diff --git a/.gitignore b/.gitignore
index bf491ec3c2..41084c45cd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,8 @@ file/*
 local/*
 _darcs/*
 logs/*
+log/*
+run/*
 config.php
 .htaccess
 httpd.conf
@@ -27,3 +29,4 @@ php.log
 .DS_Store
 nbproject
 *.mo
+
diff --git a/CONFIGURE b/CONFIGURE
new file mode 100644
index 0000000000..c5fac78730
--- /dev/null
+++ b/CONFIGURE
@@ -0,0 +1,870 @@
+Configuration options
+=====================
+
+The main configuration file for StatusNet (excepting configurations for
+dependency software) is config.php in your StatusNet directory. If you
+edit any other file in the directory, like lib/default.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.9.0, a Web based configuration panel has been
+added to StatusNet. The preferred method for changing config options is
+to use this panel.
+
+A command-line script, setconfig.php, can be used to set individual
+configuration options. It's in the scripts/ directory.
+
+Starting with version 0.7.1, you can put config files in the
+/etc/statusnet/ directory on your server, if it exists. Config files
+will be included in this order:
+
+* /etc/statusnet/statusnet.php - server-wide config
+* /etc/statusnet/<servername>.php - for a virtual host
+* /etc/statusnet/<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:
+
+    $config['section']['option'] = value;
+
+For brevity, the following documentation describes each section and
+option.
+
+site
+----
+
+This section is a catch-all for site-wide variables.
+
+name: the name of your site, like 'YourCompany Microblog'.
+server: the server part of your site's URLs, like 'example.net'.
+path: The path part of your site's URLs, like 'statusnet' or ''
+    (installed in root).
+fancy: whether or not your site uses fancy URLs (see Fancy URLs
+    section above). Default is false.
+logfile: full path to a file for StatusNet to save logging
+    information to. You may want to use this if you don't have
+    access to syslog.
+logdebug: whether to log additional debug info like backtraces on
+    hard errors. Default false.
+locale_path: full path to the directory for locale data. Unless you
+    store all your locale data in one place, you probably
+    don't need to use this.
+language: default language for your site. Defaults to US English.
+    Note that this is overridden if a user is logged in and has
+    selected a different language. It is also overridden if the
+    user is NOT logged in, but their browser requests a different
+    langauge. Since pretty much everybody's browser requests a
+    language, that means that changing this setting has little or
+    no effect in practice.
+languages: A list of languages supported on your site. Typically you'd
+    only change this if you wanted to disable support for one
+    or another language:
+    "unset($config['site']['languages']['de'])" will disable
+    support for German.
+theme: Theme for your site (see Theme section). Two themes are
+    provided by default: 'default' and 'stoica' (the one used by
+    Identi.ca). It's appreciated if you don't use the 'stoica' theme
+    except as the basis for your own.
+email: contact email address for your site. By default, it's extracted
+    from your Web server environment; you may want to customize it.
+broughtbyurl: name of an organization or individual who provides the
+    service. Each page will include a link to this name in the
+    footer. A good way to link to the blog, forum, wiki,
+    corporate portal, or whoever is making the service available.
+broughtby: text used for the "brought by" link.
+timezone: default timezone for message display. Users can set their
+    own time zone. Defaults to 'UTC', which is a pretty good default.
+closed: If set to 'true', will disallow registration on your site.
+    This is a cheap way to restrict accounts to only one
+    individual or group; just register the accounts you want on
+    the service, *then* set this variable to 'true'.
+inviteonly: If set to 'true', will only allow registration if the user
+    was invited by an existing user.
+private: If set to 'true', anonymous users will be redirected to the
+    'login' page. Also, API methods that normally require no
+    authentication will require it. Note that this does not turn
+    off registration; use 'closed' or 'inviteonly' for the
+    behaviour you want.
+notice: A plain string that will appear on every page. A good place
+    to put introductory information about your service, or info about
+    upgrades and outages, or other community info. Any HTML will
+    be escaped.
+logo: URL of an image file to use as the logo for the site. Overrides
+    the logo in the theme, if any.
+ssllogo: URL of an image file to use as the logo on SSL pages. If unset,
+    theme logo is used instead.
+ssl: Whether to use SSL and https:// URLs for some or all pages.
+    Possible values are 'always' (use it for all pages), 'never'
+    (don't use it for any pages), or 'sometimes' (use it for
+    sensitive pages that include passwords like login and registration,
+    but not for regular pages). Default to 'never'.
+sslserver: use an alternate server name for SSL URLs, like
+    'secure.example.org'. You should be careful to set cookie
+    parameters correctly so that both the SSL server and the
+    "normal" server can access the session cookie and
+    preferably other cookies as well.
+shorturllength: ignored. See 'url' section below.
+dupelimit: minimum time allowed for one person to say the same thing
+    twice. Default 60s. Anything lower is considered a user
+    or UI error.
+textlimit: default max size for texts in the site. Defaults to 0 (no limit).
+    Can be fine-tuned for notices, messages, profile bios and group descriptions.
+
+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
+set are listed below for clarity.
+
+database: a DSN (Data Source Name) for your StatusNet database. This is
+    in the format 'protocol://username:password@hostname/databasename',
+    where 'protocol' is 'mysql' or 'mysqli' (or possibly 'postgresql', if you
+    really know what you're doing), 'username' is the username,
+    'password' is the password, and etc.
+ini_yourdbname: if your database is not named 'statusnet', you'll need
+    to set this to point to the location of the
+    statusnet.ini file. Note that the real name of your database
+    should go in there, not literally 'yourdbname'.
+db_driver: You can try changing this to 'MDB2' to use the other driver
+    type for DB_DataObject, but note that it breaks the OpenID
+    libraries, which only support PEAR::DB.
+debug: On a database error, you may get a message saying to set this
+    value to 5 to see debug messages in the browser. This breaks
+    just about all pages, and will also expose the username and
+    password
+quote_identifiers: Set this to true if you're using postgresql.
+type: either 'mysql' or 'postgresql' (used for some bits of
+    database-type-specific SQL in the code). Defaults to mysql.
+mirror: you can set this to an array of DSNs, like the above
+    'database' value. If it's set, certain read-only actions will
+    use a random value out of this array for the database, rather
+    than the one in 'database' (actually, 'database' is overwritten).
+    You can offload a busy DB server by setting up MySQL replication
+    and adding the slaves to this array. Note that if you want some
+    requests to go to the 'database' (master) server, you'll need
+    to include it in this array, too.
+utf8: whether to talk to the database in UTF-8 mode. This is the default
+    with new installations, but older sites may want to turn it off
+    until they get their databases fixed up. See "UTF-8 database"
+    above for details.
+schemacheck: when to let plugins check the database schema to add
+    tables or update them. Values can be 'runtime' (default)
+    or 'script'. 'runtime' can be costly (plugins check the
+    schema on every hit, adding potentially several db
+    queries, some quite long), but not everyone knows how to
+    run a script. If you can, set this to 'script' and run
+    scripts/checkschema.php whenever you install or upgrade a
+    plugin.
+
+syslog
+------
+
+By default, StatusNet sites log error messages to the syslog facility.
+(You can override this using the 'logfile' parameter described above).
+
+appname: The name that StatusNet uses to log messages. By default it's
+    "statusnet", but if you have more than one installation on the
+    server, you may want to change the name for each instance so
+    you can track log messages more easily.
+priority: level to log at. Currently ignored.
+facility: what syslog facility to used. Defaults to LOG_USER, only
+    reset if you know what syslog is and have a good reason
+    to change it.
+
+queue
+-----
+
+You can configure the software to queue time-consuming tasks, like
+sending out SMS email or XMPP messages, for off-line processing. See
+'Queues and daemons' above for how to set this up.
+
+enabled: Whether to uses queues. Defaults to false.
+subsystem: Which kind of queueserver to use. Values include "db" for
+    our hacked-together database queuing (no other server
+    required) and "stomp" for a stomp server.
+stomp_server: "broker URI" for stomp server. Something like
+    "tcp://hostname:61613". More complicated ones are
+    possible; see your stomp server's documentation for
+    details.
+queue_basename: a root name to use for queues (stomp only). Typically
+    something like '/queue/sitename/' makes sense. If running
+    multiple instances on the same server, make sure that
+    either this setting or $config['site']['nickname'] are
+    unique for each site to keep them separate.
+
+stomp_username: username for connecting to the stomp server; defaults
+    to null.
+stomp_password: password for connecting to the stomp server; defaults
+    to null.
+
+stomp_persistent: keep items across queue server restart, if enabled.
+    Under ActiveMQ, the server configuration determines if and how
+    persistent storage is actually saved.
+
+    If using a message queue server other than ActiveMQ, you may
+    need to disable this if it does not support persistence.
+
+stomp_transactions: use transactions to aid in error detection.
+    A broken transaction will be seen quickly, allowing a message
+    to be redelivered immediately if a daemon crashes.
+
+    If using a message queue server other than ActiveMQ, you may
+    need to disable this if it does not support transactions.
+
+stomp_acks: send acknowledgements to aid in flow control.
+    An acknowledgement of successful processing tells the server
+    we're ready for more and can help keep things moving smoothly.
+
+    This should *not* be turned off when running with ActiveMQ, but
+    if using another message queue server that does not support
+    acknowledgements you might need to disable this.
+
+softlimit: an absolute or relative "soft memory limit"; daemons will
+    restart themselves gracefully when they find they've hit
+    this amount of memory usage. Defaults to 90% of PHP's global
+    memory_limit setting.
+
+inboxes: delivery of messages to receiver's inboxes can be delayed to
+    queue time for best interactive performance on the sender.
+    This may however be annoyingly slow when using the DB queues,
+    so you can set this to false if it's causing trouble.
+
+breakout: for stomp, individual queues are by default grouped up for
+    best scalability. If some need to be run by separate daemons,
+    etc they can be manually adjusted here.
+
+        Default will share all queues for all sites within each group.
+        Specify as <group>/<queue> or <group>/<queue>/<site>,
+        using nickname identifier as site.
+
+        'main/distrib' separate "distrib" queue covering all sites
+        'xmpp/xmppout/mysite' separate "xmppout" queue covering just 'mysite'
+
+max_retries: for stomp, drop messages after N failed attempts to process.
+    Defaults to 10.
+
+dead_letter_dir: for stomp, optional directory to dump data on failed
+    queue processing events after discarding them.
+
+stomp_no_transactions: for stomp, the server does not support transactions,
+    so do not try to user them. This is needed for http://www.morbidq.com/.
+
+stomp_no_acks: for stomp, the server does not support acknowledgements.
+    so do not try to user them. This is needed for http://www.morbidq.com/.
+
+license
+-------
+
+The default license to use for your users notices. The default is the
+Creative Commons Attribution 3.0 license, which is probably the right
+choice for any public site. Note that some other servers will not
+accept notices if you apply a stricter license than this.
+
+type: one of 'cc' (for Creative Commons licenses), 'allrightsreserved'
+    (default copyright), or 'private' (for private and confidential
+    information).
+owner: for 'allrightsreserved' or 'private', an assigned copyright
+    holder (for example, an employer for a private site). If
+    not specified, will be attributed to 'contributors'.
+url: URL of the license, used for links.
+title: Title for the license, like 'Creative Commons Attribution 3.0'.
+image: A button shown on each page for the license.
+
+mail
+----
+
+This is for configuring out-going email. We use PEAR's Mail module,
+see: http://pear.php.net/manual/en/package.mail.mail.factory.php
+
+backend: the backend to use for mail, one of 'mail', 'sendmail', and
+    'smtp'. Defaults to PEAR's default, 'mail'.
+params: if the mail backend requires any parameters, you can provide
+    them in an associative array.
+
+nickname
+--------
+
+This is for configuring nicknames in the service.
+
+blacklist: an array of strings for usernames that may not be
+    registered. A default array exists for strings that are
+    used by StatusNet (e.g. 'doc', 'main', 'avatar', 'theme')
+    but you may want to add others if you have other software
+    installed in a subdirectory of StatusNet or if you just
+    don't want certain words used as usernames.
+featured: an array of nicknames of 'featured' users of the site.
+    Can be useful to draw attention to well-known users, or
+    interesting people, or whatever.
+
+avatar
+------
+
+For configuring avatar access.
+
+dir: Directory to look for avatar files and to put them into.
+    Defaults to avatar subdirectory of install directory; if
+    you change it, make sure to change path, too.
+path: Path to avatars. Defaults to path for avatar subdirectory,
+    but you can change it if you wish. Note that this will
+    be included with the avatar server, too.
+server: If set, defines another server where avatars are stored in the
+    root directory. Note that the 'avatar' subdir still has to be
+    writeable. You'd typically use this to split HTTP requests on
+    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.
+    Defaults to null.
+ssl: Whether to access avatars using HTTPS. Defaults to null, meaning
+    to guess based on site-wide SSL settings.
+
+public
+------
+
+For configuring the public stream.
+
+localonly: If set to true, only messages posted by users of this
+    service (rather than other services, filtered through OStatus)
+    are shown in the public stream. Default true.
+blacklist: An array of IDs of users to hide from the public stream.
+    Useful if you have someone making excessive Twitterfeed posts
+    to the site, other kinds of automated posts, testing bots, etc.
+autosource: Sources of notices that are from automatic posters, and thus
+    should be kept off the public timeline. Default empty.
+
+theme
+-----
+
+server: Like avatars, you can speed up page loading by pointing the
+    theme file lookup to another server (virtual or real).
+    Defaults to NULL, meaning to use the site server.
+dir: Directory where theme files are stored. Used to determine
+    whether to show parts of a theme file. Defaults to the theme
+    subdirectory of the install directory.
+path: Path part of theme URLs, before the theme name. Relative to the
+    theme server. It may make sense to change this path when upgrading,
+    (using version numbers as the path) to make sure that all files are
+    reloaded by caching clients or proxies. Defaults to null,
+    which means to use the site path + '/theme'.
+ssl: Whether to use SSL for theme elements. Default is null, which means
+    guess based on site SSL settings.
+sslserver: SSL server to use when page is HTTPS-encrypted. If
+    unspecified, site ssl server and so on will be used.
+sslpath: If sslserver if defined, path to use when page is HTTPS-encrypted.
+
+javascript
+----------
+
+server: You can speed up page loading by pointing the
+    theme file lookup to another server (virtual or real).
+    Defaults to NULL, meaning to use the site server.
+path: Path part of Javascript URLs. Defaults to null,
+    which means to use the site path + '/js/'.
+ssl: Whether to use SSL for JavaScript files. Default is null, which means
+    guess based on site SSL settings.
+sslserver: SSL server to use when page is HTTPS-encrypted. If
+    unspecified, site ssl server and so on will be used.
+sslpath: If sslserver if defined, path to use when page is HTTPS-encrypted.
+bustframes: If true, all web pages will break out of framesets. If false,
+	    can comfortably live in a frame or iframe... probably. Default
+	    to true.
+
+xmpp
+----
+
+For configuring the XMPP sub-system.
+
+enabled: Whether to accept and send messages by XMPP. Default false.
+server: server part of XMPP ID for update user.
+port: connection port for clients. Default 5222, which you probably
+    shouldn't need to change.
+user: username for the client connection. Users will receive messages
+    from 'user'@'server'.
+resource: a unique identifier for the connection to the server. This
+    is actually used as a prefix for each XMPP component in the system.
+password: password for the user account.
+host: some XMPP domains are served by machines with a different
+    hostname. (For example, @gmail.com GTalk users connect to
+    talk.google.com). Set this to the correct hostname if that's the
+    case with your server.
+encryption: Whether to encrypt the connection between StatusNet and the
+    XMPP server. Defaults to true, but you can get
+    considerably better performance turning it off if you're
+    connecting to a server on the same machine or on a
+    protected network.
+debug: if turned on, this will make the XMPP library blurt out all of
+    the incoming and outgoing messages as XML stanzas. Use as a
+    last resort, and never turn it on if you don't have queues
+    enabled, since it will spit out sensitive data to the browser.
+public: an array of JIDs to send _all_ notices to. This is useful for
+    participating in third-party search and archiving services.
+
+invite
+------
+
+For configuring invites.
+
+enabled: Whether to allow users to send invites. Default true.
+
+tag
+---
+
+Miscellaneous tagging stuff.
+
+dropoff: Decay factor for tag listing, in seconds.
+    Defaults to exponential decay over ten days; you can twiddle
+    with it to try and get better results for your site.
+
+popular
+-------
+
+Settings for the "popular" section of the site.
+
+dropoff: Decay factor for popularity listing, in seconds.
+    Defaults to exponential decay over ten days; you can twiddle
+    with it to try and get better results for your site.
+
+daemon
+------
+
+For daemon processes.
+
+piddir: directory that daemon processes should write their PID file
+    (process ID) to. Defaults to /var/run/, which is where this
+    stuff should usually go on Unix-ish systems.
+user: If set, the daemons will try to change their effective user ID
+    to this user before running. Probably a good idea, especially if
+    you start the daemons as root. Note: user name, like 'daemon',
+    not 1001.
+group: If set, the daemons will try to change their effective group ID
+    to this named group. Again, a name, not a numerical ID.
+
+memcached
+---------
+
+You can get a significant boost in performance by caching some
+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
+    be an array of hostnames, if you've got more than one server.
+base: memcached uses key-value pairs to store data. We build long,
+    funny-looking keys to make sure we don't have any conflicts. The
+    base of the key is usually a simplified version of the site name
+    (like "Identi.ca" => "identica"), but you can overwrite this if
+    you need to. You can safely ignore it if you only have one
+    StatusNet site using your memcached server.
+port: Port to connect to; defaults to 11211.
+
+emailpost
+---------
+
+For post-by-email.
+
+enabled: Whether to enable post-by-email. Defaults to true. You will
+    also need to set up maildaemon.php.
+
+sms
+---
+
+For SMS integration.
+
+enabled: Whether to enable SMS integration. Defaults to true. Queues
+    should also be enabled.
+
+integration
+-----------
+
+A catch-all for integration with other systems.
+
+taguri: base for tag:// URIs. Defaults to site-server + ',2009'.
+
+inboxes
+-------
+
+For notice inboxes.
+
+enabled: No longer used. If you set this to something other than true,
+    StatusNet will no longer run.
+
+throttle
+--------
+
+For notice-posting throttles.
+
+enabled: Whether to throttle posting. Defaults to false.
+count: Each user can make this many posts in 'timespan' seconds. So, if count
+    is 100 and timespan is 3600, then there can be only 100 posts
+    from a user every hour.
+timespan: see 'count'.
+
+profile
+-------
+
+Profile management.
+
+biolimit: max character length of bio; 0 means no limit; null means to use
+    the site text limit default.
+backup: whether users can backup their own profiles. Defaults to true.
+restore: whether users can restore their profiles from backup files. Defaults
+	 to true.
+delete: whether users can delete their own accounts. Defaults to false.
+move: whether users can move their accounts to another server. Defaults
+      to true.	 
+
+newuser
+-------
+
+Options with new users.
+
+default: nickname of a user account to automatically subscribe new
+    users to. Typically this would be system account for e.g.
+    service updates or announcements. Users are able to unsub
+    if they want. Default is null; no auto subscribe.
+welcome: nickname of a user account that sends welcome messages to new
+    users. Can be the same as 'default' account, although on
+    busy servers it may be a good idea to keep that one just for
+    'urgent' messages. Default is null; no message.
+
+If either of these special user accounts are specified, the users should
+be created before the configuration is updated.
+
+snapshot
+--------
+
+The software will, by default, send statistical snapshots about the
+local installation to a stats server on the status.net Web site. This
+data is used by the developers to prioritize development decisions. No
+identifying data about users or organizations is collected. The data
+is available to the public for review. Participating in this survey
+helps StatusNet developers take your needs into account when updating
+the software.
+
+run: string indicating when to run the statistics. Values can be 'web'
+    (run occasionally at Web time), 'cron' (run from a cron script),
+    or 'never' (don't ever run). If you set it to 'cron', remember to
+    schedule the script to run on a regular basis.
+frequency: if run value is 'web', how often to report statistics.
+    Measured in Web hits; depends on how active your site is.
+    Default is 10000 -- that is, one report every 10000 Web hits,
+    on average.
+reporturl: URL to post statistics to. Defaults to StatusNet developers'
+    report system, but if they go evil or disappear you may
+    need to update this to another value. Note: if you
+    don't want to report stats, it's much better to
+    set 'run' to 'never' than to set this value to something
+    nonsensical.
+
+attachments
+-----------
+
+The software lets users upload files with their notices. You can configure
+the types of accepted files by mime types and a trio of quota options:
+per file, per user (total), per user per month.
+
+We suggest the use of the pecl file_info extension to handle mime type
+detection.
+
+supported: an array of mime types you accept to store and distribute,
+    like 'image/gif', 'video/mpeg', 'audio/mpeg', etc. Make sure you
+    setup your server to properly recognize the types you want to
+    support.
+uploads: false to disable uploading files with notices (true by default).
+filecommand: The required MIME_Type library may need to use the 'file'
+    command. It tries the one in the Web server's path, but if
+    you're having problems with uploads, try setting this to the
+    correct value. Note: 'file' must accept '-b' and '-i' options.
+
+For quotas, be sure you've set the upload_max_filesize and post_max_size
+in php.ini to be large enough to handle your upload. In httpd.conf
+(if you're using apache), check that the LimitRequestBody directive isn't
+set too low (it's optional, so it may not be there at all).
+
+file_quota: maximum size for a single file upload in bytes. A user can send
+    any amount of notices with attachments as long as each attachment
+    is smaller than file_quota.
+user_quota: total size in bytes a user can store on this server. Each user
+    can store any number of files as long as their total size does
+    not exceed the user_quota.
+monthly_quota: total size permitted in the current month. This is the total
+    size in bytes that a user can upload each month.
+dir: directory accessible to the Web process where uploads should go.
+    Defaults to the 'file' subdirectory of the install directory, which
+    should be writeable by the Web user.
+server: server name to use when creating URLs for uploaded files.
+    Defaults to null, meaning to use the default Web server. Using
+    a virtual server here can speed up Web performance.
+path: URL path, relative to the server, to find files. Defaults to
+    main path + '/file/'.
+ssl: whether to use HTTPS for file URLs. Defaults to null, meaning to
+    guess based on other SSL settings.
+filecommand: command to use for determining the type of a file. May be
+    skipped if fileinfo extension is installed. Defaults to
+    '/usr/bin/file'.
+sslserver: if specified, this server will be used when creating HTTPS
+    URLs. Otherwise, the site SSL server will be used, with /file/ path.
+sslpath: if this and the sslserver are specified, this path will be used
+    when creating HTTPS URLs. Otherwise, the attachments|path value
+    will be used.
+
+group
+-----
+
+Options for group functionality.
+
+maxaliases: maximum number of aliases a group can have. Default 3. Set
+    to 0 or less to prevent aliases in a group.
+desclimit: maximum number of characters to allow in group descriptions.
+    null (default) means to use the site-wide text limits. 0
+    means no limit.
+addtag: Whether to add a tag for the group nickname for every group post 
+	(pre-1.0.x behaviour). Defaults to false.
+
+oembed
+--------
+
+oEmbed endpoint for multimedia attachments (links in posts). Will also
+work as 'oohembed' for backwards compatibility.
+
+endpoint: oohembed endpoint using http://oohembed.com/ software. Defaults to
+	  'http://oohembed.com/oohembed/'.
+order: Array of methods to check for OEmbed data. Methods include 'built-in'
+       (use a built-in function to simulate oEmbed for some sites),
+       'well-known' (use well-known public oEmbed endpoints),
+       'discovery' (discover using <link> headers in HTML), 'service' (use
+       a third-party service, like oohembed or embed.ly. Default is
+       array('built-in', 'well-known', 'service', 'discovery'). Note that very
+       few sites implement oEmbed; 'discovery' is going to fail 99% of the
+       time.
+
+search
+------
+
+Some stuff for search.
+
+type: type of search. Ignored if PostgreSQL or Sphinx are enabled. Can either
+    be 'fulltext' or 'like' (default). The former is faster and more efficient
+    but requires the lame old MyISAM engine for MySQL. The latter
+    will work with InnoDB but could be miserably slow on large
+    systems. We'll probably add another type sometime in the future,
+    with our own indexing system (maybe like MediaWiki's).
+
+sessions
+--------
+
+Session handling.
+
+handle: boolean. Whether we should register our own PHP session-handling
+    code (using the database and memcache if enabled). Defaults to false.
+    Setting this to true makes some sense on large or multi-server
+    sites, but it probably won't hurt for smaller ones, either.
+debug: whether to output debugging info for session storage. Can help
+    with weird session bugs, sometimes. Default false.
+
+background
+----------
+
+Users can upload backgrounds for their pages; this section defines
+their use.
+
+server: the server to use for background. Using a separate (even
+    virtual) server for this can speed up load times. Default is
+    null; same as site server.
+dir: directory to write backgrounds too. Default is '/background/'
+    subdir of install dir.
+path: path to backgrounds. Default is sub-path of install path; note
+    that you may need to change this if you change site-path too.
+sslserver: SSL server to use when page is HTTPS-encrypted. If
+    unspecified, site ssl server and so on will be used.
+sslpath: If sslserver if defined, path to use when page is HTTPS-encrypted.
+
+ping
+----
+
+Using the "XML-RPC Ping" method initiated by weblogs.com, the site can
+notify third-party servers of updates.
+
+notify: an array of URLs for ping endpoints. Default is the empty
+    array (no notification).
+
+design
+------
+
+Default design (colors and background) for the site. Actual appearance
+depends on the theme.  Null values mean to use the theme defaults.
+
+backgroundcolor: Hex color of the site background.
+contentcolor: Hex color of the content area background.
+sidebarcolor: Hex color of the sidebar background.
+textcolor: Hex color of all non-link text.
+linkcolor: Hex color of all links.
+backgroundimage: Image to use for the background.
+disposition: Flags for whether or not to tile the background image.
+
+notice
+------
+
+Configuration options specific to notices.
+
+contentlimit: max length of the plain-text content of a notice.
+    Default is null, meaning to use the site-wide text limit.
+    0 means no limit.
+defaultscope: default scope for notices. If null, the default
+	scope depends on site/private. It's 1 if the site is private,
+	0 otherwise. Set this value to override.
+
+message
+-------
+
+Configuration options specific to messages.
+
+contentlimit: max length of the plain-text content of a message.
+    Default is null, meaning to use the site-wide text limit.
+    0 means no limit.
+
+logincommand
+------------
+
+Configuration options for the login command.
+
+disabled: whether to enable this command. If enabled, users who send
+    the text 'login' to the site through any channel will
+    receive a link to login to the site automatically in return.
+    Possibly useful for users who primarily use an XMPP or SMS
+    interface and can't be bothered to remember their site
+    password. Note that the security implications of this are
+    pretty serious and have not been thoroughly tested. You
+    should enable it only after you've convinced yourself that
+    it is safe. Default is 'false'.
+
+singleuser
+----------
+
+If an installation has only one user, this can simplify a lot of the
+interface. It also makes the user's profile the root URL.
+
+enabled: Whether to run in "single user mode". Default false.
+nickname: nickname of the single user. If no nickname is specified,
+          the site owner account will be used (if present).
+
+robotstxt
+---------
+
+We put out a default robots.txt file to guide the processing of
+Web crawlers. See http://www.robotstxt.org/ for more information
+on the format of this file.
+
+crawldelay: if non-empty, this value is provided as the Crawl-Delay:
+    for the robots.txt file. see http://ur1.ca/l5a0
+    for more information. Default is zero, no explicit delay.
+disallow: Array of (virtual) directories to disallow. Default is 'main',
+    'search', 'message', 'settings', 'admin'. Ignored when site
+    is private, in which case the entire site ('/') is disallowed.
+
+api
+---
+
+Options for the Twitter-like API.
+
+realm: HTTP Basic Auth realm (see http://tools.ietf.org/html/rfc2617
+    for details). Some third-party tools like ping.fm want this to be
+    'Identi.ca API', so set it to that if you want to. default = null,
+    meaning 'something based on the site name'.
+
+nofollow
+--------
+
+We optionally put 'rel="nofollow"' on some links in some pages. The
+following configuration settings let you fine-tune how or when things
+are nofollowed. See http://en.wikipedia.org/wiki/Nofollow for more
+information on what 'nofollow' means.
+
+subscribers: whether to nofollow links to subscribers on the profile
+    and personal pages. Default is true.
+members: links to members on the group page. Default true.
+peopletag: links to people listed in the peopletag page. Default true.
+external: external links in notices. One of three values: 'sometimes',
+    'always', 'never'. If 'sometimes', then external links are not
+    nofollowed on profile, notice, and favorites page. Default is
+    'sometimes'.
+
+url
+---
+
+Everybody loves URL shorteners. These are some options for fine-tuning
+how and when the server shortens URLs.
+
+shortener: URL shortening service to use by default. Users can override
+           individually. 'ur1.ca' by default.
+maxlength: If an URL is strictly longer than this limit, it will be
+           shortened. Note that the URL shortener service may return an
+           URL longer than this limit. Defaults to 25. Users can
+           override. If set to 0, all URLs will be shortened.
+maxnoticelength: If a notice is strictly longer than this limit, all
+           URLs in the notice will be shortened. Users can override.
+           -1 means the text limit for notices.
+
+router
+------
+
+We use a router class for mapping URLs to code. This section controls
+how that router works.
+
+cache: whether to cache the router in memcache (or another caching
+    mechanism). Defaults to true, but may be set to false for
+    developers (who might be actively adding pages, so won't want the
+    router cached) or others who see strange behavior. You're unlikely
+    to need this unless you're a developer.
+
+http
+----
+
+Settings for the HTTP client.
+
+ssl_cafile: location of the CA file for SSL. If not set, won't verify
+	    SSL peers. Default unset.
+curl: Use cURL <http://curl.haxx.se/> for doing HTTP calls. You must
+      have the PHP curl extension installed for this to work.
+proxy_host: Host to use for proxying HTTP requests. If unset, doesn't
+	    do any HTTP proxy stuff. Default unset.
+proxy_port: Port to use to connect to HTTP proxy host. Default null.
+proxy_user: Username to use for authenticating to the HTTP proxy. Default null.
+proxy_password: Password to use for authenticating to the HTTP proxy. Default null.
+proxy_auth_scheme: Scheme to use for authenticating to the HTTP proxy. Default null.
+
+plugins
+-------
+
+default: associative array mapping plugin name to array of arguments. To disable
+	 a default plugin, unset its value in this array.
+locale_path: path for finding plugin locale files. In the plugin's directory
+	     by default.
+server: Server to find static files for a plugin when the page is plain old HTTP.
+	Defaults to site/server (same as pages). Use this to move plugin CSS and
+	JS files to a CDN.
+sslserver: Server to find static files for a plugin when the page is HTTPS. Defaults
+	   to site/server (same as pages). Use this to move plugin CSS and JS files
+	   to a CDN.
+path: Path to the plugin files. defaults to site/path + '/plugins/'. Expects that
+      each plugin will have a subdirectory at plugins/NameOfPlugin. Change this
+      if you're using a CDN.
+sslpath: Path to use on the SSL server. Same as plugins/path.
+
+performance
+-----------
+
+high: if you need high performance, or if you're seeing bad
+      performance, set this to true. It will turn off some high-intensity code from
+      the site.
+
+oldschool
+---------
+
+enabled: enable certain old-style user settings options, like stream-only mode,
+	 conversation trees, and nicknames in streams. Off by default, and
+	 may not be well supported in future versions.
+
+
diff --git a/EVENTS.txt b/EVENTS.txt
index 0a9759c246..49940e467f 100644
--- a/EVENTS.txt
+++ b/EVENTS.txt
@@ -1418,3 +1418,41 @@ StartShowInvitationSuccess: Right before showing invitations success msg
 EndShowInvitationSuccess: After showing invitations success msg
 - $action: invitation action
 
+StartUpgrade: when starting a site upgrade
+
+EndUpgrade: when ending a site upgrade; good place to do your own upgrades
+
+HaveIMPlugin: is there an IM plugin loaded?
+- &$haveIMPlugin: set me to true if you're loaded!
+
+StartShowNoticeOptionItems: Before showing first controls in a notice list item; inside the div
+- $nli: NoticeListItem being shown
+
+EndShowNoticeOptionItems: After showing last controls in a notice list item; inside the div
+- $nli: NoticeListItem being shown
+
+StartNoticeInScope: Before checking if a notice should be visible to a user
+- $notice: The notice to check
+- $profile: The profile to check for scope
+- &$bResult: The boolean result; fill this in if you want to skip
+
+EndNoticeInScope: After checking if a notice should be visible to a user
+- $notice: The notice to check
+- $profile: The profile to check for scope
+- &$bResult: The boolean result; overwrite this if you so desire
+
+StartNoticeListPrefill: Before pre-filling a list of notices with extra data
+- &$notices: Notices to be pre-filled
+- $avatarSize: The avatar size for the list
+
+EndNoticeListPrefill: After pre-filling a list of notices with extra data
+- &$notices: Notices that were pre-filled
+- &$profiles: Profiles that were pre-filled 
+- $avatarSize: The avatar size for the list
+
+OtherAccountProfiles: Hook to add account profiles to a user account profile block
+- $profile: the Profile being shown
+- &$others: Modifiable array of profile info arrays. Each one has the following fields:
+            href: link to the profile
+            text: text for the profile
+            image: mini image for the profile
diff --git a/INSTALL b/INSTALL
new file mode 100644
index 0000000000..2508acd7e5
--- /dev/null
+++ b/INSTALL
@@ -0,0 +1,516 @@
+Prerequisites
+=============
+
+The following software packages are *required* for this software to
+run correctly.
+
+- PHP 5.2.3+. It may be possible to run this software on earlier
+  versions of PHP, but many of the functions used are only available
+  in PHP 5.2 or above. 5.2.6 or later is needed for XMPP background
+  daemons on 64-bit platforms. PHP 5.3.x should work correctly in this
+  release, but problems with some plugins are possible.
+- MySQL 5.x. The StatusNet database is stored, by default, in a MySQL
+  server. It has been primarily tested on 5.x servers, although it may
+  be possible to install on earlier (or later!) versions. The server
+  *must* support the MyISAM storage engine -- the default for most
+  MySQL servers -- *and* the InnoDB storage engine.
+- A Web server. Preferably, you should have Apache 2.2.x with the
+  mod_rewrite extension installed and enabled.
+
+Your PHP installation must include the following PHP extensions:
+
+- Curl. This is for fetching files by HTTP.
+- XMLWriter. This is for formatting XML and HTML output.
+- MySQL. For accessing the database.
+- GD. For scaling down avatar images.
+- mbstring. For handling Unicode (UTF-8) encoded strings.
+
+For some functionality, you will also need the following extensions:
+
+- Memcache. A client for the memcached server, which caches database
+  information in volatile memory. This is important for adequate
+  performance on high-traffic sites. You will also need a memcached
+  server to store the data in.
+- Mailparse. Efficient parsing of email requires this extension.
+  Submission by email or SMS-over-email uses this extension.
+- Sphinx Search. A client for the sphinx server, an alternative
+  to MySQL or Postgresql fulltext search. You will also need a
+  Sphinx server to serve the search queries.
+- bcmath or gmp. For Salmon signatures (part of OStatus). Needed
+  if you have OStatus configured.
+- gettext. For multiple languages. Default on many PHP installs;
+  will be emulated if not present.
+
+You will almost definitely get 2-3 times better performance from your
+site if you install a PHP bytecode cache/accelerator. Some well-known
+examples are: eaccelerator, Turck mmcache, xcache, apc. Zend Optimizer
+is a proprietary accelerator installed on some hosting sites.
+
+External libraries
+------------------
+
+A number of external PHP libraries are used to provide basic
+functionality and optional functionality for your system. For your
+convenience, they are available in the "extlib" directory of this
+package, and you do not have to download and install them. However,
+you may want to keep them up-to-date with the latest upstream version,
+and the URLs are listed here for your convenience.
+
+- DB_DataObject http://pear.php.net/package/DB_DataObject
+- Validate http://pear.php.net/package/Validate
+- OpenID from OpenIDEnabled (not the PEAR version!). We decided
+  to use the openidenabled.com version since it's more widely
+  implemented, and seems to be better supported.
+  http://openidenabled.com/php-openid/
+- PEAR DB. Although this is an older data access system (new
+  packages should probably use PHP DBO), the OpenID libraries
+  depend on PEAR DB so we use it here, too. DB_DataObject can
+  also use PEAR MDB2, which may give you better performance
+  but won't work with OpenID.
+  http://pear.php.net/package/DB
+- OAuth.php from http://oauth.googlecode.com/svn/code/php/
+- markdown.php from http://michelf.com/projects/php-markdown/
+- PEAR Mail, for sending out mail notifications
+  http://pear.php.net/package/Mail
+- PEAR Net_SMTP, if you use the SMTP factory for notifications
+  http://pear.php.net/package/Net_SMTP
+- PEAR Net_Socket, if you use the SMTP factory for notifications
+  http://pear.php.net/package/Net_Socket
+- XMPPHP, the follow-up to Class.Jabber.php. Probably the best XMPP
+  library available for PHP. http://xmpphp.googlecode.com/. Note that
+  as of this writing the version of this library that is available in
+  the extlib directory is *significantly different* from the upstream
+  version (patches have been submitted). Upgrading to the upstream
+  version may render your StatusNet site unable to send or receive XMPP
+  messages.
+- Facebook library. Used for the Facebook application.
+- PEAR Validate is used for URL and email validation.
+- Console_GetOpt for parsing command-line options.
+  predecessor to OStatus.
+- HTTP_Request2, a library for making HTTP requests.
+- PEAR Net_URL2 is an HTTP_Request2 dependency.
+
+A design goal of StatusNet is that the basic Web functionality should
+work on even the most restrictive commercial hosting services.
+However, additional functionality, such as receiving messages by
+Jabber/GTalk, require that you be able to run long-running processes
+on your account. In addition, posting by email or from SMS require
+that you be able to install a mail filter in your mail server.
+
+Installation
+============
+
+Installing the basic StatusNet Web component is relatively easy,
+especially if you've previously installed PHP/MySQL packages.
+
+1. Unpack the tarball you downloaded on your Web server. Usually a
+   command like this will work:
+
+       tar zxf statusnet-1.1.1.tar.gz
+
+   ...which will make a statusnet-1.1.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.)
+
+2. Move the tarball to a directory of your choosing in your Web root
+   directory. Usually something like this will work:
+
+       mv statusnet-1.1.1 /var/www/statusnet
+
+   This will make your StatusNet instance available in the statusnet path of
+   your server, like "http://example.net/statusnet". "microblog" or
+   "statusnet" might also be good path names. If you know how to
+   configure virtual hosts on your web server, you can try setting up
+   "http://micro.example.net/" or the like.
+
+3. Make your target directory writeable by the Web server.
+
+       chmod a+w /var/www/statusnet/
+
+   On some systems, this will probably work:
+
+       chgrp www-data /var/www/statusnet/
+       chmod g+w /var/www/statusnet/
+
+   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 "statusnet" and add the Web server's user to the group.
+
+4. You should also take this moment to make your avatar, background, and
+   file subdirectories writeable by the Web server. An insecure way to do
+   this is:
+
+       chmod a+w /var/www/statusnet/avatar
+       chmod a+w /var/www/statusnet/background
+       chmod a+w /var/www/statusnet/file
+
+   You can also make the avatar, background, and file directories
+   writeable by the Web server group, as noted above.
+
+5. Create a database to hold your microblog data. Something like this
+   should work:
+
+       mysqladmin -u "username" --password="password" create statusnet
+
+   Note that StatusNet must have its own database; you can't share the
+   database with another program. You can name it whatever you want,
+   though.
+
+   (If you don't have shell access to your server, you may need to use
+   a tool like PHPAdmin to create a database. Check your hosting
+   service's documentation for how to create a new MySQL database.)
+
+6. Create a new database account that StatusNet will use to access the
+   database. If you have shell access, this will probably work from the
+   MySQL shell:
+
+       GRANT ALL on statusnet.*
+       TO 'statusnetuser'@'localhost'
+       IDENTIFIED BY 'statusnetpassword';
+
+   You should change 'statusnetuser' and 'statusnetpassword' to your preferred new
+   username and password. You may want to test logging in to MySQL as
+   this new user.
+
+7. In a browser, navigate to the StatusNet install script; something like:
+
+       http://yourserver.example.com/statusnet/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, StatusNet 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/statusnet/index.php/statusnet/fred
+
+On certain systems that don't support this kind of syntax, they'll
+look like this:
+
+    http://example.org/statusnet/index.php?p=statusnet/fred
+
+It's possible to configure the software so it looks like this instead:
+
+    http://example.org/statusnet/fred
+
+These "fancy URLs" are more readable and memorable for users. To use
+fancy URLs, you must either have Apache 2.x with .htaccess enabled and
+mod_rewrite enabled, -OR- know how to configure "url redirection" in
+your server.
+
+1. Copy the htaccess.sample file to .htaccess in your StatusNet
+   directory. Note: if you have control of your server's httpd.conf or
+   similar configuration files, it can greatly improve performance to
+   import the .htaccess file into your conf file instead. If you're
+   not sure how to do it, you may save yourself a lot of headache by
+   just leaving the .htaccess file.
+
+2. Change the "RewriteBase" in the new .htaccess file to be the URL path
+   to your StatusNet installation on your server. Typically this will
+   be the path to your StatusNet directory relative to your Web root.
+
+3. Add or uncomment or change a line in your config.php file so it says:
+
+       $config['site']['fancy'] = true;
+
+You should now be able to navigate to a "fancy" URL on your server,
+like:
+
+    http://example.net/statusnet/main/register
+
+If you changed your HTTP server configuration, you may need to restart
+the server first.
+
+If it doesn't work, double-check that AllowOverride for the StatusNet
+directory is 'All' in your Apache configuration file. This is usually
+/etc/httpd.conf, /etc/apache/httpd.conf, or (on Debian and Ubuntu)
+/etc/apache2/sites-available/default. See the Apache documentation for
+.htaccess files for more details:
+
+    http://httpd.apache.org/docs/2.2/howto/htaccess.html
+
+Also, check that mod_rewrite is installed and enabled:
+
+    http://httpd.apache.org/docs/2.2/mod/mod_rewrite.html
+
+Sphinx
+------
+
+To use a Sphinx server to search users and notices, you'll need to
+enable the SphinxSearch plugin. Add to your config.php:
+
+    addPlugin('SphinxSearch');
+    $config['sphinx']['server'] = 'searchhost.local';
+
+You also need to install, compile and enable the sphinx pecl extension for
+php on the client side, which itself depends on the sphinx development files.
+
+See plugins/SphinxSearch/README for more details and server setup.
+
+SMS
+---
+
+StatusNet supports a cheap-and-dirty system for sending update messages
+to mobile phones and for receiving updates from the mobile. Instead of
+sending through the SMS network itself, which is costly and requires
+buy-in from the wireless carriers, it simply piggybacks on the email
+gateways that many carriers provide to their customers. So, SMS
+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 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.
+
+1. Run the SQL script carrier.sql in your StatusNet database. This will
+   usually work:
+
+       mysql -u "statusnetuser" --password="statusnetpassword" statusnet < db/carrier.sql
+
+   This will populate your database with a list of wireless carriers
+   that support email SMS gateways.
+
+2. Make sure the maildaemon.php file is executable:
+
+       chmod +x scripts/maildaemon.php
+
+   Note that "daemon" is kind of a misnomer here; the script is more
+   of a filter than a daemon.
+
+2. Edit /etc/aliases on your mail server and add the following line:
+
+       *: /path/to/statusnet/scripts/maildaemon.php
+
+3. Run whatever code you need to to update your aliases database. For
+   many mail servers (Postfix, Exim, Sendmail), this should work:
+
+       newaliases
+
+   You may need to restart your mail server for the new database to
+   take effect.
+
+4. Set the following in your config.php file:
+
+       $config['mail']['domain'] = 'yourdomain.example.net';
+
+At this point, post-by-email and post-by-SMS-gateway should work. Note
+that if your mail server is on a different computer from your email
+server, you'll need to have a full installation of StatusNet, a working
+config.php, and access to the StatusNet database from the mail server.
+
+XMPP
+----
+
+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
+well.
+
+1. You may want to strongly consider setting up your own XMPP server.
+   Ejabberd, OpenFire, and JabberD are all Open Source servers.
+   Jabber, Inc. provides a high-performance commercial server.
+
+2. You must register a Jabber ID (JID) with your new server. It helps
+   to choose a name like "update@example.com" or "notice" or something
+   similar.  Alternately, your "update JID" can be registered on a
+   publicly-available XMPP service, like jabber.org or GTalk.
+
+   StatusNet will not register the JID with your chosen XMPP server;
+   you need to do this manually, with an XMPP client like Gajim,
+   Telepathy, or Pidgin.im.
+
+3. Configure your site's XMPP variables, as described below in the
+   configuration section.
+
+On a default installation, your site can broadcast messages using
+XMPP. Users won't be able to post messages using XMPP unless you've
+got the XMPP daemon running.  See 'Queues and daemons' below for how
+to set that up. Also, once you have a sizable number of users, sending
+a lot of SMS, OStatus, and XMPP messages whenever someone posts a message
+can really slow down your site; it may cause posting to timeout.
+
+NOTE: stream_select(), a crucial function for network programming, is
+broken on PHP 5.2.x less than 5.2.6 on amd64-based servers. We don't
+work around this bug in StatusNet; current recommendation is to move
+off of amd64 to another server.
+
+Public feed
+-----------
+
+You can send *all* messages from your social networking site to a
+third-party service using XMPP. This can be useful for providing
+search, indexing, bridging, or other cool services.
+
+To configure a downstream site to receive your public stream, add
+their "JID" (Jabber ID) to your config.php as follows:
+
+    $config['xmpp']['public'][] = 'downstream@example.net';
+
+(Don't miss those square brackets at the end.) Note that your XMPP
+broadcasting must be configured as mentioned above. Although you can
+send out messages at "Web time", high-volume sites should strongly
+consider setting up queues and daemons.
+
+Queues and daemons
+------------------
+
+Some activities that StatusNet needs to do, like broadcast OStatus, SMS,
+and XMPP messages, can be 'queued' and done by off-line bots instead.
+For this to work, you must be able to run long-running offline
+processes, either on your main Web server or on another server you
+control. (Your other server will still need all the above
+prerequisites, with the exception of Apache.) Installing on a separate
+server is probably a good idea for high-volume sites.
+
+1. You'll need the "CLI" (command-line interface) version of PHP
+   installed on whatever server you use.
+
+2. If you're using a separate server for queues, install StatusNet
+   somewhere on the server. You don't need to worry about the
+   .htaccess file, but make sure that your config.php file is close
+   to, or identical to, your Web server's version.
+
+3. In your config.php files (both the Web server and the queues
+   server!), set the following variable:
+
+       $config['queue']['enabled'] = true;
+
+   You may also want to look at the 'daemon' section of this file for
+   more daemon options. Note that if you set the 'user' and/or 'group'
+   options, you'll need to create that user and/or group by hand.
+   They're not created automatically.
+
+4. On the queues server, run the command scripts/startdaemons.sh.
+
+This will run the queue handlers:
+
+* queuedaemon.php - polls for queued items for inbox processing and
+  pushing out to OStatus, SMS, XMPP, etc.
+* xmppdaemon.php - listens for new XMPP messages from users and stores
+  them as notices in the database; also pulls queued XMPP output from
+  queuedaemon.php to push out to clients.
+
+These two daemons will automatically restart in most cases of failure
+including memory leaks (if a memory_limit is set), but may still die
+or behave oddly if they lose connections to the XMPP or queue servers.
+
+Additional daemons may be also started by this script for certain
+plugins, such as the Twitter bridge.
+
+It may be a good idea to use a daemon-monitoring service, like 'monit',
+to check their status and keep them running.
+
+All the daemons write their process IDs (pids) to /var/run/ by
+default. This can be useful for starting, stopping, and monitoring the
+daemons.
+
+Since version 0.8.0, it's now possible to use a STOMP server instead of
+our kind of hacky home-grown DB-based queue solution. This is strongly
+recommended for best response time, especially when using XMPP.
+
+See the "queues" config section below for how to configure to use STOMP.
+As of this writing, the software has been tested with ActiveMQ 5.3.
+
+Themes
+------
+
+Older themes (version 0.9.x and below) no longer work with StatusNet
+1.0.x, due to major changes in the site layout. We ship with three new
+themes for this version, 'neo', 'neo-blue' and 'neo-light'.
+
+As of right now, your ability to change the theme is site-wide; users
+can't choose their own theme. Additionally, the only thing you can
+change in the theme is CSS stylesheets and some image files; you can't
+change the HTML output, like adding or removing menu items.
+
+You can choose a theme using the $config['site']['theme'] element in
+the config.php file. See below for details.
+
+You can add your own theme by making a sub-directory of the 'theme'
+subdirectory with the name of your theme. Each theme can have the
+following files:
+
+display.css: a CSS2 file for "default" styling for all browsers.
+ie6.css: a CSS2 file for override styling for fixing up Internet
+    Explorer 6.
+ie7.css: a CSS2 file for override styling for fixing up Internet
+    Explorer 7.
+logo.png: a logo image for the site.
+default-avatar-profile.png: a 96x96 pixel image to use as the avatar for
+    users who don't upload their own.
+default-avatar-stream.png: Ditto, but 48x48. For streams of notices.
+default-avatar-mini.png: Ditto ditto, but 24x24. For subscriptions
+    listing on profile pages.
+
+You may want to start by copying the files from the default theme to
+your own directory.
+
+Translation
+-----------
+
+Translations in StatusNet 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 StatusNet are very easy:
+you can use the Web interface at translatewiki.net 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.
+
+For info on helping with translations, see http://status.net/wiki/Translations
+
+Backups
+-------
+
+There is no built-in system for doing backups in StatusNet. You can make
+backups of a working StatusNet system by backing up the database and
+the Web directory. To backup the database use mysqldump <http://ur1.ca/7xo>
+and to backup the Web directory, try tar.
+
+Private
+-------
+
+The administrator can set the "private" flag for a site so that it's
+not visible to non-logged-in users. (This is the default for new installs of version 1.0!)
+
+This might be useful for workgroups who want to share a social
+networking site for project management, but host it on a public
+server.
+
+Total privacy is attempted but not guaranteed or ensured. Private sites
+currently don't work well with OStatus federation.
+
+Access to file attachments can also be restricted to logged-in users only.
+
+1. Add a directory outside the web root where your file uploads will be
+   stored. Usually a command like this will work:
+
+       mkdir /var/www/statusnet-files
+
+2. Make the file uploads directory writeable by the web server. An
+   insecure way to do this is:
+
+       chmod a+x /var/www/statusnet-files
+
+3. Tell StatusNet to use this directory for file uploads. Add a line
+   like this to your config.php:
+
+       $config['attachments']['dir'] = '/var/www/statusnet-files';
diff --git a/PLUGINS.txt b/PLUGINS.txt
new file mode 100644
index 0000000000..79533b96de
--- /dev/null
+++ b/PLUGINS.txt
@@ -0,0 +1,44 @@
+Plugins
+=======
+
+Beginning with the 0.7.x branch, StatusNet has supported a simple but
+powerful plugin architecture. Important events in the code are named,
+like 'StartNoticeSave', and other software can register interest
+in those events. When the events happen, the other software is called
+and has a choice of accepting or rejecting the events.
+
+In the simplest case, you can add a function to config.php and use the
+Event::addHandler() function to hook an event:
+
+    function AddGoogleLink($action)
+    {
+        $action->menuItem('http://www.google.com/', _('Google'), _('Search engine'));
+        return true;
+    }
+
+    Event::addHandler('EndPrimaryNav', 'AddGoogleLink');
+
+This adds a menu item to the end of the main navigation menu. You can
+see the list of existing events, and parameters that handlers must
+implement, in EVENTS.txt.
+
+The Plugin class in lib/plugin.php makes it easier to write more
+complex plugins. Sub-classes can just create methods named
+'onEventName', where 'EventName' is the name of the event (case
+matters!). These methods will be automatically registered as event
+handlers by the Plugin constructor (which you must call from your own
+class's constructor).
+
+Several example plugins are included in the plugins/ directory. You
+can enable a plugin with the following line in config.php:
+
+    addPlugin('Example', array('param1' => 'value1',
+                               'param2' => 'value2'));
+
+This will look for and load files named 'ExamplePlugin.php' or
+'Example/ExamplePlugin.php' either in the plugins/ directory (for
+plugins that ship with StatusNet) or in the local/ directory (for
+plugins you write yourself or that you get from somewhere else) or
+local/plugins/.
+
+Plugins are documented in their own directories.
diff --git a/README b/README
index 74ef138a2a..3999bffbce 100644
--- a/README
+++ b/README
@@ -2,24 +2,35 @@
 README
 ------
 
-StatusNet 0.9.7 "World Leader Pretend"
-17 March 2011
+StatusNet 1.1.1
+16 July 2013
 
-This is the README file for StatusNet, the Open Source microblogging
-platform. It includes installation instructions, descriptions of
-options you can set, warnings, tips, and general info for
-administrators. Information on using StatusNet can be found in the
-"doc" subdirectory or in the "help" section on-line.
+This is the README file for StatusNet, the Open Source social
+networking platform. It includes general information about the
+software and the project.
+
+Some other files to review:
+
+- INSTALL: instructions on how to install the software.
+- UPGRADE: upgrading from earlier versions
+- CONFIGURE: configuration options in gruesome detail.
+- PLUGINS.txt: how to install and configure plugins.
+- EVENTS.txt: events supported by the plugin system
+- COPYING: full text of the software license
+
+Information on using StatusNet can be found in the "doc" subdirectory
+or in the "help" section on-line.
 
 About
 =====
 
-StatusNet is a Free and Open Source microblogging platform. It helps
-people in a community, company or group to exchange short (140
-characters, by default) 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,
-Google Buzz, or Yammer.
+StatusNet is a Free and Open Source social networking platform. It
+helps people in a community, company or group to exchange short status
+updates, do polls, announce events, or other social activities (and
+you can add more!). 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, Google+, Facebook or
+Yammer, but is much more awesome.
 
 With a little work, status messages can be sent to mobile phones,
 instant messenger programs (GTalk/Jabber), and specially-designed
@@ -96,1590 +107,19 @@ for additional terms.
 New this version
 ================
 
-This is a security, bug and feature release since version 0.9.6 released on
-23 October 2010.
+This is a security fix and bug fix release since 1.1.0,
+released 2 July 2012. All 1.1.0 sites should upgrade to this version.
 
-For best compatibility with client software and site federation, and a
-lot of bug fixes, it is highly recommended that all public sites
-upgrade to the new version. Upgrades require new database indexes for
-best performance; see Upgrade below.
+It includes the following changes:
 
-Notable changes this version:
+- Fixes for SQL injection errors in profile lists.
+- Improved ActivityStreams JSON representation of activities and objects.
+- Upgrade to the Twitter 1.1 API.
+- More robust handling of errors in distribution.
+- Fix error in OStatus subscription for remote groups.
+- Fix error in XMPP distribution.
 
-- GroupPrivateMessage plugin lets users send private messages
-  to a group. (Similar to "private groups" on Yammer.)
-- Support for Twitter streaming API in Twitter bridge plugin
-- Support for a new Activity Streams-based API using AtomPub, allowing
-  richer API data. See http://status.net/wiki/AtomPub for details.
-- Unified Facebook plugin, replacing previous Facebook application
-  and Facebook Connect plugin.
-- A plugin to send out a daily summary email to network users.
-- In-line thumbnails of some attachments (video, images) and oEmbed objects.
-- Local copies of remote profiles to let moderators manage OStatus users.
-- Upgrade upstream JS, minify everything.
-- Allow pushing plugin JS, CSS, and static files to a CDN.
-- Configurable nickname rules.
-- Better support for bit.ly URL shortener.
-- InProcessCache plugin for additional caching on top of memcached.
-- Support for Activity Streams JSON feeds on many streams.
-- User-initiated backup and restore of account data in Activity Streams
-  format.
-- Bookmark plugin for making del.icio.us-like social bookmarking sites,
-  including del.icio.us backup file import. Supports OStatus.
-- SQLProfile plugin to tune SQL queries.
-- Better sorting on timelines to support restored or imported data.
-- Hundreds of translations from http://translatewiki.net/
-- Hundreds of performance tunings, bug fixes, and UI improvements.
-- Remove deprecated data from Activity Streams Atom output, to the
-  extent possible.
-- NewMenu plugin for new layout of menu items.
-- Experimental support for moving an account from one server to
-  another, using new AtomPub API.
-
-A full changelog is available at http://status.net/wiki/StatusNet_0.9.7.
-
-Prerequisites
-=============
-
-The following software packages are *required* for this software to
-run correctly.
-
-- PHP 5.2.3+. It may be possible to run this software on earlier
-  versions of PHP, but many of the functions used are only available
-  in PHP 5.2 or above. 5.2.6 or later is needed for XMPP background
-  daemons on 64-bit platforms. PHP 5.3.x should work correctly in this
-  release, but problems with some plugins are possible.
-- MySQL 5.x. The StatusNet database is stored, by default, in a MySQL
-  server. It has been primarily tested on 5.x servers, although it may
-  be possible to install on earlier (or later!) versions. The server
-  *must* support the MyISAM storage engine -- the default for most
-  MySQL servers -- *and* the InnoDB storage engine.
-- A Web server. Preferably, you should have Apache 2.2.x with the
-  mod_rewrite extension installed and enabled.
-
-Your PHP installation must include the following PHP extensions:
-
-- Curl. This is for fetching files by HTTP.
-- XMLWriter. This is for formatting XML and HTML output.
-- MySQL. For accessing the database.
-- GD. For scaling down avatar images.
-- mbstring. For handling Unicode (UTF-8) encoded strings.
-
-For some functionality, you will also need the following extensions:
-
-- Memcache. A client for the memcached server, which caches database
-  information in volatile memory. This is important for adequate
-  performance on high-traffic sites. You will also need a memcached
-  server to store the data in.
-- Mailparse. Efficient parsing of email requires this extension.
-  Submission by email or SMS-over-email uses this extension.
-- Sphinx Search. A client for the sphinx server, an alternative
-  to MySQL or Postgresql fulltext search. You will also need a
-  Sphinx server to serve the search queries.
-- bcmath or gmp. For Salmon signatures (part of OStatus). Needed
-  if you have OStatus configured.
-- gettext. For multiple languages. Default on many PHP installs;
-  will be emulated if not present.
-
-You will almost definitely get 2-3 times better performance from your
-site if you install a PHP bytecode cache/accelerator. Some well-known
-examples are: eaccelerator, Turck mmcache, xcache, apc. Zend Optimizer
-is a proprietary accelerator installed on some hosting sites.
-
-External libraries
-------------------
-
-A number of external PHP libraries are used to provide basic
-functionality and optional functionality for your system. For your
-convenience, they are available in the "extlib" directory of this
-package, and you do not have to download and install them. However,
-you may want to keep them up-to-date with the latest upstream version,
-and the URLs are listed here for your convenience.
-
-- DB_DataObject http://pear.php.net/package/DB_DataObject
-- Validate http://pear.php.net/package/Validate
-- OpenID from OpenIDEnabled (not the PEAR version!). We decided
-  to use the openidenabled.com version since it's more widely
-  implemented, and seems to be better supported.
-  http://openidenabled.com/php-openid/
-- PEAR DB. Although this is an older data access system (new
-  packages should probably use PHP DBO), the OpenID libraries
-  depend on PEAR DB so we use it here, too. DB_DataObject can
-  also use PEAR MDB2, which may give you better performance
-  but won't work with OpenID.
-  http://pear.php.net/package/DB
-- OAuth.php from http://oauth.googlecode.com/svn/code/php/
-- markdown.php from http://michelf.com/projects/php-markdown/
-- PEAR Mail, for sending out mail notifications
-  http://pear.php.net/package/Mail
-- PEAR Net_SMTP, if you use the SMTP factory for notifications
-  http://pear.php.net/package/Net_SMTP
-- PEAR Net_Socket, if you use the SMTP factory for notifications
-  http://pear.php.net/package/Net_Socket
-- XMPPHP, the follow-up to Class.Jabber.php. Probably the best XMPP
-  library available for PHP. http://xmpphp.googlecode.com/. Note that
-  as of this writing the version of this library that is available in
-  the extlib directory is *significantly different* from the upstream
-  version (patches have been submitted). Upgrading to the upstream
-  version may render your StatusNet site unable to send or receive XMPP
-  messages.
-- Facebook library. Used for the Facebook application.
-- PEAR Validate is used for URL and email validation.
-- Console_GetOpt for parsing command-line options.
-- libomb. a library for implementing OpenMicroBlogging 0.1, the
-  predecessor to OStatus.
-- HTTP_Request2, a library for making HTTP requests.
-- PEAR Net_URL2 is an HTTP_Request2 dependency.
-
-A design goal of StatusNet is that the basic Web functionality should
-work on even the most restrictive commercial hosting services.
-However, additional functionality, such as receiving messages by
-Jabber/GTalk, require that you be able to run long-running processes
-on your account. In addition, posting by email or from SMS require
-that you be able to install a mail filter in your mail server.
-
-Installation
-============
-
-Installing the basic StatusNet Web component is relatively easy,
-especially if you've previously installed PHP/MySQL packages.
-
-1. Unpack the tarball you downloaded on your Web server. Usually a
-   command like this will work:
-
-       tar zxf statusnet-0.9.7.tar.gz
-
-   ...which will make a statusnet-0.9.7 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.)
-
-2. Move the tarball to a directory of your choosing in your Web root
-   directory. Usually something like this will work:
-
-       mv statusnet-0.9.7 /var/www/statusnet
-
-   This will make your StatusNet instance available in the statusnet path of
-   your server, like "http://example.net/statusnet". "microblog" or
-   "statusnet" might also be good path names. If you know how to
-   configure virtual hosts on your web server, you can try setting up
-   "http://micro.example.net/" or the like.
-
-3. Make your target directory writeable by the Web server.
-
-       chmod a+w /var/www/statusnet/
-
-   On some systems, this will probably work:
-
-       chgrp www-data /var/www/statusnet/
-       chmod g+w /var/www/statusnet/
-
-   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 "statusnet" and add the Web server's user to the group.
-
-4. You should also take this moment to make your avatar, background, and
-   file subdirectories writeable by the Web server. An insecure way to do
-   this is:
-
-       chmod a+w /var/www/statusnet/avatar
-       chmod a+w /var/www/statusnet/background
-       chmod a+w /var/www/statusnet/file
-
-   You can also make the avatar, background, and file directories
-   writeable by the Web server group, as noted above.
-
-5. Create a database to hold your microblog data. Something like this
-   should work:
-
-       mysqladmin -u "username" --password="password" create statusnet
-
-   Note that StatusNet must have its own database; you can't share the
-   database with another program. You can name it whatever you want,
-   though.
-
-   (If you don't have shell access to your server, you may need to use
-   a tool like PHPAdmin to create a database. Check your hosting
-   service's documentation for how to create a new MySQL database.)
-
-6. Create a new database account that StatusNet will use to access the
-   database. If you have shell access, this will probably work from the
-   MySQL shell:
-
-       GRANT ALL on statusnet.*
-       TO 'statusnetuser'@'localhost'
-       IDENTIFIED BY 'statusnetpassword';
-
-   You should change 'statusnetuser' and 'statusnetpassword' to your preferred new
-   username and password. You may want to test logging in to MySQL as
-   this new user.
-
-7. In a browser, navigate to the StatusNet install script; something like:
-
-       http://yourserver.example.com/statusnet/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, StatusNet 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/statusnet/index.php/statusnet/fred
-
-On certain systems that don't support this kind of syntax, they'll
-look like this:
-
-    http://example.org/statusnet/index.php?p=statusnet/fred
-
-It's possible to configure the software so it looks like this instead:
-
-    http://example.org/statusnet/fred
-
-These "fancy URLs" are more readable and memorable for users. To use
-fancy URLs, you must either have Apache 2.x with .htaccess enabled and
-mod_rewrite enabled, -OR- know how to configure "url redirection" in
-your server.
-
-1. Copy the htaccess.sample file to .htaccess in your StatusNet
-   directory. Note: if you have control of your server's httpd.conf or
-   similar configuration files, it can greatly improve performance to
-   import the .htaccess file into your conf file instead. If you're
-   not sure how to do it, you may save yourself a lot of headache by
-   just leaving the .htaccess file.
-
-2. Change the "RewriteBase" in the new .htaccess file to be the URL path
-   to your StatusNet installation on your server. Typically this will
-   be the path to your StatusNet directory relative to your Web root.
-
-3. Add or uncomment or change a line in your config.php file so it says:
-
-       $config['site']['fancy'] = true;
-
-You should now be able to navigate to a "fancy" URL on your server,
-like:
-
-    http://example.net/statusnet/main/register
-
-If you changed your HTTP server configuration, you may need to restart
-the server first.
-
-If it doesn't work, double-check that AllowOverride for the StatusNet
-directory is 'All' in your Apache configuration file. This is usually
-/etc/httpd.conf, /etc/apache/httpd.conf, or (on Debian and Ubuntu)
-/etc/apache2/sites-available/default. See the Apache documentation for
-.htaccess files for more details:
-
-    http://httpd.apache.org/docs/2.2/howto/htaccess.html
-
-Also, check that mod_rewrite is installed and enabled:
-
-    http://httpd.apache.org/docs/2.2/mod/mod_rewrite.html
-
-Sphinx
-------
-
-To use a Sphinx server to search users and notices, you'll need to
-enable the SphinxSearch plugin. Add to your config.php:
-
-    addPlugin('SphinxSearch');
-    $config['sphinx']['server'] = 'searchhost.local';
-
-You also need to install, compile and enable the sphinx pecl extension for
-php on the client side, which itself depends on the sphinx development files.
-
-See plugins/SphinxSearch/README for more details and server setup.
-
-SMS
----
-
-StatusNet supports a cheap-and-dirty system for sending update messages
-to mobile phones and for receiving updates from the mobile. Instead of
-sending through the SMS network itself, which is costly and requires
-buy-in from the wireless carriers, it simply piggybacks on the email
-gateways that many carriers provide to their customers. So, SMS
-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 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.
-
-1. Run the SQL script carrier.sql in your StatusNet database. This will
-   usually work:
-
-       mysql -u "statusnetuser" --password="statusnetpassword" statusnet < db/carrier.sql
-
-   This will populate your database with a list of wireless carriers
-   that support email SMS gateways.
-
-2. Make sure the maildaemon.php file is executable:
-
-       chmod +x scripts/maildaemon.php
-
-   Note that "daemon" is kind of a misnomer here; the script is more
-   of a filter than a daemon.
-
-2. Edit /etc/aliases on your mail server and add the following line:
-
-       *: /path/to/statusnet/scripts/maildaemon.php
-
-3. Run whatever code you need to to update your aliases database. For
-   many mail servers (Postfix, Exim, Sendmail), this should work:
-
-       newaliases
-
-   You may need to restart your mail server for the new database to
-   take effect.
-
-4. Set the following in your config.php file:
-
-       $config['mail']['domain'] = 'yourdomain.example.net';
-
-At this point, post-by-email and post-by-SMS-gateway should work. Note
-that if your mail server is on a different computer from your email
-server, you'll need to have a full installation of StatusNet, a working
-config.php, and access to the StatusNet database from the mail server.
-
-XMPP
-----
-
-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
-well.
-
-1. You may want to strongly consider setting up your own XMPP server.
-   Ejabberd, OpenFire, and JabberD are all Open Source servers.
-   Jabber, Inc. provides a high-performance commercial server.
-
-2. You must register a Jabber ID (JID) with your new server. It helps
-   to choose a name like "update@example.com" or "notice" or something
-   similar.  Alternately, your "update JID" can be registered on a
-   publicly-available XMPP service, like jabber.org or GTalk.
-
-   StatusNet will not register the JID with your chosen XMPP server;
-   you need to do this manually, with an XMPP client like Gajim,
-   Telepathy, or Pidgin.im.
-
-3. Configure your site's XMPP variables, as described below in the
-   configuration section.
-
-On a default installation, your site can broadcast messages using
-XMPP. Users won't be able to post messages using XMPP unless you've
-got the XMPP daemon running.  See 'Queues and daemons' below for how
-to set that up. Also, once you have a sizable number of users, sending
-a lot of SMS, OMB, and XMPP messages whenever someone posts a message
-can really slow down your site; it may cause posting to timeout.
-
-NOTE: stream_select(), a crucial function for network programming, is
-broken on PHP 5.2.x less than 5.2.6 on amd64-based servers. We don't
-work around this bug in StatusNet; current recommendation is to move
-off of amd64 to another server.
-
-Public feed
------------
-
-You can send *all* messages from your microblogging site to a
-third-party service using XMPP. This can be useful for providing
-search, indexing, bridging, or other cool services.
-
-To configure a downstream site to receive your public stream, add
-their "JID" (Jabber ID) to your config.php as follows:
-
-    $config['xmpp']['public'][] = 'downstream@example.net';
-
-(Don't miss those square brackets at the end.) Note that your XMPP
-broadcasting must be configured as mentioned above. Although you can
-send out messages at "Web time", high-volume sites should strongly
-consider setting up queues and daemons.
-
-Queues and daemons
-------------------
-
-Some activities that StatusNet needs to do, like broadcast OStatus, SMS,
-and XMPP messages, can be 'queued' and done by off-line bots instead.
-For this to work, you must be able to run long-running offline
-processes, either on your main Web server or on another server you
-control. (Your other server will still need all the above
-prerequisites, with the exception of Apache.) Installing on a separate
-server is probably a good idea for high-volume sites.
-
-1. You'll need the "CLI" (command-line interface) version of PHP
-   installed on whatever server you use.
-
-2. If you're using a separate server for queues, install StatusNet
-   somewhere on the server. You don't need to worry about the
-   .htaccess file, but make sure that your config.php file is close
-   to, or identical to, your Web server's version.
-
-3. In your config.php files (both the Web server and the queues
-   server!), set the following variable:
-
-       $config['queue']['enabled'] = true;
-
-   You may also want to look at the 'daemon' section of this file for
-   more daemon options. Note that if you set the 'user' and/or 'group'
-   options, you'll need to create that user and/or group by hand.
-   They're not created automatically.
-
-4. On the queues server, run the command scripts/startdaemons.sh.
-
-This will run the queue handlers:
-
-* queuedaemon.php - polls for queued items for inbox processing and
-  pushing out to OStatus, SMS, XMPP, etc.
-* xmppdaemon.php - listens for new XMPP messages from users and stores
-  them as notices in the database; also pulls queued XMPP output from
-  queuedaemon.php to push out to clients.
-
-These two daemons will automatically restart in most cases of failure
-including memory leaks (if a memory_limit is set), but may still die
-or behave oddly if they lose connections to the XMPP or queue servers.
-
-Additional daemons may be also started by this script for certain
-plugins, such as the Twitter bridge.
-
-It may be a good idea to use a daemon-monitoring service, like 'monit',
-to check their status and keep them running.
-
-All the daemons write their process IDs (pids) to /var/run/ by
-default. This can be useful for starting, stopping, and monitoring the
-daemons.
-
-Since version 0.8.0, it's now possible to use a STOMP server instead of
-our kind of hacky home-grown DB-based queue solution. This is strongly
-recommended for best response time, especially when using XMPP.
-
-See the "queues" config section below for how to configure to use STOMP.
-As of this writing, the software has been tested with ActiveMQ 5.3.
-
-Themes
-------
-
-There are two themes shipped with this version of StatusNet: "identica",
-which is what the Identi.ca site uses, and "default", which is a good
-basis for other sites.
-
-As of right now, your ability to change the theme is site-wide; users
-can't choose their own theme. Additionally, the only thing you can
-change in the theme is CSS stylesheets and some image files; you can't
-change the HTML output, like adding or removing menu items.
-
-You can choose a theme using the $config['site']['theme'] element in
-the config.php file. See below for details.
-
-You can add your own theme by making a sub-directory of the 'theme'
-subdirectory with the name of your theme. Each theme can have the
-following files:
-
-display.css: a CSS2 file for "default" styling for all browsers.
-ie6.css: a CSS2 file for override styling for fixing up Internet
-    Explorer 6.
-ie7.css: a CSS2 file for override styling for fixing up Internet
-    Explorer 7.
-logo.png: a logo image for the site.
-default-avatar-profile.png: a 96x96 pixel image to use as the avatar for
-    users who don't upload their own.
-default-avatar-stream.png: Ditto, but 48x48. For streams of notices.
-default-avatar-mini.png: Ditto ditto, but 24x24. For subscriptions
-    listing on profile pages.
-
-You may want to start by copying the files from the default theme to
-your own directory.
-
-NOTE: the HTML generated by StatusNet 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 StatusNet 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 StatusNet are very easy:
-you can use the Web interface at translatewiki.net 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.
-
-For info on helping with translations, see http://status.net/wiki/Translations
-
-Backups
--------
-
-There is no built-in system for doing backups in StatusNet. You can make
-backups of a working StatusNet system by backing up the database and
-the Web directory. To backup the database use mysqldump <http://ur1.ca/7xo>
-and to backup the Web directory, try tar.
-
-Private
--------
-
-The administrator can set the "private" flag for a site so that it's
-not visible to non-logged-in users. This might be useful for
-workgroups who want to share a microblogging site for project
-management, but host it on a public server.
-
-Total privacy is not guaranteed or ensured. Also, privacy is
-all-or-nothing for a site; you can't have some accounts or notices
-private, and others public. The interaction of private sites
-with OStatus is undefined.
-
-Access to file attachments can also be restricted to logged-in users only.
-1. Add a directory outside the web root where your file uploads will be
-   stored. Usually a command like this will work:
-
-       mkdir /var/www/statusnet-files
-
-2. Make the file uploads directory writeable by the web server. An
-   insecure way to do this is:
-
-       chmod a+x /var/www/statusnet-files
-
-3. Tell StatusNet to use this directory for file uploads. Add a line
-   like this to your config.php:
-
-       $config['attachments']['dir'] = '/var/www/statusnet-files';
-
-Upgrading
-=========
-
-IMPORTANT NOTE: StatusNet 0.7.4 introduced a fix for some
-incorrectly-stored international characters ("UTF-8"). For new
-installations, it will now store non-ASCII characters correctly.
-However, older installations will have the incorrect storage, and will
-consequently show up "wrong" in browsers. See below for how to deal
-with this situation.
-
-If you've been using StatusNet 0.7, 0.6, 0.5 or lower, or if you've
-been tracking the "git" version of the software, you will probably
-want to upgrade and keep your existing data. There is no automated
-upgrade procedure in StatusNet 0.9.7. Try these step-by-step
-instructions; read to the end first before trying them.
-
-0. Download StatusNet and set up all the prerequisites as if you were
-   doing a new install.
-1. Make backups of both your database and your Web directory. UNDER NO
-   CIRCUMSTANCES should you try to do an upgrade without a known-good
-   backup. You have been warned.
-2. Shut down Web access to your site, either by turning off your Web
-   server or by redirecting all pages to a "sorry, under maintenance"
-   page.
-3. Shut down XMPP access to your site, typically by shutting down the
-   xmppdaemon.php process and all other daemons that you're running.
-   If you've got "monit" or "cron" automatically restarting your
-   daemons, make sure to turn that off, too.
-4. Shut down SMS and email access to your site. The easy way to do
-   this is to comment out the line piping incoming email to your
-   maildaemon.php file, and running something like "newaliases".
-5. Once all writing processes to your site are turned off, make a
-   final backup of the Web directory and database.
-6. Move your StatusNet directory to a backup spot, like "statusnet.bak".
-7. Unpack your StatusNet 0.9.7 tarball and move it to "statusnet" or
-   wherever your code used to be.
-8. Copy the config.php file and the contents of the avatar/, background/,
-   file/, and local/ subdirectories from your old directory to your new
-   directory.
-9. Copy htaccess.sample to .htaccess in the new directory. Change the
-   RewriteBase to use the correct path.
-10. Rebuild the database.
-
-    NOTE: this step is destructive and cannot be
-    reversed. YOU CAN EASILY DESTROY YOUR SITE WITH THIS STEP. Don't
-    do it without a known-good backup!
-
-    If your database is at version 0.8.0 or higher in the 0.8.x line, you can run a
-    special upgrade script:
-
-        mysql -u<rootuser> -p<rootpassword> <database> db/08to09.sql
-
-    If you are upgrading from any 0.9.x version like 0.9.6, run this script:
-
-        mysql -u<rootuser> -p<rootpassword> <database> db/096to097.sql
-
-    Despite the name, it should work for any 0.9.x branch.
-
-    Otherwise, go to your StatusNet directory and AFTER YOU MAKE A
-    BACKUP run the rebuilddb.sh script like this:
-
-        ./scripts/rebuilddb.sh rootuser rootpassword database db/statusnet.sql
-
-    Here, rootuser and rootpassword are the username and password for a
-    user who can drop and create databases as well as tables; typically
-    that's _not_ the user StatusNet runs as. Note that rebuilddb.sh drops
-    your database and rebuilds it; if there is an error you have no
-    database. Make sure you have a backup.
-    For PostgreSQL databases there is an equivalent, rebuilddb_psql.sh,
-    which operates slightly differently. Read the documentation in that
-    script before running it.
-11. Use mysql or psql client to log into your database and make sure that
-    the notice, user, profile, subscription etc. tables are non-empty.
-12. Turn back on the Web server, and check that things still work.
-13. Turn back on XMPP bots and email maildaemon. Note that the XMPP
-    bots have changed since version 0.5; see above for details.
-
-If you're upgrading from very old versions, you may want to look at
-the fixup_* scripts in the scripts directories. These will store some
-precooked data in the DB. All upgraders should check out the inboxes
-options below.
-
-NOTE: the database definition file, laconica.ini, has been renamed to
-statusnet.ini (since this is the recommended database name). If you
-have a line in your config.php pointing to the old name, you'll need
-to update it.
-
-NOTE: the 1.0.0 version of StatusNet changed the URLs for all admin
-panels from /admin/* to /panel/*. This now allows the (popular)
-username 'admin', but blocks the considerably less popular username
-'panel'. If you have an existing user named 'panel', you should rename
-them before upgrading.
-
-Notice inboxes
---------------
-
-Notice inboxes are now required. If you don't have inboxes enabled,
-StatusNet will no longer run.
-
-UTF-8 Database
---------------
-
-StatusNet 0.7.4 introduced a fix for some incorrectly-stored
-international characters ("UTF-8"). This fix is not
-backwards-compatible; installations from before 0.7.4 will show
-non-ASCII characters of old notices incorrectly. This section explains
-what to do.
-
-0. You can disable the new behaviour by setting the 'db''utf8' config
-   option to "false". You should only do this until you're ready to
-   convert your DB to the new format.
-1. When you're ready to convert, you can run the fixup_utf8.php script
-   in the scripts/ subdirectory. If you've had the "new behaviour"
-   enabled (probably a good idea), you can give the ID of the first
-   "new" notice as a parameter, and only notices before that one will
-   be converted. Notices are converted in reverse chronological order,
-   so the most recent (and visible) ones will be converted first. The
-   script should work whether or not you have the 'db''utf8' config
-   option enabled.
-2. When you're ready, set $config['db']['utf8'] to true, so that
-   new notices will be stored correctly.
-
-Configuration options
-=====================
-
-The main configuration file for StatusNet (excepting configurations for
-dependency software) is config.php in your StatusNet directory. If you
-edit any other file in the directory, like lib/default.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.9.0, a Web based configuration panel has been
-added to StatusNet. The preferred method for changing config options is
-to use this panel.
-
-A command-line script, setconfig.php, can be used to set individual
-configuration options. It's in the scripts/ directory.
-
-Starting with version 0.7.1, you can put config files in the
-/etc/statusnet/ directory on your server, if it exists. Config files
-will be included in this order:
-
-* /etc/statusnet/statusnet.php - server-wide config
-* /etc/statusnet/<servername>.php - for a virtual host
-* /etc/statusnet/<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:
-
-    $config['section']['option'] = value;
-
-For brevity, the following documentation describes each section and
-option.
-
-site
-----
-
-This section is a catch-all for site-wide variables.
-
-name: the name of your site, like 'YourCompany Microblog'.
-server: the server part of your site's URLs, like 'example.net'.
-path: The path part of your site's URLs, like 'statusnet' or ''
-    (installed in root).
-fancy: whether or not your site uses fancy URLs (see Fancy URLs
-    section above). Default is false.
-logfile: full path to a file for StatusNet to save logging
-    information to. You may want to use this if you don't have
-    access to syslog.
-logdebug: whether to log additional debug info like backtraces on
-    hard errors. Default false.
-locale_path: full path to the directory for locale data. Unless you
-    store all your locale data in one place, you probably
-    don't need to use this.
-language: default language for your site. Defaults to US English.
-    Note that this is overridden if a user is logged in and has
-    selected a different language. It is also overridden if the
-    user is NOT logged in, but their browser requests a different
-    langauge. Since pretty much everybody's browser requests a
-    language, that means that changing this setting has little or
-    no effect in practice.
-languages: A list of languages supported on your site. Typically you'd
-    only change this if you wanted to disable support for one
-    or another language:
-    "unset($config['site']['languages']['de'])" will disable
-    support for German.
-theme: Theme for your site (see Theme section). Two themes are
-    provided by default: 'default' and 'stoica' (the one used by
-    Identi.ca). It's appreciated if you don't use the 'stoica' theme
-    except as the basis for your own.
-email: contact email address for your site. By default, it's extracted
-    from your Web server environment; you may want to customize it.
-broughtbyurl: name of an organization or individual who provides the
-    service. Each page will include a link to this name in the
-    footer. A good way to link to the blog, forum, wiki,
-    corporate portal, or whoever is making the service available.
-broughtby: text used for the "brought by" link.
-timezone: default timezone for message display. Users can set their
-    own time zone. Defaults to 'UTC', which is a pretty good default.
-closed: If set to 'true', will disallow registration on your site.
-    This is a cheap way to restrict accounts to only one
-    individual or group; just register the accounts you want on
-    the service, *then* set this variable to 'true'.
-inviteonly: If set to 'true', will only allow registration if the user
-    was invited by an existing user.
-private: If set to 'true', anonymous users will be redirected to the
-    'login' page. Also, API methods that normally require no
-    authentication will require it. Note that this does not turn
-    off registration; use 'closed' or 'inviteonly' for the
-    behaviour you want.
-notice: A plain string that will appear on every page. A good place
-    to put introductory information about your service, or info about
-    upgrades and outages, or other community info. Any HTML will
-    be escaped.
-logo: URL of an image file to use as the logo for the site. Overrides
-    the logo in the theme, if any.
-ssllogo: URL of an image file to use as the logo on SSL pages. If unset,
-    theme logo is used instead.
-ssl: Whether to use SSL and https:// URLs for some or all pages.
-    Possible values are 'always' (use it for all pages), 'never'
-    (don't use it for any pages), or 'sometimes' (use it for
-    sensitive pages that include passwords like login and registration,
-    but not for regular pages). Default to 'never'.
-sslserver: use an alternate server name for SSL URLs, like
-    'secure.example.org'. You should be careful to set cookie
-    parameters correctly so that both the SSL server and the
-    "normal" server can access the session cookie and
-    preferably other cookies as well.
-shorturllength: ignored. See 'url' section below.
-dupelimit: minimum time allowed for one person to say the same thing
-    twice. Default 60s. Anything lower is considered a user
-    or UI error.
-textlimit: default max size for texts in the site. Defaults to 140.
-    0 means no limit. Can be fine-tuned for notices, messages,
-    profile bios and group descriptions.
-
-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
-set are listed below for clarity.
-
-database: a DSN (Data Source Name) for your StatusNet database. This is
-    in the format 'protocol://username:password@hostname/databasename',
-    where 'protocol' is 'mysql' or 'mysqli' (or possibly 'postgresql', if you
-    really know what you're doing), 'username' is the username,
-    'password' is the password, and etc.
-ini_yourdbname: if your database is not named 'statusnet', you'll need
-    to set this to point to the location of the
-    statusnet.ini file. Note that the real name of your database
-    should go in there, not literally 'yourdbname'.
-db_driver: You can try changing this to 'MDB2' to use the other driver
-    type for DB_DataObject, but note that it breaks the OpenID
-    libraries, which only support PEAR::DB.
-debug: On a database error, you may get a message saying to set this
-    value to 5 to see debug messages in the browser. This breaks
-    just about all pages, and will also expose the username and
-    password
-quote_identifiers: Set this to true if you're using postgresql.
-type: either 'mysql' or 'postgresql' (used for some bits of
-    database-type-specific SQL in the code). Defaults to mysql.
-mirror: you can set this to an array of DSNs, like the above
-    'database' value. If it's set, certain read-only actions will
-    use a random value out of this array for the database, rather
-    than the one in 'database' (actually, 'database' is overwritten).
-    You can offload a busy DB server by setting up MySQL replication
-    and adding the slaves to this array. Note that if you want some
-    requests to go to the 'database' (master) server, you'll need
-    to include it in this array, too.
-utf8: whether to talk to the database in UTF-8 mode. This is the default
-    with new installations, but older sites may want to turn it off
-    until they get their databases fixed up. See "UTF-8 database"
-    above for details.
-schemacheck: when to let plugins check the database schema to add
-    tables or update them. Values can be 'runtime' (default)
-    or 'script'. 'runtime' can be costly (plugins check the
-    schema on every hit, adding potentially several db
-    queries, some quite long), but not everyone knows how to
-    run a script. If you can, set this to 'script' and run
-    scripts/checkschema.php whenever you install or upgrade a
-    plugin.
-
-syslog
-------
-
-By default, StatusNet sites log error messages to the syslog facility.
-(You can override this using the 'logfile' parameter described above).
-
-appname: The name that StatusNet uses to log messages. By default it's
-    "statusnet", but if you have more than one installation on the
-    server, you may want to change the name for each instance so
-    you can track log messages more easily.
-priority: level to log at. Currently ignored.
-facility: what syslog facility to used. Defaults to LOG_USER, only
-    reset if you know what syslog is and have a good reason
-    to change it.
-
-queue
------
-
-You can configure the software to queue time-consuming tasks, like
-sending out SMS email or XMPP messages, for off-line processing. See
-'Queues and daemons' above for how to set this up.
-
-enabled: Whether to uses queues. Defaults to false.
-subsystem: Which kind of queueserver to use. Values include "db" for
-    our hacked-together database queuing (no other server
-    required) and "stomp" for a stomp server.
-stomp_server: "broker URI" for stomp server. Something like
-    "tcp://hostname:61613". More complicated ones are
-    possible; see your stomp server's documentation for
-    details.
-queue_basename: a root name to use for queues (stomp only). Typically
-    something like '/queue/sitename/' makes sense. If running
-    multiple instances on the same server, make sure that
-    either this setting or $config['site']['nickname'] are
-    unique for each site to keep them separate.
-
-stomp_username: username for connecting to the stomp server; defaults
-    to null.
-stomp_password: password for connecting to the stomp server; defaults
-    to null.
-
-stomp_persistent: keep items across queue server restart, if enabled.
-    Under ActiveMQ, the server configuration determines if and how
-    persistent storage is actually saved.
-
-    If using a message queue server other than ActiveMQ, you may
-    need to disable this if it does not support persistence.
-
-stomp_transactions: use transactions to aid in error detection.
-    A broken transaction will be seen quickly, allowing a message
-    to be redelivered immediately if a daemon crashes.
-
-    If using a message queue server other than ActiveMQ, you may
-    need to disable this if it does not support transactions.
-
-stomp_acks: send acknowledgements to aid in flow control.
-    An acknowledgement of successful processing tells the server
-    we're ready for more and can help keep things moving smoothly.
-
-    This should *not* be turned off when running with ActiveMQ, but
-    if using another message queue server that does not support
-    acknowledgements you might need to disable this.
-
-softlimit: an absolute or relative "soft memory limit"; daemons will
-    restart themselves gracefully when they find they've hit
-    this amount of memory usage. Defaults to 90% of PHP's global
-    memory_limit setting.
-
-inboxes: delivery of messages to receiver's inboxes can be delayed to
-    queue time for best interactive performance on the sender.
-    This may however be annoyingly slow when using the DB queues,
-    so you can set this to false if it's causing trouble.
-
-breakout: for stomp, individual queues are by default grouped up for
-    best scalability. If some need to be run by separate daemons,
-    etc they can be manually adjusted here.
-
-        Default will share all queues for all sites within each group.
-        Specify as <group>/<queue> or <group>/<queue>/<site>,
-        using nickname identifier as site.
-
-        'main/distrib' separate "distrib" queue covering all sites
-        'xmpp/xmppout/mysite' separate "xmppout" queue covering just 'mysite'
-
-max_retries: for stomp, drop messages after N failed attempts to process.
-    Defaults to 10.
-
-dead_letter_dir: for stomp, optional directory to dump data on failed
-    queue processing events after discarding them.
-
-stomp_no_transactions: for stomp, the server does not support transactions,
-    so do not try to user them. This is needed for http://www.morbidq.com/.
-
-stomp_no_acks: for stomp, the server does not support acknowledgements.
-    so do not try to user them. This is needed for http://www.morbidq.com/.
-
-license
--------
-
-The default license to use for your users notices. The default is the
-Creative Commons Attribution 3.0 license, which is probably the right
-choice for any public site. Note that some other servers will not
-accept notices if you apply a stricter license than this.
-
-type: one of 'cc' (for Creative Commons licenses), 'allrightsreserved'
-    (default copyright), or 'private' (for private and confidential
-    information).
-owner: for 'allrightsreserved' or 'private', an assigned copyright
-    holder (for example, an employer for a private site). If
-    not specified, will be attributed to 'contributors'.
-url: URL of the license, used for links.
-title: Title for the license, like 'Creative Commons Attribution 3.0'.
-image: A button shown on each page for the license.
-
-mail
-----
-
-This is for configuring out-going email. We use PEAR's Mail module,
-see: http://pear.php.net/manual/en/package.mail.mail.factory.php
-
-backend: the backend to use for mail, one of 'mail', 'sendmail', and
-    'smtp'. Defaults to PEAR's default, 'mail'.
-params: if the mail backend requires any parameters, you can provide
-    them in an associative array.
-
-nickname
---------
-
-This is for configuring nicknames in the service.
-
-blacklist: an array of strings for usernames that may not be
-    registered. A default array exists for strings that are
-    used by StatusNet (e.g. 'doc', 'main', 'avatar', 'theme')
-    but you may want to add others if you have other software
-    installed in a subdirectory of StatusNet or if you just
-    don't want certain words used as usernames.
-featured: an array of nicknames of 'featured' users of the site.
-    Can be useful to draw attention to well-known users, or
-    interesting people, or whatever.
-
-avatar
-------
-
-For configuring avatar access.
-
-dir: Directory to look for avatar files and to put them into.
-    Defaults to avatar subdirectory of install directory; if
-    you change it, make sure to change path, too.
-path: Path to avatars. Defaults to path for avatar subdirectory,
-    but you can change it if you wish. Note that this will
-    be included with the avatar server, too.
-server: If set, defines another server where avatars are stored in the
-    root directory. Note that the 'avatar' subdir still has to be
-    writeable. You'd typically use this to split HTTP requests on
-    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.
-    Defaults to null.
-ssl: Whether to access avatars using HTTPS. Defaults to null, meaning
-    to guess based on site-wide SSL settings.
-
-public
-------
-
-For configuring the public stream.
-
-localonly: If set to true, only messages posted by users of this
-    service (rather than other services, filtered through OMB)
-    are shown in the public stream. Default true.
-blacklist: An array of IDs of users to hide from the public stream.
-    Useful if you have someone making excessive Twitterfeed posts
-    to the site, other kinds of automated posts, testing bots, etc.
-autosource: Sources of notices that are from automatic posters, and thus
-    should be kept off the public timeline. Default empty.
-
-theme
------
-
-server: Like avatars, you can speed up page loading by pointing the
-    theme file lookup to another server (virtual or real).
-    Defaults to NULL, meaning to use the site server.
-dir: Directory where theme files are stored. Used to determine
-    whether to show parts of a theme file. Defaults to the theme
-    subdirectory of the install directory.
-path: Path part of theme URLs, before the theme name. Relative to the
-    theme server. It may make sense to change this path when upgrading,
-    (using version numbers as the path) to make sure that all files are
-    reloaded by caching clients or proxies. Defaults to null,
-    which means to use the site path + '/theme'.
-ssl: Whether to use SSL for theme elements. Default is null, which means
-    guess based on site SSL settings.
-sslserver: SSL server to use when page is HTTPS-encrypted. If
-    unspecified, site ssl server and so on will be used.
-sslpath: If sslserver if defined, path to use when page is HTTPS-encrypted.
-
-javascript
-----------
-
-server: You can speed up page loading by pointing the
-    theme file lookup to another server (virtual or real).
-    Defaults to NULL, meaning to use the site server.
-path: Path part of Javascript URLs. Defaults to null,
-    which means to use the site path + '/js/'.
-ssl: Whether to use SSL for JavaScript files. Default is null, which means
-    guess based on site SSL settings.
-sslserver: SSL server to use when page is HTTPS-encrypted. If
-    unspecified, site ssl server and so on will be used.
-sslpath: If sslserver if defined, path to use when page is HTTPS-encrypted.
-bustframes: If true, all web pages will break out of framesets. If false,
-	    can comfortably live in a frame or iframe... probably. Default
-	    to true.
-
-xmpp
-----
-
-For configuring the XMPP sub-system.
-
-enabled: Whether to accept and send messages by XMPP. Default false.
-server: server part of XMPP ID for update user.
-port: connection port for clients. Default 5222, which you probably
-    shouldn't need to change.
-user: username for the client connection. Users will receive messages
-    from 'user'@'server'.
-resource: a unique identifier for the connection to the server. This
-    is actually used as a prefix for each XMPP component in the system.
-password: password for the user account.
-host: some XMPP domains are served by machines with a different
-    hostname. (For example, @gmail.com GTalk users connect to
-    talk.google.com). Set this to the correct hostname if that's the
-    case with your server.
-encryption: Whether to encrypt the connection between StatusNet and the
-    XMPP server. Defaults to true, but you can get
-    considerably better performance turning it off if you're
-    connecting to a server on the same machine or on a
-    protected network.
-debug: if turned on, this will make the XMPP library blurt out all of
-    the incoming and outgoing messages as XML stanzas. Use as a
-    last resort, and never turn it on if you don't have queues
-    enabled, since it will spit out sensitive data to the browser.
-public: an array of JIDs to send _all_ notices to. This is useful for
-    participating in third-party search and archiving services.
-
-invite
-------
-
-For configuring invites.
-
-enabled: Whether to allow users to send invites. Default true.
-
-tag
----
-
-Miscellaneous tagging stuff.
-
-dropoff: Decay factor for tag listing, in seconds.
-    Defaults to exponential decay over ten days; you can twiddle
-    with it to try and get better results for your site.
-
-popular
--------
-
-Settings for the "popular" section of the site.
-
-dropoff: Decay factor for popularity listing, in seconds.
-    Defaults to exponential decay over ten days; you can twiddle
-    with it to try and get better results for your site.
-
-daemon
-------
-
-For daemon processes.
-
-piddir: directory that daemon processes should write their PID file
-    (process ID) to. Defaults to /var/run/, which is where this
-    stuff should usually go on Unix-ish systems.
-user: If set, the daemons will try to change their effective user ID
-    to this user before running. Probably a good idea, especially if
-    you start the daemons as root. Note: user name, like 'daemon',
-    not 1001.
-group: If set, the daemons will try to change their effective group ID
-    to this named group. Again, a name, not a numerical ID.
-
-memcached
----------
-
-You can get a significant boost in performance by caching some
-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
-    be an array of hostnames, if you've got more than one server.
-base: memcached uses key-value pairs to store data. We build long,
-    funny-looking keys to make sure we don't have any conflicts. The
-    base of the key is usually a simplified version of the site name
-    (like "Identi.ca" => "identica"), but you can overwrite this if
-    you need to. You can safely ignore it if you only have one
-    StatusNet site using your memcached server.
-port: Port to connect to; defaults to 11211.
-
-emailpost
----------
-
-For post-by-email.
-
-enabled: Whether to enable post-by-email. Defaults to true. You will
-    also need to set up maildaemon.php.
-
-sms
----
-
-For SMS integration.
-
-enabled: Whether to enable SMS integration. Defaults to true. Queues
-    should also be enabled.
-
-integration
------------
-
-A catch-all for integration with other systems.
-
-taguri: base for tag:// URIs. Defaults to site-server + ',2009'.
-
-inboxes
--------
-
-For notice inboxes.
-
-enabled: No longer used. If you set this to something other than true,
-    StatusNet will no longer run.
-
-throttle
---------
-
-For notice-posting throttles.
-
-enabled: Whether to throttle posting. Defaults to false.
-count: Each user can make this many posts in 'timespan' seconds. So, if count
-    is 100 and timespan is 3600, then there can be only 100 posts
-    from a user every hour.
-timespan: see 'count'.
-
-profile
--------
-
-Profile management.
-
-biolimit: max character length of bio; 0 means no limit; null means to use
-    the site text limit default.
-backup: whether users can backup their own profiles. Defaults to true.
-restore: whether users can restore their profiles from backup files. Defaults
-	 to true.
-delete: whether users can delete their own accounts. Defaults to false.
-move: whether users can move their accounts to another server. Defaults
-      to true.	 
-
-newuser
--------
-
-Options with new users.
-
-default: nickname of a user account to automatically subscribe new
-    users to. Typically this would be system account for e.g.
-    service updates or announcements. Users are able to unsub
-    if they want. Default is null; no auto subscribe.
-welcome: nickname of a user account that sends welcome messages to new
-    users. Can be the same as 'default' account, although on
-    busy servers it may be a good idea to keep that one just for
-    'urgent' messages. Default is null; no message.
-
-If either of these special user accounts are specified, the users should
-be created before the configuration is updated.
-
-snapshot
---------
-
-The software will, by default, send statistical snapshots about the
-local installation to a stats server on the status.net Web site. This
-data is used by the developers to prioritize development decisions. No
-identifying data about users or organizations is collected. The data
-is available to the public for review. Participating in this survey
-helps StatusNet developers take your needs into account when updating
-the software.
-
-run: string indicating when to run the statistics. Values can be 'web'
-    (run occasionally at Web time), 'cron' (run from a cron script),
-    or 'never' (don't ever run). If you set it to 'cron', remember to
-    schedule the script to run on a regular basis.
-frequency: if run value is 'web', how often to report statistics.
-    Measured in Web hits; depends on how active your site is.
-    Default is 10000 -- that is, one report every 10000 Web hits,
-    on average.
-reporturl: URL to post statistics to. Defaults to StatusNet developers'
-    report system, but if they go evil or disappear you may
-    need to update this to another value. Note: if you
-    don't want to report stats, it's much better to
-    set 'run' to 'never' than to set this value to something
-    nonsensical.
-
-attachments
------------
-
-The software lets users upload files with their notices. You can configure
-the types of accepted files by mime types and a trio of quota options:
-per file, per user (total), per user per month.
-
-We suggest the use of the pecl file_info extension to handle mime type
-detection.
-
-supported: an array of mime types you accept to store and distribute,
-    like 'image/gif', 'video/mpeg', 'audio/mpeg', etc. Make sure you
-    setup your server to properly recognize the types you want to
-    support.
-uploads: false to disable uploading files with notices (true by default).
-filecommand: The required MIME_Type library may need to use the 'file'
-    command. It tries the one in the Web server's path, but if
-    you're having problems with uploads, try setting this to the
-    correct value. Note: 'file' must accept '-b' and '-i' options.
-
-For quotas, be sure you've set the upload_max_filesize and post_max_size
-in php.ini to be large enough to handle your upload. In httpd.conf
-(if you're using apache), check that the LimitRequestBody directive isn't
-set too low (it's optional, so it may not be there at all).
-
-file_quota: maximum size for a single file upload in bytes. A user can send
-    any amount of notices with attachments as long as each attachment
-    is smaller than file_quota.
-user_quota: total size in bytes a user can store on this server. Each user
-    can store any number of files as long as their total size does
-    not exceed the user_quota.
-monthly_quota: total size permitted in the current month. This is the total
-    size in bytes that a user can upload each month.
-dir: directory accessible to the Web process where uploads should go.
-    Defaults to the 'file' subdirectory of the install directory, which
-    should be writeable by the Web user.
-server: server name to use when creating URLs for uploaded files.
-    Defaults to null, meaning to use the default Web server. Using
-    a virtual server here can speed up Web performance.
-path: URL path, relative to the server, to find files. Defaults to
-    main path + '/file/'.
-ssl: whether to use HTTPS for file URLs. Defaults to null, meaning to
-    guess based on other SSL settings.
-filecommand: command to use for determining the type of a file. May be
-    skipped if fileinfo extension is installed. Defaults to
-    '/usr/bin/file'.
-sslserver: if specified, this server will be used when creating HTTPS
-    URLs. Otherwise, the site SSL server will be used, with /file/ path.
-sslpath: if this and the sslserver are specified, this path will be used
-    when creating HTTPS URLs. Otherwise, the attachments|path value
-    will be used.
-
-group
------
-
-Options for group functionality.
-
-maxaliases: maximum number of aliases a group can have. Default 3. Set
-    to 0 or less to prevent aliases in a group.
-desclimit: maximum number of characters to allow in group descriptions.
-    null (default) means to use the site-wide text limits. 0
-    means no limit.
-addtag: Whether to add a tag for the group nickname for every group post 
-	(pre-1.0.x behaviour). Defaults to false.
-
-oembed
---------
-
-oEmbed endpoint for multimedia attachments (links in posts). Will also
-work as 'oohembed' for backwards compatibility.
-
-endpoint: oohembed endpoint using http://oohembed.com/ software. Defaults to
-	  'http://oohembed.com/oohembed/'.
-order: Array of methods to check for OEmbed data. Methods include 'built-in'
-       (use a built-in function to simulate oEmbed for some sites),
-       'well-known' (use well-known public oEmbed endpoints),
-       'discovery' (discover using <link> headers in HTML), 'service' (use
-       a third-party service, like oohembed or embed.ly. Default is
-       array('built-in', 'well-known', 'service', 'discovery'). Note that very
-       few sites implement oEmbed; 'discovery' is going to fail 99% of the
-       time.
-
-search
-------
-
-Some stuff for search.
-
-type: type of search. Ignored if PostgreSQL or Sphinx are enabled. Can either
-    be 'fulltext' (default) or 'like'. The former is faster and more efficient
-    but requires the lame old MyISAM engine for MySQL. The latter
-    will work with InnoDB but could be miserably slow on large
-    systems. We'll probably add another type sometime in the future,
-    with our own indexing system (maybe like MediaWiki's).
-
-sessions
---------
-
-Session handling.
-
-handle: boolean. Whether we should register our own PHP session-handling
-    code (using the database and memcache if enabled). Defaults to false.
-    Setting this to true makes some sense on large or multi-server
-    sites, but it probably won't hurt for smaller ones, either.
-debug: whether to output debugging info for session storage. Can help
-    with weird session bugs, sometimes. Default false.
-
-background
-----------
-
-Users can upload backgrounds for their pages; this section defines
-their use.
-
-server: the server to use for background. Using a separate (even
-    virtual) server for this can speed up load times. Default is
-    null; same as site server.
-dir: directory to write backgrounds too. Default is '/background/'
-    subdir of install dir.
-path: path to backgrounds. Default is sub-path of install path; note
-    that you may need to change this if you change site-path too.
-sslserver: SSL server to use when page is HTTPS-encrypted. If
-    unspecified, site ssl server and so on will be used.
-sslpath: If sslserver if defined, path to use when page is HTTPS-encrypted.
-
-ping
-----
-
-Using the "XML-RPC Ping" method initiated by weblogs.com, the site can
-notify third-party servers of updates.
-
-notify: an array of URLs for ping endpoints. Default is the empty
-    array (no notification).
-
-design
-------
-
-Default design (colors and background) for the site. Actual appearance
-depends on the theme.  Null values mean to use the theme defaults.
-
-backgroundcolor: Hex color of the site background.
-contentcolor: Hex color of the content area background.
-sidebarcolor: Hex color of the sidebar background.
-textcolor: Hex color of all non-link text.
-linkcolor: Hex color of all links.
-backgroundimage: Image to use for the background.
-disposition: Flags for whether or not to tile the background image.
-
-notice
-------
-
-Configuration options specific to notices.
-
-contentlimit: max length of the plain-text content of a notice.
-    Default is null, meaning to use the site-wide text limit.
-    0 means no limit.
-defaultscope: default scope for notices. Defaults to 0; set to
-	      1 to keep notices private to this site by default.
-
-message
--------
-
-Configuration options specific to messages.
-
-contentlimit: max length of the plain-text content of a message.
-    Default is null, meaning to use the site-wide text limit.
-    0 means no limit.
-
-logincommand
-------------
-
-Configuration options for the login command.
-
-disabled: whether to enable this command. If enabled, users who send
-    the text 'login' to the site through any channel will
-    receive a link to login to the site automatically in return.
-    Possibly useful for users who primarily use an XMPP or SMS
-    interface and can't be bothered to remember their site
-    password. Note that the security implications of this are
-    pretty serious and have not been thoroughly tested. You
-    should enable it only after you've convinced yourself that
-    it is safe. Default is 'false'.
-
-singleuser
-----------
-
-If an installation has only one user, this can simplify a lot of the
-interface. It also makes the user's profile the root URL.
-
-enabled: Whether to run in "single user mode". Default false.
-nickname: nickname of the single user. If no nickname is specified,
-          the site owner account will be used (if present).
-
-robotstxt
----------
-
-We put out a default robots.txt file to guide the processing of
-Web crawlers. See http://www.robotstxt.org/ for more information
-on the format of this file.
-
-crawldelay: if non-empty, this value is provided as the Crawl-Delay:
-    for the robots.txt file. see http://ur1.ca/l5a0
-    for more information. Default is zero, no explicit delay.
-disallow: Array of (virtual) directories to disallow. Default is 'main',
-    'search', 'message', 'settings', 'admin'. Ignored when site
-    is private, in which case the entire site ('/') is disallowed.
-
-api
----
-
-Options for the Twitter-like API.
-
-realm: HTTP Basic Auth realm (see http://tools.ietf.org/html/rfc2617
-    for details). Some third-party tools like ping.fm want this to be
-    'Identi.ca API', so set it to that if you want to. default = null,
-    meaning 'something based on the site name'.
-
-nofollow
---------
-
-We optionally put 'rel="nofollow"' on some links in some pages. The
-following configuration settings let you fine-tune how or when things
-are nofollowed. See http://en.wikipedia.org/wiki/Nofollow for more
-information on what 'nofollow' means.
-
-subscribers: whether to nofollow links to subscribers on the profile
-    and personal pages. Default is true.
-members: links to members on the group page. Default true.
-peopletag: links to people listed in the peopletag page. Default true.
-external: external links in notices. One of three values: 'sometimes',
-    'always', 'never'. If 'sometimes', then external links are not
-    nofollowed on profile, notice, and favorites page. Default is
-    'sometimes'.
-
-url
----
-
-Everybody loves URL shorteners. These are some options for fine-tuning
-how and when the server shortens URLs.
-
-shortener: URL shortening service to use by default. Users can override
-           individually. 'ur1.ca' by default.
-maxlength: If an URL is strictly longer than this limit, it will be
-           shortened. Note that the URL shortener service may return an
-           URL longer than this limit. Defaults to 25. Users can
-           override. If set to 0, all URLs will be shortened.
-maxnoticelength: If a notice is strictly longer than this limit, all
-           URLs in the notice will be shortened. Users can override.
-           -1 means the text limit for notices.
-
-router
-------
-
-We use a router class for mapping URLs to code. This section controls
-how that router works.
-
-cache: whether to cache the router in memcache (or another caching
-    mechanism). Defaults to true, but may be set to false for
-    developers (who might be actively adding pages, so won't want the
-    router cached) or others who see strange behavior. You're unlikely
-    to need this unless you're a developer.
-
-http
-----
-
-Settings for the HTTP client.
-
-ssl_cafile: location of the CA file for SSL. If not set, won't verify
-	    SSL peers. Default unset.
-curl: Use cURL <http://curl.haxx.se/> for doing HTTP calls. You must
-      have the PHP curl extension installed for this to work.
-proxy_host: Host to use for proxying HTTP requests. If unset, doesn't
-	    do any HTTP proxy stuff. Default unset.
-proxy_port: Port to use to connect to HTTP proxy host. Default null.
-proxy_user: Username to use for authenticating to the HTTP proxy. Default null.
-proxy_password: Password to use for authenticating to the HTTP proxy. Default null.
-proxy_auth_scheme: Scheme to use for authenticating to the HTTP proxy. Default null.
-
-plugins
--------
-
-default: associative array mapping plugin name to array of arguments. To disable
-	 a default plugin, unset its value in this array.
-locale_path: path for finding plugin locale files. In the plugin's directory
-	     by default.
-server: Server to find static files for a plugin when the page is plain old HTTP.
-	Defaults to site/server (same as pages). Use this to move plugin CSS and
-	JS files to a CDN.
-sslserver: Server to find static files for a plugin when the page is HTTPS. Defaults
-	   to site/server (same as pages). Use this to move plugin CSS and JS files
-	   to a CDN.
-path: Path to the plugin files. defaults to site/path + '/plugins/'. Expects that
-      each plugin will have a subdirectory at plugins/NameOfPlugin. Change this
-      if you're using a CDN.
-sslpath: Path to use on the SSL server. Same as plugins/path.
-
-Plugins
-=======
-
-Beginning with the 0.7.x branch, StatusNet has supported a simple but
-powerful plugin architecture. Important events in the code are named,
-like 'StartNoticeSave', and other software can register interest
-in those events. When the events happen, the other software is called
-and has a choice of accepting or rejecting the events.
-
-In the simplest case, you can add a function to config.php and use the
-Event::addHandler() function to hook an event:
-
-    function AddGoogleLink($action)
-    {
-        $action->menuItem('http://www.google.com/', _('Google'), _('Search engine'));
-        return true;
-    }
-
-    Event::addHandler('EndPrimaryNav', 'AddGoogleLink');
-
-This adds a menu item to the end of the main navigation menu. You can
-see the list of existing events, and parameters that handlers must
-implement, in EVENTS.txt.
-
-The Plugin class in lib/plugin.php makes it easier to write more
-complex plugins. Sub-classes can just create methods named
-'onEventName', where 'EventName' is the name of the event (case
-matters!). These methods will be automatically registered as event
-handlers by the Plugin constructor (which you must call from your own
-class's constructor).
-
-Several example plugins are included in the plugins/ directory. You
-can enable a plugin with the following line in config.php:
-
-    addPlugin('Example', array('param1' => 'value1',
-                               'param2' => 'value2'));
-
-This will look for and load files named 'ExamplePlugin.php' or
-'Example/ExamplePlugin.php' either in the plugins/ directory (for
-plugins that ship with StatusNet) or in the local/ directory (for
-plugins you write yourself or that you get from somewhere else) or
-local/plugins/.
-
-Plugins are documented in their own directories.
+A full changelog is available at http://status.net/wiki/StatusNet_1.1.1.
 
 Troubleshooting
 ===============
@@ -1693,32 +133,6 @@ repository (see below), and you get a compilation error ("unexpected
 T_STRING") in the browser, check to see that you don't have any
 conflicts in your code.
 
-If you upgraded to StatusNet 0.9.x without reading the "Notice
-inboxes" section above, and all your users' 'Personal' tabs are empty,
-read the "Notice inboxes" section above.
-
-Myths
-=====
-
-These are some myths you may see on the Web about StatusNet.
-Documentation from the core team about StatusNet has been pretty
-sparse, so some backtracking and guesswork resulted in some incorrect
-assumptions.
-
-- "Set $config['db']['debug'] = 5 to debug the database." This is an
-  extremely bad idea. It's a tool built into DB_DataObject that will
-  emit oodles of print lines directly to the browser of your users.
-  Among these lines will be your database username and password. Do
-  not enable this option on a production Web site for any reason.
-
-- "Edit dataobject.ini with the following settings..." dataobject.ini
-  is a development file for the DB_DataObject framework and is not
-  used by the running software. It was removed from the StatusNet
-  distribution because its presence was confusing. Do not bother
-  configuring dataobject.ini, and do not put your database username
-  and password into the file on a production Web server; unscrupulous
-  persons may try to read it to get your passwords.
-
 Unstable version
 ================
 
@@ -1753,11 +167,12 @@ There are several ways to get more information about StatusNet.
 Feedback
 ========
 
-* Microblogging messages to http://support.status.net/ are very welcome.
-* The microblogging group http://identi.ca/group/statusnet is a good
+* Messages to http://support.status.net/ are very welcome.
+* The group http://identi.ca/group/statusnet is a good
   place to discuss the software.
 * StatusNet has a bug tracker for any defects you may find, or ideas for
-  making things better. http://status.net/bugs
+  making things better. http://status.net/open-source/issues
+* The StatusNet forum is at http://forum.status.net/.
 
 Credits
 =======
diff --git a/UPGRADE b/UPGRADE
new file mode 100644
index 0000000000..2ae96e0dae
--- /dev/null
+++ b/UPGRADE
@@ -0,0 +1,117 @@
+Upgrading
+=========
+
+If you've been using StatusNet 1.0 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. Try these step-by-step
+instructions; read to the end first before trying them.
+
+0. Download StatusNet and set up all the prerequisites as if you were
+   doing a new install.
+1. Make backups of both your database and your Web directory. UNDER NO
+   CIRCUMSTANCES should you try to do an upgrade without a known-good
+   backup. You have been warned.
+2. Shut down Web access to your site, either by turning off your Web
+   server or by redirecting all pages to a "sorry, under maintenance"
+   page.
+3. Shut down XMPP access to your site, typically by shutting down the
+   xmppdaemon.php process and all other daemons that you're running.
+   If you've got "monit" or "cron" automatically restarting your
+   daemons, make sure to turn that off, too.
+4. Shut down SMS and email access to your site. The easy way to do
+   this is to comment out the line piping incoming email to your
+   maildaemon.php file, and running something like "newaliases".
+5. Once all writing processes to your site are turned off, make a
+   final backup of the Web directory and database.
+6. Move your StatusNet directory to a backup spot, like "statusnet.bak".
+7. Unpack your StatusNet 1.1.1 tarball and move it to "statusnet" or
+   wherever your code used to be.
+8. Copy the config.php file and the contents of the avatar/, background/,
+   file/, and local/ subdirectories from your old directory to your new
+   directory.
+9. Copy htaccess.sample to .htaccess in the new directory. Change the
+   RewriteBase to use the correct path.
+10. Upgrade the database.
+
+    NOTE: this step is destructive and cannot be
+    reversed. YOU CAN EASILY DESTROY YOUR SITE WITH THIS STEP. Don't
+    do it without a known-good backup!
+
+    In your new StatusNet 1.1.1 directory and AFTER YOU MAKE A
+    BACKUP run the upgrade.php script like this:
+
+        php ./scripts/upgrade.php
+
+11. Use mysql or psql client to log into your database and make sure that
+    the notice, user, profile, subscription etc. tables are non-empty.
+12. Turn back on the Web server, and check that things still work.
+13. Turn back on XMPP bots and email maildaemon.
+
+NOTE: the 1.0.0 version of StatusNet changed the URLs for all admin
+panels from /admin/* to /panel/*. This now allows the (popular)
+username 'admin', but blocks the considerably less popular username
+'panel'. If you have an existing user named 'panel', you should rename
+them before upgrading.
+
+UTF-8 Database
+--------------
+
+If you are upgrading from a 0.8.x or 0.9.x version, you can safely
+skip this section.
+
+StatusNet 0.7.4 introduced a fix for some incorrectly-stored
+international characters ("UTF-8"). This fix is not
+backwards-compatible; installations from before 0.7.4 will show
+non-ASCII characters of old notices incorrectly. This section explains
+what to do.
+
+0. You can disable the new behaviour by setting the 'db''utf8' config
+   option to "false". You should only do this until you're ready to
+   convert your DB to the new format.
+1. When you're ready to convert, you can run the fixup_utf8.php script
+   in the scripts/ subdirectory. If you've had the "new behaviour"
+   enabled (probably a good idea), you can give the ID of the first
+   "new" notice as a parameter, and only notices before that one will
+   be converted. Notices are converted in reverse chronological order,
+   so the most recent (and visible) ones will be converted first. The
+   script should work whether or not you have the 'db''utf8' config
+   option enabled.
+2. When you're ready, set $config['db']['utf8'] to true, so that
+   new notices will be stored correctly.
+
+Older versions
+==============
+
+IMPORTANT NOTE: StatusNet 0.7.4 introduced a fix for some
+incorrectly-stored international characters ("UTF-8"). For new
+installations, it will now store non-ASCII characters correctly.
+However, older installations will have the incorrect storage, and will
+consequently show up "wrong" in browsers. See below for how to deal
+with this situation.
+
+NOTE: the database definition file, laconica.ini, has been renamed to
+statusnet.ini (since this is the recommended database name). If you
+have a line in your config.php pointing to the old name, you'll need
+to update it.
+
+Note that the XMPP bots have changed since version 0.5; see above for
+details.
+
+Privacy
+=======
+
+With StatusNet 1.0, our default install profile is for private sites.
+
+If you did not specify the privacy level of your site previously, it
+was public. Now, it's private.
+
+If you upgrade a public site, you will need to reset the privacy
+level. You can do this in your config.php:
+
+       $config['site']['private'] = false;
+
+...or with setconfig.php in the db:
+
+       php setconfig.php site private false
+
+...or with the site admin panel.
diff --git a/actions/accessadminpanel.php b/actions/accessadminpanel.php
index 027c69c5e5..55fc349f25 100644
--- a/actions/accessadminpanel.php
+++ b/actions/accessadminpanel.php
@@ -187,9 +187,9 @@ class AccessAdminPanelForm extends AdminForm
      */
     function formActions()
     {
-        // TRANS: Title for button to save access settings in site admin panel.
-        $title = _('Save access settings');
-        // TRANS: Tooltip for button to save access settings in site admin panel.
+        // TRANS: Button title to save access settings in site admin panel.
+        $title = _('Save access settings.');
+        // TRANS: Button text to save access settings in site admin panel.
         $this->out->submit('submit', _m('BUTTON', 'Save'), 'submit', null, $title);
     }
 }
diff --git a/actions/addpeopletag.php b/actions/addpeopletag.php
index 1e130e27e8..a661104d5c 100644
--- a/actions/addpeopletag.php
+++ b/actions/addpeopletag.php
@@ -111,18 +111,6 @@ class AddpeopletagAction extends Action
             return false;
         }
 
-        // OMB 0.1 doesn't have a mechanism for local-server-
-        // originated tag.
-
-        $omb01 = Remote_profile::staticGet('id', $tagged_id);
-
-        if (!empty($omb01)) {
-            // TRANS: Client error displayed when trying to add an OMB 0.1 remote profile to a list.
-            $this->clientError(_('You cannot list an OMB 0.1 '.
-                                 'remote profile with this action.'));
-            return false;
-        }
-
         return true;
     }
 
diff --git a/actions/all.php b/actions/all.php
index 2e53691636..1d9509f6db 100644
--- a/actions/all.php
+++ b/actions/all.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * StatusNet - the distributed open-source microblogging tool
- * Copyright (C) 2008, 2009, StatusNet, Inc.
+ * Copyright (C) 2008-2011, StatusNet, Inc.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -56,7 +56,13 @@ class AllAction extends ProfileAction
     {
         parent::prepare($args);
 
-        $stream = new ThreadingInboxNoticeStream($this->user, Profile::current());
+        $user = common_current_user();
+
+        if (!empty($user) && $user->streamModeOnly()) {
+            $stream = new InboxNoticeStream($this->user, Profile::current());
+        } else {
+            $stream = new ThreadingInboxNoticeStream($this->user, Profile::current());
+        }
 
         $this->notice = $stream->getNotices(($this->page-1)*NOTICES_PER_PAGE,
                                             NOTICES_PER_PAGE + 1);
@@ -85,7 +91,7 @@ class AllAction extends ProfileAction
     function title()
     {
         $user = common_current_user();
-        if ($user->id == $this->user->id) {
+        if (!empty($user) && $user->id == $this->user->id) {
             // TRANS: Title of a user's own start page.
             return _('Home timeline');
         } else {
@@ -99,6 +105,15 @@ class AllAction extends ProfileAction
     function getFeeds()
     {
         return array(
+            new Feed(Feed::JSON,
+                common_local_url(
+                    'ApiTimelineFriends', array(
+                        'format' => 'as',
+                        'id' => $this->user->nickname
+                    )
+                ),
+                // TRANS: %s is user nickname.
+                sprintf(_('Feed for friends of %s (Activity Streams JSON)'), $this->user->nickname)),
             new Feed(Feed::RSS1,
                 common_local_url(
                     'allrss', array(
@@ -145,7 +160,7 @@ class AllAction extends ProfileAction
                 $message .= sprintf(_('You can try to [nudge %1$s](../%2$s) from their profile or [post something to them](%%%%action.newnotice%%%%?status_textarea=%3$s).'), $this->user->nickname, $this->user->nickname, '@' . $this->user->nickname);
             }
         } else {
-            // TRANS: Encoutagement displayed on empty timeline user pages for anonymous users.
+            // TRANS: Encouragement displayed on empty timeline user pages for anonymous users.
             // TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
             $message .= sprintf(_('Why not [register an account](%%%%action.register%%%%) and then nudge %s or post a notice to them.'), $this->user->nickname);
         }
@@ -167,7 +182,11 @@ class AllAction extends ProfileAction
                 $profile = $current_user->getProfile();
             }
 
-            $nl = new ThreadedNoticeList($this->notice, $this, $profile);
+            if (!empty($current_user) && $current_user->streamModeOnly()) {
+                $nl = new NoticeList($this->notice, $this);
+            } else {
+                $nl = new ThreadedNoticeList($this->notice, $this, $profile);
+            }
 
             $cnt = $nl->show();
 
@@ -186,12 +205,29 @@ class AllAction extends ProfileAction
 
     function showSections()
     {
-        $ibs = new InviteButtonSection($this);
-        $ibs->show();
-        $pop = new PopularNoticeSection($this);
-        $pop->show();
-        //        $pop = new InboxTagCloudSection($this, $this->user);
-        //        $pop->show();
+        // Show invite button, as long as site isn't closed, and
+        // we have a logged in user.
+        if (common_config('invite', 'enabled') && !common_config('site', 'closed') && common_logged_in()) {
+            if (!common_config('site', 'private')) {
+                $ibs = new InviteButtonSection(
+                    $this,
+                    // TRANS: Button text for inviting more users to the StatusNet instance.
+                    // TRANS: Less business/enterprise-oriented language for public sites.
+                    _m('BUTTON', 'Send invite')
+                );
+            } else {
+                $ibs = new InviteButtonSection($this);
+            }
+            $ibs->show();
+        }
+        // XXX: make this a little more convenient
+
+        if (!common_config('performance', 'high')) {
+            $pop = new PopularNoticeSection($this, Profile::current());
+            $pop->show();
+            $pop = new InboxTagCloudSection($this, $this->user);
+            $pop->show();
+        }
     }
 }
 
diff --git a/actions/apiaccountupdateprofilebackgroundimage.php b/actions/apiaccountupdateprofilebackgroundimage.php
deleted file mode 100644
index bb0cef52a4..0000000000
--- a/actions/apiaccountupdateprofilebackgroundimage.php
+++ /dev/null
@@ -1,215 +0,0 @@
-<?php
-/**
- * StatusNet, the distributed open-source microblogging tool
- *
- * Update the authenticating user's profile background image
- *
- * PHP version 5
- *
- * LICENCE: This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * @category  API
- * @package   StatusNet
- * @author    Zach Copley <zach@status.net>
- * @copyright 2009 StatusNet, Inc.
- * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://status.net/
- */
-
-if (!defined('STATUSNET')) {
-    exit(1);
-}
-
-require_once INSTALLDIR . '/lib/apiauth.php';
-
-/**
- * Update the authenticating user's profile background image
- *
- * @category API
- * @package  StatusNet
- * @author   Zach Copley <zach@status.net>
- * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://status.net/
- */
-class ApiAccountUpdateProfileBackgroundImageAction extends ApiAuthAction
-{
-    var $tile = false;
-
-    /**
-     * Take arguments for running
-     *
-     * @param array $args $_REQUEST args
-     *
-     * @return boolean success flag
-     *
-     */
-    function prepare($args)
-    {
-        parent::prepare($args);
-
-        $this->user  = $this->auth_user;
-        $this->tile  = $this->arg('tile');
-
-        return true;
-    }
-
-    /**
-     * Handle the request
-     *
-     * Check whether the credentials are valid and output the result
-     *
-     * @param array $args $_REQUEST data (unused)
-     *
-     * @return void
-     */
-    function handle($args)
-    {
-        parent::handle($args);
-
-        if ($_SERVER['REQUEST_METHOD'] != 'POST') {
-            $this->clientError(
-                // TRANS: Client error. POST is a HTTP command. It should not be translated.
-                _('This method requires a POST.'),
-                400, $this->format
-            );
-            return;
-        }
-
-        if (!in_array($this->format, array('xml', 'json'))) {
-            $this->clientError(
-                // TRANS: Client error displayed when coming across a non-supported API method.
-                _('API method not found.'),
-                404,
-                $this->format
-            );
-            return;
-        }
-
-        // Workaround for PHP returning empty $_POST and $_FILES when POST
-        // length > post_max_size in php.ini
-
-        if (empty($_FILES)
-            && empty($_POST)
-            && ($_SERVER['CONTENT_LENGTH'] > 0)
-        ) {
-             // TRANS: Client error displayed when the number of bytes in a POST request exceeds a limit.
-             // TRANS: %s is the number of bytes of the CONTENT_LENGTH.
-             $msg = _m('The server was unable to handle that much POST data (%s byte) due to its current configuration.',
-                      'The server was unable to handle that much POST data (%s bytes) due to its current configuration.',
-                      intval($_SERVER['CONTENT_LENGTH']));
-
-            $this->clientError(sprintf($msg, $_SERVER['CONTENT_LENGTH']));
-            return;
-        }
-
-        if (empty($this->user)) {
-            // TRANS: Client error when user not found updating a profile background image.
-            $this->clientError(_('No such user.'), 404, $this->format);
-            return;
-        }
-
-        $design = $this->user->getDesign();
-
-        // XXX: This is kinda gross, but before we can add a background
-        // img we have to make sure there's a Design because design ID
-        // is part of the img filename.
-
-        if (empty($design)) {
-            $this->user->query('BEGIN');
-
-            // save new design
-            $design = new Design();
-            $id = $design->insert();
-
-            if (empty($id)) {
-                common_log_db_error($id, 'INSERT', __FILE__);
-                // TRANS: Client error displayed when saving design settings fails because of an empty id.
-                $this->clientError(_('Unable to save your design settings.'));
-                return;
-            }
-
-            $original              = clone($this->user);
-            $this->user->design_id = $id;
-            $result                = $this->user->update($original);
-
-            if (empty($result)) {
-                common_log_db_error($original, 'UPDATE', __FILE__);
-                // TRANS: Client error displayed when saving design settings fails because of an empty result.
-                $this->clientError(_('Unable to save your design settings.'));
-                $this->user->query('ROLLBACK');
-                return;
-            }
-
-            $this->user->query('COMMIT');
-        }
-
-        // Okay, now get the image and add it to the design
-
-        try {
-            $imagefile = ImageFile::fromUpload('image');
-        } catch (Exception $e) {
-            $this->clientError($e->getMessage(), 400, $this->format);
-            return;
-        }
-
-        $filename = Design::filename(
-            $design->id,
-            image_type_to_extension($imagefile->type),
-            common_timestamp()
-        );
-
-        $filepath = Design::path($filename);
-
-        move_uploaded_file($imagefile->filepath, $filepath);
-
-        // delete any old backround img laying around
-
-        if (isset($design->backgroundimage)) {
-            @unlink(Design::path($design->backgroundimage));
-        }
-
-        $original = clone($design);
-        $design->backgroundimage = $filename;
-        $design->setDisposition(true, false, ($this->tile == 'true'));
-
-        $result = $design->update($original);
-
-        if ($result === false) {
-            common_log_db_error($design, 'UPDATE', __FILE__);
-            // TRANS: Error displayed when updating design settings fails.
-            $this->showForm(_('Could not update your design.'));
-            return;
-        }
-
-        $profile = $this->user->getProfile();
-
-        if (empty($profile)) {
-            // TRANS: Error message displayed when referring to a user without a profile.
-            $this->clientError(_('User has no profile.'));
-            return;
-        }
-
-        $twitter_user = $this->twitterUserArray($profile, true);
-
-        if ($this->format == 'xml') {
-            $this->initDocument('xml');
-            $this->showTwitterXmlUser($twitter_user, 'user', true);
-            $this->endDocument('xml');
-        } elseif ($this->format == 'json') {
-            $this->initDocument('json');
-            $this->showJsonObjects($twitter_user);
-            $this->endDocument('json');
-        }
-    }
-}
diff --git a/actions/apiaccountupdateprofilecolors.php b/actions/apiaccountupdateprofilecolors.php
deleted file mode 100644
index 4fa85c6877..0000000000
--- a/actions/apiaccountupdateprofilecolors.php
+++ /dev/null
@@ -1,242 +0,0 @@
-<?php
-/**
- * StatusNet, the distributed open-source microblogging tool
- *
- * Update a user's design colors
- *
- * PHP version 5
- *
- * LICENCE: This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * @category  API
- * @package   StatusNet
- * @author    Zach Copley <zach@status.net>
- * @copyright 2009-2010 StatusNet, Inc.
- * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://status.net/
- */
-
-if (!defined('STATUSNET')) {
-    exit(1);
-}
-
-require_once INSTALLDIR . '/lib/apiauth.php';
-
-/**
- * Sets one or more hex values that control the color scheme of the
- * authenticating user's design
- *
- * @category API
- * @package  StatusNet
- * @author   Zach Copley <zach@status.net>
- * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://status.net/
- */
-class ApiAccountUpdateProfileColorsAction extends ApiAuthAction
-{
-    var $profile_background_color     = null;
-    var $profile_text_color           = null;
-    var $profile_link_color           = null;
-    var $profile_sidebar_fill_color   = null;
-    var $profile_sidebar_border_color = null;
-
-    /**
-     * Take arguments for running
-     *
-     * @param array $args $_REQUEST args
-     *
-     * @return boolean success flag
-     */
-    function prepare($args)
-    {
-        parent::prepare($args);
-
-        $this->user   = $this->auth_user;
-
-        $this->profile_background_color
-            = $this->trimmed('profile_background_color');
-        $this->profile_text_color
-            = $this->trimmed('profile_text_color');
-        $this->profile_link_color
-            = $this->trimmed('profile_link_color');
-        $this->profile_sidebar_fill_color
-            = $this->trimmed('profile_sidebar_fill_color');
-
-        // XXX: we don't support changing the sidebar border color
-        // in our designs.
-
-        $this->profile_sidebar_border_color
-            = $this->trimmed('profile_sidebar_border_color');
-
-        // XXX: Unlike Twitter, we do allow people to change the 'content color'
-
-        $this->profile_content_color = $this->trimmed('profile_content_color');
-
-        return true;
-    }
-
-    /**
-     * Handle the request
-     *
-     * Try to save the user's colors in her design. Create a new design
-     * if the user doesn't already have one.
-     *
-     * @param array $args $_REQUEST data (unused)
-     *
-     * @return void
-     */
-    function handle($args)
-    {
-        parent::handle($args);
-
-        if ($_SERVER['REQUEST_METHOD'] != 'POST') {
-            $this->clientError(
-                // TRANS: Client error. POST is a HTTP command. It should not be translated.
-                _('This method requires a POST.'),
-                400, $this->format
-            );
-            return;
-        }
-
-        if (!in_array($this->format, array('xml', 'json'))) {
-            $this->clientError(
-                // TRANS: Client error displayed when coming across a non-supported API method.
-                _('API method not found.'),
-                404,
-                $this->format
-            );
-            return;
-        }
-
-        $design = $this->user->getDesign();
-
-        if (!empty($design)) {
-            $original = clone($design);
-
-            try {
-                $this->setColors($design);
-            } catch (WebColorException $e) {
-                $this->clientError($e->getMessage(), 400, $this->format);
-                return false;
-            }
-
-            $result = $design->update($original);
-
-            if ($result === false) {
-                common_log_db_error($design, 'UPDATE', __FILE__);
-                // TRANS: Client error displayed when a database error occurs updating profile colours.
-                $this->clientError(_('Could not update your design.'));
-                return;
-            }
-        } else {
-            $this->user->query('BEGIN');
-
-            // save new design
-            $design = new Design();
-
-            try {
-                $this->setColors($design);
-            } catch (WebColorException $e) {
-                $this->clientError($e->getMessage(), 400, $this->format);
-                return false;
-            }
-
-            $id = $design->insert();
-
-            if (empty($id)) {
-                common_log_db_error($id, 'INSERT', __FILE__);
-                // TRANS: Client error displayed when a database error occurs inserting profile colours.
-                $this->clientError(_('Unable to save your design settings.'));
-                return;
-            }
-
-            $original              = clone($this->user);
-            $this->user->design_id = $id;
-            $result                = $this->user->update($original);
-
-            if (empty($result)) {
-                common_log_db_error($original, 'UPDATE', __FILE__);
-                // TRANS: Client error displayed when a database error occurs updating profile colours.
-                $this->clientError(_('Unable to save your design settings.'));
-                $this->user->query('ROLLBACK');
-                return;
-            }
-
-            $this->user->query('COMMIT');
-        }
-
-        $profile = $this->user->getProfile();
-
-        if (empty($profile)) {
-            // TRANS: Error message displayed when referring to a user without a profile.
-            $this->clientError(_('User has no profile.'));
-            return;
-        }
-
-        $twitter_user = $this->twitterUserArray($profile, true);
-
-        if ($this->format == 'xml') {
-            $this->initDocument('xml');
-            $this->showTwitterXmlUser($twitter_user, 'user', true);
-            $this->endDocument('xml');
-        } elseif ($this->format == 'json') {
-            $this->initDocument('json');
-            $this->showJsonObjects($twitter_user);
-            $this->endDocument('json');
-        }
-    }
-
-    /**
-     * Sets the user's design colors based on the request parameters
-     *
-     * @param Design $design the user's Design
-     *
-     * @return void
-     */
-    function setColors($design)
-    {
-        $bgcolor = empty($this->profile_background_color) ?
-            null : new WebColor($this->profile_background_color);
-        $tcolor  = empty($this->profile_text_color) ?
-            null : new WebColor($this->profile_text_color);
-        $sbcolor = empty($this->profile_sidebar_fill_color) ?
-            null : new WebColor($this->profile_sidebar_fill_color);
-        $lcolor  = empty($this->profile_link_color) ?
-            null : new WebColor($this->profile_link_color);
-        $ccolor  = empty($this->profile_content_color) ?
-            null : new WebColor($this->profile_content_color);
-
-        if (!empty($bgcolor)) {
-            $design->backgroundcolor = $bgcolor->intValue();
-        }
-
-        if (!empty($ccolor)) {
-            $design->contentcolor = $ccolor->intValue();
-        }
-
-        if (!empty($sbcolor)) {
-            $design->sidebarcolor = $sbcolor->intValue();
-        }
-
-        if (!empty($tcolor)) {
-            $design->textcolor = $tcolor->intValue();
-        }
-
-        if (!empty($lcolor)) {
-            $design->linkcolor = $lcolor->intValue();
-        }
-
-        return true;
-    }
-}
diff --git a/actions/apiconversation.php b/actions/apiconversation.php
new file mode 100644
index 0000000000..504787b9a2
--- /dev/null
+++ b/actions/apiconversation.php
@@ -0,0 +1,238 @@
+<?php
+/**
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2011, StatusNet, Inc.
+ *
+ * Show a stream of notices in a particular conversation
+ *
+ * PHP version 5
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  API
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2011 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    // This check helps protect against security problems;
+    // your code file can't be executed directly from the web.
+    exit(1);
+}
+
+require_once INSTALLDIR . '/lib/apiauth.php';
+
+/**
+ * Show a stream of notices in a particular conversation
+ *
+ * @category  API
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2011 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+class ApiconversationAction extends ApiAuthAction
+{
+    protected $conversation = null;
+    protected $notices      = null;
+
+    /**
+     * For initializing members of the class.
+     *
+     * @param array $argarray misc. arguments
+     *
+     * @return boolean true
+     */
+    function prepare($argarray)
+    {
+        parent::prepare($argarray);
+
+        $convId = $this->trimmed('id');
+
+        if (empty($convId)) {
+            // TRANS: Client exception thrown when no conversation ID is given.
+            throw new ClientException(_('No conversation ID.'));
+        }
+
+        $this->conversation = Conversation::staticGet('id', $convId);
+
+        if (empty($this->conversation)) {
+            // TRANS: Client exception thrown when referring to a non-existing conversation ID (%d).
+            throw new ClientException(sprintf(_('No conversation with ID %d.'), $convId),
+                                      404);
+        }
+
+        $profile = Profile::current();
+
+        $stream = new ConversationNoticeStream($convId, $profile);
+
+        $notice = $stream->getNotices(($this->page-1) * $this->count,
+                                      $this->count,
+                                      $this->since_id,
+                                      $this->max_id);
+
+        $this->notices = $notice->fetchAll();
+
+        return true;
+    }
+
+    /**
+     * Handler method
+     *
+     * @param array $argarray is ignored since it's now passed in in prepare()
+     *
+     * @return void
+     */
+    function handle($argarray=null)
+    {
+        $sitename   = common_config('site', 'name');
+        // TRANS: Title for conversion timeline.
+        $title      = _m('TITLE', 'Conversation');
+        $id         = common_local_url('apiconversation', array('id' => $this->conversation->id, 'format' => $this->format));
+        $link       = common_local_url('conversation', array('id' => $this->conversation->id));
+
+        $self       = $id;
+
+        switch($this->format) {
+        case 'xml':
+            $this->showXmlTimeline($this->notices);
+            break;
+        case 'rss':
+            $this->showRssTimeline(
+                $this->notices,
+                $title,
+                $link,
+                null,
+                null,
+                null,
+                $self
+            );
+            break;
+        case 'atom':
+
+            header('Content-Type: application/atom+xml; charset=utf-8');
+
+            $atom = new AtomNoticeFeed($this->auth_user);
+
+            $atom->setId($id);
+            $atom->setTitle($title);
+            $atom->setUpdated('now');
+
+            $atom->addLink($link);
+            $atom->setSelfLink($self);
+
+            $atom->addEntryFromNotices($this->notices);
+            $this->raw($atom->getString());
+
+            break;
+        case 'json':
+            $this->showJsonTimeline($this->notices);
+            break;
+        case 'as':
+            header('Content-Type: ' . ActivityStreamJSONDocument::CONTENT_TYPE);
+            $doc = new ActivityStreamJSONDocument($this->auth_user);
+            $doc->setTitle($title);
+            $doc->addLink($link, 'alternate', 'text/html');
+            $doc->addItemsFromNotices($this->notices);
+            $this->raw($doc->asString());
+            break;
+        default:
+            // TRANS: Client error displayed when coming across a non-supported API method.
+            $this->clientError(_('API method not found.'), $code = 404);
+            break;
+        }
+    }
+
+    /**
+     * Return true if read only.
+     *
+     * MAY override
+     *
+     * @param array $args other arguments
+     *
+     * @return boolean is read only action?
+     */
+    function isReadOnly($args)
+    {
+        if ($_SERVER['REQUEST_METHOD'] == 'GET' ||
+            $_SERVER['REQUEST_METHOD'] == 'HEAD') {
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    /**
+     * Return last modified, if applicable.
+     *
+     * MAY override
+     *
+     * @return string last modified http header
+     */
+    function lastModified()
+    {
+        if (!empty($this->notices) && (count($this->notices) > 0)) {
+            return strtotime($this->notices[0]->created);
+        }
+
+        return null;
+    }
+
+    /**
+     * Return etag, if applicable.
+     *
+     * MAY override
+     *
+     * @return string etag http header
+     */
+    function etag()
+    {
+        if (!empty($this->notices) && (count($this->notices) > 0)) {
+
+            $last = count($this->notices) - 1;
+
+            return '"' . implode(
+                ':',
+                array($this->arg('action'),
+                      common_user_cache_hash($this->auth_user),
+                      common_language(),
+                      $this->user->id,
+                      strtotime($this->notices[0]->created),
+                      strtotime($this->notices[$last]->created))
+            )
+            . '"';
+        }
+
+        return null;
+    }
+
+    /**
+     * Does this require authentication?
+     *
+     * @return boolean true if delete, else false
+     */
+    function requiresAuth()
+    {
+        if ($_SERVER['REQUEST_METHOD'] == 'GET' ||
+            $_SERVER['REQUEST_METHOD'] == 'HEAD') {
+            return false;
+        } else {
+            return true;
+        }
+    }
+}
diff --git a/actions/apifavoritecreate.php b/actions/apifavoritecreate.php
index b890d4af69..3f639159cc 100644
--- a/actions/apifavoritecreate.php
+++ b/actions/apifavoritecreate.php
@@ -65,6 +65,12 @@ class ApiFavoriteCreateAction extends ApiAuthAction
 
         $this->user   = $this->auth_user;
         $this->notice = Notice::staticGet($this->arg('id'));
+        if ($this->notice->repeat_of != '' ) {
+                common_log(LOG_DEBUG, 'Trying to Fave '.$this->notice->id.', repeat of '.$this->notice->repeat_of);
+                common_log(LOG_DEBUG, 'Will Fave '.$this->notice->repeat_of.' instead');
+                $real_notice_id = $this->notice->repeat_of;
+                $this->notice = Notice::staticGet($real_notice_id);
+        }
 
         return true;
     }
diff --git a/actions/apifavoritedestroy.php b/actions/apifavoritedestroy.php
index db121ac882..59ca5c96df 100644
--- a/actions/apifavoritedestroy.php
+++ b/actions/apifavoritedestroy.php
@@ -65,6 +65,12 @@ class ApiFavoriteDestroyAction extends ApiAuthAction
 
         $this->user   = $this->auth_user;
         $this->notice = Notice::staticGet($this->arg('id'));
+        if ($this->notice->repeat_of != '' ) {
+                common_log(LOG_DEBUG, 'Trying to unFave '.$this->notice->id);
+                common_log(LOG_DEBUG, 'Will unFave '.$this->notice->repeat_of.' instead');
+                $real_notice_id = $this->notice->repeat_of;
+                $this->notice = Notice::staticGet($real_notice_id);
+        }
 
         return true;
     }
diff --git a/actions/apioauthauthorize.php b/actions/apioauthauthorize.php
index d76ae060f2..1755c36be3 100644
--- a/actions/apioauthauthorize.php
+++ b/actions/apioauthauthorize.php
@@ -22,7 +22,7 @@
  * @category  API
  * @package   StatusNet
  * @author    Zach Copley <zach@status.net>
- * @copyright 2010 StatusNet, Inc.
+ * @copyright 2010-2011 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
  */
@@ -35,7 +35,7 @@ require_once INSTALLDIR . '/lib/apioauth.php';
 require_once INSTALLDIR . '/lib/info.php';
 
 /**
- * Authorize an Oputh request token
+ * Authorize an OAuth request token
  *
  * @category API
  * @package  StatusNet
@@ -196,12 +196,6 @@ class ApiOauthAuthorizeAction extends Action
                 )
             );
 
-            // XXX: Make sure we have a oauth_token_association table. The table
-            // is now in the main schema, but because it is being added with
-            // a point release, it's unlikely to be there. This code can be
-            // removed as of 1.0.
-            $this->ensureOauthTokenAssociationTable();
-
             $tokenAssoc = new Oauth_token_association();
 
             $tokenAssoc->profile_id     = $user->id;
@@ -295,30 +289,6 @@ class ApiOauthAuthorizeAction extends Action
         }
     }
 
-    // XXX Remove this function when we hit 1.0
-    function ensureOauthTokenAssociationTable()
-    {
-        $schema = Schema::get();
-
-        $reqTokenCols = array(
-            new ColumnDef('profile_id', 'integer', null, true, 'PRI'),
-            new ColumnDef('application_id', 'integer', null, true, 'PRI'),
-            new ColumnDef('token', 'varchar', 255, true, 'PRI'),
-            new ColumnDef('created', 'datetime', null, false),
-            new ColumnDef(
-                'modified',
-                'timestamp',
-                null,
-                false,
-                null,
-                'CURRENT_TIMESTAMP',
-                'on update CURRENT_TIMESTAMP'
-            )
-        );
-
-        $schema->ensureTable('oauth_token_association', $reqTokenCols);
-    }
-
     /**
      * Show body - override to add a special CSS class for the authorize
      * page's "desktop mode" (minimal display)
diff --git a/actions/apisearchatom.php b/actions/apisearchatom.php
index 32ff918da3..075a4df83d 100644
--- a/actions/apisearchatom.php
+++ b/actions/apisearchatom.php
@@ -92,8 +92,6 @@ class ApiSearchAtomAction extends ApiPrivateAuthAction
      */
     function prepare($args)
     {
-        common_debug("in apisearchatom prepare()");
-
         parent::prepare($args);
 
         $this->query = $this->trimmed('q');
diff --git a/actions/apisearchjson.php b/actions/apisearchjson.php
index dd442b7f24..612dbdda5c 100644
--- a/actions/apisearchjson.php
+++ b/actions/apisearchjson.php
@@ -63,8 +63,6 @@ class ApiSearchJSONAction extends ApiPrivateAuthAction
      */
     function prepare($args)
     {
-        common_debug("apisearchjson prepare()");
-
         parent::prepare($args);
 
         $this->query = $this->trimmed('q');
@@ -91,6 +89,12 @@ class ApiSearchJSONAction extends ApiPrivateAuthAction
         $this->since_id = $this->trimmed('since_id');
         $this->geocode  = $this->trimmed('geocode');
 
+        if (!empty($this->auth_user)) {
+            $this->auth_profile = $this->auth_user->getProfile();
+        } else {
+            $this->auth_profile = null;
+        }
+
         return true;
     }
 
@@ -114,20 +118,27 @@ class ApiSearchJSONAction extends ApiPrivateAuthAction
      */
     function showResults()
     {
-        // TODO: Support search operators like from: and to:, boolean, etc.
-
-        $notice = new Notice();
-
-        // lcase it for comparison
         $q = strtolower($this->query);
 
-        $search_engine = $notice->getSearchEngine('notice');
-        $search_engine->set_sort_mode('chron');
-        $search_engine->limit(($this->page - 1) * $this->rpp, $this->rpp + 1, true);
-        if (false === $search_engine->query($q)) {
-            $cnt = 0;
+        // TODO: Support search operators like from: and to:, boolean, etc.
+
+        if (preg_match('/^#([\pL\pN_\-\.]{1,64})$/ue', $q)) {
+            $stream = new TagNoticeStream(substr($q, 1), $this->auth_profile);
+        } else if ($this->isAnURL($q)) {
+            $canon = File_redirection::_canonUrl($q);
+            $file = File::staticGet('url', $canon);
+            if (!empty($file)) {
+                $stream = new FileNoticeStream($file, $this->auth_profile);
+            }
         } else {
-            $cnt = $notice->find();
+            $stream = new SearchNoticeStream($q, $this->auth_profile);
+        }
+
+        if (empty($stream)) {
+            // XXX: This is hackish, but need some simple way to say "There's no results"
+            $notice = new ArrayWrapper(array());
+        } else {
+            $notice = $stream->getNotices(($this->page - 1) * $this->rpp, $this->rpp + 1);
         }
 
         // TODO: max_id, lang, geocode
@@ -139,6 +150,47 @@ class ApiSearchJSONAction extends ApiPrivateAuthAction
         $this->endDocument('json');
     }
 
+    function isAnURL($q) {
+        $regex = '#^'.
+            '(?:^|[\s\<\>\(\)\[\]\{\}\\\'\\\";]+)(?![\@\!\#])'.
+            '('.
+            '(?:'.
+            '(?:'. //Known protocols
+            '(?:'.
+            '(?:(?:https?|ftps?|mms|rtsp|gopher|news|nntp|telnet|wais|file|prospero|webcal|irc)://)'.
+            '|'.
+            '(?:(?:mailto|aim|tel|xmpp):)'.
+            ')'.
+            '(?:[\pN\pL\-\_\+\%\~]+(?::[\pN\pL\-\_\+\%\~]+)?\@)?'. //user:pass@
+            '(?:'.
+            '(?:'.
+            '\[[\pN\pL\-\_\:\.]+(?<![\.\:])\]'. //[dns]
+            ')|(?:'.
+            '[\pN\pL\-\_\:\.]+(?<![\.\:])'. //dns
+            ')'.
+            ')'.
+            ')'.
+            '|(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)'. //IPv4
+            '|(?:'. //IPv6
+            '\[?(?:(?:(?:[0-9A-Fa-f]{1,4}:){7}(?:(?:[0-9A-Fa-f]{1,4})|:))|(?:(?:[0-9A-Fa-f]{1,4}:){6}(?::|(?:(?:25[0-5]|2[0-4]\d|[01]?\d{1,2})(?:\.(?:25[0-5]|2[0-4]\d|[01]?\d{1,2})){3})|(?::[0-9A-Fa-f]{1,4})))|(?:(?:[0-9A-Fa-f]{1,4}:){5}(?:(?::(?:(?:25[0-5]|2[0-4]\d|[01]?\d{1,2})(?:\.(?:25[0-5]|2[0-4]\d|[01]?\d{1,2})){3})?)|(?:(?::[0-9A-Fa-f]{1,4}){1,2})))|(?:(?:[0-9A-Fa-f]{1,4}:){4}(?::[0-9A-Fa-f]{1,4}){0,1}(?:(?::(?:(?:25[0-5]|2[0-4]\d|[01]?\d{1,2})(?:\.(?:25[0-5]|2[0-4]\d|[01]?\d{1,2})){3})?)|(?:(?::[0-9A-Fa-f]{1,4}){1,2})))|(?:(?:[0-9A-Fa-f]{1,4}:){3}(?::[0-9A-Fa-f]{1,4}){0,2}(?:(?::(?:(?:25[0-5]|2[0-4]\d|[01]?\d{1,2})(?:\.(?:25[0-5]|2[0-4]\d|[01]?\d{1,2})){3})?)|(?:(?::[0-9A-Fa-f]{1,4}){1,2})))|(?:(?:[0-9A-Fa-f]{1,4}:){2}(?::[0-9A-Fa-f]{1,4}){0,3}(?:(?::(?:(?:25[0-5]|2[0-4]\d|[01]?\d{1,2})(?:\.(?:25[0-5]|2[0-4]\d|[01]?\d{1,2})){3})?)|(?:(?::[0-9A-Fa-f]{1,4}){1,2})))|(?:(?:[0-9A-Fa-f]{1,4}:)(?::[0-9A-Fa-f]{1,4}){0,4}(?:(?::(?:(?:25[0-5]|2[0-4]\d|[01]?\d{1,2})(?:\.(?:25[0-5]|2[0-4]\d|[01]?\d{1,2})){3})?)|(?:(?::[0-9A-Fa-f]{1,4}){1,2})))|(?::(?::[0-9A-Fa-f]{1,4}){0,5}(?:(?::(?:(?:25[0-5]|2[0-4]\d|[01]?\d{1,2})(?:\.(?:25[0-5]|2[0-4]\d|[01]?\d{1,2})){3})?)|(?:(?::[0-9A-Fa-f]{1,4}){1,2})))|(?:(?:(?:25[0-5]|2[0-4]\d|[01]?\d{1,2})(?:\.(?:25[0-5]|2[0-4]\d|[01]?\d{1,2})){3})))\]?(?<!:)'.
+            ')|(?:'. //DNS
+            '(?:[\pN\pL\-\_\+\%\~]+(?:\:[\pN\pL\-\_\+\%\~]+)?\@)?'. //user:pass@
+            '[\pN\pL\-\_]+(?:\.[\pN\pL\-\_]+)*\.'.
+            //tld list from http://data.iana.org/TLD/tlds-alpha-by-domain.txt, also added local, loc, and onion
+            '(?: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|XN--0ZWM56D|测试|XN--11B5BS3A9AJ6G|परीक�षा|XN--80AKHBYKNJ4F|и�пытание|XN--9T4B11YI5A|테스트|XN--DEBA0AD|טעסט|XN--G6W251D|測試|XN--HGBK6AJ7F53BBA|آزمایشی|XN--HLCJ6AYA9ESC7A|பரிட�சை|XN--JXALPDLP|δοκιμή|XN--KGBECHTV|إختبار|XN--ZCKZAH|テスト|YE|YT|YU|ZA|ZM|ZW|local|loc|onion)'.
+            ')(?![\pN\pL\-\_])'.
+            ')'.
+            '(?:'.
+            '(?:\:\d+)?'. //:port
+            '(?:/[\pN\pL$\,\!\(\)\.\:\-\_\+\/\=\&\;\%\~\*\$\+\'@]*)?'. // /path
+            '(?:\?[\pN\pL\$\,\!\(\)\.\:\-\_\+\/\=\&\;\%\~\*\$\+\'@\/]*)?'. // ?query string
+            '(?:\#[\pN\pL$\,\!\(\)\.\:\-\_\+\/\=\&\;\%\~\*\$\+\'\@/\?\#]*)?'. // #fragment
+            ')(?<![\?\.\,\#\,])'.
+            ')'.
+            '$#ixu';
+        return preg_match($regex, $q);
+    }
+
     /**
      * Do we need to write to the database?
      *
diff --git a/actions/apistatusesupdate.php b/actions/apistatusesupdate.php
index b0f3527160..c772f96afc 100644
--- a/actions/apistatusesupdate.php
+++ b/actions/apistatusesupdate.php
@@ -231,32 +231,12 @@ class ApiStatusesUpdateAction extends ApiAuthAction
             return;
         }
 
-        $status_shortened = $this->auth_user->shortenlinks($this->status);
-
-        if (Notice::contentTooLong($status_shortened)) {
-            // Note: Twitter truncates anything over 140, flags the status
-            // as "truncated."
-
-            $this->clientError(
-                sprintf(
-                    // TRANS: Client error displayed exceeding the maximum notice length.
-                    // TRANS: %d is the maximum length for a notice.
-                    _m('That\'s too long. Maximum notice size is %d character.',
-                      'That\'s too long. Maximum notice size is %d characters.',
-                      Notice::maxContent()),
-                    Notice::maxContent()
-                ),
-                406,
-                $this->format
-            );
-
-            return;
-        }
+        /* Do not call shortenlinks until the whole notice has been build */
 
         // Check for commands
 
         $inter = new CommandInterpreter();
-        $cmd = $inter->handle_command($this->auth_user, $status_shortened);
+        $cmd = $inter->handle_command($this->auth_user, $this->status);
 
         if ($cmd) {
             if ($this->supported($cmd)) {
@@ -299,23 +279,32 @@ class ApiStatusesUpdateAction extends ApiAuthAction
             }
 
             if (isset($upload)) {
-                $status_shortened .= ' ' . $upload->shortUrl();
+                $this->status .= ' ' . $upload->shortUrl();
 
-                if (Notice::contentTooLong($status_shortened)) {
-                    $upload->delete();
-                    // TRANS: Client error displayed exceeding the maximum notice length.
-                    // TRANS: %d is the maximum lenth for a notice.
-                    $msg = _m('Maximum notice size is %d character, including attachment URL.',
-                             'Maximum notice size is %d characters, including attachment URL.',
-                             Notice::maxContent());
-                    $this->clientError(
-                        sprintf($msg, Notice::maxContent()),
-                        400,
-                        $this->format
-                    );
-                }
+                /* Do not call shortenlinks until the whole notice has been build */
             }
 
+            /* Do call shortenlinks here & check notice length since notice is about to be saved & sent */
+            $status_shortened = $this->auth_user->shortenlinks($this->status);
+
+            if (Notice::contentTooLong($status_shortened)) {
+                if (isset($upload)) {
+                    $upload->delete();
+                }
+                // TRANS: Client error displayed exceeding the maximum notice length.
+                // TRANS: %d is the maximum lenth for a notice.
+                $msg = _m('Maximum notice size is %d character, including attachment URL.',
+                          'Maximum notice size is %d characters, including attachment URL.',
+                          Notice::maxContent());
+                /* Use HTTP 413 error code (Request Entity Too Large)
+                 * instead of basic 400 for better understanding
+                 */
+                $this->clientError(sprintf($msg, Notice::maxContent()),
+                                   413,
+                                   $this->format);
+            }
+
+
             $content = html_entity_decode($status_shortened, ENT_NOQUOTES, 'UTF-8');
 
             $options = array('reply_to' => $reply_to);
diff --git a/actions/apitimelinefavorites.php b/actions/apitimelinefavorites.php
index 2c962b450a..e2cb7c2ee2 100644
--- a/actions/apitimelinefavorites.php
+++ b/actions/apitimelinefavorites.php
@@ -170,7 +170,7 @@ class ApiTimelineFavoritesAction extends ApiBareAuthAction
             $this->showJsonTimeline($this->notices);
             break;
         case 'as':
-            header('Content-Type: application/json; charset=utf-8');
+            header('Content-Type: ' . ActivityStreamJSONDocument::CONTENT_TYPE);
             $doc = new ActivityStreamJSONDocument($this->auth_user);
             $doc->setTitle($title);
             $doc->addLink($link,'alternate', 'text/html');
diff --git a/actions/apitimelinefriends.php b/actions/apitimelinefriends.php
index 279265a30e..591baccfcc 100644
--- a/actions/apitimelinefriends.php
+++ b/actions/apitimelinefriends.php
@@ -266,16 +266,15 @@ class ApiTimelineFriendsAction extends ApiBareAuthAction
             $this->showJsonTimeline($this->notices);
             break;
         case 'as':
-            header('Content-Type: application/json; charset=utf-8');
-            $doc = new ActivityStreamJSONDocument($this->auth_user);
-            $doc->setTitle($title);
-            $doc->addLink($link,'alternate', 'text/html');
+            header('Content-Type: ' . ActivityStreamJSONDocument::CONTENT_TYPE);
+            $doc = new ActivityStreamJSONDocument($this->auth_user, $title);
+            $doc->addLink($link, 'alternate', 'text/html');
             $doc->addItemsFromNotices($this->notices);
             $this->raw($doc->asString());
             break;
         default:
             // TRANS: Client error displayed when coming across a non-supported API method.
-            $this->clientError(_('API method not found.'), $code = 404);
+            $this->clientError(_('API method not found.'), 404);
             break;
         }
     }
@@ -289,7 +288,13 @@ class ApiTimelineFriendsAction extends ApiBareAuthAction
     {
         $notices = array();
 
-        $stream = new InboxNoticeStream($this->user);
+        $profile = null;
+
+        if (isset($this->auth_user)) {
+            $profile = $this->auth_user->getProfile();
+        }
+
+        $stream = new InboxNoticeStream($this->user, $profile);
         
         $notice = $stream->getNotices(($this->page-1) * $this->count,
                                       $this->count,
diff --git a/actions/apitimelinegroup.php b/actions/apitimelinegroup.php
index 3fc930fa08..5a0ea60c7e 100644
--- a/actions/apitimelinegroup.php
+++ b/actions/apitimelinegroup.php
@@ -106,10 +106,8 @@ class ApiTimelineGroupAction extends ApiPrivateAuthAction
 
         $self = $this->getSelfUri();
 
-        $link = common_local_url(
-            'ApiTimelineGroup',
-            array('nickname' => $this->group->nickname)
-        );
+        $link = common_local_url('showgroup',
+                                 array('nickname' => $this->group->nickname));
 
         switch($this->format) {
         case 'xml':
@@ -135,7 +133,7 @@ class ApiTimelineGroupAction extends ApiPrivateAuthAction
             $this->showJsonTimeline($this->notices);
             break;
         case 'as':
-            header('Content-Type: application/json; charset=utf-8');
+            header('Content-Type: ' . ActivityStreamJSONDocument::CONTENT_TYPE);
             $doc = new ActivityStreamJSONDocument($this->auth_user);
             $doc->setTitle($atom->title);
             $doc->addLink($link, 'alternate', 'text/html');
diff --git a/actions/apitimelinehome.php b/actions/apitimelinehome.php
index 3c18a5b0bf..22c6cc5f94 100644
--- a/actions/apitimelinehome.php
+++ b/actions/apitimelinehome.php
@@ -169,7 +169,7 @@ class ApiTimelineHomeAction extends ApiBareAuthAction
             $this->showJsonTimeline($this->notices);
             break;
         case 'as':
-            header('Content-Type: application/json; charset=utf-8');
+            header('Content-Type: ' . ActivityStreamJSONDocument::CONTENT_TYPE);
             $doc = new ActivityStreamJSONDocument($this->auth_user);
             $doc->setTitle($title);
             $doc->addLink($link, 'alternate', 'text/html');
@@ -192,7 +192,13 @@ class ApiTimelineHomeAction extends ApiBareAuthAction
     {
         $notices = array();
 
-        $stream = new InboxNoticeStream($this->user);
+        $profile = null;
+
+        if (isset($this->auth_user)) {
+            $profile = $this->auth_user->getProfile();
+        }
+
+        $stream = new InboxNoticeStream($this->user, $profile);
         
         $notice = $stream->getNotices(($this->page-1) * $this->count,
                                       $this->count,
diff --git a/actions/apitimelinementions.php b/actions/apitimelinementions.php
index ecd2a1a0e6..07fbdf0b67 100644
--- a/actions/apitimelinementions.php
+++ b/actions/apitimelinementions.php
@@ -170,7 +170,7 @@ class ApiTimelineMentionsAction extends ApiBareAuthAction
             $this->showJsonTimeline($this->notices);
             break;
         case 'as':
-            header('Content-Type: application/json; charset=utf-8');
+            header('Content-Type: ' . ActivityStreamJSONDocument::CONTENT_TYPE);
             $doc = new ActivityStreamJSONDocument($this->auth_user);
             $doc->setTitle($title);
             $doc->addLink($link, 'alternate', 'text/html');
@@ -193,10 +193,18 @@ class ApiTimelineMentionsAction extends ApiBareAuthAction
     {
         $notices = array();
 
-        $notice = $this->user->getReplies(
-            ($this->page - 1) * $this->count, $this->count,
-            $this->since_id, $this->max_id
-        );
+        if (empty($this->auth_user)) {
+            $profile = null; 
+        } else {
+            $profile = $this->auth_user->getProfile();
+        }
+
+        $stream = new ReplyNoticeStream($this->user->id, $profile);
+
+        $notice = $stream->getNotices(($this->page - 1) * $this->count,
+                                      $this->count,
+                                      $this->since_id,
+                                      $this->max_id);
 
         while ($notice->fetch()) {
             $notices[] = clone($notice);
diff --git a/actions/apitimelinepublic.php b/actions/apitimelinepublic.php
index a786aa15cc..b82e01aafe 100644
--- a/actions/apitimelinepublic.php
+++ b/actions/apitimelinepublic.php
@@ -235,7 +235,7 @@ class ApiTimelinePublicAction extends ApiPrivateAuthAction
             $this->showJsonTimeline($this->notices);
             break;
         case 'as':
-            header('Content-Type: application/json; charset=utf-8');
+            header('Content-Type: ' . ActivityStreamJSONDocument::CONTENT_TYPE);
             $doc = new ActivityStreamJSONDocument($this->auth_user);
             $doc->setTitle($title);
             $doc->addLink($link, 'alternate', 'text/html');
@@ -258,14 +258,18 @@ class ApiTimelinePublicAction extends ApiPrivateAuthAction
     {
         $notices = array();
 
-        $notice = Notice::publicStream(
-            ($this->page - 1) * $this->count, $this->count, $this->since_id,
-            $this->max_id
-        );
+        $profile = ($this->auth_user) ? $this->auth_user->getProfile() : null;
 
-        while ($notice->fetch()) {
-            $notices[] = clone($notice);
-        }
+        $stream = new PublicNoticeStream($profile);
+
+        $notice = $stream->getNotices(($this->page - 1) * $this->count,
+                                      $this->count,
+                                      $this->since_id,
+                                      $this->max_id);
+
+        $notices = $notice->fetchAll();
+
+        NoticeList::prefill($notices);
 
         return $notices;
     }
diff --git a/actions/apitimelineretweetedtome.php b/actions/apitimelineretweetedtome.php
index ef943f4f88..2ea84f16e3 100644
--- a/actions/apitimelineretweetedtome.php
+++ b/actions/apitimelineretweetedtome.php
@@ -138,7 +138,7 @@ class ApiTimelineRetweetedToMeAction extends ApiAuthAction
 
             break;
         case 'as':
-            header('Content-Type: application/json; charset=utf-8');
+            header('Content-Type: ' . ActivityStreamJSONDocument::CONTENT_TYPE);
             $doc = new ActivityStreamJSONDocument($this->auth_user);
             $doc->setTitle($title);
             $doc->addLink($link, 'alternate', 'text/html');
diff --git a/actions/apitimelineretweetsofme.php b/actions/apitimelineretweetsofme.php
index d38e730ac6..d01db87b93 100644
--- a/actions/apitimelineretweetsofme.php
+++ b/actions/apitimelineretweetsofme.php
@@ -115,7 +115,15 @@ class ApiTimelineRetweetsOfMeAction extends ApiAuthAction
              array('nickname' => $this->auth_user->nickname)
         );
 
-        $strm = $this->auth_user->repeatsOfMe($offset, $limit, $this->since_id, $this->max_id);
+        // This is a really bad query for some reason
+
+        if (!common_config('performance', 'high')) {
+            $strm = $this->auth_user->repeatsOfMe($offset, $limit, $this->since_id, $this->max_id);
+        } else {
+            $strm = new Notice();
+            $strm->whereAdd('0 = 1');
+            $strm->find();
+        }
 
         switch ($this->format) {
         case 'xml':
@@ -137,7 +145,7 @@ class ApiTimelineRetweetsOfMeAction extends ApiAuthAction
             $this->raw($atom->getString());
             break;
         case 'as':
-            header('Content-Type: application/json; charset=utf-8');
+            header('Content-Type: ' . ActivityStreamJSONDocument::CONTENT_TYPE);
             $doc = new ActivityStreamJSONDocument($this->auth_user);
             $doc->setTitle($title);
             $doc->addLink($link, 'alternate', 'text/html');
diff --git a/actions/apitimelinetag.php b/actions/apitimelinetag.php
index 6c3b135ed9..31e18cf8ee 100644
--- a/actions/apitimelinetag.php
+++ b/actions/apitimelinetag.php
@@ -153,7 +153,7 @@ class ApiTimelineTagAction extends ApiPrivateAuthAction
             $this->showJsonTimeline($this->notices);
             break;
         case 'as':
-            header('Content-Type: application/json; charset=utf-8');
+            header('Content-Type: ' . ActivityStreamJSONDocument::CONTENT_TYPE);
             $doc = new ActivityStreamJSONDocument($this->auth_user);
             $doc->setTitle($title);
             $doc->addLink($link, 'alternate', 'text/html');
diff --git a/actions/apitimelineuser.php b/actions/apitimelineuser.php
index b0681c191a..62d0a5e0d5 100644
--- a/actions/apitimelineuser.php
+++ b/actions/apitimelineuser.php
@@ -202,7 +202,7 @@ class ApiTimelineUserAction extends ApiBareAuthAction
             $this->showJsonTimeline($this->notices);
             break;
         case 'as':
-            header('Content-Type: application/json; charset=utf-8');
+            header('Content-Type: ' . ActivityStreamJSONDocument::CONTENT_TYPE);
             $doc = new ActivityStreamJSONDocument($this->auth_user);
             $doc->setTitle($atom->title);
             $doc->addLink($link, 'alternate', 'text/html');
@@ -447,7 +447,7 @@ class ApiTimelineUserAction extends ApiBareAuthAction
                 } else {
                     $group = User_group::staticGet('uri', $uri);
                     if (!empty($group)) {
-                        $options['groups'][] = $uri;
+                        $options['groups'][] = $group->id;
                     } else {
                         // @fixme: hook for discovery here
                         common_log(LOG_WARNING, sprintf('AtomPub post with unknown attention URI %s', $uri));
diff --git a/actions/approvesub.php b/actions/approvesub.php
index be07b6e877..5fbb2149bd 100644
--- a/actions/approvesub.php
+++ b/actions/approvesub.php
@@ -73,6 +73,7 @@ class ApprovesubAction extends Action
 
         if (empty($this->request)) {
             // TRANS: Client error displayed trying to approve subscription for a non-existing request.
+            // TRANS: %s is a user nickname.
             $this->clientError(sprintf(_('%s is not in the moderation queue for your subscriptions.'), $this->profile->nickname), 403);
         }
 
diff --git a/actions/attachment.php b/actions/attachment.php
index 22018ab043..f149ca19d9 100644
--- a/actions/attachment.php
+++ b/actions/attachment.php
@@ -173,7 +173,9 @@ class AttachmentAction extends Action
     function showSections() {
         $ns = new AttachmentNoticeSection($this);
         $ns->show();
-        $atcs = new AttachmentTagCloudSection($this);
-        $atcs->show();
+        if (!common_config('performance', 'high')) {
+            $atcs = new AttachmentTagCloudSection($this);
+            $atcs->show();
+        }
     }
 }
diff --git a/actions/blockedfromgroup.php b/actions/blockedfromgroup.php
index dd916b170a..caf3911d7d 100644
--- a/actions/blockedfromgroup.php
+++ b/actions/blockedfromgroup.php
@@ -40,7 +40,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
-class BlockedfromgroupAction extends GroupDesignAction
+class BlockedfromgroupAction extends GroupAction
 {
     var $page = null;
 
@@ -122,12 +122,6 @@ class BlockedfromgroupAction extends GroupDesignAction
                        _('A list of the users blocked from joining this group.'));
     }
 
-    function showObjectNav()
-    {
-        $nav = new GroupNav($this, $this->group);
-        $nav->show();
-    }
-
     function showContent()
     {
         $offset = ($this->page-1) * PROFILES_PER_PAGE;
diff --git a/actions/conversation.php b/actions/conversation.php
index f33d267d35..aa2539d213 100644
--- a/actions/conversation.php
+++ b/actions/conversation.php
@@ -123,13 +123,49 @@ class ConversationAction extends Action
      */
     function showContent()
     {
-        $tnl = new FullThreadedNoticeList($this->notices, $this, $this->userProfile);
+        $user = common_current_user();
 
-        $cnt = $tnl->show();
+        if (!empty($user) && $user->conversationTree()) {
+            $nl = new ConversationTree($this->notices, $this);
+        } else {
+            $nl = new FullThreadedNoticeList($this->notices, $this, $this->userProfile);
+        }
+
+        $cnt = $nl->show();
     }
 
     function isReadOnly()
     {
         return true;
     }
+    
+    function getFeeds()
+    {
+    	
+        return array(new Feed(Feed::JSON,
+                              common_local_url('apiconversation',
+                                               array(
+                                                    'id' => $this->id,
+                                                    'format' => 'as')),
+                              // TRANS: Title for link to notice feed.
+                              // TRANS: %s is a user nickname.
+                              _('Conversation feed (Activity Streams JSON)')),
+                     new Feed(Feed::RSS2,
+                              common_local_url('apiconversation',
+                                               array(
+                                                    'id' => $this->id,
+                                                    'format' => 'rss')),
+                              // TRANS: Title for link to notice feed.
+                              // TRANS: %s is a user nickname.
+                              _('Conversation feed (RSS 2.0)')),
+                     new Feed(Feed::ATOM,
+                              common_local_url('apiconversation',
+                                               array(
+                                                    'id' => $this->id,
+                                                    'format' => 'atom')),
+                              // TRANS: Title for link to notice feed.
+                              // TRANS: %s is a user nickname.
+                              _('Conversation feed (Activity Streams JSON)')));
+    }
 }
+
diff --git a/actions/deleteaccount.php b/actions/deleteaccount.php
index 614519d474..8b80c6c6f2 100644
--- a/actions/deleteaccount.php
+++ b/actions/deleteaccount.php
@@ -320,6 +320,6 @@ class DeleteAccountForm extends Form
                            'submit',
                            null,
                            // TRANS: Button title for user account deletion.
-                           _('Permanently delete your account'));
+                           _('Permanently delete your account.'));
     }
 }
diff --git a/actions/designadminpanel.php b/actions/designadminpanel.php
deleted file mode 100644
index a77b842fe3..0000000000
--- a/actions/designadminpanel.php
+++ /dev/null
@@ -1,738 +0,0 @@
-<?php
-/**
- * StatusNet, the distributed open-source microblogging tool
- *
- * Design administration panel
- *
- * PHP version 5
- *
- * LICENCE: This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * @category  Settings
- * @package   StatusNet
- * @author    Evan Prodromou <evan@status.net>
- * @author    Zach Copley <zach@status.net>
- * @author    Sarven Capadisli <csarven@status.net>
- * @copyright 2008-2009 StatusNet, Inc.
- * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://status.net/
- */
-
-if (!defined('STATUSNET')) {
-    exit(1);
-}
-
-/**
- * Administer design settings
- *
- * @category Admin
- * @package  StatusNet
- * @author   Evan Prodromou <evan@status.net>
- * @author   Zach Copley <zach@status.net>
- * @author   Sarven Capadisli <csarven@status.net>
- * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://status.net/
- */
-class DesignadminpanelAction extends AdminPanelAction
-{
-    /* The default site design */
-    var $design = null;
-
-    /**
-     * Returns the page title
-     *
-     * @return string page title
-     */
-    function title()
-    {
-        // TRANS: Message used as title for design settings for the site.
-        return _('Design');
-    }
-
-    /**
-     * Instructions for using this form.
-     *
-     * @return string instructions
-     */
-    function getInstructions()
-    {
-        // TRANS: Instructions for design adminsitration panel.
-        return _('Design settings for this StatusNet site');
-    }
-
-    /**
-     * Get the default design and show the design admin panel form
-     *
-     * @return void
-     */
-    function showForm()
-    {
-        $this->design = Design::siteDesign();
-        $form = new DesignAdminPanelForm($this);
-        $form->show();
-        return;
-    }
-
-    /**
-     * Save settings from the form
-     *
-     * @return void
-     */
-    function saveSettings()
-    {
-        if ($this->arg('save')) {
-            $this->saveDesignSettings();
-        } else if ($this->arg('defaults')) {
-            $this->restoreDefaults();
-        } else {
-            // TRANS: Client error displayed when the submitted form contains unexpected data.
-            $this->clientError(_('Unexpected form submission.'));
-        }
-    }
-
-    /**
-     * Save the new design settings
-     *
-     * @return void
-     */
-    function saveDesignSettings()
-    {
-        // Workaround for PHP returning empty $_POST and $_FILES when POST
-        // length > post_max_size in php.ini
-
-        if (empty($_FILES)
-            && empty($_POST)
-            && ($_SERVER['CONTENT_LENGTH'] > 0)
-        ) {
-            // TRANS: Client error displayed when the number of bytes in a POST request exceeds a limit.
-            // TRANS: %s is the number of bytes of the CONTENT_LENGTH.
-            $msg = _m('The server was unable to handle that much POST data (%s byte) due to its current configuration.',
-                      'The server was unable to handle that much POST data (%s bytes) due to its current configuration.',
-                      intval($_SERVER['CONTENT_LENGTH']));
-            $this->clientException(sprintf($msg, $_SERVER['CONTENT_LENGTH']));
-            return;
-        }
-
-        // check for file uploads
-
-        $bgimage = $this->saveBackgroundImage();
-        $customTheme = $this->saveCustomTheme();
-
-        $oldtheme = common_config('site', 'theme');
-        if ($customTheme) {
-            // This feels pretty hacky :D
-            $this->args['theme'] = $customTheme;
-            $themeChanged = true;
-        } else {
-            $themeChanged = ($this->trimmed('theme') != $oldtheme);
-        }
-
-        static $settings = array('theme', 'logo', 'ssllogo');
-
-        $values = array();
-
-        foreach ($settings as $setting) {
-            $values[$setting] = $this->trimmed($setting);
-        }
-
-        $this->validate($values);
-
-        $config = new Config();
-
-        $config->query('BEGIN');
-
-        if ($themeChanged) {
-            // If the theme has changed, reset custom colors and let them pick
-            // up the new theme's defaults.
-            $colors = array('background', 'content', 'sidebar', 'text', 'link');
-            foreach ($colors as $colorKey) {
-                // Clear from global config so we see defaults on this page...
-                $GLOBALS['config']['design'][$colorKey . 'color'] = false;
-
-                // And remove old settings from DB...
-                $this->deleteSetting('design', $colorKey . 'color');
-            }
-        } else {
-            // Only save colors from the form if the theme has not changed.
-            //
-            // @fixme a future more ajaxy form should allow theme switch
-            // and color customization in one step.
-
-            $bgcolor = new WebColor($this->trimmed('design_background'));
-            $ccolor  = new WebColor($this->trimmed('design_content'));
-            $sbcolor = new WebColor($this->trimmed('design_sidebar'));
-            $tcolor  = new WebColor($this->trimmed('design_text'));
-            $lcolor  = new WebColor($this->trimmed('design_links'));
-
-            Config::save('design', 'backgroundcolor', $bgcolor->intValue());
-            Config::save('design', 'contentcolor', $ccolor->intValue());
-            Config::save('design', 'sidebarcolor', $sbcolor->intValue());
-            Config::save('design', 'textcolor', $tcolor->intValue());
-            Config::save('design', 'linkcolor', $lcolor->intValue());
-        }
-
-        $onoff = $this->arg('design_background-image_onoff');
-
-        $on   = false;
-        $off  = false;
-
-        if ($onoff == 'on') {
-            $on = true;
-        } else {
-            $off = true;
-        }
-
-        $tile = $this->boolean('design_background-image_repeat');
-
-        // Hack to use Design's bit setter
-        $scratch = new Design();
-        $scratch->setDisposition($on, $off, $tile);
-
-        Config::save('design', 'disposition', $scratch->disposition);
-
-        foreach ($settings as $setting) {
-            Config::save('site', $setting, $values[$setting]);
-        }
-
-        if (isset($bgimage)) {
-            Config::save('design', 'backgroundimage', $bgimage);
-        }
-
-        if (common_config('custom_css', 'enabled')) {
-            $css = $this->arg('css');
-            if ($css != common_config('custom_css', 'css')) {
-                Config::save('custom_css', 'css', $css);
-            }
-        }
-
-        $config->query('COMMIT');
-    }
-
-    /**
-     * Restore the default design
-     *
-     * @return void
-     */
-    function restoreDefaults()
-    {
-        $this->deleteSetting('site', 'logo');
-        $this->deleteSetting('site', 'ssllogo');
-        $this->deleteSetting('site', 'theme');
-
-        $settings = array(
-            'theme', 'backgroundimage', 'backgroundcolor', 'contentcolor',
-            'sidebarcolor', 'textcolor', 'linkcolor', 'disposition'
-        );
-
-        foreach ($settings as $setting) {
-            $this->deleteSetting('design', $setting);
-        }
-
-        // XXX: Should we restore the default dir settings, etc.? --Z
-
-        // XXX: I can't get it to show the new settings without forcing
-        // this terrible reload -- FIX ME!
-        common_redirect(common_local_url('designadminpanel'), 303);
-    }
-
-    /**
-     * Save the background image if the user uploaded one
-     *
-     * @return string $filename the filename of the image
-     */
-    function saveBackgroundImage()
-    {
-        $filename = null;
-        if (isset($_FILES['design_background-image_file']['error']) &&
-            $_FILES['design_background-image_file']['error'] ==
-            UPLOAD_ERR_OK) {
-
-            $filepath = null;
-
-            try {
-                $imagefile =
-                    ImageFile::fromUpload('design_background-image_file');
-            } catch (Exception $e) {
-                $this->clientError('Unable to save background image.');
-                return;
-            }
-
-            // Note: site design background image has a special filename
-
-            $filename = Design::filename('site-design-background',
-                image_type_to_extension($imagefile->type),
-                    common_timestamp());
-
-            $filepath = Design::path($filename);
-
-            move_uploaded_file($imagefile->filepath, $filepath);
-
-            // delete any old backround img laying around
-
-            if (isset($this->design->backgroundimage)) {
-                @unlink(Design::path($design->backgroundimage));
-            }
-
-            return $filename;
-        }
-    }
-
-    /**
-     * Save the custom theme if the user uploaded one.
-     *
-     * @return mixed custom theme name, if succesful, or null if no theme upload.
-     * @throws ClientException for invalid theme archives
-     * @throws ServerException if trouble saving the theme files
-     */
-    function saveCustomTheme()
-    {
-        if (common_config('theme_upload', 'enabled') &&
-            $_FILES['design_upload_theme']['error'] == UPLOAD_ERR_OK) {
-
-            $upload = ThemeUploader::fromUpload('design_upload_theme');
-            $basedir = common_config('local', 'dir');
-            if (empty($basedir)) {
-                $basedir = INSTALLDIR . '/local';
-            }
-            $name = 'custom'; // @todo allow multiples, custom naming?
-            $outdir = $basedir . '/theme/' . $name;
-            $upload->extract($outdir);
-            return $name;
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * Attempt to validate setting values
-     *
-     * @return void
-     */
-    function validate(&$values)
-    {
-        if (!empty($values['logo']) &&
-            !Validate::uri($values['logo'], array('allowed_schemes' => array('http', 'https')))) {
-            // TRANS: Client error displayed when a logo URL does is not valid.
-            $this->clientError(_('Invalid logo URL.'));
-        }
-
-        if (!empty($values['ssllogo']) &&
-            !Validate::uri($values['ssllogo'], array('allowed_schemes' => array('https')))) {
-            // TRANS: Client error displayed when an SSL logo URL is invalid.
-            $this->clientError(_('Invalid SSL logo URL.'));
-        }
-
-        if (!in_array($values['theme'], Theme::listAvailable())) {
-            // TRANS: Client error displayed when a theme is submitted through the form that is not in the theme list.
-            // TRANS: %s is the chosen unavailable theme.
-            $this->clientError(sprintf(_('Theme not available: %s.'), $values['theme']));
-        }
-    }
-
-    /**
-     * Add the Farbtastic stylesheet
-     *
-     * @return void
-     */
-    function showStylesheets()
-    {
-        parent::showStylesheets();
-        $this->cssLink('js/farbtastic/farbtastic.css',null,'screen, projection, tv');
-    }
-
-    /**
-     * Add the Farbtastic scripts
-     *
-     * @return void
-     */
-    function showScripts()
-    {
-        parent::showScripts();
-
-        $this->script('farbtastic/farbtastic.js');
-        $this->script('userdesign.go.js');
-
-        $this->autofocus('design_background-image_file');
-    }
-
-}
-
-class DesignAdminPanelForm extends AdminForm
-{
-
-    /**
-     * ID of the form
-     *
-     * @return int ID of the form
-     */
-    function id()
-    {
-        return 'form_design_admin_panel';
-    }
-
-    /**
-     * class of the form
-     *
-     * @return string class of the form
-     */
-    function formClass()
-    {
-        return 'form_settings';
-    }
-
-    /**
-     * HTTP method used to submit the form
-     *
-     * For image data we need to send multipart/form-data
-     * so we set that here too
-     *
-     * @return string the method to use for submitting
-     */
-    function method()
-    {
-        $this->enctype = 'multipart/form-data';
-
-        return 'post';
-    }
-
-    /**
-     * Action of the form
-     *
-     * @return string URL of the action
-     */
-    function action()
-    {
-        return common_local_url('designadminpanel');
-    }
-
-    /**
-     * Data elements of the form
-     *
-     * @return void
-     */
-    function formData()
-    {
-        $this->showLogo();
-        $this->showTheme();
-        $this->showBackground();
-        $this->showColors();
-        $this->showAdvanced();
-    }
-
-    function showLogo()
-    {
-        $this->out->elementStart('fieldset', array('id' => 'settings_design_logo'));
-        // TRANS: Fieldset legend for form to change logo.
-        $this->out->element('legend', null, _('Change logo'));
-
-        $this->out->elementStart('ul', 'form_data');
-
-        $this->li();
-        $this->input('logo',
-                     // TRANS: Field label for StatusNet site logo.
-                     _('Site logo'),
-                     // TRANS: Title for field label for StatusNet site logo.
-                     'Logo for the site (full URL).');
-        $this->unli();
-
-        $this->li();
-        $this->input('ssllogo',
-                     // TRANS: Field label for SSL StatusNet site logo.
-                     _('SSL logo'),
-                     // TRANS: Title for field label for SSL StatusNet site logo.
-                     'Logo to show on SSL pages.');
-        $this->unli();
-
-        $this->out->elementEnd('ul');
-
-        $this->out->elementEnd('fieldset');
-
-    }
-
-    function showTheme()
-    {
-        $this->out->elementStart('fieldset', array('id' => 'settings_design_theme'));
-        // TRANS: Fieldset legend for form change StatusNet site's theme.
-        $this->out->element('legend', null, _('Change theme'));
-
-        $this->out->elementStart('ul', 'form_data');
-
-        $themes = Theme::listAvailable();
-
-        // XXX: listAvailable() can return an empty list if you
-        // screw up your settings, so just in case:
-
-        if (empty($themes)) {
-            $themes = array('default', 'default');
-        }
-
-        asort($themes);
-        $themes = array_combine($themes, $themes);
-
-        $this->li();
-        // TRANS: Field label for dropdown to choose site theme.
-        $this->out->dropdown('theme', _('Site theme'),
-                             // TRANS: Title for field label for dropdown to choose site theme.
-                             $themes, _('Theme for the site.'),
-                             false, $this->value('theme'));
-        $this->unli();
-
-        if (common_config('theme_upload', 'enabled')) {
-            $this->li();
-            // TRANS: Field label for uploading a cutom theme.
-            $this->out->element('label', array('for' => 'design_upload_theme'), _('Custom theme'));
-            $this->out->element('input', array('id' => 'design_upload_theme',
-                                               'name' => 'design_upload_theme',
-                                               'type' => 'file'));
-            // TRANS: Form instructions for uploading a cutom StatusNet theme.
-            $this->out->element('p', 'form_guide', _('You can upload a custom StatusNet theme as a .ZIP archive.'));
-            $this->unli();
-        }
-
-        $this->out->elementEnd('ul');
-
-        $this->out->elementEnd('fieldset');
-    }
-
-    function showBackground()
-    {
-        $design = $this->out->design;
-
-        $this->out->elementStart('fieldset', array('id' =>
-            'settings_design_background-image'));
-        // TRANS: Fieldset legend for theme background image.
-        $this->out->element('legend', null, _('Change background image'));
-        $this->out->elementStart('ul', 'form_data');
-
-        $this->li();
-        $this->out->element('input', array('name' => 'MAX_FILE_SIZE',
-                                          'type' => 'hidden',
-                                          'id' => 'MAX_FILE_SIZE',
-                                          'value' => ImageFile::maxFileSizeInt()));
-        $this->out->element('label', array('for' => 'design_background-image_file'),
-                               // TRANS: Field label for background image on theme designer page.
-                                _('Background'));
-        $this->out->element('input', array('name' => 'design_background-image_file',
-                                     'type' => 'file',
-                                     'id' => 'design_background-image_file'));
-        $this->out->element('p', 'form_guide',
-            // TRANS: Form guide for background image upload form on theme designer page.
-            sprintf(_('You can upload a background image for the site. ' .
-              'The maximum file size is %1$s.'), ImageFile::maxFileSize()));
-        $this->unli();
-
-        if (!empty($design->backgroundimage)) {
-
-            $this->out->elementStart('li', array('id' =>
-                'design_background-image_onoff'));
-
-            $this->out->element('img', array('src' =>
-                Design::url($design->backgroundimage)));
-
-            $attrs = array('name' => 'design_background-image_onoff',
-                           'type' => 'radio',
-                           'id' => 'design_background-image_on',
-                           'class' => 'radio',
-                           'value' => 'on');
-
-            if ($design->disposition & BACKGROUND_ON) {
-                $attrs['checked'] = 'checked';
-            }
-
-            $this->out->element('input', $attrs);
-
-            $this->out->element('label', array('for' => 'design_background-image_on',
-                                          'class' => 'radio'),
-                                          // TRANS: Used as radio button label to add a background image.
-                                          _('On'));
-
-            $attrs = array('name' => 'design_background-image_onoff',
-                           'type' => 'radio',
-                           'id' => 'design_background-image_off',
-                           'class' => 'radio',
-                           'value' => 'off');
-
-            if ($design->disposition & BACKGROUND_OFF) {
-                $attrs['checked'] = 'checked';
-            }
-
-            $this->out->element('input', $attrs);
-
-            $this->out->element('label', array('for' => 'design_background-image_off',
-                                          'class' => 'radio'),
-                                          // TRANS: Used as radio button label to not add a background image.
-                                          _('Off'));
-            // TRANS: Form guide for turning background image on or off on theme designer page.
-            $this->out->element('p', 'form_guide', _('Turn background image on or off.'));
-            $this->unli();
-
-            $this->li();
-            $this->out->checkbox('design_background-image_repeat',
-                            // TRANS: Checkbox label to title background image on theme designer page.
-                            _('Tile background image'),
-                            ($design->disposition & BACKGROUND_TILE) ? true : false);
-            $this->unli();
-        }
-
-        $this->out->elementEnd('ul');
-        $this->out->elementEnd('fieldset');
-    }
-
-    function showColors()
-    {
-        $design = $this->out->design;
-
-        $this->out->elementStart('fieldset', array('id' => 'settings_design_color'));
-        // TRANS: Fieldset legend for theme colors.
-        $this->out->element('legend', null, _('Change colors'));
-
-        $this->out->elementStart('ul', 'form_data');
-
-        try {
-            // @fixme avoid loop unrolling in non-performance-critical contexts like this
-
-            $bgcolor = new WebColor($design->backgroundcolor);
-
-            $this->li();
-            // TRANS: Field label for background color selector.
-            $this->out->element('label', array('for' => 'swatch-1'), _('Background'));
-            $this->out->element('input', array('name' => 'design_background',
-                                          'type' => 'text',
-                                          'id' => 'swatch-1',
-                                          'class' => 'swatch',
-                                          'maxlength' => '7',
-                                          'size' => '7',
-                                          'value' => ''));
-            $this->unli();
-
-            $ccolor = new WebColor($design->contentcolor);
-
-            $this->li();
-            // TRANS: Field label for content color selector.
-            $this->out->element('label', array('for' => 'swatch-2'), _('Content'));
-            $this->out->element('input', array('name' => 'design_content',
-                                          'type' => 'text',
-                                          'id' => 'swatch-2',
-                                          'class' => 'swatch',
-                                          'maxlength' => '7',
-                                          'size' => '7',
-                                          'value' => ''));
-            $this->unli();
-
-            $sbcolor = new WebColor($design->sidebarcolor);
-
-            $this->li();
-            // TRANS: Field label for sidebar color selector.
-            $this->out->element('label', array('for' => 'swatch-3'), _('Sidebar'));
-            $this->out->element('input', array('name' => 'design_sidebar',
-                                        'type' => 'text',
-                                        'id' => 'swatch-3',
-                                        'class' => 'swatch',
-                                        'maxlength' => '7',
-                                        'size' => '7',
-                                        'value' => ''));
-            $this->unli();
-
-            $tcolor = new WebColor($design->textcolor);
-
-            $this->li();
-            // TRANS: Field label for text color selector.
-            $this->out->element('label', array('for' => 'swatch-4'), _('Text'));
-            $this->out->element('input', array('name' => 'design_text',
-                                        'type' => 'text',
-                                        'id' => 'swatch-4',
-                                        'class' => 'swatch',
-                                        'maxlength' => '7',
-                                        'size' => '7',
-                                        'value' => ''));
-            $this->unli();
-
-            $lcolor = new WebColor($design->linkcolor);
-
-            $this->li();
-            // TRANS: Field label for link color selector.
-            $this->out->element('label', array('for' => 'swatch-5'), _('Links'));
-            $this->out->element('input', array('name' => 'design_links',
-                                         'type' => 'text',
-                                         'id' => 'swatch-5',
-                                         'class' => 'swatch',
-                                         'maxlength' => '7',
-                                         'size' => '7',
-                                         'value' => ''));
-            $this->unli();
-
-        } catch (WebColorException $e) {
-            // @fixme normalize them individually!
-            common_log(LOG_ERR, 'Bad color values in site design: ' .
-                $e->getMessage());
-        }
-
-        $this->out->elementEnd('fieldset');
-
-        $this->out->elementEnd('ul');
-    }
-
-    function showAdvanced()
-    {
-        if (common_config('custom_css', 'enabled')) {
-            $this->out->elementStart('fieldset', array('id' => 'settings_design_advanced'));
-            // TRANS: Fieldset legend for advanced theme design settings.
-            $this->out->element('legend', null, _('Advanced'));
-            $this->out->elementStart('ul', 'form_data');
-
-            $this->li();
-            // TRANS: Field label for custom CSS.
-            $this->out->element('label', array('for' => 'css'), _('Custom CSS'));
-            $this->out->element('textarea', array('name' => 'css',
-                                            'id' => 'css',
-                                            'cols' => '50',
-                                            'rows' => '10'),
-                                strval(common_config('custom_css', 'css')));
-            $this->unli();
-
-            $this->out->elementEnd('fieldset');
-            $this->out->elementEnd('ul');
-        }
-    }
-
-    /**
-     * Action elements
-     *
-     * @return void
-     */
-
-    function formActions()
-    {
-        // TRANS: Button text for resetting theme settings.
-        $this->out->submit('defaults', _m('BUTTON','Use defaults'), 'submit form_action-default',
-                // TRANS: Title for button for resetting theme settings.
-                'defaults', _('Restore default designs.'));
-
-        $this->out->element('input', array('id' => 'settings_design_reset',
-                                         'type' => 'reset',
-                                         // TRANS: Button text for resetting theme settings.
-                                         'value' => 'Reset',
-                                         'class' => 'submit form_action-primary',
-                                         // TRANS: Title for button for resetting theme settings.
-                                         'title' => _('Reset back to default.')));
-
-        $this->out->submit('save',
-                           // TRANS: Button text for saving theme settings.
-                           _m('BUTTON','Save'),
-                           'submit form_action-secondary',
-                           'save',
-                           // TRANS: Title for button for saving theme settings.
-                           _('Save design.'));
-    }
-}
diff --git a/actions/doc.php b/actions/doc.php
index 95f76fb9dd..c26b290902 100644
--- a/actions/doc.php
+++ b/actions/doc.php
@@ -162,4 +162,72 @@ class DocAction extends Action
             Event::handle('EndLoadDoc', array($this->title, &$this->output));
         }
     }
+
+    function showLocalNav()
+    {
+        $menu = new DocNav($this);
+        $menu->show();
+    }
+}
+
+class DocNav extends Menu
+{
+    function show()
+    {
+        $stub = new HomeStubNav($this->action);
+        $this->submenu(_m('MENU','Home'), $stub);
+
+        $docs = new DocListNav($this->action);
+        $this->submenu(_m('MENU','Docs'), $docs);
+    }
+}
+
+class DocListNav extends Menu
+{
+    function getItems()
+    {
+        $items = array();
+
+        if (Event::handle('StartDocsMenu', array(&$items))) {
+
+            $items = array(array('doc',
+                                 array('title' => 'help'),
+                                 _m('MENU', 'Help'),
+                                 _('Getting started'),
+                                 'nav_doc_help'),
+                           array('doc',
+                                 array('title' => 'about'),
+                                 _m('MENU', 'About'),
+                                 _('About this site'),
+                                 'nav_doc_about'),
+                           array('doc',
+                                 array('title' => 'faq'),
+                                 _m('MENU', 'FAQ'),
+                                 _('Frequently asked questions'),
+                                 'nav_doc_faq'),
+                           array('doc',
+                                 array('title' => 'contact'),
+                                 _m('MENU', 'Contact'),
+                                 _('Contact info'),
+                                 'nav_doc_contact'),
+                           array('doc',
+                                 array('title' => 'tags'),
+                                 _m('MENU', 'Tags'),
+                                 _('Using tags'),
+                                 'nav_doc_tags'),
+                           array('doc',
+                                 array('title' => 'groups'),
+                                 _m('MENU', 'Groups'),
+                                 _('Using groups'),
+                                 'nav_doc_groups'),
+                           array('doc',
+                                 array('title' => 'api'),
+                                 _m('MENU', 'API'),
+                                 _('RESTful API'),
+                                 'nav_doc_api'));
+
+            Event::handle('EndDocsMenu', array(&$items));
+        }
+        return $items;
+    }
 }
diff --git a/actions/editapplication.php b/actions/editapplication.php
index 02fae3eb49..2ba5f6b313 100644
--- a/actions/editapplication.php
+++ b/actions/editapplication.php
@@ -22,7 +22,7 @@
  * @category  Applications
  * @package   StatusNet
  * @author    Zach Copley <zach@status.net>
- * @copyright 2008-2009 StatusNet, Inc.
+ * @copyright 2008-2011 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
  */
@@ -42,7 +42,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
-class EditApplicationAction extends OwnerDesignAction
+class EditApplicationAction extends Action
 {
     var $msg   = null;
     var $owner = null;
diff --git a/actions/editgroup.php b/actions/editgroup.php
index e46b1481d0..7439b9d030 100644
--- a/actions/editgroup.php
+++ b/actions/editgroup.php
@@ -23,8 +23,8 @@
  * @package   StatusNet
  * @author    Evan Prodromou <evan@status.net>
  * @author    Sarven Capadisli <csarven@status.net>
- * @author   Zach Copley <zach@status.net>
- * @copyright 2008-2009 StatusNet, Inc.
+ * @author    Zach Copley <zach@status.net>
+ * @copyright 2008-2011 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
  */
@@ -45,7 +45,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
-class EditgroupAction extends GroupDesignAction
+class EditgroupAction extends GroupAction
 {
     var $msg;
 
@@ -139,12 +139,6 @@ class EditgroupAction extends GroupDesignAction
         $this->showPage();
     }
 
-    function showObjectNav()
-    {
-        $nav = new GroupNav($this, $this->group);
-        $nav->show();
-    }
-
     function showContent()
     {
         $form = new GroupEditForm($this, $this->group);
@@ -165,7 +159,7 @@ class EditgroupAction extends GroupDesignAction
     function showScripts()
     {
         parent::showScripts();
-        $this->autofocus('nickname');
+        $this->autofocus('newnickname');
     }
 
     function trySave()
@@ -179,7 +173,7 @@ class EditgroupAction extends GroupDesignAction
 
         if (Event::handle('StartGroupSaveForm', array($this))) {
 
-            $nickname    = Nickname::normalize($this->trimmed('nickname'));
+            $nickname    = Nickname::normalize($this->trimmed('newnickname'));
             $fullname    = $this->trimmed('fullname');
             $homepage    = $this->trimmed('homepage');
             $description = $this->trimmed('description');
diff --git a/actions/editpeopletag.php b/actions/editpeopletag.php
index 115049f7ab..546d9910ba 100644
--- a/actions/editpeopletag.php
+++ b/actions/editpeopletag.php
@@ -40,7 +40,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
  * @link     http://status.net/
  */
 
-class EditpeopletagAction extends OwnerDesignAction
+class EditpeopletagAction extends Action
 {
     var $msg, $confirm, $confirm_args=array();
 
@@ -71,7 +71,11 @@ class EditpeopletagAction extends OwnerDesignAction
         }
 
         $id = $this->arg('id');
-        $tagger_arg = $this->arg('tagger');
+        if (common_config('singleuser', 'enabled')) {
+            $tagger_arg = User::singleUserNickname();
+        } else {
+            $tagger_arg = $this->arg('tagger');
+        }
         $tag_arg = $this->arg('tag');
 
         $tagger = common_canonical_nickname($tagger_arg);
@@ -293,7 +297,7 @@ class EditpeopletagAction extends OwnerDesignAction
 
         if (!$result) {
             common_log_db_error($this->group, 'UPDATE', __FILE__);
-            // TRANS: TRANS: Server error displayed when updating a list fails.
+            // TRANS: Server error displayed when updating a list fails.
             $this->serverError(_('Could not update list.'));
         }
 
diff --git a/actions/favorited.php b/actions/favorited.php
index 17c2a58c94..ff4a99cd60 100644
--- a/actions/favorited.php
+++ b/actions/favorited.php
@@ -172,11 +172,8 @@ class FavoritedAction extends Action
      */
     function showContent()
     {
-        $pop = new Popularity();
-        $pop->offset = ($this->page - 1) * NOTICES_PER_PAGE;
-        $pop->limit  = NOTICES_PER_PAGE;
-        $pop->expiry = 600;
-        $notice = $pop->getNotices();
+        $stream = new PopularNoticeStream(Profile::current());
+        $notice = $stream->getNotices(($this->page-1)*NOTICES_PER_PAGE, NOTICES_PER_PAGE+1);
 
         $nl = new NoticeList($notice, $this);
 
diff --git a/actions/groupdesignsettings.php b/actions/groupdesignsettings.php
deleted file mode 100644
index 798064d16c..0000000000
--- a/actions/groupdesignsettings.php
+++ /dev/null
@@ -1,319 +0,0 @@
-<?php
-/**
- * StatusNet, the distributed open-source microblogging tool
- *
- * Saves a design for a given group.
- *
- * PHP version 5
- *
- * LICENCE: This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * @category  Settings
- * @package   StatusNet
- * @author    Sarven Capadisli <csarven@status.net>
- * @author    Zach Copley <zach@status.net>
- * @copyright 2008-2009 StatusNet, Inc.
- * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://status.net/
- */
-
-if (!defined('STATUSNET') && !defined('LACONICA')) {
-    exit(1);
-}
-
-require_once INSTALLDIR . '/lib/designsettings.php';
-
-/**
- * Set a group's design
- *
- * Saves a design for a given group
- *
- * @category Settings
- * @package  StatusNet
- * @author   Zach Copley <zach@status.net>
- * @author   Sarven Capadisli <csarven@status.net>
- * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://status.net/
- */
-class GroupDesignSettingsAction extends DesignSettingsAction
-{
-    var $group = null;
-
-    /**
-     * Sets the right action for the form, and passes request args into
-     * the base action
-     *
-     * @param array $args misc. arguments
-     *
-     * @return boolean true
-     */
-    function prepare($args)
-    {
-        parent::prepare($args);
-
-        if (!common_logged_in()) {
-            // TRANS: Client error displayed trying to change group design settings while not logged in.
-            $this->clientError(_('You must be logged in to edit a group.'));
-            return false;
-        }
-
-        $nickname_arg = $this->trimmed('nickname');
-        $nickname     = common_canonical_nickname($nickname_arg);
-
-        // Permanent redirect on non-canonical nickname
-
-        if ($nickname_arg != $nickname) {
-            $args = array('nickname' => $nickname);
-            common_redirect(common_local_url('groupdesignsettings', $args), 301);
-            return false;
-        }
-
-        if (!$nickname) {
-            // TRANS: Client error displayed trying to change group design settings without providing a group nickname.
-            $this->clientError(_('No nickname.'), 404);
-            return false;
-        }
-
-        $groupid = $this->trimmed('groupid');
-
-        if ($groupid) {
-            $this->group = User_group::staticGet('id', $groupid);
-        } else {
-            $local = Local_group::staticGet('nickname', $nickname);
-            if ($local) {
-                $this->group = User_group::staticGet('id', $local->group_id);
-            }
-        }
-
-        if (!$this->group) {
-            // TRANS: Client error displayed trying to change group design settings while providing a nickname for a non-existing group.
-            $this->clientError(_('No such group.'), 404);
-            return false;
-        }
-
-        $cur = common_current_user();
-
-        if (!$cur->isAdmin($this->group)) {
-            // TRANS: Client error displayed trying to change group design settings without being a (group) admin.
-            $this->clientError(_('You must be an admin to edit the group.'), 403);
-            return false;
-        }
-
-        $this->submitaction = common_local_url('groupdesignsettings',
-            array('nickname' => $this->group->nickname));
-
-        return true;
-    }
-
-    /**
-     * A design for this action
-     *
-     * if the group attribute has been set, returns that group's
-     * design.
-     *
-     * @return Design a design object to use
-     */
-    function getDesign()
-    {
-
-        if (empty($this->group)) {
-            return null;
-        }
-
-        return $this->group->getDesign();
-    }
-
-    /**
-     * Title of the page
-     *
-     * @return string Title of the page
-     */
-
-    function title()
-    {
-        // TRANS: Title group design settings page.
-        return _('Group design');
-    }
-
-    /**
-     * Instructions for use
-     *
-     * @return instructions for use
-     */
-    function getInstructions()
-    {
-        // TRANS: Instructions for group design settings page.
-        return _('Customize the way your group looks ' .
-        'with a background image and a colour palette of your choice.');
-    }
-
-    /**
-     * Override to show group nav stuff
-     *
-     * @return nothing
-     */
-    function showObjectNav()
-    {
-        $nav = new GroupNav($this, $this->group);
-        $nav->show();
-    }
-
-    /**
-     * Override to show default nav stuff
-     *
-     * @return nothing
-     */
-    function showLocalNav()
-    {
-        Action::showLocalNav();
-    }
-
-    /**
-     * Get the design we want to edit
-     *
-     * @return Design
-     */
-    function getWorkingDesign()
-    {
-        $design = null;
-
-        if (isset($this->group)) {
-            $design = $this->group->getDesign();
-        }
-
-        return $design;
-    }
-
-    /**
-     * Content area of the page
-     *
-     * Shows a form for changing the design
-     *
-     * @return void
-     */
-    function showContent()
-    {
-        $design = $this->getWorkingDesign();
-
-        if (empty($design)) {
-            $design = Design::siteDesign();
-        }
-
-        $this->showDesignForm($design);
-    }
-
-    /**
-     * Save or update the group's design settings
-     *
-     * @return void
-     */
-    function saveDesign()
-    {
-        try {
-            $bgcolor = new WebColor($this->trimmed('design_background'));
-            $ccolor  = new WebColor($this->trimmed('design_content'));
-            $sbcolor = new WebColor($this->trimmed('design_sidebar'));
-            $tcolor  = new WebColor($this->trimmed('design_text'));
-            $lcolor  = new WebColor($this->trimmed('design_links'));
-        } catch (WebColorException $e) {
-            $this->showForm($e->getMessage());
-            return;
-        }
-
-        $onoff = $this->arg('design_background-image_onoff');
-
-        $on   = false;
-        $off  = false;
-        $tile = false;
-
-        if ($onoff == 'on') {
-            $on = true;
-        } else {
-            $off = true;
-        }
-
-        $repeat = $this->boolean('design_background-image_repeat');
-
-        if ($repeat) {
-            $tile = true;
-        }
-
-        $design = $this->group->getDesign();
-
-        if (!empty($design)) {
-            // update design
-
-            $original = clone($design);
-
-            $design->backgroundcolor = $bgcolor->intValue();
-            $design->contentcolor    = $ccolor->intValue();
-            $design->sidebarcolor    = $sbcolor->intValue();
-            $design->textcolor       = $tcolor->intValue();
-            $design->linkcolor       = $lcolor->intValue();
-
-            $design->setDisposition($on, $off, $tile);
-
-            $result = $design->update($original);
-
-            if ($result === false) {
-                common_log_db_error($design, 'UPDATE', __FILE__);
-                // TRANS: Form validation error displayed when group design settings could not be updated because of an application issue.
-                $this->showForm(_('Unable to update your design settings.'));
-                return;
-            }
-        } else {
-            $this->group->query('BEGIN');
-
-            // save new design
-
-            $design = new Design();
-
-            $design->backgroundcolor = $bgcolor->intValue();
-            $design->contentcolor    = $ccolor->intValue();
-            $design->sidebarcolor    = $sbcolor->intValue();
-            $design->textcolor       = $tcolor->intValue();
-            $design->linkcolor       = $lcolor->intValue();
-
-            $design->setDisposition($on, $off, $tile);
-
-            $id = $design->insert();
-
-            if (empty($id)) {
-                common_log_db_error($id, 'INSERT', __FILE__);
-                // TRANS: Form validation error displayed when group design settings could not be saved because of an application issue.
-                $this->showForm(_('Unable to save your design settings.'));
-                return;
-            }
-
-            $original               = clone($this->group);
-            $this->group->design_id = $id;
-            $result                 = $this->group->update($original);
-
-            if (empty($result)) {
-                common_log_db_error($original, 'UPDATE', __FILE__);
-                // TRANS: Form validation error displayed when group design settings could not be saved because of an application issue.
-                $this->showForm(_('Unable to save your design settings.'));
-                $this->group->query('ROLLBACK');
-                return;
-            }
-
-            $this->group->query('COMMIT');
-        }
-
-        $this->saveBackgroundImage($design);
-
-        // TRANS: Form text to confirm saved group design settings.
-        $this->showForm(_('Design preferences saved.'), true);
-    }
-}
diff --git a/actions/grouplogo.php b/actions/grouplogo.php
index a6694cd837..46ce274274 100644
--- a/actions/grouplogo.php
+++ b/actions/grouplogo.php
@@ -23,7 +23,7 @@
  * @package   StatusNet
  * @author    Evan Prodromou <evan@status.net>
  * @author    Zach Copley <zach@status.net>
- * @copyright 2008-2009 StatusNet, Inc.
+ * @copyright 2008-2011 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
  */
@@ -49,7 +49,7 @@ define('MAX_ORIGINAL', 480);
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
-class GrouplogoAction extends GroupDesignAction
+class GrouplogoAction extends GroupAction
 {
     var $mode = null;
     var $imagefile = null;
@@ -457,10 +457,4 @@ class GrouplogoAction extends GroupDesignAction
 
         $this->autofocus('avatarfile');
     }
-
-    function showObjectNav()
-    {
-        $nav = new GroupNav($this, $this->group);
-        $nav->show();
-    }
 }
diff --git a/actions/groupmembers.php b/actions/groupmembers.php
index 2bb35ceddc..52979101fd 100644
--- a/actions/groupmembers.php
+++ b/actions/groupmembers.php
@@ -43,7 +43,7 @@ require_once INSTALLDIR.'/lib/publicgroupnav.php';
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
-class GroupmembersAction extends GroupDesignAction
+class GroupmembersAction extends GroupAction
 {
     var $page = null;
 
@@ -55,44 +55,9 @@ class GroupmembersAction extends GroupDesignAction
     function prepare($args)
     {
         parent::prepare($args);
+
         $this->page = ($this->arg('page')) ? ($this->arg('page')+0) : 1;
 
-        $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);
-            if ($this->page != 1) {
-                $args['page'] = $this->page;
-            }
-            common_redirect(common_local_url('groupmembers', $args), 301);
-            return false;
-        }
-
-        if (!$nickname) {
-            // TRANS: Client error displayed when trying to view group members without providing a group nickname.
-            $this->clientError(_('No nickname.'), 404);
-            return false;
-        }
-
-        $local = Local_group::staticGet('nickname', $nickname);
-
-        if (!$local) {
-            // TRANS: Client error displayed when trying to view group members for a non-existing group.
-            $this->clientError(_('No such group.'), 404);
-            return false;
-        }
-
-        $this->group = User_group::staticGet('id', $local->group_id);
-
-        if (!$this->group) {
-            // TRANS: Client error displayed when trying to view group members for an object that is not a group.
-            $this->clientError(_('No such group.'), 404);
-            return false;
-        }
-
         return true;
     }
 
@@ -125,12 +90,6 @@ class GroupmembersAction extends GroupDesignAction
                        _('A list of the users in this group.'));
     }
 
-    function showObjectNav()
-    {
-        $nav = new GroupNav($this, $this->group);
-        $nav->show();
-    }
-
     function showContent()
     {
         $offset = ($this->page-1) * PROFILES_PER_PAGE;
@@ -145,8 +104,6 @@ class GroupmembersAction extends GroupDesignAction
             $cnt = $member_list->show();
         }
 
-        $members->free();
-
         $this->pagination($this->page > 1, $cnt > PROFILES_PER_PAGE,
                           $this->page, 'groupmembers',
                           array('nickname' => $this->group->nickname));
diff --git a/actions/groupqueue.php b/actions/groupqueue.php
index 7cc32a9c69..4bbf5dcb02 100644
--- a/actions/groupqueue.php
+++ b/actions/groupqueue.php
@@ -43,7 +43,7 @@ require_once INSTALLDIR.'/lib/publicgroupnav.php';
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
-class GroupqueueAction extends GroupDesignAction
+class GroupqueueAction extends GroupAction
 {
     var $page = null;
 
@@ -132,12 +132,6 @@ class GroupqueueAction extends GroupDesignAction
                        _('A list of users awaiting approval to join this group.'));
     }
 
-    function showObjectNav()
-    {
-        $nav = new GroupNav($this, $this->group);
-        $nav->show();
-    }
-
     function showContent()
     {
         $offset = ($this->page-1) * PROFILES_PER_PAGE;
diff --git a/actions/hcard.php b/actions/hcard.php
deleted file mode 100644
index 6db2972b9d..0000000000
--- a/actions/hcard.php
+++ /dev/null
@@ -1,121 +0,0 @@
-<?php
-/**
- * StatusNet, the distributed open-source microblogging tool
- *
- * Show the user's hcard
- *
- * PHP version 5
- *
- * LICENCE: This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * @category  Personal
- * @package   StatusNet
- * @author    Evan Prodromou <evan@status.net>
- * @copyright 2010 StatusNet, Inc.
- * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPLv3
- * @link      http://status.net/
- */
-
-if (!defined('STATUSNET')) {
-    exit(1);
-}
-
-/**
- * User profile page
- *
- * @category Personal
- * @package  StatusNet
- * @author   Evan Prodromou <evan@status.net>
- * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPLv3
- * @link     http://status.net/
- */
-class HcardAction extends Action
-{
-    var $user;
-    var $profile;
-
-    function prepare($args)
-    {
-        parent::prepare($args);
-
-        $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('hcard', $args), 301);
-            return false;
-        }
-
-        $this->user = User::staticGet('nickname', $nickname);
-
-        if (!$this->user) {
-            // TRANS: Client error displayed when trying to get a user hCard for a non-existing user.
-            $this->clientError(_('No such user.'), 404);
-            return false;
-        }
-
-        $this->profile = $this->user->getProfile();
-
-        if (!$this->profile) {
-            // TRANS: Error message displayed when referring to a user without a profile.
-            $this->serverError(_('User has no profile.'));
-            return false;
-        }
-
-        return true;
-    }
-
-    function handle($args)
-    {
-        parent::handle($args);
-        $this->showPage();
-    }
-
-    function title()
-    {
-        return $this->profile->getBestName();
-    }
-
-    function showContent()
-    {
-        $up = new ShortUserProfile($this, $this->user, $this->profile);
-        $up->show();
-    }
-
-    function showHeader()
-    {
-        return;
-    }
-
-    function showAside()
-    {
-        return;
-    }
-
-    function showSecondaryNav()
-    {
-        return;
-    }
-}
-
-class ShortUserProfile extends UserProfile
-{
-    function showEntityActions()
-    {
-        return;
-    }
-}
diff --git a/actions/hostmeta.php b/actions/hostmeta.php
index e921b5ad59..5caf1960cb 100644
--- a/actions/hostmeta.php
+++ b/actions/hostmeta.php
@@ -59,7 +59,13 @@ class HostMetaAction extends Action
             Event::handle('EndHostMetaLinks', array(&$xrd->links));
         }
 
+        // Output Cross-Origin Resource Sharing (CORS) header
+        if (common_config('discovery', 'cors')) {
+            header('Access-Control-Allow-Origin: *');
+        }
+
         header('Content-type: application/xrd+xml');
+
         print $xrd->toXML();
     }
 }
diff --git a/actions/imsettings.php b/actions/imsettings.php
index e809981a3f..809dbd2879 100644
--- a/actions/imsettings.php
+++ b/actions/imsettings.php
@@ -67,7 +67,7 @@ class ImsettingsAction extends SettingsAction
         // TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link.
         // TRANS: the order and formatting of link text and link should remain unchanged.
         return _('You can send and receive notices through '.
-                 'instant messaging [instant messages](%%doc.im%%). '.
+                 '[instant messaging](%%doc.im%%). '.
                  'Configure your addresses and settings below.');
     }
 
diff --git a/actions/invite.php b/actions/invite.php
index 1bfc9f76d3..75800aa858 100644
--- a/actions/invite.php
+++ b/actions/invite.php
@@ -20,7 +20,7 @@
 if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
 // @todo XXX: Add documentation.
-class InviteAction extends CurrentUserDesignAction
+class InviteAction extends Action
 {
     var $mode = null;
     var $error = null;
diff --git a/actions/joingroup.php b/actions/joingroup.php
index bb7b835915..fa5968a2c4 100644
--- a/actions/joingroup.php
+++ b/actions/joingroup.php
@@ -131,6 +131,10 @@ class JoingroupAction extends Action
         try {
             $result = $cur->joinGroup($this->group);
         } catch (Exception $e) {
+        	common_log(LOG_ERR, sprintf("Couldn't join user %s to group %s: '%s'",
+        								$cur->nickname,
+        								$this->group->nickname,
+        								$e->getMessage()));
             // TRANS: Server error displayed when joining a group failed in the database.
             // TRANS: %1$s is the joining user's nickname, $2$s is the group nickname for which the join failed.
             $this->serverError(sprintf(_('Could not join user %1$s to group %2$s.'),
diff --git a/actions/leavegroup.php b/actions/leavegroup.php
index 9e560b9717..b8aaf83d20 100644
--- a/actions/leavegroup.php
+++ b/actions/leavegroup.php
@@ -125,6 +125,7 @@ class LeavegroupAction extends Action
         try {
             $cur->leaveGroup($this->group);
         } catch (Exception $e) {
+            common_log(LOG_ERR, "Error when {$cur->nickname} tried to leave {$this->group->nickname}: " . $e->getMessage());
             // TRANS: Server error displayed when leaving a group failed in the database.
             // TRANS: %1$s is the leaving user's nickname, $2$s is the group nickname for which the leave failed.
             $this->serverError(sprintf(_('Could not remove user %1$s from group %2$s.'),
diff --git a/actions/login.php b/actions/login.php
index f774a0ed80..f8a1a5c6a3 100644
--- a/actions/login.php
+++ b/actions/login.php
@@ -94,8 +94,8 @@ class LoginAction extends Action
         parent::handle($args);
 
         if (common_is_real_login()) {
-            // TRANS: Client error displayed when trying to log in while already logged in.
-            $this->clientError(_('Already logged in.'));
+            $user = common_current_user();
+            common_redirect(common_local_url('all', array('nickname' => $user->nickname)), 307);
         } else if ($_SERVER['REQUEST_METHOD'] == 'POST') {
             $this->checkLogin();
         } else {
diff --git a/actions/logout.php b/actions/logout.php
index 567d808cd1..4e51271d43 100644
--- a/actions/logout.php
+++ b/actions/logout.php
@@ -73,7 +73,13 @@ class LogoutAction extends Action
             }
             Event::handle('EndLogout', array($this));
 
-            common_redirect(common_local_url('public'), 303);
+            if (common_config('singleuser', 'enabled')) {
+                $user = User::singleUser();
+                common_redirect(common_local_url('showstream',
+                                                 array('nickname' => $user->nickname)));
+            } else {
+                common_redirect(common_local_url('public'), 303);
+            }
         }
     }
 
diff --git a/actions/newapplication.php b/actions/newapplication.php
index 93ef417f63..23525ef321 100644
--- a/actions/newapplication.php
+++ b/actions/newapplication.php
@@ -42,7 +42,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
-class NewApplicationAction extends OwnerDesignAction
+class NewApplicationAction extends Action
 {
     var $msg;
 
@@ -295,6 +295,7 @@ class NewApplicationAction extends OwnerDesignAction
             $app->uploadLogo();
         } catch (Exception $e) {
             $app->query('ROLLBACK');
+            // TRANS: Form validation error messages displayed when uploading an invalid application logo.
             $this->showForm(_('Invalid image.'));
 	        return;	 
 	}
diff --git a/actions/newgroup.php b/actions/newgroup.php
index c54e24ed95..cf3125fd87 100644
--- a/actions/newgroup.php
+++ b/actions/newgroup.php
@@ -122,7 +122,7 @@ class NewgroupAction extends Action
     {
         if (Event::handle('StartGroupSaveForm', array($this))) {
             try {
-                $nickname = Nickname::normalize($this->trimmed('nickname'));
+                $nickname = Nickname::normalize($this->trimmed('newnickname'));
             } catch (NicknameException $e) {
                 $this->showForm($e->getMessage());
             }
diff --git a/actions/newmessage.php b/actions/newmessage.php
index dd7c5357ba..fa1922c4a0 100644
--- a/actions/newmessage.php
+++ b/actions/newmessage.php
@@ -175,7 +175,7 @@ class NewmessageAction extends Action
             return;
         } else if ($user->id == $this->other->id) {
             // TRANS: Client error displayed trying to send a direct message to self.
-            $this->clientError(_('Don\'t send a message to yourself; ' .
+            $this->clientError(_('Do not send a message to yourself; ' .
                 'just say it to yourself quietly instead.'), 403);
             return;
         }
diff --git a/actions/oauthappssettings.php b/actions/oauthappssettings.php
index a7a4b219a3..c93a0a1580 100644
--- a/actions/oauthappssettings.php
+++ b/actions/oauthappssettings.php
@@ -31,6 +31,9 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
+require_once INSTALLDIR . '/lib/applicationlist.php';
+require_once INSTALLDIR . '/lib/statusnetoauthstore.php';
+
 /**
  * Show a user's registered OAuth applications
  *
diff --git a/actions/oauthconnectionssettings.php b/actions/oauthconnectionssettings.php
index 5c66730931..80fac0d509 100644
--- a/actions/oauthconnectionssettings.php
+++ b/actions/oauthconnectionssettings.php
@@ -32,7 +32,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
 }
 
 require_once INSTALLDIR . '/lib/applicationlist.php';
-require_once INSTALLDIR . '/lib/apioauthstore.php';
+require_once INSTALLDIR . '/lib/statusnetoauthstore.php';
 
 /**
  * Show connected OAuth applications
diff --git a/actions/oldschoolsettings.php b/actions/oldschoolsettings.php
new file mode 100644
index 0000000000..74c6c05cda
--- /dev/null
+++ b/actions/oldschoolsettings.php
@@ -0,0 +1,228 @@
+<?php
+/**
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2011, StatusNet, Inc.
+ *
+ * Settings panel for old-school UI
+ * 
+ * PHP version 5
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Oldschool
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2011 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    // This check helps protect against security problems;
+    // your code file can't be executed directly from the web.
+    exit(1);
+}
+
+/**
+ * Old-school settings
+ *
+ * @category  Oldschool
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2011 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+
+class OldschoolsettingsAction extends SettingsAction
+{
+    /**
+     * Title of the page
+     *
+     * @return string Title of the page
+     */
+    function title()
+    {
+        // TRANS: Page title for profile settings.
+        return _('Old school UI settings');
+    }
+
+    /**
+     * Instructions for use
+     *
+     * @return instructions for use
+     */
+    function getInstructions()
+    {
+        // TRANS: Usage instructions for profile settings.
+        return _('If you like it "the old way", you can set that here.');
+    }
+
+    /**
+     * For initializing members of the class.
+     *
+     * @param array $argarray misc. arguments
+     *
+     * @return boolean true
+     */
+
+    function prepare($argarray)
+    {
+        if (!common_config('oldschool', 'enabled')) {
+            throw new ClientException("Old-school settings not enabled.");
+        }
+        parent::prepare($argarray);
+        return true;
+    }
+
+    /**
+     * Handler method
+     *
+     * @param array $argarray is ignored since it's now passed in in prepare()
+     *
+     * @return void
+     */
+
+    function handlePost()
+    {
+        $user = common_current_user();
+
+        $osp = Old_school_prefs::staticGet('user_id', $user->id);
+        $orig = null;
+
+        if (!empty($osp)) {
+            $orig = clone($osp);
+        } else {
+            $osp = new Old_school_prefs();
+            $osp->user_id = $user->id;
+            $osp->created = common_sql_now();
+        }
+
+        $osp->stream_mode_only  = $this->boolean('stream_mode_only');
+        $osp->conversation_tree = $this->boolean('conversation_tree');
+        $osp->stream_nicknames  = $this->boolean('stream_nicknames');
+        $osp->modified          = common_sql_now();
+
+        if (!empty($orig)) {
+            $osp->update($orig);
+        } else {
+            $osp->insert();
+        }
+
+        // TRANS: Confirmation shown when user profile settings are saved.
+        $this->showForm(_('Settings saved.'), true);
+
+        return;
+    }
+
+    function showContent()
+    {
+        $user = common_current_user();
+        $form = new OldSchoolForm($this, $user);
+        $form->show();
+    }
+}
+
+class OldSchoolForm extends Form
+{
+    var $user;
+
+    function __construct($out, $user)
+    {
+        parent::__construct($out);
+        $this->user = $user;
+    }
+
+    /**
+     * Visible or invisible data elements
+     *
+     * Display the form fields that make up the data of the form.
+     * Sub-classes should overload this to show their data.
+     *
+     * @return void
+     */
+
+    function formData()
+    {
+        $this->elementStart('fieldset');
+        $this->elementStart('ul', 'form_data');
+        $this->elementStart('li');
+        $this->checkbox('stream_mode_only', _('Only stream mode (no conversations) in timelines'),
+                        $this->user->streamModeOnly());
+        $this->elementEnd('li');
+        $this->elementStart('li');
+        $this->checkbox('conversation_tree', _('Show conversation page as hierarchical trees'),
+                        $this->user->conversationTree());
+        $this->elementEnd('li');
+        $this->elementStart('li');
+        $this->checkbox('stream_nicknames', _('Show nicknames (not full names) in timelines'),
+                        $this->user->streamNicknames());
+        $this->elementEnd('li');
+        $this->elementEnd('fieldset');
+        $this->elementEnd('ul');
+    }
+
+    /**
+     * Buttons for form actions
+     *
+     * Submit and cancel buttons (or whatever)
+     * Sub-classes should overload this to show their own buttons.
+     *
+     * @return void
+     */
+
+    function formActions()
+    {
+        $this->submit('submit', _('Save'));
+    }
+
+    /**
+     * ID of the form
+     *
+     * Should be unique on the page. Sub-classes should overload this
+     * to show their own IDs.
+     *
+     * @return int ID of the form
+     */
+
+    function id()
+    {
+        return 'form_oldschool';
+    }
+
+    /**
+     * Action of the form.
+     *
+     * URL to post to. Should be overloaded by subclasses to give
+     * somewhere to post to.
+     *
+     * @return string URL to post to
+     */
+
+    function action()
+    {
+        return common_local_url('oldschoolsettings');
+    }
+
+    /**
+     * Class of the form. May include space-separated list of multiple classes.
+     *
+     * @return string the form's class
+     */
+
+    function formClass()
+    {
+        return 'form_settings';
+    }
+}
diff --git a/actions/pathsadminpanel.php b/actions/pathsadminpanel.php
index 0b4a5ff952..57f82e7995 100644
--- a/actions/pathsadminpanel.php
+++ b/actions/pathsadminpanel.php
@@ -24,7 +24,7 @@
  * @author    Evan Prodromou <evan@status.net>
  * @author    Zach Copley <zach@status.net>
  * @author    Sarven Capadisli <csarven@status.net>
- * @copyright 2008-2010 StatusNet, Inc.
+ * @copyright 2008-2011 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
  */
@@ -92,7 +92,6 @@ class PathsadminpanelAction extends AdminPanelAction
                                  'site' => array('path', 'locale_path', 'ssl', 'sslserver'),
                                  'theme' => array('server', 'dir', 'path', 'sslserver', 'sslpath'),
                                  'avatar' => array('server', 'dir', 'path'),
-                                 'background' => array('server', 'dir', 'path', 'sslserver', 'sslpath'),
                                  'attachments' => array('server', 'dir', 'path', 'sslserver', 'sslpath')
                                  );
 
@@ -163,14 +162,6 @@ class PathsadminpanelAction extends AdminPanelAction
             $this->clientError(sprintf(_('Avatar directory not writable: %s.'), $values['avatar']['dir']));
         }
 
-        // Validate background dir
-
-        if (empty($values['background']['dir']) || !is_writable($values['background']['dir'])) {
-            // TRANS: Client error in Paths admin panel.
-            // TRANS: %s is the background directory that could not be written to.
-            $this->clientError(sprintf(_('Background directory not writable: %s.'), $values['background']['dir']));
-        }
-
         // Validate locales dir
 
         // XXX: What else do we need to validate for lacales path here? --Z
@@ -364,61 +355,7 @@ class PathsAdminPanelForm extends AdminForm
         $this->out->elementEnd('fieldset');
 
         $this->out->elementStart('fieldset', array('id' =>
-                                                   'settings_design_background-paths'));
-        // TRANS: Fieldset legend in Paths admin panel.
-        $this->out->element('legend', null, _('Backgrounds'));
-        $this->out->elementStart('ul', 'form_data');
-
-        $this->li();
-        $this->input('server',
-                     // TRANS: Field label in Paths admin panel.
-                     _('Server'),
-                     // TRANS: Tooltip for field label in Paths admin panel.
-                     _('Server for backgrounds.'),
-                     'background');
-        $this->unli();
-
-        $this->li();
-        $this->input('path',
-                     // TRANS: Field label in Paths admin panel.
-                     _('Path'),
-                     // TRANS: Tooltip for field label in Paths admin panel.
-                     _('Web path to backgrounds.'),
-                     'background');
-        $this->unli();
-
-        $this->li();
-        $this->input('sslserver',
-                     // TRANS: Field label in Paths admin panel.
-                     _('SSL server'),
-                     // TRANS: Tooltip for field label in Paths admin panel.
-                     _('Server for backgrounds on SSL pages.'),
-                     'background');
-        $this->unli();
-
-        $this->li();
-        $this->input('sslpath',
-                     // TRANS: Field label in Paths admin panel.
-                     _('SSL path'),
-                     // TRANS: Tooltip for field label in Paths admin panel.
-                     _('Web path to backgrounds on SSL pages.'),
-                     'background');
-        $this->unli();
-
-        $this->li();
-        $this->input('dir',
-                     // TRANS: Field label in Paths admin panel.
-                     _('Directory'),
-                     // TRANS: Tooltip for field label in Paths admin panel.
-                     _('Directory where backgrounds are located.'),
-                     'background');
-        $this->unli();
-
-        $this->out->elementEnd('ul');
-        $this->out->elementEnd('fieldset');
-
-        $this->out->elementStart('fieldset', array('id' =>
-                                                   'settings_design_attachments-paths'));
+                                                   'settings_attachments-paths'));
 
         // TRANS: Fieldset legens in Paths admin panel.
         $this->out->element('legend', null, _('Attachments'));
@@ -516,7 +453,7 @@ class PathsAdminPanelForm extends AdminForm
         // TRANS: Button text to store form data in the Paths admin panel.
         $this->out->submit('save', _m('BUTTON','Save'), 'submit',
                            // TRANS: Button title text to store form data in the Paths admin panel.
-                           'save', _('Save paths'));
+                           'save', _('Save path settings.'));
     }
 
     /**
diff --git a/actions/peopletagged.php b/actions/peopletagged.php
index ea25c8675b..6f9748c234 100644
--- a/actions/peopletagged.php
+++ b/actions/peopletagged.php
@@ -22,7 +22,7 @@
  * @category  Group
  * @package   StatusNet
  * @author    Shashi Gowda <connect2shashi@gmail.com>
- * @copyright 2008-2009 StatusNet, Inc.
+ * @copyright 2008-2011 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
  */
@@ -42,7 +42,7 @@ require_once(INSTALLDIR.'/lib/profilelist.php');
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
-class PeopletaggedAction extends OwnerDesignAction
+class PeopletaggedAction extends Action
 {
     var $page = null;
     var $peopletag = null;
@@ -58,7 +58,12 @@ class PeopletaggedAction extends OwnerDesignAction
         parent::prepare($args);
         $this->page = ($this->arg('page')) ? ($this->arg('page')+0) : 1;
 
-        $tagger_arg = $this->arg('tagger');
+        if (common_config('singleuser', 'enabled')) {
+            $tagger_arg = User::singleUserNickname();
+        } else {
+            $tagger_arg = $this->arg('tagger');
+        }
+
         $tag_arg = $this->arg('tag');
         $tagger = common_canonical_nickname($tagger_arg);
         $tag = common_canonical_tag($tag_arg);
diff --git a/actions/peopletagsbyuser.php b/actions/peopletagsbyuser.php
index d348585c90..8ef1a56ee1 100644
--- a/actions/peopletagsbyuser.php
+++ b/actions/peopletagsbyuser.php
@@ -22,7 +22,7 @@
  * @category  Personal
  * @package   StatusNet
  * @author    Shashi Gowda <connect2shashi@gmail.com>
- * @copyright 2008-2009 StatusNet, Inc.
+ * @copyright 2008-2011 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
  */
@@ -33,7 +33,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
 
 require_once INSTALLDIR.'/lib/peopletaglist.php';
 
-class PeopletagsbyuserAction extends OwnerDesignAction
+class PeopletagsbyuserAction extends Action
 {
     var $page = null;
     var $tagger = null;
@@ -76,7 +76,12 @@ class PeopletagsbyuserAction extends OwnerDesignAction
             $this->args['public'] = $this->args['private'] = false;
         }
 
-        $nickname_arg = $this->arg('nickname');
+        if (common_config('singleuser', 'enabled')) {
+            $nickname_arg = User::singleUserNickname();
+        } else {
+            $nickname_arg = $this->arg('nickname');
+        }
+
         $nickname = common_canonical_nickname($nickname_arg);
 
         // Permanent redirect on non-canonical nickname
@@ -213,7 +218,7 @@ class PeopletagsbyuserAction extends OwnerDesignAction
                     '(http://en.wikipedia.org/wiki/Micro-blogging) service ' .
                     'based on the Free Software [StatusNet](http://status.net/) tool. ' .
                     'You can easily keep track of what they ' .
-                    'are doing by subscribing to the tag\'s timeline.' ), $this->tagger->nickname);
+                    'are doing by subscribing to the list\'s timeline.' ), $this->tagger->nickname);
         $this->elementStart('div', array('id' => 'anon_notice'));
         $this->raw(common_markup_to_html($notice));
         $this->elementEnd('div');
diff --git a/actions/peopletagsforuser.php b/actions/peopletagsforuser.php
index 9883bd3657..d30f7321c1 100644
--- a/actions/peopletagsforuser.php
+++ b/actions/peopletagsforuser.php
@@ -22,7 +22,7 @@
  * @category  Personal
  * @package   StatusNet
  * @author    Shashi Gowda <connect2shashi@gmail.com>
- * @copyright 2008-2009 StatusNet, Inc.
+ * @copyright 2008-2011 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
  */
@@ -33,7 +33,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
 
 require_once INSTALLDIR.'/lib/peopletaglist.php';
 
-class PeopletagsforuserAction extends OwnerDesignAction
+class PeopletagsforuserAction extends Action
 {
     var $page = null;
     var $tagged = null;
@@ -58,7 +58,12 @@ class PeopletagsforuserAction extends OwnerDesignAction
     {
         parent::prepare($args);
 
-        $nickname_arg = $this->arg('nickname');
+        if (common_config('singleuser', 'enabled')) {
+            $nickname_arg = User::singleUserNickname();
+        } else {
+            $nickname_arg = $this->arg('nickname');
+        }
+
         $nickname = common_canonical_nickname($nickname_arg);
 
         // Permanent redirect on non-canonical nickname
@@ -111,7 +116,7 @@ class PeopletagsforuserAction extends OwnerDesignAction
                     '(http://en.wikipedia.org/wiki/Micro-blogging) service ' .
                     'based on the Free Software [StatusNet](http://status.net/) tool. ' .
                     'You can easily keep track of what they ' .
-                    'are doing by subscribing to the tag\'s timeline.' ), $this->tagged->nickname);
+                    'are doing by subscribing to the list\'s timeline.' ), $this->tagged->nickname);
         $this->elementStart('div', array('id' => 'anon_notice'));
         $this->raw(common_markup_to_html($notice));
         $this->elementEnd('div');
diff --git a/actions/peopletagsubscribers.php b/actions/peopletagsubscribers.php
index ebc3a9f494..1834a7e4ad 100644
--- a/actions/peopletagsubscribers.php
+++ b/actions/peopletagsubscribers.php
@@ -22,7 +22,7 @@
  * @category  Group
  * @package   StatusNet
  * @author    Evan Prodromou <evan@status.net>
- * @copyright 2008-2009 StatusNet, Inc.
+ * @copyright 2008-2011 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
  */
@@ -42,7 +42,7 @@ require_once(INSTALLDIR.'/lib/profilelist.php');
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
-class PeopletagsubscribersAction extends OwnerDesignAction
+class PeopletagsubscribersAction extends Action
 {
     var $page = null;
     var $peopletag = null;
@@ -58,7 +58,12 @@ class PeopletagsubscribersAction extends OwnerDesignAction
         parent::prepare($args);
         $this->page = ($this->arg('page')) ? ($this->arg('page')+0) : 1;
 
-        $tagger_arg = $this->arg('tagger');
+        if (common_config('singleuser', 'enabled')) {
+            $tagger_arg = User::singleUserNickname();
+        } else {
+            $tagger_arg = $this->arg('tagger');
+        }
+
         $tag_arg = $this->arg('tag');
         $tagger = common_canonical_nickname($tagger_arg);
         $tag = common_canonical_tag($tag_arg);
diff --git a/actions/peopletagsubscriptions.php b/actions/peopletagsubscriptions.php
index b65542e074..c497842969 100644
--- a/actions/peopletagsubscriptions.php
+++ b/actions/peopletagsubscriptions.php
@@ -22,7 +22,7 @@
  * @category  Personal
  * @package   StatusNet
  * @author    Shashi Gowda <connect2shashi@gmail.com>
- * @copyright 2008-2009 StatusNet, Inc.
+ * @copyright 2008-2011 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
  */
@@ -33,7 +33,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
 
 require_once INSTALLDIR.'/lib/peopletaglist.php';
 
-class PeopletagsubscriptionsAction extends OwnerDesignAction
+class PeopletagsubscriptionsAction extends Action
 {
     var $page = null;
     var $profile = null;
@@ -60,7 +60,12 @@ class PeopletagsubscriptionsAction extends OwnerDesignAction
     {
         parent::prepare($args);
 
-        $nickname_arg = $this->arg('nickname');
+        if (common_config('singleuser', 'enabled')) {
+            $nickname_arg = User::singleUserNickname();
+        } else {
+            $nickname_arg = $this->arg('nickname');
+        }
+
         $nickname = common_canonical_nickname($nickname_arg);
 
         // Permanent redirect on non-canonical nickname
diff --git a/actions/profilesettings.php b/actions/profilesettings.php
index 667fea2cf4..38424ab7af 100644
--- a/actions/profilesettings.php
+++ b/actions/profilesettings.php
@@ -185,7 +185,7 @@ class ProfilesettingsAction extends SettingsAction
             $this->checkbox('autosubscribe',
                             // TRANS: Checkbox label in form for profile settings.
                             _('Automatically subscribe to whoever '.
-                              'subscribes to me (best for non-humans).'),
+                              'subscribes to me (best for non-humans)'),
                             ($this->arg('autosubscribe')) ?
                             $this->boolean('autosubscribe') : $user->autosubscribe);
             $this->elementEnd('li');
diff --git a/actions/public.php b/actions/public.php
index 90e0e6e259..af2fcff842 100644
--- a/actions/public.php
+++ b/actions/public.php
@@ -88,14 +88,20 @@ class PublicAction extends Action
 
         $this->userProfile = Profile::current();
 
-        $stream = new ThreadingPublicNoticeStream($this->userProfile);
+        $user = common_current_user();
+
+        if (!empty($user) && $user->streamModeOnly()) {
+            $stream = new PublicNoticeStream($this->userProfile);
+        } else {
+            $stream = new ThreadingPublicNoticeStream($this->userProfile);
+        }
 
         $this->notice = $stream->getNotices(($this->page-1)*NOTICES_PER_PAGE,
                                             NOTICES_PER_PAGE + 1);
 
         if (!$this->notice) {
             // TRANS: Server error displayed when a public timeline cannot be retrieved.
-            $this->serverError(_('Could not retrieve public stream.'));
+            $this->serverError(_('Could not retrieve public timeline.'));
             return;
         }
 
@@ -153,6 +159,11 @@ class PublicAction extends Action
         $this->element('link', array('rel' => 'EditURI',
                                      'type' => 'application/rsd+xml',
                                      'href' => $rsd));
+
+        if ($this->page != 1) {
+            $this->element('link', array('rel' => 'canonical',
+                                         'href' => common_local_url('public')));
+        }
     }
 
     /**
@@ -162,19 +173,24 @@ class PublicAction extends Action
      */
     function getFeeds()
     {
-        return array(new Feed(Feed::RSS1, common_local_url('publicrss'),
+        return array(new Feed(Feed::JSON,
+                              common_local_url('ApiTimelinePublic',
+                                               array('format' => 'as')),
                               // TRANS: Link description for public timeline feed.
-                              _('Public Stream Feed (RSS 1.0)')),
+                              _('Public Timeline Feed (Activity Streams JSON)')),
+                    new Feed(Feed::RSS1, common_local_url('publicrss'),
+                              // TRANS: Link description for public timeline feed.
+                              _('Public Timeline Feed (RSS 1.0)')),
                      new Feed(Feed::RSS2,
                               common_local_url('ApiTimelinePublic',
                                                array('format' => 'rss')),
                               // TRANS: Link description for public timeline feed.
-                              _('Public Stream Feed (RSS 2.0)')),
+                              _('Public Timeline Feed (RSS 2.0)')),
                      new Feed(Feed::ATOM,
                               common_local_url('ApiTimelinePublic',
                                                array('format' => 'atom')),
                               // TRANS: Link description for public timeline feed.
-                              _('Public Stream Feed (Atom)')));
+                              _('Public Timeline Feed (Atom)')));
     }
 
     function showEmptyList()
@@ -208,7 +224,13 @@ class PublicAction extends Action
      */
     function showContent()
     {
-        $nl = new ThreadedNoticeList($this->notice, $this, $this->userProfile);
+        $user = common_current_user();
+
+        if (!empty($user) && $user->streamModeOnly()) {
+            $nl = new NoticeList($this->notice, $this);
+        } else {
+            $nl = new ThreadedNoticeList($this->notice, $this, $this->userProfile);
+        }
 
         $cnt = $nl->show();
 
@@ -222,12 +244,30 @@ class PublicAction extends Action
 
     function showSections()
     {
-        $ibs = new InviteButtonSection($this);
-        $ibs->show();
-        $pop = new PopularNoticeSection($this);
+        // Show invite button, as long as site isn't closed, and
+        // we have a logged in user.
+        if (common_config('invite', 'enabled') && !common_config('site', 'closed') && common_logged_in()) {
+            if (!common_config('site', 'private')) {
+                $ibs = new InviteButtonSection(
+                    $this,
+                    // TRANS: Button text for inviting more users to the StatusNet instance.
+                    // TRANS: Less business/enterprise-oriented language for public sites.
+                    _m('BUTTON', 'Send invite')
+                );
+            } else {
+                $ibs = new InviteButtonSection($this);
+            }
+            $ibs->show();
+        }
+
+        $p = Profile::current();
+
+        $pop = new PopularNoticeSection($this, $p);
         $pop->show();
-        $cloud = new PublicTagCloudSection($this);
-        $cloud->show();
+        if (!common_config('performance', 'high')) {
+            $cloud = new PublicTagCloudSection($this);
+            $cloud->show();
+        }
         $feat = new FeaturedUsersSection($this);
         $feat->show();
     }
diff --git a/actions/publicpeopletagcloud.php b/actions/publicpeopletagcloud.php
deleted file mode 100644
index cb65bbb163..0000000000
--- a/actions/publicpeopletagcloud.php
+++ /dev/null
@@ -1,182 +0,0 @@
-<?php
-/**
- * StatusNet, the distributed open-source microblogging tool
- *
- * Public tag cloud for notices
- *
- * PHP version 5
- *
- * LICENCE: This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * @category  Public
- * @package   StatusNet
- * @author    Mike Cochrane <mikec@mikenz.geek.nz>
- * @author    Evan Prodromou <evan@status.net>
- * @copyright 2008 Mike Cochrane
- * @copyright 2008-2009 StatusNet, Inc.
- * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://status.net/
- */
-
-if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
-
-define('TAGS_PER_PAGE', 100);
-
-/**
- * Public tag cloud for notices
- *
- * @category Personal
- * @package  StatusNet
- * @author    Mike Cochrane <mikec@mikenz.geek.nz>
- * @author    Evan Prodromou <evan@status.net>
- * @copyright 2008 Mike Cochrane
- * @copyright 2008-2009 StatusNet, Inc.
- * @link     http://status.net/
- */
-class PublicpeopletagcloudAction extends Action
-{
-    function isReadOnly($args)
-    {
-        return true;
-    }
-
-    function title()
-    {
-        // TRANS: Title for page with public list cloud.
-        return _('Public list cloud');
-    }
-
-    function showPageNotice()
-    {
-        $this->element('p', 'instructions',
-                       // TRANS: Page notice for page with public list cloud.
-                       // TRANS: %s is a StatusNet sitename.
-                       sprintf(_('These are largest lists on %s'),
-                               common_config('site', 'name')));
-    }
-
-    function showEmptyList()
-    {
-        // TRANS: Empty list message on page with public list cloud.
-        // TRANS: This message contains Markdown links in the form [description](link).
-        $message = _('No one has [listed](%%doc.tags%%) anyone yet.') . ' ';
-
-        if (common_logged_in()) {
-            // TRANS: Additional empty list message on page with public list cloud for logged in users.
-            $message .= _('Be the first to list someone!');
-        }
-        else {
-            // TRANS: Additional empty list message on page with public list cloud for anonymous users.
-        // TRANS: This message contains Markdown links in the form [description](link).
-            $message .= _('Why not [register an account](%%action.register%%) and be the first to list someone!');
-        }
-
-        $this->elementStart('div', 'guide');
-        $this->raw(common_markup_to_html($message));
-        $this->elementEnd('div');
-    }
-
-    function showLocalNav()
-    {
-        $nav = new PublicGroupNav($this);
-        $nav->show();
-    }
-
-    function handle($args)
-    {
-        parent::handle($args);
-        $this->showPage();
-    }
-
-    function showContent()
-    {
-        // XXX: cache this
-
-        $tags = new Profile_tag();
-        $plist = new Profile_list();
-        $plist->private = false;
-
-        $tags->joinAdd($plist);
-        $tags->selectAdd();
-        $tags->selectAdd('profile_tag.tag');
-        $tags->selectAdd('count(profile_tag.tag) as weight');
-        $tags->groupBy('profile_tag.tag');
-        $tags->orderBy('weight DESC');
-
-        $tags->limit(TAGS_PER_PAGE);
-
-        $cnt = $tags->find();
-
-        if ($cnt > 0) {
-            $this->elementStart('div', array('id' => 'tagcloud',
-                                             'class' => 'section'));
-
-            $tw = array();
-            $sum = 0;
-            while ($tags->fetch()) {
-                $tw[$tags->tag] = $tags->weight;
-                $sum += $tags->weight;
-            }
-
-            ksort($tw);
-
-            $this->elementStart('dl');
-            // TRANS: DT element on on page with public list cloud.
-            $this->element('dt', null, _('List cloud'));
-            $this->elementStart('dd');
-            $this->elementStart('ul', 'tags xoxo tag-cloud');
-            foreach ($tw as $tag => $weight) {
-                if ($sum) {
-                    $weightedSum = $weight/$sum;
-                } else {
-                    $weightedSum = 0.5;
-                }
-                $this->showTag($tag, $weight, $weightedSum);
-            }
-            $this->elementEnd('ul');
-            $this->elementEnd('dd');
-            $this->elementEnd('dl');
-            $this->elementEnd('div');
-        } else {
-            $this->showEmptyList();
-        }
-    }
-
-    function showTag($tag, $weight, $relative)
-    {
-        if ($relative > 0.1) {
-            $rel =  'tag-cloud-7';
-        } else if ($relative > 0.05) {
-            $rel = 'tag-cloud-6';
-        } else if ($relative > 0.02) {
-            $rel = 'tag-cloud-5';
-        } else if ($relative > 0.01) {
-            $rel = 'tag-cloud-4';
-        } else if ($relative > 0.005) {
-            $rel = 'tag-cloud-3';
-        } else if ($relative > 0.002) {
-            $rel = 'tag-cloud-2';
-        } else {
-            $rel = 'tag-cloud-1';
-        }
-
-        $this->elementStart('li', $rel);
-
-        // TRANS: Link title for number of listed people. %d is the number of listed people.
-        $title = sprintf(_m('1 person listed','%d people listed',$weight),$weight);
-        $this->element('a', array('href'  => common_local_url('peopletag', array('tag' => $tag)),
-                                  'title' => $title), $tag);
-        $this->elementEnd('li');
-    }
-}
diff --git a/actions/recoverpassword.php b/actions/recoverpassword.php
index 47a947dc0c..d8f95b24c3 100644
--- a/actions/recoverpassword.php
+++ b/actions/recoverpassword.php
@@ -260,7 +260,7 @@ class RecoverpasswordAction extends Action
         $this->elementStart('li');
          // TRANS: Field label for password reset form where the password has to be typed again.
         $this->password('confirm', _('Confirm'),
-                        // TRANS: Ttile for field label for password reset form where the password has to be typed again.
+                        // TRANS: Title for field label for password reset form where the password has to be typed again.
                         _('Same as password above.'));
         $this->elementEnd('li');
         $this->elementEnd('ul');
@@ -273,108 +273,25 @@ class RecoverpasswordAction extends Action
     function recoverPassword()
     {
         $nore = $this->trimmed('nicknameoremail');
+
         if (!$nore) {
             // TRANS: Form instructions for password recovery form.
             $this->showForm(_('Enter a nickname or email address.'));
             return;
         }
 
-        $user = User::staticGet('email', common_canonical_email($nore));
-
-        if (!$user) {
-            try {
-                $user = User::staticGet('nickname', common_canonical_nickname($nore));
-            } catch (NicknameException $e) {
-                // invalid
-            }
+        try {
+            User::recoverPassword($nore);
+            $this->mode = 'sent';
+            // TRANS: User notification after an e-mail with instructions was sent from the password recovery form.
+            $this->msg = _('Instructions for recovering your password ' .
+                           'have been sent to the email address registered to your ' .
+                           'account.');
+            $this->success = true;
+        } catch (Exception $e) {
+            $this->success = false;
+            $this->msg = $e->getMessage();
         }
-
-        // See if it's an unconfirmed email address
-
-        if (!$user) {
-            // Warning: it may actually be legit to have multiple folks
-            // who have claimed, but not yet confirmed, the same address.
-            // We'll only send to the first one that comes up.
-            $confirm_email = new Confirm_address();
-            $confirm_email->address = common_canonical_email($nore);
-            $confirm_email->address_type = 'email';
-            $confirm_email->find();
-            if ($confirm_email->fetch()) {
-                $user = User::staticGet($confirm_email->user_id);
-            } else {
-                $confirm_email = null;
-            }
-        } else {
-            $confirm_email = null;
-        }
-
-        if (!$user) {
-            // TRANS: Information on password recovery form if no known username or e-mail address was specified.
-            $this->showForm(_('No user with that email address or username.'));
-            return;
-        }
-
-        // Try to get an unconfirmed email address if they used a user name
-
-        if (!$user->email && !$confirm_email) {
-            $confirm_email = new Confirm_address();
-            $confirm_email->user_id = $user->id;
-            $confirm_email->address_type = 'email';
-            $confirm_email->find();
-            if (!$confirm_email->fetch()) {
-                $confirm_email = null;
-            }
-        }
-
-        if (!$user->email && !$confirm_email) {
-            // TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.
-            $this->clientError(_('No registered email address for that user.'));
-            return;
-        }
-
-        // Success! We have a valid user and a confirmed or unconfirmed email address
-
-        $confirm = new Confirm_address();
-        $confirm->code = common_confirmation_code(128);
-        $confirm->address_type = 'recover';
-        $confirm->user_id = $user->id;
-        $confirm->address = (!empty($user->email)) ? $user->email : $confirm_email->address;
-
-        if (!$confirm->insert()) {
-            common_log_db_error($confirm, 'INSERT', __FILE__);
-            // TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.
-            $this->serverError(_('Error saving address confirmation.'));
-            return;
-        }
-
-         // @todo FIXME: needs i18n.
-        $body = "Hey, $user->nickname.";
-        $body .= "\n\n";
-        $body .= 'Someone just asked for a new password ' .
-                 'for this account on ' . common_config('site', 'name') . '.';
-        $body .= "\n\n";
-        $body .= 'If it was you, and you want to confirm, use the URL below:';
-        $body .= "\n\n";
-        $body .= "\t".common_local_url('recoverpassword',
-                                   array('code' => $confirm->code));
-        $body .= "\n\n";
-        $body .= 'If not, just ignore this message.';
-        $body .= "\n\n";
-        $body .= 'Thanks for your time, ';
-        $body .= "\n";
-        $body .= common_config('site', 'name');
-        $body .= "\n";
-
-        $headers = _mail_prepare_headers('recoverpassword', $user->nickname, $user->nickname);
-        // TRANS: Subject for password recovery e-mail.
-        mail_to_user($user, _('Password recovery requested'), $body, $headers, $confirm->address);
-
-        $this->mode = 'sent';
-        // TRANS: User notification after an e-mail with instructions was sent from the password recovery form.
-        $this->msg = _('Instructions for recovering your password ' .
-                          'have been sent to the email address registered to your ' .
-                          'account.');
-        $this->success = true;
         $this->showPage();
     }
 
diff --git a/actions/removepeopletag.php b/actions/removepeopletag.php
index 6943f35ed1..d27175f566 100644
--- a/actions/removepeopletag.php
+++ b/actions/removepeopletag.php
@@ -112,18 +112,6 @@ class RemovepeopletagAction extends Action
             return false;
         }
 
-        // OMB 0.1 doesn't have a mechanism for local-server-
-        // originated tag.
-
-        $omb01 = Remote_profile::staticGet('id', $tagged_id);
-
-        if (!empty($omb01)) {
-            // TRANS: Client error displayed when trying to (un)list an OMB 0.1 remote profile.
-            $this->clientError(_('You cannot (un)list an OMB 0.1 '.
-                                 'remote profile with this action.'));
-            return false;
-        }
-
         return true;
     }
 
diff --git a/actions/replies.php b/actions/replies.php
index 7ae2d0eb76..86042557dc 100644
--- a/actions/replies.php
+++ b/actions/replies.php
@@ -22,7 +22,7 @@
  * @category  Personal
  * @package   StatusNet
  * @author    Evan Prodromou <evan@status.net>
- * @copyright 2008-2009 StatusNet, Inc.
+ * @copyright 2008-2011 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
  */
@@ -44,7 +44,7 @@ require_once INSTALLDIR.'/lib/feedlist.php';
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
-class RepliesAction extends OwnerDesignAction
+class RepliesAction extends Action
 {
     var $page = null;
     var $notice;
@@ -85,8 +85,11 @@ class RepliesAction extends OwnerDesignAction
 
         common_set_returnto($this->selfUrl());
 
-        $this->notice = $this->user->getReplies(($this->page-1) * NOTICES_PER_PAGE,
-             NOTICES_PER_PAGE + 1);
+        $stream = new ReplyNoticeStream($this->user->id,
+                                        Profile::current());
+
+        $this->notice = $stream->getNotices(($this->page-1) * NOTICES_PER_PAGE,
+                                            NOTICES_PER_PAGE + 1);
 
         if($this->page > 1 && $this->notice->N == 0){
             // TRANS: Server error when page not found (404)
@@ -140,7 +143,16 @@ class RepliesAction extends OwnerDesignAction
      */
     function getFeeds()
     {
-        return array(new Feed(Feed::RSS1,
+        return array(new Feed(Feed::JSON,
+                              common_local_url('ApiTimelineMentions',
+                                               array(
+                                                    'id' => $this->user->nickname,
+                                                    'format' => 'as')),
+                              // TRANS: Link for feed with replies for a user.
+                              // TRANS: %s is a user nickname.
+                              sprintf(_('Replies feed for %s (Activity Streams JSON)'),
+                                      $this->user->nickname)),
+                     new Feed(Feed::RSS1,
                               common_local_url('repliesrss',
                                                array('nickname' => $this->user->nickname)),
                               // TRANS: Link for feed with replies for a user.
diff --git a/actions/restoreaccount.php b/actions/restoreaccount.php
index 22f0a8e5da..81c792bd00 100644
--- a/actions/restoreaccount.php
+++ b/actions/restoreaccount.php
@@ -339,7 +339,7 @@ class RestoreAccountForm extends Form
         $this->out->elementStart('p', 'instructions');
 
         // TRANS: Form instructions for feed restore.
-        $this->out->raw(_('You can upload a backed-up stream in '.
+        $this->out->raw(_('You can upload a backed-up timeline in '.
                           '<a href="http://activitystrea.ms/">Activity Streams</a> format.'));
 
         $this->out->elementEnd('p');
diff --git a/actions/showapplication.php b/actions/showapplication.php
index c9cdbf1848..adfd17a06c 100644
--- a/actions/showapplication.php
+++ b/actions/showapplication.php
@@ -22,7 +22,7 @@
  * @category  Application
  * @package   StatusNet
  * @author    Zach Copley <zach@status.net>
- * @copyright 2008-2009 StatusNet, Inc.
+ * @copyright 2008-2011 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
  */
@@ -40,7 +40,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
-class ShowApplicationAction extends OwnerDesignAction
+class ShowApplicationAction extends Action
 {
     /**
      * Application to show
@@ -251,21 +251,24 @@ class ShowApplicationAction extends OwnerDesignAction
         $this->elementStart('div', 'entity_data');
         // TRANS: Header on the OAuth application page.
         $this->element('h2', null, _('Application info'));
-        $this->element('div',
-                       'entity_consumer_key',
-                       $consumer->consumer_key);
 
-        $this->element('div',
-                       'entity_consumer_secret',
-                       $consumer->consumer_secret);
-
-        $this->element('div',
-                       'entity_request_token_url',
-                       common_local_url('ApiOauthRequestToken'));
-
-        $this->element('div', 'entity_access_token_url', common_local_url('ApiOauthAccessToken'));
-
-        $this->element('div', 'entity_authorize_url', common_local_url('ApiOauthAuthorize'));
+        $this->elementStart('dl');
+        // TRANS: Field label on application page.
+        $this->element('dt', null, _('Consumer key'));
+        $this->element('dd', null, $consumer->consumer_key);
+        // TRANS: Field label on application page.
+        $this->element('dt', null, _('Consumer secret'));
+        $this->element('dd', null, $consumer->consumer_secret);
+        // TRANS: Field label on application page.
+        $this->element('dt', null, _('Request token URL'));
+        $this->element('dd', null, common_local_url('ApiOauthRequestToken'));
+        // TRANS: Field label on application page.
+        $this->element('dt', null, _('Access token URL'));
+        $this->element('dd', null, common_local_url('ApiOauthAccessToken'));
+        // TRANS: Field label on application page.
+        $this->element('dt', null, _('Authorize URL'));
+        $this->element('dd', null, common_local_url('ApiOauthAuthorize'));
+        $this->elementEnd('dl');
 
         $this->element('p', 'note',
             // TRANS: Note on the OAuth application page about signature support.
diff --git a/actions/showfavorites.php b/actions/showfavorites.php
index 67ee914a91..64fa14bc82 100644
--- a/actions/showfavorites.php
+++ b/actions/showfavorites.php
@@ -22,7 +22,7 @@
  * @category  Personal
  * @package   StatusNet
  * @author    Evan Prodromou <evan@status.net>
- * @copyright 2008-2009 StatusNet, Inc.
+ * @copyright 2008-2011 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
  */
@@ -44,7 +44,7 @@ require_once INSTALLDIR.'/lib/feedlist.php';
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
-class ShowfavoritesAction extends OwnerDesignAction
+class ShowfavoritesAction extends Action
 {
     /** User we're getting the faves of */
     var $user = null;
@@ -165,7 +165,15 @@ class ShowfavoritesAction extends OwnerDesignAction
      */
     function getFeeds()
     {
-        return array(new Feed(Feed::RSS1,
+        return array(new Feed(Feed::JSON,
+                              common_local_url('ApiTimelineFavorites',
+                                               array(
+                                                    'id' => $this->user->nickname,
+                                                    'format' => 'as')),
+                              // TRANS: Feed link text. %s is a username.
+                              sprintf(_('Feed for favorites of %s (Activity Streams JSON)'),
+                                      $this->user->nickname)),
+                     new Feed(Feed::RSS1,
                               common_local_url('favoritesrss',
                                                array('nickname' => $this->user->nickname)),
                               // TRANS: Feed link text. %s is a username.
diff --git a/actions/showgroup.php b/actions/showgroup.php
index 5bb90e86dd..10601e58b4 100644
--- a/actions/showgroup.php
+++ b/actions/showgroup.php
@@ -23,7 +23,7 @@
  * @package   StatusNet
  * @author    Evan Prodromou <evan@status.net>
  * @author    Sarven Capadisli <csarven@status.net>
- * @copyright 2008-2009 StatusNet, Inc.
+ * @copyright 2008-2011 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
  */
@@ -35,8 +35,6 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
 require_once INSTALLDIR.'/lib/noticelist.php';
 require_once INSTALLDIR.'/lib/feedlist.php';
 
-define('MEMBERS_PER_SECTION', 27);
-
 /**
  * Group main page
  *
@@ -46,7 +44,7 @@ define('MEMBERS_PER_SECTION', 27);
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
-class ShowgroupAction extends GroupDesignAction
+class ShowgroupAction extends GroupAction
 {
     /** page we're viewing. */
     var $page = null;
@@ -99,56 +97,15 @@ class ShowgroupAction extends GroupDesignAction
 
         $this->page = ($this->arg('page')) ? ($this->arg('page')+0) : 1;
 
-        $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);
-            if ($this->page != 1) {
-                $args['page'] = $this->page;
-            }
-            common_redirect(common_local_url('showgroup', $args), 301);
-            return false;
-        }
-
-        if (!$nickname) {
-            // TRANS: Client error displayed if no nickname argument was given requesting a group page.
-            $this->clientError(_('No nickname.'), 404);
-            return false;
-        }
-
-        $local = Local_group::staticGet('nickname', $nickname);
-
-        if (!$local) {
-            $alias = Group_alias::staticGet('alias', $nickname);
-            if ($alias) {
-                $args = array('id' => $alias->group_id);
-                if ($this->page != 1) {
-                    $args['page'] = $this->page;
-                }
-                common_redirect(common_local_url('groupbyid', $args), 301);
-                return false;
-            } else {
-                common_log(LOG_NOTICE, "Couldn't find local group for nickname '$nickname'");
-                // TRANS: Client error displayed if no remote group with a given name was found requesting group page.
-                $this->clientError(_('No such group.'), 404);
-                return false;
-            }
-        }
-
-        $this->group = User_group::staticGet('id', $local->group_id);
-
-        if (!$this->group) {
-                // TRANS: Client error displayed if no local group with a given name was found requesting group page.
-            $this->clientError(_('No such group.'), 404);
-            return false;
-        }
-
         $this->userProfile = Profile::current();
 
-        $stream = new ThreadingGroupNoticeStream($this->group, $this->userProfile);
+        $user = common_current_user();
+
+        if (!empty($user) && $user->streamModeOnly()) {
+            $stream = new GroupNoticeStream($this->group, $this->userProfile);
+        } else {
+            $stream = new ThreadingGroupNoticeStream($this->group, $this->userProfile);
+        }
 
         $this->notice = $stream->getNotices(($this->page-1)*NOTICES_PER_PAGE,
                                             NOTICES_PER_PAGE + 1);
@@ -171,17 +128,6 @@ class ShowgroupAction extends GroupDesignAction
         $this->showPage();
     }
 
-    /**
-     * Local menu
-     *
-     * @return void
-     */
-    function showObjectNav()
-    {
-        $nav = new GroupNav($this, $this->group);
-        $nav->show();
-    }
-
     /**
      * Show the page content
      *
@@ -199,7 +145,14 @@ class ShowgroupAction extends GroupDesignAction
      */
     function showGroupNotices()
     {
-        $nl = new ThreadedNoticeList($this->notice, $this, $this->userProfile);
+        $user = common_current_user();
+
+        if (!empty($user) && $user->streamModeOnly()) {
+            $nl = new NoticeList($this->notice, $this);
+        } else {
+            $nl = new ThreadedNoticeList($this->notice, $this, $this->userProfile);
+        } 
+
         $cnt = $nl->show();
 
         $this->pagination($this->page > 1,
@@ -220,7 +173,14 @@ class ShowgroupAction extends GroupDesignAction
           common_local_url('grouprss',
                            array('nickname' => $this->group->nickname));
 
-        return array(new Feed(Feed::RSS1,
+        return array(new Feed(Feed::JSON,
+                              common_local_url('ApiTimelineGroup',
+                                               array('format' => 'as',
+                                                     'id' => $this->group->id)),
+                              // TRANS: Tooltip for feed link. %s is a group nickname.
+                              sprintf(_('Notice feed for %s group (Activity Streams JSON)'),
+                                      $this->group->nickname)),
+                    new Feed(Feed::RSS1,
                               common_local_url('grouprss',
                                                array('nickname' => $this->group->nickname)),
                               // TRANS: Tooltip for feed link. %s is a group nickname.
@@ -248,201 +208,37 @@ class ShowgroupAction extends GroupDesignAction
                                        $this->group->nickname)));
     }
 
-    /**
-     * Fill in the sidebar.
-     *
-     * @return void
-     */
-    function showSections()
-    {
-        $this->showMembers();
-        $this->showStatistics();
-        $this->showAdmins();
-        $cloud = new GroupTagCloudSection($this, $this->group);
-        $cloud->show();
-    }
-
-    /**
-     * Show mini-list of members
-     *
-     * @return void
-     */
-    function showMembers()
-    {
-        $member = $this->group->getMembers(0, MEMBERS_PER_SECTION);
-
-        if (!$member) {
-            return;
-        }
-
-        $this->elementStart('div', array('id' => 'entity_members',
-                                         'class' => 'section'));
-
-        if (Event::handle('StartShowGroupMembersMiniList', array($this))) {
-
-            // TRANS: Header for mini list of group members on a group page (h2).
-            $this->element('h2', null, _('Members'));
-
-            $gmml = new GroupMembersMiniList($member, $this);
-            $cnt = $gmml->show();
-            if ($cnt == 0) {
-                // TRANS: Description for mini list of group members on a group page when the group has no members.
-                $this->element('p', null, _('(None)'));
-            }
-
-            // @todo FIXME: Should be shown if a group has more than 27 members, but I do not see it displayed at
-            //              for example http://identi.ca/group/statusnet. Broken?
-            if ($cnt > MEMBERS_PER_SECTION) {
-                $this->element('a', array('href' => common_local_url('groupmembers',
-                                                                     array('nickname' => $this->group->nickname))),
-                               // TRANS: Link to all group members from mini list of group members if group has more than n members.
-                               _('All members'));
-            }
-
-            Event::handle('EndShowGroupMembersMiniList', array($this));
-        }
-
-        $this->elementEnd('div');
-    }
-
-    /**
-     * Show list of admins
-     *
-     * @return void
-     */
-    function showAdmins()
-    {
-        $adminSection = new GroupAdminSection($this, $this->group);
-        $adminSection->show();
-    }
-
-    /**
-     * Show some statistics
-     *
-     * @return void
-     */
-    function showStatistics()
-    {
-        $this->elementStart('div', array('id' => 'entity_statistics',
-                                         'class' => 'section'));
-
-        // TRANS: Header for group statistics on a group page (h2).
-        $this->element('h2', null, _('Statistics'));
-
-        $this->elementStart('dl');
-
-        // TRANS: Label for group creation date.
-        $this->element('dt', null, _m('LABEL','Created'));
-        $this->element('dd', 'entity_created', date('j M Y',
-                                                 strtotime($this->group->created)));
-        // @todo FIXME: i18n issue. This label gets a colon added from somewhere. Should be part of the message.
-        // TRANS: Label for member count in statistics on group page.
-        $this->element('dt', null, _m('LABEL','Members'));
-        $this->element('dd', null, $this->group->getMemberCount());
-        $this->elementEnd('dl');
-
-        $this->elementEnd('div');
-    }
-
     function showAnonymousMessage()
     {
         if (!(common_config('site','closed') || common_config('site','inviteonly'))) {
-            // @todo FIXME: use group full name here if available instead of (uglier) primary alias.
             // TRANS: Notice on group pages for anonymous users for StatusNet sites that accept new registrations.
-            // TRANS: **%s** is the group alias, %%%%site.name%%%% is the site name,
+            // TRANS: %s is the group name, %%%%site.name%%%% is the site name,
             // TRANS: %%%%action.register%%%% is the URL for registration, %%%%doc.help%%%% is a URL to help.
             // TRANS: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
             $m = sprintf(_('**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-blogging) service ' .
                 'based on the Free Software [StatusNet](http://status.net/) tool. Its members share ' .
                 'short messages about their life and interests. '.
                 '[Join now](%%%%action.register%%%%) to become part of this group and many more! ([Read more](%%%%doc.help%%%%))'),
-                     $this->group->nickname);
+                     $this->group->getBestName());
         } else {
-            // @todo FIXME: use group full name here if available instead of (uglier) primary alias.
             // TRANS: Notice on group pages for anonymous users for StatusNet sites that accept no new registrations.
-            // TRANS: **%s** is the group alias, %%%%site.name%%%% is the site name,
+            // TRANS: %s is the group name, %%%%site.name%%%% is the site name,
             // TRANS: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
             $m = sprintf(_('**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-blogging) service ' .
                 'based on the Free Software [StatusNet](http://status.net/) tool. Its members share ' .
-                'short messages about their life and interests. '),
-                     $this->group->nickname);
+                'short messages about their life and interests.'),
+                     $this->group->getBestName());
         }
         $this->elementStart('div', array('id' => 'anon_notice'));
         $this->raw(common_markup_to_html($m));
         $this->elementEnd('div');
     }
 
-    function noticeFormOptions()
+    function extraHead()
     {
-        $options = parent::noticeFormOptions();
-        $cur = common_current_user();
-
-        if (!empty($cur) && $cur->isMember($this->group)) {
-            $options['to_group'] =  $this->group;
+        if ($this->page != 1) {
+            $this->element('link', array('rel' => 'canonical',
+                                         'href' => $this->group->homeUrl()));
         }
-
-        return $options;
     }
 }
-
-class GroupAdminSection extends ProfileSection
-{
-    var $group;
-
-    function __construct($out, $group)
-    {
-        parent::__construct($out);
-        $this->group = $group;
-    }
-
-    function getProfiles()
-    {
-        return $this->group->getAdmins();
-    }
-
-    function title()
-    {
-        // TRANS: Title for list of group administrators on a group page.
-        return _m('TITLE','Admins');
-    }
-
-    function divId()
-    {
-        return 'group_admins';
-    }
-
-    function moreUrl()
-    {
-        return null;
-    }
-}
-
-class GroupMembersMiniList extends ProfileMiniList
-{
-    function newListItem($profile)
-    {
-        return new GroupMembersMiniListItem($profile, $this->action);
-    }
-}
-
-class GroupMembersMiniListItem extends ProfileMiniListItem
-{
-    function linkAttributes()
-    {
-        $aAttrs = parent::linkAttributes();
-
-        if (common_config('nofollow', 'members')) {
-            $aAttrs['rel'] .= ' nofollow';
-        }
-
-        return $aAttrs;
-    }
-}
-
-class ThreadingGroupNoticeStream extends ThreadingNoticeStream
-{
-    function __construct($group, $profile)
-    {
-        parent::__construct(new GroupNoticeStream($group, $profile));
-    }
-}
\ No newline at end of file
diff --git a/actions/shownotice.php b/actions/shownotice.php
index ea9041efb5..6055184fcd 100644
--- a/actions/shownotice.php
+++ b/actions/shownotice.php
@@ -22,7 +22,7 @@
  * @category  Personal
  * @package   StatusNet
  * @author    Evan Prodromou <evan@status.net>
- * @copyright 2008-2009 StatusNet, Inc.
+ * @copyright 2008-2011 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
  */
@@ -44,7 +44,7 @@ require_once INSTALLDIR.'/lib/feedlist.php';
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
-class ShownoticeAction extends OwnerDesignAction
+class ShownoticeAction extends Action
 {
     /**
      * Notice object to show
@@ -214,7 +214,7 @@ class ShownoticeAction extends OwnerDesignAction
         if ($this->boolean('ajax')) {
             $this->showAjax();
         } else {
-            if ($this->notice->is_local == Notice::REMOTE_OMB) {
+            if ($this->notice->is_local == Notice::REMOTE) {
                 if (!empty($this->notice->url)) {
                     $target = $this->notice->url;
                 } else if (!empty($this->notice->uri) && preg_match('/^https?:/', $this->notice->uri)) {
diff --git a/actions/showprofiletag.php b/actions/showprofiletag.php
index d1b0768d23..ec1837f835 100644
--- a/actions/showprofiletag.php
+++ b/actions/showprofiletag.php
@@ -44,7 +44,11 @@ class ShowprofiletagAction extends Action
     {
         parent::prepare($args);
 
-        $tagger_arg = $this->arg('tagger');
+        if (common_config('singleuser', 'enabled')) {
+            $tagger_arg = User::singleUserNickname();
+        } else {
+            $tagger_arg = $this->arg('tagger');
+        }
         $tag_arg = $this->arg('tag');
         $tagger = common_canonical_nickname($tagger_arg);
         $tag = common_canonical_tag($tag_arg);
@@ -169,7 +173,18 @@ class ShowprofiletagAction extends Action
     function getFeeds()
     {
         #XXX: make these actually work
-        return array(new Feed(Feed::RSS2,
+        return array(new Feed(Feed::JSON,
+                common_local_url(
+                    'ApiTimelineList', array(
+                        'user' => $this->tagger->id,
+                        'id' => $this->peopletag->id,
+                        'format' => 'as'
+                    )
+                ),
+                // TRANS: Feed title.
+                // TRANS: %s is tagger's nickname.
+                sprintf(_('Feed for friends of %s (Activity Streams JSON)'), $this->tagger->nickname)),
+                new Feed(Feed::RSS2,
                 common_local_url(
                     'ApiTimelineList', array(
                         'user' => $this->tagger->id,
@@ -339,17 +354,7 @@ class ShowprofiletagAction extends Action
                 }
             }
 
-            if ($cnt > PROFILES_PER_MINILIST) {
-                $this->elementStart('p');
-                $this->element('a', array('href' => common_local_url('profiletagsubscribers',
-                                                                     array('nickname' => $this->tagger->nickname,
-                                                                           'profiletag' => $this->peopletag->tag)),
-                                          'class' => 'more'),
-                               // TRANS: Link for more "People following tag x"
-                               // TRANS: if there are more than the mini list's maximum.
-                               _('All subscribers'));
-                $this->elementEnd('p');
-            }
+            // FIXME: link to full list
 
             Event::handle('EndShowProfileTagSubscribersMiniList', array($this));
         }
diff --git a/actions/showstream.php b/actions/showstream.php
index fe819d30cf..9e89b1b48c 100644
--- a/actions/showstream.php
+++ b/actions/showstream.php
@@ -55,6 +55,25 @@ require_once INSTALLDIR.'/lib/feedlist.php';
  */
 class ShowstreamAction extends ProfileAction
 {
+    var $notice;
+
+    function prepare($args)
+    {
+        parent::prepare($args);
+
+        $p = Profile::current();
+
+        if (empty($this->tag)) {
+            $stream = new ProfileNoticeStream($this->profile, $p);
+        } else {
+            $stream = new TaggedProfileNoticeStream($this->profile, $this->tag, $p);
+        }
+
+        $this->notice = $stream->getNotices(($this->page-1)*NOTICES_PER_PAGE, NOTICES_PER_PAGE + 1);
+
+        return true;
+    }
+
     function isReadOnly($args)
     {
         return true;
@@ -65,11 +84,11 @@ class ShowstreamAction extends ProfileAction
         $base = $this->profile->getFancyName();
         if (!empty($this->tag)) {
             if ($this->page == 1) {
-                // TRANS: Page title showing tagged notices in one user's stream.
+                // TRANS: Page title showing tagged notices in one user's timeline.
                 // TRANS: %1$s is the username, %2$s is the hash tag.
                 return sprintf(_('Notices by %1$s tagged %2$s'), $base, $this->tag);
             } else {
-                // TRANS: Page title showing tagged notices in one user's stream.
+                // TRANS: Page title showing tagged notices in one user's timeline.
                 // TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number.
                 return sprintf(_('Notices by %1$s tagged %2$s, page %3$d'), $base, $this->tag, $this->page);
             }
@@ -77,7 +96,7 @@ class ShowstreamAction extends ProfileAction
             if ($this->page == 1) {
                 return $base;
             } else {
-                // TRANS: Extended page title showing tagged notices in one user's stream.
+                // TRANS: Extended page title showing tagged notices in one user's timeline.
                 // TRANS: %1$s is the username, %2$d is the page number.
                 return sprintf(_('Notices by %1$s, page %2$d'),
                                $base,
@@ -92,9 +111,6 @@ class ShowstreamAction extends ProfileAction
 
         // For YADIS discovery, we also have a <meta> tag
 
-        header('X-XRDS-Location: '. common_local_url('xrds', array('nickname' =>
-                                                                   $this->user->nickname)));
-
         $this->showPage();
     }
 
@@ -127,7 +143,16 @@ class ShowstreamAction extends ProfileAction
                                           $this->user->nickname, $this->tag)));
         }
 
-        return array(new Feed(Feed::RSS1,
+        return array(new Feed(Feed::JSON,
+                              common_local_url('ApiTimelineUser',
+                                               array(
+                                                    'id' => $this->user->id,
+                                                    'format' => 'as')),
+                              // TRANS: Title for link to notice feed.
+                              // TRANS: %s is a user nickname.
+                              sprintf(_('Notice feed for %s (Activity Streams JSON)'),
+                                      $this->user->nickname)),
+                     new Feed(Feed::RSS1,
                               common_local_url('userrss',
                                                array('nickname' => $this->user->nickname)),
                               // TRANS: Title for link to notice feed.
@@ -162,11 +187,6 @@ class ShowstreamAction extends ProfileAction
 
     function extraHead()
     {
-        // for remote subscriptions etc.
-        $this->element('meta', array('http-equiv' => 'X-XRDS-Location',
-                                     'content' => common_local_url('xrds', array('nickname' =>
-                                                                                 $this->user->nickname))));
-
         if ($this->profile->bio) {
             $this->element('meta', array('name' => 'description',
                                          'content' => $this->profile->bio));
@@ -192,11 +212,16 @@ class ShowstreamAction extends ProfileAction
         $this->element('link', array('rel' => 'EditURI',
                                      'type' => 'application/rsd+xml',
                                      'href' => $rsd));
+
+        if ($this->page != 1) {
+            $this->element('link', array('rel' => 'canonical',
+                                         'href' => $this->profile->profileurl));
+        }
     }
 
     function showEmptyListMessage()
     {
-        // TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
+        // TRANS: First sentence of empty list message for a timeline. $1%s is a user nickname.
         $message = sprintf(_('This is the timeline for %1$s, but %1$s hasn\'t posted anything yet.'), $this->user->nickname) . ' ';
 
         if (common_logged_in()) {
@@ -205,7 +230,7 @@ class ShowstreamAction extends ProfileAction
                 // TRANS: Second sentence of empty list message for a stream for the user themselves.
                 $message .= _('Seen anything interesting recently? You haven\'t posted any notices yet, now would be a good time to start :)');
             } else {
-                // TRANS: Second sentence of empty  list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
+                // TRANS: Second sentence of empty  list message for a non-self timeline. %1$s is a user nickname, %2$s is a part of a URL.
                 // TRANS: This message contains a Markdown link. Keep "](" together.
                 $message .= sprintf(_('You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%%?status_textarea=%2$s).'), $this->user->nickname, '@' . $this->user->nickname);
             }
@@ -223,13 +248,9 @@ class ShowstreamAction extends ProfileAction
 
     function showNotices()
     {
-        $notice = empty($this->tag)
-          ? $this->user->getNotices(($this->page-1)*NOTICES_PER_PAGE, NOTICES_PER_PAGE + 1)
-            : $this->user->getTaggedNotices($this->tag, ($this->page-1)*NOTICES_PER_PAGE, NOTICES_PER_PAGE + 1, 0, 0, null);
-
         $pnl = null;
-        if (Event::handle('ShowStreamNoticeList', array($notice, $this, &$pnl))) {
-            $pnl = new ProfileNoticeList($notice, $this);
+        if (Event::handle('ShowStreamNoticeList', array($this->notice, $this, &$pnl))) {
+            $pnl = new ProfileNoticeList($this->notice, $this);
         }
         $cnt = $pnl->show();
         if (0 == $cnt) {
@@ -248,17 +269,17 @@ class ShowstreamAction extends ProfileAction
     function showAnonymousMessage()
     {
         if (!(common_config('site','closed') || common_config('site','inviteonly'))) {
-            // TRANS: Announcement for anonymous users showing a stream if site registrations are open.
+            // TRANS: Announcement for anonymous users showing a timeline if site registrations are open.
             // TRANS: This message contains a Markdown link. Keep "](" together.
             $m = sprintf(_('**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-blogging) service ' .
                            'based on the Free Software [StatusNet](http://status.net/) tool. ' .
                            '[Join now](%%%%action.register%%%%) to follow **%s**\'s notices and many more! ([Read more](%%%%doc.help%%%%))'),
                          $this->user->nickname, $this->user->nickname);
         } else {
-            // TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
+            // TRANS: Announcement for anonymous users showing a timeline if site registrations are closed or invite only.
             // TRANS: This message contains a Markdown link. Keep "](" together.
             $m = sprintf(_('**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-blogging) service ' .
-                           'based on the Free Software [StatusNet](http://status.net/) tool. '),
+                           'based on the Free Software [StatusNet](http://status.net/) tool.'),
                          $this->user->nickname, $this->user->nickname);
         }
         $this->elementStart('div', array('id' => 'anon_notice'));
@@ -269,8 +290,10 @@ class ShowstreamAction extends ProfileAction
     function showSections()
     {
         parent::showSections();
-        $cloud = new PersonalTagCloudSection($this, $this->user);
-        $cloud->show();
+        if (!common_config('performance', 'high')) {
+            $cloud = new PersonalTagCloudSection($this, $this->user);
+            $cloud->show();
+        }
     }
 
     function noticeFormOptions()
diff --git a/actions/siteadminpanel.php b/actions/siteadminpanel.php
index 29813ca3b9..bc96a6d73e 100644
--- a/actions/siteadminpanel.php
+++ b/actions/siteadminpanel.php
@@ -24,7 +24,7 @@
  * @author    Evan Prodromou <evan@status.net>
  * @author    Zach Copley <zach@status.net>
  * @author    Sarven Capadisli <csarven@status.net>
- * @copyright 2008-2010 StatusNet, Inc.
+ * @copyright 2008-2011 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
  */
@@ -88,9 +88,19 @@ class SiteadminpanelAction extends AdminPanelAction
     function saveSettings()
     {
         static $settings = array(
-            'site' => array('name', 'broughtby', 'broughtbyurl',
-            'email', 'timezone', 'language',
-            'site', 'textlimit', 'dupelimit'),
+            'site' => array(
+                'name',
+                'broughtby',
+                'broughtbyurl',
+                'email',
+                'timezone',
+                'language',
+                'site',
+                'textlimit',
+                'dupelimit',
+                'logo',
+                'ssllogo'
+            )
         );
 
         $values = array();
@@ -144,6 +154,19 @@ class SiteadminpanelAction extends AdminPanelAction
             $this->clientError(_('Not a valid email address.'));
         }
 
+        // Validate logos
+        if (!empty($values['site']['logo']) &&
+            !Validate::uri($values['site']['logo'], array('allowed_schemes' => array('http', 'https')))) {
+            // TRANS: Client error displayed when a logo URL is not valid.
+            $this->clientError(_('Invalid logo URL.'));
+        }
+
+        if (!empty($values['site']['ssllogo']) &&
+            !Validate::uri($values['site']['ssllogo'], array('allowed_schemes' => array('https')))) {
+            // TRANS: Client error displayed when a SSL logo URL is invalid.
+            $this->clientError(_('Invalid SSL logo URL.'));
+        }
+
         // Validate timezone
 
         if (is_null($values['site']['timezone']) ||
@@ -173,7 +196,7 @@ class SiteadminpanelAction extends AdminPanelAction
 
         if (!Validate::number($values['site']['dupelimit'], array('min' => 1))) {
             // TRANS: Client error displayed trying to save site settings with a text limit below 1.
-            $this->clientError(_("Dupe limit must be one or more seconds."));
+            $this->clientError(_('Dupe limit must be one or more seconds.'));
         }
     }
 }
@@ -251,6 +274,8 @@ class SiteAdminPanelForm extends AdminForm
         $this->out->elementEnd('ul');
         $this->out->elementEnd('fieldset');
 
+        $this->showLogo();
+
         $this->out->elementStart('fieldset', array('id' => 'settings_admin_local'));
         // TRANS: Fieldset legend on site settings panel.
         $this->out->element('legend', null, _m('LEGEND','Local'));
@@ -277,7 +302,7 @@ class SiteAdminPanelForm extends AdminForm
                              _('Default language'),
                              get_nice_language_list(),
                              // TRANS: Dropdown title on site settings panel.
-                             _('Site language when autodetection from browser settings is not available'),
+                             _('The site language when autodetection from browser settings is not available.'),
                              false, $this->value('language'));
         $this->unli();
 
@@ -307,6 +332,35 @@ class SiteAdminPanelForm extends AdminForm
         $this->out->elementEnd('fieldset');
     }
 
+    function showLogo()
+    {
+        $this->out->elementStart('fieldset', array('id' => 'settings_site_logo'));
+        // TRANS: Fieldset legend for form to change logo.
+        $this->out->element('legend', null, _('Logo'));
+
+        $this->out->elementStart('ul', 'form_data');
+
+        $this->li();
+        $this->input('logo',
+                     // TRANS: Field label for StatusNet site logo.
+                     _('Site logo'),
+                     // TRANS: Title for field label for StatusNet site logo.
+                     'Logo for the site (full URL).');
+        $this->unli();
+
+        $this->li();
+        $this->input('ssllogo',
+                     // TRANS: Field label for SSL StatusNet site logo.
+                     _('SSL logo'),
+                     // TRANS: Title for field label for SSL StatusNet site logo.
+                     'Logo to show on SSL pages (full URL).');
+        $this->unli();
+
+        $this->out->elementEnd('ul');
+
+        $this->out->elementEnd('fieldset');
+    }
+
     /**
      * Action elements
      *
@@ -320,6 +374,6 @@ class SiteAdminPanelForm extends AdminForm
                            'submit',
                            null,
                            // TRANS: Button title for saving site settings.
-                           _('Save site settings'));
+                           _('Save the site settings.'));
     }
 }
diff --git a/actions/sitenoticeadminpanel.php b/actions/sitenoticeadminpanel.php
index b1ac441af7..145ae80d07 100644
--- a/actions/sitenoticeadminpanel.php
+++ b/actions/sitenoticeadminpanel.php
@@ -197,7 +197,7 @@ class SiteNoticeAdminPanelForm extends AdminForm
             _m('BUTTON','Save'),
             'submit',
             null,
-            // TRANS: Title for button to save site notice in admin panel.
+            // TRANS: Button title to save site notice in admin panel.
             _('Save site notice.')
         );
     }
diff --git a/actions/snapshotadminpanel.php b/actions/snapshotadminpanel.php
index 9790947071..751b1acd1e 100644
--- a/actions/snapshotadminpanel.php
+++ b/actions/snapshotadminpanel.php
@@ -252,7 +252,7 @@ class SnapshotAdminPanelForm extends AdminForm
             _m('BUTTON','Save'),
             'submit',
             null,
-            // TRANS: Title for button to save snapshot settings.
+            // TRANS: Button title to save snapshot settings.
             _('Save snapshot settings.')
         );
     }
diff --git a/actions/subscribe.php b/actions/subscribe.php
index b8c1cdd8f7..ce1d367cf8 100644
--- a/actions/subscribe.php
+++ b/actions/subscribe.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * StatusNet - the distributed open-source microblogging tool
- * Copyright (C) 2008-2010, StatusNet, Inc.
+ * Copyright (C) 2008-2011, StatusNet, Inc.
  *
  * Subscription action.
  *
@@ -111,18 +111,6 @@ class SubscribeAction extends Action
             return false;
         }
 
-        // OMB 0.1 doesn't have a mechanism for local-server-
-        // originated subscription.
-
-        $omb01 = Remote_profile::staticGet('id', $other_id);
-
-        if (!empty($omb01)) {
-            // TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
-            $this->clientError(_('You cannot subscribe to an OMB 0.1'.
-                                 ' remote profile with this action.'));
-            return false;
-        }
-
         return true;
     }
 
diff --git a/actions/subscriptions.php b/actions/subscriptions.php
index b4575565b9..e4cb123912 100644
--- a/actions/subscriptions.php
+++ b/actions/subscriptions.php
@@ -132,9 +132,7 @@ class SubscriptionsAction extends GalleryAction
                 // TRANS: and do not change the URL part.
                 $message = _('You\'re not listening to anyone\'s notices right now, try subscribing to people you know. '.
                              'Try [people search](%%action.peoplesearch%%), look for members in groups you\'re interested '.
-                             'in and in our [featured users](%%action.featured%%). '.
-                             'If you\'re a [Twitter user](%%action.twittersettings%%), you can automatically subscribe to '.
-                             'people you already follow there.');
+                             'in and in our [featured users](%%action.featured%%).');
             } else {
                 // TRANS: Subscription list text when looking at the subscriptions for a of a user other
                 // TRANS: than the logged in user that has no subscriptions. %s is the user nickname.
diff --git a/actions/tag.php b/actions/tag.php
index f3514bef55..e0cb9783d1 100644
--- a/actions/tag.php
+++ b/actions/tag.php
@@ -23,6 +23,8 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 class TagAction extends Action
 {
     var $notice;
+    var $tag;
+    var $page;
 
     function prepare($args)
     {
@@ -79,7 +81,15 @@ class TagAction extends Action
 
     function getFeeds()
     {
-        return array(new Feed(Feed::RSS1,
+        return array(new Feed(Feed::JSON,
+                              common_local_url('ApiTimelineTag',
+                                               array('format' => 'as',
+                                                     'tag' => $this->tag)),
+                              // TRANS: Link label for feed on "notices with tag" page.
+                              // TRANS: %s is the tag the feed is for.
+                              sprintf(_('Notice feed for tag %s (Activity Streams JSON)'),
+                                      $this->tag)),
+                     new Feed(Feed::RSS1,
                               common_local_url('tagrss',
                                                array('tag' => $this->tag)),
                               // TRANS: Link label for feed on "notices with tag" page.
diff --git a/actions/top.php b/actions/top.php
new file mode 100644
index 0000000000..39abe3df26
--- /dev/null
+++ b/actions/top.php
@@ -0,0 +1,86 @@
+<?php
+/**
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2011, StatusNet, Inc.
+ *
+ * Redirect to the appropriate top-of-site
+ * 
+ * PHP version 5
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Top
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2010 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    // This check helps protect against security problems;
+    // your code file can't be executed directly from the web.
+    exit(1);
+}
+
+/**
+ * An action to redirect to the top of the site
+ *
+ * @category  Action
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2010 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+
+class TopAction extends Action
+{
+    /**
+     * For initializing members of the class.
+     *
+     * @param array $argarray misc. arguments
+     *
+     * @return boolean true
+     */
+
+    function prepare($argarray)
+    {
+        parent::prepare($argarray);
+        return true;
+    }
+
+    /**
+     * Handler method
+     *
+     * @param array $argarray is ignored since it's now passed in in prepare()
+     *
+     * @return void
+     */
+
+    function handle($argarray=null)
+    {
+        if (common_config('singleuser', 'enabled')) {
+            $url = common_local_url('showstream', array('nickname' => User::singleUserNickname()));
+        } else {
+            $url = common_local_url('public');
+        }
+
+        // XXX: Permanent? I think so.
+
+        common_redirect($url, 301);
+
+        return;
+    }
+}
diff --git a/actions/useradminpanel.php b/actions/useradminpanel.php
index 19673189f5..1eda1c0c82 100644
--- a/actions/useradminpanel.php
+++ b/actions/useradminpanel.php
@@ -300,7 +300,7 @@ class UserAdminPanelForm extends AdminForm
                            _m('BUTTON','Save'),
                            'submit',
                            null,
-                           // TRANS: Title for button to save user settings in user admin panel.
+                           // TRANS: Button title to save user settings in user admin panel.
                            _('Save user settings.'));
     }
 }
diff --git a/actions/userdesignsettings.php b/actions/userdesignsettings.php
deleted file mode 100644
index c83815412a..0000000000
--- a/actions/userdesignsettings.php
+++ /dev/null
@@ -1,365 +0,0 @@
-<?php
-/**
- * StatusNet, the distributed open-source microblogging tool
- *
- * Change user password
- *
- * PHP version 5
- *
- * LICENCE: This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * @category  Settings
- * @package   StatusNet
- * @author    Sarven Capadisli <csarven@status.net>
- * @author    Zach Copley <zach@status.net>
- * @copyright 2008-2009 StatusNet, Inc.
- * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://status.net/
- */
-
-if (!defined('STATUSNET') && !defined('LACONICA')) {
-    exit(1);
-}
-
-require_once INSTALLDIR . '/lib/designsettings.php';
-
-/**
- * Set a user's design
- *
- * Saves a design for a given user
- *
- * @category Settings
- * @package  StatusNet
- * @author   Zach Copley <zach@status.net>
- * @author   Sarven Capadisli <csarven@status.net>
- * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://status.net/
- */
-class UserDesignSettingsAction extends DesignSettingsAction
-{
-    /**
-     * Sets the right action for the form, and passes request args into
-     * the base action
-     *
-     * @param array $args misc. arguments
-     *
-     * @return boolean true
-     */
-
-    function prepare($args)
-    {
-        parent::prepare($args);
-        $this->submitaction = common_local_url('userdesignsettings');
-        return true;
-    }
-
-    /**
-     * Title of the page
-     *
-     * @return string Title of the page
-     */
-    function title()
-    {
-        // TRANS: Title for profile design page.
-        return _('Profile design');
-    }
-
-    /**
-     * Instructions for use
-     *
-     * @return instructions for use
-     */
-    function getInstructions()
-    {
-        // TRANS: Instructions for Profile design page.
-        return _('Customize the way your profile looks ' .
-        'with a background image and a colour palette of your choice.');
-    }
-
-    /**
-     * Get the design we want to edit
-     *
-     * @return Design
-     */
-    function getWorkingDesign()
-    {
-        $user   = common_current_user();
-        $design = $user->getDesign();
-        return $design;
-    }
-
-    /**
-     * Content area of the page
-     *
-     * Shows a form for changing the design
-     *
-     * @return void
-     */
-    function showContent()
-    {
-        $design = $this->getWorkingDesign();
-
-        if (empty($design)) {
-            $design = Design::siteDesign();
-        }
-
-        $this->showDesignForm($design);
-    }
-
-    /**
-     * Shows the design settings form
-     *
-     * @param Design $design a working design to show
-     *
-     * @return nothing
-     */
-
-    function showDesignForm($design)
-    {
-        $form = new UserDesignForm($this, $design, $this->submitaction);
-        $form->show();
-    }
-
-    /**
-     * Save or update the user's design settings
-     *
-     * @return void
-     */
-    function saveDesign()
-    {
-        $this->saveDesignPreferences();
-
-        foreach ($this->args as $key => $val) {
-            if (preg_match('/(#ho|ho)Td.*g/i', $val)) {
-                $this->sethd();
-                return;
-            }
-        }
-
-        try {
-            $bgcolor = new WebColor($this->trimmed('design_background'));
-            $ccolor  = new WebColor($this->trimmed('design_content'));
-            $sbcolor = new WebColor($this->trimmed('design_sidebar'));
-            $tcolor  = new WebColor($this->trimmed('design_text'));
-            $lcolor  = new WebColor($this->trimmed('design_links'));
-        } catch (WebColorException $e) {
-            $this->showForm($e->getMessage());
-            return;
-        }
-
-        $onoff = $this->arg('design_background-image_onoff');
-
-        $on   = false;
-        $off  = false;
-        $tile = false;
-
-        if ($onoff == 'on') {
-            $on = true;
-        } else {
-            $off = true;
-        }
-
-        $repeat = $this->boolean('design_background-image_repeat');
-
-        if ($repeat) {
-            $tile = true;
-        }
-
-        $user = common_current_user();
-
-        $design = $user->getDesign();
-
-        if (!empty($design)) {
-            $original = clone($design);
-
-            $design->backgroundcolor = $bgcolor->intValue();
-            $design->contentcolor    = $ccolor->intValue();
-            $design->sidebarcolor    = $sbcolor->intValue();
-            $design->textcolor       = $tcolor->intValue();
-            $design->linkcolor       = $lcolor->intValue();
-
-            $design->setDisposition($on, $off, $tile);
-
-            $result = $design->update($original);
-
-            if ($result === false) {
-                common_log_db_error($design, 'UPDATE', __FILE__);
-                // TRANS: Form validation error on Profile design page when updating design settings has failed.
-                $this->showForm(_('Could not update your design.'));
-                return;
-            }
-            // update design
-        } else {
-            $user->query('BEGIN');
-
-            // save new design
-            $design = new Design();
-
-            $design->backgroundcolor = $bgcolor->intValue();
-            $design->contentcolor    = $ccolor->intValue();
-            $design->sidebarcolor    = $sbcolor->intValue();
-            $design->textcolor       = $tcolor->intValue();
-            $design->linkcolor       = $lcolor->intValue();
-
-            $design->setDisposition($on, $off, $tile);
-
-            $id = $design->insert();
-
-            if (empty($id)) {
-                common_log_db_error($id, 'INSERT', __FILE__);
-                // TRANS: Form validation error on Profile design page when saving design settings has failed.
-                $this->showForm(_('Unable to save your design settings.'));
-                return;
-            }
-
-            $original        = clone($user);
-            $user->design_id = $id;
-            $result          = $user->update($original);
-
-            if (empty($result)) {
-                common_log_db_error($original, 'UPDATE', __FILE__);
-                // TRANS: Form validation error on Profile design page when saving design settings has failed.
-                $this->showForm(_('Unable to save your design settings.'));
-                $user->query('ROLLBACK');
-                return;
-            }
-
-            $user->query('COMMIT');
-
-        }
-
-        $this->saveBackgroundImage($design);
-
-        // TRANS: Confirmation message on Profile design page when saving design settings has succeeded.
-        $this->showForm(_('Design preferences saved.'), true);
-    }
-
-    /**
-     * Alternate default colors
-     *
-     * @return nothing
-     */
-    function sethd()
-    {
-        $user   = common_current_user();
-        $design = $user->getDesign();
-
-        $user->query('BEGIN');
-
-        // alternate colors
-        $design = new Design();
-
-        $design->backgroundcolor = 16184329;
-        $design->contentcolor    = 16059904;
-        $design->sidebarcolor    = 16059904;
-        $design->textcolor       = 0;
-        $design->linkcolor       = 16777215;
-
-        $design->setDisposition(false, true, false);
-
-        $id = $design->insert();
-
-        if (empty($id)) {
-            common_log_db_error($id, 'INSERT', __FILE__);
-            // TRANS: Form validation error on Profile design page when saving design settings has failed.
-            $this->showForm(_('Unable to save your design settings.'));
-            return;
-        }
-
-        $original        = clone($user);
-        $user->design_id = $id;
-        $result          = $user->update($original);
-
-        if (empty($result)) {
-            common_log_db_error($original, 'UPDATE', __FILE__);
-            // TRANS: Form validation error on Profile design page when updating design settings has failed.
-            $this->showForm(_('Unable to save your design settings.'));
-            $user->query('ROLLBACK');
-            return;
-        }
-
-        $user->query('COMMIT');
-
-        $this->saveBackgroundImage($design);
-
-        // TRANS: Succes message on Profile design page when finding an easter egg.
-        $this->showForm(_('Enjoy your hotdog!'), true);
-    }
-
-    function saveDesignPreferences()
-    {
-        $viewdesigns = $this->boolean('viewdesigns');
-
-        $user = common_current_user();
-
-        $original = clone($user);
-
-        $user->viewdesigns = $viewdesigns;
-
-        $result = $user->update($original);
-
-        if ($result === false) {
-            common_log_db_error($user, 'UPDATE', __FILE__);
-            // TRANS: Server exception thrown on Profile design page when updating design settings fails.
-            throw new ServerException(_('Could not update user.'));
-        }
-    }
-}
-
-class UserDesignForm extends DesignForm
-{
-    function __construct($out, $design, $actionurl)
-    {
-        parent::__construct($out, $design, $actionurl);
-    }
-
-    /**
-     * Legend of the Form
-     *
-     * @return void
-     */
-    function formLegend()
-    {
-        // TRANS: Form legend on Profile design page.
-        $this->out->element('legend', null, _('Design settings'));
-    }
-
-    /**
-     * Data elements of the form
-     *
-     * @return void
-     */
-
-    function formData()
-    {
-        $user = common_current_user();
-
-        $this->out->elementStart('ul', 'form_data');
-        $this->out->elementStart('li');
-        // TRANS: Checkbox label on Profile design page.
-        $this->out->checkbox('viewdesigns', _('View profile designs'),
-                                                  // TRANS: Title for checkbox on Profile design page.
-                         -                        $user->viewdesigns, _('Show or hide profile designs.'));
-        $this->out->elementEnd('li');
-        $this->out->elementEnd('ul');
-
-        $this->out->elementEnd('fieldset');
-
-        $this->out->elementStart('fieldset');
-        // TRANS: Form legend on Profile design page for form to choose a background image.
-        $this->out->element('legend', null, _('Background file'));
-
-        parent::formData();
-    }
-}
diff --git a/actions/usergroups.php b/actions/usergroups.php
index 178a3586fd..9d5946b484 100644
--- a/actions/usergroups.php
+++ b/actions/usergroups.php
@@ -104,7 +104,7 @@ class UsergroupsAction extends ProfileAction
             return false;
         }
 
-        $this->page = ($this->arg('page')) ? ($this->arg('page')+0) : 1;
+        $this->page = $this->trimmed('page', 1);
 
         return true;
     }
diff --git a/actions/userrss.php b/actions/userrss.php
index 85ea2fd7fa..99330af57f 100644
--- a/actions/userrss.php
+++ b/actions/userrss.php
@@ -29,8 +29,6 @@ class UserrssAction extends Rss10Action
 
     function prepare($args)
     {
-        common_debug("UserrssAction");
-
         parent::prepare($args);
         $nickname   = $this->trimmed('nickname');
         $this->user = User::staticGet('nickname', $nickname);
diff --git a/actions/userxrd.php b/actions/userxrd.php
index 1d888064d6..6fa738a5c9 100644
--- a/actions/userxrd.php
+++ b/actions/userxrd.php
@@ -30,6 +30,7 @@ class UserxrdAction extends XrdAction
     function prepare($args)
     {
         parent::prepare($args);
+        global $config;
 
         $this->uri = $this->trimmed('uri');
         $this->uri = self::normalize($this->uri);
diff --git a/actions/version.php b/actions/version.php
index 37555652c7..0461aade5c 100644
--- a/actions/version.php
+++ b/actions/version.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * StatusNet - the distributed open-source microblogging tool
- * Copyright (C) 2008, 2009, StatusNet, Inc.
+ * Copyright (C) 2008-2011, StatusNet, Inc.
  *
  * Show version information for this software and plugins
  *
@@ -42,7 +42,7 @@ if (!defined('STATUSNET')) {
  * @package  StatusNet
  * @author   Evan Prodromou <evan@status.net>
  * @author   Craig Andrews <candrews@integralblue.com>
- * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org
+ * @copyright 2009-2011 Free Software Foundation, Inc http://www.fsf.org
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPLv3
  * @link     http://status.net/
  */
@@ -149,7 +149,7 @@ class VersionAction extends Action
         // TRANS: Content part of StatusNet version page.
         // TRANS: %1$s is the engine name (StatusNet) and %2$s is the StatusNet version.
         $this->raw(sprintf(_('This site is powered by %1$s version %2$s, '.
-                             'Copyright 2008-2010 StatusNet, Inc. '.
+                             'Copyright 2008-2011 StatusNet, Inc. '.
                              'and contributors.'),
                            XMLStringer::estring('a', array('href' => 'http://status.net/'),
                                                 // TRANS: Engine name.
@@ -160,6 +160,7 @@ class VersionAction extends Action
         // TRANS: Header for StatusNet contributors section on the version page.
         $this->element('h2', null, _('Contributors'));
 
+        sort($this->contributors);
         $this->element('p', null, implode(', ', $this->contributors));
 
         // TRANS: Header for StatusNet license section on the version page.
@@ -170,14 +171,14 @@ class VersionAction extends Action
                        _('StatusNet is free software: you can redistribute it and/or modify '.
                          'it under the terms of the GNU Affero General Public License as published by '.
                          'the Free Software Foundation, either version 3 of the License, or '.
-                         '(at your option) any later version. '));
+                         '(at your option) any later version.'));
 
         $this->element('p', null,
                        // TRANS: Content part of StatusNet version page.
                        _('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. '));
+                         'GNU Affero General Public License for more details.'));
 
         $this->elementStart('p');
         // TRANS: Content part of StatusNet version page.
@@ -277,6 +278,7 @@ class VersionAction extends Action
                               'mEDI',
                               'Brett Taylor',
                               'Brigitte Schuster',
-                              'Brion Vibber',
-                              'Siebrand Mazeland');
+                              'Brion Vibber (StatusNet)',
+                              'Siebrand Mazeland',
+                              'Samantha Doherty (StatusNet)');
 }
diff --git a/classes/Avatar.php b/classes/Avatar.php
index 0b5141ba53..d871d360b6 100644
--- a/classes/Avatar.php
+++ b/classes/Avatar.php
@@ -4,7 +4,7 @@
  */
 require_once INSTALLDIR.'/classes/Memcached_DataObject.php';
 
-class Avatar extends Memcached_DataObject
+class Avatar extends Managed_DataObject
 {
     ###START_AUTOCODE
     /* the code below is auto generated do not remove the above tag */
@@ -27,6 +27,37 @@ class Avatar extends Memcached_DataObject
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
 
+	static function pivotGet($keyCol, $keyVals, $otherCols)
+	{
+	    return Memcached_DataObject::pivotGet('Avatar', $keyCol, $keyVals, $otherCols);
+	}
+	
+    public static function schemaDef()
+    {
+        return array(
+            'fields' => array(
+                'profile_id' => array('type' => 'int', 'not null' => true, 'description' => 'foreign key to profile table'),
+                'original' => array('type' => 'int', 'size' => 'tiny', 'default' => 0, 'description' => 'uploaded by user or generated?'),
+                'width' => array('type' => 'int', 'not null' => true, 'description' => 'image width'),
+                'height' => array('type' => 'int', 'not null' => true, 'description' => 'image height'),
+                'mediatype' => array('type' => 'varchar', 'length' => 32, 'not null' => true, 'description' => 'file type'),
+                'filename' => array('type' => 'varchar', 'length' => 255, 'description' => 'local filename, if local'),
+                'url' => array('type' => 'varchar', 'length' => 255, 'description' => 'avatar location'),
+                'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
+                'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
+            ),
+            'primary key' => array('profile_id', 'width', 'height'),
+            'unique keys' => array(
+                'avatar_url_key' => array('url'),
+            ),
+            'foreign keys' => array(
+                'avatar_profile_id_fkey' => array('profile', array('profile_id' => 'id')),
+            ),
+            'indexes' => array(
+                'avatar_profile_id_idx' => array('profile_id'),
+            ),
+        );
+    }
     // We clean up the file, too
 
     function delete()
diff --git a/classes/Config.php b/classes/Config.php
index e14730438e..bd191486cb 100644
--- a/classes/Config.php
+++ b/classes/Config.php
@@ -27,7 +27,7 @@ if (!defined('STATUSNET')) {
 
 require_once INSTALLDIR.'/classes/Memcached_DataObject.php';
 
-class Config extends Memcached_DataObject
+class Config extends Managed_DataObject
 {
     ###START_AUTOCODE
     /* the code below is auto generated do not remove the above tag */
@@ -43,13 +43,29 @@ class Config extends Memcached_DataObject
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
 
+    public static function schemaDef()
+    {
+        return array(
+            'fields' => array(
+                'section' => array('type' => 'varchar', 'length' => 32, 'not null' => true, 'default' => '', 'description' => 'configuration section'),
+                'setting' => array('type' => 'varchar', 'length' => 32, 'not null' => true, 'default' => '', 'description' => 'configuration setting'),
+                'value' => array('type' => 'varchar', 'length' => 255, 'description' => 'configuration value'),
+            ),
+            'primary key' => array('section', 'setting'),
+        );
+    }
+
     const settingsKey = 'config:settings';
 
     static function loadSettings()
     {
-        $settings = self::_getSettings();
-        if (!empty($settings)) {
-            self::_applySettings($settings);
+        try {
+            $settings = self::_getSettings();
+            if (!empty($settings)) {
+                self::_applySettings($settings);
+            }
+        } catch (Exception $e) {
+            return;
         }
     }
 
diff --git a/classes/Confirm_address.php b/classes/Confirm_address.php
index 4b9bec64c6..056df836fc 100644
--- a/classes/Confirm_address.php
+++ b/classes/Confirm_address.php
@@ -4,7 +4,7 @@
  */
 require_once INSTALLDIR.'/classes/Memcached_DataObject.php';
 
-class Confirm_address extends Memcached_DataObject 
+class Confirm_address extends Managed_DataObject 
 {
     ###START_AUTOCODE
     /* the code below is auto generated do not remove the above tag */
@@ -26,8 +26,25 @@ class Confirm_address extends Memcached_DataObject
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
 
-    function sequenceKey()
-    { return array(false, false); }
+    public static function schemaDef()
+    {
+        return array(
+            'fields' => array(
+                'code' => array('type' => 'varchar', 'length' => 32, 'not null' => true, 'description' => 'good random code'),
+                'user_id' => array('type' => 'int', 'not null' => true, 'description' => 'user who requested confirmation'),
+                'address' => array('type' => 'varchar', 'length' => 255, 'not null' => true, 'description' => 'address (email, xmpp, SMS, etc.)'),
+                'address_extra' => array('type' => 'varchar', 'length' => 255, 'not null' => true, 'description' => 'carrier ID, for SMS'),
+                'address_type' => array('type' => 'varchar', 'length' => 8, 'not null' => true, 'description' => 'address type ("email", "xmpp", "sms")'),
+                'claimed' => array('type' => 'datetime', 'description' => 'date this was claimed for queueing'),
+                'sent' => array('type' => 'datetime', 'description' => 'date this was sent for queueing'),
+                'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
+            ),
+            'primary key' => array('code'),
+            'foreign keys' => array(
+                'confirm_address_user_id_fkey' => array('user', array('user_id' => 'id')),
+            ),
+        );
+    }
 
     static function getAddress($address, $addressType)
     {
diff --git a/classes/Consumer.php b/classes/Consumer.php
index c1090b85a3..1d32d853bd 100644
--- a/classes/Consumer.php
+++ b/classes/Consumer.php
@@ -4,7 +4,7 @@
  */
 require_once INSTALLDIR.'/classes/Memcached_DataObject.php';
 
-class Consumer extends Memcached_DataObject
+class Consumer extends Managed_DataObject
 {
     ###START_AUTOCODE
     /* the code below is auto generated do not remove the above tag */
@@ -23,6 +23,22 @@ class Consumer extends Memcached_DataObject
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
 
+    public static function schemaDef()
+    {
+        return array(
+            'description' => 'OAuth consumer record',
+            'fields' => array(
+                'consumer_key' => array('type' => 'varchar', 'length' => 255, 'not null' => true, 'description' => 'unique identifier, root URL'),
+                'consumer_secret' => array('type' => 'varchar', 'length' => 255, 'not null' => true, 'description' => 'secret value'),
+                'seed' => array('type' => 'char', 'length' => 32, 'not null' => true, 'description' => 'seed for new tokens by this consumer'),
+
+                'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
+                'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
+            ),
+            'primary key' => array('consumer_key'),
+        );
+    }
+
     static function generateNew()
     {
         $cons = new Consumer();
diff --git a/classes/Conversation.php b/classes/Conversation.php
index e029c20ba0..4bad474c73 100755
--- a/classes/Conversation.php
+++ b/classes/Conversation.php
@@ -29,7 +29,7 @@
 
 require_once INSTALLDIR . '/classes/Memcached_DataObject.php';
 
-class Conversation extends Memcached_DataObject
+class Conversation extends Managed_DataObject
 {
     ###START_AUTOCODE
     /* the code below is auto generated do not remove the above tag */
@@ -46,6 +46,22 @@ class Conversation extends Memcached_DataObject
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
 
+    public static function schemaDef()
+    {
+        return array(
+            'fields' => array(
+                'id' => array('type' => 'serial', 'not null' => true, 'description' => 'unique identifier'),
+                'uri' => array('type' => 'varchar', 'length' => 225, 'description' => 'URI of the conversation'),
+                'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
+                'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
+            ),
+            'primary key' => array('id'),
+            'unique keys' => array(
+                'conversation_uri_key' => array('uri'),
+            ),
+        );
+    }
+
     /**
      * Factory method for creating a new conversation
      *
diff --git a/classes/Deleted_notice.php b/classes/Deleted_notice.php
index 64dc85da65..d3f9c0bf7c 100644
--- a/classes/Deleted_notice.php
+++ b/classes/Deleted_notice.php
@@ -26,7 +26,7 @@ if (!defined('STATUSNET')) {
  */
 require_once INSTALLDIR.'/classes/Memcached_DataObject.php';
 
-class Deleted_notice extends Memcached_DataObject
+class Deleted_notice extends Managed_DataObject
 {
     ###START_AUTOCODE
     /* the code below is auto generated do not remove the above tag */
@@ -43,4 +43,24 @@ class Deleted_notice extends Memcached_DataObject
 
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
+
+    public static function schemaDef()
+    {
+        return array(
+            'fields' => array(
+                'id' => array('type' => 'int', 'not null' => true, 'description' => 'identity of notice'),
+                'profile_id' => array('type' => 'int', 'not null' => true, 'description' => 'author of the notice'),
+                'uri' => array('type' => 'varchar', 'length' => 255, 'description' => 'universally unique identifier, usually a tag URI'),
+                'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date the notice record was created'),
+                'deleted' => array('type' => 'datetime', 'not null' => true, 'description' => 'date the notice record was created'),
+            ),
+            'primary key' => array('id'),
+            'unique keys' => array(
+                'deleted_notice_uri_key' => array('uri'),
+            ),
+            'indexes' => array(
+                'deleted_notice_profile_id_idx' => array('profile_id'),
+            ),
+        );
+    }
 }
diff --git a/classes/Design.php b/classes/Design.php
deleted file mode 100644
index f4834c714e..0000000000
--- a/classes/Design.php
+++ /dev/null
@@ -1,243 +0,0 @@
-<?php
-/*
- * StatusNet - the distributed open-source microblogging tool
- * Copyright (C) 2009, StatusNet, Inc.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.     See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-if (!defined('STATUSNET') && !defined('LACONICA')) {
-    exit(1);
-}
-
-define('BACKGROUND_ON', 1);
-define('BACKGROUND_OFF', 2);
-define('BACKGROUND_TILE', 4);
-
-/**
- * Table Definition for design
- */
-
-require_once INSTALLDIR . '/classes/Memcached_DataObject.php';
-require_once INSTALLDIR . '/lib/webcolor.php';
-
-class Design extends Memcached_DataObject
-{
-    ###START_AUTOCODE
-    /* the code below is auto generated do not remove the above tag */
-
-    public $__table = 'design';                          // table name
-    public $id;                              // int(4)  primary_key not_null
-    public $backgroundcolor;                 // int(4)
-    public $contentcolor;                    // int(4)
-    public $sidebarcolor;                    // int(4)
-    public $textcolor;                       // int(4)
-    public $linkcolor;                       // int(4)
-    public $backgroundimage;                 // varchar(255)
-    public $disposition;                     // tinyint(1)   default_1
-
-    /* Static get */
-    function staticGet($k,$v=NULL) { return Memcached_DataObject::staticGet('Design',$k,$v); }
-
-    /* the code above is auto generated do not remove the tag below */
-    ###END_AUTOCODE
-
-    function showCSS($out)
-    {
-        $css = '';
-
-        $bgcolor = Design::toWebColor($this->backgroundcolor);
-
-        if (!empty($bgcolor)) {
-            $css .= 'body { background-color: #' . $bgcolor->hexValue() . ' }' . "\n";
-        }
-
-        $ccolor  = Design::toWebColor($this->contentcolor);
-
-        if (!empty($ccolor)) {
-            $css .= '#content, #site_nav_local_views .current a { background-color: #';
-            $css .= $ccolor->hexValue() . '} '."\n";
-        }
-
-        $sbcolor = Design::toWebColor($this->sidebarcolor);
-
-        if (!empty($sbcolor)) {
-            $css .= '#aside_primary { background-color: #'. $sbcolor->hexValue() . ' }' . "\n";
-        }
-
-        $tcolor  = Design::toWebColor($this->textcolor);
-
-        if (!empty($tcolor)) {
-            $css .= 'html body { color: #'. $tcolor->hexValue() . ' }'. "\n";
-        }
-
-        $lcolor  = Design::toWebColor($this->linkcolor);
-
-        if (!empty($lcolor)) {
-            $css .= 'a { color: #' . $lcolor->hexValue() . ' }' . "\n";
-        }
-
-        if (!empty($this->backgroundimage) &&
-            $this->disposition & BACKGROUND_ON) {
-
-           $repeat = ($this->disposition & BACKGROUND_TILE) ?
-               'background-repeat:repeat;' :
-               'background-repeat:no-repeat;';
-
-            $css .= 'body { background-image:url(' .
-                Design::url($this->backgroundimage) .
-                '); ' . $repeat . ' background-attachment:fixed; }' . "\n";
-        }
-
-        if (0 != mb_strlen($css)) {
-            $out->style($css);
-        }
-    }
-
-    static function toWebColor($color)
-    {
-        if ($color === null || $color === '') {
-            return null;
-        }
-
-        try {
-            return new WebColor($color);
-        } catch (WebColorException $e) {
-            // This shouldn't happen
-            common_log(LOG_ERR, "Unable to create web color for $color",
-                __FILE__);
-            return null;
-        }
-    }
-
-    static function filename($id, $extension, $extra=null)
-    {
-        return $id . (($extra) ? ('-' . $extra) : '') . $extension;
-    }
-
-    static function path($filename)
-    {
-        $dir = common_config('background', 'dir');
-
-        if ($dir[strlen($dir)-1] != '/') {
-            $dir .= '/';
-        }
-
-        return $dir . $filename;
-    }
-
-    static function url($filename)
-    {
-        if (StatusNet::isHTTPS()) {
-
-            $sslserver = common_config('background', 'sslserver');
-
-            if (empty($sslserver)) {
-                // XXX: this assumes that background dir == site dir + /background/
-                // not true if there's another server
-                if (is_string(common_config('site', 'sslserver')) &&
-                    mb_strlen(common_config('site', 'sslserver')) > 0) {
-                    $server = common_config('site', 'sslserver');
-                } else if (common_config('site', 'server')) {
-                    $server = common_config('site', 'server');
-                }
-                $path   = common_config('site', 'path') . '/background/';
-            } else {
-                $server = $sslserver;
-                $path   = common_config('background', 'sslpath');
-                if (empty($path)) {
-                    $path = common_config('background', 'path');
-                }
-            }
-
-            $protocol = 'https';
-
-        } else {
-
-            $path = common_config('background', 'path');
-
-            $server = common_config('background', 'server');
-
-            if (empty($server)) {
-                $server = common_config('site', 'server');
-            }
-
-            $protocol = 'http';
-        }
-
-        if ($path[strlen($path)-1] != '/') {
-            $path .= '/';
-        }
-
-        if ($path[0] != '/') {
-            $path = '/'.$path;
-        }
-
-        return $protocol.'://'.$server.$path.$filename;
-    }
-
-    function setDisposition($on, $off, $tile)
-    {
-        if ($on) {
-            $this->disposition |= BACKGROUND_ON;
-        } else {
-            $this->disposition &= ~BACKGROUND_ON;
-        }
-
-        if ($off) {
-            $this->disposition |= BACKGROUND_OFF;
-        } else {
-            $this->disposition &= ~BACKGROUND_OFF;
-        }
-
-        if ($tile) {
-            $this->disposition |= BACKGROUND_TILE;
-        } else {
-            $this->disposition &= ~BACKGROUND_TILE;
-        }
-    }
-
-    /**
-     * Return a design object based on the configured site design.
-     *
-     * @return Design a singleton design object for the site.
-     */
-
-    static function siteDesign()
-    {
-        static $siteDesign = null;
-
-        if (empty($siteDesign)) {
-
-            $siteDesign = new Design();
-
-            $attrs = array('backgroundcolor',
-                           'contentcolor',
-                           'sidebarcolor',
-                           'textcolor',
-                           'linkcolor',
-                           'backgroundimage',
-                           'disposition');
-
-            foreach ($attrs as $attr) {
-                $val = common_config('design', $attr);
-                if ($val !== false) {
-                    $siteDesign->$attr = $val;
-                }
-            }
-        }
-
-        return $siteDesign;
-    }
-}
diff --git a/classes/Fave.php b/classes/Fave.php
index e8fdbffc71..455e7b089c 100644
--- a/classes/Fave.php
+++ b/classes/Fave.php
@@ -4,7 +4,7 @@
  */
 require_once INSTALLDIR.'/classes/Memcached_DataObject.php';
 
-class Fave extends Memcached_DataObject
+class Fave extends Managed_DataObject
 {
     ###START_AUTOCODE
     /* the code below is auto generated do not remove the above tag */
@@ -12,6 +12,7 @@ class Fave extends Memcached_DataObject
     public $__table = 'fave';                            // table name
     public $notice_id;                       // int(4)  primary_key not_null
     public $user_id;                         // int(4)  primary_key not_null
+    public $uri;                             // varchar(255)
     public $modified;                        // timestamp()   not_null default_CURRENT_TIMESTAMP
 
     /* Static get */
@@ -21,6 +22,31 @@ class Fave extends Memcached_DataObject
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
 
+    public static function schemaDef()
+    {
+        return array(
+            'fields' => array(
+                'notice_id' => array('type' => 'int', 'not null' => true, 'description' => 'notice that is the favorite'),
+                'user_id' => array('type' => 'int', 'not null' => true, 'description' => 'user who likes this notice'),
+                'uri' => array('type' => 'varchar', 'length' => 255, 'description' => 'universally unique identifier, usually a tag URI'),
+                'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
+            ),
+            'primary key' => array('notice_id', 'user_id'),
+            'unique keys' => array(
+                'fave_uri_key' => array('uri'),
+            ),
+            'foreign keys' => array(
+                'fave_notice_id_fkey' => array('notice', array('notice_id' => 'id')),
+                'fave_user_id_fkey' => array('profile', array('user_id' => 'id')), // note: formerly referenced notice.id, but we can now record remote users' favorites
+            ),
+            'indexes' => array(
+                'fave_notice_id_idx' => array('notice_id'),
+                'fave_user_id_idx' => array('user_id', 'modified'),
+                'fave_modified_idx' => array('modified'),
+            ),
+        );
+    }
+
     /**
      * Save a favorite record.
      * @fixme post-author notification should be moved here
@@ -39,12 +65,16 @@ class Fave extends Memcached_DataObject
 
             $fave->user_id   = $profile->id;
             $fave->notice_id = $notice->id;
-
+            $fave->modified  = common_sql_now();
+            $fave->uri       = self::newURI($fave->user_id,
+                                            $fave->notice_id,
+                                            $fave->modified);
             if (!$fave->insert()) {
                 common_log_db_error($fave, 'INSERT', __FILE__);
                 return false;
             }
-            self::blow('fave:by_notice:%d', $fave->notice_id);
+            self::blow('fave:list-ids:notice_id:%d', $fave->notice_id);
+            self::blow('popular');
 
             Event::handle('EndFavorNotice', array($profile, $notice));
         }
@@ -62,7 +92,8 @@ class Fave extends Memcached_DataObject
         if (Event::handle('StartDisfavorNotice', array($profile, $notice, &$result))) {
 
             $result = parent::delete();
-            self::blow('fave:by_notice:%d', $this->notice_id);
+            self::blow('fave:list-ids:notice_id:%d', $this->notice_id);
+            self::blow('popular');
 
             if ($result) {
                 Event::handle('EndDisfavorNotice', array($profile, $notice));
@@ -93,19 +124,25 @@ class Fave extends Memcached_DataObject
 
     function asActivity()
     {
-        $notice  = Notice::staticGet('id', $this->notice_id);
+        $notice = Notice::staticGet('id', $this->notice_id);
+
+        if (!$notice) {
+            throw new Exception("Fave for non-existent notice: " . $this->notice_id);
+        }
+
         $profile = Profile::staticGet('id', $this->user_id);
 
+        if (!$profile) {
+            throw new Exception("Fave by non-existent profile: " . $this->user_id);
+        }
+
         $act = new Activity();
 
         $act->verb = ActivityVerb::FAVORITE;
 
         // FIXME: rationalize this with URL below
 
-        $act->id   = TagURI::mint('favor:%d:%d:%s',
-                                  $profile->id,
-                                  $notice->id,
-                                  common_date_iso8601($this->modified));
+        $act->id   = $this->getURI();
 
         $act->time    = strtotime($this->modified);
         // TRANS: Activity title when marking a notice as favorite.
@@ -157,30 +194,20 @@ class Fave extends Memcached_DataObject
         return $fav;
     }
 
-    /**
-     * Grab a list of profile who have favored this notice.
-     *
-     * @return ArrayWrapper masquerading as a Fave
-     */
-    static function byNotice($noticeId)
+    function getURI()
     {
-        $c = self::memcache();
-        $key = Cache::key('fave:by_notice:' . $noticeId);
-
-        $wrapper = $c->get($key);
-        if (!$wrapper) {
-            // @fixme caching & scalability!
-            $fave = new Fave();
-            $fave->notice_id = $noticeId;
-            $fave->find();
-
-            $list = array();
-            while ($fave->fetch()) {
-                $list[] = clone($fave);
-            }
-            $wrapper = new ArrayWrapper($list);
-            $c->set($key, $wrapper);
+        if (!empty($this->uri)) {
+            return $this->uri;
+        } else {
+            return self::newURI($this->user_id, $this->notice_id, $this->modified);
         }
-        return $wrapper;
+    }
+
+    static function newURI($profile_id, $notice_id, $modified)
+    {
+        return TagURI::mint('favor:%d:%d:%s',
+                            $profile_id,
+                            $notice_id,
+                            common_date_iso8601($modified));
     }
 }
diff --git a/classes/File.php b/classes/File.php
index 36ffff585c..f3940346b3 100644
--- a/classes/File.php
+++ b/classes/File.php
@@ -29,7 +29,7 @@ require_once INSTALLDIR.'/classes/File_to_post.php';
 /**
  * Table Definition for file
  */
-class File extends Memcached_DataObject
+class File extends Managed_DataObject
 {
     ###START_AUTOCODE
     /* the code below is auto generated do not remove the above tag */
@@ -51,25 +51,30 @@ class File extends Memcached_DataObject
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
 
-    function isProtected($url) {
-        return 'http://www.facebook.com/login.php' === $url;
+    public static function schemaDef()
+    {
+        return array(
+            'fields' => array(
+                'id' => array('type' => 'serial', 'not null' => true),
+                'url' => array('type' => 'varchar', 'length' => 255, 'description' => 'destination URL after following redirections'),
+                'mimetype' => array('type' => 'varchar', 'length' => 50, 'description' => 'mime type of resource'),
+                'size' => array('type' => 'int', 'description' => 'size of resource when available'),
+                'title' => array('type' => 'varchar', 'length' => 255, 'description' => 'title of resource when available'),
+                'date' => array('type' => 'int', 'description' => 'date of resource according to http query'),
+                'protected' => array('type' => 'int', 'description' => 'true when URL is private (needs login)'),
+                'filename' => array('type' => 'varchar', 'length' => 255, 'description' => 'if a local file, name of the file'),
+
+                'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
+            ),
+            'primary key' => array('id'),
+            'unique keys' => array(
+                'file_url_key' => array('url'),
+            ),
+        );
     }
 
-    /**
-     * Get the attachments for a particlar notice.
-     *
-     * @param int $post_id
-     * @return array of File objects
-     */
-    static function getAttachments($post_id) {
-        $file = new File();
-        $query = "select file.* from file join file_to_post on (file_id = file.id) where post_id = " . $file->escape($post_id);
-        $file = Memcached_DataObject::cachedQuery('File', $query);
-        $att = array();
-        while ($file->fetch()) {
-            $att[] = clone($file);
-        }
-        return $att;
+    function isProtected($url) {
+        return 'http://www.facebook.com/login.php' === $url;
     }
 
     /**
@@ -80,14 +85,22 @@ class File extends Memcached_DataObject
      * @return File
      */
     function saveNew(array $redir_data, $given_url) {
-        $x = new File;
-        $x->url = $given_url;
-        if (!empty($redir_data['protected'])) $x->protected = $redir_data['protected'];
-        if (!empty($redir_data['title'])) $x->title = $redir_data['title'];
-        if (!empty($redir_data['type'])) $x->mimetype = $redir_data['type'];
-        if (!empty($redir_data['size'])) $x->size = intval($redir_data['size']);
-        if (isset($redir_data['time']) && $redir_data['time'] > 0) $x->date = intval($redir_data['time']);
-        $file_id = $x->insert();
+
+        // I don't know why we have to keep doing this but I'm adding this last check to avoid
+        // uniqueness bugs.
+
+        $x = File::staticGet('url', $given_url);
+        
+        if (empty($x)) {
+            $x = new File;
+            $x->url = $given_url;
+            if (!empty($redir_data['protected'])) $x->protected = $redir_data['protected'];
+            if (!empty($redir_data['title'])) $x->title = $redir_data['title'];
+            if (!empty($redir_data['type'])) $x->mimetype = $redir_data['type'];
+            if (!empty($redir_data['size'])) $x->size = intval($redir_data['size']);
+            if (isset($redir_data['time']) && $redir_data['time'] > 0) $x->date = intval($redir_data['time']);
+            $file_id = $x->insert();
+        }
 
         $x->saveOembed($redir_data, $given_url);
         return $x;
@@ -187,7 +200,7 @@ class File extends Memcached_DataObject
         }
 
         if (empty($x)) {
-            $x = File::staticGet($file_id);
+            $x = File::staticGet('id', $file_id);
             if (empty($x)) {
                 // @todo FIXME: This could possibly be a clearer message :)
                 // TRANS: Server exception thrown when... Robin thinks something is impossible!
@@ -204,13 +217,20 @@ class File extends Memcached_DataObject
     function isRespectsQuota($user,$fileSize) {
 
         if ($fileSize > common_config('attachments', 'file_quota')) {
+            // TRANS: Message used to be inserted as %2$s in  the text "No file may
+            // TRANS: be larger than %1$d byte and the file you sent was %2$s.".
+            // TRANS: %1$d is the number of bytes of an uploaded file.
+            $fileSizeText = sprintf(_m('%1$d byte','%1$d bytes',$fileSize),$fileSize);
+
+            $fileQuota = common_config('attachments', 'file_quota');
             // TRANS: Message given if an upload is larger than the configured maximum.
-            // TRANS: %1$d is the byte limit for uploads, %2$d is the byte count for the uploaded file.
-            // TRANS: %1$s is used for plural.
-            return sprintf(_m('No file may be larger than %1$d byte and the file you sent was %2$d bytes. Try to upload a smaller version.',
-                              'No file may be larger than %1$d bytes and the file you sent was %2$d bytes. Try to upload a smaller version.',
-                              common_config('attachments', 'file_quota')),
-                           common_config('attachments', 'file_quota'), $fileSize);
+            // TRANS: %1$d (used for plural) is the byte limit for uploads,
+            // TRANS: %2$s is the proper form of "n bytes". This is the only ways to have
+            // TRANS: gettext support multiple plurals in the same message, unfortunately...
+            return sprintf(_m('No file may be larger than %1$d byte and the file you sent was %2$s. Try to upload a smaller version.',
+                              'No file may be larger than %1$d bytes and the file you sent was %2$s. Try to upload a smaller version.',
+                              $fileQuota),
+                           $fileQuota, $fileSizeText);
         }
 
         $query = "select sum(size) as total from file join file_to_post on file_to_post.file_id = file.id join notice on file_to_post.post_id = notice.id where profile_id = {$user->id} and file.url like '%/notice/%/file'";
diff --git a/classes/File_oembed.php b/classes/File_oembed.php
index b7bf3a5dae..ae46e61bd4 100644
--- a/classes/File_oembed.php
+++ b/classes/File_oembed.php
@@ -26,7 +26,7 @@ require_once INSTALLDIR.'/classes/File_redirection.php';
  * Table Definition for file_oembed
  */
 
-class File_oembed extends Memcached_DataObject
+class File_oembed extends Managed_DataObject
 {
     ###START_AUTOCODE
     /* the code below is auto generated do not remove the above tag */
@@ -53,9 +53,30 @@ class File_oembed extends Memcached_DataObject
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
 
-    function sequenceKey()
+    public static function schemaDef()
     {
-        return array(false, false, false);
+        return array(
+            'fields' => array(
+                'file_id' => array('type' => 'int', 'not null' => true, 'description' => 'oEmbed for that URL/file'),
+                'version' => array('type' => 'varchar', 'length' => 20, 'description' => 'oEmbed spec. version'),
+                'type' => array('type' => 'varchar', 'length' => 20, 'description' => 'oEmbed type: photo, video, link, rich'),
+                'mimetype' => array('type' => 'varchar', 'length' => 50, 'description' => 'mime type of resource'),
+                'provider' => array('type' => 'varchar', 'length' => 50, 'description' => 'name of this oEmbed provider'),
+                'provider_url' => array('type' => 'varchar', 'length' => 255, 'description' => 'URL of this oEmbed provider'),
+                'width' => array('type' => 'int', 'description' => 'width of oEmbed resource when available'),
+                'height' => array('type' => 'int', 'description' => 'height of oEmbed resource when available'),
+                'html' => array('type' => 'text', 'description' => 'html representation of this oEmbed resource when applicable'),
+                'title' => array('type' => 'varchar', 'length' => 255, 'description' => 'title of oEmbed resource when available'),
+                'author_name' => array('type' => 'varchar', 'length' => 50, 'description' => 'author name for this oEmbed resource'),
+                'author_url' => array('type' => 'varchar', 'length' => 255, 'description' => 'author URL for this oEmbed resource'),
+                'url' => array('type' => 'varchar', 'length' => 255, 'description' => 'URL for this oEmbed resource when applicable (photo, link)'),
+                'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
+            ),
+            'primary key' => array('file_id'),
+            'foreign keys' => array(
+                'file_oembed_file_id_fkey' => array('file', array('file_id' => 'id')),
+            ),
+        );
     }
 
     function _getOembed($url) {
diff --git a/classes/File_redirection.php b/classes/File_redirection.php
index 74e89db5f2..130d9e7d74 100644
--- a/classes/File_redirection.php
+++ b/classes/File_redirection.php
@@ -27,7 +27,7 @@ require_once INSTALLDIR.'/classes/File_oembed.php';
  * Table Definition for file_redirection
  */
 
-class File_redirection extends Memcached_DataObject
+class File_redirection extends Managed_DataObject
 {
     ###START_AUTOCODE
     /* the code below is auto generated do not remove the above tag */
@@ -45,6 +45,23 @@ class File_redirection extends Memcached_DataObject
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
 
+    public static function schemaDef()
+    {
+        return array(
+            'fields' => array(
+                'url' => array('type' => 'varchar', 'length' => 255, 'not null' => true, 'description' => 'short URL (or any other kind of redirect) for file (id)'),
+                'file_id' => array('type' => 'int', 'description' => 'short URL for what URL/file'),
+                'redirections' => array('type' => 'int', 'description' => 'redirect count'),
+                'httpcode' => array('type' => 'int', 'description' => 'HTTP status code (20x, 30x, etc.)'),
+                'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
+            ),
+            'primary key' => array('url'),
+            'foreign keys' => array(
+                'file_redirection_file_id_fkey' => array('file' => array('file_id' => 'id')),
+            ),
+        );
+    }
+
     static function _commonHttp($url, $redirs) {
         $request = new HTTPClient($url);
         $request->setConfig(array(
diff --git a/classes/File_thumbnail.php b/classes/File_thumbnail.php
index 17bac7f08c..6b3c0b0255 100644
--- a/classes/File_thumbnail.php
+++ b/classes/File_thumbnail.php
@@ -25,7 +25,7 @@ require_once INSTALLDIR.'/classes/Memcached_DataObject.php';
  * Table Definition for file_thumbnail
  */
 
-class File_thumbnail extends Memcached_DataObject
+class File_thumbnail extends Managed_DataObject
 {
     ###START_AUTOCODE
     /* the code below is auto generated do not remove the above tag */
@@ -43,9 +43,21 @@ class File_thumbnail extends Memcached_DataObject
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
 
-    function sequenceKey()
+    public static function schemaDef()
     {
-        return array(false, false, false);
+        return array(
+            'fields' => array(
+                'file_id' => array('type' => 'int', 'not null' => true, 'description' => 'thumbnail for what URL/file'),
+                'url' => array('type' => 'varchar', 'length' => 255, 'description' => 'URL of thumbnail'),
+                'width' => array('type' => 'int', 'description' => 'width of thumbnail'),
+                'height' => array('type' => 'int', 'description' => 'height of thumbnail'),
+                'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
+            ),
+            'primary key' => array('file_id'),
+            'foreign keys' => array(
+                'file_thumbnail_file_id_fkey' => array('file', array('file_id' => 'id')),
+            )
+        );
     }
 
     /**
diff --git a/classes/File_to_post.php b/classes/File_to_post.php
index bcb6771f4f..1a887a7c18 100644
--- a/classes/File_to_post.php
+++ b/classes/File_to_post.php
@@ -25,7 +25,7 @@ require_once INSTALLDIR.'/classes/Memcached_DataObject.php';
  * Table Definition for file_to_post
  */
 
-class File_to_post extends Memcached_DataObject
+class File_to_post extends Managed_DataObject
 {
     ###START_AUTOCODE
     /* the code below is auto generated do not remove the above tag */
@@ -41,6 +41,25 @@ class File_to_post extends Memcached_DataObject
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
 
+    public static function schemaDef()
+    {
+        return array(
+            'fields' => array(
+                'file_id' => array('type' => 'int', 'not null' => true, 'description' => 'id of URL/file'),
+                'post_id' => array('type' => 'int', 'not null' => true, 'description' => 'id of the notice it belongs to'),
+                'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
+            ),
+            'primary key' => array('file_id', 'post_id'),
+            'foreign keys' => array(
+                'file_to_post_file_id_fkey' => array('file', array('file_id' => 'id')),
+                'file_to_post_post_id_fkey' => array('notice', array('post_id' => 'id')),
+            ),
+            'indexes' => array(
+                'post_id_idx' => array('post_id'),
+            ),
+        );
+    }
+
     function processNew($file_id, $notice_id) {
         static $seen = array();
         if (empty($seen[$notice_id]) || !in_array($file_id, $seen[$notice_id])) {
diff --git a/classes/Foreign_link.php b/classes/Foreign_link.php
index 57a10dcedb..e3f0cf1ee6 100644
--- a/classes/Foreign_link.php
+++ b/classes/Foreign_link.php
@@ -4,7 +4,7 @@
  */
 require_once INSTALLDIR.'/classes/Memcached_DataObject.php';
 
-class Foreign_link extends Memcached_DataObject
+class Foreign_link extends Managed_DataObject
 {
     ###START_AUTOCODE
     /* the code below is auto generated do not remove the above tag */
@@ -29,6 +29,34 @@ class Foreign_link extends Memcached_DataObject
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
 
+    public static function schemaDef()
+    {
+        return array(
+            'fields' => array(
+                'user_id' => array('type' => 'int', 'not null' => true, 'description' => 'link to user on this system, if exists'),
+                'foreign_id' => array('type' => 'int', 'size' => 'big', 'unsigned' => true, 'not null' => true, 'description' => 'link to user on foreign service, if exists'),
+                'service' => array('type' => 'int', 'not null' => true, 'description' => 'foreign key to service'),
+                'credentials' => array('type' => 'varchar', 'length' => 255, 'description' => 'authc credentials, typically a password'),
+                'noticesync' => array('type' => 'int', 'size' => 'tiny', 'not null' => true, 'default' => 1, 'description' => 'notice synchronization, bit 1 = sync outgoing, bit 2 = sync incoming, bit 3 = filter local replies'),
+                'friendsync' => array('type' => 'int', 'size' => 'tiny', 'not null' => true, 'default' => 2, 'description' => 'friend synchronization, bit 1 = sync outgoing, bit 2 = sync incoming'),
+                'profilesync' => array('type' => 'int', 'size' => 'tiny', 'not null' => true, 'default' => 1, 'description' => 'profile synchronization, bit 1 = sync outgoing, bit 2 = sync incoming'),
+                'last_noticesync' => array('type' => 'datetime', 'description' => 'last time notices were imported'),
+                'last_friendsync' => array('type' => 'datetime', 'description' => 'last time friends were imported'),
+                'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
+                'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
+            ),
+            'primary key' => array('user_id', 'foreign_id', 'service'),
+            'foreign keys' => array(
+                'foreign_link_user_id_fkey' => array('user', array('user_id' => 'id')),
+                'foreign_link_foreign_id_fkey' => array('foreign_user', array('foreign_id' => 'id', 'service' => 'service')),
+                'foreign_link_service_fkey' => array('foreign_service', array('service' => 'id')),
+            ),
+            'indexes' => array(
+                'foreign_user_user_id_idx' => array('user_id'),
+            ),
+        );
+    }
+
     static function getByUserID($user_id, $service)
     {
         if (empty($user_id) || empty($service)) {
diff --git a/classes/Foreign_service.php b/classes/Foreign_service.php
index dd74fd2ca6..8ba73521c1 100644
--- a/classes/Foreign_service.php
+++ b/classes/Foreign_service.php
@@ -4,7 +4,7 @@
  */
 require_once INSTALLDIR.'/classes/Memcached_DataObject.php';
 
-class Foreign_service extends Memcached_DataObject
+class Foreign_service extends Managed_DataObject
 {
     ###START_AUTOCODE
     /* the code below is auto generated do not remove the above tag */
@@ -22,4 +22,21 @@ class Foreign_service extends Memcached_DataObject
 
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
+
+    public static function schemaDef()
+    {
+        return array(
+            'fields' => array(
+                'id' => array('type' => 'int', 'not null' => true, 'description' => 'numeric key for service'),
+                'name' => array('type' => 'varchar', 'length' => 32, 'not null' => true, 'description' => 'name of the service'),
+                'description' => array('type' => 'varchar', 'length' => 255, 'description' => 'description'),
+                'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
+                'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
+            ),
+            'primary key' => array('id'),
+            'unique keys' => array(
+                'foreign_service_name_key' => array('name'),
+            ),
+        );
+    }
 }
diff --git a/classes/Foreign_subscription.php b/classes/Foreign_subscription.php
index ec2631238e..99bf3868b5 100644
--- a/classes/Foreign_subscription.php
+++ b/classes/Foreign_subscription.php
@@ -4,7 +4,7 @@
  */
 require_once INSTALLDIR.'/classes/Memcached_DataObject.php';
 
-class Foreign_subscription extends Memcached_DataObject
+class Foreign_subscription extends Managed_DataObject
 {
     ###START_AUTOCODE
     /* the code below is auto generated do not remove the above tag */
@@ -21,4 +21,27 @@ class Foreign_subscription extends Memcached_DataObject
 
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
+
+    public static function schemaDef()
+    {
+        return array(
+
+            'fields' => array(
+                'service' => array('type' => 'int', 'not null' => true, 'description' => 'service where relationship happens'),
+                'subscriber' => array('type' => 'int', 'size' => 'big', 'not null' => true, 'description' => 'subscriber on foreign service'),
+                'subscribed' => array('type' => 'int', 'size' => 'big', 'not null' => true, 'description' => 'subscribed user'),
+                'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
+            ),
+            'primary key' => array('service', 'subscriber', 'subscribed'),
+            'foreign keys' => array(
+                'foreign_subscription_service_fkey' => array('foreign_service', array('service' => 'id')),
+                'foreign_subscription_subscriber_fkey' => array('foreign_user', array('subscriber' => 'id', 'service' => 'service')),
+                'foreign_subscription_subscribed_fkey' => array('foreign_user', array('subscribed' => 'id', 'service' => 'service')),
+            ),
+            'indexes' => array(
+                'foreign_subscription_subscriber_idx' => array('service', 'subscriber'),
+                'foreign_subscription_subscribed_idx' => array('service', 'subscribed'),
+            ),
+        );
+    }
 }
diff --git a/classes/Foreign_user.php b/classes/Foreign_user.php
index 82ca749a59..4a41e07f4d 100644
--- a/classes/Foreign_user.php
+++ b/classes/Foreign_user.php
@@ -4,7 +4,7 @@
  */
 require_once INSTALLDIR.'/classes/Memcached_DataObject.php';
 
-class Foreign_user extends Memcached_DataObject
+class Foreign_user extends Managed_DataObject
 {
     ###START_AUTOCODE
     /* the code below is auto generated do not remove the above tag */
@@ -23,20 +23,39 @@ class Foreign_user extends Memcached_DataObject
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
 
-    // XXX:  This only returns a 1->1 single obj mapping.  Change?  Or make
-    // a getForeignUsers() that returns more than one? --Zach
+    public static function schemaDef()
+    {
+        return array(
+            'fields' => array(
+                'id' => array('type' => 'int', 'size' => 'big', 'not null' => true, 'description' => 'unique numeric key on foreign service'),
+                'service' => array('type' => 'int', 'not null' => true, 'description' => 'foreign key to service'),
+                'uri' => array('type' => 'varchar', 'length' => 255, 'not null' => true, 'description' => 'identifying URI'),
+                'nickname' => array('type' => 'varchar', 'length' => 255, 'description' => 'nickname on foreign service'),
+                'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
+                'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
+            ),
+            'primary key' => array('id', 'service'),
+            'foreign keys' => array(
+                'foreign_user_service_fkey' => array('foreign_service', array('service' => 'id')),
+            ),
+            'unique keys' => array(
+                'foreign_user_uri_key' => array('uri'),
+            ),
+        );
+    }
+
     static function getForeignUser($id, $service) {
+
         $fuser = new Foreign_user();
-        $fuser->whereAdd("service = $service");
-        $fuser->whereAdd("id = $id");
+
+        $fuser->id      = $id;
+        $fuser->service = $service;
+
         $fuser->limit(1);
 
-        if ($fuser->find()) {
-            $fuser->fetch();
-            return $fuser;
-        }
+        $result = $fuser->find(true);
 
-        return null;
+        return empty($result) ? null : $fuser;
     }
 
     static function getByNickname($nickname, $service)
diff --git a/classes/Group_alias.php b/classes/Group_alias.php
index c5a1895a11..fcf5405547 100644
--- a/classes/Group_alias.php
+++ b/classes/Group_alias.php
@@ -23,7 +23,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
 require_once INSTALLDIR.'/classes/Memcached_DataObject.php';
 
-class Group_alias extends Memcached_DataObject
+class Group_alias extends Managed_DataObject
 {
     ###START_AUTOCODE
     /* the code below is auto generated do not remove the above tag */
@@ -38,4 +38,22 @@ class Group_alias extends Memcached_DataObject
 
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
+
+    public static function schemaDef()
+    {
+        return array(
+            'fields' => array(
+                'alias' => array('type' => 'varchar', 'length' => 64, 'not null' => true, 'description' => 'additional nickname for the group'),
+                'group_id' => array('type' => 'int', 'not null' => true, 'description' => 'group profile is blocked from'),
+                'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date alias was created'),
+            ),
+            'primary key' => array('alias'),
+            'foreign keys' => array(
+                'group_alias_group_id_fkey' => array('user_group', array('group_id' => 'id')),
+            ),
+            'indexes' => array(
+                'group_alias_group_id_idx' => array('group_id'),
+            ),
+        );
+    }
 }
diff --git a/classes/Group_block.php b/classes/Group_block.php
index 68feaef4de..dc439ba774 100644
--- a/classes/Group_block.php
+++ b/classes/Group_block.php
@@ -23,7 +23,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
 require_once INSTALLDIR.'/classes/Memcached_DataObject.php';
 
-class Group_block extends Memcached_DataObject
+class Group_block extends Managed_DataObject
 {
     ###START_AUTOCODE
     /* the code below is auto generated do not remove the above tag */
@@ -40,6 +40,24 @@ class Group_block extends Memcached_DataObject
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
 
+    public static function schemaDef()
+    {
+        return array(
+            'fields' => array(
+                'group_id' => array('type' => 'int', 'not null' => true, 'description' => 'group profile is blocked from'),
+                'blocked' => array('type' => 'int', 'not null' => true, 'description' => 'profile that is blocked'),
+                'blocker' => array('type' => 'int', 'not null' => true, 'description' => 'user making the block'),
+                'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date of blocking'),
+            ),
+            'primary key' => array('group_id', 'blocked'),
+            'foreign keys' => array(
+                'group_block_group_id_fkey' => array('user_group', array('group_id' => 'id')),
+                'group_block_blocked_fkey' => array('profile', array('blocked' => 'id')),
+                'group_block_blocker_fkey' => array('user', array('blocker' => 'id')),
+            ),
+        );
+    }
+
     function pkeyGet($kv)
     {
         return Memcached_DataObject::pkeyGet('Group_block', $kv);
diff --git a/classes/Group_inbox.php b/classes/Group_inbox.php
index 8f5c65e594..fe600cbaf8 100644
--- a/classes/Group_inbox.php
+++ b/classes/Group_inbox.php
@@ -3,7 +3,7 @@
 /**
  * Table Definition for group_inbox
  */
-class Group_inbox extends Memcached_DataObject
+class Group_inbox extends Managed_DataObject
 {
     ###START_AUTOCODE
     /* the code below is auto generated do not remove the above tag */
@@ -20,6 +20,28 @@ class Group_inbox extends Memcached_DataObject
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
 
+    public static function schemaDef()
+    {
+        return array(
+            'description' => 'Many-many table listing notices posted to a given group, or which groups a given notice was posted to.',
+            'fields' => array(
+                'group_id' => array('type' => 'int', 'not null' => true, 'description' => 'group receiving the message'),
+                'notice_id' => array('type' => 'int', 'not null' => true, 'description' => 'notice received'),
+                'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date the notice was created'),
+            ),
+            'primary key' => array('group_id', 'notice_id'),
+            'foreign keys' => array(
+                'group_inbox_group_id_fkey' => array('user_group', array('group_id' => 'id')),
+                'group_inbox_notice_id_fkey' => array('notice', array('notice_id' => 'id')),
+            ),
+            'indexes' => array(
+                'group_inbox_created_idx' => array('created'),
+                'group_inbox_notice_id_idx' => array('notice_id'),
+                'group_inbox_group_id_created_notice_id_idx' => array('group_id', 'created', 'notice_id'),
+            ),
+        );
+    }
+
     function pkeyGet($kv)
     {
         return Memcached_DataObject::pkeyGet('Group_inbox', $kv);
diff --git a/classes/Group_member.php b/classes/Group_member.php
index 5385e0f487..d51aa9ff9c 100644
--- a/classes/Group_member.php
+++ b/classes/Group_member.php
@@ -3,7 +3,7 @@
  * Table Definition for group_member
  */
 
-class Group_member extends Memcached_DataObject
+class Group_member extends Managed_DataObject
 {
     ###START_AUTOCODE
     /* the code below is auto generated do not remove the above tag */
@@ -12,6 +12,7 @@ class Group_member extends Memcached_DataObject
     public $group_id;                        // int(4)  primary_key not_null
     public $profile_id;                      // int(4)  primary_key not_null
     public $is_admin;                        // tinyint(1)
+    public $uri;                             // varchar(255)
     public $created;                         // datetime()   not_null
     public $modified;                        // timestamp()   not_null default_CURRENT_TIMESTAMP
 
@@ -21,6 +22,35 @@ class Group_member extends Memcached_DataObject
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
 
+    public static function schemaDef()
+    {
+        return array(
+            'fields' => array(
+                'group_id' => array('type' => 'int', 'not null' => true, 'description' => 'foreign key to user_group'),
+                'profile_id' => array('type' => 'int', 'not null' => true, 'description' => 'foreign key to profile table'),
+                'is_admin' => array('type' => 'int', 'size' => 'tiny', 'default' => 0, 'description' => 'is this user an admin?'),
+                'uri' => array('type' => 'varchar', 'length' => 255, 'description' => 'universal identifier'),
+                'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
+                'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
+            ),
+            'primary key' => array('group_id', 'profile_id'),
+            'unique keys' => array(
+                'group_member_uri_key' => array('uri'),
+            ),
+            'foreign keys' => array(
+                'group_member_group_id_fkey' => array('user_group', array('group_id' => 'id')),
+                'group_member_profile_id_fkey' => array('profile', array('profile_id' => 'id')),
+            ),
+            'indexes' => array(
+                // @fixme probably we want a (profile_id, created) index here?
+                'group_member_profile_id_idx' => array('profile_id'),
+                'group_member_created_idx' => array('created'),
+                'group_member_profile_id_created_idx' => array('profile_id', 'created'),
+                'group_member_group_id_created_idx' => array('group_id', 'created'),
+            ),
+        );
+    }
+
     function pkeyGet($kv)
     {
         return Memcached_DataObject::pkeyGet('Group_member', $kv);
@@ -43,6 +73,7 @@ class Group_member extends Memcached_DataObject
         $member->group_id   = $group_id;
         $member->profile_id = $profile_id;
         $member->created    = common_sql_now();
+        $member->uri        = self::newURI($profile_id, $group_id, $member->created);
 
         $result = $member->insert();
 
@@ -130,14 +161,20 @@ class Group_member extends Memcached_DataObject
     function asActivity()
     {
         $member = $this->getMember();
+
+        if (!$member) {
+            throw new Exception("No such member: " . $this->profile_id);
+        }
+
         $group  = $this->getGroup();
 
+        if (!$group) {
+            throw new Exception("No such group: " . $this->group_id);
+        }
+
         $act = new Activity();
 
-        $act->id = TagURI::mint('join:%d:%d:%s',
-                                $member->id,
-                                $group->id,
-                                common_date_iso8601($this->created));
+        $act->id = $this->getURI();
 
         $act->actor     = ActivityObject::fromProfile($member);
         $act->verb      = ActivityVerb::JOIN;
@@ -171,4 +208,21 @@ class Group_member extends Memcached_DataObject
     {
         mail_notify_group_join($this->getGroup(), $this->getMember());
     }
+
+    function getURI()
+    {
+        if (!empty($this->uri)) {
+            return $this->uri;
+        } else {
+            return self::newURI($this->profile_id, $this->group_id, $this->created);
+        }
+    }
+
+    static function newURI($profile_id, $group_id, $created)
+    {
+        return TagURI::mint('join:%d:%d:%s',
+                            $profile_id,
+                            $group_id,
+                            common_date_iso8601($created));
+    }
 }
diff --git a/classes/Inbox.php b/classes/Inbox.php
index 336bba048c..c618ff7aca 100644
--- a/classes/Inbox.php
+++ b/classes/Inbox.php
@@ -29,7 +29,7 @@
 
 require_once INSTALLDIR.'/classes/Memcached_DataObject.php';
 
-class Inbox extends Memcached_DataObject
+class Inbox extends Managed_DataObject
 {
     const BOXCAR = 128;
     const MAX_NOTICES = 1024;
@@ -47,9 +47,18 @@ class Inbox extends Memcached_DataObject
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
 
-    function sequenceKey()
+    public static function schemaDef()
     {
-        return array(false, false, false);
+        return array(
+            'fields' => array(
+                'user_id' => array('type' => 'int', 'not null' => true, 'description' => 'user receiving the notice'),
+                'notice_ids' => array('type' => 'blob', 'description' => 'packed list of notice ids'),
+            ),
+            'primary key' => array('user_id'),
+            'foreign keys' => array(
+                'inbox_user_id_fkey' => array('user', array('user_id' => 'id')),
+            ),
+        );
     }
 
     /**
diff --git a/classes/Invitation.php b/classes/Invitation.php
index 27ff400883..ae34a31023 100644
--- a/classes/Invitation.php
+++ b/classes/Invitation.php
@@ -4,7 +4,7 @@
  */
 require_once INSTALLDIR.'/classes/Memcached_DataObject.php';
 
-class Invitation extends Memcached_DataObject
+class Invitation extends Managed_DataObject
 {
     ###START_AUTOCODE
     /* the code below is auto generated do not remove the above tag */
@@ -30,4 +30,29 @@ class Invitation extends Memcached_DataObject
         $this->registered_user_id = $user->id;
         return $this->update($orig);
     }
+
+    public static function schemaDef()
+    {
+        return array(
+
+            'fields' => array(
+                'code' => array('type' => 'varchar', 'length' => 32, 'not null' => true, 'description' => 'random code for an invitation'),
+                'user_id' => array('type' => 'int', 'not null' => true, 'description' => 'who sent the invitation'),
+                'address' => array('type' => 'varchar', 'length' => 255, 'not null' => true, 'description' => 'invitation sent to'),
+                'address_type' => array('type' => 'varchar', 'length' => 8, 'not null' => true, 'description' => 'address type ("email", "xmpp", "sms")'),
+                'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
+                'registered_user_id' => array('type' => 'int', 'not null' => false, 'description' => 'if the invitation is converted, who the new user is'),
+            ),
+            'primary key' => array('code'),
+            'foreign keys' => array(
+                'invitation_user_id_fkey' => array('user', array('user_id' => 'id')),
+                'invitation_registered_user_id_fkey' => array('user', array('registered_user_id' => 'id')),
+            ),
+            'indexes' => array(
+                'invitation_address_idx' => array('address', 'address_type'),
+                'invitation_user_id_idx' => array('user_id'),
+                'invitation_registered_user_id_idx' => array('registered_user_id'),
+            ),
+        );
+    }
 }
diff --git a/classes/Local_group.php b/classes/Local_group.php
index ccd0125cf4..b895103d16 100644
--- a/classes/Local_group.php
+++ b/classes/Local_group.php
@@ -3,7 +3,7 @@
  * Table Definition for local_group
  */
 
-class Local_group extends Memcached_DataObject
+class Local_group extends Managed_DataObject
 {
     ###START_AUTOCODE
     /* the code below is auto generated do not remove the above tag */
@@ -20,15 +20,31 @@ class Local_group extends Memcached_DataObject
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
 
-    function sequenceKey()
+    public static function schemaDef()
     {
-        return array(false, false, false);
+        return array(
+            'description' => 'Record for a user group on the local site, with some additional info not in user_group',
+            'fields' => array(
+                'group_id' => array('type' => 'int', 'not null' => true, 'description' => 'group represented'),
+                'nickname' => array('type' => 'varchar', 'length' => 64, 'description' => 'group represented'),
+
+                'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
+                'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
+            ),
+            'primary key' => array('group_id'),
+            'foreign keys' => array(
+                'local_group_group_id_fkey' => array('user_group', array('group_id' => 'id')),
+            ),
+            'unique keys' => array(
+                'local_group_nickname_key' => array('nickname'),
+            ),
+        );
     }
 
     function setNickname($nickname)
     {
         $this->decache();
-        $qry = 'UPDATE local_group set nickname = "'.$nickname.'" where group_id = ' . $this->group_id;
+        $qry = 'UPDATE local_group set nickname = "'.$this->escape($nickname).'" where group_id = ' . $this->group_id;
 
         $result = $this->query($qry);
 
diff --git a/classes/Location_namespace.php b/classes/Location_namespace.php
index 5ab95d9ef2..7e12447a41 100644
--- a/classes/Location_namespace.php
+++ b/classes/Location_namespace.php
@@ -25,7 +25,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
 require_once INSTALLDIR.'/classes/Memcached_DataObject.php';
 
-class Location_namespace extends Memcached_DataObject
+class Location_namespace extends Managed_DataObject
 {
     ###START_AUTOCODE
     /* the code below is auto generated do not remove the above tag */
@@ -43,4 +43,17 @@ class Location_namespace extends Memcached_DataObject
 
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
+
+    public static function schemaDef()
+    {
+        return array(
+            'fields' => array(
+                'id' => array('type' => 'int', 'not null' => true, 'description' => 'identity for this namespace'),
+                'description' => array('type' => 'varchar', 'length' => 255, 'description' => 'description of the namespace'),
+                'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date the record was created'),
+                'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
+            ),
+            'primary key' => array('id'),
+        );
+    }
 }
diff --git a/classes/Login_token.php b/classes/Login_token.php
index 7a9388c947..7049c7c7fe 100644
--- a/classes/Login_token.php
+++ b/classes/Login_token.php
@@ -23,7 +23,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
 require_once INSTALLDIR.'/classes/Memcached_DataObject.php';
 
-class Login_token extends Memcached_DataObject
+class Login_token extends Managed_DataObject
 {
     ###START_AUTOCODE
     /* the code below is auto generated do not remove the above tag */
@@ -40,21 +40,24 @@ class Login_token extends Memcached_DataObject
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
 
-    const TIMEOUT = 120; // seconds after which to timeout the token
-
-    /*
-    DB_DataObject calculates the sequence key(s) by taking the first key returned by the keys() function.
-    In this case, the keys() function returns user_id as the first key. user_id is not a sequence, but
-    DB_DataObject's sequenceKey() will incorrectly think it is. Then, since the sequenceKey() is a numeric
-    type, but is not set to autoincrement in the database, DB_DataObject will create a _seq table and
-    manage the sequence itself. This is not the correct behavior for the user_id in this class.
-    So we override that incorrect behavior, and simply say there is no sequence key.
-    */
-    function sequenceKey()
+    public static function schemaDef()
     {
-        return array(false,false);
+        return array(
+            'fields' => array(
+                'user_id' => array('type' => 'int', 'not null' => true, 'description' => 'user owning this token'),
+                'token' => array('type' => 'char', 'length' => 32, 'not null' => true, 'description' => 'token useable for logging in'),
+                'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
+                'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
+            ),
+            'primary key' => array('user_id'),
+            'foreign keys' => array(
+                'login_token_user_id_fkey' => array('user', array('user_id' => 'id')),
+            ),
+        );
     }
 
+    const TIMEOUT = 120; // seconds after which to timeout the token
+
     function makeNew($user)
     {
         $login_token = Login_token::staticGet('user_id', $user->id);
diff --git a/classes/Managed_DataObject.php b/classes/Managed_DataObject.php
index 7263b3e320..1d55537e20 100644
--- a/classes/Managed_DataObject.php
+++ b/classes/Managed_DataObject.php
@@ -152,4 +152,54 @@ abstract class Managed_DataObject extends Memcached_DataObject
 
         return $style;
     }
+
+    function links()
+    {
+        $links = array();
+
+        $table = call_user_func(array(get_class($this), 'schemaDef'));
+
+        foreach ($table['foreign keys'] as $keyname => $keydef) {
+            if (count($keydef) == 2 && is_string($keydef[0]) && is_array($keydef[1]) && count($keydef[1]) == 1) {
+                if (isset($keydef[1][0])) {
+                    $links[$keydef[1][0]] = $keydef[0].':'.$keydef[1][1];
+                }
+            }
+        }
+        return $links;
+    }
+
+    /**
+     * Return a list of all primary/unique keys / vals that will be used for
+     * caching. This will understand compound unique keys, which
+     * Memcached_DataObject doesn't have enough info to handle properly.
+     *
+     * @return array of strings
+     */
+    function _allCacheKeys()
+    {
+        $table = call_user_func(array(get_class($this), 'schemaDef'));
+        $ckeys = array();
+
+        if (!empty($table['unique keys'])) {
+            $keyNames = $table['unique keys'];
+            foreach ($keyNames as $idx => $fields) {
+                $val = array();
+                foreach ($fields as $name) {
+                    $val[$name] = self::valueString($this->$name);
+                }
+                $ckeys[] = self::multicacheKey($this->tableName(), $val);
+            }
+        }
+
+        if (!empty($table['primary key'])) {
+            $fields = $table['primary key'];
+            $val = array();
+            foreach ($fields as $name) {
+                $val[$name] = self::valueString($this->$name);
+            }
+            $ckeys[] = self::multicacheKey($this->tableName(), $val);
+        }
+        return $ckeys;
+    }
 }
\ No newline at end of file
diff --git a/classes/Memcached_DataObject.php b/classes/Memcached_DataObject.php
index c361ba8783..54c885e737 100644
--- a/classes/Memcached_DataObject.php
+++ b/classes/Memcached_DataObject.php
@@ -34,11 +34,12 @@ class Memcached_DataObject extends Safe_DataObject
     {
         if (is_null($v)) {
             $v = $k;
-            // XXX: HACK!
-            $i = new $cls;
-            $keys = $i->keys();
+            $keys = self::pkeyCols($cls);
+            if (count($keys) > 1) {
+                // FIXME: maybe call pkeyGet() ourselves?
+                throw new Exception('Use pkeyGet() for compound primary keys');
+            }
             $k = $keys[0];
-            unset($i);
         }
         $i = Memcached_DataObject::getcached($cls, $k, $v);
         if ($i === false) { // false == cache miss
@@ -65,7 +66,291 @@ class Memcached_DataObject extends Safe_DataObject
     }
 
     /**
-     * @fixme Should this return false on lookup fail to match staticGet?
+     * Get multiple items from the database by key
+     *
+     * @param string  $cls       Class to fetch
+     * @param string  $keyCol    name of column for key
+     * @param array   $keyVals   key values to fetch
+     * @param boolean $skipNulls return only non-null results?
+     *
+     * @return array Array of objects, in order
+     */
+    function multiGet($cls, $keyCol, $keyVals, $skipNulls=true)
+    {
+        $result = self::pivotGet($cls, $keyCol, $keyVals);
+
+        $values = array_values($result);
+
+        if ($skipNulls) {
+            $tmp = array();
+            foreach ($values as $value) {
+                if (!empty($value)) {
+                    $tmp[] = $value;
+                }
+            }
+            $values = $tmp;
+        }
+
+        return new ArrayWrapper($values);
+    }
+
+    /**
+     * Get multiple items from the database by key
+     *
+     * @param string  $cls       Class to fetch
+     * @param string  $keyCol    name of column for key
+     * @param array   $keyVals   key values to fetch
+     * @param boolean $otherCols Other columns to hold fixed
+     *
+     * @return array Array mapping $keyVals to objects, or null if not found
+     */
+    static function pivotGet($cls, $keyCol, $keyVals, $otherCols = array())
+    {
+        if (is_array($keyCol)) {
+            foreach ($keyVals as $keyVal) {
+                $result[implode(',', $keyVal)] = null;
+            }
+        } else {
+            $result = array_fill_keys($keyVals, null);
+        }
+
+        $toFetch = array();
+
+        foreach ($keyVals as $keyVal) {
+
+            if (is_array($keyCol)) {
+                $kv = array_combine($keyCol, $keyVal);
+            } else {
+                $kv = array($keyCol => $keyVal);
+            }
+
+            $kv = array_merge($otherCols, $kv);
+
+            $i = self::multicache($cls, $kv);
+
+            if ($i !== false) {
+                if (is_array($keyCol)) {
+                    $result[implode(',', $keyVal)] = $i;
+                } else {
+                    $result[$keyVal] = $i;
+                }
+            } else if (!empty($keyVal)) {
+                $toFetch[] = $keyVal;
+            }
+        }
+
+        if (count($toFetch) > 0) {
+            $i = DB_DataObject::factory($cls);
+            if (empty($i)) {
+                // TRANS: Exception thrown when a program code class (%s) cannot be instantiated.
+                throw new Exception(sprintf(_('Cannot instantiate class %s.'),$cls));
+            }
+            foreach ($otherCols as $otherKeyCol => $otherKeyVal) {
+                $i->$otherKeyCol = $otherKeyVal;
+            }
+            if (is_array($keyCol)) {
+                $i->whereAdd(self::_inMultiKey($i, $keyCol, $toFetch));
+            } else {
+                $i->whereAddIn($keyCol, $toFetch, $i->columnType($keyCol));
+            }
+            if ($i->find()) {
+                while ($i->fetch()) {
+                    $copy = clone($i);
+                    $copy->encache();
+                    if (is_array($keyCol)) {
+                        $vals = array();
+                        foreach ($keyCol as $k) {
+                            $vals[] = $i->$k;
+                        }
+                        $result[implode(',', $vals)] = $copy;
+                    } else {
+                        $result[$i->$keyCol] = $copy;
+                    }
+                }
+            }
+
+            // Save state of DB misses
+
+            foreach ($toFetch as $keyVal) {
+                $r = null;
+                if (is_array($keyCol)) {
+                    $r = $result[implode(',', $keyVal)];
+                } else {
+                    $r = $result[$keyVal];
+                }
+                if (empty($r)) {
+                    if (is_array($keyCol)) {
+                        $kv = array_combine($keyCol, $keyVal);
+                    } else {
+                        $kv = array($keyCol => $keyVal);
+                    }
+                    $kv = array_merge($otherCols, $kv);
+                    // save the fact that no such row exists
+                    $c = self::memcache();
+                    if (!empty($c)) {
+                        $ck = self::multicacheKey($cls, $kv);
+                        $c->set($ck, null);
+                    }
+                }
+            }
+        }
+
+        return $result;
+    }
+
+    static function _inMultiKey($i, $cols, $values)
+    {
+        $types = array();
+
+        foreach ($cols as $col) {
+            $types[$col] = $i->columnType($col);
+        }
+
+        $first = true;
+
+        $query = '';
+
+        foreach ($values as $value) {
+            if ($first) {
+                $query .= '( ';
+                $first = false;
+            } else {
+                $query .= ' OR ';
+            }
+            $query .= '( ';
+            $i = 0;
+            $firstc = true;
+            foreach ($cols as $col) {
+                if (!$firstc) {
+                    $query .= ' AND ';
+                } else {
+                    $firstc = false;
+                }
+                switch ($types[$col]) {
+                case 'string':
+                case 'datetime':
+                    $query .= sprintf("%s = %s", $col, $i->_quote($value[$i]));
+                    break;
+                default:
+                    $query .= sprintf("%s = %s", $col, $value[$i]);
+                    break;
+                }
+            }
+            $query .= ') ';
+        }
+
+        if (!$first) {
+            $query .= ' )';
+        }
+
+        return $query;
+    }
+
+    static function pkeyCols($cls)
+    {
+        $i = DB_DataObject::factory($cls);
+        if (empty($i)) {
+            // TRANS: Exception thrown when a program code class (%s) cannot be instantiated.
+            throw new Exception(sprintf(_('Cannot instantiate class %s.'),$cls));
+        }
+        $types = $i->keyTypes();
+        ksort($types);
+
+        $pkey = array();
+
+        foreach ($types as $key => $type) {
+            if ($type == 'K' || $type == 'N') {
+                $pkey[] = $key;
+            }
+        }
+
+        return $pkey;
+    }
+
+    function listGet($cls, $keyCol, $keyVals)
+    {
+        $pkeyMap = array_fill_keys($keyVals, array());
+        $result = array_fill_keys($keyVals, array());
+
+        $pkeyCols = self::pkeyCols($cls);
+
+        $toFetch = array();
+        $allPkeys = array();
+
+        // We only cache keys -- not objects!
+
+        foreach ($keyVals as $keyVal) {
+            $l = self::cacheGet(sprintf("%s:list-ids:%s:%s", strtolower($cls), $keyCol, $keyVal));
+            if ($l !== false) {
+                $pkeyMap[$keyVal] = $l;
+                foreach ($l as $pkey) {
+                    $allPkeys[] = $pkey;
+                }
+            } else {
+                $toFetch[] = $keyVal;
+            }
+        }
+
+        if (count($allPkeys) > 0) {
+            $keyResults = self::pivotGet($cls, $pkeyCols, $allPkeys);
+
+            foreach ($pkeyMap as $keyVal => $pkeyList) {
+                foreach ($pkeyList as $pkeyVal) {
+                    $i = $keyResults[implode(',',$pkeyVal)];
+                    if (!empty($i)) {
+                        $result[$keyVal][] = $i;
+                    }
+                }
+            }
+        }
+
+        if (count($toFetch) > 0) {
+            $i = DB_DataObject::factory($cls);
+            if (empty($i)) {
+                // TRANS: Exception thrown when a program code class (%s) cannot be instantiated.
+                throw new Exception(sprintf(_('Cannot instantiate class %s.'),$cls));
+            }
+            $i->whereAddIn($keyCol, $toFetch, $i->columnType($keyCol));
+            if ($i->find()) {
+                sprintf("listGet() got {$i->N} results for class $cls key $keyCol");
+                while ($i->fetch()) {
+                    $copy = clone($i);
+                    $copy->encache();
+                    $result[$i->$keyCol][] = $copy;
+                    $pkeyVal = array();
+                    foreach ($pkeyCols as $pkeyCol) {
+                        $pkeyVal[] = $i->$pkeyCol;
+                    }
+                    $pkeyMap[$i->$keyCol][] = $pkeyVal;
+                }
+            }
+            foreach ($toFetch as $keyVal) {
+                self::cacheSet(sprintf("%s:list-ids:%s:%s", strtolower($cls), $keyCol, $keyVal),
+                               $pkeyMap[$keyVal]);
+            }
+        }
+
+        return $result;
+    }
+
+    function columnType($columnName)
+    {
+        $keys = $this->table();
+        if (!array_key_exists($columnName, $keys)) {
+            throw new Exception('Unknown key column ' . $columnName . ' in ' . join(',', array_keys($keys)));
+        }
+
+        $def = $keys[$columnName];
+
+        if ($def & DB_DATAOBJECT_INT) {
+            return 'integer';
+        } else {
+            return 'string';
+        }
+    }
+
+    /**
+     * @todo FIXME: Should this return false on lookup fail to match staticGet?
      */
     function pkeyGet($cls, $kv)
     {
@@ -78,7 +363,13 @@ class Memcached_DataObject extends Safe_DataObject
                 return false;
             }
             foreach ($kv as $k => $v) {
-                $i->$k = $v;
+                if (is_null($v)) {
+                    // XXX: possible SQL injection...? Don't
+                    // pass keys from the browser, eh.
+                    $i->whereAdd("$k is null");
+                } else {
+                    $i->$k = $v;
+                }
             }
             if ($i->find(true)) {
                 $i->encache();
@@ -409,7 +700,7 @@ class Memcached_DataObject extends Safe_DataObject
                     continue;
                 }
                 if (in_array($func, $ignoreStatic)) {
-                    continue; // @fixme this shouldn't be needed?
+                    continue; // @todo FIXME: This shouldn't be needed?
                 }
                 $here = get_class($frame['object']) . '->' . $func;
                 break;
@@ -552,7 +843,7 @@ class Memcached_DataObject extends Safe_DataObject
 
         if (!$dsn) {
             // TRANS: Exception thrown when database name or Data Source Name could not be found.
-            throw new Exception(_("No database name or DSN found anywhere."));
+            throw new Exception(_('No database name or DSN found anywhere.'));
         }
 
         return $dsn;
diff --git a/classes/Message.php b/classes/Message.php
index 484d1f724c..7fe626ec57 100644
--- a/classes/Message.php
+++ b/classes/Message.php
@@ -4,7 +4,7 @@
  */
 require_once INSTALLDIR.'/classes/Memcached_DataObject.php';
 
-class Message extends Memcached_DataObject
+class Message extends Managed_DataObject
 {
     ###START_AUTOCODE
     /* the code below is auto generated do not remove the above tag */
@@ -27,6 +27,39 @@ class Message extends Memcached_DataObject
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
 
+    public static function schemaDef()
+    {
+        return array(
+            'fields' => array(
+                'id' => array('type' => 'serial', 'not null' => true, 'description' => 'unique identifier'),
+                'uri' => array('type' => 'varchar', 'length' => 255, 'description' => 'universally unique identifier'),
+                'from_profile' => array('type' => 'int', 'not null' => true, 'description' => 'who the message is from'),
+                'to_profile' => array('type' => 'int', 'not null' => true, 'description' => 'who the message is to'),
+                'content' => array('type' => 'text', 'description' => 'message content'),
+                'rendered' => array('type' => 'text', 'description' => 'HTML version of the content'),
+                'url' => array('type' => 'varchar', 'length' => 255, 'description' => 'URL of any attachment (image, video, bookmark, whatever)'),
+                'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
+                'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
+                'source' => array('type' => 'varchar', 'length' => 32, 'description' => 'source of comment, like "web", "im", or "clientname"'),
+            ),
+            'primary key' => array('id'),
+            'unique keys' => array(
+                'message_uri_key' => array('uri'),
+            ),
+            'foreign keys' => array(
+                'message_from_profile_fkey' => array('profile', array('from_profile' => 'id')),
+                'message_to_profile_fkey' => array('profile', array('to_profile' => 'id')),
+            ),
+            'indexes' => array(
+                // @fixme these are really terrible indexes, since you can only sort on one of them at a time.
+                // looks like we really need a (to_profile, created) for inbox and a (from_profile, created) for outbox
+                'message_from_idx' => array('from_profile'),
+                'message_to_idx' => array('to_profile'),
+                'message_created_idx' => array('created'),
+            ),
+        );
+    }
+
     function getFrom()
     {
         return Profile::staticGet('id', $this->from_profile);
@@ -106,4 +139,82 @@ class Message extends Memcached_DataObject
 
         mail_notify_message($this, $from, $to);
     }
+
+    function getSource()
+    {
+        $ns = new Notice_source();
+        if (!empty($this->source)) {
+            switch ($this->source) {
+            case 'web':
+            case 'xmpp':
+            case 'mail':
+            case 'omb':
+            case 'system':
+            case 'api':
+                $ns->code = $this->source;
+                break;
+            default:
+                $ns = Notice_source::staticGet($this->source);
+                if (!$ns) {
+                    $ns = new Notice_source();
+                    $ns->code = $this->source;
+                    $app = Oauth_application::staticGet('name', $this->source);
+                    if ($app) {
+                        $ns->name = $app->name;
+                        $ns->url  = $app->source_url;
+                    }
+                }
+                break;
+            }
+        }
+        return $ns;
+    }
+
+    function asActivity()
+    {
+        $act = new Activity();
+
+        if (Event::handle('StartMessageAsActivity', array($this, &$act))) {
+
+            $act->id      = TagURI::mint(sprintf('activity:message:%d', $this->id));
+            $act->time    = strtotime($this->created);
+            $act->link    = $this->url;
+
+            $profile = Profile::staticGet('id', $this->from_profile);
+
+            if (empty($profile)) {
+                throw new Exception(sprintf("Sender profile not found: %d", $this->from_profile));
+            }
+            
+            $act->actor            = ActivityObject::fromProfile($profile);
+            $act->actor->extra[]   = $profile->profileInfo(null);
+
+            $act->verb = ActivityVerb::POST;
+
+            $act->objects[] = ActivityObject::fromMessage($this);
+
+            $ctx = new ActivityContext();
+
+            $rprofile = Profile::staticGet('id', $this->to_profile);
+
+            if (empty($rprofile)) {
+                throw new Exception(sprintf("Receiver profile not found: %d", $this->to_profile));
+            }
+
+            $ctx->attention[] = $rprofile->getUri();
+            $ctx->attentionType[$rprofile->getUri()] = ActivityObject::PERSON;
+
+            $act->context = $ctx;
+
+            $source = $this->getSource();
+
+            if ($source) {
+                $act->generator = ActivityObject::fromNoticeSource($source);
+            }
+
+            Event::handle('EndMessageAsActivity', array($this, &$act));
+        }
+
+        return $act;
+    }
 }
diff --git a/classes/Nonce.php b/classes/Nonce.php
index 93191bd409..0cd9967a08 100644
--- a/classes/Nonce.php
+++ b/classes/Nonce.php
@@ -4,7 +4,7 @@
  */
 require_once INSTALLDIR.'/classes/Memcached_DataObject.php';
 
-class Nonce extends Memcached_DataObject
+class Nonce extends Managed_DataObject
 {
     ###START_AUTOCODE
     /* the code below is auto generated do not remove the above tag */
@@ -36,4 +36,21 @@ class Nonce extends Memcached_DataObject
     {
         return array('consumer_key,token' => 'token:consumer_key,token');
     }
+
+    public static function schemaDef()
+    {
+        return array(
+            'description' => 'OAuth nonce record',
+            'fields' => array(
+                'consumer_key' => array('type' => 'varchar', 'length' => 255, 'not null' => true, 'description' => 'unique identifier, root URL'),
+                'tok' => array('type' => 'char', 'length' => 32, 'description' => 'buggy old value, ignored'),
+                'nonce' => array('type' => 'char', 'length' => 32, 'not null' => true, 'description' => 'nonce'),
+                'ts' => array('type' => 'datetime', 'not null' => true, 'description' => 'timestamp sent'),
+
+                'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
+                'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
+            ),
+            'primary key' => array('consumer_key', 'ts', 'nonce'),
+        );
+    }
 }
diff --git a/classes/Notice.php b/classes/Notice.php
index 87363158dd..462ce8b53c 100644
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * StatusNet - the distributed open-source microblogging tool
- * Copyright (C) 2008, 2009, StatusNet, Inc.
+ * Copyright (C) 2008-2011 StatusNet, Inc.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -49,7 +49,7 @@ define('NOTICE_CACHE_WINDOW', CachingNoticeStream::CACHE_WINDOW);
 
 define('MAX_BOXCARS', 128);
 
-class Notice extends Memcached_DataObject
+class Notice extends Managed_DataObject
 {
     ###START_AUTOCODE
     /* the code below is auto generated do not remove the above tag */
@@ -72,6 +72,7 @@ class Notice extends Memcached_DataObject
     public $location_id;                     // int(4)
     public $location_ns;                     // int(4)
     public $repeat_of;                       // int(4)
+    public $verb;                            // varchar(255)
     public $object_type;                     // varchar(255)
     public $scope;                           // int(4)
 
@@ -84,9 +85,66 @@ class Notice extends Memcached_DataObject
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
 
+    public static function schemaDef()
+    {
+        $def = array(
+            'fields' => array(
+                'id' => array('type' => 'serial', 'not null' => true, 'description' => 'unique identifier'),
+                'profile_id' => array('type' => 'int', 'not null' => true, 'description' => 'who made the update'),
+                'uri' => array('type' => 'varchar', 'length' => 255, 'description' => 'universally unique identifier, usually a tag URI'),
+                'content' => array('type' => 'text', 'description' => 'update content', 'collate' => 'utf8_general_ci'),
+                'rendered' => array('type' => 'text', 'description' => 'HTML version of the content'),
+                'url' => array('type' => 'varchar', 'length' => 255, 'description' => 'URL of any attachment (image, video, bookmark, whatever)'),
+                'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
+                'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
+                'reply_to' => array('type' => 'int', 'description' => 'notice replied to (usually a guess)'),
+                'is_local' => array('type' => 'int', 'size' => 'tiny', 'default' => 0, 'description' => 'notice was generated by a user'),
+                'source' => array('type' => 'varchar', 'length' => 32, 'description' => 'source of comment, like "web", "im", or "clientname"'),
+                'conversation' => array('type' => 'int', 'description' => 'id of root notice in this conversation'),
+                'lat' => array('type' => 'numeric', 'precision' => 10, 'scale' => 7, 'description' => 'latitude'),
+                'lon' => array('type' => 'numeric', 'precision' => 10, 'scale' => 7, 'description' => 'longitude'),
+                'location_id' => array('type' => 'int', 'description' => 'location id if possible'),
+                'location_ns' => array('type' => 'int', 'description' => 'namespace for location'),
+                'repeat_of' => array('type' => 'int', 'description' => 'notice this is a repeat of'),
+                'object_type' => array('type' => 'varchar', 'length' => 255, 'description' => 'URI representing activity streams object type', 'default' => 'http://activitystrea.ms/schema/1.0/note'),
+                'verb' => array('type' => 'varchar', 'length' => 255, 'description' => 'URI representing activity streams verb', 'default' => 'http://activitystrea.ms/schema/1.0/post'),
+                'scope' => array('type' => 'int',
+                                 'description' => 'bit map for distribution scope; 0 = everywhere; 1 = this server only; 2 = addressees; 4 = followers; null = default'),
+            ),
+            'primary key' => array('id'),
+            'unique keys' => array(
+                'notice_uri_key' => array('uri'),
+            ),
+            'foreign keys' => array(
+                'notice_profile_id_fkey' => array('profile', array('profile_id' => 'id')),
+                'notice_reply_to_fkey' => array('notice', array('reply_to' => 'id')),
+                'notice_conversation_fkey' => array('conversation', array('conversation' => 'id')), # note... used to refer to notice.id
+                'notice_repeat_of_fkey' => array('notice', array('repeat_of' => 'id')), # @fixme: what about repeats of deleted notices?
+            ),
+            'indexes' => array(
+                'notice_created_id_is_local_idx' => array('created', 'id', 'is_local'),
+                'notice_profile_id_idx' => array('profile_id', 'created', 'id'),
+                'notice_repeat_of_created_id_idx' => array('repeat_of', 'created', 'id'),
+                'notice_conversation_created_id_idx' => array('conversation', 'created', 'id'),
+                'notice_replyto_idx' => array('reply_to')
+            )
+        );
+
+        if (common_config('search', 'type') == 'fulltext') {
+            $def['fulltext indexes'] = array('content' => array('content'));
+        }
+
+        return $def;
+    }
+    
+	function multiGet($kc, $kvs, $skipNulls=true)
+	{
+		return Memcached_DataObject::multiGet('Notice', $kc, $kvs, $skipNulls);
+	}
+	
     /* Notice types */
     const LOCAL_PUBLIC    =  1;
-    const REMOTE_OMB      =  0;
+    const REMOTE          =  0;
     const LOCAL_NONPUBLIC = -1;
     const GATEWAY         = -2;
 
@@ -101,7 +159,7 @@ class Notice extends Memcached_DataObject
     function getProfile()
     {
         if (is_int($this->_profile) && $this->_profile == -1) {
-            $this->_profile = Profile::staticGet('id', $this->profile_id);
+            $this->_setProfile(Profile::staticGet('id', $this->profile_id));
 
             if (empty($this->_profile)) {
                 // TRANS: Server exception thrown when a user profile for a notice cannot be found.
@@ -112,6 +170,11 @@ class Notice extends Memcached_DataObject
 
         return $this->_profile;
     }
+    
+    function _setProfile($profile)
+    {
+        $this->_profile = $profile;
+    }
 
     function delete()
     {
@@ -229,11 +292,11 @@ class Notice extends Memcached_DataObject
      *              string 'created' timestamp of notice; defaults to now
      *              int 'is_local' source/gateway ID, one of:
      *                  Notice::LOCAL_PUBLIC    - Local, ok to appear in public timeline
-     *                  Notice::REMOTE_OMB      - Sent from a remote OMB service;
+     *                  Notice::REMOTE          - Sent from a remote service;
      *                                            hide from public timeline but show in
      *                                            local "and friends" timelines
      *                  Notice::LOCAL_NONPUBLIC - Local, but hide from public timeline
-     *                  Notice::GATEWAY         - From another non-OMB service;
+     *                  Notice::GATEWAY         - From another non-OStatus service;
      *                                            will not appear in public views
      *              float 'lat' decimal latitude for geolocation
      *              float 'lon' decimal longitude for geolocation
@@ -254,6 +317,7 @@ class Notice extends Memcached_DataObject
      *                           notice in place of extracting links from content
      *              boolean 'distribute' whether to distribute the notice, default true
      *              string 'object_type' URL of the associated object type (default ActivityObject::NOTE)
+     *              string 'verb' URL of the associated verb (default ActivityVerb::POST)
      *              int 'scope' Scope bitmask; default to SITE_SCOPE on private sites, 0 otherwise
      *
      * @fixme tag override
@@ -267,10 +331,12 @@ class Notice extends Memcached_DataObject
                           'reply_to' => null,
                           'repeat_of' => null,
                           'scope' => null,
-                          'distribute' => true);
+                          'distribute' => true,
+                          'object_type' => null,
+                          'verb' => null);
 
-        if (!empty($options)) {
-            $options = $options + $defaults;
+        if (!empty($options) && is_array($options)) {
+            $options = array_merge($defaults, $options);
             extract($options);
         } else {
             extract($defaults);
@@ -438,6 +504,17 @@ class Notice extends Memcached_DataObject
             $notice->rendered = common_render_content($final, $notice);
         }
 
+        if (empty($verb)) {
+            if (!empty($notice->repeat_of)) {
+                $notice->verb        = ActivityVerb::SHARE;
+                $notice->object_type = ActivityObject::ACTIVITY;
+            } else {
+                $notice->verb        = ActivityVerb::POST;
+            }
+        } else {
+            $notice->verb = $verb;
+        }
+
         if (empty($object_type)) {
             $notice->object_type = (empty($notice->reply_to)) ? ActivityObject::NOTE : ActivityObject::COMMENT;
         } else {
@@ -448,7 +525,7 @@ class Notice extends Memcached_DataObject
             if (!empty($reply)) {
                 $notice->scope = $reply->scope;
             } else {
-                $notice->scope = common_config('notice', 'defaultscope');
+                $notice->scope = self::defaultScope();
             }
         } else {
             $notice->scope = $scope;
@@ -567,14 +644,13 @@ class Notice extends Memcached_DataObject
             $this->blowStream('public');
         }
 
-        // XXX: Before we were blowing the casche only if the notice id
-        // was not the root of the conversation.  What to do now?
-
-        self::blow('notice:conversation_ids:%d', $this->conversation);
-        self::blow('conversation::notice_count:%d', $this->conversation);
+        self::blow('notice:list-ids:conversation:%s', $this->conversation);
+        self::blow('conversation:notice_count:%d', $this->conversation);
 
         if (!empty($this->repeat_of)) {
+            // XXX: we should probably only use one of these
             $this->blowStream('notice:repeats:%d', $this->repeat_of);
+            self::blow('notice:list-ids:repeat_of:%d', $this->repeat_of);
         }
 
         $original = Notice::staticGet('id', $this->repeat_of);
@@ -745,62 +821,33 @@ class Notice extends Memcached_DataObject
         return true;
     }
 
-    function getUploadedAttachment() {
-        $post = clone $this;
-        $query = 'select file.url as up, file.id as i from file join file_to_post on file.id = file_id where post_id=' . $post->escape($post->id) . ' and url like "%/notice/%/file"';
-        $post->query($query);
-        $post->fetch();
-        if (empty($post->up) || empty($post->i)) {
-            $ret = false;
-        } else {
-            $ret = array($post->up, $post->i);
-        }
-        $post->free();
-        return $ret;
-    }
-
-    function hasAttachments() {
-        $post = clone $this;
-        $query = "select count(file_id) as n_attachments from file join file_to_post on (file_id = file.id) join notice on (post_id = notice.id) where post_id = " . $post->escape($post->id);
-        $post->query($query);
-        $post->fetch();
-        $n_attachments = intval($post->n_attachments);
-        $post->free();
-        return $n_attachments;
-    }
-
+	protected $_attachments = -1;
+	
     function attachments() {
 
-        $keypart = sprintf('notice:file_ids:%d', $this->id);
-
-        $idstr = self::cacheGet($keypart);
-
-        if ($idstr !== false) {
-            $ids = explode(',', $idstr);
-        } else {
-            $ids = array();
-            $f2p = new File_to_post;
-            $f2p->post_id = $this->id;
-            if ($f2p->find()) {
-                while ($f2p->fetch()) {
-                    $ids[] = $f2p->file_id;
-                }
-            }
-            self::cacheSet($keypart, implode(',', $ids));
+		if ($this->_attachments != -1)  {
+            return $this->_attachments;
         }
-
-        $att = array();
-
-        foreach ($ids as $id) {
-            $f = File::staticGet('id', $id);
-            if (!empty($f)) {
-                $att[] = clone($f);
-            }
+		
+		$f2ps = Memcached_DataObject::listGet('File_to_post', 'post_id', array($this->id));
+		
+		$ids = array();
+		
+		foreach ($f2ps[$this->id] as $f2p) {
+            $ids[] = $f2p->file_id;    
         }
+		
+		$files = Memcached_DataObject::multiGet('File', 'id', $ids);
 
-        return $att;
+		$this->_attachments = $files->fetchAll();
+		
+        return $this->_attachments;
     }
 
+	function _setAttachments($attachments)
+	{
+	    $this->_attachments = $attachments;
+	}
 
     function publicStream($offset=0, $limit=20, $since_id=0, $max_id=0)
     {
@@ -961,10 +1008,7 @@ class Notice extends Memcached_DataObject
                 $users = $ptag->getUserSubscribers();
                 foreach ($users as $id) {
                     if (!array_key_exists($id, $ni)) {
-                        $user = User::staticGet('id', $id);
-                        if (!$user->hasBlocked($profile)) {
-                            $ni[$id] = NOTICE_INBOX_SOURCE_PROFILE_TAG;
-                        }
+                        $ni[$id] = NOTICE_INBOX_SOURCE_PROFILE_TAG;
                     }
                 }
             }
@@ -973,23 +1017,30 @@ class Notice extends Memcached_DataObject
                 if (!array_key_exists($recipient, $ni)) {
                     $ni[$recipient] = NOTICE_INBOX_SOURCE_REPLY;
                 }
+            }
 
-                // Exclude any deleted, non-local, or blocking recipients.
-                $profile = $this->getProfile();
-                $originalProfile = null;
-                if ($this->repeat_of) {
-                    // Check blocks against the original notice's poster as well.
-                    $original = Notice::staticGet('id', $this->repeat_of);
-                    if ($original) {
-                        $originalProfile = $original->getProfile();
-                    }
+            // Exclude any deleted, non-local, or blocking recipients.
+            $profile = $this->getProfile();
+            $originalProfile = null;
+            if ($this->repeat_of) {
+                // Check blocks against the original notice's poster as well.
+                $original = Notice::staticGet('id', $this->repeat_of);
+                if ($original) {
+                    $originalProfile = $original->getProfile();
                 }
-                foreach ($ni as $id => $source) {
+            }
+
+            foreach ($ni as $id => $source) {
+                try {
                     $user = User::staticGet('id', $id);
-                    if (empty($user) || $user->hasBlocked($profile) ||
+                    if (empty($user) ||
+                        $user->hasBlocked($profile) ||
                         ($originalProfile && $user->hasBlocked($originalProfile))) {
                         unset($ni[$id]);
                     }
+                } catch (UserNoProfileException $e) {
+                    // User doesn't have a profile; invalid; skip them.
+                    unset($ni[$id]);
                 }
             }
 
@@ -1322,6 +1373,8 @@ class Notice extends Memcached_DataObject
         return $reply;
     }
 
+    protected $_replies = -1;
+
     /**
      * Pull the complete list of @-reply targets for this notice.
      *
@@ -1329,31 +1382,28 @@ class Notice extends Memcached_DataObject
      */
     function getReplies()
     {
-        $keypart = sprintf('notice:reply_ids:%d', $this->id);
-
-        $idstr = self::cacheGet($keypart);
-
-        if ($idstr !== false) {
-            $ids = explode(',', $idstr);
-        } else {
-            $ids = array();
-
-            $reply = new Reply();
-            $reply->selectAdd();
-            $reply->selectAdd('profile_id');
-            $reply->notice_id = $this->id;
-
-            if ($reply->find()) {
-                while($reply->fetch()) {
-                    $ids[] = $reply->profile_id;
-                }
-            }
-            self::cacheSet($keypart, implode(',', $ids));
+        if ($this->_replies != -1) {
+            return $this->_replies;
         }
 
+        $replyMap = Memcached_DataObject::listGet('Reply', 'notice_id', array($this->id));
+
+        $ids = array();
+
+        foreach ($replyMap[$this->id] as $reply) {
+            $ids[] = $reply->profile_id;
+        }
+
+        $this->_replies = $ids;
+
         return $ids;
     }
 
+    function _setReplies($replies)
+    {
+        $this->_replies = $replies;
+    }
+
     /**
      * Pull the complete list of @-reply targets for this notice.
      *
@@ -1361,17 +1411,11 @@ class Notice extends Memcached_DataObject
      */
     function getReplyProfiles()
     {
-        $ids      = $this->getReplies();
-        $profiles = array();
-
-        foreach ($ids as $id) {
-            $profile = Profile::staticGet('id', $id);
-            if (!empty($profile)) {
-                $profiles[] = $profile;
-            }
-        }
+        $ids = $this->getReplies();
         
-        return $profiles;
+        $profiles = Profile::multiGet('id', $ids);
+        
+        return $profiles->fetchAll();
     }
 
     /**
@@ -1404,6 +1448,9 @@ class Notice extends Memcached_DataObject
      *
      * @return array of Group objects
      */
+    
+    protected $_groups = -1;
+    
     function getGroups()
     {
         // Don't save groups for repeats
@@ -1411,42 +1458,31 @@ class Notice extends Memcached_DataObject
         if (!empty($this->repeat_of)) {
             return array();
         }
+        
+        if ($this->_groups != -1)
+        {
+            return $this->_groups;
+        }
+        
+        $gis = Memcached_DataObject::listGet('Group_inbox', 'notice_id', array($this->id));
 
         $ids = array();
 
-        $keypart = sprintf('notice:groups:%d', $this->id);
-
-        $idstr = self::cacheGet($keypart);
-
-        if ($idstr !== false) {
-            $ids = explode(',', $idstr);
-        } else {
-            $gi = new Group_inbox();
-
-            $gi->selectAdd();
-            $gi->selectAdd('group_id');
-
-            $gi->notice_id = $this->id;
-
-            if ($gi->find()) {
-                while ($gi->fetch()) {
-                    $ids[] = $gi->group_id;
-                }
-            }
-
-            self::cacheSet($keypart, implode(',', $ids));
-        }
-
-        $groups = array();
-
-        foreach ($ids as $id) {
-            $group = User_group::staticGet('id', $id);
-            if ($group) {
-                $groups[] = $group;
-            }
-        }
-
-        return $groups;
+		foreach ($gis[$this->id] as $gi)
+		{
+		    $ids[] = $gi->group_id;
+		}
+		
+		$groups = User_group::multiGet('id', $ids);
+		
+		$this->_groups = $groups->fetchAll();
+		
+		return $this->_groups;
+    }
+    
+    function _setGroups($groups)
+    {
+        $this->_groups = $groups;
     }
 
     /**
@@ -1457,7 +1493,7 @@ class Notice extends Memcached_DataObject
      * @return Activity activity object representing this Notice.
      */
 
-    function asActivity($cur)
+    function asActivity($cur=null)
     {
         $act = self::cacheGet(Cache::codeKey('notice:as-activity:'.$this->id));
 
@@ -1468,22 +1504,28 @@ class Notice extends Memcached_DataObject
 
         if (Event::handle('StartNoticeAsActivity', array($this, &$act))) {
 
+            $act->id      = TagURI::mint("post:".$this->id);
+            $act->time    = strtotime($this->created);
+            $act->content = common_xml_safe_str($this->rendered);
+
             $profile = $this->getProfile();
 
             $act->actor            = ActivityObject::fromProfile($profile);
             $act->actor->extra[]   = $profile->profileInfo($cur);
-            $act->verb             = ActivityVerb::POST;
-            $act->objects[]        = ActivityObject::fromNotice($this);
+
+            $act->verb = $this->verb;
+
+            if ($this->repeat_of) {
+                $repeated = Notice::staticGet('id', $this->repeat_of);
+                if (!empty($repeated)) {
+                    $act->objects[] = $repeated->asActivity($cur);
+                }
+            } else {
+                $act->objects[] = ActivityObject::fromNotice($this);
+            }
 
             // XXX: should this be handled by default processing for object entry?
 
-            $act->time    = strtotime($this->created);
-            $act->link    = $this->bestUrl();
-
-            $act->content = common_xml_safe_str($this->rendered);
-            $act->id      = $this->uri;
-            $act->title   = common_xml_safe_str($this->content);
-
             // Categories
 
             $tags = $this->getTags();
@@ -1501,9 +1543,9 @@ class Notice extends Memcached_DataObject
             $attachments = $this->attachments();
 
             foreach ($attachments as $attachment) {
-                $enclosure = $attachment->getEnclosure();
-                if ($enclosure) {
-                    $act->enclosures[] = $enclosure;
+                // Save local attachments
+                if (!empty($attachment->filename)) {
+                    $act->attachments[] = ActivityObject::fromFile($attachment);
                 }
             }
 
@@ -1534,6 +1576,7 @@ class Notice extends Memcached_DataObject
                 $rprofile = Profile::staticGet('id', $id);
                 if (!empty($rprofile)) {
                     $ctx->attention[] = $rprofile->getUri();
+                    $ctx->attentionType[$rprofile->getUri()] = ActivityObject::PERSON;
                 }
             }
 
@@ -1541,6 +1584,19 @@ class Notice extends Memcached_DataObject
 
             foreach ($groups as $group) {
                 $ctx->attention[] = $group->getUri();
+                $ctx->attentionType[$group->getUri()] = ActivityObject::GROUP;
+            }
+
+            switch ($this->scope) {
+            case Notice::PUBLIC_SCOPE:
+                $ctx->attention[] = "http://activityschema.org/collection/public";
+                $ctx->attentionType["http://activityschema.org/collection/public"] = ActivityObject::COLLECTION;
+                break;
+            case Notice::FOLLOWER_SCOPE:
+                $surl = common_local_url("subscribers", array('nickname' => $profile->nickname));
+                $ctx->attention[] = $surl;
+                $ctx->attentionType[$surl] = ActivityObject::COLLECTION;
+                break;
             }
 
             // XXX: deprecated; use ActivityVerb::SHARE instead
@@ -1549,12 +1605,20 @@ class Notice extends Memcached_DataObject
 
             if (!empty($this->repeat_of)) {
                 $repeat = Notice::staticGet('id', $this->repeat_of);
-                $ctx->forwardID  = $repeat->uri;
-                $ctx->forwardUrl = $repeat->bestUrl();
+                if (!empty($repeat)) {
+                    $ctx->forwardID  = $repeat->uri;
+                    $ctx->forwardUrl = $repeat->bestUrl();
+                }
             }
 
             $act->context = $ctx;
 
+            $source = $this->getSource();
+
+            if ($source) {
+                $act->generator = ActivityObject::fromNoticeSource($source);
+            }
+
             // Source
 
             $atom_feed = $profile->getAtomFeed();
@@ -1856,7 +1920,11 @@ class Notice extends Memcached_DataObject
         } else {
             $idstr = $cache->get(Cache::key('notice:repeats:'.$this->id));
             if ($idstr !== false) {
-                $ids = explode(',', $idstr);
+            	if (empty($idstr)) {
+            		$ids = array();
+            	} else {
+                	$ids = explode(',', $idstr);
+            	}
             } else {
                 $ids = $this->_repeatStreamDirect(100);
                 $cache->set(Cache::key('notice:repeats:'.$this->id), implode(',', $ids));
@@ -1885,18 +1953,7 @@ class Notice extends Memcached_DataObject
             $notice->limit(0, $limit);
         }
 
-        $ids = array();
-
-        if ($notice->find()) {
-            while ($notice->fetch()) {
-                $ids[] = $notice->id;
-            }
-        }
-
-        $notice->free();
-        $notice = NULL;
-
-        return $ids;
+        return $notice->fetchAll('id');
     }
 
     function locationOptions($lat, $lon, $location_id, $location_ns, $profile = null)
@@ -2332,7 +2389,11 @@ class Notice extends Memcached_DataObject
         $result = self::cacheGet($keypart);
 
         if ($result === false) {
-            $bResult = $this->_inScope($profile);
+            $bResult = false;
+            if (Event::handle('StartNoticeInScope', array($this, $profile, &$bResult))) {
+                $bResult = $this->_inScope($profile);
+                Event::handle('EndNoticeInScope', array($this, $profile, &$bResult));
+            }
             $result = ($bResult) ? 1 : 0;
             self::cacheSet($keypart, $result, 0, 300);
         }
@@ -2342,78 +2403,118 @@ class Notice extends Memcached_DataObject
 
     protected function _inScope($profile)
     {
+        if (!is_null($this->scope)) {
+            $scope = $this->scope;
+        } else {
+            $scope = self::defaultScope();
+        }
+
         // If there's no scope, anyone (even anon) is in scope.
 
-        if ($this->scope == 0) {
-            return true;
-        }
+        if ($scope == 0) { // Not private
 
-        // If there's scope, anon cannot be in scope
+            return !$this->isHiddenSpam($profile);
 
-        if (empty($profile)) {
-            return false;
-        }
+        } else { // Private, somehow
 
-        // Author is always in scope
+            // If there's scope, anon cannot be in scope
 
-        if ($this->profile_id == $profile->id) {
-            return true;
-        }
-
-        // Only for users on this site
-
-        if ($this->scope & Notice::SITE_SCOPE) {
-            $user = $profile->getUser();
-            if (empty($user)) {
+            if (empty($profile)) {
                 return false;
             }
-        }
 
-        // Only for users mentioned in the notice
+            // Author is always in scope
 
-        if ($this->scope & Notice::ADDRESSEE_SCOPE) {
-
-            // XXX: just query for the single reply
-
-            $replies = $this->getReplies();
-
-            if (!in_array($profile->id, $replies)) {
-                return false;
+            if ($this->profile_id == $profile->id) {
+                return true;
             }
-        }
 
-        // Only for members of the given group
+            // Only for users on this site
 
-        if ($this->scope & Notice::GROUP_SCOPE) {
-
-            // XXX: just query for the single membership
-
-            $groups = $this->getGroups();
-
-            $foundOne = false;
-
-            foreach ($groups as $group) {
-                if ($profile->isMember($group)) {
-                    $foundOne = true;
-                    break;
+            if ($scope & Notice::SITE_SCOPE) {
+                $user = $profile->getUser();
+                if (empty($user)) {
+                    return false;
                 }
             }
 
-            if (!$foundOne) {
-                return false;
+            // Only for users mentioned in the notice
+
+            if ($scope & Notice::ADDRESSEE_SCOPE) {
+
+                $repl = Reply::pkeyGet(array('notice_id' => $this->id,
+                                             'profile_id' => $profile->id));
+										 
+                if (empty($repl)) {
+                    return false;
+                }
+            }
+
+            // Only for members of the given group
+
+            if ($scope & Notice::GROUP_SCOPE) {
+
+                // XXX: just query for the single membership
+
+                $groups = $this->getGroups();
+
+                $foundOne = false;
+
+                foreach ($groups as $group) {
+                    if ($profile->isMember($group)) {
+                        $foundOne = true;
+                        break;
+                    }
+                }
+
+                if (!$foundOne) {
+                    return false;
+                }
+            }
+
+            // Only for followers of the author
+
+            $author = null;
+
+            if ($scope & Notice::FOLLOWER_SCOPE) {
+
+                try {
+                    $author = $this->getProfile();
+                } catch (Exception $e) {
+                    return false;
+                }
+        
+                if (!Subscription::exists($profile, $author)) {
+                    return false;
+                }
+            }
+
+            return !$this->isHiddenSpam($profile);
+        }
+    }
+
+    function isHiddenSpam($profile) {
+        
+        // Hide posts by silenced users from everyone but moderators.
+
+        if (common_config('notice', 'hidespam')) {
+
+            try {
+                $author = $this->getProfile();
+            } catch(Exception $e) {
+                // If we can't get an author, keep it hidden.
+                // XXX: technically not spam, but, whatever.
+                return true;
+            }
+
+            if ($author->hasRole(Profile_role::SILENCED)) {
+                if (empty($profile) || (($profile->id !== $author->id) && (!$profile->hasRight(Right::REVIEWSPAM)))) {
+                    return true;
+                }
             }
         }
 
-        // Only for followers of the author
-
-        if ($this->scope & Notice::FOLLOWER_SCOPE) {
-            $author = $this->getProfile();
-            if (!Subscription::exists($profile, $author)) {
-                return false;
-            }
-        }
-
-        return true;
+        return false;
     }
 
     static function groupsFromText($text, $profile)
@@ -2466,8 +2567,197 @@ class Notice extends Memcached_DataObject
     function __sleep()
     {
         $vars = parent::__sleep();
-        $skip = array('_original', '_profile');
+        $skip = array('_original', '_profile', '_groups', '_attachments', '_faves', '_replies', '_repeats');
         return array_diff($vars, $skip);
     }
+    
+    static function defaultScope()
+    {
+    	$scope = common_config('notice', 'defaultscope');
+    	if (is_null($scope)) {
+    		if (common_config('site', 'private')) {
+    			$scope = 1;
+    		} else {
+    			$scope = 0;
+    		}
+    	}
+    	return $scope;
+    }
 
+	static function fillProfiles($notices)
+	{
+		$map = self::getProfiles($notices);
+		
+		foreach ($notices as $notice) {
+			if (array_key_exists($notice->profile_id, $map)) {
+				$notice->_setProfile($map[$notice->profile_id]);    
+			}
+		}
+		
+		return array_values($map);
+	}
+	
+	static function getProfiles(&$notices)
+	{
+		$ids = array();
+		foreach ($notices as $notice) {
+			$ids[] = $notice->profile_id;
+		}
+		
+		$ids = array_unique($ids);
+		
+		return Memcached_DataObject::pivotGet('Profile', 'id', $ids); 
+	}
+	
+	static function fillGroups(&$notices)
+	{
+        $ids = self::_idsOf($notices);
+		
+		$gis = Memcached_DataObject::listGet('Group_inbox', 'notice_id', $ids);
+		
+        $gids = array();
+
+		foreach ($gis as $id => $gi)
+		{
+		    foreach ($gi as $g)
+		    {
+		        $gids[] = $g->group_id;
+		    }
+		}
+		
+		$gids = array_unique($gids);
+		
+		$group = Memcached_DataObject::pivotGet('User_group', 'id', $gids);
+		
+		foreach ($notices as $notice)
+		{
+			$grps = array();
+			$gi = $gis[$notice->id];
+			foreach ($gi as $g) {
+			    $grps[] = $group[$g->group_id];
+			}
+		    $notice->_setGroups($grps);
+		}
+	}
+
+    static function _idsOf(&$notices)
+    {
+		$ids = array();
+		foreach ($notices as $notice) {
+			$ids[] = $notice->id;
+		}
+		$ids = array_unique($ids);
+        return $ids;
+    }
+
+    static function fillAttachments(&$notices)
+    {
+        $ids = self::_idsOf($notices);
+
+		$f2pMap = Memcached_DataObject::listGet('File_to_post', 'post_id', $ids);
+		
+		$fileIds = array();
+		
+		foreach ($f2pMap as $noticeId => $f2ps) {
+            foreach ($f2ps as $f2p) {
+                $fileIds[] = $f2p->file_id;    
+            }
+        }
+
+        $fileIds = array_unique($fileIds);
+
+		$fileMap = Memcached_DataObject::pivotGet('File', 'id', $fileIds);
+
+		foreach ($notices as $notice)
+		{
+			$files = array();
+			$f2ps = $f2pMap[$notice->id];
+			foreach ($f2ps as $f2p) {
+			    $files[] = $fileMap[$f2p->file_id];
+			}
+		    $notice->_setAttachments($files);
+		}
+    }
+
+    protected $_faves;
+
+    /**
+     * All faves of this notice
+     *
+     * @return array Array of Fave objects
+     */
+
+    function getFaves()
+    {
+        if (isset($this->_faves) && is_array($this->_faves)) {
+            return $this->_faves;
+        }
+        $faveMap = Memcached_DataObject::listGet('Fave', 'notice_id', array($this->id));
+        $this->_faves = $faveMap[$this->id];
+        return $this->_faves;
+    }
+
+    function _setFaves($faves)
+    {
+        $this->_faves = $faves;
+    }
+
+    static function fillFaves(&$notices)
+    {
+        $ids = self::_idsOf($notices);
+        $faveMap = Memcached_DataObject::listGet('Fave', 'notice_id', $ids);
+        $cnt = 0;
+        $faved = array();
+        foreach ($faveMap as $id => $faves) {
+            $cnt += count($faves);
+            if (count($faves) > 0) {
+                $faved[] = $id;
+            }
+        }
+        foreach ($notices as $notice) {
+        	$faves = $faveMap[$notice->id];
+            $notice->_setFaves($faves);
+        }
+    }
+
+    static function fillReplies(&$notices)
+    {
+        $ids = self::_idsOf($notices);
+        $replyMap = Memcached_DataObject::listGet('Reply', 'notice_id', $ids);
+        foreach ($notices as $notice) {
+            $replies = $replyMap[$notice->id];
+            $ids = array();
+            foreach ($replies as $reply) {
+                $ids[] = $reply->profile_id;
+            }
+            $notice->_setReplies($ids);
+        }
+    }
+
+    protected $_repeats;
+
+    function getRepeats()
+    {
+        if (isset($this->_repeats) && is_array($this->_repeats)) {
+            return $this->_repeats;
+        }
+        $repeatMap = Memcached_DataObject::listGet('Notice', 'repeat_of', array($this->id));
+        $this->_repeats = $repeatMap[$this->id];
+        return $this->_repeats;
+    }
+
+    function _setRepeats($repeats)
+    {
+        $this->_repeats = $repeats;
+    }
+
+    static function fillRepeats(&$notices)
+    {
+        $ids = self::_idsOf($notices);
+        $repeatMap = Memcached_DataObject::listGet('Notice', 'repeat_of', $ids);
+        foreach ($notices as $notice) {
+        	$repeats = $repeatMap[$notice->id];
+            $notice->_setRepeats($repeats);
+        }
+    }
 }
diff --git a/classes/Notice_inbox.php b/classes/Notice_inbox.php
index 47ed6b22db..dcaf2f33b1 100644
--- a/classes/Notice_inbox.php
+++ b/classes/Notice_inbox.php
@@ -31,7 +31,7 @@ define('NOTICE_INBOX_GC_MAX', 12800);
 define('NOTICE_INBOX_LIMIT', 1000);
 define('NOTICE_INBOX_SOFT_LIMIT', 1000);
 
-class Notice_inbox extends Memcached_DataObject
+class Notice_inbox extends Managed_DataObject
 {
     ###START_AUTOCODE
     /* the code below is auto generated do not remove the above tag */
@@ -49,6 +49,27 @@ class Notice_inbox extends Memcached_DataObject
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
 
+    public static function schemaDef()
+    {
+        return array(
+            'description' => 'Obsolete; old entries here are converted to packed entries in the inbox table since 0.9',
+            'fields' => array(
+                'user_id' => array('type' => 'int', 'not null' => true, 'description' => 'user receiving the message'),
+                'notice_id' => array('type' => 'int', 'not null' => true, 'description' => 'notice received'),
+                'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date the notice was created'),
+                'source' => array('type' => 'int', 'size' => 'tiny', 'default' => 1, 'description' => 'reason it is in the inbox, 1=subscription'),
+            ),
+            'primary key' => array('user_id', 'notice_id'),
+            'foreign keys' => array(
+                'notice_inbox_user_id_fkey' => array('user', array('user_id' => 'id')),
+                'notice_inbox_notice_id_fkey' => array('notice', array('notice_id' => 'id')),
+            ),
+            'indexes' => array(
+                'notice_inbox_notice_id_idx' => array('notice_id'),
+            ),
+        );
+    }
+
     function stream($user_id, $offset, $limit, $since_id, $max_id, $own=false)
     {
         throw new Exception('Notice_inbox no longer used; use Inbox');
diff --git a/classes/Notice_source.php b/classes/Notice_source.php
index 43893ebe18..a6649f5fba 100644
--- a/classes/Notice_source.php
+++ b/classes/Notice_source.php
@@ -4,7 +4,7 @@
  */
 require_once INSTALLDIR.'/classes/Memcached_DataObject.php';
 
-class Notice_source extends Memcached_DataObject
+class Notice_source extends Managed_DataObject
 {
     ###START_AUTOCODE
     /* the code below is auto generated do not remove the above tag */
@@ -22,4 +22,19 @@ class Notice_source extends Memcached_DataObject
 
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
+
+    public static function schemaDef()
+    {
+        return array(
+            'fields' => array(
+                'code' => array('type' => 'varchar', 'length' => 32, 'not null' => true, 'description' => 'source code'),
+                'name' => array('type' => 'varchar', 'length' => 255, 'not null' => true, 'description' => 'name of the source'),
+                'url' => array('type' => 'varchar', 'length' => 255, 'not null' => true, 'description' => 'url to link to'),
+                'notice_id' => array('type' => 'int', 'not null' => true, 'description' => 'date this record was created'),
+                'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
+                'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
+            ),
+            'primary key' => array('code'),
+        );
+    }
 }
diff --git a/classes/Notice_tag.php b/classes/Notice_tag.php
index 809403a9bd..b9cbcd1069 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 Managed_DataObject
 {
     ###START_AUTOCODE
     /* the code below is auto generated do not remove the above tag */
@@ -36,6 +36,27 @@ class Notice_tag extends Memcached_DataObject
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
 
+    public static function schemaDef()
+    {
+        return array(
+            'description' => 'Hash tags',
+            'fields' => array(
+                'tag' => array('type' => 'varchar', 'length' => 64, 'not null' => true, 'description' => 'hash tag associated with this notice'),
+                'notice_id' => array('type' => 'int', 'not null' => true, 'description' => 'notice tagged'),
+                'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
+            ),
+            'primary key' => array('tag', 'notice_id'),
+            'foreign keys' => array(
+                'notice_tag_notice_id_fkey' => array('notice', array('notice_id' => 'id')),
+            ),
+            'indexes' => array(
+                'notice_tag_created_idx' => array('created'),
+                'notice_tag_notice_id_idx' => array('notice_id'),
+                'notice_tag_tag_created_notice_id_idx' => array('tag', 'created', 'notice_id')
+            ),
+        );
+    }
+    
     static function getStream($tag, $offset=0, $limit=20, $sinceId=0, $maxId=0)
     {
         $stream = new TagNoticeStream($tag);
diff --git a/classes/Oauth_application.php b/classes/Oauth_application.php
index f1d4fb7a6f..15faffe2fb 100644
--- a/classes/Oauth_application.php
+++ b/classes/Oauth_application.php
@@ -4,7 +4,7 @@
  */
 require_once INSTALLDIR.'/classes/Memcached_DataObject.php';
 
-class Oauth_application extends Memcached_DataObject
+class Oauth_application extends Managed_DataObject
 {
     ###START_AUTOCODE
     /* the code below is auto generated do not remove the above tag */
@@ -159,4 +159,35 @@ class Oauth_application extends Memcached_DataObject
         $oauser->application_id = $this->id;
         $oauser->delete();
     }
+
+    public static function schemaDef()
+    {
+        return array(
+            'description' => 'OAuth application registration record',
+            'fields' => array(
+                'id' => array('type' => 'serial', 'not null' => true, 'description' => 'unique identifier'),
+                'owner' => array('type' => 'int', 'not null' => true, 'description' => 'owner of the application'),
+                'consumer_key' => array('type' => 'varchar', 'length' => 255, 'not null' => true, 'description' => 'application consumer key'),
+                'name' => array('type' => 'varchar', 'length' => 255, 'not null' => true, 'description' => 'name of the application'),
+                'description' => array('type' => 'varchar', 'length' => 255, 'description' => 'description of the application'),
+                'icon' => array('type' => 'varchar', 'length' => 255, 'not null' => true, 'description' => 'application icon'),
+                'source_url' => array('type' => 'varchar', 'length' => 255, 'description' => 'application homepage - used for source link'),
+                'organization' => array('type' => 'varchar', 'length' => 255, 'description' => 'name of the organization running the application'),
+                'homepage' => array('type' => 'varchar', 'length' => 255, 'description' => 'homepage for the organization'),
+                'callback_url' => array('type' => 'varchar', 'length' => 255, 'description' => 'url to redirect to after authentication'),
+                'type' => array('type' => 'int', 'size' => 'tiny', 'default' => 0, 'description' => 'type of app, 1 = browser, 2 = desktop'),
+                'access_type' => array('type' => 'int', 'size' => 'tiny', 'default' => 0, 'description' => 'default access type, bit 1 = read, bit 2 = write'),
+                'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
+                'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
+            ),
+            'primary key' => array('id'),
+            'unique keys' => array(
+                'oauth_application_name_key' => array('name'), // in the long run, we should perhaps not force these unique, and use another source id
+            ),
+            'foreign keys' => array(
+                'oauth_application_owner_fkey' => array('profile', array('owner' => 'id')), // Are remote users allowed to create oauth application records?
+                'oauth_application_consumer_key_fkey' => array('consumer', array('consumer_key' => 'consumer_key')),
+            ),
+        );
+    }
 }
diff --git a/classes/Oauth_application_user.php b/classes/Oauth_application_user.php
index 834e38d2be..4d25672465 100644
--- a/classes/Oauth_application_user.php
+++ b/classes/Oauth_application_user.php
@@ -4,7 +4,7 @@
  */
 require_once INSTALLDIR.'/classes/Memcached_DataObject.php';
 
-class Oauth_application_user extends Memcached_DataObject
+class Oauth_application_user extends Managed_DataObject
 {
     ###START_AUTOCODE
     /* the code below is auto generated do not remove the above tag */
@@ -24,6 +24,25 @@ class Oauth_application_user extends Memcached_DataObject
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
 
+    public static function schemaDef()
+    {
+        return array(
+            'fields' => array(
+                'profile_id' => array('type' => 'int', 'not null' => true, 'description' => 'user of the application'),
+                'application_id' => array('type' => 'int', 'not null' => true, 'description' => 'id of the application'),
+                'access_type' => array('type' => 'int', 'size' => 'tiny', 'default' => 0, 'description' => 'access type, bit 1 = read, bit 2 = write'),
+                'token' => array('type' => 'varchar', 'length' => 255, 'description' => 'request or access token'),
+                'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
+                'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
+            ),
+            'primary key' => array('profile_id', 'application_id'),
+            'foreign keys' => array(
+                'oauth_application_user_profile_id_fkey' => array('profile', array('profile_id' => 'id')),
+                'oauth_application_user_application_id_fkey' => array('oauth_application', array('application_id' => 'id')),
+            ),
+        );
+    }
+
     static function getByUserAndToken($user, $token)
     {
         if (empty($user) || empty($token)) {
diff --git a/classes/Oauth_token_association.php b/classes/Oauth_token_association.php
index 66be22b5d3..17327d4b01 100644
--- a/classes/Oauth_token_association.php
+++ b/classes/Oauth_token_association.php
@@ -4,7 +4,7 @@
  */
 require_once INSTALLDIR . '/classes/Memcached_DataObject.php';
 
-class Oauth_token_association extends Memcached_DataObject
+class Oauth_token_association extends Managed_DataObject
 {
     ###START_AUTOCODE
     /* the code below is auto generated do not remove the above tag */
@@ -39,4 +39,23 @@ class Oauth_token_association extends Memcached_DataObject
 
         return empty($result) ? null : $oau;
     }
+
+    public static function schemaDef()
+    {
+        return array(
+            'description' => 'Associate an application ID and profile ID with an OAuth token',
+            'fields' => array(
+                'profile_id' => array('type' => 'int', 'not null' => true, 'description' => 'associated user'),
+                'application_id' => array('type' => 'int', 'not null' => true, 'description' => 'the application'),
+                'token' => array('type' => 'varchar', 'length' => '255', 'not null' => true, 'description' => 'token used for this association'),
+                'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
+                'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
+            ),
+            'primary key' => array('profile_id', 'application_id', 'token'),
+            'foreign keys' => array(
+                'oauth_token_association_profile_fkey' => array('profile_id', array('profile' => 'id')),
+                'oauth_token_association_application_fkey' => array('application_id', array('application' => 'id')),
+            )
+        );
+    }
 }
diff --git a/classes/Old_school_prefs.php b/classes/Old_school_prefs.php
new file mode 100644
index 0000000000..29e13ddc74
--- /dev/null
+++ b/classes/Old_school_prefs.php
@@ -0,0 +1,88 @@
+<?php
+/**
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2011, StatusNet, Inc.
+ *
+ * Older-style UI preferences
+ * 
+ * PHP version 5
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  UI
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2011 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    // This check helps protect against security problems;
+    // your code file can't be executed directly from the web.
+    exit(1);
+}
+
+/**
+ * Separate table for storing UI preferences
+ *
+ * @category  UI
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2011 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+
+class Old_school_prefs extends Managed_DataObject
+{
+    public $__table = 'old_school_prefs';             // table name
+    public $user_id;
+    public $stream_mode_only;
+    public $conversation_tree;
+    public $stream_nicknames;
+    public $created;
+    public $modified;
+
+    public static function schemaDef()
+    {
+        return array(
+            'fields' => array(
+                'user_id' => array('type' => 'int', 'not null' => true, 'description' => 'user who has the preference'),
+                'stream_mode_only' => array('type' => 'int', 
+                                            'size' => 'tiny', 
+                                            'default' => 1, 
+                                            'description' => 'No conversation streams'),
+                'conversation_tree' => array('type' => 'int', 
+                                            'size' => 'tiny', 
+                                            'default' => 1, 
+                                            'description' => 'Hierarchical tree view for conversations'),
+                'stream_nicknames' => array('type' => 'int', 
+                                            'size' => 'tiny', 
+                                            'default' => 1, 
+                                            'description' => 'Show nicknames for authors and addressees in streams'),
+                'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
+                'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
+            ),
+            'primary key' => array('user_id'),
+            'foreign keys' => array(
+                'old_school_prefs_user_id_fkey' => array('user', array('user_id' => 'id')),
+            ),
+        );
+    }
+
+    function staticGet($k,$v=NULL) {
+        return Memcached_DataObject::staticGet('Old_school_prefs',$k,$v);
+    }
+}
diff --git a/classes/Profile.php b/classes/Profile.php
index 2638f745f7..8a5be5f358 100644
--- a/classes/Profile.php
+++ b/classes/Profile.php
@@ -1,7 +1,7 @@
 <?php
 /*
  * StatusNet - the distributed open-source microblogging tool
- * Copyright (C) 2008, 2009, StatusNet, Inc.
+ * Copyright (C) 2008-2011, StatusNet, Inc.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -24,7 +24,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
  */
 require_once INSTALLDIR.'/classes/Memcached_DataObject.php';
 
-class Profile extends Memcached_DataObject
+class Profile extends Managed_DataObject
 {
     ###START_AUTOCODE
     /* the code below is auto generated do not remove the above tag */
@@ -49,6 +49,46 @@ class Profile extends Memcached_DataObject
         return Memcached_DataObject::staticGet('Profile',$k,$v);
     }
 
+    public static function schemaDef()
+    {
+        $def = array(
+            'description' => 'local and remote users have profiles',
+            'fields' => array(
+                'id' => array('type' => 'serial', 'not null' => true, 'description' => 'unique identifier'),
+                'nickname' => array('type' => 'varchar', 'length' => 64, 'not null' => true, 'description' => 'nickname or username', 'collate' => 'utf8_general_ci'),
+                'fullname' => array('type' => 'varchar', 'length' => 255, 'description' => 'display name', 'collate' => 'utf8_general_ci'),
+                'profileurl' => array('type' => 'varchar', 'length' => 255, 'description' => 'URL, cached so we dont regenerate'),
+                'homepage' => array('type' => 'varchar', 'length' => 255, 'description' => 'identifying URL', 'collate' => 'utf8_general_ci'),
+                'bio' => array('type' => 'text', 'description' => 'descriptive biography', 'collate' => 'utf8_general_ci'),
+                'location' => array('type' => 'varchar', 'length' => 255, 'description' => 'physical location', 'collate' => 'utf8_general_ci'),
+                'lat' => array('type' => 'numeric', 'precision' => 10, 'scale' => 7, 'description' => 'latitude'),
+                'lon' => array('type' => 'numeric', 'precision' => 10, 'scale' => 7, 'description' => 'longitude'),
+                'location_id' => array('type' => 'int', 'description' => 'location id if possible'),
+                'location_ns' => array('type' => 'int', 'description' => 'namespace for location'),
+
+                'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
+                'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
+            ),
+            'primary key' => array('id'),
+            'indexes' => array(
+                'profile_nickname_idx' => array('nickname'),
+            )
+        );
+
+        // Add a fulltext index
+
+        if (common_config('search', 'type') == 'fulltext') {
+            $def['fulltext indexes'] = array('nickname' => array('nickname', 'fullname', 'location', 'bio', 'homepage'));
+        }
+
+        return $def;
+    }
+
+	function multiGet($keyCol, $keyVals, $skipNulls=true)
+	{
+	    return parent::multiGet('Profile', $keyCol, $keyVals, $skipNulls);
+	}
+	
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
 
@@ -63,24 +103,61 @@ class Profile extends Memcached_DataObject
         return $this->_user;
     }
 
+    protected $_avatars;
+
     function getAvatar($width, $height=null)
     {
         if (is_null($height)) {
             $height = $width;
         }
 
-        $avatar = null;
+        $avatar = $this->_getAvatar($width);
 
-        if (Event::handle('StartProfileGetAvatar', array($this, $width, &$avatar))) {
-            $avatar = Avatar::pkeyGet(array('profile_id' => $this->id,
-                                            'width' => $width,
-                                            'height' => $height));
-            Event::handle('EndProfileGetAvatar', array($this, $width, &$avatar));
+        if (empty($avatar)) {
+
+            if (Event::handle('StartProfileGetAvatar', array($this, $width, &$avatar))) {
+                $avatar = Avatar::pkeyGet(
+                    array(
+                        'profile_id' => $this->id,
+                        'width'      => $width,
+                        'height'     => $height
+                    )
+                );
+                Event::handle('EndProfileGetAvatar', array($this, $width, &$avatar));
+            }
+
+            $this->_fillAvatar($width, $avatar);
         }
 
         return $avatar;
     }
 
+    // XXX: @Fix me gargargar
+    function _getAvatar($width)
+    {
+        if (empty($this->_avatars)) {
+            $this->_avatars = array();
+        }
+
+        // GAR! I cannot figure out where _avatars gets pre-filled with the avatar from
+        // the previously used profile! Please shoot me now! --Zach
+        if (array_key_exists($width, $this->_avatars)) {
+            // Don't return cached avatar unless it's really for this profile
+            if ($this->_avatars[$width]->profile_id == $this->id) {
+                return $this->_avatars[$width];
+            }
+        }
+
+        return null;
+    }
+
+    function _fillAvatar($width, $avatar)
+    {
+      //common_debug("Storing avatar of width: {$avatar->width} and profile_id {$avatar->profile_id} in profile {$this->id}.");
+        $this->_avatars[$width] = $avatar;
+
+    }
+
     function getOriginalAvatar()
     {
         $avatar = DB_DataObject::factory('avatar');
@@ -225,9 +302,14 @@ class Profile extends Memcached_DataObject
 
     function isMember($group)
     {
-        $gm = Group_member::pkeyGet(array('profile_id' => $this->id,
-                                          'group_id' => $group->id));
-        return (!empty($gm));
+    	$groups = $this->getGroups(0, null);
+    	$gs = $groups->fetchAll();
+    	foreach ($gs as $g) {
+    	    if ($group->id == $g->id) {
+    	        return true;
+    	    }
+    	}
+    	return false;
     }
 
     function isAdmin($group)
@@ -268,16 +350,11 @@ class Profile extends Memcached_DataObject
             self::cacheSet($keypart, implode(',', $ids));
         }
 
-        $groups = array();
-
-        foreach ($ids as $id) {
-            $group = User_group::staticGet('id', $id);
-            if (!empty($group)) {
-                $groups[] = $group;
-            }
+        if (!is_null($offset) && !is_null($limit)) {
+            $ids = array_slice($ids, $offset, $limit);
         }
 
-        return new ArrayWrapper($groups);
+        return User_group::multiGet('id', $ids);
     }
 
     function isTagged($peopletag)
@@ -383,41 +460,55 @@ class Profile extends Memcached_DataObject
         return new ArrayWrapper($lists);
     }
 
+    /**
+     * Get tags that other people put on this profile, in reverse-chron order
+     *
+     * @param (Profile|User) $auth_user  Authorized user (used for privacy)
+     * @param int            $offset     Offset from latest
+     * @param int            $limit      Max number to get
+     * @param datetime       $since_id   max date
+     * @param datetime       $max_id     min date
+     *
+     * @return Profile_list resulting lists
+     */
+
     function getOtherTags($auth_user=null, $offset=0, $limit=null, $since_id=0, $max_id=0)
     {
-        $lists = new Profile_list();
+        $list = new Profile_list();
 
-        $tags = new Profile_tag();
-        $tags->tagged = $this->id;
+        $qry = sprintf('select profile_list.*, unix_timestamp(profile_tag.modified) as "cursor" ' .
+                       'from profile_tag join profile_list '.
+                       'on (profile_tag.tagger = profile_list.tagger ' .
+                       '    and profile_tag.tag = profile_list.tag) ' .
+                       'where profile_tag.tagged = %d ',
+                       $this->id);
 
-        $lists->joinAdd($tags);
-        #@fixme: postgres (round(date_part('epoch', my_date)))
-        $lists->selectAdd('unix_timestamp(profile_tag.modified) as "cursor"');
 
         if ($auth_user instanceof User || $auth_user instanceof Profile) {
-            $lists->whereAdd('( ( profile_list.private = false ) ' .
-                             'OR ( profile_list.tagger = ' . $auth_user->id . ' AND ' .
-                             'profile_list.private = true ) )');
+            $qry .= sprintf('AND ( ( profile_list.private = false ) ' .
+                            'OR ( profile_list.tagger = %d AND ' .
+                            'profile_list.private = true ) )',
+                            $auth_user->id);
         } else {
-            $lists->private = false;
+            $qry .= 'AND profile_list.private = 0 ';
         }
 
-        if ($since_id>0) {
-           $lists->whereAdd('cursor > '.$since_id);
+        if ($since_id > 0) {
+            $qry .= sprintf('AND (cursor > %d) ', $since_id);
         }
 
-        if ($max_id>0) {
-            $lists->whereAdd('cursor <= '.$max_id);
+        if ($max_id > 0) {
+            $qry .= sprintf('AND (cursor < %d) ', $max_id);
         }
 
-        if($offset>=0 && !is_null($limit)) {
-            $lists->limit($offset, $limit);
+        $qry .= 'ORDER BY profile_tag.modified DESC ';
+
+        if ($offset >= 0 && !is_null($limit)) {
+            $qry .= sprintf('LIMIT %d OFFSET %d ', $limit, $offset);
         }
 
-        $lists->orderBy('profile_tag.modified DESC');
-        $lists->find();
-
-        return $lists;
+        $list->query($qry);
+        return $list;
     }
 
     function getPrivateTags($offset=0, $limit=null, $since_id=0, $max_id=0)
@@ -463,7 +554,8 @@ class Profile extends Memcached_DataObject
         $lists = new Profile_list();
         $subs = new Profile_tag_subscription();
 
-        $lists->joinAdd($subs);
+        $lists->joinAdd('id', 'profile_tag_subscription:profile_tag_id');
+
         #@fixme: postgres (round(date_part('epoch', my_date)))
         $lists->selectAdd('unix_timestamp(profile_tag_subscription.created) as "cursor"');
 
@@ -503,6 +595,8 @@ class Profile extends Memcached_DataObject
             if (Event::handle('StartJoinGroup', array($group, $this))) {
                 $join = Group_member::join($group->id, $this->id);
                 self::blow('profile:groups:%d', $this->id);
+                self::blow('group:member_ids:%d', $group->id);
+                self::blow('group:member_count:%d', $group->id);
                 Event::handle('EndJoinGroup', array($group, $this));
             }
         }
@@ -523,6 +617,8 @@ class Profile extends Memcached_DataObject
         if (Event::handle('StartLeaveGroup', array($group, $this))) {
             Group_member::leave($group->id, $this->id);
             self::blow('profile:groups:%d', $this->id);
+            self::blow('group:member_ids:%d', $group->id);
+            self::blow('group:member_count:%d', $group->id);
             Event::handle('EndLeaveGroup', array($group, $this));
         }
     }
@@ -590,7 +686,7 @@ class Profile extends Memcached_DataObject
         $profile = new Profile();
         $tagged = array();
 
-        $cnt = $profile->query(sprintf($qry, $this->id, $this->id, $tag));
+        $cnt = $profile->query(sprintf($qry, $this->id, $this->id, $profile->escape($tag)));
 
         while ($profile->fetch()) {
             $tagged[] = clone($profile);
@@ -728,7 +824,7 @@ class Profile extends Memcached_DataObject
 
         $faves = new Fave();
         $faves->user_id = $this->id;
-        $cnt = (int) $faves->count('distinct notice_id');
+        $cnt = (int) $faves->count('notice_id');
 
         if (!empty($c)) {
             $c->set(Cache::key('profile:fave_count:'.$this->id), $cnt);
@@ -1047,11 +1143,27 @@ class Profile extends Memcached_DataObject
     function silence()
     {
         $this->grantRole(Profile_role::SILENCED);
+        if (common_config('notice', 'hidespam')) {
+            $this->flushVisibility();
+        }
     }
 
     function unsilence()
     {
         $this->revokeRole(Profile_role::SILENCED);
+        if (common_config('notice', 'hidespam')) {
+            $this->flushVisibility();
+        }
+    }
+
+    function flushVisibility()
+    {
+        // Get all notices
+        $stream = new ProfileNoticeStream($this, $this);
+        $ids = $stream->getNoticeIds(0, CachingNoticeStream::CACHE_WINDOW);
+        foreach ($ids as $id) {
+            self::blow('notice:in-scope-for:%d:null', $id);
+        }
     }
 
     /**
@@ -1082,6 +1194,8 @@ class Profile extends Memcached_DataObject
             case Right::SILENCEUSER:
             case Right::DELETEUSER:
             case Right::DELETEGROUP:
+            case Right::TRAINSPAM:
+            case Right::REVIEWSPAM:
                 $result = $this->hasRole(Profile_role::MODERATOR);
                 break;
             case Right::CONFIGURESITE:
@@ -1240,13 +1354,8 @@ class Profile extends Memcached_DataObject
 
             if (!empty($user)) {
                 $uri = $user->uri;
-            } else {
-                // return OMB profile if any
-                $remote = Remote_profile::staticGet('id', $this->id);
-                if (!empty($remote)) {
-                    $uri = $remote->uri;
-                }
             }
+
             Event::handle('EndGetProfileUri', array($this, &$uri));
         }
 
@@ -1291,11 +1400,6 @@ class Profile extends Memcached_DataObject
             $user = User::staticGet('uri', $uri);
             if (!empty($user)) {
                 $profile = $user->getProfile();
-            } else {
-                $remote_profile = Remote_profile::staticGet('uri', $uri);
-                if (!empty($remote_profile)) {
-                    $profile = Profile::staticGet('id', $remote_profile->profile_id);
-                }
             }
             Event::handle('EndGetProfileFromURI', array($uri, $profile));
         }
@@ -1367,7 +1471,37 @@ class Profile extends Memcached_DataObject
     function __sleep()
     {
         $vars = parent::__sleep();
-        $skip = array('_user');
+        $skip = array('_user', '_avatars');
         return array_diff($vars, $skip);
     }
+    
+    static function fillAvatars(&$profiles, $width)
+    {
+    	$ids = array();
+    	foreach ($profiles as $profile) {
+            if (!empty($profile)) {
+                $ids[] = $profile->id;
+            }
+    	}
+    	
+    	$avatars = Avatar::pivotGet('profile_id', $ids, array('width' => $width,
+															  'height' => $width));
+    	
+    	foreach ($profiles as $profile) {
+            if (!empty($profile)) { // ???
+                $profile->_fillAvatar($width, $avatars[$profile->id]);
+            }
+    	}
+    }
+    
+    // Can't seem to find how to fix this.
+
+    function getProfile()
+    {
+        return $this;
+    }
+
+    static function pivotGet($key, $values, $otherCols=array()) {
+        return Memcached_DataObject::pivotGet('Profile', $key, $values, $otherCols);
+    }
 }
diff --git a/classes/Profile_block.php b/classes/Profile_block.php
index 2d87edaa0a..8506283462 100644
--- a/classes/Profile_block.php
+++ b/classes/Profile_block.php
@@ -25,7 +25,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
 require_once INSTALLDIR.'/classes/Memcached_DataObject.php';
 
-class Profile_block extends Memcached_DataObject
+class Profile_block extends Managed_DataObject
 {
     ###START_AUTOCODE
     /* the code below is auto generated do not remove the above tag */
@@ -42,6 +42,22 @@ class Profile_block extends Memcached_DataObject
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
 
+    public static function schemaDef()
+    {
+        return array(
+            'fields' => array(
+                'blocker' => array('type' => 'int', 'not null' => true, 'description' => 'user making the block'),
+                'blocked' => array('type' => 'int', 'not null' => true, 'description' => 'profile that is blocked'),
+                'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date of blocking'),
+            ),
+            'foreign keys' => array(
+                'profile_block_blocker_fkey' => array('user', array('blocker' => 'id')),
+                'profile_block_blocked_fkey' => array('profile', array('blocked' => 'id')),
+            ),
+            'primary key' => array('blocker', 'blocked'),
+        );
+    }
+
     function get($blocker, $blocked)
     {
         return Memcached_DataObject::pkeyGet('Profile_block',
diff --git a/classes/Profile_list.php b/classes/Profile_list.php
index 17c2ffd4f4..27001978b6 100644
--- a/classes/Profile_list.php
+++ b/classes/Profile_list.php
@@ -30,7 +30,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
  */
 require_once INSTALLDIR.'/classes/Memcached_DataObject.php';
 
-class Profile_list extends Memcached_DataObject
+class Profile_list extends Managed_DataObject
 {
     ###START_AUTOCODE
     /* the code below is auto generated do not remove the above tag */
@@ -49,11 +49,46 @@ class Profile_list extends Memcached_DataObject
     public $subscriber_count;                // smallint
 
     /* Static get */
-    function staticGet($k,$v=NULL) { return DB_DataObject::staticGet('Profile_list',$k,$v); }
+    function staticGet($k,$v=NULL) { return Memcached_DataObject::staticGet('Profile_list',$k,$v); }
 
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
 
+    public static function schemaDef()
+    {
+        return array(
+            'fields' => array(
+                'id' => array('type' => 'serial', 'not null' => true, 'description' => 'unique identifier'),
+                'tagger' => array('type' => 'int', 'not null' => true, 'description' => 'user making the tag'),
+                'tag' => array('type' => 'varchar', 'length' => 64, 'not null' => true, 'description' => 'people tag'),
+                'description' => array('type' => 'text', 'description' => 'description of the people tag'),
+                'private' => array('type' => 'int', 'size' => 'tiny', 'default' => 0, 'description' => 'is this tag private'),
+
+                'created' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date the tag was added'),
+                'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date the tag was modified'),
+
+                'uri' => array('type' => 'varchar', 'length' => 255, 'description' => 'universal identifier'),
+                'mainpage' => array('type' => 'varchar', 'length' => 255, 'description' => 'page to link to'),
+                'tagged_count' => array('type' => 'int', 'default' => 0, 'description' => 'number of people tagged with this tag by this user'),
+                'subscriber_count' => array('type' => 'int', 'default' => 0, 'description' => 'number of subscribers to this tag'),
+            ),
+            'primary key' => array('tagger', 'tag'),
+            'unique keys' => array(
+                'profile_list_id_key' => array('id')
+            ),
+            'foreign keys' => array(
+                'profile_list_tagger_fkey' => array('profile', array('tagger' => 'id')),
+            ),
+            'indexes' => array(
+                'profile_list_modified_idx' => array('modified'),
+                'profile_list_tag_idx' => array('tag'),
+                'profile_list_tagger_tag_idx' => array('tagger', 'tag'),
+                'profile_list_tagged_count_idx' => array('tagged_count'),
+                'profile_list_subscriber_count_idx' => array('subscriber_count'),
+            ),
+        );
+    }
+
     /**
      * return a profile_list record, given its tag and tagger.
      *
@@ -185,10 +220,12 @@ class Profile_list extends Memcached_DataObject
     function getSubscribers($offset=0, $limit=null, $since=0, $upto=0)
     {
         $subs = new Profile();
-        $sub = new Profile_tag_subscription();
-        $sub->profile_tag_id = $this->id;
 
-        $subs->joinAdd($sub);
+        $subs->joinAdd(
+            array('id', 'profile_tag_subscription:profile_id')
+        );
+        $subs->whereAdd('profile_tag_subscription.profile_tag_id = ' . $this->id);
+
         $subs->selectAdd('unix_timestamp(profile_tag_subscription.' .
                          'created) as "cursor"');
 
diff --git a/classes/Profile_role.php b/classes/Profile_role.php
index e7aa1f0f06..61ec9ba9df 100644
--- a/classes/Profile_role.php
+++ b/classes/Profile_role.php
@@ -27,7 +27,7 @@ if (!defined('STATUSNET')) {
 
 require_once INSTALLDIR.'/classes/Memcached_DataObject.php';
 
-class Profile_role extends Memcached_DataObject
+class Profile_role extends Managed_DataObject
 {
     ###START_AUTOCODE
     /* the code below is auto generated do not remove the above tag */
@@ -43,6 +43,22 @@ class Profile_role extends Memcached_DataObject
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
 
+    public static function schemaDef()
+    {
+        return array(
+            'fields' => array(
+                'profile_id' => array('type' => 'int', 'not null' => true, 'description' => 'account having the role'),
+                'role' => array('type' => 'varchar', 'length' => 32, 'not null' => true, 'description' => 'string representing the role'),
+                'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date the role was granted'),
+            ),
+            'primary key' => array('profile_id', 'role'),
+            'foreign keys' => array(
+                'profile_role_profile_id_fkey' => array('profile', array('profile_id' => 'id')),
+            ),
+            'indexes' => array('profile_role_role_created_profile_id_idx' => array('role', 'created', 'profile_id')),
+        );
+    }
+
     function pkeyGet($kv)
     {
         return Memcached_DataObject::pkeyGet('Profile_role', $kv);
diff --git a/classes/Profile_tag.php b/classes/Profile_tag.php
index 9e475e83ec..75cca8c22c 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 Managed_DataObject
 {
     ###START_AUTOCODE
     /* the code below is auto generated do not remove the above tag */
@@ -22,6 +22,30 @@ class Profile_tag extends Memcached_DataObject
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
 
+    public static function schemaDef()
+    {
+        return array(
+
+            'fields' => array(
+                'tagger' => array('type' => 'int', 'not null' => true, 'description' => 'user making the tag'),
+                'tagged' => array('type' => 'int', 'not null' => true, 'description' => 'profile tagged'),
+                'tag' => array('type' => 'varchar', 'length' => 64, 'not null' => true, 'description' => 'hash tag associated with this notice'),
+                'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date the tag was added'),
+            ),
+            'primary key' => array('tagger', 'tagged', 'tag'),
+            'foreign keys' => array(
+                'profile_tag_tagger_fkey' => array('profile', array('tagger' => 'id')),
+                'profile_tag_tagged_fkey' => array('profile', array('tagged' => 'id')),
+                'profile_tag_tag_fkey' => array('profile_list', array('tag' => 'tag')),
+            ),
+            'indexes' => array(
+                'profile_tag_modified_idx' => array('modified'),
+                'profile_tag_tagger_tag_idx' => array('tagger', 'tag'),
+                'profile_tag_tagged_idx' => array('tagged'),
+            ),
+        );
+    }
+
     function pkeyGet($kv) {
         return Memcached_DataObject::pkeyGet('Profile_tag', $kv);
     }
@@ -55,20 +79,17 @@ class Profile_tag extends Memcached_DataObject
             return $tags;
         }
 
-        $profile_tag = new Profile_tag();
-        $profile_list->tagger = $tagger;
-        $profile_tag->tagged = $tagged;
+        $qry = 'select profile_list.* from profile_list left join '.
+               'profile_tag on (profile_list.tag = profile_tag.tag and '.
+               'profile_list.tagger = profile_tag.tagger) where '.
+               'profile_tag.tagger = %d and profile_tag.tagged = %d ';
+        $qry = sprintf($qry, $tagger, $tagged);
 
-        $profile_list->selectAdd();
+        if (!$include_priv) {
+            $qry .= ' and profile_list.private = 0';
+        }
 
-        // only fetch id, tag, mainpage and
-        // private hoping this will be faster
-        $profile_list->selectAdd('profile_list.id, ' .
-                                 'profile_list.tag, ' .
-                                 'profile_list.mainpage, ' .
-                                 'profile_list.private');
-        $profile_list->joinAdd($profile_tag);
-        $profile_list->find();
+        $profile_list->query($qry);
 
         Profile_list::setCache($key, $profile_list);
 
@@ -78,23 +99,26 @@ class Profile_tag extends Memcached_DataObject
     static function getTagsArray($tagger, $tagged, $auth_user_id=null)
     {
         $ptag = new Profile_tag();
-        $ptag->tagger = $tagger;
-        $ptag->tagged = $tagged;
 
-        if ($tagger != $auth_user_id) {
-            $list = new Profile_list();
-            $list->private = false;
-            $ptag->joinAdd($list);
-            $ptag->selectAdd();
-            $ptag->selectAdd('profile_tag.tag');
+        $qry = sprintf('select profile_tag.tag '.
+                       'from profile_tag join profile_list '.
+                       ' on (profile_tag.tagger = profile_list.tagger ' .
+                       '     and profile_tag.tag = profile_list.tag) ' .
+                       'where profile_tag.tagger = %d ' .
+                       'and   profile_tag.tagged = %d ',
+                       $tagger, $tagged);
+
+        if ($auth_user_id != $tagger) {
+            $qry .= 'and profile_list.private = 0';
         }
 
         $tags = array();
-        $ptag->find();
+
+        $ptag->query($qry);
+
         while ($ptag->fetch()) {
             $tags[] = $ptag->tag;
         }
-        $ptag->free();
 
         return $tags;
     }
@@ -169,7 +193,7 @@ class Profile_tag extends Memcached_DataObject
             if ($profile_list->taggedCount() >= common_config('peopletag', 'maxpeople')) {
                 // TRANS: Client exception thrown when trying to add more people than allowed to a list.
                 throw new ClientException(sprintf(_('You already have %1$d or more people in list %2$s, ' .
-                                                    'which is the maximum allowed number.' .
+                                                    'which is the maximum allowed number. ' .
                                                     'Try unlisting others first.'),
                                                     common_config('peopletag', 'maxpeople'), $tag));
                 return false;
@@ -260,8 +284,11 @@ class Profile_tag extends Memcached_DataObject
                'tag = "%s", tagger = "%s" ' .
                'WHERE tag = "%s" ' .
                'AND tagger = "%s"';
-        $result = $tags->query(sprintf($qry, $new->tag, $new->tagger,
-                                             $orig->tag, $orig->tagger));
+        $result = $tags->query(sprintf($qry,
+                                       $tags->escape($new->tag),
+                                       $tags->escape($new->tagger),
+                                       $tags->escape($orig->tag),
+                                       $tags->escape($orig->tagger)));
 
         if (!$result) {
             common_log_db_error($tags, 'UPDATE', __FILE__);
@@ -283,8 +310,8 @@ class Profile_tag extends Memcached_DataObject
         $profile->query('SELECT profile.* ' .
                         'FROM profile JOIN profile_tag ' .
                         'ON profile.id = profile_tag.tagged ' .
-                        'WHERE profile_tag.tagger = ' . $tagger . ' ' .
-                        'AND profile_tag.tag = "' . $tag . '" ');
+                        'WHERE profile_tag.tagger = ' . $profile->escape($tagger) . ' ' .
+                        'AND profile_tag.tag = "' . $profile->escape($tag) . '" ');
         $tagged = array();
         while ($profile->fetch()) {
             $tagged[] = clone($profile);
diff --git a/classes/Profile_tag_subscription.php b/classes/Profile_tag_subscription.php
index 031405f531..ce4a57e870 100644
--- a/classes/Profile_tag_subscription.php
+++ b/classes/Profile_tag_subscription.php
@@ -4,7 +4,7 @@
  */
 require_once INSTALLDIR.'/classes/Memcached_DataObject.php';
 
-class Profile_tag_subscription extends Memcached_DataObject
+class Profile_tag_subscription extends Managed_DataObject
 {
     ###START_AUTOCODE
     /* the code below is auto generated do not remove the above tag */
@@ -22,6 +22,29 @@ class Profile_tag_subscription extends Memcached_DataObject
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
 
+    public static function schemaDef()
+    {
+        return array(
+            'fields' => array(
+                'profile_tag_id' => array('type' => 'int', 'not null' => true, 'description' => 'foreign key to profile_tag'),
+                'profile_id' => array('type' => 'int', 'not null' => true, 'description' => 'foreign key to profile table'),
+
+                'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
+                'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
+            ),
+            'primary key' => array('profile_tag_id', 'profile_id'),
+            'foreign keys' => array(
+                'profile_tag_subscription_profile_list_id_fkey' => array('profile_list', array('profile_tag_id' => 'id')),
+                'profile_tag_subscription_profile_id_fkey' => array('profile', array('profile_id' => 'id')),
+            ),
+            'indexes' => array(
+                // @fixme probably we want a (profile_id, created) index here?
+                'profile_tag_subscription_profile_id_idx' => array('profile_id'),
+                'profile_tag_subscription_created_idx' => array('created'),
+            ),
+        );
+    }
+
     function pkeyGet($kv)
     {
         return Memcached_DataObject::pkeyGet('Profile_tag_subscription', $kv);
diff --git a/classes/Queue_item.php b/classes/Queue_item.php
index d17e512b96..e34a89d2e3 100644
--- a/classes/Queue_item.php
+++ b/classes/Queue_item.php
@@ -4,7 +4,7 @@
  */
 require_once INSTALLDIR.'/classes/Memcached_DataObject.php';
 
-class Queue_item extends Memcached_DataObject
+class Queue_item extends Managed_DataObject
 {
     ###START_AUTOCODE
     /* the code below is auto generated do not remove the above tag */
@@ -22,6 +22,23 @@ class Queue_item extends Memcached_DataObject
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
 
+    public static function schemaDef()
+    {
+        return array(
+            'fields' => array(
+                'id' => array('type' => 'serial', 'not null' => true, 'description' => 'unique identifier'),
+                'frame' => array('type' => 'blob', 'not null' => true, 'description' => 'data: object reference or opaque string'),
+                'transport' => array('type' => 'varchar', 'length' => 8, 'not null' => true, 'description' => 'queue for what? "email", "xmpp", "sms", "irc", ...'), // @fixme 8 chars is too short; bump up.
+                'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
+                'claimed' => array('type' => 'datetime', 'description' => 'date this item was claimed'),
+            ),
+            'primary key' => array('id'),
+            'indexes' => array(
+                'queue_item_created_idx' => array('created'),
+            ),
+        );
+    }
+
     /**
      * @param mixed $transports name of a single queue or array of queues to pull from
      *                          If not specified, checks all queues in the system.
diff --git a/classes/Related_group.php b/classes/Related_group.php
index c00ad9c44e..67d6ce3fc7 100644
--- a/classes/Related_group.php
+++ b/classes/Related_group.php
@@ -3,7 +3,7 @@
  * Table Definition for related_group
  */
 
-class Related_group extends Memcached_DataObject
+class Related_group extends Managed_DataObject
 {
     ###START_AUTOCODE
     /* the code below is auto generated do not remove the above tag */
@@ -18,4 +18,22 @@ class Related_group extends Memcached_DataObject
 
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
+
+    public static function schemaDef()
+    {
+        return array(
+            // @fixme description for related_group?
+            'fields' => array(
+                'group_id' => array('type' => 'int', 'not null' => true, 'description' => 'foreign key to user_group'),
+                'related_group_id' => array('type' => 'int', 'not null' => true, 'description' => 'foreign key to user_group'),
+
+                'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
+            ),
+            'primary key' => array('group_id', 'related_group_id'),
+            'foreign keys' => array(
+                'related_group_group_id_fkey' => array('user_group', array('group_id' => 'id')),
+                'related_group_related_group_id_fkey' => array('user_group', array('related_group_id' => 'id')),
+            ),
+        );
+    }
 }
diff --git a/classes/Remember_me.php b/classes/Remember_me.php
index 3df7a99831..6523ad8174 100644
--- a/classes/Remember_me.php
+++ b/classes/Remember_me.php
@@ -4,7 +4,7 @@
  */
 require_once INSTALLDIR.'/classes/Memcached_DataObject.php';
 
-class Remember_me extends Memcached_DataObject
+class Remember_me extends Managed_DataObject
 {
     ###START_AUTOCODE
     /* the code below is auto generated do not remove the above tag */
@@ -23,8 +23,18 @@ class Remember_me extends Memcached_DataObject
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
 
-    function sequenceKey()
+    public static function schemaDef()
     {
-        return array(false, false);
-    }
+        return array(
+            'fields' => array(
+                'code' => array('type' => 'varchar', 'length' => 32, 'not null' => true, 'description' => 'good random code'),
+                'user_id' => array('type' => 'int', 'not null' => true, 'description' => 'user who is logged in'),
+                'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
+            ),
+            'primary key' => array('code'),
+            'foreign keys' => array(
+                'remember_me_user_id_fkey' => array('user', array('user_id' => 'id')),
+            ),
+        );
+    }    
 }
diff --git a/classes/Remote_profile.php b/classes/Remote_profile.php
index 1672e9f956..d59f97ada7 100644
--- a/classes/Remote_profile.php
+++ b/classes/Remote_profile.php
@@ -24,7 +24,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
  */
 require_once INSTALLDIR.'/classes/Memcached_DataObject.php';
 
-class Remote_profile extends Memcached_DataObject
+class Remote_profile extends Managed_DataObject
 {
     ###START_AUTOCODE
     /* the code below is auto generated do not remove the above tag */
@@ -54,4 +54,26 @@ class Remote_profile extends Memcached_DataObject
             throw new Exception(_("Missing profile."));
         }
     }
+
+    public static function schemaDef()
+    {
+        return array(
+            'description' => 'remote people (OMB)',
+            'fields' => array(
+                'id' => array('type' => 'int', 'not null' => true, 'description' => 'foreign key to profile table'),
+                'uri' => array('type' => 'varchar', 'length' => 255, 'description' => 'universally unique identifier, usually a tag URI'),
+                'postnoticeurl' => array('type' => 'varchar', 'length' => 255, 'description' => 'URL we use for posting notices'),
+                'updateprofileurl' => array('type' => 'varchar', 'length' => 255, 'description' => 'URL we use for updates to this profile'),
+                'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
+                'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
+            ),
+            'primary key' => array('id'),
+            'unique keys' => array(
+                'remote_profile_uri_key' => array('uri'),
+            ),
+            'foreign keys' => array(
+                'remote_profile_id_fkey' => array('profile', array('id' => 'id')),
+            ),
+        );
+    }
 }
diff --git a/classes/Reply.php b/classes/Reply.php
index 9ba623ba3f..f2c308fac4 100644
--- a/classes/Reply.php
+++ b/classes/Reply.php
@@ -4,7 +4,7 @@
  */
 require_once INSTALLDIR.'/classes/Memcached_DataObject.php';
 
-class Reply extends Memcached_DataObject
+class Reply extends Managed_DataObject
 {
     ###START_AUTOCODE
     /* the code below is auto generated do not remove the above tag */
@@ -22,6 +22,34 @@ class Reply extends Memcached_DataObject
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
 
+    public static function schemaDef()
+    {
+        return array(
+            'fields' => array(
+                'notice_id' => array('type' => 'int', 'not null' => true, 'description' => 'notice that is the reply'),
+                'profile_id' => array('type' => 'int', 'not null' => true, 'description' => 'profile replied to'),
+                'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
+                'replied_id' => array('type' => 'int', 'description' => 'notice replied to (not used, see notice.reply_to)'),
+            ),
+            'primary key' => array('notice_id', 'profile_id'),
+            'foreign keys' => array(
+                'reply_notice_id_fkey' => array('notice', array('notice_id' => 'id')),
+                'reply_profile_id_fkey' => array('profile', array('profile_id' => 'id')),
+            ),
+            'indexes' => array(
+                'reply_notice_id_idx' => array('notice_id'),
+                'reply_profile_id_idx' => array('profile_id'),
+                'reply_replied_id_idx' => array('replied_id'),
+                'reply_profile_id_modified_notice_id_idx' => array('profile_id', 'modified', 'notice_id')
+            ),
+        );
+    }    
+
+	function pkeyGet($kv)
+	{
+		return Memcached_DataObject::pkeyGet('Reply',$kv);   
+	}
+	
     /**
      * Wrapper for record insertion to update related caches
      */
diff --git a/classes/Schema_version.php b/classes/Schema_version.php
index 6b464c6d1d..4a3f939e93 100644
--- a/classes/Schema_version.php
+++ b/classes/Schema_version.php
@@ -3,7 +3,7 @@
  * Table Definition for schema_version
  */
 
-class Schema_version extends Memcached_DataObject
+class Schema_version extends Managed_DataObject
 {
     ###START_AUTOCODE
     /* the code below is auto generated do not remove the above tag */
@@ -19,4 +19,17 @@ class Schema_version extends Memcached_DataObject
 
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
+
+    public static function schemaDef()
+    {
+        return array(
+            'description' => 'To avoid checking database structure all the time, we store a checksum of the expected schema info for each table here. If it has not changed since the last time we checked the table, we can leave it as is.',
+            'fields' => array(
+                'table_name' => array('type' => 'varchar', 'length' => '64', 'not null' => true, 'description' => 'Table name'),
+                'checksum' => array('type' => 'varchar', 'length' => '64', 'not null' => true, 'description' => 'Checksum of schema array; a mismatch indicates we should check the table more thoroughly.'),
+                'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
+            ),
+            'primary key' => array('table_name'),
+        );
+    }
 }
diff --git a/classes/Session.php b/classes/Session.php
index 166b89815a..1a924b7964 100644
--- a/classes/Session.php
+++ b/classes/Session.php
@@ -23,7 +23,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
 require_once INSTALLDIR.'/classes/Memcached_DataObject.php';
 
-class Session extends Memcached_DataObject
+class Session extends Managed_DataObject
 {
     ###START_AUTOCODE
     /* the code below is auto generated do not remove the above tag */
@@ -40,6 +40,22 @@ class Session extends Memcached_DataObject
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
 
+    public static function schemaDef()
+    {
+        return array(
+            'fields' => array(
+                'id' => array('type' => 'varchar', 'length' => 32, 'not null' => true, 'description' => 'session ID'),
+                'session_data' => array('type' => 'text', 'description' => 'session data'),
+                'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
+                'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
+            ),
+            'primary key' => array('id'),
+            'indexes' => array(
+                'session_modified_idx' => array('modified'),
+            ),
+        );
+    }
+
     static function logdeb($msg)
     {
         if (common_config('sessions', 'debug')) {
diff --git a/classes/Sms_carrier.php b/classes/Sms_carrier.php
index 500cb4f043..08d83f08f2 100644
--- a/classes/Sms_carrier.php
+++ b/classes/Sms_carrier.php
@@ -4,7 +4,7 @@
  */
 require_once INSTALLDIR.'/classes/Memcached_DataObject.php';
 
-class Sms_carrier extends Memcached_DataObject
+class Sms_carrier extends Managed_DataObject
 {
     ###START_AUTOCODE
     /* the code below is auto generated do not remove the above tag */
@@ -27,4 +27,21 @@ class Sms_carrier extends Memcached_DataObject
     {
         return sprintf($this->email_pattern, $sms);
     }
+
+    public static function schemaDef()
+    {
+        return array(
+            'fields' => array(
+                'id' => array('type' => 'int', 'not null' => true, 'description' => 'primary key for SMS carrier'),
+                'name' => array('type' => 'varchar', 'length' => 64, 'description' => 'name of the carrier'),
+                'email_pattern' => array('type' => 'varchar', 'length' => 255, 'not null' => true, 'description' => 'sprintf pattern for making an email address from a phone number'),
+                'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
+                'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
+            ),
+            'primary key' => array('id'),
+            'unique keys' => array(
+                'sms_carrier_name_key' => array('name'),
+            ),
+        );
+    }
 }
diff --git a/classes/Status_network.php b/classes/Status_network.php
index c3acacf595..b7a7e1c0a7 100644
--- a/classes/Status_network.php
+++ b/classes/Status_network.php
@@ -56,8 +56,9 @@ class Status_network extends Safe_DataObject
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
 
-    static $cache = null;
-    static $cacheInitialized = false;
+    // XXX: made public so Status_network_tag can eff with it
+    public static $cache = null;
+    public static $cacheInitialized = false;
     static $base = null;
     static $wildcard = null;
 
@@ -91,12 +92,18 @@ class Status_network extends Safe_DataObject
             // or a single-process script which is switching
             // configurations.
             $persist = php_sapi_name() != 'cli' || self::$cacheInitialized;
-            if (is_array($servers)) {
-                foreach($servers as $server) {
-                    self::$cache->addServer($server, 11211, $persist);
+            if (!is_array($servers)) {
+                $servers = array($servers);
+            } 
+            foreach($servers as $server) {
+                $parts = explode(':', $server);
+                $server = $parts[0];
+                if (count($parts) > 1) {
+                    $port = $parts[1];
+                } else {
+                    $port = 11211;
                 }
-            } else {
-                self::$cache->addServer($servers, 11211, $persist);
+                self::$cache->addServer($server, $port, $persist);
             }
             self::$cacheInitialized = true;
         }
diff --git a/classes/Status_network_tag.php b/classes/Status_network_tag.php
index 00ff0d8520..4a7c3b51ff 100644
--- a/classes/Status_network_tag.php
+++ b/classes/Status_network_tag.php
@@ -111,8 +111,10 @@ class Status_network_tag extends Safe_DataObject
     function decache()
     {
         $key = 'status_network_tags:' . $this->site_id;
-        if (Status_network::$cache) {
-            Status_network::$cache->delete($key);
+        if (Status_network::$cache || Status_network::$cacheInitialized) {
+            // FIXME: this was causing errors, so I'm hiding them.
+            // I'm a big chicken and lazy.
+            @Status_network::$cache->delete($key);
         }
     }
 
diff --git a/classes/Subscription.php b/classes/Subscription.php
index 8af414b3a7..70ccd724be 100644
--- a/classes/Subscription.php
+++ b/classes/Subscription.php
@@ -24,7 +24,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
  */
 require_once INSTALLDIR.'/classes/Memcached_DataObject.php';
 
-class Subscription extends Memcached_DataObject
+class Subscription extends Managed_DataObject
 {
     const CACHE_WINDOW = 201;
     const FORCE = true;
@@ -39,9 +39,36 @@ class Subscription extends Memcached_DataObject
     public $sms;                             // tinyint(1)   default_1
     public $token;                           // varchar(255)
     public $secret;                          // varchar(255)
+    public $uri;                             // varchar(255)
     public $created;                         // datetime()   not_null
     public $modified;                        // timestamp()   not_null default_CURRENT_TIMESTAMP
 
+    public static function schemaDef()
+    {
+        return array(
+            'fields' => array(
+                'subscriber' => array('type' => 'int', 'not null' => true, 'description' => 'profile listening'),
+                'subscribed' => array('type' => 'int', 'not null' => true, 'description' => 'profile being listened to'),
+                'jabber' => array('type' => 'int', 'size' => 'tiny', 'default' => 1, 'description' => 'deliver jabber messages'),
+                'sms' => array('type' => 'int', 'size' => 'tiny', 'default' => 1, 'description' => 'deliver sms messages'),
+                'token' => array('type' => 'varchar', 'length' => 255, 'description' => 'authorization token'),
+                'secret' => array('type' => 'varchar', 'length' => 255, 'description' => 'token secret'),
+                'uri' => array('type' => 'varchar', 'length' => 255, 'description' => 'universally unique identifier'),
+                'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
+                'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
+            ),
+            'primary key' => array('subscriber', 'subscribed'),
+            'unique keys' => array(
+                'subscription_uri_key' => array('uri'),
+            ),
+            'indexes' => array(
+                'subscription_subscriber_idx' => array('subscriber', 'created'),
+                'subscription_subscribed_idx' => array('subscribed', 'created'),
+                'subscription_token_idx' => array('token'),
+            ),
+        );
+    }
+
     /* Static get */
     function staticGet($k,$v=null)
     { return Memcached_DataObject::staticGet('Subscription',$k,$v); }
@@ -138,6 +165,9 @@ class Subscription extends Memcached_DataObject
         $sub->jabber     = 1;
         $sub->sms        = 1;
         $sub->created    = common_sql_now();
+        $sub->uri        = self::newURI($sub->subscriber,
+                                        $sub->subscribed,
+                                        $sub->created);
 
         $result = $sub->insert();
 
@@ -198,29 +228,6 @@ class Subscription extends Memcached_DataObject
 
             assert(!empty($sub));
 
-            // @todo: move this block to EndSubscribe handler for
-            // OMB plugin when it exists.
-
-            if (!empty($sub->token)) {
-
-                $token = new Token();
-
-                $token->tok    = $sub->token;
-
-                if ($token->find(true)) {
-
-                    $result = $token->delete();
-
-                    if (!$result) {
-                        common_log_db_error($token, 'DELETE', __FILE__);
-                        // TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
-                        throw new Exception(_('Could not delete subscription OMB token.'));
-                    }
-                } else {
-                    common_log(LOG_ERR, "Couldn't find credentials with token {$token->tok}");
-                }
-            }
-
             $result = $sub->delete();
 
             if (!$result) {
@@ -255,16 +262,21 @@ class Subscription extends Memcached_DataObject
         $subscriber = Profile::staticGet('id', $this->subscriber);
         $subscribed = Profile::staticGet('id', $this->subscribed);
 
+        if (empty($subscriber)) {
+            throw new Exception(sprintf(_('No profile for the subscriber: %d'), $this->subscriber));
+        }
+
+        if (empty($subscribed)) {
+            throw new Exception(sprintf(_('No profile for the subscribed: %d'), $this->subscribed));
+        }
+
         $act = new Activity();
 
         $act->verb = ActivityVerb::FOLLOW;
 
         // XXX: rationalize this with the URL
 
-        $act->id   = TagURI::mint('follow:%d:%d:%s',
-                                  $subscriber->id,
-                                  $subscribed->id,
-                                  common_date_iso8601($this->created));
+        $act->id   = $this->getURI();
 
         $act->time    = strtotime($this->created);
         // TRANS: Activity title when subscribing to another person.
@@ -427,4 +439,21 @@ class Subscription extends Memcached_DataObject
 
         return $result;
     }
+
+    function getURI()
+    {
+        if (!empty($this->uri)) {
+            return $this->uri;
+        } else {
+            return self::newURI($this->subscriber, $this->subscribed, $this->created);
+        }
+    }
+
+    static function newURI($subscriber_id, $subscribed_id, $created)
+    {
+        return TagURI::mint('follow:%d:%d:%s',
+                            $subscriber_id,
+                            $subscribed_id,
+                            common_date_iso8601($created));
+    }
 }
diff --git a/classes/Token.php b/classes/Token.php
index a129d1fd11..8a6b46bbbb 100644
--- a/classes/Token.php
+++ b/classes/Token.php
@@ -4,7 +4,7 @@
  */
 require_once INSTALLDIR.'/classes/Memcached_DataObject.php';
 
-class Token extends Memcached_DataObject
+class Token extends Managed_DataObject
 {
     ###START_AUTOCODE
     /* the code below is auto generated do not remove the above tag */
@@ -26,4 +26,26 @@ class Token extends Memcached_DataObject
 
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
+    public static function schemaDef()
+    {
+        return array(
+            'description' => 'OAuth token record',
+            'fields' => array(
+                'consumer_key' => array('type' => 'varchar', 'length' => 255, 'not null' => true, 'description' => 'unique identifier, root URL'),
+                'tok' => array('type' => 'char', 'length' => 32, 'not null' => true, 'description' => 'identifying value'),
+                'secret' => array('type' => 'char', 'length' => 32, 'not null' => true, 'description' => 'secret value'),
+                'type' => array('type' => 'int', 'size' => 'tiny', 'not null' => true, 'default' => 0, 'description' => 'request or access'),
+                'state' => array('type' => 'int', 'size' => 'tiny', 'default' => 0, 'description' => 'for requests, 0 = initial, 1 = authorized, 2 = used'),
+                'verifier' => array('type' => 'varchar', 'length' => 255, 'description' => 'verifier string for OAuth 1.0a'),
+                'verified_callback' => array('type' => 'varchar', 'length' => 255, 'description' => 'verified callback URL for OAuth 1.0a'),
+
+                'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
+                'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
+            ),
+            'primary key' => array('consumer_key', 'tok'),
+            'foreign keys' => array(
+                'token_consumer_key_fkey' => array('consumer', array('consumer_key'=> 'consumer_key')),
+            ),
+        );
+    }
 }
diff --git a/classes/User.php b/classes/User.php
index 9f79549327..e8aaaf6a10 100644
--- a/classes/User.php
+++ b/classes/User.php
@@ -28,7 +28,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
 require_once INSTALLDIR.'/classes/Memcached_DataObject.php';
 require_once 'Validate.php';
 
-class User extends Memcached_DataObject
+class User extends Managed_DataObject
 {
     const SUBSCRIBE_POLICY_OPEN = 0;
     const SUBSCRIBE_POLICY_MODERATE = 1;
@@ -61,8 +61,6 @@ class User extends Memcached_DataObject
     public $subscribe_policy;                // tinyint(1)
     public $urlshorteningservice;            // varchar(50)   default_ur1.ca
     public $inboxed;                         // tinyint(1)
-    public $design_id;                       // int(4)
-    public $viewdesigns;                     // tinyint(1)   default_1
     public $private_stream;                  // tinyint(1)   default_0
     public $created;                         // datetime()   not_null
     public $modified;                        // timestamp()   not_null default_CURRENT_TIMESTAMP
@@ -73,6 +71,58 @@ class User extends Memcached_DataObject
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
 
+    public static function schemaDef()
+    {
+        return array(
+            'description' => 'local users',
+            'fields' => array(
+                'id' => array('type' => 'int', 'not null' => true, 'description' => 'foreign key to profile table'),
+                'nickname' => array('type' => 'varchar', 'length' => 64, 'description' => 'nickname or username, duped in profile'),
+                'password' => array('type' => 'varchar', 'length' => 255, 'description' => 'salted password, can be null for OpenID users'),
+                'email' => array('type' => 'varchar', 'length' => 255, 'description' => 'email address for password recovery etc.'),
+                'incomingemail' => array('type' => 'varchar', 'length' => 255, 'description' => 'email address for post-by-email'),
+                'emailnotifysub' => array('type' => 'int', 'size' => 'tiny', 'default' => 1, 'description' => 'Notify by email of subscriptions'),
+                'emailnotifyfav' => array('type' => 'int', 'size' => 'tiny', 'default' => 1, 'description' => 'Notify by email of favorites'),
+                'emailnotifynudge' => array('type' => 'int', 'size' => 'tiny', 'default' => 1, 'description' => 'Notify by email of nudges'),
+                'emailnotifymsg' => array('type' => 'int', 'size' => 'tiny', 'default' => 1, 'description' => 'Notify by email of direct messages'),
+                'emailnotifyattn' => array('type' => 'int', 'size' => 'tiny', 'default' => 1, 'description' => 'Notify by email of @-replies'),
+                'emailmicroid' => array('type' => 'int', 'size' => 'tiny', 'default' => 1, 'description' => 'whether to publish email microid'),
+                'language' => array('type' => 'varchar', 'length' => 50, 'description' => 'preferred language'),
+                'timezone' => array('type' => 'varchar', 'length' => 50, 'description' => 'timezone'),
+                'emailpost' => array('type' => 'int', 'size' => 'tiny', 'default' => 1, 'description' => 'Post by email'),
+                'sms' => array('type' => 'varchar', 'length' => 64, 'description' => 'sms phone number'),
+                'carrier' => array('type' => 'int', 'description' => 'foreign key to sms_carrier'),
+                'smsnotify' => array('type' => 'int', 'size' => 'tiny', 'default' => 0, 'description' => 'whether to send notices to SMS'),
+                'smsreplies' => array('type' => 'int', 'size' => 'tiny', 'default' => 0, 'description' => 'whether to send notices to SMS on replies'),
+                'smsemail' => array('type' => 'varchar', 'length' => 255, 'description' => 'built from sms and carrier'),
+                'uri' => array('type' => 'varchar', 'length' => 255, 'description' => 'universally unique identifier, usually a tag URI'),
+                'autosubscribe' => array('type' => 'int', 'size' => 'tiny', 'default' => 0, 'description' => 'automatically subscribe to users who subscribe to us'),
+                'subscribe_policy' => array('type' => 'int', 'size' => 'tiny', 'default' => 0, 'description' => '0 = anybody can subscribe; 1 = require approval'),
+                'urlshorteningservice' => array('type' => 'varchar', 'length' => 50, 'default' => 'internal', 'description' => 'service to use for auto-shortening URLs'),
+                'inboxed' => array('type' => 'int', 'size' => 'tiny', 'default' => 0, 'description' => 'has an inbox been created for this user?'),
+                'private_stream' => array('type' => 'int', 'size' => 'tiny', 'default' => 0, 'description' => 'whether to limit all notices to followers only'),
+
+                'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
+                'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
+            ),
+            'primary key' => array('id'),
+            'unique keys' => array(
+                'user_nickname_key' => array('nickname'),
+                'user_email_key' => array('email'),
+                'user_incomingemail_key' => array('incomingemail'),
+                'user_sms_key' => array('sms'),
+                'user_uri_key' => array('uri'),
+            ),
+            'foreign keys' => array(
+                'user_id_fkey' => array('profile', array('id' => 'id')),
+                'user_carrier_fkey' => array('sms_carrier', array('carrier' => 'id')),
+            ),
+            'indexes' => array(
+                'user_smsemail_idx' => array('smsemail'),
+            ),
+        );
+    }
+
     protected $_profile = -1;
 
     /**
@@ -293,7 +343,6 @@ class User extends Memcached_DataObject
         $user->emailmicroid = 1;
         $user->emailpost = 1;
         $user->jabbermicroid = 1;
-        $user->viewdesigns = 1;
 
         $user->created = common_sql_now();
 
@@ -687,7 +736,7 @@ class User extends Memcached_DataObject
 
         $profile = new Profile();
 
-        $cnt = $profile->query(sprintf($qry, $this->id, $tag));
+        $cnt = $profile->query(sprintf($qry, $this->id, $profile->escape($tag)));
 
         return $profile;
     }
@@ -709,16 +758,11 @@ class User extends Memcached_DataObject
 
         $profile = new Profile();
 
-        $profile->query(sprintf($qry, $this->id, $tag));
+        $profile->query(sprintf($qry, $this->id, $profile->escape($tag)));
 
         return $profile;
     }
 
-    function getDesign()
-    {
-        return Design::staticGet('id', $this->design_id);
-    }
-
     function hasRight($right)
     {
         $profile = $this->getProfile();
@@ -937,7 +981,7 @@ class User extends Memcached_DataObject
             return $user->nickname;
         } catch (Exception $e) {
             if (common_config('singleuser', 'enabled') && common_config('singleuser', 'nickname')) {
-                common_log(LOG_WARN, "Warning: code attempting to pull single-user nickname when the account does not exist. If this is not setup time, this is probably a bug.");
+                common_log(LOG_WARNING, "Warning: code attempting to pull single-user nickname when the account does not exist. If this is not setup time, this is probably a bug.");
                 return common_config('singleuser', 'nickname');
             }
             throw $e;
@@ -1008,4 +1052,163 @@ class User extends Memcached_DataObject
         $skip = array('_profile');
         return array_diff($vars, $skip);
     }
+
+    static function recoverPassword($nore)
+    {
+        $user = User::staticGet('email', common_canonical_email($nore));
+
+        if (!$user) {
+            try {
+                $user = User::staticGet('nickname', common_canonical_nickname($nore));
+            } catch (NicknameException $e) {
+                // invalid
+            }
+        }
+
+        // See if it's an unconfirmed email address
+
+        if (!$user) {
+            // Warning: it may actually be legit to have multiple folks
+            // who have claimed, but not yet confirmed, the same address.
+            // We'll only send to the first one that comes up.
+            $confirm_email = new Confirm_address();
+            $confirm_email->address = common_canonical_email($nore);
+            $confirm_email->address_type = 'email';
+            $confirm_email->find();
+            if ($confirm_email->fetch()) {
+                $user = User::staticGet($confirm_email->user_id);
+            } else {
+                $confirm_email = null;
+            }
+        } else {
+            $confirm_email = null;
+        }
+
+        if (!$user) {
+            // TRANS: Information on password recovery form if no known username or e-mail address was specified.
+            throw new ClientException(_('No user with that email address or username.'));
+            return;
+        }
+
+        // Try to get an unconfirmed email address if they used a user name
+
+        if (!$user->email && !$confirm_email) {
+            $confirm_email = new Confirm_address();
+            $confirm_email->user_id = $user->id;
+            $confirm_email->address_type = 'email';
+            $confirm_email->find();
+            if (!$confirm_email->fetch()) {
+                $confirm_email = null;
+            }
+        }
+
+        if (!$user->email && !$confirm_email) {
+            // TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.
+            throw new ClientException(_('No registered email address for that user.'));
+            return;
+        }
+
+        // Success! We have a valid user and a confirmed or unconfirmed email address
+
+        $confirm = new Confirm_address();
+        $confirm->code = common_confirmation_code(128);
+        $confirm->address_type = 'recover';
+        $confirm->user_id = $user->id;
+        $confirm->address = (!empty($user->email)) ? $user->email : $confirm_email->address;
+
+        if (!$confirm->insert()) {
+            common_log_db_error($confirm, 'INSERT', __FILE__);
+            // TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.
+            throw new ServerException(_('Error saving address confirmation.'));
+            return;
+        }
+
+         // @todo FIXME: needs i18n.
+        $body = "Hey, $user->nickname.";
+        $body .= "\n\n";
+        $body .= 'Someone just asked for a new password ' .
+                 'for this account on ' . common_config('site', 'name') . '.';
+        $body .= "\n\n";
+        $body .= 'If it was you, and you want to confirm, use the URL below:';
+        $body .= "\n\n";
+        $body .= "\t".common_local_url('recoverpassword',
+                                   array('code' => $confirm->code));
+        $body .= "\n\n";
+        $body .= 'If not, just ignore this message.';
+        $body .= "\n\n";
+        $body .= 'Thanks for your time, ';
+        $body .= "\n";
+        $body .= common_config('site', 'name');
+        $body .= "\n";
+
+        $headers = _mail_prepare_headers('recoverpassword', $user->nickname, $user->nickname);
+        // TRANS: Subject for password recovery e-mail.
+        mail_to_user($user, _('Password recovery requested'), $body, $headers, $confirm->address);
+    }
+
+    function streamModeOnly()
+    {
+        if (common_config('oldschool', 'enabled')) {
+            $osp = Old_school_prefs::staticGet('user_id', $this->id);
+            if (!empty($osp)) {
+                return $osp->stream_mode_only;
+            }
+        }
+
+        return false;
+    }
+
+    function conversationTree()
+    {
+        if (common_config('oldschool', 'enabled')) {
+            $osp = Old_school_prefs::staticGet('user_id', $this->id);
+            if (!empty($osp)) {
+                return $osp->conversation_tree;
+            }
+        }
+
+        return false;
+    }
+
+    function streamNicknames()
+    {
+        if (common_config('oldschool', 'enabled')) {
+            $osp = Old_school_prefs::staticGet('user_id', $this->id);
+            if (!empty($osp)) {
+                return $osp->stream_nicknames;
+            }
+        }
+        return false;
+    }
+
+    function registrationActivity()
+    {
+        $profile = $this->getProfile();
+
+        $service = new ActivityObject();
+
+        $service->type  = ActivityObject::SERVICE;
+        $service->title = common_config('site', 'name');
+        $service->link  = common_root_url();
+        $service->id    = $service->link;
+
+        $act = new Activity();
+
+        $act->actor = ActivityObject::fromProfile($profile);
+        $act->verb = ActivityVerb::JOIN;
+
+        $act->objects[] = $service;
+
+        $act->id = TagURI::mint('user:register:%d',
+                                $this->id);
+
+        $act->time = strtotime($this->created);
+
+        $act->title = _("Register");
+
+        $act->content = sprintf(_('%1$s joined %2$s.'),
+                                $profile->getBestName(),
+                                $service->title);
+        return $act;
+    }
 }
diff --git a/classes/User_group.php b/classes/User_group.php
index 75de535bd1..406537dd8a 100644
--- a/classes/User_group.php
+++ b/classes/User_group.php
@@ -3,10 +3,11 @@
  * Table Definition for user_group
  */
 
-class User_group extends Memcached_DataObject
+class User_group extends Managed_DataObject
 {
     const JOIN_POLICY_OPEN = 0;
     const JOIN_POLICY_MODERATE = 1;
+    const CACHE_WINDOW = 201;
 
     ###START_AUTOCODE
     /* the code below is auto generated do not remove the above tag */
@@ -22,7 +23,6 @@ class User_group extends Memcached_DataObject
     public $homepage_logo;                   // varchar(255)
     public $stream_logo;                     // varchar(255)
     public $mini_logo;                       // varchar(255)
-    public $design_id;                       // int(4)
     public $created;                         // datetime   not_null default_0000-00-00%2000%3A00%3A00
     public $modified;                        // timestamp   not_null default_CURRENT_TIMESTAMP
     public $uri;                             // varchar(255)  unique_key
@@ -34,10 +34,50 @@ class User_group extends Memcached_DataObject
     function staticGet($k,$v=NULL) {
         return Memcached_DataObject::staticGet('User_group',$k,$v);
     }
+    
+    function multiGet($keyCol, $keyVals, $skipNulls=true)
+    {
+        return parent::multiGet('User_group', $keyCol, $keyVals, $skipNulls);
+    }
 
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
 
+    public static function schemaDef()
+    {
+        return array(
+            'fields' => array(
+                'id' => array('type' => 'serial', 'not null' => true, 'description' => 'unique identifier'),
+
+                'nickname' => array('type' => 'varchar', 'length' => 64, 'description' => 'nickname for addressing'),
+                'fullname' => array('type' => 'varchar', 'length' => 255, 'description' => 'display name'),
+                'homepage' => array('type' => 'varchar', 'length' => 255, 'description' => 'URL, cached so we dont regenerate'),
+                'description' => array('type' => 'text', 'description' => 'group description'),
+                'location' => array('type' => 'varchar', 'length' => 255, 'description' => 'related physical location, if any'),
+
+                'original_logo' => array('type' => 'varchar', 'length' => 255, 'description' => 'original size logo'),
+                'homepage_logo' => array('type' => 'varchar', 'length' => 255, 'description' => 'homepage (profile) size logo'),
+                'stream_logo' => array('type' => 'varchar', 'length' => 255, 'description' => 'stream-sized logo'),
+                'mini_logo' => array('type' => 'varchar', 'length' => 255, 'description' => 'mini logo'),
+
+                'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
+                'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
+
+                'uri' => array('type' => 'varchar', 'length' => 255, 'description' => 'universal identifier'),
+                'mainpage' => array('type' => 'varchar', 'length' => 255, 'description' => 'page for group info to link to'),
+                'join_policy' => array('type' => 'int', 'size' => 'tiny', 'description' => '0=open; 1=requires admin approval'),      
+                'force_scope' => array('type' => 'int', 'size' => 'tiny', 'description' => '0=never,1=sometimes,-1=always'),
+            ),
+            'primary key' => array('id'),
+            'unique keys' => array(
+                'user_group_uri_key' => array('uri'),
+            ),
+            'indexes' => array(
+                'user_group_nickname_idx' => array('nickname'),
+            ),
+        );
+    }
+
     function defaultLogo($size)
     {
         static $sizenames = array(AVATAR_PROFILE_SIZE => 'profile',
@@ -102,27 +142,52 @@ class User_group extends Memcached_DataObject
         return !in_array($nickname, $blacklist);
     }
 
-    function getMembers($offset=0, $limit=null)
-    {
-        $qry =
-          'SELECT profile.* ' .
-          'FROM profile JOIN group_member '.
-          'ON profile.id = group_member.profile_id ' .
-          'WHERE group_member.group_id = %d ' .
-          'ORDER BY group_member.created DESC ';
+    function getMembers($offset=0, $limit=null) {
+        $ids = null;
+        if (is_null($limit) || $offset + $limit > User_group::CACHE_WINDOW) {
+            $ids = $this->getMemberIDs($offset,
+                                       $limit);
+        } else {
+            $key = sprintf('group:member_ids:%d', $this->id);
+            $window = self::cacheGet($key);
+            if ($window === false) {
+                $window = $this->getMemberIDs(0,
+                                              User_group::CACHE_WINDOW);
+                self::cacheSet($key, $window);
+            }
 
-        if ($limit != null) {
-            if (common_config('db','type') == 'pgsql') {
-                $qry .= ' LIMIT ' . $limit . ' OFFSET ' . $offset;
-            } else {
-                $qry .= ' LIMIT ' . $offset . ', ' . $limit;
+            $ids = array_slice($window,
+                               $offset,
+                               $limit);
+        }
+
+        return Profile::multiGet('id', $ids);
+    }
+
+    function getMemberIDs($offset=0, $limit=null)
+    {
+        $gm = new Group_member();
+
+        $gm->selectAdd();
+        $gm->selectAdd('profile_id');
+
+        $gm->group_id = $this->id;
+
+        $gm->orderBy('created DESC');
+
+        if (!is_null($limit)) {
+            $gm->limit($offset, $limit);
+        }
+
+        $ids = array();
+
+        if ($gm->find()) {
+            while ($gm->fetch()) {
+                $ids[] = $gm->profile_id;
             }
         }
 
-        $members = new Profile();
-
-        $members->query(sprintf($qry, $this->id));
-        return $members;
+        return $ids;
     }
 
     /**
@@ -157,17 +222,44 @@ class User_group extends Memcached_DataObject
 
     function getMemberCount()
     {
-        // XXX: WORM cache this
+        $key = sprintf("group:member_count:%d", $this->id);
 
-        $members = $this->getMembers();
-        $member_count = 0;
+        $cnt = self::cacheGet($key);
 
-        /** $member->count() doesn't work. */
-        while ($members->fetch()) {
-            $member_count++;
+        if (is_integer($cnt)) {
+            return (int) $cnt;
         }
 
-        return $member_count;
+        $mem = new Group_member();
+        $mem->group_id = $this->id;
+
+        // XXX: why 'distinct'?
+
+        $cnt = (int) $mem->count('distinct profile_id');
+
+        self::cacheSet($key, $cnt);
+
+        return $cnt;
+    }
+
+    function getBlockedCount()
+    {
+        // XXX: WORM cache this
+
+        $block = new Group_block();
+        $block->group_id = $this->id;
+
+        return $block->count();
+    }
+
+    function getQueueCount()
+    {
+        // XXX: WORM cache this
+
+        $queue = new Group_join_queue();
+        $queue->group_id = $this->id;
+
+        return $queue->count();
     }
 
     function getAdmins($offset=0, $limit=null)
@@ -339,11 +431,6 @@ class User_group extends Memcached_DataObject
         return null;
     }
 
-    function getDesign()
-    {
-        return Design::staticGet('id', $this->design_id);
-    }
-
     function getUserMembers()
     {
         // XXX: cache this
@@ -495,6 +582,18 @@ class User_group extends Memcached_DataObject
         // MAGICALLY put fields into current scope
         // @fixme kill extract(); it makes debugging absurdly hard
 
+		$defaults = array('nickname' => null,
+						  'fullname' => null,
+						  'homepage' => null,
+						  'description' => null,
+						  'location' => null,
+						  'uri' => null,
+						  'mainpage' => null,
+						  'aliases' => array(),
+						  'userid' => null);
+		
+		$fields = array_merge($defaults, $fields);
+		
         extract($fields);
 
         $group = new User_group();
diff --git a/classes/User_im_prefs.php b/classes/User_im_prefs.php
index 75be8969e0..90df216c54 100644
--- a/classes/User_im_prefs.php
+++ b/classes/User_im_prefs.php
@@ -29,7 +29,7 @@
 
 require_once INSTALLDIR.'/classes/Memcached_DataObject.php';
 
-class User_im_prefs extends Memcached_DataObject
+class User_im_prefs extends Managed_DataObject
 {
     ###START_AUTOCODE
     /* the code below is auto generated do not remove the above tag */
@@ -56,39 +56,28 @@ class User_im_prefs extends Memcached_DataObject
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
 
-    /*
-    DB_DataObject calculates the sequence key(s) by taking the first key returned by the keys() function.
-    In this case, the keys() function returns user_id as the first key. user_id is not a sequence, but
-    DB_DataObject's sequenceKey() will incorrectly think it is. Then, since the sequenceKey() is a numeric
-    type, but is not set to autoincrement in the database, DB_DataObject will create a _seq table and
-    manage the sequence itself. This is not the correct behavior for the user_id in this class.
-    So we override that incorrect behavior, and simply say there is no sequence key.
-    */
-    function sequenceKey()
+    public static function schemaDef()
     {
-        return array(false,false);
-    }
-
-    /**
-     * We have two compound keys with unique constraints:
-     * (transport, user_id) which is our primary key, and
-     * (transport, screenname) which is an additional constraint.
-     * 
-     * Currently there's not a way to represent that second key
-     * in the general keys list, so we're adding it here to the
-     * list of keys to use for caching, ensuring that it gets
-     * cleared as well when we change.
-     * 
-     * @return array of cache keys
-     */
-    function _allCacheKeys()
-    {
-        $ukeys = 'transport,screenname';
-        $uvals = $this->transport . ',' . $this->screenname;
-
-        $ckeys = parent::_allCacheKeys();
-        $ckeys[] = $this->cacheKey($this->tableName(), $ukeys, $uvals);
-        return $ckeys;
+        return array(
+            'fields' => array(
+                'user_id' => array('type' => 'int', 'not null' => true, 'description' => 'user'),
+                'screenname' => array('type' => 'varchar', 'length' => 255, 'not null' => true, 'description' => 'screenname on this service'),
+                'transport' => array('type' => 'varchar', 'length' => 255, 'not null' => true, 'description' => 'transport (ex xmpp, aim)'),
+                'notify' => array('type' => 'int', 'size' => 'tiny', 'not null' => true, 'default' => 0, 'description' => 'Notify when a new notice is sent'),
+                'replies' => array('type' => 'int', 'size' => 'tiny', 'not null' => true, 'default' => 0, 'description' => 'Send replies  from people not subscribed to'),
+                'microid' => array('type' => 'int', 'size' => 'tiny', 'not null' => true, 'default' => 1, 'description' => 'Publish a MicroID'),
+                'updatefrompresence' => array('type' => 'int', 'size' => 'tiny', 'not null' => true, 'default' => 0, 'description' => 'Send replies from people not subscribed to.'),
+                'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
+                'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
+            ),
+            'primary key' => array('user_id', 'transport'),
+            'unique keys' => array(
+                'transport_screenname_key' => array('transport', 'screenname'),
+            ),
+            'foreign keys' => array(
+                'user_im_prefs_user_id_fkey' => array('user', array('user_id' => 'id')),
+            ),
+        );
     }
 
 }
diff --git a/classes/User_location_prefs.php b/classes/User_location_prefs.php
index bd6029f97c..060ef41e83 100644
--- a/classes/User_location_prefs.php
+++ b/classes/User_location_prefs.php
@@ -29,7 +29,7 @@
 
 require_once INSTALLDIR.'/classes/Memcached_DataObject.php';
 
-class User_location_prefs extends Memcached_DataObject
+class User_location_prefs extends Managed_DataObject
 {
     ###START_AUTOCODE
     /* the code below is auto generated do not remove the above tag */
@@ -46,8 +46,19 @@ class User_location_prefs extends Memcached_DataObject
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
 
-    function sequenceKey()
+    public static function schemaDef()
     {
-        return array(false, false, false);
+        return array(
+            'fields' => array(
+                'user_id' => array('type' => 'int', 'not null' => true, 'description' => 'user who has the preference'),
+                'share_location' => array('type' => 'int', 'size' => 'tiny', 'default' => 1, 'description' => 'Whether to share location data'),
+                'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
+                'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
+            ),
+            'primary key' => array('user_id'),
+            'foreign keys' => array(
+                'user_location_prefs_user_id_fkey' => array('user', array('user_id' => 'id')),
+            ),
+        );
     }
 }
diff --git a/classes/User_urlshortener_prefs.php b/classes/User_urlshortener_prefs.php
index e0f85af012..f71adc9736 100755
--- a/classes/User_urlshortener_prefs.php
+++ b/classes/User_urlshortener_prefs.php
@@ -21,7 +21,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
-class User_urlshortener_prefs extends Memcached_DataObject
+class User_urlshortener_prefs extends Managed_DataObject
 {
     ###START_AUTOCODE
     /* the code below is auto generated do not remove the above tag */
@@ -40,9 +40,23 @@ class User_urlshortener_prefs extends Memcached_DataObject
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
 
-    function sequenceKey()
+    public static function schemaDef()
     {
-        return array(false, false, false);
+        return array(
+            'fields' => array(
+                'user_id' => array('type' => 'int', 'not null' => true, 'description' => 'user'),
+                'urlshorteningservice' => array('type' => 'varchar', 'length' => 50, 'default' => 'internal', 'description' => 'service to use for auto-shortening URLs'),
+                'maxurllength' => array('type' => 'int', 'not null' => true, 'description' => 'urls greater than this length will be shortened, 0 = always, null = never'),
+                'maxnoticelength' => array('type' => 'int', 'not null' => true, 'description' => 'notices with content greater than this value will have all urls shortened, 0 = always, null = never'),
+        
+                'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
+                'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
+            ),
+            'primary key' => array('user_id'),
+            'foreign keys' => array(
+                'user_urlshortener_prefs_user_id_fkey' => array('user', array('user_id' => 'id')),
+            ),
+        );
     }
 
     static function maxUrlLength($user)
diff --git a/classes/User_username.php b/classes/User_username.php
index ae7785cc9f..652e7bd141 100644
--- a/classes/User_username.php
+++ b/classes/User_username.php
@@ -4,7 +4,7 @@
  */
 require_once INSTALLDIR.'/classes/Memcached_DataObject.php';
 
-class User_username extends Memcached_DataObject
+class User_username extends Managed_DataObject
 {
     ###START_AUTOCODE
     /* the code below is auto generated do not remove the above tag */
diff --git a/classes/statusnet.ini b/classes/statusnet.ini
deleted file mode 100644
index c5c126a133..0000000000
--- a/classes/statusnet.ini
+++ /dev/null
@@ -1,720 +0,0 @@
-[avatar]
-profile_id = 129
-original = 17
-width = 129
-height = 129
-mediatype = 130
-filename = 2
-url = 2
-created = 142
-modified = 384
-
-[avatar__keys]
-profile_id = K
-width = K
-height = K
-url = U
-
-[config]
-section = 130
-setting = 130
-value = 2
-
-[config__keys]
-section = K
-setting = K
-
-[confirm_address]
-code = 130
-user_id = 129
-address = 130
-address_extra = 130
-address_type = 130
-claimed = 14
-sent = 14
-modified = 384
-
-[confirm_address__keys]
-code = K
-
-[consumer]
-consumer_key = 130
-consumer_secret = 130
-seed = 130
-created = 142
-modified = 384
-
-[consumer__keys]
-consumer_key = K
-
-[conversation]
-id = 129
-uri = 2
-created = 142
-modified = 384
-
-[conversation__keys]
-id = N
-uri = U
-
-[deleted_notice]
-id = 129
-profile_id = 129
-uri = 2
-created = 142
-deleted = 142
-
-[deleted_notice__keys]
-id = K
-uri = U
-
-[design]
-id = 129
-backgroundcolor = 1
-contentcolor = 1
-sidebarcolor = 1
-textcolor = 1
-linkcolor = 1
-backgroundimage = 2
-disposition = 17
-
-[design__keys]
-id = N
-
-[fave]
-notice_id = 129
-user_id = 129
-modified = 384
-
-[fave__keys]
-notice_id = K
-user_id = K
-
-[file]
-id = 129
-url = 2
-mimetype = 2
-size = 1
-title = 2
-date = 1
-protected = 1
-filename = 2
-modified = 384
-
-[file__keys]
-id = N
-url = U
-
-[file_oembed]
-file_id = 129
-version = 2
-type = 2
-mimetype = 2
-provider = 2
-provider_url = 2
-width = 1
-height = 1
-html = 34
-title = 2
-author_name = 2
-author_url = 2
-url = 2
-modified = 384
-
-[file_oembed__keys]
-file_id = K
-
-[file_redirection]
-url = 130
-file_id = 1
-redirections = 1
-httpcode = 1
-modified = 384
-
-[file_redirection__keys]
-url = K
-
-[file_thumbnail]
-file_id = 129
-url = 2
-width = 1
-height = 1
-modified = 384
-
-[file_thumbnail__keys]
-file_id = K
-url = U
-
-[file_to_post]
-file_id = 129
-post_id = 129
-modified = 384
-
-[file_to_post__keys]
-file_id = K
-post_id = K
-
-[foreign_link]
-user_id = 129
-foreign_id = 129
-service = 129
-credentials = 2
-noticesync = 145
-friendsync = 145
-profilesync = 145
-last_noticesync = 14
-last_friendsync = 14
-created = 142
-modified = 384
-
-[foreign_link__keys]
-user_id = K
-foreign_id = K
-service = K
-
-[foreign_service]
-id = 129
-name = 130
-description = 2
-created = 142
-modified = 384
-
-[foreign_service__keys]
-id = K
-name = U
-
-[foreign_subscription]
-service = 129
-subscriber = 129
-subscribed = 129
-created = 142
-
-[foreign_subscription__keys]
-service = K
-subscriber = K
-subscribed = K
-
-[foreign_user]
-id = 129
-service = 129
-uri = 130
-nickname = 2
-created = 142
-modified = 384
-
-[foreign_user__keys]
-id = K
-service = K
-uri = U
-
-[group_alias]
-alias = 130
-group_id = 129
-modified = 384
-
-[group_alias__keys]
-alias = K
-
-[group_block]
-group_id = 129
-blocked = 129
-blocker = 129
-modified = 384
-
-[group_block__keys]
-group_id = K
-blocked = K
-
-[group_inbox]
-group_id = 129
-notice_id = 129
-created = 142
-
-[group_inbox__keys]
-group_id = K
-notice_id = K
-
-[group_member]
-group_id = 129
-profile_id = 129
-is_admin = 17
-created = 142
-modified = 384
-
-[group_member__keys]
-group_id = K
-profile_id = K
-
-[inbox]
-user_id = 129
-notice_ids = 66
-
-[inbox__keys]
-user_id = K
-
-[invitation]
-code = 130
-user_id = 129
-address = 130
-address_type = 130
-created = 142
-registered_user_id = 1
-
-[invitation__keys]
-code = K
-
-[local_group]
-group_id = 129
-nickname = 2
-created = 142
-modified = 384
-
-[local_group__keys]
-group_id = K
-nickname = U
-
-[location_namespace]
-id = 129
-description = 2
-created = 142
-modified = 384
-
-[location_namespace__keys]
-id = K
-
-[login_token]
-user_id = 129
-token = 130
-created = 142
-modified = 384
-
-[login_token__keys]
-user_id = K
-
-[message]
-id = 129
-uri = 2
-from_profile = 129
-to_profile = 129
-content = 34
-rendered = 34
-url = 2
-created = 142
-modified = 384
-source = 2
-
-[message__keys]
-id = N
-
-[nonce]
-consumer_key = 130
-tok = 2
-nonce = 130
-ts = 142
-created = 142
-modified = 384
-
-[nonce__keys]
-consumer_key = K
-nonce = K
-ts = K
-
-[notice]
-id = 129
-profile_id = 129
-uri = 2
-content = 34
-rendered = 34
-url = 2
-created = 142
-modified = 384
-reply_to = 1
-is_local = 17
-source = 2
-conversation = 1
-lat = 1
-lon = 1
-location_id = 1
-location_ns = 1
-repeat_of = 1
-object_type = 2
-scope = 1
-
-[notice__keys]
-id = N
-
-[notice_inbox]
-user_id = 129
-notice_id = 129
-created = 142
-source = 17
-
-[notice_inbox__keys]
-user_id = K
-notice_id = K
-
-[notice_source]
-code = 130
-name = 130
-url = 130
-created = 142
-modified = 384
-
-[notice_source__keys]
-code = K
-
-[notice_tag]
-tag = 130
-notice_id = 129
-created = 142
-
-[notice_tag__keys]
-tag = K
-notice_id = K
-
-[oauth_application]
-id = 129
-owner = 129
-consumer_key = 130
-name = 130
-description = 2
-icon = 130
-source_url = 2
-organization = 2
-homepage = 2
-callback_url = 2
-type = 17
-access_type = 17
-created = 142
-modified = 384
-
-[oauth_application__keys]
-id = N
-name = U
-
-[oauth_application_user]
-profile_id = 129
-application_id = 129
-access_type = 17
-token = 2
-created = 142
-modified = 384
-
-[oauth_application_user__keys]
-profile_id = K
-application_id = K
-
-[oauth_token_association]
-profile_id = 129
-application_id = 129
-token = 130
-created = 142
-modified = 384
-
-[oauth_token_association__keys]
-profile_id = K
-application_id = K
-token = K
-
-[profile]
-id = 129
-nickname = 130
-fullname = 2
-profileurl = 2
-homepage = 2
-bio = 34
-location = 2
-lat = 1
-lon = 1
-location_id = 1
-location_ns = 1
-created = 142
-modified = 384
-
-[profile__keys]
-id = N
-
-[profile_block]
-blocker = 129
-blocked = 129
-modified = 384
-
-[profile_block__keys]
-blocker = K
-blocked = K
-
-[profile_role]
-profile_id = 129
-role = 130
-created = 142
-
-[profile_role__keys]
-profile_id = K
-role = K
-
-[profile_tag]
-tagger = 129
-tagged = 129
-tag = 130
-modified = 384
-
-[profile_tag__keys]
-tagger = K
-tagged = K
-tag = K
-
-[profile_list]
-id = 129
-tagger = 129
-tag = 130
-description = 34
-private = 17
-created = 142
-modified = 384
-uri = 130
-mainpage = 130
-tagged_count = 129
-subscriber_count = 129
-
-[profile_list__keys]
-id = U
-tagger = K
-tag = K
-
-[profile_tag_subscription]
-profile_tag_id = 129
-profile_id = 129
-created = 142
-modified = 384 
-
-[profile_tag_subscription__keys]
-profile_tag_id = K
-profile_id = K
-
-[queue_item]
-id = 129
-frame = 194
-transport = 130
-created = 142
-claimed = 14
-
-[queue_item__keys]
-id = N
-
-[related_group]
-group_id = 129
-related_group_id = 129
-created = 142
-
-[related_group__keys]
-group_id = K
-related_group_id = K
-
-[remember_me]
-code = 130
-user_id = 129
-modified = 384
-
-[remember_me__keys]
-code = K
-
-[remote_profile]
-id = 129
-uri = 2
-postnoticeurl = 2
-updateprofileurl = 2
-created = 142
-modified = 384
-
-[remote_profile__keys]
-id = K
-uri = U
-
-[reply]
-notice_id = 129
-profile_id = 129
-modified = 142
-;modified = 384 ; skipping the mysql_timestamp mode so we can override its setting
-replied_id = 1
-
-[reply__keys]
-notice_id = K
-profile_id = K
-
-[schema_version]
-table_name = 130
-checksum = 130
-modified = 384
-
-[schema_version__keys]
-table_name = K
-
-[session]
-id = 130
-session_data = 34
-created = 142
-modified = 384
-
-[session__keys]
-id = K
-
-[sms_carrier]
-id = 129
-name = 2
-email_pattern = 130
-created = 142
-modified = 384
-
-[sms_carrier__keys]
-id = K
-name = U
-
-[subscription]
-subscriber = 129
-subscribed = 129
-jabber = 17
-sms = 17
-token = 2
-secret = 2
-created = 142
-modified = 384
-
-[subscription__keys]
-subscriber = K
-subscribed = K
-
-[token]
-consumer_key = 130
-tok = 130
-secret = 130
-type = 145
-state = 17
-verifier = 2
-verified_callback = 2
-created = 142
-modified = 384
-
-[token__keys]
-consumer_key = K
-tok = K
-
-[user]
-id = 129
-nickname = 2
-password = 2
-email = 2
-incomingemail = 2
-emailnotifysub = 17
-emailnotifyfav = 17
-emailnotifynudge = 17
-emailnotifymsg = 17
-emailnotifyattn = 17
-emailmicroid = 17
-language = 2
-timezone = 2
-emailpost = 17
-sms = 2
-carrier = 1
-smsnotify = 17
-smsreplies = 17
-smsemail = 2
-uri = 2
-autosubscribe = 17
-subscribe_policy = 17
-urlshorteningservice = 2
-inboxed = 17
-design_id = 1
-viewdesigns = 17
-private_stream = 17
-created = 142
-modified = 384
-
-[user__keys]
-id = K
-nickname = U
-email = U
-incomingemail = U
-sms = U
-uri = U
-
-[user_group]
-id = 129
-nickname = 2
-fullname = 2
-homepage = 2
-description = 34
-location = 2
-original_logo = 2
-homepage_logo = 2
-stream_logo = 2
-mini_logo = 2
-design_id = 1
-created = 142
-modified = 384
-uri = 2
-mainpage = 2
-join_policy = 1
-force_scope = 1
-
-[user_group__keys]
-id = N
-
-[user_openid]
-canonical = 130
-display = 130
-user_id = 129
-created = 142
-modified = 384
-
-[user_openid__keys]
-canonical = K
-display = U
-
-[user_openid_trustroot]
-trustroot = 130
-user_id = 129
-created = 142
-modified = 384
-
-[user_openid__keys]
-trustroot = K
-user_id = K
-
-[user_location_prefs]
-user_id = 129
-share_location = 17
-created = 142
-modified = 384
-
-[user_location_prefs__keys]
-user_id = K
-
-[user_im_prefs]
-user_id = 129
-screenname = 130
-transport = 130
-notify = 17
-replies = 17
-microid = 17
-updatefrompresence = 17
-created = 142
-modified = 384
-
-[user_im_prefs__keys]
-user_id = K
-transport = K
-; There's another unique index on (transport, screenname)
-; but we have no way to represent a compound index other than
-; the primary key in here. To ensure proper cache purging,
-; we need to tweak the class.
-
-[user_urlshortener_prefs]
-user_id = 129
-urlshorteningservice = 2
-maxurllength = 129
-maxnoticelength = 129
-created = 142
-modified = 384
-
-[user_urlshortener_prefs__keys]
-user_id = K
diff --git a/classes/statusnet.links.ini b/classes/statusnet.links.ini
deleted file mode 100644
index 17a8c40085..0000000000
--- a/classes/statusnet.links.ini
+++ /dev/null
@@ -1,74 +0,0 @@
-[avatar]
-profile_id = profile:id
-
-[user]
-id = profile:id
-carrier = sms_carrier:id
-
-[remote_profile]
-id = profile:id
-
-[notice]
-profile_id = profile:id
-reply_to = notice:id
-profile_id = profile_tag:tagged
-
-[reply]
-notice_id = notice:id
-profile_id = profile:id
-
-[token]
-consumer_key = consumer:consumer_key
-
-; Compatibility hack for PHP 5.3
-; This entry has been moved to the class definition, as commas are no longer
-; considered valid in keys, causing parse_ini_file() to reject the whole file.
-;[nonce]
-;consumer_key,token = token:consumer_key,token
-
-[confirm_address]
-user_id = user:id
-
-[remember_me]
-user_id = user:id
-
-[queue_item]
-notice_id = notice:id
-
-[subscription]
-subscriber = profile:id
-subscribed = profile:id
-
-[fave]
-notice_id = notice:id
-user_id = user:id
-
-[file_oembed]
-file_id = file:id
-
-[file_redirection]
-file_id = file:id
-
-[file_thumbnail]
-file_id = file:id
-
-[file_to_post]
-file_id = file:id
-post_id = notice:id
-
-[profile_list]
-tagger = profile:id
-
-[profile_tag]
-tagger = profile:id
-tagged = profile:id
-; in class definition:
-;tag,tagger = profile_list:tag,tagger
-
-[profile_list]
-tagger = profile:id
-
-[profile_tag_subscription]
-profile_tag_id = profile_list:id
-profile_id = profile:id
-
diff --git a/config.php.sample b/config.php.sample
deleted file mode 100644
index 5378ad973d..0000000000
--- a/config.php.sample
+++ /dev/null
@@ -1,303 +0,0 @@
-<?php
-/* -*- mode: php -*- */
-
-if (!defined('STATUSNET')) { exit(1); }
-
-// If you have downloaded libraries in random little places, you
-// can add the paths here
-
-// $extra_path = array("/opt/php-openid-2.0.1", "/usr/local/share/php");
-// set_include_path(implode(PATH_SEPARATOR, $extra_path) . PATH_SEPARATOR . get_include_path());
-
-// We get called by common.php, $config is a tree with lots of config
-// options
-// These are for configuring your URLs
-
-$config['site']['name'] = 'Just another StatusNet microblog';
-$config['site']['server'] = 'localhost';
-$config['site']['path'] = 'statusnet';
-// $config['site']['fancy'] = false;
-// $config['site']['theme'] = 'default';
-// Sets the site's default design values
-// $config['design']['backgroundcolor'] = '#F0F2F5';
-// $config['design']['contentcolor'] = '#FFFFFF';
-// $config['design']['sidebarcolor'] = '#CEE1E9';
-// $config['design']['textcolor'] = '#000000';
-// $config['design']['linkcolor'] = '#002E6E';
-// $config['design']['backgroundimage'] = null;
-// $config['design']['disposition'] = 1;
-// 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...
-// $config['site']['broughtby'] = 'Individual or Company';
-// $config['site']['broughtbyurl'] = 'http://example.net/';
-// If you don't want to let users register (say, for a one-person install)
-// Crude but effective -- register everybody, then lock down
-// $config['site']['closed'] = true;
-// Only allow registration for people invited by another user
-// $config['site']['inviteonly'] = true;
-// Make the site invisible to  non-logged-in users
-// $config['site']['private'] = true;
-
-// If your web server supports X-Sendfile (Apache with mod_xsendfile,
-// lighttpd, nginx), you can enable X-Sendfile support for better
-// performance. Presently, only attachment serving when the site is
-// in private mode will use X-Sendfile.
-// $config['site']['use_x_sendfile'] = false;
-// You may also need to enable X-Sendfile support for your web server and
-// allow it to access files outside of the web root. For Apache with
-// mod_xsendfile, you can add these to your .htaccess or server config:
-//
-//       XSendFile on
-//       XSendFileAllowAbove on
-//
-// See http://tn123.ath.cx/mod_xsendfile/ for mod_xsendfile.
-
-// If you want logging sent to a file instead of syslog
-// $config['site']['logfile'] = '/tmp/statusnet.log';
-
-// Change the syslog facility that StatusNet logs to (default is LOG_USER)
-// $config['syslog']['facility'] = LOG_LOCAL7;
-
-// Enables extra log information, for example full details of PEAR DB errors
-// $config['site']['logdebug'] = true;
-
-// To set your own logo, overriding the one in the theme
-// $config['site']['logo'] = '/mylogo.png';
-
-// 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
-
-$config['db']['database'] = 'mysql://statusnet:microblog@localhost/statusnet';
-// $config['db']['ini_your_db_name'] = $config['db']['schema_location'].'/statusnet.ini';
-// *** WARNING *** WARNING *** WARNING *** WARNING ***
-// Setting debug to a non-zero value will expose your DATABASE PASSWORD to Web users.
-// !!!!!! DO NOT SET THIS ON PRODUCTION SERVERS !!!!!! DB_DataObject's bug, btw, not
-// ours.
-// *** WARNING *** WARNING *** WARNING *** WARNING ***
-// $config['db']['debug'] = 0;
-// $config['db']['db_driver'] = 'MDB2';
-
-// Database type. For mysql, these defaults are fine. For postgresql, set
-// 'quote_identifiers' to true and 'type' to 'pgsql':
-// $config['db']['quote_identifiers'] = false;
-// $config['db']['type'] = 'mysql';
-
-// session_set_cookie_params(0, '/'. $config['site']['path'] .'/');
-
-// Standard fancy-url clashes prevented by not allowing nicknames on a blacklist
-// Add your own here. Note: empty array by default
-// $config['nickname']['blacklist'][] = 'scobleizer';
-
-// sphinx search
-$config['sphinx']['enabled'] = false;
-$config['sphinx']['server'] = 'localhost';
-$config['sphinx']['port'] = 3312;
-
-// Users to populate the 'Featured' tab
-// $config['nickname']['featured'][] = 'scobleizer';
-
-// xmpp
-// $config['xmpp']['enabled'] = false;
-// $config['xmpp']['server'] = 'server.example.net';
-// $config['xmpp']['host'] = NULL;	// Only set if different from server
-// $config['xmpp']['port'] = 5222;
-// $config['xmpp']['user'] = 'update';
-// $config['xmpp']['encryption'] = false;
-// $config['xmpp']['resource'] = 'uniquename';
-// $config['xmpp']['password'] = 'blahblahblah';
-// $config['xmpp']['public'][] = 'someindexer@example.net';
-// $config['xmpp']['debug'] = false;
-
-// Turn off invites
-// $config['invite']['enabled'] = false;
-
-// Default locale info
-// $config['site']['timezone'] = 'Pacific/Auckland';
-// $config['site']['language'] = 'en_NZ';
-
-// When validating user supplied email addresses, validate if the domain
-// is running an SMTP server.
-// $config['mail']['check_domain'] = true;
-
-// Email info, used for all outbound email
-// $config['mail']['notifyfrom'] = 'microblog@example.net';
-// Domain for generating no-reply and incoming email addresses, if enabled.
-// Defaults to site server name.
-// $config['mail']['domain'] = 'microblog.example.net';
-// See http://pear.php.net/manual/en/package.mail.mail.factory.php for options
-// $config['mail']['backend'] = 'smtp';
-// $config['mail']['params'] = array(
-// 							'host' => 'localhost',
-// 							'port' => 25,
-// 							);
-
-// exponential decay factor for tags, default 10 days
-// raise this if traffic is slow, lower it if it's fast
-// $config['tag']['dropoff'] = 86400.0 * 10;
-
-// exponential decay factor for popular (most favorited notices)
-// default 10 days -- similar to tag dropoff
-// $config['popular']['dropoff'] = 86400.0 * 10;
-
-// optionally show non-local messages in public timeline
-// $config['public']['localonly'] = false;
-
-// hide certain users from public pages, by ID
-// $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.
-// $config['queue']['enabled'] = true;
-
-// Queue subsystem
-// subsystems: internal (default) or stomp
-// using stomp requires an external message queue server
-// $config['queue']['subsystem'] = 'stomp';
-// $config['queue']['stomp_server'] = 'tcp://localhost:61613';
-// use different queue_basename for each statusnet instance managed by the server
-// $config['queue']['queue_basename'] = '/queue/statusnet/';
-
-// The following customise the behaviour of the various daemons:
-// $config['daemon']['piddir'] = '/var/run';
-// $config['daemon']['user'] = false;
-// $config['daemon']['group'] = false;
-
-// For installations with high traffic, statusnet can use MemCached to cache
-// frequently requested information. Only enable the following if you have
-// MemCached up and running:
-// $config['memcached']['enabled'] = false;
-// $config['memcached']['server'] = 'localhost';
-// $config['memcached']['port'] = 11211;
-
-// People tags
-// Maximum number of tags a user can create:
-// $config['peopletag']['maxtags'] = 100;
-// Maximum number of people can have the same tag by the same user
-// $config['peopletag']['maxpeople'] = 500;
-// Types of users one can tag.
-// Everyone.
-// $config['peopletag']['allow_tagging']['all'] = true;
-// Local only.
-// $config['peopletag']['allow_tagging']['local'] = true;
-// Subscriptions / Subscribers only (including remote)
-// $config['peopletag']['allow_tagging']['subs'] = true;
-// Remote.
-// $config['peopletag']['allow_tagging']['remote'] = true;
-// Examples:
-// The following set of options allows tagging local users and
-// remote subscribers / subscription.
-// $config['peopletag']['allow_tagging']['all'] = false;
-// $config['peopletag']['allow_tagging']['local'] = true;
-// $config['peopletag']['allow_tagging']['subs'] = true;
-// Or:
-// $config['peopletag']['allow_tagging'] = array('local' => true, 'subs' =>true);
-
-// Disable post-by-email
-// $config['emailpost']['enabled'] = false;
-
-// Disable SMS
-// $config['sms']['enabled'] = false;
-
-// Twitter integration source attribute. Note: default is StatusNet
-// $config['integration']['source'] = 'StatusNet';
-
-// Enable bidirectional Twitter bridge
-//
-// NOTE: if you enable this you must also set $config['avatar']['path']
-//
-// $config['twitterimport']['enabled'] = true;
-
-// Twitter OAuth settings. Documentation is at http://apiwiki.twitter.com/OAuth-FAQ
-// $config['twitter']['consumer_key']    = 'YOURKEY';
-// $config['twitter']['consumer_secret'] = 'YOURSECRET';
-
-// Edit throttling. Off by default. If turned on, you can only post 20 notices
-// every 10 minutes. Admins may want to play with the settings to minimize inconvenience for
-// real users without getting uncontrollable floods from spammers or runaway bots.
-
-// $config['throttle']['enabled'] = true;
-// $config['throttle']['count'] = 100;
-// $config['throttle']['timespan'] = 3600;
-
-// 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');
-
-// Use Templating (template: /tpl/index.php)
-// require_once('plugins/TemplatePlugin.php');
-// $tpl = new TemplatePlugin();
-
-// Don't allow saying the same thing more than once per hour
-// $config['site']['dupelimit'] = 3600;
-// Don't enforce the dupe limit
-// $config['site']['dupelimit'] = -1;
-
-// Base string for minting Tag URIs in Atom feeds. Defaults to
-// "yourserver,2009". This needs to be configured properly for your Atom
-// feeds to validate.  See: http://www.faqs.org/rfcs/rfc4151.html and
-// http://taguri.org/ Examples:
-// $config['integration']['taguri'] = 'example.net,2008';
-// $config['integration']['taguri'] = 'admin@example.net,2009-03-09'
-
-// Don't use SSL
-// $config['site']['ssl'] = 'never';
-// Use SSL only for sensitive pages (like login, password change)
-// $config['site']['ssl'] = 'sometimes';
-// Use SSL for all pages
-// $config['site']['ssl'] = 'always';
-
-// Use a different hostname for SSL-encrypted pages
-// $config['site']['sslserver'] = 'secure.example.org';
-
-// Indent HTML and XML
-// Enable (default) for easier to read markup for developers,
-// disable to save some bandwidth.
-// $config['site']['indent'] = true;
-
-// If you have a lot of status networks on the same server, you can
-// store the site data in a database and switch as follows
-// Status_network::setupDB('localhost', 'statusnet', 'statuspass', 'statusnet');
-// if (!Status_network::setupSite($_server, $_path)) {
-//        print "Error\n";
-//        exit(1);
-// }
-
-// How often to send snapshots; in # of web hits. Ideally,
-// try to do this once per month (that is, make this equal to number
-// of hits per month)
-// $config['snapshot']['frequency'] = 10000;
-// If you don't want to report statistics to the central server, uncomment.
-// $config['snapshot']['run'] = 'never';
-// If you want to report statistics in a cron job instead.
-// $config['snapshot']['run'] = 'cron';
-
-// Support for file uploads (attachments),
-// select supported mimetypes and quotas (in bytes)
-// $config['attachments']['supported'] = array('image/png', 'application/ogg');
-// $config['attachments']['supported'] = true; //allow all file types to be uploaded
-
-// $config['attachments']['file_quota'] = 5000000;
-// $config['attachments']['user_quota'] = 50000000;
-// $config['attachments']['monthly_quota'] = 15000000;
-// $config['attachments']['uploads'] = true;
-// $config['attachments']['path'] = "/file/"; //ignored if site is private
-// $config['attachments']['dir'] = INSTALLDIR . '/file/';
-
-// $config['oohembed']['endpoint'] = 'http://oohembed.com/oohembed/';
diff --git a/db/074to080.sql b/db/074to080.sql
deleted file mode 100644
index e3631e214a..0000000000
--- a/db/074to080.sql
+++ /dev/null
@@ -1,121 +0,0 @@
-alter table user
-     add column design_id integer comment 'id of a design' references design(id),
-     add column viewdesigns tinyint default 1 comment 'whether to view user-provided designs';
-
-alter table notice add column
-     conversation integer comment 'id of root notice in this conversation' references notice (id),
-     add index notice_conversation_idx (conversation);
-
-alter table foreign_user
-     modify column id bigint not null comment 'unique numeric key on foreign service';
-
-alter table foreign_link
-     modify column foreign_id bigint unsigned comment 'link to user on foreign service, if exists';
-
-alter table user_group
-      add column design_id integer comment 'id of a design' references design(id);
-
-create table file (
-    id integer primary key auto_increment,
-    url varchar(255) comment 'destination URL after following redirections',
-    mimetype varchar(50) comment 'mime type of resource',
-    size integer comment 'size of resource when available',
-    title varchar(255) comment 'title of resource when available',
-    date integer(11) comment 'date of resource according to http query',
-    protected integer(1) comment 'true when URL is private (needs login)',
-    filename varchar(255) comment 'if a local file, name of the file',
-    modified timestamp comment 'date this record was modified',
-
-    unique(url)
-) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_general_ci;
-
-create table file_oembed (
-    file_id integer primary key comment 'oEmbed for that URL/file' references file (id),
-    version varchar(20) comment 'oEmbed spec. version',
-    type varchar(20) comment 'oEmbed type: photo, video, link, rich',
-    provider varchar(50) comment 'name of this oEmbed provider',
-    provider_url varchar(255) comment 'URL of this oEmbed provider',
-    width integer comment 'width of oEmbed resource when available',
-    height integer comment 'height of oEmbed resource when available',
-    html text comment 'html representation of this oEmbed resource when applicable',
-    title varchar(255) comment 'title of oEmbed resource when available',
-    author_name varchar(50) comment 'author name for this oEmbed resource',
-    author_url varchar(255) comment 'author URL for this oEmbed resource',
-    url varchar(255) comment 'URL for this oEmbed resource when applicable (photo, link)',
-    modified timestamp comment 'date this record was modified'
-
-) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_general_ci;
-
-create table file_redirection (
-
-    url varchar(255) primary key comment 'short URL (or any other kind of redirect) for file (id)',
-    file_id integer comment 'short URL for what URL/file' references file (id),
-    redirections integer comment 'redirect count',
-    httpcode integer comment 'HTTP status code (20x, 30x, etc.)',
-    modified timestamp comment 'date this record was modified'
-
-) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
-
-create table file_thumbnail (
-
-    file_id integer primary key comment 'thumbnail for what URL/file' references file (id),
-    url varchar(255) comment 'URL of thumbnail',
-    width integer comment 'width of thumbnail',
-    height integer comment 'height of thumbnail',
-    modified timestamp comment 'date this record was modified',
-
-    unique(url)
-) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
-
-create table file_to_post (
-
-    file_id integer comment 'id of URL/file' references file (id),
-    post_id integer comment 'id of the notice it belongs to' references notice (id),
-    modified timestamp comment 'date this record was modified',
-
-    constraint primary key (file_id, post_id)
-
-) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
-
-create table design (
-    id integer primary key auto_increment comment 'design ID',
-    backgroundcolor integer comment 'main background color',
-    contentcolor integer comment 'content area background color',
-    sidebarcolor integer comment 'sidebar background color',
-    textcolor integer comment 'text color',
-    linkcolor integer comment 'link color',
-    backgroundimage varchar(255) comment 'background image, if any',
-    disposition tinyint default 1 comment 'bit 1 = hide background image, bit 2 = display background image, bit 4 = tile background image'
-) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
-
-create table group_block (
-   group_id integer not null comment 'group profile is blocked from' references user_group (id),
-   blocked integer not null comment 'profile that is blocked' references profile (id),
-   blocker integer not null comment 'user making the block' references user (id),
-   modified timestamp comment 'date of blocking',
-
-   constraint primary key (group_id, blocked)
-
-) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
-
-create table group_alias (
-
-   alias varchar(64) primary key comment 'additional nickname for the group',
-   group_id integer not null comment 'group profile is blocked from' references user_group (id),
-   modified timestamp comment 'date alias was created',
-
-   index group_alias_group_id_idx (group_id)
-
-) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
-
-create table session (
-
-    id varchar(32) primary key comment 'session ID',
-    session_data text comment 'session data',
-    created datetime not null comment 'date this record was created',
-    modified timestamp comment 'date this record was modified',
-
-    index session_modified_idx (modified)
-
-) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
-
diff --git a/db/074to080_pg.sql b/db/074to080_pg.sql
deleted file mode 100644
index 0a7171ae56..0000000000
--- a/db/074to080_pg.sql
+++ /dev/null
@@ -1,108 +0,0 @@
-BEGIN;
-create sequence design_seq;
-create table design (
-    id bigint default nextval('design_seq') /* comment 'design ID'*/,
-    backgroundcolor integer /* comment 'main background color'*/ ,
-    contentcolor integer /*comment 'content area background color'*/ ,
-    sidebarcolor integer /*comment 'sidebar background color'*/ ,
-    textcolor integer /*comment 'text color'*/ ,
-    linkcolor integer /*comment 'link color'*/,
-    backgroundimage varchar(255) /*comment 'background image, if any'*/,
-    disposition int default 1 /*comment 'bit 1 = hide background image, bit 2 = display background image, bit 4 = tile background image'*/,
-    primary key (id)
-);
-alter table "user"
-     add column design_id integer references design(id);
-alter table "user"
-     add column viewdesigns integer default 1;
-
-alter table notice add column
-     conversation integer references notice (id);
-
-create index notice_conversation_idx on notice(conversation);
-
-alter table foreign_user
-     alter column id TYPE bigint;
-     
-alter table foreign_user alter column id set not null;
-
-alter table foreign_link
-     alter column foreign_id TYPE bigint;
-
-alter table user_group
-      add column design_id integer;
-
-/*attachments and URLs stuff */
-create sequence file_seq;
-create table file (
-    id bigint default nextval('file_seq') primary key /* comment 'unique identifier' */,
-    url varchar(255) unique, 
-    mimetype varchar(50), 
-    size integer, 
-    title varchar(255), 
-    date integer, 
-    protected integer,
-    filename text /* comment 'if a local file, name of the file' */,
-    modified timestamp default CURRENT_TIMESTAMP /* comment 'date this record was modified'*/
-);
-
-create sequence file_oembed_seq;
-create table file_oembed (
-    file_id bigint default nextval('file_oembed_seq') primary key /* comment 'unique identifier' */,
-    version varchar(20),
-    type varchar(20),
-    provider varchar(50),
-    provider_url varchar(255),
-    width integer,
-    height integer,
-    html text,
-    title varchar(255),
-    author_name varchar(50), 
-    author_url varchar(255), 
-    url varchar(255) 
-);
-
-create sequence file_redirection_seq;
-create table file_redirection (
-    url varchar(255) primary key, 
-    file_id bigint, 
-    redirections integer, 
-    httpcode integer
-);
-
-create sequence file_thumbnail_seq;
-create table file_thumbnail (
-    file_id bigint primary key, 
-    url varchar(255) unique, 
-    width integer, 
-    height integer 
-);
-create sequence file_to_post_seq;
-create table file_to_post (
-    file_id bigint, 
-    post_id bigint, 
-
-    primary key (file_id, post_id)
-);
-
-
-create table group_block (
-   group_id integer not null /* comment 'group profile is blocked from' */ references user_group (id),
-   blocked integer not null /* comment 'profile that is blocked' */references profile (id),
-   blocker integer not null /* comment 'user making the block'*/ references "user" (id),
-   modified timestamp /* comment 'date of blocking'*/ ,
-
-   primary key (group_id, blocked)
-);
-
-create table group_alias (
-
-   alias varchar(64) /* comment 'additional nickname for the group'*/ ,
-   group_id integer not null /* comment 'group profile is blocked from'*/ references user_group (id),
-   modified timestamp /* comment 'date alias was created'*/,
-   primary key (alias)
-
-);
-create index group_alias_group_id_idx on group_alias (group_id);
-
-COMMIT;
\ No newline at end of file
diff --git a/db/08to09.sql b/db/08to09.sql
deleted file mode 100644
index ba6f382005..0000000000
--- a/db/08to09.sql
+++ /dev/null
@@ -1,190 +0,0 @@
-alter table notice
-     modify column content text comment 'update content',
-     add column lat decimal(10,7) comment 'latitude',
-     add column lon decimal(10,7) comment 'longitude',
-     add column location_id integer comment 'location id if possible',
-     add column location_ns integer comment 'namespace for location',
-     add column repeat_of integer comment 'notice this is a repeat of' references notice (id),
-     drop index notice_profile_id_idx,
-     add index notice_profile_id_idx (profile_id,created,id),
-     add index notice_repeatof_idx (repeat_of);
-
-alter table message
-     modify column content text comment 'message content';
-
-alter table profile
-     modify column bio text comment 'descriptive biography',
-     add column lat decimal(10,7) comment 'latitude',
-     add column lon decimal(10,7) comment 'longitude',
-     add column location_id integer comment 'location id if possible',
-     add column location_ns integer comment 'namespace for location';
-
-alter table user_group
-     modify column description text comment 'group description';
-
-alter table file_oembed
-     add column mimetype varchar(50) comment 'mime type of resource';
-
-alter table fave
-    drop index fave_user_id_idx,
-    add index fave_user_id_idx (user_id,modified);
-
-alter table subscription
-    drop index subscription_subscriber_idx,
-    add index subscription_subscriber_idx (subscriber,created),
-    drop index subscription_subscribed_idx,
-    add index subscription_subscribed_idx (subscribed,created);
-
-create table deleted_notice (
-
-    id integer primary key comment 'identity of notice',
-    profile_id integer not null comment 'author of the notice',
-    uri varchar(255) unique key comment 'universally unique identifier, usually a tag URI',
-    created datetime not null comment 'date the notice record was created',
-    deleted datetime not null comment 'date the notice record was created',
-
-    index deleted_notice_profile_id_idx (profile_id)
-
-) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
-
-create table config (
-
-    section varchar(32) comment 'configuration section',
-    setting varchar(32) comment 'configuration setting',
-    value varchar(255) comment 'configuration value',
-
-    constraint primary key (section, setting)
-
-) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
-
-create table profile_role (
-
-    profile_id integer not null comment 'account having the role' references profile (id),
-    role    varchar(32) not null comment 'string representing the role',
-    created datetime not null comment 'date the role was granted',
-
-    constraint primary key (profile_id, role)
-
-) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
-
-create table location_namespace (
-
-    id integer primary key comment 'identity for this namespace',
-    description varchar(255) comment 'description of the namespace',
-    created datetime not null comment 'date the record was created',
-    modified timestamp comment 'date this record was modified'
-
-) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
-
-create table login_token (
-    user_id integer not null comment 'user owning this token' references user (id),
-    token char(32) not null comment 'token useable for logging in',
-    created datetime not null comment 'date this record was created',
-    modified timestamp comment 'date this record was modified',
-
-    constraint primary key (user_id)
-) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
-
-create table user_location_prefs (
-    user_id integer not null comment 'user who has the preference' references user (id),
-    share_location tinyint default 1 comment 'Whether to share location data',
-    created datetime not null comment 'date this record was created',
-    modified timestamp comment 'date this record was modified',
-
-    constraint primary key (user_id)
-) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
-
-create table queue_item_new (
-    id integer auto_increment primary key comment 'unique identifier',
-    frame blob not null comment 'data: object reference or opaque string',
-    transport varchar(8) not null comment 'queue for what? "email", "jabber", "sms", "irc", ...',
-    created datetime not null comment 'date this record was created',
-    claimed datetime comment 'date this item was claimed',
-
-    index queue_item_created_idx (created)
-
-) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
-
-insert into queue_item_new (frame,transport,created,claimed)
-    select notice_id,transport,created,claimed from queue_item;
-alter table queue_item rename to queue_item_old;
-alter table queue_item_new rename to queue_item;
-
-alter table consumer
-    add consumer_secret varchar(255) not null comment 'secret value';
-
-alter table token
-    add verifier varchar(255) comment 'verifier string for OAuth 1.0a',
-    add verified_callback varchar(255) comment 'verified callback URL for OAuth 1.0a';
-
-create table oauth_application (
-    id integer auto_increment primary key comment 'unique identifier',
-    owner integer not null comment 'owner of the application' references profile (id),
-    consumer_key varchar(255) not null comment 'application consumer key' references consumer (consumer_key),
-    name varchar(255) not null comment 'name of the application',
-    description varchar(255) comment 'description of the application',
-    icon varchar(255) not null comment 'application icon',
-    source_url varchar(255) comment 'application homepage - used for source link',
-    organization varchar(255) comment 'name of the organization running the application',
-    homepage varchar(255) comment 'homepage for the organization',
-    callback_url varchar(255) comment 'url to redirect to after authentication',
-    type tinyint default 0 comment 'type of app, 1 = browser, 2 = desktop',
-    access_type tinyint default 0 comment 'default access type, bit 1 = read, bit 2 = write',
-    created datetime not null comment 'date this record was created',
-    modified timestamp comment 'date this record was modified'
-) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
-
-create table oauth_application_user (
-    profile_id integer not null comment 'user of the application' references profile (id),
-    application_id integer not null comment 'id of the application' references oauth_application (id),
-    access_type tinyint default 0 comment 'access type, bit 1 = read, bit 2 = write, bit 3 = revoked',
-    token varchar(255) comment 'request or access token',
-    created datetime not null comment 'date this record was created',
-    modified timestamp comment 'date this record was modified',
-    constraint primary key (profile_id, application_id)
-) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
-
-create table inbox (
-
-    user_id integer not null comment 'user receiving the notice' references user (id),
-    notice_ids blob comment 'packed list of notice ids',
-
-    constraint primary key (user_id)
-
-) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
-
-create table conversation (
-    id integer auto_increment primary key comment 'unique identifier',
-    uri varchar(225) unique comment 'URI of the conversation',
-    created datetime not null comment 'date this record was created',
-    modified timestamp comment 'date this record was modified'
-) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
-
--- stub entry to push the autoincrement past existing notice ids
-insert into conversation (id,created)
-    select max(id)+1, now() from notice;
-
-alter table user_group
-    add uri varchar(255) unique key comment 'universal identifier',
-    add mainpage varchar(255) comment 'page for group info to link to',
-    drop index nickname;
-
-create table local_group (
-
-   group_id integer primary key comment 'group represented' references user_group (id),
-   nickname varchar(64) unique key comment 'group represented',
-
-   created datetime not null comment 'date this record was created',
-   modified timestamp comment 'date this record was modified'
-
-) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
-
-insert into local_group (group_id, nickname, created)
-    select id, nickname, created from user_group;
-
-alter table file_to_post
-    add index post_id_idx (post_id);
-
-alter table group_inbox
-    add index group_inbox_notice_id_idx (notice_id);
-
diff --git a/db/08to09_pg.sql b/db/08to09_pg.sql
deleted file mode 100644
index d3eb644437..0000000000
--- a/db/08to09_pg.sql
+++ /dev/null
@@ -1,140 +0,0 @@
--- SQL commands to update an 0.8.x version of Laconica
--- to 0.9.x.
-
---these are just comments
-/*
-alter table notice
-     modify column content text comment 'update content';
-
-alter table message
-     modify column content text comment 'message content';
-
-alter table profile
-     modify column bio text comment 'descriptive biography';
-
-alter table user_group
-     modify column description text comment 'group description';
-*/
-
-alter table file_oembed
-     add column mimetype varchar(50) /*comment 'mime type of resource'*/;
-
-create table config (
-
-    section varchar(32) /* comment 'configuration section'*/,
-    setting varchar(32) /* comment 'configuration setting'*/,
-    value varchar(255) /* comment 'configuration value'*/,
-
-    primary key (section, setting)
-
-);
-
-create table profile_role (
-
-    profile_id integer not null /* comment 'account having the role'*/ references profile (id),
-    role    varchar(32) not null /* comment 'string representing the role'*/,
-    created timestamp /* not null comment 'date the role was granted'*/,
-
-    primary key (profile_id, role)
-
-);
-
-create table location_namespace (
-
-    id integer /*comment 'identity for this namespace'*/,
-    description text /* comment 'description of the namespace'*/ ,
-    created integer not null /*comment 'date the record was created*/ ,
-   /* modified timestamp comment 'date this record was modified',*/
-    primary key (id)
-
-);
-
-create table login_token (
-    user_id integer not null /* comment 'user owning this token'*/ references "user" (id),
-    token char(32) not null /* comment 'token useable for logging in'*/,
-    created timestamp not null DEFAULT CURRENT_TIMESTAMP /* comment 'date this record was created'*/,
-    modified timestamp /* comment 'date this record was modified'*/,
-
-    primary key (user_id)
-);
-
-DROP index fave_user_id_idx;
-CREATE index fave_user_id_idx on fave (user_id,modified);
-
-DROP index subscription_subscriber_idx;
-CREATE index subscription_subscriber_idx ON subscription (subscriber,created);
-
-DROP index subscription_subscribed_idx;
-CREATE index subscription_subscribed_idx ON subscription (subscribed,created);
-
-DROP index notice_profile_id_idx;
-CREATE index notice_profile_id_idx ON notice (profile_id,created,id);
-
-ALTER TABLE notice ADD COLUMN lat decimal(10, 7) /* comment 'latitude'*/;
-ALTER TABLE notice ADD COLUMN lon decimal(10,7) /* comment 'longitude'*/;
-ALTER TABLE notice ADD COLUMN location_id integer /* comment 'location id if possible'*/ ;
-ALTER TABLE notice ADD COLUMN location_ns integer /* comment 'namespace for location'*/;
-ALTER TABLE notice ADD COLUMN repeat_of integer /* comment 'notice this is a repeat of' */ references notice (id);
-
-ALTER TABLE profile ADD COLUMN lat decimal(10,7) /*comment 'latitude'*/ ;
-ALTER TABLE profile ADD COLUMN lon decimal(10,7) /*comment 'longitude'*/;
-ALTER TABLE profile ADD COLUMN location_id integer /* comment 'location id if possible'*/;
-ALTER TABLE profile ADD COLUMN location_ns integer /* comment 'namespace for location'*/;
-
-ALTER TABLE consumer add COLUMN consumer_secret varchar(255) not null ; /*comment 'secret value'*/
-
-ALTER TABLE token ADD COLUMN verifier varchar(255); /* comment 'verifier string for OAuth 1.0a',*/
-ALTER TABLE token ADD COLUMN verified_callback varchar(255); /* comment 'verified callback URL for OAuth 1.0a',*/
-
-create table queue_item_new (
-     id serial /* comment 'unique identifier'*/,
-     frame bytea not null /* comment 'data: object reference or opaque string'*/,
-     transport varchar(8) not null /*comment 'queue for what? "email", "jabber", "sms", "irc", ...'*/,
-     created timestamp not null default CURRENT_TIMESTAMP /*comment 'date this record was created'*/,
-     claimed timestamp /*comment 'date this item was claimed'*/,
-     PRIMARY KEY (id)
-);
- 
-insert into queue_item_new (frame,transport,created,claimed)
-    select ('0x' || notice_id::text)::bytea,transport,created,claimed from queue_item;
-alter table queue_item rename to queue_item_old;
-alter table queue_item_new rename to queue_item;
-
-ALTER TABLE confirm_address ALTER column sent set default CURRENT_TIMESTAMP;
-
-create table user_location_prefs (
-    user_id integer not null /*comment 'user who has the preference'*/ references "user" (id),
-    share_location int default 1 /* comment 'Whether to share location data'*/,
-    created timestamp not null /*comment 'date this record was created'*/,
-    modified timestamp /* comment 'date this record was modified'*/,
-
-    primary key (user_id)
-);
- 
-create table inbox (
-
-    user_id integer not null /* comment 'user receiving the notice' */ references "user" (id),
-    notice_ids bytea /* comment 'packed list of notice ids' */,
-
-    primary key (user_id)
-
-);
-
-create table user_location_prefs (
-    user_id integer not null /*comment 'user who has the preference'*/ references "user" (id),
-    share_location int default 1 /* comment 'Whether to share location data'*/,
-    created timestamp not null /*comment 'date this record was created'*/,
-    modified timestamp /* comment 'date this record was modified'*/,
-
-    primary key (user_id)
-);
- 
-create table inbox (
-
-    user_id integer not null /* comment 'user receiving the notice' */ references "user" (id),
-    notice_ids bytea /* comment 'packed list of notice ids' */,
-
-    primary key (user_id)
-
-);
-
diff --git a/db/095topeopletags.sql b/db/095topeopletags.sql
deleted file mode 100644
index e193b98156..0000000000
--- a/db/095topeopletags.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-/* populate people tags metadata */
-
-insert into profile_list (tagger, tag, modified, description, private)
-    select distinct tagger, tag, modified, null, false from profile_tag;
diff --git a/db/096to097.sql b/db/096to097.sql
deleted file mode 100644
index 209a3a8811..0000000000
--- a/db/096to097.sql
+++ /dev/null
@@ -1,26 +0,0 @@
--- Add indexes for sorting changes in 0.9.7
-
--- Allows sorting public timeline, api/statuses/repeats, and conversations by timestamp efficiently
-alter table notice
-    add index notice_created_id_is_local_idx (created,id,is_local),
-
-    add index notice_repeat_of_created_id_idx (repeat_of, created, id),
-    drop index notice_repeatof_idx,
-
-    add index notice_conversation_created_id_idx (conversation, created, id),
-    drop index notice_conversation_idx;
-
--- Allows sorting tag-filtered public timeline by timestamp efficiently
-alter table notice_tag add index notice_tag_tag_created_notice_id_idx (tag, created, notice_id);
-
--- Needed for sorting reply/mentions timelines
-alter table reply add index reply_profile_id_modified_notice_id_idx (profile_id, modified, notice_id);
-
--- Needed for sorting group messages by timestamp
-alter table group_inbox add index group_inbox_group_id_created_notice_id_idx (group_id, created, notice_id);
-
--- Helps make some reverse role lookups more efficient if there's a lot of assigned accounts
-alter table profile_role add index profile_role_role_created_profile_id_idx (role, created, profile_id);
-
--- Fix for sorting a user's group memberships by order joined
-alter table group_member add index group_member_profile_id_created_idx (profile_id, created);
diff --git a/db/beta5tobeta6.sql b/db/beta5tobeta6.sql
deleted file mode 100644
index e9dff17efe..0000000000
--- a/db/beta5tobeta6.sql
+++ /dev/null
@@ -1,28 +0,0 @@
-alter table oauth_application
-    modify column name varchar(255) not null unique key comment 'name of the application',
-    modify column access_type tinyint default 0 comment 'access type, bit 1 = read, bit 2 = write';
-
-alter table user_group
-add column uri varchar(255) unique key comment 'universal identifier',
-add column mainpage varchar(255) comment 'page for group info to link to',
-drop index nickname;
-
-create table conversation (
-     id integer auto_increment primary key comment 'unique identifier',
-     uri varchar(225) unique comment 'URI of the conversation',
-     created datetime not null comment 'date this record was created',
-     modified timestamp comment 'date this record was modified'
-) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
-
-create table local_group (
-    group_id integer primary key comment 'group represented' references user_group (id),
-    nickname varchar(64) unique key comment 'group represented',
-
-    created datetime not null comment 'date this record was created',
-    modified timestamp comment 'date this record was modified'
-
-) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
-
-insert into local_group (group_id, nickname, created)
-select id, nickname, created from user_group;
-
diff --git a/db/core.php b/db/core.php
index 626672bf5f..bf8cae3c4b 100644
--- a/db/core.php
+++ b/db/core.php
@@ -29,1084 +29,66 @@
  *     double-check what we've been doing on postgres?
  */
 
-$schema['profile'] = array(
-    'description' => 'local and remote users have profiles',
-    'fields' => array(
-        'id' => array('type' => 'serial', 'not null' => true, 'description' => 'unique identifier'),
-        'nickname' => array('type' => 'varchar', 'length' => 64, 'not null' => true, 'description' => 'nickname or username'),
-        'fullname' => array('type' => 'varchar', 'length' => 255, 'description' => 'display name'),
-        'profileurl' => array('type' => 'varchar', 'length' => 255, 'description' => 'URL, cached so we dont regenerate'),
-        'homepage' => array('type' => 'varchar', 'length' => 255, 'description' => 'identifying URL'),
-        'bio' => array('type' => 'text', 'description' => 'descriptive biography'),
-        'location' => array('type' => 'varchar', 'length' => 255, 'description' => 'physical location'),
-        'lat' => array('type' => 'numeric', 'precision' => 10, 'scale' => 7, 'description' => 'latitude'),
-        'lon' => array('type' => 'numeric', 'precision' => 10, 'scale' => 7, 'description' => 'longitude'),
-        'location_id' => array('type' => 'int', 'description' => 'location id if possible'),
-        'location_ns' => array('type' => 'int', 'description' => 'namespace for location'),
-
-        'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
-        'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
-    ),
-    'primary key' => array('id'),
-    'indexes' => array(
-        'profile_nickname_idx' => array('nickname'),
-    ),
-    'fulltext indexes' => array(
-        'nickname' => array('nickname', 'fullname', 'location', 'bio', 'homepage')
-    ),
+$classes = array('Schema_version',
+                 'Profile',
+                 'Avatar',
+                 'Sms_carrier',
+                 'User',
+                 'Remote_profile',
+                 'Subscription',
+                 'Group_join_queue',
+                 'Subscription_queue',
+                 'Oauth_token_association',
+                 'Notice',
+                 'Notice_source',
+                 'Reply',
+                 'Fave',
+                 'Consumer',
+                 'Token',
+                 'Nonce',
+                 'Oauth_application',
+                 'Oauth_application_user',
+                 'Confirm_address',
+                 'Remember_me',
+                 'Queue_item',
+                 'Notice_tag',
+                 'Foreign_service',
+                 'Foreign_user',
+                 'Foreign_link',
+                 'Foreign_subscription',
+                 'Invitation',
+                 'Message',
+                 // 'Notice_inbox',
+                 'Profile_tag',
+                 'Profile_list',
+                 'Profile_tag_subscription',
+                 'Profile_block',
+                 'User_group',
+                 'Related_group',
+                 'Group_inbox',
+                 'Group_member',
+                 'File',
+                 'File_oembed',
+                 'File_redirection',
+                 'File_thumbnail',
+                 'File_to_post',
+                 'Group_block',
+                 'Group_alias',
+                 'Session',
+                 'Deleted_notice',
+                 'Config',
+                 'Profile_role',
+                 'Location_namespace',
+                 'Login_token',
+                 'User_location_prefs',
+                 'Inbox',
+                 'User_im_prefs',
+                 'Conversation',
+                 'Local_group',
+                 'User_urlshortener_prefs',
+                 'Old_school_prefs',
 );
 
-$schema['avatar'] = array(
-    'fields' => array(
-        'profile_id' => array('type' => 'int', 'not null' => true, 'description' => 'foreign key to profile table'),
-        'original' => array('type' => 'int', 'size' => 'tiny', 'default' => 0, 'description' => 'uploaded by user or generated?'),
-        'width' => array('type' => 'int', 'not null' => true, 'description' => 'image width'),
-        'height' => array('type' => 'int', 'not null' => true, 'description' => 'image height'),
-        'mediatype' => array('type' => 'varchar', 'length' => 32, 'not null' => true, 'description' => 'file type'),
-        'filename' => array('type' => 'varchar', 'length' => 255, 'description' => 'local filename, if local'),
-        'url' => array('type' => 'varchar', 'length' => 255, 'description' => 'avatar location'),
-        'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
-        'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
-    ),
-    'primary key' => array('profile_id', 'width', 'height'),
-    'unique keys' => array(
-        'avatar_url_key' => array('url'),
-    ),
-    'foreign keys' => array(
-        'avatar_profile_id_fkey' => array('profile', array('profile_id' => 'id')),
-    ),
-    'indexes' => array(
-        'avatar_profile_id_idx' => array('profile_id'),
-    ),
-);
-
-$schema['sms_carrier'] = array(
-    'fields' => array(
-        'id' => array('type' => 'int', 'not null' => true, 'description' => 'primary key for SMS carrier'),
-        'name' => array('type' => 'varchar', 'length' => 64, 'description' => 'name of the carrier'),
-        'email_pattern' => array('type' => 'varchar', 'length' => 255, 'not null' => true, 'description' => 'sprintf pattern for making an email address from a phone number'),
-        'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
-        'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
-    ),
-    'primary key' => array('id'),
-    'unique keys' => array(
-        'sms_carrier_name_key' => array('name'),
-    ),
-);
-
-$schema['user'] = array(
-    'description' => 'local users',
-    'fields' => array(
-        'id' => array('type' => 'int', 'not null' => true, 'description' => 'foreign key to profile table'),
-        'nickname' => array('type' => 'varchar', 'length' => 64, 'description' => 'nickname or username, duped in profile'),
-        'password' => array('type' => 'varchar', 'length' => 255, 'description' => 'salted password, can be null for OpenID users'),
-        'email' => array('type' => 'varchar', 'length' => 255, 'description' => 'email address for password recovery etc.'),
-        'incomingemail' => array('type' => 'varchar', 'length' => 255, 'description' => 'email address for post-by-email'),
-        'emailnotifysub' => array('type' => 'int', 'size' => 'tiny', 'default' => 1, 'description' => 'Notify by email of subscriptions'),
-        'emailnotifyfav' => array('type' => 'int', 'size' => 'tiny', 'default' => 1, 'description' => 'Notify by email of favorites'),
-        'emailnotifynudge' => array('type' => 'int', 'size' => 'tiny', 'default' => 1, 'description' => 'Notify by email of nudges'),
-        'emailnotifymsg' => array('type' => 'int', 'size' => 'tiny', 'default' => 1, 'description' => 'Notify by email of direct messages'),
-        'emailnotifyattn' => array('type' => 'int', 'size' => 'tiny', 'default' => 1, 'description' => 'Notify by email of @-replies'),
-        'emailmicroid' => array('type' => 'int', 'size' => 'tiny', 'default' => 1, 'description' => 'whether to publish email microid'),
-        'language' => array('type' => 'varchar', 'length' => 50, 'description' => 'preferred language'),
-        'timezone' => array('type' => 'varchar', 'length' => 50, 'description' => 'timezone'),
-        'emailpost' => array('type' => 'int', 'size' => 'tiny', 'default' => 1, 'description' => 'Post by email'),
-        'sms' => array('type' => 'varchar', 'length' => 64, 'description' => 'sms phone number'),
-        'carrier' => array('type' => 'int', 'description' => 'foreign key to sms_carrier'),
-        'smsnotify' => array('type' => 'int', 'size' => 'tiny', 'default' => 0, 'description' => 'whether to send notices to SMS'),
-        'smsreplies' => array('type' => 'int', 'size' => 'tiny', 'default' => 0, 'description' => 'whether to send notices to SMS on replies'),
-        'smsemail' => array('type' => 'varchar', 'length' => 255, 'description' => 'built from sms and carrier'),
-        'uri' => array('type' => 'varchar', 'length' => 255, 'description' => 'universally unique identifier, usually a tag URI'),
-        'autosubscribe' => array('type' => 'int', 'size' => 'tiny', 'default' => 0, 'description' => 'automatically subscribe to users who subscribe to us'),
-        'subscribe_policy' => array('type' => 'int', 'size' => 'tiny', 'default' => 0, 'description' => '0 = anybody can subscribe; 1 = require approval'),
-        'urlshorteningservice' => array('type' => 'varchar', 'length' => 50, 'default' => 'internal', 'description' => 'service to use for auto-shortening URLs'),
-        'inboxed' => array('type' => 'int', 'size' => 'tiny', 'default' => 0, 'description' => 'has an inbox been created for this user?'),
-        'design_id' => array('type' => 'int', 'description' => 'id of a design'),
-        'viewdesigns' => array('type' => 'int', 'size' => 'tiny', 'default' => 1, 'description' => 'whether to view user-provided designs'),
-        'private_stream' => array('type' => 'int', 'size' => 'tiny', 'default' => 0, 'description' => 'whether to limit all notices to followers only'),
-
-        'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
-        'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
-    ),
-    'primary key' => array('id'),
-    'unique keys' => array(
-        'user_nickname_key' => array('nickname'),
-        'user_email_key' => array('email'),
-        'user_incomingemail_key' => array('incomingemail'),
-        'user_sms_key' => array('sms'),
-        'user_uri_key' => array('uri'),
-    ),
-    'foreign keys' => array(
-        'user_id_fkey' => array('profile', array('id' => 'id')),
-        'user_carrier_fkey' => array('sms_carrier', array('carrier' => 'id')),
-        'user_design_id_fkey' => array('design', array('design_id' => 'id')),
-    ),
-    'indexes' => array(
-        'user_smsemail_idx' => array('smsemail'),
-    ),
-);
-
-$schema['remote_profile'] = array(
-    'description' => 'remote people (OMB)',
-    'fields' => array(
-        'id' => array('type' => 'int', 'not null' => true, 'description' => 'foreign key to profile table'),
-        'uri' => array('type' => 'varchar', 'length' => 255, 'description' => 'universally unique identifier, usually a tag URI'),
-        'postnoticeurl' => array('type' => 'varchar', 'length' => 255, 'description' => 'URL we use for posting notices'),
-        'updateprofileurl' => array('type' => 'varchar', 'length' => 255, 'description' => 'URL we use for updates to this profile'),
-        'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
-        'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
-    ),
-    'primary key' => array('id'),
-    'unique keys' => array(
-        'remote_profile_uri_key' => array('uri'),
-    ),
-    'foreign keys' => array(
-        'remote_profile_id_fkey' => array('profile', array('id' => 'id')),
-    ),
-);
-
-$schema['subscription'] = array(
-    'fields' => array(
-        'subscriber' => array('type' => 'int', 'not null' => true, 'description' => 'profile listening'),
-        'subscribed' => array('type' => 'int', 'not null' => true, 'description' => 'profile being listened to'),
-        'jabber' => array('type' => 'int', 'size' => 'tiny', 'default' => 1, 'description' => 'deliver jabber messages'),
-        'sms' => array('type' => 'int', 'size' => 'tiny', 'default' => 1, 'description' => 'deliver sms messages'),
-        'token' => array('type' => 'varchar', 'length' => 255, 'description' => 'authorization token'),
-        'secret' => array('type' => 'varchar', 'length' => 255, 'description' => 'token secret'),
-        'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
-        'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
-    ),
-    'primary key' => array('subscriber', 'subscribed'),
-    'indexes' => array(
-        'subscription_subscriber_idx' => array('subscriber', 'created'),
-        'subscription_subscribed_idx' => array('subscribed', 'created'),
-        'subscription_token_idx' => array('token'),
-    ),
-);
-
-$schema['notice'] = array(
-    'fields' => array(
-        'id' => array('type' => 'serial', 'not null' => true, 'description' => 'unique identifier'),
-        'profile_id' => array('type' => 'int', 'not null' => true, 'description' => 'who made the update'),
-        'uri' => array('type' => 'varchar', 'length' => 255, 'description' => 'universally unique identifier, usually a tag URI'),
-        'content' => array('type' => 'text', 'description' => 'update content'),
-        'rendered' => array('type' => 'text', 'description' => 'HTML version of the content'),
-        'url' => array('type' => 'varchar', 'length' => 255, 'description' => 'URL of any attachment (image, video, bookmark, whatever)'),
-        'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
-        'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
-        'reply_to' => array('type' => 'int', 'description' => 'notice replied to (usually a guess)'),
-        'is_local' => array('type' => 'int', 'size' => 'tiny', 'default' => 0, 'description' => 'notice was generated by a user'),
-        'source' => array('type' => 'varchar', 'length' => 32, 'description' => 'source of comment, like "web", "im", or "clientname"'),
-        'conversation' => array('type' => 'int', 'description' => 'id of root notice in this conversation'),
-        'lat' => array('type' => 'numeric', 'precision' => 10, 'scale' => 7, 'description' => 'latitude'),
-        'lon' => array('type' => 'numeric', 'precision' => 10, 'scale' => 7, 'description' => 'longitude'),
-        'location_id' => array('type' => 'int', 'description' => 'location id if possible'),
-        'location_ns' => array('type' => 'int', 'description' => 'namespace for location'),
-        'repeat_of' => array('type' => 'int', 'description' => 'notice this is a repeat of'),
-        'object_type' => array('type' => 'varchar', 'length' => 255, 'description' => 'URI representing activity streams object type', 'default' => 'http://activitystrea.ms/schema/1.0/note'),
-        'scope' => array('type' => 'int',
-                         'default' => '1',
-                         'description' => 'bit map for distribution scope; 0 = everywhere; 1 = this server only; 2 = addressees; 4 = followers'),
-    ),
-    'primary key' => array('id'),
-    'unique keys' => array(
-        'notice_uri_key' => array('uri'),
-    ),
-    'foreign keys' => array(
-        'notice_profile_id_fkey' => array('profile', array('profile_id' => 'id')),
-        'notice_reply_to_fkey' => array('notice', array('reply_to' => 'id')),
-        'notice_conversation_fkey' => array('conversation', array('conversation' => 'id')), # note... used to refer to notice.id
-        'notice_repeat_of_fkey' => array('notice', array('repeat_of' => 'id')), # @fixme: what about repeats of deleted notices?
-    ),
-    'indexes' => array(
-        'notice_profile_id_idx' => array('profile_id', 'created', 'id'),
-        'notice_conversation_idx' => array('conversation'),
-        'notice_created_idx' => array('created'),
-        'notice_replyto_idx' => array('reply_to'),
-        'notice_repeatof_idx' => array('repeat_of'),
-    ),
-    'fulltext indexes' => array(
-        'content' => array('content'),
-    )
-);
-
-$schema['notice_source'] = array(
-    'fields' => array(
-        'code' => array('type' => 'varchar', 'length' => 32, 'not null' => true, 'description' => 'source code'),
-        'name' => array('type' => 'varchar', 'length' => 255, 'not null' => true, 'description' => 'name of the source'),
-        'url' => array('type' => 'varchar', 'length' => 255, 'not null' => true, 'description' => 'url to link to'),
-        'notice_id' => array('type' => 'int', 'not null' => true, 'description' => 'date this record was created'),
-        'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
-        'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
-    ),
-    'primary key' => array('code'),
-);
-
-$schema['reply'] = array(
-    'fields' => array(
-        'notice_id' => array('type' => 'int', 'not null' => true, 'description' => 'notice that is the reply'),
-        'profile_id' => array('type' => 'int', 'not null' => true, 'description' => 'profile replied to'),
-        'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
-        'replied_id' => array('type' => 'int', 'description' => 'notice replied to (not used, see notice.reply_to)'),
-    ),
-    'primary key' => array('notice_id', 'profile_id'),
-    'foreign keys' => array(
-        'reply_notice_id_fkey' => array('notice', array('notice_id' => 'id')),
-        'reply_profile_id_fkey' => array('profile', array('profile_id' => 'id')),
-    ),
-    'indexes' => array(
-        'reply_notice_id_idx' => array('notice_id'),
-        'reply_profile_id_idx' => array('profile_id'),
-        'reply_replied_id_idx' => array('replied_id'),
-    ),
-);
-
-$schema['fave'] = array(
-    'fields' => array(
-        'notice_id' => array('type' => 'int', 'not null' => true, 'description' => 'notice that is the favorite'),
-        'user_id' => array('type' => 'int', 'not null' => true, 'description' => 'user who likes this notice'),
-        'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
-    ),
-    'primary key' => array('notice_id', 'user_id'),
-    'foreign keys' => array(
-        'fave_notice_id_fkey' => array('notice', array('notice_id' => 'id')),
-        'fave_user_id_fkey' => array('profile', array('user_id' => 'id')), // note: formerly referenced notice.id, but we can now record remote users' favorites
-    ),
-    'indexes' => array(
-        'fave_notice_id_idx' => array('notice_id'),
-        'fave_user_id_idx' => array('user_id', 'modified'),
-        'fave_modified_idx' => array('modified'),
-    ),
-);
-
-/* tables for OAuth */
-
-$schema['consumer'] = array(
-    'description' => 'OAuth consumer record',
-    'fields' => array(
-        'consumer_key' => array('type' => 'varchar', 'length' => 255, 'not null' => true, 'description' => 'unique identifier, root URL'),
-        'consumer_secret' => array('type' => 'varchar', 'length' => 255, 'not null' => true, 'description' => 'secret value'),
-        'seed' => array('type' => 'char', 'length' => 32, 'not null' => true, 'description' => 'seed for new tokens by this consumer'),
-
-        'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
-        'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
-    ),
-    'primary key' => array('consumer_key'),
-);
-
-$schema['token'] = array(
-    'description' => 'OAuth token record',
-    'fields' => array(
-        'consumer_key' => array('type' => 'varchar', 'length' => 255, 'not null' => true, 'description' => 'unique identifier, root URL'),
-        'tok' => array('type' => 'char', 'length' => 32, 'not null' => true, 'description' => 'identifying value'),
-        'secret' => array('type' => 'char', 'length' => 32, 'not null' => true, 'description' => 'secret value'),
-        'type' => array('type' => 'int', 'size' => 'tiny', 'not null' => true, 'default' => 0, 'description' => 'request or access'),
-        'state' => array('type' => 'int', 'size' => 'tiny', 'default' => 0, 'description' => 'for requests, 0 = initial, 1 = authorized, 2 = used'),
-        'verifier' => array('type' => 'varchar', 'length' => 255, 'description' => 'verifier string for OAuth 1.0a'),
-        'verified_callback' => array('type' => 'varchar', 'length' => 255, 'description' => 'verified callback URL for OAuth 1.0a'),
-
-        'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
-        'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
-    ),
-    'primary key' => array('consumer_key', 'tok'),
-    'foreign keys' => array(
-        'token_consumer_key_fkey' => array('consumer', array('consumer_key'=> 'consumer_key')),
-    ),
-);
-
-$schema['nonce'] = array(
-    'description' => 'OAuth nonce record',
-    'fields' => array(
-        'consumer_key' => array('type' => 'varchar', 'length' => 255, 'not null' => true, 'description' => 'unique identifier, root URL'),
-        'tok' => array('type' => 'char', 'length' => 32, 'description' => 'buggy old value, ignored'),
-        'nonce' => array('type' => 'char', 'length' => 32, 'not null' => true, 'description' => 'nonce'),
-        'ts' => array('type' => 'datetime', 'not null' => true, 'description' => 'timestamp sent'),
-
-        'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
-        'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
-    ),
-    'primary key' => array('consumer_key', 'ts', 'nonce'),
-);
-
-$schema['oauth_application'] = array(
-    'description' => 'OAuth application registration record',
-    'fields' => array(
-        'id' => array('type' => 'serial', 'not null' => true, 'description' => 'unique identifier'),
-        'owner' => array('type' => 'int', 'not null' => true, 'description' => 'owner of the application'),
-        'consumer_key' => array('type' => 'varchar', 'length' => 255, 'not null' => true, 'description' => 'application consumer key'),
-        'name' => array('type' => 'varchar', 'length' => 255, 'not null' => true, 'description' => 'name of the application'),
-        'description' => array('type' => 'varchar', 'length' => 255, 'description' => 'description of the application'),
-        'icon' => array('type' => 'varchar', 'length' => 255, 'not null' => true, 'description' => 'application icon'),
-        'source_url' => array('type' => 'varchar', 'length' => 255, 'description' => 'application homepage - used for source link'),
-        'organization' => array('type' => 'varchar', 'length' => 255, 'description' => 'name of the organization running the application'),
-        'homepage' => array('type' => 'varchar', 'length' => 255, 'description' => 'homepage for the organization'),
-        'callback_url' => array('type' => 'varchar', 'length' => 255, 'description' => 'url to redirect to after authentication'),
-        'type' => array('type' => 'int', 'size' => 'tiny', 'default' => 0, 'description' => 'type of app, 1 = browser, 2 = desktop'),
-        'access_type' => array('type' => 'int', 'size' => 'tiny', 'default' => 0, 'description' => 'default access type, bit 1 = read, bit 2 = write'),
-        'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
-        'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
-    ),
-    'primary key' => array('id'),
-    'unique keys' => array(
-        'oauth_application_name_key' => array('name'), // in the long run, we should perhaps not force these unique, and use another source id
-    ),
-    'foreign keys' => array(
-        'oauth_application_owner_fkey' => array('profile', array('owner' => 'id')), // Are remote users allowed to create oauth application records?
-        'oauth_application_consumer_key_fkey' => array('consumer', array('consumer_key' => 'consumer_key')),
-    ),
-);
-
-$schema['oauth_application_user'] = array(
-    'fields' => array(
-        'profile_id' => array('type' => 'int', 'not null' => true, 'description' => 'user of the application'),
-        'application_id' => array('type' => 'int', 'not null' => true, 'description' => 'id of the application'),
-        'access_type' => array('type' => 'int', 'size' => 'tiny', 'default' => 0, 'description' => 'access type, bit 1 = read, bit 2 = write'),
-        'token' => array('type' => 'varchar', 'length' => 255, 'description' => 'request or access token'),
-        'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
-        'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
-    ),
-    'primary key' => array('profile_id', 'application_id'),
-    'foreign keys' => array(
-        'oauth_application_user_profile_id_fkey' => array('profile', array('profile_id' => 'id')),
-        'oauth_application_user_application_id_fkey' => array('oauth_application', array('application_id' => 'id')),
-    ),
-);
-
-/* These are used by JanRain OpenID library */
-
-$schema['oid_associations'] = array(
-    'fields' => array(
-        'server_url' => array('type' => 'blob', 'not null' => true),
-        'handle' => array('type' => 'varchar', 'length' => 255, 'not null' => true, 'default' => ''), // character set latin1,
-        'secret' => array('type' => 'blob'),
-        'issued' => array('type' => 'int'),
-        'lifetime' => array('type' => 'int'),
-        'assoc_type' => array('type' => 'varchar', 'length' => 64),
-    ),
-    'primary key' => array(array('server_url', 255), 'handle'),
-);
-
-$schema['oid_nonces'] = array(
-    'fields' => array(
-        'server_url' => array('type' => 'varchar', 'length' => 2047),
-        'timestamp' => array('type' => 'int'),
-        'salt' => array('type' => 'char', 'length' => 40),
-    ),
-    'unique keys' => array(
-        'oid_nonces_server_url_timestamp_salt_key' => array(array('server_url', 255), 'timestamp', 'salt'),
-    ),
-);
-
-$schema['confirm_address'] = array(
-    'fields' => array(
-        'code' => array('type' => 'varchar', 'length' => 32, 'not null' => true, 'description' => 'good random code'),
-        'user_id' => array('type' => 'int', 'not null' => true, 'description' => 'user who requested confirmation'),
-        'address' => array('type' => 'varchar', 'length' => 255, 'not null' => true, 'description' => 'address (email, xmpp, SMS, etc.)'),
-        'address_extra' => array('type' => 'varchar', 'length' => 255, 'not null' => true, 'description' => 'carrier ID, for SMS'),
-        'address_type' => array('type' => 'varchar', 'length' => 8, 'not null' => true, 'description' => 'address type ("email", "xmpp", "sms")'),
-        'claimed' => array('type' => 'datetime', 'description' => 'date this was claimed for queueing'),
-        'sent' => array('type' => 'datetime', 'description' => 'date this was sent for queueing'),
-        'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
-    ),
-    'primary key' => array('code'),
-    'foreign keys' => array(
-        'confirm_address_user_id_fkey' => array('user', array('user_id' => 'id')),
-    ),
-);
-
-$schema['remember_me'] = array(
-    'fields' => array(
-        'code' => array('type' => 'varchar', 'length' => 32, 'not null' => true, 'description' => 'good random code'),
-        'user_id' => array('type' => 'int', 'not null' => true, 'description' => 'user who is logged in'),
-        'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
-    ),
-    'primary key' => array('code'),
-    'foreign keys' => array(
-        'remember_me_user_id_fkey' => array('user', array('user_id' => 'id')),
-    ),
-);
-
-$schema['queue_item'] = array(
-    'fields' => array(
-        'id' => array('type' => 'serial', 'not null' => true, 'description' => 'unique identifier'),
-        'frame' => array('type' => 'blob', 'not null' => true, 'description' => 'data: object reference or opaque string'),
-        'transport' => array('type' => 'varchar', 'length' => 8, 'not null' => true, 'description' => 'queue for what? "email", "xmpp", "sms", "irc", ...'), // @fixme 8 chars is too short; bump up.
-        'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
-        'claimed' => array('type' => 'datetime', 'description' => 'date this item was claimed'),
-    ),
-    'primary key' => array('id'),
-    'indexes' => array(
-        'queue_item_created_idx' => array('created'),
-    ),
-);
-
-$schema['notice_tag'] = array(
-    'description' => 'Hash tags',
-    'fields' => array(
-        'tag' => array('type' => 'varchar', 'length' => 64, 'not null' => true, 'description' => 'hash tag associated with this notice'),
-        'notice_id' => array('type' => 'int', 'not null' => true, 'description' => 'notice tagged'),
-        'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
-    ),
-    'primary key' => array('tag', 'notice_id'),
-    'foreign keys' => array(
-        'notice_tag_notice_id_fkey' => array('notice', array('notice_id' => 'id')),
-    ),
-    'indexes' => array(
-        'notice_tag_created_idx' => array('created'),
-        'notice_tag_notice_id_idx' => array('notice_id'),
-    ),
-);
-
-/* Synching with foreign services */
-
-$schema['foreign_service'] = array(
-    'fields' => array(
-        'id' => array('type' => 'int', 'not null' => true, 'description' => 'numeric key for service'),
-        'name' => array('type' => 'varchar', 'length' => 32, 'not null' => true, 'description' => 'name of the service'),
-        'description' => array('type' => 'varchar', 'length' => 255, 'description' => 'description'),
-        'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
-        'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
-    ),
-    'primary key' => array('id'),
-    'unique keys' => array(
-        'foreign_service_name_key' => array('name'),
-    ),
-);
-
-$schema['foreign_user'] = array(
-    'fields' => array(
-        'id' => array('type' => 'int', 'size' => 'big', 'not null' => true, 'description' => 'unique numeric key on foreign service'),
-        'service' => array('type' => 'int', 'not null' => true, 'description' => 'foreign key to service'),
-        'uri' => array('type' => 'varchar', 'length' => 255, 'not null' => true, 'description' => 'identifying URI'),
-        'nickname' => array('type' => 'varchar', 'length' => 255, 'description' => 'nickname on foreign service'),
-        'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
-        'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
-    ),
-    'primary key' => array('id', 'service'),
-    'foreign keys' => array(
-        'foreign_user_service_fkey' => array('foreign_service', array('service' => 'id')),
-    ),
-    'unique keys' => array(
-        'foreign_user_uri_key' => array('uri'),
-    ),
-);
-
-$schema['foreign_link'] = array(
-    'fields' => array(
-        'user_id' => array('type' => 'int', 'not null' => true, 'description' => 'link to user on this system, if exists'),
-        'foreign_id' => array('type' => 'int', 'size' => 'big', 'unsigned' => true, 'not null' => true, 'description' => 'link to user on foreign service, if exists'),
-        'service' => array('type' => 'int', 'not null' => true, 'description' => 'foreign key to service'),
-        'credentials' => array('type' => 'varchar', 'length' => 255, 'description' => 'authc credentials, typically a password'),
-        'noticesync' => array('type' => 'int', 'size' => 'tiny', 'not null' => true, 'default' => 1, 'description' => 'notice synchronization, bit 1 = sync outgoing, bit 2 = sync incoming, bit 3 = filter local replies'),
-        'friendsync' => array('type' => 'int', 'size' => 'tiny', 'not null' => true, 'default' => 2, 'description' => 'friend synchronization, bit 1 = sync outgoing, bit 2 = sync incoming'),
-        'profilesync' => array('type' => 'int', 'size' => 'tiny', 'not null' => true, 'default' => 1, 'description' => 'profile synchronization, bit 1 = sync outgoing, bit 2 = sync incoming'),
-        'last_noticesync' => array('type' => 'datetime', 'description' => 'last time notices were imported'),
-        'last_friendsync' => array('type' => 'datetime', 'description' => 'last time friends were imported'),
-        'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
-        'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
-    ),
-    'primary key' => array('user_id', 'foreign_id', 'service'),
-    'foreign keys' => array(
-        'foreign_link_user_id_fkey' => array('user', array('user_id' => 'id')),
-        'foreign_link_foreign_id_fkey' => array('foreign_user', array('foreign_id' => 'id', 'service' => 'service')),
-        'foreign_link_service_fkey' => array('foreign_service', array('service' => 'id')),
-    ),
-    'indexes' => array(
-        'foreign_user_user_id_idx' => array('user_id'),
-    ),
-);
-
-$schema['foreign_subscription'] = array(
-    'fields' => array(
-        'service' => array('type' => 'int', 'not null' => true, 'description' => 'service where relationship happens'),
-        'subscriber' => array('type' => 'int', 'size' => 'big', 'not null' => true, 'description' => 'subscriber on foreign service'),
-        'subscribed' => array('type' => 'int', 'size' => 'big', 'not null' => true, 'description' => 'subscribed user'),
-        'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
-    ),
-    'primary key' => array('service', 'subscriber', 'subscribed'),
-    'foreign keys' => array(
-        'foreign_subscription_service_fkey' => array('foreign_service', array('service' => 'id')),
-        'foreign_subscription_subscriber_fkey' => array('foreign_user', array('subscriber' => 'id', 'service' => 'service')),
-        'foreign_subscription_subscribed_fkey' => array('foreign_user', array('subscribed' => 'id', 'service' => 'service')),
-    ),
-    'indexes' => array(
-        'foreign_subscription_subscriber_idx' => array('service', 'subscriber'),
-        'foreign_subscription_subscribed_idx' => array('service', 'subscribed'),
-    ),
-);
-
-$schema['invitation'] = array(
-    'fields' => array(
-        'code' => array('type' => 'varchar', 'length' => 32, 'not null' => true, 'description' => 'random code for an invitation'),
-        'user_id' => array('type' => 'int', 'not null' => true, 'description' => 'who sent the invitation'),
-        'address' => array('type' => 'varchar', 'length' => 255, 'not null' => true, 'description' => 'invitation sent to'),
-        'address_type' => array('type' => 'varchar', 'length' => 8, 'not null' => true, 'description' => 'address type ("email", "xmpp", "sms")'),
-        'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
-        'registered_user_id' => array('type' => 'int', 'not null' => false, 'description' => 'if the invitation is converted, who the new user is'),
-    ),
-    'primary key' => array('code'),
-    'foreign keys' => array(
-        'invitation_user_id_fkey' => array('user', array('user_id' => 'id')),
-        'invitation_registered_user_id_fkey' => array('user', array('registered_user_id' => 'id')),
-    ),
-    'indexes' => array(
-        'invitation_address_idx' => array('address', 'address_type'),
-        'invitation_user_id_idx' => array('user_id'),
-        'invitation_registered_user_id_idx' => array('registered_user_id'),
-    ),
-);
-
-$schema['message'] = array(
-    'fields' => array(
-        'id' => array('type' => 'serial', 'not null' => true, 'description' => 'unique identifier'),
-        'uri' => array('type' => 'varchar', 'length' => 255, 'description' => 'universally unique identifier'),
-        'from_profile' => array('type' => 'int', 'not null' => true, 'description' => 'who the message is from'),
-        'to_profile' => array('type' => 'int', 'not null' => true, 'description' => 'who the message is to'),
-        'content' => array('type' => 'text', 'description' => 'message content'),
-        'rendered' => array('type' => 'text', 'description' => 'HTML version of the content'),
-        'url' => array('type' => 'varchar', 'length' => 255, 'description' => 'URL of any attachment (image, video, bookmark, whatever)'),
-        'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
-        'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
-        'source' => array('type' => 'varchar', 'length' => 32, 'description' => 'source of comment, like "web", "im", or "clientname"'),
-    ),
-    'primary key' => array('id'),
-    'unique keys' => array(
-        'message_uri_key' => array('uri'),
-    ),
-    'foreign keys' => array(
-        'message_from_profile_fkey' => array('profile', array('from_profile' => 'id')),
-        'message_to_profile_fkey' => array('profile', array('to_profile' => 'id')),
-    ),
-    'indexes' => array(
-        // @fixme these are really terrible indexes, since you can only sort on one of them at a time.
-        // looks like we really need a (to_profile, created) for inbox and a (from_profile, created) for outbox
-        'message_from_idx' => array('from_profile'),
-        'message_to_idx' => array('to_profile'),
-        'message_created_idx' => array('created'),
-    ),
-);
-
-$schema['notice_inbox'] = array(
-    'description' => 'Obsolete; old entries here are converted to packed entries in the inbox table since 0.9',
-    'fields' => array(
-        'user_id' => array('type' => 'int', 'not null' => true, 'description' => 'user receiving the message'),
-        'notice_id' => array('type' => 'int', 'not null' => true, 'description' => 'notice received'),
-        'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date the notice was created'),
-        'source' => array('type' => 'int', 'size' => 'tiny', 'default' => 1, 'description' => 'reason it is in the inbox, 1=subscription'),
-    ),
-    'primary key' => array('user_id', 'notice_id'),
-    'foreign keys' => array(
-        'notice_inbox_user_id_fkey' => array('user', array('user_id' => 'id')),
-        'notice_inbox_notice_id_fkey' => array('notice', array('notice_id' => 'id')),
-    ),
-    'indexes' => array(
-        'notice_inbox_notice_id_idx' => array('notice_id'),
-    ),
-);
-
-$schema['profile_tag'] = array(
-    'fields' => array(
-        'tagger' => array('type' => 'int', 'not null' => true, 'description' => 'user making the tag'),
-        'tagged' => array('type' => 'int', 'not null' => true, 'description' => 'profile tagged'),
-        'tag' => array('type' => 'varchar', 'length' => 64, 'not null' => true, 'description' => 'hash tag associated with this notice'),
-        'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date the tag was added'),
-    ),
-    'primary key' => array('tagger', 'tagged', 'tag'),
-    'foreign keys' => array(
-        'profile_tag_tagger_fkey' => array('profile', array('tagger' => 'id')),
-        'profile_tag_tagged_fkey' => array('profile', array('tagged' => 'id')),
-        'profile_tag_tag_fkey' => array('profile_list', array('tag' => 'tag')),
-    ),
-    'indexes' => array(
-        'profile_tag_modified_idx' => array('modified'),
-        'profile_tag_tagger_tag_idx' => array('tagger', 'tag'),
-        'profile_tag_tagged_idx' => array('tagged'),
-    ),
-);
-
-$schema['profile_list'] = array(
-    'fields' => array(
-        'id' => array('type' => 'serial', 'not null' => true, 'description' => 'unique identifier'),
-        'tagger' => array('type' => 'int', 'not null' => true, 'description' => 'user making the tag'),
-        'tag' => array('type' => 'varchar', 'length' => 64, 'not null' => true, 'description' => 'people tag'),
-        'description' => array('type' => 'text', 'description' => 'description of the people tag'),
-        'private' => array('type' => 'int', 'size' => 'tiny', 'default' => 0, 'description' => 'is this tag private'),
-
-        'created' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date the tag was added'),
-        'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date the tag was modified'),
-
-        'uri' => array('type' => 'varchar', 'length' => 255, 'description' => 'universal identifier'),
-        'mainpage' => array('type' => 'varchar', 'length' => 255, 'description' => 'page to link to'),
-        'tagged_count' => array('type' => 'int', 'default' => 0, 'description' => 'number of people tagged with this tag by this user'),
-        'subscriber_count' => array('type' => 'int', 'default' => 0, 'description' => 'number of subscribers to this tag'),
-    ),
-    'primary key' => array('tagger', 'tag'),
-    'unique keys' => array(
-      'profile_list_id_key' => array('id')
-    ),
-    'foreign keys' => array(
-        'profile_list_tagger_fkey' => array('profile', array('tagger' => 'id')),
-    ),
-    'indexes' => array(
-        'profile_list_modified_idx' => array('modified'),
-        'profile_list_tag_idx' => array('tag'),
-        'profile_list_tagger_tag_idx' => array('tagger', 'tag'),
-        'profile_list_tagged_count_idx' => array('tagged_count'),
-        'profile_list_subscriber_count_idx' => array('subscriber_count'),
-    ),
-);
-
-$schema['profile_tag_inbox'] = array(
-    'description' => 'Many-many table listing notices associated with people tags.',
-    'fields' => array(
-        'profile_tag_id' => array('type' => 'int', 'not null' => true, 'description' => 'people tag receiving the message'),
-        'notice_id' => array('type' => 'int', 'not null' => true, 'description' => 'notice received'),
-        'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date the notice was created'),
-    ),
-    'primary key' => array('profile_tag_id', 'notice_id'),
-    'foreign keys' => array(
-        'profile_tag_inbox_profile_list_id_fkey' => array('profile_list', array('profile_tag_id' => 'id')),
-        'profile_tag_inbox_notice_id_fkey' => array('notice', array('notice_id' => 'id')),
-    ),
-    'indexes' => array(
-        'profile_tag_inbox_created_idx' => array('created'),
-        'profile_tag_inbox_profile_tag_id_idx' => array('profile_tag_id'),
-    ),
-);
-
-$schema['profile_tag_subscription'] = array(
-    'fields' => array(
-        'profile_tag_id' => array('type' => 'int', 'not null' => true, 'description' => 'foreign key to profile_tag'),
-        'profile_id' => array('type' => 'int', 'not null' => true, 'description' => 'foreign key to profile table'),
-
-        'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
-        'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
-    ),
-    'primary key' => array('profile_tag_id', 'profile_id'),
-    'foreign keys' => array(
-        'profile_tag_subscription_profile_list_id_fkey' => array('profile_list', array('profile_tag_id' => 'id')),
-        'profile_tag_subscription_profile_id_fkey' => array('profile', array('profile_id' => 'id')),
-    ),
-    'indexes' => array(
-        // @fixme probably we want a (profile_id, created) index here?
-        'profile_tag_subscription_profile_id_idx' => array('profile_id'),
-        'profile_tag_subscription_created_idx' => array('created'),
-    ),
-);
-
-$schema['profile_block'] = array(
-    'fields' => array(
-        'blocker' => array('type' => 'int', 'not null' => true, 'description' => 'user making the block'),
-        'blocked' => array('type' => 'int', 'not null' => true, 'description' => 'profile that is blocked'),
-        'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date of blocking'),
-    ),
-    'foreign keys' => array(
-        'profile_block_blocker_fkey' => array('user', array('blocker' => 'id')),
-        'profile_block_blocked_fkey' => array('profile', array('blocked' => 'id')),
-    ),
-    'primary key' => array('blocker', 'blocked'),
-);
-
-$schema['user_group'] = array(
-    'fields' => array(
-        'id' => array('type' => 'serial', 'not null' => true, 'description' => 'unique identifier'),
-
-        'nickname' => array('type' => 'varchar', 'length' => 64, 'description' => 'nickname for addressing'),
-        'fullname' => array('type' => 'varchar', 'length' => 255, 'description' => 'display name'),
-        'homepage' => array('type' => 'varchar', 'length' => 255, 'description' => 'URL, cached so we dont regenerate'),
-        'description' => array('type' => 'text', 'description' => 'group description'),
-        'location' => array('type' => 'varchar', 'length' => 255, 'description' => 'related physical location, if any'),
-
-        'original_logo' => array('type' => 'varchar', 'length' => 255, 'description' => 'original size logo'),
-        'homepage_logo' => array('type' => 'varchar', 'length' => 255, 'description' => 'homepage (profile) size logo'),
-        'stream_logo' => array('type' => 'varchar', 'length' => 255, 'description' => 'stream-sized logo'),
-        'mini_logo' => array('type' => 'varchar', 'length' => 255, 'description' => 'mini logo'),
-        'design_id' => array('type' => 'int', 'description' => 'id of a design'),
-
-        'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
-        'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
-
-        'uri' => array('type' => 'varchar', 'length' => 255, 'description' => 'universal identifier'),
-        'mainpage' => array('type' => 'varchar', 'length' => 255, 'description' => 'page for group info to link to'),
-        'join_policy' => array('type' => 'int', 'size' => 'tiny', 'description' => '0=open; 1=requires admin approval'),      
-        'force_scope' => array('type' => 'int', 'size' => 'tiny', 'description' => '0=never,1=sometimes,-1=always'),
-    ),
-    'primary key' => array('id'),
-    'unique keys' => array(
-        'user_group_uri_key' => array('uri'),
-    ),
-    'foreign keys' => array(
-        'user_group_design_id_fkey' => array('design', array('design_id' => 'id')),
-    ),
-    'indexes' => array(
-        'user_group_nickname_idx' => array('nickname'),
-    ),
-);
-
-$schema['group_member'] = array(
-    'fields' => array(
-        'group_id' => array('type' => 'int', 'not null' => true, 'description' => 'foreign key to user_group'),
-        'profile_id' => array('type' => 'int', 'not null' => true, 'description' => 'foreign key to profile table'),
-        'is_admin' => array('type' => 'int', 'size' => 'tiny', 'default' => 0, 'description' => 'is this user an admin?'),
-
-        'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
-        'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
-    ),
-    'primary key' => array('group_id', 'profile_id'),
-    'foreign keys' => array(
-        'group_member_group_id_fkey' => array('user_group', array('group_id' => 'id')),
-        'group_member_profile_id_fkey' => array('profile', array('profile_id' => 'id')),
-    ),
-    'indexes' => array(
-        // @fixme probably we want a (profile_id, created) index here?
-        'group_member_profile_id_idx' => array('profile_id'),
-        'group_member_created_idx' => array('created'),
-    ),
-);
-
-$schema['related_group'] = array(
-    // @fixme description for related_group?
-    'fields' => array(
-        'group_id' => array('type' => 'int', 'not null' => true, 'description' => 'foreign key to user_group'),
-        'related_group_id' => array('type' => 'int', 'not null' => true, 'description' => 'foreign key to user_group'),
-
-        'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
-    ),
-    'primary key' => array('group_id', 'related_group_id'),
-    'foreign keys' => array(
-        'related_group_group_id_fkey' => array('user_group', array('group_id' => 'id')),
-        'related_group_related_group_id_fkey' => array('user_group', array('related_group_id' => 'id')),
-    ),
-);
-
-$schema['group_inbox'] = array(
-    'description' => 'Many-many table listing notices posted to a given group, or which groups a given notice was posted to.',
-    'fields' => array(
-        'group_id' => array('type' => 'int', 'not null' => true, 'description' => 'group receiving the message'),
-        'notice_id' => array('type' => 'int', 'not null' => true, 'description' => 'notice received'),
-        'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date the notice was created'),
-    ),
-    'primary key' => array('group_id', 'notice_id'),
-    'foreign keys' => array(
-        'group_inbox_group_id_fkey' => array('user_group', array('group_id' => 'id')),
-        'group_inbox_notice_id_fkey' => array('notice', array('notice_id' => 'id')),
-    ),
-    'indexes' => array(
-        'group_inbox_created_idx' => array('created'),
-        'group_inbox_notice_id_idx' => array('notice_id'),
-    ),
-);
-
-$schema['file'] = array(
-    'fields' => array(
-        'id' => array('type' => 'serial', 'not null' => true),
-        'url' => array('type' => 'varchar', 'length' => 255, 'description' => 'destination URL after following redirections'),
-        'mimetype' => array('type' => 'varchar', 'length' => 50, 'description' => 'mime type of resource'),
-        'size' => array('type' => 'int', 'description' => 'size of resource when available'),
-        'title' => array('type' => 'varchar', 'length' => 255, 'description' => 'title of resource when available'),
-        'date' => array('type' => 'int', 'description' => 'date of resource according to http query'),
-        'protected' => array('type' => 'int', 'description' => 'true when URL is private (needs login)'),
-        'filename' => array('type' => 'varchar', 'length' => 255, 'description' => 'if a local file, name of the file'),
-
-        'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
-    ),
-    'primary key' => array('id'),
-    'unique keys' => array(
-        'file_url_key' => array('url'),
-    ),
-);
-
-$schema['file_oembed'] = array(
-    'fields' => array(
-        'file_id' => array('type' => 'int', 'not null' => true, 'description' => 'oEmbed for that URL/file'),
-        'version' => array('type' => 'varchar', 'length' => 20, 'description' => 'oEmbed spec. version'),
-        'type' => array('type' => 'varchar', 'length' => 20, 'description' => 'oEmbed type: photo, video, link, rich'),
-        'mimetype' => array('type' => 'varchar', 'length' => 50, 'description' => 'mime type of resource'),
-        'provider' => array('type' => 'varchar', 'length' => 50, 'description' => 'name of this oEmbed provider'),
-        'provider_url' => array('type' => 'varchar', 'length' => 255, 'description' => 'URL of this oEmbed provider'),
-        'width' => array('type' => 'int', 'description' => 'width of oEmbed resource when available'),
-        'height' => array('type' => 'int', 'description' => 'height of oEmbed resource when available'),
-        'html' => array('type' => 'text', 'description' => 'html representation of this oEmbed resource when applicable'),
-        'title' => array('type' => 'varchar', 'length' => 255, 'description' => 'title of oEmbed resource when available'),
-        'author_name' => array('type' => 'varchar', 'length' => 50, 'description' => 'author name for this oEmbed resource'),
-        'author_url' => array('type' => 'varchar', 'length' => 255, 'description' => 'author URL for this oEmbed resource'),
-        'url' => array('type' => 'varchar', 'length' => 255, 'description' => 'URL for this oEmbed resource when applicable (photo, link)'),
-        'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
-    ),
-    'primary key' => array('file_id'),
-    'foreign keys' => array(
-         'file_oembed_file_id_fkey' => array('file', array('file_id' => 'id')),
-    ),
-);
-
-$schema['file_redirection'] = array(
-    'fields' => array(
-        'url' => array('type' => 'varchar', 'length' => 255, 'not null' => true, 'description' => 'short URL (or any other kind of redirect) for file (id)'),
-        'file_id' => array('type' => 'int', 'description' => 'short URL for what URL/file'),
-        'redirections' => array('type' => 'int', 'description' => 'redirect count'),
-        'httpcode' => array('type' => 'int', 'description' => 'HTTP status code (20x, 30x, etc.)'),
-        'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
-    ),
-    'primary key' => array('url'),
-    'foreign keys' => array(
-         'file_redirection_file_id_fkey' => array('file' => array('file_id' => 'id')),
-    ),
-);
-
-$schema['file_thumbnail'] = array(
-    'fields' => array(
-        'file_id' => array('type' => 'int', 'not null' => true, 'description' => 'thumbnail for what URL/file'),
-        'url' => array('type' => 'varchar', 'length' => 255, 'description' => 'URL of thumbnail'),
-        'width' => array('type' => 'int', 'description' => 'width of thumbnail'),
-        'height' => array('type' => 'int', 'description' => 'height of thumbnail'),
-        'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
-    ),
-    'primary key' => array('file_id'),
-    'foreign keys' => array(
-        'file_thumbnail_file_id_fkey' => array('file', array('file_id' => 'id')),
-    ),
-    'unique keys' => array(
-        'file_thumbnail_url_key' => array('url'),
-    ),
-);
-
-$schema['file_to_post'] = array(
-    'fields' => array(
-        'file_id' => array('type' => 'int', 'not null' => true, 'description' => 'id of URL/file'),
-        'post_id' => array('type' => 'int', 'not null' => true, 'description' => 'id of the notice it belongs to'),
-        'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
-    ),
-    'primary key' => array('file_id', 'post_id'),
-    'foreign keys' => array(
-        'file_to_post_file_id_fkey' => array('file', array('file_id' => 'id')),
-        'file_to_post_post_id_fkey' => array('notice', array('post_id' => 'id')),
-    ),
-    'indexes' => array(
-        'post_id_idx' => array('post_id'),
-    ),
-);
-
-$schema['design'] = array(
-    'fields' => array(
-        'id' => array('type' => 'serial', 'not null' => true, 'description' => 'design ID'),
-        'backgroundcolor' => array('type' => 'int', 'description' => 'main background color'),
-        'contentcolor' => array('type' => 'int', 'description' => 'content area background color'),
-        'sidebarcolor' => array('type' => 'int', 'description' => 'sidebar background color'),
-        'textcolor' => array('type' => 'int', 'description' => 'text color'),
-        'linkcolor' => array('type' => 'int', 'description' => 'link color'),
-        'backgroundimage' => array('type' => 'varchar', 'length' => 255, 'description' => 'background image, if any'),
-        'disposition' => array('type' => 'int', 'size' => 'tiny', 'default' => 1, 'description' => 'bit 1 = hide background image, bit 2 = display background image, bit 4 = tile background image'),
-    ),
-    'primary key' => array('id'),
-);
-
-$schema['group_block'] = array(
-    'fields' => array(
-        'group_id' => array('type' => 'int', 'not null' => true, 'description' => 'group profile is blocked from'),
-        'blocked' => array('type' => 'int', 'not null' => true, 'description' => 'profile that is blocked'),
-        'blocker' => array('type' => 'int', 'not null' => true, 'description' => 'user making the block'),
-        'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date of blocking'),
-    ),
-    'primary key' => array('group_id', 'blocked'),
-    'foreign keys' => array(
-        'group_block_group_id_fkey' => array('user_group', array('group_id' => 'id')),
-        'group_block_blocked_fkey' => array('profile', array('blocked' => 'id')),
-        'group_block_blocker_fkey' => array('user', array('blocker' => 'id')),
-    ),
-);
-
-$schema['group_alias'] = array(
-    'fields' => array(
-        'alias' => array('type' => 'varchar', 'length' => 64, 'not null' => true, 'description' => 'additional nickname for the group'),
-        'group_id' => array('type' => 'int', 'not null' => true, 'description' => 'group profile is blocked from'),
-        'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date alias was created'),
-    ),
-    'primary key' => array('alias'),
-    'foreign keys' => array(
-        'group_alias_group_id_fkey' => array('user_group', array('group_id' => 'id')),
-    ),
-    'indexes' => array(
-        'group_alias_group_id_idx' => array('group_id'),
-    ),
-);
-
-$schema['session'] = array(
-    'fields' => array(
-        'id' => array('type' => 'varchar', 'length' => 32, 'not null' => true, 'description' => 'session ID'),
-        'session_data' => array('type' => 'text', 'description' => 'session data'),
-        'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
-        'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
-    ),
-    'primary key' => array('id'),
-    'indexes' => array(
-        'session_modified_idx' => array('modified'),
-    ),
-);
-
-$schema['deleted_notice'] = array(
-    'fields' => array(
-        'id' => array('type' => 'int', 'not null' => true, 'description' => 'identity of notice'),
-        'profile_id' => array('type' => 'int', 'not null' => true, 'description' => 'author of the notice'),
-        'uri' => array('type' => 'varchar', 'length' => 255, 'description' => 'universally unique identifier, usually a tag URI'),
-        'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date the notice record was created'),
-        'deleted' => array('type' => 'datetime', 'not null' => true, 'description' => 'date the notice record was created'),
-    ),
-    'primary key' => array('id'),
-    'unique keys' => array(
-        'deleted_notice_uri_key' => array('uri'),
-    ),
-    'indexes' => array(
-        'deleted_notice_profile_id_idx' => array('profile_id'),
-    ),
-);
-
-$schema['config'] = array(
-    'fields' => array(
-        'section' => array('type' => 'varchar', 'length' => 32, 'not null' => true, 'default' => '', 'description' => 'configuration section'),
-        'setting' => array('type' => 'varchar', 'length' => 32, 'not null' => true, 'default' => '', 'description' => 'configuration setting'),
-        'value' => array('type' => 'varchar', 'length' => 255, 'description' => 'configuration value'),
-    ),
-    'primary key' => array('section', 'setting'),
-);
-
-$schema['profile_role'] = array(
-    'fields' => array(
-        'profile_id' => array('type' => 'int', 'not null' => true, 'description' => 'account having the role'),
-        'role' => array('type' => 'varchar', 'length' => 32, 'not null' => true, 'description' => 'string representing the role'),
-        'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date the role was granted'),
-    ),
-    'primary key' => array('profile_id', 'role'),
-    'foreign keys' => array(
-        'profile_role_profile_id_fkey' => array('profile', array('profile_id' => 'id')),
-    ),
-);
-
-$schema['location_namespace'] = array(
-    'fields' => array(
-        'id' => array('type' => 'int', 'not null' => true, 'description' => 'identity for this namespace'),
-        'description' => array('type' => 'varchar', 'length' => 255, 'description' => 'description of the namespace'),
-        'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date the record was created'),
-        'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
-    ),
-    'primary key' => array('id'),
-);
-
-$schema['login_token'] = array(
-    'fields' => array(
-        'user_id' => array('type' => 'int', 'not null' => true, 'description' => 'user owning this token'),
-        'token' => array('type' => 'char', 'length' => 32, 'not null' => true, 'description' => 'token useable for logging in'),
-        'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
-        'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
-    ),
-    'primary key' => array('user_id'),
-    'foreign keys' => array(
-        'login_token_user_id_fkey' => array('user', array('user_id' => 'id')),
-    ),
-);
-
-$schema['user_location_prefs'] = array(
-    'fields' => array(
-        'user_id' => array('type' => 'int', 'not null' => true, 'description' => 'user who has the preference'),
-        'share_location' => array('type' => 'int', 'size' => 'tiny', 'default' => 1, 'description' => 'Whether to share location data'),
-        'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
-        'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
-    ),
-    'primary key' => array('user_id'),
-    'foreign keys' => array(
-        'user_location_prefs_user_id_fkey' => array('user', array('user_id' => 'id')),
-    ),
-);
-
-$schema['inbox'] = array(
-    'fields' => array(
-        'user_id' => array('type' => 'int', 'not null' => true, 'description' => 'user receiving the notice'),
-        'notice_ids' => array('type' => 'blob', 'description' => 'packed list of notice ids'),
-    ),
-    'primary key' => array('user_id'),
-    'foreign keys' => array(
-        'inbox_user_id_fkey' => array('user', array('user_id' => 'id')),
-    ),
-);
-
-// @fixme possibly swap this for a more general prefs table?
-$schema['user_im_prefs'] = array(
-    'fields' => array(
-        'user_id' => array('type' => 'int', 'not null' => true, 'description' => 'user'),
-        'screenname' => array('type' => 'varchar', 'length' => 255, 'not null' => true, 'description' => 'screenname on this service'),
-        'transport' => array('type' => 'varchar', 'length' => 255, 'not null' => true, 'description' => 'transport (ex xmpp, aim)'),
-        'notify' => array('type' => 'int', 'size' => 'tiny', 'not null' => true, 'default' => 0, 'description' => 'Notify when a new notice is sent'),
-        'replies' => array('type' => 'int', 'size' => 'tiny', 'not null' => true, 'default' => 0, 'description' => 'Send replies  from people not subscribed to'),
-        'microid' => array('type' => 'int', 'size' => 'tiny', 'not null' => true, 'default' => 1, 'description' => 'Publish a MicroID'),
-        'updatefrompresence' => array('type' => 'int', 'size' => 'tiny', 'not null' => true, 'default' => 0, 'description' => 'Send replies from people not subscribed to.'),
-        'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
-        'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
-    ),
-    'primary key' => array('user_id', 'transport'),
-    'unique keys' => array(
-        'transport_screenname_key' => array('transport', 'screenname'),
-    ),
-    'foreign keys' => array(
-        'user_im_prefs_user_id_fkey' => array('user', array('user_id' => 'id')),
-    ),
-);
-
-$schema['conversation'] = array(
-    'fields' => array(
-        'id' => array('type' => 'serial', 'not null' => true, 'description' => 'unique identifier'),
-        'uri' => array('type' => 'varchar', 'length' => 225, 'description' => 'URI of the conversation'),
-        'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
-        'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
-    ),
-    'primary key' => array('id'),
-    'unique keys' => array(
-        'conversation_uri_key' => array('uri'),
-    ),
-);
-
-$schema['local_group'] = array(
-    'description' => 'Record for a user group on the local site, with some additional info not in user_group',
-    'fields' => array(
-        'group_id' => array('type' => 'int', 'not null' => true, 'description' => 'group represented'),
-        'nickname' => array('type' => 'varchar', 'length' => 64, 'description' => 'group represented'),
-
-        'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
-        'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
-    ),
-    'primary key' => array('group_id'),
-    'foreign keys' => array(
-        'local_group_group_id_fkey' => array('user_group', array('group_id' => 'id')),
-    ),
-    'unique keys' => array(
-        'local_group_nickname_key' => array('nickname'),
-    ),
-);
-
-$schema['user_urlshortener_prefs'] = array(
-    'fields' => array(
-        'user_id' => array('type' => 'int', 'not null' => true, 'description' => 'user'),
-        'urlshorteningservice' => array('type' => 'varchar', 'length' => 50, 'default' => 'internal', 'description' => 'service to use for auto-shortening URLs'),
-        'maxurllength' => array('type' => 'int', 'not null' => true, 'description' => 'urls greater than this length will be shortened, 0 = always, null = never'),
-        'maxnoticelength' => array('type' => 'int', 'not null' => true, 'description' => 'notices with content greater than this value will have all urls shortened, 0 = always, null = never'),
-        
-        'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
-        'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
-    ),
-    'primary key' => array('user_id'),
-    'foreign keys' => array(
-        'user_urlshortener_prefs_user_id_fkey' => array('user', array('user_id' => 'id')),
-    ),
-);
-
-$schema['schema_version'] = array(
-    'description' => 'To avoid checking database structure all the time, we store a checksum of the expected schema info for each table here. If it has not changed since the last time we checked the table, we can leave it as is.',
-    'fields' => array(
-        'table_name' => array('type' => 'varchar', 'length' => '64', 'not null' => true, 'description' => 'Table name'),
-        'checksum' => array('type' => 'varchar', 'length' => '64', 'not null' => true, 'description' => 'Checksum of schema array; a mismatch indicates we should check the table more thoroughly.'),
-        'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
-    ),
-    'primary key' => array('table_name'),
-);
-
-$schema['group_join_queue'] = Group_join_queue::schemaDef();
-
-$schema['subscription_queue'] = Subscription_queue::schemaDef();
+foreach ($classes as $cls) {
+    $schema[strtolower($cls)] = call_user_func(array($cls, 'schemaDef'));
+}
diff --git a/db/innodb.sql b/db/innodb.sql
deleted file mode 100644
index f3ab6cd690..0000000000
--- a/db/innodb.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-alter table profile drop index nickname, engine=InnoDB;
-alter table notice drop index content, engine=InnoDB;
diff --git a/db/rc2torc3.sql b/db/rc2torc3.sql
deleted file mode 100644
index 886b9adf22..0000000000
--- a/db/rc2torc3.sql
+++ /dev/null
@@ -1,17 +0,0 @@
-create table user_location_prefs (
-    user_id integer not null comment 'user who has the preference' references user (id),
-    share_location tinyint default 1 comment 'Whether to share location data',
-    created datetime not null comment 'date this record was created',
-    modified timestamp comment 'date this record was modified',
-
-    constraint primary key (user_id)
-) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
-
-create table inbox (
-
-    user_id integer not null comment 'user receiving the notice' references user (id),
-    notice_ids blob comment 'packed list of notice ids',
-
-    constraint primary key (user_id)
-
-) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
diff --git a/db/rc3torc4.sql b/db/rc3torc4.sql
deleted file mode 100644
index 917c1f1c41..0000000000
--- a/db/rc3torc4.sql
+++ /dev/null
@@ -1,50 +0,0 @@
-create table queue_item_new (
-    id integer auto_increment primary key comment 'unique identifier',
-    frame blob not null comment 'data: object reference or opaque string',
-    transport varchar(8) not null comment 'queue for what? "email", "jabber", "sms", "irc", ...',
-    created datetime not null comment 'date this record was created',
-    claimed datetime comment 'date this item was claimed',
-
-    index queue_item_created_idx (created)
-
-) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
-
-insert into queue_item_new (frame,transport,created,claimed)
-    select notice_id,transport,created,claimed from queue_item;
-alter table queue_item rename to queue_item_old;
-alter table queue_item_new rename to queue_item;
-
-alter table consumer
-    add consumer_secret varchar(255) not null comment 'secret value';
-
-alter table token
-    add verifier varchar(255) comment 'verifier string for OAuth 1.0a',
-    add verified_callback varchar(255) comment 'verified callback URL for OAuth 1.0a';
-
-create table oauth_application (
-    id integer auto_increment primary key comment 'unique identifier',
-    owner integer not null comment 'owner of the application' references profile (id),
-    consumer_key varchar(255) not null comment 'application consumer key' references consumer (consumer_key),
-    name varchar(255) not null comment 'name of the application',
-    description varchar(255) comment 'description of the application',
-    icon varchar(255) not null comment 'application icon',
-    source_url varchar(255) comment 'application homepage - used for source link',
-    organization varchar(255) comment 'name of the organization running the application',
-    homepage varchar(255) comment 'homepage for the organization',
-    callback_url varchar(255) comment 'url to redirect to after authentication',
-    type tinyint default 0 comment 'type of app, 1 = browser, 2 = desktop',
-    access_type tinyint default 0 comment 'default access type, bit 1 = read, bit 2 = write',
-    created datetime not null comment 'date this record was created',
-    modified timestamp comment 'date this record was modified'
-) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
-
-create table oauth_application_user (
-    profile_id integer not null comment 'user of the application' references profile (id),
-    application_id integer not null comment 'id of the application' references oauth_application (id),
-    access_type tinyint default 0 comment 'access type, bit 1 = read, bit 2 = write, bit 3 = revoked',
-    token varchar(255) comment 'request or access token',
-    created datetime not null comment 'date this record was created',
-    modified timestamp comment 'date this record was modified',
-    constraint primary key (profile_id, application_id)
-) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
-
diff --git a/db/site_093to094.sql b/db/site_093to094.sql
deleted file mode 100644
index 30cea31dfa..0000000000
--- a/db/site_093to094.sql
+++ /dev/null
@@ -1,13 +0,0 @@
-alter table status_network 
-      drop primary key,
-      add column site_id integer auto_increment primary key first,
-      add unique key (nickname);
-
-create table status_network_tag (
-    site_id integer  comment 'unique id',
-    tag varchar(64) comment 'tag name',
-    created datetime not null comment 'date the record was created',
-
-    constraint primary key (site_id, tag)
-) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_general_ci;
-
diff --git a/db/statusnet.sql b/db/statusnet.sql
deleted file mode 100644
index 29a555948b..0000000000
--- a/db/statusnet.sql
+++ /dev/null
@@ -1,759 +0,0 @@
-/* local and remote users have profiles */
-
-create table profile (
-
-    id integer auto_increment primary key comment 'unique identifier',
-    nickname varchar(64) not null comment 'nickname or username',
-    fullname varchar(255) comment 'display name',
-    profileurl varchar(255) comment 'URL, cached so we dont regenerate',
-    homepage varchar(255) comment 'identifying URL',
-    bio text comment 'descriptive biography',
-    location varchar(255) comment 'physical location',
-    lat decimal(10,7) comment 'latitude',
-    lon decimal(10,7) comment 'longitude',
-    location_id integer comment 'location id if possible',
-    location_ns integer comment 'namespace for location',
-
-    created datetime not null comment 'date this record was created',
-    modified timestamp comment 'date this record was modified',
-
-    index profile_nickname_idx (nickname),
-    FULLTEXT(nickname, fullname, location, bio, homepage)
-) ENGINE=MyISAM CHARACTER SET utf8 COLLATE utf8_general_ci;
-
-create table avatar (
-    profile_id integer not null comment 'foreign key to profile table' references profile (id),
-    original boolean default false comment 'uploaded by user or generated?',
-    width integer not null comment 'image width',
-    height integer not null comment 'image height',
-    mediatype varchar(32) not null comment 'file type',
-    filename varchar(255) null comment 'local filename, if local',
-    url varchar(255) unique key comment 'avatar location',
-    created datetime not null comment 'date this record was created',
-    modified timestamp comment 'date this record was modified',
-
-    constraint primary key (profile_id, width, height),
-    index avatar_profile_id_idx (profile_id)
-) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
-
-create table 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',
-    modified timestamp comment 'date this record was modified'
-) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
-
-/* local users */
-
-create table user (
-
-    id integer primary key comment 'foreign key to profile table' references profile (id),
-    nickname varchar(64) unique key comment 'nickname or username, duped in profile',
-    password varchar(255) comment 'salted password, can be null for OpenID users',
-    email varchar(255) unique key comment 'email address for password recovery etc.',
-    incomingemail varchar(255) unique key comment 'email address for post-by-email',
-    emailnotifysub tinyint default 1 comment 'Notify by email of subscriptions',
-    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',
-    emailpost tinyint default 1 comment 'Post by email',
-    sms varchar(64) unique key comment 'sms phone number',
-    carrier integer comment 'foreign key to sms_carrier' references sms_carrier (id),
-    smsnotify tinyint default 0 comment 'whether to send notices to SMS',
-    smsreplies tinyint default 0 comment 'whether to send notices to SMS on replies',
-    smsemail varchar(255) comment 'built from sms and carrier',
-    uri varchar(255) unique key comment 'universally unique identifier, usually a tag URI',
-    autosubscribe tinyint 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 tinyint default 0 comment 'has an inbox been created for this user?',
-    design_id integer comment 'id of a design' references design(id),
-    viewdesigns tinyint default 1 comment 'whether to view user-provided designs',
-
-    created datetime not null comment 'date this record was created',
-    modified timestamp comment 'date this record was modified',
-
-    index user_smsemail_idx (smsemail)
-) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_general_ci;
-
-/* remote people */
-
-create table remote_profile (
-    id integer primary key comment 'foreign key to profile table' references profile (id),
-    uri varchar(255) unique key 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 datetime not null comment 'date this record was created',
-    modified timestamp comment 'date this record was modified'
-) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
-
-create table subscription (
-    subscriber integer not null comment 'profile listening',
-    subscribed integer not null comment 'profile being listened to',
-    jabber tinyint default 1 comment 'deliver jabber messages',
-    sms tinyint default 1 comment 'deliver sms messages',
-    token varchar(255) comment 'authorization token',
-    secret varchar(255) comment 'token secret',
-    created datetime not null comment 'date this record was created',
-    modified timestamp comment 'date this record was modified',
-
-    constraint primary key (subscriber, subscribed),
-    index subscription_subscriber_idx (subscriber, created),
-    index subscription_subscribed_idx (subscribed, created),
-    index subscription_token_idx (token)
-) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
-
-create table notice (
-    id integer auto_increment primary key comment 'unique identifier',
-    profile_id integer not null comment 'who made the update' references profile (id),
-    uri varchar(255) unique key comment 'universally unique identifier, usually a tag URI',
-    content text comment 'update content',
-    rendered text comment 'HTML version of the content',
-    url varchar(255) comment 'URL of any attachment (image, video, bookmark, whatever)',
-    created datetime not null 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 tinyint default 0 comment 'notice was generated by a user',
-    source varchar(32) comment 'source of comment, like "web", "im", or "clientname"',
-    conversation integer comment 'id of root notice in this conversation' references notice (id),
-    lat decimal(10,7) comment 'latitude',
-    lon decimal(10,7) comment 'longitude',
-    location_id integer comment 'location id if possible',
-    location_ns integer comment 'namespace for location',
-    repeat_of integer comment 'notice this is a repeat of' references notice (id),
-
-    -- For public timeline...
-    index notice_created_id_is_local_idx (created,id,is_local),
-
-    -- For profile timelines...
-    index notice_profile_id_idx (profile_id,created,id),
-
-    -- For api/statuses/repeats...
-    index notice_repeat_of_created_id_idx (repeat_of, created, id),
-
-    -- For conversation views
-    index notice_conversation_created_id_idx (conversation, created, id),
-
-    -- Are these needed/used?
-    index notice_replyto_idx (reply_to),
-
-    FULLTEXT(content)
-) ENGINE=MyISAM CHARACTER SET utf8 COLLATE utf8_general_ci;
-
-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 datetime not null comment 'date this record was created',
-     modified timestamp comment 'date this record was modified'
-) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
-
-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 comment 'date this record was modified',
-    replied_id integer comment 'notice replied to (not used, see notice.reply_to)',
-
-    constraint primary key (notice_id, profile_id),
-    index reply_notice_id_idx (notice_id),
-    index reply_profile_id_idx (profile_id),
-    index reply_replied_id_idx (replied_id),
-
-    -- Needed for sorting reply/mentions timelines
-    index reply_profile_id_modified_notice_id_idx (profile_id, modified, notice_id)
-
-) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
-
-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',
-
-    constraint primary key (notice_id, user_id),
-    index fave_notice_id_idx (notice_id),
-    index fave_user_id_idx (user_id,modified),
-    index fave_modified_idx (modified)
-
-) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
-
-/* tables for OAuth */
-
-create table consumer (
-    consumer_key varchar(255) primary key comment 'unique identifier, root URL',
-    consumer_secret varchar(255) not null comment 'secret value',
-    seed char(32) not null comment 'seed for new tokens by this consumer',
-
-    created datetime not null comment 'date this record was created',
-    modified timestamp comment 'date this record was modified'
-) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
-
-create table token (
-    consumer_key varchar(255) not null comment 'unique identifier, root URL' references consumer (consumer_key),
-    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',
-    verifier varchar(255) comment 'verifier string for OAuth 1.0a',
-    verified_callback varchar(255) comment 'verified callback URL for OAuth 1.0a',
-
-    created datetime not null comment 'date this record was created',
-    modified timestamp comment 'date this record was modified',
-
-    constraint primary key (consumer_key, tok)
-) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
-
-create table nonce (
-    consumer_key varchar(255) not null comment 'unique identifier, root URL',
-    tok char(32) null comment 'buggy old value, ignored',
-    nonce char(32) not null comment 'nonce',
-    ts datetime not null comment 'timestamp sent',
-
-    created datetime not null comment 'date this record was created',
-    modified timestamp comment 'date this record was modified',
-
-    constraint primary key (consumer_key, ts, nonce)
-) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
-
-create table oauth_application (
-    id integer auto_increment primary key comment 'unique identifier',
-    owner integer not null comment 'owner of the application' references profile (id),
-    consumer_key varchar(255) not null comment 'application consumer key' references consumer (consumer_key),
-    name varchar(255) not null unique key comment 'name of the application',
-    description varchar(255) comment 'description of the application',
-    icon varchar(255) not null comment 'application icon',
-    source_url varchar(255) comment 'application homepage - used for source link',
-    organization varchar(255) comment 'name of the organization running the application',
-    homepage varchar(255) comment 'homepage for the organization',
-    callback_url varchar(255) comment 'url to redirect to after authentication',
-    type tinyint default 0 comment 'type of app, 1 = browser, 2 = desktop',
-    access_type tinyint default 0 comment 'default access type, bit 1 = read, bit 2 = write',
-    created datetime not null comment 'date this record was created',
-    modified timestamp comment 'date this record was modified'
-) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
-
-create table oauth_application_user (
-    profile_id integer not null comment 'user of the application' references profile (id),
-    application_id integer not null comment 'id of the application' references oauth_application (id),
-    access_type tinyint default 0 comment 'access type, bit 1 = read, bit 2 = write',
-    token varchar(255) comment 'request or access token',
-    created datetime not null comment 'date this record was created',
-    modified timestamp comment 'date this record was modified',
-    constraint primary key (profile_id, application_id)
-) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
-
-create table oauth_token_association (
-    profile_id integer not null comment 'user of the application' references profile (id),
-    application_id integer not null comment 'id of the application' references oauth_application (id),
-    token varchar(255) comment 'request or access token',
-    created datetime not null comment 'date this record was created',
-    modified timestamp comment 'date this record was modified',
-    constraint primary key (profile_id, application_id, token)
-) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
-
-/* These are used by JanRain OpenID library */
-
-create table oid_associations (
-    server_url BLOB,
-    handle VARCHAR(255) character set latin1,
-    secret BLOB,
-    issued INTEGER,
-    lifetime INTEGER,
-    assoc_type VARCHAR(64),
-    PRIMARY KEY (server_url(255), handle)
-) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
-
-create table oid_nonces (
-    server_url VARCHAR(2047),
-    timestamp INTEGER,
-    salt CHAR(40),
-    UNIQUE (server_url(255), timestamp, salt)
-) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
-
-create table confirm_address (
-    code varchar(32) not null primary key comment 'good random code',
-    user_id integer not null comment 'user who requested confirmation' references user (id),
-    address varchar(255) not null comment 'address (email, xmpp, SMS, etc.)',
-    address_extra varchar(255) not null comment 'carrier ID, for SMS',
-    address_type varchar(8) not null comment 'address type ("email", "xmpp", "sms")',
-    claimed datetime comment 'date this was claimed for queueing',
-    sent datetime comment 'date this was sent for queueing',
-    modified timestamp comment 'date this record was modified'
-) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
-
-create table remember_me (
-    code varchar(32) not null primary key comment 'good random code',
-    user_id integer not null comment 'user who is logged in' references user (id),
-    modified timestamp comment 'date this record was modified'
-) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
-
-create table queue_item (
-    id integer auto_increment primary key comment 'unique identifier',
-    frame blob not null comment 'data: object reference or opaque string',
-    transport varchar(8) not null comment 'queue for what? "email", "xmpp", "sms", "irc", ...',
-    created datetime not null comment 'date this record was created',
-    claimed datetime comment 'date this item was claimed',
-
-    index queue_item_created_idx (created)
-
-) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
-
-/* Hash tags */
-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 datetime not null comment 'date this record was created',
-
-    constraint primary key (tag, notice_id),
-    index notice_tag_created_idx (created),
-    index notice_tag_notice_id_idx (notice_id),
-
-    -- For sorting tag-filtered public timeline
-    index notice_tag_tag_created_notice_id_idx (tag, created, notice_id)
-) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
-
-/* Synching with foreign services */
-
-create table foreign_service (
-     id int not null primary key comment 'numeric key for service',
-     name varchar(32) not null unique key comment 'name of the service',
-     description varchar(255) comment 'description',
-     created datetime not null comment 'date this record was created',
-     modified timestamp comment 'date this record was modified'
-) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
-
-create table foreign_user (
-     id bigint not null 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 key comment 'identifying URI',
-     nickname varchar(255) comment 'nickname on foreign service',
-     created datetime not null comment 'date this record was created',
-     modified timestamp comment 'date this record was modified',
-
-     constraint primary key (id, service)
-) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
-
-create table foreign_link (
-     user_id int comment 'link to user on this system, if exists' references user (id),
-     foreign_id bigint unsigned comment 'link to user on foreign service, if exists' references foreign_user(id),
-     service int not null comment 'foreign key to service' references foreign_service(id),
-     credentials varchar(255) comment 'authc credentials, typically a password',
-     noticesync tinyint not null default 1 comment 'notice synchronization, bit 1 = sync outgoing, bit 2 = sync incoming, bit 3 = filter local replies',
-     friendsync tinyint not null default 2 comment 'friend synchronization, bit 1 = sync outgoing, bit 2 = sync incoming',
-     profilesync tinyint not null default 1 comment 'profile synchronization, bit 1 = sync outgoing, bit 2 = sync incoming',
-     last_noticesync datetime default null comment 'last time notices were imported',
-     last_friendsync datetime default null comment 'last time friends were imported',
-     created datetime not null comment 'date this record was created',
-     modified timestamp comment 'date this record was modified',
-
-     constraint primary key (user_id, foreign_id, service),
-     index foreign_user_user_id_idx (user_id)
-) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
-
-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' references foreign_user (id),
-     subscribed int not null comment 'subscribed user' references foreign_user (id),
-     created datetime not null comment 'date this record was created',
-
-     constraint primary key (service, subscriber, subscribed),
-     index foreign_subscription_subscriber_idx (subscriber),
-     index foreign_subscription_subscribed_idx (subscribed)
-) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
-
-create table invitation (
-     code varchar(32) not null primary key comment 'random code for an 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", "xmpp", "sms")',
-     created datetime not null comment 'date this record was created',
-
-     index invitation_address_idx (address, address_type),
-     index invitation_user_id_idx (user_id)
-) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
-
-create table message (
-    id integer auto_increment primary key comment 'unique identifier',
-    uri varchar(255) unique key comment 'universally unique identifier',
-    from_profile integer not null comment 'who the message is from' references profile (id),
-    to_profile integer not null comment 'who the message is to' references profile (id),
-    content text comment 'message content',
-    rendered text comment 'HTML version of the content',
-    url varchar(255) comment 'URL of any attachment (image, video, bookmark, whatever)',
-    created datetime not null 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"',
-
-    index message_from_idx (from_profile),
-    index message_to_idx (to_profile),
-    index message_created_idx (created)
-) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_general_ci;
-
-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',
-
-    constraint primary key (user_id, notice_id),
-    index notice_inbox_notice_id_idx (notice_id)
-) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
-
-create table profile_tag (
-   tagger integer not null comment 'user making the tag' references profile (id),
-   tagged integer not null comment 'profile tagged' references profile (id),
-   tag varchar(64) not null comment 'hash tag associated with this notice',
-   modified timestamp comment 'date the tag was added',
-
-   constraint primary key (tagger, tagged, tag),
-   index profile_tag_modified_idx (modified),
-   index profile_tag_tagger_tag_idx (tagger, tag),
-   index profile_tag_tagged_idx (tagged)
-) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
-
-/* people tag metadata */
-create table profile_list (
-    id integer auto_increment unique key comment 'unique identifier',
-    tagger integer not null comment 'user making the tag' references profile (id),
-    tag varchar(64) not null comment 'hash tag',
-    description text comment 'description for the tag',
-    private tinyint(1) default 0 comment 'is this list private',
-
-    created datetime not null comment 'date this record was created',
-    modified timestamp comment 'date this record was modified',
-
-    uri varchar(255) unique key comment 'universal identifier',
-    mainpage varchar(255) comment 'page for tag info info to link to',
-    tagged_count smallint not null default 0 comment 'number of people tagged',
-    subscriber_count smallint not null default 0 comment 'number of people subscribing',
-
-    constraint primary key (tagger, tag),
-    index profile_list_tag_idx (tag),
-    index profile_list_tagged_count_idx (tagged_count),
-    index profile_list_modified_idx (modified),
-    index profile_list_subscriber_count_idx (subscriber_count)
-) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
-
-create table profile_tag_inbox (
-    profile_tag_id integer not null comment 'peopletag receiving the message' references profile_tag (id),
-    notice_id integer not null comment 'notice received' references notice (id),
-    created datetime not null comment 'date the notice was created',
-
-    constraint primary key (profile_tag_id, notice_id),
-    index profile_tag_inbox_created_idx (created),
-    index profile_tag_inbox_notice_id_idx (notice_id)
-
-) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
-
-create table profile_tag_subscription (
-    profile_tag_id integer not null comment 'foreign key to profile_tag' references profile_list (id),
-
-    profile_id integer not null comment 'foreign key to profile table' references profile (id),
-    created datetime not null comment 'date this record was created',
-    modified timestamp comment 'date this record was modified',
-
-    constraint primary key (profile_tag_id, profile_id),
-    index profile_tag_subscription_profile_id_idx (profile_id),
-    index profile_tag_subscription_created_idx (created)
-
-) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
-
-create table profile_block (
-   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',
-
-   constraint primary key (blocker, blocked)
-
-) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
-
-create table user_group (
-    id integer auto_increment primary key comment 'unique identifier',
-
-    nickname varchar(64) comment 'nickname for addressing',
-    fullname varchar(255) comment 'display name',
-    homepage varchar(255) comment 'URL, cached so we dont regenerate',
-    description text comment 'group description',
-    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',
-    design_id integer comment 'id of a design' references design(id),
-
-    created datetime not null comment 'date this record was created',
-    modified timestamp comment 'date this record was modified',
-
-    uri varchar(255) unique key comment 'universal identifier',
-    mainpage varchar(255) comment 'page for group info to link to',
-
-    index user_group_nickname_idx (nickname)
-
-) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_general_ci;
-
-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 boolean default false comment 'is this user an admin?',
-
-    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),
-    index group_member_profile_id_idx (profile_id),
-    index group_member_created_idx (created),
-
-    -- To pull up a list of someone's groups in order joined
-    index group_member_profile_id_created_idx (profile_id, created)
-
-) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
-
-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 datetime not null comment 'date this record was created',
-
-    constraint primary key (group_id, related_group_id)
-
-) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
-
-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 datetime not null comment 'date the notice was created',
-
-    constraint primary key (group_id, notice_id),
-    index group_inbox_created_idx (created),
-    index group_inbox_notice_id_idx (notice_id),
-
-    -- Needed for sorting group messages by timestamp
-    index group_inbox_group_id_created_notice_id_idx (group_id, created, notice_id)
-
-) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
-
-create table file (
-
-    id integer primary key auto_increment,
-    url varchar(255) comment 'destination URL after following redirections',
-    mimetype varchar(50) comment 'mime type of resource',
-    size integer comment 'size of resource when available',
-    title varchar(255) comment 'title of resource when available',
-    date integer(11) comment 'date of resource according to http query',
-    protected integer(1) comment 'true when URL is private (needs login)',
-    filename varchar(255) comment 'if a local file, name of the file',
-
-    modified timestamp comment 'date this record was modified',
-
-    unique(url)
-) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_general_ci;
-
-create table file_oembed (
-    file_id integer primary key comment 'oEmbed for that URL/file' references file (id),
-    version varchar(20) comment 'oEmbed spec. version',
-    type varchar(20) comment 'oEmbed type: photo, video, link, rich',
-    mimetype varchar(50) comment 'mime type of resource',
-    provider varchar(50) comment 'name of this oEmbed provider',
-    provider_url varchar(255) comment 'URL of this oEmbed provider',
-    width integer comment 'width of oEmbed resource when available',
-    height integer comment 'height of oEmbed resource when available',
-    html text comment 'html representation of this oEmbed resource when applicable',
-    title varchar(255) comment 'title of oEmbed resource when available',
-    author_name varchar(50) comment 'author name for this oEmbed resource',
-    author_url varchar(255) comment 'author URL for this oEmbed resource',
-    url varchar(255) comment 'URL for this oEmbed resource when applicable (photo, link)',
-    modified timestamp comment 'date this record was modified'
-
-) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_general_ci;
-
-create table file_redirection (
-
-    url varchar(255) primary key comment 'short URL (or any other kind of redirect) for file (id)',
-    file_id integer comment 'short URL for what URL/file' references file (id),
-    redirections integer comment 'redirect count',
-    httpcode integer comment 'HTTP status code (20x, 30x, etc.)',
-    modified timestamp comment 'date this record was modified'
-
-) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
-
-create table file_thumbnail (
-
-    file_id integer primary key comment 'thumbnail for what URL/file' references file (id),
-    url varchar(255) comment 'URL of thumbnail',
-    width integer comment 'width of thumbnail',
-    height integer comment 'height of thumbnail',
-    modified timestamp comment 'date this record was modified',
-
-    unique(url)
-) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
-
-create table file_to_post (
-
-    file_id integer comment 'id of URL/file' references file (id),
-    post_id integer comment 'id of the notice it belongs to' references notice (id),
-    modified timestamp comment 'date this record was modified',
-
-    constraint primary key (file_id, post_id),
-    index post_id_idx (post_id)
-
-) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
-
-create table design (
-    id integer primary key auto_increment comment 'design ID',
-    backgroundcolor integer comment 'main background color',
-    contentcolor integer comment 'content area background color',
-    sidebarcolor integer comment 'sidebar background color',
-    textcolor integer comment 'text color',
-    linkcolor integer comment 'link color',
-    backgroundimage varchar(255) comment 'background image, if any',
-    disposition tinyint default 1 comment 'bit 1 = hide background image, bit 2 = display background image, bit 4 = tile background image'
-) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
-
-create table group_block (
-   group_id integer not null comment 'group profile is blocked from' references user_group (id),
-   blocked integer not null comment 'profile that is blocked' references profile (id),
-   blocker integer not null comment 'user making the block' references user (id),
-   modified timestamp comment 'date of blocking',
-
-   constraint primary key (group_id, blocked)
-
-) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
-
-create table group_alias (
-
-   alias varchar(64) primary key comment 'additional nickname for the group',
-   group_id integer not null comment 'group profile is blocked from' references user_group (id),
-   modified timestamp comment 'date alias was created',
-
-   index group_alias_group_id_idx (group_id)
-
-) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
-
-create table session (
-
-    id varchar(32) primary key comment 'session ID',
-    session_data text comment 'session data',
-    created datetime not null comment 'date this record was created',
-    modified timestamp comment 'date this record was modified',
-
-    index session_modified_idx (modified)
-
-) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
-
-create table deleted_notice (
-
-    id integer primary key comment 'identity of notice',
-    profile_id integer not null comment 'author of the notice',
-    uri varchar(255) unique key comment 'universally unique identifier, usually a tag URI',
-    created datetime not null comment 'date the notice record was created',
-    deleted datetime not null comment 'date the notice record was created',
-
-    index deleted_notice_profile_id_idx (profile_id)
-
-) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
-
-create table config (
-
-    section varchar(32) comment 'configuration section',
-    setting varchar(32) comment 'configuration setting',
-    value varchar(255) comment 'configuration value',
-
-    constraint primary key (section, setting)
-
-) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
-
-create table profile_role (
-
-    profile_id integer not null comment 'account having the role' references profile (id),
-    role    varchar(32) not null comment 'string representing the role',
-    created datetime not null comment 'date the role was granted',
-
-    constraint primary key (profile_id, role),
-    index profile_role_role_created_profile_id_idx (role, created, profile_id)
-
-) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
-
-create table location_namespace (
-
-    id integer primary key comment 'identity for this namespace',
-    description varchar(255) comment 'description of the namespace',
-    created datetime not null comment 'date the record was created',
-    modified timestamp comment 'date this record was modified'
-
-) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
-
-create table login_token (
-    user_id integer not null comment 'user owning this token' references user (id),
-    token char(32) not null comment 'token useable for logging in',
-    created datetime not null comment 'date this record was created',
-    modified timestamp comment 'date this record was modified',
-
-    constraint primary key (user_id)
-) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
-
-create table user_location_prefs (
-    user_id integer not null comment 'user who has the preference' references user (id),
-    share_location tinyint default 1 comment 'Whether to share location data',
-    created datetime not null comment 'date this record was created',
-    modified timestamp comment 'date this record was modified',
-
-    constraint primary key (user_id)
-) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
-
-create table inbox (
-
-    user_id integer not null comment 'user receiving the notice' references user (id),
-    notice_ids blob comment 'packed list of notice ids',
-
-    constraint primary key (user_id)
-
-) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
-
-create table user_im_prefs (
-    user_id integer not null comment 'user' references user (id),
-    screenname varchar(255) not null comment 'screenname on this service',
-    transport varchar(255) not null comment 'transport (ex xmpp, aim)',
-    notify tinyint(1) not null default 0 comment 'Notify when a new notice is sent',
-    replies tinyint(1) not null default 0 comment 'Send replies  from people not subscribed to',
-    microid tinyint(1) not null default 1 comment 'Publish a MicroID',
-    updatefrompresence tinyint(1) not null default 0 comment 'Send replies  from people not subscribed to.',
-    created timestamp not null DEFAULT CURRENT_TIMESTAMP comment 'date this record was created',
-    modified timestamp comment 'date this record was modified',
-
-    constraint primary key (user_id, transport),
-    constraint unique key `transport_screenname_key` ( `transport` , `screenname` )
-) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
-
-create table conversation (
-    id integer auto_increment primary key comment 'unique identifier',
-    uri varchar(225) unique comment 'URI of the conversation',
-    created datetime not null comment 'date this record was created',
-    modified timestamp comment 'date this record was modified'
-) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
-
-create table local_group (
-
-   group_id integer primary key comment 'group represented' references user_group (id),
-   nickname varchar(64) unique key comment 'group represented',
-
-   created datetime not null comment 'date this record was created',
-   modified timestamp comment 'date this record was modified'
-
-) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
-
-create table user_urlshortener_prefs (
-
-   user_id integer not null comment 'user' references user (id),
-   urlshorteningservice varchar(50) default 'ur1.ca' comment 'service to use for auto-shortening URLs',
-   maxurllength integer not null comment 'urls greater than this length will be shortened, 0 = always, null = never',
-   maxnoticelength integer not null comment 'notices with content greater than this value will have all urls shortened, 0 = always, null = never',
-
-   created datetime not null comment 'date this record was created',
-   modified timestamp comment 'date this record was modified',
-
-   constraint primary key (user_id)
-) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
diff --git a/db/statusnet_pg.sql b/db/statusnet_pg.sql
deleted file mode 100644
index fe0758de89..0000000000
--- a/db/statusnet_pg.sql
+++ /dev/null
@@ -1,649 +0,0 @@
-/* local and remote users have profiles */
-create sequence profile_seq;
-create table profile (
-    id bigint default nextval('profile_seq') primary key /* comment 'unique identifier' */,
-    nickname varchar(64) not null /* comment 'nickname or username' */,
-    fullname varchar(255) /* comment 'display name' */,
-    profileurl varchar(255) /* comment 'URL, cached so we dont regenerate' */,
-    homepage varchar(255) /* comment 'identifying URL' */,
-    bio varchar(140) /* comment 'descriptive biography' */,
-    location varchar(255) /* comment 'physical location' */,
-    lat decimal(10,7) /* comment 'latitude'*/ ,
-    lon decimal(10,7) /* comment 'longitude'*/ ,
-    location_id integer /* comment 'location id if possible'*/ ,
-    location_ns integer /* comment 'namespace for location'*/ ,
-    created timestamp not null default CURRENT_TIMESTAMP /* comment 'date this record was created' */,
-    modified timestamp /* comment 'date this record was modified' */,
-
-    textsearch tsvector
-);
-create index profile_nickname_idx on profile using btree(nickname);
-
-create table avatar (
-    profile_id integer not null /* comment 'foreign key to profile table' */ references profile (id) ,
-    original integer default 0 /* comment 'uploaded by user or generated?' */,
-    width integer not null /* comment 'image width' */,
-    height integer not null /* comment 'image height' */,
-    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 default CURRENT_TIMESTAMP /* comment 'date this record was created' */,
-    modified timestamp /* comment 'date this record was modified' */,
-
-    primary key(profile_id, width, height)
-);
-create index avatar_profile_id_idx on avatar using btree(profile_id);
-
-create sequence sms_carrier_seq;
-create table sms_carrier (
-    id bigint default nextval('sms_carrier_seq') 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 default CURRENT_TIMESTAMP /* comment 'date this record was created' */,
-    modified timestamp /* comment 'date this record was modified ' */
-);
-
-create sequence design_seq;
-create table design (
-    id bigint default nextval('design_seq') /* comment 'design ID'*/,
-    backgroundcolor integer /* comment 'main background color'*/ ,
-    contentcolor integer /*comment 'content area background color'*/ ,
-    sidebarcolor integer /*comment 'sidebar background color'*/ ,
-    textcolor integer /*comment 'text color'*/ ,
-    linkcolor integer /*comment 'link color'*/,
-    backgroundimage varchar(255) /*comment 'background image, if any'*/,
-    disposition int default 1 /*comment 'bit 1 = hide background image, bit 2 = display background image, bit 4 = tile background image'*/,
-    primary key (id)
-);
-
-/* local users */
-
-create table "user" (
-    id integer primary key /* comment 'foreign key to profile table' */ references profile (id) ,
-    nickname varchar(64) unique /* comment 'nickname or username, duped in profile' */,
-    password varchar(255) /* comment 'salted password, can be null for OpenID users' */,
-    email varchar(255) unique /* comment 'email address for password recovery etc.' */,
-    incomingemail varchar(255) unique /* comment 'email address for post-by-email' */,
-    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' */,
-    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' */,
-    jabber varchar(255) unique /* comment 'jabber ID for notices' */,
-    jabbernotify integer default 0 /* comment 'whether to send notices to jabber' */,
-    jabberreplies integer default 0 /* comment 'whether to send notices to jabber on replies' */,
-    jabbermicroid integer default 1 /* comment 'whether to publish xmpp microid' */,
-    updatefrompresence integer default 0 /* comment 'whether to record updates from Jabber presence notices' */,
-    sms varchar(64) unique /* comment 'sms phone number' */,
-    carrier integer /* comment 'foreign key to sms_carrier' */ references sms_carrier (id) ,
-    smsnotify integer default 0 /* comment 'whether to send notices to SMS' */,
-    smsreplies integer default 0 /* comment 'whether to send notices to SMS on replies' */,
-    smsemail varchar(255) /* comment 'built from sms and carrier' */,
-    uri varchar(255) unique /* comment 'universally unique identifier, usually a tag URI' */,
-    autosubscribe integer default 0 /* comment 'automatically subscribe to users who subscribe to us' */,
-    urlshorteningservice varchar(50) default 'ur1.ca' /* comment 'service to use for auto-shortening URLs' */,
-    inboxed integer default 0 /* comment 'has an inbox been created for this user?' */,
-    design_id integer /* comment 'id of a design' */references design(id),
-    viewdesigns integer default 1 /* comment 'whether to view user-provided designs'*/,
-    created timestamp not null default CURRENT_TIMESTAMP /* comment 'date this record was created' */,
-    modified timestamp /* comment 'date this record was modified' */
-
-);
-create index user_smsemail_idx on "user" using btree(smsemail);
-
-/* remote people */
-
-create table remote_profile (
-    id integer primary key /* comment 'foreign key to profile table' */ references profile (id) ,
-    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 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' */,
-    token varchar(255) /* comment 'authorization token' */,
-    secret varchar(255) /* comment 'token secret' */,
-    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)
-);
-create index subscription_subscriber_idx on subscription using btree(subscriber,created);
-create index subscription_subscribed_idx on subscription using btree(subscribed,created);
-
-create sequence notice_seq;
-create table notice (
-
-    id bigint default nextval('notice_seq') primary key /* comment 'unique identifier' */,
-    profile_id integer not null /* comment 'who made the update' */ references profile (id) ,
-    uri varchar(255) unique /* comment 'universally unique identifier, usually a tag URI' */,
-    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 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' */,
-    source varchar(32) /* comment 'source of comment, like "web", "im", or "clientname"' */,
-    conversation integer /*id of root notice in this conversation' */ references notice (id),
-    lat decimal(10,7) /* comment 'latitude'*/ ,
-    lon decimal(10,7) /* comment 'longitude'*/ ,
-    location_id integer /* comment 'location id if possible'*/ ,
-    location_ns integer /* comment 'namespace for location'*/ ,
-    repeat_of integer /* comment 'notice this is a repeat of' */ references notice (id) 
-
-/*    FULLTEXT(content) */
-);
-
-create index notice_profile_id_idx on notice using btree(profile_id,created,id);
-create index notice_created_idx on notice using btree(created);
-
-create table notice_source (
-     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 default CURRENT_TIMESTAMP /* comment 'date this record was created' */,
-     modified timestamp /* comment 'date this record was modified' */
-);
-
-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 /* 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)
-
-);
-create index reply_notice_id_idx on reply using btree(notice_id);
-create index reply_profile_id_idx on reply using btree(profile_id);
-create index reply_replied_id_idx on reply using btree(replied_id);
-
-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 default CURRENT_TIMESTAMP /* comment 'date this record was modified' */,
-    primary key (notice_id, user_id)
-
-);
-create index fave_notice_id_idx on fave using btree(notice_id);
-create index fave_user_id_idx on fave using btree(user_id,modified);
-create index fave_modified_idx on fave using btree(modified);
-
-/* tables for OAuth */
-
-create table consumer (
-    consumer_key varchar(255) primary key /* comment 'unique identifier, root URL' */,
-    consumer_secret varchar(255) not null /* comment 'secret value', */,
-    seed char(32) not null /* comment 'seed for new tokens by this consumer' */,
-
-    created timestamp not null default CURRENT_TIMESTAMP /* comment 'date this record was created' */,
-    modified timestamp /* comment 'date this record was modified' */
-);
-
-create table token (
-    consumer_key varchar(255) not null /* comment 'unique identifier, root URL' */ references consumer (consumer_key),
-    tok char(32) not null /* comment 'identifying value' */,
-    secret char(32) not null /* comment 'secret value' */,
-    type integer not null default 0 /* comment 'request or access' */,
-    state integer default 0 /* comment 'for requests 0 = initial, 1 = authorized, 2 = used' */,
-
-    verifier varchar(255) /*comment 'verifier string for OAuth 1.0a'*/,
-    verified_callback varchar(255) /*comment 'verified callback URL for OAuth 1.0a'*/,
-
-    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)
-);
-
-create table nonce (
-    consumer_key varchar(255) not null /* comment 'unique identifier, root URL' */,
-    tok char(32) /* comment 'buggy old value, ignored' */,
-    nonce char(32) null /* comment 'buggy old value, ignored */,
-    ts integer not null /* comment 'timestamp sent' values are epoch, and only used internally */,
-
-    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, ts, nonce)
-);
-
-create sequence oauth_application_seq;
-create table oauth_application (
-    id bigint default nextval('oauth_application_seq') primary key /* comment 'unique identifier' */,
-    owner integer not null /* comment 'owner of the application' */ references profile (id),
-    consumer_key varchar(255) not null /* comment 'application consumer key' */ references consumer (consumer_key),
-    name varchar(255) unique not null /* comment 'name of the application' */,
-    description varchar(255) /* comment 'description of the application' */,
-    icon varchar(255) not null /* comment 'application icon' */,
-    source_url varchar(255) /* comment 'application homepage - used for source link' */,
-    organization varchar(255) /* comment 'name of the organization running the application' */,
-    homepage varchar(255) /* comment 'homepage for the organization' */,
-    callback_url varchar(255) /* comment 'url to redirect to after authentication' */,
-    "type" integer default 0 /* comment 'type of app, 1 = browser, 2 = desktop' */,
-    access_type integer default 0 /* comment 'default access type, bit 1 = read, bit 2 = write' */,
-    created timestamp not null default CURRENT_TIMESTAMP /* comment 'date this record was created' */,
-    modified timestamp /* comment 'date this record was modified' */
-);
-
-create table oauth_application_user (
-    profile_id integer not null /* 'user of the application' */ references profile (id),
-    application_id integer not null /* 'id of the application' */ references oauth_application (id),
-    access_type integer default 0 /* 'access type, bit 1 = read, bit 2 = write' */,
-    token varchar(255) /* 'request or access token' */,
-    created timestamp not null default CURRENT_TIMESTAMP /* 'date this record was created' */,
-    modified timestamp /* 'date this record was modified' */,
-    primary key (profile_id, application_id)
-);
-
-/* These are used by JanRain OpenID library */
-
-create table oid_associations (
-    server_url varchar(2047),
-    handle varchar(255),
-    secret bytea,
-    issued integer,
-    lifetime integer,
-    assoc_type varchar(64),
-    primary key (server_url, handle)
-);
-
-create table oid_nonces (
-    server_url varchar(2047),
-    "timestamp" integer,
-    salt character(40),
-    unique (server_url, "timestamp", salt)
-);
-
-create table confirm_address (
-    code varchar(32) not null primary key /* comment 'good random code' */,
-    user_id integer not null /* comment 'user who requested confirmation' */ references "user" (id),
-    address varchar(255) not null /* comment 'address (email, Jabber, SMS, etc.)' */,
-    address_extra varchar(255) not null default '' /* comment 'carrier ID, for SMS' */,
-    address_type varchar(8) not null /* comment 'address type ("email", "jabber", "sms")' */,
-    claimed timestamp /* comment 'date this was claimed for queueing' */,
-    sent timestamp default CURRENT_TIMESTAMP /* comment 'date this was sent for queueing' */,
-    modified timestamp /* comment 'date this record was modified' */
-);
-
-create table remember_me (
-    code varchar(32) not null primary key /* comment 'good random code' */,
-    user_id integer not null /* comment 'user who is logged in' */ references "user" (id),
-    modified timestamp /* comment 'date this record was modified' */
-);
-
-create table queue_item (
-     id serial /* comment 'unique identifier'*/,
-     frame bytea not null /* comment 'data: object reference or opaque string'*/,
-     transport varchar(8) not null /*comment 'queue for what? "email", "jabber", "sms", "irc", ...'*/,
-     created timestamp not null default CURRENT_TIMESTAMP /*comment 'date this record was created'*/,
-     claimed timestamp /*comment 'date this item was claimed'*/,
-     PRIMARY KEY (id)
-);
-create index queue_item_created_idx on queue_item using btree(created);
-
-/* Hash tags */
-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 default CURRENT_TIMESTAMP /* comment 'date this record was created' */,
-
-    primary key (tag, notice_id)
-);
-create index notice_tag_created_idx on notice_tag using btree(created);
-
-/* Synching with foreign services */
-
-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 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 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 default CURRENT_TIMESTAMP /* comment 'date this record was created' */,
-     modified timestamp /* comment 'date this record was modified' */,
-
-     primary key (id, service)
-);
-
-create table foreign_link (
-     user_id int /* comment 'link to user on this system, if exists' */ references "user" (id),
-     foreign_id int /* comment 'link' */ references foreign_user (id),
-     service int not null /* comment 'foreign key to service' */ references foreign_service (id),
-     credentials varchar(255) /* comment 'authc credentials, typically a password' */,
-     noticesync int not null default 1 /* comment 'notice synchronisation, bit 1 = sync outgoing, bit 2 = sync incoming, bit 3 = filter local replies' */,
-     friendsync int not null default 2 /* comment 'friend synchronisation, bit 1 = sync outgoing, bit 2 = sync incoming */,
-     profilesync int not null default 1 /* comment 'profile synchronization, bit 1 = sync outgoing, bit 2 = sync incoming' */,
-     last_noticesync timestamp default null /* comment 'last time notices were imported' */,
-     last_friendsync timestamp default null /* comment 'last time friends were imported' */,
-     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)
-);
-create index foreign_user_user_id_idx on foreign_link using btree(user_id);
-
-create table foreign_subscription (
-     service int not null /* comment 'service where relationship happens' */ references foreign_service(id) ,
-     subscriber int not null /* comment 'subscriber on foreign service' */ ,
-     subscribed int not null /* comment 'subscribed user' */ ,
-     created timestamp not null default CURRENT_TIMESTAMP /* comment 'date this record was created' */,
-
-     primary key (service, subscriber, subscribed)
-);
-create index foreign_subscription_subscriber_idx on foreign_subscription using btree(subscriber);
-create index foreign_subscription_subscribed_idx on foreign_subscription using btree(subscribed);
-
-create table invitation (
-     code varchar(32) not null primary key /* comment 'random code for an 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 default CURRENT_TIMESTAMP /* comment 'date this record was created' */
-
-);
-create index invitation_address_idx on invitation using btree(address,address_type);
-create index invitation_user_id_idx on invitation using btree(user_id);
-
-create sequence message_seq;
-create table message (
-
-    id bigint default nextval('message_seq') primary key /* comment 'unique identifier' */,
-    uri varchar(255) unique /* comment 'universally unique identifier' */,
-    from_profile integer not null /* comment 'who the message is from' */ references profile (id),
-    to_profile integer not null /* comment 'who the message is to' */ references profile (id),
-    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 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"' */
-
-);
-create index message_from_idx on message using btree(from_profile);
-create index message_to_idx on message using btree(to_profile);
-create index message_created_idx on message using btree(created);
-
-create table notice_inbox (
-
-    user_id integer not null /* comment 'user receiving the message' */ references "user" (id),
-    notice_id integer not null /* comment 'notice received' */ references notice (id),
-    created 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 on notice_inbox using btree(notice_id);
-
-create table profile_tag (
-   tagger integer not null /* comment 'user making the tag' */ references "user" (id),
-   tagged integer not null /* comment 'profile tagged' */ references profile (id),
-   tag varchar(64) not null /* comment 'hash tag associated with this notice' */,
-   modified timestamp /* comment 'date the tag was added' */,
-
-   primary key (tagger, tagged, tag)
-);
-create index profile_tag_modified_idx on profile_tag using btree(modified);
-create index profile_tag_tagger_tag_idx on profile_tag using btree(tagger,tag);
-
-create table profile_block (
-
-   blocker integer not null /* comment 'user making the block' */ references "user" (id),
-   blocked integer not null /* comment 'profile that is blocked' */ references profile (id),
-   modified timestamp /* comment 'date of blocking' */,
-
-   primary key (blocker, blocked)
-
-);
-
-create sequence user_group_seq;
-create table user_group (
-
-    id bigint default nextval('user_group_seq') 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' */,
-    design_id integer /*comment 'id of a design' */ references design(id),
-
-    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);
-
-/*attachments and URLs stuff */
-create sequence file_seq;
-create table file (
-    id bigint default nextval('file_seq') primary key /* comment 'unique identifier' */,
-    url varchar(255) unique,
-    mimetype varchar(50),
-    size integer,
-    title varchar(255),
-    date integer,
-    protected integer,
-    filename text /* comment 'if a local file, name of the file' */,
-    modified timestamp default CURRENT_TIMESTAMP /* comment 'date this record was modified'*/
-);
-
-create sequence file_oembed_seq;
-create table file_oembed (
-    file_id bigint default nextval('file_oembed_seq') primary key /* comment 'unique identifier' */,
-    version varchar(20),
-    type varchar(20),
-    mimetype varchar(50),
-    provider varchar(50),
-    provider_url varchar(255),
-    width integer,
-    height integer,
-    html text,
-    title varchar(255),
-    author_name varchar(50),
-    author_url varchar(255),
-    url varchar(255)
-);
-
-create sequence file_redirection_seq;
-create table file_redirection (
-    url varchar(255) primary key,
-    file_id bigint,
-    redirections integer,
-    httpcode integer
-);
-
-create sequence file_thumbnail_seq;
-create table file_thumbnail (
-    file_id bigint primary key,
-    url varchar(255) unique,
-    width integer,
-    height integer
-);
-
-create sequence file_to_post_seq;
-create table file_to_post (
-    file_id bigint,
-    post_id bigint,
-
-    primary key (file_id, post_id)
-);
-
-create table group_block (
-   group_id integer not null /* comment 'group profile is blocked from' */ references user_group (id),
-   blocked integer not null /* comment 'profile that is blocked' */references profile (id),
-   blocker integer not null /* comment 'user making the block'*/ references "user" (id),
-   modified timestamp /* comment 'date of blocking'*/ ,
-
-   primary key (group_id, blocked)
-);
-
-create table group_alias (
-
-   alias varchar(64) /* comment 'additional nickname for the group'*/ ,
-   group_id integer not null /* comment 'group profile is blocked from'*/ references user_group (id),
-   modified timestamp /* comment 'date alias was created'*/,
-   primary key (alias)
-
-);
-create index group_alias_group_id_idx on group_alias (group_id);
-
-create table session (
-
-    id varchar(32) primary key /* comment 'session ID'*/,
-    session_data text /* comment 'session data'*/,
-    created timestamp not null DEFAULT CURRENT_TIMESTAMP /* comment 'date this record was created'*/,
-    modified integer DEFAULT extract(epoch from CURRENT_TIMESTAMP) /* comment 'date this record was modified'*/
-);
-
-create index session_modified_idx on session (modified);
-
-create table deleted_notice (
-
-    id integer primary key /* comment 'identity of notice'*/ ,
-    profile_id integer /* not null comment 'author of the notice'*/,
-    uri varchar(255) unique /* comment 'universally unique identifier, usually a tag URI'*/,
-    created timestamp not null  /* comment 'date the notice record was created'*/ ,
-    deleted timestamp not null DEFAULT CURRENT_TIMESTAMP /* comment 'date the notice record was created'*/
-);
-
-CREATE index deleted_notice_profile_id_idx on deleted_notice (profile_id);
-
-/* Textsearch stuff */
-
-create index textsearch_idx on profile using gist(textsearch);
-create index noticecontent_idx on notice using gist(to_tsvector('english',content));
-create trigger textsearchupdate before insert or update on profile for each row
-execute procedure tsvector_update_trigger(textsearch, 'pg_catalog.english', nickname, fullname, location, bio, homepage);
-
-create table config (
-
-    section varchar(32) /* comment 'configuration section'*/,
-    setting varchar(32) /* comment 'configuration setting'*/,
-    value varchar(255) /* comment 'configuration value'*/,
-
-    primary key (section, setting)
-
-);
-
-create table profile_role (
-
-    profile_id integer not null /* comment 'account having the role'*/ references profile (id),
-    role    varchar(32) not null /* comment 'string representing the role'*/,
-    created timestamp /* not null comment 'date the role was granted'*/,
-
-    primary key (profile_id, role)
-
-);
-
-create table location_namespace (
-
-    id integer /*comment 'identity for this namespace'*/,
-    description text /* comment 'description of the namespace'*/ ,
-    created integer not null /*comment 'date the record was created*/ ,
-   /* modified timestamp comment 'date this record was modified',*/
-    primary key (id)
-
-);
-
-create table login_token (
-    user_id integer not null /* comment 'user owning this token'*/ references "user" (id),
-    token char(32) not null /* comment 'token useable for logging in'*/,
-    created timestamp not null DEFAULT CURRENT_TIMESTAMP /* comment 'date this record was created'*/,
-    modified timestamp /* comment 'date this record was modified'*/,
-
-    primary key (user_id)
-);
-
-create table user_location_prefs (
-    user_id integer not null /* comment 'user who has the preference' */ references "user" (id),
-    share_location integer default 1 /* comment 'Whether to share location data' */,
-    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)
-);
-
-create table inbox (
-
-    user_id integer not null /* comment 'user receiving the notice' */ references "user" (id),
-    notice_ids bytea /* comment 'packed list of notice ids' */,
-
-    primary key (user_id)
-
-);
-
-create sequence conversation_seq;
-create table conversation (
-    id bigint default nextval('conversation_seq') primary key /* comment 'unique identifier' */,
-    uri varchar(225) unique /* comment 'URI of the conversation' */,
-    created timestamp not null DEFAULT CURRENT_TIMESTAMP /* comment 'date this record was created' */,
-    modified timestamp /* comment 'date this record was modified' */
-);
-
-create table local_group (
-
-   group_id integer primary key /* comment 'group represented' */ references user_group (id),
-   nickname varchar(64) unique /* comment 'group represented' */,
-
-   created timestamp not null DEFAULT CURRENT_TIMESTAMP /* comment 'date this record was created' */,
-   modified timestamp /* comment 'date this record was modified' */
-
-);
-
diff --git a/doc-src/badge b/doc-src/badge
deleted file mode 100644
index 98cdcfce27..0000000000
--- a/doc-src/badge
+++ /dev/null
@@ -1,69 +0,0 @@
-<!-- Copyright 2008-2010 StatusNet Inc. and contributors. -->
-<!-- Document licensed under Creative Commons Attribution 3.0 Unported. See -->
-<!-- http://creativecommons.org/licenses/by/3.0/ for details. -->
-
-Install the %%site.name%% badge on your 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-src/bookmarklet b/doc-src/bookmarklet
deleted file mode 100644
index 0b77bf45a7..0000000000
--- a/doc-src/bookmarklet
+++ /dev/null
@@ -1,9 +0,0 @@
-<!-- Copyright 2008-2010 StatusNet Inc. and contributors. -->
-<!-- Document licensed under Creative Commons Attribution 3.0 Unported. See -->
-<!-- http://creativecommons.org/licenses/by/3.0/ for details. -->
-
-A bookmarklet is a small piece of javascript code used as a bookmark. This one will let you post to %%site.name%% simply by selecting some text on a page and pressing the bookmarklet.
-
-Drag-and-drop the following link to your bookmarks bar or right-click it and add it to your browser favorites to keep it handy.
-
-<a href="javascript:(function(){var%20d=document,w=window,e=w.getSelection,k=d.getSelection,x=d.selection,s=(e?e():(k)?k():(x?x.createRange().text:0)),f='http://%%site.server%%/%%site.path%%/index.php?action=bookmarklet',l=d.location,e=encodeURIComponent,g=f+'&status_textarea=%E2%80%9C'+((e(s))?e(s):e(document.title))+'%E2%80%9D%20%E2%80%94%20'+e(l.href);function%20a(){if(!w.open(g,'t','toolbar=0,resizable=0,scrollbars=1,status=1,width=450,height=200')){l.href=g;}}a();})()">Post to %%site.name%%</a>
diff --git a/doc-src/contact b/doc-src/contact
index 75c3aa8364..4b31439c42 100644
--- a/doc-src/contact
+++ b/doc-src/contact
@@ -5,14 +5,6 @@
 There are a number of options for getting in contact with responsible
 people for %%site.name%%.
 
-Post a notice
--------------
-
-If you have a question about how to do something, just post a notice
-with your question. People here like to answer messages. Watch the
-[public timeline](%%action.public%%) for answers; they'll usually start
-with "@" plus your user name.
-
 Bugs
 ----
 
@@ -25,4 +17,10 @@ Email
 
 You can reach the responsible party for this server at [%%site.email%%](mailto:%%site.email%%).
 
+Post a notice
+-------------
+
+If you have a question about how to do something, just post a notice
+with your question. Watch your inbox [public timeline](%%action.top%%)
+for answers.
 
diff --git a/doc-src/groups b/doc-src/groups
index 5ff09600ef..823e5b16be 100644
--- a/doc-src/groups
+++ b/doc-src/groups
@@ -4,7 +4,8 @@
 
 Users on %%site.name%% can create *groups* that other users can join.
 Groups can be a great way to share information and entertainment with
-a group of people who have a common interest or background.
+a group of people who have a common interest or background; who work
+together on a team; or who have a particular knowledge or skill.
 
 You can find out about groups on the server on the
 [Groups](%%action.groups%%) page. You can join a group by clicking on
@@ -13,16 +14,16 @@ the "Join" button either in the group list or on the group's home page.
 Starting a new group
 --------------------
 
-If you want, you can start a new group for friends and people with
-common interests. Note that all groups are free for anyone to join.
+You can start a new group for friends and colleagues. Note that all
+groups are free for anyone to join.
 
 To start a new group, use the [new group](%%action.newgroup%%) tool
 and fill out the form. Describe your group as best you can if you want
 people to be able to find it.
 
 When choosing the nickname for your group, try to keep it short. The
-nickname is included in every message to and from the group, so the
-less chars the better. Try using acronyms for organizations, or
+nickname is sometimes included in messages to and from the group, so
+the less chars the better. Try using acronyms for organizations, or
 airport codes for places (like 'pdx' instead of 'portland').
 
 Sending messages to a group
@@ -33,14 +34,22 @@ anywhere in the message. If you have more than one group named, the
 notice will go to each group. Only members can send notices to a
 group, and groups do not respond to direct messages (DMs).
 
+You can also select the group from the "To:" drop down when posting.
+
+You can make a group message private by clicking the "private" button
+before posting.
+
 Receiving messages
 ------------------
 
 New group messages will appear in your inbox, and will also come to
 your phone or IM client if you've set them up to receive notices.
 
-Remote groups
--------------
+Private groups
+--------------
 
-While it's technically possible, this version of StatusNet does not
-support remote group membership.
+The administrator can make a group private. For a private group, all
+notices will marked as private for group members only. Also,
+administrators will have to approve all new members to the group.
+
+Private groups are visible in the group directory.
diff --git a/doc-src/help b/doc-src/help
index 92d5d05afa..4bb9cd33a2 100644
--- a/doc-src/help
+++ b/doc-src/help
@@ -2,38 +2,18 @@
 <!-- Document licensed under Creative Commons Attribution 3.0 Unported. See -->
 <!-- http://creativecommons.org/licenses/by/3.0/ for details. -->
 
-%%site.name%% is a **microblogging service**. Users post short (%%site.textlimit%%
-character) notices which are broadcast to their friends and fans using
-the Web, RSS, or instant messages.
+%%site.name%% is a **social service**. Users can post short
+(%%site.textlimit%% character) status messages which are broadcast to
+their friends and colleagues on the service and (optionally) onto the Web.
+
+You can also broadcast other types of data, like bookmarks, event
+invitations, polls, and questions.
 
 If you'd like to try it out, first [register](%%action.register%%) a new account.
-Then, on the [public timeline](%%action.public%%), enter your message into
+Then, on the [public timeline](%%action.top%%), enter your message into
 the textbox at the top of the page, and click "Send". It will go out on the
-public timeline and to anyone who is subscribed to your notices (probably nobody,
-at first).
+public timeline and to anyone who is subscribed to your notices.
 
 To subscribe to other people's notifications, go to their profile page
 and click the "subscribe" button. They'll get a notice that you're now
-subscribed to their notifications, and, who knows?, they might subscribe
-back.
-
-More help
----------
-
-Here are some documents that you might find helpful in understanding
-%%site.name%% and how to use it.
-
-* [About](%%doc.about%%) - an overview of the service
-* [FAQ](%%doc.faq%%) - frequently-asked questions about %%site.name%%
-* [Contact](%%doc.contact%%) - who to contact with questions about the service
-* [IM](%%doc.im%%) - using the instant-message (IM) features of %%site.name%%
-* [SMS](%%doc.sms%%) - tying your cellphone to %%site.name%%
-* [Tags](%%doc.tags%%) - different ways to use tagging
-* [Groups](%%doc.groups%%) - joining together in groups
-* [Lists](%%doc.lists%%) - organize your contacts
-* [OpenMicroBlogging](%%doc.openmublog%%) - subscribing to remote users
-* [Privacy](%%doc.privacy%%) - %%site.name%%'s privacy policy
-* [Source](%%doc.source%%) - How to get the StatusNet source code
-* [Badge](%%doc.badge%%) - How to put a StatusNet badge on your blog or homepage
-* [Bookmarklet](%%doc.bookmarklet%%) - Bookmarklet for posting Web pages
-* [API](%%doc.api%%) - API for use by external clients
+subscribed to their notifications.
diff --git a/doc-src/lists b/doc-src/lists
deleted file mode 100644
index b2e93aa853..0000000000
--- a/doc-src/lists
+++ /dev/null
@@ -1,73 +0,0 @@
-<!-- Copyright 2008-2010 StatusNet Inc. and contributors. -->
-<!-- Document licensed under Creative Commons Attribution 3.0 Unported. See -->
-<!-- http://creativecommons.org/licenses/by/3.0/ for details. -->
-
-%%site.name%% supports
-[tags](http://en.wikipedia.org/wiki/Tag_(metadata)) to help you
-organize your activities here. You can use tags for people and for
-notices.
-
-Tagging a notice
-----------------
-
-You can tag a notice using a *hashtag*; a # character followed by
-letters and numbers as well as '.', '-', and '_'. Note that accented
-latin characters are not supported, and non-roman scripts are right out.
-
-The HTML for the notice will link to a stream of all the other notices
-with that tag. This can be a great way to keep track of a conversation.
-
-The most popular current tags on the site can be found in the [public
-tag cloud](%%action.publictagcloud%%). Their size shows their
-popularity and recency.
-
-Tagging yourself
-----------------
-
-You can also add tags for yourself on your [profile
-settings](%%action.profilesettings%%) page or by using the edit tags
-button on your profile page. Use single words to
-describe yourself, your experiences and your interest. The tags will
-become links on your profile page to a list of all the users on the
-site who use that same tag. It can be a nice way to find people who
-are related to you geographically or who have a common interest.
-
-Tagging others
---------------
-
-You can also tag other users by using the edit tags button next to
-their profile. Such tags are called *people tags*. Once you have
-created a people tag, you can add or remove users from it using the
-tag's edit form. This makes it easy to organize your subscriptions
-into groups and sort through them separately. Also, it will let
-you create custom lists of people that others can subscribe to.
-
-You can also send a notice "to the attention of" your subscribers
-whom you've marked with a particular tag (note: *not* people who've
-marked themselves with that tag). "@#family hello" will send a
-notice to all your subscribers you've marked with the tag 'family'.
-
-Private and public people tags
-------------------------------
-
-A private people tag is only visible to the creator, it cannot be
-subscribed to, but the timeline can be viewed. To create a new
-private prepend a '.' to the tag in the tags editing box. To set
-an existing public tag as private or vice-versa, go to the tag's
-edit page.
-
-The most used public tags are displayed in the
-[public people tag cloud](%%action.publicpeopletagcloud%%). Their
-size shows their frequency of use.
-
-Remote people tags
-------------------
-
-You can even [tag remote users](%%action.profilesettings%%). Just
-enter the remote profile's URI and click on the "Fetch" button to
-fetch the profile, you can then add tags and save them.
-
-Subscribing to the timeline of a people tag on another server also
-works. Just copy the URL of the people tag's timeline page to the
-[OStatus subscription](%%action.ostatussub%%) form.
-
diff --git a/doc-src/openmublog b/doc-src/openmublog
deleted file mode 100644
index 267ad6e7c4..0000000000
--- a/doc-src/openmublog
+++ /dev/null
@@ -1,29 +0,0 @@
-<!-- Copyright 2008-2010 StatusNet Inc. and contributors. -->
-<!-- Document licensed under Creative Commons Attribution 3.0 Unported. See -->
-<!-- http://creativecommons.org/licenses/by/3.0/ for details. -->
-
-[OpenMicroBlogging](http://openmicroblogging.org/) is a protocol that
-lets users of one [microblogging](http://en.wikipedia.org/wiki/microblogging) service
-subscribe to notices by users of another service. The protocol, based on
-[OAuth](http://oauth.net/), is open and free, and doesn't depend on any
-central authority to maintain the federated microblogs.
-
-The [StatusNet](http://status.net/) software that runs %%site.name%% supports
-OpenMicroBlogging 0.1. Anyone can make a new installation of StatusNet on their
-own servers, and users of that new installation can subscribe to notices from
-%%site.name%%.
-
-Remote subscription
--------------------
-
-If you have an account on a remote site that supports OpenMicroBlogging, and you
-want to subscribe to the notices of a user on this site, click on the "Subscribe"
-link under their avatar on their profile page. This should take you to the
-[remote subscription](%%action.remotesubscribe%%) page. Make sure that you've got the
-right nickname registered, and enter your profile URL on the other microblogging
-service.
-
-You'll be taken to your microblogging service, where you'll be asked to confirm the
-subscription. When you confirm, your service will receive new notifications from
-the user on %%site.name%%, and your service will forward them to you (using IM, SMS,
-the Web, or whatever else).
diff --git a/doc-src/tags b/doc-src/tags
index b2e93aa853..8f42b5b752 100644
--- a/doc-src/tags
+++ b/doc-src/tags
@@ -17,10 +17,6 @@ latin characters are not supported, and non-roman scripts are right out.
 The HTML for the notice will link to a stream of all the other notices
 with that tag. This can be a great way to keep track of a conversation.
 
-The most popular current tags on the site can be found in the [public
-tag cloud](%%action.publictagcloud%%). Their size shows their
-popularity and recency.
-
 Tagging yourself
 ----------------
 
@@ -55,19 +51,3 @@ subscribed to, but the timeline can be viewed. To create a new
 private prepend a '.' to the tag in the tags editing box. To set
 an existing public tag as private or vice-versa, go to the tag's
 edit page.
-
-The most used public tags are displayed in the
-[public people tag cloud](%%action.publicpeopletagcloud%%). Their
-size shows their frequency of use.
-
-Remote people tags
-------------------
-
-You can even [tag remote users](%%action.profilesettings%%). Just
-enter the remote profile's URI and click on the "Fetch" button to
-fetch the profile, you can then add tags and save them.
-
-Subscribing to the timeline of a people tag on another server also
-works. Just copy the URL of the people tag's timeline page to the
-[OStatus subscription](%%action.ostatussub%%) form.
-
diff --git a/doc-src/tos b/doc-src/tos
index 8d5bac57fc..e54da049b7 100644
--- a/doc-src/tos
+++ b/doc-src/tos
@@ -14,7 +14,7 @@ particular, make sure that none of the prohibited items listed below
 appear in your notice stream or get linked to from your notice stream (things
 like spam, viruses, or hate content).
 
-You can review our [Public Stream](%%action.public%%) to get a sense
+You can review our [Public Stream](%%action.top%%) to get a sense
 of the types of notices that are welcome on our service (or not!). If
 you find a %%site.name%% account that you believe violates our terms
 of service, please check our [Contact](%%doc.contact%%) documentation.
diff --git a/extlib/HTTP/Request2.php b/extlib/HTTP/Request2.php
index e06bb86bca..60beeaf2ef 100644
--- a/extlib/HTTP/Request2.php
+++ b/extlib/HTTP/Request2.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Class representing a HTTP request
+ * Class representing a HTTP request message
  *
  * PHP version 5
  *
  * LICENSE:
  *
- * Copyright (c) 2008, 2009, Alexey Borzov <avb@php.net>
+ * Copyright (c) 2008-2011, Alexey Borzov <avb@php.net>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -37,7 +37,7 @@
  * @package    HTTP_Request2
  * @author     Alexey Borzov <avb@php.net>
  * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: Request2.php 278226 2009-04-03 21:32:48Z avb $
+ * @version    SVN: $Id: Request2.php 308735 2011-02-27 20:31:28Z avb $
  * @link       http://pear.php.net/package/HTTP_Request2
  */
 
@@ -48,16 +48,16 @@ require_once 'Net/URL2.php';
 
 /**
  * Exception class for HTTP_Request2 package
- */ 
+ */
 require_once 'HTTP/Request2/Exception.php';
 
 /**
- * Class representing a HTTP request
+ * Class representing a HTTP request message
  *
  * @category   HTTP
  * @package    HTTP_Request2
  * @author     Alexey Borzov <avb@php.net>
- * @version    Release: 0.4.1
+ * @version    Release: 2.0.0RC1
  * @link       http://tools.ietf.org/html/rfc2616#section-5
  */
 class HTTP_Request2 implements SplSubject
@@ -78,7 +78,7 @@ class HTTP_Request2 implements SplSubject
    /**#@-*/
 
    /**#@+
-    * Constants for HTTP authentication schemes 
+    * Constants for HTTP authentication schemes
     *
     * @link http://tools.ietf.org/html/rfc2617
     */
@@ -95,7 +95,7 @@ class HTTP_Request2 implements SplSubject
    /**
     * Regular expression used to check for invalid symbols in cookie strings
     * @link http://pear.php.net/bugs/bug.php?id=15630
-    * @link http://cgi.netscape.com/newsref/std/cookie_spec.html
+    * @link http://web.archive.org/web/20080331104521/http://cgi.netscape.com/newsref/std/cookie_spec.html
     */
     const REGEXP_INVALID_COOKIE = '/[\s,;]/';
 
@@ -164,7 +164,11 @@ class HTTP_Request2 implements SplSubject
         'ssl_local_cert'    => null,
         'ssl_passphrase'    => null,
 
-        'digest_compat_ie'  => false
+        'digest_compat_ie'  => false,
+
+        'follow_redirects'  => false,
+        'max_redirects'     => 5,
+        'strict_redirects'  => false
     );
 
    /**
@@ -191,7 +195,7 @@ class HTTP_Request2 implements SplSubject
     protected $postParams = array();
 
    /**
-    * Array of file uploads (for multipart/form-data POST requests) 
+    * Array of file uploads (for multipart/form-data POST requests)
     * @var  array
     */
     protected $uploads = array();
@@ -202,11 +206,16 @@ class HTTP_Request2 implements SplSubject
     */
     protected $adapter;
 
+   /**
+    * Cookie jar to persist cookies between requests
+    * @var HTTP_Request2_CookieJar
+    */
+    protected $cookieJar = null;
 
    /**
     * Constructor. Can set request URL, method and configuration array.
     *
-    * Also sets a default value for User-Agent header. 
+    * Also sets a default value for User-Agent header.
     *
     * @param    string|Net_Url2     Request URL
     * @param    string              Request method
@@ -214,14 +223,14 @@ class HTTP_Request2 implements SplSubject
     */
     public function __construct($url = null, $method = self::METHOD_GET, array $config = array())
     {
+        $this->setConfig($config);
         if (!empty($url)) {
             $this->setUrl($url);
         }
         if (!empty($method)) {
             $this->setMethod($method);
         }
-        $this->setConfig($config);
-        $this->setHeader('user-agent', 'HTTP_Request2/0.4.1 ' .
+        $this->setHeader('user-agent', 'HTTP_Request2/2.0.0RC1 ' .
                          '(http://pear.php.net/package/http_request2) ' .
                          'PHP/' . phpversion());
     }
@@ -235,15 +244,20 @@ class HTTP_Request2 implements SplSubject
     *
     * @param    string|Net_URL2 Request URL
     * @return   HTTP_Request2
-    * @throws   HTTP_Request2_Exception
+    * @throws   HTTP_Request2_LogicException
     */
     public function setUrl($url)
     {
         if (is_string($url)) {
-            $url = new Net_URL2($url);
+            $url = new Net_URL2(
+                $url, array(Net_URL2::OPTION_USE_BRACKETS => $this->config['use_brackets'])
+            );
         }
         if (!$url instanceof Net_URL2) {
-            throw new HTTP_Request2_Exception('Parameter is not a valid HTTP URL');
+            throw new HTTP_Request2_LogicException(
+                'Parameter is not a valid HTTP URL',
+                HTTP_Request2_Exception::INVALID_ARGUMENT
+            );
         }
         // URL contains username / password?
         if ($url->getUserinfo()) {
@@ -275,13 +289,16 @@ class HTTP_Request2 implements SplSubject
     *
     * @param    string
     * @return   HTTP_Request2
-    * @throws   HTTP_Request2_Exception if the method name is invalid
+    * @throws   HTTP_Request2_LogicException if the method name is invalid
     */
     public function setMethod($method)
     {
         // Method name should be a token: http://tools.ietf.org/html/rfc2616#section-5.1.1
         if (preg_match(self::REGEXP_INVALID_TOKEN, $method)) {
-            throw new HTTP_Request2_Exception("Invalid request method '{$method}'");
+            throw new HTTP_Request2_LogicException(
+                "Invalid request method '{$method}'",
+                HTTP_Request2_Exception::INVALID_ARGUMENT
+            );
         }
         $this->method = $method;
 
@@ -306,7 +323,7 @@ class HTTP_Request2 implements SplSubject
     *   <li> 'adapter'           - adapter to use (string)</li>
     *   <li> 'connect_timeout'   - Connection timeout in seconds (integer)</li>
     *   <li> 'timeout'           - Total number of seconds a request can take.
-    *                              Use 0 for no limit, should be greater than 
+    *                              Use 0 for no limit, should be greater than
     *                              'connect_timeout' if set (integer)</li>
     *   <li> 'use_brackets'      - Whether to append [] to array variable names (bool)</li>
     *   <li> 'protocol_version'  - HTTP Version to use, '1.0' or '1.1' (string)</li>
@@ -324,7 +341,7 @@ class HTTP_Request2 implements SplSubject
     *                              certificate matches host name (bool)</li>
     *   <li> 'ssl_cafile'        - Cerificate Authority file to verify the peer
     *                              with (use with 'ssl_verify_peer') (string)</li>
-    *   <li> 'ssl_capath'        - Directory holding multiple Certificate 
+    *   <li> 'ssl_capath'        - Directory holding multiple Certificate
     *                              Authority files (string)</li>
     *   <li> 'ssl_local_cert'    - Name of a file containing local cerificate (string)</li>
     *   <li> 'ssl_passphrase'    - Passphrase with which local certificate
@@ -332,13 +349,19 @@ class HTTP_Request2 implements SplSubject
     *   <li> 'digest_compat_ie'  - Whether to imitate behaviour of MSIE 5 and 6
     *                              in using URL without query string in digest
     *                              authentication (boolean)</li>
+    *   <li> 'follow_redirects'  - Whether to automatically follow HTTP Redirects (boolean)</li>
+    *   <li> 'max_redirects'     - Maximum number of redirects to follow (integer)</li>
+    *   <li> 'strict_redirects'  - Whether to keep request method on redirects via status 301 and
+    *                              302 (true, needed for compatibility with RFC 2616)
+    *                              or switch to GET (false, needed for compatibility with most
+    *                              browsers) (boolean)</li>
     * </ul>
     *
     * @param    string|array    configuration parameter name or array
     *                           ('parameter name' => 'parameter value')
     * @param    mixed           parameter value if $nameOrConfig is not an array
     * @return   HTTP_Request2
-    * @throws   HTTP_Request2_Exception If the parameter is unknown
+    * @throws   HTTP_Request2_LogicException If the parameter is unknown
     */
     public function setConfig($nameOrConfig, $value = null)
     {
@@ -349,8 +372,9 @@ class HTTP_Request2 implements SplSubject
 
         } else {
             if (!array_key_exists($nameOrConfig, $this->config)) {
-                throw new HTTP_Request2_Exception(
-                    "Unknown configuration parameter '{$nameOrConfig}'"
+                throw new HTTP_Request2_LogicException(
+                    "Unknown configuration parameter '{$nameOrConfig}'",
+                    HTTP_Request2_Exception::INVALID_ARGUMENT
                 );
             }
             $this->config[$nameOrConfig] = $value;
@@ -363,17 +387,18 @@ class HTTP_Request2 implements SplSubject
     * Returns the value(s) of the configuration parameter(s)
     *
     * @param    string  parameter name
-    * @return   mixed   value of $name parameter, array of all configuration 
+    * @return   mixed   value of $name parameter, array of all configuration
     *                   parameters if $name is not given
-    * @throws   HTTP_Request2_Exception If the parameter is unknown
+    * @throws   HTTP_Request2_LogicException If the parameter is unknown
     */
     public function getConfig($name = null)
     {
         if (null === $name) {
             return $this->config;
         } elseif (!array_key_exists($name, $this->config)) {
-            throw new HTTP_Request2_Exception(
-                "Unknown configuration parameter '{$name}'"
+            throw new HTTP_Request2_LogicException(
+                "Unknown configuration parameter '{$name}'",
+                HTTP_Request2_Exception::INVALID_ARGUMENT
             );
         }
         return $this->config[$name];
@@ -386,7 +411,7 @@ class HTTP_Request2 implements SplSubject
     * @param    string  password
     * @param    string  authentication scheme
     * @return   HTTP_Request2
-    */ 
+    */
     public function setAuth($user, $password = '', $scheme = self::AUTH_BASIC)
     {
         if (empty($user)) {
@@ -419,13 +444,13 @@ class HTTP_Request2 implements SplSubject
     * Sets request header(s)
     *
     * The first parameter may be either a full header string 'header: value' or
-    * header name. In the former case $value parameter is ignored, in the latter 
+    * header name. In the former case $value parameter is ignored, in the latter
     * the header's value will either be set to $value or the header will be
     * removed if $value is null. The first parameter can also be an array of
     * headers, in that case method will be called recursively.
     *
     * Note that headers are treated case insensitively as per RFC 2616.
-    * 
+    *
     * <code>
     * $req->setHeader('Foo: Bar'); // sets the value of 'Foo' header to 'Bar'
     * $req->setHeader('FoO', 'Baz'); // sets the value of 'Foo' header to 'Baz'
@@ -435,18 +460,21 @@ class HTTP_Request2 implements SplSubject
     *
     * @param    string|array    header name, header string ('Header: value')
     *                           or an array of headers
-    * @param    string|null     header value, header will be removed if null
+    * @param    string|array|null header value if $name is not an array,
+    *                           header will be removed if value is null
+    * @param    bool            whether to replace previous header with the
+    *                           same name or append to its value
     * @return   HTTP_Request2
-    * @throws   HTTP_Request2_Exception
+    * @throws   HTTP_Request2_LogicException
     */
-    public function setHeader($name, $value = null)
+    public function setHeader($name, $value = null, $replace = true)
     {
         if (is_array($name)) {
             foreach ($name as $k => $v) {
                 if (is_string($k)) {
-                    $this->setHeader($k, $v);
+                    $this->setHeader($k, $v, $replace);
                 } else {
-                    $this->setHeader($v);
+                    $this->setHeader($v, null, $replace);
                 }
             }
         } else {
@@ -455,17 +483,30 @@ class HTTP_Request2 implements SplSubject
             }
             // Header name should be a token: http://tools.ietf.org/html/rfc2616#section-4.2
             if (preg_match(self::REGEXP_INVALID_TOKEN, $name)) {
-                throw new HTTP_Request2_Exception("Invalid header name '{$name}'");
+                throw new HTTP_Request2_LogicException(
+                    "Invalid header name '{$name}'",
+                    HTTP_Request2_Exception::INVALID_ARGUMENT
+                );
             }
             // Header names are case insensitive anyway
             $name = strtolower($name);
             if (null === $value) {
                 unset($this->headers[$name]);
+
             } else {
-                $this->headers[$name] = $value;
+                if (is_array($value)) {
+                    $value = implode(', ', array_map('trim', $value));
+                } elseif (is_string($value)) {
+                    $value = trim($value);
+                }
+                if (!isset($this->headers[$name]) || $replace) {
+                    $this->headers[$name] = $value;
+                } else {
+                    $this->headers[$name] .= ', ' . $value;
+                }
             }
         }
-        
+
         return $this;
     }
 
@@ -483,21 +524,39 @@ class HTTP_Request2 implements SplSubject
     }
 
    /**
-    * Appends a cookie to "Cookie:" header
+    * Adds a cookie to the request
+    *
+    * If the request does not have a CookieJar object set, this method simply
+    * appends a cookie to "Cookie:" header.
+    *
+    * If a CookieJar object is available, the cookie is stored in that object.
+    * Data from request URL will be used for setting its 'domain' and 'path'
+    * parameters, 'expires' and 'secure' will be set to null and false,
+    * respectively. If you need further control, use CookieJar's methods.
     *
     * @param    string  cookie name
     * @param    string  cookie value
     * @return   HTTP_Request2
-    * @throws   HTTP_Request2_Exception
+    * @throws   HTTP_Request2_LogicException
+    * @see      setCookieJar()
     */
     public function addCookie($name, $value)
     {
-        $cookie = $name . '=' . $value;
-        if (preg_match(self::REGEXP_INVALID_COOKIE, $cookie)) {
-            throw new HTTP_Request2_Exception("Invalid cookie: '{$cookie}'");
+        if (!empty($this->cookieJar)) {
+            $this->cookieJar->store(array('name' => $name, 'value' => $value),
+                                    $this->url);
+
+        } else {
+            $cookie = $name . '=' . $value;
+            if (preg_match(self::REGEXP_INVALID_COOKIE, $cookie)) {
+                throw new HTTP_Request2_LogicException(
+                    "Invalid cookie: '{$cookie}'",
+                    HTTP_Request2_Exception::INVALID_ARGUMENT
+                );
+            }
+            $cookies = empty($this->headers['cookie'])? '': $this->headers['cookie'] . '; ';
+            $this->setHeader('cookie', $cookies . $cookie);
         }
-        $cookies = empty($this->headers['cookie'])? '': $this->headers['cookie'] . '; ';
-        $this->setHeader('cookie', $cookies . $cookie);
 
         return $this;
     }
@@ -505,24 +564,32 @@ class HTTP_Request2 implements SplSubject
    /**
     * Sets the request body
     *
-    * @param    string  Either a string with the body or filename containing body
+    * If you provide file pointer rather than file name, it should support
+    * fstat() and rewind() operations.
+    *
+    * @param    string|resource|HTTP_Request2_MultipartBody  Either a string
+    *               with the body or filename containing body or pointer to
+    *               an open file or object with multipart body data
     * @param    bool    Whether first parameter is a filename
     * @return   HTTP_Request2
-    * @throws   HTTP_Request2_Exception
+    * @throws   HTTP_Request2_LogicException
     */
     public function setBody($body, $isFilename = false)
     {
-        if (!$isFilename) {
-            $this->body = (string)$body;
-        } else {
-            if (!($fp = @fopen($body, 'rb'))) {
-                throw new HTTP_Request2_Exception("Cannot open file {$body}");
+        if (!$isFilename && !is_resource($body)) {
+            if (!$body instanceof HTTP_Request2_MultipartBody) {
+                $this->body = (string)$body;
+            } else {
+                $this->body = $body;
             }
-            $this->body = $fp;
+        } else {
+            $fileData = $this->fopenWrapper($body, empty($this->headers['content-type']));
+            $this->body = $fileData['fp'];
             if (empty($this->headers['content-type'])) {
-                $this->setHeader('content-type', self::detectMimeType($body));
+                $this->setHeader('content-type', $fileData['type']);
             }
         }
+        $this->postParams = $this->uploads = array();
 
         return $this;
     }
@@ -534,10 +601,10 @@ class HTTP_Request2 implements SplSubject
     */
     public function getBody()
     {
-        if (self::METHOD_POST == $this->method && 
+        if (self::METHOD_POST == $this->method &&
             (!empty($this->postParams) || !empty($this->uploads))
         ) {
-            if ('application/x-www-form-urlencoded' == $this->headers['content-type']) {
+            if (0 === strpos($this->headers['content-type'], 'application/x-www-form-urlencoded')) {
                 $body = http_build_query($this->postParams, '', '&');
                 if (!$this->getConfig('use_brackets')) {
                     $body = preg_replace('/%5B\d+%5D=/', '=', $body);
@@ -545,7 +612,7 @@ class HTTP_Request2 implements SplSubject
                 // support RFC 3986 by not encoding '~' symbol (request #15368)
                 return str_replace('%7E', '~', $body);
 
-            } elseif ('multipart/form-data' == $this->headers['content-type']) {
+            } elseif (0 === strpos($this->headers['content-type'], 'multipart/form-data')) {
                 require_once 'HTTP/Request2/MultipartBody.php';
                 return new HTTP_Request2_MultipartBody(
                     $this->postParams, $this->uploads, $this->getConfig('use_brackets')
@@ -564,25 +631,28 @@ class HTTP_Request2 implements SplSubject
     * If you just want to send the contents of a file as the body of HTTP
     * request you should use setBody() method.
     *
+    * If you provide file pointers rather than file names, they should support
+    * fstat() and rewind() operations.
+    *
     * @param    string  name of file-upload field
-    * @param    mixed   full name of local file
-    * @param    string  filename to send in the request 
+    * @param    string|resource|array   full name of local file, pointer to
+    *               open file or an array of files
+    * @param    string  filename to send in the request
     * @param    string  content-type of file being uploaded
     * @return   HTTP_Request2
-    * @throws   HTTP_Request2_Exception
+    * @throws   HTTP_Request2_LogicException
     */
     public function addUpload($fieldName, $filename, $sendFilename = null,
                               $contentType = null)
     {
         if (!is_array($filename)) {
-            if (!($fp = @fopen($filename, 'rb'))) {
-                throw new HTTP_Request2_Exception("Cannot open file {$filename}");
-            }
+            $fileData = $this->fopenWrapper($filename, empty($contentType));
             $this->uploads[$fieldName] = array(
-                'fp'        => $fp,
-                'filename'  => empty($sendFilename)? basename($filename): $sendFilename,
-                'size'      => filesize($filename),
-                'type'      => empty($contentType)? self::detectMimeType($filename): $contentType
+                'fp'        => $fileData['fp'],
+                'filename'  => !empty($sendFilename)? $sendFilename
+                                :(is_string($filename)? basename($filename): 'anonymous.blob') ,
+                'size'      => $fileData['size'],
+                'type'      => empty($contentType)? $fileData['type']: $contentType
             );
         } else {
             $fps = $names = $sizes = $types = array();
@@ -590,13 +660,12 @@ class HTTP_Request2 implements SplSubject
                 if (!is_array($f)) {
                     $f = array($f);
                 }
-                if (!($fp = @fopen($f[0], 'rb'))) {
-                    throw new HTTP_Request2_Exception("Cannot open file {$f[0]}");
-                }
-                $fps[]   = $fp;
-                $names[] = empty($f[1])? basename($f[0]): $f[1];
-                $sizes[] = filesize($f[0]);
-                $types[] = empty($f[2])? self::detectMimeType($f[0]): $f[2];
+                $fileData = $this->fopenWrapper($f[0], empty($f[2]));
+                $fps[]   = $fileData['fp'];
+                $names[] = !empty($f[1])? $f[1]
+                            :(is_string($f[0])? basename($f[0]): 'anonymous.blob');
+                $sizes[] = $fileData['size'];
+                $types[] = empty($f[2])? $fileData['type']: $f[2];
             }
             $this->uploads[$fieldName] = array(
                 'fp' => $fps, 'filename' => $names, 'size' => $sizes, 'type' => $types
@@ -703,8 +772,10 @@ class HTTP_Request2 implements SplSubject
     *   <li>'disconnect'              - after disconnection from server</li>
     *   <li>'sentHeaders'             - after sending the request headers,
     *                                   data is the headers sent (string)</li>
-    *   <li>'sentBodyPart'            - after sending a part of the request body, 
+    *   <li>'sentBodyPart'            - after sending a part of the request body,
     *                                   data is the length of that part (int)</li>
+    *   <li>'sentBody'                - after sending the whole request body,
+    *                                   data is request body length (int)</li>
     *   <li>'receivedHeaders'         - after receiving the response headers,
     *                                   data is HTTP_Request2_Response object</li>
     *   <li>'receivedBodyPart'        - after receiving a part of the response
@@ -738,7 +809,7 @@ class HTTP_Request2 implements SplSubject
     *
     * @param    string|HTTP_Request2_Adapter
     * @return   HTTP_Request2
-    * @throws   HTTP_Request2_Exception
+    * @throws   HTTP_Request2_LogicException
     */
     public function setAdapter($adapter)
     {
@@ -751,19 +822,67 @@ class HTTP_Request2 implements SplSubject
                     include_once str_replace('_', DIRECTORY_SEPARATOR, $adapter) . '.php';
                 }
                 if (!class_exists($adapter, false)) {
-                    throw new HTTP_Request2_Exception("Class {$adapter} not found");
+                    throw new HTTP_Request2_LogicException(
+                        "Class {$adapter} not found",
+                        HTTP_Request2_Exception::MISSING_VALUE
+                    );
                 }
             }
             $adapter = new $adapter;
         }
         if (!$adapter instanceof HTTP_Request2_Adapter) {
-            throw new HTTP_Request2_Exception('Parameter is not a HTTP request adapter');
+            throw new HTTP_Request2_LogicException(
+                'Parameter is not a HTTP request adapter',
+                HTTP_Request2_Exception::INVALID_ARGUMENT
+            );
         }
         $this->adapter = $adapter;
 
         return $this;
     }
 
+   /**
+    * Sets the cookie jar
+    *
+    * A cookie jar is used to maintain cookies across HTTP requests and
+    * responses. Cookies from jar will be automatically added to the request
+    * headers based on request URL.
+    *
+    * @param HTTP_Request2_CookieJar|bool   Existing CookieJar object, true to
+    *                                       create a new one, false to remove
+    */
+    public function setCookieJar($jar = true)
+    {
+        if (!class_exists('HTTP_Request2_CookieJar', false)) {
+            require_once 'HTTP/Request2/CookieJar.php';
+        }
+
+        if ($jar instanceof HTTP_Request2_CookieJar) {
+            $this->cookieJar = $jar;
+        } elseif (true === $jar) {
+            $this->cookieJar = new HTTP_Request2_CookieJar();
+        } elseif (!$jar) {
+            $this->cookieJar = null;
+        } else {
+            throw new HTTP_Request2_LogicException(
+                'Invalid parameter passed to setCookieJar()',
+                HTTP_Request2_Exception::INVALID_ARGUMENT
+            );
+        }
+
+        return $this;
+    }
+
+   /**
+    * Returns current CookieJar object or null if none
+    *
+    * @return HTTP_Request2_CookieJar|null
+    */
+    public function getCookieJar()
+    {
+        return $this->cookieJar;
+    }
+
    /**
     * Sends the request and returns the response
     *
@@ -773,20 +892,25 @@ class HTTP_Request2 implements SplSubject
     public function send()
     {
         // Sanity check for URL
-        if (!$this->url instanceof Net_URL2) {
-            throw new HTTP_Request2_Exception('No URL given');
-        } elseif (!$this->url->isAbsolute()) {
-            throw new HTTP_Request2_Exception('Absolute URL required');
-        } elseif (!in_array(strtolower($this->url->getScheme()), array('https', 'http'))) {
-            throw new HTTP_Request2_Exception('Not a HTTP URL');
+        if (!$this->url instanceof Net_URL2
+            || !$this->url->isAbsolute()
+            || !in_array(strtolower($this->url->getScheme()), array('https', 'http'))
+        ) {
+            throw new HTTP_Request2_LogicException(
+                'HTTP_Request2 needs an absolute HTTP(S) request URL, '
+                . ($this->url instanceof Net_URL2
+                   ? 'none' : "'" . $this->url->__toString() . "'")
+                . ' given',
+                HTTP_Request2_Exception::INVALID_ARGUMENT
+            );
         }
         if (empty($this->adapter)) {
             $this->setAdapter($this->getConfig('adapter'));
         }
         // magic_quotes_runtime may break file uploads and chunked response
-        // processing; see bug #4543
-        if ($magicQuotes = ini_get('magic_quotes_runtime')) {
-            ini_set('magic_quotes_runtime', false);
+        // processing; see bug #4543. Don't use ini_get() here; see bug #16440.
+        if ($magicQuotes = get_magic_quotes_runtime()) {
+            set_magic_quotes_runtime(false);
         }
         // force using single byte encoding if mbstring extension overloads
         // strlen() and substr(); see bug #1781, bug #10605
@@ -801,7 +925,7 @@ class HTTP_Request2 implements SplSubject
         }
         // cleanup in either case (poor man's "finally" clause)
         if ($magicQuotes) {
-            ini_set('magic_quotes_runtime', true);
+            set_magic_quotes_runtime(true);
         }
         if (!empty($oldEncoding)) {
             mb_internal_encoding($oldEncoding);
@@ -813,6 +937,53 @@ class HTTP_Request2 implements SplSubject
         return $response;
     }
 
+   /**
+    * Wrapper around fopen()/fstat() used by setBody() and addUpload()
+    *
+    * @param  string|resource file name or pointer to open file
+    * @param  bool            whether to try autodetecting MIME type of file,
+    *                         will only work if $file is a filename, not pointer
+    * @return array array('fp' => file pointer, 'size' => file size, 'type' => MIME type)
+    * @throws HTTP_Request2_LogicException
+    */
+    protected function fopenWrapper($file, $detectType = false)
+    {
+        if (!is_string($file) && !is_resource($file)) {
+            throw new HTTP_Request2_LogicException(
+                "Filename or file pointer resource expected",
+                HTTP_Request2_Exception::INVALID_ARGUMENT
+            );
+        }
+        $fileData = array(
+            'fp'   => is_string($file)? null: $file,
+            'type' => 'application/octet-stream',
+            'size' => 0
+        );
+        if (is_string($file)) {
+            $track = @ini_set('track_errors', 1);
+            if (!($fileData['fp'] = @fopen($file, 'rb'))) {
+                $e = new HTTP_Request2_LogicException(
+                    $php_errormsg, HTTP_Request2_Exception::READ_ERROR
+                );
+            }
+            @ini_set('track_errors', $track);
+            if (isset($e)) {
+                throw $e;
+            }
+            if ($detectType) {
+                $fileData['type'] = self::detectMimeType($file);
+            }
+        }
+        if (!($stat = fstat($fileData['fp']))) {
+            throw new HTTP_Request2_LogicException(
+                "fstat() call failed", HTTP_Request2_Exception::READ_ERROR
+            );
+        }
+        $fileData['size'] = $stat['size'];
+
+        return $fileData;
+    }
+
    /**
     * Tries to detect MIME type of a file
     *
@@ -825,12 +996,12 @@ class HTTP_Request2 implements SplSubject
     */
     protected static function detectMimeType($filename)
     {
-        // finfo extension from PECL available 
+        // finfo extension from PECL available
         if (function_exists('finfo_open')) {
             if (!isset(self::$_fileinfoDb)) {
                 self::$_fileinfoDb = @finfo_open(FILEINFO_MIME);
             }
-            if (self::$_fileinfoDb) { 
+            if (self::$_fileinfoDb) {
                 $info = finfo_file(self::$_fileinfoDb, $filename);
             }
         }
diff --git a/extlib/HTTP/Request2/Adapter.php b/extlib/HTTP/Request2/Adapter.php
index 39b092b346..2cabbf897b 100644
--- a/extlib/HTTP/Request2/Adapter.php
+++ b/extlib/HTTP/Request2/Adapter.php
@@ -6,7 +6,7 @@
  *
  * LICENSE:
  *
- * Copyright (c) 2008, 2009, Alexey Borzov <avb@php.net>
+ * Copyright (c) 2008-2011, Alexey Borzov <avb@php.net>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -37,7 +37,7 @@
  * @package    HTTP_Request2
  * @author     Alexey Borzov <avb@php.net>
  * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: Adapter.php 274684 2009-01-26 23:07:27Z avb $
+ * @version    SVN: $Id: Adapter.php 308322 2011-02-14 13:58:03Z avb $
  * @link       http://pear.php.net/package/HTTP_Request2
  */
 
@@ -50,13 +50,13 @@ require_once 'HTTP/Request2/Response.php';
  * Base class for HTTP_Request2 adapters
  *
  * HTTP_Request2 class itself only defines methods for aggregating the request
- * data, all actual work of sending the request to the remote server and 
+ * data, all actual work of sending the request to the remote server and
  * receiving its response is performed by adapters.
  *
  * @category   HTTP
  * @package    HTTP_Request2
  * @author     Alexey Borzov <avb@php.net>
- * @version    Release: 0.4.1
+ * @version    Release: 2.0.0RC1
  */
 abstract class HTTP_Request2_Adapter
 {
@@ -109,8 +109,8 @@ abstract class HTTP_Request2_Adapter
    /**
     * Calculates length of the request body, adds proper headers
     *
-    * @param    array   associative array of request headers, this method will 
-    *                   add proper 'Content-Length' and 'Content-Type' headers 
+    * @param    array   associative array of request headers, this method will
+    *                   add proper 'Content-Length' and 'Content-Type' headers
     *                   to this array (or remove them if not needed)
     */
     protected function calculateRequestLength(&$headers)
@@ -133,13 +133,15 @@ abstract class HTTP_Request2_Adapter
         if (in_array($this->request->getMethod(), self::$bodyDisallowed) ||
             0 == $this->contentLength
         ) {
-            unset($headers['content-type']);
             // No body: send a Content-Length header nonetheless (request #12900),
             // but do that only for methods that require a body (bug #14740)
             if (in_array($this->request->getMethod(), self::$bodyRequired)) {
                 $headers['content-length'] = 0;
             } else {
                 unset($headers['content-length']);
+                // if the method doesn't require a body and doesn't have a
+                // body, don't send a Content-Type header. (request #16799)
+                unset($headers['content-type']);
             }
         } else {
             if (empty($headers['content-type'])) {
diff --git a/extlib/HTTP/Request2/Adapter/Curl.php b/extlib/HTTP/Request2/Adapter/Curl.php
index 4d4de0dcc7..fecfbd7abc 100644
--- a/extlib/HTTP/Request2/Adapter/Curl.php
+++ b/extlib/HTTP/Request2/Adapter/Curl.php
@@ -6,7 +6,7 @@
  *
  * LICENSE:
  *
- * Copyright (c) 2008, 2009, Alexey Borzov <avb@php.net>
+ * Copyright (c) 2008-2011, Alexey Borzov <avb@php.net>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -37,7 +37,7 @@
  * @package    HTTP_Request2
  * @author     Alexey Borzov <avb@php.net>
  * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: Curl.php 278226 2009-04-03 21:32:48Z avb $
+ * @version    SVN: $Id: Curl.php 310800 2011-05-06 07:29:56Z avb $
  * @link       http://pear.php.net/package/HTTP_Request2
  */
 
@@ -52,7 +52,7 @@ require_once 'HTTP/Request2/Adapter.php';
  * @category    HTTP
  * @package     HTTP_Request2
  * @author      Alexey Borzov <avb@php.net>
- * @version     Release: 0.4.1
+ * @version     Release: 2.0.0RC1
  */
 class HTTP_Request2_Adapter_Curl extends HTTP_Request2_Adapter
 {
@@ -79,6 +79,46 @@ class HTTP_Request2_Adapter_Curl extends HTTP_Request2_Adapter
         'ssl_passphrase'  => CURLOPT_SSLCERTPASSWD
    );
 
+   /**
+    * Mapping of CURLE_* constants to Exception subclasses and error codes
+    * @var  array
+    */
+    protected static $errorMap = array(
+        CURLE_UNSUPPORTED_PROTOCOL  => array('HTTP_Request2_MessageException',
+                                             HTTP_Request2_Exception::NON_HTTP_REDIRECT),
+        CURLE_COULDNT_RESOLVE_PROXY => array('HTTP_Request2_ConnectionException'),
+        CURLE_COULDNT_RESOLVE_HOST  => array('HTTP_Request2_ConnectionException'),
+        CURLE_COULDNT_CONNECT       => array('HTTP_Request2_ConnectionException'),
+        // error returned from write callback
+        CURLE_WRITE_ERROR           => array('HTTP_Request2_MessageException',
+                                             HTTP_Request2_Exception::NON_HTTP_REDIRECT),
+        CURLE_OPERATION_TIMEOUTED   => array('HTTP_Request2_MessageException',
+                                             HTTP_Request2_Exception::TIMEOUT),
+        CURLE_HTTP_RANGE_ERROR      => array('HTTP_Request2_MessageException'),
+        CURLE_SSL_CONNECT_ERROR     => array('HTTP_Request2_ConnectionException'),
+        CURLE_LIBRARY_NOT_FOUND     => array('HTTP_Request2_LogicException',
+                                             HTTP_Request2_Exception::MISCONFIGURATION),
+        CURLE_FUNCTION_NOT_FOUND    => array('HTTP_Request2_LogicException',
+                                             HTTP_Request2_Exception::MISCONFIGURATION),
+        CURLE_ABORTED_BY_CALLBACK   => array('HTTP_Request2_MessageException',
+                                             HTTP_Request2_Exception::NON_HTTP_REDIRECT),
+        CURLE_TOO_MANY_REDIRECTS    => array('HTTP_Request2_MessageException',
+                                             HTTP_Request2_Exception::TOO_MANY_REDIRECTS),
+        CURLE_SSL_PEER_CERTIFICATE  => array('HTTP_Request2_ConnectionException'),
+        CURLE_GOT_NOTHING           => array('HTTP_Request2_MessageException'),
+        CURLE_SSL_ENGINE_NOTFOUND   => array('HTTP_Request2_LogicException',
+                                             HTTP_Request2_Exception::MISCONFIGURATION),
+        CURLE_SSL_ENGINE_SETFAILED  => array('HTTP_Request2_LogicException',
+                                             HTTP_Request2_Exception::MISCONFIGURATION),
+        CURLE_SEND_ERROR            => array('HTTP_Request2_MessageException'),
+        CURLE_RECV_ERROR            => array('HTTP_Request2_MessageException'),
+        CURLE_SSL_CERTPROBLEM       => array('HTTP_Request2_LogicException',
+                                             HTTP_Request2_Exception::INVALID_ARGUMENT),
+        CURLE_SSL_CIPHER            => array('HTTP_Request2_ConnectionException'),
+        CURLE_SSL_CACERT            => array('HTTP_Request2_ConnectionException'),
+        CURLE_BAD_CONTENT_ENCODING  => array('HTTP_Request2_MessageException'),
+    );
+
    /**
     * Response being received
     * @var  HTTP_Request2_Response
@@ -110,6 +150,26 @@ class HTTP_Request2_Adapter_Curl extends HTTP_Request2_Adapter
     */
     protected $lastInfo;
 
+   /**
+    * Creates a subclass of HTTP_Request2_Exception from curl error data
+    *
+    * @param resource curl handle
+    * @return HTTP_Request2_Exception
+    */
+    protected static function wrapCurlError($ch)
+    {
+        $nativeCode = curl_errno($ch);
+        $message    = 'Curl error: ' . curl_error($ch);
+        if (!isset(self::$errorMap[$nativeCode])) {
+            return new HTTP_Request2_Exception($message, 0, $nativeCode);
+        } else {
+            $class = self::$errorMap[$nativeCode][0];
+            $code  = empty(self::$errorMap[$nativeCode][1])
+                     ? 0 : self::$errorMap[$nativeCode][1];
+            return new $class($message, $code, $nativeCode);
+        }
+    }
+
    /**
     * Sends request to the remote server and returns its response
     *
@@ -120,7 +180,9 @@ class HTTP_Request2_Adapter_Curl extends HTTP_Request2_Adapter
     public function sendRequest(HTTP_Request2 $request)
     {
         if (!extension_loaded('curl')) {
-            throw new HTTP_Request2_Exception('cURL extension not available');
+            throw new HTTP_Request2_LogicException(
+                'cURL extension not available', HTTP_Request2_Exception::MISCONFIGURATION
+            );
         }
 
         $this->request              = $request;
@@ -131,24 +193,30 @@ class HTTP_Request2_Adapter_Curl extends HTTP_Request2_Adapter
 
         try {
             if (false === curl_exec($ch = $this->createCurlHandle())) {
-                $errorMessage = 'Error sending request: #' . curl_errno($ch) .
-                                                       ' ' . curl_error($ch);
+                $e = self::wrapCurlError($ch);
             }
         } catch (Exception $e) {
         }
-        $this->lastInfo = curl_getinfo($ch);
-        curl_close($ch);
+        if (isset($ch)) {
+            $this->lastInfo = curl_getinfo($ch);
+            curl_close($ch);
+        }
+
+        $response = $this->response;
+        unset($this->request, $this->requestBody, $this->response);
 
         if (!empty($e)) {
             throw $e;
-        } elseif (!empty($errorMessage)) {
-            throw new HTTP_Request2_Exception($errorMessage);
+        }
+
+        if ($jar = $request->getCookieJar()) {
+            $jar->addCookiesFromResponse($response, $request->getUrl());
         }
 
         if (0 < $this->lastInfo['size_download']) {
-            $this->request->setLastEvent('receivedBody', $this->response);
+            $request->setLastEvent('receivedBody', $response);
         }
-        return $this->response;
+        return $response;
     }
 
    /**
@@ -165,19 +233,16 @@ class HTTP_Request2_Adapter_Curl extends HTTP_Request2_Adapter
     * Creates a new cURL handle and populates it with data from the request
     *
     * @return   resource    a cURL handle, as created by curl_init()
-    * @throws   HTTP_Request2_Exception
+    * @throws   HTTP_Request2_LogicException
     */
     protected function createCurlHandle()
     {
         $ch = curl_init();
 
         curl_setopt_array($ch, array(
-            // setup callbacks
-            CURLOPT_READFUNCTION   => array($this, 'callbackReadBody'),
+            // setup write callbacks
             CURLOPT_HEADERFUNCTION => array($this, 'callbackWriteHeader'),
             CURLOPT_WRITEFUNCTION  => array($this, 'callbackWriteBody'),
-            // disallow redirects
-            CURLOPT_FOLLOWLOCATION => false,
             // buffer size
             CURLOPT_BUFFERSIZE     => $this->request->getConfig('buffer_size'),
             // connection timeout
@@ -188,6 +253,27 @@ class HTTP_Request2_Adapter_Curl extends HTTP_Request2_Adapter
             CURLOPT_URL            => $this->request->getUrl()->getUrl()
         ));
 
+        // set up redirects
+        if (!$this->request->getConfig('follow_redirects')) {
+            curl_setopt($ch, CURLOPT_FOLLOWLOCATION, false);
+        } else {
+            if (!@curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true)) {
+                throw new HTTP_Request2_LogicException(
+                    'Redirect support in curl is unavailable due to open_basedir or safe_mode setting',
+                    HTTP_Request2_Exception::MISCONFIGURATION
+                );
+            }
+            curl_setopt($ch, CURLOPT_MAXREDIRS, $this->request->getConfig('max_redirects'));
+            // limit redirects to http(s), works in 5.2.10+
+            if (defined('CURLOPT_REDIR_PROTOCOLS')) {
+                curl_setopt($ch, CURLOPT_REDIR_PROTOCOLS, CURLPROTO_HTTP | CURLPROTO_HTTPS);
+            }
+            // works in 5.3.2+, http://bugs.php.net/bug.php?id=49571
+            if ($this->request->getConfig('strict_redirects') && defined('CURLOPT_POSTREDIR')) {
+                curl_setopt($ch, CURLOPT_POSTREDIR, 3);
+            }
+        }
+
         // request timeout
         if ($timeout = $this->request->getConfig('timeout')) {
             curl_setopt($ch, CURLOPT_TIMEOUT, $timeout);
@@ -210,6 +296,12 @@ class HTTP_Request2_Adapter_Curl extends HTTP_Request2_Adapter
             case HTTP_Request2::METHOD_POST:
                 curl_setopt($ch, CURLOPT_POST, true);
                 break;
+            case HTTP_Request2::METHOD_HEAD:
+                curl_setopt($ch, CURLOPT_NOBODY, true);
+                break;
+            case HTTP_Request2::METHOD_PUT:
+                curl_setopt($ch, CURLOPT_UPLOAD, true);
+                break;
             default:
                 curl_setopt($ch, CURLOPT_CUSTOMREQUEST, $this->request->getMethod());
         }
@@ -217,7 +309,9 @@ class HTTP_Request2_Adapter_Curl extends HTTP_Request2_Adapter
         // set proxy, if needed
         if ($host = $this->request->getConfig('proxy_host')) {
             if (!($port = $this->request->getConfig('proxy_port'))) {
-                throw new HTTP_Request2_Exception('Proxy port not provided');
+                throw new HTTP_Request2_LogicException(
+                    'Proxy port not provided', HTTP_Request2_Exception::MISSING_VALUE
+                );
             }
             curl_setopt($ch, CURLOPT_PROXY, $host . ':' . $port);
             if ($user = $this->request->getConfig('proxy_user')) {
@@ -246,13 +340,11 @@ class HTTP_Request2_Adapter_Curl extends HTTP_Request2_Adapter
         }
 
         // set SSL options
-        if (0 == strcasecmp($this->request->getUrl()->getScheme(), 'https')) {
-            foreach ($this->request->getConfig() as $name => $value) {
-                if ('ssl_verify_host' == $name && null !== $value) {
-                    curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, $value? 2: 0);
-                } elseif (isset(self::$sslContextMap[$name]) && null !== $value) {
-                    curl_setopt($ch, self::$sslContextMap[$name], $value);
-                }
+        foreach ($this->request->getConfig() as $name => $value) {
+            if ('ssl_verify_host' == $name && null !== $value) {
+                curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, $value? 2: 0);
+            } elseif (isset(self::$sslContextMap[$name]) && null !== $value) {
+                curl_setopt($ch, self::$sslContextMap[$name], $value);
             }
         }
 
@@ -262,6 +354,12 @@ class HTTP_Request2_Adapter_Curl extends HTTP_Request2_Adapter
             $headers['accept-encoding'] = '';
         }
 
+        if (($jar = $this->request->getCookieJar())
+            && ($cookies = $jar->getMatching($this->request->getUrl(), true))
+        ) {
+            $headers['cookie'] = (empty($headers['cookie'])? '': $headers['cookie'] . '; ') . $cookies;
+        }
+
         // set headers having special cURL keys
         foreach (self::$headerMap as $name => $option) {
             if (isset($headers[$name])) {
@@ -271,6 +369,9 @@ class HTTP_Request2_Adapter_Curl extends HTTP_Request2_Adapter
         }
 
         $this->calculateRequestLength($headers);
+        if (isset($headers['content-length'])) {
+            $this->workaroundPhpBug47204($ch, $headers);
+        }
 
         // set headers not having special keys
         $headersFmt = array();
@@ -283,13 +384,50 @@ class HTTP_Request2_Adapter_Curl extends HTTP_Request2_Adapter
         return $ch;
     }
 
+   /**
+    * Workaround for PHP bug #47204 that prevents rewinding request body
+    *
+    * The workaround consists of reading the entire request body into memory
+    * and setting it as CURLOPT_POSTFIELDS, so it isn't recommended for large
+    * file uploads, use Socket adapter instead.
+    *
+    * @param    resource    cURL handle
+    * @param    array       Request headers
+    */
+    protected function workaroundPhpBug47204($ch, &$headers)
+    {
+        // no redirects, no digest auth -> probably no rewind needed
+        if (!$this->request->getConfig('follow_redirects')
+            && (!($auth = $this->request->getAuth())
+                || HTTP_Request2::AUTH_DIGEST != $auth['scheme'])
+        ) {
+            curl_setopt($ch, CURLOPT_READFUNCTION, array($this, 'callbackReadBody'));
+
+        // rewind may be needed, read the whole body into memory
+        } else {
+            if ($this->requestBody instanceof HTTP_Request2_MultipartBody) {
+                $this->requestBody = $this->requestBody->__toString();
+
+            } elseif (is_resource($this->requestBody)) {
+                $fp = $this->requestBody;
+                $this->requestBody = '';
+                while (!feof($fp)) {
+                    $this->requestBody .= fread($fp, 16384);
+                }
+            }
+            // curl hangs up if content-length is present
+            unset($headers['content-length']);
+            curl_setopt($ch, CURLOPT_POSTFIELDS, $this->requestBody);
+        }
+    }
+
    /**
     * Callback function called by cURL for reading the request body
     *
     * @param    resource    cURL handle
     * @param    resource    file descriptor (not used)
     * @param    integer     maximum length of data to return
-    * @return   string      part of the request body, up to $length bytes 
+    * @return   string      part of the request body, up to $length bytes
     */
     protected function callbackReadBody($ch, $fd, $length)
     {
@@ -336,6 +474,19 @@ class HTTP_Request2_Adapter_Curl extends HTTP_Request2_Adapter
                     'sentHeaders', curl_getinfo($ch, CURLINFO_HEADER_OUT)
                 );
             }
+            $upload = curl_getinfo($ch, CURLINFO_SIZE_UPLOAD);
+            // if body wasn't read by a callback, send event with total body size
+            if ($upload > $this->position) {
+                $this->request->setLastEvent(
+                    'sentBodyPart', $upload - $this->position
+                );
+                $this->position = $upload;
+            }
+            if ($upload && (!$this->eventSentHeaders
+                            || $this->response->getStatus() >= 200)
+            ) {
+                $this->request->setLastEvent('sentBody', $upload);
+            }
             $this->eventSentHeaders = true;
             // we'll need a new response object
             if ($this->eventReceivedHeaders) {
@@ -344,7 +495,9 @@ class HTTP_Request2_Adapter_Curl extends HTTP_Request2_Adapter
             }
         }
         if (empty($this->response)) {
-            $this->response = new HTTP_Request2_Response($string, false);
+            $this->response = new HTTP_Request2_Response(
+                $string, false, curl_getinfo($ch, CURLINFO_EFFECTIVE_URL)
+            );
         } else {
             $this->response->parseHeaderLine($string);
             if ('' == trim($string)) {
@@ -352,6 +505,27 @@ class HTTP_Request2_Adapter_Curl extends HTTP_Request2_Adapter
                 if (200 <= $this->response->getStatus()) {
                     $this->request->setLastEvent('receivedHeaders', $this->response);
                 }
+
+                if ($this->request->getConfig('follow_redirects') && $this->response->isRedirect()) {
+                    $redirectUrl = new Net_URL2($this->response->getHeader('location'));
+
+                    // for versions lower than 5.2.10, check the redirection URL protocol
+                    if (!defined('CURLOPT_REDIR_PROTOCOLS') && $redirectUrl->isAbsolute()
+                        && !in_array($redirectUrl->getScheme(), array('http', 'https'))
+                    ) {
+                        return -1;
+                    }
+
+                    if ($jar = $this->request->getCookieJar()) {
+                        $jar->addCookiesFromResponse($this->response, $this->request->getUrl());
+                        if (!$redirectUrl->isAbsolute()) {
+                            $redirectUrl = $this->request->getUrl()->resolve($redirectUrl);
+                        }
+                        if ($cookies = $jar->getMatching($redirectUrl, true)) {
+                            curl_setopt($ch, CURLOPT_COOKIE, $cookies);
+                        }
+                    }
+                }
                 $this->eventReceivedHeaders = true;
             }
         }
@@ -368,10 +542,13 @@ class HTTP_Request2_Adapter_Curl extends HTTP_Request2_Adapter
     */
     protected function callbackWriteBody($ch, $string)
     {
-        // cURL calls WRITEFUNCTION callback without calling HEADERFUNCTION if 
+        // cURL calls WRITEFUNCTION callback without calling HEADERFUNCTION if
         // response doesn't start with proper HTTP status line (see bug #15716)
         if (empty($this->response)) {
-            throw new HTTP_Request2_Exception("Malformed response: {$string}");
+            throw new HTTP_Request2_MessageException(
+                "Malformed response: {$string}",
+                HTTP_Request2_Exception::MALFORMED_RESPONSE
+            );
         }
         if ($this->request->getConfig('store_body')) {
             $this->response->appendBody($string);
diff --git a/extlib/HTTP/Request2/Adapter/Mock.php b/extlib/HTTP/Request2/Adapter/Mock.php
index 89688003b2..c99defb899 100644
--- a/extlib/HTTP/Request2/Adapter/Mock.php
+++ b/extlib/HTTP/Request2/Adapter/Mock.php
@@ -6,7 +6,7 @@
  *
  * LICENSE:
  *
- * Copyright (c) 2008, 2009, Alexey Borzov <avb@php.net>
+ * Copyright (c) 2008-2011, Alexey Borzov <avb@php.net>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -37,7 +37,7 @@
  * @package    HTTP_Request2
  * @author     Alexey Borzov <avb@php.net>
  * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: Mock.php 274406 2009-01-23 18:01:57Z avb $
+ * @version    SVN: $Id: Mock.php 308322 2011-02-14 13:58:03Z avb $
  * @link       http://pear.php.net/package/HTTP_Request2
  */
 
@@ -55,31 +55,31 @@ require_once 'HTTP/Request2/Adapter.php';
  * <code>
  * $mock = new HTTP_Request2_Adapter_Mock();
  * $mock->addResponse("HTTP/1.1 ... ");
- * 
+ *
  * $request = new HTTP_Request2();
  * $request->setAdapter($mock);
- * 
+ *
  * // This will return the response set above
  * $response = $req->send();
- * </code> 
+ * </code>
  *
  * @category   HTTP
  * @package    HTTP_Request2
  * @author     Alexey Borzov <avb@php.net>
- * @version    Release: 0.4.1
+ * @version    Release: 2.0.0RC1
  */
 class HTTP_Request2_Adapter_Mock extends HTTP_Request2_Adapter
 {
    /**
     * A queue of responses to be returned by sendRequest()
-    * @var  array 
+    * @var  array
     */
     protected $responses = array();
 
    /**
     * Returns the next response from the queue built by addResponse()
     *
-    * If the queue is empty will return default empty response with status 400,
+    * If the queue is empty it will return default empty response with status 400,
     * if an Exception object was added to the queue it will be thrown.
     *
     * @param    HTTP_Request2
@@ -93,7 +93,7 @@ class HTTP_Request2_Adapter_Mock extends HTTP_Request2_Adapter
             if ($response instanceof HTTP_Request2_Response) {
                 return $response;
             } else {
-                // rethrow the exception,
+                // rethrow the exception
                 $class   = get_class($response);
                 $message = $response->getMessage();
                 $code    = $response->getCode();
@@ -108,7 +108,7 @@ class HTTP_Request2_Adapter_Mock extends HTTP_Request2_Adapter
     * Adds response to the queue
     *
     * @param    mixed   either a string, a pointer to an open file,
-    *                   a HTTP_Request2_Response or Exception object
+    *                   an instance of HTTP_Request2_Response or Exception
     * @throws   HTTP_Request2_Exception
     */
     public function addResponse($response)
@@ -135,7 +135,7 @@ class HTTP_Request2_Adapter_Mock extends HTTP_Request2_Adapter
     public static function createResponseFromString($str)
     {
         $parts       = preg_split('!(\r?\n){2}!m', $str, 2);
-        $headerLines = explode("\n", $parts[0]); 
+        $headerLines = explode("\n", $parts[0]);
         $response    = new HTTP_Request2_Response(array_shift($headerLines));
         foreach ($headerLines as $headerLine) {
             $response->parseHeaderLine($headerLine);
diff --git a/extlib/HTTP/Request2/Adapter/Socket.php b/extlib/HTTP/Request2/Adapter/Socket.php
index ff44d49594..05cc4c715b 100644
--- a/extlib/HTTP/Request2/Adapter/Socket.php
+++ b/extlib/HTTP/Request2/Adapter/Socket.php
@@ -6,7 +6,7 @@
  *
  * LICENSE:
  *
- * Copyright (c) 2008, 2009, Alexey Borzov <avb@php.net>
+ * Copyright (c) 2008-2011, Alexey Borzov <avb@php.net>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -37,7 +37,7 @@
  * @package    HTTP_Request2
  * @author     Alexey Borzov <avb@php.net>
  * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: Socket.php 279760 2009-05-03 10:46:42Z avb $
+ * @version    SVN: $Id: Socket.php 309921 2011-04-03 16:43:02Z avb $
  * @link       http://pear.php.net/package/HTTP_Request2
  */
 
@@ -55,13 +55,13 @@ require_once 'HTTP/Request2/Adapter.php';
  * @category    HTTP
  * @package     HTTP_Request2
  * @author      Alexey Borzov <avb@php.net>
- * @version     Release: 0.4.1
+ * @version     Release: 2.0.0RC1
  */
 class HTTP_Request2_Adapter_Socket extends HTTP_Request2_Adapter
 {
    /**
     * Regular expression for 'token' rule from RFC 2616
-    */ 
+    */
     const REGEXP_TOKEN = '[^\x00-\x1f\x7f-\xff()<>@,;:\\\\"/\[\]?={}\s]+';
 
    /**
@@ -79,11 +79,11 @@ class HTTP_Request2_Adapter_Socket extends HTTP_Request2_Adapter
    /**
     * Data for digest authentication scheme
     *
-    * The keys for the array are URL prefixes. 
+    * The keys for the array are URL prefixes.
     *
-    * The values are associative arrays with data (realm, nonce, nonce-count, 
-    * opaque...) needed for digest authentication. Stored here to prevent making 
-    * duplicate requests to digest-protected resources after we have already 
+    * The values are associative arrays with data (realm, nonce, nonce-count,
+    * opaque...) needed for digest authentication. Stored here to prevent making
+    * duplicate requests to digest-protected resources after we have already
     * received the challenge.
     *
     * @var  array
@@ -110,18 +110,28 @@ class HTTP_Request2_Adapter_Socket extends HTTP_Request2_Adapter
     protected $proxyChallenge;
 
    /**
-    * Global timeout, exception will be raised if request continues past this time
+    * Sum of start time and global timeout, exception will be thrown if request continues past this time
     * @var  integer
     */
-    protected $timeout = null;
+    protected $deadline = null;
 
    /**
     * Remaining length of the current chunk, when reading chunked response
     * @var  integer
     * @see  readChunked()
-    */ 
+    */
     protected $chunkLength = 0;
 
+   /**
+    * Remaining amount of redirections to follow
+    *
+    * Starts at 'max_redirects' configuration parameter and is reduced on each
+    * subsequent redirect. An Exception will be thrown once it reaches zero.
+    *
+    * @var  integer
+    */
+    protected $redirectCountdown = null;
+
    /**
     * Sends request to the remote server and returns its response
     *
@@ -132,33 +142,38 @@ class HTTP_Request2_Adapter_Socket extends HTTP_Request2_Adapter
     public function sendRequest(HTTP_Request2 $request)
     {
         $this->request = $request;
-        $keepAlive     = $this->connect();
-        $headers       = $this->prepareHeaders();
 
-        // Use global request timeout if given, see feature requests #5735, #8964 
+        // Use global request timeout if given, see feature requests #5735, #8964
         if ($timeout = $request->getConfig('timeout')) {
-            $this->timeout = time() + $timeout;
+            $this->deadline = time() + $timeout;
         } else {
-            $this->timeout = null;
+            $this->deadline = null;
         }
 
         try {
+            $keepAlive = $this->connect();
+            $headers   = $this->prepareHeaders();
             if (false === @fwrite($this->socket, $headers, strlen($headers))) {
-                throw new HTTP_Request2_Exception('Error writing request');
+                throw new HTTP_Request2_MessageException('Error writing request');
             }
             // provide request headers to the observer, see request #7633
             $this->request->setLastEvent('sentHeaders', $headers);
             $this->writeBody();
 
-            if ($this->timeout && time() > $this->timeout) {
-                throw new HTTP_Request2_Exception(
-                    'Request timed out after ' . 
-                    $request->getConfig('timeout') . ' second(s)'
+            if ($this->deadline && time() > $this->deadline) {
+                throw new HTTP_Request2_MessageException(
+                    'Request timed out after ' .
+                    $request->getConfig('timeout') . ' second(s)',
+                    HTTP_Request2_Exception::TIMEOUT
                 );
             }
 
             $response = $this->readResponse();
 
+            if ($jar = $request->getCookieJar()) {
+                $jar->addCookiesFromResponse($response, $request->getUrl());
+            }
+
             if (!$this->canKeepAlive($keepAlive, $response)) {
                 $this->disconnect();
             }
@@ -178,10 +193,21 @@ class HTTP_Request2_Adapter_Socket extends HTTP_Request2_Adapter
 
         } catch (Exception $e) {
             $this->disconnect();
+        }
+
+        unset($this->request, $this->requestBody);
+
+        if (!empty($e)) {
+            $this->redirectCountdown = null;
             throw $e;
         }
 
-        return $response;
+        if (!$request->getConfig('follow_redirects') || !$response->isRedirect()) {
+            $this->redirectCountdown = null;
+            return $response;
+        } else {
+            return $this->handleRedirect($request, $response);
+        }
     }
 
    /**
@@ -202,7 +228,10 @@ class HTTP_Request2_Adapter_Socket extends HTTP_Request2_Adapter
 
         if ($host = $this->request->getConfig('proxy_host')) {
             if (!($port = $this->request->getConfig('proxy_port'))) {
-                throw new HTTP_Request2_Exception('Proxy port not provided');
+                throw new HTTP_Request2_LogicException(
+                    'Proxy port not provided',
+                    HTTP_Request2_Exception::MISSING_VALUE
+                );
             }
             $proxy = true;
         } else {
@@ -212,25 +241,27 @@ class HTTP_Request2_Adapter_Socket extends HTTP_Request2_Adapter
         }
 
         if ($tunnel && !$proxy) {
-            throw new HTTP_Request2_Exception(
-                "Trying to perform CONNECT request without proxy"
+            throw new HTTP_Request2_LogicException(
+                "Trying to perform CONNECT request without proxy",
+                HTTP_Request2_Exception::MISSING_VALUE
             );
         }
         if ($secure && !in_array('ssl', stream_get_transports())) {
-            throw new HTTP_Request2_Exception(
-                'Need OpenSSL support for https:// requests'
+            throw new HTTP_Request2_LogicException(
+                'Need OpenSSL support for https:// requests',
+                HTTP_Request2_Exception::MISCONFIGURATION
             );
         }
 
         // RFC 2068, section 19.7.1: A client MUST NOT send the Keep-Alive
         // connection token to a proxy server...
-        if ($proxy && !$secure && 
+        if ($proxy && !$secure &&
             !empty($headers['connection']) && 'Keep-Alive' == $headers['connection']
         ) {
             $this->request->setHeader('connection');
         }
 
-        $keepAlive = ('1.1' == $this->request->getConfig('protocol_version') && 
+        $keepAlive = ('1.1' == $this->request->getConfig('protocol_version') &&
                       empty($headers['connection'])) ||
                      (!empty($headers['connection']) &&
                       'Keep-Alive' == $headers['connection']);
@@ -278,21 +309,27 @@ class HTTP_Request2_Adapter_Socket extends HTTP_Request2_Adapter
             $context = stream_context_create();
             foreach ($options as $name => $value) {
                 if (!stream_context_set_option($context, 'ssl', $name, $value)) {
-                    throw new HTTP_Request2_Exception(
+                    throw new HTTP_Request2_LogicException(
                         "Error setting SSL context option '{$name}'"
                     );
                 }
             }
+            $track = @ini_set('track_errors', 1);
             $this->socket = @stream_socket_client(
                 $remote, $errno, $errstr,
                 $this->request->getConfig('connect_timeout'),
                 STREAM_CLIENT_CONNECT, $context
             );
             if (!$this->socket) {
-                throw new HTTP_Request2_Exception(
-                    "Unable to connect to {$remote}. Error #{$errno}: {$errstr}"
+                $e = new HTTP_Request2_ConnectionException(
+                    "Unable to connect to {$remote}. Error: "
+                     . (empty($errstr)? $php_errormsg: $errstr), 0, $errno
                 );
             }
+            @ini_set('track_errors', $track);
+            if (isset($e)) {
+                throw $e;
+            }
             $this->request->setLastEvent('connect', $remote);
             self::$sockets[$socketKey] =& $this->socket;
         }
@@ -320,7 +357,7 @@ class HTTP_Request2_Adapter_Socket extends HTTP_Request2_Adapter
         $response = $connect->send();
         // Need any successful (2XX) response
         if (200 > $response->getStatus() || 300 <= $response->getStatus()) {
-            throw new HTTP_Request2_Exception(
+            throw new HTTP_Request2_ConnectionException(
                 'Failed to connect via HTTPS proxy. Proxy response: ' .
                 $response->getStatus() . ' ' . $response->getReasonPhrase()
             );
@@ -328,10 +365,10 @@ class HTTP_Request2_Adapter_Socket extends HTTP_Request2_Adapter
         $this->socket = $donor->socket;
 
         $modes = array(
-            STREAM_CRYPTO_METHOD_TLS_CLIENT, 
+            STREAM_CRYPTO_METHOD_TLS_CLIENT,
             STREAM_CRYPTO_METHOD_SSLv3_CLIENT,
             STREAM_CRYPTO_METHOD_SSLv23_CLIENT,
-            STREAM_CRYPTO_METHOD_SSLv2_CLIENT 
+            STREAM_CRYPTO_METHOD_SSLv2_CLIENT
         );
 
         foreach ($modes as $mode) {
@@ -339,7 +376,7 @@ class HTTP_Request2_Adapter_Socket extends HTTP_Request2_Adapter
                 return;
             }
         }
-        throw new HTTP_Request2_Exception(
+        throw new HTTP_Request2_ConnectionException(
             'Failed to enable secure connection when connecting through proxy'
         );
     }
@@ -347,7 +384,7 @@ class HTTP_Request2_Adapter_Socket extends HTTP_Request2_Adapter
    /**
     * Checks whether current connection may be reused or should be closed
     *
-    * @param    boolean                 whether connection could be persistent 
+    * @param    boolean                 whether connection could be persistent
     *                                   in the first place
     * @param    HTTP_Request2_Response  response object to check
     * @return   boolean
@@ -361,8 +398,11 @@ class HTTP_Request2_Adapter_Socket extends HTTP_Request2_Adapter
             return true;
         }
 
-        $lengthKnown = 'chunked' == strtolower($response->getHeader('transfer-encoding')) ||
-                       null !== $response->getHeader('content-length');
+        $lengthKnown = 'chunked' == strtolower($response->getHeader('transfer-encoding'))
+                       || null !== $response->getHeader('content-length')
+                       // no body possible for such responses, see also request #17031
+                       || HTTP_Request2::METHOD_HEAD == $this->request->getMethod()
+                       || in_array($response->getStatus(), array(204, 304));
         $persistent  = 'keep-alive' == strtolower($response->getHeader('connection')) ||
                        (null === $response->getHeader('connection') &&
                         '1.1' == $response->getVersion());
@@ -381,6 +421,66 @@ class HTTP_Request2_Adapter_Socket extends HTTP_Request2_Adapter
         }
     }
 
+   /**
+    * Handles HTTP redirection
+    *
+    * This method will throw an Exception if redirect to a non-HTTP(S) location
+    * is attempted, also if number of redirects performed already is equal to
+    * 'max_redirects' configuration parameter.
+    *
+    * @param    HTTP_Request2               Original request
+    * @param    HTTP_Request2_Response      Response containing redirect
+    * @return   HTTP_Request2_Response      Response from a new location
+    * @throws   HTTP_Request2_Exception
+    */
+    protected function handleRedirect(HTTP_Request2 $request,
+                                      HTTP_Request2_Response $response)
+    {
+        if (is_null($this->redirectCountdown)) {
+            $this->redirectCountdown = $request->getConfig('max_redirects');
+        }
+        if (0 == $this->redirectCountdown) {
+            $this->redirectCountdown = null;
+            // Copying cURL behaviour
+            throw new HTTP_Request2_MessageException (
+                'Maximum (' . $request->getConfig('max_redirects') . ') redirects followed',
+                HTTP_Request2_Exception::TOO_MANY_REDIRECTS
+            );
+        }
+        $redirectUrl = new Net_URL2(
+            $response->getHeader('location'),
+            array(Net_URL2::OPTION_USE_BRACKETS => $request->getConfig('use_brackets'))
+        );
+        // refuse non-HTTP redirect
+        if ($redirectUrl->isAbsolute()
+            && !in_array($redirectUrl->getScheme(), array('http', 'https'))
+        ) {
+            $this->redirectCountdown = null;
+            throw new HTTP_Request2_MessageException(
+                'Refusing to redirect to a non-HTTP URL ' . $redirectUrl->__toString(),
+                HTTP_Request2_Exception::NON_HTTP_REDIRECT
+            );
+        }
+        // Theoretically URL should be absolute (see http://tools.ietf.org/html/rfc2616#section-14.30),
+        // but in practice it is often not
+        if (!$redirectUrl->isAbsolute()) {
+            $redirectUrl = $request->getUrl()->resolve($redirectUrl);
+        }
+        $redirect = clone $request;
+        $redirect->setUrl($redirectUrl);
+        if (303 == $response->getStatus() || (!$request->getConfig('strict_redirects')
+             && in_array($response->getStatus(), array(301, 302)))
+        ) {
+            $redirect->setMethod(HTTP_Request2::METHOD_GET);
+            $redirect->setBody('');
+        }
+
+        if (0 < $this->redirectCountdown) {
+            $this->redirectCountdown--;
+        }
+        return $this->sendRequest($redirect);
+    }
+
    /**
     * Checks whether another request should be performed with server digest auth
     *
@@ -389,7 +489,7 @@ class HTTP_Request2_Adapter_Socket extends HTTP_Request2_Adapter
     *   - auth credentials should be set in the request object
     *   - response should contain WWW-Authenticate header with digest challenge
     *   - there is either no challenge stored for this URL or new challenge
-    *     contains stale=true parameter (in other case we probably just failed 
+    *     contains stale=true parameter (in other case we probably just failed
     *     due to invalid username / password)
     *
     * The method stores challenge values in $challenges static property
@@ -453,7 +553,7 @@ class HTTP_Request2_Adapter_Socket extends HTTP_Request2_Adapter
     *   - proxy auth credentials should be set in the request object
     *   - response should contain Proxy-Authenticate header with digest challenge
     *   - there is either no challenge stored for this proxy or new challenge
-    *     contains stale=true parameter (in other case we probably just failed 
+    *     contains stale=true parameter (in other case we probably just failed
     *     due to invalid username / password)
     *
     * The method stores challenge values in $challenges static property
@@ -489,7 +589,7 @@ class HTTP_Request2_Adapter_Socket extends HTTP_Request2_Adapter
     * Extracts digest method challenge from (WWW|Proxy)-Authenticate header value
     *
     * There is a problem with implementation of RFC 2617: several of the parameters
-    * here are defined as quoted-string and thus may contain backslash escaped
+    * are defined as quoted-string there and thus may contain backslash escaped
     * double quotes (RFC 2616, section 2.2). However, RFC 2617 defines unq(X) as
     * just value of quoted-string X without surrounding quotes, it doesn't speak
     * about removing backslash escaping.
@@ -501,17 +601,17 @@ class HTTP_Request2_Adapter_Socket extends HTTP_Request2_Adapter
     *   - Squid allows (manually escaped) quotes there, but it is impossible to
     *     authorize with either escaped or unescaped quotes used in digest,
     *     probably it can't parse the response (?)
-    *   - Both IE and Firefox display realm value with backslashes in 
+    *   - Both IE and Firefox display realm value with backslashes in
     *     the password popup and apparently use the same value for digest
     *
     * HTTP_Request2 follows IE and Firefox (and hopefully RFC 2617) in
-    * quoted-string handling, unfortunately that means failure to authorize 
+    * quoted-string handling, unfortunately that means failure to authorize
     * sometimes
     *
     * @param    string  value of WWW-Authenticate or Proxy-Authenticate header
     * @return   mixed   associative array with challenge parameters, false if
     *                   no challenge is present in header value
-    * @throws   HTTP_Request2_Exception in case of unsupported challenge parameters
+    * @throws   HTTP_Request2_NotImplementedException in case of unsupported challenge parameters
     */
     protected function parseDigestChallenge($headerValue)
     {
@@ -537,23 +637,23 @@ class HTTP_Request2_Adapter_Socket extends HTTP_Request2_Adapter
             }
         }
         // we only support qop=auth
-        if (!empty($paramsAry['qop']) && 
+        if (!empty($paramsAry['qop']) &&
             !in_array('auth', array_map('trim', explode(',', $paramsAry['qop'])))
         ) {
-            throw new HTTP_Request2_Exception(
+            throw new HTTP_Request2_NotImplementedException(
                 "Only 'auth' qop is currently supported in digest authentication, " .
                 "server requested '{$paramsAry['qop']}'"
             );
         }
         // we only support algorithm=MD5
         if (!empty($paramsAry['algorithm']) && 'MD5' != $paramsAry['algorithm']) {
-            throw new HTTP_Request2_Exception(
+            throw new HTTP_Request2_NotImplementedException(
                 "Only 'MD5' algorithm is currently supported in digest authentication, " .
                 "server requested '{$paramsAry['algorithm']}'"
             );
         }
 
-        return $paramsAry; 
+        return $paramsAry;
     }
 
    /**
@@ -562,7 +662,7 @@ class HTTP_Request2_Adapter_Socket extends HTTP_Request2_Adapter
     * @param    array   challenge to update
     * @param    string  value of [Proxy-]Authentication-Info header
     * @todo     validate server rspauth response
-    */ 
+    */
     protected function updateChallenge(&$challenge, $headerValue)
     {
         $authParam   = '!(' . self::REGEXP_TOKEN . ')\\s*=\\s*(' .
@@ -593,10 +693,10 @@ class HTTP_Request2_Adapter_Socket extends HTTP_Request2_Adapter
     * @param    array   digest challenge parameters
     * @return   string  value of [Proxy-]Authorization request header
     * @link     http://tools.ietf.org/html/rfc2617#section-3.2.2
-    */ 
+    */
     protected function createDigestResponse($user, $password, $url, &$challenge)
     {
-        if (false !== ($q = strpos($url, '?')) && 
+        if (false !== ($q = strpos($url, '?')) &&
             $this->request->getConfig('digest_compat_ie')
         ) {
             $url = substr($url, 0, $q);
@@ -621,7 +721,7 @@ class HTTP_Request2_Adapter_Socket extends HTTP_Request2_Adapter
                'nonce="' . $challenge['nonce'] . '", ' .
                'uri="' . $url . '", ' .
                'response="' . $digest . '"' .
-               (!empty($challenge['opaque'])? 
+               (!empty($challenge['opaque'])?
                 ', opaque="' . $challenge['opaque'] . '"':
                 '') .
                (!empty($challenge['qop'])?
@@ -635,7 +735,7 @@ class HTTP_Request2_Adapter_Socket extends HTTP_Request2_Adapter
     * @param    array   request headers
     * @param    string  request host (needed for digest authentication)
     * @param    string  request URL (needed for digest authentication)
-    * @throws   HTTP_Request2_Exception
+    * @throws   HTTP_Request2_NotImplementedException
     */
     protected function addAuthorizationHeader(&$headers, $requestHost, $requestUrl)
     {
@@ -644,7 +744,7 @@ class HTTP_Request2_Adapter_Socket extends HTTP_Request2_Adapter
         }
         switch ($auth['scheme']) {
             case HTTP_Request2::AUTH_BASIC:
-                $headers['authorization'] = 
+                $headers['authorization'] =
                     'Basic ' . base64_encode($auth['user'] . ':' . $auth['password']);
                 break;
 
@@ -657,7 +757,7 @@ class HTTP_Request2_Adapter_Socket extends HTTP_Request2_Adapter
                 foreach (array_keys(self::$challenges) as $key) {
                     if ($key == substr($fullUrl, 0, strlen($key))) {
                         $headers['authorization'] = $this->createDigestResponse(
-                            $auth['user'], $auth['password'], 
+                            $auth['user'], $auth['password'],
                             $requestUrl, self::$challenges[$key]
                         );
                         $this->serverChallenge =& self::$challenges[$key];
@@ -667,7 +767,7 @@ class HTTP_Request2_Adapter_Socket extends HTTP_Request2_Adapter
                 break;
 
             default:
-                throw new HTTP_Request2_Exception(
+                throw new HTTP_Request2_NotImplementedException(
                     "Unknown HTTP authentication scheme '{$auth['scheme']}'"
                 );
         }
@@ -678,7 +778,7 @@ class HTTP_Request2_Adapter_Socket extends HTTP_Request2_Adapter
     *
     * @param    array   request headers
     * @param    string  request URL (needed for digest authentication)
-    * @throws   HTTP_Request2_Exception
+    * @throws   HTTP_Request2_NotImplementedException
     */
     protected function addProxyAuthorizationHeader(&$headers, $requestUrl)
     {
@@ -711,7 +811,7 @@ class HTTP_Request2_Adapter_Socket extends HTTP_Request2_Adapter
                 break;
 
             default:
-                throw new HTTP_Request2_Exception(
+                throw new HTTP_Request2_NotImplementedException(
                     "Unknown HTTP authentication scheme '" .
                     $this->request->getConfig('proxy_auth_scheme') . "'"
                 );
@@ -762,6 +862,11 @@ class HTTP_Request2_Adapter_Socket extends HTTP_Request2_Adapter
         ) {
             $headers['accept-encoding'] = 'gzip, deflate';
         }
+        if (($jar = $this->request->getCookieJar())
+            && ($cookies = $jar->getMatching($this->request->getUrl(), true))
+        ) {
+            $headers['cookie'] = (empty($headers['cookie'])? '': $headers['cookie'] . '; ') . $cookies;
+        }
 
         $this->addAuthorizationHeader($headers, $host, $requestUrl);
         $this->addProxyAuthorizationHeader($headers, $requestUrl);
@@ -779,7 +884,7 @@ class HTTP_Request2_Adapter_Socket extends HTTP_Request2_Adapter
    /**
     * Sends the request body
     *
-    * @throws   HTTP_Request2_Exception
+    * @throws   HTTP_Request2_MessageException
     */
     protected function writeBody()
     {
@@ -800,12 +905,13 @@ class HTTP_Request2_Adapter_Socket extends HTTP_Request2_Adapter
                 $str = $this->requestBody->read($bufferSize);
             }
             if (false === @fwrite($this->socket, $str, strlen($str))) {
-                throw new HTTP_Request2_Exception('Error writing request');
+                throw new HTTP_Request2_MessageException('Error writing request');
             }
             // Provide the length of written string to the observer, request #7630
             $this->request->setLastEvent('sentBodyPart', strlen($str));
-            $position += strlen($str); 
+            $position += strlen($str);
         }
+        $this->request->setLastEvent('sentBody', $this->contentLength);
     }
 
    /**
@@ -819,7 +925,9 @@ class HTTP_Request2_Adapter_Socket extends HTTP_Request2_Adapter
         $bufferSize = $this->request->getConfig('buffer_size');
 
         do {
-            $response = new HTTP_Request2_Response($this->readLine($bufferSize), true);
+            $response = new HTTP_Request2_Response(
+                $this->readLine($bufferSize), true, $this->request->getUrl()
+            );
             do {
                 $headerLine = $this->readLine($bufferSize);
                 $response->parseHeaderLine($headerLine);
@@ -880,28 +988,30 @@ class HTTP_Request2_Adapter_Socket extends HTTP_Request2_Adapter
     }
 
    /**
-    * Reads until either the end of the socket or a newline, whichever comes first 
+    * Reads until either the end of the socket or a newline, whichever comes first
     *
-    * Strips the trailing newline from the returned data, handles global 
-    * request timeout. Method idea borrowed from Net_Socket PEAR package. 
+    * Strips the trailing newline from the returned data, handles global
+    * request timeout. Method idea borrowed from Net_Socket PEAR package.
     *
     * @param    int     buffer size to use for reading
     * @return   Available data up to the newline (not including newline)
-    * @throws   HTTP_Request2_Exception     In case of timeout
+    * @throws   HTTP_Request2_MessageException     In case of timeout
     */
     protected function readLine($bufferSize)
     {
         $line = '';
         while (!feof($this->socket)) {
-            if ($this->timeout) {
-                stream_set_timeout($this->socket, max($this->timeout - time(), 1));
+            if ($this->deadline) {
+                stream_set_timeout($this->socket, max($this->deadline - time(), 1));
             }
             $line .= @fgets($this->socket, $bufferSize);
             $info  = stream_get_meta_data($this->socket);
-            if ($info['timed_out'] || $this->timeout && time() > $this->timeout) {
-                throw new HTTP_Request2_Exception(
-                    'Request timed out after ' . 
-                    $this->request->getConfig('timeout') . ' second(s)'
+            if ($info['timed_out'] || $this->deadline && time() > $this->deadline) {
+                $reason = $this->deadline
+                          ? 'after ' . $this->request->getConfig('timeout') . ' second(s)'
+                          : 'due to default_socket_timeout php.ini setting';
+                throw new HTTP_Request2_MessageException(
+                    "Request timed out {$reason}", HTTP_Request2_Exception::TIMEOUT
                 );
             }
             if (substr($line, -1) == "\n") {
@@ -916,19 +1026,21 @@ class HTTP_Request2_Adapter_Socket extends HTTP_Request2_Adapter
     *
     * @param    int     Reads up to this number of bytes
     * @return   Data read from socket
-    * @throws   HTTP_Request2_Exception     In case of timeout
+    * @throws   HTTP_Request2_MessageException     In case of timeout
     */
     protected function fread($length)
     {
-        if ($this->timeout) {
-            stream_set_timeout($this->socket, max($this->timeout - time(), 1));
+        if ($this->deadline) {
+            stream_set_timeout($this->socket, max($this->deadline - time(), 1));
         }
         $data = fread($this->socket, $length);
         $info = stream_get_meta_data($this->socket);
-        if ($info['timed_out'] || $this->timeout && time() > $this->timeout) {
-            throw new HTTP_Request2_Exception(
-                'Request timed out after ' . 
-                $this->request->getConfig('timeout') . ' second(s)'
+        if ($info['timed_out'] || $this->deadline && time() > $this->deadline) {
+            $reason = $this->deadline
+                      ? 'after ' . $this->request->getConfig('timeout') . ' second(s)'
+                      : 'due to default_socket_timeout php.ini setting';
+            throw new HTTP_Request2_MessageException(
+                "Request timed out {$reason}", HTTP_Request2_Exception::TIMEOUT
             );
         }
         return $data;
@@ -939,7 +1051,7 @@ class HTTP_Request2_Adapter_Socket extends HTTP_Request2_Adapter
     *
     * @param    int     buffer size to use for reading
     * @return   string
-    * @throws   HTTP_Request2_Exception
+    * @throws   HTTP_Request2_MessageException
     */
     protected function readChunked($bufferSize)
     {
@@ -947,8 +1059,9 @@ class HTTP_Request2_Adapter_Socket extends HTTP_Request2_Adapter
         if (0 == $this->chunkLength) {
             $line = $this->readLine($bufferSize);
             if (!preg_match('/^([0-9a-f]+)/i', $line, $matches)) {
-                throw new HTTP_Request2_Exception(
-                    "Cannot decode chunked response, invalid chunk length '{$line}'"
+                throw new HTTP_Request2_MessageException(
+                    "Cannot decode chunked response, invalid chunk length '{$line}'",
+                    HTTP_Request2_Exception::DECODE_ERROR
                 );
             } else {
                 $this->chunkLength = hexdec($matches[1]);
diff --git a/extlib/HTTP/Request2/CookieJar.php b/extlib/HTTP/Request2/CookieJar.php
new file mode 100644
index 0000000000..af7534f18d
--- /dev/null
+++ b/extlib/HTTP/Request2/CookieJar.php
@@ -0,0 +1,499 @@
+<?php
+/**
+ * Stores cookies and passes them between HTTP requests
+ *
+ * PHP version 5
+ *
+ * LICENSE:
+ *
+ * Copyright (c) 2008-2011, Alexey Borzov <avb@php.net>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *    * Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *    * Redistributions in binary form must reproduce the above copyright
+ *      notice, this list of conditions and the following disclaimer in the
+ *      documentation and/or other materials provided with the distribution.
+ *    * The names of the authors may not be used to endorse or promote products
+ *      derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @category   HTTP
+ * @package    HTTP_Request2
+ * @author     Alexey Borzov <avb@php.net>
+ * @license    http://opensource.org/licenses/bsd-license.php New BSD License
+ * @version    SVN: $Id: CookieJar.php 308629 2011-02-24 17:34:24Z avb $
+ * @link       http://pear.php.net/package/HTTP_Request2
+ */
+
+/** Class representing a HTTP request message */
+require_once 'HTTP/Request2.php';
+
+/**
+ * Stores cookies and passes them between HTTP requests
+ *
+ * @category   HTTP
+ * @package    HTTP_Request2
+ * @author     Alexey Borzov <avb@php.net>
+ * @version    Release: @package_version@
+ */
+class HTTP_Request2_CookieJar implements Serializable
+{
+   /**
+    * Array of stored cookies
+    *
+    * The array is indexed by domain, path and cookie name
+    *   .example.com
+    *     /
+    *       some_cookie => cookie data
+    *     /subdir
+    *       other_cookie => cookie data
+    *   .example.org
+    *     ...
+    *
+    * @var array
+    */
+    protected $cookies = array();
+
+   /**
+    * Whether session cookies should be serialized when serializing the jar
+    * @var bool
+    */
+    protected $serializeSession = false;
+
+   /**
+    * Whether Public Suffix List should be used for domain matching
+    * @var bool
+    */
+    protected $useList = true;
+
+   /**
+    * Array with Public Suffix List data
+    * @var  array
+    * @link http://publicsuffix.org/
+    */
+    protected static $psl = array();
+
+   /**
+    * Class constructor, sets various options
+    *
+    * @param bool Controls serializing session cookies, see {@link serializeSessionCookies()}
+    * @param bool Controls using Public Suffix List, see {@link usePublicSuffixList()}
+    */
+    public function __construct($serializeSessionCookies = false, $usePublicSuffixList = true)
+    {
+        $this->serializeSessionCookies($serializeSessionCookies);
+        $this->usePublicSuffixList($usePublicSuffixList);
+    }
+
+   /**
+    * Returns current time formatted in ISO-8601 at UTC timezone
+    *
+    * @return string
+    */
+    protected function now()
+    {
+        $dt = new DateTime();
+        $dt->setTimezone(new DateTimeZone('UTC'));
+        return $dt->format(DateTime::ISO8601);
+    }
+
+   /**
+    * Checks cookie array for correctness, possibly updating its 'domain', 'path' and 'expires' fields
+    *
+    * The checks are as follows:
+    *   - cookie array should contain 'name' and 'value' fields;
+    *   - name and value should not contain disallowed symbols;
+    *   - 'expires' should be either empty parseable by DateTime;
+    *   - 'domain' and 'path' should be either not empty or an URL where
+    *     cookie was set should be provided.
+    *   - if $setter is provided, then document at that URL should be allowed
+    *     to set a cookie for that 'domain'. If $setter is not provided,
+    *     then no domain checks will be made.
+    *
+    * 'expires' field will be converted to ISO8601 format from COOKIE format,
+    * 'domain' and 'path' will be set from setter URL if empty.
+    *
+    * @param    array    cookie data, as returned by {@link HTTP_Request2_Response::getCookies()}
+    * @param    Net_URL2 URL of the document that sent Set-Cookie header
+    * @return   array    Updated cookie array
+    * @throws   HTTP_Request2_LogicException
+    * @throws   HTTP_Request2_MessageException
+    */
+    protected function checkAndUpdateFields(array $cookie, Net_URL2 $setter = null)
+    {
+        if ($missing = array_diff(array('name', 'value'), array_keys($cookie))) {
+            throw new HTTP_Request2_LogicException(
+                "Cookie array should contain 'name' and 'value' fields",
+                HTTP_Request2_Exception::MISSING_VALUE
+            );
+        }
+        if (preg_match(HTTP_Request2::REGEXP_INVALID_COOKIE, $cookie['name'])) {
+            throw new HTTP_Request2_LogicException(
+                "Invalid cookie name: '{$cookie['name']}'",
+                HTTP_Request2_Exception::INVALID_ARGUMENT
+            );
+        }
+        if (preg_match(HTTP_Request2::REGEXP_INVALID_COOKIE, $cookie['value'])) {
+            throw new HTTP_Request2_LogicException(
+                "Invalid cookie value: '{$cookie['value']}'",
+                HTTP_Request2_Exception::INVALID_ARGUMENT
+            );
+        }
+        $cookie += array('domain' => '', 'path' => '', 'expires' => null, 'secure' => false);
+
+        // Need ISO-8601 date @ UTC timezone
+        if (!empty($cookie['expires'])
+            && !preg_match('/^\\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}\\+0000$/', $cookie['expires'])
+        ) {
+            try {
+                $dt = new DateTime($cookie['expires']);
+                $dt->setTimezone(new DateTimeZone('UTC'));
+                $cookie['expires'] = $dt->format(DateTime::ISO8601);
+            } catch (Exception $e) {
+                throw new HTTP_Request2_LogicException($e->getMessage());
+            }
+        }
+
+        if (empty($cookie['domain']) || empty($cookie['path'])) {
+            if (!$setter) {
+                throw new HTTP_Request2_LogicException(
+                    'Cookie misses domain and/or path component, cookie setter URL needed',
+                    HTTP_Request2_Exception::MISSING_VALUE
+                );
+            }
+            if (empty($cookie['domain'])) {
+                if ($host = $setter->getHost()) {
+                    $cookie['domain'] = $host;
+                } else {
+                    throw new HTTP_Request2_LogicException(
+                        'Setter URL does not contain host part, can\'t set cookie domain',
+                        HTTP_Request2_Exception::MISSING_VALUE
+                    );
+                }
+            }
+            if (empty($cookie['path'])) {
+                $path = $setter->getPath();
+                $cookie['path'] = empty($path)? '/': substr($path, 0, strrpos($path, '/') + 1);
+            }
+        }
+
+        if ($setter && !$this->domainMatch($setter->getHost(), $cookie['domain'])) {
+            throw new HTTP_Request2_MessageException(
+                "Domain " . $setter->getHost() . " cannot set cookies for "
+                . $cookie['domain']
+            );
+        }
+
+        return $cookie;
+    }
+
+   /**
+    * Stores a cookie in the jar
+    *
+    * @param    array    cookie data, as returned by {@link HTTP_Request2_Response::getCookies()}
+    * @param    Net_URL2 URL of the document that sent Set-Cookie header
+    * @throws   HTTP_Request2_Exception
+    */
+    public function store(array $cookie, Net_URL2 $setter = null)
+    {
+        $cookie = $this->checkAndUpdateFields($cookie, $setter);
+
+        if (strlen($cookie['value'])
+            && (is_null($cookie['expires']) || $cookie['expires'] > $this->now())
+        ) {
+            if (!isset($this->cookies[$cookie['domain']])) {
+                $this->cookies[$cookie['domain']] = array();
+            }
+            if (!isset($this->cookies[$cookie['domain']][$cookie['path']])) {
+                $this->cookies[$cookie['domain']][$cookie['path']] = array();
+            }
+            $this->cookies[$cookie['domain']][$cookie['path']][$cookie['name']] = $cookie;
+
+        } elseif (isset($this->cookies[$cookie['domain']][$cookie['path']][$cookie['name']])) {
+            unset($this->cookies[$cookie['domain']][$cookie['path']][$cookie['name']]);
+        }
+    }
+
+   /**
+    * Adds cookies set in HTTP response to the jar
+    *
+    * @param HTTP_Request2_Response response
+    * @param Net_URL2               original request URL, needed for setting
+    *                               default domain/path
+    */
+    public function addCookiesFromResponse(HTTP_Request2_Response $response, Net_URL2 $setter)
+    {
+        foreach ($response->getCookies() as $cookie) {
+            $this->store($cookie, $setter);
+        }
+    }
+
+   /**
+    * Returns all cookies matching a given request URL
+    *
+    * The following checks are made:
+    *   - cookie domain should match request host
+    *   - cookie path should be a prefix for request path
+    *   - 'secure' cookies will only be sent for HTTPS requests
+    *
+    * @param  Net_URL2
+    * @param  bool      Whether to return cookies as string for "Cookie: " header
+    * @return array
+    */
+    public function getMatching(Net_URL2 $url, $asString = false)
+    {
+        $host   = $url->getHost();
+        $path   = $url->getPath();
+        $secure = 0 == strcasecmp($url->getScheme(), 'https');
+
+        $matched = $ret = array();
+        foreach (array_keys($this->cookies) as $domain) {
+            if ($this->domainMatch($host, $domain)) {
+                foreach (array_keys($this->cookies[$domain]) as $cPath) {
+                    if (0 === strpos($path, $cPath)) {
+                        foreach ($this->cookies[$domain][$cPath] as $name => $cookie) {
+                            if (!$cookie['secure'] || $secure) {
+                                $matched[$name][strlen($cookie['path'])] = $cookie;
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        foreach ($matched as $cookies) {
+            krsort($cookies);
+            $ret = array_merge($ret, $cookies);
+        }
+        if (!$asString) {
+            return $ret;
+        } else {
+            $str = '';
+            foreach ($ret as $c) {
+                $str .= (empty($str)? '': '; ') . $c['name'] . '=' . $c['value'];
+            }
+            return $str;
+        }
+    }
+
+   /**
+    * Returns all cookies stored in a jar
+    *
+    * @return array
+    */
+    public function getAll()
+    {
+        $cookies = array();
+        foreach (array_keys($this->cookies) as $domain) {
+            foreach (array_keys($this->cookies[$domain]) as $path) {
+                foreach ($this->cookies[$domain][$path] as $name => $cookie) {
+                    $cookies[] = $cookie;
+                }
+            }
+        }
+        return $cookies;
+    }
+
+   /**
+    * Sets whether session cookies should be serialized when serializing the jar
+    *
+    * @param    boolean
+    */
+    public function serializeSessionCookies($serialize)
+    {
+        $this->serializeSession = (bool)$serialize;
+    }
+
+   /**
+    * Sets whether Public Suffix List should be used for restricting cookie-setting
+    *
+    * Without PSL {@link domainMatch()} will only prevent setting cookies for
+    * top-level domains like '.com' or '.org'. However, it will not prevent
+    * setting a cookie for '.co.uk' even though only third-level registrations
+    * are possible in .uk domain.
+    *
+    * With the List it is possible to find the highest level at which a domain
+    * may be registered for a particular top-level domain and consequently
+    * prevent cookies set for '.co.uk' or '.msk.ru'. The same list is used by
+    * Firefox, Chrome and Opera browsers to restrict cookie setting.
+    *
+    * Note that PSL is licensed differently to HTTP_Request2 package (refer to
+    * the license information in public-suffix-list.php), so you can disable
+    * its use if this is an issue for you.
+    *
+    * @param    boolean
+    * @link     http://publicsuffix.org/learn/
+    */
+    public function usePublicSuffixList($useList)
+    {
+        $this->useList = (bool)$useList;
+    }
+
+   /**
+    * Returns string representation of object
+    *
+    * @return string
+    * @see    Serializable::serialize()
+    */
+    public function serialize()
+    {
+        $cookies = $this->getAll();
+        if (!$this->serializeSession) {
+            for ($i = count($cookies) - 1; $i >= 0; $i--) {
+                if (empty($cookies[$i]['expires'])) {
+                    unset($cookies[$i]);
+                }
+            }
+        }
+        return serialize(array(
+            'cookies'          => $cookies,
+            'serializeSession' => $this->serializeSession,
+            'useList'          => $this->useList
+        ));
+    }
+
+   /**
+    * Constructs the object from serialized string
+    *
+    * @param string  string representation
+    * @see   Serializable::unserialize()
+    */
+    public function unserialize($serialized)
+    {
+        $data = unserialize($serialized);
+        $now  = $this->now();
+        $this->serializeSessionCookies($data['serializeSession']);
+        $this->usePublicSuffixList($data['useList']);
+        foreach ($data['cookies'] as $cookie) {
+            if (!empty($cookie['expires']) && $cookie['expires'] <= $now) {
+                continue;
+            }
+            if (!isset($this->cookies[$cookie['domain']])) {
+                $this->cookies[$cookie['domain']] = array();
+            }
+            if (!isset($this->cookies[$cookie['domain']][$cookie['path']])) {
+                $this->cookies[$cookie['domain']][$cookie['path']] = array();
+            }
+            $this->cookies[$cookie['domain']][$cookie['path']][$cookie['name']] = $cookie;
+        }
+    }
+
+   /**
+    * Checks whether a cookie domain matches a request host.
+    *
+    * The method is used by {@link store()} to check for whether a document
+    * at given URL can set a cookie with a given domain attribute and by
+    * {@link getMatching()} to find cookies matching the request URL.
+    *
+    * @param    string  request host
+    * @param    string  cookie domain
+    * @return   bool    match success
+    */
+    public function domainMatch($requestHost, $cookieDomain)
+    {
+        if ($requestHost == $cookieDomain) {
+            return true;
+        }
+        // IP address, we require exact match
+        if (preg_match('/^(?:\d{1,3}\.){3}\d{1,3}$/', $requestHost)) {
+            return false;
+        }
+        if ('.' != $cookieDomain[0]) {
+            $cookieDomain = '.' . $cookieDomain;
+        }
+        // prevents setting cookies for '.com' and similar domains
+        if (!$this->useList && substr_count($cookieDomain, '.') < 2
+            || $this->useList && !self::getRegisteredDomain($cookieDomain)
+        ) {
+            return false;
+        }
+        return substr('.' . $requestHost, -strlen($cookieDomain)) == $cookieDomain;
+    }
+
+   /**
+    * Removes subdomains to get the registered domain (the first after top-level)
+    *
+    * The method will check Public Suffix List to find out where top-level
+    * domain ends and registered domain starts. It will remove domain parts
+    * to the left of registered one.
+    *
+    * @param  string        domain name
+    * @return string|bool   registered domain, will return false if $domain is
+    *                       either invalid or a TLD itself
+    */
+    public static function getRegisteredDomain($domain)
+    {
+        $domainParts = explode('.', ltrim($domain, '.'));
+
+        // load the list if needed
+        if (empty(self::$psl)) {
+            $path = '@data_dir@' . DIRECTORY_SEPARATOR . 'HTTP_Request2';
+            if (0 === strpos($path, '@' . 'data_dir@')) {
+                $path = realpath(dirname(__FILE__) . DIRECTORY_SEPARATOR . '..'
+                                 . DIRECTORY_SEPARATOR . 'data');
+            }
+            self::$psl = include_once $path . DIRECTORY_SEPARATOR . 'public-suffix-list.php';
+        }
+
+        if (!($result = self::checkDomainsList($domainParts, self::$psl))) {
+            // known TLD, invalid domain name
+            return false;
+        }
+
+        // unknown TLD
+        if (!strpos($result, '.')) {
+            // fallback to checking that domain "has at least two dots"
+            if (2 > ($count = count($domainParts))) {
+                return false;
+            }
+            return $domainParts[$count - 2] . '.' . $domainParts[$count - 1];
+        }
+        return $result;
+    }
+
+   /**
+    * Recursive helper method for {@link getRegisteredDomain()}
+    *
+    * @param  array         remaining domain parts
+    * @param  mixed         node in {@link HTTP_Request2_CookieJar::$psl} to check
+    * @return string|null   concatenated domain parts, null in case of error
+    */
+    protected static function checkDomainsList(array $domainParts, $listNode)
+    {
+        $sub    = array_pop($domainParts);
+        $result = null;
+
+        if (!is_array($listNode) || is_null($sub)
+            || array_key_exists('!' . $sub, $listNode)
+         ) {
+            return $sub;
+
+        } elseif (array_key_exists($sub, $listNode)) {
+            $result = self::checkDomainsList($domainParts, $listNode[$sub]);
+
+        } elseif (array_key_exists('*', $listNode)) {
+            $result = self::checkDomainsList($domainParts, $listNode['*']);
+
+        } else {
+            return $sub;
+        }
+
+        return (strlen($result) > 0) ? ($result . '.' . $sub) : null;
+    }
+}
+?>
\ No newline at end of file
diff --git a/extlib/HTTP/Request2/Exception.php b/extlib/HTTP/Request2/Exception.php
index bfef7d6c22..530c23b9ce 100644
--- a/extlib/HTTP/Request2/Exception.php
+++ b/extlib/HTTP/Request2/Exception.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Exception class for HTTP_Request2 package
+ * Exception classes for HTTP_Request2 package
  *
  * PHP version 5
  *
  * LICENSE:
  *
- * Copyright (c) 2008, 2009, Alexey Borzov <avb@php.net>
+ * Copyright (c) 2008-2011, Alexey Borzov <avb@php.net>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -37,7 +37,7 @@
  * @package    HTTP_Request2
  * @author     Alexey Borzov <avb@php.net>
  * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: Exception.php 273003 2009-01-07 19:28:22Z avb $
+ * @version    SVN: $Id: Exception.php 308629 2011-02-24 17:34:24Z avb $
  * @link       http://pear.php.net/package/HTTP_Request2
  */
 
@@ -47,16 +47,114 @@
 require_once 'PEAR/Exception.php';
 
 /**
- * Exception class for HTTP_Request2 package
- *
- * Such a class is required by the Exception RFC:
- * http://pear.php.net/pepr/pepr-proposal-show.php?id=132
+ * Base exception class for HTTP_Request2 package
  *
  * @category   HTTP
  * @package    HTTP_Request2
- * @version    Release: 0.4.1
+ * @version    Release: 2.0.0RC1
+ * @link       http://pear.php.net/pepr/pepr-proposal-show.php?id=132
  */
 class HTTP_Request2_Exception extends PEAR_Exception
 {
+    /** An invalid argument was passed to a method */
+    const INVALID_ARGUMENT   = 1;
+    /** Some required value was not available */
+    const MISSING_VALUE      = 2;
+    /** Request cannot be processed due to errors in PHP configuration */
+    const MISCONFIGURATION   = 3;
+    /** Error reading the local file */
+    const READ_ERROR         = 4;
+
+    /** Server returned a response that does not conform to HTTP protocol */
+    const MALFORMED_RESPONSE = 10;
+    /** Failure decoding Content-Encoding or Transfer-Encoding of response */
+    const DECODE_ERROR       = 20;
+    /** Operation timed out */
+    const TIMEOUT            = 30;
+    /** Number of redirects exceeded 'max_redirects' configuration parameter */
+    const TOO_MANY_REDIRECTS = 40;
+    /** Redirect to a protocol other than http(s):// */
+    const NON_HTTP_REDIRECT  = 50;
+
+   /**
+    * Native error code
+    * @var int
+    */
+    private $_nativeCode;
+
+   /**
+    * Constructor, can set package error code and native error code
+    *
+    * @param string exception message
+    * @param int    package error code, one of class constants
+    * @param int    error code from underlying PHP extension
+    */
+    public function __construct($message = null, $code = null, $nativeCode = null)
+    {
+        parent::__construct($message, $code);
+        $this->_nativeCode = $nativeCode;
+    }
+
+   /**
+    * Returns error code produced by underlying PHP extension
+    *
+    * For Socket Adapter this may contain error number returned by
+    * stream_socket_client(), for Curl Adapter this will contain error number
+    * returned by curl_errno()
+    *
+    * @return integer
+    */
+    public function getNativeCode()
+    {
+        return $this->_nativeCode;
+    }
 }
+
+/**
+ * Exception thrown in case of missing features
+ *
+ * @category   HTTP
+ * @package    HTTP_Request2
+ * @version    Release: 2.0.0RC1
+ */
+class HTTP_Request2_NotImplementedException extends HTTP_Request2_Exception {}
+
+/**
+ * Exception that represents error in the program logic
+ *
+ * This exception usually implies a programmer's error, like passing invalid
+ * data to methods or trying to use PHP extensions that weren't installed or
+ * enabled. Usually exceptions of this kind will be thrown before request even
+ * starts.
+ *
+ * The exception will usually contain a package error code.
+ *
+ * @category   HTTP
+ * @package    HTTP_Request2
+ * @version    Release: 2.0.0RC1
+ */
+class HTTP_Request2_LogicException extends HTTP_Request2_Exception {}
+
+/**
+ * Exception thrown when connection to a web or proxy server fails
+ *
+ * The exception will not contain a package error code, but will contain
+ * native error code, as returned by stream_socket_client() or curl_errno().
+ *
+ * @category   HTTP
+ * @package    HTTP_Request2
+ * @version    Release: 2.0.0RC1
+ */
+class HTTP_Request2_ConnectionException extends HTTP_Request2_Exception {}
+
+/**
+ * Exception thrown when sending or receiving HTTP message fails
+ *
+ * The exception may contain both package error code and native error code.
+ *
+ * @category   HTTP
+ * @package    HTTP_Request2
+ * @version    Release: 2.0.0RC1
+ */
+class HTTP_Request2_MessageException extends HTTP_Request2_Exception {}
 ?>
\ No newline at end of file
diff --git a/extlib/HTTP/Request2/MultipartBody.php b/extlib/HTTP/Request2/MultipartBody.php
index d8afd8344c..a7bd948baf 100644
--- a/extlib/HTTP/Request2/MultipartBody.php
+++ b/extlib/HTTP/Request2/MultipartBody.php
@@ -6,7 +6,7 @@
  *
  * LICENSE:
  *
- * Copyright (c) 2008, 2009, Alexey Borzov <avb@php.net>
+ * Copyright (c) 2008-2011, Alexey Borzov <avb@php.net>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -37,7 +37,7 @@
  * @package    HTTP_Request2
  * @author     Alexey Borzov <avb@php.net>
  * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: MultipartBody.php 287306 2009-08-14 15:22:52Z avb $
+ * @version    SVN: $Id: MultipartBody.php 308322 2011-02-14 13:58:03Z avb $
  * @link       http://pear.php.net/package/HTTP_Request2
  */
 
@@ -50,7 +50,7 @@
  * @category   HTTP
  * @package    HTTP_Request2
  * @author     Alexey Borzov <avb@php.net>
- * @version    Release: 0.4.1
+ * @version    Release: 2.0.0RC1
  * @link       http://tools.ietf.org/html/rfc1867
  */
 class HTTP_Request2_MultipartBody
@@ -172,7 +172,7 @@ class HTTP_Request2_MultipartBody
         while ($length > 0 && $this->_pos[0] <= $paramCount + $uploadCount) {
             $oldLength = $length;
             if ($this->_pos[0] < $paramCount) {
-                $param = sprintf($this->_headerParam, $boundary, 
+                $param = sprintf($this->_headerParam, $boundary,
                                  $this->_params[$this->_pos[0]][0]) .
                          $this->_params[$this->_pos[0]][1] . "\r\n";
                 $ret    .= substr($param, $this->_pos[1], $length);
diff --git a/extlib/HTTP/Request2/Observer/Log.php b/extlib/HTTP/Request2/Observer/Log.php
index b1a0552780..7865906f65 100644
--- a/extlib/HTTP/Request2/Observer/Log.php
+++ b/extlib/HTTP/Request2/Observer/Log.php
@@ -6,7 +6,7 @@
  *
  * LICENSE:
  *
- * Copyright (c) 2008, 2009, Alexey Borzov <avb@php.net>
+ * Copyright (c) 2008-2011, Alexey Borzov <avb@php.net>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -38,19 +38,19 @@
  * @author   David Jean Louis <izi@php.net>
  * @author   Alexey Borzov <avb@php.net>
  * @license  http://opensource.org/licenses/bsd-license.php New BSD License
- * @version  CVS: $Id: Log.php 272593 2009-01-02 16:27:14Z avb $
+ * @version  SVN: $Id: Log.php 308680 2011-02-25 17:40:17Z avb $
  * @link     http://pear.php.net/package/HTTP_Request2
  */
 
 /**
  * Exception class for HTTP_Request2 package
- */ 
+ */
 require_once 'HTTP/Request2/Exception.php';
 
 /**
  * A debug observer useful for debugging / testing.
  *
- * This observer logs to a log target data corresponding to the various request 
+ * This observer logs to a log target data corresponding to the various request
  * and response events, it logs by default to php://output but can be configured
  * to log to a file or via the PEAR Log package.
  *
@@ -87,7 +87,7 @@ require_once 'HTTP/Request2/Exception.php';
  * @author   David Jean Louis <izi@php.net>
  * @author   Alexey Borzov <avb@php.net>
  * @license  http://opensource.org/licenses/bsd-license.php New BSD License
- * @version  Release: 0.4.1
+ * @version  Release: 2.0.0RC1
  * @link     http://pear.php.net/package/HTTP_Request2
  */
 class HTTP_Request2_Observer_Log implements SplObserver
@@ -109,7 +109,7 @@ class HTTP_Request2_Observer_Log implements SplObserver
     public $events = array(
         'connect',
         'sentHeaders',
-        'sentBodyPart',
+        'sentBody',
         'receivedHeaders',
         'receivedBody',
         'disconnect',
@@ -134,7 +134,7 @@ class HTTP_Request2_Observer_Log implements SplObserver
         }
         if (is_resource($target) || $target instanceof Log) {
             $this->target = $target;
-        } elseif (false === ($this->target = @fopen($target, 'w'))) {
+        } elseif (false === ($this->target = @fopen($target, 'ab'))) {
             throw new HTTP_Request2_Exception("Unable to open '{$target}'");
         }
     }
@@ -143,7 +143,7 @@ class HTTP_Request2_Observer_Log implements SplObserver
     // update() {{{
 
     /**
-     * Called when the request notify us of an event.
+     * Called when the request notifies us of an event.
      *
      * @param HTTP_Request2 $subject The HTTP_Request2 instance
      *
@@ -167,8 +167,8 @@ class HTTP_Request2_Observer_Log implements SplObserver
                 $this->log('> ' . $header);
             }
             break;
-        case 'sentBodyPart':
-            $this->log('> ' . $event['data']);
+        case 'sentBody':
+            $this->log('> ' . $event['data'] . ' byte(s) sent');
             break;
         case 'receivedHeaders':
             $this->log(sprintf('< HTTP/%s %s %s',
@@ -189,12 +189,12 @@ class HTTP_Request2_Observer_Log implements SplObserver
             break;
         }
     }
-    
+
     // }}}
     // log() {{{
 
     /**
-     * Log the given message to the configured target.
+     * Logs the given message to the configured target.
      *
      * @param string $message Message to display
      *
diff --git a/extlib/HTTP/Request2/Response.php b/extlib/HTTP/Request2/Response.php
index c7c1021fbb..73e9a5dc82 100644
--- a/extlib/HTTP/Request2/Response.php
+++ b/extlib/HTTP/Request2/Response.php
@@ -6,7 +6,7 @@
  *
  * LICENSE:
  *
- * Copyright (c) 2008, 2009, Alexey Borzov <avb@php.net>
+ * Copyright (c) 2008-2011, Alexey Borzov <avb@php.net>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -37,13 +37,13 @@
  * @package    HTTP_Request2
  * @author     Alexey Borzov <avb@php.net>
  * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: Response.php 287948 2009-09-01 17:12:18Z avb $
+ * @version    SVN: $Id: Response.php 309921 2011-04-03 16:43:02Z avb $
  * @link       http://pear.php.net/package/HTTP_Request2
  */
 
 /**
  * Exception class for HTTP_Request2 package
- */ 
+ */
 require_once 'HTTP/Request2/Exception.php';
 
 /**
@@ -58,11 +58,11 @@ require_once 'HTTP/Request2/Exception.php';
  *     $headerLine = read_header_line();
  *     $response->parseHeaderLine($headerLine);
  * } while ($headerLine != '');
- * 
+ *
  * while ($chunk = read_body()) {
  *     $response->appendBody($chunk);
  * }
- * 
+ *
  * var_dump($response->getHeader(), $response->getCookies(), $response->getBody());
  * </code>
  *
@@ -70,7 +70,7 @@ require_once 'HTTP/Request2/Exception.php';
  * @category   HTTP
  * @package    HTTP_Request2
  * @author     Alexey Borzov <avb@php.net>
- * @version    Release: 0.4.1
+ * @version    Release: 2.0.0RC1
  * @link       http://tools.ietf.org/html/rfc2616#section-6
  */
 class HTTP_Request2_Response
@@ -95,6 +95,12 @@ class HTTP_Request2_Response
     */
     protected $reasonPhrase;
 
+   /**
+    * Effective URL (may be different from original request URL in case of redirects)
+    * @var  string
+    */
+    protected $effectiveUrl;
+
    /**
     * Associative array of response headers
     * @var  array
@@ -164,7 +170,7 @@ class HTTP_Request2_Response
         305 => 'Use Proxy',
         307 => 'Temporary Redirect',
 
-        // 4xx: Client Error - The request contains bad syntax or cannot be 
+        // 4xx: Client Error - The request contains bad syntax or cannot be
         // fulfilled
         400 => 'Bad Request',
         401 => 'Unauthorized',
@@ -200,14 +206,18 @@ class HTTP_Request2_Response
    /**
     * Constructor, parses the response status line
     *
-    * @param    string  Response status line (e.g. "HTTP/1.1 200 OK")
-    * @param    bool    Whether body is still encoded by Content-Encoding
-    * @throws   HTTP_Request2_Exception if status line is invalid according to spec
+    * @param    string Response status line (e.g. "HTTP/1.1 200 OK")
+    * @param    bool   Whether body is still encoded by Content-Encoding
+    * @param    string Effective URL of the response
+    * @throws   HTTP_Request2_MessageException if status line is invalid according to spec
     */
-    public function __construct($statusLine, $bodyEncoded = true)
+    public function __construct($statusLine, $bodyEncoded = true, $effectiveUrl = null)
     {
         if (!preg_match('!^HTTP/(\d\.\d) (\d{3})(?: (.+))?!', $statusLine, $m)) {
-            throw new HTTP_Request2_Exception("Malformed response: {$statusLine}");
+            throw new HTTP_Request2_MessageException(
+                "Malformed response: {$statusLine}",
+                HTTP_Request2_Exception::MALFORMED_RESPONSE
+            );
         }
         $this->version = $m[1];
         $this->code    = intval($m[2]);
@@ -216,13 +226,14 @@ class HTTP_Request2_Response
         } elseif (!empty(self::$phrases[$this->code])) {
             $this->reasonPhrase = self::$phrases[$this->code];
         }
-        $this->bodyEncoded = (bool)$bodyEncoded;
+        $this->bodyEncoded  = (bool)$bodyEncoded;
+        $this->effectiveUrl = (string)$effectiveUrl;
     }
 
    /**
     * Parses the line from HTTP response filling $headers array
     *
-    * The method should be called after reading the line from socket or receiving 
+    * The method should be called after reading the line from socket or receiving
     * it into cURL callback. Passing an empty string here indicates the end of
     * response headers and triggers additional processing, so be sure to pass an
     * empty string in the end.
@@ -264,7 +275,7 @@ class HTTP_Request2_Response
             }
             $this->lastHeader = $name;
 
-        // string 
+        // continuation of a previous header
         } elseif (preg_match('!^\s+(.+)$!', $headerLine, $m) && $this->lastHeader) {
             if (!is_array($this->headers[$this->lastHeader])) {
                 $this->headers[$this->lastHeader] .= ' ' . trim($m[1]);
@@ -273,13 +284,13 @@ class HTTP_Request2_Response
                 $this->headers[$this->lastHeader][$key] .= ' ' . trim($m[1]);
             }
         }
-    } 
+    }
 
    /**
     * Parses a Set-Cookie header to fill $cookies array
     *
     * @param    string    value of Set-Cookie header
-    * @link     http://cgi.netscape.com/newsref/std/cookie_spec.html
+    * @link     http://web.archive.org/web/20080331104521/http://cgi.netscape.com/newsref/std/cookie_spec.html
     */
     protected function parseCookie($cookieString)
     {
@@ -334,9 +345,22 @@ class HTTP_Request2_Response
         $this->body .= $bodyChunk;
     }
 
+   /**
+    * Returns the effective URL of the response
+    *
+    * This may be different from the request URL if redirects were followed.
+    *
+    * @return string
+    * @link   http://pear.php.net/bugs/bug.php?id=18412
+    */
+    public function getEffectiveUrl()
+    {
+        return $this->effectiveUrl;
+    }
+
    /**
     * Returns the status code
-    * @return   integer 
+    * @return   integer
     */
     public function getStatus()
     {
@@ -352,6 +376,16 @@ class HTTP_Request2_Response
         return $this->reasonPhrase;
     }
 
+   /**
+    * Whether response is a redirect that can be automatically handled by HTTP_Request2
+    * @return   bool
+    */
+    public function isRedirect()
+    {
+        return in_array($this->code, array(300, 301, 302, 303, 307))
+               && isset($this->headers['location']);
+    }
+
    /**
     * Returns either the named header or all response headers
     *
@@ -388,7 +422,7 @@ class HTTP_Request2_Response
     */
     public function getBody()
     {
-        if (!$this->bodyEncoded ||
+        if (0 == strlen($this->body) || !$this->bodyEncoded ||
             !in_array(strtolower($this->getHeader('content-encoding')), array('gzip', 'deflate'))
         ) {
             return $this->body;
@@ -424,7 +458,7 @@ class HTTP_Request2_Response
     * Get the HTTP version of the response
     *
     * @return   string
-    */ 
+    */
     public function getVersion()
     {
         return $this->version;
@@ -439,7 +473,8 @@ class HTTP_Request2_Response
     *
     * @param    string  gzip-encoded data
     * @return   string  decoded data
-    * @throws   HTTP_Request2_Exception
+    * @throws   HTTP_Request2_LogicException
+    * @throws   HTTP_Request2_MessageException
     * @link     http://tools.ietf.org/html/rfc1952
     */
     public static function decodeGzip($data)
@@ -450,15 +485,24 @@ class HTTP_Request2_Response
             return $data;
         }
         if (!function_exists('gzinflate')) {
-            throw new HTTP_Request2_Exception('Unable to decode body: gzip extension not available');
+            throw new HTTP_Request2_LogicException(
+                'Unable to decode body: gzip extension not available',
+                HTTP_Request2_Exception::MISCONFIGURATION
+            );
         }
         $method = ord(substr($data, 2, 1));
         if (8 != $method) {
-            throw new HTTP_Request2_Exception('Error parsing gzip header: unknown compression method');
+            throw new HTTP_Request2_MessageException(
+                'Error parsing gzip header: unknown compression method',
+                HTTP_Request2_Exception::DECODE_ERROR
+            );
         }
         $flags = ord(substr($data, 3, 1));
         if ($flags & 224) {
-            throw new HTTP_Request2_Exception('Error parsing gzip header: reserved bits are set');
+            throw new HTTP_Request2_MessageException(
+                'Error parsing gzip header: reserved bits are set',
+                HTTP_Request2_Exception::DECODE_ERROR
+            );
         }
 
         // header is 10 bytes minimum. may be longer, though.
@@ -466,45 +510,69 @@ class HTTP_Request2_Response
         // extra fields, need to skip 'em
         if ($flags & 4) {
             if ($length - $headerLength - 2 < 8) {
-                throw new HTTP_Request2_Exception('Error parsing gzip header: data too short');
+                throw new HTTP_Request2_MessageException(
+                    'Error parsing gzip header: data too short',
+                    HTTP_Request2_Exception::DECODE_ERROR
+                );
             }
             $extraLength = unpack('v', substr($data, 10, 2));
             if ($length - $headerLength - 2 - $extraLength[1] < 8) {
-                throw new HTTP_Request2_Exception('Error parsing gzip header: data too short');
+                throw new HTTP_Request2_MessageException(
+                    'Error parsing gzip header: data too short',
+                    HTTP_Request2_Exception::DECODE_ERROR
+                );
             }
             $headerLength += $extraLength[1] + 2;
         }
         // file name, need to skip that
         if ($flags & 8) {
             if ($length - $headerLength - 1 < 8) {
-                throw new HTTP_Request2_Exception('Error parsing gzip header: data too short');
+                throw new HTTP_Request2_MessageException(
+                    'Error parsing gzip header: data too short',
+                    HTTP_Request2_Exception::DECODE_ERROR
+                );
             }
             $filenameLength = strpos(substr($data, $headerLength), chr(0));
             if (false === $filenameLength || $length - $headerLength - $filenameLength - 1 < 8) {
-                throw new HTTP_Request2_Exception('Error parsing gzip header: data too short');
+                throw new HTTP_Request2_MessageException(
+                    'Error parsing gzip header: data too short',
+                    HTTP_Request2_Exception::DECODE_ERROR
+                );
             }
             $headerLength += $filenameLength + 1;
         }
         // comment, need to skip that also
         if ($flags & 16) {
             if ($length - $headerLength - 1 < 8) {
-                throw new HTTP_Request2_Exception('Error parsing gzip header: data too short');
+                throw new HTTP_Request2_MessageException(
+                    'Error parsing gzip header: data too short',
+                    HTTP_Request2_Exception::DECODE_ERROR
+                );
             }
             $commentLength = strpos(substr($data, $headerLength), chr(0));
             if (false === $commentLength || $length - $headerLength - $commentLength - 1 < 8) {
-                throw new HTTP_Request2_Exception('Error parsing gzip header: data too short');
+                throw new HTTP_Request2_MessageException(
+                    'Error parsing gzip header: data too short',
+                    HTTP_Request2_Exception::DECODE_ERROR
+                );
             }
             $headerLength += $commentLength + 1;
         }
         // have a CRC for header. let's check
         if ($flags & 2) {
             if ($length - $headerLength - 2 < 8) {
-                throw new HTTP_Request2_Exception('Error parsing gzip header: data too short');
+                throw new HTTP_Request2_MessageException(
+                    'Error parsing gzip header: data too short',
+                    HTTP_Request2_Exception::DECODE_ERROR
+                );
             }
             $crcReal   = 0xffff & crc32(substr($data, 0, $headerLength));
             $crcStored = unpack('v', substr($data, $headerLength, 2));
             if ($crcReal != $crcStored[1]) {
-                throw new HTTP_Request2_Exception('Header CRC check failed');
+                throw new HTTP_Request2_MessageException(
+                    'Header CRC check failed',
+                    HTTP_Request2_Exception::DECODE_ERROR
+                );
             }
             $headerLength += 2;
         }
@@ -517,11 +585,20 @@ class HTTP_Request2_Response
         // don't pass $dataSize to gzinflate, see bugs #13135, #14370
         $unpacked = gzinflate(substr($data, $headerLength, -8));
         if (false === $unpacked) {
-            throw new HTTP_Request2_Exception('gzinflate() call failed');
+            throw new HTTP_Request2_MessageException(
+                'gzinflate() call failed',
+                HTTP_Request2_Exception::DECODE_ERROR
+            );
         } elseif ($dataSize != strlen($unpacked)) {
-            throw new HTTP_Request2_Exception('Data size check failed');
+            throw new HTTP_Request2_MessageException(
+                'Data size check failed',
+                HTTP_Request2_Exception::DECODE_ERROR
+            );
         } elseif ((0xffffffff & $dataCrc) != (0xffffffff & crc32($unpacked))) {
-            throw new HTTP_Request2_Exception('Data CRC check failed');
+            throw new HTTP_Request2_Exception(
+                'Data CRC check failed',
+                HTTP_Request2_Exception::DECODE_ERROR
+            );
         }
         return $unpacked;
     }
@@ -531,12 +608,15 @@ class HTTP_Request2_Response
     *
     * @param    string  deflate-encoded data
     * @return   string  decoded data
-    * @throws   HTTP_Request2_Exception
+    * @throws   HTTP_Request2_LogicException
     */
     public static function decodeDeflate($data)
     {
         if (!function_exists('gzuncompress')) {
-            throw new HTTP_Request2_Exception('Unable to decode body: gzip extension not available');
+            throw new HTTP_Request2_LogicException(
+                'Unable to decode body: gzip extension not available',
+                HTTP_Request2_Exception::MISCONFIGURATION
+            );
         }
         // RFC 2616 defines 'deflate' encoding as zlib format from RFC 1950,
         // while many applications send raw deflate stream from RFC 1951.
diff --git a/extlib/Net/URL/Mapper.php b/extlib/Net/URL/Mapper.php
deleted file mode 100644
index 009c135214..0000000000
--- a/extlib/Net/URL/Mapper.php
+++ /dev/null
@@ -1,324 +0,0 @@
-<?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 232857 2007-03-28 10:23:04Z mansion $
- * @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
deleted file mode 100644
index 1915ad9782..0000000000
--- a/extlib/Net/URL/Mapper/Exception.php
+++ /dev/null
@@ -1,104 +0,0 @@
-<?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 232857 2007-03-28 10:23:04Z mansion $
- * @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
deleted file mode 100644
index 087c368eea..0000000000
--- a/extlib/Net/URL/Mapper/Part.php
+++ /dev/null
@@ -1,142 +0,0 @@
-<?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 232857 2007-03-28 10:23:04Z mansion $
- * @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
deleted file mode 100644
index 914afa4211..0000000000
--- a/extlib/Net/URL/Mapper/Part/Dynamic.php
+++ /dev/null
@@ -1,81 +0,0 @@
-<?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 232857 2007-03-28 10:23:04Z mansion $
- * @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
deleted file mode 100644
index 7d94973eac..0000000000
--- a/extlib/Net/URL/Mapper/Part/Fixed.php
+++ /dev/null
@@ -1,70 +0,0 @@
-<?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 232857 2007-03-28 10:23:04Z mansion $
- * @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
deleted file mode 100644
index 84e29e1306..0000000000
--- a/extlib/Net/URL/Mapper/Part/Wildcard.php
+++ /dev/null
@@ -1,80 +0,0 @@
-<?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 232857 2007-03-28 10:23:04Z mansion $
- * @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
deleted file mode 100644
index b459fa1fd3..0000000000
--- a/extlib/Net/URL/Mapper/Path.php
+++ /dev/null
@@ -1,451 +0,0 @@
-<?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 296456 2010-03-20 00:41:08Z kguest $
- * @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();
-    }
-
-    /**
-    * Called when the object is serialized
-    * Make sure we do not store too much info when the object is serialized
-    * and call the regular expressions generator functions so that they will
-    * not need to be generated again on wakeup.
-    *
-    * @return   array   Name of properties to store when serialized
-    */
-    public function __sleep()
-    {
-        $this->getFormat();
-        $this->getRule();
-        return array('alias', 'path', 'defaults', 'rule', 'format',
-            'parts', 'minKeys', 'maxKeys', 'fixed', 'required');
-    }
-
-    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)) {
-            if(strpos($path, '?') === false) {
-                $path .= '?';
-            } else {
-                $path .= '&';
-            }
-            $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);
-    }
-
-}
-
-?>
diff --git a/extlib/Net/URL/Mapper/Path.plex b/extlib/Net/URL/Mapper/Path.plex
deleted file mode 100644
index c5ef1f88ea..0000000000
--- a/extlib/Net/URL/Mapper/Path.plex
+++ /dev/null
@@ -1,334 +0,0 @@
-<?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.plex 283937 2009-07-12 11:37:21Z mansion $
- * @link       http://pear.php.net/package/Net_URL_Mapper
- */
-
-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();
-    }
-
-    /**
-    * Called when the object is serialized
-    * Make sure we do not store too much info when the object is serialized
-    * and call the regular expressions generator functions so that they will
-    * not need to be generated again on wakeup.
-    *
-    * @return   array   Name of properties to store when serialized
-    */
-    public function __sleep()
-    {
-        $this->getFormat();
-        $this->getRule();
-        return array('alias', 'path', 'defaults', 'rule', 'format',
-            'parts', 'minKeys', 'maxKeys', 'fixed', 'required');
-    }
-
-    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;
-    }
-
-
-
-/*!lex2php
-%input $this->path
-%counter $this->N
-%token $this->token
-%value $this->value
-%line $this->line
-static = /\/?([^\/:\*]+)/
-variable = /([a-zA-Z0-9_]+)/
-dynamic = /\/?:/
-wildcard = @/?\*@
-grouping = /\/?\(([a-zA-Z0-9_]+)\)/
-*/
-/*!lex2php
-%statename START
-dynamic grouping {
-    $c = $yy_subpatterns[0];
-    $part = self::createPart(Net_URL_Mapper_Part::DYNAMIC, $c, $this->value);
-    $this->addPart($part);
-}
-wildcard grouping {
-    $c = $yy_subpatterns[0];
-    $part = self::createPart(Net_URL_Mapper_Part::WILDCARD, $c, $this->value);
-    $this->addPart($part);
-}
-dynamic variable {
-    $c = $yy_subpatterns[0];
-    $part = self::createPart(Net_URL_Mapper_Part::DYNAMIC, $c, $this->value);
-    $this->addPart($part);
-}
-wildcard variable {
-    $c = $yy_subpatterns[0];
-    $part = self::createPart(Net_URL_Mapper_Part::WILDCARD, $c, $this->value);
-    $this->addPart($part);
-}
-static {
-    $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/index.php b/index.php
index 3534739bfa..1566399fa2 100644
--- a/index.php
+++ b/index.php
@@ -49,21 +49,29 @@ $action = null;
 
 function getPath($req)
 {
+    $p = null;
+
     if ((common_config('site', 'fancy') || !array_key_exists('PATH_INFO', $_SERVER))
         && array_key_exists('p', $req)
     ) {
-        return $req['p'];
+        $p = $req['p'];
     } else if (array_key_exists('PATH_INFO', $_SERVER)) {
         $path = $_SERVER['PATH_INFO'];
         $script = $_SERVER['SCRIPT_NAME'];
         if (substr($path, 0, mb_strlen($script)) == $script) {
-            return substr($path, mb_strlen($script));
+            $p = substr($path, mb_strlen($script) + 1);
         } else {
-            return $path;
+            $p = $path;
         }
     } else {
-        return null;
+        $p = null;
     }
+
+    // Trim all initial '/'
+
+    $p = ltrim($p, '/');
+
+    return $p;
 }
 
 /**
@@ -116,15 +124,13 @@ function handleError($error)
                 common_config('site', 'name'),
                 common_config('site', 'email')
             );
-        } else {
-            // TRANS: Error message.
-            $msg = _('An important error occured, probably related to email setup. '.
-                'Check logfiles for more info.'
-            );
-        }
 
-        $dac = new DBErrorAction($msg, 500);
-        $dac->showPage();
+            $dac = new DBErrorAction($msg, 500);
+            $dac->showPage();
+        } else {
+            $sac = new ServerErrorAction($error->getMessage(), 500, $error);
+            $sac->showPage();
+        }
 
     } catch (Exception $e) {
         // TRANS: Error message.
diff --git a/install.php b/install.php
index 9b0d19882c..f44999285a 100644
--- a/install.php
+++ b/install.php
@@ -248,6 +248,21 @@ class WebInstaller extends Installer
                     </li>
                 </ul>
             </fieldset>
+            <fieldset id="settings_profile">
+                <legend>Site profile</legend>
+                <ul class="form_data">
+                    <li>
+                        <label for="site_profile">Type of site</label>
+                        <select id="site_profile" name="site_profile">
+                            <option value="private">Private</option>
+                            <option value="community">Community</option>
+                            <option value ="public">Public</option>
+                            <option value ="singleuser">Single User</option>
+                        </select>
+                        <p class="form_guide">Initial access settings for your site</p>
+                    </li>
+                </ul>
+            </fieldset>
             <input type="submit" name="submit" class="submit" value="Submit" />
         </fieldset>
     </form>
@@ -284,7 +299,7 @@ STR;
     /**
      * Read and validate input data.
      * May output side effects.
-     * 
+     *
      * @return boolean success
      */
     function prepare()
@@ -304,6 +319,8 @@ STR;
         $this->adminEmail   = $post->string('admin_email');
         $this->adminUpdates = $post->string('admin_updates');
 
+        $this->siteProfile = $post->string('site_profile');
+
         $this->server = $_SERVER['HTTP_HOST'];
         $this->path = substr(dirname($_SERVER['PHP_SELF']), 1);
 
@@ -315,12 +332,16 @@ STR;
         if (!$this->validateAdmin()) {
             $fail = true;
         }
-        
+
         if ($this->adminPass != $adminPass2) {
             $this->updateStatus("Administrator passwords do not match. Did you mistype?", true);
             $fail = true;
         }
-        
+
+        if (!$this->validateSiteProfile()) {
+            $fail = true;
+        }
+
         return !$fail;
     }
 
@@ -335,10 +356,11 @@ PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
     <head>
         <title>Install StatusNet</title>
 	<link rel="shortcut icon" href="favicon.ico"/>
-        <link rel="stylesheet" type="text/css" href="theme/default/css/display.css" media="screen, projection, tv"/>
+        <link rel="stylesheet" type="text/css" href="theme/base/css/display.css" media="screen, projection, tv"/>
+        <link rel="stylesheet" type="text/css" href="theme/neo/css/display.css" media="screen, projection, tv"/>
         <!--[if IE]><link rel="stylesheet" type="text/css" href="theme/base/css/ie.css" /><![endif]-->
         <!--[if lte IE 6]><link rel="stylesheet" type="text/css" theme/base/css/ie6.css" /><![endif]-->
-        <!--[if IE]><link rel="stylesheet" type="text/css" href="theme/default/css/ie.css" /><![endif]-->
+        <!--[if lte IE 7]><link rel="stylesheet" type="text/css" theme/base/css/ie7.css" /><![endif]-->
         <script src="js/jquery.min.js"></script>
         <script src="js/install.js"></script>
     </head>
@@ -347,22 +369,34 @@ PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
             <div id="header">
                 <address id="site_contact" class="vcard">
                     <a class="url home bookmark" href=".">
-                        <img class="logo photo" src="theme/default/logo.png" alt="StatusNet"/>
+                        <img class="logo photo" src="theme/neo/logo.png" alt="StatusNet"/>
                         <span class="fn org">StatusNet</span>
                     </a>
                 </address>
+                <div id="site_nav_global_primary"></div>
             </div>
             <div id="core">
+             <div id="aside_primary_wrapper">
+              <div id="content_wrapper">
+               <div id="site_nav_local_views_wrapper">
+                <div id="site_nav_local_views"></div>
+
                 <div id="content">
                      <div id="content_inner">
                         <h1>Install StatusNet</h1>
-<?php 
+<?php
 $installer = new WebInstaller();
 $installer->main();
 ?>
                    </div>
                 </div>
+
+                <div id="aside_primary" class="aside"></div>
+               </div>
+              </div>
+             </div>
             </div>
+            <div id="footer"></div>
         </div>
     </body>
 </html>
diff --git a/js/userdesign.go.js b/js/userdesign.go.js
index eb4dece095..f6c696759d 100644
--- a/js/userdesign.go.js
+++ b/js/userdesign.go.js
@@ -2,7 +2,7 @@
  *
  * @package   StatusNet
  * @author Sarven Capadisli <csarven@status.net>
- * @copyright 2009 StatusNet, Inc.
+ * @copyright 2009-2011 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
  */
@@ -16,7 +16,7 @@ $(document).ready(function() {
                 $(E).val(rgb2hex($('#content').css('background-color')));
                 break;
             case 3:
-                $(E).val(rgb2hex($('#aside_primary').css('background-color')));
+                $(E).val(rgb2hex($('#aside_primary_wrapper, #site_nav_local_views_wrapper').css('background-color')));
                 break;
             case 4:
                 $(E).val(rgb2hex($('html body').css('color')));
@@ -45,10 +45,10 @@ $(document).ready(function() {
                 $('body').css({'background-color':C});
                 break;
             case 2:
-                $('#content, #site_nav_local_views .current a').css({'background-color':C});
+                $('#content').css({'background-color':C});
                 break;
             case 3:
-                $('#aside_primary').css({'background-color':C});
+                $('#aside_primary_wrapper, #site_nav_local_views_wrapper').css({'background-color':C});
                 break;
             case 4:
                 $('html body').css({'color':C});
diff --git a/js/util.js b/js/util.js
index 979415c639..c22802651a 100644
--- a/js/util.js
+++ b/js/util.js
@@ -638,13 +638,23 @@ var SN = { // StatusNet
             // Find the notice we're replying to...
             var id = $($('.notice_id', notice)[0]).text();
             var parentNotice = notice;
+            var stripForm = true; // strip a couple things out of reply forms that are inline
 
             // Find the threaded replies view we'll be adding to...
             var list = notice.closest('.notices');
-            if (list.hasClass('threaded-replies')) {
+            if (list.closest('.old-school').length) {
+            	// We're replying to an old-school conversation thread;
+            	// use the old-style ping into the top form.
+            	SN.U.switchInputFormTab("status")
+            	replyForm = $('#input_form_status').find('form');
+            	stripForm = false;
+            } else if (list.hasClass('threaded-replies')) {
                 // We're replying to a reply; use reply form on the end of this list.
                 // We'll add our form at the end of this; grab the root notice.
                 parentNotice = list.closest('.notice');
+
+		        // See if the form's already open...
+		        var replyForm = $('.notice-reply-form', list);
             } else {
                 // We're replying to a parent notice; pull its threaded list
                 // and we'll add on the end of it. Will add if needed.
@@ -658,18 +668,21 @@ var SN = { // StatusNet
                         SN.U.NoticeInlineReplyPlaceholder(notice);
                     }
                 }
-            }
 
-            // See if the form's already open...
-            var replyForm = $('.notice-reply-form', list);
+		        // See if the form's already open...
+		        var replyForm = $('.notice-reply-form', list);
+            }
 
             var nextStep = function() {
                 // Override...?
                 replyForm.find('input[name=inreplyto]').val(id);
-                replyForm.find('#notice_to').attr('disabled', 'disabled').hide();
-                replyForm.find('#notice_private').attr('disabled', 'disabled').hide();
-                replyForm.find('label[for=notice_to]').hide();
-                replyForm.find('label[for=notice_private]').hide();
+                if (stripForm) {
+                	// Don't do this for old-school reply form, as they don't come back!
+	                replyForm.find('#notice_to').attr('disabled', 'disabled').hide();
+    	            replyForm.find('#notice_private').attr('disabled', 'disabled').hide();
+    	            replyForm.find('label[for=notice_to]').hide();
+    	            replyForm.find('label[for=notice_private]').hide();
+    	        }
 
                 // Set focus...
                 var text = replyForm.find('textarea');
@@ -1422,7 +1435,15 @@ var SN = { // StatusNet
                     SN.Init.NoticeFormSetup(form);
                 })
                 .find('.notice_data-text').focus();
-	}
+	},
+
+        showMoreMenuItems: function(menuid) {
+            $('#'+menuid+' .more_link').remove();
+            var selector = '#'+menuid+' .extended_menu';
+            var extended = $(selector);
+            extended.removeClass('extended_menu');
+            return void(0);
+        }
     },
 
     Init: {
diff --git a/js/util.min.js b/js/util.min.js
index 1dd11c2852..78e0c89841 100644
--- a/js/util.min.js
+++ b/js/util.min.js
@@ -1 +1 @@
-var SN={C:{I:{CounterBlackout:false,MaxLength:140,PatternUsername:/^[0-9a-zA-Z\-_.]*$/,HTTP20x30x:[200,201,202,203,204,205,206,300,301,302,303,304,305,306,307],NoticeFormMaster:null},S:{Disabled:"disabled",Warning:"warning",Error:"error",Success:"success",Processing:"processing",CommandResult:"command_result",FormNotice:"form_notice",NoticeDataGeo:"notice_data-geo",NoticeDataGeoCookie:"NoticeDataGeo",NoticeDataGeoSelected:"notice_data-geo_selected",StatusNetInstance:"StatusNetInstance"}},messages:{},msg:function(a){if(typeof SN.messages[a]=="undefined"){return"["+a+"]"}else{return SN.messages[a]}},U:{FormNoticeEnhancements:function(b){if(jQuery.data(b[0],"ElementData")===undefined){MaxLength=b.find(".count").text();if(typeof(MaxLength)=="undefined"){MaxLength=SN.C.I.MaxLength}jQuery.data(b[0],"ElementData",{MaxLength:MaxLength});SN.U.Counter(b);NDT=b.find(".notice_data-text:first");NDT.bind("keyup",function(c){SN.U.Counter(b)});var a=function(c){window.setTimeout(function(){SN.U.Counter(b)},50)};NDT.bind("cut",a).bind("paste",a)}else{b.find(".count").text(jQuery.data(b[0],"ElementData").MaxLength)}},Counter:function(d){SN.C.I.FormNoticeCurrent=d;var b=jQuery.data(d[0],"ElementData").MaxLength;if(b<=0){return}var c=b-SN.U.CharacterCount(d);var a=d.find(".count");if(c.toString()!=a.text()){if(!SN.C.I.CounterBlackout||c===0){if(a.text()!=String(c)){a.text(c)}if(c<0){d.addClass(SN.C.S.Warning)}else{d.removeClass(SN.C.S.Warning)}if(!SN.C.I.CounterBlackout){SN.C.I.CounterBlackout=true;SN.C.I.FormNoticeCurrent=d;window.setTimeout("SN.U.ClearCounterBlackout(SN.C.I.FormNoticeCurrent);",500)}}}},CharacterCount:function(a){return a.find(".notice_data-text:first").val().length},ClearCounterBlackout:function(a){SN.C.I.CounterBlackout=false;SN.U.Counter(a)},RewriteAjaxAction:function(a){if(document.location.protocol=="https:"&&a.substr(0,5)=="http:"){return a.replace(/^http:\/\/[^:\/]+/,"https://"+document.location.host)}else{return a}},FormXHR:function(a,b){$.ajax({type:"POST",dataType:"xml",url:SN.U.RewriteAjaxAction(a.attr("action")),data:a.serialize()+"&ajax=1",beforeSend:function(c){a.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled)},error:function(e,f,d){var c=null;if(e.responseXML){c=$("#error",e.responseXML).text()}alert(c||d||f);a.removeClass(SN.C.S.Processing).find(".submit").removeClass(SN.C.S.Disabled).removeAttr(SN.C.S.Disabled)},success:function(c,d){if(typeof($("form",c)[0])!="undefined"){form_new=document._importNode($("form",c)[0],true);a.replaceWith(form_new);if(b){b()}}else{if(typeof($("p",c)[0])!="undefined"){a.replaceWith(document._importNode($("p",c)[0],true));if(b){b()}}else{alert("Unknown error.")}}}})},FormNoticeXHR:function(b){SN.C.I.NoticeDataGeo={};b.append('<input type="hidden" name="ajax" value="1"/>');b.attr("action",SN.U.RewriteAjaxAction(b.attr("action")));var c=function(d,e){b.append($('<p class="form_response"></p>').addClass(d).text(e))};var a=function(){b.find(".form_response").remove()};b.ajaxForm({dataType:"xml",timeout:"60000",beforeSend:function(d){if(b.find(".notice_data-text:first").val()==""){b.addClass(SN.C.S.Warning);return false}b.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled);SN.U.normalizeGeoData(b);return true},error:function(f,g,e){b.removeClass(SN.C.S.Processing).find(".submit").removeClass(SN.C.S.Disabled).removeAttr(SN.C.S.Disabled,SN.C.S.Disabled);a();if(g=="timeout"){c("error","Sorry! We had trouble sending your notice. The servers are overloaded. Please try again, and contact the site administrator if this problem persists.")}else{var d=SN.U.GetResponseXML(f);if($("."+SN.C.S.Error,d).length>0){b.append(document._importNode($("."+SN.C.S.Error,d)[0],true))}else{if(parseInt(f.status)===0||jQuery.inArray(parseInt(f.status),SN.C.I.HTTP20x30x)>=0){b.resetForm().find(".attach-status").remove();SN.U.FormNoticeEnhancements(b)}else{c("error","(Sorry! We had trouble sending your notice ("+f.status+" "+f.statusText+"). Please report the problem to the site administrator if this happens again.")}}}},success:function(j,f){a();var p=$("#"+SN.C.S.Error,j);if(p.length>0){c("error",p.text())}else{if($("body")[0].id=="bookmarklet"){self.close()}var d=$("#"+SN.C.S.CommandResult,j);if(d.length>0){c("success",d.text())}else{var o=document._importNode($("li",j)[0],true);var k=$("#notices_primary .notices:first");var m=b.closest("li.notice-reply");if(m.length>0){var l=b.closest(".threaded-replies");var n=l.find(".notice-reply-placeholder");m.remove();var e=$(o).attr("id");if($("#"+e).length==0){$(o).insertBefore(n)}else{}n.show()}else{if(k.length>0&&SN.U.belongsOnTimeline(o)){if($("#"+o.id).length===0){var h=b.find("[name=inreplyto]").val();var g="#notices_primary #notice-"+h;if($("body")[0].id=="conversation"){if(h.length>0&&$(g+" .notices").length<1){$(g).append('<ul class="notices"></ul>')}$($(g+" .notices")[0]).append(o)}else{k.prepend(o)}$("#"+o.id).css({display:"none"}).fadeIn(2500);SN.U.NoticeWithAttachment($("#"+o.id));SN.U.switchInputFormTab("placeholder")}}else{c("success",$("title",j).text())}}}b.resetForm();b.find("[name=inreplyto]").val("");b.find(".attach-status").remove();SN.U.FormNoticeEnhancements(b)}},complete:function(d,e){b.removeClass(SN.C.S.Processing).find(".submit").removeAttr(SN.C.S.Disabled).removeClass(SN.C.S.Disabled);b.find("[name=lat]").val(SN.C.I.NoticeDataGeo.NLat);b.find("[name=lon]").val(SN.C.I.NoticeDataGeo.NLon);b.find("[name=location_ns]").val(SN.C.I.NoticeDataGeo.NLNS);b.find("[name=location_id]").val(SN.C.I.NoticeDataGeo.NLID);b.find("[name=notice_data-geo]").attr("checked",SN.C.I.NoticeDataGeo.NDG)}})},FormProfileSearchXHR:function(a){$.ajax({type:"POST",dataType:"xml",url:a.attr("action"),data:a.serialize()+"&ajax=1",beforeSend:function(b){a.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled)},error:function(c,d,b){alert(b||d)},success:function(d,f){var b=$("#profile_search_results");if(typeof($("ul",d)[0])!="undefined"){var c=document._importNode($("ul",d)[0],true);b.replaceWith(c)}else{var e=$("<li/>").append(document._importNode($("p",d)[0],true));b.html(e)}a.removeClass(SN.C.S.Processing).find(".submit").removeClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,false)}})},FormPeopletagsXHR:function(a){$.ajax({type:"POST",dataType:"xml",url:a.attr("action"),data:a.serialize()+"&ajax=1",beforeSend:function(b){a.find(".submit").addClass(SN.C.S.Processing).addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled)},error:function(c,d,b){alert(b||d)},success:function(d,e){var c=a.parents(".entity_tags");if(typeof($(".entity_tags",d)[0])!="undefined"){var b=document._importNode($(".entity_tags",d)[0],true);$(b).find(".editable").append($('<button class="peopletags_edit_button"/>'));c.replaceWith(b)}else{c.find("p").remove();c.append(document._importNode($("p",d)[0],true));a.removeClass(SN.C.S.Processing).find(".submit").removeClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,false)}}})},normalizeGeoData:function(a){SN.C.I.NoticeDataGeo.NLat=a.find("[name=lat]").val();SN.C.I.NoticeDataGeo.NLon=a.find("[name=lon]").val();SN.C.I.NoticeDataGeo.NLNS=a.find("[name=location_ns]").val();SN.C.I.NoticeDataGeo.NLID=a.find("[name=location_id]").val();SN.C.I.NoticeDataGeo.NDG=a.find("[name=notice_data-geo]").attr("checked");var b=$.cookie(SN.C.S.NoticeDataGeoCookie);if(b!==null&&b!="disabled"){b=JSON.parse(b);SN.C.I.NoticeDataGeo.NLat=a.find("[name=lat]").val(b.NLat).val();SN.C.I.NoticeDataGeo.NLon=a.find("[name=lon]").val(b.NLon).val();if(b.NLNS){SN.C.I.NoticeDataGeo.NLNS=a.find("[name=location_ns]").val(b.NLNS).val();SN.C.I.NoticeDataGeo.NLID=a.find("[name=location_id]").val(b.NLID).val()}else{a.find("[name=location_ns]").val("");a.find("[name=location_id]").val("")}}if(b=="disabled"){SN.C.I.NoticeDataGeo.NDG=a.find("[name=notice_data-geo]").attr("checked",false).attr("checked")}else{SN.C.I.NoticeDataGeo.NDG=a.find("[name=notice_data-geo]").attr("checked",true).attr("checked")}},GetResponseXML:function(b){try{return b.responseXML}catch(a){return(new DOMParser()).parseFromString(b.responseText,"text/xml")}},NoticeReply:function(){$("#content .notice_reply").live("click",function(b){b.preventDefault();var a=$(this).closest("li.notice");SN.U.NoticeInlineReplyTrigger(a);return false})},NoticeReplyTo:function(a){},NoticeInlineReplyTrigger:function(j,k){var b=$($(".notice_id",j)[0]).text();var e=j;var f=j.closest(".notices");if(f.hasClass("threaded-replies")){e=f.closest(".notice")}else{f=$("ul.threaded-replies",j);if(f.length==0){SN.U.NoticeInlineReplyPlaceholder(j);f=$("ul.threaded-replies",j)}else{var h=$("li.notice-reply-placeholder",j);if(h.length==0){SN.U.NoticeInlineReplyPlaceholder(j)}}}var l=$(".notice-reply-form",f);var d=function(){l.find("input[name=inreplyto]").val(b);l.find("#notice_to").attr("disabled","disabled").hide();l.find("#notice_private").attr("disabled","disabled").hide();l.find("label[for=notice_to]").hide();l.find("label[for=notice_private]").hide();var o=l.find("textarea");if(o.length==0){throw"No textarea"}var n="";if(k){n=k+" "}o.val(n+o.val().replace(RegExp(n,"i"),""));o.data("initialText",$.trim(k+""));o.focus();if(o[0].setSelectionRange){var m=o.val().length;o[0].setSelectionRange(m,m)}};if(l.length>0){d()}else{var h=f.find("li.notice-reply-placeholder").hide();var g=$("li.notice-reply",f);if(g.length==0){g=$('<li class="notice-reply"></li>');var c=function(m){var n=document._importNode(m,true);g.append(n);f.append(g);var o=l=$(n);SN.Init.NoticeFormSetup(o);d()};if(SN.C.I.NoticeFormMaster){c(SN.C.I.NoticeFormMaster)}else{var a=$("#form_notice").attr("action");$.get(a,{ajax:1},function(m,o,n){c($("form",m)[0])})}}}},NoticeInlineReplyPlaceholder:function(b){var a=b.find("ul.threaded-replies");if(a.length==0){a=$('<ul class="notices threaded-replies xoxo"></ul>');b.append(a);a=b.find("ul.threaded-replies")}var c=$('<li class="notice-reply-placeholder"><input class="placeholder" /></li>');c.find("input").val(SN.msg("reply_placeholder"));a.append(c)},NoticeInlineReplySetup:function(){$("li.notice-reply-placeholder input").live("focus",function(){var a=$(this).closest("li.notice");SN.U.NoticeInlineReplyTrigger(a);return false});$("li.notice-reply-comments a").live("click",function(){var a=$(this).attr("href");var b=$(this).closest(".threaded-replies");$.get(a,{ajax:1},function(d,f,e){var c=$(".threaded-replies",d);if(c.length){b.replaceWith(document._importNode(c[0],true))}});return false})},NoticeRepeat:function(){$(".form_repeat").live("click",function(a){a.preventDefault();SN.U.NoticeRepeatConfirmation($(this));return false})},NoticeRepeatConfirmation:function(a){var c=a.find(".submit");var b=c.clone();b.addClass("submit_dialogbox").removeClass("submit");a.append(b);b.bind("click",function(){SN.U.FormXHR(a);return false});c.hide();a.addClass("dialogbox").append('<button class="close">&#215;</button>').closest(".notice-options").addClass("opaque");a.find("button.close").click(function(){$(this).remove();a.removeClass("dialogbox").closest(".notice-options").removeClass("opaque");a.find(".submit_dialogbox").remove();a.find(".submit").show();return false})},NoticeAttachments:function(){$(".notice a.attachment").each(function(){SN.U.NoticeWithAttachment($(this).closest(".notice"))})},NoticeWithAttachment:function(b){if(b.find(".attachment").length===0){return}var a=b.find(".attachment.more");if(a.length>0){$(a[0]).click(function(){var c=$(this);c.addClass(SN.C.S.Processing);$.get(c.attr("href")+"/ajax",null,function(d){c.parent(".entry-content").html($(d).find("#attachment_view .entry-content").html())});return false}).attr("title",SN.msg("showmore_tooltip"))}},NoticeDataAttach:function(b){var a=b.find("input[type=file]");a.change(function(f){b.find(".attach-status").remove();var d=$(this).val();if(!d){return false}var c=$('<div class="attach-status '+SN.C.S.Success+'"><code></code> <button class="close">&#215;</button></div>');c.find("code").text(d);c.find("button").click(function(){c.remove();a.val("");return false});b.append(c);if(typeof this.files=="object"){for(var e=0;e<this.files.length;e++){SN.U.PreviewAttach(b,this.files[e])}}})},maxFileSize:function(b){var a=$(b).find("input[name=MAX_FILE_SIZE]").attr("value");if(a){return parseInt(a)}else{return 0}},PreviewAttach:function(d,c){var e=c.type+" "+Math.round(c.size/1024)+"KB";var f=true;var h;if(typeof window.createObjectURL!="undefined"){h=function(j,k){k(window.createObjectURL(j))}}else{if(typeof window.FileReader!="undefined"){h=function(k,l){var j=new FileReader();j.onload=function(m){l(j.result)};j.readAsDataURL(k)}}else{f=false}}var a=["image/png","image/jpeg","image/gif","image/svg+xml"];if($.inArray(c.type,a)==-1){f=false}var g=8*1024*1024;if(c.size>g){f=false}if(f){h(c,function(k){var j=$("<img>").attr("title",e).attr("alt",e).attr("src",k).attr("style","height: 120px");d.find(".attach-status").append(j)})}else{var b=$("<div></div>").text(e);d.find(".attach-status").append(b)}},NoticeLocationAttach:function(a){var e=a.find("[name=lat]");var l=a.find("[name=lon]");var g=a.find("[name=location_ns]").val();var m=a.find("[name=location_id]").val();var b="";var d=a.find("[name=notice_data-geo]");var c=a.find("[name=notice_data-geo]");var k=a.find("label.notice_data-geo");function f(o){k.attr("title",jQuery.trim(k.text())).removeClass("checked");a.find("[name=lat]").val("");a.find("[name=lon]").val("");a.find("[name=location_ns]").val("");a.find("[name=location_id]").val("");a.find("[name=notice_data-geo]").attr("checked",false);$.cookie(SN.C.S.NoticeDataGeoCookie,"disabled",{path:"/"});if(o){a.find(".geo_status_wrapper").removeClass("success").addClass("error");a.find(".geo_status_wrapper .geo_status").text(o)}else{a.find(".geo_status_wrapper").remove()}}function n(o,p){SN.U.NoticeGeoStatus(a,"Looking up place name...");$.getJSON(o,p,function(q){var r,s;if(typeof(q.location_ns)!="undefined"){a.find("[name=location_ns]").val(q.location_ns);r=q.location_ns}if(typeof(q.location_id)!="undefined"){a.find("[name=location_id]").val(q.location_id);s=q.location_id}if(typeof(q.name)=="undefined"){NLN_text=p.lat+";"+p.lon}else{NLN_text=q.name}SN.U.NoticeGeoStatus(a,NLN_text,p.lat,p.lon,q.url);k.attr("title",NoticeDataGeo_text.ShareDisable+" ("+NLN_text+")");a.find("[name=lat]").val(p.lat);a.find("[name=lon]").val(p.lon);a.find("[name=location_ns]").val(r);a.find("[name=location_id]").val(s);a.find("[name=notice_data-geo]").attr("checked",true);var t={NLat:p.lat,NLon:p.lon,NLNS:r,NLID:s,NLN:NLN_text,NLNU:q.url,NDG:true};$.cookie(SN.C.S.NoticeDataGeoCookie,JSON.stringify(t),{path:"/"})})}if(c.length>0){if($.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){c.attr("checked",false)}else{c.attr("checked",true)}var h=a.find(".notice_data-geo_wrap");var j=h.attr("data-api");k.attr("title",k.text());c.change(function(){if(c.attr("checked")===true||$.cookie(SN.C.S.NoticeDataGeoCookie)===null){k.attr("title",NoticeDataGeo_text.ShareDisable).addClass("checked");if($.cookie(SN.C.S.NoticeDataGeoCookie)===null||$.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){if(navigator.geolocation){SN.U.NoticeGeoStatus(a,"Requesting location from browser...");navigator.geolocation.getCurrentPosition(function(q){a.find("[name=lat]").val(q.coords.latitude);a.find("[name=lon]").val(q.coords.longitude);var r={lat:q.coords.latitude,lon:q.coords.longitude,token:$("#token").val()};n(j,r)},function(q){switch(q.code){case q.PERMISSION_DENIED:f("Location permission denied.");break;case q.TIMEOUT:f("Location lookup timeout.");break}},{timeout:10000})}else{if(e.length>0&&l.length>0){var o={lat:e,lon:l,token:$("#token").val()};n(j,o)}else{f();c.remove();k.remove()}}}else{var p=JSON.parse($.cookie(SN.C.S.NoticeDataGeoCookie));a.find("[name=lat]").val(p.NLat);a.find("[name=lon]").val(p.NLon);a.find("[name=location_ns]").val(p.NLNS);a.find("[name=location_id]").val(p.NLID);a.find("[name=notice_data-geo]").attr("checked",p.NDG);SN.U.NoticeGeoStatus(a,p.NLN,p.NLat,p.NLon,p.NLNU);k.attr("title",NoticeDataGeo_text.ShareDisable+" ("+p.NLN+")").addClass("checked")}}else{f()}}).change()}},NoticeGeoStatus:function(e,a,f,g,c){var h=e.find(".geo_status_wrapper");if(h.length==0){h=$('<div class="'+SN.C.S.Success+' geo_status_wrapper"><button class="close" style="float:right">&#215;</button><div class="geo_status"></div></div>');h.find("button.close").click(function(){e.find("[name=notice_data-geo]").removeAttr("checked").change();return false});e.append(h)}var b;if(c){b=$("<a></a>").attr("href",c)}else{b=$("<span></span>")}b.text(a);if(f||g){var d=f+";"+g;b.attr("title",d);if(!a){b.text(d)}}h.find(".geo_status").empty().append(b)},NewDirectMessage:function(){NDM=$(".entity_send-a-message a");NDM.attr({href:NDM.attr("href")+"&ajax=1"});NDM.bind("click",function(){var a=$(".entity_send-a-message form");if(a.length===0){$(this).addClass(SN.C.S.Processing);$.get(NDM.attr("href"),null,function(b){$(".entity_send-a-message").append(document._importNode($("form",b)[0],true));a=$(".entity_send-a-message .form_notice");SN.U.FormNoticeXHR(a);SN.U.FormNoticeEnhancements(a);a.append('<button class="close">&#215;</button>');$(".entity_send-a-message button").click(function(){a.hide();return false});NDM.removeClass(SN.C.S.Processing)})}else{a.show();$(".entity_send-a-message textarea").focus()}return false})},GetFullYear:function(c,d,a){var b=new Date();b.setFullYear(c,d,a);return b},StatusNetInstance:{Set:function(b){var a=SN.U.StatusNetInstance.Get();if(a!==null){b=$.extend(a,b)}$.cookie(SN.C.S.StatusNetInstance,JSON.stringify(b),{path:"/",expires:SN.U.GetFullYear(2029,0,1)})},Get:function(){var a=$.cookie(SN.C.S.StatusNetInstance);if(a!==null){return JSON.parse(a)}return null},Delete:function(){$.cookie(SN.C.S.StatusNetInstance,null)}},belongsOnTimeline:function(b){var a=$("body").attr("id");if(a=="public"){return true}var c=$("#nav_profile a").attr("href");if(c){var d=$(b).find(".vcard.author a.url").attr("href");if(d==c){if(a=="all"||a=="showstream"){return true}}}return false},switchInputFormTab:function(a){$(".input_form_nav_tab.current").removeClass("current");if(a=="placeholder"){$("#input_form_nav_status").addClass("current")}else{$("#input_form_nav_"+a).addClass("current")}var b=$(".input_form.current.nonav");if(b.length>0){return}$(".input_form.current").removeClass("current");$("#input_form_"+a).addClass("current").find(".ajax-notice").each(function(){var c=$(this);SN.Init.NoticeFormSetup(c)}).find(".notice_data-text").focus()}},Init:{NoticeForm:function(){if($("body.user_in").length>0){$("#input_form_placeholder input.placeholder").focus(function(){SN.U.switchInputFormTab("status")});$("body").bind("click",function(g){var d=$("#content .input_forms div.current");if(d.length>0){if($("#content .input_forms").has(g.target).length==0){var a=d.find('textarea, input[type=text], input[type=""]');var c=false;a.each(function(){c=c||$(this).val()});if(!c){SN.U.switchInputFormTab("placeholder")}}}var b=$("li.notice-reply");if(b.length>0){var f=$(g.target);b.each(function(){var k=$(this);if(k.has(g.target).length==0){var h=k.find(".notice_data-text:first");var j=$.trim(h.val());if(j==""||j==h.data("initialText")){var e=k.closest("li.notice");k.remove();e.find("li.notice-reply-placeholder").show()}}})}});$(".input_forms fieldset fieldset label").inFieldLabels({fadeOpacity:0})}},NoticeFormSetup:function(a){if(!a.data("NoticeFormSetup")){SN.U.NoticeLocationAttach(a);SN.U.FormNoticeXHR(a);SN.U.FormNoticeEnhancements(a);SN.U.NoticeDataAttach(a);a.data("NoticeFormSetup",true)}},Notices:function(){if($("body.user_in").length>0){var a=$(".form_notice:first");if(a.length>0){SN.C.I.NoticeFormMaster=document._importNode(a[0],true)}SN.U.NoticeRepeat();SN.U.NoticeReply();SN.U.NoticeInlineReplySetup()}SN.U.NoticeAttachments()},EntityActions:function(){if($("body.user_in").length>0){$(".form_user_subscribe").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_user_unsubscribe").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_group_join").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_group_leave").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_user_nudge").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_peopletag_subscribe").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_peopletag_unsubscribe").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_user_add_peopletag").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_user_remove_peopletag").live("click",function(){SN.U.FormXHR($(this));return false});SN.U.NewDirectMessage()}},ProfileSearch:function(){if($("body.user_in").length>0){$(".form_peopletag_edit_user_search input.submit").live("click",function(){SN.U.FormProfileSearchXHR($(this).parents("form"));return false})}},Login:function(){if(SN.U.StatusNetInstance.Get()!==null){var a=SN.U.StatusNetInstance.Get().Nickname;if(a!==null){$("#form_login #nickname").val(a)}}$("#form_login").bind("submit",function(){SN.U.StatusNetInstance.Set({Nickname:$("#form_login #nickname").val()});return true})},PeopletagAutocomplete:function(b){var a=function(d){return d.split(/\s+/)};var c=function(d){return a(d).pop()};b.live("keydown",function(d){if(d.keyCode===$.ui.keyCode.TAB&&$(this).data("autocomplete").menu.active){d.preventDefault()}}).autocomplete({minLength:0,source:function(e,d){d($.ui.autocomplete.filter(SN.C.PtagACData,c(e.term)))},focus:function(){return false},select:function(e,f){var d=a(this.value);d.pop();d.push(f.item.value);d.push("");this.value=d.join(" ");return false}}).data("autocomplete")._renderItem=function(e,f){var d='<a class="ptag-ac-line-tag">'+f.tag+' <em class="privacy_mode">'+f.mode+'</em><span class="freq">'+f.freq+"</span></a>";return $("<li/>").addClass("mode-"+f.mode).addClass("ptag-ac-line").data("item.autocomplete",f).append(d).appendTo(e)}},PeopleTags:function(){$(".user_profile_tags .editable").append($('<button class="peopletags_edit_button"/>'));$(".peopletags_edit_button").live("click",function(){var a=$(this).parents("dd").eq(0).find("form");$.ajax({url:_peopletagAC,dataType:"json",data:{token:$("#token").val()},ifModified:true,success:function(b){for(i=0;i<b.length;i++){b[i].label=b[i].tag}SN.C.PtagACData=b;SN.Init.PeopletagAutocomplete(a.find("#tags"))}});$(this).parents("ul").eq(0).fadeOut(200,function(){a.fadeIn(200).find("input#tags")})});$(".user_profile_tags form .submit").live("click",function(){SN.U.FormPeopletagsXHR($(this).parents("form"));return false})},AjaxForms:function(){$("form.ajax").live("submit",function(){SN.U.FormXHR($(this));return false});$("form.ajax input[type=submit]").live("click",function(){var a=$(this);var b=a.closest("form");b.find(".hidden-submit-button").remove();$('<input class="hidden-submit-button" type="hidden" />').attr("name",a.attr("name")).val(a.val()).appendTo(b)})},UploadForms:function(){$("input[type=file]").change(function(d){if(typeof this.files=="object"&&this.files.length>0){var c=0;for(var b=0;b<this.files.length;b++){c+=this.files[b].size}var a=SN.U.maxFileSize($(this.form));if(a>0&&c>a){var e="File too large: maximum upload size is %d bytes.";alert(e.replace("%d",a));$(this).val("");d.preventDefault();return false}}})},CheckBoxes:function(){$("span[class='checkbox-wrapper']").addClass("unchecked");$(".checkbox-wrapper").click(function(){if($(this).children("input").attr("checked")){$(this).children("input").attr({checked:""});$(this).removeClass("checked");$(this).addClass("unchecked");$(this).children("label").text("Private?")}else{$(this).children("input").attr({checked:"checked"});$(this).removeClass("unchecked");$(this).addClass("checked");$(this).children("label").text("Private")}})}}};$(document).ready(function(){SN.Init.AjaxForms();SN.Init.UploadForms();SN.Init.CheckBoxes();if($("."+SN.C.S.FormNotice).length>0){SN.Init.NoticeForm()}if($("#content .notices").length>0){SN.Init.Notices()}if($("#content .entity_actions").length>0){SN.Init.EntityActions()}if($("#form_login").length>0){SN.Init.Login()}if($("#profile_search_results").length>0){SN.Init.ProfileSearch()}if($(".user_profile_tags .editable").length>0){SN.Init.PeopleTags()}});if(!document.ELEMENT_NODE){document.ELEMENT_NODE=1;document.ATTRIBUTE_NODE=2;document.TEXT_NODE=3;document.CDATA_SECTION_NODE=4;document.ENTITY_REFERENCE_NODE=5;document.ENTITY_NODE=6;document.PROCESSING_INSTRUCTION_NODE=7;document.COMMENT_NODE=8;document.DOCUMENT_NODE=9;document.DOCUMENT_TYPE_NODE=10;document.DOCUMENT_FRAGMENT_NODE=11;document.NOTATION_NODE=12}document._importNode=function(e,a){switch(e.nodeType){case document.ELEMENT_NODE:var d=document.createElement(e.nodeName);if(e.attributes&&e.attributes.length>0){for(var c=0,b=e.attributes.length;c<b;){if(e.attributes[c].nodeName=="class"){d.className=e.getAttribute(e.attributes[c++].nodeName)}else{d.setAttribute(e.attributes[c].nodeName,e.getAttribute(e.attributes[c++].nodeName))}}}if(a&&e.childNodes&&e.childNodes.length>0){for(var c=0,b=e.childNodes.length;c<b;){d.appendChild(document._importNode(e.childNodes[c++],a))}}return d;break;case document.TEXT_NODE:case document.CDATA_SECTION_NODE:case document.COMMENT_NODE:return document.createTextNode(e.nodeValue);break}};if(typeof navigator.geolocation=="undefined"||navigator.geolocation.shim){(function(){(function(){if(window.google&&google.gears){return}var c=null;if(typeof GearsFactory!="undefined"){c=new GearsFactory()}else{try{c=new ActiveXObject("Gears.Factory");if(c.getBuildInfo().indexOf("ie_mobile")!=-1){c.privateSetGlobalObject(this)}}catch(d){if((typeof navigator.mimeTypes!="undefined")&&navigator.mimeTypes["application/x-googlegears"]){c=document.createElement("object");c.style.display="none";c.width=0;c.height=0;c.type="application/x-googlegears";document.documentElement.appendChild(c)}}}if(!c){return}if(!window.google){google={}}if(!google.gears){google.gears={factory:c}}})();var a=(function(){var d=google.gears.factory.create("beta.geolocation");var c=function(f,e){return function(g){f(g);e.lastPosition=g}};return{shim:true,type:"Gears",lastPosition:null,getCurrentPosition:function(e,g,h){var f=this;var j=c(e,f);d.getCurrentPosition(j,g,h)},watchPosition:function(e,f,g){d.watchPosition(e,f,g)},clearWatch:function(e){d.clearWatch(e)},getPermission:function(g,e,f){d.getPermission(g,e,f)}}});var b=(function(){var j=false;var e=function(){if(!d()&&!j){j=true;var k=document.createElement("script");k.src=(document.location.protocol=="https:"?"https://":"http://")+"www.google.com/jsapi?callback=_google_loader_apiLoaded";k.type="text/javascript";document.getElementsByTagName("body")[0].appendChild(k)}};var c=[];var h=function(k){c.push(k)};var f=function(){if(d()){while(c.length>0){var k=c.pop();k()}}};window._google_loader_apiLoaded=function(){f()};var d=function(){return(window.google&&google.loader)};var g=function(k){if(d()){return true}h(k);e();return false};e();return{shim:true,type:"ClientLocation",lastPosition:null,getCurrentPosition:function(l,o,p){var n=this;if(!g(function(){n.getCurrentPosition(l,o,p)})){return}if(google.loader.ClientLocation){var m=google.loader.ClientLocation;var k={coords:{latitude:m.latitude,longitude:m.longitude,altitude:null,accuracy:43000,altitudeAccuracy:null,heading:null,speed:null},address:{city:m.address.city,country:m.address.country,country_code:m.address.country_code,region:m.address.region},timestamp:new Date()};l(k);this.lastPosition=k}else{if(o==="function"){o({code:3,message:"Using the Google ClientLocation API and it is not able to calculate a location."})}}},watchPosition:function(k,m,n){this.getCurrentPosition(k,m,n);var l=this;var o=setInterval(function(){l.getCurrentPosition(k,m,n)},10000);return o},clearWatch:function(k){clearInterval(k)},getPermission:function(m,k,l){return true}}});navigator.geolocation=(window.google&&google.gears)?a():b()})()};
\ No newline at end of file
+var SN={C:{I:{CounterBlackout:false,MaxLength:140,PatternUsername:/^[0-9a-zA-Z\-_.]*$/,HTTP20x30x:[200,201,202,203,204,205,206,300,301,302,303,304,305,306,307],NoticeFormMaster:null},S:{Disabled:"disabled",Warning:"warning",Error:"error",Success:"success",Processing:"processing",CommandResult:"command_result",FormNotice:"form_notice",NoticeDataGeo:"notice_data-geo",NoticeDataGeoCookie:"NoticeDataGeo",NoticeDataGeoSelected:"notice_data-geo_selected",StatusNetInstance:"StatusNetInstance"}},messages:{},msg:function(a){if(typeof SN.messages[a]=="undefined"){return"["+a+"]"}else{return SN.messages[a]}},U:{FormNoticeEnhancements:function(b){if(jQuery.data(b[0],"ElementData")===undefined){MaxLength=b.find(".count").text();if(typeof(MaxLength)=="undefined"){MaxLength=SN.C.I.MaxLength}jQuery.data(b[0],"ElementData",{MaxLength:MaxLength});SN.U.Counter(b);NDT=b.find(".notice_data-text:first");NDT.bind("keyup",function(c){SN.U.Counter(b)});var a=function(c){window.setTimeout(function(){SN.U.Counter(b)},50)};NDT.bind("cut",a).bind("paste",a)}else{b.find(".count").text(jQuery.data(b[0],"ElementData").MaxLength)}},Counter:function(d){SN.C.I.FormNoticeCurrent=d;var b=jQuery.data(d[0],"ElementData").MaxLength;if(b<=0){return}var c=b-SN.U.CharacterCount(d);var a=d.find(".count");if(c.toString()!=a.text()){if(!SN.C.I.CounterBlackout||c===0){if(a.text()!=String(c)){a.text(c)}if(c<0){d.addClass(SN.C.S.Warning)}else{d.removeClass(SN.C.S.Warning)}if(!SN.C.I.CounterBlackout){SN.C.I.CounterBlackout=true;SN.C.I.FormNoticeCurrent=d;window.setTimeout("SN.U.ClearCounterBlackout(SN.C.I.FormNoticeCurrent);",500)}}}},CharacterCount:function(a){return a.find(".notice_data-text:first").val().length},ClearCounterBlackout:function(a){SN.C.I.CounterBlackout=false;SN.U.Counter(a)},RewriteAjaxAction:function(a){if(document.location.protocol=="https:"&&a.substr(0,5)=="http:"){return a.replace(/^http:\/\/[^:\/]+/,"https://"+document.location.host)}else{return a}},FormXHR:function(a,b){$.ajax({type:"POST",dataType:"xml",url:SN.U.RewriteAjaxAction(a.attr("action")),data:a.serialize()+"&ajax=1",beforeSend:function(c){a.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled)},error:function(e,f,d){var c=null;if(e.responseXML){c=$("#error",e.responseXML).text()}alert(c||d||f);a.removeClass(SN.C.S.Processing).find(".submit").removeClass(SN.C.S.Disabled).removeAttr(SN.C.S.Disabled)},success:function(c,d){if(typeof($("form",c)[0])!="undefined"){form_new=document._importNode($("form",c)[0],true);a.replaceWith(form_new);if(b){b()}}else{if(typeof($("p",c)[0])!="undefined"){a.replaceWith(document._importNode($("p",c)[0],true));if(b){b()}}else{alert("Unknown error.")}}}})},FormNoticeXHR:function(b){SN.C.I.NoticeDataGeo={};b.append('<input type="hidden" name="ajax" value="1"/>');b.attr("action",SN.U.RewriteAjaxAction(b.attr("action")));var c=function(d,e){b.append($('<p class="form_response"></p>').addClass(d).text(e))};var a=function(){b.find(".form_response").remove()};b.ajaxForm({dataType:"xml",timeout:"60000",beforeSend:function(d){if(b.find(".notice_data-text:first").val()==""){b.addClass(SN.C.S.Warning);return false}b.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled);SN.U.normalizeGeoData(b);return true},error:function(f,g,e){b.removeClass(SN.C.S.Processing).find(".submit").removeClass(SN.C.S.Disabled).removeAttr(SN.C.S.Disabled,SN.C.S.Disabled);a();if(g=="timeout"){c("error","Sorry! We had trouble sending your notice. The servers are overloaded. Please try again, and contact the site administrator if this problem persists.")}else{var d=SN.U.GetResponseXML(f);if($("."+SN.C.S.Error,d).length>0){b.append(document._importNode($("."+SN.C.S.Error,d)[0],true))}else{if(parseInt(f.status)===0||jQuery.inArray(parseInt(f.status),SN.C.I.HTTP20x30x)>=0){b.resetForm().find(".attach-status").remove();SN.U.FormNoticeEnhancements(b)}else{c("error","(Sorry! We had trouble sending your notice ("+f.status+" "+f.statusText+"). Please report the problem to the site administrator if this happens again.")}}}},success:function(j,f){a();var p=$("#"+SN.C.S.Error,j);if(p.length>0){c("error",p.text())}else{if($("body")[0].id=="bookmarklet"){self.close()}var d=$("#"+SN.C.S.CommandResult,j);if(d.length>0){c("success",d.text())}else{var o=document._importNode($("li",j)[0],true);var k=$("#notices_primary .notices:first");var m=b.closest("li.notice-reply");if(m.length>0){var l=b.closest(".threaded-replies");var n=l.find(".notice-reply-placeholder");m.remove();var e=$(o).attr("id");if($("#"+e).length==0){$(o).insertBefore(n)}else{}n.show()}else{if(k.length>0&&SN.U.belongsOnTimeline(o)){if($("#"+o.id).length===0){var h=b.find("[name=inreplyto]").val();var g="#notices_primary #notice-"+h;if($("body")[0].id=="conversation"){if(h.length>0&&$(g+" .notices").length<1){$(g).append('<ul class="notices"></ul>')}$($(g+" .notices")[0]).append(o)}else{k.prepend(o)}$("#"+o.id).css({display:"none"}).fadeIn(2500);SN.U.NoticeWithAttachment($("#"+o.id));SN.U.switchInputFormTab("placeholder")}}else{c("success",$("title",j).text())}}}b.resetForm();b.find("[name=inreplyto]").val("");b.find(".attach-status").remove();SN.U.FormNoticeEnhancements(b)}},complete:function(d,e){b.removeClass(SN.C.S.Processing).find(".submit").removeAttr(SN.C.S.Disabled).removeClass(SN.C.S.Disabled);b.find("[name=lat]").val(SN.C.I.NoticeDataGeo.NLat);b.find("[name=lon]").val(SN.C.I.NoticeDataGeo.NLon);b.find("[name=location_ns]").val(SN.C.I.NoticeDataGeo.NLNS);b.find("[name=location_id]").val(SN.C.I.NoticeDataGeo.NLID);b.find("[name=notice_data-geo]").attr("checked",SN.C.I.NoticeDataGeo.NDG)}})},FormProfileSearchXHR:function(a){$.ajax({type:"POST",dataType:"xml",url:a.attr("action"),data:a.serialize()+"&ajax=1",beforeSend:function(b){a.addClass(SN.C.S.Processing).find(".submit").addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled)},error:function(c,d,b){alert(b||d)},success:function(d,f){var b=$("#profile_search_results");if(typeof($("ul",d)[0])!="undefined"){var c=document._importNode($("ul",d)[0],true);b.replaceWith(c)}else{var e=$("<li/>").append(document._importNode($("p",d)[0],true));b.html(e)}a.removeClass(SN.C.S.Processing).find(".submit").removeClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,false)}})},FormPeopletagsXHR:function(a){$.ajax({type:"POST",dataType:"xml",url:a.attr("action"),data:a.serialize()+"&ajax=1",beforeSend:function(b){a.find(".submit").addClass(SN.C.S.Processing).addClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,SN.C.S.Disabled)},error:function(c,d,b){alert(b||d)},success:function(d,e){var c=a.parents(".entity_tags");if(typeof($(".entity_tags",d)[0])!="undefined"){var b=document._importNode($(".entity_tags",d)[0],true);$(b).find(".editable").append($('<button class="peopletags_edit_button"/>'));c.replaceWith(b)}else{c.find("p").remove();c.append(document._importNode($("p",d)[0],true));a.removeClass(SN.C.S.Processing).find(".submit").removeClass(SN.C.S.Disabled).attr(SN.C.S.Disabled,false)}}})},normalizeGeoData:function(a){SN.C.I.NoticeDataGeo.NLat=a.find("[name=lat]").val();SN.C.I.NoticeDataGeo.NLon=a.find("[name=lon]").val();SN.C.I.NoticeDataGeo.NLNS=a.find("[name=location_ns]").val();SN.C.I.NoticeDataGeo.NLID=a.find("[name=location_id]").val();SN.C.I.NoticeDataGeo.NDG=a.find("[name=notice_data-geo]").attr("checked");var b=$.cookie(SN.C.S.NoticeDataGeoCookie);if(b!==null&&b!="disabled"){b=JSON.parse(b);SN.C.I.NoticeDataGeo.NLat=a.find("[name=lat]").val(b.NLat).val();SN.C.I.NoticeDataGeo.NLon=a.find("[name=lon]").val(b.NLon).val();if(b.NLNS){SN.C.I.NoticeDataGeo.NLNS=a.find("[name=location_ns]").val(b.NLNS).val();SN.C.I.NoticeDataGeo.NLID=a.find("[name=location_id]").val(b.NLID).val()}else{a.find("[name=location_ns]").val("");a.find("[name=location_id]").val("")}}if(b=="disabled"){SN.C.I.NoticeDataGeo.NDG=a.find("[name=notice_data-geo]").attr("checked",false).attr("checked")}else{SN.C.I.NoticeDataGeo.NDG=a.find("[name=notice_data-geo]").attr("checked",true).attr("checked")}},GetResponseXML:function(b){try{return b.responseXML}catch(a){return(new DOMParser()).parseFromString(b.responseText,"text/xml")}},NoticeReply:function(){$("#content .notice_reply").live("click",function(b){b.preventDefault();var a=$(this).closest("li.notice");SN.U.NoticeInlineReplyTrigger(a);return false})},NoticeReplyTo:function(a){},NoticeInlineReplyTrigger:function(k,l){var b=$($(".notice_id",k)[0]).text();var e=k;var g=true;var f=k.closest(".notices");if(f.closest(".old-school").length){SN.U.switchInputFormTab("status");m=$("#input_form_status").find("form");g=false}else{if(f.hasClass("threaded-replies")){e=f.closest(".notice");var m=$(".notice-reply-form",f)}else{f=$("ul.threaded-replies",k);if(f.length==0){SN.U.NoticeInlineReplyPlaceholder(k);f=$("ul.threaded-replies",k)}else{var j=$("li.notice-reply-placeholder",k);if(j.length==0){SN.U.NoticeInlineReplyPlaceholder(k)}}var m=$(".notice-reply-form",f)}}var d=function(){m.find("input[name=inreplyto]").val(b);if(g){m.find("#notice_to").attr("disabled","disabled").hide();m.find("#notice_private").attr("disabled","disabled").hide();m.find("label[for=notice_to]").hide();m.find("label[for=notice_private]").hide()}var p=m.find("textarea");if(p.length==0){throw"No textarea"}var o="";if(l){o=l+" "}p.val(o+p.val().replace(RegExp(o,"i"),""));p.data("initialText",$.trim(l+""));p.focus();if(p[0].setSelectionRange){var n=p.val().length;p[0].setSelectionRange(n,n)}};if(m.length>0){d()}else{var j=f.find("li.notice-reply-placeholder").hide();var h=$("li.notice-reply",f);if(h.length==0){h=$('<li class="notice-reply"></li>');var c=function(n){var o=document._importNode(n,true);h.append(o);f.append(h);var p=m=$(o);SN.Init.NoticeFormSetup(p);d()};if(SN.C.I.NoticeFormMaster){c(SN.C.I.NoticeFormMaster)}else{var a=$("#form_notice").attr("action");$.get(a,{ajax:1},function(n,p,o){c($("form",n)[0])})}}}},NoticeInlineReplyPlaceholder:function(b){var a=b.find("ul.threaded-replies");if(a.length==0){a=$('<ul class="notices threaded-replies xoxo"></ul>');b.append(a);a=b.find("ul.threaded-replies")}var c=$('<li class="notice-reply-placeholder"><input class="placeholder" /></li>');c.find("input").val(SN.msg("reply_placeholder"));a.append(c)},NoticeInlineReplySetup:function(){$("li.notice-reply-placeholder input").live("focus",function(){var a=$(this).closest("li.notice");SN.U.NoticeInlineReplyTrigger(a);return false});$("li.notice-reply-comments a").live("click",function(){var a=$(this).attr("href");var b=$(this).closest(".threaded-replies");$.get(a,{ajax:1},function(d,f,e){var c=$(".threaded-replies",d);if(c.length){b.replaceWith(document._importNode(c[0],true))}});return false})},NoticeRepeat:function(){$(".form_repeat").live("click",function(a){a.preventDefault();SN.U.NoticeRepeatConfirmation($(this));return false})},NoticeRepeatConfirmation:function(a){var c=a.find(".submit");var b=c.clone();b.addClass("submit_dialogbox").removeClass("submit");a.append(b);b.bind("click",function(){SN.U.FormXHR(a);return false});c.hide();a.addClass("dialogbox").append('<button class="close">&#215;</button>').closest(".notice-options").addClass("opaque");a.find("button.close").click(function(){$(this).remove();a.removeClass("dialogbox").closest(".notice-options").removeClass("opaque");a.find(".submit_dialogbox").remove();a.find(".submit").show();return false})},NoticeAttachments:function(){$(".notice a.attachment").each(function(){SN.U.NoticeWithAttachment($(this).closest(".notice"))})},NoticeWithAttachment:function(b){if(b.find(".attachment").length===0){return}var a=b.find(".attachment.more");if(a.length>0){$(a[0]).click(function(){var c=$(this);c.addClass(SN.C.S.Processing);$.get(c.attr("href")+"/ajax",null,function(d){c.parent(".entry-content").html($(d).find("#attachment_view .entry-content").html())});return false}).attr("title",SN.msg("showmore_tooltip"))}},NoticeDataAttach:function(b){var a=b.find("input[type=file]");a.change(function(f){b.find(".attach-status").remove();var d=$(this).val();if(!d){return false}var c=$('<div class="attach-status '+SN.C.S.Success+'"><code></code> <button class="close">&#215;</button></div>');c.find("code").text(d);c.find("button").click(function(){c.remove();a.val("");return false});b.append(c);if(typeof this.files=="object"){for(var e=0;e<this.files.length;e++){SN.U.PreviewAttach(b,this.files[e])}}})},maxFileSize:function(b){var a=$(b).find("input[name=MAX_FILE_SIZE]").attr("value");if(a){return parseInt(a)}else{return 0}},PreviewAttach:function(d,c){var e=c.type+" "+Math.round(c.size/1024)+"KB";var f=true;var h;if(typeof window.createObjectURL!="undefined"){h=function(j,k){k(window.createObjectURL(j))}}else{if(typeof window.FileReader!="undefined"){h=function(k,l){var j=new FileReader();j.onload=function(m){l(j.result)};j.readAsDataURL(k)}}else{f=false}}var a=["image/png","image/jpeg","image/gif","image/svg+xml"];if($.inArray(c.type,a)==-1){f=false}var g=8*1024*1024;if(c.size>g){f=false}if(f){h(c,function(k){var j=$("<img>").attr("title",e).attr("alt",e).attr("src",k).attr("style","height: 120px");d.find(".attach-status").append(j)})}else{var b=$("<div></div>").text(e);d.find(".attach-status").append(b)}},NoticeLocationAttach:function(a){var e=a.find("[name=lat]");var l=a.find("[name=lon]");var g=a.find("[name=location_ns]").val();var m=a.find("[name=location_id]").val();var b="";var d=a.find("[name=notice_data-geo]");var c=a.find("[name=notice_data-geo]");var k=a.find("label.notice_data-geo");function f(o){k.attr("title",jQuery.trim(k.text())).removeClass("checked");a.find("[name=lat]").val("");a.find("[name=lon]").val("");a.find("[name=location_ns]").val("");a.find("[name=location_id]").val("");a.find("[name=notice_data-geo]").attr("checked",false);$.cookie(SN.C.S.NoticeDataGeoCookie,"disabled",{path:"/"});if(o){a.find(".geo_status_wrapper").removeClass("success").addClass("error");a.find(".geo_status_wrapper .geo_status").text(o)}else{a.find(".geo_status_wrapper").remove()}}function n(o,p){SN.U.NoticeGeoStatus(a,"Looking up place name...");$.getJSON(o,p,function(q){var r,s;if(typeof(q.location_ns)!="undefined"){a.find("[name=location_ns]").val(q.location_ns);r=q.location_ns}if(typeof(q.location_id)!="undefined"){a.find("[name=location_id]").val(q.location_id);s=q.location_id}if(typeof(q.name)=="undefined"){NLN_text=p.lat+";"+p.lon}else{NLN_text=q.name}SN.U.NoticeGeoStatus(a,NLN_text,p.lat,p.lon,q.url);k.attr("title",NoticeDataGeo_text.ShareDisable+" ("+NLN_text+")");a.find("[name=lat]").val(p.lat);a.find("[name=lon]").val(p.lon);a.find("[name=location_ns]").val(r);a.find("[name=location_id]").val(s);a.find("[name=notice_data-geo]").attr("checked",true);var t={NLat:p.lat,NLon:p.lon,NLNS:r,NLID:s,NLN:NLN_text,NLNU:q.url,NDG:true};$.cookie(SN.C.S.NoticeDataGeoCookie,JSON.stringify(t),{path:"/"})})}if(c.length>0){if($.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){c.attr("checked",false)}else{c.attr("checked",true)}var h=a.find(".notice_data-geo_wrap");var j=h.attr("data-api");k.attr("title",k.text());c.change(function(){if(c.attr("checked")===true||$.cookie(SN.C.S.NoticeDataGeoCookie)===null){k.attr("title",NoticeDataGeo_text.ShareDisable).addClass("checked");if($.cookie(SN.C.S.NoticeDataGeoCookie)===null||$.cookie(SN.C.S.NoticeDataGeoCookie)=="disabled"){if(navigator.geolocation){SN.U.NoticeGeoStatus(a,"Requesting location from browser...");navigator.geolocation.getCurrentPosition(function(q){a.find("[name=lat]").val(q.coords.latitude);a.find("[name=lon]").val(q.coords.longitude);var r={lat:q.coords.latitude,lon:q.coords.longitude,token:$("#token").val()};n(j,r)},function(q){switch(q.code){case q.PERMISSION_DENIED:f("Location permission denied.");break;case q.TIMEOUT:f("Location lookup timeout.");break}},{timeout:10000})}else{if(e.length>0&&l.length>0){var o={lat:e,lon:l,token:$("#token").val()};n(j,o)}else{f();c.remove();k.remove()}}}else{var p=JSON.parse($.cookie(SN.C.S.NoticeDataGeoCookie));a.find("[name=lat]").val(p.NLat);a.find("[name=lon]").val(p.NLon);a.find("[name=location_ns]").val(p.NLNS);a.find("[name=location_id]").val(p.NLID);a.find("[name=notice_data-geo]").attr("checked",p.NDG);SN.U.NoticeGeoStatus(a,p.NLN,p.NLat,p.NLon,p.NLNU);k.attr("title",NoticeDataGeo_text.ShareDisable+" ("+p.NLN+")").addClass("checked")}}else{f()}}).change()}},NoticeGeoStatus:function(e,a,f,g,c){var h=e.find(".geo_status_wrapper");if(h.length==0){h=$('<div class="'+SN.C.S.Success+' geo_status_wrapper"><button class="close" style="float:right">&#215;</button><div class="geo_status"></div></div>');h.find("button.close").click(function(){e.find("[name=notice_data-geo]").removeAttr("checked").change();return false});e.append(h)}var b;if(c){b=$("<a></a>").attr("href",c)}else{b=$("<span></span>")}b.text(a);if(f||g){var d=f+";"+g;b.attr("title",d);if(!a){b.text(d)}}h.find(".geo_status").empty().append(b)},NewDirectMessage:function(){NDM=$(".entity_send-a-message a");NDM.attr({href:NDM.attr("href")+"&ajax=1"});NDM.bind("click",function(){var a=$(".entity_send-a-message form");if(a.length===0){$(this).addClass(SN.C.S.Processing);$.get(NDM.attr("href"),null,function(b){$(".entity_send-a-message").append(document._importNode($("form",b)[0],true));a=$(".entity_send-a-message .form_notice");SN.U.FormNoticeXHR(a);SN.U.FormNoticeEnhancements(a);a.append('<button class="close">&#215;</button>');$(".entity_send-a-message button").click(function(){a.hide();return false});NDM.removeClass(SN.C.S.Processing)})}else{a.show();$(".entity_send-a-message textarea").focus()}return false})},GetFullYear:function(c,d,a){var b=new Date();b.setFullYear(c,d,a);return b},StatusNetInstance:{Set:function(b){var a=SN.U.StatusNetInstance.Get();if(a!==null){b=$.extend(a,b)}$.cookie(SN.C.S.StatusNetInstance,JSON.stringify(b),{path:"/",expires:SN.U.GetFullYear(2029,0,1)})},Get:function(){var a=$.cookie(SN.C.S.StatusNetInstance);if(a!==null){return JSON.parse(a)}return null},Delete:function(){$.cookie(SN.C.S.StatusNetInstance,null)}},belongsOnTimeline:function(b){var a=$("body").attr("id");if(a=="public"){return true}var c=$("#nav_profile a").attr("href");if(c){var d=$(b).find(".vcard.author a.url").attr("href");if(d==c){if(a=="all"||a=="showstream"){return true}}}return false},switchInputFormTab:function(a){$(".input_form_nav_tab.current").removeClass("current");if(a=="placeholder"){$("#input_form_nav_status").addClass("current")}else{$("#input_form_nav_"+a).addClass("current")}var b=$(".input_form.current.nonav");if(b.length>0){return}$(".input_form.current").removeClass("current");$("#input_form_"+a).addClass("current").find(".ajax-notice").each(function(){var c=$(this);SN.Init.NoticeFormSetup(c)}).find(".notice_data-text").focus()},showMoreMenuItems:function(c){$("#"+c+" .more_link").remove();var b="#"+c+" .extended_menu";var a=$(b);a.removeClass("extended_menu");return void (0)}},Init:{NoticeForm:function(){if($("body.user_in").length>0){$("#input_form_placeholder input.placeholder").focus(function(){SN.U.switchInputFormTab("status")});$("body").bind("click",function(g){var d=$("#content .input_forms div.current");if(d.length>0){if($("#content .input_forms").has(g.target).length==0){var a=d.find('textarea, input[type=text], input[type=""]');var c=false;a.each(function(){c=c||$(this).val()});if(!c){SN.U.switchInputFormTab("placeholder")}}}var b=$("li.notice-reply");if(b.length>0){var f=$(g.target);b.each(function(){var k=$(this);if(k.has(g.target).length==0){var h=k.find(".notice_data-text:first");var j=$.trim(h.val());if(j==""||j==h.data("initialText")){var e=k.closest("li.notice");k.remove();e.find("li.notice-reply-placeholder").show()}}})}});$(".input_forms fieldset fieldset label").inFieldLabels({fadeOpacity:0})}},NoticeFormSetup:function(a){if(!a.data("NoticeFormSetup")){SN.U.NoticeLocationAttach(a);SN.U.FormNoticeXHR(a);SN.U.FormNoticeEnhancements(a);SN.U.NoticeDataAttach(a);a.data("NoticeFormSetup",true)}},Notices:function(){if($("body.user_in").length>0){var a=$(".form_notice:first");if(a.length>0){SN.C.I.NoticeFormMaster=document._importNode(a[0],true)}SN.U.NoticeRepeat();SN.U.NoticeReply();SN.U.NoticeInlineReplySetup()}SN.U.NoticeAttachments()},EntityActions:function(){if($("body.user_in").length>0){$(".form_user_subscribe").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_user_unsubscribe").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_group_join").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_group_leave").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_user_nudge").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_peopletag_subscribe").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_peopletag_unsubscribe").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_user_add_peopletag").live("click",function(){SN.U.FormXHR($(this));return false});$(".form_user_remove_peopletag").live("click",function(){SN.U.FormXHR($(this));return false});SN.U.NewDirectMessage()}},ProfileSearch:function(){if($("body.user_in").length>0){$(".form_peopletag_edit_user_search input.submit").live("click",function(){SN.U.FormProfileSearchXHR($(this).parents("form"));return false})}},Login:function(){if(SN.U.StatusNetInstance.Get()!==null){var a=SN.U.StatusNetInstance.Get().Nickname;if(a!==null){$("#form_login #nickname").val(a)}}$("#form_login").bind("submit",function(){SN.U.StatusNetInstance.Set({Nickname:$("#form_login #nickname").val()});return true})},PeopletagAutocomplete:function(b){var a=function(d){return d.split(/\s+/)};var c=function(d){return a(d).pop()};b.live("keydown",function(d){if(d.keyCode===$.ui.keyCode.TAB&&$(this).data("autocomplete").menu.active){d.preventDefault()}}).autocomplete({minLength:0,source:function(e,d){d($.ui.autocomplete.filter(SN.C.PtagACData,c(e.term)))},focus:function(){return false},select:function(e,f){var d=a(this.value);d.pop();d.push(f.item.value);d.push("");this.value=d.join(" ");return false}}).data("autocomplete")._renderItem=function(e,f){var d='<a class="ptag-ac-line-tag">'+f.tag+' <em class="privacy_mode">'+f.mode+'</em><span class="freq">'+f.freq+"</span></a>";return $("<li/>").addClass("mode-"+f.mode).addClass("ptag-ac-line").data("item.autocomplete",f).append(d).appendTo(e)}},PeopleTags:function(){$(".user_profile_tags .editable").append($('<button class="peopletags_edit_button"/>'));$(".peopletags_edit_button").live("click",function(){var a=$(this).parents("dd").eq(0).find("form");$.ajax({url:_peopletagAC,dataType:"json",data:{token:$("#token").val()},ifModified:true,success:function(b){for(i=0;i<b.length;i++){b[i].label=b[i].tag}SN.C.PtagACData=b;SN.Init.PeopletagAutocomplete(a.find("#tags"))}});$(this).parents("ul").eq(0).fadeOut(200,function(){a.fadeIn(200).find("input#tags")})});$(".user_profile_tags form .submit").live("click",function(){SN.U.FormPeopletagsXHR($(this).parents("form"));return false})},AjaxForms:function(){$("form.ajax").live("submit",function(){SN.U.FormXHR($(this));return false});$("form.ajax input[type=submit]").live("click",function(){var a=$(this);var b=a.closest("form");b.find(".hidden-submit-button").remove();$('<input class="hidden-submit-button" type="hidden" />').attr("name",a.attr("name")).val(a.val()).appendTo(b)})},UploadForms:function(){$("input[type=file]").change(function(d){if(typeof this.files=="object"&&this.files.length>0){var c=0;for(var b=0;b<this.files.length;b++){c+=this.files[b].size}var a=SN.U.maxFileSize($(this.form));if(a>0&&c>a){var e="File too large: maximum upload size is %d bytes.";alert(e.replace("%d",a));$(this).val("");d.preventDefault();return false}}})},CheckBoxes:function(){$("span[class='checkbox-wrapper']").addClass("unchecked");$(".checkbox-wrapper").click(function(){if($(this).children("input").attr("checked")){$(this).children("input").attr({checked:""});$(this).removeClass("checked");$(this).addClass("unchecked");$(this).children("label").text("Private?")}else{$(this).children("input").attr({checked:"checked"});$(this).removeClass("unchecked");$(this).addClass("checked");$(this).children("label").text("Private")}})}}};$(document).ready(function(){SN.Init.AjaxForms();SN.Init.UploadForms();SN.Init.CheckBoxes();if($("."+SN.C.S.FormNotice).length>0){SN.Init.NoticeForm()}if($("#content .notices").length>0){SN.Init.Notices()}if($("#content .entity_actions").length>0){SN.Init.EntityActions()}if($("#form_login").length>0){SN.Init.Login()}if($("#profile_search_results").length>0){SN.Init.ProfileSearch()}if($(".user_profile_tags .editable").length>0){SN.Init.PeopleTags()}});if(!document.ELEMENT_NODE){document.ELEMENT_NODE=1;document.ATTRIBUTE_NODE=2;document.TEXT_NODE=3;document.CDATA_SECTION_NODE=4;document.ENTITY_REFERENCE_NODE=5;document.ENTITY_NODE=6;document.PROCESSING_INSTRUCTION_NODE=7;document.COMMENT_NODE=8;document.DOCUMENT_NODE=9;document.DOCUMENT_TYPE_NODE=10;document.DOCUMENT_FRAGMENT_NODE=11;document.NOTATION_NODE=12}document._importNode=function(e,a){switch(e.nodeType){case document.ELEMENT_NODE:var d=document.createElement(e.nodeName);if(e.attributes&&e.attributes.length>0){for(var c=0,b=e.attributes.length;c<b;){if(e.attributes[c].nodeName=="class"){d.className=e.getAttribute(e.attributes[c++].nodeName)}else{d.setAttribute(e.attributes[c].nodeName,e.getAttribute(e.attributes[c++].nodeName))}}}if(a&&e.childNodes&&e.childNodes.length>0){for(var c=0,b=e.childNodes.length;c<b;){d.appendChild(document._importNode(e.childNodes[c++],a))}}return d;break;case document.TEXT_NODE:case document.CDATA_SECTION_NODE:case document.COMMENT_NODE:return document.createTextNode(e.nodeValue);break}};if(typeof navigator.geolocation=="undefined"||navigator.geolocation.shim){(function(){(function(){if(window.google&&google.gears){return}var c=null;if(typeof GearsFactory!="undefined"){c=new GearsFactory()}else{try{c=new ActiveXObject("Gears.Factory");if(c.getBuildInfo().indexOf("ie_mobile")!=-1){c.privateSetGlobalObject(this)}}catch(d){if((typeof navigator.mimeTypes!="undefined")&&navigator.mimeTypes["application/x-googlegears"]){c=document.createElement("object");c.style.display="none";c.width=0;c.height=0;c.type="application/x-googlegears";document.documentElement.appendChild(c)}}}if(!c){return}if(!window.google){google={}}if(!google.gears){google.gears={factory:c}}})();var a=(function(){var d=google.gears.factory.create("beta.geolocation");var c=function(f,e){return function(g){f(g);e.lastPosition=g}};return{shim:true,type:"Gears",lastPosition:null,getCurrentPosition:function(e,g,h){var f=this;var j=c(e,f);d.getCurrentPosition(j,g,h)},watchPosition:function(e,f,g){d.watchPosition(e,f,g)},clearWatch:function(e){d.clearWatch(e)},getPermission:function(g,e,f){d.getPermission(g,e,f)}}});var b=(function(){var j=false;var e=function(){if(!d()&&!j){j=true;var k=document.createElement("script");k.src=(document.location.protocol=="https:"?"https://":"http://")+"www.google.com/jsapi?callback=_google_loader_apiLoaded";k.type="text/javascript";document.getElementsByTagName("body")[0].appendChild(k)}};var c=[];var h=function(k){c.push(k)};var f=function(){if(d()){while(c.length>0){var k=c.pop();k()}}};window._google_loader_apiLoaded=function(){f()};var d=function(){return(window.google&&google.loader)};var g=function(k){if(d()){return true}h(k);e();return false};e();return{shim:true,type:"ClientLocation",lastPosition:null,getCurrentPosition:function(l,o,p){var n=this;if(!g(function(){n.getCurrentPosition(l,o,p)})){return}if(google.loader.ClientLocation){var m=google.loader.ClientLocation;var k={coords:{latitude:m.latitude,longitude:m.longitude,altitude:null,accuracy:43000,altitudeAccuracy:null,heading:null,speed:null},address:{city:m.address.city,country:m.address.country,country_code:m.address.country_code,region:m.address.region},timestamp:new Date()};l(k);this.lastPosition=k}else{if(o==="function"){o({code:3,message:"Using the Google ClientLocation API and it is not able to calculate a location."})}}},watchPosition:function(k,m,n){this.getCurrentPosition(k,m,n);var l=this;var o=setInterval(function(){l.getCurrentPosition(k,m,n)},10000);return o},clearWatch:function(k){clearInterval(k)},getPermission:function(m,k,l){return true}}});navigator.geolocation=(window.google&&google.gears)?a():b()})()};
\ No newline at end of file
diff --git a/lib/accountprofileblock.php b/lib/accountprofileblock.php
index 59c2777601..f49c73aeab 100644
--- a/lib/accountprofileblock.php
+++ b/lib/accountprofileblock.php
@@ -94,6 +94,15 @@ class AccountProfileBlock extends ProfileBlock
         return $this->profile->bio;
     }
 
+    function otherProfiles()
+    {
+        $others = array();
+
+        Event::handle('OtherAccountProfiles', array($this->profile, &$others));
+        
+        return $others;
+    }
+
     function showTags()
     {
         $cur = common_current_user();
@@ -138,9 +147,6 @@ class AccountProfileBlock extends ProfileBlock
             if (Event::handle('StartProfilePageActionsElements', array($this->out, $this->profile))) {
                 if (empty($cur)) { // not logged in
                     if (Event::handle('StartProfileRemoteSubscribe', array($this->out, $this->profile))) {
-                        $this->out->elementStart('li', 'entity_subscribe');
-                        $this->showRemoteSubscribeLink();
-                        $this->out->elementEnd('li');
                         Event::handle('EndProfileRemoteSubscribe', array($this->out, $this->profile));
                     }
                 } else {
@@ -298,16 +304,6 @@ class AccountProfileBlock extends ProfileBlock
         $this->out->elementEnd('li');
     }
 
-    function showRemoteSubscribeLink()
-    {
-        $url = common_local_url('remotesubscribe',
-                                array('nickname' => $this->profile->nickname));
-        $this->out->element('a', array('href' => $url,
-                                  'class' => 'entity_remote_subscribe'),
-                       // TRANS: Link text for link that will subscribe to a remote profile.
-                       _m('BUTTON','Subscribe'));
-    }
-
     function show()
     {
         $this->out->elementStart('div', 'profile_block account_profile_block section');
diff --git a/lib/action.php b/lib/action.php
index 9ef7af2b98..71fd7407e2 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -229,7 +229,7 @@ class Action extends HTMLOutputter // lawsuit
                 Event::handle('EndShowLaconicaStyles', array($this));
             }
 
-            $this->cssLink(common_path('js/css/smoothness/jquery-ui.css'));
+            $this->cssLink(common_path('js/css/smoothness/jquery-ui.css', StatusNet::isHTTPS()));
 
             if (Event::handle('StartShowUAStyles', array($this))) {
                 $this->comment('[if IE]><link rel="stylesheet" type="text/css" '.
@@ -241,25 +241,13 @@ class Action extends HTMLOutputter // lawsuit
                                        'href="'.Theme::path('css/ie'.$ver.'.css', 'base').'?version='.STATUSNET_VERSION.'" /><![endif]');
                     }
                 }
-                $this->comment('[if IE]><link rel="stylesheet" type="text/css" '.
+                if (file_exists(Theme::file('css/ie.css'))) {
+                    $this->comment('[if IE]><link rel="stylesheet" type="text/css" '.
                                'href="'.Theme::path('css/ie.css', null).'?version='.STATUSNET_VERSION.'" /><![endif]');
+                }
                 Event::handle('EndShowUAStyles', array($this));
             }
 
-            if (Event::handle('StartShowDesign', array($this))) {
-
-                $user = common_current_user();
-
-                if (empty($user) || $user->viewdesigns) {
-                    $design = $this->getDesign();
-
-                    if (!empty($design)) {
-                        $design->showCSS($this);
-                    }
-                }
-
-                Event::handle('EndShowDesign', array($this));
-            }
             Event::handle('EndShowStyles', array($this));
 
             if (common_config('custom_css', 'enabled')) {
@@ -291,6 +279,13 @@ class Action extends HTMLOutputter // lawsuit
             $this->cssLink('css/display.css', $baseTheme, $media);
         }
         $this->cssLink('css/display.css', $mainTheme, $media);
+
+        // Additional styles for RTL languages
+        if (is_rtl(common_language())) {
+            if (file_exists(Theme::file('css/rtl.css'))) {
+                $this->cssLink('css/rtl.css', $mainTheme, $media);
+            }
+        }
     }
 
     /**
@@ -307,7 +302,7 @@ class Action extends HTMLOutputter // lawsuit
                     $this->script('jquery.form.min.js');
                     $this->script('jquery-ui.min.js');
                     $this->script('jquery.cookie.min.js');
-                    $this->inlineScript('if (typeof window.JSON !== "object") { $.getScript("'.common_path('js/json2.min.js').'"); }');
+                    $this->inlineScript('if (typeof window.JSON !== "object") { $.getScript("'.common_path('js/json2.min.js', StatusNet::isHTTPS()).'"); }');
                     $this->script('jquery.joverlay.min.js');
                     $this->script('jquery.infieldlabel.min.js');
                 } else {
@@ -315,7 +310,7 @@ class Action extends HTMLOutputter // lawsuit
                     $this->script('jquery.form.js');
                     $this->script('jquery-ui.min.js');
                     $this->script('jquery.cookie.js');
-                    $this->inlineScript('if (typeof window.JSON !== "object") { $.getScript("'.common_path('js/json2.js').'"); }');
+                    $this->inlineScript('if (typeof window.JSON !== "object") { $.getScript("'.common_path('js/json2.js', StatusNet::isHTTPS()).'"); }');
                     $this->script('jquery.joverlay.js');
                     $this->script('jquery.infieldlabel.js');
                 }
@@ -331,12 +326,17 @@ class Action extends HTMLOutputter // lawsuit
                     $this->script('xbImportNode.js');
                     $this->script('geometa.js');
                 }
+                // This route isn't available in single-user mode.
+                // Not sure why, but it causes errors here.
                 $this->inlineScript('var _peopletagAC = "' .
-                    common_local_url('peopletagautocomplete') . '";');
+                                    common_local_url('peopletagautocomplete') . '";');
                 $this->showScriptMessages();
-                // Frame-busting code to avoid clickjacking attacks.
+                // Anti-framing code to avoid clickjacking attacks in older browsers.
+                // This will show a blank page if the page is being framed, which is
+                // consistent with the behavior of the 'X-Frame-Options: SAMEORIGIN'
+                // header, which prevents framing in newer browser.
                 if (common_config('javascript', 'bustframes')) {
-                    $this->inlineScript('if (window.top !== window.self) { window.top.location.href = window.self.location.href; }');
+                    $this->inlineScript('if (window.top !== window.self) { document.write = ""; window.top.location = window.self.location; setTimeout(function () { document.body.innerHTML = ""; }, 1); window.self.onload = function () { document.body.innerHTML = ""; }; }');
                 }
                 Event::handle('EndShowStatusNetScripts', array($this));
                 Event::handle('EndShowLaconicaScripts', array($this));
@@ -584,6 +584,14 @@ class Action extends HTMLOutputter // lawsuit
     function showPrimaryNav()
     {
         $this->elementStart('div', array('id' => 'site_nav_global_primary'));
+
+        $user = common_current_user();
+
+        if (!empty($user) || !common_config('site', 'private')) {
+            $form = new SearchForm($this);
+            $form->show();
+        }
+
         $pn = new PrimaryNav($this);
         $pn->show();
         $this->elementEnd('div');
@@ -1362,15 +1370,22 @@ class Action extends HTMLOutputter // lawsuit
     {
         // Added @id to li for some control.
         // XXX: We might want to move this to htmloutputter.php
-        $lattrs = array();
+        $lattrs  = array();
+        $classes = array();
         if ($class !== null) {
-            $lattrs['class'] = $class;
-            if ($is_selected) {
-                $lattrs['class'] = trim('current ' . $lattrs['class']);
-            }
+            $classes[] = trim($class);
+        }
+        if ($is_selected) {
+            $classes[] = 'current';
         }
 
-        (is_null($id)) ? $lattrs : $lattrs['id'] = $id;
+        if (!empty($classes)) {
+            $lattrs['class'] = implode(' ', $classes);
+        }
+
+        if (!is_null($id)) {
+            $lattrs['id'] = $id;
+        }
 
         $this->elementStart('li', $lattrs);
         $attrs['href'] = $url;
@@ -1439,16 +1454,6 @@ class Action extends HTMLOutputter // lawsuit
         return null;
     }
 
-    /**
-     * A design for this action
-     *
-     * @return Design a design object to use
-     */
-    function getDesign()
-    {
-        return Design::siteDesign();
-    }
-
     /**
      * Check the session token.
      *
diff --git a/lib/activity.php b/lib/activity.php
index 83a115d160..7546e2cd43 100644
--- a/lib/activity.php
+++ b/lib/activity.php
@@ -100,12 +100,13 @@ class Activity
     public $title;   // title of the activity
     public $categories = array(); // list of AtomCategory objects
     public $enclosures = array(); // list of enclosure URL references
+    public $attachments = array(); // list of attachments
 
     public $extra = array(); // extra elements as array(tag, attrs, content)
     public $source;  // ActivitySource object representing 'home feed'
     public $selfLink; // <link rel='self' type='application/atom+xml'>
     public $editLink; // <link rel='edit' type='application/atom+xml'>
-
+    public $generator; // ActivityObject representing the generating application
     /**
      * Turns a regular old Atom <entry> into a magical activity
      *
@@ -135,6 +136,9 @@ class Activity
         } else if ($entry->namespaceURI == Activity::RSS &&
                    $entry->localName == 'item') {
             $this->_fromRssItem($entry, $feed);
+        } else if ($entry->namespaceURI == Activity::SPEC &&
+                   $entry->localName == 'object') {
+            $this->_fromAtomEntry($entry, $feed);
         } else {
             // Low level exception. No need for i18n.
             throw new Exception("Unknown DOM element: {$entry->namespaceURI} {$entry->localName}");
@@ -168,14 +172,22 @@ class Activity
             // XXX: do other implied stuff here
         }
 
-        $objectEls = $entry->getElementsByTagNameNS(self::SPEC, self::OBJECT);
+        // get immediate object children
 
-        if ($objectEls->length > 0) {
-            for ($i = 0; $i < $objectEls->length; $i++) {
-                $objectEl = $objectEls->item($i);
-                $this->objects[] = new ActivityObject($objectEl);
+        $objectEls = ActivityUtils::children($entry, self::OBJECT, self::SPEC);
+
+        if (count($objectEls) > 0) {
+            foreach ($objectEls as $objectEl) {
+                // Special case for embedded activities
+                $objectType = ActivityUtils::childContent($objectEl, self::OBJECTTYPE, self::SPEC);
+                if (!empty($objectType) && $objectType == ActivityObject::ACTIVITY) {
+                    $this->objects[] = new Activity($objectEl);
+                } else {
+                    $this->objects[] = new ActivityObject($objectEl);
+                }
             }
         } else {
+            // XXX: really?
             $this->objects[] = new ActivityObject($entry);
         }
 
@@ -351,91 +363,100 @@ class Activity
         // actor
         $activity['actor'] = $this->actor->asArray();
 
-        // body
-        $activity['body'] = $this->content;
+        // content
+        $activity['content'] = $this->content;
 
-        // generator <-- We could use this when we know a notice is created
-        //               locally. Or if we know the upstream Generator.
+        // generator
 
-        // icon <-- I've decided to use the posting user's stream avatar here
-        //          for now (also included in the avatarLinks extension)
+        if (!empty($this->generator)) {
+            $activity['generator'] = $this->generator->asArray();
+        }
 
+        // icon <-- possibly a mini object representing verb?
+
+        // id
+        $activity['id'] = $this->id;
 
         // object
-        if ($this->verb == ActivityVerb::POST && count($this->objects) == 1) {
-            $activity['object'] = $this->objects[0]->asArray();
-
-            // Context stuff. For now I'm just sticking most of it
-            // in a property called "context"
-
-            if (!empty($this->context)) {
-
-                if (!empty($this->context->location)) {
-                    $loc = $this->context->location;
-
-                    // GeoJSON
-
-                    $activity['geopoint'] = array(
-                        'type'        => 'Point',
-                        'coordinates' => array($loc->lat, $loc->lon)
-                    );
-
-                }
-
-                $activity['to']      = $this->context->getToArray();
-                $activity['context'] = $this->context->asArray();
-            }
-
-            // Instead of adding enclosures as an extension to JSON
-            // Activities, it seems like we should be using the
-            // attachedObjects property of ActivityObject
-
-            $attachedObjects = array();
-
-            // XXX: OK, this is kinda cheating. We should probably figure out
-            // what kind of objects these are based on mime-type and then
-            // create specific object types. Right now this rely on
-            // duck-typing.  Also, we should include an embed code for
-            // video attachments.
-
-            foreach ($this->enclosures as $enclosure) {
-
-                if (is_string($enclosure)) {
-
-                    $attachedObjects[]['id']  = $enclosure;
-
-                } else {
-
-                    $attachedObjects[]['id']  = $enclosure->url;
-
-                    $mediaLink = new ActivityStreamsMediaLink(
-                        $enclosure->url,
-                        null,
-                        null,
-                        $enclosure->mimetype
-                        // XXX: Add 'size' as an extension to MediaLink?
-                    );
-
-                    $attachedObjects[]['mediaLink'] = $mediaLink->asArray(); // extension
-
-                    if ($enclosure->title) {
-                        $attachedObjects[]['displayName'] = $enclosure->title;
-                    }
-               }
-            }
-
-            if (!empty($attachedObjects)) {
-                $activity['object']['attachedObjects'] = $attachedObjects;
-            }
 
+        if (count($this->objects) == 0) {
+            common_log(LOG_ERR, "Can't save " . $this->id);
         } else {
-            $activity['object'] = array();
-            foreach($this->objects as $object) {
-                $activity['object'][] = $object->asArray();
+            if (count($this->objects) > 1) {
+                common_log(LOG_WARNING, "Ignoring " . (count($this->objects) - 1) . " extra objects in JSON output for activity " . $this->id);
+            }
+            $object = $this->objects[0];
+
+            if ($object instanceof Activity) {
+                // Sharing a post activity is more like sharing the original object
+                if (ActivityVerb::canonical($this->verb) == ActivityVerb::canonical(ActivityVerb::SHARE) &&
+                    ActivityVerb::canonical($object->verb) == ActivityVerb::canonical(ActivityVerb::POST)) {
+                    // XXX: Here's one for the obfuscation record books
+                    $object = $object->objects[0];
+                }
+            }
+
+            $activity['object'] = $object->asArray();
+
+            if ($object instanceof Activity) {
+                $activity['object']['objectType'] = 'activity';
+            }
+
+            foreach ($this->attachments as $attachment) {
+                if (empty($activity['object']['attachments'])) {
+                    $activity['object']['attachments'] = array();
+                }
+                $activity['object']['attachments'][] = $attachment->asArray();
+            }
+        }
+        
+        // Context stuff.
+
+        if (!empty($this->context)) {
+
+            if (!empty($this->context->location)) {
+                $loc = $this->context->location;
+
+                $activity['location'] = array(
+                    'objectType' => 'place',
+                    'position' => sprintf("%+02.5F%+03.5F/", $loc->lat, $loc->lon),
+                    'lat' => $loc->lat,
+                    'lon' => $loc->lon
+                );
+
+                $name = $loc->getName();
+
+                if ($name) {
+                    $activity['location']['displayName'] = $name;
+                }
+                    
+                $url = $loc->getURL();
+
+                if ($url) {
+                    $activity['location']['url'] = $url;
+                }
+            }
+
+            $activity['to']      = $this->context->getToArray();
+
+            $ctxarr = $this->context->asArray();
+
+            if (array_key_exists('inReplyTo', $ctxarr)) {
+                $activity['object']['inReplyTo'] = $ctxarr['inReplyTo'];
+                unset($ctxarr['inReplyTo']);
+            }
+
+            if (!array_key_exists('status_net', $activity)) {
+                $activity['status_net'] = array();
+            }
+
+            foreach ($ctxarr as $key => $value) {
+                $activity['status_net'][$key] = $value;
             }
         }
 
-        $activity['postedTime'] = self::iso8601Date($this->time); // Change to exactly be RFC3339?
+        // published
+        $activity['published'] = self::iso8601Date($this->time);
 
         // provider
         $provider = array(
@@ -454,26 +475,34 @@ class Activity
         // title
         $activity['title'] = $this->title;
 
-        // updatedTime <-- Should we use this to indicate the time we received
-        //                 a remote notice? Probably not.
+        // updated <-- Optional. Should we use this to indicate the time we r
+        //             eceived a remote notice? Probably not.
 
         // verb
-        //
-        // We can probably use the whole schema URL here but probably the
-        // relative simple name is easier to parse
-        $activity['verb'] = substr($this->verb, strrpos($this->verb, '/') + 1);
+
+        $activity['verb'] = ActivityVerb::canonical($this->verb);
+
+        // url
+        if ($this->link) {
+            $activity['url'] = $this->link;
+        }
 
         /* Purely extensions hereafter */
 
-        $tags = array();
-
-        // Use an Activity Object for term? Which object? Note?
-        foreach ($this->categories as $cat) {
-            $tags[] = $cat->term;
+        if ($activity['verb'] == 'post') {
+            $tags = array();
+            foreach ($this->categories as $cat) {
+                if (mb_strlen($cat->term) > 0) {
+                    // Couldn't figure out which object type to use, so...
+                    $tags[] = array('objectType' => 'http://activityschema.org/object/hashtag',
+                                    'displayName' => $cat->term);
+                }
+            }
+            if (count($tags) > 0) {
+                $activity['object']['tags'] = $tags;
+            }
         }
 
-        $activity['tags'] = $tags;
-
         // XXX: a bit of a hack... Since JSON isn't namespaced we probably
         // shouldn't be using 'statusnet:notice_info', but this will work
         // for the moment.
@@ -481,7 +510,15 @@ class Activity
         foreach ($this->extra as $e) {
             list($objectName, $props, $txt) = $e;
             if (!empty($objectName)) {
-                $activity[$objectName] = $props;
+                $parts = explode(":", $objectName);
+                if (count($parts) == 2 && $parts[0] == "statusnet") {
+                    if (!array_key_exists('status_net', $activity)) {
+                        $activity['status_net'] = array();
+                    }
+                    $activity['status_net'][$parts[1]] = $props;
+                } else {
+                    $activity[$objectName] = $props;
+                }
             }
         }
 
@@ -495,7 +532,7 @@ class Activity
         return $xs->getString();
     }
 
-    function outputTo($xs, $namespace=false, $author=true, $source=false)
+    function outputTo($xs, $namespace=false, $author=true, $source=false, $tag='entry')
     {
         if ($namespace) {
             $attrs = array('xmlns' => 'http://www.w3.org/2005/Atom',
@@ -510,16 +547,26 @@ class Activity
             $attrs = array();
         }
 
-        $xs->elementStart('entry', $attrs);
+        $xs->elementStart($tag, $attrs);
 
-        if ($this->verb == ActivityVerb::POST && count($this->objects) == 1) {
+        if ($tag != 'entry') {
+            $xs->element('activity:object-type', null, ActivityObject::ACTIVITY);
+        }
+
+        if ($this->verb == ActivityVerb::POST && count($this->objects) == 1 && $tag == 'entry') {
 
             $obj = $this->objects[0];
 			$obj->outputTo($xs, null);
 
         } else {
             $xs->element('id', null, $this->id);
-            $xs->element('title', null, $this->title);
+
+            if ($this->title) {
+                $xs->element('title', null, $this->title);
+            } else {
+                // Require element
+                $xs->element('title', null, "");
+            }
 
             $xs->element('content', array('type' => 'html'), $this->content);
 
@@ -544,23 +591,15 @@ class Activity
 
         if ($author) {
             $this->actor->outputTo($xs, 'author');
-
-            // XXX: Remove <activity:actor> ASAP! Author information
-            // has been moved to the author element in the Activity
-            // Streams spec. We're outputting actor only for backward
-            // compatibility with clients that can only parse
-            // activities based on older versions of the spec.
-
-            $depMsg = 'Deprecation warning: activity:actor is present '
-                . 'only for backward compatibility. It will be '
-                . 'removed in the next version of StatusNet.';
-            $xs->comment($depMsg);
-            $this->actor->outputTo($xs, 'activity:actor');
         }
 
-        if ($this->verb != ActivityVerb::POST || count($this->objects) != 1) {
+        if ($this->verb != ActivityVerb::POST || count($this->objects) != 1 || $tag != 'entry') {
             foreach($this->objects as $object) {
-                $object->outputTo($xs, 'activity:object');
+                if ($object instanceof Activity) {
+                    $object->outputTo($xs, false, true, true, 'activity:object');
+                } else {
+                    $object->outputTo($xs, 'activity:object');
+                }
             }
         }
 
@@ -694,7 +733,7 @@ class Activity
             $xs->element($tag, $attrs, $content);
         }
 
-        $xs->elementEnd('entry');
+        $xs->elementEnd($tag);
 
         return;
     }
diff --git a/lib/activitycontext.php b/lib/activitycontext.php
index 2eff3fb15f..e383b05734 100644
--- a/lib/activitycontext.php
+++ b/lib/activitycontext.php
@@ -38,9 +38,11 @@ class ActivityContext
     public $replyToUrl;
     public $location;
     public $attention = array();
+    public $attentionType = array();
     public $conversation;
     public $forwardID; // deprecated, use ActivityVerb::SHARE instead
     public $forwardUrl; // deprecated, use ActivityVerb::SHARE instead
+    public $scope;
 
     const THR     = 'http://purl.org/syndication/thread/1.0';
     const GEORSS  = 'http://www.georss.org/georss';
@@ -167,10 +169,14 @@ class ActivityContext
         $tos = array();
 
         foreach ($this->attention as $attnUrl) {
+            if (array_key_exists($attnUrl, $this->attentionType)) {
+                $type = ActivityObject::canonicalType($this->attentionType[$attnUrl]);
+            } else {
+                $type = ActivityObject::canonicalType(ActivityObject::PERSON);
+            }
             $to = array(
-                'objectType' => 'person',
-                'id'         => $attnUrl,
-                'url'        => $attnUrl
+                'objectType' => $type,
+                'id'         => $attnUrl
             );
             $tos[] = $to;
         }
diff --git a/lib/activityimporter.php b/lib/activityimporter.php
index da6fc5e321..096eb9ba43 100644
--- a/lib/activityimporter.php
+++ b/lib/activityimporter.php
@@ -63,9 +63,9 @@ class ActivityImporter extends QueueHandler
 
         $done = null;
 
-        if (Event::handle('StartImportActivity',
-                          array($user, $author, $activity, $trusted, &$done))) {
-            try {
+        try {
+            if (Event::handle('StartImportActivity',
+                              array($user, $author, $activity, $trusted, &$done))) {
                 switch ($activity->verb) {
                 case ActivityVerb::FOLLOW:
                     $this->subscribeProfile($user, $author, $activity);
@@ -83,10 +83,10 @@ class ActivityImporter extends QueueHandler
                 Event::handle('EndImportActivity',
                               array($user, $author, $activity, $trusted));
                 $done = true;
-            } catch (Exception $e) {
-                common_log(LOG_ERR, $e->getMessage());
-                $done = true;
             }
+        } catch (Exception $e) {
+            common_log(LOG_ERR, $e->getMessage());
+            $done = true;
         }
         return $done;
     }
diff --git a/lib/activityobject.php b/lib/activityobject.php
index 444d098073..5a42a1dfb3 100644
--- a/lib/activityobject.php
+++ b/lib/activityobject.php
@@ -68,6 +68,11 @@ class ActivityObject
     const PLACE     = 'http://activitystrea.ms/schema/1.0/place';
     const COMMENT   = 'http://activitystrea.ms/schema/1.0/comment';
     // ^^^^^^^^^^ tea!
+    const ACTIVITY = 'http://activitystrea.ms/schema/1.0/activity';
+    const SERVICE   = 'http://activitystrea.ms/schema/1.0/service';
+    const IMAGE     = 'http://activitystrea.ms/schema/1.0/image';
+    const COLLECTION = 'http://activitystrea.ms/schema/1.0/collection';
+    const APPLICATION = 'http://activitystrea.ms/schema/1.0/application';
 
     // Atom elements we snarf
 
@@ -109,6 +114,8 @@ class ActivityObject
     public $description;
     public $extra = array();
 
+    public $stream;
+
     /**
      * Constructor
      *
@@ -431,10 +438,11 @@ class ActivityObject
             $object->type    = (empty($notice->object_type)) ? ActivityObject::NOTE : $notice->object_type;
 
             $object->id      = $notice->uri;
-            $object->title   = $notice->content;
             $object->content = $notice->rendered;
             $object->link    = $notice->bestUrl();
 
+            $object->extra[] = array('status_net', array('notice_id' => $notice->id));
+
             Event::handle('EndActivityObjectFromNotice', array($notice, &$object));
         }
 
@@ -498,6 +506,10 @@ class ActivityObject
 
             $object->poco = PoCo::fromProfile($profile);
 
+            if ($profile->getUser()) {
+                $object->extra[] = array('followers', array('url' => common_local_url('subscribers', array('nickname' => $profile->nickname))));
+            }
+
             Event::handle('EndActivityObjectFromProfile', array($profile, &$object));
         }
 
@@ -548,6 +560,113 @@ class ActivityObject
         return $object;
     }
 
+    static function fromFile(File $file)
+    {
+        $object = new ActivityObject();
+
+        if (Event::handle('StartActivityObjectFromFile', array($file, &$object))) {
+
+            $object->type = self::mimeTypeToObjectType($file->mimetype);
+            $object->id   = TagURI::mint(sprintf("file:%d", $file->id));
+            $object->link = common_local_url('attachment', array('attachment' => $file->id));
+
+            if ($file->title) {
+                $object->title = $file->title;
+            }
+
+            if ($file->date) {
+                $object->date = $file->date;
+            }
+
+            $thumbnail = $file->getThumbnail();
+
+            if (!empty($thumbnail)) {
+                $object->thumbnail = $thumbnail;
+            }
+
+            switch (ActivityObject::canonicalType($object->type)) {
+            case 'image':
+                $object->largerImage = $file->url;
+                break;
+            case 'video':
+            case 'audio':
+                $object->stream = $file->url;
+                break;
+            }
+
+            Event::handle('EndActivityObjectFromFile', array($file, &$object));
+        }
+
+        return $object;
+    }
+
+    static function fromNoticeSource(Notice_source $source)
+    {
+        $object = new ActivityObject();
+        $wellKnown = array('web', 'xmpp', 'mail', 'omb', 'system', 'api', 'ostatus',
+                           'activity', 'feed', 'mirror', 'twitter', 'facebook');
+
+        if (Event::handle('StartActivityObjectFromNoticeSource', array($source, &$object))) {
+            $object->type = ActivityObject::APPLICATION;
+
+            if (in_array($source->code, $wellKnown)) {
+                // We use one ID for all well-known StatusNet sources
+                $object->id = "tag:status.net,2009:notice-source:".$source->code;
+            } else if ($source->url) {
+                // They registered with an URL
+                $object->id = $source->url;
+            } else {
+                // Locally-registered, no URL
+                $object->id = TagURI::mint("notice-source:".$source->code);
+            }
+
+            if ($source->url) {
+                $object->link = $source->url;
+            }
+
+            if ($source->name) {
+                $object->title = $source->name;
+            } else {
+                $object->title = $source->code;
+            }
+
+            if ($source->created) {
+                $object->date = $source->created;
+            }
+            
+            $object->extra[] = array('status_net', array('source_code' => $source->code));
+
+            Event::handle('EndActivityObjectFromNoticeSource', array($source, &$object));
+        }
+
+        return $object;
+    }
+
+    static function fromMessage(Message $message)
+    {
+        $object = new ActivityObject();
+
+        if (Event::handle('StartActivityObjectFromMessage', array($message, &$object))) {
+
+            $object->type    = ActivityObject::NOTE;
+            $object->id      = ($message->uri) ? $message->uri : (($message->url) ? $message->url : TagURI::mint(sprintf("message:%d", $message->id)));
+            $object->content = $message->rendered;
+            $object->date    = $message->created;
+
+            if ($message->url) {
+                $object->link = $message->url;
+            } else {
+                $object->link = common_local_url('showmessage', array('message' => $message->id));
+            }
+
+            $object->extra[] = array('status_net', array('message_id' => $message->id));
+            
+            Event::handle('EndActivityObjectFromMessage', array($message, &$object));
+        }
+
+        return $object;
+    }
+
     function outputTo($xo, $tag='activity:object')
     {
         if (!empty($tag)) {
@@ -678,19 +797,27 @@ class ActivityObject
         $object = array();
 
         if (Event::handle('StartActivityObjectOutputJson', array($this, &$object))) {
-            // XXX: attachedObjects are added by Activity
+            // XXX: attachments are added by Activity
+
+            // author (Add object for author? Could be useful for repeats.)
+
+            // content (Add rendered version of the notice?)
 
             // displayName
-            $object['displayName'] = $this->title;
 
-            // TODO: downstreamDuplicates
+            if ($this->title) {
+                $object['displayName'] = $this->title;
+            }
 
-            // embedCode (used for video)
+            // downstreamDuplicates
 
             // id
-            //
-            // XXX: Should we use URL here? or a crazy tag URI?
-            $object['id'] = $this->id;
+
+            if ($this->id) {
+                $object['id'] = $this->id;
+            } else if ($this->link) {
+                $object['id'] = $this->link;
+            }
 
             if ($this->type == ActivityObject::PERSON
                 || $this->type == ActivityObject::GROUP) {
@@ -698,7 +825,7 @@ class ActivityObject
                 // XXX: Not sure what the best avatar is to use for the
                 // author's "image". For now, I'm using the large size.
 
-                $avatarLarge      = null;
+                $imgLink          = null;
                 $avatarMediaLinks = array();
 
                 foreach ($this->avatarLinks as $a) {
@@ -720,53 +847,161 @@ class ActivityObject
                     $avatarMediaLinks[] = $avatar->asArray();
                 }
 
-                $object['avatarLinks'] = $avatarMediaLinks; // extension
+                if (!array_key_exists('status_net', $object)) {
+                    $object['status_net'] = array();
+                }
+
+                $object['status_net']['avatarLinks'] = $avatarMediaLinks; // extension
 
                 // image
-                $object['image']  = $imgLink->asArray();
+                if (!empty($imgLink)) {
+                    $object['image']  = $imgLink->asArray();
+                }
             }
 
             // objectType
             //
             // We can probably use the whole schema URL here but probably the
             // relative simple name is easier to parse
-            // @fixme this breaks extension URIs
-            $object['type'] = substr($this->type, strrpos($this->type, '/') + 1);
+
+            $object['objectType'] = ActivityObject::canonicalType($this->type);
 
             // summary
             $object['summary'] = $this->summary;
 
+            // content
+            $object['content'] = $this->content;
+
+            // published (probably don't need. Might be useful for repeats.)
+
+            // updated (probably don't need this)
+
             // TODO: upstreamDuplicates
 
-            // url (XXX: need to put the right thing here...)
-            $object['url'] = $this->id;
+            if ($this->link) {
+                $object['url'] = $this->link;
+            }
 
             /* Extensions */
             // @fixme these may collide with XML extensions
             // @fixme multiple tags of same name will overwrite each other
             // @fixme text content from XML extensions will be lost
+
             foreach ($this->extra as $e) {
                 list($objectName, $props, $txt) = $e;
-                $object[$objectName] = $props;
+                if (!empty($objectName)) {
+                    $parts = explode(":", $objectName);
+                    if (count($parts) == 2 && $parts[0] == "statusnet") {
+                        if (!array_key_exists('status_net', $object)) {
+                            $object['status_net'] = array();
+                        }
+                        $object['status_net'][$parts[1]] = $props;
+                    } else {
+                        $object[$objectName] = $props;
+                    }
+                }
             }
 
-            // GeoJSON
-
             if (!empty($this->geopoint)) {
 
-                list($lat, $long) = explode(' ', $this->geopoint);
+                list($lat, $lon) = explode(' ', $this->geopoint);
 
-                $object['geopoint'] = array(
-                    'type'        => 'Point',
-                    'coordinates' => array($lat, $long)
-                );
+                if (!empty($lat) && !empty($lon)) {
+                    $object['location'] = array(
+                        'objectType' => 'place',
+                        'position' => sprintf("%+02.5F%+03.5F/", $lat, $lon),
+                        'lat' => $lat,
+                        'lon' => $lon
+                    );
+
+                    $loc = Location::fromLatLon((float)$lat, (float)$lon);
+
+                    if ($loc) {
+                        $name = $loc->getName();
+
+                        if ($name) {
+                            $object['location']['displayName'] = $name;
+                        }
+                        $url = $loc->getURL();
+
+                        if ($url) {
+                            $object['location']['url'] = $url;
+                        }
+                    }
+                }
             }
 
             if (!empty($this->poco)) {
-                $object['contact'] = $this->poco->asArray();
+                $object['portablecontacts_net'] = array_filter($this->poco->asArray());
             }
+
+            if (!empty($this->thumbnail)) {
+                if (is_string($this->thumbnail)) {
+                    $object['image'] = array('url' => $this->thumbnail);
+                } else {
+                    $object['image'] = array('url' => $this->thumbnail->url);
+                    if ($this->thumbnail->width) {
+                        $object['image']['width'] = $this->thumbnail->width;
+                    }
+                    if ($this->thumbnail->height) {
+                        $object['image']['height'] = $this->thumbnail->height;
+                    }
+                }
+            }
+
+            switch (ActivityObject::canonicalType($this->type)) {
+            case 'image':
+                if (!empty($this->largerImage)) {
+                    $object['fullImage'] = array('url' => $this->largerImage);
+                }
+                break;
+            case 'audio':
+            case 'video':
+                if (!empty($this->stream)) {
+                    $object['stream'] = array('url' => $this->stream);
+                }
+                break;
+            }
+
             Event::handle('EndActivityObjectOutputJson', array($this, &$object));
         }
         return array_filter($object);
     }
+
+    static function canonicalType($type) {
+        $ns = 'http://activitystrea.ms/schema/1.0/';
+        if (substr($type, 0, mb_strlen($ns)) == $ns) {
+            return substr($type, mb_strlen($ns));
+        } else {
+            return $type;
+        }
+    }
+
+    static function mimeTypeToObjectType($mimeType) {
+        $ot = null;
+
+        // Default
+
+        if (empty($mimeType)) {
+            return self::FILE;
+        }
+
+        $parts = explode('/', $mimeType);
+
+        switch ($parts[0]) {
+        case 'image':
+            $ot = self::IMAGE;
+            break;
+        case 'audio':
+            $ot = self::AUDIO;
+            break;
+        case 'video':
+            $ot = self::VIDEO;
+            break;
+        default:
+            $ot = self::FILE;
+        }
+
+        return $ot;
+    }
 }
diff --git a/lib/activitystreamjsondocument.php b/lib/activitystreamjsondocument.php
index 0c64ebb998..9964f1e60c 100644
--- a/lib/activitystreamjsondocument.php
+++ b/lib/activitystreamjsondocument.php
@@ -41,14 +41,29 @@ if (!defined('STATUSNET'))
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
-class ActivityStreamJSONDocument
+class ActivityStreamJSONDocument extends JSONActivityCollection
 {
+    // Note: Lot of AS folks think the content type should be:
+    // 'application/stream+json; charset=utf-8', but this is more
+    // useful at the moment, because some programs actually understand
+    // it.
+    const CONTENT_TYPE = 'application/json; charset=utf-8';
 
     /* Top level array representing the document */
     protected $doc = array();
 
     /* The current authenticated user */
-    protected $cur = null;
+    protected $cur;
+
+    /* Title of the document */
+    protected $title;
+
+    /* Links associated with this document */
+    protected $links;
+
+    /* Count of items in this document */
+    // XXX This is cryptically referred to in the spec: "The Stream serialization MAY contain a count property."
+    protected $count;
 
     /**
      * Constructor
@@ -56,20 +71,26 @@ class ActivityStreamJSONDocument
      * @param User $cur the current authenticated user
      */
 
-    function __construct($cur = null)
+    function __construct($cur = null, $title = null, $items = null, $links = null, $url = null)
     {
+        parent::__construct($items, $url);
 
         $this->cur = $cur;
 
         /* Title of the JSON document */
-        $this->doc['title'] = null;
+        $this->title = $title;
 
-        /* Array of activity items */
-        $this->doc['items'] = array();
+        if (!empty($items)) {
+            $this->count = count($this->items);
+        }
 
         /* Array of links associated with the document */
-        $this->doc['links'] = array();
+        $this->links = empty($links) ? array() : $items;
 
+        /* URL of a document, this document? containing a list of all the items in the stream */
+        if (!empty($this->url)) {
+            $this->url = $this->url;
+        }
     }
 
     /**
@@ -80,9 +101,15 @@ class ActivityStreamJSONDocument
 
     function setTitle($title)
     {
-        $this->doc['title'] = $title;
+        $this->title = $title;
     }
 
+    function setUrl($url)
+    {
+        $this->url = $url;
+    }
+
+
     /**
      * Add more than one Item to the document
      *
@@ -115,7 +142,8 @@ class ActivityStreamJSONDocument
 
         $act          = $notice->asActivity($cur);
         $act->extra[] = $notice->noticeInfo($cur);
-        array_push($this->doc['items'], $act->asArray());
+        array_push($this->items, $act->asArray());
+        $this->count++;
     }
 
     /**
@@ -127,7 +155,7 @@ class ActivityStreamJSONDocument
     function addLink($url = null, $rel = null, $mediaType = null)
     {
         $link = new ActivityStreamsLink($url, $rel, $mediaType);
-        $this->doc['links'][] = $link->asArray();
+        array_push($this->links, $link->asArray());
     }
 
     /*
@@ -137,7 +165,13 @@ class ActivityStreamJSONDocument
      */
     function asString()
     {
-        return json_encode(array_filter($this->doc));
+        $this->doc['generator'] = 'StatusNet ' . STATUSNET_VERSION; // extension
+        $this->doc['title'] = $this->title;
+        $this->doc['url']   = $this->url;
+        $this->doc['totalItems'] = $this->count;
+        $this->doc['items'] = $this->items;
+        $this->doc['links'] = $this->links; // extension
+        return json_encode(array_filter($this->doc)); // filter out empty elements
     }
 
 }
@@ -160,16 +194,16 @@ class ActivityStreamsMediaLink extends ActivityStreamsLink
         $url       = null,
         $width     = null,
         $height    = null,
-        $mediaType = null,
-        $rel       = null,
+        $mediaType = null, // extension
+        $rel       = null, // extension
         $duration  = null
     )
     {
         parent::__construct($url, $rel, $mediaType);
         $this->linkDict = array(
-            'width'      => $width,
-            'height'     => $height,
-            'duration'   => $duration
+            'width'      => intval($width),
+            'height'     => intval($height),
+            'duration'   => intval($duration)
         );
     }
 
@@ -182,6 +216,49 @@ class ActivityStreamsMediaLink extends ActivityStreamsLink
     }
 }
 
+/*
+ * Collection primarily as the root of an Activity Streams doc but can be used as the value
+ * of extension properties in a variety of situations.
+ *
+ * A valid Collection object serialization MUST contain at least the url or items properties.
+ */
+class JSONActivityCollection {
+
+    /* Non-negative integer specifying the total number of activities within the stream */
+    protected $totalItems;
+
+    /* An array containing a listing of Objects of any object type */
+    protected $items;
+
+    /* IRI referencing a JSON document containing the full listing of objects in the collection */
+    protected $url;
+
+    /**
+     * Constructor
+     *
+     * @param array  $items       array of activity items
+     * @param string $url         url of a doc list all the objs in the collection
+     * @param int    $totalItems  total number of items in the collection
+     */
+    function __construct($items = null, $url = null)
+    {
+        $this->items      = empty($items) ? array() : $items;
+        $this->totalItems = count($items);
+        $this->url        = $url;
+    }
+
+    /**
+     * Get the total number of items in the collection
+     *
+     * @return int total the total
+     */
+    public function getTotalItems()
+    {
+        $this->totalItems = count($items);
+        return $this->totalItems;
+    }
+}
+
 /**
  * A class for representing links in JSON Activities
  *
@@ -215,3 +292,4 @@ class ActivityStreamsLink
         return array_filter($this->linkDict);
     }
 }
+
diff --git a/lib/activityutils.php b/lib/activityutils.php
index 3aa09deb4e..c2c239f1d3 100644
--- a/lib/activityutils.php
+++ b/lib/activityutils.php
@@ -104,8 +104,9 @@ class ActivityUtils
     {
         $els = $element->childNodes;
         $out = array();
-
-        foreach ($els as $link) {
+        
+        for ($i = 0; $i < $els->length; $i++) {
+            $link = $els->item($i);
             if ($link->localName == self::LINK && $link->namespaceURI == self::ATOM) {
                 $linkRel = $link->getAttribute(self::REL);
                 $linkType = $link->getAttribute(self::TYPE);
@@ -144,6 +145,34 @@ class ActivityUtils
         }
     }
 
+    /**
+     * Gets all immediate child elements with the given tag
+     *
+     * @param DOMElement $element   element to pick at
+     * @param string     $tag       tag to look for
+     * @param string     $namespace Namespace to look under
+     *
+     * @return array found element or null
+     */
+
+    static function children(DOMNode $element, $tag, $namespace=self::ATOM)
+    {
+        $results = array();
+
+        $els = $element->childNodes;
+
+        if (!empty($els) && $els->length > 0) {
+            for ($i = 0; $i < $els->length; $i++) {
+                $el = $els->item($i);
+                if ($el->localName == $tag && $el->namespaceURI == $namespace) {
+                    $results[] = $el;
+                }
+            }
+        }
+
+        return $results;
+    }
+
     /**
      * Grab the text content of a DOM element child of the current element
      *
diff --git a/lib/activityverb.php b/lib/activityverb.php
index 5ee68f2880..513605b620 100644
--- a/lib/activityverb.php
+++ b/lib/activityverb.php
@@ -63,4 +63,13 @@ class ActivityVerb
 
     // For simple profile-update pings; no content to share.
     const UPDATE_PROFILE = 'http://ostatus.org/schema/1.0/update-profile';
+
+    static function canonical($verb) {
+        $ns = 'http://activitystrea.ms/schema/1.0/';
+        if (substr($verb, 0, mb_strlen($ns)) == $ns) {
+            return substr($verb, mb_strlen($ns));
+        } else {
+            return $verb;
+        }
+    }
 }
diff --git a/lib/adminpanelaction.php b/lib/adminpanelaction.php
index 5642c68d62..4868e9d492 100644
--- a/lib/adminpanelaction.php
+++ b/lib/adminpanelaction.php
@@ -251,35 +251,6 @@ class AdminPanelAction extends Action
         return;
     }
 
-    /**
-     * Delete a design setting
-     *
-     * // XXX: Maybe this should go in Design? --Z
-     *
-     * @return mixed $result false if something didn't work
-     */
-    function deleteSetting($section, $setting)
-    {
-        $config = new Config();
-
-        $config->section = $section;
-        $config->setting = $setting;
-
-        if ($config->find(true)) {
-            $result = $config->delete();
-            if (!$result) {
-                common_log_db_error($config, 'DELETE', __FILE__);
-                // TRANS: Client error message thrown if design settings could not be deleted in
-                // TRANS: the admin panel Design.
-                $this->clientError(_("Unable to delete design setting."));
-                return null;
-            }
-            return $result;
-        }
-
-        return null;
-    }
-
     function canAdmin($name)
     {
         $isOK = false;
diff --git a/lib/adminpanelnav.php b/lib/adminpanelnav.php
index 245438c614..40c4889f27 100644
--- a/lib/adminpanelnav.php
+++ b/lib/adminpanelnav.php
@@ -94,14 +94,6 @@ class AdminPanelNav extends Menu
                                      $menu_title, $action_name == 'siteadminpanel', 'nav_site_admin_panel');
             }
 
-            if (AdminPanelAction::canAdmin('design')) {
-                // TRANS: Menu item title in administrator navigation panel.
-                $menu_title = _('Design configuration');
-                // TRANS: Menu item in administrator navigation panel.
-                $this->out->menuItem(common_local_url('designadminpanel'), _m('MENU', 'Design'),
-                                     $menu_title, $action_name == 'designadminpanel', 'nav_design_admin_panel');
-            }
-
             if (AdminPanelAction::canAdmin('user')) {
                 // TRANS: Menu item title in administrator navigation panel.
                 $menu_title = _('User configuration');
@@ -163,7 +155,7 @@ class AdminPanelNav extends Menu
                 $menu_title = _('Plugins configuration');
                 // TRANS: Menu item in administrator navigation panel.
                 $this->out->menuItem(common_local_url('pluginsadminpanel'), _m('MENU','Plugins'),
-                                     $menu_title, $action_name == 'pluginsadminpanel', 'nav_design_admin_panel');
+                                     $menu_title, $action_name == 'pluginsadminpanel', 'nav_plugin_admin_panel');
             }
 
             Event::handle('EndAdminPanelNav', array($this));
diff --git a/lib/apiaction.php b/lib/apiaction.php
index c0e5095fd5..14e21ae4fd 100644
--- a/lib/apiaction.php
+++ b/lib/apiaction.php
@@ -215,33 +215,11 @@ class ApiAction extends Action
             Avatar::defaultImage(AVATAR_STREAM_SIZE);
 
         $twitter_user['url'] = ($profile->homepage) ? $profile->homepage : null;
-        $twitter_user['protected'] = ($user->private_stream) ? true : false;
+        $twitter_user['protected'] = (!empty($user) && $user->private_stream) ? true : false;
         $twitter_user['followers_count'] = $profile->subscriberCount();
 
-        $design = null;
-
         // Note: some profiles don't have an associated user
 
-        $defaultDesign = Design::siteDesign();
-
-        if (!empty($user)) {
-            $design = $user->getDesign();
-        }
-
-        if (empty($design)) {
-            $design = $defaultDesign;
-        }
-
-        $color = Design::toWebColor(empty($design->backgroundcolor) ? $defaultDesign->backgroundcolor : $design->backgroundcolor);
-        $twitter_user['profile_background_color'] = ($color == null) ? '' : '#'.$color->hexValue();
-        $color = Design::toWebColor(empty($design->textcolor) ? $defaultDesign->textcolor : $design->textcolor);
-        $twitter_user['profile_text_color'] = ($color == null) ? '' : '#'.$color->hexValue();
-        $color = Design::toWebColor(empty($design->linkcolor) ? $defaultDesign->linkcolor : $design->linkcolor);
-        $twitter_user['profile_link_color'] = ($color == null) ? '' : '#'.$color->hexValue();
-        $color = Design::toWebColor(empty($design->sidebarcolor) ? $defaultDesign->sidebarcolor : $design->sidebarcolor);
-        $twitter_user['profile_sidebar_fill_color'] = ($color == null) ? '' : '#'.$color->hexValue();
-        $twitter_user['profile_sidebar_border_color'] = '';
-
         $twitter_user['friends_count'] = $profile->subscriptionCount();
 
         $twitter_user['created_at'] = $this->dateTwitter($profile->created);
@@ -259,26 +237,17 @@ class ApiAction extends Action
 
         $twitter_user['utc_offset'] = $t->format('Z');
         $twitter_user['time_zone'] = $timezone;
-
-        $twitter_user['profile_background_image_url']
-            = empty($design->backgroundimage)
-            ? '' : ($design->disposition & BACKGROUND_ON)
-            ? Design::url($design->backgroundimage) : '';
-
-        $twitter_user['profile_background_tile']
-            = (bool)($design->disposition & BACKGROUND_TILE);
-
         $twitter_user['statuses_count'] = $profile->noticeCount();
 
         // Is the requesting user following this user?
         $twitter_user['following'] = false;
-        $twitter_user['statusnet:blocking'] = false;
+        $twitter_user['statusnet_blocking'] = false;
         $twitter_user['notifications'] = false;
 
         if (isset($this->auth_user)) {
 
             $twitter_user['following'] = $this->auth_user->isSubscribed($profile);
-            $twitter_user['statusnet:blocking']  = $this->auth_user->hasBlocked($profile);
+            $twitter_user['statusnet_blocking']  = $this->auth_user->hasBlocked($profile);
 
             // Notifications on?
             $sub = Subscription::pkeyGet(array('subscriber' =>
@@ -406,6 +375,7 @@ class ApiAction extends Action
         // StatusNet-specific
 
         $twitter_status['statusnet_html'] = $notice->rendered;
+        $twitter_status['statusnet_conversation_id'] = intval($notice->conversation);
 
         return $twitter_status;
     }
@@ -988,9 +958,9 @@ class ApiAction extends Action
         $to_profile = $message->getTo();
 
         $dmsg['id'] = intval($message->id);
-        $dmsg['sender_id'] = intval($from_profile);
+        $dmsg['sender_id'] = intval($from_profile->id);
         $dmsg['text'] = trim($message->content);
-        $dmsg['recipient_id'] = intval($to_profile);
+        $dmsg['recipient_id'] = intval($to_profile->id);
         $dmsg['created_at'] = $this->dateTwitter($message->created);
         $dmsg['sender_screen_name'] = $from_profile->nickname;
         $dmsg['recipient_screen_name'] = $to_profile->nickname;
diff --git a/lib/apiauth.php b/lib/apiauth.php
index 42d32dd624..1061e6b68c 100644
--- a/lib/apiauth.php
+++ b/lib/apiauth.php
@@ -204,7 +204,12 @@ class ApiAuthAction extends ApiAction
                             }
                         }
                         $this->auth_user = $user;
-                        Event::handle('EndSetApiUser', array($user));
+                        // FIXME: setting the value returned by common_current_user()
+                        // There should probably be a better method for this. common_set_user()
+                        // does lots of session stuff.
+                        global $_cur;
+                        $_cur = $this->auth_user;
+                        Event::handle('EndSetApiUser', array($user)); 
                     }
 
                     $msg = "API OAuth authentication for user '%s' (id: %d) on behalf of " .
diff --git a/lib/apioauth.php b/lib/apioauth.php
index 54cecf92a8..a93811cc0f 100644
--- a/lib/apioauth.php
+++ b/lib/apioauth.php
@@ -31,7 +31,7 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 require_once INSTALLDIR . '/lib/apiaction.php';
-require_once INSTALLDIR . '/lib/apioauthstore.php';
+require_once INSTALLDIR . '/lib/statusnetoauthstore.php';
 
 /**
  * Base action for API OAuth enpoints. Clean up the
diff --git a/lib/applicationeditform.php b/lib/applicationeditform.php
index dda61dbb69..4b4356e721 100644
--- a/lib/applicationeditform.php
+++ b/lib/applicationeditform.php
@@ -350,10 +350,10 @@ class ApplicationEditForm extends Form
         // TRANS: Button label in the "Edit application" form.
         $this->out->submit('cancel', _m('BUTTON','Cancel'), 'submit form_action-primary',
                            // TRANS: Submit button title.
-                           'cancel', _('Cancel'));
+                           'cancel', _('Cancel application changes.'));
         // TRANS: Button label in the "Edit application" form.
         $this->out->submit('save', _m('BUTTON','Save'), 'submit form_action-secondary',
                            // TRANS: Submit button title.
-                           'save', _('Save'));
+                           'save', _('Save application changes.'));
     }
 }
diff --git a/lib/arraywrapper.php b/lib/arraywrapper.php
index f9d3c3cf94..30cb6cfdc7 100644
--- a/lib/arraywrapper.php
+++ b/lib/arraywrapper.php
@@ -48,6 +48,16 @@ class ArrayWrapper
         }
     }
 
+	function fetchAll($k= false, $v = false, $method = false)
+	{
+		if ($k !== false || $v !== false || $method !== false)
+		{
+			$item =& $this->_items[$this->_i];
+			return $item->fetchAll($k, $v, $method);
+		}
+		return $this->_items;
+	}
+	
     function __set($name, $value)
     {
         $item =& $this->_items[$this->_i];
diff --git a/lib/atompubclient.php b/lib/atompubclient.php
new file mode 100644
index 0000000000..a693579eab
--- /dev/null
+++ b/lib/atompubclient.php
@@ -0,0 +1,251 @@
+<?php
+/**
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2011, StatusNet, Inc.
+ *
+ * Client class for AtomPub
+ * 
+ * PHP version 5
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Cache
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2011 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    // This check helps protect against security problems;
+    // your code file can't be executed directly from the web.
+    exit(1);
+}
+
+/**
+ * Client class for AtomPub
+ *
+ * @category  General
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2011 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+
+class AtomPubClient
+{
+    public $url;
+    private $user, $pass;
+
+    /**
+     *
+     * @param string $url collection feed URL
+     * @param string $user auth username
+     * @param string $pass auth password
+     */
+    function __construct($url, $user, $pass)
+    {
+        $this->url = $url;
+        $this->user = $user;
+        $this->pass = $pass;
+    }
+
+    /**
+     * Set up an HTTPClient with auth for our resource.
+     *
+     * @param string $method
+     * @return HTTPClient
+     */
+    private function httpClient($method='GET')
+    {
+        $client = new HTTPClient($this->url);
+        $client->setMethod($method);
+        $client->setAuth($this->user, $this->pass);
+        return $client;
+    }
+
+    function get()
+    {
+        $client = $this->httpClient('GET');
+        $response = $client->send();
+        if ($response->isOk()) {
+            return $response->getBody();
+        } else {
+            throw new Exception("Bogus return code: " . $response->getStatus() . ': ' . $response->getBody());
+        }
+    }
+
+    /**
+     * Create a new resource by POSTing it to the collection.
+     * If successful, will return the URL representing the
+     * canonical location of the new resource. Neat!
+     *
+     * @param string $data
+     * @param string $type defaults to Atom entry
+     * @return string URL to the created resource
+     *
+     * @throws exceptions on failure
+     */
+    function post($data, $type='application/atom+xml;type=entry')
+    {
+        $client = $this->httpClient('POST');
+        $client->setHeader('Content-Type', $type);
+        // optional Slug header not used in this case
+        $client->setBody($data);
+        $response = $client->send();
+
+        if ($response->getStatus() != '201') {
+            throw new Exception("Expected HTTP 201 on POST, got " . $response->getStatus() . ': ' . $response->getBody());
+        }
+        $loc = $response->getHeader('Location');
+        $contentLoc = $response->getHeader('Content-Location');
+
+        if (empty($loc)) {
+            throw new Exception("AtomPub POST response missing Location header.");
+        }
+        if (!empty($contentLoc)) {
+            if ($loc != $contentLoc) {
+                throw new Exception("AtomPub POST response Location and Content-Location headers do not match.");
+            }
+
+            // If Content-Location and Location match, that means the response
+            // body is safe to interpret as the resource itself.
+            if ($type == 'application/atom+xml;type=entry') {
+                self::validateAtomEntry($response->getBody());
+            }
+        }
+
+        return $loc;
+    }
+
+    /**
+     * Note that StatusNet currently doesn't allow PUT editing on notices.
+     *
+     * @param string $data
+     * @param string $type defaults to Atom entry
+     * @return true on success
+     *
+     * @throws exceptions on failure
+     */
+    function put($data, $type='application/atom+xml;type=entry')
+    {
+        $client = $this->httpClient('PUT');
+        $client->setHeader('Content-Type', $type);
+        $client->setBody($data);
+        $response = $client->send();
+
+        if ($response->getStatus() != '200' && $response->getStatus() != '204') {
+            throw new Exception("Expected HTTP 200 or 204 on PUT, got " . $response->getStatus() . ': ' . $response->getBody());
+        }
+
+        return true;
+    }
+
+    /**
+     * Delete the resource.
+     *
+     * @return true on success
+     *
+     * @throws exceptions on failure
+     */
+    function delete()
+    {
+        $client = $this->httpClient('DELETE');
+        $client->setBody($data);
+        $response = $client->send();
+
+        if ($response->getStatus() != '200' && $response->getStatus() != '204') {
+            throw new Exception("Expected HTTP 200 or 204 on DELETE, got " . $response->getStatus() . ': ' . $response->getBody());
+        }
+
+        return true;
+    }
+
+    /**
+     * Ensure that the given string is a parseable Atom entry.
+     *
+     * @param string $str
+     * @return boolean
+     * @throws Exception on invalid input
+     */
+    static function validateAtomEntry($str)
+    {
+        if (empty($str)) {
+            throw new Exception('Bad Atom entry: empty');
+        }
+        $dom = new DOMDocument;
+        if (!$dom->loadXML($str)) {
+            throw new Exception('Bad Atom entry: XML is not well formed.');
+        }
+
+        $activity = new Activity($dom->documentRoot);
+        return true;
+    }
+
+    static function entryEditURL($str) {
+        $dom = new DOMDocument;
+        $dom->loadXML($str);
+        $path = new DOMXPath($dom);
+        $path->registerNamespace('atom', 'http://www.w3.org/2005/Atom');
+
+        $links = $path->query('/atom:entry/atom:link[@rel="edit"]', $dom->documentRoot);
+        if ($links && $links->length) {
+            if ($links->length > 1) {
+                throw new Exception('Bad Atom entry; has multiple rel=edit links.');
+            }
+            $link = $links->item(0);
+            $url = $link->getAttribute('href');
+            return $url;
+        } else {
+            throw new Exception('Atom entry lists no rel=edit link.');
+        }
+    }
+
+    static function entryId($str) {
+        $dom = new DOMDocument;
+        $dom->loadXML($str);
+        $path = new DOMXPath($dom);
+        $path->registerNamespace('atom', 'http://www.w3.org/2005/Atom');
+
+        $links = $path->query('/atom:entry/atom:id', $dom->documentRoot);
+        if ($links && $links->length) {
+            if ($links->length > 1) {
+                throw new Exception('Bad Atom entry; has multiple id entries.');
+            }
+            $link = $links->item(0);
+            $url = $link->textContent;
+            return $url;
+        } else {
+            throw new Exception('Atom entry lists no id.');
+        }
+    }
+
+    static function getEntryInFeed($str, $id)
+    {
+        $dom = new DOMDocument;
+        $dom->loadXML($str);
+        $path = new DOMXPath($dom);
+        $path->registerNamespace('atom', 'http://www.w3.org/2005/Atom');
+
+        $query = '/atom:feed/atom:entry[atom:id="'.$id.'"]';
+        $items = $path->query($query, $dom->documentRoot);
+        if ($items && $items->length) {
+            return $items->item(0);
+        } else {
+            return null;
+        }
+    }
+}
diff --git a/lib/attachmentlist.php b/lib/attachmentlist.php
index cf7c9acc14..a93a6842bb 100644
--- a/lib/attachmentlist.php
+++ b/lib/attachmentlist.php
@@ -76,7 +76,7 @@ class AttachmentList extends Widget
      */
     function show()
     {
-        $att = File::getAttachments($this->notice->id);
+    	$att = $this->notice->attachments();
         if (empty($att)) return 0;
         $this->showListStart();
 
diff --git a/lib/attachmentnoticesection.php b/lib/attachmentnoticesection.php
index 25e64adf9e..b59568749c 100644
--- a/lib/attachmentnoticesection.php
+++ b/lib/attachmentnoticesection.php
@@ -52,9 +52,10 @@ class AttachmentNoticeSection extends NoticeSection
     function getNotices()
     {
         $notice = new Notice;
-        $f2p = new File_to_post;
-        $f2p->file_id = $this->out->attachment->id;
-        $notice->joinAdd($f2p);
+
+        $notice->joinAdd(array('id', 'file_to_post:post_id'));
+        $notice->whereAdd(sprintf('file_to_post.file_id = %d', $this->out->attachment->id));
+
         $notice->orderBy('created desc');
         $notice->selectAdd('post_id as id');
         $notice->find();
diff --git a/lib/cache.php b/lib/cache.php
index eb4eb66656..59110f74d8 100644
--- a/lib/cache.php
+++ b/lib/cache.php
@@ -43,11 +43,23 @@
  */
 class Cache
 {
-    var $_items   = array();
+    /**
+     * @var array additional in-process cache for web requests;
+     *      disabled on CLI, unsafe for long-running daemons
+     */
+    var $_items = array();
+    var $_inlineCache = true;
     static $_inst = null;
 
     const COMPRESSED = 1;
 
+    private function __construct() {
+        // Potentially long-running daemons or maintenance scripts
+        // should not use an in-process cache as it becomes out of
+        // date.
+        $this->_inlineCache = (php_sapi_name() != 'cli');
+    }
+
     /**
      * Singleton constructor
      *
@@ -166,7 +178,7 @@ class Cache
 
         common_perf_counter('Cache::get', $key);
         if (Event::handle('StartCacheGet', array(&$key, &$value))) {
-            if (array_key_exists($key, $this->_items)) {
+            if ($this->_inlineCache && array_key_exists($key, $this->_items)) {
                 $value = unserialize($this->_items[$key]);
             }
             Event::handle('EndCacheGet', array($key, &$value));
@@ -193,7 +205,9 @@ class Cache
         if (Event::handle('StartCacheSet', array(&$key, &$value, &$flag,
                                                  &$expiry, &$success))) {
 
-            $this->_items[$key] = serialize($value);
+            if ($this->_inlineCache) {
+                $this->_items[$key] = serialize($value);
+            }
 
             $success = true;
 
@@ -244,7 +258,7 @@ class Cache
 
         common_perf_counter('Cache::delete', $key);
         if (Event::handle('StartCacheDelete', array(&$key, &$success))) {
-            if (array_key_exists($key, $this->_items)) {
+            if ($this->_inlineCache && array_key_exists($key, $this->_items)) {
                 unset($this->_items[$key]);
             }
             $success = true;
diff --git a/lib/cachingnoticestream.php b/lib/cachingnoticestream.php
index f8ab2a85af..e68bb3a1f2 100644
--- a/lib/cachingnoticestream.php
+++ b/lib/cachingnoticestream.php
@@ -51,11 +51,13 @@ class CachingNoticeStream extends NoticeStream
 
     public $stream   = null;
     public $cachekey = null;
+    public $useLast  = true;
 
-    function __construct($stream, $cachekey)
+    function __construct($stream, $cachekey, $useLast = true)
     {
         $this->stream   = $stream;
         $this->cachekey = $cachekey;
+        $this->useLast  = $useLast;
     }
 
     function getNoticeIds($offset, $limit, $sinceId, $maxId)
@@ -85,29 +87,31 @@ class CachingNoticeStream extends NoticeStream
             return $ids;
         }
 
-        // Check the cache to see if we have a "last-known-good" version.
-        // The actual cache gets blown away when new notices are added, but
-        // the "last" value holds a lot of info. We might need to only generate
-        // a few at the "tip", which can bound our queries and save lots
-        // of time.
+        if ($this->useLast) {
+            // Check the cache to see if we have a "last-known-good" version.
+            // The actual cache gets blown away when new notices are added, but
+            // the "last" value holds a lot of info. We might need to only generate
+            // a few at the "tip", which can bound our queries and save lots
+            // of time.
 
-        $laststr = $cache->get($idkey.';last');
+            $laststr = $cache->get($idkey.';last');
 
-        if ($laststr !== false) {
-            $window = explode(',', $laststr);
-            $last_id = $window[0];
-            $new_ids = $this->stream->getNoticeIds(0, self::CACHE_WINDOW, $last_id, 0);
+            if ($laststr !== false) {
+                $window = explode(',', $laststr);
+                $last_id = $window[0];
+                $new_ids = $this->stream->getNoticeIds(0, self::CACHE_WINDOW, $last_id, 0);
 
-            $new_window = array_merge($new_ids, $window);
+                $new_window = array_merge($new_ids, $window);
 
-            $new_windowstr = implode(',', $new_window);
+                $new_windowstr = implode(',', $new_window);
 
-            $result = $cache->set($idkey, $new_windowstr);
-            $result = $cache->set($idkey . ';last', $new_windowstr);
+                $result = $cache->set($idkey, $new_windowstr);
+                $result = $cache->set($idkey . ';last', $new_windowstr);
 
-            $ids = array_slice($new_window, $offset, $limit);
+                $ids = array_slice($new_window, $offset, $limit);
 
-            return $ids;
+                return $ids;
+            }
         }
 
         // No cache hits :( Generate directly and stick the results
@@ -118,7 +122,10 @@ class CachingNoticeStream extends NoticeStream
         $windowstr = implode(',', $window);
 
         $result = $cache->set($idkey, $windowstr);
-        $result = $cache->set($idkey . ';last', $windowstr);
+
+        if ($this->useLast) {
+            $result = $cache->set($idkey . ';last', $windowstr);
+        }
 
         // Return just the slice that was requested
 
diff --git a/lib/command.php b/lib/command.php
index fcc21cc5e5..f51cbbb5f7 100644
--- a/lib/command.php
+++ b/lib/command.php
@@ -629,7 +629,7 @@ class MessageCommand extends Command
             return;
         } else if ($this->user->id == $other->id) {
             // TRANS: Error text shown when trying to send a direct message to self.
-            $channel->error($this->user, _('Don\'t send a message to yourself; just say it to yourself quietly instead.'));
+            $channel->error($this->user, _('Do not send a message to yourself; just say it to yourself quietly instead.'));
             return;
         }
         $message = Message::saveNew($this->user->id, $other->id, $this->text, $channel->source());
diff --git a/lib/conversationnoticestream.php b/lib/conversationnoticestream.php
index 66075db84f..c43b5deb24 100644
--- a/lib/conversationnoticestream.php
+++ b/lib/conversationnoticestream.php
@@ -20,7 +20,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
- * @category  Cache
+ * @category  NoticeStream
  * @package   StatusNet
  * @author    Evan Prodromou <evan@status.net>
  * @copyright 2011 StatusNet, Inc.
@@ -52,8 +52,7 @@ class ConversationNoticeStream extends ScopingNoticeStream
             $profile = Profile::current();
         }
 
-        parent::__construct(new CachingNoticeStream(new RawConversationNoticeStream($id),
-                                                    'notice:conversation_ids:'.$id),
+        parent::__construct(new RawConversationNoticeStream($id),
                             $profile);
     }
 }
@@ -77,32 +76,35 @@ class RawConversationNoticeStream extends NoticeStream
         $this->id = $id;
     }
 
+    function getNotices($offset, $limit, $sinceId = null, $maxId = null)
+    {
+        $all = Memcached_DataObject::listGet('Notice', 'conversation', array($this->id));
+        $notices = $all[$this->id];
+        // Re-order in reverse-chron
+        usort($notices, array('RawConversationNoticeStream', '_reverseChron'));
+        // FIXME: handle since and max
+        $wanted = array_slice($notices, $offset, $limit);
+        return new ArrayWrapper($wanted);
+    }
+
     function getNoticeIds($offset, $limit, $since_id, $max_id)
     {
-        $notice = new Notice();
-
-        $notice->selectAdd(); // clears it
-        $notice->selectAdd('id');
-
-        $notice->conversation = $this->id;
-
-        $notice->orderBy('created DESC, id DESC');
-
-        if (!is_null($offset)) {
-            $notice->limit($offset, $limit);
-        }
-
-        Notice::addWhereSinceId($notice, $since_id);
-        Notice::addWhereMaxId($notice, $max_id);
-
-        $ids = array();
-
-        if ($notice->find()) {
-            while ($notice->fetch()) {
-                $ids[] = $notice->id;
-            }
-        }
-
+        $notice = $this->getNotices($offset, $limit, $since_id, $max_id);
+        $ids = $notice->fetchAll('id');
         return $ids;
     }
-}
\ No newline at end of file
+
+    function _reverseChron($a, $b)
+    {
+        $at = strtotime($a->created);
+        $bt = strtotime($b->created);
+        
+        if ($at == $bt) {
+            return 0;
+        } else if ($at > $bt) {
+            return -1;
+        } else {
+            return 1;
+        }
+    }
+}
diff --git a/lib/conversationtree.php b/lib/conversationtree.php
new file mode 100644
index 0000000000..ee24310fa1
--- /dev/null
+++ b/lib/conversationtree.php
@@ -0,0 +1,215 @@
+<?php
+/**
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2011, StatusNet, Inc.
+ *
+ * Conversation tree widget for oooooold school playas
+ * 
+ * PHP version 5
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Widget
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2011 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    // This check helps protect against security problems;
+    // your code file can't be executed directly from the web.
+    exit(1);
+}
+
+/**
+ * Conversation tree
+ *
+ * The widget class for displaying a hierarchical list of notices.
+ *
+ * @category Widget
+ * @package  StatusNet
+ * @author   Evan Prodromou <evan@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
+ * @link     http://status.net/
+ */
+class ConversationTree extends NoticeList
+{
+    var $tree  = null;
+    var $table = null;
+
+    /**
+     * Show the tree of notices
+     *
+     * @return void
+     */
+    function show()
+    {
+        $cnt = $this->_buildTree();
+
+        $this->out->elementStart('div', array('id' =>'notices_primary'));
+        // TRANS: Header on conversation page. Hidden by default (h2).
+        $this->out->element('h2', null, _('Notices'));
+        $this->out->elementStart('ol', array('class' => 'notices xoxo old-school'));
+
+        if (array_key_exists('root', $this->tree)) {
+            $rootid = $this->tree['root'][0];
+            $this->showNoticePlus($rootid);
+        }
+
+        $this->out->elementEnd('ol');
+        $this->out->elementEnd('div');
+
+        return $cnt;
+    }
+
+    function _buildTree()
+    {
+        $cnt = 0;
+
+        $this->tree  = array();
+        $this->table = array();
+
+        while ($this->notice->fetch()) {
+
+            $cnt++;
+
+            $id     = $this->notice->id;
+            $notice = clone($this->notice);
+
+            $this->table[$id] = $notice;
+
+            if (is_null($notice->reply_to)) {
+                $this->tree['root'] = array($notice->id);
+            } else if (array_key_exists($notice->reply_to, $this->tree)) {
+                $this->tree[$notice->reply_to][] = $notice->id;
+            } else {
+                $this->tree[$notice->reply_to] = array($notice->id);
+            }
+        }
+
+        return $cnt;
+    }
+
+    /**
+     * Shows a notice plus its list of children.
+     *
+     * @param integer $id ID of the notice to show
+     *
+     * @return void
+     */
+    function showNoticePlus($id)
+    {
+        $notice = $this->table[$id];
+
+        $this->out->elementStart('li', array('class' => 'hentry notice',
+                                             'id' => 'notice-' . $id));
+
+        $item = $this->newListItem($notice);
+        $item->show();
+
+        if (array_key_exists($id, $this->tree)) {
+            $children = $this->tree[$id];
+
+            $this->out->elementStart('ol', array('class' => 'notices'));
+
+            sort($children);
+
+            foreach ($children as $child) {
+                $this->showNoticePlus($child);
+            }
+
+            $this->out->elementEnd('ol');
+        }
+
+        $this->out->elementEnd('li');
+    }
+
+    /**
+     * Override parent class to return our preferred item.
+     *
+     * @param Notice $notice Notice to display
+     *
+     * @return NoticeListItem a list item to show
+     */
+    function newListItem($notice)
+    {
+        return new ConversationTreeItem($notice, $this->out);
+    }
+}
+
+/**
+ * Conversation tree list item
+ *
+ * Special class of NoticeListItem for use inside conversation trees.
+ *
+ * @category Widget
+ * @package  StatusNet
+ * @author   Evan Prodromou <evan@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
+ * @link     http://status.net/
+ */
+class ConversationTreeItem extends NoticeListItem
+{
+    /**
+     * start a single notice.
+     *
+     * The default creates the <li>; we skip, since the ConversationTree
+     * takes care of that.
+     *
+     * @return void
+     */
+    function showStart()
+    {
+        return;
+    }
+
+    /**
+     * finish the notice
+     *
+     * The default closes the <li>; we skip, since the ConversationTree
+     * takes care of that.
+     *
+     * @return void
+     */
+    function showEnd()
+    {
+        return;
+    }
+
+    /**
+     * show link to notice conversation page
+     *
+     * Since we're only used on the conversation page, we skip this
+     *
+     * @return void
+     */
+    function showContext()
+    {
+        return;
+    }
+
+    /**
+     * show people this notice is in reply to
+     *
+     * Tree context shows this, so we skip it.
+     *
+     * @return void
+     */
+    function showAddressees()
+    {
+        return;
+    }
+}
diff --git a/lib/currentuserdesignaction.php b/lib/currentuserdesignaction.php
deleted file mode 100644
index e84c777685..0000000000
--- a/lib/currentuserdesignaction.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php
-/**
- * StatusNet, the distributed open-source microblogging tool
- *
- * Base class for actions that use the current user's design
- *
- * PHP version 5
- *
- * LICENCE: This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * @category  Action
- * @package   StatusNet
- * @author    Evan Prodromou <evan@status.net>
- * @copyright 2009-2010 StatusNet, Inc.
- * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://status.net/
- */
-
-if (!defined('STATUSNET') && !defined('LACONICA')) {
-    exit(1);
-}
-
-/**
- * Base class for actions that use the current user's design
- *
- * Some pages (settings in particular) use the current user's chosen
- * design. This superclass returns that design.
- *
- * @category Action
- * @package  StatusNet
- * @author   Evan Prodromou <evan@status.net>
- * @author   Zach Copley    <zach@status.net>
- * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://status.net/
- *
- */
-class CurrentUserDesignAction extends Action
-{
-
-    protected $cur = null; // The current user
-
-    /**
-     * For initializing members of the class. Set a the
-     * current user here.
-     *
-     * @param array $argarray misc. arguments
-     *
-     * @return boolean true
-     */
-    function prepare($argarray)
-    {
-        parent::prepare($argarray);
-
-        $this->cur = common_current_user();
-
-	return true;
-    }
-
-    /**
-     * A design for this action
-     *
-     * Returns the design preferences for the current user.
-     *
-     * @return Design a design object to use
-     */
-    function getDesign()
-    {
-        if (!empty($this->cur)) {
-
-            $design = $this->cur->getDesign();
-
-            if (!empty($design)) {
-                return $design;
-            }
-        }
-
-        return parent::getDesign();
-    }
-
-    function getCurrentUser()
-    {
-	return $this->cur;
-    }
-}
-
diff --git a/lib/default.php b/lib/default.php
index cdd8e5460d..82ffe80a5d 100644
--- a/lib/default.php
+++ b/lib/default.php
@@ -58,7 +58,7 @@ $default =
               'sslserver' => null,
               'shorturllength' => 30,
               'dupelimit' => 60, // default for same person saying the same thing
-              'textlimit' => 140,
+              'textlimit' => 0, // in chars; 0 == no limit
               'indent' => true,
               'use_x_sendfile' => false,
               'notice' => null, // site wide notice text
@@ -66,7 +66,7 @@ $default =
               'minify' => true, // true to use the minified versions of JS files; false to use orig files. Can aid during development
               ),
         'db' =>
-        array('database' => 'YOU HAVE TO SET THIS IN config.php',
+          array('database' => null, // must be set
               'schema_location' => INSTALLDIR . '/classes',
               'class_location' => INSTALLDIR . '/classes',
               'require_prefix' => 'classes/',
@@ -277,7 +277,7 @@ $default =
               'allow_tagging' => array('all' => true), // equivalent to array('local' => true, 'remote' => true)
               'desclimit' => null),
         'oembed' =>
-        array('endpoint' => 'http://oohembed.com/oohembed/',
+        array('endpoint' => 'https://noembed.com/embed/',
               'order' => array('built-in', 'well-known', 'service', 'discovery'),
         ),
         'search' =>
@@ -286,20 +286,10 @@ $default =
         array('handle' => false,   // whether to handle sessions ourselves
               'debug' => false,    // debugging output for sessions
               'gc_limit' => 1000), // max sessions to expire at a time
-        'design' =>
-        array('backgroundcolor' => null, // null -> 'use theme default'
-              'contentcolor' => null,
-              'sidebarcolor' => null,
-              'textcolor' => null,
-              'linkcolor' => null,
-              'backgroundimage' => null,
-              'disposition' => null),
-        'custom_css' =>
-        array('enabled' => true,
-              'css' => ''),
         'notice' =>
         array('contentlimit' => null,
-              'defaultscope' => 0), // set to 0 for default open
+              'defaultscope' => null, // null means 1 if site/private, 0 otherwise
+              'hidespam' => false), // Whether to hide silenced users from timelines
         'message' =>
         array('contentlimit' => null),
         'location' =>
@@ -321,7 +311,8 @@ $default =
                                  'TagSub' => null,
                                  'OpenID' => null,
                                  'Directory' => null,
-                                 'ExtendedProfile' => null),
+                                 'ExtendedProfile' => null,
+                                 'Activity' => null),
               'locale_path' => false, // Set to a path to use *instead of* each plugin's own locale subdirectories
               'server' => null,
               'sslserver' => null,
@@ -330,7 +321,7 @@ $default =
               ),
         'pluginlist' => array(),
         'admin' =>
-        array('panels' => array('design', 'site', 'user', 'paths', 'access', 'sessions', 'sitenotice', 'license', 'plugins')),
+        array('panels' => array('site', 'user', 'paths', 'access', 'sessions', 'sitenotice', 'license', 'plugins')),
         'singleuser' =>
         array('enabled' => false,
               'nickname' => null),
@@ -360,4 +351,7 @@ $default =
               ),
         'router' =>
         array('cache' => true), // whether to cache the router object. Defaults to true, turn off for devel
+        'discovery' =>
+          array('cors' => false), // Allow Cross-Origin Resource Sharing for service discovery (host-meta, XRD, etc.)
+        'performance' => array('high' => false) // disable some features for higher performance; default false
     );
diff --git a/lib/defaultprofileblock.php b/lib/defaultprofileblock.php
index b8af14ac21..78c7c4a118 100644
--- a/lib/defaultprofileblock.php
+++ b/lib/defaultprofileblock.php
@@ -86,4 +86,9 @@ class DefaultProfileBlock extends AccountProfileBlock
     {
         return null;
     }
+
+    function otherProfiles()
+    {
+        return array();
+    }
 }
\ No newline at end of file
diff --git a/lib/designform.php b/lib/designform.php
deleted file mode 100644
index a584b61adb..0000000000
--- a/lib/designform.php
+++ /dev/null
@@ -1,319 +0,0 @@
-<?php
-/**
- * StatusNet, the distributed open-source microblogging tool
- *
- * Form for choosing a design
- *
- * PHP version 5
- *
- * LICENCE: This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * @category  Form
- * @package   StatusNet
- * @author    Evan Prodromou <evan@status.net>
- * @author    Sarven Capadisli <csarven@status.net>
- * @copyright 2009 StatusNet, Inc.
- * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://status.net/
- */
-
-if (!defined('STATUSNET') && !defined('LACONICA')) {
-    exit(1);
-}
-
-/**
- * Form for choosing a design
- *
- * Used for choosing a site design, user design, or group design.
- *
- * @category Form
- * @package  StatusNet
- * @author   Evan Prodromou <evan@status.net>
- * @author   Sarven Capadisli <csarven@status.net>
- * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://status.net/
- *
- */
-class DesignForm extends Form
-{
-    /**
-     * Return-to args
-     */
-
-    var $design     = null;
-    var $actionurl  = null;
-
-    /**
-     * Constructor
-     *
-     * @param HTMLOutputter $out       output channel
-     * @param Design        $design    initial design
-     * @param Design        $actionurl url of action (for form posting)
-     */
-    function __construct($out, $design, $actionurl)
-    {
-        parent::__construct($out);
-
-        $this->design     = $design;
-        $this->actionurl = $actionurl;
-    }
-
-    /**
-     * ID of the form
-     *
-     * @return int ID of the form
-     */
-    function id()
-    {
-        return 'design';
-    }
-
-    /**
-     * class of the form
-     *
-     * @return string class of the form
-     */
-    function formClass()
-    {
-        return 'form_design';
-    }
-
-    /**
-     * Action of the form
-     *
-     * @return string URL of the action
-     */
-    function action()
-    {
-        return $this->actionurl;
-    }
-
-    /**
-     * Legend of the Form
-     *
-     * @return void
-     */
-    function formLegend()
-    {
-        // TRANS: Form legend of form for changing the page design.
-        $this->out->element('legend', null, _('Change design'));
-    }
-
-    /**
-     * Data elements of the form
-     *
-     * @return void
-     */
-    function formData()
-    {
-        $this->backgroundData();
-
-        $this->out->elementEnd('fieldset');
-
-        $this->out->elementStart('fieldset', array('id' => 'settings_design_color'));
-        // TRANS: Fieldset legend on profile design page to change profile page colours.
-        $this->out->element('legend', null, _('Change colours'));
-        $this->colourData();
-        $this->out->elementEnd('fieldset');
-
-        $this->out->elementStart('fieldset');
-
-        // TRANS: Button text on profile design page to immediately reset all colour settings to default.
-        $this->out->submit('defaults', _('Use defaults'), 'submit form_action-default',
-                           // TRANS: Title for button on profile design page to reset all colour settings to default.
-                           'defaults', _('Restore default designs.'));
-
-        $this->out->element('input', array('id' => 'settings_design_reset',
-                                           'type' => 'reset',
-                                           // TRANS: Button text on profile design page to reset all colour settings to default without saving.
-                                           'value' => _m('BUTTON', 'Reset'),
-                                           'class' => 'submit form_action-primary',
-                                           // TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-                                           'title' => _('Reset back to default.')));
-    }
-
-    function backgroundData()
-    {
-        $this->out->elementStart('ul', 'form_data');
-        $this->out->elementStart('li');
-        $this->out->element('label', array('for' => 'design_background-image_file'),
-                            // TRANS: Label in form on profile design page.
-                            // TRANS: Field contains file name on user's computer that could be that user's custom profile background image.
-                            _('Upload file'));
-        $this->out->element('input', array('name' => 'design_background-image_file',
-                                           'type' => 'file',
-                                           'id' => 'design_background-image_file'));
-        // TRANS: Instructions for form on profile design page.
-        $this->out->element('p', 'form_guide', _('You can upload your personal ' .
-                                                 'background image. The maximum file size is 2MB.'));
-        $this->out->element('input', array('name' => 'MAX_FILE_SIZE',
-                                           'type' => 'hidden',
-                                           'id' => 'MAX_FILE_SIZE',
-                                           'value' => ImageFile::maxFileSizeInt()));
-        $this->out->elementEnd('li');
-
-        if (!empty($this->design->backgroundimage)) {
-
-            $this->out->elementStart('li', array('id' =>
-                                                 'design_background-image_onoff'));
-
-            $this->out->element('img', array('src' =>
-                                             Design::url($this->design->backgroundimage)));
-
-            $attrs = array('name' => 'design_background-image_onoff',
-                           'type' => 'radio',
-                           'id' => 'design_background-image_on',
-                           'class' => 'radio',
-                           'value' => 'on');
-
-            if ($this->design->disposition & BACKGROUND_ON) {
-                $attrs['checked'] = 'checked';
-            }
-
-            $this->out->element('input', $attrs);
-
-            $this->out->element('label', array('for' => 'design_background-image_on',
-                                               'class' => 'radio'),
-                                // TRANS: Radio button on profile design page that will enable use of the uploaded profile image.
-                                _m('RADIO', 'On'));
-
-            $attrs = array('name' => 'design_background-image_onoff',
-                           'type' => 'radio',
-                           'id' => 'design_background-image_off',
-                           'class' => 'radio',
-                           'value' => 'off');
-
-            if ($this->design->disposition & BACKGROUND_OFF) {
-                $attrs['checked'] = 'checked';
-            }
-
-            $this->out->element('input', $attrs);
-
-            $this->out->element('label', array('for' => 'design_background-image_off',
-                                               'class' => 'radio'),
-                                // TRANS: Radio button on profile design page that will disable use of the uploaded profile image.
-                                _m('RADIO', 'Off'));
-            // TRANS: Form guide for a set of radio buttons on the profile design page that will enable or disable
-            // TRANS: use of the uploaded profile image.
-            $this->out->element('p', 'form_guide', _('Turn background image on or off.'));
-            $this->out->elementEnd('li');
-
-            $this->out->elementStart('li');
-            $this->out->checkbox('design_background-image_repeat',
-                                 // TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
-                                 _('Tile background image'),
-                                 ($this->design->disposition & BACKGROUND_TILE) ? true : false);
-            $this->out->elementEnd('li');
-        }
-
-        $this->out->elementEnd('ul');
-    }
-
-    function colourData()
-    {
-        $this->out->elementStart('ul', 'form_data');
-
-        try {
-
-            $bgcolor = new WebColor($this->design->backgroundcolor);
-
-            $this->out->elementStart('li');
-            // TRANS: Label on profile design page for setting a profile page background colour.
-            $this->out->element('label', array('for' => 'swatch-1'), _('Background'));
-            $this->out->element('input', array('name' => 'design_background',
-                                               'type' => 'text',
-                                               'id' => 'swatch-1',
-                                               'class' => 'swatch',
-                                               'maxlength' => '7',
-                                               'size' => '7',
-                                               'value' => ''));
-            $this->out->elementEnd('li');
-
-            $ccolor = new WebColor($this->design->contentcolor);
-
-            $this->out->elementStart('li');
-            // TRANS: Label on profile design page for setting a profile page content colour.
-            $this->out->element('label', array('for' => 'swatch-2'), _('Content'));
-            $this->out->element('input', array('name' => 'design_content',
-                                               'type' => 'text',
-                                               'id' => 'swatch-2',
-                                               'class' => 'swatch',
-                                               'maxlength' => '7',
-                                               'size' => '7',
-                                               'value' => ''));
-            $this->out->elementEnd('li');
-
-            $sbcolor = new WebColor($this->design->sidebarcolor);
-
-            $this->out->elementStart('li');
-            // TRANS: Label on profile design page for setting a profile page sidebar colour.
-            $this->out->element('label', array('for' => 'swatch-3'), _('Sidebar'));
-            $this->out->element('input', array('name' => 'design_sidebar',
-                                               'type' => 'text',
-                                               'id' => 'swatch-3',
-                                               'class' => 'swatch',
-                                               'maxlength' => '7',
-                                               'size' => '7',
-                                               'value' => ''));
-            $this->out->elementEnd('li');
-
-            $tcolor = new WebColor($this->design->textcolor);
-
-            $this->out->elementStart('li');
-            // TRANS: Label on profile design page for setting a profile page text colour.
-            $this->out->element('label', array('for' => 'swatch-4'), _('Text'));
-            $this->out->element('input', array('name' => 'design_text',
-                                               'type' => 'text',
-                                               'id' => 'swatch-4',
-                                               'class' => 'swatch',
-                                               'maxlength' => '7',
-                                               'size' => '7',
-                                               'value' => ''));
-            $this->out->elementEnd('li');
-
-            $lcolor = new WebColor($this->design->linkcolor);
-
-            $this->out->elementStart('li');
-            // TRANS: Label on profile design page for setting a profile page links colour.
-            $this->out->element('label', array('for' => 'swatch-5'), _('Links'));
-            $this->out->element('input', array('name' => 'design_links',
-                                               'type' => 'text',
-                                               'id' => 'swatch-5',
-                                               'class' => 'swatch',
-                                               'maxlength' => '7',
-                                               'size' => '7',
-                                               'value' => ''));
-            $this->out->elementEnd('li');
-
-        } catch (WebColorException $e) {
-            common_log(LOG_ERR, 'Bad color values in design ID: ' .$this->design->id);
-        }
-
-        $this->out->elementEnd('ul');
-    }
-
-    /**
-     * Action elements
-     *
-     * @return void
-     */
-
-    function formActions()
-    {
-        // TRANS: Button text on profile design page to save settings.
-        $this->out->submit('save', _m('BUTTON','Save'), 'submit form_action-secondary',
-                           // TRANS: Title for button on profile design page to save settings.
-                           'save', _('Save design.'));
-    }
-}
diff --git a/lib/designsettings.php b/lib/designsettings.php
deleted file mode 100644
index cb65ca14cb..0000000000
--- a/lib/designsettings.php
+++ /dev/null
@@ -1,247 +0,0 @@
-<?php
-/**
- * StatusNet, the distributed open-source microblogging tool
- *
- * Change user password
- *
- * PHP version 5
- *
- * LICENCE: This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * @category  Settings
- * @package   StatusNet
- * @author    Sarven Capadisli <csarven@status.net>
- * @author    Zach Copley <zach@status.net>
- * @copyright 2008-2009 StatusNet, Inc.
- * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://status.net/
- */
-
-if (!defined('STATUSNET') && !defined('LACONICA')) {
-    exit(1);
-}
-
-/**
- * Base class for setting a user or group design
- *
- * Shows the design setting form and also handles some things like saving
- * background images, and fetching a default design
- *
- * @category Settings
- * @package  StatusNet
- * @author   Zach Copley <zach@status.net>
- * @author   Sarven Capadisli <csarven@status.net>
- * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://status.net/
- */
-
-class DesignSettingsAction extends SettingsAction
-{
-    var $submitaction = null;
-
-    /**
-     * Title of the page
-     *
-     * @return string Title of the page
-     */
-    function title()
-    {
-        // TRANS: Page title for profile design page.
-        return _('Profile design');
-    }
-
-    /**
-     * Instructions for use
-     *
-     * @return instructions for use
-     */
-    function getInstructions()
-    {
-        // TRANS: Instructions for profile design page.
-        return _('Customize the way your profile looks ' .
-        'with a background image and a colour palette of your choice.');
-    }
-
-    /**
-     * Shows the design settings form
-     *
-     * @param Design $design a working design to show
-     *
-     * @return nothing
-     */
-    function showDesignForm($design)
-    {
-        $form = new DesignForm($this, $design, $this->selfUrl());
-        $form->show();
-
-    }
-
-    /**
-     * Handle a post
-     *
-     * Validate input and save changes. Reload the form with a success
-     * or error message.
-     *
-     * @return void
-     */
-    function handlePost()
-    {
-        if ($_SERVER['REQUEST_METHOD'] == 'POST') {
-
-            // Workaround for PHP returning empty $_POST and $_FILES when POST
-            // length > post_max_size in php.ini
-
-            if (empty($_FILES)
-                && empty($_POST)
-                && ($_SERVER['CONTENT_LENGTH'] > 0)
-            ) {
-                // TRANS: Form validation error in design settings form. POST should remain untranslated.
-                $msg = _m('The server was unable to handle that much POST data (%s byte) due to its current configuration.',
-                          'The server was unable to handle that much POST data (%s bytes) due to its current configuration.',
-                          intval($_SERVER['CONTENT_LENGTH']));
-
-                $this->showForm(sprintf($msg, $_SERVER['CONTENT_LENGTH']));
-                return;
-            }
-        }
-
-        // CSRF protection
-        $token = $this->trimmed('token');
-        if (!$token || $token != common_session_token()) {
-            // TRANS: Client error displayed when the session token does not match or is not given.
-            $this->showForm(_('There was a problem with your session token. '.
-                              'Try again, please.'));
-            return;
-        }
-
-        if ($this->arg('save')) {
-            $this->saveDesign();
-        } else if ($this->arg('defaults')) {
-            $this->restoreDefaults();
-        } else {
-            // TRANS: Unknown form validation error in design settings form.
-            $this->showForm(_('Unexpected form submission.'));
-        }
-    }
-
-    /**
-     * Add the Farbtastic stylesheet
-     *
-     * @return void
-     */
-    function showStylesheets()
-    {
-        parent::showStylesheets();
-        $this->cssLink('js/farbtastic/farbtastic.css',null,'screen, projection, tv');
-    }
-
-    /**
-     * Add the Farbtastic scripts
-     *
-     * @return void
-     */
-    function showScripts()
-    {
-        parent::showScripts();
-
-        $this->script('farbtastic/farbtastic.js');
-        $this->script('userdesign.go.js');
-
-        $this->autofocus('design_background-image_file');
-    }
-
-    /**
-     * Save the background image, if any, and set its disposition
-     *
-     * @param Design $design a working design to attach the img to
-     *
-     * @return nothing
-     */
-    function saveBackgroundImage($design)
-    {
-        // Now that we have a Design ID we can add a file to the design.
-        // XXX: This is an additional DB hit, but figured having the image
-        // associated with the Design rather than the User was worth
-        // it. -- Zach
-
-        if (array_key_exists('design_background-image_file', $_FILES) &&
-          $_FILES['design_background-image_file']['error'] == UPLOAD_ERR_OK) {
-
-            $filepath = null;
-
-            try {
-                $imagefile = ImageFile::fromUpload('design_background-image_file');
-            } catch (Exception $e) {
-                $this->showForm($e->getMessage());
-                return;
-            }
-
-            $filename = Design::filename($design->id,
-                                         image_type_to_extension($imagefile->type),
-                                         common_timestamp());
-
-            $filepath = Design::path($filename);
-
-            move_uploaded_file($imagefile->filepath, $filepath);
-
-            // delete any old backround img laying around
-
-            if (isset($design->backgroundimage)) {
-                @unlink(Design::path($design->backgroundimage));
-            }
-
-            $original = clone($design);
-
-            $design->backgroundimage = $filename;
-
-            // default to on, no tile
-
-            $design->setDisposition(true, false, false);
-
-            $result = $design->update($original);
-
-            if ($result === false) {
-                common_log_db_error($design, 'UPDATE', __FILE__);
-                // TRANS: Error message displayed if design settings could not be saved.
-                $this->showForm(_('Could not update your design.'));
-                return;
-            }
-        }
-    }
-
-    /**
-     * Restore the user or group design to system defaults
-     *
-     * @return nothing
-     */
-    function restoreDefaults()
-    {
-        $design = $this->getWorkingDesign();
-
-        if (!empty($design)) {
-
-            $result = $design->delete();
-
-            if ($result === false) {
-                common_log_db_error($design, 'DELETE', __FILE__);
-                // TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
-                $this->showForm(_('Could not update your design.'));
-                return;
-            }
-        }
-
-        // TRANS: Success message displayed if design settings were saved after clicking "Use defaults".
-        $this->showForm(_('Design defaults restored.'), true);
-    }
-}
diff --git a/lib/discovery.php b/lib/discovery.php
index 70638cf243..1430227c5f 100644
--- a/lib/discovery.php
+++ b/lib/discovery.php
@@ -279,10 +279,6 @@ class Discovery_LRDD_Host_Meta implements Discovery_LRDD
         $xrd = Discovery::fetchXrd($url);
 
         if ($xrd) {
-            if ($xrd->host != $domain) {
-                return false;
-            }
-
             return $xrd->links;
         }
     }
diff --git a/lib/disfavorform.php b/lib/disfavorform.php
index 9d0e39784e..9754dfc83b 100644
--- a/lib/disfavorform.php
+++ b/lib/disfavorform.php
@@ -136,8 +136,8 @@ class DisfavorForm extends Form
                            _m('BUTTON','Disfavor favorite'),
                            'submit',
                            null,
-                           // TRANS: Title for button text for removing the favourite status for a favourite notice.
-                           _('Disfavor this notice'));
+                           // TRANS: Button title for removing the favourite status for a favourite notice.
+                           _('Remove this notice from your list of favorite notices.'));
     }
 
     /**
diff --git a/lib/favorform.php b/lib/favorform.php
index c07ba6df59..eab5ba6e9c 100644
--- a/lib/favorform.php
+++ b/lib/favorform.php
@@ -135,8 +135,8 @@ class FavorForm extends Form
                            _m('BUTTON','Favor'),
                            'submit',
                            null,
-                           // TRANS: Title for button text for adding the favourite status to a notice.
-                           _('Favor this notice'));
+                           // TRANS: Button title for adding the favourite status to a notice.
+                           _('Add this notice to your list of favorite notices.'));
     }
 
     /**
diff --git a/lib/feed.php b/lib/feed.php
index e5a97a0cb8..e04c69be6c 100644
--- a/lib/feed.php
+++ b/lib/feed.php
@@ -49,6 +49,7 @@ class Feed
     const RSS2 = 2;
     const ATOM = 3;
     const FOAF = 4;
+    const JSON = 5; // Activity Streams
 
     var $type = null;
     var $url = null;
@@ -72,6 +73,8 @@ class Feed
             return 'application/atom+xml';
          case Feed::FOAF:
             return 'application/rdf+xml';
+         case Feed::JSON:
+            return 'application/stream+json';
          default:
             return null;
         }
@@ -92,6 +95,9 @@ class Feed
          case Feed::FOAF:
             // TRANS: Feed type name. FOAF stands for Friend of a Friend.
             return _('FOAF');
+         case Feed::JSON:
+            // TRANS: Feed type name. See http://activitystrea.ms/
+            return _('Activity Streams');
          default:
             return null;
         }
@@ -103,6 +109,7 @@ class Feed
          case Feed::RSS1:
          case Feed::RSS2:
          case Feed::ATOM:
+         case Feed::JSON:
             return 'alternate';
          case Feed::FOAF:
             return 'meta';
diff --git a/lib/feedlist.php b/lib/feedlist.php
index bbe66b2e74..c57f377238 100644
--- a/lib/feedlist.php
+++ b/lib/feedlist.php
@@ -93,6 +93,9 @@ class FeedList extends Widget
             case Feed::FOAF:
                 $classname = 'foaf';
                 break;
+            case Feed::JSON:
+                $classname = 'json';
+                break;
             }
 
             $this->out->elementStart('li');
diff --git a/lib/filenoticestream.php b/lib/filenoticestream.php
index fba6183fc2..f7bca1ed68 100644
--- a/lib/filenoticestream.php
+++ b/lib/filenoticestream.php
@@ -42,7 +42,7 @@ class FileNoticeStream extends ScopingNoticeStream
             $profile = Profile::current();
         }
         parent::__construct(new CachingNoticeStream(new RawFileNoticeStream($file),
-                                                    'file:notice-ids:'.$this->url),
+                                                    'file:notice-ids:'.$file->id),
                             $profile);
     }
 }
diff --git a/lib/filteringnoticestream.php b/lib/filteringnoticestream.php
index f412211074..221e9cd705 100644
--- a/lib/filteringnoticestream.php
+++ b/lib/filteringnoticestream.php
@@ -70,6 +70,7 @@ abstract class FilteringNoticeStream extends NoticeStream
         // or we get nothing from upstream.
 
         $results = null;
+        $round = 0;
 
         do {
 
@@ -81,9 +82,13 @@ abstract class FilteringNoticeStream extends NoticeStream
                 break;
             }
 
-            while ($raw->fetch()) {
-                if ($this->filter($raw)) {
-                    $filtered[] = clone($raw);
+            $notices = $raw->fetchAll();
+            
+            $this->prefill($notices);
+
+            foreach ($notices as $notice) {
+                if ($this->filter($notice)) {
+                    $filtered[] = $notice;
                     if (count($filtered) >= $total) {
                         break;
                     }
@@ -93,9 +98,20 @@ abstract class FilteringNoticeStream extends NoticeStream
             // XXX: make these smarter; factor hit rate into $askFor
 
             $startAt += $askFor;
-            $askFor   = max($total - count($filtered), NOTICES_PER_PAGE);
+            
+            $hits = count($filtered);
 
-        } while (count($filtered) < $total && $results !== 0);
+            $lastAsk = $askFor;
+
+            if ($hits === 0) {
+                $askFor = max(min(2 * $askFor, NOTICES_PER_PAGE * 50), NOTICES_PER_PAGE);
+            } else {
+                $askFor = max(min(intval(ceil(($total - $hits)*$startAt/$hits)), NOTICES_PER_PAGE * 50), NOTICES_PER_PAGE);
+            }
+
+            $round++;
+
+        } while (count($filtered) < $total && $results >= $lastAsk);
 
         return new ArrayWrapper(array_slice($filtered, $offset, $limit));
     }
@@ -112,4 +128,9 @@ abstract class FilteringNoticeStream extends NoticeStream
 
         return $ids;
     }
+
+    function prefill($notices)
+    {
+        return;
+    }
 }
diff --git a/lib/framework.php b/lib/framework.php
index b0b50fc961..99955b040c 100644
--- a/lib/framework.php
+++ b/lib/framework.php
@@ -19,13 +19,13 @@
 
 if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
-define('STATUSNET_BASE_VERSION', '1.0.0');
-define('STATUSNET_LIFECYCLE', 'alpha2'); // 'dev', 'alpha[0-9]+', 'beta[0-9]+', 'rc[0-9]+', 'release'
-define('STATUSNET_VERSION', STATUSNET_BASE_VERSION . STATUSNET_LIFECYCLE);
+define('STATUSNET_BASE_VERSION', '1.1.1');
+define('STATUSNET_LIFECYCLE', 'release'); // 'dev', 'alpha[0-9]+', 'beta[0-9]+', 'rc[0-9]+', 'release'
+define('STATUSNET_VERSION', STATUSNET_BASE_VERSION . '-' . STATUSNET_LIFECYCLE);
 
 define('LACONICA_VERSION', STATUSNET_VERSION); // compatibility
 
-define('STATUSNET_CODENAME', 'The Sounds of Science');
+define('STATUSNET_CODENAME', 'OK');
 
 define('AVATAR_PROFILE_SIZE', 96);
 define('AVATAR_STREAM_SIZE', 48);
@@ -34,6 +34,7 @@ define('AVATAR_MINI_SIZE', 24);
 define('NOTICES_PER_PAGE', 20);
 define('PROFILES_PER_PAGE', 20);
 define('MESSAGES_PER_PAGE', 20);
+define('GROUPS_PER_PAGE', 20);
 
 define('FOREIGN_NOTICE_SEND', 1);
 define('FOREIGN_NOTICE_RECV', 2);
@@ -151,9 +152,27 @@ function PEAR_ErrorToPEAR_Exception($err)
     if ($err->getCode() == DB_DATAOBJECT_ERROR_NODATA) {
         return;
     }
+
+    $msg      = $err->getMessage();
+    $userInfo = $err->getUserInfo();
+
+    // Log this; push the message up as an exception
+
+    common_log(LOG_ERR, "PEAR Error: $msg ($userInfo)");
+
+    // HACK: queue handlers get kicked by the long-query killer, and 
+    // keep the same broken connection. We die here to get a new
+    // process started.
+
+    if (php_sapi_name() == 'cli' && preg_match('/nativecode=2006/', $userInfo)) {
+        common_log(LOG_ERR, "Lost DB connection; dying.");
+        exit(100);
+    }
+
     if ($err->getCode()) {
         throw new PEAR_Exception($err->getMessage(), $err->getCode());
     }
     throw new PEAR_Exception($err->getMessage());
 }
+
 PEAR::setErrorHandling(PEAR_ERROR_CALLBACK, 'PEAR_ErrorToPEAR_Exception');
diff --git a/lib/groupaction.php b/lib/groupaction.php
new file mode 100644
index 0000000000..a5e62a2a5a
--- /dev/null
+++ b/lib/groupaction.php
@@ -0,0 +1,380 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Base class for group actions
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Action
+ * @package   StatusNet
+ * @author    Zach Copley <zach@status.net>
+ * @copyright 2009-2011 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET') && !defined('LACONICA')) {
+    exit(1);
+}
+
+define('MEMBERS_PER_SECTION', 27);
+
+/**
+ * Base class for group actions, similar to ProfileAction
+ *
+ * @category Action
+ * @package  StatusNet
+ * @author   Zach Copley <zach@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://status.net/
+ */
+class GroupAction extends Action
+{
+    protected $group;
+
+    function prepare($args)
+    {
+        parent::prepare($args);
+
+        $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);
+            if ($this->page != 1) {
+                $args['page'] = $this->page;
+            }
+            common_redirect(common_local_url('showgroup', $args), 301);
+            return false;
+        }
+
+        if (!$nickname) {
+            // TRANS: Client error displayed if no nickname argument was given requesting a group page.
+            $this->clientError(_('No nickname.'), 404);
+            return false;
+        }
+
+        $local = Local_group::staticGet('nickname', $nickname);
+
+        if (!$local) {
+            $alias = Group_alias::staticGet('alias', $nickname);
+            if ($alias) {
+                $args = array('id' => $alias->group_id);
+                if ($this->page != 1) {
+                    $args['page'] = $this->page;
+                }
+                common_redirect(common_local_url('groupbyid', $args), 301);
+                return false;
+            } else {
+                common_log(LOG_NOTICE, "Couldn't find local group for nickname '$nickname'");
+                // TRANS: Client error displayed if no remote group with a given name was found requesting group page.
+                $this->clientError(_('No such group.'), 404);
+                return false;
+            }
+        }
+
+        $this->group = User_group::staticGet('id', $local->group_id);
+
+        if (!$this->group) {
+            // TRANS: Client error displayed if no local group with a given name was found requesting group page.
+            $this->clientError(_('No such group.'), 404);
+            return false;
+        }
+    }
+
+    function showProfileBlock()
+    {
+        $block = new GroupProfileBlock($this, $this->group);
+        $block->show();
+    }
+
+    /**
+     * Fill in the sidebar.
+     *
+     * @return void
+     */
+    function showSections()
+    {
+        $this->showMembers();
+        $cur = common_current_user();
+        if ($cur && $cur->isAdmin($this->group)) {
+            $this->showPending();
+            $this->showBlocked();
+        }
+
+        $this->showAdmins();
+
+        if (!common_config('performance', 'high')) {
+            $cloud = new GroupTagCloudSection($this, $this->group);
+            $cloud->show();
+        }
+    }
+
+    /**
+     * Show mini-list of members
+     *
+     * @return void
+     */
+    function showMembers()
+    {
+        $member = $this->group->getMembers(0, MEMBERS_PER_SECTION);
+
+        if (!$member) {
+            return;
+        }
+
+        $this->elementStart('div', array('id' => 'entity_members',
+                                         'class' => 'section'));
+
+        if (Event::handle('StartShowGroupMembersMiniList', array($this))) {
+            $this->elementStart('h2');
+
+            $this->element('a', array('href' => common_local_url('groupmembers', array('nickname' =>
+                                                                                       $this->group->nickname))),
+                           // TRANS: Header for mini list of group members on a group page (h2).
+                           _('Members'));
+
+            $this->text(' ');
+
+            $this->text($this->group->getMemberCount());
+
+            $this->elementEnd('h2');
+
+            $gmml = new GroupMembersMiniList($member, $this);
+            $cnt = $gmml->show();
+            if ($cnt == 0) {
+                // TRANS: Description for mini list of group members on a group page when the group has no members.
+                $this->element('p', null, _('(None)'));
+            }
+
+            // @todo FIXME: Should be shown if a group has more than 27 members, but I do not see it displayed at
+            //              for example http://identi.ca/group/statusnet. Broken?
+            if ($cnt > MEMBERS_PER_SECTION) {
+                $this->element('a', array('href' => common_local_url('groupmembers',
+                                                                     array('nickname' => $this->group->nickname))),
+                               // TRANS: Link to all group members from mini list of group members if group has more than n members.
+                               _('All members'));
+            }
+
+            Event::handle('EndShowGroupMembersMiniList', array($this));
+        }
+
+        $this->elementEnd('div');
+    }
+
+    function showPending()
+    {
+        if ($this->group->join_policy != User_group::JOIN_POLICY_MODERATE) {
+            return;
+        }
+
+        $pending = $this->group->getQueueCount();
+
+        if (!$pending) {
+            return;
+        }
+
+        $request = $this->group->getRequests(0, MEMBERS_PER_SECTION);
+
+        if (!$request) {
+            return;
+        }
+
+        $this->elementStart('div', array('id' => 'entity_pending',
+                                         'class' => 'section'));
+
+        if (Event::handle('StartShowGroupPendingMiniList', array($this))) {
+
+            $this->elementStart('h2');
+
+            $this->element('a', array('href' => common_local_url('groupqueue', array('nickname' =>
+                                                                                     $this->group->nickname))),
+                           // TRANS: Header for mini list of users with a pending membership request on a group page (h2).
+                           _('Pending'));
+
+            $this->text(' ');
+
+            $this->text($pending);
+
+            $this->elementEnd('h2');
+
+            $gmml = new ProfileMiniList($request, $this);
+            $gmml->show();
+
+            Event::handle('EndShowGroupPendingMiniList', array($this));
+        }
+
+        $this->elementEnd('div');
+    }
+
+    function showBlocked()
+    {
+        $blocked = $this->group->getBlocked(0, MEMBERS_PER_SECTION);
+
+        if (!$blocked) {
+            return;
+        }
+
+        $this->elementStart('div', array('id' => 'entity_blocked',
+                                         'class' => 'section'));
+
+        if (Event::handle('StartShowGroupBlockedMiniList', array($this))) {
+
+            $this->elementStart('h2');
+
+            $this->element('a', array('href' => common_local_url('blockedfromgroup', array('nickname' =>
+                                                                                           $this->group->nickname))),
+                           // TRANS: Header for mini list of users that are blocked in a group page (h2).
+                           _('Blocked'));
+
+            $this->text(' ');
+
+            $this->text($this->group->getBlockedCount());
+
+            $this->elementEnd('h2');
+
+            $gmml = new GroupBlockedMiniList($blocked, $this);
+            $cnt = $gmml->show();
+            if ($cnt == 0) {
+                // TRANS: Description for mini list of group members on a group page when the group has no members.
+                $this->element('p', null, _('(None)'));
+            }
+
+            // @todo FIXME: Should be shown if a group has more than 27 members, but I do not see it displayed at
+            //              for example http://identi.ca/group/statusnet. Broken?
+            if ($cnt > MEMBERS_PER_SECTION) {
+                $this->element('a', array('href' => common_local_url('blockedfromgroup',
+                                                                     array('nickname' => $this->group->nickname))),
+                               // TRANS: Link to all group members from mini list of group members if group has more than n members.
+                               _('All members'));
+            }
+
+            Event::handle('EndShowGroupBlockedMiniList', array($this));
+        }
+
+        $this->elementEnd('div');
+    }
+
+    /**
+     * Show list of admins
+     *
+     * @return void
+     */
+    function showAdmins()
+    {
+        $adminSection = new GroupAdminSection($this, $this->group);
+        $adminSection->show();
+    }
+
+    function noticeFormOptions()
+    {
+        $options = parent::noticeFormOptions();
+        $cur = common_current_user();
+
+        if (!empty($cur) && $cur->isMember($this->group)) {
+            $options['to_group'] =  $this->group;
+        }
+
+        return $options;
+    }
+}
+
+class GroupAdminSection extends ProfileSection
+{
+    var $group;
+
+    function __construct($out, $group)
+    {
+        parent::__construct($out);
+        $this->group = $group;
+    }
+
+    function getProfiles()
+    {
+        return $this->group->getAdmins();
+    }
+
+    function title()
+    {
+        // TRANS: Title for list of group administrators on a group page.
+        return _m('TITLE','Admins');
+    }
+
+    function divId()
+    {
+        return 'group_admins';
+    }
+
+    function moreUrl()
+    {
+        return null;
+    }
+}
+
+class GroupMembersMiniList extends ProfileMiniList
+{
+    function newListItem($profile)
+    {
+        return new GroupMembersMiniListItem($profile, $this->action);
+    }
+}
+
+class GroupMembersMiniListItem extends ProfileMiniListItem
+{
+    function linkAttributes()
+    {
+        $aAttrs = parent::linkAttributes();
+
+        if (common_config('nofollow', 'members')) {
+            $aAttrs['rel'] .= ' nofollow';
+        }
+
+        return $aAttrs;
+    }
+}
+
+class GroupBlockedMiniList extends ProfileMiniList
+{
+    function newListItem($profile)
+    {
+        return new GroupBlockedMiniListItem($profile, $this->action);
+    }
+}
+
+class GroupBlockedMiniListItem extends ProfileMiniListItem
+{
+    function linkAttributes()
+    {
+        $aAttrs = parent::linkAttributes();
+
+        if (common_config('nofollow', 'members')) {
+            $aAttrs['rel'] .= ' nofollow';
+        }
+
+        return $aAttrs;
+    }
+}
+
+class ThreadingGroupNoticeStream extends ThreadingNoticeStream
+{
+    function __construct($group, $profile)
+    {
+        parent::__construct(new GroupNoticeStream($group, $profile));
+    }
+}
diff --git a/lib/groupblockform.php b/lib/groupblockform.php
index 918a5902fd..e60587d37b 100644
--- a/lib/groupblockform.php
+++ b/lib/groupblockform.php
@@ -125,6 +125,6 @@ class GroupBlockForm extends Form
             'submit',
             null,
             // TRANS: Submit button title.
-            _m('TOOLTIP', 'Block this user'));
+            _m('TOOLTIP', 'Block this user so that they can no longer post messages to it.'));
     }
 }
diff --git a/lib/groupdesignaction.php b/lib/groupdesignaction.php
deleted file mode 100644
index 44f35f6299..0000000000
--- a/lib/groupdesignaction.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?php
-/**
- * StatusNet, the distributed open-source microblogging tool
- *
- * Base class for actions that use the current user's design
- *
- * PHP version 5
- *
- * LICENCE: This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * @category  Action
- * @package   StatusNet
- * @author    Zach Copley <zach@status.net>
- * @copyright 2009 StatusNet, Inc.
- * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://status.net/
- */
-
-if (!defined('STATUSNET') && !defined('LACONICA')) {
-    exit(1);
-}
-
-/**
- * Base class for actions that use a group's design
- *
- * Pages related to groups can be themed with a design.
- * This superclass returns that design.
- *
- * @category Action
- * @package  StatusNet
- * @author   Zach Copley <zach@status.net>
- * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://status.net/
- *
- */
-class GroupDesignAction extends Action {
-
-    /** The group in question */
-    var $group = null;
-
-    /**
-     * A design for this action
-     *
-     * if the group attribute has been set, returns that group's
-     * design.
-     *
-     * @return Design a design object to use
-     */
-
-    function getDesign()
-    {
-        if (!empty($this->group)) {
-            $design = $this->group->getDesign();
-            if (!empty($design)) {
-                return $design;
-            }
-        }
-        return parent::getDesign();
-    }
-
-    function showProfileBlock()
-    {
-        $block = new GroupProfileBlock($this, $this->group);
-        $block->show();
-    }
-}
diff --git a/lib/groupeditform.php b/lib/groupeditform.php
index b795c1387d..e943dcd19a 100644
--- a/lib/groupeditform.php
+++ b/lib/groupeditform.php
@@ -144,8 +144,8 @@ class GroupEditForm extends Form
             $this->out->elementStart('li');
             $this->out->hidden('groupid', $id);
             // TRANS: Field label on group edit form.
-            $this->out->input('nickname', _('Nickname'),
-                              ($this->out->arg('nickname')) ? $this->out->arg('nickname') : $nickname,
+            $this->out->input('newnickname', _('Nickname'),
+                              ($this->out->arg('newnickname')) ? $this->out->arg('newnickname') : $nickname,
                               // TRANS: Field title on group edit form.
                               _('1-64 lowercase letters or numbers, no punctuation or spaces.'));
             $this->out->elementEnd('li');
diff --git a/lib/grouplist.php b/lib/grouplist.php
index 34a43e61ae..e2adf57477 100644
--- a/lib/grouplist.php
+++ b/lib/grouplist.php
@@ -34,8 +34,6 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
 
 require_once INSTALLDIR.'/lib/widget.php';
 
-define('GROUPS_PER_PAGE', 20);
-
 /**
  * Widget to show a list of groups
  *
diff --git a/lib/groupnav.php b/lib/groupnav.php
deleted file mode 100644
index 13795721ae..0000000000
--- a/lib/groupnav.php
+++ /dev/null
@@ -1,161 +0,0 @@
-<?php
-/**
- * StatusNet, the distributed open-source microblogging tool
- *
- * Tabset for a particular group
- *
- * PHP version 5
- *
- * LICENCE: This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * @category  Action
- * @package   StatusNet
- * @author    Evan Prodromou <evan@status.net>
- * @author    Sarven Capadisli <csarven@status.net>
- * @copyright 2008 StatusNet, Inc.
- * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://status.net/
- */
-
-if (!defined('STATUSNET') && !defined('LACONICA')) {
-    exit(1);
-}
-
-require_once INSTALLDIR.'/lib/widget.php';
-
-/**
- * Tabset for a group
- *
- * Shows a group of tabs for a particular user group
- *
- * @category Output
- * @package  StatusNet
- * @author   Evan Prodromou <evan@status.net>
- * @author   Sarven Capadisli <csarven@status.net>
- * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://status.net/
- *
- * @see      HTMLOutputter
- */
-class GroupNav extends Menu
-{
-    var $group = null;
-
-    /**
-     * Construction
-     *
-     * @param Action $action current action, used for output
-     */
-    function __construct($action=null, $group=null)
-    {
-        parent::__construct($action);
-        $this->group = $group;
-    }
-
-    /**
-     * Show the menu
-     *
-     * @return void
-     */
-    function show()
-    {
-        $action_name = $this->action->trimmed('action');
-        $nickname = $this->group->nickname;
-
-        $this->out->elementStart('ul', array('class' => 'nav'));
-        if (Event::handle('StartGroupGroupNav', array($this))) {
-            $this->out->menuItem(common_local_url('showgroup', array('nickname' =>
-                                                                     $nickname)),
-                                 // TRANS: Menu item in the group navigation page.
-                                 _m('MENU','Group'),
-                                 // TRANS: Tooltip for menu item in the group navigation page.
-                                 // TRANS: %s is the nickname of the group.
-                                 sprintf(_m('TOOLTIP','%s group'), $nickname),
-                                 $action_name == 'showgroup',
-                                 'nav_group_group');
-            $this->out->menuItem(common_local_url('groupmembers', array('nickname' =>
-                                                                        $nickname)),
-                                 // TRANS: Menu item in the group navigation page.
-                                 _m('MENU','Members'),
-                                 // TRANS: Tooltip for menu item in the group navigation page.
-                                 // TRANS: %s is the nickname of the group.
-                                 sprintf(_m('TOOLTIP','%s group members'), $nickname),
-                                 $action_name == 'groupmembers',
-                                 'nav_group_members');
-
-            $cur = common_current_user();
-
-            if ($cur && $cur->isAdmin($this->group)) {
-                $pending = $this->countPendingMembers();
-                if ($pending || $this->group->join_policy == User_group::JOIN_POLICY_MODERATE) {
-                    $this->out->menuItem(common_local_url('groupqueue', array('nickname' =>
-                                                                              $nickname)),
-                                         // TRANS: Menu item in the group navigation page. Only shown for group administrators.
-                                         // TRANS: %d is the number of pending members.
-                                         sprintf(_m('MENU','Pending members (%d)','Pending members (%d)',$pending), $pending),
-                                         // TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
-                                         // TRANS: %s is the nickname of the group.
-                                         sprintf(_m('TOOLTIP','%s pending members'), $nickname),
-                                         $action_name == 'groupqueue',
-                                         'nav_group_pending');
-                }
-                $this->out->menuItem(common_local_url('blockedfromgroup', array('nickname' =>
-                                                                                $nickname)),
-                                     // TRANS: Menu item in the group navigation page. Only shown for group administrators.
-                                     _m('MENU','Blocked'),
-                                     // TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
-                                     // TRANS: %s is the nickname of the group.
-                                     sprintf(_m('TOOLTIP','%s blocked users'), $nickname),
-                                     $action_name == 'blockedfromgroup',
-                                     'nav_group_blocked');
-                $this->out->menuItem(common_local_url('editgroup', array('nickname' =>
-                                                                         $nickname)),
-                                     // TRANS: Menu item in the group navigation page. Only shown for group administrators.
-                                     _m('MENU','Admin'),
-                                     // TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
-                                     // TRANS: %s is the nickname of the group.
-                                     sprintf(_m('TOOLTIP','Edit %s group properties'), $nickname),
-                                     $action_name == 'editgroup',
-                                     'nav_group_admin');
-                $this->out->menuItem(common_local_url('grouplogo', array('nickname' =>
-                                                                         $nickname)),
-                                     // TRANS: Menu item in the group navigation page. Only shown for group administrators.
-                                     _m('MENU','Logo'),
-                                     // TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
-                                     // TRANS: %s is the nickname of the group.
-                                     sprintf(_m('TOOLTIP','Add or edit %s logo'), $nickname),
-                                     $action_name == 'grouplogo',
-                                     'nav_group_logo');
-                $this->out->menuItem(common_local_url('groupdesignsettings', array('nickname' =>
-                                                                      $nickname)),
-                                     // TRANS: Menu item in the group navigation page. Only shown for group administrators.
-                                     _m('MENU','Design'),
-                                     // TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
-                                     // TRANS: %s is the nickname of the group.
-                                     sprintf(_m('TOOLTIP','Add or edit %s design'), $nickname),
-                                     $action_name == 'groupdesignsettings',
-                                     'nav_group_design');
-            }
-            Event::handle('EndGroupGroupNav', array($this));
-        }
-        $this->out->elementEnd('ul');
-    }
-
-    function countPendingMembers()
-    {
-        $req = new Group_join_queue();
-        $req->group_id = $this->group->id;
-        return $req->count();
-    }
-}
diff --git a/lib/groupnoticestream.php b/lib/groupnoticestream.php
index 26784458e0..723f064cb3 100644
--- a/lib/groupnoticestream.php
+++ b/lib/groupnoticestream.php
@@ -46,15 +46,49 @@ if (!defined('STATUSNET')) {
  */
 class GroupNoticeStream extends ScopingNoticeStream
 {
+    var $group;
+    var $userProfile;
+
     function __construct($group, $profile = -1)
     {
         if (is_int($profile) && $profile == -1) {
             $profile = Profile::current();
         }
+        $this->group = $group;
+        $this->userProfile = $profile;
+
         parent::__construct(new CachingNoticeStream(new RawGroupNoticeStream($group),
                                                     'user_group:notice_ids:' . $group->id),
                             $profile);
     }
+
+    function getNoticeIds($offset, $limit, $since_id, $max_id)
+    {
+        if ($this->impossibleStream()) {
+            return array();
+        } else {
+            return parent::getNoticeIds($offset, $limit, $since_id, $max_id);
+        }
+    }
+
+    function getNotices($offset, $limit, $sinceId = null, $maxId = null)
+    {
+        if ($this->impossibleStream()) {
+            return new ArrayWrapper(array());
+        } else {
+            return parent::getNotices($offset, $limit, $sinceId, $maxId);
+        }
+    }
+
+    function impossibleStream() 
+    {
+        if ($this->group->force_scope &&
+            (empty($this->userProfile) || !$this->userProfile->isMember($this->group))) {
+            return true;
+        }
+
+        return false;
+    }
 }
 
 /**
diff --git a/lib/groupprofileblock.php b/lib/groupprofileblock.php
index 10dddb8467..87ec174dc6 100644
--- a/lib/groupprofileblock.php
+++ b/lib/groupprofileblock.php
@@ -4,7 +4,7 @@
  * Copyright (C) 2011, StatusNet, Inc.
  *
  * Profile block to show for a group
- * 
+ *
  * PHP version 5
  *
  * This program is free software: you can redistribute it and/or modify
@@ -44,7 +44,6 @@ if (!defined('STATUSNET')) {
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
  * @link      http://status.net/
  */
-
 class GroupProfileBlock extends ProfileBlock
 {
     protected $group = null;
@@ -68,7 +67,7 @@ class GroupProfileBlock extends ProfileBlock
 
     function url()
     {
-        return $this->group->mainpage;
+        return $this->group->homeUrl();
     }
 
     function location()
@@ -86,6 +85,11 @@ class GroupProfileBlock extends ProfileBlock
         return $this->group->description;
     }
 
+    function otherProfiles()
+    {
+        return array();
+    }
+
     function showActions()
     {
         $cur = common_current_user();
@@ -112,12 +116,33 @@ class GroupProfileBlock extends ProfileBlock
                 Event::handle('EndGroupSubscribe', array($this, $this->group));
             }
             $this->out->elementEnd('li');
+            if ($cur && $cur->isAdmin($this->group)) {
+                $this->out->elementStart('li', 'entity_edit');
+                $this->out->element('a', array('href' => common_local_url('editgroup',
+                                                                          array('nickname' => $this->group->nickname)),
+                                               // TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
+                                               // TRANS: %s is the nickname of the group.
+                                               'title' => sprintf(_m('TOOLTIP','Edit %s group properties'), $this->group->nickname)),
+                                    // TRANS: Link text for link on user profile.
+                                    _m('BUTTON','Edit'));
+                $this->out->elementEnd('li');
+                $this->out->elementStart('li', 'entity_edit');
+                $this->out->element('a', array('href' => common_local_url('grouplogo',
+                                                                          array('nickname' => $this->group->nickname)),
+                                               // TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
+                                               // TRANS: %s is the nickname of the group.
+                                               'title' => sprintf(_m('TOOLTIP','Add or edit %s logo'), $this->group->nickname)),
+                                    // TRANS: Link text for link on user profile.
+                                    _m('MENU','Logo'));
+                $this->out->elementEnd('li');
+            }
             if ($cur && $cur->hasRight(Right::DELETEGROUP)) {
                 $this->out->elementStart('li', 'entity_delete');
                 $df = new DeleteGroupForm($this->out, $this->group);
                 $df->show();
                 $this->out->elementEnd('li');
             }
+
             Event::handle('EndGroupActionsList', array($this, $this->group));
         }
         $this->out->elementEnd('ul');
@@ -133,4 +158,23 @@ class GroupProfileBlock extends ProfileBlock
         }
         $this->out->elementEnd('div');
     }
+
+    function showName()
+    {
+        parent::showName();
+        $this->showAliases();
+    }
+
+    function showAliases()
+    {
+        $aliases = $this->group->getAliases();
+
+        if (!empty($aliases)) {
+            $this->out->elementStart('ul', 'group_aliases');
+            foreach ($aliases as $alias) {
+                $this->out->element('li', 'group_alias', $alias);
+            }
+            $this->out->elementEnd('ul');
+        }
+    }
 }
diff --git a/lib/groupsbymemberssection.php b/lib/groupsbymemberssection.php
index 4cb8ed46f0..9b1bac2154 100644
--- a/lib/groupsbymemberssection.php
+++ b/lib/groupsbymemberssection.php
@@ -47,7 +47,7 @@ class GroupsByMembersSection extends GroupSection
         $qry = 'SELECT user_group.*, count(*) as value ' .
           'FROM user_group JOIN group_member '.
           'ON user_group.id = group_member.group_id ' .
-          'GROUP BY user_group.id,user_group.nickname,user_group.fullname,user_group.homepage,user_group.description,user_group.location,user_group.original_logo,user_group.homepage_logo,user_group.stream_logo,user_group.mini_logo,user_group.created,user_group.modified,user_group.design_id ' .
+          'GROUP BY user_group.id,user_group.nickname,user_group.fullname,user_group.homepage,user_group.description,user_group.location,user_group.original_logo,user_group.homepage_logo,user_group.stream_logo,user_group.mini_logo,user_group.created,user_group.modified ' .
           'ORDER BY value DESC ';
 
         $limit = GROUPS_PER_SECTION;
diff --git a/lib/groupsbypostssection.php b/lib/groupsbypostssection.php
index c338ab7e97..d0fadcb450 100644
--- a/lib/groupsbypostssection.php
+++ b/lib/groupsbypostssection.php
@@ -47,7 +47,7 @@ class GroupsByPostsSection extends GroupSection
         $qry = 'SELECT user_group.*, count(*) as value ' .
           'FROM user_group JOIN group_inbox '.
           'ON user_group.id = group_inbox.group_id ' .
-          'GROUP BY user_group.id,user_group.nickname,user_group.fullname,user_group.homepage,user_group.description,user_group.location,user_group.original_logo,user_group.homepage_logo,user_group.stream_logo,user_group.mini_logo,user_group.created,user_group.modified,user_group.design_id ' .
+          'GROUP BY user_group.id,user_group.nickname,user_group.fullname,user_group.homepage,user_group.description,user_group.location,user_group.original_logo,user_group.homepage_logo,user_group.stream_logo,user_group.mini_logo,user_group.created,user_group.modified ' .
           'ORDER BY value DESC ';
 
         $limit = GROUPS_PER_SECTION;
diff --git a/lib/groupsnav.php b/lib/groupsnav.php
index 26058c2b7e..8439ab6399 100644
--- a/lib/groupsnav.php
+++ b/lib/groupsnav.php
@@ -44,7 +44,7 @@ if (!defined('STATUSNET')) {
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
  * @link      http://status.net/
  */
-class GroupsNav extends Menu
+class GroupsNav extends MoreMenu
 {
     protected $user;
     protected $groups;
@@ -61,33 +61,53 @@ class GroupsNav extends Menu
         return (!empty($this->groups) && ($this->groups->N > 0));
     }
 
-    /**
-     * Show the menu
-     *
-     * @return void
-     */
-    function show()
+    function tag()
     {
-        $action = $this->actionName;
+        return 'groups';
+    }
 
-        $this->out->elementStart('ul', array('class' => 'nav'));
+    function getItems()
+    {
+        $items = array();
 
-        if (Event::handle('StartGroupsNav', array($this))) {
-
-            while ($this->groups->fetch()) {
-                $this->out->menuItem(($this->groups->mainpage) ?
-                                     $this->groups->mainpage :
-                                     common_local_url('showgroup',
-                                                      array('nickname' => $this->groups->nickname)),
-                                     $this->groups->getBestName(),
-                                     '',
-                                     $action == 'showgroup' &&
-                                     $this->action->arg('nickname') == $this->groups->nickname,
-                                     'nav_timeline_group_'.$this->groups->nickname);
-            }
-            Event::handle('EndGroupsNav', array($this));
+        while ($this->groups->fetch()) {
+            $items[] = array('placeholder',
+                             array('nickname' => $this->groups->nickname,
+                                   'mainpage' => $this->groups->homeUrl()),
+                             $this->groups->getBestName(),
+                             $this->groups->getBestName()
+                            );
         }
 
-        $this->out->elementEnd('ul');
+        return $items;
+    }
+
+    function seeAllItem() {
+        return array('usergroups',
+                     array('nickname' => $this->user->nickname),
+                     // TRANS: Link description for seeing all groups.
+                     _('See all'),
+                     // TRANS: Link title for seeing all groups.
+                     _('See all groups you belong to.'));
+    }
+
+    function item($actionName, $args, $label, $description, $id=null, $cls=null)
+    {
+        if ($actionName != 'placeholder') {
+            return parent::item($actionName, $args, $label, $description, $id, $cls);
+        }
+
+        if (empty($id)) {
+            $id = $this->menuItemID('showgroup', array('nickname' => $args['nickname']));
+        }
+
+        $url = $args['mainpage'];
+
+        $this->out->menuItem($url,
+                             $label,
+                             $description,
+                             $this->isCurrent($actionName, $args),
+                             $id,
+                             $cls);
     }
 }
diff --git a/lib/grouptagcloudsection.php b/lib/grouptagcloudsection.php
index 5b914c0073..5ed14560ce 100644
--- a/lib/grouptagcloudsection.php
+++ b/lib/grouptagcloudsection.php
@@ -54,7 +54,7 @@ class GroupTagCloudSection extends TagCloudSection
     {
         // TRANS: Title for group tag cloud section.
         // TRANS: %s is a group name.
-        return sprintf(_('Tags in %s group\'s notices'), $this->group->nickname);
+        return _('Tags');
     }
 
     function getTags()
diff --git a/lib/homestubnav.php b/lib/homestubnav.php
new file mode 100644
index 0000000000..e9f4ba2308
--- /dev/null
+++ b/lib/homestubnav.php
@@ -0,0 +1,61 @@
+<?php
+/**
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2011, StatusNet, Inc.
+ *
+ * Stub sub-menu for sections that need to go home
+ * 
+ * PHP version 5
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Menu
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2011 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    // This check helps protect against security problems;
+    // your code file can't be executed directly from the web.
+    exit(1);
+}
+
+/**
+ * stub sub-menu for settings and stuff
+ *
+ * @category  General
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2011 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+
+class HomeStubNav extends Menu
+{
+    function getItems()
+    {
+        return array(array('top',
+                           null,
+                           // TRANS: Menu item in personal group navigation menu.
+                           _m('MENU','Home'),
+                           // TRANS: Menu item title in personal group navigation menu.
+                           // TRANS: %s is a username.
+                           _('Back to top'),
+                           'nav_return_top'));
+    }
+}
diff --git a/lib/htmloutputter.php b/lib/htmloutputter.php
index 3b3c1913a1..9a43ef069e 100644
--- a/lib/htmloutputter.php
+++ b/lib/htmloutputter.php
@@ -108,6 +108,13 @@ class HTMLOutputter extends XMLOutputter
 
         header('Content-Type: '.$type);
 
+	// Output anti-framing headers to prevent clickjacking (respected by newer
+        // browsers).
+	if (common_config('javascript', 'bustframes')) {
+            header('X-XSS-Protection: 1; mode=block'); // detect XSS Reflection attacks
+            header('X-Frame-Options: SAMEORIGIN'); // no rendering if origin mismatch
+        }
+
         $this->extraHeaders();
         if (preg_match("/.*\/.*xml/", $type)) {
             // Required for XML documents
diff --git a/lib/implugin.php b/lib/implugin.php
index d096c41a28..a037860391 100644
--- a/lib/implugin.php
+++ b/lib/implugin.php
@@ -258,7 +258,6 @@ abstract class ImPlugin extends Plugin
      */
     function sendConfirmationCode($screenname, $code, $user)
     {
-        // @todo FIXME: parameter 4 is not being used. Should para3 and para4 be a markdown link?
         // TRANS: Body text for confirmation code e-mail.
         // TRANS: %1$s is a user nickname, %2$s is the StatusNet sitename,
         // TRANS: %3$s is the display name of an IM plugin.
@@ -268,7 +267,7 @@ abstract class ImPlugin extends Plugin
           ' . (If you cannot click it, copy-and-paste it into the ' .
           'address bar of your browser). If that user is not you, ' .
           'or if you did not request this confirmation, just ignore this message.'),
-          $user->nickname, common_config('site', 'name'), $this->getDisplayName(), common_local_url('confirmaddress', array('code' => $code)));
+          $user->nickname, common_config('site', 'name'), $this->getDisplayName(), common_local_url('confirmaddress', null, array('code' => $code)));
 
         return $this->sendMessage($screenname, $body);
     }
@@ -621,6 +620,11 @@ abstract class ImPlugin extends Plugin
         return true;
     }
 
+    function onHaveImPlugin(&$haveImPlugin) {
+        $haveImPlugin = true; // set flag true (we're loaded, after all!)
+        return false; // stop looking
+    }
+
     function initialize()
     {
         if( ! common_config('queue', 'enabled'))
diff --git a/lib/inboxnoticestream.php b/lib/inboxnoticestream.php
index 5517cef113..58b0075050 100644
--- a/lib/inboxnoticestream.php
+++ b/lib/inboxnoticestream.php
@@ -135,4 +135,30 @@ class RawInboxNoticeStream extends NoticeStream
 
         return $ids;
     }
+
+    function getNotices($offset, $limit, $sinceId, $maxId)
+    {
+        $all = array();
+
+        do {
+
+            $ids = $this->getNoticeIds($offset, $limit, $sinceId, $maxId);
+
+            $notices = Memcached_DataObject::pivotGet('Notice', 'id', $ids);
+
+            // By default, takes out false values
+
+            $notices = array_filter($notices);
+
+            $all = array_merge($all, $notices);
+
+            if (count($notices < count($ids))) {
+                $offset += $limit;
+                $limit  -= count($notices);
+            }
+
+        } while (count($notices) < count($ids) && count($ids) > 0);
+
+        return new ArrayWrapper($all);
+    }
 }
diff --git a/lib/installer.php b/lib/installer.php
index 6f58b247b5..2fe83dd9a2 100644
--- a/lib/installer.php
+++ b/lib/installer.php
@@ -42,7 +42,7 @@
 abstract class Installer
 {
     /** Web site info */
-    public $sitename, $server, $path, $fancy;
+    public $sitename, $server, $path, $fancy, $siteProfile;
     /** DB info */
     public $host, $database, $dbtype, $username, $password, $db;
     /** Administrator info */
@@ -73,7 +73,7 @@ abstract class Installer
         error_reporting($old);
         return $ok;
     }
-    
+
     /**
      * Check if all is ready for installation
      *
@@ -185,7 +185,7 @@ abstract class Installer
     /**
      * Basic validation on the database paramters
      * Side effects: error output if not valid
-     * 
+     *
      * @return boolean success
      */
     function validateDb()
@@ -218,7 +218,7 @@ abstract class Installer
     /**
      * Basic validation on the administrator user paramters
      * Side effects: error output if not valid
-     * 
+     *
      * @return boolean success
      */
     function validateAdmin()
@@ -251,10 +251,29 @@ abstract class Installer
         return !$fail;
     }
 
+    /**
+     * Make sure a site profile was selected
+     *
+     * @return type boolean success
+     */
+    function validateSiteProfile()
+    {
+        $fail = false;
+
+        $sprofile = $this->siteProfile;
+
+        if (empty($sprofile))  {
+            $this->updateStatus("No site profile selected.", true);
+            $fail = true;
+        }
+
+        return !$fail;
+    }
+
     /**
      * Set up the database with the appropriate function for the selected type...
      * Saves database info into $this->db.
-     * 
+     *
      * @fixme escape things in the connection string in case we have a funny pass etc
      * @return mixed array of database connection params on success, false on failure
      */
@@ -303,7 +322,7 @@ abstract class Installer
             $this->updateStatus(sprintf("Adding %s data to database...", $name));
             $res = $this->runDbScript($scr.'.sql', $conn);
             if ($res === false) {
-                $this->updateStatus(sprintf("Can't run %d script.", $name), true);
+                $this->updateStatus(sprintf("Can't run %s script.", $name), true);
                 return false;
             }
         }
@@ -316,7 +335,7 @@ abstract class Installer
      * Open a connection to the database.
      *
      * @param <type> $dsn
-     * @return <type> 
+     * @return <type>
      */
     function connectDatabase($dsn)
     {
@@ -384,7 +403,7 @@ abstract class Installer
      * Write a stock configuration file.
      *
      * @return boolean success
-     * 
+     *
      * @fixme escape variables in output in case we have funny chars, apostrophes etc
      */
     function writeConf()
@@ -394,7 +413,7 @@ abstract class Installer
             'server' => $this->server,
             'path' => $this->path,
             'db_database' => $this->db['database'],
-            'db_type' => $this->db['type'],
+            'db_type' => $this->db['type']
         ));
 
         // assemble configuration file in a string
@@ -425,6 +444,41 @@ abstract class Installer
         return $res;
     }
 
+    /**
+     * Write the site profile. We do this after creating the initial user
+     * in case the site profile is set to single user. This gets around the
+     * 'chicken-and-egg' problem of the system requiring a valid user for
+     * single user mode, before the intial user is actually created. Yeah,
+     * we should probably do this in smarter way.
+     *
+     * @return int res number of bytes written
+     */
+    function writeSiteProfile()
+    {
+        $vals = $this->phpVals(array(
+            'site_profile' => $this->siteProfile,
+            'nickname' => $this->adminNick
+        ));
+
+        $cfg =
+        // site profile
+        "\$config['site']['profile'] = {$vals['site_profile']};\n";
+
+        if ($this->siteProfile == "singleuser") {
+            $cfg .= "\$config['singleuser']['nickname'] = {$vals['nickname']};\n\n";
+        } else {
+            $cfg .= "\n";
+        }
+
+        // Normalize line endings for Windows servers
+        $cfg = str_replace("\n", PHP_EOL, $cfg);
+
+        // write configuration file out to install directory
+        $res = file_put_contents(INSTALLDIR.'/config.php', $cfg, FILE_APPEND);
+
+        return $res;
+    }
+
     /**
      * Install schema into the database
      *
@@ -479,7 +533,7 @@ abstract class Installer
         $user->grantRole('owner');
         $user->grantRole('moderator');
         $user->grantRole('administrator');
-        
+
         // Attempt to do a remote subscribe to update@status.net
         // Will fail if instance is on a private network.
 
@@ -499,9 +553,9 @@ abstract class Installer
     /**
      * The beef of the installer!
      * Create database, config file, and admin user.
-     * 
+     *
      * Prerequisites: validation of input data.
-     * 
+     *
      * @return boolean success
      */
     function doInstall()
@@ -527,6 +581,9 @@ abstract class Installer
             return false;
         }
 
+        // Make sure we can write to the file twice
+        $oldUmask = umask(000); 
+
         if (!$this->skipConfig) {
             $this->updateStatus("Writing config file...");
             $res = $this->writeConf();
@@ -552,6 +609,21 @@ abstract class Installer
             }
         }
 
+        if (!$this->skipConfig) {
+            $this->updateStatus("Setting site profile...");
+            $res = $this->writeSiteProfile();
+
+            if (!$res) {
+                $this->updateStatus("Can't write to config file.", true);
+                return false;
+            }
+        }
+
+        // Restore original umask
+        umask($oldUmask);
+        // Set permissions back to something decent
+        chmod(INSTALLDIR.'/config.php', 0644);
+        
         /*
             TODO https needs to be considered
         */
diff --git a/lib/invitebuttonsection.php b/lib/invitebuttonsection.php
index c10817d7a8..3d385f02a5 100644
--- a/lib/invitebuttonsection.php
+++ b/lib/invitebuttonsection.php
@@ -46,6 +46,19 @@ if (!defined('STATUSNET')) {
  */
 class InviteButtonSection extends Section
 {
+    protected $buttonText;
+
+    function __construct($out = null, $buttonText = null)
+    {
+        $this->out = $out;
+        if (empty($buttonText)) {
+            // TRANS: Default button text for inviting more users to the StatusNet instance.
+            $this->buttonText = _m('BUTTON', 'Invite more colleagues');
+        } else {
+            $this->buttonText = $buttonText;
+        }
+    }
+
     function showTitle()
     {
         return false;
@@ -53,11 +66,14 @@ class InviteButtonSection extends Section
 
     function showContent()
     {
-        $this->out->element('a',
-                            array('href' => common_local_url('invite'),
-                                  'class' => 'invite_button'),
-                            // TRANS: Button text for inviting more users to the StatusNet instance.
-                            _m('BUTTON','Invite more colleagues'));
+        $this->out->element(
+            'a',
+            array(
+                'href' => common_local_url('invite'),
+                'class' => 'invite_button'
+            ),
+            $this->buttonText
+        );
         return false;
     }
 }
diff --git a/lib/jsonsearchresultslist.php b/lib/jsonsearchresultslist.php
index 8bf3678d4f..c9b2705991 100644
--- a/lib/jsonsearchresultslist.php
+++ b/lib/jsonsearchresultslist.php
@@ -232,10 +232,15 @@ class ResultItem
         $this->id           = $this->notice->id;
         $this->from_user_id = $this->profile->id;
 
-        $user = User::staticGet('id', $this->profile->id);
-
-        $this->iso_language_code = $user->language;
+        $user = $this->profile->getUser();
 
+        if (empty($user)) {
+            // Gonna have to do till we can detect it
+            $this->iso_language_code = common_config('site', 'language');
+        } else {
+            $this->iso_language_code = $user->language;
+        }
+        
         $this->source = $this->getSourceLink($this->notice->source);
 
         $avatar = $this->profile->getAvatar(AVATAR_STREAM_SIZE);
diff --git a/lib/language.php b/lib/language.php
index 2af62fea0c..7c97cc413f 100644
--- a/lib/language.php
+++ b/lib/language.php
@@ -194,12 +194,12 @@ function _m($msg/*, ...*/)
 function _mdomain($backtrace)
 {
     /*
-      0 => 
+      0 =>
         array
           'file' => string '/var/www/mublog/plugins/FeedSub/FeedSubPlugin.php' (length=49)
           'line' => int 77
           'function' => string '_m' (length=2)
-          'args' => 
+          'args' =>
             array
               0 => &string 'Feeds' (length=5)
     */
@@ -289,6 +289,21 @@ function get_nice_language_list()
     return $nice_lang;
 }
 
+/*
+ * Check whether a language is right-to-left
+ *
+ * @param string $lang language code of the language to check
+ *
+ * @return boolean true if language is rtl
+ */
+
+function is_rtl($lang)
+{
+    $all_languages = common_config('site', 'languages');
+    $lang = $all_languages[$lang];
+    return ($lang['direction'] == 'rtl');
+}
+
 /**
  * Get a list of all languages that are enabled in the default config
  *
@@ -303,6 +318,7 @@ function get_all_languages() {
         'af'      => array('q' => 0.8, 'lang' => 'af', 'name' => 'Afrikaans', 'direction' => 'ltr'),
         'ar'      => array('q' => 0.8, 'lang' => 'ar', 'name' => 'Arabic', 'direction' => 'rtl'),
         'arz'     => array('q' => 0.8, 'lang' => 'arz', 'name' => 'Egyptian Spoken Arabic', 'direction' => 'rtl'),
+        'be-tarask' => array('q' => 0.5, 'lang' => 'be-tarask', 'name' => 'Belarusian (Taraškievica orthography)', 'direction' => 'ltr'),
         'bg'      => array('q' => 0.8, 'lang' => 'bg', 'name' => 'Bulgarian', 'direction' => 'ltr'),
         'br'      => array('q' => 0.8, 'lang' => 'br', 'name' => 'Breton', 'direction' => 'ltr'),
         'ca'      => array('q' => 0.5, 'lang' => 'ca', 'name' => 'Catalan', 'direction' => 'ltr'),
@@ -315,6 +331,7 @@ function get_all_languages() {
         'en-gb'   => array('q' => 1, 'lang' => 'en_GB', 'name' => 'English (British)', 'direction' => 'ltr'),
         'en'      => array('q' => 1, 'lang' => 'en',    'name' => 'English (US)', 'direction' => 'ltr'),
         'es'      => array('q' => 1, 'lang' => 'es',    'name' => 'Spanish', 'direction' => 'ltr'),
+        'eu'      => array('q' => 1, 'lang' => 'eu',    'name' => 'Basque', 'direction' => 'ltr'),
         'fa'      => array('q' => 1, 'lang' => 'fa', 'name' => 'Persian', 'direction' => 'rtl'),
         'fi'      => array('q' => 1, 'lang' => 'fi', 'name' => 'Finnish', 'direction' => 'ltr'),
         'fr-fr'   => array('q' => 1, 'lang' => 'fr', 'name' => 'French', 'direction' => 'ltr'),
@@ -331,6 +348,7 @@ function get_all_languages() {
         'ka'      => array('q' => 0.8, 'lang' => 'ka',    'name' => 'Georgian', 'direction' => 'ltr'),
         'ko'      => array('q' => 0.9, 'lang' => 'ko',    'name' => 'Korean', 'direction' => 'ltr'),
         'mk'      => array('q' => 0.5, 'lang' => 'mk', 'name' => 'Macedonian', 'direction' => 'ltr'),
+        'ml'      => array('q' => 0.5, 'lang' => 'ml', 'name' => 'Malayalam', 'direction' => 'ltr'),
         'nb'      => array('q' => 0.1, 'lang' => 'nb', 'name' => 'Norwegian (Bokmål)', 'direction' => 'ltr'),
         'no'      => array('q' => 0.1, 'lang' => 'nb', 'name' => 'Norwegian (Bokmål)', 'direction' => 'ltr'),
         'nn'      => array('q' => 1, 'lang' => 'nn', 'name' => 'Norwegian (Nynorsk)', 'direction' => 'ltr'),
diff --git a/lib/listsnav.php b/lib/listsnav.php
index 0f107e8883..a2fa0b8cd1 100644
--- a/lib/listsnav.php
+++ b/lib/listsnav.php
@@ -39,7 +39,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
-class ListsNav extends Menu
+class ListsNav extends MoreMenu
 {
     var $profile=null;
     var $lists=null;
@@ -54,37 +54,39 @@ class ListsNav extends Menu
         $this->lists = $profile->getLists($user);
     }
 
-    function show()
+    function tag()
     {
-        $action = $this->actionName;
+        return 'lists';
+    }
 
-        $this->out->elementStart('ul', array('class' => 'nav'));
+    function getItems()
+    {
+        $items = array();
 
-        if (Event::handle('StartListsNav', array($this))) {
-
-            while ($this->lists->fetch()) {
+        while ($this->lists->fetch()) {
                 $mode = $this->lists->private ? 'private' : 'public';
-                $this->out->menuItem(($this->lists->mainpage) ?
-                                     $this->lists->mainpage :
-                                     common_local_url('showprofiletag',
-                                                      array('tagger' => $this->profile->nickname,
-                                                            'tag'    => $this->lists->tag)),
-                                     $this->lists->tag,
-                                     '',
-                                     $action == 'showprofiletag' &&
-                                     $this->action->arg('tagger') == $this->profile->nickname &&
-                                     $this->action->arg('tag')    == $this->lists->tag,
-                                     'nav_timeline_list_'.$this->lists->id,
-                                     'mode-' . $mode);
-            }
-            Event::handle('EndListsNav', array($this));
-        }
+                $items[] = array('showprofiletag',
+                                 array('tagger' => $this->profile->nickname,
+                                       'tag'    => $this->lists->tag),
+                                 $this->lists->tag,
+                                 '');
+         }
 
-        $this->out->elementEnd('ul');
+         return $items;
     }
 
     function hasLists()
     {
         return (!empty($this->lists) && $this->lists->N > 0);
     }
+
+    function seeAllItem()
+    {
+        return array('peopletagsbyuser',
+                     array('nickname' => $this->profile->nickname),
+                     // TRANS: Link description for seeing all lists.
+                     _('See all'),
+                     // TRANS: Link title for seeing all lists.
+                     _('See all lists you have created.'));
+    }
 }
diff --git a/lib/mail.php b/lib/mail.php
index eaef2285b5..223721a345 100644
--- a/lib/mail.php
+++ b/lib/mail.php
@@ -71,18 +71,25 @@ function mail_backend()
  */
 function mail_send($recipients, $headers, $body)
 {
-    // XXX: use Mail_Queue... maybe
-    $backend = mail_backend();
-    if (!isset($headers['Content-Type'])) {
-        $headers['Content-Type'] = 'text/plain; charset=UTF-8';
-    }
-    assert($backend); // throws an error if it's bad
-    $sent = $backend->send($recipients, $headers, $body);
-    if (PEAR::isError($sent)) {
-        common_log(LOG_ERR, 'Email error: ' . $sent->getMessage());
+    try {
+        // XXX: use Mail_Queue... maybe
+        $backend = mail_backend();
+
+        if (!isset($headers['Content-Type'])) {
+           $headers['Content-Type'] = 'text/plain; charset=UTF-8';
+        }
+
+        assert($backend); // throws an error if it's bad
+        $sent = $backend->send($recipients, $headers, $body);
+        return true;
+    } catch (PEAR_Exception $e) {
+        common_log(
+            LOG_ERR,
+            "Unable to send email - '{$e->getMessage()}'. "
+            . 'Is your mail subsystem set up correctly?'
+        );
         return false;
     }
-    return true;
 }
 
 /**
@@ -240,14 +247,13 @@ function mail_subscribe_notify_profile($listenee, $other)
         $headers['To']      = $name . ' <' . $listenee->email . '>';
         // TRANS: Subject of new-subscriber notification e-mail.
         // TRANS: %1$s is the subscribing user's nickname, %2$s is the StatusNet sitename.
-        $headers['Subject'] = sprintf(_('%1$s is now listening to '.
-                                        'your notices on %2$s.'),
+        $headers['Subject'] = sprintf(_('%1$s is now following you on %2$s.'),
                                       $other->getBestName(),
                                       common_config('site', 'name'));
 
         // TRANS: Main body of new-subscriber notification e-mail.
         // TRANS: %1$s is the subscriber's long name, %2$s is the StatusNet sitename.
-        $body = sprintf(_('%1$s is now listening to your notices on %2$s.'),
+        $body = sprintf(_('%1$s is now following you on %2$s.'),
                         $long_name,
                         common_config('site', 'name')) .
                 mail_profile_block($other) .
@@ -448,7 +454,8 @@ function mail_broadcast_notice_sms($notice)
                    __FILE__);
         $success = mail_send_sms_notice_address($notice,
                                                 $user->smsemail,
-                                                $user->incomingemail);
+                                                $user->incomingemail,
+                                                $user->nickname);
         if (!$success) {
             // XXX: Not sure, but I think that's the right thing to do
             common_log(LOG_WARNING,
@@ -481,7 +488,8 @@ function mail_send_sms_notice($notice, $user)
 {
     return mail_send_sms_notice_address($notice,
                                         $user->smsemail,
-                                        $user->incomingemail);
+                                        $user->incomingemail,
+                                        $user->nickname);
 }
 
 /**
@@ -493,10 +501,11 @@ function mail_send_sms_notice($notice, $user)
  * @param Notice $notice        notice to send
  * @param string $smsemail      email address to send to
  * @param string $incomingemail email address to set as 'from'
+ * @param string $nickname      nickname to add to beginning
  *
  * @return boolean success flag
  */
-function mail_send_sms_notice_address($notice, $smsemail, $incomingemail)
+function mail_send_sms_notice_address($notice, $smsemail, $incomingemail, $nickname)
 {
     $to = $nickname . ' <' . $smsemail . '>';
 
@@ -727,6 +736,11 @@ function mail_notify_attn($user, $notice)
         return;
     }
 
+    if ($user->hasBlocked($sender)) {
+        // If the author has blocked us, don't spam them with a notification.
+        return;
+    }
+
     $bestname = $sender->getBestName();
 
     common_switch_locale($user->language);
@@ -748,7 +762,7 @@ function mail_notify_attn($user, $notice)
         // TRANS: Body of @-reply notification e-mail.
         // TRANS: %1$s is the sending user's name, $2$s is the StatusNet sitename,
         // TRANS: %3$s is a URL to the notice, %4$s is the notice text,
-        // TRANS: %5$s is a URL to the full conversion if it exists (otherwise empty),
+        // TRANS: %5$s is the text "The full conversation can be read here:" and a URL to the full conversion if it exists (otherwise empty),
         // TRANS: %6$s is a URL to reply to the notice, %7$s is a URL to all @-replies for the addressed user,
         $body = sprintf(_("%1\$s just sent a notice to your attention (an '@-reply') on %2\$s.\n\n".
                       "The notice is here:\n\n".
@@ -822,7 +836,7 @@ function mail_notify_group_join($group, $joiner)
             // TRANS: Subject of group join notification e-mail.
             // TRANS: %1$s is the joining user's nickname, %2$s is the group name, and %3$s is the StatusNet sitename.
             $headers['Subject'] = sprintf(_('%1$s has joined '.
-                                            'your group %2$s on %3$s.'),
+                                            'your group %2$s on %3$s'),
                                           $joiner->getBestName(),
                                           $group->getBestName(),
                                           common_config('site', 'name'));
diff --git a/lib/mailbox.php b/lib/mailbox.php
index 7c6567c6c1..db686a255a 100644
--- a/lib/mailbox.php
+++ b/lib/mailbox.php
@@ -42,7 +42,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
  * @see      InboxAction
  * @see      OutboxAction
  */
-class MailboxAction extends CurrentUserDesignAction
+class MailboxAction extends Action
 {
     var $page = null;
 
diff --git a/lib/makeadminform.php b/lib/makeadminform.php
index f1280d3b69..f02bf396f7 100644
--- a/lib/makeadminform.php
+++ b/lib/makeadminform.php
@@ -121,6 +121,6 @@ class MakeAdminForm extends Form
           'submit',
           null,
           // TRANS: Submit button title.
-          _m('TOOLTIP','Make this user an admin'));
+          _m('TOOLTIP','Make this user an admin.'));
     }
 }
diff --git a/lib/menu.php b/lib/menu.php
index 2713b44d50..281ef7797b 100644
--- a/lib/menu.php
+++ b/lib/menu.php
@@ -49,6 +49,8 @@ class Menu extends Widget
 {
     var $action     = null;
     var $actionName = null;
+    var $actionArgs = null;
+    
     /**
      * Construction
      *
@@ -60,12 +62,52 @@ class Menu extends Widget
 
         $this->action     = $action;
         $this->actionName = $action->trimmed('action');
+
+        $rtargs = $action->returnToArgs();
+
+        $this->actionArgs = $rtargs[1];
     }
 
-    function item($actionName, $args, $label, $description, $id=null)
+    function getItems()
+    {
+        return array();
+    }
+
+    function tag()
+    {
+        return null;
+    }
+    
+    function show()
+    {
+        $items = $this->getItems();
+        $tag = $this->tag();
+
+        $attrs = array('class' => 'nav');
+
+        if (!is_null($tag)) {
+            $attrs['id']  = 'nav_' . $tag;
+        }
+
+        if (Event::handle('StartNav', array($this, &$tag, &$items))) {
+
+            $this->out->elementStart('ul', $attrs);
+
+            foreach ($items as $item) {
+                list($actionName, $args, $label, $description, $id) = $item;
+                $this->item($actionName, $args, $label, $description, $id);
+            }
+        
+            $this->out->elementEnd('ul');
+            
+            Event::handle('EndNav', array($this, $tag, $items));
+        }
+    }
+    
+    function item($actionName, $args, $label, $description, $id=null, $cls=null)
     {
         if (empty($id)) {
-            $id = $this->menuItemID($actionName);
+            $id = $this->menuItemID($actionName, $args);
         }
 
         $url = common_local_url($actionName, $args);
@@ -73,13 +115,37 @@ class Menu extends Widget
         $this->out->menuItem($url,
                              $label,
                              $description,
-                             $actionName == $this->actionName,
-                             $id);
+                             $this->isCurrent($actionName, $args),
+                             $id,
+                             $cls);
     }
 
-    function menuItemID($actionName)
+    function isCurrent($actionName, $args)
     {
-        return sprintf('nav_%s', $actionName);
+        if ($actionName != $this->actionName) {
+            return false;
+        }
+
+        foreach ($this->actionArgs as $k => $v) {
+            if (!array_key_exists($k, $args) || $args[$k] != $v) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+    
+    function menuItemID($actionName, $args = null)
+    {
+        $id = sprintf('nav_%s', $actionName);
+        
+        if (!is_null($args)) {
+            foreach ($args as $key => $value) {
+                $id .= '_' . $key . '_' . $value;
+            }
+        }
+
+        return $id;
     }
 
     function submenu($label, $menu)
diff --git a/lib/messageform.php b/lib/messageform.php
index 80e7716cda..acd30e3b38 100644
--- a/lib/messageform.php
+++ b/lib/messageform.php
@@ -141,7 +141,7 @@ class MessageForm extends Form
         unset($mutual_users);
 
         if (count($mutual) == 1) {
-            // TRANS Entry in drop-down selection box in direct-message inbox/outbox when no one is available to message.
+            // TRANS: Entry in drop-down selection box in direct-message inbox/outbox when no one is available to message.
             $mutual[0] = _('No mutual subscribers.');
         }
 
diff --git a/lib/microappplugin.php b/lib/microappplugin.php
index 1dfb90036e..11058ad1ac 100644
--- a/lib/microappplugin.php
+++ b/lib/microappplugin.php
@@ -175,7 +175,7 @@ abstract class MicroAppPlugin extends Plugin
      */
     function isMyNotice($notice) {
         $types = $this->types();
-        return in_array($notice->object_type, $types);
+        return ($notice->verb == ActivityVerb::POST) && in_array($notice->object_type, $types);
     }
 
     /**
@@ -193,6 +193,8 @@ abstract class MicroAppPlugin extends Plugin
     function isMyActivity($activity) {
         $types = $this->types();
         return (count($activity->objects) == 1 &&
+                ($activity->objects[0] instanceof ActivityObject) &&
+                ($activity->verb == ActivityVerb::POST) &&
                 in_array($activity->objects[0]->type, $types));
     }
 
@@ -345,7 +347,7 @@ abstract class MicroAppPlugin extends Plugin
      *
      * @return boolean hook value
      */
-    function onStartHandleFeedEntryWithProfile($activity, $oprofile)
+    function onStartHandleFeedEntryWithProfile($activity, $oprofile, &$notice)
     {
         if ($this->isMyActivity($activity)) {
 
@@ -360,11 +362,11 @@ abstract class MicroAppPlugin extends Plugin
 
             $options = array('uri' => $object->id,
                              'url' => $object->link,
-                             'is_local' => Notice::REMOTE_OMB,
+                             'is_local' => Notice::REMOTE,
                              'source' => 'ostatus');
 
             // $actor is an ostatus_profile
-            $this->saveNoticeFromActivity($activity, $actor->localProfile(), $options);
+            $notice = $this->saveNoticeFromActivity($activity, $actor->localProfile(), $options);
 
             return false;
         }
@@ -418,7 +420,7 @@ abstract class MicroAppPlugin extends Plugin
 
             $options = array('uri' => $object->id,
                              'url' => $object->link,
-                             'is_local' => Notice::REMOTE_OMB,
+                             'is_local' => Notice::REMOTE,
                              'source' => 'ostatus');
 
             // $actor is an ostatus_profile
@@ -446,9 +448,9 @@ abstract class MicroAppPlugin extends Plugin
             $options = array('source' => 'atompub');
 
             // $user->getProfile() is a Profile
-            $this->saveNoticeFromActivity($activity,
-                                          $user->getProfile(),
-                                          $options);
+            $notice = $this->saveNoticeFromActivity($activity,
+                                                    $user->getProfile(),
+                                                    $options);
 
             return false;
         }
diff --git a/lib/moremenu.php b/lib/moremenu.php
new file mode 100644
index 0000000000..3562ac4148
--- /dev/null
+++ b/lib/moremenu.php
@@ -0,0 +1,138 @@
+<?php
+/**
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2011, StatusNet, Inc.
+ *
+ * A menu with a More... button to show more elements
+ *
+ * PHP version 5
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Widget
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2011 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    // This check helps protect against security problems;
+    // your code file can't be executed directly from the web.
+    exit(1);
+}
+
+/**
+ * A menu with a More... element to show more items
+ *
+ * @category  General
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2011 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+class MoreMenu extends Menu
+{
+    const SOFT_MAX = 5;
+    const HARD_MAX = 15;
+
+    /**
+     * Show a menu with a limited number of elements
+     *
+     * @param
+     *
+     * @return
+     */
+    function show()
+    {
+        $items = $this->getItems();
+        $tag = $this->tag();
+        $menuID  = null;
+
+        $attrs = array('class' => 'nav');
+
+        if (!is_null($tag)) {
+            $menuID = 'nav_' . $tag;
+            $attrs['id'] = $menuID;
+        }
+
+        if (Event::handle('StartNav', array($this, &$tag, &$items))) {
+            $this->out->elementStart('ul', $attrs);
+
+            $total = count($items);
+
+            if ($total <= self::SOFT_MAX + 1) {
+                $toShow = $items;
+            } else {
+                $toShow = array_slice($items, 0, self::SOFT_MAX);
+            }
+
+            foreach ($toShow as $item) {
+            	if (count($item) == 5) {
+                	list($actionName, $args, $label, $description, $id) = $item;
+            	} else {
+                	list($actionName, $args, $label, $description) = $item;
+                	$id = null;            	    
+            	}
+                $this->item($actionName, $args, $label, $description, $id);
+            }
+
+            if ($total > self::SOFT_MAX + 1) {
+                $this->out->elementStart('li', array('class' => 'more_link'));
+                $this->out->element('a', array('href' => '#',
+                                               'onclick' => 'SN.U.showMoreMenuItems("'.$menuID.'"); return false;'),
+                                    // TRANS: Link description to show more items in a list.
+                                    _('More â–¼'));
+                $this->out->elementEnd('li');
+
+                $extended = array_slice($items, self::SOFT_MAX, self::HARD_MAX - self::SOFT_MAX);
+
+                foreach ($extended as $item) {
+            		if (count($item) == 5) {
+                		list($actionName, $args, $label, $description, $id) = $item;
+            		} else {
+                		list($actionName, $args, $label, $description) = $item;
+                		$id = null;            	    
+            		}
+                    $this->item($actionName, $args, $label, $description, $id, 'extended_menu');
+                }
+
+                if ($total > self::HARD_MAX) {
+                    $seeAll = $this->seeAllItem();
+
+                    if (!empty($seeAll)) {
+            			if (count($seeAll) == 5) {
+                			list($actionName, $args, $label, $description, $id) = $seeAll;
+            			} else {
+                			list($actionName, $args, $label, $description) = $seeAll;
+                			$id = null;            	    
+            			}
+                        $this->item($actionName, $args, $label, $description, $id, 'extended_menu see_all');
+                    }
+                }
+            }
+
+            $this->out->elementEnd('ul');
+
+            Event::handle('EndNav', array($this, $tag, $items));
+        }
+    }
+
+    function seeAllItem()
+    {
+        return null;
+    }
+}
diff --git a/lib/mysqlschema.php b/lib/mysqlschema.php
index c3d3501c74..435ba4e3a9 100644
--- a/lib/mysqlschema.php
+++ b/lib/mysqlschema.php
@@ -298,6 +298,16 @@ class MysqlSchema extends Schema
         return "{$tableName}_{$columnName}_idx";
     }
 
+    /**
+     * MySQL doesn't take 'DROP CONSTRAINT', need to treat primary keys as
+     * if they were indexes here, but can use 'PRIMARY KEY' special name.
+     *
+     * @param array $phrase
+     */
+    function appendAlterDropPrimary(array &$phrase)
+    {
+        $phrase[] = 'DROP PRIMARY KEY';
+    }
 
     /**
      * MySQL doesn't take 'DROP CONSTRAINT', need to treat unique keys as
diff --git a/lib/noticelist.php b/lib/noticelist.php
index f18b2d6684..7f38cf005b 100644
--- a/lib/noticelist.php
+++ b/lib/noticelist.php
@@ -83,17 +83,16 @@ class NoticeList extends Widget
         $this->out->elementStart('div', array('id' =>'notices_primary'));
         $this->out->elementStart('ol', array('class' => 'notices xoxo'));
 
-        $cnt = 0;
-
-        while ($this->notice->fetch() && $cnt <= NOTICES_PER_PAGE) {
-            $cnt++;
-
-            if ($cnt > NOTICES_PER_PAGE) {
-                break;
-            }
+		$notices = $this->notice->fetchAll();
+		$total   = count($notices);
+		$notices = array_slice($notices, 0, NOTICES_PER_PAGE);
+		
+    	self::prefill($notices);
+    	
+    	foreach ($notices as $notice) {
 
             try {
-                $item = $this->newListItem($this->notice);
+                $item = $this->newListItem($notice);
                 $item->show();
             } catch (Exception $e) {
                 // we log exceptions and continue
@@ -105,7 +104,7 @@ class NoticeList extends Widget
         $this->out->elementEnd('ol');
         $this->out->elementEnd('div');
 
-        return $cnt;
+        return $total;
     }
 
     /**
@@ -122,4 +121,37 @@ class NoticeList extends Widget
     {
         return new NoticeListItem($notice, $this->out);
     }
+    
+    static function prefill(&$notices, $avatarSize=AVATAR_STREAM_SIZE)
+    {
+        if (Event::handle('StartNoticeListPrefill', array(&$notices, $avatarSize))) {
+
+            // Prefill attachments
+            Notice::fillAttachments($notices);
+            // Prefill attachments
+            Notice::fillFaves($notices);
+            // Prefill repeat data
+            Notice::fillRepeats($notices);
+            // Prefill the profiles
+            $profiles = Notice::fillProfiles($notices);
+            // Prefill the avatars
+            Profile::fillAvatars($profiles, $avatarSize);
+    	
+            $p = Profile::current();
+    	
+            if (!empty($p)) {
+
+                $ids = array();
+    	
+                foreach ($notices as $notice) {
+                    $ids[] = $notice->id;
+                }
+    	
+                Memcached_DataObject::pivotGet('Fave', 'notice_id', $ids, array('user_id' => $p->id));
+                Memcached_DataObject::pivotGet('Notice', 'repeat_of', $ids, array('profile_id' => $p->id));
+            }
+
+            Event::handle('EndNoticeListPrefill', array(&$notices, &$profiles, $avatarSize));
+        }
+    }
 }
diff --git a/lib/noticelistitem.php b/lib/noticelistitem.php
index 2d41e53017..08053bceb6 100644
--- a/lib/noticelistitem.php
+++ b/lib/noticelistitem.php
@@ -144,10 +144,13 @@ class NoticeListItem extends Widget
             $user = common_current_user();
             if ($user) {
                 $this->out->elementStart('div', 'notice-options');
-                $this->showFaveForm();
-                $this->showReplyLink();
-                $this->showRepeatForm();
-                $this->showDeleteLink();
+                if (Event::handle('StartShowNoticeOptionItems', array($this))) {
+                    $this->showFaveForm();
+                    $this->showReplyLink();
+                    $this->showRepeatForm();
+                    $this->showDeleteLink();
+                    Event::handle('EndShowNoticeOptionItems', array($this));
+                }
                 $this->out->elementEnd('div');
             }
             Event::handle('EndShowNoticeOptions', array($this));
@@ -167,6 +170,9 @@ class NoticeListItem extends Widget
             if ($this->notice->scope != 0 && $this->notice->scope != 1) {
                 $class .= ' limited-scope';
             }
+            if (!empty($this->notice->source)) {
+                $class .= ' notice-source-'.$this->notice->source;
+            }
             $this->out->elementStart('li', array('class' => $class,
                                                  'id' => 'notice-' . $id));
             Event::handle('EndOpenNoticeListItemElement', array($this));
@@ -216,8 +222,14 @@ class NoticeListItem extends Widget
         $this->out->elementStart('a', $attrs);
         $this->showAvatar();
         $this->out->text(' ');
-        $this->out->element('span',array('class' => 'fn'),
-                            $this->profile->getBestName());
+        $user = common_current_user();
+        if (!empty($user) && $user->streamNicknames()) {
+            $this->out->element('span',array('class' => 'fn'),
+                                $this->profile->nickname);
+        } else {
+            $this->out->element('span',array('class' => 'fn'),
+                                $this->profile->getBestName());
+        }
         $this->out->elementEnd('a');
 
         $this->out->elementEnd('span');
@@ -229,31 +241,48 @@ class NoticeListItem extends Widget
 
     function showAddressees()
     {
-        $this->out->elementStart('span', 'addressees');
+        $ga = $this->getGroupAddressees();
+        $pa = $this->getProfileAddressees();
 
-        $cnt = $this->showGroupAddressees(true);
-        $cnt = $this->showProfileAddressees($cnt == 0);
+        $a = array_merge($ga, $pa);
 
-        $this->out->elementEnd('span', 'addressees');
+        if (!empty($a)) {
+            $this->out->elementStart('span', 'addressees');
+            $first = true;
+            foreach ($a as $addr) {
+                if (!$first) {
+                    // TRANS: Separator in profile addressees list.
+                    $this->out->text(_m('SEPARATOR',', '));
+                } else {
+                    // Start of profile addressees list.
+                    $first = false;
+                }
+                $text = $addr['text'];
+                unset($addr['text']);
+                $this->out->element('a', $addr, $text);
+            }
+            $this->out->elementEnd('span', 'addressees');
+        }
     }
 
-    function showGroupAddressees($first)
+    function getGroupAddressees()
     {
+        $ga = array();
+
         $groups = $this->getGroups();
 
+        $user = common_current_user();
+
+        $streamNicknames = !empty($user) && $user->streamNicknames();
+
         foreach ($groups as $group) {
-            if (!$first) {
-                $this->out->text( _m('SEPARATOR',', '));
-            } else {
-                $first = false;
-            }
-            $this->out->element('a', array('href' => $group->homeUrl(),
-                                           'title' => $group->nickname,
-                                           'class' => 'addressee group'),
-                                $group->getBestName());
+            $ga[] = array('href' => $group->homeUrl(),
+                          'title' => $group->nickname,
+                          'class' => 'addressee group',
+                          'text' => ($streamNicknames) ? $group->nickname : $group->getBestName());
         }
 
-        return count($groups);
+        return $ga;
     }
 
     function getGroups()
@@ -261,25 +290,24 @@ class NoticeListItem extends Widget
         return $this->notice->getGroups();
     }
 
-    function showProfileAddressees($first)
+    function getProfileAddressees()
     {
+        $pa = array();
+
         $replies = $this->getReplyProfiles();
 
+        $user = common_current_user();
+
+        $streamNicknames = !empty($user) && $user->streamNicknames();
+
         foreach ($replies as $reply) {
-            if (!$first) {
-                // TRANS: Separator in profile addressees list.
-                $this->out->text(_m('SEPARATOR',', '));
-            } else {
-                // TRANS: Start of profile addressees list.
-                $first = false;
-            }
-            $this->out->element('a', array('href' => $reply->profileurl,
-                                           'title' => $reply->nickname,
-                                           'class' => 'addressee account'),
-                                $reply->getBestName());
+            $pa[] = array('href' => $reply->profileurl,
+                          'title' => $reply->nickname,
+                          'class' => 'addressee account',
+                          'text' => ($streamNicknames) ? $reply->nickname : $reply->getBestName());
         }
 
-        return count($replies);
+        return $pa;
     }
 
     function getReplyProfiles()
@@ -592,6 +620,7 @@ class NoticeListItem extends Widget
 
             // TRANS: Addition in notice list item if notice was repeated. Followed by a span with a nickname.
             $this->out->raw(_('Repeated by'));
+            $this->out->raw(' ');
 
             $this->out->elementStart('a', $attrs);
             $this->out->element('span', 'fn nickname', $repeater->nickname);
@@ -618,7 +647,7 @@ class NoticeListItem extends Widget
             $this->out->elementStart('a', array('href' => $reply_url,
                                                 'class' => 'notice_reply',
                                                 // TRANS: Link title in notice list item to reply to a notice.
-                                                'title' => _('Reply to this notice')));
+                                                'title' => _('Reply to this notice.')));
             // TRANS: Link text in notice list item to reply to a notice.
             $this->out->text(_('Reply'));
             $this->out->text(' ');
@@ -646,7 +675,7 @@ class NoticeListItem extends Widget
             $this->out->element('a', array('href' => $deleteurl,
                                            'class' => 'notice_delete',
                                            // TRANS: Link title in notice list item to delete a notice.
-                                           'title' => _('Delete this notice')),
+                                           'title' => _('Delete this notice from the timeline.')),
                                            // TRANS: Link text in notice list item to delete a notice.
                                            _('Delete'));
         }
@@ -694,4 +723,17 @@ class NoticeListItem extends Widget
             Event::handle('EndCloseNoticeListItemElement', array($this));
         }
     }
+
+    /**
+     * Get the notice in question
+     *
+     * For hooks, etc., this may be useful
+     *
+     * @return Notice The notice we're showing
+     */
+
+    function getNotice()
+    {
+        return $this->notice;
+    }
 }
diff --git a/lib/noticestream.php b/lib/noticestream.php
index be28aa6186..e9ff47b68c 100644
--- a/lib/noticestream.php
+++ b/lib/noticestream.php
@@ -59,42 +59,6 @@ abstract class NoticeStream
 
     static function getStreamByIds($ids)
     {
-        $cache = Cache::instance();
-
-        if (!empty($cache)) {
-            $notices = array();
-            foreach ($ids as $id) {
-                $n = Notice::staticGet('id', $id);
-                if (!empty($n)) {
-                    $notices[] = $n;
-                }
-            }
-            return new ArrayWrapper($notices);
-        } else {
-            $notice = new Notice();
-            if (empty($ids)) {
-                //if no IDs requested, just return the notice object
-                return $notice;
-            }
-            $notice->whereAdd('id in (' . implode(', ', $ids) . ')');
-
-            $notice->find();
-
-            $temp = array();
-
-            while ($notice->fetch()) {
-                $temp[$notice->id] = clone($notice);
-            }
-
-            $wrapped = array();
-
-            foreach ($ids as $id) {
-                if (array_key_exists($id, $temp)) {
-                    $wrapped[] = $temp[$id];
-                }
-            }
-
-            return new ArrayWrapper($wrapped);
-        }
+    	return Notice::multiGet('id', $ids);
     }
 }
diff --git a/lib/oauthclient.php b/lib/oauthclient.php
index bc7587183b..e14f673392 100644
--- a/lib/oauthclient.php
+++ b/lib/oauthclient.php
@@ -242,8 +242,9 @@ class OAuthClient
             'ssl_verify_host' => false
         ));
 
-        // Twitter is strict about accepting invalid "Expect" headers
-        $request->setHeader('Expect', '');
+        // Twitter was strict about accepting invalid "Expect" headers
+        // between 2008ish and October 2012. Caused "417 Expectation failed"
+        //$request->setHeader('Expect', '');
 
         if (isset($params)) {
             $request->setMethod(HTTP_Request2::METHOD_POST);
diff --git a/lib/oembedhelper.php b/lib/oembedhelper.php
index 6d8064e660..6b5b8d34f2 100644
--- a/lib/oembedhelper.php
+++ b/lib/oembedhelper.php
@@ -61,7 +61,7 @@ class oEmbedHelper
      * Some known hosts are whitelisted with API endpoints where we
      * know they exist but autodiscovery data isn't available.
      * If autodiscovery links are missing and we don't recognize the
-     * host, we'll pass it to oohembed.com's public service which
+     * host, we'll pass it to noembed.com's public service which
      * will either proxy or fake info on a lot of sites.
      *
      * A few hosts are blacklisted due to known problems with oohembed,
@@ -94,7 +94,7 @@ class oEmbedHelper
             case 'built-in':
                 common_log(LOG_INFO, 'Considering built-in oEmbed methods...');
                 // Blacklist: systems with no oEmbed API of their own, which are
-                // either missing from or broken on oohembed.com's proxy.
+                // either missing from or broken on noembed.com's proxy.
                 // we know how to look data up in another way...
                 if (array_key_exists($host, self::$functionMap)) {
                     common_log(LOG_INFO, 'We have a built-in method for ' . $host);
@@ -216,6 +216,10 @@ class oEmbedHelper
     {
         $params['url'] = $url;
         $params['format'] = 'json';
+        $key=common_config('oembed','apikey');
+        if(isset($key)) {
+            $params['key'] = common_config('oembed','apikey');
+        }
         $data = self::json($api, $params);
         return self::normalize($data);
     }
diff --git a/lib/ownerdesignaction.php b/lib/ownerdesignaction.php
deleted file mode 100644
index d557f10c06..0000000000
--- a/lib/ownerdesignaction.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?php
-/**
- * StatusNet, the distributed open-source microblogging tool
- *
- * Base class for actions that use the page owner's design
- *
- * PHP version 5
- *
- * LICENCE: This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * @category  Action
- * @package   StatusNet
- * @author    Evan Prodromou <evan@status.net>
- * @copyright 2009 StatusNet, Inc.
- * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://status.net/
- */
-
-if (!defined('STATUSNET') && !defined('LACONICA')) {
-    exit(1);
-}
-
-/**
- * Base class for actions that use the page owner's design
- *
- * Some pages have a clear "owner" -- like the profile page, subscriptions
- * pages, etc. This superclass uses that owner's chosen design for the page
- * design.
- *
- * @category Action
- * @package  StatusNet
- * @author   Evan Prodromou <evan@status.net>
- * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://status.net/
- *
- */
-
-class OwnerDesignAction extends Action {
-
-    /** The user for this page. */
-
-    var $user = null;
-
-    /**
-     * A design for this action
-     *
-     * if the user attribute has been set, returns that user's
-     * design.
-     *
-     * @return Design a design object to use
-     */
-
-    function getDesign()
-    {
-        if (!empty($this->user)) {
-
-            $design = $this->user->getDesign();
-
-            if (!empty($design)) {
-                return $design;
-            }
-        }
-
-        return parent::getDesign();
-    }
-}
diff --git a/lib/peopletaggroupnav.php b/lib/peopletaggroupnav.php
index 3cfcb3cff3..70f7f5a425 100644
--- a/lib/peopletaggroupnav.php
+++ b/lib/peopletaggroupnav.php
@@ -79,7 +79,13 @@ class PeopletagGroupNav extends Widget
 	// FIXME: we should probably pass this in
 
         $action = $this->action->trimmed('action');
-        $nickname = $this->action->trimmed('tagger');
+
+        if (common_config('singleuser', 'enabled')) {
+            $nickname = User::singleUserNickname();
+        } else {
+            $nickname = $this->action->arg('tagger');
+        }
+
         $tag = $this->action->trimmed('tag');
 
         if ($nickname) {
diff --git a/lib/peopletaglist.php b/lib/peopletaglist.php
index 3ee1d34938..986712f51d 100644
--- a/lib/peopletaglist.php
+++ b/lib/peopletaglist.php
@@ -169,8 +169,8 @@ class PeopletagListItem extends Widget
             array('href' => common_local_url('peopletagged',
                                               array('tagger' => $this->profile->nickname,
                                                     'tag' => $this->peopletag->tag))),
-            // TRANS: Link description for link to list of users tagged with a tag.
-            _('Tagged'));
+            // TRANS: Link description for link to list of users tagged with a tag (so part of a list).
+            _('Listed'));
         $this->out->raw($this->peopletag->taggedCount());
         $this->out->elementEnd('span');
 
diff --git a/lib/peopletagnoticestream.php b/lib/peopletagnoticestream.php
index 9477ca8ea6..4422261ae9 100644
--- a/lib/peopletagnoticestream.php
+++ b/lib/peopletagnoticestream.php
@@ -99,7 +99,9 @@ class RawPeopletagNoticeStream extends NoticeStream
         $ptag = new Profile_tag();
         $ptag->tag    = $this->profile_list->tag;
         $ptag->tagger = $this->profile_list->tagger;
-        $notice->joinAdd($ptag);
+        $notice->joinAdd(array('profile_id', 'profile_tag:tagged'));
+        $notice->whereAdd('profile_tag.tagger = ' . $this->profile_list->tagger);
+        $notice->whereAdd(sprintf('profile_tag.tag = "%s"', $this->profile_list->tag));
 
         if ($since_id != 0) {
             $notice->whereAdd('notice.id > ' . $since_id);
diff --git a/lib/plugin.php b/lib/plugin.php
index 0e8c0a742d..a5424e06ca 100644
--- a/lib/plugin.php
+++ b/lib/plugin.php
@@ -159,7 +159,12 @@ class Plugin
         }
 
         if (empty($path)) {
-            $path = common_config('site', 'path') . '/plugins/';
+            // XXX: extra stat().
+            if (@file_exists(INSTALLDIR.'/local/plugins/'.$plugin.'/'.$relative)) {
+                $path = common_config('site', 'path') . '/local/plugins/';
+            } else {
+                $path = common_config('site', 'path') . '/plugins/';
+            }
         }
 
         if ($path[strlen($path)-1] != '/') {
diff --git a/lib/pluginlist.php b/lib/pluginlist.php
index 0bd1a15355..51c02aa245 100644
--- a/lib/pluginlist.php
+++ b/lib/pluginlist.php
@@ -192,8 +192,7 @@ class PluginListItem extends Widget
         } else {
             return array('name' => $this->plugin,
                          // TRANS: Plugin description for a disabled plugin.
-                         'rawdescription' => _m('plugin-description',
-                                                '(Plugin descriptions unavailable when disabled.)'));
+                         'rawdescription' => _m('plugin-description','(The plugin description is unavailable when a plugin has been disabled.)'));
         }
     }
 
diff --git a/lib/pluginqueuehandler.php b/lib/pluginqueuehandler.php
index 9653ccad42..c2d74f4840 100644
--- a/lib/pluginqueuehandler.php
+++ b/lib/pluginqueuehandler.php
@@ -44,7 +44,12 @@ class PluginQueueHandler extends QueueHandler
 
     function handle($notice)
     {
-        Event::handle('HandleQueuedNotice', array(&$notice));
+        try {
+            Event::handle('HandleQueuedNotice', array(&$notice));
+        } catch (UserNoProfileException $unp) {
+            // We can't do anything about this, so just skip
+            return true;
+        }
         return true;
     }
 }
diff --git a/lib/popularity.php b/lib/popularity.php
deleted file mode 100644
index 7ab259a391..0000000000
--- a/lib/popularity.php
+++ /dev/null
@@ -1,92 +0,0 @@
-<?php
-/**
- * StatusNet, the distributed open-source microblogging tool
- *
- * Wrapper for fetching lists of popular notices.
- *
- * PHP version 5
- *
- * LICENCE: This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * @category  Widget
- * @package   StatusNet
- * @author    Evan Prodromou <evan@status.net>
- * @author    Brion Vibber <brion@status.net>
- * @copyright 2010 StatusNet, Inc.
- * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://status.net/
- */
-
-if (!defined('STATUSNET') && !defined('LACONICA')) {
-    exit(1);
-}
-
-/**
- * Wrapper for fetching notices ranked according to popularity,
- * broken out so it can be called from multiple actions with
- * less code duplication.
- */
-class Popularity
-{
-    public $limit = NOTICES_PER_PAGE;
-    public $offset = 0;
-    public $tag = false;
-    public $expiry = 600;
-
-    /**
-     * Run a cached query to fetch notices, whee!
-     *
-     * @return Notice
-     */
-    function getNotices()
-    {
-        // @fixme there should be a common func for this
-        if (common_config('db', 'type') == 'pgsql') {
-            if (!empty($this->tag)) {
-                $tag = pg_escape_string($this->tag);
-            }
-        } else {
-            if (!empty($this->tag)) {
-                 $tag = mysql_escape_string($this->tag);
-            }
-        }
-        $weightexpr = common_sql_weight('fave.modified', common_config('popular', 'dropoff'));
-        $cutoff = sprintf("fave.modified > '%s'",
-                          common_sql_date(time() - common_config('popular', 'cutoff')));
-        $qry = "SELECT notice.*, $weightexpr as weight ";
-        if(isset($tag)) {
-            $qry .= 'FROM notice_tag, notice JOIN fave ON notice.id = fave.notice_id ' .
-                    "WHERE $cutoff and notice.id = notice_tag.notice_id and '$tag' = notice_tag.tag";
-        } else {
-            $qry .= 'FROM notice JOIN fave ON notice.id = fave.notice_id ' .
-                    "WHERE $cutoff";
-        }
-        $qry .= ' 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,notice.conversation, ' .
-                'notice.lat,notice.lon,location_id,location_ns,notice.repeat_of';
-        $qry .= ' HAVING \'silenced\' NOT IN (SELECT role FROM profile_role WHERE profile_id=notice.profile_id)';
-        $qry .= ' ORDER BY weight DESC';
-
-        $offset = $this->offset;
-        $limit  = $this->limit + 1;
-
-        $qry .= ' LIMIT ' . $limit . ' OFFSET ' . $offset;
-
-        $notice = Memcached_DataObject::cachedQuery('Notice',
-                                                    $qry,
-                                                    1200);
-        return $notice;
-    }
-}
\ No newline at end of file
diff --git a/lib/popularnoticesection.php b/lib/popularnoticesection.php
index f6f27c6878..2000d302d4 100644
--- a/lib/popularnoticesection.php
+++ b/lib/popularnoticesection.php
@@ -22,7 +22,7 @@
  * @category  Widget
  * @package   StatusNet
  * @author    Evan Prodromou <evan@status.net>
- * @copyright 2009 StatusNet, Inc.
+ * @copyright 2009,2011 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
  */
@@ -45,15 +45,18 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
  */
 class PopularNoticeSection extends NoticeSection
 {
+    protected $viewer;
+
+    function __construct($out, $viewer)
+    {
+        parent::__construct($out);
+        $this->viewer = $viewer;
+    }
+
     function getNotices()
     {
-        $pop = new Popularity();
-        if (!empty($this->out->tag)) {
-            $pop->tag = $this->out->tag;
-        }
-        $pop->limit = NOTICES_PER_SECTION;
-        $pop->expiry = 1200;
-        return $pop->getNotices();
+        $stream = new PopularNoticeStream($this->viewer);
+        return $stream->getNotices(0, NOTICES_PER_SECTION + 1);
     }
 
     function title()
@@ -69,6 +72,12 @@ class PopularNoticeSection extends NoticeSection
 
     function moreUrl()
     {
-        return common_local_url('favorited');
+        if (common_config('singleuser', 'enabled')) {
+            $user = User::singleUser();
+            common_local_url('showfavorites', array('nickname' =>
+                                                    $user->nickname));
+        } else {
+            return common_local_url('favorited');
+        }
     }
 }
diff --git a/lib/popularnoticestream.php b/lib/popularnoticestream.php
new file mode 100644
index 0000000000..eeba541238
--- /dev/null
+++ b/lib/popularnoticestream.php
@@ -0,0 +1,92 @@
+<?php
+/**
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2011, StatusNet, Inc.
+ *
+ * Stream of notices sorted by popularity
+ * 
+ * PHP version 5
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Popular
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2011 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    // This check helps protect against security problems;
+    // your code file can't be executed directly from the web.
+    exit(1);
+}
+
+/**
+ * Stream of notices sorted by popularity
+ *
+ * @category  Popular
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2011 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+
+class PopularNoticeStream extends ScopingNoticeStream
+{
+    function __construct($profile=null)
+    {
+        parent::__construct(new CachingNoticeStream(new RawPopularNoticeStream(),
+                                                    'popular',
+                                                    false),
+                            $profile);
+    }
+}
+
+class RawPopularNoticeStream extends NoticeStream
+{
+    function getNoticeIds($offset, $limit, $since_id, $max_id)
+    {
+        $weightexpr = common_sql_weight('modified', common_config('popular', 'dropoff'));
+        $cutoff = sprintf("modified > '%s'",
+                          common_sql_date(time() - common_config('popular', 'cutoff')));
+
+        $fave = new Fave();
+        $fave->selectAdd();
+        $fave->selectAdd('notice_id');
+        $fave->selectAdd("$weightexpr as weight");
+        $fave->whereAdd($cutoff);
+        $fave->orderBy('weight DESC');
+        $fave->groupBy('notice_id');
+
+        if (!is_null($offset)) {
+            $fave->limit($offset, $limit);
+        }
+
+        // FIXME: $since_id, $max_id are ignored
+
+        $ids = array();
+
+        if ($fave->find()) {
+            while ($fave->fetch()) {
+                $ids[] = $fave->notice_id;
+            }
+        }
+
+        return $ids;
+    }
+}
+
diff --git a/lib/primarynav.php b/lib/primarynav.php
index 7a9815af7b..f765938903 100644
--- a/lib/primarynav.php
+++ b/lib/primarynav.php
@@ -86,16 +86,6 @@ class PrimaryNav extends Menu
                                 'nav_login');
             }
 
-            if (!empty($user) || !common_config('site', 'private')) {
-                $this->action->menuItem(common_local_url('noticesearch'),
-                                // TRANS: Menu item in primary navigation panel.
-                                _m('MENU','Search'),
-                                // TRANS: Menu item title in primary navigation panel.
-                                _('Search the site.'),
-                                false,
-                                'nav_search');
-            }
-
             Event::handle('EndPrimaryNav', array($this->action));
         }
 
diff --git a/lib/profileaction.php b/lib/profileaction.php
index 09ebcc5de0..45866b52f9 100644
--- a/lib/profileaction.php
+++ b/lib/profileaction.php
@@ -23,7 +23,7 @@
  * @package   StatusNet
  * @author    Evan Prodromou <evan@status.net>
  * @author    Sarven Capadisli <csarven@status.net>
- * @copyright 2008-2009 StatusNet, Inc.
+ * @copyright 2008-2011 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
  */
@@ -46,7 +46,7 @@ require_once INSTALLDIR.'/lib/groupminilist.php';
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
-class ProfileAction extends OwnerDesignAction
+class ProfileAction extends Action
 {
     var $page    = null;
     var $profile = null;
@@ -86,6 +86,13 @@ class ProfileAction extends OwnerDesignAction
             return false;
         }
 
+        $user = common_current_user();
+
+        if ($this->profile->hasRole(Profile_role::SILENCED) &&
+            (empty($user) || !$user->hasRight(Right::SILENCEUSER))) {
+            throw new ClientException(_('This profile has been silenced by site moderators'), 403);
+        }
+
         $this->tag = $this->trimmed('tag');
         $this->page = ($this->arg('page')) ? ($this->arg('page')+0) : 1;
         common_set_returnto($this->selfUrl());
@@ -259,7 +266,7 @@ class ProfileAction extends OwnerDesignAction
             // TRANS: H2 text for user group membership statistics.
             $this->statsSectionLink('usergroups', _('Groups'));
             $this->text(' ');
-            $this->text($this->profile->getGroups()->N);
+            $this->text($this->profile->getGroups(0, null)->N);
             $this->elementEnd('h2');
 
             if ($groups) {
diff --git a/lib/profileblock.php b/lib/profileblock.php
index 432df0da5a..8edc5d9ba1 100644
--- a/lib/profileblock.php
+++ b/lib/profileblock.php
@@ -61,6 +61,7 @@ abstract class ProfileBlock extends Widget
         $this->showName();
         $this->showLocation();
         $this->showHomepage();
+        $this->showOtherProfiles();
         $this->showDescription();
         $this->showTags();
     }
@@ -122,8 +123,41 @@ abstract class ProfileBlock extends Widget
 
     function showHomepage()
     {
+        $homepage = $this->homepage();
+
         if (!empty($homepage)) {
-            $this->out->element('a', 'profile_block_homepage', $homepage);
+            $this->out->element('a',
+                                array('href' => $homepage,
+                                      'rel' => 'me',
+                                      'class' => 'profile_block_homepage'),
+                                $homepage);
+        }
+    }
+
+    function showOtherProfiles()
+    {
+        $otherProfiles = $this->otherProfiles();
+
+        if (!empty($otherProfiles)) {
+
+            $this->out->elementStart('ul',
+                                     array('class' => 'profile_block_otherprofile_list'));
+
+            foreach ($otherProfiles as $otherProfile) {
+                $this->out->elementStart('li');
+                $this->out->elementStart('a',
+                                         array('href' => $otherProfile['href'],
+                                               'rel' => 'me',
+                                               'class' => 'profile_block_otherprofile',
+                                               'title' => $otherProfile['text']));
+                $this->out->element('img',
+                                    array('src' => $otherProfile['image'],
+                                          'class' => 'profile_block_otherprofile_icon'));
+                $this->out->elementEnd('a');
+                $this->out->elementEnd('li');
+            }
+
+            $this->out->elementEnd('ul');
         }
     }
 
diff --git a/lib/profilelist.php b/lib/profilelist.php
index 397ea19848..313cf76073 100644
--- a/lib/profilelist.php
+++ b/lib/profilelist.php
@@ -85,14 +85,20 @@ class ProfileList extends Widget
 
     function showProfiles()
     {
-        $cnt = 0;
+        // Note: we don't use fetchAll() because it's borked with query()
+
+        $profiles = array();
 
         while ($this->profile->fetch()) {
-            $cnt++;
-            if($cnt > PROFILES_PER_PAGE) {
-                break;
-            }
-            $pli = $this->newListItem($this->profile);
+            $profiles[] = clone($this->profile);
+        }
+
+        $cnt = count($profiles);
+
+        $max = min($cnt, $this->maxProfiles());
+
+        for ($i = 0; $i < $max; $i++) {
+            $pli = $this->newListItem($profiles[$i]);
             $pli->show();
         }
 
@@ -101,7 +107,17 @@ class ProfileList extends Widget
 
     function newListItem($profile)
     {
-        return new ProfileListItem($this->profile, $this->action);
+        return new ProfileListItem($profile, $this->action);
+    }
+
+    function maxProfiles()
+    {
+        return PROFILES_PER_PAGE;
+    }
+
+    function avatarSize()
+    {
+        return AVATAR_STREAM_SIZE;
     }
 }
 
@@ -186,7 +202,7 @@ class ProfileListItem extends Widget
         $avatar = $this->profile->getAvatar(AVATAR_STREAM_SIZE);
         $aAttrs = $this->linkAttributes();
         $this->out->elementStart('a', $aAttrs);
-        $this->out->element('img', array('src' => ($avatar) ? $avatar->displayUrl() : Avatar::defaultImage(AVATAR_STREAM_SIZE),
+        $this->out->element('img', array('src' => (!empty($avatar)) ? $avatar->displayUrl() : Avatar::defaultImage(AVATAR_STREAM_SIZE),
                                          'class' => 'photo avatar',
                                          'width' => AVATAR_STREAM_SIZE,
                                          'height' => AVATAR_STREAM_SIZE,
@@ -289,11 +305,10 @@ class ProfileListItem extends Widget
                 $usf = new UnsubscribeForm($this->out, $this->profile);
                 $usf->show();
             } else {
-                // We can't initiate sub for a remote OMB profile.
-                $remote = Remote_profile::staticGet('id', $this->profile->id);
-                if (empty($remote)) {
+                if (Event::handle('StartShowProfileListSubscribeButton', array($this))) {
                     $sf = new SubscribeForm($this->out, $this->profile);
                     $sf->show();
+                    Event::handle('EndShowProfileListSubscribeButton', array($this));
                 }
             }
             $this->out->elementEnd('li');
diff --git a/lib/profileminilist.php b/lib/profileminilist.php
index 36bfad770c..7418c89232 100644
--- a/lib/profileminilist.php
+++ b/lib/profileminilist.php
@@ -47,6 +47,7 @@ define('PROFILES_PER_MINILIST', 8);
 
 class ProfileMiniList extends ProfileList
 {
+    const MAX_PROFILES = PROFILES_PER_MINILIST; // put it in the class
 
     function startList()
     {
@@ -58,22 +59,15 @@ class ProfileMiniList extends ProfileList
         return new ProfileMiniListItem($profile, $this->action);
     }
 
-    function showProfiles()
+    function maxProfiles()
     {
-        $cnt = 0;
-
-        while ($this->profile->fetch()) {
-            $cnt++;
-            if ($cnt > PROFILES_PER_MINILIST) {
-                break;
-            }
-            $pli = $this->newListItem($this->profile);
-            $pli->show();
-        }
-
-        return $cnt;
+        return PROFILES_PER_MINILIST;
     }
 
+    function avatarSize()
+    {
+        return AVATAR_MINI_SIZE;
+    }
 }
 
 class ProfileMiniListItem extends ProfileListItem
diff --git a/lib/profilenoticestream.php b/lib/profilenoticestream.php
index 64cd31abc4..0cf088a702 100644
--- a/lib/profilenoticestream.php
+++ b/lib/profilenoticestream.php
@@ -47,15 +47,61 @@ if (!defined('STATUSNET')) {
 
 class ProfileNoticeStream extends ScopingNoticeStream
 {
+    var $streamProfile;
+    var $userProfile;
+
     function __construct($profile, $userProfile = -1)
     {
         if (is_int($userProfile) && $userProfile == -1) {
             $userProfile = Profile::current();
         }
+        $this->streamProfile = $profile;
+        $this->userProfile   = $userProfile;
         parent::__construct(new CachingNoticeStream(new RawProfileNoticeStream($profile),
                                                     'profile:notice_ids:' . $profile->id),
                             $userProfile);
     }
+
+    function getNoticeIds($offset, $limit, $sinceId = null, $maxId = null)
+    {
+        if ($this->impossibleStream()) {
+            return array();
+        } else {
+            return parent::getNoticeIds($offset, $limit, $since_id, $max_id);
+        }
+    }
+
+    function getNotices($offset, $limit, $sinceId = null, $maxId = null)
+    {
+        if ($this->impossibleStream()) {
+            return new ArrayWrapper(array());
+        } else {
+            return parent::getNotices($offset, $limit, $sinceId, $maxId);
+        }
+    }
+
+    function impossibleStream() 
+    {
+        $user = User::staticGet('id', $this->streamProfile->id);
+
+        // If it's a private stream, and no user or not a subscriber
+
+        if (!empty($user) && $user->private_stream && 
+            (empty($this->userProfile) || !$this->userProfile->isSubscribed($this->streamProfile))) {
+            return true;
+        }
+
+        // If it's a spammy stream, and no user or not a moderator
+
+        if (common_config('notice', 'hidespam')) {
+            if ($this->streamProfile->hasRole(Profile_role::SILENCED) &&
+                (empty($this->userProfile) || (($this->userProfile->id !== $this->streamProfile->id) && !$this->userProfile->hasRight(Right::REVIEWSPAM)))) {
+                return true;
+            }
+        }
+
+        return false;
+    }
 }
 
 /**
diff --git a/lib/publicgroupnav.php b/lib/publicgroupnav.php
index 77243fda7a..79190a11f0 100644
--- a/lib/publicgroupnav.php
+++ b/lib/publicgroupnav.php
@@ -62,20 +62,24 @@ class PublicGroupNav extends Menu
         $this->action->elementStart('ul', array('class' => 'nav'));
 
         if (Event::handle('StartPublicGroupNav', array($this))) {
-            // TRANS: Menu item in search group navigation panel.
-            $this->out->menuItem(common_local_url('public'), _m('MENU','Public'),
-                // TRANS: Menu item title in search group navigation panel.
-                _('Public timeline'), $this->actionName == 'public', 'nav_timeline_public');
+            if (!common_config('singleuser', 'enabled')) {
+                // TRANS: Menu item in search group navigation panel.
+                $this->out->menuItem(common_local_url('public'), _m('MENU','Public'),
+                                     // TRANS: Menu item title in search group navigation panel.
+                                     _('Public timeline'), $this->actionName == 'public', 'nav_timeline_public');
+            }
 
             // TRANS: Menu item in search group navigation panel.
             $this->out->menuItem(common_local_url('groups'), _m('MENU','Groups'),
                 // TRANS: Menu item title in search group navigation panel.
                 _('User groups'), $this->actionName == 'groups', 'nav_groups');
 
-            // TRANS: Menu item in search group navigation panel.
-            $this->out->menuItem(common_local_url('publictagcloud'), _m('MENU','Recent tags'),
-                // TRANS: Menu item title in search group navigation panel.
-                _('Recent tags'), $this->actionName == 'publictagcloud', 'nav_recent-tags');
+            if (!common_config('performance', 'high')) {
+                // TRANS: Menu item in search group navigation panel.
+                $this->out->menuItem(common_local_url('publictagcloud'), _m('MENU','Recent tags'),
+                                     // TRANS: Menu item title in search group navigation panel.
+                                     _('Recent tags'), $this->actionName == 'publictagcloud', 'nav_recent-tags');
+            }
 
             if (count(common_config('nickname', 'featured')) > 0) {
                 // TRANS: Menu item in search group navigation panel.
@@ -84,10 +88,12 @@ class PublicGroupNav extends Menu
                     _('Featured users'), $this->actionName == 'featured', 'nav_featured');
             }
 
-            // TRANS: Menu item in search group navigation panel.
-            $this->out->menuItem(common_local_url('favorited'), _m('MENU','Popular'),
-                // TRANS: Menu item title in search group navigation panel.
-                _('Popular notices'), $this->actionName == 'favorited', 'nav_timeline_favorited');
+            if (!common_config('singleuser', 'enabled')) {
+                // TRANS: Menu item in search group navigation panel.
+                $this->out->menuItem(common_local_url('favorited'), _m('MENU','Popular'),
+                                     // TRANS: Menu item title in search group navigation panel.
+                                     _('Popular notices'), $this->actionName == 'favorited', 'nav_timeline_favorited');
+            }
 
             Event::handle('EndPublicGroupNav', array($this));
         }
diff --git a/lib/queuemanager.php b/lib/queuemanager.php
index 1fa3417829..72eff6e463 100644
--- a/lib/queuemanager.php
+++ b/lib/queuemanager.php
@@ -233,7 +233,6 @@ abstract class QueueManager extends IoManager
 
         if (Event::handle('StartInitializeQueueManager', array($this))) {
             $this->connect('distrib', 'DistribQueueHandler');
-            $this->connect('omb', 'OmbQueueHandler');
             $this->connect('ping', 'PingQueueHandler');
             if (common_config('sms', 'enabled')) {
                 $this->connect('sms', 'SmsQueueHandler');
@@ -246,9 +245,6 @@ abstract class QueueManager extends IoManager
             $this->connect('acctmove', 'AccountMover');
             $this->connect('actmove', 'ActivityMover');
 
-            // Broadcasting profile updates to OMB remote subscribers
-            $this->connect('profile', 'ProfileQueueHandler');
-
             // For compat with old plugins not registering their own handlers.
             $this->connect('plugin', 'PluginQueueHandler');
         }
diff --git a/lib/right.php b/lib/right.php
index baa18d3c13..f00f590278 100644
--- a/lib/right.php
+++ b/lib/right.php
@@ -68,5 +68,7 @@ class Right
     const CREATEGROUP        = 'creategroup';
     const WEBLOGIN           = 'weblogin';
     const API                = 'api';
+    const REVIEWSPAM         = 'reviewspam';
+    const TRAINSPAM          = 'trainspam';
 }
 
diff --git a/lib/router.php b/lib/router.php
index 9ba8051522..25c436ac92 100644
--- a/lib/router.php
+++ b/lib/router.php
@@ -31,73 +31,6 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
-require_once 'Net/URL/Mapper.php';
-
-class StatusNet_URL_Mapper extends Net_URL_Mapper
-{
-    private static $_singleton = null;
-    private $_actionToPath = array();
-
-    private function __construct()
-    {
-    }
-
-    public static function getInstance($id = '__default__')
-    {
-        if (empty(self::$_singleton)) {
-            self::$_singleton = new StatusNet_URL_Mapper();
-        }
-        return self::$_singleton;
-    }
-
-    public function connect($path, $defaults = array(), $rules = array())
-    {
-        $result = null;
-        if (Event::handle('StartConnectPath', array(&$path, &$defaults, &$rules, &$result))) {
-            $result = parent::connect($path, $defaults, $rules);
-            if (array_key_exists('action', $defaults)) {
-                $action = $defaults['action'];
-            } elseif (array_key_exists('action', $rules)) {
-                $action = $rules['action'];
-            } else {
-                $action = null;
-            }
-            $this->_mapAction($action, $result);
-            Event::handle('EndConnectPath', array($path, $defaults, $rules, $result));
-        }
-        return $result;
-    }
-
-    protected function _mapAction($action, $path)
-    {
-        if (!array_key_exists($action, $this->_actionToPath)) {
-            $this->_actionToPath[$action] = array();
-        }
-        $this->_actionToPath[$action][] = $path;
-        return;
-    }
-
-    public function generate($values = array(), $qstring = array(), $anchor = '')
-    {
-        if (!array_key_exists('action', $values)) {
-            return parent::generate($values, $qstring, $anchor);
-        }
-
-        $action = $values['action'];
-
-        if (!array_key_exists($action, $this->_actionToPath)) {
-            return parent::generate($values, $qstring, $anchor);
-        }
-
-        $oldPaths    = $this->paths;
-        $this->paths = $this->_actionToPath[$action];
-        $result      = parent::generate($values, $qstring, $anchor);
-        $this->paths = $oldPaths;
-
-        return $result;
-    }
-}
-
 /**
  * URL Router
  *
@@ -113,8 +46,6 @@ class Router
 {
     var $m = null;
     static $inst = null;
-    static $bare = array('requesttoken', 'accesstoken', 'userauthorization',
-                         'postnotice', 'updateprofile', 'finishremotesubscribe');
 
     const REGEX_TAG = '[^\/]+'; // [\pL\pN_\-\.]{1,64} better if we can do unicode regexes
 
@@ -138,19 +69,7 @@ class Router
     function __construct()
     {
         if (empty($this->m)) {
-            if (!common_config('router', 'cache')) {
-                $this->m = $this->initialize();
-            } else {
-                $k = self::cacheKey();
-                $c = Cache::instance();
-                $m = $c->get($k);
-                if (!empty($m)) {
-                    $this->m = $m;
-                } else {
-                    $this->m = $this->initialize();
-                    $c->set($k, $this->m);
-                }
-            }
+            $this->m = $this->initialize();
         }
     }
 
@@ -161,8 +80,8 @@ class Router
      * you're running and the plugins that are enabled. To avoid having bad routes
      * get stuck in the cache, the key includes a list of plugins and the software
      * version.
-     *
-     * There can still be problems with a) differences in versions of the plugins and
+     * 
+    * There can still be problems with a) differences in versions of the plugins and
      * b) people running code between official versions, but these tend to be more
      * sophisticated users who can grok what's going on and clear their caches.
      *
@@ -185,7 +104,7 @@ class Router
 
     function initialize()
     {
-        $m = StatusNet_URL_Mapper::getInstance();
+        $m = new URLMapper();
 
         if (Event::handle('StartInitializeRouter', array(&$m))) {
 
@@ -205,6 +124,20 @@ class Router
                         array('user_id' => '[0-9]+',
                               'token' => '.+'));
 
+            // these take a code; before the main part
+
+            foreach (array('register', 'confirmaddress', 'recoverpassword') as $c) {
+                $m->connect('main/'.$c.'/:code', array('action' => $c));
+            }
+
+            // Also need a block variant accepting ID on URL for mail links
+            $m->connect('main/block/:profileid',
+                        array('action' => 'block'),
+                        array('profileid' => '[0-9]+'));
+
+            $m->connect('main/sup/:seconds', array('action' => 'sup'),
+                        array('seconds' => '[0-9]+'));
+
             // main stuff is repetitive
 
             $main = array('login', 'logout', 'register', 'subscribe',
@@ -223,24 +156,18 @@ class Router
                           'backupaccount',
                           'deleteaccount',
                           'restoreaccount',
+                          'top',
             );
 
             foreach ($main as $a) {
                 $m->connect('main/'.$a, array('action' => $a));
             }
 
-            // Also need a block variant accepting ID on URL for mail links
-            $m->connect('main/block/:profileid',
-                        array('action' => 'block'),
-                        array('profileid' => '[0-9]+'));
-
-            $m->connect('main/sup/:seconds', array('action' => 'sup'),
-                        array('seconds' => '[0-9]+'));
-
-            $m->connect('main/tagprofile', array('action' => 'tagprofile'));
             $m->connect('main/tagprofile/:id', array('action' => 'tagprofile'),
                                                array('id' => '[0-9]+'));
 
+            $m->connect('main/tagprofile', array('action' => 'tagprofile'));
+
             $m->connect('main/oembed',
                         array('action' => 'oembed'));
 
@@ -251,28 +178,17 @@ class Router
             $m->connect('main/xrd',
                         array('action' => 'userxrd'));
 
-            // these take a code
-
-            foreach (array('register', 'confirmaddress', 'recoverpassword') as $c) {
-                $m->connect('main/'.$c.'/:code', array('action' => $c));
-            }
-
-            // exceptional
-
-            $m->connect('main/remote', array('action' => 'remotesubscribe'));
-            $m->connect('main/remote?nickname=:nickname', array('action' => 'remotesubscribe'), array('nickname' => '[A-Za-z0-9_-]+'));
-
-            foreach (Router::$bare as $action) {
-                $m->connect('index.php?action=' . $action, array('action' => $action));
-            }
-
             // settings
 
             foreach (array('profile', 'avatar', 'password', 'im', 'oauthconnections',
-                           'oauthapps', 'email', 'sms', 'userdesign', 'url') as $s) {
+                           'oauthapps', 'email', 'sms', 'url') as $s) {
                 $m->connect('settings/'.$s, array('action' => $s.'settings'));
             }
 
+            if (common_config('oldschool', 'enabled')) {
+                $m->connect('settings/oldschool', array('action' => 'oldschoolsettings'));
+            }
+
             $m->connect('settings/oauthapps/show/:id',
                         array('action' => 'showapplication'),
                         array('id' => '[0-9]+')
@@ -292,18 +208,18 @@ class Router
             // 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/'.$s, array('action' => $s.'search'));
             }
 
             // The second of these is needed to make the link work correctly
             // when inserted into the page. The first is needed to match the
             // route on the way in. Seems to be another Net_URL_Mapper bug to me.
-            $m->connect('search/notice/rss', array('action' => 'noticesearchrss'));
             $m->connect('search/notice/rss?q=:q', array('action' => 'noticesearchrss'),
                         array('q' => '.+'));
+            $m->connect('search/notice/rss', array('action' => 'noticesearchrss'));
 
             $m->connect('attachment/:attachment',
                         array('action' => 'attachment'),
@@ -317,15 +233,17 @@ class Router
                         array('action' => 'attachment_thumbnail'),
                         array('attachment' => '[0-9]+'));
 
-            $m->connect('notice/new', array('action' => 'newnotice'));
-            $m->connect('notice/new?replyto=:replyto',
-                        array('action' => 'newnotice'),
-                        array('replyto' => Nickname::DISPLAY_FMT));
             $m->connect('notice/new?replyto=:replyto&inreplyto=:inreplyto',
                         array('action' => 'newnotice'),
                         array('replyto' => Nickname::DISPLAY_FMT),
                         array('inreplyto' => '[0-9]+'));
 
+            $m->connect('notice/new?replyto=:replyto',
+                        array('action' => 'newnotice'),
+                        array('replyto' => Nickname::DISPLAY_FMT));
+
+            $m->connect('notice/new', array('action' => 'newnotice'));
+
             $m->connect('notice/:notice/file',
                         array('action' => 'file'),
                         array('notice' => '[0-9]+'));
@@ -333,11 +251,13 @@ class Router
             $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('notice/delete', array('action' => 'deletenotice'));
+
             $m->connect('bookmarklet/new', array('action' => 'bookmarklet'));
 
             // conversation
@@ -359,10 +279,12 @@ class Router
                         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'));
+            if (!common_config('performance', 'high')) {
+                $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' => self::REGEX_TAG));
@@ -383,7 +305,7 @@ class Router
                             array('id' => '[0-9]+'));
             }
 
-            foreach (array('members', 'logo', 'rss', 'designsettings') as $n) {
+            foreach (array('members', 'logo', 'rss') as $n) {
                 $m->connect('group/:nickname/'.$n,
                             array('action' => 'group'.$n),
                             array('nickname' => Nickname::DISPLAY_FMT));
@@ -413,6 +335,10 @@ class Router
                         array('action' => 'showgroup'),
                         array('nickname' => Nickname::DISPLAY_FMT));
 
+            $m->connect('group/:nickname/',
+                        array('action' => 'showgroup'),
+                        array('nickname' => Nickname::DISPLAY_FMT));
+
             $m->connect('group/', array('action' => 'groups'));
             $m->connect('group', array('action' => 'groups'));
             $m->connect('groups/', array('action' => 'groups'));
@@ -431,17 +357,13 @@ class Router
                         array('action' => 'ApiTimelinePublic',
                               'format' => '(xml|json|rss|atom|as)'));
 
-            $m->connect('api/statuses/friends_timeline.:format',
-                        array('action' => 'ApiTimelineFriends',
-                              'format' => '(xml|json|rss|atom|as)'));
-
             $m->connect('api/statuses/friends_timeline/:id.:format',
                         array('action' => 'ApiTimelineFriends',
                               'id' => Nickname::INPUT_FMT,
                               'format' => '(xml|json|rss|atom|as)'));
 
-            $m->connect('api/statuses/home_timeline.:format',
-                        array('action' => 'ApiTimelineHome',
+            $m->connect('api/statuses/friends_timeline.:format',
+                        array('action' => 'ApiTimelineFriends',
                               'format' => '(xml|json|rss|atom|as)'));
 
             $m->connect('api/statuses/home_timeline/:id.:format',
@@ -449,8 +371,8 @@ class Router
                               'id' => Nickname::INPUT_FMT,
                               'format' => '(xml|json|rss|atom|as)'));
 
-            $m->connect('api/statuses/user_timeline.:format',
-                        array('action' => 'ApiTimelineUser',
+            $m->connect('api/statuses/home_timeline.:format',
+                        array('action' => 'ApiTimelineHome',
                               'format' => '(xml|json|rss|atom|as)'));
 
             $m->connect('api/statuses/user_timeline/:id.:format',
@@ -458,8 +380,8 @@ class Router
                               'id' => Nickname::INPUT_FMT,
                               'format' => '(xml|json|rss|atom|as)'));
 
-            $m->connect('api/statuses/mentions.:format',
-                        array('action' => 'ApiTimelineMentions',
+            $m->connect('api/statuses/user_timeline.:format',
+                        array('action' => 'ApiTimelineUser',
                               'format' => '(xml|json|rss|atom|as)'));
 
             $m->connect('api/statuses/mentions/:id.:format',
@@ -467,7 +389,7 @@ class Router
                               'id' => Nickname::INPUT_FMT,
                               'format' => '(xml|json|rss|atom|as)'));
 
-            $m->connect('api/statuses/replies.:format',
+            $m->connect('api/statuses/mentions.:format',
                         array('action' => 'ApiTimelineMentions',
                               'format' => '(xml|json|rss|atom|as)'));
 
@@ -476,6 +398,10 @@ class Router
                               'id' => Nickname::INPUT_FMT,
                               'format' => '(xml|json|rss|atom|as)'));
 
+            $m->connect('api/statuses/replies.:format',
+                        array('action' => 'ApiTimelineMentions',
+                              'format' => '(xml|json|rss|atom|as)'));
+
             $m->connect('api/statuses/retweeted_by_me.:format',
                         array('action' => 'ApiTimelineRetweetedByMe',
                               'format' => '(xml|json|atom|as)'));
@@ -488,17 +414,13 @@ class Router
                         array('action' => 'ApiTimelineRetweetsOfMe',
                               'format' => '(xml|json|atom|as)'));
 
-            $m->connect('api/statuses/friends.:format',
-                        array('action' => 'ApiUserFriends',
-                              'format' => '(xml|json)'));
-
             $m->connect('api/statuses/friends/:id.:format',
                         array('action' => 'ApiUserFriends',
                               'id' => Nickname::INPUT_FMT,
                               'format' => '(xml|json)'));
 
-            $m->connect('api/statuses/followers.:format',
-                        array('action' => 'ApiUserFollowers',
+            $m->connect('api/statuses/friends.:format',
+                        array('action' => 'ApiUserFriends',
                               'format' => '(xml|json)'));
 
             $m->connect('api/statuses/followers/:id.:format',
@@ -506,28 +428,32 @@ class Router
                               'id' => Nickname::INPUT_FMT,
                               'format' => '(xml|json)'));
 
-            $m->connect('api/statuses/show.:format',
-                        array('action' => 'ApiStatusesShow',
-                              'format' => '(xml|json|atom)'));
+            $m->connect('api/statuses/followers.:format',
+                        array('action' => 'ApiUserFollowers',
+                              'format' => '(xml|json)'));
 
             $m->connect('api/statuses/show/:id.:format',
                         array('action' => 'ApiStatusesShow',
                               'id' => '[0-9]+',
                               'format' => '(xml|json|atom)'));
 
+            $m->connect('api/statuses/show.:format',
+                        array('action' => 'ApiStatusesShow',
+                              'format' => '(xml|json|atom)'));
+
             $m->connect('api/statuses/update.:format',
                         array('action' => 'ApiStatusesUpdate',
                               'format' => '(xml|json)'));
 
-            $m->connect('api/statuses/destroy.:format',
-                        array('action' => 'ApiStatusesDestroy',
-                              'format' => '(xml|json)'));
-
             $m->connect('api/statuses/destroy/:id.:format',
                         array('action' => 'ApiStatusesDestroy',
                               'id' => '[0-9]+',
                               'format' => '(xml|json)'));
 
+            $m->connect('api/statuses/destroy.:format',
+                        array('action' => 'ApiStatusesDestroy',
+                              'format' => '(xml|json)'));
+
             $m->connect('api/statuses/retweet/:id.:format',
                         array('action' => 'ApiStatusesRetweet',
                               'id' => '[0-9]+',
@@ -540,15 +466,15 @@ class Router
 
             // users
 
-            $m->connect('api/users/show.:format',
-                        array('action' => 'ApiUserShow',
-                              'format' => '(xml|json)'));
-
             $m->connect('api/users/show/:id.:format',
                         array('action' => 'ApiUserShow',
                               'id' => Nickname::INPUT_FMT,
                               'format' => '(xml|json)'));
 
+            $m->connect('api/users/show.:format',
+                        array('action' => 'ApiUserShow',
+                              'format' => '(xml|json)'));
+
             $m->connect('api/users/profile_image/:screen_name.:format',
                         array('action' => 'ApiUserProfileImage',
                               'screen_name' => Nickname::DISPLAY_FMT,
@@ -579,24 +505,24 @@ class Router
                         array('action' => 'ApiFriendshipsExists',
                               'format' => '(xml|json)'));
 
-            $m->connect('api/friendships/create.:format',
-                        array('action' => 'ApiFriendshipsCreate',
-                              'format' => '(xml|json)'));
-
-            $m->connect('api/friendships/destroy.:format',
-                        array('action' => 'ApiFriendshipsDestroy',
-                              'format' => '(xml|json)'));
-
             $m->connect('api/friendships/create/:id.:format',
                         array('action' => 'ApiFriendshipsCreate',
                               'id' => Nickname::INPUT_FMT,
                               'format' => '(xml|json)'));
 
+            $m->connect('api/friendships/create.:format',
+                        array('action' => 'ApiFriendshipsCreate',
+                              'format' => '(xml|json)'));
+
             $m->connect('api/friendships/destroy/:id.:format',
                         array('action' => 'ApiFriendshipsDestroy',
                               'id' => Nickname::INPUT_FMT,
                               'format' => '(xml|json)'));
 
+            $m->connect('api/friendships/destroy.:format',
+                        array('action' => 'ApiFriendshipsDestroy',
+                              'format' => '(xml|json)'));
+
             // Social graph
 
             $m->connect('api/friends/ids/:id.:format',
@@ -626,12 +552,6 @@ class Router
             $m->connect('api/account/update_profile_image.:format',
                         array('action' => 'ApiAccountUpdateProfileImage'));
 
-            $m->connect('api/account/update_profile_background_image.:format',
-                        array('action' => 'ApiAccountUpdateProfileBackgroundImage'));
-
-            $m->connect('api/account/update_profile_colors.:format',
-                        array('action' => 'ApiAccountUpdateProfileColors'));
-
             $m->connect('api/account/update_delivery_device.:format',
                         array('action' => 'ApiAccountUpdateDeliveryDevice'));
 
@@ -645,15 +565,15 @@ class Router
 
             // favorites
 
-            $m->connect('api/favorites.:format',
-                        array('action' => 'ApiTimelineFavorites',
-                              'format' => '(xml|json|rss|atom|as)'));
-
             $m->connect('api/favorites/:id.:format',
                         array('action' => 'ApiTimelineFavorites',
                               'id' => Nickname::INPUT_FMT,
                               'format' => '(xml|json|rss|atom|as)'));
 
+            $m->connect('api/favorites.:format',
+                        array('action' => 'ApiTimelineFavorites',
+                              'format' => '(xml|json|rss|atom|as)'));
+
             $m->connect('api/favorites/create/:id.:format',
                         array('action' => 'ApiFavoriteCreate',
                               'id' => '[0-9]+',
@@ -665,12 +585,17 @@ class Router
                               'format' => '(xml|json)'));
             // blocks
 
+            $m->connect('api/blocks/create/:id.:format',
+                        array('action' => 'ApiBlockCreate',
+                              'id' => Nickname::INPUT_FMT,
+                              'format' => '(xml|json)'));
+
             $m->connect('api/blocks/create.:format',
                         array('action' => 'ApiBlockCreate',
                               'format' => '(xml|json)'));
 
-            $m->connect('api/blocks/create/:id.:format',
-                        array('action' => 'ApiBlockCreate',
+            $m->connect('api/blocks/destroy/:id.:format',
+                        array('action' => 'ApiBlockDestroy',
                               'id' => Nickname::INPUT_FMT,
                               'format' => '(xml|json)'));
 
@@ -678,10 +603,6 @@ class Router
                         array('action' => 'ApiBlockDestroy',
                               'format' => '(xml|json)'));
 
-            $m->connect('api/blocks/destroy/:id.:format',
-                        array('action' => 'ApiBlockDestroy',
-                              'id' => Nickname::INPUT_FMT,
-                              'format' => '(xml|json)'));
             // help
 
             $m->connect('api/help/test.:format',
@@ -719,13 +640,17 @@ class Router
                               'id' => Nickname::INPUT_FMT,
                               'format' => '(xml|json|rss|atom|as)'));
 
+            $m->connect('api/statusnet/groups/show/:id.:format',
+                        array('action' => 'ApiGroupShow',
+                              'id' => Nickname::INPUT_FMT,
+                              'format' => '(xml|json)'));
+
             $m->connect('api/statusnet/groups/show.:format',
                         array('action' => 'ApiGroupShow',
                               'format' => '(xml|json)'));
 
-            $m->connect('api/statusnet/groups/show/:id.:format',
-                        array('action' => 'ApiGroupShow',
-                              'id' => Nickname::INPUT_FMT,
+            $m->connect('api/statusnet/groups/join/:id.:format',
+                        array('action' => 'ApiGroupJoin',
                               'format' => '(xml|json)'));
 
             $m->connect('api/statusnet/groups/join.:format',
@@ -733,8 +658,8 @@ class Router
                               'id' => Nickname::INPUT_FMT,
                               'format' => '(xml|json)'));
 
-            $m->connect('api/statusnet/groups/join/:id.:format',
-                        array('action' => 'ApiGroupJoin',
+            $m->connect('api/statusnet/groups/leave/:id.:format',
+                        array('action' => 'ApiGroupLeave',
                               'format' => '(xml|json)'));
 
             $m->connect('api/statusnet/groups/leave.:format',
@@ -742,36 +667,32 @@ class Router
                               'id' => Nickname::INPUT_FMT,
                               'format' => '(xml|json)'));
 
-            $m->connect('api/statusnet/groups/leave/:id.:format',
-                        array('action' => 'ApiGroupLeave',
-                              'format' => '(xml|json)'));
-
             $m->connect('api/statusnet/groups/is_member.:format',
                         array('action' => 'ApiGroupIsMember',
                               'format' => '(xml|json)'));
 
-            $m->connect('api/statusnet/groups/list.:format',
-                        array('action' => 'ApiGroupList',
-                              'format' => '(xml|json|rss|atom)'));
-
             $m->connect('api/statusnet/groups/list/:id.:format',
                         array('action' => 'ApiGroupList',
                               'id' => Nickname::INPUT_FMT,
                               'format' => '(xml|json|rss|atom)'));
 
+            $m->connect('api/statusnet/groups/list.:format',
+                        array('action' => 'ApiGroupList',
+                              'format' => '(xml|json|rss|atom)'));
+
             $m->connect('api/statusnet/groups/list_all.:format',
                         array('action' => 'ApiGroupListAll',
                               'format' => '(xml|json|rss|atom)'));
 
-            $m->connect('api/statusnet/groups/membership.:format',
-                        array('action' => 'ApiGroupMembership',
-                              'format' => '(xml|json)'));
-
             $m->connect('api/statusnet/groups/membership/:id.:format',
                         array('action' => 'ApiGroupMembership',
                               'id' => Nickname::INPUT_FMT,
                               'format' => '(xml|json)'));
 
+            $m->connect('api/statusnet/groups/membership.:format',
+                        array('action' => 'ApiGroupMembership',
+                              'format' => '(xml|json)'));
+
             $m->connect('api/statusnet/groups/create.:format',
                         array('action' => 'ApiGroupCreate',
                               'format' => '(xml|json)'));
@@ -780,6 +701,11 @@ class Router
                         array('action' => 'ApiGroupProfileUpdate',
                               'id' => '[a-zA-Z0-9]+',
                               'format' => '(xml|json)'));
+                              
+            $m->connect('api/statusnet/conversation/:id.:format',
+                        array('action' => 'apiconversation',
+                              'id' => '[0-9]+',
+                              'format' => '(xml|json|rss|atom|as)'));
 
             // Lists (people tags)
 
@@ -800,39 +726,28 @@ class Router
                         array('action' => 'ApiListSubscriptions',
                               'user' => '[a-zA-Z0-9]+',
                               'format' => '(xml|json)'));
+
             $m->connect('api/lists.:format',
                         array('action' => 'ApiLists',
                               'format' => '(xml|json)'));
 
-            $m->connect('api/:user/lists.:format',
-                        array('action' => 'ApiLists',
-                              'user' => '[a-zA-Z0-9]+',
-                              'format' => '(xml|json)'));
-
             $m->connect('api/:user/lists/:id.:format',
                         array('action' => 'ApiList',
                               'user' => '[a-zA-Z0-9]+',
                               'id' => '[a-zA-Z0-9]+',
                               'format' => '(xml|json)'));
 
+            $m->connect('api/:user/lists.:format',
+                        array('action' => 'ApiLists',
+                              'user' => '[a-zA-Z0-9]+',
+                              'format' => '(xml|json)'));
+
             $m->connect('api/:user/lists/:id/statuses.:format',
                         array('action' => 'ApiTimelineList',
                               'user' => '[a-zA-Z0-9]+',
                               'id' => '[a-zA-Z0-9]+',
                               'format' => '(xml|json|rss|atom)'));
 
-            $m->connect('api/:user/:list_id/members.:format',
-                        array('action' => 'ApiListMembers',
-                              'user' => '[a-zA-Z0-9]+',
-                              'list_id' => '[a-zA-Z0-9]+',
-                              'format' => '(xml|json)'));
-
-            $m->connect('api/:user/:list_id/subscribers.:format',
-                        array('action' => 'ApiListSubscribers',
-                              'user' => '[a-zA-Z0-9]+',
-                              'list_id' => '[a-zA-Z0-9]+',
-                              'format' => '(xml|json)'));
-
             $m->connect('api/:user/:list_id/members/:id.:format',
                         array('action' => 'ApiListMember',
                               'user' => '[a-zA-Z0-9]+',
@@ -840,6 +755,12 @@ class Router
                               'id' => '[a-zA-Z0-9]+',
                               'format' => '(xml|json)'));
 
+            $m->connect('api/:user/:list_id/members.:format',
+                        array('action' => 'ApiListMembers',
+                              'user' => '[a-zA-Z0-9]+',
+                              'list_id' => '[a-zA-Z0-9]+',
+                              'format' => '(xml|json)'));
+
             $m->connect('api/:user/:list_id/subscribers/:id.:format',
                         array('action' => 'ApiListSubscriber',
                               'user' => '[a-zA-Z0-9]+',
@@ -847,6 +768,12 @@ class Router
                               'id' => '[a-zA-Z0-9]+',
                               'format' => '(xml|json)'));
 
+            $m->connect('api/:user/:list_id/subscribers.:format',
+                        array('action' => 'ApiListSubscribers',
+                              'user' => '[a-zA-Z0-9]+',
+                              'list_id' => '[a-zA-Z0-9]+',
+                              'format' => '(xml|json)'));
+
             // Tags
             $m->connect('api/statusnet/tags/timeline/:tag.:format',
                         array('action' => 'ApiTimelineTag',
@@ -875,7 +802,6 @@ class Router
             // Admin
 
             $m->connect('panel/site', array('action' => 'siteadminpanel'));
-            $m->connect('panel/design', array('action' => 'designadminpanel'));
             $m->connect('panel/user', array('action' => 'useradminpanel'));
 	        $m->connect('panel/access', array('action' => 'accessadminpanel'));
             $m->connect('panel/paths', array('action' => 'pathsadminpanel'));
@@ -896,6 +822,22 @@ class Router
                         array('action' => 'getfile'),
                         array('filename' => '[A-Za-z0-9._-]+'));
 
+            // Common people-tag stuff
+
+            $m->connect('peopletag/:tag', array('action' => 'peopletag',
+                                                'tag'    => self::REGEX_TAG));
+
+            $m->connect('selftag/:tag', array('action' => 'selftag',
+                                              'tag'    => self::REGEX_TAG));
+
+            $m->connect('main/addpeopletag', array('action' => 'addpeopletag'));
+
+            $m->connect('main/removepeopletag', array('action' => 'removepeopletag'));
+
+            $m->connect('main/profilecompletion', array('action' => 'profilecompletion'));
+
+            $m->connect('main/peopletagautocomplete', array('action' => 'peopletagautocomplete'));
+
             // In the "root"
 
             if (common_config('singleuser', 'enabled')) {
@@ -903,8 +845,8 @@ class Router
                 $nickname = User::singleUserNickname();
 
                 foreach (array('subscriptions', 'subscribers',
-                               'all', 'foaf', 'xrds',
-                               'replies', 'microsummary', 'hcard') as $a) {
+                               'all', 'foaf', 'replies',
+                               'microsummary') as $a) {
                     $m->connect($a,
                                 array('action' => $a,
                                       'nickname' => $nickname));
@@ -959,6 +901,57 @@ class Router
                 $m->connect('',
                             array('action' => 'showstream',
                                   'nickname' => $nickname));
+
+                // peopletags
+
+                $m->connect('peopletags',
+                            array('action' => 'peopletagsbyuser'));
+
+                $m->connect('peopletags/private',
+                            array('action' => 'peopletagsbyuser',
+                                  'private' => 1));
+
+                $m->connect('peopletags/public',
+                            array('action' => 'peopletagsbyuser',
+                                  'public' => 1));
+
+                $m->connect('othertags',
+                            array('action' => 'peopletagsforuser'));
+
+                $m->connect('peopletagsubscriptions',
+                            array('action' => 'peopletagsubscriptions'));
+
+                $m->connect('all/:tag/subscribers',
+                            array('action' => 'peopletagsubscribers',
+                                  'tag' => self::REGEX_TAG));
+
+                $m->connect('all/:tag/tagged',
+                                array('action' => 'peopletagged',
+                                      'tag' => self::REGEX_TAG));
+
+                $m->connect('all/:tag/edit',
+                                array('action' => 'editpeopletag',
+                                      'tag' => self::REGEX_TAG));
+
+                foreach(array('subscribe', 'unsubscribe') as $v) {
+                    $m->connect('peopletag/:id/'.$v,
+                                    array('action' => $v.'peopletag',
+                                          'id' => '[0-9]{1,64}'));
+                }
+                $m->connect('user/:tagger_id/profiletag/:id/id',
+                                array('action' => 'profiletagbyid',
+                                      'tagger_id' => '[0-9]+',
+                                      'id' => '[0-9]+'));
+
+                $m->connect('all/:tag',
+                                array('action' => 'showprofiletag',
+                                      'tag' => self::REGEX_TAG));
+
+                foreach (array('subscriptions', 'subscribers') as $a) {
+                    $m->connect($a.'/:tag',
+                                array('action' => $a),
+                                array('tag' => self::REGEX_TAG));
+                }
             } else {
                 $m->connect('', array('action' => 'public'));
                 $m->connect('rss', array('action' => 'publicrss'));
@@ -971,8 +964,8 @@ class Router
                 $m->connect('rsd.xml', array('action' => 'rsd'));
 
                 foreach (array('subscriptions', 'subscribers',
-                               'nudge', 'all', 'foaf', 'xrds',
-                               'replies', 'inbox', 'outbox', 'microsummary', 'hcard') as $a) {
+                               'nudge', 'all', 'foaf', 'replies',
+                               'inbox', 'outbox', 'microsummary') as $a) {
                     $m->connect(':nickname/'.$a,
                                 array('action' => $a),
                                 array('nickname' => Nickname::DISPLAY_FMT));
@@ -983,22 +976,6 @@ class Router
 
                 // people tags
 
-                $m->connect('peopletags', array('action' => 'publicpeopletagcloud'));
-
-                $m->connect('peopletag/:tag', array('action' => 'peopletag',
-                                                    'tag'    => self::REGEX_TAG));
-
-                $m->connect('selftag/:tag', array('action' => 'selftag',
-                                                  'tag'    => self::REGEX_TAG));
-
-                $m->connect('main/addpeopletag', array('action' => 'addpeopletag'));
-
-                $m->connect('main/removepeopletag', array('action' => 'removepeopletag'));
-
-                $m->connect('main/profilecompletion', array('action' => 'profilecompletion'));
-
-                $m->connect('main/peopletagautocomplete', array('action' => 'peopletagautocomplete'));
-
                 $m->connect(':nickname/peopletags',
                                 array('action' => 'peopletagsbyuser',
                                       'nickname' => Nickname::DISPLAY_FMT));
@@ -1096,6 +1073,10 @@ class Router
                 $m->connect(':nickname',
                             array('action' => 'showstream'),
                             array('nickname' => Nickname::DISPLAY_FMT));
+
+                $m->connect(':nickname/',
+                            array('action' => 'showstream'),
+                            array('nickname' => Nickname::DISPLAY_FMT));
             }
 
             // AtomPub API
@@ -1152,7 +1133,7 @@ class Router
     {
         try {
             $match = $this->m->match($path);
-        } catch (Net_URL_Mapper_InvalidException $e) {
+        } catch (Exception $e) {
             common_log(LOG_ERR, "Problem getting route for $path - " .
                        $e->getMessage());
             // TRANS: Client error on action trying to visit a non-existing page.
@@ -1174,7 +1155,6 @@ class Router
         }
 
         $url = $this->m->generate($args, $params, $fragment);
-
         // Due to a bug in the Net_URL_Mapper code, the returned URL may
         // contain a malformed query of the form ?p1=v1?p2=v2?p3=v3. We
         // repair that here rather than modifying the upstream code...
diff --git a/lib/schema.php b/lib/schema.php
index 2e27955881..92555499ba 100644
--- a/lib/schema.php
+++ b/lib/schema.php
@@ -107,9 +107,11 @@ class Schema
     {
         $td = $this->getTableDef($table);
 
-        foreach ($td->columns as $cd) {
-            if ($cd->name == $column) {
-                return $cd;
+        if (!empty($td) && !empty($td->columns)) {
+            foreach ($td->columns as $cd) {
+                if ($cd->name == $column) {
+                    return $cd;
+                }
             }
         }
 
@@ -560,12 +562,18 @@ class Schema
         $uniques = $this->diffArrays($old, $def, 'unique keys');
         $indexes = $this->diffArrays($old, $def, 'indexes');
         $foreign = $this->diffArrays($old, $def, 'foreign keys');
+        $fulltext = $this->diffArrays($old, $def, 'fulltext indexes');
 
         // Drop any obsolete or modified indexes ahead...
         foreach ($indexes['del'] + $indexes['mod'] as $indexName) {
             $this->appendDropIndex($statements, $tableName, $indexName);
         }
 
+        // Drop any obsolete or modified fulltext indexes ahead...
+        foreach ($fulltext['del'] + $fulltext['mod'] as $indexName) {
+            $this->appendDropIndex($statements, $tableName, $indexName);
+        }
+
         // For efficiency, we want this all in one
         // query, instead of using our methods.
 
@@ -579,6 +587,10 @@ class Schema
             $this->appendAlterDropUnique($phrase, $keyName);
         }
 
+        if (isset($old['primary key']) && (!isset($def['primary key']) || $def['primary key'] != $old['primary key'])) {
+            $this->appendAlterDropPrimary($phrase);
+        }
+
         foreach ($fields['add'] as $columnName) {
             $this->appendAlterAddColumn($phrase, $columnName,
                     $def['fields'][$columnName]);
@@ -594,6 +606,10 @@ class Schema
             $this->appendAlterDropColumn($phrase, $columnName);
         }
 
+        if (isset($def['primary key']) && (!isset($old['primary key']) || $old['primary key'] != $def['primary key'])) {
+            $this->appendAlterAddPrimary($phrase, $def['primary key']);
+        }
+
         foreach ($uniques['mod'] + $uniques['add'] as $keyName) {
             $this->appendAlterAddUnique($phrase, $keyName, $def['unique keys'][$keyName]);
         }
@@ -614,6 +630,11 @@ class Schema
             $this->appendCreateIndex($statements, $tableName, $indexName, $def['indexes'][$indexName]);
         }
 
+        foreach ($fulltext['mod'] + $fulltext['add'] as $indexName) {
+            $colDef = $def['fulltext indexes'][$indexName];
+            $this->appendCreateFulltextIndex($statements, $tableName, $indexName, $colDef);
+        }
+
         return $statements;
     }
 
@@ -713,6 +734,19 @@ class Schema
         $phrase[] = implode(' ', $sql);
     }
 
+    function appendAlterAddPrimary(array &$phrase, array $def)
+    {
+        $sql = array();
+        $sql[] = 'ADD';
+        $this->appendPrimaryKeyDef($sql, $def);
+        $phrase[] = implode(' ', $sql);
+    }
+
+    function appendAlterDropPrimary(array &$phrase)
+    {
+        $phrase[] = 'DROP CONSTRAINT PRIMARY KEY';
+    }
+
     function appendAlterDropUnique(array &$phrase, $keyName)
     {
         $phrase[] = 'DROP CONSTRAINT ' . $keyName;
diff --git a/lib/scopingnoticestream.php b/lib/scopingnoticestream.php
index 30b80f10e5..9a101fa3ac 100644
--- a/lib/scopingnoticestream.php
+++ b/lib/scopingnoticestream.php
@@ -73,4 +73,26 @@ class ScopingNoticeStream extends FilteringNoticeStream
     {
         return $notice->inScope($this->profile);
     }
+
+    function prefill($notices)
+    {
+        // XXX: this should probably only be in the scoping one.
+            
+        Notice::fillGroups($notices);
+        Notice::fillReplies($notices);
+
+        if (common_config('notice', 'hidespam')) {
+
+            $profiles = Notice::getProfiles($notices);
+
+            foreach ($profiles as $profile) {
+                $pids[] = $profile->id;
+            }
+            
+            Memcached_DataObject::pivotGet('Profile_role',
+                                           'profile_id',
+                                           $pids,
+                                           array('role' => Profile_role::SILENCED));
+        }
+    }
 }
diff --git a/lib/searchform.php b/lib/searchform.php
new file mode 100644
index 0000000000..02ccbc302d
--- /dev/null
+++ b/lib/searchform.php
@@ -0,0 +1,114 @@
+<?php
+/**
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2011, StatusNet, Inc.
+ *
+ * Form for searching a StatusNet site
+ *
+ * PHP version 5
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Widget
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2011 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    // This check helps protect against security problems;
+    // your code file can't be executed directly from the web.
+    exit(1);
+}
+
+/**
+ * Form for searching a StatusNet site
+ *
+ * @category  General
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2011 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+class SearchForm extends Form
+{
+    /**
+     * Visible or invisible data elements
+     *
+     * Display the form fields that make up the data of the form.
+     * Sub-classes should overload this to show their data.
+     *
+     * @return void
+     */
+    function formData()
+    {
+        $this->out->element('input', array('name' => 'q',
+                                           'size' => 20,
+                                           'id' => 'search-q'));
+    }
+
+    /**
+     * Buttons for form actions
+     *
+     * Submit and cancel buttons (or whatever)
+     * Sub-classes should overload this to show their own buttons.
+     *
+     * @return void
+     */
+    function formActions()
+    {
+        $this->out->element('input', array('type' => 'submit',
+                                           // TRANS: Button text for search button on search form.
+                                           'value' => _m('BUTTON','Search')));
+    }
+
+    /**
+     * ID of the form
+     *
+     * Should be unique on the page. Sub-classes should overload this
+     * to show their own IDs.
+     *
+     * @return int ID of the form
+     */
+    function id()
+    {
+        return 'header-search';
+    }
+
+    /**
+     * Action of the form.
+     *
+     * URL to post to. Should be overloaded by subclasses to give
+     * somewhere to post to.
+     *
+     * @return string URL to post to
+     */
+    function action()
+    {
+        return common_local_url('noticesearch');
+    }
+
+    function method()
+    {
+        return 'get';
+    }
+
+    function sessionToken()
+    {
+        return;
+    }
+}
diff --git a/lib/secondarynav.php b/lib/secondarynav.php
index 7d38e74ffc..29dc05b53d 100644
--- a/lib/secondarynav.php
+++ b/lib/secondarynav.php
@@ -79,9 +79,6 @@ class SecondaryNav extends Menu
                                  // TRANS: Secondary navigation menu item leading to e-mail contact information on the
                                  // TRANS: StatusNet site, where to report bugs, ...
                                  _m('MENU','Contact'));
-            $this->out->menuItem(common_local_url('doc', array('title' => 'badge')),
-                                 // TRANS: Secondary navigation menu item. Leads to information about embedding a timeline widget.
-                                 _m('MENU','Badge'));
             Event::handle('EndSecondaryNav', array($this->action));
         }
         $this->out->elementEnd('ul');
diff --git a/lib/settingsaction.php b/lib/settingsaction.php
index c70a5ffa8d..560534065f 100644
--- a/lib/settingsaction.php
+++ b/lib/settingsaction.php
@@ -43,7 +43,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
  * @see      Widget
  */
 
-class SettingsAction extends CurrentUserDesignAction
+class SettingsAction extends Action
 {
     /**
      * A message for the user.
diff --git a/lib/settingsnav.php b/lib/settingsnav.php
index f8c78ec6f1..504b66fc6f 100644
--- a/lib/settingsnav.php
+++ b/lib/settingsnav.php
@@ -59,24 +59,9 @@ class SettingsNav extends Menu
         $nickname = $user->nickname;
         $name = $user->getProfile()->getBestName();
 
-        // Stub section w/ home link
-        $this->action->elementStart('ul');
-        $this->action->elementStart('li');
-        // TRANS: Header in settings navigation panel.
-        $this->action->element('h3', null, _m('HEADER','Home'));
-        $this->action->elementStart('ul', 'nav');
-        $this->out->menuItem(common_local_url('all', array('nickname' =>
-                                                           $nickname)),
-                             // TRANS: Menu item in settings navigation panel.
-                             _m('MENU','Home'),
-                             // TRANS: Menu item title in settings navigation panel.
-                             // TRANS: %s is a username.
-                             sprintf(_('%s and friends'), $name),
-                             $this->action == 'all', 'nav_timeline_personal');
-        $this->action->elementEnd('ul');
-        $this->action->elementEnd('li');
-        $this->action->elementEnd('ul');
-
+        $stub = new HomeStubNav($this->action);
+        $this->submenu(_m('MENU','Home'), $stub);
+        
         $this->action->elementStart('ul');
         $this->action->elementStart('li');
         // TRANS: Header in settings navigation panel.
@@ -112,13 +97,6 @@ class SettingsNav extends Menu
                                     _('Change email handling'),
                                     $actionName == 'emailsettings');
 
-            $this->action->menuItem(common_local_url('userdesignsettings'),
-                                    // TRANS: Menu item in settings navigation panel.
-                                    _m('MENU','Design'),
-                                    // TRANS: Menu item title in settings navigation panel.
-                                    _('Design your profile'),
-                                    $actionName == 'userdesignsettings');
-
             $this->action->menuItem(common_local_url('urlsettings'),
                                     // TRANS: Menu item in settings navigation panel.
                                     _m('MENU','URL'),
@@ -128,7 +106,11 @@ class SettingsNav extends Menu
 
             Event::handle('EndAccountSettingsNav', array(&$this->action));
 
-            if (common_config('xmpp', 'enabled')) {
+            $haveImPlugin = false;
+
+            Event::handle('HaveImPlugin', array(&$haveImPlugin));
+
+            if ($haveImPlugin) {
                 $this->action->menuItem(common_local_url('imsettings'),
                                         // TRANS: Menu item in settings navigation panel.
                                         _m('MENU','IM'),
@@ -153,6 +135,15 @@ class SettingsNav extends Menu
                                     _('Authorized connected applications'),
                                     $actionName == 'oauthconnectionsettings');
 
+            if (common_config('oldschool', 'enabled')) {
+                $this->action->menuItem(common_local_url('oldschoolsettings'),
+                                        // TRANS: Menu item in settings navigation panel.
+                                        _m('MENU','Old school'),
+                                        // TRANS: Menu item title in settings navigation panel.
+                                        _('UI tweaks for old-school users'),
+                                        $actionName == 'oldschoolsettings');
+            }
+
             Event::handle('EndConnectSettingsNav', array(&$this->action));
         }
 
diff --git a/lib/siteprofile.php b/lib/siteprofile.php
new file mode 100644
index 0000000000..f43f89b1f9
--- /dev/null
+++ b/lib/siteprofile.php
@@ -0,0 +1,274 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * A site profile is a set of default settings for a particular style of
+ * StatusNet site: public, private, community, etc.
+ *
+ * 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  Installation
+ * @package   StatusNet
+ * @author    Zach Copley <zach@status.net>
+ * @copyright 2011 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    exit(1);
+}
+
+/**
+ * Helper class for getting the settings for a particular site profile
+ */
+class SiteProfile
+{
+    /**
+     * Returns the config settings for a site profile by name
+     *
+     * @param  string $name name of a site profile
+     * @return array  config settings
+     */
+    static public function getSettings($name)
+    {
+        $sprofileClass = ucfirst($name) . "Site";
+
+        if (class_exists($sprofileClass)) {
+            return call_user_func(array($sprofileClass, 'getSettings'));
+        } else {
+            common_log(
+                LOG_ERR,
+                "Unknown site profile '{$name}' specified in config file.",
+                __FILE__
+            );
+            return array();
+        }
+    }
+}
+
+/**
+ * Site profile settings contain the list of the default settings (and
+ * possibly other information for a particular flavor of StatusNet
+ * installation). These will overwrite base defaults in $config global.
+ *
+ * @category Installation
+ * @package  StatusNet
+ * @author   Zach Copley <zach@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://status.net/
+ */
+abstract class SiteProfileSettings
+{
+    abstract static function getSettings();
+}
+
+/**
+ * Settings for a 'public' site
+ */
+class PublicSite extends SiteProfileSettings
+{
+    /**
+     * Get the settings for this site profile
+     *
+     * @return type array   an array of settings
+     */
+    static function getSettings() {
+        global $config;
+        return array(
+            // We only want to change these values, not replace entire 'site' array
+            'site' => array_merge(
+                $config['site'], array(
+                    'inviteonly' => false,
+                    'private'    => false,
+                    'closed'     => false
+                )
+            ),
+            'plugins' => array(
+                'default' => array(
+                    'Bookmark'                => null,
+                    'ClientSideShorten'       => null,
+                    'Directory'               => null,
+                    'Event'                   => null,
+                    'ExtendedProfile'         => null,
+                    'Geonames'                => null,
+                    'Gravatar'                => null,
+                    'OpenID'                  => null,
+                    'OStatus'                 => null,
+                    'Poll'                    => null,
+                    'QnA'                     => null,
+                    'SearchSub'               => null,
+                    'StrictTransportSecurity' => null,
+                    'TagSub'                  => null
+                )
+            ),
+            'discovery' => array('cors' => true) // Allow Cross-Origin Resource Sharing for service discovery (host-meta, XRD, etc.)
+        );
+    }
+}
+
+/**
+ * Settings for a 'private' site
+ *
+ * // XXX Too business oriented?
+ */
+class PrivateSite extends SiteProfileSettings
+{
+    /**
+     * Get the settings for this site profile
+     *
+     * @return type array  an array of settings
+     */
+    static function getSettings() {
+        global $config;
+        return array(
+            // We only want to change these values, not replace entire 'site' array
+            'site' => array_merge(
+                $config['site'], array(
+                    'inviteonly' => true,
+                    'private'    => true,
+                )
+            ),
+            'plugins' => array(
+                'default' => array(
+                    'Bookmark'                => null,
+                    'ClientSideShorten'       => null,
+                    'Directory'               => null,
+                    'Event'                   => null,
+                    'ExtendedProfile'         => null,
+                    'EmailRegistration'       => null,
+                    'Geonames'                => null,
+                    'Gravatar'                => null,
+                    'NewMenu'                 => null,
+                    'MobileProfile'           => null,
+                    'OpenID'                  => null,
+                    'Poll'                    => null,
+                    'QnA'                     => null,
+                    'SearchSub'               => null,
+                    'StrictTransportSecurity' => null,
+                    'TagSub'                  => null
+                )
+             ),
+            'profile'       => array('delete' => 'true'),
+            'license'       => array('type'   => 'private'),
+            'attachments'   => array(
+                // Only allow uploads of pictures and MS Office files
+                'supported' => array(
+                    'image/png',
+                    'image/jpeg',
+                    'image/gif',
+                    'image/svg+xml',
+                    'application/pdf',
+                    'application/msword',
+                    'application/vnd.ms-office',
+                    'application/vnd.ms-excel',
+                    'application/vnd.ms-powerpoint',
+                    'application/ogg'
+                )
+             ),
+            'discovery' => array('cors'   => false) // Allow Cross-Origin Resource Sharing for service discovery (host-meta, XRD, etc.)
+        );
+    }
+}
+
+/**
+ * Settings for a 'community' site
+ */
+class CommunitySite extends SiteProfileSettings
+{
+    /**
+     * Get the settings for this site profile
+     *
+     * @return type array  an array of settings
+     */
+    static function getSettings() {
+        global $config;
+        return array(
+            // We only want to change these values, not replace entire 'site' array
+            'site' => array_merge(
+                $config['site'], array(
+                    'private'    => false,
+                    'closed'     => false
+                )
+            ),
+            'plugins' => array(
+                'default' => array(
+                    'Bookmark'                => null,
+                    'ClientSideShorten'       => null,
+                    'Directory'               => null,
+                    'Event'                   => null,
+                    'Geonames'                => null,
+                    'Gravatar'                => null,
+                    'OpenID'                  => null,
+                    'OStatus'                 => null,
+                    'Poll'                    => null,
+                    'QnA'                     => null,
+                    'SearchSub'               => null,
+                    'StrictTransportSecurity' => null,
+                    'TagSub'                  => null
+                )
+            ),
+            'discovery' => array('cors' => true) // Allow Cross-Origin Resource Sharing for service discovery (host-meta, XRD, etc.)
+        );
+    }
+
+}
+
+/**
+ * Settings for a 'singleuser' site
+ */
+class SingleuserSite extends SiteProfileSettings
+{
+    /**
+     * Get the settings for this site profile
+     *
+     * @return type array  an array of settings
+     */
+    static function getSettings() {
+        global $config;
+        return array(
+            'singleuser' => array('enabled' => true),
+            // We only want to change these values, not replace entire 'site' array
+            'site' => array_merge(
+                $config['site'], array(
+                    'private'    => false,
+                    'closed'     => true,
+                )
+            ),
+            'plugins' => array(
+                'default' => array(
+                    'Bookmark'                => null,
+                    'ClientSideShorten'       => null,
+                    'Event'                   => null,
+                    'Geonames'                => null,
+                    'NewMenu'                 => null,
+                    'MobileProfile'           => null,
+                    'OpenID'                  => null,
+                    'OStatus'                 => null,
+                    'Poll'                    => null,
+                    'QnA'                     => null,
+                    'SearchSub'               => null,
+                    'StrictTransportSecurity' => null,
+                    'TagSub'                  => null,
+                    'TwitterBridge'           => null,
+                    'FacebookBridge'          => null,
+                )
+            ),
+            'discovery' => array('cors' => true) // Allow Cross-Origin Resource Sharing for service discovery (host-meta, XRD, etc.)
+        );
+    }
+
+}
diff --git a/lib/statusnet.php b/lib/statusnet.php
index 292f074199..cd78516528 100644
--- a/lib/statusnet.php
+++ b/lib/statusnet.php
@@ -113,6 +113,10 @@ class StatusNet
         StatusNet::initDefaults($server, $path);
         StatusNet::loadConfigFile($conffile);
 
+        $sprofile = common_config('site', 'profile');
+        if (!empty($sprofile)) {
+            StatusNet::loadSiteProfile($sprofile);
+        }
         // Load settings from database; note we need autoload for this
         Config::loadSettings();
 
@@ -296,16 +300,19 @@ class StatusNet
 
         $config['db'] = $default['db'];
 
-        // Backward compatibility
-
-        $config['site']['design'] =& $config['design'];
-
         if (function_exists('date_default_timezone_set')) {
             /* Work internally in UTC */
             date_default_timezone_set('UTC');
         }
     }
 
+    public static function loadSiteProfile($name)
+    {
+        global $config;
+        $settings = SiteProfile::getSettings($name);
+        $config = array_merge($config, $settings);
+    }
+
     protected function _sn_to_path($sn)
     {
         $past_root = substr($sn, 1);
@@ -355,6 +362,7 @@ class StatusNet
             if (@file_exists($_config_file)) {
                 // Ignore 0-byte config files
                 if (filesize($_config_file) > 0) {
+                    common_log(LOG_INFO, "Including config file: " . $_config_file);
                     include($_config_file);
                     self::$have_config = true;
                 }
@@ -366,13 +374,6 @@ class StatusNet
                                         $config_files);
         }
 
-        // Fixup for statusnet.ini
-        $_db_name = substr($config['db']['database'], strrpos($config['db']['database'], '/') + 1);
-
-        if ($_db_name != 'statusnet' && !array_key_exists('ini_'.$_db_name, $config['db'])) {
-            $config['db']['ini_'.$_db_name] = INSTALLDIR.'/classes/statusnet.ini';
-        }
-
         // Backwards compatibility
         if (array_key_exists('memcached', $config)) {
             if ($config['memcached']['enabled']) {
@@ -383,6 +384,7 @@ class StatusNet
                 $config['cache']['base'] = $config['memcached']['base'];
             }
         }
+
         if (array_key_exists('xmpp', $config)) {
             if ($config['xmpp']['enabled']) {
                 addPlugin('xmpp', array(
@@ -398,6 +400,12 @@ class StatusNet
                 ));
             }
         }
+
+        // Check for database server; must exist!
+
+        if (empty($config['db']['database'])) {
+            throw new ServerException("No database server for this site.");
+        }
     }
 
     /**
diff --git a/lib/apioauthstore.php b/lib/statusnetoauthstore.php
similarity index 84%
rename from lib/apioauthstore.php
rename to lib/statusnetoauthstore.php
index ac53ec210c..341e32d857 100644
--- a/lib/apioauthstore.php
+++ b/lib/statusnetoauthstore.php
@@ -1,7 +1,7 @@
 <?php
 /*
  * StatusNet - the distributed open-source microblogging tool
- * Copyright (C) 2008, 2009, StatusNet, Inc.
+ * Copyright (C) 2008-2011, StatusNet, Inc.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -19,10 +19,12 @@
 
 if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
-require_once INSTALLDIR . '/lib/oauthstore.php';
+require_once 'OAuth.php';
 
-// @todo FIXME: Class documentation missing.
-class ApiStatusNetOAuthDataStore extends StatusNetOAuthDataStore
+/**
+ * @fixme class doc
+ */
+class ApiStatusNetOAuthDataStore extends OAuthDataStore
 {
     function lookup_consumer($consumerKey)
     {
@@ -410,4 +412,95 @@ class ApiStatusNetOAuthDataStore extends StatusNetOAuthDataStore
             return new OAuthToken($t->tok, $t->secret);
         }
     }
+
+    /**
+     * Authorize specified OAuth token
+     *
+     * Authorizes the authorization token specified by $token_key.
+     * Throws exceptions in case of error.
+     *
+     * @param string $token_key The token to be authorized
+     *
+     * @access public
+     **/
+    public function authorize_token($token_key) {
+        $rt = new Token();
+        $rt->tok = $token_key;
+        $rt->type = 0;
+        $rt->state = 0;
+        if (!$rt->find(true)) {
+            throw new Exception('Tried to authorize unknown token');
+        }
+        $orig_rt = clone($rt);
+        $rt->state = 1; # Authorized but not used
+        if (!$rt->update($orig_rt)) {
+            throw new Exception('Failed to authorize token');
+        }
+    }
+
+    /**
+     *
+     * http://oauth.net/core/1.0/#nonce
+     * "The Consumer SHALL then generate a Nonce value that is unique for
+     * all requests with that timestamp."
+     * XXX: It's not clear why the token is here
+     *
+     * @param type $consumer
+     * @param type $token
+     * @param type $nonce
+     * @param type $timestamp
+     * @return type
+     */
+    function lookup_nonce($consumer, $token, $nonce, $timestamp)
+    {
+        $n = new Nonce();
+        $n->consumer_key = $consumer->key;
+        $n->ts = common_sql_date($timestamp);
+        $n->nonce = $nonce;
+        if ($n->find(true)) {
+            return true;
+        } else {
+            $n->created = DB_DataObject_Cast::dateTime();
+            $n->insert();
+            return false;
+        }
+    }
+
+    /**
+     *
+     * @param type $consumer
+     * @param type $token_type
+     * @param type $token_key
+     * @return OAuthToken
+     */
+    function lookup_token($consumer, $token_type, $token_key)
+    {
+        $t = new Token();
+        if (!is_null($consumer)) {
+            $t->consumer_key = $consumer->key;
+        }
+        $t->tok = $token_key;
+        $t->type = ($token_type == 'access') ? 1 : 0;
+        if ($t->find(true)) {
+            return new OAuthToken($t->tok, $t->secret);
+        } else {
+            return null;
+        }
+    }
+
+    /**
+     *
+     * @param type $token_key
+     * @return Token 
+     */
+    function getTokenByKey($token_key)
+    {
+        $t = new Token();
+        $t->tok = $token_key;
+        if ($t->find(true)) {
+            return $t;
+        } else {
+            return null;
+        }
+    }
 }
diff --git a/lib/taggedprofilenoticestream.php b/lib/taggedprofilenoticestream.php
index 9998b7d769..eec20cd8c6 100644
--- a/lib/taggedprofilenoticestream.php
+++ b/lib/taggedprofilenoticestream.php
@@ -47,7 +47,7 @@ if (!defined('STATUSNET')) {
 
 class TaggedProfileNoticeStream extends ScopingNoticeStream
 {
-    function __construct($profile, $tag, $userProfile)
+    function __construct($profile, $tag, $userProfile=-1)
     {
         if (is_int($userProfile) && $userProfile == -1) {
             $userProfile = Profile::current();
diff --git a/lib/theme.php b/lib/theme.php
index b5f2b58cf2..fbcbbe052a 100644
--- a/lib/theme.php
+++ b/lib/theme.php
@@ -53,6 +53,8 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
  */
 class Theme
 {
+    const FALLBACK = 'neo';
+
     var $name = null;
     var $dir  = null;
     var $path = null;
@@ -99,7 +101,19 @@ class Theme
         if (file_exists($fulldir) && is_dir($fulldir)) {
             $this->dir = $fulldir;
             $this->path = $this->relativeThemePath('theme', 'theme', $name);
+            return;
         }
+
+        // Ruh roh. Fall back to default, then.
+
+        common_log(LOG_WARNING, sprintf("Unable to find theme '%s', falling back to default theme '%s'",
+                                        $name,
+                                        Theme::FALLBACK));
+
+        $this->name = Theme::FALLBACK;
+        $this->dir  = $instroot.'/'.Theme::FALLBACK;
+        $this->path = $this->relativeThemePath('theme', 'theme', Theme::FALLBACK);
+
     }
 
     /**
diff --git a/lib/threadednoticelist.php b/lib/threadednoticelist.php
index 43494bab1a..f0854767d6 100644
--- a/lib/threadednoticelist.php
+++ b/lib/threadednoticelist.php
@@ -76,17 +76,18 @@ class ThreadedNoticeList extends NoticeList
         $this->out->element('h2', null, _m('HEADER','Notices'));
         $this->out->elementStart('ol', array('class' => 'notices threaded-notices xoxo'));
 
-        $cnt = 0;
+		$notices = $this->notice->fetchAll();
+		$total = count($notices);
+		$notices = array_slice($notices, 0, NOTICES_PER_PAGE);
+		
+    	self::prefill(self::_allNotices($notices));
+    	
         $conversations = array();
-        while ($this->notice->fetch() && $cnt <= NOTICES_PER_PAGE) {
-            $cnt++;
-
-            if ($cnt > NOTICES_PER_PAGE) {
-                break;
-            }
+        
+        foreach ($notices as $notice) {
 
             // Collapse repeats into their originals...
-            $notice = $this->notice;
+            
             if ($notice->repeat_of) {
                 $orig = Notice::staticGet('id', $notice->repeat_of);
                 if ($orig) {
@@ -119,7 +120,22 @@ class ThreadedNoticeList extends NoticeList
         $this->out->elementEnd('ol');
         $this->out->elementEnd('div');
 
-        return $cnt;
+        return $total;
+    }
+
+    function _allNotices($notices)
+    {
+        $convId = array();
+        foreach ($notices as $notice) {
+            $convId[] = $notice->conversation;
+        }
+        $convId = array_unique($convId);
+        $allMap = Memcached_DataObject::listGet('Notice', 'conversation', $convId);
+        $allArray = array();
+        foreach ($allMap as $convId => $convNotices) {
+            $allArray = array_merge($allArray, $convNotices);
+        }
+        return $allArray;
     }
 
     /**
@@ -468,9 +484,9 @@ class ThreadedNoticeListFavesItem extends NoticeListActorsItem
 {
     function getProfiles()
     {
-        $fave = Fave::byNotice($this->notice->id);
+        $faves = $this->notice->getFaves();
         $profiles = array();
-        while ($fave->fetch()) {
+        foreach ($faves as $fave) {
             $profiles[] = $fave->user_id;
         }
         return $profiles;
@@ -542,26 +558,46 @@ class ThreadedNoticeListRepeatsItem extends NoticeListActorsItem
 {
     function getProfiles()
     {
-        $rep = $this->notice->repeatStream();
+        $repeats = $this->notice->getRepeats();
 
         $profiles = array();
-        while ($rep->fetch()) {
+
+        foreach ($repeats as $rep) {
             $profiles[] = $rep->profile_id;
         }
+
         return $profiles;
     }
 
+    function magicList($items)
+    {
+        if (count($items) > 4) {
+            return parent::magicList(array_slice($items, 0, 3));
+        } else {
+            return parent::magicList($items);
+        }
+    }
+
     function getListMessage($count, $you)
     {
         if ($count == 1 && $you) {
             // darn first person being different from third person!
             // TRANS: List message for notice repeated by logged in user.
-            return _m('REPEATLIST', 'You have repeated this notice.');
+            return _m('REPEATLIST', 'You repeated this.');
+        } else if ($count > 4) {
+            // TRANS: List message for when more than 4 people repeat something.
+            // TRANS: %%s is a list of users liking a notice, %d is the number over 4 that like the notice.
+            // TRANS: Plural is decided on the total number of users liking the notice (count of %%s + %d).
+            return sprintf(_m('%%s and %d other repeated this.',
+                              '%%s and %d others repeated this.',
+                              $count - 3),
+                           $count - 3);
         } else {
-            // TRANS: List message for repeated notices.
-            // TRANS: %d is the number of users that have repeated a notice.
-            return sprintf(_m('One person has repeated this notice.',
-                              '%d people have repeated this notice.',
+            // TRANS: List message for favoured notices.
+            // TRANS: %%s is a list of users liking a notice.
+            // TRANS: Plural is based on the number of of users that have favoured a notice.
+            return sprintf(_m('%%s repeated this.',
+                              '%%s repeated this.',
                               $count),
                            $count);
         }
diff --git a/lib/toselector.php b/lib/toselector.php
index f131147dd6..ba9593f0b3 100644
--- a/lib/toselector.php
+++ b/lib/toselector.php
@@ -146,7 +146,7 @@ class ToSelector extends Widget
             break;
         case 'profile':
             $profile = Profile::staticGet('id', $value);
-            $options['replies'] = $profile->getUri();
+            $options['replies'] = array($profile->getUri());
             if ($private) {
                 $options['scope'] = Notice::ADDRESSEE_SCOPE;
             }
diff --git a/lib/unsubscribeform.php b/lib/unsubscribeform.php
index 0332bd8ca6..3fa594b1b3 100644
--- a/lib/unsubscribeform.php
+++ b/lib/unsubscribeform.php
@@ -131,6 +131,6 @@ class UnsubscribeForm extends Form
         // TRANS: Button text on unsubscribe form.
         $this->out->submit('submit', _m('BUTTON','Unsubscribe'), 'submit', null,
                            // TRANS: Button title on unsubscribe form.
-                           _('Unsubscribe from this user'));
+                           _('Unsubscribe from this user.'));
     }
 }
diff --git a/lib/urlmapper.php b/lib/urlmapper.php
new file mode 100644
index 0000000000..d17493e21d
--- /dev/null
+++ b/lib/urlmapper.php
@@ -0,0 +1,257 @@
+<?php
+/**
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2011, StatusNet, Inc.
+ *
+ * URL mapper
+ *
+ * PHP version 5
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  URL
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2011 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    // This check helps protect against security problems;
+    // your code file can't be executed directly from the web.
+    exit(1);
+}
+
+/**
+ * URL mapper
+ *
+ * Converts a path into a set of parameters, and vice versa
+ *
+ * We used to use Net_URL_Mapper, so there's a wrapper class at Router, q.v.
+ *
+ * NUM's vagaries are the main reason we have weirdnesses here.
+ *
+ * @category  URL
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2011 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+
+class URLMapper
+{
+    const ACTION = 'action';
+
+    protected $statics = array();
+    protected $variables = array();
+    protected $reverse = array();
+    protected $allpaths = array();
+
+    function connect($path, $args, $paramPatterns=array())
+    {
+        if (!array_key_exists(self::ACTION, $args)) {
+            throw new Exception(sprintf("Can't connect %s; path has no action.", $path));
+        }
+
+        $allpaths[] = $path;
+
+        $action = $args[self::ACTION];
+
+        $paramNames = $this->getParamNames($path);
+
+        if (empty($paramNames)) {
+            $this->statics[$path] = $args;
+            if (array_key_exists($action, $this->reverse)) {
+                $this->reverse[$args[self::ACTION]][] = array($args, $path);
+            } else {
+                $this->reverse[$args[self::ACTION]] = array(array($args, $path));
+            }
+        } else {
+
+            // Eff if I understand why some go here and some go there.
+            // Anyways, fixup my preconceptions
+
+            foreach ($paramNames as $name) {
+                if (!array_key_exists($name, $paramPatterns) &&
+                    array_key_exists($name, $args)) {
+                    $paramPatterns[$name] = $args[$name];
+                    unset($args[$name]);
+                }
+            }
+
+            $regex = $this->makeRegex($path, $paramPatterns);
+
+            $this->variables[] = array($args, $regex, $paramNames);
+
+            $format = $this->makeFormat($path, $paramPatterns);
+
+            if (array_key_exists($action, $this->reverse)) {
+                $this->reverse[$args[self::ACTION]][] = array($args, $format, $paramNames);
+            } else {
+                $this->reverse[$args[self::ACTION]] = array(array($args, $format, $paramNames));
+            }
+        }
+    }
+
+    function match($path)
+    {
+        if (array_key_exists($path, $this->statics)) {
+            return $this->statics[$path];
+        }
+
+        foreach ($this->variables as $pattern) {
+            list($args, $regex, $paramNames) = $pattern;
+            if (preg_match($regex, $path, $match)) {
+                $results = $args;
+                foreach ($paramNames as $name) {
+                    $results[$name] = $match[$name];
+                }
+                return $results;
+            }
+        }
+
+        throw new Exception(sprintf('No match for path "%s"', $path));
+    }
+
+    function generate($args, $qstring, $fragment)
+    {
+        if (!array_key_exists(self::ACTION, $args)) {
+            throw new Exception("Every path needs an action.");
+        }
+
+        $action = $args[self::ACTION];
+
+        if (!array_key_exists($action, $this->reverse)) {
+            throw new Exception(sprintf('No candidate paths for action "%s"', $action));
+        }
+
+        $candidates = $this->reverse[$action];
+
+        foreach ($candidates as $candidate) {
+            if (count($candidate) == 2) { // static
+                list($tryArgs, $tryPath) = $candidate;
+                foreach ($tryArgs as $key => $value) {
+                    if (!array_key_exists($key, $args) || $args[$key] != $value) {
+                        // next candidate
+                        continue 2;
+                    }
+                }
+                // success
+                $path = $tryPath;
+            } else {
+                list($tryArgs, $format, $paramNames) = $candidate;
+
+                foreach ($tryArgs as $key => $value) {
+                    if (!array_key_exists($key, $args) || $args[$key] != $value) {
+                        // next candidate
+                        continue 2;
+                    }
+                }
+
+                // success
+
+                $toFormat = array();
+
+                foreach ($paramNames as $name) {
+                    if (!array_key_exists($name, $args)) {
+                        // next candidate
+                        continue 2;
+                    }
+                    $toFormat[] = $args[$name];
+                }
+
+                $path = vsprintf($format, $toFormat);
+            }
+
+            if (!empty($qstring)) {
+                $formatted = http_build_query($qstring);
+                $path .= '?' . $formatted;
+            }
+
+            return $path;
+        }
+
+        // failure; some reporting twiddles
+
+        unset($args['action']);
+
+        if (empty($args)) {
+            throw new Exception(sprintf('No matches for action "%s"', $action));
+        }
+
+        $argstring = '';
+
+        foreach ($args as $key => $value) {
+            $argstring .= "$key=$value ";
+        }
+
+        throw new Exception(sprintf('No matches for action "%s" with arguments "%s"', $action, $argstring));
+    }
+
+    protected function getParamNames($path)
+    {
+        preg_match_all('/:(?P<name>\w+)/', $path, $match);
+        return $match['name'];
+    }
+
+    protected function makeRegex($path, $paramPatterns)
+    {
+        $pr = new PatternReplacer($paramPatterns);
+
+        $regex = preg_replace_callback('/:(\w+)/',
+                                       array($pr, 'toPattern'),
+                                       $path);
+
+        $regex = '#^' . str_replace('#', '\#', $regex) . '$#';
+
+        return $regex;
+    }
+
+    protected function makeFormat($path, $paramPatterns)
+    {
+        $format = preg_replace('/(:\w+)/', '%s', $path);
+
+        return $format;
+    }
+
+    public function getPaths()
+    {
+        return $this->allpaths;
+    }
+}
+
+class PatternReplacer
+{
+    private $patterns;
+
+    function __construct($patterns)
+    {
+        $this->patterns = $patterns;
+    }
+
+    function toPattern($matches)
+    {
+        // trim out the :
+        $name = $matches[1];
+        if (array_key_exists($name, $this->patterns)) {
+            $pattern = $this->patterns[$name];
+        } else {
+            // ???
+            $pattern = '\w+';
+        }
+        return '(?P<'.$name.'>'.$pattern.')';
+    }
+}
diff --git a/lib/useractivitystream.php b/lib/useractivitystream.php
index d1e3e28fb8..f4a771c5f0 100644
--- a/lib/useractivitystream.php
+++ b/lib/useractivitystream.php
@@ -42,11 +42,12 @@ class UserActivityStream extends AtomUserNoticeFeed
      *                           Raw output mode will attempt to stream, keeping less
      *                           data in memory but will leave $this->activities incomplete.
      */
-    function __construct($user, $indent = true, $outputMode = UserActivityStream::OUTPUT_STRING)
+    function __construct($user, $indent = true, $outputMode = UserActivityStream::OUTPUT_STRING, $after = null)
     {
         parent::__construct($user, null, $indent);
 
         $this->outputMode = $outputMode;
+
         if ($this->outputMode == self::OUTPUT_STRING) {
             // String buffering? Grab all the notices now.
             $notices = $this->getNotices();
@@ -65,14 +66,29 @@ class UserActivityStream extends AtomUserNoticeFeed
             throw new Exception('Invalid outputMode provided to ' . __METHOD__);
         }
 
+        $this->after = $after;
+
         // Assume that everything but notices is feasible
         // to pull at once and work with in memory...
+
         $subscriptions = $this->getSubscriptions();
         $subscribers   = $this->getSubscribers();
         $groups        = $this->getGroups();
         $faves         = $this->getFaves();
+        $messagesFrom  = $this->getMessagesFrom();
+        $messagesTo    = $this->getMessagesTo();
 
-        $objs = array_merge($subscriptions, $subscribers, $groups, $faves, $notices);
+        $objs = array_merge($subscriptions, $subscribers, $groups, $faves, $notices, $messagesFrom, $messagesTo);
+
+        $subscriptions = null;
+        $subscribers   = null;
+        $groups        = null;
+        $faves         = null;
+
+        unset($subscriptions);
+        unset($subscribers);
+        unset($groups);
+        unset($faves);
 
         // Sort by create date
 
@@ -80,41 +96,130 @@ class UserActivityStream extends AtomUserNoticeFeed
 
         // We'll keep these around for later, and interleave them into
         // the output stream with the user's notices.
-        foreach ($objs as $obj) {
-            $this->activities[] = $obj->asActivity();
-        }
+
+        $this->objs = $objs;
     }
 
     /**
      * Interleave the pre-sorted subs/groups/faves with the user's
      * notices, all in reverse chron order.
      */
-    function renderEntries()
+    function renderEntries($format=Feed::ATOM, $handle=null)
     {
+        $haveOne = false;
+
         $end = time() + 1;
-        foreach ($this->activities as $act) {
+        foreach ($this->objs as $obj) {
+            try {
+                $act = $obj->asActivity();
+            } catch (Exception $e) {
+                common_log(LOG_ERR, $e->getMessage());
+                continue;
+            }
+
             $start = $act->time;
 
             if ($this->outputMode == self::OUTPUT_RAW && $start != $end) {
                 // In raw mode, we haven't pre-fetched notices.
                 // Grab the chunks of notices between other activities.
-                $notices = $this->getNoticesBetween($start, $end);
-                foreach ($notices as $noticeAct) {
-                    $noticeAct->asActivity()->outputTo($this, false, false);
+                try {
+                    $notices = $this->getNoticesBetween($start, $end);
+                    foreach ($notices as $noticeAct) {
+                        try {
+                            $nact = $noticeAct->asActivity($this->user);
+                            if ($format == Feed::ATOM) {
+                                $nact->outputTo($this, false, false);
+                            } else {
+                                if ($haveOne) {
+                                    fwrite($handle, ",");
+                                }
+                                fwrite($handle, json_encode($nact->asArray()));
+                                $haveOne = true;
+                            }
+                        } catch (Exception $e) {
+                            common_log(LOG_ERR, $e->getMessage());
+                            continue;
+                        }
+                        $nact = null;
+                        unset($nact);
+                    }
+                } catch (Exception $e) {
+                    common_log(LOG_ERR, $e->getMessage());
                 }
             }
 
-            // Only show the author sub-element if it's different from default user
-            $act->outputTo($this, false, ($act->actor->id != $this->user->uri));
+            $notices = null;
+            unset($notices);
+
+            try {
+                if ($format == Feed::ATOM) {
+                    // Only show the author sub-element if it's different from default user
+                    $act->outputTo($this, false, ($act->actor->id != $this->user->uri));
+                } else {
+                    if ($haveOne) {
+                        fwrite($handle, ",");
+                    }
+                    fwrite($handle, json_encode($act->asArray()));
+                    $haveOne = true;
+                }
+            } catch (Exception $e) {
+                common_log(LOG_ERR, $e->getMessage());
+            }
+
+            $act = null;
+            unset($act);
 
             $end = $start;
         }
 
         if ($this->outputMode == self::OUTPUT_RAW) {
             // Grab anything after the last pre-sorted activity.
-            $notices = $this->getNoticesBetween(0, $end);
-            foreach ($notices as $noticeAct) {
-                $noticeAct->asActivity()->outputTo($this, false, false);
+            try {
+                if (!empty($this->after)) {
+                    $notices = $this->getNoticesBetween($this->after, $end);
+                } else {
+                    $notices = $this->getNoticesBetween(0, $end);
+                }
+                foreach ($notices as $noticeAct) {
+                    try {
+                        $nact = $noticeAct->asActivity($this->user);
+                        if ($format == Feed::ATOM) {
+                            $nact->outputTo($this, false, false);
+                        } else {
+                            if ($haveOne) {
+                                fwrite($handle, ",");
+                            }
+                            fwrite($handle, json_encode($nact->asArray()));
+                            $haveOne = true;
+                        }
+                    } catch (Exception $e) {
+                        common_log(LOG_ERR, $e->getMessage());
+                        continue;
+                    }
+                }
+            } catch (Exception $e) {
+                common_log(LOG_ERR, $e->getMessage());
+            }
+        }
+
+        if (empty($this->after) || strtotime($this->user->created) > $this->after) {
+            // We always add the registration activity at the end, even if
+            // they have older activities (from restored backups) in their stream.
+
+            try {
+                $ract = $this->user->registrationActivity();
+                if ($format == Feed::ATOM) {
+                    $ract->outputTo($this, false, false);
+                } else {
+                    if ($haveOne) {
+                        fwrite($handle, ",");
+                    }
+                    fwrite($handle, json_encode($ract->asArray()));
+                    $haveOne = true;
+                }
+            } catch (Exception $e) {
+                common_log(LOG_ERR, $e->getMessage());
+                continue;
             }
         }
     }
@@ -135,6 +240,10 @@ class UserActivityStream extends AtomUserNoticeFeed
 
         $sub->subscriber = $this->user->id;
 
+        if (!empty($this->after)) {
+            $sub->whereAdd("created > '" . common_sql_date($this->after) . "'");
+        }
+
         if ($sub->find()) {
             while ($sub->fetch()) {
                 if ($sub->subscribed != $this->user->id) {
@@ -154,6 +263,10 @@ class UserActivityStream extends AtomUserNoticeFeed
 
         $sub->subscribed = $this->user->id;
 
+        if (!empty($this->after)) {
+            $sub->whereAdd("created > '" . common_sql_date($this->after) . "'");
+        }
+
         if ($sub->find()) {
             while ($sub->fetch()) {
                 if ($sub->subscriber != $this->user->id) {
@@ -173,6 +286,10 @@ class UserActivityStream extends AtomUserNoticeFeed
 
         $fave->user_id = $this->user->id;
 
+        if (!empty($this->after)) {
+            $fave->whereAdd("modified > '" . common_sql_date($this->after) . "'");
+        }
+
         if ($fave->find()) {
             while ($fave->fetch()) {
                 $faves[] = clone($fave);
@@ -196,6 +313,17 @@ class UserActivityStream extends AtomUserNoticeFeed
 
         $notice->profile_id = $this->user->id;
 
+        // Only stuff after $this->after
+
+        if (!empty($this->after)) {
+            if ($start) {
+                $start = max($start, $this->after);
+            }
+            if ($end) {
+                $end = max($end, $this->after);
+            }
+        }
+
         if ($start) {
             $tsstart = common_sql_date($start);
             $notice->whereAdd("created >= '$tsstart'");
@@ -218,7 +346,11 @@ class UserActivityStream extends AtomUserNoticeFeed
 
     function getNotices()
     {
-        return $this->getNoticesBetween();
+        if (!empty($this->after)) {
+            return $this->getNoticesBetween($this->after);
+        } else {
+            return $this->getNoticesBetween();
+        }
     }
 
     function getGroups()
@@ -229,6 +361,10 @@ class UserActivityStream extends AtomUserNoticeFeed
 
         $gm->profile_id = $this->user->id;
 
+        if (!empty($this->after)) {
+            $gm->whereAdd("created > '" . common_sql_date($this->after) . "'");
+        }
+
         if ($gm->find()) {
             while ($gm->fetch()) {
                 $groups[] = clone($gm);
@@ -237,4 +373,43 @@ class UserActivityStream extends AtomUserNoticeFeed
 
         return $groups;
     }
+
+    function getMessagesTo()
+    {
+        $msgMap = Memcached_DataObject::listGet('Message', 'to_profile', array($this->user->id));
+
+        $messages = $msgMap[$this->user->id];
+
+        if (!empty($this->after)) {
+            $messages = array_filter($messages, array($this, 'createdAfter'));
+        }
+
+        return $messages;
+    }
+
+    function getMessagesFrom()
+    {
+        $msgMap = Memcached_DataObject::listGet('Message', 'from_profile', array($this->user->id));
+
+        $messages = $msgMap[$this->user->id];
+
+        if (!empty($this->after)) {
+            $messages = array_filter($messages, array($this, 'createdAfter'));
+        }
+
+        return $messages;
+    }
+
+    function createdAfter($item) {
+        $created = strtotime((empty($item->created)) ? $item->modified : $item->created);
+        return ($created >= $this->after);
+    }
+
+    function writeJSON($handle)
+    {
+        require_once INSTALLDIR.'/lib/activitystreamjsondocument.php';
+        fwrite($handle, '{"items": [');
+        $this->renderEntries(Feed::JSON, $handle);
+        fwrite($handle, ']}');
+    }
 }
diff --git a/lib/util.php b/lib/util.php
index 0b637dd1cc..4a87f9a217 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -1,7 +1,7 @@
 <?php
 /*
  * StatusNet - the distributed open-source microblogging tool
- * Copyright (C) 2008, 2009, StatusNet, Inc.
+ * Copyright (C) 2008-2011, StatusNet, Inc.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -413,7 +413,7 @@ function common_remembered_user()
         return null;
     }
 
-    $rm = Remember_me::staticGet($code);
+    $rm = Remember_me::staticGet('code', $code);
 
     if (!$rm) {
         common_log(LOG_WARNING, 'No such remember code: ' . $code);
@@ -427,7 +427,7 @@ function common_remembered_user()
         return null;
     }
 
-    $user = User::staticGet($rm->user_id);
+    $user = User::staticGet('id', $rm->user_id);
 
     if (!$user) {
         common_log(LOG_WARNING, 'No such user for rememberme: ' . $rm->user_id);
@@ -1040,7 +1040,9 @@ function common_linkify($url) {
  */
 function common_shorten_links($text, $always = false, User $user=null)
 {
-    $user = common_current_user();
+    if ($user === null) {
+        $user = common_current_user();
+    }
 
     $maxLength = User_urlshortener_prefs::maxNoticeLength($user);
 
@@ -1127,8 +1129,11 @@ function common_tag_link($tag)
 
 function common_canonical_tag($tag)
 {
+  // only alphanum
+  $tag = preg_replace('/[^\pL\pN]/u', '', $tag);
   $tag = mb_convert_case($tag, MB_CASE_LOWER, "UTF-8");
-  return str_replace(array('-', '_', '.'), '', $tag);
+  $tag = substr($tag, 0, 64);
+  return $tag;
 }
 
 function common_valid_profile_tag($str)
@@ -1234,12 +1239,12 @@ function common_local_url($action, $args=null, $params=null, $fragment=null, $ad
         $ssl = common_is_sensitive($action);
 
         if (common_config('site','fancy')) {
-            $url = common_path(mb_substr($path, 1), $ssl, $addSession);
+            $url = common_path($path, $ssl, $addSession);
         } else {
             if (mb_strpos($path, '/index.php') === 0) {
-                $url = common_path(mb_substr($path, 1), $ssl, $addSession);
+                $url = common_path($path, $ssl, $addSession);
             } else {
-                $url = common_path('index.php'.$path, $ssl, $addSession);
+                $url = common_path('index.php/'.$path, $ssl, $addSession);
             }
         }
         Event::handle('EndLocalURL', array(&$action, &$params, &$fragment, &$addSession, &$url));
@@ -1304,11 +1309,11 @@ function common_inject_session($url, $serverpart = null)
 {
     if (common_have_session()) {
 
-	if (empty($serverpart)) {
-	    $serverpart = parse_url($url, PHP_URL_HOST);
-	}
+        if (empty($serverpart)) {
+            $serverpart = parse_url($url, PHP_URL_HOST);
+        }
 
-        $currentServer = $_SERVER['HTTP_HOST'];
+        $currentServer = (array_key_exists('HTTP_HOST', $_SERVER)) ? $_SERVER['HTTP_HOST'] : null;
 
         // Are we pointing to another server (like an SSL server?)
 
@@ -1456,6 +1461,7 @@ function common_redirect($url, $code=307)
 
     header('HTTP/1.1 '.$code.' '.$status[$code]);
     header("Location: $url");
+    header("Connection: close");
 
     $xo = new XMLOutputter();
     $xo->startXML('a',
@@ -1470,8 +1476,7 @@ function common_redirect($url, $code=307)
 
 function common_enqueue_notice($notice)
 {
-    static $localTransports = array('omb',
-                                    'ping');
+    static $localTransports = array('ping');
 
     $transports = array();
     if (common_config('sms', 'enabled')) {
@@ -1502,16 +1507,18 @@ function common_enqueue_notice($notice)
 }
 
 /**
- * Broadcast profile updates to OMB and other remote subscribers.
+ * Legacy function to broadcast profile updates to OMB remote subscribers.
+ *
+ * XXX: This probably needs killing, but there are several bits of code
+ *      that broadcast profile changes that need to be dealt with. AFAIK
+ *      this function is only used for OMB. -z
  *
  * Since this may be slow with a lot of subscribers or bad remote sites,
  * this is run through the background queues if possible.
  */
 function common_broadcast_profile(Profile $profile)
 {
-    $qm = QueueManager::get();
-    $qm->enqueue($profile, "profile");
-    return true;
+    Event::handle('BroadcastProfile', array($profile));
 }
 
 function common_profile_url($nickname)
@@ -2009,20 +2016,20 @@ function common_user_property($property)
 
 function common_profile_uri($profile)
 {
-    if (!$profile) {
-        return null;
-    }
-    $user = User::staticGet($profile->id);
-    if ($user) {
-        return $user->uri;
+    $uri = null;
+
+    if (!empty($profile)) {
+        if (Event::handle('StartCommonProfileURI', array($profile, &$uri))) {
+            $user = User::staticGet($profile->id);
+            if (!empty($user)) {
+                $uri = $user->uri;
+            }
+            Event::handle('EndCommonProfileURI', array($profile, &$uri));
+        }
     }
 
-    $remote = Remote_profile::staticGet($profile->id);
-    if ($remote) {
-        return $remote->uri;
-    }
     // XXX: this is a very bad profile!
-    return null;
+    return $uri;
 }
 
 function common_canonical_sms($sms)
@@ -2158,7 +2165,11 @@ function common_shorten_url($long_url, User $user=null, $force = false)
             } else {
                 $shortenedUrl = common_local_url('redirecturl',
                                                  array('id' => $f->id));
-                return $shortenedUrl;
+                if ((mb_strlen($shortenedUrl) < mb_strlen($long_url)) || $force) {
+                    return $shortenedUrl;
+                } else {
+                    return $long_url;
+                }
             }
         } else {
             return $long_url;
@@ -2308,3 +2319,31 @@ function common_is_email($str)
 {
     return (strpos($str, '@') !== false);
 }
+
+function common_init_stats()
+{
+    global $_mem, $_ts;
+
+    $_mem = memory_get_usage(true);
+    $_ts  = microtime(true);
+}
+
+function common_log_delta($comment=null)
+{
+    global $_mem, $_ts;
+
+    $mold = $_mem;
+    $told = $_ts;
+
+    $_mem = memory_get_usage(true);
+    $_ts  = microtime(true);
+
+    $mtotal = $_mem - $mold;
+    $ttotal = $_ts - $told;
+
+    if (empty($comment)) {
+        $comment = 'Delta';
+    }
+
+    common_debug(sprintf("%s: %d %d", $comment, $mtotal, round($ttotal * 1000000)));
+}
diff --git a/lib/uuid.php b/lib/uuid.php
index 93153504f2..386d0e2121 100644
--- a/lib/uuid.php
+++ b/lib/uuid.php
@@ -47,6 +47,7 @@ if (!defined('STATUSNET')) {
 
 class UUID
 {
+    const REGEX = '[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}';
     protected $str = null;
 
     /**
diff --git a/lib/widget.php b/lib/widget.php
index f9b7152559..d068dea0f0 100644
--- a/lib/widget.php
+++ b/lib/widget.php
@@ -80,6 +80,19 @@ class Widget
     {
     }
 
+    /**
+     * Get HTMLOutputter
+     *
+     * Return the HTMLOutputter for the widget.
+     *
+     * @return HTMLOutputter the output helper
+     */
+
+    function getOut()
+    {
+        return $this->out;
+    }
+
     /**
      * Delegate output methods to the outputter attribute.
      *
diff --git a/lib/xrdaction.php b/lib/xrdaction.php
index a0e7a1c415..6cca80d93e 100644
--- a/lib/xrdaction.php
+++ b/lib/xrdaction.php
@@ -82,11 +82,6 @@ class XrdAction extends Action
                                   'type' => 'text/html',
                                   'href' => $profile->profileurl);
 
-            // hCard
-            $xrd->links[] = array('rel' => self::HCARD,
-                                  'type' => 'text/html',
-                                  'href' => common_local_url('hcard', array('nickname' => $nick)));
-
             // XFN
             $xrd->links[] = array('rel' => 'http://gmpg.org/xfn/11',
                                   'type' => 'text/html',
@@ -117,7 +112,12 @@ class XrdAction extends Action
             Event::handle('EndXrdActionLinks', array(&$xrd, $this->user));
         }
 
+        if (common_config('discovery', 'cors')) {
+            header('Access-Control-Allow-Origin: *');
+        }
+
         header('Content-type: application/xrd+xml');
+
         print $xrd->toXML();
     }
 
diff --git a/locale/ar/LC_MESSAGES/statusnet.po b/locale/ar/LC_MESSAGES/statusnet.po
index 5ef1d30d9f..f0d02fb184 100644
--- a/locale/ar/LC_MESSAGES/statusnet.po
+++ b/locale/ar/LC_MESSAGES/statusnet.po
@@ -2,8 +2,10 @@
 # Exported from translatewiki.net
 #
 # Author: Brion
+# Author: Houcinee1
 # Author: Majid Al-Dharrab
 # Author: Meno25
+# Author: Mohd.bloui
 # Author: Mutarjem horr
 # Author: OsamaK
 # --
@@ -13,19 +15,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:42+0000\n"
-"Language-Team: Arabic <http://translatewiki.net/wiki/Portal:ar>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:28+0000\n"
+"Language-Team: Arabic <https://translatewiki.net/wiki/Portal:ar>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ar\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=6; plural=(n == 0) ? 0 : ( (n == 1) ? 1 : ( (n == "
 "2) ? 2 : ( (n%100 >= 3 && n%100 <= 10) ? 3 : ( (n%100 >= 11 && n%100 <= "
 "99) ? 4 : 5 ) ) ) );\n"
-"X-POT-Import-Date: 2011-05-05 10:52:40+0000\n"
+"X-POT-Import-Date: 2012-04-22 22:02:21+0000\n"
 
 #. TRANS: Database error message.
 #, php-format
@@ -36,12 +38,6 @@ msgid ""
 "again."
 msgstr ""
 
-#. TRANS: Error message.
-msgid ""
-"An important error occured, probably related to email setup. Check logfiles "
-"for more info."
-msgstr ""
-
 #. TRANS: Error message.
 msgid "An error occurred."
 msgstr "حدث خطأ."
@@ -50,7 +46,7 @@ msgstr "حدث خطأ."
 #, php-format
 msgid ""
 "No configuration file found. Try running the installation program first."
-msgstr "لم يتم العثور على مل� التشكيل. حاول تشغيل برنامج التثبيت أولاّ."
+msgstr "تعذر العثور على مل� التشكيل. حاول تشغيل برنامج التثبيت أولًا."
 
 #. TRANS: Error message displayed when trying to access a non-existing page.
 msgid "Unknown page"
@@ -63,7 +59,7 @@ msgstr "إجراء غير معرو�"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 msgid "Access"
-msgstr "ن�اذ"
+msgstr "الن�اذ"
 
 #. TRANS: Page notice.
 msgid "Site access settings"
@@ -71,11 +67,11 @@ msgstr "إعدادات الوصول إلى الموقع"
 
 #. TRANS: Form legend for registration form.
 msgid "Registration"
-msgstr "تسجيل"
+msgstr "التسجيل"
 
 #. TRANS: Checkbox instructions for admin setting "Private".
 msgid "Prohibit anonymous users (not logged in) from viewing site?"
-msgstr "أأمنع المستخدمين المجهولين (غير الوالجين) من عرض الموقع؟"
+msgstr "أأمنع المستخدمين المجهولين (غير الوالجين) من مشاهدة الموقع؟"
 
 #. TRANS: Checkbox label for prohibiting anonymous users from viewing site.
 #. TRANS: Checkbox label to show private tags.
@@ -100,12 +96,11 @@ msgstr "عطّل التسجيل الجديد."
 msgid "Closed"
 msgstr "م�غلق"
 
-#. TRANS: Title for button to save access settings in site admin panel.
-msgid "Save access settings"
-msgstr "ح�ظ إعدادت الوصول"
+#. TRANS: Button title to save access settings in site admin panel.
+msgid "Save access settings."
+msgstr "اح�ظ إعدادت الوصول."
 
-#. TRANS: Tooltip for button to save access settings in site admin panel.
-#. TRANS: Button text for saving theme settings.
+#. TRANS: Button text to save access settings in site admin panel.
 #. TRANS: Button label to save e-mail preferences.
 #. TRANS: Button label to save IM preferences.
 #. TRANS: Button text in the license admin panel.
@@ -121,7 +116,6 @@ msgstr "ح�ظ إعدادت الوصول"
 #. TRANS: Button text for saving "Other settings" in profile.
 #. TRANS: Button text to save user settings in user admin panel.
 #. TRANS: Button label in the "Edit application" form.
-#. TRANS: Button text on profile design page to save settings.
 #. TRANS: Text for save button on group edit form.
 #. TRANS: Button text to save tags for a profile.
 msgctxt "BUTTON"
@@ -152,17 +146,13 @@ msgstr "لست والجًا."
 #. TRANS: Client error displayed trying to subscribe to a non-existing profile.
 #. TRANS: Client error displayed trying to perform an action related to a non-existing profile.
 msgid "No such profile."
-msgstr "لا مل� كهذا."
+msgstr "لا يوجد مل� شخصي بهذا الاسم."
 
 #. TRANS: Client error displayed trying to reference a non-existing list.
 #. TRANS: Client error displayed when referring to a non-existing list.
 #. TRANS: Client error displayed trying to reference a non-existing list.
 msgid "No such list."
-msgstr "لا توجد لائحة كهذه."
-
-#. TRANS: Client error displayed when trying to add an OMB 0.1 remote profile to a list.
-msgid "You cannot list an OMB 0.1 remote profile with this action."
-msgstr ""
+msgstr "اللائحة المقصودة غير موجودة."
 
 #. TRANS: Client error displayed when an unknown error occurs when adding a user to a list.
 #. TRANS: %s is a username.
@@ -181,19 +171,18 @@ msgstr ""
 #. TRANS: Title after adding a user to a list.
 msgctxt "TITLE"
 msgid "Listed"
-msgstr ""
+msgstr "المدرجون"
 
 #. TRANS: Server error when page not found (404).
 #. TRANS: Server error when page not found (404)
 #. TRANS: Server error when page not found (404).
 msgid "No such page."
-msgstr "لا ص�حة كهذه."
+msgstr "الص�حة غير موجودة."
 
 #. TRANS: Client error when user not found for an action.
 #. TRANS: Client error when user not found for an rss related action.
 #. TRANS: Client error displayed when no existing user is provided for a user's delivery device setting.
 #. TRANS: Client error displayed if a user could not be found.
-#. TRANS: Client error when user not found updating a profile background image.
 #. TRANS: Client error displayed updating profile image without having a user object.
 #. TRANS: Client error displayed when making an Atom API request for an unknown user.
 #. TRANS: Client error displayed when trying to block a non-existing user or a user from another site.
@@ -219,14 +208,11 @@ msgstr "لا ص�حة كهذه."
 #. TRANS: Client error displayed when trying to get the RSS feed with favorites of a user that does not exist.
 #. TRANS: Client error displayed when requesting Friends of a Friend feed without providing a user nickname.
 #. TRANS: Client error displayed when requesting Friends of a Friend feed for an object that is not a user.
-#. TRANS: Client error displayed when trying to get a user hCard for a non-existing user.
 #. TRANS: Client error displayed trying to make a micro summary without providing a valid user.
 #. TRANS: Client error displayed trying to send a direct message to a non-existing user.
 #. TRANS: Client error displayed trying to use "one time password login" without using an existing user.
 #. TRANS: Client error displayed when referring to non-existing user.
 #. TRANS: Client error displayed trying to perform an action related to a non-existing user.
-#. TRANS: Form validation error on page for remote subscribe when no user was provided.
-#. TRANS: Form validation error on page for remote subscribe when no user profile was found.
 #. TRANS: Client error displayed when trying to reply to a non-exsting user.
 #. TRANS: Client error displayed when providing a non-existing nickname in a RSS 1.0 action.
 #. TRANS: Client error.
@@ -235,24 +221,29 @@ msgstr "لا ص�حة كهذه."
 #. TRANS: Client error displayed trying to find a user by ID for a non-existing ID.
 #. TRANS: Client error displayed requesting groups for a non-existing user.
 #. TRANS: Client error displayed when user not found for an action.
-#. TRANS: Client error displayed providing a non-existing nickname.
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #. TRANS: Client error displayed when trying to perform a gallery action with an unknown user.
 #. TRANS: Client error displayed when trying to access a mailbox without providing a user.
 #. TRANS: Client error displayed when calling a profile action without specifying a user.
 msgid "No such user."
-msgstr "لا مستخدم كهذا."
+msgstr "لا يوجد مستخدم بهذا الاسم."
 
 #. TRANS: Title of a user's own start page.
-#, fuzzy
 msgid "Home timeline"
-msgstr "مسار %s الزمني"
+msgstr "المسار الزمني الرئيسي"
 
 #. TRANS: Title of another user's start page.
 #. TRANS: %s is the other user's name.
-#, fuzzy, php-format
+#, php-format
 msgid "%s's home timeline"
-msgstr "مسار %s الزمني"
+msgstr "المسار الزمني الرئيسي ل%s"
+
+#. TRANS: %s is user nickname.
+#. TRANS: Feed title.
+#. TRANS: %s is tagger's nickname.
+#, php-format
+msgid "Feed for friends of %s (Activity Streams JSON)"
+msgstr "تغذية أصدقاء %s (آكت�تي ستريمز جيسن)"
 
 #. TRANS: %s is user nickname.
 #, php-format
@@ -275,7 +266,7 @@ msgstr "تغذية أصدقاء %s (أتوم)"
 #, php-format
 msgid ""
 "This is the timeline for %s and friends but no one has posted anything yet."
-msgstr "هذا هو السجل الزمني ل%s وأصدقائه لكن لم يرسل أحد شيئًا إلى الآن."
+msgstr "هذا هو المسار الزمني ل�%s وأصدقائه لكن لم يرسل أحد شيئًا إلى الآن."
 
 #. TRANS: Encouragement displayed on logged in user's empty timeline.
 #. TRANS: This message contains Markdown links. Keep "](" together.
@@ -285,7 +276,7 @@ msgid ""
 "something yourself."
 msgstr ""
 "حاول أن تشترك بمزيد من الأشخاص أو أن [تنضم إلى مجموعة](%%action.groups%%) أو "
-"أن تكتبت شيئا."
+"أن تكتب شيئًا."
 
 #. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@".
 #. TRANS: This message contains Markdown links. Keep "](" together.
@@ -297,7 +288,7 @@ msgstr ""
 "يمكن أن تحاول [تنبيه %1$s](../%2$s) من مل�ه الشخصي أو [مراسلته عن أمر ما](%%%"
 "%action.newnotice%%%%?status_textarea=%3$s)."
 
-#. TRANS: Encoutagement displayed on empty timeline user pages for anonymous users.
+#. TRANS: Encouragement displayed on empty timeline user pages for anonymous users.
 #. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
 #. TRANS: Empty list message for page with replies for a user for not logged in users.
 #. TRANS: %1$s is a user nickname. This message contains a Markdown link in the form [link text](link).
@@ -310,6 +301,12 @@ msgid ""
 msgstr ""
 "لمَ لا [تسجل حسابًا](%%%%action.register%%%%) لتنبه %s أو ترسل إليه إشعارًا؟"
 
+#. TRANS: Button text for inviting more users to the StatusNet instance.
+#. TRANS: Less business/enterprise-oriented language for public sites.
+msgctxt "BUTTON"
+msgid "Send invite"
+msgstr "أرسل دعوة"
+
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Title of API timeline for a user and friends.
 #. TRANS: %s is a username.
@@ -318,8 +315,6 @@ msgstr ""
 #. TRANS: %s is a username.
 #. TRANS: Menu item title in personal group navigation menu.
 #. TRANS: %s is a username.
-#. TRANS: Menu item title in settings navigation panel.
-#. TRANS: %s is a username.
 #, php-format
 msgid "%s and friends"
 msgstr "%s والأصدقاء"
@@ -334,7 +329,7 @@ msgstr "مستجدات %1$s وأصدقائه على %2$s!"
 #. TRANS: Client error displayed when trying to handle an unknown API method.
 #. TRANS: Client error displayed when coming across a non-supported API method.
 msgid "API method not found."
-msgstr "لم يتم العثور على وسيلة API."
+msgstr "تعذر العثور على وسيلة API."
 
 #. TRANS: Client error message. POST is a HTTP command. It should not be translated.
 #. TRANS: Client error. POST is a HTTP command. It should not be translated.
@@ -357,7 +352,6 @@ msgstr ""
 #. TRANS: Server error thrown on database error updating SMS preferences.
 #. TRANS: Server error thrown on database error removing a registered SMS phone number.
 #. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
-#. TRANS: Server exception thrown on Profile design page when updating design settings fails.
 msgid "Could not update user."
 msgstr "تعذّر تحديث المستخدم."
 
@@ -372,7 +366,6 @@ msgstr "لم يمكن ح�ظ المل�."
 
 #. TRANS: Client error displayed when the number of bytes in a POST request exceeds a limit.
 #. TRANS: %s is the number of bytes of the CONTENT_LENGTH.
-#. TRANS: Form validation error in design settings form. POST should remain untranslated.
 #, php-format
 msgid ""
 "The server was unable to handle that much POST data (%s byte) due to its "
@@ -387,24 +380,6 @@ msgstr[3] ""
 msgstr[4] ""
 msgstr[5] ""
 
-#. TRANS: Client error displayed when saving design settings fails because of an empty id.
-#. TRANS: Client error displayed when saving design settings fails because of an empty result.
-#. TRANS: Client error displayed when a database error occurs inserting profile colours.
-#. TRANS: Client error displayed when a database error occurs updating profile colours.
-#. TRANS: Form validation error displayed when group design settings could not be saved because of an application issue.
-#. TRANS: Form validation error on Profile design page when saving design settings has failed.
-#. TRANS: Form validation error on Profile design page when updating design settings has failed.
-msgid "Unable to save your design settings."
-msgstr "تعذّر ح�ظ إعدادات تصميمك."
-
-#. TRANS: Error displayed when updating design settings fails.
-#. TRANS: Client error displayed when a database error occurs updating profile colours.
-#. TRANS: Form validation error on Profile design page when updating design settings has failed.
-#. TRANS: Error message displayed if design settings could not be saved.
-#. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
-msgid "Could not update your design."
-msgstr "تعذّر تحديث تصميمك."
-
 #. TRANS: Title for Atom feed.
 msgctxt "ATOM"
 msgid "Main"
@@ -451,6 +426,20 @@ msgstr "�شل منع المستخدم."
 msgid "Unblock user failed."
 msgstr "�شل إلغاء منع المستخدم."
 
+#. TRANS: Client exception thrown when no conversation ID is given.
+msgid "No conversation ID."
+msgstr "لا رقم محادثة."
+
+#. TRANS: Client exception thrown when referring to a non-existing conversation ID (%d).
+#, php-format
+msgid "No conversation with ID %d."
+msgstr "لا تحويل بالرقم %d."
+
+#. TRANS: Title for conversion timeline.
+msgctxt "TITLE"
+msgid "Conversation"
+msgstr "محادثة"
+
 #. TRANS: Title. %s is a user nickname.
 #, php-format
 msgid "Direct messages from %s"
@@ -482,12 +471,16 @@ msgstr "لا نص �ي الرسالة!"
 #, php-format
 msgid "That's too long. Maximum message size is %d character."
 msgid_plural "That's too long. Maximum message size is %d characters."
-msgstr[0] ""
+msgstr[0] "هذا أطول من الحد المسموح به. لا يسمح بوضع حر� واحد �ي الرسالة."
 msgstr[1] ""
-msgstr[2] ""
+"هذا أطول من الحد المسموح به. لا يسمح بوضع أكثر من حر� واحد �ي الرسالة."
+msgstr[2] "هذا أطول من الحد المسموح به. لا يسمح بوضع أكثر من حر�ين �ي الرسالة."
 msgstr[3] ""
+"هذا أطول من الحد المسموح به. لا يسمح بوضع أكثر من %d أحر� �ي الرسالة."
 msgstr[4] ""
+"هذا أطول من الحد المسموح به. لا يسمح بوضع أكثر من %d حر�ًا �ي الرسالة."
 msgstr[5] ""
+"هذا أطول من الحد المسموح به. لا يسمح بوضع أكثر من %d حر� �ي الرسالة."
 
 #. TRANS: Client error displayed if a recipient user could not be found (403).
 msgid "Recipient user not found."
@@ -498,6 +491,8 @@ msgid "Cannot send direct messages to users who aren't your friend."
 msgstr "لا يمكن أن ترسل رسائل مباشرة إلى مستخدمين ليسوا أصدقاءك."
 
 #. TRANS: Client error displayed trying to direct message self (403).
+#. TRANS: Client error displayed trying to send a direct message to self.
+#. TRANS: Error text shown when trying to send a direct message to self.
 msgid ""
 "Do not send a message to yourself; just say it to yourself quietly instead."
 msgstr "لا ترسل رسالة لن�سك؛ حسبك أن تقولها �ي سرك."
@@ -535,7 +530,7 @@ msgstr "تعذر متابعة المستخدم: الحساب غير موجود."
 #. TRANS: %s is the nickname of the user that is already being followed.
 #, php-format
 msgid "Could not follow user: %s is already on your list."
-msgstr "تعذر متابعة المستخدم: %s موجود �ي قائمتك مسبقًا."
+msgstr "تعذر متابعة المستخدم: %s موجود �ي لائحتك مسبقًا."
 
 #. TRANS: Client error displayed when trying to unfollow a user that cannot be found.
 msgid "Could not unfollow user: User not found."
@@ -608,15 +603,15 @@ msgstr "الاسم الكامل طويل جدًا (الحد الأقصى 255 ح
 #. TRANS: %d is the maximum number of characters for the description.
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed characters.
-#, fuzzy, php-format
+#, php-format
 msgid "Description is too long (maximum %d character)."
 msgid_plural "Description is too long (maximum %d characters)."
-msgstr[0] "المنظمة طويلة جدا (الأقصى %d حر�ا)."
-msgstr[1] "المنظمة طويلة جدا (الأقصى %d حر�ا)."
-msgstr[2] "المنظمة طويلة جدا (الأقصى %d حر�ا)."
-msgstr[3] "المنظمة طويلة جدا (الأقصى %d حر�ا)."
-msgstr[4] "المنظمة طويلة جدا (الأقصى %d حر�ا)."
-msgstr[5] "المنظمة طويلة جدا (الأقصى %d حر�ا)."
+msgstr[0] "(%d حر�ا"
+msgstr[1] "حر� واحد"
+msgstr[2] "حر�ان"
+msgstr[3] "%d حرو�"
+msgstr[4] "%d حر�"
+msgstr[5] "%d حر�ا"
 
 #. TRANS: Client error shown when providing too long a location during group creation.
 #. TRANS: API validation exception thrown when location does not validate.
@@ -659,14 +654,14 @@ msgstr "كنية غير صالحة: \"%s\"."
 #. TRANS: %s is the already used alias.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error. %s is the already used alias.
-#, fuzzy, php-format
+#, php-format
 msgid "Alias \"%s\" already in use. Try another one."
-msgstr "هذا الاسم مستخدم بال�عل. جرّب اسمًا آخر."
+msgstr "الكنية \"%s\" مستخدمة بال�عل. جرّب كنية أخرى."
 
 #. TRANS: Client error displayed when trying to use an alias during group creation that is the same as the group's nickname.
 #. TRANS: Group edit form validation error.
 msgid "Alias can't be the same as nickname."
-msgstr ""
+msgstr "الاسم الرمزي لا يمكن أن يكون مثل الاسم المستعار"
 
 #. TRANS: Client error displayed when checking group membership for a non-existing group.
 #. TRANS: Client error displayed when trying to join a group that does not exist.
@@ -688,7 +683,7 @@ msgstr "أنت قد كنت عضو �ي تلك المجموعة."
 #. TRANS: Client error displayed when trying to join a group while being blocked form joining it.
 #. TRANS: Error text shown when a user tries to join a group they are blocked from joining.
 msgid "You have been blocked from that group by the admin."
-msgstr "لقد تم طردك من تلك المجموعة من قبل الإدارة."
+msgstr "لقد طردتك إدارة هذه المجموعة."
 
 #. TRANS: Server error displayed when joining a group failed in the database.
 #. TRANS: %1$s is the joining user's nickname, $2$s is the group nickname for which the join failed.
@@ -734,7 +729,6 @@ msgstr "مجموعات %s"
 
 #. TRANS: Client error displayed when trying to edit a group without being an admin.
 #. TRANS: Client error displayed trying to edit a group while not being a group admin.
-#. TRANS: Client error displayed trying to change group design settings without being a (group) admin.
 #. TRANS: Client error displayed when trying to change group logo settings while not being a group admin.
 msgid "You must be an admin to edit the group."
 msgstr "يجب أن تكون إداريا لتعدل المجموعة."
@@ -758,7 +752,7 @@ msgstr ""
 #. TRANS: API validation exception thrown when alias is the same as nickname.
 #. TRANS: Group create form validation error.
 msgid "Alias cannot be the same as nickname."
-msgstr ""
+msgstr "الاسم الرمزي لا يمكن أن يكون مثل الاسم المستعار"
 
 #. TRANS: Client error displayed when referring to a non-existing list.
 #. TRANS: Client error displayed trying to perform an action related to a non-existing list.
@@ -843,7 +837,6 @@ msgstr ""
 
 #. TRANS: Client error given on when invalid data was passed through a form in the OAuth API.
 #. TRANS: Unexpected validation error on avatar upload form.
-#. TRANS: Client error displayed when the submitted form contains unexpected data.
 #. TRANS: Client error displayed submitting invalid form data for edit application.
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
 #. TRANS: Form validation error message when an unsupported argument is used.
@@ -852,7 +845,6 @@ msgstr ""
 #. TRANS: Client error when submitting a form with unexpected information.
 #. TRANS: Client error displayed when unexpected data is posted in the password recovery form.
 #. TRANS: Message given submitting a form with an unknown action in SMS settings.
-#. TRANS: Unknown form validation error in design settings form.
 msgid "Unexpected form submission."
 msgstr ""
 
@@ -891,7 +883,6 @@ msgstr "الحساب"
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Field label on account registration page.
-#. TRANS: Label for nickname on user authorisation page.
 #. TRANS: Field label on group edit form.
 #. TRANS: Dropdown option for searching in profiles.
 msgid "Nickname"
@@ -971,7 +962,7 @@ msgstr "لا يسمح لك بحذ� حالة مستخدم آخر."
 #. TRANS: Error message displayed trying to delete a non-existing notice.
 #. TRANS: Client error displayed trying to show a non-existing notice.
 msgid "No such notice."
-msgstr "لا إشعار كهذا."
+msgstr "الإشعار المطلوب غير موجود."
 
 #. TRANS: Client error displayed calling an unsupported HTTP error in API status show.
 #. TRANS: Client exception thrown when using an unsupported HTTP method.
@@ -1067,9 +1058,9 @@ msgstr "مستجدات %1$s التي �ضلها %2$s / %3$s!"
 
 #. TRANS: Server error displayed whe trying to get a timeline fails.
 #. TRANS: %s is the error message.
-#, fuzzy, php-format
+#, php-format
 msgid "Could not generate feed for list - %s"
-msgstr "لم يمكن إنشاء توكن الولوج ل%s"
+msgstr "لا يمكن توليد تغذية القائمة - %s"
 
 #. TRANS: Title for timeline of most recent mentions of a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user nickname.
@@ -1093,7 +1084,7 @@ msgstr "مسار %s الزمني العام"
 #. TRANS: Subtitle for site timeline. %s is the StatusNet sitename.
 #, php-format
 msgid "%s updates from everyone!"
-msgstr ""
+msgstr "مستجدات جميع من هم على %s!"
 
 #. TRANS: Server error displayed calling unimplemented API method for 'retweeted by me'.
 msgid "Unimplemented."
@@ -1186,7 +1177,7 @@ msgstr ""
 
 #. TRANS: Client error displayed when requesting user information for a non-existing user.
 msgid "User not found."
-msgstr "لم ي�عثرعلى المستخدم."
+msgstr "لم ي�عثر على المستخدم."
 
 #. TRANS: Client error displayed when trying to leave a group while not logged in.
 msgid "You must be logged in to leave a group."
@@ -1207,12 +1198,9 @@ msgstr "يجب أن تلج لتغادر مجموعة."
 #. TRANS: Client error displayed when requesting Friends of a Friend feed for a nickname that is not a group.
 #. TRANS: Client error displayed trying to block a user from a group while specifying a non-existing group.
 #. TRANS: Client error displayed referring to a group's permalink for a non-existing group ID.
-#. TRANS: Client error displayed trying to change group design settings while providing a nickname for a non-existing group.
 #. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
 #. TRANS: Client error displayed when trying to view group members for a non-existing group.
 #. TRANS: Client error displayed when trying to view group members for an object that is not a group.
-#. TRANS: Client error displayed when trying to view group members for a non-existing group.
-#. TRANS: Client error displayed when trying to view group members for an object that is not a group.
 #. TRANS: Client error displayed when requesting a group RSS feed for group that does not exist.
 #. TRANS: Client error displayed when requesting a group RSS feed for an object that is not a group.
 #. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
@@ -1221,12 +1209,12 @@ msgstr "يجب أن تلج لتغادر مجموعة."
 #. TRANS: Client error displayed when trying to leave a non-local group.
 #. TRANS: Client error displayed when trying to leave a non-existing group.
 #. TRANS: Client error displayed when providing an invalid group ID on the Make Admin page.
-#. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
-#. TRANS: Client error displayed if no local group with a given name was found requesting group page.
 #. TRANS: Command exception text shown when a group is requested that does not exist.
 #. TRANS: Error text shown when trying to leave a group that does not exist.
+#. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
+#. TRANS: Client error displayed if no local group with a given name was found requesting group page.
 msgid "No such group."
-msgstr "لا مجموعة كهذه."
+msgstr "لا توجد مجموعة بهذا الاسم."
 
 #. TRANS: Client error displayed when trying to leave a group without providing a group name or group ID.
 #. TRANS: Client error when trying to delete a group without providing a nickname or ID for the group.
@@ -1267,7 +1255,7 @@ msgstr ""
 #. TRANS: Client error displayed trying to approve/deny group membership.
 #. TRANS: Client error displayed trying to approve/deny  subscription
 msgid "Internal error: received both cancel and abort."
-msgstr ""
+msgstr "خطأ داخلي: وصل أمر إلغاء وأمر إجهاض."
 
 #. TRANS: Server error displayed when cancelling a queued group join request fails.
 #. TRANS: %1$s is the leaving user's nickname, $2$s is the group nickname for which the leave failed.
@@ -1291,6 +1279,7 @@ msgid "Join request canceled."
 msgstr "ألغي طلب الانضمام."
 
 #. TRANS: Client error displayed trying to approve subscription for a non-existing request.
+#. TRANS: %s is a user nickname.
 #, php-format
 msgid "%s is not in the moderation queue for your subscriptions."
 msgstr ""
@@ -1303,10 +1292,10 @@ msgstr ""
 
 #. TRANS: Title for subscription approval ajax return
 #. TRANS: %1$s is the approved user's nickname
-#, fuzzy, php-format
+#, php-format
 msgctxt "TITLE"
 msgid "%1$s's request"
-msgstr "حالة %1$s �ي يوم %2$s"
+msgstr "طلب %1$s"
 
 #. TRANS: Message on page for user after approving a subscription request.
 msgid "Subscription approved."
@@ -1377,7 +1366,7 @@ msgstr "أنت ممنوع من ق�بل المدير."
 
 #. TRANS: Client exception thrown when referencing a non-existing favorite.
 msgid "No such favorite."
-msgstr ""
+msgstr "هذه الم�ضلة غير موجودة."
 
 #. TRANS: Client exception thrown when trying to remove a favorite notice of another user.
 msgid "Cannot delete someone else's favorite."
@@ -1395,7 +1384,7 @@ msgstr "لا يمكن أن تحذ� عضوية شخص آخر."
 #. TRANS: %d is the non-existing profile ID number.
 #, php-format
 msgid "No such profile id: %d."
-msgstr ""
+msgstr "رقم المل� الشخصي هذا غير موجود: %d."
 
 #. TRANS: Client exception thrown when trying to display a subscription for a non-subscribed profile ID.
 #. TRANS: %1$d is the non-existing subscriber ID number, $2$d is the ID of the profile that was not subscribed to.
@@ -1425,7 +1414,7 @@ msgstr ""
 #. TRANS: %s is the unknown profile ID.
 #, php-format
 msgid "Unknown profile %s."
-msgstr ""
+msgstr "مل� %s الشخصي غير معرو�."
 
 #. TRANS: Client error displayed trying to subscribe to an already subscribed profile.
 #. TRANS: %s is the profile the user already has a subscription on.
@@ -1435,12 +1424,11 @@ msgstr "م�شترك �علا ب%s."
 
 #. TRANS: Client error displayed trying to get a non-existing attachment.
 msgid "No such attachment."
-msgstr "لا مر�ق كهذا."
+msgstr "المر�ق غير موجود."
 
 #. TRANS: Client error displayed trying to get an avatar without providing a nickname.
 #. TRANS: Client error displayed when requesting a list of blocked users for a group without providing a group nickname.
 #. TRANS: Client error displayed trying to edit a group while not proving a nickname for the group to edit.
-#. TRANS: Client error displayed trying to change group design settings without providing a group nickname.
 #. TRANS: Client error displayed when trying to change group logo settings without providing a nickname.
 #. TRANS: Client error displayed when trying to view group members without providing a group nickname.
 #. TRANS: Client error displayed when requesting a group RSS feed without providing a group nickname.
@@ -1538,7 +1526,7 @@ msgstr "انسخ الحساب احتياطيا"
 
 #. TRANS: Client exception thrown when trying to backup an account while not logged in.
 msgid "Only logged-in users can backup their account."
-msgstr ""
+msgstr "يستطيع المستخدمون الوالجون وحدهم نسخ حساباتهم احتياطيا."
 
 #. TRANS: Client exception thrown when trying to backup an account without having backup rights.
 msgid "You may not backup your account."
@@ -1552,8 +1540,8 @@ msgid ""
 "addresses is not backed up. Additionally, uploaded files and direct messages "
 "are not backed up."
 msgstr ""
-"يمكنك نسخ بيانات حسابك بنسق <a href=\"http://activitystrea.ms/\">Activity "
-"Streams</a>. هذه الميزة تجريبية وتو�ر نسخة احتياطية غير مكتملة. معلومات "
+"يمكنك نسخ بيانات حسابك بنسق <a href=\"http://activitystrea.ms/\">آكت�تي "
+"ستريمز</a>. هذه الميزة تجريبية وتو�ر نسخة احتياطية غير مكتملة. معلومات "
 "الحساب الخاصة كالبريد الإلكتروني وعناوين المحادثة ال�ورية لن تنسخ. المل�ات "
 "المر�وعة والرسائل المباشرة أيضًا لن تنسخ."
 
@@ -1727,12 +1715,22 @@ msgstr "أكد العنوان"
 #. TRANS: %s can be 'email', 'jabber', or 'sms'.
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
-msgstr "لقد تم التأكد من عنوان حسابك \"%s\"."
+msgstr "لقد تأكدنا من عنوان حسابك \"%s\"."
 
 #. TRANS: Title for page with a conversion (multiple notices in context).
 msgid "Conversation"
 msgstr "محادثة"
 
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+msgid "Conversation feed (Activity Streams JSON)"
+msgstr "تغذية المحادثة (آكت�تي ستريمز جيسن)"
+
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+msgid "Conversation feed (RSS 2.0)"
+msgstr "تغذية المحادثة (آرإس​إس 2.0)"
+
 #. TRANS: Title for conversation page.
 #. TRANS: Title for page that shows a notice.
 msgctxt "TITLE"
@@ -1793,8 +1791,8 @@ msgid "Enter \"%s\" to confirm that you want to delete your account."
 msgstr "أدخل \"%s\" لتأكيد رغبتك �ي حذ� حسابك."
 
 #. TRANS: Button title for user account deletion.
-msgid "Permanently delete your account"
-msgstr "احذ� حسابك إلى الأبد"
+msgid "Permanently delete your account."
+msgstr "احذ� حسابك إلى الأبد."
 
 #. TRANS: Client error displayed trying to delete an application while not logged in.
 msgid "You must be logged in to delete an application."
@@ -1818,7 +1816,7 @@ msgstr ""
 #. TRANS: Title for delete application page.
 #. TRANS: Fieldset legend on delete application page.
 msgid "Delete application"
-msgstr "احذ� هذا التطبيق"
+msgstr "احذ� التطبيق"
 
 #. TRANS: Confirmation text on delete application page.
 msgid ""
@@ -1884,12 +1882,13 @@ msgstr "احذ� هذه المجموعة."
 msgid ""
 "You are about to permanently delete a notice. Once this is done, it cannot "
 "be undone."
-msgstr "أنت على وشك حذ� إشعار بشكل دائم. عندما تقوم بذلك لن تتمكن من التراجع."
+msgstr ""
+"أنت على وشك حذ� الإشعار نهائيًا. تتمكن من التراجع عن هذه الخطوة بعد تن�يذها."
 
 #. TRANS: Page title when deleting a notice.
 #. TRANS: Fieldset legend for the delete notice form.
 msgid "Delete notice"
-msgstr "احذ� الإشعار"
+msgstr "حذ� إشعار"
 
 #. TRANS: Message for the delete notice form.
 msgid "Are you sure you want to delete this notice?"
@@ -1936,151 +1935,9 @@ msgstr "لا تحذ� هذا المستخدم."
 msgid "Delete this user."
 msgstr "احذ� هذا المستخدم."
 
-#. TRANS: Message used as title for design settings for the site.
-msgid "Design"
-msgstr "التصميم"
-
-#. TRANS: Instructions for design adminsitration panel.
-msgid "Design settings for this StatusNet site"
-msgstr "إعدادات تصميم موقع ستاسنت هذا"
-
-#. TRANS: Client error displayed when a logo URL does is not valid.
-msgid "Invalid logo URL."
-msgstr "مسار شعار غير صالح."
-
-#. TRANS: Client error displayed when an SSL logo URL is invalid.
-msgid "Invalid SSL logo URL."
-msgstr "مسار شعار SSL غير صالح."
-
-#. TRANS: Client error displayed when a theme is submitted through the form that is not in the theme list.
-#. TRANS: %s is the chosen unavailable theme.
-#, php-format
-msgid "Theme not available: %s."
-msgstr "السمة غير متو�رة: %s"
-
-#. TRANS: Fieldset legend for form to change logo.
-msgid "Change logo"
-msgstr "غيّر الشعار"
-
-#. TRANS: Field label for StatusNet site logo.
-msgid "Site logo"
-msgstr "شعار الموقع"
-
-#. TRANS: Field label for SSL StatusNet site logo.
-msgid "SSL logo"
-msgstr "شعار SSL"
-
-#. TRANS: Fieldset legend for form change StatusNet site's theme.
-msgid "Change theme"
-msgstr "غيّر السمة"
-
-#. TRANS: Field label for dropdown to choose site theme.
-msgid "Site theme"
-msgstr "سمة الموقع"
-
-#. TRANS: Title for field label for dropdown to choose site theme.
-msgid "Theme for the site."
-msgstr "سمة الموقع."
-
-#. TRANS: Field label for uploading a cutom theme.
-msgid "Custom theme"
-msgstr "سمة مخصصة"
-
-#. TRANS: Form instructions for uploading a cutom StatusNet theme.
-msgid "You can upload a custom StatusNet theme as a .ZIP archive."
-msgstr "يمكنك ر�ع سمة ستاتس نت على هيأة أرشي� .ZIP."
-
-#. TRANS: Fieldset legend for theme background image.
-msgid "Change background image"
-msgstr "تغيير صورة الخل�ية"
-
-#. TRANS: Field label for background image on theme designer page.
-#. TRANS: Field label for background color selector.
-#. TRANS: Label on profile design page for setting a profile page background colour.
-msgid "Background"
-msgstr "الخل�ية"
-
-#. TRANS: Form guide for background image upload form on theme designer page.
-#, php-format
-msgid ""
-"You can upload a background image for the site. The maximum file size is %1"
-"$s."
-msgstr "بإمكانك ر�ع صورة خل�ية للموقع. أقصى حجم للمل� هو %1$s."
-
-#. TRANS: Used as radio button label to add a background image.
-msgid "On"
-msgstr "مكّن"
-
-#. TRANS: Used as radio button label to not add a background image.
-msgid "Off"
-msgstr "عطّل"
-
-#. TRANS: Form guide for turning background image on or off on theme designer page.
-#. TRANS: Form guide for a set of radio buttons on the profile design page that will enable or disable
-#. TRANS: use of the uploaded profile image.
-msgid "Turn background image on or off."
-msgstr "مكّن صورة الخل�ية أو عطّلها."
-
-#. TRANS: Checkbox label to title background image on theme designer page.
-#. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
-msgid "Tile background image"
-msgstr "كرّر صورة الخل�ية"
-
-#. TRANS: Fieldset legend for theme colors.
-msgid "Change colors"
-msgstr "غيّر الألوان"
-
-#. TRANS: Field label for content color selector.
-#. TRANS: Label on profile design page for setting a profile page content colour.
-msgid "Content"
-msgstr "المحتوى"
-
-#. TRANS: Field label for sidebar color selector.
-#. TRANS: Label on profile design page for setting a profile page sidebar colour.
-msgid "Sidebar"
-msgstr "الشريط الجانبي"
-
-#. TRANS: Field label for text color selector.
-#. TRANS: Label on profile design page for setting a profile page text colour.
-msgid "Text"
-msgstr "النص"
-
-#. TRANS: Field label for link color selector.
-#. TRANS: Label on profile design page for setting a profile page links colour.
-msgid "Links"
-msgstr "وصلات"
-
-#. TRANS: Fieldset legend for advanced theme design settings.
-msgid "Advanced"
-msgstr "متقدم"
-
-#. TRANS: Field label for custom CSS.
-msgid "Custom CSS"
-msgstr "CSS مخصصة"
-
-#. TRANS: Button text for resetting theme settings.
-msgctxt "BUTTON"
-msgid "Use defaults"
-msgstr "استخدم المبدئية"
-
-#. TRANS: Title for button for resetting theme settings.
-#. TRANS: Title for button on profile design page to reset all colour settings to default.
-msgid "Restore default designs."
-msgstr "استعد التصاميم المبدئية."
-
-#. TRANS: Title for button for resetting theme settings.
-#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-msgid "Reset back to default."
-msgstr "ارجع إلى المبدئيات."
-
-#. TRANS: Title for button for saving theme settings.
-#. TRANS: Title for button on profile design page to save settings.
-msgid "Save design."
-msgstr "اح�ظ التصميم."
-
 #. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
 msgid "This notice is not a favorite!"
-msgstr "هذا الشعار ليس م�ضلًا!"
+msgstr "هذا الإشعار ليس م�ضلًا!"
 
 #. TRANS: Title for page on which favorites can be added.
 msgid "Add to favorites"
@@ -2092,6 +1949,79 @@ msgstr "أض� إلى الم�ضلات"
 msgid "No such document \"%s\"."
 msgstr "لا مستند باسم \"%s\"."
 
+#. TRANS: Menu item in administrator navigation panel.
+#. TRANS: Menu item in default local navigation panel.
+#. TRANS: Menu item in personal group navigation menu.
+msgctxt "MENU"
+msgid "Home"
+msgstr "الرئيسية"
+
+msgctxt "MENU"
+msgid "Docs"
+msgstr ""
+
+#. TRANS: Secondary navigation menu item leading to help on StatusNet.
+msgctxt "MENU"
+msgid "Help"
+msgstr "مساعدة"
+
+#, fuzzy
+msgid "Getting started"
+msgstr "ح��ظت الإعدادات."
+
+#. TRANS: Secondary navigation menu item leading to text about StatusNet site.
+msgctxt "MENU"
+msgid "About"
+msgstr "عن"
+
+#, fuzzy
+msgid "About this site"
+msgstr "ألغ� منع هذا المستخدم"
+
+#. TRANS: Secondary navigation menu item leading to Frequently Asked Questions.
+msgctxt "MENU"
+msgid "FAQ"
+msgstr "الأسئلة المتكررة"
+
+msgid "Frequently asked questions"
+msgstr ""
+
+#. TRANS: Secondary navigation menu item leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+msgctxt "MENU"
+msgid "Contact"
+msgstr "اتصل"
+
+#, fuzzy
+msgid "Contact info"
+msgstr "اتصل"
+
+#, fuzzy
+msgctxt "MENU"
+msgid "Tags"
+msgstr "الوسوم"
+
+msgid "Using tags"
+msgstr ""
+
+#. TRANS: Menu item in default local navigation panel.
+#. TRANS: Menu item in search group navigation panel.
+#. TRANS: Menu item in local navigation menu.
+msgctxt "MENU"
+msgid "Groups"
+msgstr "مجموعات"
+
+#, fuzzy
+msgid "Using groups"
+msgstr "مجموعات المستخدمين"
+
+msgctxt "MENU"
+msgid "API"
+msgstr ""
+
+msgid "RESTful API"
+msgstr ""
+
 #. TRANS: Title for "Edit application" form.
 #. TRANS: Form legend.
 msgid "Edit application"
@@ -2104,7 +2034,7 @@ msgstr "يجب أن تكون مسجل الدخول لتعدل تطبيقا."
 #. TRANS: Client error displayed trying to edit an application that does not exist.
 #. TRANS: Client error displayed trying to display a non-existing OAuth application.
 msgid "No such application."
-msgstr "لا تطبيق كهذا."
+msgstr "التطبيق المطلوب غير موجود."
 
 #. TRANS: Instructions for "Edit application" form.
 msgid "Use this form to edit your application."
@@ -2222,11 +2152,11 @@ msgstr "يجب أن تكون منشئ الوسم كي تستطيع تغييره.
 
 #. TRANS: Form instruction for edit list form.
 msgid "Use this form to edit the list."
-msgstr "إستعمل هذه الإستمارة كي تحرر اللائحة."
+msgstr "استخدم هذا النموذج لتعديل اللائحة."
 
 #. TRANS: Form validation error displayed if the form data for deleting a tag was incorrect.
 msgid "Delete aborted."
-msgstr "تم إجهاض عملية المحو."
+msgstr "أ�جهضت عملية المحو."
 
 #. TRANS: Text in confirmation dialog for deleting a tag.
 msgid ""
@@ -2235,15 +2165,14 @@ msgid ""
 msgstr ""
 
 #. TRANS: Form validation error displayed if a given tag is invalid.
-#, fuzzy
 msgid "Invalid tag."
-msgstr "صورة غير صالحة."
+msgstr "وسم غير صالح."
 
 #. TRANS: Form validation error displayed if a given tag is already present.
 #. TRANS: %s is the already present tag.
-#, fuzzy, php-format
+#, php-format
 msgid "You already have a tag named %s."
-msgstr "لقد كررت هذه الملاحظة بال�عل."
+msgstr "لديك مسبقا وسم باسم %s."
 
 #. TRANS: Text in confirmation dialog for setting a tag from public to private.
 msgid ""
@@ -2251,10 +2180,9 @@ msgid ""
 "subscriptions to it. Do you still want to continue?"
 msgstr ""
 
-#. TRANS: TRANS: Server error displayed when updating a list fails.
-#, fuzzy
+#. TRANS: Server error displayed when updating a list fails.
 msgid "Could not update list."
-msgstr "تعذّر تحديث المستخدم."
+msgstr "تعذّر تحديث اللائحة."
 
 #. TRANS: Title for e-mail settings.
 msgid "Email settings"
@@ -2379,9 +2307,8 @@ msgid "No email address."
 msgstr "لا عنوان بريد إلكتروني."
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
-#, fuzzy
 msgid "Cannot normalize that email address."
-msgstr "عنوان البريد الإلكتروني الم�ؤكد الحالي."
+msgstr "لا يمكن تطبيع عنوان البريد الإلكتروني هذا."
 
 #. TRANS: Message given saving e-mail address that not valid.
 #. TRANS: Form validation error displayed when trying to register without a valid e-mail address.
@@ -2415,7 +2342,7 @@ msgstr ""
 #. TRANS: Message given canceling Instant Messaging address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
 msgid "No pending confirmation to cancel."
-msgstr "لا يوجد تأكيد قيد الانتظار لتلغيه."
+msgstr "لا يوجد تأكيد معلق لتلغيه."
 
 #. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
 msgid "That is the wrong email address."
@@ -2455,18 +2382,16 @@ msgstr "ح�ذ�� عنوان البريد الإلكتروني الوارد."
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
 #. TRANS: Confirmation text after updating SMS settings.
-#, fuzzy
 msgid "New incoming email address added."
-msgstr "لا عنوان بريد إلكتروني وارد."
+msgstr "أضي� عنوان بريد إلكتروني وارد جديد."
 
 #. TRANS: Client error displayed when trying to mark a notice as favorite that already is a favorite.
 msgid "This notice is already a favorite!"
-msgstr "هذا الإشعار م�ضلة مسبقًا!"
+msgstr "هذا الإشعار م�ضل سابقا!"
 
 #. TRANS: Page title for page on which favorite notices can be unfavourited.
-#, fuzzy
 msgid "Disfavor favorite."
-msgstr "ألغ� ت�ضيل الم�ضلة"
+msgstr "ألغ� ت�ضيل الم�ضلة."
 
 #. TRANS: Page title for first page of favorited notices.
 #. TRANS: Title for favourited notices section.
@@ -2493,6 +2418,7 @@ msgid ""
 "Be the first to add a notice to your favorites by clicking the fave button "
 "next to any notice you like."
 msgstr ""
+"كن أول من يضي� إشعارا إلى م�ضلته بنقر زر الت�ضيل الملاصق لأي إشعار يعجبك."
 
 #. TRANS: Additional text displayed instead of a list when a site does not yet have any favourited notices for not logged in users.
 #. TRANS: %%action.register%% is a registration link. "[link text](link)" is Mark Down. Do not change the formatting.
@@ -2501,6 +2427,7 @@ msgid ""
 "Why not [register an account](%%action.register%%) and be the first to add a "
 "notice to your favorites!"
 msgstr ""
+"لم لا [تسجل حسابا](%%action.register%%) وتكون أول من يضي� إشعارا إلى م�ضلته!"
 
 #. TRANS: Title of RSS feed with favourite notices of a user.
 #. TRANS: %s is a user's nickname.
@@ -2522,7 +2449,7 @@ msgstr "المستجدات التي �ضلها %1$s �ي %2$s!"
 #. TRANS: Title for featured users section.
 #. TRANS: Menu item title in search group navigation panel.
 msgid "Featured users"
-msgstr "مستخدمون مختارون"
+msgstr "مستخدمون مميزون"
 
 #. TRANS: Page title for all but first page of featured users.
 #. TRANS: %d is the page number being displayed.
@@ -2531,9 +2458,9 @@ msgid "Featured users, page %d"
 msgstr "مستخدمون مختارون، ص�حة %d"
 
 #. TRANS: Description on page displaying featured users.
-#, fuzzy, php-format
+#, php-format
 msgid "A selection of some great users on %s."
-msgstr "اختيار لبعض المستخدمين المتميزين على %s"
+msgstr "عينة لبعض المستخدمين المتميزين على %s."
 
 #. TRANS: Client error displayed when no notice ID was given trying do display a file.
 msgid "No notice ID."
@@ -2552,44 +2479,9 @@ msgstr "لا مر�قات."
 msgid "No uploaded attachments."
 msgstr "لا مر�قات مر�وعة."
 
-#. TRANS: Client error displayed when subscribing to a remote profile and an unexpected response is received.
-msgid "Not expecting this response!"
-msgstr "لم أتوقع هذا الرد!"
-
-#. TRANS: Client error displayed when subscribing to a remote profile that does not exist.
-msgid "User being listened to does not exist."
-msgstr "المستخدم الذي تستمع إليه غير موجود."
-
-#. TRANS: Client error displayed when subscribing to a remote profile that is a local profile.
-#. TRANS: Client error displayed when using remote subscribe for a local entity.
-msgid "You can use the local subscription!"
-msgstr "تستطيع استخدام الاشتراك المحلي!"
-
-#. TRANS: Client error displayed when subscribing to a remote profile that is blocked form subscribing to.
-#, fuzzy
-msgid "That user has blocked you from subscribing."
-msgstr "لقد منعك المستخدم."
-
-#. TRANS: Client error displayed when subscribing to a remote profile without providing an authorised token.
-msgid "You are not authorized."
-msgstr "لا تملك تصريحًا."
-
-#. TRANS: Client error displayed when subscribing to a remote profile and conversion of the request token to access token fails.
-msgid "Could not convert request token to access token."
-msgstr ""
-
-#. TRANS: Client error displayed when subscribing to a remote profile fails because of an unsupported version of the OMB protocol.
-msgid "Remote service uses unknown version of OMB protocol."
-msgstr ""
-
-#. TRANS: Server error displayed when subscribing to a remote profile fails because the remote profile could not be updated.
-#. TRANS: Exception thrown when updating a remote profile fails in OAuth store.
-msgid "Error updating remote profile."
-msgstr "خطأ أثناء تحديث المل� الشخصي البعيد."
-
 #. TRANS: Client error displayed when requesting a non-existent file.
 msgid "No such file."
-msgstr "لا مل� كهذا."
+msgstr "المل� المقصود غير موجود."
 
 #. TRANS: Client error displayed when requesting a file without having read access to it.
 msgid "Cannot read file."
@@ -2597,14 +2489,13 @@ msgstr "تعذّرت قراءة المل�."
 
 #. TRANS: Client error displayed when trying to assign an invalid role to a user.
 #. TRANS: Client error displayed when trying to revoke an invalid role.
-#, fuzzy
 msgid "Invalid role."
-msgstr "حجم غير صالح."
+msgstr "دور غير صالح."
 
 #. TRANS: Client error displayed when trying to assign an reserved role to a user.
 #. TRANS: Client error displayed when trying to revoke a reserved role.
 msgid "This role is reserved and cannot be set."
-msgstr ""
+msgstr "هذا الدور مجحوز ولايمكن ضبطه."
 
 #. TRANS: Client error displayed when trying to assign a role to a user while not being allowed to set roles.
 msgid "You cannot grant user roles on this site."
@@ -2633,9 +2524,8 @@ msgid "Only an admin can block group members."
 msgstr ""
 
 #. TRANS: Client error displayed trying to block a user from a group while user is already blocked from the given group.
-#, fuzzy
 msgid "User is already blocked from group."
-msgstr "المستخدم ليس ممنوعًا من المجموعة."
+msgstr "المستخدم ممنوع من المجموعة من قبل."
 
 #. TRANS: Client error displayed trying to block a user from a group while user is not a member of given group.
 msgid "User is not a member of group."
@@ -2656,14 +2546,12 @@ msgid ""
 msgstr ""
 
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
-#, fuzzy
 msgid "Do not block this user from this group."
-msgstr "لا تمنع هذا المستخدم من هذه المجموعة"
+msgstr "لا تمنع هذا المستخدم من هذه المجموعة."
 
 #. TRANS: Submit button title for 'Yes' when blocking a user from a group.
-#, fuzzy
 msgid "Block this user from this group."
-msgstr "امنع هذا المستخدم من هذه المجموعة"
+msgstr "امنع هذا المستخدم من هذه المجموعة."
 
 #. TRANS: Server error displayed when trying to block a user from a group fails because of an application error.
 msgid "Database error blocking user from group."
@@ -2675,30 +2563,6 @@ msgstr "خطأ �ي قاعدة البيانات أثناء منع المستخد
 msgid "No ID."
 msgstr "لا هوية."
 
-#. TRANS: Client error displayed trying to change group design settings while not logged in.
-msgid "You must be logged in to edit a group."
-msgstr "يجب أن تلج لت�عدّل المجموعات."
-
-#. TRANS: Title group design settings page.
-msgid "Group design"
-msgstr "تصميم المجموعة"
-
-#. TRANS: Instructions for group design settings page.
-#, fuzzy
-msgid ""
-"Customize the way your group looks with a background image and a colour "
-"palette of your choice."
-msgstr "خصّص أسلوب عرض مل�ك بصورة خل�ية ومخطط ألوان من اختيارك."
-
-#. TRANS: Form validation error displayed when group design settings could not be updated because of an application issue.
-msgid "Unable to update your design settings."
-msgstr "!تعذّر تحديث إعدادات تصميمك."
-
-#. TRANS: Form text to confirm saved group design settings.
-#. TRANS: Confirmation message on Profile design page when saving design settings has succeeded.
-msgid "Design preferences saved."
-msgstr "ح��ظت ت�ضيلات التصميم."
-
 #. TRANS: Title for group logo settings page.
 #. TRANS: Group logo form legend.
 msgid "Group logo"
@@ -2868,9 +2732,11 @@ msgstr "إعدادات المراسلة ال�ورية"
 #. TRANS: the order and formatting of link text and link should remain unchanged.
 #, php-format
 msgid ""
-"You can send and receive notices through instant messaging [instant messages]"
-"(%%doc.im%%). Configure your addresses and settings below."
+"You can send and receive notices through [instant messaging](%%doc.im%%). "
+"Configure your addresses and settings below."
 msgstr ""
+"يمكنك إرسال واستقبال الإشعارات عبر [المراسلة ال�ورية](%%doc.im%%). اضبط "
+"عنوانك وإعدادتك أدناه."
 
 #. TRANS: Message given in the IM settings if IM is not enabled on the site.
 msgid "IM is not available."
@@ -2883,13 +2749,13 @@ msgstr "عنوان %s الم�ؤكد حاليا."
 
 #. TRANS: Form note in IM settings form.
 #. TRANS: %s is the IM service name, %2$s is the IM address set.
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your %1$s account for a message "
 "with further instructions. (Did you add %2$s to your buddy list?)"
 msgstr ""
-"�ي انتظار تأكيد هذا العنوان. التمس رسالة تحوي مزيدًا من التعليمات �ي صندوق "
-"الوارد (وصندوق الرسائل المزعجة!)."
+"�ي انتظار تأكيد هذا العنوان. التمس رسالة تحوي مزيدًا من التعليمات �ي حسابك %1"
+"$s. (أأض�ت %2$s إلى قائمة أصدقائك؟)"
 
 #. TRANS: Field label for IM address.
 msgid "IM address"
@@ -2934,14 +2800,12 @@ msgid "No screenname."
 msgstr "لا اسم مستعار."
 
 #. TRANS: Form validation error when no transport is available setting an IM address.
-#, fuzzy
 msgid "No transport."
-msgstr "لا ملاحظة."
+msgstr "لا نقل."
 
 #. TRANS: Message given saving IM address that cannot be normalised.
-#, fuzzy
 msgid "Cannot normalize that screenname."
-msgstr "ليست هوية جابر صالحة"
+msgstr "لا يمكن تطبيع اسم الشاشة هذا."
 
 #. TRANS: Message given saving IM address that not valid.
 msgid "Not a valid screenname."
@@ -2994,7 +2858,7 @@ msgstr "هذا صندوق بريدك الوارد، والذي يسرد رسائ
 
 #. TRANS: Client error displayed when trying to sent invites while they have been disabled.
 msgid "Invites have been disabled."
-msgstr "تم تعطيل الدعوات."
+msgstr "ع�طّلت الدعوات."
 
 #. TRANS: Client error displayed when trying to sent invites while not logged in.
 #. TRANS: %s is the StatusNet site name.
@@ -3055,9 +2919,9 @@ msgstr[5] ""
 msgid "Invitation sent to the following person:"
 msgid_plural "Invitations sent to the following people:"
 msgstr[0] ""
-msgstr[1] "أرسلت الدعوة إلى الشخص التالي:"
-msgstr[2] "أرسلت الدعوتين إلى الشخصين التاليين:"
-msgstr[3] "أرسلت الدعوات إلى الأشخاص التالين:"
+msgstr[1] "أ�رسلت الدعوة إلى هذا الشخص:"
+msgstr[2] "أ�رسلت الدعوتان إلى هذين الشخصين:"
+msgstr[3] "أ�رسلت الدعوات إلى هؤلاء الأشخاص:"
 msgstr[4] ""
 msgstr[5] ""
 
@@ -3066,37 +2930,13 @@ msgstr[5] ""
 msgid ""
 "You will be notified when your invitees accept the invitation and register "
 "on the site. Thanks for growing the community!"
-msgstr ""
-"سو� يتم بإبلاغك عندما يقبل من دعوتهم دعوتك ويسجلوا �ي الموقع. شكرا لك على "
-"إنماء المجتمع!"
+msgstr "سو� ت�بلغ عند قبول دعوتك والتسجيل �ي الموقع. نشكر لك إنماء مجتمعنا!"
 
 #. TRANS: Form instructions.
 msgid ""
 "Use this form to invite your friends and colleagues to use this service."
 msgstr "استخدم هذا النموذج لدعوة أصدقائك وزملائك لاستخدام هذه الخدمة."
 
-#. TRANS: Field label for a list of e-mail addresses.
-msgid "Email addresses"
-msgstr "عناوين البريد الإلكتروني"
-
-#. TRANS: Tooltip for field label for a list of e-mail addresses.
-msgid "Addresses of friends to invite (one per line)."
-msgstr "عناوين الأصدقاء الذين تريد دعوتهم (واحد لكل سطر)."
-
-#. TRANS: Field label for a personal message to send to invitees.
-msgid "Personal message"
-msgstr "رسالة شخصية"
-
-#. TRANS: Tooltip for field label for a personal message to send to invitees.
-msgid "Optionally add a personal message to the invitation."
-msgstr "يمكنك إضا�ة رسالة شخصية اختيارية إلى الدعوة."
-
-#. TRANS: Send button for inviting friends
-#. TRANS: Button text for sending notice.
-msgctxt "BUTTON"
-msgid "Send"
-msgstr "أرسل"
-
 #. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral
 #. TRANS: singular 3rd-person pronoun in English. %1$s is the inviting user, $2$s is
 #. TRANS: the StatusNet sitename.
@@ -3193,7 +3033,7 @@ msgstr "ت�اصيل الرخصة"
 
 #. TRANS: Field label in the license admin panel.
 msgid "Owner"
-msgstr ""
+msgstr "المالك"
 
 #. TRANS: Field title in the license admin panel.
 msgid "Name of the owner of the site's content (if applicable)."
@@ -3227,12 +3067,6 @@ msgstr "مسار الصورة التي ستعرض مع الرخصة."
 msgid "Save license settings."
 msgstr "اح�ظ إعدادات الرخصة."
 
-#. TRANS: Client error displayed when trying to log in while already logged in.
-#. TRANS: Client error displayed trying to use "one time password login" when already logged in.
-#. TRANS: Client error displayed when trying to register while already logged in.
-msgid "Already logged in."
-msgstr "والج بال�عل."
-
 #. TRANS: Form validation error displayed when trying to log in with incorrect credentials.
 msgid "Incorrect username or password."
 msgstr "اسم المستخدم أو كلمة السر غير صحيحان."
@@ -3251,9 +3085,8 @@ msgid "Login to site"
 msgstr "ل�ج إلى الموقع"
 
 #. TRANS: Field label on login page.
-#, fuzzy
 msgid "Username or email address"
-msgstr "الاسم المستعار أو البريد الإلكتروني"
+msgstr "اسم المستخدم أو البريد الإلكتروني"
 
 #. TRANS: Checkbox label label on login page.
 #. TRANS: Checkbox label on account registration page.
@@ -3290,7 +3123,7 @@ msgstr "ل�ج باسم مستخدمك وكلمة سرك."
 #, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
-msgstr "ليس لديك حساب؟ [سجل](%%action.register%%) حسابًا جديدًا"
+msgstr "ليس لديك حساب؟ [سجل](%%action.register%%) حسابًا جديدًا."
 
 #. TRANS: Client error displayed when trying to make another user admin on the Make Admin page while not an admin.
 msgid "Only an admin can make another user an admin."
@@ -3333,14 +3166,14 @@ msgid "Use this form to register a new application."
 msgstr "استخدم هذا النموذج لتسجل تطبيقا جديدا."
 
 #. TRANS: Validation error shown when not providing a source URL in the "New application" form.
-#, fuzzy
 msgid "Source URL is required."
-msgstr "مسار المصدر ليس صحيحا."
+msgstr "المسار المصدر مطلوب."
 
 #. TRANS: Server error displayed when an application could not be registered in the database through the "New application" form.
 msgid "Could not create application."
 msgstr "لم يمكن إنشاء التطبيق."
 
+#. TRANS: Form validation error messages displayed when uploading an invalid application logo.
 msgid "Invalid image."
 msgstr "صورة غير صالحة."
 
@@ -3349,9 +3182,8 @@ msgid "New group"
 msgstr "مجموعة جديدة"
 
 #. TRANS: Client exception thrown when a user tries to create a group while banned.
-#, fuzzy
 msgid "You are not allowed to create groups on this site."
-msgstr "لست عضوًا �ي هذه المجموعة"
+msgstr "لا يسمح لك بإنشاء مجموعات على هذا الموقع."
 
 #. TRANS: Form instructions for group create form.
 msgid "Use this form to create a new group."
@@ -3364,9 +3196,8 @@ msgstr "رسالة جديدة"
 
 #. TRANS: Client error displayed trying to send a direct message to a user while sender and
 #. TRANS: receiver are not subscribed to each other.
-#, fuzzy
 msgid "You cannot send a message to this user."
-msgstr "لا يمكنك إرسال رسائل إلى هذا المستخدم."
+msgstr "لا يمكنك إرسال رسالة إلى هذا المستخدم."
 
 #. TRANS: Form validator error displayed trying to send a direct message without content.
 #. TRANS: Client error displayed trying to send a notice without content.
@@ -3379,12 +3210,6 @@ msgstr "لا محتوى!"
 msgid "No recipient specified."
 msgstr "لا مستلم ح�دّد."
 
-#. TRANS: Client error displayed trying to send a direct message to self.
-#. TRANS: Error text shown when trying to send a direct message to self.
-msgid ""
-"Don't send a message to yourself; just say it to yourself quietly instead."
-msgstr "لا ترسل رسالة إلى ن�سك، قلها لن�سك �ي سرك بدلًا من ذلك."
-
 #. TRANS: Page title after sending a direct message.
 msgid "Message sent"
 msgstr "أ�رسلت الرسالة"
@@ -3395,7 +3220,7 @@ msgstr "أ�رسلت الرسالة"
 #. TRANS: %s is the name of the other user.
 #, php-format
 msgid "Direct message to %s sent."
-msgstr "رسالة مباشرة ل%s تم إرسالها."
+msgstr "تم إرسال رسالة مباشرة ل%s."
 
 #. TRANS: Page title after an AJAX error occurred on the "send direct message" page.
 #. TRANS: Page title after an AJAX error occurs on the send notice page.
@@ -3448,6 +3273,8 @@ msgid ""
 "Why not [register an account](%%%%action.register%%%%) and be the first to "
 "[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
 msgstr ""
+"لمَ لا [تسجل حسابا](%%%%action.register%%%%) وتكون أول من [ينشر عن هذا "
+"الموضوع](%%%%action.newnotice%%%%?status_textarea=%s)!"
 
 #. TRANS: RSS notice search feed title. %s is the query.
 #, php-format
@@ -3497,7 +3324,7 @@ msgstr "التطبيقات المتصلة"
 
 #. TRANS: Instructions for OAuth connection settings.
 msgid "The following connections exist for your account."
-msgstr ""
+msgstr "توجد الارتباطات التالية بحسابك."
 
 #. TRANS: Client error when trying to revoke access for an application while not being a user of it.
 msgid "You are not a user of that application."
@@ -3505,9 +3332,9 @@ msgstr "لست مستخدما لهذا التطبيق."
 
 #. TRANS: Client error when revoking access has failed for some reason.
 #. TRANS: %s is the application ID revoking access failed for.
-#, fuzzy, php-format
+#, php-format
 msgid "Unable to revoke access for application: %s."
-msgstr "استخدم هذا النموذج لتعدل تطبيقك."
+msgstr "غير قادر على سحب الصلاحية للتطبيق: %s."
 
 #. TRANS: Success message after revoking access for an application.
 #. TRANS: %1$s is the application name, %2$s is the first part of the user token.
@@ -3528,7 +3355,7 @@ msgstr "لم تسمح لأي تطبيق بإستعمال حسابك."
 msgid ""
 "Are you a developer? [Register an OAuth client application](%s) to use with "
 "this instance of StatusNet."
-msgstr ""
+msgstr "هل أنت مطو�ّر؟ [سجّل تطبيق عميل OAuth](%s) لتستخدمه مع هذا الموقع."
 
 #. TRANS: Server error displayed in oEmbed action when path not found.
 #. TRANS: %s is a path.
@@ -3581,6 +3408,33 @@ msgstr ""
 msgid "Not a supported data format."
 msgstr "ليس نسق بيانات مدعوم."
 
+#. TRANS: Page title for profile settings.
+#, fuzzy
+msgid "Old school UI settings"
+msgstr "إعدادات المراسلة ال�ورية"
+
+#. TRANS: Usage instructions for profile settings.
+msgid "If you like it \"the old way\", you can set that here."
+msgstr ""
+
+#. TRANS: Confirmation shown when user profile settings are saved.
+#. TRANS: Message after successful saving of administrative settings.
+msgid "Settings saved."
+msgstr "ح��ظت الإعدادات."
+
+msgid "Only stream mode (no conversations) in timelines"
+msgstr ""
+
+msgid "Show conversation page as hierarchical trees"
+msgstr ""
+
+msgid "Show nicknames (not full names) in timelines"
+msgstr ""
+
+#. TRANS: Button text to save a list.
+msgid "Save"
+msgstr "اح�ظ"
+
 #. TRANS: ShortName in the OpenSearch interface when trying to find users.
 msgid "People Search"
 msgstr "بحث �ي الأشخاص"
@@ -3589,6 +3443,11 @@ msgstr "بحث �ي الأشخاص"
 msgid "Notice Search"
 msgstr "بحث الإشعارات"
 
+#. TRANS: Client error displayed trying to use "one time password login" when already logged in.
+#. TRANS: Client error displayed when trying to register while already logged in.
+msgid "Already logged in."
+msgstr "والج بال�عل."
+
 #. TRANS: Client error displayed trying to use "one time password login" without specifying a user.
 msgid "No user ID specified."
 msgstr "لا هوية مستخدم محددة."
@@ -3658,7 +3517,7 @@ msgid "Confirm"
 msgstr "أكّد"
 
 #. TRANS: Field title on page where to change password.
-#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
+#. TRANS: Title for field label for password reset form where the password has to be typed again.
 #. TRANS: Field title on account registration page.
 msgid "Same as password above."
 msgstr "ن�س كلمة السر أعلاه."
@@ -3716,12 +3575,6 @@ msgstr "لا يمكن قراءة دليل السمات: %s."
 msgid "Avatar directory not writable: %s."
 msgstr "لا يمكن الكتابة �ي دليل الأ�تارات: %s."
 
-#. TRANS: Client error in Paths admin panel.
-#. TRANS: %s is the background directory that could not be written to.
-#, php-format
-msgid "Background directory not writable: %s."
-msgstr "لا يمكن الكتابة �ي دليل الخل�يات: %s."
-
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the locales directory that could not be read from.
 #, php-format
@@ -3823,9 +3676,8 @@ msgid "Avatar path"
 msgstr "مسار الأ�تارات"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#, fuzzy
 msgid "Web path to avatars."
-msgstr "�شل تحديث الأ�تار."
+msgstr "مسار الويب للصور الرمزية."
 
 #. TRANS: Field label in Paths admin panel.
 msgid "Avatar directory"
@@ -3835,30 +3687,6 @@ msgstr "دليل الأ�تارات"
 msgid "Directory where avatars are located."
 msgstr "الدليل الذي �يه الأ�تارات."
 
-#. TRANS: Fieldset legend in Paths admin panel.
-msgid "Backgrounds"
-msgstr "الخل�يات"
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-msgid "Server for backgrounds."
-msgstr "خادوم الخل�يات."
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-msgid "Web path to backgrounds."
-msgstr "مسار الشبكة للصور الخل�ية."
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-msgid "Server for backgrounds on SSL pages."
-msgstr ""
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-msgid "Web path to backgrounds on SSL pages."
-msgstr ""
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-msgid "Directory where backgrounds are located."
-msgstr "الدليل الذي �يه الخل�يات."
-
 #. TRANS: Fieldset legens in Paths admin panel.
 msgid "Attachments"
 msgstr "المر�قات"
@@ -3914,8 +3742,8 @@ msgid "Server to direct SSL requests to."
 msgstr "الخادوم الذي ستوجه طلبات SSL إليه."
 
 #. TRANS: Button title text to store form data in the Paths admin panel.
-msgid "Save paths"
-msgstr "اح�ظ المسارات"
+msgid "Save path settings."
+msgstr "اح�ظ إعدادت المسارات."
 
 #. TRANS: Instructions for the "People search" page.
 #. TRANS: %%site.name%% is the name of the StatusNet site.
@@ -3933,28 +3761,29 @@ msgstr "بحث �ي الأشخاص"
 
 #. TRANS: Title for list page.
 #. TRANS: %s is a list.
-#, fuzzy, php-format
+#, php-format
 msgid "Public list %s"
-msgstr "سحابة الوسوم العمومية"
+msgstr "اللائحة العامة %s"
 
 #. TRANS: Title for list page.
 #. TRANS: %1$s is a list, %2$d is a page number.
-#, fuzzy, php-format
+#, php-format
 msgid "Public list %1$s, page %2$d"
-msgstr "الردود على %1$s، الص�حة %2$d"
+msgstr "اللائحة العامة %1$s، الص�حة %2$d"
 
 #. TRANS: Message for anonymous users on list page.
 #. TRANS: This message contains Markdown links in the form [description](link).
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "Lists are how you sort similar people on %%site.name%%, a [micro-blogging]"
 "(http://en.wikipedia.org/wiki/Micro-blogging) service based on the Free "
 "Software [StatusNet](http://status.net/) tool. You can then easily keep "
 "track of what they are doing by subscribing to the list's timeline."
 msgstr ""
-"**%s** مجموعة مستخدمين على %%%%site.name%%%%، خدمة [التدوين الم�صغّر](http://"
-"en.wikipedia.org/wiki/Micro-blogging) المبنية على البرنامج الحر [ستاتس نت]"
-"(http://status.net/). يتشارك أعضاؤها رسائل قصيرة عن حياتهم واهتماماتهم. "
+"تمكنك اللائحات من �رز الأشخاص حسب تشابههم على %%site.name%%، خدمة [التدوين "
+"الم�صغّر](http://en.wikipedia.org/wiki/Micro-blogging) المبنية على البرنامج "
+"الحر [ستاتس نت](http://status.net/). يمكنك بعد ذلك متابعتهم بالاشتراك "
+"بالمسار الزمني للائحة."
 
 #. TRANS: Client error displayed when a tagger is expected but not provided.
 msgid "No tagger."
@@ -3964,13 +3793,13 @@ msgstr ""
 #. TRANS: %1$s is a list, %2$s is a username.
 #, php-format
 msgid "People listed in %1$s by %2$s"
-msgstr "الناس المدرجة �ي  %1$s من %2$s"
+msgstr "المدرجون �ي %1$s من %2$s"
 
 #. TRANS: Title for list of people listed by the user.
 #. TRANS: %1$s is a list, %2$s is a username, %2$s is a page number.
 #, php-format
 msgid "People listed in %1$s by %2$s, page %3$d"
-msgstr "الناس المدرجة �ي %1$s من %2$s ، الص�حة %3$d"
+msgstr "المدرجون �ي %1$s من %2$s، الص�حة %3$d"
 
 #. TRANS: Addition in tag membership list for creator of a tag.
 #. TRANS: Addition in tag subscribers list for creator of a tag.
@@ -3979,31 +3808,31 @@ msgstr "المنشئ"
 
 #. TRANS: Title for lists by a user page for a private tag.
 msgid "Private lists by you"
-msgstr "اللائحات الخاصة بك"
+msgstr "لائحاتك الخاصة"
 
 #. TRANS: Title for lists by a user page for a public tag.
 msgid "Public lists by you"
-msgstr "اللائحات العامة لك"
+msgstr "لائحاتك العامة"
 
 #. TRANS: Title for lists by a user page.
 msgid "Lists by you"
-msgstr "اللائحات لك"
+msgstr "لائحاتك"
 
 #. TRANS: Title for lists by a user page.
 #. TRANS: %s is a user nickname.
 #, php-format
 msgid "Lists by %s"
-msgstr "اللائحات لــ%s"
+msgstr "لائحات %s"
 
 #. TRANS: Title for lists by a user page.
 #. TRANS: %1$s is a user nickname, %2$d is a page number.
 #, php-format
 msgid "Lists by %1$s, page %2$d"
-msgstr ""
+msgstr "لائحات %1$s، الص�حة %2$d"
 
 #. TRANS: Client error displayed when trying view another user's private lists.
 msgid "You cannot view others' private lists"
-msgstr ""
+msgstr "لا يمكن أن تشاهد لائحات الآخرين الخاصة."
 
 #. TRANS: Mode selector label.
 msgid "Mode"
@@ -4021,7 +3850,7 @@ msgstr "اختر وسمًا لترشيحه"
 
 #. TRANS: Checkbox title.
 msgid "Show private tags."
-msgstr ""
+msgstr "عرض الوسوم الخاصة"
 
 #. TRANS: Checkbox label to show public tags.
 msgctxt "LABEL"
@@ -4030,13 +3859,13 @@ msgstr "عمومي"
 
 #. TRANS: Checkbox title.
 msgid "Show public tags."
-msgstr ""
+msgstr "أظهر الوسوم العمومية."
 
 #. TRANS: Submit button text for tag filter form.
 #. TRANS: Submit button text on gallery action page.
 msgctxt "BUTTON"
 msgid "Go"
-msgstr "إنطلق"
+msgstr "اذهب"
 
 #. TRANS: Message displayed for anonymous users on page that displays lists by a user.
 #. TRANS: This message contains Markdown links in the form [description](links).
@@ -4047,25 +3876,29 @@ msgid ""
 "%%%site.name%%%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
 "blogging) service based on the Free Software [StatusNet](http://status.net/) "
 "tool. You can easily keep track of what they are doing by subscribing to the "
-"tag's timeline."
+"list's timeline."
 msgstr ""
+"هذه اللائحات التي أنشأها **%s**. تمكنك اللائحات من �رز الأشخاص حسب تشابههم "
+"على %%%%site.name%%%% خدمة [التدوين الم�صغّر](http://en.wikipedia.org/wiki/"
+"Micro-blogging) المبنية على البرنامج الحر [ستاتس نت](http://status.net/). "
+"يمكنك بعد ذلك متابعتهم بالاشتراك بالمسار الزمني للائحة."
 
 #. TRANS: Message displayed on page that displays lists by a user when there are none.
 #. TRANS: This message contains Markdown links in the form [description](links).
 #. TRANS: %s is a tagger nickname.
 #, php-format
 msgid "%s has not created any [lists](%%%%doc.lists%%%%) yet."
-msgstr ""
+msgstr "لم ينشئ %s أي [لائحات](%%%%doc.lists%%%%) إلى الآن."
 
 #. TRANS: Page title. %s is a tagged user's nickname.
 #, php-format
 msgid "Lists with %s in them"
-msgstr ""
+msgstr "اللائحات التي �يها %s"
 
 #. TRANS: Page title. %1$s is a tagged user's nickname, %2$s is a page number.
 #, php-format
 msgid "Lists with %1$s, page %2$d"
-msgstr ""
+msgstr "اللائحات التي �يها %1$s، الص�حة %2$d"
 
 #. TRANS: Message displayed for anonymous users on page that displays lists for a user.
 #. TRANS: This message contains Markdown links in the form [description](links).
@@ -4076,39 +3909,43 @@ msgid ""
 "site.name%%%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
 "blogging) service based on the Free Software [StatusNet](http://status.net/) "
 "tool. You can easily keep track of what they are doing by subscribing to the "
-"tag's timeline."
+"list's timeline."
 msgstr ""
+"هذه لائحات **%s**. تمكنك اللائحات من �رز الأشخاص حسب تشابههم على %%%%site."
+"name%%%%، خدمة [التدوين الم�صغّر](http://en.wikipedia.org/wiki/Micro-blogging) "
+"المبنية على البرنامج الحر [ستاتس نت](http://status.net/). يمكنك بعد ذلك "
+"متابعتهم بالاشتراك بالمسار الزمني للائحة."
 
 #. TRANS: Message displayed on page that displays lists a user was added to when there are none.
 #. TRANS: This message contains Markdown links in the form [description](links).
 #. TRANS: %s is a user nickname.
 #, php-format
 msgid "%s has not been [listed](%%%%doc.lists%%%%) by anyone yet."
-msgstr ""
+msgstr "لم [يدرج](%%%%doc.lists%%%%) أحد %s إلى الآن."
 
 #. TRANS: Page title for list of list subscribers.
 #. TRANS: %1$s is a list, %2$s is a user nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "Subscribers to list %1$s by %2$s"
-msgstr "الردود على %1$s، الص�حة %2$d"
+msgstr "المشتركون باللائحة %1$s التي أنشأها %2$s"
 
 #. TRANS: Page title for list of list subscribers.
 #. TRANS: %1$s is a list, %2$s is a user nickname, %3$d is a page number.
-#, fuzzy, php-format
+#, php-format
 msgid "Subscribers to list %1$s by %2$s, page %3$d"
-msgstr "الإشعارات الموسومة ب%s، الص�حة %2$d"
+msgstr "المشتركون باللائحة %1$s التي أنشأها %2$s، الص�حة %3$d"
 
 #. TRANS: Title for page that displays lists subscribed to by a user.
 #. TRANS: %s is a profile nickname.
 #, php-format
 msgid "Lists subscribed to by %s"
-msgstr "اللائحات اللتي %s هو مشترك �يها"
+msgstr "اللائحات التي %s مشترك بها"
 
 #. TRANS: Title for page that displays lists subscribed to by a user.
 #. TRANS: %1$s is a profile nickname, %2$d is a page number.
 #, php-format
 msgid "Lists subscribed to by %1$s, page %2$d"
-msgstr ""
+msgstr "اللائحات التي %1$s مشترك بها، الص�حة %2$d"
 
 #. TRANS: Message displayed for anonymous users on page that displays lists subscribed to by a user.
 #. TRANS: This message contains Markdown links in the form [description](links).
@@ -4121,6 +3958,10 @@ msgid ""
 "net/) tool. You can easily keep track of what they are doing by subscribing "
 "to the list's timeline."
 msgstr ""
+"هذه اللائحات التي أنشأها **%s**. تمكنك اللائحات من �رز الأشخاص حسب تشابههم "
+"على %%%%site.name%%%%، خدمة [التدوين الم�صغّر](http://en.wikipedia.org/wiki/"
+"Micro-blogging) المبنية على البرنامج الحر [ستاتس نت](http://status.net/). "
+"يمكنك بعد ذلك متابعتهم بالاشتراك بالمسار الزمني للائحة."
 
 #. TRANS: Page title for AJAX form return when a disabling a plugin.
 msgctxt "plugin"
@@ -4141,7 +3982,7 @@ msgstr "لا يمكنك إدارة الملحقات."
 
 #. TRANS: Client error displayed when trying to enable or disable a non-existing plugin.
 msgid "No such plugin."
-msgstr "لا ملحق كهذا."
+msgstr "الملحق المقصود غير موجود."
 
 #. TRANS: Page title for AJAX form return when enabling a plugin.
 msgctxt "plugin"
@@ -4169,16 +4010,6 @@ msgid ""
 "All default plugins have been disabled from the site's configuration file."
 msgstr ""
 
-#. TRANS: Client error displayed if the notice posted has too many characters.
-msgid "Invalid notice content."
-msgstr "محتوى إشعار غير صالح."
-
-#. TRANS: Exception thrown if a notice's license is not compatible with the StatusNet site license.
-#. TRANS: %1$s is the notice license, %2$s is the StatusNet site's license.
-#, php-format
-msgid "Notice license \"%1$s\" is not compatible with site license \"%2$s\"."
-msgstr ""
-
 #. TRANS: Client error displayed when trying to add an unindentified field to profile.
 #. TRANS: %s is a field name.
 #, php-format
@@ -4210,9 +4041,8 @@ msgstr "معلومات المل� الشخصي"
 #. TRANS: Tooltip for field label in form for profile settings.
 #. TRANS: Field title on account registration page.
 #. TRANS: Field title on group edit form.
-#, fuzzy
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
-msgstr "1-64 حر�ًا إنجليزيًا أو رقمًا بدون نقاط أو مسا�ات"
+msgstr "1-64 حر�ًا إنجليزيًا أو رقمًا، بدون نقاط أو مسا�ات."
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Field label on account registration page.
@@ -4230,7 +4060,7 @@ msgstr "الص�حة الرئيسية"
 #. TRANS: Tooltip for field label in form for profile settings.
 #. TRANS: Field title on account registration page.
 msgid "URL of your homepage, blog, or profile on another site."
-msgstr ""
+msgstr "مسار موقعك أو مدونتك أو ص�حتك على موقع آخر."
 
 #. TRANS: Tooltip for field label in form for profile settings. Plural
 #. TRANS: is decided by the number of characters available for the
@@ -4241,12 +4071,12 @@ msgstr ""
 #, php-format
 msgid "Describe yourself and your interests in %d character."
 msgid_plural "Describe yourself and your interests in %d characters."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-msgstr[4] ""
-msgstr[5] ""
+msgstr[0] "ص� ن�سك واهتماماتك بلا أحر�."
+msgstr[1] "ص� ن�سك واهتماماتك �ي حر� واحد."
+msgstr[2] "ص� ن�سك واهتماماتك �ي حر�ين."
+msgstr[3] "ص� ن�سك واهتماماتك �ي %d أحر�."
+msgstr[4] "ص� ن�سك واهتماماتك �ي %d حر�ًا."
+msgstr[5] "ص� ن�سك واهتماماتك �ي %d حر�."
 
 #. TRANS: Tooltip for field label in form for profile settings.
 #. TRANS: Text area title on account registration page.
@@ -4276,6 +4106,8 @@ msgid "Share my current location when posting notices"
 msgstr "شارك مكاني الحالي عند إرسال إشعارات"
 
 #. TRANS: Field label in form for profile settings.
+#. TRANS: Title for group tag cloud section.
+#. TRANS: %s is a group name.
 msgid "Tags"
 msgstr "الوسوم"
 
@@ -4284,6 +4116,7 @@ msgid ""
 "Tags for yourself (letters, numbers, -, ., and _), comma- or space- "
 "separated."
 msgstr ""
+"وسومك (حرو� وأرقام و \"-\" و \".\" و \"_\")، ا�صلها ب�اصلة (',') أو مسا�ة."
 
 #. TRANS: Dropdownlist label in form for profile settings.
 msgid "Language"
@@ -4303,28 +4136,28 @@ msgstr "ما المنطقة الزمنية التي تتواجد �يها عاد
 
 #. TRANS: Checkbox label in form for profile settings.
 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 "اشترك تلقائيًا بأي شخص يشترك بي (ي�ضل أن يستخدم لغير البشر)"
 
 #. TRANS: Dropdown field label on profile settings, for what policies to apply when someone else tries to subscribe to your updates.
 msgid "Subscription policy"
-msgstr "سياسة الإشتراكات"
+msgstr "سياسة الاشتراكات"
 
 #. TRANS: Dropdown field option for following policy.
 msgid "Let anyone follow me"
-msgstr "السماح لأي شخص بمتابعتي"
+msgstr "اسمح لأي شخص بمتابعتي"
 
 #. TRANS: Dropdown field option for following policy.
 msgid "Ask me first"
-msgstr "إسألني أولاّ"
+msgstr "اسألني أولا"
 
 #. TRANS: Dropdown field title on group edit form.
 msgid "Whether other users need your permission to follow your updates."
-msgstr ""
+msgstr "هل يحتاج الناس إلى إذنك ليتابعوا مستجداتك؟"
 
 #. TRANS: Checkbox label in profile settings.
 msgid "Make updates visible only to my followers"
-msgstr "إجعل التحديثات �قط تظهر لمتابعيني"
+msgstr "لا تجعل إشعاراتي تظهر إلا لمتابعيّ"
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Plural form is used based on the maximum number of allowed
@@ -4373,15 +4206,10 @@ msgstr "لم أتمكن من ح�ظ ت�ضيلات الموقع."
 msgid "Could not save tags."
 msgstr "تعذّر ح�ظ الوسوم."
 
-#. TRANS: Confirmation shown when user profile settings are saved.
-#. TRANS: Message after successful saving of administrative settings.
-msgid "Settings saved."
-msgstr "ح��ظت الإعدادات."
-
 #. TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
 #. TRANS: Page title for page where a user account can be restored from backup.
 msgid "Restore account"
-msgstr "استعادة الحساب"
+msgstr "استعد الحساب"
 
 #. TRANS: Client error displayed when requesting a public timeline page beyond the page limit.
 #. TRANS: %s is the page limit.
@@ -4390,8 +4218,8 @@ msgid "Beyond the page limit (%s)."
 msgstr "بعد حد الص�حة (%s)."
 
 #. TRANS: Server error displayed when a public timeline cannot be retrieved.
-msgid "Could not retrieve public stream."
-msgstr "تعذّرت استعادة الد�ق العام."
+msgid "Could not retrieve public timeline."
+msgstr "لم يمكن استرداد الخط الزمني العلني."
 
 #. TRANS: Title for all public timeline pages but the first.
 #. TRANS: %d is the page number.
@@ -4405,16 +4233,20 @@ msgid "Public timeline"
 msgstr "المسار الزمني العام"
 
 #. TRANS: Link description for public timeline feed.
-msgid "Public Stream Feed (RSS 1.0)"
-msgstr ""
+msgid "Public Timeline Feed (Activity Streams JSON)"
+msgstr "تغذية المسار الزمني العام (آكت�تي ستريمز جيسن)"
 
 #. TRANS: Link description for public timeline feed.
-msgid "Public Stream Feed (RSS 2.0)"
-msgstr ""
+msgid "Public Timeline Feed (RSS 1.0)"
+msgstr "تغذية المسار الزمني العام (آرإس​إس 1.0)"
 
 #. TRANS: Link description for public timeline feed.
-msgid "Public Stream Feed (Atom)"
-msgstr ""
+msgid "Public Timeline Feed (RSS 2.0)"
+msgstr "تغذية المسار الزمني العام (آرإس​إس 2.0)"
+
+#. TRANS: Link description for public timeline feed.
+msgid "Public Timeline Feed (Atom)"
+msgstr "تغذية المسار الزمني العام (أتوم)"
 
 #. TRANS: Text displayed for public feed when there are no public notices.
 #, php-format
@@ -4422,6 +4254,7 @@ msgid ""
 "This is the public timeline for %%site.name%% but no one has posted anything "
 "yet."
 msgstr ""
+"هذا هو المسار الزمني العام ل%%site.name%% لكن لم يرسل أحد شيئًا حتى الآن."
 
 #. TRANS: Additional text displayed for public feed when there are no public notices for a logged in user.
 msgid "Be the first to post!"
@@ -4431,7 +4264,7 @@ msgstr "كن أول من ي�رسل!"
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to post!"
-msgstr ""
+msgstr "لمَ لا [تسجل حسابا](%%action.register%%) وتكون أول من يرسل!"
 
 #. TRANS: Message for not logged in users at an invite-only site trying to view the public feed of notices.
 #. TRANS: This message contains Markdown links. Please mind the formatting.
@@ -4458,53 +4291,10 @@ msgstr ""
 "هنا %%site.name%%، خدمة [التدوين الم�صغّر](http://en.wikipedia.org/wiki/Micro-"
 "blogging) المبنية على البرنامج الحر [ستاتس نت](http://status.net/)."
 
-#. TRANS: Title for page with public list cloud.
-msgid "Public list cloud"
-msgstr ""
-
-#. TRANS: Page notice for page with public list cloud.
-#. TRANS: %s is a StatusNet sitename.
-#, php-format
-msgid "These are largest lists on %s"
-msgstr "هذه هي أكبر اللائحات على %s"
-
-#. TRANS: Empty list message on page with public list cloud.
-#. TRANS: This message contains Markdown links in the form [description](link).
-#, php-format
-msgid "No one has [listed](%%doc.tags%%) anyone yet."
-msgstr ""
-
-#. TRANS: Additional empty list message on page with public list cloud for logged in users.
-msgid "Be the first to list someone!"
-msgstr "كن الأول من يشترك بلائحة أحد ما !"
-
-#. TRANS: Additional empty list message on page with public list cloud for anonymous users.
-#. TRANS: This message contains Markdown links in the form [description](link).
-#, php-format
-msgid ""
-"Why not [register an account](%%action.register%%) and be the first to list "
-"someone!"
-msgstr ""
-
-#. TRANS: DT element on on page with public list cloud.
-msgid "List cloud"
-msgstr ""
-
-#. TRANS: Link title for number of listed people. %d is the number of listed people.
-#, php-format
-msgid "1 person listed"
-msgid_plural "%d people listed"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-msgstr[4] ""
-msgstr[5] ""
-
 #. TRANS: Public RSS feed description. %s is the StatusNet site name.
 #, php-format
 msgid "%s updates from everyone."
-msgstr "%s تحديثات من أي واحد."
+msgstr "مستجدات %s من الجميع."
 
 #. TRANS: Title for public tag cloud.
 msgid "Public tag cloud"
@@ -4514,14 +4304,14 @@ msgstr "سحابة الوسوم العمومية"
 #. TRANS: %s is the StatusNet sitename.
 #, php-format
 msgid "These are most popular recent tags on %s"
-msgstr "هذه تحديثات الأوسمة الأكثر شعبية على %s"
+msgstr "هذه الأوسمة الحديثة الأكثر شعبية على %s"
 
 #. TRANS: This message contains a Markdown URL. The link description is between
 #. TRANS: square brackets, and the link between parentheses. Do not separate "]("
 #. TRANS: and do not change the URL part.
 #, php-format
 msgid "No one has posted a notice with a [hashtag](%%doc.tags%%) yet."
-msgstr ""
+msgstr "لم ينشر أحد إشعارا ب[وسم](%%doc.tags%%) إلى الآن."
 
 #. TRANS: Message shown to a logged in user for the public tag cloud
 #. TRANS: while no tags exist yet. "One" refers to the non-existing hashtag.
@@ -4537,7 +4327,7 @@ msgstr "كن أول من ي�رسل!"
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to post "
 "one!"
-msgstr ""
+msgstr "لمَ لا [تسجل حسابا](%%action.register%%) وتكون أول من يرسل!"
 
 #. TRANS: Client error displayed trying to recover password while already logged in.
 msgid "You are already logged in!"
@@ -4545,7 +4335,7 @@ msgstr "أنت والج بال�عل!"
 
 #. TRANS: Client error displayed when password recovery code is not correct.
 msgid "No such recovery code."
-msgstr "لا رمز استعادة كهذا."
+msgstr "رمز الاستعادة هذا غير موجود."
 
 #. TRANS: Client error displayed when no proper password recovery code was submitted.
 msgid "Not a recovery code."
@@ -4572,6 +4362,8 @@ msgid ""
 "If you have forgotten or lost your password, you can get a new one sent to "
 "the email address you have stored in your account."
 msgstr ""
+"إذا نسيت كلمة سرك، يمكن أن ترسل لك كلمة سر جديدة عبر عنوان البريد الإلكتروني "
+"الذي خزنته �ي حسابك."
 
 #. TRANS: Page notice for password change page.
 msgid "You have been identified. Enter a new password below."
@@ -4587,7 +4379,7 @@ msgstr "الاسم المستعار أو البريد الإلكتروني"
 
 #. TRANS: Title for field label on password recovery page.
 msgid "Your nickname on this server, or your registered email address."
-msgstr ""
+msgstr "اسمك المستعار على هذا الخادوم أو عنوا بريدك الإلكتروني المسجل."
 
 #. TRANS: Field label on password recovery page.
 msgid "Recover"
@@ -4600,7 +4392,7 @@ msgstr "استعد"
 
 #. TRANS: Title for password recovery page in password reset mode.
 msgid "Reset password"
-msgstr "أعد ضبط كلمة السر"
+msgstr "إعادة تعيين كلمة السر"
 
 #. TRANS: Title for password recovery page in password recover mode.
 msgid "Recover password"
@@ -4620,7 +4412,6 @@ msgid "6 or more characters, and do not forget it!"
 msgstr "6 أحر� أو أكثر، لا تنسها!"
 
 #. TRANS: Button text for password reset form.
-#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
 msgctxt "BUTTON"
 msgid "Reset"
 msgstr "أعد الضبط"
@@ -4629,18 +4420,6 @@ msgstr "أعد الضبط"
 msgid "Enter a nickname or email address."
 msgstr "أدخل اسمًا مستعارًا أو عنوان بريد إلكتروني."
 
-#. TRANS: Information on password recovery form if no known username or e-mail address was specified.
-msgid "No user with that email address or username."
-msgstr "لا مستخدم لديه عنوان البريد الإلكتروني أو اسم المستخدم هذا."
-
-#. TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.
-msgid "No registered email address for that user."
-msgstr "لا يوجد عنوان بريد إلكتروني م�سجّل لهذا المستخدم."
-
-#. TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.
-msgid "Error saving address confirmation."
-msgstr "خطأ أثناء ح�ظ تأكيد العنوان."
-
 #. TRANS: User notification after an e-mail with instructions was sent from the password recovery form.
 msgid ""
 "Instructions for recovering your password have been sent to the email "
@@ -4748,7 +4527,7 @@ msgstr "سجّل"
 #, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
-msgstr ""
+msgstr "أعي أن محتويات وبيانات %1$s خاصة وسرية."
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with a specified copyright owner.
 #. TRANS: %1$s is the license owner.
@@ -4770,6 +4549,8 @@ msgid ""
 "My text and files are available under %s except this private data: password, "
 "email address, IM address, and phone number."
 msgstr ""
+"تخضع نصوصي ومل�اتي ل%s إلا البيانات الخاصة التالية: كلمة السر وعنوان البريد "
+"الإلكتروني وعنوان المراسلة ال�ورية ورقم الهات�."
 
 #. TRANS: Text displayed after successful account registration.
 #. TRANS: %1$s is the registered nickname, %2$s is the profile URL.
@@ -4792,74 +4573,27 @@ msgid ""
 "\n"
 "Thanks for signing up and we hope you enjoy using this service."
 msgstr ""
+"تهانينا يا %1$s! ومرحبا بكم �ي %%%%site.name%%%%. يمكنك بداءً منها...\n"
+"\n"
+"* الذهاب إلى [مل�ك الشخصي](%2$s) وإرسال رسالتك الأولى.\n"
+"* إضا�ة [عنوان جابر أو محادثة غوغل](%%%%action.imsettings%%%%) لتتمكن من "
+"إرسال الإشعارات عبر رسائل �ورية.\n"
+"* [البحث عن أشخاص](%%%%action.peoplesearch%%%%) قد تعر�هم أو تشاركهم "
+"الاهتمامات. \n"
+"* تحديث [إعدادات مل�ك الشخصي](%%%%action.profilesettings%%%%) لتحكي للناس "
+"مزيدا عن ن�سك. \n"
+"* اقرأ المزيد �ي [الوثائق المنشورة](%%%%doc.help%%%%) لتتعر� على مزايا قد "
+"تكون لم تتنبه لها. \n"
+"\n"
+"شكرا على الاشتراك ونأمل أن تستمعوا باستخدام هذه الخدمة."
 
 #. TRANS: Instruction text on how to deal with the e-mail address confirmation e-mail.
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
 msgstr ""
-
-#. TRANS: Page notice for remote subscribe. This message contains Markdown links.
-#. TRANS: Ensure to keep the correct markup of [link description](link).
-#, 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 ""
-
-#. TRANS: Page title for Remote subscribe.
-msgid "Remote subscribe"
-msgstr "اشتراك بعيد"
-
-#. TRANS: Field legend on page for remote subscribe.
-msgid "Subscribe to a remote user"
-msgstr "اشترك بمستخدم بعيد"
-
-#. TRANS: Field label on page for remote subscribe.
-msgid "User nickname"
-msgstr "اسم المستخدم المستعار"
-
-#. TRANS: Field title on page for remote subscribe.
-msgid "Nickname of the user you want to follow."
-msgstr "الإسم المستعار للمستخدم اللذي تريد متابعته."
-
-#. TRANS: Field label on page for remote subscribe.
-msgid "Profile URL"
-msgstr "مسار المل� الشخصي"
-
-#. TRANS: Field title on page for remote subscribe.
-msgid "URL of your profile on another compatible microblogging service."
-msgstr ""
-
-#. TRANS: Button text on page for remote subscribe.
-#. TRANS: Link text for link that will subscribe to a remote profile.
-#. TRANS: Button text to subscribe to a user.
-#. TRANS: Button text for subscribing to a list.
-msgctxt "BUTTON"
-msgid "Subscribe"
-msgstr "اشترك"
-
-#. TRANS: Form validation error on page for remote subscribe when an invalid profile URL was provided.
-msgid "Invalid profile URL (bad format)."
-msgstr ""
-
-#. TRANS: Form validation error on page for remote subscribe when no the provided profile URL
-#. TRANS: does not contain expected data.
-msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
-msgstr ""
-
-#. TRANS: Form validation error on page for remote subscribe.
-msgid "That is a local profile! Login to subscribe."
-msgstr ""
-
-#. TRANS: Form validation error on page for remote subscribe when the remote service is not providing a request token.
-msgid "Could not get a request token."
-msgstr ""
-
-#. TRANS: Client error displayed when trying to (un)list an OMB 0.1 remote profile.
-msgid "You cannot (un)list an OMB 0.1 remote profile with this action."
-msgstr ""
+"(ينبغي أن تتلقى رسالة بريد إلكتروني خلال لحظات بها تعليمات عن كي�ية تأكيد "
+"عنوان بريدك الإلكتروني.)"
 
 #. TRANS: Client error displayed when an unknown error occurs while delisting a user.
 #. TRANS: %s is a username.
@@ -4912,23 +4646,29 @@ msgstr "الردود على %s"
 msgid "Replies to %1$s, page %2$d"
 msgstr "الردود على %1$s، الص�حة %2$d"
 
+#. TRANS: Link for feed with replies for a user.
+#. TRANS: %s is a user nickname.
+#, php-format
+msgid "Replies feed for %s (Activity Streams JSON)"
+msgstr "تغذية الردود على %s (آكت�تي ستريمز جيسن)"
+
 #. TRANS: Link for feed with replies for a user.
 #. TRANS: %s is a user nickname.
 #, php-format
 msgid "Replies feed for %s (RSS 1.0)"
-msgstr ""
+msgstr "تغذية أصدقاء %s (آرإس​إس 1.0)"
 
 #. TRANS: Link for feed with replies for a user.
 #. TRANS: %s is a user nickname.
 #, php-format
 msgid "Replies feed for %s (RSS 2.0)"
-msgstr ""
+msgstr "مشاركة المحتوى للردود لـ %s (RSS 2.0)"
 
 #. TRANS: Link for feed with replies for a user.
 #. TRANS: %s is a user nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "Replies feed for %s (Atom)"
-msgstr "الردود على %s"
+msgstr "تغذية الردود على %s (أتوم)"
 
 #. TRANS: Empty list message for page with replies for a user.
 #. TRANS: %1$s and %s$s are the user nickname.
@@ -4937,6 +4677,7 @@ msgid ""
 "This is the timeline showing replies to %1$s but %2$s hasn't received a "
 "notice to them yet."
 msgstr ""
+"هذا هو المسار الزمني الذي يظهر الردود على %1$s لكن %2$s لم يتلقَ ردا إلى الآن."
 
 #. TRANS: Empty list message for page with replies for a user for the logged in user.
 #. TRANS: This message contains a Markdown link in the form [link text](link).
@@ -4945,6 +4686,8 @@ msgid ""
 "You can engage other users in a conversation, subscribe to more people or "
 "[join groups](%%action.groups%%)."
 msgstr ""
+"يمكن أن تنخرط �ي محادثات مع مستخدمين آخرين أو أن تشترك بمزيد من الأشخاص أو "
+"أن [تنضم إلى مجموعات](%%action.groups%%)."
 
 #. TRANS: Empty list message for page with replies for a user for all logged in users but the user themselves.
 #. TRANS: %1$s, %2$s and %3$s are a user nickname. This message contains a Markdown link in the form [link text](link).
@@ -4953,12 +4696,14 @@ msgid ""
 "You can try to [nudge %1$s](../%2$s) or [post something to them](%%%%action."
 "newnotice%%%%?status_textarea=%3$s)."
 msgstr ""
+"يمكن أن تجرب [تنبيه %1$s](../%2$s) أو [إرسال شيء إليه](%%%%action.newnotice%%"
+"%%?status_textarea=%3$s)."
 
 #. TRANS: RSS reply feed description.
 #. TRANS: %1$s is a user nickname, %2$s is the StatusNet site name.
-#, fuzzy, php-format
+#, php-format
 msgid "Replies to %1$s on %2$s."
-msgstr "الردود على %1$s، الص�حة %2$d"
+msgstr "الردود على %1$s على %2$s."
 
 #. TRANS: Client exception displayed when trying to restore an account while not logged in.
 msgid "Only logged-in users can restore their account."
@@ -5003,13 +4748,12 @@ msgstr "أوق�ت إضا�ة ر�ع المل�."
 #. TRANS: Exception thrown when uploading an image fails for an unknown reason.
 #. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
 msgid "System error uploading file."
-msgstr ""
+msgstr "حدث خطأ �ي النظام عند تحميل المل�."
 
 #. TRANS: Client exception thrown when a feed is not an Atom feed.
 #. TRANS: Client exception thrown when an imported feed is not an Atom feed.
-#, fuzzy
 msgid "Not an Atom feed."
-msgstr "جميع الأعضاء"
+msgstr "ليست تغذية أتوم."
 
 #. TRANS: Success message when a feed has been restored.
 msgid ""
@@ -5023,9 +4767,11 @@ msgstr ""
 
 #. TRANS: Form instructions for feed restore.
 msgid ""
-"You can upload a backed-up stream in <a href=\"http://activitystrea.ms/"
+"You can upload a backed-up timeline in <a href=\"http://activitystrea.ms/"
 "\">Activity Streams</a> format."
 msgstr ""
+"يمكن أن تر�ع نسخة احتياطية من مسارك الزمني بنسق <a href=\"http://"
+"activitystrea.ms/\">آكت�تي ستريمز</a>."
 
 #. TRANS: Title for submit button to confirm upload of a user backup file for account restore.
 msgid "Upload the file"
@@ -5036,9 +4782,8 @@ msgid "You cannot revoke user roles on this site."
 msgstr "لا يمكنك سحب أدوار المستخدمين على هذا الموقع."
 
 #. TRANS: Client error displayed when trying to revoke a role that is not set.
-#, fuzzy
 msgid "User does not have this role."
-msgstr "ليس للمستخدم هذا الدور."
+msgstr "ليس لدى المستخدم هذا الدور."
 
 #. TRANS: Engine name for RSD.
 #. TRANS: Engine name.
@@ -5047,36 +4792,33 @@ msgstr "ستاتس نت"
 
 #. TRANS: Client error displayed trying to sandbox users on a site where the feature is not enabled.
 #. TRANS: Client error on page to unsandbox a user when the feature is not enabled.
-#, fuzzy
 msgid "You cannot sandbox users on this site."
-msgstr "لا يمكنك إسكات المستخدمين على هذا الموقع."
+msgstr "لا يمكنك الحجر على المستخدمين على هذا الموقع."
 
 #. TRANS: Client error displayed trying to sandbox an already sandboxed user.
-#, fuzzy
 msgid "User is already sandboxed."
-msgstr "المستخدم مسكت من قبل."
+msgstr "المستخدم محجور عليه من قبل."
 
 #. TRANS: Client error displayed when trying to list a profile with an invalid list.
 #. TRANS: %s is the invalid list name.
-#, fuzzy, php-format
+#, php-format
 msgid "Not a valid list: %s."
-msgstr "ليس وسم أشخاص صالح: %s."
+msgstr "ليست قائمة صالحة: %s."
 
 #. TRANS: Page title for page showing self tags.
 #. TRANS: %1$s is a tag, %2$d is a page number.
-#, fuzzy, php-format
+#, php-format
 msgid "Users self-tagged with %1$s, page %2$d"
-msgstr "المستخدمون الذين وسموا أن�سهم ب%1$s - الص�حة %2$d"
+msgstr "المستخدمون الذين وسموا أن�سهم ب%1$s، الص�حة %2$d"
 
 #. TRANS: Title for the sessions administration panel.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Sessions"
 msgstr "الجلسات"
 
 #. TRANS: Instructions for the sessions administration panel.
 msgid "Session settings for this StatusNet site"
-msgstr ""
+msgstr "إعدادات جلسات موقع StatusNet هذا."
 
 #. TRANS: Fieldset legend on the sessions administration panel.
 msgctxt "LEGEND"
@@ -5103,21 +4845,19 @@ msgstr "تنقيح الجلسة"
 #. TRANS: Checkbox title on the sessions administration panel.
 #, fuzzy
 msgid "Enable debugging output for sessions."
-msgstr "مكّن تنقيح م�خرجات الجلسة."
+msgstr "تمكين تنقيح م�خرجات الجلسة."
 
 #. TRANS: Title for submit button on the sessions administration panel.
-#, fuzzy
 msgid "Save session settings"
-msgstr "ح�ظ إعدادت الوصول"
+msgstr "اح�ظ إعدادت الجلسات"
 
 #. TRANS: Client error displayed trying to display an OAuth application while not logged in.
 msgid "You must be logged in to view an application."
 msgstr "يجب أن تكون مسجل الدخول لرؤية تطبيق."
 
 #. TRANS: Header on the OAuth application page.
-#, fuzzy
 msgid "Application profile"
-msgstr "معلومات التطبيق"
+msgstr "مل� التطبيق"
 
 #. TRANS: Information output on an OAuth application page.
 #. TRANS: %1$s is the application creator, %2$s is "read-only" or "read-write",
@@ -5133,15 +4873,13 @@ msgstr[4] ""
 msgstr[5] ""
 
 #. TRANS: Header on the OAuth application page.
-#, fuzzy
 msgid "Application actions"
-msgstr "معلومات التطبيق"
+msgstr "إجراءات التطبيق"
 
 #. TRANS: Link text to edit application on the OAuth application page.
-#, fuzzy
 msgctxt "EDITAPP"
 msgid "Edit"
-msgstr "عدّل"
+msgstr "عدل"
 
 #. TRANS: Button text on the OAuth application page.
 #. TRANS: Resets the OAuth consumer key and secret.
@@ -5152,6 +4890,26 @@ msgstr ""
 msgid "Application info"
 msgstr "معلومات التطبيق"
 
+#. TRANS: Field label on application page.
+msgid "Consumer key"
+msgstr ""
+
+#. TRANS: Field label on application page.
+msgid "Consumer secret"
+msgstr ""
+
+#. TRANS: Field label on application page.
+msgid "Request token URL"
+msgstr ""
+
+#. TRANS: Field label on application page.
+msgid "Access token URL"
+msgstr ""
+
+#. TRANS: Field label on application page.
+msgid "Authorize URL"
+msgstr "اسمح بالمسار"
+
 #. TRANS: Note on the OAuth application page about signature support.
 msgid ""
 "Note: HMAC-SHA1 signatures are supported. The plaintext signature method is "
@@ -5160,7 +4918,7 @@ msgstr ""
 
 #. TRANS: Text in confirmation dialog to reset consumer key and secret for an OAuth application.
 msgid "Are you sure you want to reset your consumer key and secret?"
-msgstr "أمتأكد من أنك تريد إعادة ضبط م�تاح المستهلك وكلمة سره؟"
+msgstr "أمتأكد من أنك تريد إعادة تعيين م�تاح المستهلك وكلمة سره؟"
 
 #. TRANS: Title for all but the first page of favourite notices of a user.
 #. TRANS: %1$s is the user for whom the favourite notices are displayed, %2$d is the page number.
@@ -5169,30 +4927,36 @@ msgid "%1$s's favorite notices, page %2$d"
 msgstr "إشعارات %1$s الم��ضلة، الص�حة %2$d"
 
 #. TRANS: Server error displayed when favourite notices could not be retrieved from the database.
-#, fuzzy
 msgid "Could not retrieve favorite notices."
-msgstr "تعذّر إنشاء م�ضلة."
+msgstr "تعذّر استرجاع الإشعارات الم�ضلة."
+
+#. TRANS: Feed link text. %s is a username.
+#, php-format
+msgid "Feed for favorites of %s (Activity Streams JSON)"
+msgstr "تغذية م�ضلات %s (آكت�تي ستريمز جيسن)"
 
 #. TRANS: Feed link text. %s is a username.
 #, php-format
 msgid "Feed for favorites of %s (RSS 1.0)"
-msgstr ""
+msgstr "تغذية م�ضلات %s (آرإس​إس 1.0)"
 
 #. TRANS: Feed link text. %s is a username.
 #, php-format
 msgid "Feed for favorites of %s (RSS 2.0)"
-msgstr ""
+msgstr "تغذية م�ضلات %s (آرإس​إس 2.0)"
 
 #. TRANS: Feed link text. %s is a username.
 #, php-format
 msgid "Feed for favorites of %s (Atom)"
-msgstr ""
+msgstr "تغذية م�ضلات %s (أتوم)"
 
 #. TRANS: Text displayed instead of favourite notices for the current logged in user that has no favourites.
 msgid ""
 "You haven't chosen any favorite notices yet. Click the fave button on "
 "notices you like to bookmark them for later or shed a spotlight on them."
 msgstr ""
+"لم تختر أي إشعارات م�ضلة بعد. انقر زر الت�ضيل على الإشعارات التي تعجبك لكي "
+"تؤشر عليها لتعود لها لاحقًا أو حتى تجذب الانتباه إليها."
 
 #. TRANS: Text displayed instead of favourite notices for a user that has no favourites while logged in.
 #. TRANS: %s is a username.
@@ -5231,62 +4995,33 @@ msgstr "مجموعة %s"
 msgid "%1$s group, page %2$d"
 msgstr "مجموعة %1$s، الص�حة %2$d"
 
+#. TRANS: Tooltip for feed link. %s is a group nickname.
+#, php-format
+msgid "Notice feed for %s group (Activity Streams JSON)"
+msgstr "تغذية إشعارات مجموعة %s (آكت�تي ستريمز جيسن)"
+
 #. TRANS: Tooltip for feed link. %s is a group nickname.
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
-msgstr ""
+msgstr "تغذية إشعارات مجموعة %s (آرإس​إس 1.0)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
 #, php-format
 msgid "Notice feed for %s group (RSS 2.0)"
-msgstr ""
+msgstr "تغذية إشعارات مجموعة %s (آرإس​إس 2.0)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
 #, php-format
 msgid "Notice feed for %s group (Atom)"
-msgstr ""
+msgstr "تغذية إشعارات مجموعة %s (أتوم)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
 #, php-format
 msgid "FOAF for %s group"
 msgstr ""
 
-#. TRANS: Header for mini list of group members on a group page (h2).
-msgid "Members"
-msgstr "الأعضاء"
-
-#. TRANS: Description for mini list of group members on a group page when the group has no members.
-#. TRANS: Content of "Listed" page if there are no listed users.
-#. TRANS: Content of "People following tag x" if there are no subscribed users.
-#. TRANS: Empty list message for tags.
-#. TRANS: Text for user subscription statistics if the user has no subscriptions.
-#. TRANS: Text for user subscriber statistics if user has no subscribers.
-#. TRANS: Text for user user group membership statistics if user is not a member of any group.
-#. TRANS: Default content for section/sidebar widget.
-msgid "(None)"
-msgstr "(لا شيء)"
-
-#. TRANS: Link to all group members from mini list of group members if group has more than n members.
-msgid "All members"
-msgstr "جميع الأعضاء"
-
-#. TRANS: Header for group statistics on a group page (h2).
-#. TRANS: H2 text for user statistics.
-msgid "Statistics"
-msgstr "إحصاءات"
-
-#. TRANS: Label for group creation date.
-msgctxt "LABEL"
-msgid "Created"
-msgstr "أنشئت"
-
-#. TRANS: Label for member count in statistics on group page.
-msgctxt "LABEL"
-msgid "Members"
-msgstr "الأعضاء"
-
 #. TRANS: Notice on group pages for anonymous users for StatusNet sites that accept new registrations.
-#. TRANS: **%s** is the group alias, %%%%site.name%%%% is the site name,
+#. TRANS: %s is the group name, %%%%site.name%%%% is the site name,
 #. TRANS: %%%%action.register%%%% is the URL for registration, %%%%doc.help%%%% is a URL to help.
 #. TRANS: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
 #, php-format
@@ -5304,27 +5039,22 @@ msgstr ""
 "أخرى عديدة! ([اقرأ المزيد](%%%%doc.help%%%%))"
 
 #. TRANS: Notice on group pages for anonymous users for StatusNet sites that accept no new registrations.
-#. TRANS: **%s** is the group alias, %%%%site.name%%%% is the site name,
+#. TRANS: %s is the group name, %%%%site.name%%%% is the site name,
 #. TRANS: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
-#, php-format
+#, fuzzy, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
 "wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
 "[StatusNet](http://status.net/) tool. Its members share short messages about "
-"their life and interests. "
+"their life and interests."
 msgstr ""
 "**%s** مجموعة مستخدمين على %%%%site.name%%%%، خدمة [التدوين الم�صغّر](http://"
 "en.wikipedia.org/wiki/Micro-blogging) المبنية على البرنامج الحر [ستاتس نت]"
 "(http://status.net/). يتشارك أعضاؤها رسائل قصيرة عن حياتهم واهتماماتهم. "
 
-#. TRANS: Title for list of group administrators on a group page.
-msgctxt "TITLE"
-msgid "Admins"
-msgstr "الإداريون"
-
 #. TRANS: Client error displayed requesting a single message that does not exist.
 msgid "No such message."
-msgstr "لا رسالة كهذه."
+msgstr "الرسالة المطلوبة غير موجودة."
 
 #. TRANS: Client error displayed requesting a single direct message the requesting user was not a party in.
 msgid "Only the sender and recipient may read this message."
@@ -5354,43 +5084,43 @@ msgstr "ح�ذ� الإشعار."
 #. TRANS: %1$s is a list, %2$s is a page number.
 #, php-format
 msgid "Private timeline for %1$s list by you, page %2$d"
-msgstr ""
+msgstr "المسار الزمني الخاص لقائمة %1$s التي أنشأتها، الص�حة %2$d"
 
 #. TRANS: Title for public list timeline where the viewer is the tagger.
 #. TRANS: %1$s is a list, %2$s is a page number.
 #, php-format
 msgid "Timeline for %1$s list by you, page %2$d"
-msgstr ""
+msgstr "المسار الزمني لقائمة %1$s التي أنشأتها، الص�حة %2$d"
 
 #. TRANS: Title for private list timeline.
 #. TRANS: %1$s is a list, %2$s is the tagger's nickname, %3$d is a page number.
 #, php-format
 msgid "Timeline for %1$s list by %2$s, page %3$d"
-msgstr ""
+msgstr "المسار الزمني لقائمة %1$s التي أنشأها %2$s، الص�حة %3$d"
 
 #. TRANS: Title for private list timeline.
 #. TRANS: %s is a list.
 #, php-format
 msgid "Private timeline of %s list by you"
-msgstr ""
+msgstr "المسار الزمني الخاص لقائمة %s التي أنشأتها"
 
 #. TRANS: Title for public list timeline where the viewer is the tagger.
 #. TRANS: %s is a list.
 #, php-format
 msgid "Timeline for %s list by you"
-msgstr ""
+msgstr "المسار الزمني لقائمة %s التي أنشأتها"
 
 #. TRANS: Title for private list timeline.
 #. TRANS: %1$s is a list, %2$s is the tagger's nickname.
 #, php-format
 msgid "Timeline for %1$s list by %2$s"
-msgstr ""
+msgstr "المسار الزمني لقائمة %1$s التي أنشأها %2$s"
 
 #. TRANS: Feed title.
 #. TRANS: %1$s is a list, %2$s is tagger's nickname.
 #, php-format
 msgid "Feed for %1$s list by %2$s (Atom)"
-msgstr ""
+msgstr "تغذية قائمة %1$s التي أنشأها %2$s (أتوم)"
 
 #. TRANS: Empty list message for list timeline.
 #. TRANS: %1$s is a list, %2$s is a tagger's nickname.
@@ -5399,24 +5129,38 @@ msgid ""
 "This is the timeline for %1$s list by %2$s but no one has posted anything "
 "yet."
 msgstr ""
+"هذا هو المسار الزمني لقائمة %1$s التي أنشأها %2$s لكن لم يرسل أحد شيئًا إلى "
+"الآن."
 
 #. TRANS: Additional empty list message for list timeline for currently logged in user tagged tags.
 msgid "Try tagging more people."
-msgstr ""
+msgstr "حاول وسم مزيد من الأشخاص."
 
 #. TRANS: Additional empty list message for list timeline.
 #. TRANS: This message contains Markdown links in the form [description](link).
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and start following "
 "this timeline!"
 msgstr ""
-"لمَ لا [تسجل حسابًا](%%%%action.register%%%%) لتنبه %s أو ترسل إليه إشعارًا؟"
+"لمَ لا [تسجل حسابًا](%%%%action.register%%%%) وتبدأ �ي متابعة هذا المسار "
+"الزمني!"
 
 #. TRANS: Header on show list page.
-#, fuzzy
+#. TRANS: Link description for link to list of users tagged with a tag (so part of a list).
 msgid "Listed"
-msgstr "الرخصة"
+msgstr "المدرجون"
+
+#. TRANS: Content of "Listed" page if there are no listed users.
+#. TRANS: Content of "People following tag x" if there are no subscribed users.
+#. TRANS: Description for mini list of group members on a group page when the group has no members.
+#. TRANS: Empty list message for tags.
+#. TRANS: Text for user subscription statistics if the user has no subscriptions.
+#. TRANS: Text for user subscriber statistics if user has no subscribers.
+#. TRANS: Text for user user group membership statistics if user is not a member of any group.
+#. TRANS: Default content for section/sidebar widget.
+msgid "(None)"
+msgstr "(لا يوجد)"
 
 #. TRANS: Link for more "People in list x by a user"
 #. TRANS: if there are more than the mini list's maximum.
@@ -5428,52 +5172,53 @@ msgstr "اعرض الكل"
 msgid "Subscribers"
 msgstr "المشتركون"
 
-#. TRANS: Link for more "People following tag x"
-#. TRANS: if there are more than the mini list's maximum.
-msgid "All subscribers"
-msgstr "جميع المشتركين"
-
-#. TRANS: Page title showing tagged notices in one user's stream.
+#. TRANS: Page title showing tagged notices in one user's timeline.
 #. TRANS: %1$s is the username, %2$s is the hash tag.
-#, fuzzy, php-format
+#, php-format
 msgid "Notices by %1$s tagged %2$s"
-msgstr "%1$s، الص�حة %2$d"
+msgstr "إشعارات %1$s الموسومة ب%2$s"
 
-#. TRANS: Page title showing tagged notices in one user's stream.
+#. TRANS: Page title showing tagged notices in one user's timeline.
 #. TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number.
-#, fuzzy, php-format
+#, php-format
 msgid "Notices by %1$s tagged %2$s, page %3$d"
-msgstr "الإشعارات الموسومة ب%s، الص�حة %2$d"
+msgstr "إشعارات %1$s الموسومة ب%2$s، الص�حة %3$d"
 
-#. TRANS: Extended page title showing tagged notices in one user's stream.
+#. TRANS: Extended page title showing tagged notices in one user's timeline.
 #. TRANS: %1$s is the username, %2$d is the page number.
-#, fuzzy, php-format
+#, php-format
 msgid "Notices by %1$s, page %2$d"
-msgstr "الإشعارات الموسومة ب%s، الص�حة %2$d"
+msgstr "إشعارات %1$s، الص�حة %2$d"
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %1$s is a user nickname, %2$s is a hashtag.
 #, php-format
 msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
-msgstr ""
+msgstr "تغذية إشعارات %1$s الموسومة ب%2$s (آرإس​إس 1.0)"
+
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#, php-format
+msgid "Notice feed for %s (Activity Streams JSON)"
+msgstr "تغذية إشعارات %s (آكت�تي ستريمز جيسن)"
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %s is a user nickname.
 #, php-format
 msgid "Notice feed for %s (RSS 1.0)"
-msgstr ""
+msgstr "تغذية إشعارات %s (آرإس​إس 1.0)"
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %s is a user nickname.
 #, php-format
 msgid "Notice feed for %s (RSS 2.0)"
-msgstr ""
+msgstr "تغذية إشعارات %s (آرإس​إس 2.0)"
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %s is a user nickname.
 #, php-format
 msgid "Notice feed for %s (Atom)"
-msgstr ""
+msgstr "تغذية إشعارات %s (أتوم)"
 
 #. TRANS: Title for link to notice feed. FOAF stands for Friend of a Friend.
 #. TRANS: More information at http://www.foaf-project.org. %s is a user nickname.
@@ -5481,18 +5226,20 @@ msgstr ""
 msgid "FOAF for %s"
 msgstr "صندوق %s الصادر"
 
-#. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
+#. TRANS: First sentence of empty list message for a timeline. $1%s is a user nickname.
 #, php-format
 msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
-msgstr ""
+msgstr "هذا هو المسار الزمني ل%1$s لكن %1$s لم يرسل شيئا إلى الآن."
 
 #. TRANS: Second sentence of empty list message for a stream for the user themselves.
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
 msgstr ""
+"هل شاهدت شيئًا مثيرًا مؤخرًا؟ لم تنشر أي إشعارات بعد، وقد يكون هذا الوقت مناسبًا "
+"للبدء �ي ذلك :)"
 
-#. TRANS: Second sentence of empty  list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
+#. TRANS: Second sentence of empty  list message for a non-self timeline. %1$s is a user nickname, %2$s is a part of a URL.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
 #, php-format
 msgid ""
@@ -5502,7 +5249,7 @@ msgstr ""
 "يمكن أن تحاول تنبيه %1$s أو [مراسلته عن أمر ما](%%%%action.newnotice%%%%?"
 "status_textarea=%2$s)."
 
-#. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
+#. TRANS: Announcement for anonymous users showing a timeline if site registrations are open.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
 #, php-format
 msgid ""
@@ -5517,13 +5264,13 @@ msgstr ""
 "[انضم الآن](%%%%action.register%%%%) لتتابع إشعارت **%s** وغيره! ([اقرأ "
 "المزيد](%%%%doc.help%%%%))"
 
-#. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
+#. TRANS: Announcement for anonymous users showing a timeline if site registrations are closed or invite only.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#, php-format
+#, fuzzy, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
 "wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
-"[StatusNet](http://status.net/) tool. "
+"[StatusNet](http://status.net/) tool."
 msgstr ""
 "لدى **%s** حساب على  %%%%site.name%%%%، خدمة [التدوين الم�صغّر](http://en."
 "wikipedia.org/wiki/Micro-blogging) المبنية على البرنامج الحر [ستاتس نت]"
@@ -5560,6 +5307,14 @@ msgstr "يجب ألا يكون طول اسم الموقع ص�رًا."
 msgid "You must have a valid contact email address."
 msgstr "يجب أن تملك عنوان بريد إلكتروني صحيح."
 
+#. TRANS: Client error displayed when a logo URL is not valid.
+msgid "Invalid logo URL."
+msgstr "مسار شعار غير صالح."
+
+#. TRANS: Client error displayed when a SSL logo URL is invalid.
+msgid "Invalid SSL logo URL."
+msgstr "مسار شعار SSL غير صالح."
+
 #. TRANS: Client error displayed trying to save site settings with an invalid language code.
 #. TRANS: %s is the invalid language code.
 #, php-format
@@ -5572,7 +5327,7 @@ msgstr "حد النص الأدنى 0 (غير محدود)."
 
 #. TRANS: Client error displayed trying to save site settings with a text limit below 1.
 msgid "Dupe limit must be one or more seconds."
-msgstr ""
+msgstr "يجب أن يكون حد التكرار ثانية أو أكثر."
 
 #. TRANS: Fieldset legend on site settings panel.
 msgctxt "LEGEND"
@@ -5590,7 +5345,7 @@ msgstr "اسم موقعك، \"مدونة شركتك المصغرة\" مثلا."
 
 #. TRANS: Field label on site settings panel.
 msgid "Brought by"
-msgstr ""
+msgstr "تم جلبها بواسطة"
 
 #. TRANS: Field title on site settings panel.
 msgid "Text used for credits link in footer of each page."
@@ -5609,9 +5364,8 @@ msgid "Email"
 msgstr "البريد الإلكتروني"
 
 #. TRANS: Field title on site settings panel.
-#, fuzzy
 msgid "Contact email address for your site."
-msgstr "عنوان البريد الإلكتروني للاتصال بموقعك"
+msgstr "عنوان البريد الإلكتروني للاتصال بموقعك."
 
 #. TRANS: Fieldset legend on site settings panel.
 #, fuzzy
@@ -5632,11 +5386,11 @@ msgid "Default language"
 msgstr "اللغة المبدئية"
 
 #. TRANS: Dropdown title on site settings panel.
-msgid "Site language when autodetection from browser settings is not available"
-msgstr "لغة الموقع إذا لم يتو�ر اكتشا� اللغة آليًا من إعدادات المتص�ح"
+msgid ""
+"The site language when autodetection from browser settings is not available."
+msgstr "لغة الموقع إذا لم يتو�ر اكتشا� اللغة آليًا من إعدادات المتص�ح."
 
 #. TRANS: Fieldset legend on site settings panel.
-#, fuzzy
 msgctxt "LEGEND"
 msgid "Limits"
 msgstr "الحدود"
@@ -5650,9 +5404,8 @@ msgid "Maximum number of characters for notices."
 msgstr "أقصى عدد للحرو� �ي الإشعارات."
 
 #. TRANS: Field label on site settings panel.
-#, fuzzy
 msgid "Dupe limit"
-msgstr "حد النص"
+msgstr "حد التكرار"
 
 #. TRANS: Field title on site settings panel.
 msgid "How long users must wait (in seconds) to post the same thing again."
@@ -5660,9 +5413,21 @@ msgstr ""
 "ال�ترة (بالثواني) التي ينبغي أن ينتظرها المستخدمون قبل أن ينشروا الرسالة "
 "ن�سها مجددًا"
 
+#. TRANS: Fieldset legend for form to change logo.
+msgid "Logo"
+msgstr "الشعار"
+
+#. TRANS: Field label for StatusNet site logo.
+msgid "Site logo"
+msgstr "شعار الموقع"
+
+#. TRANS: Field label for SSL StatusNet site logo.
+msgid "SSL logo"
+msgstr "شعار SSL"
+
 #. TRANS: Button title for saving site settings.
-msgid "Save site settings"
-msgstr "اح�ظ إعدادت الموقع"
+msgid "Save the site settings."
+msgstr "اح�ظ إعدادت الموقع."
 
 #. TRANS: Page title for site-wide notice tab in admin panel.
 msgid "Site Notice"
@@ -5685,11 +5450,10 @@ msgid "Site notice text"
 msgstr "نص إشعار الموقع"
 
 #. TRANS: Tooltip for site-wide notice text field in admin panel.
-#, fuzzy
 msgid "Site-wide notice text (255 characters maximum; HTML allowed)"
-msgstr "نص إشعار عام للموقع (255 حر� كحد أقصى؛ يسمح بHTML)"
+msgstr "نص إشعار يعم الموقع (255 حر� كحد أقصى؛ يسمح بHTML)"
 
-#. TRANS: Title for button to save site notice in admin panel.
+#. TRANS: Button title to save site notice in admin panel.
 msgid "Save site notice."
 msgstr "اح�ظ إشعار الموقع."
 
@@ -5717,9 +5481,8 @@ msgid "Current confirmed SMS-enabled phone number."
 msgstr "عنوان البريد الإلكتروني الم�ؤكد الحالي."
 
 #. TRANS: Form guide in IM settings form.
-#, fuzzy
 msgid "Awaiting confirmation on this phone number."
-msgstr "إن رقم التأكيد هذا خاطئ."
+msgstr "بانتظار التأكيد من رقم الهات� هذا."
 
 #. TRANS: Field label for SMS address input in SMS settings form.
 msgid "Confirmation code"
@@ -5739,9 +5502,8 @@ msgid "SMS phone number"
 msgstr "رقم هات� SMS"
 
 #. TRANS: SMS phone number input field instructions in SMS settings form.
-#, fuzzy
 msgid "Phone number, no punctuation or spaces, with area code."
-msgstr "رقم الهات� بدون شرطات أو مسا�ات مع رمز المنطقة"
+msgstr "رقم الهات� -بدون شرطات أو مسا�ات- مع رمز المنطقة."
 
 #. TRANS: Form legend for SMS preferences form.
 msgid "SMS preferences"
@@ -5767,14 +5529,12 @@ msgid "No carrier selected."
 msgstr "ح�ذ� الإشعار."
 
 #. TRANS: Message given saving SMS phone number that is already set.
-#, fuzzy
 msgid "That is already your phone number."
-msgstr "هذا ليس رقم هات�ك."
+msgstr "هذا رقم هات�ك �علا."
 
 #. TRANS: Message given saving SMS phone number that is already set for another user.
-#, fuzzy
 msgid "That phone number already belongs to another user."
-msgstr "هذا البريد الإلكتروني ملك مستخدم آخر بال�عل."
+msgstr "رقهم الهات� هذا ملك مستخدم آخر بال�عل."
 
 #. TRANS: Message given saving valid SMS phone number that is to be confirmed.
 msgid ""
@@ -5789,9 +5549,8 @@ msgid "That is the wrong confirmation number."
 msgstr "إن رقم التأكيد هذا خاطئ."
 
 #. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
-#, fuzzy
 msgid "Could not delete SMS confirmation."
-msgstr "تعذّر حذ� تأكيد البريد المراسلة ال�ورية."
+msgstr "تعذّر حذ� تأكيد الرسالة القصيرة."
 
 #. TRANS: Message given after successfully canceling SMS phone number confirmation.
 msgid "SMS confirmation cancelled."
@@ -5887,15 +5646,14 @@ msgstr "بلّغ عن المسار"
 msgid "Snapshots will be sent to this URL."
 msgstr ""
 
-#. TRANS: Title for button to save snapshot settings.
+#. TRANS: Button title to save snapshot settings.
 #, fuzzy
 msgid "Save snapshot settings."
 msgstr "اذ� إعدادت الموقع"
 
 #. TRANS: Client error displayed trying a change a subscription for a non-subscribed profile.
-#, fuzzy
 msgid "You are not subscribed to that profile."
-msgstr "لست م�شتركًا بأي أحد."
+msgstr "!لست م�شتركًا بهذا المل� الشخصي."
 
 #. TRANS: Server error displayed when updating a subscription fails with a database error.
 #. TRANS: Exception thrown when a subscription could not be stored on the server.
@@ -5908,33 +5666,27 @@ msgstr ""
 
 #. TRANS: Title of the first page showing pending subscribers still awaiting approval.
 #. TRANS: %s is the name of the user.
-#, fuzzy, php-format
+#, php-format
 msgid "%s subscribers awaiting approval"
-msgstr "عضوية %s �ي المجموعات"
+msgstr "مشتركو %s الذين ينتظرون الموا�قة"
 
 #. TRANS: Title of all but the first page showing pending subscribersmembers still awaiting approval.
 #. TRANS: %1$s is the name of the user, %2$d is the page number of the members list.
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s subscribers awaiting approval, page %2$d"
-msgstr "%1$s أعضاء المجموعة, الص�حة %2$d"
+msgstr "مشتركو %1$s الذين ينتظرون الموا�قة، الص�حة %2$d"
 
 #. TRANS: Page notice for group members page.
-#, fuzzy
 msgid "A list of users awaiting approval to subscribe to you."
-msgstr "قائمة بمستخدمي هذه المجموعة."
-
-#. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
-msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
-msgstr ""
+msgstr "قائمة بالمستخدمين الذين ينتظرون الموا�قة على الاشتراك بك."
 
 #. TRANS: Page title when subscription succeeded.
 msgid "Subscribed"
 msgstr "م�شترك"
 
 #. TRANS: Client error displayed when trying to perform an action while not logged in.
-#, fuzzy
 msgid "You must be logged in to unsubscribe from a list."
-msgstr "يجب أن تكون والجًا لتنشئ مجموعة."
+msgstr "يجب أن تكون والجًا لتلغي اشتراكك بقائمة."
 
 #. TRANS: Client error displayed when trying to perform an action without providing an ID.
 #, fuzzy
@@ -5943,15 +5695,15 @@ msgstr "لا مدخل هوية."
 
 #. TRANS: Server error displayed subscribing to a list fails.
 #. TRANS: %1$s is a user nickname, %2$s is a list, %3$s is the error message (no period).
-#, fuzzy, php-format
+#, php-format
 msgid "Could not subscribe user %1$s to list %2$s: %3$s"
-msgstr "لم يمكن ضم المستخدم %1$s إلى المجموعة %2$s."
+msgstr "تعذر اشتراك المستخدم %1$s باللائحة %2$s: %3$s"
 
 #. TRANS: Title of form to subscribe to a list.
 #. TRANS: %1%s is a user nickname, %2$s is a list, %3$s is a tagger nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s subscribed to list %2$s by %3$s"
-msgstr "مشتركو %1$s, الص�حة %2$d"
+msgstr "اشترك %1$s باللائحة %2$s التي أنشأها %3$s"
 
 #. TRANS: Header for list of subscribers for a user (first page).
 #. TRANS: %s is the user's nickname.
@@ -5972,9 +5724,9 @@ msgstr "هؤلاء هم الأشخاص الذين يستمعون إلى إشعا
 
 #. TRANS: Page notice for page with an overview of all subscribers of a user other
 #. TRANS: than the logged in user. %s is the user nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "These are the people who listen to %s's notices."
-msgstr "هؤلاء هم الأشخاص الذين يستمعون إلى إشعاراتك."
+msgstr "هؤلاء هم الأشخاص الذين يستمعون إلى إشعارات %s."
 
 #. TRANS: Subscriber list text when the logged in user has no subscribers.
 msgid ""
@@ -5986,7 +5738,7 @@ msgstr "ليس لديك مشتركون. جر�ّب الاشتراك مع أشخ
 #. TRANS: than the logged in user that has no subscribers. %s is the user nickname.
 #, php-format
 msgid "%s has no subscribers. Want to be the first?"
-msgstr ""
+msgstr "ليس ل%s أي مشتركين. أتريد أن تكون الأول؟"
 
 #. TRANS: Subscriber list text when looking at the subscribers for a of a user that has none
 #. TRANS: as an anonymous user. %s is the user nickname.
@@ -5998,6 +5750,8 @@ msgid ""
 "%s has no subscribers. Why not [register an account](%%%%action.register%%%"
 "%) and be the first?"
 msgstr ""
+"ليس ل%s أي مشتركون. لم لا [تسجل حسابا](%%%%action.register%%%%) وتكون أول "
+"مشترك؟"
 
 #. TRANS: Header for subscriptions overview for a user (not first page).
 #. TRANS: %1$s is a user nickname, %2$d is the page number.
@@ -6020,33 +5774,36 @@ msgstr "هؤلاء الأشخاص الذي يستمع %s إليهم."
 #. TRANS: This message contains Markdown URLs. The link description is between
 #. TRANS: square brackets, and the link between parentheses. Do not separate "]("
 #. TRANS: and do not change the URL part.
-#, php-format
+#, fuzzy, php-format
 msgid ""
 "You're not listening to anyone's notices right now, try subscribing to "
 "people you know. Try [people search](%%action.peoplesearch%%), look for "
 "members in groups you're interested in and in our [featured users](%%action."
-"featured%%). If you're a [Twitter user](%%action.twittersettings%%), you can "
-"automatically subscribe to people you already follow there."
+"featured%%)."
 msgstr ""
+"أنت لا تستمع الآن لإشعارات أحد. جرب الاشتراك بأناس تعر�هم. حاول أن [تبحث عن "
+"الأشخاص](%%action.peoplesearch%%) وابحث �ي أعضاء مجموعات أنت مهتم بها و�ي "
+"[مستخدمينا المميزين](%%action.featured%%). إذا كنت [مستخدما لتويتر](%%action."
+"twittersettings%%) �بإمكانك الاشتراك تلقائيا بالأشخاص الذين تتابعهم هناك "
+"حاليا."
 
 #. TRANS: Subscription list text when looking at the subscriptions for a of a user other
 #. TRANS: than the logged in user that has no subscriptions. %s is the user nickname.
 #. TRANS: Subscription list text when looking at the subscriptions for a of a user that has none
 #. TRANS: as an anonymous user. %s is the user nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "%s is not listening to anyone."
-msgstr "%1$s يستمع الآن إلى إشعاراتك على %2$s."
+msgstr "لا يستمع %s إلى أحد."
 
 #. TRANS: Atom feed title. %s is a profile nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "Subscription feed for %s (Atom)"
-msgstr "الردود على %s"
+msgstr "تغذية اشتراكات %s (أتوم)"
 
 #. TRANS: Checkbox label for enabling IM messages for a profile in a subscriptions list.
-#, fuzzy
 msgctxt "LABEL"
 msgid "IM"
-msgstr "محادثة �ورية"
+msgstr "المراسلة ال�ورية"
 
 #. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
 msgid "SMS"
@@ -6058,91 +5815,89 @@ msgstr "رسائل قصيرة"
 msgid "Notices tagged with %1$s, page %2$d"
 msgstr "الإشعارات الموسومة ب%s، الص�حة %2$d"
 
+#. TRANS: Link label for feed on "notices with tag" page.
+#. TRANS: %s is the tag the feed is for.
+#, php-format
+msgid "Notice feed for tag %s (Activity Streams JSON)"
+msgstr "تغذية إشعارات وسم %s (آكت�تي ستريمز جيسن)"
+
 #. TRANS: Link label for feed on "notices with tag" page.
 #. TRANS: %s is the tag the feed is for.
 #, php-format
 msgid "Notice feed for tag %s (RSS 1.0)"
-msgstr ""
+msgstr "تغذية إشعارات وسم %s (آرإس​إس 1.0)"
 
 #. TRANS: Link label for feed on "notices with tag" page.
 #. TRANS: %s is the tag the feed is for.
 #, php-format
 msgid "Notice feed for tag %s (RSS 2.0)"
-msgstr ""
+msgstr "تغذية إشعارات وسم %s (آرإس​إس 2.0)"
 
 #. TRANS: Link label for feed on "notices with tag" page.
 #. TRANS: %s is the tag the feed is for.
 #, php-format
 msgid "Notice feed for tag %s (Atom)"
-msgstr ""
+msgstr "تغذية إشعارات وسم %s (أتوم)"
 
 #. TRANS: Client error displayed when trying to tag a user that cannot be tagged.
 #. TRANS: Client exception thrown trying to set a tag for a user that cannot be tagged.
 #. TRANS: Error displayed when trying to tag a user that cannot be tagged.
-#, fuzzy
 msgid "You cannot tag this user."
-msgstr "لا يمكنك إرسال رسائل إلى هذا المستخدم."
+msgstr "لا يمكنك وسم هذا المستخدم."
 
 #. TRANS: Title for list form when not on a profile page.
-#, fuzzy
 msgid "List a profile"
-msgstr "مل� المستخدم الشخصي"
+msgstr "إدراج مل�ا شخصيا"
 
 #. TRANS: Title for list form when on a profile page.
 #. TRANS: %s is a profile nickname.
-#, fuzzy, php-format
+#, php-format
 msgctxt "ADDTOLIST"
 msgid "List %s"
-msgstr "الحدود"
+msgstr "إدراج %s"
 
 #. TRANS: Title for list form when an error has occurred.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Error"
-msgstr "خطأ أجاكس"
+msgstr "خطأ"
 
 #. TRANS: Header in list form.
 msgid "User profile"
 msgstr "مل� المستخدم الشخصي"
 
 #. TRANS: Fieldset legend for list form.
-#, fuzzy
 msgid "List user"
-msgstr "الحدود"
+msgstr "أدرج مستخدما"
 
 #. TRANS: Field label on list form.
-#, fuzzy
 msgctxt "LABEL"
 msgid "Lists"
-msgstr "الحدود"
+msgstr "اللائحات"
 
 #. TRANS: Field title on list form.
-#, fuzzy
 msgid ""
 "Lists for this user (letters, numbers, -, ., and _), comma- or space- "
 "separated."
 msgstr ""
-"س�م ن�سك (حرو� وأرقام و \"-\" و \".\" و \"_\")، ا�صلها ب�اصلة (',') أو مسا�ة."
+"لائحات هذا المستخدم (حرو� وأرقام و \"-\" و \".\" و \"_\")، ا�صلها ب�اصلة "
+"(',') أو مسا�ة."
 
 #. TRANS: Title for personal tag cloud section.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Tags"
 msgstr "الوسوم"
 
 #. TRANS: Success message if lists are saved.
-#, fuzzy
 msgid "Lists saved."
-msgstr "ح��ظت كلمة السر."
+msgstr "ح��ظت اللائحات."
 
 #. TRANS: Page notice.
-#, fuzzy
 msgid "Use this form to add your subscribers or subscriptions to lists."
-msgstr "استخدم هذا النموذج لتعدل تطبيقك."
+msgstr "استخدم هذا النموذج لتدرج المشتركين بك أو المشترك أنت بهم إلى لائحة."
 
 #. TRANS: Client error when requesting a tag feed for a non-existing tag.
 msgid "No such tag."
-msgstr "لا وسم كهذا."
+msgstr "لا يوجد وسم بهذا الاسم."
 
 #. TRANS: Client error displayed when trying to unblock a non-blocked user.
 msgid "You haven't blocked that user."
@@ -6150,7 +5905,7 @@ msgstr "لم تمنع هذا المستخدم."
 
 #. TRANS: Client error on page to unsilence a user when the to be unsandboxed user has not been sandboxed.
 msgid "User is not sandboxed."
-msgstr "المستخدم ليس �ي صندوق الرمل."
+msgstr "المستخدم ليس محجورا."
 
 #. TRANS: Client error on page to unsilence a user when the to be unsilenced user has not been silenced.
 msgid "User is not silenced."
@@ -6162,24 +5917,13 @@ msgstr "غير مشترك"
 
 #. TRANS: Page title for form that allows unsubscribing from a list.
 #. TRANS: %1$s is a nickname, %2$s is a list, %3$s is a tagger nickname.
-#, fuzzy, php-format
-msgid "%1$s unsubscribed from list %2$s by %3$s"
-msgstr "مشتركو %1$s, الص�حة %2$d"
-
-#. TRANS: Client error displayed when trying to update profile with an incompatible license.
-#. TRANS: %1$s is the license incompatible with site license %2$s.
-#. TRANS: Exception thrown when licenses are not compatible for an authorisation request.
-#. TRANS: %1$s is the license for the listenee, %2$s is the license for "this" StatusNet site.
 #, php-format
-msgid ""
-"Listenee stream license \"%1$s\" is not compatible with site license \"%2$s"
-"\"."
-msgstr ""
+msgid "%1$s unsubscribed from list %2$s by %3$s"
+msgstr "أزال %1$s اشتراكه من اللائحة %2$s التي أنشأها %3$s"
 
 #. TRANS: Title of URL settings tab in profile settings.
-#, fuzzy
 msgid "URL settings"
-msgstr "إعدادات المراسلة ال�ورية"
+msgstr "إعدادات المسارات"
 
 #. TRANS: Instructions for tab "Other" in user profile settings.
 msgid "Manage various other options."
@@ -6192,13 +5936,12 @@ msgid " (free service)"
 msgstr " (خدمة حرة)"
 
 #. TRANS: Default value for URL shortening settings.
-#, fuzzy
 msgid "[none]"
-msgstr "لا شيء"
+msgstr "[لا يوجد]"
 
 #. TRANS: Default value for URL shortening settings.
 msgid "[internal]"
-msgstr ""
+msgstr "[داخلي]"
 
 #. TRANS: Label for dropdown with URL shortener services.
 msgid "Shorten URLs with"
@@ -6210,35 +5953,32 @@ msgstr "خدمة التقصير المطلوب استخدامها."
 
 #. TRANS: Field label in URL settings in profile.
 msgid "URL longer than"
-msgstr ""
+msgstr "المسارات الأطول من"
 
 #. TRANS: Field title in URL settings in profile.
 msgid "URLs longer than this will be shortened, 0 means always shorten."
-msgstr ""
+msgstr "المسارات الأطول من الرقم سو� تقصر، 0 يعني قصر دائما."
 
 #. TRANS: Field label in URL settings in profile.
 msgid "Text longer than"
-msgstr ""
+msgstr "النصوص الأطول من"
 
 #. TRANS: Field title in URL settings in profile.
 msgid ""
 "URLs in notices longer than this will be shortened, 0 means always shorten."
-msgstr ""
+msgstr "المسارات التي �ي إشعارات أطول من الرقم سو� تقصر، 0 يعني قصر دائما."
 
 #. TRANS: Form validation error for form "Other settings" in user profile.
-#, fuzzy
 msgid "URL shortening service is too long (maximum 50 characters)."
-msgstr "الاسم الكامل طويل جدا (الأقصى 255 حر�ًا)"
+msgstr "خدمة تقصير المسارات طويلة جدا (أقصى حد 50 حر�ا)."
 
 #. TRANS: Client exception thrown when the maximum URL settings value is invalid in profile URL settings.
-#, fuzzy
 msgid "Invalid number for maximum URL length."
-msgstr "محتوى إشعار غير صالح."
+msgstr "رقم غير صالح لطول المسارات."
 
 #. TRANS: Client exception thrown when the maximum notice length settings value is invalid in profile URL settings.
-#, fuzzy
 msgid "Invalid number for maximum notice length."
-msgstr "محتوى إشعار غير صالح."
+msgstr "رقم غير صالح لطول الإشعارات."
 
 #. TRANS: Server exception thrown in profile URL settings when preferences could not be saved.
 msgid "Error saving user URL shortening preferences."
@@ -6251,7 +5991,7 @@ msgstr "المستخدم"
 
 #. TRANS: Instruction for user admin panel.
 msgid "User settings for this StatusNet site"
-msgstr ""
+msgstr "إعدادات مستخدمي موقع StatusNet هذا."
 
 #. TRANS: Form validation error in user admin panel when a non-numeric character limit was set.
 msgid "Invalid bio limit. Must be numeric."
@@ -6268,7 +6008,6 @@ msgid "Invalid default subscripton: \"%1$s\" is not a user."
 msgstr "اشتراك مبدئي غير صالح: \"%1$s\" ليس مستخدمًا."
 
 #. TRANS: Fieldset legend in user administration panel.
-#, fuzzy
 msgctxt "LEGEND"
 msgid "Profile"
 msgstr "المل� الشخصي"
@@ -6313,146 +6052,10 @@ msgstr "الدعوات م��علة"
 msgid "Whether to allow users to invite new users."
 msgstr "اسمح للمستخدمين بدعوة مستخدمين جدد."
 
-#. TRANS: Title for button to save user settings in user admin panel.
+#. TRANS: Button title to save user settings in user admin panel.
 msgid "Save user settings."
 msgstr "اح�ظ إعدادات المستخدم."
 
-#. TRANS: Page title.
-msgid "Authorize subscription"
-msgstr "التصريح للاشتراكات"
-
-#. TRANS: Page notice on "Authorize subscription" page.
-msgid ""
-"Please check these details to make sure that you want to subscribe to this "
-"user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
-"click \"Reject\"."
-msgstr ""
-"ي�رجى التحقق من هذه الت�اصيل للتأكد من أنك تريد الاشتراك بإشعارات هذا "
-"المستخدم. إذا لم تطلب للتو الاستماع لإشعارات شخص ما �انقر \"ار�ض\"."
-
-#. TRANS: Button text on Authorise Subscription page.
-#. TRANS: Submit button text to accept a group membership request on approve group form.
-#. TRANS: Submit button text to accept a subscription request on approve sub form.
-msgctxt "BUTTON"
-msgid "Accept"
-msgstr "اقبل"
-
-#. TRANS: Title for button on Authorise Subscription page.
-#. TRANS: Button title to subscribe to a user.
-msgid "Subscribe to this user."
-msgstr "اشترك بهذا المستخدم"
-
-#. TRANS: Button text on Authorise Subscription page.
-#. TRANS: Submit button text to reject a group membership request on approve group form.
-#. TRANS: Submit button text to reject a subscription request on approve sub form.
-msgctxt "BUTTON"
-msgid "Reject"
-msgstr "ار�ض"
-
-#. TRANS: Title for button on Authorise Subscription page.
-msgid "Reject this subscription."
-msgstr "ار�ض هذا الاشتراك"
-
-#. TRANS: Client error displayed for an empty authorisation request.
-msgid "No authorization request!"
-msgstr "لا طلب تصريح!"
-
-#. TRANS: Accept message header from Authorise subscription page.
-msgid "Subscription authorized"
-msgstr "أ�ذ�ن للاشتراك"
-
-#. TRANS: Accept message text from Authorise subscription page.
-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 ""
-
-#. TRANS: Reject message header from Authorise subscription page.
-msgid "Subscription rejected"
-msgstr "ر��ض الاشتراك"
-
-#. TRANS: Reject message from Authorise subscription page.
-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 ""
-
-#. TRANS: Exception thrown when no valid user is found for an authorisation request.
-#. TRANS: %s is a listener URI.
-#, php-format
-msgid "Listener URI \"%s\" not found here."
-msgstr ""
-
-#. TRANS: Exception thrown when listenee URI is too long for an authorisation request.
-#. TRANS: %s is a listenee URI.
-#, php-format
-msgid "Listenee URI \"%s\" is too long."
-msgstr "مسار المستمع \"%s\" طويل للغاية."
-
-#. TRANS: Exception thrown when listenee URI is a local user for an authorisation request.
-#. TRANS: %s is a listenee URI.
-#, php-format
-msgid "Listenee URI \"%s\" is a local user."
-msgstr "مسار المستمع \"%s\" لمستخدم محلي."
-
-#. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
-#. TRANS: %s is a profile URL.
-#, php-format
-msgid "Profile URL \"%s\" is for a local user."
-msgstr ""
-
-#. TRANS: Exception thrown when avatar URL is invalid for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#, fuzzy, php-format
-msgid "Avatar URL \"%s\" is not valid."
-msgstr "مسار المصدر ليس صحيحا."
-
-#. TRANS: Exception thrown when avatar URL could not be read for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#, fuzzy, php-format
-msgid "Cannot read avatar URL \"%s\"."
-msgstr "تعذر قراءة رابط الأ�تار ‘%s’."
-
-#. TRANS: Exception thrown when avatar URL return an invalid image type for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#, php-format
-msgid "Wrong image type for avatar URL \"%s\"."
-msgstr ""
-
-#. TRANS: Title for profile design page.
-#. TRANS: Page title for profile design page.
-msgid "Profile design"
-msgstr "تصميم المل� الشخصي"
-
-#. TRANS: Instructions for Profile design page.
-#. TRANS: Instructions for profile design page.
-msgid ""
-"Customize the way your profile looks with a background image and a colour "
-"palette of your choice."
-msgstr "خصّص أسلوب عرض مل�ك بصورة خل�ية ومخطط ألوان من اختيارك."
-
-#. TRANS: Succes message on Profile design page when finding an easter egg.
-msgid "Enjoy your hotdog!"
-msgstr "استمتع بالنقانق!"
-
-#. TRANS: Form legend on Profile design page.
-msgid "Design settings"
-msgstr "إعدادات التصميم"
-
-#. TRANS: Checkbox label on Profile design page.
-msgid "View profile designs"
-msgstr "اعرض تصاميم المل� الشخصي"
-
-#. TRANS: Title for checkbox on Profile design page.
-msgid "Show or hide profile designs."
-msgstr "أظهر أو أخ�� تصاميم المل�ات الشخصية."
-
-#. TRANS: Form legend on Profile design page for form to choose a background image.
-msgid "Background file"
-msgstr "مل� الخل�ية"
-
 #. TRANS: Page title for all but the first page of groups for a user.
 #. TRANS: %1$s is a nickname, %2$d is a page number.
 #, php-format
@@ -6493,11 +6096,11 @@ msgstr "ستاتس نت %s"
 #. TRANS: %1$s is the engine name (StatusNet) and %2$s is the StatusNet version.
 #, php-format
 msgid ""
-"This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, "
+"This site is powered by %1$s version %2$s, Copyright 2008-2011 StatusNet, "
 "Inc. and contributors."
 msgstr ""
-"هذا الموقع يشغله %1$s النسخة %2$s، حقوق النشر 2008-2010 StatusNet, Inc "
-"ومساهموها."
+"!هذا الموقع يشغله %1$s النسخة %2$s، حقوق النشر 2008-2011 لStatusNet, Inc "
+"ومساهميها."
 
 #. TRANS: Header for StatusNet contributors section on the version page.
 msgid "Contributors"
@@ -6508,22 +6111,23 @@ msgid "License"
 msgstr "الرخصة"
 
 #. TRANS: Content part of StatusNet version page.
+#, fuzzy
 msgid ""
 "StatusNet is free software: you can redistribute it and/or modify it under "
 "the terms of the GNU Affero General Public License as published by the Free "
 "Software Foundation, either version 3 of the License, or (at your option) "
-"any later version. "
+"any later version."
 msgstr ""
 "ستاتس نت برمجية حرة، يمكنك إعادة توزيعها وتعديلها و�قا لشروط رخصة غنو أ�يرو "
 "العمومية كما نشرتها مؤسسة البرمجيات الحرة، برخصتها الثالثة أو أي نسخة تليها "
-"(أيهما تشاء)."
+"(أيهما تشاء). "
 
 #. TRANS: Content part of StatusNet version page.
 msgid ""
 "This program is distributed in the hope that it will be useful, but WITHOUT "
 "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
 "FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License "
-"for more details. "
+"for more details."
 msgstr ""
 
 #. TRANS: Content part of StatusNet version page.
@@ -6571,22 +6175,36 @@ msgstr "%1$s علّم الإشعار %2$s م�ضّلا."
 #. TRANS: Server exception thrown when a URL cannot be processed.
 #, php-format
 msgid "Cannot process URL '%s'"
-msgstr ""
+msgstr "تغذرت معالجة المسار '%s'"
 
 #. TRANS: Server exception thrown when... Robin thinks something is impossible!
 msgid "Robin thinks something is impossible."
 msgstr ""
 
+#. TRANS: Message used to be inserted as %2$s in  the text "No file may
+#. TRANS: be larger than %1$d byte and the file you sent was %2$s.".
+#. TRANS: %1$d is the number of bytes of an uploaded file.
+#, php-format
+msgid "%1$d byte"
+msgid_plural "%1$d bytes"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
+msgstr[5] ""
+
 #. TRANS: Message given if an upload is larger than the configured maximum.
-#. TRANS: %1$d is the byte limit for uploads, %2$d is the byte count for the uploaded file.
-#. TRANS: %1$s is used for plural.
+#. TRANS: %1$d (used for plural) is the byte limit for uploads,
+#. TRANS: %2$s is the proper form of "n bytes". This is the only ways to have
+#. TRANS: gettext support multiple plurals in the same message, unfortunately...
 #, php-format
 msgid ""
-"No file may be larger than %1$d byte and the file you sent was %2$d bytes. "
-"Try to upload a smaller version."
+"No file may be larger than %1$d byte and the file you sent was %2$s. Try to "
+"upload a smaller version."
 msgid_plural ""
-"No file may be larger than %1$d bytes and the file you sent was %2$d bytes. "
-"Try to upload a smaller version."
+"No file may be larger than %1$d bytes and the file you sent was %2$s. Try to "
+"upload a smaller version."
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
@@ -6666,6 +6284,11 @@ msgstr "تعذر تحديث المجموعة المحلية."
 msgid "Could not create login token for %s"
 msgstr "لم يمكن إنشاء توكن الولوج ل%s"
 
+#. TRANS: Exception thrown when a program code class (%s) cannot be instantiated.
+#, fuzzy, php-format
+msgid "Cannot instantiate class %s."
+msgstr "!تعذّر ح�ظ كلمة السر الجديدة."
+
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.
 msgid "No database name or DSN found anywhere."
 msgstr ""
@@ -6822,18 +6445,16 @@ msgstr ""
 #, php-format
 msgid ""
 "You already have %1$d or more people in list %2$s, which is the maximum "
-"allowed number.Try unlisting others first."
+"allowed number. Try unlisting others first."
 msgstr ""
 
 #. TRANS: Exception thrown when inserting a list subscription in the database fails.
-#, fuzzy
 msgid "Adding list subscription failed."
-msgstr "تعذّر ح�ظ الاشتراك."
+msgstr "�شلت إضا�ة الاشتراك باللائحة."
 
 #. TRANS: Exception thrown when deleting a list subscription from the database fails.
-#, fuzzy
 msgid "Removing list subscription failed."
-msgstr "تعذّر ح�ظ الاشتراك."
+msgstr "�شلت إزالة الاشتراك باللائحة."
 
 #. TRANS: Exception thrown when a right for a non-existing user profile is checked.
 #, fuzzy
@@ -6845,9 +6466,8 @@ msgid "Unable to save tag."
 msgstr "تعذّر ح�ظ الوسم."
 
 #. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
-#. TRANS: Error message displayed to a banned user when they try to subscribe.
 msgid "You have been banned from subscribing."
-msgstr ""
+msgstr "تم منعك من الاشتراك."
 
 #. TRANS: Exception thrown when trying to subscribe while already subscribed.
 msgid "Already subscribed!"
@@ -6865,10 +6485,6 @@ msgstr "غير مشترك!"
 msgid "Could not delete self-subscription."
 msgstr "تعذّر حذ� الاشتراك الذاتي."
 
-#. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
-msgid "Could not delete subscription OMB token."
-msgstr "تعذّر ح�ظ الاشتراك."
-
 #. TRANS: Exception thrown when a subscription could not be deleted on the server.
 msgid "Could not delete subscription."
 msgstr "تعذّر ح�ظ الاشتراك."
@@ -6880,9 +6496,9 @@ msgstr "تابع"
 
 #. TRANS: Notification given when one person starts following another.
 #. TRANS: %1$s is the subscriber, %2$s is the subscribed.
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s is now following %2$s."
-msgstr "%1$s يستمع الآن إلى إشعاراتك على %2$s."
+msgstr "%1$s بدأ �ي متابعة %2$s."
 
 #. TRANS: Notice given on user registration.
 #. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
@@ -6902,6 +6518,18 @@ msgstr ""
 msgid "Single-user mode code called when not enabled."
 msgstr ""
 
+#. TRANS: Information on password recovery form if no known username or e-mail address was specified.
+msgid "No user with that email address or username."
+msgstr "لا مستخدم لديه عنوان البريد الإلكتروني أو اسم المستخدم هذا."
+
+#. TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.
+msgid "No registered email address for that user."
+msgstr "لا يوجد عنوان بريد إلكتروني م�سجّل لهذا المستخدم."
+
+#. TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.
+msgid "Error saving address confirmation."
+msgstr "خطأ أثناء ح�ظ تأكيد العنوان."
+
 #. TRANS: Server exception thrown when creating a group failed.
 msgid "Could not create group."
 msgstr "تعذّر إنشاء المجموعة."
@@ -7008,7 +6636,7 @@ msgstr "اكتب ردًا..."
 #. TRANS: Tab on the notice form.
 msgctxt "TAB"
 msgid "Status"
-msgstr "الحالة"
+msgstr "حالة"
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
 #. TRANS: Text between [] is a link description, text between () is the link itself.
@@ -7087,14 +6715,12 @@ msgid "Cannot force subscription for untrusted user."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to force a remote user to subscribe.
-#, fuzzy
 msgid "Cannot force remote user to subscribe."
-msgstr "تعذّر تحديث سجل المستخدم."
+msgstr "لا يمكن �رض اشتراك مستخدم بعيد بمجموعة."
 
 #. TRANS: Client exception thrown when trying to subscribe to an unknown profile.
-#, fuzzy
 msgid "Unknown profile."
-msgstr "نوع مل� غير معرو�"
+msgstr "مل� شخصي غير معرو�."
 
 #. TRANS: Client exception thrown when trying to import an event not related to the importing user.
 msgid "This activity seems unrelated to our user."
@@ -7105,9 +6731,8 @@ msgid "Remote profile is not a group!"
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to join a group the importing user is already a member of.
-#, fuzzy
 msgid "User is already a member of this group."
-msgstr "أنت بال�عل عضو �ي هذه المجموعة"
+msgstr "المستخدم بال�عل عضو �ي هذه المجموعة."
 
 #. TRANS: Client exception thrown when trying to import a notice by another user.
 #. TRANS: %1$s is the source URI of the notice, %2$s is the URI of the author.
@@ -7126,9 +6751,9 @@ msgid "No content for notice %s."
 msgstr "ابحث عن محتويات �ي الإشعارات"
 
 #. TRANS: Exception thrown if a non-existing user is provided. %s is a user ID.
-#, fuzzy, php-format
+#, php-format
 msgid "No such user \"%s\"."
-msgstr "لا مستخدم كهذا."
+msgstr "المستخدم \"%s\" غير موجود."
 
 #. TRANS: Client exception thrown when post to collection fails with a 400 status.
 #. TRANS: %1$s is a URL, %2$s is the status, %s$s is the fail reason.
@@ -7136,10 +6761,10 @@ msgstr "لا مستخدم كهذا."
 #. TRANS: %1$s is a URL, %2$s is the status, %s$s is the fail reason.
 #. TRANS: Exception thrown when post to collection fails with a status that is not handled.
 #. TRANS: %1$s is a URL, %2$s is the status, %s$s is the fail reason.
-#, fuzzy, php-format
+#, php-format
 msgctxt "URLSTATUSREASON"
 msgid "%1$s %2$s %3$s"
-msgstr "%1$s - %2$s"
+msgstr "%1$s %2$s %3$s"
 
 #. TRANS: Client exception thrown when there is no source attribute.
 msgid "Can't handle remote content yet."
@@ -7171,32 +6796,15 @@ msgstr "الأمر لم ي�جهزّ بعد."
 msgid "saveSettings() not implemented."
 msgstr "الأمر لم ي�جهزّ بعد."
 
-#. TRANS: Client error message thrown if design settings could not be deleted in
-#. TRANS: the admin panel Design.
-msgid "Unable to delete design setting."
-msgstr "تعذّر حذ� إعدادات التصميم."
-
 #. TRANS: Header in administrator navigation panel.
-#. TRANS: Header in settings navigation panel.
-#, fuzzy
 msgctxt "HEADER"
 msgid "Home"
 msgstr "الرئيسية"
 
-#. TRANS: Menu item in administrator navigation panel.
-#. TRANS: Menu item in default local navigation panel.
-#. TRANS: Menu item in personal group navigation menu.
-#. TRANS: Menu item in settings navigation panel.
-#, fuzzy
-msgctxt "MENU"
-msgid "Home"
-msgstr "الرئيسية"
-
 #. TRANS: Header in administrator navigation panel.
-#, fuzzy
 msgctxt "HEADER"
 msgid "Admin"
-msgstr "إداري"
+msgstr "إدارة"
 
 #. TRANS: Menu item title in administrator navigation panel.
 msgid "Basic site configuration"
@@ -7207,17 +6815,6 @@ msgctxt "MENU"
 msgid "Site"
 msgstr "الموقع"
 
-#. TRANS: Menu item title in administrator navigation panel.
-msgid "Design configuration"
-msgstr "ضبط التصميم"
-
-#. TRANS: Menu item in administrator navigation panel.
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: Menu item in settings navigation panel.
-msgctxt "MENU"
-msgid "Design"
-msgstr "التصميم"
-
 #. TRANS: Menu item title in administrator navigation panel.
 msgid "User configuration"
 msgstr "ضبط المستخدم"
@@ -7275,10 +6872,9 @@ msgstr ""
 
 #. TRANS: Menu item title in administrator navigation panel.
 msgid "Set site license"
-msgstr "اضبط رخصة الموقع"
+msgstr "تعيين رخصة الموقع"
 
 #. TRANS: Menu item in administrator navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "License"
 msgstr "الرخصة"
@@ -7317,43 +6913,6 @@ msgstr ""
 msgid "Could not authenticate you."
 msgstr ""
 
-#. TRANS: Server error displayed when trying to create an anynymous OAuth consumer.
-#, fuzzy
-msgid "Could not create anonymous consumer."
-msgstr "تعذّر إنشاء الكنى."
-
-#. TRANS: Server error displayed when trying to create an anynymous OAuth application.
-#, fuzzy
-msgid "Could not create anonymous OAuth application."
-msgstr "لم يمكن إنشاء التطبيق."
-
-#. TRANS: Exception thrown when no token association could be found.
-msgid ""
-"Could not find a profile and application associated with the request token."
-msgstr ""
-
-#. TRANS: Exception thrown when no access token can be issued.
-#, fuzzy
-msgid "Could not issue access token."
-msgstr "تعذّر إدراج الرسالة."
-
-#. TRANS: Exception thrown when a database error occurs.
-msgid "Database error inserting OAuth application user."
-msgstr "خطأ �ي قاعدة البيانات أثناء حذ� مستخدم تطبيق OAuth."
-
-#. TRANS: Exception thrown when a database error occurs.
-#, fuzzy
-msgid "Database error updating OAuth application user."
-msgstr "خطأ �ي قاعدة البيانات أثناء حذ� مستخدم تطبيق OAuth."
-
-#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
-msgid "Tried to revoke unknown token."
-msgstr ""
-
-#. TRANS: Exception thrown when an attempt is made to remove a revoked token.
-msgid "Failed to delete revoked token."
-msgstr ""
-
 #. TRANS: Form input field label for application icon.
 msgid "Icon"
 msgstr "أيقونة"
@@ -7398,18 +6957,16 @@ msgid "Source URL"
 msgstr "مسار المصدر"
 
 #. TRANS: Form input field instructions.
-#, fuzzy
 msgid "Organization responsible for this application"
-msgstr "أيقونة لهذا التطبيق"
+msgstr "المنظمة المسؤولة عن هذا التطبيق"
 
 #. TRANS: Form input field label.
 msgid "Organization"
 msgstr "المنظمة"
 
 #. TRANS: Form input field instructions.
-#, fuzzy
 msgid "URL for the homepage of the organization"
-msgstr "مسار ص�حة هذا التطبيق"
+msgstr "مسار ص�حة المنظمة"
 
 #. TRANS: Form input field instructions.
 msgid "URL to redirect to after authentication"
@@ -7421,55 +6978,53 @@ msgstr "متص�ح"
 
 #. TRANS: Radio button label for application type
 msgid "Desktop"
-msgstr ""
+msgstr "سطح مكتب"
 
 #. TRANS: Form guide.
 msgid "Type of application, browser or desktop"
-msgstr ""
+msgstr "نوع التطبيق: متص�ح أو سطح مكتب"
 
 #. TRANS: Radio button label for access type.
 msgid "Read-only"
-msgstr ""
+msgstr "قراءة �قط"
 
 #. TRANS: Radio button label for access type.
 msgid "Read-write"
-msgstr ""
+msgstr "قراءة-كتابة"
 
 #. TRANS: Form guide.
 msgid "Default access for this application: read-only, or read-write"
 msgstr ""
 
 #. TRANS: Submit button title.
-msgid "Cancel"
-msgstr "ألغ�"
+msgid "Cancel application changes."
+msgstr "ألغ� التغييرات على التطبيق."
 
 #. TRANS: Submit button title.
-#. TRANS: Button text to save a list.
-msgid "Save"
-msgstr "اح�ظ"
+msgid "Save application changes."
+msgstr "اح�ظ التغييرات على التطبيق."
 
 #. TRANS: Name for an anonymous application in application list.
-#, fuzzy
 msgid "Unknown application"
-msgstr "إجراء غير معرو�"
+msgstr "تطبيق غير معرو�"
 
 #. TRANS: Message has a leading space and a trailing space. Used in application list.
 #. TRANS: Before this message the application name is put, behind it the organisation that manages it.
 msgid " by "
-msgstr ""
+msgstr " أنشأه "
 
 #. TRANS: Application access type
 msgid "read-write"
-msgstr ""
+msgstr "قراءة-كتابة"
 
 #. TRANS: Application access type
 msgid "read-only"
-msgstr ""
+msgstr "قراءة �قط"
 
 #. TRANS: Used in application list. %1$s is a modified date, %2$s is access type ("read-write" or "read-only")
 #, php-format
 msgid "Approved %1$s - \"%2$s\" access."
-msgstr ""
+msgstr "أقر �ي %1$s - ن�اذ \"%2$s\"."
 
 #. TRANS: Access token in the application list.
 #. TRANS: %s are the first 7 characters of the access token.
@@ -7482,6 +7037,18 @@ msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "أزل"
 
+#. TRANS: Submit button text to accept a group membership request on approve group form.
+#. TRANS: Submit button text to accept a subscription request on approve sub form.
+msgctxt "BUTTON"
+msgid "Accept"
+msgstr "اقبل"
+
+#. TRANS: Submit button text to reject a group membership request on approve group form.
+#. TRANS: Submit button text to reject a subscription request on approve sub form.
+msgctxt "BUTTON"
+msgid "Reject"
+msgstr "ار�ض"
+
 #. TRANS: Atom feed exception thrown when an author element does not contain a name element.
 msgid "Author element must contain a name element."
 msgstr ""
@@ -7492,34 +7059,31 @@ msgid "Do not use this method!"
 msgstr "لا تحذ� هذا الإشعار"
 
 #. TRANS: Title in atom list notice feed. %1$s is a list name, %2$s is a tagger's nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "Timeline for people in list %1$s by %2$s"
-msgstr "الردود على %1$s، الص�حة %2$d"
+msgstr "المسار الزمني لمن هم �ي اللائحة %1$s التي أنشأها %2$s"
 
 #. TRANS: Message is used as a subtitle in atom list notice feed.
 #. TRANS: %1$s is a tagger's nickname, %2$s is a list name, %3$s is a site name.
-#, fuzzy, php-format
+#, php-format
 msgid "Updates from %1$s's list %2$s on %3$s!"
-msgstr "مستجدات %1$s على %2$s!"
+msgstr "مستجدات قائمة %1$s لمنشئها %2$s على %3$s!"
 
 #. TRANS: Title.
-#, fuzzy
 msgid "Notices where this attachment appears"
-msgstr "وسوم هذا المر�ق"
+msgstr "الإشعارات التي يظهر �يها هذا المر�ق"
 
 #. TRANS: Title.
 msgid "Tags for this attachment"
 msgstr "وسوم هذا المر�ق"
 
 #. TRANS: Exception thrown when a password change fails.
-#, fuzzy
 msgid "Password changing failed."
-msgstr "تغيير كلمة السر �شل"
+msgstr "�شل تغيير كلمة السر."
 
 #. TRANS: Exception thrown when a password change attempt fails because it is not allowed.
-#, fuzzy
 msgid "Password changing is not allowed."
-msgstr "تغيير كلمة السر غير مسموح به"
+msgstr "لا يسمح بغيير كلمة السر."
 
 #. TRANS: Title for the form to block a user.
 msgid "Block"
@@ -7535,17 +7099,15 @@ msgid "Cancel join request"
 msgstr "ألغ� طلب الانضمام"
 
 #. TRANS: Button text for form action to cancel a subscription request.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Cancel subscription request"
-msgstr "جميع الاشتراكات"
+msgstr "ألغ� طلب الاشتراك"
 
 #. TRANS: Title for command results.
 msgid "Command results"
 msgstr "نتائج الأمر"
 
 #. TRANS: Title for command results.
-#, fuzzy
 msgid "AJAX error"
 msgstr "خطأ أجاكس"
 
@@ -7559,9 +7121,8 @@ msgid "Command failed"
 msgstr "�شل الأمر"
 
 #. TRANS: Command exception text shown when a notice ID is requested that does not exist.
-#, fuzzy
 msgid "Notice with that id does not exist."
-msgstr "لا مل� بهذه الهوية."
+msgstr "لا يوجد إشعار بتلك الهوية."
 
 #. TRANS: Command exception text shown when a last user notice is requested and it does not exist.
 #. TRANS: Error text shown when a last user notice is requested and it does not exist.
@@ -7579,7 +7140,7 @@ msgstr "تعذّر إيجاد المستخدم الهد�."
 #. TRANS: %s is the nickname of the user that could not be found.
 #, php-format
 msgid "Could not find a local user with nickname %s."
-msgstr ""
+msgstr "تعذر العثور على مستخدم محلي اسمه المستعار %s."
 
 #. TRANS: Error text shown when an unimplemented command is given.
 #, fuzzy
@@ -7616,9 +7177,8 @@ msgid "Could not create favorite: Already favorited."
 msgstr "تعذّر إنشاء م�ضلة: م�ضلة �علا."
 
 #. TRANS: Text shown when a notice has been marked as favourite successfully.
-#, fuzzy
 msgid "Notice marked as fave."
-msgstr "هذا الإشعار م�ضلة مسبقًا!"
+msgstr "ع�لّم الإشعار م�ضلا."
 
 #. TRANS: Message given having added a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
@@ -7636,20 +7196,20 @@ msgstr "غادر %1$s إلى مجموعة %2$s."
 #. TRANS: %1$s is the tagged user, %2$s is the error message (no punctuation).
 #, php-format
 msgid "Error tagging %1$s: %2$s"
-msgstr ""
+msgstr "خطأ �ي وسم %1$s: %2$s"
 
 #. TRANS: Succes message displayed if tagging a user succeeds.
 #. TRANS: %1$s is the tagged user's nickname, %2$s is a list of tags.
 #. TRANS: Plural is decided based on the number of tags added (not part of message).
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s was tagged %2$s"
 msgid_plural "%1$s was tagged %2$s"
-msgstr[0] "%1$s Ùˆ %2$s"
-msgstr[1] "%1$s Ùˆ %2$s"
-msgstr[2] "%1$s Ùˆ %2$s"
-msgstr[3] "%1$s Ùˆ %2$s"
-msgstr[4] "%1$s Ùˆ %2$s"
-msgstr[5] "%1$s Ùˆ %2$s"
+msgstr[0] "و�سم %1$s ب%2$s"
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
+msgstr[5] ""
 
 #. TRANS: Separator for list of tags.
 #. TRANS: Separator in list of user names like "Jim, Bob, Mary".
@@ -7666,7 +7226,7 @@ msgstr "وسم غير صالح: \"%s\""
 #. TRANS: %1$s is the untagged user, %2$s is the error message (no punctuation).
 #, php-format
 msgid "Error untagging %1$s: %2$s"
-msgstr ""
+msgstr "خطأ �ي إزالة وسم %1$s: %2$s"
 
 #. TRANS: Succes message displayed if untagging a user succeeds.
 #. TRANS: %1$s is the untagged user's nickname, %2$s is a list of tags.
@@ -7762,9 +7322,9 @@ msgstr[5] "هذه طويلة جدًا. أطول حجم للإشعار %d  حر�
 
 #. TRANS: Text shown having sent a reply to a notice successfully.
 #. TRANS: %s is the nickname of the user of the notice the reply was sent to.
-#, fuzzy, php-format
+#, php-format
 msgid "Reply to %s sent."
-msgstr "ر�د على رسالة %s"
+msgstr "أ�رسل الرد إلى %s."
 
 #. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
 msgid "Error saving notice."
@@ -7782,18 +7342,18 @@ msgstr ""
 #. TRANS: %s is the name of the user the subscription was requested for.
 #, php-format
 msgid "Subscribed to %s."
-msgstr ""
+msgstr "اشتركت ب%s."
 
 #. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
 #. TRANS: Error text shown when no username was provided when issuing the command.
 msgid "Specify the name of the user to unsubscribe from."
-msgstr ""
+msgstr "حدد اسم المستخدم لتلغي اشتراكك منه."
 
 #. TRANS: Text shown after having unsubscribed from another user successfully.
 #. TRANS: %s is the name of the user the unsubscription was requested for.
 #, php-format
 msgid "Unsubscribed from %s."
-msgstr ""
+msgstr "ألغي اشتراكك ب%s."
 
 #. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
 #. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
@@ -7824,13 +7384,13 @@ msgstr ""
 #. TRANS: %s is a logon link..
 #, php-format
 msgid "This link is useable only once and is valid for only 2 minutes: %s."
-msgstr ""
+msgstr "يمكن استخدام هذه الوصلة لمرة واحدة وهي صالحة لدقيقتين �قط: %s"
 
 #. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
 #. TRANS: %s is the name of the user the unsubscription was requested for.
 #, php-format
 msgid "Unsubscribed %s."
-msgstr ""
+msgstr "ألغي اشتراك %s."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
 msgid "You are not subscribed to anyone."
@@ -7883,22 +7443,19 @@ msgstr[4] ""
 msgstr[5] ""
 
 #. TRANS: Header line of help text for commands.
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "Commands:"
-msgstr "نتائج الأمر"
+msgstr "الأوامر:"
 
 #. TRANS: Help message for IM/SMS command "on".
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "turn on notifications"
-msgstr "تعذّر تشغيل الإشعار."
+msgstr "شغّل التنبيهات"
 
 #. TRANS: Help message for IM/SMS command "off".
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "turn off notifications"
-msgstr "تعذّر إط�اء الإشعارات."
+msgstr "أوق� الإشعارات"
 
 #. TRANS: Help message for IM/SMS command "help".
 msgctxt "COMMANDHELP"
@@ -7916,16 +7473,14 @@ msgid "lists the groups you have joined"
 msgstr "يسرد المجموعات التي أنت مشترك بها"
 
 #. TRANS: Help message for IM/SMS command "tag".
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "tag a user"
-msgstr "اوسم المستخدم"
+msgstr "يوسم مستخدما"
 
 #. TRANS: Help message for IM/SMS command "untag".
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "untag a user"
-msgstr "اوسم المستخدم"
+msgstr "يزيل وسم مستخدم"
 
 #. TRANS: Help message for IM/SMS command "subscriptions".
 msgctxt "COMMANDHELP"
@@ -8003,10 +7558,9 @@ msgid "Get a link to login to the web interface"
 msgstr ""
 
 #. TRANS: Help message for IM/SMS command "drop <group>".
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "leave group"
-msgstr "احذ� المستخدم"
+msgstr "يغادر المجموعة"
 
 #. TRANS: Help message for IM/SMS command "stats".
 msgctxt "COMMANDHELP"
@@ -8022,17 +7576,17 @@ msgstr ""
 #. TRANS: Help message for IM/SMS command "sub <nickname>".
 msgctxt "COMMANDHELP"
 msgid "same as 'follow'"
-msgstr ""
+msgstr "مثل 'follow'"
 
 #. TRANS: Help message for IM/SMS command "unsub <nickname>".
 msgctxt "COMMANDHELP"
 msgid "same as 'leave'"
-msgstr ""
+msgstr "مثل 'leave'"
 
 #. TRANS: Help message for IM/SMS command "last <nickname>".
 msgctxt "COMMANDHELP"
 msgid "same as 'get'"
-msgstr ""
+msgstr "مثل 'get'"
 
 #. TRANS: Help message for IM/SMS command "on <nickname>".
 #. TRANS: Help message for IM/SMS command "off <nickname>".
@@ -8054,9 +7608,8 @@ msgid "remind a user to update."
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#, fuzzy
 msgid "No configuration file found."
-msgstr "لا رمز تأكيد."
+msgstr "لم يعثر على مل� ضبط."
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: Is followed by a list of directories (separated by HTML breaks).
@@ -8072,31 +7625,26 @@ msgstr ""
 msgid "Go to the installer."
 msgstr "اذهب إلى الم�ثبّت."
 
+#. TRANS: Header on conversation page. Hidden by default (h2).
+#. TRANS: Label for user statistics.
+msgid "Notices"
+msgstr "الإشعارات"
+
 #. TRANS: Page title for when a database error occurs.
 msgid "Database error"
 msgstr "خطأ قاعدة بيانات"
 
 #. TRANS: Menu item in default local navigation panel.
 #. TRANS: Menu item in search group navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Public"
-msgstr "عام"
-
-#. TRANS: Menu item in default local navigation panel.
-#. TRANS: Menu item in search group navigation panel.
-#. TRANS: Menu item in local navigation menu.
-#, fuzzy
-msgctxt "MENU"
-msgid "Groups"
-msgstr "مجموعات"
+msgstr "العموم"
 
 #. TRANS: Menu item in default local navigation panel.
 #. TRANS: Menu item title in local navigation menu.
-#, fuzzy
 msgctxt "MENU"
 msgid "Lists"
-msgstr "الحدود"
+msgstr "اللائحات"
 
 #. TRANS: Title of form for deleting a user.
 #. TRANS: Link text in notice list item to delete a notice.
@@ -8107,69 +7655,37 @@ msgstr "احذ�"
 msgid "Delete this user"
 msgstr "احذ� هذا المستخدم"
 
-#. TRANS: Form legend of form for changing the page design.
-msgid "Change design"
-msgstr "غيّر التصميم"
-
-#. TRANS: Fieldset legend on profile design page to change profile page colours.
-msgid "Change colours"
-msgstr "تغيير الألوان"
-
-#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-msgid "Use defaults"
-msgstr "استخدم المبدئيات"
-
-#. TRANS: Label in form on profile design page.
-#. TRANS: Field contains file name on user's computer that could be that user's custom profile background image.
-msgid "Upload file"
-msgstr "ار�ع مل�ًا"
-
-#. TRANS: Instructions for form on profile design page.
-msgid ""
-"You can upload your personal background image. The maximum file size is 2MB."
-msgstr "تستطيع ر�ع صورتك الشخصية. أقصى حجم للمل� هو 2 م.ب."
-
-#. TRANS: Radio button on profile design page that will enable use of the uploaded profile image.
-msgctxt "RADIO"
-msgid "On"
-msgstr "مكّن"
-
-#. TRANS: Radio button on profile design page that will disable use of the uploaded profile image.
-msgctxt "RADIO"
-msgid "Off"
-msgstr "عطّل"
-
-#. TRANS: Success message displayed if design settings were saved after clicking "Use defaults".
-msgid "Design defaults restored."
-msgstr "استعيدت مبدئيات التصميم."
-
 #. TRANS: Exception. %s is an ID.
 #, fuzzy, php-format
 msgid "Unable to find services for %s."
 msgstr "استخدم هذا النموذج لتعدل تطبيقك."
 
 #. TRANS: Form legend for removing the favourite status for a favourite notice.
-#. TRANS: Title for button text for removing the favourite status for a favourite notice.
 msgid "Disfavor this notice"
 msgstr "ألغ� ت�ضيل هذا الإشعار"
 
 #. TRANS: Button text for removing the favourite status for a favourite notice.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Disfavor favorite"
-msgstr "ألغ� ت�ضيل الم�ضلة"
+msgstr "ألغ� الت�ضيل"
+
+#. TRANS: Button title for removing the favourite status for a favourite notice.
+msgid "Remove this notice from your list of favorite notices."
+msgstr "أزل هذا الإشعار من قائمة إشعاراتك الم�ضلة."
 
 #. TRANS: Form legend for adding the favourite status to a notice.
-#. TRANS: Title for button text for adding the favourite status to a notice.
 msgid "Favor this notice"
 msgstr "�ضّل هذا الإشعار"
 
 #. TRANS: Button text for adding the favourite status to a notice.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Favor"
 msgstr "�ضّل"
 
+#. TRANS: Button title for adding the favourite status to a notice.
+msgid "Add this notice to your list of favorite notices."
+msgstr "أض� هذا الإشعار إلى قائمة إشعاراتك الم�ضلة."
+
 #. TRANS: Feed type name.
 msgid "RSS 1.0"
 msgstr "آرإس​إس 1.0"
@@ -8186,6 +7702,10 @@ msgstr "أتوم"
 msgid "FOAF"
 msgstr "FOAF"
 
+#. TRANS: Feed type name. See http://activitystrea.ms/
+msgid "Activity Streams"
+msgstr "آكت�تي ستريمز"
+
 #. TRANS: Client exception thrown when an imported feed does not have an author.
 msgid "No author in the feed."
 msgstr ""
@@ -8197,10 +7717,9 @@ msgstr ""
 
 #. TRANS: Header for feed links (h2).
 msgid "Feeds"
-msgstr ""
+msgstr "التغذيات"
 
 #. TRANS: List element on gallery action page to show all tags.
-#, fuzzy
 msgctxt "TAGS"
 msgid "All"
 msgstr "الكل"
@@ -8218,6 +7737,27 @@ msgstr ""
 msgid "Grant this user the \"%s\" role"
 msgstr ""
 
+#. TRANS: Header for mini list of group members on a group page (h2).
+msgid "Members"
+msgstr "الأعضاء"
+
+#. TRANS: Link to all group members from mini list of group members if group has more than n members.
+msgid "All members"
+msgstr "جميع الأعضاء"
+
+#. TRANS: Header for mini list of users with a pending membership request on a group page (h2).
+msgid "Pending"
+msgstr "لمعلقون"
+
+#. TRANS: Header for mini list of users that are blocked in a group page (h2).
+msgid "Blocked"
+msgstr "ممنوع"
+
+#. TRANS: Title for list of group administrators on a group page.
+msgctxt "TITLE"
+msgid "Admins"
+msgstr "الإداريون"
+
 #. TRANS: Button text for the form that will block a user from a group.
 msgctxt "BUTTON"
 msgid "Block"
@@ -8225,18 +7765,16 @@ msgstr "امنع"
 
 #. TRANS: Submit button title.
 msgctxt "TOOLTIP"
-msgid "Block this user"
-msgstr "امنع هذا المستخدم"
+msgid "Block this user so that they can no longer post messages to it."
+msgstr "امنع هذا المستخدم لكي لا يتمكن من الإرسال مجددا."
 
 #. TRANS: Field title on group edit form.
-#, fuzzy
 msgid "URL of the homepage or blog of the group or topic."
-msgstr "مسار ص�حة هذا التطبيق"
+msgstr "مسار موقع أو مدونة المجموعة أو الموضوع."
 
 #. TRANS: Text area title for group description when there is no text limit.
-#, fuzzy
 msgid "Describe the group or topic."
-msgstr "ص�� المجموعة أو الموضوع"
+msgstr "ص�� المجموعة أو الموضوع."
 
 #. TRANS: Text area title for group description.
 #. TRANS: %d is the number of characters available for the description.
@@ -8251,10 +7789,10 @@ msgstr[4] "ص�� المجموعة أو الموضوع"
 msgstr[5] "ص�� المجموعة أو الموضوع"
 
 #. TRANS: Field title on group edit form.
-#, fuzzy
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\"."
-msgstr "مكان تواجدك، على سبيل المثال \"المدينة، الولاية (أو المنطقة)، الدولة\""
+msgstr ""
+"مكان المجموعة، على سبيل المثال \"المدينة، الولاية (أو المنطقة)، الدولة\"."
 
 #. TRANS: Field label on group edit form.
 msgid "Aliases"
@@ -8279,87 +7817,24 @@ msgstr[5] ""
 #. TRANS: Checkbox field title on group edit form to mark a group private.
 msgid ""
 "New members must be approved by admin and all posts are forced to be private."
-msgstr ""
+msgstr "يجب أن يوا�ق إداري على الأعضاء الجدد وستكون كل المنشورات خاصة."
 
 #. TRANS: Indicator in group members list that this user is a group administrator.
-#, fuzzy
 msgctxt "GROUPADMIN"
 msgid "Admin"
 msgstr "إداري"
 
-#. TRANS: Menu item in the group navigation page.
-msgctxt "MENU"
-msgid "Group"
-msgstr ""
-
-#. TRANS: Tooltip for menu item in the group navigation page.
-#. TRANS: %s is the nickname of the group.
-#, php-format
-msgctxt "TOOLTIP"
-msgid "%s group"
-msgstr ""
-
-#. TRANS: Menu item in the group navigation page.
-msgctxt "MENU"
-msgid "Members"
-msgstr ""
-
-#. TRANS: Tooltip for menu item in the group navigation page.
-#. TRANS: %s is the nickname of the group.
-#, php-format
-msgctxt "TOOLTIP"
-msgid "%s group members"
-msgstr ""
-
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: %d is the number of pending members.
-#, php-format
-msgctxt "MENU"
-msgid "Pending members (%d)"
-msgid_plural "Pending members (%d)"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-msgstr[4] ""
-msgstr[5] ""
-
-#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: %s is the nickname of the group.
-#, fuzzy, php-format
-msgctxt "TOOLTIP"
-msgid "%s pending members"
-msgstr "أعضاء مجموعة %s"
-
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-msgctxt "MENU"
-msgid "Blocked"
-msgstr ""
-
-#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: %s is the nickname of the group.
-#, php-format
-msgctxt "TOOLTIP"
-msgid "%s blocked users"
-msgstr ""
-
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: Menu item in primary navigation panel.
-msgctxt "MENU"
-msgid "Admin"
-msgstr "إداري"
+#. TRANS: Group actions header (h2). Text hidden by default.
+#, fuzzy
+msgid "Group actions"
+msgstr "تصر�ات المستخدم"
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Edit %s group properties"
-msgstr ""
-
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-msgctxt "MENU"
-msgid "Logo"
-msgstr "الشعار"
+msgstr "عدل خصائص المجموعة %s"
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
@@ -8368,33 +7843,32 @@ msgctxt "TOOLTIP"
 msgid "Add or edit %s logo"
 msgstr "أض� شعارا ل%s أو عدله"
 
-#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: %s is the nickname of the group.
-#, php-format
-msgctxt "TOOLTIP"
-msgid "Add or edit %s design"
-msgstr "أض� تصميما ل%s أو عدله"
-
-#. TRANS: Group actions header (h2). Text hidden by default.
-#, fuzzy
-msgid "Group actions"
-msgstr "تصر�ات المستخدم"
+#. TRANS: Link text for link on user profile.
+msgctxt "MENU"
+msgid "Logo"
+msgstr "الشعار"
 
 #. TRANS: Title for groups with the most members section.
-#, fuzzy
 msgid "Popular groups"
-msgstr "إشعارات محبوبة"
+msgstr "مجموعات محبوبة"
 
 #. TRANS: Title for groups with the most posts section.
-#, fuzzy
 msgid "Active groups"
-msgstr "كل المجموعات"
+msgstr "مجموعات نشطة"
 
-#. TRANS: Title for group tag cloud section.
-#. TRANS: %s is a group name.
-#, php-format
-msgid "Tags in %s group's notices"
-msgstr "وسوم �ي إشعارات مجموعة %s"
+#. TRANS: Link description for seeing all groups.
+#. TRANS: Link description for seeing all lists.
+msgid "See all"
+msgstr "شاهد الكل"
+
+#. TRANS: Link title for seeing all groups.
+msgid "See all groups you belong to."
+msgstr "شاهد كل المجموعات التي تنتمي إليها."
+
+#. TRANS: Menu item title in personal group navigation menu.
+#. TRANS: %s is a username.
+msgid "Back to top"
+msgstr ""
 
 #. TRANS: Client exception 406
 msgid "This page is not available in a media type you accept"
@@ -8428,33 +7902,33 @@ msgid "Unknown file type"
 msgstr "نوع مل� غير معرو�"
 
 #. TRANS: Number of megabytes. %d is the number.
-#, fuzzy, php-format
+#, php-format
 msgid "%dMB"
 msgid_plural "%dMB"
-msgstr[0] "ميجابايت"
-msgstr[1] "ميجابايت"
-msgstr[2] "ميجابايت"
-msgstr[3] "ميجابايت"
-msgstr[4] "ميجابايت"
-msgstr[5] "ميجابايت"
+msgstr[0] "%d م‌ب"
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
+msgstr[5] ""
 
 #. TRANS: Number of kilobytes. %d is the number.
-#, fuzzy, php-format
+#, php-format
 msgid "%dkB"
 msgid_plural "%dkB"
-msgstr[0] "كيلوبايت"
-msgstr[1] "كيلوبايت"
-msgstr[2] "كيلوبايت"
-msgstr[3] "كيلوبايت"
-msgstr[4] "كيلوبايت"
-msgstr[5] "كيلوبايت"
+msgstr[0] "%d ك‌ب"
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
+msgstr[5] ""
 
 #. TRANS: Number of bytes. %d is the number.
 #, php-format
 msgid "%dB"
 msgid_plural "%dB"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%dB"
+msgstr[1] "%d ب"
 msgstr[2] ""
 msgstr[3] ""
 msgstr[4] ""
@@ -8489,13 +7963,42 @@ msgstr ""
 #. TRANS: Title for inbox tag cloud section.
 msgctxt "TITLE"
 msgid "Trends"
-msgstr ""
+msgstr "الراهن"
 
-#. TRANS: Button text for inviting more users to the StatusNet instance.
-#, fuzzy
+#. TRANS: Default button text for inviting more users to the StatusNet instance.
 msgctxt "BUTTON"
 msgid "Invite more colleagues"
-msgstr "دعوة مستخدمين جدد"
+msgstr "ادع� مزيدا من أصدقائك"
+
+#. TRANS: Form legend.
+msgid "Invite collegues"
+msgstr "ادع� أصدقاءك"
+
+#. TRANS: Field label for a list of e-mail addresses.
+msgid "Email addresses"
+msgstr "عناوين البريد الإلكتروني"
+
+#. TRANS: Field title for a list of e-mail addresses.
+msgid "Addresses of friends to invite (one per line)."
+msgstr "عناوين الأصدقاء الذين تريد دعوتهم (واحد لكل سطر)."
+
+#. TRANS: Field label for a personal message to send to invitees.
+msgid "Personal message"
+msgstr "رسالة شخصية"
+
+#. TRANS: Field title for a personal message to send to invitees.
+msgid "Optionally add a personal message to the invitation."
+msgstr "يمكنك إضا�ة رسالة شخصية اختيارية إلى الدعوة."
+
+#. TRANS: Send button for inviting friends
+#. TRANS: Button text for sending notice.
+msgctxt "BUTTON"
+msgid "Send"
+msgstr "أرسل"
+
+#. TRANS: Submit button title.
+msgid "Send invitations."
+msgstr "أرسل الدعوات."
 
 #. TRANS: Button text for joining a group.
 msgctxt "BUTTON"
@@ -8507,6 +8010,10 @@ msgctxt "BUTTON"
 msgid "Leave"
 msgstr "غادر"
 
+#. TRANS: Link title for seeing all lists.
+msgid "See all lists you have created."
+msgstr "شاهد كل القوائم التي أنشأتها."
+
 #. TRANS: Menu item for logging in to the StatusNet site.
 #. TRANS: Menu item in primary navigation panel.
 msgctxt "MENU"
@@ -8533,7 +8040,7 @@ msgstr "تأكيد عنوان البريد الإلكتروني"
 #. TRANS: Body for address confirmation email.
 #. TRANS: %1$s is the addressed user's nickname, %2$s is the StatusNet sitename,
 #. TRANS: %3$s is the URL to confirm at.
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "Hey, %1$s.\n"
 "\n"
@@ -8548,32 +8055,32 @@ msgid ""
 "Thanks for your time, \n"
 "%2$s\n"
 msgstr ""
-"مرحبًا، %s.\n"
+"مرحبًا، %1$s.\n"
 "\n"
-"لقد أدخل أحدهم قبل لحظات عنوان البريد الإلكتروني هذا على  %s.\n"
+"لقد أدخل أحدهم قبل لحظات عنوان البريد الإلكتروني هذا على %2$s.\n"
 "\n"
 "إذا كنت هو، وإذا كنت تريد تأكيد هذه المدخلة، �استخدم المسار أدناه:\n"
 "\n"
-" %s\n"
+"%3$s\n"
 "\n"
 "إذا كان الأمر خلا� ذلك، �تجاهل هذه الرسالة.\n"
 "\n"
 "شكرًا على الوقت الذي أمضيته، \n"
-"%s\n"
+"%2$s\n"
 
 #. TRANS: Subject of new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscribing user's nickname, %2$s is the StatusNet sitename.
 #. TRANS: Main body of new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscriber's long name, %2$s is the StatusNet sitename.
 #, php-format
-msgid "%1$s is now listening to your notices on %2$s."
-msgstr "%1$s يستمع الآن إلى إشعاراتك على %2$s."
+msgid "%1$s is now following you on %2$s."
+msgstr "%1$s يتابعك الآن على %2$s."
 
 #. TRANS: Subject of pending new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscribing user's nickname, %2$s is the StatusNet sitename.
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s would like to listen to your notices on %2$s."
-msgstr "%1$s يستمع الآن إلى إشعاراتك على %2$s."
+msgstr "يرغب %1$s �ي الاستماع إلى إشعاراتك على %2$s."
 
 #. TRANS: Main body of pending new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscriber's long name, %2$s is the StatusNet sitename.
@@ -8582,11 +8089,13 @@ msgid ""
 "%1$s would like to listen to your notices on %2$s. You may approve or reject "
 "their subscription at %3$s"
 msgstr ""
+"يرغب %1$s �ي الاستماع على إشعاراتك على %2$s. يمكن أن تقبل أو تر�ض اشتراكهم "
+"�ي %3$s."
 
 #. TRANS: Common footer block for StatusNet notification emails.
 #. TRANS: %1$s is the StatusNet sitename,
 #. TRANS: %2$s is a link to the addressed user's e-mail settings.
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "Faithfully yours,\n"
 "%1$s.\n"
@@ -8594,22 +8103,17 @@ msgid ""
 "----\n"
 "Change your email address or notification options at %2$s"
 msgstr ""
-"%1$s يستمع الآن إلى إشعاراتك على %2$s.\n"
-"\n"
-"%3$s\n"
-"\n"
-"%4$s%5$s%6$s\n"
-"بو�اء،\n"
-"%7$s.\n"
+"مع تحياتنا،\n"
+"%1$s.\n"
 "\n"
 "----\n"
-"غيّر خيارات البريد الإلكتروني والإشعار �ي %8$s\n"
+"غيّر عنوان البريد الإلكتروني أو إعدادات التنبيه �ي %2$s"
 
 #. TRANS: Profile info line in notification e-mail.
 #. TRANS: %s is a URL.
-#, fuzzy, php-format
+#, php-format
 msgid "Profile: %s"
-msgstr "المل� الشخصي"
+msgstr "المل� الشخصي: %s"
 
 #. TRANS: Profile info line in notification e-mail.
 #. TRANS: %s is biographical information.
@@ -8624,6 +8128,8 @@ msgid ""
 "If you believe this account is being used abusively, you can block them from "
 "your subscribers list and report as spam to site administrators at %s."
 msgstr ""
+"إذا كنت تعتقد أن هذا الحساب يساء استخدامه، يمكن أن تمنعه من الاشتراك بك وأن "
+"تبلغ إداريي الموقع أنه سخام �ي %s."
 
 #. TRANS: Subject of notification mail for new posting email address.
 #. TRANS: %s is the StatusNet sitename.
@@ -8657,13 +8163,13 @@ msgstr "تأكيد الرسالة القصيرة"
 #. TRANS: %s is the addressed user's nickname.
 #, php-format
 msgid "%s: confirm you own this phone number with this code:"
-msgstr ""
+msgstr "%s: أكّد أن هذا رقم هات�ك بهذا الرمز:"
 
 #. TRANS: Subject for 'nudge' notification email.
 #. TRANS: %s is the nudging user.
-#, fuzzy, php-format
+#, php-format
 msgid "You have been nudged by %s"
-msgstr "لقد نبهك %s"
+msgstr "يريد %s أن يل�ت انتباهك"
 
 #. TRANS: Body for 'nudge' notification email.
 #. TRANS: %1$s is the nuding user's long name, $2$s is the nudging user's nickname,
@@ -8679,6 +8185,13 @@ msgid ""
 "\n"
 "Don't reply to this email; it won't get to them."
 msgstr ""
+"يتساءل %1$s (%2$s) عن أحوالك مؤخرا ويدعوك إلى نشر بعض المستجدات.\n"
+"\n"
+"دعنا نراك!\n"
+"\n"
+"%3$s\n"
+"\n"
+"لا ترد على هذا البريد؛ لأنه لن يصل إلى المستخدم."
 
 #. TRANS: Subject for direct-message notification email.
 #. TRANS: %s is the sending user's nickname.
@@ -8703,12 +8216,23 @@ msgid ""
 "\n"
 "Don't reply to this email; it won't get to them."
 msgstr ""
+"أرسل لك %1$s (%2$s) رسالة خاصة:\n"
+"\n"
+"------------------------------------------------------\n"
+"%3$s\n"
+"------------------------------------------------------\n"
+"\n"
+"يمكن أن ترد عليها هنا:\n"
+"\n"
+"%4$s\n"
+"\n"
+"لا ترد على هذا البريد؛ لأنه لن يصل إلى المستخدم."
 
 #. TRANS: Subject for favorite notification e-mail.
 #. TRANS: %1$s is the adding user's long name, %2$s is the adding user's nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s (@%2$s) added your notice as a favorite"
-msgstr "لقد أضا� %s (@%s) إشعارك إلى م�ضلاته"
+msgstr "أضا� %1$s (@%2$s) إشعارك إلى م�ضلاته"
 
 #. TRANS: Body for favorite notification e-mail.
 #. TRANS: %1$s is the adding user's long name, $2$s is the date the notice was created,
@@ -8731,6 +8255,19 @@ msgid ""
 "\n"
 "%5$s"
 msgstr ""
+"أضا� %1$s (@%7$s) للتو إشعارك �ي %2$s إلى م�ضلاته.\n"
+"\n"
+"مسار إشعارك:\n"
+"\n"
+"%3$s\n"
+"\n"
+"نص إشعارك:\n"
+"\n"
+"%4$s\n"
+"\n"
+"يمكن أن تشاهد قائمة بم�ضلات %1$s هنا:\n"
+"\n"
+"%5$s"
 
 #. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
 #, php-format
@@ -8752,7 +8289,7 @@ msgstr "أرسل %1$s (@%2$s) إشعارًا إليك"
 #. TRANS: Body of @-reply notification e-mail.
 #. TRANS: %1$s is the sending user's name, $2$s is the StatusNet sitename,
 #. TRANS: %3$s is a URL to the notice, %4$s is the notice text,
-#. TRANS: %5$s is a URL to the full conversion if it exists (otherwise empty),
+#. TRANS: %5$s is the text "The full conversation can be read here:" and a URL to the full conversion if it exists (otherwise empty),
 #. TRANS: %6$s is a URL to reply to the notice, %7$s is a URL to all @-replies for the addressed user,
 #, php-format
 msgid ""
@@ -8774,22 +8311,43 @@ msgid ""
 "\n"
 "%7$s"
 msgstr ""
+"أرسل %1$s للتو إشعارك إليك ('رد @') على %2$s.\n"
+"\n"
+"الإشعار موجود هنا:\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"نصه:\n"
+"\n"
+"\t%4$s\n"
+"\n"
+"%5$sيمكن أن ترد هنا:\n"
+"\n"
+"\t%6$s\n"
+"\n"
+"قائمة بكل الردود (@) إليك موجودة هنا:\n"
+"\n"
+"%7$s"
 
 #. TRANS: Subject of group join notification e-mail.
 #. TRANS: %1$s is the joining user's nickname, %2$s is the group name, and %3$s is the StatusNet sitename.
+#, fuzzy, php-format
+msgid "%1$s has joined your group %2$s on %3$s"
+msgstr "انضم %1$s للمجموعة %2$s على %3$s."
+
 #. TRANS: Main body of group join notification e-mail.
 #. TRANS: %1$s is the subscriber's long name, %2$s is the group name, and %3$s is the StatusNet sitename,
 #. TRANS: %4$s is a block of profile info about the subscriber.
 #. TRANS: %5$s is a link to the addressed user's e-mail settings.
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s has joined your group %2$s on %3$s."
-msgstr "%1$s انضم للمجموعة %2$s"
+msgstr "انضم %1$s للمجموعة %2$s على %3$s."
 
 #. TRANS: Subject of pending group join request notification e-mail.
 #. TRANS: %1$s is the joining user's nickname, %2$s is the group name, and %3$s is the StatusNet sitename.
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s wants to join your group %2$s on %3$s."
-msgstr "الإشعارات التي �ضلها %1$s �ي %2$s!"
+msgstr "يرغب %1$s �ي الانضمام إلى مجموعتك %2$s على %3$s."
 
 #. TRANS: Main body of pending group join request notification e-mail.
 #. TRANS: %1$s is the subscriber's long name, %2$s is the group name, and %3$s is the StatusNet sitename,
@@ -8801,37 +8359,34 @@ msgid ""
 msgstr ""
 
 #. TRANS: Client error displayed when trying to access a mailbox that is not of the logged in user.
-#, fuzzy
 msgid "Only the user can read their own mailboxes."
-msgstr "يستطيع المستخدمون الوالجون وحدهم تكرار الإشعارات."
+msgstr "يستطيع المستخدمون الوالجون وحدهم قراءة صناديق بريدهم."
 
 #. TRANS: Message displayed when there are no private messages in the inbox of a user.
 msgid ""
 "You have no private messages. You can send private message to engage other "
 "users in conversation. People can send you messages for your eyes only."
 msgstr ""
+"ليست لديك رسائل خاصة. يمكنك إرسال الرسائل الخاصة إلى مستخدمين آخرين للخوض �ي "
+"محادثات معهم. يمكن أن يرسل الناس رسائل لك لا يراها غيرك."
 
 #. TRANS: Menu item in mailbox menu. Leads to incoming private messages.
-#, fuzzy
 msgctxt "MENU"
 msgid "Inbox"
 msgstr "صندوق الوارد"
 
 #. TRANS: Menu item title in mailbox menu. Leads to incoming private messages.
-#, fuzzy
 msgid "Your incoming messages."
-msgstr "رسائلك الواردة"
+msgstr "الرسائل الواردة إليك"
 
 #. TRANS: Menu item in mailbox menu. Leads to outgoing private messages.
-#, fuzzy
 msgctxt "MENU"
 msgid "Outbox"
 msgstr "صندوق الصادر"
 
 #. TRANS: Menu item title in mailbox menu. Leads to outgoing private messages.
-#, fuzzy
 msgid "Your sent messages."
-msgstr "رسائلك الم�رسلة"
+msgstr "الرسائل التي أرسلتها."
 
 #. TRANS: Error message in incoming mail handler used when an incoming e-mail cannot be processed.
 msgid "Could not parse message."
@@ -8842,9 +8397,8 @@ msgid "Not a registered user."
 msgstr "ليس مستخدمًا مسجلًا."
 
 #. TRANS: Error message in incoming mail handler used when an incoming e-mail is not from a user's incoming e-mail address.
-#, fuzzy
 msgid "Sorry, that is not your incoming email address."
-msgstr "هذا ليس عنوان بريدك الإلكتروني."
+msgstr "عذرا، هذا ليس عنوان بريدك الإلكتروني الوارد."
 
 #. TRANS: Error message in incoming mail handler used when no incoming e-mail is allowed.
 #, fuzzy
@@ -8853,9 +8407,9 @@ msgstr "لا عنوان بريد إلكتروني وارد."
 
 #. TRANS: Error message in incoming mail handler used when an incoming e-mail is of an unsupported type.
 #. TRANS: %s is the unsupported type.
-#, fuzzy, php-format
+#, php-format
 msgid "Unsupported message type: %s."
-msgstr "نوع رسالة غير مدعوم: %s"
+msgstr "نوع الرسالة غير مدعوم: %s."
 
 #. TRANS: Form legend for form to make a user a group admin.
 msgid "Make user an admin of the group"
@@ -8868,8 +8422,8 @@ msgstr "اجعله إداريًا"
 
 #. TRANS: Submit button title.
 msgctxt "TOOLTIP"
-msgid "Make this user an admin"
-msgstr "اجعل هذا المستخدم إداريًا"
+msgid "Make this user an admin."
+msgstr "اجعل هذا المستخدم إداريًا."
 
 #. TRANS: Client exception thrown when a database error was thrown during a file upload operation.
 msgid "There was a database error while saving your file. Please try again."
@@ -8911,14 +8465,12 @@ msgstr "أرسل إشعارًا مباشرًا"
 #. TRANS: Label entry in drop-down selection box in direct-message inbox/outbox.
 #. TRANS: This is the default entry in the drop-down box, doubling as instructions
 #. TRANS: and a brake against accidental submissions with the first user in the list.
-#, fuzzy
 msgid "Select recipient:"
-msgstr "اختر وسمًا لترشيحه"
+msgstr "اختر مستلما:"
 
-#. TRANS Entry in drop-down selection box in direct-message inbox/outbox when no one is available to message.
-#, fuzzy
+#. TRANS: Entry in drop-down selection box in direct-message inbox/outbox when no one is available to message.
 msgid "No mutual subscribers."
-msgstr "غير مشترك!"
+msgstr "لم تتبادل الاشتراكات مع أحد."
 
 #. TRANS: Dropdown label in direct notice form.
 msgid "To"
@@ -8930,9 +8482,8 @@ msgid "Send"
 msgstr "أرسل"
 
 #. TRANS: Header in message list.
-#, fuzzy
 msgid "Messages"
-msgstr "رسالة"
+msgstr "الرسائل"
 
 #. TRANS: Followed by notice source (usually the client used to send the notice).
 #. TRANS: Followed by notice source.
@@ -8940,7 +8491,6 @@ msgid "from"
 msgstr "من"
 
 #. TRANS: A possible notice source (web interface).
-#, fuzzy
 msgctxt "SOURCE"
 msgid "web"
 msgstr "الوب"
@@ -8951,10 +8501,9 @@ msgid "xmpp"
 msgstr ""
 
 #. TRANS: A possible notice source (e-mail).
-#, fuzzy
 msgctxt "SOURCE"
 msgid "mail"
-msgstr "البريد الإلكتروني"
+msgstr "البريد"
 
 #. TRANS: A possible notice source (OpenMicroBlogging).
 msgctxt "SOURCE"
@@ -8988,9 +8537,13 @@ msgstr ""
 msgid "You must implement either adaptNoticeListItem() or showNotice()."
 msgstr ""
 
+#. TRANS: Link description to show more items in a list.
+msgid "More â–¼"
+msgstr "مزيد ▼"
+
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 msgid "Nickname cannot be empty."
-msgstr ""
+msgstr "لا يمك ترك خانة الاسم المستعار خالية."
 
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 #, php-format
@@ -9017,9 +8570,8 @@ msgid "Attach"
 msgstr "أر�ق"
 
 #. TRANS: Title for input field to attach a file to a notice.
-#, fuzzy
 msgid "Attach a file."
-msgstr "أر�ق مل�ًا"
+msgstr "أر�ق مل�ًا."
 
 #. TRANS: Field label to add location to a notice.
 msgid "Share my location"
@@ -9036,14 +8588,9 @@ msgid ""
 msgstr ""
 
 #. TRANS: Separator in profile addressees list.
-#, fuzzy
 msgctxt "SEPARATOR"
 msgid ", "
-msgstr " Ùˆ "
-
-#. TRANS: Start of profile addressees list.
-msgid " â–¸ "
-msgstr ""
+msgstr "Ùˆ "
 
 #. TRANS: Used in coordinates as abbreviation of north.
 msgid "N"
@@ -9068,7 +8615,7 @@ msgstr "غ"
 #. TRANS: %7$s is longitude seconds, %8$s is E (east) or W (west) depending on longitude,
 #, php-format
 msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
-msgstr ""
+msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 
 #. TRANS: Followed by geo location.
 msgid "at"
@@ -9083,61 +8630,37 @@ msgid "Repeated by"
 msgstr "كرره"
 
 #. TRANS: Link title in notice list item to reply to a notice.
-msgid "Reply to this notice"
-msgstr "ر�د على هذا الإشعار"
+msgid "Reply to this notice."
+msgstr "ر�د على هذا الإشعار."
 
 #. TRANS: Link text in notice list item to reply to a notice.
 msgid "Reply"
 msgstr "ر�د"
 
 #. TRANS: Link title in notice list item to delete a notice.
-msgid "Delete this notice"
-msgstr "احذ� هذا الإشعار"
+msgid "Delete this notice from the timeline."
+msgstr "احذ� هذا الإشعار من المسار الزمني."
 
 #. TRANS: Title for repeat form status in notice list when a notice has been repeated.
-#, fuzzy
 msgid "Notice repeated."
-msgstr "الإشعار مكرر"
+msgstr "كرّر الإشعار"
 
 #. TRANS: Field label for notice text.
 msgid "Update your status..."
-msgstr ""
+msgstr "حدّث حالتك..."
 
 #. TRANS: Form legend of form to nudge/ping another user.
 msgid "Nudge this user"
 msgstr "نبّه هذا المستخدم"
 
 #. TRANS: Button text to nudge/ping another user.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Nudge"
 msgstr "نبّه"
 
 #. TRANS: Button title to nudge/ping another user.
-#, fuzzy
 msgid "Send a nudge to this user."
-msgstr "أرسل رسالة مباشرة إلى هذا المستخدم"
-
-#. TRANS: Exception thrown when creating a new profile fails in OAuth store.
-msgid "Error inserting new profile."
-msgstr ""
-
-#. TRANS: Exception thrown when creating a new avatar fails in OAuth store.
-msgid "Error inserting avatar."
-msgstr ""
-
-#. TRANS: Exception thrown when creating a remote profile fails in OAuth store.
-msgid "Error inserting remote profile."
-msgstr ""
-
-#. TRANS: Exception thrown when a notice is denied because it has been sent before.
-msgid "Duplicate notice."
-msgstr ""
-
-#. TRANS: Exception thrown when creating a new subscription fails in OAuth store.
-#, fuzzy
-msgid "Could not insert new subscription."
-msgstr "تعذّر إدراج اشتراك جديد."
+msgstr "أرسل تنبيها للمستخدم."
 
 #. TRANS: Server exception thrown in oEmbed action if no API endpoint is available.
 #, fuzzy
@@ -9145,202 +8668,178 @@ msgid "No oEmbed API endpoint available."
 msgstr "المراسلة ال�ورية غير متو�رة."
 
 #. TRANS: Field label for list.
-#, fuzzy
 msgctxt "LABEL"
 msgid "List"
-msgstr "وصلات"
+msgstr "اللائحة"
 
 #. TRANS: Field title for list.
-#, fuzzy
 msgid "Change the list (letters, numbers, -, ., and _ are allowed)."
-msgstr ""
-"س�م ن�سك (حرو� وأرقام و \"-\" و \".\" و \"_\")، ا�صلها ب�اصلة (',') أو مسا�ة."
+msgstr "غير القائمة (يسمح بحرو� وأرقام و \"-\" و \".\" و \"_\")"
 
 #. TRANS: Field title for description of list.
-#, fuzzy
 msgid "Describe the list or topic."
-msgstr "ص�� المجموعة أو الموضوع"
+msgstr "ص�� القائمة أو الموضوع."
 
 #. TRANS: Field title for description of list.
 #. TRANS: %d is the maximum number of characters for the description.
-#, fuzzy, php-format
+#, php-format
 msgid "Describe the list or topic in %d character."
 msgid_plural "Describe the list or topic in %d characters."
-msgstr[0] "ص�� المجموعة أو الموضوع"
-msgstr[1] "ص�� المجموعة أو الموضوع"
-msgstr[2] "ص�� المجموعة أو الموضوع"
-msgstr[3] "ص�� المجموعة أو الموضوع"
-msgstr[4] "ص�� المجموعة أو الموضوع"
-msgstr[5] "ص�� المجموعة أو الموضوع"
+msgstr[0] ""
+msgstr[1] "ص�� القائمة أو الموضوع �ي حر� واحد"
+msgstr[2] "ص�� المجموعة أو الموضوع �ي حر�ين"
+msgstr[3] "ص�� المجموعة أو الموضوع �ي %d حرو�"
+msgstr[4] "ص�� المجموعة أو الموضوع �ي %d حر�ًا"
+msgstr[5] "ص�� المجموعة أو الموضوع �ي %d حر�"
 
 #. TRANS: Button title to delete a list.
-#, fuzzy
 msgid "Delete this list."
-msgstr "احذ� هذا المستخدم."
+msgstr "احذ� هذه القائمة."
 
 #. TRANS: Header in list edit form.
 msgid "Add or remove people"
-msgstr ""
+msgstr "إضا�ة أو إزالة أشخاص"
 
 #. TRANS: Header in list edit form.
-#, fuzzy
 msgctxt "HEADER"
 msgid "Search"
 msgstr "ابحث"
 
 #. TRANS: Menu item in list navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "List"
-msgstr "وصلات"
+msgstr "القائمة"
 
 #. TRANS: Menu item title in list navigation panel.
 #. TRANS: %1$s is a list, %2$s is a nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s list by %2$s."
-msgstr "%1$s Ùˆ %2$s"
+msgstr "قائمة %1$s التي أنشأها %2$s."
 
 #. TRANS: Menu item in list navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Listed"
-msgstr "الرخصة"
+msgstr "المدرجون"
 
 #. TRANS: Menu item in list navigation panel.
 #. TRANS: Menu item in local navigation menu.
-#, fuzzy
 msgctxt "MENU"
 msgid "Subscribers"
 msgstr "المشتركون"
 
 #. TRANS: Menu item title in list navigation panel.
 #. TRANS: %1$s is a list, %2$s is a nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "Subscribers to %1$s list by %2$s."
-msgstr "الردود على %1$s، الص�حة %2$d"
+msgstr "المشتركون �ي قائمة %1$s التي أنشأها %2$s."
 
 #. TRANS: Menu item in list navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Edit"
-msgstr "عدّل"
+msgstr "عدل"
 
 #. TRANS: Menu item title in list navigation panel.
 #. TRANS: %s is a list.
-#, fuzzy, php-format
+#, php-format
 msgid "Edit %s list by you."
-msgstr "عدّل مجموعة %s"
-
-#. TRANS: Link description for link to list of users tagged with a tag.
-#, fuzzy
-msgid "Tagged"
-msgstr "الوسم"
+msgstr "عدل لائحة %s التي أنشأتها."
 
 #. TRANS: Title for link to edit list settings.
-#, fuzzy
 msgid "Edit list settings."
-msgstr "عدّل إعدادات المل� الشخصي."
+msgstr "عدّل إعدادات اللائحة."
 
 #. TRANS: Text for link to edit list settings.
 msgid "Edit"
 msgstr "عدّل"
 
 #. TRANS: Privacy mode text in list list item for private list.
-#, fuzzy
 msgctxt "MODE"
 msgid "Private"
 msgstr "خاص"
 
 #. TRANS: Menu item in the group navigation page.
-#, fuzzy
 msgctxt "MENU"
 msgid "List Subscriptions"
-msgstr "الاشتراكات"
+msgstr "الاشتراكات باللائحات"
 
 #. TRANS: Tooltip for menu item in the group navigation page.
 #. TRANS: %s is a user nickname.
-#, fuzzy, php-format
+#, php-format
 msgctxt "TOOLTIP"
 msgid "Lists subscribed to by %s."
-msgstr "الأشخاص المشتركون ب%s"
+msgstr "الائحات التي اشترك بها %s."
 
 #. TRANS: Menu item in the group navigation page.
 #. TRANS: %s is a user nickname.
-#, fuzzy, php-format
+#, php-format
 msgctxt "MENU"
 msgid "Lists with %s"
-msgstr "الإشعارات الموسومة ب%s"
+msgstr "اللائحات التي %s �يها"
 
 #. TRANS: Tooltip for menu item in the group navigation page.
 #. TRANS: %s is a user nickname.
-#, fuzzy, php-format
+#, php-format
 msgctxt "TOOLTIP"
 msgid "Lists with %s."
-msgstr "الإشعارات الموسومة ب%s"
+msgstr "اللائحات التي %s �يها."
 
 #. TRANS: Menu item in the group navigation page.
 #. TRANS: %s is a user nickname.
 #, php-format
 msgctxt "MENU"
 msgid "Lists by %s"
-msgstr ""
+msgstr "لائحات %s"
 
 #. TRANS: Tooltip for menu item in the group navigation page.
 #. TRANS: %s is a user nickname.
-#, fuzzy, php-format
+#, php-format
 msgctxt "TOOLTIP"
 msgid "Lists by %s."
-msgstr "%1$s Ùˆ %2$s"
+msgstr "لائحات %s."
 
 #. TRANS: Label in lists widget.
-#, fuzzy
 msgctxt "LABEL"
 msgid "Your lists"
-msgstr "إشعارات محبوبة"
+msgstr "لائحاتك"
 
 #. TRANS: Fieldset legend in lists widget.
-#, fuzzy
 msgctxt "LEGEND"
 msgid "Edit lists"
-msgstr "ليس وسم أشخاص صالح: %s."
+msgstr "عدل اللائحات"
 
 #. TRANS: Label in self tags widget.
-#, fuzzy
 msgctxt "LABEL"
 msgid "Tags"
 msgstr "الوسوم"
 
 #. TRANS: Title for section contaning lists with the most subscribers.
-#, fuzzy
 msgid "Popular lists"
-msgstr "إشعارات محبوبة"
+msgstr "لائحات محبوبة"
 
 #. TRANS: List summary. %1$d is the number of users in the list,
 #. TRANS: %2$d is the number of subscribers to the list.
-#, fuzzy, php-format
+#, php-format
 msgid "Listed: %1$d Subscribers: %2$d"
-msgstr "مشتركو %1$s, الص�حة %2$d"
+msgstr "المدرجون: %1$d المشتركون: %2$d"
 
 #. TRANS: Title for page that displays which lists current user is part of.
-#, fuzzy, php-format
+#, php-format
 msgid "Lists with you"
-msgstr "لم ي�عثرعلى المستخدم."
+msgstr "اللائحات التي أنت �يها"
 
 #. TRANS: Title for page that displays which lists a user is part of.
 #. TRANS: %s is a profile name.
-#, fuzzy, php-format
+#, php-format
 msgid "Lists with %s"
-msgstr "الإشعارات الموسومة ب%s"
+msgstr "اللائحات التي %s �يها"
 
 #. TRANS: Title for page that displays lists a user has subscribed to.
-#, fuzzy
 msgid "List subscriptions"
-msgstr "اشتراكات %s"
+msgstr "الاشتراكات باللائحات"
 
 #. TRANS: Menu item in personal group navigation menu.
 #. TRANS: Menu item in settings navigation panel.
 #. TRANS: Menu item in local navigation menu.
-#, fuzzy
 msgctxt "MENU"
 msgid "Profile"
 msgstr "المل� الشخصي"
@@ -9350,13 +8849,11 @@ msgid "Your profile"
 msgstr "مل�ك الشخصي"
 
 #. TRANS: Menu item in personal group navigation menu.
-#, fuzzy
 msgctxt "MENU"
 msgid "Replies"
 msgstr "الردود"
 
 #. TRANS: Menu item in personal group navigation menu.
-#, fuzzy
 msgctxt "MENU"
 msgid "Favorites"
 msgstr "الم�ضلات"
@@ -9368,10 +8865,9 @@ msgid "User"
 msgstr "المستخدم"
 
 #. TRANS: Menu item in personal group navigation menu.
-#, fuzzy
 msgctxt "MENU"
 msgid "Messages"
-msgstr "رسالة"
+msgstr "الرسائل"
 
 #. TRANS: Menu item title in personal group navigation menu.
 msgid "Your incoming messages"
@@ -9384,32 +8880,36 @@ msgstr "غير معرو�ة"
 #. TRANS: Plugin admin panel controls
 msgctxt "plugin"
 msgid "Disable"
-msgstr ""
+msgstr "عطل"
 
 #. TRANS: Plugin admin panel controls
 msgctxt "plugin"
 msgid "Enable"
-msgstr ""
+msgstr "�عّل"
 
+#. TRANS: Plugin description for a disabled plugin.
 msgctxt "plugin-description"
-msgid "(Plugin descriptions unavailable when disabled.)"
-msgstr ""
+msgid ""
+"(The plugin description is unavailable when a plugin has been disabled.)"
+msgstr "(وص� الملحق غير متاح عندما يعطل المحلق)"
 
 #. TRANS: Menu item in primary navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Settings"
 msgstr "إعدادات"
 
 #. TRANS: Menu item title in primary navigation panel.
-#, fuzzy
 msgid "Change your personal settings."
-msgstr "غيّر إعدادات مل�ك الشخصي"
+msgstr "غيّر إعدادات مل�ك الشخصي."
+
+#. TRANS: Menu item in primary navigation panel.
+msgctxt "MENU"
+msgid "Admin"
+msgstr "أدر"
 
 #. TRANS: Menu item title in primary navigation panel.
-#, fuzzy
 msgid "Site configuration."
-msgstr "ضبط المستخدم"
+msgstr "ضبط الموقع."
 
 #. TRANS: Menu item in primary navigation panel.
 msgctxt "MENU"
@@ -9417,34 +8917,27 @@ msgid "Logout"
 msgstr "اخرج"
 
 #. TRANS: Menu item title in primary navigation panel.
-#, fuzzy
 msgid "Logout from the site."
-msgstr "اخرج من الموقع"
+msgstr "اخرج من الموقع."
 
 #. TRANS: Menu item title in primary navigation panel.
-#, fuzzy
 msgid "Login to the site."
-msgstr "ل�ج إلى الموقع"
+msgstr "ل�ج إلى الموقع."
 
-#. TRANS: Menu item in primary navigation panel.
-msgctxt "MENU"
-msgid "Search"
-msgstr "ابحث"
-
-#. TRANS: Menu item title in primary navigation panel.
-#, fuzzy
-msgid "Search the site."
-msgstr "ابحث �ي الموقع"
+msgid "This profile has been silenced by site moderators"
+msgstr ""
 
 #. TRANS: H2 text for user subscription statistics.
-#, fuzzy
 msgid "Following"
-msgstr "تابع"
+msgstr "يتابع"
 
 #. TRANS: H2 text for user subscriber statistics.
-#, fuzzy
 msgid "Followers"
-msgstr "تابع"
+msgstr "المتابعون"
+
+#. TRANS: H2 text for user statistics.
+msgid "Statistics"
+msgstr "إحصاءات"
 
 #. TRANS: Label for user statistics.
 msgid "User ID"
@@ -9454,10 +8947,6 @@ msgstr "هوية المستخدم"
 msgid "Member since"
 msgstr "عضو منذ"
 
-#. TRANS: Label for user statistics.
-msgid "Notices"
-msgstr "الإشعارات"
-
 #. TRANS: Label for user statistics.
 #. TRANS: Average count of posts made per day since account registration.
 msgid "Daily average"
@@ -9468,9 +8957,8 @@ msgid "Groups"
 msgstr "مجموعات"
 
 #. TRANS: H2 text for user list membership statistics.
-#, fuzzy
 msgid "Lists"
-msgstr "الحدود"
+msgstr "اللائحات"
 
 #. TRANS: Server error displayed when using an unimplemented method.
 msgid "Unimplemented method."
@@ -9481,7 +8969,6 @@ msgid "User groups"
 msgstr "مجموعات المستخدمين"
 
 #. TRANS: Menu item in search group navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Recent tags"
 msgstr "الوسوم الحديثة"
@@ -9491,13 +8978,11 @@ msgid "Recent tags"
 msgstr "الوسوم الحديثة"
 
 #. TRANS: Menu item in search group navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Featured"
-msgstr "م�ختارون"
+msgstr "مميزون"
 
 #. TRANS: Menu item in search group navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Popular"
 msgstr "محبوبة"
@@ -9505,7 +8990,7 @@ msgstr "محبوبة"
 #. TRANS: Title for inbox tag cloud section.
 msgctxt "TITLE"
 msgid "Trending topics"
-msgstr ""
+msgstr "المواضيع الراهنة"
 
 #. TRANS: Client error displayed when return-to was defined without a target.
 msgid "No return-to arguments."
@@ -9516,29 +9001,26 @@ msgid "Repeat this notice?"
 msgstr "أأكرّر هذا الإشعار؟"
 
 #. TRANS: Button title to repeat a notice on notice repeat form.
-#, fuzzy
 msgid "Repeat this notice."
-msgstr "كرّر هذا الإشعار"
+msgstr "كرّر هذا الإشعار."
 
 #. TRANS: Description of role revoke form. %s is the role to be revoked.
-#, fuzzy, php-format
+#, php-format
 msgid "Revoke the \"%s\" role from this user"
-msgstr "امنع هذا المستخدم من هذه المجموعة"
+msgstr "اسحب دور \"%s\" من هذا المستخدم"
 
 #. TRANS: Client error on action trying to visit a non-existing page.
-#, fuzzy
 msgid "Page not found."
-msgstr "لم يتم العثور على وسيلة API."
+msgstr "لم يتم إيحاد الص�حة."
 
 #. TRANS: Title of form to sandbox a user.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Sandbox"
-msgstr "أزل هذا المستخدم من صندوق الرمل"
+msgstr "احجر"
 
 #. TRANS: Description of form to sandbox a user.
 msgid "Sandbox this user"
-msgstr "أض� هذا المستخدم إلى صندوق الرمل"
+msgstr "احجر هذا المستخدم"
 
 #. TRANS: Fieldset legend for the search form.
 msgid "Search site"
@@ -9550,6 +9032,7 @@ msgid "Keyword(s)"
 msgstr "الكلمات الم�تاحية"
 
 #. TRANS: Button text for searching site.
+#. TRANS: Button text for search button on search form.
 #. TRANS: Button text to search profiles.
 msgctxt "BUTTON"
 msgid "Search"
@@ -9562,6 +9045,10 @@ msgid ""
 "* Try more general keywords.\n"
 "* Try fewer keywords."
 msgstr ""
+"* تأكد من أن كل الكلمات صحيحة التهجئة.\n"
+"* حاول بكلمات أخرى.\n"
+"* حاول بكلمات أكثر عمومًا.\n"
+"* حاول بكلمات أقل."
 
 #. TRANS: Standard search suggestions shown when a search does not give any results.
 #, php-format
@@ -9575,6 +9062,14 @@ msgid ""
 "* [Yahoo](http://search.yahoo.com/search?p=site%%3A%%%%site.server%%%%+%s)\n"
 "* [Collecta](http://collecta.com/#q=%s)"
 msgstr ""
+"يمكن أن تجرب البحث �ي محركات أخرى:\n"
+"\n"
+"* [Twingly](http://www.twingly.com/search?q=%s&content=microblog&site=%%%%"
+"site.server%%%%)\n"
+"* [Tweet scan](http://www.tweetscan.com/indexi.php?s=%s)\n"
+"* [Google](http://www.google.com/search?q=site%%3A%%%%site.server%%%%+%s)\n"
+"* [Yahoo](http://search.yahoo.com/search?p=site%%3A%%%%site.server%%%%+%s)\n"
+"* [Collecta](http://collecta.com/#q=%s)"
 
 #. TRANS: Menu item in search group navigation panel.
 msgctxt "MENU"
@@ -9598,21 +9093,6 @@ msgstr "ابحث عن محتويات �ي الإشعارات"
 msgid "Find groups on this site"
 msgstr "ابحث عن مجموعات على هذا الموقع"
 
-#. TRANS: Secondary navigation menu item leading to help on StatusNet.
-msgctxt "MENU"
-msgid "Help"
-msgstr "مساعدة"
-
-#. TRANS: Secondary navigation menu item leading to text about StatusNet site.
-msgctxt "MENU"
-msgid "About"
-msgstr "عن"
-
-#. TRANS: Secondary navigation menu item leading to Frequently Asked Questions.
-msgctxt "MENU"
-msgid "FAQ"
-msgstr "الأسئلة المتكررة"
-
 #. TRANS: Secondary navigation menu item leading to Terms of Service.
 msgctxt "MENU"
 msgid "TOS"
@@ -9633,18 +9113,6 @@ msgctxt "MENU"
 msgid "Version"
 msgstr "النسخة"
 
-#. TRANS: Secondary navigation menu item leading to e-mail contact information on the
-#. TRANS: StatusNet site, where to report bugs, ...
-msgctxt "MENU"
-msgid "Contact"
-msgstr "اتصل"
-
-#. TRANS: Secondary navigation menu item. Leads to information about embedding a timeline widget.
-#, fuzzy
-msgctxt "MENU"
-msgid "Badge"
-msgstr "الجسر"
-
 #. TRANS: Default title for section/sidebar widget.
 msgid "Untitled section"
 msgstr "قسم غير م�عنون"
@@ -9654,7 +9122,6 @@ msgid "More..."
 msgstr "المزيد..."
 
 #. TRANS: Header in settings navigation panel.
-#, fuzzy
 msgctxt "HEADER"
 msgid "Settings"
 msgstr "إعدادات"
@@ -9664,17 +9131,15 @@ msgid "Change your profile settings"
 msgstr "غيّر إعدادات مل�ك الشخصي"
 
 #. TRANS: Menu item in settings navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Avatar"
-msgstr "أ�تار"
+msgstr "الأ�تار"
 
 #. TRANS: Menu item title in settings navigation panel.
 msgid "Upload an avatar"
 msgstr "ار�ع أ�تارًا"
 
 #. TRANS: Menu item in settings navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Password"
 msgstr "كلمة السر"
@@ -9684,7 +9149,6 @@ msgid "Change your password"
 msgstr "غير كلمة سرّك"
 
 #. TRANS: Menu item in settings navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Email"
 msgstr "البريد الإلكتروني"
@@ -9693,53 +9157,52 @@ msgstr "البريد الإلكتروني"
 msgid "Change email handling"
 msgstr "غير أسلوب التعامل مع البريد الإلكتروني"
 
-#. TRANS: Menu item title in settings navigation panel.
-msgid "Design your profile"
-msgstr "صمّم مل�ك الشخصي"
-
 #. TRANS: Menu item in settings navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "URL"
-msgstr "مسار"
+msgstr "المسارات"
 
 #. TRANS: Menu item title in settings navigation panel.
 msgid "URL shorteners"
 msgstr ""
 
 #. TRANS: Menu item in settings navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "IM"
-msgstr "محادثة �ورية"
+msgstr "المراسلة ال�ورية"
 
 #. TRANS: Menu item title in settings navigation panel.
 msgid "Updates by instant messenger (IM)"
 msgstr ""
 
 #. TRANS: Menu item in settings navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "SMS"
-msgstr "رسائل قصيرة"
+msgstr "الرسائل القصيرة"
 
 #. TRANS: Menu item title in settings navigation panel.
 msgid "Updates by SMS"
-msgstr "تحديثات عبر الرسائل القصيرة"
+msgstr "مستحدات عبر الرسائل القصيرة"
 
 #. TRANS: Menu item in settings navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Connections"
-msgstr "اتصالات"
+msgstr "الارتباطات"
 
 #. TRANS: Menu item title in settings navigation panel.
-#, fuzzy
 msgid "Authorized connected applications"
-msgstr "تطبيقات OAuth"
+msgstr "التطبيقات المخولة المرتبطة"
+
+#. TRANS: Menu item in settings navigation panel.
+msgctxt "MENU"
+msgid "Old school"
+msgstr "الأسلوب القديم"
+
+#. TRANS: Menu item title in settings navigation panel.
+msgid "UI tweaks for old-school users"
+msgstr ""
 
 #. TRANS: Title of form to silence a user.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Silence"
 msgstr "أسك�ت"
@@ -9748,47 +9211,83 @@ msgstr "أسك�ت"
 msgid "Silence this user"
 msgstr "أسك�ت هذا المستخدم"
 
-#. TRANS: Menu item in local navigation menu.
+#. TRANS: Server error displayed when trying to create an anynymous OAuth consumer.
 #, fuzzy
+msgid "Could not create anonymous consumer."
+msgstr "تعذّر إنشاء الكنى."
+
+#. TRANS: Server error displayed when trying to create an anynymous OAuth application.
+#, fuzzy
+msgid "Could not create anonymous OAuth application."
+msgstr "لم يمكن إنشاء التطبيق."
+
+#. TRANS: Exception thrown when no token association could be found.
+msgid ""
+"Could not find a profile and application associated with the request token."
+msgstr ""
+
+#. TRANS: Exception thrown when no access token can be issued.
+#, fuzzy
+msgid "Could not issue access token."
+msgstr "تعذّر إدراج الرسالة."
+
+#. TRANS: Exception thrown when a database error occurs.
+msgid "Database error inserting OAuth application user."
+msgstr "خطأ �ي قاعدة البيانات أثناء حذ� مستخدم تطبيق OAuth."
+
+#. TRANS: Exception thrown when a database error occurs.
+#, fuzzy
+msgid "Database error updating OAuth application user."
+msgstr "خطأ �ي قاعدة البيانات أثناء حذ� مستخدم تطبيق OAuth."
+
+#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
+msgid "Tried to revoke unknown token."
+msgstr ""
+
+#. TRANS: Exception thrown when an attempt is made to remove a revoked token.
+msgid "Failed to delete revoked token."
+msgstr ""
+
+#. TRANS: Menu item in local navigation menu.
 msgctxt "MENU"
 msgid "Subscriptions"
 msgstr "الاشتراكات"
 
 #. TRANS: Menu item title in local navigation menu.
 #. TRANS: %s is a user nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "People %s subscribes to."
-msgstr "الأشخاص الذين اشترك بهم %s"
+msgstr "الأشخاص الذين اشترك بهم %s."
 
 #. TRANS: Menu item title in local navigation menu.
 #. TRANS: %s is a user nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "People subscribed to %s."
-msgstr "الأشخاص المشتركون ب%s"
+msgstr "الأشخاص المشتركون ب%s."
 
 #. TRANS: Menu item in local navigation menu.
 #. TRANS: %d is the number of pending subscription requests.
 #, php-format
 msgctxt "MENU"
 msgid "Pending (%d)"
-msgstr ""
+msgstr "المعلقون (%d)"
 
 #. TRANS: Menu item title in local navigation menu.
 #, php-format
 msgid "Approve pending subscription requests."
-msgstr ""
+msgstr "اقبل طلبات الاشتراك المعلقة."
 
 #. TRANS: Menu item title in local navigation menu.
 #. TRANS: %s is a user nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "Groups %s is a member of."
-msgstr "المجموعات التي %s عضو �يها"
+msgstr "المجموعات التي %s عضو �يها."
 
 #. TRANS: Menu item title in local navigation menu.
 #. TRANS: %s is a user nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "List subscriptions by %s."
-msgstr "الأشخاص المشتركون ب%s"
+msgstr "اللائحات المشترك %s بها"
 
 #. TRANS: Menu item in local navigation menu.
 msgctxt "MENU"
@@ -9797,14 +9296,24 @@ msgstr "ادع�"
 
 #. TRANS: Menu item title in local navigation menu.
 #. TRANS: %s is the StatusNet sitename.
-#, fuzzy, php-format
+#, php-format
 msgid "Invite friends and colleagues to join you on %s."
-msgstr "ادع� أصدقائك وزملائك للانضمام إليك �ي %s"
+msgstr "دع� أصدقائك وزملائك للانضمام إليك �ي %s."
 
 #. TRANS: Form of form to subscribe to a user.
 msgid "Subscribe to this user"
 msgstr "اشترك بهذا المستخدم"
 
+#. TRANS: Button text to subscribe to a user.
+#. TRANS: Button text for subscribing to a list.
+msgctxt "BUTTON"
+msgid "Subscribe"
+msgstr "اشترك"
+
+#. TRANS: Button title to subscribe to a user.
+msgid "Subscribe to this user."
+msgstr "اشترك بهذا المستخدم"
+
 #. TRANS: Title of personal tag cloud section.
 msgid "People Tagcloud as self-tagged"
 msgstr ""
@@ -9816,7 +9325,7 @@ msgstr ""
 #. TRANS: Content displayed in a tag cloud section if there are no tags.
 msgctxt "NOTAGS"
 msgid "None"
-msgstr "لا شيء"
+msgstr "لا يوجد"
 
 #. TRANS: Server exception displayed if a theme name was invalid.
 msgid "Invalid theme name."
@@ -9887,11 +9396,11 @@ msgstr "الإشعارات"
 msgid "Show reply"
 msgid_plural "Show all %d replies"
 msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-msgstr[4] ""
-msgstr[5] ""
+msgstr[1] "أظهر الرد"
+msgstr[2] "أظهر الردين"
+msgstr[3] "أظهر الردود ال%d"
+msgstr[4] "أظهر الردود ال%d"
+msgstr[5] "أظهر الردود ال%d"
 
 #. TRANS: Reference to the logged in user in favourite list.
 msgctxt "FAVELIST"
@@ -9906,10 +9415,9 @@ msgid "%1$s and %2$s"
 msgstr "%1$s Ùˆ %2$s"
 
 #. TRANS: List message for notice favoured by logged in user.
-#, fuzzy
 msgctxt "FAVELIST"
 msgid "You like this."
-msgstr "إشعارات محبوبة"
+msgstr "أعجبك هذا."
 
 #. TRANS: List message for when more than 4 people like something.
 #. TRANS: %%s is a list of users liking a notice, %d is the number over 4 that like the notice.
@@ -9918,6 +9426,38 @@ msgstr "إشعارات محبوبة"
 msgid "%%s and %d others like this."
 msgid_plural "%%s and %d others like this."
 msgstr[0] ""
+msgstr[1] "%%s وواحد آخر أعجبهم هذا الإشعار."
+msgstr[2] "%%s واثنان آخران أعجبهم هذا الإشعار."
+msgstr[3] "%%s و%d آخرون أعجبهم هذا الإشعار."
+msgstr[4] "%%s و%d واحدًا آخر أعجبهم هذا الإشعار."
+msgstr[5] "%%s و%d آخرون أعجبهم هذا الإشعار."
+
+#. TRANS: List message for favoured notices.
+#. TRANS: %%s is a list of users liking a notice.
+#. TRANS: Plural is based on the number of of users that have favoured a notice.
+#, php-format
+msgid "%%s likes this."
+msgid_plural "%%s like this."
+msgstr[0] "لم يعجب أحدًا"
+msgstr[1] "أعجب %%s"
+msgstr[2] "أعجب %%s"
+msgstr[3] "أعجب %%s"
+msgstr[4] "أعجب %%s"
+msgstr[5] "أعجب %%s"
+
+#. TRANS: List message for notice repeated by logged in user.
+#, fuzzy
+msgctxt "REPEATLIST"
+msgid "You repeated this."
+msgstr "كرّرتَ هذا الإشعار."
+
+#. TRANS: List message for when more than 4 people repeat something.
+#. TRANS: %%s is a list of users liking a notice, %d is the number over 4 that like the notice.
+#. TRANS: Plural is decided on the total number of users liking the notice (count of %%s + %d).
+#, php-format
+msgid "%%s and %d other repeated this."
+msgid_plural "%%s and %d others repeated this."
+msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
@@ -9927,41 +9467,24 @@ msgstr[5] ""
 #. TRANS: List message for favoured notices.
 #. TRANS: %%s is a list of users liking a notice.
 #. TRANS: Plural is based on the number of of users that have favoured a notice.
-#, php-format
-msgid "%%s likes this."
-msgid_plural "%%s like this."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-msgstr[4] ""
-msgstr[5] ""
-
-#. TRANS: List message for notice repeated by logged in user.
-msgctxt "REPEATLIST"
-msgid "You have repeated this notice."
-msgstr "كرّرتَ هذا الإشعار."
-
-#. TRANS: List message for repeated notices.
-#. TRANS: %d is the number of users that have repeated a notice.
 #, fuzzy, php-format
-msgid "One person has repeated this notice."
-msgid_plural "%d people have repeated this notice."
-msgstr[0] "لم يكرر أحد هذا الإشعار"
-msgstr[1] "كرّر شخص واحد هذا الإشعار"
-msgstr[2] "كرّر شخصان هذا الإشعار."
-msgstr[3] "كرّر %d أشخاص هذا الإشعار"
-msgstr[4] "كرّر %d شخصًا هذا الإشعار"
-msgstr[5] "كرّر %d شخص هذا الإشعار."
+msgid "%%s repeated this."
+msgid_plural "%%s repeated this."
+msgstr[0] "لم يعجب أحدًا"
+msgstr[1] "أعجب %%s"
+msgstr[2] "أعجب %%s"
+msgstr[3] "أعجب %%s"
+msgstr[4] "أعجب %%s"
+msgstr[5] "أعجب %%s"
 
 #. TRANS: Form legend.
-#, fuzzy, php-format
+#, php-format
 msgid "Search and list people"
-msgstr "ابحث �ي الموقع"
+msgstr "ابحث أشخاص وأدرجهم"
 
 #. TRANS: Dropdown option for searching in profiles.
 msgid "Everything"
-msgstr ""
+msgstr "كل شيء"
 
 #. TRANS: Dropdown option for searching in profiles.
 msgid "Fullname"
@@ -9982,15 +9505,15 @@ msgstr "اختر حقلا للبحث."
 
 #. TRANS: Form legend.
 #. TRANS: %1$s is a nickname, $2$s is a list.
-#, fuzzy, php-format
+#, php-format
 msgid "Remove %1$s from list %2$s"
-msgstr "%1$s Ùˆ %2$s"
+msgstr "أزل %1$s من اللائحة %2$s"
 
 #. TRANS: Legend on form to add a profile to a list.
 #. TRANS: %1$s is a nickname, %2$s is a list.
-#, fuzzy, php-format
+#, php-format
 msgid "Add %1$s to list %2$s"
-msgstr "%1$s Ùˆ %2$s"
+msgstr "أض� %1$s إلى اللائحة %2$s"
 
 #. TRANS: Title for top posters section.
 msgid "Top posters"
@@ -9999,13 +9522,13 @@ msgstr "أعلى المرسلين"
 #. TRANS: Option in drop-down of potential addressees.
 msgctxt "SENDTO"
 msgid "Everyone"
-msgstr ""
+msgstr "الجميع"
 
 #. TRANS: Option in drop-down of potential addressees.
 #. TRANS: %s is a StatusNet sitename.
 #, php-format
 msgid "My colleagues at %s"
-msgstr ""
+msgstr "زملائي �ي %s"
 
 #. TRANS: Label for drop-down of potential addressees.
 msgctxt "LABEL"
@@ -10027,14 +9550,13 @@ msgid "Unblock"
 msgstr "ألغ� المنع"
 
 #. TRANS: Title for unsandbox form.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Unsandbox"
-msgstr "أزل هذا المستخدم من صندوق الرمل"
+msgstr "ألغ� الحجر"
 
 #. TRANS: Description for unsandbox form.
 msgid "Unsandbox this user"
-msgstr "أزل هذا المستخدم من صندوق الرمل"
+msgstr "ألغ� حجر هذا المستخدم"
 
 #. TRANS: Title for unsilence form.
 msgid "Unsilence"
@@ -10045,7 +9567,6 @@ msgid "Unsilence this user"
 msgstr "ألغ� إسكات هذا المستخدم"
 
 #. TRANS: Form legend on unsubscribe form.
-#. TRANS: Button title on unsubscribe form.
 msgid "Unsubscribe from this user"
 msgstr "ألغ� الاشتراك بهذا المستخدم"
 
@@ -10055,6 +9576,10 @@ msgctxt "BUTTON"
 msgid "Unsubscribe"
 msgstr "ألغ� الاشتراك"
 
+#. TRANS: Button title on unsubscribe form.
+msgid "Unsubscribe from this user."
+msgstr "ألغ� الاشتراك بهذا المستخدم."
+
 #. TRANS: Exception text shown when no profile can be found for a user.
 #. TRANS: %1$s is a user nickname, $2$d is a user ID (number).
 #, php-format
@@ -10077,27 +9602,27 @@ msgstr "قبل دقيقة تقريبًا"
 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"
-msgstr[0] "أقل من دقيقة"
-msgstr[1] "حوالي دقيقة واحدة"
-msgstr[2] "حوالي دقيقتين"
-msgstr[3] "حوالي %d دقائق"
-msgstr[4] "حوالي %d دقيقة"
-msgstr[5] "حوالي %d دقيقة"
+msgstr[0] "قبل أقل من دقيقة"
+msgstr[1] "قبل حوالي دقيقة واحدة"
+msgstr[2] "قبل حوالي دقيقتين"
+msgstr[3] "قبل حوالي %d دقائق"
+msgstr[4] "قبل حوالي %d دقيقة"
+msgstr[5] "قبل حوالي %d دقيقة"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 msgid "about an hour ago"
-msgstr "قبل ساعة تقريبًا"
+msgstr "قبل حوالي ساعة"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"
 msgstr[0] "قبل أقل من ساعة"
-msgstr[1] "قبل ساعة واحدة تقريبا"
-msgstr[2] "قبل ساعتين تقريبا"
-msgstr[3] "قبل %d ساعات تقريبا"
-msgstr[4] "قبل %d ساعة تقريبا"
-msgstr[5] "قبل %d ساعة تقريبا"
+msgstr[1] "قبل حوالي ساعة واحدة"
+msgstr[2] "قبل حوالي ساعتين"
+msgstr[3] "قبل حوالي %d ساعات"
+msgstr[4] "قبل حوالي %d ساعة"
+msgstr[5] "قبل حوالي %d ساعة"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 msgid "about a day ago"
@@ -10111,8 +9636,8 @@ msgstr[0] "قبل أقل من يوم"
 msgstr[1] "قبل يوم واحد تقريبا"
 msgstr[2] "قبل يومين تقريبا"
 msgstr[3] "قبل %d أيام تقريبا"
-msgstr[4] "قبل %d يوم تقريبا"
-msgstr[5] "قبل %d يوما تقريبا"
+msgstr[4] "قبل %d يومًا تقريبا"
+msgstr[5] "قبل %d يوم تقريبا"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 msgid "about a month ago"
@@ -10126,8 +9651,8 @@ msgstr[0] "قبل أقل من شهر"
 msgstr[1] "قبل شهر واحد تقريبا"
 msgstr[2] "قبل شهرين تقريبا"
 msgstr[3] "قبل %d أشهر تقريبا"
-msgstr[4] "قبل %d شهر تقريبا"
-msgstr[5] "قبل %d شهرا تقريبا"
+msgstr[4] "قبل %d شهرًا تقريبا"
+msgstr[5] "قبل %d شهر تقريبا"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 msgid "about a year ago"
@@ -10153,8 +9678,6 @@ msgstr ""
 msgid "Getting backup from file '%s'."
 msgstr ""
 
-#~ msgid "%1$s and friends, page %2$d"
-#~ msgstr "%1$s والأصدقاء, الص�حة %2$d"
-
-#~ msgid "You and friends"
-#~ msgstr "أنت والأصدقاء"
+#
+#~ msgid " "
+#~ msgstr " "
diff --git a/locale/be-tarask/LC_MESSAGES/statusnet.po b/locale/be-tarask/LC_MESSAGES/statusnet.po
new file mode 100644
index 0000000000..0ca16a8baf
--- /dev/null
+++ b/locale/be-tarask/LC_MESSAGES/statusnet.po
@@ -0,0 +1,9593 @@
+# Translation of StatusNet - Core to Belarusian (Taraškievica orthography) (‪белару�ка� (тарашкевіца)‬)
+# Exported from translatewiki.net
+#
+# Author: EugeneZelenko
+# Author: Jim-by
+# Author: Renessaince
+# Author: Wizardist
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Core\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:34+0000\n"
+"Language-Team: Belarusian (Taraškievica orthography) <https://translatewiki."
+"net/wiki/Portal:be-tarask>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2012-04-22 22:02:21+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: be-tarask\n"
+"X-Message-Group: #out-statusnet-core\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Database error message.
+#, php-format
+msgid ""
+"The database for %1$s is not responding correctly, so the site will not work "
+"properly. The site admins probably know about the problem, but you can "
+"contact them at %2$s to make sure. Otherwise, wait a few minutes and try "
+"again."
+msgstr ""
+"База зьве�так дл� %1$s не адказвае належным чынам, таму �айт н� будзе "
+"працаваць �лушна. �дміні�тратары �айту, верагодна, ведаюць пра праблему, але "
+"Вы можаце зьв�зацца зь імі на %2$s каб у г�тым уп�ўніцца. У адваротным "
+"выпадку, пачакайце некалькі хвілінаў і па�прабуйце ізноў."
+
+#. TRANS: Error message.
+msgid "An error occurred."
+msgstr "�дбыла�� памылка."
+
+#. TRANS: Error message displayed when there is no StatusNet configuration file.
+#, php-format
+msgid ""
+"No configuration file found. Try running the installation program first."
+msgstr ""
+"Файлы канфігурацыі н� знойдзены�. Па�прабуйце �пачатку запу�ьціць праграму "
+"у�тал�ваньн�."
+
+#. TRANS: Error message displayed when trying to access a non-existing page.
+msgid "Unknown page"
+msgstr "�ев�дома� �таронка"
+
+#. TRANS: Error message displayed when trying to perform an undefined action.
+#. TRANS: Title for password recovery page when an unknown action has been specified.
+msgid "Unknown action"
+msgstr "�ев�домае дзе�ньне"
+
+#. TRANS: Page title for Access admin panel that allows configuring site access.
+msgid "Access"
+msgstr "До�туп"
+
+#. TRANS: Page notice.
+msgid "Site access settings"
+msgstr "У�таноўкі до�тупу на �айт"
+
+#. TRANS: Form legend for registration form.
+msgid "Registration"
+msgstr "Р�гі�трацы�"
+
+#. TRANS: Checkbox instructions for admin setting "Private".
+msgid "Prohibit anonymous users (not logged in) from viewing site?"
+msgstr ""
+"Забараніць ананімным кары�тальнікам (�кі� не ўвайшлі ў �ы�т�му) прагл�даць "
+"�айт?"
+
+#. TRANS: Checkbox label for prohibiting anonymous users from viewing site.
+#. TRANS: Checkbox label to show private tags.
+#. TRANS: Checkbox field label on group edit form to mark a group private.
+msgctxt "LABEL"
+msgid "Private"
+msgstr "Прыватнае"
+
+#. TRANS: Checkbox instructions for admin setting "Invite only".
+msgid "Make registration invitation only."
+msgstr "Дазволіць р�гі�трацыю толькі па запраш�ньн�х."
+
+#. TRANS: Checkbox label for configuring site as invite only.
+msgid "Invite only"
+msgstr "Толькі па запраш�ньн�х"
+
+#. TRANS: Checkbox instructions for admin setting "Closed" (no new registrations).
+msgid "Disable new registrations."
+msgstr "Забараніць новы� р�гі�трацыі."
+
+#. TRANS: Checkbox label for disabling new user registrations.
+msgid "Closed"
+msgstr "Закрыта"
+
+#. TRANS: Button title to save access settings in site admin panel.
+msgid "Save access settings."
+msgstr "Захаваць налады до�тупу."
+
+#. TRANS: Button text to save access settings in site admin panel.
+#. TRANS: Button label to save e-mail preferences.
+#. TRANS: Button label to save IM preferences.
+#. TRANS: Button text in the license admin panel.
+#. TRANS: Button text to store form data in the Paths admin panel.
+#. TRANS: Button to save input in profile settings.
+#. TRANS: Submit button text on the sessions administration panel.
+#. TRANS: Button text for saving site settings.
+#. TRANS: Button text for saving site notice in admin panel.
+#. TRANS: Button label to save SMS preferences.
+#. TRANS: Button text to save snapshot settings.
+#. TRANS: Save button for settings for a profile in a subscriptions list.
+#. TRANS: Button text to save lists.
+#. TRANS: Button text for saving "Other settings" in profile.
+#. TRANS: Button text to save user settings in user admin panel.
+#. TRANS: Button label in the "Edit application" form.
+#. TRANS: Text for save button on group edit form.
+#. TRANS: Button text to save tags for a profile.
+msgctxt "BUTTON"
+msgid "Save"
+msgstr "Захаваць"
+
+#. TRANS: Client error displayed when the session token does not match or is not given.
+#. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
+#. TRANS: Client error displayed when the session token does not match or is not given.
+#. TRANS: Form validation error message.
+#. TRANS: Client error displayed when the session token does not match or is not given.
+#. TRANS: Form validation error.
+#. TRANS: Form validation error message.
+#. TRANS: Client error displayed when the session token does not match or is not given.
+#. TRANS: Client error displayed when the session token is not okay.
+#. TRANS: Client error displayed when the session token does not match or is not given.
+msgid "There was a problem with your session token. Try again, please."
+msgstr "Узьнікла праблема з ключом Вашай ���іі. Калі ла�ка, па�прабуйце зноў."
+
+#. TRANS: Error message displayed when trying to perform an action that requires a logged in user.
+msgid "Not logged in."
+msgstr "Вы не ўвайшлі ў �ы�т�му."
+
+#. TRANS: Client error displayed trying to perform an action related to a non-existing profile.
+#. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
+#. TRANS: Client exception.
+#. TRANS: Client error displayed when referring to a non-existing profile.
+#. TRANS: Client error displayed trying to subscribe to a non-existing profile.
+#. TRANS: Client error displayed trying to perform an action related to a non-existing profile.
+msgid "No such profile."
+msgstr "��ма такога профілю."
+
+#. TRANS: Client error displayed trying to reference a non-existing list.
+#. TRANS: Client error displayed when referring to a non-existing list.
+#. TRANS: Client error displayed trying to reference a non-existing list.
+msgid "No such list."
+msgstr "��ма такога �ьпі�у."
+
+#. TRANS: Client error displayed when an unknown error occurs when adding a user to a list.
+#. TRANS: %s is a username.
+#, php-format
+msgid "There was an unexpected error while listing %s."
+msgstr "Узьнікла нечакана� памылка падча� даданьн� ў �ьпі� %s."
+
+#. TRANS: Client error displayed when an unknown error occurs when adding a user to a list.
+#. TRANS: %s is a profile URL.
+#, php-format
+msgid ""
+"There was a problem listing %s. The remote server is probably not responding "
+"correctly. Please try retrying later."
+msgstr ""
+"�емагчыма дадаць у �ьпі� %s. �ддалены ��рв�р, верагодна, не адказвае �лушна. "
+"Калі ла�ка, па�прабуйце потым."
+
+#. TRANS: Title after adding a user to a list.
+msgctxt "TITLE"
+msgid "Listed"
+msgstr "Уне�ены ў �ьпі�"
+
+#. TRANS: Server error when page not found (404).
+#. TRANS: Server error when page not found (404)
+#. TRANS: Server error when page not found (404).
+msgid "No such page."
+msgstr "��ма такой �таронкі."
+
+#. TRANS: Client error when user not found for an action.
+#. TRANS: Client error when user not found for an rss related action.
+#. TRANS: Client error displayed when no existing user is provided for a user's delivery device setting.
+#. TRANS: Client error displayed if a user could not be found.
+#. TRANS: Client error displayed updating profile image without having a user object.
+#. TRANS: Client error displayed when making an Atom API request for an unknown user.
+#. TRANS: Client error displayed when trying to block a non-existing user or a user from another site.
+#. TRANS: Client error when user not found for an API action to remove a block for a user.
+#. TRANS: Client error given when a user was not found (404).
+#. TRANS: Client error when user not found for an API direct message action.
+#. TRANS: Client error given when a user was not found (404).
+#. TRANS: Client error displayed when checking group membership for a non-existing user.
+#. TRANS: Client error displayed when trying to have a non-existing user join a group.
+#. TRANS: Client error displayed when trying to have a non-existing user leave a group.
+#. TRANS: Client error displayed when user not found for an action.
+#. TRANS: Client error displayed when not providing a user or an invalid user.
+#. TRANS: Client error displayed when referring to a non-existing user.
+#. TRANS: Client error displayed trying to perform an action related to a non-existing user.
+#. TRANS: Client error displayed when updating a status for a non-existing user.
+#. TRANS: Client error displayed when requesting a list of followers for a non-existing user.
+#. TRANS: Client error displayed when requesting most recent favourite notices by a user for a non-existing user.
+#. TRANS: Client error displayed when requesting dents of a user and friends for a user that does not exist.
+#. TRANS: Client error displayed when requesting most recent dents by user and friends for a non-existing user.
+#. TRANS: Client error displayed when requesting most recent mentions for a non-existing user.
+#. TRANS: Client error displayed requesting most recent notices for a non-existing user.
+#. TRANS: Client error displayed trying to get an avatar for a non-existing user.
+#. TRANS: Client error displayed when trying to get the RSS feed with favorites of a user that does not exist.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed without providing a user nickname.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed for an object that is not a user.
+#. TRANS: Client error displayed trying to make a micro summary without providing a valid user.
+#. TRANS: Client error displayed trying to send a direct message to a non-existing user.
+#. TRANS: Client error displayed trying to use "one time password login" without using an existing user.
+#. TRANS: Client error displayed when referring to non-existing user.
+#. TRANS: Client error displayed trying to perform an action related to a non-existing user.
+#. TRANS: Client error displayed when trying to reply to a non-exsting user.
+#. TRANS: Client error displayed when providing a non-existing nickname in a RSS 1.0 action.
+#. TRANS: Client error.
+#. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
+#. TRANS: Client error displayed trying to perform an action related to a non-existing user.
+#. TRANS: Client error displayed trying to find a user by ID for a non-existing ID.
+#. TRANS: Client error displayed requesting groups for a non-existing user.
+#. TRANS: Client error displayed when user not found for an action.
+#. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
+#. TRANS: Client error displayed when trying to perform a gallery action with an unknown user.
+#. TRANS: Client error displayed when trying to access a mailbox without providing a user.
+#. TRANS: Client error displayed when calling a profile action without specifying a user.
+msgid "No such user."
+msgstr "��ма такога кары�тальніка."
+
+#. TRANS: Title of a user's own start page.
+msgid "Home timeline"
+msgstr "Хатн�� �тужка паведамленьн�ў"
+
+#. TRANS: Title of another user's start page.
+#. TRANS: %s is the other user's name.
+#, php-format
+msgid "%s's home timeline"
+msgstr "Хатн�� �тужка паведамленьн�ў %s"
+
+#. TRANS: %s is user nickname.
+#. TRANS: Feed title.
+#. TRANS: %s is tagger's nickname.
+#, php-format
+msgid "Feed for friends of %s (Activity Streams JSON)"
+msgstr "Стужка дл� ��броў %s (�тужкі актыўна�ьці JSON)"
+
+#. TRANS: %s is user nickname.
+#, php-format
+msgid "Feed for friends of %s (RSS 1.0)"
+msgstr "Стужка ��броў кары�тальніка %s (RSS 1.0)"
+
+#. TRANS: %s is user nickname.
+#. TRANS: Feed title.
+#. TRANS: %s is tagger's nickname.
+#, php-format
+msgid "Feed for friends of %s (RSS 2.0)"
+msgstr "Стужка ��броў кары�тальніка %s (RSS 2.0)"
+
+#. TRANS: %s is user nickname.
+#, php-format
+msgid "Feed for friends of %s (Atom)"
+msgstr "Стужка ��броў кары�тальніка %s (Atom)"
+
+#. TRANS: Empty list message. %s is a user nickname.
+#, php-format
+msgid ""
+"This is the timeline for %s and friends but no one has posted anything yet."
+msgstr "Г�та �тужка %s і ��броў, але ніхто �шч� не пакінуў паведамленьн�ў."
+
+#. TRANS: Encouragement displayed on logged in user's empty timeline.
+#. TRANS: This message contains Markdown links. Keep "](" together.
+#, php-format
+msgid ""
+"Try subscribing to more people, [join a group](%%action.groups%%) or post "
+"something yourself."
+msgstr ""
+"Па�прабуйце падпі�ацца на большую колька�ьць кары�тальнікаў, [далучыце�� да "
+"групы](%%action.groups%%) альбо напішыце што-небудзь �ваё."
+
+#. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@".
+#. TRANS: This message contains Markdown links. Keep "](" together.
+#, php-format
+msgid ""
+"You can try to [nudge %1$s](../%2$s) from their profile or [post something "
+"to them](%%%%action.newnotice%%%%?status_textarea=%3$s)."
+msgstr ""
+"Вы можаце па�прабаваць [падштурхнуць %1$s](../%2$s) з іх профілю альбо "
+"[да�лаць што-небудзь да іх](%%%%action.newnotice%%%%?status_textarea=%3$s)."
+
+#. TRANS: Encouragement displayed on empty timeline user pages for anonymous users.
+#. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
+#. TRANS: Empty list message for page with replies for a user for not logged in users.
+#. TRANS: %1$s is a user nickname. This message contains a Markdown link in the form [link text](link).
+#. TRANS: Second sentence of empty message for anonymous users. %s is a user nickname.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#, php-format
+msgid ""
+"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
+"post a notice to them."
+msgstr ""
+"Чаму не [�тварыць рахунак](%%%%action.register%%%%), а потым падштурхнуць "
+"кары�тальнікаў %s альбо да�лаць да іх паведамленьне."
+
+#. TRANS: Button text for inviting more users to the StatusNet instance.
+#. TRANS: Less business/enterprise-oriented language for public sites.
+msgctxt "BUTTON"
+msgid "Send invite"
+msgstr "Да�лаць запраш�ньне"
+
+#. TRANS: Message is used as link title. %s is a user nickname.
+#. TRANS: Title of API timeline for a user and friends.
+#. TRANS: %s is a username.
+#. TRANS: Timeline title for user and friends. %s is a user nickname.
+#. TRANS: Menu item title in administrator navigation panel.
+#. TRANS: %s is a username.
+#. TRANS: Menu item title in personal group navigation menu.
+#. TRANS: %s is a username.
+#, php-format
+msgid "%s and friends"
+msgstr "%s і ��бры"
+
+#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
+#. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name.
+#, php-format
+msgid "Updates from %1$s and friends on %2$s!"
+msgstr "�бнаўленьні ад %1$s і ��броў на %2$s!"
+
+#. TRANS: Client error displayed when coming across a non-supported API method.
+#. TRANS: Client error displayed when trying to handle an unknown API method.
+#. TRANS: Client error displayed when coming across a non-supported API method.
+msgid "API method not found."
+msgstr "API-м�тад н� знойдзены."
+
+#. TRANS: Client error message. POST is a HTTP command. It should not be translated.
+#. TRANS: Client error. POST is a HTTP command. It should not be translated.
+#. TRANS: Client error message. POST is a HTTP command. It should not be translated.
+#. TRANS: Client error. POST is a HTTP command. It should not be translated.
+msgid "This method requires a POST."
+msgstr "Г�ты м�тад патрабуе POST."
+
+#. TRANS: Client error displayed when no valid device parameter is provided for a user's delivery device setting.
+msgid ""
+"You must specify a parameter named 'device' with a value of one of: sms, im, "
+"none."
+msgstr ""
+"Вы павінны пазначыць парам�тар з назвай «device» з адным з на�тупных "
+"знач�ньн�ў: sms, im, none."
+
+#. TRANS: Server error displayed when a user's delivery device cannot be updated.
+#. TRANS: Server error displayed when confirming an e-mail address or IM address fails.
+#. TRANS: Server error thrown on database error updating e-mail preferences.
+#. TRANS: Server error thrown on database error removing a registered e-mail address.
+#. TRANS: Server error thrown when user profile settings could not be updated.
+#. TRANS: Server error thrown on database error updating SMS preferences.
+#. TRANS: Server error thrown on database error removing a registered SMS phone number.
+#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
+msgid "Could not update user."
+msgstr "�емагчыма абнавіць кары�тальніка."
+
+#. TRANS: Error message displayed when referring to a user without a profile.
+msgid "User has no profile."
+msgstr "Кары�тальнік н� мае профілю."
+
+#. TRANS: Server error displayed if a user profile could not be saved.
+#. TRANS: Server error thrown when user profile settings could not be saved.
+msgid "Could not save profile."
+msgstr "�емагчыма захаваць профіль."
+
+#. TRANS: Client error displayed when the number of bytes in a POST request exceeds a limit.
+#. TRANS: %s is the number of bytes of the CONTENT_LENGTH.
+#, php-format
+msgid ""
+"The server was unable to handle that much POST data (%s byte) due to its "
+"current configuration."
+msgid_plural ""
+"The server was unable to handle that much POST data (%s bytes) due to its "
+"current configuration."
+msgstr[0] ""
+"С�рв�р н� змог апрацаваць так шмат POST-зьве�так (%s байт) з-за ц�перашн�й "
+"канфігурацыі."
+msgstr[1] ""
+"С�рв�р н� змог апрацаваць так шмат POST-зьве�так (%s байты) з-за ц�перашн�й "
+"канфігурацыі."
+
+#. TRANS: Title for Atom feed.
+msgctxt "ATOM"
+msgid "Main"
+msgstr "Галоўна�"
+
+#. TRANS: Title for Atom feed. %s is a user nickname.
+#. TRANS: Message is used as link title. %s is a user nickname.
+#. TRANS: Title in atom group notice feed. %s is a group name.
+#. TRANS: Title in atom user notice feed. %s is a user name.
+#, php-format
+msgid "%s timeline"
+msgstr "Стужка паведамленьн�ў %s"
+
+#. TRANS: Title for Atom feed with a user's subscriptions. %s is a user nickname.
+#. TRANS: Title for Atom subscription feed.
+#. TRANS: %s is a user nickname.
+#. TRANS: Header for subscriptions overview for a user (first page).
+#. TRANS: %s is a user nickname.
+#, php-format
+msgid "%s subscriptions"
+msgstr "Падпі�кі %s"
+
+#. TRANS: Title for Atom feed with a user's favorite notices. %s is a user nickname.
+#. TRANS: Title for Atom favorites feed.
+#. TRANS: %s is a user nickname.
+#, php-format
+msgid "%s favorites"
+msgstr "Улюблёны� %s"
+
+#. TRANS: Title for Atom feed with a user's memberships. %s is a user nickname.
+#, php-format
+msgid "%s memberships"
+msgstr "Удзельнікі групы %s"
+
+#. TRANS: Client error displayed when users try to block themselves.
+msgid "You cannot block yourself!"
+msgstr "Вы н� можаце забл�каваць �амі ��бе!"
+
+#. TRANS: Server error displayed when blocking a user has failed.
+msgid "Block user failed."
+msgstr "Памылка бл�каваньн� кары�тальніка."
+
+#. TRANS: Server error displayed when unblocking a user has failed.
+msgid "Unblock user failed."
+msgstr "Памылка разбл�каваньн� кары�тальніка."
+
+#. TRANS: Client exception thrown when no conversation ID is given.
+msgid "No conversation ID."
+msgstr "��ма ід�нтыфікатару размовы."
+
+#. TRANS: Client exception thrown when referring to a non-existing conversation ID (%d).
+#, php-format
+msgid "No conversation with ID %d."
+msgstr "��ма размовы з ід�нтыфікатарам %d."
+
+#. TRANS: Title for conversion timeline.
+msgctxt "TITLE"
+msgid "Conversation"
+msgstr "Размова"
+
+#. TRANS: Title. %s is a user nickname.
+#, php-format
+msgid "Direct messages from %s"
+msgstr "�епа�р�дны� паведамленьні ад %s"
+
+#. TRANS: Subtitle. %s is a user nickname.
+#, php-format
+msgid "All the direct messages sent from %s"
+msgstr "У�е непа�р�дны� паведамленьні ад %s"
+
+#. TRANS: Title. %s is a user nickname.
+#, php-format
+msgid "Direct messages to %s"
+msgstr "�епа�р�дны� паведамленьні да %s"
+
+#. TRANS: Subtitle. %s is a user nickname.
+#, php-format
+msgid "All the direct messages sent to %s"
+msgstr "У�е непа�р�дны� паведамленьні да %s"
+
+#. TRANS: Client error displayed when no message text was submitted (406).
+msgid "No message text!"
+msgstr "��ма т�к�ту паведамленьн�!"
+
+#. TRANS: Client error displayed when message content is too long.
+#. TRANS: %d is the maximum number of characters for a message.
+#. TRANS: Form validation error displayed when message content is too long.
+#. TRANS: %d is the maximum number of characters for a message.
+#, php-format
+msgid "That's too long. Maximum message size is %d character."
+msgid_plural "That's too long. Maximum message size is %d characters."
+msgstr[0] ""
+"Г�та занадта доўгае паведамленьне. Мак�ымальны памер �кладае %d �ымбаль."
+msgstr[1] ""
+"Г�та занадта доўгае паведамленьне. Мак�ымальны памер �кладае %d �ымбалі."
+
+#. TRANS: Client error displayed if a recipient user could not be found (403).
+msgid "Recipient user not found."
+msgstr "�трымальнік н� знойдзены."
+
+#. TRANS: Client error displayed trying to direct message another user who's not a friend (403).
+msgid "Cannot send direct messages to users who aren't your friend."
+msgstr ""
+"�емагчыма да�ылаць непа�р�дны� паведамленьні кары�тальнікам, �кі� не "
+"зь�ўл�юцца Вашымі ��брамі."
+
+#. TRANS: Client error displayed trying to direct message self (403).
+#. TRANS: Client error displayed trying to send a direct message to self.
+#. TRANS: Error text shown when trying to send a direct message to self.
+msgid ""
+"Do not send a message to yourself; just say it to yourself quietly instead."
+msgstr ""
+"�е да�ылайце паведамленьні �амаму �абе; про�та �кажыце г�та ціхенька �амому "
+"�абе."
+
+#. TRANS: Client error displayed when requesting a status with a non-existing ID.
+#. TRANS: Client error displayed when trying to remove a favourite with an invalid ID.
+#. TRANS: Client error displayed trying to delete a status with an invalid ID.
+msgid "No status found with that ID."
+msgstr "�� знойдзены �тату� з такім ід�нтыфікатарам."
+
+#. TRANS: Client error displayed when trying to mark a notice favourite that already is a favourite.
+msgid "This status is already a favorite."
+msgstr "Г�ты �тату� ўжо знаходзіцца ў ліку ўлюблёных."
+
+#. TRANS: Client error displayed when marking a notice as favourite fails.
+#. TRANS: Server error displayed when trying to mark a notice as favorite fails in the database.
+#. TRANS: Error message text shown when a favorite could not be set.
+msgid "Could not create favorite."
+msgstr "�емагчыма �тварыць улюблёны запі�."
+
+#. TRANS: Client error displayed when trying to remove a favourite that was not a favourite.
+msgid "That status is not a favorite."
+msgstr "Г�ты �тату� не зь�ўл�ецца ўлюблёным."
+
+#. TRANS: Client error displayed when removing a favourite has failed.
+#. TRANS: Server error displayed when removing a favorite from the database fails.
+msgid "Could not delete favorite."
+msgstr "�емагчыма выдаліць улюблёны запі�."
+
+#. TRANS: Client error displayed when trying follow who's profile could not be found.
+msgid "Could not follow user: profile not found."
+msgstr "�емагчыма �ачыць за кары�тальнікам: профіль н� знойдзены."
+
+#. TRANS: Client error displayed when trying to follow a user that's already being followed.
+#. TRANS: %s is the nickname of the user that is already being followed.
+#, php-format
+msgid "Could not follow user: %s is already on your list."
+msgstr "�емагчыма �ачыць за кары�тальнікам: %s ужо знаходзіцца ў Вашым �ьпі�е."
+
+#. TRANS: Client error displayed when trying to unfollow a user that cannot be found.
+msgid "Could not unfollow user: User not found."
+msgstr "�емагчыма �ачыць за кары�тальнікам: кары�тальнік н� знойдзены."
+
+#. TRANS: Client error displayed when trying to unfollow self.
+msgid "You cannot unfollow yourself."
+msgstr "Вы н� можаце пера�таць �ачыць за �амім �абой."
+
+#. TRANS: Client error displayed when supplying invalid parameters to an API call checking if a friendship exists.
+msgid "Two valid IDs or nick names must be supplied."
+msgstr "�еабходна падаць два �лушных ід�нтыфікатары ці м�нушкі."
+
+#. TRANS: Client error displayed when a source user could not be determined showing friendship.
+msgid "Could not determine source user."
+msgstr "�емагчыма вызначыць крынічнага кары�тальніка."
+
+#. TRANS: Client error displayed when a target user could not be determined showing friendship.
+msgid "Could not find target user."
+msgstr "�емагчыма знай�ьці м�тавага кары�тальніка."
+
+#. TRANS: Client error trying to create a group with a nickname this is already in use.
+#. TRANS: API validation exception thrown when nickname is already used.
+#. TRANS: Group edit form validation error.
+#. TRANS: Group create form validation error.
+#. TRANS: Validation error in form for profile settings.
+#. TRANS: Form validation error displayed when trying to register with an existing nickname.
+msgid "Nickname already in use. Try another one."
+msgstr "Такое ім� кары�тальніка ўжо выкары�тоўваецца. Па�прабуйце іншае."
+
+#. TRANS: Client error in form for group creation.
+#. TRANS: API validation exception thrown when nickname does not validate.
+#. TRANS: Group edit form validation error.
+#. TRANS: Group create form validation error.
+#. TRANS: Validation error in form for profile settings.
+#. TRANS: Form validation error displayed when trying to register with an invalid nickname.
+msgid "Not a valid nickname."
+msgstr "���лушнае ім� кары�тальніка."
+
+#. TRANS: Client error in form for group creation.
+#. TRANS: API validation exception thrown when homepage URL does not validate.
+#. TRANS: Validation error shown when providing an invalid homepage URL in the "Edit application" form.
+#. TRANS: Group edit form validation error.
+#. TRANS: Validation error shown when providing an invalid homepage URL in the "New application" form.
+#. TRANS: Group create form validation error.
+#. TRANS: Validation error in form for profile settings.
+#. TRANS: Form validation error displayed when trying to register with an invalid homepage URL.
+msgid "Homepage is not a valid URL."
+msgstr "���лушны URL-адра� хатн�й �таронкі."
+
+#. TRANS: Client error in form for group creation.
+#. TRANS: API validation exception thrown when full name does not validate.
+#. TRANS: Group edit form validation error.
+#. TRANS: Group create form validation error.
+#. TRANS: Validation error in form for profile settings.
+#. TRANS: Form validation error displayed when trying to register with a too long full name.
+msgid "Full name is too long (maximum 255 characters)."
+msgstr "Поўнае ім� занадта доўгае (мак�ымальна 255 �ымбал�ў)."
+
+#. TRANS: Client error shown when providing too long a description during group creation.
+#. TRANS: %d is the maximum number of allowed characters.
+#. TRANS: API validation exception thrown when description does not validate.
+#. TRANS: %d is the maximum description length and used for plural.
+#. TRANS: Validation error shown when providing too long a description in the "Edit application" form.
+#. TRANS: %d is the maximum number of allowed characters.
+#. TRANS: Group edit form validation error.
+#. TRANS: Client error shown when providing too long a description when editing a list.
+#. TRANS: %d is the maximum number of allowed characters.
+#. TRANS: Form validation error in New application form.
+#. TRANS: %d is the maximum number of characters for the description.
+#. TRANS: Group create form validation error.
+#. TRANS: %d is the maximum number of allowed characters.
+#, php-format
+msgid "Description is too long (maximum %d character)."
+msgid_plural "Description is too long (maximum %d characters)."
+msgstr[0] "�пі�аньне занадта доўгае (мак�ымальна %d �ымбаль)."
+msgstr[1] "�пі�аньне занадта доўгае (мак�ымальна %d �ымбалі)."
+
+#. TRANS: Client error shown when providing too long a location during group creation.
+#. TRANS: API validation exception thrown when location does not validate.
+#. TRANS: Group edit form validation error.
+#. TRANS: Group create form validation error.
+#. TRANS: Validation error in form for profile settings.
+#. TRANS: Form validation error displayed when trying to register with a too long location.
+msgid "Location is too long (maximum 255 characters)."
+msgstr "Знаходжаньне занадта доўгае (мак�ымальна 255 �ымбал�ў)."
+
+#. TRANS: Client error shown when providing too many aliases during group creation.
+#. TRANS: %d is the maximum number of allowed aliases.
+#. TRANS: API validation exception thrown when aliases do not validate.
+#. TRANS: %d is the maximum number of aliases and used for plural.
+#. TRANS: Group edit form validation error.
+#. TRANS: %d is the maximum number of allowed aliases.
+#. TRANS: Group create form validation error.
+#. TRANS: %d is the maximum number of allowed aliases.
+#, php-format
+msgid "Too many aliases! Maximum %d allowed."
+msgid_plural "Too many aliases! Maximum %d allowed."
+msgstr[0] "Зашмат п��ўданімаў! Мак�ымальна дазволена %d."
+msgstr[1] "Зашмат п��ўданімаў! Мак�ымальна дазволена %d."
+
+#. TRANS: Client error shown when providing an invalid alias during group creation.
+#. TRANS: %s is the invalid alias.
+#. TRANS: API validation exception thrown when aliases does not validate.
+#. TRANS: %s is the invalid alias.
+#, php-format
+msgid "Invalid alias: \"%s\"."
+msgstr "���лушны п��ўданім: «%s»."
+
+#. TRANS: Client error displayed when trying to use an alias during group creation that is already in use.
+#. TRANS: %s is the alias that is already in use.
+#. TRANS: API validation exception thrown when aliases is already used.
+#. TRANS: %s is the already used alias.
+#. TRANS: Group edit form validation error.
+#. TRANS: Group create form validation error. %s is the already used alias.
+#, php-format
+msgid "Alias \"%s\" already in use. Try another one."
+msgstr "П��ўданім «%s» ўжо выкары�тоўваецца. Па�прабуйце іншы."
+
+#. TRANS: Client error displayed when trying to use an alias during group creation that is the same as the group's nickname.
+#. TRANS: Group edit form validation error.
+msgid "Alias can't be the same as nickname."
+msgstr "П��ўданім н� можа �упадаць з м�нушкай."
+
+#. TRANS: Client error displayed when checking group membership for a non-existing group.
+#. TRANS: Client error displayed when trying to join a group that does not exist.
+#. TRANS: Client error displayed when trying to leave a group that does not exist.
+#. TRANS: Client error displayed trying to show group membership on a non-existing group.
+#. TRANS: Client error displayed when not providing a group or an invalid group.
+#. TRANS: Client error displayed when trying to show a group that could not be found.
+#. TRANS: Client error displayed requesting most recent notices to a group for a non-existing group.
+msgid "Group not found."
+msgstr "Група н� знойдзена�."
+
+#. TRANS: Server error displayed when trying to join a group the user is already a member of.
+#. TRANS: Client error displayed when trying to join a group while already a member.
+#. TRANS: Error text shown a user tries to join a group they already are a member of.
+msgid "You are already a member of that group."
+msgstr "Вы ўжо зь�ўл�еце�� ўдзельнікам г�тай групы."
+
+#. TRANS: Server error displayed when trying to join a group the user is blocked from joining.
+#. TRANS: Client error displayed when trying to join a group while being blocked form joining it.
+#. TRANS: Error text shown when a user tries to join a group they are blocked from joining.
+msgid "You have been blocked from that group by the admin."
+msgstr "Вы былі забл�каваны� ў г�тай групе адміні�тратарам."
+
+#. TRANS: Server error displayed when joining a group failed in the database.
+#. TRANS: %1$s is the joining user's nickname, $2$s is the group nickname for which the join failed.
+#. TRANS: Message given having failed to add a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#, php-format
+msgid "Could not join user %1$s to group %2$s."
+msgstr "�емагчыма далучыць кары�тальніка %1$s да групы %2$s."
+
+#. TRANS: Server error displayed when trying to leave a group the user is not a member of.
+msgid "You are not a member of this group."
+msgstr "Вы не зь�ўл�еце�� ўдзельнікам г�тай групы."
+
+#. TRANS: Server error displayed when leaving a group failed in the database.
+#. TRANS: %1$s is the leaving user's nickname, $2$s is the group nickname for which the leave failed.
+#. TRANS: Message given having failed to remove a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#, php-format
+msgid "Could not remove user %1$s from group %2$s."
+msgstr "�емагчыма выдаліць кары�тальніка %1$s з групы %2$s."
+
+#. TRANS: Used as title in check for group membership. %s is a user name.
+#, php-format
+msgid "%s's groups"
+msgstr "Групы %s"
+
+#. TRANS: Used as subtitle in check for group membership. %1$s is the site name, %2$s is a user name.
+#, php-format
+msgid "%1$s groups %2$s is a member of."
+msgstr "Групы %1$s, удзельнікам �кіх зь�ўл�ецца %2$s."
+
+#. TRANS: Message is used as a title when listing the lastest 20 groups. %s is a site name.
+#. TRANS: Page title for first page of groups for a user.
+#. TRANS: %s is a nickname.
+#, php-format
+msgid "%s groups"
+msgstr "Групы %s"
+
+#. TRANS: Message is used as a subtitle when listing the latest 20 groups. %s is a site name.
+#, php-format
+msgid "groups on %s"
+msgstr "групы на %s"
+
+#. TRANS: Client error displayed when trying to edit a group without being an admin.
+#. TRANS: Client error displayed trying to edit a group while not being a group admin.
+#. TRANS: Client error displayed when trying to change group logo settings while not being a group admin.
+msgid "You must be an admin to edit the group."
+msgstr "Вы павінны быць адміні�тратарам каб р�дагаваць групу."
+
+#. TRANS: Server error displayed when group update fails.
+#. TRANS: Server error displayed when editing a group fails.
+msgid "Could not update group."
+msgstr "�емагчыма абнавіць групу."
+
+#. TRANS: Server error displayed when adding group aliases fails.
+#. TRANS: Server error displayed when group aliases could not be added.
+#. TRANS: Server exception thrown when creating group aliases failed.
+msgid "Could not create aliases."
+msgstr "�емагчыма �тварыць п��ўданімы."
+
+#. TRANS: API validation exception thrown when nickname does not validate.
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+msgid "Nickname must have only lowercase letters and numbers and no spaces."
+msgstr ""
+"Ім� кары�тальніка павінна ўтрымліваць толькі малы� літары і лічбы, без "
+"прагалаў."
+
+#. TRANS: API validation exception thrown when alias is the same as nickname.
+#. TRANS: Group create form validation error.
+msgid "Alias cannot be the same as nickname."
+msgstr "П��ўданім н� можа �упадаць з м�нушкай."
+
+#. TRANS: Client error displayed when referring to a non-existing list.
+#. TRANS: Client error displayed trying to perform an action related to a non-existing list.
+#. TRANS: Client error displayed when referring to a non-existing list.
+msgid "List not found."
+msgstr "Сьпі� н� знойдзены."
+
+#. TRANS: Client error displayed when trying to update another user's list.
+msgid "You cannot update lists that do not belong to you."
+msgstr "Вы н� можаце абнавіць �ьпі�, �кі Вам не належыць."
+
+#. TRANS: Client error displayed when an unknown error occurs updating a list.
+#. TRANS: Client error displayed when an unknown error occurs viewing list members.
+#. TRANS: Client error displayed when an unknown error occurs in the list subscribers action.
+#. TRANS: Client error displayed when an unknown error occurs unsubscribing from a list.
+msgid "An error occured."
+msgstr "�дбыла�� памылка."
+
+#. TRANS: Client error displayed when trying to delete another user's list.
+msgid "You cannot delete lists that do not belong to you."
+msgstr "Вы н� можаце выдаліць �ьпі�, �кі Вам не належыць."
+
+#. TRANS: Client error displayed when referring to a non-list member.
+msgid "The specified user is not a member of this list."
+msgstr "Пазначаны кары�тальнік не ўваходзіць у г�ты �ьпі�."
+
+#. TRANS: Client error displayed when trying to add members to a list without having the right to do so.
+msgid "You are not allowed to add members to this list."
+msgstr "Вам не дазволена дадаваць удзельнікаў у г�ты �ьпі�."
+
+#. TRANS: Client error displayed when trying to modify list members without specifying them.
+msgid "You must specify a member."
+msgstr "Вам неабходна пазначыць удзельніка."
+
+#. TRANS: Client error displayed when trying to remove members from a list without having the right to do so.
+msgid "You are not allowed to remove members from this list."
+msgstr "Вам не дазволена выдал�ць удзельнікаў з г�тага �ьпі�у."
+
+#. TRANS: Client error displayed when trying to remove a list member that is not part of a list.
+msgid "The user you are trying to remove from the list is not a member."
+msgstr ""
+"Удзельнік, �кога Вы �прабуеце выдаліць �а �ьпі�у, не зь�ўл�ецца ўдзельнікам."
+
+#. TRANS: Client error displayed when trying to create a list without a name.
+msgid "A list must have a name."
+msgstr "Сьпі� павінен мець назву."
+
+#. TRANS: Client error displayed when a membership check for a user is nagative.
+msgid "The specified user is not a subscriber of this list."
+msgstr "Пазначаны кары�тальнік не зь�ўл�ецца падпі�чыкам г�тага �ьпі�у."
+
+#. TRANS: Client error displayed when trying to unsubscribe from a non-subscribed list.
+msgid "You are not subscribed to this list."
+msgstr "Вы не падпі�аны на г�ты �ьпі�."
+
+#. TRANS: Client error displayed when uploading a media file has failed.
+msgid "Upload failed."
+msgstr "�емагчыма загрузіць."
+
+#. TRANS: Client error given from the OAuth API when the request token or verifier is invalid.
+msgid "Invalid request token or verifier."
+msgstr "���лушны запыт ключа ці пацьверджаньн�."
+
+#. TRANS: Client error given when no oauth_token was passed to the OAuth API.
+msgid "No oauth_token parameter provided."
+msgstr "�е пададзены парам�тар oauth_token."
+
+#. TRANS: Client error given when an invalid request token was passed to the OAuth API.
+msgid "Invalid request token."
+msgstr "���лушны ключ запыту."
+
+#. TRANS: Client error given when an invalid request token was passed to the OAuth API.
+msgid "Request token already authorized."
+msgstr "Ключ запыту ўжо аўтарызаваны."
+
+#. TRANS: Form validation error given when an invalid username and/or password was passed to the OAuth API.
+msgid "Invalid nickname / password!"
+msgstr "���лушнае ім� ці пароль!"
+
+#. TRANS: Server error displayed when a database action fails.
+msgid "Database error inserting oauth_token_association."
+msgstr "Памылка базы зьве�так падча� даданьн� oauth_token_association."
+
+#. TRANS: Client error given on when invalid data was passed through a form in the OAuth API.
+#. TRANS: Unexpected validation error on avatar upload form.
+#. TRANS: Client error displayed submitting invalid form data for edit application.
+#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
+#. TRANS: Form validation error message when an unsupported argument is used.
+#. TRANS: Message given submitting a form with an unknown action in Instant Messaging settings.
+#. TRANS: Client error displayed when encountering an unexpected action on form submission.
+#. TRANS: Client error when submitting a form with unexpected information.
+#. TRANS: Client error displayed when unexpected data is posted in the password recovery form.
+#. TRANS: Message given submitting a form with an unknown action in SMS settings.
+msgid "Unexpected form submission."
+msgstr "�ечакана� адпраўка формы."
+
+#. TRANS: Title for a page where a user can confirm/deny account access by an external application.
+msgid "An application would like to connect to your account"
+msgstr "Да�та�аваньне жадае далучыцца да Вашага рахунку"
+
+#. TRANS: Fieldset legend.
+msgid "Allow or deny access"
+msgstr "Дазволіць ці забараніць до�туп"
+
+#. TRANS: User notification of external application requesting account access.
+#. TRANS: %3$s is the access type requested (read-write or read-only), %4$s is the StatusNet sitename.
+#, php-format
+msgid ""
+"An application would like the ability to <strong>%3$s</strong> your %4$s "
+"account data. You should only give access to your %4$s account to third "
+"parties you trust."
+msgstr ""
+"Да�та�аваньне пра�іць магчыма�ьць <strong>%3$s</strong> зьве�так Вашага "
+"рахунку %4$s. Вам неабходна даваць до�туп да Вашага рахунку %4$s толькі тым "
+"да�та�аваньн�м, �кім Вы дав�раеце."
+
+#. TRANS: User notification of external application requesting account access.
+#. TRANS: %1$s is the application name requesting access, %2$s is the organisation behind the application,
+#. TRANS: %3$s is the access type requested, %4$s is the StatusNet sitename.
+#, php-format
+msgid ""
+"The application <strong>%1$s</strong> by <strong>%2$s</strong> would like "
+"the ability to <strong>%3$s</strong> your %4$s account data. You should only "
+"give access to your %4$s account to third parties you trust."
+msgstr ""
+"Да�та�аваньне <strong>%1$s</strong> ад <strong>%2$s</strong> пра�іць "
+"магчыма�ьць <strong>%3$s</strong> зьве�так Вашага рахунку %4$s. Вам "
+"неабходна даваць до�туп да Вашага рахунку %4$s толькі тым да�та�аваньн�м, "
+"�кім Вы дав�раеце."
+
+#. TRANS: Fieldset legend.
+msgctxt "LEGEND"
+msgid "Account"
+msgstr "Рахунак"
+
+#. TRANS: Field label on OAuth API authorisation form.
+#. TRANS: Field label in form for profile settings.
+#. TRANS: Field label on account registration page.
+#. TRANS: Field label on group edit form.
+#. TRANS: Dropdown option for searching in profiles.
+msgid "Nickname"
+msgstr "М�нушка"
+
+#. TRANS: Field label on OAuth API authorisation form.
+#. TRANS: Field label on login page.
+#. TRANS: Field label on account registration page.
+msgid "Password"
+msgstr "Пароль"
+
+#. TRANS: Button text that when clicked will cancel the process of allowing access to an account
+#. TRANS: by an external application.
+#. TRANS: Button label to cancel an e-mail address confirmation procedure.
+#. TRANS: Button label to cancel an IM address confirmation procedure.
+#. TRANS: Button label to cancel a SMS address confirmation procedure.
+#. TRANS: Button label in the "Edit application" form.
+msgctxt "BUTTON"
+msgid "Cancel"
+msgstr "Ска�аваць"
+
+#. TRANS: Button text that when clicked will allow access to an account by an external application.
+msgctxt "BUTTON"
+msgid "Allow"
+msgstr "Дазволіць"
+
+#. TRANS: Form instructions.
+msgid "Authorize access to your account information."
+msgstr "Дазволіць до�туп да інфармацыі ў Вашым рахунку."
+
+#. TRANS: Header for user notification after revoking OAuth access to an application.
+msgid "Authorization canceled."
+msgstr "�ўтарызацы� адменена�."
+
+#. TRANS: User notification after revoking OAuth access to an application.
+#. TRANS: %s is an OAuth token.
+#, php-format
+msgid "The request token %s has been revoked."
+msgstr "Ключ запыту %s быў адкліканы."
+
+#. TRANS: Title of the page notifying the user that an anonymous client application was successfully authorized to access the user's account with OAuth.
+msgid "You have successfully authorized the application"
+msgstr "Вы па�ьп�хова аўтарызавалі да�та�аваньне"
+
+#. TRANS: Message notifying the user that an anonymous client application was successfully authorized to access the user's account with OAuth.
+msgid ""
+"Please return to the application and enter the following security code to "
+"complete the process."
+msgstr ""
+"Калі ла�ка, в�рніце�� да да�та�аваньн� і ўв�дзіце на�тупны код б��ьпекі, каб "
+"�кончыць прац��."
+
+#. TRANS: Title of the page notifying the user that the client application was successfully authorized to access the user's account with OAuth.
+#. TRANS: %s is the authorised application name.
+#, php-format
+msgid "You have successfully authorized %s"
+msgstr "Вы па�ьп�хова аўтарызавалі %s"
+
+#. TRANS: Message notifying the user that the client application was successfully authorized to access the user's account with OAuth.
+#. TRANS: %s is the authorised application name.
+#, php-format
+msgid ""
+"Please return to %s and enter the following security code to complete the "
+"process."
+msgstr ""
+"Калі ла�ка, в�рніце�� да %s і ўв�дзіце на�тупны код б��ьпекі, каб �кончыць "
+"прац��."
+
+#. TRANS: Client error displayed trying to delete a status not using POST or DELETE.
+#. TRANS: POST and DELETE should not be translated.
+msgid "This method requires a POST or DELETE."
+msgstr "Г�ты м�тад патрабуе POST ці DELETE."
+
+#. TRANS: Client error displayed trying to delete a status of another user.
+msgid "You may not delete another user's status."
+msgstr "Вы н� можаце выдал�ць �тату� іншых кары�тальнікаў."
+
+#. TRANS: Client error displayed trying to repeat a non-existing notice through the API.
+#. TRANS: Client error displayed trying to display redents of a non-exiting notice.
+#. TRANS: Client exception thrown when referencing a non-existing notice.
+#. TRANS: Error message displayed trying to delete a non-existing notice.
+#. TRANS: Client error displayed trying to show a non-existing notice.
+msgid "No such notice."
+msgstr "��ма такога запі�у."
+
+#. TRANS: Client error displayed calling an unsupported HTTP error in API status show.
+#. TRANS: Client exception thrown when using an unsupported HTTP method.
+#. TRANS: Client exception thrown using an unsupported HTTP method.
+#. TRANS: Client exception thrown when using an unsupported HTTP method.
+#. TRANS: Client error shown when using a non-supported HTTP method.
+#. TRANS: Client exception thrown when using an unsupported HTTP method.
+msgid "HTTP method not supported."
+msgstr "HTTP-м�тад не падтрымліваецца."
+
+#. TRANS: Exception thrown requesting an unsupported notice output format.
+#. TRANS: %s is the requested output format.
+#, php-format
+msgid "Unsupported format: %s."
+msgstr "�епадтрымліваемы фармат: %s."
+
+#. TRANS: Client error displayed requesting a deleted status.
+msgid "Status deleted."
+msgstr "Стату� выдалены."
+
+#. TRANS: Client error displayed requesting a status with an invalid ID.
+msgid "No status with that ID found."
+msgstr "�� знойдзены �тату� з такім ід�нтыфікатарам."
+
+#. TRANS: Client error displayed when trying to delete a notice not using the Atom format.
+msgid "Can only delete using the Atom format."
+msgstr "Магчыма выдаліць толькі з выкары�таньнем фармату Atom."
+
+#. TRANS: Client error displayed when a user has no rights to delete notices of other users.
+#. TRANS: Error message displayed trying to delete a notice that was not made by the current user.
+msgid "Cannot delete this notice."
+msgstr "�емагчыма выдаліць г�ты запі�."
+
+#. TRANS: Confirmation of notice deletion in API. %d is the ID (number) of the deleted notice.
+#, php-format
+msgid "Deleted notice %d"
+msgstr "Паведамленьне %d выдаленае"
+
+#. TRANS: Client error displayed when the parameter "status" is missing.
+msgid "Client must provide a 'status' parameter with a value."
+msgstr "Кліент павінен падаць парам�тар 'status' �а знач�ньнем."
+
+#. TRANS: Client error displayed exceeding the maximum notice length.
+#. TRANS: %d is the maximum length for a notice.
+#. TRANS: Client error displayed when the parameter "status" is missing.
+#. TRANS: %d is the maximum number of character for a notice.
+#. TRANS: Error message in incoming mail handler used when an incoming e-mail contains too many characters.
+#, php-format
+msgid "That's too long. Maximum notice size is %d character."
+msgid_plural "That's too long. Maximum notice size is %d characters."
+msgstr[0] ""
+"Г�та занадта доўгае паведамленьне. Мак�ымальны памер �кладае %d �ымбаль."
+msgstr[1] ""
+"Г�та занадта доўгае паведамленьне. Мак�ымальны памер �кладае %d �ымбалі."
+
+#. TRANS: Client error displayed when replying to a non-existing notice.
+msgid "Parent notice not found."
+msgstr "Бацькоў�кі запі� н� знойдзены."
+
+#. TRANS: Client error displayed exceeding the maximum notice length.
+#. TRANS: %d is the maximum lenth for a notice.
+#. TRANS: Client error displayed exceeding the maximum notice length.
+#. TRANS: %d is the maximum length for a notice.
+#, php-format
+msgid "Maximum notice size is %d character, including attachment URL."
+msgid_plural "Maximum notice size is %d characters, including attachment URL."
+msgstr[0] ""
+"Мак�ымальны памер запі�у �кладае %d �ымбаль, уключаючы URL-адра� укладаньн�."
+msgstr[1] ""
+"Мак�ымальны памер запі�у �кладае %d �ымбалі, уключаючы URL-адра� укладаньн�."
+
+#. TRANS: Client error displayed when requesting profiles of followers in an unsupported format.
+#. TRANS: Client error displayed when requesting IDs of followers in an unsupported format.
+msgid "Unsupported format."
+msgstr "�епадтрымліваемы фармат."
+
+#. TRANS: Title for timeline of most recent favourite notices by a user.
+#. TRANS: %1$s is the StatusNet sitename, %2$s is a user nickname.
+#, php-format
+msgid "%1$s / Favorites from %2$s"
+msgstr "%1$s / Улюблёны� ад %2$s"
+
+#. TRANS: Subtitle for timeline of most recent favourite notices by a user.
+#. TRANS: %1$s is the StatusNet sitename, %2$s is a user's full name,
+#. TRANS: %3$s is a user nickname.
+#, php-format
+msgid "%1$s updates favorited by %2$s / %3$s."
+msgstr "%1$s абнаўл�е ўлюблёны� паводле %2$s / %3$s."
+
+#. TRANS: Server error displayed whe trying to get a timeline fails.
+#. TRANS: %s is the error message.
+#, php-format
+msgid "Could not generate feed for list - %s"
+msgstr "�емагчыма �тварыць �тужку дл� �ьпі�у: %s"
+
+#. TRANS: Title for timeline of most recent mentions of a user.
+#. TRANS: %1$s is the StatusNet sitename, %2$s is a user nickname.
+#, php-format
+msgid "%1$s / Updates mentioning %2$s"
+msgstr "%1$s / �бнаўленьні, �кі� ўзгадваюць %2$s"
+
+#. TRANS: Subtitle for timeline of most recent mentions of a user.
+#. TRANS: %1$s is the StatusNet sitename, %2$s is a user nickname,
+#. TRANS: %3$s is a user's full name.
+#, php-format
+msgid "%1$s updates that reply to updates from %2$s / %3$s."
+msgstr "%1$s абнавіў г�ты адказ на абнаўленьні ад %2$s / %3$s."
+
+#. TRANS: Title for site timeline. %s is the StatusNet sitename.
+#. TRANS: Public RSS feed title. %s is the StatusNet site name.
+#, php-format
+msgid "%s public timeline"
+msgstr "%s публічна� �тужка паведамленьн�ў"
+
+#. TRANS: Subtitle for site timeline. %s is the StatusNet sitename.
+#, php-format
+msgid "%s updates from everyone!"
+msgstr "%s абнаўленьн�ў ад у�іх!"
+
+#. TRANS: Server error displayed calling unimplemented API method for 'retweeted by me'.
+msgid "Unimplemented."
+msgstr "�е р�алізавана."
+
+#. TRANS: Title for Atom feed "repeated to me". %s is the user nickname.
+#, php-format
+msgid "Repeated to %s"
+msgstr "Паўторана дл� %s"
+
+#. TRANS: Subtitle for API action that shows most recent notices that are repeats in user's inbox.
+#. TRANS: %1$s is the sitename, %2$s is a user nickname, %3$s is a user profile name.
+#, php-format
+msgid "%1$s notices that were to repeated to %2$s / %3$s."
+msgstr "%1$s запі�ы �кі� былі паўтораны� на %2$s / %3$s."
+
+#. TRANS: Title of list of repeated notices of the logged in user.
+#. TRANS: %s is the nickname of the logged in user.
+#, php-format
+msgid "Repeats of %s"
+msgstr "Паўторы за %s"
+
+#. TRANS: Subtitle of API time with retweets of me.
+#. TRANS: %1$s is the StatusNet sitename, %2$s is the user nickname, %3$s is the user profile name.
+#, php-format
+msgid "%1$s notices that %2$s / %3$s has repeated."
+msgstr "%1$s запі�ы, �кі� былі паўтораны� %2$s / %3$s."
+
+#. TRANS: Title for timeline with lastest notices with a given tag.
+#. TRANS: %s is the tag.
+#. TRANS: Title for first page of notices with tags.
+#. TRANS: %s is the tag.
+#, php-format
+msgid "Notices tagged with %s"
+msgstr "Запі�ы з т�гам %s"
+
+#. TRANS: Subtitle for timeline with lastest notices with a given tag.
+#. TRANS: %1$s is the tag, $2$s is the StatusNet sitename.
+#. TRANS: Tag feed description.
+#. TRANS: %1$s is the tag name, %2$s is the StatusNet sitename.
+#, php-format
+msgid "Updates tagged with %1$s on %2$s!"
+msgstr "�бнаўленьні з т�гам %1$s на %2$s!"
+
+#. TRANS: Client error displayed trying to add a notice to another user's timeline.
+msgid "Only the user can add to their own timeline."
+msgstr "Толькі кары�тальнік можа дадаваць ва ула�ную �тужку паведамленьн�ў."
+
+#. TRANS: Client error displayed when using another format than AtomPub.
+msgid "Only accept AtomPub for Atom feeds."
+msgstr "Прыймаць толькі AtomPub дл� �тужак Atom."
+
+#. TRANS: Client error displayed attempting to post an empty API notice.
+msgid "Atom post must not be empty."
+msgstr "Паведамленьне Atom н� можа быць пу�тым."
+
+#. TRANS: Client error displayed attempting to post an API that is not well-formed XML.
+msgid "Atom post must be well-formed XML."
+msgstr "Паведамленьне Atom павінна быць добра �фармаваным XML."
+
+#. TRANS: Client error displayed when not using an Atom entry.
+msgid "Atom post must be an Atom entry."
+msgstr "Atom-паведамленьне павінна быць аб'ектам Atom."
+
+#. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
+msgid "Can only handle POST activities."
+msgstr "Магчыма� апрацоўка толькі POST-актыўна�ьці."
+
+#. TRANS: Client error displayed when using an unsupported activity object type.
+#. TRANS: %s is the unsupported activity object type.
+#, php-format
+msgid "Cannot handle activity object type \"%s\"."
+msgstr "�емагчыма апрацаваць актыўна�ьць аб'екта тыпу «%s»."
+
+#. TRANS: Client error displayed when posting a notice without content through the API.
+#. TRANS: %d is the notice ID (number).
+#, php-format
+msgid "No content for notice %d."
+msgstr "��ма зьме�ту ў запі�у %d."
+
+#. TRANS: Client error displayed when using another format than AtomPub.
+#. TRANS: %s is the notice URI.
+#, php-format
+msgid "Notice with URI \"%s\" already exists."
+msgstr "�бв�шч�ньне з URI «%s» ужо і�нуе."
+
+#. TRANS: Server error for unfinished API method showTrends.
+msgid "API method under construction."
+msgstr "М�тад API знаходзіцца ў ра�працоўцы."
+
+#. TRANS: Client error displayed when requesting user information for a non-existing user.
+msgid "User not found."
+msgstr "Кары�тальнік н� знойдзены."
+
+#. TRANS: Client error displayed when trying to leave a group while not logged in.
+msgid "You must be logged in to leave a group."
+msgstr "Вы павінны ўвай�ьці ў �ы�т�му, каб пакінуць групу."
+
+#. TRANS: Client error displayed when trying to leave a non-local group.
+#. TRANS: Client error displayed when trying to leave a non-existing group.
+#. TRANS: Client exception thrown when referencing a non-existing group.
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
+#. TRANS: Client error displayed when trying to leave a non-local group.
+#. TRANS: Client error displayed when trying to leave a non-existing group.
+#. TRANS: Client error when trying to delete a non-local group.
+#. TRANS: Client error when trying to delete a non-existing group.
+#. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed without providing a group nickname.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed for a non-local group.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed for a nickname that is not a group.
+#. TRANS: Client error displayed trying to block a user from a group while specifying a non-existing group.
+#. TRANS: Client error displayed referring to a group's permalink for a non-existing group ID.
+#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
+#. TRANS: Client error displayed when trying to view group members for a non-existing group.
+#. TRANS: Client error displayed when trying to view group members for an object that is not a group.
+#. TRANS: Client error displayed when requesting a group RSS feed for group that does not exist.
+#. TRANS: Client error displayed when requesting a group RSS feed for an object that is not a group.
+#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
+#. TRANS: Client error displayed when trying to join a non-local group.
+#. TRANS: Client error displayed when trying to join a non-existing group.
+#. TRANS: Client error displayed when trying to leave a non-local group.
+#. TRANS: Client error displayed when trying to leave a non-existing group.
+#. TRANS: Client error displayed when providing an invalid group ID on the Make Admin page.
+#. TRANS: Command exception text shown when a group is requested that does not exist.
+#. TRANS: Error text shown when trying to leave a group that does not exist.
+#. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
+#. TRANS: Client error displayed if no local group with a given name was found requesting group page.
+msgid "No such group."
+msgstr "��ма такой групы."
+
+#. TRANS: Client error displayed when trying to leave a group without providing a group name or group ID.
+#. TRANS: Client error when trying to delete a group without providing a nickname or ID for the group.
+#. TRANS: Client error displayed when trying to join a group without providing a group name or group ID.
+#. TRANS: Client error displayed when trying to leave a group without providing a group name or group ID.
+msgid "No nickname or ID."
+msgstr "��ма м�нушкі ці ід�нтыфікатара."
+
+#. TRANS: Client error displayed trying to approve group membership while not logged in.
+#. TRANS: Client error displayed when trying to leave a group while not logged in.
+msgid "Must be logged in."
+msgstr "Тр�ба ўвай�ьці ў �ы�т�му."
+
+#. TRANS: Client error displayed trying to approve group membership while not a group administrator.
+#. TRANS: Client error displayed when trying to approve or cancel a group join request without
+#. TRANS: being a group administrator.
+msgid "Only group admin can approve or cancel join requests."
+msgstr ""
+"Толькі адміні�тратар групы можа зацьвердзіць ці адхіліць запыты на "
+"далуч�ньне."
+
+#. TRANS: Client error displayed trying to approve group membership without specifying a profile to approve.
+#. TRANS: Client error displayed trying to approve subscriptionswithout specifying a profile to approve.
+msgid "Must specify a profile."
+msgstr "Тр�ба пазначыць профіль."
+
+#. TRANS: Client error displayed trying to approve group membership for a non-existing request.
+#. TRANS: %s is a nickname.
+#. TRANS: Client error displayed when trying to approve a non-existing group join request.
+#. TRANS: %s is a user nickname.
+#, php-format
+msgid "%s is not in the moderation queue for this group."
+msgstr "%s не зь�ўл�ецца мад�ратарам чаргі дл� г�тай групы."
+
+#. TRANS: Client error displayed trying to approve/deny group membership.
+#. TRANS: Client error displayed trying to approve/deny subscription.
+msgid "Internal error: received neither cancel nor abort."
+msgstr "Унутрана� памылка: не атрымана ні «�ка�аваць» ці «адм�ніць»"
+
+#. TRANS: Client error displayed trying to approve/deny group membership.
+#. TRANS: Client error displayed trying to approve/deny  subscription
+msgid "Internal error: received both cancel and abort."
+msgstr "Унутрана� памылка: атрымана і «�ка�аваць» і «адм�ніць»."
+
+#. TRANS: Server error displayed when cancelling a queued group join request fails.
+#. TRANS: %1$s is the leaving user's nickname, $2$s is the group nickname for which the leave failed.
+#, php-format
+msgid "Could not cancel request for user %1$s to join group %2$s."
+msgstr ""
+"�емагчыма �ка�аваць запыт дл� кары�тальніка %1$s на далуч�ньне да групы %2$s."
+
+#. TRANS: Title for leave group page after group join request is approved/disapproved.
+#. TRANS: %1$s is the user nickname, %2$s is the group nickname.
+#, php-format
+msgctxt "TITLE"
+msgid "%1$s's request for %2$s"
+msgstr "Запыт %1$s на %2$s"
+
+#. TRANS: Message on page for group admin after approving a join request.
+msgid "Join request approved."
+msgstr "Запыт на далуч�ньне зацьверджаны."
+
+#. TRANS: Message on page for group admin after rejecting a join request.
+msgid "Join request canceled."
+msgstr "Запыт на далуч�ньне адхілены."
+
+#. TRANS: Client error displayed trying to approve subscription for a non-existing request.
+#. TRANS: %s is a user nickname.
+#, php-format
+msgid "%s is not in the moderation queue for your subscriptions."
+msgstr "%s н� знаходзіцца ў чарзе на мад�рацыю дл� Вашых падпі�ак."
+
+#. TRANS: Server error displayed when cancelling a queued subscription request fails.
+#. TRANS: %1$s is the leaving user's nickname, $2$s is the nickname for which the leave failed.
+#, php-format
+msgid "Could not cancel or approve request for user %1$s to join group %2$s."
+msgstr ""
+"�емагчыма �ка�аваць ці зацьвердзіць запыт дл� кары�тальніка %1$s на "
+"далуч�ньне да групы %2$s."
+
+#. TRANS: Title for subscription approval ajax return
+#. TRANS: %1$s is the approved user's nickname
+#, php-format
+msgctxt "TITLE"
+msgid "%1$s's request"
+msgstr "Запыт %1$s"
+
+#. TRANS: Message on page for user after approving a subscription request.
+msgid "Subscription approved."
+msgstr "Падпі�ка зацьверджана�."
+
+#. TRANS: Message on page for user after rejecting a subscription request.
+msgid "Subscription canceled."
+msgstr "Падпі�ка �ка�авана�."
+
+#. TRANS: Subtitle for Atom favorites feed.
+#. TRANS: %1$s is a user nickname, %2$s is the StatusNet sitename.
+#, php-format
+msgid "Notices %1$s has favorited on %2$s"
+msgstr "Запі�ы %1$s былі дададзены� да ўлюблёных на %2$s"
+
+#. TRANS: Client exception thrown when trying to set a favorite for another user.
+#. TRANS: Client exception thrown when trying to subscribe another user.
+msgid "Cannot add someone else's subscription."
+msgstr "�емагчыма дадаць падпі�ку іншага кары�тальніка."
+
+#. TRANS: Client exception thrown when trying use an incorrect activity verb for the Atom pub method.
+msgid "Can only handle favorite activities."
+msgstr "Магчыма� апрацоўка толькі актыўна�ьці ўлюблёных."
+
+#. TRANS: Client exception thrown when trying favorite an object that is not a notice.
+msgid "Can only fave notices."
+msgstr "Можна толькі дадаваць абв�шч�ньні ва ўлюблёны�."
+
+#. TRANS: Client exception thrown when trying favorite a notice without content.
+msgid "Unknown notice."
+msgstr "�ев�домы запі�."
+
+#. TRANS: Client exception thrown when trying favorite an already favorited notice.
+msgid "Already a favorite."
+msgstr "Ужо ва ўлюблёных."
+
+#. TRANS: Title for group membership feed.
+#. TRANS: %s is a username.
+#, php-format
+msgid "Group memberships of %s"
+msgstr "Удзел у групах %s"
+
+#. TRANS: Subtitle for group membership feed.
+#. TRANS: %1$s is a username, %2$s is the StatusNet sitename.
+#, php-format
+msgid "Groups %1$s is a member of on %2$s"
+msgstr "Групы %1$s ў �кіх знаходз�цца на %2$s"
+
+#. TRANS: Client exception thrown when trying subscribe someone else to a group.
+msgid "Cannot add someone else's membership."
+msgstr "�емагчыма дадаць удзел іншаму кары�тальніку."
+
+#. TRANS: Client error displayed when not using the join verb.
+msgid "Can only handle join activities."
+msgstr "Магчыма� апрацоўка толькі актыўна�ьць далуч�ньн�."
+
+#. TRANS: Client exception thrown when trying to subscribe to a non-existing group.
+msgid "Unknown group."
+msgstr "�ев�дома� група."
+
+#. TRANS: Client exception thrown when trying to subscribe to an already subscribed group.
+msgid "Already a member."
+msgstr "Ужо ўдзельнік."
+
+#. TRANS: Client exception thrown when trying to subscribe to group while blocked from that group.
+msgid "Blocked by admin."
+msgstr "Забл�каваны адміні�тратарам."
+
+#. TRANS: Client exception thrown when referencing a non-existing favorite.
+msgid "No such favorite."
+msgstr "��ма такога ўлюблёнага запі�у."
+
+#. TRANS: Client exception thrown when trying to remove a favorite notice of another user.
+msgid "Cannot delete someone else's favorite."
+msgstr "�емагчыма выдаліць з чужога �ьпі�у ўлюблёных."
+
+#. TRANS: Client exception thrown when trying to show membership of a non-subscribed group
+msgid "Not a member."
+msgstr "�е зь�ўл�ецца ўдзельнікам."
+
+#. TRANS: Client exception thrown when deleting someone else's membership.
+msgid "Cannot delete someone else's membership."
+msgstr "�емагчыма выдаліць чужы удзел."
+
+#. TRANS: Client exception thrown when trying to display a subscription for a non-existing profile ID.
+#. TRANS: %d is the non-existing profile ID number.
+#, php-format
+msgid "No such profile id: %d."
+msgstr "��ма такога ід�нтыфікатара профілю: %d."
+
+#. TRANS: Client exception thrown when trying to display a subscription for a non-subscribed profile ID.
+#. TRANS: %1$d is the non-existing subscriber ID number, $2$d is the ID of the profile that was not subscribed to.
+#, php-format
+msgid "Profile %1$d not subscribed to profile %2$d."
+msgstr "Профіль %1$d не падпі�аны на профіль %2$d."
+
+#. TRANS: Client exception thrown when trying to delete a subscription of another user.
+msgid "Cannot delete someone else's subscription."
+msgstr "�емагчыма выдаліць чужую падпі�ку."
+
+#. TRANS: Subtitle for Atom subscription feed.
+#. TRANS: %1$s is a user nickname, %s$s is the StatusNet sitename.
+#, php-format
+msgid "People %1$s has subscribed to on %2$s"
+msgstr "Людзі %1$s падпі�аны� на %2$s"
+
+#. TRANS: Client error displayed when not using the follow verb.
+msgid "Can only handle Follow activities."
+msgstr "Магчыма� апрацоўка толькі на�тупных актыўна�ьц�ў."
+
+#. TRANS: Client exception thrown when subscribing to an object that is not a person.
+msgid "Can only follow people."
+msgstr "Магчыма �ачыць толькі за людзьмі."
+
+#. TRANS: Client exception thrown when subscribing to a non-existing profile.
+#. TRANS: %s is the unknown profile ID.
+#, php-format
+msgid "Unknown profile %s."
+msgstr "�ев�домы профіль %s."
+
+#. TRANS: Client error displayed trying to subscribe to an already subscribed profile.
+#. TRANS: %s is the profile the user already has a subscription on.
+#, php-format
+msgid "Already subscribed to %s."
+msgstr "Ужо падпі�аны на %s."
+
+#. TRANS: Client error displayed trying to get a non-existing attachment.
+msgid "No such attachment."
+msgstr "��ма такога далуч�ньн�."
+
+#. TRANS: Client error displayed trying to get an avatar without providing a nickname.
+#. TRANS: Client error displayed when requesting a list of blocked users for a group without providing a group nickname.
+#. TRANS: Client error displayed trying to edit a group while not proving a nickname for the group to edit.
+#. TRANS: Client error displayed when trying to change group logo settings without providing a nickname.
+#. TRANS: Client error displayed when trying to view group members without providing a group nickname.
+#. TRANS: Client error displayed when requesting a group RSS feed without providing a group nickname.
+#. TRANS: Client error displayed if no nickname argument was given requesting a group page.
+msgid "No nickname."
+msgstr "��ма м�нушкі."
+
+#. TRANS: Client error displayed trying to get an avatar without providing an avatar size.
+msgid "No size."
+msgstr "��ма памеру."
+
+#. TRANS: Client error displayed trying to get an avatar providing an invalid avatar size.
+msgid "Invalid size."
+msgstr "���лушны памер."
+
+#. TRANS: Title for avatar upload page.
+msgid "Avatar"
+msgstr "�ватара"
+
+#. TRANS: Instruction for avatar upload page.
+#. TRANS: %s is the maximum file size, for example "500b", "10kB" or "2MB".
+#, php-format
+msgid "You can upload your personal avatar. The maximum file size is %s."
+msgstr ""
+"Вы можаце загрузіць ула�ную аватару. Мак�ымальны памер файла �кладае %s."
+
+#. TRANS: Avatar upload page form legend.
+#. TRANS: Avatar upload page crop form legend.
+#. TRANS: Legend for group logo settings fieldset.
+msgid "Avatar settings"
+msgstr "У�таноўкі аватара"
+
+#. TRANS: Header on avatar upload page for thumbnail of originally uploaded avatar (h2).
+#. TRANS: Header on avatar upload crop form for thumbnail of originally uploaded avatar (h2).
+#. TRANS: Uploaded original file in group logo form.
+#. TRANS: Header for originally uploaded file before a crop on the group logo page.
+msgid "Original"
+msgstr "�рыгінальны�"
+
+#. TRANS: Header on avatar upload page for thumbnail of to be used rendition of uploaded avatar (h2).
+#. TRANS: Header on avatar upload crop form for thumbnail of to be used rendition of uploaded avatar (h2).
+#. TRANS: Header for preview of to be displayed group logo.
+#. TRANS: Header for the cropped group logo on the group logo page.
+msgid "Preview"
+msgstr "Пап�р�дні прагл�д"
+
+#. TRANS: Button on avatar upload page to delete current avatar.
+#. TRANS: Button text for user account deletion.
+#. TRANS: Submit button text the OAuth application page to delete an application.
+#. TRANS: Button text for deleting a group.
+#. TRANS: Button text to delete a list.
+msgctxt "BUTTON"
+msgid "Delete"
+msgstr "Выдаліць"
+
+#. TRANS: Button on avatar upload page to upload an avatar.
+#. TRANS: Submit button to confirm upload of a user backup file for account restore.
+msgctxt "BUTTON"
+msgid "Upload"
+msgstr "Загрузіць"
+
+#. TRANS: Button on avatar upload crop form to confirm a selected crop as avatar.
+msgctxt "BUTTON"
+msgid "Crop"
+msgstr "Выразаць"
+
+#. TRANS: Validation error on avatar upload form when no file was uploaded.
+msgid "No file uploaded."
+msgstr "�і�кіх файлаў не загружана."
+
+#. TRANS: Avatar upload form instruction after uploading a file.
+msgid "Pick a square area of the image to be your avatar."
+msgstr "Выберыце квадратны абшар вы�вы дл� Вашай аватары."
+
+#. TRANS: Server error displayed if an avatar upload went wrong somehow server side.
+#. TRANS: Server error displayed trying to crop an uploaded group logo that is no longer present.
+msgid "Lost our file data."
+msgstr "Страчаны� зьве�ткі пра файл."
+
+#. TRANS: Success message for having updated a user avatar.
+msgid "Avatar updated."
+msgstr "�ватара абноўлена�."
+
+#. TRANS: Error displayed on the avatar upload page if the avatar could not be updated for an unknown reason.
+msgid "Failed updating avatar."
+msgstr "�емагчыма абнавіць аватару."
+
+#. TRANS: Success message for deleting a user avatar.
+msgid "Avatar deleted."
+msgstr "�ватара выдалена�."
+
+#. TRANS: Title for backup account page.
+#. TRANS: Option in profile settings to create a backup of the account of the currently logged in user.
+msgid "Backup account"
+msgstr "Р�з�рвова� копі�"
+
+#. TRANS: Client exception thrown when trying to backup an account while not logged in.
+msgid "Only logged-in users can backup their account."
+msgstr ""
+"Толькі кары�тальнікі, �кі� увайшлі ў �ы�т�му, могуць зрабіць р�з�рвовую "
+"копію іх рахунку."
+
+#. TRANS: Client exception thrown when trying to backup an account without having backup rights.
+msgid "You may not backup your account."
+msgstr "Вы н� можаце �тварыць р�з�рвовую копію �вайго рахунку."
+
+#. TRANS: Information displayed on the backup account page.
+msgid ""
+"You can backup your account data in <a href=\"http://activitystrea.ms/"
+"\">Activity Streams</a> format. This is an experimental feature and provides "
+"an incomplete backup; private account information like email and IM "
+"addresses is not backed up. Additionally, uploaded files and direct messages "
+"are not backed up."
+msgstr ""
+"Вы можаце �тварыць р�з�рвовую копію зьве�так Вашага рахунку ў фармаце <a "
+"href=\"http://activitystrea.ms/\">Activity Streams</a>. Г�та "
+"�к�п�рым�нтальна� магчыма�ьць і �на прад�таўл�е н�поўную копію; прыватна� "
+"інфармацы� рахунку, напрыклад, адра� �лектроннай пошты і IM-адра�ы н� будуць "
+"�капі�ваны�. Дадаткова, загружаны� файлы і непа�р�дны� паведамленьні так�ама "
+"н� будуць �капі�ваны�."
+
+#. TRANS: Submit button to backup an account on the backup account page.
+msgctxt "BUTTON"
+msgid "Backup"
+msgstr "Р�з�рвова� копі�"
+
+#. TRANS: Title for submit button to backup an account on the backup account page.
+msgid "Backup your account."
+msgstr "Р�з�рвовае капі�ваньне Вашага рахунку."
+
+#. TRANS: Client error displayed when blocking a user that has already been blocked.
+msgid "You already blocked that user."
+msgstr "Вы ўжо забл�кавалі г�тага кары�тальніка."
+
+#. TRANS: Title for block user page.
+#. TRANS: Legend for block user form.
+#. TRANS: Fieldset legend for block user from group form.
+msgid "Block user"
+msgstr "Забл�каваць кары�тальніка"
+
+#. TRANS: Explanation of consequences when blocking a user on the block user page.
+msgid ""
+"Are you sure you want to block this user? Afterwards, they will be "
+"unsubscribed from you, unable to subscribe to you in the future, and you "
+"will not be notified of any @-replies from them."
+msgstr ""
+"Вы ўп�ўнены, што жадаеце забл�каваць г�тага кары�тальніка? Па�ьл� г�тага ён "
+"будзе ад Ва� адпі�аны і ён н� зможа падпі�ацца ў будучыні, а Вам н� будуць "
+"прыходзіць паведамленьні пра �го @-адказы."
+
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete group form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+msgctxt "BUTTON"
+msgid "No"
+msgstr "�е"
+
+#. TRANS: Submit button title for 'No' when blocking a user.
+msgid "Do not block this user."
+msgstr "�е бл�каваць г�тага кары�тальніка."
+
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete group form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#. TRANS: Button text to repeat a notice on notice repeat form.
+msgctxt "BUTTON"
+msgid "Yes"
+msgstr "Так"
+
+#. TRANS: Submit button title for 'Yes' when blocking a user.
+msgid "Block this user."
+msgstr "Забл�каваць г�тага кары�тальніка."
+
+#. TRANS: Server error displayed when blocking a user fails.
+msgid "Failed to save block information."
+msgstr "Памылка захаваньн� інфармацыі пра бл�каваньне."
+
+#. TRANS: Title for first page with list of users blocked from a group.
+#. TRANS: %s is a group nickname.
+#, php-format
+msgid "%s blocked profiles"
+msgstr "%s забл�каваны� профілі"
+
+#. TRANS: Title for any but the first page with list of users blocked from a group.
+#. TRANS: %1$s is a group nickname, %2$d is a page number.
+#, php-format
+msgid "%1$s blocked profiles, page %2$d"
+msgstr "%1$s забл�каваны� профілі, �таронка %2$d"
+
+#. TRANS: Instructions for list of users blocked from a group.
+msgid "A list of the users blocked from joining this group."
+msgstr "Сьпі� кары�тальнікаў забл�каваных ад далуч�ньн� да г�тай групы."
+
+#. TRANS: Form legend for unblocking a user from a group.
+msgid "Unblock user from group"
+msgstr "Разбл�каваць кары�тальніка ў г�тай групе"
+
+#. TRANS: Button text for unblocking a user from a group.
+msgctxt "BUTTON"
+msgid "Unblock"
+msgstr "Разбл�каваць"
+
+#. TRANS: Tooltip for button for unblocking a user from a group.
+#. TRANS: Description of the form to unblock a user.
+msgid "Unblock this user"
+msgstr "Разбл�каваць г�тага кары�тальніка"
+
+#. TRANS: Title for mini-posting window loaded from bookmarklet.
+#. TRANS: %s is the StatusNet site name.
+#, php-format
+msgid "Post to %s"
+msgstr "Да�лаць у %s"
+
+#. TRANS: Title for leave group page after leaving.
+#. TRANS: %s$s is the leaving user's name, %2$s is the group name.
+#. TRANS: Title for leave group page after leaving.
+#, php-format
+msgctxt "TITLE"
+msgid "%1$s left group %2$s"
+msgstr "%1$s пакінуў групу %2$s"
+
+#. TRANS: Client error displayed when trying to leave a group without specifying an ID.
+#. TRANS: Client error displayed when trying to unsubscribe without providing a profile ID.
+msgid "No profile ID in request."
+msgstr "��ма ід�нтыфікатара профілю ў запыце."
+
+#. TRANS: Client error displayed when trying to leave a non-existing group.
+#. TRANS: Client error displayed trying to block a user from a group while specifying a non-existing profile.
+#. TRANS: Client error displayed when trying to unblock a user from a group without providing an existing profile.
+#. TRANS: Client error displayed when specifying an invalid profile ID on the Make Admin page.
+#. TRANS: Client error displayed trying a change a subscription for a non-existant profile ID.
+#. TRANS: Client error displayed when referring to non-existing profile ID.
+#. TRANS: Client error displayed when trying to unsubscribe while providing a non-existing profile ID.
+#. TRANS: Client error displayed when trying to change user options without specifying an existing user to work on.
+msgid "No profile with that ID."
+msgstr "��ма профілю з такім ід�нтыфікатарам."
+
+#. TRANS: Title after unsubscribing from a group.
+msgctxt "TITLE"
+msgid "Unsubscribed"
+msgstr "�дпі�аны"
+
+#. TRANS: Client error displayed when not providing a confirmation code in the contact address confirmation action.
+msgid "No confirmation code."
+msgstr "��ма коду пацьверджаньн�."
+
+#. TRANS: Client error displayed when providing a non-existing confirmation code in the contact address confirmation action.
+msgid "Confirmation code not found."
+msgstr "Код пацьверджаньн� н� знойдзены."
+
+#. TRANS: Client error displayed when not providing a confirmation code for another user in the contact address confirmation action.
+msgid "That confirmation code is not for you!"
+msgstr "Г�ты код пацьверджаньн� не дл� Ва�!"
+
+#. TRANS: Server error for an unknown address type, which can be 'email', 'sms', or the name of an IM network (such as 'xmpp' or 'aim')
+#, php-format
+msgid "Unrecognized address type %s"
+msgstr "�ев�домы тып адра�у %s"
+
+#. TRANS: Client error for an already confirmed email/jabber/sms address.
+#. TRANS: Client error for an already confirmed IM address.
+msgid "That address has already been confirmed."
+msgstr "Г�ты адра� ужо пацьверджаны."
+
+#. TRANS: Server error displayed when updating IM preferences fails.
+#. TRANS: Server error thrown on database error removing a registered IM address.
+msgid "Could not update user IM preferences."
+msgstr "�емагчыма абнавіць налады ��рві�у імгненных паведамленьн�ў."
+
+#. TRANS: Server error displayed when adding IM preferences fails.
+msgid "Could not insert user IM preferences."
+msgstr "�емагчыма ў�тавіць налады ��рві�у імгненных паведамленьн�ў."
+
+#. TRANS: Server error displayed when an address confirmation code deletion from the
+#. TRANS: database fails in the contact address confirmation action.
+msgid "Could not delete address confirmation."
+msgstr "�емагчыма выдаліць пацьверджаньне адра�у."
+
+#. TRANS: Title for the contact address confirmation action.
+msgid "Confirm address"
+msgstr "Пацьвердзіць адра�"
+
+#. TRANS: Success message for the contact address confirmation action.
+#. TRANS: %s can be 'email', 'jabber', or 'sms'.
+#, php-format
+msgid "The address \"%s\" has been confirmed for your account."
+msgstr "�дра� «%s» быў пацьверджаны дл� Вашага рахунка."
+
+#. TRANS: Title for page with a conversion (multiple notices in context).
+msgid "Conversation"
+msgstr "Размова"
+
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+msgid "Conversation feed (Activity Streams JSON)"
+msgstr "Стужка размовы (�тужкі актыўна�ьці JSON)"
+
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+msgid "Conversation feed (RSS 2.0)"
+msgstr "Стужка размовы (RSS 2.0)"
+
+#. TRANS: Title for conversation page.
+#. TRANS: Title for page that shows a notice.
+msgctxt "TITLE"
+msgid "Notice"
+msgstr "Заўвага"
+
+#. TRANS: Client exception displayed trying to delete a user account while not logged in.
+msgid "Only logged-in users can delete their account."
+msgstr ""
+"Толькі кары�тальнікі, �кі� увайшлі ў �ы�т�му, могуць выдал�ць �вае рахункі."
+
+#. TRANS: Client exception displayed trying to delete a user account without have the rights to do that.
+msgid "You cannot delete your account."
+msgstr "Вы н� можаце выдаліць Ваш рахунак."
+
+#. TRANS: Confirmation text for user deletion. The user has to type this exactly the same, including punctuation.
+msgid "I am sure."
+msgstr "Я ўп�ўнены."
+
+#. TRANS: Notification for user about the text that must be input to be able to delete a user account.
+#. TRANS: %s is the text that needs to be input.
+#, php-format
+msgid "You must write \"%s\" exactly in the box."
+msgstr "Вы павінны напі�аць «%s» менавіта ў полі."
+
+#. TRANS: Confirmation that a user account has been deleted.
+msgid "Account deleted."
+msgstr "Рахунак выдалены."
+
+#. TRANS: Page title for page on which a user account can be deleted.
+#. TRANS: Option in profile settings to delete the account of the currently logged in user.
+msgid "Delete account"
+msgstr "Выдаліць рахунак"
+
+#. TRANS: Form text for user deletion form.
+msgid ""
+"This will <strong>permanently delete</strong> your account data from this "
+"server."
+msgstr ""
+"Г�та прыв�дзе да <strong>поўнага выдаленьн�</strong> зьве�так пра Ваш "
+"рахунак з г�тага ��рв�ра."
+
+#. TRANS: Additional form text for user deletion form shown if a user has account backup rights.
+#. TRANS: %s is a URL to the backup page.
+#, php-format
+msgid ""
+"You are strongly advised to <a href=\"%s\">back up your data</a> before "
+"deletion."
+msgstr ""
+"�а�тойліва р�кам�ндуем Вам, <a href=\"%s\">�тварыць р�з�рвовую копію "
+"зьве�так</a> перад выдаленьнем."
+
+#. TRANS: Field label for delete account confirmation entry.
+#. TRANS: Field label for password reset form where the password has to be typed again.
+msgid "Confirm"
+msgstr "Пацьвердзіць"
+
+#. TRANS: Input title for the delete account field.
+#. TRANS: %s is the text that needs to be input.
+#, php-format
+msgid "Enter \"%s\" to confirm that you want to delete your account."
+msgstr "Ув�дзіце «%s» каб пацьвердзіць, што Вы жадаеце выдаліць Ваш рахунак."
+
+#. TRANS: Button title for user account deletion.
+msgid "Permanently delete your account."
+msgstr "Выдаліць Ваш рахунак назаў�ёды."
+
+#. TRANS: Client error displayed trying to delete an application while not logged in.
+msgid "You must be logged in to delete an application."
+msgstr "Вы павінны ўвай�ьці ў �ы�т�му, каб выдаліць да�та�аваньне."
+
+#. TRANS: Client error displayed trying to delete an application that does not exist.
+msgid "Application not found."
+msgstr "Да�та�аваньне не было знойдзенае."
+
+#. TRANS: Client error displayed trying to delete an application the current user does not own.
+#. TRANS: Client error displayed trying to edit an application while not being its owner.
+#. TRANS: Client error displayed trying to display an OAuth application for which the logged in user is not the owner.
+msgid "You are not the owner of this application."
+msgstr "Вы не зь�ўл�еце�� ўладальнікам г�тага да�та�аваньн�."
+
+#. TRANS: Client error displayed when the session token does not match or is not given.
+#. TRANS: Client error text when there is a problem with the session token.
+msgid "There was a problem with your session token."
+msgstr "Узьнікла праблема з ключом Вашай ���іі."
+
+#. TRANS: Title for delete application page.
+#. TRANS: Fieldset legend on delete application page.
+msgid "Delete application"
+msgstr "Выдаліць да�та�аваньне"
+
+#. TRANS: Confirmation text on delete application page.
+msgid ""
+"Are you sure you want to delete this application? This will clear all data "
+"about the application from the database, including all existing user "
+"connections."
+msgstr ""
+"Вы ўп�ўнены, што жадаеце выдаліць г�тае да�та�аваньне? Г�та ачы�ьціць у�е "
+"зьве�ткі пра да�та�аваньне з базы зьве�так, уключаючы ў�е і�нуючы� злуч�ньні "
+"кары�тальніка."
+
+#. TRANS: Submit button title for 'No' when deleting an application.
+msgid "Do not delete this application."
+msgstr "�е выдал�йце г�тае да�та�аваньне."
+
+#. TRANS: Submit button title for 'Yes' when deleting an application.
+msgid "Delete this application."
+msgstr "Выдаліць г�тае да�та�аваньне."
+
+#. TRANS: Client error when trying to delete group while not logged in.
+msgid "You must be logged in to delete a group."
+msgstr "Вам неабходна ўвай�ьці ў �ы�т�му каб выдаліць групу."
+
+#. TRANS: Client error when trying to delete a group without having the rights to delete it.
+msgid "You are not allowed to delete this group."
+msgstr "Вам не дазволена выдаліць г�тую групу."
+
+#. TRANS: Server error displayed if a group could not be deleted.
+#. TRANS: %s is the name of the group that could not be deleted.
+#, php-format
+msgid "Could not delete group %s."
+msgstr "�емагчыма выдаліць групу %s."
+
+#. TRANS: Message given after deleting a group.
+#. TRANS: %s is the deleted group's name.
+#, php-format
+msgid "Deleted group %s"
+msgstr "Група %s выдалена�"
+
+#. TRANS: Title of delete group page.
+#. TRANS: Form legend for deleting a group.
+msgid "Delete group"
+msgstr "Выдаліць групу"
+
+#. TRANS: Warning in form for deleleting a group.
+msgid ""
+"Are you sure you want to delete this group? This will clear all data about "
+"the group from the database, without a backup. Public posts to this group "
+"will still appear in individual timelines."
+msgstr ""
+"Вы ўп�ўнены, што жадаеце выдаліць г�тую групу? Г�та выдаліць у�е зьве�ткі "
+"пра групу з базы зьве�так, без магчыма�ьці аднаўленьн�. Публічны� "
+"паведамленьні ў г�тай групе за�тануцца ў а�абі�тых �тужках паведамленьн�ў."
+
+#. TRANS: Submit button title for 'No' when deleting a group.
+msgid "Do not delete this group."
+msgstr "�е выдал�ць г�тую групу."
+
+#. TRANS: Submit button title for 'Yes' when deleting a group.
+msgid "Delete this group."
+msgstr "Выдаліць г�тую групу."
+
+#. TRANS: Instructions for deleting a notice.
+msgid ""
+"You are about to permanently delete a notice. Once this is done, it cannot "
+"be undone."
+msgstr ""
+"Вы назаў�ёды выдал�еце паведамленьне. Калі г�та будзе зроблена, г�тае "
+"дзе�ньне н� можа быць адмененае."
+
+#. TRANS: Page title when deleting a notice.
+#. TRANS: Fieldset legend for the delete notice form.
+msgid "Delete notice"
+msgstr "Выдаліць паведамленьне"
+
+#. TRANS: Message for the delete notice form.
+msgid "Are you sure you want to delete this notice?"
+msgstr "Вы ўп�ўнены, што жадаеце выдаліць г�та паведамленьне?"
+
+#. TRANS: Submit button title for 'No' when deleting a notice.
+msgid "Do not delete this notice."
+msgstr "�е выдал�ць г�тае паведамленьне."
+
+#. TRANS: Submit button title for 'Yes' when deleting a notice.
+msgid "Delete this notice."
+msgstr "Выдаліць г�тае паведамленьне."
+
+#. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
+msgid "You cannot delete users."
+msgstr "Вы н� можаце выдал�ць кары�тальнікаў."
+
+#. TRANS: Client error displayed when trying to delete a non-local user.
+msgid "You can only delete local users."
+msgstr "Вы можаце выдал�ць толькі л�кальных кары�тальнікаў."
+
+#. TRANS: Title of delete user page.
+msgctxt "TITLE"
+msgid "Delete user"
+msgstr "Выдаліць кары�тальніка"
+
+#. TRANS: Fieldset legend on delete user page.
+msgid "Delete user"
+msgstr "Выдаліць кары�тальніка"
+
+#. TRANS: Information text to request if a user is certain that the described action has to be performed.
+msgid ""
+"Are you sure you want to delete this user? This will clear all data about "
+"the user from the database, without a backup."
+msgstr ""
+"Вы ўп�ўнены, што жадаеце выдаліць г�тага кары�тальніка? Г�та ачы�ьціць у�е "
+"зьве�ткі пра кары�тальніка з базы зьве�так без магчыма�ьці аднаўленьн�."
+
+#. TRANS: Submit button title for 'No' when deleting a user.
+msgid "Do not delete this user."
+msgstr "�е выдал�ць г�тага кары�тальніка."
+
+#. TRANS: Submit button title for 'Yes' when deleting a user.
+msgid "Delete this user."
+msgstr "Выдаліць г�тага кары�тальніка."
+
+#. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
+msgid "This notice is not a favorite!"
+msgstr "Г�тае паведамленьне не зь�ўл�ецца ўлюблёным!"
+
+#. TRANS: Title for page on which favorites can be added.
+msgid "Add to favorites"
+msgstr "Дадаць ва ўлюблёны�"
+
+#. TRANS: Client exception thrown when requesting a document from the documentation that does not exist.
+#. TRANS: %s is the non-existing document.
+#, php-format
+msgid "No such document \"%s\"."
+msgstr "��ма такога дакум�нта «%s»."
+
+#. TRANS: Menu item in administrator navigation panel.
+#. TRANS: Menu item in default local navigation panel.
+#. TRANS: Menu item in personal group navigation menu.
+msgctxt "MENU"
+msgid "Home"
+msgstr "Галоўна� �таронка"
+
+msgctxt "MENU"
+msgid "Docs"
+msgstr "Дакум�нтацы�"
+
+#. TRANS: Secondary navigation menu item leading to help on StatusNet.
+msgctxt "MENU"
+msgid "Help"
+msgstr "Дапамога"
+
+msgid "Getting started"
+msgstr "Пачатак працы"
+
+#. TRANS: Secondary navigation menu item leading to text about StatusNet site.
+msgctxt "MENU"
+msgid "About"
+msgstr "Пра"
+
+msgid "About this site"
+msgstr "Інфармацы� пра г�ты �айт"
+
+#. TRANS: Secondary navigation menu item leading to Frequently Asked Questions.
+msgctxt "MENU"
+msgid "FAQ"
+msgstr "Ча�ты� пытаньні"
+
+msgid "Frequently asked questions"
+msgstr "Ча�ты� пытаньні"
+
+#. TRANS: Secondary navigation menu item leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+msgctxt "MENU"
+msgid "Contact"
+msgstr "Кантакты"
+
+msgid "Contact info"
+msgstr "Кантактна� інфармацы�"
+
+msgctxt "MENU"
+msgid "Tags"
+msgstr "Т�гі"
+
+msgid "Using tags"
+msgstr "Выкары�тоўваемы� т�гі"
+
+#. TRANS: Menu item in default local navigation panel.
+#. TRANS: Menu item in search group navigation panel.
+#. TRANS: Menu item in local navigation menu.
+msgctxt "MENU"
+msgid "Groups"
+msgstr "Групы"
+
+msgid "Using groups"
+msgstr "Выкары�тоўваемы� групы"
+
+msgctxt "MENU"
+msgid "API"
+msgstr "API"
+
+msgid "RESTful API"
+msgstr ""
+
+#. TRANS: Title for "Edit application" form.
+#. TRANS: Form legend.
+msgid "Edit application"
+msgstr "Р�дагаваць да�та�аваньне"
+
+#. TRANS: Client error displayed trying to edit an application while not logged in.
+msgid "You must be logged in to edit an application."
+msgstr "Вы павінны ўвай�ьці ў �ы�т�му, каб р�дагаваць да�та�аваньне."
+
+#. TRANS: Client error displayed trying to edit an application that does not exist.
+#. TRANS: Client error displayed trying to display a non-existing OAuth application.
+msgid "No such application."
+msgstr "��ма такога да�та�аваньн�."
+
+#. TRANS: Instructions for "Edit application" form.
+msgid "Use this form to edit your application."
+msgstr "Выкары�тоўвайце г�тую форму дл� р�дагаваньн� Вашага да�та�аваньн�."
+
+#. TRANS: Validation error shown when not providing a name in the "Edit application" form.
+#. TRANS: Validation error shown when not providing a name in the "New application" form.
+msgid "Name is required."
+msgstr "Патрабуецца ім�."
+
+#. TRANS: Validation error shown when providing too long a name in the "Edit application" form.
+#. TRANS: Validation error shown when providing too long a name in the "New application" form.
+msgid "Name is too long (maximum 255 characters)."
+msgstr "Ім� занадта доўгае (мак�ымальна 255 �ымбал�ў)."
+
+#. TRANS: Validation error shown when providing a name for an application that already exists in the "Edit application" form.
+#. TRANS: Validation error shown when providing a name for an application that already exists in the "New application" form.
+msgid "Name already in use. Try another one."
+msgstr "Ім� кары�тальніка ўжо выкары�тоўваецца. Па�прабуйце іншае."
+
+#. TRANS: Validation error shown when not providing a description in the "Edit application" form.
+#. TRANS: Validation error shown when not providing a description in the "New application" form.
+msgid "Description is required."
+msgstr "�пі�аньне абав�зковае."
+
+#. TRANS: Validation error shown when providing too long a source URL in the "Edit application" form.
+msgid "Source URL is too long."
+msgstr "Крынічны URL-адра� занадта доўгі."
+
+#. TRANS: Validation error shown when providing an invalid source URL in the "Edit application" form.
+#. TRANS: Validation error shown when providing an invalid source URL in the "New application" form.
+msgid "Source URL is not valid."
+msgstr "Крынічны URL-адра� н��лушны."
+
+#. TRANS: Validation error shown when not providing an organisation in the "Edit application" form.
+#. TRANS: Validation error shown when not providing an organisation in the "New application" form.
+msgid "Organization is required."
+msgstr "�рганізацы� абав�зкова�."
+
+#. TRANS: Validation error shown when providing too long an arganisation name in the "Edit application" form.
+msgid "Organization is too long (maximum 255 characters)."
+msgstr "�азва арганізацыі занадта доўга� (мак�ымальна 255 �ымбал�ў)."
+
+#. TRANS: Form validation error show when an organisation name has not been provided in the edit application form.
+#. TRANS: Form validation error show when an organisation name has not been provided in the new application form.
+msgid "Organization homepage is required."
+msgstr "Хатн�� �таронка арганізацыі абав�зкова�."
+
+#. TRANS: Validation error shown when providing too long a callback URL in the "Edit application" form.
+#. TRANS: Validation error shown when providing too long a callback URL in the "New application" form.
+msgid "Callback is too long."
+msgstr "Зваротны адра� занадта в�лікі."
+
+#. TRANS: Validation error shown when providing an invalid callback URL in the "Edit application" form.
+#. TRANS: Validation error shown when providing an invalid callback URL in the "New application" form.
+msgid "Callback URL is not valid."
+msgstr "Зваротны URL-адра� н��лушны."
+
+#. TRANS: Server error occuring when an application could not be updated from the "Edit application" form.
+msgid "Could not update application."
+msgstr "�емагчыма абнавіць да�та�аваньне."
+
+#. TRANS: Title for form to edit a group. %s is a group nickname.
+#, php-format
+msgid "Edit %s group"
+msgstr "Р�дагаваць групу %s"
+
+#. TRANS: Client error displayed trying to edit a group while not logged in.
+#. TRANS: Client error displayed when trying to create a group while not logged in.
+#. TRANS: Client error displayed trying to create a group while not logged in.
+msgid "You must be logged in to create a group."
+msgstr "Вам неабходна ўвай�ьці ў �ы�т�му каб �тварыць групу."
+
+#. TRANS: Form instructions for group edit form.
+msgid "Use this form to edit the group."
+msgstr "Выкары�тоўвайце г�тую форму дл� р�дагаваньн� групы."
+
+#. TRANS: Group edit form validation error.
+#. TRANS: Group create form validation error.
+#. TRANS: %s is the invalid alias.
+#, php-format
+msgid "Invalid alias: \"%s\""
+msgstr "���лушны п��ўданім: «%s»"
+
+#. TRANS: Group edit form success message.
+#. TRANS: Edit list form success message.
+msgid "Options saved."
+msgstr "�алады захаваны�."
+
+#. TRANS: Title for edit list page after deleting a tag.
+#. TRANS: %s is a list.
+#, php-format
+msgid "Delete %s list"
+msgstr "Выдаліць �ьпі� %s"
+
+#. TRANS: Title for edit list page.
+#. TRANS: %s is a list.
+#. TRANS: Form legend for list edit form.
+#. TRANS: %s is a list.
+#, php-format
+msgid "Edit list %s"
+msgstr "Р�дагаваць �ьпі� %s"
+
+#. TRANS: Error message displayed when trying to perform an action that requires a tagging user or ID.
+msgid "No tagger or ID."
+msgstr "��ма т�гаў ці ід�нтыфікатараў."
+
+#. TRANS: Client error displayed when referring to non-local user.
+msgid "Not a local user."
+msgstr "�е л�кальны кары�тальнік."
+
+#. TRANS: Client error displayed when reting to edit a tag that was not self-created.
+msgid "You must be the creator of the tag to edit it."
+msgstr "Каб р�дагаваць г�ты т�г, Вам неабходна быць �го �тваральнікам."
+
+#. TRANS: Form instruction for edit list form.
+msgid "Use this form to edit the list."
+msgstr "Выкары�тоўвайце г�тую форму дл� р�дагаваньн� �ьпі�у."
+
+#. TRANS: Form validation error displayed if the form data for deleting a tag was incorrect.
+msgid "Delete aborted."
+msgstr "Выдаленьне �ка�аванае."
+
+#. TRANS: Text in confirmation dialog for deleting a tag.
+msgid ""
+"Deleting this tag will permanantly remove all its subscription and "
+"membership records. Do you still want to continue?"
+msgstr ""
+"Выдаленьне г�тага т�гу прыв�дзе да поўнага выдаленьн� ў�іх падпі�ак і "
+"запі�аў удзельнікаў. Вы жадаеце прац�гваць?"
+
+#. TRANS: Form validation error displayed if a given tag is invalid.
+msgid "Invalid tag."
+msgstr "���лушны т�г."
+
+#. TRANS: Form validation error displayed if a given tag is already present.
+#. TRANS: %s is the already present tag.
+#, php-format
+msgid "You already have a tag named %s."
+msgstr "Вы ўжо маеце т�г з назвай %s."
+
+#. TRANS: Text in confirmation dialog for setting a tag from public to private.
+msgid ""
+"Setting a public tag as private will permanently remove all the existing "
+"subscriptions to it. Do you still want to continue?"
+msgstr ""
+"�алада публічных т�гаў �к прыватных поўна�ьцю выдаліць у�е і�нуючы� падпі�кі "
+"на іх. Вы жадаеце прац�гваць?"
+
+#. TRANS: Server error displayed when updating a list fails.
+msgid "Could not update list."
+msgstr "�емагчыма абнавіць �ьпі�."
+
+#. TRANS: Title for e-mail settings.
+msgid "Email settings"
+msgstr "�алады �лектроннай пошты"
+
+#. TRANS: E-mail settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#, php-format
+msgid "Manage how you get email from %%site.name%%."
+msgstr "Кіраваньне атрыманьнем �лектронных лі�тоў ад %%site.name%%."
+
+#. TRANS: Form legend for e-mail settings form.
+#. TRANS: Field label for e-mail address input in e-mail settings form.
+msgid "Email address"
+msgstr "�дра� �лектроннай пошты"
+
+#. TRANS: Form note in e-mail settings form.
+msgid "Current confirmed email address."
+msgstr "Ц�перашні пацьверджаны адра� �лектроннай пошты."
+
+#. TRANS: Button label to remove a confirmed e-mail address.
+#. TRANS: Button label for removing a set sender e-mail address to post notices from.
+#. TRANS: Button label to remove a confirmed IM address.
+#. TRANS: Button label to remove a confirmed SMS address.
+#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
+#. TRANS: Button text to untag a profile.
+msgctxt "BUTTON"
+msgid "Remove"
+msgstr "Выдаліць"
+
+#. TRANS: Form note in e-mail settings form.
+msgid ""
+"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
+"a message with further instructions."
+msgstr ""
+"Чакае пацьверджаньн� г�тага адра�у. Праверце Вашую паштовую �крыню (і папку "
+"дл� �паму!) ці атрымалі Вы паведамленьне з далейшымі ін�трукцы�мі."
+
+#. TRANS: Instructions for e-mail address input form. Do not translate
+#. TRANS: "example.org". It is one of the domain names reserved for
+#. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
+#. TRANS: Any other domain may be owned by a legitimate person or
+#. TRANS: organization.
+msgid "Email address, like \"UserName@example.org\""
+msgstr "�дра� �лектроннай пошты, напрыклад, «UserName@example.org»"
+
+#. TRANS: Button label for adding an e-mail address in e-mail settings form.
+#. TRANS: Button label for adding an IM address in IM settings form.
+#. TRANS: Button label for adding a SMS phone number in SMS settings form.
+#. TRANS: Button text to tag a profile.
+msgctxt "BUTTON"
+msgid "Add"
+msgstr "Дадаць"
+
+#. TRANS: Form legend for incoming e-mail settings form.
+#. TRANS: Form legend for incoming SMS settings form.
+msgid "Incoming email"
+msgstr "Уваходз�ча� пошта"
+
+#. TRANS: Checkbox label in e-mail preferences form.
+msgid "I want to post notices by email."
+msgstr "Я жадаю разьм��ьціць запі� праз �лектронную пошту."
+
+#. TRANS: Form instructions for incoming e-mail form in e-mail settings.
+#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
+msgid "Send email to this address to post new notices."
+msgstr "Дашліце �лектронны лі�т на г�ты адра� каб разьм��ьціць новы� запі�ы."
+
+#. TRANS: Instructions for incoming e-mail address input form, when an address has already been assigned.
+#. TRANS: Instructions for incoming SMS e-mail address input form.
+msgid "Make a new email address for posting to; cancels the old one."
+msgstr ""
+"Стварыць новы адра� �лектроннай пошты дл� да�ылкі запі�аў. �дм�н�е �тары "
+"адра�."
+
+#. TRANS: Instructions for incoming e-mail address input form.
+msgid ""
+"To send notices via email, we need to create a unique email address for you "
+"on this server:"
+msgstr ""
+"Каб да�ылаць запі�ы праз �лектронную пошту, нам неабходна �тварыць унікальны "
+"адра� �лектроннай пошты дл� Ва� на г�тым ��рв�ры:"
+
+#. TRANS: Button label for adding an e-mail address to send notices from.
+#. TRANS: Button label for adding an SMS e-mail address to send notices from.
+msgctxt "BUTTON"
+msgid "New"
+msgstr "�овы"
+
+#. TRANS: Form legend for e-mail preferences form.
+msgid "Email preferences"
+msgstr "�алады �лектроннай пошты"
+
+#. TRANS: Checkbox label in e-mail preferences form.
+msgid "Send me notices of new subscriptions through email."
+msgstr "Паведамл�ць мне пра новых падпі�чыкаў праз �лектронную пошту."
+
+#. TRANS: Checkbox label in e-mail preferences form.
+msgid "Send me email when someone adds my notice as a favorite."
+msgstr ""
+"Да�ылаць мне �лектронны лі�т, калі хто-небудзь дада�ьць мой запі� ва "
+"ўлюблёны�."
+
+#. TRANS: Checkbox label in e-mail preferences form.
+msgid "Send me email when someone sends me a private message."
+msgstr ""
+"Да�ылаць мне �лектронны лі�т, калі хто-небудзь дашле мне а�абі�тае "
+"паведамленьне."
+
+#. TRANS: Checkbox label in e-mail preferences form.
+msgid "Send me email when someone sends me an \"@-reply\"."
+msgstr "Да�ылаць мне �лектронны лі�т, калі хто-небудзь дашле мне «@-адказ»."
+
+#. TRANS: Checkbox label in e-mail preferences form.
+msgid "Allow friends to nudge me and send me an email."
+msgstr "Дазволіць ��брам падштурхоўваць м�не і да�ылаць мне �лектронны� лі�ты."
+
+#. TRANS: Checkbox label in e-mail preferences form.
+msgid "Publish a MicroID for my email address."
+msgstr "Публікаваць MicroID дл� майго адра�у �лектроннай пошты."
+
+#. TRANS: Confirmation message for successful e-mail preferences save.
+msgid "Email preferences saved."
+msgstr "�алады �лектроннай пошты захаваны�."
+
+#. TRANS: Message given saving e-mail address without having provided one.
+msgid "No email address."
+msgstr "��ма адра�у �лектроннай пошты."
+
+#. TRANS: Message given saving e-mail address that cannot be normalised.
+msgid "Cannot normalize that email address."
+msgstr "�емагчыма нармалізаваць г�ты адра� �лектроннай пошты."
+
+#. TRANS: Message given saving e-mail address that not valid.
+#. TRANS: Form validation error displayed when trying to register without a valid e-mail address.
+#. TRANS: Client error displayed trying to save site settings without a valid contact address.
+msgid "Not a valid email address."
+msgstr "���лушны адра� �лектроннай пошты."
+
+#. TRANS: Message given saving e-mail address that is already set.
+msgid "That is already your email address."
+msgstr "Г�та ўжо Ваш адра� �лектроннай пошты."
+
+#. TRANS: Message given saving e-mail address that is already set for another user.
+msgid "That email address already belongs to another user."
+msgstr "Г�ты адра� �лектроннай пошты ўжо належыць іншаму кары�тальніку."
+
+#. TRANS: Server error thrown on database error adding e-mail confirmation code.
+#. TRANS: Server error thrown on database error adding Instant Messaging confirmation code.
+#. TRANS: Server error thrown on database error adding SMS confirmation code.
+msgid "Could not insert confirmation code."
+msgstr "�емагчыма ў�тавіць код пацьверджаньн�."
+
+#. TRANS: Message given saving valid e-mail address that is to be confirmed.
+msgid ""
+"A confirmation code was sent to the email address you added. Check your "
+"inbox (and spam box!) for the code and instructions on how to use it."
+msgstr ""
+"Код пацьверджаньн� быў да�ланы на дададзены Вамі адра� �лектроннай пошты. "
+"Праверце Вашую �крыню з уваходз�чай поштай (і �крыню �а �памам!), каб "
+"знай�ьці код і ін�трукцыі па �го выкары�таньню."
+
+#. TRANS: Message given canceling e-mail address confirmation that is not pending.
+#. TRANS: Message given canceling Instant Messaging address confirmation that is not pending.
+#. TRANS: Message given canceling SMS phone number confirmation that is not pending.
+msgid "No pending confirmation to cancel."
+msgstr "��ма чакаючых пацьверджаньн�ў да �ка�аваньн�."
+
+#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
+msgid "That is the wrong email address."
+msgstr "Г�та н��лушны адра� �лектроннай пошты."
+
+#. TRANS: Server error thrown on database error canceling e-mail address confirmation.
+msgid "Could not delete email confirmation."
+msgstr "�емагчыма выдаліць пацьверджаньне �лектроннай пошты."
+
+#. TRANS: Message given after successfully canceling e-mail address confirmation.
+msgid "Email confirmation cancelled."
+msgstr "Пацьверджаньне �лектроннай пошты �ка�аванае."
+
+#. TRANS: Message given trying to remove an e-mail address that is not
+#. TRANS: registered for the active user.
+msgid "That is not your email address."
+msgstr "Г�та не Ваш адра� �лектроннай пошты."
+
+#. TRANS: Message given after successfully removing a registered e-mail address.
+msgid "The email address was removed."
+msgstr "�дра� �лектроннай пошты быў выдалены."
+
+#. TRANS: Form validation error displayed when trying to remove an incoming e-mail address while no address has been set.
+msgid "No incoming email address."
+msgstr "��ма ўваходз�чага адра�у �лектроннай пошты."
+
+#. TRANS: Server error thrown on database error removing incoming e-mail address.
+#. TRANS: Server error thrown on database error adding incoming e-mail address.
+#. TRANS: Server error displayed when the user could not be updated in SMS settings.
+msgid "Could not update user record."
+msgstr "�емагчыма абнавіць інфармацыю пра кары�тальніка."
+
+#. TRANS: Message given after successfully removing an incoming e-mail address.
+#. TRANS: Confirmation text after updating SMS settings.
+msgid "Incoming email address removed."
+msgstr "Уваходз�чы адра� �лектроннай пошты выдалены."
+
+#. TRANS: Message given after successfully adding an incoming e-mail address.
+#. TRANS: Confirmation text after updating SMS settings.
+msgid "New incoming email address added."
+msgstr "�овы ўваходз�чы адра� �лектроннай пошты дададзены."
+
+#. TRANS: Client error displayed when trying to mark a notice as favorite that already is a favorite.
+msgid "This notice is already a favorite!"
+msgstr "Г�тае паведамленьне ўжо знаходзіцца ў ліку ўлюблёных!"
+
+#. TRANS: Page title for page on which favorite notices can be unfavourited.
+msgid "Disfavor favorite."
+msgstr "Выдаліць з улюблёных."
+
+#. TRANS: Page title for first page of favorited notices.
+#. TRANS: Title for favourited notices section.
+#. TRANS: Menu item title in search group navigation panel.
+msgid "Popular notices"
+msgstr "Папул�рны� запі�ы"
+
+#. TRANS: Page title for all but first page of favorited notices.
+#. TRANS: %d is the page number being displayed.
+#, php-format
+msgid "Popular notices, page %d"
+msgstr "Папул�рны� запі�ы, �таронка %d"
+
+#. TRANS: Description on page displaying favorited notices.
+msgid "The most popular notices on the site right now."
+msgstr "Самы� папул�рны� запі�ы на �айце ў ц�перашні ча�."
+
+#. TRANS: Text displayed instead of a list when a site does not yet have any favourited notices.
+msgid "Favorite notices appear on this page but no one has favorited one yet."
+msgstr "Улюблёны� запі�ы зь�ўл�юцца на г�тай �таронцы, але такіх пакуль н�ма."
+
+#. TRANS: Additional text displayed instead of a list when a site does not yet have any favourited notices for logged in users.
+msgid ""
+"Be the first to add a notice to your favorites by clicking the fave button "
+"next to any notice you like."
+msgstr ""
+"Дадайце першы запі� да ўлюблёных, наці�нуўшы на адпаведную кнопку кал� "
+"запі�у, �кі �падабаў��."
+
+#. TRANS: Additional text displayed instead of a list when a site does not yet have any favourited notices for not logged in users.
+#. TRANS: %%action.register%% is a registration link. "[link text](link)" is Mark Down. Do not change the formatting.
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and be the first to add a "
+"notice to your favorites!"
+msgstr ""
+"Чаму б не [зар�гі�траваць рахунак](%%action.register%%) і першым дадаць "
+"запі� да ўлюблёных!"
+
+#. TRANS: Title of RSS feed with favourite notices of a user.
+#. TRANS: %s is a user's nickname.
+#. TRANS: Title for first page of favourite notices of a user.
+#. TRANS: %s is the user for whom the favourite notices are displayed.
+#. TRANS: Menu item title in personal group navigation menu.
+#. TRANS: %s is a username.
+#, php-format
+msgid "%s's favorite notices"
+msgstr "Улюблёны� запі�ы %s"
+
+#. TRANS: Desciption of RSS feed with favourite notices of a user.
+#. TRANS: %1$s is a user's nickname, %2$s is the name of the StatusNet site.
+#, php-format
+msgid "Updates favored by %1$s on %2$s!"
+msgstr "�бнаўленьні улюблёны� %1$s на %2$s!"
+
+#. TRANS: Page title for first page of featured users.
+#. TRANS: Title for featured users section.
+#. TRANS: Menu item title in search group navigation panel.
+msgid "Featured users"
+msgstr "В�домы� кары�тальнікі"
+
+#. TRANS: Page title for all but first page of featured users.
+#. TRANS: %d is the page number being displayed.
+#, php-format
+msgid "Featured users, page %d"
+msgstr "В�домы� кары�тальнікі, �таронка %d"
+
+#. TRANS: Description on page displaying featured users.
+#, php-format
+msgid "A selection of some great users on %s."
+msgstr "Выбар в�домых кары�тальнікаў на %s."
+
+#. TRANS: Client error displayed when no notice ID was given trying do display a file.
+msgid "No notice ID."
+msgstr "��ма ід�нтыфікатара запі�у."
+
+#. TRANS: Client error displayed when an invalid notice ID was given trying do display a file.
+msgid "No notice."
+msgstr "��ма запі�у."
+
+#. TRANS: Client error displayed when trying do display a file for a notice without a file attachement.
+msgid "No attachments."
+msgstr "��ма далуч�ньн�ў."
+
+#. TRANS: Client error displayed when trying do display a file for a notice with file attachements
+#. TRANS: that could not be found.
+msgid "No uploaded attachments."
+msgstr "��ма загружаных далуч�ньн�ў."
+
+#. TRANS: Client error displayed when requesting a non-existent file.
+msgid "No such file."
+msgstr "��ма такога файла."
+
+#. TRANS: Client error displayed when requesting a file without having read access to it.
+msgid "Cannot read file."
+msgstr "�емагчыма прачытаць файл."
+
+#. TRANS: Client error displayed when trying to assign an invalid role to a user.
+#. TRANS: Client error displayed when trying to revoke an invalid role.
+msgid "Invalid role."
+msgstr "���лушна� рол�."
+
+#. TRANS: Client error displayed when trying to assign an reserved role to a user.
+#. TRANS: Client error displayed when trying to revoke a reserved role.
+msgid "This role is reserved and cannot be set."
+msgstr "Г�та� рол� зар�з�рвавана� і н� можа быць у�таноўлена�."
+
+#. TRANS: Client error displayed when trying to assign a role to a user while not being allowed to set roles.
+msgid "You cannot grant user roles on this site."
+msgstr "Вы н� можаце прызначыць кары�тальніку ролю на г�тым �айце."
+
+#. TRANS: Client error displayed when trying to assign a role to a user that already has that role.
+msgid "User already has this role."
+msgstr "Кары�тальнік ужо мае г�тую ролю."
+
+#. TRANS: Client error displayed trying to block a user from a group while not specifying a to be blocked user profile.
+#. TRANS: Client error displayed when trying to unblock a user from a group without providing a profile.
+#. TRANS: Client error displayed when not providing a profile ID on the Make Admin page.
+#. TRANS: Client error displayed trying a change a subscription without providing a profile.
+#. TRANS: Client error displayed when trying to change user options without specifying a user to work on.
+msgid "No profile specified."
+msgstr "Профіль не пазначаны."
+
+#. TRANS: Client error displayed trying to block a user from a group while not specifying a group to block a profile from.
+#. TRANS: Client error displayed when trying to unblock a user from a group without providing a group.
+#. TRANS: Client error displayed when not providing a group ID on the Make Admin page.
+msgid "No group specified."
+msgstr "Група не пазначана�."
+
+#. TRANS: Client error displayed trying to block a user from a group while not being an admin user.
+msgid "Only an admin can block group members."
+msgstr "Толькі адміні�тратар можа забл�каваць удзельнікаў групы."
+
+#. TRANS: Client error displayed trying to block a user from a group while user is already blocked from the given group.
+msgid "User is already blocked from group."
+msgstr "Кары�тальнік ужо забл�каваны ў групе."
+
+#. TRANS: Client error displayed trying to block a user from a group while user is not a member of given group.
+msgid "User is not a member of group."
+msgstr "Кары�тальнік не зь�ўл�ецца ўдзельнікам групы."
+
+#. TRANS: Title for block user from group page.
+#. TRANS: Form legend for form to block user from a group.
+msgid "Block user from group"
+msgstr "Забл�каваць кары�тальніка ў групе"
+
+#. TRANS: Explanatory text for block user from group form before setting the block.
+#. TRANS: %1$s is that to be blocked user, %2$s is the group the user will be blocked from.
+#, php-format
+msgid ""
+"Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They "
+"will be removed from the group, unable to post, and unable to subscribe to "
+"the group in the future."
+msgstr ""
+"Вы ўп�ўнены, што жадаеце забл�каваць кары�тальніка «%1$s» у групе «%2$s»? �н "
+"будзе выдалены з групы, н� зможа пакідаць паведамленьні, і падпі�вацца на "
+"групу ў будучыні."
+
+#. TRANS: Submit button title for 'No' when blocking a user from a group.
+msgid "Do not block this user from this group."
+msgstr "�е бл�каваць г�тага кары�тальніка ў г�тай групе."
+
+#. TRANS: Submit button title for 'Yes' when blocking a user from a group.
+msgid "Block this user from this group."
+msgstr "Забл�каваць г�тага кары�тальніка ў г�тай групе."
+
+#. TRANS: Server error displayed when trying to block a user from a group fails because of an application error.
+msgid "Database error blocking user from group."
+msgstr "Памылка базы зьве�так падча� бл�каваньн� кары�тальніка ў г�тай групе."
+
+#. TRANS: Client error displayed referring to a group's permalink without providing a group ID.
+#. TRANS: Client error displayed trying to perform an action without providing an ID.
+#. TRANS: Client error displayed trying to find a user by ID without providing an ID.
+msgid "No ID."
+msgstr "��ма ід�нтыфікатара."
+
+#. TRANS: Title for group logo settings page.
+#. TRANS: Group logo form legend.
+msgid "Group logo"
+msgstr "Л�гатып групы"
+
+#. TRANS: Instructions for group logo page.
+#. TRANS: %s is the maximum file size for that site.
+#, php-format
+msgid ""
+"You can upload a logo image for your group. The maximum file size is %s."
+msgstr ""
+"Вы можаце загрузіць л�гатып Вашай групы. Мак�ымальны памер файла �кладае %s."
+
+#. TRANS: Submit button for uploading a group logo.
+msgid "Upload"
+msgstr "Загрузіць"
+
+#. TRANS: Button text for cropping an uploaded group logo.
+msgid "Crop"
+msgstr "�бр�заць"
+
+#. TRANS: Form instructions on the group logo page.
+msgid "Pick a square area of the image to be the logo."
+msgstr "Выберыце квадратны абшар вы�вы дл� Вашага л�гатыпу."
+
+#. TRANS: Form success message after updating a group logo.
+msgid "Logo updated."
+msgstr "Л�гатып абноўлены."
+
+#. TRANS: Form failure message after failing to update a group logo.
+msgid "Failed updating logo."
+msgstr "�емагчыма абнавіць л�гатып."
+
+#. TRANS: Title of the page showing group members.
+#. TRANS: %s is the name of the group.
+#, php-format
+msgid "%s group members"
+msgstr "Удзельнікі групы %s"
+
+#. TRANS: Title of the page showing group members.
+#. TRANS: %1$s is the name of the group, %2$d is the page number of the members list.
+#, php-format
+msgid "%1$s group members, page %2$d"
+msgstr "Удзельнікі групы %1$s, �таронка %2$d"
+
+#. TRANS: Page notice for group members page.
+msgid "A list of the users in this group."
+msgstr "Сьпі� удзельнікаў г�тай групы."
+
+#. TRANS: Client error displayed when trying to approve group applicants without being a group administrator.
+msgid "Only the group admin may approve users."
+msgstr "Толькі адміні�тратар групы можа зацьвердзіць кары�тальніка."
+
+#. TRANS: Title of the first page showing pending group members still awaiting approval to join the group.
+#. TRANS: %s is the name of the group.
+#, php-format
+msgid "%s group members awaiting approval"
+msgstr "Удзельнікі групы %s чакаюць зацьверджаньн�"
+
+#. TRANS: Title of all but the first page showing pending group members still awaiting approval to join the group.
+#. TRANS: %1$s is the name of the group, %2$d is the page number of the members list.
+#, php-format
+msgid "%1$s group members awaiting approval, page %2$d"
+msgstr "Удзельнікі групы %1$s чакаюць зацьверджаньн�, �таронка %2$d"
+
+#. TRANS: Page notice for group members page.
+msgid "A list of users awaiting approval to join this group."
+msgstr ""
+"Сьпі� кары�тальнікаў, �кі� чакаюць зацьверджаньн� далуч�ньн� да г�тай групы."
+
+#. TRANS: Message is used as link description. %1$s is a group name, %2$s is a site name.
+#, php-format
+msgid "Updates from members of %1$s on %2$s!"
+msgstr "�бнаўленьні ад удзельнікаў %1$s на %2$s!"
+
+#. TRANS: Title for first page of the groups list.
+msgctxt "TITLE"
+msgid "Groups"
+msgstr "Групы"
+
+#. TRANS: Title for all but the first page of the groups list.
+#. TRANS: %d is the page number.
+#, php-format
+msgctxt "TITLE"
+msgid "Groups, page %d"
+msgstr "Групы, �таронка %d"
+
+#. TRANS: Page notice of group list. %%%%site.name%%%% is the StatusNet site name,
+#. TRANS: %%%%action.groupsearch%%%% and %%%%action.newgroup%%%% are URLs. Do not change them.
+#. TRANS: This message contains Markdown links in the form [link text](link).
+#, php-format
+msgid ""
+"%%%%site.name%%%% groups let you find and talk with people of similar "
+"interests. After you join a group you can send messages to all other members "
+"using the syntax \"!groupname\". Don't see a group you like? Try [searching "
+"for one](%%%%action.groupsearch%%%%) or [start your own](%%%%action.newgroup%"
+"%%%)!"
+msgstr ""
+"Групы на �айце %%%%site.name%%%% дазвал�юць Вам шукаць і зно�іцца з людзьмі "
+"з падобнымі інтар��амі. Па�ьл� далуч�ньн� да групы, Вы зможаце да�ылаць "
+"паведамленьні ў�ім іншым удзельнікам групы з дапамогай �ынтак�і�у «!"
+"groupname». �е бачыце групу да �падобы? Па�прабуйце [знай�ьці �е](%%%%action."
+"groupsearch%%%%) ці [�тварыць ула�ную](%%%%action.newgroup%%%%)!"
+
+#. TRANS: Link to create a new group on the group list page.
+#. TRANS: Link text on group page to create a new group.
+#. TRANS: Form legend for group edit form.
+msgid "Create a new group"
+msgstr "Стварыць новую групу"
+
+#. TRANS: Instructions for page where groups can be searched. %%site.name%% is the name of the StatusNet site.
+#, php-format
+msgid ""
+"Search for groups on %%site.name%% by their name, location, or description. "
+"Separate the terms by spaces; they must be 3 characters or more."
+msgstr ""
+"Пошук групаў на %%site.name%% па назьве, ме�цазнаходжаньні ці апі�аньні. "
+"Падз�л�йце �ловы прагаламі; �ны павінны ўтрымліваць 3 ці болей �ымбал�ў."
+
+#. TRANS: Title for page where groups can be searched.
+msgid "Group search"
+msgstr "Пошук групы"
+
+#. TRANS: Text on page where groups can be searched if no results were found for a query.
+#. TRANS: Text for notice search results is the query had no results.
+#. TRANS: Message on the "People search" page where a query has no results.
+#. TRANS: Output when there are no results for a search.
+msgid "No results."
+msgstr "Вынікаў н�ма."
+
+#. TRANS: Additional text on page where groups can be searched if no results were found for a query for a logged in user.
+#. TRANS: This message contains Markdown links in the form [link text](link).
+#, php-format
+msgid ""
+"If you cannot find the group you're looking for, you can [create it](%%"
+"action.newgroup%%) yourself."
+msgstr ""
+"Калі Вы н� можаце знай�ьці групу, �ка� Ва� цікавіць, Вы можаце [�е �тварыць]"
+"(%%action.newgroup%%) �ама�тойна."
+
+#. TRANS: Additional text on page where groups can be searched if no results were found for a query for a not logged in user.
+#. TRANS: This message contains Markdown links in the form [link text](link).
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and [create the group](%%"
+"action.newgroup%%) yourself!"
+msgstr ""
+"Чаму б не [�тварыць рахунак](%%action.register%%) і [групу](%%action.newgroup"
+"%%) �ама�тойна!"
+
+#. TRANS: Client error displayed when trying to unblock a user from a group without being an administrator for the group.
+msgid "Only an admin can unblock group members."
+msgstr "Толькі адміні�тратар можа разбл�каваць удзельнікаў групы."
+
+#. TRANS: Client error displayed when trying to unblock a non-blocked user from a group.
+msgid "User is not blocked from group."
+msgstr "Кары�тальнік не забл�каваны ў групе."
+
+#. TRANS: Server error displayed when unblocking a user from a group fails because of an unknown error.
+#. TRANS: Server error displayed when removing a user block.
+msgid "Error removing the block."
+msgstr "�емагчыма разбл�каваць."
+
+#. TRANS: Title for Instant Messaging settings.
+msgid "IM settings"
+msgstr "�алады IM"
+
+#. TRANS: Instant messaging settings page instructions.
+#. TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link.
+#. TRANS: the order and formatting of link text and link should remain unchanged.
+#, php-format
+msgid ""
+"You can send and receive notices through [instant messaging](%%doc.im%%). "
+"Configure your addresses and settings below."
+msgstr ""
+"Вы можаце да�ылаць ці атрымліваць абвешчаньні праз [�ы�т�му імгненных "
+"паведамленьн�ў](%%doc.im%%). �аладзьце Вашы� адра�ы і ў�таноўкі ніж�й."
+
+#. TRANS: Message given in the IM settings if IM is not enabled on the site.
+msgid "IM is not available."
+msgstr "IM неда�тупны."
+
+#. TRANS: Form note in IM settings form. %s is the type of IM address that was confirmed.
+#, php-format
+msgid "Current confirmed %s address."
+msgstr "Ц�перашні пацьверджаны адра� %s."
+
+#. TRANS: Form note in IM settings form.
+#. TRANS: %s is the IM service name, %2$s is the IM address set.
+#, php-format
+msgid ""
+"Awaiting confirmation on this address. Check your %1$s account for a message "
+"with further instructions. (Did you add %2$s to your buddy list?)"
+msgstr ""
+"Чаканьне пацьверджаньн� г�тага адра�у. Праверце Ваш рахунак %1$s на "
+"на�ўна�ьць паведамленьн� з далейшымі ін�трукцы�мі. (Вы дадалі %2$s у Ваш "
+"�ьпі� ��броў?)"
+
+#. TRANS: Field label for IM address.
+msgid "IM address"
+msgstr "ІM-адра�"
+
+#. TRANS: Field title for IM address. %s is the IM service name.
+#, php-format
+msgid "%s screenname."
+msgstr "М�нушка %s."
+
+#. TRANS: Header for IM preferences form.
+msgid "IM Preferences"
+msgstr "�алады IM"
+
+#. TRANS: Checkbox label in IM preferences form.
+msgid "Send me notices"
+msgstr "Да�ылаць мне абв�шч�ньні"
+
+#. TRANS: Checkbox label in IM preferences form.
+msgid "Post a notice when my status changes."
+msgstr "Да�ылаць абв�шч�ньні пры зьмене майго �тату�у."
+
+#. TRANS: Checkbox label in IM preferences form.
+msgid "Send me replies from people I'm not subscribed to."
+msgstr "Да�ылаць мне адказы людзей, на �кіх � не падпі�аны."
+
+#. TRANS: Checkbox label in IM preferences form.
+msgid "Publish a MicroID"
+msgstr "�публікаваць MicroID"
+
+#. TRANS: Server error thrown on database error updating IM preferences.
+msgid "Could not update IM preferences."
+msgstr "�емагчыма абнавіць налады імгненных паведамленьн�ў."
+
+#. TRANS: Confirmation message for successful IM preferences save.
+#. TRANS: Confirmation message after saving preferences.
+msgid "Preferences saved."
+msgstr "�алады захаваны�."
+
+#. TRANS: Message given saving IM address without having provided one.
+msgid "No screenname."
+msgstr "��ма м�нушкі."
+
+#. TRANS: Form validation error when no transport is available setting an IM address.
+msgid "No transport."
+msgstr "��ма тран�парту."
+
+#. TRANS: Message given saving IM address that cannot be normalised.
+msgid "Cannot normalize that screenname."
+msgstr "�емагчыма нармалізаваць г�тую м�нушку."
+
+#. TRANS: Message given saving IM address that not valid.
+msgid "Not a valid screenname."
+msgstr "���лушна� м�нушка."
+
+#. TRANS: Message given saving IM address that is already set for another user.
+msgid "Screenname already belongs to another user."
+msgstr "М�нушка ўжо належыць іншаму кары�тальніку."
+
+#. TRANS: Message given saving valid IM address that is to be confirmed.
+msgid "A confirmation code was sent to the IM address you added."
+msgstr "Код пацьверджаньн� быў да�ланы на дададзены Вамі адра� IM."
+
+#. TRANS: Message given canceling IM address confirmation for the wrong IM address.
+msgid "That is the wrong IM address."
+msgstr "Г�та н��лушны IM-адра�."
+
+#. TRANS: Server error thrown on database error canceling IM address confirmation.
+msgid "Could not delete confirmation."
+msgstr "�емагчыма выдаліць пацьверджаньне."
+
+#. TRANS: Message given after successfully canceling IM address confirmation.
+msgid "IM confirmation cancelled."
+msgstr "Пацьверджаньне IM �ка�аванае."
+
+#. TRANS: Message given trying to remove an IM address that is not
+#. TRANS: registered for the active user.
+msgid "That is not your screenname."
+msgstr "Г�та н� Ваша� м�нушка."
+
+#. TRANS: Message given after successfully removing a registered Instant Messaging address.
+msgid "The IM address was removed."
+msgstr "�дра� IM быў выдалены."
+
+#. TRANS: Title for all but the first page of the inbox page.
+#. TRANS: %1$s is the user's nickname, %2$s is the page number.
+#, php-format
+msgid "Inbox for %1$s - page %2$d"
+msgstr "Уваходз�чы� дл� %1$s — �таронка %2$d"
+
+#. TRANS: Title for the first page of the inbox page.
+#. TRANS: %s is the user's nickname.
+#, php-format
+msgid "Inbox for %s"
+msgstr "Уваходны� дл� %s"
+
+#. TRANS: Instructions for user inbox page.
+msgid "This is your inbox, which lists your incoming private messages."
+msgstr ""
+"Г�та Ваша� �крын� ўваходз�чых паведамленьн�ў, тут знаходз�цца атрыманы� "
+"прыватны� паведамленьні."
+
+#. TRANS: Client error displayed when trying to sent invites while they have been disabled.
+msgid "Invites have been disabled."
+msgstr "Запраш�ньні былі адключаны�."
+
+#. TRANS: Client error displayed when trying to sent invites while not logged in.
+#. TRANS: %s is the StatusNet site name.
+#, php-format
+msgid "You must be logged in to invite other users to use %s."
+msgstr ""
+"Вам неабходна ўвай�ьці ў �ы�т�му, каб запрашаць іншых кары�тальнікаў "
+"выкары�тоўваць %s."
+
+#. TRANS: Form validation message when providing an e-mail address that does not validate.
+#. TRANS: %s is an invalid e-mail address.
+#, php-format
+msgid "Invalid email address: %s."
+msgstr "���лушны адра� �лектроннай пошты: %s."
+
+#. TRANS: Page title when invitations have been sent.
+msgid "Invitations sent"
+msgstr "Запраш�ньні да�ланы�"
+
+#. TRANS: Page title when inviting potential users.
+msgid "Invite new users"
+msgstr "Запра�іць новых кары�тальнікаў"
+
+#. TRANS: Message displayed inviting users to use a StatusNet site while the inviting user
+#. TRANS: is already subscribed to one or more users with the given e-mail address(es).
+#. TRANS: Plural form is based on the number of reported already subscribed e-mail addresses.
+#. TRANS: Followed by a bullet list.
+msgid "You are already subscribed to this user:"
+msgid_plural "You are already subscribed to these users:"
+msgstr[0] "Вы ўжо падпі�аны на г�тага кары�тальніка:"
+msgstr[1] "Вы ўжо падпі�аны на г�тых кары�тальнікаў:"
+
+#. TRANS: Used as list item for already subscribed users (%1$s is nickname, %2$s is e-mail address).
+#. TRANS: Used as list item for already registered people (%1$s is nickname, %2$s is e-mail address).
+#, php-format
+msgctxt "INVITE"
+msgid "%1$s (%2$s)"
+msgstr "%1$s (%2$s)"
+
+#. TRANS: Message displayed inviting users to use a StatusNet site while the invited user
+#. TRANS: already uses a this StatusNet site. Plural form is based on the number of
+#. TRANS: reported already present people. Followed by a bullet list.
+msgid "This person is already a user and you were automatically subscribed:"
+msgid_plural ""
+"These people are already users and you were automatically subscribed to them:"
+msgstr[0] ""
+"Г�та а�оба, �ка� ўжо зь�ўл�ецца кары�тальнікам, і на �кую Вы аўтаматычна "
+"падпі�алі��:"
+msgstr[1] ""
+"Г�ты� а�обы, �кі� ўжо зь�ўл�юцца кары�тальнікамі, і на �кіх Вы аўтаматычна "
+"падпі�алі��:"
+
+#. TRANS: Message displayed inviting users to use a StatusNet site. Plural form is
+#. TRANS: based on the number of invitations sent. Followed by a bullet list of
+#. TRANS: e-mail addresses to which invitations were sent.
+msgid "Invitation sent to the following person:"
+msgid_plural "Invitations sent to the following people:"
+msgstr[0] "Запраш�ньне да�ланае на�тупнай а�обе:"
+msgstr[1] "Запраш�ньні да�ланы� на�тупным а�обам:"
+
+#. TRANS: Generic message displayed after sending out one or more invitations to
+#. TRANS: people to join a StatusNet site.
+msgid ""
+"You will be notified when your invitees accept the invitation and register "
+"on the site. Thanks for growing the community!"
+msgstr ""
+"Вы будзеце праінфармаваны, калі Вашы� запраш�ньні будуць прын�ты�, і "
+"запрошаны� будуць зар�гі�траваны� на �айце. Дз�куй Вам за дапамогу ў ро�ьце "
+"�упольна�ьці!"
+
+#. TRANS: Form instructions.
+msgid ""
+"Use this form to invite your friends and colleagues to use this service."
+msgstr ""
+"Выкары�тоўвайце г�тую форму дл� запраш�ньн� Вашых ��броў і калегаў на г�ты "
+"��рві�."
+
+#. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral
+#. TRANS: singular 3rd-person pronoun in English. %1$s is the inviting user, $2$s is
+#. TRANS: the StatusNet sitename.
+#, php-format
+msgid "%1$s has invited you to join them on %2$s"
+msgstr "%1$s запра�іў Ва� далучыцца да �го на %2$s"
+
+#. TRANS: Client error displayed when trying to join a group while not logged in.
+msgid "You must be logged in to join a group."
+msgstr "Вам неабходна ўвай�ьці на �айт, каб далучыцца да групы."
+
+#. TRANS: Title for join group page after joining.
+#, php-format
+msgctxt "TITLE"
+msgid "%1$s joined group %2$s"
+msgstr "%1$s далучыў�� да групы %2$s"
+
+#. TRANS: Exception thrown when there is an unknown error joining a group.
+msgid "Unknown error joining group."
+msgstr "�ев�дома� памылка падча� далуч�ньн� да групы."
+
+#. TRANS: Client error displayed when trying to join a group while already a member.
+#. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
+msgid "You are not a member of that group."
+msgstr "Вы не зь�ўл�еце�� ўдзельнікам г�тай групы."
+
+#. TRANS: User admin panel title
+msgctxt "TITLE"
+msgid "License"
+msgstr "Ліц�нзі�"
+
+#. TRANS: Form instructions for the site license admin panel.
+msgid "License for this StatusNet site"
+msgstr "Ліц�нзі� дл� г�тага �айту StatusNet"
+
+#. TRANS: Client error displayed selecting an invalid license in the license admin panel.
+msgid "Invalid license selection."
+msgstr "���лушны выбар ліц�нзіі."
+
+#. TRANS: Client error displayed when not specifying an owner for the all rights reserved license in the license admin panel.
+msgid ""
+"You must specify the owner of the content when using the All Rights Reserved "
+"license."
+msgstr ""
+"Вы му�іце пазначыць уладальніка аўтар�кіх правоў падча� выкары�таньн� "
+"ліц�нзіі «У�е правы абаронены�»."
+
+#. TRANS: Client error displayed selecting a too long license title in the license admin panel.
+msgid "Invalid license title. Maximum length is 255 characters."
+msgstr "���лушна� назва ліц�нзіі. Мак�ымальна� даўжын� — 255 �ымбал�ў."
+
+#. TRANS: Client error displayed specifying an invalid license URL in the license admin panel.
+msgid "Invalid license URL."
+msgstr "���лушны URL-адра� ліц�нзіі."
+
+#. TRANS: Client error displayed specifying an invalid license image URL in the license admin panel.
+msgid "Invalid license image URL."
+msgstr "���лушны URL-адра� вы�вы ліц�нзіі."
+
+#. TRANS: Client error displayed specifying an invalid license URL in the license admin panel.
+msgid "License URL must be blank or a valid URL."
+msgstr "URL-адра� ліц�нзіі павінен быць пу�тым, ці �лушным."
+
+#. TRANS: Client error displayed specifying an invalid license image URL in the license admin panel.
+msgid "License image must be blank or valid URL."
+msgstr "Вы�ва ліц�нзіі павінна быць пу�тым, ці �лушным URL-адра�ам."
+
+#. TRANS: Form legend in the license admin panel.
+msgid "License selection"
+msgstr "Выбар ліц�нзіі"
+
+#. TRANS: License option in the license admin panel.
+#. TRANS: Checkbox label to mark a list private.
+msgid "Private"
+msgstr "Прыватнае"
+
+#. TRANS: License option in the license admin panel.
+msgid "All Rights Reserved"
+msgstr "У�е правы абаронены�"
+
+#. TRANS: License option in the license admin panel.
+msgid "Creative Commons"
+msgstr "Creative Commons"
+
+#. TRANS: Dropdown field label in the license admin panel.
+msgid "Type"
+msgstr "Тып"
+
+#. TRANS: Dropdown field instructions in the license admin panel.
+msgid "Select a license."
+msgstr "Выберыце ліц�нзію."
+
+#. TRANS: Form legend in the license admin panel.
+msgid "License details"
+msgstr "Падраб�зна�ьці ліц�нзіі"
+
+#. TRANS: Field label in the license admin panel.
+msgid "Owner"
+msgstr "Уладальнік"
+
+#. TRANS: Field title in the license admin panel.
+msgid "Name of the owner of the site's content (if applicable)."
+msgstr "Ім� ўладальніка зьме�ту �айта (калі ўжываецца)."
+
+#. TRANS: Field label in the license admin panel.
+msgid "License Title"
+msgstr "�азва ліц�нзіі"
+
+#. TRANS: Field title in the license admin panel.
+msgid "The title of the license."
+msgstr "�азва ліц�нзіі."
+
+#. TRANS: Field label in the license admin panel.
+msgid "License URL"
+msgstr "URL-адра� ліц�нзіі"
+
+#. TRANS: Field title in the license admin panel.
+msgid "URL for more information about the license."
+msgstr "URL-адра� дл� атрыманьн� дадатковай інфармацыі пра ліц�нзію."
+
+#. TRANS: Field label in the license admin panel.
+msgid "License Image URL"
+msgstr "URL-адра� вы�вы ліц�нзіі"
+
+#. TRANS: Field title in the license admin panel.
+msgid "URL for an image to display with the license."
+msgstr "URL-адра� вы�вы дл� паказу з ліц�нзі�й."
+
+#. TRANS: Button title in the license admin panel.
+msgid "Save license settings."
+msgstr "Захаваць налады ліц�нзіі."
+
+#. TRANS: Form validation error displayed when trying to log in with incorrect credentials.
+msgid "Incorrect username or password."
+msgstr "���лушнае ім� кары�тальніка ці пароль."
+
+#. TRANS: Server error displayed when during login a server error occurs.
+#. TRANS: Server error displayed when a user object could not be created trying to login using "one time password login".
+msgid "Error setting user. You are probably not authorized."
+msgstr "Памылка ў�таноўкі кары�тальніка. Верагодна Вы не аўтарызаваны."
+
+#. TRANS: Page title for login page.
+msgid "Login"
+msgstr "Увай�ьці"
+
+#. TRANS: Form legend on login page.
+msgid "Login to site"
+msgstr "Увай�ьці на �айт"
+
+#. TRANS: Field label on login page.
+msgid "Username or email address"
+msgstr "Ім� кары�тальніка/кары�тальніцы альбо адра� �лектроннай пошты:"
+
+#. TRANS: Checkbox label label on login page.
+#. TRANS: Checkbox label on account registration page.
+msgid "Remember me"
+msgstr "Запам�таць м�не"
+
+#. TRANS: Checkbox title on login page.
+#. TRANS: Checkbox title on account registration page.
+msgid "Automatically login in the future; not for shared computers!"
+msgstr "�ўтаматычны ўваход у будучыні; не дл� агульнада�тупных кампутараў!"
+
+#. TRANS: Button text for log in on login page.
+msgctxt "BUTTON"
+msgid "Login"
+msgstr "Увай�ьці"
+
+#. TRANS: Link text for link to "reset password" on login page.
+msgid "Lost or forgotten password?"
+msgstr "Страцілі ці забылі пароль?"
+
+#. TRANS: Form instructions on login page before being able to change user settings.
+msgid ""
+"For security reasons, please re-enter your user name and password before "
+"changing your settings."
+msgstr ""
+"Па прычынах б��ьпекі, калі ла�ка, ув�дзіце Вашае ім� і пароль зноў, перад "
+"тым �к зьм�н�ць Вашы� налады."
+
+#. TRANS: Form instructions on login page.
+msgid "Login with your username and password."
+msgstr "Увай�ьці з Вашым іменем і паролем."
+
+#. TRANS: Form instructions on login page. This message contains Markdown links in the form [Link text](Link).
+#. TRANS: %%action.register%% is a link to the registration page.
+#, php-format
+msgid ""
+"Don't have a username yet? [Register](%%action.register%%) a new account."
+msgstr ""
+"Яшч� н� маеце ім� кары�тальніка? [зар�гі�траваць](%%action.register%%) новы "
+"рахунак."
+
+#. TRANS: Client error displayed when trying to make another user admin on the Make Admin page while not an admin.
+msgid "Only an admin can make another user an admin."
+msgstr ""
+"Толькі адміні�тратар можа зрабіць іншага кары�тальніка адміні�тратарам."
+
+#. TRANS: Client error displayed when trying to make another user admin on the Make Admin page who already is admin.
+#. TRANS: %1$s is the user that is already admin, %2$s is the group user is already admin for.
+#, php-format
+msgid "%1$s is already an admin for group \"%2$s\"."
+msgstr "%1$s ужо зь�ўл�ецца адміні�тратарам групы «%2$s»."
+
+#. TRANS: Server error displayed when trying to make another user admin on the Make Admin page fails
+#. TRANS: because the group membership record could not be gotten.
+#. TRANS: %1$s is the to be admin user, %2$s is the group user should be admin for.
+#, php-format
+msgid "Can't get membership record for %1$s in group %2$s."
+msgstr "�емагчыма атрымаць запі� прыналежна�ьці %1$s да групы %2$s."
+
+#. TRANS: Server error displayed when trying to make another user admin on the Make Admin page fails
+#. TRANS: because the group adminship record coud not be saved properly.
+#. TRANS: %1$s is the to be admin user, %2$s is the group user is already admin for.
+#, php-format
+msgid "Can't make %1$s an admin for group %2$s."
+msgstr "�емагчыма зрабіць %1$s адміні�тратарам групы %2$s."
+
+#. TRANS: Client error displayed trying to make a micro summary without providing a status.
+msgid "No current status."
+msgstr "��ма ц�перашн�га �тату�у."
+
+#. TRANS: This is the title of the form for adding a new application.
+msgid "New application"
+msgstr "�овае да�та�аваньне"
+
+#. TRANS: Client error displayed trying to add a new application while not logged in.
+msgid "You must be logged in to register an application."
+msgstr "Вы павінны ўвай�ьці ў �ы�т�му, каб зар�гі�траваць да�та�аваньне."
+
+#. TRANS: Form instructions for registering a new application.
+msgid "Use this form to register a new application."
+msgstr "Выкары�тоўвайце г�тую форму дл� р�гі�трацыі новага да�та�аваньн�."
+
+#. TRANS: Validation error shown when not providing a source URL in the "New application" form.
+msgid "Source URL is required."
+msgstr "�еабходны URL-адра� крыніцы."
+
+#. TRANS: Server error displayed when an application could not be registered in the database through the "New application" form.
+msgid "Could not create application."
+msgstr "�емагчыма �тварыць да�та�аваньне."
+
+#. TRANS: Form validation error messages displayed when uploading an invalid application logo.
+msgid "Invalid image."
+msgstr "���лушна� вы�ва."
+
+#. TRANS: Title for form to create a group.
+msgid "New group"
+msgstr "�ова� група"
+
+#. TRANS: Client exception thrown when a user tries to create a group while banned.
+msgid "You are not allowed to create groups on this site."
+msgstr "Вам не дазволена �твараць групы на г�тым �айце."
+
+#. TRANS: Form instructions for group create form.
+msgid "Use this form to create a new group."
+msgstr "Выкары�тоўвайце г�тую форму дл� �твар�ньн� новай групы."
+
+#. TRANS: Page title for new direct message page.
+#. TRANS: Page title on page for sending a direct message.
+msgid "New message"
+msgstr "�овае паведамленьне"
+
+#. TRANS: Client error displayed trying to send a direct message to a user while sender and
+#. TRANS: receiver are not subscribed to each other.
+msgid "You cannot send a message to this user."
+msgstr "Вы н� можаце да�ылаць паведамленьні г�таму кары�тальніку."
+
+#. TRANS: Form validator error displayed trying to send a direct message without content.
+#. TRANS: Client error displayed trying to send a notice without content.
+#. TRANS: Command exception text shown when trying to send a direct message to another user without content.
+#. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
+msgid "No content!"
+msgstr "��ма зьме�ту!"
+
+#. TRANS: Form validation error displayed trying to send a direct message without specifying a recipient.
+msgid "No recipient specified."
+msgstr "�е пададзены атрымальнік."
+
+#. TRANS: Page title after sending a direct message.
+msgid "Message sent"
+msgstr "Паведамленьне да�ланае"
+
+#. TRANS: Confirmation text after sending a direct message.
+#. TRANS: %s is the direct message recipient.
+#. TRANS: Message given have sent a direct message to another user.
+#. TRANS: %s is the name of the other user.
+#, php-format
+msgid "Direct message to %s sent."
+msgstr "Да�ланае непа�р�днае паведамленьне да %s."
+
+#. TRANS: Page title after an AJAX error occurred on the "send direct message" page.
+#. TRANS: Page title after an AJAX error occurs on the send notice page.
+msgid "Ajax Error"
+msgstr "Памылка Ajax"
+
+#. TRANS: Page title for sending a new notice.
+#. TRANS: Title for form to send a new notice.
+msgctxt "TITLE"
+msgid "New notice"
+msgstr "�овы запі�"
+
+#. TRANS: Page title after sending a notice.
+msgid "Notice posted"
+msgstr "Запі� да�ланы"
+
+#. TRANS: Instructions for Notice search page.
+#. TRANS: %%site.name%% is the name of the StatusNet site.
+#, 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 �ымбал�ў."
+
+#. TRANS: Title of the page where users can search for notices.
+msgid "Text search"
+msgstr "Пошук т�к�ту"
+
+#. TRANS: Test in RSS notice search.
+#. TRANS: %1$s is the query, %2$s is the StatusNet site name.
+#, php-format
+msgid "Search results for \"%1$s\" on %2$s"
+msgstr "Вынікі пошуку дл� «%1$s» на %2$s"
+
+#. TRANS: Text for logged in users making a query for notices without results.
+#. TRANS: This message contains a Markdown link.
+#, php-format
+msgid ""
+"Be the first to [post on this topic](%%%%action.newnotice%%%%?"
+"status_textarea=%s)!"
+msgstr ""
+"Станьце першым, хто [што-небудзь дашле па г�тай т�ме](%%%%action.newnotice%%%"
+"%?status_textarea=%s)!"
+
+#. TRANS: Text for not logged in users making a query for notices without results.
+#. TRANS: This message contains Markdown links.
+#, php-format
+msgid ""
+"Why not [register an account](%%%%action.register%%%%) and be the first to "
+"[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
+msgstr ""
+"Чаму не [�тварыць рахунак](%%%%action.register%%%%) і быць першым хто [што-"
+"небудзь дашле па г�тай т�ме](%%%%action.newnotice%%%%?status_textarea=%s)!"
+
+#. TRANS: RSS notice search feed title. %s is the query.
+#, php-format
+msgid "Updates with \"%s\""
+msgstr "�бнаўленьні з «%s»"
+
+#. TRANS: RSS notice search feed description.
+#. TRANS: %1$s is the query, %2$s is the StatusNet site name.
+#, php-format
+msgid "Updates matching search term \"%1$s\" on %2$s."
+msgstr "�бнаўленьні, �кі� адпав�даюць умовам пошуку «%1$s» на %2$s."
+
+#. TRANS: Client error displayed trying to nudge a user that cannot be nudged.
+msgid ""
+"This user doesn't allow nudges or hasn't confirmed or set their email "
+"address yet."
+msgstr ""
+"Г�ты кары�тальнік не дазволіў ��бе «падштурхоўваць», ці �шч� не пацьвердзіў "
+"ці не падаў адра� �ваёй �лектроннай пошты."
+
+#. TRANS: Page title after sending a nudge.
+msgid "Nudge sent"
+msgstr "«Штуршок» да�ланы"
+
+#. TRANS: Confirmation text after sending a nudge.
+msgid "Nudge sent!"
+msgstr "«Штуршок» да�ланы!"
+
+#. TRANS: Message displayed to an anonymous user trying to view OAuth application list.
+msgid "You must be logged in to list your applications."
+msgstr ""
+"Вы павінны ўвай�ьці ў �ы�т�му, каб прагл�даць �ьпі� �ваіх да�та�аваньн�ў."
+
+#. TRANS: Page title for OAuth applications
+msgid "OAuth applications"
+msgstr "Да�та�аваньні OAuth"
+
+#. TRANS: Page instructions for OAuth applications
+msgid "Applications you have registered"
+msgstr "Да�та�аваньні, �кі� Вы зар�гі�травалі"
+
+#. TRANS: Empty list message on page with OAuth applications.
+#, php-format
+msgid "You have not registered any applications yet."
+msgstr "Вы �шч� не зар�гі�травалі ніводнага да�та�аваньн�."
+
+#. TRANS: Title for OAuth connection settings.
+msgid "Connected applications"
+msgstr "Далучаны� да�та�аваньні"
+
+#. TRANS: Instructions for OAuth connection settings.
+msgid "The following connections exist for your account."
+msgstr "�а�тупны� злуч�ньні і�нуюць дл� Вашага рахунку."
+
+#. TRANS: Client error when trying to revoke access for an application while not being a user of it.
+msgid "You are not a user of that application."
+msgstr "Вы не зь�ўл�еце�� кары�тальнікам г�тага да�та�аваньн�."
+
+#. TRANS: Client error when revoking access has failed for some reason.
+#. TRANS: %s is the application ID revoking access failed for.
+#, php-format
+msgid "Unable to revoke access for application: %s."
+msgstr "�емагчыма �ка�аваць до�туп дл� да�та�аваньн�: %s."
+
+#. TRANS: Success message after revoking access for an application.
+#. TRANS: %1$s is the application name, %2$s is the first part of the user token.
+#, php-format
+msgid ""
+"You have successfully revoked access for %1$s and the access token starting "
+"with %2$s."
+msgstr ""
+"Вы па�ьп�хова �ка�авалі до�туп дл� %1$s і ключ до�тупу пачынаецца з %2$s."
+
+#. TRANS: Empty list message when no applications have been authorised yet.
+msgid "You have not authorized any applications to use your account."
+msgstr "Вы не дазволілі да�та�аваньн�м выкары�тоўваць Ваш рахунак."
+
+#. TRANS: Note for developers in the OAuth connection settings form.
+#. TRANS: This message contains a Markdown link. Do not separate "](".
+#. TRANS: %s is the URL to the OAuth settings.
+#, php-format
+msgid ""
+"Are you a developer? [Register an OAuth client application](%s) to use with "
+"this instance of StatusNet."
+msgstr ""
+"Вы ра�працоўшчык? [Зар�гі�труйце кліенцкае да�та�аваньне OAuth](%s) дл� "
+"выкары�таньн� з г�тым �айтам StatusNet."
+
+#. TRANS: Server error displayed in oEmbed action when path not found.
+#. TRANS: %s is a path.
+#, php-format
+msgid "\"%s\" not found."
+msgstr "«%s» н� знойдзены."
+
+#. TRANS: Server error displayed in oEmbed action when notice not found.
+#. TRANS: %s is a notice.
+#, php-format
+msgid "Notice %s not found."
+msgstr "Запі� %s н� знойдзены."
+
+#. TRANS: Server error displayed in oEmbed action when notice has not profile.
+#. TRANS: Server error displayed trying to show a notice without a connected profile.
+msgid "Notice has no profile."
+msgstr "Запі� н� мае профілю."
+
+#. TRANS: oEmbed title. %1$s is the author name, %2$s is the creation date.
+#. TRANS: Title of the page that shows a notice.
+#. TRANS: %1$s is a user name, %2$s is the notice creation date/time.
+#, php-format
+msgid "%1$s's status on %2$s"
+msgstr "Стату� %1$s на %2$s"
+
+#. TRANS: Server error displayed in oEmbed action when attachment not found.
+#. TRANS: %d is an attachment ID.
+#, php-format
+msgid "Attachment %s not found."
+msgstr "Далуч�ньне %s н� знойдзенае."
+
+#. TRANS: Server error displayed in oEmbed request when a path is not supported.
+#. TRANS: %s is a path.
+#, php-format
+msgid "\"%s\" not supported for oembed requests."
+msgstr "«%s» не падтрымліваецца дл� oembed-запытаў."
+
+#. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
+#, php-format
+msgid "Content type %s not supported."
+msgstr "Тып зьме�ту %s не падтрымліваецца."
+
+#. TRANS: Error message displaying attachments. %s is the site's base URL.
+#, php-format
+msgid "Only %s URLs over plain HTTP please."
+msgstr "Дазволены� толькі URL-адра�ы %s праз звычайны пратакол HTTP."
+
+#. TRANS: Server error displayed in oEmbed action when request specifies an unsupported data format.
+#. TRANS: Client error on an API request with an unsupported data format.
+msgid "Not a supported data format."
+msgstr "Такі фармат зьве�так не падтрымліваецца."
+
+#. TRANS: Page title for profile settings.
+msgid "Old school UI settings"
+msgstr "�алады інт�рф�й�у ў �тарым �тылі"
+
+#. TRANS: Usage instructions for profile settings.
+msgid "If you like it \"the old way\", you can set that here."
+msgstr "Калі Вы жадаеце «�тарым чынам», Вы можаце пазначыць г�та тут."
+
+#. TRANS: Confirmation shown when user profile settings are saved.
+#. TRANS: Message after successful saving of administrative settings.
+msgid "Settings saved."
+msgstr "�алады захаваны�."
+
+msgid "Only stream mode (no conversations) in timelines"
+msgstr "Толькі р�жым �трумен� (без абмеркаваньн�ў) ў �тужцы падзе�ў"
+
+msgid "Show conversation page as hierarchical trees"
+msgstr "Паказаць �таронку абмеркаваньн� ў выгл�дзе гіерархічных др�ваў"
+
+msgid "Show nicknames (not full names) in timelines"
+msgstr "Паказаць м�нушкі (не поўны� імёны) у �тужцы падзе�ў"
+
+#. TRANS: Button text to save a list.
+msgid "Save"
+msgstr "Захаваць"
+
+#. TRANS: ShortName in the OpenSearch interface when trying to find users.
+msgid "People Search"
+msgstr "Пошук людзей"
+
+#. TRANS: ShortName in the OpenSearch interface when trying to find notices.
+msgid "Notice Search"
+msgstr "Пошук запі�аў"
+
+#. TRANS: Client error displayed trying to use "one time password login" when already logged in.
+#. TRANS: Client error displayed when trying to register while already logged in.
+msgid "Already logged in."
+msgstr "Ужо ўвайшлі ў �ы�т�му."
+
+#. TRANS: Client error displayed trying to use "one time password login" without specifying a user.
+msgid "No user ID specified."
+msgstr "�е пазначаны ід�нтыфікатар кары�тальніка."
+
+#. TRANS: Client error displayed trying to use "one time password login" without specifying a login token.
+msgid "No login token specified."
+msgstr "�е пазначаны ключ уваходу."
+
+#. TRANS: Client error displayed trying to use "one time password login" without requesting a login token.
+msgid "No login token requested."
+msgstr "Ключ уваходу не запытаны."
+
+#. TRANS: Client error displayed trying to use "one time password login" while specifying an invalid login token.
+msgid "Invalid login token specified."
+msgstr "Пазначаны н��лушны ключ уваходу."
+
+#. TRANS: Client error displayed trying to use "one time password login" while specifying an expired login token.
+msgid "Login token expired."
+msgstr "Т�рмін дзе�ньн� ключа ўваходу �кончыў��."
+
+#. TRANS: Title for outbox for any but the fist page.
+#. TRANS: %1$s is the user nickname, %2$d is the page number.
+#, php-format
+msgid "Outbox for %1$s - page %2$d"
+msgstr "Выходз�чы� дл� %1$s — �таронка %2$d"
+
+#. TRANS: Title for first page of outbox.
+#, php-format
+msgid "Outbox for %s"
+msgstr "Выходз�чы� дл� %s"
+
+#. TRANS: Instructions for outbox.
+msgid "This is your outbox, which lists private messages you have sent."
+msgstr ""
+"Г�та Вашы� выходз�чы� паведамленьні, тут знаходз�цца а�абі�ты� "
+"паведамленьні, �кі� Вы да�ылалі раней."
+
+#. TRANS: Title for page where to change password.
+msgctxt "TITLE"
+msgid "Change password"
+msgstr "Зьм�ніць пароль"
+
+#. TRANS: Instructions for page where to change password.
+msgid "Change your password."
+msgstr "Зьм�ніць Ваш пароль."
+
+#. TRANS: Fieldset legend on page where to change password.
+#. TRANS: Fieldset legend for password reset form.
+msgid "Password change"
+msgstr "Зьмена паролю"
+
+#. TRANS: Field label on page where to change password.
+msgid "Old password"
+msgstr "Стары пароль"
+
+#. TRANS: Field label on page where to change password.
+#. TRANS: Field label for password reset form.
+msgid "New password"
+msgstr "�овы пароль"
+
+#. TRANS: Field title on page where to change password.
+#. TRANS: Field title on account registration page.
+msgid "6 or more characters."
+msgstr "6 ці болей �ымбал�ў."
+
+#. TRANS: Field label on page where to change password. In this field the new password should be typed a second time.
+msgctxt "LABEL"
+msgid "Confirm"
+msgstr "Пацьвердзіць"
+
+#. TRANS: Field title on page where to change password.
+#. TRANS: Title for field label for password reset form where the password has to be typed again.
+#. TRANS: Field title on account registration page.
+msgid "Same as password above."
+msgstr "Той �амы пароль, што і выш�й."
+
+#. TRANS: Button text on page where to change password.
+msgctxt "BUTTON"
+msgid "Change"
+msgstr "Зьм�ніць"
+
+#. TRANS: Form validation error on page where to change password.
+#. TRANS: Form validation error displayed when trying to register with too short a password.
+msgid "Password must be 6 or more characters."
+msgstr "Пароль павінен утрымліваць 6 ці болей �ымбал�ў."
+
+#. TRANS: Form validation error on password change when password confirmation does not match.
+#. TRANS: Form validation error displayed when trying to register with non-matching passwords.
+msgid "Passwords do not match."
+msgstr "Паролі не �упадаюць."
+
+#. TRANS: Form validation error on page where to change password.
+msgid "Incorrect old password."
+msgstr "���лушны �тары пароль."
+
+#. TRANS: Form validation error on page where to change password.
+msgid "Error saving user; invalid."
+msgstr "Памылка захаваньн� кары�тальніка; н��лушнае ім�."
+
+#. TRANS: Server error displayed on page where to change password when password change
+#. TRANS: could not be made because of a server error.
+#. TRANS: Reset password form validation error message.
+msgid "Cannot save new password."
+msgstr "�емагчыма захаваць новы пароль."
+
+#. TRANS: Form validation notice on page where to change password.
+msgid "Password saved."
+msgstr "Пароль захаваны."
+
+#. TRANS: Title for Paths admin panel.
+msgid "Paths"
+msgstr "Шл�хі"
+
+#. TRANS: Form instructions for Path admin panel.
+msgid "Path and server settings for this StatusNet site"
+msgstr "�алады шл�ху і ��рв�ра дл� г�тага �айта StatusNet"
+
+#. TRANS: Client error in Paths admin panel.
+#. TRANS: %s is the directory that could not be read from.
+#, php-format
+msgid "Theme directory not readable: %s."
+msgstr "Дыр�кторы� т�маў неда�тупна� дл� чытаньн�: %s."
+
+#. TRANS: Client error in Paths admin panel.
+#. TRANS: %s is the avatar directory that could not be written to.
+#, php-format
+msgid "Avatar directory not writable: %s."
+msgstr "Дыр�кторы� аватараў неда�тупна� дл� запі�у: %s."
+
+#. TRANS: Client error in Paths admin panel.
+#. TRANS: %s is the locales directory that could not be read from.
+#, php-format
+msgid "Locales directory not readable: %s."
+msgstr "Дыр�кторы� л�калізацы�ў неда�тупна� дл� чытаньн�: %s."
+
+#. TRANS: Client error in Paths admin panel.
+#. TRANS: %s is the SSL server URL that is too long.
+msgid "Invalid SSL server. The maximum length is 255 characters."
+msgstr "���лушны SSL-��рв�р. Мак�ымальна� даўжын� — 255 �ымбал�ў."
+
+#. TRANS: Fieldset legend in Paths admin panel.
+msgid "Site"
+msgstr "Сайт"
+
+#. TRANS: Field label in Paths admin panel.
+msgid "Server"
+msgstr "С�рв�р"
+
+#. TRANS: Field title in Paths admin panel.
+msgid "Site's server hostname."
+msgstr "�азва хо�ту ��рв�ра �айта."
+
+#. TRANS: Field label in Paths admin panel.
+msgid "Path"
+msgstr "Шл�х"
+
+#. TRANS: Field title in Paths admin panel.
+msgid "Site path."
+msgstr "Шл�х да �айту."
+
+#. TRANS: Field label in Paths admin panel.
+msgid "Locale directory"
+msgstr "Дыр�кторы� л�калізацы�ў"
+
+#. TRANS: Field title in Paths admin panel.
+msgid "Directory path to locales."
+msgstr "Шл�х да дыр�кторыі л�калізацы�ў."
+
+#. TRANS: Checkbox label in Paths admin panel.
+msgid "Fancy URLs"
+msgstr "Кароткі� URL-адра�ы"
+
+#. TRANS: Field title in Paths admin panel.
+msgid "Use fancy URLs (more readable and memorable)?"
+msgstr "Выкары�тоўваць кароткі� URL-адра�ы (больш чытальны� і запамінальны�)?"
+
+#. TRANS: Fieldset legend in Paths admin panel.
+msgctxt "LEGEND"
+msgid "Theme"
+msgstr "�фармленьне"
+
+#. TRANS: Tooltip for field label in Paths admin panel.
+msgid "Server for themes."
+msgstr "С�рв�р афармленьн�ў."
+
+#. TRANS: Tooltip for field label in Paths admin panel.
+msgid "Web path to themes."
+msgstr "Ў�б-шл�х да афармленьн�ў."
+
+#. TRANS: Field label in Paths admin panel.
+msgid "SSL server"
+msgstr "SSL-��рв�р"
+
+#. TRANS: Tooltip for field label in Paths admin panel.
+msgid "SSL server for themes (default: SSL server)."
+msgstr "SSL-��рв�р дл� афармленьн�ў (па змоўчваньні: SSL-��рв�р)."
+
+#. TRANS: Field label in Paths admin panel.
+msgid "SSL path"
+msgstr "SSL-шл�х"
+
+#. TRANS: Tooltip for field label in Paths admin panel.
+msgid "SSL path to themes (default: /theme/)."
+msgstr "SSL-шл�х да т�маў (па змоўчваньні: /theme/)."
+
+#. TRANS: Field label in Paths admin panel.
+msgid "Directory"
+msgstr "Дыр�кторы�"
+
+#. TRANS: Tooltip for field label in Paths admin panel.
+msgid "Directory where themes are located."
+msgstr "Дыр�кторы�, у �кой знаходз�цца т�мы."
+
+#. TRANS: Fieldset legend in Paths admin panel.
+msgid "Avatars"
+msgstr "�ватары"
+
+#. TRANS: Field label in Paths admin panel.
+msgid "Avatar server"
+msgstr "С�рв�р аватараў"
+
+#. TRANS: Tooltip for field label in Paths admin panel.
+msgid "Server for avatars."
+msgstr "С�рв�р дл� аватараў."
+
+#. TRANS: Field label in Paths admin panel.
+msgid "Avatar path"
+msgstr "Шл�х да аватараў"
+
+#. TRANS: Tooltip for field label in Paths admin panel.
+msgid "Web path to avatars."
+msgstr "Ў�б-шл�х да аватараў."
+
+#. TRANS: Field label in Paths admin panel.
+msgid "Avatar directory"
+msgstr "Дыр�кторы� аватараў"
+
+#. TRANS: Tooltip for field label in Paths admin panel.
+msgid "Directory where avatars are located."
+msgstr "Дыр�кторы�, у �кой знаходз�цца аватары."
+
+#. TRANS: Fieldset legens in Paths admin panel.
+msgid "Attachments"
+msgstr "Далуч�ньні"
+
+#. TRANS: Tooltip for field label in Paths admin panel.
+msgid "Server for attachments."
+msgstr "С�рв�р далуч�ньн�ў."
+
+#. TRANS: Tooltip for field label in Paths admin panel.
+msgid "Web path to attachments."
+msgstr "Ў�б-шл�х да далуч�ньн�ў."
+
+#. TRANS: Tooltip for field label in Paths admin panel.
+msgid "Server for attachments on SSL pages."
+msgstr "С�рв�р дл� далуч�ньн�ў на SSL-�таронках."
+
+#. TRANS: Tooltip for field label in Paths admin panel.
+msgid "Web path to attachments on SSL pages."
+msgstr "У�б-шл�х дл� далуч�ньн�ў на SSL-�таронках."
+
+#. TRANS: Tooltip for field label in Paths admin panel.
+msgid "Directory where attachments are located."
+msgstr "Дыр�кторы�, у �кой знаходз�цца далуч�ньні."
+
+#. TRANS: Fieldset legend in Paths admin panel.
+msgctxt "LEGEND"
+msgid "SSL"
+msgstr "SSL"
+
+#. TRANS: Drop down option in Paths admin panel (option for "When to use SSL").
+#. TRANS: Option in dropdown for snapshot method in admin panel for snapshots.
+msgid "Never"
+msgstr "�іколі"
+
+#. TRANS: Drop down option in Paths admin panel (option for "When to use SSL").
+msgid "Sometimes"
+msgstr "Ча�ам"
+
+#. TRANS: Drop down option in Paths admin panel (option for "When to use SSL").
+msgid "Always"
+msgstr "Заў�ёды"
+
+#. TRANS: Drop down label in Paths admin panel.
+msgid "Use SSL"
+msgstr "Выкары�тоўваць SSL"
+
+#. TRANS: Tooltip for field label in Paths admin panel.
+msgid "When to use SSL."
+msgstr "Калі выкары�тоўваць SSL."
+
+#. TRANS: Tooltip for field label in Paths admin panel.
+msgid "Server to direct SSL requests to."
+msgstr "С�рв�р, на �кі перанакіроўваць SSL-запыты."
+
+#. TRANS: Button title text to store form data in the Paths admin panel.
+msgid "Save path settings."
+msgstr "Захаваць налады шл�ху."
+
+#. TRANS: Instructions for the "People search" page.
+#. TRANS: %%site.name%% is the name of the StatusNet site.
+#, 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 ці болей �ымбал�ў."
+
+#. TRANS: Title of a page where users can search for other users.
+msgid "People search"
+msgstr "Пошук людзей"
+
+#. TRANS: Title for list page.
+#. TRANS: %s is a list.
+#, php-format
+msgid "Public list %s"
+msgstr "Публічны �ьпі� %s"
+
+#. TRANS: Title for list page.
+#. TRANS: %1$s is a list, %2$d is a page number.
+#, php-format
+msgid "Public list %1$s, page %2$d"
+msgstr "Публічны �ьпі� %1$s, �таронка %2$d"
+
+#. TRANS: Message for anonymous users on list page.
+#. TRANS: This message contains Markdown links in the form [description](link).
+#, php-format
+msgid ""
+"Lists are how you sort similar people on %%site.name%%, a [micro-blogging]"
+"(http://en.wikipedia.org/wiki/Micro-blogging) service based on the Free "
+"Software [StatusNet](http://status.net/) tool. You can then easily keep "
+"track of what they are doing by subscribing to the list's timeline."
+msgstr ""
+"Сьпі�ы — �по�аб групоўкі падобных людзей на %%site.name%%, ��рві�е "
+"[мікраблёгаў](http://en.wikipedia.org/wiki/Micro-blogging), �кі працуе з "
+"дапамогай вольнага праграмнага забе�ьп�ч�ньн� [StatusNet](http://status."
+"net/). Вы можаце зь лёгка�ьцю �ачыць за тым, што �ны роб�ць, падпі�аўшы�� на "
+"�тужку паведамленьн�ў г�тага �ьпі�у."
+
+#. TRANS: Client error displayed when a tagger is expected but not provided.
+msgid "No tagger."
+msgstr "��ма аўтара т�га."
+
+#. TRANS: Title for list of people listed by the user.
+#. TRANS: %1$s is a list, %2$s is a username.
+#, php-format
+msgid "People listed in %1$s by %2$s"
+msgstr "Людзі пазначаны� ў �ьпі�е %1$s кары�тальнікам %2$s"
+
+#. TRANS: Title for list of people listed by the user.
+#. TRANS: %1$s is a list, %2$s is a username, %2$s is a page number.
+#, php-format
+msgid "People listed in %1$s by %2$s, page %3$d"
+msgstr "Людзі пазначаны� ў �ьпі�е %1$s кары�тальнікам %2$s, �таронка %3$d"
+
+#. TRANS: Addition in tag membership list for creator of a tag.
+#. TRANS: Addition in tag subscribers list for creator of a tag.
+msgid "Creator"
+msgstr "�ўтар"
+
+#. TRANS: Title for lists by a user page for a private tag.
+msgid "Private lists by you"
+msgstr "Вашы� а�абі�ты� �ьпі�ы"
+
+#. TRANS: Title for lists by a user page for a public tag.
+msgid "Public lists by you"
+msgstr "Вашы� публічны� �ьпі�ы"
+
+#. TRANS: Title for lists by a user page.
+msgid "Lists by you"
+msgstr "Вашы� �ьпі�ы"
+
+#. TRANS: Title for lists by a user page.
+#. TRANS: %s is a user nickname.
+#, php-format
+msgid "Lists by %s"
+msgstr "Сьпі�ы %s"
+
+#. TRANS: Title for lists by a user page.
+#. TRANS: %1$s is a user nickname, %2$d is a page number.
+#, php-format
+msgid "Lists by %1$s, page %2$d"
+msgstr "Сьпі�ы %1$s, �таронка %2$d"
+
+#. TRANS: Client error displayed when trying view another user's private lists.
+msgid "You cannot view others' private lists"
+msgstr "Вы н� можаце прагл�даць прыватны� �ьпі�ы іншых кары�тальнікаў"
+
+#. TRANS: Mode selector label.
+msgid "Mode"
+msgstr "Р�жым"
+
+#. TRANS: Link text to show lists for user %s.
+#, php-format
+msgid "Lists for %s"
+msgstr "Сьпі�ы дл� %s"
+
+#. TRANS: Fieldset legend.
+#. TRANS: Fieldset legend on gallery action page.
+msgid "Select tag to filter"
+msgstr "Выберыце т�г дл� фільтраваньн�"
+
+#. TRANS: Checkbox title.
+msgid "Show private tags."
+msgstr "Паказваць прыватны� т�гі."
+
+#. TRANS: Checkbox label to show public tags.
+msgctxt "LABEL"
+msgid "Public"
+msgstr "Публічны�"
+
+#. TRANS: Checkbox title.
+msgid "Show public tags."
+msgstr "Паказваць публічны� т�гі."
+
+#. TRANS: Submit button text for tag filter form.
+#. TRANS: Submit button text on gallery action page.
+msgctxt "BUTTON"
+msgid "Go"
+msgstr "Перай�ьці"
+
+#. TRANS: Message displayed for anonymous users on page that displays lists by a user.
+#. TRANS: This message contains Markdown links in the form [description](links).
+#. TRANS: %s is a tagger nickname.
+#, php-format
+msgid ""
+"These are lists created by **%s**. Lists are how you sort similar people on %"
+"%%%site.name%%%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
+"blogging) service based on the Free Software [StatusNet](http://status.net/) "
+"tool. You can easily keep track of what they are doing by subscribing to the "
+"list's timeline."
+msgstr ""
+"Тут пададзены� �ьпі�ы �твораны� **%s**. Сьпі�ы — �по�аб �артаваньн� падобных "
+"людзей на %%site.name%%, ��рві�е [мікраблёгаў](http://en.wikipedia.org/wiki/"
+"Micro-blogging), �кі працуе з дапамогай вольнага праграмнага забе�ьп�ч�ньн� "
+"[StatusNet](http://status.net/). Вы можаце зь лёгка�ьцю �ачыць за тым, што "
+"�ны роб�ць, падпі�аўшы�� на �тужку паведамленьн�ў г�тага �ьпі�у."
+
+#. TRANS: Message displayed on page that displays lists by a user when there are none.
+#. TRANS: This message contains Markdown links in the form [description](links).
+#. TRANS: %s is a tagger nickname.
+#, php-format
+msgid "%s has not created any [lists](%%%%doc.lists%%%%) yet."
+msgstr "%s �шч� не �тварыў ніводнага [�ьпі�у](%%%%doc.lists%%%%)."
+
+#. TRANS: Page title. %s is a tagged user's nickname.
+#, php-format
+msgid "Lists with %s in them"
+msgstr "Сьпі�ы, да �кіх належыць %s"
+
+#. TRANS: Page title. %1$s is a tagged user's nickname, %2$s is a page number.
+#, php-format
+msgid "Lists with %1$s, page %2$d"
+msgstr "Сьпі�ы з %1$s, �таронка %2$d"
+
+#. TRANS: Message displayed for anonymous users on page that displays lists for a user.
+#. TRANS: This message contains Markdown links in the form [description](links).
+#. TRANS: %s is a tagger nickname.
+#, php-format
+msgid ""
+"These are lists for **%s**. lists are how you sort similar people on %%%%"
+"site.name%%%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
+"blogging) service based on the Free Software [StatusNet](http://status.net/) "
+"tool. You can easily keep track of what they are doing by subscribing to the "
+"list's timeline."
+msgstr ""
+"Тут пададзены� �ьпі�ы дл� **%s**. Сьпі�ы — �по�аб �артаваньн� падобных "
+"людзей на %%%%site.name%%%%, ��рві�е [мікраблёгаў](http://en.wikipedia.org/"
+"wiki/Micro-blogging), �кі працуе з дапамогай вольнага праграмнага "
+"забе�ьп�ч�ньн� [StatusNet](http://status.net/). Вы можаце зь лёгка�ьцю "
+"�ачыць за тым, што �ны роб�ць, падпі�аўшы�� на �тужку паведамленьн�ў г�тага "
+"�ьпі�у."
+
+#. TRANS: Message displayed on page that displays lists a user was added to when there are none.
+#. TRANS: This message contains Markdown links in the form [description](links).
+#. TRANS: %s is a user nickname.
+#, php-format
+msgid "%s has not been [listed](%%%%doc.lists%%%%) by anyone yet."
+msgstr ""
+"%s �шч� не ўваходзіць ні ў �кі [�ьпі�](%%%%doc.lists%%%%) іншых "
+"кары�тальнікаў."
+
+#. TRANS: Page title for list of list subscribers.
+#. TRANS: %1$s is a list, %2$s is a user nickname.
+#, php-format
+msgid "Subscribers to list %1$s by %2$s"
+msgstr "Падпі�аны� на �ьпі� %1$s кары�тальніка %2$s"
+
+#. TRANS: Page title for list of list subscribers.
+#. TRANS: %1$s is a list, %2$s is a user nickname, %3$d is a page number.
+#, php-format
+msgid "Subscribers to list %1$s by %2$s, page %3$d"
+msgstr "Падпі�аны� на �ьпі� %1$s кары�тальніка %2$s, �таронка %3$d"
+
+#. TRANS: Title for page that displays lists subscribed to by a user.
+#. TRANS: %s is a profile nickname.
+#, php-format
+msgid "Lists subscribed to by %s"
+msgstr "Сьпі�ы, на �кі� падпі�аны %s"
+
+#. TRANS: Title for page that displays lists subscribed to by a user.
+#. TRANS: %1$s is a profile nickname, %2$d is a page number.
+#, php-format
+msgid "Lists subscribed to by %1$s, page %2$d"
+msgstr "Сьпі�ы, на �кі� падпі�аны %1$s, �таронка %2$d"
+
+#. TRANS: Message displayed for anonymous users on page that displays lists subscribed to by a user.
+#. TRANS: This message contains Markdown links in the form [description](links).
+#. TRANS: %s is a profile nickname.
+#, php-format
+msgid ""
+"These are lists subscribed to by **%s**. Lists are how you sort similar "
+"people on %%%%site.name%%%%, a [micro-blogging](http://en.wikipedia.org/wiki/"
+"Micro-blogging) service based on the Free Software [StatusNet](http://status."
+"net/) tool. You can easily keep track of what they are doing by subscribing "
+"to the list's timeline."
+msgstr ""
+"Тут пададзены� �ьпі�ы, на �кі� падпі�аны **%s**. Сьпі�ы — �по�аб групоўкі "
+"падобных людзей на %%site.name%%, ��рві�е [мікраблёгаў](http://en.wikipedia."
+"org/wiki/Micro-blogging), �кі працуе з дапамогай вольнага праграмнага "
+"забе�ьп�ч�ньн� [StatusNet](http://status.net/). Вы можаце зь лёгка�ьцю "
+"�ачыць за тым, што �ны роб�ць, падпі�аўшы�� на �тужку паведамленьн�ў г�тага "
+"�ьпі�у."
+
+#. TRANS: Page title for AJAX form return when a disabling a plugin.
+msgctxt "plugin"
+msgid "Disabled"
+msgstr "Выключаны"
+
+#. TRANS: Client error displayed when trying to use another method than POST.
+#. TRANS: Do not translate POST.
+#. TRANS: Client error displayed trying to perform any request method other than POST.
+#. TRANS: Do not translate POST.
+#. TRANS: Client error displayed when trying to use another method than POST.
+msgid "This action only accepts POST requests."
+msgstr "Г�тае дзе�ньне прымае толькі POST-запыты."
+
+#. TRANS: Client error displayed when trying to enable or disable a plugin without access rights.
+msgid "You cannot administer plugins."
+msgstr "Вы н� можаце кіраваць дапаўненьн�мі."
+
+#. TRANS: Client error displayed when trying to enable or disable a non-existing plugin.
+msgid "No such plugin."
+msgstr "��ма такога дапаўненьн�."
+
+#. TRANS: Page title for AJAX form return when enabling a plugin.
+msgctxt "plugin"
+msgid "Enabled"
+msgstr "Уключаны"
+
+#. TRANS: Tab and title for plugins admin panel.
+msgctxt "TITLE"
+msgid "Plugins"
+msgstr "Дапаўненьні"
+
+#. TRANS: Instructions at top of plugin admin page.
+msgid ""
+"Additional plugins can be enabled and configured manually. See the <a href="
+"\"http://status.net/wiki/Plugins\">online plugin documentation</a> for more "
+"details."
+msgstr ""
+"Дадатковы� дапаўненьні можна ўключыць і наладжваць уручную. Гл�дзіце <a href="
+"\"http://status.net/wiki/Plugins\">дакум�нтацыю</a>, каб атрымаць дадатковую "
+"інфармацыю."
+
+#. TRANS: Admin form section header
+msgid "Default plugins"
+msgstr "Дапаўненьні па змоўчваньні"
+
+#. TRANS: Text displayed on plugin admin page when no plugin are enabled.
+msgid ""
+"All default plugins have been disabled from the site's configuration file."
+msgstr ""
+"У�е дапаўненьні па змоўчваньні былі адключаны� ў файле канфігурацыі �айта."
+
+#. TRANS: Client error displayed when trying to add an unindentified field to profile.
+#. TRANS: %s is a field name.
+#, php-format
+msgid "Unidentified field %s."
+msgstr "�ев�домае поле %s."
+
+#. TRANS: Page title.
+msgctxt "TITLE"
+msgid "Search results"
+msgstr "Вынікі пошуку"
+
+#. TRANS: Error message in case a search is shorter than three characters.
+msgid "The search string must be at least 3 characters long."
+msgstr "Радок пошуку павінен утрымліваць н� меней 3 �ымбал�ў."
+
+#. TRANS: Page title for profile settings.
+msgid "Profile settings"
+msgstr "�алады профілю"
+
+#. TRANS: Usage instructions for profile settings.
+msgid ""
+"You can update your personal profile info here so people know more about you."
+msgstr ""
+"Вы можаце абнавіць Вашую а�абі�тую інфармацыю ў профілі, каб людзі "
+"даведалі�� пра Ва� болей."
+
+#. TRANS: Profile settings form legend.
+msgid "Profile information"
+msgstr "Інфармацы� пра профіль"
+
+#. TRANS: Tooltip for field label in form for profile settings.
+#. TRANS: Field title on account registration page.
+#. TRANS: Field title on group edit form.
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
+msgstr "1-64 малых літараў ці лічбаў, без �ымбал�ў пунктуацыі і прагалаў."
+
+#. TRANS: Field label in form for profile settings.
+#. TRANS: Field label on account registration page.
+#. TRANS: Field label on group edit form.
+msgid "Full name"
+msgstr "Поўнае ім�"
+
+#. TRANS: Field label in form for profile settings.
+#. TRANS: Field label on account registration page.
+#. TRANS: Form input field label.
+#. TRANS: Field label on group edit form; points to "more info" for a group.
+msgid "Homepage"
+msgstr "Хатн�� �таронка"
+
+#. TRANS: Tooltip for field label in form for profile settings.
+#. TRANS: Field title on account registration page.
+msgid "URL of your homepage, blog, or profile on another site."
+msgstr "URL-адра� Вашай хатн�й �таронкі, блёгу ці профілю на іншым �айце."
+
+#. TRANS: Tooltip for field label in form for profile settings. Plural
+#. TRANS: is decided by the number of characters available for the
+#. TRANS: biography (%d).
+#. TRANS: Text area title in form for account registration. Plural
+#. TRANS: is decided by the number of characters available for the
+#. TRANS: biography (%d).
+#, php-format
+msgid "Describe yourself and your interests in %d character."
+msgid_plural "Describe yourself and your interests in %d characters."
+msgstr[0] "�пішыце ��бе і Вашы� зацікаўлена�ьці ўклаўшы�� ў %d �ымбаль."
+msgstr[1] "�пішыце ��бе і Вашы� зацікаўлена�ьці ўклаўшы�� ў %d �ымбалі."
+
+#. TRANS: Tooltip for field label in form for profile settings.
+#. TRANS: Text area title on account registration page.
+msgid "Describe yourself and your interests."
+msgstr "�пішыце ��бе і Вашы� зацікаўлена�ьці."
+
+#. TRANS: Text area label in form for profile settings where users can provide
+#. TRANS: their biography.
+#. TRANS: Text area label on account registration page.
+msgid "Bio"
+msgstr "Бі�графі�"
+
+#. TRANS: Field label in form for profile settings.
+#. TRANS: Field label on account registration page.
+#. TRANS: Field label on group edit form.
+#. TRANS: Dropdown option for searching in profiles.
+msgid "Location"
+msgstr "Ме�цазнаходжаньне"
+
+#. TRANS: Tooltip for field label in form for profile settings.
+#. TRANS: Field title on account registration page.
+msgid "Where you are, like \"City, State (or Region), Country\"."
+msgstr "Дзе Вы знаходзіце��, напрыклад, «Горад, штат (вобла�ьць), краіна»."
+
+#. TRANS: Checkbox label in form for profile settings.
+msgid "Share my current location when posting notices"
+msgstr "Паказваць маё ц�перашн�е ме�цазнаходжаньне, падча� адпраўкі запі�аў"
+
+#. TRANS: Field label in form for profile settings.
+#. TRANS: Title for group tag cloud section.
+#. TRANS: %s is a group name.
+msgid "Tags"
+msgstr "Т�гі"
+
+#. TRANS: Tooltip for field label in form for profile settings.
+msgid ""
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- "
+"separated."
+msgstr ""
+"Т�гі дл� ��бе (літары, лічбы, -, ., і _), падзелены� ко�кай ці прагалам."
+
+#. TRANS: Dropdownlist label in form for profile settings.
+msgid "Language"
+msgstr "Мова"
+
+#. TRANS: Tooltip for dropdown list label in form for profile settings.
+msgid "Preferred language."
+msgstr "Мова, �кім � аддаю перавагу."
+
+#. TRANS: Dropdownlist label in form for profile settings.
+msgid "Timezone"
+msgstr "Ча�авы по��"
+
+#. TRANS: Tooltip for dropdown list label in form for profile settings.
+msgid "What timezone are you normally in?"
+msgstr "У �кім ча�авым по��е Вы знаходзіце��?"
+
+#. TRANS: Checkbox label in form for profile settings.
+#, fuzzy
+msgid ""
+"Automatically subscribe to whoever subscribes to me (best for non-humans)"
+msgstr ""
+"�ўтаматычна падпі�вацца на тых, хто падпі�аў�� на м�не (найлепей дл� "
+"робатаў)."
+
+#. TRANS: Dropdown field label on profile settings, for what policies to apply when someone else tries to subscribe to your updates.
+msgid "Subscription policy"
+msgstr "Правілы падпі�кі"
+
+#. TRANS: Dropdown field option for following policy.
+msgid "Let anyone follow me"
+msgstr "Дазволіць у�ім �ачыць за мной"
+
+#. TRANS: Dropdown field option for following policy.
+msgid "Ask me first"
+msgstr "Спачатку �пытаць у м�не"
+
+#. TRANS: Dropdown field title on group edit form.
+msgid "Whether other users need your permission to follow your updates."
+msgstr ""
+"Ці патр�бны Ваш дазвол іншым кары�тальнікам, каб �ачыць за Вашымі "
+"абнаўленьн�мі."
+
+#. TRANS: Checkbox label in profile settings.
+msgid "Make updates visible only to my followers"
+msgstr "Зрабіць абнаўленьні бачнымі толькі дл� тых, хто за мной �очыць"
+
+#. TRANS: Validation error in form for profile settings.
+#. TRANS: Plural form is used based on the maximum number of allowed
+#. TRANS: characters for the biography (%d).
+#. TRANS: Form validation error on registration page when providing too long a bio text.
+#. TRANS: %d is the maximum number of characters for bio; used for plural.
+#, php-format
+msgid "Bio is too long (maximum %d character)."
+msgid_plural "Bio is too long (maximum %d characters)."
+msgstr[0] "Бі�графі� занадта доўга� (мак�ымальна %d �ымбаль)."
+msgstr[1] "Бі�графі� занадта доўга� (мак�ымальна %d �ымбалі)."
+
+#. TRANS: Validation error in form for profile settings.
+#. TRANS: Client error displayed trying to save site settings without a timezone.
+msgid "Timezone not selected."
+msgstr "Ча�авы по�� н� выбраны."
+
+#. TRANS: Validation error in form for profile settings.
+msgid "Language is too long (maximum 50 characters)."
+msgstr "Мова занадта доўга� (мак�ымальна 50 �ымбал�ў)."
+
+#. TRANS: Validation error in form for profile settings.
+#. TRANS: %s is an invalid tag.
+#. TRANS: Form validation error displayed if a given tag is invalid.
+#. TRANS: %s is the invalid tag.
+#. TRANS: Error displayed if a given tag is invalid.
+#. TRANS: %s is the invalid tag.
+#, php-format
+msgid "Invalid tag: \"%s\"."
+msgstr "���лушны т�г: «%s»."
+
+#. TRANS: Server error thrown when user profile settings could not be updated to
+#. TRANS: automatically subscribe to any subscriber.
+msgid "Could not update user for autosubscribe or subscribe_policy."
+msgstr ""
+"�емагчыма абнавіць кары�тальніка дл� аўтаматычнай подпі�кі ці умоваў "
+"падпі�кі."
+
+#. TRANS: Server error thrown when user profile location preference settings could not be updated.
+msgid "Could not save location prefs."
+msgstr "�емагчыма захаваць налады ме�цазнаходжаньн�."
+
+#. TRANS: Server error thrown when user profile settings tags could not be saved.
+msgid "Could not save tags."
+msgstr "�емагчыма захаваць т�гі."
+
+#. TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
+#. TRANS: Page title for page where a user account can be restored from backup.
+msgid "Restore account"
+msgstr "�днавіць рахунак"
+
+#. TRANS: Client error displayed when requesting a public timeline page beyond the page limit.
+#. TRANS: %s is the page limit.
+#, php-format
+msgid "Beyond the page limit (%s)."
+msgstr "Перавышанае абмежаваньне �таронкі (%s)."
+
+#. TRANS: Server error displayed when a public timeline cannot be retrieved.
+msgid "Could not retrieve public timeline."
+msgstr "�емагчыма в�рнуць публічную �тужку паведамленьн�ў."
+
+#. TRANS: Title for all public timeline pages but the first.
+#. TRANS: %d is the page number.
+#, php-format
+msgid "Public timeline, page %d"
+msgstr "�гульна� �тужка паведамленьн�ў, �таронка %d"
+
+#. TRANS: Title for the first public timeline page.
+#. TRANS: Menu item title in search group navigation panel.
+msgid "Public timeline"
+msgstr "�гульна� �тужка паведамленьн�ў"
+
+#. TRANS: Link description for public timeline feed.
+msgid "Public Timeline Feed (Activity Streams JSON)"
+msgstr "�гульна� �тужка паведамленьн�ў (�тужкі актыўна�ьці JSON)"
+
+#. TRANS: Link description for public timeline feed.
+msgid "Public Timeline Feed (RSS 1.0)"
+msgstr "�гульна� �тужка паведамленьн�ў (RSS 1.0)"
+
+#. TRANS: Link description for public timeline feed.
+msgid "Public Timeline Feed (RSS 2.0)"
+msgstr "�гульна� �тужка паведамленьн�ў (RSS 2.0)"
+
+#. TRANS: Link description for public timeline feed.
+msgid "Public Timeline Feed (Atom)"
+msgstr "�гульна� �тужка паведамленьн�ў (Atom)"
+
+#. TRANS: Text displayed for public feed when there are no public notices.
+#, php-format
+msgid ""
+"This is the public timeline for %%site.name%% but no one has posted anything "
+"yet."
+msgstr ""
+"Г�та агульна� �тужка паведамленьн�ў %%site.name%%, але ніхто �шч� нічога не "
+"да�лаў."
+
+#. TRANS: Additional text displayed for public feed when there are no public notices for a logged in user.
+msgid "Be the first to post!"
+msgstr "Дашліце што-небудзь першым!"
+
+#. TRANS: Additional text displayed for public feed when there are no public notices for a not logged in user.
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and be the first to post!"
+msgstr ""
+"Чаму не [�тварыць рахунак](%%action.register%%) і �таць першым, хто што-"
+"небудзь дашле!"
+
+#. TRANS: Message for not logged in users at an invite-only site trying to view the public feed of notices.
+#. TRANS: This message contains Markdown links. Please mind the formatting.
+#, php-format
+msgid ""
+"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
+"blogging) service based on the Free Software [StatusNet](http://status.net/) "
+"tool. [Join now](%%action.register%%) to share notices about yourself with "
+"friends, family, and colleagues! ([Read more](%%doc.help%%))"
+msgstr ""
+"Г�та %%site.name%%, ��рві� [мікраблёгаў](http://en.wikipedia.org/wiki/Micro-"
+"blogging), за�наваны на вольным праграмным забе�ьп�ч�ньні [StatusNet](http://"
+"status.net/). [Далучыце�� зараз](%%action.register%%), каб дз�ліцца "
+"паведамленьн�мі пра ��бе з ��брамі, роднымі і калегамі! ([Даведацца болей](%%"
+"doc.help%%))"
+
+#. TRANS: Message for not logged in users at a closed site trying to view the public feed of notices.
+#. TRANS: This message contains Markdown links. Please mind the formatting.
+#, php-format
+msgid ""
+"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
+"blogging) service based on the Free Software [StatusNet](http://status.net/) "
+"tool."
+msgstr ""
+"%%site.name%% — ��рві� [мікраблёгаў](http://en.wikipedia.org/wiki/Micro-"
+"blogging), за�наваны на вольным праграмным забе�ьп�ч�ньні [StatusNet](http://"
+"status.net/)."
+
+#. TRANS: Public RSS feed description. %s is the StatusNet site name.
+#, php-format
+msgid "%s updates from everyone."
+msgstr "%s абнаўленьн�ў ад у�іх."
+
+#. TRANS: Title for public tag cloud.
+msgid "Public tag cloud"
+msgstr "Воблака публічных т�гаў"
+
+#. TRANS: Instructions (more used like an explanation/header).
+#. TRANS: %s is the StatusNet sitename.
+#, php-format
+msgid "These are most popular recent tags on %s"
+msgstr "Г�та �амы� папул�рны� апошні� т�гі на %s"
+
+#. TRANS: This message contains a Markdown URL. The link description is between
+#. TRANS: square brackets, and the link between parentheses. Do not separate "]("
+#. TRANS: and do not change the URL part.
+#, php-format
+msgid "No one has posted a notice with a [hashtag](%%doc.tags%%) yet."
+msgstr "�іхто �шч� не пакінуў запі�аў з дапамогай [hashtag](%%doc.tags%%)."
+
+#. TRANS: Message shown to a logged in user for the public tag cloud
+#. TRANS: while no tags exist yet. "One" refers to the non-existing hashtag.
+msgid "Be the first to post one!"
+msgstr "Дашліце паведамленьне першым!"
+
+#. TRANS: Message shown to a anonymous user for the public tag cloud
+#. TRANS: while no tags exist yet. "One" refers to the non-existing hashtag.
+#. TRANS: This message contains a Markdown URL. The link description is between
+#. TRANS: square brackets, and the link between parentheses. Do not separate "]("
+#. TRANS: and do not change the URL part.
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and be the first to post "
+"one!"
+msgstr ""
+"Чаму не [�тварыць рахунак](%%action.register%%) і �таць першым, хто дашле "
+"паведамленьне!"
+
+#. TRANS: Client error displayed trying to recover password while already logged in.
+msgid "You are already logged in!"
+msgstr "Вы ўжо ўвайшлі!"
+
+#. TRANS: Client error displayed when password recovery code is not correct.
+msgid "No such recovery code."
+msgstr "��ма такога коду аднаўленьн�."
+
+#. TRANS: Client error displayed when no proper password recovery code was submitted.
+msgid "Not a recovery code."
+msgstr "Г�та не код аднаўленьн�."
+
+#. TRANS: Server error displayed trying to recover password without providing a user.
+msgid "Recovery code for unknown user."
+msgstr "Код аднаўленьн� дл� нев�домага кары�тальніка."
+
+#. TRANS: Server error displayed removing a password recovery code from the database.
+msgid "Error with confirmation code."
+msgstr "Памылка з кодам пацьверджаньн�."
+
+#. TRANS: Client error displayed trying to recover password with too old a recovery code.
+msgid "This confirmation code is too old. Please start again."
+msgstr "Г�ты код пацьверджаньн� �а�тар�ў. Калі ла�ка, па�прабуйце �шч� раз."
+
+#. TRANS: Server error displayed when updating a user's e-mail address in the database fails while recovering a password.
+msgid "Could not update user with confirmed email address."
+msgstr ""
+"�емагчыма абнавіць кары�тальніка з пацьверджаным адра�ам �лектроннай пошты."
+
+#. TRANS: Page notice for password recovery page.
+msgid ""
+"If you have forgotten or lost your password, you can get a new one sent to "
+"the email address you have stored in your account."
+msgstr ""
+"Калі Вы забылі ці �трацілі Ваш пароль, Вы можаце атрымаць новы, да�лаўшы "
+"запыт на адра� �лектроннай пошты, �кі Вы пазначылі ў Вашым рахунку."
+
+#. TRANS: Page notice for password change page.
+msgid "You have been identified. Enter a new password below."
+msgstr "Вы былі ід�нтыфікаваны. Ув�дзіце новы пароль ніж�й."
+
+#. TRANS: Fieldset legend for password recovery page.
+msgid "Password recovery"
+msgstr "�днаўленьне паролю"
+
+#. TRANS: Field label on password recovery page.
+msgid "Nickname or email address"
+msgstr "Ім� кары�тальніка альбо адра� �лектроннай пошты"
+
+#. TRANS: Title for field label on password recovery page.
+msgid "Your nickname on this server, or your registered email address."
+msgstr ""
+"Вашае ім� на г�тым ��рв�ры ці Ваш зар�гі�траваны адра� �лектроннай пошты."
+
+#. TRANS: Field label on password recovery page.
+msgid "Recover"
+msgstr "�днавіць"
+
+#. TRANS: Button text on password recovery page.
+msgctxt "BUTTON"
+msgid "Recover"
+msgstr "�днавіць"
+
+#. TRANS: Title for password recovery page in password reset mode.
+msgid "Reset password"
+msgstr "�чы�ьціць пароль"
+
+#. TRANS: Title for password recovery page in password recover mode.
+msgid "Recover password"
+msgstr "�днавіць пароль"
+
+#. TRANS: Title for password recovery page in email sent mode.
+#. TRANS: Subject for password recovery e-mail.
+msgid "Password recovery requested"
+msgstr "Запытанае аднаўленьне паролю"
+
+#. TRANS: Title for password recovery page in password saved mode.
+msgid "Password saved"
+msgstr "Пароль захаваны"
+
+#. TRANS: Title for field label for password reset form.
+msgid "6 or more characters, and do not forget it!"
+msgstr "6 ці болей �ымбал�ў, і не забывайце �го!"
+
+#. TRANS: Button text for password reset form.
+msgctxt "BUTTON"
+msgid "Reset"
+msgstr "Скінуць"
+
+#. TRANS: Form instructions for password recovery form.
+msgid "Enter a nickname or email address."
+msgstr "Ув�дзіце ім� ці адра� �лектроннай пошты."
+
+#. TRANS: User notification after an e-mail with instructions was sent from the password recovery form.
+msgid ""
+"Instructions for recovering your password have been sent to the email "
+"address registered to your account."
+msgstr ""
+"Ін�трукцыі дл� аднаўленьн� Вашага паролю былі да�ланы� на адра� �лектроннай "
+"пошты, пададзены падча� �твар�ньн� Вашага рахунку."
+
+#. TRANS: Client error displayed when trying to reset as password without providing a user.
+msgid "Unexpected password reset."
+msgstr "�ечаканае �кіданьне паролю."
+
+#. TRANS: Reset password form validation error message.
+msgid "Password must be 6 characters or more."
+msgstr "Пароль павінен утрымліваць 6 �ымбал�ў ці больш."
+
+#. TRANS: Reset password form validation error message.
+msgid "Password and confirmation do not match."
+msgstr "Пароль і пацьверджаньне не �упадаюць."
+
+#. TRANS: Server error displayed when something does wrong with the user object during password reset.
+#. TRANS: Server error displayed when saving fails during user registration.
+msgid "Error setting user."
+msgstr "Памылка наладаў кары�тальніка."
+
+#. TRANS: Success message for user after password reset.
+msgid "New password successfully saved. You are now logged in."
+msgstr "�овы пароль захаваны па�ьп�хова. Ц�пер вы ўвайшлі ў �ы�т�му."
+
+#. TRANS: Client exception thrown when no ID parameter was provided.
+msgid "No id parameter."
+msgstr "��ма парам�тру id."
+
+#. TRANS: Client exception thrown when an invalid ID parameter was provided for a file.
+#. TRANS: %d is the provided ID for which the file is not present (number).
+#, php-format
+msgid "No such file \"%d\"."
+msgstr "��ма такога файла «%d»."
+
+#. TRANS: Client error displayed when trying to register to an invite-only site without an invitation.
+msgid "Sorry, only invited people can register."
+msgstr "Прабачце, �твар�ньне рахункаў толькі па запраш�ньні."
+
+#. TRANS: Client error displayed when trying to register to an invite-only site without a valid invitation.
+msgid "Sorry, invalid invitation code."
+msgstr "Прабачце, н��лушны код запраш�ньн�."
+
+#. TRANS: Title for registration page after a succesful registration.
+msgid "Registration successful"
+msgstr "Рахунак �твораны па�ьп�хова"
+
+#. TRANS: Title for registration page.
+msgctxt "TITLE"
+msgid "Register"
+msgstr "Стварыць рахунак"
+
+#. TRANS: Client error displayed when trying to register to a closed site.
+msgid "Registration not allowed."
+msgstr "Ствар�ньне рахунку не дазволенае."
+
+#. TRANS: Form validation error displayed when trying to register without agreeing to the site license.
+msgid "You cannot register if you do not agree to the license."
+msgstr ""
+"Вы н� можаце �тварыць рахунак, калі н� згодзіце�� з ліц�нзійным пагадненьнем."
+
+#. TRANS: Form validation error displayed when trying to register with an already registered e-mail address.
+msgid "Email address already exists."
+msgstr "Г�ты адра� �лектроннай пошты ўжо выкары�тоўваецца."
+
+#. TRANS: Form validation error displayed when trying to register with an invalid username or password.
+msgid "Invalid username or password."
+msgstr "���лушнае ім� кары�тальніка ці пароль."
+
+#. TRANS: Page notice on registration page.
+msgid ""
+"With this form you can create a new account. You can then post notices and "
+"link up to friends and colleagues."
+msgstr ""
+"З дапамогай г�тай формы Вы можаце �тварыць новы рахунак. Па�ьл� г�тага Вы "
+"можаце да�ылаць паведамленьні і зно�іцца з ��брамі і калегамі."
+
+#. TRANS: Field label on account registration page. In this field the password has to be entered a second time.
+msgctxt "PASSWORD"
+msgid "Confirm"
+msgstr "Пацьвердзіць"
+
+#. TRANS: Field label on account registration page.
+msgctxt "LABEL"
+msgid "Email"
+msgstr "Электронна� пошта"
+
+#. TRANS: Field title on account registration page.
+msgid "Used only for updates, announcements, and password recovery."
+msgstr ""
+"Выкары�тоўваецца толькі дл� абнаўленьн�ў, абв�шч�ньн�ў і аднаўленьн�ў паролю."
+
+#. TRANS: Field title on account registration page.
+msgid "Longer name, preferably your \"real\" name."
+msgstr "Поўнае ім�, пажадана Вашае «�апраўднае» ім�."
+
+#. TRANS: Button text to register a user on account registration page.
+msgctxt "BUTTON"
+msgid "Register"
+msgstr "Р�гі�трацы�"
+
+#. TRANS: Copyright checkbox label in registration dialog, for private sites.
+#. TRANS: %1$s is the StatusNet sitename.
+#, php-format
+msgid ""
+"I understand that content and data of %1$s are private and confidential."
+msgstr ""
+"Я разумею, што зьме�т і зьве�ткі %1$s зь�ўл�юцца прыватнымі і "
+"канфід�нцыйнымі."
+
+#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with a specified copyright owner.
+#. TRANS: %1$s is the license owner.
+#, php-format
+msgid "My text and files are copyright by %1$s."
+msgstr "Мой т�к�т і файлы ахоўваюцца аўтар�кімі правамі %1$s."
+
+#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
+msgid "My text and files remain under my own copyright."
+msgstr "Мой т�к�т і файлы за�таюцца пад маімі аўтар�кімі правамі."
+
+#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
+msgid "All rights reserved."
+msgstr "У�е правы абаронены�."
+
+#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
+#, php-format
+msgid ""
+"My text and files are available under %s except this private data: password, "
+"email address, IM address, and phone number."
+msgstr ""
+"Мой т�к�т і файлы да�тупны� на ўмовах %s за выключ�ньнем г�тых прыватных "
+"зьве�так: паролю, адра�у �лектроннай пошты, IM-адра�у і нумару т�лефона."
+
+#. TRANS: Text displayed after successful account registration.
+#. TRANS: %1$s is the registered nickname, %2$s is the profile URL.
+#. TRANS: This message contains Markdown links in the form [link text](link)
+#. TRANS: and variables in the form %%%%variable%%%%. Please mind the syntax.
+#, php-format
+msgid ""
+"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
+"want to...\n"
+"\n"
+"* Go to [your profile](%2$s) and post your first message.\n"
+"* Add a [Jabber/GTalk address](%%%%action.imsettings%%%%) so you can send "
+"notices through instant messages.\n"
+"* [Search for people](%%%%action.peoplesearch%%%%) that you may know or that "
+"share your interests. \n"
+"* Update your [profile settings](%%%%action.profilesettings%%%%) to tell "
+"others more about you. \n"
+"* Read over the [online docs](%%%%doc.help%%%%) for features you may have "
+"missed. \n"
+"\n"
+"Thanks for signing up and we hope you enjoy using this service."
+msgstr ""
+"Віншуем, %1$s! І вітаем у %%%%site.name%%%%. Ц�пер Вы можаце…\n"
+"\n"
+"* Перай�ьці ў [Ваш профіль](%2$s) і да�лаць Вашае першае паведамленьне.\n"
+"* Дадаць [Jabber/GTalk-адра�](%%%%action.imsettings%%%%) каб мець "
+"магчыма�ьць да�ылаць запі�ы праз імгненны� паведамленьні.\n"
+"* [Шукаць людзей](%%%%action.peoplesearch%%%%), �кіх Вы, магчыма, ведаеце, "
+"ці �кі� падз�л�юць Вашы� інтар��ы. \n"
+"* �бнаўл�ць [налады Вашага профілю](%%%%action.profilesettings%%%%) каб "
+"ра�казаць іншым болей пра Ва�. \n"
+"* Даведацца болей у [дакум�нтацыі](%%%%doc.help%%%%) пра магчыма�ьці, �кі� "
+"Вы н� ведаеце. \n"
+"\n"
+"Дз�куй за р�гі�трацыю, і мы �падз�ем��, што Вам �падабаецца кары�тацца нашым "
+"��рві�ам."
+
+#. TRANS: Instruction text on how to deal with the e-mail address confirmation e-mail.
+msgid ""
+"(You should receive a message by email momentarily, with instructions on how "
+"to confirm your email address.)"
+msgstr ""
+"(Вы павінны атрымаць �лектронную лі�т, у �кім будуць ін�трукцыі �к "
+"пацьвердзіць Ваш адра� �лектроннай пошты.)"
+
+#. TRANS: Client error displayed when an unknown error occurs while delisting a user.
+#. TRANS: %s is a username.
+#, php-format
+msgid "There was an unexpected error while delisting %s."
+msgstr "Узьнікла нечакана� памылка падча� выдаленьн� �а �ьпі�у %s."
+
+#. TRANS: Client error displayed when an unknown error occurs while listing a user.
+#. TRANS: %s is a profile URL.
+#, php-format
+msgid ""
+"There was a problem listing %s. The remote server is probably not responding "
+"correctly, please try retrying later."
+msgstr ""
+"�емагчыма дадаць у �ьпі� %s. �ддалены ��рв�р, верагодна, не адказвае �лушна. "
+"Калі ла�ка, па�прабуйце потым."
+
+#. TRANS: Title after removing a user from a list.
+msgid "Unlisted"
+msgstr "�е ў �ьпі�е"
+
+#. TRANS: Client error displayed when trying to repeat a notice while not logged in.
+msgid "Only logged-in users can repeat notices."
+msgstr "Толькі кары�тальнікі, �кі� ўвайшлі ў �ы�т�му, могуць паўтараць запі�ы."
+
+#. TRANS: Client error displayed when trying to repeat a notice while not providing a notice ID.
+#. TRANS: Client error displayed when trying to repeat a non-existing notice.
+msgid "No notice specified."
+msgstr "Запі� не пазначаны."
+
+#. TRANS: Title after repeating a notice.
+#. TRANS: Repeat form status in notice list when a notice has been repeated.
+msgid "Repeated"
+msgstr "Паўторана"
+
+#. TRANS: Confirmation text after repeating a notice.
+msgid "Repeated!"
+msgstr "Паўторана!"
+
+#. TRANS: Title for first page of replies for a user.
+#. TRANS: %s is a user nickname.
+#. TRANS: RSS reply feed title. %s is a user nickname.
+#. TRANS: Menu item title in personal group navigation menu.
+#. TRANS: %s is a username.
+#, php-format
+msgid "Replies to %s"
+msgstr "�дказы на %s"
+
+#. TRANS: Title for all but the first page of replies for a user.
+#. TRANS: %1$s is a user nickname, %2$d is a page number.
+#, php-format
+msgid "Replies to %1$s, page %2$d"
+msgstr "�дказы на %1$s, �таронка %2$d"
+
+#. TRANS: Link for feed with replies for a user.
+#. TRANS: %s is a user nickname.
+#, php-format
+msgid "Replies feed for %s (Activity Streams JSON)"
+msgstr "Стужка адказаў дл� %s (�тужак актыўна�ьці JSON)"
+
+#. TRANS: Link for feed with replies for a user.
+#. TRANS: %s is a user nickname.
+#, php-format
+msgid "Replies feed for %s (RSS 1.0)"
+msgstr "Стужка адказаў дл� %s (RSS 1.0)"
+
+#. TRANS: Link for feed with replies for a user.
+#. TRANS: %s is a user nickname.
+#, php-format
+msgid "Replies feed for %s (RSS 2.0)"
+msgstr "Стужка адказаў дл� %s (RSS 2.0)"
+
+#. TRANS: Link for feed with replies for a user.
+#. TRANS: %s is a user nickname.
+#, php-format
+msgid "Replies feed for %s (Atom)"
+msgstr "Стужка адказаў дл� %s (Atom)"
+
+#. TRANS: Empty list message for page with replies for a user.
+#. TRANS: %1$s and %s$s are the user nickname.
+#, php-format
+msgid ""
+"This is the timeline showing replies to %1$s but %2$s hasn't received a "
+"notice to them yet."
+msgstr ""
+"Г�та� �тужка ўтрымлівае адказы дл� %1$s, але %2$s �шч� не атрымаў на іх "
+"абв�шч�ньн�."
+
+#. TRANS: Empty list message for page with replies for a user for the logged in user.
+#. TRANS: This message contains a Markdown link in the form [link text](link).
+#, php-format
+msgid ""
+"You can engage other users in a conversation, subscribe to more people or "
+"[join groups](%%action.groups%%)."
+msgstr ""
+"Вы можаце ўц�гнуць у размову іншых кары�тальнікаў, падпі�ацца на в�лікую "
+"колька�ьць людзей ці [далучыцца да групаў](%%action.groups%%)."
+
+#. TRANS: Empty list message for page with replies for a user for all logged in users but the user themselves.
+#. TRANS: %1$s, %2$s and %3$s are a user nickname. This message contains a Markdown link in the form [link text](link).
+#, php-format
+msgid ""
+"You can try to [nudge %1$s](../%2$s) or [post something to them](%%%%action."
+"newnotice%%%%?status_textarea=%3$s)."
+msgstr ""
+"Вы можаце па�прабаваць [падштурхнуць %1$s](../%2$s) альбо [да�лаць што-"
+"небудзь да іх](%%%%action.newnotice%%%%?status_textarea=%3$s)."
+
+#. TRANS: RSS reply feed description.
+#. TRANS: %1$s is a user nickname, %2$s is the StatusNet site name.
+#, php-format
+msgid "Replies to %1$s on %2$s."
+msgstr "�дказы да %1$s на %2$s."
+
+#. TRANS: Client exception displayed when trying to restore an account while not logged in.
+msgid "Only logged-in users can restore their account."
+msgstr ""
+"Толькі кары�тальнікі, �кі� увайшлі ў �ы�т�му, могуць аднаўл�ць �вае рахункі."
+
+#. TRANS: Client exception displayed when trying to restore an account without having restore rights.
+msgid "You may not restore your account."
+msgstr "Вы н� можаце аднавіць �вой рахунак."
+
+#. TRANS: Client exception displayed trying to restore an account while something went wrong uploading a file.
+#. TRANS: Client exception. No file; probably just a non-AJAX submission.
+msgid "No uploaded file."
+msgstr "��ма загружаных файлаў."
+
+#. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
+msgstr "Загружаны файл перавышае дыр�ктыву upload_max_filesize у php.ini."
+
+#. TRANS: Client exception.
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form."
+msgstr ""
+"Загружаны файл перавышае дыр�ктыву MAX_FILE_SIZE, �ка� была пазначана� ў "
+"HTML-форме."
+
+#. TRANS: Client exception.
+msgid "The uploaded file was only partially uploaded."
+msgstr "Файл быў загружаны толькі ча�ткова."
+
+#. TRANS: Client exception thrown when a temporary folder is not present to store a file upload.
+msgid "Missing a temporary folder."
+msgstr "��ма ча�овага каталёгу."
+
+#. TRANS: Client exception thrown when writing to disk is not possible during a file upload operation.
+msgid "Failed to write file to disk."
+msgstr "�емагчыма запі�аць файл на ды�к."
+
+#. TRANS: Client exception thrown when a file upload operation has been stopped by an extension.
+msgid "File upload stopped by extension."
+msgstr "Загрузка файла �пынена� з-за пашыр�ньн�."
+
+#. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
+#. TRANS: Exception thrown when uploading an image fails for an unknown reason.
+#. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
+msgid "System error uploading file."
+msgstr "Сы�т�мна� памылка падча� загрузкі файла."
+
+#. TRANS: Client exception thrown when a feed is not an Atom feed.
+#. TRANS: Client exception thrown when an imported feed is not an Atom feed.
+msgid "Not an Atom feed."
+msgstr "�е зь�ўл�ецца �тужкай Atom."
+
+#. TRANS: Success message when a feed has been restored.
+msgid ""
+"Feed has been restored. Your old posts should now appear in search and your "
+"profile page."
+msgstr ""
+"Стужка была адноўлена�. Вашы� �тары� паведамленьні ц�пер павінны зь�віцца ў "
+"полі пошуку і на �таронцы Вашага профілю."
+
+#. TRANS: Message when a feed restore is in progress.
+msgid "Feed will be restored. Please wait a few minutes for results."
+msgstr "Стужка будзе адноўлена�. Калі ла�ка, пачакайце некалькі хвілінаў."
+
+#. TRANS: Form instructions for feed restore.
+msgid ""
+"You can upload a backed-up timeline in <a href=\"http://activitystrea.ms/"
+"\">Activity Streams</a> format."
+msgstr ""
+"Вы можаце загрузіць р�з�рвовую копію �тужкі падзе�ў у фармаце <a href="
+"\"http://activitystrea.ms/\">Activity Streams</a>."
+
+#. TRANS: Title for submit button to confirm upload of a user backup file for account restore.
+msgid "Upload the file"
+msgstr "Загрузіць файл"
+
+#. TRANS: Client error displayed when trying to revoke a role without having the right to do that.
+msgid "You cannot revoke user roles on this site."
+msgstr "Вы н� можаце пазбаўл�ць кары�тальнікаў рол�ў на г�тым �айце."
+
+#. TRANS: Client error displayed when trying to revoke a role that is not set.
+msgid "User does not have this role."
+msgstr "Кары�тальнік н� мае г�тай ролі."
+
+#. TRANS: Engine name for RSD.
+#. TRANS: Engine name.
+msgid "StatusNet"
+msgstr "StatusNet"
+
+#. TRANS: Client error displayed trying to sandbox users on a site where the feature is not enabled.
+#. TRANS: Client error on page to unsandbox a user when the feature is not enabled.
+msgid "You cannot sandbox users on this site."
+msgstr "Вы н� можаце абм�жоўваць п��очніцай кары�тальнікаў на г�тым �айце."
+
+#. TRANS: Client error displayed trying to sandbox an already sandboxed user.
+msgid "User is already sandboxed."
+msgstr "Кары�тальнік ужо ў р�жыме п��очніцы."
+
+#. TRANS: Client error displayed when trying to list a profile with an invalid list.
+#. TRANS: %s is the invalid list name.
+#, php-format
+msgid "Not a valid list: %s."
+msgstr "���лушны �ьпі�: %s."
+
+#. TRANS: Page title for page showing self tags.
+#. TRANS: %1$s is a tag, %2$d is a page number.
+#, php-format
+msgid "Users self-tagged with %1$s, page %2$d"
+msgstr "Кары�тальнікі, �кі� �амі дадалі т�г %1$s, �таронка %2$d"
+
+#. TRANS: Title for the sessions administration panel.
+msgctxt "TITLE"
+msgid "Sessions"
+msgstr "С��іі"
+
+#. TRANS: Instructions for the sessions administration panel.
+msgid "Session settings for this StatusNet site"
+msgstr "У�таноўкі ���і�ў дл� г�тага �айта StatusNet"
+
+#. TRANS: Fieldset legend on the sessions administration panel.
+msgctxt "LEGEND"
+msgid "Sessions"
+msgstr "С��іі"
+
+#. TRANS: Checkbox title on the sessions administration panel.
+#. TRANS: Indicates if StatusNet should handle session administration.
+msgid "Handle sessions"
+msgstr "Кіраваньне ���і�мі"
+
+#. TRANS: Checkbox title on the sessions administration panel.
+#. TRANS: Indicates if StatusNet should handle session administration.
+msgid "Handle sessions ourselves."
+msgstr "Сама�тойнае кіраваньне ���і�мі."
+
+#. TRANS: Checkbox label on the sessions administration panel.
+#. TRANS: Indicates if StatusNet should write session debugging output.
+msgid "Session debugging"
+msgstr "�аладка ���іі"
+
+#. TRANS: Checkbox title on the sessions administration panel.
+msgid "Enable debugging output for sessions."
+msgstr "Дазволіць вывад наладкі дл� ���і�ў."
+
+#. TRANS: Title for submit button on the sessions administration panel.
+msgid "Save session settings"
+msgstr "Захаваць налады ���іі"
+
+#. TRANS: Client error displayed trying to display an OAuth application while not logged in.
+msgid "You must be logged in to view an application."
+msgstr "Вы павінны ўвай�ьці ў �ы�т�му, каб прагл�даць да�та�аваньне."
+
+#. TRANS: Header on the OAuth application page.
+msgid "Application profile"
+msgstr "Профіль да�та�аваньн�"
+
+#. TRANS: Information output on an OAuth application page.
+#. TRANS: %1$s is the application creator, %2$s is "read-only" or "read-write",
+#. TRANS: %3$d is the number of users using the OAuth application.
+#, php-format
+msgid "Created by %1$s - %2$s access by default - %3$d user"
+msgid_plural "Created by %1$s - %2$s access by default - %3$d users"
+msgstr[0] "Створаны %1$s — %2$s до�туп па змоўчваньні — %3$d кары�тальнік"
+msgstr[1] "Створаны %1$s — %2$s до�туп па змоўчваньні — %3$d кары�тальнікі"
+
+#. TRANS: Header on the OAuth application page.
+msgid "Application actions"
+msgstr "Дзе�ньні да�та�аваньн�"
+
+#. TRANS: Link text to edit application on the OAuth application page.
+msgctxt "EDITAPP"
+msgid "Edit"
+msgstr "Р�дагаваць"
+
+#. TRANS: Button text on the OAuth application page.
+#. TRANS: Resets the OAuth consumer key and secret.
+msgid "Reset key & secret"
+msgstr "Скінуць ключ і �акр�тнае �лова"
+
+#. TRANS: Header on the OAuth application page.
+msgid "Application info"
+msgstr "Інфармацы� пра да�та�аваньне"
+
+#. TRANS: Field label on application page.
+msgid "Consumer key"
+msgstr "Ключ �пажыўца"
+
+#. TRANS: Field label on application page.
+msgid "Consumer secret"
+msgstr "Сакр�тнае �лова �пажыўца"
+
+#. TRANS: Field label on application page.
+msgid "Request token URL"
+msgstr "URL-адра� ключа запыту"
+
+#. TRANS: Field label on application page.
+msgid "Access token URL"
+msgstr "URL-адра� ключа до�тупу"
+
+#. TRANS: Field label on application page.
+msgid "Authorize URL"
+msgstr "URL-адра� аўтарызацыі"
+
+#. TRANS: Note on the OAuth application page about signature support.
+msgid ""
+"Note: HMAC-SHA1 signatures are supported. The plaintext signature method is "
+"not supported."
+msgstr ""
+"Увага: Подпі�ы шыфруюцца HMAC-SHA1. Подпі� про�тым т�к�там не "
+"падтрымліваецца."
+
+#. TRANS: Text in confirmation dialog to reset consumer key and secret for an OAuth application.
+msgid "Are you sure you want to reset your consumer key and secret?"
+msgstr "Вы ўп�ўнены, што жадаеце �кінуць Ваш ключ �пажыўца і �акр�тнае �лова?"
+
+#. TRANS: Title for all but the first page of favourite notices of a user.
+#. TRANS: %1$s is the user for whom the favourite notices are displayed, %2$d is the page number.
+#, php-format
+msgid "%1$s's favorite notices, page %2$d"
+msgstr "Улюблёны� запі�ы %1$s, �таронка %2$d"
+
+#. TRANS: Server error displayed when favourite notices could not be retrieved from the database.
+msgid "Could not retrieve favorite notices."
+msgstr "�емагчыма аднавіць ўлюблёны� запі�ы."
+
+#. TRANS: Feed link text. %s is a username.
+#, php-format
+msgid "Feed for favorites of %s (Activity Streams JSON)"
+msgstr "Стужка дл� ўлюблёных %s (�тужкі актыўна�ьці JSON)"
+
+#. TRANS: Feed link text. %s is a username.
+#, php-format
+msgid "Feed for favorites of %s (RSS 1.0)"
+msgstr "Стужка дл� ўлюблёных %s (RSS 1.0)"
+
+#. TRANS: Feed link text. %s is a username.
+#, php-format
+msgid "Feed for favorites of %s (RSS 2.0)"
+msgstr "Стужка дл� ўлюблёных %s (RSS 2.0)"
+
+#. TRANS: Feed link text. %s is a username.
+#, php-format
+msgid "Feed for favorites of %s (Atom)"
+msgstr "Стужка дл� ўлюблёных %s (Atom)"
+
+#. TRANS: Text displayed instead of favourite notices for the current logged in user that has no favourites.
+msgid ""
+"You haven't chosen any favorite notices yet. Click the fave button on "
+"notices you like to bookmark them for later or shed a spotlight on them."
+msgstr ""
+"Пакуль што Вы н� выбралі ніводнага ўлюблёнага запі�у. �аці�ьніце адпаведную "
+"кнопку кал� запі�у, �кі Вам �падабаў��, каб потым зьв�рнуць на �го ўвагу."
+
+#. TRANS: Text displayed instead of favourite notices for a user that has no favourites while logged in.
+#. TRANS: %s is a username.
+#, php-format
+msgid ""
+"%s hasn't added any favorite notices yet. Post something interesting they "
+"would add to their favorites :)"
+msgstr ""
+"%s пакуль што н� выбраў ўлюблёных запі�аў. Пакіньце што-небудзь цікавае, каб "
+"г�та было магчыма дадаць ва ўлюблёны� :)"
+
+#. TRANS: Text displayed instead of favourite notices for a user that has no favourites while not logged in.
+#. TRANS: %s is a username, %%%%action.register%%%% is a link to the user registration page.
+#. TRANS: (link text)[link] is a Mark Down link.
+#, php-format
+msgid ""
+"%s hasn't added any favorite notices yet. Why not [register an account](%%%%"
+"action.register%%%%) and then post something interesting they would add to "
+"their favorites :)"
+msgstr ""
+"%s пакуль што не дадаў ўлюблёных запі�аў. Чаму б не [�тварыць рахунак](%%%%"
+"action.register%%%%) і потым пакінуць што-небудзь цікавае, каб г�та было "
+"магчыма дадаць ва ўлюблёны� :)"
+
+#. TRANS: Page notice for show favourites page.
+msgid "This is a way to share what you like."
+msgstr "Г�та �по�аб падз�ліцца тым, што Вам падабаецца."
+
+#. TRANS: Page title for first group page. %s is a group name.
+#, php-format
+msgid "%s group"
+msgstr "Група %s"
+
+#. TRANS: Page title for any but first group page.
+#. TRANS: %1$s is a group name, $2$s is a page number.
+#, php-format
+msgid "%1$s group, page %2$d"
+msgstr "Група %1$s, �таронка %2$d"
+
+#. TRANS: Tooltip for feed link. %s is a group nickname.
+#, php-format
+msgid "Notice feed for %s group (Activity Streams JSON)"
+msgstr "Стужка запі�аў дл� групы %s (�тужка актыўна�ьці JSON)"
+
+#. TRANS: Tooltip for feed link. %s is a group nickname.
+#, php-format
+msgid "Notice feed for %s group (RSS 1.0)"
+msgstr "Стужка запі�аў дл� групы %s (RSS 1.0)"
+
+#. TRANS: Tooltip for feed link. %s is a group nickname.
+#, php-format
+msgid "Notice feed for %s group (RSS 2.0)"
+msgstr "Стужка запі�аў дл� групы %s (RSS 2.0)"
+
+#. TRANS: Tooltip for feed link. %s is a group nickname.
+#, php-format
+msgid "Notice feed for %s group (Atom)"
+msgstr "Стужка запі�аў дл� групы %s (Atom)"
+
+#. TRANS: Tooltip for feed link. %s is a group nickname.
+#, php-format
+msgid "FOAF for %s group"
+msgstr "С�бры ��броў групы %s"
+
+#. TRANS: Notice on group pages for anonymous users for StatusNet sites that accept new registrations.
+#. TRANS: %s is the group name, %%%%site.name%%%% is the site name,
+#. TRANS: %%%%action.register%%%% is the URL for registration, %%%%doc.help%%%% is a URL to help.
+#. TRANS: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
+#, php-format
+msgid ""
+"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. Its members share short messages about "
+"their life and interests. [Join now](%%%%action.register%%%%) to become part "
+"of this group and many more! ([Read more](%%%%doc.help%%%%))"
+msgstr ""
+"**%s** — група кары�тальнікаў на %%%%site.name%%%%, ��рві�у [мікраблёгінга]"
+"(http://en.wikipedia.org/wiki/Micro-blogging), �кі працуе на пад�таве "
+"вольнага праграмнага забе�ьп�ч�ньн� [StatusNet](http://status.net/). Яе "
+"удзельнікі могуць абменьвацца кароткімі паведамленьн�мі пра �ваё жыцьцё і "
+"захапленьні. [Далучайце�� зараз](%%%%action.register%%%%), каб �таць ��брам "
+"г�тай групы, і атрымаць іншы� магчыма�ьці! ([Даведацца болей](%%%%doc.help%%%"
+"%))"
+
+#. TRANS: Notice on group pages for anonymous users for StatusNet sites that accept no new registrations.
+#. TRANS: %s is the group name, %%%%site.name%%%% is the site name,
+#. TRANS: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
+#, php-format
+msgid ""
+"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. Its members share short messages about "
+"their life and interests."
+msgstr ""
+"**%s** — група кары�тальнікаў на %%%%site.name%%%%, ��рві�у [мікраблёгінга]"
+"(http://en.wikipedia.org/wiki/Micro-blogging), �кі працуе на пад�таве "
+"вольнага праграмнага забе�ьп�ч�ньн� [StatusNet](http://status.net/). Яе "
+"удзельнікі могуць абменьвацца кароткімі паведамленьн�мі пра �ваё жыцьцё і "
+"захапленьні."
+
+#. TRANS: Client error displayed requesting a single message that does not exist.
+msgid "No such message."
+msgstr "��ма такога паведамленьн�."
+
+#. TRANS: Client error displayed requesting a single direct message the requesting user was not a party in.
+msgid "Only the sender and recipient may read this message."
+msgstr "Толькі адпраўшчык і атрымальнік могуць прачытаць г�тае паведамленьне."
+
+#. TRANS: Page title for single direct message display when viewing user is the sender.
+#. TRANS: %1$s is the addressed user's nickname, $2$s is a timestamp.
+#, php-format
+msgid "Message to %1$s on %2$s"
+msgstr "Паведамленьне дл� %1$s на %2$s"
+
+#. TRANS: Page title for single message display.
+#. TRANS: %1$s is the sending user's nickname, $2$s is a timestamp.
+#, php-format
+msgid "Message from %1$s on %2$s"
+msgstr "Паведамленьне ад %1$s на %2$s"
+
+#. TRANS: Client exception thrown when trying a view a notice the user has no access to.
+msgid "Not available."
+msgstr "�е да�тупна."
+
+#. TRANS: Client error displayed trying to show a deleted notice.
+msgid "Notice deleted."
+msgstr "Запі� выдалены."
+
+#. TRANS: Title for private list timeline.
+#. TRANS: %1$s is a list, %2$s is a page number.
+#, php-format
+msgid "Private timeline for %1$s list by you, page %2$d"
+msgstr "Прыватна� �тужка паведамленьн�ў дл� Вашага �ьпі�у %1$s, �таронка %2$d"
+
+#. TRANS: Title for public list timeline where the viewer is the tagger.
+#. TRANS: %1$s is a list, %2$s is a page number.
+#, php-format
+msgid "Timeline for %1$s list by you, page %2$d"
+msgstr "Стужка паведамленьн�ў дл� Вашага �ьпі�у %1$s, �таронка %2$d"
+
+#. TRANS: Title for private list timeline.
+#. TRANS: %1$s is a list, %2$s is the tagger's nickname, %3$d is a page number.
+#, php-format
+msgid "Timeline for %1$s list by %2$s, page %3$d"
+msgstr "Стужка паведамленьн�ў �ьпі�у %1$s кары�тальніка %2$s, �таронка %3$d"
+
+#. TRANS: Title for private list timeline.
+#. TRANS: %s is a list.
+#, php-format
+msgid "Private timeline of %s list by you"
+msgstr "Прыватна� �тужка паведамленьн�ў Вашага �ьпі�у %s"
+
+#. TRANS: Title for public list timeline where the viewer is the tagger.
+#. TRANS: %s is a list.
+#, php-format
+msgid "Timeline for %s list by you"
+msgstr "Стужка паведамленьн�ў Вашага �ьпі�у %s"
+
+#. TRANS: Title for private list timeline.
+#. TRANS: %1$s is a list, %2$s is the tagger's nickname.
+#, php-format
+msgid "Timeline for %1$s list by %2$s"
+msgstr "Стужка паведамленьн�ў �ьпі�у %1$s кары�тальніка %2$s"
+
+#. TRANS: Feed title.
+#. TRANS: %1$s is a list, %2$s is tagger's nickname.
+#, php-format
+msgid "Feed for %1$s list by %2$s (Atom)"
+msgstr "Стужка дл� �ьпі�у %1$s кары�тальніка %2$s (Atom)"
+
+#. TRANS: Empty list message for list timeline.
+#. TRANS: %1$s is a list, %2$s is a tagger's nickname.
+#, php-format
+msgid ""
+"This is the timeline for %1$s list by %2$s but no one has posted anything "
+"yet."
+msgstr "Г�та �тужка �ьпі�у %1$s кары�тальніка %2$s, але �на �шч� пу�та�."
+
+#. TRANS: Additional empty list message for list timeline for currently logged in user tagged tags.
+msgid "Try tagging more people."
+msgstr "Па�прабуйце пазначыць болей людзей."
+
+#. TRANS: Additional empty list message for list timeline.
+#. TRANS: This message contains Markdown links in the form [description](link).
+#, php-format
+msgid ""
+"Why not [register an account](%%%%action.register%%%%) and start following "
+"this timeline!"
+msgstr ""
+"Чаму б не [�тварыць рахунак](%%%%action.register%%%%) і пачаць �ачыць за "
+"г�тай �тужкай!"
+
+#. TRANS: Header on show list page.
+#. TRANS: Link description for link to list of users tagged with a tag (so part of a list).
+msgid "Listed"
+msgstr "Уне�ены ў �ьпі�"
+
+#. TRANS: Content of "Listed" page if there are no listed users.
+#. TRANS: Content of "People following tag x" if there are no subscribed users.
+#. TRANS: Description for mini list of group members on a group page when the group has no members.
+#. TRANS: Empty list message for tags.
+#. TRANS: Text for user subscription statistics if the user has no subscriptions.
+#. TRANS: Text for user subscriber statistics if user has no subscribers.
+#. TRANS: Text for user user group membership statistics if user is not a member of any group.
+#. TRANS: Default content for section/sidebar widget.
+msgid "(None)"
+msgstr "(��ма)"
+
+#. TRANS: Link for more "People in list x by a user"
+#. TRANS: if there are more than the mini list's maximum.
+msgid "Show all"
+msgstr "Паказаць у�е"
+
+#. TRANS: Header for tag subscribers.
+#. TRANS: Link description for link to list of users subscribed to a tag.
+msgid "Subscribers"
+msgstr "Падпі�чыкі"
+
+#. TRANS: Page title showing tagged notices in one user's timeline.
+#. TRANS: %1$s is the username, %2$s is the hash tag.
+#, php-format
+msgid "Notices by %1$s tagged %2$s"
+msgstr "Запі�ы %1$s з т�гам %2$s"
+
+#. TRANS: Page title showing tagged notices in one user's timeline.
+#. TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number.
+#, php-format
+msgid "Notices by %1$s tagged %2$s, page %3$d"
+msgstr "Запі�ы %1$s з т�гам %2$s, �таронка %3$d"
+
+#. TRANS: Extended page title showing tagged notices in one user's timeline.
+#. TRANS: %1$s is the username, %2$d is the page number.
+#, php-format
+msgid "Notices by %1$s, page %2$d"
+msgstr "Запі�ы %1$s, �таронка %2$d"
+
+#. TRANS: Title for link to notice feed.
+#. TRANS: %1$s is a user nickname, %2$s is a hashtag.
+#, php-format
+msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
+msgstr "Стужка запі�аў дл� %1$s з т�гам %2$s (RSS 1.0)"
+
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#, php-format
+msgid "Notice feed for %s (Activity Streams JSON)"
+msgstr "Стужка запі�аў дл� %s (�тужка актыўна�ьці JSON)"
+
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#, php-format
+msgid "Notice feed for %s (RSS 1.0)"
+msgstr "Стужка запі�аў дл� %s (RSS 1.0)"
+
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#, php-format
+msgid "Notice feed for %s (RSS 2.0)"
+msgstr "Стужка запі�аў дл� %s (RSS 2.0)"
+
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#, php-format
+msgid "Notice feed for %s (Atom)"
+msgstr "Стужка запі�аў дл� %s (Atom)"
+
+#. TRANS: Title for link to notice feed. FOAF stands for Friend of a Friend.
+#. TRANS: More information at http://www.foaf-project.org. %s is a user nickname.
+#, php-format
+msgid "FOAF for %s"
+msgstr "С�бры ��броў %s"
+
+#. TRANS: First sentence of empty list message for a timeline. $1%s is a user nickname.
+#, php-format
+msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
+msgstr "Г�та �тужка падзе�ў дл� %1$s, але %1$s �шч� нічога не напі�аў."
+
+#. TRANS: Second sentence of empty list message for a stream for the user themselves.
+msgid ""
+"Seen anything interesting recently? You haven't posted any notices yet, now "
+"would be a good time to start :)"
+msgstr ""
+"��даўна ўбачылі што-небудзь цікавае? Вы �шч� нічога не напі�алі, ц�пер добры "
+"ча�, каб пачаць :)"
+
+#. TRANS: Second sentence of empty  list message for a non-self timeline. %1$s is a user nickname, %2$s is a part of a URL.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#, php-format
+msgid ""
+"You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
+"%?status_textarea=%2$s)."
+msgstr ""
+"Вы можаце па�прабаваць падштурхнуць %1$s ці [напі�аць што-небудзь дл� �го](%%"
+"%%action.newnotice%%%%?status_textarea=%2$s)."
+
+#. TRANS: Announcement for anonymous users showing a timeline if site registrations are open.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#, php-format
+msgid ""
+"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. [Join now](%%%%action.register%%%%) to "
+"follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))"
+msgstr ""
+"**%s** мае рахунак на %%%%site.name%%%%, ��рві�е [мікраблёгаў](http://en."
+"wikipedia.org/wiki/Micro-blogging), �кі працуе на базе вольнага праграмнага "
+"забе�ьп�ч�ньн� [StatusNet](http://status.net/). [Далучайце�� зараз](%%%%"
+"action.register%%%%), каб �ачыць за паведамленьн�мі **%s**'s і шмат чаго "
+"іншага! ([Чытаць падраб�зьней](%%%%doc.help%%%%))"
+
+#. TRANS: Announcement for anonymous users showing a timeline if site registrations are closed or invite only.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#, php-format
+msgid ""
+"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool."
+msgstr ""
+"**%s** мае рахунак на %%%%site.name%%%%, ��рві�е [мікраблёгаў](http://en."
+"wikipedia.org/wiki/Micro-blogging), �кі працуе на базе вольнага праграмнага "
+"забе�ьп�ч�ньн� [StatusNet](http://status.net/)."
+
+#. TRANS: Link to the author of a repeated notice. %s is a linked nickname.
+#, php-format
+msgid "Repeat of %s"
+msgstr "Паўтор за %s"
+
+#. TRANS: Client error displayed trying to silence a user on a site where the feature is not enabled.
+#. TRANS: Client error on page to unsilence a user when the feature is not enabled.
+msgid "You cannot silence users on this site."
+msgstr "Вы н� можаце заглушаць кары�тальнікаў на г�тым �айце."
+
+#. TRANS: Client error displayed trying to silence an already silenced user.
+msgid "User is already silenced."
+msgstr "Кары�тальнік ужо заглушаны."
+
+#. TRANS: Title for site administration panel.
+msgctxt "TITLE"
+msgid "Site"
+msgstr "Сайт"
+
+#. TRANS: Instructions for site administration panel.
+msgid "Basic settings for this StatusNet site"
+msgstr "��ноўны� налады г�тага �айта StatusNet"
+
+#. TRANS: Client error displayed trying to save an empty site name.
+msgid "Site name must have non-zero length."
+msgstr "�азва �айту н� можа быць пу�той."
+
+#. TRANS: Client error displayed trying to save site settings without a contact address.
+msgid "You must have a valid contact email address."
+msgstr "Вы павінны мець дзейны адра� �лектроннай пошты."
+
+#. TRANS: Client error displayed when a logo URL is not valid.
+msgid "Invalid logo URL."
+msgstr "���лушны URL-адра� л�гатыпу."
+
+#. TRANS: Client error displayed when a SSL logo URL is invalid.
+msgid "Invalid SSL logo URL."
+msgstr "���лушны URL-адра� л�гатыпу SSL."
+
+#. TRANS: Client error displayed trying to save site settings with an invalid language code.
+#. TRANS: %s is the invalid language code.
+#, php-format
+msgid "Unknown language \"%s\"."
+msgstr "�ев�дома� мова «%s»."
+
+#. TRANS: Client error displayed trying to save site settings with a text limit below 0.
+msgid "Minimum text limit is 0 (unlimited)."
+msgstr "Мінімальнае абмежаваньне т�к�ту �кладае 0 (неабмежаваны)."
+
+#. TRANS: Client error displayed trying to save site settings with a text limit below 1.
+msgid "Dupe limit must be one or more seconds."
+msgstr "�бмежаваньне дублікатаў павінна �кладаць адну ці болей ��кундаў."
+
+#. TRANS: Fieldset legend on site settings panel.
+msgctxt "LEGEND"
+msgid "General"
+msgstr "�гульны�"
+
+#. TRANS: Field label on site settings panel.
+msgctxt "LABEL"
+msgid "Site name"
+msgstr "�азва �айта"
+
+#. TRANS: Field title on site settings panel.
+msgid "The name of your site, like \"Yourcompany Microblog\"."
+msgstr "�азва Вашага �айту, напрыклад «Мікраблёг кампаніі …»"
+
+#. TRANS: Field label on site settings panel.
+msgid "Brought by"
+msgstr "Прад�таўленае"
+
+#. TRANS: Field title on site settings panel.
+msgid "Text used for credits link in footer of each page."
+msgstr ""
+"Т�к�т, �кі выкары�тоўваецца дл� пазнач�ньн� аўтараў унізе кожнай �таронкі."
+
+#. TRANS: Field label on site settings panel.
+msgid "Brought by URL"
+msgstr "URL-адра� прад�таўленага"
+
+#. TRANS: Field title on site settings panel.
+msgid "URL used for credits link in footer of each page."
+msgstr "URL-адра�ы аўтараў унізе кожнай �таронкі."
+
+#. TRANS: Field label on site settings panel.
+msgid "Email"
+msgstr "Электронна� пошта"
+
+#. TRANS: Field title on site settings panel.
+msgid "Contact email address for your site."
+msgstr "Кантактны адра� �лектроннай пошты Вашага �айту."
+
+#. TRANS: Fieldset legend on site settings panel.
+msgctxt "LEGEND"
+msgid "Local"
+msgstr "Л�кальна�"
+
+#. TRANS: Dropdown label on site settings panel.
+msgid "Default timezone"
+msgstr "Ча�авы па� па змоўчваньні"
+
+#. TRANS: Dropdown title on site settings panel.
+msgid "Default timezone for the site; usually UTC."
+msgstr "Ча�авы па� па змоўчваньні дл� �айту; звычайна UTC."
+
+#. TRANS: Dropdown label on site settings panel.
+msgid "Default language"
+msgstr "Мова па змоўчваньні"
+
+#. TRANS: Dropdown title on site settings panel.
+msgid ""
+"The site language when autodetection from browser settings is not available."
+msgstr ""
+"Мова �айту ў выпадку, калі аўтаматычнае вызнач�ньне наладаў з браўз�ра "
+"неда�тупнае."
+
+#. TRANS: Fieldset legend on site settings panel.
+msgctxt "LEGEND"
+msgid "Limits"
+msgstr "�бмежаваньні"
+
+#. TRANS: Field label on site settings panel.
+msgid "Text limit"
+msgstr "�бмежаваньні т�к�ту"
+
+#. TRANS: Field title on site settings panel.
+msgid "Maximum number of characters for notices."
+msgstr "Мак�ымальна� колька�ьць �ымбал�ў дл� запі�аў."
+
+#. TRANS: Field label on site settings panel.
+msgid "Dupe limit"
+msgstr "�бмежаваньне дубліраваньн�"
+
+#. TRANS: Field title on site settings panel.
+msgid "How long users must wait (in seconds) to post the same thing again."
+msgstr ""
+"Колькі тр�ба чакаць кары�тальнікам (у ��кундах), каб да�лаць тое �амае �шч� "
+"раз."
+
+#. TRANS: Fieldset legend for form to change logo.
+msgid "Logo"
+msgstr "Л�гатып"
+
+#. TRANS: Field label for StatusNet site logo.
+msgid "Site logo"
+msgstr "Л�гатып �айту"
+
+#. TRANS: Field label for SSL StatusNet site logo.
+msgid "SSL logo"
+msgstr "Л�гатып SSL"
+
+#. TRANS: Button title for saving site settings.
+msgid "Save the site settings."
+msgstr "Захаваць налады �айта."
+
+#. TRANS: Page title for site-wide notice tab in admin panel.
+msgid "Site Notice"
+msgstr "Паведамленьне �айта"
+
+#. TRANS: Instructions for site-wide notice tab in admin panel.
+msgid "Edit site-wide message"
+msgstr "Р�дагаваць абв�шч�ньне дл� ў��го �айту"
+
+#. TRANS: Server error displayed when saving a site-wide notice was impossible.
+msgid "Unable to save site notice."
+msgstr "�емагчыма захаваць абв�шч�ньне дл� �айту."
+
+#. TRANS: Client error displayed when a site-wide notice was longer than allowed.
+msgid "Maximum length for the site-wide notice is 255 characters."
+msgstr ""
+"Мак�ымальна� даўжын� дл� абв�шч�ньн� дл� ў��го �айту �кладае 255 �ымбал�ў."
+
+#. TRANS: Label for site-wide notice text field in admin panel.
+msgid "Site notice text"
+msgstr "Т�к�т абв�шч�ньн� �айта"
+
+#. TRANS: Tooltip for site-wide notice text field in admin panel.
+msgid "Site-wide notice text (255 characters maximum; HTML allowed)"
+msgstr "Т�к�т абв�шч�ньн� �айта (мак�ымум 255 �ымбал�ў; дазволены HTML)"
+
+#. TRANS: Button title to save site notice in admin panel.
+msgid "Save site notice."
+msgstr "Захаваць абв�шч�ньне �айта."
+
+#. TRANS: Title for SMS settings.
+msgid "SMS settings"
+msgstr "�алады СМС"
+
+#. TRANS: SMS settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#, php-format
+msgid "You can receive SMS messages through email from %%site.name%%."
+msgstr ""
+"Вы можаце атрымліваць СМС-паведамленьні праз �лектронную пошту з %%site.name%"
+"%."
+
+#. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
+msgid "SMS is not available."
+msgstr "�дпраўка СМС неда�тупна�."
+
+#. TRANS: Form legend for SMS settings form.
+msgid "SMS address"
+msgstr "СМС-адра�"
+
+#. TRANS: Form guide in SMS settings form.
+msgid "Current confirmed SMS-enabled phone number."
+msgstr "Ц�перашні пацьверджаны т�лефонны нумар дл� СМС."
+
+#. TRANS: Form guide in IM settings form.
+msgid "Awaiting confirmation on this phone number."
+msgstr "Чакаецца пацьверджаньне г�тага т�лефоннага нумару."
+
+#. TRANS: Field label for SMS address input in SMS settings form.
+msgid "Confirmation code"
+msgstr "Код пацьверджаньн�"
+
+#. TRANS: Form field instructions in SMS settings form.
+msgid "Enter the code you received on your phone."
+msgstr "Ув�дзіце код, �кі Вы атрымалі на Ваш т�лефон."
+
+#. TRANS: Button label to confirm SMS confirmation code in SMS settings.
+msgctxt "BUTTON"
+msgid "Confirm"
+msgstr "Пацьвердзіць"
+
+#. TRANS: Field label for SMS phone number input in SMS settings form.
+msgid "SMS phone number"
+msgstr "�умар т�лефона дл� СМС"
+
+#. TRANS: SMS phone number input field instructions in SMS settings form.
+msgid "Phone number, no punctuation or spaces, with area code."
+msgstr "�умар т�лефона, без знакаў пунктуацыі і прагалаў, з кодам краіны."
+
+#. TRANS: Form legend for SMS preferences form.
+msgid "SMS preferences"
+msgstr "�алады СМС"
+
+#. TRANS: Checkbox label in SMS preferences form.
+msgid ""
+"Send me notices through SMS; I understand I may incur exorbitant charges "
+"from my carrier."
+msgstr ""
+"Да�ылаць мне паведамленьні праз СМС. Я разумею, што г�та можа прыве�ьці да "
+"павеліч�ньн� рахункаў ад майго ап�ратара."
+
+#. TRANS: Confirmation message for successful SMS preferences save.
+msgid "SMS preferences saved."
+msgstr "�алады СМС захаваны�."
+
+#. TRANS: Message given saving SMS phone number without having provided one.
+msgid "No phone number."
+msgstr "��ма нумару т�лефона."
+
+#. TRANS: Message given saving SMS phone number without having selected a carrier.
+msgid "No carrier selected."
+msgstr "�п�ратар н� выбраны."
+
+#. TRANS: Message given saving SMS phone number that is already set.
+msgid "That is already your phone number."
+msgstr "Г�та ўжо Ваш нумар т�лефону."
+
+#. TRANS: Message given saving SMS phone number that is already set for another user.
+msgid "That phone number already belongs to another user."
+msgstr "Г�ты нумар т�лефону ўжо належыць іншаму кары�тальніку."
+
+#. TRANS: Message given saving valid SMS phone number that is to be confirmed.
+msgid ""
+"A confirmation code was sent to the phone number you added. Check your phone "
+"for the code and instructions on how to use it."
+msgstr ""
+"Код пацьверджаньн� быць да�ланы на нумар т�лефону, �кі Вы дадалі. Праверце "
+"Ваш т�лефон дл� атрыманьн� коду і ін�трукцый дл� �го выкары�таньн�."
+
+#. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
+msgid "That is the wrong confirmation number."
+msgstr "Г�та н��лушны код пацьверджаньн�."
+
+#. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
+msgid "Could not delete SMS confirmation."
+msgstr "�емагчыма выдаліць СМС-пацьверджаньне."
+
+#. TRANS: Message given after successfully canceling SMS phone number confirmation.
+msgid "SMS confirmation cancelled."
+msgstr "СМС-пацьверджаньне �ка�аванае."
+
+#. TRANS: Message given trying to remove an SMS phone number that is not
+#. TRANS: registered for the active user.
+msgid "That is not your phone number."
+msgstr "Г�та н� Ваш нумар т�лефону."
+
+#. TRANS: Message given after successfully removing a registered SMS phone number.
+msgid "The SMS phone number was removed."
+msgstr "�умар т�лефону дл� СМС быў выдалены."
+
+#. TRANS: Label for mobile carrier dropdown menu in SMS settings.
+msgid "Mobile carrier"
+msgstr "Мабільны ап�ратар"
+
+#. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
+msgid "Select a carrier"
+msgstr "Выбар мабільнага ап�ратара"
+
+#. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
+#. TRANS: %s is an administrative contact's e-mail address.
+#, 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 ""
+"Ваш ап�ратар мабільнай �ув�зі. Калі Вы ведаеце ап�ратара, �кі атрымлівае СМС-"
+"паведамленьні праз �лектронную пошту, але �кога н�ма ў г�тым �ьпі�е, "
+"паведаміце нам на адра� %s."
+
+#. TRANS: Message given saving SMS phone number confirmation code without having provided one.
+msgid "No code entered."
+msgstr "Код не ўведзены."
+
+#. TRANS: Title for admin panel to configure snapshots.
+msgctxt "TITLE"
+msgid "Snapshots"
+msgstr "Здымкі"
+
+#. TRANS: Instructions for admin panel to configure snapshots.
+msgid "Manage snapshot configuration"
+msgstr "Кіраваньне канфігурацы�й здымкаў"
+
+#. TRANS: Client error displayed on admin panel for snapshots when providing an invalid run value.
+msgid "Invalid snapshot run value."
+msgstr "���лушнае знач�ньне запу�ку здымка."
+
+#. TRANS: Client error displayed on admin panel for snapshots when providing an invalid value for frequency.
+msgid "Snapshot frequency must be a number."
+msgstr "Ча�тата здымкаў павінна быць лікам."
+
+#. TRANS: Client error displayed on admin panel for snapshots when providing an invalid report URL.
+msgid "Invalid snapshot report URL."
+msgstr "���лушны URL-адра� �праваздачы здымка."
+
+#. TRANS: Fieldset legend on admin panel for snapshots.
+msgctxt "LEGEND"
+msgid "Snapshots"
+msgstr "Здымкі"
+
+#. TRANS: Option in dropdown for snapshot method in admin panel for snapshots.
+msgid "Randomly during web hit"
+msgstr "Выпадкова падча� ў�б-зьв�ртаньн�"
+
+#. TRANS: Option in dropdown for snapshot method in admin panel for snapshots.
+msgid "In a scheduled job"
+msgstr "Як запл�навана� праца"
+
+#. TRANS: Dropdown label for snapshot method in admin panel for snapshots.
+msgid "Data snapshots"
+msgstr "Здымкі зьве�так"
+
+#. TRANS: Dropdown title for snapshot method in admin panel for snapshots.
+msgid "When to send statistical data to status.net servers."
+msgstr "Калі да�ылаць �таты�тычны� зьве�ткі на ��рв�ры status.net."
+
+#. TRANS: Input field label for snapshot frequency in admin panel for snapshots.
+msgid "Frequency"
+msgstr "Ча�тата"
+
+#. TRANS: Input field title for snapshot frequency in admin panel for snapshots.
+msgid "Snapshots will be sent once every N web hits."
+msgstr "Здымкі будуць да�ланы� кожны� N наведваньн�ў �айта."
+
+#. TRANS: Input field label for snapshot report URL in admin panel for snapshots.
+msgid "Report URL"
+msgstr "URL-адра� �праваздачы"
+
+#. TRANS: Input field title for snapshot report URL in admin panel for snapshots.
+msgid "Snapshots will be sent to this URL."
+msgstr "Здымкі будуць да�ланы� на г�ты URL-адра�."
+
+#. TRANS: Button title to save snapshot settings.
+msgid "Save snapshot settings."
+msgstr "Захаваць налады здымкаў."
+
+#. TRANS: Client error displayed trying a change a subscription for a non-subscribed profile.
+msgid "You are not subscribed to that profile."
+msgstr "Вы не падпі�аны на г�ты профіль."
+
+#. TRANS: Server error displayed when updating a subscription fails with a database error.
+#. TRANS: Exception thrown when a subscription could not be stored on the server.
+msgid "Could not save subscription."
+msgstr "�емагчыма захаваць падпі�ку."
+
+#. TRANS: Client error displayed when trying to approve group applicants without being a group administrator.
+msgid "You may only approve your own pending subscriptions."
+msgstr "Вы можаце зацьвердзіць толькі ўла�ную чаргу падпі�кі."
+
+#. TRANS: Title of the first page showing pending subscribers still awaiting approval.
+#. TRANS: %s is the name of the user.
+#, php-format
+msgid "%s subscribers awaiting approval"
+msgstr "Падпі�чыкі %s, �кі� чакаюць зацьверджаньн�"
+
+#. TRANS: Title of all but the first page showing pending subscribersmembers still awaiting approval.
+#. TRANS: %1$s is the name of the user, %2$d is the page number of the members list.
+#, php-format
+msgid "%1$s subscribers awaiting approval, page %2$d"
+msgstr "Падпі�чыкі %1$s, �кі� чакаюць зацьверджаньн�, �таронка %2$d"
+
+#. TRANS: Page notice for group members page.
+msgid "A list of users awaiting approval to subscribe to you."
+msgstr "Сьпі� кары�тальнікаў, �кі� чакаюць Вашага зацьверджаньн� на падпі�ку."
+
+#. TRANS: Page title when subscription succeeded.
+msgid "Subscribed"
+msgstr "Падпі�аны"
+
+#. TRANS: Client error displayed when trying to perform an action while not logged in.
+msgid "You must be logged in to unsubscribe from a list."
+msgstr "Вам неабходна ўвай�ьці ў �ы�т�му, каб адпі�ацца ад �ьпі�у."
+
+#. TRANS: Client error displayed when trying to perform an action without providing an ID.
+msgid "No ID given."
+msgstr "�е пададзены ід�нтыфікатар."
+
+#. TRANS: Server error displayed subscribing to a list fails.
+#. TRANS: %1$s is a user nickname, %2$s is a list, %3$s is the error message (no period).
+#, php-format
+msgid "Could not subscribe user %1$s to list %2$s: %3$s"
+msgstr "�емагчыма падпі�аць кары�тальніка %1$s на �ьпі� %2$s: %3$s"
+
+#. TRANS: Title of form to subscribe to a list.
+#. TRANS: %1%s is a user nickname, %2$s is a list, %3$s is a tagger nickname.
+#, php-format
+msgid "%1$s subscribed to list %2$s by %3$s"
+msgstr "%1$s падпі�аны на �ьпі� %2$s кары�тальніка %3$s"
+
+#. TRANS: Header for list of subscribers for a user (first page).
+#. TRANS: %s is the user's nickname.
+#, php-format
+msgid "%s subscribers"
+msgstr "Падпі�чыкі %s"
+
+#. TRANS: Header for list of subscribers for a user (not first page).
+#. TRANS: %1$s is the user's nickname, $2$d is the page number.
+#, php-format
+msgid "%1$s subscribers, page %2$d"
+msgstr "Падпі�чыкі %1$s, �таронка %2$d"
+
+#. TRANS: Page notice for page with an overview of all subscribers
+#. TRANS: of the logged in user's own profile.
+msgid "These are the people who listen to your notices."
+msgstr "Г�та людзі, �кі� прагл�даюць Вашы� запі�ы."
+
+#. TRANS: Page notice for page with an overview of all subscribers of a user other
+#. TRANS: than the logged in user. %s is the user nickname.
+#, php-format
+msgid "These are the people who listen to %s's notices."
+msgstr "Г�та людзі, �кі� прагл�даюць запі�ы %s."
+
+#. TRANS: Subscriber list text when the logged in user has no subscribers.
+msgid ""
+"You have no subscribers. Try subscribing to people you know and they might "
+"return the favor."
+msgstr ""
+"Вы н� маеце падпі�чыкаў. Па�прабуйце падпі�ацца на в�домых Вам людзей, і "
+"�ны, магчыма, адкажуць узаемна�ьцю."
+
+#. TRANS: Subscriber list text when looking at the subscribers for a of a user other
+#. TRANS: than the logged in user that has no subscribers. %s is the user nickname.
+#, php-format
+msgid "%s has no subscribers. Want to be the first?"
+msgstr "%s н� мае падпі�чыкаў. Жадаеце быць першым?"
+
+#. TRANS: Subscriber list text when looking at the subscribers for a of a user that has none
+#. TRANS: as an anonymous user. %s is the user nickname.
+#. TRANS: This message contains a Markdown URL. The link description is between
+#. TRANS: square brackets, and the link between parentheses. Do not separate "]("
+#. TRANS: and do not change the URL part.
+#, php-format
+msgid ""
+"%s has no subscribers. Why not [register an account](%%%%action.register%%%"
+"%) and be the first?"
+msgstr ""
+"%s н� мае падпі�чыкаў. Чаму б не [�тварыць рахунак](%%%%action.register%%%%) "
+"і быць першым?"
+
+#. TRANS: Header for subscriptions overview for a user (not first page).
+#. TRANS: %1$s is a user nickname, %2$d is the page number.
+#, php-format
+msgid "%1$s subscriptions, page %2$d"
+msgstr "Падпі�кі %1$s, �таронка %2$d"
+
+#. TRANS: Page notice for page with an overview of all subscriptions
+#. TRANS: of the logged in user's own profile.
+msgid "These are the people whose notices you listen to."
+msgstr "Г�та кары�тальнікі, запі�ы �кіх Вы чытаеце."
+
+#. TRANS: Page notice for page with an overview of all subscriptions of a user other
+#. TRANS: than the logged in user. %s is the user nickname.
+#, php-format
+msgid "These are the people whose notices %s listens to."
+msgstr "Г�та кары�тальнікі, запі�ы �кіх чытае %s."
+
+#. TRANS: Subscription list text when the logged in user has no subscriptions.
+#. TRANS: This message contains Markdown URLs. The link description is between
+#. TRANS: square brackets, and the link between parentheses. Do not separate "]("
+#. TRANS: and do not change the URL part.
+#, php-format
+msgid ""
+"You're not listening to anyone's notices right now, try subscribing to "
+"people you know. Try [people search](%%action.peoplesearch%%), look for "
+"members in groups you're interested in and in our [featured users](%%action."
+"featured%%)."
+msgstr ""
+"Зараз Вы не чытаеце нічыіх запі�аў. Па�прабуйце падпі�ацца на людзей, �кіх "
+"Вы ведаеце. Па�прабуйце [пашукаць людзей](%%action.peoplesearch%%), "
+"пагл�дзіце удзельнікаў групаў, �кі� Вам цікавы�, і пагл�дзіце [ўдзельнікаў "
+"вартых увагі](%%action.featured%%)."
+
+#. TRANS: Subscription list text when looking at the subscriptions for a of a user other
+#. TRANS: than the logged in user that has no subscriptions. %s is the user nickname.
+#. TRANS: Subscription list text when looking at the subscriptions for a of a user that has none
+#. TRANS: as an anonymous user. %s is the user nickname.
+#, php-format
+msgid "%s is not listening to anyone."
+msgstr "%s не чытае нікога."
+
+#. TRANS: Atom feed title. %s is a profile nickname.
+#, php-format
+msgid "Subscription feed for %s (Atom)"
+msgstr "Стужка падпі�ак %s (Atom)"
+
+#. TRANS: Checkbox label for enabling IM messages for a profile in a subscriptions list.
+msgctxt "LABEL"
+msgid "IM"
+msgstr "IM"
+
+#. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
+msgid "SMS"
+msgstr "СМС"
+
+#. TRANS: Title for all but the first page of notices with tags.
+#. TRANS: %1$s is the tag, %2$d is the page number.
+#, php-format
+msgid "Notices tagged with %1$s, page %2$d"
+msgstr "Запі�ы з т�гам %1$s, �таронка %2$d"
+
+#. TRANS: Link label for feed on "notices with tag" page.
+#. TRANS: %s is the tag the feed is for.
+#, php-format
+msgid "Notice feed for tag %s (Activity Streams JSON)"
+msgstr "Стужка запі�аў дл� т�га %s (�тужка актыўна�ьці JSON)"
+
+#. TRANS: Link label for feed on "notices with tag" page.
+#. TRANS: %s is the tag the feed is for.
+#, php-format
+msgid "Notice feed for tag %s (RSS 1.0)"
+msgstr "Стужка запі�аў дл� т�га %s (RSS 1.0)"
+
+#. TRANS: Link label for feed on "notices with tag" page.
+#. TRANS: %s is the tag the feed is for.
+#, php-format
+msgid "Notice feed for tag %s (RSS 2.0)"
+msgstr "Стужка запі�аў дл� т�га %s (RSS 2.0)"
+
+#. TRANS: Link label for feed on "notices with tag" page.
+#. TRANS: %s is the tag the feed is for.
+#, php-format
+msgid "Notice feed for tag %s (Atom)"
+msgstr "Стужка запі�аў дл� т�га %s (Atom)"
+
+#. TRANS: Client error displayed when trying to tag a user that cannot be tagged.
+#. TRANS: Client exception thrown trying to set a tag for a user that cannot be tagged.
+#. TRANS: Error displayed when trying to tag a user that cannot be tagged.
+msgid "You cannot tag this user."
+msgstr "Вы н� можаце пазначыць г�тага кары�тальніка."
+
+#. TRANS: Title for list form when not on a profile page.
+msgid "List a profile"
+msgstr "Сьпі� профілю"
+
+#. TRANS: Title for list form when on a profile page.
+#. TRANS: %s is a profile nickname.
+#, php-format
+msgctxt "ADDTOLIST"
+msgid "List %s"
+msgstr "Сьпі� %s"
+
+#. TRANS: Title for list form when an error has occurred.
+msgctxt "TITLE"
+msgid "Error"
+msgstr "Памылка"
+
+#. TRANS: Header in list form.
+msgid "User profile"
+msgstr "Профіль кары�тальніка"
+
+#. TRANS: Fieldset legend for list form.
+msgid "List user"
+msgstr "Кары�тальнік �а �ьпі�у"
+
+#. TRANS: Field label on list form.
+msgctxt "LABEL"
+msgid "Lists"
+msgstr "Сьпі�ы"
+
+#. TRANS: Field title on list form.
+msgid ""
+"Lists for this user (letters, numbers, -, ., and _), comma- or space- "
+"separated."
+msgstr ""
+"Сьпі�ы дл� г�тага кары�тальніка (літары, лічбы, -, ., і _), падзелены� "
+"ко�кай ці прагалам."
+
+#. TRANS: Title for personal tag cloud section.
+msgctxt "TITLE"
+msgid "Tags"
+msgstr "Т�гі"
+
+#. TRANS: Success message if lists are saved.
+msgid "Lists saved."
+msgstr "Сьпі�ы захаваны�."
+
+#. TRANS: Page notice.
+msgid "Use this form to add your subscribers or subscriptions to lists."
+msgstr ""
+"Выкары�тоўвайце г�тую форму каб дадаваць Вашых падпі�чыкаў ці падпі�кі ў "
+"�ьпі�ы."
+
+#. TRANS: Client error when requesting a tag feed for a non-existing tag.
+msgid "No such tag."
+msgstr "��ма такога т�гу."
+
+#. TRANS: Client error displayed when trying to unblock a non-blocked user.
+msgid "You haven't blocked that user."
+msgstr "Вы не забл�кавалі г�тага кары�тальніка."
+
+#. TRANS: Client error on page to unsilence a user when the to be unsandboxed user has not been sandboxed.
+msgid "User is not sandboxed."
+msgstr "Кары�тальнік не ў п��очніцы."
+
+#. TRANS: Client error on page to unsilence a user when the to be unsilenced user has not been silenced.
+msgid "User is not silenced."
+msgstr "Кары�тальнік не заглушаны."
+
+#. TRANS: Page title for page to unsubscribe.
+msgid "Unsubscribed"
+msgstr "�дпі�аны"
+
+#. TRANS: Page title for form that allows unsubscribing from a list.
+#. TRANS: %1$s is a nickname, %2$s is a list, %3$s is a tagger nickname.
+#, php-format
+msgid "%1$s unsubscribed from list %2$s by %3$s"
+msgstr "%1$s адпі�аў�� ад �ьпі�у %2$s кары�тальніка %3$s"
+
+#. TRANS: Title of URL settings tab in profile settings.
+msgid "URL settings"
+msgstr "�алады URL-адра�оў"
+
+#. TRANS: Instructions for tab "Other" in user profile settings.
+msgid "Manage various other options."
+msgstr "Кіраваньне рознымі іншымі наладамі."
+
+#. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
+#. TRANS: user's profile settings. This message has one space at the beginning. Use your
+#. TRANS: language's word separator here if it has one (most likely a single space).
+msgid " (free service)"
+msgstr " (вольны ��рві�)"
+
+#. TRANS: Default value for URL shortening settings.
+msgid "[none]"
+msgstr "[н�ма]"
+
+#. TRANS: Default value for URL shortening settings.
+msgid "[internal]"
+msgstr "[унутраны]"
+
+#. TRANS: Label for dropdown with URL shortener services.
+msgid "Shorten URLs with"
+msgstr "Скарач�ньне URL-адра�оў з дапамогай"
+
+#. TRANS: Tooltip for for dropdown with URL shortener services.
+msgid "Automatic shortening service to use."
+msgstr "Выкары�тоўваць аўтаматычную па�лугу �карач�ньн�."
+
+#. TRANS: Field label in URL settings in profile.
+msgid "URL longer than"
+msgstr "URL-адра�ы даўж�й за"
+
+#. TRANS: Field title in URL settings in profile.
+msgid "URLs longer than this will be shortened, 0 means always shorten."
+msgstr "URL-адра�ы даўж�й за г�та будуць �карочаны�, 0 — �карачаць заў�ёды."
+
+#. TRANS: Field label in URL settings in profile.
+msgid "Text longer than"
+msgstr "Т�к�т даўж�й за"
+
+#. TRANS: Field title in URL settings in profile.
+msgid ""
+"URLs in notices longer than this will be shortened, 0 means always shorten."
+msgstr ""
+"URL-адра�ы ў запі�ах даўж�й за г�та будуць �карочаны�, 0 — �карачаць заў�ёды."
+
+#. TRANS: Form validation error for form "Other settings" in user profile.
+msgid "URL shortening service is too long (maximum 50 characters)."
+msgstr ""
+"С�рві� �карач�ньне URL-адра�оў занадта доўгі (мак�ымальна 50 �ымбал�ў)."
+
+#. TRANS: Client exception thrown when the maximum URL settings value is invalid in profile URL settings.
+msgid "Invalid number for maximum URL length."
+msgstr "���лушны лік мак�ымальнай даўжыні URL-адра�у."
+
+#. TRANS: Client exception thrown when the maximum notice length settings value is invalid in profile URL settings.
+msgid "Invalid number for maximum notice length."
+msgstr "���лушны лік мак�ымальнай даўжыні запі�у."
+
+#. TRANS: Server exception thrown in profile URL settings when preferences could not be saved.
+msgid "Error saving user URL shortening preferences."
+msgstr "Памылка захаваньн� наладаў ��рві�у �карач�ньн� URL-адра�оў."
+
+#. TRANS: User admin panel title.
+msgctxt "TITLE"
+msgid "User"
+msgstr "Кары�тальнік"
+
+#. TRANS: Instruction for user admin panel.
+msgid "User settings for this StatusNet site"
+msgstr "�алады кары�тальніка дл� г�тага �айта StatusNet"
+
+#. TRANS: Form validation error in user admin panel when a non-numeric character limit was set.
+msgid "Invalid bio limit. Must be numeric."
+msgstr "���лушнае абмежаваньне бі�графіі. Павінен быць лік."
+
+#. TRANS: Form validation error in user admin panel when welcome text is too long.
+msgid "Invalid welcome text. Maximum length is 255 characters."
+msgstr "���лушны т�к�т вітаньн�. Мак�ымальна� даўжын� — 255 �ымбал�ў."
+
+#. TRANS: Client error displayed when trying to set a non-existing user as default subscription for new
+#. TRANS: users in user admin panel. %1$s is the invalid nickname.
+#, php-format
+msgid "Invalid default subscripton: \"%1$s\" is not a user."
+msgstr "���лушна� падпі�ка па змоўчваньні: «%1$s» не зь�ўл�ецца кары�тальнікам."
+
+#. TRANS: Fieldset legend in user administration panel.
+msgctxt "LEGEND"
+msgid "Profile"
+msgstr "Профіль"
+
+#. TRANS: Field label in user admin panel for setting the character limit for the bio field.
+msgid "Bio Limit"
+msgstr "�бмежаваньне бі�графіі"
+
+#. TRANS: Tooltip in user admin panel for setting the character limit for the bio field.
+msgid "Maximum length of a profile bio in characters."
+msgstr "Мак�ымальна� даўжын� бі�графіі ў профілі ў �ымбал�х."
+
+#. TRANS: Form legend in user admin panel.
+msgid "New users"
+msgstr "�овы� кары�тальнікі"
+
+#. TRANS: Field label in user admin panel for setting new user welcome text.
+msgid "New user welcome"
+msgstr "Вітаньні новым кары�тальнікам"
+
+#. TRANS: Tooltip in user admin panel for setting new user welcome text.
+msgid "Welcome text for new users (maximum 255 characters)."
+msgstr "Т�к�т вітаньн� дл� новых кары�тальнікаў (мак�ымальна 255 �ымбал�ў)."
+
+#. TRANS: Field label in user admin panel for setting default subscription for new users.
+msgid "Default subscription"
+msgstr "Падпі�ка па змоўчваньні"
+
+#. TRANS: Tooltip in user admin panel for setting default subscription for new users.
+msgid "Automatically subscribe new users to this user."
+msgstr "�ўтаматычна падпі�ваць новых кары�тальнікаў на г�тага кары�тальніка."
+
+#. TRANS: Form legend in user admin panel.
+msgid "Invitations"
+msgstr "Запраш�ньні"
+
+#. TRANS: Field label for checkbox in user admin panel for allowing users to invite friend using site e-mail.
+msgid "Invitations enabled"
+msgstr "Запраш�ньні ўключаны�"
+
+#. TRANS: Tooltip for checkbox in user admin panel for allowing users to invite friend using site e-mail.
+msgid "Whether to allow users to invite new users."
+msgstr "Ці дазвал�ць кары�тальнікам запрашаць новых кары�тальнікаў."
+
+#. TRANS: Button title to save user settings in user admin panel.
+msgid "Save user settings."
+msgstr "Захаваць налады кары�тальніка."
+
+#. TRANS: Page title for all but the first page of groups for a user.
+#. TRANS: %1$s is a nickname, %2$d is a page number.
+#, php-format
+msgid "%1$s groups, page %2$d"
+msgstr "Групы %1$s, �таронка %2$d"
+
+#. TRANS: Link text on group page to search for groups.
+msgid "Search for more groups"
+msgstr "Шукаць іншы� групы"
+
+#. TRANS: Text on group page for a user that is not a member of any group.
+#. TRANS: %s is a user nickname.
+#, php-format
+msgid "%s is not a member of any group."
+msgstr "%s не зь�ўл�ецца ўдзельнікам ніводнай групы."
+
+#. TRANS: Text on group page for a user that is not a member of any group. This message contains
+#. TRANS: a Markdown link in the form [link text](link) and a variable that should not be changed.
+#, php-format
+msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
+msgstr ""
+"Па�прабуйце [пашукаць групы](%%action.groupsearch%%) і далучыцца да іх."
+
+#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
+#. TRANS: Message is used as a subtitle in atom group notice feed.
+#. TRANS: %1$s is a group name, %2$s is a site name.
+#. TRANS: Message is used as a subtitle in atom user notice feed.
+#. TRANS: %1$s is a user name, %2$s is a site name.
+#, php-format
+msgid "Updates from %1$s on %2$s!"
+msgstr "�бнаўленьні ад %1$s на %2$s!"
+
+#. TRANS: Title for version page. %s is the StatusNet version.
+#, php-format
+msgid "StatusNet %s"
+msgstr "StatusNet %s"
+
+#. TRANS: Content part of StatusNet version page.
+#. TRANS: %1$s is the engine name (StatusNet) and %2$s is the StatusNet version.
+#, php-format
+msgid ""
+"This site is powered by %1$s version %2$s, Copyright 2008-2011 StatusNet, "
+"Inc. and contributors."
+msgstr ""
+"Г�ты �айт �твораны на а�нове %1$s в�р�іі %2$s. �ўтар�кі� правы 2008-2011 "
+"StatusNet, Inc. і ра�працоўшчыкі."
+
+#. TRANS: Header for StatusNet contributors section on the version page.
+msgid "Contributors"
+msgstr "�ўтары"
+
+#. TRANS: Header for StatusNet license section on the version page.
+msgid "License"
+msgstr "Ліц�нзі�"
+
+#. TRANS: Content part of StatusNet version page.
+msgid ""
+"StatusNet is free software: you can redistribute it and/or modify it under "
+"the terms of the GNU Affero General Public License as published by the Free "
+"Software Foundation, either version 3 of the License, or (at your option) "
+"any later version."
+msgstr ""
+"StatusNet — вольнае праграмнае забе�ьп�ч�ньне: Вы можаце ра�паў�юджваць �го "
+"і/альбо зьм�н�ць �го ў адпаведна�ьці з умовамі ліц�нзіі GNU Affero General "
+"Public, �ка� апублікавана� Фундацы�й Вольнага Праграмнага Забе�ьп�ч�ньн�, "
+"в�р�іі 3 ці любой больш позьн�й."
+
+#. TRANS: Content part of StatusNet version page.
+msgid ""
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License "
+"for more details."
+msgstr ""
+"Г�та� праграма ра�паў�юджваецца з надзе�й, што �на будзе кары�най, але БЕЗ "
+"Г�Р��ТЫІ; нават без н��ўнай гарантыі Г��ДЛ�В�Й ПРЫД�Т��СЬЦІ ці ПРЫД�Т��СЬЦІ "
+"ВЫК�РЫСТ��Ь�Я. Дадатковую інфармацыю гл�дзіце ў ліц�нзіі GNU Affero General "
+"Public."
+
+#. TRANS: Content part of StatusNet version page.
+#. TRANS: %s is a link to the AGPL license with link description "http://www.gnu.org/licenses/agpl.html".
+#, php-format
+msgid ""
+"You should have received a copy of the GNU Affero General Public License "
+"along with this program.  If not, see %s."
+msgstr ""
+"Вам неабходна атрымаць копію ліц�нзіі GNU Affero General Public з г�тай "
+"праграмай. Калі не, гл�дзіце %s."
+
+#. TRANS: Header for StatusNet plugins section on the version page.
+msgid "Plugins"
+msgstr "Дапаўненьні"
+
+#. TRANS: Column header for plugins table on version page.
+msgctxt "HEADER"
+msgid "Name"
+msgstr "�азва"
+
+#. TRANS: Column header for plugins table on version page.
+msgctxt "HEADER"
+msgid "Version"
+msgstr "В�р�і�"
+
+#. TRANS: Column header for plugins table on version page.
+msgctxt "HEADER"
+msgid "Author(s)"
+msgstr "�ўтар(ы)"
+
+#. TRANS: Column header for plugins table on version page.
+msgctxt "HEADER"
+msgid "Description"
+msgstr "�пі�аньне"
+
+#. TRANS: Activity title when marking a notice as favorite.
+msgid "Favor"
+msgstr "Дадаць да ўлюблёных"
+
+#. TRANS: Ntofication given when a user marks a notice as favorite.
+#. TRANS: %1$s is a user nickname or full name, %2$s is a notice URI.
+#, php-format
+msgid "%1$s marked notice %2$s as a favorite."
+msgstr "%1$s дадаў запі� %2$s да ўлюблёных."
+
+#. TRANS: Server exception thrown when a URL cannot be processed.
+#, php-format
+msgid "Cannot process URL '%s'"
+msgstr "�емагчыма апрацаваць URL-адра� «%s»"
+
+#. TRANS: Server exception thrown when... Robin thinks something is impossible!
+msgid "Robin thinks something is impossible."
+msgstr "Робін лічыць, што г�та немагчыма."
+
+#. TRANS: Message used to be inserted as %2$s in  the text "No file may
+#. TRANS: be larger than %1$d byte and the file you sent was %2$s.".
+#. TRANS: %1$d is the number of bytes of an uploaded file.
+#, php-format
+msgid "%1$d byte"
+msgid_plural "%1$d bytes"
+msgstr[0] "%1$d байт"
+msgstr[1] "%1$d байты"
+
+#. TRANS: Message given if an upload is larger than the configured maximum.
+#. TRANS: %1$d (used for plural) is the byte limit for uploads,
+#. TRANS: %2$s is the proper form of "n bytes". This is the only ways to have
+#. TRANS: gettext support multiple plurals in the same message, unfortunately...
+#, php-format
+msgid ""
+"No file may be larger than %1$d byte and the file you sent was %2$s. Try to "
+"upload a smaller version."
+msgid_plural ""
+"No file may be larger than %1$d bytes and the file you sent was %2$s. Try to "
+"upload a smaller version."
+msgstr[0] ""
+"Файл н� можа быць болей %1$d байта, а да�ланы Вамі файл ўтрымлівае %2$s. "
+"Па�прабуйце загрузіць меншую в�р�ію."
+msgstr[1] ""
+"Файл н� можа быць болей %1$d байты, а да�ланы Вамі файл ўтрымлівае %2$s. "
+"Па�прабуйце загрузіць меншую в�р�ію."
+
+#. TRANS: Message given if an upload would exceed user quota.
+#. TRANS: %d (number) is the user quota in bytes and is used for plural.
+#, php-format
+msgid "A file this large would exceed your user quota of %d byte."
+msgid_plural "A file this large would exceed your user quota of %d bytes."
+msgstr[0] "Файл такога памеру перавы�іць Вашую квоту кары�тальніка ў %d байт."
+msgstr[1] "Файл такога памеру перавы�іць Вашую квоту кары�тальніка ў %d байты."
+
+#. TRANS: Message given id an upload would exceed a user's monthly quota.
+#. TRANS: $d (number) is the monthly user quota in bytes and is used for plural.
+#, php-format
+msgid "A file this large would exceed your monthly quota of %d byte."
+msgid_plural "A file this large would exceed your monthly quota of %d bytes."
+msgstr[0] "Файл такога памеру перавы�іць Вашую штоме��чную квоту ў %d байт."
+msgstr[1] "Файл такога памеру перавы�іць Вашую штоме��чную квоту ў %d байты."
+
+#. TRANS: Client exception thrown if a file upload does not have a valid name.
+msgid "Invalid filename."
+msgstr "���лушна� назва файла."
+
+#. TRANS: Exception thrown providing an invalid profile ID.
+#. TRANS: %s is the invalid profile ID.
+#, php-format
+msgid "Profile ID %s is invalid."
+msgstr "���лушны ід�нтыфікатар профілю %s."
+
+#. TRANS: Exception thrown providing an invalid group ID.
+#. TRANS: %s is the invalid group ID.
+#, php-format
+msgid "Group ID %s is invalid."
+msgstr "���лушны ід�нтыфікатар групы %s."
+
+#. TRANS: Exception thrown when joining a group fails.
+msgid "Group join failed."
+msgstr "Памылка далуч�ньн� да групы."
+
+#. TRANS: Exception thrown when trying to leave a group the user is not a member of.
+msgid "Not part of group."
+msgstr "�е зь�ўл�ецца ча�ткай групы."
+
+#. TRANS: Exception thrown when trying to leave a group fails.
+msgid "Group leave failed."
+msgstr "Памылка выхаду з групы."
+
+#. TRANS: Activity title.
+msgid "Join"
+msgstr "Далучыцца"
+
+#. TRANS: Success message for subscribe to group attempt through OStatus.
+#. TRANS: %1$s is the member name, %2$s is the subscribed group's name.
+#, php-format
+msgid "%1$s has joined group %2$s."
+msgstr "%1$s далучыў�� да групы %2$s."
+
+#. TRANS: Server exception thrown when updating a local group fails.
+msgid "Could not update local group."
+msgstr "�емагчыма абнавіць л�кальную групу."
+
+#. TRANS: Exception thrown when trying creating a login token failed.
+#. TRANS: %s is the user nickname for which token creation failed.
+#, php-format
+msgid "Could not create login token for %s"
+msgstr "�емагчыма �тварыць ключ уваходу дл� %s"
+
+#. TRANS: Exception thrown when a program code class (%s) cannot be instantiated.
+#, php-format
+msgid "Cannot instantiate class %s."
+msgstr "�емагчыма �тварыць �кз�мпл�р кл��ы %s."
+
+#. TRANS: Exception thrown when database name or Data Source Name could not be found.
+msgid "No database name or DSN found anywhere."
+msgstr "�� знойдзена� назва базы зьве�так."
+
+#. TRANS: Client exception thrown when a user tries to send a direct message while being banned from sending them.
+msgid "You are banned from sending direct messages."
+msgstr "Вы забл�каваны ад да�ылкі непа�р�дных паведамленьн�ў."
+
+#. TRANS: Message given when a message could not be stored on the server.
+msgid "Could not insert message."
+msgstr "�емагчыма ў�тавіць паведамленьне."
+
+#. TRANS: Message given when a message could not be updated on the server.
+msgid "Could not update message with new URI."
+msgstr "�емагчыма абнавіць паведамленьне з новым URI-адра�ам."
+
+#. TRANS: Server exception thrown when a user profile for a notice cannot be found.
+#. TRANS: %1$d is a profile ID (number), %2$d is a notice ID (number).
+#, php-format
+msgid "No such profile (%1$d) for notice (%2$d)."
+msgstr "��ма такога профілю (%1$d) дл� запі�у (%2$d)."
+
+#. TRANS: Server exception. %s are the error details.
+#, php-format
+msgid "Database error inserting hashtag: %s."
+msgstr "Памылка базы зьве�так падча� ў�таўкі х�ш-т�гу: %s."
+
+#. TRANS: Client exception thrown if a notice contains too many characters.
+msgid "Problem saving notice. Too long."
+msgstr "Праблема захаваньн� запі�у. Занадта доўгі."
+
+#. TRANS: Client exception thrown when trying to save a notice for an unknown user.
+msgid "Problem saving notice. Unknown user."
+msgstr "Праблема захаваньн� запі�у. �ев�домы кары�тальнік."
+
+#. TRANS: Client exception thrown when a user tries to post too many notices in a given time frame.
+msgid ""
+"Too many notices too fast; take a breather and post again in a few minutes."
+msgstr ""
+"Зашмат запі�аў за кароткі ча�; адпачніце і па�прабуйце зноў праз некалькі "
+"хвілінаў."
+
+#. TRANS: Client exception thrown when a user tries to post too many duplicate notices in a given time frame.
+msgid ""
+"Too many duplicate messages too quickly; take a breather and post again in a "
+"few minutes."
+msgstr ""
+"Зашмат аднолькавых запі�аў за кароткі ча�; адпачніце і па�прабуйце зноў праз "
+"некалькі хвілінаў."
+
+#. TRANS: Client exception thrown when a user tries to post while being banned.
+msgid "You are banned from posting notices on this site."
+msgstr "Вам забаронена да�ылаць запі�ы на г�ты �айт."
+
+#. TRANS: Client exception thrown in notice when trying to repeat a missing or deleted notice.
+msgid "Cannot repeat; original notice is missing or deleted."
+msgstr "�емагчыма паўтарыць; пачатковы запі� быў выдалены ці зьнік."
+
+#. TRANS: Client error displayed when trying to repeat an own notice.
+msgid "You cannot repeat your own notice."
+msgstr "Вы н� можаце паўтарыць ула�ны запі�."
+
+#. TRANS: Client error displayed when trying to repeat a non-public notice.
+msgid "Cannot repeat a private notice."
+msgstr "�емагчыма паўтарыць прыватны запі�."
+
+#. TRANS: Client error displayed when trying to repeat a notice you cannot access.
+msgid "Cannot repeat a notice you cannot read."
+msgstr "�емагчыма паўтарыць запі�, �кі Вы н� можаце прачытаць."
+
+#. TRANS: Client error displayed when trying to repeat an already repeated notice.
+msgid "You already repeated that notice."
+msgstr "Вы ўжо паўтарылі г�ты запі�."
+
+#. TRANS: Client error displayed when trying to reply to a notice a the target has no access to.
+#. TRANS: %1$s is a user nickname, %2$d is a notice ID (number).
+#, php-format
+msgid "%1$s has no access to notice %2$d."
+msgstr "%1$s н� мае до�тупу да запі�у %2$d."
+
+#. TRANS: Server exception thrown when a notice cannot be saved.
+#. TRANS: Server exception thrown when a notice cannot be updated.
+msgid "Problem saving notice."
+msgstr "Праблема захаваньн� запі�у."
+
+#. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
+msgid "Bad type provided to saveKnownGroups."
+msgstr "Пададзены н��лушны тып дл� saveKnownGroups."
+
+#. TRANS: Server exception thrown when an update for a group inbox fails.
+msgid "Problem saving group inbox."
+msgstr "Праблема захаваньн� уваходз�чых паведамленьн�ў групы."
+
+#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
+#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
+#, php-format
+msgid "RT @%1$s %2$s"
+msgstr "Паўтор @%1$s %2$s"
+
+#. TRANS: Full name of a profile or group (%1$s) followed by nickname (%2$s) in parentheses.
+#. TRANS: Full name of a profile or group followed by nickname in parens
+#, php-format
+msgctxt "FANCYNAME"
+msgid "%1$s (%2$s)"
+msgstr "%1$s (%2$s)"
+
+#. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
+#. TRANS: %1$s is the role name, %2$s is the user ID (number).
+#, php-format
+msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
+msgstr "�емагчыма адклікаць ролю «%1$s» дл� кары�тальніка #%2$d, �кі не і�нуе."
+
+#. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
+#. TRANS: %1$s is the role name, %2$s is the user ID (number).
+#, php-format
+msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
+msgstr ""
+"�емагчыма адклікаць ролю «%1$s» дл� кары�тальніка #%2$d; памылка базы "
+"зьве�так."
+
+#. TRANS: Server exception.
+msgid "The tag you are trying to rename to already exists."
+msgstr "Т�г, �кі Вы �прабуеце перайменаваць, ужо і�нуе."
+
+#. TRANS: Server exception saving new tag without having a tagger specified.
+msgid "No tagger specified."
+msgstr "Т�г не пазначаны."
+
+#. TRANS: Server exception saving new tag without having a tag specified.
+msgid "No tag specified."
+msgstr "Т�г не пазначаны."
+
+#. TRANS: Server exception saving new tag.
+msgid "Could not create profile tag."
+msgstr "�емагчыма �тварыць т�г профілю."
+
+#. TRANS: Server exception saving new tag.
+msgid "Could not set profile tag URI."
+msgstr "�емагчыма ў�танавіць URI т�га профілю."
+
+#. TRANS: Server exception saving new tag.
+msgid "Could not set profile tag mainpage."
+msgstr "�емагчыма ў�танавіць галоўную �таронку т�га профілю."
+
+#. TRANS: Client exception thrown trying to set more tags than allowed.
+#, php-format
+msgid ""
+"You already have created %d or more tags which is the maximum allowed number "
+"of tags. Try using or deleting some existing tags."
+msgstr ""
+"Вы ўжо �тварылі %d ці болей т�гаў, што зь�ўл�ецца дазволенай колька�ьцю "
+"т�гаў. Па�прабуйце выкары�таць ці выдаліць некаторы� і�нуючы� т�гі."
+
+#. TRANS: Client exception thrown when trying to add more people than allowed to a list.
+#, php-format
+msgid ""
+"You already have %1$d or more people in list %2$s, which is the maximum "
+"allowed number. Try unlisting others first."
+msgstr ""
+"Вы ўжо маеце %1$d ці болей людзей у �ьпі�е %2$s, што зь�ўл�ецца мак�ымальна "
+"дазволенай колька�ьцю. Па�прабуйце, �пачатку, выдаліць каго-небудзь �а "
+"�ьпі�у."
+
+#. TRANS: Exception thrown when inserting a list subscription in the database fails.
+msgid "Adding list subscription failed."
+msgstr "�емагчыма дадаць ў �ьпі� падпі�кі."
+
+#. TRANS: Exception thrown when deleting a list subscription from the database fails.
+msgid "Removing list subscription failed."
+msgstr "�емагчыма выдаліць �а �ьпі�у падпі�кі."
+
+#. TRANS: Exception thrown when a right for a non-existing user profile is checked.
+msgid "Missing profile."
+msgstr "��ма профілю."
+
+#. TRANS: Exception thrown when a tag cannot be saved.
+msgid "Unable to save tag."
+msgstr "�емагчыма захаваць т�г."
+
+#. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
+msgid "You have been banned from subscribing."
+msgstr "Вы былі забл�каваны� ад падпі�кі."
+
+#. TRANS: Exception thrown when trying to subscribe while already subscribed.
+msgid "Already subscribed!"
+msgstr "Ужо падпі�аны!"
+
+#. TRANS: Exception thrown when trying to subscribe to a user who has blocked the subscribing user.
+msgid "User has blocked you."
+msgstr "Кары�тальнік Ва� забл�каваў."
+
+#. TRANS: Exception thrown when trying to unsibscribe without a subscription.
+msgid "Not subscribed!"
+msgstr "�е падпі�аны!"
+
+#. TRANS: Exception thrown when trying to unsubscribe a user from themselves.
+msgid "Could not delete self-subscription."
+msgstr "�емагчыма выдаліць падпі�ку на �амога ��бе."
+
+#. TRANS: Exception thrown when a subscription could not be deleted on the server.
+msgid "Could not delete subscription."
+msgstr "�емагчыма выдаліць падпі�ку."
+
+#. TRANS: Activity title when subscribing to another person.
+msgctxt "TITLE"
+msgid "Follow"
+msgstr "Сачыць"
+
+#. TRANS: Notification given when one person starts following another.
+#. TRANS: %1$s is the subscriber, %2$s is the subscribed.
+#, php-format
+msgid "%1$s is now following %2$s."
+msgstr "%1$s ц�пер �очыць за %2$s."
+
+#. TRANS: Notice given on user registration.
+#. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
+#, php-format
+msgid "Welcome to %1$s, @%2$s!"
+msgstr "Вітаем на %1$s, @%2$s!"
+
+#. TRANS: Exception thrown when trying view "repeated to me".
+msgid "Not implemented since inbox change."
+msgstr "�е р�алізавана з моманту зьмены ўваходз�чых паведамленьн�ў."
+
+#. TRANS: Server exception.
+msgid "No single user defined for single-user mode."
+msgstr "�е вызначаны кары�тальнік дл� р�жыму аднаго кары�тальніка."
+
+#. TRANS: Server exception.
+msgid "Single-user mode code called when not enabled."
+msgstr "Выкліканы р�жым аднаго кары�тальніка, калі не ўключаны."
+
+#. TRANS: Information on password recovery form if no known username or e-mail address was specified.
+msgid "No user with that email address or username."
+msgstr "��ма кары�тальнікаў з такім адра�ам �лектроннай пошты ці іменем."
+
+#. TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.
+msgid "No registered email address for that user."
+msgstr ""
+"��ма зар�гі�траваных адра�оў �лектроннай пошты дл� г�тага кары�тальніка."
+
+#. TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.
+msgid "Error saving address confirmation."
+msgstr "Памылка захаваньн� пацьверджаньн� адра�у."
+
+#. TRANS: Server exception thrown when creating a group failed.
+msgid "Could not create group."
+msgstr "�емагчыма �тварыць групу."
+
+#. TRANS: Server exception thrown when updating a group URI failed.
+msgid "Could not set group URI."
+msgstr "�емагчыма ў�танавіць URI групы."
+
+#. TRANS: Server exception thrown when setting group membership failed.
+msgid "Could not set group membership."
+msgstr "�емагчыма ў�танавіць удзел у групе."
+
+#. TRANS: Server exception thrown when saving local group information failed.
+msgid "Could not save local group info."
+msgstr "�емагчыма захаваць інфармацыю пра л�кальную групу."
+
+#. TRANS: Exception thrown when an account could not be located when it should be moved.
+#. TRANS: %s is the remote site.
+#, php-format
+msgid "Cannot locate account %s."
+msgstr "�емагчыма знай�ьці рахунак %s."
+
+#. TRANS: Exception thrown when a service document could not be located account move.
+#. TRANS: %s is the remote site.
+#, php-format
+msgid "Cannot find XRD for %s."
+msgstr "�емагчыма знай�ьці XRD дл� %s."
+
+#. TRANS: Exception thrown when an account could not be located when it should be moved.
+#. TRANS: %s is the remote site.
+#, php-format
+msgid "No AtomPub API service for %s."
+msgstr "��ма ��рві�у AtomPub API дл� %s."
+
+#. TRANS: H2 for user actions in a profile.
+#. TRANS: H2 for entity actions in a profile.
+msgid "User actions"
+msgstr "Дзе�ньні кары�тальніка"
+
+#. TRANS: Text shown in user profile of not yet compeltely deleted users.
+msgid "User deletion in progress..."
+msgstr "Ідзе выдаленьне кары�тальніка…"
+
+#. TRANS: Link title for link on user profile.
+msgid "Edit profile settings."
+msgstr "Р�дагаваць налады профілю."
+
+#. TRANS: Link text for link on user profile.
+msgctxt "BUTTON"
+msgid "Edit"
+msgstr "Р�дагаваць"
+
+#. TRANS: Link title for link on user profile.
+msgid "Send a direct message to this user."
+msgstr "Да�лаць непа�р�днае паведамленьне г�таму кары�тальніку"
+
+#. TRANS: Link text for link on user profile.
+msgctxt "BUTTON"
+msgid "Message"
+msgstr "Паведамленьне"
+
+#. TRANS: Label text on user profile to select a user role.
+msgid "Moderate"
+msgstr "Мар�рацы�"
+
+#. TRANS: Label text on user profile to select a user role.
+msgid "User role"
+msgstr "Рол� кары�тальніка"
+
+#. TRANS: Role that can be set for a user profile.
+msgctxt "role"
+msgid "Administrator"
+msgstr "�дміні�тратар"
+
+#. TRANS: Role that can be set for a user profile.
+msgctxt "role"
+msgid "Moderator"
+msgstr "Мад�ратар"
+
+#. TRANS: Page title. %1$s is the title, %2$s is the site name.
+#, php-format
+msgid "%1$s - %2$s"
+msgstr "%1$s — %2$s"
+
+#. TRANS: Page title for a page without a title set.
+msgid "Untitled page"
+msgstr "Старонка б�з назвы"
+
+#. TRANS: Localized tooltip for '...' expansion button on overlong remote messages.
+msgctxt "TOOLTIP"
+msgid "Show more"
+msgstr "Паказаць болей"
+
+#. TRANS: Inline reply form submit button: submits a reply comment.
+msgctxt "BUTTON"
+msgid "Reply"
+msgstr "�дказаць"
+
+#. TRANS: Placeholder text for inline reply form. Clicking in this box will turn it into a mini notice form.
+#. TRANS: Field label for reply mini form.
+msgid "Write a reply..."
+msgstr "�апі�аць адказ…"
+
+#. TRANS: Tab on the notice form.
+msgctxt "TAB"
+msgid "Status"
+msgstr "Стату�"
+
+#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
+#. TRANS: Text between [] is a link description, text between () is the link itself.
+#. TRANS: Make sure there is no whitespace between "]" and "(".
+#. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
+#, php-format
+msgid ""
+"**%%site.name%%** is a microblogging service brought to you by [%%site."
+"broughtby%%](%%site.broughtbyurl%%)."
+msgstr ""
+"**%%site.name%%** — ��рві� мікраблёгінгу, прад�таўлена� Вам [%%site.broughtby"
+"%%](%%site.broughtbyurl%%)."
+
+#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
+#, php-format
+msgid "**%%site.name%%** is a microblogging service."
+msgstr "**%%site.name%%** — ��рві� мікраблёгінгу."
+
+#. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license.
+#. TRANS: Make sure there is no whitespace between "]" and "(".
+#. TRANS: Text between [] is a link description, text between () is the link itself.
+#. TRANS: %s is the version of StatusNet that is being used.
+#, php-format
+msgid ""
+"It runs the [StatusNet](http://status.net/) microblogging software, version %"
+"s, available under the [GNU Affero General Public License](http://www.fsf."
+"org/licensing/licenses/agpl-3.0.html)."
+msgstr ""
+"�н дзейнічае пры дапамозе праграмнага забе�ьп�ч�ньн� мікраблёгінгу "
+"[StatusNet](http://status.net/), в�р�іі %s, да�тупнага на ўмовах ліц�нзіі "
+"[GNU Affero General Public](http://www.fsf.org/licensing/licenses/agpl-3.0."
+"html)."
+
+#. TRANS: Content license displayed when license is set to 'private'.
+#. TRANS: %1$s is the site name.
+#, php-format
+msgid "Content and data of %1$s are private and confidential."
+msgstr "Зьме�т і зьве�ткі %1$s зь�ўл�юцца прыватнымі і канфід�нцы�льнымі."
+
+#. TRANS: Content license displayed when license is set to 'allrightsreserved'.
+#. TRANS: %1$s is the copyright owner.
+#, php-format
+msgid "Content and data copyright by %1$s. All rights reserved."
+msgstr ""
+"�ўтар�кі� правы на зьме�т і зьве�ткі належаць %1$s. У�е правы абаронены�."
+
+#. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
+msgid "Content and data copyright by contributors. All rights reserved."
+msgstr ""
+"�ўтар�кі� правы на зьме�т і зьве�ткі належаць ра�працоўшчыкам. У�е правы "
+"абаронены�."
+
+#. TRANS: license message in footer.
+#. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
+#, php-format
+msgid "All %1$s content and data are available under the %2$s license."
+msgstr "Уве�ь зьме�т і зьве�ткі %1$s да�тупны� на ўмовах ліц�нзіі %2$s."
+
+#. TRANS: Pagination message to go to a page displaying information more in the
+#. TRANS: present than the currently displayed information.
+msgid "After"
+msgstr "�а�тупна�"
+
+#. TRANS: Pagination message to go to a page displaying information more in the
+#. TRANS: past than the currently displayed information.
+msgid "Before"
+msgstr "Пап�р�дн��"
+
+#. TRANS: Client exception thrown when a feed instance is a DOMDocument.
+msgid "Expecting a root feed element but got a whole XML document."
+msgstr "Чакаў�� кар�нны �лем�нт �тужкі, а атрыманы ўве�ь XML-дакум�нт."
+
+#. TRANS: Client exception thrown when using an unknown verb for the activity importer.
+#, php-format
+msgid "Unknown verb: \"%s\"."
+msgstr "�ев�дома� каманда: «%s»."
+
+#. TRANS: Client exception thrown when trying to force a subscription for an untrusted user.
+msgid "Cannot force subscription for untrusted user."
+msgstr "Прыму�ова� падпі�ка дл� ненадзейных удзельнікаў немагчыма�."
+
+#. TRANS: Client exception thrown when trying to force a remote user to subscribe.
+msgid "Cannot force remote user to subscribe."
+msgstr "Прыму�ова� падпі�ка дл� выдаленых удзельнікаў немагчыма�."
+
+#. TRANS: Client exception thrown when trying to subscribe to an unknown profile.
+msgid "Unknown profile."
+msgstr "�ев�домы профіль."
+
+#. TRANS: Client exception thrown when trying to import an event not related to the importing user.
+msgid "This activity seems unrelated to our user."
+msgstr "Г�ты� дзе�ньні, здаецца, н� зьв�зана� з нашым кары�тальнікам."
+
+#. TRANS: Client exception thrown when trying to join a remote group that is not a group.
+msgid "Remote profile is not a group!"
+msgstr "�ддалены профіль не зь�ўл�ецца групай!"
+
+#. TRANS: Client exception thrown when trying to join a group the importing user is already a member of.
+msgid "User is already a member of this group."
+msgstr "Кары�тальнік ўжо зь�ўл�ецца ўдзельнікам г�тай групы."
+
+#. TRANS: Client exception thrown when trying to import a notice by another user.
+#. TRANS: %1$s is the source URI of the notice, %2$s is the URI of the author.
+#, php-format
+msgid "Already know about notice %1$s and  it has a different author %2$s."
+msgstr "Запі� %1$s ужо в�домы і мае іншага аўтара %2$s."
+
+#. TRANS: Client exception thrown when trying to overwrite the author information for a non-trusted user during import.
+msgid "Not overwriting author info for non-trusted user."
+msgstr ""
+"�емагчыма перазапі�аць аўтар�кую інфармацыю пра ненадзейнага кары�тальніка."
+
+#. TRANS: Client exception thrown when trying to import a notice without content.
+#. TRANS: %s is the notice URI.
+#, php-format
+msgid "No content for notice %s."
+msgstr "��ма зьме�ту дл� запі�у %s."
+
+#. TRANS: Exception thrown if a non-existing user is provided. %s is a user ID.
+#, php-format
+msgid "No such user \"%s\"."
+msgstr "��ма такога ўдзельніка «%s»."
+
+#. TRANS: Client exception thrown when post to collection fails with a 400 status.
+#. TRANS: %1$s is a URL, %2$s is the status, %s$s is the fail reason.
+#. TRANS: Server exception thrown when post to collection fails with a 500 status.
+#. TRANS: %1$s is a URL, %2$s is the status, %s$s is the fail reason.
+#. TRANS: Exception thrown when post to collection fails with a status that is not handled.
+#. TRANS: %1$s is a URL, %2$s is the status, %s$s is the fail reason.
+#, php-format
+msgctxt "URLSTATUSREASON"
+msgid "%1$s %2$s %3$s"
+msgstr "%1$s %2$s %3$s"
+
+#. TRANS: Client exception thrown when there is no source attribute.
+msgid "Can't handle remote content yet."
+msgstr "Пакуль �шч� немагчыма апрацоўваць аддалены зьме�т."
+
+#. TRANS: Client exception thrown when there embedded XML content is found that cannot be processed yet.
+msgid "Can't handle embedded XML content yet."
+msgstr "Пакуль �шч� немагчыма апрацоўваць убудаваны XML-зьме�т."
+
+#. TRANS: Client exception thrown when base64 encoded content is found that cannot be processed yet.
+msgid "Can't handle embedded Base64 content yet."
+msgstr "Пакуль �шч� немагчыма апрацоўваць убудаваны зьме�т Base64."
+
+#. TRANS: Client error message thrown when a user tries to change admin settings but has no access rights.
+msgid "You cannot make changes to this site."
+msgstr "Вы н� можаце зьм�н�ць г�ты �айт."
+
+#. TRANS: Client error message throw when a certain panel's settings cannot be changed.
+msgid "Changes to that panel are not allowed."
+msgstr "Зьмены дл� г�тай пан�лі не дазволены�."
+
+#. TRANS: Client error message.
+msgid "showForm() not implemented."
+msgstr "showForm() не р�алізавана�."
+
+#. TRANS: Client error message
+msgid "saveSettings() not implemented."
+msgstr "saveSettings() не р�алізавана�."
+
+#. TRANS: Header in administrator navigation panel.
+msgctxt "HEADER"
+msgid "Home"
+msgstr "Галоўна� �таронка"
+
+#. TRANS: Header in administrator navigation panel.
+msgctxt "HEADER"
+msgid "Admin"
+msgstr "�дміні�тратар"
+
+#. TRANS: Menu item title in administrator navigation panel.
+msgid "Basic site configuration"
+msgstr "��ноўна� канфігурацы� �айта"
+
+#. TRANS: Menu item in administrator navigation panel.
+msgctxt "MENU"
+msgid "Site"
+msgstr "Сайт"
+
+#. TRANS: Menu item title in administrator navigation panel.
+msgid "User configuration"
+msgstr "Канфігурацы� кары�тальніка"
+
+#. TRANS: Menu item in administrator navigation panel.
+msgctxt "MENU"
+msgid "User"
+msgstr "Кары�тальнік"
+
+#. TRANS: Menu item title in administrator navigation panel.
+msgid "Access configuration"
+msgstr "Канфігурацы� до�тупу"
+
+#. TRANS: Menu item in administrator navigation panel.
+msgctxt "MENU"
+msgid "Access"
+msgstr "До�туп"
+
+#. TRANS: Menu item title in administrator navigation panel.
+msgid "Paths configuration"
+msgstr "Канфігурацы� шл�хоў"
+
+#. TRANS: Menu item in administrator navigation panel.
+msgctxt "MENU"
+msgid "Paths"
+msgstr "Шл�хі"
+
+#. TRANS: Menu item title in administrator navigation panel.
+msgid "Sessions configuration"
+msgstr "Канфігурацы� ���і�ў"
+
+#. TRANS: Menu item in administrator navigation panel.
+msgctxt "MENU"
+msgid "Sessions"
+msgstr "С��іі"
+
+#. TRANS: Menu item title in administrator navigation panel.
+msgid "Edit site notice"
+msgstr "Р�дагаваць паведамленьне �айту"
+
+#. TRANS: Menu item in administrator navigation panel.
+msgctxt "MENU"
+msgid "Site notice"
+msgstr "Паведамленьне �айта"
+
+#. TRANS: Menu item title in administrator navigation panel.
+msgid "Snapshots configuration"
+msgstr "Канфігурацы� здымкаў"
+
+#. TRANS: Menu item in administrator navigation panel.
+msgctxt "MENU"
+msgid "Snapshots"
+msgstr "Здымкі"
+
+#. TRANS: Menu item title in administrator navigation panel.
+msgid "Set site license"
+msgstr "У�танавіць ліц�нзію �айта"
+
+#. TRANS: Menu item in administrator navigation panel.
+msgctxt "MENU"
+msgid "License"
+msgstr "Ліц�нзі�"
+
+#. TRANS: Menu item title in administrator navigation panel.
+msgid "Plugins configuration"
+msgstr "Канфігурацы� дапаўненьн�ў"
+
+#. TRANS: Menu item in administrator navigation panel.
+msgctxt "MENU"
+msgid "Plugins"
+msgstr "Дапаўненьні"
+
+#. TRANS: Client error 401.
+msgid "API resource requires read-write access, but you only have read access."
+msgstr ""
+"API патрабуе до�туп дл� чытаньн� і запі�у, але Вы маеце толькі до�туп дл� "
+"чытаньн�."
+
+#. TRANS: OAuth exception thrown when no application is found for a given consumer key.
+msgid "No application for that consumer key."
+msgstr "��ма да�та�аваньн� да г�тага �пажывецкага ключа."
+
+#. TRANS: Authorization exception thrown when a user without API access tries to access the API.
+msgid "Not allowed to use API."
+msgstr "�е дазволена выкары�тоўваць API."
+
+#. TRANS: OAuth exception given when an incorrect access token was given for a user.
+msgid "Bad access token."
+msgstr "���лушны ключ до�тупу."
+
+#. TRANS: OAuth exception given when no user was found for a given token (no token was found).
+msgid "No user for that token."
+msgstr "��ма кары�тальніка дл� г�тага ключа."
+
+#. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel".
+#. TRANS: Client error thrown when authentication fails.
+msgid "Could not authenticate you."
+msgstr "�емагчыма Ва� аўт�нтыфікаваць."
+
+#. TRANS: Form input field label for application icon.
+msgid "Icon"
+msgstr "Міні�тура"
+
+#. TRANS: Form guide.
+msgid "Icon for this application"
+msgstr "Міні�тура дл� г�тага да�та�аваньн�"
+
+#. TRANS: Form input field label for application name.
+msgid "Name"
+msgstr "�азва"
+
+#. TRANS: Form input field instructions.
+#. TRANS: %d is the number of available characters for the description.
+#, php-format
+msgid "Describe your application in %d character"
+msgid_plural "Describe your application in %d characters"
+msgstr[0] "�пішыце Вашае да�та�аваньне %d �ымбалем"
+msgstr[1] "�пішыце Вашае да�та�аваньне %d �ымбал�мі"
+
+#. TRANS: Form input field instructions.
+msgid "Describe your application"
+msgstr "�пішыце Вашае да�та�аваньне"
+
+#. TRANS: Form input field label.
+#. TRANS: Text area label on group edit form; contains description of group.
+#. TRANS: Field label for description of list.
+#. TRANS: Dropdown option for searching in profiles.
+msgid "Description"
+msgstr "�пі�аньне"
+
+#. TRANS: Form input field instructions.
+msgid "URL of the homepage of this application"
+msgstr "URL-адра� хатн�й �таронкі г�тага да�та�аваньн�"
+
+#. TRANS: Form input field label.
+msgid "Source URL"
+msgstr "URL-адра� крыніцы"
+
+#. TRANS: Form input field instructions.
+msgid "Organization responsible for this application"
+msgstr "�рганізацы� адказна� за г�тае да�та�аваньне"
+
+#. TRANS: Form input field label.
+msgid "Organization"
+msgstr "�рганізацы�"
+
+#. TRANS: Form input field instructions.
+msgid "URL for the homepage of the organization"
+msgstr "URL-адра� хатн�й �таронкі арганізацыі"
+
+#. TRANS: Form input field instructions.
+msgid "URL to redirect to after authentication"
+msgstr "URL-адра� дл� перанакіраваньн� па�ьл� аўт�нтыфікацыі"
+
+#. TRANS: Radio button label for application type
+msgid "Browser"
+msgstr "Браўз�р"
+
+#. TRANS: Radio button label for application type
+msgid "Desktop"
+msgstr "Працоўны �тол"
+
+#. TRANS: Form guide.
+msgid "Type of application, browser or desktop"
+msgstr "Тып да�та�аваньн�, браўз�р ці ап�рацыйна� �ы�т�ма"
+
+#. TRANS: Radio button label for access type.
+msgid "Read-only"
+msgstr "Толькі чытаньне"
+
+#. TRANS: Radio button label for access type.
+msgid "Read-write"
+msgstr "Чытаньне і запі�"
+
+#. TRANS: Form guide.
+msgid "Default access for this application: read-only, or read-write"
+msgstr ""
+"До�туп па змоўчваньні дл� г�тага да�та�аваньн�: толькі чытаньне ці чытаньне "
+"і запі�"
+
+#. TRANS: Submit button title.
+msgid "Cancel application changes."
+msgstr "Ска�аваць зьмены да�та�аваньн�."
+
+#. TRANS: Submit button title.
+msgid "Save application changes."
+msgstr "Захаваць зьмены да�та�аваньн�."
+
+#. TRANS: Name for an anonymous application in application list.
+msgid "Unknown application"
+msgstr "�ев�домае да�та�аваньне"
+
+#. TRANS: Message has a leading space and a trailing space. Used in application list.
+#. TRANS: Before this message the application name is put, behind it the organisation that manages it.
+msgid " by "
+msgstr " ад "
+
+#. TRANS: Application access type
+msgid "read-write"
+msgstr "чытаньне і запі�"
+
+#. TRANS: Application access type
+msgid "read-only"
+msgstr "толькі чытаньне"
+
+#. TRANS: Used in application list. %1$s is a modified date, %2$s is access type ("read-write" or "read-only")
+#, php-format
+msgid "Approved %1$s - \"%2$s\" access."
+msgstr "Пацьверджаны до�туп %1$s — «%2$s»."
+
+#. TRANS: Access token in the application list.
+#. TRANS: %s are the first 7 characters of the access token.
+#, php-format
+msgid "Access token starting with: %s"
+msgstr "Ключ до�тупу пачынаецца з: %s"
+
+#. TRANS: Button label in application list to revoke access to user data.
+msgctxt "BUTTON"
+msgid "Revoke"
+msgstr "�дклікаць"
+
+#. TRANS: Submit button text to accept a group membership request on approve group form.
+#. TRANS: Submit button text to accept a subscription request on approve sub form.
+msgctxt "BUTTON"
+msgid "Accept"
+msgstr "Прын�ць"
+
+#. TRANS: Submit button text to reject a group membership request on approve group form.
+#. TRANS: Submit button text to reject a subscription request on approve sub form.
+msgctxt "BUTTON"
+msgid "Reject"
+msgstr "�дмовіцца"
+
+#. TRANS: Atom feed exception thrown when an author element does not contain a name element.
+msgid "Author element must contain a name element."
+msgstr "Элем�нт «author» павінен утрымліваць �лем�нт «name»."
+
+#. TRANS: Server exception thrown when using the method setActivitySubject() in the class Atom10Feed.
+msgid "Do not use this method!"
+msgstr "�е выкары�тоўвайце г�ты м�тад!"
+
+#. TRANS: Title in atom list notice feed. %1$s is a list name, %2$s is a tagger's nickname.
+#, php-format
+msgid "Timeline for people in list %1$s by %2$s"
+msgstr "Лента запі�аў дл� людзей �а �ьпі�у %1$s кары�тальніка %2$s"
+
+#. TRANS: Message is used as a subtitle in atom list notice feed.
+#. TRANS: %1$s is a tagger's nickname, %2$s is a list name, %3$s is a site name.
+#, php-format
+msgid "Updates from %1$s's list %2$s on %3$s!"
+msgstr "�бнаўленьні �ьпі�у %2$s кары�тальніка %1$s на %3$s!"
+
+#. TRANS: Title.
+msgid "Notices where this attachment appears"
+msgstr "Паведамленьні, дзе зь�ўл�ецца г�тае далуч�ньне"
+
+#. TRANS: Title.
+msgid "Tags for this attachment"
+msgstr "Т�гі дл� г�тага далуч�ньн�"
+
+#. TRANS: Exception thrown when a password change fails.
+msgid "Password changing failed."
+msgstr "�емагчыма зьм�ніць пароль."
+
+#. TRANS: Exception thrown when a password change attempt fails because it is not allowed.
+msgid "Password changing is not allowed."
+msgstr "Зьмена паролю не дазволена�."
+
+#. TRANS: Title for the form to block a user.
+msgid "Block"
+msgstr "Забл�каваць"
+
+#. TRANS: Description of the form to block a user.
+msgid "Block this user"
+msgstr "Забл�каваць г�тага кары�тальніка"
+
+#. TRANS: Submit button text on form to cancel group join request.
+msgctxt "BUTTON"
+msgid "Cancel join request"
+msgstr "Ска�аваць запыт да далуч�ньне"
+
+#. TRANS: Button text for form action to cancel a subscription request.
+msgctxt "BUTTON"
+msgid "Cancel subscription request"
+msgstr "Ска�аваць запыт на падпі�ку"
+
+#. TRANS: Title for command results.
+msgid "Command results"
+msgstr "Вынікі каманды"
+
+#. TRANS: Title for command results.
+msgid "AJAX error"
+msgstr "Памылка AJAX"
+
+#. TRANS: E-mail subject when a command has completed.
+#. TRANS: E-mail subject for reply to an e-mail command.
+msgid "Command complete"
+msgstr "Каманда выканана�"
+
+#. TRANS: E-mail subject when a command has failed.
+msgid "Command failed"
+msgstr "Каманда н� выканана�"
+
+#. TRANS: Command exception text shown when a notice ID is requested that does not exist.
+msgid "Notice with that id does not exist."
+msgstr "Запі� з такім ід�нтыфікатарам не і�нуе."
+
+#. TRANS: Command exception text shown when a last user notice is requested and it does not exist.
+#. TRANS: Error text shown when a last user notice is requested and it does not exist.
+msgid "User has no last notice."
+msgstr "Кары�тальнік н� мае апошн�га запі�у."
+
+#. TRANS: Message given requesting a profile for a non-existing user.
+#. TRANS: %s is the nickname of the user for which the profile could not be found.
+#, php-format
+msgid "Could not find a user with nickname %s."
+msgstr "�емагчыма знай�ьці кары�тальніка з іменем %s."
+
+#. TRANS: Message given getting a non-existing user.
+#. TRANS: %s is the nickname of the user that could not be found.
+#, php-format
+msgid "Could not find a local user with nickname %s."
+msgstr "�емагчыма знай�ьці л�кальнага кары�тальніка з іменем %s."
+
+#. TRANS: Error text shown when an unimplemented command is given.
+msgid "Sorry, this command is not yet implemented."
+msgstr "Прабачце, функцы�нальна�ьць г�тай каманды �шч� н� �творана�."
+
+#. TRANS: Command exception text shown when a user tries to nudge themselves.
+msgid "It does not make a lot of sense to nudge yourself!"
+msgstr "��ма ��н�у падштурхоўваць �амога ��бе!"
+
+#. TRANS: Message given having nudged another user.
+#. TRANS: %s is the nickname of the user that was nudged.
+#, php-format
+msgid "Nudge sent to %s."
+msgstr "Штуршок да�ланы %s."
+
+#. TRANS: User statistics text.
+#. TRANS: %1$s is the number of other user the user is subscribed to.
+#. TRANS: %2$s is the number of users that are subscribed to the user.
+#. TRANS: %3$s is the number of notices the user has sent.
+#, php-format
+msgid ""
+"Subscriptions: %1$s\n"
+"Subscribers: %2$s\n"
+"Notices: %3$s"
+msgstr ""
+"Падпі�аны: %1$s\n"
+"Падпі�аных: %2$s\n"
+"Запі�аў: %3$s"
+
+#. TRANS: Error message text shown when a favorite could not be set because it has already been favorited.
+msgid "Could not create favorite: Already favorited."
+msgstr "�емагчыма дадаць да ўлюблёных: ужо да іх адно�іцца."
+
+#. TRANS: Text shown when a notice has been marked as favourite successfully.
+msgid "Notice marked as fave."
+msgstr "Запі� пазначаны �к улюблёны."
+
+#. TRANS: Message given having added a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#, php-format
+msgid "%1$s joined group %2$s."
+msgstr "%1$s далучыў�� да групы %2$s."
+
+#. TRANS: Message given having removed a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#, php-format
+msgid "%1$s left group %2$s."
+msgstr "%1$s пакінуў групу %2$s"
+
+#. TRANS: Error displayed if tagging a user fails.
+#. TRANS: %1$s is the tagged user, %2$s is the error message (no punctuation).
+#, php-format
+msgid "Error tagging %1$s: %2$s"
+msgstr "�емагчыма дадаць т�г %1$s: %2$s"
+
+#. TRANS: Succes message displayed if tagging a user succeeds.
+#. TRANS: %1$s is the tagged user's nickname, %2$s is a list of tags.
+#. TRANS: Plural is decided based on the number of tags added (not part of message).
+#, php-format
+msgid "%1$s was tagged %2$s"
+msgid_plural "%1$s was tagged %2$s"
+msgstr[0] "%1$s дадаў т�г %2$s"
+msgstr[1] "%1$s дадаў т�гі %2$s"
+
+#. TRANS: Separator for list of tags.
+#. TRANS: Separator in list of user names like "Jim, Bob, Mary".
+msgid ", "
+msgstr ", "
+
+#. TRANS: Error displayed if a given tag is invalid.
+#. TRANS: %s is the invalid tag.
+#, php-format
+msgid "Invalid tag: \"%s\""
+msgstr "���лушны т�г: «%s»"
+
+#. TRANS: Error displayed if untagging a user fails.
+#. TRANS: %1$s is the untagged user, %2$s is the error message (no punctuation).
+#, php-format
+msgid "Error untagging %1$s: %2$s"
+msgstr "�емагчыма выдаліць т�г %1$s: %2$s"
+
+#. TRANS: Succes message displayed if untagging a user succeeds.
+#. TRANS: %1$s is the untagged user's nickname, %2$s is a list of tags.
+#. TRANS: Plural is decided based on the number of tags removed (not part of message).
+#, php-format
+msgid "The following tag was removed from user %1$s: %2$s."
+msgid_plural "The following tags were removed from user %1$s: %2$s."
+msgstr[0] "�а�тупны т�г быў выдалены з кары�тальніка %1$s: %2$s."
+msgstr[1] "�а�тупны� т�гі былі выдалены з кары�тальніка %1$s: %2$s."
+
+#. TRANS: Whois output.
+#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
+#, php-format
+msgctxt "WHOIS"
+msgid "%1$s (%2$s)"
+msgstr "%1$s (%2$s)"
+
+#. TRANS: Whois output. %s is the full name of the queried user.
+#, php-format
+msgid "Fullname: %s"
+msgstr "Поўнае ім�: %s"
+
+#. TRANS: Whois output. %s is the location of the queried user.
+#. TRANS: Profile info line in notification e-mail.
+#. TRANS: %s is a location.
+#, php-format
+msgid "Location: %s"
+msgstr "Ме�цазнаходжаньне: %s"
+
+#. TRANS: Whois output. %s is the homepage of the queried user.
+#. TRANS: Profile info line in notification e-mail.
+#. TRANS: %s is a homepage.
+#, php-format
+msgid "Homepage: %s"
+msgstr "Хатн�� �таронка: %s"
+
+#. TRANS: Whois output. %s is the bio information of the queried user.
+#, php-format
+msgid "About: %s"
+msgstr "Пра: %s"
+
+#. TRANS: Command exception text shown when trying to send a direct message to a remote user (a user not registered at the current server).
+#. TRANS: %s is a remote profile.
+#, php-format
+msgid ""
+"%s is a remote profile; you can only send direct messages to users on the "
+"same server."
+msgstr ""
+"%s г�та аддалены профіль; Вы можаце толькі да�лаць прамое паведамленьне "
+"ўдзельнікам на тым за �амым ��рв�ры."
+
+#. TRANS: Message given if content is too long. %1$sd is used for plural.
+#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
+#. TRANS: Message given when a status is too long. %1$s is the maximum number of characters,
+#. TRANS: %2$s is the number of characters sent (used for plural).
+#, php-format
+msgid "Message too long - maximum is %1$d character, you sent %2$d."
+msgid_plural "Message too long - maximum is %1$d characters, you sent %2$d."
+msgstr[0] ""
+"Паведамленьне занадта в�лікае - мак�ымум %1$d �ымбаль, Вы да�лалі %2$d."
+msgstr[1] ""
+"Паведамленьне занадта в�лікае - мак�ымум %1$d �ымбалі, Вы да�лалі %2$d."
+
+#. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
+msgid "You can't send a message to this user."
+msgstr "Вы н� можаце да�ылаць паведамленьні г�таму кары�тальніку."
+
+#. TRANS: Error text shown sending a direct message fails with an unknown reason.
+msgid "Error sending direct message."
+msgstr "Памылка адпраўкі прамога паведамленьн�."
+
+#. TRANS: Message given having repeated a notice from another user.
+#. TRANS: %s is the name of the user for which the notice was repeated.
+#, php-format
+msgid "Notice from %s repeated."
+msgstr "Запі� з %s паўтораны."
+
+#. TRANS: Message given if content of a notice for a reply is too long. %1$d is used for plural.
+#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
+#, php-format
+msgid "Notice too long - maximum is %1$d character, you sent %2$d."
+msgid_plural "Notice too long - maximum is %1$d characters, you sent %2$d."
+msgstr[0] "Запі� занадта в�лікі - мак�ымум %1$d �ымбаль, Вы да�лалі %2$d."
+msgstr[1] "Запі� занадта в�лікі - мак�ымум %1$d �ымбалі, Вы да�лалі %2$d."
+
+#. TRANS: Text shown having sent a reply to a notice successfully.
+#. TRANS: %s is the nickname of the user of the notice the reply was sent to.
+#, php-format
+msgid "Reply to %s sent."
+msgstr "�дказ %s да�ланы."
+
+#. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
+msgid "Error saving notice."
+msgstr "Памылка захаваньн� запі�у."
+
+#. TRANS: Error text shown when no username was provided when issuing a subscribe command.
+msgid "Specify the name of the user to subscribe to."
+msgstr "Пазначце ім� ўдзельніка дл� падпі�кі."
+
+#. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
+msgid "Can't subscribe to OMB profiles by command."
+msgstr "�емагчыма падпі�ацца камандай на OMB-профілі."
+
+#. TRANS: Text shown after having subscribed to another user successfully.
+#. TRANS: %s is the name of the user the subscription was requested for.
+#, php-format
+msgid "Subscribed to %s."
+msgstr "Падпі�аны на %s."
+
+#. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
+#. TRANS: Error text shown when no username was provided when issuing the command.
+msgid "Specify the name of the user to unsubscribe from."
+msgstr "Пазначце ім� ўдзельніка дл� адпі�кі."
+
+#. TRANS: Text shown after having unsubscribed from another user successfully.
+#. TRANS: %s is the name of the user the unsubscription was requested for.
+#, php-format
+msgid "Unsubscribed from %s."
+msgstr "�дпі�аны ад %s."
+
+#. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
+#. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
+msgid "Command not yet implemented."
+msgstr "Каманда �шч� н� выканана�."
+
+#. TRANS: Text shown when issuing the command "off" successfully.
+msgid "Notification off."
+msgstr "�бв�шч�ньне адключанае."
+
+#. TRANS: Error text shown when the command "off" fails for an unknown reason.
+msgid "Can't turn off notification."
+msgstr "�е магчыма адключыць абв�шч�ньне."
+
+#. TRANS: Text shown when issuing the command "on" successfully.
+msgid "Notification on."
+msgstr "�бв�шч�ньне ўключанае."
+
+#. TRANS: Error text shown when the command "on" fails for an unknown reason.
+msgid "Can't turn on notification."
+msgstr "�е магчыма ўключыць абв�шч�ньне."
+
+#. TRANS: Error text shown when issuing the login command while login is disabled.
+msgid "Login command is disabled."
+msgstr "Каманда ўваходу ў �ы�т�му адключана�."
+
+#. TRANS: Text shown after issuing the login command successfully.
+#. TRANS: %s is a logon link..
+#, php-format
+msgid "This link is useable only once and is valid for only 2 minutes: %s."
+msgstr ""
+"Г�тую �па�ылку можна выкары�таць толькі адзін раз і �на дзейна� толькі 2 "
+"хвіліны: %s."
+
+#. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
+#. TRANS: %s is the name of the user the unsubscription was requested for.
+#, php-format
+msgid "Unsubscribed %s."
+msgstr "Падпа�ка %s �ка�авана�."
+
+#. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
+msgid "You are not subscribed to anyone."
+msgstr "Вы не падпі�аны ні на нікога."
+
+#. TRANS: Text shown after requesting other users a user is subscribed to.
+#. TRANS: This message supports plural forms. This message is followed by a
+#. TRANS: hard coded space and a comma separated list of subscribed users.
+msgid "You are subscribed to this person:"
+msgid_plural "You are subscribed to these people:"
+msgstr[0] "Вы падпі�аны на г�тага чалавека:"
+msgstr[1] "Вы падпі�аны на г�тых людзей:"
+
+#. TRANS: Text shown after requesting other users that are subscribed to a user
+#. TRANS: (followers) without having any subscribers.
+msgid "No one is subscribed to you."
+msgstr "�іхто на Ва� не падпі�аны."
+
+#. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
+#. TRANS: This message supports plural forms. This message is followed by a
+#. TRANS: hard coded space and a comma separated list of subscribing users.
+msgid "This person is subscribed to you:"
+msgid_plural "These people are subscribed to you:"
+msgstr[0] ""
+msgstr[1] ""
+
+#. TRANS: Text shown after requesting groups a user is subscribed to without having
+#. TRANS: any group subscriptions.
+msgid "You are not a member of any groups."
+msgstr ""
+
+#. TRANS: Text shown after requesting groups a user is subscribed to.
+#. TRANS: This message supports plural forms. This message is followed by a
+#. TRANS: hard coded space and a comma separated list of subscribed groups.
+msgid "You are a member of this group:"
+msgid_plural "You are a member of these groups:"
+msgstr[0] ""
+msgstr[1] ""
+
+#. TRANS: Header line of help text for commands.
+msgctxt "COMMANDHELP"
+msgid "Commands:"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "on".
+msgctxt "COMMANDHELP"
+msgid "turn on notifications"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "off".
+msgctxt "COMMANDHELP"
+msgid "turn off notifications"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "help".
+msgctxt "COMMANDHELP"
+msgid "show this help"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "follow <nickname>".
+msgctxt "COMMANDHELP"
+msgid "subscribe to user"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "groups".
+msgctxt "COMMANDHELP"
+msgid "lists the groups you have joined"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "tag".
+msgctxt "COMMANDHELP"
+msgid "tag a user"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "untag".
+msgctxt "COMMANDHELP"
+msgid "untag a user"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "subscriptions".
+msgctxt "COMMANDHELP"
+msgid "list the people you follow"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "subscribers".
+msgctxt "COMMANDHELP"
+msgid "list the people that follow you"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "leave <nickname>".
+msgctxt "COMMANDHELP"
+msgid "unsubscribe from user"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "d <nickname> <text>".
+msgctxt "COMMANDHELP"
+msgid "direct message to user"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "get <nickname>".
+msgctxt "COMMANDHELP"
+msgid "get last notice from user"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "whois <nickname>".
+msgctxt "COMMANDHELP"
+msgid "get profile info on user"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "lose <nickname>".
+msgctxt "COMMANDHELP"
+msgid "force user to stop following you"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "fav <nickname>".
+msgctxt "COMMANDHELP"
+msgid "add user's last notice as a 'fave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "fav #<notice_id>".
+msgctxt "COMMANDHELP"
+msgid "add notice with the given id as a 'fave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "repeat #<notice_id>".
+msgctxt "COMMANDHELP"
+msgid "repeat a notice with a given id"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "repeat <nickname>".
+msgctxt "COMMANDHELP"
+msgid "repeat the last notice from user"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "reply #<notice_id>".
+msgctxt "COMMANDHELP"
+msgid "reply to notice with a given id"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "reply <nickname>".
+msgctxt "COMMANDHELP"
+msgid "reply to the last notice from user"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "join <group>".
+msgctxt "COMMANDHELP"
+msgid "join group"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "login".
+msgctxt "COMMANDHELP"
+msgid "Get a link to login to the web interface"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "drop <group>".
+msgctxt "COMMANDHELP"
+msgid "leave group"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "stats".
+msgctxt "COMMANDHELP"
+msgid "get your stats"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "stop".
+#. TRANS: Help message for IM/SMS command "quit".
+msgctxt "COMMANDHELP"
+msgid "same as 'off'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "sub <nickname>".
+msgctxt "COMMANDHELP"
+msgid "same as 'follow'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "unsub <nickname>".
+msgctxt "COMMANDHELP"
+msgid "same as 'leave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "last <nickname>".
+msgctxt "COMMANDHELP"
+msgid "same as 'get'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "on <nickname>".
+#. TRANS: Help message for IM/SMS command "off <nickname>".
+#. TRANS: Help message for IM/SMS command "invite <phone number>".
+#. TRANS: Help message for IM/SMS command "track <word>".
+#. TRANS: Help message for IM/SMS command "untrack <word>".
+#. TRANS: Help message for IM/SMS command "track off".
+#. TRANS: Help message for IM/SMS command "untrack all".
+#. TRANS: Help message for IM/SMS command "tracks".
+#. TRANS: Help message for IM/SMS command "tracking".
+msgctxt "COMMANDHELP"
+msgid "not yet implemented."
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "nudge <nickname>".
+msgctxt "COMMANDHELP"
+msgid "remind a user to update."
+msgstr ""
+
+#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
+msgid "No configuration file found."
+msgstr ""
+
+#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
+#. TRANS: Is followed by a list of directories (separated by HTML breaks).
+msgid "I looked for configuration files in the following places:"
+msgstr ""
+
+#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
+msgid "You may wish to run the installer to fix this."
+msgstr ""
+
+#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
+#. TRANS: The text is link text that leads to the installer page.
+msgid "Go to the installer."
+msgstr ""
+
+#. TRANS: Header on conversation page. Hidden by default (h2).
+#. TRANS: Label for user statistics.
+msgid "Notices"
+msgstr "Заўвагі"
+
+#. TRANS: Page title for when a database error occurs.
+msgid "Database error"
+msgstr ""
+
+#. TRANS: Menu item in default local navigation panel.
+#. TRANS: Menu item in search group navigation panel.
+msgctxt "MENU"
+msgid "Public"
+msgstr ""
+
+#. TRANS: Menu item in default local navigation panel.
+#. TRANS: Menu item title in local navigation menu.
+msgctxt "MENU"
+msgid "Lists"
+msgstr ""
+
+#. TRANS: Title of form for deleting a user.
+#. TRANS: Link text in notice list item to delete a notice.
+msgid "Delete"
+msgstr ""
+
+#. TRANS: Description of form for deleting a user.
+msgid "Delete this user"
+msgstr "Выдаліць г�тага кары�тальніка"
+
+#. TRANS: Exception. %s is an ID.
+#, php-format
+msgid "Unable to find services for %s."
+msgstr ""
+
+#. TRANS: Form legend for removing the favourite status for a favourite notice.
+msgid "Disfavor this notice"
+msgstr ""
+
+#. TRANS: Button text for removing the favourite status for a favourite notice.
+msgctxt "BUTTON"
+msgid "Disfavor favorite"
+msgstr ""
+
+#. TRANS: Button title for removing the favourite status for a favourite notice.
+msgid "Remove this notice from your list of favorite notices."
+msgstr ""
+
+#. TRANS: Form legend for adding the favourite status to a notice.
+msgid "Favor this notice"
+msgstr ""
+
+#. TRANS: Button text for adding the favourite status to a notice.
+msgctxt "BUTTON"
+msgid "Favor"
+msgstr ""
+
+#. TRANS: Button title for adding the favourite status to a notice.
+#, fuzzy
+msgid "Add this notice to your list of favorite notices."
+msgstr "Г�тае паведамленьне не зь�ўл�ецца ўлюблёным!"
+
+#. TRANS: Feed type name.
+msgid "RSS 1.0"
+msgstr ""
+
+#. TRANS: Feed type name.
+msgid "RSS 2.0"
+msgstr ""
+
+#. TRANS: Feed type name.
+msgid "Atom"
+msgstr ""
+
+#. TRANS: Feed type name. FOAF stands for Friend of a Friend.
+msgid "FOAF"
+msgstr ""
+
+#. TRANS: Feed type name. See http://activitystrea.ms/
+msgid "Activity Streams"
+msgstr ""
+
+#. TRANS: Client exception thrown when an imported feed does not have an author.
+msgid "No author in the feed."
+msgstr ""
+
+#. TRANS: Client exception thrown when an imported feed does not have an author that
+#. TRANS: can be associated with a user.
+msgid "Cannot import without a user."
+msgstr ""
+
+#. TRANS: Header for feed links (h2).
+msgid "Feeds"
+msgstr ""
+
+#. TRANS: List element on gallery action page to show all tags.
+msgctxt "TAGS"
+msgid "All"
+msgstr ""
+
+#. TRANS: Dropdown field label on gallery action page for a list containing tags.
+msgid "Tag"
+msgstr ""
+
+#. TRANS: Dropdown field title on gallery action page for a list containing tags.
+msgid "Choose a tag to narrow list."
+msgstr ""
+
+#. TRANS: Description on form for granting a role.
+#, php-format
+msgid "Grant this user the \"%s\" role"
+msgstr ""
+
+#. TRANS: Header for mini list of group members on a group page (h2).
+msgid "Members"
+msgstr ""
+
+#. TRANS: Link to all group members from mini list of group members if group has more than n members.
+msgid "All members"
+msgstr ""
+
+#. TRANS: Header for mini list of users with a pending membership request on a group page (h2).
+msgid "Pending"
+msgstr ""
+
+#. TRANS: Header for mini list of users that are blocked in a group page (h2).
+#, fuzzy
+msgid "Blocked"
+msgstr "Забл�каваць кары�тальніка"
+
+#. TRANS: Title for list of group administrators on a group page.
+msgctxt "TITLE"
+msgid "Admins"
+msgstr ""
+
+#. TRANS: Button text for the form that will block a user from a group.
+msgctxt "BUTTON"
+msgid "Block"
+msgstr ""
+
+#. TRANS: Submit button title.
+msgctxt "TOOLTIP"
+msgid "Block this user so that they can no longer post messages to it."
+msgstr ""
+
+#. TRANS: Field title on group edit form.
+msgid "URL of the homepage or blog of the group or topic."
+msgstr ""
+
+#. TRANS: Text area title for group description when there is no text limit.
+msgid "Describe the group or topic."
+msgstr ""
+
+#. TRANS: Text area title for group description.
+#. TRANS: %d is the number of characters available for the description.
+#, php-format
+msgid "Describe the group or topic in %d character or less."
+msgid_plural "Describe the group or topic in %d characters or less."
+msgstr[0] ""
+msgstr[1] ""
+
+#. TRANS: Field title on group edit form.
+msgid ""
+"Location for the group, if any, like \"City, State (or Region), Country\"."
+msgstr ""
+
+#. TRANS: Field label on group edit form.
+msgid "Aliases"
+msgstr ""
+
+#. TRANS: Input field title for group aliases.
+#. TRANS: %d is the maximum number of group aliases available.
+#, php-format
+msgid ""
+"Extra nicknames for the group, separated with commas or spaces. Maximum %d "
+"alias allowed."
+msgid_plural ""
+"Extra nicknames for the group, separated with commas or spaces. Maximum %d "
+"aliases allowed."
+msgstr[0] ""
+msgstr[1] ""
+
+#. TRANS: Checkbox field title on group edit form to mark a group private.
+msgid ""
+"New members must be approved by admin and all posts are forced to be private."
+msgstr ""
+
+#. TRANS: Indicator in group members list that this user is a group administrator.
+msgctxt "GROUPADMIN"
+msgid "Admin"
+msgstr ""
+
+#. TRANS: Group actions header (h2). Text hidden by default.
+msgid "Group actions"
+msgstr ""
+
+#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
+#. TRANS: %s is the nickname of the group.
+#, php-format
+msgctxt "TOOLTIP"
+msgid "Edit %s group properties"
+msgstr ""
+
+#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
+#. TRANS: %s is the nickname of the group.
+#, php-format
+msgctxt "TOOLTIP"
+msgid "Add or edit %s logo"
+msgstr ""
+
+#. TRANS: Link text for link on user profile.
+msgctxt "MENU"
+msgid "Logo"
+msgstr ""
+
+#. TRANS: Title for groups with the most members section.
+msgid "Popular groups"
+msgstr ""
+
+#. TRANS: Title for groups with the most posts section.
+msgid "Active groups"
+msgstr ""
+
+#. TRANS: Link description for seeing all groups.
+#. TRANS: Link description for seeing all lists.
+msgid "See all"
+msgstr ""
+
+#. TRANS: Link title for seeing all groups.
+msgid "See all groups you belong to."
+msgstr ""
+
+#. TRANS: Menu item title in personal group navigation menu.
+#. TRANS: %s is a username.
+msgid "Back to top"
+msgstr ""
+
+#. TRANS: Client exception 406
+msgid "This page is not available in a media type you accept"
+msgstr ""
+
+#. TRANS: Exception thrown when trying to upload an unsupported image file format.
+msgid "Unsupported image file format."
+msgstr ""
+
+#. TRANS: Exception thrown when too large a file is uploaded.
+#. TRANS: %s is the maximum file size, for example "500b", "10kB" or "2MB".
+#, php-format
+msgid "That file is too big. The maximum file size is %s."
+msgstr ""
+
+#. TRANS: Exception thrown when uploading an image and that action could not be completed.
+msgid "Partial upload."
+msgstr ""
+
+#. TRANS: Exception thrown when uploading a file as image that is not an image or is a corrupt file.
+msgid "Not an image or corrupt file."
+msgstr ""
+
+#. TRANS: Exception thrown during resize when image has been registered as present, but is no longer there.
+msgid "Lost our file."
+msgstr ""
+
+#. TRANS: Exception thrown when trying to resize an unknown file type.
+#. TRANS: Exception thrown when trying resize an unknown file type.
+msgid "Unknown file type"
+msgstr ""
+
+#. TRANS: Number of megabytes. %d is the number.
+#, php-format
+msgid "%dMB"
+msgid_plural "%dMB"
+msgstr[0] ""
+msgstr[1] ""
+
+#. TRANS: Number of kilobytes. %d is the number.
+#, php-format
+msgid "%dkB"
+msgid_plural "%dkB"
+msgstr[0] ""
+msgstr[1] ""
+
+#. TRANS: Number of bytes. %d is the number.
+#, php-format
+msgid "%dB"
+msgid_plural "%dB"
+msgstr[0] ""
+msgstr[1] ""
+
+#. TRANS: Body text for confirmation code e-mail.
+#. TRANS: %1$s is a user nickname, %2$s is the StatusNet sitename,
+#. TRANS: %3$s is the display name of an IM plugin.
+#, php-format
+msgid ""
+"User \"%1$s\" on %2$s has said that your %3$s screenname belongs to them. If "
+"that is true, you can confirm by clicking on this URL: %4$s . (If you cannot "
+"click it, copy-and-paste it into the address bar of your browser). If that "
+"user is not you, or if you did not request this confirmation, just ignore "
+"this message."
+msgstr ""
+
+#. TRANS: Exception thrown when trying to deliver a notice to an unknown inbox.
+#. TRANS: %d is the unknown inbox ID (number).
+#, php-format
+msgid "Unknown inbox source %d."
+msgstr ""
+
+#. TRANS: Server exception thrown trying to initialise an IM plugin without meeting all prerequisites.
+msgid "Queueing must be enabled to use IM plugins."
+msgstr ""
+
+#. TRANS: Server exception thrown trying to initialise an IM plugin without a transport method.
+msgid "Transport cannot be null."
+msgstr ""
+
+#. TRANS: Title for inbox tag cloud section.
+msgctxt "TITLE"
+msgid "Trends"
+msgstr ""
+
+#. TRANS: Default button text for inviting more users to the StatusNet instance.
+msgctxt "BUTTON"
+msgid "Invite more colleagues"
+msgstr ""
+
+#. TRANS: Form legend.
+msgid "Invite collegues"
+msgstr ""
+
+#. TRANS: Field label for a list of e-mail addresses.
+msgid "Email addresses"
+msgstr "�дра�ы �лектроннай пошты"
+
+#. TRANS: Field title for a list of e-mail addresses.
+msgid "Addresses of friends to invite (one per line)."
+msgstr ""
+
+#. TRANS: Field label for a personal message to send to invitees.
+msgid "Personal message"
+msgstr ""
+
+#. TRANS: Field title for a personal message to send to invitees.
+msgid "Optionally add a personal message to the invitation."
+msgstr ""
+
+#. TRANS: Send button for inviting friends
+#. TRANS: Button text for sending notice.
+msgctxt "BUTTON"
+msgid "Send"
+msgstr "Да�лаць"
+
+#. TRANS: Submit button title.
+msgid "Send invitations."
+msgstr ""
+
+#. TRANS: Button text for joining a group.
+msgctxt "BUTTON"
+msgid "Join"
+msgstr ""
+
+#. TRANS: Button text on form to leave a group.
+msgctxt "BUTTON"
+msgid "Leave"
+msgstr ""
+
+#. TRANS: Link title for seeing all lists.
+#, fuzzy
+msgid "See all lists you have created."
+msgstr "Да�та�аваньні, �кі� Вы зар�гі�травалі"
+
+#. TRANS: Menu item for logging in to the StatusNet site.
+#. TRANS: Menu item in primary navigation panel.
+msgctxt "MENU"
+msgid "Login"
+msgstr ""
+
+#. TRANS: Title for menu item for logging in to the StatusNet site.
+msgid "Login with a username and password"
+msgstr ""
+
+#. TRANS: Menu item for registering with the StatusNet site.
+msgctxt "MENU"
+msgid "Register"
+msgstr ""
+
+#. TRANS: Title for menu item for registering with the StatusNet site.
+msgid "Sign up for a new account"
+msgstr ""
+
+#. TRANS: Subject for address confirmation email.
+msgid "Email address confirmation"
+msgstr ""
+
+#. TRANS: Body for address confirmation email.
+#. TRANS: %1$s is the addressed user's nickname, %2$s is the StatusNet sitename,
+#. TRANS: %3$s is the URL to confirm at.
+#, php-format
+msgid ""
+"Hey, %1$s.\n"
+"\n"
+"Someone just entered this email address on %2$s.\n"
+"\n"
+"If it was you, and you want to confirm your entry, use the URL below:\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"If not, just ignore this message.\n"
+"\n"
+"Thanks for your time, \n"
+"%2$s\n"
+msgstr ""
+
+#. TRANS: Subject of new-subscriber notification e-mail.
+#. TRANS: %1$s is the subscribing user's nickname, %2$s is the StatusNet sitename.
+#. TRANS: Main body of new-subscriber notification e-mail.
+#. TRANS: %1$s is the subscriber's long name, %2$s is the StatusNet sitename.
+#, php-format
+msgid "%1$s is now following you on %2$s."
+msgstr ""
+
+#. TRANS: Subject of pending new-subscriber notification e-mail.
+#. TRANS: %1$s is the subscribing user's nickname, %2$s is the StatusNet sitename.
+#, php-format
+msgid "%1$s would like to listen to your notices on %2$s."
+msgstr ""
+
+#. TRANS: Main body of pending new-subscriber notification e-mail.
+#. TRANS: %1$s is the subscriber's long name, %2$s is the StatusNet sitename.
+#, php-format
+msgid ""
+"%1$s would like to listen to your notices on %2$s. You may approve or reject "
+"their subscription at %3$s"
+msgstr ""
+
+#. TRANS: Common footer block for StatusNet notification emails.
+#. TRANS: %1$s is the StatusNet sitename,
+#. TRANS: %2$s is a link to the addressed user's e-mail settings.
+#, php-format
+msgid ""
+"Faithfully yours,\n"
+"%1$s.\n"
+"\n"
+"----\n"
+"Change your email address or notification options at %2$s"
+msgstr ""
+
+#. TRANS: Profile info line in notification e-mail.
+#. TRANS: %s is a URL.
+#, php-format
+msgid "Profile: %s"
+msgstr ""
+
+#. TRANS: Profile info line in notification e-mail.
+#. TRANS: %s is biographical information.
+#, php-format
+msgid "Bio: %s"
+msgstr ""
+
+#. TRANS: This is a paragraph in a new-subscriber e-mail.
+#. TRANS: %s is a URL where the subscriber can be reported as abusive.
+#, php-format
+msgid ""
+"If you believe this account is being used abusively, you can block them from "
+"your subscribers list and report as spam to site administrators at %s."
+msgstr ""
+
+#. TRANS: Subject of notification mail for new posting email address.
+#. TRANS: %s is the StatusNet sitename.
+#, php-format
+msgid "New email address for posting to %s"
+msgstr ""
+
+#. TRANS: Body of notification mail for new posting email address.
+#. TRANS: %1$s is the StatusNet sitename, %2$s is the e-mail address to send
+#. TRANS: to to post by e-mail, %3$s is a URL to more instructions.
+#, 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."
+msgstr ""
+
+#. TRANS: Subject line for SMS-by-email notification messages.
+#. TRANS: %s is the posting user's nickname.
+#, php-format
+msgid "%s status"
+msgstr ""
+
+#. TRANS: Subject line for SMS-by-email address confirmation message.
+msgid "SMS confirmation"
+msgstr ""
+
+#. TRANS: Main body heading for SMS-by-email address confirmation message.
+#. TRANS: %s is the addressed user's nickname.
+#, php-format
+msgid "%s: confirm you own this phone number with this code:"
+msgstr ""
+
+#. TRANS: Subject for 'nudge' notification email.
+#. TRANS: %s is the nudging user.
+#, php-format
+msgid "You have been nudged by %s"
+msgstr ""
+
+#. TRANS: Body for 'nudge' notification email.
+#. TRANS: %1$s is the nuding user's long name, $2$s is the nudging user's nickname,
+#. TRANS: %3$s is a URL to post notices at.
+#, php-format
+msgid ""
+"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
+"to post some news.\n"
+"\n"
+"So let's hear from you :)\n"
+"\n"
+"%3$s\n"
+"\n"
+"Don't reply to this email; it won't get to them."
+msgstr ""
+
+#. TRANS: Subject for direct-message notification email.
+#. TRANS: %s is the sending user's nickname.
+#, php-format
+msgid "New private message from %s"
+msgstr ""
+
+#. TRANS: Body for direct-message notification email.
+#. TRANS: %1$s is the sending user's long name, %2$s is the sending user's nickname,
+#. TRANS: %3$s is the message content, %4$s a URL to the message,
+#, php-format
+msgid ""
+"%1$s (%2$s) sent you a private message:\n"
+"\n"
+"------------------------------------------------------\n"
+"%3$s\n"
+"------------------------------------------------------\n"
+"\n"
+"You can reply to their message here:\n"
+"\n"
+"%4$s\n"
+"\n"
+"Don't reply to this email; it won't get to them."
+msgstr ""
+
+#. TRANS: Subject for favorite notification e-mail.
+#. TRANS: %1$s is the adding user's long name, %2$s is the adding user's nickname.
+#, php-format
+msgid "%1$s (@%2$s) added your notice as a favorite"
+msgstr ""
+
+#. TRANS: Body for favorite notification e-mail.
+#. TRANS: %1$s is the adding user's long name, $2$s is the date the notice was created,
+#. TRANS: %3$s is a URL to the faved notice, %4$s is the faved notice text,
+#. TRANS: %5$s is a URL to all faves of the adding user, %6$s is the StatusNet sitename,
+#. TRANS: %7$s is the adding user's nickname.
+#, php-format
+msgid ""
+"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
+"\n"
+"The URL of your notice is:\n"
+"\n"
+"%3$s\n"
+"\n"
+"The text of your notice is:\n"
+"\n"
+"%4$s\n"
+"\n"
+"You can see the list of %1$s's favorites here:\n"
+"\n"
+"%5$s"
+msgstr ""
+
+#. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
+#, php-format
+msgid ""
+"The full conversation can be read here:\n"
+"\n"
+"\t%s"
+msgstr ""
+
+#. TRANS: E-mail subject for notice notification.
+#. TRANS: %1$s is the sending user's long name, %2$s is the adding user's nickname.
+#, php-format
+msgid "%1$s (@%2$s) sent a notice to your attention"
+msgstr ""
+
+#. TRANS: Body of @-reply notification e-mail.
+#. TRANS: %1$s is the sending user's name, $2$s is the StatusNet sitename,
+#. TRANS: %3$s is a URL to the notice, %4$s is the notice text,
+#. TRANS: %5$s is the text "The full conversation can be read here:" and a URL to the full conversion if it exists (otherwise empty),
+#. TRANS: %6$s is a URL to reply to the notice, %7$s is a URL to all @-replies for the addressed user,
+#, php-format
+msgid ""
+"%1$s just sent a notice to your attention (an '@-reply') on %2$s.\n"
+"\n"
+"The notice is here:\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"It reads:\n"
+"\n"
+"\t%4$s\n"
+"\n"
+"%5$sYou can reply back here:\n"
+"\n"
+"\t%6$s\n"
+"\n"
+"The list of all @-replies for you here:\n"
+"\n"
+"%7$s"
+msgstr ""
+
+#. TRANS: Subject of group join notification e-mail.
+#. TRANS: %1$s is the joining user's nickname, %2$s is the group name, and %3$s is the StatusNet sitename.
+#, fuzzy, php-format
+msgid "%1$s has joined your group %2$s on %3$s"
+msgstr "%1$s далучыў�� да групы %2$s"
+
+#. TRANS: Main body of group join notification e-mail.
+#. TRANS: %1$s is the subscriber's long name, %2$s is the group name, and %3$s is the StatusNet sitename,
+#. TRANS: %4$s is a block of profile info about the subscriber.
+#. TRANS: %5$s is a link to the addressed user's e-mail settings.
+#, php-format
+msgid "%1$s has joined your group %2$s on %3$s."
+msgstr ""
+
+#. TRANS: Subject of pending group join request notification e-mail.
+#. TRANS: %1$s is the joining user's nickname, %2$s is the group name, and %3$s is the StatusNet sitename.
+#, php-format
+msgid "%1$s wants to join your group %2$s on %3$s."
+msgstr ""
+
+#. TRANS: Main body of pending group join request notification e-mail.
+#. TRANS: %1$s is the subscriber's long name, %2$s is the group name, and %3$s is the StatusNet sitename,
+#. TRANS: %4$s is the URL to the moderation queue page.
+#, php-format
+msgid ""
+"%1$s would like to join your group %2$s on %3$s. You may approve or reject "
+"their group membership at %4$s"
+msgstr ""
+
+#. TRANS: Client error displayed when trying to access a mailbox that is not of the logged in user.
+msgid "Only the user can read their own mailboxes."
+msgstr ""
+
+#. TRANS: Message displayed when there are no private messages in the inbox of a user.
+msgid ""
+"You have no private messages. You can send private message to engage other "
+"users in conversation. People can send you messages for your eyes only."
+msgstr ""
+
+#. TRANS: Menu item in mailbox menu. Leads to incoming private messages.
+msgctxt "MENU"
+msgid "Inbox"
+msgstr ""
+
+#. TRANS: Menu item title in mailbox menu. Leads to incoming private messages.
+msgid "Your incoming messages."
+msgstr ""
+
+#. TRANS: Menu item in mailbox menu. Leads to outgoing private messages.
+msgctxt "MENU"
+msgid "Outbox"
+msgstr ""
+
+#. TRANS: Menu item title in mailbox menu. Leads to outgoing private messages.
+msgid "Your sent messages."
+msgstr ""
+
+#. TRANS: Error message in incoming mail handler used when an incoming e-mail cannot be processed.
+msgid "Could not parse message."
+msgstr ""
+
+#. TRANS: Error message in incoming mail handler used when an incoming e-mail is not from a registered user.
+msgid "Not a registered user."
+msgstr ""
+
+#. TRANS: Error message in incoming mail handler used when an incoming e-mail is not from a user's incoming e-mail address.
+msgid "Sorry, that is not your incoming email address."
+msgstr ""
+
+#. TRANS: Error message in incoming mail handler used when no incoming e-mail is allowed.
+msgid "Sorry, no incoming email allowed."
+msgstr ""
+
+#. TRANS: Error message in incoming mail handler used when an incoming e-mail is of an unsupported type.
+#. TRANS: %s is the unsupported type.
+#, php-format
+msgid "Unsupported message type: %s."
+msgstr ""
+
+#. TRANS: Form legend for form to make a user a group admin.
+msgid "Make user an admin of the group"
+msgstr ""
+
+#. TRANS: Button text for the form that will make a user administrator.
+msgctxt "BUTTON"
+msgid "Make Admin"
+msgstr ""
+
+#. TRANS: Submit button title.
+#, fuzzy
+msgctxt "TOOLTIP"
+msgid "Make this user an admin."
+msgstr ""
+"Толькі адміні�тратар можа зрабіць іншага кары�тальніка адміні�тратарам."
+
+#. TRANS: Client exception thrown when a database error was thrown during a file upload operation.
+msgid "There was a database error while saving your file. Please try again."
+msgstr ""
+
+#. TRANS: Client exception thrown when a file upload operation would cause a user to exceed a set quota.
+msgid "File exceeds user's quota."
+msgstr ""
+
+#. TRANS: Client exception thrown when a file upload operation fails because the file could
+#. TRANS: not be moved from the temporary folder to the permanent file location.
+msgid "File could not be moved to destination directory."
+msgstr ""
+
+#. TRANS: Client exception thrown when a file upload operation has been stopped because the MIME
+#. TRANS: type of the uploaded file could not be determined.
+msgid "Could not determine file's MIME type."
+msgstr ""
+
+#. TRANS: Client exception thrown trying to upload a forbidden MIME type.
+#. TRANS: %1$s is the file type that was denied, %2$s is the application part of
+#. TRANS: the MIME type that was denied.
+#, php-format
+msgid ""
+"\"%1$s\" is not a supported file type on this server. Try using another %2$s "
+"format."
+msgstr ""
+
+#. TRANS: Client exception thrown trying to upload a forbidden MIME type.
+#. TRANS: %s is the file type that was denied.
+#, php-format
+msgid "\"%s\" is not a supported file type on this server."
+msgstr ""
+
+#. TRANS: Form legend for direct notice.
+msgid "Send a direct notice"
+msgstr ""
+
+#. TRANS: Label entry in drop-down selection box in direct-message inbox/outbox.
+#. TRANS: This is the default entry in the drop-down box, doubling as instructions
+#. TRANS: and a brake against accidental submissions with the first user in the list.
+msgid "Select recipient:"
+msgstr ""
+
+#. TRANS: Entry in drop-down selection box in direct-message inbox/outbox when no one is available to message.
+msgid "No mutual subscribers."
+msgstr ""
+
+#. TRANS: Dropdown label in direct notice form.
+msgid "To"
+msgstr ""
+
+#. TRANS: Button text for sending a direct notice.
+msgctxt "Send button for sending notice"
+msgid "Send"
+msgstr ""
+
+#. TRANS: Header in message list.
+msgid "Messages"
+msgstr ""
+
+#. TRANS: Followed by notice source (usually the client used to send the notice).
+#. TRANS: Followed by notice source.
+msgid "from"
+msgstr ""
+
+#. TRANS: A possible notice source (web interface).
+msgctxt "SOURCE"
+msgid "web"
+msgstr ""
+
+#. TRANS: A possible notice source (XMPP).
+msgctxt "SOURCE"
+msgid "xmpp"
+msgstr ""
+
+#. TRANS: A possible notice source (e-mail).
+msgctxt "SOURCE"
+msgid "mail"
+msgstr ""
+
+#. TRANS: A possible notice source (OpenMicroBlogging).
+msgctxt "SOURCE"
+msgid "omb"
+msgstr ""
+
+#. TRANS: A possible notice source (Application Programming Interface).
+msgctxt "SOURCE"
+msgid "api"
+msgstr ""
+
+#. TRANS: Client exception thrown when no author for an activity was found.
+msgid "Cannot get author for activity."
+msgstr ""
+
+#. TRANS: Client exception thrown when ...
+msgid "Bookmark not posted to this group."
+msgstr ""
+
+#. TRANS: Client exception when ...
+msgid "Object not posted to this user."
+msgstr ""
+
+#. TRANS: Server exception thrown when a micro app plugin uses a target that cannot be handled.
+msgid "Do not know how to handle this kind of target."
+msgstr ""
+
+#. TRANS: Server exception thrown when a micro app plugin developer has not done his job too well.
+msgid "You must implement either adaptNoticeListItem() or showNotice()."
+msgstr ""
+
+#. TRANS: Link description to show more items in a list.
+msgid "More â–¼"
+msgstr ""
+
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+msgid "Nickname cannot be empty."
+msgstr ""
+
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#, php-format
+msgid "Nickname cannot be more than %d character long."
+msgid_plural "Nickname cannot be more than %d characters long."
+msgstr[0] ""
+msgstr[1] ""
+
+#. TRANS: Form legend for notice form.
+msgid "Send a notice"
+msgstr ""
+
+#. TRANS: Title for notice label. %s is the user's nickname.
+#, php-format
+msgid "What's up, %s?"
+msgstr ""
+
+#. TRANS: Input label in notice form for adding an attachment.
+msgid "Attach"
+msgstr ""
+
+#. TRANS: Title for input field to attach a file to a notice.
+msgid "Attach a file."
+msgstr ""
+
+#. TRANS: Field label to add location to a notice.
+msgid "Share my location"
+msgstr ""
+
+#. TRANS: Text to not share location for a notice in notice form.
+msgid "Do not share my location"
+msgstr ""
+
+#. TRANS: Timeout error text for location retrieval in notice form.
+msgid ""
+"Sorry, retrieving your geo location is taking longer than expected, please "
+"try again later"
+msgstr ""
+
+#. TRANS: Separator in profile addressees list.
+msgctxt "SEPARATOR"
+msgid ", "
+msgstr ""
+
+#. TRANS: Used in coordinates as abbreviation of north.
+msgid "N"
+msgstr ""
+
+#. TRANS: Used in coordinates as abbreviation of south.
+msgid "S"
+msgstr ""
+
+#. TRANS: Used in coordinates as abbreviation of east.
+msgid "E"
+msgstr ""
+
+#. TRANS: Used in coordinates as abbreviation of west.
+msgid "W"
+msgstr ""
+
+#. TRANS: Coordinates message.
+#. TRANS: %1$s is lattitude degrees, %2$s is lattitude minutes,
+#. TRANS: %3$s is lattitude seconds, %4$s is N (north) or S (south) depending on lattitude,
+#. TRANS: %5$s is longitude degrees, %6$s is longitude minutes,
+#. TRANS: %7$s is longitude seconds, %8$s is E (east) or W (west) depending on longitude,
+#, php-format
+msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
+msgstr ""
+
+#. TRANS: Followed by geo location.
+msgid "at"
+msgstr ""
+
+#. TRANS: Addition in notice list item if notice is part of a conversation.
+msgid "in context"
+msgstr ""
+
+#. TRANS: Addition in notice list item if notice was repeated. Followed by a span with a nickname.
+msgid "Repeated by"
+msgstr ""
+
+#. TRANS: Link title in notice list item to reply to a notice.
+#, fuzzy
+msgid "Reply to this notice."
+msgstr "Выдаліць г�тае паведамленьне."
+
+#. TRANS: Link text in notice list item to reply to a notice.
+msgid "Reply"
+msgstr ""
+
+#. TRANS: Link title in notice list item to delete a notice.
+#, fuzzy
+msgid "Delete this notice from the timeline."
+msgstr "Выдаліць г�тае паведамленьне."
+
+#. TRANS: Title for repeat form status in notice list when a notice has been repeated.
+msgid "Notice repeated."
+msgstr ""
+
+#. TRANS: Field label for notice text.
+msgid "Update your status..."
+msgstr ""
+
+#. TRANS: Form legend of form to nudge/ping another user.
+msgid "Nudge this user"
+msgstr ""
+
+#. TRANS: Button text to nudge/ping another user.
+msgctxt "BUTTON"
+msgid "Nudge"
+msgstr ""
+
+#. TRANS: Button title to nudge/ping another user.
+msgid "Send a nudge to this user."
+msgstr ""
+
+#. TRANS: Server exception thrown in oEmbed action if no API endpoint is available.
+msgid "No oEmbed API endpoint available."
+msgstr ""
+
+#. TRANS: Field label for list.
+msgctxt "LABEL"
+msgid "List"
+msgstr ""
+
+#. TRANS: Field title for list.
+msgid "Change the list (letters, numbers, -, ., and _ are allowed)."
+msgstr ""
+
+#. TRANS: Field title for description of list.
+msgid "Describe the list or topic."
+msgstr ""
+
+#. TRANS: Field title for description of list.
+#. TRANS: %d is the maximum number of characters for the description.
+#, php-format
+msgid "Describe the list or topic in %d character."
+msgid_plural "Describe the list or topic in %d characters."
+msgstr[0] ""
+msgstr[1] ""
+
+#. TRANS: Button title to delete a list.
+msgid "Delete this list."
+msgstr ""
+
+#. TRANS: Header in list edit form.
+msgid "Add or remove people"
+msgstr ""
+
+#. TRANS: Header in list edit form.
+msgctxt "HEADER"
+msgid "Search"
+msgstr ""
+
+#. TRANS: Menu item in list navigation panel.
+msgctxt "MENU"
+msgid "List"
+msgstr ""
+
+#. TRANS: Menu item title in list navigation panel.
+#. TRANS: %1$s is a list, %2$s is a nickname.
+#, php-format
+msgid "%1$s list by %2$s."
+msgstr ""
+
+#. TRANS: Menu item in list navigation panel.
+msgctxt "MENU"
+msgid "Listed"
+msgstr ""
+
+#. TRANS: Menu item in list navigation panel.
+#. TRANS: Menu item in local navigation menu.
+msgctxt "MENU"
+msgid "Subscribers"
+msgstr ""
+
+#. TRANS: Menu item title in list navigation panel.
+#. TRANS: %1$s is a list, %2$s is a nickname.
+#, php-format
+msgid "Subscribers to %1$s list by %2$s."
+msgstr ""
+
+#. TRANS: Menu item in list navigation panel.
+msgctxt "MENU"
+msgid "Edit"
+msgstr ""
+
+#. TRANS: Menu item title in list navigation panel.
+#. TRANS: %s is a list.
+#, php-format
+msgid "Edit %s list by you."
+msgstr ""
+
+#. TRANS: Title for link to edit list settings.
+msgid "Edit list settings."
+msgstr ""
+
+#. TRANS: Text for link to edit list settings.
+msgid "Edit"
+msgstr ""
+
+#. TRANS: Privacy mode text in list list item for private list.
+msgctxt "MODE"
+msgid "Private"
+msgstr ""
+
+#. TRANS: Menu item in the group navigation page.
+msgctxt "MENU"
+msgid "List Subscriptions"
+msgstr ""
+
+#. TRANS: Tooltip for menu item in the group navigation page.
+#. TRANS: %s is a user nickname.
+#, php-format
+msgctxt "TOOLTIP"
+msgid "Lists subscribed to by %s."
+msgstr ""
+
+#. TRANS: Menu item in the group navigation page.
+#. TRANS: %s is a user nickname.
+#, php-format
+msgctxt "MENU"
+msgid "Lists with %s"
+msgstr ""
+
+#. TRANS: Tooltip for menu item in the group navigation page.
+#. TRANS: %s is a user nickname.
+#, php-format
+msgctxt "TOOLTIP"
+msgid "Lists with %s."
+msgstr ""
+
+#. TRANS: Menu item in the group navigation page.
+#. TRANS: %s is a user nickname.
+#, php-format
+msgctxt "MENU"
+msgid "Lists by %s"
+msgstr ""
+
+#. TRANS: Tooltip for menu item in the group navigation page.
+#. TRANS: %s is a user nickname.
+#, php-format
+msgctxt "TOOLTIP"
+msgid "Lists by %s."
+msgstr ""
+
+#. TRANS: Label in lists widget.
+msgctxt "LABEL"
+msgid "Your lists"
+msgstr ""
+
+#. TRANS: Fieldset legend in lists widget.
+msgctxt "LEGEND"
+msgid "Edit lists"
+msgstr ""
+
+#. TRANS: Label in self tags widget.
+msgctxt "LABEL"
+msgid "Tags"
+msgstr ""
+
+#. TRANS: Title for section contaning lists with the most subscribers.
+msgid "Popular lists"
+msgstr ""
+
+#. TRANS: List summary. %1$d is the number of users in the list,
+#. TRANS: %2$d is the number of subscribers to the list.
+#, php-format
+msgid "Listed: %1$d Subscribers: %2$d"
+msgstr ""
+
+#. TRANS: Title for page that displays which lists current user is part of.
+#, php-format
+msgid "Lists with you"
+msgstr ""
+
+#. TRANS: Title for page that displays which lists a user is part of.
+#. TRANS: %s is a profile name.
+#, php-format
+msgid "Lists with %s"
+msgstr ""
+
+#. TRANS: Title for page that displays lists a user has subscribed to.
+msgid "List subscriptions"
+msgstr ""
+
+#. TRANS: Menu item in personal group navigation menu.
+#. TRANS: Menu item in settings navigation panel.
+#. TRANS: Menu item in local navigation menu.
+msgctxt "MENU"
+msgid "Profile"
+msgstr ""
+
+#. TRANS: Menu item title in personal group navigation menu.
+msgid "Your profile"
+msgstr ""
+
+#. TRANS: Menu item in personal group navigation menu.
+msgctxt "MENU"
+msgid "Replies"
+msgstr ""
+
+#. TRANS: Menu item in personal group navigation menu.
+msgctxt "MENU"
+msgid "Favorites"
+msgstr ""
+
+#. TRANS: Replaces %s in '%s\'s favorite notices'. (Yes, we know we need to fix this.)
+msgctxt "FIXME"
+msgid "User"
+msgstr ""
+
+#. TRANS: Menu item in personal group navigation menu.
+msgctxt "MENU"
+msgid "Messages"
+msgstr ""
+
+#. TRANS: Menu item title in personal group navigation menu.
+msgid "Your incoming messages"
+msgstr ""
+
+#. TRANS: Displayed as version information for a plugin if no version information was found.
+msgid "Unknown"
+msgstr ""
+
+#. TRANS: Plugin admin panel controls
+msgctxt "plugin"
+msgid "Disable"
+msgstr ""
+
+#. TRANS: Plugin admin panel controls
+msgctxt "plugin"
+msgid "Enable"
+msgstr ""
+
+#. TRANS: Plugin description for a disabled plugin.
+msgctxt "plugin-description"
+msgid ""
+"(The plugin description is unavailable when a plugin has been disabled.)"
+msgstr ""
+
+#. TRANS: Menu item in primary navigation panel.
+msgctxt "MENU"
+msgid "Settings"
+msgstr ""
+
+#. TRANS: Menu item title in primary navigation panel.
+msgid "Change your personal settings."
+msgstr ""
+
+#. TRANS: Menu item in primary navigation panel.
+msgctxt "MENU"
+msgid "Admin"
+msgstr ""
+
+#. TRANS: Menu item title in primary navigation panel.
+msgid "Site configuration."
+msgstr ""
+
+#. TRANS: Menu item in primary navigation panel.
+msgctxt "MENU"
+msgid "Logout"
+msgstr ""
+
+#. TRANS: Menu item title in primary navigation panel.
+msgid "Logout from the site."
+msgstr ""
+
+#. TRANS: Menu item title in primary navigation panel.
+msgid "Login to the site."
+msgstr ""
+
+msgid "This profile has been silenced by site moderators"
+msgstr ""
+
+#. TRANS: H2 text for user subscription statistics.
+msgid "Following"
+msgstr ""
+
+#. TRANS: H2 text for user subscriber statistics.
+msgid "Followers"
+msgstr ""
+
+#. TRANS: H2 text for user statistics.
+msgid "Statistics"
+msgstr ""
+
+#. TRANS: Label for user statistics.
+msgid "User ID"
+msgstr ""
+
+#. TRANS: Label for user statistics.
+msgid "Member since"
+msgstr ""
+
+#. TRANS: Label for user statistics.
+#. TRANS: Average count of posts made per day since account registration.
+msgid "Daily average"
+msgstr ""
+
+#. TRANS: H2 text for user group membership statistics.
+msgid "Groups"
+msgstr ""
+
+#. TRANS: H2 text for user list membership statistics.
+msgid "Lists"
+msgstr ""
+
+#. TRANS: Server error displayed when using an unimplemented method.
+msgid "Unimplemented method."
+msgstr ""
+
+#. TRANS: Menu item title in search group navigation panel.
+msgid "User groups"
+msgstr ""
+
+#. TRANS: Menu item in search group navigation panel.
+msgctxt "MENU"
+msgid "Recent tags"
+msgstr ""
+
+#. TRANS: Menu item title in search group navigation panel.
+msgid "Recent tags"
+msgstr ""
+
+#. TRANS: Menu item in search group navigation panel.
+msgctxt "MENU"
+msgid "Featured"
+msgstr ""
+
+#. TRANS: Menu item in search group navigation panel.
+msgctxt "MENU"
+msgid "Popular"
+msgstr ""
+
+#. TRANS: Title for inbox tag cloud section.
+msgctxt "TITLE"
+msgid "Trending topics"
+msgstr ""
+
+#. TRANS: Client error displayed when return-to was defined without a target.
+msgid "No return-to arguments."
+msgstr ""
+
+#. TRANS: For legend for notice repeat form.
+msgid "Repeat this notice?"
+msgstr ""
+
+#. TRANS: Button title to repeat a notice on notice repeat form.
+msgid "Repeat this notice."
+msgstr ""
+
+#. TRANS: Description of role revoke form. %s is the role to be revoked.
+#, php-format
+msgid "Revoke the \"%s\" role from this user"
+msgstr ""
+
+#. TRANS: Client error on action trying to visit a non-existing page.
+msgid "Page not found."
+msgstr ""
+
+#. TRANS: Title of form to sandbox a user.
+msgctxt "TITLE"
+msgid "Sandbox"
+msgstr ""
+
+#. TRANS: Description of form to sandbox a user.
+msgid "Sandbox this user"
+msgstr ""
+
+#. TRANS: Fieldset legend for the search form.
+msgid "Search site"
+msgstr ""
+
+#. TRANS: Used as a field label for the field where one or more keywords
+#. TRANS: for searching can be entered.
+msgid "Keyword(s)"
+msgstr ""
+
+#. TRANS: Button text for searching site.
+#. TRANS: Button text for search button on search form.
+#. TRANS: Button text to search profiles.
+msgctxt "BUTTON"
+msgid "Search"
+msgstr ""
+
+#. TRANS: Standard search suggestions shown when a search does not give any results.
+msgid ""
+"* Make sure all words are spelled correctly.\n"
+"* Try different keywords.\n"
+"* Try more general keywords.\n"
+"* Try fewer keywords."
+msgstr ""
+
+#. TRANS: Standard search suggestions shown when a search does not give any results.
+#, php-format
+msgid ""
+"You can also try your search on other engines:\n"
+"\n"
+"* [Twingly](http://www.twingly.com/search?q=%s&content=microblog&site=%%%%"
+"site.server%%%%)\n"
+"* [Tweet scan](http://www.tweetscan.com/indexi.php?s=%s)\n"
+"* [Google](http://www.google.com/search?q=site%%3A%%%%site.server%%%%+%s)\n"
+"* [Yahoo](http://search.yahoo.com/search?p=site%%3A%%%%site.server%%%%+%s)\n"
+"* [Collecta](http://collecta.com/#q=%s)"
+msgstr ""
+
+#. TRANS: Menu item in search group navigation panel.
+msgctxt "MENU"
+msgid "People"
+msgstr ""
+
+#. TRANS: Menu item title in search group navigation panel.
+msgid "Find people on this site"
+msgstr ""
+
+#. TRANS: Menu item in search group navigation panel.
+msgctxt "MENU"
+msgid "Notices"
+msgstr ""
+
+#. TRANS: Menu item title in search group navigation panel.
+msgid "Find content of notices"
+msgstr ""
+
+#. TRANS: Menu item title in search group navigation panel.
+msgid "Find groups on this site"
+msgstr ""
+
+#. TRANS: Secondary navigation menu item leading to Terms of Service.
+msgctxt "MENU"
+msgid "TOS"
+msgstr ""
+
+#. TRANS: Secondary navigation menu item leading to privacy policy.
+msgctxt "MENU"
+msgid "Privacy"
+msgstr ""
+
+#. TRANS: Secondary navigation menu item. Leads to information about StatusNet and its license.
+msgctxt "MENU"
+msgid "Source"
+msgstr ""
+
+#. TRANS: Secondary navigation menu item leading to version information on the StatusNet site.
+msgctxt "MENU"
+msgid "Version"
+msgstr ""
+
+#. TRANS: Default title for section/sidebar widget.
+msgid "Untitled section"
+msgstr ""
+
+#. TRANS: Default "More..." title for section/sidebar widget.
+msgid "More..."
+msgstr ""
+
+#. TRANS: Header in settings navigation panel.
+msgctxt "HEADER"
+msgid "Settings"
+msgstr ""
+
+#. TRANS: Menu item title in settings navigation panel.
+msgid "Change your profile settings"
+msgstr ""
+
+#. TRANS: Menu item in settings navigation panel.
+msgctxt "MENU"
+msgid "Avatar"
+msgstr ""
+
+#. TRANS: Menu item title in settings navigation panel.
+msgid "Upload an avatar"
+msgstr ""
+
+#. TRANS: Menu item in settings navigation panel.
+msgctxt "MENU"
+msgid "Password"
+msgstr ""
+
+#. TRANS: Menu item title in settings navigation panel.
+msgid "Change your password"
+msgstr ""
+
+#. TRANS: Menu item in settings navigation panel.
+msgctxt "MENU"
+msgid "Email"
+msgstr ""
+
+#. TRANS: Menu item title in settings navigation panel.
+msgid "Change email handling"
+msgstr ""
+
+#. TRANS: Menu item in settings navigation panel.
+msgctxt "MENU"
+msgid "URL"
+msgstr ""
+
+#. TRANS: Menu item title in settings navigation panel.
+msgid "URL shorteners"
+msgstr ""
+
+#. TRANS: Menu item in settings navigation panel.
+msgctxt "MENU"
+msgid "IM"
+msgstr ""
+
+#. TRANS: Menu item title in settings navigation panel.
+msgid "Updates by instant messenger (IM)"
+msgstr ""
+
+#. TRANS: Menu item in settings navigation panel.
+msgctxt "MENU"
+msgid "SMS"
+msgstr ""
+
+#. TRANS: Menu item title in settings navigation panel.
+msgid "Updates by SMS"
+msgstr ""
+
+#. TRANS: Menu item in settings navigation panel.
+msgctxt "MENU"
+msgid "Connections"
+msgstr ""
+
+#. TRANS: Menu item title in settings navigation panel.
+msgid "Authorized connected applications"
+msgstr ""
+
+#. TRANS: Menu item in settings navigation panel.
+msgctxt "MENU"
+msgid "Old school"
+msgstr ""
+
+#. TRANS: Menu item title in settings navigation panel.
+msgid "UI tweaks for old-school users"
+msgstr ""
+
+#. TRANS: Title of form to silence a user.
+msgctxt "TITLE"
+msgid "Silence"
+msgstr ""
+
+#. TRANS: Description of form to silence a user.
+msgid "Silence this user"
+msgstr ""
+
+#. TRANS: Server error displayed when trying to create an anynymous OAuth consumer.
+msgid "Could not create anonymous consumer."
+msgstr ""
+
+#. TRANS: Server error displayed when trying to create an anynymous OAuth application.
+msgid "Could not create anonymous OAuth application."
+msgstr ""
+
+#. TRANS: Exception thrown when no token association could be found.
+msgid ""
+"Could not find a profile and application associated with the request token."
+msgstr ""
+
+#. TRANS: Exception thrown when no access token can be issued.
+msgid "Could not issue access token."
+msgstr ""
+
+#. TRANS: Exception thrown when a database error occurs.
+msgid "Database error inserting OAuth application user."
+msgstr ""
+
+#. TRANS: Exception thrown when a database error occurs.
+msgid "Database error updating OAuth application user."
+msgstr ""
+
+#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
+msgid "Tried to revoke unknown token."
+msgstr ""
+
+#. TRANS: Exception thrown when an attempt is made to remove a revoked token.
+msgid "Failed to delete revoked token."
+msgstr ""
+
+#. TRANS: Menu item in local navigation menu.
+msgctxt "MENU"
+msgid "Subscriptions"
+msgstr ""
+
+#. TRANS: Menu item title in local navigation menu.
+#. TRANS: %s is a user nickname.
+#, php-format
+msgid "People %s subscribes to."
+msgstr ""
+
+#. TRANS: Menu item title in local navigation menu.
+#. TRANS: %s is a user nickname.
+#, php-format
+msgid "People subscribed to %s."
+msgstr ""
+
+#. TRANS: Menu item in local navigation menu.
+#. TRANS: %d is the number of pending subscription requests.
+#, php-format
+msgctxt "MENU"
+msgid "Pending (%d)"
+msgstr ""
+
+#. TRANS: Menu item title in local navigation menu.
+#, php-format
+msgid "Approve pending subscription requests."
+msgstr ""
+
+#. TRANS: Menu item title in local navigation menu.
+#. TRANS: %s is a user nickname.
+#, php-format
+msgid "Groups %s is a member of."
+msgstr ""
+
+#. TRANS: Menu item title in local navigation menu.
+#. TRANS: %s is a user nickname.
+#, php-format
+msgid "List subscriptions by %s."
+msgstr ""
+
+#. TRANS: Menu item in local navigation menu.
+msgctxt "MENU"
+msgid "Invite"
+msgstr ""
+
+#. TRANS: Menu item title in local navigation menu.
+#. TRANS: %s is the StatusNet sitename.
+#, php-format
+msgid "Invite friends and colleagues to join you on %s."
+msgstr ""
+
+#. TRANS: Form of form to subscribe to a user.
+msgid "Subscribe to this user"
+msgstr ""
+
+#. TRANS: Button text to subscribe to a user.
+#. TRANS: Button text for subscribing to a list.
+msgctxt "BUTTON"
+msgid "Subscribe"
+msgstr ""
+
+#. TRANS: Button title to subscribe to a user.
+msgid "Subscribe to this user."
+msgstr ""
+
+#. TRANS: Title of personal tag cloud section.
+msgid "People Tagcloud as self-tagged"
+msgstr ""
+
+#. TRANS: Title of personal tag cloud section.
+msgid "People Tagcloud as tagged"
+msgstr ""
+
+#. TRANS: Content displayed in a tag cloud section if there are no tags.
+msgctxt "NOTAGS"
+msgid "None"
+msgstr ""
+
+#. TRANS: Server exception displayed if a theme name was invalid.
+msgid "Invalid theme name."
+msgstr ""
+
+#. TRANS: Exception thrown when a compressed theme is uploaded while no support present in PHP configuration.
+msgid "This server cannot handle theme uploads without ZIP support."
+msgstr ""
+
+#. TRANS: Server exception thrown when uploading a theme fails.
+msgid "The theme file is missing or the upload failed."
+msgstr ""
+
+#. TRANS: Server exception thrown when saving an uploaded theme after decompressing it fails.
+#. TRANS: Server exception thrown when an uploaded theme cannot be saved during extraction.
+msgid "Failed saving theme."
+msgstr ""
+
+#. TRANS: Server exception thrown when an uploaded theme has an incorrect structure.
+msgid "Invalid theme: Bad directory structure."
+msgstr ""
+
+#. TRANS: Client exception thrown when an uploaded theme is larger than the limit.
+#. TRANS: %d is the number of bytes of the uncompressed theme.
+#, php-format
+msgid "Uploaded theme is too large; must be less than %d byte uncompressed."
+msgid_plural ""
+"Uploaded theme is too large; must be less than %d bytes uncompressed."
+msgstr[0] ""
+msgstr[1] ""
+
+#. TRANS: Server exception thrown when an uploaded theme is incomplete.
+msgid "Invalid theme archive: Missing file css/display.css"
+msgstr ""
+
+#. TRANS: Server exception thrown when an uploaded theme has an incorrect file or folder name.
+msgid ""
+"Theme contains invalid file or folder name. Stick with ASCII letters, "
+"digits, underscore, and minus sign."
+msgstr ""
+
+#. TRANS: Server exception thrown when an uploaded theme contains files with unsafe file extensions.
+msgid "Theme contains unsafe file extension names; may be unsafe."
+msgstr ""
+
+#. TRANS: Server exception thrown when an uploaded theme contains a file type that is not allowed.
+#. TRANS: %s is the file type that is not allowed.
+#, php-format
+msgid "Theme contains file of type \".%s\", which is not allowed."
+msgstr ""
+
+#. TRANS: Server exception thrown when an uploaded compressed theme cannot be opened.
+msgid "Error opening theme archive."
+msgstr ""
+
+#. TRANS: Header for Notices section.
+msgctxt "HEADER"
+msgid "Notices"
+msgstr ""
+
+#. TRANS: Link to show replies for a notice.
+#. TRANS: %d is the number of replies to a notice and used for plural.
+#, php-format
+msgid "Show reply"
+msgid_plural "Show all %d replies"
+msgstr[0] ""
+msgstr[1] ""
+
+#. TRANS: Reference to the logged in user in favourite list.
+msgctxt "FAVELIST"
+msgid "You"
+msgstr ""
+
+#. TRANS: For building a list such as "Jim, Bob, Mary and 5 others like this".
+#. TRANS: %1$s is a list of users, separated by a separator (default: ", "), %2$s is the last user in the list.
+#, php-format
+msgctxt "FAVELIST"
+msgid "%1$s and %2$s"
+msgstr ""
+
+#. TRANS: List message for notice favoured by logged in user.
+msgctxt "FAVELIST"
+msgid "You like this."
+msgstr ""
+
+#. TRANS: List message for when more than 4 people like something.
+#. TRANS: %%s is a list of users liking a notice, %d is the number over 4 that like the notice.
+#. TRANS: Plural is decided on the total number of users liking the notice (count of %%s + %d).
+#, php-format
+msgid "%%s and %d others like this."
+msgid_plural "%%s and %d others like this."
+msgstr[0] ""
+msgstr[1] ""
+
+#. TRANS: List message for favoured notices.
+#. TRANS: %%s is a list of users liking a notice.
+#. TRANS: Plural is based on the number of of users that have favoured a notice.
+#, php-format
+msgid "%%s likes this."
+msgid_plural "%%s like this."
+msgstr[0] ""
+msgstr[1] ""
+
+#. TRANS: List message for notice repeated by logged in user.
+#, fuzzy
+msgctxt "REPEATLIST"
+msgid "You repeated this."
+msgstr "Паўторана дл� %s"
+
+#. TRANS: List message for when more than 4 people repeat something.
+#. TRANS: %%s is a list of users liking a notice, %d is the number over 4 that like the notice.
+#. TRANS: Plural is decided on the total number of users liking the notice (count of %%s + %d).
+#, php-format
+msgid "%%s and %d other repeated this."
+msgid_plural "%%s and %d others repeated this."
+msgstr[0] ""
+msgstr[1] ""
+
+#. TRANS: List message for favoured notices.
+#. TRANS: %%s is a list of users liking a notice.
+#. TRANS: Plural is based on the number of of users that have favoured a notice.
+#, fuzzy, php-format
+msgid "%%s repeated this."
+msgid_plural "%%s repeated this."
+msgstr[0] "Паўторана дл� %s"
+msgstr[1] "Паўторана дл� %s"
+
+#. TRANS: Form legend.
+#, php-format
+msgid "Search and list people"
+msgstr ""
+
+#. TRANS: Dropdown option for searching in profiles.
+msgid "Everything"
+msgstr ""
+
+#. TRANS: Dropdown option for searching in profiles.
+msgid "Fullname"
+msgstr ""
+
+#. TRANS: Dropdown option for searching in profiles.
+msgid "URI (Remote users)"
+msgstr ""
+
+#. TRANS: Dropdown field label.
+msgctxt "LABEL"
+msgid "Search in"
+msgstr ""
+
+#. TRANS: Dropdown field title.
+msgid "Choose a field to search."
+msgstr ""
+
+#. TRANS: Form legend.
+#. TRANS: %1$s is a nickname, $2$s is a list.
+#, php-format
+msgid "Remove %1$s from list %2$s"
+msgstr ""
+
+#. TRANS: Legend on form to add a profile to a list.
+#. TRANS: %1$s is a nickname, %2$s is a list.
+#, php-format
+msgid "Add %1$s to list %2$s"
+msgstr ""
+
+#. TRANS: Title for top posters section.
+msgid "Top posters"
+msgstr ""
+
+#. TRANS: Option in drop-down of potential addressees.
+msgctxt "SENDTO"
+msgid "Everyone"
+msgstr ""
+
+#. TRANS: Option in drop-down of potential addressees.
+#. TRANS: %s is a StatusNet sitename.
+#, php-format
+msgid "My colleagues at %s"
+msgstr ""
+
+#. TRANS: Label for drop-down of potential addressees.
+msgctxt "LABEL"
+msgid "To:"
+msgstr ""
+
+#. TRANS: Checkbox label in widget for selecting potential addressees to mark the notice private.
+msgid "Private?"
+msgstr ""
+
+#. TRANS: Client exception thrown in widget for selecting potential addressees when an invalid fill option was received.
+#, php-format
+msgid "Unknown to value: \"%s\"."
+msgstr ""
+
+#. TRANS: Title for the form to unblock a user.
+msgctxt "TITLE"
+msgid "Unblock"
+msgstr ""
+
+#. TRANS: Title for unsandbox form.
+msgctxt "TITLE"
+msgid "Unsandbox"
+msgstr ""
+
+#. TRANS: Description for unsandbox form.
+msgid "Unsandbox this user"
+msgstr ""
+
+#. TRANS: Title for unsilence form.
+msgid "Unsilence"
+msgstr ""
+
+#. TRANS: Form description for unsilence form.
+msgid "Unsilence this user"
+msgstr ""
+
+#. TRANS: Form legend on unsubscribe form.
+msgid "Unsubscribe from this user"
+msgstr ""
+
+#. TRANS: Button text on unsubscribe form.
+#. TRANS: Button text for unsubscribing from a list.
+msgctxt "BUTTON"
+msgid "Unsubscribe"
+msgstr ""
+
+#. TRANS: Button title on unsubscribe form.
+#, fuzzy
+msgid "Unsubscribe from this user."
+msgstr "Разбл�каваць г�тага кары�тальніка"
+
+#. TRANS: Exception text shown when no profile can be found for a user.
+#. TRANS: %1$s is a user nickname, $2$d is a user ID (number).
+#, php-format
+msgid "User %1$s (%2$d) has no profile record."
+msgstr ""
+
+#. TRANS: Authorisation exception thrown when a user a not allowed to login.
+msgid "Not allowed to log in."
+msgstr ""
+
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+msgid "a few seconds ago"
+msgstr ""
+
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+msgid "about a minute ago"
+msgstr ""
+
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#, php-format
+msgid "about one minute ago"
+msgid_plural "about %d minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+msgid "about an hour ago"
+msgstr ""
+
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#, php-format
+msgid "about one hour ago"
+msgid_plural "about %d hours ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+msgid "about a day ago"
+msgstr ""
+
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#, php-format
+msgid "about one day ago"
+msgid_plural "about %d days ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+msgid "about a month ago"
+msgstr ""
+
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#, php-format
+msgid "about one month ago"
+msgid_plural "about %d months ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+msgid "about a year ago"
+msgstr ""
+
+#. TRANS: Web color exception thrown when a hexadecimal color code does not validate.
+#. TRANS: %s is the provided (invalid) color code.
+#, php-format
+msgid "%s is not a valid color! Use 3 or 6 hex characters."
+msgstr ""
+
+#. TRANS: Exception.
+msgid "Invalid XML."
+msgstr ""
+
+#. TRANS: Exception.
+msgid "Invalid XML, missing XRD root."
+msgstr ""
+
+#. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
+#, php-format
+msgid "Getting backup from file '%s'."
+msgstr ""
diff --git a/locale/bg/LC_MESSAGES/statusnet.po b/locale/bg/LC_MESSAGES/statusnet.po
index 7c4eab8668..4389673acc 100644
--- a/locale/bg/LC_MESSAGES/statusnet.po
+++ b/locale/bg/LC_MESSAGES/statusnet.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Core to Bulgarian (Българ�ки)
+# Translation of StatusNet - Core to Bulgarian (българ�ки)
 # Exported from translatewiki.net
 #
 # Author: AVRS
@@ -11,17 +11,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:44+0000\n"
-"Language-Team: Bulgarian <http://translatewiki.net/wiki/Portal:bg>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:36+0000\n"
+"Language-Team: Bulgarian <https://translatewiki.net/wiki/Portal:bg>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: bg\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-05-05 10:52:40+0000\n"
+"X-POT-Import-Date: 2012-04-22 22:02:21+0000\n"
 
 #. TRANS: Database error message.
 #, php-format
@@ -32,12 +32,6 @@ msgid ""
 "again."
 msgstr ""
 
-#. TRANS: Error message.
-msgid ""
-"An important error occured, probably related to email setup. Check logfiles "
-"for more info."
-msgstr ""
-
 #. TRANS: Error message.
 msgid "An error occurred."
 msgstr ""
@@ -49,9 +43,8 @@ msgid ""
 msgstr ""
 
 #. TRANS: Error message displayed when trying to access a non-existing page.
-#, fuzzy
 msgid "Unknown page"
-msgstr "�епознато"
+msgstr "�епозната �траница"
 
 #. TRANS: Error message displayed when trying to perform an undefined action.
 #. TRANS: Title for password recovery page when an unknown action has been specified.
@@ -97,12 +90,12 @@ msgstr "Изключване на новите реги�трации."
 msgid "Closed"
 msgstr "Затворен"
 
-#. TRANS: Title for button to save access settings in site admin panel.
-msgid "Save access settings"
+#. TRANS: Button title to save access settings in site admin panel.
+#, fuzzy
+msgid "Save access settings."
 msgstr "Запазване на�тройките за до�тъп"
 
-#. TRANS: Tooltip for button to save access settings in site admin panel.
-#. TRANS: Button text for saving theme settings.
+#. TRANS: Button text to save access settings in site admin panel.
 #. TRANS: Button label to save e-mail preferences.
 #. TRANS: Button label to save IM preferences.
 #. TRANS: Button text in the license admin panel.
@@ -118,7 +111,6 @@ msgstr "Запазване на�тройките за до�тъп"
 #. TRANS: Button text for saving "Other settings" in profile.
 #. TRANS: Button text to save user settings in user admin panel.
 #. TRANS: Button label in the "Edit application" form.
-#. TRANS: Button text on profile design page to save settings.
 #. TRANS: Text for save button on group edit form.
 #. TRANS: Button text to save tags for a profile.
 msgctxt "BUTTON"
@@ -154,14 +146,8 @@ msgstr "��ма такъв профил."
 #. TRANS: Client error displayed trying to reference a non-existing list.
 #. TRANS: Client error displayed when referring to a non-existing list.
 #. TRANS: Client error displayed trying to reference a non-existing list.
-#, fuzzy
 msgid "No such list."
-msgstr "��ма такъв етикет."
-
-#. TRANS: Client error displayed when trying to add an OMB 0.1 remote profile to a list.
-#, fuzzy
-msgid "You cannot list an OMB 0.1 remote profile with this action."
-msgstr "�е �те абонирани за този профил"
+msgstr "��ма такъв �пи�ък."
 
 #. TRANS: Client error displayed when an unknown error occurs when adding a user to a list.
 #. TRANS: %s is a username.
@@ -193,7 +179,6 @@ msgstr "��ма такака �траница."
 #. TRANS: Client error when user not found for an rss related action.
 #. TRANS: Client error displayed when no existing user is provided for a user's delivery device setting.
 #. TRANS: Client error displayed if a user could not be found.
-#. TRANS: Client error when user not found updating a profile background image.
 #. TRANS: Client error displayed updating profile image without having a user object.
 #. TRANS: Client error displayed when making an Atom API request for an unknown user.
 #. TRANS: Client error displayed when trying to block a non-existing user or a user from another site.
@@ -219,14 +204,11 @@ msgstr "��ма такака �траница."
 #. TRANS: Client error displayed when trying to get the RSS feed with favorites of a user that does not exist.
 #. TRANS: Client error displayed when requesting Friends of a Friend feed without providing a user nickname.
 #. TRANS: Client error displayed when requesting Friends of a Friend feed for an object that is not a user.
-#. TRANS: Client error displayed when trying to get a user hCard for a non-existing user.
 #. TRANS: Client error displayed trying to make a micro summary without providing a valid user.
 #. TRANS: Client error displayed trying to send a direct message to a non-existing user.
 #. TRANS: Client error displayed trying to use "one time password login" without using an existing user.
 #. TRANS: Client error displayed when referring to non-existing user.
 #. TRANS: Client error displayed trying to perform an action related to a non-existing user.
-#. TRANS: Form validation error on page for remote subscribe when no user was provided.
-#. TRANS: Form validation error on page for remote subscribe when no user profile was found.
 #. TRANS: Client error displayed when trying to reply to a non-exsting user.
 #. TRANS: Client error displayed when providing a non-existing nickname in a RSS 1.0 action.
 #. TRANS: Client error.
@@ -235,7 +217,6 @@ msgstr "��ма такака �траница."
 #. TRANS: Client error displayed trying to find a user by ID for a non-existing ID.
 #. TRANS: Client error displayed requesting groups for a non-existing user.
 #. TRANS: Client error displayed when user not found for an action.
-#. TRANS: Client error displayed providing a non-existing nickname.
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #. TRANS: Client error displayed when trying to perform a gallery action with an unknown user.
 #. TRANS: Client error displayed when trying to access a mailbox without providing a user.
@@ -254,6 +235,13 @@ msgstr "Поток на %s"
 msgid "%s's home timeline"
 msgstr "Поток на %s"
 
+#. TRANS: %s is user nickname.
+#. TRANS: Feed title.
+#. TRANS: %s is tagger's nickname.
+#, fuzzy, php-format
+msgid "Feed for friends of %s (Activity Streams JSON)"
+msgstr "Еми�и� � при�телите на %s (Atom)"
+
 #. TRANS: %s is user nickname.
 #, php-format
 msgid "Feed for friends of %s (RSS 1.0)"
@@ -293,7 +281,7 @@ msgid ""
 "to them](%%%%action.newnotice%%%%?status_textarea=%3$s)."
 msgstr ""
 
-#. TRANS: Encoutagement displayed on empty timeline user pages for anonymous users.
+#. TRANS: Encouragement displayed on empty timeline user pages for anonymous users.
 #. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
 #. TRANS: Empty list message for page with replies for a user for not logged in users.
 #. TRANS: %1$s is a user nickname. This message contains a Markdown link in the form [link text](link).
@@ -305,6 +293,13 @@ msgid ""
 "post a notice to them."
 msgstr ""
 
+#. TRANS: Button text for inviting more users to the StatusNet instance.
+#. TRANS: Less business/enterprise-oriented language for public sites.
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Send invite"
+msgstr "Покани"
+
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Title of API timeline for a user and friends.
 #. TRANS: %s is a username.
@@ -313,8 +308,6 @@ msgstr ""
 #. TRANS: %s is a username.
 #. TRANS: Menu item title in personal group navigation menu.
 #. TRANS: %s is a username.
-#. TRANS: Menu item title in settings navigation panel.
-#. TRANS: %s is a username.
 #, php-format
 msgid "%s and friends"
 msgstr "%s и при�тели"
@@ -352,7 +345,6 @@ msgstr ""
 #. TRANS: Server error thrown on database error updating SMS preferences.
 #. TRANS: Server error thrown on database error removing a registered SMS phone number.
 #. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
-#. TRANS: Server exception thrown on Profile design page when updating design settings fails.
 msgid "Could not update user."
 msgstr "Грешка при обнов�ване на потребител�."
 
@@ -367,7 +359,6 @@ msgstr "Грешка при запазване на профила."
 
 #. TRANS: Client error displayed when the number of bytes in a POST request exceeds a limit.
 #. TRANS: %s is the number of bytes of the CONTENT_LENGTH.
-#. TRANS: Form validation error in design settings form. POST should remain untranslated.
 #, php-format
 msgid ""
 "The server was unable to handle that much POST data (%s byte) due to its "
@@ -378,26 +369,6 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#. TRANS: Client error displayed when saving design settings fails because of an empty id.
-#. TRANS: Client error displayed when saving design settings fails because of an empty result.
-#. TRANS: Client error displayed when a database error occurs inserting profile colours.
-#. TRANS: Client error displayed when a database error occurs updating profile colours.
-#. TRANS: Form validation error displayed when group design settings could not be saved because of an application issue.
-#. TRANS: Form validation error on Profile design page when saving design settings has failed.
-#. TRANS: Form validation error on Profile design page when updating design settings has failed.
-#, fuzzy
-msgid "Unable to save your design settings."
-msgstr "Грешка при запи�ване на�тройките за Twitter"
-
-#. TRANS: Error displayed when updating design settings fails.
-#. TRANS: Client error displayed when a database error occurs updating profile colours.
-#. TRANS: Form validation error on Profile design page when updating design settings has failed.
-#. TRANS: Error message displayed if design settings could not be saved.
-#. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
-#, fuzzy
-msgid "Could not update your design."
-msgstr "Грешка при обнов�ване на потребител�."
-
 #. TRANS: Title for Atom feed.
 msgctxt "ATOM"
 msgid "Main"
@@ -444,6 +415,22 @@ msgstr "Грешка при блокиране на потребител�."
 msgid "Unblock user failed."
 msgstr "Грешка при разблокиране на потребител�."
 
+#. TRANS: Client exception thrown when no conversation ID is given.
+#, fuzzy
+msgid "No conversation ID."
+msgstr "Разговор"
+
+#. TRANS: Client exception thrown when referring to a non-existing conversation ID (%d).
+#, fuzzy, php-format
+msgid "No conversation with ID %d."
+msgstr "Разговор"
+
+#. TRANS: Title for conversion timeline.
+#, fuzzy
+msgctxt "TITLE"
+msgid "Conversation"
+msgstr "Разговор"
+
 #. TRANS: Title. %s is a user nickname.
 #, php-format
 msgid "Direct messages from %s"
@@ -490,6 +477,8 @@ msgstr ""
 "при�тели."
 
 #. TRANS: Client error displayed trying to direct message self (403).
+#. TRANS: Client error displayed trying to send a direct message to self.
+#. TRANS: Error text shown when trying to send a direct message to self.
 #, fuzzy
 msgid ""
 "Do not send a message to yourself; just say it to yourself quietly instead."
@@ -725,7 +714,6 @@ msgstr "групи в %s"
 
 #. TRANS: Client error displayed when trying to edit a group without being an admin.
 #. TRANS: Client error displayed trying to edit a group while not being a group admin.
-#. TRANS: Client error displayed trying to change group design settings without being a (group) admin.
 #. TRANS: Client error displayed when trying to change group logo settings while not being a group admin.
 msgid "You must be an admin to edit the group."
 msgstr "За да редактирате група, тр�бва да �те влезли."
@@ -848,7 +836,6 @@ msgstr "Грешка в базата от данни — отговор при 
 
 #. TRANS: Client error given on when invalid data was passed through a form in the OAuth API.
 #. TRANS: Unexpected validation error on avatar upload form.
-#. TRANS: Client error displayed when the submitted form contains unexpected data.
 #. TRANS: Client error displayed submitting invalid form data for edit application.
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
 #. TRANS: Form validation error message when an unsupported argument is used.
@@ -857,7 +844,6 @@ msgstr "Грешка в базата от данни — отговор при 
 #. TRANS: Client error when submitting a form with unexpected information.
 #. TRANS: Client error displayed when unexpected data is posted in the password recovery form.
 #. TRANS: Message given submitting a form with an unknown action in SMS settings.
-#. TRANS: Unknown form validation error in design settings form.
 msgid "Unexpected form submission."
 msgstr "�еочаквано изпращане на форма."
 
@@ -896,7 +882,6 @@ msgstr "Сметка"
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Field label on account registration page.
-#. TRANS: Label for nickname on user authorisation page.
 #. TRANS: Field label on group edit form.
 #. TRANS: Dropdown option for searching in profiles.
 msgid "Nickname"
@@ -1211,12 +1196,9 @@ msgstr "За напу�нете група, тр�бва да �те влезл
 #. TRANS: Client error displayed when requesting Friends of a Friend feed for a nickname that is not a group.
 #. TRANS: Client error displayed trying to block a user from a group while specifying a non-existing group.
 #. TRANS: Client error displayed referring to a group's permalink for a non-existing group ID.
-#. TRANS: Client error displayed trying to change group design settings while providing a nickname for a non-existing group.
 #. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
 #. TRANS: Client error displayed when trying to view group members for a non-existing group.
 #. TRANS: Client error displayed when trying to view group members for an object that is not a group.
-#. TRANS: Client error displayed when trying to view group members for a non-existing group.
-#. TRANS: Client error displayed when trying to view group members for an object that is not a group.
 #. TRANS: Client error displayed when requesting a group RSS feed for group that does not exist.
 #. TRANS: Client error displayed when requesting a group RSS feed for an object that is not a group.
 #. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
@@ -1225,10 +1207,10 @@ msgstr "За напу�нете група, тр�бва да �те влезл
 #. TRANS: Client error displayed when trying to leave a non-local group.
 #. TRANS: Client error displayed when trying to leave a non-existing group.
 #. TRANS: Client error displayed when providing an invalid group ID on the Make Admin page.
-#. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
-#. TRANS: Client error displayed if no local group with a given name was found requesting group page.
 #. TRANS: Command exception text shown when a group is requested that does not exist.
 #. TRANS: Error text shown when trying to leave a group that does not exist.
+#. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
+#. TRANS: Client error displayed if no local group with a given name was found requesting group page.
 msgid "No such group."
 msgstr "��ма такава група"
 
@@ -1298,6 +1280,7 @@ msgid "Join request canceled."
 msgstr ""
 
 #. TRANS: Client error displayed trying to approve subscription for a non-existing request.
+#. TRANS: %s is a user nickname.
 #, fuzzy, php-format
 msgid "%s is not in the moderation queue for your subscriptions."
 msgstr "Спи�ък � потребителите в тази група."
@@ -1461,7 +1444,6 @@ msgstr "��ма прикачени файлове."
 #. TRANS: Client error displayed trying to get an avatar without providing a nickname.
 #. TRANS: Client error displayed when requesting a list of blocked users for a group without providing a group nickname.
 #. TRANS: Client error displayed trying to edit a group while not proving a nickname for the group to edit.
-#. TRANS: Client error displayed trying to change group design settings without providing a group nickname.
 #. TRANS: Client error displayed when trying to change group logo settings without providing a nickname.
 #. TRANS: Client error displayed when trying to view group members without providing a group nickname.
 #. TRANS: Client error displayed when requesting a group RSS feed without providing a group nickname.
@@ -1757,6 +1739,18 @@ msgstr "�дре�ът \"%s\" е потвърден за �метката ви."
 msgid "Conversation"
 msgstr "Разговор"
 
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#, fuzzy
+msgid "Conversation feed (Activity Streams JSON)"
+msgstr "Еми�и� � бележки на %s (Atom)"
+
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#, fuzzy
+msgid "Conversation feed (RSS 2.0)"
+msgstr "Еми�и� � бележки на %s (RSS 2.0)"
+
 #. TRANS: Title for conversation page.
 #. TRANS: Title for page that shows a notice.
 #, fuzzy
@@ -1820,7 +1814,7 @@ msgstr "�е можете да изтривате потребители."
 
 #. TRANS: Button title for user account deletion.
 #, fuzzy
-msgid "Permanently delete your account"
+msgid "Permanently delete your account."
 msgstr "�е можете да изтривате потребители."
 
 #. TRANS: Client error displayed trying to delete an application while not logged in.
@@ -1968,161 +1962,6 @@ msgstr "Да не �е изтрива бележката"
 msgid "Delete this user."
 msgstr "Изтриване на този потребител"
 
-#. TRANS: Message used as title for design settings for the site.
-msgid "Design"
-msgstr "Дизайн"
-
-#. TRANS: Instructions for design adminsitration panel.
-msgid "Design settings for this StatusNet site"
-msgstr ""
-
-#. TRANS: Client error displayed when a logo URL does is not valid.
-#, fuzzy
-msgid "Invalid logo URL."
-msgstr "�еправилен размер."
-
-#. TRANS: Client error displayed when an SSL logo URL is invalid.
-#, fuzzy
-msgid "Invalid SSL logo URL."
-msgstr "�еправилен размер."
-
-#. TRANS: Client error displayed when a theme is submitted through the form that is not in the theme list.
-#. TRANS: %s is the chosen unavailable theme.
-#, fuzzy, php-format
-msgid "Theme not available: %s."
-msgstr "Страницата не е до�тъпна във вида меди�, който приемате"
-
-#. TRANS: Fieldset legend for form to change logo.
-msgid "Change logo"
-msgstr "См�на на логото"
-
-#. TRANS: Field label for StatusNet site logo.
-msgid "Site logo"
-msgstr "Лого на �айта"
-
-#. TRANS: Field label for SSL StatusNet site logo.
-#, fuzzy
-msgid "SSL logo"
-msgstr "Лого на �айта"
-
-#. TRANS: Fieldset legend for form change StatusNet site's theme.
-#, fuzzy
-msgid "Change theme"
-msgstr "Пром�на"
-
-#. TRANS: Field label for dropdown to choose site theme.
-msgid "Site theme"
-msgstr "Път до �айта"
-
-#. TRANS: Title for field label for dropdown to choose site theme.
-#, fuzzy
-msgid "Theme for the site."
-msgstr "Излизане от �айта"
-
-#. TRANS: Field label for uploading a cutom theme.
-#, fuzzy
-msgid "Custom theme"
-msgstr "�ова бележка"
-
-#. TRANS: Form instructions for uploading a cutom StatusNet theme.
-msgid "You can upload a custom StatusNet theme as a .ZIP archive."
-msgstr ""
-
-#. TRANS: Fieldset legend for theme background image.
-msgid "Change background image"
-msgstr "См�на на изображението за фон"
-
-#. TRANS: Field label for background image on theme designer page.
-#. TRANS: Field label for background color selector.
-#. TRANS: Label on profile design page for setting a profile page background colour.
-msgid "Background"
-msgstr "Фон"
-
-#. TRANS: Form guide for background image upload form on theme designer page.
-#, php-format
-msgid ""
-"You can upload a background image for the site. The maximum file size is %1"
-"$s."
-msgstr ""
-"Можете да качите лично изображение за фон. Мак�ималната големина на файла е "
-"2MB."
-
-#. TRANS: Used as radio button label to add a background image.
-msgid "On"
-msgstr "Вкл."
-
-#. TRANS: Used as radio button label to not add a background image.
-msgid "Off"
-msgstr "Изкл."
-
-#. TRANS: Form guide for turning background image on or off on theme designer page.
-#. TRANS: Form guide for a set of radio buttons on the profile design page that will enable or disable
-#. TRANS: use of the uploaded profile image.
-#, fuzzy
-msgid "Turn background image on or off."
-msgstr "См�на на изображението за фон"
-
-#. TRANS: Checkbox label to title background image on theme designer page.
-#. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
-#, fuzzy
-msgid "Tile background image"
-msgstr "См�на на изображението за фон"
-
-#. TRANS: Fieldset legend for theme colors.
-#, fuzzy
-msgid "Change colors"
-msgstr "См�на на цветовете"
-
-#. TRANS: Field label for content color selector.
-#. TRANS: Label on profile design page for setting a profile page content colour.
-msgid "Content"
-msgstr "Съдържание"
-
-#. TRANS: Field label for sidebar color selector.
-#. TRANS: Label on profile design page for setting a profile page sidebar colour.
-msgid "Sidebar"
-msgstr "Страничен панел"
-
-#. TRANS: Field label for text color selector.
-#. TRANS: Label on profile design page for setting a profile page text colour.
-msgid "Text"
-msgstr "Тек�т"
-
-#. TRANS: Field label for link color selector.
-#. TRANS: Label on profile design page for setting a profile page links colour.
-msgid "Links"
-msgstr "Лиценз"
-
-#. TRANS: Fieldset legend for advanced theme design settings.
-msgid "Advanced"
-msgstr ""
-
-#. TRANS: Field label for custom CSS.
-msgid "Custom CSS"
-msgstr ""
-
-#. TRANS: Button text for resetting theme settings.
-msgctxt "BUTTON"
-msgid "Use defaults"
-msgstr ""
-
-#. TRANS: Title for button for resetting theme settings.
-#. TRANS: Title for button on profile design page to reset all colour settings to default.
-#, fuzzy
-msgid "Restore default designs."
-msgstr "Грешка при запи�ване на�тройките за Twitter"
-
-#. TRANS: Title for button for resetting theme settings.
-#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-msgid "Reset back to default."
-msgstr ""
-
-#. TRANS: Title for button for saving theme settings.
-#. TRANS: Title for button on profile design page to save settings.
-#, fuzzy
-msgid "Save design."
-msgstr "Запазване на�тройките на �айта"
-
 #. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
 msgid "This notice is not a favorite!"
 msgstr "Тази бележка не е отбел�зана като любима!"
@@ -2137,6 +1976,84 @@ msgstr "Добав�не към любимите"
 msgid "No such document \"%s\"."
 msgstr "��ма такава бележка."
 
+#. TRANS: Menu item in administrator navigation panel.
+#. TRANS: Menu item in default local navigation panel.
+#. TRANS: Menu item in personal group navigation menu.
+#, fuzzy
+msgctxt "MENU"
+msgid "Home"
+msgstr "Лична �траница"
+
+msgctxt "MENU"
+msgid "Docs"
+msgstr ""
+
+#. TRANS: Secondary navigation menu item leading to help on StatusNet.
+msgctxt "MENU"
+msgid "Help"
+msgstr "Помощ"
+
+#, fuzzy
+msgid "Getting started"
+msgstr "�а�тройките �а запазени."
+
+#. TRANS: Secondary navigation menu item leading to text about StatusNet site.
+#, fuzzy
+msgctxt "MENU"
+msgid "About"
+msgstr "Отно�но"
+
+#, fuzzy
+msgid "About this site"
+msgstr "Разблокиране на този потребител"
+
+#. TRANS: Secondary navigation menu item leading to Frequently Asked Questions.
+#, fuzzy
+msgctxt "MENU"
+msgid "FAQ"
+msgstr "Въпро�и"
+
+msgid "Frequently asked questions"
+msgstr ""
+
+#. TRANS: Secondary navigation menu item leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+#, fuzzy
+msgctxt "MENU"
+msgid "Contact"
+msgstr "Контакт"
+
+#, fuzzy
+msgid "Contact info"
+msgstr "Контакт"
+
+#, fuzzy
+msgctxt "MENU"
+msgid "Tags"
+msgstr "Етикети"
+
+msgid "Using tags"
+msgstr ""
+
+#. TRANS: Menu item in default local navigation panel.
+#. TRANS: Menu item in search group navigation panel.
+#. TRANS: Menu item in local navigation menu.
+#, fuzzy
+msgctxt "MENU"
+msgid "Groups"
+msgstr "Групи"
+
+#, fuzzy
+msgid "Using groups"
+msgstr "Групи"
+
+msgctxt "MENU"
+msgid "API"
+msgstr ""
+
+msgid "RESTful API"
+msgstr ""
+
 #. TRANS: Title for "Edit application" form.
 #. TRANS: Form legend.
 #, fuzzy
@@ -2310,7 +2227,7 @@ msgid ""
 "subscriptions to it. Do you still want to continue?"
 msgstr ""
 
-#. TRANS: TRANS: Server error displayed when updating a list fails.
+#. TRANS: Server error displayed when updating a list fails.
 #, fuzzy
 msgid "Could not update list."
 msgstr "Грешка при обнов�ване на потребител�."
@@ -2615,44 +2532,6 @@ msgstr "��ма прикачени файлове."
 msgid "No uploaded attachments."
 msgstr "��ма прикачени файлове."
 
-#. TRANS: Client error displayed when subscribing to a remote profile and an unexpected response is received.
-msgid "Not expecting this response!"
-msgstr "�еочакван отговор."
-
-#. TRANS: Client error displayed when subscribing to a remote profile that does not exist.
-#, fuzzy
-msgid "User being listened to does not exist."
-msgstr "Потребител�т, когото про�лед�вате, не �ъще�твува. "
-
-#. TRANS: Client error displayed when subscribing to a remote profile that is a local profile.
-#. TRANS: Client error displayed when using remote subscribe for a local entity.
-msgid "You can use the local subscription!"
-msgstr "Можете да ползвате локален абонамент!"
-
-#. TRANS: Client error displayed when subscribing to a remote profile that is blocked form subscribing to.
-msgid "That user has blocked you from subscribing."
-msgstr "Потребител�т е забранил да �е абонирате за него."
-
-#. TRANS: Client error displayed when subscribing to a remote profile without providing an authorised token.
-msgid "You are not authorized."
-msgstr "�е �те абонирани за никого."
-
-#. TRANS: Client error displayed when subscribing to a remote profile and conversion of the request token to access token fails.
-#, fuzzy
-msgid "Could not convert request token to access token."
-msgstr "Грешка при преобразуване на tokens за одобрение в tokens за до�тъп."
-
-#. TRANS: Client error displayed when subscribing to a remote profile fails because of an unsupported version of the OMB protocol.
-#, fuzzy
-msgid "Remote service uses unknown version of OMB protocol."
-msgstr "�епозната вер�и� на протокола OMB."
-
-#. TRANS: Server error displayed when subscribing to a remote profile fails because the remote profile could not be updated.
-#. TRANS: Exception thrown when updating a remote profile fails in OAuth store.
-#, fuzzy
-msgid "Error updating remote profile."
-msgstr "Грешка при обнов�ване на отдалечен профил"
-
 #. TRANS: Client error displayed when requesting a non-existent file.
 msgid "No such file."
 msgstr "��ма такъв файл."
@@ -2742,31 +2621,6 @@ msgstr "Разблокиране на потребител� от групата
 msgid "No ID."
 msgstr "Лип�ва ID."
 
-#. TRANS: Client error displayed trying to change group design settings while not logged in.
-msgid "You must be logged in to edit a group."
-msgstr "За да редактирате група, тр�бва да �те влезли."
-
-#. TRANS: Title group design settings page.
-#, fuzzy
-msgid "Group design"
-msgstr "Групи"
-
-#. TRANS: Instructions for group design settings page.
-msgid ""
-"Customize the way your group looks with a background image and a colour "
-"palette of your choice."
-msgstr ""
-
-#. TRANS: Form validation error displayed when group design settings could not be updated because of an application issue.
-#, fuzzy
-msgid "Unable to update your design settings."
-msgstr "Грешка при запи�ване на�тройките за Twitter"
-
-#. TRANS: Form text to confirm saved group design settings.
-#. TRANS: Confirmation message on Profile design page when saving design settings has succeeded.
-msgid "Design preferences saved."
-msgstr "�а�тройките на е-поща �а запазени."
-
 #. TRANS: Title for group logo settings page.
 #. TRANS: Group logo form legend.
 msgid "Group logo"
@@ -2933,8 +2787,8 @@ msgstr "�а�тройки за SMS"
 #. TRANS: the order and formatting of link text and link should remain unchanged.
 #, fuzzy, php-format
 msgid ""
-"You can send and receive notices through instant messaging [instant messages]"
-"(%%doc.im%%). Configure your addresses and settings below."
+"You can send and receive notices through [instant messaging](%%doc.im%%). "
+"Configure your addresses and settings below."
 msgstr ""
 "Можете да получавате �ъобщени� по Jabber/GTalk [instant messages](%%doc.im%"
 "%). Въведете адре�а �и в на�тройките по-долу."
@@ -3151,30 +3005,6 @@ msgstr ""
 "Използвайте това поле, за да поканите при�тели и колеги да използват "
 "у�лугата на �айта."
 
-#. TRANS: Field label for a list of e-mail addresses.
-msgid "Email addresses"
-msgstr "�дре�и на е-поща"
-
-#. TRANS: Tooltip for field label for a list of e-mail addresses.
-#, fuzzy
-msgid "Addresses of friends to invite (one per line)."
-msgstr "�дре�и на при�тели, които каните (по един на ред)"
-
-#. TRANS: Field label for a personal message to send to invitees.
-msgid "Personal message"
-msgstr "Лично �ъобщение"
-
-#. TRANS: Tooltip for field label for a personal message to send to invitees.
-msgid "Optionally add a personal message to the invitation."
-msgstr "Може да добавите и лично �ъобщение към поканата."
-
-#. TRANS: Send button for inviting friends
-#. TRANS: Button text for sending notice.
-#, fuzzy
-msgctxt "BUTTON"
-msgid "Send"
-msgstr "Прати"
-
 #. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral
 #. TRANS: singular 3rd-person pronoun in English. %1$s is the inviting user, $2$s is
 #. TRANS: the StatusNet sitename.
@@ -3309,12 +3139,6 @@ msgstr ""
 msgid "Save license settings."
 msgstr "Запазване на�тройките на �айта"
 
-#. TRANS: Client error displayed when trying to log in while already logged in.
-#. TRANS: Client error displayed trying to use "one time password login" when already logged in.
-#. TRANS: Client error displayed when trying to register while already logged in.
-msgid "Already logged in."
-msgstr "Вече �те влезли."
-
 #. TRANS: Form validation error displayed when trying to log in with incorrect credentials.
 msgid "Incorrect username or password."
 msgstr "Грешно име или парола."
@@ -3433,6 +3257,7 @@ msgstr "Името е задължително."
 msgid "Could not create application."
 msgstr "Грешка при отбел�зване като любима."
 
+#. TRANS: Form validation error messages displayed when uploading an invalid application logo.
 #, fuzzy
 msgid "Invalid image."
 msgstr "�еправилен размер."
@@ -3472,14 +3297,6 @@ msgstr "��ма �ъдържание!"
 msgid "No recipient specified."
 msgstr "�е е указан получател."
 
-#. TRANS: Client error displayed trying to send a direct message to self.
-#. TRANS: Error text shown when trying to send a direct message to self.
-msgid ""
-"Don't send a message to yourself; just say it to yourself quietly instead."
-msgstr ""
-"�е може да изпращате �ъобщени� до �ебе �и. По-добре �и го кажете на �ебе �и "
-"тихичко."
-
 #. TRANS: Page title after sending a direct message.
 msgid "Message sent"
 msgstr "Съобщението е изпратено"
@@ -3677,6 +3494,33 @@ msgstr ""
 msgid "Not a supported data format."
 msgstr "�еподдържан формат на данните"
 
+#. TRANS: Page title for profile settings.
+#, fuzzy
+msgid "Old school UI settings"
+msgstr "�а�тройки за SMS"
+
+#. TRANS: Usage instructions for profile settings.
+msgid "If you like it \"the old way\", you can set that here."
+msgstr ""
+
+#. TRANS: Confirmation shown when user profile settings are saved.
+#. TRANS: Message after successful saving of administrative settings.
+msgid "Settings saved."
+msgstr "�а�тройките �а запазени."
+
+msgid "Only stream mode (no conversations) in timelines"
+msgstr ""
+
+msgid "Show conversation page as hierarchical trees"
+msgstr ""
+
+msgid "Show nicknames (not full names) in timelines"
+msgstr ""
+
+#. TRANS: Button text to save a list.
+msgid "Save"
+msgstr "Запазване"
+
 #. TRANS: ShortName in the OpenSearch interface when trying to find users.
 msgid "People Search"
 msgstr "Тър�ене на хора"
@@ -3685,6 +3529,11 @@ msgstr "Тър�ене на хора"
 msgid "Notice Search"
 msgstr "Тър�ене на бележки"
 
+#. TRANS: Client error displayed trying to use "one time password login" when already logged in.
+#. TRANS: Client error displayed when trying to register while already logged in.
+msgid "Already logged in."
+msgstr "Вече �те влезли."
+
 #. TRANS: Client error displayed trying to use "one time password login" without specifying a user.
 #, fuzzy
 msgid "No user ID specified."
@@ -3760,7 +3609,7 @@ msgid "Confirm"
 msgstr "Потвърждаване"
 
 #. TRANS: Field title on page where to change password.
-#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
+#. TRANS: Title for field label for password reset form where the password has to be typed again.
 #. TRANS: Field title on account registration page.
 #, fuzzy
 msgid "Same as password above."
@@ -3823,12 +3672,6 @@ msgstr "Страницата не е до�тъпна във вида меди�
 msgid "Avatar directory not writable: %s."
 msgstr "Директори� на аватара"
 
-#. TRANS: Client error in Paths admin panel.
-#. TRANS: %s is the background directory that could not be written to.
-#, fuzzy, php-format
-msgid "Background directory not writable: %s."
-msgstr "Директори� на фона"
-
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the locales directory that could not be read from.
 #, fuzzy, php-format
@@ -3948,31 +3791,6 @@ msgstr "Директори� на аватара"
 msgid "Directory where avatars are located."
 msgstr ""
 
-#. TRANS: Fieldset legend in Paths admin panel.
-msgid "Backgrounds"
-msgstr "Фонове"
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-#, fuzzy
-msgid "Server for backgrounds."
-msgstr "Излизане от �айта"
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-msgid "Web path to backgrounds."
-msgstr ""
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-msgid "Server for backgrounds on SSL pages."
-msgstr ""
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-msgid "Web path to backgrounds on SSL pages."
-msgstr ""
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-msgid "Directory where backgrounds are located."
-msgstr ""
-
 #. TRANS: Fieldset legens in Paths admin panel.
 #, fuzzy
 msgid "Attachments"
@@ -4034,8 +3852,9 @@ msgid "Server to direct SSL requests to."
 msgstr ""
 
 #. TRANS: Button title text to store form data in the Paths admin panel.
-msgid "Save paths"
-msgstr "Запазване на пътищата"
+#, fuzzy
+msgid "Save path settings."
+msgstr "Запазване на�тройките на �айта"
 
 #. TRANS: Instructions for the "People search" page.
 #. TRANS: %%site.name%% is the name of the StatusNet site.
@@ -4172,7 +3991,7 @@ msgid ""
 "%%%site.name%%%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
 "blogging) service based on the Free Software [StatusNet](http://status.net/) "
 "tool. You can easily keep track of what they are doing by subscribing to the "
-"tag's timeline."
+"list's timeline."
 msgstr ""
 
 #. TRANS: Message displayed on page that displays lists by a user when there are none.
@@ -4201,7 +4020,7 @@ msgid ""
 "site.name%%%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
 "blogging) service based on the Free Software [StatusNet](http://status.net/) "
 "tool. You can easily keep track of what they are doing by subscribing to the "
-"tag's timeline."
+"list's timeline."
 msgstr ""
 
 #. TRANS: Message displayed on page that displays lists a user was added to when there are none.
@@ -4298,16 +4117,6 @@ msgid ""
 "All default plugins have been disabled from the site's configuration file."
 msgstr ""
 
-#. TRANS: Client error displayed if the notice posted has too many characters.
-msgid "Invalid notice content."
-msgstr "�еправилен размер."
-
-#. TRANS: Exception thrown if a notice's license is not compatible with the StatusNet site license.
-#. TRANS: %1$s is the notice license, %2$s is the StatusNet site's license.
-#, php-format
-msgid "Notice license \"%1$s\" is not compatible with site license \"%2$s\"."
-msgstr ""
-
 #. TRANS: Client error displayed when trying to add an unindentified field to profile.
 #. TRANS: %s is a field name.
 #, php-format
@@ -4405,6 +4214,8 @@ msgid "Share my current location when posting notices"
 msgstr ""
 
 #. TRANS: Field label in form for profile settings.
+#. TRANS: Title for group tag cloud section.
+#. TRANS: %s is a group name.
 msgid "Tags"
 msgstr "Етикети"
 
@@ -4432,9 +4243,8 @@ msgid "What timezone are you normally in?"
 msgstr "В кой ча�ови по�� �те обикновено?"
 
 #. TRANS: Checkbox label in form for profile settings.
-#, fuzzy
 msgid ""
-"Automatically subscribe to whoever subscribes to me (best for non-humans)."
+"Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr ""
 "�втоматично абониране за в�еки, който �е абонира за мен (подход�що за "
 "ботове)."
@@ -4506,11 +4316,6 @@ msgstr "Грешка при запазване етикетите."
 msgid "Could not save tags."
 msgstr "Грешка при запазване на етикетите."
 
-#. TRANS: Confirmation shown when user profile settings are saved.
-#. TRANS: Message after successful saving of administrative settings.
-msgid "Settings saved."
-msgstr "�а�тройките �а запазени."
-
 #. TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
 #. TRANS: Page title for page where a user account can be restored from backup.
 #, fuzzy
@@ -4524,7 +4329,8 @@ msgid "Beyond the page limit (%s)."
 msgstr ""
 
 #. TRANS: Server error displayed when a public timeline cannot be retrieved.
-msgid "Could not retrieve public stream."
+#, fuzzy
+msgid "Could not retrieve public timeline."
 msgstr "Грешка при изтегл�не на общи� поток"
 
 #. TRANS: Title for all public timeline pages but the first.
@@ -4539,15 +4345,23 @@ msgid "Public timeline"
 msgstr "Общ поток"
 
 #. TRANS: Link description for public timeline feed.
-msgid "Public Stream Feed (RSS 1.0)"
+#, fuzzy
+msgid "Public Timeline Feed (Activity Streams JSON)"
+msgstr "Еми�и� на общи� поток (Atom)"
+
+#. TRANS: Link description for public timeline feed.
+#, fuzzy
+msgid "Public Timeline Feed (RSS 1.0)"
 msgstr "Еми�и� на общи� поток (RSS 1.0)"
 
 #. TRANS: Link description for public timeline feed.
-msgid "Public Stream Feed (RSS 2.0)"
+#, fuzzy
+msgid "Public Timeline Feed (RSS 2.0)"
 msgstr "Еми�и� на общи� поток (RSS 2.0)"
 
 #. TRANS: Link description for public timeline feed.
-msgid "Public Stream Feed (Atom)"
+#, fuzzy
+msgid "Public Timeline Feed (Atom)"
 msgstr "Еми�и� на общи� поток (Atom)"
 
 #. TRANS: Text displayed for public feed when there are no public notices.
@@ -4586,47 +4400,6 @@ msgid ""
 "tool."
 msgstr ""
 
-#. TRANS: Title for page with public list cloud.
-#, fuzzy
-msgid "Public list cloud"
-msgstr "Общ поток, �траница %d"
-
-#. TRANS: Page notice for page with public list cloud.
-#. TRANS: %s is a StatusNet sitename.
-#, fuzzy, php-format
-msgid "These are largest lists on %s"
-msgstr "Това �а хората, които четат бележките на %s."
-
-#. TRANS: Empty list message on page with public list cloud.
-#. TRANS: This message contains Markdown links in the form [description](link).
-#, php-format
-msgid "No one has [listed](%%doc.tags%%) anyone yet."
-msgstr ""
-
-#. TRANS: Additional empty list message on page with public list cloud for logged in users.
-msgid "Be the first to list someone!"
-msgstr ""
-
-#. TRANS: Additional empty list message on page with public list cloud for anonymous users.
-#. TRANS: This message contains Markdown links in the form [description](link).
-#, php-format
-msgid ""
-"Why not [register an account](%%action.register%%) and be the first to list "
-"someone!"
-msgstr ""
-
-#. TRANS: DT element on on page with public list cloud.
-#, fuzzy
-msgid "List cloud"
-msgstr "�е е открит методът в API."
-
-#. TRANS: Link title for number of listed people. %d is the number of listed people.
-#, php-format
-msgid "1 person listed"
-msgid_plural "%d people listed"
-msgstr[0] ""
-msgstr[1] ""
-
 #. TRANS: Public RSS feed description. %s is the StatusNet site name.
 #, php-format
 msgid "%s updates from everyone."
@@ -4752,7 +4525,6 @@ msgid "6 or more characters, and do not forget it!"
 msgstr "6 или повече знака. И не ги забрав�йте!"
 
 #. TRANS: Button text for password reset form.
-#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Reset"
@@ -4762,18 +4534,6 @@ msgstr "Обнов�ване"
 msgid "Enter a nickname or email address."
 msgstr "Въведете п�евдоним или е-поща."
 
-#. TRANS: Information on password recovery form if no known username or e-mail address was specified.
-msgid "No user with that email address or username."
-msgstr "��ма потребител � такава е-поща или потребител�ко име."
-
-#. TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.
-msgid "No registered email address for that user."
-msgstr "��ма указана е-поща за този потребител."
-
-#. TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.
-msgid "Error saving address confirmation."
-msgstr "Грешка при запазване на потвърждение за адре�"
-
 #. TRANS: User notification after an e-mail with instructions was sent from the password recovery form.
 msgid ""
 "Instructions for recovering your password have been sent to the email "
@@ -4957,80 +4717,6 @@ msgstr ""
 "(Тр�бва да получите веднага електронно пи�мо � указани� за потвърждаване "
 "адре�а на е-пощата ви.)"
 
-#. TRANS: Page notice for remote subscribe. This message contains Markdown links.
-#. TRANS: Ensure to keep the correct markup of [link description](link).
-#, php-format
-msgid ""
-"To subscribe, you can [login](%%action.login%%), or [register](%%action."
-"register%%) a new  account. If you already have an account  on a [compatible "
-"microblogging site](%%doc.openmublog%%),  enter your profile URL below."
-msgstr ""
-"За да �е абонирате, можете да  [влезете](%%action.login%%) или да "
-"[реги�трирате](%%action.register%%) нова �метка. �ко имате �метка на друга, "
-"[подобна у�луга за микроблогване](%%doc.openmublog%%), въведете адре�а на "
-"профила �и в не� по-долу."
-
-#. TRANS: Page title for Remote subscribe.
-msgid "Remote subscribe"
-msgstr "Отдалечен абонамент"
-
-#. TRANS: Field legend on page for remote subscribe.
-msgid "Subscribe to a remote user"
-msgstr "�бониране за отдалечен потребител"
-
-#. TRANS: Field label on page for remote subscribe.
-msgid "User nickname"
-msgstr "Потребител�ки п�евдоним"
-
-#. TRANS: Field title on page for remote subscribe.
-#, fuzzy
-msgid "Nickname of the user you want to follow."
-msgstr "П�евдоним на потребител, когото и�кате да �ледите"
-
-#. TRANS: Field label on page for remote subscribe.
-msgid "Profile URL"
-msgstr "�дре� на профила"
-
-#. TRANS: Field title on page for remote subscribe.
-#, fuzzy
-msgid "URL of your profile on another compatible microblogging service."
-msgstr "�дре� на профила ви в друга, �ъвме�тима у�луга за микроблогване"
-
-#. TRANS: Button text on page for remote subscribe.
-#. TRANS: Link text for link that will subscribe to a remote profile.
-#. TRANS: Button text to subscribe to a user.
-#. TRANS: Button text for subscribing to a list.
-#, fuzzy
-msgctxt "BUTTON"
-msgid "Subscribe"
-msgstr "�бониране"
-
-#. TRANS: Form validation error on page for remote subscribe when an invalid profile URL was provided.
-#, fuzzy
-msgid "Invalid profile URL (bad format)."
-msgstr "�еправилен адре� на профил (грешен формат)"
-
-#. TRANS: Form validation error on page for remote subscribe when no the provided profile URL
-#. TRANS: does not contain expected data.
-msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
-msgstr ""
-"�еправилен адре� на профил (н�ма документ YADIS или XRDS е неправилен)."
-
-#. TRANS: Form validation error on page for remote subscribe.
-#, fuzzy
-msgid "That is a local profile! Login to subscribe."
-msgstr "Това е локален профил! Влезте, за да �е абонирате."
-
-#. TRANS: Form validation error on page for remote subscribe when the remote service is not providing a request token.
-#, fuzzy
-msgid "Could not get a request token."
-msgstr "�е е получен token за одобрение."
-
-#. TRANS: Client error displayed when trying to (un)list an OMB 0.1 remote profile.
-#, fuzzy
-msgid "You cannot (un)list an OMB 0.1 remote profile with this action."
-msgstr "�е �те абонирани за този профил"
-
 #. TRANS: Client error displayed when an unknown error occurs while delisting a user.
 #. TRANS: %s is a username.
 #, php-format
@@ -5083,6 +4769,12 @@ msgstr "Отговори на %s"
 msgid "Replies to %1$s, page %2$d"
 msgstr "Отговори до %1$s в %2$s!"
 
+#. TRANS: Link for feed with replies for a user.
+#. TRANS: %s is a user nickname.
+#, fuzzy, php-format
+msgid "Replies feed for %s (Activity Streams JSON)"
+msgstr "Еми�и� � отговори на %s (Atom)"
+
 #. TRANS: Link for feed with replies for a user.
 #. TRANS: %s is a user nickname.
 #, php-format
@@ -5197,7 +4889,7 @@ msgstr ""
 
 #. TRANS: Form instructions for feed restore.
 msgid ""
-"You can upload a backed-up stream in <a href=\"http://activitystrea.ms/"
+"You can upload a backed-up timeline in <a href=\"http://activitystrea.ms/"
 "\">Activity Streams</a> format."
 msgstr ""
 
@@ -5320,6 +5012,27 @@ msgstr ""
 msgid "Application info"
 msgstr "Данни за приложението"
 
+#. TRANS: Field label on application page.
+msgid "Consumer key"
+msgstr ""
+
+#. TRANS: Field label on application page.
+msgid "Consumer secret"
+msgstr ""
+
+#. TRANS: Field label on application page.
+#, fuzzy
+msgid "Request token URL"
+msgstr "�еправилен размер."
+
+#. TRANS: Field label on application page.
+msgid "Access token URL"
+msgstr ""
+
+#. TRANS: Field label on application page.
+msgid "Authorize URL"
+msgstr "Изходен код"
+
 #. TRANS: Note on the OAuth application page about signature support.
 msgid ""
 "Note: HMAC-SHA1 signatures are supported. The plaintext signature method is "
@@ -5341,6 +5054,11 @@ msgstr "Любими бележки на %1$s, �траница %2$d"
 msgid "Could not retrieve favorite notices."
 msgstr "Грешка при изтегл�не на любимите бележки"
 
+#. TRANS: Feed link text. %s is a username.
+#, fuzzy, php-format
+msgid "Feed for favorites of %s (Activity Streams JSON)"
+msgstr "Еми�и� � при�телите на %s"
+
 #. TRANS: Feed link text. %s is a username.
 #, php-format
 msgid "Feed for favorites of %s (RSS 1.0)"
@@ -5395,6 +5113,11 @@ msgstr "Група %s"
 msgid "%1$s group, page %2$d"
 msgstr "%1$s, �траница %2$d"
 
+#. TRANS: Tooltip for feed link. %s is a group nickname.
+#, fuzzy, php-format
+msgid "Notice feed for %s group (Activity Streams JSON)"
+msgstr "Еми�и� � бележки на %s (Atom)"
+
 #. TRANS: Tooltip for feed link. %s is a group nickname.
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
@@ -5415,44 +5138,8 @@ msgstr "Еми�и� � бележки на %s (Atom)"
 msgid "FOAF for %s group"
 msgstr "Изход�ща кути� за %s"
 
-#. TRANS: Header for mini list of group members on a group page (h2).
-msgid "Members"
-msgstr "Членове"
-
-#. TRANS: Description for mini list of group members on a group page when the group has no members.
-#. TRANS: Content of "Listed" page if there are no listed users.
-#. TRANS: Content of "People following tag x" if there are no subscribed users.
-#. TRANS: Empty list message for tags.
-#. TRANS: Text for user subscription statistics if the user has no subscriptions.
-#. TRANS: Text for user subscriber statistics if user has no subscribers.
-#. TRANS: Text for user user group membership statistics if user is not a member of any group.
-#. TRANS: Default content for section/sidebar widget.
-msgid "(None)"
-msgstr "(Без)"
-
-#. TRANS: Link to all group members from mini list of group members if group has more than n members.
-msgid "All members"
-msgstr "В�ички членове"
-
-#. TRANS: Header for group statistics on a group page (h2).
-#. TRANS: H2 text for user statistics.
-msgid "Statistics"
-msgstr "Стати�тики"
-
-#. TRANS: Label for group creation date.
-#, fuzzy
-msgctxt "LABEL"
-msgid "Created"
-msgstr "Създадена на"
-
-#. TRANS: Label for member count in statistics on group page.
-#, fuzzy
-msgctxt "LABEL"
-msgid "Members"
-msgstr "Членове"
-
 #. TRANS: Notice on group pages for anonymous users for StatusNet sites that accept new registrations.
-#. TRANS: **%s** is the group alias, %%%%site.name%%%% is the site name,
+#. TRANS: %s is the group name, %%%%site.name%%%% is the site name,
 #. TRANS: %%%%action.register%%%% is the URL for registration, %%%%doc.help%%%% is a URL to help.
 #. TRANS: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
 #, php-format
@@ -5465,22 +5152,16 @@ msgid ""
 msgstr ""
 
 #. TRANS: Notice on group pages for anonymous users for StatusNet sites that accept no new registrations.
-#. TRANS: **%s** is the group alias, %%%%site.name%%%% is the site name,
+#. TRANS: %s is the group name, %%%%site.name%%%% is the site name,
 #. TRANS: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
 "wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
 "[StatusNet](http://status.net/) tool. Its members share short messages about "
-"their life and interests. "
+"their life and interests."
 msgstr ""
 
-#. TRANS: Title for list of group administrators on a group page.
-#, fuzzy
-msgctxt "TITLE"
-msgid "Admins"
-msgstr "�дмини�тратори"
-
 #. TRANS: Client error displayed requesting a single message that does not exist.
 msgid "No such message."
 msgstr "��ма такова �ъобщение"
@@ -5573,10 +5254,22 @@ msgid ""
 msgstr ""
 
 #. TRANS: Header on show list page.
+#. TRANS: Link description for link to list of users tagged with a tag (so part of a list).
 #, fuzzy
 msgid "Listed"
 msgstr "Лиценз"
 
+#. TRANS: Content of "Listed" page if there are no listed users.
+#. TRANS: Content of "People following tag x" if there are no subscribed users.
+#. TRANS: Description for mini list of group members on a group page when the group has no members.
+#. TRANS: Empty list message for tags.
+#. TRANS: Text for user subscription statistics if the user has no subscriptions.
+#. TRANS: Text for user subscriber statistics if user has no subscribers.
+#. TRANS: Text for user user group membership statistics if user is not a member of any group.
+#. TRANS: Default content for section/sidebar widget.
+msgid "(None)"
+msgstr "(Без)"
+
 #. TRANS: Link for more "People in list x by a user"
 #. TRANS: if there are more than the mini list's maximum.
 msgid "Show all"
@@ -5587,24 +5280,19 @@ msgstr ""
 msgid "Subscribers"
 msgstr "�бонати"
 
-#. TRANS: Link for more "People following tag x"
-#. TRANS: if there are more than the mini list's maximum.
-msgid "All subscribers"
-msgstr "В�ички абонати"
-
-#. TRANS: Page title showing tagged notices in one user's stream.
+#. TRANS: Page title showing tagged notices in one user's timeline.
 #. TRANS: %1$s is the username, %2$s is the hash tag.
 #, fuzzy, php-format
 msgid "Notices by %1$s tagged %2$s"
 msgstr "%1$s, �траница %2$d"
 
-#. TRANS: Page title showing tagged notices in one user's stream.
+#. TRANS: Page title showing tagged notices in one user's timeline.
 #. TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number.
 #, fuzzy, php-format
 msgid "Notices by %1$s tagged %2$s, page %3$d"
 msgstr "Бележки � етикет %s"
 
-#. TRANS: Extended page title showing tagged notices in one user's stream.
+#. TRANS: Extended page title showing tagged notices in one user's timeline.
 #. TRANS: %1$s is the username, %2$d is the page number.
 #, fuzzy, php-format
 msgid "Notices by %1$s, page %2$d"
@@ -5616,6 +5304,12 @@ msgstr "Бележки � етикет %s"
 msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
 msgstr "Еми�и� � бележки на %s (RSS 1.0)"
 
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#, fuzzy, php-format
+msgid "Notice feed for %s (Activity Streams JSON)"
+msgstr "Еми�и� � бележки на %s (Atom)"
+
 #. TRANS: Title for link to notice feed.
 #. TRANS: %s is a user nickname.
 #, php-format
@@ -5640,7 +5334,7 @@ msgstr "Еми�и� � бележки на %s (Atom)"
 msgid "FOAF for %s"
 msgstr "FOAF за %s"
 
-#. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
+#. TRANS: First sentence of empty list message for a timeline. $1%s is a user nickname.
 #, php-format
 msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
 msgstr ""
@@ -5651,7 +5345,7 @@ msgid ""
 "would be a good time to start :)"
 msgstr ""
 
-#. TRANS: Second sentence of empty  list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
+#. TRANS: Second sentence of empty  list message for a non-self timeline. %1$s is a user nickname, %2$s is a part of a URL.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
 #, php-format
 msgid ""
@@ -5659,7 +5353,7 @@ msgid ""
 "%?status_textarea=%2$s)."
 msgstr ""
 
-#. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
+#. TRANS: Announcement for anonymous users showing a timeline if site registrations are open.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
 #, php-format
 msgid ""
@@ -5669,13 +5363,13 @@ msgid ""
 "follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))"
 msgstr ""
 
-#. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
+#. TRANS: Announcement for anonymous users showing a timeline if site registrations are closed or invite only.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
 "wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
-"[StatusNet](http://status.net/) tool. "
+"[StatusNet](http://status.net/) tool."
 msgstr ""
 
 #. TRANS: Link to the author of a repeated notice. %s is a linked nickname.
@@ -5710,6 +5404,16 @@ msgstr "Името на �айта е задължително."
 msgid "You must have a valid contact email address."
 msgstr "�еправилен адре� на е-поща."
 
+#. TRANS: Client error displayed when a logo URL is not valid.
+#, fuzzy
+msgid "Invalid logo URL."
+msgstr "�еправилен размер."
+
+#. TRANS: Client error displayed when a SSL logo URL is invalid.
+#, fuzzy
+msgid "Invalid SSL logo URL."
+msgstr "�еправилен размер."
+
 #. TRANS: Client error displayed trying to save site settings with an invalid language code.
 #. TRANS: %s is the invalid language code.
 #, php-format
@@ -5785,7 +5489,8 @@ msgid "Default language"
 msgstr "Език по подразбиране"
 
 #. TRANS: Dropdown title on site settings panel.
-msgid "Site language when autodetection from browser settings is not available"
+msgid ""
+"The site language when autodetection from browser settings is not available."
 msgstr ""
 
 #. TRANS: Fieldset legend on site settings panel.
@@ -5810,8 +5515,22 @@ msgstr ""
 msgid "How long users must wait (in seconds) to post the same thing again."
 msgstr ""
 
+#. TRANS: Fieldset legend for form to change logo.
+msgid "Logo"
+msgstr "Изход"
+
+#. TRANS: Field label for StatusNet site logo.
+msgid "Site logo"
+msgstr "Лого на �айта"
+
+#. TRANS: Field label for SSL StatusNet site logo.
+#, fuzzy
+msgid "SSL logo"
+msgstr "Лого на �айта"
+
 #. TRANS: Button title for saving site settings.
-msgid "Save site settings"
+#, fuzzy
+msgid "Save the site settings."
 msgstr "Запазване на�тройките на �айта"
 
 #. TRANS: Page title for site-wide notice tab in admin panel.
@@ -5840,7 +5559,7 @@ msgstr "Изтриване на бележката"
 msgid "Site-wide notice text (255 characters maximum; HTML allowed)"
 msgstr ""
 
-#. TRANS: Title for button to save site notice in admin panel.
+#. TRANS: Button title to save site notice in admin panel.
 #, fuzzy
 msgid "Save site notice."
 msgstr "Запазване на�тройките на �айта"
@@ -6042,7 +5761,7 @@ msgstr ""
 msgid "Snapshots will be sent to this URL."
 msgstr ""
 
-#. TRANS: Title for button to save snapshot settings.
+#. TRANS: Button title to save snapshot settings.
 #, fuzzy
 msgid "Save snapshot settings."
 msgstr "Запазване на�тройките на �айта"
@@ -6077,11 +5796,6 @@ msgstr "�бонати на %1$s, �траница %2$d"
 msgid "A list of users awaiting approval to subscribe to you."
 msgstr "Спи�ък � потребителите в тази група."
 
-#. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
-#, fuzzy
-msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
-msgstr "�е �те абонирани за този профил"
-
 #. TRANS: Page title when subscription succeeded.
 #, fuzzy
 msgid "Subscribed"
@@ -6181,8 +5895,7 @@ msgid ""
 "You're not listening to anyone's notices right now, try subscribing to "
 "people you know. Try [people search](%%action.peoplesearch%%), look for "
 "members in groups you're interested in and in our [featured users](%%action."
-"featured%%). If you're a [Twitter user](%%action.twittersettings%%), you can "
-"automatically subscribe to people you already follow there."
+"featured%%)."
 msgstr ""
 
 #. TRANS: Subscription list text when looking at the subscriptions for a of a user other
@@ -6214,6 +5927,12 @@ msgstr "SMS"
 msgid "Notices tagged with %1$s, page %2$d"
 msgstr "Бележки � етикет %s"
 
+#. TRANS: Link label for feed on "notices with tag" page.
+#. TRANS: %s is the tag the feed is for.
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (Activity Streams JSON)"
+msgstr "Еми�и� � бележки на %s (Atom)"
+
 #. TRANS: Link label for feed on "notices with tag" page.
 #. TRANS: %s is the tag the feed is for.
 #, php-format
@@ -6321,16 +6040,6 @@ msgstr "Отпи�ване"
 msgid "%1$s unsubscribed from list %2$s by %3$s"
 msgstr "�бонати на %1$s, �траница %2$d"
 
-#. TRANS: Client error displayed when trying to update profile with an incompatible license.
-#. TRANS: %1$s is the license incompatible with site license %2$s.
-#. TRANS: Exception thrown when licenses are not compatible for an authorisation request.
-#. TRANS: %1$s is the license for the listenee, %2$s is the license for "this" StatusNet site.
-#, php-format
-msgid ""
-"Listenee stream license \"%1$s\" is not compatible with site license \"%2$s"
-"\"."
-msgstr ""
-
 #. TRANS: Title of URL settings tab in profile settings.
 #, fuzzy
 msgid "URL settings"
@@ -6475,159 +6184,11 @@ msgstr "Поканите �а включени"
 msgid "Whether to allow users to invite new users."
 msgstr ""
 
-#. TRANS: Title for button to save user settings in user admin panel.
+#. TRANS: Button title to save user settings in user admin panel.
 #, fuzzy
 msgid "Save user settings."
 msgstr "Запазване на�тройките на �айта"
 
-#. TRANS: Page title.
-msgid "Authorize subscription"
-msgstr "Одобр�ване на абонамента"
-
-#. TRANS: Page notice on "Authorize subscription" page.
-#, fuzzy
-msgid ""
-"Please check these details to make sure that you want to subscribe to this "
-"user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
-"click \"Reject\"."
-msgstr ""
-"Проверете тези детайли и �е уверете, че и�кате да �е абонирате за бележките "
-"на този потребител. �ко не и�кате абонамента, нати�нете \"Cancel\" (Отказ)."
-
-#. TRANS: Button text on Authorise Subscription page.
-#. TRANS: Submit button text to accept a group membership request on approve group form.
-#. TRANS: Submit button text to accept a subscription request on approve sub form.
-#, fuzzy
-msgctxt "BUTTON"
-msgid "Accept"
-msgstr "Приемане"
-
-#. TRANS: Title for button on Authorise Subscription page.
-#. TRANS: Button title to subscribe to a user.
-#, fuzzy
-msgid "Subscribe to this user."
-msgstr "�бониране за този потребител"
-
-#. TRANS: Button text on Authorise Subscription page.
-#. TRANS: Submit button text to reject a group membership request on approve group form.
-#. TRANS: Submit button text to reject a subscription request on approve sub form.
-#, fuzzy
-msgctxt "BUTTON"
-msgid "Reject"
-msgstr "Охвърл�не"
-
-#. TRANS: Title for button on Authorise Subscription page.
-#, fuzzy
-msgid "Reject this subscription."
-msgstr "�бонаменти на %s"
-
-#. TRANS: Client error displayed for an empty authorisation request.
-msgid "No authorization request!"
-msgstr "��ма за�вка за одобрение."
-
-#. TRANS: Accept message header from Authorise subscription page.
-msgid "Subscription authorized"
-msgstr "�бонаментът е одобрен"
-
-#. TRANS: Accept message text from Authorise subscription page.
-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 за абонамент е:"
-
-#. TRANS: Reject message header from Authorise subscription page.
-msgid "Subscription rejected"
-msgstr "�бонаментът е отказан"
-
-#. TRANS: Reject message from Authorise subscription page.
-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. За да откажете напълно "
-"абонамента, проверете ин�трукциите на �айта."
-
-#. TRANS: Exception thrown when no valid user is found for an authorisation request.
-#. TRANS: %s is a listener URI.
-#, php-format
-msgid "Listener URI \"%s\" not found here."
-msgstr ""
-
-#. TRANS: Exception thrown when listenee URI is too long for an authorisation request.
-#. TRANS: %s is a listenee URI.
-#, fuzzy, php-format
-msgid "Listenee URI \"%s\" is too long."
-msgstr "Изходни�т адре� е твърде дълъг."
-
-#. TRANS: Exception thrown when listenee URI is a local user for an authorisation request.
-#. TRANS: %s is a listenee URI.
-#, php-format
-msgid "Listenee URI \"%s\" is a local user."
-msgstr ""
-
-#. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
-#. TRANS: %s is a profile URL.
-#, php-format
-msgid "Profile URL \"%s\" is for a local user."
-msgstr ""
-
-#. TRANS: Exception thrown when avatar URL is invalid for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#, fuzzy, php-format
-msgid "Avatar URL \"%s\" is not valid."
-msgstr "�дре�ът на личната �траница не е правилен URL."
-
-#. TRANS: Exception thrown when avatar URL could not be read for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#, fuzzy, php-format
-msgid "Cannot read avatar URL \"%s\"."
-msgstr "Грешка при четене адре�а на аватара '%s'"
-
-#. TRANS: Exception thrown when avatar URL return an invalid image type for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#, fuzzy, php-format
-msgid "Wrong image type for avatar URL \"%s\"."
-msgstr "Грешен вид изображение за '%s'"
-
-#. TRANS: Title for profile design page.
-#. TRANS: Page title for profile design page.
-#, fuzzy
-msgid "Profile design"
-msgstr "�а�тройки на профила"
-
-#. TRANS: Instructions for Profile design page.
-#. TRANS: Instructions for profile design page.
-msgid ""
-"Customize the way your profile looks with a background image and a colour "
-"palette of your choice."
-msgstr ""
-
-#. TRANS: Succes message on Profile design page when finding an easter egg.
-msgid "Enjoy your hotdog!"
-msgstr ""
-
-#. TRANS: Form legend on Profile design page.
-#, fuzzy
-msgid "Design settings"
-msgstr "Запазване на�тройките на �айта"
-
-#. TRANS: Checkbox label on Profile design page.
-msgid "View profile designs"
-msgstr "Редактиране на профила"
-
-#. TRANS: Title for checkbox on Profile design page.
-msgid "Show or hide profile designs."
-msgstr ""
-
-#. TRANS: Form legend on Profile design page for form to choose a background image.
-#, fuzzy
-msgid "Background file"
-msgstr "Фон"
-
 #. TRANS: Page title for all but the first page of groups for a user.
 #. TRANS: %1$s is a nickname, %2$d is a page number.
 #, php-format
@@ -6668,7 +6229,7 @@ msgstr "StatusNet %s"
 #. TRANS: %1$s is the engine name (StatusNet) and %2$s is the StatusNet version.
 #, php-format
 msgid ""
-"This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, "
+"This site is powered by %1$s version %2$s, Copyright 2008-2011 StatusNet, "
 "Inc. and contributors."
 msgstr ""
 
@@ -6685,7 +6246,7 @@ msgid ""
 "StatusNet is free software: you can redistribute it and/or modify it under "
 "the terms of the GNU Affero General Public License as published by the Free "
 "Software Foundation, either version 3 of the License, or (at your option) "
-"any later version. "
+"any later version."
 msgstr ""
 
 #. TRANS: Content part of StatusNet version page.
@@ -6693,7 +6254,7 @@ msgid ""
 "This program is distributed in the hope that it will be useful, but WITHOUT "
 "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
 "FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License "
-"for more details. "
+"for more details."
 msgstr ""
 
 #. TRANS: Content part of StatusNet version page.
@@ -6751,16 +6312,26 @@ msgstr ""
 msgid "Robin thinks something is impossible."
 msgstr ""
 
+#. TRANS: Message used to be inserted as %2$s in  the text "No file may
+#. TRANS: be larger than %1$d byte and the file you sent was %2$s.".
+#. TRANS: %1$d is the number of bytes of an uploaded file.
+#, php-format
+msgid "%1$d byte"
+msgid_plural "%1$d bytes"
+msgstr[0] ""
+msgstr[1] ""
+
 #. TRANS: Message given if an upload is larger than the configured maximum.
-#. TRANS: %1$d is the byte limit for uploads, %2$d is the byte count for the uploaded file.
-#. TRANS: %1$s is used for plural.
+#. TRANS: %1$d (used for plural) is the byte limit for uploads,
+#. TRANS: %2$s is the proper form of "n bytes". This is the only ways to have
+#. TRANS: gettext support multiple plurals in the same message, unfortunately...
 #, php-format
 msgid ""
-"No file may be larger than %1$d byte and the file you sent was %2$d bytes. "
-"Try to upload a smaller version."
+"No file may be larger than %1$d byte and the file you sent was %2$s. Try to "
+"upload a smaller version."
 msgid_plural ""
-"No file may be larger than %1$d bytes and the file you sent was %2$d bytes. "
-"Try to upload a smaller version."
+"No file may be larger than %1$d bytes and the file you sent was %2$s. Try to "
+"upload a smaller version."
 msgstr[0] ""
 msgstr[1] ""
 
@@ -6833,6 +6404,11 @@ msgstr "Грешка при обнов�ване на групата."
 msgid "Could not create login token for %s"
 msgstr "Грешка при отбел�зване като любима."
 
+#. TRANS: Exception thrown when a program code class (%s) cannot be instantiated.
+#, fuzzy, php-format
+msgid "Cannot instantiate class %s."
+msgstr "Грешка при запазване на новата парола."
+
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.
 msgid "No database name or DSN found anywhere."
 msgstr ""
@@ -6999,7 +6575,7 @@ msgstr ""
 #, php-format
 msgid ""
 "You already have %1$d or more people in list %2$s, which is the maximum "
-"allowed number.Try unlisting others first."
+"allowed number. Try unlisting others first."
 msgstr ""
 
 #. TRANS: Exception thrown when inserting a list subscription in the database fails.
@@ -7022,7 +6598,6 @@ msgid "Unable to save tag."
 msgstr "Грешка при запазване на етикетите."
 
 #. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
-#. TRANS: Error message displayed to a banned user when they try to subscribe.
 #, fuzzy
 msgid "You have been banned from subscribing."
 msgstr "Потребител�т е забранил да �е абонирате за него."
@@ -7045,10 +6620,6 @@ msgstr "�е �те абонирани!"
 msgid "Could not delete self-subscription."
 msgstr "Грешка при добав�не на нов абонамент."
 
-#. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
-msgid "Could not delete subscription OMB token."
-msgstr "Грешка при добав�не на нов абонамент."
-
 #. TRANS: Exception thrown when a subscription could not be deleted on the server.
 msgid "Could not delete subscription."
 msgstr "Грешка при добав�не на нов абонамент."
@@ -7083,6 +6654,18 @@ msgstr ""
 msgid "Single-user mode code called when not enabled."
 msgstr ""
 
+#. TRANS: Information on password recovery form if no known username or e-mail address was specified.
+msgid "No user with that email address or username."
+msgstr "��ма потребител � такава е-поща или потребител�ко име."
+
+#. TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.
+msgid "No registered email address for that user."
+msgstr "��ма указана е-поща за този потребител."
+
+#. TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.
+msgid "Error saving address confirmation."
+msgstr "Грешка при запазване на потвърждение за адре�"
+
 #. TRANS: Server exception thrown when creating a group failed.
 msgid "Could not create group."
 msgstr "Грешка при �ъздаване на групата."
@@ -7360,28 +6943,12 @@ msgstr "Командата в�е още не �е поддържа."
 msgid "saveSettings() not implemented."
 msgstr "Командата в�е още не �е поддържа."
 
-#. TRANS: Client error message thrown if design settings could not be deleted in
-#. TRANS: the admin panel Design.
-#, fuzzy
-msgid "Unable to delete design setting."
-msgstr "Грешка при запи�ване на�тройките за Twitter"
-
 #. TRANS: Header in administrator navigation panel.
-#. TRANS: Header in settings navigation panel.
 #, fuzzy
 msgctxt "HEADER"
 msgid "Home"
 msgstr "Лична �траница"
 
-#. TRANS: Menu item in administrator navigation panel.
-#. TRANS: Menu item in default local navigation panel.
-#. TRANS: Menu item in personal group navigation menu.
-#. TRANS: Menu item in settings navigation panel.
-#, fuzzy
-msgctxt "MENU"
-msgid "Home"
-msgstr "Лична �траница"
-
 #. TRANS: Header in administrator navigation panel.
 #, fuzzy
 msgctxt "HEADER"
@@ -7397,18 +6964,6 @@ msgctxt "MENU"
 msgid "Site"
 msgstr "Сайт"
 
-#. TRANS: Menu item title in administrator navigation panel.
-msgid "Design configuration"
-msgstr "�а�тройка на оформлението"
-
-#. TRANS: Menu item in administrator navigation panel.
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: Menu item in settings navigation panel.
-#, fuzzy
-msgctxt "MENU"
-msgid "Design"
-msgstr "Вер�и�"
-
 #. TRANS: Menu item title in administrator navigation panel.
 #, fuzzy
 msgid "User configuration"
@@ -7518,44 +7073,6 @@ msgstr ""
 msgid "Could not authenticate you."
 msgstr ""
 
-#. TRANS: Server error displayed when trying to create an anynymous OAuth consumer.
-#, fuzzy
-msgid "Could not create anonymous consumer."
-msgstr "Грешка при отбел�зване като любима."
-
-#. TRANS: Server error displayed when trying to create an anynymous OAuth application.
-#, fuzzy
-msgid "Could not create anonymous OAuth application."
-msgstr "Грешка при отбел�зване като любима."
-
-#. TRANS: Exception thrown when no token association could be found.
-msgid ""
-"Could not find a profile and application associated with the request token."
-msgstr ""
-
-#. TRANS: Exception thrown when no access token can be issued.
-#, fuzzy
-msgid "Could not issue access token."
-msgstr "Грешка при вмъкване на �ъобщението."
-
-#. TRANS: Exception thrown when a database error occurs.
-#, fuzzy
-msgid "Database error inserting OAuth application user."
-msgstr "Грешка в базата от данни — отговор при вмъкването: %s"
-
-#. TRANS: Exception thrown when a database error occurs.
-#, fuzzy
-msgid "Database error updating OAuth application user."
-msgstr "Грешка в базата от данни — отговор при вмъкването: %s"
-
-#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
-msgid "Tried to revoke unknown token."
-msgstr ""
-
-#. TRANS: Exception thrown when an attempt is made to remove a revoked token.
-msgid "Failed to delete revoked token."
-msgstr ""
-
 #. TRANS: Form input field label for application icon.
 msgid "Icon"
 msgstr "Икона"
@@ -7640,13 +7157,14 @@ msgid "Default access for this application: read-only, or read-write"
 msgstr ""
 
 #. TRANS: Submit button title.
-msgid "Cancel"
-msgstr "Отказ"
+#, fuzzy
+msgid "Cancel application changes."
+msgstr "Изтриване на приложението"
 
 #. TRANS: Submit button title.
-#. TRANS: Button text to save a list.
-msgid "Save"
-msgstr "Запазване"
+#, fuzzy
+msgid "Save application changes."
+msgstr "�ово приложение"
 
 #. TRANS: Name for an anonymous application in application list.
 #, fuzzy
@@ -7683,6 +7201,20 @@ msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "Премахване"
 
+#. TRANS: Submit button text to accept a group membership request on approve group form.
+#. TRANS: Submit button text to accept a subscription request on approve sub form.
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Accept"
+msgstr "Приемане"
+
+#. TRANS: Submit button text to reject a group membership request on approve group form.
+#. TRANS: Submit button text to reject a subscription request on approve sub form.
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Reject"
+msgstr "Охвърл�не"
+
 #. TRANS: Atom feed exception thrown when an author element does not contain a name element.
 msgid "Author element must contain a name element."
 msgstr ""
@@ -8261,6 +7793,11 @@ msgstr ""
 msgid "Go to the installer."
 msgstr "Влизане в �айта"
 
+#. TRANS: Header on conversation page. Hidden by default (h2).
+#. TRANS: Label for user statistics.
+msgid "Notices"
+msgstr "Бележки"
+
 #. TRANS: Page title for when a database error occurs.
 msgid "Database error"
 msgstr "Грешка в базата от данни"
@@ -8272,14 +7809,6 @@ msgctxt "MENU"
 msgid "Public"
 msgstr "Общ поток"
 
-#. TRANS: Menu item in default local navigation panel.
-#. TRANS: Menu item in search group navigation panel.
-#. TRANS: Menu item in local navigation menu.
-#, fuzzy
-msgctxt "MENU"
-msgid "Groups"
-msgstr "Групи"
-
 #. TRANS: Menu item in default local navigation panel.
 #. TRANS: Menu item title in local navigation menu.
 #, fuzzy
@@ -8296,54 +7825,12 @@ msgstr "Изтриване"
 msgid "Delete this user"
 msgstr "Изтриване на този потребител"
 
-#. TRANS: Form legend of form for changing the page design.
-#, fuzzy
-msgid "Change design"
-msgstr "Запазване на�тройките на �айта"
-
-#. TRANS: Fieldset legend on profile design page to change profile page colours.
-msgid "Change colours"
-msgstr "См�на на цветовете"
-
-#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-msgid "Use defaults"
-msgstr ""
-
-#. TRANS: Label in form on profile design page.
-#. TRANS: Field contains file name on user's computer that could be that user's custom profile background image.
-msgid "Upload file"
-msgstr "Качване на файл"
-
-#. TRANS: Instructions for form on profile design page.
-msgid ""
-"You can upload your personal background image. The maximum file size is 2MB."
-msgstr ""
-"Можете да качите лично изображение за фон. Мак�ималната големина на файла е "
-"2MB."
-
-#. TRANS: Radio button on profile design page that will enable use of the uploaded profile image.
-#, fuzzy
-msgctxt "RADIO"
-msgid "On"
-msgstr "Вкл."
-
-#. TRANS: Radio button on profile design page that will disable use of the uploaded profile image.
-#, fuzzy
-msgctxt "RADIO"
-msgid "Off"
-msgstr "Изкл."
-
-#. TRANS: Success message displayed if design settings were saved after clicking "Use defaults".
-msgid "Design defaults restored."
-msgstr ""
-
 #. TRANS: Exception. %s is an ID.
 #, fuzzy, php-format
 msgid "Unable to find services for %s."
 msgstr "Използвайте тази бланка за �ъздаване на нова група."
 
 #. TRANS: Form legend for removing the favourite status for a favourite notice.
-#. TRANS: Title for button text for removing the favourite status for a favourite notice.
 msgid "Disfavor this notice"
 msgstr "Отбел�зване като любимо"
 
@@ -8353,8 +7840,12 @@ msgctxt "BUTTON"
 msgid "Disfavor favorite"
 msgstr "Добав�не към любимите"
 
+#. TRANS: Button title for removing the favourite status for a favourite notice.
+#, fuzzy
+msgid "Remove this notice from your list of favorite notices."
+msgstr "Грешка при изтегл�не на любимите бележки"
+
 #. TRANS: Form legend for adding the favourite status to a notice.
-#. TRANS: Title for button text for adding the favourite status to a notice.
 msgid "Favor this notice"
 msgstr "Отбел�зване като любимо"
 
@@ -8364,6 +7855,11 @@ msgctxt "BUTTON"
 msgid "Favor"
 msgstr "Любимо"
 
+#. TRANS: Button title for adding the favourite status to a notice.
+#, fuzzy
+msgid "Add this notice to your list of favorite notices."
+msgstr "Грешка при изтегл�не на любимите бележки"
+
 #. TRANS: Feed type name.
 msgid "RSS 1.0"
 msgstr "RSS 1.0"
@@ -8380,6 +7876,10 @@ msgstr "Atom"
 msgid "FOAF"
 msgstr "FOAF"
 
+#. TRANS: Feed type name. See http://activitystrea.ms/
+msgid "Activity Streams"
+msgstr ""
+
 #. TRANS: Client exception thrown when an imported feed does not have an author.
 msgid "No author in the feed."
 msgstr ""
@@ -8413,6 +7913,28 @@ msgstr "Изберете етикет за конкретизиране"
 msgid "Grant this user the \"%s\" role"
 msgstr ""
 
+#. TRANS: Header for mini list of group members on a group page (h2).
+msgid "Members"
+msgstr "Членове"
+
+#. TRANS: Link to all group members from mini list of group members if group has more than n members.
+msgid "All members"
+msgstr "В�ички членове"
+
+#. TRANS: Header for mini list of users with a pending membership request on a group page (h2).
+msgid "Pending"
+msgstr ""
+
+#. TRANS: Header for mini list of users that are blocked in a group page (h2).
+msgid "Blocked"
+msgstr "Блокирани"
+
+#. TRANS: Title for list of group administrators on a group page.
+#, fuzzy
+msgctxt "TITLE"
+msgid "Admins"
+msgstr "�дмини�тратори"
+
 #. TRANS: Button text for the form that will block a user from a group.
 msgctxt "BUTTON"
 msgid "Block"
@@ -8420,8 +7942,8 @@ msgstr "Блокиране"
 
 #. TRANS: Submit button title.
 msgctxt "TOOLTIP"
-msgid "Block this user"
-msgstr "Блокиране на този потребител"
+msgid "Block this user so that they can no longer post messages to it."
+msgstr ""
 
 #. TRANS: Field title on group edit form.
 #, fuzzy
@@ -8475,64 +7997,10 @@ msgctxt "GROUPADMIN"
 msgid "Admin"
 msgstr "�а�тройки"
 
-#. TRANS: Menu item in the group navigation page.
-msgctxt "MENU"
-msgid "Group"
-msgstr ""
-
-#. TRANS: Tooltip for menu item in the group navigation page.
-#. TRANS: %s is the nickname of the group.
-#, php-format
-msgctxt "TOOLTIP"
-msgid "%s group"
-msgstr ""
-
-#. TRANS: Menu item in the group navigation page.
-msgctxt "MENU"
-msgid "Members"
-msgstr ""
-
-#. TRANS: Tooltip for menu item in the group navigation page.
-#. TRANS: %s is the nickname of the group.
-#, php-format
-msgctxt "TOOLTIP"
-msgid "%s group members"
-msgstr ""
-
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: %d is the number of pending members.
-#, php-format
-msgctxt "MENU"
-msgid "Pending members (%d)"
-msgid_plural "Pending members (%d)"
-msgstr[0] ""
-msgstr[1] ""
-
-#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: %s is the nickname of the group.
-#, fuzzy, php-format
-msgctxt "TOOLTIP"
-msgid "%s pending members"
-msgstr "Членове на групата %s"
-
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-msgctxt "MENU"
-msgid "Blocked"
-msgstr ""
-
-#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: %s is the nickname of the group.
-#, php-format
-msgctxt "TOOLTIP"
-msgid "%s blocked users"
-msgstr ""
-
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: Menu item in primary navigation panel.
+#. TRANS: Group actions header (h2). Text hidden by default.
 #, fuzzy
-msgctxt "MENU"
-msgid "Admin"
-msgstr "�а�тройки"
+msgid "Group actions"
+msgstr "Потребител�ки дей�тви�"
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
@@ -8541,11 +8009,6 @@ msgctxt "TOOLTIP"
 msgid "Edit %s group properties"
 msgstr ""
 
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-msgctxt "MENU"
-msgid "Logo"
-msgstr ""
-
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
 #, php-format
@@ -8553,18 +8016,11 @@ msgctxt "TOOLTIP"
 msgid "Add or edit %s logo"
 msgstr ""
 
-#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: %s is the nickname of the group.
-#, php-format
-msgctxt "TOOLTIP"
-msgid "Add or edit %s design"
+#. TRANS: Link text for link on user profile.
+msgctxt "MENU"
+msgid "Logo"
 msgstr ""
 
-#. TRANS: Group actions header (h2). Text hidden by default.
-#, fuzzy
-msgid "Group actions"
-msgstr "Потребител�ки дей�тви�"
-
 #. TRANS: Title for groups with the most members section.
 #, fuzzy
 msgid "Popular groups"
@@ -8575,11 +8031,19 @@ msgstr "Попул�рни бележки"
 msgid "Active groups"
 msgstr "В�ички групи"
 
-#. TRANS: Title for group tag cloud section.
-#. TRANS: %s is a group name.
-#, php-format
-msgid "Tags in %s group's notices"
-msgstr "Етикети в бележките към групата %s"
+#. TRANS: Link description for seeing all groups.
+#. TRANS: Link description for seeing all lists.
+msgid "See all"
+msgstr ""
+
+#. TRANS: Link title for seeing all groups.
+msgid "See all groups you belong to."
+msgstr ""
+
+#. TRANS: Menu item title in personal group navigation menu.
+#. TRANS: %s is a username.
+msgid "Back to top"
+msgstr ""
 
 #. TRANS: Client exception 406
 msgid "This page is not available in a media type you accept"
@@ -8664,12 +8128,46 @@ msgctxt "TITLE"
 msgid "Trends"
 msgstr ""
 
-#. TRANS: Button text for inviting more users to the StatusNet instance.
+#. TRANS: Default button text for inviting more users to the StatusNet instance.
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Invite more colleagues"
 msgstr "Покани за нови потребители"
 
+#. TRANS: Form legend.
+#, fuzzy
+msgid "Invite collegues"
+msgstr "Покани за нови потребители"
+
+#. TRANS: Field label for a list of e-mail addresses.
+msgid "Email addresses"
+msgstr "�дре�и на е-поща"
+
+#. TRANS: Field title for a list of e-mail addresses.
+#, fuzzy
+msgid "Addresses of friends to invite (one per line)."
+msgstr "�дре�и на при�тели, които каните (по един на ред)"
+
+#. TRANS: Field label for a personal message to send to invitees.
+msgid "Personal message"
+msgstr "Лично �ъобщение"
+
+#. TRANS: Field title for a personal message to send to invitees.
+msgid "Optionally add a personal message to the invitation."
+msgstr "Може да добавите и лично �ъобщение към поканата."
+
+#. TRANS: Send button for inviting friends
+#. TRANS: Button text for sending notice.
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Send"
+msgstr "Прати"
+
+#. TRANS: Submit button title.
+#, fuzzy
+msgid "Send invitations."
+msgstr "Покани"
+
 #. TRANS: Button text for joining a group.
 #, fuzzy
 msgctxt "BUTTON"
@@ -8682,6 +8180,10 @@ msgctxt "BUTTON"
 msgid "Leave"
 msgstr "�апу�кане"
 
+#. TRANS: Link title for seeing all lists.
+msgid "See all lists you have created."
+msgstr ""
+
 #. TRANS: Menu item for logging in to the StatusNet site.
 #. TRANS: Menu item in primary navigation panel.
 msgctxt "MENU"
@@ -8728,8 +8230,8 @@ msgstr ""
 #. TRANS: %1$s is the subscribing user's nickname, %2$s is the StatusNet sitename.
 #. TRANS: Main body of new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscriber's long name, %2$s is the StatusNet sitename.
-#, php-format
-msgid "%1$s is now listening to your notices on %2$s."
+#, fuzzy, php-format
+msgid "%1$s is now following you on %2$s."
 msgstr "%1$s вече получава бележките ви в %2$s."
 
 #. TRANS: Subject of pending new-subscriber notification e-mail.
@@ -8912,7 +8414,7 @@ msgstr "%s (@%s) отбел�за бележката ви като любима"
 #. TRANS: Body of @-reply notification e-mail.
 #. TRANS: %1$s is the sending user's name, $2$s is the StatusNet sitename,
 #. TRANS: %3$s is a URL to the notice, %4$s is the notice text,
-#. TRANS: %5$s is a URL to the full conversion if it exists (otherwise empty),
+#. TRANS: %5$s is the text "The full conversation can be read here:" and a URL to the full conversion if it exists (otherwise empty),
 #. TRANS: %6$s is a URL to reply to the notice, %7$s is a URL to all @-replies for the addressed user,
 #, php-format
 msgid ""
@@ -8937,6 +8439,10 @@ msgstr ""
 
 #. TRANS: Subject of group join notification e-mail.
 #. TRANS: %1$s is the joining user's nickname, %2$s is the group name, and %3$s is the StatusNet sitename.
+#, fuzzy, php-format
+msgid "%1$s has joined your group %2$s on %3$s"
+msgstr "%1$s напу�на групата %2$s"
+
 #. TRANS: Main body of group join notification e-mail.
 #. TRANS: %1$s is the subscriber's long name, %2$s is the group name, and %3$s is the StatusNet sitename,
 #. TRANS: %4$s is a block of profile info about the subscriber.
@@ -9025,9 +8531,10 @@ msgid "Make Admin"
 msgstr ""
 
 #. TRANS: Submit button title.
+#, fuzzy
 msgctxt "TOOLTIP"
-msgid "Make this user an admin"
-msgstr ""
+msgid "Make this user an admin."
+msgstr "За да редактирате групата, тр�бва да �те й админи�тратор."
 
 #. TRANS: Client exception thrown when a database error was thrown during a file upload operation.
 msgid "There was a database error while saving your file. Please try again."
@@ -9073,7 +8580,7 @@ msgstr "Изпращане на пр�ко �ъобщеие"
 msgid "Select recipient:"
 msgstr "Изберете оператор"
 
-#. TRANS Entry in drop-down selection box in direct-message inbox/outbox when no one is available to message.
+#. TRANS: Entry in drop-down selection box in direct-message inbox/outbox when no one is available to message.
 #, fuzzy
 msgid "No mutual subscribers."
 msgstr "�е �те абонирани!"
@@ -9146,6 +8653,10 @@ msgstr ""
 msgid "You must implement either adaptNoticeListItem() or showNotice()."
 msgstr ""
 
+#. TRANS: Link description to show more items in a list.
+msgid "More â–¼"
+msgstr ""
+
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 msgid "Nickname cannot be empty."
 msgstr ""
@@ -9194,10 +8705,6 @@ msgctxt "SEPARATOR"
 msgid ", "
 msgstr ""
 
-#. TRANS: Start of profile addressees list.
-msgid " â–¸ "
-msgstr ""
-
 #. TRANS: Used in coordinates as abbreviation of north.
 msgid "N"
 msgstr "С"
@@ -9237,7 +8744,8 @@ msgid "Repeated by"
 msgstr "Повторено от"
 
 #. TRANS: Link title in notice list item to reply to a notice.
-msgid "Reply to this notice"
+#, fuzzy
+msgid "Reply to this notice."
 msgstr "Отговар�не на тази бележка"
 
 #. TRANS: Link text in notice list item to reply to a notice.
@@ -9245,7 +8753,8 @@ msgid "Reply"
 msgstr "Отговор"
 
 #. TRANS: Link title in notice list item to delete a notice.
-msgid "Delete this notice"
+#, fuzzy
+msgid "Delete this notice from the timeline."
 msgstr "Изтриване на бележката"
 
 #. TRANS: Title for repeat form status in notice list when a notice has been repeated.
@@ -9272,27 +8781,6 @@ msgstr "Побутване"
 msgid "Send a nudge to this user."
 msgstr "Побутване на този потребител"
 
-#. TRANS: Exception thrown when creating a new profile fails in OAuth store.
-msgid "Error inserting new profile."
-msgstr ""
-
-#. TRANS: Exception thrown when creating a new avatar fails in OAuth store.
-msgid "Error inserting avatar."
-msgstr ""
-
-#. TRANS: Exception thrown when creating a remote profile fails in OAuth store.
-msgid "Error inserting remote profile."
-msgstr ""
-
-#. TRANS: Exception thrown when a notice is denied because it has been sent before.
-msgid "Duplicate notice."
-msgstr ""
-
-#. TRANS: Exception thrown when creating a new subscription fails in OAuth store.
-#, fuzzy
-msgid "Could not insert new subscription."
-msgstr "Грешка при добав�не на нов абонамент."
-
 #. TRANS: Server exception thrown in oEmbed action if no API endpoint is available.
 #, fuzzy
 msgid "No oEmbed API endpoint available."
@@ -9379,11 +8867,6 @@ msgstr "Редактиране"
 msgid "Edit %s list by you."
 msgstr "Редактиране на групата %s"
 
-#. TRANS: Link description for link to list of users tagged with a tag.
-#, fuzzy
-msgid "Tagged"
-msgstr "Етикет"
-
 #. TRANS: Title for link to edit list settings.
 #, fuzzy
 msgid "Edit list settings."
@@ -9540,8 +9023,10 @@ msgctxt "plugin"
 msgid "Enable"
 msgstr ""
 
+#. TRANS: Plugin description for a disabled plugin.
 msgctxt "plugin-description"
-msgid "(Plugin descriptions unavailable when disabled.)"
+msgid ""
+"(The plugin description is unavailable when a plugin has been disabled.)"
 msgstr ""
 
 #. TRANS: Menu item in primary navigation panel.
@@ -9555,6 +9040,12 @@ msgstr "�а�тройки за SMS"
 msgid "Change your personal settings."
 msgstr "Пром�на на�тройките на профила"
 
+#. TRANS: Menu item in primary navigation panel.
+#, fuzzy
+msgctxt "MENU"
+msgid "Admin"
+msgstr "�а�тройки"
+
 #. TRANS: Menu item title in primary navigation panel.
 #, fuzzy
 msgid "Site configuration."
@@ -9575,15 +9066,8 @@ msgstr "Излизане от �айта"
 msgid "Login to the site."
 msgstr "Влизане в �айта"
 
-#. TRANS: Menu item in primary navigation panel.
-msgctxt "MENU"
-msgid "Search"
-msgstr "Тър�ене"
-
-#. TRANS: Menu item title in primary navigation panel.
-#, fuzzy
-msgid "Search the site."
-msgstr "Тър�ене в �айта"
+msgid "This profile has been silenced by site moderators"
+msgstr ""
 
 #. TRANS: H2 text for user subscription statistics.
 #, fuzzy
@@ -9595,6 +9079,10 @@ msgstr "Разрешение"
 msgid "Followers"
 msgstr "Разрешение"
 
+#. TRANS: H2 text for user statistics.
+msgid "Statistics"
+msgstr "Стати�тики"
+
 #. TRANS: Label for user statistics.
 #, fuzzy
 msgid "User ID"
@@ -9604,10 +9092,6 @@ msgstr "Потребител"
 msgid "Member since"
 msgstr "Уча�тник от"
 
-#. TRANS: Label for user statistics.
-msgid "Notices"
-msgstr "Бележки"
-
 #. TRANS: Label for user statistics.
 #. TRANS: Average count of posts made per day since account registration.
 msgid "Daily average"
@@ -9701,6 +9185,7 @@ msgid "Keyword(s)"
 msgstr "Ключови думи"
 
 #. TRANS: Button text for searching site.
+#. TRANS: Button text for search button on search form.
 #. TRANS: Button text to search profiles.
 msgctxt "BUTTON"
 msgid "Search"
@@ -9751,23 +9236,6 @@ msgstr "Тър�ене в �ъдържанието на бележките"
 msgid "Find groups on this site"
 msgstr "Тър�ене на групи в �айта"
 
-#. TRANS: Secondary navigation menu item leading to help on StatusNet.
-msgctxt "MENU"
-msgid "Help"
-msgstr "Помощ"
-
-#. TRANS: Secondary navigation menu item leading to text about StatusNet site.
-#, fuzzy
-msgctxt "MENU"
-msgid "About"
-msgstr "Отно�но"
-
-#. TRANS: Secondary navigation menu item leading to Frequently Asked Questions.
-#, fuzzy
-msgctxt "MENU"
-msgid "FAQ"
-msgstr "Въпро�и"
-
 #. TRANS: Secondary navigation menu item leading to Terms of Service.
 #, fuzzy
 msgctxt "MENU"
@@ -9792,19 +9260,6 @@ msgctxt "MENU"
 msgid "Version"
 msgstr "Вер�и�"
 
-#. TRANS: Secondary navigation menu item leading to e-mail contact information on the
-#. TRANS: StatusNet site, where to report bugs, ...
-#, fuzzy
-msgctxt "MENU"
-msgid "Contact"
-msgstr "Контакт"
-
-#. TRANS: Secondary navigation menu item. Leads to information about embedding a timeline widget.
-#, fuzzy
-msgctxt "MENU"
-msgid "Badge"
-msgstr "Табелка"
-
 #. TRANS: Default title for section/sidebar widget.
 msgid "Untitled section"
 msgstr "�еозаглавен раздел"
@@ -9853,11 +9308,6 @@ msgstr "Е-поща"
 msgid "Change email handling"
 msgstr "Пром�на обработката на пи�мата"
 
-#. TRANS: Menu item title in settings navigation panel.
-#, fuzzy
-msgid "Design your profile"
-msgstr "Потребител�ки профил"
-
 #. TRANS: Menu item in settings navigation panel.
 #, fuzzy
 msgctxt "MENU"
@@ -9899,6 +9349,15 @@ msgstr "Свързване"
 msgid "Authorized connected applications"
 msgstr "Изтриване на приложението"
 
+#. TRANS: Menu item in settings navigation panel.
+msgctxt "MENU"
+msgid "Old school"
+msgstr ""
+
+#. TRANS: Menu item title in settings navigation panel.
+msgid "UI tweaks for old-school users"
+msgstr ""
+
 #. TRANS: Title of form to silence a user.
 #, fuzzy
 msgctxt "TITLE"
@@ -9909,6 +9368,44 @@ msgstr "Заглушаване"
 msgid "Silence this user"
 msgstr "Заглушаване на този потребител."
 
+#. TRANS: Server error displayed when trying to create an anynymous OAuth consumer.
+#, fuzzy
+msgid "Could not create anonymous consumer."
+msgstr "Грешка при отбел�зване като любима."
+
+#. TRANS: Server error displayed when trying to create an anynymous OAuth application.
+#, fuzzy
+msgid "Could not create anonymous OAuth application."
+msgstr "Грешка при отбел�зване като любима."
+
+#. TRANS: Exception thrown when no token association could be found.
+msgid ""
+"Could not find a profile and application associated with the request token."
+msgstr ""
+
+#. TRANS: Exception thrown when no access token can be issued.
+#, fuzzy
+msgid "Could not issue access token."
+msgstr "Грешка при вмъкване на �ъобщението."
+
+#. TRANS: Exception thrown when a database error occurs.
+#, fuzzy
+msgid "Database error inserting OAuth application user."
+msgstr "Грешка в базата от данни — отговор при вмъкването: %s"
+
+#. TRANS: Exception thrown when a database error occurs.
+#, fuzzy
+msgid "Database error updating OAuth application user."
+msgstr "Грешка в базата от данни — отговор при вмъкването: %s"
+
+#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
+msgid "Tried to revoke unknown token."
+msgstr ""
+
+#. TRANS: Exception thrown when an attempt is made to remove a revoked token.
+msgid "Failed to delete revoked token."
+msgstr ""
+
 #. TRANS: Menu item in local navigation menu.
 #, fuzzy
 msgctxt "MENU"
@@ -9967,6 +9464,18 @@ msgstr "Поканете при�тели и колеги да �е при�ъе
 msgid "Subscribe to this user"
 msgstr "�бониране за този потребител"
 
+#. TRANS: Button text to subscribe to a user.
+#. TRANS: Button text for subscribing to a list.
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Subscribe"
+msgstr "�бониране"
+
+#. TRANS: Button title to subscribe to a user.
+#, fuzzy
+msgid "Subscribe to this user."
+msgstr "�бониране за този потребител"
+
 #. TRANS: Title of personal tag cloud section.
 msgid "People Tagcloud as self-tagged"
 msgstr ""
@@ -10090,16 +9599,26 @@ msgstr[1] ""
 #. TRANS: List message for notice repeated by logged in user.
 #, fuzzy
 msgctxt "REPEATLIST"
-msgid "You have repeated this notice."
+msgid "You repeated this."
 msgstr "Вече �те повторили тази бележка."
 
-#. TRANS: List message for repeated notices.
-#. TRANS: %d is the number of users that have repeated a notice.
+#. TRANS: List message for when more than 4 people repeat something.
+#. TRANS: %%s is a list of users liking a notice, %d is the number over 4 that like the notice.
+#. TRANS: Plural is decided on the total number of users liking the notice (count of %%s + %d).
+#, php-format
+msgid "%%s and %d other repeated this."
+msgid_plural "%%s and %d others repeated this."
+msgstr[0] ""
+msgstr[1] ""
+
+#. TRANS: List message for favoured notices.
+#. TRANS: %%s is a list of users liking a notice.
+#. TRANS: Plural is based on the number of of users that have favoured a notice.
 #, fuzzy, php-format
-msgid "One person has repeated this notice."
-msgid_plural "%d people have repeated this notice."
-msgstr[0] "Вече �те повторили тази бележка."
-msgstr[1] "Вече �те повторили тази бележка."
+msgid "%%s repeated this."
+msgid_plural "%%s repeated this."
+msgstr[0] "Повторено за %s"
+msgstr[1] "Повторено за %s"
 
 #. TRANS: Form legend.
 #, fuzzy, php-format
@@ -10200,7 +9719,6 @@ msgid "Unsilence this user"
 msgstr "Заглушаване на този потребител."
 
 #. TRANS: Form legend on unsubscribe form.
-#. TRANS: Button title on unsubscribe form.
 msgid "Unsubscribe from this user"
 msgstr "Отпи�ване от този потребител"
 
@@ -10211,6 +9729,11 @@ msgctxt "BUTTON"
 msgid "Unsubscribe"
 msgstr "Отпи�ване"
 
+#. TRANS: Button title on unsubscribe form.
+#, fuzzy
+msgid "Unsubscribe from this user."
+msgstr "Отпи�ване от този потребител"
+
 #. TRANS: Exception text shown when no profile can be found for a user.
 #. TRANS: %1$s is a user nickname, $2$d is a user ID (number).
 #, fuzzy, php-format
@@ -10293,9 +9816,3 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
-
-#~ msgid "%1$s and friends, page %2$d"
-#~ msgstr "%1$s и при�тели, �траница %2$d"
-
-#~ msgid "You and friends"
-#~ msgstr "Вие и при�телите"
diff --git a/locale/br/LC_MESSAGES/statusnet.po b/locale/br/LC_MESSAGES/statusnet.po
index fb387d7081..11ce7f1a0c 100644
--- a/locale/br/LC_MESSAGES/statusnet.po
+++ b/locale/br/LC_MESSAGES/statusnet.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Core to Breton (Brezhoneg)
+# Translation of StatusNet - Core to Breton (brezhoneg)
 # Exported from translatewiki.net
 #
 # Author: Fohanno
@@ -12,17 +12,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:46+0000\n"
-"Language-Team: Breton <http://translatewiki.net/wiki/Portal:br>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:38+0000\n"
+"Language-Team: Breton <https://translatewiki.net/wiki/Portal:br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-POT-Import-Date: 2011-05-05 10:52:40+0000\n"
+"X-POT-Import-Date: 2012-04-22 22:02:21+0000\n"
 
 #. TRANS: Database error message.
 #, php-format
@@ -33,12 +33,6 @@ msgid ""
 "again."
 msgstr ""
 
-#. TRANS: Error message.
-msgid ""
-"An important error occured, probably related to email setup. Check logfiles "
-"for more info."
-msgstr ""
-
 #. TRANS: Error message.
 msgid "An error occurred."
 msgstr "Ur fazi zo bet."
@@ -50,9 +44,8 @@ msgid ""
 msgstr ""
 
 #. TRANS: Error message displayed when trying to access a non-existing page.
-#, fuzzy
 msgid "Unknown page"
-msgstr "Dianav"
+msgstr "Pajenn dianav"
 
 #. TRANS: Error message displayed when trying to perform an undefined action.
 #. TRANS: Title for password recovery page when an unknown action has been specified.
@@ -99,12 +92,11 @@ msgstr "Diweredekaat an enskrivadurioù nevez."
 msgid "Closed"
 msgstr "Serr"
 
-#. TRANS: Title for button to save access settings in site admin panel.
-msgid "Save access settings"
-msgstr "Enrollañ an arventennoù moned"
+#. TRANS: Button title to save access settings in site admin panel.
+msgid "Save access settings."
+msgstr "Enrollañ an arventennoù moned."
 
-#. TRANS: Tooltip for button to save access settings in site admin panel.
-#. TRANS: Button text for saving theme settings.
+#. TRANS: Button text to save access settings in site admin panel.
 #. TRANS: Button label to save e-mail preferences.
 #. TRANS: Button label to save IM preferences.
 #. TRANS: Button text in the license admin panel.
@@ -120,7 +112,6 @@ msgstr "Enrollañ an arventennoù moned"
 #. TRANS: Button text for saving "Other settings" in profile.
 #. TRANS: Button text to save user settings in user admin panel.
 #. TRANS: Button label in the "Edit application" form.
-#. TRANS: Button text on profile design page to save settings.
 #. TRANS: Text for save button on group edit form.
 #. TRANS: Button text to save tags for a profile.
 msgctxt "BUTTON"
@@ -142,7 +133,7 @@ msgstr "Ur gudenn 'zo bet gant ho jedaouer dalc'h. Mar plij adklaskit."
 
 #. TRANS: Error message displayed when trying to perform an action that requires a logged in user.
 msgid "Not logged in."
-msgstr "Nann-kevreet."
+msgstr "Digevreet."
 
 #. TRANS: Client error displayed trying to perform an action related to a non-existing profile.
 #. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
@@ -156,14 +147,8 @@ msgstr "N'eus ket eus ar profil-se."
 #. TRANS: Client error displayed trying to reference a non-existing list.
 #. TRANS: Client error displayed when referring to a non-existing list.
 #. TRANS: Client error displayed trying to reference a non-existing list.
-#, fuzzy
 msgid "No such list."
-msgstr "N'eus ket eus ar bajenn-se."
-
-#. TRANS: Client error displayed when trying to add an OMB 0.1 remote profile to a list.
-#, fuzzy
-msgid "You cannot list an OMB 0.1 remote profile with this action."
-msgstr "Ne c'helloc'h ket reiñ rolloù d'an implijerien eus al lec'hienn-mañ."
+msgstr "N'eus ket eus ar roll-se."
 
 #. TRANS: Client error displayed when an unknown error occurs when adding a user to a list.
 #. TRANS: %s is a username.
@@ -180,10 +165,9 @@ msgid ""
 msgstr ""
 
 #. TRANS: Title after adding a user to a list.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Listed"
-msgstr "Aotre implijout"
+msgstr "Rollet"
 
 #. TRANS: Server error when page not found (404).
 #. TRANS: Server error when page not found (404)
@@ -195,7 +179,6 @@ msgstr "N'eus ket eus ar bajenn-se."
 #. TRANS: Client error when user not found for an rss related action.
 #. TRANS: Client error displayed when no existing user is provided for a user's delivery device setting.
 #. TRANS: Client error displayed if a user could not be found.
-#. TRANS: Client error when user not found updating a profile background image.
 #. TRANS: Client error displayed updating profile image without having a user object.
 #. TRANS: Client error displayed when making an Atom API request for an unknown user.
 #. TRANS: Client error displayed when trying to block a non-existing user or a user from another site.
@@ -221,14 +204,11 @@ msgstr "N'eus ket eus ar bajenn-se."
 #. TRANS: Client error displayed when trying to get the RSS feed with favorites of a user that does not exist.
 #. TRANS: Client error displayed when requesting Friends of a Friend feed without providing a user nickname.
 #. TRANS: Client error displayed when requesting Friends of a Friend feed for an object that is not a user.
-#. TRANS: Client error displayed when trying to get a user hCard for a non-existing user.
 #. TRANS: Client error displayed trying to make a micro summary without providing a valid user.
 #. TRANS: Client error displayed trying to send a direct message to a non-existing user.
 #. TRANS: Client error displayed trying to use "one time password login" without using an existing user.
 #. TRANS: Client error displayed when referring to non-existing user.
 #. TRANS: Client error displayed trying to perform an action related to a non-existing user.
-#. TRANS: Form validation error on page for remote subscribe when no user was provided.
-#. TRANS: Form validation error on page for remote subscribe when no user profile was found.
 #. TRANS: Client error displayed when trying to reply to a non-exsting user.
 #. TRANS: Client error displayed when providing a non-existing nickname in a RSS 1.0 action.
 #. TRANS: Client error.
@@ -237,7 +217,6 @@ msgstr "N'eus ket eus ar bajenn-se."
 #. TRANS: Client error displayed trying to find a user by ID for a non-existing ID.
 #. TRANS: Client error displayed requesting groups for a non-existing user.
 #. TRANS: Client error displayed when user not found for an action.
-#. TRANS: Client error displayed providing a non-existing nickname.
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #. TRANS: Client error displayed when trying to perform a gallery action with an unknown user.
 #. TRANS: Client error displayed when trying to access a mailbox without providing a user.
@@ -246,15 +225,21 @@ msgid "No such user."
 msgstr "N'eus ket eus an implijer-se."
 
 #. TRANS: Title of a user's own start page.
-#, fuzzy
 msgid "Home timeline"
-msgstr "Oberezhioù %s"
+msgstr "Degemer - neudennad"
 
 #. TRANS: Title of another user's start page.
 #. TRANS: %s is the other user's name.
-#, fuzzy, php-format
+#, php-format
 msgid "%s's home timeline"
-msgstr "Oberezhioù %s"
+msgstr "Neudennad oberezhioù %s"
+
+#. TRANS: %s is user nickname.
+#. TRANS: Feed title.
+#. TRANS: %s is tagger's nickname.
+#, fuzzy, php-format
+msgid "Feed for friends of %s (Activity Streams JSON)"
+msgstr "Gwazh evit mignoned %s (Atom)"
 
 #. TRANS: %s is user nickname.
 #, php-format
@@ -299,7 +284,7 @@ msgid ""
 "to them](%%%%action.newnotice%%%%?status_textarea=%3$s)."
 msgstr ""
 
-#. TRANS: Encoutagement displayed on empty timeline user pages for anonymous users.
+#. TRANS: Encouragement displayed on empty timeline user pages for anonymous users.
 #. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
 #. TRANS: Empty list message for page with replies for a user for not logged in users.
 #. TRANS: %1$s is a user nickname. This message contains a Markdown link in the form [link text](link).
@@ -313,6 +298,12 @@ msgstr ""
 "Perak ne [groufec'h ket ur gont](%%%%action.register%%%%) ha goude-se demata "
 "%s pe postañ ur c'hemenn bennak evitañ."
 
+#. TRANS: Button text for inviting more users to the StatusNet instance.
+#. TRANS: Less business/enterprise-oriented language for public sites.
+msgctxt "BUTTON"
+msgid "Send invite"
+msgstr "Kas pedadennoù"
+
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Title of API timeline for a user and friends.
 #. TRANS: %s is a username.
@@ -321,8 +312,6 @@ msgstr ""
 #. TRANS: %s is a username.
 #. TRANS: Menu item title in personal group navigation menu.
 #. TRANS: %s is a username.
-#. TRANS: Menu item title in settings navigation panel.
-#. TRANS: %s is a username.
 #, php-format
 msgid "%s and friends"
 msgstr "%s hag e vignoned"
@@ -360,7 +349,6 @@ msgstr ""
 #. TRANS: Server error thrown on database error updating SMS preferences.
 #. TRANS: Server error thrown on database error removing a registered SMS phone number.
 #. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
-#. TRANS: Server exception thrown on Profile design page when updating design settings fails.
 msgid "Could not update user."
 msgstr "Dibosupl hizivaat an implijer."
 
@@ -375,7 +363,6 @@ msgstr "Dibosupl eo enrollañ ar profil."
 
 #. TRANS: Client error displayed when the number of bytes in a POST request exceeds a limit.
 #. TRANS: %s is the number of bytes of the CONTENT_LENGTH.
-#. TRANS: Form validation error in design settings form. POST should remain untranslated.
 #, php-format
 msgid ""
 "The server was unable to handle that much POST data (%s byte) due to its "
@@ -386,24 +373,6 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#. TRANS: Client error displayed when saving design settings fails because of an empty id.
-#. TRANS: Client error displayed when saving design settings fails because of an empty result.
-#. TRANS: Client error displayed when a database error occurs inserting profile colours.
-#. TRANS: Client error displayed when a database error occurs updating profile colours.
-#. TRANS: Form validation error displayed when group design settings could not be saved because of an application issue.
-#. TRANS: Form validation error on Profile design page when saving design settings has failed.
-#. TRANS: Form validation error on Profile design page when updating design settings has failed.
-msgid "Unable to save your design settings."
-msgstr "Dibosupl eo enrollañ an arventennoù empentiñ."
-
-#. TRANS: Error displayed when updating design settings fails.
-#. TRANS: Client error displayed when a database error occurs updating profile colours.
-#. TRANS: Form validation error on Profile design page when updating design settings has failed.
-#. TRANS: Error message displayed if design settings could not be saved.
-#. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
-msgid "Could not update your design."
-msgstr "Dibosupl eo hizivaat ho design."
-
 #. TRANS: Title for Atom feed.
 msgctxt "ATOM"
 msgid "Main"
@@ -450,6 +419,20 @@ msgstr "N'eus ket bet tu da stankañ an implijer."
 msgid "Unblock user failed."
 msgstr "N'eus ket bet tu da zistankañ an implijer."
 
+#. TRANS: Client exception thrown when no conversation ID is given.
+msgid "No conversation ID."
+msgstr "N'eus ID kaozeadenn ebet."
+
+#. TRANS: Client exception thrown when referring to a non-existing conversation ID (%d).
+#, php-format
+msgid "No conversation with ID %d."
+msgstr "Kaozeadenn ebet gant an ID %d."
+
+#. TRANS: Title for conversion timeline.
+msgctxt "TITLE"
+msgid "Conversation"
+msgstr "Kaozeadenn"
+
 #. TRANS: Title. %s is a user nickname.
 #, php-format
 msgid "Direct messages from %s"
@@ -489,13 +472,14 @@ msgid "Recipient user not found."
 msgstr "N'eo ket bet kavet ar resever."
 
 #. TRANS: Client error displayed trying to direct message another user who's not a friend (403).
-#, fuzzy
 msgid "Cannot send direct messages to users who aren't your friend."
 msgstr ""
-"Ne c'helloc'h ket kas kemennadennoù personel d'an implijerien n'int ket ho "
-"mignoned."
+"Ne c'hellit ket kas kemennadennoù personel war-eeun d'an implijerien n'int "
+"ket ho mignoned."
 
 #. TRANS: Client error displayed trying to direct message self (403).
+#. TRANS: Client error displayed trying to send a direct message to self.
+#. TRANS: Error text shown when trying to send a direct message to self.
 msgid ""
 "Do not send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
@@ -727,7 +711,6 @@ msgstr "strolladoù war %s"
 
 #. TRANS: Client error displayed when trying to edit a group without being an admin.
 #. TRANS: Client error displayed trying to edit a group while not being a group admin.
-#. TRANS: Client error displayed trying to change group design settings without being a (group) admin.
 #. TRANS: Client error displayed when trying to change group logo settings while not being a group admin.
 msgid "You must be an admin to edit the group."
 msgstr "Rankout a reer bezañ merour evit kemmañ ar strollad."
@@ -745,22 +728,21 @@ msgstr "Dibosupl eo krouiñ an aliasoù."
 
 #. TRANS: API validation exception thrown when nickname does not validate.
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
-#, fuzzy
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
-msgstr "1 da 64 lizherenn vihan pe sifr, hep poentaouiñ nag esaouenn"
+msgstr ""
+"Ne c'heller kaout nemet lizherennoù vihan ha sifroù, hep esaouennoù, el "
+"lesanvioù."
 
 #. TRANS: API validation exception thrown when alias is the same as nickname.
 #. TRANS: Group create form validation error.
-#, fuzzy
 msgid "Alias cannot be the same as nickname."
 msgstr "Ne c'hell ket an alias bezañ ar memes hini eget al lesanv."
 
 #. TRANS: Client error displayed when referring to a non-existing list.
 #. TRANS: Client error displayed trying to perform an action related to a non-existing list.
 #. TRANS: Client error displayed when referring to a non-existing list.
-#, fuzzy
 msgid "List not found."
-msgstr "N'eo ket bet kavet an implijer."
+msgstr "N'eo ket bet kavet ar roll."
 
 #. TRANS: Client error displayed when trying to update another user's list.
 msgid "You cannot update lists that do not belong to you."
@@ -771,49 +753,43 @@ msgstr ""
 #. TRANS: Client error displayed when an unknown error occurs in the list subscribers action.
 #. TRANS: Client error displayed when an unknown error occurs unsubscribing from a list.
 msgid "An error occured."
-msgstr ""
+msgstr "Ur fazi zo bet."
 
 #. TRANS: Client error displayed when trying to delete another user's list.
 msgid "You cannot delete lists that do not belong to you."
 msgstr ""
 
 #. TRANS: Client error displayed when referring to a non-list member.
-#, fuzzy
 msgid "The specified user is not a member of this list."
 msgstr "N'eo ket an implijer-mañ ezel eus ur strollad."
 
 #. TRANS: Client error displayed when trying to add members to a list without having the right to do so.
-#, fuzzy
 msgid "You are not allowed to add members to this list."
-msgstr "N'oc'h ket ezel eus ar strollad-mañ."
+msgstr "N'och ket aotreet da ouzhpennañ izili d'ar roll-mañ."
 
 #. TRANS: Client error displayed when trying to modify list members without specifying them.
-#, fuzzy
 msgid "You must specify a member."
-msgstr "Mankout a ra ar profil."
+msgstr "Rankout a rit spisaat un ezel."
 
 #. TRANS: Client error displayed when trying to remove members from a list without having the right to do so.
-#, fuzzy
 msgid "You are not allowed to remove members from this list."
-msgstr "N'oc'h ket ezel eus ar strollad-mañ."
+msgstr "N'och ket aotreet da zilemel izili deus ar roll-mañ."
 
 #. TRANS: Client error displayed when trying to remove a list member that is not part of a list.
 msgid "The user you are trying to remove from the list is not a member."
-msgstr ""
+msgstr "An implijer a glaskit dilemel n'eo ket ezel deus ar roll."
 
 #. TRANS: Client error displayed when trying to create a list without a name.
-#, fuzzy
 msgid "A list must have a name."
-msgstr "Ne c'hell ket an alias bezañ ar memes hini eget al lesanv."
+msgstr "Ur roll a rank kaout un anv."
 
 #. TRANS: Client error displayed when a membership check for a user is nagative.
 msgid "The specified user is not a subscriber of this list."
-msgstr ""
+msgstr "N'eo ket an implijer-mañ koumanantet d'ar roll."
 
 #. TRANS: Client error displayed when trying to unsubscribe from a non-subscribed list.
-#, fuzzy
 msgid "You are not subscribed to this list."
-msgstr "N'oc'h ket koumanantet d'ar profil-se."
+msgstr "N'oc'h ket koumanantet d'ar roll-mañ."
 
 #. TRANS: Client error displayed when uploading a media file has failed.
 msgid "Upload failed."
@@ -837,7 +813,7 @@ msgstr "Aotreet eo bet ar jedouer reked dija."
 
 #. TRANS: Form validation error given when an invalid username and/or password was passed to the OAuth API.
 msgid "Invalid nickname / password!"
-msgstr "Lesanv / ger tremen direizh !"
+msgstr "Lesanv / ger-tremen direizh !"
 
 #. TRANS: Server error displayed when a database action fails.
 msgid "Database error inserting oauth_token_association."
@@ -847,7 +823,6 @@ msgstr ""
 
 #. TRANS: Client error given on when invalid data was passed through a form in the OAuth API.
 #. TRANS: Unexpected validation error on avatar upload form.
-#. TRANS: Client error displayed when the submitted form contains unexpected data.
 #. TRANS: Client error displayed submitting invalid form data for edit application.
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
 #. TRANS: Form validation error message when an unsupported argument is used.
@@ -856,7 +831,6 @@ msgstr ""
 #. TRANS: Client error when submitting a form with unexpected information.
 #. TRANS: Client error displayed when unexpected data is posted in the password recovery form.
 #. TRANS: Message given submitting a form with an unknown action in SMS settings.
-#. TRANS: Unknown form validation error in design settings form.
 msgid "Unexpected form submission."
 msgstr "Kinnig ar furmskrid dic'hortoz."
 
@@ -895,7 +869,6 @@ msgstr "Kont"
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Field label on account registration page.
-#. TRANS: Label for nickname on user authorisation page.
 #. TRANS: Field label on group edit form.
 #. TRANS: Dropdown option for searching in profiles.
 msgid "Nickname"
@@ -992,7 +965,7 @@ msgstr "N'eo ket skoret an hentenn HTTP."
 
 #. TRANS: Exception thrown requesting an unsupported notice output format.
 #. TRANS: %s is the requested output format.
-#, fuzzy, php-format
+#, php-format
 msgid "Unsupported format: %s."
 msgstr "Diembreget eo ar furmad : %s"
 
@@ -1210,12 +1183,9 @@ msgstr "Ret eo deoc'h bezañ kevreet evit kuitaat ur strollad"
 #. TRANS: Client error displayed when requesting Friends of a Friend feed for a nickname that is not a group.
 #. TRANS: Client error displayed trying to block a user from a group while specifying a non-existing group.
 #. TRANS: Client error displayed referring to a group's permalink for a non-existing group ID.
-#. TRANS: Client error displayed trying to change group design settings while providing a nickname for a non-existing group.
 #. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
 #. TRANS: Client error displayed when trying to view group members for a non-existing group.
 #. TRANS: Client error displayed when trying to view group members for an object that is not a group.
-#. TRANS: Client error displayed when trying to view group members for a non-existing group.
-#. TRANS: Client error displayed when trying to view group members for an object that is not a group.
 #. TRANS: Client error displayed when requesting a group RSS feed for group that does not exist.
 #. TRANS: Client error displayed when requesting a group RSS feed for an object that is not a group.
 #. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
@@ -1224,10 +1194,10 @@ msgstr "Ret eo deoc'h bezañ kevreet evit kuitaat ur strollad"
 #. TRANS: Client error displayed when trying to leave a non-local group.
 #. TRANS: Client error displayed when trying to leave a non-existing group.
 #. TRANS: Client error displayed when providing an invalid group ID on the Make Admin page.
-#. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
-#. TRANS: Client error displayed if no local group with a given name was found requesting group page.
 #. TRANS: Command exception text shown when a group is requested that does not exist.
 #. TRANS: Error text shown when trying to leave a group that does not exist.
+#. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
+#. TRANS: Client error displayed if no local group with a given name was found requesting group page.
 msgid "No such group."
 msgstr "N'eus ket eus ar strollad-se."
 
@@ -1240,9 +1210,8 @@ msgstr "Lesanv pe ID ebet."
 
 #. TRANS: Client error displayed trying to approve group membership while not logged in.
 #. TRANS: Client error displayed when trying to leave a group while not logged in.
-#, fuzzy
 msgid "Must be logged in."
-msgstr "Nann-kevreet."
+msgstr "Rankout a rit bezañ kevreet."
 
 #. TRANS: Client error displayed trying to approve group membership while not a group administrator.
 #. TRANS: Client error displayed when trying to approve or cancel a group join request without
@@ -1296,6 +1265,7 @@ msgid "Join request canceled."
 msgstr ""
 
 #. TRANS: Client error displayed trying to approve subscription for a non-existing request.
+#. TRANS: %s is a user nickname.
 #, fuzzy, php-format
 msgid "%s is not in the moderation queue for your subscriptions."
 msgstr "Roll an implijerien enrollet er strollad-mañ."
@@ -1454,7 +1424,6 @@ msgstr "N'eo ket bet kavet ar restr stag."
 #. TRANS: Client error displayed trying to get an avatar without providing a nickname.
 #. TRANS: Client error displayed when requesting a list of blocked users for a group without providing a group nickname.
 #. TRANS: Client error displayed trying to edit a group while not proving a nickname for the group to edit.
-#. TRANS: Client error displayed trying to change group design settings without providing a group nickname.
 #. TRANS: Client error displayed when trying to change group logo settings without providing a nickname.
 #. TRANS: Client error displayed when trying to view group members without providing a group nickname.
 #. TRANS: Client error displayed when requesting a group RSS feed without providing a group nickname.
@@ -1623,9 +1592,8 @@ msgid "Yes"
 msgstr "Ya"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
-#, fuzzy
 msgid "Block this user."
-msgstr "Stankañ an implijer-mañ"
+msgstr "Stankañ an implijer-mañ."
 
 #. TRANS: Server error displayed when blocking a user fails.
 msgid "Failed to save block information."
@@ -1718,7 +1686,7 @@ msgstr "N'eo ket bet anavezet seurt ar chomlec'h %s"
 #. TRANS: Client error for an already confirmed email/jabber/sms address.
 #. TRANS: Client error for an already confirmed IM address.
 msgid "That address has already been confirmed."
-msgstr "Kadarnaet eo bet dija ar chomlec'h-mañ."
+msgstr "Kadarnaet eo bet ar chomlec'h-mañ c'hoazh."
 
 #. TRANS: Server error displayed when updating IM preferences fails.
 #. TRANS: Server error thrown on database error removing a registered IM address.
@@ -1750,6 +1718,18 @@ msgstr "Kadarnaet eo bet ar chomlec'h \"%s\" evit ho kont."
 msgid "Conversation"
 msgstr "Kaozeadenn"
 
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#, fuzzy
+msgid "Conversation feed (Activity Streams JSON)"
+msgstr "Gwazh alioù %s (Atom)"
+
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#, fuzzy
+msgid "Conversation feed (RSS 2.0)"
+msgstr "Neudenn an alioù evit %s (RSS 2.0)"
+
 #. TRANS: Title for conversation page.
 #. TRANS: Title for page that shows a notice.
 #, fuzzy
@@ -1810,7 +1790,8 @@ msgid "Enter \"%s\" to confirm that you want to delete your account."
 msgstr "Ebarzhit \"%s\" evit kadarnaat e fell deoc'h dilemel ho kont."
 
 #. TRANS: Button title for user account deletion.
-msgid "Permanently delete your account"
+#, fuzzy
+msgid "Permanently delete your account."
 msgstr "Dilemel ho kont da vat"
 
 #. TRANS: Client error displayed trying to delete an application while not logged in.
@@ -1954,153 +1935,6 @@ msgstr "Arabat dilemel an implijer-mañ"
 msgid "Delete this user."
 msgstr "Diverkañ an implijer-mañ"
 
-#. TRANS: Message used as title for design settings for the site.
-msgid "Design"
-msgstr "Design"
-
-#. TRANS: Instructions for design adminsitration panel.
-msgid "Design settings for this StatusNet site"
-msgstr ""
-
-#. TRANS: Client error displayed when a logo URL does is not valid.
-msgid "Invalid logo URL."
-msgstr "URL fall evit al logo."
-
-#. TRANS: Client error displayed when an SSL logo URL is invalid.
-msgid "Invalid SSL logo URL."
-msgstr "Chomlec'h URL fall evit al logo SSL."
-
-#. TRANS: Client error displayed when a theme is submitted through the form that is not in the theme list.
-#. TRANS: %s is the chosen unavailable theme.
-#, php-format
-msgid "Theme not available: %s."
-msgstr "N'eus ket eus ar gaoz-se : %s."
-
-#. TRANS: Fieldset legend for form to change logo.
-msgid "Change logo"
-msgstr "Cheñch al logo"
-
-#. TRANS: Field label for StatusNet site logo.
-msgid "Site logo"
-msgstr "Logo al lec'hienn"
-
-#. TRANS: Field label for SSL StatusNet site logo.
-msgid "SSL logo"
-msgstr "Logo SSL"
-
-#. TRANS: Fieldset legend for form change StatusNet site's theme.
-msgid "Change theme"
-msgstr "Lakaat un dodenn all"
-
-#. TRANS: Field label for dropdown to choose site theme.
-msgid "Site theme"
-msgstr "Dodenn al lec'hienn"
-
-#. TRANS: Title for field label for dropdown to choose site theme.
-msgid "Theme for the site."
-msgstr "Dodenn evit al lec'hienn."
-
-#. TRANS: Field label for uploading a cutom theme.
-msgid "Custom theme"
-msgstr "Dodenn personelaet"
-
-#. TRANS: Form instructions for uploading a cutom StatusNet theme.
-msgid "You can upload a custom StatusNet theme as a .ZIP archive."
-msgstr ""
-
-#. TRANS: Fieldset legend for theme background image.
-msgid "Change background image"
-msgstr "Kemmañ ar skeudenn foñs"
-
-#. TRANS: Field label for background image on theme designer page.
-#. TRANS: Field label for background color selector.
-#. TRANS: Label on profile design page for setting a profile page background colour.
-msgid "Background"
-msgstr "Background"
-
-#. TRANS: Form guide for background image upload form on theme designer page.
-#, php-format
-msgid ""
-"You can upload a background image for the site. The maximum file size is %1"
-"$s."
-msgstr ""
-
-#. TRANS: Used as radio button label to add a background image.
-msgid "On"
-msgstr "Gweredekaet"
-
-#. TRANS: Used as radio button label to not add a background image.
-msgid "Off"
-msgstr "Diweredekaet"
-
-#. TRANS: Form guide for turning background image on or off on theme designer page.
-#. TRANS: Form guide for a set of radio buttons on the profile design page that will enable or disable
-#. TRANS: use of the uploaded profile image.
-msgid "Turn background image on or off."
-msgstr "Gweredekaat pe diweredekaat ar skeudenn foñs."
-
-#. TRANS: Checkbox label to title background image on theme designer page.
-#. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
-msgid "Tile background image"
-msgstr "Adober gant ar skeudenn drekleur"
-
-#. TRANS: Fieldset legend for theme colors.
-#, fuzzy
-msgid "Change colors"
-msgstr "Kemmañ al livioù"
-
-#. TRANS: Field label for content color selector.
-#. TRANS: Label on profile design page for setting a profile page content colour.
-msgid "Content"
-msgstr "Endalc'h"
-
-#. TRANS: Field label for sidebar color selector.
-#. TRANS: Label on profile design page for setting a profile page sidebar colour.
-msgid "Sidebar"
-msgstr "Barenn kostez"
-
-#. TRANS: Field label for text color selector.
-#. TRANS: Label on profile design page for setting a profile page text colour.
-msgid "Text"
-msgstr "Testenn"
-
-#. TRANS: Field label for link color selector.
-#. TRANS: Label on profile design page for setting a profile page links colour.
-msgid "Links"
-msgstr "Liammoù"
-
-#. TRANS: Fieldset legend for advanced theme design settings.
-msgid "Advanced"
-msgstr "Araokaet"
-
-#. TRANS: Field label for custom CSS.
-msgid "Custom CSS"
-msgstr "CSS personelaet"
-
-#. TRANS: Button text for resetting theme settings.
-#, fuzzy
-msgctxt "BUTTON"
-msgid "Use defaults"
-msgstr "Implijout an talvoudoù dre ziouer"
-
-#. TRANS: Title for button for resetting theme settings.
-#. TRANS: Title for button on profile design page to reset all colour settings to default.
-#, fuzzy
-msgid "Restore default designs."
-msgstr "Adlakaat an neuz dre ziouer."
-
-#. TRANS: Title for button for resetting theme settings.
-#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#, fuzzy
-msgid "Reset back to default."
-msgstr "Adlakaat an arventennoù dre ziouer"
-
-#. TRANS: Title for button for saving theme settings.
-#. TRANS: Title for button on profile design page to save settings.
-#, fuzzy
-msgid "Save design."
-msgstr "Enrollañ an design"
-
 #. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
 msgid "This notice is not a favorite!"
 msgstr "N'eo ket ar c'hemenn-mañ ur pennroll !"
@@ -2115,6 +1949,75 @@ msgstr "Ouzhpennañ d'ar pennrolloù"
 msgid "No such document \"%s\"."
 msgstr "N'eo ket bet kavet ar restr \"%s\""
 
+#. TRANS: Menu item in administrator navigation panel.
+#. TRANS: Menu item in default local navigation panel.
+#. TRANS: Menu item in personal group navigation menu.
+msgctxt "MENU"
+msgid "Home"
+msgstr "Degemer"
+
+msgctxt "MENU"
+msgid "Docs"
+msgstr "Teuliadur"
+
+#. TRANS: Secondary navigation menu item leading to help on StatusNet.
+msgctxt "MENU"
+msgid "Help"
+msgstr "Skoazell"
+
+msgid "Getting started"
+msgstr "Kregiñ ganti"
+
+#. TRANS: Secondary navigation menu item leading to text about StatusNet site.
+msgctxt "MENU"
+msgid "About"
+msgstr "Diwar-benn"
+
+msgid "About this site"
+msgstr "Diwar-benn al lec'hienn-mañ"
+
+#. TRANS: Secondary navigation menu item leading to Frequently Asked Questions.
+msgctxt "MENU"
+msgid "FAQ"
+msgstr "FAG"
+
+msgid "Frequently asked questions"
+msgstr "Foar ar Goulennoù"
+
+#. TRANS: Secondary navigation menu item leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+msgctxt "MENU"
+msgid "Contact"
+msgstr "Darempred"
+
+#, fuzzy
+msgid "Contact info"
+msgstr "Darempred"
+
+msgctxt "MENU"
+msgid "Tags"
+msgstr "Balizennoù"
+
+msgid "Using tags"
+msgstr "Implijout balizennoù"
+
+#. TRANS: Menu item in default local navigation panel.
+#. TRANS: Menu item in search group navigation panel.
+#. TRANS: Menu item in local navigation menu.
+msgctxt "MENU"
+msgid "Groups"
+msgstr "Strolladoù"
+
+msgid "Using groups"
+msgstr "Implijout strolladoù"
+
+msgctxt "MENU"
+msgid "API"
+msgstr "API"
+
+msgid "RESTful API"
+msgstr ""
+
 #. TRANS: Title for "Edit application" form.
 #. TRANS: Form legend.
 msgid "Edit application"
@@ -2140,7 +2043,6 @@ msgstr "Ret eo lakaat un anv."
 
 #. TRANS: Validation error shown when providing too long a name in the "Edit application" form.
 #. TRANS: Validation error shown when providing too long a name in the "New application" form.
-#, fuzzy
 msgid "Name is too long (maximum 255 characters)."
 msgstr "Re hir eo an anv (255 arouezenn d'ar muiañ)."
 
@@ -2169,7 +2071,6 @@ msgid "Organization is required."
 msgstr "Ezhomm 'zo eus an aozadur."
 
 #. TRANS: Validation error shown when providing too long an arganisation name in the "Edit application" form.
-#, fuzzy
 msgid "Organization is too long (maximum 255 characters)."
 msgstr "Re hir eo an aozadur (255 arouezenn d'ar muiañ)."
 
@@ -2205,7 +2106,7 @@ msgstr "Rankout a reoc'h bezañ luget evit krouiñ ur strollad."
 
 #. TRANS: Form instructions for group edit form.
 msgid "Use this form to edit the group."
-msgstr "Leunit ar furmskrid-mañ evit kemmañ dibarzhioù ar strollad."
+msgstr "Implijit ar furmskrid-mañ evit kemmañ dibarzhioù ar strollad."
 
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
@@ -2221,20 +2122,19 @@ msgstr "Enrollet eo bet ho dibarzhioù."
 
 #. TRANS: Title for edit list page after deleting a tag.
 #. TRANS: %s is a list.
-#, fuzzy, php-format
+#, php-format
 msgid "Delete %s list"
-msgstr "Diverkañ an implijer-mañ"
+msgstr "Diverkañ ar roll %s"
 
 #. TRANS: Title for edit list page.
 #. TRANS: %s is a list.
 #. TRANS: Form legend for list edit form.
 #. TRANS: %s is a list.
-#, fuzzy, php-format
+#, php-format
 msgid "Edit list %s"
-msgstr "N'eo ket reizh ar merk-se : %s."
+msgstr "Kemmañ ar roll %s"
 
 #. TRANS: Error message displayed when trying to perform an action that requires a tagging user or ID.
-#, fuzzy
 msgid "No tagger or ID."
 msgstr "Lesanv pe ID ebet."
 
@@ -2243,19 +2143,16 @@ msgid "Not a local user."
 msgstr "N'eo ket un implijer lec'hel."
 
 #. TRANS: Client error displayed when reting to edit a tag that was not self-created.
-#, fuzzy
 msgid "You must be the creator of the tag to edit it."
-msgstr "Rankout a reer bezañ merour evit kemmañ ar strollad."
+msgstr "Rankout a reer bezañ krouer ar balizenn evit kemmañ anezhi."
 
 #. TRANS: Form instruction for edit list form.
-#, fuzzy
 msgid "Use this form to edit the list."
-msgstr "Leunit ar furmskrid-mañ evit kemmañ dibarzhioù ar strollad."
+msgstr "Implijit ar furmskrid-mañ evit kemmañ dibarzhioù ar roll."
 
 #. TRANS: Form validation error displayed if the form data for deleting a tag was incorrect.
-#, fuzzy
 msgid "Delete aborted."
-msgstr "Dilemel un ali"
+msgstr "Diverkadenn bet nullet."
 
 #. TRANS: Text in confirmation dialog for deleting a tag.
 msgid ""
@@ -2280,7 +2177,7 @@ msgid ""
 "subscriptions to it. Do you still want to continue?"
 msgstr ""
 
-#. TRANS: TRANS: Server error displayed when updating a list fails.
+#. TRANS: Server error displayed when updating a list fails.
 #, fuzzy
 msgid "Could not update list."
 msgstr "Dibosupl hizivaat an implijer."
@@ -2582,42 +2479,6 @@ msgstr "N'eus restr stag ebet."
 msgid "No uploaded attachments."
 msgstr "N'eus restr stag ebet."
 
-#. TRANS: Client error displayed when subscribing to a remote profile and an unexpected response is received.
-msgid "Not expecting this response!"
-msgstr "Ne oa ket gortozet ar respont-mañ !"
-
-#. TRANS: Client error displayed when subscribing to a remote profile that does not exist.
-msgid "User being listened to does not exist."
-msgstr ""
-
-#. TRANS: Client error displayed when subscribing to a remote profile that is a local profile.
-#. TRANS: Client error displayed when using remote subscribe for a local entity.
-#, fuzzy
-msgid "You can use the local subscription!"
-msgstr "Dibosupl eo dilemel ar c'houmanant."
-
-#. TRANS: Client error displayed when subscribing to a remote profile that is blocked form subscribing to.
-msgid "That user has blocked you from subscribing."
-msgstr "An implijer-se en deus ho stanket evit en enskrivañ."
-
-#. TRANS: Client error displayed when subscribing to a remote profile without providing an authorised token.
-msgid "You are not authorized."
-msgstr "N'oc'h ket aotreet."
-
-#. TRANS: Client error displayed when subscribing to a remote profile and conversion of the request token to access token fails.
-#, fuzzy
-msgid "Could not convert request token to access token."
-msgstr "Dibosupl eo kaout ur jedaouer reked."
-
-#. TRANS: Client error displayed when subscribing to a remote profile fails because of an unsupported version of the OMB protocol.
-msgid "Remote service uses unknown version of OMB protocol."
-msgstr ""
-
-#. TRANS: Server error displayed when subscribing to a remote profile fails because the remote profile could not be updated.
-#. TRANS: Exception thrown when updating a remote profile fails in OAuth store.
-msgid "Error updating remote profile."
-msgstr "Fazi en ur hizivaat ar profil a-bell."
-
 #. TRANS: Client error displayed when requesting a non-existent file.
 msgid "No such file."
 msgstr "Restr ezvezant."
@@ -2703,31 +2564,6 @@ msgstr "Distankañ implijer ar strollad"
 msgid "No ID."
 msgstr "ID ebet"
 
-#. TRANS: Client error displayed trying to change group design settings while not logged in.
-#, fuzzy
-msgid "You must be logged in to edit a group."
-msgstr "Rankout a reoc'h bezañ luget evit krouiñ ur strollad."
-
-#. TRANS: Title group design settings page.
-msgid "Group design"
-msgstr "Design ar strollad"
-
-#. TRANS: Instructions for group design settings page.
-msgid ""
-"Customize the way your group looks with a background image and a colour "
-"palette of your choice."
-msgstr ""
-
-#. TRANS: Form validation error displayed when group design settings could not be updated because of an application issue.
-#, fuzzy
-msgid "Unable to update your design settings."
-msgstr "Dibosupl eo enrollañ an arventennoù empentiñ."
-
-#. TRANS: Form text to confirm saved group design settings.
-#. TRANS: Confirmation message on Profile design page when saving design settings has succeeded.
-msgid "Design preferences saved."
-msgstr "Enrollet eo bet an arventennoù design."
-
 #. TRANS: Title for group logo settings page.
 #. TRANS: Group logo form legend.
 msgid "Group logo"
@@ -2897,8 +2733,8 @@ msgstr "Arventennoù ar bostelerezh prim"
 #. TRANS: the order and formatting of link text and link should remain unchanged.
 #, php-format
 msgid ""
-"You can send and receive notices through instant messaging [instant messages]"
-"(%%doc.im%%). Configure your addresses and settings below."
+"You can send and receive notices through [instant messaging](%%doc.im%%). "
+"Configure your addresses and settings below."
 msgstr ""
 
 #. TRANS: Message given in the IM settings if IM is not enabled on the site.
@@ -2925,7 +2761,7 @@ msgstr "Chomlec'h postelerezh prim"
 #. TRANS: Field title for IM address. %s is the IM service name.
 #, php-format
 msgid "%s screenname."
-msgstr ""
+msgstr "%s lesanv."
 
 #. TRANS: Header for IM preferences form.
 #, fuzzy
@@ -3108,29 +2944,6 @@ msgid ""
 "Use this form to invite your friends and colleagues to use this service."
 msgstr "Pediñ mignoned hag kenseurted da zont ganeoc'h war %s"
 
-#. TRANS: Field label for a list of e-mail addresses.
-msgid "Email addresses"
-msgstr "Chomlec'hioù postel"
-
-#. TRANS: Tooltip for field label for a list of e-mail addresses.
-#, fuzzy
-msgid "Addresses of friends to invite (one per line)."
-msgstr "Chomlec'hioù an implijerien da bediñ (unan dre linenn)"
-
-#. TRANS: Field label for a personal message to send to invitees.
-msgid "Personal message"
-msgstr "Kemennadenn bersonel"
-
-#. TRANS: Tooltip for field label for a personal message to send to invitees.
-msgid "Optionally add a personal message to the invitation."
-msgstr "Ouzhpennañ ur gemennadenn bersonel d'ar bedadenn (diret)."
-
-#. TRANS: Send button for inviting friends
-#. TRANS: Button text for sending notice.
-msgctxt "BUTTON"
-msgid "Send"
-msgstr "Kas"
-
 #. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral
 #. TRANS: singular 3rd-person pronoun in English. %1$s is the inviting user, $2$s is
 #. TRANS: the StatusNet sitename.
@@ -3265,12 +3078,6 @@ msgstr "URL ur skeudenn da ziskouez gant an aotre-implijout."
 msgid "Save license settings."
 msgstr "Enrollañ arventennoù an aotre-implijout"
 
-#. TRANS: Client error displayed when trying to log in while already logged in.
-#. TRANS: Client error displayed trying to use "one time password login" when already logged in.
-#. TRANS: Client error displayed when trying to register while already logged in.
-msgid "Already logged in."
-msgstr "Kevreet oc'h dija."
-
 #. TRANS: Form validation error displayed when trying to log in with incorrect credentials.
 msgid "Incorrect username or password."
 msgstr "Anv implijer pe ger-tremen direizh."
@@ -3386,6 +3193,7 @@ msgstr "Ezhomm 'zo eus ar vammenn URL."
 msgid "Could not create application."
 msgstr "N'eo ket posubl krouiñ ar poellad."
 
+#. TRANS: Form validation error messages displayed when uploading an invalid application logo.
 #, fuzzy
 msgid "Invalid image."
 msgstr "Ment direizh."
@@ -3425,14 +3233,6 @@ msgstr "Goullo eo !"
 msgid "No recipient specified."
 msgstr "N'ho peus ket lakaet a resever."
 
-#. TRANS: Client error displayed trying to send a direct message to self.
-#. TRANS: Error text shown when trying to send a direct message to self.
-msgid ""
-"Don't send a message to yourself; just say it to yourself quietly instead."
-msgstr ""
-"Na gasit ket a gemennadenn deoc'h c'hwi ho unan ; lavarit an traoù-se en ho "
-"penn kentoc'h."
-
 #. TRANS: Page title after sending a direct message.
 msgid "Message sent"
 msgstr "Kemennadenn kaset"
@@ -3633,6 +3433,33 @@ msgstr ""
 msgid "Not a supported data format."
 msgstr "Diembreget eo ar furmad-se."
 
+#. TRANS: Page title for profile settings.
+#, fuzzy
+msgid "Old school UI settings"
+msgstr "Arventennoù ar bostelerezh prim"
+
+#. TRANS: Usage instructions for profile settings.
+msgid "If you like it \"the old way\", you can set that here."
+msgstr ""
+
+#. TRANS: Confirmation shown when user profile settings are saved.
+#. TRANS: Message after successful saving of administrative settings.
+msgid "Settings saved."
+msgstr "Enrollet eo bet an arventennoù."
+
+msgid "Only stream mode (no conversations) in timelines"
+msgstr ""
+
+msgid "Show conversation page as hierarchical trees"
+msgstr ""
+
+msgid "Show nicknames (not full names) in timelines"
+msgstr ""
+
+#. TRANS: Button text to save a list.
+msgid "Save"
+msgstr "Enrollañ"
+
 #. TRANS: ShortName in the OpenSearch interface when trying to find users.
 msgid "People Search"
 msgstr "Klask tud"
@@ -3641,6 +3468,11 @@ msgstr "Klask tud"
 msgid "Notice Search"
 msgstr "Klask alioù"
 
+#. TRANS: Client error displayed trying to use "one time password login" when already logged in.
+#. TRANS: Client error displayed when trying to register while already logged in.
+msgid "Already logged in."
+msgstr "Kevreet oc'h dija."
+
 #. TRANS: Client error displayed trying to use "one time password login" without specifying a user.
 msgid "No user ID specified."
 msgstr "N'eus bet diferet ID implijer ebet."
@@ -3706,9 +3538,8 @@ msgstr "Ger-tremen nevez"
 
 #. TRANS: Field title on page where to change password.
 #. TRANS: Field title on account registration page.
-#, fuzzy
 msgid "6 or more characters."
-msgstr "6 arouezenn pe muioc'h"
+msgstr "6 arouezenn pe muioc'h."
 
 #. TRANS: Field label on page where to change password. In this field the new password should be typed a second time.
 #, fuzzy
@@ -3717,11 +3548,10 @@ msgid "Confirm"
 msgstr "Kadarnaat"
 
 #. TRANS: Field title on page where to change password.
-#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
+#. TRANS: Title for field label for password reset form where the password has to be typed again.
 #. TRANS: Field title on account registration page.
-#, fuzzy
 msgid "Same as password above."
-msgstr "Memestra eget ar ger tremen a-us"
+msgstr "Memestra eget ar ger-tremen a-us"
 
 #. TRANS: Button text on page where to change password.
 #, fuzzy
@@ -3780,12 +3610,6 @@ msgstr "N'eus ket eus ar gaoz-se : %s."
 msgid "Avatar directory not writable: %s."
 msgstr "N'eus ket eus ar gaoz-se : %s."
 
-#. TRANS: Client error in Paths admin panel.
-#. TRANS: %s is the background directory that could not be written to.
-#, fuzzy, php-format
-msgid "Background directory not writable: %s."
-msgstr "N'eus ket eus ar gaoz-se : %s."
-
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the locales directory that could not be read from.
 #, fuzzy, php-format
@@ -3819,9 +3643,8 @@ msgid "Site path."
 msgstr "Hent al lec'hienn"
 
 #. TRANS: Field label in Paths admin panel.
-#, fuzzy
 msgid "Locale directory"
-msgstr "Doser an temoù"
+msgstr "Kavlec'h lec'helaat"
 
 #. TRANS: Field title in Paths admin panel.
 msgid "Directory path to locales."
@@ -3868,9 +3691,8 @@ msgid "SSL path to themes (default: /theme/)."
 msgstr ""
 
 #. TRANS: Field label in Paths admin panel.
-#, fuzzy
 msgid "Directory"
-msgstr "Doser an temoù"
+msgstr "Kavlec'h"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
 msgid "Directory where themes are located."
@@ -3906,31 +3728,6 @@ msgstr "Restroù an avataroù"
 msgid "Directory where avatars are located."
 msgstr ""
 
-#. TRANS: Fieldset legend in Paths admin panel.
-msgid "Backgrounds"
-msgstr "Backgroundoù"
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-#, fuzzy
-msgid "Server for backgrounds."
-msgstr "Dodenn evit al lec'hienn."
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-msgid "Web path to backgrounds."
-msgstr ""
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-msgid "Server for backgrounds on SSL pages."
-msgstr ""
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-msgid "Web path to backgrounds on SSL pages."
-msgstr ""
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-msgid "Directory where backgrounds are located."
-msgstr ""
-
 #. TRANS: Fieldset legens in Paths admin panel.
 msgid "Attachments"
 msgstr "Pezhioù stag"
@@ -3991,8 +3788,9 @@ msgid "Server to direct SSL requests to."
 msgstr ""
 
 #. TRANS: Button title text to store form data in the Paths admin panel.
-msgid "Save paths"
-msgstr "Enrollañ an hentadoù."
+#, fuzzy
+msgid "Save path settings."
+msgstr "Enrollañ arventennoù al lec'hienn"
 
 #. TRANS: Instructions for the "People search" page.
 #. TRANS: %%site.name%% is the name of the StatusNet site.
@@ -4134,7 +3932,7 @@ msgid ""
 "%%%site.name%%%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
 "blogging) service based on the Free Software [StatusNet](http://status.net/) "
 "tool. You can easily keep track of what they are doing by subscribing to the "
-"tag's timeline."
+"list's timeline."
 msgstr ""
 "%%site.name%% a zo ur servij [micro-blogging](http://br.wikipedia.org/wiki/"
 "Microblog) diazezet war ar meziant frank [StatusNet](http://status.net/)."
@@ -4165,7 +3963,7 @@ msgid ""
 "site.name%%%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
 "blogging) service based on the Free Software [StatusNet](http://status.net/) "
 "tool. You can easily keep track of what they are doing by subscribing to the "
-"tag's timeline."
+"list's timeline."
 msgstr ""
 "%%site.name%% a zo ur servij [micro-blogging](http://br.wikipedia.org/wiki/"
 "Microblog) diazezet war ar meziant frank [StatusNet](http://status.net/)."
@@ -4266,18 +4064,6 @@ msgid ""
 "All default plugins have been disabled from the site's configuration file."
 msgstr ""
 
-#. TRANS: Client error displayed if the notice posted has too many characters.
-msgid "Invalid notice content."
-msgstr "Danvez direizh an ali."
-
-#. TRANS: Exception thrown if a notice's license is not compatible with the StatusNet site license.
-#. TRANS: %1$s is the notice license, %2$s is the StatusNet site's license.
-#, fuzzy, php-format
-msgid "Notice license \"%1$s\" is not compatible with site license \"%2$s\"."
-msgstr ""
-"Aotre-implijout ar menegoù \"%1$s\" ne ya ket gant aotre-implijout al "
-"lec'hienn \"%2$s\"."
-
 #. TRANS: Client error displayed when trying to add an unindentified field to profile.
 #. TRANS: %s is a field name.
 #, php-format
@@ -4377,6 +4163,8 @@ msgid "Share my current location when posting notices"
 msgstr "Rannañ va lec'hiadur pa bostan un ali."
 
 #. TRANS: Field label in form for profile settings.
+#. TRANS: Title for group tag cloud section.
+#. TRANS: %s is a group name.
 msgid "Tags"
 msgstr "Balizennoù"
 
@@ -4407,9 +4195,8 @@ msgid "What timezone are you normally in?"
 msgstr "Pehini eo gwerzhid-eur boaz ?"
 
 #. TRANS: Checkbox label in form for profile settings.
-#, fuzzy
 msgid ""
-"Automatically subscribe to whoever subscribes to me (best for non-humans)."
+"Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr ""
 "En em enskrivañ ez emgefre d'an holl re hag en em goumanant din (erbedet "
 "evit an implijerien nann-denel)"
@@ -4421,11 +4208,11 @@ msgstr "Koumanantoù"
 
 #. TRANS: Dropdown field option for following policy.
 msgid "Let anyone follow me"
-msgstr ""
+msgstr "Aotreañ forzh piv da heuliañ ac'hanon"
 
 #. TRANS: Dropdown field option for following policy.
 msgid "Ask me first"
-msgstr ""
+msgstr "Goulenn ganin da gentañ"
 
 #. TRANS: Dropdown field title on group edit form.
 msgid "Whether other users need your permission to follow your updates."
@@ -4481,11 +4268,6 @@ msgstr "Dibosupl eo enrollañ an dibaboù lec'hiadur."
 msgid "Could not save tags."
 msgstr "Dibosupl eo enrollañ ar merkoù."
 
-#. TRANS: Confirmation shown when user profile settings are saved.
-#. TRANS: Message after successful saving of administrative settings.
-msgid "Settings saved."
-msgstr "Enrollet eo bet an arventennoù."
-
 #. TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
 #. TRANS: Page title for page where a user account can be restored from backup.
 #, fuzzy
@@ -4499,7 +4281,8 @@ msgid "Beyond the page limit (%s)."
 msgstr "Dreist da bevennoù ar bajenn (%s)."
 
 #. TRANS: Server error displayed when a public timeline cannot be retrieved.
-msgid "Could not retrieve public stream."
+#, fuzzy
+msgid "Could not retrieve public timeline."
 msgstr "Dibosupl eo adtapout al lanv foran."
 
 #. TRANS: Title for all public timeline pages but the first.
@@ -4514,15 +4297,23 @@ msgid "Public timeline"
 msgstr "Lanv foran"
 
 #. TRANS: Link description for public timeline feed.
-msgid "Public Stream Feed (RSS 1.0)"
+#, fuzzy
+msgid "Public Timeline Feed (Activity Streams JSON)"
+msgstr "Neudenn gwazh foran (Atom)"
+
+#. TRANS: Link description for public timeline feed.
+#, fuzzy
+msgid "Public Timeline Feed (RSS 1.0)"
 msgstr "Neudenn gwazh foran (RSS 1.0)"
 
 #. TRANS: Link description for public timeline feed.
-msgid "Public Stream Feed (RSS 2.0)"
+#, fuzzy
+msgid "Public Timeline Feed (RSS 2.0)"
 msgstr "Neudenn gwazh foran (RSS 2.0)"
 
 #. TRANS: Link description for public timeline feed.
-msgid "Public Stream Feed (Atom)"
+#, fuzzy
+msgid "Public Timeline Feed (Atom)"
 msgstr "Neudenn gwazh foran (Atom)"
 
 #. TRANS: Text displayed for public feed when there are no public notices.
@@ -4568,50 +4359,6 @@ msgstr ""
 "%%site.name%% a zo ur servij [micro-blogging](http://br.wikipedia.org/wiki/"
 "Microblog) diazezet war ar meziant frank [StatusNet](http://status.net/)."
 
-#. TRANS: Title for page with public list cloud.
-#, fuzzy
-msgid "Public list cloud"
-msgstr "Koumoulenn a merkoù foran"
-
-#. TRANS: Page notice for page with public list cloud.
-#. TRANS: %s is a StatusNet sitename.
-#, fuzzy, php-format
-msgid "These are largest lists on %s"
-msgstr "Ar merkoù ziwezhañ evit ar re vrudetañ war %s "
-
-#. TRANS: Empty list message on page with public list cloud.
-#. TRANS: This message contains Markdown links in the form [description](link).
-#, php-format
-msgid "No one has [listed](%%doc.tags%%) anyone yet."
-msgstr ""
-
-#. TRANS: Additional empty list message on page with public list cloud for logged in users.
-#, fuzzy
-msgid "Be the first to list someone!"
-msgstr "Bezit an hini gentañ oc'h embann unan !"
-
-#. TRANS: Additional empty list message on page with public list cloud for anonymous users.
-#. TRANS: This message contains Markdown links in the form [description](link).
-#, fuzzy, php-format
-msgid ""
-"Why not [register an account](%%action.register%%) and be the first to list "
-"someone!"
-msgstr ""
-"Perak ne [groufec'h ket ur gont](%%action.register%%) ha bezañ an hini "
-"gentañ da embann un dra !"
-
-#. TRANS: DT element on on page with public list cloud.
-#, fuzzy
-msgid "List cloud"
-msgstr "N'eo ket bet kavet an implijer."
-
-#. TRANS: Link title for number of listed people. %d is the number of listed people.
-#, php-format
-msgid "1 person listed"
-msgid_plural "%d people listed"
-msgstr[0] ""
-msgstr[1] ""
-
 #. TRANS: Public RSS feed description. %s is the StatusNet site name.
 #, fuzzy, php-format
 msgid "%s updates from everyone."
@@ -4654,7 +4401,7 @@ msgstr ""
 
 #. TRANS: Client error displayed trying to recover password while already logged in.
 msgid "You are already logged in!"
-msgstr "Luget oc'h dija !"
+msgstr "Kevreet oc'h c'hoazh !"
 
 #. TRANS: Client error displayed when password recovery code is not correct.
 msgid "No such recovery code."
@@ -4710,7 +4457,6 @@ msgid "Recover"
 msgstr "Adtapout"
 
 #. TRANS: Button text on password recovery page.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Recover"
 msgstr "Adtapout"
@@ -4734,12 +4480,10 @@ msgid "Password saved"
 msgstr "Ger-tremen enrollet."
 
 #. TRANS: Title for field label for password reset form.
-#, fuzzy
 msgid "6 or more characters, and do not forget it!"
 msgstr "6 arouezenn pe muioc'h, ha n'e zisoñjit ket !"
 
 #. TRANS: Button text for password reset form.
-#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
 msgctxt "BUTTON"
 msgid "Reset"
 msgstr "Adderaouekaat"
@@ -4748,18 +4492,6 @@ msgstr "Adderaouekaat"
 msgid "Enter a nickname or email address."
 msgstr "Lakait ul lesanv pe ur chomlec'h postel."
 
-#. TRANS: Information on password recovery form if no known username or e-mail address was specified.
-msgid "No user with that email address or username."
-msgstr "N'eus bet kavet implijer ebet gant ar postel-se pe an anv-se."
-
-#. TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.
-msgid "No registered email address for that user."
-msgstr "Chomlec'h postel enrollet ebet evit an implijer-mañ."
-
-#. TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.
-msgid "Error saving address confirmation."
-msgstr "Ur fazi 'zo bet pa voe enrollet kod kadarnaat ar postel."
-
 #. TRANS: User notification after an e-mail with instructions was sent from the password recovery form.
 msgid ""
 "Instructions for recovering your password have been sent to the email "
@@ -4895,7 +4627,7 @@ msgstr "Ma zestenn ha ma restroù a chom dindan ma gwirioù oberour."
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
 msgid "All rights reserved."
-msgstr "Holl gwrioù miret strizh."
+msgstr "Pep gwir miret strizh."
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
 #, php-format
@@ -4934,74 +4666,6 @@ msgstr ""
 "(Resevout a reoc'h a-benn nebeut ur postel gant an titouroù evit kadarnaat "
 "ho chomlec'h.)"
 
-#. TRANS: Page notice for remote subscribe. This message contains Markdown links.
-#. TRANS: Ensure to keep the correct markup of [link description](link).
-#, 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 ""
-
-#. TRANS: Page title for Remote subscribe.
-msgid "Remote subscribe"
-msgstr "Koumanant eus a-bell"
-
-#. TRANS: Field legend on page for remote subscribe.
-msgid "Subscribe to a remote user"
-msgstr "Koumanantiñ d'un implijer pell"
-
-#. TRANS: Field label on page for remote subscribe.
-msgid "User nickname"
-msgstr "Lesanv an implijer"
-
-#. TRANS: Field title on page for remote subscribe.
-#, fuzzy
-msgid "Nickname of the user you want to follow."
-msgstr "Lesanv an implijer ho peus c'hoant heuliañ"
-
-#. TRANS: Field label on page for remote subscribe.
-msgid "Profile URL"
-msgstr "URL ar profil"
-
-#. TRANS: Field title on page for remote subscribe.
-msgid "URL of your profile on another compatible microblogging service."
-msgstr ""
-
-#. TRANS: Button text on page for remote subscribe.
-#. TRANS: Link text for link that will subscribe to a remote profile.
-#. TRANS: Button text to subscribe to a user.
-#. TRANS: Button text for subscribing to a list.
-#, fuzzy
-msgctxt "BUTTON"
-msgid "Subscribe"
-msgstr "En em enskrivañ"
-
-#. TRANS: Form validation error on page for remote subscribe when an invalid profile URL was provided.
-#, fuzzy
-msgid "Invalid profile URL (bad format)."
-msgstr "URL direizh evit ar profil (furmad fall)"
-
-#. TRANS: Form validation error on page for remote subscribe when no the provided profile URL
-#. TRANS: does not contain expected data.
-msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
-msgstr ""
-
-#. TRANS: Form validation error on page for remote subscribe.
-#, fuzzy
-msgid "That is a local profile! Login to subscribe."
-msgstr "Lec'hel eo ar profil-mañ ! Kevreit evit koumananti."
-
-#. TRANS: Form validation error on page for remote subscribe when the remote service is not providing a request token.
-#, fuzzy
-msgid "Could not get a request token."
-msgstr "Dibosupl eo kaout ur jedaouer reked."
-
-#. TRANS: Client error displayed when trying to (un)list an OMB 0.1 remote profile.
-#, fuzzy
-msgid "You cannot (un)list an OMB 0.1 remote profile with this action."
-msgstr "Ne c'helloc'h ket reiñ rolloù d'an implijerien eus al lec'hienn-mañ."
-
 #. TRANS: Client error displayed when an unknown error occurs while delisting a user.
 #. TRANS: %s is a username.
 #, php-format
@@ -5054,6 +4718,12 @@ msgstr "Respontoù da %s"
 msgid "Replies to %1$s, page %2$d"
 msgstr "Respontoù da %1$s, pajenn %2$d"
 
+#. TRANS: Link for feed with replies for a user.
+#. TRANS: %s is a user nickname.
+#, fuzzy, php-format
+msgid "Replies feed for %s (Activity Streams JSON)"
+msgstr "Gwazh respontoù evit %s (Atom)"
+
 #. TRANS: Link for feed with replies for a user.
 #. TRANS: %s is a user nickname.
 #, php-format
@@ -5170,7 +4840,7 @@ msgstr ""
 
 #. TRANS: Form instructions for feed restore.
 msgid ""
-"You can upload a backed-up stream in <a href=\"http://activitystrea.ms/"
+"You can upload a backed-up timeline in <a href=\"http://activitystrea.ms/"
 "\">Activity Streams</a> format."
 msgstr ""
 
@@ -5275,7 +4945,7 @@ msgstr[1] "Krouet gant %1$s - moned %2$s dre ziouer - %3$d implijer"
 
 #. TRANS: Header on the OAuth application page.
 msgid "Application actions"
-msgstr "Obererezhioù ar poellad"
+msgstr "Obererezhioù an arload"
 
 #. TRANS: Link text to edit application on the OAuth application page.
 #, fuzzy
@@ -5292,6 +4962,26 @@ msgstr "Adderaouekaat an alc'hwez hag ar sekred"
 msgid "Application info"
 msgstr "Titouroù ar poelad"
 
+#. TRANS: Field label on application page.
+msgid "Consumer key"
+msgstr "Alc'hwez implijer"
+
+#. TRANS: Field label on application page.
+msgid "Consumer secret"
+msgstr "Sekred an implijer"
+
+#. TRANS: Field label on application page.
+msgid "Request token URL"
+msgstr "URL ar jedouer reked"
+
+#. TRANS: Field label on application page.
+msgid "Access token URL"
+msgstr "URL ar jedouer moned"
+
+#. TRANS: Field label on application page.
+msgid "Authorize URL"
+msgstr "aotren an URL"
+
 #. TRANS: Note on the OAuth application page about signature support.
 msgid ""
 "Note: HMAC-SHA1 signatures are supported. The plaintext signature method is "
@@ -5313,6 +5003,11 @@ msgstr "Alioù karetañ %1$s, pajenn %2$d"
 msgid "Could not retrieve favorite notices."
 msgstr "Diposupl eo diskwel ar pennrolloù."
 
+#. TRANS: Feed link text. %s is a username.
+#, fuzzy, php-format
+msgid "Feed for favorites of %s (Activity Streams JSON)"
+msgstr "Gwazh evit mignoned %s (Atom)"
+
 #. TRANS: Feed link text. %s is a username.
 #, php-format
 msgid "Feed for favorites of %s (RSS 1.0)"
@@ -5367,6 +5062,11 @@ msgstr "strollad %s"
 msgid "%1$s group, page %2$d"
 msgstr "Strollad %1$s, pajenn %2$d"
 
+#. TRANS: Tooltip for feed link. %s is a group nickname.
+#, fuzzy, php-format
+msgid "Notice feed for %s group (Activity Streams JSON)"
+msgstr "Neudenn alioù ar strollad %s (Atom)"
+
 #. TRANS: Tooltip for feed link. %s is a group nickname.
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
@@ -5387,42 +5087,8 @@ msgstr "Neudenn alioù ar strollad %s (Atom)"
 msgid "FOAF for %s group"
 msgstr "Mignon ur mignon evit ar strollad %s"
 
-#. TRANS: Header for mini list of group members on a group page (h2).
-msgid "Members"
-msgstr "Izili"
-
-#. TRANS: Description for mini list of group members on a group page when the group has no members.
-#. TRANS: Content of "Listed" page if there are no listed users.
-#. TRANS: Content of "People following tag x" if there are no subscribed users.
-#. TRANS: Empty list message for tags.
-#. TRANS: Text for user subscription statistics if the user has no subscriptions.
-#. TRANS: Text for user subscriber statistics if user has no subscribers.
-#. TRANS: Text for user user group membership statistics if user is not a member of any group.
-#. TRANS: Default content for section/sidebar widget.
-msgid "(None)"
-msgstr "(Hini ebet)"
-
-#. TRANS: Link to all group members from mini list of group members if group has more than n members.
-msgid "All members"
-msgstr "An holl izili"
-
-#. TRANS: Header for group statistics on a group page (h2).
-#. TRANS: H2 text for user statistics.
-msgid "Statistics"
-msgstr "Stadegoù"
-
-#. TRANS: Label for group creation date.
-msgctxt "LABEL"
-msgid "Created"
-msgstr "Krouet"
-
-#. TRANS: Label for member count in statistics on group page.
-msgctxt "LABEL"
-msgid "Members"
-msgstr "Izili"
-
 #. TRANS: Notice on group pages for anonymous users for StatusNet sites that accept new registrations.
-#. TRANS: **%s** is the group alias, %%%%site.name%%%% is the site name,
+#. TRANS: %s is the group name, %%%%site.name%%%% is the site name,
 #. TRANS: %%%%action.register%%%% is the URL for registration, %%%%doc.help%%%% is a URL to help.
 #. TRANS: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
 #, fuzzy, php-format
@@ -5437,23 +5103,18 @@ msgstr ""
 "Microblog) diazezet war ar meziant frank [StatusNet](http://status.net/)."
 
 #. TRANS: Notice on group pages for anonymous users for StatusNet sites that accept no new registrations.
-#. TRANS: **%s** is the group alias, %%%%site.name%%%% is the site name,
+#. TRANS: %s is the group name, %%%%site.name%%%% is the site name,
 #. TRANS: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
 #, fuzzy, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
 "wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
 "[StatusNet](http://status.net/) tool. Its members share short messages about "
-"their life and interests. "
+"their life and interests."
 msgstr ""
 "%%site.name%% a zo ur servij [micro-blogging](http://br.wikipedia.org/wiki/"
 "Microblog) diazezet war ar meziant frank [StatusNet](http://status.net/)."
 
-#. TRANS: Title for list of group administrators on a group page.
-msgctxt "TITLE"
-msgid "Admins"
-msgstr "Merourien"
-
 #. TRANS: Client error displayed requesting a single message that does not exist.
 msgid "No such message."
 msgstr "N'eus ket eus ar gemennadenn-se."
@@ -5551,9 +5212,21 @@ msgstr ""
 "gentañ da embann un dra !"
 
 #. TRANS: Header on show list page.
+#. TRANS: Link description for link to list of users tagged with a tag (so part of a list).
 msgid "Listed"
 msgstr "Rollet"
 
+#. TRANS: Content of "Listed" page if there are no listed users.
+#. TRANS: Content of "People following tag x" if there are no subscribed users.
+#. TRANS: Description for mini list of group members on a group page when the group has no members.
+#. TRANS: Empty list message for tags.
+#. TRANS: Text for user subscription statistics if the user has no subscriptions.
+#. TRANS: Text for user subscriber statistics if user has no subscribers.
+#. TRANS: Text for user user group membership statistics if user is not a member of any group.
+#. TRANS: Default content for section/sidebar widget.
+msgid "(None)"
+msgstr "(Hini ebet)"
+
 #. TRANS: Link for more "People in list x by a user"
 #. TRANS: if there are more than the mini list's maximum.
 msgid "Show all"
@@ -5564,24 +5237,19 @@ msgstr "Diskouez pep tra"
 msgid "Subscribers"
 msgstr "Koumananterien"
 
-#. TRANS: Link for more "People following tag x"
-#. TRANS: if there are more than the mini list's maximum.
-msgid "All subscribers"
-msgstr "An holl goumananterien"
-
-#. TRANS: Page title showing tagged notices in one user's stream.
+#. TRANS: Page title showing tagged notices in one user's timeline.
 #. TRANS: %1$s is the username, %2$s is the hash tag.
 #, fuzzy, php-format
 msgid "Notices by %1$s tagged %2$s"
 msgstr "%1$s, pajenn %2$d"
 
-#. TRANS: Page title showing tagged notices in one user's stream.
+#. TRANS: Page title showing tagged notices in one user's timeline.
 #. TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number.
 #, fuzzy, php-format
 msgid "Notices by %1$s tagged %2$s, page %3$d"
 msgstr "Alioù merket gant %1$s, pajenn %2$d"
 
-#. TRANS: Extended page title showing tagged notices in one user's stream.
+#. TRANS: Extended page title showing tagged notices in one user's timeline.
 #. TRANS: %1$s is the username, %2$d is the page number.
 #, fuzzy, php-format
 msgid "Notices by %1$s, page %2$d"
@@ -5593,6 +5261,12 @@ msgstr "Alioù merket gant %1$s, pajenn %2$d"
 msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
 msgstr "Neudenn an alioù evit %1$s merket %2$s (RSS 1.0)"
 
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#, fuzzy, php-format
+msgid "Notice feed for %s (Activity Streams JSON)"
+msgstr "Gwazh alioù %s (Atom)"
+
 #. TRANS: Title for link to notice feed.
 #. TRANS: %s is a user nickname.
 #, php-format
@@ -5617,7 +5291,7 @@ msgstr "Gwazh alioù %s (Atom)"
 msgid "FOAF for %s"
 msgstr "mignon ur mignon evit %s"
 
-#. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
+#. TRANS: First sentence of empty list message for a timeline. $1%s is a user nickname.
 #, fuzzy, php-format
 msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
 msgstr ""
@@ -5630,7 +5304,7 @@ msgid ""
 "would be a good time to start :)"
 msgstr ""
 
-#. TRANS: Second sentence of empty  list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
+#. TRANS: Second sentence of empty  list message for a non-self timeline. %1$s is a user nickname, %2$s is a part of a URL.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
 #, php-format
 msgid ""
@@ -5638,7 +5312,7 @@ msgid ""
 "%?status_textarea=%2$s)."
 msgstr ""
 
-#. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
+#. TRANS: Announcement for anonymous users showing a timeline if site registrations are open.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
 #, fuzzy, php-format
 msgid ""
@@ -5650,13 +5324,13 @@ msgstr ""
 "%%site.name%% a zo ur servij [micro-blogging](http://br.wikipedia.org/wiki/"
 "Microblog) diazezet war ar meziant frank [StatusNet](http://status.net/)."
 
-#. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
+#. TRANS: Announcement for anonymous users showing a timeline if site registrations are closed or invite only.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
 #, fuzzy, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
 "wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
-"[StatusNet](http://status.net/) tool. "
+"[StatusNet](http://status.net/) tool."
 msgstr ""
 "%%site.name%% a zo ur servij [micro-blogging](http://br.wikipedia.org/wiki/"
 "Microblog) diazezet war ar meziant frank [StatusNet](http://status.net/)."
@@ -5695,6 +5369,14 @@ msgstr "Ne c'hell ket bezañ goullo anv al lec'hienn."
 msgid "You must have a valid contact email address."
 msgstr "N'eo ket ur chomlec'h postel reizh."
 
+#. TRANS: Client error displayed when a logo URL is not valid.
+msgid "Invalid logo URL."
+msgstr "URL fall evit al logo."
+
+#. TRANS: Client error displayed when a SSL logo URL is invalid.
+msgid "Invalid SSL logo URL."
+msgstr "Chomlec'h URL fall evit al logo SSL."
+
 #. TRANS: Client error displayed trying to save site settings with an invalid language code.
 #. TRANS: %s is the invalid language code.
 #, php-format
@@ -5766,7 +5448,8 @@ msgid "Default language"
 msgstr "Yezh dre ziouer"
 
 #. TRANS: Dropdown title on site settings panel.
-msgid "Site language when autodetection from browser settings is not available"
+msgid ""
+"The site language when autodetection from browser settings is not available."
 msgstr ""
 
 #. TRANS: Fieldset legend on site settings panel.
@@ -5791,8 +5474,21 @@ msgstr "Bevenn a doublennoù"
 msgid "How long users must wait (in seconds) to post the same thing again."
 msgstr ""
 
+#. TRANS: Fieldset legend for form to change logo.
+msgid "Logo"
+msgstr "Logo"
+
+#. TRANS: Field label for StatusNet site logo.
+msgid "Site logo"
+msgstr "Logo al lec'hienn"
+
+#. TRANS: Field label for SSL StatusNet site logo.
+msgid "SSL logo"
+msgstr "Logo SSL"
+
 #. TRANS: Button title for saving site settings.
-msgid "Save site settings"
+#, fuzzy
+msgid "Save the site settings."
 msgstr "Enrollañ arventennoù al lec'hienn"
 
 #. TRANS: Page title for site-wide notice tab in admin panel.
@@ -5822,7 +5518,7 @@ msgstr ""
 "Testenn an ali diwar-benn al lec'hienn a-bezh (255 arouezenn d'ar muiañ ; "
 "HTML gweredekaet)"
 
-#. TRANS: Title for button to save site notice in admin panel.
+#. TRANS: Button title to save site notice in admin panel.
 #, fuzzy
 msgid "Save site notice."
 msgstr "Enrollañ ali ul lec'hienn"
@@ -6021,7 +5717,7 @@ msgstr "URL an danevell"
 msgid "Snapshots will be sent to this URL."
 msgstr ""
 
-#. TRANS: Title for button to save snapshot settings.
+#. TRANS: Button title to save snapshot settings.
 #, fuzzy
 msgid "Save snapshot settings."
 msgstr "Enrollañ arventennoù al lec'hienn"
@@ -6057,10 +5753,6 @@ msgstr "Izili ar strollad %1$s, pajenn %2$d"
 msgid "A list of users awaiting approval to subscribe to you."
 msgstr "Roll an implijerien enrollet er strollad-mañ."
 
-#. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
-msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
-msgstr ""
-
 #. TRANS: Page title when subscription succeeded.
 msgid "Subscribed"
 msgstr "Koumanantet"
@@ -6164,8 +5856,7 @@ msgid ""
 "You're not listening to anyone's notices right now, try subscribing to "
 "people you know. Try [people search](%%action.peoplesearch%%), look for "
 "members in groups you're interested in and in our [featured users](%%action."
-"featured%%). If you're a [Twitter user](%%action.twittersettings%%), you can "
-"automatically subscribe to people you already follow there."
+"featured%%)."
 msgstr ""
 
 #. TRANS: Subscription list text when looking at the subscriptions for a of a user other
@@ -6197,6 +5888,12 @@ msgstr "SMS"
 msgid "Notices tagged with %1$s, page %2$d"
 msgstr "Alioù merket gant %1$s, pajenn %2$d"
 
+#. TRANS: Link label for feed on "notices with tag" page.
+#. TRANS: %s is the tag the feed is for.
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (Activity Streams JSON)"
+msgstr "Gwazh an alioù evit ar merk %s (Atom)"
+
 #. TRANS: Link label for feed on "notices with tag" page.
 #. TRANS: %s is the tag the feed is for.
 #, php-format
@@ -6271,9 +5968,8 @@ msgid "Tags"
 msgstr "Balizennoù"
 
 #. TRANS: Success message if lists are saved.
-#, fuzzy
 msgid "Lists saved."
-msgstr "Ger-tremen enrollet."
+msgstr "Rolloù enrollet."
 
 #. TRANS: Page notice.
 #, fuzzy
@@ -6309,18 +6005,6 @@ msgstr "Digoumanantet"
 msgid "%1$s unsubscribed from list %2$s by %3$s"
 msgstr "Koumanantet da %1$s, pajenn %2$d"
 
-#. TRANS: Client error displayed when trying to update profile with an incompatible license.
-#. TRANS: %1$s is the license incompatible with site license %2$s.
-#. TRANS: Exception thrown when licenses are not compatible for an authorisation request.
-#. TRANS: %1$s is the license for the listenee, %2$s is the license for "this" StatusNet site.
-#, fuzzy, php-format
-msgid ""
-"Listenee stream license \"%1$s\" is not compatible with site license \"%2$s"
-"\"."
-msgstr ""
-"Aotre-implijout ar menegoù \"%1$s\" ne ya ket gant aotre-implijout al "
-"lec'hienn \"%2$s\"."
-
 #. TRANS: Title of URL settings tab in profile settings.
 #, fuzzy
 msgid "URL settings"
@@ -6337,9 +6021,8 @@ msgid " (free service)"
 msgstr " (servij digoust)"
 
 #. TRANS: Default value for URL shortening settings.
-#, fuzzy
 msgid "[none]"
-msgstr "Hini ebet"
+msgstr "[hini ebet]"
 
 #. TRANS: Default value for URL shortening settings.
 msgid "[internal]"
@@ -6347,7 +6030,7 @@ msgstr "[diabarzh]"
 
 #. TRANS: Label for dropdown with URL shortener services.
 msgid "Shorten URLs with"
-msgstr ""
+msgstr "Berraat an URLù gant"
 
 #. TRANS: Tooltip for for dropdown with URL shortener services.
 msgid "Automatic shortening service to use."
@@ -6355,7 +6038,7 @@ msgstr ""
 
 #. TRANS: Field label in URL settings in profile.
 msgid "URL longer than"
-msgstr ""
+msgstr "URL hiroc'h eget"
 
 #. TRANS: Field title in URL settings in profile.
 msgid "URLs longer than this will be shortened, 0 means always shorten."
@@ -6363,7 +6046,7 @@ msgstr ""
 
 #. TRANS: Field label in URL settings in profile.
 msgid "Text longer than"
-msgstr ""
+msgstr "Testenn hiroc'h eget"
 
 #. TRANS: Field title in URL settings in profile.
 msgid ""
@@ -6463,150 +6146,11 @@ msgstr "Pedadennoù gweredekaet"
 msgid "Whether to allow users to invite new users."
 msgstr "Ma rankomp merañ an dalc'hoù hon unan."
 
-#. TRANS: Title for button to save user settings in user admin panel.
+#. TRANS: Button title to save user settings in user admin panel.
 #, fuzzy
 msgid "Save user settings."
 msgstr "Enrollañ arventennoù an implijer"
 
-#. TRANS: Page title.
-msgid "Authorize subscription"
-msgstr "Aotreañ ar c'houmanant"
-
-#. TRANS: Page notice on "Authorize subscription" page.
-msgid ""
-"Please check these details to make sure that you want to subscribe to this "
-"user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
-"click \"Reject\"."
-msgstr ""
-
-#. TRANS: Button text on Authorise Subscription page.
-#. TRANS: Submit button text to accept a group membership request on approve group form.
-#. TRANS: Submit button text to accept a subscription request on approve sub form.
-msgctxt "BUTTON"
-msgid "Accept"
-msgstr "Asantiñ"
-
-#. TRANS: Title for button on Authorise Subscription page.
-#. TRANS: Button title to subscribe to a user.
-#, fuzzy
-msgid "Subscribe to this user."
-msgstr "En em goumanantiñ d'an implijer-mañ"
-
-#. TRANS: Button text on Authorise Subscription page.
-#. TRANS: Submit button text to reject a group membership request on approve group form.
-#. TRANS: Submit button text to reject a subscription request on approve sub form.
-msgctxt "BUTTON"
-msgid "Reject"
-msgstr "Disteurel"
-
-#. TRANS: Title for button on Authorise Subscription page.
-#, fuzzy
-msgid "Reject this subscription."
-msgstr "Nac'hañ ar c'houmanant"
-
-#. TRANS: Client error displayed for an empty authorisation request.
-msgid "No authorization request!"
-msgstr "Reked aotreañ ebet !"
-
-#. TRANS: Accept message header from Authorise subscription page.
-msgid "Subscription authorized"
-msgstr "Koumanant aotreet"
-
-#. TRANS: Accept message text from Authorise subscription page.
-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 ""
-
-#. TRANS: Reject message header from Authorise subscription page.
-msgid "Subscription rejected"
-msgstr "Koumanant bet nac'het"
-
-#. TRANS: Reject message from Authorise subscription page.
-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 ""
-
-#. TRANS: Exception thrown when no valid user is found for an authorisation request.
-#. TRANS: %s is a listener URI.
-#, fuzzy, php-format
-msgid "Listener URI \"%s\" not found here."
-msgstr "N'eo ket bet kavet amañ URI ar selaouer \"%s\"."
-
-#. TRANS: Exception thrown when listenee URI is too long for an authorisation request.
-#. TRANS: %s is a listenee URI.
-#, fuzzy, php-format
-msgid "Listenee URI \"%s\" is too long."
-msgstr "Re hir eo an URI \"%s\" ez oc'h koumanantet dezhi."
-
-#. TRANS: Exception thrown when listenee URI is a local user for an authorisation request.
-#. TRANS: %s is a listenee URI.
-#, fuzzy, php-format
-msgid "Listenee URI \"%s\" is a local user."
-msgstr "An URI \"%s\" ez oc'h koumanantet dezhi a zo un implijer lec'hel."
-
-#. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
-#. TRANS: %s is a profile URL.
-#, fuzzy, php-format
-msgid "Profile URL \"%s\" is for a local user."
-msgstr "URI ar profil \"%s\" a zo evit un implijer lec'hel."
-
-#. TRANS: Exception thrown when avatar URL is invalid for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#, fuzzy, php-format
-msgid "Avatar URL \"%s\" is not valid."
-msgstr "N'eo ket reizh URL an avatar \"%s\"."
-
-#. TRANS: Exception thrown when avatar URL could not be read for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#, fuzzy, php-format
-msgid "Cannot read avatar URL \"%s\"."
-msgstr "Dibosupl eo lenn URL an avatar \"%s\"."
-
-#. TRANS: Exception thrown when avatar URL return an invalid image type for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#, fuzzy, php-format
-msgid "Wrong image type for avatar URL \"%s\"."
-msgstr "Seurt skeudenn direizh evit URL an avatar \"%s\"."
-
-#. TRANS: Title for profile design page.
-#. TRANS: Page title for profile design page.
-msgid "Profile design"
-msgstr "Design ar profil"
-
-#. TRANS: Instructions for Profile design page.
-#. TRANS: Instructions for profile design page.
-msgid ""
-"Customize the way your profile looks with a background image and a colour "
-"palette of your choice."
-msgstr ""
-
-#. TRANS: Succes message on Profile design page when finding an easter egg.
-msgid "Enjoy your hotdog!"
-msgstr "Bez plijadur gant da hotdog !"
-
-#. TRANS: Form legend on Profile design page.
-#, fuzzy
-msgid "Design settings"
-msgstr "Enrollañ arventennoù al lec'hienn"
-
-#. TRANS: Checkbox label on Profile design page.
-#, fuzzy
-msgid "View profile designs"
-msgstr "Design ar profil"
-
-#. TRANS: Title for checkbox on Profile design page.
-msgid "Show or hide profile designs."
-msgstr "Diskouez pe kuzhat designoù ar profil."
-
-#. TRANS: Form legend on Profile design page for form to choose a background image.
-#, fuzzy
-msgid "Background file"
-msgstr "Background"
-
 #. TRANS: Page title for all but the first page of groups for a user.
 #. TRANS: %1$s is a nickname, %2$d is a page number.
 #, php-format
@@ -6647,7 +6191,7 @@ msgstr "StatusNet %s"
 #. TRANS: %1$s is the engine name (StatusNet) and %2$s is the StatusNet version.
 #, php-format
 msgid ""
-"This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, "
+"This site is powered by %1$s version %2$s, Copyright 2008-2011 StatusNet, "
 "Inc. and contributors."
 msgstr ""
 
@@ -6664,7 +6208,7 @@ msgid ""
 "StatusNet is free software: you can redistribute it and/or modify it under "
 "the terms of the GNU Affero General Public License as published by the Free "
 "Software Foundation, either version 3 of the License, or (at your option) "
-"any later version. "
+"any later version."
 msgstr ""
 
 #. TRANS: Content part of StatusNet version page.
@@ -6672,7 +6216,7 @@ msgid ""
 "This program is distributed in the hope that it will be useful, but WITHOUT "
 "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
 "FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License "
-"for more details. "
+"for more details."
 msgstr ""
 
 #. TRANS: Content part of StatusNet version page.
@@ -6688,25 +6232,21 @@ msgid "Plugins"
 msgstr "Toupinoù"
 
 #. TRANS: Column header for plugins table on version page.
-#, fuzzy
 msgctxt "HEADER"
 msgid "Name"
 msgstr "Anv"
 
 #. TRANS: Column header for plugins table on version page.
-#, fuzzy
 msgctxt "HEADER"
 msgid "Version"
 msgstr "Stumm"
 
 #. TRANS: Column header for plugins table on version page.
-#, fuzzy
 msgctxt "HEADER"
 msgid "Author(s)"
 msgstr "Aozer(ien)"
 
 #. TRANS: Column header for plugins table on version page.
-#, fuzzy
 msgctxt "HEADER"
 msgid "Description"
 msgstr "Deskrivadur"
@@ -6730,16 +6270,26 @@ msgstr ""
 msgid "Robin thinks something is impossible."
 msgstr ""
 
+#. TRANS: Message used to be inserted as %2$s in  the text "No file may
+#. TRANS: be larger than %1$d byte and the file you sent was %2$s.".
+#. TRANS: %1$d is the number of bytes of an uploaded file.
+#, php-format
+msgid "%1$d byte"
+msgid_plural "%1$d bytes"
+msgstr[0] ""
+msgstr[1] ""
+
 #. TRANS: Message given if an upload is larger than the configured maximum.
-#. TRANS: %1$d is the byte limit for uploads, %2$d is the byte count for the uploaded file.
-#. TRANS: %1$s is used for plural.
+#. TRANS: %1$d (used for plural) is the byte limit for uploads,
+#. TRANS: %2$s is the proper form of "n bytes". This is the only ways to have
+#. TRANS: gettext support multiple plurals in the same message, unfortunately...
 #, php-format
 msgid ""
-"No file may be larger than %1$d byte and the file you sent was %2$d bytes. "
-"Try to upload a smaller version."
+"No file may be larger than %1$d byte and the file you sent was %2$s. Try to "
+"upload a smaller version."
 msgid_plural ""
-"No file may be larger than %1$d bytes and the file you sent was %2$d bytes. "
-"Try to upload a smaller version."
+"No file may be larger than %1$d bytes and the file you sent was %2$s. Try to "
+"upload a smaller version."
 msgstr[0] ""
 msgstr[1] ""
 
@@ -6809,6 +6359,11 @@ msgstr "Diposubl eo hizivaat ar strollad."
 msgid "Could not create login token for %s"
 msgstr "Diposubl eo krouiñ an aliasoù."
 
+#. TRANS: Exception thrown when a program code class (%s) cannot be instantiated.
+#, fuzzy, php-format
+msgid "Cannot instantiate class %s."
+msgstr "Dibosupl eo enrollañ ar ger-tremen nevez."
+
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.
 msgid "No database name or DSN found anywhere."
 msgstr ""
@@ -6969,7 +6524,7 @@ msgstr ""
 #, php-format
 msgid ""
 "You already have %1$d or more people in list %2$s, which is the maximum "
-"allowed number.Try unlisting others first."
+"allowed number. Try unlisting others first."
 msgstr ""
 
 #. TRANS: Exception thrown when inserting a list subscription in the database fails.
@@ -6991,7 +6546,6 @@ msgid "Unable to save tag."
 msgstr "Dibosupl eo enrollañ an tikedenn."
 
 #. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
-#. TRANS: Error message displayed to a banned user when they try to subscribe.
 msgid "You have been banned from subscribing."
 msgstr "Nac'het ez eus bet deoc'h en em goumanantiñ."
 
@@ -7011,10 +6565,6 @@ msgstr "Nann-koumanantet !"
 msgid "Could not delete self-subscription."
 msgstr "Dibosupl eo dilemel ar c'houmanant."
 
-#. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
-msgid "Could not delete subscription OMB token."
-msgstr "Dibosupl eo dilemel ar c'houmanant."
-
 #. TRANS: Exception thrown when a subscription could not be deleted on the server.
 msgid "Could not delete subscription."
 msgstr "Dibosupl eo dilemel ar c'houmanant."
@@ -7049,6 +6599,18 @@ msgstr ""
 msgid "Single-user mode code called when not enabled."
 msgstr ""
 
+#. TRANS: Information on password recovery form if no known username or e-mail address was specified.
+msgid "No user with that email address or username."
+msgstr "N'eus bet kavet implijer ebet gant ar postel-se pe an anv-se."
+
+#. TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.
+msgid "No registered email address for that user."
+msgstr "Chomlec'h postel enrollet ebet evit an implijer-mañ."
+
+#. TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.
+msgid "Error saving address confirmation."
+msgstr "Ur fazi 'zo bet pa voe enrollet kod kadarnaat ar postel."
+
 #. TRANS: Server exception thrown when creating a group failed.
 msgid "Could not create group."
 msgstr "Dibosupl eo krouiñ ar strollad."
@@ -7098,7 +6660,6 @@ msgid "Edit profile settings."
 msgstr "Kemmañ arventennoù ar profil"
 
 #. TRANS: Link text for link on user profile.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Edit"
 msgstr "Aozañ"
@@ -7318,27 +6879,11 @@ msgstr "N'eo ket bet emplementet showForm()."
 msgid "saveSettings() not implemented."
 msgstr "N'eo ket bet emplementet saveSettings()."
 
-#. TRANS: Client error message thrown if design settings could not be deleted in
-#. TRANS: the admin panel Design.
-msgid "Unable to delete design setting."
-msgstr "Dibosupl eo dilemel an arventennoù krouiñ."
-
 #. TRANS: Header in administrator navigation panel.
-#. TRANS: Header in settings navigation panel.
-#, fuzzy
 msgctxt "HEADER"
 msgid "Home"
 msgstr "Degemer"
 
-#. TRANS: Menu item in administrator navigation panel.
-#. TRANS: Menu item in default local navigation panel.
-#. TRANS: Menu item in personal group navigation menu.
-#. TRANS: Menu item in settings navigation panel.
-#, fuzzy
-msgctxt "MENU"
-msgid "Home"
-msgstr "Degemer"
-
 #. TRANS: Header in administrator navigation panel.
 #, fuzzy
 msgctxt "HEADER"
@@ -7354,23 +6899,11 @@ msgctxt "MENU"
 msgid "Site"
 msgstr "Lec'hienn"
 
-#. TRANS: Menu item title in administrator navigation panel.
-msgid "Design configuration"
-msgstr "Kefluniadur ar c'hrouiñ"
-
-#. TRANS: Menu item in administrator navigation panel.
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: Menu item in settings navigation panel.
-msgctxt "MENU"
-msgid "Design"
-msgstr "Design"
-
 #. TRANS: Menu item title in administrator navigation panel.
 msgid "User configuration"
 msgstr "Kefluniadur an implijer"
 
 #. TRANS: Menu item in administrator navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "User"
 msgstr "Implijer"
@@ -7380,7 +6913,6 @@ msgid "Access configuration"
 msgstr "Kefluniadur ar moned"
 
 #. TRANS: Menu item in administrator navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Access"
 msgstr "Moned"
@@ -7390,17 +6922,15 @@ msgid "Paths configuration"
 msgstr "Kefluniadur an hentoù"
 
 #. TRANS: Menu item in administrator navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Paths"
-msgstr "Hentoù"
+msgstr "Hentoù moned"
 
 #. TRANS: Menu item title in administrator navigation panel.
 msgid "Sessions configuration"
 msgstr "Kefluniadur an dalc'hoù"
 
 #. TRANS: Menu item in administrator navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Sessions"
 msgstr "Dalc'hoù"
@@ -7410,7 +6940,6 @@ msgid "Edit site notice"
 msgstr "Kemmañ ali al lec'hienn"
 
 #. TRANS: Menu item in administrator navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Site notice"
 msgstr "Ali al lec'hienn"
@@ -7420,20 +6949,18 @@ msgid "Snapshots configuration"
 msgstr "Kefluniadur ar primoù"
 
 #. TRANS: Menu item in administrator navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Snapshots"
-msgstr "Prim"
+msgstr "Tapadennoù prim"
 
 #. TRANS: Menu item title in administrator navigation panel.
 msgid "Set site license"
-msgstr ""
+msgstr "Termeniñ aotre-implijout al lec'hienn"
 
 #. TRANS: Menu item in administrator navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "License"
-msgstr "Aotre implijout"
+msgstr "Aotre-implijout"
 
 #. TRANS: Menu item title in administrator navigation panel.
 #, fuzzy
@@ -7470,43 +6997,6 @@ msgstr ""
 msgid "Could not authenticate you."
 msgstr ""
 
-#. TRANS: Server error displayed when trying to create an anynymous OAuth consumer.
-#, fuzzy
-msgid "Could not create anonymous consumer."
-msgstr "Diposubl eo krouiñ an aliasoù."
-
-#. TRANS: Server error displayed when trying to create an anynymous OAuth application.
-#, fuzzy
-msgid "Could not create anonymous OAuth application."
-msgstr "N'eo ket posubl krouiñ ar poellad."
-
-#. TRANS: Exception thrown when no token association could be found.
-msgid ""
-"Could not find a profile and application associated with the request token."
-msgstr ""
-
-#. TRANS: Exception thrown when no access token can be issued.
-#, fuzzy
-msgid "Could not issue access token."
-msgstr "Diposubl eo ensoc'hañ ur gemenadenn"
-
-#. TRANS: Exception thrown when a database error occurs.
-msgid "Database error inserting OAuth application user."
-msgstr ""
-
-#. TRANS: Exception thrown when a database error occurs.
-#, fuzzy
-msgid "Database error updating OAuth application user."
-msgstr "Ur fazi 'zo bet en ur ensoc'hañ an avatar"
-
-#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
-msgid "Tried to revoke unknown token."
-msgstr ""
-
-#. TRANS: Exception thrown when an attempt is made to remove a revoked token.
-msgid "Failed to delete revoked token."
-msgstr ""
-
 #. TRANS: Form input field label for application icon.
 msgid "Icon"
 msgstr "Arlun"
@@ -7587,13 +7077,14 @@ msgid "Default access for this application: read-only, or read-write"
 msgstr ""
 
 #. TRANS: Submit button title.
-msgid "Cancel"
-msgstr "Nullañ"
+#, fuzzy
+msgid "Cancel application changes."
+msgstr "Poeladoù kevreet."
 
 #. TRANS: Submit button title.
-#. TRANS: Button text to save a list.
-msgid "Save"
-msgstr "Enrollañ"
+#, fuzzy
+msgid "Save application changes."
+msgstr "Arload nevez"
 
 #. TRANS: Name for an anonymous application in application list.
 #, fuzzy
@@ -7629,6 +7120,18 @@ msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "Disteuler"
 
+#. TRANS: Submit button text to accept a group membership request on approve group form.
+#. TRANS: Submit button text to accept a subscription request on approve sub form.
+msgctxt "BUTTON"
+msgid "Accept"
+msgstr "Asantiñ"
+
+#. TRANS: Submit button text to reject a group membership request on approve group form.
+#. TRANS: Submit button text to reject a subscription request on approve sub form.
+msgctxt "BUTTON"
+msgid "Reject"
+msgstr "Disteurel"
+
 #. TRANS: Atom feed exception thrown when an author element does not contain a name element.
 msgid "Author element must contain a name element."
 msgstr ""
@@ -7659,14 +7162,12 @@ msgid "Tags for this attachment"
 msgstr "N'eo ket bet kavet ar restr stag."
 
 #. TRANS: Exception thrown when a password change fails.
-#, fuzzy
 msgid "Password changing failed."
-msgstr "N'eo ket aet betek penn kemmañ ar ger-tremen"
+msgstr "N'eo ket aet betek penn kemmañ ar ger-tremen."
 
 #. TRANS: Exception thrown when a password change attempt fails because it is not allowed.
-#, fuzzy
 msgid "Password changing is not allowed."
-msgstr "N'eo ket aotreet kemmañ ar ger-tremen"
+msgstr "N'eo ket aotreet kemmañ ar ger-tremen."
 
 #. TRANS: Title for the form to block a user.
 msgid "Block"
@@ -7792,7 +7293,7 @@ msgstr[1] "%1$s - %2$s"
 #. TRANS: Separator for list of tags.
 #. TRANS: Separator in list of user names like "Jim, Bob, Mary".
 msgid ", "
-msgstr ""
+msgstr ", "
 
 #. TRANS: Error displayed if a given tag is invalid.
 #. TRANS: %s is the invalid tag.
@@ -8207,6 +7708,11 @@ msgstr ""
 msgid "Go to the installer."
 msgstr "Mont d'ar meziant staliañ"
 
+#. TRANS: Header on conversation page. Hidden by default (h2).
+#. TRANS: Label for user statistics.
+msgid "Notices"
+msgstr "Ali"
+
 #. TRANS: Page title for when a database error occurs.
 msgid "Database error"
 msgstr "Fazi bank roadennoù"
@@ -8218,13 +7724,6 @@ msgctxt "MENU"
 msgid "Public"
 msgstr "Foran"
 
-#. TRANS: Menu item in default local navigation panel.
-#. TRANS: Menu item in search group navigation panel.
-#. TRANS: Menu item in local navigation menu.
-msgctxt "MENU"
-msgid "Groups"
-msgstr "Strolladoù"
-
 #. TRANS: Menu item in default local navigation panel.
 #. TRANS: Menu item title in local navigation menu.
 msgctxt "MENU"
@@ -8240,53 +7739,12 @@ msgstr "Diverkañ"
 msgid "Delete this user"
 msgstr "Diverkañ an implijer-mañ"
 
-#. TRANS: Form legend of form for changing the page design.
-#, fuzzy
-msgid "Change design"
-msgstr "Enrollañ an design"
-
-#. TRANS: Fieldset legend on profile design page to change profile page colours.
-msgid "Change colours"
-msgstr "Kemmañ al livioù"
-
-#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-msgid "Use defaults"
-msgstr "Implijout an talvoudoù dre ziouer"
-
-#. TRANS: Label in form on profile design page.
-#. TRANS: Field contains file name on user's computer that could be that user's custom profile background image.
-msgid "Upload file"
-msgstr "Enporzhiañ ar restr"
-
-#. TRANS: Instructions for form on profile design page.
-#, fuzzy
-msgid ""
-"You can upload your personal background image. The maximum file size is 2MB."
-msgstr ""
-"Gallout a rit kargañ hoc'h avatar personel. Ment vrasañ ar restr zo %s."
-
-#. TRANS: Radio button on profile design page that will enable use of the uploaded profile image.
-msgctxt "RADIO"
-msgid "On"
-msgstr "Gweredekaet"
-
-#. TRANS: Radio button on profile design page that will disable use of the uploaded profile image.
-msgctxt "RADIO"
-msgid "Off"
-msgstr "Diweredekaet"
-
-#. TRANS: Success message displayed if design settings were saved after clicking "Use defaults".
-#, fuzzy
-msgid "Design defaults restored."
-msgstr "Enrollet eo bet an arventennoù design."
-
 #. TRANS: Exception. %s is an ID.
 #, fuzzy, php-format
 msgid "Unable to find services for %s."
 msgstr "Dibosupl eo nullañ moned ar poellad : "
 
 #. TRANS: Form legend for removing the favourite status for a favourite notice.
-#. TRANS: Title for button text for removing the favourite status for a favourite notice.
 msgid "Disfavor this notice"
 msgstr "Tennañ eus ar pennrolloù"
 
@@ -8296,8 +7754,12 @@ msgctxt "BUTTON"
 msgid "Disfavor favorite"
 msgstr "Tennañ ar pennroll"
 
+#. TRANS: Button title for removing the favourite status for a favourite notice.
+#, fuzzy
+msgid "Remove this notice from your list of favorite notices."
+msgstr "Diposupl eo diskwel ar pennrolloù."
+
 #. TRANS: Form legend for adding the favourite status to a notice.
-#. TRANS: Title for button text for adding the favourite status to a notice.
 msgid "Favor this notice"
 msgstr "Ouzhpennañ d'ar pennrolloù"
 
@@ -8307,6 +7769,11 @@ msgctxt "BUTTON"
 msgid "Favor"
 msgstr "Pennrolloù"
 
+#. TRANS: Button title for adding the favourite status to a notice.
+#, fuzzy
+msgid "Add this notice to your list of favorite notices."
+msgstr "Diposupl eo diskwel ar pennrolloù."
+
 #. TRANS: Feed type name.
 msgid "RSS 1.0"
 msgstr "RSS 1.0"
@@ -8323,6 +7790,10 @@ msgstr "Atom"
 msgid "FOAF"
 msgstr "Mignon ur mignon (FOAF)"
 
+#. TRANS: Feed type name. See http://activitystrea.ms/
+msgid "Activity Streams"
+msgstr ""
+
 #. TRANS: Client exception thrown when an imported feed does not have an author.
 msgid "No author in the feed."
 msgstr ""
@@ -8355,6 +7826,28 @@ msgstr ""
 msgid "Grant this user the \"%s\" role"
 msgstr ""
 
+#. TRANS: Header for mini list of group members on a group page (h2).
+msgid "Members"
+msgstr "Izili"
+
+#. TRANS: Link to all group members from mini list of group members if group has more than n members.
+msgid "All members"
+msgstr "An holl izili"
+
+#. TRANS: Header for mini list of users with a pending membership request on a group page (h2).
+#, fuzzy
+msgid "Pending"
+msgstr "War gortoz (%s)"
+
+#. TRANS: Header for mini list of users that are blocked in a group page (h2).
+msgid "Blocked"
+msgstr "Stanket"
+
+#. TRANS: Title for list of group administrators on a group page.
+msgctxt "TITLE"
+msgid "Admins"
+msgstr "Merourien"
+
 #. TRANS: Button text for the form that will block a user from a group.
 msgctxt "BUTTON"
 msgid "Block"
@@ -8362,8 +7855,8 @@ msgstr "Stankañ"
 
 #. TRANS: Submit button title.
 msgctxt "TOOLTIP"
-msgid "Block this user"
-msgstr "Stankañ an implijer-mañ"
+msgid "Block this user so that they can no longer post messages to it."
+msgstr ""
 
 #. TRANS: Field title on group edit form.
 #, fuzzy
@@ -8415,63 +7908,9 @@ msgctxt "GROUPADMIN"
 msgid "Admin"
 msgstr "Merour"
 
-#. TRANS: Menu item in the group navigation page.
-msgctxt "MENU"
-msgid "Group"
-msgstr "Strollad"
-
-#. TRANS: Tooltip for menu item in the group navigation page.
-#. TRANS: %s is the nickname of the group.
-#, php-format
-msgctxt "TOOLTIP"
-msgid "%s group"
-msgstr "strollad %s"
-
-#. TRANS: Menu item in the group navigation page.
-msgctxt "MENU"
-msgid "Members"
-msgstr "Izili"
-
-#. TRANS: Tooltip for menu item in the group navigation page.
-#. TRANS: %s is the nickname of the group.
-#, php-format
-msgctxt "TOOLTIP"
-msgid "%s group members"
-msgstr "Izili ar strollad %s"
-
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: %d is the number of pending members.
-#, php-format
-msgctxt "MENU"
-msgid "Pending members (%d)"
-msgid_plural "Pending members (%d)"
-msgstr[0] ""
-msgstr[1] ""
-
-#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: %s is the nickname of the group.
-#, fuzzy, php-format
-msgctxt "TOOLTIP"
-msgid "%s pending members"
-msgstr "Izili ar strollad %s"
-
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-msgctxt "MENU"
-msgid "Blocked"
-msgstr "Stanket"
-
-#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: %s is the nickname of the group.
-#, php-format
-msgctxt "TOOLTIP"
-msgid "%s blocked users"
-msgstr "implijerien stanket ar strollad %s"
-
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: Menu item in primary navigation panel.
-msgctxt "MENU"
-msgid "Admin"
-msgstr "Merañ"
+#. TRANS: Group actions header (h2). Text hidden by default.
+msgid "Group actions"
+msgstr "Obererezh ar strollad"
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
@@ -8480,11 +7919,6 @@ msgctxt "TOOLTIP"
 msgid "Edit %s group properties"
 msgstr "Kemmañ perzhioù ar strollad %s"
 
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-msgctxt "MENU"
-msgid "Logo"
-msgstr "Logo"
-
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
 #, php-format
@@ -8492,16 +7926,10 @@ msgctxt "TOOLTIP"
 msgid "Add or edit %s logo"
 msgstr "Ouzhpennañ pe kemmañ logo ar strollad %s"
 
-#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: %s is the nickname of the group.
-#, php-format
-msgctxt "TOOLTIP"
-msgid "Add or edit %s design"
-msgstr "Ouzhpennañ pe kemmañ tres ar strollad %s"
-
-#. TRANS: Group actions header (h2). Text hidden by default.
-msgid "Group actions"
-msgstr "Obererezh ar strollad"
+#. TRANS: Link text for link on user profile.
+msgctxt "MENU"
+msgid "Logo"
+msgstr "Logo"
 
 #. TRANS: Title for groups with the most members section.
 #, fuzzy
@@ -8513,10 +7941,19 @@ msgstr "Alioù poblek"
 msgid "Active groups"
 msgstr "An holl strolladoù"
 
-#. TRANS: Title for group tag cloud section.
-#. TRANS: %s is a group name.
-#, php-format
-msgid "Tags in %s group's notices"
+#. TRANS: Link description for seeing all groups.
+#. TRANS: Link description for seeing all lists.
+#, fuzzy
+msgid "See all"
+msgstr "Diskouez pep tra"
+
+#. TRANS: Link title for seeing all groups.
+msgid "See all groups you belong to."
+msgstr ""
+
+#. TRANS: Menu item title in personal group navigation menu.
+#. TRANS: %s is a username.
+msgid "Back to top"
 msgstr ""
 
 #. TRANS: Client exception 406
@@ -8601,26 +8038,61 @@ msgstr ""
 #. TRANS: Title for inbox tag cloud section.
 msgctxt "TITLE"
 msgid "Trends"
-msgstr ""
+msgstr "Tuadurioù"
 
-#. TRANS: Button text for inviting more users to the StatusNet instance.
-#, fuzzy
+#. TRANS: Default button text for inviting more users to the StatusNet instance.
 msgctxt "BUTTON"
 msgid "Invite more colleagues"
-msgstr "Pediñ implijerien nevez"
+msgstr "Pediñ muioc'h a genseurted"
+
+#. TRANS: Form legend.
+#, fuzzy
+msgid "Invite collegues"
+msgstr "Pediñ muioc'h a genseurted"
+
+#. TRANS: Field label for a list of e-mail addresses.
+msgid "Email addresses"
+msgstr "Chomlec'hioù postel"
+
+#. TRANS: Field title for a list of e-mail addresses.
+#, fuzzy
+msgid "Addresses of friends to invite (one per line)."
+msgstr "Chomlec'hioù an implijerien da bediñ (unan dre linenn)"
+
+#. TRANS: Field label for a personal message to send to invitees.
+msgid "Personal message"
+msgstr "Kemennadenn bersonel"
+
+#. TRANS: Field title for a personal message to send to invitees.
+msgid "Optionally add a personal message to the invitation."
+msgstr "Ouzhpennañ ur gemennadenn bersonel d'ar bedadenn (diret)."
+
+#. TRANS: Send button for inviting friends
+#. TRANS: Button text for sending notice.
+msgctxt "BUTTON"
+msgid "Send"
+msgstr "Kas"
+
+#. TRANS: Submit button title.
+#, fuzzy
+msgid "Send invitations."
+msgstr "Pedadennoù"
 
 #. TRANS: Button text for joining a group.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Join"
 msgstr "Stagañ"
 
 #. TRANS: Button text on form to leave a group.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Leave"
 msgstr "Kuitaat"
 
+#. TRANS: Link title for seeing all lists.
+#, fuzzy
+msgid "See all lists you have created."
+msgstr "Ar poelladoù ho peus enrollet"
+
 #. TRANS: Menu item for logging in to the StatusNet site.
 #. TRANS: Menu item in primary navigation panel.
 msgctxt "MENU"
@@ -8628,9 +8100,8 @@ msgid "Login"
 msgstr "Kevreañ"
 
 #. TRANS: Title for menu item for logging in to the StatusNet site.
-#, fuzzy
 msgid "Login with a username and password"
-msgstr "Kevreit gant ho anv implijer hag ho ker-tremen."
+msgstr "Kevreit gant ho anv implijer hag ho ker-tremen"
 
 #. TRANS: Menu item for registering with the StatusNet site.
 msgctxt "MENU"
@@ -8669,7 +8140,7 @@ msgstr ""
 #. TRANS: Main body of new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscriber's long name, %2$s is the StatusNet sitename.
 #, fuzzy, php-format
-msgid "%1$s is now listening to your notices on %2$s."
+msgid "%1$s is now following you on %2$s."
 msgstr "Ne heuilh %s den ebet."
 
 #. TRANS: Subject of pending new-subscriber notification e-mail.
@@ -8845,7 +8316,7 @@ msgstr "%s (@%s) en deus kaset deoc'h ur c'hemenn"
 #. TRANS: Body of @-reply notification e-mail.
 #. TRANS: %1$s is the sending user's name, $2$s is the StatusNet sitename,
 #. TRANS: %3$s is a URL to the notice, %4$s is the notice text,
-#. TRANS: %5$s is a URL to the full conversion if it exists (otherwise empty),
+#. TRANS: %5$s is the text "The full conversation can be read here:" and a URL to the full conversion if it exists (otherwise empty),
 #. TRANS: %6$s is a URL to reply to the notice, %7$s is a URL to all @-replies for the addressed user,
 #, php-format
 msgid ""
@@ -8870,6 +8341,10 @@ msgstr ""
 
 #. TRANS: Subject of group join notification e-mail.
 #. TRANS: %1$s is the joining user's nickname, %2$s is the group name, and %3$s is the StatusNet sitename.
+#, fuzzy, php-format
+msgid "%1$s has joined your group %2$s on %3$s"
+msgstr "%1$s a zo bet er strollad %2$s."
+
 #. TRANS: Main body of group join notification e-mail.
 #. TRANS: %1$s is the subscriber's long name, %2$s is the group name, and %3$s is the StatusNet sitename,
 #. TRANS: %4$s is a block of profile info about the subscriber.
@@ -8961,8 +8436,9 @@ msgid "Make Admin"
 msgstr "Lakaat ur merour"
 
 #. TRANS: Submit button title.
+#, fuzzy
 msgctxt "TOOLTIP"
-msgid "Make this user an admin"
+msgid "Make this user an admin."
 msgstr "Lakaat an implijer-mañ da verour"
 
 #. TRANS: Client exception thrown when a database error was thrown during a file upload operation.
@@ -9010,7 +8486,7 @@ msgstr "Kas ur gemennadenn war-eeun"
 msgid "Select recipient:"
 msgstr "Dibab un aotre-implijout"
 
-#. TRANS Entry in drop-down selection box in direct-message inbox/outbox when no one is available to message.
+#. TRANS: Entry in drop-down selection box in direct-message inbox/outbox when no one is available to message.
 #, fuzzy
 msgid "No mutual subscribers."
 msgstr "Nann-koumanantet !"
@@ -9042,13 +8518,12 @@ msgstr "web"
 #. TRANS: A possible notice source (XMPP).
 msgctxt "SOURCE"
 msgid "xmpp"
-msgstr ""
+msgstr "xmpp"
 
 #. TRANS: A possible notice source (e-mail).
-#, fuzzy
 msgctxt "SOURCE"
 msgid "mail"
-msgstr "Postel"
+msgstr "postel"
 
 #. TRANS: A possible notice source (OpenMicroBlogging).
 msgctxt "SOURCE"
@@ -9082,6 +8557,10 @@ msgstr ""
 msgid "You must implement either adaptNoticeListItem() or showNotice()."
 msgstr ""
 
+#. TRANS: Link description to show more items in a list.
+msgid "More â–¼"
+msgstr "Muioc'h â–¼"
+
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 msgid "Nickname cannot be empty."
 msgstr ""
@@ -9130,10 +8609,6 @@ msgctxt "SEPARATOR"
 msgid ", "
 msgstr ", "
 
-#. TRANS: Start of profile addressees list.
-msgid " â–¸ "
-msgstr " â–¸ "
-
 #. TRANS: Used in coordinates as abbreviation of north.
 msgid "N"
 msgstr "N"
@@ -9172,7 +8647,8 @@ msgid "Repeated by"
 msgstr "Adkemeret gant"
 
 #. TRANS: Link title in notice list item to reply to a notice.
-msgid "Reply to this notice"
+#, fuzzy
+msgid "Reply to this notice."
 msgstr "Respont d'ar c'hemenn-mañ"
 
 #. TRANS: Link text in notice list item to reply to a notice.
@@ -9180,53 +8656,30 @@ msgid "Reply"
 msgstr "Respont"
 
 #. TRANS: Link title in notice list item to delete a notice.
-msgid "Delete this notice"
+#, fuzzy
+msgid "Delete this notice from the timeline."
 msgstr "Dilemel ar c'hemenn-mañ"
 
 #. TRANS: Title for repeat form status in notice list when a notice has been repeated.
-#, fuzzy
 msgid "Notice repeated."
-msgstr "Ali adkemeret"
+msgstr "Ali adkemeret."
 
 #. TRANS: Field label for notice text.
 msgid "Update your status..."
-msgstr ""
+msgstr "Hizivaat ho statud..."
 
 #. TRANS: Form legend of form to nudge/ping another user.
 msgid "Nudge this user"
 msgstr "Kas ur blinkadenn d'an implijer-mañ"
 
 #. TRANS: Button text to nudge/ping another user.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Nudge"
 msgstr "Blinkadenn"
 
 #. TRANS: Button title to nudge/ping another user.
-#, fuzzy
 msgid "Send a nudge to this user."
-msgstr "Kas ur blinkadenn d'an implijer-mañ"
-
-#. TRANS: Exception thrown when creating a new profile fails in OAuth store.
-msgid "Error inserting new profile."
-msgstr ""
-
-#. TRANS: Exception thrown when creating a new avatar fails in OAuth store.
-msgid "Error inserting avatar."
-msgstr ""
-
-#. TRANS: Exception thrown when creating a remote profile fails in OAuth store.
-msgid "Error inserting remote profile."
-msgstr ""
-
-#. TRANS: Exception thrown when a notice is denied because it has been sent before.
-msgid "Duplicate notice."
-msgstr ""
-
-#. TRANS: Exception thrown when creating a new subscription fails in OAuth store.
-#, fuzzy
-msgid "Could not insert new subscription."
-msgstr "Dibosupl eo dilemel ar c'houmanant."
+msgstr "Kas ur blinkadenn d'an implijer-mañ."
 
 #. TRANS: Server exception thrown in oEmbed action if no API endpoint is available.
 #, fuzzy
@@ -9234,10 +8687,9 @@ msgid "No oEmbed API endpoint available."
 msgstr "Dizimplijadus eo ar bostelerezh prim"
 
 #. TRANS: Field label for list.
-#, fuzzy
 msgctxt "LABEL"
 msgid "List"
-msgstr "Liammoù"
+msgstr "Roll"
 
 #. TRANS: Field title for list.
 #, fuzzy
@@ -9260,25 +8712,22 @@ msgstr[0] "Diskrivit ho poellad gant %d arouezenn"
 msgstr[1] "Diskrivit ho poellad gant %d arouezenn"
 
 #. TRANS: Button title to delete a list.
-#, fuzzy
 msgid "Delete this list."
-msgstr "Diverkañ an implijer-mañ"
+msgstr "Diverkañ ar roll-mañ."
 
 #. TRANS: Header in list edit form.
 msgid "Add or remove people"
-msgstr ""
+msgstr "Ouzhpennañ pe dilemel tud"
 
 #. TRANS: Header in list edit form.
-#, fuzzy
 msgctxt "HEADER"
 msgid "Search"
 msgstr "Klask"
 
 #. TRANS: Menu item in list navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "List"
-msgstr "Liammoù"
+msgstr "Roll"
 
 #. TRANS: Menu item title in list navigation panel.
 #. TRANS: %1$s is a list, %2$s is a nickname.
@@ -9287,17 +8736,15 @@ msgid "%1$s list by %2$s."
 msgstr "%1$s - %2$s"
 
 #. TRANS: Menu item in list navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Listed"
-msgstr "Aotre implijout"
+msgstr "Rollet"
 
 #. TRANS: Menu item in list navigation panel.
 #. TRANS: Menu item in local navigation menu.
-#, fuzzy
 msgctxt "MENU"
 msgid "Subscribers"
-msgstr "Ar re koumanantet"
+msgstr "Koumananterien"
 
 #. TRANS: Menu item title in list navigation panel.
 #. TRANS: %1$s is a list, %2$s is a nickname.
@@ -9306,7 +8753,6 @@ msgid "Subscribers to %1$s list by %2$s."
 msgstr "Koumanantet da %s."
 
 #. TRANS: Menu item in list navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Edit"
 msgstr "Aozañ"
@@ -9317,11 +8763,6 @@ msgstr "Aozañ"
 msgid "Edit %s list by you."
 msgstr "Kemmañ ar strollad  %s"
 
-#. TRANS: Link description for link to list of users tagged with a tag.
-#, fuzzy
-msgid "Tagged"
-msgstr "Balizenn"
-
 #. TRANS: Title for link to edit list settings.
 #, fuzzy
 msgid "Edit list settings."
@@ -9332,7 +8773,6 @@ msgid "Edit"
 msgstr "Aozañ"
 
 #. TRANS: Privacy mode text in list list item for private list.
-#, fuzzy
 msgctxt "MODE"
 msgid "Private"
 msgstr "Prevez"
@@ -9352,17 +8792,17 @@ msgstr "Koumanantet da %s."
 
 #. TRANS: Menu item in the group navigation page.
 #. TRANS: %s is a user nickname.
-#, fuzzy, php-format
+#, php-format
 msgctxt "MENU"
 msgid "Lists with %s"
-msgstr "Hizivadenn gant \"%s\""
+msgstr "Rolloù gant %s"
 
 #. TRANS: Tooltip for menu item in the group navigation page.
 #. TRANS: %s is a user nickname.
-#, fuzzy, php-format
+#, php-format
 msgctxt "TOOLTIP"
 msgid "Lists with %s."
-msgstr "Hizivadenn gant \"%s\""
+msgstr "Rolloù gant %s."
 
 #. TRANS: Menu item in the group navigation page.
 #. TRANS: %s is a user nickname.
@@ -9379,10 +8819,9 @@ msgid "Lists by %s."
 msgstr "%1$s - %2$s"
 
 #. TRANS: Label in lists widget.
-#, fuzzy
 msgctxt "LABEL"
 msgid "Your lists"
-msgstr "Alioù poblek"
+msgstr "Ho rolloù"
 
 #. TRANS: Fieldset legend in lists widget.
 #, fuzzy
@@ -9396,9 +8835,8 @@ msgid "Tags"
 msgstr "Tikedennoù"
 
 #. TRANS: Title for section contaning lists with the most subscribers.
-#, fuzzy
 msgid "Popular lists"
-msgstr "Alioù poblek"
+msgstr "Rolloù poblek"
 
 #. TRANS: List summary. %1$d is the number of users in the list,
 #. TRANS: %2$d is the number of subscribers to the list.
@@ -9407,15 +8845,15 @@ msgid "Listed: %1$d Subscribers: %2$d"
 msgstr "Koumanantet da %1$s, pajenn %2$d"
 
 #. TRANS: Title for page that displays which lists current user is part of.
-#, fuzzy, php-format
+#, php-format
 msgid "Lists with you"
-msgstr "N'eo ket bet kavet an implijer."
+msgstr "Rolloù ganeoc'h"
 
 #. TRANS: Title for page that displays which lists a user is part of.
 #. TRANS: %s is a profile name.
-#, fuzzy, php-format
+#, php-format
 msgid "Lists with %s"
-msgstr "Hizivadenn gant \"%s\""
+msgstr "Rolloù gant %s"
 
 #. TRANS: Title for page that displays lists a user has subscribed to.
 #, fuzzy
@@ -9425,7 +8863,6 @@ msgstr "Koumanantoù %s"
 #. TRANS: Menu item in personal group navigation menu.
 #. TRANS: Menu item in settings navigation panel.
 #. TRANS: Menu item in local navigation menu.
-#, fuzzy
 msgctxt "MENU"
 msgid "Profile"
 msgstr "Profil"
@@ -9435,7 +8872,6 @@ msgid "Your profile"
 msgstr "Ho profil"
 
 #. TRANS: Menu item in personal group navigation menu.
-#, fuzzy
 msgctxt "MENU"
 msgid "Replies"
 msgstr "Respontoù"
@@ -9452,7 +8888,6 @@ msgid "User"
 msgstr "Implijer"
 
 #. TRANS: Menu item in personal group navigation menu.
-#, fuzzy
 msgctxt "MENU"
 msgid "Messages"
 msgstr "Kemennadennoù"
@@ -9475,25 +8910,29 @@ msgctxt "plugin"
 msgid "Enable"
 msgstr "Gweredekaat"
 
+#. TRANS: Plugin description for a disabled plugin.
 msgctxt "plugin-description"
-msgid "(Plugin descriptions unavailable when disabled.)"
+msgid ""
+"(The plugin description is unavailable when a plugin has been disabled.)"
 msgstr ""
 
 #. TRANS: Menu item in primary navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Settings"
 msgstr "Arventennoù"
 
 #. TRANS: Menu item title in primary navigation panel.
-#, fuzzy
 msgid "Change your personal settings."
-msgstr "Kemmañ ho arventennoù hiniennel"
+msgstr "Kemmañ hoc'h arventennoù hiniennel."
+
+#. TRANS: Menu item in primary navigation panel.
+msgctxt "MENU"
+msgid "Admin"
+msgstr "Merañ"
 
 #. TRANS: Menu item title in primary navigation panel.
-#, fuzzy
 msgid "Site configuration."
-msgstr "Kefluniadur an implijer"
+msgstr "Kefluniadur al lec'hienn."
 
 #. TRANS: Menu item in primary navigation panel.
 msgctxt "MENU"
@@ -9501,32 +8940,27 @@ msgid "Logout"
 msgstr "Digevreañ"
 
 #. TRANS: Menu item title in primary navigation panel.
-#, fuzzy
 msgid "Logout from the site."
-msgstr "Digevreañ diouzh al lec'hienn"
+msgstr "Digevreañ diouzh al lec'hienn."
 
 #. TRANS: Menu item title in primary navigation panel.
-#, fuzzy
 msgid "Login to the site."
-msgstr "Kevreañ d'al lec'hienn"
+msgstr "Kevreañ d'al lec'hienn."
 
-#. TRANS: Menu item in primary navigation panel.
-msgctxt "MENU"
-msgid "Search"
-msgstr "Klask"
-
-#. TRANS: Menu item title in primary navigation panel.
-msgid "Search the site."
-msgstr "Klask al lec'hienn."
+msgid "This profile has been silenced by site moderators"
+msgstr ""
 
 #. TRANS: H2 text for user subscription statistics.
 msgid "Following"
 msgstr "O Heuliañ"
 
 #. TRANS: H2 text for user subscriber statistics.
-#, fuzzy
 msgid "Followers"
-msgstr "Heuliañ"
+msgstr "Heulierien"
+
+#. TRANS: H2 text for user statistics.
+msgid "Statistics"
+msgstr "Stadegoù"
 
 #. TRANS: Label for user statistics.
 msgid "User ID"
@@ -9536,10 +8970,6 @@ msgstr "ID an implijer"
 msgid "Member since"
 msgstr "Ezel abaoe"
 
-#. TRANS: Label for user statistics.
-msgid "Notices"
-msgstr "Ali"
-
 #. TRANS: Label for user statistics.
 #. TRANS: Average count of posts made per day since account registration.
 msgid "Daily average"
@@ -9550,9 +8980,8 @@ msgid "Groups"
 msgstr "Strolladoù"
 
 #. TRANS: H2 text for user list membership statistics.
-#, fuzzy
 msgid "Lists"
-msgstr "Bevennoù"
+msgstr "Rolloù"
 
 #. TRANS: Server error displayed when using an unimplemented method.
 msgid "Unimplemented method."
@@ -9563,7 +8992,6 @@ msgid "User groups"
 msgstr "Strolladoù implijerien"
 
 #. TRANS: Menu item in search group navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Recent tags"
 msgstr "Merkoù nevez"
@@ -9573,13 +9001,11 @@ msgid "Recent tags"
 msgstr "Merkoù nevez"
 
 #. TRANS: Menu item in search group navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Featured"
 msgstr "Heverk"
 
 #. TRANS: Menu item in search group navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Popular"
 msgstr "Poblek"
@@ -9599,9 +9025,8 @@ msgid "Repeat this notice?"
 msgstr "Adkregiñ gant ar c'hemenn-mañ ?"
 
 #. TRANS: Button title to repeat a notice on notice repeat form.
-#, fuzzy
 msgid "Repeat this notice."
-msgstr "Adkregiñ gant ar c'hemenn-mañ"
+msgstr "Adkregiñ gant ar c'hemenn-mañ."
 
 #. TRANS: Description of role revoke form. %s is the role to be revoked.
 #, fuzzy, php-format
@@ -9609,12 +9034,10 @@ msgid "Revoke the \"%s\" role from this user"
 msgstr "Stankañ an implijer-mañ eus ar strollad-se"
 
 #. TRANS: Client error on action trying to visit a non-existing page.
-#, fuzzy
 msgid "Page not found."
-msgstr "N'eo ket bet kavet an hentenn API !"
+msgstr "N'eo ket bet kavet ar bajenn."
 
 #. TRANS: Title of form to sandbox a user.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Sandbox"
 msgstr "Poull-traezh"
@@ -9634,6 +9057,7 @@ msgid "Keyword(s)"
 msgstr "Ger(ioù) alc'hwez"
 
 #. TRANS: Button text for searching site.
+#. TRANS: Button text for search button on search form.
 #. TRANS: Button text to search profiles.
 msgctxt "BUTTON"
 msgid "Search"
@@ -9661,7 +9085,6 @@ msgid ""
 msgstr ""
 
 #. TRANS: Menu item in search group navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "People"
 msgstr "Tud"
@@ -9671,10 +9094,9 @@ msgid "Find people on this site"
 msgstr "Klask tud el lec'hienn-mañ"
 
 #. TRANS: Menu item in search group navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Notices"
-msgstr "Ali"
+msgstr "Alioù"
 
 #. TRANS: Menu item title in search group navigation panel.
 msgid "Find content of notices"
@@ -9684,60 +9106,26 @@ msgstr "Klask alioù en danvez"
 msgid "Find groups on this site"
 msgstr "Klask strolladoù el lec'hienn-mañ"
 
-#. TRANS: Secondary navigation menu item leading to help on StatusNet.
-msgctxt "MENU"
-msgid "Help"
-msgstr "Skoazell"
-
-#. TRANS: Secondary navigation menu item leading to text about StatusNet site.
-#, fuzzy
-msgctxt "MENU"
-msgid "About"
-msgstr "Diwar-benn"
-
-#. TRANS: Secondary navigation menu item leading to Frequently Asked Questions.
-#, fuzzy
-msgctxt "MENU"
-msgid "FAQ"
-msgstr "FAG"
-
 #. TRANS: Secondary navigation menu item leading to Terms of Service.
-#, fuzzy
 msgctxt "MENU"
 msgid "TOS"
 msgstr "AIH"
 
 #. TRANS: Secondary navigation menu item leading to privacy policy.
-#, fuzzy
 msgctxt "MENU"
 msgid "Privacy"
 msgstr "Prevezded"
 
 #. TRANS: Secondary navigation menu item. Leads to information about StatusNet and its license.
-#, fuzzy
 msgctxt "MENU"
 msgid "Source"
 msgstr "Mammenn"
 
 #. TRANS: Secondary navigation menu item leading to version information on the StatusNet site.
-#, fuzzy
 msgctxt "MENU"
 msgid "Version"
 msgstr "Stumm"
 
-#. TRANS: Secondary navigation menu item leading to e-mail contact information on the
-#. TRANS: StatusNet site, where to report bugs, ...
-#, fuzzy
-msgctxt "MENU"
-msgid "Contact"
-msgstr "Darempred"
-
-#. TRANS: Secondary navigation menu item. Leads to information about embedding a timeline widget.
-#, fuzzy
-msgctxt "MENU"
-msgid "Badge"
-msgstr "Badj"
-
 #. TRANS: Default title for section/sidebar widget.
 msgid "Untitled section"
 msgstr "Rann hep titl"
@@ -9747,7 +9135,6 @@ msgid "More..."
 msgstr "Muioc'h..."
 
 #. TRANS: Header in settings navigation panel.
-#, fuzzy
 msgctxt "HEADER"
 msgid "Settings"
 msgstr "Arventennoù"
@@ -9757,7 +9144,6 @@ msgid "Change your profile settings"
 msgstr "Kemmañ arventennoù ho profil"
 
 #. TRANS: Menu item in settings navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Avatar"
 msgstr "Avatar"
@@ -9767,7 +9153,6 @@ msgid "Upload an avatar"
 msgstr "Enporzhiañ un avatar"
 
 #. TRANS: Menu item in settings navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Password"
 msgstr "Ger-tremen"
@@ -9777,7 +9162,6 @@ msgid "Change your password"
 msgstr "Cheñch ar ger-tremen"
 
 #. TRANS: Menu item in settings navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Email"
 msgstr "Postel"
@@ -9786,12 +9170,7 @@ msgstr "Postel"
 msgid "Change email handling"
 msgstr "Kemmañ tretadur ar posteloù"
 
-#. TRANS: Menu item title in settings navigation panel.
-msgid "Design your profile"
-msgstr "Krouit ho profil"
-
 #. TRANS: Menu item in settings navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "URL"
 msgstr "URL"
@@ -9801,17 +9180,15 @@ msgid "URL shorteners"
 msgstr ""
 
 #. TRANS: Menu item in settings navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "IM"
 msgstr "IM"
 
 #. TRANS: Menu item title in settings navigation panel.
 msgid "Updates by instant messenger (IM)"
-msgstr ""
+msgstr "Hizivadurioù dre bostelerezh prim (IM)"
 
 #. TRANS: Menu item in settings navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "SMS"
 msgstr "SMS"
@@ -9821,18 +9198,24 @@ msgid "Updates by SMS"
 msgstr "Hizivadennoù dre SMS"
 
 #. TRANS: Menu item in settings navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Connections"
 msgstr "Kevreadennoù"
 
 #. TRANS: Menu item title in settings navigation panel.
-#, fuzzy
 msgid "Authorized connected applications"
-msgstr "Poeladoù kevreet."
+msgstr "Poelladoù aotreet kevret"
+
+#. TRANS: Menu item in settings navigation panel.
+msgctxt "MENU"
+msgid "Old school"
+msgstr ""
+
+#. TRANS: Menu item title in settings navigation panel.
+msgid "UI tweaks for old-school users"
+msgstr ""
 
 #. TRANS: Title of form to silence a user.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Silence"
 msgstr "Didrouz"
@@ -9842,8 +9225,44 @@ msgstr "Didrouz"
 msgid "Silence this user"
 msgstr "Diverkañ an implijer-mañ"
 
-#. TRANS: Menu item in local navigation menu.
+#. TRANS: Server error displayed when trying to create an anynymous OAuth consumer.
 #, fuzzy
+msgid "Could not create anonymous consumer."
+msgstr "Diposubl eo krouiñ an aliasoù."
+
+#. TRANS: Server error displayed when trying to create an anynymous OAuth application.
+#, fuzzy
+msgid "Could not create anonymous OAuth application."
+msgstr "N'eo ket posubl krouiñ ar poellad."
+
+#. TRANS: Exception thrown when no token association could be found.
+msgid ""
+"Could not find a profile and application associated with the request token."
+msgstr ""
+
+#. TRANS: Exception thrown when no access token can be issued.
+#, fuzzy
+msgid "Could not issue access token."
+msgstr "Diposubl eo ensoc'hañ ur gemenadenn"
+
+#. TRANS: Exception thrown when a database error occurs.
+msgid "Database error inserting OAuth application user."
+msgstr ""
+
+#. TRANS: Exception thrown when a database error occurs.
+#, fuzzy
+msgid "Database error updating OAuth application user."
+msgstr "Ur fazi 'zo bet en ur ensoc'hañ an avatar"
+
+#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
+msgid "Tried to revoke unknown token."
+msgstr ""
+
+#. TRANS: Exception thrown when an attempt is made to remove a revoked token.
+msgid "Failed to delete revoked token."
+msgstr ""
+
+#. TRANS: Menu item in local navigation menu.
 msgctxt "MENU"
 msgid "Subscriptions"
 msgstr "Koumanantoù"
@@ -9856,16 +9275,16 @@ msgstr "Koumanantoù %s"
 
 #. TRANS: Menu item title in local navigation menu.
 #. TRANS: %s is a user nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "People subscribed to %s."
-msgstr "Koumananterien %s"
+msgstr "Koumananterien %s."
 
 #. TRANS: Menu item in local navigation menu.
 #. TRANS: %d is the number of pending subscription requests.
-#, php-format
+#, fuzzy, php-format
 msgctxt "MENU"
 msgid "Pending (%d)"
-msgstr ""
+msgstr "War gortoz (%s)"
 
 #. TRANS: Menu item title in local navigation menu.
 #, php-format
@@ -9874,9 +9293,9 @@ msgstr ""
 
 #. TRANS: Menu item title in local navigation menu.
 #. TRANS: %s is a user nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "Groups %s is a member of."
-msgstr "Ezel eo %s eus ar strolladoù"
+msgstr "Ezel eo %s eus ar strolladoù."
 
 #. TRANS: Menu item title in local navigation menu.
 #. TRANS: %s is a user nickname.
@@ -9891,14 +9310,26 @@ msgstr "Pediñ"
 
 #. TRANS: Menu item title in local navigation menu.
 #. TRANS: %s is the StatusNet sitename.
-#, fuzzy, php-format
+#, php-format
 msgid "Invite friends and colleagues to join you on %s."
-msgstr "Pediñ mignoned hag kenseurted da zont ganeoc'h war %s"
+msgstr "Pediñ mignoned ha kenseurted da zont ganeoc'h war %s."
 
 #. TRANS: Form of form to subscribe to a user.
 msgid "Subscribe to this user"
 msgstr "En em goumanantiñ d'an implijer-mañ"
 
+#. TRANS: Button text to subscribe to a user.
+#. TRANS: Button text for subscribing to a list.
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Subscribe"
+msgstr "En em enskrivañ"
+
+#. TRANS: Button title to subscribe to a user.
+#, fuzzy
+msgid "Subscribe to this user."
+msgstr "En em goumanantiñ d'an implijer-mañ"
+
 #. TRANS: Title of personal tag cloud section.
 msgid "People Tagcloud as self-tagged"
 msgstr ""
@@ -9971,10 +9402,9 @@ msgid "Error opening theme archive."
 msgstr "Fazi en ur hizivaat ar profil a-bell."
 
 #. TRANS: Header for Notices section.
-#, fuzzy
 msgctxt "HEADER"
 msgid "Notices"
-msgstr "Ali"
+msgstr "Alioù"
 
 #. TRANS: Link to show replies for a notice.
 #. TRANS: %d is the number of replies to a notice and used for plural.
@@ -9987,20 +9417,19 @@ msgstr[1] "Diskouez muioc'h"
 #. TRANS: Reference to the logged in user in favourite list.
 msgctxt "FAVELIST"
 msgid "You"
-msgstr ""
+msgstr "C'hwi"
 
 #. TRANS: For building a list such as "Jim, Bob, Mary and 5 others like this".
 #. TRANS: %1$s is a list of users, separated by a separator (default: ", "), %2$s is the last user in the list.
-#, fuzzy, php-format
+#, php-format
 msgctxt "FAVELIST"
 msgid "%1$s and %2$s"
-msgstr "%1$s - %2$s"
+msgstr "%1$s ha %2$s"
 
 #. TRANS: List message for notice favoured by logged in user.
-#, fuzzy
 msgctxt "FAVELIST"
 msgid "You like this."
-msgstr "Alioù poblek"
+msgstr "Plijout a ra deoc'h."
 
 #. TRANS: List message for when more than 4 people like something.
 #. TRANS: %%s is a list of users liking a notice, %d is the number over 4 that like the notice.
@@ -10023,16 +9452,26 @@ msgstr[1] ""
 #. TRANS: List message for notice repeated by logged in user.
 #, fuzzy
 msgctxt "REPEATLIST"
-msgid "You have repeated this notice."
-msgstr "Adkemeret ho peus ar c'hemenn-mañ c'hoazh."
+msgid "You repeated this."
+msgstr "Adkemeret ho peus ar c'hemenn-mañ."
 
-#. TRANS: List message for repeated notices.
-#. TRANS: %d is the number of users that have repeated a notice.
+#. TRANS: List message for when more than 4 people repeat something.
+#. TRANS: %%s is a list of users liking a notice, %d is the number over 4 that like the notice.
+#. TRANS: Plural is decided on the total number of users liking the notice (count of %%s + %d).
+#, php-format
+msgid "%%s and %d other repeated this."
+msgid_plural "%%s and %d others repeated this."
+msgstr[0] ""
+msgstr[1] ""
+
+#. TRANS: List message for favoured notices.
+#. TRANS: %%s is a list of users liking a notice.
+#. TRANS: Plural is based on the number of of users that have favoured a notice.
 #, fuzzy, php-format
-msgid "One person has repeated this notice."
-msgid_plural "%d people have repeated this notice."
-msgstr[0] "Kemenn bet adkemeret dija."
-msgstr[1] "Kemenn bet adkemeret dija."
+msgid "%%s repeated this."
+msgid_plural "%%s repeated this."
+msgstr[0] "Adkemeret evit %s"
+msgstr[1] "Adkemeret evit %s"
 
 #. TRANS: Form legend.
 #, fuzzy, php-format
@@ -10041,10 +9480,9 @@ msgstr "Klask el lec'hienn"
 
 #. TRANS: Dropdown option for searching in profiles.
 msgid "Everything"
-msgstr ""
+msgstr "Pep tra"
 
 #. TRANS: Dropdown option for searching in profiles.
-#, fuzzy
 msgid "Fullname"
 msgstr "Anv klok"
 
@@ -10053,26 +9491,25 @@ msgid "URI (Remote users)"
 msgstr ""
 
 #. TRANS: Dropdown field label.
-#, fuzzy
 msgctxt "LABEL"
 msgid "Search in"
-msgstr "Klask el lec'hienn"
+msgstr "Klask e"
 
 #. TRANS: Dropdown field title.
 msgid "Choose a field to search."
-msgstr ""
+msgstr "Dibab ur vaezienn da glask."
 
 #. TRANS: Form legend.
 #. TRANS: %1$s is a nickname, $2$s is a list.
-#, fuzzy, php-format
+#, php-format
 msgid "Remove %1$s from list %2$s"
-msgstr "%1$s - %2$s"
+msgstr "Dilemel %1$s deus ar roll %2$s"
 
 #. TRANS: Legend on form to add a profile to a list.
 #. TRANS: %1$s is a nickname, %2$s is a list.
-#, fuzzy, php-format
+#, php-format
 msgid "Add %1$s to list %2$s"
-msgstr "%1$s - %2$s"
+msgstr "Ouzhpennañ %1$s er roll %2$s"
 
 #. TRANS: Title for top posters section.
 msgid "Top posters"
@@ -10081,24 +9518,22 @@ msgstr "An implijerien an efedusañ"
 #. TRANS: Option in drop-down of potential addressees.
 msgctxt "SENDTO"
 msgid "Everyone"
-msgstr ""
+msgstr "An holl"
 
 #. TRANS: Option in drop-down of potential addressees.
 #. TRANS: %s is a StatusNet sitename.
 #, php-format
 msgid "My colleagues at %s"
-msgstr ""
+msgstr "Ma c'henseurted war %s"
 
 #. TRANS: Label for drop-down of potential addressees.
-#, fuzzy
 msgctxt "LABEL"
 msgid "To:"
-msgstr "Da"
+msgstr "Da :"
 
 #. TRANS: Checkbox label in widget for selecting potential addressees to mark the notice private.
-#, fuzzy
 msgid "Private?"
-msgstr "Prevez"
+msgstr "Prevez ?"
 
 #. TRANS: Client exception thrown in widget for selecting potential addressees when an invalid fill option was received.
 #, fuzzy, php-format
@@ -10111,7 +9546,6 @@ msgid "Unblock"
 msgstr "Distankañ"
 
 #. TRANS: Title for unsandbox form.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Unsandbox"
 msgstr "Kuitaat ar poull-traezh"
@@ -10132,17 +9566,20 @@ msgid "Unsilence this user"
 msgstr "Distankañ an implijer-mañ"
 
 #. TRANS: Form legend on unsubscribe form.
-#. TRANS: Button title on unsubscribe form.
 msgid "Unsubscribe from this user"
 msgstr "En em zigoumanantiñ eus an implijer-mañ"
 
 #. TRANS: Button text on unsubscribe form.
 #. TRANS: Button text for unsubscribing from a list.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Unsubscribe"
 msgstr "Digoumanantiñ"
 
+#. TRANS: Button title on unsubscribe form.
+#, fuzzy
+msgid "Unsubscribe from this user."
+msgstr "En em zigoumanantiñ eus an implijer-mañ"
+
 #. TRANS: Exception text shown when no profile can be found for a user.
 #. TRANS: %1$s is a user nickname, $2$d is a user ID (number).
 #, fuzzy, php-format
@@ -10150,9 +9587,8 @@ msgid "User %1$s (%2$d) has no profile record."
 msgstr "An implijer-mañ n'eus profil ebet dezhañ."
 
 #. TRANS: Authorisation exception thrown when a user a not allowed to login.
-#, fuzzy
 msgid "Not allowed to log in."
-msgstr "Nann-kevreet."
+msgstr "Nann-aotreet da gevreañ."
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 msgid "a few seconds ago"
@@ -10213,21 +9649,18 @@ msgid "%s is not a valid color! Use 3 or 6 hex characters."
 msgstr "N'eo ket %s ul liv reizh ! Implijit 3 pe 6 arouezenn heksdekvedennel."
 
 #. TRANS: Exception.
-#, fuzzy
 msgid "Invalid XML."
-msgstr "Ment direizh."
+msgstr "XML direizh."
 
 #. TRANS: Exception.
 msgid "Invalid XML, missing XRD root."
-msgstr ""
+msgstr "XML direizh, mankout a ra ar wrizienn XRD."
 
 #. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
 
-#~ msgid "%1$s and friends, page %2$d"
-#~ msgstr "%1$s hag e vignoned, pajenn %2$d"
-
-#~ msgid "You and friends"
-#~ msgstr "C'hwi hag o mignoned"
+#, fuzzy
+#~ msgid " "
+#~ msgstr ", "
diff --git a/locale/ca/LC_MESSAGES/statusnet.po b/locale/ca/LC_MESSAGES/statusnet.po
index 8f96cefacc..02e8aea7c6 100644
--- a/locale/ca/LC_MESSAGES/statusnet.po
+++ b/locale/ca/LC_MESSAGES/statusnet.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Core to Catalan (Català)
+# Translation of StatusNet - Core to Catalan (català)
 # Exported from translatewiki.net
 #
 # Author: Aleator
@@ -16,17 +16,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:48+0000\n"
-"Language-Team: Catalan <http://translatewiki.net/wiki/Portal:ca>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:40+0000\n"
+"Language-Team: Catalan <https://translatewiki.net/wiki/Portal:ca>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ca\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-05-05 10:52:40+0000\n"
+"X-POT-Import-Date: 2012-04-22 22:02:21+0000\n"
 
 #. TRANS: Database error message.
 #, php-format
@@ -41,14 +41,6 @@ msgstr ""
 "problema, però també podeu posar-vos-hi en contacte des de %2$s per a "
 "assegurar-vos-en. Sinó, espereu uns pocs minuts i torneu-ho a provar."
 
-#. TRANS: Error message.
-msgid ""
-"An important error occured, probably related to email setup. Check logfiles "
-"for more info."
-msgstr ""
-"S'ha produït un error important, probablement està relacionat amb la "
-"configuració del correu. Comproveu els fitxers de registre per a més detalls."
-
 #. TRANS: Error message.
 msgid "An error occurred."
 msgstr "S'ha produït un error."
@@ -111,12 +103,11 @@ msgstr "Inhabilita els nous registres."
 msgid "Closed"
 msgstr "Tancat"
 
-#. TRANS: Title for button to save access settings in site admin panel.
-msgid "Save access settings"
-msgstr "Desa els paràmetres d'accés"
+#. TRANS: Button title to save access settings in site admin panel.
+msgid "Save access settings."
+msgstr "Desa els paràmetres d'accés."
 
-#. TRANS: Tooltip for button to save access settings in site admin panel.
-#. TRANS: Button text for saving theme settings.
+#. TRANS: Button text to save access settings in site admin panel.
 #. TRANS: Button label to save e-mail preferences.
 #. TRANS: Button label to save IM preferences.
 #. TRANS: Button text in the license admin panel.
@@ -132,7 +123,6 @@ msgstr "Desa els paràmetres d'accés"
 #. TRANS: Button text for saving "Other settings" in profile.
 #. TRANS: Button text to save user settings in user admin panel.
 #. TRANS: Button label in the "Edit application" form.
-#. TRANS: Button text on profile design page to save settings.
 #. TRANS: Text for save button on group edit form.
 #. TRANS: Button text to save tags for a profile.
 msgctxt "BUTTON"
@@ -173,10 +163,6 @@ msgstr "No existeix el perfil."
 msgid "No such list."
 msgstr "No existeix la llista."
 
-#. TRANS: Client error displayed when trying to add an OMB 0.1 remote profile to a list.
-msgid "You cannot list an OMB 0.1 remote profile with this action."
-msgstr "No podeu llistar un perfil remot OMB 0.1 amb aquesta acció."
-
 #. TRANS: Client error displayed when an unknown error occurs when adding a user to a list.
 #. TRANS: %s is a username.
 #, php-format
@@ -208,7 +194,6 @@ msgstr "No existeix la pàgina."
 #. TRANS: Client error when user not found for an rss related action.
 #. TRANS: Client error displayed when no existing user is provided for a user's delivery device setting.
 #. TRANS: Client error displayed if a user could not be found.
-#. TRANS: Client error when user not found updating a profile background image.
 #. TRANS: Client error displayed updating profile image without having a user object.
 #. TRANS: Client error displayed when making an Atom API request for an unknown user.
 #. TRANS: Client error displayed when trying to block a non-existing user or a user from another site.
@@ -234,14 +219,11 @@ msgstr "No existeix la pàgina."
 #. TRANS: Client error displayed when trying to get the RSS feed with favorites of a user that does not exist.
 #. TRANS: Client error displayed when requesting Friends of a Friend feed without providing a user nickname.
 #. TRANS: Client error displayed when requesting Friends of a Friend feed for an object that is not a user.
-#. TRANS: Client error displayed when trying to get a user hCard for a non-existing user.
 #. TRANS: Client error displayed trying to make a micro summary without providing a valid user.
 #. TRANS: Client error displayed trying to send a direct message to a non-existing user.
 #. TRANS: Client error displayed trying to use "one time password login" without using an existing user.
 #. TRANS: Client error displayed when referring to non-existing user.
 #. TRANS: Client error displayed trying to perform an action related to a non-existing user.
-#. TRANS: Form validation error on page for remote subscribe when no user was provided.
-#. TRANS: Form validation error on page for remote subscribe when no user profile was found.
 #. TRANS: Client error displayed when trying to reply to a non-exsting user.
 #. TRANS: Client error displayed when providing a non-existing nickname in a RSS 1.0 action.
 #. TRANS: Client error.
@@ -250,7 +232,6 @@ msgstr "No existeix la pàgina."
 #. TRANS: Client error displayed trying to find a user by ID for a non-existing ID.
 #. TRANS: Client error displayed requesting groups for a non-existing user.
 #. TRANS: Client error displayed when user not found for an action.
-#. TRANS: Client error displayed providing a non-existing nickname.
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #. TRANS: Client error displayed when trying to perform a gallery action with an unknown user.
 #. TRANS: Client error displayed when trying to access a mailbox without providing a user.
@@ -259,15 +240,21 @@ msgid "No such user."
 msgstr "No existeix l'usuari."
 
 #. TRANS: Title of a user's own start page.
-#, fuzzy
 msgid "Home timeline"
-msgstr "%s línia temporal"
+msgstr "Línia temporal inicial"
 
 #. TRANS: Title of another user's start page.
 #. TRANS: %s is the other user's name.
-#, fuzzy, php-format
+#, php-format
 msgid "%s's home timeline"
-msgstr "%s línia temporal"
+msgstr "Línia temporal inicial de %s"
+
+#. TRANS: %s is user nickname.
+#. TRANS: Feed title.
+#. TRANS: %s is tagger's nickname.
+#, php-format
+msgid "Feed for friends of %s (Activity Streams JSON)"
+msgstr "Canal dels amics de %s (fluxos d'activitat JSON)"
 
 #. TRANS: %s is user nickname.
 #, php-format
@@ -314,7 +301,7 @@ msgstr ""
 "Sigueu el primer en [enviar sobre aquest tema](%%%%action.newnotice%%%%?"
 "status_textarea=%s)!"
 
-#. TRANS: Encoutagement displayed on empty timeline user pages for anonymous users.
+#. TRANS: Encouragement displayed on empty timeline user pages for anonymous users.
 #. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
 #. TRANS: Empty list message for page with replies for a user for not logged in users.
 #. TRANS: %1$s is a user nickname. This message contains a Markdown link in the form [link text](link).
@@ -328,6 +315,12 @@ msgstr ""
 "Per què no hi [registreu un compte](%%action.register%%) i sou el primer en "
 "escriure'n un!"
 
+#. TRANS: Button text for inviting more users to the StatusNet instance.
+#. TRANS: Less business/enterprise-oriented language for public sites.
+msgctxt "BUTTON"
+msgid "Send invite"
+msgstr "Envia una invitació"
+
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Title of API timeline for a user and friends.
 #. TRANS: %s is a username.
@@ -336,8 +329,6 @@ msgstr ""
 #. TRANS: %s is a username.
 #. TRANS: Menu item title in personal group navigation menu.
 #. TRANS: %s is a username.
-#. TRANS: Menu item title in settings navigation panel.
-#. TRANS: %s is a username.
 #, php-format
 msgid "%s and friends"
 msgstr "%s i amics"
@@ -377,7 +368,6 @@ msgstr ""
 #. TRANS: Server error thrown on database error updating SMS preferences.
 #. TRANS: Server error thrown on database error removing a registered SMS phone number.
 #. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
-#. TRANS: Server exception thrown on Profile design page when updating design settings fails.
 msgid "Could not update user."
 msgstr "No s'ha pogut actualitzar l'usuari."
 
@@ -392,7 +382,6 @@ msgstr "No s'ha pogut desar el perfil."
 
 #. TRANS: Client error displayed when the number of bytes in a POST request exceeds a limit.
 #. TRANS: %s is the number of bytes of the CONTENT_LENGTH.
-#. TRANS: Form validation error in design settings form. POST should remain untranslated.
 #, php-format
 msgid ""
 "The server was unable to handle that much POST data (%s byte) due to its "
@@ -407,24 +396,6 @@ msgstr[1] ""
 "El servidor no ha pogut gestionar tantes dades POST (%s bytes) a causa de la "
 "configuració actual."
 
-#. TRANS: Client error displayed when saving design settings fails because of an empty id.
-#. TRANS: Client error displayed when saving design settings fails because of an empty result.
-#. TRANS: Client error displayed when a database error occurs inserting profile colours.
-#. TRANS: Client error displayed when a database error occurs updating profile colours.
-#. TRANS: Form validation error displayed when group design settings could not be saved because of an application issue.
-#. TRANS: Form validation error on Profile design page when saving design settings has failed.
-#. TRANS: Form validation error on Profile design page when updating design settings has failed.
-msgid "Unable to save your design settings."
-msgstr "No s'han pogut desar els paràmetres de disseny."
-
-#. TRANS: Error displayed when updating design settings fails.
-#. TRANS: Client error displayed when a database error occurs updating profile colours.
-#. TRANS: Form validation error on Profile design page when updating design settings has failed.
-#. TRANS: Error message displayed if design settings could not be saved.
-#. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
-msgid "Could not update your design."
-msgstr "No s'ha pogut actualitzar el vostre disseny."
-
 #. TRANS: Title for Atom feed.
 msgctxt "ATOM"
 msgid "Main"
@@ -471,6 +442,20 @@ msgstr "Ha fallat el blocatge de l'usuari."
 msgid "Unblock user failed."
 msgstr "Ha fallat el desblocatge de l'usuari."
 
+#. TRANS: Client exception thrown when no conversation ID is given.
+msgid "No conversation ID."
+msgstr "No hi ha un identificador de conversa."
+
+#. TRANS: Client exception thrown when referring to a non-existing conversation ID (%d).
+#, php-format
+msgid "No conversation with ID %d."
+msgstr "No hi ha cap conversa amb l'ID %d."
+
+#. TRANS: Title for conversion timeline.
+msgctxt "TITLE"
+msgid "Conversation"
+msgstr "Conversa"
+
 #. TRANS: Title. %s is a user nickname.
 #, php-format
 msgid "Direct messages from %s"
@@ -516,6 +501,8 @@ msgstr ""
 "amics."
 
 #. TRANS: Client error displayed trying to direct message self (403).
+#. TRANS: Client error displayed trying to send a direct message to self.
+#. TRANS: Error text shown when trying to send a direct message to self.
 msgid ""
 "Do not send a message to yourself; just say it to yourself quietly instead."
 msgstr "No us envieu un missatge a un mateix; simplement comentar-vos-ho."
@@ -744,7 +731,6 @@ msgstr "grups sobre %s"
 
 #. TRANS: Client error displayed when trying to edit a group without being an admin.
 #. TRANS: Client error displayed trying to edit a group while not being a group admin.
-#. TRANS: Client error displayed trying to change group design settings without being a (group) admin.
 #. TRANS: Client error displayed when trying to change group logo settings while not being a group admin.
 msgid "You must be an admin to edit the group."
 msgstr "Heu de ser administrador per editar el grup."
@@ -855,7 +841,6 @@ msgstr "Error de la base de dades en inserir l'oauth_token_association."
 
 #. TRANS: Client error given on when invalid data was passed through a form in the OAuth API.
 #. TRANS: Unexpected validation error on avatar upload form.
-#. TRANS: Client error displayed when the submitted form contains unexpected data.
 #. TRANS: Client error displayed submitting invalid form data for edit application.
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
 #. TRANS: Form validation error message when an unsupported argument is used.
@@ -864,7 +849,6 @@ msgstr "Error de la base de dades en inserir l'oauth_token_association."
 #. TRANS: Client error when submitting a form with unexpected information.
 #. TRANS: Client error displayed when unexpected data is posted in the password recovery form.
 #. TRANS: Message given submitting a form with an unknown action in SMS settings.
-#. TRANS: Unknown form validation error in design settings form.
 msgid "Unexpected form submission."
 msgstr "Enviament de formulari inesperat."
 
@@ -909,7 +893,6 @@ msgstr "Compte"
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Field label on account registration page.
-#. TRANS: Label for nickname on user authorisation page.
 #. TRANS: Field label on group edit form.
 #. TRANS: Dropdown option for searching in profiles.
 msgid "Nickname"
@@ -1222,12 +1205,9 @@ msgstr "Heu d'haver iniciat una sessió per deixar un grup."
 #. TRANS: Client error displayed when requesting Friends of a Friend feed for a nickname that is not a group.
 #. TRANS: Client error displayed trying to block a user from a group while specifying a non-existing group.
 #. TRANS: Client error displayed referring to a group's permalink for a non-existing group ID.
-#. TRANS: Client error displayed trying to change group design settings while providing a nickname for a non-existing group.
 #. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
 #. TRANS: Client error displayed when trying to view group members for a non-existing group.
 #. TRANS: Client error displayed when trying to view group members for an object that is not a group.
-#. TRANS: Client error displayed when trying to view group members for a non-existing group.
-#. TRANS: Client error displayed when trying to view group members for an object that is not a group.
 #. TRANS: Client error displayed when requesting a group RSS feed for group that does not exist.
 #. TRANS: Client error displayed when requesting a group RSS feed for an object that is not a group.
 #. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
@@ -1236,10 +1216,10 @@ msgstr "Heu d'haver iniciat una sessió per deixar un grup."
 #. TRANS: Client error displayed when trying to leave a non-local group.
 #. TRANS: Client error displayed when trying to leave a non-existing group.
 #. TRANS: Client error displayed when providing an invalid group ID on the Make Admin page.
-#. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
-#. TRANS: Client error displayed if no local group with a given name was found requesting group page.
 #. TRANS: Command exception text shown when a group is requested that does not exist.
 #. TRANS: Error text shown when trying to leave a group that does not exist.
+#. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
+#. TRANS: Client error displayed if no local group with a given name was found requesting group page.
 msgid "No such group."
 msgstr "No s'ha trobat el grup."
 
@@ -1309,6 +1289,7 @@ msgid "Join request canceled."
 msgstr "S'ha cancel·lat la sol·licitud d'unió."
 
 #. TRANS: Client error displayed trying to approve subscription for a non-existing request.
+#. TRANS: %s is a user nickname.
 #, php-format
 msgid "%s is not in the moderation queue for your subscriptions."
 msgstr "%s no és una cua de moderació de les vostres subscripcions."
@@ -1460,7 +1441,6 @@ msgstr "No existeix l'adjunció."
 #. TRANS: Client error displayed trying to get an avatar without providing a nickname.
 #. TRANS: Client error displayed when requesting a list of blocked users for a group without providing a group nickname.
 #. TRANS: Client error displayed trying to edit a group while not proving a nickname for the group to edit.
-#. TRANS: Client error displayed trying to change group design settings without providing a group nickname.
 #. TRANS: Client error displayed when trying to change group logo settings without providing a nickname.
 #. TRANS: Client error displayed when trying to view group members without providing a group nickname.
 #. TRANS: Client error displayed when requesting a group RSS feed without providing a group nickname.
@@ -1761,6 +1741,16 @@ msgstr "L'adreça «%s» ha estat confirmada per al vostre compte."
 msgid "Conversation"
 msgstr "Conversa"
 
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+msgid "Conversation feed (Activity Streams JSON)"
+msgstr "Canal de conversos (fluxos d'activitats JSON)"
+
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+msgid "Conversation feed (RSS 2.0)"
+msgstr "Canal de converses (RSS 2.0)"
+
 #. TRANS: Title for conversation page.
 #. TRANS: Title for page that shows a notice.
 msgctxt "TITLE"
@@ -1824,8 +1814,8 @@ msgid "Enter \"%s\" to confirm that you want to delete your account."
 msgstr "Introduïu «%s» per a confirmar que voleu eliminar el vostre compte."
 
 #. TRANS: Button title for user account deletion.
-msgid "Permanently delete your account"
-msgstr "Elimina permanentment el compte"
+msgid "Permanently delete your account."
+msgstr "Elimina permanentment el compte."
 
 #. TRANS: Client error displayed trying to delete an application while not logged in.
 msgid "You must be logged in to delete an application."
@@ -1970,149 +1960,6 @@ msgstr "No eliminis l'usuari."
 msgid "Delete this user."
 msgstr "Elimina l'usuari."
 
-#. TRANS: Message used as title for design settings for the site.
-msgid "Design"
-msgstr "Disseny"
-
-#. TRANS: Instructions for design adminsitration panel.
-msgid "Design settings for this StatusNet site"
-msgstr "Paràmetres de disseny d'aquest lloc StatusNet."
-
-#. TRANS: Client error displayed when a logo URL does is not valid.
-msgid "Invalid logo URL."
-msgstr "L'URL del logotip no és vàlid."
-
-#. TRANS: Client error displayed when an SSL logo URL is invalid.
-msgid "Invalid SSL logo URL."
-msgstr "L'URL SSL del logotip no és vàlid."
-
-#. TRANS: Client error displayed when a theme is submitted through the form that is not in the theme list.
-#. TRANS: %s is the chosen unavailable theme.
-#, php-format
-msgid "Theme not available: %s."
-msgstr "Tema no disponible: %s."
-
-#. TRANS: Fieldset legend for form to change logo.
-msgid "Change logo"
-msgstr "Canvia el logotip"
-
-#. TRANS: Field label for StatusNet site logo.
-msgid "Site logo"
-msgstr "Logotip del lloc"
-
-#. TRANS: Field label for SSL StatusNet site logo.
-msgid "SSL logo"
-msgstr "Logotip SSL"
-
-#. TRANS: Fieldset legend for form change StatusNet site's theme.
-msgid "Change theme"
-msgstr "Canvia el tema"
-
-#. TRANS: Field label for dropdown to choose site theme.
-msgid "Site theme"
-msgstr "Tema del lloc"
-
-#. TRANS: Title for field label for dropdown to choose site theme.
-msgid "Theme for the site."
-msgstr "Tema del lloc."
-
-#. TRANS: Field label for uploading a cutom theme.
-msgid "Custom theme"
-msgstr "Tema personalitzat"
-
-#. TRANS: Form instructions for uploading a cutom StatusNet theme.
-msgid "You can upload a custom StatusNet theme as a .ZIP archive."
-msgstr "Podeu pujar un tema personalitzat de l'StatusNet amb un arxiu ZIP."
-
-#. TRANS: Fieldset legend for theme background image.
-msgid "Change background image"
-msgstr "Canvia la imatge de fons"
-
-#. TRANS: Field label for background image on theme designer page.
-#. TRANS: Field label for background color selector.
-#. TRANS: Label on profile design page for setting a profile page background colour.
-msgid "Background"
-msgstr "Fons"
-
-#. TRANS: Form guide for background image upload form on theme designer page.
-#, php-format
-msgid ""
-"You can upload a background image for the site. The maximum file size is %1"
-"$s."
-msgstr ""
-"Podeu pujar una imatge de fons per al lloc. La mida màxima de fitxer és %1$s."
-
-#. TRANS: Used as radio button label to add a background image.
-msgid "On"
-msgstr "Activada"
-
-#. TRANS: Used as radio button label to not add a background image.
-msgid "Off"
-msgstr "Desactivada"
-
-#. TRANS: Form guide for turning background image on or off on theme designer page.
-#. TRANS: Form guide for a set of radio buttons on the profile design page that will enable or disable
-#. TRANS: use of the uploaded profile image.
-msgid "Turn background image on or off."
-msgstr "Activa o desactiva la imatge de fons."
-
-#. TRANS: Checkbox label to title background image on theme designer page.
-#. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
-msgid "Tile background image"
-msgstr "Posa en mosaic la imatge de fons"
-
-#. TRANS: Fieldset legend for theme colors.
-msgid "Change colors"
-msgstr "Canvia els colors"
-
-#. TRANS: Field label for content color selector.
-#. TRANS: Label on profile design page for setting a profile page content colour.
-msgid "Content"
-msgstr "Contingut"
-
-#. TRANS: Field label for sidebar color selector.
-#. TRANS: Label on profile design page for setting a profile page sidebar colour.
-msgid "Sidebar"
-msgstr "Barra lateral"
-
-#. TRANS: Field label for text color selector.
-#. TRANS: Label on profile design page for setting a profile page text colour.
-msgid "Text"
-msgstr "Text"
-
-#. TRANS: Field label for link color selector.
-#. TRANS: Label on profile design page for setting a profile page links colour.
-msgid "Links"
-msgstr "Enllaços"
-
-#. TRANS: Fieldset legend for advanced theme design settings.
-msgid "Advanced"
-msgstr "Avançat"
-
-#. TRANS: Field label for custom CSS.
-msgid "Custom CSS"
-msgstr "CSS personalitzat"
-
-#. TRANS: Button text for resetting theme settings.
-msgctxt "BUTTON"
-msgid "Use defaults"
-msgstr "Utilitza els paràmetres per defecte"
-
-#. TRANS: Title for button for resetting theme settings.
-#. TRANS: Title for button on profile design page to reset all colour settings to default.
-msgid "Restore default designs."
-msgstr "Restaura els dissenys per defecte."
-
-#. TRANS: Title for button for resetting theme settings.
-#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-msgid "Reset back to default."
-msgstr "Torna a restaurar els paràmetres per defecte."
-
-#. TRANS: Title for button for saving theme settings.
-#. TRANS: Title for button on profile design page to save settings.
-msgid "Save design."
-msgstr "Desa el disseny."
-
 #. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
 msgid "This notice is not a favorite!"
 msgstr "Aquesta avís no és un preferit!"
@@ -2127,6 +1974,74 @@ msgstr "Afegeix als preferits"
 msgid "No such document \"%s\"."
 msgstr "No existeix el document «%s»"
 
+#. TRANS: Menu item in administrator navigation panel.
+#. TRANS: Menu item in default local navigation panel.
+#. TRANS: Menu item in personal group navigation menu.
+msgctxt "MENU"
+msgid "Home"
+msgstr "Inici"
+
+msgctxt "MENU"
+msgid "Docs"
+msgstr "Documents"
+
+#. TRANS: Secondary navigation menu item leading to help on StatusNet.
+msgctxt "MENU"
+msgid "Help"
+msgstr "Ajuda"
+
+msgid "Getting started"
+msgstr "Primers passos"
+
+#. TRANS: Secondary navigation menu item leading to text about StatusNet site.
+msgctxt "MENU"
+msgid "About"
+msgstr "Quant a"
+
+msgid "About this site"
+msgstr "Quant a aquest lloc"
+
+#. TRANS: Secondary navigation menu item leading to Frequently Asked Questions.
+msgctxt "MENU"
+msgid "FAQ"
+msgstr "Preguntes més freqüents"
+
+msgid "Frequently asked questions"
+msgstr "Preguntes més freqüents"
+
+#. TRANS: Secondary navigation menu item leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+msgctxt "MENU"
+msgid "Contact"
+msgstr "Contacte"
+
+msgid "Contact info"
+msgstr "Informació de contacte"
+
+msgctxt "MENU"
+msgid "Tags"
+msgstr "Etiquetes"
+
+msgid "Using tags"
+msgstr "Ús de les etiquetes"
+
+#. TRANS: Menu item in default local navigation panel.
+#. TRANS: Menu item in search group navigation panel.
+#. TRANS: Menu item in local navigation menu.
+msgctxt "MENU"
+msgid "Groups"
+msgstr "Grups"
+
+msgid "Using groups"
+msgstr "Ús dels grups"
+
+msgctxt "MENU"
+msgid "API"
+msgstr "API"
+
+msgid "RESTful API"
+msgstr "RESTful API"
+
 #. TRANS: Title for "Edit application" form.
 #. TRANS: Form legend.
 msgid "Edit application"
@@ -2289,7 +2204,7 @@ msgstr ""
 "En definir una etiqueta pública com a privada eliminarà permanentment totes "
 "les subscripcions que hi estan associades. Encara voleu continuar?"
 
-#. TRANS: TRANS: Server error displayed when updating a list fails.
+#. TRANS: Server error displayed when updating a list fails.
 msgid "Could not update list."
 msgstr "No s'ha pogut actualitzar la llista."
 
@@ -2595,40 +2510,6 @@ msgstr "Cap adjunció."
 msgid "No uploaded attachments."
 msgstr "No s'ha pujat cap adjunt."
 
-#. TRANS: Client error displayed when subscribing to a remote profile and an unexpected response is received.
-msgid "Not expecting this response!"
-msgstr "Resposta inesperada!"
-
-#. TRANS: Client error displayed when subscribing to a remote profile that does not exist.
-msgid "User being listened to does not exist."
-msgstr "L'usuari que s'escolta no existeix."
-
-#. TRANS: Client error displayed when subscribing to a remote profile that is a local profile.
-#. TRANS: Client error displayed when using remote subscribe for a local entity.
-msgid "You can use the local subscription!"
-msgstr "Podeu utilitzar la subscripció local!"
-
-#. TRANS: Client error displayed when subscribing to a remote profile that is blocked form subscribing to.
-msgid "That user has blocked you from subscribing."
-msgstr "Aquest usuari t'ha bloquejat com a subscriptor."
-
-#. TRANS: Client error displayed when subscribing to a remote profile without providing an authorised token.
-msgid "You are not authorized."
-msgstr "No esteu autoritzat."
-
-#. TRANS: Client error displayed when subscribing to a remote profile and conversion of the request token to access token fails.
-msgid "Could not convert request token to access token."
-msgstr "No s'ha pogut convertir el testimoni de sol·licitud a un d'accés."
-
-#. TRANS: Client error displayed when subscribing to a remote profile fails because of an unsupported version of the OMB protocol.
-msgid "Remote service uses unknown version of OMB protocol."
-msgstr "El servei remot utilitza una versió desconeguda del protocol OMB."
-
-#. TRANS: Server error displayed when subscribing to a remote profile fails because the remote profile could not be updated.
-#. TRANS: Exception thrown when updating a remote profile fails in OAuth store.
-msgid "Error updating remote profile."
-msgstr "S'ha produït un error en actualitzar el perfil remot."
-
 #. TRANS: Client error displayed when requesting a non-existent file.
 msgid "No such file."
 msgstr "No existeix el fitxer."
@@ -2715,31 +2596,6 @@ msgstr "S'ha produït un error en la base de dades en blocar l'usuari del grup."
 msgid "No ID."
 msgstr "Sense ID."
 
-#. TRANS: Client error displayed trying to change group design settings while not logged in.
-msgid "You must be logged in to edit a group."
-msgstr "Heu d'iniciar una sessió per editar un grup."
-
-#. TRANS: Title group design settings page.
-msgid "Group design"
-msgstr "Disseny de grup"
-
-#. TRANS: Instructions for group design settings page.
-msgid ""
-"Customize the way your group looks with a background image and a colour "
-"palette of your choice."
-msgstr ""
-"Personalitzeu l'aspecte del vostre grup amb una imatge de fons i una paleta "
-"de colors de la vostra elecció."
-
-#. TRANS: Form validation error displayed when group design settings could not be updated because of an application issue.
-msgid "Unable to update your design settings."
-msgstr "No s'han pogut actualitzar els paràmetres de disseny."
-
-#. TRANS: Form text to confirm saved group design settings.
-#. TRANS: Confirmation message on Profile design page when saving design settings has succeeded.
-msgid "Design preferences saved."
-msgstr "S'han desat les preferències de disseny."
-
 #. TRANS: Title for group logo settings page.
 #. TRANS: Group logo form legend.
 msgid "Group logo"
@@ -2913,12 +2769,11 @@ msgstr "Paràmetres de missatgeria instantània"
 #. TRANS: the order and formatting of link text and link should remain unchanged.
 #, php-format
 msgid ""
-"You can send and receive notices through instant messaging [instant messages]"
-"(%%doc.im%%). Configure your addresses and settings below."
+"You can send and receive notices through [instant messaging](%%doc.im%%). "
+"Configure your addresses and settings below."
 msgstr ""
-"Podeu enviar i rebre avisos a través de la missatgeria instantània "
-"[missatges instantanis](%%doc.im%%) de Jabber/GTalk. Configureu les adreces "
-"i paràmetres a continuació."
+"Podeu enviar i rebre avisos a través de [la missatgeria instantània](%%doc.im"
+"%%). Configureu les adreces i paràmetres a continuació."
 
 #. TRANS: Message given in the IM settings if IM is not enabled on the site.
 msgid "IM is not available."
@@ -3116,28 +2971,6 @@ msgstr ""
 "Feu servir aquest formulari per convidar els vostres amics i companys a "
 "utilitzar aquest servei."
 
-#. TRANS: Field label for a list of e-mail addresses.
-msgid "Email addresses"
-msgstr "Adreces de correu electrònic"
-
-#. TRANS: Tooltip for field label for a list of e-mail addresses.
-msgid "Addresses of friends to invite (one per line)."
-msgstr "Adreces d'amics per convidar (una per línia)."
-
-#. TRANS: Field label for a personal message to send to invitees.
-msgid "Personal message"
-msgstr "Missatge personal"
-
-#. TRANS: Tooltip for field label for a personal message to send to invitees.
-msgid "Optionally add a personal message to the invitation."
-msgstr "Opcionalment podeu afegir un missatge a la invitació."
-
-#. TRANS: Send button for inviting friends
-#. TRANS: Button text for sending notice.
-msgctxt "BUTTON"
-msgid "Send"
-msgstr "Envia"
-
 #. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral
 #. TRANS: singular 3rd-person pronoun in English. %1$s is the inviting user, $2$s is
 #. TRANS: the StatusNet sitename.
@@ -3271,12 +3104,6 @@ msgstr "URL de la imatge que es mostrarà juntament amb la llicència."
 msgid "Save license settings."
 msgstr "Desa els paràmetres de la llicència."
 
-#. TRANS: Client error displayed when trying to log in while already logged in.
-#. TRANS: Client error displayed trying to use "one time password login" when already logged in.
-#. TRANS: Client error displayed when trying to register while already logged in.
-msgid "Already logged in."
-msgstr "Ja hi heu iniciat una sessió."
-
 #. TRANS: Form validation error displayed when trying to log in with incorrect credentials.
 msgid "Incorrect username or password."
 msgstr "Nom d'usuari o contrasenya incorrectes."
@@ -3297,9 +3124,8 @@ msgid "Login to site"
 msgstr "Accedir al lloc"
 
 #. TRANS: Field label on login page.
-#, fuzzy
 msgid "Username or email address"
-msgstr "Sobrenom o adreça electrònica"
+msgstr "Nom d'usuari o adreça electrònica"
 
 #. TRANS: Checkbox label label on login page.
 #. TRANS: Checkbox label on account registration page.
@@ -3391,6 +3217,7 @@ msgstr "URL d'origen requerida."
 msgid "Could not create application."
 msgstr "No s'ha pogut crear l'aplicació."
 
+#. TRANS: Form validation error messages displayed when uploading an invalid application logo.
 msgid "Invalid image."
 msgstr "La imatge no és vàlida."
 
@@ -3427,12 +3254,6 @@ msgstr "Cap contingut!"
 msgid "No recipient specified."
 msgstr "No has especificat el destinatari."
 
-#. TRANS: Client error displayed trying to send a direct message to self.
-#. TRANS: Error text shown when trying to send a direct message to self.
-msgid ""
-"Don't send a message to yourself; just say it to yourself quietly instead."
-msgstr "No t'enviïs missatges a tu mateix, simplement dir-te això."
-
 #. TRANS: Page title after sending a direct message.
 msgid "Message sent"
 msgstr "S'ha enviat el missatge"
@@ -3639,6 +3460,32 @@ msgstr "Si us plau, només URL %s sobre HTTP pla."
 msgid "Not a supported data format."
 msgstr "Format de data no suportat."
 
+#. TRANS: Page title for profile settings.
+msgid "Old school UI settings"
+msgstr "Paràmetres d'interfície de la versió antiga"
+
+#. TRANS: Usage instructions for profile settings.
+msgid "If you like it \"the old way\", you can set that here."
+msgstr "Si us agrada a l'antiga, podeu definir-ho des d'aquí."
+
+#. TRANS: Confirmation shown when user profile settings are saved.
+#. TRANS: Message after successful saving of administrative settings.
+msgid "Settings saved."
+msgstr "S'ha desat la configuració."
+
+msgid "Only stream mode (no conversations) in timelines"
+msgstr "Només mode de flux (sense converses) a les línies temporals"
+
+msgid "Show conversation page as hierarchical trees"
+msgstr "Mostra la pàgina de converses com arbres jeràrquics."
+
+msgid "Show nicknames (not full names) in timelines"
+msgstr "Mostra els sobrenoms (no els noms sencers) en les línies temporals"
+
+#. TRANS: Button text to save a list.
+msgid "Save"
+msgstr "Desa"
+
 #. TRANS: ShortName in the OpenSearch interface when trying to find users.
 msgid "People Search"
 msgstr "Cerca de gent"
@@ -3647,6 +3494,11 @@ msgstr "Cerca de gent"
 msgid "Notice Search"
 msgstr "Cerca d'avisos"
 
+#. TRANS: Client error displayed trying to use "one time password login" when already logged in.
+#. TRANS: Client error displayed when trying to register while already logged in.
+msgid "Already logged in."
+msgstr "Ja hi heu iniciat una sessió."
+
 #. TRANS: Client error displayed trying to use "one time password login" without specifying a user.
 msgid "No user ID specified."
 msgstr "No s'ha especificat cap ID d'usuari."
@@ -3718,7 +3570,7 @@ msgid "Confirm"
 msgstr "Confirma"
 
 #. TRANS: Field title on page where to change password.
-#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
+#. TRANS: Title for field label for password reset form where the password has to be typed again.
 #. TRANS: Field title on account registration page.
 msgid "Same as password above."
 msgstr "Igual que la contrasenya de dalt"
@@ -3776,12 +3628,6 @@ msgstr "No es pot llegir el directori de temes: %s"
 msgid "Avatar directory not writable: %s."
 msgstr "No es pot escriure al directori d'avatars: %s"
 
-#. TRANS: Client error in Paths admin panel.
-#. TRANS: %s is the background directory that could not be written to.
-#, php-format
-msgid "Background directory not writable: %s."
-msgstr "No es pot escriure al directori de fons: %s"
-
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the locales directory that could not be read from.
 #, php-format
@@ -3894,30 +3740,6 @@ msgstr "Directori d'avatars"
 msgid "Directory where avatars are located."
 msgstr "Directori on es troben els avatars."
 
-#. TRANS: Fieldset legend in Paths admin panel.
-msgid "Backgrounds"
-msgstr "Fons"
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-msgid "Server for backgrounds."
-msgstr "Servidor de fons."
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-msgid "Web path to backgrounds."
-msgstr "Camí web de fons."
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-msgid "Server for backgrounds on SSL pages."
-msgstr "Servidor de fons a pàgines SSL."
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-msgid "Web path to backgrounds on SSL pages."
-msgstr "Camí web de fons a pàgines SSL."
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-msgid "Directory where backgrounds are located."
-msgstr "Directori on es troben els fons."
-
 #. TRANS: Fieldset legens in Paths admin panel.
 msgid "Attachments"
 msgstr "Adjuncions"
@@ -3973,8 +3795,8 @@ msgid "Server to direct SSL requests to."
 msgstr "Servidor on dirigir les sol·licituds SSL."
 
 #. TRANS: Button title text to store form data in the Paths admin panel.
-msgid "Save paths"
-msgstr "Desa els camins"
+msgid "Save path settings."
+msgstr "Desa el camí del lloc."
 
 #. TRANS: Instructions for the "People search" page.
 #. TRANS: %%site.name%% is the name of the StatusNet site.
@@ -4107,13 +3929,13 @@ msgid ""
 "%%%site.name%%%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
 "blogging) service based on the Free Software [StatusNet](http://status.net/) "
 "tool. You can easily keep track of what they are doing by subscribing to the "
-"tag's timeline."
+"list's timeline."
 msgstr ""
 "Aquestes són llistes creades per **%s**. Les llistes són la forma com "
 "agrupeu gent similar a %%%%site.name%%%%, un servei de [microblogging]"
 "(http://ca.wikipedia.org/wiki/Microblogging) basat en l'eina lliure "
 "[StatusNet](http://status.net/). Podeu seguir fàcilment què estan fent "
-"subscrivint-vos a la línia temporal d'una etiqueta."
+"subscrivint-vos a la línia temporal de la llista."
 
 #. TRANS: Message displayed on page that displays lists by a user when there are none.
 #. TRANS: This message contains Markdown links in the form [description](links).
@@ -4141,13 +3963,13 @@ msgid ""
 "site.name%%%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
 "blogging) service based on the Free Software [StatusNet](http://status.net/) "
 "tool. You can easily keep track of what they are doing by subscribing to the "
-"tag's timeline."
+"list's timeline."
 msgstr ""
 "Aquestes són llistes de **%s**. Les llistes són la forma com agrupeu gent "
 "similar a %%%%site.name%%%%, un servei de [microblogging](http://ca."
 "wikipedia.org/wiki/Microblogging) basat en l'eina lliure [StatusNet](http://"
 "status.net/). Podeu seguir fàcilment què estan fent subscrivint-vos a la "
-"línia temporal d'una etiqueta."
+"línia temporal d'una llista."
 
 #. TRANS: Message displayed on page that displays lists a user was added to when there are none.
 #. TRANS: This message contains Markdown links in the form [description](links).
@@ -4249,18 +4071,6 @@ msgstr ""
 "S'han inhabilitat tots els connectors per defecte del fitxer de configuració "
 "del lloc."
 
-#. TRANS: Client error displayed if the notice posted has too many characters.
-msgid "Invalid notice content."
-msgstr "El contingut de l'avís no és vàlid."
-
-#. TRANS: Exception thrown if a notice's license is not compatible with the StatusNet site license.
-#. TRANS: %1$s is the notice license, %2$s is the StatusNet site's license.
-#, php-format
-msgid "Notice license \"%1$s\" is not compatible with site license \"%2$s\"."
-msgstr ""
-"La llicència ‘%1$s’ de l'avís no és compatible amb la llicència ‘%2$s’ del "
-"lloc."
-
 #. TRANS: Client error displayed when trying to add an unindentified field to profile.
 #. TRANS: %s is a field name.
 #, php-format
@@ -4356,6 +4166,8 @@ msgid "Share my current location when posting notices"
 msgstr "Comparteix la ubicació on estic en enviar avisos"
 
 #. TRANS: Field label in form for profile settings.
+#. TRANS: Title for group tag cloud section.
+#. TRANS: %s is a group name.
 msgid "Tags"
 msgstr "Etiquetes"
 
@@ -4385,9 +4197,9 @@ msgstr "En quin fus horari us trobeu normalment?"
 
 #. TRANS: Checkbox label in form for profile settings.
 msgid ""
-"Automatically subscribe to whoever subscribes to me (best for non-humans)."
+"Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr ""
-"Subscriu automàticament a qualsevol qui em tingui subscrit (ideal per no-"
+"Subscripció automàtica a qualsevol qui em tingui subscrit (ideal per no-"
 "humans)"
 
 #. TRANS: Dropdown field label on profile settings, for what policies to apply when someone else tries to subscribe to your updates.
@@ -4456,11 +4268,6 @@ msgstr "No s'han pogut desar les preferències d'ubicació."
 msgid "Could not save tags."
 msgstr "No s'han pogut guardar les etiquetes."
 
-#. TRANS: Confirmation shown when user profile settings are saved.
-#. TRANS: Message after successful saving of administrative settings.
-msgid "Settings saved."
-msgstr "S'ha desat la configuració."
-
 #. TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
 #. TRANS: Page title for page where a user account can be restored from backup.
 msgid "Restore account"
@@ -4473,8 +4280,8 @@ msgid "Beyond the page limit (%s)."
 msgstr "Més enllà del límit de la pàgina (%s)"
 
 #. TRANS: Server error displayed when a public timeline cannot be retrieved.
-msgid "Could not retrieve public stream."
-msgstr "No s'ha pogut recuperar la conversa pública."
+msgid "Could not retrieve public timeline."
+msgstr "No s'ha pogut recuperar la línia temporal pública."
 
 #. TRANS: Title for all public timeline pages but the first.
 #. TRANS: %d is the page number.
@@ -4488,16 +4295,20 @@ msgid "Public timeline"
 msgstr "Línia temporal pública"
 
 #. TRANS: Link description for public timeline feed.
-msgid "Public Stream Feed (RSS 1.0)"
-msgstr "Flux de canal públic (RSS 1.0)"
+msgid "Public Timeline Feed (Activity Streams JSON)"
+msgstr "Canal de la línia temporal pública (fluxos d'activitat JSON)"
 
 #. TRANS: Link description for public timeline feed.
-msgid "Public Stream Feed (RSS 2.0)"
-msgstr "Flux de canal públic (RSS 2.0)"
+msgid "Public Timeline Feed (RSS 1.0)"
+msgstr "Canal de la línia temporal pública (RSS 1.0)"
 
 #. TRANS: Link description for public timeline feed.
-msgid "Public Stream Feed (Atom)"
-msgstr "Flux de canal públic (Atom)"
+msgid "Public Timeline Feed (RSS 2.0)"
+msgstr "Canal de la línia temporal pública (RSS 2.0)"
+
+#. TRANS: Link description for public timeline feed.
+msgid "Public Timeline Feed (Atom)"
+msgstr "Canal de la línia temporal pública (Atom)"
 
 #. TRANS: Text displayed for public feed when there are no public notices.
 #, php-format
@@ -4545,47 +4356,6 @@ msgstr ""
 "Això és %%site.name%%, un servei de [microblogging](http://ca.wikipedia.org/"
 "wiki/Microblogging) basat en l'eina lliure [StatusNet](http://status.net/)."
 
-#. TRANS: Title for page with public list cloud.
-msgid "Public list cloud"
-msgstr "Núvol públic de llistes"
-
-#. TRANS: Page notice for page with public list cloud.
-#. TRANS: %s is a StatusNet sitename.
-#, php-format
-msgid "These are largest lists on %s"
-msgstr "Aquestes són les llistes més extenses a %s"
-
-#. TRANS: Empty list message on page with public list cloud.
-#. TRANS: This message contains Markdown links in the form [description](link).
-#, php-format
-msgid "No one has [listed](%%doc.tags%%) anyone yet."
-msgstr "Ningú ha [llistat](%%doc.tags%%) encara ningú."
-
-#. TRANS: Additional empty list message on page with public list cloud for logged in users.
-msgid "Be the first to list someone!"
-msgstr "Sigueu el primer en llistar algú!"
-
-#. TRANS: Additional empty list message on page with public list cloud for anonymous users.
-#. TRANS: This message contains Markdown links in the form [description](link).
-#, php-format
-msgid ""
-"Why not [register an account](%%action.register%%) and be the first to list "
-"someone!"
-msgstr ""
-"Per què no hi [registreu un compte](%%action.register%%) i sou el primer en "
-"llistar algú!"
-
-#. TRANS: DT element on on page with public list cloud.
-msgid "List cloud"
-msgstr "Núvol de llistes"
-
-#. TRANS: Link title for number of listed people. %d is the number of listed people.
-#, php-format
-msgid "1 person listed"
-msgid_plural "%d people listed"
-msgstr[0] "S'ha llistat 1 persona"
-msgstr[1] "S'han llistat %d persones"
-
 #. TRANS: Public RSS feed description. %s is the StatusNet site name.
 #, php-format
 msgid "%s updates from everyone."
@@ -4713,7 +4483,6 @@ msgid "6 or more characters, and do not forget it!"
 msgstr "6 o més caràcters, i no ho oblideu!"
 
 #. TRANS: Button text for password reset form.
-#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
 msgctxt "BUTTON"
 msgid "Reset"
 msgstr "Reinicialitza"
@@ -4722,18 +4491,6 @@ msgstr "Reinicialitza"
 msgid "Enter a nickname or email address."
 msgstr "Escriviu un sobrenom o una adreça de correu electrònic."
 
-#. TRANS: Information on password recovery form if no known username or e-mail address was specified.
-msgid "No user with that email address or username."
-msgstr "No hi ha cap usuari amb aquesta direcció o usuari."
-
-#. TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.
-msgid "No registered email address for that user."
-msgstr "No hi ha cap adreça de correu electrònic registrada d'aquest usuari."
-
-#. TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.
-msgid "Error saving address confirmation."
-msgstr "S'ha produït un error en desar la confirmació de l'adreça."
-
 #. TRANS: User notification after an e-mail with instructions was sent from the password recovery form.
 msgid ""
 "Instructions for recovering your password have been sent to the email "
@@ -4914,74 +4671,6 @@ msgstr ""
 "(Hauries de rebre un missatge per correu electrònic d'aquí uns moments, amb "
 "instruccions sobre com confirmar la teva direcció de correu electrònic.)"
 
-#. TRANS: Page notice for remote subscribe. This message contains Markdown links.
-#. TRANS: Ensure to keep the correct markup of [link description](link).
-#, php-format
-msgid ""
-"To subscribe, you can [login](%%action.login%%), or [register](%%action."
-"register%%) a new  account. If you already have an account  on a [compatible "
-"microblogging site](%%doc.openmublog%%),  enter your profile URL below."
-msgstr ""
-"Per subscriure-us, podeu [iniciar una sessió](%%action.login%%), o "
-"[registrar-hi](%%action.register%%) un nou compte. Si ja en teniu un en un "
-"[servei de microblogging compatible](%%doc.openmublog%%), escriviu l'URL del "
-"vostre perfil a continuació."
-
-#. TRANS: Page title for Remote subscribe.
-msgid "Remote subscribe"
-msgstr "Subscripció remota"
-
-#. TRANS: Field legend on page for remote subscribe.
-msgid "Subscribe to a remote user"
-msgstr "Subscriu a un usuari remot"
-
-#. TRANS: Field label on page for remote subscribe.
-msgid "User nickname"
-msgstr "Sobrenom de l'usuari"
-
-#. TRANS: Field title on page for remote subscribe.
-msgid "Nickname of the user you want to follow."
-msgstr "Sobrenom de l'usuari que voleu seguir."
-
-#. TRANS: Field label on page for remote subscribe.
-msgid "Profile URL"
-msgstr "URL del perfil"
-
-#. TRANS: Field title on page for remote subscribe.
-msgid "URL of your profile on another compatible microblogging service."
-msgstr "URL del vostre perfil en un altre servei de microblogging compatible."
-
-#. TRANS: Button text on page for remote subscribe.
-#. TRANS: Link text for link that will subscribe to a remote profile.
-#. TRANS: Button text to subscribe to a user.
-#. TRANS: Button text for subscribing to a list.
-msgctxt "BUTTON"
-msgid "Subscribe"
-msgstr "Subscriu-m'hi"
-
-#. TRANS: Form validation error on page for remote subscribe when an invalid profile URL was provided.
-msgid "Invalid profile URL (bad format)."
-msgstr "L'URL del perfil no és vàlid (format incorrecte)."
-
-#. TRANS: Form validation error on page for remote subscribe when no the provided profile URL
-#. TRANS: does not contain expected data.
-msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
-msgstr ""
-"L'URL del perfil no és vàlid (no és un document YADIS o no s'ha definit un "
-"XRDS vàlid)."
-
-#. TRANS: Form validation error on page for remote subscribe.
-msgid "That is a local profile! Login to subscribe."
-msgstr "Aquest és un perfil local! Inicieu una sessió per subscriure-us-hi."
-
-#. TRANS: Form validation error on page for remote subscribe when the remote service is not providing a request token.
-msgid "Could not get a request token."
-msgstr "No s'ha pogut obtenir un testimoni de sol·licitud."
-
-#. TRANS: Client error displayed when trying to (un)list an OMB 0.1 remote profile.
-msgid "You cannot (un)list an OMB 0.1 remote profile with this action."
-msgstr "No podeu (des)llistar un perfil remot OMB 0.1 amb aquesta acció."
-
 #. TRANS: Client error displayed when an unknown error occurs while delisting a user.
 #. TRANS: %s is a username.
 #, php-format
@@ -5035,6 +4724,12 @@ msgstr "Respostes a %s"
 msgid "Replies to %1$s, page %2$d"
 msgstr "Respostes a %1$s, pàgina %2$d"
 
+#. TRANS: Link for feed with replies for a user.
+#. TRANS: %s is a user nickname.
+#, php-format
+msgid "Replies feed for %s (Activity Streams JSON)"
+msgstr "Canal de respostes de %s (fluxos d'activitat JSON)"
+
 #. TRANS: Link for feed with replies for a user.
 #. TRANS: %s is a user nickname.
 #, php-format
@@ -5157,11 +4852,11 @@ msgstr "Es restaurarà el perfil. Espereu uns pocs minuts per als resultats."
 
 #. TRANS: Form instructions for feed restore.
 msgid ""
-"You can upload a backed-up stream in <a href=\"http://activitystrea.ms/"
+"You can upload a backed-up timeline in <a href=\"http://activitystrea.ms/"
 "\">Activity Streams</a> format."
 msgstr ""
-"Podeu pujar una còpia de seguretat de flux en format <a href=\"http://"
-"activitystrea.ms/\">Activity Streams</a>."
+"Podeu pujar una còpia de seguretat de la línia temporal en format <a href="
+"\"http://activitystrea.ms/\">Activity Streams</a>."
 
 #. TRANS: Title for submit button to confirm upload of a user backup file for account restore.
 msgid "Upload the file"
@@ -5273,6 +4968,26 @@ msgstr "Reinicialitza la clau i la secreta"
 msgid "Application info"
 msgstr "Informació de l'aplicació"
 
+#. TRANS: Field label on application page.
+msgid "Consumer key"
+msgstr "Clau del consumidor"
+
+#. TRANS: Field label on application page.
+msgid "Consumer secret"
+msgstr "Secreta del consumidor"
+
+#. TRANS: Field label on application page.
+msgid "Request token URL"
+msgstr "Sol·licita l'URL del testimoni"
+
+#. TRANS: Field label on application page.
+msgid "Access token URL"
+msgstr "Accedeix a l'URL del testimoni"
+
+#. TRANS: Field label on application page.
+msgid "Authorize URL"
+msgstr "Autoritza l'URL"
+
 #. TRANS: Note on the OAuth application page about signature support.
 msgid ""
 "Note: HMAC-SHA1 signatures are supported. The plaintext signature method is "
@@ -5296,6 +5011,11 @@ msgstr "Avisos preferits de %1$s, pàgina %2$d"
 msgid "Could not retrieve favorite notices."
 msgstr "No s'han pogut recuperar els avisos preferits."
 
+#. TRANS: Feed link text. %s is a username.
+#, php-format
+msgid "Feed for favorites of %s (Activity Streams JSON)"
+msgstr "Canal dels preferits de %s (fluxos d'activitat de JSON)"
+
 #. TRANS: Feed link text. %s is a username.
 #, php-format
 msgid "Feed for favorites of %s (RSS 1.0)"
@@ -5356,6 +5076,11 @@ msgstr "%s grup"
 msgid "%1$s group, page %2$d"
 msgstr "grup %1$s, pàgina %2$d"
 
+#. TRANS: Tooltip for feed link. %s is a group nickname.
+#, php-format
+msgid "Notice feed for %s group (Activity Streams JSON)"
+msgstr "Canal d'avisos del grup %s (fluxos d'activitat JSON)"
+
 #. TRANS: Tooltip for feed link. %s is a group nickname.
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
@@ -5376,42 +5101,8 @@ msgstr "Canal d'avisos del grup %s (Atom)"
 msgid "FOAF for %s group"
 msgstr "Safata de sortida per %s"
 
-#. TRANS: Header for mini list of group members on a group page (h2).
-msgid "Members"
-msgstr "Membres"
-
-#. TRANS: Description for mini list of group members on a group page when the group has no members.
-#. TRANS: Content of "Listed" page if there are no listed users.
-#. TRANS: Content of "People following tag x" if there are no subscribed users.
-#. TRANS: Empty list message for tags.
-#. TRANS: Text for user subscription statistics if the user has no subscriptions.
-#. TRANS: Text for user subscriber statistics if user has no subscribers.
-#. TRANS: Text for user user group membership statistics if user is not a member of any group.
-#. TRANS: Default content for section/sidebar widget.
-msgid "(None)"
-msgstr "(Cap)"
-
-#. TRANS: Link to all group members from mini list of group members if group has more than n members.
-msgid "All members"
-msgstr "Tots els membres"
-
-#. TRANS: Header for group statistics on a group page (h2).
-#. TRANS: H2 text for user statistics.
-msgid "Statistics"
-msgstr "Estadístiques"
-
-#. TRANS: Label for group creation date.
-msgctxt "LABEL"
-msgid "Created"
-msgstr "S'ha creat"
-
-#. TRANS: Label for member count in statistics on group page.
-msgctxt "LABEL"
-msgid "Members"
-msgstr "Membres"
-
 #. TRANS: Notice on group pages for anonymous users for StatusNet sites that accept new registrations.
-#. TRANS: **%s** is the group alias, %%%%site.name%%%% is the site name,
+#. TRANS: %s is the group name, %%%%site.name%%%% is the site name,
 #. TRANS: %%%%action.register%%%% is the URL for registration, %%%%doc.help%%%% is a URL to help.
 #. TRANS: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
 #, php-format
@@ -5430,24 +5121,19 @@ msgstr ""
 "%))"
 
 #. TRANS: Notice on group pages for anonymous users for StatusNet sites that accept no new registrations.
-#. TRANS: **%s** is the group alias, %%%%site.name%%%% is the site name,
+#. TRANS: %s is the group name, %%%%site.name%%%% is the site name,
 #. TRANS: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
 "wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
 "[StatusNet](http://status.net/) tool. Its members share short messages about "
-"their life and interests. "
+"their life and interests."
 msgstr ""
 "**%s** és un grup d'usuaris a %%%%site.name%%%%, un servei de [microblogging]"
 "(http://ca.wikipedia.org/wiki/Microblogging) basat en l'eina lliure "
-"[StatusNet](http://status.net/). Els seus membre comparteixen missatges "
-"curts sobre llur vida i interessos. "
-
-#. TRANS: Title for list of group administrators on a group page.
-msgctxt "TITLE"
-msgid "Admins"
-msgstr "Administradors"
+"[StatusNet](http://status.net/). Els seus membres comparteixen missatges "
+"curts de llurs vides i interessos."
 
 #. TRANS: Client error displayed requesting a single message that does not exist.
 msgid "No such message."
@@ -5544,9 +5230,21 @@ msgstr ""
 "seguir aquesta línia temporal!"
 
 #. TRANS: Header on show list page.
+#. TRANS: Link description for link to list of users tagged with a tag (so part of a list).
 msgid "Listed"
 msgstr "Llistat"
 
+#. TRANS: Content of "Listed" page if there are no listed users.
+#. TRANS: Content of "People following tag x" if there are no subscribed users.
+#. TRANS: Description for mini list of group members on a group page when the group has no members.
+#. TRANS: Empty list message for tags.
+#. TRANS: Text for user subscription statistics if the user has no subscriptions.
+#. TRANS: Text for user subscriber statistics if user has no subscribers.
+#. TRANS: Text for user user group membership statistics if user is not a member of any group.
+#. TRANS: Default content for section/sidebar widget.
+msgid "(None)"
+msgstr "(Cap)"
+
 #. TRANS: Link for more "People in list x by a user"
 #. TRANS: if there are more than the mini list's maximum.
 msgid "Show all"
@@ -5557,24 +5255,19 @@ msgstr "Mostra-ho tot"
 msgid "Subscribers"
 msgstr "Subscriptors"
 
-#. TRANS: Link for more "People following tag x"
-#. TRANS: if there are more than the mini list's maximum.
-msgid "All subscribers"
-msgstr "Tots els subscriptors"
-
-#. TRANS: Page title showing tagged notices in one user's stream.
+#. TRANS: Page title showing tagged notices in one user's timeline.
 #. TRANS: %1$s is the username, %2$s is the hash tag.
 #, php-format
 msgid "Notices by %1$s tagged %2$s"
 msgstr "Avisos de %1$s etiquetats amb %2$s"
 
-#. TRANS: Page title showing tagged notices in one user's stream.
+#. TRANS: Page title showing tagged notices in one user's timeline.
 #. TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number.
 #, php-format
 msgid "Notices by %1$s tagged %2$s, page %3$d"
 msgstr "Avisos de %1$s etiquetats amb %2$s, pàgina %3$d"
 
-#. TRANS: Extended page title showing tagged notices in one user's stream.
+#. TRANS: Extended page title showing tagged notices in one user's timeline.
 #. TRANS: %1$s is the username, %2$d is the page number.
 #, php-format
 msgid "Notices by %1$s, page %2$d"
@@ -5586,6 +5279,12 @@ msgstr "Avisos de %1$s, pàgina %2$d"
 msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
 msgstr "Canal d'avisos de %1$s etiquetats amb %2$s (RSS 1.0)"
 
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#, php-format
+msgid "Notice feed for %s (Activity Streams JSON)"
+msgstr "Canal d'avisos de %s (fluxos d'activitats JSON)"
+
 #. TRANS: Title for link to notice feed.
 #. TRANS: %s is a user nickname.
 #, php-format
@@ -5610,7 +5309,7 @@ msgstr "Canal d'avisos de %s (Atom)"
 msgid "FOAF for %s"
 msgstr "FOAF de %s"
 
-#. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
+#. TRANS: First sentence of empty list message for a timeline. $1%s is a user nickname.
 #, php-format
 msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
 msgstr ""
@@ -5624,7 +5323,7 @@ msgstr ""
 "Heu vist res interessant recentment? No heu enviat cap avís encara, ara "
 "podria ser un bon moment per començar :)"
 
-#. TRANS: Second sentence of empty  list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
+#. TRANS: Second sentence of empty  list message for a non-self timeline. %1$s is a user nickname, %2$s is a part of a URL.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
 #, php-format
 msgid ""
@@ -5634,7 +5333,7 @@ msgstr ""
 "Sigueu el primer en [enviar sobre aquest tema](%%%%action.newnotice%%%%?"
 "status_textarea=%s)!"
 
-#. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
+#. TRANS: Announcement for anonymous users showing a timeline if site registrations are open.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
 #, php-format
 msgid ""
@@ -5650,17 +5349,17 @@ msgstr ""
 "seguir els avisos de **%s** i molt més! ([Més informació...](%%%%doc.help%%%"
 "%))"
 
-#. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
+#. TRANS: Announcement for anonymous users showing a timeline if site registrations are closed or invite only.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
 "wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
-"[StatusNet](http://status.net/) tool. "
+"[StatusNet](http://status.net/) tool."
 msgstr ""
 "**%s** té un compte a %%%%site.name%%%%, un servei de [microblogging](http://"
 "ca.wikipedia.org/wiki/Microblogging) basat en l'eina lliure [StatusNet]"
-"(http://status.net/). "
+"(http://status.net/)."
 
 #. TRANS: Link to the author of a repeated notice. %s is a linked nickname.
 #, php-format
@@ -5693,6 +5392,14 @@ msgstr "El nom del lloc ha de tenir una longitud superior a zero."
 msgid "You must have a valid contact email address."
 msgstr "Heu de tenir una adreça electrònica de contacte vàlida."
 
+#. TRANS: Client error displayed when a logo URL is not valid.
+msgid "Invalid logo URL."
+msgstr "L'URL del logotip no és vàlid."
+
+#. TRANS: Client error displayed when a SSL logo URL is invalid.
+msgid "Invalid SSL logo URL."
+msgstr "L'URL SSL del logotip no és vàlid."
+
 #. TRANS: Client error displayed trying to save site settings with an invalid language code.
 #. TRANS: %s is the invalid language code.
 #, php-format
@@ -5763,10 +5470,11 @@ msgid "Default language"
 msgstr "Llengua per defecte"
 
 #. TRANS: Dropdown title on site settings panel.
-msgid "Site language when autodetection from browser settings is not available"
+msgid ""
+"The site language when autodetection from browser settings is not available."
 msgstr ""
 "Llengua del lloc quan la detecció automàtica des de la configuració del "
-"navegador no està disponible"
+"navegador no està disponible."
 
 #. TRANS: Fieldset legend on site settings panel.
 msgctxt "LEGEND"
@@ -5791,9 +5499,21 @@ msgstr ""
 "Quant de temps cal que esperin els usuaris (en segons) per enviar el mateix "
 "de nou."
 
+#. TRANS: Fieldset legend for form to change logo.
+msgid "Logo"
+msgstr "Logotip"
+
+#. TRANS: Field label for StatusNet site logo.
+msgid "Site logo"
+msgstr "Logotip del lloc"
+
+#. TRANS: Field label for SSL StatusNet site logo.
+msgid "SSL logo"
+msgstr "Logotip SSL"
+
 #. TRANS: Button title for saving site settings.
-msgid "Save site settings"
-msgstr "Desa els paràmetres del lloc"
+msgid "Save the site settings."
+msgstr "Desa els paràmetres del lloc."
 
 #. TRANS: Page title for site-wide notice tab in admin panel.
 msgid "Site Notice"
@@ -5819,7 +5539,7 @@ msgstr "Text d'avís per a tot el lloc"
 msgid "Site-wide notice text (255 characters maximum; HTML allowed)"
 msgstr "Text d'avís per a tot el lloc (màxim 255 caràcters; es permet l'HTML)"
 
-#. TRANS: Title for button to save site notice in admin panel.
+#. TRANS: Button title to save site notice in admin panel.
 msgid "Save site notice."
 msgstr "Desa l'avís per a tot el lloc."
 
@@ -6015,7 +5735,7 @@ msgstr "Informa de l'URL"
 msgid "Snapshots will be sent to this URL."
 msgstr "Les instantànies s'enviaran a aquest URL."
 
-#. TRANS: Title for button to save snapshot settings.
+#. TRANS: Button title to save snapshot settings.
 msgid "Save snapshot settings."
 msgstr "Desa els paràmetres de les instantànies."
 
@@ -6048,10 +5768,6 @@ msgstr "%1$s subscriptors a l'espera d'aprovació, pàgina %2$d"
 msgid "A list of users awaiting approval to subscribe to you."
 msgstr "Una llista d'usuaris és a l'espera d'aprovació per a subscriure-vos."
 
-#. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
-msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
-msgstr "No podeu subscriure-us a un perfil remot OMB 0.1 amb aquesta acció."
-
 #. TRANS: Page title when subscription succeeded.
 msgid "Subscribed"
 msgstr "Subscrit"
@@ -6153,15 +5869,12 @@ msgid ""
 "You're not listening to anyone's notices right now, try subscribing to "
 "people you know. Try [people search](%%action.peoplesearch%%), look for "
 "members in groups you're interested in and in our [featured users](%%action."
-"featured%%). If you're a [Twitter user](%%action.twittersettings%%), you can "
-"automatically subscribe to people you already follow there."
+"featured%%)."
 msgstr ""
 "No esteu escoltant els avisos de ningú ara mateix, proveu de subscriure-us a "
 "gent que coneixeu. Proveu de [cercar gent](%%action.peoplesearch%%), trobar "
 "membres de grups en què esteu interessats i en els nostres [usuaris "
-"destacats](%%action.featured%%). Si sou un [usuari del Twitter](%%action."
-"twittersettings%%), podeu subscriure-us automàticament a gent que ja seguiu "
-"allà."
+"destacats](%%action.featured%%)."
 
 #. TRANS: Subscription list text when looking at the subscriptions for a of a user other
 #. TRANS: than the logged in user that has no subscriptions. %s is the user nickname.
@@ -6191,6 +5904,12 @@ msgstr "SMS"
 msgid "Notices tagged with %1$s, page %2$d"
 msgstr "Avisos etiquetats amb %1$s, pàgina %2$d"
 
+#. TRANS: Link label for feed on "notices with tag" page.
+#. TRANS: %s is the tag the feed is for.
+#, php-format
+msgid "Notice feed for tag %s (Activity Streams JSON)"
+msgstr "Canal d'avisos de l'etiqueta %s (fluxos d'activitat JSON)"
+
 #. TRANS: Link label for feed on "notices with tag" page.
 #. TRANS: %s is the tag the feed is for.
 #, php-format
@@ -6293,18 +6012,6 @@ msgstr "No subscrit"
 msgid "%1$s unsubscribed from list %2$s by %3$s"
 msgstr "%1$s han cancel·lat la subscripció de la llista %2$s per %3$s"
 
-#. TRANS: Client error displayed when trying to update profile with an incompatible license.
-#. TRANS: %1$s is the license incompatible with site license %2$s.
-#. TRANS: Exception thrown when licenses are not compatible for an authorisation request.
-#. TRANS: %1$s is the license for the listenee, %2$s is the license for "this" StatusNet site.
-#, php-format
-msgid ""
-"Listenee stream license \"%1$s\" is not compatible with site license \"%2$s"
-"\"."
-msgstr ""
-"La llicència del flux de qui escolteu, «%1$s», no és compatible amb la "
-"llicència del lloc, «%2$s»."
-
 #. TRANS: Title of URL settings tab in profile settings.
 msgid "URL settings"
 msgstr "Paràmetres d'URL"
@@ -6442,155 +6149,10 @@ msgstr "S'han habilitat les invitacions"
 msgid "Whether to allow users to invite new users."
 msgstr "Si es permet als usuaris invitar-ne de nous."
 
-#. TRANS: Title for button to save user settings in user admin panel.
+#. TRANS: Button title to save user settings in user admin panel.
 msgid "Save user settings."
 msgstr "Desa els paràmetres d'usuari."
 
-#. TRANS: Page title.
-msgid "Authorize subscription"
-msgstr "Autoritza la subscripció"
-
-#. TRANS: Page notice on "Authorize subscription" page.
-msgid ""
-"Please check these details to make sure that you want to subscribe to this "
-"user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
-"click \"Reject\"."
-msgstr ""
-"Reviseu aquests detalls per assegurar-vos que voleu subscriure-us als avisos "
-"d'aquest usuari. Si no heu demanat subscriure-us als avisos de ningú, feu "
-"clic a «Rebutja»."
-
-#. TRANS: Button text on Authorise Subscription page.
-#. TRANS: Submit button text to accept a group membership request on approve group form.
-#. TRANS: Submit button text to accept a subscription request on approve sub form.
-msgctxt "BUTTON"
-msgid "Accept"
-msgstr "Accepta"
-
-#. TRANS: Title for button on Authorise Subscription page.
-#. TRANS: Button title to subscribe to a user.
-msgid "Subscribe to this user."
-msgstr "Subscriu-me a aquest usuari"
-
-#. TRANS: Button text on Authorise Subscription page.
-#. TRANS: Submit button text to reject a group membership request on approve group form.
-#. TRANS: Submit button text to reject a subscription request on approve sub form.
-msgctxt "BUTTON"
-msgid "Reject"
-msgstr "Rebutja"
-
-#. TRANS: Title for button on Authorise Subscription page.
-msgid "Reject this subscription."
-msgstr "Rebutja la subscripció."
-
-#. TRANS: Client error displayed for an empty authorisation request.
-msgid "No authorization request!"
-msgstr "No és una sol·licitud d'autorització!"
-
-#. TRANS: Accept message header from Authorise subscription page.
-msgid "Subscription authorized"
-msgstr "Subscripció autoritzada"
-
-#. TRANS: Accept message text from Authorise subscription page.
-msgid ""
-"The subscription has been authorized, but no callback URL was passed. Check "
-"with the site's instructions for details on how to authorize the "
-"subscription. Your subscription token is:"
-msgstr ""
-"S'ha autoritzat la subscripció, però no s'ha enviat cap URL de la crida de "
-"retorn. Reviseu les instruccions del lloc per tal de tenir més detalls de "
-"com autoritzar la subscripció. El vostre testimoni de subscripció és:"
-
-#. TRANS: Reject message header from Authorise subscription page.
-msgid "Subscription rejected"
-msgstr "Subscripció rebutjada"
-
-#. TRANS: Reject message from Authorise subscription page.
-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 cap URL de la crida de "
-"retorn. Reviseu les instruccions del lloc per tal de tenir més detalls de "
-"com rebutjar la subscripció completament."
-
-#. TRANS: Exception thrown when no valid user is found for an authorisation request.
-#. TRANS: %s is a listener URI.
-#, php-format
-msgid "Listener URI \"%s\" not found here."
-msgstr "No s'hi ha trobat aquí l'URI de qui us escolta, «%s»."
-
-#. TRANS: Exception thrown when listenee URI is too long for an authorisation request.
-#. TRANS: %s is a listenee URI.
-#, php-format
-msgid "Listenee URI \"%s\" is too long."
-msgstr "L'URI de qui escolteu, «%s», és massa llarga."
-
-#. TRANS: Exception thrown when listenee URI is a local user for an authorisation request.
-#. TRANS: %s is a listenee URI.
-#, php-format
-msgid "Listenee URI \"%s\" is a local user."
-msgstr "L'URI de qui escolteu, «%s», és un usuari local."
-
-#. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
-#. TRANS: %s is a profile URL.
-#, php-format
-msgid "Profile URL \"%s\" is for a local user."
-msgstr "L'URL del perfil «%s» és per a un usuari local."
-
-#. TRANS: Exception thrown when avatar URL is invalid for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#, php-format
-msgid "Avatar URL \"%s\" is not valid."
-msgstr "L'URL de l'avatar «%s» no és vàlid."
-
-#. TRANS: Exception thrown when avatar URL could not be read for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#, php-format
-msgid "Cannot read avatar URL \"%s\"."
-msgstr "No es pot llegir l'URL de l'avatar «%s»."
-
-#. TRANS: Exception thrown when avatar URL return an invalid image type for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#, php-format
-msgid "Wrong image type for avatar URL \"%s\"."
-msgstr "Tipus d'imatge incorrecta per a l'URL de l'avatar «%s»."
-
-#. TRANS: Title for profile design page.
-#. TRANS: Page title for profile design page.
-msgid "Profile design"
-msgstr "Disseny del perfil"
-
-#. TRANS: Instructions for Profile design page.
-#. TRANS: Instructions for profile design page.
-msgid ""
-"Customize the way your profile looks with a background image and a colour "
-"palette of your choice."
-msgstr ""
-"Personalitzeu l'aspecte del vostre perfil amb una imatge de fons o una "
-"paleta de colors de la vostra elecció."
-
-#. TRANS: Succes message on Profile design page when finding an easter egg.
-msgid "Enjoy your hotdog!"
-msgstr "Gaudiu de l'entrepà!"
-
-#. TRANS: Form legend on Profile design page.
-msgid "Design settings"
-msgstr "Paràmetres de disseny"
-
-#. TRANS: Checkbox label on Profile design page.
-msgid "View profile designs"
-msgstr "Visualitza els dissenys de perfil"
-
-#. TRANS: Title for checkbox on Profile design page.
-msgid "Show or hide profile designs."
-msgstr "Mostra o amaga els dissenys de perfil."
-
-#. TRANS: Form legend on Profile design page for form to choose a background image.
-msgid "Background file"
-msgstr "Fitxer de fons"
-
 #. TRANS: Page title for all but the first page of groups for a user.
 #. TRANS: %1$s is a nickname, %2$d is a page number.
 #, php-format
@@ -6631,10 +6193,10 @@ msgstr "StatusNet %s"
 #. TRANS: %1$s is the engine name (StatusNet) and %2$s is the StatusNet version.
 #, php-format
 msgid ""
-"This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, "
+"This site is powered by %1$s version %2$s, Copyright 2008-2011 StatusNet, "
 "Inc. and contributors."
 msgstr ""
-"El lloc funciona gràcies a %1$s versió %2$s. Copyright 2008-2010 StatusNet, "
+"El lloc funciona gràcies a %1$s versió %2$s. Copyright 2008-2011 StatusNet, "
 "Inc. i col·laboradors."
 
 #. TRANS: Header for StatusNet contributors section on the version page.
@@ -6650,24 +6212,24 @@ msgid ""
 "StatusNet is free software: you can redistribute it and/or modify it under "
 "the terms of the GNU Affero General Public License as published by the Free "
 "Software Foundation, either version 3 of the License, or (at your option) "
-"any later version. "
+"any later version."
 msgstr ""
-"L'StatusNet és programari lliure; podeu redistribuir-lo i/o modificar-lo "
+"L'StatusNet és programari lliure: podeu redistribuir-lo i/o modificar-lo "
 "d'acord amb els termes de la llicència GNU Affero General Public License tal "
-"i com la publica la Free Software Foundation; tant per a la versió 3 de la "
-"llicència, com (a la vostra discreció) per a una versió posterior. "
+"com la publica la Free Software Foundation; tant per a la versió 3 de la "
+"llicència, com (a la vostra discreció) per a qualsevol versió posterior."
 
 #. TRANS: Content part of StatusNet version page.
 msgid ""
 "This program is distributed in the hope that it will be useful, but WITHOUT "
 "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
 "FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License "
-"for more details. "
+"for more details."
 msgstr ""
-"Aquest programa es distribueix amb la voluntat que sigui útil, perquè sense "
+"Aquest programa es distribueix amb la voluntat que sigui útil, però sense "
 "cap mena de garantia; sense tampoc cap garantia implícita respecte a la seva "
 "comercialització o idoneïtat per a cap propòsit en particular. Consulteu la "
-"llicència GNU Affero General Public License per a més detalls. "
+"llicència GNU Affero General Public License per a més detalls."
 
 #. TRANS: Content part of StatusNet version page.
 #. TRANS: %s is a link to the AGPL license with link description "http://www.gnu.org/licenses/agpl.html".
@@ -6722,22 +6284,32 @@ msgstr "No es pot processar l'URL «%s»"
 msgid "Robin thinks something is impossible."
 msgstr "El Robin pensa que quelcom és impossible."
 
+#. TRANS: Message used to be inserted as %2$s in  the text "No file may
+#. TRANS: be larger than %1$d byte and the file you sent was %2$s.".
+#. TRANS: %1$d is the number of bytes of an uploaded file.
+#, php-format
+msgid "%1$d byte"
+msgid_plural "%1$d bytes"
+msgstr[0] "%1$d byte"
+msgstr[1] "%1$d bytes"
+
 #. TRANS: Message given if an upload is larger than the configured maximum.
-#. TRANS: %1$d is the byte limit for uploads, %2$d is the byte count for the uploaded file.
-#. TRANS: %1$s is used for plural.
+#. TRANS: %1$d (used for plural) is the byte limit for uploads,
+#. TRANS: %2$s is the proper form of "n bytes". This is the only ways to have
+#. TRANS: gettext support multiple plurals in the same message, unfortunately...
 #, php-format
 msgid ""
-"No file may be larger than %1$d byte and the file you sent was %2$d bytes. "
-"Try to upload a smaller version."
+"No file may be larger than %1$d byte and the file you sent was %2$s. Try to "
+"upload a smaller version."
 msgid_plural ""
-"No file may be larger than %1$d bytes and the file you sent was %2$d bytes. "
-"Try to upload a smaller version."
+"No file may be larger than %1$d bytes and the file you sent was %2$s. Try to "
+"upload a smaller version."
 msgstr[0] ""
-"Cap fitxer pot ser major de %1$d byte i el fitxer que heu enviat era de %2$d "
-"bytes. Proveu de pujar una versió de mida menor."
+"Cap fitxer pot ser major de %1$d byte i el fitxer que heu enviat n'era d'%2"
+"$s. Proveu de pujar una versió de mida menor."
 msgstr[1] ""
-"Cap fitxer pot ser major de %1$d bytes i el fitxer que heu enviat era de %2"
-"$d bytes. Proveu de pujar una versió de mida menor."
+"Cap fitxer pot ser major de %1$d bytes i el fitxer que heu enviat n'era de %2"
+"$s bytes. Proveu de pujar una versió de mida menor."
 
 #. TRANS: Message given if an upload would exceed user quota.
 #. TRANS: %d (number) is the user quota in bytes and is used for plural.
@@ -6807,6 +6379,11 @@ msgstr "No s'ha pogut actualitzar el grup local."
 msgid "Could not create login token for %s"
 msgstr "No s'ha pogut crear un testimoni d'inici de sessió per a %s"
 
+#. TRANS: Exception thrown when a program code class (%s) cannot be instantiated.
+#, php-format
+msgid "Cannot instantiate class %s."
+msgstr "No es pot instanciar la classe %s."
+
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.
 msgid "No database name or DSN found anywhere."
 msgstr "No s'ha trobat el nom de la base de dades o el DSN enlloc."
@@ -6965,10 +6542,10 @@ msgstr ""
 #, php-format
 msgid ""
 "You already have %1$d or more people in list %2$s, which is the maximum "
-"allowed number.Try unlisting others first."
+"allowed number. Try unlisting others first."
 msgstr ""
 "Ja teniu %1$d o més persones a la llista %2$s, que és el nombre màxim "
-"permès. Proveu de treure'n de la llista uns quants primer."
+"permès. Proveu de treure'n de la llista uns altres primer."
 
 #. TRANS: Exception thrown when inserting a list subscription in the database fails.
 msgid "Adding list subscription failed."
@@ -6987,7 +6564,6 @@ msgid "Unable to save tag."
 msgstr "No s'ha pogut desar l'etiqueta."
 
 #. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
-#. TRANS: Error message displayed to a banned user when they try to subscribe.
 msgid "You have been banned from subscribing."
 msgstr "Se us ha banejat la subscripció."
 
@@ -7007,10 +6583,6 @@ msgstr "No hi esteu subscrit!"
 msgid "Could not delete self-subscription."
 msgstr "No s'ha pogut eliminar l'autosubscripció."
 
-#. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
-msgid "Could not delete subscription OMB token."
-msgstr "No s'ha pogut eliminar el testimoni OMB de la subscripció."
-
 #. TRANS: Exception thrown when a subscription could not be deleted on the server.
 msgid "Could not delete subscription."
 msgstr "No s'ha pogut eliminar la subscripció."
@@ -7044,6 +6616,18 @@ msgstr "No s'ha definit cap usuari únic per al mode d'usuari únic."
 msgid "Single-user mode code called when not enabled."
 msgstr "S'ha cridat el codi del mode d'únic usuari quan no està habilitat."
 
+#. TRANS: Information on password recovery form if no known username or e-mail address was specified.
+msgid "No user with that email address or username."
+msgstr "No hi ha cap usuari amb aquesta direcció o usuari."
+
+#. TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.
+msgid "No registered email address for that user."
+msgstr "No hi ha cap adreça de correu electrònic registrada d'aquest usuari."
+
+#. TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.
+msgid "Error saving address confirmation."
+msgstr "S'ha produït un error en desar la confirmació de l'adreça."
+
 #. TRANS: Server exception thrown when creating a group failed.
 msgid "Could not create group."
 msgstr "No s'ha pogut crear el grup."
@@ -7317,25 +6901,11 @@ msgstr "El showForm() no està implementat."
 msgid "saveSettings() not implemented."
 msgstr "El saveSettings() no està implementat."
 
-#. TRANS: Client error message thrown if design settings could not be deleted in
-#. TRANS: the admin panel Design.
-msgid "Unable to delete design setting."
-msgstr "No s'ha pogut eliminar el paràmetre de disseny."
-
 #. TRANS: Header in administrator navigation panel.
-#. TRANS: Header in settings navigation panel.
 msgctxt "HEADER"
 msgid "Home"
 msgstr "Inici"
 
-#. TRANS: Menu item in administrator navigation panel.
-#. TRANS: Menu item in default local navigation panel.
-#. TRANS: Menu item in personal group navigation menu.
-#. TRANS: Menu item in settings navigation panel.
-msgctxt "MENU"
-msgid "Home"
-msgstr "Inici"
-
 #. TRANS: Header in administrator navigation panel.
 msgctxt "HEADER"
 msgid "Admin"
@@ -7350,17 +6920,6 @@ msgctxt "MENU"
 msgid "Site"
 msgstr "Lloc"
 
-#. TRANS: Menu item title in administrator navigation panel.
-msgid "Design configuration"
-msgstr "Configuració del disseny"
-
-#. TRANS: Menu item in administrator navigation panel.
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: Menu item in settings navigation panel.
-msgctxt "MENU"
-msgid "Design"
-msgstr "Disseny"
-
 #. TRANS: Menu item title in administrator navigation panel.
 msgid "User configuration"
 msgstr "Configuració de l'usuari"
@@ -7460,42 +7019,6 @@ msgstr "No hi ha cap usuari per aquest testimoni."
 msgid "Could not authenticate you."
 msgstr "No se us ha pogut autenticar."
 
-#. TRANS: Server error displayed when trying to create an anynymous OAuth consumer.
-msgid "Could not create anonymous consumer."
-msgstr "No s'ha pogut crear un consumidor anònim."
-
-#. TRANS: Server error displayed when trying to create an anynymous OAuth application.
-msgid "Could not create anonymous OAuth application."
-msgstr "No s'ha pogut crear l'aplicació OAuth anònima."
-
-#. TRANS: Exception thrown when no token association could be found.
-msgid ""
-"Could not find a profile and application associated with the request token."
-msgstr ""
-"No s'ha pogut trobar un perfil i una aplicació associada amb el testimoni "
-"sol·licitat."
-
-#. TRANS: Exception thrown when no access token can be issued.
-msgid "Could not issue access token."
-msgstr "No s'ha pogut emetre un testimoni d'accés."
-
-#. TRANS: Exception thrown when a database error occurs.
-msgid "Database error inserting OAuth application user."
-msgstr "Error de la base de dades en inserir l'usuari de l'aplicació OAuth."
-
-#. TRANS: Exception thrown when a database error occurs.
-msgid "Database error updating OAuth application user."
-msgstr ""
-"Error de la base de dades en actualitzar l'usuari de l'aplicació OAuth."
-
-#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
-msgid "Tried to revoke unknown token."
-msgstr "S'ha provat de revocar el testimoni desconegut."
-
-#. TRANS: Exception thrown when an attempt is made to remove a revoked token.
-msgid "Failed to delete revoked token."
-msgstr "No s'ha pogut suprimir el testimoni revocat."
-
 #. TRANS: Form input field label for application icon.
 msgid "Icon"
 msgstr "Icona"
@@ -7577,13 +7100,12 @@ msgstr ""
 "Accés per defecte per a l'aplicació: només lectura, o lectura i escriptura"
 
 #. TRANS: Submit button title.
-msgid "Cancel"
-msgstr "Cancel·la"
+msgid "Cancel application changes."
+msgstr "Cancel·la els canvis d'aplicació."
 
 #. TRANS: Submit button title.
-#. TRANS: Button text to save a list.
-msgid "Save"
-msgstr "Desa"
+msgid "Save application changes."
+msgstr "Desa els canvis d'aplicació."
 
 #. TRANS: Name for an anonymous application in application list.
 msgid "Unknown application"
@@ -7618,6 +7140,18 @@ msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "Revoca"
 
+#. TRANS: Submit button text to accept a group membership request on approve group form.
+#. TRANS: Submit button text to accept a subscription request on approve sub form.
+msgctxt "BUTTON"
+msgid "Accept"
+msgstr "Accepta"
+
+#. TRANS: Submit button text to reject a group membership request on approve group form.
+#. TRANS: Submit button text to reject a subscription request on approve sub form.
+msgctxt "BUTTON"
+msgid "Reject"
+msgstr "Rebutja"
+
 #. TRANS: Atom feed exception thrown when an author element does not contain a name element.
 msgid "Author element must contain a name element."
 msgstr "L'element autor ha de contenir un element nom."
@@ -8169,6 +7703,11 @@ msgstr "Podeu voler executar l'instal·lador per corregir-ho."
 msgid "Go to the installer."
 msgstr "Vés a l'instal·lador."
 
+#. TRANS: Header on conversation page. Hidden by default (h2).
+#. TRANS: Label for user statistics.
+msgid "Notices"
+msgstr "Avisos"
+
 #. TRANS: Page title for when a database error occurs.
 msgid "Database error"
 msgstr "Error de la base de dades"
@@ -8179,13 +7718,6 @@ msgctxt "MENU"
 msgid "Public"
 msgstr "Públic"
 
-#. TRANS: Menu item in default local navigation panel.
-#. TRANS: Menu item in search group navigation panel.
-#. TRANS: Menu item in local navigation menu.
-msgctxt "MENU"
-msgid "Groups"
-msgstr "Grups"
-
 #. TRANS: Menu item in default local navigation panel.
 #. TRANS: Menu item title in local navigation menu.
 msgctxt "MENU"
@@ -8201,51 +7733,12 @@ msgstr "Elimina"
 msgid "Delete this user"
 msgstr "Elimina l'usuari"
 
-#. TRANS: Form legend of form for changing the page design.
-msgid "Change design"
-msgstr "Canvia el disseny"
-
-#. TRANS: Fieldset legend on profile design page to change profile page colours.
-msgid "Change colours"
-msgstr "Canvia els colors"
-
-#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-msgid "Use defaults"
-msgstr "Utilitza els paràmetres per defecte"
-
-#. TRANS: Label in form on profile design page.
-#. TRANS: Field contains file name on user's computer that could be that user's custom profile background image.
-msgid "Upload file"
-msgstr "Puja un fitxer"
-
-#. TRANS: Instructions for form on profile design page.
-msgid ""
-"You can upload your personal background image. The maximum file size is 2MB."
-msgstr ""
-"Podeu pujar la vostra imatge de fons personal. La mida màxima del fitxer és "
-"2MB."
-
-#. TRANS: Radio button on profile design page that will enable use of the uploaded profile image.
-msgctxt "RADIO"
-msgid "On"
-msgstr "Activada"
-
-#. TRANS: Radio button on profile design page that will disable use of the uploaded profile image.
-msgctxt "RADIO"
-msgid "Off"
-msgstr "Desactivada"
-
-#. TRANS: Success message displayed if design settings were saved after clicking "Use defaults".
-msgid "Design defaults restored."
-msgstr "S'han restaurat els paràmetres de disseny per defecte."
-
 #. TRANS: Exception. %s is an ID.
 #, php-format
 msgid "Unable to find services for %s."
 msgstr "No s'han pogut trobar els serveis de %s."
 
 #. TRANS: Form legend for removing the favourite status for a favourite notice.
-#. TRANS: Title for button text for removing the favourite status for a favourite notice.
 msgid "Disfavor this notice"
 msgstr "Deixa de tenir com a preferit aquest avís"
 
@@ -8254,8 +7747,11 @@ msgctxt "BUTTON"
 msgid "Disfavor favorite"
 msgstr "Fes que deixi de ser preferit"
 
+#. TRANS: Button title for removing the favourite status for a favourite notice.
+msgid "Remove this notice from your list of favorite notices."
+msgstr "Elimina aquest avís de la vostra llista d'avisos preferits."
+
 #. TRANS: Form legend for adding the favourite status to a notice.
-#. TRANS: Title for button text for adding the favourite status to a notice.
 msgid "Favor this notice"
 msgstr "Fes preferit aquest avís"
 
@@ -8264,6 +7760,10 @@ msgctxt "BUTTON"
 msgid "Favor"
 msgstr "Preferit"
 
+#. TRANS: Button title for adding the favourite status to a notice.
+msgid "Add this notice to your list of favorite notices."
+msgstr "Afegeix aquest avís a la vostra llista d'avisos preferits."
+
 #. TRANS: Feed type name.
 msgid "RSS 1.0"
 msgstr "RSS 1.0"
@@ -8280,6 +7780,10 @@ msgstr "Atom"
 msgid "FOAF"
 msgstr "FOAF"
 
+#. TRANS: Feed type name. See http://activitystrea.ms/
+msgid "Activity Streams"
+msgstr "Fluxos d'activitat"
+
 #. TRANS: Client exception thrown when an imported feed does not have an author.
 msgid "No author in the feed."
 msgstr "No hi ha cap autor al canal."
@@ -8311,6 +7815,27 @@ msgstr "Trieu una etiqueta per escurçar la llista"
 msgid "Grant this user the \"%s\" role"
 msgstr "Atorga a l'usuari el rol «%s»"
 
+#. TRANS: Header for mini list of group members on a group page (h2).
+msgid "Members"
+msgstr "Membres"
+
+#. TRANS: Link to all group members from mini list of group members if group has more than n members.
+msgid "All members"
+msgstr "Tots els membres"
+
+#. TRANS: Header for mini list of users with a pending membership request on a group page (h2).
+msgid "Pending"
+msgstr "Pendent"
+
+#. TRANS: Header for mini list of users that are blocked in a group page (h2).
+msgid "Blocked"
+msgstr "Blocat"
+
+#. TRANS: Title for list of group administrators on a group page.
+msgctxt "TITLE"
+msgid "Admins"
+msgstr "Administradors"
+
 #. TRANS: Button text for the form that will block a user from a group.
 msgctxt "BUTTON"
 msgid "Block"
@@ -8318,8 +7843,8 @@ msgstr "Bloca"
 
 #. TRANS: Submit button title.
 msgctxt "TOOLTIP"
-msgid "Block this user"
-msgstr "Bloca aquest usuari"
+msgid "Block this user so that they can no longer post messages to it."
+msgstr "Bloca l'usuari per tal que no pugui tornar a publicar-hi missatges."
 
 #. TRANS: Field title on group edit form.
 msgid "URL of the homepage or blog of the group or topic."
@@ -8375,63 +7900,9 @@ msgctxt "GROUPADMIN"
 msgid "Admin"
 msgstr "Administrador"
 
-#. TRANS: Menu item in the group navigation page.
-msgctxt "MENU"
-msgid "Group"
-msgstr "Grup"
-
-#. TRANS: Tooltip for menu item in the group navigation page.
-#. TRANS: %s is the nickname of the group.
-#, php-format
-msgctxt "TOOLTIP"
-msgid "%s group"
-msgstr "Grup %s"
-
-#. TRANS: Menu item in the group navigation page.
-msgctxt "MENU"
-msgid "Members"
-msgstr "Membres"
-
-#. TRANS: Tooltip for menu item in the group navigation page.
-#. TRANS: %s is the nickname of the group.
-#, php-format
-msgctxt "TOOLTIP"
-msgid "%s group members"
-msgstr "Membres del grup %s"
-
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: %d is the number of pending members.
-#, php-format
-msgctxt "MENU"
-msgid "Pending members (%d)"
-msgid_plural "Pending members (%d)"
-msgstr[0] "Membres pendents (%d)"
-msgstr[1] "Membres pendents (%d)"
-
-#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: %s is the nickname of the group.
-#, php-format
-msgctxt "TOOLTIP"
-msgid "%s pending members"
-msgstr "%s membres pendents"
-
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-msgctxt "MENU"
-msgid "Blocked"
-msgstr "Blocats"
-
-#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: %s is the nickname of the group.
-#, php-format
-msgctxt "TOOLTIP"
-msgid "%s blocked users"
-msgstr "%s usuaris blocats"
-
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: Menu item in primary navigation panel.
-msgctxt "MENU"
-msgid "Admin"
-msgstr "Administrador"
+#. TRANS: Group actions header (h2). Text hidden by default.
+msgid "Group actions"
+msgstr "Accions del grup"
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
@@ -8440,11 +7911,6 @@ msgctxt "TOOLTIP"
 msgid "Edit %s group properties"
 msgstr "Edita les propietats del grup %s"
 
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-msgctxt "MENU"
-msgid "Logo"
-msgstr "Logotip"
-
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
 #, php-format
@@ -8452,16 +7918,10 @@ msgctxt "TOOLTIP"
 msgid "Add or edit %s logo"
 msgstr "Afegeix o edita el logotip de %s"
 
-#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: %s is the nickname of the group.
-#, php-format
-msgctxt "TOOLTIP"
-msgid "Add or edit %s design"
-msgstr "Afegeix o edita el disseny de %s"
-
-#. TRANS: Group actions header (h2). Text hidden by default.
-msgid "Group actions"
-msgstr "Accions del grup"
+#. TRANS: Link text for link on user profile.
+msgctxt "MENU"
+msgid "Logo"
+msgstr "Logotip"
 
 #. TRANS: Title for groups with the most members section.
 msgid "Popular groups"
@@ -8471,11 +7931,19 @@ msgstr "Grups populars"
 msgid "Active groups"
 msgstr "Grups actius"
 
-#. TRANS: Title for group tag cloud section.
-#. TRANS: %s is a group name.
-#, php-format
-msgid "Tags in %s group's notices"
-msgstr "Etiquetes en els avisos del grup %s"
+#. TRANS: Link description for seeing all groups.
+#. TRANS: Link description for seeing all lists.
+msgid "See all"
+msgstr "Mostra-ho tot"
+
+#. TRANS: Link title for seeing all groups.
+msgid "See all groups you belong to."
+msgstr "Mostra tots els grups en què pertanyeu."
+
+#. TRANS: Menu item title in personal group navigation menu.
+#. TRANS: %s is a username.
+msgid "Back to top"
+msgstr "Torna a dalt"
 
 #. TRANS: Client exception 406
 msgid "This page is not available in a media type you accept"
@@ -8565,11 +8033,41 @@ msgctxt "TITLE"
 msgid "Trends"
 msgstr "Tendències"
 
-#. TRANS: Button text for inviting more users to the StatusNet instance.
+#. TRANS: Default button text for inviting more users to the StatusNet instance.
 msgctxt "BUTTON"
 msgid "Invite more colleagues"
 msgstr "Convida més companys"
 
+#. TRANS: Form legend.
+msgid "Invite collegues"
+msgstr "Convida els col·legues"
+
+#. TRANS: Field label for a list of e-mail addresses.
+msgid "Email addresses"
+msgstr "Adreces de correu electrònic"
+
+#. TRANS: Field title for a list of e-mail addresses.
+msgid "Addresses of friends to invite (one per line)."
+msgstr "Adreces d'amics per convidar (una per línia)."
+
+#. TRANS: Field label for a personal message to send to invitees.
+msgid "Personal message"
+msgstr "Missatge personal"
+
+#. TRANS: Field title for a personal message to send to invitees.
+msgid "Optionally add a personal message to the invitation."
+msgstr "Opcionalment podeu afegir un missatge a la invitació."
+
+#. TRANS: Send button for inviting friends
+#. TRANS: Button text for sending notice.
+msgctxt "BUTTON"
+msgid "Send"
+msgstr "Envia"
+
+#. TRANS: Submit button title.
+msgid "Send invitations."
+msgstr "Envia invitacions."
+
 #. TRANS: Button text for joining a group.
 msgctxt "BUTTON"
 msgid "Join"
@@ -8580,6 +8078,10 @@ msgctxt "BUTTON"
 msgid "Leave"
 msgstr "Deixa"
 
+#. TRANS: Link title for seeing all lists.
+msgid "See all lists you have created."
+msgstr "Mostra totes les llistes que heu creat."
+
 #. TRANS: Menu item for logging in to the StatusNet site.
 #. TRANS: Menu item in primary navigation panel.
 msgctxt "MENU"
@@ -8639,8 +8141,8 @@ msgstr "Hola, %1$s.\n"
 #. TRANS: Main body of new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscriber's long name, %2$s is the StatusNet sitename.
 #, php-format
-msgid "%1$s is now listening to your notices on %2$s."
-msgstr "%1$s ara està escoltant els vostres avisos a %2$s."
+msgid "%1$s is now following you on %2$s."
+msgstr "%1$s ara està seguint-vos a %2$s."
 
 #. TRANS: Subject of pending new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscribing user's nickname, %2$s is the StatusNet sitename.
@@ -8864,7 +8366,7 @@ msgstr "%1$s (@%2$s) us ha enviat un avís a la vostra atenció"
 #. TRANS: Body of @-reply notification e-mail.
 #. TRANS: %1$s is the sending user's name, $2$s is the StatusNet sitename,
 #. TRANS: %3$s is a URL to the notice, %4$s is the notice text,
-#. TRANS: %5$s is a URL to the full conversion if it exists (otherwise empty),
+#. TRANS: %5$s is the text "The full conversation can be read here:" and a URL to the full conversion if it exists (otherwise empty),
 #. TRANS: %6$s is a URL to reply to the notice, %7$s is a URL to all @-replies for the addressed user,
 #, php-format
 msgid ""
@@ -8907,6 +8409,10 @@ msgstr ""
 
 #. TRANS: Subject of group join notification e-mail.
 #. TRANS: %1$s is the joining user's nickname, %2$s is the group name, and %3$s is the StatusNet sitename.
+#, php-format
+msgid "%1$s has joined your group %2$s on %3$s"
+msgstr "%1$s s'ha unit al grup %2$s a %3$s"
+
 #. TRANS: Main body of group join notification e-mail.
 #. TRANS: %1$s is the subscriber's long name, %2$s is the group name, and %3$s is the StatusNet sitename,
 #. TRANS: %4$s is a block of profile info about the subscriber.
@@ -8996,8 +8502,8 @@ msgstr "Fes-lo administrador"
 
 #. TRANS: Submit button title.
 msgctxt "TOOLTIP"
-msgid "Make this user an admin"
-msgstr "Fes aquest usuari administrador"
+msgid "Make this user an admin."
+msgstr "Fes aquest usuari administrador."
 
 #. TRANS: Client exception thrown when a database error was thrown during a file upload operation.
 msgid "There was a database error while saving your file. Please try again."
@@ -9046,7 +8552,7 @@ msgstr "Envia un avís directe"
 msgid "Select recipient:"
 msgstr "Seleccioneu el destinatari"
 
-#. TRANS Entry in drop-down selection box in direct-message inbox/outbox when no one is available to message.
+#. TRANS: Entry in drop-down selection box in direct-message inbox/outbox when no one is available to message.
 msgid "No mutual subscribers."
 msgstr "No teniu subscriptors mutus."
 
@@ -9113,6 +8619,10 @@ msgstr "No se sap gestionar aquest tipus d'objectiu."
 msgid "You must implement either adaptNoticeListItem() or showNotice()."
 msgstr "Heu d'implementar adaptNoticeListItem() o bé showNotice()."
 
+#. TRANS: Link description to show more items in a list.
+msgid "More â–¼"
+msgstr "Més ▼"
+
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 msgid "Nickname cannot be empty."
 msgstr "El sobrenom no pot estar en blanc."
@@ -9162,10 +8672,6 @@ msgctxt "SEPARATOR"
 msgid ", "
 msgstr ", "
 
-#. TRANS: Start of profile addressees list.
-msgid " â–¸ "
-msgstr " â–¸ "
-
 #. TRANS: Used in coordinates as abbreviation of north.
 msgid "N"
 msgstr "N"
@@ -9204,16 +8710,16 @@ msgid "Repeated by"
 msgstr "Repetit per"
 
 #. TRANS: Link title in notice list item to reply to a notice.
-msgid "Reply to this notice"
-msgstr "Respon a aquest avís"
+msgid "Reply to this notice."
+msgstr "Respon a aquest avís."
 
 #. TRANS: Link text in notice list item to reply to a notice.
 msgid "Reply"
 msgstr "Respon"
 
 #. TRANS: Link title in notice list item to delete a notice.
-msgid "Delete this notice"
-msgstr "Elimina aquest avís"
+msgid "Delete this notice from the timeline."
+msgstr "Elimina l'avís de la línia temporal."
 
 #. TRANS: Title for repeat form status in notice list when a notice has been repeated.
 msgid "Notice repeated."
@@ -9236,26 +8742,6 @@ msgstr "Crida l'atenció"
 msgid "Send a nudge to this user."
 msgstr "Crida l'atenció a l'usuari."
 
-#. TRANS: Exception thrown when creating a new profile fails in OAuth store.
-msgid "Error inserting new profile."
-msgstr "S'ha produït un error en inserir un perfil nou."
-
-#. TRANS: Exception thrown when creating a new avatar fails in OAuth store.
-msgid "Error inserting avatar."
-msgstr "S'ha produït un error en inserir un avatar."
-
-#. TRANS: Exception thrown when creating a remote profile fails in OAuth store.
-msgid "Error inserting remote profile."
-msgstr "S'ha produït un error en inserir un perfil remot."
-
-#. TRANS: Exception thrown when a notice is denied because it has been sent before.
-msgid "Duplicate notice."
-msgstr "Avís duplicat."
-
-#. TRANS: Exception thrown when creating a new subscription fails in OAuth store.
-msgid "Could not insert new subscription."
-msgstr "No s'ha pogut inserir una nova subscripció."
-
 #. TRANS: Server exception thrown in oEmbed action if no API endpoint is available.
 msgid "No oEmbed API endpoint available."
 msgstr "No hi ha cap punt d'enllaç oEmbed disponible."
@@ -9333,10 +8819,6 @@ msgstr "Edita"
 msgid "Edit %s list by you."
 msgstr "Edita la llista %s que heu creat."
 
-#. TRANS: Link description for link to list of users tagged with a tag.
-msgid "Tagged"
-msgstr "Etiquetat"
-
 #. TRANS: Title for link to edit list settings.
 msgid "Edit list settings."
 msgstr "Edita els paràmetres de la llista."
@@ -9479,10 +8961,11 @@ msgctxt "plugin"
 msgid "Enable"
 msgstr "Habilita"
 
+#. TRANS: Plugin description for a disabled plugin.
 msgctxt "plugin-description"
-msgid "(Plugin descriptions unavailable when disabled.)"
-msgstr ""
-"(Les descripcions dels connectors no són disponibles en ser inhabiitats.)"
+msgid ""
+"(The plugin description is unavailable when a plugin has been disabled.)"
+msgstr "(La descripció del connector no és disponible en ser inhabilitat.)"
 
 #. TRANS: Menu item in primary navigation panel.
 msgctxt "MENU"
@@ -9493,6 +8976,11 @@ msgstr "Paràmetres"
 msgid "Change your personal settings."
 msgstr "Canvieu els vostres paràmetres personals"
 
+#. TRANS: Menu item in primary navigation panel.
+msgctxt "MENU"
+msgid "Admin"
+msgstr "Administrador"
+
 #. TRANS: Menu item title in primary navigation panel.
 msgid "Site configuration."
 msgstr "Configuració del lloc"
@@ -9510,14 +8998,8 @@ msgstr "Finalitza la sessió del lloc"
 msgid "Login to the site."
 msgstr "Inicia una sessió al lloc"
 
-#. TRANS: Menu item in primary navigation panel.
-msgctxt "MENU"
-msgid "Search"
-msgstr "Cerca"
-
-#. TRANS: Menu item title in primary navigation panel.
-msgid "Search the site."
-msgstr "Cerca al lloc"
+msgid "This profile has been silenced by site moderators"
+msgstr "Aquest perfil ha estat silenciat pels moderadors del lloc"
 
 #. TRANS: H2 text for user subscription statistics.
 msgid "Following"
@@ -9527,6 +9009,10 @@ msgstr "Seguint"
 msgid "Followers"
 msgstr "Seguidors"
 
+#. TRANS: H2 text for user statistics.
+msgid "Statistics"
+msgstr "Estadístiques"
+
 #. TRANS: Label for user statistics.
 msgid "User ID"
 msgstr "ID de l'usuari"
@@ -9535,10 +9021,6 @@ msgstr "ID de l'usuari"
 msgid "Member since"
 msgstr "Membre des de"
 
-#. TRANS: Label for user statistics.
-msgid "Notices"
-msgstr "Avisos"
-
 #. TRANS: Label for user statistics.
 #. TRANS: Average count of posts made per day since account registration.
 msgid "Daily average"
@@ -9624,13 +9106,13 @@ msgid "Keyword(s)"
 msgstr "Paraules clau"
 
 #. TRANS: Button text for searching site.
+#. TRANS: Button text for search button on search form.
 #. TRANS: Button text to search profiles.
 msgctxt "BUTTON"
 msgid "Search"
 msgstr "Cerca"
 
 #. TRANS: Standard search suggestions shown when a search does not give any results.
-#, fuzzy
 msgid ""
 "* Make sure all words are spelled correctly.\n"
 "* Try different keywords.\n"
@@ -9640,10 +9122,10 @@ msgstr ""
 "* Assegureu-vos que totes les paraules estan ben escrites.\n"
 "* Proveu paraules clau diferents.\n"
 "* Proveu paraules clau més generals.\n"
-"* Proveu menys paraules clau.\n"
+"* Proveu menys paraules clau."
 
 #. TRANS: Standard search suggestions shown when a search does not give any results.
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "You can also try your search on other engines:\n"
 "\n"
@@ -9654,7 +9136,6 @@ msgid ""
 "* [Yahoo](http://search.yahoo.com/search?p=site%%3A%%%%site.server%%%%+%s)\n"
 "* [Collecta](http://collecta.com/#q=%s)"
 msgstr ""
-"\n"
 "També podeu provar de cercar a altres motors de cerca:\n"
 "\n"
 "* [Twingly](http://www.twingly.com/search?q=%s&content=microblog&site=%%%%"
@@ -9662,7 +9143,7 @@ msgstr ""
 "* [Tweet scan](http://www.tweetscan.com/indexi.php?s=%s)\n"
 "* [Google](http://www.google.com/search?q=site%%3A%%%%site.server%%%%+%s)\n"
 "* [Yahoo](http://search.yahoo.com/search?p=site%%3A%%%%site.server%%%%+%s)\n"
-"* [Collecta](http://collecta.com/#q=%s)\n"
+"* [Collecta](http://collecta.com/#q=%s)"
 
 #. TRANS: Menu item in search group navigation panel.
 msgctxt "MENU"
@@ -9686,21 +9167,6 @@ msgstr "Cerca el contingut dels avisos"
 msgid "Find groups on this site"
 msgstr "Cerca grups en aquest lloc"
 
-#. TRANS: Secondary navigation menu item leading to help on StatusNet.
-msgctxt "MENU"
-msgid "Help"
-msgstr "Ajuda"
-
-#. TRANS: Secondary navigation menu item leading to text about StatusNet site.
-msgctxt "MENU"
-msgid "About"
-msgstr "Quant a"
-
-#. TRANS: Secondary navigation menu item leading to Frequently Asked Questions.
-msgctxt "MENU"
-msgid "FAQ"
-msgstr "Preguntes més freqüents"
-
 #. TRANS: Secondary navigation menu item leading to Terms of Service.
 msgctxt "MENU"
 msgid "TOS"
@@ -9721,17 +9187,6 @@ msgctxt "MENU"
 msgid "Version"
 msgstr "Versió"
 
-#. TRANS: Secondary navigation menu item leading to e-mail contact information on the
-#. TRANS: StatusNet site, where to report bugs, ...
-msgctxt "MENU"
-msgid "Contact"
-msgstr "Contacte"
-
-#. TRANS: Secondary navigation menu item. Leads to information about embedding a timeline widget.
-msgctxt "MENU"
-msgid "Badge"
-msgstr "Insígnia"
-
 #. TRANS: Default title for section/sidebar widget.
 msgid "Untitled section"
 msgstr "Secció sense títol"
@@ -9776,10 +9231,6 @@ msgstr "Adreça electrònica"
 msgid "Change email handling"
 msgstr "Canvieu la gestió del correu"
 
-#. TRANS: Menu item title in settings navigation panel.
-msgid "Design your profile"
-msgstr "Dissenyeu el vostre perfil"
-
 #. TRANS: Menu item in settings navigation panel.
 msgctxt "MENU"
 msgid "URL"
@@ -9816,6 +9267,16 @@ msgstr "Connexions"
 msgid "Authorized connected applications"
 msgstr "Aplicacions de connexió autoritzades"
 
+#. TRANS: Menu item in settings navigation panel.
+msgctxt "MENU"
+msgid "Old school"
+msgstr "A l'antiga"
+
+#. TRANS: Menu item title in settings navigation panel.
+msgid "UI tweaks for old-school users"
+msgstr ""
+"Modificacions d'interfícies per als usuaris que els hi agrada a l'antiga"
+
 #. TRANS: Title of form to silence a user.
 msgctxt "TITLE"
 msgid "Silence"
@@ -9825,6 +9286,42 @@ msgstr "Silenci"
 msgid "Silence this user"
 msgstr "Silencia l'usuari"
 
+#. TRANS: Server error displayed when trying to create an anynymous OAuth consumer.
+msgid "Could not create anonymous consumer."
+msgstr "No s'ha pogut crear un consumidor anònim."
+
+#. TRANS: Server error displayed when trying to create an anynymous OAuth application.
+msgid "Could not create anonymous OAuth application."
+msgstr "No s'ha pogut crear l'aplicació OAuth anònima."
+
+#. TRANS: Exception thrown when no token association could be found.
+msgid ""
+"Could not find a profile and application associated with the request token."
+msgstr ""
+"No s'ha pogut trobar un perfil i una aplicació associada amb el testimoni "
+"sol·licitat."
+
+#. TRANS: Exception thrown when no access token can be issued.
+msgid "Could not issue access token."
+msgstr "No s'ha pogut emetre un testimoni d'accés."
+
+#. TRANS: Exception thrown when a database error occurs.
+msgid "Database error inserting OAuth application user."
+msgstr "Error de la base de dades en inserir l'usuari de l'aplicació OAuth."
+
+#. TRANS: Exception thrown when a database error occurs.
+msgid "Database error updating OAuth application user."
+msgstr ""
+"Error de la base de dades en actualitzar l'usuari de l'aplicació OAuth."
+
+#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
+msgid "Tried to revoke unknown token."
+msgstr "S'ha provat de revocar el testimoni desconegut."
+
+#. TRANS: Exception thrown when an attempt is made to remove a revoked token.
+msgid "Failed to delete revoked token."
+msgstr "No s'ha pogut suprimir el testimoni revocat."
+
 #. TRANS: Menu item in local navigation menu.
 msgctxt "MENU"
 msgid "Subscriptions"
@@ -9881,6 +9378,16 @@ msgstr "Convida amics i companys perquè participin a %s."
 msgid "Subscribe to this user"
 msgstr "Subscriu-me a aquest usuari"
 
+#. TRANS: Button text to subscribe to a user.
+#. TRANS: Button text for subscribing to a list.
+msgctxt "BUTTON"
+msgid "Subscribe"
+msgstr "Subscriu-m'hi"
+
+#. TRANS: Button title to subscribe to a user.
+msgid "Subscribe to this user."
+msgstr "Subscriu-me a aquest usuari"
+
 #. TRANS: Title of personal tag cloud section.
 msgid "People Tagcloud as self-tagged"
 msgstr "Núvol d'etiquetes personals (etiquetes pròpies)"
@@ -10002,16 +9509,26 @@ msgstr[1] "A %%s els hi agrada."
 
 #. TRANS: List message for notice repeated by logged in user.
 msgctxt "REPEATLIST"
-msgid "You have repeated this notice."
-msgstr "Heu repetit l'avís."
+msgid "You repeated this."
+msgstr "Ho heu repetit."
 
-#. TRANS: List message for repeated notices.
-#. TRANS: %d is the number of users that have repeated a notice.
+#. TRANS: List message for when more than 4 people repeat something.
+#. TRANS: %%s is a list of users liking a notice, %d is the number over 4 that like the notice.
+#. TRANS: Plural is decided on the total number of users liking the notice (count of %%s + %d).
 #, php-format
-msgid "One person has repeated this notice."
-msgid_plural "%d people have repeated this notice."
-msgstr[0] "Una persona ha repetit l'avís."
-msgstr[1] "%d persones ha repetit l'avís."
+msgid "%%s and %d other repeated this."
+msgid_plural "%%s and %d others repeated this."
+msgstr[0] "%%s i %d altre ho han repetit."
+msgstr[1] "%%s i %d altres ho han repetit."
+
+#. TRANS: List message for favoured notices.
+#. TRANS: %%s is a list of users liking a notice.
+#. TRANS: Plural is based on the number of of users that have favoured a notice.
+#, php-format
+msgid "%%s repeated this."
+msgid_plural "%%s repeated this."
+msgstr[0] "%%s ho ha repetit."
+msgstr[1] "%%s ho han repetit."
 
 #. TRANS: Form legend.
 #, php-format
@@ -10103,7 +9620,6 @@ msgid "Unsilence this user"
 msgstr "Dessilencia l'usuari"
 
 #. TRANS: Form legend on unsubscribe form.
-#. TRANS: Button title on unsubscribe form.
 msgid "Unsubscribe from this user"
 msgstr "Cancel·la la subscripció d'aquest usuari"
 
@@ -10113,6 +9629,10 @@ msgctxt "BUTTON"
 msgid "Unsubscribe"
 msgstr "Cancel·la la subscripció"
 
+#. TRANS: Button title on unsubscribe form.
+msgid "Unsubscribe from this user."
+msgstr "Cancel·la la subscripció d'aquest usuari."
+
 #. TRANS: Exception text shown when no profile can be found for a user.
 #. TRANS: %1$s is a user nickname, $2$d is a user ID (number).
 #, php-format
@@ -10194,8 +9714,6 @@ msgstr "L'XML no és vàlid, hi manca l'arrel XRD."
 msgid "Getting backup from file '%s'."
 msgstr "Es recupera la còpia de seguretat del fitxer '%s'."
 
-#~ msgid "%1$s and friends, page %2$d"
-#~ msgstr "%1$s i amics, pàgina %2$d"
-
-#~ msgid "You and friends"
-#~ msgstr "Un mateix i amics"
+#
+#~ msgid " "
+#~ msgstr " "
diff --git a/locale/cs/LC_MESSAGES/statusnet.po b/locale/cs/LC_MESSAGES/statusnet.po
index e999830125..5bd73f4425 100644
--- a/locale/cs/LC_MESSAGES/statusnet.po
+++ b/locale/cs/LC_MESSAGES/statusnet.po
@@ -1,9 +1,12 @@
-# Translation of StatusNet - Core to Czech (ÄŒesky)
+# Translation of StatusNet - Core to Czech (�esky)
 # Exported from translatewiki.net
 #
 # Author: Brion
+# Author: Jezevec
 # Author: Koo6
 # Author: Kuvaly
+# Author: TchoÅ™
+# Author: Utar
 # Author: Veritaslibero
 # Author: W4rr10r
 # --
@@ -13,18 +16,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:50+0000\n"
-"Language-Team: Czech <http://translatewiki.net/wiki/Portal:cs>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:42+0000\n"
+"Language-Team: Czech <https://translatewiki.net/wiki/Portal:cs>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: cs\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=3; plural=(n == 1) ? 0 : ( (n >= 2 && n <= 4) ? 1 : "
 "2 );\n"
-"X-POT-Import-Date: 2011-05-05 10:52:40+0000\n"
+"X-POT-Import-Date: 2012-04-22 22:02:21+0000\n"
 
 #. TRANS: Database error message.
 #, php-format
@@ -35,21 +38,16 @@ msgid ""
 "again."
 msgstr ""
 
-#. TRANS: Error message.
-msgid ""
-"An important error occured, probably related to email setup. Check logfiles "
-"for more info."
-msgstr ""
-
 #. TRANS: Error message.
 msgid "An error occurred."
-msgstr ""
+msgstr "Došlo k chybě."
 
 #. TRANS: Error message displayed when there is no StatusNet configuration file.
 #, php-format
 msgid ""
 "No configuration file found. Try running the installation program first."
 msgstr ""
+"Konfigura�ní soubor nenalezen. Zkuste nejprve spustit instala�ní program."
 
 #. TRANS: Error message displayed when trying to access a non-existing page.
 msgid "Unknown page"
@@ -99,12 +97,12 @@ msgstr "Znemožnit nové registrace"
 msgid "Closed"
 msgstr "Uzavřené"
 
-#. TRANS: Title for button to save access settings in site admin panel.
-msgid "Save access settings"
+#. TRANS: Button title to save access settings in site admin panel.
+#, fuzzy
+msgid "Save access settings."
 msgstr "uložit nastavení přístupu"
 
-#. TRANS: Tooltip for button to save access settings in site admin panel.
-#. TRANS: Button text for saving theme settings.
+#. TRANS: Button text to save access settings in site admin panel.
 #. TRANS: Button label to save e-mail preferences.
 #. TRANS: Button label to save IM preferences.
 #. TRANS: Button text in the license admin panel.
@@ -120,7 +118,6 @@ msgstr "uložit nastavení přístupu"
 #. TRANS: Button text for saving "Other settings" in profile.
 #. TRANS: Button text to save user settings in user admin panel.
 #. TRANS: Button label in the "Edit application" form.
-#. TRANS: Button text on profile design page to save settings.
 #. TRANS: Text for save button on group edit form.
 #. TRANS: Button text to save tags for a profile.
 msgctxt "BUTTON"
@@ -160,12 +157,6 @@ msgstr "Žádný takový profil."
 msgid "No such list."
 msgstr "Žádná taková nálepka."
 
-#. TRANS: Client error displayed when trying to add an OMB 0.1 remote profile to a list.
-#, fuzzy
-msgid "You cannot list an OMB 0.1 remote profile with this action."
-msgstr ""
-"Touto akcí se nemůžete se přihlásit k odběru vzdáleného OMB 0.1 profilu."
-
 #. TRANS: Client error displayed when an unknown error occurs when adding a user to a list.
 #. TRANS: %s is a username.
 #, php-format
@@ -196,7 +187,6 @@ msgstr "Tady žádná taková stránka není."
 #. TRANS: Client error when user not found for an rss related action.
 #. TRANS: Client error displayed when no existing user is provided for a user's delivery device setting.
 #. TRANS: Client error displayed if a user could not be found.
-#. TRANS: Client error when user not found updating a profile background image.
 #. TRANS: Client error displayed updating profile image without having a user object.
 #. TRANS: Client error displayed when making an Atom API request for an unknown user.
 #. TRANS: Client error displayed when trying to block a non-existing user or a user from another site.
@@ -222,14 +212,11 @@ msgstr "Tady žádná taková stránka není."
 #. TRANS: Client error displayed when trying to get the RSS feed with favorites of a user that does not exist.
 #. TRANS: Client error displayed when requesting Friends of a Friend feed without providing a user nickname.
 #. TRANS: Client error displayed when requesting Friends of a Friend feed for an object that is not a user.
-#. TRANS: Client error displayed when trying to get a user hCard for a non-existing user.
 #. TRANS: Client error displayed trying to make a micro summary without providing a valid user.
 #. TRANS: Client error displayed trying to send a direct message to a non-existing user.
 #. TRANS: Client error displayed trying to use "one time password login" without using an existing user.
 #. TRANS: Client error displayed when referring to non-existing user.
 #. TRANS: Client error displayed trying to perform an action related to a non-existing user.
-#. TRANS: Form validation error on page for remote subscribe when no user was provided.
-#. TRANS: Form validation error on page for remote subscribe when no user profile was found.
 #. TRANS: Client error displayed when trying to reply to a non-exsting user.
 #. TRANS: Client error displayed when providing a non-existing nickname in a RSS 1.0 action.
 #. TRANS: Client error.
@@ -238,7 +225,6 @@ msgstr "Tady žádná taková stránka není."
 #. TRANS: Client error displayed trying to find a user by ID for a non-existing ID.
 #. TRANS: Client error displayed requesting groups for a non-existing user.
 #. TRANS: Client error displayed when user not found for an action.
-#. TRANS: Client error displayed providing a non-existing nickname.
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #. TRANS: Client error displayed when trying to perform a gallery action with an unknown user.
 #. TRANS: Client error displayed when trying to access a mailbox without providing a user.
@@ -257,6 +243,13 @@ msgstr "�asová osa %s"
 msgid "%s's home timeline"
 msgstr "�asová osa %s"
 
+#. TRANS: %s is user nickname.
+#. TRANS: Feed title.
+#. TRANS: %s is tagger's nickname.
+#, fuzzy, php-format
+msgid "Feed for friends of %s (Activity Streams JSON)"
+msgstr "Feed pro přátele uživatele: %s (Atom)"
+
 #. TRANS: %s is user nickname.
 #, php-format
 msgid "Feed for friends of %s (RSS 1.0)"
@@ -302,7 +295,7 @@ msgstr ""
 "Můžete se pokusit uživatele [%1$s postr�it](../%2$s) z jejich profilu nebo "
 "[jim něco poslat](%%%%action.newnotice%%%%?status_textarea=%3$s)."
 
-#. TRANS: Encoutagement displayed on empty timeline user pages for anonymous users.
+#. TRANS: Encouragement displayed on empty timeline user pages for anonymous users.
 #. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
 #. TRANS: Empty list message for page with replies for a user for not logged in users.
 #. TRANS: %1$s is a user nickname. This message contains a Markdown link in the form [link text](link).
@@ -316,6 +309,13 @@ msgstr ""
 "Pro� si [nezaregistrovat ú�et](%%%%action.register%%%%) a pak pošťouchnout "
 "uživatele %s nebo jim poslat hlášku."
 
+#. TRANS: Button text for inviting more users to the StatusNet instance.
+#. TRANS: Less business/enterprise-oriented language for public sites.
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Send invite"
+msgstr "Pozvánky"
+
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Title of API timeline for a user and friends.
 #. TRANS: %s is a username.
@@ -324,8 +324,6 @@ msgstr ""
 #. TRANS: %s is a username.
 #. TRANS: Menu item title in personal group navigation menu.
 #. TRANS: %s is a username.
-#. TRANS: Menu item title in settings navigation panel.
-#. TRANS: %s is a username.
 #, php-format
 msgid "%s and friends"
 msgstr "%s a přátelé"
@@ -364,7 +362,6 @@ msgstr ""
 #. TRANS: Server error thrown on database error updating SMS preferences.
 #. TRANS: Server error thrown on database error removing a registered SMS phone number.
 #. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
-#. TRANS: Server exception thrown on Profile design page when updating design settings fails.
 msgid "Could not update user."
 msgstr "Nepodařilo se aktualizovat nastavení uživatele"
 
@@ -379,7 +376,6 @@ msgstr "Nepodařilo se uložit profil."
 
 #. TRANS: Client error displayed when the number of bytes in a POST request exceeds a limit.
 #. TRANS: %s is the number of bytes of the CONTENT_LENGTH.
-#. TRANS: Form validation error in design settings form. POST should remain untranslated.
 #, fuzzy, php-format
 msgid ""
 "The server was unable to handle that much POST data (%s byte) due to its "
@@ -397,24 +393,6 @@ msgstr[2] ""
 "Server nebyl schopen zpracovat tolik POST dat (%s bytů) vzhledem k jeho "
 "aktuální konfiguraci."
 
-#. TRANS: Client error displayed when saving design settings fails because of an empty id.
-#. TRANS: Client error displayed when saving design settings fails because of an empty result.
-#. TRANS: Client error displayed when a database error occurs inserting profile colours.
-#. TRANS: Client error displayed when a database error occurs updating profile colours.
-#. TRANS: Form validation error displayed when group design settings could not be saved because of an application issue.
-#. TRANS: Form validation error on Profile design page when saving design settings has failed.
-#. TRANS: Form validation error on Profile design page when updating design settings has failed.
-msgid "Unable to save your design settings."
-msgstr "Nelze uložit vaše nastavení designu."
-
-#. TRANS: Error displayed when updating design settings fails.
-#. TRANS: Client error displayed when a database error occurs updating profile colours.
-#. TRANS: Form validation error on Profile design page when updating design settings has failed.
-#. TRANS: Error message displayed if design settings could not be saved.
-#. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
-msgid "Could not update your design."
-msgstr "Nelze uložit design."
-
 #. TRANS: Title for Atom feed.
 msgctxt "ATOM"
 msgid "Main"
@@ -461,6 +439,22 @@ msgstr "Zablokovat uživatele se nezdařilo."
 msgid "Unblock user failed."
 msgstr "Odblokovat uživatele se nezdařilo."
 
+#. TRANS: Client exception thrown when no conversation ID is given.
+#, fuzzy
+msgid "No conversation ID."
+msgstr "Konverzace"
+
+#. TRANS: Client exception thrown when referring to a non-existing conversation ID (%d).
+#, fuzzy, php-format
+msgid "No conversation with ID %d."
+msgstr "Konverzace"
+
+#. TRANS: Title for conversion timeline.
+#, fuzzy
+msgctxt "TITLE"
+msgid "Conversation"
+msgstr "Konverzace"
+
 #. TRANS: Title. %s is a user nickname.
 #, php-format
 msgid "Direct messages from %s"
@@ -506,6 +500,8 @@ msgid "Cannot send direct messages to users who aren't your friend."
 msgstr "Nelze odesílat zprávy uživatelům, kteří nejsou vašimi přáteli."
 
 #. TRANS: Client error displayed trying to direct message self (403).
+#. TRANS: Client error displayed trying to send a direct message to self.
+#. TRANS: Error text shown when trying to send a direct message to self.
 #, fuzzy
 msgid ""
 "Do not send a message to yourself; just say it to yourself quietly instead."
@@ -740,7 +736,6 @@ msgstr "skupiny na %s"
 
 #. TRANS: Client error displayed when trying to edit a group without being an admin.
 #. TRANS: Client error displayed trying to edit a group while not being a group admin.
-#. TRANS: Client error displayed trying to change group design settings without being a (group) admin.
 #. TRANS: Client error displayed when trying to change group logo settings while not being a group admin.
 msgid "You must be an admin to edit the group."
 msgstr "K úpravě skupiny musíte být admin."
@@ -783,7 +778,7 @@ msgstr ""
 #. TRANS: Client error displayed when an unknown error occurs in the list subscribers action.
 #. TRANS: Client error displayed when an unknown error occurs unsubscribing from a list.
 msgid "An error occured."
-msgstr ""
+msgstr "Došlo k chybě."
 
 #. TRANS: Client error displayed when trying to delete another user's list.
 msgid "You cannot delete lists that do not belong to you."
@@ -861,7 +856,6 @@ msgstr "Chyba databáze při vkládání uživatele aplikace OAuth."
 
 #. TRANS: Client error given on when invalid data was passed through a form in the OAuth API.
 #. TRANS: Unexpected validation error on avatar upload form.
-#. TRANS: Client error displayed when the submitted form contains unexpected data.
 #. TRANS: Client error displayed submitting invalid form data for edit application.
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
 #. TRANS: Form validation error message when an unsupported argument is used.
@@ -870,7 +864,6 @@ msgstr "Chyba databáze při vkládání uživatele aplikace OAuth."
 #. TRANS: Client error when submitting a form with unexpected information.
 #. TRANS: Client error displayed when unexpected data is posted in the password recovery form.
 #. TRANS: Message given submitting a form with an unknown action in SMS settings.
-#. TRANS: Unknown form validation error in design settings form.
 msgid "Unexpected form submission."
 msgstr "Ne�ekaný požadavek."
 
@@ -908,7 +901,6 @@ msgstr ""
 "vašeho ú�tu na %4$s jen třetím stranám kterým věříte.."
 
 #. TRANS: Fieldset legend.
-#, fuzzy
 msgctxt "LEGEND"
 msgid "Account"
 msgstr "Ú�et"
@@ -916,7 +908,6 @@ msgstr "Ú�et"
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Field label on account registration page.
-#. TRANS: Label for nickname on user authorisation page.
 #. TRANS: Field label on group edit form.
 #. TRANS: Dropdown option for searching in profiles.
 msgid "Nickname"
@@ -1015,9 +1006,9 @@ msgstr "Metoda HTTP není podporována."
 
 #. TRANS: Exception thrown requesting an unsupported notice output format.
 #. TRANS: %s is the requested output format.
-#, fuzzy, php-format
+#, php-format
 msgid "Unsupported format: %s."
-msgstr "Nepodporovaný formát."
+msgstr "Nepodporovaný formát:  %s ."
 
 #. TRANS: Client error displayed requesting a deleted status.
 msgid "Status deleted."
@@ -1236,12 +1227,9 @@ msgstr "Musíte být přihlášen abyste mohl opustit skupinu."
 #. TRANS: Client error displayed when requesting Friends of a Friend feed for a nickname that is not a group.
 #. TRANS: Client error displayed trying to block a user from a group while specifying a non-existing group.
 #. TRANS: Client error displayed referring to a group's permalink for a non-existing group ID.
-#. TRANS: Client error displayed trying to change group design settings while providing a nickname for a non-existing group.
 #. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
 #. TRANS: Client error displayed when trying to view group members for a non-existing group.
 #. TRANS: Client error displayed when trying to view group members for an object that is not a group.
-#. TRANS: Client error displayed when trying to view group members for a non-existing group.
-#. TRANS: Client error displayed when trying to view group members for an object that is not a group.
 #. TRANS: Client error displayed when requesting a group RSS feed for group that does not exist.
 #. TRANS: Client error displayed when requesting a group RSS feed for an object that is not a group.
 #. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
@@ -1250,10 +1238,10 @@ msgstr "Musíte být přihlášen abyste mohl opustit skupinu."
 #. TRANS: Client error displayed when trying to leave a non-local group.
 #. TRANS: Client error displayed when trying to leave a non-existing group.
 #. TRANS: Client error displayed when providing an invalid group ID on the Make Admin page.
-#. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
-#. TRANS: Client error displayed if no local group with a given name was found requesting group page.
 #. TRANS: Command exception text shown when a group is requested that does not exist.
 #. TRANS: Error text shown when trying to leave a group that does not exist.
+#. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
+#. TRANS: Client error displayed if no local group with a given name was found requesting group page.
 msgid "No such group."
 msgstr "Žádný takový uživatel."
 
@@ -1266,9 +1254,8 @@ msgstr "Žádná přezdívka nebo ID."
 
 #. TRANS: Client error displayed trying to approve group membership while not logged in.
 #. TRANS: Client error displayed when trying to leave a group while not logged in.
-#, fuzzy
 msgid "Must be logged in."
-msgstr "Nejste přihlášen(a)."
+msgstr "Musíte být přihlášen(a)."
 
 #. TRANS: Client error displayed trying to approve group membership while not a group administrator.
 #. TRANS: Client error displayed when trying to approve or cancel a group join request without
@@ -1322,6 +1309,7 @@ msgid "Join request canceled."
 msgstr ""
 
 #. TRANS: Client error displayed trying to approve subscription for a non-existing request.
+#. TRANS: %s is a user nickname.
 #, fuzzy, php-format
 msgid "%s is not in the moderation queue for your subscriptions."
 msgstr "Seznam uživatelů v této skupině."
@@ -1409,9 +1397,8 @@ msgid "Unknown group."
 msgstr "Neznámé"
 
 #. TRANS: Client exception thrown when trying to subscribe to an already subscribed group.
-#, fuzzy
 msgid "Already a member."
-msgstr "Všichni �lenové"
+msgstr "Již jste �lenem."
 
 #. TRANS: Client exception thrown when trying to subscribe to group while blocked from that group.
 msgid "Blocked by admin."
@@ -1423,9 +1410,8 @@ msgid "No such favorite."
 msgstr "Žádný takový soubor."
 
 #. TRANS: Client exception thrown when trying to remove a favorite notice of another user.
-#, fuzzy
 msgid "Cannot delete someone else's favorite."
-msgstr "Nelze smazat oblíbenou položku."
+msgstr "Nelze smazat oblíbenou položku někoho jiného."
 
 #. TRANS: Client exception thrown when trying to show membership of a non-subscribed group
 #, fuzzy
@@ -1470,9 +1456,9 @@ msgstr ""
 
 #. TRANS: Client exception thrown when subscribing to a non-existing profile.
 #. TRANS: %s is the unknown profile ID.
-#, fuzzy, php-format
+#, php-format
 msgid "Unknown profile %s."
-msgstr "Neznámý typ souboru"
+msgstr "Neznámý profil  %s ."
 
 #. TRANS: Client error displayed trying to subscribe to an already subscribed profile.
 #. TRANS: %s is the profile the user already has a subscription on.
@@ -1487,7 +1473,6 @@ msgstr "Žádná taková příloha."
 #. TRANS: Client error displayed trying to get an avatar without providing a nickname.
 #. TRANS: Client error displayed when requesting a list of blocked users for a group without providing a group nickname.
 #. TRANS: Client error displayed trying to edit a group while not proving a nickname for the group to edit.
-#. TRANS: Client error displayed trying to change group design settings without providing a group nickname.
 #. TRANS: Client error displayed when trying to change group logo settings without providing a nickname.
 #. TRANS: Client error displayed when trying to view group members without providing a group nickname.
 #. TRANS: Client error displayed when requesting a group RSS feed without providing a group nickname.
@@ -1790,6 +1775,18 @@ msgstr "Adresa \"%s\" byla potvrzena pro váš ú�et"
 msgid "Conversation"
 msgstr "Konverzace"
 
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#, fuzzy
+msgid "Conversation feed (Activity Streams JSON)"
+msgstr "Feed oznámení pro %1$s (Atom)"
+
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#, fuzzy
+msgid "Conversation feed (RSS 2.0)"
+msgstr "Feed oznámení pro %1$s (RSS 2.0)"
+
 #. TRANS: Title for conversation page.
 #. TRANS: Title for page that shows a notice.
 #, fuzzy
@@ -1855,7 +1852,7 @@ msgstr "Nemůžete odstranit uživatele."
 
 #. TRANS: Button title for user account deletion.
 #, fuzzy
-msgid "Permanently delete your account"
+msgid "Permanently delete your account."
 msgstr "Nemůžete odstranit uživatele."
 
 #. TRANS: Client error displayed trying to delete an application while not logged in.
@@ -2012,156 +2009,6 @@ msgstr "Neodstraňujte toto oznámení"
 msgid "Delete this user."
 msgstr "Odstranit tohoto uživatele"
 
-#. TRANS: Message used as title for design settings for the site.
-msgid "Design"
-msgstr "Vzhled"
-
-#. TRANS: Instructions for design adminsitration panel.
-msgid "Design settings for this StatusNet site"
-msgstr ""
-
-#. TRANS: Client error displayed when a logo URL does is not valid.
-msgid "Invalid logo URL."
-msgstr "Neplatná URL loga."
-
-#. TRANS: Client error displayed when an SSL logo URL is invalid.
-#, fuzzy
-msgid "Invalid SSL logo URL."
-msgstr "Neplatná URL loga."
-
-#. TRANS: Client error displayed when a theme is submitted through the form that is not in the theme list.
-#. TRANS: %s is the chosen unavailable theme.
-#, php-format
-msgid "Theme not available: %s."
-msgstr "Téma není k dispozici: %s."
-
-#. TRANS: Fieldset legend for form to change logo.
-msgid "Change logo"
-msgstr "Změňte logo"
-
-#. TRANS: Field label for StatusNet site logo.
-msgid "Site logo"
-msgstr "Logo stránek"
-
-#. TRANS: Field label for SSL StatusNet site logo.
-#, fuzzy
-msgid "SSL logo"
-msgstr "Logo stránek"
-
-#. TRANS: Fieldset legend for form change StatusNet site's theme.
-msgid "Change theme"
-msgstr "Změnit téma"
-
-#. TRANS: Field label for dropdown to choose site theme.
-msgid "Site theme"
-msgstr "Téma stránek"
-
-#. TRANS: Title for field label for dropdown to choose site theme.
-msgid "Theme for the site."
-msgstr "Téma stránek"
-
-#. TRANS: Field label for uploading a cutom theme.
-msgid "Custom theme"
-msgstr "Vlastní téma"
-
-#. TRANS: Form instructions for uploading a cutom StatusNet theme.
-msgid "You can upload a custom StatusNet theme as a .ZIP archive."
-msgstr "Můžete nahrát vlastní StatusNet téma jako .ZIP archiv."
-
-#. TRANS: Fieldset legend for theme background image.
-msgid "Change background image"
-msgstr "Změnit obrázek na pozadí"
-
-#. TRANS: Field label for background image on theme designer page.
-#. TRANS: Field label for background color selector.
-#. TRANS: Label on profile design page for setting a profile page background colour.
-msgid "Background"
-msgstr "Pozadí"
-
-#. TRANS: Form guide for background image upload form on theme designer page.
-#, php-format
-msgid ""
-"You can upload a background image for the site. The maximum file size is %1"
-"$s."
-msgstr ""
-"Můžete nahrát obrázek na pozadí stránek. Maximální velikost souboru je %1$s."
-
-#. TRANS: Used as radio button label to add a background image.
-msgid "On"
-msgstr "zap."
-
-#. TRANS: Used as radio button label to not add a background image.
-msgid "Off"
-msgstr "vyp."
-
-#. TRANS: Form guide for turning background image on or off on theme designer page.
-#. TRANS: Form guide for a set of radio buttons on the profile design page that will enable or disable
-#. TRANS: use of the uploaded profile image.
-msgid "Turn background image on or off."
-msgstr "Zapněte nebů vypněte obrázek na pozadí."
-
-#. TRANS: Checkbox label to title background image on theme designer page.
-#. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
-msgid "Tile background image"
-msgstr "Dlaždicovat obrázek na pozadí"
-
-#. TRANS: Fieldset legend for theme colors.
-#, fuzzy
-msgid "Change colors"
-msgstr "Změnit barvy"
-
-#. TRANS: Field label for content color selector.
-#. TRANS: Label on profile design page for setting a profile page content colour.
-msgid "Content"
-msgstr "Obsah"
-
-#. TRANS: Field label for sidebar color selector.
-#. TRANS: Label on profile design page for setting a profile page sidebar colour.
-msgid "Sidebar"
-msgstr "Bo�ní panel"
-
-#. TRANS: Field label for text color selector.
-#. TRANS: Label on profile design page for setting a profile page text colour.
-msgid "Text"
-msgstr "Text"
-
-#. TRANS: Field label for link color selector.
-#. TRANS: Label on profile design page for setting a profile page links colour.
-msgid "Links"
-msgstr "Odkazy"
-
-#. TRANS: Fieldset legend for advanced theme design settings.
-msgid "Advanced"
-msgstr "Rozšířené"
-
-#. TRANS: Field label for custom CSS.
-msgid "Custom CSS"
-msgstr "Vlastní CSS"
-
-#. TRANS: Button text for resetting theme settings.
-#, fuzzy
-msgctxt "BUTTON"
-msgid "Use defaults"
-msgstr "Použít výchozí"
-
-#. TRANS: Title for button for resetting theme settings.
-#. TRANS: Title for button on profile design page to reset all colour settings to default.
-#, fuzzy
-msgid "Restore default designs."
-msgstr "Obnovit výchozí vzhledy"
-
-#. TRANS: Title for button for resetting theme settings.
-#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#, fuzzy
-msgid "Reset back to default."
-msgstr "Reset zpět do výchozího"
-
-#. TRANS: Title for button for saving theme settings.
-#. TRANS: Title for button on profile design page to save settings.
-#, fuzzy
-msgid "Save design."
-msgstr "Uložit vzhled"
-
 #. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
 msgid "This notice is not a favorite!"
 msgstr "Toto oznámení není oblíbeno!"
@@ -2176,6 +2023,83 @@ msgstr "Přidat do oblíbených"
 msgid "No such document \"%s\"."
 msgstr "Žádný dokument \"%s\" neexistuje"
 
+#. TRANS: Menu item in administrator navigation panel.
+#. TRANS: Menu item in default local navigation panel.
+#. TRANS: Menu item in personal group navigation menu.
+#, fuzzy
+msgctxt "MENU"
+msgid "Home"
+msgstr "Moje stránky"
+
+msgctxt "MENU"
+msgid "Docs"
+msgstr ""
+
+#. TRANS: Secondary navigation menu item leading to help on StatusNet.
+msgctxt "MENU"
+msgid "Help"
+msgstr "Nápověda"
+
+#, fuzzy
+msgid "Getting started"
+msgstr "Nastavení uloženo"
+
+#. TRANS: Secondary navigation menu item leading to text about StatusNet site.
+#, fuzzy
+msgctxt "MENU"
+msgid "About"
+msgstr "O nás"
+
+#, fuzzy
+msgid "About this site"
+msgstr "Odblokovat tohoto uživatele"
+
+#. TRANS: Secondary navigation menu item leading to Frequently Asked Questions.
+#, fuzzy
+msgctxt "MENU"
+msgid "FAQ"
+msgstr "FAQ"
+
+msgid "Frequently asked questions"
+msgstr ""
+
+#. TRANS: Secondary navigation menu item leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+#, fuzzy
+msgctxt "MENU"
+msgid "Contact"
+msgstr "Kontakt"
+
+#, fuzzy
+msgid "Contact info"
+msgstr "Kontakt"
+
+#, fuzzy
+msgctxt "MENU"
+msgid "Tags"
+msgstr "Tagy"
+
+msgid "Using tags"
+msgstr ""
+
+#. TRANS: Menu item in default local navigation panel.
+#. TRANS: Menu item in search group navigation panel.
+#. TRANS: Menu item in local navigation menu.
+msgctxt "MENU"
+msgid "Groups"
+msgstr "Skupiny"
+
+#, fuzzy
+msgid "Using groups"
+msgstr "Skupin uživatel"
+
+msgctxt "MENU"
+msgid "API"
+msgstr ""
+
+msgid "RESTful API"
+msgstr ""
+
 #. TRANS: Title for "Edit application" form.
 #. TRANS: Form legend.
 msgid "Edit application"
@@ -2341,7 +2265,7 @@ msgid ""
 "subscriptions to it. Do you still want to continue?"
 msgstr ""
 
-#. TRANS: TRANS: Server error displayed when updating a list fails.
+#. TRANS: Server error displayed when updating a list fails.
 #, fuzzy
 msgid "Could not update list."
 msgstr "Nepodařilo se aktualizovat nastavení uživatele"
@@ -2649,40 +2573,6 @@ msgstr "Bez příloh."
 msgid "No uploaded attachments."
 msgstr "Žádné nahrané přílohy."
 
-#. TRANS: Client error displayed when subscribing to a remote profile and an unexpected response is received.
-msgid "Not expecting this response!"
-msgstr "Ne�ekaná odpově�!"
-
-#. TRANS: Client error displayed when subscribing to a remote profile that does not exist.
-msgid "User being listened to does not exist."
-msgstr "Úživatel, kterému nasloucháte neexistuje."
-
-#. TRANS: Client error displayed when subscribing to a remote profile that is a local profile.
-#. TRANS: Client error displayed when using remote subscribe for a local entity.
-msgid "You can use the local subscription!"
-msgstr "Můžete použít místní odebírání."
-
-#. TRANS: Client error displayed when subscribing to a remote profile that is blocked form subscribing to.
-msgid "That user has blocked you from subscribing."
-msgstr "Uživatel vaše odebírání zablokoval."
-
-#. TRANS: Client error displayed when subscribing to a remote profile without providing an authorised token.
-msgid "You are not authorized."
-msgstr "Nejste autorizován."
-
-#. TRANS: Client error displayed when subscribing to a remote profile and conversion of the request token to access token fails.
-msgid "Could not convert request token to access token."
-msgstr "Nemohu převést žádost token na přístup token."
-
-#. TRANS: Client error displayed when subscribing to a remote profile fails because of an unsupported version of the OMB protocol.
-msgid "Remote service uses unknown version of OMB protocol."
-msgstr "Vzdálená služba používá neznámou verzi protokolu OMB."
-
-#. TRANS: Server error displayed when subscribing to a remote profile fails because the remote profile could not be updated.
-#. TRANS: Exception thrown when updating a remote profile fails in OAuth store.
-msgid "Error updating remote profile."
-msgstr "Chyba při aktualizaci vzdáleného profilu."
-
 #. TRANS: Client error displayed when requesting a non-existent file.
 msgid "No such file."
 msgstr "Žádný takový soubor."
@@ -2771,32 +2661,6 @@ msgstr "Chyba databáze při blokování uživatele ze skupiny."
 msgid "No ID."
 msgstr "Chybí ID."
 
-#. TRANS: Client error displayed trying to change group design settings while not logged in.
-msgid "You must be logged in to edit a group."
-msgstr "K úpravě skupiny musíte být přihlášen."
-
-#. TRANS: Title group design settings page.
-msgid "Group design"
-msgstr "Vzhled skupiny"
-
-#. TRANS: Instructions for group design settings page.
-msgid ""
-"Customize the way your group looks with a background image and a colour "
-"palette of your choice."
-msgstr ""
-"Přizpůsobit vzhled skupiny obrázkem na pozadí a barevnou paletou vašeho "
-"výběru."
-
-#. TRANS: Form validation error displayed when group design settings could not be updated because of an application issue.
-#, fuzzy
-msgid "Unable to update your design settings."
-msgstr "Nelze uložit vaše nastavení designu."
-
-#. TRANS: Form text to confirm saved group design settings.
-#. TRANS: Confirmation message on Profile design page when saving design settings has succeeded.
-msgid "Design preferences saved."
-msgstr "Nastavení vzhledu uloženo."
-
 #. TRANS: Title for group logo settings page.
 #. TRANS: Group logo form legend.
 msgid "Group logo"
@@ -2874,7 +2738,6 @@ msgid "Updates from members of %1$s on %2$s!"
 msgstr "Novinky od �lenů %1$s na %2$s!"
 
 #. TRANS: Title for first page of the groups list.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Groups"
 msgstr "Skupiny"
@@ -2971,8 +2834,8 @@ msgstr "Nastavení IM"
 #. TRANS: the order and formatting of link text and link should remain unchanged.
 #, fuzzy, php-format
 msgid ""
-"You can send and receive notices through instant messaging [instant messages]"
-"(%%doc.im%%). Configure your addresses and settings below."
+"You can send and receive notices through [instant messaging](%%doc.im%%). "
+"Configure your addresses and settings below."
 msgstr ""
 "Můžete odesílat nebo přijámat oznámení pomocí Jabber/GTalk [zpráv](%%doc.im%"
 "%) .Zadejte svou adresu a nastavení níže."
@@ -3192,29 +3055,6 @@ msgstr ""
 "Použijte tento formulář k pozvání svých přátel a kolegů k používání této "
 "služby."
 
-#. TRANS: Field label for a list of e-mail addresses.
-msgid "Email addresses"
-msgstr "E-mailové adresy"
-
-#. TRANS: Tooltip for field label for a list of e-mail addresses.
-#, fuzzy
-msgid "Addresses of friends to invite (one per line)."
-msgstr "Adresy přátel k pozvání (jedna na řádek)"
-
-#. TRANS: Field label for a personal message to send to invitees.
-msgid "Personal message"
-msgstr "Osobní zpráva"
-
-#. TRANS: Tooltip for field label for a personal message to send to invitees.
-msgid "Optionally add a personal message to the invitation."
-msgstr "Volitelně přidat osobní zprávu."
-
-#. TRANS: Send button for inviting friends
-#. TRANS: Button text for sending notice.
-msgctxt "BUTTON"
-msgid "Send"
-msgstr "Odeslat"
-
 #. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral
 #. TRANS: singular 3rd-person pronoun in English. %1$s is the inviting user, $2$s is
 #. TRANS: the StatusNet sitename.
@@ -3245,7 +3085,7 @@ msgstr "Nejste �lenem této skupiny."
 #. TRANS: User admin panel title
 msgctxt "TITLE"
 msgid "License"
-msgstr ""
+msgstr "Licence"
 
 #. TRANS: Form instructions for the site license admin panel.
 msgid "License for this StatusNet site"
@@ -3294,11 +3134,11 @@ msgstr "Soukromí"
 
 #. TRANS: License option in the license admin panel.
 msgid "All Rights Reserved"
-msgstr ""
+msgstr "Všechna práva vyhrazena"
 
 #. TRANS: License option in the license admin panel.
 msgid "Creative Commons"
-msgstr ""
+msgstr "Creative Commons"
 
 #. TRANS: Dropdown field label in the license admin panel.
 msgid "Type"
@@ -3311,7 +3151,7 @@ msgstr "Vyberte operátora"
 
 #. TRANS: Form legend in the license admin panel.
 msgid "License details"
-msgstr ""
+msgstr "Podrobnosti o licenci"
 
 #. TRANS: Field label in the license admin panel.
 msgid "Owner"
@@ -3350,12 +3190,6 @@ msgstr ""
 msgid "Save license settings."
 msgstr "Uložit Nastavení webu"
 
-#. TRANS: Client error displayed when trying to log in while already logged in.
-#. TRANS: Client error displayed trying to use "one time password login" when already logged in.
-#. TRANS: Client error displayed when trying to register while already logged in.
-msgid "Already logged in."
-msgstr "Již přihlášen"
-
 #. TRANS: Form validation error displayed when trying to log in with incorrect credentials.
 msgid "Incorrect username or password."
 msgstr "Neplatné jméno nebo heslo"
@@ -3468,6 +3302,7 @@ msgstr "Zdrojové URL je nutné."
 msgid "Could not create application."
 msgstr "Nelze vytvořit aplikaci."
 
+#. TRANS: Form validation error messages displayed when uploading an invalid application logo.
 #, fuzzy
 msgid "Invalid image."
 msgstr "Neplatná velikost"
@@ -3508,12 +3343,6 @@ msgstr "Chybí obsah!"
 msgid "No recipient specified."
 msgstr "Neuveden příjemce."
 
-#. TRANS: Client error displayed trying to send a direct message to self.
-#. TRANS: Error text shown when trying to send a direct message to self.
-msgid ""
-"Don't send a message to yourself; just say it to yourself quietly instead."
-msgstr "Neposílejte si zprávu, potichu si ji pro sebe řekněte."
-
 #. TRANS: Page title after sending a direct message.
 msgid "Message sent"
 msgstr "Zpráva odeslána"
@@ -3717,6 +3546,33 @@ msgstr "Only %s URLs over plain HTTP please."
 msgid "Not a supported data format."
 msgstr "Nepodporovaný formát dat."
 
+#. TRANS: Page title for profile settings.
+#, fuzzy
+msgid "Old school UI settings"
+msgstr "Nastavení IM"
+
+#. TRANS: Usage instructions for profile settings.
+msgid "If you like it \"the old way\", you can set that here."
+msgstr ""
+
+#. TRANS: Confirmation shown when user profile settings are saved.
+#. TRANS: Message after successful saving of administrative settings.
+msgid "Settings saved."
+msgstr "Nastavení uloženo"
+
+msgid "Only stream mode (no conversations) in timelines"
+msgstr ""
+
+msgid "Show conversation page as hierarchical trees"
+msgstr ""
+
+msgid "Show nicknames (not full names) in timelines"
+msgstr ""
+
+#. TRANS: Button text to save a list.
+msgid "Save"
+msgstr "Uložit"
+
 #. TRANS: ShortName in the OpenSearch interface when trying to find users.
 msgid "People Search"
 msgstr "Hledání lidí"
@@ -3725,6 +3581,11 @@ msgstr "Hledání lidí"
 msgid "Notice Search"
 msgstr "Hledání oznámení"
 
+#. TRANS: Client error displayed trying to use "one time password login" when already logged in.
+#. TRANS: Client error displayed when trying to register while already logged in.
+msgid "Already logged in."
+msgstr "Již přihlášen"
+
 #. TRANS: Client error displayed trying to use "one time password login" without specifying a user.
 msgid "No user ID specified."
 msgstr "Nebylo zadáno uživatelské ID."
@@ -3793,20 +3654,18 @@ msgid "6 or more characters."
 msgstr "6 a více znaků"
 
 #. TRANS: Field label on page where to change password. In this field the new password should be typed a second time.
-#, fuzzy
 msgctxt "LABEL"
 msgid "Confirm"
-msgstr "Potvrdit"
+msgstr "Potvrzení"
 
 #. TRANS: Field title on page where to change password.
-#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
+#. TRANS: Title for field label for password reset form where the password has to be typed again.
 #. TRANS: Field title on account registration page.
 #, fuzzy
 msgid "Same as password above."
 msgstr "Stejné jako heslo výše"
 
 #. TRANS: Button text on page where to change password.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Change"
 msgstr "Změnit"
@@ -3862,12 +3721,6 @@ msgstr "Adresář témat není �itelný: %s."
 msgid "Avatar directory not writable: %s."
 msgstr "Nelze zapisovat do adresáře avatarů: %s."
 
-#. TRANS: Client error in Paths admin panel.
-#. TRANS: %s is the background directory that could not be written to.
-#, php-format
-msgid "Background directory not writable: %s."
-msgstr "Nelze zapisovat do adresáře pozadí: %s."
-
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the locales directory that could not be read from.
 #, php-format
@@ -3992,32 +3845,6 @@ msgstr "Adresář avatarů"
 msgid "Directory where avatars are located."
 msgstr "Cesta k adresáři locales"
 
-#. TRANS: Fieldset legend in Paths admin panel.
-msgid "Backgrounds"
-msgstr "Pozadí"
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-#, fuzzy
-msgid "Server for backgrounds."
-msgstr "Téma stránek"
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-msgid "Web path to backgrounds."
-msgstr ""
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-msgid "Server for backgrounds on SSL pages."
-msgstr ""
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-msgid "Web path to backgrounds on SSL pages."
-msgstr ""
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-#, fuzzy
-msgid "Directory where backgrounds are located."
-msgstr "Cesta k adresáři locales"
-
 #. TRANS: Fieldset legens in Paths admin panel.
 msgid "Attachments"
 msgstr "Přílohy"
@@ -4080,8 +3907,9 @@ msgid "Server to direct SSL requests to."
 msgstr "Server kam směrovat SSL žádosti"
 
 #. TRANS: Button title text to store form data in the Paths admin panel.
-msgid "Save paths"
-msgstr "Uložit cesty"
+#, fuzzy
+msgid "Save path settings."
+msgstr "Uložit Nastavení webu"
 
 #. TRANS: Instructions for the "People search" page.
 #. TRANS: %%site.name%% is the name of the StatusNet site.
@@ -4223,7 +4051,7 @@ msgid ""
 "%%%site.name%%%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
 "blogging) service based on the Free Software [StatusNet](http://status.net/) "
 "tool. You can easily keep track of what they are doing by subscribing to the "
-"tag's timeline."
+"list's timeline."
 msgstr ""
 "**%s** je skupina uživatelů na %%%%site.name%%%%, [mikro-blogovací](http://"
 "drbz.cz/i/napoveda-faq#mikroblog) službě založené na Free Software nástroji "
@@ -4256,7 +4084,7 @@ msgid ""
 "site.name%%%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
 "blogging) service based on the Free Software [StatusNet](http://status.net/) "
 "tool. You can easily keep track of what they are doing by subscribing to the "
-"tag's timeline."
+"list's timeline."
 msgstr ""
 "**%s** je skupina uživatelů na %%%%site.name%%%%, [mikro-blogovací](http://"
 "drbz.cz/i/napoveda-faq#mikroblog) službě založené na Free Software nástroji "
@@ -4361,16 +4189,6 @@ msgid ""
 "All default plugins have been disabled from the site's configuration file."
 msgstr ""
 
-#. TRANS: Client error displayed if the notice posted has too many characters.
-msgid "Invalid notice content."
-msgstr "Neplatná velikost"
-
-#. TRANS: Exception thrown if a notice's license is not compatible with the StatusNet site license.
-#. TRANS: %1$s is the notice license, %2$s is the StatusNet site's license.
-#, fuzzy, php-format
-msgid "Notice license \"%1$s\" is not compatible with site license \"%2$s\"."
-msgstr "Licence hlášky ‘%1$s’ není kompatibilní s licencí webu ‘%2$s’."
-
 #. TRANS: Client error displayed when trying to add an unindentified field to profile.
 #. TRANS: %s is a field name.
 #, php-format
@@ -4471,6 +4289,8 @@ msgid "Share my current location when posting notices"
 msgstr "Sdělit mou aktuální polohu při posílání hlášek"
 
 #. TRANS: Field label in form for profile settings.
+#. TRANS: Title for group tag cloud section.
+#. TRANS: %s is a group name.
 msgid "Tags"
 msgstr "Tagy"
 
@@ -4499,9 +4319,8 @@ msgid "What timezone are you normally in?"
 msgstr "V jaké �asové zóně se oby�ejně nacházíte?"
 
 #. TRANS: Checkbox label in form for profile settings.
-#, fuzzy
 msgid ""
-"Automatically subscribe to whoever subscribes to me (best for non-humans)."
+"Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr ""
 "Automaticky se přihlásit k odběru toho kdo se přihlásil ke mně (nejlepší pro "
 "ne-lidi)"
@@ -4574,11 +4393,6 @@ msgstr "Nelze uložit nastavení umístění."
 msgid "Could not save tags."
 msgstr "Nelze uložit nálepky"
 
-#. TRANS: Confirmation shown when user profile settings are saved.
-#. TRANS: Message after successful saving of administrative settings.
-msgid "Settings saved."
-msgstr "Nastavení uloženo"
-
 #. TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
 #. TRANS: Page title for page where a user account can be restored from backup.
 #, fuzzy
@@ -4592,7 +4406,8 @@ msgid "Beyond the page limit (%s)."
 msgstr "Přes limit stránky (%s)."
 
 #. TRANS: Server error displayed when a public timeline cannot be retrieved.
-msgid "Could not retrieve public stream."
+#, fuzzy
+msgid "Could not retrieve public timeline."
 msgstr "Nepodařilo se získat veřejný proud."
 
 #. TRANS: Title for all public timeline pages but the first.
@@ -4607,15 +4422,23 @@ msgid "Public timeline"
 msgstr "Veřejné zprávy"
 
 #. TRANS: Link description for public timeline feed.
-msgid "Public Stream Feed (RSS 1.0)"
+#, fuzzy
+msgid "Public Timeline Feed (Activity Streams JSON)"
+msgstr "Veřejný Stream Feed (Atom)"
+
+#. TRANS: Link description for public timeline feed.
+#, fuzzy
+msgid "Public Timeline Feed (RSS 1.0)"
 msgstr "Veřejný Stream Feed (RSS 1.0)"
 
 #. TRANS: Link description for public timeline feed.
-msgid "Public Stream Feed (RSS 2.0)"
+#, fuzzy
+msgid "Public Timeline Feed (RSS 2.0)"
 msgstr "Veřejný Stream Feed (RSS 2.0)"
 
 #. TRANS: Link description for public timeline feed.
-msgid "Public Stream Feed (Atom)"
+#, fuzzy
+msgid "Public Timeline Feed (Atom)"
 msgstr "Veřejný Stream Feed (Atom)"
 
 #. TRANS: Text displayed for public feed when there are no public notices.
@@ -4663,50 +4486,6 @@ msgstr ""
 "faq#mikroblog) služba založená na Free Software nástroji [StatusNet](http://"
 "status.net/)."
 
-#. TRANS: Title for page with public list cloud.
-#, fuzzy
-msgid "Public list cloud"
-msgstr "Veřejný tag cloud"
-
-#. TRANS: Page notice for page with public list cloud.
-#. TRANS: %s is a StatusNet sitename.
-#, fuzzy, php-format
-msgid "These are largest lists on %s"
-msgstr "Poslední nejpopulárnější zna�ky na %s "
-
-#. TRANS: Empty list message on page with public list cloud.
-#. TRANS: This message contains Markdown links in the form [description](link).
-#, fuzzy, php-format
-msgid "No one has [listed](%%doc.tags%%) anyone yet."
-msgstr "Nikdo ještě neposlal oznámení s [tagem](%%doc.tags%%)."
-
-#. TRANS: Additional empty list message on page with public list cloud for logged in users.
-#, fuzzy
-msgid "Be the first to list someone!"
-msgstr "Pošlete něco jako první!"
-
-#. TRANS: Additional empty list message on page with public list cloud for anonymous users.
-#. TRANS: This message contains Markdown links in the form [description](link).
-#, fuzzy, php-format
-msgid ""
-"Why not [register an account](%%action.register%%) and be the first to list "
-"someone!"
-msgstr ""
-"Pro� ne [zaregistrovat ú�et](%%action.register%%) a poslat něco jako první!"
-
-#. TRANS: DT element on on page with public list cloud.
-#, fuzzy
-msgid "List cloud"
-msgstr " API metoda nebyla nalezena."
-
-#. TRANS: Link title for number of listed people. %d is the number of listed people.
-#, php-format
-msgid "1 person listed"
-msgid_plural "%d people listed"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
 #. TRANS: Public RSS feed description. %s is the StatusNet site name.
 #, fuzzy, php-format
 msgid "%s updates from everyone."
@@ -4832,7 +4611,6 @@ msgid "6 or more characters, and do not forget it!"
 msgstr "6 a více znaků, a nezapomeňte ho!"
 
 #. TRANS: Button text for password reset form.
-#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Reset"
@@ -4842,18 +4620,6 @@ msgstr "Reset"
 msgid "Enter a nickname or email address."
 msgstr "Zadej přezdívku nebo emailovou adresu"
 
-#. TRANS: Information on password recovery form if no known username or e-mail address was specified.
-msgid "No user with that email address or username."
-msgstr "Žádný uživatel s touto e-mailovou adresu nebo uživatelským jménem."
-
-#. TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.
-msgid "No registered email address for that user."
-msgstr "Žádný registrovaný email pro tohoto uživatele."
-
-#. TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.
-msgid "Error saving address confirmation."
-msgstr "Chyba při ukládání potvrzení adresy"
-
 #. TRANS: User notification after an e-mail with instructions was sent from the password recovery form.
 msgid ""
 "Instructions for recovering your password have been sent to the email "
@@ -5041,81 +4807,6 @@ msgstr ""
 "(Měli byste za okamžik obdržet e-mailem zprávu s instrukcemi, jak potvrdit "
 "svou e-mailovou adresu.)"
 
-#. TRANS: Page notice for remote subscribe. This message contains Markdown links.
-#. TRANS: Ensure to keep the correct markup of [link description](link).
-#, php-format
-msgid ""
-"To subscribe, you can [login](%%action.login%%), or [register](%%action."
-"register%%) a new  account. If you already have an account  on a [compatible "
-"microblogging site](%%doc.openmublog%%),  enter your profile URL below."
-msgstr ""
-"Pro odebírání, se musíte [přihlásit](%%action.login%%), nebo [registrovat](%%"
-"action.register%%) nový ú�et. Pokud již máte ú�et na [kompatibilních "
-"mikroblozích](%%doc.openmublog%%), vložte níže adresu."
-
-#. TRANS: Page title for Remote subscribe.
-msgid "Remote subscribe"
-msgstr "Vzdálený odběr"
-
-#. TRANS: Field legend on page for remote subscribe.
-msgid "Subscribe to a remote user"
-msgstr "Přihlásit se ke vzdálenému uživateli"
-
-#. TRANS: Field label on page for remote subscribe.
-msgid "User nickname"
-msgstr "Přezdívka uživatele"
-
-#. TRANS: Field title on page for remote subscribe.
-#, fuzzy
-msgid "Nickname of the user you want to follow."
-msgstr "Přezdívka uživatele, kterého chcete sledovat"
-
-#. TRANS: Field label on page for remote subscribe.
-msgid "Profile URL"
-msgstr "Adresa Profilu"
-
-#. TRANS: Field title on page for remote subscribe.
-#, fuzzy
-msgid "URL of your profile on another compatible microblogging service."
-msgstr "Adresa profilu na jiných kompatibilních mikroblozích."
-
-#. TRANS: Button text on page for remote subscribe.
-#. TRANS: Link text for link that will subscribe to a remote profile.
-#. TRANS: Button text to subscribe to a user.
-#. TRANS: Button text for subscribing to a list.
-#, fuzzy
-msgctxt "BUTTON"
-msgid "Subscribe"
-msgstr "Odebírat"
-
-#. TRANS: Form validation error on page for remote subscribe when an invalid profile URL was provided.
-#, fuzzy
-msgid "Invalid profile URL (bad format)."
-msgstr "Neplatná adresa profilu (špatný formát)"
-
-#. TRANS: Form validation error on page for remote subscribe when no the provided profile URL
-#. TRANS: does not contain expected data.
-msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
-msgstr ""
-"Není platnou adresou profilu (není YADIS dokumentem nebo definováno neplatné "
-"XRDS)."
-
-#. TRANS: Form validation error on page for remote subscribe.
-#, fuzzy
-msgid "That is a local profile! Login to subscribe."
-msgstr "To je místní profil! Pro přihlášení k odběru se přihlášte."
-
-#. TRANS: Form validation error on page for remote subscribe when the remote service is not providing a request token.
-#, fuzzy
-msgid "Could not get a request token."
-msgstr "Nelze získat řetězec požadavku."
-
-#. TRANS: Client error displayed when trying to (un)list an OMB 0.1 remote profile.
-#, fuzzy
-msgid "You cannot (un)list an OMB 0.1 remote profile with this action."
-msgstr ""
-"Touto akcí se nemůžete se přihlásit k odběru vzdáleného OMB 0.1 profilu."
-
 #. TRANS: Client error displayed when an unknown error occurs while delisting a user.
 #. TRANS: %s is a username.
 #, php-format
@@ -5168,6 +4859,12 @@ msgstr "Odpovědi na %s"
 msgid "Replies to %1$s, page %2$d"
 msgstr "Odpovědi na %1$s, strana %2$d"
 
+#. TRANS: Link for feed with replies for a user.
+#. TRANS: %s is a user nickname.
+#, fuzzy, php-format
+msgid "Replies feed for %s (Activity Streams JSON)"
+msgstr "Feed odpovědí pro %s (Atom)"
+
 #. TRANS: Link for feed with replies for a user.
 #. TRANS: %s is a user nickname.
 #, php-format
@@ -5291,7 +4988,7 @@ msgstr ""
 
 #. TRANS: Form instructions for feed restore.
 msgid ""
-"You can upload a backed-up stream in <a href=\"http://activitystrea.ms/"
+"You can upload a backed-up timeline in <a href=\"http://activitystrea.ms/"
 "\">Activity Streams</a> format."
 msgstr ""
 
@@ -5417,6 +5114,26 @@ msgstr "Resetovat klí� a tajemství"
 msgid "Application info"
 msgstr "Info o aplikaci"
 
+#. TRANS: Field label on application page.
+msgid "Consumer key"
+msgstr "Spotřebitelský klí�"
+
+#. TRANS: Field label on application page.
+msgid "Consumer secret"
+msgstr "Spotřebitelské tajemství"
+
+#. TRANS: Field label on application page.
+msgid "Request token URL"
+msgstr "Adresa řetězce požadavku"
+
+#. TRANS: Field label on application page.
+msgid "Access token URL"
+msgstr "URL Access tokenu"
+
+#. TRANS: Field label on application page.
+msgid "Authorize URL"
+msgstr "Authoriza�ní URL"
+
 #. TRANS: Note on the OAuth application page about signature support.
 #, fuzzy
 msgid ""
@@ -5439,6 +5156,11 @@ msgstr "Oblíbená oznámení uživatele %1$s, strana %2$d"
 msgid "Could not retrieve favorite notices."
 msgstr "Nepodařilo se získat oblíbená oznámení."
 
+#. TRANS: Feed link text. %s is a username.
+#, fuzzy, php-format
+msgid "Feed for favorites of %s (Activity Streams JSON)"
+msgstr "Feed oblíbených oznámení uživatele %s (Atom)"
+
 #. TRANS: Feed link text. %s is a username.
 #, php-format
 msgid "Feed for favorites of %s (RSS 1.0)"
@@ -5500,6 +5222,11 @@ msgstr "skupina %s"
 msgid "%1$s group, page %2$d"
 msgstr "skupina %1$s, str. %2$d"
 
+#. TRANS: Tooltip for feed link. %s is a group nickname.
+#, fuzzy, php-format
+msgid "Notice feed for %s group (Activity Streams JSON)"
+msgstr "Feed sdělení skupiny %s (Atom)"
+
 #. TRANS: Tooltip for feed link. %s is a group nickname.
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
@@ -5520,44 +5247,8 @@ msgstr "Feed sdělení skupiny %s (Atom)"
 msgid "FOAF for %s group"
 msgstr "FOAF pro skupinu %s"
 
-#. TRANS: Header for mini list of group members on a group page (h2).
-msgid "Members"
-msgstr "Členové"
-
-#. TRANS: Description for mini list of group members on a group page when the group has no members.
-#. TRANS: Content of "Listed" page if there are no listed users.
-#. TRANS: Content of "People following tag x" if there are no subscribed users.
-#. TRANS: Empty list message for tags.
-#. TRANS: Text for user subscription statistics if the user has no subscriptions.
-#. TRANS: Text for user subscriber statistics if user has no subscribers.
-#. TRANS: Text for user user group membership statistics if user is not a member of any group.
-#. TRANS: Default content for section/sidebar widget.
-msgid "(None)"
-msgstr "(nic)"
-
-#. TRANS: Link to all group members from mini list of group members if group has more than n members.
-msgid "All members"
-msgstr "Všichni �lenové"
-
-#. TRANS: Header for group statistics on a group page (h2).
-#. TRANS: H2 text for user statistics.
-msgid "Statistics"
-msgstr "Statistiky"
-
-#. TRANS: Label for group creation date.
-#, fuzzy
-msgctxt "LABEL"
-msgid "Created"
-msgstr "Vytvořeno"
-
-#. TRANS: Label for member count in statistics on group page.
-#, fuzzy
-msgctxt "LABEL"
-msgid "Members"
-msgstr "Členové"
-
 #. TRANS: Notice on group pages for anonymous users for StatusNet sites that accept new registrations.
-#. TRANS: **%s** is the group alias, %%%%site.name%%%% is the site name,
+#. TRANS: %s is the group name, %%%%site.name%%%% is the site name,
 #. TRANS: %%%%action.register%%%% is the URL for registration, %%%%doc.help%%%% is a URL to help.
 #. TRANS: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
 #, php-format
@@ -5575,26 +5266,20 @@ msgstr ""
 "�lenem této skupiny a mnoha dalších! ([Čtěte více](%%%%doc.help%%%%))"
 
 #. TRANS: Notice on group pages for anonymous users for StatusNet sites that accept no new registrations.
-#. TRANS: **%s** is the group alias, %%%%site.name%%%% is the site name,
+#. TRANS: %s is the group name, %%%%site.name%%%% is the site name,
 #. TRANS: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
-#, php-format
+#, fuzzy, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
 "wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
 "[StatusNet](http://status.net/) tool. Its members share short messages about "
-"their life and interests. "
+"their life and interests."
 msgstr ""
 "**%s** je skupina uživatelů na %%%%site.name%%%%, [mikro-blogovací](http://"
 "drbz.cz/i/napoveda-faq#mikroblog) službě založené na Free Software nástroji "
 "[StatusNet](http://status.net/). Její �lenové sdílejí krátké zprávy o svém "
 "životě a zájmech.  "
 
-#. TRANS: Title for list of group administrators on a group page.
-#, fuzzy
-msgctxt "TITLE"
-msgid "Admins"
-msgstr "Adminové"
-
 #. TRANS: Client error displayed requesting a single message that does not exist.
 msgid "No such message."
 msgstr "Žádné takové zprávy."
@@ -5690,10 +5375,22 @@ msgstr ""
 "Pro� ne [zaregistrovat ú�et](%%action.register%%) a poslat něco jako první!"
 
 #. TRANS: Header on show list page.
+#. TRANS: Link description for link to list of users tagged with a tag (so part of a list).
 #, fuzzy
 msgid "Listed"
 msgstr "Licence"
 
+#. TRANS: Content of "Listed" page if there are no listed users.
+#. TRANS: Content of "People following tag x" if there are no subscribed users.
+#. TRANS: Description for mini list of group members on a group page when the group has no members.
+#. TRANS: Empty list message for tags.
+#. TRANS: Text for user subscription statistics if the user has no subscriptions.
+#. TRANS: Text for user subscriber statistics if user has no subscribers.
+#. TRANS: Text for user user group membership statistics if user is not a member of any group.
+#. TRANS: Default content for section/sidebar widget.
+msgid "(None)"
+msgstr "(nic)"
+
 #. TRANS: Link for more "People in list x by a user"
 #. TRANS: if there are more than the mini list's maximum.
 msgid "Show all"
@@ -5704,24 +5401,19 @@ msgstr ""
 msgid "Subscribers"
 msgstr "Odběratelé"
 
-#. TRANS: Link for more "People following tag x"
-#. TRANS: if there are more than the mini list's maximum.
-msgid "All subscribers"
-msgstr "Všichni odběratelé"
-
-#. TRANS: Page title showing tagged notices in one user's stream.
+#. TRANS: Page title showing tagged notices in one user's timeline.
 #. TRANS: %1$s is the username, %2$s is the hash tag.
 #, fuzzy, php-format
 msgid "Notices by %1$s tagged %2$s"
 msgstr "%1$s, strana %2$d"
 
-#. TRANS: Page title showing tagged notices in one user's stream.
+#. TRANS: Page title showing tagged notices in one user's timeline.
 #. TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number.
 #, fuzzy, php-format
 msgid "Notices by %1$s tagged %2$s, page %3$d"
 msgstr "Oznámení ozna�ená %1$s, strana %2$d"
 
-#. TRANS: Extended page title showing tagged notices in one user's stream.
+#. TRANS: Extended page title showing tagged notices in one user's timeline.
 #. TRANS: %1$s is the username, %2$d is the page number.
 #, fuzzy, php-format
 msgid "Notices by %1$s, page %2$d"
@@ -5733,6 +5425,12 @@ msgstr "Oznámení ozna�ená %1$s, strana %2$d"
 msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
 msgstr "Feed oznámení pro %1$s otagovaných %2$s (RSS 1.0)"
 
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#, fuzzy, php-format
+msgid "Notice feed for %s (Activity Streams JSON)"
+msgstr "Feed oznámení pro %1$s (Atom)"
+
 #. TRANS: Title for link to notice feed.
 #. TRANS: %s is a user nickname.
 #, php-format
@@ -5757,7 +5455,7 @@ msgstr "Feed oznámení pro %1$s (Atom)"
 msgid "FOAF for %s"
 msgstr "FOAF pro %s"
 
-#. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
+#. TRANS: First sentence of empty list message for a timeline. $1%s is a user nickname.
 #, fuzzy, php-format
 msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
 msgstr "Toto je �asová osa pro %1$s, ale %2$s zatím ni�ím nepřispěli."
@@ -5770,7 +5468,7 @@ msgstr ""
 "Viděli jste v poslední době zajímavého? Nemáte zatím žádné oznámení, te� by "
 "byl dobrý �as za�ít:)"
 
-#. TRANS: Second sentence of empty  list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
+#. TRANS: Second sentence of empty  list message for a non-self timeline. %1$s is a user nickname, %2$s is a part of a URL.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
 #, php-format
 msgid ""
@@ -5780,7 +5478,7 @@ msgstr ""
 "Můžete se pokusit uživatele %1$s postr�it nebo [jim něco poslat](%%%%action."
 "newnotice%%%%?status_textarea=%2$s)."
 
-#. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
+#. TRANS: Announcement for anonymous users showing a timeline if site registrations are open.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
 #, php-format
 msgid ""
@@ -5794,13 +5492,13 @@ msgstr ""
 "(http://status.net/). [Zaregistrujte se](%%%%action.register%%%%) a sledujte "
 "oznámení od **%s**a mnoha dalších! ([Čtěte více](%%%%doc.help%%%%))"
 
-#. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
+#. TRANS: Announcement for anonymous users showing a timeline if site registrations are closed or invite only.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#, php-format
+#, fuzzy, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
 "wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
-"[StatusNet](http://status.net/) tool. "
+"[StatusNet](http://status.net/) tool."
 msgstr ""
 "**%s** má ú�et na %%%%site.name%%%%, [mikro-blogovací](http://drbz.cz/i/"
 "napoveda-faq#mikroblog) službě založené na Free Software nástroji [StatusNet]"
@@ -5838,6 +5536,15 @@ msgstr "Název webu musí mít nenulovou délku."
 msgid "You must have a valid contact email address."
 msgstr "Musíte mít platnou kontaktní emailovou adresu."
 
+#. TRANS: Client error displayed when a logo URL is not valid.
+msgid "Invalid logo URL."
+msgstr "Neplatná URL loga."
+
+#. TRANS: Client error displayed when a SSL logo URL is invalid.
+#, fuzzy
+msgid "Invalid SSL logo URL."
+msgstr "Neplatná URL loga."
+
 #. TRANS: Client error displayed trying to save site settings with an invalid language code.
 #. TRANS: %s is the invalid language code.
 #, php-format
@@ -5915,7 +5622,9 @@ msgid "Default language"
 msgstr "Výchozí jazyk"
 
 #. TRANS: Dropdown title on site settings panel.
-msgid "Site language when autodetection from browser settings is not available"
+#, fuzzy
+msgid ""
+"The site language when autodetection from browser settings is not available."
 msgstr "Jazyk stránky když není k dispozici autodetekce z nastavení prohlíže�e"
 
 #. TRANS: Fieldset legend on site settings panel.
@@ -5941,8 +5650,22 @@ msgid "How long users must wait (in seconds) to post the same thing again."
 msgstr ""
 "Jak dlouho uživatel musí �ekat (v sekundách) než může poslat totéž znovu."
 
+#. TRANS: Fieldset legend for form to change logo.
+msgid "Logo"
+msgstr "Logo"
+
+#. TRANS: Field label for StatusNet site logo.
+msgid "Site logo"
+msgstr "Logo stránek"
+
+#. TRANS: Field label for SSL StatusNet site logo.
+#, fuzzy
+msgid "SSL logo"
+msgstr "Logo stránek"
+
 #. TRANS: Button title for saving site settings.
-msgid "Save site settings"
+#, fuzzy
+msgid "Save the site settings."
 msgstr "Uložit Nastavení webu"
 
 #. TRANS: Page title for site-wide notice tab in admin panel.
@@ -5971,7 +5694,7 @@ msgstr "Text sdělení stránky"
 msgid "Site-wide notice text (255 characters maximum; HTML allowed)"
 msgstr "Celo-webové sdělení (255 znaků max., s HTML)"
 
-#. TRANS: Title for button to save site notice in admin panel.
+#. TRANS: Button title to save site notice in admin panel.
 #, fuzzy
 msgid "Save site notice."
 msgstr "Uložit oznámení stránky"
@@ -6172,7 +5895,7 @@ msgstr "Reportovací URL"
 msgid "Snapshots will be sent to this URL."
 msgstr "Na tuto adresu budou poslány snímky"
 
-#. TRANS: Title for button to save snapshot settings.
+#. TRANS: Button title to save snapshot settings.
 #, fuzzy
 msgid "Save snapshot settings."
 msgstr "Uložit nastavení snímkování"
@@ -6207,11 +5930,6 @@ msgstr "�lenové skupiny %1$s, strana %2$d"
 msgid "A list of users awaiting approval to subscribe to you."
 msgstr "Seznam uživatelů v této skupině."
 
-#. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
-msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
-msgstr ""
-"Touto akcí se nemůžete se přihlásit k odběru vzdáleného OMB 0.1 profilu."
-
 #. TRANS: Page title when subscription succeeded.
 msgid "Subscribed"
 msgstr "Prihlášen"
@@ -6310,13 +6028,12 @@ msgstr "Toto jsou lidé, jejímž sdělením %s naslouchá"
 #. TRANS: This message contains Markdown URLs. The link description is between
 #. TRANS: square brackets, and the link between parentheses. Do not separate "]("
 #. TRANS: and do not change the URL part.
-#, php-format
+#, fuzzy, php-format
 msgid ""
 "You're not listening to anyone's notices right now, try subscribing to "
 "people you know. Try [people search](%%action.peoplesearch%%), look for "
 "members in groups you're interested in and in our [featured users](%%action."
-"featured%%). If you're a [Twitter user](%%action.twittersettings%%), you can "
-"automatically subscribe to people you already follow there."
+"featured%%)."
 msgstr ""
 "Momentálně nenasloucháte ní�ím oznámením, zkuste se přihlásit k lidem které "
 "znáte. Zkuste [Vyhledávání lidí](%%action.peoplesearch%%), podívejte se po "
@@ -6353,6 +6070,12 @@ msgstr "SMS"
 msgid "Notices tagged with %1$s, page %2$d"
 msgstr "Oznámení ozna�ená %1$s, strana %2$d"
 
+#. TRANS: Link label for feed on "notices with tag" page.
+#. TRANS: %s is the tag the feed is for.
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (Activity Streams JSON)"
+msgstr "Feed oznámení ozna�ených %s (Atom)"
+
 #. TRANS: Link label for feed on "notices with tag" page.
 #. TRANS: %s is the tag the feed is for.
 #, php-format
@@ -6463,17 +6186,6 @@ msgstr "Odhlášeno"
 msgid "%1$s unsubscribed from list %2$s by %3$s"
 msgstr "odběratelé %1$s, strana %2$d"
 
-#. TRANS: Client error displayed when trying to update profile with an incompatible license.
-#. TRANS: %1$s is the license incompatible with site license %2$s.
-#. TRANS: Exception thrown when licenses are not compatible for an authorisation request.
-#. TRANS: %1$s is the license for the listenee, %2$s is the license for "this" StatusNet site.
-#, fuzzy, php-format
-msgid ""
-"Listenee stream license \"%1$s\" is not compatible with site license \"%2$s"
-"\"."
-msgstr ""
-"Licence naslouchaného '%1$s' není kompatibilní s licencí stránky '%2$s'."
-
 #. TRANS: Title of URL settings tab in profile settings.
 #, fuzzy
 msgid "URL settings"
@@ -6613,162 +6325,11 @@ msgstr "Pozvánky povoleny"
 msgid "Whether to allow users to invite new users."
 msgstr "Zda chcete uživatelům umožnit pozvat nové uživatele."
 
-#. TRANS: Title for button to save user settings in user admin panel.
+#. TRANS: Button title to save user settings in user admin panel.
 #, fuzzy
 msgid "Save user settings."
 msgstr "Uložit Nastavení webu"
 
-#. TRANS: Page title.
-msgid "Authorize subscription"
-msgstr "Autorizujte přihlášení"
-
-#. TRANS: Page notice on "Authorize subscription" page.
-#, fuzzy
-msgid ""
-"Please check these details to make sure that you want to subscribe to this "
-"user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
-"click \"Reject\"."
-msgstr ""
-"Prosím zkontrolujte tyto detailu, a ujistěte se že opravdu chcete odebírat "
-"sdělení tohoto uživatele. Pokud jste právě nepožádali o přihlášení k tomuto "
-"uživteli, klikněte na \"Zrušit\""
-
-#. TRANS: Button text on Authorise Subscription page.
-#. TRANS: Submit button text to accept a group membership request on approve group form.
-#. TRANS: Submit button text to accept a subscription request on approve sub form.
-#, fuzzy
-msgctxt "BUTTON"
-msgid "Accept"
-msgstr "Přijmout"
-
-#. TRANS: Title for button on Authorise Subscription page.
-#. TRANS: Button title to subscribe to a user.
-#, fuzzy
-msgid "Subscribe to this user."
-msgstr "Přihlásit se k tomuto uživateli"
-
-#. TRANS: Button text on Authorise Subscription page.
-#. TRANS: Submit button text to reject a group membership request on approve group form.
-#. TRANS: Submit button text to reject a subscription request on approve sub form.
-#, fuzzy
-msgctxt "BUTTON"
-msgid "Reject"
-msgstr "Odmítnout"
-
-#. TRANS: Title for button on Authorise Subscription page.
-#, fuzzy
-msgid "Reject this subscription."
-msgstr "Odmítnout toto přihlášení"
-
-#. TRANS: Client error displayed for an empty authorisation request.
-msgid "No authorization request!"
-msgstr "Žádná žádost o autorizaci!"
-
-#. TRANS: Accept message header from Authorise subscription page.
-msgid "Subscription authorized"
-msgstr "Odběr autorizován"
-
-#. TRANS: Accept message text from Authorise subscription page.
-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 autorizován, ale nepřišla žádná callback adresa. Zkontrolujte v "
-"nápovědě jak správně postupovat při autorizování odběru. Váš řetězec odběru "
-"je:"
-
-#. TRANS: Reject message header from Authorise subscription page.
-msgid "Subscription rejected"
-msgstr "Odběr odmítnut"
-
-#. TRANS: Reject message from Authorise subscription page.
-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 nepřišla žádná callback adresa. Zkontrolujte v "
-"nápovědě jak správně postupovat pro plné zamítnutí odběru."
-
-#. TRANS: Exception thrown when no valid user is found for an authorisation request.
-#. TRANS: %s is a listener URI.
-#, fuzzy, php-format
-msgid "Listener URI \"%s\" not found here."
-msgstr "Naslouchací URI ‘%s’ zde nebyl nalezen."
-
-#. TRANS: Exception thrown when listenee URI is too long for an authorisation request.
-#. TRANS: %s is a listenee URI.
-#, fuzzy, php-format
-msgid "Listenee URI \"%s\" is too long."
-msgstr "Naslouchací URI ‘%s’ je příliš dlouhý."
-
-#. TRANS: Exception thrown when listenee URI is a local user for an authorisation request.
-#. TRANS: %s is a listenee URI.
-#, fuzzy, php-format
-msgid "Listenee URI \"%s\" is a local user."
-msgstr "Naslouchací URI ‘%s’ je místní uživatel."
-
-#. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
-#. TRANS: %s is a profile URL.
-#, fuzzy, php-format
-msgid "Profile URL \"%s\" is for a local user."
-msgstr "URL profilu '%s' je pro místního uživatele."
-
-#. TRANS: Exception thrown when avatar URL is invalid for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#, fuzzy, php-format
-msgid "Avatar URL \"%s\" is not valid."
-msgstr "URL avataru ‘%s’ není platný."
-
-#. TRANS: Exception thrown when avatar URL could not be read for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#, fuzzy, php-format
-msgid "Cannot read avatar URL \"%s\"."
-msgstr "Nelze na�íst avatara z URL '%s'"
-
-#. TRANS: Exception thrown when avatar URL return an invalid image type for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#, fuzzy, php-format
-msgid "Wrong image type for avatar URL \"%s\"."
-msgstr "Špatný typ obrázku na URL '%s'"
-
-#. TRANS: Title for profile design page.
-#. TRANS: Page title for profile design page.
-msgid "Profile design"
-msgstr "Vzhled profilu"
-
-#. TRANS: Instructions for Profile design page.
-#. TRANS: Instructions for profile design page.
-msgid ""
-"Customize the way your profile looks with a background image and a colour "
-"palette of your choice."
-msgstr ""
-"Přizpůsobit vzhled vašeho profilu obrázkem na pozadí a barevnou paletou "
-"vašeho výběru."
-
-#. TRANS: Succes message on Profile design page when finding an easter egg.
-msgid "Enjoy your hotdog!"
-msgstr "Užijte si svůj párek v rohlíku!"
-
-#. TRANS: Form legend on Profile design page.
-#, fuzzy
-msgid "Design settings"
-msgstr "Uložit Nastavení webu"
-
-#. TRANS: Checkbox label on Profile design page.
-msgid "View profile designs"
-msgstr "Zobrazit vzhledy profilu"
-
-#. TRANS: Title for checkbox on Profile design page.
-msgid "Show or hide profile designs."
-msgstr "Zobrazit nebo skrýt vzhledy profilu."
-
-#. TRANS: Form legend on Profile design page for form to choose a background image.
-#, fuzzy
-msgid "Background file"
-msgstr "Pozadí"
-
 #. TRANS: Page title for all but the first page of groups for a user.
 #. TRANS: %1$s is a nickname, %2$d is a page number.
 #, php-format
@@ -6808,9 +6369,9 @@ msgstr "StatusNet %s"
 
 #. TRANS: Content part of StatusNet version page.
 #. TRANS: %1$s is the engine name (StatusNet) and %2$s is the StatusNet version.
-#, php-format
+#, fuzzy, php-format
 msgid ""
-"This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, "
+"This site is powered by %1$s version %2$s, Copyright 2008-2011 StatusNet, "
 "Inc. and contributors."
 msgstr ""
 "Tato webová stránka je poháněna a běží na programu %1$S verze %2$s, "
@@ -6825,11 +6386,12 @@ msgid "License"
 msgstr "Licence"
 
 #. TRANS: Content part of StatusNet version page.
+#, fuzzy
 msgid ""
 "StatusNet is free software: you can redistribute it and/or modify it under "
 "the terms of the GNU Affero General Public License as published by the Free "
 "Software Foundation, either version 3 of the License, or (at your option) "
-"any later version. "
+"any later version."
 msgstr ""
 "StatusNet je svobodný software: můžete jej šířit a / nebo modifikovat podle "
 "podmínek GNU Affero General Public License, vydávané Free Software "
@@ -6837,11 +6399,12 @@ msgstr ""
 "kterékoli pozdější verze. "
 
 #. TRANS: Content part of StatusNet version page.
+#, fuzzy
 msgid ""
 "This program is distributed in the hope that it will be useful, but WITHOUT "
 "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
 "FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License "
-"for more details. "
+"for more details."
 msgstr ""
 "Tento program je rozšiřován v naději, že bude užite�ný, avšak BEZ JAKÉKOLI "
 "Z�RUKY; neposkytují se ani odvozené záruky PRODEJNOSTI anebo VHODNOSTI PRO "
@@ -6905,16 +6468,27 @@ msgstr "Nemůžu zpracovat URL '%s'"
 msgid "Robin thinks something is impossible."
 msgstr "Robin si myslí, že je něco nemožné."
 
+#. TRANS: Message used to be inserted as %2$s in  the text "No file may
+#. TRANS: be larger than %1$d byte and the file you sent was %2$s.".
+#. TRANS: %1$d is the number of bytes of an uploaded file.
+#, php-format
+msgid "%1$d byte"
+msgid_plural "%1$d bytes"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
 #. TRANS: Message given if an upload is larger than the configured maximum.
-#. TRANS: %1$d is the byte limit for uploads, %2$d is the byte count for the uploaded file.
-#. TRANS: %1$s is used for plural.
+#. TRANS: %1$d (used for plural) is the byte limit for uploads,
+#. TRANS: %2$s is the proper form of "n bytes". This is the only ways to have
+#. TRANS: gettext support multiple plurals in the same message, unfortunately...
 #, fuzzy, php-format
 msgid ""
-"No file may be larger than %1$d byte and the file you sent was %2$d bytes. "
-"Try to upload a smaller version."
+"No file may be larger than %1$d byte and the file you sent was %2$s. Try to "
+"upload a smaller version."
 msgid_plural ""
-"No file may be larger than %1$d bytes and the file you sent was %2$d bytes. "
-"Try to upload a smaller version."
+"No file may be larger than %1$d bytes and the file you sent was %2$s. Try to "
+"upload a smaller version."
 msgstr[0] ""
 "Žádný soubor nesmí být větší než %1$d bajtů a soubor, který jste poslal měl %"
 "2$d bajtů. Zkuste nahrát menší verzi."
@@ -6991,6 +6565,11 @@ msgstr "Nelze aktualizovat místní skupinu."
 msgid "Could not create login token for %s"
 msgstr "Nelze vytvořit přihlašovací token pro %s"
 
+#. TRANS: Exception thrown when a program code class (%s) cannot be instantiated.
+#, fuzzy, php-format
+msgid "Cannot instantiate class %s."
+msgstr "Nelze uložit nové heslo"
+
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.
 msgid "No database name or DSN found anywhere."
 msgstr "Nenalezeno jméno databáze ani DSN."
@@ -7154,7 +6733,7 @@ msgstr ""
 #, php-format
 msgid ""
 "You already have %1$d or more people in list %2$s, which is the maximum "
-"allowed number.Try unlisting others first."
+"allowed number. Try unlisting others first."
 msgstr ""
 
 #. TRANS: Exception thrown when inserting a list subscription in the database fails.
@@ -7176,7 +6755,6 @@ msgid "Unable to save tag."
 msgstr "Nelze uložit tag."
 
 #. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
-#. TRANS: Error message displayed to a banned user when they try to subscribe.
 msgid "You have been banned from subscribing."
 msgstr "Byl jste vykázán (banned) z přihlašování se."
 
@@ -7196,10 +6774,6 @@ msgstr "Nepřihlášen!"
 msgid "Could not delete self-subscription."
 msgstr "Nelze smazat odebírání sebe sama"
 
-#. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
-msgid "Could not delete subscription OMB token."
-msgstr "Nelze smazat OMB token přihlášení."
-
 #. TRANS: Exception thrown when a subscription could not be deleted on the server.
 msgid "Could not delete subscription."
 msgstr "Nelze smazat odebírání"
@@ -7234,6 +6808,18 @@ msgstr "Nenastaven uživatel pro jednouživatelský mód"
 msgid "Single-user mode code called when not enabled."
 msgstr ""
 
+#. TRANS: Information on password recovery form if no known username or e-mail address was specified.
+msgid "No user with that email address or username."
+msgstr "Žádný uživatel s touto e-mailovou adresu nebo uživatelským jménem."
+
+#. TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.
+msgid "No registered email address for that user."
+msgstr "Žádný registrovaný email pro tohoto uživatele."
+
+#. TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.
+msgid "Error saving address confirmation."
+msgstr "Chyba při ukládání potvrzení adresy"
+
 #. TRANS: Server exception thrown when creating a group failed.
 msgid "Could not create group."
 msgstr "Nelze vytvořit skupinu."
@@ -7507,27 +7093,12 @@ msgstr "showForm () není implementována."
 msgid "saveSettings() not implemented."
 msgstr "saveSettings () není implementována."
 
-#. TRANS: Client error message thrown if design settings could not be deleted in
-#. TRANS: the admin panel Design.
-msgid "Unable to delete design setting."
-msgstr "Nelze smazat nastavení vzhledu."
-
 #. TRANS: Header in administrator navigation panel.
-#. TRANS: Header in settings navigation panel.
 #, fuzzy
 msgctxt "HEADER"
 msgid "Home"
 msgstr "Moje stránky"
 
-#. TRANS: Menu item in administrator navigation panel.
-#. TRANS: Menu item in default local navigation panel.
-#. TRANS: Menu item in personal group navigation menu.
-#. TRANS: Menu item in settings navigation panel.
-#, fuzzy
-msgctxt "MENU"
-msgid "Home"
-msgstr "Moje stránky"
-
 #. TRANS: Header in administrator navigation panel.
 #, fuzzy
 msgctxt "HEADER"
@@ -7543,17 +7114,6 @@ msgctxt "MENU"
 msgid "Site"
 msgstr "Stránky"
 
-#. TRANS: Menu item title in administrator navigation panel.
-msgid "Design configuration"
-msgstr "Nastavení vzhledu"
-
-#. TRANS: Menu item in administrator navigation panel.
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: Menu item in settings navigation panel.
-msgctxt "MENU"
-msgid "Design"
-msgstr "Vzhled"
-
 #. TRANS: Menu item title in administrator navigation panel.
 msgid "User configuration"
 msgstr "Akce uživatele"
@@ -7660,43 +7220,6 @@ msgstr ""
 msgid "Could not authenticate you."
 msgstr ""
 
-#. TRANS: Server error displayed when trying to create an anynymous OAuth consumer.
-#, fuzzy
-msgid "Could not create anonymous consumer."
-msgstr "Nelze vytvořit aliasy."
-
-#. TRANS: Server error displayed when trying to create an anynymous OAuth application.
-#, fuzzy
-msgid "Could not create anonymous OAuth application."
-msgstr "Nelze vytvořit aplikaci."
-
-#. TRANS: Exception thrown when no token association could be found.
-msgid ""
-"Could not find a profile and application associated with the request token."
-msgstr ""
-
-#. TRANS: Exception thrown when no access token can be issued.
-#, fuzzy
-msgid "Could not issue access token."
-msgstr "Nemohu vložit zprávu."
-
-#. TRANS: Exception thrown when a database error occurs.
-msgid "Database error inserting OAuth application user."
-msgstr "Chyba databáze při vkládání uživatele aplikace OAuth."
-
-#. TRANS: Exception thrown when a database error occurs.
-#, fuzzy
-msgid "Database error updating OAuth application user."
-msgstr "Chyba databáze při vkládání uživatele aplikace OAuth."
-
-#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
-msgid "Tried to revoke unknown token."
-msgstr ""
-
-#. TRANS: Exception thrown when an attempt is made to remove a revoked token.
-msgid "Failed to delete revoked token."
-msgstr ""
-
 #. TRANS: Form input field label for application icon.
 msgid "Icon"
 msgstr "Ikona"
@@ -7778,13 +7301,14 @@ msgid "Default access for this application: read-only, or read-write"
 msgstr "Výchozí přístup pro tuto aplikaci: pouze pro �tení, nebo �íst-psát"
 
 #. TRANS: Submit button title.
-msgid "Cancel"
-msgstr "Zrušit"
+#, fuzzy
+msgid "Cancel application changes."
+msgstr "Propojené aplikace"
 
 #. TRANS: Submit button title.
-#. TRANS: Button text to save a list.
-msgid "Save"
-msgstr "Uložit"
+#, fuzzy
+msgid "Save application changes."
+msgstr "Nová aplikace"
 
 #. TRANS: Name for an anonymous application in application list.
 #, fuzzy
@@ -7820,6 +7344,20 @@ msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "Obnovit"
 
+#. TRANS: Submit button text to accept a group membership request on approve group form.
+#. TRANS: Submit button text to accept a subscription request on approve sub form.
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Accept"
+msgstr "Přijmout"
+
+#. TRANS: Submit button text to reject a group membership request on approve group form.
+#. TRANS: Submit button text to reject a subscription request on approve sub form.
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Reject"
+msgstr "Odmítnout"
+
 #. TRANS: Atom feed exception thrown when an author element does not contain a name element.
 msgid "Author element must contain a name element."
 msgstr ""
@@ -8395,6 +7933,11 @@ msgstr "Možná budete chtít spustit instala�ní program abyste to vyřešili.
 msgid "Go to the installer."
 msgstr "Jdi na instalaci."
 
+#. TRANS: Header on conversation page. Hidden by default (h2).
+#. TRANS: Label for user statistics.
+msgid "Notices"
+msgstr "Sdělení"
+
 #. TRANS: Page title for when a database error occurs.
 msgid "Database error"
 msgstr "Chyba databáze"
@@ -8406,14 +7949,6 @@ msgctxt "MENU"
 msgid "Public"
 msgstr "Veřejné"
 
-#. TRANS: Menu item in default local navigation panel.
-#. TRANS: Menu item in search group navigation panel.
-#. TRANS: Menu item in local navigation menu.
-#, fuzzy
-msgctxt "MENU"
-msgid "Groups"
-msgstr "Skupiny"
-
 #. TRANS: Menu item in default local navigation panel.
 #. TRANS: Menu item title in local navigation menu.
 #, fuzzy
@@ -8430,54 +7965,12 @@ msgstr "Odstranit"
 msgid "Delete this user"
 msgstr "Odstranit tohoto uživatele"
 
-#. TRANS: Form legend of form for changing the page design.
-#, fuzzy
-msgid "Change design"
-msgstr "Uložit vzhled"
-
-#. TRANS: Fieldset legend on profile design page to change profile page colours.
-msgid "Change colours"
-msgstr "Změnit barvy"
-
-#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-msgid "Use defaults"
-msgstr "Použít výchozí"
-
-#. TRANS: Label in form on profile design page.
-#. TRANS: Field contains file name on user's computer that could be that user's custom profile background image.
-msgid "Upload file"
-msgstr "Nahrát soubor"
-
-#. TRANS: Instructions for form on profile design page.
-msgid ""
-"You can upload your personal background image. The maximum file size is 2MB."
-msgstr ""
-"Můžete nahrát váš osobní obrázek na pozadí. Maximální velikost souboru je 2 "
-"MB."
-
-#. TRANS: Radio button on profile design page that will enable use of the uploaded profile image.
-#, fuzzy
-msgctxt "RADIO"
-msgid "On"
-msgstr "zap."
-
-#. TRANS: Radio button on profile design page that will disable use of the uploaded profile image.
-#, fuzzy
-msgctxt "RADIO"
-msgid "Off"
-msgstr "vyp."
-
-#. TRANS: Success message displayed if design settings were saved after clicking "Use defaults".
-msgid "Design defaults restored."
-msgstr "Obnoveno výchozí nastavení vzhledu."
-
 #. TRANS: Exception. %s is an ID.
 #, fuzzy, php-format
 msgid "Unable to find services for %s."
 msgstr "Nelze zrušit přístup aplikace %s."
 
 #. TRANS: Form legend for removing the favourite status for a favourite notice.
-#. TRANS: Title for button text for removing the favourite status for a favourite notice.
 msgid "Disfavor this notice"
 msgstr "Odebrat toto oznámení z oblíbených"
 
@@ -8487,8 +7980,12 @@ msgctxt "BUTTON"
 msgid "Disfavor favorite"
 msgstr "Znemilostnit oblíbenou"
 
+#. TRANS: Button title for removing the favourite status for a favourite notice.
+#, fuzzy
+msgid "Remove this notice from your list of favorite notices."
+msgstr "Nepodařilo se získat oblíbená oznámení."
+
 #. TRANS: Form legend for adding the favourite status to a notice.
-#. TRANS: Title for button text for adding the favourite status to a notice.
 msgid "Favor this notice"
 msgstr "Přidat toto oznámení do oblíbených"
 
@@ -8498,6 +7995,11 @@ msgctxt "BUTTON"
 msgid "Favor"
 msgstr "Oblíbit"
 
+#. TRANS: Button title for adding the favourite status to a notice.
+#, fuzzy
+msgid "Add this notice to your list of favorite notices."
+msgstr "Nepodařilo se získat oblíbená oznámení."
+
 #. TRANS: Feed type name.
 msgid "RSS 1.0"
 msgstr "RSS 1.0"
@@ -8514,6 +8016,10 @@ msgstr "Atom"
 msgid "FOAF"
 msgstr "FOAF"
 
+#. TRANS: Feed type name. See http://activitystrea.ms/
+msgid "Activity Streams"
+msgstr ""
+
 #. TRANS: Client exception thrown when an imported feed does not have an author.
 msgid "No author in the feed."
 msgstr ""
@@ -8547,6 +8053,28 @@ msgstr "Vyberte si zna�ku k zúžení seznamu"
 msgid "Grant this user the \"%s\" role"
 msgstr "Dát tomuto uživateli roli \"%s\""
 
+#. TRANS: Header for mini list of group members on a group page (h2).
+msgid "Members"
+msgstr "Členové"
+
+#. TRANS: Link to all group members from mini list of group members if group has more than n members.
+msgid "All members"
+msgstr "Všichni �lenové"
+
+#. TRANS: Header for mini list of users with a pending membership request on a group page (h2).
+msgid "Pending"
+msgstr ""
+
+#. TRANS: Header for mini list of users that are blocked in a group page (h2).
+msgid "Blocked"
+msgstr "Zablokován"
+
+#. TRANS: Title for list of group administrators on a group page.
+#, fuzzy
+msgctxt "TITLE"
+msgid "Admins"
+msgstr "Adminové"
+
 #. TRANS: Button text for the form that will block a user from a group.
 msgctxt "BUTTON"
 msgid "Block"
@@ -8554,7 +8082,7 @@ msgstr ""
 
 #. TRANS: Submit button title.
 msgctxt "TOOLTIP"
-msgid "Block this user"
+msgid "Block this user so that they can no longer post messages to it."
 msgstr ""
 
 #. TRANS: Field title on group edit form.
@@ -8612,64 +8140,9 @@ msgctxt "GROUPADMIN"
 msgid "Admin"
 msgstr "Admin"
 
-#. TRANS: Menu item in the group navigation page.
-msgctxt "MENU"
-msgid "Group"
-msgstr ""
-
-#. TRANS: Tooltip for menu item in the group navigation page.
-#. TRANS: %s is the nickname of the group.
-#, php-format
-msgctxt "TOOLTIP"
-msgid "%s group"
-msgstr ""
-
-#. TRANS: Menu item in the group navigation page.
-msgctxt "MENU"
-msgid "Members"
-msgstr ""
-
-#. TRANS: Tooltip for menu item in the group navigation page.
-#. TRANS: %s is the nickname of the group.
-#, php-format
-msgctxt "TOOLTIP"
-msgid "%s group members"
-msgstr ""
-
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: %d is the number of pending members.
-#, php-format
-msgctxt "MENU"
-msgid "Pending members (%d)"
-msgid_plural "Pending members (%d)"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: %s is the nickname of the group.
-#, fuzzy, php-format
-msgctxt "TOOLTIP"
-msgid "%s pending members"
-msgstr "�lenové skupiny %s"
-
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-msgctxt "MENU"
-msgid "Blocked"
-msgstr ""
-
-#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: %s is the nickname of the group.
-#, php-format
-msgctxt "TOOLTIP"
-msgid "%s blocked users"
-msgstr ""
-
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: Menu item in primary navigation panel.
-msgctxt "MENU"
-msgid "Admin"
-msgstr "Admin"
+#. TRANS: Group actions header (h2). Text hidden by default.
+msgid "Group actions"
+msgstr "Akce skupiny"
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
@@ -8678,11 +8151,6 @@ msgctxt "TOOLTIP"
 msgid "Edit %s group properties"
 msgstr ""
 
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-msgctxt "MENU"
-msgid "Logo"
-msgstr ""
-
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
 #, php-format
@@ -8690,17 +8158,11 @@ msgctxt "TOOLTIP"
 msgid "Add or edit %s logo"
 msgstr ""
 
-#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: %s is the nickname of the group.
-#, php-format
-msgctxt "TOOLTIP"
-msgid "Add or edit %s design"
+#. TRANS: Link text for link on user profile.
+msgctxt "MENU"
+msgid "Logo"
 msgstr ""
 
-#. TRANS: Group actions header (h2). Text hidden by default.
-msgid "Group actions"
-msgstr "Akce skupiny"
-
 #. TRANS: Title for groups with the most members section.
 #, fuzzy
 msgid "Popular groups"
@@ -8711,11 +8173,19 @@ msgstr "Populární oznámení"
 msgid "Active groups"
 msgstr "VÅ¡echny skupiny"
 
-#. TRANS: Title for group tag cloud section.
-#. TRANS: %s is a group name.
-#, php-format
-msgid "Tags in %s group's notices"
-msgstr "Zna�ky v oznámeních skupiny %s"
+#. TRANS: Link description for seeing all groups.
+#. TRANS: Link description for seeing all lists.
+msgid "See all"
+msgstr ""
+
+#. TRANS: Link title for seeing all groups.
+msgid "See all groups you belong to."
+msgstr ""
+
+#. TRANS: Menu item title in personal group navigation menu.
+#. TRANS: %s is a username.
+msgid "Back to top"
+msgstr ""
 
 #. TRANS: Client exception 406
 msgid "This page is not available in a media type you accept"
@@ -8803,12 +8273,45 @@ msgctxt "TITLE"
 msgid "Trends"
 msgstr ""
 
-#. TRANS: Button text for inviting more users to the StatusNet instance.
+#. TRANS: Default button text for inviting more users to the StatusNet instance.
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Invite more colleagues"
 msgstr "Pozvat nové uživatele"
 
+#. TRANS: Form legend.
+#, fuzzy
+msgid "Invite collegues"
+msgstr "Pozvat nové uživatele"
+
+#. TRANS: Field label for a list of e-mail addresses.
+msgid "Email addresses"
+msgstr "E-mailové adresy"
+
+#. TRANS: Field title for a list of e-mail addresses.
+#, fuzzy
+msgid "Addresses of friends to invite (one per line)."
+msgstr "Adresy přátel k pozvání (jedna na řádek)"
+
+#. TRANS: Field label for a personal message to send to invitees.
+msgid "Personal message"
+msgstr "Osobní zpráva"
+
+#. TRANS: Field title for a personal message to send to invitees.
+msgid "Optionally add a personal message to the invitation."
+msgstr "Volitelně přidat osobní zprávu."
+
+#. TRANS: Send button for inviting friends
+#. TRANS: Button text for sending notice.
+msgctxt "BUTTON"
+msgid "Send"
+msgstr "Odeslat"
+
+#. TRANS: Submit button title.
+#, fuzzy
+msgid "Send invitations."
+msgstr "Pozvánky"
+
 #. TRANS: Button text for joining a group.
 #, fuzzy
 msgctxt "BUTTON"
@@ -8821,6 +8324,11 @@ msgctxt "BUTTON"
 msgid "Leave"
 msgstr "Opustit"
 
+#. TRANS: Link title for seeing all lists.
+#, fuzzy
+msgid "See all lists you have created."
+msgstr "Aplikace které jste zaregistrovali"
+
 #. TRANS: Menu item for logging in to the StatusNet site.
 #. TRANS: Menu item in primary navigation panel.
 msgctxt "MENU"
@@ -8880,8 +8388,8 @@ msgstr ""
 #. TRANS: %1$s is the subscribing user's nickname, %2$s is the StatusNet sitename.
 #. TRANS: Main body of new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscriber's long name, %2$s is the StatusNet sitename.
-#, php-format
-msgid "%1$s is now listening to your notices on %2$s."
+#, fuzzy, php-format
+msgid "%1$s is now following you on %2$s."
 msgstr "%1$s od te� naslouchá tvým sdělením na %2$s."
 
 #. TRANS: Subject of pending new-subscriber notification e-mail.
@@ -9052,7 +8560,7 @@ msgstr ""
 "Neodpovídejte na tento e-mail, nedostane se k nim.\n"
 "\n"
 "S pozdravem\n"
-"%5$s\n"
+"%5$s"
 
 #. TRANS: Subject for favorite notification e-mail.
 #. TRANS: %1$s is the adding user's long name, %2$s is the adding user's nickname.
@@ -9119,7 +8627,7 @@ msgstr "%s (@%s) poslal oznámení žádající o vaši pozornost"
 #. TRANS: Body of @-reply notification e-mail.
 #. TRANS: %1$s is the sending user's name, $2$s is the StatusNet sitename,
 #. TRANS: %3$s is a URL to the notice, %4$s is the notice text,
-#. TRANS: %5$s is a URL to the full conversion if it exists (otherwise empty),
+#. TRANS: %5$s is the text "The full conversation can be read here:" and a URL to the full conversion if it exists (otherwise empty),
 #. TRANS: %6$s is a URL to reply to the notice, %7$s is a URL to all @-replies for the addressed user,
 #, fuzzy, php-format
 msgid ""
@@ -9167,6 +8675,10 @@ msgstr ""
 
 #. TRANS: Subject of group join notification e-mail.
 #. TRANS: %1$s is the joining user's nickname, %2$s is the group name, and %3$s is the StatusNet sitename.
+#, fuzzy, php-format
+msgid "%1$s has joined your group %2$s on %3$s"
+msgstr "%1$s se připojil(a) ke skupině %2$s."
+
 #. TRANS: Main body of group join notification e-mail.
 #. TRANS: %1$s is the subscriber's long name, %2$s is the group name, and %3$s is the StatusNet sitename,
 #. TRANS: %4$s is a block of profile info about the subscriber.
@@ -9257,9 +8769,10 @@ msgid "Make Admin"
 msgstr ""
 
 #. TRANS: Submit button title.
+#, fuzzy
 msgctxt "TOOLTIP"
-msgid "Make this user an admin"
-msgstr ""
+msgid "Make this user an admin."
+msgstr "U�elat uživatele adminem skupiny"
 
 #. TRANS: Client exception thrown when a database error was thrown during a file upload operation.
 msgid "There was a database error while saving your file. Please try again."
@@ -9305,7 +8818,7 @@ msgstr "Pošlete přímou zprávu"
 msgid "Select recipient:"
 msgstr "Vyberte operátora"
 
-#. TRANS Entry in drop-down selection box in direct-message inbox/outbox when no one is available to message.
+#. TRANS: Entry in drop-down selection box in direct-message inbox/outbox when no one is available to message.
 #, fuzzy
 msgid "No mutual subscribers."
 msgstr "Nepřihlášen!"
@@ -9378,6 +8891,10 @@ msgstr ""
 msgid "You must implement either adaptNoticeListItem() or showNotice()."
 msgstr ""
 
+#. TRANS: Link description to show more items in a list.
+msgid "More â–¼"
+msgstr ""
+
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 msgid "Nickname cannot be empty."
 msgstr ""
@@ -9429,10 +8946,6 @@ msgctxt "SEPARATOR"
 msgid ", "
 msgstr ""
 
-#. TRANS: Start of profile addressees list.
-msgid " â–¸ "
-msgstr ""
-
 #. TRANS: Used in coordinates as abbreviation of north.
 msgid "N"
 msgstr "S"
@@ -9471,7 +8984,8 @@ msgid "Repeated by"
 msgstr "Opakováno"
 
 #. TRANS: Link title in notice list item to reply to a notice.
-msgid "Reply to this notice"
+#, fuzzy
+msgid "Reply to this notice."
 msgstr "Odpovědět na toto oznámení"
 
 #. TRANS: Link text in notice list item to reply to a notice.
@@ -9479,7 +8993,8 @@ msgid "Reply"
 msgstr "Odpovědět"
 
 #. TRANS: Link title in notice list item to delete a notice.
-msgid "Delete this notice"
+#, fuzzy
+msgid "Delete this notice from the timeline."
 msgstr "Odstranit toto oznámení"
 
 #. TRANS: Title for repeat form status in notice list when a notice has been repeated.
@@ -9506,27 +9021,6 @@ msgstr "Pošťouchnout"
 msgid "Send a nudge to this user."
 msgstr "Poslat pošťouchnutí tomuto uživateli"
 
-#. TRANS: Exception thrown when creating a new profile fails in OAuth store.
-msgid "Error inserting new profile."
-msgstr ""
-
-#. TRANS: Exception thrown when creating a new avatar fails in OAuth store.
-msgid "Error inserting avatar."
-msgstr ""
-
-#. TRANS: Exception thrown when creating a remote profile fails in OAuth store.
-msgid "Error inserting remote profile."
-msgstr ""
-
-#. TRANS: Exception thrown when a notice is denied because it has been sent before.
-msgid "Duplicate notice."
-msgstr ""
-
-#. TRANS: Exception thrown when creating a new subscription fails in OAuth store.
-#, fuzzy
-msgid "Could not insert new subscription."
-msgstr "Nelze vložit odebírání"
-
 #. TRANS: Server exception thrown in oEmbed action if no API endpoint is available.
 #, fuzzy
 msgid "No oEmbed API endpoint available."
@@ -9617,11 +9111,6 @@ msgstr "Editovat"
 msgid "Edit %s list by you."
 msgstr "Upravit skupinu %s"
 
-#. TRANS: Link description for link to list of users tagged with a tag.
-#, fuzzy
-msgid "Tagged"
-msgstr "Zna�ka"
-
 #. TRANS: Title for link to edit list settings.
 #, fuzzy
 msgid "Edit list settings."
@@ -9777,8 +9266,10 @@ msgctxt "plugin"
 msgid "Enable"
 msgstr ""
 
+#. TRANS: Plugin description for a disabled plugin.
 msgctxt "plugin-description"
-msgid "(Plugin descriptions unavailable when disabled.)"
+msgid ""
+"(The plugin description is unavailable when a plugin has been disabled.)"
 msgstr ""
 
 #. TRANS: Menu item in primary navigation panel.
@@ -9792,6 +9283,11 @@ msgstr "nastavení SMS"
 msgid "Change your personal settings."
 msgstr "Změňte nastavení profilu"
 
+#. TRANS: Menu item in primary navigation panel.
+msgctxt "MENU"
+msgid "Admin"
+msgstr "Admin"
+
 #. TRANS: Menu item title in primary navigation panel.
 #, fuzzy
 msgid "Site configuration."
@@ -9812,15 +9308,8 @@ msgstr "Odhlášení z webu"
 msgid "Login to the site."
 msgstr "Přihlásit se na stránky"
 
-#. TRANS: Menu item in primary navigation panel.
-msgctxt "MENU"
-msgid "Search"
-msgstr "Hledat"
-
-#. TRANS: Menu item title in primary navigation panel.
-#, fuzzy
-msgid "Search the site."
-msgstr "Prohledat stránky"
+msgid "This profile has been silenced by site moderators"
+msgstr ""
 
 #. TRANS: H2 text for user subscription statistics.
 #, fuzzy
@@ -9832,6 +9321,10 @@ msgstr "Povolit"
 msgid "Followers"
 msgstr "Povolit"
 
+#. TRANS: H2 text for user statistics.
+msgid "Statistics"
+msgstr "Statistiky"
+
 #. TRANS: Label for user statistics.
 msgid "User ID"
 msgstr "ID uživatele"
@@ -9840,10 +9333,6 @@ msgstr "ID uživatele"
 msgid "Member since"
 msgstr "ÄŒlenem od"
 
-#. TRANS: Label for user statistics.
-msgid "Notices"
-msgstr "Sdělení"
-
 #. TRANS: Label for user statistics.
 #. TRANS: Average count of posts made per day since account registration.
 msgid "Daily average"
@@ -9936,6 +9425,7 @@ msgid "Keyword(s)"
 msgstr "Klí�ová slova"
 
 #. TRANS: Button text for searching site.
+#. TRANS: Button text for search button on search form.
 #. TRANS: Button text to search profiles.
 msgctxt "BUTTON"
 msgid "Search"
@@ -9986,23 +9476,6 @@ msgstr "Najít v obsahu oznámení"
 msgid "Find groups on this site"
 msgstr "Najít skupiny na této stránce"
 
-#. TRANS: Secondary navigation menu item leading to help on StatusNet.
-msgctxt "MENU"
-msgid "Help"
-msgstr "Nápověda"
-
-#. TRANS: Secondary navigation menu item leading to text about StatusNet site.
-#, fuzzy
-msgctxt "MENU"
-msgid "About"
-msgstr "O nás"
-
-#. TRANS: Secondary navigation menu item leading to Frequently Asked Questions.
-#, fuzzy
-msgctxt "MENU"
-msgid "FAQ"
-msgstr "FAQ"
-
 #. TRANS: Secondary navigation menu item leading to Terms of Service.
 #, fuzzy
 msgctxt "MENU"
@@ -10027,19 +9500,6 @@ msgctxt "MENU"
 msgid "Version"
 msgstr "Verze"
 
-#. TRANS: Secondary navigation menu item leading to e-mail contact information on the
-#. TRANS: StatusNet site, where to report bugs, ...
-#, fuzzy
-msgctxt "MENU"
-msgid "Contact"
-msgstr "Kontakt"
-
-#. TRANS: Secondary navigation menu item. Leads to information about embedding a timeline widget.
-#, fuzzy
-msgctxt "MENU"
-msgid "Badge"
-msgstr "Odznak"
-
 #. TRANS: Default title for section/sidebar widget.
 msgid "Untitled section"
 msgstr "Oddíl bez názvu"
@@ -10088,10 +9548,6 @@ msgstr "Email"
 msgid "Change email handling"
 msgstr "Změnit manipulaci emailu"
 
-#. TRANS: Menu item title in settings navigation panel.
-msgid "Design your profile"
-msgstr "Změňte vzhled svého profilu"
-
 #. TRANS: Menu item in settings navigation panel.
 #, fuzzy
 msgctxt "MENU"
@@ -10132,6 +9588,15 @@ msgstr "Připojení"
 msgid "Authorized connected applications"
 msgstr "Autorizované propojené aplikace"
 
+#. TRANS: Menu item in settings navigation panel.
+msgctxt "MENU"
+msgid "Old school"
+msgstr ""
+
+#. TRANS: Menu item title in settings navigation panel.
+msgid "UI tweaks for old-school users"
+msgstr ""
+
 #. TRANS: Title of form to silence a user.
 #, fuzzy
 msgctxt "TITLE"
@@ -10142,6 +9607,43 @@ msgstr "Uťišit"
 msgid "Silence this user"
 msgstr "Utišit tohoto uživatele"
 
+#. TRANS: Server error displayed when trying to create an anynymous OAuth consumer.
+#, fuzzy
+msgid "Could not create anonymous consumer."
+msgstr "Nelze vytvořit aliasy."
+
+#. TRANS: Server error displayed when trying to create an anynymous OAuth application.
+#, fuzzy
+msgid "Could not create anonymous OAuth application."
+msgstr "Nelze vytvořit aplikaci."
+
+#. TRANS: Exception thrown when no token association could be found.
+msgid ""
+"Could not find a profile and application associated with the request token."
+msgstr ""
+
+#. TRANS: Exception thrown when no access token can be issued.
+#, fuzzy
+msgid "Could not issue access token."
+msgstr "Nemohu vložit zprávu."
+
+#. TRANS: Exception thrown when a database error occurs.
+msgid "Database error inserting OAuth application user."
+msgstr "Chyba databáze při vkládání uživatele aplikace OAuth."
+
+#. TRANS: Exception thrown when a database error occurs.
+#, fuzzy
+msgid "Database error updating OAuth application user."
+msgstr "Chyba databáze při vkládání uživatele aplikace OAuth."
+
+#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
+msgid "Tried to revoke unknown token."
+msgstr ""
+
+#. TRANS: Exception thrown when an attempt is made to remove a revoked token.
+msgid "Failed to delete revoked token."
+msgstr ""
+
 #. TRANS: Menu item in local navigation menu.
 #, fuzzy
 msgctxt "MENU"
@@ -10199,6 +9701,18 @@ msgstr "Pozvěte přátele a kolegy, aby se k vám připojili na %s"
 msgid "Subscribe to this user"
 msgstr "Přihlásit se k tomuto uživateli"
 
+#. TRANS: Button text to subscribe to a user.
+#. TRANS: Button text for subscribing to a list.
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Subscribe"
+msgstr "Odebírat"
+
+#. TRANS: Button title to subscribe to a user.
+#, fuzzy
+msgid "Subscribe to this user."
+msgstr "Přihlásit se k tomuto uživateli"
+
 #. TRANS: Title of personal tag cloud section.
 msgid "People Tagcloud as self-tagged"
 msgstr "Mrak štítků kterými se uživatelé sami ozna�ili"
@@ -10332,17 +9846,28 @@ msgstr[2] ""
 #. TRANS: List message for notice repeated by logged in user.
 #, fuzzy
 msgctxt "REPEATLIST"
-msgid "You have repeated this notice."
+msgid "You repeated this."
 msgstr "Již jste zopakoval toto oznámení."
 
-#. TRANS: List message for repeated notices.
-#. TRANS: %d is the number of users that have repeated a notice.
+#. TRANS: List message for when more than 4 people repeat something.
+#. TRANS: %%s is a list of users liking a notice, %d is the number over 4 that like the notice.
+#. TRANS: Plural is decided on the total number of users liking the notice (count of %%s + %d).
+#, php-format
+msgid "%%s and %d other repeated this."
+msgid_plural "%%s and %d others repeated this."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#. TRANS: List message for favoured notices.
+#. TRANS: %%s is a list of users liking a notice.
+#. TRANS: Plural is based on the number of of users that have favoured a notice.
 #, fuzzy, php-format
-msgid "One person has repeated this notice."
-msgid_plural "%d people have repeated this notice."
-msgstr[0] "Již jste zopakoval toto oznámení."
-msgstr[1] "Již jste zopakoval toto oznámení."
-msgstr[2] "Již jste zopakoval toto oznámení."
+msgid "%%s repeated this."
+msgid_plural "%%s repeated this."
+msgstr[0] "Opakováno uživatelem %s"
+msgstr[1] "Opakováno uživatelem %s"
+msgstr[2] "Opakováno uživatelem %s"
 
 #. TRANS: Form legend.
 #, fuzzy, php-format
@@ -10441,7 +9966,6 @@ msgid "Unsilence this user"
 msgstr "Zrušit utišení tohoto uživatele"
 
 #. TRANS: Form legend on unsubscribe form.
-#. TRANS: Button title on unsubscribe form.
 msgid "Unsubscribe from this user"
 msgstr "Odhlásit se od tohoto uživatele"
 
@@ -10452,6 +9976,11 @@ msgctxt "BUTTON"
 msgid "Unsubscribe"
 msgstr "Odhlásit"
 
+#. TRANS: Button title on unsubscribe form.
+#, fuzzy
+msgid "Unsubscribe from this user."
+msgstr "Odhlásit se od tohoto uživatele"
+
 #. TRANS: Exception text shown when no profile can be found for a user.
 #. TRANS: %1$s is a user nickname, $2$d is a user ID (number).
 #, fuzzy, php-format
@@ -10538,9 +10067,3 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
-
-#~ msgid "%1$s and friends, page %2$d"
-#~ msgstr "%1$s a přátelé, strana %2$d"
-
-#~ msgid "You and friends"
-#~ msgstr "Vy a přátelé"
diff --git a/locale/de/LC_MESSAGES/statusnet.po b/locale/de/LC_MESSAGES/statusnet.po
index 4f39c2ba63..61f5ff7c8b 100644
--- a/locale/de/LC_MESSAGES/statusnet.po
+++ b/locale/de/LC_MESSAGES/statusnet.po
@@ -1,11 +1,16 @@
 # Translation of StatusNet - Core to German (Deutsch)
 # Exported from translatewiki.net
 #
+# Author: Alphakilo
 # Author: Apmon
 # Author: Bavatar
 # Author: Brion
+# Author: ChrisiPK
+# Author: Exit91
+# Author: Fujnky
 # Author: George Animal
 # Author: Giftpflanze
+# Author: Gta74
 # Author: Habi
 # Author: Jan Luca
 # Author: Kghbln
@@ -16,8 +21,12 @@
 # Author: Michael
 # Author: Michi
 # Author: Od1n
+# Author: PtM
 # Author: Purodha
+# Author: Quedel
+# Author: Sebastian Wallroth
 # Author: The Evil IP address
+# Author: Tiin
 # Author: Umherirrender
 # Author: W (aka Wuzur)
 # Author: Xqt
@@ -28,17 +37,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:52+0000\n"
-"Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:44+0000\n"
+"Language-Team: German <https://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-05-05 10:52:40+0000\n"
+"X-POT-Import-Date: 2012-04-22 22:02:21+0000\n"
 
 #. TRANS: Database error message.
 #, php-format
@@ -54,14 +63,6 @@ msgstr ""
 "um sicherzugehen. Andernfalls warte einige Minuten und versuche es "
 "nocheinmal."
 
-#. TRANS: Error message.
-msgid ""
-"An important error occured, probably related to email setup. Check logfiles "
-"for more info."
-msgstr ""
-"Ein wichtiger Fehler ist aufgetreten, der wahrscheinlich mit dem E-Mail-"
-"Setup zu tun hat. Prüfe die Logdateien für weitere Informationen."
-
 #. TRANS: Error message.
 msgid "An error occurred."
 msgstr "Ein Fehler ist aufgetreten."
@@ -71,8 +72,8 @@ msgstr "Ein Fehler ist aufgetreten."
 msgid ""
 "No configuration file found. Try running the installation program first."
 msgstr ""
-"Keine Konfigurationsdatei gefunden. Versuchen Sie das Installationsprogramm "
-"zuerst auszuführen."
+"Keine Konfigurationsdatei gefunden. Versuchen Sie, zuerst das "
+"Installationsprogramm auszuführen."
 
 #. TRANS: Error message displayed when trying to access a non-existing page.
 msgid "Unknown page"
@@ -89,11 +90,11 @@ msgstr "Zugang"
 
 #. TRANS: Page notice.
 msgid "Site access settings"
-msgstr "Zugangseinstellungen speichern"
+msgstr "Zugangseinstellungen"
 
 #. TRANS: Form legend for registration form.
 msgid "Registration"
-msgstr "Registrieren"
+msgstr "Registrierung"
 
 #. TRANS: Checkbox instructions for admin setting "Private".
 msgid "Prohibit anonymous users (not logged in) from viewing site?"
@@ -123,12 +124,11 @@ msgstr "Neuregistrierungen deaktivieren."
 msgid "Closed"
 msgstr "Geschlossen"
 
-#. TRANS: Title for button to save access settings in site admin panel.
-msgid "Save access settings"
+#. TRANS: Button title to save access settings in site admin panel.
+msgid "Save access settings."
 msgstr "Zugangs-Einstellungen speichern"
 
-#. TRANS: Tooltip for button to save access settings in site admin panel.
-#. TRANS: Button text for saving theme settings.
+#. TRANS: Button text to save access settings in site admin panel.
 #. TRANS: Button label to save e-mail preferences.
 #. TRANS: Button label to save IM preferences.
 #. TRANS: Button text in the license admin panel.
@@ -144,7 +144,6 @@ msgstr "Zugangs-Einstellungen speichern"
 #. TRANS: Button text for saving "Other settings" in profile.
 #. TRANS: Button text to save user settings in user admin panel.
 #. TRANS: Button label in the "Edit application" form.
-#. TRANS: Button text on profile design page to save settings.
 #. TRANS: Text for save button on group edit form.
 #. TRANS: Button text to save tags for a profile.
 msgctxt "BUTTON"
@@ -183,16 +182,11 @@ msgstr "Profil nicht gefunden."
 msgid "No such list."
 msgstr "Liste nicht gefunden."
 
-#. TRANS: Client error displayed when trying to add an OMB 0.1 remote profile to a list.
-#, fuzzy
-msgid "You cannot list an OMB 0.1 remote profile with this action."
-msgstr "Du hast dieses OMB 0.1 Profil nicht abonniert."
-
 #. TRANS: Client error displayed when an unknown error occurs when adding a user to a list.
 #. TRANS: %s is a username.
 #, php-format
 msgid "There was an unexpected error while listing %s."
-msgstr "Ein unerwarteter Fehler ist aufgetreten während der Auflistung von %s."
+msgstr "Ein unerwarteter Fehler ist während der Auflistung von %s aufgetreten."
 
 #. TRANS: Client error displayed when an unknown error occurs when adding a user to a list.
 #. TRANS: %s is a profile URL.
@@ -201,8 +195,8 @@ msgid ""
 "There was a problem listing %s. The remote server is probably not responding "
 "correctly. Please try retrying later."
 msgstr ""
-"Es gab ein Problem beim Hinzufügen von %s. Der entfernt liegende Server "
-"antwortet vielleicht nicht richtig. Bitte später noch einmal versuchen."
+"Es gab ein Problem beim auflisten von %s. Der Server antwortet vielleicht "
+"nicht richtig. Bitte versuche es später noch einmal."
 
 #. TRANS: Title after adding a user to a list.
 msgctxt "TITLE"
@@ -213,13 +207,12 @@ msgstr "Hinzugefügt"
 #. TRANS: Server error when page not found (404)
 #. TRANS: Server error when page not found (404).
 msgid "No such page."
-msgstr "Seite nicht vorhanden"
+msgstr "Seite nicht vorhanden."
 
 #. TRANS: Client error when user not found for an action.
 #. TRANS: Client error when user not found for an rss related action.
 #. TRANS: Client error displayed when no existing user is provided for a user's delivery device setting.
 #. TRANS: Client error displayed if a user could not be found.
-#. TRANS: Client error when user not found updating a profile background image.
 #. TRANS: Client error displayed updating profile image without having a user object.
 #. TRANS: Client error displayed when making an Atom API request for an unknown user.
 #. TRANS: Client error displayed when trying to block a non-existing user or a user from another site.
@@ -245,14 +238,11 @@ msgstr "Seite nicht vorhanden"
 #. TRANS: Client error displayed when trying to get the RSS feed with favorites of a user that does not exist.
 #. TRANS: Client error displayed when requesting Friends of a Friend feed without providing a user nickname.
 #. TRANS: Client error displayed when requesting Friends of a Friend feed for an object that is not a user.
-#. TRANS: Client error displayed when trying to get a user hCard for a non-existing user.
 #. TRANS: Client error displayed trying to make a micro summary without providing a valid user.
 #. TRANS: Client error displayed trying to send a direct message to a non-existing user.
 #. TRANS: Client error displayed trying to use "one time password login" without using an existing user.
 #. TRANS: Client error displayed when referring to non-existing user.
 #. TRANS: Client error displayed trying to perform an action related to a non-existing user.
-#. TRANS: Form validation error on page for remote subscribe when no user was provided.
-#. TRANS: Form validation error on page for remote subscribe when no user profile was found.
 #. TRANS: Client error displayed when trying to reply to a non-exsting user.
 #. TRANS: Client error displayed when providing a non-existing nickname in a RSS 1.0 action.
 #. TRANS: Client error.
@@ -261,7 +251,6 @@ msgstr "Seite nicht vorhanden"
 #. TRANS: Client error displayed trying to find a user by ID for a non-existing ID.
 #. TRANS: Client error displayed requesting groups for a non-existing user.
 #. TRANS: Client error displayed when user not found for an action.
-#. TRANS: Client error displayed providing a non-existing nickname.
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #. TRANS: Client error displayed when trying to perform a gallery action with an unknown user.
 #. TRANS: Client error displayed when trying to access a mailbox without providing a user.
@@ -270,15 +259,21 @@ msgid "No such user."
 msgstr "Unbekannter Benutzer."
 
 #. TRANS: Title of a user's own start page.
-#, fuzzy
 msgid "Home timeline"
-msgstr "%s-Zeitleiste"
+msgstr "Eigene Zeitleiste"
 
 #. TRANS: Title of another user's start page.
 #. TRANS: %s is the other user's name.
-#, fuzzy, php-format
+#, php-format
 msgid "%s's home timeline"
-msgstr "%s-Zeitleiste"
+msgstr "Zeitleiste von %s"
+
+#. TRANS: %s is user nickname.
+#. TRANS: Feed title.
+#. TRANS: %s is tagger's nickname.
+#, php-format
+msgid "Feed for friends of %s (Activity Streams JSON)"
+msgstr "Feed der Freunde von %s (Activity Streams JSON)"
 
 #. TRANS: %s is user nickname.
 #, php-format
@@ -323,9 +318,9 @@ msgid ""
 "to them](%%%%action.newnotice%%%%?status_textarea=%3$s)."
 msgstr ""
 "Du kannst versuchen, [%1$s in seinem Profil einen Stups zu geben](../%2$s) "
-"oder [ihm etwas posten](%%%%action.newnotice%%%%?status_textarea=%s)."
+"oder [ihm etwas posten](%%%%action.newnotice%%%%?status_textarea=%3$s)."
 
-#. TRANS: Encoutagement displayed on empty timeline user pages for anonymous users.
+#. TRANS: Encouragement displayed on empty timeline user pages for anonymous users.
 #. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
 #. TRANS: Empty list message for page with replies for a user for not logged in users.
 #. TRANS: %1$s is a user nickname. This message contains a Markdown link in the form [link text](link).
@@ -339,6 +334,12 @@ msgstr ""
 "Warum [registrierst du nicht ein Benutzerkonto](%%%%action.register%%%%) und "
 "gibst %s dann einen Stups oder postest ihm etwas."
 
+#. TRANS: Button text for inviting more users to the StatusNet instance.
+#. TRANS: Less business/enterprise-oriented language for public sites.
+msgctxt "BUTTON"
+msgid "Send invite"
+msgstr "Einladung senden"
+
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Title of API timeline for a user and friends.
 #. TRANS: %s is a username.
@@ -347,8 +348,6 @@ msgstr ""
 #. TRANS: %s is a username.
 #. TRANS: Menu item title in personal group navigation menu.
 #. TRANS: %s is a username.
-#. TRANS: Menu item title in settings navigation panel.
-#. TRANS: %s is a username.
 #, php-format
 msgid "%s and friends"
 msgstr "%s und Freunde"
@@ -388,7 +387,6 @@ msgstr ""
 #. TRANS: Server error thrown on database error updating SMS preferences.
 #. TRANS: Server error thrown on database error removing a registered SMS phone number.
 #. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
-#. TRANS: Server exception thrown on Profile design page when updating design settings fails.
 msgid "Could not update user."
 msgstr "Konnte Benutzerdaten nicht aktualisieren."
 
@@ -403,7 +401,6 @@ msgstr "Konnte Profil nicht speichern."
 
 #. TRANS: Client error displayed when the number of bytes in a POST request exceeds a limit.
 #. TRANS: %s is the number of bytes of the CONTENT_LENGTH.
-#. TRANS: Form validation error in design settings form. POST should remain untranslated.
 #, php-format
 msgid ""
 "The server was unable to handle that much POST data (%s byte) due to its "
@@ -418,24 +415,6 @@ msgstr[1] ""
 "Der Server kann so große POST-Abfragen (%s Bytes) aufgrund der Konfiguration "
 "nicht verarbeiten."
 
-#. TRANS: Client error displayed when saving design settings fails because of an empty id.
-#. TRANS: Client error displayed when saving design settings fails because of an empty result.
-#. TRANS: Client error displayed when a database error occurs inserting profile colours.
-#. TRANS: Client error displayed when a database error occurs updating profile colours.
-#. TRANS: Form validation error displayed when group design settings could not be saved because of an application issue.
-#. TRANS: Form validation error on Profile design page when saving design settings has failed.
-#. TRANS: Form validation error on Profile design page when updating design settings has failed.
-msgid "Unable to save your design settings."
-msgstr "Konnte Design-Einstellungen nicht speichern."
-
-#. TRANS: Error displayed when updating design settings fails.
-#. TRANS: Client error displayed when a database error occurs updating profile colours.
-#. TRANS: Form validation error on Profile design page when updating design settings has failed.
-#. TRANS: Error message displayed if design settings could not be saved.
-#. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
-msgid "Could not update your design."
-msgstr "Konnte Benutzerdesign nicht aktualisieren."
-
 #. TRANS: Title for Atom feed.
 msgctxt "ATOM"
 msgid "Main"
@@ -482,6 +461,20 @@ msgstr "Blockieren des Benutzers fehlgeschlagen."
 msgid "Unblock user failed."
 msgstr "Freigeben des Benutzers fehlgeschlagen."
 
+#. TRANS: Client exception thrown when no conversation ID is given.
+msgid "No conversation ID."
+msgstr "Keine Unterhaltungs-ID."
+
+#. TRANS: Client exception thrown when referring to a non-existing conversation ID (%d).
+#, php-format
+msgid "No conversation with ID %d."
+msgstr "Unterhaltung mit ID %d existiert nicht."
+
+#. TRANS: Title for conversion timeline.
+msgctxt "TITLE"
+msgid "Conversation"
+msgstr "Unterhaltung"
+
 #. TRANS: Title. %s is a user nickname.
 #, php-format
 msgid "Direct messages from %s"
@@ -525,10 +518,12 @@ msgstr "Empfänger nicht gefunden."
 #. TRANS: Client error displayed trying to direct message another user who's not a friend (403).
 msgid "Cannot send direct messages to users who aren't your friend."
 msgstr ""
-"Es können keine direkten Nachrichten an Benutzer geschickt werden mit denen "
+"Es können keine direkten Nachrichten an Benutzer geschickt werden, mit denen "
 "du nicht befreundet bist."
 
 #. TRANS: Client error displayed trying to direct message self (403).
+#. TRANS: Client error displayed trying to send a direct message to self.
+#. TRANS: Error text shown when trying to send a direct message to self.
 msgid ""
 "Do not send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
@@ -548,11 +543,11 @@ msgstr "Diese Nachricht ist bereits ein Favorit!"
 #. TRANS: Server error displayed when trying to mark a notice as favorite fails in the database.
 #. TRANS: Error message text shown when a favorite could not be set.
 msgid "Could not create favorite."
-msgstr "Konnte keinen Favoriten erstellen."
+msgstr "Konnte den Favoriten nicht erstellen."
 
 #. TRANS: Client error displayed when trying to remove a favourite that was not a favourite.
 msgid "That status is not a favorite."
-msgstr "Diese Nachricht ist kein Favorit!"
+msgstr "Diese Nachricht ist kein Favorit."
 
 #. TRANS: Client error displayed when removing a favourite has failed.
 #. TRANS: Server error displayed when removing a favorite from the database fails.
@@ -576,7 +571,7 @@ msgstr "Kann Benutzer nicht entfolgen: Benutzer nicht gefunden."
 
 #. TRANS: Client error displayed when trying to unfollow self.
 msgid "You cannot unfollow yourself."
-msgstr "Du kannst dich nicht selbst entfolgen!"
+msgstr "Du kannst dich nicht selbst entfolgen."
 
 #. TRANS: Client error displayed when supplying invalid parameters to an API call checking if a friendship exists.
 msgid "Two valid IDs or nick names must be supplied."
@@ -588,7 +583,7 @@ msgstr "Konnte öffentlichen Stream nicht abrufen."
 
 #. TRANS: Client error displayed when a target user could not be determined showing friendship.
 msgid "Could not find target user."
-msgstr "Konnte keine Statusmeldungen finden."
+msgstr "Konnte Zielbenutzer nicht finden."
 
 #. TRANS: Client error trying to create a group with a nickname this is already in use.
 #. TRANS: API validation exception thrown when nickname is already used.
@@ -597,7 +592,7 @@ msgstr "Konnte keine Statusmeldungen finden."
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Form validation error displayed when trying to register with an existing nickname.
 msgid "Nickname already in use. Try another one."
-msgstr "Benutzername wird bereits verwendet. Suche dir einen anderen aus."
+msgstr "Benutzername wird bereits verwendet. Versuche einen anderen."
 
 #. TRANS: Client error in form for group creation.
 #. TRANS: API validation exception thrown when nickname does not validate.
@@ -617,8 +612,7 @@ msgstr "Ungültiger Benutzername."
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Form validation error displayed when trying to register with an invalid homepage URL.
 msgid "Homepage is not a valid URL."
-msgstr ""
-"Homepage ist keine gültige URL. URLs müssen ein Präfix wie http enthalten."
+msgstr "Die Homepage ist keine gültige URL."
 
 #. TRANS: Client error in form for group creation.
 #. TRANS: API validation exception thrown when full name does not validate.
@@ -645,8 +639,8 @@ msgstr "Der bürgerliche Name ist zu lang (maximal 255 Zeichen)."
 #, php-format
 msgid "Description is too long (maximum %d character)."
 msgid_plural "Description is too long (maximum %d characters)."
-msgstr[0] "Die Beschreibung ist zu lang (max. %d Zeichen)."
-msgstr[1] "Die Beschreibung ist zu lang (max. %d Zeichen)."
+msgstr[0] "Die Beschreibung ist zu lang (maximal %d Zeichen)."
+msgstr[1] "Die Beschreibung ist zu lang (maximal %d Zeichen)."
 
 #. TRANS: Client error shown when providing too long a location during group creation.
 #. TRANS: API validation exception thrown when location does not validate.
@@ -760,7 +754,6 @@ msgstr "Gruppen von %s"
 
 #. TRANS: Client error displayed when trying to edit a group without being an admin.
 #. TRANS: Client error displayed trying to edit a group while not being a group admin.
-#. TRANS: Client error displayed trying to change group design settings without being a (group) admin.
 #. TRANS: Client error displayed when trying to change group logo settings while not being a group admin.
 msgid "You must be an admin to edit the group."
 msgstr "Du musst ein Admin sein, um die Gruppe zu bearbeiten"
@@ -818,9 +811,8 @@ msgid "You are not allowed to add members to this list."
 msgstr "Du bist nicht berechtigt, Mitglieder zu dieser Liste hinzufügen."
 
 #. TRANS: Client error displayed when trying to modify list members without specifying them.
-#, fuzzy
 msgid "You must specify a member."
-msgstr "Benutzer hat kein Profil."
+msgstr "Du musst ein Mitglied angeben."
 
 #. TRANS: Client error displayed when trying to remove members from a list without having the right to do so.
 msgid "You are not allowed to remove members from this list."
@@ -840,9 +832,8 @@ msgid "The specified user is not a subscriber of this list."
 msgstr "Dieser Benutzer ist kein Abonnent dieser Liste."
 
 #. TRANS: Client error displayed when trying to unsubscribe from a non-subscribed list.
-#, fuzzy
 msgid "You are not subscribed to this list."
-msgstr "Du hast dieses Profil nicht abonniert."
+msgstr "Du hast diese Liste nicht abonniert."
 
 #. TRANS: Client error displayed when uploading a media file has failed.
 msgid "Upload failed."
@@ -874,7 +865,6 @@ msgstr "Datenbankfehler beim Einfügen von oauth_token_association."
 
 #. TRANS: Client error given on when invalid data was passed through a form in the OAuth API.
 #. TRANS: Unexpected validation error on avatar upload form.
-#. TRANS: Client error displayed when the submitted form contains unexpected data.
 #. TRANS: Client error displayed submitting invalid form data for edit application.
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
 #. TRANS: Form validation error message when an unsupported argument is used.
@@ -883,7 +873,6 @@ msgstr "Datenbankfehler beim Einfügen von oauth_token_association."
 #. TRANS: Client error when submitting a form with unexpected information.
 #. TRANS: Client error displayed when unexpected data is posted in the password recovery form.
 #. TRANS: Message given submitting a form with an unknown action in SMS settings.
-#. TRANS: Unknown form validation error in design settings form.
 msgid "Unexpected form submission."
 msgstr "Unerwartete Formulareingabe."
 
@@ -928,7 +917,6 @@ msgstr "Profil"
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Field label on account registration page.
-#. TRANS: Label for nickname on user authorisation page.
 #. TRANS: Field label on group edit form.
 #. TRANS: Dropdown option for searching in profiles.
 msgid "Nickname"
@@ -1108,9 +1096,9 @@ msgstr "%1$s-Aktualisierungen favorisiert von %2$s / %3$s."
 
 #. TRANS: Server error displayed whe trying to get a timeline fails.
 #. TRANS: %s is the error message.
-#, fuzzy, php-format
+#, php-format
 msgid "Could not generate feed for list - %s"
-msgstr "Konnte keinen Login-Token für %s erstellen"
+msgstr "Konnte keinen Feed für die Liste erstellen - %s"
 
 #. TRANS: Title for timeline of most recent mentions of a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user nickname.
@@ -1248,12 +1236,9 @@ msgstr "Du musst angemeldet sein, um aus einer Gruppe auszutreten."
 #. TRANS: Client error displayed when requesting Friends of a Friend feed for a nickname that is not a group.
 #. TRANS: Client error displayed trying to block a user from a group while specifying a non-existing group.
 #. TRANS: Client error displayed referring to a group's permalink for a non-existing group ID.
-#. TRANS: Client error displayed trying to change group design settings while providing a nickname for a non-existing group.
 #. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
 #. TRANS: Client error displayed when trying to view group members for a non-existing group.
 #. TRANS: Client error displayed when trying to view group members for an object that is not a group.
-#. TRANS: Client error displayed when trying to view group members for a non-existing group.
-#. TRANS: Client error displayed when trying to view group members for an object that is not a group.
 #. TRANS: Client error displayed when requesting a group RSS feed for group that does not exist.
 #. TRANS: Client error displayed when requesting a group RSS feed for an object that is not a group.
 #. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
@@ -1262,10 +1247,10 @@ msgstr "Du musst angemeldet sein, um aus einer Gruppe auszutreten."
 #. TRANS: Client error displayed when trying to leave a non-local group.
 #. TRANS: Client error displayed when trying to leave a non-existing group.
 #. TRANS: Client error displayed when providing an invalid group ID on the Make Admin page.
-#. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
-#. TRANS: Client error displayed if no local group with a given name was found requesting group page.
 #. TRANS: Command exception text shown when a group is requested that does not exist.
 #. TRANS: Error text shown when trying to leave a group that does not exist.
+#. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
+#. TRANS: Client error displayed if no local group with a given name was found requesting group page.
 msgid "No such group."
 msgstr "Keine derartige Gruppe."
 
@@ -1289,17 +1274,16 @@ msgstr "Nur der Gruppenverwalter kann Beitrittsgesuche annehmen oder ablehnen."
 
 #. TRANS: Client error displayed trying to approve group membership without specifying a profile to approve.
 #. TRANS: Client error displayed trying to approve subscriptionswithout specifying a profile to approve.
-#, fuzzy
 msgid "Must specify a profile."
-msgstr "Benutzer hat kein Profil."
+msgstr "Du musst ein Profil auswählen."
 
 #. TRANS: Client error displayed trying to approve group membership for a non-existing request.
 #. TRANS: %s is a nickname.
 #. TRANS: Client error displayed when trying to approve a non-existing group join request.
 #. TRANS: %s is a user nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "%s is not in the moderation queue for this group."
-msgstr "Liste der Benutzer in dieser Gruppe."
+msgstr "%s ist nicht in der Moderations-Liste für diese Gruppe."
 
 #. TRANS: Client error displayed trying to approve/deny group membership.
 #. TRANS: Client error displayed trying to approve/deny subscription.
@@ -1315,16 +1299,18 @@ msgstr ""
 
 #. TRANS: Server error displayed when cancelling a queued group join request fails.
 #. TRANS: %1$s is the leaving user's nickname, $2$s is the group nickname for which the leave failed.
-#, fuzzy, php-format
+#, php-format
 msgid "Could not cancel request for user %1$s to join group %2$s."
-msgstr "Konnte Benutzer %1$s nicht der Gruppe %2$s hinzufügen."
+msgstr ""
+"Konnte das Beitrittsgesuch des Benutzers %1$s zur Gruppe %2$s nicht "
+"entfernen."
 
 #. TRANS: Title for leave group page after group join request is approved/disapproved.
 #. TRANS: %1$s is the user nickname, %2$s is the group nickname.
-#, fuzzy, php-format
+#, php-format
 msgctxt "TITLE"
 msgid "%1$s's request for %2$s"
-msgstr "Status von %1$s auf %2$s"
+msgstr "%1$ss Anfragen auf %2$s"
 
 #. TRANS: Message on page for group admin after approving a join request.
 msgid "Join request approved."
@@ -1335,31 +1321,33 @@ msgid "Join request canceled."
 msgstr "Beitrittsgesuch abgelehnt."
 
 #. TRANS: Client error displayed trying to approve subscription for a non-existing request.
-#, fuzzy, php-format
+#. TRANS: %s is a user nickname.
+#, php-format
 msgid "%s is not in the moderation queue for your subscriptions."
-msgstr "Liste der Benutzer in dieser Gruppe."
+msgstr "%s ist nicht in der Moderationswarteschlange deiner Abonnements."
 
 #. TRANS: Server error displayed when cancelling a queued subscription request fails.
 #. TRANS: %1$s is the leaving user's nickname, $2$s is the nickname for which the leave failed.
-#, fuzzy, php-format
+#, php-format
 msgid "Could not cancel or approve request for user %1$s to join group %2$s."
-msgstr "Konnte Benutzer %1$s nicht der Gruppe %2$s hinzufügen."
+msgstr ""
+"Konnte das Beitrittsgesuch des Benutzers %1$s zur Gruppe %2$s nicht "
+"entfernen oder annehmen."
 
 #. TRANS: Title for subscription approval ajax return
 #. TRANS: %1$s is the approved user's nickname
-#, fuzzy, php-format
+#, php-format
 msgctxt "TITLE"
 msgid "%1$s's request"
-msgstr "Status von %1$s auf %2$s"
+msgstr "Anfrage von %1$s"
 
 #. TRANS: Message on page for user after approving a subscription request.
 msgid "Subscription approved."
 msgstr "Abonnement genehmigt."
 
 #. TRANS: Message on page for user after rejecting a subscription request.
-#, fuzzy
 msgid "Subscription canceled."
-msgstr "Authorisierung abgebrochen."
+msgstr "Abonnement aufgelöst."
 
 #. TRANS: Subtitle for Atom favorites feed.
 #. TRANS: %1$s is a user nickname, %2$s is the StatusNet sitename.
@@ -1373,12 +1361,10 @@ msgid "Cannot add someone else's subscription."
 msgstr "Konnte neues Abonnement nicht eintragen."
 
 #. TRANS: Client exception thrown when trying use an incorrect activity verb for the Atom pub method.
-#, fuzzy
 msgid "Can only handle favorite activities."
 msgstr "Kann nur Favoriten-Aktionen bearbeiten."
 
 #. TRANS: Client exception thrown when trying favorite an object that is not a notice.
-#, fuzzy
 msgid "Can only fave notices."
 msgstr "Kann nur Notizen favorisieren."
 
@@ -1398,17 +1384,17 @@ msgstr "Gruppen-Mitgliedschaften von %s"
 
 #. TRANS: Subtitle for group membership feed.
 #. TRANS: %1$s is a username, %2$s is the StatusNet sitename.
-#, fuzzy, php-format
+#, php-format
 msgid "Groups %1$s is a member of on %2$s"
-msgstr "Gruppen %1$s ist ein Mitglied von %2$s"
+msgstr ""
+"Mitglieder der Gruppe %1$s, die auf die Aufnahmebestätigung warten, Seite %2"
+"$s."
 
 #. TRANS: Client exception thrown when trying subscribe someone else to a group.
-#, fuzzy
 msgid "Cannot add someone else's membership."
-msgstr "Kann Abonnement von jemand  anderem nicht eintragen."
+msgstr "Kann kein Abonnement für jemand anderen eintragen."
 
 #. TRANS: Client error displayed when not using the join verb.
-#, fuzzy
 msgid "Can only handle join activities."
 msgstr "Kann nur Beitritts-Aktivitäten durchführen."
 
@@ -1429,18 +1415,16 @@ msgid "No such favorite."
 msgstr "Favorit nicht gefunden."
 
 #. TRANS: Client exception thrown when trying to remove a favorite notice of another user.
-#, fuzzy
 msgid "Cannot delete someone else's favorite."
-msgstr "Kann Favoriten von jemand anderem nicht löschen."
+msgstr "Kann keine Favoriten für jeamnd anderen löschen."
 
 #. TRANS: Client exception thrown when trying to show membership of a non-subscribed group
 msgid "Not a member."
 msgstr "Kein Mitglied"
 
 #. TRANS: Client exception thrown when deleting someone else's membership.
-#, fuzzy
 msgid "Cannot delete someone else's membership."
-msgstr "Konnte Abonnement von jemand anderem nicht löschen."
+msgstr "Kann kein Abonnement für jemand anderen löschen."
 
 #. TRANS: Client exception thrown when trying to display a subscription for a non-existing profile ID.
 #. TRANS: %d is the non-existing profile ID number.
@@ -1450,20 +1434,19 @@ msgstr "Keine Profil-Id: %d"
 
 #. TRANS: Client exception thrown when trying to display a subscription for a non-subscribed profile ID.
 #. TRANS: %1$d is the non-existing subscriber ID number, $2$d is the ID of the profile that was not subscribed to.
-#, fuzzy, php-format
+#, php-format
 msgid "Profile %1$d not subscribed to profile %2$d."
-msgstr "Du hast dieses Profil nicht abonniert."
+msgstr "Profil %1$d hat Profil %2$d nicht abonniert."
 
 #. TRANS: Client exception thrown when trying to delete a subscription of another user.
-#, fuzzy
 msgid "Cannot delete someone else's subscription."
-msgstr "Konnte Selbst-Abonnement nicht löschen."
+msgstr "Kann kein Abonnement eines anderen löschen."
 
 #. TRANS: Subtitle for Atom subscription feed.
 #. TRANS: %1$s is a user nickname, %s$s is the StatusNet sitename.
-#, fuzzy, php-format
+#, php-format
 msgid "People %1$s has subscribed to on %2$s"
-msgstr "Leute, die „%s“ abonniert haben"
+msgstr "Leute, die %1$s auf %2$s abonniert hat"
 
 #. TRANS: Client error displayed when not using the follow verb.
 msgid "Can only handle Follow activities."
@@ -1492,7 +1475,6 @@ msgstr "Kein solcher Anhang."
 #. TRANS: Client error displayed trying to get an avatar without providing a nickname.
 #. TRANS: Client error displayed when requesting a list of blocked users for a group without providing a group nickname.
 #. TRANS: Client error displayed trying to edit a group while not proving a nickname for the group to edit.
-#. TRANS: Client error displayed trying to change group design settings without providing a group nickname.
 #. TRANS: Client error displayed when trying to change group logo settings without providing a nickname.
 #. TRANS: Client error displayed when trying to view group members without providing a group nickname.
 #. TRANS: Client error displayed when requesting a group RSS feed without providing a group nickname.
@@ -1564,9 +1546,9 @@ msgid "No file uploaded."
 msgstr "Keine Datei hoch geladen."
 
 #. TRANS: Avatar upload form instruction after uploading a file.
-#, fuzzy
 msgid "Pick a square area of the image to be your avatar."
-msgstr "Wähle einen quadratischen Bereich aus dem Bild als dein Avatar."
+msgstr ""
+"Wähle einen quadratischen Bereich des Bildes, der dein Avatar sein soll."
 
 #. TRANS: Server error displayed if an avatar upload went wrong somehow server side.
 #. TRANS: Server error displayed trying to crop an uploaded group logo that is no longer present.
@@ -1591,9 +1573,8 @@ msgid "Backup account"
 msgstr "Backup-Konto"
 
 #. TRANS: Client exception thrown when trying to backup an account while not logged in.
-#, fuzzy
 msgid "Only logged-in users can backup their account."
-msgstr "Nur angemeldete Benutzer können Nachrichten wiederholen."
+msgstr "Nur angemeldete Benutzer können ihren Account sichern."
 
 #. TRANS: Client exception thrown when trying to backup an account without having backup rights.
 msgid "You may not backup your account."
@@ -1619,9 +1600,8 @@ msgid "Backup"
 msgstr "Backup"
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
-#, fuzzy
 msgid "Backup your account."
-msgstr "Sicherheitskopie des Konto erstellen."
+msgstr "Sicherheitskopie des Kontos erstellen."
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
 msgid "You already blocked that user."
@@ -1654,9 +1634,8 @@ msgid "No"
 msgstr "Nein"
 
 #. TRANS: Submit button title for 'No' when blocking a user.
-#, fuzzy
 msgid "Do not block this user."
-msgstr "Diesen Benutzer nicht blokieren."
+msgstr "Diesen Benutzer nicht blockieren."
 
 #. TRANS: Button label on the user block form.
 #. TRANS: Button label on the delete application form.
@@ -1716,7 +1695,7 @@ msgstr "Versenden an %s"
 #. TRANS: Title for leave group page after leaving.
 #. TRANS: %s$s is the leaving user's name, %2$s is the group name.
 #. TRANS: Title for leave group page after leaving.
-#, fuzzy, php-format
+#, php-format
 msgctxt "TITLE"
 msgid "%1$s left group %2$s"
 msgstr "%1$s hat die Gruppe %2$s verlassen"
@@ -1738,10 +1717,9 @@ msgid "No profile with that ID."
 msgstr "Kein Benutzer-Profil mit dieser ID."
 
 #. TRANS: Title after unsubscribing from a group.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Unsubscribed"
-msgstr "Abbestellt"
+msgstr "Abgemeldet"
 
 #. TRANS: Client error displayed when not providing a confirmation code in the contact address confirmation action.
 msgid "No confirmation code."
@@ -1767,14 +1745,12 @@ msgstr "Diese Adresse wurde bereits bestätigt."
 
 #. TRANS: Server error displayed when updating IM preferences fails.
 #. TRANS: Server error thrown on database error removing a registered IM address.
-#, fuzzy
 msgid "Could not update user IM preferences."
-msgstr "Konnte Benutzereintrag nicht schreiben"
+msgstr "Konnte IM-Einstellungen des Benuzters nicht aktualisieren."
 
 #. TRANS: Server error displayed when adding IM preferences fails.
-#, fuzzy
 msgid "Could not insert user IM preferences."
-msgstr "Konnte neues Abonnement nicht eintragen."
+msgstr "Konnte IM-Einstellungen des Benuzters nichte eintragen."
 
 #. TRANS: Server error displayed when an address confirmation code deletion from the
 #. TRANS: database fails in the contact address confirmation action.
@@ -1795,17 +1771,25 @@ msgstr "Die Adresse „%s“ wurde für dein Konto bestätigt."
 msgid "Conversation"
 msgstr "Unterhaltung"
 
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+msgid "Conversation feed (Activity Streams JSON)"
+msgstr "Feed der Unterhaltungen (Activity Streams JSON)"
+
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+msgid "Conversation feed (RSS 2.0)"
+msgstr "Feed der Unterhaltungen (RSS 2.0)"
+
 #. TRANS: Title for conversation page.
 #. TRANS: Title for page that shows a notice.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Notice"
 msgstr "Nachrichten"
 
 #. TRANS: Client exception displayed trying to delete a user account while not logged in.
-#, fuzzy
 msgid "Only logged-in users can delete their account."
-msgstr "Nur angemeldete Benutzer können Nachrichten wiederholen."
+msgstr "Nur angemeldete Benutzer können ihr Konto löschen."
 
 #. TRANS: Client exception displayed trying to delete a user account without have the rights to do that.
 msgid "You cannot delete your account."
@@ -1855,14 +1839,13 @@ msgstr "Bestätigen"
 
 #. TRANS: Input title for the delete account field.
 #. TRANS: %s is the text that needs to be input.
-#, fuzzy, php-format
+#, php-format
 msgid "Enter \"%s\" to confirm that you want to delete your account."
-msgstr "Du kannst keine Benutzer löschen."
+msgstr "Gib „%s� ein, um zu bestätigen, dass du dein Konto löschen willst."
 
 #. TRANS: Button title for user account deletion.
-#, fuzzy
-msgid "Permanently delete your account"
-msgstr "Du kannst keine Benutzer löschen."
+msgid "Permanently delete your account."
+msgstr "Dein Konto für immer löschen."
 
 #. TRANS: Client error displayed trying to delete an application while not logged in.
 msgid "You must be logged in to delete an application."
@@ -1898,12 +1881,10 @@ msgstr ""
 "aus der Datenbank entfernt, auch alle bestehenden Benutzer-Verbindungen."
 
 #. TRANS: Submit button title for 'No' when deleting an application.
-#, fuzzy
 msgid "Do not delete this application."
-msgstr "Dieses Programm nicht löschen"
+msgstr "Dieses Programm nicht löschen."
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
-#, fuzzy
 msgid "Delete this application."
 msgstr "Programm löschen"
 
@@ -1943,12 +1924,10 @@ msgstr ""
 "dieser Gruppe werden noch in einzelnen Zeitleisten erscheinen."
 
 #. TRANS: Submit button title for 'No' when deleting a group.
-#, fuzzy
 msgid "Do not delete this group."
 msgstr "Diese Gruppe nicht löschen"
 
 #. TRANS: Submit button title for 'Yes' when deleting a group.
-#, fuzzy
 msgid "Delete this group."
 msgstr "Diese Gruppe löschen"
 
@@ -1970,12 +1949,10 @@ msgid "Are you sure you want to delete this notice?"
 msgstr "Bist du sicher, dass du diese Nachricht löschen möchtest?"
 
 #. TRANS: Submit button title for 'No' when deleting a notice.
-#, fuzzy
 msgid "Do not delete this notice."
 msgstr "Diese Nachricht nicht löschen"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#, fuzzy
 msgid "Delete this notice."
 msgstr "Nachricht löschen"
 
@@ -2005,7 +1982,6 @@ msgstr ""
 "werden aus der Datenbank gelöscht (ohne ein Backup)."
 
 #. TRANS: Submit button title for 'No' when deleting a user.
-#, fuzzy
 msgid "Do not delete this user."
 msgstr "Diesen Benutzer nicht löschen"
 
@@ -2013,154 +1989,6 @@ msgstr "Diesen Benutzer nicht löschen"
 msgid "Delete this user."
 msgstr "Diesen Benutzer löschen."
 
-#. TRANS: Message used as title for design settings for the site.
-msgid "Design"
-msgstr "Design"
-
-#. TRANS: Instructions for design adminsitration panel.
-msgid "Design settings for this StatusNet site"
-msgstr "Design-Einstellungen dieser StatusNet-Website"
-
-#. TRANS: Client error displayed when a logo URL does is not valid.
-msgid "Invalid logo URL."
-msgstr "Ungültige URL für das Logo"
-
-#. TRANS: Client error displayed when an SSL logo URL is invalid.
-msgid "Invalid SSL logo URL."
-msgstr "Ungültige URL für das SSL-Logo."
-
-#. TRANS: Client error displayed when a theme is submitted through the form that is not in the theme list.
-#. TRANS: %s is the chosen unavailable theme.
-#, php-format
-msgid "Theme not available: %s."
-msgstr "Theme nicht verfügbar: %s"
-
-#. TRANS: Fieldset legend for form to change logo.
-msgid "Change logo"
-msgstr "Logo ändern"
-
-#. TRANS: Field label for StatusNet site logo.
-msgid "Site logo"
-msgstr "Seitenlogo"
-
-#. TRANS: Field label for SSL StatusNet site logo.
-msgid "SSL logo"
-msgstr "SSL-Logo"
-
-#. TRANS: Fieldset legend for form change StatusNet site's theme.
-msgid "Change theme"
-msgstr "Theme ändern"
-
-#. TRANS: Field label for dropdown to choose site theme.
-msgid "Site theme"
-msgstr "Seitentheme"
-
-#. TRANS: Title for field label for dropdown to choose site theme.
-msgid "Theme for the site."
-msgstr "Theme dieser Seite."
-
-#. TRANS: Field label for uploading a cutom theme.
-msgid "Custom theme"
-msgstr "Angepasster Skin"
-
-#. TRANS: Form instructions for uploading a cutom StatusNet theme.
-msgid "You can upload a custom StatusNet theme as a .ZIP archive."
-msgstr "Du kannst ein angepasstes StatusNet-Theme als .ZIP-Archiv hochladen."
-
-#. TRANS: Fieldset legend for theme background image.
-msgid "Change background image"
-msgstr "Hintergrundbild ändern"
-
-#. TRANS: Field label for background image on theme designer page.
-#. TRANS: Field label for background color selector.
-#. TRANS: Label on profile design page for setting a profile page background colour.
-msgid "Background"
-msgstr "Hintergrund"
-
-#. TRANS: Form guide for background image upload form on theme designer page.
-#, php-format
-msgid ""
-"You can upload a background image for the site. The maximum file size is %1"
-"$s."
-msgstr ""
-"Du kannst ein Hintergrundbild für deine Gruppe hochladen. Die maximale "
-"Dateigröße beträgt %1$s."
-
-#. TRANS: Used as radio button label to add a background image.
-msgid "On"
-msgstr "An"
-
-#. TRANS: Used as radio button label to not add a background image.
-msgid "Off"
-msgstr "Aus"
-
-#. TRANS: Form guide for turning background image on or off on theme designer page.
-#. TRANS: Form guide for a set of radio buttons on the profile design page that will enable or disable
-#. TRANS: use of the uploaded profile image.
-msgid "Turn background image on or off."
-msgstr "Hintergrundbild ein- oder ausschalten."
-
-#. TRANS: Checkbox label to title background image on theme designer page.
-#. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
-msgid "Tile background image"
-msgstr "Hintergrundbild kacheln"
-
-#. TRANS: Fieldset legend for theme colors.
-msgid "Change colors"
-msgstr "Farben ändern"
-
-#. TRANS: Field label for content color selector.
-#. TRANS: Label on profile design page for setting a profile page content colour.
-msgid "Content"
-msgstr "Inhalt"
-
-#. TRANS: Field label for sidebar color selector.
-#. TRANS: Label on profile design page for setting a profile page sidebar colour.
-msgid "Sidebar"
-msgstr "Seitenleiste"
-
-#. TRANS: Field label for text color selector.
-#. TRANS: Label on profile design page for setting a profile page text colour.
-msgid "Text"
-msgstr "Text"
-
-#. TRANS: Field label for link color selector.
-#. TRANS: Label on profile design page for setting a profile page links colour.
-msgid "Links"
-msgstr "Links"
-
-#. TRANS: Fieldset legend for advanced theme design settings.
-msgid "Advanced"
-msgstr "Erweitert"
-
-#. TRANS: Field label for custom CSS.
-msgid "Custom CSS"
-msgstr "Eigene CSS"
-
-#. TRANS: Button text for resetting theme settings.
-#, fuzzy
-msgctxt "BUTTON"
-msgid "Use defaults"
-msgstr "Standardeinstellungen benutzen"
-
-#. TRANS: Title for button for resetting theme settings.
-#. TRANS: Title for button on profile design page to reset all colour settings to default.
-#, fuzzy
-msgid "Restore default designs."
-msgstr "Standard-Design wiederherstellen"
-
-#. TRANS: Title for button for resetting theme settings.
-#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#, fuzzy
-msgid "Reset back to default."
-msgstr "Standard wiederherstellen"
-
-#. TRANS: Title for button for saving theme settings.
-#. TRANS: Title for button on profile design page to save settings.
-#, fuzzy
-msgid "Save design."
-msgstr "Design speichern"
-
 #. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
 msgid "This notice is not a favorite!"
 msgstr "Diese Nachricht ist kein Favorit!"
@@ -2175,6 +2003,74 @@ msgstr "Zu Favoriten hinzufügen"
 msgid "No such document \"%s\"."
 msgstr "Unbekanntes Dokument „%s“"
 
+#. TRANS: Menu item in administrator navigation panel.
+#. TRANS: Menu item in default local navigation panel.
+#. TRANS: Menu item in personal group navigation menu.
+msgctxt "MENU"
+msgid "Home"
+msgstr "Startseite"
+
+msgctxt "MENU"
+msgid "Docs"
+msgstr "Dokumentation"
+
+#. TRANS: Secondary navigation menu item leading to help on StatusNet.
+msgctxt "MENU"
+msgid "Help"
+msgstr "Hilfe"
+
+msgid "Getting started"
+msgstr "Erste Schritte"
+
+#. TRANS: Secondary navigation menu item leading to text about StatusNet site.
+msgctxt "MENU"
+msgid "About"
+msgstr "Ãœber"
+
+msgid "About this site"
+msgstr "Ãœber diese Seite"
+
+#. TRANS: Secondary navigation menu item leading to Frequently Asked Questions.
+msgctxt "MENU"
+msgid "FAQ"
+msgstr "FAQ"
+
+msgid "Frequently asked questions"
+msgstr "Häufig gestellte Fragen"
+
+#. TRANS: Secondary navigation menu item leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+msgctxt "MENU"
+msgid "Contact"
+msgstr "Kontakt"
+
+msgid "Contact info"
+msgstr "Kontaktinformationen"
+
+msgctxt "MENU"
+msgid "Tags"
+msgstr "Tags"
+
+msgid "Using tags"
+msgstr "Tags verwenden"
+
+#. TRANS: Menu item in default local navigation panel.
+#. TRANS: Menu item in search group navigation panel.
+#. TRANS: Menu item in local navigation menu.
+msgctxt "MENU"
+msgid "Groups"
+msgstr "Gruppen"
+
+msgid "Using groups"
+msgstr "Gruppen verwenden"
+
+msgctxt "MENU"
+msgid "API"
+msgstr "API"
+
+msgid "RESTful API"
+msgstr "RESTful API"
+
 #. TRANS: Title for "Edit application" form.
 #. TRANS: Form legend.
 msgid "Edit application"
@@ -2280,41 +2176,37 @@ msgstr "Einstellungen gespeichert."
 
 #. TRANS: Title for edit list page after deleting a tag.
 #. TRANS: %s is a list.
-#, fuzzy, php-format
+#, php-format
 msgid "Delete %s list"
-msgstr "Diesen Benutzer löschen"
+msgstr "Löschung der Liste %s"
 
 #. TRANS: Title for edit list page.
 #. TRANS: %s is a list.
 #. TRANS: Form legend for list edit form.
 #. TRANS: %s is a list.
-#, fuzzy, php-format
+#, php-format
 msgid "Edit list %s"
-msgstr "Ungültiger Personen-Tag: „%s“."
+msgstr "Bearbeiten der Liste %s"
 
 #. TRANS: Error message displayed when trying to perform an action that requires a tagging user or ID.
-#, fuzzy
 msgid "No tagger or ID."
-msgstr "Kein Benutzername oder ID"
+msgstr "Kein Benutzer oder ID angegeben."
 
 #. TRANS: Client error displayed when referring to non-local user.
 msgid "Not a local user."
 msgstr "Kein lokaler Benutzer."
 
 #. TRANS: Client error displayed when reting to edit a tag that was not self-created.
-#, fuzzy
 msgid "You must be the creator of the tag to edit it."
-msgstr "Du musst ein Admin sein, um die Gruppe zu bearbeiten"
+msgstr "Du musst der Ersteller dieses Tags sein, um es zu bearbeiten."
 
 #. TRANS: Form instruction for edit list form.
-#, fuzzy
 msgid "Use this form to edit the list."
-msgstr "Benutze dieses Formular, um die Gruppe zu bearbeiten."
+msgstr "Benutze dieses Formular, um die Liste zu bearbeiten."
 
 #. TRANS: Form validation error displayed if the form data for deleting a tag was incorrect.
-#, fuzzy
 msgid "Delete aborted."
-msgstr "Notiz löschen"
+msgstr "Löschen abgebrochen."
 
 #. TRANS: Text in confirmation dialog for deleting a tag.
 msgid ""
@@ -2325,15 +2217,14 @@ msgstr ""
 "Mitgliedschaft. Möchtest du trotzdem fortfahren?"
 
 #. TRANS: Form validation error displayed if a given tag is invalid.
-#, fuzzy
 msgid "Invalid tag."
-msgstr "Ungültige Größe."
+msgstr "Ungültiges Tag."
 
 #. TRANS: Form validation error displayed if a given tag is already present.
 #. TRANS: %s is the already present tag.
-#, fuzzy, php-format
+#, php-format
 msgid "You already have a tag named %s."
-msgstr "Nachricht bereits wiederholt"
+msgstr "Das Tag %s existiert bereits."
 
 #. TRANS: Text in confirmation dialog for setting a tag from public to private.
 msgid ""
@@ -2343,10 +2234,9 @@ msgstr ""
 "Das Markieren eines öffentlichen Tags entfernt dauerhaft alle existierenden "
 "diesbezüglichen Abonnements. Möchtest du trotzdem fortfahren?"
 
-#. TRANS: TRANS: Server error displayed when updating a list fails.
-#, fuzzy
+#. TRANS: Server error displayed when updating a list fails.
 msgid "Could not update list."
-msgstr "Konnte Benutzerdaten nicht aktualisieren."
+msgstr "Konnte Liste nicht aktualisieren."
 
 #. TRANS: Title for e-mail settings.
 msgid "Email settings"
@@ -2475,9 +2365,8 @@ msgid "No email address."
 msgstr "Keine E-Mail-Adresse."
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
-#, fuzzy
 msgid "Cannot normalize that email address."
-msgstr "Diese e-Mail-Adresse kann nicht normalisiert werden."
+msgstr "Diese Emailadresse kann nicht normalisiert werden."
 
 #. TRANS: Message given saving e-mail address that not valid.
 #. TRANS: Form validation error displayed when trying to register without a valid e-mail address.
@@ -2496,9 +2385,8 @@ msgstr "Diese E-Mail-Adresse gehört bereits einem anderen Benutzer."
 #. TRANS: Server error thrown on database error adding e-mail confirmation code.
 #. TRANS: Server error thrown on database error adding Instant Messaging confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
-#, fuzzy
 msgid "Could not insert confirmation code."
-msgstr "Konnte keinen Bestätigungscode einfügen."
+msgstr "Konnte Bestätigungscode nicht einfügen."
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
 msgid ""
@@ -2520,7 +2408,6 @@ msgid "That is the wrong email address."
 msgstr "Dies ist die falsche E-Mail Adresse"
 
 #. TRANS: Server error thrown on database error canceling e-mail address confirmation.
-#, fuzzy
 msgid "Could not delete email confirmation."
 msgstr "Konnte E-Mail-Bestätigung nicht löschen."
 
@@ -2544,9 +2431,8 @@ msgstr "Keine Eingangs-E-Mail-Adresse."
 #. TRANS: Server error thrown on database error removing incoming e-mail address.
 #. TRANS: Server error thrown on database error adding incoming e-mail address.
 #. TRANS: Server error displayed when the user could not be updated in SMS settings.
-#, fuzzy
 msgid "Could not update user record."
-msgstr "Konnte Benutzereintrag nicht schreiben"
+msgstr "Konnte Benutzereintrag nicht aktualisieren."
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
 #. TRANS: Confirmation text after updating SMS settings.
@@ -2563,9 +2449,8 @@ msgid "This notice is already a favorite!"
 msgstr "Diese Nachricht ist bereits ein Favorit!"
 
 #. TRANS: Page title for page on which favorite notices can be unfavourited.
-#, fuzzy
 msgid "Disfavor favorite."
-msgstr "Aus Favoriten entfernen"
+msgstr "Aus den Favoriten entfernen."
 
 #. TRANS: Page title for first page of favorited notices.
 #. TRANS: Title for favourited notices section.
@@ -2636,9 +2521,9 @@ msgid "Featured users, page %d"
 msgstr "Top-Benutzer, Seite %d"
 
 #. TRANS: Description on page displaying featured users.
-#, fuzzy, php-format
+#, php-format
 msgid "A selection of some great users on %s."
-msgstr "Eine Auswahl toller Benutzer auf %s"
+msgstr "Eine Auswahl besonderer Benutzer auf %s."
 
 #. TRANS: Client error displayed when no notice ID was given trying do display a file.
 msgid "No notice ID."
@@ -2657,40 +2542,6 @@ msgstr "Keine Anhänge vorhanden"
 msgid "No uploaded attachments."
 msgstr "Kein Anhang geladen."
 
-#. TRANS: Client error displayed when subscribing to a remote profile and an unexpected response is received.
-msgid "Not expecting this response!"
-msgstr "Unerwartete Antwort!"
-
-#. TRANS: Client error displayed when subscribing to a remote profile that does not exist.
-msgid "User being listened to does not exist."
-msgstr "Aufgeführter Benutzer existiert nicht."
-
-#. TRANS: Client error displayed when subscribing to a remote profile that is a local profile.
-#. TRANS: Client error displayed when using remote subscribe for a local entity.
-msgid "You can use the local subscription!"
-msgstr "Du kannst ein lokales Abonnement erstellen!"
-
-#. TRANS: Client error displayed when subscribing to a remote profile that is blocked form subscribing to.
-msgid "That user has blocked you from subscribing."
-msgstr "Dieser Benutzer erlaubt dir nicht ihn zu abonnieren."
-
-#. TRANS: Client error displayed when subscribing to a remote profile without providing an authorised token.
-msgid "You are not authorized."
-msgstr "Du bist nicht autorisiert."
-
-#. TRANS: Client error displayed when subscribing to a remote profile and conversion of the request token to access token fails.
-msgid "Could not convert request token to access token."
-msgstr "Konnte Anfrage-Token nicht in Zugriffs-Token umwandeln."
-
-#. TRANS: Client error displayed when subscribing to a remote profile fails because of an unsupported version of the OMB protocol.
-msgid "Remote service uses unknown version of OMB protocol."
-msgstr "Service nutzt unbekannte OMB-Protokollversion."
-
-#. TRANS: Server error displayed when subscribing to a remote profile fails because the remote profile could not be updated.
-#. TRANS: Exception thrown when updating a remote profile fails in OAuth store.
-msgid "Error updating remote profile."
-msgstr "Fehler beim Aktualisieren des entfernten Profils."
-
 #. TRANS: Client error displayed when requesting a non-existent file.
 msgid "No such file."
 msgstr "Datei nicht gefunden."
@@ -2761,14 +2612,12 @@ msgstr ""
 "und wird auch in Zukunft dieser Gruppe nicht mehr beitreten können."
 
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
-#, fuzzy
 msgid "Do not block this user from this group."
-msgstr "Diesen Benutzerzugang nicht für diese Gruppe blockieren."
+msgstr "Diesen Benutzer in dieser Gruppe nicht blockieren."
 
 #. TRANS: Submit button title for 'Yes' when blocking a user from a group.
-#, fuzzy
 msgid "Block this user from this group."
-msgstr "Diesen Benutzer von der Gruppe blockieren"
+msgstr "Diesen Benutzer in dieser Gruppe blockieren."
 
 #. TRANS: Server error displayed when trying to block a user from a group fails because of an application error.
 msgid "Database error blocking user from group."
@@ -2781,32 +2630,6 @@ msgstr ""
 msgid "No ID."
 msgstr "Keine ID"
 
-#. TRANS: Client error displayed trying to change group design settings while not logged in.
-msgid "You must be logged in to edit a group."
-msgstr "Du musst angemeldet sein, um eine Gruppe zu bearbeiten."
-
-#. TRANS: Title group design settings page.
-msgid "Group design"
-msgstr "Gruppen-Design"
-
-#. TRANS: Instructions for group design settings page.
-msgid ""
-"Customize the way your group looks with a background image and a colour "
-"palette of your choice."
-msgstr ""
-"Stelle ein wie die Gruppenseite aussehen soll. Hintergrundbild und "
-"Farbpalette frei wählbar."
-
-#. TRANS: Form validation error displayed when group design settings could not be updated because of an application issue.
-#, fuzzy
-msgid "Unable to update your design settings."
-msgstr "Konnte Twitter-Einstellungen nicht speichern."
-
-#. TRANS: Form text to confirm saved group design settings.
-#. TRANS: Confirmation message on Profile design page when saving design settings has succeeded.
-msgid "Design preferences saved."
-msgstr "Design-Einstellungen gespeichert."
-
 #. TRANS: Title for group logo settings page.
 #. TRANS: Group logo form legend.
 msgid "Group logo"
@@ -2863,20 +2686,22 @@ msgstr "Nur der Gruppenverwalter kann Benutzer annehmen."
 
 #. TRANS: Title of the first page showing pending group members still awaiting approval to join the group.
 #. TRANS: %s is the name of the group.
-#, fuzzy, php-format
+#, php-format
 msgid "%s group members awaiting approval"
-msgstr "%s Gruppen-Mitgliedschaften"
+msgstr "Mitglieder der Gruppe %s, die auf die Aufnahmebestätigung warten."
 
 #. TRANS: Title of all but the first page showing pending group members still awaiting approval to join the group.
 #. TRANS: %1$s is the name of the group, %2$d is the page number of the members list.
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s group members awaiting approval, page %2$d"
-msgstr "%1$s Gruppen-Mitglieder, Seite %2$d"
+msgstr ""
+"Mitglieder der Gruppe %1$s, die auf die Aufnahmebestätigung warten, Seite %2"
+"$d."
 
 #. TRANS: Page notice for group members page.
-#, fuzzy
 msgid "A list of users awaiting approval to join this group."
-msgstr "Liste der Benutzer in dieser Gruppe."
+msgstr ""
+"Liste von Benutzern, die auf die Bestätigung ihrer Mitgliedschaft warten."
 
 #. TRANS: Message is used as link description. %1$s is a group name, %2$s is a site name.
 #, php-format
@@ -2890,7 +2715,7 @@ msgstr "Gruppen"
 
 #. TRANS: Title for all but the first page of the groups list.
 #. TRANS: %d is the page number.
-#, fuzzy, php-format
+#, php-format
 msgctxt "TITLE"
 msgid "Groups, page %d"
 msgstr "Gruppen, Seite %d"
@@ -2898,7 +2723,7 @@ msgstr "Gruppen, Seite %d"
 #. TRANS: Page notice of group list. %%%%site.name%%%% is the StatusNet site name,
 #. TRANS: %%%%action.groupsearch%%%% and %%%%action.newgroup%%%% are URLs. Do not change them.
 #. TRANS: This message contains Markdown links in the form [link text](link).
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "%%%%site.name%%%% groups let you find and talk with people of similar "
 "interests. After you join a group you can send messages to all other members "
@@ -2907,10 +2732,10 @@ msgid ""
 "%%%)!"
 msgstr ""
 "Finde und rede mit Gleichgesinnten in %%%%site.name%%%%-Gruppen. Nachdem du "
-"einer Gruppe beigetreten bist kannst du mit „!Gruppenname“ eine Nachricht an "
-"alle Gruppenmitglieder schicken. Du kannst nach einer [Gruppe suchen](%%%%"
-"action.groupsearch%%%%) oder deine eigene [Gruppe aufmachen!](%%%%action."
-"newgroup%%%%)"
+"einer Gruppe beigetreten bist, kannst du mit „!Gruppenname“ eine Nachricht "
+"an alle Gruppenmitglieder schicken. Du kannst nach einer [Gruppe suchen](%%%%"
+"action.groupsearch%%%%) oder deine eigene [Gruppe aufmachen](%%%%action."
+"newgroup%%%%)!"
 
 #. TRANS: Link to create a new group on the group list page.
 #. TRANS: Link text on group page to create a new group.
@@ -2941,13 +2766,13 @@ msgstr "Keine Ergebnisse."
 
 #. TRANS: Additional text on page where groups can be searched if no results were found for a query for a logged in user.
 #. TRANS: This message contains Markdown links in the form [link text](link).
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "If you cannot find the group you're looking for, you can [create it](%%"
 "action.newgroup%%) yourself."
 msgstr ""
-"Wenn du die Gruppe die dich interessiert nicht finden kannst, dann [erstelle "
-"sie](%%action.newgroup%%) doch einfach."
+"Wenn du die Gruppe, die dich interessiert, nicht finden kannst, dann "
+"[erstelle sie](%%action.newgroup%%) doch einfach."
 
 #. TRANS: Additional text on page where groups can be searched if no results were found for a query for a not logged in user.
 #. TRANS: This message contains Markdown links in the form [link text](link).
@@ -2979,33 +2804,33 @@ msgstr "IM-Einstellungen"
 #. TRANS: Instant messaging settings page instructions.
 #. TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link.
 #. TRANS: the order and formatting of link text and link should remain unchanged.
-#, fuzzy, php-format
+#, php-format
 msgid ""
-"You can send and receive notices through instant messaging [instant messages]"
-"(%%doc.im%%). Configure your addresses and settings below."
+"You can send and receive notices through [instant messaging](%%doc.im%%). "
+"Configure your addresses and settings below."
 msgstr ""
-"Du kannst Nachrichten mittels [Jabber/GTalk IM](%%doc.im%%) empfangen und "
-"senden. Stelle deine Adresse und Einstellungen unten ein."
+"Du kannst Nachrichten mittels [Instant Messaging](%%doc.im%%) empfangen und "
+"senden. Lege deine Adressen und Einstellungen unten fest."
 
 #. TRANS: Message given in the IM settings if IM is not enabled on the site.
 msgid "IM is not available."
 msgstr "IM ist nicht verfügbar."
 
 #. TRANS: Form note in IM settings form. %s is the type of IM address that was confirmed.
-#, fuzzy, php-format
+#, php-format
 msgid "Current confirmed %s address."
-msgstr "Aktuelle bestätigte E-Mail-Adresse."
+msgstr "Aktuelle bestätigte Adresse für %s."
 
 #. TRANS: Form note in IM settings form.
 #. TRANS: %s is the IM service name, %2$s is the IM address set.
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your %1$s account for a message "
 "with further instructions. (Did you add %2$s to your buddy list?)"
 msgstr ""
 "Warte auf Bestätigung dieser Adresse. Eine Nachricht mit weiteren Anweisung "
-"sollte in deinem Jabber/GTalk-Konto eingehen. (Hast du %s zu deiner "
-"Freundesliste hinzugefügt?)"
+"sollte in deinem %1$s-Konto eingehen. (Hast du %2$s zu deiner Freundesliste "
+"hinzugefügt?)"
 
 #. TRANS: Field label for IM address.
 msgid "IM address"
@@ -3017,36 +2842,29 @@ msgid "%s screenname."
 msgstr "%s Benutzername."
 
 #. TRANS: Header for IM preferences form.
-#, fuzzy
 msgid "IM Preferences"
 msgstr "IM-Einstellungen"
 
 #. TRANS: Checkbox label in IM preferences form.
-#, fuzzy
 msgid "Send me notices"
-msgstr "Nachricht senden"
+msgstr "Schicke mir Nachrichten"
 
 #. TRANS: Checkbox label in IM preferences form.
-#, fuzzy
 msgid "Post a notice when my status changes."
-msgstr "Schicke eine Nachricht, wenn sich mein Jabber/GTalk-Status verändert."
-
-#. TRANS: Checkbox label in IM preferences form.
-#, fuzzy
-msgid "Send me replies from people I'm not subscribed to."
 msgstr ""
-"Schicke mir Antworten von Leuten, die ich nicht abonniert habe, mit Jabber/"
-"GTalk."
+"Schicke mir eine Nachricht, wenn sich mein Jabber/GTalk-Status verändert."
+
+#. TRANS: Checkbox label in IM preferences form.
+msgid "Send me replies from people I'm not subscribed to."
+msgstr "Schicke mir Antworten von Leuten, die ich nicht abonniert habe."
 
 #. TRANS: Checkbox label in IM preferences form.
-#, fuzzy
 msgid "Publish a MicroID"
-msgstr "MicroID für meine E-Mail-Adresse veröffentlichen."
+msgstr "MicroID veröffentlichen"
 
 #. TRANS: Server error thrown on database error updating IM preferences.
-#, fuzzy
 msgid "Could not update IM preferences."
-msgstr "Konnte Benutzerdaten nicht aktualisieren."
+msgstr "Konnte I%TEinstellungen nihct aktualisieren."
 
 #. TRANS: Confirmation message for successful IM preferences save.
 #. TRANS: Confirmation message after saving preferences.
@@ -3054,43 +2872,36 @@ msgid "Preferences saved."
 msgstr "Einstellungen gesichert."
 
 #. TRANS: Message given saving IM address without having provided one.
-#, fuzzy
 msgid "No screenname."
-msgstr "Kein Benutzername."
+msgstr "Kein IM-Benutzername angegeben."
 
 #. TRANS: Form validation error when no transport is available setting an IM address.
-#, fuzzy
 msgid "No transport."
-msgstr "Keine Nachricht"
+msgstr "Keine Übertragungsmöglichkeit vorhanden."
 
 #. TRANS: Message given saving IM address that cannot be normalised.
-#, fuzzy
 msgid "Cannot normalize that screenname."
-msgstr "Konnte diese Jabber-ID nicht normalisieren"
+msgstr "Konnte den IM-Benutzernamen nicht normalisieren."
 
 #. TRANS: Message given saving IM address that not valid.
-#, fuzzy
 msgid "Not a valid screenname."
 msgstr "Ungültiger Benutzername."
 
 #. TRANS: Message given saving IM address that is already set for another user.
-#, fuzzy
 msgid "Screenname already belongs to another user."
-msgstr "Diese Jabber-ID wird bereits von einem anderen Benutzer verwendet."
+msgstr "Dieser Benutzername wird bereits von jemand anderem verwendet."
 
 #. TRANS: Message given saving valid IM address that is to be confirmed.
-#, fuzzy
 msgid "A confirmation code was sent to the IM 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."
+"hast."
 
 #. TRANS: Message given canceling IM address confirmation for the wrong IM address.
 msgid "That is the wrong IM address."
 msgstr "Das ist die falsche IM-Adresse."
 
 #. TRANS: Server error thrown on database error canceling IM address confirmation.
-#, fuzzy
 msgid "Could not delete confirmation."
 msgstr "Konnte die IM-Bestätigung nicht löschen."
 
@@ -3100,9 +2911,8 @@ msgstr "IM-Bestätigung abgebrochen."
 
 #. TRANS: Message given trying to remove an IM address that is not
 #. TRANS: registered for the active user.
-#, fuzzy
 msgid "That is not your screenname."
-msgstr "Dies ist nicht deine Telefonnummer."
+msgstr "Dies ist nicht dein Benutzername."
 
 #. TRANS: Message given after successfully removing a registered Instant Messaging address.
 msgid "The IM address was removed."
@@ -3202,33 +3012,6 @@ 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."
 
-#. TRANS: Field label for a list of e-mail addresses.
-msgid "Email addresses"
-msgstr "E-Mail-Adressen"
-
-#. TRANS: Tooltip for field label for a list of e-mail addresses.
-#, fuzzy
-msgid "Addresses of friends to invite (one per line)."
-msgstr ""
-"Adressen von Freunden, die du einladen möchtest. (Jeweils eine Adresse pro "
-"Zeile)"
-
-#. TRANS: Field label for a personal message to send to invitees.
-msgid "Personal message"
-msgstr "Private Nachricht"
-
-#. TRANS: Tooltip for field label for a personal message to send to invitees.
-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."
-
-#. TRANS: Send button for inviting friends
-#. TRANS: Button text for sending notice.
-msgctxt "BUTTON"
-msgid "Send"
-msgstr "Senden"
-
 #. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral
 #. TRANS: singular 3rd-person pronoun in English. %1$s is the inviting user, $2$s is
 #. TRANS: the StatusNet sitename.
@@ -3241,15 +3024,14 @@ msgid "You must be logged in to join a group."
 msgstr "Du musst angemeldet sein, um Mitglied einer Gruppe zu werden."
 
 #. TRANS: Title for join group page after joining.
-#, fuzzy, php-format
+#, php-format
 msgctxt "TITLE"
 msgid "%1$s joined group %2$s"
 msgstr "%1$s ist der Gruppe %2$s beigetreten"
 
 #. TRANS: Exception thrown when there is an unknown error joining a group.
-#, fuzzy
 msgid "Unknown error joining group."
-msgstr "Unbekannte Gruppe."
+msgstr "Unbekannter Fehler beim Beitritt zur Gruppe aufgetreten"
 
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
@@ -3319,7 +3101,6 @@ msgid "Type"
 msgstr "Typ"
 
 #. TRANS: Dropdown field instructions in the license admin panel.
-#, fuzzy
 msgid "Select a license."
 msgstr "Lizenz auswählen"
 
@@ -3360,15 +3141,8 @@ msgid "URL for an image to display with the license."
 msgstr "URL eines mit der Lizenz anzuzeigenden Bildes."
 
 #. TRANS: Button title in the license admin panel.
-#, fuzzy
 msgid "Save license settings."
-msgstr "Lizenz-Einstellungen speichern"
-
-#. TRANS: Client error displayed when trying to log in while already logged in.
-#. TRANS: Client error displayed trying to use "one time password login" when already logged in.
-#. TRANS: Client error displayed when trying to register while already logged in.
-msgid "Already logged in."
-msgstr "Bereits angemeldet."
+msgstr "Lizenzeinstellungen speichern"
 
 #. TRANS: Form validation error displayed when trying to log in with incorrect credentials.
 msgid "Incorrect username or password."
@@ -3389,9 +3163,8 @@ msgid "Login to site"
 msgstr "An Seite anmelden"
 
 #. TRANS: Field label on login page.
-#, fuzzy
 msgid "Username or email address"
-msgstr "Spitzname oder E-Mail-Adresse"
+msgstr "Benutzername oder E-Mail-Adresse"
 
 #. TRANS: Checkbox label label on login page.
 #. TRANS: Checkbox label on account registration page.
@@ -3481,18 +3254,17 @@ msgstr "Quell-URL ist erforderlich."
 msgid "Could not create application."
 msgstr "Konnte das Programm nicht erstellen."
 
-#, fuzzy
+#. TRANS: Form validation error messages displayed when uploading an invalid application logo.
 msgid "Invalid image."
-msgstr "Ungültige Größe."
+msgstr "Ungültiges Bild"
 
 #. TRANS: Title for form to create a group.
 msgid "New group"
 msgstr "Neue Gruppe"
 
 #. TRANS: Client exception thrown when a user tries to create a group while banned.
-#, fuzzy
 msgid "You are not allowed to create groups on this site."
-msgstr "Du darfst diese Gruppe nicht löschen."
+msgstr "Du darfst hier keine Gruppen gründen."
 
 #. TRANS: Form instructions for group create form.
 msgid "Use this form to create a new group."
@@ -3505,7 +3277,6 @@ msgstr "Neue Nachricht"
 
 #. TRANS: Client error displayed trying to send a direct message to a user while sender and
 #. TRANS: receiver are not subscribed to each other.
-#, fuzzy
 msgid "You cannot send a message to this user."
 msgstr "Du kannst diesem Benutzer keine Nachricht schicken."
 
@@ -3520,13 +3291,6 @@ msgstr "Kein Inhalt!"
 msgid "No recipient specified."
 msgstr "Kein Empfänger angegeben."
 
-#. TRANS: Client error displayed trying to send a direct message to self.
-#. TRANS: Error text shown when trying to send a direct message to self.
-msgid ""
-"Don't send a message to yourself; just say it to yourself quietly instead."
-msgstr ""
-"Schicke dir selbst keine Nachrichten; sag es dir stattdessen einfach leise."
-
 #. TRANS: Page title after sending a direct message.
 msgid "Message sent"
 msgstr "Nachricht gesendet"
@@ -3546,7 +3310,6 @@ msgstr "Ajax-Fehler"
 
 #. TRANS: Page title for sending a new notice.
 #. TRANS: Title for form to send a new notice.
-#, fuzzy
 msgctxt "TITLE"
 msgid "New notice"
 msgstr "Neue Nachricht"
@@ -3604,9 +3367,9 @@ msgstr "Aktualisierungen mit „%s“"
 
 #. TRANS: RSS notice search feed description.
 #. TRANS: %1$s is the query, %2$s is the StatusNet site name.
-#, fuzzy, php-format
+#, php-format
 msgid "Updates matching search term \"%1$s\" on %2$s."
-msgstr "Alle Aktualisierungen, die den Suchbegriff „%s“ enthalten"
+msgstr "Alle Aktualisierungen, die den Suchbegriff „%1$s“ auf %2$s enthalten"
 
 #. TRANS: Client error displayed trying to nudge a user that cannot be nudged.
 msgid ""
@@ -3687,15 +3450,15 @@ msgstr ""
 
 #. TRANS: Server error displayed in oEmbed action when path not found.
 #. TRANS: %s is a path.
-#, fuzzy, php-format
+#, php-format
 msgid "\"%s\" not found."
-msgstr "API-Methode nicht gefunden."
+msgstr "„%s“ nicht gefunden."
 
 #. TRANS: Server error displayed in oEmbed action when notice not found.
 #. TRANS: %s is a notice.
-#, fuzzy, php-format
+#, php-format
 msgid "Notice %s not found."
-msgstr "API-Methode nicht gefunden."
+msgstr "Notiz %s nicht gefunden."
 
 #. TRANS: Server error displayed in oEmbed action when notice has not profile.
 #. TRANS: Server error displayed trying to show a notice without a connected profile.
@@ -3711,15 +3474,15 @@ msgstr "Status von %1$s auf %2$s"
 
 #. TRANS: Server error displayed in oEmbed action when attachment not found.
 #. TRANS: %d is an attachment ID.
-#, fuzzy, php-format
+#, php-format
 msgid "Attachment %s not found."
-msgstr "Empfänger nicht gefunden."
+msgstr "Anhang %s nihct gefunden."
 
 #. TRANS: Server error displayed in oEmbed request when a path is not supported.
 #. TRANS: %s is a path.
-#, fuzzy, php-format
+#, php-format
 msgid "\"%s\" not supported for oembed requests."
-msgstr "\"%s\" ist für Oembed-Anfragen nicht unterstützt."
+msgstr "„%s“ wird bei oEmbed-Anfragen nicht unterstützt."
 
 #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
 #, php-format
@@ -3736,6 +3499,32 @@ msgstr "Bitte nur %s URLs über einfaches HTTP."
 msgid "Not a supported data format."
 msgstr "Kein unterstütztes Datenformat."
 
+#. TRANS: Page title for profile settings.
+msgid "Old school UI settings"
+msgstr "Alte UI-Einstellungen"
+
+#. TRANS: Usage instructions for profile settings.
+msgid "If you like it \"the old way\", you can set that here."
+msgstr "Wenn du \"die alte Art\" bevorzugst, kannst du das hier festlegen."
+
+#. TRANS: Confirmation shown when user profile settings are saved.
+#. TRANS: Message after successful saving of administrative settings.
+msgid "Settings saved."
+msgstr "Einstellungen gespeichert."
+
+msgid "Only stream mode (no conversations) in timelines"
+msgstr "Nur Stream-Modus (keine Konversationen) in Time-Lines"
+
+msgid "Show conversation page as hierarchical trees"
+msgstr "Konversationsseite als hierarchischen Baum anzeigen"
+
+msgid "Show nicknames (not full names) in timelines"
+msgstr "Spitznamen (nicht die vollständigen Namen) in Zeitleisten anzeigen"
+
+#. TRANS: Button text to save a list.
+msgid "Save"
+msgstr "Speichern"
+
 #. TRANS: ShortName in the OpenSearch interface when trying to find users.
 msgid "People Search"
 msgstr "Suche nach Benutzern"
@@ -3744,6 +3533,11 @@ msgstr "Suche nach Benutzern"
 msgid "Notice Search"
 msgstr "Nachrichtensuche"
 
+#. TRANS: Client error displayed trying to use "one time password login" when already logged in.
+#. TRANS: Client error displayed when trying to register while already logged in.
+msgid "Already logged in."
+msgstr "Bereits angemeldet."
+
 #. TRANS: Client error displayed trying to use "one time password login" without specifying a user.
 msgid "No user ID specified."
 msgstr "Keine Benutzer-ID angegeben"
@@ -3781,7 +3575,6 @@ msgstr ""
 "Das hier ist dein Postausgang, er beinhaltet deine gesendeten Nachrichten."
 
 #. TRANS: Title for page where to change password.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Change password"
 msgstr "Passwort ändern"
@@ -3810,19 +3603,17 @@ msgid "6 or more characters."
 msgstr "6 oder mehr Zeichen"
 
 #. TRANS: Field label on page where to change password. In this field the new password should be typed a second time.
-#, fuzzy
 msgctxt "LABEL"
 msgid "Confirm"
 msgstr "Bestätigen"
 
 #. TRANS: Field title on page where to change password.
-#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
+#. TRANS: Title for field label for password reset form where the password has to be typed again.
 #. TRANS: Field title on account registration page.
 msgid "Same as password above."
 msgstr "Gleiches Passwort wie zuvor"
 
 #. TRANS: Button text on page where to change password.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Change"
 msgstr "Ändern"
@@ -3834,14 +3625,12 @@ msgstr "Das Passwort muss aus 6 oder mehr Zeichen bestehen."
 
 #. TRANS: Form validation error on password change when password confirmation does not match.
 #. TRANS: Form validation error displayed when trying to register with non-matching passwords.
-#, fuzzy
 msgid "Passwords do not match."
 msgstr "Passwörter stimmen nicht überein."
 
 #. TRANS: Form validation error on page where to change password.
-#, fuzzy
 msgid "Incorrect old password."
-msgstr "Altes Passwort falsch"
+msgstr "Das alte Passwort wurde falsch angegeben."
 
 #. TRANS: Form validation error on page where to change password.
 msgid "Error saving user; invalid."
@@ -3850,9 +3639,8 @@ msgstr "Fehler beim Speichern des Benutzers, ungültig."
 #. TRANS: Server error displayed on page where to change password when password change
 #. TRANS: could not be made because of a server error.
 #. TRANS: Reset password form validation error message.
-#, fuzzy
 msgid "Cannot save new password."
-msgstr "Konnte neues Passwort nicht speichern"
+msgstr "Kann neues Passwort nicht speichern."
 
 #. TRANS: Form validation notice on page where to change password.
 msgid "Password saved."
@@ -3878,12 +3666,6 @@ msgstr "Theme-Verzeichnis nicht lesbar: %s."
 msgid "Avatar directory not writable: %s."
 msgstr "Avatar-Verzeichnis ist nicht beschreibbar: %s."
 
-#. TRANS: Client error in Paths admin panel.
-#. TRANS: %s is the background directory that could not be written to.
-#, php-format
-msgid "Background directory not writable: %s."
-msgstr "Hintergrund-Verzeichnis ist nicht beschreibbar: %s."
-
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the locales directory that could not be read from.
 #, php-format
@@ -3928,12 +3710,10 @@ msgid "Fancy URLs"
 msgstr "Schicke URLs."
 
 #. TRANS: Field title in Paths admin panel.
-#, fuzzy
 msgid "Use fancy URLs (more readable and memorable)?"
-msgstr "Schicke URLs (lesbarer und besser zu merken) verwenden?"
+msgstr "Ausgefallene URLs verwenden (lesbarer und besser merkbar)?"
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#, fuzzy
 msgctxt "LEGEND"
 msgid "Theme"
 msgstr "Motiv"
@@ -3998,30 +3778,6 @@ msgstr "Avatarverzeichnis"
 msgid "Directory where avatars are located."
 msgstr "Pfad, in dem sich die Avatare befinden."
 
-#. TRANS: Fieldset legend in Paths admin panel.
-msgid "Backgrounds"
-msgstr "Hintergrundbilder"
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-msgid "Server for backgrounds."
-msgstr "Server für Hintergründe."
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-msgid "Web path to backgrounds."
-msgstr "Web-Pfad zu den Hintergründen."
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-msgid "Server for backgrounds on SSL pages."
-msgstr "Server für Hintergründe auf SSL-Seiten."
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-msgid "Web path to backgrounds on SSL pages."
-msgstr "Web Pfad zu Hintergründen auf SSL-Seiten."
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-msgid "Directory where backgrounds are located."
-msgstr "Verzeichnis, in dem sich die Hintergründe befinden."
-
 #. TRANS: Fieldset legens in Paths admin panel.
 msgid "Attachments"
 msgstr "Anhänge"
@@ -4047,7 +3803,6 @@ msgid "Directory where attachments are located."
 msgstr "Pfad, in dem sich die Themes befinden."
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#, fuzzy
 msgctxt "LEGEND"
 msgid "SSL"
 msgstr "SSL"
@@ -4078,8 +3833,8 @@ msgid "Server to direct SSL requests to."
 msgstr "Server an den SSL Anfragen gerichtet werden sollen"
 
 #. TRANS: Button title text to store form data in the Paths admin panel.
-msgid "Save paths"
-msgstr "Speicherpfade"
+msgid "Save path settings."
+msgstr "Pfadeinstellungen speichern"
 
 #. TRANS: Instructions for the "People search" page.
 #. TRANS: %%site.name%% is the name of the StatusNet site.
@@ -4098,67 +3853,62 @@ msgstr "Suche nach anderen Benutzern"
 
 #. TRANS: Title for list page.
 #. TRANS: %s is a list.
-#, fuzzy, php-format
+#, php-format
 msgid "Public list %s"
-msgstr "Öffentliche Tag-Wolke"
+msgstr "Öffentliche Liste %s"
 
 #. TRANS: Title for list page.
 #. TRANS: %1$s is a list, %2$d is a page number.
-#, fuzzy, php-format
+#, php-format
 msgid "Public list %1$s, page %2$d"
-msgstr "Antworten an %1$s, Seite %2$d"
+msgstr "Öffentliche Liste %1$s, Seite %2$d"
 
 #. TRANS: Message for anonymous users on list page.
 #. TRANS: This message contains Markdown links in the form [description](link).
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "Lists are how you sort similar people on %%site.name%%, a [micro-blogging]"
 "(http://en.wikipedia.org/wiki/Micro-blogging) service based on the Free "
 "Software [StatusNet](http://status.net/) tool. You can then easily keep "
 "track of what they are doing by subscribing to the list's timeline."
 msgstr ""
-"**%s** ist eine Benutzergruppe auf %%%%site.name%%%%, einem [Mikroblogging]"
+"Listen gruppieren ähnliche Leute auf %%%%site.name%%%%, einem [Mikroblogging]"
 "(http://de.wikipedia.org/wiki/Mikroblogging)-Dienst basierend auf der freien "
-"Software [StatusNet](http://status.net/). Seine Mitglieder erstellen kurze "
-"Nachrichten über ihr Leben und Interessen. "
+"Software [StatusNet](http://status.net/). Du kannst leicht verfolgen, was "
+"sie tun, indem du die Zeitleiste dieser Liste abonnierst."
 
 #. TRANS: Client error displayed when a tagger is expected but not provided.
-#, fuzzy
 msgid "No tagger."
-msgstr "Tag nicht vorhanden."
+msgstr "Kein Benutzer angegeben."
 
 #. TRANS: Title for list of people listed by the user.
 #. TRANS: %1$s is a list, %2$s is a username.
-#, fuzzy, php-format
+#, php-format
 msgid "People listed in %1$s by %2$s"
-msgstr "Antworten an %1$s auf %2$s!"
+msgstr "Leute, die auf der Liste %1$s von %2$s stehen"
 
 #. TRANS: Title for list of people listed by the user.
 #. TRANS: %1$s is a list, %2$s is a username, %2$s is a page number.
-#, fuzzy, php-format
+#, php-format
 msgid "People listed in %1$s by %2$s, page %3$d"
-msgstr "Antworten an %1$s, Seite %2$d"
+msgstr "Leute, die auf der Liste %1$s von %2$s stehen, seite %3$d"
 
 #. TRANS: Addition in tag membership list for creator of a tag.
 #. TRANS: Addition in tag subscribers list for creator of a tag.
-#, fuzzy
 msgid "Creator"
-msgstr "Erstellt"
+msgstr "Ersteller"
 
 #. TRANS: Title for lists by a user page for a private tag.
-#, fuzzy
 msgid "Private lists by you"
-msgstr "Gruppe %s bearbeiten"
+msgstr "Deine privaten Listen"
 
 #. TRANS: Title for lists by a user page for a public tag.
-#, fuzzy
 msgid "Public lists by you"
-msgstr "Öffentliche Tag-Wolke"
+msgstr "Deine öffentlichen Listen"
 
 #. TRANS: Title for lists by a user page.
-#, fuzzy
 msgid "Lists by you"
-msgstr "Gruppe %s bearbeiten"
+msgstr "Deine Listen"
 
 #. TRANS: Title for lists by a user page.
 #. TRANS: %s is a user nickname.
@@ -4168,23 +3918,22 @@ msgstr "Listen von %s"
 
 #. TRANS: Title for lists by a user page.
 #. TRANS: %1$s is a user nickname, %2$d is a page number.
-#, fuzzy, php-format
+#, php-format
 msgid "Lists by %1$s, page %2$d"
-msgstr "Mit „%1$s“ getaggte Nachrichten, Seite %2$d"
+msgstr "Listen von %1$s, seite %2$d"
 
 #. TRANS: Client error displayed when trying view another user's private lists.
 msgid "You cannot view others' private lists"
 msgstr "Du kannst keine Listen von anderen ansehen"
 
 #. TRANS: Mode selector label.
-#, fuzzy
 msgid "Mode"
-msgstr "Moderieren"
+msgstr "Modus"
 
 #. TRANS: Link text to show lists for user %s.
-#, fuzzy, php-format
+#, php-format
 msgid "Lists for %s"
-msgstr "Postausgang von %s"
+msgstr "Listen für %s"
 
 #. TRANS: Fieldset legend.
 #. TRANS: Fieldset legend on gallery action page.
@@ -4196,19 +3945,16 @@ msgid "Show private tags."
 msgstr "Private Tags anzeigen."
 
 #. TRANS: Checkbox label to show public tags.
-#, fuzzy
 msgctxt "LABEL"
 msgid "Public"
-msgstr "Zeitleiste"
+msgstr "Öffentlich"
 
 #. TRANS: Checkbox title.
-#, fuzzy
 msgid "Show public tags."
-msgstr "Tag nicht vorhanden."
+msgstr "Öffentliche Tags anzeigen."
 
 #. TRANS: Submit button text for tag filter form.
 #. TRANS: Submit button text on gallery action page.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Go"
 msgstr "Los geht's"
@@ -4216,27 +3962,26 @@ msgstr "Los geht's"
 #. TRANS: Message displayed for anonymous users on page that displays lists by a user.
 #. TRANS: This message contains Markdown links in the form [description](links).
 #. TRANS: %s is a tagger nickname.
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "These are lists created by **%s**. Lists are how you sort similar people on %"
 "%%%site.name%%%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
 "blogging) service based on the Free Software [StatusNet](http://status.net/) "
 "tool. You can easily keep track of what they are doing by subscribing to the "
-"tag's timeline."
+"list's timeline."
 msgstr ""
-"**%s** ist eine Benutzergruppe auf %%%%site.name%%%%, einem [Mikroblogging]"
-"(http://de.wikipedia.org/wiki/Mikroblogging)-Dienst basierend auf der freien "
-"Software [StatusNet](http://status.net/). Seine Mitglieder erstellen kurze "
-"Nachrichten über ihr Leben und Interessen. "
+"Diese Listen wurden von **%s** erstellt. Listen gruppieren ähnliche Leute "
+"auf %%%%site.name%%%%, einem [Mikroblogging](http://de.wikipedia.org/wiki/"
+"Mikroblogging)-Dienst basierend auf der freien Software [StatusNet](http://"
+"status.net/). Du kannst leicht verfolgen, was sie tun, indem du die "
+"Zeitleiste dieser Liste abonnierst."
 
 #. TRANS: Message displayed on page that displays lists by a user when there are none.
 #. TRANS: This message contains Markdown links in the form [description](links).
 #. TRANS: %s is a tagger nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "%s has not created any [lists](%%%%doc.lists%%%%) yet."
-msgstr ""
-"Bis jetzt hat noch niemand eine Nachricht mit dem Tag „[hashtag](%%doc.tags%"
-"%)“ gepostet."
+msgstr "%s hat noch keine [Listen](%%%%doc.lists%%%%) erstellt."
 
 #. TRANS: Page title. %s is a tagged user's nickname.
 #, php-format
@@ -4244,63 +3989,62 @@ msgid "Lists with %s in them"
 msgstr "Listen, die %s enthalten"
 
 #. TRANS: Page title. %1$s is a tagged user's nickname, %2$s is a page number.
-#, fuzzy, php-format
+#, php-format
 msgid "Lists with %1$s, page %2$d"
-msgstr "Mit „%1$s“ getaggte Nachrichten, Seite %2$d"
+msgstr "Listen mit %1$s, Seite %2$d"
 
 #. TRANS: Message displayed for anonymous users on page that displays lists for a user.
 #. TRANS: This message contains Markdown links in the form [description](links).
 #. TRANS: %s is a tagger nickname.
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "These are lists for **%s**. lists are how you sort similar people on %%%%"
 "site.name%%%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
 "blogging) service based on the Free Software [StatusNet](http://status.net/) "
 "tool. You can easily keep track of what they are doing by subscribing to the "
-"tag's timeline."
+"list's timeline."
 msgstr ""
-"**%s** ist eine Benutzergruppe auf %%%%site.name%%%%, einem [Mikroblogging]"
-"(http://de.wikipedia.org/wiki/Mikroblogging)-Dienst basierend auf der freien "
-"Software [StatusNet](http://status.net/). Seine Mitglieder erstellen kurze "
-"Nachrichten über ihr Leben und Interessen. "
+"Diese Listen sind für **%s**. Listen gruppieren ähnliche Leute auf %%%%site."
+"name%%%%, einem [Mikroblogging](http://de.wikipedia.org/wiki/Mikroblogging)-"
+"Dienst basierend auf der freien Software [StatusNet](http://status.net/). Du "
+"kannst einfach verfolgen, was sie tun, indem du die Zeitleiste dieser Liste "
+"abonnierst."
 
 #. TRANS: Message displayed on page that displays lists a user was added to when there are none.
 #. TRANS: This message contains Markdown links in the form [description](links).
 #. TRANS: %s is a user nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "%s has not been [listed](%%%%doc.lists%%%%) by anyone yet."
-msgstr ""
-"Bis jetzt hat noch niemand eine Nachricht mit dem Tag „[hashtag](%%doc.tags%"
-"%)“ gepostet."
+msgstr "%s wurde bisher von niemandem [gelistet](%%%%doc.lists%%%%)."
 
 #. TRANS: Page title for list of list subscribers.
 #. TRANS: %1$s is a list, %2$s is a user nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "Subscribers to list %1$s by %2$s"
-msgstr "%s abboniert."
+msgstr "Abonnenten der Liste %1$s von %2$s"
 
 #. TRANS: Page title for list of list subscribers.
 #. TRANS: %1$s is a list, %2$s is a user nickname, %3$d is a page number.
-#, fuzzy, php-format
+#, php-format
 msgid "Subscribers to list %1$s by %2$s, page %3$d"
-msgstr "Von „%1$s“ mit „%2$s“ getaggte Nachrichten, Seite %3$d"
+msgstr "Abonnenten der Liste %1$s von %2$s, Seite %3$d"
 
 #. TRANS: Title for page that displays lists subscribed to by a user.
 #. TRANS: %s is a profile nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "Lists subscribed to by %s"
-msgstr "%s abboniert."
+msgstr "Von %s abonnierte Listen"
 
 #. TRANS: Title for page that displays lists subscribed to by a user.
 #. TRANS: %1$s is a profile nickname, %2$d is a page number.
-#, fuzzy, php-format
+#, php-format
 msgid "Lists subscribed to by %1$s, page %2$d"
-msgstr "%1$s Abonnements, Seite %2$d"
+msgstr "Von %1$s abonnierte Listen, Seite %2$d"
 
 #. TRANS: Message displayed for anonymous users on page that displays lists subscribed to by a user.
 #. TRANS: This message contains Markdown links in the form [description](links).
 #. TRANS: %s is a profile nickname.
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "These are lists subscribed to by **%s**. Lists are how you sort similar "
 "people on %%%%site.name%%%%, a [micro-blogging](http://en.wikipedia.org/wiki/"
@@ -4308,10 +4052,11 @@ msgid ""
 "net/) tool. You can easily keep track of what they are doing by subscribing "
 "to the list's timeline."
 msgstr ""
-"**%s** ist eine Benutzergruppe auf %%%%site.name%%%%, einem [Mikroblogging]"
-"(http://de.wikipedia.org/wiki/Mikroblogging)-Dienst basierend auf der freien "
-"Software [StatusNet](http://status.net/). Seine Mitglieder erstellen kurze "
-"Nachrichten über ihr Leben und Interessen. "
+"Diese Listen hat **%s** abonniert. Listen gruppieren ähnliche Leute auf %%%%"
+"site.name%%%%, einem [Mikroblogging](http://de.wikipedia.org/wiki/"
+"Mikroblogging)-Dienst basierend auf der freien Software [StatusNet](http://"
+"status.net/). Du kannst leicht verfolgen, was sie tun, indem du die "
+"Zeitleiste dieser Liste abonnierst."
 
 #. TRANS: Page title for AJAX form return when a disabling a plugin.
 msgctxt "plugin"
@@ -4327,14 +4072,12 @@ msgid "This action only accepts POST requests."
 msgstr "Diese Aktion nimmt nur POST-Requests"
 
 #. TRANS: Client error displayed when trying to enable or disable a plugin without access rights.
-#, fuzzy
 msgid "You cannot administer plugins."
-msgstr "Du kannst keine Benutzer löschen."
+msgstr "Du kannst keine Erweiterungen verwalten."
 
 #. TRANS: Client error displayed when trying to enable or disable a non-existing plugin.
-#, fuzzy
 msgid "No such plugin."
-msgstr "Seite nicht vorhanden"
+msgstr "Erweiterung nicht vorhanden."
 
 #. TRANS: Page title for AJAX form return when enabling a plugin.
 msgctxt "plugin"
@@ -4342,7 +4085,6 @@ msgid "Enabled"
 msgstr "Aktiviert"
 
 #. TRANS: Tab and title for plugins admin panel.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Plugins"
 msgstr "Erweiterungen"
@@ -4358,27 +4100,14 @@ msgstr ""
 "findest du mehr Details."
 
 #. TRANS: Admin form section header
-#, fuzzy
 msgid "Default plugins"
-msgstr "Bevorzugte Sprache"
+msgstr "Standard-Erweiterungen"
 
 #. TRANS: Text displayed on plugin admin page when no plugin are enabled.
 msgid ""
 "All default plugins have been disabled from the site's configuration file."
 msgstr "Alle Standard-Plugins der Konfigurationsdatei wurden deaktiviert."
 
-#. TRANS: Client error displayed if the notice posted has too many characters.
-msgid "Invalid notice content."
-msgstr "Ungültiger Nachrichteninhalt."
-
-#. TRANS: Exception thrown if a notice's license is not compatible with the StatusNet site license.
-#. TRANS: %1$s is the notice license, %2$s is the StatusNet site's license.
-#, fuzzy, php-format
-msgid "Notice license \"%1$s\" is not compatible with site license \"%2$s\"."
-msgstr ""
-"Die Nachrichtenlizenz „%1$s“ ist nicht kompatibel mit der Lizenz der Seite „%"
-"2$s“."
-
 #. TRANS: Client error displayed when trying to add an unindentified field to profile.
 #. TRANS: %s is a field name.
 #, php-format
@@ -4386,10 +4115,9 @@ msgid "Unidentified field %s."
 msgstr "Nicht identifiziertes Feld %s."
 
 #. TRANS: Page title.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Search results"
-msgstr "Website durchsuchen"
+msgstr "Suchergebnisse"
 
 #. TRANS: Error message in case a search is shorter than three characters.
 msgid "The search string must be at least 3 characters long."
@@ -4442,17 +4170,16 @@ msgstr ""
 #. TRANS: Text area title in form for account registration. Plural
 #. TRANS: is decided by the number of characters available for the
 #. TRANS: biography (%d).
-#, fuzzy, php-format
+#, php-format
 msgid "Describe yourself and your interests in %d character."
 msgid_plural "Describe yourself and your interests in %d characters."
-msgstr[0] "Beschreibe dich selbst und deine Interessen in einem Zeichen"
-msgstr[1] "Beschreibe dich selbst und deine Interessen in %d Zeichen"
+msgstr[0] "Beschreibe dich selbst und deine Interessen in %d Zeichen."
+msgstr[1] "Beschreibe dich selbst und deine Interessen in %d Zeichen."
 
 #. TRANS: Tooltip for field label in form for profile settings.
 #. TRANS: Text area title on account registration page.
-#, fuzzy
 msgid "Describe yourself and your interests."
-msgstr "Beschreibe dich selbst und deine Interessen"
+msgstr "Beschreibe dich selbst und deine Interessen."
 
 #. TRANS: Text area label in form for profile settings where users can provide
 #. TRANS: their biography.
@@ -4469,33 +4196,32 @@ msgstr "Aufenthaltsort"
 
 #. TRANS: Tooltip for field label in form for profile settings.
 #. TRANS: Field title on account registration page.
-#, fuzzy
 msgid "Where you are, like \"City, State (or Region), Country\"."
-msgstr "Wo du bist, beispielsweise „Stadt, Region, Land“"
+msgstr "Wo du bist, beispielsweise „Stadt, Region, Land“."
 
 #. TRANS: Checkbox label in form for profile settings.
 msgid "Share my current location when posting notices"
 msgstr "Teile meine aktuelle Position, wenn ich Nachrichten sende"
 
 #. TRANS: Field label in form for profile settings.
+#. TRANS: Title for group tag cloud section.
+#. TRANS: %s is a group name.
 msgid "Tags"
 msgstr "Tags"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#, fuzzy
 msgid ""
 "Tags for yourself (letters, numbers, -, ., and _), comma- or space- "
 "separated."
 msgstr ""
-"Tags über dich selbst (Buchstaben, Zahlen, -, ., und _) durch Kommas oder "
-"Leerzeichen getrennt"
+"Tags über dich selbst (Buchstaben, Zahlen, -, . und _) durch Kommas oder "
+"Leerzeichen getrennt."
 
 #. TRANS: Dropdownlist label in form for profile settings.
 msgid "Language"
 msgstr "Sprache"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#, fuzzy
 msgid "Preferred language."
 msgstr "Bevorzugte Sprache"
 
@@ -4508,22 +4234,19 @@ msgid "What timezone are you normally in?"
 msgstr "In welcher Zeitzone befindest du dich üblicherweise?"
 
 #. TRANS: Checkbox label in form for profile settings.
-#, fuzzy
 msgid ""
-"Automatically subscribe to whoever subscribes to me (best for non-humans)."
+"Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr ""
 "Abonniere automatisch alle Kontakte, die mich abonnieren (sinnvoll für Nicht-"
-"Menschen)"
+"Menschen)."
 
 #. TRANS: Dropdown field label on profile settings, for what policies to apply when someone else tries to subscribe to your updates.
-#, fuzzy
 msgid "Subscription policy"
-msgstr "Abonnements"
+msgstr "Abonnementeinstellungen"
 
 #. TRANS: Dropdown field option for following policy.
-#, fuzzy
 msgid "Let anyone follow me"
-msgstr "Man kann nur Personen folgen"
+msgstr "Jeder darf mich abonnieren"
 
 #. TRANS: Dropdown field option for following policy.
 msgid "Ask me first"
@@ -4564,18 +4287,18 @@ msgstr "Die eingegebene Sprache ist zu lang (maximal 50 Zeichen)."
 #. TRANS: %s is the invalid tag.
 #. TRANS: Error displayed if a given tag is invalid.
 #. TRANS: %s is the invalid tag.
-#, fuzzy, php-format
+#, php-format
 msgid "Invalid tag: \"%s\"."
-msgstr "Ungültiges Stichwort: „%s“"
+msgstr "Ungültiges Tag: „%s“."
 
 #. TRANS: Server error thrown when user profile settings could not be updated to
 #. TRANS: automatically subscribe to any subscriber.
-#, fuzzy
 msgid "Could not update user for autosubscribe or subscribe_policy."
-msgstr "Autosubscribe konnte nicht aktiviert werden."
+msgstr ""
+"Benutzer konnte nicht für autosubscribe oder subscribe_policy aktualisiert "
+"werden."
 
 #. TRANS: Server error thrown when user profile location preference settings could not be updated.
-#, fuzzy
 msgid "Could not save location prefs."
 msgstr "Konnte Positions-Einstellungen nicht speichern."
 
@@ -4583,16 +4306,10 @@ msgstr "Konnte Positions-Einstellungen nicht speichern."
 msgid "Could not save tags."
 msgstr "Konnte Tags nicht speichern."
 
-#. TRANS: Confirmation shown when user profile settings are saved.
-#. TRANS: Message after successful saving of administrative settings.
-msgid "Settings saved."
-msgstr "Einstellungen gespeichert."
-
 #. TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
 #. TRANS: Page title for page where a user account can be restored from backup.
-#, fuzzy
 msgid "Restore account"
-msgstr "Neues Benutzerkonto erstellen"
+msgstr "Konto wiederherstellen"
 
 #. TRANS: Client error displayed when requesting a public timeline page beyond the page limit.
 #. TRANS: %s is the page limit.
@@ -4601,8 +4318,8 @@ msgid "Beyond the page limit (%s)."
 msgstr "Jenseits des Seitenlimits (%s)."
 
 #. TRANS: Server error displayed when a public timeline cannot be retrieved.
-msgid "Could not retrieve public stream."
-msgstr "Konnte öffentlichen Stream nicht abrufen."
+msgid "Could not retrieve public timeline."
+msgstr "Konnte öffentliche Zeitleiste nicht abrufen."
 
 #. TRANS: Title for all public timeline pages but the first.
 #. TRANS: %d is the page number.
@@ -4616,16 +4333,20 @@ msgid "Public timeline"
 msgstr "Öffentliche Zeitleiste"
 
 #. TRANS: Link description for public timeline feed.
-msgid "Public Stream Feed (RSS 1.0)"
-msgstr "Feed des öffentlichen Streams (RSS 1.0)"
+msgid "Public Timeline Feed (Activity Streams JSON)"
+msgstr "Feed der öffentlichen Zeitleiste  (Activity Streams JSON)"
 
 #. TRANS: Link description for public timeline feed.
-msgid "Public Stream Feed (RSS 2.0)"
-msgstr "Feed des öffentlichen Streams (RSS 2.0)"
+msgid "Public Timeline Feed (RSS 1.0)"
+msgstr "Feed der öffentlichen Zeitleiste (RSS 1.0)"
 
 #. TRANS: Link description for public timeline feed.
-msgid "Public Stream Feed (Atom)"
-msgstr "Feed des öffentlichen Streams (Atom)"
+msgid "Public Timeline Feed (RSS 2.0)"
+msgstr "Feed der öffentlichen Zeitleiste (RSS 2.0)"
+
+#. TRANS: Link description for public timeline feed.
+msgid "Public Timeline Feed (Atom)"
+msgstr "Feed der öffentlichen Zeitleiste (Atom)"
 
 #. TRANS: Text displayed for public feed when there are no public notices.
 #, php-format
@@ -4675,56 +4396,10 @@ msgstr ""
 "Mikroblogging)-Dienst basierend auf der freien Software [StatusNet](http://"
 "status.net/)."
 
-#. TRANS: Title for page with public list cloud.
-#, fuzzy
-msgid "Public list cloud"
-msgstr "Öffentliche Tag-Wolke"
-
-#. TRANS: Page notice for page with public list cloud.
-#. TRANS: %s is a StatusNet sitename.
-#, fuzzy, php-format
-msgid "These are largest lists on %s"
-msgstr "Das sind die beliebtesten Tags auf „%s“"
-
-#. TRANS: Empty list message on page with public list cloud.
-#. TRANS: This message contains Markdown links in the form [description](link).
-#, fuzzy, php-format
-msgid "No one has [listed](%%doc.tags%%) anyone yet."
-msgstr ""
-"Bis jetzt hat noch niemand eine Nachricht mit dem Tag „[hashtag](%%doc.tags%"
-"%)“ gepostet."
-
-#. TRANS: Additional empty list message on page with public list cloud for logged in users.
-#, fuzzy
-msgid "Be the first to list someone!"
-msgstr "Sei der erste, der etwas schreibt!"
-
-#. TRANS: Additional empty list message on page with public list cloud for anonymous users.
-#. TRANS: This message contains Markdown links in the form [description](link).
-#, fuzzy, php-format
-msgid ""
-"Why not [register an account](%%action.register%%) and be the first to list "
-"someone!"
-msgstr ""
-"Warum [registrierst du nicht einen Account](%%%%action.register%%%%) und "
-"bist der erste der eine Nachricht abschickt!"
-
-#. TRANS: DT element on on page with public list cloud.
-#, fuzzy
-msgid "List cloud"
-msgstr "API-Methode nicht gefunden."
-
-#. TRANS: Link title for number of listed people. %d is the number of listed people.
-#, php-format
-msgid "1 person listed"
-msgid_plural "%d people listed"
-msgstr[0] "1 Person aufgeführt"
-msgstr[1] "%d Personen aufgeführt"
-
 #. TRANS: Public RSS feed description. %s is the StatusNet site name.
-#, fuzzy, php-format
+#, php-format
 msgid "%s updates from everyone."
-msgstr "%s Nachrichten von allen!"
+msgstr "%s Nachrichten von allen."
 
 #. TRANS: Title for public tag cloud.
 msgid "Public tag cloud"
@@ -4820,7 +4495,6 @@ msgid "Recover"
 msgstr "Wiederherstellung"
 
 #. TRANS: Button text on password recovery page.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Recover"
 msgstr "Wiederherstellung"
@@ -4839,17 +4513,14 @@ msgid "Password recovery requested"
 msgstr "Wiederherstellung des Passworts angefordert"
 
 #. TRANS: Title for password recovery page in password saved mode.
-#, fuzzy
 msgid "Password saved"
-msgstr "Passwort gespeichert."
+msgstr "Passwort gespeichert"
 
 #. TRANS: Title for field label for password reset form.
-#, fuzzy
 msgid "6 or more characters, and do not forget it!"
 msgstr "6 oder mehr Zeichen, und nicht vergessen!"
 
 #. TRANS: Button text for password reset form.
-#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
 msgctxt "BUTTON"
 msgid "Reset"
 msgstr "Zurücksetzen"
@@ -4858,18 +4529,6 @@ msgstr "Zurücksetzen"
 msgid "Enter a nickname or email address."
 msgstr "Gib einen Spitznamen oder eine E-Mail-Adresse ein."
 
-#. TRANS: Information on password recovery form if no known username or e-mail address was specified.
-msgid "No user with that email address or username."
-msgstr "Kein Benutzer mit dieser E-Mail-Adresse oder mit diesem Nutzernamen."
-
-#. TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.
-msgid "No registered email address for that user."
-msgstr "Der Benutzer hat keine registrierte E-Mail-Adresse."
-
-#. TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.
-msgid "Error saving address confirmation."
-msgstr "Fehler beim Speichern der Adressbestätigung."
-
 #. TRANS: User notification after an e-mail with instructions was sent from the password recovery form.
 msgid ""
 "Instructions for recovering your password have been sent to the email "
@@ -4900,15 +4559,14 @@ msgid "New password successfully saved. You are now logged in."
 msgstr "Neues Passwort erfolgreich gespeichert. Du bist jetzt angemeldet."
 
 #. TRANS: Client exception thrown when no ID parameter was provided.
-#, fuzzy
 msgid "No id parameter."
 msgstr "Kein ID-Argument."
 
 #. TRANS: Client exception thrown when an invalid ID parameter was provided for a file.
 #. TRANS: %d is the provided ID for which the file is not present (number).
-#, fuzzy, php-format
+#, php-format
 msgid "No such file \"%d\"."
-msgstr "Datei nicht gefunden."
+msgstr "Datei „%d“ nicht gefunden."
 
 #. TRANS: Client error displayed when trying to register to an invite-only site without an invitation.
 msgid "Sorry, only invited people can register."
@@ -4923,7 +4581,6 @@ msgid "Registration successful"
 msgstr "Registrierung erfolgreich"
 
 #. TRANS: Title for registration page.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Register"
 msgstr "Registrieren"
@@ -4933,7 +4590,6 @@ msgid "Registration not allowed."
 msgstr "Registrierung nicht erlaubt."
 
 #. TRANS: Form validation error displayed when trying to register without agreeing to the site license.
-#, fuzzy
 msgid "You cannot register if you do not agree to the license."
 msgstr ""
 "Du kannst dich nicht registrieren, wenn du die Lizenz nicht akzeptierst."
@@ -4947,40 +4603,34 @@ msgid "Invalid username or password."
 msgstr "Benutzername oder Passwort falsch."
 
 #. TRANS: Page notice on registration page.
-#, fuzzy
 msgid ""
 "With this form you can create a new account. You can then post notices and "
 "link up to friends and colleagues."
 msgstr ""
 "Hier kannst du einen neuen Zugang einrichten. Anschließend kannst du "
-"Nachrichten und Links mit deinen Freunden und Kollegen teilen. "
+"Nachrichten und Links mit deinen Freunden und Kollegen teilen."
 
 #. TRANS: Field label on account registration page. In this field the password has to be entered a second time.
-#, fuzzy
 msgctxt "PASSWORD"
 msgid "Confirm"
 msgstr "Bestätigen"
 
 #. TRANS: Field label on account registration page.
-#, fuzzy
 msgctxt "LABEL"
 msgid "Email"
 msgstr "E-Mail"
 
 #. TRANS: Field title on account registration page.
-#, fuzzy
 msgid "Used only for updates, announcements, and password recovery."
 msgstr ""
-"Wird nur für Updates, wichtige Mitteilungen und zur "
-"Passwortwiederherstellung verwendet"
+"Wird nur für Updates, Bekanntmachungen und die Passwortwiederherstellung "
+"verwendet."
 
 #. TRANS: Field title on account registration page.
-#, fuzzy
 msgid "Longer name, preferably your \"real\" name."
-msgstr "Längerer Name, bevorzugt dein bürgerlicher Name"
+msgstr "Längerer Name, vorzugsweise dein bürgerlicher Name."
 
 #. TRANS: Button text to register a user on account registration page.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Register"
 msgstr "Registrieren"
@@ -5060,85 +4710,13 @@ msgstr ""
 "(Du solltest in Kürze eine E-Mail mit der Anleitung zur Überprüfung deiner "
 "Mailadresse erhalten.)"
 
-#. TRANS: Page notice for remote subscribe. This message contains Markdown links.
-#. TRANS: Ensure to keep the correct markup of [link description](link).
-#, php-format
-msgid ""
-"To subscribe, you can [login](%%action.login%%), or [register](%%action."
-"register%%) a new  account. If you already have an account  on a [compatible "
-"microblogging site](%%doc.openmublog%%),  enter your profile URL below."
-msgstr ""
-"Für ein Abonnement kannst du dich entweder [anmelden](%%action.login%%) oder "
-"ein neues Konto [registrieren](%%action.register%%). Wenn du schon ein Konto "
-"auf einer [kompatiblen Mikrobloggingsite](%%doc.openmublog%%) hast, dann gib "
-"deine Profil-URL unten an."
-
-#. TRANS: Page title for Remote subscribe.
-msgid "Remote subscribe"
-msgstr "Entferntes Abonnement"
-
-#. TRANS: Field legend on page for remote subscribe.
-msgid "Subscribe to a remote user"
-msgstr "Abonniere diesen Benutzer"
-
-#. TRANS: Field label on page for remote subscribe.
-msgid "User nickname"
-msgstr "Benutzername"
-
-#. TRANS: Field title on page for remote subscribe.
-#, fuzzy
-msgid "Nickname of the user you want to follow."
-msgstr "Name des Benutzers, dem du folgen möchtest"
-
-#. TRANS: Field label on page for remote subscribe.
-msgid "Profile URL"
-msgstr "Profil-URL"
-
-#. TRANS: Field title on page for remote subscribe.
-#, fuzzy
-msgid "URL of your profile on another compatible microblogging service."
-msgstr "Profil-URL bei einem anderen kompatiblen Mikrobloggingdienst"
-
-#. TRANS: Button text on page for remote subscribe.
-#. TRANS: Link text for link that will subscribe to a remote profile.
-#. TRANS: Button text to subscribe to a user.
-#. TRANS: Button text for subscribing to a list.
-#, fuzzy
-msgctxt "BUTTON"
-msgid "Subscribe"
-msgstr "Abonnieren"
-
-#. TRANS: Form validation error on page for remote subscribe when an invalid profile URL was provided.
-#, fuzzy
-msgid "Invalid profile URL (bad format)."
-msgstr "Ungültige Profil-URL (falsches Format)"
-
-#. TRANS: Form validation error on page for remote subscribe when no the provided profile URL
-#. TRANS: does not contain expected data.
-msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
-msgstr ""
-"Ungültige Profil-URL (kein YADIS-Dokument oder ungültige XRDS definiert)."
-
-#. TRANS: Form validation error on page for remote subscribe.
-#, fuzzy
-msgid "That is a local profile! Login to subscribe."
-msgstr "Das ist ein lokales Profil! Zum Abonnieren anmelden."
-
-#. TRANS: Form validation error on page for remote subscribe when the remote service is not providing a request token.
-#, fuzzy
-msgid "Could not get a request token."
-msgstr "Konnte keinen Anfrage-Token bekommen."
-
-#. TRANS: Client error displayed when trying to (un)list an OMB 0.1 remote profile.
-#, fuzzy
-msgid "You cannot (un)list an OMB 0.1 remote profile with this action."
-msgstr "Du hast dieses OMB 0.1 Profil nicht abonniert."
-
 #. TRANS: Client error displayed when an unknown error occurs while delisting a user.
 #. TRANS: %s is a username.
-#, fuzzy, php-format
+#, php-format
 msgid "There was an unexpected error while delisting %s."
-msgstr "Ein unerwarteter Fehler ist aufgetreten während der Auflistung von %s."
+msgstr ""
+"Bei der Entfernung von %s von der Liste ist ein unerwarteter Fehler ist "
+"aufgetreten."
 
 #. TRANS: Client error displayed when an unknown error occurs while listing a user.
 #. TRANS: %s is a profile URL.
@@ -5151,9 +4729,8 @@ msgstr ""
 "antwortet vielleicht nicht richtig. Bitte später noch einmal versuchen."
 
 #. TRANS: Title after removing a user from a list.
-#, fuzzy
 msgid "Unlisted"
-msgstr "Lizenz"
+msgstr "Nicht gelistet"
 
 #. TRANS: Client error displayed when trying to repeat a notice while not logged in.
 msgid "Only logged-in users can repeat notices."
@@ -5188,6 +4765,12 @@ msgstr "Antworten an %s"
 msgid "Replies to %1$s, page %2$d"
 msgstr "Antworten an %1$s, Seite %2$d"
 
+#. TRANS: Link for feed with replies for a user.
+#. TRANS: %s is a user nickname.
+#, php-format
+msgid "Replies feed for %s (Activity Streams JSON)"
+msgstr "Feed der Antworten von %s (Activity Streams JSON)"
+
 #. TRANS: Link for feed with replies for a user.
 #. TRANS: %s is a user nickname.
 #, php-format
@@ -5238,19 +4821,17 @@ msgstr ""
 
 #. TRANS: RSS reply feed description.
 #. TRANS: %1$s is a user nickname, %2$s is the StatusNet site name.
-#, fuzzy, php-format
+#, php-format
 msgid "Replies to %1$s on %2$s."
 msgstr "Antworten an %1$s auf %2$s!"
 
 #. TRANS: Client exception displayed when trying to restore an account while not logged in.
-#, fuzzy
 msgid "Only logged-in users can restore their account."
-msgstr "Nur angemeldete Benutzer können Nachrichten wiederholen."
+msgstr "Nur angemeldete Benutzer können ihr Konto wiederherstellen."
 
 #. TRANS: Client exception displayed when trying to restore an account without having restore rights.
-#, fuzzy
 msgid "You may not restore your account."
-msgstr "Du hast noch keine Programme registriert"
+msgstr "Du darfst dein Benutzerkonto nicht wiederherstellen."
 
 #. TRANS: Client exception displayed trying to restore an account while something went wrong uploading a file.
 #. TRANS: Client exception. No file; probably just a non-AJAX submission.
@@ -5295,9 +4876,8 @@ msgstr "Systemfehler beim Hochladen der Datei."
 
 #. TRANS: Client exception thrown when a feed is not an Atom feed.
 #. TRANS: Client exception thrown when an imported feed is not an Atom feed.
-#, fuzzy
 msgid "Not an Atom feed."
-msgstr "Kein Mitglied"
+msgstr "Kein Atom-Feed."
 
 #. TRANS: Success message when a feed has been restored.
 msgid ""
@@ -5313,7 +4893,7 @@ msgstr "Feed wird wiederhergestellt. Dies kann einige Minuten dauern."
 
 #. TRANS: Form instructions for feed restore.
 msgid ""
-"You can upload a backed-up stream in <a href=\"http://activitystrea.ms/"
+"You can upload a backed-up timeline in <a href=\"http://activitystrea.ms/"
 "\">Activity Streams</a> format."
 msgstr ""
 "Eine Sicherungskopie kann im <a href=\"http://activitystrea.ms/\">Activity "
@@ -5328,7 +4908,6 @@ msgid "You cannot revoke user roles on this site."
 msgstr "Du kannst die Rollen von Benutzern dieser Seite nicht widerrufen."
 
 #. TRANS: Client error displayed when trying to revoke a role that is not set.
-#, fuzzy
 msgid "User does not have this role."
 msgstr "Benutzer verfügt nicht über diese Rolle."
 
@@ -5348,31 +4927,29 @@ msgstr "Benutzer ist schon blockiert."
 
 #. TRANS: Client error displayed when trying to list a profile with an invalid list.
 #. TRANS: %s is the invalid list name.
-#, fuzzy, php-format
+#, php-format
 msgid "Not a valid list: %s."
-msgstr "Ungültiger Personen-Tag: „%s“."
+msgstr "Keine gültige Liste:  %s ."
 
 #. TRANS: Page title for page showing self tags.
 #. TRANS: %1$s is a tag, %2$d is a page number.
-#, fuzzy, php-format
+#, php-format
 msgid "Users self-tagged with %1$s, page %2$d"
-msgstr "Benutzer, die sich selbst mit „%1$s“ getaggt haben - Seite %2$d"
+msgstr "Benutzer, die sich selbst mit „%1$s“ getaggt haben, Seite %2$d"
 
 #. TRANS: Title for the sessions administration panel.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Sessions"
-msgstr "Sitzung"
+msgstr "Sitzungen"
 
 #. TRANS: Instructions for the sessions administration panel.
 msgid "Session settings for this StatusNet site"
 msgstr "Sitzungs-Einstellungen dieser StatusNet-Website"
 
 #. TRANS: Fieldset legend on the sessions administration panel.
-#, fuzzy
 msgctxt "LEGEND"
 msgid "Sessions"
-msgstr "Sitzung"
+msgstr "Sitzungen"
 
 #. TRANS: Checkbox title on the sessions administration panel.
 #. TRANS: Indicates if StatusNet should handle session administration.
@@ -5381,7 +4958,6 @@ msgstr "Sitzung verwalten"
 
 #. TRANS: Checkbox title on the sessions administration panel.
 #. TRANS: Indicates if StatusNet should handle session administration.
-#, fuzzy
 msgid "Handle sessions ourselves."
 msgstr "Sitzungsverwaltung selber übernehmen."
 
@@ -5391,14 +4967,12 @@ msgid "Session debugging"
 msgstr "Sitzung untersuchen"
 
 #. TRANS: Checkbox title on the sessions administration panel.
-#, fuzzy
 msgid "Enable debugging output for sessions."
-msgstr "Fehleruntersuchung für Sitzungen aktivieren"
+msgstr "Fehleruntersuchung für Sitzungen aktivieren."
 
 #. TRANS: Title for submit button on the sessions administration panel.
-#, fuzzy
 msgid "Save session settings"
-msgstr "Zugangs-Einstellungen speichern"
+msgstr "Sitzungseinstellungen speichern"
 
 #. TRANS: Client error displayed trying to display an OAuth application while not logged in.
 msgid "You must be logged in to view an application."
@@ -5411,7 +4985,7 @@ msgstr "Anwendungsprofil"
 #. TRANS: Information output on an OAuth application page.
 #. TRANS: %1$s is the application creator, %2$s is "read-only" or "read-write",
 #. TRANS: %3$d is the number of users using the OAuth application.
-#, fuzzy, php-format
+#, php-format
 msgid "Created by %1$s - %2$s access by default - %3$d user"
 msgid_plural "Created by %1$s - %2$s access by default - %3$d users"
 msgstr[0] "Erstellt von %1$s - %2$s Standard Zugang - %3$d Benutzer"
@@ -5422,7 +4996,6 @@ msgid "Application actions"
 msgstr "Programmaktionen"
 
 #. TRANS: Link text to edit application on the OAuth application page.
-#, fuzzy
 msgctxt "EDITAPP"
 msgid "Edit"
 msgstr "Bearbeiten"
@@ -5436,14 +5009,33 @@ msgstr "Schlüssel zurücksetzen"
 msgid "Application info"
 msgstr "Programminformation"
 
+#. TRANS: Field label on application page.
+msgid "Consumer key"
+msgstr "Anwender-Schlüssel"
+
+#. TRANS: Field label on application page.
+msgid "Consumer secret"
+msgstr "Anwender-Geheimnis"
+
+#. TRANS: Field label on application page.
+msgid "Request token URL"
+msgstr "Anfrage-Token Adresse"
+
+#. TRANS: Field label on application page.
+msgid "Access token URL"
+msgstr "Zugriffs-Token-Adresse"
+
+#. TRANS: Field label on application page.
+msgid "Authorize URL"
+msgstr "Autorisationadresse"
+
 #. TRANS: Note on the OAuth application page about signature support.
-#, fuzzy
 msgid ""
 "Note: HMAC-SHA1 signatures are supported. The plaintext signature method is "
 "not supported."
 msgstr ""
-"Hinweis: Wir unterstützen HMAC-SHA1-Signaturen. Wir unterstützen keine "
-"Klartext-Signaturen."
+"Hinweis: HMAC-SHA1-Signaturen werden unterstützt. Die Klartext-"
+"Signaturmethode wird nicht unterstützt."
 
 #. TRANS: Text in confirmation dialog to reset consumer key and secret for an OAuth application.
 msgid "Are you sure you want to reset your consumer key and secret?"
@@ -5459,6 +5051,11 @@ msgstr "Favorisierte Nachrichten von %1$s, Seite %2$d"
 msgid "Could not retrieve favorite notices."
 msgstr "Konnte Favoriten nicht abrufen."
 
+#. TRANS: Feed link text. %s is a username.
+#, php-format
+msgid "Feed for favorites of %s (Activity Streams JSON)"
+msgstr "Feed der Favoriten von %s (Activity Streams JSON)"
+
 #. TRANS: Feed link text. %s is a username.
 #, php-format
 msgid "Feed for favorites of %s (RSS 1.0)"
@@ -5521,6 +5118,11 @@ msgstr "%s-Gruppe"
 msgid "%1$s group, page %2$d"
 msgstr "%1$s Gruppe, Seite %d"
 
+#. TRANS: Tooltip for feed link. %s is a group nickname.
+#, php-format
+msgid "Notice feed for %s group (Activity Streams JSON)"
+msgstr "Nachrichtenfeed der Gruppe %s (Activity Streams JSON)"
+
 #. TRANS: Tooltip for feed link. %s is a group nickname.
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
@@ -5541,42 +5143,8 @@ msgstr "Nachrichtenfeed der Gruppe %s (Atom)"
 msgid "FOAF for %s group"
 msgstr "Postausgang von %s"
 
-#. TRANS: Header for mini list of group members on a group page (h2).
-msgid "Members"
-msgstr "Mitglieder"
-
-#. TRANS: Description for mini list of group members on a group page when the group has no members.
-#. TRANS: Content of "Listed" page if there are no listed users.
-#. TRANS: Content of "People following tag x" if there are no subscribed users.
-#. TRANS: Empty list message for tags.
-#. TRANS: Text for user subscription statistics if the user has no subscriptions.
-#. TRANS: Text for user subscriber statistics if user has no subscribers.
-#. TRANS: Text for user user group membership statistics if user is not a member of any group.
-#. TRANS: Default content for section/sidebar widget.
-msgid "(None)"
-msgstr "(Kein)"
-
-#. TRANS: Link to all group members from mini list of group members if group has more than n members.
-msgid "All members"
-msgstr "Alle Mitglieder"
-
-#. TRANS: Header for group statistics on a group page (h2).
-#. TRANS: H2 text for user statistics.
-msgid "Statistics"
-msgstr "Statistik"
-
-#. TRANS: Label for group creation date.
-msgctxt "LABEL"
-msgid "Created"
-msgstr "Erstellt"
-
-#. TRANS: Label for member count in statistics on group page.
-msgctxt "LABEL"
-msgid "Members"
-msgstr "Mitglieder"
-
 #. TRANS: Notice on group pages for anonymous users for StatusNet sites that accept new registrations.
-#. TRANS: **%s** is the group alias, %%%%site.name%%%% is the site name,
+#. TRANS: %s is the group name, %%%%site.name%%%% is the site name,
 #. TRANS: %%%%action.register%%%% is the URL for registration, %%%%doc.help%%%% is a URL to help.
 #. TRANS: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
 #, php-format
@@ -5594,25 +5162,19 @@ msgstr ""
 "help%%%%))"
 
 #. TRANS: Notice on group pages for anonymous users for StatusNet sites that accept no new registrations.
-#. TRANS: **%s** is the group alias, %%%%site.name%%%% is the site name,
+#. TRANS: %s is the group name, %%%%site.name%%%% is the site name,
 #. TRANS: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
 "wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
 "[StatusNet](http://status.net/) tool. Its members share short messages about "
-"their life and interests. "
+"their life and interests."
 msgstr ""
 "**%s** ist eine Benutzergruppe auf %%%%site.name%%%%, einem [Mikroblogging]"
 "(http://de.wikipedia.org/wiki/Mikroblogging)-Dienst basierend auf der freien "
 "Software [StatusNet](http://status.net/). Seine Mitglieder erstellen kurze "
-"Nachrichten über ihr Leben und Interessen. "
-
-#. TRANS: Title for list of group administrators on a group page.
-#, fuzzy
-msgctxt "TITLE"
-msgid "Admins"
-msgstr "Admins"
+"Nachrichten über ihr Leben und Interessen."
 
 #. TRANS: Client error displayed requesting a single message that does not exist.
 msgid "No such message."
@@ -5635,9 +5197,8 @@ msgid "Message from %1$s on %2$s"
 msgstr "Nachricht von %1$s auf %2$s"
 
 #. TRANS: Client exception thrown when trying a view a notice the user has no access to.
-#, fuzzy
 msgid "Not available."
-msgstr "IM ist nicht verfügbar."
+msgstr "Nicht verfügbar."
 
 #. TRANS: Client error displayed trying to show a deleted notice.
 msgid "Notice deleted."
@@ -5645,21 +5206,21 @@ msgstr "Nachricht gelöscht."
 
 #. TRANS: Title for private list timeline.
 #. TRANS: %1$s is a list, %2$s is a page number.
-#, fuzzy, php-format
+#, php-format
 msgid "Private timeline for %1$s list by you, page %2$d"
-msgstr "Benutzer, die sich selbst mit „%1$s“ getaggt haben - Seite %2$d"
+msgstr "Private Zeitleiste für die Liste %1$s von dir, Seite %2$d"
 
 #. TRANS: Title for public list timeline where the viewer is the tagger.
 #. TRANS: %1$s is a list, %2$s is a page number.
-#, fuzzy, php-format
+#, php-format
 msgid "Timeline for %1$s list by you, page %2$d"
-msgstr "Benutzer, die sich selbst mit „%1$s“ getaggt haben - Seite %2$d"
+msgstr "Zeitleiste für die Liste %1$s von dir, Seite %2$d"
 
 #. TRANS: Title for private list timeline.
 #. TRANS: %1$s is a list, %2$s is the tagger's nickname, %3$d is a page number.
-#, fuzzy, php-format
+#, php-format
 msgid "Timeline for %1$s list by %2$s, page %3$d"
-msgstr "Von „%1$s“ mit „%2$s“ getaggte Nachrichten, Seite %3$d"
+msgstr "Zeitleiste für die liste %1$s von %2$s, Seite %3$d"
 
 #. TRANS: Title for private list timeline.
 #. TRANS: %s is a list.
@@ -5675,25 +5236,25 @@ msgstr "Zeitleiste für Liste %s von dir"
 
 #. TRANS: Title for private list timeline.
 #. TRANS: %1$s is a list, %2$s is the tagger's nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "Timeline for %1$s list by %2$s"
-msgstr "Antworten an %1$s auf %2$s!"
+msgstr "Zeitleiste für die Liste %1$s von %2$s"
 
 #. TRANS: Feed title.
 #. TRANS: %1$s is a list, %2$s is tagger's nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "Feed for %1$s list by %2$s (Atom)"
-msgstr "Feed der Freunde von %s (Atom)"
+msgstr "Feed für die Liste %1$s  von %2$s (Atom)"
 
 #. TRANS: Empty list message for list timeline.
 #. TRANS: %1$s is a list, %2$s is a tagger's nickname.
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "This is the timeline for %1$s list by %2$s but no one has posted anything "
 "yet."
 msgstr ""
-"Dies ist die Zeitleiste von %s und Freunden, aber bisher hat niemand etwas "
-"gepostet."
+"Dies ist die Zeitleiste für die Liste %1$s von %2$s, aber bisher hat niemand "
+"etwas gepostet."
 
 #. TRANS: Additional empty list message for list timeline for currently logged in user tagged tags.
 msgid "Try tagging more people."
@@ -5701,52 +5262,57 @@ msgstr "Versuche, mehr Leute zu taggen."
 
 #. TRANS: Additional empty list message for list timeline.
 #. TRANS: This message contains Markdown links in the form [description](link).
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and start following "
 "this timeline!"
 msgstr ""
 "Warum [registrierst du nicht einen Account](%%%%action.register%%%%) und "
-"bist der erste der eine Nachricht abschickt!"
+"fängst an, dieser Zeitleiste zu folgen!"
 
 #. TRANS: Header on show list page.
-#, fuzzy
+#. TRANS: Link description for link to list of users tagged with a tag (so part of a list).
 msgid "Listed"
-msgstr "Lizenz"
+msgstr "Gelistet"
+
+#. TRANS: Content of "Listed" page if there are no listed users.
+#. TRANS: Content of "People following tag x" if there are no subscribed users.
+#. TRANS: Description for mini list of group members on a group page when the group has no members.
+#. TRANS: Empty list message for tags.
+#. TRANS: Text for user subscription statistics if the user has no subscriptions.
+#. TRANS: Text for user subscriber statistics if user has no subscribers.
+#. TRANS: Text for user user group membership statistics if user is not a member of any group.
+#. TRANS: Default content for section/sidebar widget.
+msgid "(None)"
+msgstr "(Kein)"
 
 #. TRANS: Link for more "People in list x by a user"
 #. TRANS: if there are more than the mini list's maximum.
-#, fuzzy
 msgid "Show all"
-msgstr "Mehr anzeigen"
+msgstr "Alle anzeigen"
 
 #. TRANS: Header for tag subscribers.
 #. TRANS: Link description for link to list of users subscribed to a tag.
 msgid "Subscribers"
 msgstr "Abonnenten"
 
-#. TRANS: Link for more "People following tag x"
-#. TRANS: if there are more than the mini list's maximum.
-msgid "All subscribers"
-msgstr "Alle Abonnenten"
-
-#. TRANS: Page title showing tagged notices in one user's stream.
+#. TRANS: Page title showing tagged notices in one user's timeline.
 #. TRANS: %1$s is the username, %2$s is the hash tag.
-#, fuzzy, php-format
+#, php-format
 msgid "Notices by %1$s tagged %2$s"
-msgstr "Von „%1$s“ mit „%2$s“ getaggte Nachrichten"
+msgstr "Von %1$s mit %2$s getaggte Nachrichten"
 
-#. TRANS: Page title showing tagged notices in one user's stream.
+#. TRANS: Page title showing tagged notices in one user's timeline.
 #. TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number.
-#, fuzzy, php-format
+#, php-format
 msgid "Notices by %1$s tagged %2$s, page %3$d"
-msgstr "Von „%1$s“ mit „%2$s“ getaggte Nachrichten, Seite %3$d"
+msgstr "Von %1$s mit %2$s getaggte Nachrichten, Seite %3$d"
 
-#. TRANS: Extended page title showing tagged notices in one user's stream.
+#. TRANS: Extended page title showing tagged notices in one user's timeline.
 #. TRANS: %1$s is the username, %2$d is the page number.
-#, fuzzy, php-format
+#, php-format
 msgid "Notices by %1$s, page %2$d"
-msgstr "Mit „%1$s“ getaggte Nachrichten, Seite %2$d"
+msgstr "Nachrichten von %1$s, Seite %2$d"
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %1$s is a user nickname, %2$s is a hashtag.
@@ -5754,6 +5320,12 @@ msgstr "Mit „%1$s“ getaggte Nachrichten, Seite %2$d"
 msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
 msgstr "Feed aller von „%1$s“ mit „%2$s“ getaggten Nachrichten (RSS 1.0)"
 
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#, php-format
+msgid "Notice feed for %s (Activity Streams JSON)"
+msgstr "Feed der Nachrichten von %s (Activity Streams JSON)"
+
 #. TRANS: Title for link to notice feed.
 #. TRANS: %s is a user nickname.
 #, php-format
@@ -5778,7 +5350,7 @@ msgstr "Feed der Nachrichten von %s (Atom)"
 msgid "FOAF for %s"
 msgstr "FOAF von %s"
 
-#. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
+#. TRANS: First sentence of empty list message for a timeline. $1%s is a user nickname.
 #, php-format
 msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
 msgstr ""
@@ -5792,7 +5364,7 @@ msgstr ""
 "In letzter Zeit irgendwas Interessantes erlebt? Du hast noch nichts "
 "geschrieben, jetzt wäre doch ein guter Zeitpunkt los zu legen :)"
 
-#. TRANS: Second sentence of empty  list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
+#. TRANS: Second sentence of empty  list message for a non-self timeline. %1$s is a user nickname, %2$s is a part of a URL.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
 #, php-format
 msgid ""
@@ -5802,7 +5374,7 @@ msgstr ""
 "Du kannst %1$s in seinem Profil einen Stups geben oder [ihm etwas posten](%%%"
 "%action.newnotice%%%%?status_textarea=%s)."
 
-#. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
+#. TRANS: Announcement for anonymous users showing a timeline if site registrations are open.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
 #, php-format
 msgid ""
@@ -5817,17 +5389,17 @@ msgstr ""
 "um **%s**'s und vielen anderen zu folgen! ([Mehr Informationen](%%%%doc.help%"
 "%%%))"
 
-#. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
+#. TRANS: Announcement for anonymous users showing a timeline if site registrations are closed or invite only.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
 "wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
-"[StatusNet](http://status.net/) tool. "
+"[StatusNet](http://status.net/) tool."
 msgstr ""
 "**%s** hat ein Konto auf %%%%site.name%%%%, einem [Mikroblogging](http://de."
 "wikipedia.org/wiki/Mikroblogging)-Dienst basierend auf der freien Software "
-"[StatusNet](http://status.net/). "
+"[StatusNet](http://status.net/)."
 
 #. TRANS: Link to the author of a repeated notice. %s is a linked nickname.
 #, php-format
@@ -5844,7 +5416,6 @@ msgid "User is already silenced."
 msgstr "Benutzer ist bereits ruhig gestellt."
 
 #. TRANS: Title for site administration panel.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Site"
 msgstr "Seite"
@@ -5861,6 +5432,14 @@ msgstr "Der Seitenname darf nicht leer sein."
 msgid "You must have a valid contact email address."
 msgstr "Du musst eine gültige E-Mail-Adresse haben."
 
+#. TRANS: Client error displayed when a logo URL is not valid.
+msgid "Invalid logo URL."
+msgstr "Ungültige URL für das Logo"
+
+#. TRANS: Client error displayed when a SSL logo URL is invalid.
+msgid "Invalid SSL logo URL."
+msgstr "Ungültige URL für das SSL-Logo."
+
 #. TRANS: Client error displayed trying to save site settings with an invalid language code.
 #. TRANS: %s is the invalid language code.
 #, php-format
@@ -5876,53 +5455,46 @@ msgid "Dupe limit must be one or more seconds."
 msgstr "Duplikatlimit muss mehr als 1 Sekunde sein"
 
 #. TRANS: Fieldset legend on site settings panel.
-#, fuzzy
 msgctxt "LEGEND"
 msgid "General"
 msgstr "Allgemein"
 
 #. TRANS: Field label on site settings panel.
-#, fuzzy
 msgctxt "LABEL"
 msgid "Site name"
 msgstr "Seitenname"
 
 #. TRANS: Field title on site settings panel.
-#, fuzzy
 msgid "The name of your site, like \"Yourcompany Microblog\"."
-msgstr "Der Name deiner Seite, sowas wie „DeinUnternehmen-Mikroblog“"
+msgstr "Der Name deiner Seite, so etwas wie „DeinUnternehmen-Mikroblog“."
 
 #. TRANS: Field label on site settings panel.
 msgid "Brought by"
 msgstr "Erstellt von"
 
 #. TRANS: Field title on site settings panel.
-#, fuzzy
 msgid "Text used for credits link in footer of each page."
 msgstr ""
-"Text der für den Credit-Link im Fußbereich auf jeder Seite benutzt wird"
+"Text der für den Credit-Link im Fußbereich auf jeder Seite benutzt wird."
 
 #. TRANS: Field label on site settings panel.
 msgid "Brought by URL"
 msgstr "Erstellt von Adresse"
 
 #. TRANS: Field title on site settings panel.
-#, fuzzy
 msgid "URL used for credits link in footer of each page."
 msgstr ""
-"Adresse, die für den Credit-Link im Fußbereich auf jeder Seite benutzt wird"
+"Adresse, die für den Credit-Link im Fußbereich auf jeder Seite benutzt wird."
 
 #. TRANS: Field label on site settings panel.
 msgid "Email"
 msgstr "E-Mail"
 
 #. TRANS: Field title on site settings panel.
-#, fuzzy
 msgid "Contact email address for your site."
 msgstr "Kontakt-E-Mail-Adresse für deine Website."
 
 #. TRANS: Fieldset legend on site settings panel.
-#, fuzzy
 msgctxt "LEGEND"
 msgid "Local"
 msgstr "Lokal"
@@ -5940,16 +5512,16 @@ msgid "Default language"
 msgstr "Bevorzugte Sprache"
 
 #. TRANS: Dropdown title on site settings panel.
-msgid "Site language when autodetection from browser settings is not available"
+msgid ""
+"The site language when autodetection from browser settings is not available."
 msgstr ""
 "Sprache der Seite für den Fall, dass die automatische Erkennung anhand der "
 "Browser-Einstellungen nicht verfügbar ist."
 
 #. TRANS: Fieldset legend on site settings panel.
-#, fuzzy
 msgctxt "LEGEND"
 msgid "Limits"
-msgstr "Limit"
+msgstr "Limits"
 
 #. TRANS: Field label on site settings panel.
 msgid "Text limit"
@@ -5969,9 +5541,21 @@ msgstr ""
 "Wie lange muss ein Benutzer warten, bis er eine identische Nachricht "
 "abschicken kann (in Sekunden)."
 
+#. TRANS: Fieldset legend for form to change logo.
+msgid "Logo"
+msgstr "Logo"
+
+#. TRANS: Field label for StatusNet site logo.
+msgid "Site logo"
+msgstr "Seitenlogo"
+
+#. TRANS: Field label for SSL StatusNet site logo.
+msgid "SSL logo"
+msgstr "SSL-Logo"
+
 #. TRANS: Button title for saving site settings.
-msgid "Save site settings"
-msgstr "Website-Einstellungen speichern"
+msgid "Save the site settings."
+msgstr "Die Website-Einstellungen speichern."
 
 #. TRANS: Page title for site-wide notice tab in admin panel.
 msgid "Site Notice"
@@ -5997,10 +5581,9 @@ msgstr "Seitenbenachrichtigung"
 msgid "Site-wide notice text (255 characters maximum; HTML allowed)"
 msgstr "Systembenachrichtigung (maximal 255 Zeichen; HTML erlaubt)"
 
-#. TRANS: Title for button to save site notice in admin panel.
-#, fuzzy
+#. TRANS: Button title to save site notice in admin panel.
 msgid "Save site notice."
-msgstr "Systemnachricht speichern"
+msgstr "Systemnachricht speichern."
 
 #. TRANS: Title for SMS settings.
 msgid "SMS settings"
@@ -6046,9 +5629,8 @@ msgid "SMS phone number"
 msgstr "SMS-Telefonnummer"
 
 #. TRANS: SMS phone number input field instructions in SMS settings form.
-#, fuzzy
 msgid "Phone number, no punctuation or spaces, with area code."
-msgstr "Telefonnummer, keine Sonder- oder Leerzeichen mit Vorwahl"
+msgstr "Telefonnummer mit Vorwahl, keine Sonder- oder Leerzeichen."
 
 #. TRANS: Form legend for SMS preferences form.
 msgid "SMS preferences"
@@ -6096,7 +5678,6 @@ msgid "That is the wrong confirmation number."
 msgstr "Die Bestätigungsnummer ist falsch."
 
 #. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
-#, fuzzy
 msgid "Could not delete SMS confirmation."
 msgstr "Konnte die IM-Bestätigung nicht löschen."
 
@@ -6133,15 +5714,13 @@ msgstr ""
 "s."
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
-#, fuzzy
 msgid "No code entered."
-msgstr "Kein Code eingegeben"
+msgstr "Kein Code eingegeben."
 
 #. TRANS: Title for admin panel to configure snapshots.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Snapshots"
-msgstr "Snapshots"
+msgstr "Schnappschüsse"
 
 #. TRANS: Instructions for admin panel to configure snapshots.
 msgid "Manage snapshot configuration"
@@ -6160,10 +5739,9 @@ msgid "Invalid snapshot report URL."
 msgstr "Ungültige Snapshot-Berichts-URL."
 
 #. TRANS: Fieldset legend on admin panel for snapshots.
-#, fuzzy
 msgctxt "LEGEND"
 msgid "Snapshots"
-msgstr "Snapshots"
+msgstr "Schnappschüsse"
 
 #. TRANS: Option in dropdown for snapshot method in admin panel for snapshots.
 msgid "Randomly during web hit"
@@ -6178,32 +5756,28 @@ msgid "Data snapshots"
 msgstr "Daten-Snapshot"
 
 #. TRANS: Dropdown title for snapshot method in admin panel for snapshots.
-#, fuzzy
 msgid "When to send statistical data to status.net servers."
-msgstr "Wann sollen Statistiken zum status.net-Server geschickt werden"
+msgstr "Wann sollen Statistiken zum Status.net-Server geschickt werden."
 
 #. TRANS: Input field label for snapshot frequency in admin panel for snapshots.
 msgid "Frequency"
 msgstr "Frequenz"
 
 #. TRANS: Input field title for snapshot frequency in admin panel for snapshots.
-#, fuzzy
 msgid "Snapshots will be sent once every N web hits."
-msgstr "Snapshots werden alle N Webseitenbesuche gesendet"
+msgstr "Schnappschüsse werden einmal bei jeden N Webseitenbesuchen gesendet."
 
 #. TRANS: Input field label for snapshot report URL in admin panel for snapshots.
 msgid "Report URL"
 msgstr "URL melden"
 
 #. TRANS: Input field title for snapshot report URL in admin panel for snapshots.
-#, fuzzy
 msgid "Snapshots will be sent to this URL."
-msgstr "An diese Adresse werden Snapshots gesendet"
+msgstr "Schnappschüsse werden an diese URL gesendet."
 
-#. TRANS: Title for button to save snapshot settings.
-#, fuzzy
+#. TRANS: Button title to save snapshot settings.
 msgid "Save snapshot settings."
-msgstr "Snapshot-Einstellungen speichern"
+msgstr "Schnappschuss-Einstellungen speichern."
 
 #. TRANS: Client error displayed trying a change a subscription for a non-subscribed profile.
 msgid "You are not subscribed to that profile."
@@ -6220,50 +5794,44 @@ msgstr "Du kannst nur deine eigenen ausstehenden Abonnements annehmen."
 
 #. TRANS: Title of the first page showing pending subscribers still awaiting approval.
 #. TRANS: %s is the name of the user.
-#, fuzzy, php-format
+#, php-format
 msgid "%s subscribers awaiting approval"
-msgstr "%s Gruppen-Mitgliedschaften"
+msgstr "%s Mitglieder warten auf Bestätigung"
 
 #. TRANS: Title of all but the first page showing pending subscribersmembers still awaiting approval.
 #. TRANS: %1$s is the name of the user, %2$d is the page number of the members list.
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s subscribers awaiting approval, page %2$d"
-msgstr "%1$s Gruppen-Mitglieder, Seite %2$d"
+msgstr ""
+"Abonnenten von %1$s, die auf die Aufnahmebestätigung warten, Seite %2$d"
 
 #. TRANS: Page notice for group members page.
-#, fuzzy
 msgid "A list of users awaiting approval to subscribe to you."
-msgstr "Liste der Benutzer in dieser Gruppe."
-
-#. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
-msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
-msgstr "Du hast dieses OMB 0.1 Profil nicht abonniert."
+msgstr "Liste der Benutzer die auf Bestätigung warten."
 
 #. TRANS: Page title when subscription succeeded.
 msgid "Subscribed"
 msgstr "Abonniert"
 
 #. TRANS: Client error displayed when trying to perform an action while not logged in.
-#, fuzzy
 msgid "You must be logged in to unsubscribe from a list."
-msgstr "Du musst angemeldet sein, um eine Gruppe zu erstellen."
+msgstr "Du musst angemeldet sein, um dich von einer Liste abzumelden."
 
 #. TRANS: Client error displayed when trying to perform an action without providing an ID.
-#, fuzzy
 msgid "No ID given."
-msgstr "Kein ID-Argument."
+msgstr "Keine ID angegeben."
 
 #. TRANS: Server error displayed subscribing to a list fails.
 #. TRANS: %1$s is a user nickname, %2$s is a list, %3$s is the error message (no period).
-#, fuzzy, php-format
+#, php-format
 msgid "Could not subscribe user %1$s to list %2$s: %3$s"
-msgstr "Konnte Benutzer %1$s nicht der Gruppe %2$s hinzufügen."
+msgstr "Konnte Benutzer %1$s nicht der Gruppe %2$s hinzufügen: %3$s"
 
 #. TRANS: Title of form to subscribe to a list.
 #. TRANS: %1%s is a user nickname, %2$s is a list, %3$s is a tagger nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s subscribed to list %2$s by %3$s"
-msgstr "%1$s Abonnenten, Seite %2$d"
+msgstr "%1$s haben die Liste %2$s durch %3$s abonniert"
 
 #. TRANS: Header for list of subscribers for a user (first page).
 #. TRANS: %s is the user's nickname.
@@ -6341,14 +5909,12 @@ msgid ""
 "You're not listening to anyone's notices right now, try subscribing to "
 "people you know. Try [people search](%%action.peoplesearch%%), look for "
 "members in groups you're interested in and in our [featured users](%%action."
-"featured%%). If you're a [Twitter user](%%action.twittersettings%%), you can "
-"automatically subscribe to people you already follow there."
+"featured%%)."
 msgstr ""
-"Du hast momentan noch niemanden abonniert. Benutze die [Personensuche](%%"
-"action.peoplesearch%%) um nach Freunden zu suchen oder besuche die [Beliebte "
-"Benutzer](%%action.featured%%) Seite. Wenn du ein [Twitter-Benutzer](%%"
-"action.twittersettings%%) bist, kannst du auch automatisch deine Twitter-"
-"Freunde abonnieren."
+"Du folgst momentan niemandes Nachrichten, du kannst ja dir bekannte Personen "
+"abonnieren. Versuche es mit der [Personensuche](%%action.peoplesearch%%), "
+"suche Mitglieder in Gruppen, die Dich interessieren, und besuche unsere "
+"[Beliebte-Benutzer](%%action.featured%%)-Seite."
 
 #. TRANS: Subscription list text when looking at the subscriptions for a of a user other
 #. TRANS: than the logged in user that has no subscriptions. %s is the user nickname.
@@ -6359,12 +5925,11 @@ msgid "%s is not listening to anyone."
 msgstr "%s hat niemanden abonniert."
 
 #. TRANS: Atom feed title. %s is a profile nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "Subscription feed for %s (Atom)"
-msgstr "Feed der Nachrichten von %s (Atom)"
+msgstr "Feed der Abonnementen von %s (Atom)"
 
 #. TRANS: Checkbox label for enabling IM messages for a profile in a subscriptions list.
-#, fuzzy
 msgctxt "LABEL"
 msgid "IM"
 msgstr "IM"
@@ -6379,6 +5944,12 @@ msgstr "SMS"
 msgid "Notices tagged with %1$s, page %2$d"
 msgstr "Mit „%1$s“ getaggte Nachrichten, Seite %2$d"
 
+#. TRANS: Link label for feed on "notices with tag" page.
+#. TRANS: %s is the tag the feed is for.
+#, php-format
+msgid "Notice feed for tag %s (Activity Streams JSON)"
+msgstr "Feed der Nachrichten für den Tag %s (Activity Streams JSON)"
+
 #. TRANS: Link label for feed on "notices with tag" page.
 #. TRANS: %s is the tag the feed is for.
 #, php-format
@@ -6400,69 +5971,60 @@ msgstr "Nachrichten-Feed des Tags „%s“ (Atom)"
 #. TRANS: Client error displayed when trying to tag a user that cannot be tagged.
 #. TRANS: Client exception thrown trying to set a tag for a user that cannot be tagged.
 #. TRANS: Error displayed when trying to tag a user that cannot be tagged.
-#, fuzzy
 msgid "You cannot tag this user."
 msgstr "Du kannst diesem Benutzer keine Nachricht schicken."
 
 #. TRANS: Title for list form when not on a profile page.
-#, fuzzy
 msgid "List a profile"
-msgstr "Benutzerprofil"
+msgstr "Profil auflisten"
 
 #. TRANS: Title for list form when on a profile page.
 #. TRANS: %s is a profile nickname.
-#, fuzzy, php-format
+#, php-format
 msgctxt "ADDTOLIST"
 msgid "List %s"
-msgstr "Limit"
+msgstr "%s abonnieren"
 
 #. TRANS: Title for list form when an error has occurred.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Error"
-msgstr "Ajax-Fehler"
+msgstr "Fehler"
 
 #. TRANS: Header in list form.
 msgid "User profile"
 msgstr "Benutzerprofil"
 
 #. TRANS: Fieldset legend for list form.
-#, fuzzy
 msgid "List user"
-msgstr "Limit"
+msgstr "Benutzer auflisten"
 
 #. TRANS: Field label on list form.
-#, fuzzy
 msgctxt "LABEL"
 msgid "Lists"
-msgstr "Limit"
+msgstr "Listen"
 
 #. TRANS: Field title on list form.
-#, fuzzy
 msgid ""
 "Lists for this user (letters, numbers, -, ., and _), comma- or space- "
 "separated."
 msgstr ""
-"Tags über dich selbst (Buchstaben, Zahlen, -, ., und _) durch Kommas oder "
-"Leerzeichen getrennt"
+"Listen für diesen Benutzer (Buchstaben, Zahlen, -, ., und _) sind durch "
+"Kommas oder Leerzeichen getrennt."
 
 #. TRANS: Title for personal tag cloud section.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Tags"
 msgstr "Tags"
 
 #. TRANS: Success message if lists are saved.
-#, fuzzy
 msgid "Lists saved."
-msgstr "Passwort gespeichert."
+msgstr "Listen gespeichert."
 
 #. TRANS: Page notice.
-#, fuzzy
 msgid "Use this form to add your subscribers or subscriptions to lists."
 msgstr ""
-"Benutze dieses Formular, um Tags deinen Abonnenten oder Abonnements "
-"hinzuzufügen."
+"Mithilfe dieses Formulars können Ihre Abonnenten oder Abonnements zu Listen "
+"hinzufügen."
 
 #. TRANS: Client error when requesting a tag feed for a non-existing tag.
 msgid "No such tag."
@@ -6486,26 +6048,13 @@ msgstr "Abbestellt"
 
 #. TRANS: Page title for form that allows unsubscribing from a list.
 #. TRANS: %1$s is a nickname, %2$s is a list, %3$s is a tagger nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s unsubscribed from list %2$s by %3$s"
-msgstr "%1$s Abonnenten, Seite %2$d"
-
-#. TRANS: Client error displayed when trying to update profile with an incompatible license.
-#. TRANS: %1$s is the license incompatible with site license %2$s.
-#. TRANS: Exception thrown when licenses are not compatible for an authorisation request.
-#. TRANS: %1$s is the license for the listenee, %2$s is the license for "this" StatusNet site.
-#, fuzzy, php-format
-msgid ""
-"Listenee stream license \"%1$s\" is not compatible with site license \"%2$s"
-"\"."
-msgstr ""
-"Die Benutzerlizenz „%1$s“ ist nicht kompatibel mit der Lizenz der Seite „%2"
-"$s“."
+msgstr "%1$s hat die Liste %2$s von %3$s abbestellt."
 
 #. TRANS: Title of URL settings tab in profile settings.
-#, fuzzy
 msgid "URL settings"
-msgstr "IM-Einstellungen"
+msgstr "URL-Einstellungen"
 
 #. TRANS: Instructions for tab "Other" in user profile settings.
 msgid "Manage various other options."
@@ -6518,9 +6067,8 @@ msgid " (free service)"
 msgstr " (freier Dienst)"
 
 #. TRANS: Default value for URL shortening settings.
-#, fuzzy
 msgid "[none]"
-msgstr "Nichts"
+msgstr "[keine]"
 
 #. TRANS: Default value for URL shortening settings.
 msgid "[internal]"
@@ -6556,14 +6104,12 @@ msgid "URL shortening service is too long (maximum 50 characters)."
 msgstr "URL-Auto-Kürzungs-Dienst ist zu lang (maximal 50 Zeichen)."
 
 #. TRANS: Client exception thrown when the maximum URL settings value is invalid in profile URL settings.
-#, fuzzy
 msgid "Invalid number for maximum URL length."
-msgstr "Ungültige Zahl für maximale URL-Länge."
+msgstr "Ungültige maximale URL-Länge."
 
 #. TRANS: Client exception thrown when the maximum notice length settings value is invalid in profile URL settings.
-#, fuzzy
 msgid "Invalid number for maximum notice length."
-msgstr "Ungültige Zahl für maximale Nachrichten-Länge."
+msgstr "Ungültige maximale Nachrichten-Länge."
 
 #. TRANS: Server exception thrown in profile URL settings when preferences could not be saved.
 msgid "Error saving user URL shortening preferences."
@@ -6588,12 +6134,11 @@ msgstr "Willkommens-Nachricht ungültig. Maximale Länge sind 255 Zeichen."
 
 #. TRANS: Client error displayed when trying to set a non-existing user as default subscription for new
 #. TRANS: users in user admin panel. %1$s is the invalid nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "Invalid default subscripton: \"%1$s\" is not a user."
-msgstr "Ungültiges Standard-Abonnement: „%1$s“ ist kein Benutzer."
+msgstr "Ungültiges Standard-Abonnement: \"%1$s\" ist kein Benutzer."
 
 #. TRANS: Fieldset legend in user administration panel.
-#, fuzzy
 msgctxt "LEGEND"
 msgid "Profile"
 msgstr "Profil"
@@ -6620,7 +6165,7 @@ msgstr "Willkommens-Nachricht für neue Benutzer (maximal 255 Zeichen)."
 
 #. TRANS: Field label in user admin panel for setting default subscription for new users.
 msgid "Default subscription"
-msgstr "Standard-Abonnement"
+msgstr "Standardabonnement"
 
 #. TRANS: Tooltip in user admin panel for setting default subscription for new users.
 msgid "Automatically subscribe new users to this user."
@@ -6638,163 +6183,10 @@ msgstr "Einladungen aktivieren"
 msgid "Whether to allow users to invite new users."
 msgstr "Ist es Benutzern erlaubt, neue Benutzer einzuladen."
 
-#. TRANS: Title for button to save user settings in user admin panel.
-#, fuzzy
+#. TRANS: Button title to save user settings in user admin panel.
 msgid "Save user settings."
 msgstr "Benutzer-Einstellungen speichern"
 
-#. TRANS: Page title.
-msgid "Authorize subscription"
-msgstr "Abonnement bestätigen"
-
-#. TRANS: Page notice on "Authorize subscription" page.
-#, fuzzy
-msgid ""
-"Please check these details to make sure that you want to subscribe to this "
-"user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
-"click \"Reject\"."
-msgstr ""
-"Bitte überprüfe diese Angaben, um sicher zu gehen, dass du die Nachrichten "
-"dieses Benutzers abonnieren möchtest. Wenn du das nicht wolltest, klicke auf "
-"„Abbrechen“."
-
-#. TRANS: Button text on Authorise Subscription page.
-#. TRANS: Submit button text to accept a group membership request on approve group form.
-#. TRANS: Submit button text to accept a subscription request on approve sub form.
-#, fuzzy
-msgctxt "BUTTON"
-msgid "Accept"
-msgstr "Akzeptieren"
-
-#. TRANS: Title for button on Authorise Subscription page.
-#. TRANS: Button title to subscribe to a user.
-#, fuzzy
-msgid "Subscribe to this user."
-msgstr "Abonniere diesen Benutzer"
-
-#. TRANS: Button text on Authorise Subscription page.
-#. TRANS: Submit button text to reject a group membership request on approve group form.
-#. TRANS: Submit button text to reject a subscription request on approve sub form.
-#, fuzzy
-msgctxt "BUTTON"
-msgid "Reject"
-msgstr "Ablehnen"
-
-#. TRANS: Title for button on Authorise Subscription page.
-#, fuzzy
-msgid "Reject this subscription."
-msgstr "Abonnement ablehnen"
-
-#. TRANS: Client error displayed for an empty authorisation request.
-msgid "No authorization request!"
-msgstr "Keine Bestätigungsanfrage!"
-
-#. TRANS: Accept message header from Authorise subscription page.
-msgid "Subscription authorized"
-msgstr "Abonnement autorisiert"
-
-#. TRANS: Accept message text from Authorise subscription page.
-msgid ""
-"The subscription has been authorized, but no callback URL was passed. Check "
-"with the site's instructions for details on how to authorize the "
-"subscription. Your subscription token is:"
-msgstr ""
-"Das Abonnement wurde bestätigt, aber es wurde keine Antwort-URL angegeben. "
-"Lies nochmal die Anweisungen auf der Seite wie Abonnements bestätigt werden. "
-"Dein Abonnement-Token ist:"
-
-#. TRANS: Reject message header from Authorise subscription page.
-msgid "Subscription rejected"
-msgstr "Abonnement abgelehnt"
-
-#. TRANS: Reject message from Authorise subscription page.
-msgid ""
-"The subscription has been rejected, but no callback URL was passed. Check "
-"with the site's instructions for details on how to fully reject the "
-"subscription."
-msgstr ""
-"Das Abonnement wurde abgelehnt, aber es wurde keine Callback-URL "
-"zurückgegeben. Lies nochmal die Anweisungen der Seite, wie Abonnements "
-"vollständig abgelehnt werden. Dein Abonnement-Token ist:"
-
-#. TRANS: Exception thrown when no valid user is found for an authorisation request.
-#. TRANS: %s is a listener URI.
-#, fuzzy, php-format
-msgid "Listener URI \"%s\" not found here."
-msgstr "Eine Listener-URI „%s“ wurde hier nicht gefunden."
-
-#. TRANS: Exception thrown when listenee URI is too long for an authorisation request.
-#. TRANS: %s is a listenee URI.
-#, fuzzy, php-format
-msgid "Listenee URI \"%s\" is too long."
-msgstr "Die URI „%s“ für den Stream ist zu lang."
-
-#. TRANS: Exception thrown when listenee URI is a local user for an authorisation request.
-#. TRANS: %s is a listenee URI.
-#, fuzzy, php-format
-msgid "Listenee URI \"%s\" is a local user."
-msgstr "Die URI „%s“ für den Stream ist ein lokaler Benutzer."
-
-#. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
-#. TRANS: %s is a profile URL.
-#, fuzzy, php-format
-msgid "Profile URL \"%s\" is for a local user."
-msgstr "Profiladresse „%s“ ist für einen lokalen Benutzer."
-
-#. TRANS: Exception thrown when avatar URL is invalid for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#, fuzzy, php-format
-msgid "Avatar URL \"%s\" is not valid."
-msgstr "Avataradresse „%s“ ist nicht gültig."
-
-#. TRANS: Exception thrown when avatar URL could not be read for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#, fuzzy, php-format
-msgid "Cannot read avatar URL \"%s\"."
-msgstr "Konnte Avatar-URL nicht öffnen „%s“"
-
-#. TRANS: Exception thrown when avatar URL return an invalid image type for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#, fuzzy, php-format
-msgid "Wrong image type for avatar URL \"%s\"."
-msgstr "Falscher Bildtyp für „%s“"
-
-#. TRANS: Title for profile design page.
-#. TRANS: Page title for profile design page.
-msgid "Profile design"
-msgstr "Profil-Design-Einstellungen"
-
-#. TRANS: Instructions for Profile design page.
-#. TRANS: Instructions for profile design page.
-msgid ""
-"Customize the way your profile looks with a background image and a colour "
-"palette of your choice."
-msgstr ""
-"Stelle ein wie deine Profilseite aussehen soll. Hintergrundbild und "
-"Farbpalette sind frei wählbar."
-
-#. TRANS: Succes message on Profile design page when finding an easter egg.
-msgid "Enjoy your hotdog!"
-msgstr "Hab Spaß!"
-
-#. TRANS: Form legend on Profile design page.
-#, fuzzy
-msgid "Design settings"
-msgstr "Website-Einstellungen speichern"
-
-#. TRANS: Checkbox label on Profile design page.
-msgid "View profile designs"
-msgstr "Profil-Designs ansehen"
-
-#. TRANS: Title for checkbox on Profile design page.
-msgid "Show or hide profile designs."
-msgstr "Profil-Designs anzeigen oder verstecken."
-
-#. TRANS: Form legend on Profile design page for form to choose a background image.
-#, fuzzy
-msgid "Background file"
-msgstr "Hintergrund"
-
 #. TRANS: Page title for all but the first page of groups for a user.
 #. TRANS: %1$s is a nickname, %2$d is a page number.
 #, php-format
@@ -6836,10 +6228,10 @@ msgstr "StatusNet %s"
 #. TRANS: %1$s is the engine name (StatusNet) and %2$s is the StatusNet version.
 #, php-format
 msgid ""
-"This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, "
+"This site is powered by %1$s version %2$s, Copyright 2008-2011 StatusNet, "
 "Inc. and contributors."
 msgstr ""
-"Diese Seite wird mit %1$s Version %2$s betrieben. Copyright 2008–2010 "
+"Diese Seite wird mit %1$s Version %2$s betrieben. Copyright 2008–2011 "
 "StatusNet, Inc. und Mitarbeiter"
 
 #. TRANS: Header for StatusNet contributors section on the version page.
@@ -6855,24 +6247,24 @@ msgid ""
 "StatusNet is free software: you can redistribute it and/or modify it under "
 "the terms of the GNU Affero General Public License as published by the Free "
 "Software Foundation, either version 3 of the License, or (at your option) "
-"any later version. "
+"any later version."
 msgstr ""
-"StatusNet ist freie Software: Sie dürfen es weiter verteilen und/oder "
-"verändern unter Berücksichtigung der Regeln zur GNU General Public License "
-"wie veröffentlicht durch die Free Software Foundation, entweder Version 3 "
-"der Lizenz, oder jede höhere Version."
+"StatusNet ist freie Software: Sie dürfen sie weiter verteilen und/oder "
+"verändern unter Berücksichtigung der Bedingungen der GNU Affero General "
+"Public License wie durch die Free Software Foundation veröffentlicht, "
+"entweder Version 3 der Lizenz, oder (nach Ihrer Wahl) jede höhere Version."
 
 #. TRANS: Content part of StatusNet version page.
 msgid ""
 "This program is distributed in the hope that it will be useful, but WITHOUT "
 "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
 "FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License "
-"for more details. "
+"for more details."
 msgstr ""
 "Dieses Programm wird in der Hoffnung vertrieben, dass es nützlich sein wird, "
 "aber OHNE IRGENDEINE GARANTIE, sogar ohne die implizite Garantie der "
 "MARKTREIFE oder der EIGNUNG FÃœR EINEN BESTIMMTEN ZWECK. Lesen Sie die GNU "
-"Affero General Public License für weitere Details. "
+"Affero General Public License für weitere Details."
 
 #. TRANS: Content part of StatusNet version page.
 #. TRANS: %s is a link to the AGPL license with link description "http://www.gnu.org/licenses/agpl.html".
@@ -6889,25 +6281,21 @@ msgid "Plugins"
 msgstr "Erweiterungen"
 
 #. TRANS: Column header for plugins table on version page.
-#, fuzzy
 msgctxt "HEADER"
 msgid "Name"
 msgstr "Name"
 
 #. TRANS: Column header for plugins table on version page.
-#, fuzzy
 msgctxt "HEADER"
 msgid "Version"
 msgstr "Version"
 
 #. TRANS: Column header for plugins table on version page.
-#, fuzzy
 msgctxt "HEADER"
 msgid "Author(s)"
 msgstr "Autor(en)"
 
 #. TRANS: Column header for plugins table on version page.
-#, fuzzy
 msgctxt "HEADER"
 msgid "Description"
 msgstr "Beschreibung"
@@ -6931,22 +6319,32 @@ msgstr "Die URL „%s“ konnte nicht verarbeitet werden"
 msgid "Robin thinks something is impossible."
 msgstr "Robin denkt, dass etwas unmöglich ist."
 
+#. TRANS: Message used to be inserted as %2$s in  the text "No file may
+#. TRANS: be larger than %1$d byte and the file you sent was %2$s.".
+#. TRANS: %1$d is the number of bytes of an uploaded file.
+#, php-format
+msgid "%1$d byte"
+msgid_plural "%1$d bytes"
+msgstr[0] "%1$d Byte"
+msgstr[1] "%1$d Bytes"
+
 #. TRANS: Message given if an upload is larger than the configured maximum.
-#. TRANS: %1$d is the byte limit for uploads, %2$d is the byte count for the uploaded file.
-#. TRANS: %1$s is used for plural.
+#. TRANS: %1$d (used for plural) is the byte limit for uploads,
+#. TRANS: %2$s is the proper form of "n bytes". This is the only ways to have
+#. TRANS: gettext support multiple plurals in the same message, unfortunately...
 #, php-format
 msgid ""
-"No file may be larger than %1$d byte and the file you sent was %2$d bytes. "
-"Try to upload a smaller version."
+"No file may be larger than %1$d byte and the file you sent was %2$s. Try to "
+"upload a smaller version."
 msgid_plural ""
-"No file may be larger than %1$d bytes and the file you sent was %2$d bytes. "
-"Try to upload a smaller version."
+"No file may be larger than %1$d bytes and the file you sent was %2$s. Try to "
+"upload a smaller version."
 msgstr[0] ""
-"Keine Datei darf größer als ein Byte sein und die Datei die du verschicken "
-"wolltest war %2$d Bytes groß. Bitte eine kleinere Version hochladen."
+"Keine Datei darf größer als %1$d Byte sein und die Datei, die du verschickt "
+"hast, war %2$s Bytes groß. Versuche bitte eine kleinere Version hochzuladen."
 msgstr[1] ""
-"Keine Datei darf größer als %1$d Bytes sein und die Datei die du verschicken "
-"wolltest war %2$d Bytes groß. Bitte eine kleinere Version hochladen."
+"Keine Datei darf größer als %1$d Bytes sein und die Datei, die du verschickt "
+"hast, war %2$s Bytes groß. Versuche bitte eine kleinere Version hochzuladen."
 
 #. TRANS: Message given if an upload would exceed user quota.
 #. TRANS: %d (number) is the user quota in bytes and is used for plural.
@@ -7018,6 +6416,11 @@ msgstr "Konnte Gruppe nicht aktualisieren."
 msgid "Could not create login token for %s"
 msgstr "Konnte keinen Login-Token für %s erstellen"
 
+#. TRANS: Exception thrown when a program code class (%s) cannot be instantiated.
+#, php-format
+msgid "Cannot instantiate class %s."
+msgstr "Kann Klasse %s nicht instanziieren."
+
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.
 msgid "No database name or DSN found anywhere."
 msgstr "Nirgendwo einen Datenbanknamen oder DSN gefunden."
@@ -7041,9 +6444,9 @@ msgid "No such profile (%1$d) for notice (%2$d)."
 msgstr "Kein Profil (%1$d) für eine Notiz gefunden (%2$d)."
 
 #. TRANS: Server exception. %s are the error details.
-#, fuzzy, php-format
+#, php-format
 msgid "Database error inserting hashtag: %s."
-msgstr "Datenbankfehler beim Einfügen des Hashtags: %s"
+msgstr "Datenbankfehler beim Einfügen des Hashtags: %s."
 
 #. TRANS: Client exception thrown if a notice contains too many characters.
 msgid "Problem saving notice. Too long."
@@ -7074,24 +6477,23 @@ msgstr ""
 "Du wurdest für das Schreiben von Nachrichten auf dieser Seite gesperrt."
 
 #. TRANS: Client exception thrown in notice when trying to repeat a missing or deleted notice.
-#, fuzzy
 msgid "Cannot repeat; original notice is missing or deleted."
-msgstr "Du kannst deine eigenen Nachrichten nicht wiederholen."
+msgstr ""
+"Kann nicht wiederholt werden; ursprüngliche Nachricht fehlt oder ist "
+"gelöscht worden."
 
 #. TRANS: Client error displayed when trying to repeat an own notice.
-#, fuzzy
 msgid "You cannot repeat your own notice."
 msgstr "Du kannst deine eigene Nachricht nicht wiederholen."
 
 #. TRANS: Client error displayed when trying to repeat a non-public notice.
-#, fuzzy
 msgid "Cannot repeat a private notice."
-msgstr "Du kannst deine eigenen Nachrichten nicht wiederholen."
+msgstr "Private Nachricht kann nicht wiederholt werden."
 
 #. TRANS: Client error displayed when trying to repeat a notice you cannot access.
-#, fuzzy
 msgid "Cannot repeat a notice you cannot read."
-msgstr "Du kannst deine eigenen Nachrichten nicht wiederholen."
+msgstr ""
+"Eine Nachricht, die du nicht lesen kannst, kann nicht wiederholt werden."
 
 #. TRANS: Client error displayed when trying to repeat an already repeated notice.
 msgid "You already repeated that notice."
@@ -7099,9 +6501,9 @@ msgstr "Nachricht bereits wiederholt"
 
 #. TRANS: Client error displayed when trying to reply to a notice a the target has no access to.
 #. TRANS: %1$s is a user nickname, %2$d is a notice ID (number).
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s has no access to notice %2$d."
-msgstr "Benutzer hat keine letzte Nachricht."
+msgstr "%1$s hat keinen Zugriff auf die Nachricht %2$d."
 
 #. TRANS: Server exception thrown when a notice cannot be saved.
 #. TRANS: Server exception thrown when a notice cannot be updated.
@@ -7152,29 +6554,24 @@ msgid "The tag you are trying to rename to already exists."
 msgstr "Der Tag, zu dem du umbenennen willst, existiert bereits."
 
 #. TRANS: Server exception saving new tag without having a tagger specified.
-#, fuzzy
 msgid "No tagger specified."
-msgstr "Keine Gruppe angegeben"
+msgstr "Kein Tagger angegeben."
 
 #. TRANS: Server exception saving new tag without having a tag specified.
-#, fuzzy
 msgid "No tag specified."
-msgstr "Keine Gruppe angegeben"
+msgstr "Keine Tag angegeben."
 
 #. TRANS: Server exception saving new tag.
-#, fuzzy
 msgid "Could not create profile tag."
-msgstr "Konnte Profil nicht speichern."
+msgstr "Konnte Profil-Tag nicht erstellen."
 
 #. TRANS: Server exception saving new tag.
-#, fuzzy
 msgid "Could not set profile tag URI."
-msgstr "Konnte Profil nicht speichern."
+msgstr "Tag URI konnte nicht gespeichert werden."
 
 #. TRANS: Server exception saving new tag.
-#, fuzzy
 msgid "Could not set profile tag mainpage."
-msgstr "Konnte Profil nicht speichern."
+msgstr "Profil Tag Mainpage konnte nicht festgelegt werden."
 
 #. TRANS: Client exception thrown trying to set more tags than allowed.
 #, php-format
@@ -7189,20 +6586,18 @@ msgstr ""
 #, php-format
 msgid ""
 "You already have %1$d or more people in list %2$s, which is the maximum "
-"allowed number.Try unlisting others first."
+"allowed number. Try unlisting others first."
 msgstr ""
 "Du hast bereits %1$d oder mehr Personen in der Liste %2$s, was die maximal "
 "zulässige Anzahl ist. Entferne zuerst andere Personen."
 
 #. TRANS: Exception thrown when inserting a list subscription in the database fails.
-#, fuzzy
 msgid "Adding list subscription failed."
-msgstr "Konnte Abonnement nicht löschen."
+msgstr "Neues Listenabonnement gescheitert."
 
 #. TRANS: Exception thrown when deleting a list subscription from the database fails.
-#, fuzzy
 msgid "Removing list subscription failed."
-msgstr "Konnte Abonnement nicht löschen."
+msgstr "Konnte Listen-Abonnement nicht entfernen."
 
 #. TRANS: Exception thrown when a right for a non-existing user profile is checked.
 msgid "Missing profile."
@@ -7213,7 +6608,6 @@ msgid "Unable to save tag."
 msgstr "Konnte Tag nicht speichern."
 
 #. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
-#. TRANS: Error message displayed to a banned user when they try to subscribe.
 msgid "You have been banned from subscribing."
 msgstr "Dieser Benutzer erlaubt dir nicht ihn zu abonnieren."
 
@@ -7233,16 +6627,11 @@ msgstr "Nicht abonniert!"
 msgid "Could not delete self-subscription."
 msgstr "Konnte Selbst-Abonnement nicht löschen."
 
-#. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
-msgid "Could not delete subscription OMB token."
-msgstr "Konnte OMB-Abonnement-Token nicht löschen."
-
 #. TRANS: Exception thrown when a subscription could not be deleted on the server.
 msgid "Could not delete subscription."
 msgstr "Konnte Abonnement nicht löschen."
 
 #. TRANS: Activity title when subscribing to another person.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Follow"
 msgstr "Folgen"
@@ -7271,6 +6660,18 @@ msgstr "Kein einzelner Benutzer für den Ein-Benutzer-Modus ausgewählt."
 msgid "Single-user mode code called when not enabled."
 msgstr "Einzeluser-Modus aufgerufen, aber nicht aktiviert."
 
+#. TRANS: Information on password recovery form if no known username or e-mail address was specified.
+msgid "No user with that email address or username."
+msgstr "Kein Benutzer mit dieser E-Mail-Adresse oder mit diesem Nutzernamen."
+
+#. TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.
+msgid "No registered email address for that user."
+msgstr "Der Benutzer hat keine registrierte E-Mail-Adresse."
+
+#. TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.
+msgid "Error saving address confirmation."
+msgstr "Fehler beim Speichern der Adressbestätigung."
+
 #. TRANS: Server exception thrown when creating a group failed.
 msgid "Could not create group."
 msgstr "Konnte Gruppe nicht erstellen."
@@ -7289,9 +6690,9 @@ msgstr "Konnte die lokale Gruppen Information nicht speichern."
 
 #. TRANS: Exception thrown when an account could not be located when it should be moved.
 #. TRANS: %s is the remote site.
-#, fuzzy, php-format
+#, php-format
 msgid "Cannot locate account %s."
-msgstr "Kann Konto %s nicht finden."
+msgstr "Konto %s kann nicht gefunden werden."
 
 #. TRANS: Exception thrown when a service document could not be located account move.
 #. TRANS: %s is the remote site.
@@ -7315,23 +6716,19 @@ msgid "User deletion in progress..."
 msgstr "Löschung des Benutzers in Arbeit …"
 
 #. TRANS: Link title for link on user profile.
-#, fuzzy
 msgid "Edit profile settings."
-msgstr "Profil-Einstellungen ändern"
+msgstr "Profil-Einstellungen bearbeiten."
 
 #. TRANS: Link text for link on user profile.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Edit"
 msgstr "Bearbeiten"
 
 #. TRANS: Link title for link on user profile.
-#, fuzzy
 msgid "Send a direct message to this user."
-msgstr "Direkte Nachricht an Benutzer versenden"
+msgstr "Direkte Nachricht an diesen Benutzer versenden."
 
 #. TRANS: Link text for link on user profile.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Message"
 msgstr "Nachricht"
@@ -7369,7 +6766,6 @@ msgid "Show more"
 msgstr "Mehr anzeigen"
 
 #. TRANS: Inline reply form submit button: submits a reply comment.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Reply"
 msgstr "Antworten"
@@ -7380,7 +6776,6 @@ msgid "Write a reply..."
 msgstr "Antwort verfassen..."
 
 #. TRANS: Tab on the notice form.
-#, fuzzy
 msgctxt "TAB"
 msgid "Status"
 msgstr "Status"
@@ -7457,7 +6852,7 @@ msgid "Expecting a root feed element but got a whole XML document."
 msgstr "Root-Element eines Feeds erwartet, aber ganzes XML-Dokument erhalten."
 
 #. TRANS: Client exception thrown when using an unknown verb for the activity importer.
-#, fuzzy, php-format
+#, php-format
 msgid "Unknown verb: \"%s\"."
 msgstr "Unbekanntes Verb: „%s“"
 
@@ -7466,14 +6861,12 @@ msgid "Cannot force subscription for untrusted user."
 msgstr "Abonnement für nicht vertrauten Benutzer kann nicht forciert werden."
 
 #. TRANS: Client exception thrown when trying to force a remote user to subscribe.
-#, fuzzy
 msgid "Cannot force remote user to subscribe."
-msgstr "Kann entfernten Benutzer nicht forciert abonnieren."
+msgstr "Kann entfernten Benutzer nicht zum Abonnement forcieren."
 
 #. TRANS: Client exception thrown when trying to subscribe to an unknown profile.
-#, fuzzy
 msgid "Unknown profile."
-msgstr "Profil %s ist unbekannt"
+msgstr "Unbekanntes Profil."
 
 #. TRANS: Client exception thrown when trying to import an event not related to the importing user.
 msgid "This activity seems unrelated to our user."
@@ -7484,9 +6877,8 @@ msgid "Remote profile is not a group!"
 msgstr "Entferntes Profil ist keine Gruppe!"
 
 #. TRANS: Client exception thrown when trying to join a group the importing user is already a member of.
-#, fuzzy
 msgid "User is already a member of this group."
-msgstr "Du bist bereits Mitglied dieser Gruppe"
+msgstr "Benutzer ist bereits Mitglied dieser Gruppe"
 
 #. TRANS: Client exception thrown when trying to import a notice by another user.
 #. TRANS: %1$s is the source URI of the notice, %2$s is the URI of the author.
@@ -7500,14 +6892,14 @@ msgstr "Autor für nicht-vertrauten Benutzer wird nicht überschrieben."
 
 #. TRANS: Client exception thrown when trying to import a notice without content.
 #. TRANS: %s is the notice URI.
-#, fuzzy, php-format
+#, php-format
 msgid "No content for notice %s."
-msgstr "Kein Inhalt für Nachricht %d."
+msgstr "Kein Inhalt für Nachricht %s."
 
 #. TRANS: Exception thrown if a non-existing user is provided. %s is a user ID.
-#, fuzzy, php-format
+#, php-format
 msgid "No such user \"%s\"."
-msgstr "Unbekannter Benutzer."
+msgstr "Unbekannter Benutzer „%s“."
 
 #. TRANS: Client exception thrown when post to collection fails with a 400 status.
 #. TRANS: %1$s is a URL, %2$s is the status, %s$s is the fail reason.
@@ -7515,10 +6907,10 @@ msgstr "Unbekannter Benutzer."
 #. TRANS: %1$s is a URL, %2$s is the status, %s$s is the fail reason.
 #. TRANS: Exception thrown when post to collection fails with a status that is not handled.
 #. TRANS: %1$s is a URL, %2$s is the status, %s$s is the fail reason.
-#, fuzzy, php-format
+#, php-format
 msgctxt "URLSTATUSREASON"
 msgid "%1$s %2$s %3$s"
-msgstr "%1$s – %2$s"
+msgstr "%1$s %2$s %3$s"
 
 #. TRANS: Client exception thrown when there is no source attribute.
 msgid "Can't handle remote content yet."
@@ -7548,29 +6940,12 @@ msgstr "showForm() noch nicht implementiert."
 msgid "saveSettings() not implemented."
 msgstr "saveSettings() noch nicht implementiert."
 
-#. TRANS: Client error message thrown if design settings could not be deleted in
-#. TRANS: the admin panel Design.
-msgid "Unable to delete design setting."
-msgstr "Konnte die Design-Einstellungen nicht löschen."
-
 #. TRANS: Header in administrator navigation panel.
-#. TRANS: Header in settings navigation panel.
-#, fuzzy
 msgctxt "HEADER"
 msgid "Home"
-msgstr "Homepage"
-
-#. TRANS: Menu item in administrator navigation panel.
-#. TRANS: Menu item in default local navigation panel.
-#. TRANS: Menu item in personal group navigation menu.
-#. TRANS: Menu item in settings navigation panel.
-#, fuzzy
-msgctxt "MENU"
-msgid "Home"
-msgstr "Homepage"
+msgstr "Startseite"
 
 #. TRANS: Header in administrator navigation panel.
-#, fuzzy
 msgctxt "HEADER"
 msgid "Admin"
 msgstr "Admin"
@@ -7584,23 +6959,11 @@ msgctxt "MENU"
 msgid "Site"
 msgstr "Seite"
 
-#. TRANS: Menu item title in administrator navigation panel.
-msgid "Design configuration"
-msgstr "Design-Konfiguration"
-
-#. TRANS: Menu item in administrator navigation panel.
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: Menu item in settings navigation panel.
-msgctxt "MENU"
-msgid "Design"
-msgstr "Design"
-
 #. TRANS: Menu item title in administrator navigation panel.
 msgid "User configuration"
 msgstr "Benutzereinstellung"
 
 #. TRANS: Menu item in administrator navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "User"
 msgstr "Benutzer"
@@ -7610,7 +6973,6 @@ msgid "Access configuration"
 msgstr "Zugangskonfiguration"
 
 #. TRANS: Menu item in administrator navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Access"
 msgstr "Zugang"
@@ -7638,7 +7000,6 @@ msgid "Edit site notice"
 msgstr "Seitennachricht bearbeiten"
 
 #. TRANS: Menu item in administrator navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Site notice"
 msgstr "Seitennachricht"
@@ -7648,28 +7009,24 @@ msgid "Snapshots configuration"
 msgstr "Snapshot-Konfiguration"
 
 #. TRANS: Menu item in administrator navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Snapshots"
-msgstr "Snapshots"
+msgstr "Schnappschüsse"
 
 #. TRANS: Menu item title in administrator navigation panel.
 msgid "Set site license"
 msgstr "Website-Lizenz einstellen"
 
 #. TRANS: Menu item in administrator navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "License"
 msgstr "Lizenz"
 
 #. TRANS: Menu item title in administrator navigation panel.
-#, fuzzy
 msgid "Plugins configuration"
-msgstr "Pfadkonfiguration"
+msgstr "Plugin-Konfiguration"
 
 #. TRANS: Menu item in administrator navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Plugins"
 msgstr "Erweiterungen"
@@ -7699,41 +7056,6 @@ msgstr "Kein Benutzer mit diesem Token."
 msgid "Could not authenticate you."
 msgstr "Konnte dich nicht authentifizieren."
 
-#. TRANS: Server error displayed when trying to create an anynymous OAuth consumer.
-msgid "Could not create anonymous consumer."
-msgstr "Anonymer Zugang konnte nicht erstellt werden"
-
-#. TRANS: Server error displayed when trying to create an anynymous OAuth application.
-msgid "Could not create anonymous OAuth application."
-msgstr "Anonyme OAuth-Anwendung konnte nicht erstellt werden."
-
-#. TRANS: Exception thrown when no token association could be found.
-msgid ""
-"Could not find a profile and application associated with the request token."
-msgstr "Konnte kein Profil und Anwendung für das Anfrage-Token finden."
-
-#. TRANS: Exception thrown when no access token can be issued.
-#, fuzzy
-msgid "Could not issue access token."
-msgstr "Konnte Nachricht nicht einfügen."
-
-#. TRANS: Exception thrown when a database error occurs.
-msgid "Database error inserting OAuth application user."
-msgstr "Datenbankfehler beim Einfügen des OAuth-Programm-Benutzers."
-
-#. TRANS: Exception thrown when a database error occurs.
-#, fuzzy
-msgid "Database error updating OAuth application user."
-msgstr "Datenbankfehler beim Einfügen des OAuth-Programm-Benutzers."
-
-#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
-msgid "Tried to revoke unknown token."
-msgstr "Versuchte, unbekanntes Token ungültig zu machen."
-
-#. TRANS: Exception thrown when an attempt is made to remove a revoked token.
-msgid "Failed to delete revoked token."
-msgstr "Konnte ungültig gemachtes Token nicht löschen."
-
 #. TRANS: Form input field label for application icon.
 msgid "Icon"
 msgstr "Symbol"
@@ -7816,18 +7138,16 @@ msgstr ""
 "Schreibzugriff"
 
 #. TRANS: Submit button title.
-msgid "Cancel"
-msgstr "Abbrechen"
+msgid "Cancel application changes."
+msgstr "Anwendungsänderungen abbrechen"
 
 #. TRANS: Submit button title.
-#. TRANS: Button text to save a list.
-msgid "Save"
-msgstr "Speichern"
+msgid "Save application changes."
+msgstr "Anwendungsänderungen speichern"
 
 #. TRANS: Name for an anonymous application in application list.
-#, fuzzy
 msgid "Unknown application"
-msgstr "Unbekannter Befehl"
+msgstr "Unbekannte Anwendung"
 
 #. TRANS: Message has a leading space and a trailing space. Used in application list.
 #. TRANS: Before this message the application name is put, behind it the organisation that manages it.
@@ -7858,26 +7178,36 @@ msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "Widerrufen"
 
+#. TRANS: Submit button text to accept a group membership request on approve group form.
+#. TRANS: Submit button text to accept a subscription request on approve sub form.
+msgctxt "BUTTON"
+msgid "Accept"
+msgstr "Akzeptieren"
+
+#. TRANS: Submit button text to reject a group membership request on approve group form.
+#. TRANS: Submit button text to reject a subscription request on approve sub form.
+msgctxt "BUTTON"
+msgid "Reject"
+msgstr "Ablehnen"
+
 #. TRANS: Atom feed exception thrown when an author element does not contain a name element.
-#, fuzzy
 msgid "Author element must contain a name element."
-msgstr "Das „author“-Element muss ein „name“-Element erhaten."
+msgstr "Das „author“-Element muss ein „name“-Element enthalten."
 
 #. TRANS: Server exception thrown when using the method setActivitySubject() in the class Atom10Feed.
-#, fuzzy
 msgid "Do not use this method!"
-msgstr "Diese Gruppe nicht löschen"
+msgstr "Diese Methode nicht verwenden!"
 
 #. TRANS: Title in atom list notice feed. %1$s is a list name, %2$s is a tagger's nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "Timeline for people in list %1$s by %2$s"
-msgstr "Antworten an %1$s auf %2$s!"
+msgstr "Timeline zu Personen in Liste %1$s von %2$s"
 
 #. TRANS: Message is used as a subtitle in atom list notice feed.
 #. TRANS: %1$s is a tagger's nickname, %2$s is a list name, %3$s is a site name.
-#, fuzzy, php-format
+#, php-format
 msgid "Updates from %1$s's list %2$s on %3$s!"
-msgstr "Aktualisierungen von %1$s auf %2$s!"
+msgstr "Aktualisierungen von %1$ss Liste %2$s auf %3$s!"
 
 #. TRANS: Title.
 msgid "Notices where this attachment appears"
@@ -7909,10 +7239,9 @@ msgid "Cancel join request"
 msgstr "Beitrittsgesuch abbrechen"
 
 #. TRANS: Button text for form action to cancel a subscription request.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Cancel subscription request"
-msgstr "Alle Abonnements"
+msgstr "Abonnementanforderung abbrechen"
 
 #. TRANS: Title for command results.
 msgid "Command results"
@@ -7981,9 +7310,8 @@ msgstr ""
 "Mitteilungen: %3$s"
 
 #. TRANS: Error message text shown when a favorite could not be set because it has already been favorited.
-#, fuzzy
 msgid "Could not create favorite: Already favorited."
-msgstr "Konnte keinen Favoriten erstellen."
+msgstr "Konnte keinen Favoriten erstellen: Bereits favorisiert."
 
 #. TRANS: Text shown when a notice has been marked as favourite successfully.
 msgid "Notice marked as fave."
@@ -8010,11 +7338,11 @@ msgstr "Fehler beim Taggen von %1$s: %2$s"
 #. TRANS: Succes message displayed if tagging a user succeeds.
 #. TRANS: %1$s is the tagged user's nickname, %2$s is a list of tags.
 #. TRANS: Plural is decided based on the number of tags added (not part of message).
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s was tagged %2$s"
 msgid_plural "%1$s was tagged %2$s"
-msgstr[0] "%1$s – %2$s"
-msgstr[1] "%1$s – %2$s"
+msgstr[0] "%1$s wurde getaggt als %2$s"
+msgstr[1] "%1$s wurde getaggt als %2$s"
 
 #. TRANS: Separator for list of tags.
 #. TRANS: Separator in list of user names like "Jim, Bob, Mary".
@@ -8230,22 +7558,19 @@ msgstr[0] "Du bist Mitglied dieser Gruppe:"
 msgstr[1] "Du bist Mitglied dieser Gruppen:"
 
 #. TRANS: Header line of help text for commands.
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "Commands:"
-msgstr "Befehl-Ergebnisse"
+msgstr "Befehle:"
 
 #. TRANS: Help message for IM/SMS command "on".
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "turn on notifications"
-msgstr "Konnte Benachrichtigung nicht aktivieren."
+msgstr "Benachrichtigungen aktivieren"
 
 #. TRANS: Help message for IM/SMS command "off".
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "turn off notifications"
-msgstr "Konnte Benachrichtigung nicht deaktivieren."
+msgstr "Benachrichtigungen deaktivieren"
 
 #. TRANS: Help message for IM/SMS command "help".
 msgctxt "COMMANDHELP"
@@ -8253,10 +7578,9 @@ msgid "show this help"
 msgstr "diese Hilfe anzeigen"
 
 #. TRANS: Help message for IM/SMS command "follow <nickname>".
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "subscribe to user"
-msgstr "Abonniere diesen Benutzer"
+msgstr "Benutzer abonnieren"
 
 #. TRANS: Help message for IM/SMS command "groups".
 msgctxt "COMMANDHELP"
@@ -8264,16 +7588,14 @@ msgid "lists the groups you have joined"
 msgstr "Gruppen auflisten, denen du beigetreten bist"
 
 #. TRANS: Help message for IM/SMS command "tag".
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "tag a user"
 msgstr "Benutzer taggen"
 
 #. TRANS: Help message for IM/SMS command "untag".
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "untag a user"
-msgstr "Benutzer taggen"
+msgstr "Benutzer enttaggen"
 
 #. TRANS: Help message for IM/SMS command "subscriptions".
 msgctxt "COMMANDHELP"
@@ -8286,16 +7608,14 @@ msgid "list the people that follow you"
 msgstr "Personen auflisten, die dir folgen"
 
 #. TRANS: Help message for IM/SMS command "leave <nickname>".
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "unsubscribe from user"
-msgstr "Abonnement von diesem Benutzer abbestellen"
+msgstr "Benutzer-Abonnement abbestellen"
 
 #. TRANS: Help message for IM/SMS command "d <nickname> <text>".
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "direct message to user"
-msgstr "Direkte Nachrichten an %s"
+msgstr "direkte Nachricht an Benutzer"
 
 #. TRANS: Help message for IM/SMS command "get <nickname>".
 msgctxt "COMMANDHELP"
@@ -8303,10 +7623,9 @@ msgid "get last notice from user"
 msgstr "letzte Nachricht des Benutzers aufrufen"
 
 #. TRANS: Help message for IM/SMS command "whois <nickname>".
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "get profile info on user"
-msgstr "Entferntes Profil ist keine Gruppe!"
+msgstr "Benutzer-Profil erhalten"
 
 #. TRANS: Help message for IM/SMS command "lose <nickname>".
 msgctxt "COMMANDHELP"
@@ -8329,10 +7648,9 @@ msgid "repeat a notice with a given id"
 msgstr "Nachricht mit der gegebenen ID wiederholen"
 
 #. TRANS: Help message for IM/SMS command "repeat <nickname>".
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "repeat the last notice from user"
-msgstr "Diese Nachricht wiederholen"
+msgstr "letzte Nachricht des Benutzers wiederholen"
 
 #. TRANS: Help message for IM/SMS command "reply #<notice_id>".
 msgctxt "COMMANDHELP"
@@ -8340,16 +7658,14 @@ msgid "reply to notice with a given id"
 msgstr "auf eine Nachricht mit der gegebenen ID antworten"
 
 #. TRANS: Help message for IM/SMS command "reply <nickname>".
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "reply to the last notice from user"
-msgstr "Auf diese Nachricht antworten"
+msgstr "auf letzte Nachricht des Nutzers antworten"
 
 #. TRANS: Help message for IM/SMS command "join <group>".
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "join group"
-msgstr "Unbekannte Gruppe."
+msgstr "Gruppe beitreten"
 
 #. TRANS: Help message for IM/SMS command "login".
 msgctxt "COMMANDHELP"
@@ -8357,10 +7673,9 @@ msgid "Get a link to login to the web interface"
 msgstr "Link zum Anmelden auf der Webseite erhalten"
 
 #. TRANS: Help message for IM/SMS command "drop <group>".
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "leave group"
-msgstr "Gruppe löschen"
+msgstr "Gruppe verlassen"
 
 #. TRANS: Help message for IM/SMS command "stats".
 msgctxt "COMMANDHELP"
@@ -8397,10 +7712,9 @@ msgstr "dasselbe wie „get“"
 #. TRANS: Help message for IM/SMS command "untrack all".
 #. TRANS: Help message for IM/SMS command "tracks".
 #. TRANS: Help message for IM/SMS command "tracking".
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "not yet implemented."
-msgstr "Befehl noch nicht implementiert."
+msgstr "noch nicht implementiert"
 
 #. TRANS: Help message for IM/SMS command "nudge <nickname>".
 msgctxt "COMMANDHELP"
@@ -8425,31 +7739,26 @@ msgstr "Bitte die Installation erneut starten, um das Problem zu beheben."
 msgid "Go to the installer."
 msgstr "Zur Installation gehen."
 
+#. TRANS: Header on conversation page. Hidden by default (h2).
+#. TRANS: Label for user statistics.
+msgid "Notices"
+msgstr "Nachrichten"
+
 #. TRANS: Page title for when a database error occurs.
 msgid "Database error"
 msgstr "Datenbankfehler."
 
 #. TRANS: Menu item in default local navigation panel.
 #. TRANS: Menu item in search group navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Public"
-msgstr "Zeitleiste"
-
-#. TRANS: Menu item in default local navigation panel.
-#. TRANS: Menu item in search group navigation panel.
-#. TRANS: Menu item in local navigation menu.
-#, fuzzy
-msgctxt "MENU"
-msgid "Groups"
-msgstr "Gruppen"
+msgstr "Öffentlich"
 
 #. TRANS: Menu item in default local navigation panel.
 #. TRANS: Menu item title in local navigation menu.
-#, fuzzy
 msgctxt "MENU"
 msgid "Lists"
-msgstr "Limit"
+msgstr "Listen"
 
 #. TRANS: Title of form for deleting a user.
 #. TRANS: Link text in notice list item to delete a notice.
@@ -8460,72 +7769,37 @@ msgstr "Löschen"
 msgid "Delete this user"
 msgstr "Diesen Benutzer löschen"
 
-#. TRANS: Form legend of form for changing the page design.
-#, fuzzy
-msgid "Change design"
-msgstr "Design speichern"
-
-#. TRANS: Fieldset legend on profile design page to change profile page colours.
-msgid "Change colours"
-msgstr "Farben ändern"
-
-#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-msgid "Use defaults"
-msgstr "Standardeinstellungen benutzen"
-
-#. TRANS: Label in form on profile design page.
-#. TRANS: Field contains file name on user's computer that could be that user's custom profile background image.
-msgid "Upload file"
-msgstr "Datei hochladen"
-
-#. TRANS: Instructions for form on profile design page.
-msgid ""
-"You can upload your personal background image. The maximum file size is 2MB."
-msgstr ""
-"Du kannst dein persönliches Hintergrundbild hochladen. Die maximale "
-"Dateigröße ist 2 MB."
-
-#. TRANS: Radio button on profile design page that will enable use of the uploaded profile image.
-msgctxt "RADIO"
-msgid "On"
-msgstr "An"
-
-#. TRANS: Radio button on profile design page that will disable use of the uploaded profile image.
-msgctxt "RADIO"
-msgid "Off"
-msgstr "Aus"
-
-#. TRANS: Success message displayed if design settings were saved after clicking "Use defaults".
-msgid "Design defaults restored."
-msgstr "Standard-Design wieder hergestellt."
-
 #. TRANS: Exception. %s is an ID.
-#, fuzzy, php-format
+#, php-format
 msgid "Unable to find services for %s."
-msgstr "Kann Zugang dieses Programm nicht entfernen: %s."
+msgstr "Kann Dienste für %s nicht finden."
 
 #. TRANS: Form legend for removing the favourite status for a favourite notice.
-#. TRANS: Title for button text for removing the favourite status for a favourite notice.
 msgid "Disfavor this notice"
 msgstr "Aus Favoriten entfernen"
 
 #. TRANS: Button text for removing the favourite status for a favourite notice.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Disfavor favorite"
 msgstr "Aus Favoriten entfernen"
 
+#. TRANS: Button title for removing the favourite status for a favourite notice.
+msgid "Remove this notice from your list of favorite notices."
+msgstr "Diese Nachricht aus deiner Liste der Lieblingsnachrichten entfernen."
+
 #. TRANS: Form legend for adding the favourite status to a notice.
-#. TRANS: Title for button text for adding the favourite status to a notice.
 msgid "Favor this notice"
 msgstr "Zu den Favoriten hinzufügen"
 
 #. TRANS: Button text for adding the favourite status to a notice.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Favor"
 msgstr "Zu Favoriten hinzufügen"
 
+#. TRANS: Button title for adding the favourite status to a notice.
+msgid "Add this notice to your list of favorite notices."
+msgstr "Diese Nachricht zu deiner Liste der Lieblingsnachrichten hinzufügen."
+
 #. TRANS: Feed type name.
 msgid "RSS 1.0"
 msgstr "RSS 1.0"
@@ -8542,6 +7816,10 @@ msgstr "Atom"
 msgid "FOAF"
 msgstr "FOAF"
 
+#. TRANS: Feed type name. See http://activitystrea.ms/
+msgid "Activity Streams"
+msgstr "Activity Streams"
+
 #. TRANS: Client exception thrown when an imported feed does not have an author.
 msgid "No author in the feed."
 msgstr "Der Feed hat keinen Autor."
@@ -8556,7 +7834,6 @@ msgid "Feeds"
 msgstr "Feeds"
 
 #. TRANS: List element on gallery action page to show all tags.
-#, fuzzy
 msgctxt "TAGS"
 msgid "All"
 msgstr "Alle"
@@ -8566,7 +7843,6 @@ msgid "Tag"
 msgstr "Tag"
 
 #. TRANS: Dropdown field title on gallery action page for a list containing tags.
-#, fuzzy
 msgid "Choose a tag to narrow list."
 msgstr "Wähle ein Tag, um die Liste einzuschränken"
 
@@ -8575,6 +7851,27 @@ msgstr "Wähle ein Tag, um die Liste einzuschränken"
 msgid "Grant this user the \"%s\" role"
 msgstr "Teile dem Benutzer die „%s“-Rolle zu"
 
+#. TRANS: Header for mini list of group members on a group page (h2).
+msgid "Members"
+msgstr "Mitglieder"
+
+#. TRANS: Link to all group members from mini list of group members if group has more than n members.
+msgid "All members"
+msgstr "Alle Mitglieder"
+
+#. TRANS: Header for mini list of users with a pending membership request on a group page (h2).
+msgid "Pending"
+msgstr "Ausstehend"
+
+#. TRANS: Header for mini list of users that are blocked in a group page (h2).
+msgid "Blocked"
+msgstr "Blockiert"
+
+#. TRANS: Title for list of group administrators on a group page.
+msgctxt "TITLE"
+msgid "Admins"
+msgstr "Admins"
+
 #. TRANS: Button text for the form that will block a user from a group.
 msgctxt "BUTTON"
 msgid "Block"
@@ -8582,25 +7879,25 @@ msgstr "Blockieren"
 
 #. TRANS: Submit button title.
 msgctxt "TOOLTIP"
-msgid "Block this user"
-msgstr "Diesen Benutzer blockieren"
+msgid "Block this user so that they can no longer post messages to it."
+msgstr ""
+"Blockiere diesen Benutzer, so dass er keine Nachrichten mehr schicken kann."
 
 #. TRANS: Field title on group edit form.
 msgid "URL of the homepage or blog of the group or topic."
 msgstr "Adresse der Homepage oder Blogs der Gruppe oder des Themas."
 
 #. TRANS: Text area title for group description when there is no text limit.
-#, fuzzy
 msgid "Describe the group or topic."
-msgstr "Beschreibe die Gruppe oder das Thema"
+msgstr "Beschreibe die Gruppe oder das Thema."
 
 #. TRANS: Text area title for group description.
 #. TRANS: %d is the number of characters available for the description.
-#, fuzzy, php-format
+#, php-format
 msgid "Describe the group or topic in %d character or less."
 msgid_plural "Describe the group or topic in %d characters or less."
-msgstr[0] "Beschreibe die Gruppe oder das Thema in einem Zeichen"
-msgstr[1] "Beschreibe die Gruppe oder das Thema in %d Zeichen"
+msgstr[0] "Beschreibe die Gruppe oder das Thema in %d oder weniger Zeichen"
+msgstr[1] "Beschreibe die Gruppe oder das Thema in %d oder weniger Zeichen"
 
 #. TRANS: Field title on group edit form.
 msgid ""
@@ -8635,68 +7932,13 @@ msgstr ""
 "Nachrichten sind privat."
 
 #. TRANS: Indicator in group members list that this user is a group administrator.
-#, fuzzy
 msgctxt "GROUPADMIN"
 msgid "Admin"
 msgstr "Admin"
 
-#. TRANS: Menu item in the group navigation page.
-msgctxt "MENU"
-msgid "Group"
-msgstr "Gruppe"
-
-#. TRANS: Tooltip for menu item in the group navigation page.
-#. TRANS: %s is the nickname of the group.
-#, php-format
-msgctxt "TOOLTIP"
-msgid "%s group"
-msgstr "%s-Gruppe"
-
-#. TRANS: Menu item in the group navigation page.
-msgctxt "MENU"
-msgid "Members"
-msgstr "Mitglieder"
-
-#. TRANS: Tooltip for menu item in the group navigation page.
-#. TRANS: %s is the nickname of the group.
-#, php-format
-msgctxt "TOOLTIP"
-msgid "%s group members"
-msgstr "%s-Gruppen-Mitglieder"
-
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: %d is the number of pending members.
-#, php-format
-msgctxt "MENU"
-msgid "Pending members (%d)"
-msgid_plural "Pending members (%d)"
-msgstr[0] "Ausstehende Mitglieder (%d)"
-msgstr[1] "Ausstehende Mitglieder (%d)"
-
-#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: %s is the nickname of the group.
-#, fuzzy, php-format
-msgctxt "TOOLTIP"
-msgid "%s pending members"
-msgstr "%s Gruppen-Mitglieder"
-
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-msgctxt "MENU"
-msgid "Blocked"
-msgstr "Blockiert"
-
-#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: %s is the nickname of the group.
-#, php-format
-msgctxt "TOOLTIP"
-msgid "%s blocked users"
-msgstr "Blockierte Benutzer der Gruppe „%s“"
-
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: Menu item in primary navigation panel.
-msgctxt "MENU"
-msgid "Admin"
-msgstr "Admin"
+#. TRANS: Group actions header (h2). Text hidden by default.
+msgid "Group actions"
+msgstr "Gruppenaktionen"
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
@@ -8705,11 +7947,6 @@ msgctxt "TOOLTIP"
 msgid "Edit %s group properties"
 msgstr "%s-Gruppen-Einstellungen bearbeiten"
 
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-msgctxt "MENU"
-msgid "Logo"
-msgstr "Logo"
-
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
 #, php-format
@@ -8717,32 +7954,32 @@ msgctxt "TOOLTIP"
 msgid "Add or edit %s logo"
 msgstr "%s-Logo hinzufügen oder bearbeiten"
 
-#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: %s is the nickname of the group.
-#, php-format
-msgctxt "TOOLTIP"
-msgid "Add or edit %s design"
-msgstr "%s-Design hinzufügen oder bearbeiten"
-
-#. TRANS: Group actions header (h2). Text hidden by default.
-msgid "Group actions"
-msgstr "Gruppenaktionen"
+#. TRANS: Link text for link on user profile.
+msgctxt "MENU"
+msgid "Logo"
+msgstr "Logo"
 
 #. TRANS: Title for groups with the most members section.
-#, fuzzy
 msgid "Popular groups"
-msgstr "Beliebte Nachrichten"
+msgstr "Beliebte Gruppen"
 
 #. TRANS: Title for groups with the most posts section.
-#, fuzzy
 msgid "Active groups"
-msgstr "Alle Gruppen"
+msgstr "Aktive Gruppen"
 
-#. TRANS: Title for group tag cloud section.
-#. TRANS: %s is a group name.
-#, php-format
-msgid "Tags in %s group's notices"
-msgstr "Tags in den Nachrichten der Gruppe „%s“"
+#. TRANS: Link description for seeing all groups.
+#. TRANS: Link description for seeing all lists.
+msgid "See all"
+msgstr "Alle zeigen"
+
+#. TRANS: Link title for seeing all groups.
+msgid "See all groups you belong to."
+msgstr "Alle Gruppen, zu denen du gehörst, ansehen."
+
+#. TRANS: Menu item title in personal group navigation menu.
+#. TRANS: %s is a username.
+msgid "Back to top"
+msgstr "Zurück zum Anfang"
 
 #. TRANS: Client exception 406
 msgid "This page is not available in a media type you accept"
@@ -8832,24 +8069,59 @@ msgctxt "TITLE"
 msgid "Trends"
 msgstr "Trends"
 
-#. TRANS: Button text for inviting more users to the StatusNet instance.
-#, fuzzy
+#. TRANS: Default button text for inviting more users to the StatusNet instance.
 msgctxt "BUTTON"
 msgid "Invite more colleagues"
-msgstr "Lade neue Leute ein"
+msgstr "Mehr Kollegen einladen"
+
+#. TRANS: Form legend.
+msgid "Invite collegues"
+msgstr "Kollegen einladen"
+
+#. TRANS: Field label for a list of e-mail addresses.
+msgid "Email addresses"
+msgstr "E-Mail-Adressen"
+
+#. TRANS: Field title for a list of e-mail addresses.
+msgid "Addresses of friends to invite (one per line)."
+msgstr ""
+"Adressen von Freunden, die du einladen möchtest. (Jeweils eine Adresse pro "
+"Zeile)"
+
+#. TRANS: Field label for a personal message to send to invitees.
+msgid "Personal message"
+msgstr "Private Nachricht"
+
+#. TRANS: Field title for a personal message to send to invitees.
+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."
+
+#. TRANS: Send button for inviting friends
+#. TRANS: Button text for sending notice.
+msgctxt "BUTTON"
+msgid "Send"
+msgstr "Senden"
+
+#. TRANS: Submit button title.
+msgid "Send invitations."
+msgstr "Einladungen senden."
 
 #. TRANS: Button text for joining a group.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Join"
 msgstr "Beitreten"
 
 #. TRANS: Button text on form to leave a group.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Leave"
 msgstr "Verlassen"
 
+#. TRANS: Link title for seeing all lists.
+msgid "See all lists you have created."
+msgstr "Alle Listen, die du erstellt hast"
+
 #. TRANS: Menu item for logging in to the StatusNet site.
 #. TRANS: Menu item in primary navigation panel.
 msgctxt "MENU"
@@ -8910,14 +8182,14 @@ msgstr ""
 #. TRANS: Main body of new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscriber's long name, %2$s is the StatusNet sitename.
 #, php-format
-msgid "%1$s is now listening to your notices on %2$s."
-msgstr "%1$s hat deine Nachrichten auf „%2$s“ abonniert."
+msgid "%1$s is now following you on %2$s."
+msgstr "%1$s folgt dir nun auf %2$s."
 
 #. TRANS: Subject of pending new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscribing user's nickname, %2$s is the StatusNet sitename.
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s would like to listen to your notices on %2$s."
-msgstr "%1$s hat deine Nachrichten auf „%2$s“ abonniert."
+msgstr "%1$s würde gerne deine Nachrichten auf „%2$s“ abonnieren."
 
 #. TRANS: Main body of pending new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscriber's long name, %2$s is the StatusNet sitename.
@@ -8932,7 +8204,7 @@ msgstr ""
 #. TRANS: Common footer block for StatusNet notification emails.
 #. TRANS: %1$s is the StatusNet sitename,
 #. TRANS: %2$s is a link to the addressed user's e-mail settings.
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "Faithfully yours,\n"
 "%1$s.\n"
@@ -8940,23 +8212,18 @@ msgid ""
 "----\n"
 "Change your email address or notification options at %2$s"
 msgstr ""
-"%1$s hat deine Nachrichten auf %2$s abonniert.\n"
-"\n"
-"%3$s\n"
-"\n"
-"%4$s%5$s%6$s\n"
 "Mit freundlichen Grüßen,\n"
-"%2$s.\n"
+"%1$s \n"
 "\n"
 "----\n"
-"Du kannst deine E-Mail-Adresse und die Benachrichtigungseinstellungen auf %7"
-"$s ändern.\n"
+"Du kannst deine E-Mail-Adresse und die Benachrichtigungseinstellungen auf %2"
+"$s ändern."
 
 #. TRANS: Profile info line in notification e-mail.
 #. TRANS: %s is a URL.
-#, fuzzy, php-format
+#, php-format
 msgid "Profile: %s"
-msgstr "Profil"
+msgstr "Profil: %s"
 
 #. TRANS: Profile info line in notification e-mail.
 #. TRANS: %s is biographical information.
@@ -8966,7 +8233,7 @@ msgstr "Biografie: %s"
 
 #. TRANS: This is a paragraph in a new-subscriber e-mail.
 #. TRANS: %s is a URL where the subscriber can be reported as abusive.
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "If you believe this account is being used abusively, you can block them from "
 "your subscribers list and report as spam to site administrators at %s."
@@ -8984,7 +8251,7 @@ msgstr "Neue E-Mail-Adresse, um auf „%s“ zu schreiben"
 #. TRANS: Body of notification mail for new posting email address.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is the e-mail address to send
 #. TRANS: to to post by e-mail, %3$s is a URL to more instructions.
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
 "\n"
@@ -8996,10 +8263,7 @@ msgstr ""
 "\n"
 "Schicke eine E-Mail an %2$s, um eine neue Nachricht hinzuzufügen.\n"
 "\n"
-"Weitere E-Mail-Anweisungen unter %3$s.\n"
-"\n"
-"Viele Grüße,\n"
-"%1$s"
+"Weitere E-Mail-Anweisungen unter %3$s."
 
 #. TRANS: Subject line for SMS-by-email notification messages.
 #. TRANS: %s is the posting user's nickname.
@@ -9021,14 +8285,14 @@ msgstr ""
 
 #. TRANS: Subject for 'nudge' notification email.
 #. TRANS: %s is the nudging user.
-#, fuzzy, php-format
+#, php-format
 msgid "You have been nudged by %s"
 msgstr "Du wurdest von „%s“ angestupst"
 
 #. TRANS: Body for 'nudge' notification email.
 #. TRANS: %1$s is the nuding user's long name, $2$s is the nudging user's nickname,
 #. TRANS: %3$s is a URL to post notices at.
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "%1$s (%2$s) is wondering what you are up to these days and is inviting you "
 "to post some news.\n"
@@ -9046,10 +8310,7 @@ msgstr ""
 "\n"
 "%3$s\n"
 "\n"
-"Antworte nicht auf diese E-Mail, sie wird niemanden erreichen.\n"
-"\n"
-"Mit freundlichen Grüßen,\n"
-"%4$s\n"
+"Antworte nicht auf diese E-Mail, sie wird niemanden erreichen."
 
 #. TRANS: Subject for direct-message notification email.
 #. TRANS: %s is the sending user's nickname.
@@ -9060,7 +8321,7 @@ msgstr "Neue private Nachricht von „%s“"
 #. TRANS: Body for direct-message notification email.
 #. TRANS: %1$s is the sending user's long name, %2$s is the sending user's nickname,
 #. TRANS: %3$s is the message content, %4$s a URL to the message,
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
 "\n"
@@ -9084,10 +8345,7 @@ msgstr ""
 "\n"
 "%4$s\n"
 "\n"
-"Antworte nicht auf diese E-Mail, sie wird niemanden erreichen.\n"
-"\n"
-"Mit freundlichen Grüßen,\n"
-"%5$s\n"
+"Antworte nicht auf diese E-Mail, sie wird niemanden erreichen."
 
 #. TRANS: Subject for favorite notification e-mail.
 #. TRANS: %1$s is the adding user's long name, %2$s is the adding user's nickname.
@@ -9100,7 +8358,7 @@ msgstr "%1$s (@%2$s) hat deine Nachricht als Favorit gespeichert"
 #. TRANS: %3$s is a URL to the faved notice, %4$s is the faved notice text,
 #. TRANS: %5$s is a URL to all faves of the adding user, %6$s is the StatusNet sitename,
 #. TRANS: %7$s is the adding user's nickname.
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
 "\n"
@@ -9121,11 +8379,8 @@ msgstr ""
 "%3$s\n"
 "Der Text der Nachricht ist:\n"
 "%4$s\n"
-"Die Favoritenliste von %1$s ist hier:\n"
-"%5$s\n"
-"\n"
-"Gruß,\n"
-"%6$s\n"
+"Die Favoritenliste von %1$s ist hier einsehbar:\n"
+"%5$s"
 
 #. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
 #, php-format
@@ -9149,9 +8404,9 @@ msgstr ""
 #. TRANS: Body of @-reply notification e-mail.
 #. TRANS: %1$s is the sending user's name, $2$s is the StatusNet sitename,
 #. TRANS: %3$s is a URL to the notice, %4$s is the notice text,
-#. TRANS: %5$s is a URL to the full conversion if it exists (otherwise empty),
+#. TRANS: %5$s is the text "The full conversation can be read here:" and a URL to the full conversion if it exists (otherwise empty),
 #. TRANS: %6$s is a URL to reply to the notice, %7$s is a URL to all @-replies for the addressed user,
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "%1$s just sent a notice to your attention (an '@-reply') on %2$s.\n"
 "\n"
@@ -9171,8 +8426,7 @@ msgid ""
 "\n"
 "%7$s"
 msgstr ""
-"%1$s (@%9$s) hat dir gerade eine Nachricht (eine „@-Antwort“) auf „%2$s“ "
-"gesendet.\n"
+"%1$s hat dir gerade eine Nachricht (eine „@-Antwort“) auf „%2$s“ gesendet.\n"
 "\n"
 "Die Nachricht findest du hier:\n"
 "\n"
@@ -9188,28 +8442,27 @@ msgstr ""
 "\n"
 "Eine Liste aller @-Antworten an dich findest du hier:\n"
 "\n"
-"%7$s\n"
-"\n"
-"Hochachtungsvoll dein,\n"
-"%2$s\n"
-"\n"
-"P.S. Diese E-Mail Benachrichtigung kannst du hier deaktivieren: %8$s\n"
+"%7$s"
 
 #. TRANS: Subject of group join notification e-mail.
 #. TRANS: %1$s is the joining user's nickname, %2$s is the group name, and %3$s is the StatusNet sitename.
+#, php-format
+msgid "%1$s has joined your group %2$s on %3$s"
+msgstr "%1$s ist deiner Gruppe „%2$s“ auf %3$s beigetreten"
+
 #. TRANS: Main body of group join notification e-mail.
 #. TRANS: %1$s is the subscriber's long name, %2$s is the group name, and %3$s is the StatusNet sitename,
 #. TRANS: %4$s is a block of profile info about the subscriber.
 #. TRANS: %5$s is a link to the addressed user's e-mail settings.
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s has joined your group %2$s on %3$s."
-msgstr "%1$s ist der Gruppe „%2$s“ beigetreten."
+msgstr "%1$s ist deiner Gruppe „%2$s“ auf %3$s beigetreten."
 
 #. TRANS: Subject of pending group join request notification e-mail.
 #. TRANS: %1$s is the joining user's nickname, %2$s is the group name, and %3$s is the StatusNet sitename.
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s wants to join your group %2$s on %3$s."
-msgstr "%1$s ist der Gruppe „%2$s“ beigetreten."
+msgstr "%1$s will deiner Gruppe „%2$s“ auf %3$s beitreten."
 
 #. TRANS: Main body of pending group join request notification e-mail.
 #. TRANS: %1$s is the subscriber's long name, %2$s is the group name, and %3$s is the StatusNet sitename,
@@ -9241,20 +8494,17 @@ msgid "Inbox"
 msgstr "Posteingang"
 
 #. TRANS: Menu item title in mailbox menu. Leads to incoming private messages.
-#, fuzzy
 msgid "Your incoming messages."
-msgstr "Deine eingehenden Nachrichten"
+msgstr "Deine eingehenden Nachrichten."
 
 #. TRANS: Menu item in mailbox menu. Leads to outgoing private messages.
-#, fuzzy
 msgctxt "MENU"
 msgid "Outbox"
 msgstr "Postausgang"
 
 #. TRANS: Menu item title in mailbox menu. Leads to outgoing private messages.
-#, fuzzy
 msgid "Your sent messages."
-msgstr "Deine gesendeten Nachrichten"
+msgstr "Deine gesendeten Nachrichten."
 
 #. TRANS: Error message in incoming mail handler used when an incoming e-mail cannot be processed.
 msgid "Could not parse message."
@@ -9274,7 +8524,7 @@ msgstr "Sorry, keine eingehenden E-Mails gestattet."
 
 #. TRANS: Error message in incoming mail handler used when an incoming e-mail is of an unsupported type.
 #. TRANS: %s is the unsupported type.
-#, fuzzy, php-format
+#, php-format
 msgid "Unsupported message type: %s."
 msgstr "Nachrichten-Typ „%s“ wird nicht unterstützt."
 
@@ -9289,7 +8539,7 @@ msgstr "Zum Admin ernennen"
 
 #. TRANS: Submit button title.
 msgctxt "TOOLTIP"
-msgid "Make this user an admin"
+msgid "Make this user an admin."
 msgstr "Diesen Benutzer zum Admin ernennen"
 
 #. TRANS: Client exception thrown when a database error was thrown during a file upload operation.
@@ -9339,10 +8589,9 @@ msgstr "Versende eine direkte Nachricht"
 msgid "Select recipient:"
 msgstr "Empfänger auswählen"
 
-#. TRANS Entry in drop-down selection box in direct-message inbox/outbox when no one is available to message.
-#, fuzzy
+#. TRANS: Entry in drop-down selection box in direct-message inbox/outbox when no one is available to message.
 msgid "No mutual subscribers."
-msgstr "Nicht abonniert!"
+msgstr "Keine gegenseitigen Abonnenten."
 
 #. TRANS: Dropdown label in direct notice form.
 msgid "To"
@@ -9354,9 +8603,8 @@ msgid "Send"
 msgstr "Senden"
 
 #. TRANS: Header in message list.
-#, fuzzy
 msgid "Messages"
-msgstr "Nachricht"
+msgstr "Nachrichten"
 
 #. TRANS: Followed by notice source (usually the client used to send the notice).
 #. TRANS: Followed by notice source.
@@ -9364,7 +8612,6 @@ msgid "from"
 msgstr "von"
 
 #. TRANS: A possible notice source (web interface).
-#, fuzzy
 msgctxt "SOURCE"
 msgid "web"
 msgstr "Web"
@@ -9375,7 +8622,6 @@ msgid "xmpp"
 msgstr "XMPP"
 
 #. TRANS: A possible notice source (e-mail).
-#, fuzzy
 msgctxt "SOURCE"
 msgid "mail"
 msgstr "E-Mail"
@@ -9395,14 +8641,12 @@ msgid "Cannot get author for activity."
 msgstr "Für diese Aktivität ist kein Autor verfügbar."
 
 #. TRANS: Client exception thrown when ...
-#, fuzzy
 msgid "Bookmark not posted to this group."
-msgstr "Du darfst diese Gruppe nicht löschen."
+msgstr "Lesezeichen an diese Gruppe nicht gepostet."
 
 #. TRANS: Client exception when ...
-#, fuzzy
 msgid "Object not posted to this user."
-msgstr "Diesen Benutzer nicht löschen"
+msgstr "Objekt an diesen Benutzer nicht gepostet."
 
 #. TRANS: Server exception thrown when a micro app plugin uses a target that cannot be handled.
 msgid "Do not know how to handle this kind of target."
@@ -9413,6 +8657,10 @@ msgid "You must implement either adaptNoticeListItem() or showNotice()."
 msgstr ""
 "Du musst entweder adaptNoticeListItem() oder showNotice() implementieren."
 
+#. TRANS: Link description to show more items in a list.
+msgid "More â–¼"
+msgstr "Mehr â–¼"
+
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 msgid "Nickname cannot be empty."
 msgstr "Benutzername darf nicht leer sein."
@@ -9438,9 +8686,8 @@ msgid "Attach"
 msgstr "Anhängen"
 
 #. TRANS: Title for input field to attach a file to a notice.
-#, fuzzy
 msgid "Attach a file."
-msgstr "Datei anhängen"
+msgstr "Datei anhängen."
 
 #. TRANS: Field label to add location to a notice.
 msgid "Share my location"
@@ -9463,10 +8710,6 @@ msgctxt "SEPARATOR"
 msgid ", "
 msgstr ", "
 
-#. TRANS: Start of profile addressees list.
-msgid " â–¸ "
-msgstr " â–¸ "
-
 #. TRANS: Used in coordinates as abbreviation of north.
 msgid "N"
 msgstr "N"
@@ -9505,21 +8748,20 @@ msgid "Repeated by"
 msgstr "Wiederholt von"
 
 #. TRANS: Link title in notice list item to reply to a notice.
-msgid "Reply to this notice"
-msgstr "Auf diese Nachricht antworten"
+msgid "Reply to this notice."
+msgstr "Auf diese Nachricht antworten."
 
 #. TRANS: Link text in notice list item to reply to a notice.
 msgid "Reply"
 msgstr "Antworten"
 
 #. TRANS: Link title in notice list item to delete a notice.
-msgid "Delete this notice"
-msgstr "Nachricht löschen"
+msgid "Delete this notice from the timeline."
+msgstr "Diese Nachricht aus der Zeitleiste löschen."
 
 #. TRANS: Title for repeat form status in notice list when a notice has been repeated.
-#, fuzzy
 msgid "Notice repeated."
-msgstr "Nachricht wiederholt"
+msgstr "Nachricht wiederholt."
 
 #. TRANS: Field label for notice text.
 msgid "Update your status..."
@@ -9530,172 +8772,129 @@ msgid "Nudge this user"
 msgstr "Gib diesem Benutzer einen Stups"
 
 #. TRANS: Button text to nudge/ping another user.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Nudge"
 msgstr "Stups"
 
 #. TRANS: Button title to nudge/ping another user.
-#, fuzzy
 msgid "Send a nudge to this user."
-msgstr "Sende diesem Benutzer einen Stups"
-
-#. TRANS: Exception thrown when creating a new profile fails in OAuth store.
-msgid "Error inserting new profile."
-msgstr "Neues Profil konnte nicht angelegt werden."
-
-#. TRANS: Exception thrown when creating a new avatar fails in OAuth store.
-msgid "Error inserting avatar."
-msgstr "Fehler beim Einfügen des Avatars."
-
-#. TRANS: Exception thrown when creating a remote profile fails in OAuth store.
-msgid "Error inserting remote profile."
-msgstr "Fehler beim Einfügen des entfernten Profils."
-
-#. TRANS: Exception thrown when a notice is denied because it has been sent before.
-msgid "Duplicate notice."
-msgstr "Doppelte Nachricht."
-
-#. TRANS: Exception thrown when creating a new subscription fails in OAuth store.
-#, fuzzy
-msgid "Could not insert new subscription."
-msgstr "Konnte neues Abonnement nicht eintragen."
+msgstr "Sende diesem Benutzer einen Stups."
 
 #. TRANS: Server exception thrown in oEmbed action if no API endpoint is available.
-#, fuzzy
 msgid "No oEmbed API endpoint available."
-msgstr "IM ist nicht verfügbar."
+msgstr "Kein oEmbed-API-Endpunkt verfügbar."
 
 #. TRANS: Field label for list.
-#, fuzzy
 msgctxt "LABEL"
 msgid "List"
-msgstr "Links"
+msgstr "Liste"
 
 #. TRANS: Field title for list.
-#, fuzzy
 msgid "Change the list (letters, numbers, -, ., and _ are allowed)."
-msgstr ""
-"Tags dieses Benutzers (Buchstaben, Nummer, -, ., und _), durch Komma oder "
-"Leerzeichen getrennt"
+msgstr "Liste ändern (Buchstaben, Zahlen, -, ., und _ sind erlaubt)."
 
 #. TRANS: Field title for description of list.
-#, fuzzy
 msgid "Describe the list or topic."
-msgstr "Beschreibe die Gruppe oder das Thema"
+msgstr "Beschreibe die Liste oder das Thema"
 
 #. TRANS: Field title for description of list.
 #. TRANS: %d is the maximum number of characters for the description.
-#, fuzzy, php-format
+#, php-format
 msgid "Describe the list or topic in %d character."
 msgid_plural "Describe the list or topic in %d characters."
 msgstr[0] "Beschreibe die Gruppe oder das Thema in einem Zeichen"
 msgstr[1] "Beschreibe die Gruppe oder das Thema in %d Zeichen"
 
 #. TRANS: Button title to delete a list.
-#, fuzzy
 msgid "Delete this list."
-msgstr "Diesen Benutzer löschen."
+msgstr "Diese Liste löschen."
 
 #. TRANS: Header in list edit form.
 msgid "Add or remove people"
 msgstr "Personen hinzufügen oder entfernen"
 
 #. TRANS: Header in list edit form.
-#, fuzzy
 msgctxt "HEADER"
 msgid "Search"
 msgstr "Suchen"
 
 #. TRANS: Menu item in list navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "List"
-msgstr "Links"
+msgstr "Liste"
 
 #. TRANS: Menu item title in list navigation panel.
 #. TRANS: %1$s is a list, %2$s is a nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s list by %2$s."
-msgstr "%1$s – %2$s"
+msgstr "%1$s Liste von %2$s."
 
 #. TRANS: Menu item in list navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Listed"
-msgstr "Lizenz"
+msgstr "Hinzugefügt"
 
 #. TRANS: Menu item in list navigation panel.
 #. TRANS: Menu item in local navigation menu.
-#, fuzzy
 msgctxt "MENU"
 msgid "Subscribers"
 msgstr "Abonnenten"
 
 #. TRANS: Menu item title in list navigation panel.
 #. TRANS: %1$s is a list, %2$s is a nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "Subscribers to %1$s list by %2$s."
-msgstr "%s abboniert."
+msgstr "Abonnenten der %1$s Liste von %2$s."
 
 #. TRANS: Menu item in list navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Edit"
 msgstr "Bearbeiten"
 
 #. TRANS: Menu item title in list navigation panel.
 #. TRANS: %s is a list.
-#, fuzzy, php-format
+#, php-format
 msgid "Edit %s list by you."
-msgstr "Gruppe %s bearbeiten"
-
-#. TRANS: Link description for link to list of users tagged with a tag.
-#, fuzzy
-msgid "Tagged"
-msgstr "Tag"
+msgstr "Liste %s bearbeiten"
 
 #. TRANS: Title for link to edit list settings.
-#, fuzzy
 msgid "Edit list settings."
-msgstr "Profil-Einstellungen ändern"
+msgstr "Listen-Einstellungen ändern."
 
 #. TRANS: Text for link to edit list settings.
 msgid "Edit"
 msgstr "Bearbeiten"
 
 #. TRANS: Privacy mode text in list list item for private list.
-#, fuzzy
 msgctxt "MODE"
 msgid "Private"
 msgstr "Privat"
 
 #. TRANS: Menu item in the group navigation page.
-#, fuzzy
 msgctxt "MENU"
 msgid "List Subscriptions"
-msgstr "Abonnements"
+msgstr "Listen-Abonnements"
 
 #. TRANS: Tooltip for menu item in the group navigation page.
 #. TRANS: %s is a user nickname.
-#, fuzzy, php-format
+#, php-format
 msgctxt "TOOLTIP"
 msgid "Lists subscribed to by %s."
-msgstr "%s abboniert."
+msgstr "Von %s abonnierte Listen."
 
 #. TRANS: Menu item in the group navigation page.
 #. TRANS: %s is a user nickname.
-#, fuzzy, php-format
+#, php-format
 msgctxt "MENU"
 msgid "Lists with %s"
-msgstr "Aktualisierungen mit „%s“"
+msgstr "Listen mit „%s“"
 
 #. TRANS: Tooltip for menu item in the group navigation page.
 #. TRANS: %s is a user nickname.
-#, fuzzy, php-format
+#, php-format
 msgctxt "TOOLTIP"
 msgid "Lists with %s."
-msgstr "Aktualisierungen mit „%s“"
+msgstr "Listen mit „%s“."
 
 #. TRANS: Menu item in the group navigation page.
 #. TRANS: %s is a user nickname.
@@ -9706,92 +8905,81 @@ msgstr "Listen von %s"
 
 #. TRANS: Tooltip for menu item in the group navigation page.
 #. TRANS: %s is a user nickname.
-#, fuzzy, php-format
+#, php-format
 msgctxt "TOOLTIP"
 msgid "Lists by %s."
-msgstr "%1$s – %2$s"
+msgstr "Listen von %s."
 
 #. TRANS: Label in lists widget.
-#, fuzzy
 msgctxt "LABEL"
 msgid "Your lists"
-msgstr "Beliebte Nachrichten"
+msgstr "Deine Listen"
 
 #. TRANS: Fieldset legend in lists widget.
-#, fuzzy
 msgctxt "LEGEND"
 msgid "Edit lists"
-msgstr "Ungültiger Personen-Tag: „%s“."
+msgstr "Listen bearbeiten"
 
 #. TRANS: Label in self tags widget.
-#, fuzzy
 msgctxt "LABEL"
 msgid "Tags"
 msgstr "Tags"
 
 #. TRANS: Title for section contaning lists with the most subscribers.
-#, fuzzy
 msgid "Popular lists"
-msgstr "Beliebte Nachrichten"
+msgstr "Beliebte Listen"
 
 #. TRANS: List summary. %1$d is the number of users in the list,
 #. TRANS: %2$d is the number of subscribers to the list.
-#, fuzzy, php-format
+#, php-format
 msgid "Listed: %1$d Subscribers: %2$d"
-msgstr "%1$s Abonnenten, Seite %2$d"
+msgstr "Gelistet: %1$d Abonnenten: %2$d"
 
 #. TRANS: Title for page that displays which lists current user is part of.
-#, fuzzy, php-format
+#, php-format
 msgid "Lists with you"
-msgstr "API-Methode nicht gefunden."
+msgstr "Listen mit dir"
 
 #. TRANS: Title for page that displays which lists a user is part of.
 #. TRANS: %s is a profile name.
-#, fuzzy, php-format
+#, php-format
 msgid "Lists with %s"
-msgstr "Aktualisierungen mit „%s“"
+msgstr "Listen mit „%s“"
 
 #. TRANS: Title for page that displays lists a user has subscribed to.
-#, fuzzy
 msgid "List subscriptions"
-msgstr "%s Abonnements"
+msgstr "Listen-Abonnements"
 
 #. TRANS: Menu item in personal group navigation menu.
 #. TRANS: Menu item in settings navigation panel.
 #. TRANS: Menu item in local navigation menu.
-#, fuzzy
 msgctxt "MENU"
 msgid "Profile"
 msgstr "Profil"
 
 #. TRANS: Menu item title in personal group navigation menu.
-#, fuzzy
 msgid "Your profile"
-msgstr "Gruppenprofil"
+msgstr "Dein Profil"
 
 #. TRANS: Menu item in personal group navigation menu.
-#, fuzzy
 msgctxt "MENU"
 msgid "Replies"
 msgstr "Antworten"
 
 #. TRANS: Menu item in personal group navigation menu.
-#, fuzzy
 msgctxt "MENU"
 msgid "Favorites"
 msgstr "Favoriten"
 
 #. TRANS: Replaces %s in '%s\'s favorite notices'. (Yes, we know we need to fix this.)
-#, fuzzy
 msgctxt "FIXME"
 msgid "User"
 msgstr "Benutzer"
 
 #. TRANS: Menu item in personal group navigation menu.
-#, fuzzy
 msgctxt "MENU"
 msgid "Messages"
-msgstr "Nachricht"
+msgstr "Nachrichten"
 
 #. TRANS: Menu item title in personal group navigation menu.
 msgid "Your incoming messages"
@@ -9811,25 +8999,31 @@ msgctxt "plugin"
 msgid "Enable"
 msgstr "Aktivieren"
 
+#. TRANS: Plugin description for a disabled plugin.
 msgctxt "plugin-description"
-msgid "(Plugin descriptions unavailable when disabled.)"
-msgstr "(Plugin Beschreibung nicht verfügbar wenn deaktiviert.)"
+msgid ""
+"(The plugin description is unavailable when a plugin has been disabled.)"
+msgstr ""
+"(Die Plugin-Beschreibung ist nicht verfügbar, wenn ein Plugin deaktiviert "
+"wurde.)"
 
 #. TRANS: Menu item in primary navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Settings"
-msgstr "SMS-Einstellungen"
+msgstr "Einstellungen"
 
 #. TRANS: Menu item title in primary navigation panel.
-#, fuzzy
 msgid "Change your personal settings."
-msgstr "Ändern der Profileinstellungen"
+msgstr "Persönliche Einstellungen ändern."
+
+#. TRANS: Menu item in primary navigation panel.
+msgctxt "MENU"
+msgid "Admin"
+msgstr "Admin"
 
 #. TRANS: Menu item title in primary navigation panel.
-#, fuzzy
 msgid "Site configuration."
-msgstr "Benutzereinstellung"
+msgstr "Site-Konfiguration."
 
 #. TRANS: Menu item in primary navigation panel.
 msgctxt "MENU"
@@ -9837,47 +9031,36 @@ msgid "Logout"
 msgstr "Abmelden"
 
 #. TRANS: Menu item title in primary navigation panel.
-#, fuzzy
 msgid "Logout from the site."
-msgstr "Von der Seite abmelden"
+msgstr "Von der Seite abmelden."
 
 #. TRANS: Menu item title in primary navigation panel.
-#, fuzzy
 msgid "Login to the site."
-msgstr "Auf der Seite anmelden"
+msgstr "Auf der Seite anmelden."
 
-#. TRANS: Menu item in primary navigation panel.
-msgctxt "MENU"
-msgid "Search"
-msgstr "Suchen"
-
-#. TRANS: Menu item title in primary navigation panel.
-#, fuzzy
-msgid "Search the site."
-msgstr "Website durchsuchen"
+msgid "This profile has been silenced by site moderators"
+msgstr "Dieses Profil wurde von Website-Moderatoren verstummt"
 
 #. TRANS: H2 text for user subscription statistics.
-#, fuzzy
 msgid "Following"
-msgstr "Folgen"
+msgstr "Folgend"
 
 #. TRANS: H2 text for user subscriber statistics.
-#, fuzzy
 msgid "Followers"
-msgstr "Folgen"
+msgstr "Folgende"
+
+#. TRANS: H2 text for user statistics.
+msgid "Statistics"
+msgstr "Statistik"
 
 #. TRANS: Label for user statistics.
 msgid "User ID"
-msgstr "Benutzer-ID"
+msgstr "Benutzerkennung"
 
 #. TRANS: Label for user statistics.
 msgid "Member since"
 msgstr "Mitglied seit"
 
-#. TRANS: Label for user statistics.
-msgid "Notices"
-msgstr "Nachrichten"
-
 #. TRANS: Label for user statistics.
 #. TRANS: Average count of posts made per day since account registration.
 msgid "Daily average"
@@ -9888,9 +9071,8 @@ msgid "Groups"
 msgstr "Gruppen"
 
 #. TRANS: H2 text for user list membership statistics.
-#, fuzzy
 msgid "Lists"
-msgstr "Limit"
+msgstr "Listen"
 
 #. TRANS: Server error displayed when using an unimplemented method.
 msgid "Unimplemented method."
@@ -9901,7 +9083,6 @@ msgid "User groups"
 msgstr "Benutzer-Gruppen"
 
 #. TRANS: Menu item in search group navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Recent tags"
 msgstr "Aktuelle Tags"
@@ -9911,16 +9092,14 @@ msgid "Recent tags"
 msgstr "Aktuelle Tags"
 
 #. TRANS: Menu item in search group navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Featured"
-msgstr "Beliebte Benutzer"
+msgstr "Präsentiert"
 
 #. TRANS: Menu item in search group navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Popular"
-msgstr "Beliebte Beiträge"
+msgstr "Beliebt"
 
 #. TRANS: Title for inbox tag cloud section.
 msgctxt "TITLE"
@@ -9936,7 +9115,6 @@ msgid "Repeat this notice?"
 msgstr "Diese Nachricht wiederholen?"
 
 #. TRANS: Button title to repeat a notice on notice repeat form.
-#, fuzzy
 msgid "Repeat this notice."
 msgstr "Diese Nachricht wiederholen"
 
@@ -9950,7 +9128,6 @@ msgid "Page not found."
 msgstr "Seite nicht gefunden."
 
 #. TRANS: Title of form to sandbox a user.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Sandbox"
 msgstr "Spielwiese"
@@ -9969,13 +9146,13 @@ msgid "Keyword(s)"
 msgstr "Suchbegriffe"
 
 #. TRANS: Button text for searching site.
+#. TRANS: Button text for search button on search form.
 #. TRANS: Button text to search profiles.
 msgctxt "BUTTON"
 msgid "Search"
 msgstr "Suchen"
 
 #. TRANS: Standard search suggestions shown when a search does not give any results.
-#, fuzzy
 msgid ""
 "* Make sure all words are spelled correctly.\n"
 "* Try different keywords.\n"
@@ -9985,10 +9162,10 @@ msgstr ""
 "* Stelle sicher, dass alle Worte richtig geschrieben sind.\n"
 "* Versuche andere Schlüsselwörter zu benutzen.\n"
 "* Versuche allgemeinere Schlüsselwörter zu benutzen.\n"
-"* Versuche weniger Schlüsselwörter zu benutzen.\n"
+"* Versuche weniger Schlüsselwörter zu benutzen."
 
 #. TRANS: Standard search suggestions shown when a search does not give any results.
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "You can also try your search on other engines:\n"
 "\n"
@@ -10006,10 +9183,9 @@ msgstr ""
 "* [Tweet scan](http://www.tweetscan.com/indexi.php?s=%s)\n"
 "* [Google](http://www.google.com/search?q=site%%3A%%%%site.server%%%%+%s)\n"
 "* [Yahoo](http://search.yahoo.com/search?p=site%%3A%%%%site.server%%%%+%s)\n"
-"* [Collecta](http://collecta.com/#q=%s)\n"
+"* [Collecta](http://collecta.com/#q=%s)"
 
 #. TRANS: Menu item in search group navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "People"
 msgstr "Leute"
@@ -10019,7 +9195,6 @@ msgid "Find people on this site"
 msgstr "Finde Leute auf dieser Seite"
 
 #. TRANS: Menu item in search group navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Notices"
 msgstr "Nachrichten"
@@ -10032,60 +9207,26 @@ msgstr "Durchsuche den Inhalt der Nachrichten"
 msgid "Find groups on this site"
 msgstr "Finde Gruppen auf dieser Seite"
 
-#. TRANS: Secondary navigation menu item leading to help on StatusNet.
-msgctxt "MENU"
-msgid "Help"
-msgstr "Hilfe"
-
-#. TRANS: Secondary navigation menu item leading to text about StatusNet site.
-#, fuzzy
-msgctxt "MENU"
-msgid "About"
-msgstr "Ãœber"
-
-#. TRANS: Secondary navigation menu item leading to Frequently Asked Questions.
-#, fuzzy
-msgctxt "MENU"
-msgid "FAQ"
-msgstr "FAQ"
-
 #. TRANS: Secondary navigation menu item leading to Terms of Service.
-#, fuzzy
 msgctxt "MENU"
 msgid "TOS"
 msgstr "AGB"
 
 #. TRANS: Secondary navigation menu item leading to privacy policy.
-#, fuzzy
 msgctxt "MENU"
 msgid "Privacy"
 msgstr "Privatsphäre"
 
 #. TRANS: Secondary navigation menu item. Leads to information about StatusNet and its license.
-#, fuzzy
 msgctxt "MENU"
 msgid "Source"
 msgstr "Quellcode"
 
 #. TRANS: Secondary navigation menu item leading to version information on the StatusNet site.
-#, fuzzy
 msgctxt "MENU"
 msgid "Version"
 msgstr "Version"
 
-#. TRANS: Secondary navigation menu item leading to e-mail contact information on the
-#. TRANS: StatusNet site, where to report bugs, ...
-#, fuzzy
-msgctxt "MENU"
-msgid "Contact"
-msgstr "Kontakt"
-
-#. TRANS: Secondary navigation menu item. Leads to information about embedding a timeline widget.
-#, fuzzy
-msgctxt "MENU"
-msgid "Badge"
-msgstr "Plakette"
-
 #. TRANS: Default title for section/sidebar widget.
 msgid "Untitled section"
 msgstr "Abschnitt ohne Titel"
@@ -10095,17 +9236,15 @@ msgid "More..."
 msgstr "Mehr …"
 
 #. TRANS: Header in settings navigation panel.
-#, fuzzy
 msgctxt "HEADER"
 msgid "Settings"
-msgstr "SMS-Einstellungen"
+msgstr "Einstellungen"
 
 #. TRANS: Menu item title in settings navigation panel.
 msgid "Change your profile settings"
 msgstr "Ändern der Profileinstellungen"
 
 #. TRANS: Menu item in settings navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Avatar"
 msgstr "Avatar"
@@ -10115,7 +9254,6 @@ msgid "Upload an avatar"
 msgstr "Avatar hochladen"
 
 #. TRANS: Menu item in settings navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Password"
 msgstr "Passwort"
@@ -10125,7 +9263,6 @@ msgid "Change your password"
 msgstr "Ändere dein Passwort"
 
 #. TRANS: Menu item in settings navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Email"
 msgstr "E-Mail"
@@ -10134,12 +9271,7 @@ msgstr "E-Mail"
 msgid "Change email handling"
 msgstr "Ändere die E-Mail-Verarbeitung"
 
-#. TRANS: Menu item title in settings navigation panel.
-msgid "Design your profile"
-msgstr "Passe dein Profil an"
-
 #. TRANS: Menu item in settings navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "URL"
 msgstr "URL"
@@ -10175,8 +9307,16 @@ msgstr "Verbindungen"
 msgid "Authorized connected applications"
 msgstr "Programme mit Zugriffserlaubnis"
 
+#. TRANS: Menu item in settings navigation panel.
+msgctxt "MENU"
+msgid "Old school"
+msgstr "Alte Schule"
+
+#. TRANS: Menu item title in settings navigation panel.
+msgid "UI tweaks for old-school users"
+msgstr "UI-Tweaks für Old-School-User"
+
 #. TRANS: Title of form to silence a user.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Silence"
 msgstr "Stummschalten"
@@ -10185,23 +9325,55 @@ msgstr "Stummschalten"
 msgid "Silence this user"
 msgstr "Benutzer verstummen lassen"
 
+#. TRANS: Server error displayed when trying to create an anynymous OAuth consumer.
+msgid "Could not create anonymous consumer."
+msgstr "Anonymer Zugang konnte nicht erstellt werden"
+
+#. TRANS: Server error displayed when trying to create an anynymous OAuth application.
+msgid "Could not create anonymous OAuth application."
+msgstr "Anonyme OAuth-Anwendung konnte nicht erstellt werden."
+
+#. TRANS: Exception thrown when no token association could be found.
+msgid ""
+"Could not find a profile and application associated with the request token."
+msgstr "Konnte kein Profil und Anwendung für das Anfrage-Token finden."
+
+#. TRANS: Exception thrown when no access token can be issued.
+msgid "Could not issue access token."
+msgstr "Zugangs-Token konnte nicht ausgestellt werden."
+
+#. TRANS: Exception thrown when a database error occurs.
+msgid "Database error inserting OAuth application user."
+msgstr "Datenbankfehler beim Einfügen des OAuth-Programm-Benutzers."
+
+#. TRANS: Exception thrown when a database error occurs.
+msgid "Database error updating OAuth application user."
+msgstr "Datenbankfehler beim Aktualisieren des OAuth-Programm-Benutzers."
+
+#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
+msgid "Tried to revoke unknown token."
+msgstr "Versuchte, unbekanntes Token ungültig zu machen."
+
+#. TRANS: Exception thrown when an attempt is made to remove a revoked token.
+msgid "Failed to delete revoked token."
+msgstr "Konnte ungültig gemachtes Token nicht löschen."
+
 #. TRANS: Menu item in local navigation menu.
-#, fuzzy
 msgctxt "MENU"
 msgid "Subscriptions"
 msgstr "Abonnements"
 
 #. TRANS: Menu item title in local navigation menu.
 #. TRANS: %s is a user nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "People %s subscribes to."
 msgstr "Leute, die „%s“ abonniert hat"
 
 #. TRANS: Menu item title in local navigation menu.
 #. TRANS: %s is a user nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "People subscribed to %s."
-msgstr "Leute, die „%s“ abonniert haben"
+msgstr "Leute, die „%s“ abonniert haben."
 
 #. TRANS: Menu item in local navigation menu.
 #. TRANS: %d is the number of pending subscription requests.
@@ -10217,15 +9389,15 @@ msgstr "Ausstehende Abonnementanforderungen annehmen."
 
 #. TRANS: Menu item title in local navigation menu.
 #. TRANS: %s is a user nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "Groups %s is a member of."
-msgstr "Gruppen, in denen „%s“ Mitglied ist"
+msgstr "Gruppen, in denen „%s“ Mitglied ist."
 
 #. TRANS: Menu item title in local navigation menu.
 #. TRANS: %s is a user nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "List subscriptions by %s."
-msgstr "Leute, die „%s“ abonniert haben"
+msgstr "Listen-Abonnements von %s ."
 
 #. TRANS: Menu item in local navigation menu.
 msgctxt "MENU"
@@ -10234,14 +9406,24 @@ msgstr "Einladen"
 
 #. TRANS: Menu item title in local navigation menu.
 #. TRANS: %s is the StatusNet sitename.
-#, fuzzy, php-format
+#, php-format
 msgid "Invite friends and colleagues to join you on %s."
-msgstr "Lade Freunde und Kollegen ein, dir auf „%s“ zu folgen"
+msgstr "Lade Freunde und Kollegen ein, sich dir auf „%s“ anzuschließen."
 
 #. TRANS: Form of form to subscribe to a user.
 msgid "Subscribe to this user"
 msgstr "Abonniere diesen Benutzer"
 
+#. TRANS: Button text to subscribe to a user.
+#. TRANS: Button text for subscribing to a list.
+msgctxt "BUTTON"
+msgid "Subscribe"
+msgstr "Abonnieren"
+
+#. TRANS: Button title to subscribe to a user.
+msgid "Subscribe to this user."
+msgstr "Abonniere diesen Benutzer."
+
 #. TRANS: Title of personal tag cloud section.
 msgid "People Tagcloud as self-tagged"
 msgstr "Personen-Tagwolke, wie man sich selbst markiert hat."
@@ -10251,7 +9433,6 @@ msgid "People Tagcloud as tagged"
 msgstr "Personen-Tag, wie markiert wurde"
 
 #. TRANS: Content displayed in a tag cloud section if there are no tags.
-#, fuzzy
 msgctxt "NOTAGS"
 msgid "None"
 msgstr "Nichts"
@@ -10275,7 +9456,6 @@ msgid "Failed saving theme."
 msgstr "Speicherung des Themes fehlgeschlagen."
 
 #. TRANS: Server exception thrown when an uploaded theme has an incorrect structure.
-#, fuzzy
 msgid "Invalid theme: Bad directory structure."
 msgstr "Ungültiger Theme: schlechte Ordner-Struktur."
 
@@ -10293,9 +9473,8 @@ msgstr[1] ""
 "sein."
 
 #. TRANS: Server exception thrown when an uploaded theme is incomplete.
-#, fuzzy
 msgid "Invalid theme archive: Missing file css/display.css"
-msgstr "Ungültigges Theme-Archiv: fehlende Datei css/display.css"
+msgstr "Ungültiges Theme-Archiv: fehlende Datei css/display.css"
 
 #. TRANS: Server exception thrown when an uploaded theme has an incorrect file or folder name.
 msgid ""
@@ -10311,27 +9490,26 @@ msgstr "Theme enthält unsichere Dateierweiterungen; könnte unsicher sein."
 
 #. TRANS: Server exception thrown when an uploaded theme contains a file type that is not allowed.
 #. TRANS: %s is the file type that is not allowed.
-#, fuzzy, php-format
+#, php-format
 msgid "Theme contains file of type \".%s\", which is not allowed."
-msgstr "Das Theme enthält Dateien des Types „.%s“, die nicht erlaubt sind."
+msgstr "Das Theme enthält Dateien des Typs „.%s“, was nicht erlaubt ist."
 
 #. TRANS: Server exception thrown when an uploaded compressed theme cannot be opened.
 msgid "Error opening theme archive."
 msgstr "Fehler beim Öffnen des Theme-Archives."
 
 #. TRANS: Header for Notices section.
-#, fuzzy
 msgctxt "HEADER"
 msgid "Notices"
 msgstr "Nachrichten"
 
 #. TRANS: Link to show replies for a notice.
 #. TRANS: %d is the number of replies to a notice and used for plural.
-#, fuzzy, php-format
+#, php-format
 msgid "Show reply"
 msgid_plural "Show all %d replies"
-msgstr[0] "Mehr anzeigen"
-msgstr[1] "Mehr anzeigen"
+msgstr[0] "Antwort anzeigen"
+msgstr[1] "Alle %d Antworten anzeigen"
 
 #. TRANS: Reference to the logged in user in favourite list.
 msgctxt "FAVELIST"
@@ -10340,16 +9518,15 @@ msgstr "Du"
 
 #. TRANS: For building a list such as "Jim, Bob, Mary and 5 others like this".
 #. TRANS: %1$s is a list of users, separated by a separator (default: ", "), %2$s is the last user in the list.
-#, fuzzy, php-format
+#, php-format
 msgctxt "FAVELIST"
 msgid "%1$s and %2$s"
-msgstr "%1$s – %2$s"
+msgstr "%1$s und %2$s"
 
 #. TRANS: List message for notice favoured by logged in user.
-#, fuzzy
 msgctxt "FAVELIST"
 msgid "You like this."
-msgstr "Beliebte Nachrichten"
+msgstr "Du magst das."
 
 #. TRANS: List message for when more than 4 people like something.
 #. TRANS: %%s is a list of users liking a notice, %d is the number over 4 that like the notice.
@@ -10357,8 +9534,8 @@ msgstr "Beliebte Nachrichten"
 #, php-format
 msgid "%%s and %d others like this."
 msgid_plural "%%s and %d others like this."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%%s und %d ähnliches. "
+msgstr[1] "%%s und %d  ähnliche."
 
 #. TRANS: List message for favoured notices.
 #. TRANS: %%s is a list of users liking a notice.
@@ -10366,63 +9543,69 @@ msgstr[1] ""
 #, php-format
 msgid "%%s likes this."
 msgid_plural "%%s like this."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%%s gefällt das."
+msgstr[1] "%%s gefällt das."
 
 #. TRANS: List message for notice repeated by logged in user.
-#, fuzzy
 msgctxt "REPEATLIST"
-msgid "You have repeated this notice."
-msgstr "Nachricht bereits wiederholt"
+msgid "You repeated this."
+msgstr "Du hast dies wiederholt."
 
-#. TRANS: List message for repeated notices.
-#. TRANS: %d is the number of users that have repeated a notice.
-#, fuzzy, php-format
-msgid "One person has repeated this notice."
-msgid_plural "%d people have repeated this notice."
-msgstr[0] "Nachricht bereits wiederholt"
-msgstr[1] "Nachricht bereits wiederholt"
+#. TRANS: List message for when more than 4 people repeat something.
+#. TRANS: %%s is a list of users liking a notice, %d is the number over 4 that like the notice.
+#. TRANS: Plural is decided on the total number of users liking the notice (count of %%s + %d).
+#, php-format
+msgid "%%s and %d other repeated this."
+msgid_plural "%%s and %d others repeated this."
+msgstr[0] "%%s und %d andere wiederholten dies."
+msgstr[1] "%%s und %d andere wiederholten dies."
+
+#. TRANS: List message for favoured notices.
+#. TRANS: %%s is a list of users liking a notice.
+#. TRANS: Plural is based on the number of of users that have favoured a notice.
+#, php-format
+msgid "%%s repeated this."
+msgid_plural "%%s repeated this."
+msgstr[0] "%%s wiederholte dies."
+msgstr[1] "%%s wiederholte dies."
 
 #. TRANS: Form legend.
-#, fuzzy, php-format
+#, php-format
 msgid "Search and list people"
-msgstr "Website durchsuchen"
+msgstr "Personen suchen und auflisten"
 
 #. TRANS: Dropdown option for searching in profiles.
 msgid "Everything"
 msgstr "Alles"
 
 #. TRANS: Dropdown option for searching in profiles.
-#, fuzzy
 msgid "Fullname"
-msgstr "Bürgerlicher Name"
+msgstr "Voller Name"
 
 #. TRANS: Dropdown option for searching in profiles.
 msgid "URI (Remote users)"
 msgstr "URI (Entfernt liegende Benutzer)"
 
 #. TRANS: Dropdown field label.
-#, fuzzy
 msgctxt "LABEL"
 msgid "Search in"
-msgstr "Website durchsuchen"
+msgstr "Suche in"
 
 #. TRANS: Dropdown field title.
-#, fuzzy
 msgid "Choose a field to search."
-msgstr "Wähle ein Tag, um die Liste einzuschränken"
+msgstr "Wähle ein zu durchsuchendes Feld."
 
 #. TRANS: Form legend.
 #. TRANS: %1$s is a nickname, $2$s is a list.
-#, fuzzy, php-format
+#, php-format
 msgid "Remove %1$s from list %2$s"
-msgstr "%1$s – %2$s"
+msgstr "Entferne %1$s aus der Liste %2$s"
 
 #. TRANS: Legend on form to add a profile to a list.
 #. TRANS: %1$s is a nickname, %2$s is a list.
-#, fuzzy, php-format
+#, php-format
 msgid "Add %1$s to list %2$s"
-msgstr "%1$s – %2$s"
+msgstr "Füge %1$s zur Liste %2$s hinzu"
 
 #. TRANS: Title for top posters section.
 msgid "Top posters"
@@ -10431,7 +9614,7 @@ msgstr "Top-Schreiber"
 #. TRANS: Option in drop-down of potential addressees.
 msgctxt "SENDTO"
 msgid "Everyone"
-msgstr "Jedermann"
+msgstr "Jeder"
 
 #. TRANS: Option in drop-down of potential addressees.
 #. TRANS: %s is a StatusNet sitename.
@@ -10440,20 +9623,18 @@ msgid "My colleagues at %s"
 msgstr "Meine Kollegen bei %s"
 
 #. TRANS: Label for drop-down of potential addressees.
-#, fuzzy
 msgctxt "LABEL"
 msgid "To:"
-msgstr "An"
+msgstr "An:"
 
 #. TRANS: Checkbox label in widget for selecting potential addressees to mark the notice private.
-#, fuzzy
 msgid "Private?"
-msgstr "Privat"
+msgstr "Privat?"
 
 #. TRANS: Client exception thrown in widget for selecting potential addressees when an invalid fill option was received.
-#, fuzzy, php-format
+#, php-format
 msgid "Unknown to value: \"%s\"."
-msgstr "Unbekanntes Verb: „%s“"
+msgstr "Unbekannter Wert: „%s“."
 
 #. TRANS: Title for the form to unblock a user.
 msgctxt "TITLE"
@@ -10461,10 +9642,9 @@ msgid "Unblock"
 msgstr "Freigeben"
 
 #. TRANS: Title for unsandbox form.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Unsandbox"
-msgstr "Von Spielwiese freigeben"
+msgstr "Isolierung aufheben"
 
 #. TRANS: Description for unsandbox form.
 msgid "Unsandbox this user"
@@ -10479,17 +9659,19 @@ msgid "Unsilence this user"
 msgstr "Benutzer freigeben"
 
 #. TRANS: Form legend on unsubscribe form.
-#. TRANS: Button title on unsubscribe form.
 msgid "Unsubscribe from this user"
 msgstr "Abonnement von diesem Benutzer abbestellen"
 
 #. TRANS: Button text on unsubscribe form.
 #. TRANS: Button text for unsubscribing from a list.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Unsubscribe"
 msgstr "Abbestellen"
 
+#. TRANS: Button title on unsubscribe form.
+msgid "Unsubscribe from this user."
+msgstr "Benutzer-Abonnement abbestellen"
+
 #. TRANS: Exception text shown when no profile can be found for a user.
 #. TRANS: %1$s is a user nickname, $2$d is a user ID (number).
 #, php-format
@@ -10497,9 +9679,8 @@ msgid "User %1$s (%2$d) has no profile record."
 msgstr "Benutzer „%1$s“ (%2$d) hat kein Profil."
 
 #. TRANS: Authorisation exception thrown when a user a not allowed to login.
-#, fuzzy
 msgid "Not allowed to log in."
-msgstr "Nicht angemeldet."
+msgstr "Anmelden nicht gestattet."
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 msgid "a few seconds ago"
@@ -10572,8 +9753,6 @@ msgstr "Ungültiges XML, XRD-Root fehlt."
 msgid "Getting backup from file '%s'."
 msgstr "Hole Backup von der Datei „%s“."
 
-#~ msgid "%1$s and friends, page %2$d"
-#~ msgstr "%1$s und Freunde, Seite% 2$d"
-
-#~ msgid "You and friends"
-#~ msgstr "Du und Freunde"
+#
+#~ msgid " "
+#~ msgstr " "
diff --git a/locale/en_GB/LC_MESSAGES/statusnet.po b/locale/en_GB/LC_MESSAGES/statusnet.po
index 42918fc0fa..61334b5503 100644
--- a/locale/en_GB/LC_MESSAGES/statusnet.po
+++ b/locale/en_GB/LC_MESSAGES/statusnet.po
@@ -5,6 +5,7 @@
 # Author: Bruce89
 # Author: CiaranG
 # Author: Lcawte
+# Author: Lloffiwr
 # Author: Od1n
 # Author: Reedy
 # Author: XTL
@@ -15,17 +16,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:54+0000\n"
-"Language-Team: British English <http://translatewiki.net/wiki/Portal:en-gb>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:46+0000\n"
+"Language-Team: British English <https://translatewiki.net/wiki/Portal:en-"
+"gb>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: en-gb\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-05-05 10:52:40+0000\n"
+"X-POT-Import-Date: 2012-04-22 22:02:21+0000\n"
 
 #. TRANS: Database error message.
 #, php-format
@@ -36,12 +38,6 @@ msgid ""
 "again."
 msgstr ""
 
-#. TRANS: Error message.
-msgid ""
-"An important error occured, probably related to email setup. Check logfiles "
-"for more info."
-msgstr ""
-
 #. TRANS: Error message.
 msgid "An error occurred."
 msgstr ""
@@ -53,9 +49,8 @@ msgid ""
 msgstr ""
 
 #. TRANS: Error message displayed when trying to access a non-existing page.
-#, fuzzy
 msgid "Unknown page"
-msgstr "Unknown"
+msgstr ""
 
 #. TRANS: Error message displayed when trying to perform an undefined action.
 #. TRANS: Title for password recovery page when an unknown action has been specified.
@@ -101,12 +96,12 @@ msgstr "Disable new registrations."
 msgid "Closed"
 msgstr "Closed"
 
-#. TRANS: Title for button to save access settings in site admin panel.
-msgid "Save access settings"
+#. TRANS: Button title to save access settings in site admin panel.
+#, fuzzy
+msgid "Save access settings."
 msgstr "Save access settings"
 
-#. TRANS: Tooltip for button to save access settings in site admin panel.
-#. TRANS: Button text for saving theme settings.
+#. TRANS: Button text to save access settings in site admin panel.
 #. TRANS: Button label to save e-mail preferences.
 #. TRANS: Button label to save IM preferences.
 #. TRANS: Button text in the license admin panel.
@@ -122,7 +117,6 @@ msgstr "Save access settings"
 #. TRANS: Button text for saving "Other settings" in profile.
 #. TRANS: Button text to save user settings in user admin panel.
 #. TRANS: Button label in the "Edit application" form.
-#. TRANS: Button text on profile design page to save settings.
 #. TRANS: Text for save button on group edit form.
 #. TRANS: Button text to save tags for a profile.
 msgctxt "BUTTON"
@@ -158,14 +152,8 @@ msgstr "No such profile."
 #. TRANS: Client error displayed trying to reference a non-existing list.
 #. TRANS: Client error displayed when referring to a non-existing list.
 #. TRANS: Client error displayed trying to reference a non-existing list.
-#, fuzzy
 msgid "No such list."
-msgstr "No such tag."
-
-#. TRANS: Client error displayed when trying to add an OMB 0.1 remote profile to a list.
-#, fuzzy
-msgid "You cannot list an OMB 0.1 remote profile with this action."
-msgstr "You cannot subscribe to an OMB 0.1 remote profile with this action."
+msgstr ""
 
 #. TRANS: Client error displayed when an unknown error occurs when adding a user to a list.
 #. TRANS: %s is a username.
@@ -197,7 +185,6 @@ msgstr "No such page."
 #. TRANS: Client error when user not found for an rss related action.
 #. TRANS: Client error displayed when no existing user is provided for a user's delivery device setting.
 #. TRANS: Client error displayed if a user could not be found.
-#. TRANS: Client error when user not found updating a profile background image.
 #. TRANS: Client error displayed updating profile image without having a user object.
 #. TRANS: Client error displayed when making an Atom API request for an unknown user.
 #. TRANS: Client error displayed when trying to block a non-existing user or a user from another site.
@@ -223,14 +210,11 @@ msgstr "No such page."
 #. TRANS: Client error displayed when trying to get the RSS feed with favorites of a user that does not exist.
 #. TRANS: Client error displayed when requesting Friends of a Friend feed without providing a user nickname.
 #. TRANS: Client error displayed when requesting Friends of a Friend feed for an object that is not a user.
-#. TRANS: Client error displayed when trying to get a user hCard for a non-existing user.
 #. TRANS: Client error displayed trying to make a micro summary without providing a valid user.
 #. TRANS: Client error displayed trying to send a direct message to a non-existing user.
 #. TRANS: Client error displayed trying to use "one time password login" without using an existing user.
 #. TRANS: Client error displayed when referring to non-existing user.
 #. TRANS: Client error displayed trying to perform an action related to a non-existing user.
-#. TRANS: Form validation error on page for remote subscribe when no user was provided.
-#. TRANS: Form validation error on page for remote subscribe when no user profile was found.
 #. TRANS: Client error displayed when trying to reply to a non-exsting user.
 #. TRANS: Client error displayed when providing a non-existing nickname in a RSS 1.0 action.
 #. TRANS: Client error.
@@ -239,7 +223,6 @@ msgstr "No such page."
 #. TRANS: Client error displayed trying to find a user by ID for a non-existing ID.
 #. TRANS: Client error displayed requesting groups for a non-existing user.
 #. TRANS: Client error displayed when user not found for an action.
-#. TRANS: Client error displayed providing a non-existing nickname.
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #. TRANS: Client error displayed when trying to perform a gallery action with an unknown user.
 #. TRANS: Client error displayed when trying to access a mailbox without providing a user.
@@ -258,6 +241,13 @@ msgstr "%s timeline"
 msgid "%s's home timeline"
 msgstr "%s timeline"
 
+#. TRANS: %s is user nickname.
+#. TRANS: Feed title.
+#. TRANS: %s is tagger's nickname.
+#, fuzzy, php-format
+msgid "Feed for friends of %s (Activity Streams JSON)"
+msgstr "Feed for friends of %s (Atom)"
+
 #. TRANS: %s is user nickname.
 #, php-format
 msgid "Feed for friends of %s (RSS 1.0)"
@@ -302,7 +292,7 @@ msgstr ""
 "You can try to [nudge %1$s](../%2$s) from their profile or [post something "
 "to them](%%%%action.newnotice%%%%?status_textarea=%3$s)."
 
-#. TRANS: Encoutagement displayed on empty timeline user pages for anonymous users.
+#. TRANS: Encouragement displayed on empty timeline user pages for anonymous users.
 #. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
 #. TRANS: Empty list message for page with replies for a user for not logged in users.
 #. TRANS: %1$s is a user nickname. This message contains a Markdown link in the form [link text](link).
@@ -316,6 +306,13 @@ msgstr ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
 "post a notice to them."
 
+#. TRANS: Button text for inviting more users to the StatusNet instance.
+#. TRANS: Less business/enterprise-oriented language for public sites.
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Send invite"
+msgstr "Invitations"
+
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Title of API timeline for a user and friends.
 #. TRANS: %s is a username.
@@ -324,8 +321,6 @@ msgstr ""
 #. TRANS: %s is a username.
 #. TRANS: Menu item title in personal group navigation menu.
 #. TRANS: %s is a username.
-#. TRANS: Menu item title in settings navigation panel.
-#. TRANS: %s is a username.
 #, php-format
 msgid "%s and friends"
 msgstr "%s and friends"
@@ -365,7 +360,6 @@ msgstr ""
 #. TRANS: Server error thrown on database error updating SMS preferences.
 #. TRANS: Server error thrown on database error removing a registered SMS phone number.
 #. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
-#. TRANS: Server exception thrown on Profile design page when updating design settings fails.
 msgid "Could not update user."
 msgstr "Could not update user."
 
@@ -380,7 +374,6 @@ msgstr "Could not save profile."
 
 #. TRANS: Client error displayed when the number of bytes in a POST request exceeds a limit.
 #. TRANS: %s is the number of bytes of the CONTENT_LENGTH.
-#. TRANS: Form validation error in design settings form. POST should remain untranslated.
 #, fuzzy, php-format
 msgid ""
 "The server was unable to handle that much POST data (%s byte) due to its "
@@ -395,24 +388,6 @@ msgstr[1] ""
 "The server was unable to handle that much POST data (%s bytes) due to its "
 "current configuration."
 
-#. TRANS: Client error displayed when saving design settings fails because of an empty id.
-#. TRANS: Client error displayed when saving design settings fails because of an empty result.
-#. TRANS: Client error displayed when a database error occurs inserting profile colours.
-#. TRANS: Client error displayed when a database error occurs updating profile colours.
-#. TRANS: Form validation error displayed when group design settings could not be saved because of an application issue.
-#. TRANS: Form validation error on Profile design page when saving design settings has failed.
-#. TRANS: Form validation error on Profile design page when updating design settings has failed.
-msgid "Unable to save your design settings."
-msgstr "Unable to save your design settings."
-
-#. TRANS: Error displayed when updating design settings fails.
-#. TRANS: Client error displayed when a database error occurs updating profile colours.
-#. TRANS: Form validation error on Profile design page when updating design settings has failed.
-#. TRANS: Error message displayed if design settings could not be saved.
-#. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
-msgid "Could not update your design."
-msgstr "Could not update your design."
-
 #. TRANS: Title for Atom feed.
 msgctxt "ATOM"
 msgid "Main"
@@ -459,6 +434,22 @@ msgstr "Block user failed."
 msgid "Unblock user failed."
 msgstr "Unblock user failed."
 
+#. TRANS: Client exception thrown when no conversation ID is given.
+#, fuzzy
+msgid "No conversation ID."
+msgstr "Conversation"
+
+#. TRANS: Client exception thrown when referring to a non-existing conversation ID (%d).
+#, fuzzy, php-format
+msgid "No conversation with ID %d."
+msgstr "Conversation"
+
+#. TRANS: Title for conversion timeline.
+#, fuzzy
+msgctxt "TITLE"
+msgid "Conversation"
+msgstr "Conversation"
+
 #. TRANS: Title. %s is a user nickname.
 #, php-format
 msgid "Direct messages from %s"
@@ -503,6 +494,8 @@ msgid "Cannot send direct messages to users who aren't your friend."
 msgstr "Can't send direct messages to users who aren't your friend."
 
 #. TRANS: Client error displayed trying to direct message self (403).
+#. TRANS: Client error displayed trying to send a direct message to self.
+#. TRANS: Error text shown when trying to send a direct message to self.
 msgid ""
 "Do not send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
@@ -735,7 +728,6 @@ msgstr "groups on %s"
 
 #. TRANS: Client error displayed when trying to edit a group without being an admin.
 #. TRANS: Client error displayed trying to edit a group while not being a group admin.
-#. TRANS: Client error displayed trying to change group design settings without being a (group) admin.
 #. TRANS: Client error displayed when trying to change group logo settings while not being a group admin.
 msgid "You must be an admin to edit the group."
 msgstr "You must be an admin to edit the group."
@@ -854,7 +846,6 @@ msgstr "Database error inserting OAuth application user."
 
 #. TRANS: Client error given on when invalid data was passed through a form in the OAuth API.
 #. TRANS: Unexpected validation error on avatar upload form.
-#. TRANS: Client error displayed when the submitted form contains unexpected data.
 #. TRANS: Client error displayed submitting invalid form data for edit application.
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
 #. TRANS: Form validation error message when an unsupported argument is used.
@@ -863,7 +854,6 @@ msgstr "Database error inserting OAuth application user."
 #. TRANS: Client error when submitting a form with unexpected information.
 #. TRANS: Client error displayed when unexpected data is posted in the password recovery form.
 #. TRANS: Message given submitting a form with an unknown action in SMS settings.
-#. TRANS: Unknown form validation error in design settings form.
 msgid "Unexpected form submission."
 msgstr "Unexpected form submission."
 
@@ -909,7 +899,6 @@ msgstr "Account"
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Field label on account registration page.
-#. TRANS: Label for nickname on user authorisation page.
 #. TRANS: Field label on group edit form.
 #. TRANS: Dropdown option for searching in profiles.
 msgid "Nickname"
@@ -1224,12 +1213,9 @@ msgstr "You must be logged in to leave a group."
 #. TRANS: Client error displayed when requesting Friends of a Friend feed for a nickname that is not a group.
 #. TRANS: Client error displayed trying to block a user from a group while specifying a non-existing group.
 #. TRANS: Client error displayed referring to a group's permalink for a non-existing group ID.
-#. TRANS: Client error displayed trying to change group design settings while providing a nickname for a non-existing group.
 #. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
 #. TRANS: Client error displayed when trying to view group members for a non-existing group.
 #. TRANS: Client error displayed when trying to view group members for an object that is not a group.
-#. TRANS: Client error displayed when trying to view group members for a non-existing group.
-#. TRANS: Client error displayed when trying to view group members for an object that is not a group.
 #. TRANS: Client error displayed when requesting a group RSS feed for group that does not exist.
 #. TRANS: Client error displayed when requesting a group RSS feed for an object that is not a group.
 #. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
@@ -1238,10 +1224,10 @@ msgstr "You must be logged in to leave a group."
 #. TRANS: Client error displayed when trying to leave a non-local group.
 #. TRANS: Client error displayed when trying to leave a non-existing group.
 #. TRANS: Client error displayed when providing an invalid group ID on the Make Admin page.
-#. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
-#. TRANS: Client error displayed if no local group with a given name was found requesting group page.
 #. TRANS: Command exception text shown when a group is requested that does not exist.
 #. TRANS: Error text shown when trying to leave a group that does not exist.
+#. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
+#. TRANS: Client error displayed if no local group with a given name was found requesting group page.
 msgid "No such group."
 msgstr "No such group."
 
@@ -1310,6 +1296,7 @@ msgid "Join request canceled."
 msgstr ""
 
 #. TRANS: Client error displayed trying to approve subscription for a non-existing request.
+#. TRANS: %s is a user nickname.
 #, fuzzy, php-format
 msgid "%s is not in the moderation queue for your subscriptions."
 msgstr "A list of the users in this group."
@@ -1475,7 +1462,6 @@ msgstr "No such attachment."
 #. TRANS: Client error displayed trying to get an avatar without providing a nickname.
 #. TRANS: Client error displayed when requesting a list of blocked users for a group without providing a group nickname.
 #. TRANS: Client error displayed trying to edit a group while not proving a nickname for the group to edit.
-#. TRANS: Client error displayed trying to change group design settings without providing a group nickname.
 #. TRANS: Client error displayed when trying to change group logo settings without providing a nickname.
 #. TRANS: Client error displayed when trying to view group members without providing a group nickname.
 #. TRANS: Client error displayed when requesting a group RSS feed without providing a group nickname.
@@ -1778,6 +1764,18 @@ msgstr "The address \"%s\" has been confirmed for your account."
 msgid "Conversation"
 msgstr "Conversation"
 
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#, fuzzy
+msgid "Conversation feed (Activity Streams JSON)"
+msgstr "Notice feed for %s (Atom)"
+
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#, fuzzy
+msgid "Conversation feed (RSS 2.0)"
+msgstr "Notice feed for %s (RSS 2.0)"
+
 #. TRANS: Title for conversation page.
 #. TRANS: Title for page that shows a notice.
 #, fuzzy
@@ -1843,7 +1841,7 @@ msgstr "You cannot delete users."
 
 #. TRANS: Button title for user account deletion.
 #, fuzzy
-msgid "Permanently delete your account"
+msgid "Permanently delete your account."
 msgstr "You cannot delete users."
 
 #. TRANS: Client error displayed trying to delete an application while not logged in.
@@ -1998,155 +1996,6 @@ msgstr "Do not delete this group"
 msgid "Delete this user."
 msgstr "Delete this user"
 
-#. TRANS: Message used as title for design settings for the site.
-msgid "Design"
-msgstr "Design"
-
-#. TRANS: Instructions for design adminsitration panel.
-msgid "Design settings for this StatusNet site"
-msgstr ""
-
-#. TRANS: Client error displayed when a logo URL does is not valid.
-msgid "Invalid logo URL."
-msgstr "Invalid logo URL."
-
-#. TRANS: Client error displayed when an SSL logo URL is invalid.
-msgid "Invalid SSL logo URL."
-msgstr "Invalid SSL logo URL."
-
-#. TRANS: Client error displayed when a theme is submitted through the form that is not in the theme list.
-#. TRANS: %s is the chosen unavailable theme.
-#, php-format
-msgid "Theme not available: %s."
-msgstr "Theme not available: %s."
-
-#. TRANS: Fieldset legend for form to change logo.
-msgid "Change logo"
-msgstr "Change logo"
-
-#. TRANS: Field label for StatusNet site logo.
-msgid "Site logo"
-msgstr "Site logo"
-
-#. TRANS: Field label for SSL StatusNet site logo.
-msgid "SSL logo"
-msgstr "SSL logo"
-
-#. TRANS: Fieldset legend for form change StatusNet site's theme.
-msgid "Change theme"
-msgstr "Change theme"
-
-#. TRANS: Field label for dropdown to choose site theme.
-msgid "Site theme"
-msgstr "Site theme"
-
-#. TRANS: Title for field label for dropdown to choose site theme.
-msgid "Theme for the site."
-msgstr "Theme for the site."
-
-#. TRANS: Field label for uploading a cutom theme.
-msgid "Custom theme"
-msgstr "Custom theme"
-
-#. TRANS: Form instructions for uploading a cutom StatusNet theme.
-msgid "You can upload a custom StatusNet theme as a .ZIP archive."
-msgstr ""
-
-#. TRANS: Fieldset legend for theme background image.
-msgid "Change background image"
-msgstr "Change background image"
-
-#. TRANS: Field label for background image on theme designer page.
-#. TRANS: Field label for background color selector.
-#. TRANS: Label on profile design page for setting a profile page background colour.
-msgid "Background"
-msgstr "Background"
-
-#. TRANS: Form guide for background image upload form on theme designer page.
-#, php-format
-msgid ""
-"You can upload a background image for the site. The maximum file size is %1"
-"$s."
-msgstr ""
-"You can upload a background image for the site. The maximum file size is %1"
-"$s."
-
-#. TRANS: Used as radio button label to add a background image.
-msgid "On"
-msgstr "On"
-
-#. TRANS: Used as radio button label to not add a background image.
-msgid "Off"
-msgstr "Off"
-
-#. TRANS: Form guide for turning background image on or off on theme designer page.
-#. TRANS: Form guide for a set of radio buttons on the profile design page that will enable or disable
-#. TRANS: use of the uploaded profile image.
-msgid "Turn background image on or off."
-msgstr "Turn background image on or off."
-
-#. TRANS: Checkbox label to title background image on theme designer page.
-#. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
-msgid "Tile background image"
-msgstr "Tile background image"
-
-#. TRANS: Fieldset legend for theme colors.
-#, fuzzy
-msgid "Change colors"
-msgstr "Change colours"
-
-#. TRANS: Field label for content color selector.
-#. TRANS: Label on profile design page for setting a profile page content colour.
-msgid "Content"
-msgstr "Content"
-
-#. TRANS: Field label for sidebar color selector.
-#. TRANS: Label on profile design page for setting a profile page sidebar colour.
-msgid "Sidebar"
-msgstr "Sidebar"
-
-#. TRANS: Field label for text color selector.
-#. TRANS: Label on profile design page for setting a profile page text colour.
-msgid "Text"
-msgstr "Text"
-
-#. TRANS: Field label for link color selector.
-#. TRANS: Label on profile design page for setting a profile page links colour.
-msgid "Links"
-msgstr "Links"
-
-#. TRANS: Fieldset legend for advanced theme design settings.
-msgid "Advanced"
-msgstr ""
-
-#. TRANS: Field label for custom CSS.
-msgid "Custom CSS"
-msgstr ""
-
-#. TRANS: Button text for resetting theme settings.
-#, fuzzy
-msgctxt "BUTTON"
-msgid "Use defaults"
-msgstr "Use defaults"
-
-#. TRANS: Title for button for resetting theme settings.
-#. TRANS: Title for button on profile design page to reset all colour settings to default.
-#, fuzzy
-msgid "Restore default designs."
-msgstr "Restore default designs"
-
-#. TRANS: Title for button for resetting theme settings.
-#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#, fuzzy
-msgid "Reset back to default."
-msgstr "Reset back to default"
-
-#. TRANS: Title for button for saving theme settings.
-#. TRANS: Title for button on profile design page to save settings.
-#, fuzzy
-msgid "Save design."
-msgstr "Save design"
-
 #. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
 msgid "This notice is not a favorite!"
 msgstr "This notice is not a favourite!"
@@ -2161,6 +2010,84 @@ msgstr "Add to favourites"
 msgid "No such document \"%s\"."
 msgstr "No such document \"%s\""
 
+#. TRANS: Menu item in administrator navigation panel.
+#. TRANS: Menu item in default local navigation panel.
+#. TRANS: Menu item in personal group navigation menu.
+#, fuzzy
+msgctxt "MENU"
+msgid "Home"
+msgstr "Homepage"
+
+msgctxt "MENU"
+msgid "Docs"
+msgstr ""
+
+#. TRANS: Secondary navigation menu item leading to help on StatusNet.
+msgctxt "MENU"
+msgid "Help"
+msgstr "Help"
+
+#, fuzzy
+msgid "Getting started"
+msgstr "Settings saved."
+
+#. TRANS: Secondary navigation menu item leading to text about StatusNet site.
+#, fuzzy
+msgctxt "MENU"
+msgid "About"
+msgstr "About"
+
+#, fuzzy
+msgid "About this site"
+msgstr "Unblock this user"
+
+#. TRANS: Secondary navigation menu item leading to Frequently Asked Questions.
+#, fuzzy
+msgctxt "MENU"
+msgid "FAQ"
+msgstr "F.A.Q."
+
+msgid "Frequently asked questions"
+msgstr ""
+
+#. TRANS: Secondary navigation menu item leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+#, fuzzy
+msgctxt "MENU"
+msgid "Contact"
+msgstr "Contact"
+
+#, fuzzy
+msgid "Contact info"
+msgstr "Contact"
+
+#, fuzzy
+msgctxt "MENU"
+msgid "Tags"
+msgstr "Tags"
+
+msgid "Using tags"
+msgstr ""
+
+#. TRANS: Menu item in default local navigation panel.
+#. TRANS: Menu item in search group navigation panel.
+#. TRANS: Menu item in local navigation menu.
+#, fuzzy
+msgctxt "MENU"
+msgid "Groups"
+msgstr "Groups"
+
+#, fuzzy
+msgid "Using groups"
+msgstr "User groups"
+
+msgctxt "MENU"
+msgid "API"
+msgstr ""
+
+msgid "RESTful API"
+msgstr ""
+
 #. TRANS: Title for "Edit application" form.
 #. TRANS: Form legend.
 msgid "Edit application"
@@ -2326,7 +2253,7 @@ msgid ""
 "subscriptions to it. Do you still want to continue?"
 msgstr ""
 
-#. TRANS: TRANS: Server error displayed when updating a list fails.
+#. TRANS: Server error displayed when updating a list fails.
 #, fuzzy
 msgid "Could not update list."
 msgstr "Could not update user."
@@ -2632,40 +2559,6 @@ msgstr "No attachments."
 msgid "No uploaded attachments."
 msgstr "No uploaded attachments."
 
-#. TRANS: Client error displayed when subscribing to a remote profile and an unexpected response is received.
-msgid "Not expecting this response!"
-msgstr "Not expecting this response!"
-
-#. TRANS: Client error displayed when subscribing to a remote profile that does not exist.
-msgid "User being listened to does not exist."
-msgstr "User being listened to does not exist."
-
-#. TRANS: Client error displayed when subscribing to a remote profile that is a local profile.
-#. TRANS: Client error displayed when using remote subscribe for a local entity.
-msgid "You can use the local subscription!"
-msgstr "You can use the local subscription!"
-
-#. TRANS: Client error displayed when subscribing to a remote profile that is blocked form subscribing to.
-msgid "That user has blocked you from subscribing."
-msgstr "That user has blocked you from subscribing."
-
-#. TRANS: Client error displayed when subscribing to a remote profile without providing an authorised token.
-msgid "You are not authorized."
-msgstr "You are not authorised."
-
-#. TRANS: Client error displayed when subscribing to a remote profile and conversion of the request token to access token fails.
-msgid "Could not convert request token to access token."
-msgstr "Could not convert request token to access token."
-
-#. TRANS: Client error displayed when subscribing to a remote profile fails because of an unsupported version of the OMB protocol.
-msgid "Remote service uses unknown version of OMB protocol."
-msgstr "Remote service uses unknown version of OMB protocol."
-
-#. TRANS: Server error displayed when subscribing to a remote profile fails because the remote profile could not be updated.
-#. TRANS: Exception thrown when updating a remote profile fails in OAuth store.
-msgid "Error updating remote profile."
-msgstr "Error updating remote profile."
-
 #. TRANS: Client error displayed when requesting a non-existent file.
 msgid "No such file."
 msgstr "No such file."
@@ -2755,32 +2648,6 @@ msgstr "Database error blocking user from group."
 msgid "No ID."
 msgstr "No ID."
 
-#. TRANS: Client error displayed trying to change group design settings while not logged in.
-msgid "You must be logged in to edit a group."
-msgstr "You must be logged in to edit a group."
-
-#. TRANS: Title group design settings page.
-msgid "Group design"
-msgstr "Group design"
-
-#. TRANS: Instructions for group design settings page.
-msgid ""
-"Customize the way your group looks with a background image and a colour "
-"palette of your choice."
-msgstr ""
-"Customise the way your group looks with a background image and a colour "
-"palette of your choice."
-
-#. TRANS: Form validation error displayed when group design settings could not be updated because of an application issue.
-#, fuzzy
-msgid "Unable to update your design settings."
-msgstr "Unable to save your design settings."
-
-#. TRANS: Form text to confirm saved group design settings.
-#. TRANS: Confirmation message on Profile design page when saving design settings has succeeded.
-msgid "Design preferences saved."
-msgstr "Design preferences saved."
-
 #. TRANS: Title for group logo settings page.
 #. TRANS: Group logo form legend.
 msgid "Group logo"
@@ -2954,8 +2821,8 @@ msgstr "IM settings"
 #. TRANS: the order and formatting of link text and link should remain unchanged.
 #, fuzzy, php-format
 msgid ""
-"You can send and receive notices through instant messaging [instant messages]"
-"(%%doc.im%%). Configure your addresses and settings below."
+"You can send and receive notices through [instant messaging](%%doc.im%%). "
+"Configure your addresses and settings below."
 msgstr ""
 "You can send and receive notices through Jabber/GTalk [instant messages](%%"
 "doc.im%%). Configure your address and settings below."
@@ -3173,29 +3040,6 @@ msgid ""
 msgstr ""
 "Use this form to invite your friends and colleagues to use this service."
 
-#. TRANS: Field label for a list of e-mail addresses.
-msgid "Email addresses"
-msgstr "E-mail addresses"
-
-#. TRANS: Tooltip for field label for a list of e-mail addresses.
-#, fuzzy
-msgid "Addresses of friends to invite (one per line)."
-msgstr "Addresses of friends to invite (one per line)"
-
-#. TRANS: Field label for a personal message to send to invitees.
-msgid "Personal message"
-msgstr "Personal message"
-
-#. TRANS: Tooltip for field label for a personal message to send to invitees.
-msgid "Optionally add a personal message to the invitation."
-msgstr "Optionally add a personal message to the invitation."
-
-#. TRANS: Send button for inviting friends
-#. TRANS: Button text for sending notice.
-msgctxt "BUTTON"
-msgid "Send"
-msgstr "Send"
-
 #. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral
 #. TRANS: singular 3rd-person pronoun in English. %1$s is the inviting user, $2$s is
 #. TRANS: the StatusNet sitename.
@@ -3330,12 +3174,6 @@ msgstr ""
 msgid "Save license settings."
 msgstr "Save site settings"
 
-#. TRANS: Client error displayed when trying to log in while already logged in.
-#. TRANS: Client error displayed trying to use "one time password login" when already logged in.
-#. TRANS: Client error displayed when trying to register while already logged in.
-msgid "Already logged in."
-msgstr "Already logged in."
-
 #. TRANS: Form validation error displayed when trying to log in with incorrect credentials.
 msgid "Incorrect username or password."
 msgstr "Incorrect username or password."
@@ -3447,6 +3285,7 @@ msgstr "Source URL is required."
 msgid "Could not create application."
 msgstr "Could not create application."
 
+#. TRANS: Form validation error messages displayed when uploading an invalid application logo.
 #, fuzzy
 msgid "Invalid image."
 msgstr "Invalid size."
@@ -3486,13 +3325,6 @@ msgstr "No content!"
 msgid "No recipient specified."
 msgstr "No recipient specified."
 
-#. TRANS: Client error displayed trying to send a direct message to self.
-#. TRANS: Error text shown when trying to send a direct message to self.
-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."
-
 #. TRANS: Page title after sending a direct message.
 msgid "Message sent"
 msgstr "Message sent"
@@ -3696,6 +3528,33 @@ msgstr ""
 msgid "Not a supported data format."
 msgstr "Not a supported data format."
 
+#. TRANS: Page title for profile settings.
+#, fuzzy
+msgid "Old school UI settings"
+msgstr "IM settings"
+
+#. TRANS: Usage instructions for profile settings.
+msgid "If you like it \"the old way\", you can set that here."
+msgstr ""
+
+#. TRANS: Confirmation shown when user profile settings are saved.
+#. TRANS: Message after successful saving of administrative settings.
+msgid "Settings saved."
+msgstr "Settings saved."
+
+msgid "Only stream mode (no conversations) in timelines"
+msgstr ""
+
+msgid "Show conversation page as hierarchical trees"
+msgstr ""
+
+msgid "Show nicknames (not full names) in timelines"
+msgstr ""
+
+#. TRANS: Button text to save a list.
+msgid "Save"
+msgstr "Save"
+
 #. TRANS: ShortName in the OpenSearch interface when trying to find users.
 msgid "People Search"
 msgstr "People Search"
@@ -3704,6 +3563,11 @@ msgstr "People Search"
 msgid "Notice Search"
 msgstr "Notice Search"
 
+#. TRANS: Client error displayed trying to use "one time password login" when already logged in.
+#. TRANS: Client error displayed when trying to register while already logged in.
+msgid "Already logged in."
+msgstr "Already logged in."
+
 #. TRANS: Client error displayed trying to use "one time password login" without specifying a user.
 msgid "No user ID specified."
 msgstr "No user ID specified."
@@ -3776,7 +3640,7 @@ msgid "Confirm"
 msgstr "Confirm"
 
 #. TRANS: Field title on page where to change password.
-#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
+#. TRANS: Title for field label for password reset form where the password has to be typed again.
 #. TRANS: Field title on account registration page.
 #, fuzzy
 msgid "Same as password above."
@@ -3839,12 +3703,6 @@ msgstr "Theme directory not readable: %s."
 msgid "Avatar directory not writable: %s."
 msgstr "Avatar directory not writable: %s."
 
-#. TRANS: Client error in Paths admin panel.
-#. TRANS: %s is the background directory that could not be written to.
-#, php-format
-msgid "Background directory not writable: %s."
-msgstr "Background directory not writable: %s."
-
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the locales directory that could not be read from.
 #, php-format
@@ -3962,31 +3820,6 @@ msgstr "Avatar directory"
 msgid "Directory where avatars are located."
 msgstr ""
 
-#. TRANS: Fieldset legend in Paths admin panel.
-msgid "Backgrounds"
-msgstr "Backgrounds"
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-#, fuzzy
-msgid "Server for backgrounds."
-msgstr "Server for themes"
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-msgid "Web path to backgrounds."
-msgstr ""
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-msgid "Server for backgrounds on SSL pages."
-msgstr ""
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-msgid "Web path to backgrounds on SSL pages."
-msgstr ""
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-msgid "Directory where backgrounds are located."
-msgstr ""
-
 #. TRANS: Fieldset legens in Paths admin panel.
 msgid "Attachments"
 msgstr "Attachments"
@@ -4046,8 +3879,9 @@ msgid "Server to direct SSL requests to."
 msgstr ""
 
 #. TRANS: Button title text to store form data in the Paths admin panel.
-msgid "Save paths"
-msgstr "Save paths"
+#, fuzzy
+msgid "Save path settings."
+msgstr "Save site settings"
 
 #. TRANS: Instructions for the "People search" page.
 #. TRANS: %%site.name%% is the name of the StatusNet site.
@@ -4189,7 +4023,7 @@ msgid ""
 "%%%site.name%%%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
 "blogging) service based on the Free Software [StatusNet](http://status.net/) "
 "tool. You can easily keep track of what they are doing by subscribing to the "
-"tag's timeline."
+"list's timeline."
 msgstr ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
 "wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
@@ -4222,7 +4056,7 @@ msgid ""
 "site.name%%%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
 "blogging) service based on the Free Software [StatusNet](http://status.net/) "
 "tool. You can easily keep track of what they are doing by subscribing to the "
-"tag's timeline."
+"list's timeline."
 msgstr ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
 "wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
@@ -4326,16 +4160,6 @@ msgid ""
 "All default plugins have been disabled from the site's configuration file."
 msgstr ""
 
-#. TRANS: Client error displayed if the notice posted has too many characters.
-msgid "Invalid notice content."
-msgstr "Invalid notice content."
-
-#. TRANS: Exception thrown if a notice's license is not compatible with the StatusNet site license.
-#. TRANS: %1$s is the notice license, %2$s is the StatusNet site's license.
-#, fuzzy, php-format
-msgid "Notice license \"%1$s\" is not compatible with site license \"%2$s\"."
-msgstr "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’."
-
 #. TRANS: Client error displayed when trying to add an unindentified field to profile.
 #. TRANS: %s is a field name.
 #, php-format
@@ -4434,6 +4258,8 @@ msgid "Share my current location when posting notices"
 msgstr ""
 
 #. TRANS: Field label in form for profile settings.
+#. TRANS: Title for group tag cloud section.
+#. TRANS: %s is a group name.
 msgid "Tags"
 msgstr "Tags"
 
@@ -4463,9 +4289,8 @@ msgid "What timezone are you normally in?"
 msgstr "In which timezone are you?"
 
 #. TRANS: Checkbox label in form for profile settings.
-#, fuzzy
 msgid ""
-"Automatically subscribe to whoever subscribes to me (best for non-humans)."
+"Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr ""
 "Automatically subscribe to whoever subscribes to me (best for non-humans)"
 
@@ -4536,11 +4361,6 @@ msgstr "Couldn't save location prefs."
 msgid "Could not save tags."
 msgstr "Could not save tags."
 
-#. TRANS: Confirmation shown when user profile settings are saved.
-#. TRANS: Message after successful saving of administrative settings.
-msgid "Settings saved."
-msgstr "Settings saved."
-
 #. TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
 #. TRANS: Page title for page where a user account can be restored from backup.
 #, fuzzy
@@ -4554,7 +4374,8 @@ msgid "Beyond the page limit (%s)."
 msgstr ""
 
 #. TRANS: Server error displayed when a public timeline cannot be retrieved.
-msgid "Could not retrieve public stream."
+#, fuzzy
+msgid "Could not retrieve public timeline."
 msgstr "Could not retrieve public stream."
 
 #. TRANS: Title for all public timeline pages but the first.
@@ -4569,15 +4390,23 @@ msgid "Public timeline"
 msgstr "Public timeline"
 
 #. TRANS: Link description for public timeline feed.
-msgid "Public Stream Feed (RSS 1.0)"
+#, fuzzy
+msgid "Public Timeline Feed (Activity Streams JSON)"
+msgstr "Public Stream Feed (Atom)"
+
+#. TRANS: Link description for public timeline feed.
+#, fuzzy
+msgid "Public Timeline Feed (RSS 1.0)"
 msgstr "Public Stream Feed (RSS 1.0)"
 
 #. TRANS: Link description for public timeline feed.
-msgid "Public Stream Feed (RSS 2.0)"
+#, fuzzy
+msgid "Public Timeline Feed (RSS 2.0)"
 msgstr "Public Stream Feed (RSS 2.0)"
 
 #. TRANS: Link description for public timeline feed.
-msgid "Public Stream Feed (Atom)"
+#, fuzzy
+msgid "Public Timeline Feed (Atom)"
 msgstr "Public Stream Feed (Atom)"
 
 #. TRANS: Text displayed for public feed when there are no public notices.
@@ -4626,49 +4455,6 @@ msgstr ""
 "blogging) service based on the Free Software [StatusNet](http://status.net/) "
 "tool."
 
-#. TRANS: Title for page with public list cloud.
-#, fuzzy
-msgid "Public list cloud"
-msgstr "Public tag cloud"
-
-#. TRANS: Page notice for page with public list cloud.
-#. TRANS: %s is a StatusNet sitename.
-#, fuzzy, php-format
-msgid "These are largest lists on %s"
-msgstr "These are most popular recent tags on %s "
-
-#. TRANS: Empty list message on page with public list cloud.
-#. TRANS: This message contains Markdown links in the form [description](link).
-#, php-format
-msgid "No one has [listed](%%doc.tags%%) anyone yet."
-msgstr ""
-
-#. TRANS: Additional empty list message on page with public list cloud for logged in users.
-msgid "Be the first to list someone!"
-msgstr ""
-
-#. TRANS: Additional empty list message on page with public list cloud for anonymous users.
-#. TRANS: This message contains Markdown links in the form [description](link).
-#, fuzzy, php-format
-msgid ""
-"Why not [register an account](%%action.register%%) and be the first to list "
-"someone!"
-msgstr ""
-"Why not [register an account](%%action.register%%) and be the first to post "
-"one!"
-
-#. TRANS: DT element on on page with public list cloud.
-#, fuzzy
-msgid "List cloud"
-msgstr "API method not found."
-
-#. TRANS: Link title for number of listed people. %d is the number of listed people.
-#, php-format
-msgid "1 person listed"
-msgid_plural "%d people listed"
-msgstr[0] ""
-msgstr[1] ""
-
 #. TRANS: Public RSS feed description. %s is the StatusNet site name.
 #, fuzzy, php-format
 msgid "%s updates from everyone."
@@ -4795,7 +4581,6 @@ msgid "6 or more characters, and do not forget it!"
 msgstr "6 or more characters, and don't forget it!"
 
 #. TRANS: Button text for password reset form.
-#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Reset"
@@ -4805,18 +4590,6 @@ msgstr "Reset"
 msgid "Enter a nickname or email address."
 msgstr "Enter a nickname or e-mail address."
 
-#. TRANS: Information on password recovery form if no known username or e-mail address was specified.
-msgid "No user with that email address or username."
-msgstr "No user with that e-mail address or username."
-
-#. TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.
-msgid "No registered email address for that user."
-msgstr "No registered e-mail address for that user."
-
-#. TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.
-msgid "Error saving address confirmation."
-msgstr "Error saving address confirmation."
-
 #. TRANS: User notification after an e-mail with instructions was sent from the password recovery form.
 msgid ""
 "Instructions for recovering your password have been sent to the email "
@@ -4946,7 +4719,7 @@ msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
 msgid "All rights reserved."
-msgstr "Tous droits réservés."
+msgstr "All rights reserved."
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
 #, php-format
@@ -5001,78 +4774,6 @@ msgstr ""
 "(You should receive a message by e-mail momentarily, with instructions on "
 "how to confirm your e-mail address.)"
 
-#. TRANS: Page notice for remote subscribe. This message contains Markdown links.
-#. TRANS: Ensure to keep the correct markup of [link description](link).
-#, php-format
-msgid ""
-"To subscribe, you can [login](%%action.login%%), or [register](%%action."
-"register%%) a new  account. If you already have an account  on a [compatible "
-"microblogging site](%%doc.openmublog%%),  enter your profile URL below."
-msgstr ""
-"To subscribe, you can [login](%%action.login%%), or [register](%%action."
-"register%%) a new  account. If you already have an account  on a [compatible "
-"microblogging site](%%doc.openmublog%%),  enter your profile URL below."
-
-#. TRANS: Page title for Remote subscribe.
-msgid "Remote subscribe"
-msgstr "Remote subscribe"
-
-#. TRANS: Field legend on page for remote subscribe.
-msgid "Subscribe to a remote user"
-msgstr "Subscribe to a remote user"
-
-#. TRANS: Field label on page for remote subscribe.
-msgid "User nickname"
-msgstr "User nickname"
-
-#. TRANS: Field title on page for remote subscribe.
-#, fuzzy
-msgid "Nickname of the user you want to follow."
-msgstr "Nickname of the user you want to follow"
-
-#. TRANS: Field label on page for remote subscribe.
-msgid "Profile URL"
-msgstr "Profile URL"
-
-#. TRANS: Field title on page for remote subscribe.
-#, fuzzy
-msgid "URL of your profile on another compatible microblogging service."
-msgstr "URL of your profile on another compatible microblogging service"
-
-#. TRANS: Button text on page for remote subscribe.
-#. TRANS: Link text for link that will subscribe to a remote profile.
-#. TRANS: Button text to subscribe to a user.
-#. TRANS: Button text for subscribing to a list.
-#, fuzzy
-msgctxt "BUTTON"
-msgid "Subscribe"
-msgstr "Subscribe"
-
-#. TRANS: Form validation error on page for remote subscribe when an invalid profile URL was provided.
-#, fuzzy
-msgid "Invalid profile URL (bad format)."
-msgstr "Invalid profile URL (bad format)"
-
-#. TRANS: Form validation error on page for remote subscribe when no the provided profile URL
-#. TRANS: does not contain expected data.
-msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
-msgstr "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
-
-#. TRANS: Form validation error on page for remote subscribe.
-#, fuzzy
-msgid "That is a local profile! Login to subscribe."
-msgstr "That’s a local profile! Login to subscribe."
-
-#. TRANS: Form validation error on page for remote subscribe when the remote service is not providing a request token.
-#, fuzzy
-msgid "Could not get a request token."
-msgstr "Couldn’t get a request token."
-
-#. TRANS: Client error displayed when trying to (un)list an OMB 0.1 remote profile.
-#, fuzzy
-msgid "You cannot (un)list an OMB 0.1 remote profile with this action."
-msgstr "You cannot subscribe to an OMB 0.1 remote profile with this action."
-
 #. TRANS: Client error displayed when an unknown error occurs while delisting a user.
 #. TRANS: %s is a username.
 #, php-format
@@ -5125,6 +4826,12 @@ msgstr "Replies to %s"
 msgid "Replies to %1$s, page %2$d"
 msgstr "Replies to %1$s, page %2$d"
 
+#. TRANS: Link for feed with replies for a user.
+#. TRANS: %s is a user nickname.
+#, fuzzy, php-format
+msgid "Replies feed for %s (Activity Streams JSON)"
+msgstr "Replies feed for %s (Atom)"
+
 #. TRANS: Link for feed with replies for a user.
 #. TRANS: %s is a user nickname.
 #, php-format
@@ -5243,7 +4950,7 @@ msgstr ""
 
 #. TRANS: Form instructions for feed restore.
 msgid ""
-"You can upload a backed-up stream in <a href=\"http://activitystrea.ms/"
+"You can upload a backed-up timeline in <a href=\"http://activitystrea.ms/"
 "\">Activity Streams</a> format."
 msgstr ""
 
@@ -5363,6 +5070,27 @@ msgstr ""
 msgid "Application info"
 msgstr "Application information"
 
+#. TRANS: Field label on application page.
+msgid "Consumer key"
+msgstr ""
+
+#. TRANS: Field label on application page.
+msgid "Consumer secret"
+msgstr ""
+
+#. TRANS: Field label on application page.
+#, fuzzy
+msgid "Request token URL"
+msgstr "Invalid request token."
+
+#. TRANS: Field label on application page.
+msgid "Access token URL"
+msgstr ""
+
+#. TRANS: Field label on application page.
+msgid "Authorize URL"
+msgstr "Authorise URL"
+
 #. TRANS: Note on the OAuth application page about signature support.
 msgid ""
 "Note: HMAC-SHA1 signatures are supported. The plaintext signature method is "
@@ -5383,6 +5111,11 @@ msgstr "%1$s's favorite notices, page %2$d"
 msgid "Could not retrieve favorite notices."
 msgstr "Could not retrieve favourite notices."
 
+#. TRANS: Feed link text. %s is a username.
+#, fuzzy, php-format
+msgid "Feed for favorites of %s (Activity Streams JSON)"
+msgstr "Feed for favorites of %s (Atom)"
+
 #. TRANS: Feed link text. %s is a username.
 #, php-format
 msgid "Feed for favorites of %s (RSS 1.0)"
@@ -5444,6 +5177,11 @@ msgstr "%s group"
 msgid "%1$s group, page %2$d"
 msgstr "%1$s group, page %2$d"
 
+#. TRANS: Tooltip for feed link. %s is a group nickname.
+#, fuzzy, php-format
+msgid "Notice feed for %s group (Activity Streams JSON)"
+msgstr "Notice feed for %s group (Atom)"
+
 #. TRANS: Tooltip for feed link. %s is a group nickname.
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
@@ -5464,44 +5202,8 @@ msgstr "Notice feed for %s group (Atom)"
 msgid "FOAF for %s group"
 msgstr "FOAF for %s group"
 
-#. TRANS: Header for mini list of group members on a group page (h2).
-msgid "Members"
-msgstr "Members"
-
-#. TRANS: Description for mini list of group members on a group page when the group has no members.
-#. TRANS: Content of "Listed" page if there are no listed users.
-#. TRANS: Content of "People following tag x" if there are no subscribed users.
-#. TRANS: Empty list message for tags.
-#. TRANS: Text for user subscription statistics if the user has no subscriptions.
-#. TRANS: Text for user subscriber statistics if user has no subscribers.
-#. TRANS: Text for user user group membership statistics if user is not a member of any group.
-#. TRANS: Default content for section/sidebar widget.
-msgid "(None)"
-msgstr "(None)"
-
-#. TRANS: Link to all group members from mini list of group members if group has more than n members.
-msgid "All members"
-msgstr "All members"
-
-#. TRANS: Header for group statistics on a group page (h2).
-#. TRANS: H2 text for user statistics.
-msgid "Statistics"
-msgstr "Statistics"
-
-#. TRANS: Label for group creation date.
-#, fuzzy
-msgctxt "LABEL"
-msgid "Created"
-msgstr "Created"
-
-#. TRANS: Label for member count in statistics on group page.
-#, fuzzy
-msgctxt "LABEL"
-msgid "Members"
-msgstr "Members"
-
 #. TRANS: Notice on group pages for anonymous users for StatusNet sites that accept new registrations.
-#. TRANS: **%s** is the group alias, %%%%site.name%%%% is the site name,
+#. TRANS: %s is the group name, %%%%site.name%%%% is the site name,
 #. TRANS: %%%%action.register%%%% is the URL for registration, %%%%doc.help%%%% is a URL to help.
 #. TRANS: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
 #, php-format
@@ -5519,26 +5221,20 @@ msgstr ""
 "of this group and many more! ([Read more](%%%%doc.help%%%%))"
 
 #. TRANS: Notice on group pages for anonymous users for StatusNet sites that accept no new registrations.
-#. TRANS: **%s** is the group alias, %%%%site.name%%%% is the site name,
+#. TRANS: %s is the group name, %%%%site.name%%%% is the site name,
 #. TRANS: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
-#, php-format
+#, fuzzy, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
 "wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
 "[StatusNet](http://status.net/) tool. Its members share short messages about "
-"their life and interests. "
+"their life and interests."
 msgstr ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
 "wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
 "[StatusNet](http://status.net/) tool. Its members share short messages about "
 "their life and interests. "
 
-#. TRANS: Title for list of group administrators on a group page.
-#, fuzzy
-msgctxt "TITLE"
-msgid "Admins"
-msgstr "Admins"
-
 #. TRANS: Client error displayed requesting a single message that does not exist.
 msgid "No such message."
 msgstr "No such message."
@@ -5634,10 +5330,22 @@ msgstr ""
 "one!"
 
 #. TRANS: Header on show list page.
+#. TRANS: Link description for link to list of users tagged with a tag (so part of a list).
 #, fuzzy
 msgid "Listed"
 msgstr "License"
 
+#. TRANS: Content of "Listed" page if there are no listed users.
+#. TRANS: Content of "People following tag x" if there are no subscribed users.
+#. TRANS: Description for mini list of group members on a group page when the group has no members.
+#. TRANS: Empty list message for tags.
+#. TRANS: Text for user subscription statistics if the user has no subscriptions.
+#. TRANS: Text for user subscriber statistics if user has no subscribers.
+#. TRANS: Text for user user group membership statistics if user is not a member of any group.
+#. TRANS: Default content for section/sidebar widget.
+msgid "(None)"
+msgstr "(None)"
+
 #. TRANS: Link for more "People in list x by a user"
 #. TRANS: if there are more than the mini list's maximum.
 msgid "Show all"
@@ -5648,24 +5356,19 @@ msgstr ""
 msgid "Subscribers"
 msgstr "Subscribers"
 
-#. TRANS: Link for more "People following tag x"
-#. TRANS: if there are more than the mini list's maximum.
-msgid "All subscribers"
-msgstr "All subscribers"
-
-#. TRANS: Page title showing tagged notices in one user's stream.
+#. TRANS: Page title showing tagged notices in one user's timeline.
 #. TRANS: %1$s is the username, %2$s is the hash tag.
 #, fuzzy, php-format
 msgid "Notices by %1$s tagged %2$s"
 msgstr "%1$s, page %2$d"
 
-#. TRANS: Page title showing tagged notices in one user's stream.
+#. TRANS: Page title showing tagged notices in one user's timeline.
 #. TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number.
 #, fuzzy, php-format
 msgid "Notices by %1$s tagged %2$s, page %3$d"
 msgstr "Notices tagged with %1$s, page %2$d"
 
-#. TRANS: Extended page title showing tagged notices in one user's stream.
+#. TRANS: Extended page title showing tagged notices in one user's timeline.
 #. TRANS: %1$s is the username, %2$d is the page number.
 #, fuzzy, php-format
 msgid "Notices by %1$s, page %2$d"
@@ -5677,6 +5380,12 @@ msgstr "Notices tagged with %1$s, page %2$d"
 msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
 msgstr "Notice feed for %1$s tagged %2$s (RSS 1.0)"
 
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#, fuzzy, php-format
+msgid "Notice feed for %s (Activity Streams JSON)"
+msgstr "Notice feed for %s (Atom)"
+
 #. TRANS: Title for link to notice feed.
 #. TRANS: %s is a user nickname.
 #, php-format
@@ -5701,7 +5410,7 @@ msgstr "Notice feed for %s (Atom)"
 msgid "FOAF for %s"
 msgstr "FOAF for %s"
 
-#. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
+#. TRANS: First sentence of empty list message for a timeline. $1%s is a user nickname.
 #, fuzzy, php-format
 msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
 msgstr "This is the timeline for %1$s but %2$s hasn't posted anything yet."
@@ -5712,7 +5421,7 @@ msgid ""
 "would be a good time to start :)"
 msgstr ""
 
-#. TRANS: Second sentence of empty  list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
+#. TRANS: Second sentence of empty  list message for a non-self timeline. %1$s is a user nickname, %2$s is a part of a URL.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
 #, php-format
 msgid ""
@@ -5722,7 +5431,7 @@ msgstr ""
 "You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
 "%?status_textarea=%2$s)."
 
-#. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
+#. TRANS: Announcement for anonymous users showing a timeline if site registrations are open.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
 #, php-format
 msgid ""
@@ -5736,13 +5445,13 @@ msgstr ""
 "[StatusNet](http://status.net/) tool. [Join now](%%%%action.register%%%%) to "
 "follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))"
 
-#. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
+#. TRANS: Announcement for anonymous users showing a timeline if site registrations are closed or invite only.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#, php-format
+#, fuzzy, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
 "wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
-"[StatusNet](http://status.net/) tool. "
+"[StatusNet](http://status.net/) tool."
 msgstr ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
 "wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
@@ -5780,6 +5489,14 @@ msgstr ""
 msgid "You must have a valid contact email address."
 msgstr "You must have a valid contact email address."
 
+#. TRANS: Client error displayed when a logo URL is not valid.
+msgid "Invalid logo URL."
+msgstr "Invalid logo URL."
+
+#. TRANS: Client error displayed when a SSL logo URL is invalid.
+msgid "Invalid SSL logo URL."
+msgstr "Invalid SSL logo URL."
+
 #. TRANS: Client error displayed trying to save site settings with an invalid language code.
 #. TRANS: %s is the invalid language code.
 #, php-format
@@ -5853,7 +5570,8 @@ msgid "Default language"
 msgstr "Default language"
 
 #. TRANS: Dropdown title on site settings panel.
-msgid "Site language when autodetection from browser settings is not available"
+msgid ""
+"The site language when autodetection from browser settings is not available."
 msgstr ""
 
 #. TRANS: Fieldset legend on site settings panel.
@@ -5877,8 +5595,21 @@ msgstr ""
 msgid "How long users must wait (in seconds) to post the same thing again."
 msgstr ""
 
+#. TRANS: Fieldset legend for form to change logo.
+msgid "Logo"
+msgstr "Logout"
+
+#. TRANS: Field label for StatusNet site logo.
+msgid "Site logo"
+msgstr "Site logo"
+
+#. TRANS: Field label for SSL StatusNet site logo.
+msgid "SSL logo"
+msgstr "SSL logo"
+
 #. TRANS: Button title for saving site settings.
-msgid "Save site settings"
+#, fuzzy
+msgid "Save the site settings."
 msgstr "Save site settings"
 
 #. TRANS: Page title for site-wide notice tab in admin panel.
@@ -5905,7 +5636,7 @@ msgstr "Site notice text"
 msgid "Site-wide notice text (255 characters maximum; HTML allowed)"
 msgstr ""
 
-#. TRANS: Title for button to save site notice in admin panel.
+#. TRANS: Button title to save site notice in admin panel.
 #, fuzzy
 msgid "Save site notice."
 msgstr "Save site notice"
@@ -6103,7 +5834,7 @@ msgstr "Report URL"
 msgid "Snapshots will be sent to this URL."
 msgstr ""
 
-#. TRANS: Title for button to save snapshot settings.
+#. TRANS: Button title to save snapshot settings.
 #, fuzzy
 msgid "Save snapshot settings."
 msgstr "Save snapshot settings"
@@ -6138,10 +5869,6 @@ msgstr "%1$s group members, page %2$d"
 msgid "A list of users awaiting approval to subscribe to you."
 msgstr "A list of the users in this group."
 
-#. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
-msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
-msgstr "You cannot subscribe to an OMB 0.1 remote profile with this action."
-
 #. TRANS: Page title when subscription succeeded.
 msgid "Subscribed"
 msgstr "Subscribed"
@@ -6245,8 +5972,7 @@ msgid ""
 "You're not listening to anyone's notices right now, try subscribing to "
 "people you know. Try [people search](%%action.peoplesearch%%), look for "
 "members in groups you're interested in and in our [featured users](%%action."
-"featured%%). If you're a [Twitter user](%%action.twittersettings%%), you can "
-"automatically subscribe to people you already follow there."
+"featured%%)."
 msgstr ""
 
 #. TRANS: Subscription list text when looking at the subscriptions for a of a user other
@@ -6278,6 +6004,12 @@ msgstr "SMS"
 msgid "Notices tagged with %1$s, page %2$d"
 msgstr "Notices tagged with %1$s, page %2$d"
 
+#. TRANS: Link label for feed on "notices with tag" page.
+#. TRANS: %s is the tag the feed is for.
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (Activity Streams JSON)"
+msgstr "Notice feed for tag %s (Atom)"
+
 #. TRANS: Link label for feed on "notices with tag" page.
 #. TRANS: %s is the tag the feed is for.
 #, php-format
@@ -6386,17 +6118,6 @@ msgstr "Unsubscribed"
 msgid "%1$s unsubscribed from list %2$s by %3$s"
 msgstr "%1$s subscribers, page %2$d"
 
-#. TRANS: Client error displayed when trying to update profile with an incompatible license.
-#. TRANS: %1$s is the license incompatible with site license %2$s.
-#. TRANS: Exception thrown when licenses are not compatible for an authorisation request.
-#. TRANS: %1$s is the license for the listenee, %2$s is the license for "this" StatusNet site.
-#, fuzzy, php-format
-msgid ""
-"Listenee stream license \"%1$s\" is not compatible with site license \"%2$s"
-"\"."
-msgstr ""
-"Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
-
 #. TRANS: Title of URL settings tab in profile settings.
 #, fuzzy
 msgid "URL settings"
@@ -6535,163 +6256,11 @@ msgstr "Invitations enabled"
 msgid "Whether to allow users to invite new users."
 msgstr ""
 
-#. TRANS: Title for button to save user settings in user admin panel.
+#. TRANS: Button title to save user settings in user admin panel.
 #, fuzzy
 msgid "Save user settings."
 msgstr "Save site settings"
 
-#. TRANS: Page title.
-msgid "Authorize subscription"
-msgstr "Authorise subscription"
-
-#. TRANS: Page notice on "Authorize subscription" page.
-#, fuzzy
-msgid ""
-"Please check these details to make sure that you want to subscribe to this "
-"user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
-"click \"Reject\"."
-msgstr ""
-"Please check these details to make sure that you want to subscribe to this "
-"user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
-"click “Reject�."
-
-#. TRANS: Button text on Authorise Subscription page.
-#. TRANS: Submit button text to accept a group membership request on approve group form.
-#. TRANS: Submit button text to accept a subscription request on approve sub form.
-#, fuzzy
-msgctxt "BUTTON"
-msgid "Accept"
-msgstr "Accept"
-
-#. TRANS: Title for button on Authorise Subscription page.
-#. TRANS: Button title to subscribe to a user.
-#, fuzzy
-msgid "Subscribe to this user."
-msgstr "Subscribe to this user"
-
-#. TRANS: Button text on Authorise Subscription page.
-#. TRANS: Submit button text to reject a group membership request on approve group form.
-#. TRANS: Submit button text to reject a subscription request on approve sub form.
-#, fuzzy
-msgctxt "BUTTON"
-msgid "Reject"
-msgstr "Reject"
-
-#. TRANS: Title for button on Authorise Subscription page.
-#, fuzzy
-msgid "Reject this subscription."
-msgstr "Reject this subscription"
-
-#. TRANS: Client error displayed for an empty authorisation request.
-msgid "No authorization request!"
-msgstr "No authorisation request!"
-
-#. TRANS: Accept message header from Authorise subscription page.
-msgid "Subscription authorized"
-msgstr "Subscription authorised"
-
-#. TRANS: Accept message text from Authorise subscription page.
-msgid ""
-"The subscription has been authorized, but no callback URL was passed. Check "
-"with the site's instructions for details on how to authorize the "
-"subscription. Your subscription token is:"
-msgstr ""
-"The subscription has been 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:"
-
-#. TRANS: Reject message header from Authorise subscription page.
-msgid "Subscription rejected"
-msgstr "Subscription rejected"
-
-#. TRANS: Reject message from Authorise subscription page.
-msgid ""
-"The subscription has been rejected, but no callback URL was passed. Check "
-"with the site's instructions for details on how to fully reject the "
-"subscription."
-msgstr ""
-"The subscription has been rejected, but no callback URL was passed. Check "
-"with the site’s instructions for details on how to fully reject the "
-"subscription."
-
-#. TRANS: Exception thrown when no valid user is found for an authorisation request.
-#. TRANS: %s is a listener URI.
-#, php-format
-msgid "Listener URI \"%s\" not found here."
-msgstr ""
-
-#. TRANS: Exception thrown when listenee URI is too long for an authorisation request.
-#. TRANS: %s is a listenee URI.
-#, fuzzy, php-format
-msgid "Listenee URI \"%s\" is too long."
-msgstr "Source URL is too long."
-
-#. TRANS: Exception thrown when listenee URI is a local user for an authorisation request.
-#. TRANS: %s is a listenee URI.
-#, php-format
-msgid "Listenee URI \"%s\" is a local user."
-msgstr ""
-
-#. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
-#. TRANS: %s is a profile URL.
-#, php-format
-msgid "Profile URL \"%s\" is for a local user."
-msgstr ""
-
-#. TRANS: Exception thrown when avatar URL is invalid for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#, fuzzy, php-format
-msgid "Avatar URL \"%s\" is not valid."
-msgstr "Avatar URL ‘%s’ is not valid."
-
-#. TRANS: Exception thrown when avatar URL could not be read for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#, fuzzy, php-format
-msgid "Cannot read avatar URL \"%s\"."
-msgstr "Can’t read avatar URL ‘%s’."
-
-#. TRANS: Exception thrown when avatar URL return an invalid image type for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#, fuzzy, php-format
-msgid "Wrong image type for avatar URL \"%s\"."
-msgstr "Wrong image type for avatar URL ‘%s’."
-
-#. TRANS: Title for profile design page.
-#. TRANS: Page title for profile design page.
-msgid "Profile design"
-msgstr "Profile design"
-
-#. TRANS: Instructions for Profile design page.
-#. TRANS: Instructions for profile design page.
-msgid ""
-"Customize the way your profile looks with a background image and a colour "
-"palette of your choice."
-msgstr ""
-"Customise the way your profile looks with a background image and a colour "
-"palette of your choice."
-
-#. TRANS: Succes message on Profile design page when finding an easter egg.
-msgid "Enjoy your hotdog!"
-msgstr ""
-
-#. TRANS: Form legend on Profile design page.
-#, fuzzy
-msgid "Design settings"
-msgstr "Save site settings"
-
-#. TRANS: Checkbox label on Profile design page.
-msgid "View profile designs"
-msgstr "View profile designs"
-
-#. TRANS: Title for checkbox on Profile design page.
-msgid "Show or hide profile designs."
-msgstr "Show or hide profile designs."
-
-#. TRANS: Form legend on Profile design page for form to choose a background image.
-#, fuzzy
-msgid "Background file"
-msgstr "Background"
-
 #. TRANS: Page title for all but the first page of groups for a user.
 #. TRANS: %1$s is a nickname, %2$d is a page number.
 #, php-format
@@ -6732,7 +6301,7 @@ msgstr "StatusNet %s"
 #. TRANS: %1$s is the engine name (StatusNet) and %2$s is the StatusNet version.
 #, php-format
 msgid ""
-"This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, "
+"This site is powered by %1$s version %2$s, Copyright 2008-2011 StatusNet, "
 "Inc. and contributors."
 msgstr ""
 
@@ -6745,11 +6314,12 @@ msgid "License"
 msgstr "License"
 
 #. TRANS: Content part of StatusNet version page.
+#, fuzzy
 msgid ""
 "StatusNet is free software: you can redistribute it and/or modify it under "
 "the terms of the GNU Affero General Public License as published by the Free "
 "Software Foundation, either version 3 of the License, or (at your option) "
-"any later version. "
+"any later version."
 msgstr ""
 "StatusNet is free software: you can redistribute it and/or modify it under "
 "the terms of the GNU Affero General Public Licence as published by the Free "
@@ -6757,11 +6327,12 @@ msgstr ""
 "any later version. "
 
 #. TRANS: Content part of StatusNet version page.
+#, fuzzy
 msgid ""
 "This program is distributed in the hope that it will be useful, but WITHOUT "
 "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
 "FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License "
-"for more details. "
+"for more details."
 msgstr ""
 "This program is distributed in the hope that it will be useful, but WITHOUT "
 "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
@@ -6824,16 +6395,26 @@ msgstr ""
 msgid "Robin thinks something is impossible."
 msgstr ""
 
+#. TRANS: Message used to be inserted as %2$s in  the text "No file may
+#. TRANS: be larger than %1$d byte and the file you sent was %2$s.".
+#. TRANS: %1$d is the number of bytes of an uploaded file.
+#, php-format
+msgid "%1$d byte"
+msgid_plural "%1$d bytes"
+msgstr[0] ""
+msgstr[1] ""
+
 #. TRANS: Message given if an upload is larger than the configured maximum.
-#. TRANS: %1$d is the byte limit for uploads, %2$d is the byte count for the uploaded file.
-#. TRANS: %1$s is used for plural.
+#. TRANS: %1$d (used for plural) is the byte limit for uploads,
+#. TRANS: %2$s is the proper form of "n bytes". This is the only ways to have
+#. TRANS: gettext support multiple plurals in the same message, unfortunately...
 #, php-format
 msgid ""
-"No file may be larger than %1$d byte and the file you sent was %2$d bytes. "
-"Try to upload a smaller version."
+"No file may be larger than %1$d byte and the file you sent was %2$s. Try to "
+"upload a smaller version."
 msgid_plural ""
-"No file may be larger than %1$d bytes and the file you sent was %2$d bytes. "
-"Try to upload a smaller version."
+"No file may be larger than %1$d bytes and the file you sent was %2$s. Try to "
+"upload a smaller version."
 msgstr[0] ""
 msgstr[1] ""
 
@@ -6901,6 +6482,11 @@ msgstr "Could not update local group."
 msgid "Could not create login token for %s"
 msgstr "Could not create login token for %s"
 
+#. TRANS: Exception thrown when a program code class (%s) cannot be instantiated.
+#, fuzzy, php-format
+msgid "Cannot instantiate class %s."
+msgstr "Can't save new password."
+
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.
 msgid "No database name or DSN found anywhere."
 msgstr ""
@@ -7062,7 +6648,7 @@ msgstr ""
 #, php-format
 msgid ""
 "You already have %1$d or more people in list %2$s, which is the maximum "
-"allowed number.Try unlisting others first."
+"allowed number. Try unlisting others first."
 msgstr ""
 
 #. TRANS: Exception thrown when inserting a list subscription in the database fails.
@@ -7084,7 +6670,6 @@ msgid "Unable to save tag."
 msgstr "Unable to save tag."
 
 #. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
-#. TRANS: Error message displayed to a banned user when they try to subscribe.
 msgid "You have been banned from subscribing."
 msgstr "You have been banned from subscribing."
 
@@ -7104,10 +6689,6 @@ msgstr "Not subscribed!"
 msgid "Could not delete self-subscription."
 msgstr "Could not delete self-subscription."
 
-#. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
-msgid "Could not delete subscription OMB token."
-msgstr "Could not delete subscription OMB token."
-
 #. TRANS: Exception thrown when a subscription could not be deleted on the server.
 msgid "Could not delete subscription."
 msgstr "Could not delete subscription."
@@ -7142,6 +6723,18 @@ msgstr ""
 msgid "Single-user mode code called when not enabled."
 msgstr ""
 
+#. TRANS: Information on password recovery form if no known username or e-mail address was specified.
+msgid "No user with that email address or username."
+msgstr "No user with that e-mail address or username."
+
+#. TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.
+msgid "No registered email address for that user."
+msgstr "No registered e-mail address for that user."
+
+#. TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.
+msgid "Error saving address confirmation."
+msgstr "Error saving address confirmation."
+
 #. TRANS: Server exception thrown when creating a group failed.
 msgid "Could not create group."
 msgstr "Could not create group."
@@ -7415,27 +7008,12 @@ msgstr "showForm() not implemented."
 msgid "saveSettings() not implemented."
 msgstr "saveSettings() not implemented."
 
-#. TRANS: Client error message thrown if design settings could not be deleted in
-#. TRANS: the admin panel Design.
-msgid "Unable to delete design setting."
-msgstr "Unable to delete design setting."
-
 #. TRANS: Header in administrator navigation panel.
-#. TRANS: Header in settings navigation panel.
 #, fuzzy
 msgctxt "HEADER"
 msgid "Home"
 msgstr "Homepage"
 
-#. TRANS: Menu item in administrator navigation panel.
-#. TRANS: Menu item in default local navigation panel.
-#. TRANS: Menu item in personal group navigation menu.
-#. TRANS: Menu item in settings navigation panel.
-#, fuzzy
-msgctxt "MENU"
-msgid "Home"
-msgstr "Homepage"
-
 #. TRANS: Header in administrator navigation panel.
 #, fuzzy
 msgctxt "HEADER"
@@ -7451,17 +7029,6 @@ msgctxt "MENU"
 msgid "Site"
 msgstr "Site"
 
-#. TRANS: Menu item title in administrator navigation panel.
-msgid "Design configuration"
-msgstr "Design configuration"
-
-#. TRANS: Menu item in administrator navigation panel.
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: Menu item in settings navigation panel.
-msgctxt "MENU"
-msgid "Design"
-msgstr "Design"
-
 #. TRANS: Menu item title in administrator navigation panel.
 msgid "User configuration"
 msgstr "User configuration"
@@ -7565,43 +7132,6 @@ msgstr ""
 msgid "Could not authenticate you."
 msgstr ""
 
-#. TRANS: Server error displayed when trying to create an anynymous OAuth consumer.
-#, fuzzy
-msgid "Could not create anonymous consumer."
-msgstr "Could not create aliases."
-
-#. TRANS: Server error displayed when trying to create an anynymous OAuth application.
-#, fuzzy
-msgid "Could not create anonymous OAuth application."
-msgstr "Could not create application."
-
-#. TRANS: Exception thrown when no token association could be found.
-msgid ""
-"Could not find a profile and application associated with the request token."
-msgstr ""
-
-#. TRANS: Exception thrown when no access token can be issued.
-#, fuzzy
-msgid "Could not issue access token."
-msgstr "Could not insert message."
-
-#. TRANS: Exception thrown when a database error occurs.
-msgid "Database error inserting OAuth application user."
-msgstr "Database error inserting OAuth application user."
-
-#. TRANS: Exception thrown when a database error occurs.
-#, fuzzy
-msgid "Database error updating OAuth application user."
-msgstr "Database error inserting OAuth application user."
-
-#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
-msgid "Tried to revoke unknown token."
-msgstr ""
-
-#. TRANS: Exception thrown when an attempt is made to remove a revoked token.
-msgid "Failed to delete revoked token."
-msgstr ""
-
 #. TRANS: Form input field label for application icon.
 msgid "Icon"
 msgstr ""
@@ -7682,13 +7212,14 @@ msgid "Default access for this application: read-only, or read-write"
 msgstr ""
 
 #. TRANS: Submit button title.
-msgid "Cancel"
-msgstr "Cancel"
+#, fuzzy
+msgid "Cancel application changes."
+msgstr "Connected applications"
 
 #. TRANS: Submit button title.
-#. TRANS: Button text to save a list.
-msgid "Save"
-msgstr "Save"
+#, fuzzy
+msgid "Save application changes."
+msgstr "New Application"
 
 #. TRANS: Name for an anonymous application in application list.
 #, fuzzy
@@ -7724,6 +7255,20 @@ msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "Revoke"
 
+#. TRANS: Submit button text to accept a group membership request on approve group form.
+#. TRANS: Submit button text to accept a subscription request on approve sub form.
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Accept"
+msgstr "Accept"
+
+#. TRANS: Submit button text to reject a group membership request on approve group form.
+#. TRANS: Submit button text to reject a subscription request on approve sub form.
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Reject"
+msgstr "Reject"
+
 #. TRANS: Atom feed exception thrown when an author element does not contain a name element.
 msgid "Author element must contain a name element."
 msgstr ""
@@ -8283,6 +7828,11 @@ msgstr ""
 msgid "Go to the installer."
 msgstr "Go to the installer."
 
+#. TRANS: Header on conversation page. Hidden by default (h2).
+#. TRANS: Label for user statistics.
+msgid "Notices"
+msgstr "Notices"
+
 #. TRANS: Page title for when a database error occurs.
 msgid "Database error"
 msgstr ""
@@ -8294,14 +7844,6 @@ msgctxt "MENU"
 msgid "Public"
 msgstr "Public"
 
-#. TRANS: Menu item in default local navigation panel.
-#. TRANS: Menu item in search group navigation panel.
-#. TRANS: Menu item in local navigation menu.
-#, fuzzy
-msgctxt "MENU"
-msgid "Groups"
-msgstr "Groups"
-
 #. TRANS: Menu item in default local navigation panel.
 #. TRANS: Menu item title in local navigation menu.
 #, fuzzy
@@ -8318,53 +7860,12 @@ msgstr "Delete"
 msgid "Delete this user"
 msgstr "Delete this user"
 
-#. TRANS: Form legend of form for changing the page design.
-#, fuzzy
-msgid "Change design"
-msgstr "Save design"
-
-#. TRANS: Fieldset legend on profile design page to change profile page colours.
-msgid "Change colours"
-msgstr "Change colours"
-
-#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-msgid "Use defaults"
-msgstr "Use defaults"
-
-#. TRANS: Label in form on profile design page.
-#. TRANS: Field contains file name on user's computer that could be that user's custom profile background image.
-msgid "Upload file"
-msgstr "Upload file"
-
-#. TRANS: Instructions for form on profile design page.
-msgid ""
-"You can upload your personal background image. The maximum file size is 2MB."
-msgstr ""
-"You can upload your personal background image. The maximum file size is 2MB."
-
-#. TRANS: Radio button on profile design page that will enable use of the uploaded profile image.
-#, fuzzy
-msgctxt "RADIO"
-msgid "On"
-msgstr "On"
-
-#. TRANS: Radio button on profile design page that will disable use of the uploaded profile image.
-#, fuzzy
-msgctxt "RADIO"
-msgid "Off"
-msgstr "Off"
-
-#. TRANS: Success message displayed if design settings were saved after clicking "Use defaults".
-msgid "Design defaults restored."
-msgstr "Design defaults restored."
-
 #. TRANS: Exception. %s is an ID.
 #, fuzzy, php-format
 msgid "Unable to find services for %s."
 msgstr "Use this form to edit your application."
 
 #. TRANS: Form legend for removing the favourite status for a favourite notice.
-#. TRANS: Title for button text for removing the favourite status for a favourite notice.
 msgid "Disfavor this notice"
 msgstr "Disfavour this notice"
 
@@ -8374,8 +7875,12 @@ msgctxt "BUTTON"
 msgid "Disfavor favorite"
 msgstr "Disfavor favourite"
 
+#. TRANS: Button title for removing the favourite status for a favourite notice.
+#, fuzzy
+msgid "Remove this notice from your list of favorite notices."
+msgstr "Could not retrieve favourite notices."
+
 #. TRANS: Form legend for adding the favourite status to a notice.
-#. TRANS: Title for button text for adding the favourite status to a notice.
 msgid "Favor this notice"
 msgstr "Favour this notice"
 
@@ -8385,6 +7890,11 @@ msgctxt "BUTTON"
 msgid "Favor"
 msgstr "Favour"
 
+#. TRANS: Button title for adding the favourite status to a notice.
+#, fuzzy
+msgid "Add this notice to your list of favorite notices."
+msgstr "Could not retrieve favourite notices."
+
 #. TRANS: Feed type name.
 msgid "RSS 1.0"
 msgstr ""
@@ -8401,6 +7911,10 @@ msgstr ""
 msgid "FOAF"
 msgstr ""
 
+#. TRANS: Feed type name. See http://activitystrea.ms/
+msgid "Activity Streams"
+msgstr ""
+
 #. TRANS: Client exception thrown when an imported feed does not have an author.
 msgid "No author in the feed."
 msgstr ""
@@ -8434,6 +7948,28 @@ msgstr "Choose a tag to narrow list"
 msgid "Grant this user the \"%s\" role"
 msgstr ""
 
+#. TRANS: Header for mini list of group members on a group page (h2).
+msgid "Members"
+msgstr "Members"
+
+#. TRANS: Link to all group members from mini list of group members if group has more than n members.
+msgid "All members"
+msgstr "All members"
+
+#. TRANS: Header for mini list of users with a pending membership request on a group page (h2).
+msgid "Pending"
+msgstr ""
+
+#. TRANS: Header for mini list of users that are blocked in a group page (h2).
+msgid "Blocked"
+msgstr "Blocked"
+
+#. TRANS: Title for list of group administrators on a group page.
+#, fuzzy
+msgctxt "TITLE"
+msgid "Admins"
+msgstr "Admins"
+
 #. TRANS: Button text for the form that will block a user from a group.
 msgctxt "BUTTON"
 msgid "Block"
@@ -8441,7 +7977,7 @@ msgstr ""
 
 #. TRANS: Submit button title.
 msgctxt "TOOLTIP"
-msgid "Block this user"
+msgid "Block this user so that they can no longer post messages to it."
 msgstr ""
 
 #. TRANS: Field title on group edit form.
@@ -8496,63 +8032,9 @@ msgctxt "GROUPADMIN"
 msgid "Admin"
 msgstr "Admin"
 
-#. TRANS: Menu item in the group navigation page.
-msgctxt "MENU"
-msgid "Group"
-msgstr ""
-
-#. TRANS: Tooltip for menu item in the group navigation page.
-#. TRANS: %s is the nickname of the group.
-#, php-format
-msgctxt "TOOLTIP"
-msgid "%s group"
-msgstr ""
-
-#. TRANS: Menu item in the group navigation page.
-msgctxt "MENU"
-msgid "Members"
-msgstr ""
-
-#. TRANS: Tooltip for menu item in the group navigation page.
-#. TRANS: %s is the nickname of the group.
-#, php-format
-msgctxt "TOOLTIP"
-msgid "%s group members"
-msgstr ""
-
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: %d is the number of pending members.
-#, php-format
-msgctxt "MENU"
-msgid "Pending members (%d)"
-msgid_plural "Pending members (%d)"
-msgstr[0] ""
-msgstr[1] ""
-
-#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: %s is the nickname of the group.
-#, fuzzy, php-format
-msgctxt "TOOLTIP"
-msgid "%s pending members"
-msgstr "%s group members"
-
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-msgctxt "MENU"
-msgid "Blocked"
-msgstr ""
-
-#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: %s is the nickname of the group.
-#, php-format
-msgctxt "TOOLTIP"
-msgid "%s blocked users"
-msgstr ""
-
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: Menu item in primary navigation panel.
-msgctxt "MENU"
-msgid "Admin"
-msgstr "Admin"
+#. TRANS: Group actions header (h2). Text hidden by default.
+msgid "Group actions"
+msgstr "Group actions"
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
@@ -8561,11 +8043,6 @@ msgctxt "TOOLTIP"
 msgid "Edit %s group properties"
 msgstr ""
 
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-msgctxt "MENU"
-msgid "Logo"
-msgstr ""
-
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
 #, php-format
@@ -8573,17 +8050,11 @@ msgctxt "TOOLTIP"
 msgid "Add or edit %s logo"
 msgstr ""
 
-#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: %s is the nickname of the group.
-#, php-format
-msgctxt "TOOLTIP"
-msgid "Add or edit %s design"
+#. TRANS: Link text for link on user profile.
+msgctxt "MENU"
+msgid "Logo"
 msgstr ""
 
-#. TRANS: Group actions header (h2). Text hidden by default.
-msgid "Group actions"
-msgstr "Group actions"
-
 #. TRANS: Title for groups with the most members section.
 #, fuzzy
 msgid "Popular groups"
@@ -8594,11 +8065,19 @@ msgstr "Popular notices"
 msgid "Active groups"
 msgstr "All groups"
 
-#. TRANS: Title for group tag cloud section.
-#. TRANS: %s is a group name.
-#, php-format
-msgid "Tags in %s group's notices"
-msgstr "Tags in %s group's notices"
+#. TRANS: Link description for seeing all groups.
+#. TRANS: Link description for seeing all lists.
+msgid "See all"
+msgstr ""
+
+#. TRANS: Link title for seeing all groups.
+msgid "See all groups you belong to."
+msgstr ""
+
+#. TRANS: Menu item title in personal group navigation menu.
+#. TRANS: %s is a username.
+msgid "Back to top"
+msgstr ""
 
 #. TRANS: Client exception 406
 msgid "This page is not available in a media type you accept"
@@ -8683,12 +8162,45 @@ msgctxt "TITLE"
 msgid "Trends"
 msgstr ""
 
-#. TRANS: Button text for inviting more users to the StatusNet instance.
+#. TRANS: Default button text for inviting more users to the StatusNet instance.
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Invite more colleagues"
 msgstr "Invite new users"
 
+#. TRANS: Form legend.
+#, fuzzy
+msgid "Invite collegues"
+msgstr "Invite new users"
+
+#. TRANS: Field label for a list of e-mail addresses.
+msgid "Email addresses"
+msgstr "E-mail addresses"
+
+#. TRANS: Field title for a list of e-mail addresses.
+#, fuzzy
+msgid "Addresses of friends to invite (one per line)."
+msgstr "Addresses of friends to invite (one per line)"
+
+#. TRANS: Field label for a personal message to send to invitees.
+msgid "Personal message"
+msgstr "Personal message"
+
+#. TRANS: Field title for a personal message to send to invitees.
+msgid "Optionally add a personal message to the invitation."
+msgstr "Optionally add a personal message to the invitation."
+
+#. TRANS: Send button for inviting friends
+#. TRANS: Button text for sending notice.
+msgctxt "BUTTON"
+msgid "Send"
+msgstr "Send"
+
+#. TRANS: Submit button title.
+#, fuzzy
+msgid "Send invitations."
+msgstr "Invitations"
+
 #. TRANS: Button text for joining a group.
 #, fuzzy
 msgctxt "BUTTON"
@@ -8701,6 +8213,11 @@ msgctxt "BUTTON"
 msgid "Leave"
 msgstr "Leave"
 
+#. TRANS: Link title for seeing all lists.
+#, fuzzy
+msgid "See all lists you have created."
+msgstr "Applications you have registered"
+
 #. TRANS: Menu item for logging in to the StatusNet site.
 #. TRANS: Menu item in primary navigation panel.
 msgctxt "MENU"
@@ -8747,9 +8264,9 @@ msgstr ""
 #. TRANS: %1$s is the subscribing user's nickname, %2$s is the StatusNet sitename.
 #. TRANS: Main body of new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscriber's long name, %2$s is the StatusNet sitename.
-#, 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."
+#, fuzzy, php-format
+msgid "%1$s is now following you on %2$s."
+msgstr "%1$s is now following %2$s."
 
 #. TRANS: Subject of pending new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscribing user's nickname, %2$s is the StatusNet sitename.
@@ -8939,7 +8456,7 @@ msgstr "%s (@%s) sent a notice to your attention"
 #. TRANS: Body of @-reply notification e-mail.
 #. TRANS: %1$s is the sending user's name, $2$s is the StatusNet sitename,
 #. TRANS: %3$s is a URL to the notice, %4$s is the notice text,
-#. TRANS: %5$s is a URL to the full conversion if it exists (otherwise empty),
+#. TRANS: %5$s is the text "The full conversation can be read here:" and a URL to the full conversion if it exists (otherwise empty),
 #. TRANS: %6$s is a URL to reply to the notice, %7$s is a URL to all @-replies for the addressed user,
 #, php-format
 msgid ""
@@ -8964,6 +8481,10 @@ msgstr ""
 
 #. TRANS: Subject of group join notification e-mail.
 #. TRANS: %1$s is the joining user's nickname, %2$s is the group name, and %3$s is the StatusNet sitename.
+#, fuzzy, php-format
+msgid "%1$s has joined your group %2$s on %3$s"
+msgstr "%1$s joined group %2$s"
+
 #. TRANS: Main body of group join notification e-mail.
 #. TRANS: %1$s is the subscriber's long name, %2$s is the group name, and %3$s is the StatusNet sitename,
 #. TRANS: %4$s is a block of profile info about the subscriber.
@@ -9051,9 +8572,10 @@ msgid "Make Admin"
 msgstr ""
 
 #. TRANS: Submit button title.
+#, fuzzy
 msgctxt "TOOLTIP"
-msgid "Make this user an admin"
-msgstr ""
+msgid "Make this user an admin."
+msgstr "Make user an admin of the group"
 
 #. TRANS: Client exception thrown when a database error was thrown during a file upload operation.
 msgid "There was a database error while saving your file. Please try again."
@@ -9099,7 +8621,7 @@ msgstr "Send a direct notice"
 msgid "Select recipient:"
 msgstr "Select a carrier"
 
-#. TRANS Entry in drop-down selection box in direct-message inbox/outbox when no one is available to message.
+#. TRANS: Entry in drop-down selection box in direct-message inbox/outbox when no one is available to message.
 #, fuzzy
 msgid "No mutual subscribers."
 msgstr "Not subscribed!"
@@ -9171,6 +8693,10 @@ msgstr ""
 msgid "You must implement either adaptNoticeListItem() or showNotice()."
 msgstr ""
 
+#. TRANS: Link description to show more items in a list.
+msgid "More â–¼"
+msgstr ""
+
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 msgid "Nickname cannot be empty."
 msgstr ""
@@ -9218,10 +8744,6 @@ msgctxt "SEPARATOR"
 msgid ", "
 msgstr ""
 
-#. TRANS: Start of profile addressees list.
-msgid " â–¸ "
-msgstr ""
-
 #. TRANS: Used in coordinates as abbreviation of north.
 msgid "N"
 msgstr "N"
@@ -9260,7 +8782,8 @@ msgid "Repeated by"
 msgstr "Repeated by"
 
 #. TRANS: Link title in notice list item to reply to a notice.
-msgid "Reply to this notice"
+#, fuzzy
+msgid "Reply to this notice."
 msgstr "Reply to this notice"
 
 #. TRANS: Link text in notice list item to reply to a notice.
@@ -9268,7 +8791,8 @@ msgid "Reply"
 msgstr "Reply"
 
 #. TRANS: Link title in notice list item to delete a notice.
-msgid "Delete this notice"
+#, fuzzy
+msgid "Delete this notice from the timeline."
 msgstr "Delete this notice"
 
 #. TRANS: Title for repeat form status in notice list when a notice has been repeated.
@@ -9295,27 +8819,6 @@ msgstr "Nudge"
 msgid "Send a nudge to this user."
 msgstr "Send a nudge to this user"
 
-#. TRANS: Exception thrown when creating a new profile fails in OAuth store.
-msgid "Error inserting new profile."
-msgstr ""
-
-#. TRANS: Exception thrown when creating a new avatar fails in OAuth store.
-msgid "Error inserting avatar."
-msgstr ""
-
-#. TRANS: Exception thrown when creating a remote profile fails in OAuth store.
-msgid "Error inserting remote profile."
-msgstr ""
-
-#. TRANS: Exception thrown when a notice is denied because it has been sent before.
-msgid "Duplicate notice."
-msgstr ""
-
-#. TRANS: Exception thrown when creating a new subscription fails in OAuth store.
-#, fuzzy
-msgid "Could not insert new subscription."
-msgstr "Couldn't insert new subscription."
-
 #. TRANS: Server exception thrown in oEmbed action if no API endpoint is available.
 #, fuzzy
 msgid "No oEmbed API endpoint available."
@@ -9405,11 +8908,6 @@ msgstr "Edit"
 msgid "Edit %s list by you."
 msgstr "Edit %s group"
 
-#. TRANS: Link description for link to list of users tagged with a tag.
-#, fuzzy
-msgid "Tagged"
-msgstr "Tag"
-
 #. TRANS: Title for link to edit list settings.
 #, fuzzy
 msgid "Edit list settings."
@@ -9566,8 +9064,10 @@ msgctxt "plugin"
 msgid "Enable"
 msgstr ""
 
+#. TRANS: Plugin description for a disabled plugin.
 msgctxt "plugin-description"
-msgid "(Plugin descriptions unavailable when disabled.)"
+msgid ""
+"(The plugin description is unavailable when a plugin has been disabled.)"
 msgstr ""
 
 #. TRANS: Menu item in primary navigation panel.
@@ -9581,6 +9081,11 @@ msgstr "SMS settings"
 msgid "Change your personal settings."
 msgstr "Change your profile settings"
 
+#. TRANS: Menu item in primary navigation panel.
+msgctxt "MENU"
+msgid "Admin"
+msgstr "Admin"
+
 #. TRANS: Menu item title in primary navigation panel.
 #, fuzzy
 msgid "Site configuration."
@@ -9601,15 +9106,8 @@ msgstr "Logout from the site"
 msgid "Login to the site."
 msgstr "Login to the site"
 
-#. TRANS: Menu item in primary navigation panel.
-msgctxt "MENU"
-msgid "Search"
-msgstr "Search"
-
-#. TRANS: Menu item title in primary navigation panel.
-#, fuzzy
-msgid "Search the site."
-msgstr "Search site"
+msgid "This profile has been silenced by site moderators"
+msgstr ""
 
 #. TRANS: H2 text for user subscription statistics.
 #, fuzzy
@@ -9621,6 +9119,10 @@ msgstr "Allow"
 msgid "Followers"
 msgstr "Allow"
 
+#. TRANS: H2 text for user statistics.
+msgid "Statistics"
+msgstr "Statistics"
+
 #. TRANS: Label for user statistics.
 msgid "User ID"
 msgstr "User ID"
@@ -9629,10 +9131,6 @@ msgstr "User ID"
 msgid "Member since"
 msgstr "Member since"
 
-#. TRANS: Label for user statistics.
-msgid "Notices"
-msgstr "Notices"
-
 #. TRANS: Label for user statistics.
 #. TRANS: Average count of posts made per day since account registration.
 msgid "Daily average"
@@ -9725,6 +9223,7 @@ msgid "Keyword(s)"
 msgstr ""
 
 #. TRANS: Button text for searching site.
+#. TRANS: Button text for search button on search form.
 #. TRANS: Button text to search profiles.
 msgctxt "BUTTON"
 msgid "Search"
@@ -9775,23 +9274,6 @@ msgstr "Find content of notices"
 msgid "Find groups on this site"
 msgstr "Find groups on this site"
 
-#. TRANS: Secondary navigation menu item leading to help on StatusNet.
-msgctxt "MENU"
-msgid "Help"
-msgstr "Help"
-
-#. TRANS: Secondary navigation menu item leading to text about StatusNet site.
-#, fuzzy
-msgctxt "MENU"
-msgid "About"
-msgstr "About"
-
-#. TRANS: Secondary navigation menu item leading to Frequently Asked Questions.
-#, fuzzy
-msgctxt "MENU"
-msgid "FAQ"
-msgstr "F.A.Q."
-
 #. TRANS: Secondary navigation menu item leading to Terms of Service.
 msgctxt "MENU"
 msgid "TOS"
@@ -9815,19 +9297,6 @@ msgctxt "MENU"
 msgid "Version"
 msgstr "Version"
 
-#. TRANS: Secondary navigation menu item leading to e-mail contact information on the
-#. TRANS: StatusNet site, where to report bugs, ...
-#, fuzzy
-msgctxt "MENU"
-msgid "Contact"
-msgstr "Contact"
-
-#. TRANS: Secondary navigation menu item. Leads to information about embedding a timeline widget.
-#, fuzzy
-msgctxt "MENU"
-msgid "Badge"
-msgstr "Badge"
-
 #. TRANS: Default title for section/sidebar widget.
 msgid "Untitled section"
 msgstr "Untitled section"
@@ -9876,10 +9345,6 @@ msgstr "E-mail"
 msgid "Change email handling"
 msgstr "Change e-mail handling"
 
-#. TRANS: Menu item title in settings navigation panel.
-msgid "Design your profile"
-msgstr "Design your profile"
-
 #. TRANS: Menu item in settings navigation panel.
 #, fuzzy
 msgctxt "MENU"
@@ -9917,6 +9382,15 @@ msgstr "Connections"
 msgid "Authorized connected applications"
 msgstr "Authorised connected applications"
 
+#. TRANS: Menu item in settings navigation panel.
+msgctxt "MENU"
+msgid "Old school"
+msgstr ""
+
+#. TRANS: Menu item title in settings navigation panel.
+msgid "UI tweaks for old-school users"
+msgstr ""
+
 #. TRANS: Title of form to silence a user.
 #, fuzzy
 msgctxt "TITLE"
@@ -9927,6 +9401,43 @@ msgstr "Silence"
 msgid "Silence this user"
 msgstr "Silence this user"
 
+#. TRANS: Server error displayed when trying to create an anynymous OAuth consumer.
+#, fuzzy
+msgid "Could not create anonymous consumer."
+msgstr "Could not create aliases."
+
+#. TRANS: Server error displayed when trying to create an anynymous OAuth application.
+#, fuzzy
+msgid "Could not create anonymous OAuth application."
+msgstr "Could not create application."
+
+#. TRANS: Exception thrown when no token association could be found.
+msgid ""
+"Could not find a profile and application associated with the request token."
+msgstr ""
+
+#. TRANS: Exception thrown when no access token can be issued.
+#, fuzzy
+msgid "Could not issue access token."
+msgstr "Could not insert message."
+
+#. TRANS: Exception thrown when a database error occurs.
+msgid "Database error inserting OAuth application user."
+msgstr "Database error inserting OAuth application user."
+
+#. TRANS: Exception thrown when a database error occurs.
+#, fuzzy
+msgid "Database error updating OAuth application user."
+msgstr "Database error inserting OAuth application user."
+
+#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
+msgid "Tried to revoke unknown token."
+msgstr ""
+
+#. TRANS: Exception thrown when an attempt is made to remove a revoked token.
+msgid "Failed to delete revoked token."
+msgstr ""
+
 #. TRANS: Menu item in local navigation menu.
 #, fuzzy
 msgctxt "MENU"
@@ -9984,6 +9495,18 @@ msgstr "Invite friends and colleagues to join you on %s"
 msgid "Subscribe to this user"
 msgstr "Subscribe to this user"
 
+#. TRANS: Button text to subscribe to a user.
+#. TRANS: Button text for subscribing to a list.
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Subscribe"
+msgstr "Subscribe"
+
+#. TRANS: Button title to subscribe to a user.
+#, fuzzy
+msgid "Subscribe to this user."
+msgstr "Subscribe to this user"
+
 #. TRANS: Title of personal tag cloud section.
 msgid "People Tagcloud as self-tagged"
 msgstr ""
@@ -10106,16 +9629,26 @@ msgstr[1] ""
 #. TRANS: List message for notice repeated by logged in user.
 #, fuzzy
 msgctxt "REPEATLIST"
-msgid "You have repeated this notice."
+msgid "You repeated this."
 msgstr "You already repeated that notice."
 
-#. TRANS: List message for repeated notices.
-#. TRANS: %d is the number of users that have repeated a notice.
+#. TRANS: List message for when more than 4 people repeat something.
+#. TRANS: %%s is a list of users liking a notice, %d is the number over 4 that like the notice.
+#. TRANS: Plural is decided on the total number of users liking the notice (count of %%s + %d).
+#, php-format
+msgid "%%s and %d other repeated this."
+msgid_plural "%%s and %d others repeated this."
+msgstr[0] ""
+msgstr[1] ""
+
+#. TRANS: List message for favoured notices.
+#. TRANS: %%s is a list of users liking a notice.
+#. TRANS: Plural is based on the number of of users that have favoured a notice.
 #, fuzzy, php-format
-msgid "One person has repeated this notice."
-msgid_plural "%d people have repeated this notice."
-msgstr[0] "Already repeated that notice."
-msgstr[1] "Already repeated that notice."
+msgid "%%s repeated this."
+msgid_plural "%%s repeated this."
+msgstr[0] "Repeated to %s"
+msgstr[1] "Repeated to %s"
 
 #. TRANS: Form legend.
 #, fuzzy, php-format
@@ -10214,7 +9747,6 @@ msgid "Unsilence this user"
 msgstr "Unsilence this user"
 
 #. TRANS: Form legend on unsubscribe form.
-#. TRANS: Button title on unsubscribe form.
 msgid "Unsubscribe from this user"
 msgstr "Unsubscribe from this user"
 
@@ -10225,6 +9757,11 @@ msgctxt "BUTTON"
 msgid "Unsubscribe"
 msgstr "Unsubscribe"
 
+#. TRANS: Button title on unsubscribe form.
+#, fuzzy
+msgid "Unsubscribe from this user."
+msgstr "Unsubscribe from this user"
+
 #. TRANS: Exception text shown when no profile can be found for a user.
 #. TRANS: %1$s is a user nickname, $2$d is a user ID (number).
 #, php-format
@@ -10307,9 +9844,3 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
-
-#~ msgid "%1$s and friends, page %2$d"
-#~ msgstr "%1$s and friends, page %2$d"
-
-#~ msgid "You and friends"
-#~ msgstr "You and friends"
diff --git a/locale/eo/LC_MESSAGES/statusnet.po b/locale/eo/LC_MESSAGES/statusnet.po
index 465b154cd4..0a193fb8cc 100644
--- a/locale/eo/LC_MESSAGES/statusnet.po
+++ b/locale/eo/LC_MESSAGES/statusnet.po
@@ -4,6 +4,7 @@
 # Author: AVRS
 # Author: Brion
 # Author: Eliovir
+# Author: Happy5214
 # Author: Ianmcorvidae
 # Author: Kris10
 # Author: LyzTyphone
@@ -17,17 +18,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:56+0000\n"
-"Language-Team: Esperanto <http://translatewiki.net/wiki/Portal:eo>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:50+0000\n"
+"Language-Team: Esperanto <https://translatewiki.net/wiki/Portal:eo>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: eo\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-05-05 10:52:40+0000\n"
+"X-POT-Import-Date: 2012-04-22 22:02:21+0000\n"
 
 #. TRANS: Database error message.
 #, php-format
@@ -38,12 +39,6 @@ msgid ""
 "again."
 msgstr ""
 
-#. TRANS: Error message.
-msgid ""
-"An important error occured, probably related to email setup. Check logfiles "
-"for more info."
-msgstr ""
-
 #. TRANS: Error message.
 msgid "An error occurred."
 msgstr ""
@@ -102,12 +97,11 @@ msgstr "Malpermesi novan registri�on."
 msgid "Closed"
 msgstr "Fermita"
 
-#. TRANS: Title for button to save access settings in site admin panel.
-msgid "Save access settings"
-msgstr "Konservi atingan agordon"
+#. TRANS: Button title to save access settings in site admin panel.
+msgid "Save access settings."
+msgstr "Konservi atingajn agordojn"
 
-#. TRANS: Tooltip for button to save access settings in site admin panel.
-#. TRANS: Button text for saving theme settings.
+#. TRANS: Button text to save access settings in site admin panel.
 #. TRANS: Button label to save e-mail preferences.
 #. TRANS: Button label to save IM preferences.
 #. TRANS: Button text in the license admin panel.
@@ -123,7 +117,6 @@ msgstr "Konservi atingan agordon"
 #. TRANS: Button text for saving "Other settings" in profile.
 #. TRANS: Button text to save user settings in user admin panel.
 #. TRANS: Button label in the "Edit application" form.
-#. TRANS: Button text on profile design page to save settings.
 #. TRANS: Text for save button on group edit form.
 #. TRANS: Button text to save tags for a profile.
 msgctxt "BUTTON"
@@ -162,10 +155,6 @@ msgstr "Ne ekzistas tia profilo."
 msgid "No such list."
 msgstr "Ne ekzistas tiu listo."
 
-#. TRANS: Client error displayed when trying to add an OMB 0.1 remote profile to a list.
-msgid "You cannot list an OMB 0.1 remote profile with this action."
-msgstr "Vi ne povas listigi OMB 0.1-an foran profilon per ĉi tiu ago."
-
 #. TRANS: Client error displayed when an unknown error occurs when adding a user to a list.
 #. TRANS: %s is a username.
 #, php-format
@@ -195,7 +184,6 @@ msgstr "Ne estas tiu pa�o."
 #. TRANS: Client error when user not found for an rss related action.
 #. TRANS: Client error displayed when no existing user is provided for a user's delivery device setting.
 #. TRANS: Client error displayed if a user could not be found.
-#. TRANS: Client error when user not found updating a profile background image.
 #. TRANS: Client error displayed updating profile image without having a user object.
 #. TRANS: Client error displayed when making an Atom API request for an unknown user.
 #. TRANS: Client error displayed when trying to block a non-existing user or a user from another site.
@@ -221,14 +209,11 @@ msgstr "Ne estas tiu pa�o."
 #. TRANS: Client error displayed when trying to get the RSS feed with favorites of a user that does not exist.
 #. TRANS: Client error displayed when requesting Friends of a Friend feed without providing a user nickname.
 #. TRANS: Client error displayed when requesting Friends of a Friend feed for an object that is not a user.
-#. TRANS: Client error displayed when trying to get a user hCard for a non-existing user.
 #. TRANS: Client error displayed trying to make a micro summary without providing a valid user.
 #. TRANS: Client error displayed trying to send a direct message to a non-existing user.
 #. TRANS: Client error displayed trying to use "one time password login" without using an existing user.
 #. TRANS: Client error displayed when referring to non-existing user.
 #. TRANS: Client error displayed trying to perform an action related to a non-existing user.
-#. TRANS: Form validation error on page for remote subscribe when no user was provided.
-#. TRANS: Form validation error on page for remote subscribe when no user profile was found.
 #. TRANS: Client error displayed when trying to reply to a non-exsting user.
 #. TRANS: Client error displayed when providing a non-existing nickname in a RSS 1.0 action.
 #. TRANS: Client error.
@@ -237,7 +222,6 @@ msgstr "Ne estas tiu pa�o."
 #. TRANS: Client error displayed trying to find a user by ID for a non-existing ID.
 #. TRANS: Client error displayed requesting groups for a non-existing user.
 #. TRANS: Client error displayed when user not found for an action.
-#. TRANS: Client error displayed providing a non-existing nickname.
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #. TRANS: Client error displayed when trying to perform a gallery action with an unknown user.
 #. TRANS: Client error displayed when trying to access a mailbox without providing a user.
@@ -256,6 +240,13 @@ msgstr "Tempstrio de %s"
 msgid "%s's home timeline"
 msgstr "Tempstrio de %s"
 
+#. TRANS: %s is user nickname.
+#. TRANS: Feed title.
+#. TRANS: %s is tagger's nickname.
+#, fuzzy, php-format
+msgid "Feed for friends of %s (Activity Streams JSON)"
+msgstr "Fluo por amikoj de %s (Atom)"
+
 #. TRANS: %s is user nickname.
 #, php-format
 msgid "Feed for friends of %s (RSS 1.0)"
@@ -300,7 +291,7 @@ msgstr ""
 "Vi povas provi  [pu�eti %1$s](../%2$s) de lia profilo aŭ [afi�i ion al li](%%"
 "%%action.newnotice%%%%?status_textarea=%3$s)."
 
-#. TRANS: Encoutagement displayed on empty timeline user pages for anonymous users.
+#. TRANS: Encouragement displayed on empty timeline user pages for anonymous users.
 #. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
 #. TRANS: Empty list message for page with replies for a user for not logged in users.
 #. TRANS: %1$s is a user nickname. This message contains a Markdown link in the form [link text](link).
@@ -314,6 +305,12 @@ msgstr ""
 "Kial ne [krei konton](%%%%action.register%%%%) kaj poste pu�eti %s aŭ afi�i "
 "avizon al li?"
 
+#. TRANS: Button text for inviting more users to the StatusNet instance.
+#. TRANS: Less business/enterprise-oriented language for public sites.
+msgctxt "BUTTON"
+msgid "Send invite"
+msgstr "Sendi inviton"
+
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Title of API timeline for a user and friends.
 #. TRANS: %s is a username.
@@ -322,8 +319,6 @@ msgstr ""
 #. TRANS: %s is a username.
 #. TRANS: Menu item title in personal group navigation menu.
 #. TRANS: %s is a username.
-#. TRANS: Menu item title in settings navigation panel.
-#. TRANS: %s is a username.
 #, php-format
 msgid "%s and friends"
 msgstr "%s kaj amikoj"
@@ -363,7 +358,6 @@ msgstr ""
 #. TRANS: Server error thrown on database error updating SMS preferences.
 #. TRANS: Server error thrown on database error removing a registered SMS phone number.
 #. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
-#. TRANS: Server exception thrown on Profile design page when updating design settings fails.
 msgid "Could not update user."
 msgstr "Malsukcesis �isdatigi uzanton"
 
@@ -378,7 +372,6 @@ msgstr "Malsukcesis konservi la profilon."
 
 #. TRANS: Client error displayed when the number of bytes in a POST request exceeds a limit.
 #. TRANS: %s is the number of bytes of the CONTENT_LENGTH.
-#. TRANS: Form validation error in design settings form. POST should remain untranslated.
 #, php-format
 msgid ""
 "The server was unable to handle that much POST data (%s byte) due to its "
@@ -393,24 +386,6 @@ msgstr[1] ""
 "La servilo ne povis trakti tiom da POST-datumo (%s bajtoj) pro �ia nuna "
 "agordo."
 
-#. TRANS: Client error displayed when saving design settings fails because of an empty id.
-#. TRANS: Client error displayed when saving design settings fails because of an empty result.
-#. TRANS: Client error displayed when a database error occurs inserting profile colours.
-#. TRANS: Client error displayed when a database error occurs updating profile colours.
-#. TRANS: Form validation error displayed when group design settings could not be saved because of an application issue.
-#. TRANS: Form validation error on Profile design page when saving design settings has failed.
-#. TRANS: Form validation error on Profile design page when updating design settings has failed.
-msgid "Unable to save your design settings."
-msgstr "Malsukcesis konservi vian desegnan agordon"
-
-#. TRANS: Error displayed when updating design settings fails.
-#. TRANS: Client error displayed when a database error occurs updating profile colours.
-#. TRANS: Form validation error on Profile design page when updating design settings has failed.
-#. TRANS: Error message displayed if design settings could not be saved.
-#. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
-msgid "Could not update your design."
-msgstr "Malsukcesis �isdatigi vian desegnon."
-
 #. TRANS: Title for Atom feed.
 msgctxt "ATOM"
 msgid "Main"
@@ -457,6 +432,20 @@ msgstr "Ne sukcesis bloki uzanton."
 msgid "Unblock user failed."
 msgstr "Ne sukcesis malbloki uzanton."
 
+#. TRANS: Client exception thrown when no conversation ID is given.
+msgid "No conversation ID."
+msgstr "Mankas identigo de konversacio"
+
+#. TRANS: Client exception thrown when referring to a non-existing conversation ID (%d).
+#, php-format
+msgid "No conversation with ID %d."
+msgstr "Neniu konversacio kun identigo %d"
+
+#. TRANS: Title for conversion timeline.
+msgctxt "TITLE"
+msgid "Conversation"
+msgstr "Konversacio"
+
 #. TRANS: Title. %s is a user nickname.
 #, php-format
 msgid "Direct messages from %s"
@@ -496,11 +485,12 @@ msgid "Recipient user not found."
 msgstr "Ricevonta uzanto ne trovi�as."
 
 #. TRANS: Client error displayed trying to direct message another user who's not a friend (403).
-#, fuzzy
 msgid "Cannot send direct messages to users who aren't your friend."
 msgstr "Vi ne povas sendi rektan mesa�on al uzanto kiu ne estas via amiko."
 
 #. TRANS: Client error displayed trying to direct message self (403).
+#. TRANS: Client error displayed trying to send a direct message to self.
+#. TRANS: Error text shown when trying to send a direct message to self.
 msgid ""
 "Do not send a message to yourself; just say it to yourself quietly instead."
 msgstr "Ne sendu mesa�on al vi mem! Simple diru al vi mem anstataŭe."
@@ -729,7 +719,6 @@ msgstr "grupoj ĉe %s"
 
 #. TRANS: Client error displayed when trying to edit a group without being an admin.
 #. TRANS: Client error displayed trying to edit a group while not being a group admin.
-#. TRANS: Client error displayed trying to change group design settings without being a (group) admin.
 #. TRANS: Client error displayed when trying to change group logo settings while not being a group admin.
 msgid "You must be an admin to edit the group."
 msgstr "Vi devas esti administranto por redakti la grupon."
@@ -813,9 +802,8 @@ msgid "The specified user is not a subscriber of this list."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to unsubscribe from a non-subscribed list.
-#, fuzzy
 msgid "You are not subscribed to this list."
-msgstr "Vi ne abonis tiun profilon."
+msgstr "Vi ne abonis ĉi tiun liston."
 
 #. TRANS: Client error displayed when uploading a media file has failed.
 msgid "Upload failed."
@@ -848,7 +836,6 @@ msgstr "Datumbaza eraro enigi la uzanton de *OAuth-aplikaĵo."
 
 #. TRANS: Client error given on when invalid data was passed through a form in the OAuth API.
 #. TRANS: Unexpected validation error on avatar upload form.
-#. TRANS: Client error displayed when the submitted form contains unexpected data.
 #. TRANS: Client error displayed submitting invalid form data for edit application.
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
 #. TRANS: Form validation error message when an unsupported argument is used.
@@ -857,7 +844,6 @@ msgstr "Datumbaza eraro enigi la uzanton de *OAuth-aplikaĵo."
 #. TRANS: Client error when submitting a form with unexpected information.
 #. TRANS: Client error displayed when unexpected data is posted in the password recovery form.
 #. TRANS: Message given submitting a form with an unknown action in SMS settings.
-#. TRANS: Unknown form validation error in design settings form.
 msgid "Unexpected form submission."
 msgstr "Neatendita formo-sendo."
 
@@ -901,7 +887,6 @@ msgstr "Konto"
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Field label on account registration page.
-#. TRANS: Label for nickname on user authorisation page.
 #. TRANS: Field label on group edit form.
 #. TRANS: Dropdown option for searching in profiles.
 msgid "Nickname"
@@ -1220,12 +1205,9 @@ msgstr "Ensalutu por eksani�i."
 #. TRANS: Client error displayed when requesting Friends of a Friend feed for a nickname that is not a group.
 #. TRANS: Client error displayed trying to block a user from a group while specifying a non-existing group.
 #. TRANS: Client error displayed referring to a group's permalink for a non-existing group ID.
-#. TRANS: Client error displayed trying to change group design settings while providing a nickname for a non-existing group.
 #. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
 #. TRANS: Client error displayed when trying to view group members for a non-existing group.
 #. TRANS: Client error displayed when trying to view group members for an object that is not a group.
-#. TRANS: Client error displayed when trying to view group members for a non-existing group.
-#. TRANS: Client error displayed when trying to view group members for an object that is not a group.
 #. TRANS: Client error displayed when requesting a group RSS feed for group that does not exist.
 #. TRANS: Client error displayed when requesting a group RSS feed for an object that is not a group.
 #. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
@@ -1234,10 +1216,10 @@ msgstr "Ensalutu por eksani�i."
 #. TRANS: Client error displayed when trying to leave a non-local group.
 #. TRANS: Client error displayed when trying to leave a non-existing group.
 #. TRANS: Client error displayed when providing an invalid group ID on the Make Admin page.
-#. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
-#. TRANS: Client error displayed if no local group with a given name was found requesting group page.
 #. TRANS: Command exception text shown when a group is requested that does not exist.
 #. TRANS: Error text shown when trying to leave a group that does not exist.
+#. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
+#. TRANS: Client error displayed if no local group with a given name was found requesting group page.
 msgid "No such group."
 msgstr "Ne estas tiu grupo."
 
@@ -1304,6 +1286,7 @@ msgid "Join request canceled."
 msgstr ""
 
 #. TRANS: Client error displayed trying to approve subscription for a non-existing request.
+#. TRANS: %s is a user nickname.
 #, fuzzy, php-format
 msgid "%s is not in the moderation queue for your subscriptions."
 msgstr "%s ne estas en la atendovico por ali�o al tiu ĉi grupo."
@@ -1380,16 +1363,15 @@ msgstr "Estas neeble aldoni anecon de aliulo."
 
 #. TRANS: Client error displayed when not using the join verb.
 msgid "Can only handle join activities."
-msgstr ""
+msgstr "Povas nur trakti ali�ajn agojn."
 
 #. TRANS: Client exception thrown when trying to subscribe to a non-existing group.
 msgid "Unknown group."
 msgstr "Nekonata grupo."
 
 #. TRANS: Client exception thrown when trying to subscribe to an already subscribed group.
-#, fuzzy
 msgid "Already a member."
-msgstr "Jam ano."
+msgstr "Jam membro."
 
 #. TRANS: Client exception thrown when trying to subscribe to group while blocked from that group.
 #, fuzzy
@@ -1465,7 +1447,6 @@ msgstr "Ne estas tiu aldonaĵo."
 #. TRANS: Client error displayed trying to get an avatar without providing a nickname.
 #. TRANS: Client error displayed when requesting a list of blocked users for a group without providing a group nickname.
 #. TRANS: Client error displayed trying to edit a group while not proving a nickname for the group to edit.
-#. TRANS: Client error displayed trying to change group design settings without providing a group nickname.
 #. TRANS: Client error displayed when trying to change group logo settings without providing a nickname.
 #. TRANS: Client error displayed when trying to view group members without providing a group nickname.
 #. TRANS: Client error displayed when requesting a group RSS feed without providing a group nickname.
@@ -1669,10 +1650,9 @@ msgid "Unblock user from group"
 msgstr "Malbloki uzanton de grupo"
 
 #. TRANS: Button text for unblocking a user from a group.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Unblock"
-msgstr "Malbloki"
+msgstr "Malforbari"
 
 #. TRANS: Tooltip for button for unblocking a user from a group.
 #. TRANS: Description of the form to unblock a user.
@@ -1767,6 +1747,18 @@ msgstr "Adreso \"%s\" nun konfirmitas je via konto."
 msgid "Conversation"
 msgstr "Konversacio"
 
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#, fuzzy
+msgid "Conversation feed (Activity Streams JSON)"
+msgstr "Avizofluo pri %1$s  (Atom)"
+
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#, fuzzy
+msgid "Conversation feed (RSS 2.0)"
+msgstr "Avizofluo pri %1$s (RSS 2.0)"
+
 #. TRANS: Title for conversation page.
 #. TRANS: Title for page that shows a notice.
 #, fuzzy
@@ -1784,7 +1776,6 @@ msgid "You cannot delete your account."
 msgstr "Vi ne povas forvi�i vian konton."
 
 #. TRANS: Confirmation text for user deletion. The user has to type this exactly the same, including punctuation.
-#, fuzzy
 msgid "I am sure."
 msgstr "Mi estas certa."
 
@@ -1834,7 +1825,8 @@ msgid "Enter \"%s\" to confirm that you want to delete your account."
 msgstr "Enigu «%s» por konfirmi, ke vi volas forvi�i vian konton."
 
 #. TRANS: Button title for user account deletion.
-msgid "Permanently delete your account"
+#, fuzzy
+msgid "Permanently delete your account."
 msgstr "Forvi�i nemalfareble vian konton"
 
 #. TRANS: Client error displayed trying to delete an application while not logged in.
@@ -1955,7 +1947,6 @@ msgid "You can only delete local users."
 msgstr "Vi povas forigi nur lokan uzanton."
 
 #. TRANS: Title of delete user page.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Delete user"
 msgstr "Forigi uzanton"
@@ -1982,153 +1973,6 @@ msgstr "Ne forigi la avizon"
 msgid "Delete this user."
 msgstr "Forigi la uzanton"
 
-#. TRANS: Message used as title for design settings for the site.
-msgid "Design"
-msgstr "Aspekto"
-
-#. TRANS: Instructions for design adminsitration panel.
-msgid "Design settings for this StatusNet site"
-msgstr "Desegna agordo por ĉi tiu StatusNet-retejo"
-
-#. TRANS: Client error displayed when a logo URL does is not valid.
-msgid "Invalid logo URL."
-msgstr "URL por la emblemo nevalida."
-
-#. TRANS: Client error displayed when an SSL logo URL is invalid.
-#, fuzzy
-msgid "Invalid SSL logo URL."
-msgstr "URL por la SSLa emblemo nevalidas."
-
-#. TRANS: Client error displayed when a theme is submitted through the form that is not in the theme list.
-#. TRANS: %s is the chosen unavailable theme.
-#, php-format
-msgid "Theme not available: %s."
-msgstr "Desegno ne havebla: %s."
-
-#. TRANS: Fieldset legend for form to change logo.
-msgid "Change logo"
-msgstr "Ŝan�i emblemon"
-
-#. TRANS: Field label for StatusNet site logo.
-msgid "Site logo"
-msgstr "Reteja emblemo"
-
-#. TRANS: Field label for SSL StatusNet site logo.
-#, fuzzy
-msgid "SSL logo"
-msgstr "SSLa emblemo"
-
-#. TRANS: Fieldset legend for form change StatusNet site's theme.
-msgid "Change theme"
-msgstr "Ŝan�i desegnon"
-
-#. TRANS: Field label for dropdown to choose site theme.
-msgid "Site theme"
-msgstr "Reteja desegno"
-
-#. TRANS: Title for field label for dropdown to choose site theme.
-msgid "Theme for the site."
-msgstr "Desegno por la retejo"
-
-#. TRANS: Field label for uploading a cutom theme.
-msgid "Custom theme"
-msgstr "Propra desegno"
-
-#. TRANS: Form instructions for uploading a cutom StatusNet theme.
-msgid "You can upload a custom StatusNet theme as a .ZIP archive."
-msgstr "Vi povas al�uti propran StatusNet-desegnon kiel .zip-dosiero"
-
-#. TRANS: Fieldset legend for theme background image.
-msgid "Change background image"
-msgstr "Ŝan�i fonbildon"
-
-#. TRANS: Field label for background image on theme designer page.
-#. TRANS: Field label for background color selector.
-#. TRANS: Label on profile design page for setting a profile page background colour.
-msgid "Background"
-msgstr "Fono"
-
-#. TRANS: Form guide for background image upload form on theme designer page.
-#, php-format
-msgid ""
-"You can upload a background image for the site. The maximum file size is %1"
-"$s."
-msgstr "Vi povas al�uti fonbildon por la retejo. Dosiero-grandlimo estas %1$s."
-
-#. TRANS: Used as radio button label to add a background image.
-msgid "On"
-msgstr "En"
-
-#. TRANS: Used as radio button label to not add a background image.
-msgid "Off"
-msgstr "For"
-
-#. TRANS: Form guide for turning background image on or off on theme designer page.
-#. TRANS: Form guide for a set of radio buttons on the profile design page that will enable or disable
-#. TRANS: use of the uploaded profile image.
-msgid "Turn background image on or off."
-msgstr "Aktivigi aÅ­ senaktivigi fonbildon"
-
-#. TRANS: Checkbox label to title background image on theme designer page.
-#. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
-msgid "Tile background image"
-msgstr "Ripeti la fonbildon"
-
-#. TRANS: Fieldset legend for theme colors.
-msgid "Change colors"
-msgstr "Ŝan�i kolorojn"
-
-#. TRANS: Field label for content color selector.
-#. TRANS: Label on profile design page for setting a profile page content colour.
-msgid "Content"
-msgstr "Enhavo"
-
-#. TRANS: Field label for sidebar color selector.
-#. TRANS: Label on profile design page for setting a profile page sidebar colour.
-msgid "Sidebar"
-msgstr "Flanka strio"
-
-#. TRANS: Field label for text color selector.
-#. TRANS: Label on profile design page for setting a profile page text colour.
-msgid "Text"
-msgstr "Teksto"
-
-#. TRANS: Field label for link color selector.
-#. TRANS: Label on profile design page for setting a profile page links colour.
-msgid "Links"
-msgstr "Ligiloj"
-
-#. TRANS: Fieldset legend for advanced theme design settings.
-msgid "Advanced"
-msgstr "Speciala"
-
-#. TRANS: Field label for custom CSS.
-msgid "Custom CSS"
-msgstr "Propra CSS"
-
-#. TRANS: Button text for resetting theme settings.
-msgctxt "BUTTON"
-msgid "Use defaults"
-msgstr "Uzi defaÅ­lton"
-
-#. TRANS: Title for button for resetting theme settings.
-#. TRANS: Title for button on profile design page to reset all colour settings to default.
-#, fuzzy
-msgid "Restore default designs."
-msgstr "RestaÅ­ri defaÅ­ltajn desegnojn"
-
-#. TRANS: Title for button for resetting theme settings.
-#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#, fuzzy
-msgid "Reset back to default."
-msgstr "Redefaŭlti�i"
-
-#. TRANS: Title for button for saving theme settings.
-#. TRANS: Title for button on profile design page to save settings.
-#, fuzzy
-msgid "Save design."
-msgstr "Savi desegnon"
-
 #. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
 msgid "This notice is not a favorite!"
 msgstr "Ĉi tiu avizo ne estas preferita"
@@ -2143,6 +1987,84 @@ msgstr "Aldoni al �atolisto"
 msgid "No such document \"%s\"."
 msgstr "Ne estas tia dokumento \"%s\""
 
+#. TRANS: Menu item in administrator navigation panel.
+#. TRANS: Menu item in default local navigation panel.
+#. TRANS: Menu item in personal group navigation menu.
+#, fuzzy
+msgctxt "MENU"
+msgid "Home"
+msgstr "Hejmpa�o"
+
+msgctxt "MENU"
+msgid "Docs"
+msgstr ""
+
+#. TRANS: Secondary navigation menu item leading to help on StatusNet.
+msgctxt "MENU"
+msgid "Help"
+msgstr "Helpo"
+
+#, fuzzy
+msgid "Getting started"
+msgstr "Agordo konservitas."
+
+#. TRANS: Secondary navigation menu item leading to text about StatusNet site.
+#, fuzzy
+msgctxt "MENU"
+msgid "About"
+msgstr "Enkonduko"
+
+#, fuzzy
+msgid "About this site"
+msgstr "Malbloki ĉi tiun uzanton"
+
+#. TRANS: Secondary navigation menu item leading to Frequently Asked Questions.
+#, fuzzy
+msgctxt "MENU"
+msgid "FAQ"
+msgstr "Oftaj demandoj"
+
+msgid "Frequently asked questions"
+msgstr "Oftaj demandoj"
+
+#. TRANS: Secondary navigation menu item leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+#, fuzzy
+msgctxt "MENU"
+msgid "Contact"
+msgstr "Kontakto"
+
+#, fuzzy
+msgid "Contact info"
+msgstr "Kontakto"
+
+#, fuzzy
+msgctxt "MENU"
+msgid "Tags"
+msgstr "Markiloj"
+
+msgid "Using tags"
+msgstr ""
+
+#. TRANS: Menu item in default local navigation panel.
+#. TRANS: Menu item in search group navigation panel.
+#. TRANS: Menu item in local navigation menu.
+#, fuzzy
+msgctxt "MENU"
+msgid "Groups"
+msgstr "Grupoj"
+
+#, fuzzy
+msgid "Using groups"
+msgstr "Uzantaj grupoj"
+
+msgctxt "MENU"
+msgid "API"
+msgstr ""
+
+msgid "RESTful API"
+msgstr ""
+
 #. TRANS: Title for "Edit application" form.
 #. TRANS: Form legend.
 msgid "Edit application"
@@ -2309,7 +2231,7 @@ msgid ""
 "subscriptions to it. Do you still want to continue?"
 msgstr ""
 
-#. TRANS: TRANS: Server error displayed when updating a list fails.
+#. TRANS: Server error displayed when updating a list fails.
 #, fuzzy
 msgid "Could not update list."
 msgstr "Malsukcesis �isdatigi uzanton"
@@ -2614,40 +2536,6 @@ msgstr "Ne estas aldonaĵo."
 msgid "No uploaded attachments."
 msgstr "Ne estas al�utita aldonaĵo."
 
-#. TRANS: Client error displayed when subscribing to a remote profile and an unexpected response is received.
-msgid "Not expecting this response!"
-msgstr "Neatendita respondo!"
-
-#. TRANS: Client error displayed when subscribing to a remote profile that does not exist.
-msgid "User being listened to does not exist."
-msgstr "Vizitata uzanto ne ekzistas."
-
-#. TRANS: Client error displayed when subscribing to a remote profile that is a local profile.
-#. TRANS: Client error displayed when using remote subscribe for a local entity.
-msgid "You can use the local subscription!"
-msgstr "Vi povas aboni loke!"
-
-#. TRANS: Client error displayed when subscribing to a remote profile that is blocked form subscribing to.
-msgid "That user has blocked you from subscribing."
-msgstr "Tiu uzanto abonblokis vin."
-
-#. TRANS: Client error displayed when subscribing to a remote profile without providing an authorised token.
-msgid "You are not authorized."
-msgstr "Vi ne estas rajtigita."
-
-#. TRANS: Client error displayed when subscribing to a remote profile and conversion of the request token to access token fails.
-msgid "Could not convert request token to access token."
-msgstr "Malsukcesis inter�an�i petĵetonon al atingoĵetono."
-
-#. TRANS: Client error displayed when subscribing to a remote profile fails because of an unsupported version of the OMB protocol.
-msgid "Remote service uses unknown version of OMB protocol."
-msgstr "Fora servo uzas nekonatan version de OMB-protokolo."
-
-#. TRANS: Server error displayed when subscribing to a remote profile fails because the remote profile could not be updated.
-#. TRANS: Exception thrown when updating a remote profile fails in OAuth store.
-msgid "Error updating remote profile."
-msgstr "Eraro je �isdatigo de fora profilo."
-
 #. TRANS: Client error displayed when requesting a non-existent file.
 msgid "No such file."
 msgstr "Ne ekzistas tia dosiero."
@@ -2736,30 +2624,6 @@ msgstr "Malsukcesis forbari uzanton de la grupo pro datumbaza eraro."
 msgid "No ID."
 msgstr "Neniu ID."
 
-#. TRANS: Client error displayed trying to change group design settings while not logged in.
-msgid "You must be logged in to edit a group."
-msgstr "Ensalutu por redakti grupon."
-
-#. TRANS: Title group design settings page.
-msgid "Group design"
-msgstr "Grupa desegno"
-
-#. TRANS: Instructions for group design settings page.
-msgid ""
-"Customize the way your group looks with a background image and a colour "
-"palette of your choice."
-msgstr "Agordi kiel aspektu via grupo, per elekto de fonbildo kaj koloraro."
-
-#. TRANS: Form validation error displayed when group design settings could not be updated because of an application issue.
-#, fuzzy
-msgid "Unable to update your design settings."
-msgstr "Malsukcesis konservi vian desegnan agordon"
-
-#. TRANS: Form text to confirm saved group design settings.
-#. TRANS: Confirmation message on Profile design page when saving design settings has succeeded.
-msgid "Design preferences saved."
-msgstr "Desegna agordo konservita."
-
 #. TRANS: Title for group logo settings page.
 #. TRANS: Group logo form legend.
 msgid "Group logo"
@@ -2932,8 +2796,8 @@ msgstr "Tujmesa�ila agordo."
 #. TRANS: the order and formatting of link text and link should remain unchanged.
 #, fuzzy, php-format
 msgid ""
-"You can send and receive notices through instant messaging [instant messages]"
-"(%%doc.im%%). Configure your addresses and settings below."
+"You can send and receive notices through [instant messaging](%%doc.im%%). "
+"Configure your addresses and settings below."
 msgstr ""
 "Vi povas sendi kaj ricevi avizojn per Jabber/GTalk-[tujmesa�iloj](%%doc.im%"
 "%). Jen agordu vian adreson kaj ceteron."
@@ -2967,7 +2831,6 @@ msgid "%s screenname."
 msgstr ""
 
 #. TRANS: Header for IM preferences form.
-#, fuzzy
 msgid "IM Preferences"
 msgstr "Tujmesa�ilaj preferoj"
 
@@ -3139,29 +3002,6 @@ msgid ""
 msgstr ""
 "Uzu la formularon por inviti viajn amikojn kaj kolegojn al ĉi tiu servo."
 
-#. TRANS: Field label for a list of e-mail addresses.
-msgid "Email addresses"
-msgstr "Retpo�tadresoj"
-
-#. TRANS: Tooltip for field label for a list of e-mail addresses.
-#, fuzzy
-msgid "Addresses of friends to invite (one per line)."
-msgstr "Adresoj de invitataj amikoj (unu por linio)"
-
-#. TRANS: Field label for a personal message to send to invitees.
-msgid "Personal message"
-msgstr "Persona mesa�o"
-
-#. TRANS: Tooltip for field label for a personal message to send to invitees.
-msgid "Optionally add a personal message to the invitation."
-msgstr "Vi povas aldoni personan mesa�on al la invito."
-
-#. TRANS: Send button for inviting friends
-#. TRANS: Button text for sending notice.
-msgctxt "BUTTON"
-msgid "Send"
-msgstr "Sendi"
-
 #. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral
 #. TRANS: singular 3rd-person pronoun in English. %1$s is the inviting user, $2$s is
 #. TRANS: the StatusNet sitename.
@@ -3305,12 +3145,6 @@ msgstr ""
 msgid "Save license settings."
 msgstr "Konservi la permesilan agordon."
 
-#. TRANS: Client error displayed when trying to log in while already logged in.
-#. TRANS: Client error displayed trying to use "one time password login" when already logged in.
-#. TRANS: Client error displayed when trying to register while already logged in.
-msgid "Already logged in."
-msgstr "Vi jam ensalutis."
-
 #. TRANS: Form validation error displayed when trying to log in with incorrect credentials.
 msgid "Incorrect username or password."
 msgstr "Mal�usta uzantnomo aŭ pasvorto."
@@ -3420,6 +3254,7 @@ msgstr "Fonta URL bezonata."
 msgid "Could not create application."
 msgstr "Malsukcesis krei aplikaĵon."
 
+#. TRANS: Form validation error messages displayed when uploading an invalid application logo.
 #, fuzzy
 msgid "Invalid image."
 msgstr "Nevalida bildo."
@@ -3457,12 +3292,6 @@ msgstr "Neniu enhavo!"
 msgid "No recipient specified."
 msgstr "Neniu ricevonto speifi�as."
 
-#. TRANS: Client error displayed trying to send a direct message to self.
-#. TRANS: Error text shown when trying to send a direct message to self.
-msgid ""
-"Don't send a message to yourself; just say it to yourself quietly instead."
-msgstr "Ne sendu mesa�on al vi mem! Simple suspiru anstataŭ."
-
 #. TRANS: Page title after sending a direct message.
 msgid "Message sent"
 msgstr "Mesa�o sendita"
@@ -3666,6 +3495,33 @@ msgstr "Bonvolu, nur %s-URL per plata HTTP."
 msgid "Not a supported data format."
 msgstr "Datumformato ne subteni�as."
 
+#. TRANS: Page title for profile settings.
+#, fuzzy
+msgid "Old school UI settings"
+msgstr "Tujmesa�ila agordo."
+
+#. TRANS: Usage instructions for profile settings.
+msgid "If you like it \"the old way\", you can set that here."
+msgstr ""
+
+#. TRANS: Confirmation shown when user profile settings are saved.
+#. TRANS: Message after successful saving of administrative settings.
+msgid "Settings saved."
+msgstr "Agordo konservitas."
+
+msgid "Only stream mode (no conversations) in timelines"
+msgstr ""
+
+msgid "Show conversation page as hierarchical trees"
+msgstr ""
+
+msgid "Show nicknames (not full names) in timelines"
+msgstr ""
+
+#. TRANS: Button text to save a list.
+msgid "Save"
+msgstr "Konservi"
+
 #. TRANS: ShortName in the OpenSearch interface when trying to find users.
 msgid "People Search"
 msgstr "Homserĉo"
@@ -3674,6 +3530,11 @@ msgstr "Homserĉo"
 msgid "Notice Search"
 msgstr "Avizoserĉo"
 
+#. TRANS: Client error displayed trying to use "one time password login" when already logged in.
+#. TRANS: Client error displayed when trying to register while already logged in.
+msgid "Already logged in."
+msgstr "Vi jam ensalutis."
+
 #. TRANS: Client error displayed trying to use "one time password login" without specifying a user.
 msgid "No user ID specified."
 msgstr "Neniu uzanto-ID specifi�as."
@@ -3747,7 +3608,7 @@ msgid "Confirm"
 msgstr "Konfirmi"
 
 #. TRANS: Field title on page where to change password.
-#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
+#. TRANS: Title for field label for password reset form where the password has to be typed again.
 #. TRANS: Field title on account registration page.
 #, fuzzy
 msgid "Same as password above."
@@ -3808,12 +3669,6 @@ msgstr "Desegno adresaro ne havebla: %s."
 msgid "Avatar directory not writable: %s."
 msgstr "Avatara adresaro ne skribebla: %s."
 
-#. TRANS: Client error in Paths admin panel.
-#. TRANS: %s is the background directory that could not be written to.
-#, php-format
-msgid "Background directory not writable: %s."
-msgstr "Fona adresaro ne skribebla: %s."
-
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the locales directory that could not be read from.
 #, php-format
@@ -3929,30 +3784,6 @@ msgstr "Avatara adresaro"
 msgid "Directory where avatars are located."
 msgstr "Dosierujo kie avataroj estas."
 
-#. TRANS: Fieldset legend in Paths admin panel.
-msgid "Backgrounds"
-msgstr "Fono"
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-msgid "Server for backgrounds."
-msgstr "Servilo por fonoj."
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-msgid "Web path to backgrounds."
-msgstr "Retvojo al fonoj."
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-msgid "Server for backgrounds on SSL pages."
-msgstr "Servilo por fonoj en SSL-pa�oj."
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-msgid "Web path to backgrounds on SSL pages."
-msgstr "Retvojo al fonoj en SSL-pa�oj."
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-msgid "Directory where backgrounds are located."
-msgstr "Dosierujo kie fonoj estas."
-
 #. TRANS: Fieldset legens in Paths admin panel.
 msgid "Attachments"
 msgstr "Aldonaĵo"
@@ -4009,8 +3840,9 @@ msgid "Server to direct SSL requests to."
 msgstr "Servilo, kien direkti \"SSL\"-petojn"
 
 #. TRANS: Button title text to store form data in the Paths admin panel.
-msgid "Save paths"
-msgstr "Konservi lokigilon"
+#, fuzzy
+msgid "Save path settings."
+msgstr "Konservi retejan agordon"
 
 #. TRANS: Instructions for the "People search" page.
 #. TRANS: %%site.name%% is the name of the StatusNet site.
@@ -4150,7 +3982,7 @@ msgid ""
 "%%%site.name%%%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
 "blogging) service based on the Free Software [StatusNet](http://status.net/) "
 "tool. You can easily keep track of what they are doing by subscribing to the "
-"tag's timeline."
+"list's timeline."
 msgstr ""
 "**%s** estas grupo de uzantoj ĉe %%%%*site.*name%%%%, [mikrobloga servo]"
 "(*http://estas.*wikipedia.*org/*wiki/*Microblogging) baze de ilaro de Libera "
@@ -4183,7 +4015,7 @@ msgid ""
 "site.name%%%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
 "blogging) service based on the Free Software [StatusNet](http://status.net/) "
 "tool. You can easily keep track of what they are doing by subscribing to the "
-"tag's timeline."
+"list's timeline."
 msgstr ""
 "**%s** estas grupo de uzantoj ĉe %%%%*site.*name%%%%, [mikrobloga servo]"
 "(*http://estas.*wikipedia.*org/*wiki/*Microblogging) baze de ilaro de Libera "
@@ -4288,16 +4120,6 @@ msgid ""
 "All default plugins have been disabled from the site's configuration file."
 msgstr ""
 
-#. TRANS: Client error displayed if the notice posted has too many characters.
-msgid "Invalid notice content."
-msgstr "Nevalida avizo-enhavo"
-
-#. TRANS: Exception thrown if a notice's license is not compatible with the StatusNet site license.
-#. TRANS: %1$s is the notice license, %2$s is the StatusNet site's license.
-#, fuzzy, php-format
-msgid "Notice license \"%1$s\" is not compatible with site license \"%2$s\"."
-msgstr "Aviza permesilo ‘%1$s’ ne konformas al reteja permesilo ‘%2$s’."
-
 #. TRANS: Client error displayed when trying to add an unindentified field to profile.
 #. TRANS: %s is a field name.
 #, php-format
@@ -4397,6 +4219,8 @@ msgid "Share my current location when posting notices"
 msgstr "Sciigu mian nunan lokon, kiam mi sendas avizon."
 
 #. TRANS: Field label in form for profile settings.
+#. TRANS: Title for group tag cloud section.
+#. TRANS: %s is a group name.
 msgid "Tags"
 msgstr "Markiloj"
 
@@ -4426,9 +4250,8 @@ msgid "What timezone are you normally in?"
 msgstr "En kiu horzono vi kutime trovi�as?"
 
 #. TRANS: Checkbox label in form for profile settings.
-#, fuzzy
 msgid ""
-"Automatically subscribe to whoever subscribes to me (best for non-humans)."
+"Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr "AÅ­tomate aboni iun ajn, kiu abonas min (prefereble por ne-homoj)"
 
 #. TRANS: Dropdown field label on profile settings, for what policies to apply when someone else tries to subscribe to your updates.
@@ -4498,11 +4321,6 @@ msgstr "Malsukcesis konservi lokan preferon."
 msgid "Could not save tags."
 msgstr "Malsukcesis konservi etikedojn."
 
-#. TRANS: Confirmation shown when user profile settings are saved.
-#. TRANS: Message after successful saving of administrative settings.
-msgid "Settings saved."
-msgstr "Agordo konservitas."
-
 #. TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
 #. TRANS: Page title for page where a user account can be restored from backup.
 msgid "Restore account"
@@ -4515,7 +4333,8 @@ msgid "Beyond the page limit (%s)."
 msgstr "Trans pa�olimo (%s)."
 
 #. TRANS: Server error displayed when a public timeline cannot be retrieved.
-msgid "Could not retrieve public stream."
+#, fuzzy
+msgid "Could not retrieve public timeline."
 msgstr "Malsukcesis ricevi publikan fluon"
 
 #. TRANS: Title for all public timeline pages but the first.
@@ -4530,15 +4349,23 @@ msgid "Public timeline"
 msgstr "Publika tempstrio"
 
 #. TRANS: Link description for public timeline feed.
-msgid "Public Stream Feed (RSS 1.0)"
+#, fuzzy
+msgid "Public Timeline Feed (Activity Streams JSON)"
+msgstr "Publika fluo (Atom)"
+
+#. TRANS: Link description for public timeline feed.
+#, fuzzy
+msgid "Public Timeline Feed (RSS 1.0)"
 msgstr "Publika fluo (RSS 1.0)"
 
 #. TRANS: Link description for public timeline feed.
-msgid "Public Stream Feed (RSS 2.0)"
+#, fuzzy
+msgid "Public Timeline Feed (RSS 2.0)"
 msgstr "Publika fluo (RSS 2.0)"
 
 #. TRANS: Link description for public timeline feed.
-msgid "Public Stream Feed (Atom)"
+#, fuzzy
+msgid "Public Timeline Feed (Atom)"
 msgstr "Publika fluo (Atom)"
 
 #. TRANS: Text displayed for public feed when there are no public notices.
@@ -4586,48 +4413,6 @@ msgstr ""
 "blogging) servo surbaze de libera servila programo [StatusNet](http://status."
 "net/)."
 
-#. TRANS: Title for page with public list cloud.
-#, fuzzy
-msgid "Public list cloud"
-msgstr "Publika markil-nubo"
-
-#. TRANS: Page notice for page with public list cloud.
-#. TRANS: %s is a StatusNet sitename.
-#, fuzzy, php-format
-msgid "These are largest lists on %s"
-msgstr "Jen la plej popularaj entikedoj lastatempaj ĉe %s "
-
-#. TRANS: Empty list message on page with public list cloud.
-#. TRANS: This message contains Markdown links in the form [description](link).
-#, fuzzy, php-format
-msgid "No one has [listed](%%doc.tags%%) anyone yet."
-msgstr "Neniu jam afi�is avizon kun [haketentikedon](%%doc.tags%%)."
-
-#. TRANS: Additional empty list message on page with public list cloud for logged in users.
-#, fuzzy
-msgid "Be the first to list someone!"
-msgstr "Estu la unua afi�anto!"
-
-#. TRANS: Additional empty list message on page with public list cloud for anonymous users.
-#. TRANS: This message contains Markdown links in the form [description](link).
-#, fuzzy, php-format
-msgid ""
-"Why not [register an account](%%action.register%%) and be the first to list "
-"someone!"
-msgstr "Kial ne [krei konton](%%action.register%%) kaj esti la unua afi�anto!"
-
-#. TRANS: DT element on on page with public list cloud.
-#, fuzzy
-msgid "List cloud"
-msgstr "Listo ne ekzistas."
-
-#. TRANS: Link title for number of listed people. %d is the number of listed people.
-#, php-format
-msgid "1 person listed"
-msgid_plural "%d people listed"
-msgstr[0] ""
-msgstr[1] ""
-
 #. TRANS: Public RSS feed description. %s is the StatusNet site name.
 #, fuzzy, php-format
 msgid "%s updates from everyone."
@@ -4751,7 +4536,6 @@ msgid "6 or more characters, and do not forget it!"
 msgstr "Almenaŭ 6 signoj, kaj ne forgesu �in!"
 
 #. TRANS: Button text for password reset form.
-#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Reset"
@@ -4761,18 +4545,6 @@ msgstr "Restarigi"
 msgid "Enter a nickname or email address."
 msgstr "Alinomo aŭ retpo�tadreso."
 
-#. TRANS: Information on password recovery form if no known username or e-mail address was specified.
-msgid "No user with that email address or username."
-msgstr "Ne estas uzanto kun tiu retpo�tadreso aŭ uzantnomo."
-
-#. TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.
-msgid "No registered email address for that user."
-msgstr "Neniu registrita retpo�tadreso apartenas al la uzanto."
-
-#. TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.
-msgid "Error saving address confirmation."
-msgstr "Eraras pro komfirma kodo."
-
 #. TRANS: User notification after an e-mail with instructions was sent from the password recovery form.
 msgid ""
 "Instructions for recovering your password have been sent to the email "
@@ -4859,7 +4631,6 @@ msgstr ""
 "kaj komuniki kun amikoj kaj kolegoj. "
 
 #. TRANS: Field label on account registration page. In this field the password has to be entered a second time.
-#, fuzzy
 msgctxt "PASSWORD"
 msgid "Confirm"
 msgstr "Konfirmi"
@@ -4958,79 +4729,6 @@ msgid ""
 msgstr ""
 "(Vi ricevos tuj mesa�on retpo�tan, kun gvidon konfirmi vian retpo�tadreson.)"
 
-#. TRANS: Page notice for remote subscribe. This message contains Markdown links.
-#. TRANS: Ensure to keep the correct markup of [link description](link).
-#, 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 ""
-"Por aboni, [ensalutu](%%action.login%%), aÅ­ [krei konton](%%action.register%"
-"%). Se vi jam havas konton ĉe iu [kongrua mikroblogilo-retejo](%%doc."
-"openmublog%%),  entajpu vian profilan URL jene."
-
-#. TRANS: Page title for Remote subscribe.
-msgid "Remote subscribe"
-msgstr "Defore aboni"
-
-#. TRANS: Field legend on page for remote subscribe.
-msgid "Subscribe to a remote user"
-msgstr "Aboni foran uzanton"
-
-#. TRANS: Field label on page for remote subscribe.
-msgid "User nickname"
-msgstr "Uzanta alinomo"
-
-#. TRANS: Field title on page for remote subscribe.
-#, fuzzy
-msgid "Nickname of the user you want to follow."
-msgstr "Alnomo de la uzanto, kiun vi volas aboni."
-
-#. TRANS: Field label on page for remote subscribe.
-msgid "Profile URL"
-msgstr "Profila URL"
-
-#. TRANS: Field title on page for remote subscribe.
-#, fuzzy
-msgid "URL of your profile on another compatible microblogging service."
-msgstr "URL de via profilo ĉe alia kongrua mikroblogilo-servo"
-
-#. TRANS: Button text on page for remote subscribe.
-#. TRANS: Link text for link that will subscribe to a remote profile.
-#. TRANS: Button text to subscribe to a user.
-#. TRANS: Button text for subscribing to a list.
-#, fuzzy
-msgctxt "BUTTON"
-msgid "Subscribe"
-msgstr "Aboni"
-
-#. TRANS: Form validation error on page for remote subscribe when an invalid profile URL was provided.
-#, fuzzy
-msgid "Invalid profile URL (bad format)."
-msgstr "Nevalida profila URL (fu�a formato)"
-
-#. TRANS: Form validation error on page for remote subscribe when no the provided profile URL
-#. TRANS: does not contain expected data.
-msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
-msgstr ""
-"Ne valida profila URL (ne estas YADIS-dokumento aŭ difini�as nevalida XRDS)."
-
-#. TRANS: Form validation error on page for remote subscribe.
-#, fuzzy
-msgid "That is a local profile! Login to subscribe."
-msgstr "Tio estas loka profilo! Ensalutu por aboni."
-
-#. TRANS: Form validation error on page for remote subscribe when the remote service is not providing a request token.
-#, fuzzy
-msgid "Could not get a request token."
-msgstr "Malsukcesis akiri pet-ĵetonon."
-
-#. TRANS: Client error displayed when trying to (un)list an OMB 0.1 remote profile.
-#, fuzzy
-msgid "You cannot (un)list an OMB 0.1 remote profile with this action."
-msgstr "Vi ne povas aboni foran  OMB 0.1-an profilon per ĉi tiu ago."
-
 #. TRANS: Client error displayed when an unknown error occurs while delisting a user.
 #. TRANS: %s is a username.
 #, php-format
@@ -5083,6 +4781,12 @@ msgstr "Respondoj al %s"
 msgid "Replies to %1$s, page %2$d"
 msgstr "Respondoj al %1$s, pa�o %2$d"
 
+#. TRANS: Link for feed with replies for a user.
+#. TRANS: %s is a user nickname.
+#, fuzzy, php-format
+msgid "Replies feed for %s (Activity Streams JSON)"
+msgstr "Responda fluo al %s (Atom)"
+
 #. TRANS: Link for feed with replies for a user.
 #. TRANS: %s is a user nickname.
 #, php-format
@@ -5206,7 +4910,7 @@ msgstr ""
 
 #. TRANS: Form instructions for feed restore.
 msgid ""
-"You can upload a backed-up stream in <a href=\"http://activitystrea.ms/"
+"You can upload a backed-up timeline in <a href=\"http://activitystrea.ms/"
 "\">Activity Streams</a> format."
 msgstr ""
 
@@ -5271,9 +4975,8 @@ msgstr "Trakti seancojn"
 
 #. TRANS: Checkbox title on the sessions administration panel.
 #. TRANS: Indicates if StatusNet should handle session administration.
-#, fuzzy
 msgid "Handle sessions ourselves."
-msgstr "Ĉu traktu seancojn ni mem."
+msgstr "Ttrakti seancojn ni mem."
 
 #. TRANS: Checkbox label on the sessions administration panel.
 #. TRANS: Indicates if StatusNet should write session debugging output.
@@ -5326,6 +5029,26 @@ msgstr "Rekomencigi �losilon & sekreton"
 msgid "Application info"
 msgstr "Aplikaĵa informo"
 
+#. TRANS: Field label on application page.
+msgid "Consumer key"
+msgstr "Konsumanta �losilo"
+
+#. TRANS: Field label on application page.
+msgid "Consumer secret"
+msgstr "Konsumanta sekreto"
+
+#. TRANS: Field label on application page.
+msgid "Request token URL"
+msgstr "Pet-ĵetona URL"
+
+#. TRANS: Field label on application page.
+msgid "Access token URL"
+msgstr "Alir-ĵetona URL"
+
+#. TRANS: Field label on application page.
+msgid "Authorize URL"
+msgstr "Rajtigi URL"
+
 #. TRANS: Note on the OAuth application page about signature support.
 #, fuzzy
 msgid ""
@@ -5349,6 +5072,11 @@ msgstr "Ŝatataj avizoj de %s, pa�o %2$d"
 msgid "Could not retrieve favorite notices."
 msgstr "Malsukcesis ricevi �ataton."
 
+#. TRANS: Feed link text. %s is a username.
+#, fuzzy, php-format
+msgid "Feed for favorites of %s (Activity Streams JSON)"
+msgstr "Fluo pri �atato de %s (Atom)"
+
 #. TRANS: Feed link text. %s is a username.
 #, php-format
 msgid "Feed for favorites of %s (RSS 1.0)"
@@ -5408,6 +5136,11 @@ msgstr "Grupo %s"
 msgid "%1$s group, page %2$d"
 msgstr "Grupo %1$s, pa�o %2$d"
 
+#. TRANS: Tooltip for feed link. %s is a group nickname.
+#, fuzzy, php-format
+msgid "Notice feed for %s group (Activity Streams JSON)"
+msgstr "Avizofluo de grupo %s (Atom)"
+
 #. TRANS: Tooltip for feed link. %s is a group nickname.
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
@@ -5428,42 +5161,8 @@ msgstr "Avizofluo de grupo %s (Atom)"
 msgid "FOAF for %s group"
 msgstr "Foramiko de grupo %s"
 
-#. TRANS: Header for mini list of group members on a group page (h2).
-msgid "Members"
-msgstr "Grupanoj"
-
-#. TRANS: Description for mini list of group members on a group page when the group has no members.
-#. TRANS: Content of "Listed" page if there are no listed users.
-#. TRANS: Content of "People following tag x" if there are no subscribed users.
-#. TRANS: Empty list message for tags.
-#. TRANS: Text for user subscription statistics if the user has no subscriptions.
-#. TRANS: Text for user subscriber statistics if user has no subscribers.
-#. TRANS: Text for user user group membership statistics if user is not a member of any group.
-#. TRANS: Default content for section/sidebar widget.
-msgid "(None)"
-msgstr "(nenio)"
-
-#. TRANS: Link to all group members from mini list of group members if group has more than n members.
-msgid "All members"
-msgstr "Ĉiuj grupanoj"
-
-#. TRANS: Header for group statistics on a group page (h2).
-#. TRANS: H2 text for user statistics.
-msgid "Statistics"
-msgstr "Statistiko"
-
-#. TRANS: Label for group creation date.
-msgctxt "LABEL"
-msgid "Created"
-msgstr "Kreita je"
-
-#. TRANS: Label for member count in statistics on group page.
-msgctxt "LABEL"
-msgid "Members"
-msgstr "Anoj"
-
 #. TRANS: Notice on group pages for anonymous users for StatusNet sites that accept new registrations.
-#. TRANS: **%s** is the group alias, %%%%site.name%%%% is the site name,
+#. TRANS: %s is the group name, %%%%site.name%%%% is the site name,
 #. TRANS: %%%%action.register%%%% is the URL for registration, %%%%doc.help%%%% is a URL to help.
 #. TRANS: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
 #, php-format
@@ -5480,25 +5179,20 @@ msgstr ""
 "parto de tiu ĉi grupo kaj multe pli! ([Pli](%%doc.help%%))"
 
 #. TRANS: Notice on group pages for anonymous users for StatusNet sites that accept no new registrations.
-#. TRANS: **%s** is the group alias, %%%%site.name%%%% is the site name,
+#. TRANS: %s is the group name, %%%%site.name%%%% is the site name,
 #. TRANS: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
-#, php-format
+#, fuzzy, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
 "wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
 "[StatusNet](http://status.net/) tool. Its members share short messages about "
-"their life and interests. "
+"their life and interests."
 msgstr ""
 "**%s** estas grupo de uzantoj ĉe %%%%*site.*name%%%%, [mikrobloga servo]"
 "(*http://estas.*wikipedia.*org/*wiki/*Microblogging) baze de ilaro de Libera "
 "Molvaro [StatusNet](*http://*status.*net/), kie anoj konigas mesa�etojn pri "
 "siaj vivoj kaj �atokupoj. "
 
-#. TRANS: Title for list of group administrators on a group page.
-msgctxt "TITLE"
-msgid "Admins"
-msgstr "Estroj"
-
 #. TRANS: Client error displayed requesting a single message that does not exist.
 msgid "No such message."
 msgstr "Ne estas tiu mesa�o."
@@ -5592,9 +5286,21 @@ msgid ""
 msgstr "Kial ne [krei konton](%%action.register%%) kaj esti la unua afi�anto!"
 
 #. TRANS: Header on show list page.
+#. TRANS: Link description for link to list of users tagged with a tag (so part of a list).
 msgid "Listed"
 msgstr "Listigita"
 
+#. TRANS: Content of "Listed" page if there are no listed users.
+#. TRANS: Content of "People following tag x" if there are no subscribed users.
+#. TRANS: Description for mini list of group members on a group page when the group has no members.
+#. TRANS: Empty list message for tags.
+#. TRANS: Text for user subscription statistics if the user has no subscriptions.
+#. TRANS: Text for user subscriber statistics if user has no subscribers.
+#. TRANS: Text for user user group membership statistics if user is not a member of any group.
+#. TRANS: Default content for section/sidebar widget.
+msgid "(None)"
+msgstr "(nenio)"
+
 #. TRANS: Link for more "People in list x by a user"
 #. TRANS: if there are more than the mini list's maximum.
 msgid "Show all"
@@ -5605,24 +5311,19 @@ msgstr ""
 msgid "Subscribers"
 msgstr "Abonantoj"
 
-#. TRANS: Link for more "People following tag x"
-#. TRANS: if there are more than the mini list's maximum.
-msgid "All subscribers"
-msgstr "Ĉiuj abonantoj"
-
-#. TRANS: Page title showing tagged notices in one user's stream.
+#. TRANS: Page title showing tagged notices in one user's timeline.
 #. TRANS: %1$s is the username, %2$s is the hash tag.
 #, fuzzy, php-format
 msgid "Notices by %1$s tagged %2$s"
 msgstr "%1$s, pa�o %2$d"
 
-#. TRANS: Page title showing tagged notices in one user's stream.
+#. TRANS: Page title showing tagged notices in one user's timeline.
 #. TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number.
 #, fuzzy, php-format
 msgid "Notices by %1$s tagged %2$s, page %3$d"
 msgstr "Avizoj etikeditaj per %1$s - pa�o %2$d"
 
-#. TRANS: Extended page title showing tagged notices in one user's stream.
+#. TRANS: Extended page title showing tagged notices in one user's timeline.
 #. TRANS: %1$s is the username, %2$d is the page number.
 #, fuzzy, php-format
 msgid "Notices by %1$s, page %2$d"
@@ -5634,6 +5335,12 @@ msgstr "Avizoj etikeditaj per %1$s - pa�o %2$d"
 msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
 msgstr "Avizofluo pri %1$s etikedigita %2$s (RSS 1.0)"
 
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#, fuzzy, php-format
+msgid "Notice feed for %s (Activity Streams JSON)"
+msgstr "Avizofluo pri %1$s  (Atom)"
+
 #. TRANS: Title for link to notice feed.
 #. TRANS: %s is a user nickname.
 #, php-format
@@ -5658,7 +5365,7 @@ msgstr "Avizofluo pri %1$s  (Atom)"
 msgid "FOAF for %s"
 msgstr "Foramiko de  %s"
 
-#. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
+#. TRANS: First sentence of empty list message for a timeline. $1%s is a user nickname.
 #, fuzzy, php-format
 msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
 msgstr "Tie ĉi estus tempstrio de %1$s sed %2$s ankoraŭ afi�is nenion."
@@ -5670,7 +5377,7 @@ msgid ""
 msgstr ""
 "Ĉu okazas io interesa lastatempe? Vi ne afi�is ion ajn, nun taŭgas komenci :)"
 
-#. TRANS: Second sentence of empty  list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
+#. TRANS: Second sentence of empty  list message for a non-self timeline. %1$s is a user nickname, %2$s is a part of a URL.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
 #, php-format
 msgid ""
@@ -5680,7 +5387,7 @@ msgstr ""
 "Vi povas provi  [pu�eti %1$s] aŭ [afi�i ion al li](%%%%action.newnotice%%%%?"
 "status_textarea=%2$s)."
 
-#. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
+#. TRANS: Announcement for anonymous users showing a timeline if site registrations are open.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
 #, php-format
 msgid ""
@@ -5694,13 +5401,13 @@ msgstr ""
 "(http://status.net/). [Ani�u](%%%%action.register%%%%) por sekvi avizojn de "
 "**%s** kaj multe pli! ([Pli](%%%%doc.help%%%%))"
 
-#. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
+#. TRANS: Announcement for anonymous users showing a timeline if site registrations are closed or invite only.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#, php-format
+#, fuzzy, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
 "wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
-"[StatusNet](http://status.net/) tool. "
+"[StatusNet](http://status.net/) tool."
 msgstr ""
 "**%s** havas konton ĉe %%%%site.name%%%%, [mikrobloga](http://en.wikipedia."
 "org/wiki/Micro-blogging) servo surbaze de libera programaro [StatusNet]"
@@ -5738,6 +5445,15 @@ msgstr "La sita nomo devas pli ol nula longeco"
 msgid "You must have a valid contact email address."
 msgstr "Vi devas havi validan kontakteblan retpo�tadreson"
 
+#. TRANS: Client error displayed when a logo URL is not valid.
+msgid "Invalid logo URL."
+msgstr "URL por la emblemo nevalida."
+
+#. TRANS: Client error displayed when a SSL logo URL is invalid.
+#, fuzzy
+msgid "Invalid SSL logo URL."
+msgstr "URL por la SSLa emblemo nevalidas."
+
 #. TRANS: Client error displayed trying to save site settings with an invalid language code.
 #. TRANS: %s is the invalid language code.
 #, php-format
@@ -5814,7 +5530,9 @@ msgid "Default language"
 msgstr "DefaÅ­lta lingvo"
 
 #. TRANS: Dropdown title on site settings panel.
-msgid "Site language when autodetection from browser settings is not available"
+#, fuzzy
+msgid ""
+"The site language when autodetection from browser settings is not available."
 msgstr "Reteja lingvo por kiam lingva prefero ne trovi�as el la foliumilo"
 
 #. TRANS: Fieldset legend on site settings panel.
@@ -5840,8 +5558,22 @@ msgid "How long users must wait (in seconds) to post the same thing again."
 msgstr ""
 "Kiel longe devas uzantoj atendas (je sekundo) antaŭ afi�i la saman refejo."
 
+#. TRANS: Fieldset legend for form to change logo.
+msgid "Logo"
+msgstr "Emblemo"
+
+#. TRANS: Field label for StatusNet site logo.
+msgid "Site logo"
+msgstr "Reteja emblemo"
+
+#. TRANS: Field label for SSL StatusNet site logo.
+#, fuzzy
+msgid "SSL logo"
+msgstr "SSLa emblemo"
+
 #. TRANS: Button title for saving site settings.
-msgid "Save site settings"
+#, fuzzy
+msgid "Save the site settings."
 msgstr "Konservi retejan agordon"
 
 #. TRANS: Page title for site-wide notice tab in admin panel.
@@ -5870,7 +5602,7 @@ msgstr "Teksto de reteja anonco."
 msgid "Site-wide notice text (255 characters maximum; HTML allowed)"
 msgstr "Teksto de reteja anonco (apenaÅ­ 255 literoj; HTML eblas)"
 
-#. TRANS: Title for button to save site notice in admin panel.
+#. TRANS: Button title to save site notice in admin panel.
 #, fuzzy
 msgid "Save site notice."
 msgstr "Konservi retejan agordon"
@@ -6071,7 +5803,7 @@ msgstr "Alraporta URL"
 msgid "Snapshots will be sent to this URL."
 msgstr "Momentfotoj sendi�os al ĉi tiu URL"
 
-#. TRANS: Title for button to save snapshot settings.
+#. TRANS: Button title to save snapshot settings.
 #, fuzzy
 msgid "Save snapshot settings."
 msgstr "Konservi retejan agordon"
@@ -6106,10 +5838,6 @@ msgstr "Grupanoj de %1$s, pa�o %2$d"
 msgid "A list of users awaiting approval to subscribe to you."
 msgstr "Listo de uzantoj en tiu ĉi grupo"
 
-#. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
-msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
-msgstr "Vi ne povas aboni foran  OMB 0.1-an profilon per ĉi tiu ago."
-
 #. TRANS: Page title when subscription succeeded.
 msgid "Subscribed"
 msgstr "Abonita"
@@ -6206,13 +5934,12 @@ msgstr "Jen homoj, kies avizoj %s rigardas."
 #. TRANS: This message contains Markdown URLs. The link description is between
 #. TRANS: square brackets, and the link between parentheses. Do not separate "]("
 #. TRANS: and do not change the URL part.
-#, php-format
+#, fuzzy, php-format
 msgid ""
 "You're not listening to anyone's notices right now, try subscribing to "
 "people you know. Try [people search](%%action.peoplesearch%%), look for "
 "members in groups you're interested in and in our [featured users](%%action."
-"featured%%). If you're a [Twitter user](%%action.twittersettings%%), you can "
-"automatically subscribe to people you already follow there."
+"featured%%)."
 msgstr ""
 "Vi ne nun abonas ies ajn avizoj. Provu aboni konatojn. Provu [homserĉi](%%"
 "action.peoplesearch%%), kontrolu grupanojn en interesaj grupoj, kaj nian "
@@ -6248,6 +5975,12 @@ msgstr "SMS"
 msgid "Notices tagged with %1$s, page %2$d"
 msgstr "Avizoj etikeditaj per %1$s - pa�o %2$d"
 
+#. TRANS: Link label for feed on "notices with tag" page.
+#. TRANS: %s is the tag the feed is for.
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (Activity Streams JSON)"
+msgstr "Avizofluo pri etikedo %s (Atom)"
+
 #. TRANS: Link label for feed on "notices with tag" page.
 #. TRANS: %s is the tag the feed is for.
 #, php-format
@@ -6356,17 +6089,6 @@ msgstr "Malabonita"
 msgid "%1$s unsubscribed from list %2$s by %3$s"
 msgstr "%1$s abonantoj, pa�o %2$d"
 
-#. TRANS: Client error displayed when trying to update profile with an incompatible license.
-#. TRANS: %1$s is the license incompatible with site license %2$s.
-#. TRANS: Exception thrown when licenses are not compatible for an authorisation request.
-#. TRANS: %1$s is the license for the listenee, %2$s is the license for "this" StatusNet site.
-#, fuzzy, php-format
-msgid ""
-"Listenee stream license \"%1$s\" is not compatible with site license \"%2$s"
-"\"."
-msgstr ""
-"Rigardato-flua permesilo \"%1$s\" ne konformas al reteja permesilo \"%2$s\"."
-
 #. TRANS: Title of URL settings tab in profile settings.
 #, fuzzy
 msgid "URL settings"
@@ -6509,159 +6231,9 @@ msgstr "Invito ebli�is"
 msgid "Whether to allow users to invite new users."
 msgstr "Ĉu permesi al uzantoj inviti novan uzantojn."
 
-#. TRANS: Title for button to save user settings in user admin panel.
-#, fuzzy
+#. TRANS: Button title to save user settings in user admin panel.
 msgid "Save user settings."
-msgstr "Konservi retejan agordon"
-
-#. TRANS: Page title.
-msgid "Authorize subscription"
-msgstr "Rajtigi abonon"
-
-#. TRANS: Page notice on "Authorize subscription" page.
-#, fuzzy
-msgid ""
-"Please check these details to make sure that you want to subscribe to this "
-"user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
-"click \"Reject\"."
-msgstr ""
-"Bonvolu kontroli la detalojn por certigi ĉu vi deziras aboni la avizoj de ĉi "
-"tiu uzanto. Se ne simple alklaku “Rifuzi\"."
-
-#. TRANS: Button text on Authorise Subscription page.
-#. TRANS: Submit button text to accept a group membership request on approve group form.
-#. TRANS: Submit button text to accept a subscription request on approve sub form.
-#, fuzzy
-msgctxt "BUTTON"
-msgid "Accept"
-msgstr "Akcepti"
-
-#. TRANS: Title for button on Authorise Subscription page.
-#. TRANS: Button title to subscribe to a user.
-#, fuzzy
-msgid "Subscribe to this user."
-msgstr "Aboni la uzanton"
-
-#. TRANS: Button text on Authorise Subscription page.
-#. TRANS: Submit button text to reject a group membership request on approve group form.
-#. TRANS: Submit button text to reject a subscription request on approve sub form.
-#, fuzzy
-msgctxt "BUTTON"
-msgid "Reject"
-msgstr "Malakcepti"
-
-#. TRANS: Title for button on Authorise Subscription page.
-#, fuzzy
-msgid "Reject this subscription."
-msgstr "Rifuzi la abonon"
-
-#. TRANS: Client error displayed for an empty authorisation request.
-msgid "No authorization request!"
-msgstr "Ne bezonas permesado!"
-
-#. TRANS: Accept message header from Authorise subscription page.
-msgid "Subscription authorized"
-msgstr "Abono permesi�is"
-
-#. TRANS: Accept message text from Authorise subscription page.
-#, 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 ""
-"La abono permesi�is, sed ne pasi�is revoka URL. Legu gvidon de la retejo pro "
-"detaloj pri kiel rajtigi abonon. Via abono-ĵetono jenas:"
-
-#. TRANS: Reject message header from Authorise subscription page.
-msgid "Subscription rejected"
-msgstr "Abono rifuzi�is"
-
-#. TRANS: Reject message from Authorise subscription page.
-#, 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 ""
-"La abono rifuzi�is sed ne pasi�is revoka URL. Legu gvidon de la retejo pro "
-"detaloj pri kiel rajtigi abonon. Via abono-ĵetono jenas:"
-
-#. TRANS: Exception thrown when no valid user is found for an authorisation request.
-#. TRANS: %s is a listener URI.
-#, fuzzy, php-format
-msgid "Listener URI \"%s\" not found here."
-msgstr "URL de aboninto ‘%s’ ne trovi�as tie ĉi."
-
-#. TRANS: Exception thrown when listenee URI is too long for an authorisation request.
-#. TRANS: %s is a listenee URI.
-#, fuzzy, php-format
-msgid "Listenee URI \"%s\" is too long."
-msgstr "URL de abonito ‘%s’ tro longas."
-
-#. TRANS: Exception thrown when listenee URI is a local user for an authorisation request.
-#. TRANS: %s is a listenee URI.
-#, fuzzy, php-format
-msgid "Listenee URI \"%s\" is a local user."
-msgstr "URL de abonito ‘%s’ estas de loka uzanto."
-
-#. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
-#. TRANS: %s is a profile URL.
-#, fuzzy, php-format
-msgid "Profile URL \"%s\" is for a local user."
-msgstr "Profila URL ‘%s’ estas de loka uzanto."
-
-#. TRANS: Exception thrown when avatar URL is invalid for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#, fuzzy, php-format
-msgid "Avatar URL \"%s\" is not valid."
-msgstr "Viza�bilda URL ‘%s' ne estas valida."
-
-#. TRANS: Exception thrown when avatar URL could not be read for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#, fuzzy, php-format
-msgid "Cannot read avatar URL \"%s\"."
-msgstr "Malsukcesis legi viza�bildan URL ‘%s’."
-
-#. TRANS: Exception thrown when avatar URL return an invalid image type for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#, fuzzy, php-format
-msgid "Wrong image type for avatar URL \"%s\"."
-msgstr "Mal�usta bildotipo por viza�bilda URL ‘%s'."
-
-#. TRANS: Title for profile design page.
-#. TRANS: Page title for profile design page.
-msgid "Profile design"
-msgstr "Profila desegno"
-
-#. TRANS: Instructions for Profile design page.
-#. TRANS: Instructions for profile design page.
-msgid ""
-"Customize the way your profile looks with a background image and a colour "
-"palette of your choice."
-msgstr "Agodi kiel aspektu via profilo, per elekto de fonbildo kaj koloraro."
-
-#. TRANS: Succes message on Profile design page when finding an easter egg.
-msgid "Enjoy your hotdog!"
-msgstr "Äœuu vian kolbasobulkon!"
-
-#. TRANS: Form legend on Profile design page.
-#, fuzzy
-msgid "Design settings"
-msgstr "Konservi retejan agordon"
-
-#. TRANS: Checkbox label on Profile design page.
-msgid "View profile designs"
-msgstr "Vidi profilo-desegnon"
-
-#. TRANS: Title for checkbox on Profile design page.
-msgid "Show or hide profile designs."
-msgstr "Montri aŭ ka�i profilo-desegnon."
-
-#. TRANS: Form legend on Profile design page for form to choose a background image.
-#, fuzzy
-msgid "Background file"
-msgstr "Fono"
+msgstr "Konservi uzulajn agordojn"
 
 #. TRANS: Page title for all but the first page of groups for a user.
 #. TRANS: %1$s is a nickname, %2$d is a page number.
@@ -6701,9 +6273,9 @@ msgstr "StatusNet %s"
 
 #. TRANS: Content part of StatusNet version page.
 #. TRANS: %1$s is the engine name (StatusNet) and %2$s is the StatusNet version.
-#, php-format
+#, fuzzy, php-format
 msgid ""
-"This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, "
+"This site is powered by %1$s version %2$s, Copyright 2008-2011 StatusNet, "
 "Inc. and contributors."
 msgstr ""
 "La retejon ebligis %1$s de versio %2$s, aÅ­torrajto 2008-2010 StatusNet, Inc. "
@@ -6718,11 +6290,12 @@ msgid "License"
 msgstr "Licenco"
 
 #. TRANS: Content part of StatusNet version page.
+#, fuzzy
 msgid ""
 "StatusNet is free software: you can redistribute it and/or modify it under "
 "the terms of the GNU Affero General Public License as published by the Free "
 "Software Foundation, either version 3 of the License, or (at your option) "
-"any later version. "
+"any later version."
 msgstr ""
 "StatusNet estas libera molvaro: vi rajtas redistribui �in kaj/aŭ modifi �in "
 "sub la condiĉoj de la GNU-a Affero Ĝenerala Publika Licenco kiel eldonite de "
@@ -6730,11 +6303,12 @@ msgstr ""
 "ĉiu posta versio taŭgas. "
 
 #. TRANS: Content part of StatusNet version page.
+#, fuzzy
 msgid ""
 "This program is distributed in the hope that it will be useful, but WITHOUT "
 "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
 "FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License "
-"for more details. "
+"for more details."
 msgstr ""
 "Ĉi tiu programo distribui�is kun espero ke �i estos utila, sed SEN AJNA "
 "GARANTIO; ne eĉ suba garantio de FUNKCIPOVO aŭ TAŬGECO POR IU CERTA CELO. "
@@ -6793,16 +6367,26 @@ msgstr "Malsukcesis trakti URL '%s'"
 msgid "Robin thinks something is impossible."
 msgstr "Robin pensas ke io neeblas."
 
+#. TRANS: Message used to be inserted as %2$s in  the text "No file may
+#. TRANS: be larger than %1$d byte and the file you sent was %2$s.".
+#. TRANS: %1$d is the number of bytes of an uploaded file.
+#, php-format
+msgid "%1$d byte"
+msgid_plural "%1$d bytes"
+msgstr[0] ""
+msgstr[1] ""
+
 #. TRANS: Message given if an upload is larger than the configured maximum.
-#. TRANS: %1$d is the byte limit for uploads, %2$d is the byte count for the uploaded file.
-#. TRANS: %1$s is used for plural.
+#. TRANS: %1$d (used for plural) is the byte limit for uploads,
+#. TRANS: %2$s is the proper form of "n bytes". This is the only ways to have
+#. TRANS: gettext support multiple plurals in the same message, unfortunately...
 #, fuzzy, php-format
 msgid ""
-"No file may be larger than %1$d byte and the file you sent was %2$d bytes. "
-"Try to upload a smaller version."
+"No file may be larger than %1$d byte and the file you sent was %2$s. Try to "
+"upload a smaller version."
 msgid_plural ""
-"No file may be larger than %1$d bytes and the file you sent was %2$d bytes. "
-"Try to upload a smaller version."
+"No file may be larger than %1$d bytes and the file you sent was %2$s. Try to "
+"upload a smaller version."
 msgstr[0] ""
 "Grandlimo por sendota dosiero estas %1$d bajtoj, tamen tio, kion vi volis "
 "sendi grandas %2$d bajtojn. Provu per versio pli malgranda."
@@ -6874,6 +6458,11 @@ msgstr "Malsukcesis �isdatigi lokan grupon."
 msgid "Could not create login token for %s"
 msgstr "Malsukcesis krei ensalut-ĵetonon por %s"
 
+#. TRANS: Exception thrown when a program code class (%s) cannot be instantiated.
+#, fuzzy, php-format
+msgid "Cannot instantiate class %s."
+msgstr "Malsukcesis konservo de nova pasvorto."
+
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.
 msgid "No database name or DSN found anywhere."
 msgstr "Ne trovi�as datumbaza nomo aŭ DSN ie ajn."
@@ -6976,7 +6565,7 @@ msgstr "RT @%1$s %2$s"
 
 #. TRANS: Full name of a profile or group (%1$s) followed by nickname (%2$s) in parentheses.
 #. TRANS: Full name of a profile or group followed by nickname in parens
-#, fuzzy, php-format
+#, php-format
 msgctxt "FANCYNAME"
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
@@ -7033,7 +6622,7 @@ msgstr ""
 #, php-format
 msgid ""
 "You already have %1$d or more people in list %2$s, which is the maximum "
-"allowed number.Try unlisting others first."
+"allowed number. Try unlisting others first."
 msgstr ""
 
 #. TRANS: Exception thrown when inserting a list subscription in the database fails.
@@ -7055,7 +6644,6 @@ msgid "Unable to save tag."
 msgstr "Malsukcesis konservi etikedon."
 
 #. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
-#. TRANS: Error message displayed to a banned user when they try to subscribe.
 msgid "You have been banned from subscribing."
 msgstr "Vi esatas blokita de aboni."
 
@@ -7075,10 +6663,6 @@ msgstr "Ne abonato!"
 msgid "Could not delete self-subscription."
 msgstr "Ne eblas forigi abonon al vi mem."
 
-#. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
-msgid "Could not delete subscription OMB token."
-msgstr "Malsukcesis forigi abonan OMB-ĵetonon."
-
 #. TRANS: Exception thrown when a subscription could not be deleted on the server.
 msgid "Could not delete subscription."
 msgstr "Malsukcesis forigi abonon."
@@ -7113,6 +6697,18 @@ msgstr "Neniu difinata uzanto por sol-uzanta re�imo."
 msgid "Single-user mode code called when not enabled."
 msgstr ""
 
+#. TRANS: Information on password recovery form if no known username or e-mail address was specified.
+msgid "No user with that email address or username."
+msgstr "Ne estas uzanto kun tiu retpo�tadreso aŭ uzantnomo."
+
+#. TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.
+msgid "No registered email address for that user."
+msgstr "Neniu registrita retpo�tadreso apartenas al la uzanto."
+
+#. TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.
+msgid "Error saving address confirmation."
+msgstr "Eraras pro komfirma kodo."
+
 #. TRANS: Server exception thrown when creating a group failed.
 msgid "Could not create group."
 msgstr "Malsukcesis krei grupon."
@@ -7389,27 +6985,12 @@ msgstr "showForm() ne jam realigita."
 msgid "saveSettings() not implemented."
 msgstr "saveSettings() ne jam realigita."
 
-#. TRANS: Client error message thrown if design settings could not be deleted in
-#. TRANS: the admin panel Design.
-msgid "Unable to delete design setting."
-msgstr "Malsukcesas forigi desegnan agordon."
-
 #. TRANS: Header in administrator navigation panel.
-#. TRANS: Header in settings navigation panel.
 #, fuzzy
 msgctxt "HEADER"
 msgid "Home"
 msgstr "Hejmpa�o"
 
-#. TRANS: Menu item in administrator navigation panel.
-#. TRANS: Menu item in default local navigation panel.
-#. TRANS: Menu item in personal group navigation menu.
-#. TRANS: Menu item in settings navigation panel.
-#, fuzzy
-msgctxt "MENU"
-msgid "Home"
-msgstr "Hejmpa�o"
-
 #. TRANS: Header in administrator navigation panel.
 #, fuzzy
 msgctxt "HEADER"
@@ -7425,17 +7006,6 @@ msgctxt "MENU"
 msgid "Site"
 msgstr "Retejo"
 
-#. TRANS: Menu item title in administrator navigation panel.
-msgid "Design configuration"
-msgstr "Desegna agordo"
-
-#. TRANS: Menu item in administrator navigation panel.
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: Menu item in settings navigation panel.
-msgctxt "MENU"
-msgid "Design"
-msgstr "Desegno"
-
 #. TRANS: Menu item title in administrator navigation panel.
 msgid "User configuration"
 msgstr "Uzanta agordo"
@@ -7461,7 +7031,6 @@ msgid "Paths configuration"
 msgstr "Voja agordo"
 
 #. TRANS: Menu item in administrator navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Paths"
 msgstr "Vojoj"
@@ -7542,43 +7111,6 @@ msgstr "Ne estas uzanto kun tiu ĵetono."
 msgid "Could not authenticate you."
 msgstr "Malsukcesis aÅ­tentigi vin."
 
-#. TRANS: Server error displayed when trying to create an anynymous OAuth consumer.
-#, fuzzy
-msgid "Could not create anonymous consumer."
-msgstr "Malsukcesis krei alinomon."
-
-#. TRANS: Server error displayed when trying to create an anynymous OAuth application.
-#, fuzzy
-msgid "Could not create anonymous OAuth application."
-msgstr "Malsukcesis krei aplikaĵon."
-
-#. TRANS: Exception thrown when no token association could be found.
-msgid ""
-"Could not find a profile and application associated with the request token."
-msgstr ""
-
-#. TRANS: Exception thrown when no access token can be issued.
-#, fuzzy
-msgid "Could not issue access token."
-msgstr "Malsukcesis enmeti mesa�on."
-
-#. TRANS: Exception thrown when a database error occurs.
-msgid "Database error inserting OAuth application user."
-msgstr "Datumbaza eraro enigi la uzanton de *OAuth-aplikaĵo."
-
-#. TRANS: Exception thrown when a database error occurs.
-#, fuzzy
-msgid "Database error updating OAuth application user."
-msgstr "Datumbaza eraro enigi la uzanton de *OAuth-aplikaĵo."
-
-#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
-msgid "Tried to revoke unknown token."
-msgstr "Provis revoki nekonatan ĵetonon."
-
-#. TRANS: Exception thrown when an attempt is made to remove a revoked token.
-msgid "Failed to delete revoked token."
-msgstr "Malsukcesis forigi revokitan ĵetonon."
-
 #. TRANS: Form input field label for application icon.
 msgid "Icon"
 msgstr "Bildsimbolo"
@@ -7659,13 +7191,14 @@ msgid "Default access for this application: read-only, or read-write"
 msgstr "Defaŭta aliro por la aplikaĵo: nur-lege aŭ leg-skribe."
 
 #. TRANS: Submit button title.
-msgid "Cancel"
-msgstr "Nuligi"
+#, fuzzy
+msgid "Cancel application changes."
+msgstr "Konektita aplikaĵo"
 
 #. TRANS: Submit button title.
-#. TRANS: Button text to save a list.
-msgid "Save"
-msgstr "Konservi"
+#, fuzzy
+msgid "Save application changes."
+msgstr "Nova aplikaĵo"
 
 #. TRANS: Name for an anonymous application in application list.
 #, fuzzy
@@ -7701,6 +7234,20 @@ msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "Revoki"
 
+#. TRANS: Submit button text to accept a group membership request on approve group form.
+#. TRANS: Submit button text to accept a subscription request on approve sub form.
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Accept"
+msgstr "Akcepti"
+
+#. TRANS: Submit button text to reject a group membership request on approve group form.
+#. TRANS: Submit button text to reject a subscription request on approve sub form.
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Reject"
+msgstr "Malakcepti"
+
 #. TRANS: Atom feed exception thrown when an author element does not contain a name element.
 msgid "Author element must contain a name element."
 msgstr ""
@@ -8266,25 +7813,21 @@ msgstr "Vi eble volas uzi instalilon por ripari tiun ĉi."
 msgid "Go to the installer."
 msgstr "Al la instalilo."
 
+#. TRANS: Header on conversation page. Hidden by default (h2).
+#. TRANS: Label for user statistics.
+msgid "Notices"
+msgstr "Avizoj"
+
 #. TRANS: Page title for when a database error occurs.
 msgid "Database error"
 msgstr "Datumbaza eraro"
 
 #. TRANS: Menu item in default local navigation panel.
 #. TRANS: Menu item in search group navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Public"
 msgstr "Publika"
 
-#. TRANS: Menu item in default local navigation panel.
-#. TRANS: Menu item in search group navigation panel.
-#. TRANS: Menu item in local navigation menu.
-#, fuzzy
-msgctxt "MENU"
-msgid "Groups"
-msgstr "Grupoj"
-
 #. TRANS: Menu item in default local navigation panel.
 #. TRANS: Menu item title in local navigation menu.
 #, fuzzy
@@ -8301,53 +7844,12 @@ msgstr "Forigi"
 msgid "Delete this user"
 msgstr "Forigi la uzanton"
 
-#. TRANS: Form legend of form for changing the page design.
-#, fuzzy
-msgid "Change design"
-msgstr "�an�i etoson"
-
-#. TRANS: Fieldset legend on profile design page to change profile page colours.
-msgid "Change colours"
-msgstr "Ŝan�i kolorojn"
-
-#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-msgid "Use defaults"
-msgstr "Uzi defaÅ­lton"
-
-#. TRANS: Label in form on profile design page.
-#. TRANS: Field contains file name on user's computer that could be that user's custom profile background image.
-msgid "Upload file"
-msgstr "Al�uti dosieron"
-
-#. TRANS: Instructions for form on profile design page.
-msgid ""
-"You can upload your personal background image. The maximum file size is 2MB."
-msgstr ""
-"Vi povas al�uti vian propran fonbildon. La dosiera grandlimo estas 2MB."
-
-#. TRANS: Radio button on profile design page that will enable use of the uploaded profile image.
-#, fuzzy
-msgctxt "RADIO"
-msgid "On"
-msgstr "En"
-
-#. TRANS: Radio button on profile design page that will disable use of the uploaded profile image.
-#, fuzzy
-msgctxt "RADIO"
-msgid "Off"
-msgstr "For"
-
-#. TRANS: Success message displayed if design settings were saved after clicking "Use defaults".
-msgid "Design defaults restored."
-msgstr "Desegnaj defaŭltoj konservi�as."
-
 #. TRANS: Exception. %s is an ID.
 #, fuzzy, php-format
 msgid "Unable to find services for %s."
 msgstr "Maleble revoki aliradon al aplikaĵo: %s."
 
 #. TRANS: Form legend for removing the favourite status for a favourite notice.
-#. TRANS: Title for button text for removing the favourite status for a favourite notice.
 msgid "Disfavor this notice"
 msgstr "Forigi �atmarkon de ĉi tiu avizo"
 
@@ -8357,8 +7859,12 @@ msgctxt "BUTTON"
 msgid "Disfavor favorite"
 msgstr "Mal�ati �ataton."
 
+#. TRANS: Button title for removing the favourite status for a favourite notice.
+#, fuzzy
+msgid "Remove this notice from your list of favorite notices."
+msgstr "Malsukcesis ricevi �ataton."
+
 #. TRANS: Form legend for adding the favourite status to a notice.
-#. TRANS: Title for button text for adding the favourite status to a notice.
 msgid "Favor this notice"
 msgstr "Åœati la avizon"
 
@@ -8368,6 +7874,11 @@ msgctxt "BUTTON"
 msgid "Favor"
 msgstr "Åœati"
 
+#. TRANS: Button title for adding the favourite status to a notice.
+#, fuzzy
+msgid "Add this notice to your list of favorite notices."
+msgstr "Malsukcesis ricevi �ataton."
+
 #. TRANS: Feed type name.
 msgid "RSS 1.0"
 msgstr "RSS 1.0"
@@ -8384,6 +7895,10 @@ msgstr "Atom"
 msgid "FOAF"
 msgstr "FOAF"
 
+#. TRANS: Feed type name. See http://activitystrea.ms/
+msgid "Activity Streams"
+msgstr ""
+
 #. TRANS: Client exception thrown when an imported feed does not have an author.
 msgid "No author in the feed."
 msgstr ""
@@ -8416,6 +7931,27 @@ msgstr ""
 msgid "Grant this user the \"%s\" role"
 msgstr "Donu al la uzanto rolon \"%s\""
 
+#. TRANS: Header for mini list of group members on a group page (h2).
+msgid "Members"
+msgstr "Grupanoj"
+
+#. TRANS: Link to all group members from mini list of group members if group has more than n members.
+msgid "All members"
+msgstr "Ĉiuj grupanoj"
+
+#. TRANS: Header for mini list of users with a pending membership request on a group page (h2).
+msgid "Pending"
+msgstr ""
+
+#. TRANS: Header for mini list of users that are blocked in a group page (h2).
+msgid "Blocked"
+msgstr "Blokito"
+
+#. TRANS: Title for list of group administrators on a group page.
+msgctxt "TITLE"
+msgid "Admins"
+msgstr "Estroj"
+
 #. TRANS: Button text for the form that will block a user from a group.
 msgctxt "BUTTON"
 msgid "Block"
@@ -8423,8 +7959,8 @@ msgstr "Bloki"
 
 #. TRANS: Submit button title.
 msgctxt "TOOLTIP"
-msgid "Block this user"
-msgstr "Bloki ĉi tiun uzanton"
+msgid "Block this user so that they can no longer post messages to it."
+msgstr ""
 
 #. TRANS: Field title on group edit form.
 #, fuzzy
@@ -8479,63 +8015,9 @@ msgctxt "GROUPADMIN"
 msgid "Admin"
 msgstr "Grupestrarano"
 
-#. TRANS: Menu item in the group navigation page.
-msgctxt "MENU"
-msgid "Group"
-msgstr "Grupo"
-
-#. TRANS: Tooltip for menu item in the group navigation page.
-#. TRANS: %s is the nickname of the group.
-#, php-format
-msgctxt "TOOLTIP"
-msgid "%s group"
-msgstr "Grupo %s"
-
-#. TRANS: Menu item in the group navigation page.
-msgctxt "MENU"
-msgid "Members"
-msgstr "Grupanoj"
-
-#. TRANS: Tooltip for menu item in the group navigation page.
-#. TRANS: %s is the nickname of the group.
-#, php-format
-msgctxt "TOOLTIP"
-msgid "%s group members"
-msgstr "Grupanoj de %s"
-
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: %d is the number of pending members.
-#, php-format
-msgctxt "MENU"
-msgid "Pending members (%d)"
-msgid_plural "Pending members (%d)"
-msgstr[0] ""
-msgstr[1] ""
-
-#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: %s is the nickname of the group.
-#, fuzzy, php-format
-msgctxt "TOOLTIP"
-msgid "%s pending members"
-msgstr "%s grupanoj"
-
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-msgctxt "MENU"
-msgid "Blocked"
-msgstr "Blokito"
-
-#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: %s is the nickname of the group.
-#, php-format
-msgctxt "TOOLTIP"
-msgid "%s blocked users"
-msgstr "Blokito de %s"
-
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: Menu item in primary navigation panel.
-msgctxt "MENU"
-msgid "Admin"
-msgstr "Administri"
+#. TRANS: Group actions header (h2). Text hidden by default.
+msgid "Group actions"
+msgstr "Grupaj agoj"
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
@@ -8544,11 +8026,6 @@ msgctxt "TOOLTIP"
 msgid "Edit %s group properties"
 msgstr "Redakti agordon de grupo %s"
 
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-msgctxt "MENU"
-msgid "Logo"
-msgstr "Emblemo"
-
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
 #, php-format
@@ -8556,16 +8033,10 @@ msgctxt "TOOLTIP"
 msgid "Add or edit %s logo"
 msgstr "Aldoni aÅ­ redakti emblemon de %s"
 
-#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: %s is the nickname of the group.
-#, php-format
-msgctxt "TOOLTIP"
-msgid "Add or edit %s design"
-msgstr "Aldoni aÅ­ redakti desegnon de %s"
-
-#. TRANS: Group actions header (h2). Text hidden by default.
-msgid "Group actions"
-msgstr "Grupaj agoj"
+#. TRANS: Link text for link on user profile.
+msgctxt "MENU"
+msgid "Logo"
+msgstr "Emblemo"
 
 #. TRANS: Title for groups with the most members section.
 #, fuzzy
@@ -8577,11 +8048,19 @@ msgstr "Popularaj avizoj"
 msgid "Active groups"
 msgstr "Ĉiuj grupoj"
 
-#. TRANS: Title for group tag cloud section.
-#. TRANS: %s is a group name.
-#, php-format
-msgid "Tags in %s group's notices"
-msgstr "Etikedoj en avizoj de grupo %s"
+#. TRANS: Link description for seeing all groups.
+#. TRANS: Link description for seeing all lists.
+msgid "See all"
+msgstr ""
+
+#. TRANS: Link title for seeing all groups.
+msgid "See all groups you belong to."
+msgstr ""
+
+#. TRANS: Menu item title in personal group navigation menu.
+#. TRANS: %s is a username.
+msgid "Back to top"
+msgstr ""
 
 #. TRANS: Client exception 406
 msgid "This page is not available in a media type you accept"
@@ -8667,12 +8146,45 @@ msgctxt "TITLE"
 msgid "Trends"
 msgstr ""
 
-#. TRANS: Button text for inviting more users to the StatusNet instance.
+#. TRANS: Default button text for inviting more users to the StatusNet instance.
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Invite more colleagues"
 msgstr "Inviti novajn uzantojn"
 
+#. TRANS: Form legend.
+#, fuzzy
+msgid "Invite collegues"
+msgstr "Inviti novajn uzantojn"
+
+#. TRANS: Field label for a list of e-mail addresses.
+msgid "Email addresses"
+msgstr "Retpo�tadresoj"
+
+#. TRANS: Field title for a list of e-mail addresses.
+#, fuzzy
+msgid "Addresses of friends to invite (one per line)."
+msgstr "Adresoj de invitataj amikoj (unu por linio)"
+
+#. TRANS: Field label for a personal message to send to invitees.
+msgid "Personal message"
+msgstr "Persona mesa�o"
+
+#. TRANS: Field title for a personal message to send to invitees.
+msgid "Optionally add a personal message to the invitation."
+msgstr "Vi povas aldoni personan mesa�on al la invito."
+
+#. TRANS: Send button for inviting friends
+#. TRANS: Button text for sending notice.
+msgctxt "BUTTON"
+msgid "Send"
+msgstr "Sendi"
+
+#. TRANS: Submit button title.
+#, fuzzy
+msgid "Send invitations."
+msgstr "Invitoj"
+
 #. TRANS: Button text for joining a group.
 #, fuzzy
 msgctxt "BUTTON"
@@ -8685,6 +8197,11 @@ msgctxt "BUTTON"
 msgid "Leave"
 msgstr "Forlasi"
 
+#. TRANS: Link title for seeing all lists.
+#, fuzzy
+msgid "See all lists you have created."
+msgstr "Aplikoj kiujn vi enskribis"
+
 #. TRANS: Menu item for logging in to the StatusNet site.
 #. TRANS: Menu item in primary navigation panel.
 msgctxt "MENU"
@@ -8743,8 +8260,8 @@ msgstr ""
 #. TRANS: %1$s is the subscribing user's nickname, %2$s is the StatusNet sitename.
 #. TRANS: Main body of new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscriber's long name, %2$s is the StatusNet sitename.
-#, php-format
-msgid "%1$s is now listening to your notices on %2$s."
+#, fuzzy, php-format
+msgid "%1$s is now following you on %2$s."
 msgstr "%1$s nun rigardas viajn avizojn ĉe %2$s."
 
 #. TRANS: Subject of pending new-subscriber notification e-mail.
@@ -8912,7 +8429,7 @@ msgstr ""
 "\n"
 "%4$s\n"
 "\n"
-"Ne respondu al ĉi tiu retpo�tadreso; respondo ne atingos lin.\n"
+"Ne respondu al ĉi tiu retpo�tadreso; respondo ne atingos lin."
 
 #. TRANS: Subject for favorite notification e-mail.
 #. TRANS: %1$s is the adding user's long name, %2$s is the adding user's nickname.
@@ -8978,7 +8495,7 @@ msgstr "%s (@%s) afi�is avizon al vi"
 #. TRANS: Body of @-reply notification e-mail.
 #. TRANS: %1$s is the sending user's name, $2$s is the StatusNet sitename,
 #. TRANS: %3$s is a URL to the notice, %4$s is the notice text,
-#. TRANS: %5$s is a URL to the full conversion if it exists (otherwise empty),
+#. TRANS: %5$s is the text "The full conversation can be read here:" and a URL to the full conversion if it exists (otherwise empty),
 #. TRANS: %6$s is a URL to reply to the notice, %7$s is a URL to all @-replies for the addressed user,
 #, fuzzy, php-format
 msgid ""
@@ -9025,6 +8542,10 @@ msgstr ""
 
 #. TRANS: Subject of group join notification e-mail.
 #. TRANS: %1$s is the joining user's nickname, %2$s is the group name, and %3$s is the StatusNet sitename.
+#, fuzzy, php-format
+msgid "%1$s has joined your group %2$s on %3$s"
+msgstr "%1$s ali�is vian grupon %2$s ĉe %3$s."
+
 #. TRANS: Main body of group join notification e-mail.
 #. TRANS: %1$s is the subscriber's long name, %2$s is the group name, and %3$s is the StatusNet sitename,
 #. TRANS: %4$s is a block of profile info about the subscriber.
@@ -9115,8 +8636,9 @@ msgid "Make Admin"
 msgstr "Estrigi"
 
 #. TRANS: Submit button title.
+#, fuzzy
 msgctxt "TOOLTIP"
-msgid "Make this user an admin"
+msgid "Make this user an admin."
 msgstr "Estrigi la uzanton"
 
 #. TRANS: Client exception thrown when a database error was thrown during a file upload operation.
@@ -9164,7 +8686,7 @@ msgstr "Sendi rektan avizon"
 msgid "Select recipient:"
 msgstr "Elektu ricevonton:"
 
-#. TRANS Entry in drop-down selection box in direct-message inbox/outbox when no one is available to message.
+#. TRANS: Entry in drop-down selection box in direct-message inbox/outbox when no one is available to message.
 msgid "No mutual subscribers."
 msgstr "Mankas abonantoj reciprokaj."
 
@@ -9236,6 +8758,10 @@ msgstr ""
 msgid "You must implement either adaptNoticeListItem() or showNotice()."
 msgstr ""
 
+#. TRANS: Link description to show more items in a list.
+msgid "More â–¼"
+msgstr ""
+
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 msgid "Nickname cannot be empty."
 msgstr ""
@@ -9286,10 +8812,6 @@ msgctxt "SEPARATOR"
 msgid ", "
 msgstr ""
 
-#. TRANS: Start of profile addressees list.
-msgid " â–¸ "
-msgstr ""
-
 #. TRANS: Used in coordinates as abbreviation of north.
 msgid "N"
 msgstr "N"
@@ -9328,7 +8850,8 @@ msgid "Repeated by"
 msgstr "Ripetita de"
 
 #. TRANS: Link title in notice list item to reply to a notice.
-msgid "Reply to this notice"
+#, fuzzy
+msgid "Reply to this notice."
 msgstr "Respondi ĉi tiun avizon"
 
 #. TRANS: Link text in notice list item to reply to a notice.
@@ -9336,8 +8859,9 @@ msgid "Reply"
 msgstr "Respondi"
 
 #. TRANS: Link title in notice list item to delete a notice.
-msgid "Delete this notice"
-msgstr "Forigi la avizon"
+#, fuzzy
+msgid "Delete this notice from the timeline."
+msgstr "Forvi�i ĉi tiun avizon."
 
 #. TRANS: Title for repeat form status in notice list when a notice has been repeated.
 #, fuzzy
@@ -9363,27 +8887,6 @@ msgstr "Pu�eti"
 msgid "Send a nudge to this user."
 msgstr "Sendi pu�eton al la uzanto"
 
-#. TRANS: Exception thrown when creating a new profile fails in OAuth store.
-msgid "Error inserting new profile."
-msgstr "Eraris enmeti novan profilon"
-
-#. TRANS: Exception thrown when creating a new avatar fails in OAuth store.
-msgid "Error inserting avatar."
-msgstr "Eraris enmeti novan viza�bildon."
-
-#. TRANS: Exception thrown when creating a remote profile fails in OAuth store.
-msgid "Error inserting remote profile."
-msgstr "Eraris enmeti foran profilon."
-
-#. TRANS: Exception thrown when a notice is denied because it has been sent before.
-msgid "Duplicate notice."
-msgstr "Refoja avizo."
-
-#. TRANS: Exception thrown when creating a new subscription fails in OAuth store.
-#, fuzzy
-msgid "Could not insert new subscription."
-msgstr "Eraris enmeti novan abonon."
-
 #. TRANS: Server exception thrown in oEmbed action if no API endpoint is available.
 #, fuzzy
 msgid "No oEmbed API endpoint available."
@@ -9473,11 +8976,6 @@ msgstr "Redakti"
 msgid "Edit %s list by you."
 msgstr "Redakti %s grupon"
 
-#. TRANS: Link description for link to list of users tagged with a tag.
-#, fuzzy
-msgid "Tagged"
-msgstr "Etikedo"
-
 #. TRANS: Title for link to edit list settings.
 #, fuzzy
 msgid "Edit list settings."
@@ -9633,8 +9131,10 @@ msgctxt "plugin"
 msgid "Enable"
 msgstr ""
 
+#. TRANS: Plugin description for a disabled plugin.
 msgctxt "plugin-description"
-msgid "(Plugin descriptions unavailable when disabled.)"
+msgid ""
+"(The plugin description is unavailable when a plugin has been disabled.)"
 msgstr ""
 
 #. TRANS: Menu item in primary navigation panel.
@@ -9648,6 +9148,11 @@ msgstr "Agordoj"
 msgid "Change your personal settings."
 msgstr "Ŝan�i viajn personajn agordojn"
 
+#. TRANS: Menu item in primary navigation panel.
+msgctxt "MENU"
+msgid "Admin"
+msgstr "Administri"
+
 #. TRANS: Menu item title in primary navigation panel.
 #, fuzzy
 msgid "Site configuration."
@@ -9668,15 +9173,8 @@ msgstr "Elsaluti el la retpa�aro"
 msgid "Login to the site."
 msgstr "Ensaluti al la retpa�aro"
 
-#. TRANS: Menu item in primary navigation panel.
-msgctxt "MENU"
-msgid "Search"
-msgstr "Serĉi"
-
-#. TRANS: Menu item title in primary navigation panel.
-#, fuzzy
-msgid "Search the site."
-msgstr "Serĉi en la retpa�aro"
+msgid "This profile has been silenced by site moderators"
+msgstr ""
 
 #. TRANS: H2 text for user subscription statistics.
 #, fuzzy
@@ -9688,6 +9186,10 @@ msgstr "Sekvi"
 msgid "Followers"
 msgstr "Sekvi"
 
+#. TRANS: H2 text for user statistics.
+msgid "Statistics"
+msgstr "Statistiko"
+
 #. TRANS: Label for user statistics.
 msgid "User ID"
 msgstr "ID de uzanto"
@@ -9696,10 +9198,6 @@ msgstr "ID de uzanto"
 msgid "Member since"
 msgstr "Ano ekde"
 
-#. TRANS: Label for user statistics.
-msgid "Notices"
-msgstr "Avizoj"
-
 #. TRANS: Label for user statistics.
 #. TRANS: Average count of posts made per day since account registration.
 msgid "Daily average"
@@ -9792,6 +9290,7 @@ msgid "Keyword(s)"
 msgstr "Serĉvorto(j)"
 
 #. TRANS: Button text for searching site.
+#. TRANS: Button text for search button on search form.
 #. TRANS: Button text to search profiles.
 msgctxt "BUTTON"
 msgid "Search"
@@ -9840,23 +9339,6 @@ msgstr "Serĉi enhavon ĉe la retejo"
 msgid "Find groups on this site"
 msgstr "Serĉi grupon ĉe la retejo"
 
-#. TRANS: Secondary navigation menu item leading to help on StatusNet.
-msgctxt "MENU"
-msgid "Help"
-msgstr "Helpo"
-
-#. TRANS: Secondary navigation menu item leading to text about StatusNet site.
-#, fuzzy
-msgctxt "MENU"
-msgid "About"
-msgstr "Enkonduko"
-
-#. TRANS: Secondary navigation menu item leading to Frequently Asked Questions.
-#, fuzzy
-msgctxt "MENU"
-msgid "FAQ"
-msgstr "Oftaj demandoj"
-
 #. TRANS: Secondary navigation menu item leading to Terms of Service.
 #, fuzzy
 msgctxt "MENU"
@@ -9881,19 +9363,6 @@ msgctxt "MENU"
 msgid "Version"
 msgstr "Versio"
 
-#. TRANS: Secondary navigation menu item leading to e-mail contact information on the
-#. TRANS: StatusNet site, where to report bugs, ...
-#, fuzzy
-msgctxt "MENU"
-msgid "Contact"
-msgstr "Kontakto"
-
-#. TRANS: Secondary navigation menu item. Leads to information about embedding a timeline widget.
-#, fuzzy
-msgctxt "MENU"
-msgid "Badge"
-msgstr "Insigno"
-
 #. TRANS: Default title for section/sidebar widget.
 msgid "Untitled section"
 msgstr "Sentitola sekcio"
@@ -9942,10 +9411,6 @@ msgstr "Retpo�to"
 msgid "Change email handling"
 msgstr "Ŝan�i retpo�tan disponadon."
 
-#. TRANS: Menu item title in settings navigation panel.
-msgid "Design your profile"
-msgstr "Desegni vian profilon"
-
 #. TRANS: Menu item in settings navigation panel.
 #, fuzzy
 msgctxt "MENU"
@@ -9986,6 +9451,15 @@ msgstr "Konektoj"
 msgid "Authorized connected applications"
 msgstr "Konektitaj aplikaĵoj rajtigitaj"
 
+#. TRANS: Menu item in settings navigation panel.
+msgctxt "MENU"
+msgid "Old school"
+msgstr ""
+
+#. TRANS: Menu item title in settings navigation panel.
+msgid "UI tweaks for old-school users"
+msgstr ""
+
 #. TRANS: Title of form to silence a user.
 #, fuzzy
 msgctxt "TITLE"
@@ -9996,6 +9470,43 @@ msgstr "Silento"
 msgid "Silence this user"
 msgstr "Silentigi la uzanton"
 
+#. TRANS: Server error displayed when trying to create an anynymous OAuth consumer.
+#, fuzzy
+msgid "Could not create anonymous consumer."
+msgstr "Malsukcesis krei alinomon."
+
+#. TRANS: Server error displayed when trying to create an anynymous OAuth application.
+#, fuzzy
+msgid "Could not create anonymous OAuth application."
+msgstr "Malsukcesis krei aplikaĵon."
+
+#. TRANS: Exception thrown when no token association could be found.
+msgid ""
+"Could not find a profile and application associated with the request token."
+msgstr ""
+
+#. TRANS: Exception thrown when no access token can be issued.
+#, fuzzy
+msgid "Could not issue access token."
+msgstr "Malsukcesis enmeti mesa�on."
+
+#. TRANS: Exception thrown when a database error occurs.
+msgid "Database error inserting OAuth application user."
+msgstr "Datumbaza eraro enigi la uzanton de *OAuth-aplikaĵo."
+
+#. TRANS: Exception thrown when a database error occurs.
+#, fuzzy
+msgid "Database error updating OAuth application user."
+msgstr "Datumbaza eraro enigi la uzanton de *OAuth-aplikaĵo."
+
+#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
+msgid "Tried to revoke unknown token."
+msgstr "Provis revoki nekonatan ĵetonon."
+
+#. TRANS: Exception thrown when an attempt is made to remove a revoked token.
+msgid "Failed to delete revoked token."
+msgstr "Malsukcesis forigi revokitan ĵetonon."
+
 #. TRANS: Menu item in local navigation menu.
 #, fuzzy
 msgctxt "MENU"
@@ -10053,6 +9564,18 @@ msgstr "Inviti amikojn kaj kolegojn al %s kun vi"
 msgid "Subscribe to this user"
 msgstr "Aboni la uzanton"
 
+#. TRANS: Button text to subscribe to a user.
+#. TRANS: Button text for subscribing to a list.
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Subscribe"
+msgstr "Aboni"
+
+#. TRANS: Button title to subscribe to a user.
+#, fuzzy
+msgid "Subscribe to this user."
+msgstr "Aboni la uzanton"
+
 #. TRANS: Title of personal tag cloud section.
 msgid "People Tagcloud as self-tagged"
 msgstr ""
@@ -10181,16 +9704,26 @@ msgstr[1] ""
 #. TRANS: List message for notice repeated by logged in user.
 #, fuzzy
 msgctxt "REPEATLIST"
-msgid "You have repeated this notice."
+msgid "You repeated this."
 msgstr "La avizo jam ripeti�is."
 
-#. TRANS: List message for repeated notices.
-#. TRANS: %d is the number of users that have repeated a notice.
+#. TRANS: List message for when more than 4 people repeat something.
+#. TRANS: %%s is a list of users liking a notice, %d is the number over 4 that like the notice.
+#. TRANS: Plural is decided on the total number of users liking the notice (count of %%s + %d).
+#, php-format
+msgid "%%s and %d other repeated this."
+msgid_plural "%%s and %d others repeated this."
+msgstr[0] ""
+msgstr[1] ""
+
+#. TRANS: List message for favoured notices.
+#. TRANS: %%s is a list of users liking a notice.
+#. TRANS: Plural is based on the number of of users that have favoured a notice.
 #, fuzzy, php-format
-msgid "One person has repeated this notice."
-msgid_plural "%d people have repeated this notice."
-msgstr[0] "La avizo jam ripeti�is."
-msgstr[1] "La avizo jam ripeti�is."
+msgid "%%s repeated this."
+msgid_plural "%%s repeated this."
+msgstr[0] "Ripetita al %s"
+msgstr[1] "Ripetita al %s"
 
 #. TRANS: Form legend.
 #, fuzzy, php-format
@@ -10288,7 +9821,6 @@ msgid "Unsilence this user"
 msgstr "Nesilentigi la uzanton"
 
 #. TRANS: Form legend on unsubscribe form.
-#. TRANS: Button title on unsubscribe form.
 msgid "Unsubscribe from this user"
 msgstr "Malaboni la uzanton"
 
@@ -10299,6 +9831,11 @@ msgctxt "BUTTON"
 msgid "Unsubscribe"
 msgstr "Malaboni"
 
+#. TRANS: Button title on unsubscribe form.
+#, fuzzy
+msgid "Unsubscribe from this user."
+msgstr "Malaboni la uzanton"
+
 #. TRANS: Exception text shown when no profile can be found for a user.
 #. TRANS: %1$s is a user nickname, $2$d is a user ID (number).
 #, fuzzy, php-format
@@ -10381,9 +9918,3 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
-
-#~ msgid "%1$s and friends, page %2$d"
-#~ msgstr "%1$s kaj amikoj, pa�o %2$d"
-
-#~ msgid "You and friends"
-#~ msgstr "Vi kaj amikoj"
diff --git a/locale/es/LC_MESSAGES/statusnet.po b/locale/es/LC_MESSAGES/statusnet.po
index 05ac48b98c..850710f510 100644
--- a/locale/es/LC_MESSAGES/statusnet.po
+++ b/locale/es/LC_MESSAGES/statusnet.po
@@ -1,20 +1,25 @@
-# Translation of StatusNet - Core to Spanish (Español)
+# Translation of StatusNet - Core to Spanish (español)
 # Exported from translatewiki.net
 #
 # Author: ArkBlitz
+# Author: Armando-Martin
 # Author: Barucomx
 # Author: Brion
 # Author: Crazymadlover
+# Author: Erchache2000
 # Author: Fitoschido
 # Author: Johnarupire
 # Author: Locos epraix
 # Author: McDutchie
+# Author: Mor
 # Author: Od1n
 # Author: Ovruni
 # Author: Patcito
 # Author: PerroVerd
 # Author: Peter17
+# Author: Plaxed
 # Author: Translationista
+# Author: Xuacu
 # --
 # This file is distributed under the same license as the StatusNet package.
 #
@@ -22,17 +27,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:58+0000\n"
-"Language-Team: Spanish <http://translatewiki.net/wiki/Portal:es>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:52+0000\n"
+"Language-Team: Spanish <https://translatewiki.net/wiki/Portal:es>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-05-05 10:52:40+0000\n"
+"X-POT-Import-Date: 2012-04-22 22:02:21+0000\n"
 
 #. TRANS: Database error message.
 #, php-format
@@ -47,15 +52,6 @@ msgstr ""
 "el problema, pero puede contactar con ellos en %2$s para asegurarse. De lo "
 "contrario, espere unos minutos y vuelva a intentarlo."
 
-#. TRANS: Error message.
-msgid ""
-"An important error occured, probably related to email setup. Check logfiles "
-"for more info."
-msgstr ""
-"Se ha producido un error importante, probablemente relacionado con la "
-"configuración de correo electrónico. Compruebe los archivos de registro para "
-"obtener más información."
-
 #. TRANS: Error message.
 msgid "An error occurred."
 msgstr "Se ha producido un error."
@@ -116,12 +112,11 @@ msgstr "Inhabilitar nuevos registros."
 msgid "Closed"
 msgstr "Cerrado"
 
-#. TRANS: Title for button to save access settings in site admin panel.
-msgid "Save access settings"
+#. TRANS: Button title to save access settings in site admin panel.
+msgid "Save access settings."
 msgstr "Guardar la configuración de acceso"
 
-#. TRANS: Tooltip for button to save access settings in site admin panel.
-#. TRANS: Button text for saving theme settings.
+#. TRANS: Button text to save access settings in site admin panel.
 #. TRANS: Button label to save e-mail preferences.
 #. TRANS: Button label to save IM preferences.
 #. TRANS: Button text in the license admin panel.
@@ -137,7 +132,6 @@ msgstr "Guardar la configuración de acceso"
 #. TRANS: Button text for saving "Other settings" in profile.
 #. TRANS: Button text to save user settings in user admin panel.
 #. TRANS: Button label in the "Edit application" form.
-#. TRANS: Button text on profile design page to save settings.
 #. TRANS: Text for save button on group edit form.
 #. TRANS: Button text to save tags for a profile.
 msgctxt "BUTTON"
@@ -177,10 +171,6 @@ msgstr "No existe tal perfil."
 msgid "No such list."
 msgstr "No hay tal lista"
 
-#. TRANS: Client error displayed when trying to add an OMB 0.1 remote profile to a list.
-msgid "You cannot list an OMB 0.1 remote profile with this action."
-msgstr "No puedes suscribirte a un perfil remoto 0.1 de OMB con esta acción."
-
 #. TRANS: Client error displayed when an unknown error occurs when adding a user to a list.
 #. TRANS: %s is a username.
 #, php-format
@@ -212,7 +202,6 @@ msgstr "No existe tal página."
 #. TRANS: Client error when user not found for an rss related action.
 #. TRANS: Client error displayed when no existing user is provided for a user's delivery device setting.
 #. TRANS: Client error displayed if a user could not be found.
-#. TRANS: Client error when user not found updating a profile background image.
 #. TRANS: Client error displayed updating profile image without having a user object.
 #. TRANS: Client error displayed when making an Atom API request for an unknown user.
 #. TRANS: Client error displayed when trying to block a non-existing user or a user from another site.
@@ -238,14 +227,11 @@ msgstr "No existe tal página."
 #. TRANS: Client error displayed when trying to get the RSS feed with favorites of a user that does not exist.
 #. TRANS: Client error displayed when requesting Friends of a Friend feed without providing a user nickname.
 #. TRANS: Client error displayed when requesting Friends of a Friend feed for an object that is not a user.
-#. TRANS: Client error displayed when trying to get a user hCard for a non-existing user.
 #. TRANS: Client error displayed trying to make a micro summary without providing a valid user.
 #. TRANS: Client error displayed trying to send a direct message to a non-existing user.
 #. TRANS: Client error displayed trying to use "one time password login" without using an existing user.
 #. TRANS: Client error displayed when referring to non-existing user.
 #. TRANS: Client error displayed trying to perform an action related to a non-existing user.
-#. TRANS: Form validation error on page for remote subscribe when no user was provided.
-#. TRANS: Form validation error on page for remote subscribe when no user profile was found.
 #. TRANS: Client error displayed when trying to reply to a non-exsting user.
 #. TRANS: Client error displayed when providing a non-existing nickname in a RSS 1.0 action.
 #. TRANS: Client error.
@@ -254,7 +240,6 @@ msgstr "No existe tal página."
 #. TRANS: Client error displayed trying to find a user by ID for a non-existing ID.
 #. TRANS: Client error displayed requesting groups for a non-existing user.
 #. TRANS: Client error displayed when user not found for an action.
-#. TRANS: Client error displayed providing a non-existing nickname.
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #. TRANS: Client error displayed when trying to perform a gallery action with an unknown user.
 #. TRANS: Client error displayed when trying to access a mailbox without providing a user.
@@ -263,15 +248,21 @@ msgid "No such user."
 msgstr "No existe ese usuario."
 
 #. TRANS: Title of a user's own start page.
-#, fuzzy
 msgid "Home timeline"
-msgstr "línea temporal de %s"
+msgstr "Línea de tiempo principal"
 
 #. TRANS: Title of another user's start page.
 #. TRANS: %s is the other user's name.
-#, fuzzy, php-format
+#, php-format
 msgid "%s's home timeline"
-msgstr "línea temporal de %s"
+msgstr "Línea temporal de %s"
+
+#. TRANS: %s is user nickname.
+#. TRANS: Feed title.
+#. TRANS: %s is tagger's nickname.
+#, php-format
+msgid "Feed for friends of %s (Activity Streams JSON)"
+msgstr "Canal de los amigos de %s (Atom)"
 
 #. TRANS: %s is user nickname.
 #, php-format
@@ -318,7 +309,7 @@ msgstr ""
 "Puedes intentar [dar un toque a %1$s](../%2$s) desde su perfil o [publicar "
 "algo a ellos](%%%%action.newnotice%%%%?status_textarea=%3$s)."
 
-#. TRANS: Encoutagement displayed on empty timeline user pages for anonymous users.
+#. TRANS: Encouragement displayed on empty timeline user pages for anonymous users.
 #. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
 #. TRANS: Empty list message for page with replies for a user for not logged in users.
 #. TRANS: %1$s is a user nickname. This message contains a Markdown link in the form [link text](link).
@@ -332,6 +323,12 @@ msgstr ""
 "Por qué no [registrar una cuenta](%%%%action.register%%%%) y luego zarandear "
 "a %s o publicar una nota a ellos?"
 
+#. TRANS: Button text for inviting more users to the StatusNet instance.
+#. TRANS: Less business/enterprise-oriented language for public sites.
+msgctxt "BUTTON"
+msgid "Send invite"
+msgstr "Invitaciones"
+
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Title of API timeline for a user and friends.
 #. TRANS: %s is a username.
@@ -340,8 +337,6 @@ msgstr ""
 #. TRANS: %s is a username.
 #. TRANS: Menu item title in personal group navigation menu.
 #. TRANS: %s is a username.
-#. TRANS: Menu item title in settings navigation panel.
-#. TRANS: %s is a username.
 #, php-format
 msgid "%s and friends"
 msgstr "%s y sus amistades"
@@ -381,7 +376,6 @@ msgstr ""
 #. TRANS: Server error thrown on database error updating SMS preferences.
 #. TRANS: Server error thrown on database error removing a registered SMS phone number.
 #. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
-#. TRANS: Server exception thrown on Profile design page when updating design settings fails.
 msgid "Could not update user."
 msgstr "No se pudo actualizar el usuario."
 
@@ -396,7 +390,6 @@ msgstr "No se pudo guardar el perfil."
 
 #. TRANS: Client error displayed when the number of bytes in a POST request exceeds a limit.
 #. TRANS: %s is the number of bytes of the CONTENT_LENGTH.
-#. TRANS: Form validation error in design settings form. POST should remain untranslated.
 #, php-format
 msgid ""
 "The server was unable to handle that much POST data (%s byte) due to its "
@@ -411,24 +404,6 @@ msgstr[1] ""
 "El servidor no ha podido manejar tanta información del tipo POST (%s de "
 "bytes) a causa de su configuración actual."
 
-#. TRANS: Client error displayed when saving design settings fails because of an empty id.
-#. TRANS: Client error displayed when saving design settings fails because of an empty result.
-#. TRANS: Client error displayed when a database error occurs inserting profile colours.
-#. TRANS: Client error displayed when a database error occurs updating profile colours.
-#. TRANS: Form validation error displayed when group design settings could not be saved because of an application issue.
-#. TRANS: Form validation error on Profile design page when saving design settings has failed.
-#. TRANS: Form validation error on Profile design page when updating design settings has failed.
-msgid "Unable to save your design settings."
-msgstr "No se pudo grabar tu configuración de diseño."
-
-#. TRANS: Error displayed when updating design settings fails.
-#. TRANS: Client error displayed when a database error occurs updating profile colours.
-#. TRANS: Form validation error on Profile design page when updating design settings has failed.
-#. TRANS: Error message displayed if design settings could not be saved.
-#. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
-msgid "Could not update your design."
-msgstr "No se pudo actualizar tu diseño."
-
 #. TRANS: Title for Atom feed.
 msgctxt "ATOM"
 msgid "Main"
@@ -475,6 +450,20 @@ msgstr "Falló bloquear usuario."
 msgid "Unblock user failed."
 msgstr "Falló desbloquear usuario."
 
+#. TRANS: Client exception thrown when no conversation ID is given.
+msgid "No conversation ID."
+msgstr "Sin ID de Conversación"
+
+#. TRANS: Client exception thrown when referring to a non-existing conversation ID (%d).
+#, php-format
+msgid "No conversation with ID %d."
+msgstr "No hay conversaciones con ID %d"
+
+#. TRANS: Title for conversion timeline.
+msgctxt "TITLE"
+msgid "Conversation"
+msgstr "Conversación"
+
 #. TRANS: Title. %s is a user nickname.
 #, php-format
 msgid "Direct messages from %s"
@@ -518,6 +507,8 @@ msgid "Cannot send direct messages to users who aren't your friend."
 msgstr "No puedes enviar mensajes directos a usuarios que no son tus amigos."
 
 #. TRANS: Client error displayed trying to direct message self (403).
+#. TRANS: Client error displayed trying to send a direct message to self.
+#. TRANS: Error text shown when trying to send a direct message to self.
 msgid ""
 "Do not send a message to yourself; just say it to yourself quietly instead."
 msgstr "No te envíes un mensaje a ti mismo; sólo dilo para ti en voz baja."
@@ -746,7 +737,6 @@ msgstr "Grupos en %s"
 
 #. TRANS: Client error displayed when trying to edit a group without being an admin.
 #. TRANS: Client error displayed trying to edit a group while not being a group admin.
-#. TRANS: Client error displayed trying to change group design settings without being a (group) admin.
 #. TRANS: Client error displayed when trying to change group logo settings while not being a group admin.
 msgid "You must be an admin to edit the group."
 msgstr "Para editar el grupo debes ser administrador."
@@ -857,7 +847,6 @@ msgstr "Error de base de datos insertando oauth_token_association."
 
 #. TRANS: Client error given on when invalid data was passed through a form in the OAuth API.
 #. TRANS: Unexpected validation error on avatar upload form.
-#. TRANS: Client error displayed when the submitted form contains unexpected data.
 #. TRANS: Client error displayed submitting invalid form data for edit application.
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
 #. TRANS: Form validation error message when an unsupported argument is used.
@@ -866,7 +855,6 @@ msgstr "Error de base de datos insertando oauth_token_association."
 #. TRANS: Client error when submitting a form with unexpected information.
 #. TRANS: Client error displayed when unexpected data is posted in the password recovery form.
 #. TRANS: Message given submitting a form with an unknown action in SMS settings.
-#. TRANS: Unknown form validation error in design settings form.
 msgid "Unexpected form submission."
 msgstr "Envío de formulario inesperado."
 
@@ -910,7 +898,6 @@ msgstr "Cuenta"
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Field label on account registration page.
-#. TRANS: Label for nickname on user authorisation page.
 #. TRANS: Field label on group edit form.
 #. TRANS: Dropdown option for searching in profiles.
 msgid "Nickname"
@@ -1084,15 +1071,15 @@ msgstr "Actualizaciones de %1$s marcadas como favoritas por %2$s / %3$s."
 
 #. TRANS: Server error displayed whe trying to get a timeline fails.
 #. TRANS: %s is the error message.
-#, fuzzy, php-format
+#, php-format
 msgid "Could not generate feed for list - %s"
-msgstr "No se pudo crear el token de acceso para %s"
+msgstr "No se pudo crear el canal para la lista - %s"
 
 #. TRANS: Title for timeline of most recent mentions of a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user nickname.
 #, php-format
 msgid "%1$s / Updates mentioning %2$s"
-msgstr "%1$s / Actualizaciones que mencionan %2$s"
+msgstr "%1$s / Mensaxes que mencionen a %2$s"
 
 #. TRANS: Subtitle for timeline of most recent mentions of a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user nickname,
@@ -1224,12 +1211,9 @@ msgstr "Debes estar conectado para dejar un grupo."
 #. TRANS: Client error displayed when requesting Friends of a Friend feed for a nickname that is not a group.
 #. TRANS: Client error displayed trying to block a user from a group while specifying a non-existing group.
 #. TRANS: Client error displayed referring to a group's permalink for a non-existing group ID.
-#. TRANS: Client error displayed trying to change group design settings while providing a nickname for a non-existing group.
 #. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
 #. TRANS: Client error displayed when trying to view group members for a non-existing group.
 #. TRANS: Client error displayed when trying to view group members for an object that is not a group.
-#. TRANS: Client error displayed when trying to view group members for a non-existing group.
-#. TRANS: Client error displayed when trying to view group members for an object that is not a group.
 #. TRANS: Client error displayed when requesting a group RSS feed for group that does not exist.
 #. TRANS: Client error displayed when requesting a group RSS feed for an object that is not a group.
 #. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
@@ -1238,10 +1222,10 @@ msgstr "Debes estar conectado para dejar un grupo."
 #. TRANS: Client error displayed when trying to leave a non-local group.
 #. TRANS: Client error displayed when trying to leave a non-existing group.
 #. TRANS: Client error displayed when providing an invalid group ID on the Make Admin page.
-#. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
-#. TRANS: Client error displayed if no local group with a given name was found requesting group page.
 #. TRANS: Command exception text shown when a group is requested that does not exist.
 #. TRANS: Error text shown when trying to leave a group that does not exist.
+#. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
+#. TRANS: Client error displayed if no local group with a given name was found requesting group page.
 msgid "No such group."
 msgstr "No existe ese grupo."
 
@@ -1311,6 +1295,7 @@ msgid "Join request canceled."
 msgstr "Solicitud de ingreso cancelada."
 
 #. TRANS: Client error displayed trying to approve subscription for a non-existing request.
+#. TRANS: %s is a user nickname.
 #, php-format
 msgid "%s is not in the moderation queue for your subscriptions."
 msgstr "%s no está en la cola de moderación de sus suscripciones."
@@ -1462,7 +1447,6 @@ msgstr "No existe tal archivo adjunto."
 #. TRANS: Client error displayed trying to get an avatar without providing a nickname.
 #. TRANS: Client error displayed when requesting a list of blocked users for a group without providing a group nickname.
 #. TRANS: Client error displayed trying to edit a group while not proving a nickname for the group to edit.
-#. TRANS: Client error displayed trying to change group design settings without providing a group nickname.
 #. TRANS: Client error displayed when trying to change group logo settings without providing a nickname.
 #. TRANS: Client error displayed when trying to view group members without providing a group nickname.
 #. TRANS: Client error displayed when requesting a group RSS feed without providing a group nickname.
@@ -1763,6 +1747,16 @@ msgstr "La dirección \"%s\" fue confirmada para tu cuenta."
 msgid "Conversation"
 msgstr "Conversación"
 
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+msgid "Conversation feed (Activity Streams JSON)"
+msgstr "Fuente de mensajes (Activity Streams JSON)"
+
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+msgid "Conversation feed (RSS 2.0)"
+msgstr "Fuente de mensajes (RSS 2.0)"
+
 #. TRANS: Title for conversation page.
 #. TRANS: Title for page that shows a notice.
 msgctxt "TITLE"
@@ -1826,7 +1820,7 @@ msgid "Enter \"%s\" to confirm that you want to delete your account."
 msgstr "Introduzca «%s» para confirmar que desea eliminar su cuenta."
 
 #. TRANS: Button title for user account deletion.
-msgid "Permanently delete your account"
+msgid "Permanently delete your account."
 msgstr "Eliminar permanentemente su cuenta"
 
 #. TRANS: Client error displayed trying to delete an application while not logged in.
@@ -1868,7 +1862,6 @@ msgid "Do not delete this application."
 msgstr "No elimine esta aplicación."
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
-#, fuzzy
 msgid "Delete this application."
 msgstr "Borrar esta aplicación"
 
@@ -1908,9 +1901,8 @@ msgstr ""
 "públicos al grupo todavía aparecerán en las líneas de tiempo individuales."
 
 #. TRANS: Submit button title for 'No' when deleting a group.
-#, fuzzy
 msgid "Do not delete this group."
-msgstr "No eliminar este grupo"
+msgstr "No eliminar este grupo."
 
 #. TRANS: Submit button title for 'Yes' when deleting a group.
 msgid "Delete this group."
@@ -1967,161 +1959,12 @@ msgstr ""
 "todos los datos sobre el usuario, sin dejar una copia de seguridad."
 
 #. TRANS: Submit button title for 'No' when deleting a user.
-#, fuzzy
 msgid "Do not delete this user."
-msgstr "No eliminar este usuario"
+msgstr "No eliminar este usuario."
 
 #. TRANS: Submit button title for 'Yes' when deleting a user.
-#, fuzzy
 msgid "Delete this user."
-msgstr "Borrar este usuario"
-
-#. TRANS: Message used as title for design settings for the site.
-msgid "Design"
-msgstr "Diseño"
-
-#. TRANS: Instructions for design adminsitration panel.
-msgid "Design settings for this StatusNet site"
-msgstr "Configuración de diseño de este sitio de StatusNet"
-
-#. TRANS: Client error displayed when a logo URL does is not valid.
-msgid "Invalid logo URL."
-msgstr "URL de logotipo inválido."
-
-#. TRANS: Client error displayed when an SSL logo URL is invalid.
-msgid "Invalid SSL logo URL."
-msgstr "URL no válida de logotipo SSL."
-
-#. TRANS: Client error displayed when a theme is submitted through the form that is not in the theme list.
-#. TRANS: %s is the chosen unavailable theme.
-#, php-format
-msgid "Theme not available: %s."
-msgstr "Tema no disponible: %s."
-
-#. TRANS: Fieldset legend for form to change logo.
-msgid "Change logo"
-msgstr "Cambiar logo"
-
-#. TRANS: Field label for StatusNet site logo.
-msgid "Site logo"
-msgstr "Logo del sitio"
-
-#. TRANS: Field label for SSL StatusNet site logo.
-msgid "SSL logo"
-msgstr "Logo SSL"
-
-#. TRANS: Fieldset legend for form change StatusNet site's theme.
-msgid "Change theme"
-msgstr "Cambiar el tema"
-
-#. TRANS: Field label for dropdown to choose site theme.
-msgid "Site theme"
-msgstr "Tema del sitio"
-
-#. TRANS: Title for field label for dropdown to choose site theme.
-msgid "Theme for the site."
-msgstr "Tema para el sitio."
-
-#. TRANS: Field label for uploading a cutom theme.
-msgid "Custom theme"
-msgstr "Personalizar tema"
-
-#. TRANS: Form instructions for uploading a cutom StatusNet theme.
-msgid "You can upload a custom StatusNet theme as a .ZIP archive."
-msgstr "Puedes subir un tema personalizado StatusNet como un archivo .ZIP."
-
-#. TRANS: Fieldset legend for theme background image.
-msgid "Change background image"
-msgstr "Cambiar la imagen de fondo"
-
-#. TRANS: Field label for background image on theme designer page.
-#. TRANS: Field label for background color selector.
-#. TRANS: Label on profile design page for setting a profile page background colour.
-msgid "Background"
-msgstr "Fondo"
-
-#. TRANS: Form guide for background image upload form on theme designer page.
-#, php-format
-msgid ""
-"You can upload a background image for the site. The maximum file size is %1"
-"$s."
-msgstr ""
-"Puedes subir una imagen de fondo para el sitio. El tamaño máximo de archivo "
-"es %1$s."
-
-#. TRANS: Used as radio button label to add a background image.
-msgid "On"
-msgstr "Activar"
-
-#. TRANS: Used as radio button label to not add a background image.
-msgid "Off"
-msgstr "Desactivar"
-
-#. TRANS: Form guide for turning background image on or off on theme designer page.
-#. TRANS: Form guide for a set of radio buttons on the profile design page that will enable or disable
-#. TRANS: use of the uploaded profile image.
-msgid "Turn background image on or off."
-msgstr "Activar o desactivar la imagen de fondo."
-
-#. TRANS: Checkbox label to title background image on theme designer page.
-#. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
-msgid "Tile background image"
-msgstr "Imagen de fondo en mosaico"
-
-#. TRANS: Fieldset legend for theme colors.
-msgid "Change colors"
-msgstr "Cambiar colores"
-
-#. TRANS: Field label for content color selector.
-#. TRANS: Label on profile design page for setting a profile page content colour.
-msgid "Content"
-msgstr "Contenido"
-
-#. TRANS: Field label for sidebar color selector.
-#. TRANS: Label on profile design page for setting a profile page sidebar colour.
-msgid "Sidebar"
-msgstr "Barra lateral"
-
-#. TRANS: Field label for text color selector.
-#. TRANS: Label on profile design page for setting a profile page text colour.
-msgid "Text"
-msgstr "Texto"
-
-#. TRANS: Field label for link color selector.
-#. TRANS: Label on profile design page for setting a profile page links colour.
-msgid "Links"
-msgstr "Vínculos"
-
-#. TRANS: Fieldset legend for advanced theme design settings.
-msgid "Advanced"
-msgstr "Avanzado"
-
-#. TRANS: Field label for custom CSS.
-msgid "Custom CSS"
-msgstr "Personalizar CSS"
-
-#. TRANS: Button text for resetting theme settings.
-msgctxt "BUTTON"
-msgid "Use defaults"
-msgstr "Usar los valores predeterminados"
-
-#. TRANS: Title for button for resetting theme settings.
-#. TRANS: Title for button on profile design page to reset all colour settings to default.
-#, fuzzy
-msgid "Restore default designs."
-msgstr "Restaurar los diseños predeterminados"
-
-#. TRANS: Title for button for resetting theme settings.
-#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#, fuzzy
-msgid "Reset back to default."
-msgstr "Volver a los valores predeterminados"
-
-#. TRANS: Title for button for saving theme settings.
-#. TRANS: Title for button on profile design page to save settings.
-#, fuzzy
-msgid "Save design."
-msgstr "Guardar el diseño"
+msgstr "Borrar este usuario."
 
 #. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
 msgid "This notice is not a favorite!"
@@ -2133,10 +1976,78 @@ msgstr "Agregar a favoritos"
 
 #. TRANS: Client exception thrown when requesting a document from the documentation that does not exist.
 #. TRANS: %s is the non-existing document.
-#, fuzzy, php-format
+#, php-format
 msgid "No such document \"%s\"."
 msgstr "No existe el documento «%s»."
 
+#. TRANS: Menu item in administrator navigation panel.
+#. TRANS: Menu item in default local navigation panel.
+#. TRANS: Menu item in personal group navigation menu.
+msgctxt "MENU"
+msgid "Home"
+msgstr "Inicio"
+
+msgctxt "MENU"
+msgid "Docs"
+msgstr "Documentación"
+
+#. TRANS: Secondary navigation menu item leading to help on StatusNet.
+msgctxt "MENU"
+msgid "Help"
+msgstr "Ayuda"
+
+msgid "Getting started"
+msgstr "Primeros pasos"
+
+#. TRANS: Secondary navigation menu item leading to text about StatusNet site.
+msgctxt "MENU"
+msgid "About"
+msgstr "Acerca de"
+
+msgid "About this site"
+msgstr "Sobre este sitio"
+
+#. TRANS: Secondary navigation menu item leading to Frequently Asked Questions.
+msgctxt "MENU"
+msgid "FAQ"
+msgstr "Preguntas Frecuentes"
+
+msgid "Frequently asked questions"
+msgstr "Preguntas Frecuentes"
+
+#. TRANS: Secondary navigation menu item leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+msgctxt "MENU"
+msgid "Contact"
+msgstr "Contacto"
+
+msgid "Contact info"
+msgstr "Información de contacto"
+
+msgctxt "MENU"
+msgid "Tags"
+msgstr "Etiquetas"
+
+msgid "Using tags"
+msgstr "Usando etiquetes"
+
+#. TRANS: Menu item in default local navigation panel.
+#. TRANS: Menu item in search group navigation panel.
+#. TRANS: Menu item in local navigation menu.
+msgctxt "MENU"
+msgid "Groups"
+msgstr "Grupos"
+
+msgid "Using groups"
+msgstr "Grupos de usuario"
+
+msgctxt "MENU"
+msgid "API"
+msgstr "API"
+
+msgid "RESTful API"
+msgstr "RESTful API"
+
 #. TRANS: Title for "Edit application" form.
 #. TRANS: Form legend.
 msgid "Edit application"
@@ -2162,7 +2073,6 @@ msgstr "Se requiere un nombre"
 
 #. TRANS: Validation error shown when providing too long a name in the "Edit application" form.
 #. TRANS: Validation error shown when providing too long a name in the "New application" form.
-#, fuzzy
 msgid "Name is too long (maximum 255 characters)."
 msgstr "El nombre es muy largo (máx. 255 carac.)"
 
@@ -2191,7 +2101,6 @@ msgid "Organization is required."
 msgstr "Se requiere una organización."
 
 #. TRANS: Validation error shown when providing too long an arganisation name in the "Edit application" form.
-#, fuzzy
 msgid "Organization is too long (maximum 255 characters)."
 msgstr "El texto de organización es muy largo (máx. 255 caracteres)."
 
@@ -2243,66 +2152,65 @@ msgstr "Se guardó Opciones."
 
 #. TRANS: Title for edit list page after deleting a tag.
 #. TRANS: %s is a list.
-#, fuzzy, php-format
+#, php-format
 msgid "Delete %s list"
-msgstr "Borrar este usuario"
+msgstr "Eliminar %s de la lista"
 
 #. TRANS: Title for edit list page.
 #. TRANS: %s is a list.
 #. TRANS: Form legend for list edit form.
 #. TRANS: %s is a list.
-#, fuzzy, php-format
+#, php-format
 msgid "Edit list %s"
-msgstr "No es una etiqueta válida para personas: %s."
+msgstr "Editar lista de %s"
 
 #. TRANS: Error message displayed when trying to perform an action that requires a tagging user or ID.
-#, fuzzy
 msgid "No tagger or ID."
-msgstr "Ningún nombre de usuario o ID."
+msgstr "Ningún usuario o ID."
 
 #. TRANS: Client error displayed when referring to non-local user.
 msgid "Not a local user."
 msgstr "No existe ese usuario."
 
 #. TRANS: Client error displayed when reting to edit a tag that was not self-created.
-#, fuzzy
 msgid "You must be the creator of the tag to edit it."
-msgstr "Para editar el grupo debes ser administrador."
+msgstr "Debe ser el creador de la etiqueta para editarlo."
 
 #. TRANS: Form instruction for edit list form.
-#, fuzzy
 msgid "Use this form to edit the list."
-msgstr "Usa este formulario para editar el grupo."
+msgstr "Utilice este formulario para editar la lista."
 
 #. TRANS: Form validation error displayed if the form data for deleting a tag was incorrect.
-#, fuzzy
 msgid "Delete aborted."
-msgstr "Borrar mensaje"
+msgstr "Eliminar anulado."
 
 #. TRANS: Text in confirmation dialog for deleting a tag.
 msgid ""
 "Deleting this tag will permanantly remove all its subscription and "
 "membership records. Do you still want to continue?"
 msgstr ""
+"Borrando esta etiqueta eliminará permanentemente todas las suscripciones y "
+"miembros del mismo. ¿Desea continuar?"
 
 #. TRANS: Form validation error displayed if a given tag is invalid.
-#, fuzzy
 msgid "Invalid tag."
-msgstr "Tamaño inválido."
+msgstr "Etiqueta inválida."
 
 #. TRANS: Form validation error displayed if a given tag is already present.
 #. TRANS: %s is the already present tag.
-#, fuzzy, php-format
+#, php-format
 msgid "You already have a tag named %s."
-msgstr "Ya has repetido este mensaje."
+msgstr "Ya has creado la etiqueta %s."
 
 #. TRANS: Text in confirmation dialog for setting a tag from public to private.
 msgid ""
 "Setting a public tag as private will permanently remove all the existing "
 "subscriptions to it. Do you still want to continue?"
 msgstr ""
+"Definiendo como pública una etiqueta privada va a eliminar permanentemente "
+"todas sus suscripciones existente. ¿Desea continuar?"
 
-#. TRANS: TRANS: Server error displayed when updating a list fails.
+#. TRANS: Server error displayed when updating a list fails.
 msgid "Could not update list."
 msgstr "No se pudo actualizar la lista."
 
@@ -2475,9 +2383,8 @@ msgid "That is the wrong email address."
 msgstr "Esa es la dirección de correo electrónico incorrecta."
 
 #. TRANS: Server error thrown on database error canceling e-mail address confirmation.
-#, fuzzy
 msgid "Could not delete email confirmation."
-msgstr "No se pudo eliminar el correo electrónico de  confirmación."
+msgstr "No puede eliminar el correo electrónico de confimación."
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
 msgid "Email confirmation cancelled."
@@ -2499,14 +2406,13 @@ msgstr "No hay dirección de correo entrante."
 #. TRANS: Server error thrown on database error removing incoming e-mail address.
 #. TRANS: Server error thrown on database error adding incoming e-mail address.
 #. TRANS: Server error displayed when the user could not be updated in SMS settings.
-#, fuzzy
 msgid "Could not update user record."
-msgstr "No se pudo actualizar información de usuario."
+msgstr "No puede actualizar los datos de usuario."
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
 #. TRANS: Confirmation text after updating SMS settings.
 msgid "Incoming email address removed."
-msgstr "Dirección de correo entrante removida."
+msgstr "Dirección de correo electrónico entrante eliminada."
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
 #. TRANS: Confirmation text after updating SMS settings.
@@ -2518,9 +2424,8 @@ msgid "This notice is already a favorite!"
 msgstr "¡Este mensaje ya está en favoritos!"
 
 #. TRANS: Page title for page on which favorite notices can be unfavourited.
-#, fuzzy
 msgid "Disfavor favorite."
-msgstr "Sacar favorito"
+msgstr "Eliminar favorito."
 
 #. TRANS: Page title for first page of favorited notices.
 #. TRANS: Title for favourited notices section.
@@ -2591,9 +2496,9 @@ msgid "Featured users, page %d"
 msgstr "Usuarios que figuran, página %d"
 
 #. TRANS: Description on page displaying featured users.
-#, fuzzy, php-format
+#, php-format
 msgid "A selection of some great users on %s."
-msgstr "Una selección de fantásticos usuarios en %s"
+msgstr "Una selección de usuarios recomendados en %s."
 
 #. TRANS: Client error displayed when no notice ID was given trying do display a file.
 msgid "No notice ID."
@@ -2612,40 +2517,6 @@ msgstr "Sin archivo adjunto"
 msgid "No uploaded attachments."
 msgstr "No hay archivos adjuntos subidos."
 
-#. TRANS: Client error displayed when subscribing to a remote profile and an unexpected response is received.
-msgid "Not expecting this response!"
-msgstr "¡Respuesta inesperada!"
-
-#. TRANS: Client error displayed when subscribing to a remote profile that does not exist.
-msgid "User being listened to does not exist."
-msgstr "El usuario al que quieres listar no existe."
-
-#. TRANS: Client error displayed when subscribing to a remote profile that is a local profile.
-#. TRANS: Client error displayed when using remote subscribe for a local entity.
-msgid "You can use the local subscription!"
-msgstr "¡Puedes usar la suscripción local!"
-
-#. TRANS: Client error displayed when subscribing to a remote profile that is blocked form subscribing to.
-msgid "That user has blocked you from subscribing."
-msgstr "Ese usuario te ha bloqueado la suscripción."
-
-#. TRANS: Client error displayed when subscribing to a remote profile without providing an authorised token.
-msgid "You are not authorized."
-msgstr "No estás autorizado."
-
-#. TRANS: Client error displayed when subscribing to a remote profile and conversion of the request token to access token fails.
-msgid "Could not convert request token to access token."
-msgstr "No se pudo convertir el token de solicitud en token de acceso."
-
-#. TRANS: Client error displayed when subscribing to a remote profile fails because of an unsupported version of the OMB protocol.
-msgid "Remote service uses unknown version of OMB protocol."
-msgstr "El servicio remoto utiliza una versión desconocida del protocolo OMB."
-
-#. TRANS: Server error displayed when subscribing to a remote profile fails because the remote profile could not be updated.
-#. TRANS: Exception thrown when updating a remote profile fails in OAuth store.
-msgid "Error updating remote profile."
-msgstr "Error al actualizar el perfil remoto."
-
 #. TRANS: Client error displayed when requesting a non-existent file.
 msgid "No such file."
 msgstr "No existe tal archivo."
@@ -2716,14 +2587,12 @@ msgstr ""
 "sucesivo."
 
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
-#, fuzzy
 msgid "Do not block this user from this group."
 msgstr "No bloquear este usuario de este grupo"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user from a group.
-#, fuzzy
 msgid "Block this user from this group."
-msgstr "Bloquear este usuario de este grupo"
+msgstr "Bloquear este usuario de este grupo."
 
 #. TRANS: Server error displayed when trying to block a user from a group fails because of an application error.
 msgid "Database error blocking user from group."
@@ -2737,32 +2606,6 @@ msgstr ""
 msgid "No ID."
 msgstr "Sin ID."
 
-#. TRANS: Client error displayed trying to change group design settings while not logged in.
-msgid "You must be logged in to edit a group."
-msgstr "Debes estar conectado para editar un grupo."
-
-#. TRANS: Title group design settings page.
-msgid "Group design"
-msgstr "Diseño de grupo"
-
-#. TRANS: Instructions for group design settings page.
-msgid ""
-"Customize the way your group looks with a background image and a colour "
-"palette of your choice."
-msgstr ""
-"Personaliza el aspecto de tu grupo con una imagen de fondo y la paleta de "
-"colores que prefieras."
-
-#. TRANS: Form validation error displayed when group design settings could not be updated because of an application issue.
-#, fuzzy
-msgid "Unable to update your design settings."
-msgstr "No se pudo actualizar tu configuración de diseño."
-
-#. TRANS: Form text to confirm saved group design settings.
-#. TRANS: Confirmation message on Profile design page when saving design settings has succeeded.
-msgid "Design preferences saved."
-msgstr "Preferencias de diseño guardadas."
-
 #. TRANS: Title for group logo settings page.
 #. TRANS: Group logo form legend.
 msgid "Group logo"
@@ -2854,7 +2697,7 @@ msgstr "Grupos, página %d"
 #. TRANS: Page notice of group list. %%%%site.name%%%% is the StatusNet site name,
 #. TRANS: %%%%action.groupsearch%%%% and %%%%action.newgroup%%%% are URLs. Do not change them.
 #. TRANS: This message contains Markdown links in the form [link text](link).
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "%%%%site.name%%%% groups let you find and talk with people of similar "
 "interests. After you join a group you can send messages to all other members "
@@ -2936,11 +2779,11 @@ msgstr "Configuración de mensajería instantánea"
 #. TRANS: the order and formatting of link text and link should remain unchanged.
 #, php-format
 msgid ""
-"You can send and receive notices through instant messaging [instant messages]"
-"(%%doc.im%%). Configure your addresses and settings below."
+"You can send and receive notices through [instant messaging](%%doc.im%%). "
+"Configure your addresses and settings below."
 msgstr ""
-"Puedes enviar y recibir mensajes vía [mensajería instantána](%%doc.im%%) de "
-"Jabber/GTalk. Configura tu dirección y opciones abajo."
+"Puedes enviar y recibir mensajes vía [mensajería instantána](%%doc.im%%). "
+"Configura tu dirección y opciones abajo."
 
 #. TRANS: Message given in the IM settings if IM is not enabled on the site.
 msgid "IM is not available."
@@ -3117,7 +2960,6 @@ msgstr[1] ""
 #. TRANS: Message displayed inviting users to use a StatusNet site. Plural form is
 #. TRANS: based on the number of invitations sent. Followed by a bullet list of
 #. TRANS: e-mail addresses to which invitations were sent.
-#, fuzzy
 msgid "Invitation sent to the following person:"
 msgid_plural "Invitations sent to the following people:"
 msgstr[0] "Invitacion(es) enviada(s) a las siguientes personas:"
@@ -3138,29 +2980,6 @@ msgid ""
 msgstr ""
 "Usa este formulario para invitar a tus amigos y colegas a usar este servicio."
 
-#. TRANS: Field label for a list of e-mail addresses.
-msgid "Email addresses"
-msgstr "Direcciones de correo electrónico"
-
-#. TRANS: Tooltip for field label for a list of e-mail addresses.
-#, fuzzy
-msgid "Addresses of friends to invite (one per line)."
-msgstr "Direcciones de los amigos a invitar (una por línea)"
-
-#. TRANS: Field label for a personal message to send to invitees.
-msgid "Personal message"
-msgstr "Mensaje Personal"
-
-#. TRANS: Tooltip for field label for a personal message to send to invitees.
-msgid "Optionally add a personal message to the invitation."
-msgstr "Opcionalmente añada un mensaje personalizado a su invitación."
-
-#. TRANS: Send button for inviting friends
-#. TRANS: Button text for sending notice.
-msgctxt "BUTTON"
-msgid "Send"
-msgstr "Enviar"
-
 #. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral
 #. TRANS: singular 3rd-person pronoun in English. %1$s is the inviting user, $2$s is
 #. TRANS: the StatusNet sitename.
@@ -3173,15 +2992,14 @@ msgid "You must be logged in to join a group."
 msgstr "Debes estar conectado para unirte a un grupo."
 
 #. TRANS: Title for join group page after joining.
-#, fuzzy, php-format
+#, php-format
 msgctxt "TITLE"
 msgid "%1$s joined group %2$s"
 msgstr "%1$s se ha unido al grupo %2$s"
 
 #. TRANS: Exception thrown when there is an unknown error joining a group.
-#, fuzzy
 msgid "Unknown error joining group."
-msgstr "Desconocido"
+msgstr "Error de Grupo Unión desconocido."
 
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
@@ -3206,27 +3024,28 @@ msgid ""
 "You must specify the owner of the content when using the All Rights Reserved "
 "license."
 msgstr ""
+"Debe especificar el propietario de los derechos de autor de ese contenido "
+"cuando usa una licencia de todos los derechos reservados."
 
 #. TRANS: Client error displayed selecting a too long license title in the license admin panel.
-#, fuzzy
 msgid "Invalid license title. Maximum length is 255 characters."
 msgstr "Texto de bienvenida inválido. La longitud máx. es de 255 caracteres."
 
 #. TRANS: Client error displayed specifying an invalid license URL in the license admin panel.
 msgid "Invalid license URL."
-msgstr ""
+msgstr "Url de licencia inválida."
 
 #. TRANS: Client error displayed specifying an invalid license image URL in the license admin panel.
 msgid "Invalid license image URL."
-msgstr ""
+msgstr "Url de licencia inválida."
 
 #. TRANS: Client error displayed specifying an invalid license URL in the license admin panel.
 msgid "License URL must be blank or a valid URL."
-msgstr ""
+msgstr "La URL de licencia debe estar en blanco o ser válida."
 
 #. TRANS: Client error displayed specifying an invalid license image URL in the license admin panel.
 msgid "License image must be blank or valid URL."
-msgstr ""
+msgstr "La licencia de imagen debe estar en blanco o ser válida."
 
 #. TRANS: Form legend in the license admin panel.
 msgid "License selection"
@@ -3250,9 +3069,8 @@ msgid "Type"
 msgstr "Tipo"
 
 #. TRANS: Dropdown field instructions in the license admin panel.
-#, fuzzy
 msgid "Select a license."
-msgstr "Seleccione un operador móvil"
+msgstr "Seleccione una licencia."
 
 #. TRANS: Form legend in the license admin panel.
 msgid "License details"
@@ -3264,42 +3082,35 @@ msgstr "Propietario"
 
 #. TRANS: Field title in the license admin panel.
 msgid "Name of the owner of the site's content (if applicable)."
-msgstr ""
+msgstr "Nombre del propietario del contenido del sitio (si procede)."
 
 #. TRANS: Field label in the license admin panel.
 msgid "License Title"
-msgstr ""
+msgstr "Título de licencia"
 
 #. TRANS: Field title in the license admin panel.
 msgid "The title of the license."
-msgstr ""
+msgstr "El título de la licencia."
 
 #. TRANS: Field label in the license admin panel.
 msgid "License URL"
-msgstr ""
+msgstr "URL de licencia"
 
 #. TRANS: Field title in the license admin panel.
 msgid "URL for more information about the license."
-msgstr ""
+msgstr "URL para obtener más información sobre la licencia."
 
 #. TRANS: Field label in the license admin panel.
 msgid "License Image URL"
-msgstr ""
+msgstr "URL de imagen de licencia"
 
 #. TRANS: Field title in the license admin panel.
 msgid "URL for an image to display with the license."
-msgstr ""
+msgstr "Dirección URL de una imagen para mostrar con la licencia."
 
 #. TRANS: Button title in the license admin panel.
-#, fuzzy
 msgid "Save license settings."
-msgstr "Guardar la configuración del sitio"
-
-#. TRANS: Client error displayed when trying to log in while already logged in.
-#. TRANS: Client error displayed trying to use "one time password login" when already logged in.
-#. TRANS: Client error displayed when trying to register while already logged in.
-msgid "Already logged in."
-msgstr "Ya estás conectado."
+msgstr "Guardar configuración de licencia."
 
 #. TRANS: Form validation error displayed when trying to log in with incorrect credentials.
 msgid "Incorrect username or password."
@@ -3319,9 +3130,8 @@ msgid "Login to site"
 msgstr "Ingresar a sitio"
 
 #. TRANS: Field label on login page.
-#, fuzzy
 msgid "Username or email address"
-msgstr "Nombre de usuario o dirección de correo electrónico"
+msgstr "Nombre de usuario o correo electrónico"
 
 #. TRANS: Checkbox label label on login page.
 #. TRANS: Checkbox label on account registration page.
@@ -3395,7 +3205,6 @@ msgid "No current status."
 msgstr "No existe estado actual."
 
 #. TRANS: This is the title of the form for adding a new application.
-#, fuzzy
 msgid "New application"
 msgstr "Nueva aplicación"
 
@@ -3415,18 +3224,17 @@ msgstr "Se requiere el URL fuente."
 msgid "Could not create application."
 msgstr "No se pudo crear la aplicación."
 
-#, fuzzy
+#. TRANS: Form validation error messages displayed when uploading an invalid application logo.
 msgid "Invalid image."
-msgstr "Tamaño inválido."
+msgstr "Imagen no válida."
 
 #. TRANS: Title for form to create a group.
 msgid "New group"
 msgstr "Grupo nuevo "
 
 #. TRANS: Client exception thrown when a user tries to create a group while banned.
-#, fuzzy
 msgid "You are not allowed to create groups on this site."
-msgstr "No eres miembro de este grupo."
+msgstr "No estas autorizado para crear grupos en este sitio."
 
 #. TRANS: Form instructions for group create form.
 msgid "Use this form to create a new group."
@@ -3439,9 +3247,8 @@ msgstr "Nuevo Mensaje "
 
 #. TRANS: Client error displayed trying to send a direct message to a user while sender and
 #. TRANS: receiver are not subscribed to each other.
-#, fuzzy
 msgid "You cannot send a message to this user."
-msgstr "No puedes enviar mensaje a este usuario."
+msgstr "No puedes enviar un mensaje a este usuario."
 
 #. TRANS: Form validator error displayed trying to send a direct message without content.
 #. TRANS: Client error displayed trying to send a notice without content.
@@ -3454,12 +3261,6 @@ msgstr "¡Ningún contenido!"
 msgid "No recipient specified."
 msgstr "No se especificó receptor."
 
-#. TRANS: Client error displayed trying to send a direct message to self.
-#. TRANS: Error text shown when trying to send a direct message to self.
-msgid ""
-"Don't send a message to yourself; just say it to yourself quietly instead."
-msgstr "No te auto envíes un mensaje; dícetelo a ti mismo."
-
 #. TRANS: Page title after sending a direct message.
 msgid "Message sent"
 msgstr "Mensaje enviado"
@@ -3479,7 +3280,6 @@ msgstr "Error de Ajax"
 
 #. TRANS: Page title for sending a new notice.
 #. TRANS: Title for form to send a new notice.
-#, fuzzy
 msgctxt "TITLE"
 msgid "New notice"
 msgstr "Nuevo mensaje"
@@ -3536,13 +3336,11 @@ msgstr "Actualizaciones con \"%s\""
 
 #. TRANS: RSS notice search feed description.
 #. TRANS: %1$s is the query, %2$s is the StatusNet site name.
-#, fuzzy, php-format
+#, php-format
 msgid "Updates matching search term \"%1$s\" on %2$s."
-msgstr ""
-"¡Actualizaciones que contienen el término de búsqueda \"%1$s\" en %2$s!"
+msgstr "Actualiza el término de búsqueda coincidente \" %1$s \" en  %2$s ."
 
 #. TRANS: Client error displayed trying to nudge a user that cannot be nudged.
-#, fuzzy
 msgid ""
 "This user doesn't allow nudges or hasn't confirmed or set their email "
 "address yet."
@@ -3589,7 +3387,7 @@ msgstr "No eres un usuario de esa aplicación."
 
 #. TRANS: Client error when revoking access has failed for some reason.
 #. TRANS: %s is the application ID revoking access failed for.
-#, fuzzy, php-format
+#, php-format
 msgid "Unable to revoke access for application: %s."
 msgstr "No se puede revocar el acceso para la aplicación: %s."
 
@@ -3600,6 +3398,8 @@ msgid ""
 "You have successfully revoked access for %1$s and the access token starting "
 "with %2$s."
 msgstr ""
+"Se ha revocado acceso con éxito para  %1$s  y el token de acceso que "
+"comienza por  %2$s ."
 
 #. TRANS: Empty list message when no applications have been authorised yet.
 msgid "You have not authorized any applications to use your account."
@@ -3613,18 +3413,20 @@ msgid ""
 "Are you a developer? [Register an OAuth client application](%s) to use with "
 "this instance of StatusNet."
 msgstr ""
+"¿Eres un desarrollador? [Registrar una aplicación de cliente de OAuth]( %s ) "
+"para usar con esta instancia de StatusNet."
 
 #. TRANS: Server error displayed in oEmbed action when path not found.
 #. TRANS: %s is a path.
-#, fuzzy, php-format
+#, php-format
 msgid "\"%s\" not found."
-msgstr "Método de API no encontrado."
+msgstr "\" %s \" no se ha encontrado."
 
 #. TRANS: Server error displayed in oEmbed action when notice not found.
 #. TRANS: %s is a notice.
-#, fuzzy, php-format
+#, php-format
 msgid "Notice %s not found."
-msgstr "Método de API no encontrado."
+msgstr "Aviso  %s  no encontrado."
 
 #. TRANS: Server error displayed in oEmbed action when notice has not profile.
 #. TRANS: Server error displayed trying to show a notice without a connected profile.
@@ -3640,15 +3442,15 @@ msgstr "estado de %1$s en %2$s"
 
 #. TRANS: Server error displayed in oEmbed action when attachment not found.
 #. TRANS: %d is an attachment ID.
-#, fuzzy, php-format
+#, php-format
 msgid "Attachment %s not found."
-msgstr "No se encuentra usuario receptor."
+msgstr "Archivo adjunto  %s  no encontrado."
 
 #. TRANS: Server error displayed in oEmbed request when a path is not supported.
 #. TRANS: %s is a path.
 #, php-format
 msgid "\"%s\" not supported for oembed requests."
-msgstr ""
+msgstr "\" %s \" no se admite para solicitudes oembed."
 
 #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
 #, php-format
@@ -3665,6 +3467,32 @@ msgstr "Solamente %s URL sobre HTTP simples, por favor."
 msgid "Not a supported data format."
 msgstr "No es un formato de datos compatible."
 
+#. TRANS: Page title for profile settings.
+msgid "Old school UI settings"
+msgstr "Configuración de interfaz de usuario de vieja escuela oldskool"
+
+#. TRANS: Usage instructions for profile settings.
+msgid "If you like it \"the old way\", you can set that here."
+msgstr "Si te gusta \"el sistema viejo\", se puede establecer aquí."
+
+#. TRANS: Confirmation shown when user profile settings are saved.
+#. TRANS: Message after successful saving of administrative settings.
+msgid "Settings saved."
+msgstr "Se guardó configuración."
+
+msgid "Only stream mode (no conversations) in timelines"
+msgstr "Flujo sólo de modo (no conversaciones) en líneas de tiempo"
+
+msgid "Show conversation page as hierarchical trees"
+msgstr "Mostrar página de conversación como árboles jerárquicos"
+
+msgid "Show nicknames (not full names) in timelines"
+msgstr "Mostrar apodos (no apellidos) en líneas de tiempo"
+
+#. TRANS: Button text to save a list.
+msgid "Save"
+msgstr "Guardar"
+
 #. TRANS: ShortName in the OpenSearch interface when trying to find users.
 msgid "People Search"
 msgstr "Búsqueda de gente"
@@ -3673,6 +3501,11 @@ msgstr "Búsqueda de gente"
 msgid "Notice Search"
 msgstr "Búsqueda de mensajes"
 
+#. TRANS: Client error displayed trying to use "one time password login" when already logged in.
+#. TRANS: Client error displayed when trying to register while already logged in.
+msgid "Already logged in."
+msgstr "Ya estás conectado."
+
 #. TRANS: Client error displayed trying to use "one time password login" without specifying a user.
 msgid "No user ID specified."
 msgstr "No se ha especificado ID de usuario."
@@ -3743,7 +3576,7 @@ msgid "Confirm"
 msgstr "Confirmar"
 
 #. TRANS: Field title on page where to change password.
-#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
+#. TRANS: Title for field label for password reset form where the password has to be typed again.
 #. TRANS: Field title on account registration page.
 msgid "Same as password above."
 msgstr "Igual a la contraseña de arriba."
@@ -3760,9 +3593,8 @@ msgstr "La contraseña debe tener 6 o más caracteres."
 
 #. TRANS: Form validation error on password change when password confirmation does not match.
 #. TRANS: Form validation error displayed when trying to register with non-matching passwords.
-#, fuzzy
 msgid "Passwords do not match."
-msgstr "Las contraseñas no coinciden"
+msgstr "Las contraseñas no coinciden."
 
 #. TRANS: Form validation error on page where to change password.
 msgid "Incorrect old password."
@@ -3789,6 +3621,7 @@ msgstr "Rutas"
 #. TRANS: Form instructions for Path admin panel.
 msgid "Path and server settings for this StatusNet site"
 msgstr ""
+"Configuración de ruta de acceso y servidor para este sitio de StatusNet"
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the directory that could not be read from.
@@ -3802,12 +3635,6 @@ msgstr "Directorio de temas ilegible: %s."
 msgid "Avatar directory not writable: %s."
 msgstr "Directorio de avatares no escribible: %s."
 
-#. TRANS: Client error in Paths admin panel.
-#. TRANS: %s is the background directory that could not be written to.
-#, php-format
-msgid "Background directory not writable: %s."
-msgstr "Directorio de fondo no escribible: %s."
-
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the locales directory that could not be read from.
 #, php-format
@@ -3836,26 +3663,22 @@ msgid "Path"
 msgstr "Ruta"
 
 #. TRANS: Field title in Paths admin panel.
-#, fuzzy
 msgid "Site path."
-msgstr "Ruta del sitio"
+msgstr "Ruta del sitio."
 
 #. TRANS: Field label in Paths admin panel.
-#, fuzzy
 msgid "Locale directory"
-msgstr "Directorio de temas"
+msgstr "Directorio de configuración regional"
 
 #. TRANS: Field title in Paths admin panel.
-#, fuzzy
 msgid "Directory path to locales."
-msgstr "Ruta del directorio de las configuraciones locales"
+msgstr "Ruta del directorio a configuraciones regionales."
 
 #. TRANS: Checkbox label in Paths admin panel.
 msgid "Fancy URLs"
 msgstr "URL agradables"
 
 #. TRANS: Field title in Paths admin panel.
-#, fuzzy
 msgid "Use fancy URLs (more readable and memorable)?"
 msgstr "¿Usar URL amigables (más legibles y memorizables)?"
 
@@ -3865,13 +3688,12 @@ msgid "Theme"
 msgstr "Tema"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#, fuzzy
 msgid "Server for themes."
-msgstr "Tema para el sitio."
+msgstr "Servidor de temas."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
 msgid "Web path to themes."
-msgstr ""
+msgstr "Ruta temas web."
 
 #. TRANS: Field label in Paths admin panel.
 msgid "SSL server"
@@ -3879,26 +3701,23 @@ msgstr "Servidor SSL"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
 msgid "SSL server for themes (default: SSL server)."
-msgstr ""
+msgstr "Servidor SSL para temas (predeterminado: servidor SSL)."
 
 #. TRANS: Field label in Paths admin panel.
-#, fuzzy
 msgid "SSL path"
-msgstr "Ruta del sitio"
+msgstr "Ruta SSL"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
 msgid "SSL path to themes (default: /theme/)."
-msgstr ""
+msgstr "Ruta de acceso SSL a temas (predeterminado: /theme/)."
 
 #. TRANS: Field label in Paths admin panel.
-#, fuzzy
 msgid "Directory"
-msgstr "Directorio de temas"
+msgstr "Directorio"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#, fuzzy
 msgid "Directory where themes are located."
-msgstr "Ruta del directorio de las configuraciones locales"
+msgstr "Directorio donde se encuentran temas."
 
 #. TRANS: Fieldset legend in Paths admin panel.
 msgid "Avatars"
@@ -3909,80 +3728,48 @@ msgid "Avatar server"
 msgstr "Servidor de la imagen"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#, fuzzy
 msgid "Server for avatars."
-msgstr "Tema para el sitio."
+msgstr "Servidor de avatares."
 
 #. TRANS: Field label in Paths admin panel.
 msgid "Avatar path"
 msgstr "Ruta de la imagen"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#, fuzzy
 msgid "Web path to avatars."
-msgstr "Error al actualizar la imagen."
+msgstr "Ruta Web avatares."
 
 #. TRANS: Field label in Paths admin panel.
 msgid "Avatar directory"
 msgstr "Directorio de la imagen"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#, fuzzy
 msgid "Directory where avatars are located."
-msgstr "Ruta del directorio de las configuraciones locales"
-
-#. TRANS: Fieldset legend in Paths admin panel.
-msgid "Backgrounds"
-msgstr "Fondos"
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-#, fuzzy
-msgid "Server for backgrounds."
-msgstr "Tema para el sitio."
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-msgid "Web path to backgrounds."
-msgstr ""
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-msgid "Server for backgrounds on SSL pages."
-msgstr ""
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-msgid "Web path to backgrounds on SSL pages."
-msgstr ""
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-#, fuzzy
-msgid "Directory where backgrounds are located."
-msgstr "Ruta del directorio de las configuraciones locales"
+msgstr "Directorio donde se encuentran avatares."
 
 #. TRANS: Fieldset legens in Paths admin panel.
 msgid "Attachments"
 msgstr "Adjuntos"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#, fuzzy
 msgid "Server for attachments."
-msgstr "Tema para el sitio."
+msgstr "Servidor de archivos adjuntos."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
 msgid "Web path to attachments."
 msgstr "Ruta de acceso a los adjuntos"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#, fuzzy
 msgid "Server for attachments on SSL pages."
-msgstr "Tema para el sitio."
+msgstr "Servidor de archivos adjuntos en las páginas SSL."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
 msgid "Web path to attachments on SSL pages."
-msgstr ""
+msgstr "Ruta Web archivos adjuntos en las páginas SSL."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#, fuzzy
 msgid "Directory where attachments are located."
-msgstr "Ruta del directorio de las configuraciones locales"
+msgstr "Directorio donde se encuentran los archivos adjuntos."
 
 #. TRANS: Fieldset legend in Paths admin panel.
 msgctxt "LEGEND"
@@ -4015,8 +3802,8 @@ msgid "Server to direct SSL requests to."
 msgstr "Servidor hacia el cual dirigir las solicitudes SSL."
 
 #. TRANS: Button title text to store form data in the Paths admin panel.
-msgid "Save paths"
-msgstr "Guardar rutas"
+msgid "Save path settings."
+msgstr "Guardar configuración de ruta."
 
 #. TRANS: Instructions for the "People search" page.
 #. TRANS: %%site.name%% is the name of the StatusNet site.
@@ -4034,93 +3821,88 @@ msgstr "Buscador de gente"
 
 #. TRANS: Title for list page.
 #. TRANS: %s is a list.
-#, fuzzy, php-format
+#, php-format
 msgid "Public list %s"
-msgstr "Nube de etiquetas pública"
+msgstr "Lista pública %s"
 
 #. TRANS: Title for list page.
 #. TRANS: %1$s is a list, %2$d is a page number.
-#, fuzzy, php-format
+#, php-format
 msgid "Public list %1$s, page %2$d"
-msgstr "Respuestas a %1$s, página %2$d"
+msgstr "Lista pública de  %1$s , página%2$d"
 
 #. TRANS: Message for anonymous users on list page.
 #. TRANS: This message contains Markdown links in the form [description](link).
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "Lists are how you sort similar people on %%site.name%%, a [micro-blogging]"
 "(http://en.wikipedia.org/wiki/Micro-blogging) service based on the Free "
 "Software [StatusNet](http://status.net/) tool. You can then easily keep "
 "track of what they are doing by subscribing to the list's timeline."
 msgstr ""
-"**%s** es un grupo de usuarios en %%%%site.name%%%%, un servicio de "
-"[microblogueo](http://es.wikipedia.org/wiki/Microblogging) basado en la "
-"herramienta de software libre [StatusNet](http://status.net/). Sus miembros "
-"comparten mensajes cortos acerca de su vida e intereses. "
+"Las listas son similares a cómo ordenar personas en % %site.name% %, un "
+"[micro-blogging](http://en.wikipedia.org/wiki/Micro-blogging) servicio "
+"basado en el Software libre [herramienta de StatusNet](http://status.net/). "
+"Puede entonces fácilmente realizar un seguimiento de lo que están haciendo "
+"por suscribirse a la línea de tiempo de la lista."
 
 #. TRANS: Client error displayed when a tagger is expected but not provided.
-#, fuzzy
 msgid "No tagger."
 msgstr "No existe tal etiqueta."
 
 #. TRANS: Title for list of people listed by the user.
 #. TRANS: %1$s is a list, %2$s is a username.
-#, fuzzy, php-format
+#, php-format
 msgid "People listed in %1$s by %2$s"
-msgstr "Respuestas a %1$s en %2$s!"
+msgstr "Personas enumeradas en %1$s por %2$s"
 
 #. TRANS: Title for list of people listed by the user.
 #. TRANS: %1$s is a list, %2$s is a username, %2$s is a page number.
-#, fuzzy, php-format
+#, php-format
 msgid "People listed in %1$s by %2$s, page %3$d"
-msgstr "Respuestas a %1$s, página %2$d"
+msgstr "Personas enumeradas en el  %1$s por %2$s, página %3$d"
 
 #. TRANS: Addition in tag membership list for creator of a tag.
 #. TRANS: Addition in tag subscribers list for creator of a tag.
-#, fuzzy
 msgid "Creator"
-msgstr "Creado"
+msgstr "Creador"
 
 #. TRANS: Title for lists by a user page for a private tag.
-#, fuzzy
 msgid "Private lists by you"
-msgstr "Editar grupo %s"
+msgstr "Listas privadas suyas"
 
 #. TRANS: Title for lists by a user page for a public tag.
-#, fuzzy
 msgid "Public lists by you"
-msgstr "Nube de etiquetas pública"
+msgstr "Listas públicas suyas"
 
 #. TRANS: Title for lists by a user page.
-#, fuzzy
 msgid "Lists by you"
-msgstr "Editar grupo %s"
+msgstr "Sus listas"
 
 #. TRANS: Title for lists by a user page.
 #. TRANS: %s is a user nickname.
 #, php-format
 msgid "Lists by %s"
-msgstr ""
+msgstr "Listas de %s"
 
 #. TRANS: Title for lists by a user page.
 #. TRANS: %1$s is a user nickname, %2$d is a page number.
-#, fuzzy, php-format
+#, php-format
 msgid "Lists by %1$s, page %2$d"
-msgstr "Mensajes etiquetados con %1$s, página %2$d"
+msgstr "Listas de  %1$s, página %2$d"
 
 #. TRANS: Client error displayed when trying view another user's private lists.
 msgid "You cannot view others' private lists"
-msgstr ""
+msgstr "No puede ver otras listas privadas"
 
 #. TRANS: Mode selector label.
-#, fuzzy
 msgid "Mode"
-msgstr "Moderar"
+msgstr "Modo"
 
 #. TRANS: Link text to show lists for user %s.
-#, fuzzy, php-format
+#, php-format
 msgid "Lists for %s"
-msgstr "Bandeja de salida para %s"
+msgstr "Listas para %s"
 
 #. TRANS: Fieldset legend.
 #. TRANS: Fieldset legend on gallery action page.
@@ -4129,22 +3911,19 @@ msgstr "Seleccione una etiqueta a filtrar"
 
 #. TRANS: Checkbox title.
 msgid "Show private tags."
-msgstr ""
+msgstr "Mostrar etiquetas privadas."
 
 #. TRANS: Checkbox label to show public tags.
-#, fuzzy
 msgctxt "LABEL"
 msgid "Public"
 msgstr "Público"
 
 #. TRANS: Checkbox title.
-#, fuzzy
 msgid "Show public tags."
-msgstr "No existe tal etiqueta."
+msgstr "Mostrar etiquetas públicas."
 
 #. TRANS: Submit button text for tag filter form.
 #. TRANS: Submit button text on gallery action page.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Go"
 msgstr "Ir"
@@ -4152,89 +3931,88 @@ msgstr "Ir"
 #. TRANS: Message displayed for anonymous users on page that displays lists by a user.
 #. TRANS: This message contains Markdown links in the form [description](links).
 #. TRANS: %s is a tagger nickname.
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "These are lists created by **%s**. Lists are how you sort similar people on %"
 "%%%site.name%%%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
 "blogging) service based on the Free Software [StatusNet](http://status.net/) "
 "tool. You can easily keep track of what they are doing by subscribing to the "
-"tag's timeline."
+"list's timeline."
 msgstr ""
 "**%s** es un grupo de usuarios en %%%%site.name%%%%, un servicio de "
 "[microblogueo](http://es.wikipedia.org/wiki/Microblogging) basado en la "
 "herramienta de software libre [StatusNet](http://status.net/). Sus miembros "
-"comparten mensajes cortos acerca de su vida e intereses. "
+"comparten mensajes cortos acerca de su vida e intereses."
 
 #. TRANS: Message displayed on page that displays lists by a user when there are none.
 #. TRANS: This message contains Markdown links in the form [description](links).
 #. TRANS: %s is a tagger nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "%s has not created any [lists](%%%%doc.lists%%%%) yet."
-msgstr ""
-"Aún nadie ha publicado un mensaje con una [etiqueta clave](%%doc.tags%%)"
+msgstr "%s no ha creado ninguna [listas] (%%% %doc.lists% %%%) todavía."
 
 #. TRANS: Page title. %s is a tagged user's nickname.
 #, php-format
 msgid "Lists with %s in them"
-msgstr ""
+msgstr "Listas con %s en ellos"
 
 #. TRANS: Page title. %1$s is a tagged user's nickname, %2$s is a page number.
-#, fuzzy, php-format
+#, php-format
 msgid "Lists with %1$s, page %2$d"
-msgstr "Mensajes etiquetados con %1$s, página %2$d"
+msgstr "Listas con %1$s, página %2$d"
 
 #. TRANS: Message displayed for anonymous users on page that displays lists for a user.
 #. TRANS: This message contains Markdown links in the form [description](links).
 #. TRANS: %s is a tagger nickname.
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "These are lists for **%s**. lists are how you sort similar people on %%%%"
 "site.name%%%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
 "blogging) service based on the Free Software [StatusNet](http://status.net/) "
 "tool. You can easily keep track of what they are doing by subscribing to the "
-"tag's timeline."
+"list's timeline."
 msgstr ""
-"**%s** es un grupo de usuarios en %%%%site.name%%%%, un servicio de "
-"[microblogueo](http://es.wikipedia.org/wiki/Microblogging) basado en la "
-"herramienta de software libre [StatusNet](http://status.net/). Sus miembros "
-"comparten mensajes cortos acerca de su vida e intereses. "
+"Las listas son similares a cómo ordenar personas en % %site.name% %, un "
+"[micro-blogging](http://en.wikipedia.org/wiki/Micro-blogging) servicio "
+"basado en el Software libre [herramienta de StatusNet](http://status.net/). "
+"Puede entonces fácilmente realizar un seguimiento de lo que están haciendo "
+"por suscribirse a la línea de tiempo de la lista."
 
 #. TRANS: Message displayed on page that displays lists a user was added to when there are none.
 #. TRANS: This message contains Markdown links in the form [description](links).
 #. TRANS: %s is a user nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "%s has not been [listed](%%%%doc.lists%%%%) by anyone yet."
-msgstr ""
-"Aún nadie ha publicado un mensaje con una [etiqueta clave](%%doc.tags%%)"
+msgstr "%s no ha sido [lista] (%%% %doc.lists% %%%) por nadie todavía."
 
 #. TRANS: Page title for list of list subscribers.
 #. TRANS: %1$s is a list, %2$s is a user nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "Subscribers to list %1$s by %2$s"
-msgstr "Suscrito a %s."
+msgstr "Los suscriptores a la lista  %1$s  por %2$s"
 
 #. TRANS: Page title for list of list subscribers.
 #. TRANS: %1$s is a list, %2$s is a user nickname, %3$d is a page number.
-#, fuzzy, php-format
+#, php-format
 msgid "Subscribers to list %1$s by %2$s, page %3$d"
-msgstr "Mensajes etiquetados con %1$s, página %2$d"
+msgstr "Los suscriptores a la lista  %1$s  por  %2$s , página%3$d"
 
 #. TRANS: Title for page that displays lists subscribed to by a user.
 #. TRANS: %s is a profile nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "Lists subscribed to by %s"
-msgstr "Suscrito a %s."
+msgstr "Listas suscritas por %s"
 
 #. TRANS: Title for page that displays lists subscribed to by a user.
 #. TRANS: %1$s is a profile nickname, %2$d is a page number.
-#, fuzzy, php-format
+#, php-format
 msgid "Lists subscribed to by %1$s, page %2$d"
-msgstr "%1$s suscrippciones, página %2$d"
+msgstr "Listas suscritas por %1$s, página %2$d"
 
 #. TRANS: Message displayed for anonymous users on page that displays lists subscribed to by a user.
 #. TRANS: This message contains Markdown links in the form [description](links).
 #. TRANS: %s is a profile nickname.
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "These are lists subscribed to by **%s**. Lists are how you sort similar "
 "people on %%%%site.name%%%%, a [micro-blogging](http://en.wikipedia.org/wiki/"
@@ -4245,7 +4023,7 @@ msgstr ""
 "**%s** es un grupo de usuarios en %%%%site.name%%%%, un servicio de "
 "[microblogueo](http://es.wikipedia.org/wiki/Microblogging) basado en la "
 "herramienta de software libre [StatusNet](http://status.net/). Sus miembros "
-"comparten mensajes cortos acerca de su vida e intereses. "
+"comparten mensajes cortos acerca de su vida e intereses."
 
 #. TRANS: Page title for AJAX form return when a disabling a plugin.
 msgctxt "plugin"
@@ -4284,44 +4062,35 @@ msgid ""
 "\"http://status.net/wiki/Plugins\">online plugin documentation</a> for more "
 "details."
 msgstr ""
+"Plugins adicionales se pueden activar y configurar de forma manual. Ver la "
+"<a href=\"http://status.net/wiki/Plugins\">documentación en línea del "
+"plugin</a> para más detalles."
 
 #. TRANS: Admin form section header
-#, fuzzy
 msgid "Default plugins"
-msgstr "!Idioma predeterminado"
+msgstr "Plugins por defecto"
 
 #. TRANS: Text displayed on plugin admin page when no plugin are enabled.
 msgid ""
 "All default plugins have been disabled from the site's configuration file."
 msgstr ""
-
-#. TRANS: Client error displayed if the notice posted has too many characters.
-msgid "Invalid notice content."
-msgstr "Contenido de mensaje inválido."
-
-#. TRANS: Exception thrown if a notice's license is not compatible with the StatusNet site license.
-#. TRANS: %1$s is the notice license, %2$s is the StatusNet site's license.
-#, fuzzy, php-format
-msgid "Notice license \"%1$s\" is not compatible with site license \"%2$s\"."
-msgstr ""
-"La licencia del mensaje %1$s’ es incompatible con la licencia del sitio ‘%2"
-"$s’."
+"Todos los plugins por defecto han sido desactivados del archivo de "
+"configuración del sitio."
 
 #. TRANS: Client error displayed when trying to add an unindentified field to profile.
 #. TRANS: %s is a field name.
 #, php-format
 msgid "Unidentified field %s."
-msgstr ""
+msgstr "Campo no identificado  %s ."
 
 #. TRANS: Page title.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Search results"
-msgstr "Buscar sitio"
+msgstr "Resultados de la búsqueda"
 
 #. TRANS: Error message in case a search is shorter than three characters.
 msgid "The search string must be at least 3 characters long."
-msgstr ""
+msgstr "La búsqueda debe ser de al menos 3 caracteres de longitud."
 
 #. TRANS: Page title for profile settings.
 msgid "Profile settings"
@@ -4341,7 +4110,6 @@ msgstr "Información del perfil"
 #. TRANS: Tooltip for field label in form for profile settings.
 #. TRANS: Field title on account registration page.
 #. TRANS: Field title on group edit form.
-#, fuzzy
 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"
@@ -4361,9 +4129,8 @@ msgstr "Página de inicio"
 
 #. TRANS: Tooltip for field label in form for profile settings.
 #. TRANS: Field title on account registration page.
-#, fuzzy
 msgid "URL of your homepage, blog, or profile on another site."
-msgstr "El URL de tu página de inicio, blog o perfil en otro sitio"
+msgstr "URL de tu página, blog o perfil en otro sitio."
 
 #. TRANS: Tooltip for field label in form for profile settings. Plural
 #. TRANS: is decided by the number of characters available for the
@@ -4371,7 +4138,7 @@ msgstr "El URL de tu página de inicio, blog o perfil en otro sitio"
 #. TRANS: Text area title in form for account registration. Plural
 #. TRANS: is decided by the number of characters available for the
 #. TRANS: biography (%d).
-#, fuzzy, php-format
+#, php-format
 msgid "Describe yourself and your interests in %d character."
 msgid_plural "Describe yourself and your interests in %d characters."
 msgstr[0] "Descríbete y cuéntanos tus intereses en %d caracteres"
@@ -4379,7 +4146,6 @@ msgstr[1] "Descríbete y cuéntanos tus intereses en %d caracteres"
 
 #. TRANS: Tooltip for field label in form for profile settings.
 #. TRANS: Text area title on account registration page.
-#, fuzzy
 msgid "Describe yourself and your interests."
 msgstr "Descríbete y cuéntanos acerca de tus intereses"
 
@@ -4406,11 +4172,12 @@ msgid "Share my current location when posting notices"
 msgstr "Compartir mi ubicación actual al publicar los mensajes"
 
 #. TRANS: Field label in form for profile settings.
+#. TRANS: Title for group tag cloud section.
+#. TRANS: %s is a group name.
 msgid "Tags"
 msgstr "Etiquetas"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#, fuzzy
 msgid ""
 "Tags for yourself (letters, numbers, -, ., and _), comma- or space- "
 "separated."
@@ -4423,9 +4190,8 @@ msgid "Language"
 msgstr "Idioma"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#, fuzzy
 msgid "Preferred language."
-msgstr "Lenguaje de preferencia"
+msgstr "Idioma preferido."
 
 #. TRANS: Dropdownlist label in form for profile settings.
 msgid "Timezone"
@@ -4436,41 +4202,39 @@ msgid "What timezone are you normally in?"
 msgstr "En que zona horaria se encuentra normalmente?"
 
 #. TRANS: Checkbox label in form for profile settings.
-#, fuzzy
 msgid ""
-"Automatically subscribe to whoever subscribes to me (best for non-humans)."
+"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)"
 
 #. TRANS: Dropdown field label on profile settings, for what policies to apply when someone else tries to subscribe to your updates.
-#, fuzzy
 msgid "Subscription policy"
-msgstr "Suscripciones"
+msgstr "Política de suscripción"
 
 #. TRANS: Dropdown field option for following policy.
-#, fuzzy
 msgid "Let anyone follow me"
-msgstr "Sólo puede seguir personas"
+msgstr "Dejar que alguien me siga"
 
 #. TRANS: Dropdown field option for following policy.
 msgid "Ask me first"
-msgstr ""
+msgstr "Pregúntame primero"
 
 #. TRANS: Dropdown field title on group edit form.
 msgid "Whether other users need your permission to follow your updates."
 msgstr ""
+"Si otros usuarios necesitan su permiso para seguir sus actualizaciones."
 
 #. TRANS: Checkbox label in profile settings.
 msgid "Make updates visible only to my followers"
-msgstr ""
+msgstr "Hacer mis mensajes visibles sólo para mis seguidores"
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Plural form is used based on the maximum number of allowed
 #. TRANS: characters for the biography (%d).
 #. TRANS: Form validation error on registration page when providing too long a bio text.
 #. TRANS: %d is the maximum number of characters for bio; used for plural.
-#, fuzzy, php-format
+#, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
 msgstr[0] "La biografía es muy larga (máx. %d caracteres)."
@@ -4482,7 +4246,6 @@ msgid "Timezone not selected."
 msgstr "Zona horaria no seleccionada"
 
 #. TRANS: Validation error in form for profile settings.
-#, fuzzy
 msgid "Language is too long (maximum 50 characters)."
 msgstr "Idioma es muy largo ( max 50 car.)"
 
@@ -4492,18 +4255,16 @@ msgstr "Idioma es muy largo ( max 50 car.)"
 #. TRANS: %s is the invalid tag.
 #. TRANS: Error displayed if a given tag is invalid.
 #. TRANS: %s is the invalid tag.
-#, fuzzy, php-format
+#, php-format
 msgid "Invalid tag: \"%s\"."
-msgstr "Etiqueta inválida: \"% s\""
+msgstr "Etiqueta no válida: \" %s \"."
 
 #. TRANS: Server error thrown when user profile settings could not be updated to
 #. TRANS: automatically subscribe to any subscriber.
-#, fuzzy
 msgid "Could not update user for autosubscribe or subscribe_policy."
 msgstr "No se pudo actualizar el usuario para autosuscribirse."
 
 #. TRANS: Server error thrown when user profile location preference settings could not be updated.
-#, fuzzy
 msgid "Could not save location prefs."
 msgstr "No se han podido guardar las preferencias de ubicación."
 
@@ -4511,11 +4272,6 @@ msgstr "No se han podido guardar las preferencias de ubicación."
 msgid "Could not save tags."
 msgstr "No se han podido guardar las etiquetas."
 
-#. TRANS: Confirmation shown when user profile settings are saved.
-#. TRANS: Message after successful saving of administrative settings.
-msgid "Settings saved."
-msgstr "Se guardó configuración."
-
 #. TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
 #. TRANS: Page title for page where a user account can be restored from backup.
 msgid "Restore account"
@@ -4528,8 +4284,8 @@ msgid "Beyond the page limit (%s)."
 msgstr "Más allá del límite de páginas (%s)."
 
 #. TRANS: Server error displayed when a public timeline cannot be retrieved.
-msgid "Could not retrieve public stream."
-msgstr "No se pudo acceder a corriente pública."
+msgid "Could not retrieve public timeline."
+msgstr "No se pudo recuperar la línea de tiempo pública."
 
 #. TRANS: Title for all public timeline pages but the first.
 #. TRANS: %d is the page number.
@@ -4543,16 +4299,20 @@ msgid "Public timeline"
 msgstr "Línea temporal pública"
 
 #. TRANS: Link description for public timeline feed.
-msgid "Public Stream Feed (RSS 1.0)"
-msgstr "Canal público (RSS 1.0)"
+msgid "Public Timeline Feed (Activity Streams JSON)"
+msgstr "Feed de línea de tiempo pública (Activity Streams JSON)"
 
 #. TRANS: Link description for public timeline feed.
-msgid "Public Stream Feed (RSS 2.0)"
-msgstr "Canal público (RSS 2.0)"
+msgid "Public Timeline Feed (RSS 1.0)"
+msgstr "Suscripción a línea de tiempo (RSS 1.0)"
 
 #. TRANS: Link description for public timeline feed.
-msgid "Public Stream Feed (Atom)"
-msgstr "Canal público (Atom)"
+msgid "Public Timeline Feed (RSS 2.0)"
+msgstr "Suscripción a línea de tiempo (RSS 2.0)"
+
+#. TRANS: Link description for public timeline feed.
+msgid "Public Timeline Feed (Atom)"
+msgstr "Suscripción a línea de tiempo (Atom)"
 
 #. TRANS: Text displayed for public feed when there are no public notices.
 #, php-format
@@ -4602,55 +4362,10 @@ msgstr ""
 "org/wiki/Microblogging) basada en la herramienta de software libre  "
 "[StatusNet](http://status.net/) tool."
 
-#. TRANS: Title for page with public list cloud.
-#, fuzzy
-msgid "Public list cloud"
-msgstr "Nube de etiquetas pública"
-
-#. TRANS: Page notice for page with public list cloud.
-#. TRANS: %s is a StatusNet sitename.
-#, fuzzy, php-format
-msgid "These are largest lists on %s"
-msgstr "Estas son las etiquetas recientes más populares en %s"
-
-#. TRANS: Empty list message on page with public list cloud.
-#. TRANS: This message contains Markdown links in the form [description](link).
-#, fuzzy, php-format
-msgid "No one has [listed](%%doc.tags%%) anyone yet."
-msgstr ""
-"Aún nadie ha publicado un mensaje con una [etiqueta clave](%%doc.tags%%)"
-
-#. TRANS: Additional empty list message on page with public list cloud for logged in users.
-#, fuzzy
-msgid "Be the first to list someone!"
-msgstr "¡Sé la primera persona en publicar!"
-
-#. TRANS: Additional empty list message on page with public list cloud for anonymous users.
-#. TRANS: This message contains Markdown links in the form [description](link).
-#, fuzzy, php-format
-msgid ""
-"Why not [register an account](%%action.register%%) and be the first to list "
-"someone!"
-msgstr ""
-"¿Por qué no [registras una cuenta](%%action.register%%) y te conviertes en "
-"la primera persona en publicar uno?"
-
-#. TRANS: DT element on on page with public list cloud.
-#, fuzzy
-msgid "List cloud"
-msgstr "Método de API no encontrado."
-
-#. TRANS: Link title for number of listed people. %d is the number of listed people.
-#, php-format
-msgid "1 person listed"
-msgid_plural "%d people listed"
-msgstr[0] ""
-msgstr[1] ""
-
 #. TRANS: Public RSS feed description. %s is the StatusNet site name.
-#, fuzzy, php-format
+#, php-format
 msgid "%s updates from everyone."
-msgstr "¡Actualizaciones de todos en %s!"
+msgstr "Actualizaciones de todos en %s"
 
 #. TRANS: Title for public tag cloud.
 msgid "Public tag cloud"
@@ -4777,7 +4492,6 @@ msgid "6 or more characters, and do not forget it!"
 msgstr "6 o más caracteres, ¡y no la olvides!"
 
 #. TRANS: Button text for password reset form.
-#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
 msgctxt "BUTTON"
 msgid "Reset"
 msgstr "Restablecer"
@@ -4786,18 +4500,6 @@ msgstr "Restablecer"
 msgid "Enter a nickname or email address."
 msgstr "Ingresa un nombre de usuario o correo electronico"
 
-#. TRANS: Information on password recovery form if no known username or e-mail address was specified.
-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."
-
-#. TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.
-msgid "No registered email address for that user."
-msgstr "Ninguna dirección de correo electrónico registrada por este usuario."
-
-#. TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.
-msgid "Error saving address confirmation."
-msgstr "Error al guardar confirmación de la dirección."
-
 #. TRANS: User notification after an e-mail with instructions was sent from the password recovery form.
 msgid ""
 "Instructions for recovering your password have been sent to the email "
@@ -4828,15 +4530,14 @@ msgid "New password successfully saved. You are now logged in."
 msgstr "Nueva contraseña guardada correctamente. Has iniciado una sesión."
 
 #. TRANS: Client exception thrown when no ID parameter was provided.
-#, fuzzy
 msgid "No id parameter."
-msgstr "No existe argumento de ID."
+msgstr "Ningún parámetro id."
 
 #. TRANS: Client exception thrown when an invalid ID parameter was provided for a file.
 #. TRANS: %d is the provided ID for which the file is not present (number).
-#, fuzzy, php-format
+#, php-format
 msgid "No such file \"%d\"."
-msgstr "No existe el archivo %d"
+msgstr "No hay tal archivo \" %d \"."
 
 #. TRANS: Client error displayed when trying to register to an invite-only site without an invitation.
 msgid "Sorry, only invited people can register."
@@ -4851,7 +4552,6 @@ msgid "Registration successful"
 msgstr "Registro exitoso."
 
 #. TRANS: Title for registration page.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Register"
 msgstr "Registrarse"
@@ -4861,9 +4561,8 @@ msgid "Registration not allowed."
 msgstr "Registro de usuario no permitido."
 
 #. TRANS: Form validation error displayed when trying to register without agreeing to the site license.
-#, fuzzy
 msgid "You cannot register if you do not agree to the license."
-msgstr "No puedes registrarte si no estás de acuerdo con la licencia."
+msgstr "No se puede registrar si no acepta la licencia."
 
 #. TRANS: Form validation error displayed when trying to register with an already registered e-mail address.
 msgid "Email address already exists."
@@ -4882,13 +4581,11 @@ msgstr ""
 "mensajes y enviar vínculos de ellos a tus amigos y colegas."
 
 #. TRANS: Field label on account registration page. In this field the password has to be entered a second time.
-#, fuzzy
 msgctxt "PASSWORD"
 msgid "Confirm"
 msgstr "Confirmar"
 
 #. TRANS: Field label on account registration page.
-#, fuzzy
 msgctxt "LABEL"
 msgid "Email"
 msgstr "Correo electrónico"
@@ -4903,7 +4600,6 @@ msgid "Longer name, preferably your \"real\" name."
 msgstr "Nombre largo, preferiblemente tu nombre \"real\""
 
 #. TRANS: Button text to register a user on account registration page.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Register"
 msgstr "Registrarse"
@@ -4985,85 +4681,11 @@ msgstr ""
 "(Deberías recibir un mensaje por correo eléctronico en unos momentos, con "
 "instrucciones sobre cómo confirmar tu dirección de correo.)"
 
-#. TRANS: Page notice for remote subscribe. This message contains Markdown links.
-#. TRANS: Ensure to keep the correct markup of [link description](link).
-#, php-format
-msgid ""
-"To subscribe, you can [login](%%action.login%%), or [register](%%action."
-"register%%) a new  account. If you already have an account  on a [compatible "
-"microblogging site](%%doc.openmublog%%),  enter your profile URL below."
-msgstr ""
-"Para suscribirte, puedes [iniciar una sesión](%%action.login%%), o "
-"[registrar](%%action.register%%) una cuenta nueva. Si ya tienes una en un "
-"[servicio de microblogueo compatible](%%doc.openmublog%%), escribe el URL de "
-"tu perfil debajo."
-
-#. TRANS: Page title for Remote subscribe.
-msgid "Remote subscribe"
-msgstr "Subscripción remota"
-
-#. TRANS: Field legend on page for remote subscribe.
-msgid "Subscribe to a remote user"
-msgstr "Suscribirse a un usuario remoto"
-
-#. TRANS: Field label on page for remote subscribe.
-msgid "User nickname"
-msgstr "Usuario"
-
-#. TRANS: Field title on page for remote subscribe.
-msgid "Nickname of the user you want to follow."
-msgstr "Usuario a quien quieres seguir"
-
-#. TRANS: Field label on page for remote subscribe.
-msgid "Profile URL"
-msgstr "URL del perfil"
-
-#. TRANS: Field title on page for remote subscribe.
-#, fuzzy
-msgid "URL of your profile on another compatible microblogging service."
-msgstr "El URL de tu perfil en otro servicio de microblogueo compatible"
-
-#. TRANS: Button text on page for remote subscribe.
-#. TRANS: Link text for link that will subscribe to a remote profile.
-#. TRANS: Button text to subscribe to a user.
-#. TRANS: Button text for subscribing to a list.
-#, fuzzy
-msgctxt "BUTTON"
-msgid "Subscribe"
-msgstr "Suscribirse"
-
-#. TRANS: Form validation error on page for remote subscribe when an invalid profile URL was provided.
-#, fuzzy
-msgid "Invalid profile URL (bad format)."
-msgstr "El URL del perfil es inválido (formato incorrecto)"
-
-#. TRANS: Form validation error on page for remote subscribe when no the provided profile URL
-#. TRANS: does not contain expected data.
-msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
-msgstr ""
-"No es un perfil válido URL (no se ha definido un documento YADIS o un XRDS "
-"inválido)."
-
-#. TRANS: Form validation error on page for remote subscribe.
-#, fuzzy
-msgid "That is a local profile! Login to subscribe."
-msgstr "¡Este es un perfil local! Ingresa para suscribirte"
-
-#. TRANS: Form validation error on page for remote subscribe when the remote service is not providing a request token.
-#, fuzzy
-msgid "Could not get a request token."
-msgstr "No se pudo obtener un token de solicitud"
-
-#. TRANS: Client error displayed when trying to (un)list an OMB 0.1 remote profile.
-#, fuzzy
-msgid "You cannot (un)list an OMB 0.1 remote profile with this action."
-msgstr "No puedes suscribirte a un perfil remoto 0.1 de OMB con esta acción."
-
 #. TRANS: Client error displayed when an unknown error occurs while delisting a user.
 #. TRANS: %s is a username.
-#, fuzzy, php-format
+#, php-format
 msgid "There was an unexpected error while delisting %s."
-msgstr "Se ha producido un error mientras se enlistaba %s."
+msgstr "Se ha producido un error mientras se eliminaba la lista %s."
 
 #. TRANS: Client error displayed when an unknown error occurs while listing a user.
 #. TRANS: %s is a profile URL.
@@ -5072,11 +4694,12 @@ msgid ""
 "There was a problem listing %s. The remote server is probably not responding "
 "correctly, please try retrying later."
 msgstr ""
+"Hubo un problema al mostrar la lista %s. El servidor remoto probablemente no "
+"está respondiendo correctamente. Por favor intente nuevamente mas tarde."
 
 #. TRANS: Title after removing a user from a list.
-#, fuzzy
 msgid "Unlisted"
-msgstr "Licencia"
+msgstr "Sin listar"
 
 #. TRANS: Client error displayed when trying to repeat a notice while not logged in.
 msgid "Only logged-in users can repeat notices."
@@ -5111,6 +4734,12 @@ msgstr "Respuestas a %s"
 msgid "Replies to %1$s, page %2$d"
 msgstr "Respuestas a %1$s, página %2$d"
 
+#. TRANS: Link for feed with replies for a user.
+#. TRANS: %s is a user nickname.
+#, php-format
+msgid "Replies feed for %s (Activity Streams JSON)"
+msgstr "Respuestas de suscripción para  %s (Activity Streams JSON)"
+
 #. TRANS: Link for feed with replies for a user.
 #. TRANS: %s is a user nickname.
 #, php-format
@@ -5161,25 +4790,22 @@ msgstr ""
 
 #. TRANS: RSS reply feed description.
 #. TRANS: %1$s is a user nickname, %2$s is the StatusNet site name.
-#, fuzzy, php-format
+#, php-format
 msgid "Replies to %1$s on %2$s."
-msgstr "Respuestas a %1$s en %2$s!"
+msgstr "Respuestas a %1$s en %2$s"
 
 #. TRANS: Client exception displayed when trying to restore an account while not logged in.
-#, fuzzy
 msgid "Only logged-in users can restore their account."
-msgstr "Sólo los usuarios que hayan accedido pueden repetir mensajes."
+msgstr "Sólo usuarios registrados pueden restaurar su cuenta."
 
 #. TRANS: Client exception displayed when trying to restore an account without having restore rights.
-#, fuzzy
 msgid "You may not restore your account."
-msgstr "Aún no has registrado aplicación alguna."
+msgstr "No puede restaurar tu cuenta."
 
 #. TRANS: Client exception displayed trying to restore an account while something went wrong uploading a file.
 #. TRANS: Client exception. No file; probably just a non-AJAX submission.
-#, fuzzy
 msgid "No uploaded file."
-msgstr "Subir archivo"
+msgstr "Ningún archivo cargado."
 
 #. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
@@ -5218,25 +4844,30 @@ msgstr "Error del sistema subir el archivo"
 
 #. TRANS: Client exception thrown when a feed is not an Atom feed.
 #. TRANS: Client exception thrown when an imported feed is not an Atom feed.
-#, fuzzy
 msgid "Not an Atom feed."
-msgstr "Todos los miembros"
+msgstr "No es una fuente de Atom."
 
 #. TRANS: Success message when a feed has been restored.
 msgid ""
 "Feed has been restored. Your old posts should now appear in search and your "
 "profile page."
 msgstr ""
+"Los feeds han sido restaurados. Sus mensajes deben aparecer ahora en la "
+"búsqueda y la página de perfil."
 
 #. TRANS: Message when a feed restore is in progress.
 msgid "Feed will be restored. Please wait a few minutes for results."
 msgstr ""
+"Se restaurará la alimentación. Por favor, espere unos minutos para obtener "
+"los resultados."
 
 #. TRANS: Form instructions for feed restore.
 msgid ""
-"You can upload a backed-up stream in <a href=\"http://activitystrea.ms/"
+"You can upload a backed-up timeline in <a href=\"http://activitystrea.ms/"
 "\">Activity Streams</a> format."
 msgstr ""
+"Puede cargar una copia de la cronología de <a href=\"http://activitystrea.ms/"
+"\">Secuencias de actividad</a> ."
 
 #. TRANS: Title for submit button to confirm upload of a user backup file for account restore.
 msgid "Upload the file"
@@ -5247,7 +4878,6 @@ msgid "You cannot revoke user roles on this site."
 msgstr "No puedes revocar funciones de usuario en este sitio."
 
 #. TRANS: Client error displayed when trying to revoke a role that is not set.
-#, fuzzy
 msgid "User does not have this role."
 msgstr "El usuario no tiene esta función."
 
@@ -5267,28 +4897,26 @@ msgstr "Al usuario ya se le ha impuesto restricciones."
 
 #. TRANS: Client error displayed when trying to list a profile with an invalid list.
 #. TRANS: %s is the invalid list name.
-#, fuzzy, php-format
+#, php-format
 msgid "Not a valid list: %s."
-msgstr "No es una etiqueta válida para personas: %s."
+msgstr "No es una lista válida: %s."
 
 #. TRANS: Page title for page showing self tags.
 #. TRANS: %1$s is a tag, %2$d is a page number.
-#, fuzzy, php-format
+#, php-format
 msgid "Users self-tagged with %1$s, page %2$d"
-msgstr "Usuarios auto etiquetados con %1$s - página %2$d"
+msgstr "Usuarios autoetiquetados con %1$s - página %2$d"
 
 #. TRANS: Title for the sessions administration panel.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Sessions"
 msgstr "Sesiones"
 
 #. TRANS: Instructions for the sessions administration panel.
 msgid "Session settings for this StatusNet site"
-msgstr ""
+msgstr "Configuración de sesión para este sitio StatusNet"
 
 #. TRANS: Fieldset legend on the sessions administration panel.
-#, fuzzy
 msgctxt "LEGEND"
 msgid "Sessions"
 msgstr "Sesiones"
@@ -5300,9 +4928,8 @@ msgstr "Gestionar sesiones"
 
 #. TRANS: Checkbox title on the sessions administration panel.
 #. TRANS: Indicates if StatusNet should handle session administration.
-#, fuzzy
 msgid "Handle sessions ourselves."
-msgstr "Si manejamos las sesiones nosotros mismos."
+msgstr "Manejar las sesiones nosotros mismos."
 
 #. TRANS: Checkbox label on the sessions administration panel.
 #. TRANS: Indicates if StatusNet should write session debugging output.
@@ -5310,14 +4937,12 @@ msgid "Session debugging"
 msgstr "Depuración de sesión"
 
 #. TRANS: Checkbox title on the sessions administration panel.
-#, fuzzy
 msgid "Enable debugging output for sessions."
-msgstr "Activar la salida de depuración para sesiones."
+msgstr "Habilitar depuración de salida para las sesiones."
 
 #. TRANS: Title for submit button on the sessions administration panel.
-#, fuzzy
 msgid "Save session settings"
-msgstr "Guardar la configuración de acceso"
+msgstr "Guardar configuración de sesión"
 
 #. TRANS: Client error displayed trying to display an OAuth application while not logged in.
 msgid "You must be logged in to view an application."
@@ -5330,7 +4955,7 @@ msgstr "Perfil de la aplicación"
 #. TRANS: Information output on an OAuth application page.
 #. TRANS: %1$s is the application creator, %2$s is "read-only" or "read-write",
 #. TRANS: %3$d is the number of users using the OAuth application.
-#, fuzzy, php-format
+#, php-format
 msgid "Created by %1$s - %2$s access by default - %3$d user"
 msgid_plural "Created by %1$s - %2$s access by default - %3$d users"
 msgstr[0] "Creado por %1$s - acceso predeterminado %2$s - %3$d usuarios"
@@ -5341,7 +4966,6 @@ msgid "Application actions"
 msgstr "Acciones de la aplicación"
 
 #. TRANS: Link text to edit application on the OAuth application page.
-#, fuzzy
 msgctxt "EDITAPP"
 msgid "Edit"
 msgstr "Editar"
@@ -5355,14 +4979,33 @@ msgstr "Reiniciar clave y secreto"
 msgid "Application info"
 msgstr "Información de la aplicación"
 
+#. TRANS: Field label on application page.
+msgid "Consumer key"
+msgstr "Clave del consumidor"
+
+#. TRANS: Field label on application page.
+msgid "Consumer secret"
+msgstr "Secreto del consumidor"
+
+#. TRANS: Field label on application page.
+msgid "Request token URL"
+msgstr "URL del token de solicitud"
+
+#. TRANS: Field label on application page.
+msgid "Access token URL"
+msgstr "URL del token de acceso"
+
+#. TRANS: Field label on application page.
+msgid "Authorize URL"
+msgstr "Autorizar URL"
+
 #. TRANS: Note on the OAuth application page about signature support.
-#, fuzzy
 msgid ""
 "Note: HMAC-SHA1 signatures are supported. The plaintext signature method is "
 "not supported."
 msgstr ""
-"Nota: Nuestro sistema sólo es compatible con firmas HMAC-SHA1. No son "
-"compatibles las firmas de texto sin formato."
+"Nota: Se admiten las firmas HMAC-SHA1. No se admite el método de firma de "
+"texto plano."
 
 #. TRANS: Text in confirmation dialog to reset consumer key and secret for an OAuth application.
 msgid "Are you sure you want to reset your consumer key and secret?"
@@ -5378,6 +5021,11 @@ msgstr "Mensajes favoritos de %1$s, página %2$d"
 msgid "Could not retrieve favorite notices."
 msgstr "No se pudo recibir avisos favoritos."
 
+#. TRANS: Feed link text. %s is a username.
+#, php-format
+msgid "Feed for favorites of %s (Activity Streams JSON)"
+msgstr "Canal de los amigos de %s (Activity Streams JSON)"
+
 #. TRANS: Feed link text. %s is a username.
 #, php-format
 msgid "Feed for favorites of %s (RSS 1.0)"
@@ -5439,6 +5087,11 @@ msgstr "Grupo %s"
 msgid "%1$s group, page %2$d"
 msgstr "grupo %1$s, página %2$d"
 
+#. TRANS: Tooltip for feed link. %s is a group nickname.
+#, php-format
+msgid "Notice feed for %s group (Activity Streams JSON)"
+msgstr "Canal de mensajes del grupo %s (Activity Streams JSON)"
+
 #. TRANS: Tooltip for feed link. %s is a group nickname.
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
@@ -5459,42 +5112,8 @@ msgstr "Canal de mensajes del grupo %s (Atom)"
 msgid "FOAF for %s group"
 msgstr "Amistades de amistades del grupo %s"
 
-#. TRANS: Header for mini list of group members on a group page (h2).
-msgid "Members"
-msgstr "Miembros"
-
-#. TRANS: Description for mini list of group members on a group page when the group has no members.
-#. TRANS: Content of "Listed" page if there are no listed users.
-#. TRANS: Content of "People following tag x" if there are no subscribed users.
-#. TRANS: Empty list message for tags.
-#. TRANS: Text for user subscription statistics if the user has no subscriptions.
-#. TRANS: Text for user subscriber statistics if user has no subscribers.
-#. TRANS: Text for user user group membership statistics if user is not a member of any group.
-#. TRANS: Default content for section/sidebar widget.
-msgid "(None)"
-msgstr "(Ninguno)"
-
-#. TRANS: Link to all group members from mini list of group members if group has more than n members.
-msgid "All members"
-msgstr "Todos los miembros"
-
-#. TRANS: Header for group statistics on a group page (h2).
-#. TRANS: H2 text for user statistics.
-msgid "Statistics"
-msgstr "Estadísticas"
-
-#. TRANS: Label for group creation date.
-msgctxt "LABEL"
-msgid "Created"
-msgstr "Creado"
-
-#. TRANS: Label for member count in statistics on group page.
-msgctxt "LABEL"
-msgid "Members"
-msgstr "Miembros"
-
 #. TRANS: Notice on group pages for anonymous users for StatusNet sites that accept new registrations.
-#. TRANS: **%s** is the group alias, %%%%site.name%%%% is the site name,
+#. TRANS: %s is the group name, %%%%site.name%%%% is the site name,
 #. TRANS: %%%%action.register%%%% is the URL for registration, %%%%doc.help%%%% is a URL to help.
 #. TRANS: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
 #, php-format
@@ -5513,25 +5132,19 @@ msgstr ""
 "información](%%%%doc.help%%%%))"
 
 #. TRANS: Notice on group pages for anonymous users for StatusNet sites that accept no new registrations.
-#. TRANS: **%s** is the group alias, %%%%site.name%%%% is the site name,
+#. TRANS: %s is the group name, %%%%site.name%%%% is the site name,
 #. TRANS: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
 "wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
 "[StatusNet](http://status.net/) tool. Its members share short messages about "
-"their life and interests. "
+"their life and interests."
 msgstr ""
 "**%s** es un grupo de usuarios en %%%%site.name%%%%, un servicio de "
 "[microblogueo](http://es.wikipedia.org/wiki/Microblogging) basado en la "
 "herramienta de software libre [StatusNet](http://status.net/). Sus miembros "
-"comparten mensajes cortos acerca de su vida e intereses. "
-
-#. TRANS: Title for list of group administrators on a group page.
-#, fuzzy
-msgctxt "TITLE"
-msgid "Admins"
-msgstr "Administradores"
+"comparten mensajes cortos acerca de su vida e intereses."
 
 #. TRANS: Client error displayed requesting a single message that does not exist.
 msgid "No such message."
@@ -5554,9 +5167,8 @@ msgid "Message from %1$s on %2$s"
 msgstr "Mensaje de %1$s en %2$s"
 
 #. TRANS: Client exception thrown when trying a view a notice the user has no access to.
-#, fuzzy
 msgid "Not available."
-msgstr "La mensajería instantánea no está disponible."
+msgstr "No disponible"
 
 #. TRANS: Client error displayed trying to show a deleted notice.
 msgid "Notice deleted."
@@ -5564,63 +5176,63 @@ msgstr "Mensaje borrado"
 
 #. TRANS: Title for private list timeline.
 #. TRANS: %1$s is a list, %2$s is a page number.
-#, fuzzy, php-format
+#, php-format
 msgid "Private timeline for %1$s list by you, page %2$d"
-msgstr "Usuarios auto etiquetados con %1$s - página %2$d"
+msgstr "Línea de tiempo privado para  %1$s  listado por usted, página%2$d"
 
 #. TRANS: Title for public list timeline where the viewer is the tagger.
 #. TRANS: %1$s is a list, %2$s is a page number.
-#, fuzzy, php-format
+#, php-format
 msgid "Timeline for %1$s list by you, page %2$d"
-msgstr "Usuarios auto etiquetados con %1$s - página %2$d"
+msgstr "Línea de tiempo para  %1$s  listado por usted, página%2$d"
 
 #. TRANS: Title for private list timeline.
 #. TRANS: %1$s is a list, %2$s is the tagger's nickname, %3$d is a page number.
-#, fuzzy, php-format
+#, php-format
 msgid "Timeline for %1$s list by %2$s, page %3$d"
-msgstr "Mensajes etiquetados con %1$s, página %2$d"
+msgstr "Línea de tiempo para  %1$s  lista de  %2$s , página %3$d"
 
 #. TRANS: Title for private list timeline.
 #. TRANS: %s is a list.
 #, php-format
 msgid "Private timeline of %s list by you"
-msgstr ""
+msgstr "Línea de tiempo privado de  %s  de usted"
 
 #. TRANS: Title for public list timeline where the viewer is the tagger.
 #. TRANS: %s is a list.
 #, php-format
 msgid "Timeline for %s list by you"
-msgstr ""
+msgstr "Línea de tiempo para  %s de usted"
 
 #. TRANS: Title for private list timeline.
 #. TRANS: %1$s is a list, %2$s is the tagger's nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "Timeline for %1$s list by %2$s"
-msgstr "Respuestas a %1$s en %2$s!"
+msgstr "Línea de tiempo para  %1$s  por la lista %2$s"
 
 #. TRANS: Feed title.
 #. TRANS: %1$s is a list, %2$s is tagger's nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "Feed for %1$s list by %2$s (Atom)"
-msgstr "Canal de las amistades de %s (Atom)"
+msgstr "Fuente para  %1$s  lista de  %2$s  (Atom)"
 
 #. TRANS: Empty list message for list timeline.
 #. TRANS: %1$s is a list, %2$s is a tagger's nickname.
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "This is the timeline for %1$s list by %2$s but no one has posted anything "
 "yet."
 msgstr ""
-"Esta es la línea temporal de %s y amistades, pero nadie ha publicado nada "
-"todavía."
+"Esta es la línea de tiempo para  %1$s  lista de  %2$s  pero nadie ha "
+"publicado nada aún."
 
 #. TRANS: Additional empty list message for list timeline for currently logged in user tagged tags.
 msgid "Try tagging more people."
-msgstr ""
+msgstr "Intenta etiquetar mas usuarios."
 
 #. TRANS: Additional empty list message for list timeline.
 #. TRANS: This message contains Markdown links in the form [description](link).
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and start following "
 "this timeline!"
@@ -5629,43 +5241,48 @@ msgstr ""
 "la primera persona en publicar uno?"
 
 #. TRANS: Header on show list page.
-#, fuzzy
+#. TRANS: Link description for link to list of users tagged with a tag (so part of a list).
 msgid "Listed"
-msgstr "Licencia"
+msgstr "Listado"
+
+#. TRANS: Content of "Listed" page if there are no listed users.
+#. TRANS: Content of "People following tag x" if there are no subscribed users.
+#. TRANS: Description for mini list of group members on a group page when the group has no members.
+#. TRANS: Empty list message for tags.
+#. TRANS: Text for user subscription statistics if the user has no subscriptions.
+#. TRANS: Text for user subscriber statistics if user has no subscribers.
+#. TRANS: Text for user user group membership statistics if user is not a member of any group.
+#. TRANS: Default content for section/sidebar widget.
+msgid "(None)"
+msgstr "(Ninguno)"
 
 #. TRANS: Link for more "People in list x by a user"
 #. TRANS: if there are more than the mini list's maximum.
-#, fuzzy
 msgid "Show all"
-msgstr "Ver más"
+msgstr "Mostrar todos"
 
 #. TRANS: Header for tag subscribers.
 #. TRANS: Link description for link to list of users subscribed to a tag.
 msgid "Subscribers"
 msgstr "Suscriptores"
 
-#. TRANS: Link for more "People following tag x"
-#. TRANS: if there are more than the mini list's maximum.
-msgid "All subscribers"
-msgstr "Todos los suscriptores"
-
-#. TRANS: Page title showing tagged notices in one user's stream.
+#. TRANS: Page title showing tagged notices in one user's timeline.
 #. TRANS: %1$s is the username, %2$s is the hash tag.
-#, fuzzy, php-format
+#, php-format
 msgid "Notices by %1$s tagged %2$s"
-msgstr "%1$s, página %2$s"
+msgstr "Avisos de %1$s etiquetadas por %2$s"
 
-#. TRANS: Page title showing tagged notices in one user's stream.
+#. TRANS: Page title showing tagged notices in one user's timeline.
 #. TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number.
-#, fuzzy, php-format
+#, php-format
 msgid "Notices by %1$s tagged %2$s, page %3$d"
-msgstr "Mensajes etiquetados con %1$s, página %2$d"
+msgstr "Avisos por  %1$s  etiquetas %2$s , página%3$d"
 
-#. TRANS: Extended page title showing tagged notices in one user's stream.
+#. TRANS: Extended page title showing tagged notices in one user's timeline.
 #. TRANS: %1$s is the username, %2$d is the page number.
-#, fuzzy, php-format
+#, php-format
 msgid "Notices by %1$s, page %2$d"
-msgstr "Mensajes etiquetados con %1$s, página %2$d"
+msgstr "Avisos por  %1$s , página %2$d"
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %1$s is a user nickname, %2$s is a hashtag.
@@ -5673,6 +5290,12 @@ msgstr "Mensajes etiquetados con %1$s, página %2$d"
 msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
 msgstr "Canal de avisos de %1$s etiquetados %2$s (RSS 1.0)"
 
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#, php-format
+msgid "Notice feed for %s (Activity Streams JSON)"
+msgstr "Canal de mensajes para %s (Activity Streams JSON)"
+
 #. TRANS: Title for link to notice feed.
 #. TRANS: %s is a user nickname.
 #, php-format
@@ -5697,10 +5320,11 @@ msgstr "Canal de mensajes para %s (Atom)"
 msgid "FOAF for %s"
 msgstr "Amistades de amistades de %s"
 
-#. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
-#, fuzzy, php-format
+#. TRANS: First sentence of empty list message for a timeline. $1%s is a user nickname.
+#, php-format
 msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
-msgstr "Esta es la línea temporal de %1$s, pero %2$s aún no ha publicado nada."
+msgstr ""
+"Esta es la línea de tiempo para  %1$s , pero  %1$s  no ha publicado nada aún."
 
 #. TRANS: Second sentence of empty list message for a stream for the user themselves.
 msgid ""
@@ -5710,7 +5334,7 @@ msgstr ""
 "¿Has visto algo interesante recientemente? Aún no has hecho ninguna "
 "publicación, así que este puede ser un buen momento para empezar :)"
 
-#. TRANS: Second sentence of empty  list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
+#. TRANS: Second sentence of empty  list message for a non-self timeline. %1$s is a user nickname, %2$s is a part of a URL.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
 #, php-format
 msgid ""
@@ -5720,7 +5344,7 @@ msgstr ""
 "Puedes intentar darle un toque a %1$s o [publicar algo a su atención](%%%%"
 "action.newnotice%%%%?status_textarea=%2$s)."
 
-#. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
+#. TRANS: Announcement for anonymous users showing a timeline if site registrations are open.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
 #, php-format
 msgid ""
@@ -5735,17 +5359,17 @@ msgstr ""
 "register%%%%) para seguir los avisos de **%s** y de muchas personas más! "
 "([Más información](%%%%doc.help%%%%))"
 
-#. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
+#. TRANS: Announcement for anonymous users showing a timeline if site registrations are closed or invite only.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
 "wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
-"[StatusNet](http://status.net/) tool. "
+"[StatusNet](http://status.net/) tool."
 msgstr ""
-"**% s ** tiene una cuenta en %%%%site.name%%%%, un servicio de [microblogueo]"
-"(http://en.wikipedia.org/wiki/Micro-blogging), basado en la herramienta de "
-"software libre [StatusNet](http://status.net/). "
+"** %s ** tiene una cuenta en %%% %site.name% %%%, un [micro-blogging](http://"
+"en.wikipedia.org/wiki/Micro-blogging) servicio basado en el Software libre "
+"[herramienta de StatusNet](http://status.net/)."
 
 #. TRANS: Link to the author of a repeated notice. %s is a linked nickname.
 #, php-format
@@ -5762,7 +5386,6 @@ msgid "User is already silenced."
 msgstr "El usuario ya ha sido silenciado."
 
 #. TRANS: Title for site administration panel.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Site"
 msgstr "Sitio"
@@ -5779,6 +5402,14 @@ msgstr "El nombre del sitio debe tener longitud diferente de cero."
 msgid "You must have a valid contact email address."
 msgstr "Debes tener una dirección de correo electrónico válida."
 
+#. TRANS: Client error displayed when a logo URL is not valid.
+msgid "Invalid logo URL."
+msgstr "URL de logotipo inválido."
+
+#. TRANS: Client error displayed when a SSL logo URL is invalid.
+msgid "Invalid SSL logo URL."
+msgstr "URL no válida de logotipo SSL."
+
 #. TRANS: Client error displayed trying to save site settings with an invalid language code.
 #. TRANS: %s is the invalid language code.
 #, php-format
@@ -5794,19 +5425,16 @@ msgid "Dupe limit must be one or more seconds."
 msgstr "El límite de duplicación debe ser de 1 o más segundos."
 
 #. TRANS: Fieldset legend on site settings panel.
-#, fuzzy
 msgctxt "LEGEND"
 msgid "General"
 msgstr "General"
 
 #. TRANS: Field label on site settings panel.
-#, fuzzy
 msgctxt "LABEL"
 msgid "Site name"
 msgstr "Nombre del sitio"
 
 #. TRANS: Field title on site settings panel.
-#, fuzzy
 msgid "The name of your site, like \"Yourcompany Microblog\"."
 msgstr "El nombre de tu sitio, por ejemplo, \"Microblog tucompañía\""
 
@@ -5815,33 +5443,30 @@ msgid "Brought by"
 msgstr "Traído por"
 
 #. TRANS: Field title on site settings panel.
-#, fuzzy
 msgid "Text used for credits link in footer of each page."
-msgstr "Texto utilizado para los vínculos a créditos en el pie de cada página"
+msgstr "Texto utilizado para enlace de créditos en el pie de cada página."
 
 #. TRANS: Field label on site settings panel.
 msgid "Brought by URL"
 msgstr "Traído por URL"
 
 #. TRANS: Field title on site settings panel.
-#, fuzzy
 msgid "URL used for credits link in footer of each page."
-msgstr "URL utilizado para el vínculo a los créditos en el pie de cada página"
+msgstr ""
+"Dirección URL utilizada para enlace de créditos en el pie de cada página."
 
 #. TRANS: Field label on site settings panel.
 msgid "Email"
 msgstr "Correo electrónico"
 
 #. TRANS: Field title on site settings panel.
-#, fuzzy
 msgid "Contact email address for your site."
 msgstr "Correo electrónico de contacto para tu sitio"
 
 #. TRANS: Fieldset legend on site settings panel.
-#, fuzzy
 msgctxt "LEGEND"
 msgid "Local"
-msgstr "Configuraciones regionales"
+msgstr "Local"
 
 #. TRANS: Dropdown label on site settings panel.
 msgid "Default timezone"
@@ -5856,13 +5481,13 @@ msgid "Default language"
 msgstr "!Idioma predeterminado"
 
 #. TRANS: Dropdown title on site settings panel.
-msgid "Site language when autodetection from browser settings is not available"
+msgid ""
+"The site language when autodetection from browser settings is not available."
 msgstr ""
-"Idioma del sitio cuando la autodetección de la configuración del navegador "
-"no está disponible"
+"El idioma del sitio cuando no está disponible la detección automática de la "
+"configuración del navegador."
 
 #. TRANS: Fieldset legend on site settings panel.
-#, fuzzy
 msgctxt "LEGEND"
 msgid "Limits"
 msgstr "Límites"
@@ -5883,9 +5508,21 @@ msgstr "Límite de duplicados"
 msgid "How long users must wait (in seconds) to post the same thing again."
 msgstr "Cuántos segundos es necesario esperar para publicar lo mismo de nuevo."
 
+#. TRANS: Fieldset legend for form to change logo.
+msgid "Logo"
+msgstr "Logo"
+
+#. TRANS: Field label for StatusNet site logo.
+msgid "Site logo"
+msgstr "Logo del sitio"
+
+#. TRANS: Field label for SSL StatusNet site logo.
+msgid "SSL logo"
+msgstr "Logo SSL"
+
 #. TRANS: Button title for saving site settings.
-msgid "Save site settings"
-msgstr "Guardar la configuración del sitio"
+msgid "Save the site settings."
+msgstr "Guardar la configuración del sitio."
 
 #. TRANS: Page title for site-wide notice tab in admin panel.
 msgid "Site Notice"
@@ -5900,27 +5537,21 @@ msgid "Unable to save site notice."
 msgstr "No se pudo guarda el aviso del sitio."
 
 #. TRANS: Client error displayed when a site-wide notice was longer than allowed.
-#, fuzzy
 msgid "Maximum length for the site-wide notice is 255 characters."
-msgstr ""
-"La longitud máxima para el aviso que va a lo ancho del sitio es de 255 "
-"caracteres."
+msgstr "Longitud máxima de noticia en todo el sitio es de 255 caracteres."
 
 #. TRANS: Label for site-wide notice text field in admin panel.
 msgid "Site notice text"
 msgstr "Texto del mensaje del sitio"
 
 #. TRANS: Tooltip for site-wide notice text field in admin panel.
-#, fuzzy
 msgid "Site-wide notice text (255 characters maximum; HTML allowed)"
 msgstr ""
-"Texto del mensaje que va a lo ancho del sitio (máximo 255 caracteres; se "
-"acepta HTML)"
+"Texto de aviso en todo el sitio (255 caracteres como máximo; HTML permitido)"
 
-#. TRANS: Title for button to save site notice in admin panel.
-#, fuzzy
+#. TRANS: Button title to save site notice in admin panel.
 msgid "Save site notice."
-msgstr "Guardar el mensaje del sitio"
+msgstr "Guardar el aviso del sitio."
 
 #. TRANS: Title for SMS settings.
 msgid "SMS settings"
@@ -5967,9 +5598,9 @@ msgid "SMS phone number"
 msgstr "Número de teléfono de SMS"
 
 #. TRANS: SMS phone number input field instructions in SMS settings form.
-#, fuzzy
 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"
+msgstr ""
+"Número de teléfono, sin signos de puntuación o espacios, con código de área."
 
 #. TRANS: Form legend for SMS preferences form.
 msgid "SMS preferences"
@@ -6017,9 +5648,8 @@ msgid "That is the wrong confirmation number."
 msgstr "Ese no es el número de confirmación"
 
 #. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
-#, fuzzy
 msgid "Could not delete SMS confirmation."
-msgstr "No se pudo eliminar la confirmación de mensajería instantánea."
+msgstr "No se pudo eliminar la confirmación de SMS."
 
 #. TRANS: Message given after successfully canceling SMS phone number confirmation.
 msgid "SMS confirmation cancelled."
@@ -6058,7 +5688,6 @@ msgid "No code entered."
 msgstr "No ingresó el código"
 
 #. TRANS: Title for admin panel to configure snapshots.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Snapshots"
 msgstr "Capturas"
@@ -6080,7 +5709,6 @@ msgid "Invalid snapshot report URL."
 msgstr "URL de instantánea de reporte inválido"
 
 #. TRANS: Fieldset legend on admin panel for snapshots.
-#, fuzzy
 msgctxt "LEGEND"
 msgid "Snapshots"
 msgstr "Capturas"
@@ -6098,16 +5726,14 @@ msgid "Data snapshots"
 msgstr "Capturas de datos"
 
 #. TRANS: Dropdown title for snapshot method in admin panel for snapshots.
-#, fuzzy
 msgid "When to send statistical data to status.net servers."
-msgstr "Cuándo enviar datos estadísticos a los servidores status.net"
+msgstr "Cuándo enviar datos estadísticos a los servidores de status.net"
 
 #. TRANS: Input field label for snapshot frequency in admin panel for snapshots.
 msgid "Frequency"
 msgstr "Frecuencia"
 
 #. TRANS: Input field title for snapshot frequency in admin panel for snapshots.
-#, fuzzy
 msgid "Snapshots will be sent once every N web hits."
 msgstr "Las instantáneas se enviarán una vez cada N visitas Web"
 
@@ -6116,12 +5742,10 @@ msgid "Report URL"
 msgstr "Reportar URL"
 
 #. TRANS: Input field title for snapshot report URL in admin panel for snapshots.
-#, fuzzy
 msgid "Snapshots will be sent to this URL."
 msgstr "Las capturas se enviarán a este URL"
 
-#. TRANS: Title for button to save snapshot settings.
-#, fuzzy
+#. TRANS: Button title to save snapshot settings.
 msgid "Save snapshot settings."
 msgstr "Guardar la configuración de instantáneas"
 
@@ -6136,54 +5760,47 @@ msgstr "No se ha podido guardar la suscripción."
 
 #. TRANS: Client error displayed when trying to approve group applicants without being a group administrator.
 msgid "You may only approve your own pending subscriptions."
-msgstr ""
+msgstr "Solo tú puedes aprobar tus propias suscripciones pendientes."
 
 #. TRANS: Title of the first page showing pending subscribers still awaiting approval.
 #. TRANS: %s is the name of the user.
-#, fuzzy, php-format
+#, php-format
 msgid "%s subscribers awaiting approval"
-msgstr "%s miembros en el grupo"
+msgstr "%s suscriptores a la espera de aprobación"
 
 #. TRANS: Title of all but the first page showing pending subscribersmembers still awaiting approval.
 #. TRANS: %1$s is the name of the user, %2$d is the page number of the members list.
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s subscribers awaiting approval, page %2$d"
-msgstr "%1$s miembros de grupo, página %2$d"
+msgstr "%1$s suscriptores en espera de aprobación,  página %2$d"
 
 #. TRANS: Page notice for group members page.
-#, fuzzy
 msgid "A list of users awaiting approval to subscribe to you."
-msgstr "Lista de los usuarios en este grupo."
-
-#. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
-msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
-msgstr "No puedes suscribirte a un perfil remoto 0.1 de OMB con esta acción."
+msgstr "Lista de usuarios esperando aprobación para suscribirse a usted."
 
 #. TRANS: Page title when subscription succeeded.
 msgid "Subscribed"
 msgstr "Suscrito"
 
 #. TRANS: Client error displayed when trying to perform an action while not logged in.
-#, fuzzy
 msgid "You must be logged in to unsubscribe from a list."
-msgstr "Debes estar conectado para crear un grupo"
+msgstr "Debe haber iniciado sesión para darse de baja de una lista."
 
 #. TRANS: Client error displayed when trying to perform an action without providing an ID.
-#, fuzzy
 msgid "No ID given."
-msgstr "No existe argumento de ID."
+msgstr "No existe ID."
 
 #. TRANS: Server error displayed subscribing to a list fails.
 #. TRANS: %1$s is a user nickname, %2$s is a list, %3$s is the error message (no period).
-#, fuzzy, php-format
+#, php-format
 msgid "Could not subscribe user %1$s to list %2$s: %3$s"
-msgstr "No se pudo unir el usuario %s al grupo %s"
+msgstr "No se puede suscribir al usuario %1$s a la lista  %2$s:%3$s"
 
 #. TRANS: Title of form to subscribe to a list.
 #. TRANS: %1%s is a user nickname, %2$s is a list, %3$s is a tagger nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s subscribed to list %2$s by %3$s"
-msgstr "%1$s suscriptores, página %2$d"
+msgstr "%1$s suscrito a la lista %2$s de %3$s"
 
 #. TRANS: Header for list of subscribers for a user (first page).
 #. TRANS: %s is the user's nickname.
@@ -6262,8 +5879,7 @@ msgid ""
 "You're not listening to anyone's notices right now, try subscribing to "
 "people you know. Try [people search](%%action.peoplesearch%%), look for "
 "members in groups you're interested in and in our [featured users](%%action."
-"featured%%). If you're a [Twitter user](%%action.twittersettings%%), you can "
-"automatically subscribe to people you already follow there."
+"featured%%)."
 msgstr ""
 "Ahora mismo no estás escuchando los avisos de nadie. Intenta suscribirte a "
 "gente que conozcas. Puedes [buscar gente](%%action.peoplesearch%%); busca "
@@ -6280,12 +5896,11 @@ msgid "%s is not listening to anyone."
 msgstr "%s no está escuchando a nadie."
 
 #. TRANS: Atom feed title. %s is a profile nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "Subscription feed for %s (Atom)"
 msgstr "Canal de mensajes para %s (Atom)"
 
 #. TRANS: Checkbox label for enabling IM messages for a profile in a subscriptions list.
-#, fuzzy
 msgctxt "LABEL"
 msgid "IM"
 msgstr "IM"
@@ -6300,6 +5915,12 @@ msgstr "SMS"
 msgid "Notices tagged with %1$s, page %2$d"
 msgstr "Mensajes etiquetados con %1$s, página %2$d"
 
+#. TRANS: Link label for feed on "notices with tag" page.
+#. TRANS: %s is the tag the feed is for.
+#, php-format
+msgid "Notice feed for tag %s (Activity Streams JSON)"
+msgstr "Canal de mensajes con etiqueta %s (Activity Streams JSON)"
+
 #. TRANS: Link label for feed on "notices with tag" page.
 #. TRANS: %s is the tag the feed is for.
 #, php-format
@@ -6321,69 +5942,60 @@ msgstr "Canal de mensajes con etiqueta %s (Atom)"
 #. TRANS: Client error displayed when trying to tag a user that cannot be tagged.
 #. TRANS: Client exception thrown trying to set a tag for a user that cannot be tagged.
 #. TRANS: Error displayed when trying to tag a user that cannot be tagged.
-#, fuzzy
 msgid "You cannot tag this user."
-msgstr "No puedes enviar mensaje a este usuario."
+msgstr "No puede etiquetar este usuario."
 
 #. TRANS: Title for list form when not on a profile page.
-#, fuzzy
 msgid "List a profile"
-msgstr "Perfil de usuario"
+msgstr "Listar un perfil"
 
 #. TRANS: Title for list form when on a profile page.
 #. TRANS: %s is a profile nickname.
-#, fuzzy, php-format
+#, php-format
 msgctxt "ADDTOLIST"
 msgid "List %s"
-msgstr "Límites"
+msgstr "Lista %s"
 
 #. TRANS: Title for list form when an error has occurred.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Error"
-msgstr "Error de Ajax"
+msgstr "Error"
 
 #. TRANS: Header in list form.
 msgid "User profile"
 msgstr "Perfil de usuario"
 
 #. TRANS: Fieldset legend for list form.
-#, fuzzy
 msgid "List user"
-msgstr "Límites"
+msgstr "Lista de usuario"
 
 #. TRANS: Field label on list form.
-#, fuzzy
 msgctxt "LABEL"
 msgid "Lists"
-msgstr "Límites"
+msgstr "Listas"
 
 #. TRANS: Field title on list form.
-#, fuzzy
 msgid ""
 "Lists for this user (letters, numbers, -, ., and _), comma- or space- "
 "separated."
 msgstr ""
-"Etiquetas para ti (letras, números, -, ., y _), separadas por comas o "
-"espacios"
+"Listas para este usuario (letras, números,-,. y _), separados por comas o "
+"espacio."
 
 #. TRANS: Title for personal tag cloud section.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Tags"
 msgstr "Etiquetas"
 
 #. TRANS: Success message if lists are saved.
-#, fuzzy
 msgid "Lists saved."
-msgstr "Se guardó la contraseña."
+msgstr "Listas guardadas."
 
 #. TRANS: Page notice.
-#, fuzzy
 msgid "Use this form to add your subscribers or subscriptions to lists."
 msgstr ""
-"Usa este formulario para agregar etiquetas a tus suscriptores o "
-"suscripciones."
+"Utilice este formulario para agregar tus suscriptores o suscripciones a "
+"listas."
 
 #. TRANS: Client error when requesting a tag feed for a non-existing tag.
 msgid "No such tag."
@@ -6407,26 +6019,13 @@ msgstr "Desuscrito"
 
 #. TRANS: Page title for form that allows unsubscribing from a list.
 #. TRANS: %1$s is a nickname, %2$s is a list, %3$s is a tagger nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s unsubscribed from list %2$s by %3$s"
-msgstr "%1$s suscriptores, página %2$d"
-
-#. TRANS: Client error displayed when trying to update profile with an incompatible license.
-#. TRANS: %1$s is the license incompatible with site license %2$s.
-#. TRANS: Exception thrown when licenses are not compatible for an authorisation request.
-#. TRANS: %1$s is the license for the listenee, %2$s is the license for "this" StatusNet site.
-#, fuzzy, php-format
-msgid ""
-"Listenee stream license \"%1$s\" is not compatible with site license \"%2$s"
-"\"."
-msgstr ""
-"Licencia de flujo del emisor ‘%1$s’ es incompatible con la licencia del "
-"sitio ‘%2$s’."
+msgstr "%1$s elimina suscripción a la lista %2$s de %3$s"
 
 #. TRANS: Title of URL settings tab in profile settings.
-#, fuzzy
 msgid "URL settings"
-msgstr "Configuración de mensajería instantánea"
+msgstr "Configuración de direcciones URL"
 
 #. TRANS: Instructions for tab "Other" in user profile settings.
 msgid "Manage various other options."
@@ -6439,13 +6038,12 @@ msgid " (free service)"
 msgstr " (servicio libre)"
 
 #. TRANS: Default value for URL shortening settings.
-#, fuzzy
 msgid "[none]"
-msgstr "Ninguno"
+msgstr "[Ninguno]"
 
 #. TRANS: Default value for URL shortening settings.
 msgid "[internal]"
-msgstr ""
+msgstr "[Interno]"
 
 #. TRANS: Label for dropdown with URL shortener services.
 msgid "Shorten URLs with"
@@ -6457,39 +6055,40 @@ msgstr "Servicio de acorte automático a usar."
 
 #. TRANS: Field label in URL settings in profile.
 msgid "URL longer than"
-msgstr ""
+msgstr "URL mas largo de"
 
 #. TRANS: Field title in URL settings in profile.
 msgid "URLs longer than this will be shortened, 0 means always shorten."
 msgstr ""
+"URLs más largo que esto será acostado, 0 significa que siempre se acortan."
 
 #. TRANS: Field label in URL settings in profile.
 msgid "Text longer than"
-msgstr ""
+msgstr "Texto mas largo de"
 
 #. TRANS: Field title in URL settings in profile.
 msgid ""
 "URLs in notices longer than this will be shortened, 0 means always shorten."
 msgstr ""
+"URLs en mensajes largos serán acortados, 0 significa que todos serán "
+"acortados."
 
 #. TRANS: Form validation error for form "Other settings" in user profile.
-#, fuzzy
 msgid "URL shortening service is too long (maximum 50 characters)."
-msgstr "El servicio de acortamiento de URL es muy largo (máx. 50 caracteres)."
+msgstr ""
+"Servicio de acortamiento de URL es demasiado larga (máximo 50 caracteres)."
 
 #. TRANS: Client exception thrown when the maximum URL settings value is invalid in profile URL settings.
-#, fuzzy
 msgid "Invalid number for maximum URL length."
-msgstr "Contenido de mensaje inválido."
+msgstr "Número no válido para la longitud máxima de URL."
 
 #. TRANS: Client exception thrown when the maximum notice length settings value is invalid in profile URL settings.
-#, fuzzy
 msgid "Invalid number for maximum notice length."
-msgstr "Contenido de mensaje inválido."
+msgstr "Número máximo de longitud de noticia inválido."
 
 #. TRANS: Server exception thrown in profile URL settings when preferences could not be saved.
 msgid "Error saving user URL shortening preferences."
-msgstr ""
+msgstr "Error al guardar las preferencias del usuario de acortamiento de URL."
 
 #. TRANS: User admin panel title.
 msgctxt "TITLE"
@@ -6498,25 +6097,23 @@ msgstr "Usuario"
 
 #. TRANS: Instruction for user admin panel.
 msgid "User settings for this StatusNet site"
-msgstr ""
+msgstr "Configuración de usuario de este sitio StatusNet"
 
 #. TRANS: Form validation error in user admin panel when a non-numeric character limit was set.
 msgid "Invalid bio limit. Must be numeric."
 msgstr "Límite para la bio inválido: Debe ser numérico."
 
 #. TRANS: Form validation error in user admin panel when welcome text is too long.
-#, fuzzy
 msgid "Invalid welcome text. Maximum length is 255 characters."
-msgstr "Texto de bienvenida inválido. La longitud máx. es de 255 caracteres."
+msgstr "Texto bienvenida no válido. Longitud máxima es de 255 caracteres."
 
 #. TRANS: Client error displayed when trying to set a non-existing user as default subscription for new
 #. TRANS: users in user admin panel. %1$s is the invalid nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "Invalid default subscripton: \"%1$s\" is not a user."
-msgstr "Suscripción predeterminada inválida : '%1$s' no es un usuario"
+msgstr "Subscripciónn predeterminada no válida: \" %1$s \" no es un usuario."
 
 #. TRANS: Fieldset legend in user administration panel.
-#, fuzzy
 msgctxt "LEGEND"
 msgid "Profile"
 msgstr "Perfil"
@@ -6538,9 +6135,8 @@ msgid "New user welcome"
 msgstr "Bienvenida a nuevos usuarios"
 
 #. TRANS: Tooltip in user admin panel for setting new user welcome text.
-#, fuzzy
 msgid "Welcome text for new users (maximum 255 characters)."
-msgstr "Texto de bienvenida para nuevos usuarios (máx. 255 caracteres)."
+msgstr "Texto Bienvenido para los nuevos usuarios (máximo 255 caracteres)."
 
 #. TRANS: Field label in user admin panel for setting default subscription for new users.
 msgid "Default subscription"
@@ -6562,158 +6158,9 @@ msgstr "Invitaciones habilitadas"
 msgid "Whether to allow users to invite new users."
 msgstr "Si permitir a los usuarios invitar nuevos usuarios."
 
-#. TRANS: Title for button to save user settings in user admin panel.
-#, fuzzy
+#. TRANS: Button title to save user settings in user admin panel.
 msgid "Save user settings."
-msgstr "Guardar la configuración del sitio"
-
-#. TRANS: Page title.
-msgid "Authorize subscription"
-msgstr "Autorizar la suscripción"
-
-#. TRANS: Page notice on "Authorize subscription" page.
-#, fuzzy
-msgid ""
-"Please check these details to make sure that you want to subscribe to this "
-"user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
-"click \"Reject\"."
-msgstr ""
-"Por favor revisa estos detalles para asegurar que deseas suscribirte a los "
-"avisos de este usuario. Si no pediste suscribirte a los avisos de alguien, "
-"haz clic en \"Cancelar\"."
-
-#. TRANS: Button text on Authorise Subscription page.
-#. TRANS: Submit button text to accept a group membership request on approve group form.
-#. TRANS: Submit button text to accept a subscription request on approve sub form.
-msgctxt "BUTTON"
-msgid "Accept"
-msgstr "Aceptar"
-
-#. TRANS: Title for button on Authorise Subscription page.
-#. TRANS: Button title to subscribe to a user.
-msgid "Subscribe to this user."
-msgstr "Suscribirse a este usuario."
-
-#. TRANS: Button text on Authorise Subscription page.
-#. TRANS: Submit button text to reject a group membership request on approve group form.
-#. TRANS: Submit button text to reject a subscription request on approve sub form.
-msgctxt "BUTTON"
-msgid "Reject"
-msgstr "Rechazar"
-
-#. TRANS: Title for button on Authorise Subscription page.
-msgid "Reject this subscription."
-msgstr "Rechazar esta suscripción."
-
-#. TRANS: Client error displayed for an empty authorisation request.
-msgid "No authorization request!"
-msgstr "¡Ninguna petición de autorización!"
-
-#. TRANS: Accept message header from Authorise subscription page.
-msgid "Subscription authorized"
-msgstr "Suscripción autorizada"
-
-#. TRANS: Accept message text from Authorise subscription page.
-msgid ""
-"The subscription has been authorized, but no callback URL was passed. Check "
-"with the site's instructions for details on how to authorize the "
-"subscription. Your subscription token is:"
-msgstr ""
-"La suscripción ha sido autorizada, pero no se ha pasado un URL  de retorno. "
-"Consulte con las instrucciones del sitio para obtener detalles acerca de "
-"cómo autorizar la suscripción. Tu token de suscripción es:"
-
-#. TRANS: Reject message header from Authorise subscription page.
-msgid "Subscription rejected"
-msgstr "Suscripción rechazada"
-
-#. TRANS: Reject message from Authorise subscription page.
-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 pasado un URL de retorno. Lee "
-"de nuevo las instrucciones para saber cómo rechazar la suscripción "
-"completamente."
-
-#. TRANS: Exception thrown when no valid user is found for an authorisation request.
-#. TRANS: %s is a listener URI.
-#, fuzzy, php-format
-msgid "Listener URI \"%s\" not found here."
-msgstr "No se ha encontrado aquí el URI del oyente ‘%s’."
-
-#. TRANS: Exception thrown when listenee URI is too long for an authorisation request.
-#. TRANS: %s is a listenee URI.
-#, fuzzy, php-format
-msgid "Listenee URI \"%s\" is too long."
-msgstr "El URI ‘%s’ del receptor es muy largo."
-
-#. TRANS: Exception thrown when listenee URI is a local user for an authorisation request.
-#. TRANS: %s is a listenee URI.
-#, fuzzy, php-format
-msgid "Listenee URI \"%s\" is a local user."
-msgstr "El URI ‘%s’  del receptor es un usuario local."
-
-#. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
-#. TRANS: %s is a profile URL.
-#, fuzzy, php-format
-msgid "Profile URL \"%s\" is for a local user."
-msgstr "El URL ‘%s’ de perfil es para un usuario local."
-
-#. TRANS: Exception thrown when avatar URL is invalid for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#, fuzzy, php-format
-msgid "Avatar URL \"%s\" is not valid."
-msgstr "La URL ‘%s’ de la imagen no es válida."
-
-#. TRANS: Exception thrown when avatar URL could not be read for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#, fuzzy, php-format
-msgid "Cannot read avatar URL \"%s\"."
-msgstr "No se puede leer la URL de la imagen ‘%s’."
-
-#. TRANS: Exception thrown when avatar URL return an invalid image type for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#, fuzzy, php-format
-msgid "Wrong image type for avatar URL \"%s\"."
-msgstr "Tipo de imagen incorrecto para la URL de imagen ‘%s’."
-
-#. TRANS: Title for profile design page.
-#. TRANS: Page title for profile design page.
-msgid "Profile design"
-msgstr "Diseño del perfil"
-
-#. TRANS: Instructions for Profile design page.
-#. TRANS: Instructions for profile design page.
-msgid ""
-"Customize the way your profile looks with a background image and a colour "
-"palette of your choice."
-msgstr ""
-"Personaliza la vista de tu perfil con una imagen de fondo y la paelta de "
-"colores que quieras."
-
-#. TRANS: Succes message on Profile design page when finding an easter egg.
-msgid "Enjoy your hotdog!"
-msgstr "¡Disfruta de tu perrito caliente!"
-
-#. TRANS: Form legend on Profile design page.
-#, fuzzy
-msgid "Design settings"
-msgstr "Guardar la configuración del sitio"
-
-#. TRANS: Checkbox label on Profile design page.
-msgid "View profile designs"
-msgstr "Ver diseños de perfil"
-
-#. TRANS: Title for checkbox on Profile design page.
-msgid "Show or hide profile designs."
-msgstr "Ocultar o mostrar diseños de perfil."
-
-#. TRANS: Form legend on Profile design page for form to choose a background image.
-#, fuzzy
-msgid "Background file"
-msgstr "Fondo"
+msgstr "Guardar configuración de usuario."
 
 #. TRANS: Page title for all but the first page of groups for a user.
 #. TRANS: %1$s is a nickname, %2$d is a page number.
@@ -6755,7 +6202,7 @@ msgstr "%s StatusNet"
 #. TRANS: %1$s is the engine name (StatusNet) and %2$s is the StatusNet version.
 #, php-format
 msgid ""
-"This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, "
+"This site is powered by %1$s version %2$s, Copyright 2008-2011 StatusNet, "
 "Inc. and contributors."
 msgstr ""
 "Este sitio ha sido desarrollado con %1$s, versión %2$s, Derechos Reservados "
@@ -6774,24 +6221,24 @@ msgid ""
 "StatusNet is free software: you can redistribute it and/or modify it under "
 "the terms of the GNU Affero General Public License as published by the Free "
 "Software Foundation, either version 3 of the License, or (at your option) "
-"any later version. "
+"any later version."
 msgstr ""
-"Freecol es software libre: Puedes redistribuirlo y/o modificarlo bajo los "
-"términos de la Licencia Pública General de Affero AGPL tal y como se ha "
-"publicado por la Fundación del Software Libre, bien por la versión 3 de la "
-"Licencia, o cualquier versión posterior (la de tu elección). "
+"StatusNet es software libre: usted puede redistribuirlo y/o modificarlo bajo "
+"los términos de la GNU Affero General Public License publicada por la Free "
+"Software Foundation, bien la versión 3 de la licencia, o (a su opción) "
+"cualquier versión posterior."
 
 #. TRANS: Content part of StatusNet version page.
 msgid ""
 "This program is distributed in the hope that it will be useful, but WITHOUT "
 "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
 "FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License "
-"for more details. "
+"for more details."
 msgstr ""
-"Este programa se distribuye con la esperanza de que sea útil, pero SIN "
-"NINGUNA GARANT�A, incluso sin la garantía implícita de COMERCIALIZACIÓN o "
-"IDONEIDAD PARA UN PROPÓSITO PARTICULAR. Consulte la Licencia Pública General "
-"de Affero AGPL para más detalles. "
+"Este programa se distribuye con la esperanza de que será útil, pero sin "
+"ninguna garantía; ni siquiera la garantía implícita de comerciabilidad o "
+"idoneidad para un propósito PARTICULAR.  Consulte la GNU Affero General "
+"Public License para más detalles."
 
 #. TRANS: Content part of StatusNet version page.
 #. TRANS: %s is a link to the AGPL license with link description "http://www.gnu.org/licenses/agpl.html".
@@ -6808,25 +6255,21 @@ msgid "Plugins"
 msgstr "Complementos"
 
 #. TRANS: Column header for plugins table on version page.
-#, fuzzy
 msgctxt "HEADER"
 msgid "Name"
 msgstr "Nombre"
 
 #. TRANS: Column header for plugins table on version page.
-#, fuzzy
 msgctxt "HEADER"
 msgid "Version"
 msgstr "Versión"
 
 #. TRANS: Column header for plugins table on version page.
-#, fuzzy
 msgctxt "HEADER"
 msgid "Author(s)"
-msgstr "Autor(es)"
+msgstr "Autor (es)"
 
 #. TRANS: Column header for plugins table on version page.
-#, fuzzy
 msgctxt "HEADER"
 msgid "Description"
 msgstr "Descripción"
@@ -6837,9 +6280,9 @@ msgstr "Aceptar"
 
 #. TRANS: Ntofication given when a user marks a notice as favorite.
 #. TRANS: %1$s is a user nickname or full name, %2$s is a notice URI.
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s marked notice %2$s as a favorite."
-msgstr "%s (@%s) agregó tu mensaje a los favoritos"
+msgstr "%1$s ha marcado la noticia  %2$s  como favorito."
 
 #. TRANS: Server exception thrown when a URL cannot be processed.
 #, php-format
@@ -6850,26 +6293,36 @@ msgstr "No se puede procesar URL '%s'"
 msgid "Robin thinks something is impossible."
 msgstr " Robin piensa que algo es imposible."
 
+#. TRANS: Message used to be inserted as %2$s in  the text "No file may
+#. TRANS: be larger than %1$d byte and the file you sent was %2$s.".
+#. TRANS: %1$d is the number of bytes of an uploaded file.
+#, php-format
+msgid "%1$d byte"
+msgid_plural "%1$d bytes"
+msgstr[0] "%1$d byte"
+msgstr[1] "%1$d bytes"
+
 #. TRANS: Message given if an upload is larger than the configured maximum.
-#. TRANS: %1$d is the byte limit for uploads, %2$d is the byte count for the uploaded file.
-#. TRANS: %1$s is used for plural.
-#, fuzzy, php-format
+#. TRANS: %1$d (used for plural) is the byte limit for uploads,
+#. TRANS: %2$s is the proper form of "n bytes". This is the only ways to have
+#. TRANS: gettext support multiple plurals in the same message, unfortunately...
+#, php-format
 msgid ""
-"No file may be larger than %1$d byte and the file you sent was %2$d bytes. "
-"Try to upload a smaller version."
+"No file may be larger than %1$d byte and the file you sent was %2$s. Try to "
+"upload a smaller version."
 msgid_plural ""
-"No file may be larger than %1$d bytes and the file you sent was %2$d bytes. "
-"Try to upload a smaller version."
+"No file may be larger than %1$d bytes and the file you sent was %2$s. Try to "
+"upload a smaller version."
 msgstr[0] ""
-"Ningún archivopuede ser de tamaño mayor a %1$d bytes y el archivo que "
-"enviaste es de %2$d bytes. Trata de subir una versión más pequeña."
+"Ningún archivo puede ser de tamaño mayor a %1$d byte y el archivo que "
+"enviaste es de %2$s bytes. Trata de subir una versión más pequeña."
 msgstr[1] ""
-"Ningún archivopuede ser de tamaño mayor a %1$d bytes y el archivo que "
-"enviaste es de %2$d bytes. Trata de subir una versión más pequeña."
+"Ningún archivo puede ser de tamaño mayor a %1$d bytes y el archivo que "
+"enviaste es de %2$s bytes. Trata de subir una versión más pequeña."
 
 #. TRANS: Message given if an upload would exceed user quota.
 #. TRANS: %d (number) is the user quota in bytes and is used for plural.
-#, fuzzy, php-format
+#, php-format
 msgid "A file this large would exceed your user quota of %d byte."
 msgid_plural "A file this large would exceed your user quota of %d bytes."
 msgstr[0] ""
@@ -6879,7 +6332,7 @@ msgstr[1] ""
 
 #. TRANS: Message given id an upload would exceed a user's monthly quota.
 #. TRANS: $d (number) is the monthly user quota in bytes and is used for plural.
-#, fuzzy, php-format
+#, php-format
 msgid "A file this large would exceed your monthly quota of %d byte."
 msgid_plural "A file this large would exceed your monthly quota of %d bytes."
 msgstr[0] ""
@@ -6895,13 +6348,13 @@ msgstr "Nombre de archivo inválido."
 #. TRANS: %s is the invalid profile ID.
 #, php-format
 msgid "Profile ID %s is invalid."
-msgstr ""
+msgstr "ID del perfil %s no es válida."
 
 #. TRANS: Exception thrown providing an invalid group ID.
 #. TRANS: %s is the invalid group ID.
-#, fuzzy, php-format
+#, php-format
 msgid "Group ID %s is invalid."
-msgstr "Error al guardar el usuario; inválido."
+msgstr "ID de grupo  %s  no es válido."
 
 #. TRANS: Exception thrown when joining a group fails.
 msgid "Group join failed."
@@ -6923,7 +6376,7 @@ msgstr "Unirse"
 #. TRANS: %1$s is the member name, %2$s is the subscribed group's name.
 #, php-format
 msgid "%1$s has joined group %2$s."
-msgstr ""
+msgstr "%1$s se unió al grupo %2$s."
 
 #. TRANS: Server exception thrown when updating a local group fails.
 msgid "Could not update local group."
@@ -6935,6 +6388,11 @@ msgstr "No se pudo actualizar el grupo local."
 msgid "Could not create login token for %s"
 msgstr "No se pudo crear el token de acceso para %s"
 
+#. TRANS: Exception thrown when a program code class (%s) cannot be instantiated.
+#, php-format
+msgid "Cannot instantiate class %s."
+msgstr "No se puede crear una instancia de clase  %s ."
+
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.
 msgid "No database name or DSN found anywhere."
 msgstr "Ningún nombre de base de datos o DSN encontrado."
@@ -6958,7 +6416,7 @@ msgid "No such profile (%1$d) for notice (%2$d)."
 msgstr "No existe tal perfil (%1$d) para notificar (%2$d)."
 
 #. TRANS: Server exception. %s are the error details.
-#, fuzzy, php-format
+#, php-format
 msgid "Database error inserting hashtag: %s."
 msgstr "Error de la BD al insertar la etiqueta clave: %s"
 
@@ -6990,24 +6448,20 @@ msgid "You are banned from posting notices on this site."
 msgstr "Tienes prohibido publicar avisos en este sitio."
 
 #. TRANS: Client exception thrown in notice when trying to repeat a missing or deleted notice.
-#, fuzzy
 msgid "Cannot repeat; original notice is missing or deleted."
-msgstr "No puedes repetir tus propios mensajes"
+msgstr "No se puede repetir; aviso original está perdido o eliminado."
 
 #. TRANS: Client error displayed when trying to repeat an own notice.
-#, fuzzy
 msgid "You cannot repeat your own notice."
-msgstr "No puedes repetir tus propios mensajes."
+msgstr "No puedes repetir tus propios mensajes"
 
 #. TRANS: Client error displayed when trying to repeat a non-public notice.
-#, fuzzy
 msgid "Cannot repeat a private notice."
-msgstr "No puedes repetir tus propios mensajes"
+msgstr "No se puede repetir un anuncio privado."
 
 #. TRANS: Client error displayed when trying to repeat a notice you cannot access.
-#, fuzzy
 msgid "Cannot repeat a notice you cannot read."
-msgstr "No puedes repetir tus propios mensajes"
+msgstr "No se puede repetir un anuncio que no puede leer."
 
 #. TRANS: Client error displayed when trying to repeat an already repeated notice.
 msgid "You already repeated that notice."
@@ -7015,9 +6469,9 @@ msgstr "Ya has repetido este mensaje."
 
 #. TRANS: Client error displayed when trying to reply to a notice a the target has no access to.
 #. TRANS: %1$s is a user nickname, %2$d is a notice ID (number).
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s has no access to notice %2$d."
-msgstr "El/La usuario/a no tiene ningún último mensaje"
+msgstr "%1$s no tiene acceso al mensaje  %2$d ."
 
 #. TRANS: Server exception thrown when a notice cannot be saved.
 #. TRANS: Server exception thrown when a notice cannot be updated.
@@ -7025,9 +6479,8 @@ msgid "Problem saving notice."
 msgstr "Hubo un problema al guardar el mensaje."
 
 #. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#, fuzzy
 msgid "Bad type provided to saveKnownGroups."
-msgstr "Mal tipo proveído a saveKnownGroups"
+msgstr "Mal tipo a saveKnownGroups."
 
 #. TRANS: Server exception thrown when an update for a group inbox fails.
 msgid "Problem saving group inbox."
@@ -7041,7 +6494,7 @@ msgstr "RT @%1$s %2$s"
 
 #. TRANS: Full name of a profile or group (%1$s) followed by nickname (%2$s) in parentheses.
 #. TRANS: Full name of a profile or group followed by nickname in parens
-#, fuzzy, php-format
+#, php-format
 msgctxt "FANCYNAME"
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
@@ -7061,32 +6514,27 @@ msgstr ""
 
 #. TRANS: Server exception.
 msgid "The tag you are trying to rename to already exists."
-msgstr ""
+msgstr "La etiqueta que está tratando de renombrar ya existe."
 
 #. TRANS: Server exception saving new tag without having a tagger specified.
-#, fuzzy
 msgid "No tagger specified."
-msgstr "Grupo no especificado."
+msgstr "No se ha especificado una etiqueta."
 
 #. TRANS: Server exception saving new tag without having a tag specified.
-#, fuzzy
 msgid "No tag specified."
-msgstr "Grupo no especificado."
+msgstr "No se ha especificado una etiqueta."
 
 #. TRANS: Server exception saving new tag.
-#, fuzzy
 msgid "Could not create profile tag."
-msgstr "No se pudo guardar el perfil."
+msgstr "No se pudo crear la etiqueta de perfil."
 
 #. TRANS: Server exception saving new tag.
-#, fuzzy
 msgid "Could not set profile tag URI."
-msgstr "No se pudo guardar el perfil."
+msgstr "No se pudo establecer la etiqueta de perfil URI."
 
 #. TRANS: Server exception saving new tag.
-#, fuzzy
 msgid "Could not set profile tag mainpage."
-msgstr "No se pudo guardar el perfil."
+msgstr "No se pudo establecer la etiqueta de perfil principal."
 
 #. TRANS: Client exception thrown trying to set more tags than allowed.
 #, php-format
@@ -7094,23 +6542,25 @@ msgid ""
 "You already have created %d or more tags which is the maximum allowed number "
 "of tags. Try using or deleting some existing tags."
 msgstr ""
+"Ya ha creado  %d  o más etiquetas que el máximo permitido de etiquetas. "
+"Intente utilizar o eliminar algunas etiquetas existentes."
 
 #. TRANS: Client exception thrown when trying to add more people than allowed to a list.
 #, php-format
 msgid ""
 "You already have %1$d or more people in list %2$s, which is the maximum "
-"allowed number.Try unlisting others first."
+"allowed number. Try unlisting others first."
 msgstr ""
+"Ya tienes %1$d o más personas en la lista %2$s, que es el máximo permitido. "
+"Pruebe a eliminar algunos primero."
 
 #. TRANS: Exception thrown when inserting a list subscription in the database fails.
-#, fuzzy
 msgid "Adding list subscription failed."
-msgstr "No se pudo eliminar la suscripción."
+msgstr "Error al agregar la lista de suscripción."
 
 #. TRANS: Exception thrown when deleting a list subscription from the database fails.
-#, fuzzy
 msgid "Removing list subscription failed."
-msgstr "No se pudo eliminar la suscripción."
+msgstr "No se pudo quitar la suscripción de la lista."
 
 #. TRANS: Exception thrown when a right for a non-existing user profile is checked.
 msgid "Missing profile."
@@ -7121,7 +6571,6 @@ msgid "Unable to save tag."
 msgstr "Incapaz de grabar etiqueta."
 
 #. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
-#. TRANS: Error message displayed to a banned user when they try to subscribe.
 msgid "You have been banned from subscribing."
 msgstr "Se te ha prohibido la suscripción."
 
@@ -7134,33 +6583,27 @@ msgid "User has blocked you."
 msgstr "El usuario te ha bloqueado."
 
 #. TRANS: Exception thrown when trying to unsibscribe without a subscription.
-#, fuzzy
 msgid "Not subscribed!"
-msgstr "¡No estás suscrito!"
+msgstr "¡No suscrito!"
 
 #. TRANS: Exception thrown when trying to unsubscribe a user from themselves.
 msgid "Could not delete self-subscription."
 msgstr "No se pudo eliminar la auto-suscripción."
 
-#. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
-msgid "Could not delete subscription OMB token."
-msgstr "No se pudo eliminar la ficha OMB de suscripción."
-
 #. TRANS: Exception thrown when a subscription could not be deleted on the server.
 msgid "Could not delete subscription."
 msgstr "No se pudo eliminar la suscripción."
 
 #. TRANS: Activity title when subscribing to another person.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Follow"
-msgstr "Permitir"
+msgstr "Seguir"
 
 #. TRANS: Notification given when one person starts following another.
 #. TRANS: %1$s is the subscriber, %2$s is the subscribed.
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s is now following %2$s."
-msgstr "%1$s ahora está escuchando tus avisos en %2$s"
+msgstr "%1$s ahora sigue a  %2$s ."
 
 #. TRANS: Notice given on user registration.
 #. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
@@ -7170,7 +6613,7 @@ msgstr "Bienvenido a %1$s, @%2$s!"
 
 #. TRANS: Exception thrown when trying view "repeated to me".
 msgid "Not implemented since inbox change."
-msgstr ""
+msgstr "No implementado desde el cambio en la bandeja de entrada."
 
 #. TRANS: Server exception.
 msgid "No single user defined for single-user mode."
@@ -7178,7 +6621,19 @@ msgstr "Ningún usuario sólo definido para modo monousuario."
 
 #. TRANS: Server exception.
 msgid "Single-user mode code called when not enabled."
-msgstr ""
+msgstr "Modo de único cuando no esta activado."
+
+#. TRANS: Information on password recovery form if no known username or e-mail address was specified.
+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."
+
+#. TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.
+msgid "No registered email address for that user."
+msgstr "Ninguna dirección de correo electrónico registrada por este usuario."
+
+#. TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.
+msgid "Error saving address confirmation."
+msgstr "Error al guardar confirmación de la dirección."
 
 #. TRANS: Server exception thrown when creating a group failed.
 msgid "Could not create group."
@@ -7198,21 +6653,21 @@ msgstr "No se ha podido guardar la información del grupo local."
 
 #. TRANS: Exception thrown when an account could not be located when it should be moved.
 #. TRANS: %s is the remote site.
-#, fuzzy, php-format
+#, php-format
 msgid "Cannot locate account %s."
-msgstr "No puedes borrar usuarios."
+msgstr "No puede encontrar la cuenta  %s ."
 
 #. TRANS: Exception thrown when a service document could not be located account move.
 #. TRANS: %s is the remote site.
 #, php-format
 msgid "Cannot find XRD for %s."
-msgstr ""
+msgstr "No se puede encontrar XRD para  %s ."
 
 #. TRANS: Exception thrown when an account could not be located when it should be moved.
 #. TRANS: %s is the remote site.
 #, php-format
 msgid "No AtomPub API service for %s."
-msgstr ""
+msgstr "Ningún servicio de AtomPub API para  %s ."
 
 #. TRANS: H2 for user actions in a profile.
 #. TRANS: H2 for entity actions in a profile.
@@ -7224,23 +6679,19 @@ msgid "User deletion in progress..."
 msgstr "Eliminación de usuario en curso..."
 
 #. TRANS: Link title for link on user profile.
-#, fuzzy
 msgid "Edit profile settings."
-msgstr "Editar configuración del perfil"
+msgstr "Editar configuración del perfil."
 
 #. TRANS: Link text for link on user profile.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Edit"
 msgstr "Editar"
 
 #. TRANS: Link title for link on user profile.
-#, fuzzy
 msgid "Send a direct message to this user."
-msgstr "Enviar un mensaje directo a este usuario"
+msgstr "Enviar un mensaje directo a este usuario."
 
 #. TRANS: Link text for link on user profile.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Message"
 msgstr "Mensaje"
@@ -7285,10 +6736,9 @@ msgstr "Responder"
 #. TRANS: Placeholder text for inline reply form. Clicking in this box will turn it into a mini notice form.
 #. TRANS: Field label for reply mini form.
 msgid "Write a reply..."
-msgstr ""
+msgstr "Escribe una respuesta..."
 
 #. TRANS: Tab on the notice form.
-#, fuzzy
 msgctxt "TAB"
 msgid "Status"
 msgstr "Estado"
@@ -7368,34 +6818,31 @@ msgstr ""
 "XML entero."
 
 #. TRANS: Client exception thrown when using an unknown verb for the activity importer.
-#, fuzzy, php-format
+#, php-format
 msgid "Unknown verb: \"%s\"."
-msgstr "Idioma desconocido \"%s\"."
+msgstr "Verbo desconocido: \" %s \"."
 
 #. TRANS: Client exception thrown when trying to force a subscription for an untrusted user.
 msgid "Cannot force subscription for untrusted user."
-msgstr ""
+msgstr "No se puede forzar suscripción para usuario sin confianza."
 
 #. TRANS: Client exception thrown when trying to force a remote user to subscribe.
-#, fuzzy
 msgid "Cannot force remote user to subscribe."
-msgstr "Especificar el nombre del usuario al cual se quiere suscribir."
+msgstr "No puede obligar a un usuario remoto para suscribirse."
 
 #. TRANS: Client exception thrown when trying to subscribe to an unknown profile.
-#, fuzzy
 msgid "Unknown profile."
-msgstr "Tipo de archivo desconocido"
+msgstr "Perfil desconocido."
 
 #. TRANS: Client exception thrown when trying to import an event not related to the importing user.
 msgid "This activity seems unrelated to our user."
-msgstr ""
+msgstr "Esta actividad parece no relacionada con nuestro usuario."
 
 #. TRANS: Client exception thrown when trying to join a remote group that is not a group.
 msgid "Remote profile is not a group!"
-msgstr ""
+msgstr "Perfil remoto no es de un grupo!"
 
 #. TRANS: Client exception thrown when trying to join a group the importing user is already a member of.
-#, fuzzy
 msgid "User is already a member of this group."
 msgstr "Ya eres miembro de ese grupo"
 
@@ -7403,22 +6850,22 @@ msgstr "Ya eres miembro de ese grupo"
 #. TRANS: %1$s is the source URI of the notice, %2$s is the URI of the author.
 #, php-format
 msgid "Already know about notice %1$s and  it has a different author %2$s."
-msgstr ""
+msgstr "Ya saben sobre noticia  %1$s  y tiene un autor diferente  %2$s ."
 
 #. TRANS: Client exception thrown when trying to overwrite the author information for a non-trusted user during import.
 msgid "Not overwriting author info for non-trusted user."
-msgstr ""
+msgstr "No sobrescribir información de autor a usuarios sin confianza."
 
 #. TRANS: Client exception thrown when trying to import a notice without content.
 #. TRANS: %s is the notice URI.
-#, fuzzy, php-format
+#, php-format
 msgid "No content for notice %s."
-msgstr "Buscar en el contenido de mensajes"
+msgstr "Ningún contenido de notificación  %s ."
 
 #. TRANS: Exception thrown if a non-existing user is provided. %s is a user ID.
-#, fuzzy, php-format
+#, php-format
 msgid "No such user \"%s\"."
-msgstr "Este usuario no existe %s"
+msgstr "Ningún usuario \" %s \"."
 
 #. TRANS: Client exception thrown when post to collection fails with a 400 status.
 #. TRANS: %1$s is a URL, %2$s is the status, %s$s is the fail reason.
@@ -7459,32 +6906,15 @@ msgstr "showForm() no implementada."
 msgid "saveSettings() not implemented."
 msgstr "saveSettings() no implementada."
 
-#. TRANS: Client error message thrown if design settings could not be deleted in
-#. TRANS: the admin panel Design.
-msgid "Unable to delete design setting."
-msgstr "No se puede eliminar la configuración de diseño."
-
 #. TRANS: Header in administrator navigation panel.
-#. TRANS: Header in settings navigation panel.
-#, fuzzy
 msgctxt "HEADER"
 msgid "Home"
-msgstr "Página de inicio"
-
-#. TRANS: Menu item in administrator navigation panel.
-#. TRANS: Menu item in default local navigation panel.
-#. TRANS: Menu item in personal group navigation menu.
-#. TRANS: Menu item in settings navigation panel.
-#, fuzzy
-msgctxt "MENU"
-msgid "Home"
-msgstr "Página de inicio"
+msgstr "Inicio"
 
 #. TRANS: Header in administrator navigation panel.
-#, fuzzy
 msgctxt "HEADER"
 msgid "Admin"
-msgstr "Admin"
+msgstr "Administración"
 
 #. TRANS: Menu item title in administrator navigation panel.
 msgid "Basic site configuration"
@@ -7495,23 +6925,11 @@ msgctxt "MENU"
 msgid "Site"
 msgstr "Sitio"
 
-#. TRANS: Menu item title in administrator navigation panel.
-msgid "Design configuration"
-msgstr "Configuración del diseño"
-
-#. TRANS: Menu item in administrator navigation panel.
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: Menu item in settings navigation panel.
-msgctxt "MENU"
-msgid "Design"
-msgstr "Diseño"
-
 #. TRANS: Menu item title in administrator navigation panel.
 msgid "User configuration"
 msgstr "Configuración de usuario"
 
 #. TRANS: Menu item in administrator navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "User"
 msgstr "Usuario"
@@ -7521,7 +6939,6 @@ msgid "Access configuration"
 msgstr "Configuración de acceso"
 
 #. TRANS: Menu item in administrator navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Access"
 msgstr "Acceder"
@@ -7531,7 +6948,6 @@ msgid "Paths configuration"
 msgstr "Configuración de rutas"
 
 #. TRANS: Menu item in administrator navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Paths"
 msgstr "Rutas"
@@ -7541,7 +6957,6 @@ msgid "Sessions configuration"
 msgstr "Configuración de sesiones"
 
 #. TRANS: Menu item in administrator navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Sessions"
 msgstr "Sesiones"
@@ -7551,7 +6966,6 @@ msgid "Edit site notice"
 msgstr "Editar el mensaje del sitio"
 
 #. TRANS: Menu item in administrator navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Site notice"
 msgstr "Mensaje de sitio"
@@ -7561,17 +6975,15 @@ msgid "Snapshots configuration"
 msgstr "Configuración de instantáneas"
 
 #. TRANS: Menu item in administrator navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Snapshots"
 msgstr "Capturas"
 
 #. TRANS: Menu item title in administrator navigation panel.
 msgid "Set site license"
-msgstr ""
+msgstr "Definir licencia de sitio"
 
 #. TRANS: Menu item in administrator navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "License"
 msgstr "Licencia"
@@ -7581,10 +6993,9 @@ msgid "Plugins configuration"
 msgstr "Configuración de plugins"
 
 #. TRANS: Menu item in administrator navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Plugins"
-msgstr "Complementos"
+msgstr "Plugins"
 
 #. TRANS: Client error 401.
 msgid "API resource requires read-write access, but you only have read access."
@@ -7598,7 +7009,7 @@ msgstr "No hay ninguna aplicación para esa clave de consumidor."
 
 #. TRANS: Authorization exception thrown when a user without API access tries to access the API.
 msgid "Not allowed to use API."
-msgstr ""
+msgstr "No se te permite el uso de la API."
 
 #. TRANS: OAuth exception given when an incorrect access token was given for a user.
 msgid "Bad access token."
@@ -7613,42 +7024,6 @@ msgstr "No hay ningún usuario para ese token."
 msgid "Could not authenticate you."
 msgstr "No ha sido posible autenticarte."
 
-#. TRANS: Server error displayed when trying to create an anynymous OAuth consumer.
-msgid "Could not create anonymous consumer."
-msgstr "No fue posible crear usuario anónimo."
-
-#. TRANS: Server error displayed when trying to create an anynymous OAuth application.
-#, fuzzy
-msgid "Could not create anonymous OAuth application."
-msgstr "No se pudo crear la aplicación."
-
-#. TRANS: Exception thrown when no token association could be found.
-msgid ""
-"Could not find a profile and application associated with the request token."
-msgstr ""
-
-#. TRANS: Exception thrown when no access token can be issued.
-#, fuzzy
-msgid "Could not issue access token."
-msgstr "No se pudo insertar mensaje."
-
-#. TRANS: Exception thrown when a database error occurs.
-msgid "Database error inserting OAuth application user."
-msgstr "Error de base de datos al insertar usuario de la aplicación OAuth."
-
-#. TRANS: Exception thrown when a database error occurs.
-#, fuzzy
-msgid "Database error updating OAuth application user."
-msgstr "Error de base de datos al insertar usuario de la aplicación OAuth."
-
-#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
-msgid "Tried to revoke unknown token."
-msgstr "Se intentó revocar un token desconocido."
-
-#. TRANS: Exception thrown when an attempt is made to remove a revoked token.
-msgid "Failed to delete revoked token."
-msgstr "No se pudo eliminar el token revocado."
-
 #. TRANS: Form input field label for application icon.
 msgid "Icon"
 msgstr "Icono"
@@ -7663,7 +7038,7 @@ msgstr "Nombre"
 
 #. TRANS: Form input field instructions.
 #. TRANS: %d is the number of available characters for the description.
-#, fuzzy, php-format
+#, php-format
 msgid "Describe your application in %d character"
 msgid_plural "Describe your application in %d characters"
 msgstr[0] "Describe tu aplicación en %d caracteres"
@@ -7730,18 +7105,16 @@ msgstr ""
 "Acceso predeterminado para esta aplicación: sólo lectura o lectura-escritura"
 
 #. TRANS: Submit button title.
-msgid "Cancel"
-msgstr "Cancelar"
+msgid "Cancel application changes."
+msgstr "Cancelar cambios en las aplicaciones."
 
 #. TRANS: Submit button title.
-#. TRANS: Button text to save a list.
-msgid "Save"
-msgstr "Guardar"
+msgid "Save application changes."
+msgstr "Guardar cambios en las aplicaciones."
 
 #. TRANS: Name for an anonymous application in application list.
-#, fuzzy
 msgid "Unknown application"
-msgstr "Acción desconocida"
+msgstr "Aplicación desconocida"
 
 #. TRANS: Message has a leading space and a trailing space. Used in application list.
 #. TRANS: Before this message the application name is put, behind it the organisation that manages it.
@@ -7765,32 +7138,43 @@ msgstr "Aprobado el %1$s - acceso \"%2$s\"."
 #. TRANS: %s are the first 7 characters of the access token.
 #, php-format
 msgid "Access token starting with: %s"
-msgstr ""
+msgstr "Comenzando con el token de acceso:%s"
 
 #. TRANS: Button label in application list to revoke access to user data.
 msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "Revocar"
 
+#. TRANS: Submit button text to accept a group membership request on approve group form.
+#. TRANS: Submit button text to accept a subscription request on approve sub form.
+msgctxt "BUTTON"
+msgid "Accept"
+msgstr "Aceptar"
+
+#. TRANS: Submit button text to reject a group membership request on approve group form.
+#. TRANS: Submit button text to reject a subscription request on approve sub form.
+msgctxt "BUTTON"
+msgid "Reject"
+msgstr "Rechazar"
+
 #. TRANS: Atom feed exception thrown when an author element does not contain a name element.
 msgid "Author element must contain a name element."
-msgstr ""
+msgstr "Elemento de Autor debe contener un nombre."
 
 #. TRANS: Server exception thrown when using the method setActivitySubject() in the class Atom10Feed.
-#, fuzzy
 msgid "Do not use this method!"
-msgstr "No eliminar este mensaje"
+msgstr "No utilice este método!"
 
 #. TRANS: Title in atom list notice feed. %1$s is a list name, %2$s is a tagger's nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "Timeline for people in list %1$s by %2$s"
-msgstr "Respuestas a %1$s en %2$s!"
+msgstr "Línea de tiempo para la gente en la lista  %1$s  por %2$s"
 
 #. TRANS: Message is used as a subtitle in atom list notice feed.
 #. TRANS: %1$s is a tagger's nickname, %2$s is a list name, %3$s is a site name.
-#, fuzzy, php-format
+#, php-format
 msgid "Updates from %1$s's list %2$s on %3$s!"
-msgstr "¡Actualizaciones de %1$s en %2$s!"
+msgstr "Actualizaciones de  %1$s de la lista  %2$s  en  %3$s !"
 
 #. TRANS: Title.
 msgid "Notices where this attachment appears"
@@ -7801,9 +7185,8 @@ msgid "Tags for this attachment"
 msgstr "Etiquetas de este archivo adjunto"
 
 #. TRANS: Exception thrown when a password change fails.
-#, fuzzy
 msgid "Password changing failed."
-msgstr "El cambio de contraseña ha fallado"
+msgstr "Error al cambiar la contraseña."
 
 #. TRANS: Exception thrown when a password change attempt fails because it is not allowed.
 msgid "Password changing is not allowed."
@@ -7820,22 +7203,20 @@ msgstr "Bloquear este usuario."
 #. TRANS: Submit button text on form to cancel group join request.
 msgctxt "BUTTON"
 msgid "Cancel join request"
-msgstr ""
+msgstr "Cancelar petición de unirse"
 
 #. TRANS: Button text for form action to cancel a subscription request.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Cancel subscription request"
-msgstr "Todas las suscripciones"
+msgstr "Cancelación de solicitud de suscripción"
 
 #. TRANS: Title for command results.
 msgid "Command results"
 msgstr "Resultados de comando"
 
 #. TRANS: Title for command results.
-#, fuzzy
 msgid "AJAX error"
-msgstr "Error de Ajax"
+msgstr "Error de AJAX"
 
 #. TRANS: E-mail subject when a command has completed.
 #. TRANS: E-mail subject for reply to an e-mail command.
@@ -7897,9 +7278,8 @@ msgstr ""
 "Avisos: %3$s"
 
 #. TRANS: Error message text shown when a favorite could not be set because it has already been favorited.
-#, fuzzy
 msgid "Could not create favorite: Already favorited."
-msgstr "No se pudo crear favorito."
+msgstr "No se pudo crear favoritos: ya existe."
 
 #. TRANS: Text shown when a notice has been marked as favourite successfully.
 msgid "Notice marked as fave."
@@ -7921,16 +7301,16 @@ msgstr "%1$s dejo el grupo %2$s."
 #. TRANS: %1$s is the tagged user, %2$s is the error message (no punctuation).
 #, php-format
 msgid "Error tagging %1$s: %2$s"
-msgstr ""
+msgstr "Error etiquetando %1$s: %2$s"
 
 #. TRANS: Succes message displayed if tagging a user succeeds.
 #. TRANS: %1$s is the tagged user's nickname, %2$s is a list of tags.
 #. TRANS: Plural is decided based on the number of tags added (not part of message).
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s was tagged %2$s"
 msgid_plural "%1$s was tagged %2$s"
-msgstr[0] "%1$s - %2$s"
-msgstr[1] "%1$s - %2$s"
+msgstr[0] "%1$s fue etiquetado %2$s"
+msgstr[1] "%1$sfue etiquetado %2$s"
 
 #. TRANS: Separator for list of tags.
 #. TRANS: Separator in list of user names like "Jim, Bob, Mary".
@@ -7947,7 +7327,7 @@ msgstr "Etiqueta inválida: \"% s\""
 #. TRANS: %1$s is the untagged user, %2$s is the error message (no punctuation).
 #, php-format
 msgid "Error untagging %1$s: %2$s"
-msgstr ""
+msgstr "Error etiquetando %1$s: %2$s"
 
 #. TRANS: Succes message displayed if untagging a user succeeds.
 #. TRANS: %1$s is the untagged user's nickname, %2$s is a list of tags.
@@ -7955,12 +7335,12 @@ msgstr ""
 #, php-format
 msgid "The following tag was removed from user %1$s: %2$s."
 msgid_plural "The following tags were removed from user %1$s: %2$s."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Se eliminó la siguiente etiqueta de usuario %1$s : %2$s."
+msgstr[1] "Se quitaron las siguientes etiquetas de usuario %1$s : %2$s ."
 
 #. TRANS: Whois output.
 #. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#, fuzzy, php-format
+#, php-format
 msgctxt "WHOIS"
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
@@ -8003,7 +7383,7 @@ msgstr ""
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
 #. TRANS: Message given when a status is too long. %1$s is the maximum number of characters,
 #. TRANS: %2$s is the number of characters sent (used for plural).
-#, fuzzy, php-format
+#, php-format
 msgid "Message too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Message too long - maximum is %1$d characters, you sent %2$d."
 msgstr[0] "Mensaje muy largo - máximo %1$d caracteres, enviaste %2$d"
@@ -8025,13 +7405,13 @@ msgstr "Se ha repetido el mensaje de %s."
 
 #. TRANS: Message given if content of a notice for a reply is too long. %1$d is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#, fuzzy, php-format
+#, php-format
 msgid "Notice too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Notice too long - maximum is %1$d characters, you sent %2$d."
 msgstr[0] ""
-"Mensaje demasiado largo - el máximo es de 140 caracteres, enviaste %d."
+"Mensaje demasiado largo - el máximo es de %1$d caracteres, enviaste %2$d."
 msgstr[1] ""
-"Mensaje demasiado largo - el máximo es de 140 caracteres, enviaste %d."
+"Mensaje demasiado largo - el máximo es de %1$d caracteres, enviaste %2$d."
 
 #. TRANS: Text shown having sent a reply to a notice successfully.
 #. TRANS: %s is the nickname of the user of the notice the reply was sent to.
@@ -8146,164 +7526,150 @@ msgstr[0] "Eres miembro de este grupo:"
 msgstr[1] "Eres miembro de estos grupos:"
 
 #. TRANS: Header line of help text for commands.
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "Commands:"
-msgstr "Resultados de comando"
+msgstr "Comandos:"
 
 #. TRANS: Help message for IM/SMS command "on".
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "turn on notifications"
-msgstr "No se puede activar notificación."
+msgstr "Activar notificaciones"
 
 #. TRANS: Help message for IM/SMS command "off".
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "turn off notifications"
-msgstr "No se puede desactivar notificación."
+msgstr "Desactivar notificaciones"
 
 #. TRANS: Help message for IM/SMS command "help".
 msgctxt "COMMANDHELP"
 msgid "show this help"
-msgstr ""
+msgstr "Muestra esta ayuda"
 
 #. TRANS: Help message for IM/SMS command "follow <nickname>".
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "subscribe to user"
-msgstr "Suscribirse a este usuario"
+msgstr "Suscribirse a usuario"
 
 #. TRANS: Help message for IM/SMS command "groups".
 msgctxt "COMMANDHELP"
 msgid "lists the groups you have joined"
-msgstr ""
+msgstr "Lista de grupos a los que te has agregado"
 
 #. TRANS: Help message for IM/SMS command "tag".
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "tag a user"
-msgstr "Etiquetar usuario"
+msgstr "etiqueta a un usuario"
 
 #. TRANS: Help message for IM/SMS command "untag".
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "untag a user"
-msgstr "Etiquetar usuario"
+msgstr "quitar etiqueta a un usuario"
 
 #. TRANS: Help message for IM/SMS command "subscriptions".
 msgctxt "COMMANDHELP"
 msgid "list the people you follow"
-msgstr ""
+msgstr "lista de las personas que sigues"
 
 #. TRANS: Help message for IM/SMS command "subscribers".
 msgctxt "COMMANDHELP"
 msgid "list the people that follow you"
-msgstr ""
+msgstr "lista de las personas que te siguen"
 
 #. TRANS: Help message for IM/SMS command "leave <nickname>".
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "unsubscribe from user"
 msgstr "Desuscribirse de este usuario"
 
 #. TRANS: Help message for IM/SMS command "d <nickname> <text>".
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "direct message to user"
-msgstr "Mensajes directos a %s"
+msgstr "mensaje directo al usuario"
 
 #. TRANS: Help message for IM/SMS command "get <nickname>".
 msgctxt "COMMANDHELP"
 msgid "get last notice from user"
-msgstr ""
+msgstr "obtener el último aviso de usuario"
 
 #. TRANS: Help message for IM/SMS command "whois <nickname>".
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "get profile info on user"
-msgstr "Información del perfil"
+msgstr "obtener información del perfil de usuario"
 
 #. TRANS: Help message for IM/SMS command "lose <nickname>".
 msgctxt "COMMANDHELP"
 msgid "force user to stop following you"
-msgstr ""
+msgstr "Forzar a un usuario a que pare de seguirte"
 
 #. TRANS: Help message for IM/SMS command "fav <nickname>".
 msgctxt "COMMANDHELP"
 msgid "add user's last notice as a 'fave'"
-msgstr ""
+msgstr "Añadir la última noticia del usuario como favorito"
 
 #. TRANS: Help message for IM/SMS command "fav #<notice_id>".
 msgctxt "COMMANDHELP"
 msgid "add notice with the given id as a 'fave'"
-msgstr ""
+msgstr "Añadir mensaje como favorito"
 
 #. TRANS: Help message for IM/SMS command "repeat #<notice_id>".
 msgctxt "COMMANDHELP"
 msgid "repeat a notice with a given id"
-msgstr ""
+msgstr "Repetir mensaje con la id dada"
 
 #. TRANS: Help message for IM/SMS command "repeat <nickname>".
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "repeat the last notice from user"
-msgstr "Repetir este mensaje."
+msgstr "repetir el último mensaje del usuario"
 
 #. TRANS: Help message for IM/SMS command "reply #<notice_id>".
 msgctxt "COMMANDHELP"
 msgid "reply to notice with a given id"
-msgstr ""
+msgstr "reponder al mensaje con la id dada"
 
 #. TRANS: Help message for IM/SMS command "reply <nickname>".
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "reply to the last notice from user"
-msgstr "Responder a este mensaje."
+msgstr "repetir el último mensaje del usuario"
 
 #. TRANS: Help message for IM/SMS command "join <group>".
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "join group"
-msgstr "Desconocido"
+msgstr "Agregar al grupo"
 
 #. TRANS: Help message for IM/SMS command "login".
 msgctxt "COMMANDHELP"
 msgid "Get a link to login to the web interface"
-msgstr ""
+msgstr "Obtener un enlace para acceder a la interfaz web"
 
 #. TRANS: Help message for IM/SMS command "drop <group>".
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "leave group"
-msgstr "Borrar grupo"
+msgstr "dejar el grupo"
 
 #. TRANS: Help message for IM/SMS command "stats".
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "get your stats"
-msgstr "Actualiza tu estado."
+msgstr "obtener sus estadísticas"
 
 #. TRANS: Help message for IM/SMS command "stop".
 #. TRANS: Help message for IM/SMS command "quit".
 msgctxt "COMMANDHELP"
 msgid "same as 'off'"
-msgstr ""
+msgstr "igual que 'apagar'"
 
 #. TRANS: Help message for IM/SMS command "sub <nickname>".
 msgctxt "COMMANDHELP"
 msgid "same as 'follow'"
-msgstr ""
+msgstr "igual que 'seguir'"
 
 #. TRANS: Help message for IM/SMS command "unsub <nickname>".
 msgctxt "COMMANDHELP"
 msgid "same as 'leave'"
-msgstr ""
+msgstr "igual que 'abandonar'"
 
 #. TRANS: Help message for IM/SMS command "last <nickname>".
 msgctxt "COMMANDHELP"
 msgid "same as 'get'"
-msgstr ""
+msgstr "igual que 'coger'"
 
 #. TRANS: Help message for IM/SMS command "on <nickname>".
 #. TRANS: Help message for IM/SMS command "off <nickname>".
@@ -8314,26 +7680,24 @@ msgstr ""
 #. TRANS: Help message for IM/SMS command "untrack all".
 #. TRANS: Help message for IM/SMS command "tracks".
 #. TRANS: Help message for IM/SMS command "tracking".
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "not yet implemented."
-msgstr "Todavía no se implementa comando."
+msgstr "aún no se ha implementado."
 
 #. TRANS: Help message for IM/SMS command "nudge <nickname>".
 msgctxt "COMMANDHELP"
 msgid "remind a user to update."
-msgstr ""
+msgstr "recordar a un usuario para actualizar."
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#, fuzzy
 msgid "No configuration file found."
-msgstr "Ningún archivo de configuración encontrado. "
+msgstr "No se encuentra en el archivo de configuración."
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: Is followed by a list of directories (separated by HTML breaks).
-#, fuzzy
 msgid "I looked for configuration files in the following places:"
-msgstr "He buscado archivos de configuración en los siguientes lugares: "
+msgstr ""
+"Me puse a buscar los archivos de configuración en los siguientes lugares:"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 msgid "You may wish to run the installer to fix this."
@@ -8344,31 +7708,26 @@ msgstr "Quizá desees ejecutar el instalador para solucionar este problema."
 msgid "Go to the installer."
 msgstr "Ir al instalador."
 
+#. TRANS: Header on conversation page. Hidden by default (h2).
+#. TRANS: Label for user statistics.
+msgid "Notices"
+msgstr "Mensajes"
+
 #. TRANS: Page title for when a database error occurs.
 msgid "Database error"
 msgstr "Error de la base de datos"
 
 #. TRANS: Menu item in default local navigation panel.
 #. TRANS: Menu item in search group navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Public"
 msgstr "Público"
 
-#. TRANS: Menu item in default local navigation panel.
-#. TRANS: Menu item in search group navigation panel.
-#. TRANS: Menu item in local navigation menu.
-#, fuzzy
-msgctxt "MENU"
-msgid "Groups"
-msgstr "Grupos"
-
 #. TRANS: Menu item in default local navigation panel.
 #. TRANS: Menu item title in local navigation menu.
-#, fuzzy
 msgctxt "MENU"
 msgid "Lists"
-msgstr "Límites"
+msgstr "Listas"
 
 #. TRANS: Title of form for deleting a user.
 #. TRANS: Link text in notice list item to delete a notice.
@@ -8379,71 +7738,36 @@ msgstr "Borrar"
 msgid "Delete this user"
 msgstr "Borrar este usuario"
 
-#. TRANS: Form legend of form for changing the page design.
-#, fuzzy
-msgid "Change design"
-msgstr "Guardar el diseño"
-
-#. TRANS: Fieldset legend on profile design page to change profile page colours.
-msgid "Change colours"
-msgstr "Cambiar colores"
-
-#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-msgid "Use defaults"
-msgstr "Utilizar los valores predeterminados"
-
-#. TRANS: Label in form on profile design page.
-#. TRANS: Field contains file name on user's computer that could be that user's custom profile background image.
-msgid "Upload file"
-msgstr "Subir archivo"
-
-#. TRANS: Instructions for form on profile design page.
-msgid ""
-"You can upload your personal background image. The maximum file size is 2MB."
-msgstr ""
-"Puedes subir tu imagen de fondo personal. El tamaño de archivo máximo "
-"permitido es 2 MB."
-
-#. TRANS: Radio button on profile design page that will enable use of the uploaded profile image.
-msgctxt "RADIO"
-msgid "On"
-msgstr "Activar"
-
-#. TRANS: Radio button on profile design page that will disable use of the uploaded profile image.
-msgctxt "RADIO"
-msgid "Off"
-msgstr "Desactivar"
-
-#. TRANS: Success message displayed if design settings were saved after clicking "Use defaults".
-msgid "Design defaults restored."
-msgstr "Diseño predeterminado restaurado."
-
 #. TRANS: Exception. %s is an ID.
-#, fuzzy, php-format
+#, php-format
 msgid "Unable to find services for %s."
-msgstr "No se puede revocar el acceso para la aplicación: %s."
+msgstr "No se ha podido encontrar servicios para  %s ."
 
 #. TRANS: Form legend for removing the favourite status for a favourite notice.
-#. TRANS: Title for button text for removing the favourite status for a favourite notice.
 msgid "Disfavor this notice"
 msgstr "Excluir este mensaje de mis favoritos"
 
 #. TRANS: Button text for removing the favourite status for a favourite notice.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Disfavor favorite"
-msgstr "Sacar favorito"
+msgstr "Eliminar favorito."
+
+#. TRANS: Button title for removing the favourite status for a favourite notice.
+msgid "Remove this notice from your list of favorite notices."
+msgstr "Eliminar este mensaje de la lista de mensajes Favoritos."
 
 #. TRANS: Form legend for adding the favourite status to a notice.
-#. TRANS: Title for button text for adding the favourite status to a notice.
 msgid "Favor this notice"
 msgstr "Incluir este mensaje en tus favoritos"
 
 #. TRANS: Button text for adding the favourite status to a notice.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Favor"
-msgstr "Aceptar"
+msgstr "Favorito"
+
+#. TRANS: Button title for adding the favourite status to a notice.
+msgid "Add this notice to your list of favorite notices."
+msgstr "Añadir este mensaje a tu lista de mensajes Favoritos."
 
 #. TRANS: Feed type name.
 msgid "RSS 1.0"
@@ -8461,31 +7785,33 @@ msgstr "Atom"
 msgid "FOAF"
 msgstr "Amistad de amistad"
 
+#. TRANS: Feed type name. See http://activitystrea.ms/
+msgid "Activity Streams"
+msgstr "Flujos de actividad"
+
 #. TRANS: Client exception thrown when an imported feed does not have an author.
 msgid "No author in the feed."
-msgstr ""
+msgstr "Ningún autor en la fuente."
 
 #. TRANS: Client exception thrown when an imported feed does not have an author that
 #. TRANS: can be associated with a user.
 msgid "Cannot import without a user."
-msgstr ""
+msgstr "No se puede importar sin un usuario."
 
 #. TRANS: Header for feed links (h2).
 msgid "Feeds"
 msgstr "Feeds"
 
 #. TRANS: List element on gallery action page to show all tags.
-#, fuzzy
 msgctxt "TAGS"
 msgid "All"
-msgstr "Todo"
+msgstr "Todos"
 
 #. TRANS: Dropdown field label on gallery action page for a list containing tags.
 msgid "Tag"
 msgstr "Etiqueta"
 
 #. TRANS: Dropdown field title on gallery action page for a list containing tags.
-#, fuzzy
 msgid "Choose a tag to narrow list."
 msgstr "Elegir una etiqueta para reducir la lista"
 
@@ -8494,6 +7820,27 @@ msgstr "Elegir una etiqueta para reducir la lista"
 msgid "Grant this user the \"%s\" role"
 msgstr "Otorgar al usuario el papel de \"%$\""
 
+#. TRANS: Header for mini list of group members on a group page (h2).
+msgid "Members"
+msgstr "Miembros"
+
+#. TRANS: Link to all group members from mini list of group members if group has more than n members.
+msgid "All members"
+msgstr "Todos los miembros"
+
+#. TRANS: Header for mini list of users with a pending membership request on a group page (h2).
+msgid "Pending"
+msgstr "Pendiente"
+
+#. TRANS: Header for mini list of users that are blocked in a group page (h2).
+msgid "Blocked"
+msgstr "Bloqueado"
+
+#. TRANS: Title for list of group administrators on a group page.
+msgctxt "TITLE"
+msgid "Admins"
+msgstr "Administradores"
+
 #. TRANS: Button text for the form that will block a user from a group.
 msgctxt "BUTTON"
 msgid "Block"
@@ -8501,34 +7848,30 @@ msgstr "Bloquear"
 
 #. TRANS: Submit button title.
 msgctxt "TOOLTIP"
-msgid "Block this user"
-msgstr "Bloquear a este usuario"
+msgid "Block this user so that they can no longer post messages to it."
+msgstr "Bloquear a este usuario de modo que ya no pueden enviar mensajes."
 
 #. TRANS: Field title on group edit form.
-#, fuzzy
 msgid "URL of the homepage or blog of the group or topic."
-msgstr "URL de página de inicio o blog del grupo o tema"
+msgstr "URL de la página o el blog del grupo o tema."
 
 #. TRANS: Text area title for group description when there is no text limit.
-#, fuzzy
 msgid "Describe the group or topic."
-msgstr "Describir al grupo o tema"
+msgstr "Describir el grupo o tema."
 
 #. TRANS: Text area title for group description.
 #. TRANS: %d is the number of characters available for the description.
-#, fuzzy, php-format
+#, php-format
 msgid "Describe the group or topic in %d character or less."
 msgid_plural "Describe the group or topic in %d characters or less."
-msgstr[0] "Describir al grupo o tema en %d caracteres"
-msgstr[1] "Describir al grupo o tema en %d caracteres"
+msgstr[0] "Describir el grupo o el tema en %d caracteres o menos."
+msgstr[1] "Describir el grupo o el tema en %d caracteres o menos."
 
 #. TRANS: Field title on group edit form.
-#, fuzzy
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\"."
 msgstr ""
-"Ubicación del grupo, si existe, por ejemplo \"Ciudad, Estado (o Región), País"
-"\""
+"Ubicación del grupo, si alguno, como \"ciudad, Estado o región, país\"."
 
 #. TRANS: Field label on group edit form.
 msgid "Aliases"
@@ -8536,7 +7879,7 @@ msgstr "Alias"
 
 #. TRANS: Input field title for group aliases.
 #. TRANS: %d is the maximum number of group aliases available.
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
 "alias allowed."
@@ -8544,78 +7887,27 @@ msgid_plural ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
 "aliases allowed."
 msgstr[0] ""
-"Nombres adicionales para el grupo, separados por comas o espacios. Máximo: %d"
+"Extra nicknames for the group, separated with commas or spaces. Maximum %d "
+"alias allowed."
 msgstr[1] ""
-"Nombres adicionales para el grupo, separados por comas o espacios. Máximo: %d"
+"Extra nicknames for the group, separated with commas or spaces. Maximum %d "
+"aliases allowed."
 
 #. TRANS: Checkbox field title on group edit form to mark a group private.
 msgid ""
 "New members must be approved by admin and all posts are forced to be private."
 msgstr ""
+"Nuevos miembros deben ser aprobados por el administrador y todos los "
+"mensajes serán obligados a ser privados."
 
 #. TRANS: Indicator in group members list that this user is a group administrator.
-#, fuzzy
 msgctxt "GROUPADMIN"
 msgid "Admin"
-msgstr "Admin"
+msgstr "Administrador"
 
-#. TRANS: Menu item in the group navigation page.
-msgctxt "MENU"
-msgid "Group"
-msgstr "Grupo"
-
-#. TRANS: Tooltip for menu item in the group navigation page.
-#. TRANS: %s is the nickname of the group.
-#, php-format
-msgctxt "TOOLTIP"
-msgid "%s group"
-msgstr "Grupo %s"
-
-#. TRANS: Menu item in the group navigation page.
-msgctxt "MENU"
-msgid "Members"
-msgstr "Miembros"
-
-#. TRANS: Tooltip for menu item in the group navigation page.
-#. TRANS: %s is the nickname of the group.
-#, php-format
-msgctxt "TOOLTIP"
-msgid "%s group members"
-msgstr "Miembros del grupo %s"
-
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: %d is the number of pending members.
-#, php-format
-msgctxt "MENU"
-msgid "Pending members (%d)"
-msgid_plural "Pending members (%d)"
-msgstr[0] ""
-msgstr[1] ""
-
-#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: %s is the nickname of the group.
-#, fuzzy, php-format
-msgctxt "TOOLTIP"
-msgid "%s pending members"
-msgstr "Miembros del grupo %s"
-
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-msgctxt "MENU"
-msgid "Blocked"
-msgstr "Bloqueado"
-
-#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: %s is the nickname of the group.
-#, php-format
-msgctxt "TOOLTIP"
-msgid "%s blocked users"
-msgstr "%s usuarios bloqueados"
-
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: Menu item in primary navigation panel.
-msgctxt "MENU"
-msgid "Admin"
-msgstr "Admin"
+#. TRANS: Group actions header (h2). Text hidden by default.
+msgid "Group actions"
+msgstr "Acciones del grupo"
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
@@ -8624,11 +7916,6 @@ msgctxt "TOOLTIP"
 msgid "Edit %s group properties"
 msgstr "Editar las propiedades del grupo %s"
 
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-msgctxt "MENU"
-msgid "Logo"
-msgstr "Logo"
-
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
 #, php-format
@@ -8636,32 +7923,32 @@ msgctxt "TOOLTIP"
 msgid "Add or edit %s logo"
 msgstr "Añadir o modificar el logo %s"
 
-#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: %s is the nickname of the group.
-#, php-format
-msgctxt "TOOLTIP"
-msgid "Add or edit %s design"
-msgstr "Añadir o modificar el diseño %s"
-
-#. TRANS: Group actions header (h2). Text hidden by default.
-msgid "Group actions"
-msgstr "Acciones del grupo"
+#. TRANS: Link text for link on user profile.
+msgctxt "MENU"
+msgid "Logo"
+msgstr "Logo"
 
 #. TRANS: Title for groups with the most members section.
-#, fuzzy
 msgid "Popular groups"
-msgstr "Mensajes populares"
+msgstr "Grupos populares"
 
 #. TRANS: Title for groups with the most posts section.
-#, fuzzy
 msgid "Active groups"
-msgstr "Todos los grupos"
+msgstr "Grupos activos"
 
-#. TRANS: Title for group tag cloud section.
-#. TRANS: %s is a group name.
-#, php-format
-msgid "Tags in %s group's notices"
-msgstr "Etiquetas en mensajes del grupo %s"
+#. TRANS: Link description for seeing all groups.
+#. TRANS: Link description for seeing all lists.
+msgid "See all"
+msgstr "Ver todos"
+
+#. TRANS: Link title for seeing all groups.
+msgid "See all groups you belong to."
+msgstr "Ver todos los grupos que pertenece."
+
+#. TRANS: Menu item title in personal group navigation menu.
+#. TRANS: %s is a username.
+msgid "Back to top"
+msgstr "Volver al principio"
 
 #. TRANS: Client exception 406
 msgid "This page is not available in a media type you accept"
@@ -8695,25 +7982,25 @@ msgid "Unknown file type"
 msgstr "Tipo de archivo desconocido"
 
 #. TRANS: Number of megabytes. %d is the number.
-#, fuzzy, php-format
+#, php-format
 msgid "%dMB"
 msgid_plural "%dMB"
-msgstr[0] "MB"
-msgstr[1] "MB"
+msgstr[0] "%dMB"
+msgstr[1] "%dMB"
 
 #. TRANS: Number of kilobytes. %d is the number.
-#, fuzzy, php-format
+#, php-format
 msgid "%dkB"
 msgid_plural "%dkB"
-msgstr[0] "kB"
-msgstr[1] "kB"
+msgstr[0] "%dkB"
+msgstr[1] "%dkB"
 
 #. TRANS: Number of bytes. %d is the number.
 #, php-format
 msgid "%dB"
 msgid_plural "%dB"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%dB"
+msgstr[1] "%dB"
 
 #. TRANS: Body text for confirmation code e-mail.
 #. TRANS: %1$s is a user nickname, %2$s is the StatusNet sitename,
@@ -8726,6 +8013,11 @@ msgid ""
 "user is not you, or if you did not request this confirmation, just ignore "
 "this message."
 msgstr ""
+"Usuario \" %1$s \" en  %2$s  ha dicho que su  %3$s  nombre de usuario le "
+"pertenece. Si eso es cierto, puede confirmar haciendo clic en esta URL:  %4"
+"$s  . (Si se puede pulsar en él, copiar y pegar en la barra de direcciones "
+"del navegador). Si el usuario no es usted, o si no pides esta confirmación, "
+"simplemente ignore este mensaje."
 
 #. TRANS: Exception thrown when trying to deliver a notice to an unknown inbox.
 #. TRANS: %d is the unknown inbox ID (number).
@@ -8735,35 +8027,66 @@ msgstr "Origen de bandeja de entrada %d desconocido."
 
 #. TRANS: Server exception thrown trying to initialise an IM plugin without meeting all prerequisites.
 msgid "Queueing must be enabled to use IM plugins."
-msgstr ""
+msgstr "Cola debe estar habilitado para usar plugins IM."
 
 #. TRANS: Server exception thrown trying to initialise an IM plugin without a transport method.
 msgid "Transport cannot be null."
-msgstr ""
+msgstr "Transporte no puede ser nulo."
 
 #. TRANS: Title for inbox tag cloud section.
 msgctxt "TITLE"
 msgid "Trends"
-msgstr ""
+msgstr "Tendencias"
 
-#. TRANS: Button text for inviting more users to the StatusNet instance.
-#, fuzzy
+#. TRANS: Default button text for inviting more users to the StatusNet instance.
 msgctxt "BUTTON"
 msgid "Invite more colleagues"
-msgstr "Invitar nuevos usuarios:"
+msgstr "Invitar a más amigos"
+
+#. TRANS: Form legend.
+msgid "Invite collegues"
+msgstr "Invitar a amigos"
+
+#. TRANS: Field label for a list of e-mail addresses.
+msgid "Email addresses"
+msgstr "Direcciones de correo electrónico"
+
+#. TRANS: Field title for a list of e-mail addresses.
+msgid "Addresses of friends to invite (one per line)."
+msgstr "Direcciones de amigos invitar (uno por línea)."
+
+#. TRANS: Field label for a personal message to send to invitees.
+msgid "Personal message"
+msgstr "Mensaje Personal"
+
+#. TRANS: Field title for a personal message to send to invitees.
+msgid "Optionally add a personal message to the invitation."
+msgstr "Opcionalmente añada un mensaje personalizado a su invitación."
+
+#. TRANS: Send button for inviting friends
+#. TRANS: Button text for sending notice.
+msgctxt "BUTTON"
+msgid "Send"
+msgstr "Enviar"
+
+#. TRANS: Submit button title.
+msgid "Send invitations."
+msgstr "Enviar invitaciones."
 
 #. TRANS: Button text for joining a group.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Join"
 msgstr "Unirse"
 
 #. TRANS: Button text on form to leave a group.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Leave"
 msgstr "Abandonar"
 
+#. TRANS: Link title for seeing all lists.
+msgid "See all lists you have created."
+msgstr "Ver todas las listas que ha creado."
+
 #. TRANS: Menu item for logging in to the StatusNet site.
 #. TRANS: Menu item in primary navigation panel.
 msgctxt "MENU"
@@ -8824,14 +8147,14 @@ msgstr ""
 #. TRANS: Main body of new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscriber's long name, %2$s is the StatusNet sitename.
 #, 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"
+msgid "%1$s is now following you on %2$s."
+msgstr "%1$s le sigue ahora  %2$s ."
 
 #. TRANS: Subject of pending new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscribing user's nickname, %2$s is the StatusNet sitename.
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s would like to listen to your notices on %2$s."
-msgstr "%1$s ahora está escuchando tus avisos en %2$s"
+msgstr "%1$s le gustaría ver tus mensajes en  %2$s ."
 
 #. TRANS: Main body of pending new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscriber's long name, %2$s is the StatusNet sitename.
@@ -8840,11 +8163,13 @@ msgid ""
 "%1$s would like to listen to your notices on %2$s. You may approve or reject "
 "their subscription at %3$s"
 msgstr ""
+"%1$s le gustaría ver tus mensajes en  %2$s . Puede aprobar o rechazar su "
+"suscripción en %3$s"
 
 #. TRANS: Common footer block for StatusNet notification emails.
 #. TRANS: %1$s is the StatusNet sitename,
 #. TRANS: %2$s is a link to the addressed user's e-mail settings.
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "Faithfully yours,\n"
 "%1$s.\n"
@@ -8852,24 +8177,17 @@ msgid ""
 "----\n"
 "Change your email address or notification options at %2$s"
 msgstr ""
-"%1$s ahora está escuchando tus avisos en  %2$s.\n"
-"\n"
-"%3$s\n"
-"\n"
-"%4$s%5$s%6$s\n"
-"\n"
-"Atentamente,\n"
-"\n"
-"%7$s.\n"
+"Fielmente suyo/a,\n"
+"%1$s.\n"
 "\n"
 "----\n"
-"Cambia tu correo electrónico o las opciones de notificación en  %7$s\n"
+"Cambia tu correo electrónico o las opciones de notificación en  %2$s"
 
 #. TRANS: Profile info line in notification e-mail.
 #. TRANS: %s is a URL.
-#, fuzzy, php-format
+#, php-format
 msgid "Profile: %s"
-msgstr "Perfil"
+msgstr "Perfil:%s"
 
 #. TRANS: Profile info line in notification e-mail.
 #. TRANS: %s is biographical information.
@@ -8879,7 +8197,7 @@ msgstr "Bio: %s"
 
 #. TRANS: This is a paragraph in a new-subscriber e-mail.
 #. TRANS: %s is a URL where the subscriber can be reported as abusive.
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "If you believe this account is being used abusively, you can block them from "
 "your subscribers list and report as spam to site administrators at %s."
@@ -8897,7 +8215,7 @@ msgstr "Nueva dirección de correo para postear a %s"
 #. TRANS: Body of notification mail for new posting email address.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is the e-mail address to send
 #. TRANS: to to post by e-mail, %3$s is a URL to more instructions.
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
 "\n"
@@ -8905,14 +8223,11 @@ msgid ""
 "\n"
 "More email instructions at %3$s."
 msgstr ""
-"You have a new posting address on %1$s.\n"
+"Tiene un nuevo correo en %1$s.\n"
 "\n"
 "Enviar correo a %2$s para publicar nuevos mensajes. \n"
 "\n"
-"Más instrucciones de correo en %3$s.\n"
-"\n"
-"Attentamente, \n"
-"%4$s"
+"Más instrucciones de correo en %3$s."
 
 #. TRANS: Subject line for SMS-by-email notification messages.
 #. TRANS: %s is the posting user's nickname.
@@ -8939,7 +8254,7 @@ msgstr "%s te ha dado un toque"
 #. TRANS: Body for 'nudge' notification email.
 #. TRANS: %1$s is the nuding user's long name, $2$s is the nudging user's nickname,
 #. TRANS: %3$s is a URL to post notices at.
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "%1$s (%2$s) is wondering what you are up to these days and is inviting you "
 "to post some news.\n"
@@ -8953,14 +8268,11 @@ msgstr ""
 "%1$s (%2$s) se pregunta que será de tí durante estos días y te invita a "
 "publicar algunas noticias.\n"
 "\n"
-"Así que, ¡vamos! queremos escuchar de tí:)\n"
+"Así que, ¡vamos! queremos escuchar de tí :)\n"
 "\n"
 "%3$s\n"
 "\n"
-"No respondas a este correo electrónico. No llegará a ninguna parte.\n"
-"\n"
-"Un cordial saludo,\n"
-"%4$s\n"
+"No respondas a este correo electrónico. No llegará a ninguna parte."
 
 #. TRANS: Subject for direct-message notification email.
 #. TRANS: %s is the sending user's nickname.
@@ -8971,7 +8283,7 @@ msgstr "Nuevo mensaje privado de %s"
 #. TRANS: Body for direct-message notification email.
 #. TRANS: %1$s is the sending user's long name, %2$s is the sending user's nickname,
 #. TRANS: %3$s is the message content, %4$s a URL to the message,
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
 "\n"
@@ -8995,10 +8307,7 @@ msgstr ""
 "\n"
 "%4$s\n"
 "\n"
-"No respondas a este correo electrónico. No llegará a ningún sitio.\n"
-"\n"
-"Saludos cordiales,\n"
-"%5$s\n"
+"No respondas a este correo electrónico. No llegará a ningún sitio."
 
 #. TRANS: Subject for favorite notification e-mail.
 #. TRANS: %1$s is the adding user's long name, %2$s is the adding user's nickname.
@@ -9011,7 +8320,7 @@ msgstr "%1$s (@%2$s) agregó tu mensaje como favorito."
 #. TRANS: %3$s is a URL to the faved notice, %4$s is the faved notice text,
 #. TRANS: %5$s is a URL to all faves of the adding user, %6$s is the StatusNet sitename,
 #. TRANS: %7$s is the adding user's nickname.
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
 "\n"
@@ -9039,10 +8348,7 @@ msgstr ""
 "\n"
 "Puedes ver el listado de los favoritos de %1$s aquí:\n"
 "\n"
-"%5$s\n"
-"\n"
-"Saludos,\n"
-"%6$s\n"
+"%5$s"
 
 #. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
 #, php-format
@@ -9064,9 +8370,9 @@ msgstr "%1$s (@%2$s) ha enviado un aviso para tu atención"
 #. TRANS: Body of @-reply notification e-mail.
 #. TRANS: %1$s is the sending user's name, $2$s is the StatusNet sitename,
 #. TRANS: %3$s is a URL to the notice, %4$s is the notice text,
-#. TRANS: %5$s is a URL to the full conversion if it exists (otherwise empty),
+#. TRANS: %5$s is the text "The full conversation can be read here:" and a URL to the full conversion if it exists (otherwise empty),
 #. TRANS: %6$s is a URL to reply to the notice, %7$s is a URL to all @-replies for the addressed user,
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "%1$s just sent a notice to your attention (an '@-reply') on %2$s.\n"
 "\n"
@@ -9086,7 +8392,7 @@ msgid ""
 "\n"
 "%7$s"
 msgstr ""
-"%1$s (@%9$s) ha enviado un aviso a tu atención (una '@-respuesta') en %2$s.\n"
+"%1$s ha enviado un aviso a tu atención (una '@-respuesta') en %2$s.\n"
 "\n"
 "El anuncio está aquí:\n"
 "\n"
@@ -9096,35 +8402,33 @@ msgstr ""
 "\n"
 "%4$s\n"
 "\n"
-"%5$sPuedes responder aquí:\n"
+"%5$s Puedes responder aquí:\n"
 "\n"
 "%6$s\n"
 "\n"
 "Aquí encontrarás un listado de todas las @-respuestas dirigidas a ti:\n"
 "\n"
-"%7$s\n"
-"\n"
-"Saludos,\n"
-"%2$s\n"
-"\n"
-"P.D. Puedes desactivar las notificaciones que recibes en tu correo "
-"electrónico aquí: %8$s\n"
+"%7$s"
 
 #. TRANS: Subject of group join notification e-mail.
 #. TRANS: %1$s is the joining user's nickname, %2$s is the group name, and %3$s is the StatusNet sitename.
+#, php-format
+msgid "%1$s has joined your group %2$s on %3$s"
+msgstr "%1$s se unió al grupo %2$s en %3$s"
+
 #. TRANS: Main body of group join notification e-mail.
 #. TRANS: %1$s is the subscriber's long name, %2$s is the group name, and %3$s is the StatusNet sitename,
 #. TRANS: %4$s is a block of profile info about the subscriber.
 #. TRANS: %5$s is a link to the addressed user's e-mail settings.
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s has joined your group %2$s on %3$s."
-msgstr "%1$s se unió al grupo %2$s."
+msgstr "%1$s se unió al grupo %2$s en %3$s"
 
 #. TRANS: Subject of pending group join request notification e-mail.
 #. TRANS: %1$s is the joining user's nickname, %2$s is the group name, and %3$s is the StatusNet sitename.
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s wants to join your group %2$s on %3$s."
-msgstr "%1$s se unió al grupo %2$s."
+msgstr "%1$s quiere unirse a su grupo  %2$s  en  %3$s ."
 
 #. TRANS: Main body of pending group join request notification e-mail.
 #. TRANS: %1$s is the subscriber's long name, %2$s is the group name, and %3$s is the StatusNet sitename,
@@ -9134,6 +8438,8 @@ msgid ""
 "%1$s would like to join your group %2$s on %3$s. You may approve or reject "
 "their group membership at %4$s"
 msgstr ""
+"%1$s le gustaría unirse a su grupo  %2$s  en  %3$s . Puede aprobar o "
+"rechazar su pertenencia a %4$s"
 
 #. TRANS: Client error displayed when trying to access a mailbox that is not of the logged in user.
 msgid "Only the user can read their own mailboxes."
@@ -9149,24 +8455,20 @@ msgstr ""
 "mensajes que sólo puedas leer tú."
 
 #. TRANS: Menu item in mailbox menu. Leads to incoming private messages.
-#, fuzzy
 msgctxt "MENU"
 msgid "Inbox"
-msgstr "Bandeja de Entrada"
+msgstr "Bandeja de entrada"
 
 #. TRANS: Menu item title in mailbox menu. Leads to incoming private messages.
-#, fuzzy
 msgid "Your incoming messages."
 msgstr "Mensajes entrantes"
 
 #. TRANS: Menu item in mailbox menu. Leads to outgoing private messages.
-#, fuzzy
 msgctxt "MENU"
 msgid "Outbox"
 msgstr "Bandeja de Salida"
 
 #. TRANS: Menu item title in mailbox menu. Leads to outgoing private messages.
-#, fuzzy
 msgid "Your sent messages."
 msgstr "Mensajes enviados"
 
@@ -9188,7 +8490,7 @@ msgstr "Lo sentimos, pero no se permite correos entrantes"
 
 #. TRANS: Error message in incoming mail handler used when an incoming e-mail is of an unsupported type.
 #. TRANS: %s is the unsupported type.
-#, fuzzy, php-format
+#, php-format
 msgid "Unsupported message type: %s."
 msgstr "Tipo de mensaje no compatible: %s"
 
@@ -9203,7 +8505,7 @@ msgstr "Convertir en administrador"
 
 #. TRANS: Submit button title.
 msgctxt "TOOLTIP"
-msgid "Make this user an admin"
+msgid "Make this user an admin."
 msgstr "Convertir a este usuario en administrador"
 
 #. TRANS: Client exception thrown when a database error was thrown during a file upload operation.
@@ -9250,11 +8552,10 @@ msgstr "Enviar un mensaje directo"
 #. TRANS: Label entry in drop-down selection box in direct-message inbox/outbox.
 #. TRANS: This is the default entry in the drop-down box, doubling as instructions
 #. TRANS: and a brake against accidental submissions with the first user in the list.
-#, fuzzy
 msgid "Select recipient:"
-msgstr "Seleccione un operador móvil"
+msgstr "Seleccione a destinatario:"
 
-#. TRANS Entry in drop-down selection box in direct-message inbox/outbox when no one is available to message.
+#. TRANS: Entry in drop-down selection box in direct-message inbox/outbox when no one is available to message.
 msgid "No mutual subscribers."
 msgstr "Sin suscripción mutua"
 
@@ -9277,10 +8578,9 @@ msgid "from"
 msgstr "desde"
 
 #. TRANS: A possible notice source (web interface).
-#, fuzzy
 msgctxt "SOURCE"
 msgid "web"
-msgstr "red"
+msgstr "Web"
 
 #. TRANS: A possible notice source (XMPP).
 msgctxt "SOURCE"
@@ -9288,7 +8588,6 @@ msgid "xmpp"
 msgstr "xmpp"
 
 #. TRANS: A possible notice source (e-mail).
-#, fuzzy
 msgctxt "SOURCE"
 msgid "mail"
 msgstr "Correo electrónico"
@@ -9296,45 +8595,47 @@ msgstr "Correo electrónico"
 #. TRANS: A possible notice source (OpenMicroBlogging).
 msgctxt "SOURCE"
 msgid "omb"
-msgstr ""
+msgstr "omb"
 
 #. TRANS: A possible notice source (Application Programming Interface).
 msgctxt "SOURCE"
 msgid "api"
-msgstr ""
+msgstr "api"
 
 #. TRANS: Client exception thrown when no author for an activity was found.
 msgid "Cannot get author for activity."
-msgstr ""
+msgstr "No se puede obtener el autor para la actividad."
 
 #. TRANS: Client exception thrown when ...
-#, fuzzy
 msgid "Bookmark not posted to this group."
-msgstr "No puede eliminar este grupo."
+msgstr "Marcador no publicado a este grupo."
 
 #. TRANS: Client exception when ...
-#, fuzzy
 msgid "Object not posted to this user."
-msgstr "No eliminar este usuario"
+msgstr "Objeto no registrado para este usuario."
 
 #. TRANS: Server exception thrown when a micro app plugin uses a target that cannot be handled.
 msgid "Do not know how to handle this kind of target."
-msgstr ""
+msgstr "No sé cómo manejar este tipo de destino."
 
 #. TRANS: Server exception thrown when a micro app plugin developer has not done his job too well.
 msgid "You must implement either adaptNoticeListItem() or showNotice()."
-msgstr ""
+msgstr "Se debe implementar ya sea adaptNoticeListItem() o showNotice()."
+
+#. TRANS: Link description to show more items in a list.
+msgid "More â–¼"
+msgstr "Más ▼"
 
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 msgid "Nickname cannot be empty."
-msgstr ""
+msgstr "El campo del nombre de usuario no puede estar vacío."
 
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 #, php-format
 msgid "Nickname cannot be more than %d character long."
 msgid_plural "Nickname cannot be more than %d characters long."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Apodo no puede ser más largo de %d caracteres."
+msgstr[1] "Apodo no puede ser más largo de %d caracteres."
 
 #. TRANS: Form legend for notice form.
 msgid "Send a notice"
@@ -9374,10 +8675,6 @@ msgctxt "SEPARATOR"
 msgid ", "
 msgstr ", "
 
-#. TRANS: Start of profile addressees list.
-msgid " â–¸ "
-msgstr " â–¸ "
-
 #. TRANS: Used in coordinates as abbreviation of north.
 msgid "N"
 msgstr "N"
@@ -9416,7 +8713,7 @@ msgid "Repeated by"
 msgstr "Repetido por"
 
 #. TRANS: Link title in notice list item to reply to a notice.
-msgid "Reply to this notice"
+msgid "Reply to this notice."
 msgstr "Responder a este mensaje."
 
 #. TRANS: Link text in notice list item to reply to a notice.
@@ -9424,11 +8721,10 @@ msgid "Reply"
 msgstr "Responder"
 
 #. TRANS: Link title in notice list item to delete a notice.
-msgid "Delete this notice"
-msgstr "Borrar este mensaje"
+msgid "Delete this notice from the timeline."
+msgstr "Eliminar este mensaje desde la línea de tiempo."
 
 #. TRANS: Title for repeat form status in notice list when a notice has been repeated.
-#, fuzzy
 msgid "Notice repeated."
 msgstr "Mensaje repetido"
 
@@ -9441,236 +8737,187 @@ msgid "Nudge this user"
 msgstr "Dar un toque a este usuario"
 
 #. TRANS: Button text to nudge/ping another user.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Nudge"
-msgstr "Dar un toque a "
+msgstr "Dar un toque a"
 
 #. TRANS: Button title to nudge/ping another user.
-#, fuzzy
 msgid "Send a nudge to this user."
 msgstr "Dar un toque a este usuario"
 
-#. TRANS: Exception thrown when creating a new profile fails in OAuth store.
-msgid "Error inserting new profile."
-msgstr "Error al insertar un nuevo perfil."
-
-#. TRANS: Exception thrown when creating a new avatar fails in OAuth store.
-msgid "Error inserting avatar."
-msgstr "Error al insertar el avatar."
-
-#. TRANS: Exception thrown when creating a remote profile fails in OAuth store.
-msgid "Error inserting remote profile."
-msgstr "Error al insertar el perfil remoto."
-
-#. TRANS: Exception thrown when a notice is denied because it has been sent before.
-msgid "Duplicate notice."
-msgstr "Mensaje duplicado."
-
-#. TRANS: Exception thrown when creating a new subscription fails in OAuth store.
-#, fuzzy
-msgid "Could not insert new subscription."
-msgstr "No se pudo insertar una nueva suscripción."
-
 #. TRANS: Server exception thrown in oEmbed action if no API endpoint is available.
-#, fuzzy
 msgid "No oEmbed API endpoint available."
-msgstr "La mensajería instantánea no está disponible."
+msgstr "Ningún extremo oEmbed API disponible."
 
 #. TRANS: Field label for list.
-#, fuzzy
 msgctxt "LABEL"
 msgid "List"
-msgstr "Vínculos"
+msgstr "Lista"
 
 #. TRANS: Field title for list.
-#, fuzzy
 msgid "Change the list (letters, numbers, -, ., and _ are allowed)."
-msgstr ""
-"Etiquetas para este usuario (letras, números, -, ., y _), separadas por "
-"comas o espacios"
+msgstr "Cambiar la lista (letras, números,-,., y _ están permitidos)."
 
 #. TRANS: Field title for description of list.
-#, fuzzy
 msgid "Describe the list or topic."
-msgstr "Describir al grupo o tema"
+msgstr "Describir la lista o tema."
 
 #. TRANS: Field title for description of list.
 #. TRANS: %d is the maximum number of characters for the description.
-#, fuzzy, php-format
+#, php-format
 msgid "Describe the list or topic in %d character."
 msgid_plural "Describe the list or topic in %d characters."
-msgstr[0] "Describir al grupo o tema en %d caracteres"
-msgstr[1] "Describir al grupo o tema en %d caracteres"
+msgstr[0] "Describir la lista o tema en %d caracteres."
+msgstr[1] "Describir la lista o tema en %d caracteres."
 
 #. TRANS: Button title to delete a list.
-#, fuzzy
 msgid "Delete this list."
-msgstr "Borrar este usuario"
+msgstr "Eliminar esta lista."
 
 #. TRANS: Header in list edit form.
 msgid "Add or remove people"
-msgstr ""
+msgstr "Agregar o quitar usuarios"
 
 #. TRANS: Header in list edit form.
-#, fuzzy
 msgctxt "HEADER"
 msgid "Search"
 msgstr "Buscar"
 
 #. TRANS: Menu item in list navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "List"
-msgstr "Vínculos"
+msgstr "Lista"
 
 #. TRANS: Menu item title in list navigation panel.
 #. TRANS: %1$s is a list, %2$s is a nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s list by %2$s."
-msgstr "%1$s - %2$s"
+msgstr "%1$s lista de  %2$s ."
 
 #. TRANS: Menu item in list navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Listed"
-msgstr "Licencia"
+msgstr "Listado"
 
 #. TRANS: Menu item in list navigation panel.
 #. TRANS: Menu item in local navigation menu.
-#, fuzzy
 msgctxt "MENU"
 msgid "Subscribers"
 msgstr "Suscriptores"
 
 #. TRANS: Menu item title in list navigation panel.
 #. TRANS: %1$s is a list, %2$s is a nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "Subscribers to %1$s list by %2$s."
-msgstr "Suscrito a %s."
+msgstr "Suscriptores de  %1$s  lista de  %2$s ."
 
 #. TRANS: Menu item in list navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Edit"
 msgstr "Editar"
 
 #. TRANS: Menu item title in list navigation panel.
 #. TRANS: %s is a list.
-#, fuzzy, php-format
+#, php-format
 msgid "Edit %s list by you."
-msgstr "Editar grupo %s"
-
-#. TRANS: Link description for link to list of users tagged with a tag.
-#, fuzzy
-msgid "Tagged"
-msgstr "Etiqueta"
+msgstr "Editar  %s  lista por usted."
 
 #. TRANS: Title for link to edit list settings.
-#, fuzzy
 msgid "Edit list settings."
-msgstr "Editar configuración del perfil"
+msgstr "Editar configuración de la lista."
 
 #. TRANS: Text for link to edit list settings.
 msgid "Edit"
 msgstr "Editar"
 
 #. TRANS: Privacy mode text in list list item for private list.
-#, fuzzy
 msgctxt "MODE"
 msgid "Private"
 msgstr "Privado"
 
 #. TRANS: Menu item in the group navigation page.
-#, fuzzy
 msgctxt "MENU"
 msgid "List Subscriptions"
-msgstr "Suscripciones"
+msgstr "Lista de suscripciones"
 
 #. TRANS: Tooltip for menu item in the group navigation page.
 #. TRANS: %s is a user nickname.
-#, fuzzy, php-format
+#, php-format
 msgctxt "TOOLTIP"
 msgid "Lists subscribed to by %s."
-msgstr "Suscrito a %s."
+msgstr "Listas suscritas por %s"
 
 #. TRANS: Menu item in the group navigation page.
 #. TRANS: %s is a user nickname.
-#, fuzzy, php-format
+#, php-format
 msgctxt "MENU"
 msgid "Lists with %s"
-msgstr "Actualizaciones con \"%s\""
+msgstr "Listas con %s"
 
 #. TRANS: Tooltip for menu item in the group navigation page.
 #. TRANS: %s is a user nickname.
-#, fuzzy, php-format
+#, php-format
 msgctxt "TOOLTIP"
 msgid "Lists with %s."
-msgstr "Actualizaciones con \"%s\""
+msgstr "Listas con %s"
 
 #. TRANS: Menu item in the group navigation page.
 #. TRANS: %s is a user nickname.
 #, php-format
 msgctxt "MENU"
 msgid "Lists by %s"
-msgstr ""
+msgstr "Listas de %s"
 
 #. TRANS: Tooltip for menu item in the group navigation page.
 #. TRANS: %s is a user nickname.
-#, fuzzy, php-format
+#, php-format
 msgctxt "TOOLTIP"
 msgid "Lists by %s."
-msgstr "%1$s - %2$s"
+msgstr "Listas de %s"
 
 #. TRANS: Label in lists widget.
-#, fuzzy
 msgctxt "LABEL"
 msgid "Your lists"
-msgstr "Mensajes populares"
+msgstr "Sus listas"
 
 #. TRANS: Fieldset legend in lists widget.
-#, fuzzy
 msgctxt "LEGEND"
 msgid "Edit lists"
-msgstr "No es una etiqueta válida para personas: %s."
+msgstr "Editar listas"
 
 #. TRANS: Label in self tags widget.
-#, fuzzy
 msgctxt "LABEL"
 msgid "Tags"
 msgstr "Etiquetas"
 
 #. TRANS: Title for section contaning lists with the most subscribers.
-#, fuzzy
 msgid "Popular lists"
-msgstr "Mensajes populares"
+msgstr "Listas populares"
 
 #. TRANS: List summary. %1$d is the number of users in the list,
 #. TRANS: %2$d is the number of subscribers to the list.
-#, fuzzy, php-format
+#, php-format
 msgid "Listed: %1$d Subscribers: %2$d"
-msgstr "%1$s suscriptores, página %2$d"
+msgstr "La lista:  %1$d  suscriptores: %2$d"
 
 #. TRANS: Title for page that displays which lists current user is part of.
-#, fuzzy, php-format
+#, php-format
 msgid "Lists with you"
-msgstr "Método de API no encontrado."
+msgstr "Listas de usted"
 
 #. TRANS: Title for page that displays which lists a user is part of.
 #. TRANS: %s is a profile name.
-#, fuzzy, php-format
+#, php-format
 msgid "Lists with %s"
-msgstr "Actualizaciones con \"%s\""
+msgstr "Listas con %s"
 
 #. TRANS: Title for page that displays lists a user has subscribed to.
-#, fuzzy
 msgid "List subscriptions"
-msgstr "Suscripciones %s"
+msgstr "Lista de suscripciones"
 
 #. TRANS: Menu item in personal group navigation menu.
 #. TRANS: Menu item in settings navigation panel.
 #. TRANS: Menu item in local navigation menu.
-#, fuzzy
 msgctxt "MENU"
 msgid "Profile"
 msgstr "Perfil"
@@ -9680,25 +8927,21 @@ msgid "Your profile"
 msgstr "Perfil del grupo"
 
 #. TRANS: Menu item in personal group navigation menu.
-#, fuzzy
 msgctxt "MENU"
 msgid "Replies"
 msgstr "Respuestas"
 
 #. TRANS: Menu item in personal group navigation menu.
-#, fuzzy
 msgctxt "MENU"
 msgid "Favorites"
 msgstr "Favoritos"
 
 #. TRANS: Replaces %s in '%s\'s favorite notices'. (Yes, we know we need to fix this.)
-#, fuzzy
 msgctxt "FIXME"
 msgid "User"
 msgstr "Usuario"
 
 #. TRANS: Menu item in personal group navigation menu.
-#, fuzzy
 msgctxt "MENU"
 msgid "Messages"
 msgstr "Mensajes"
@@ -9721,25 +8964,31 @@ msgctxt "plugin"
 msgid "Enable"
 msgstr "Habilitado"
 
+#. TRANS: Plugin description for a disabled plugin.
 msgctxt "plugin-description"
-msgid "(Plugin descriptions unavailable when disabled.)"
+msgid ""
+"(The plugin description is unavailable when a plugin has been disabled.)"
 msgstr ""
+"(La descripción complemento no está disponible cuando un plugin ha sido "
+"desactivado.)"
 
 #. TRANS: Menu item in primary navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Settings"
-msgstr "Configuración de SMS"
+msgstr "Ajustes"
 
 #. TRANS: Menu item title in primary navigation panel.
-#, fuzzy
 msgid "Change your personal settings."
-msgstr "Cambia tus opciones de perfil"
+msgstr "Cambiar la configuración personal."
+
+#. TRANS: Menu item in primary navigation panel.
+msgctxt "MENU"
+msgid "Admin"
+msgstr "Admin"
 
 #. TRANS: Menu item title in primary navigation panel.
-#, fuzzy
 msgid "Site configuration."
-msgstr "Configuración de usuario"
+msgstr "Configuración del sitio."
 
 #. TRANS: Menu item in primary navigation panel.
 msgctxt "MENU"
@@ -9747,34 +8996,27 @@ msgid "Logout"
 msgstr "Cerrar sesión"
 
 #. TRANS: Menu item title in primary navigation panel.
-#, fuzzy
 msgid "Logout from the site."
-msgstr "Cerrar sesión en el sitio"
+msgstr "Cerrar sesión en el sitio."
 
 #. TRANS: Menu item title in primary navigation panel.
-#, fuzzy
 msgid "Login to the site."
 msgstr "Iniciar sesión en el sitio"
 
-#. TRANS: Menu item in primary navigation panel.
-msgctxt "MENU"
-msgid "Search"
-msgstr "Buscar"
-
-#. TRANS: Menu item title in primary navigation panel.
-#, fuzzy
-msgid "Search the site."
-msgstr "Buscar en el sitio"
+msgid "This profile has been silenced by site moderators"
+msgstr "Este perfil ha sido silenciado por los moderadores del sitio."
 
 #. TRANS: H2 text for user subscription statistics.
-#, fuzzy
 msgid "Following"
-msgstr "Permitir"
+msgstr "Siguiendo"
 
 #. TRANS: H2 text for user subscriber statistics.
-#, fuzzy
 msgid "Followers"
-msgstr "Permitir"
+msgstr "Seguidores"
+
+#. TRANS: H2 text for user statistics.
+msgid "Statistics"
+msgstr "Estadísticas"
 
 #. TRANS: Label for user statistics.
 msgid "User ID"
@@ -9784,10 +9026,6 @@ msgstr "ID de usuario"
 msgid "Member since"
 msgstr "Miembro desde"
 
-#. TRANS: Label for user statistics.
-msgid "Notices"
-msgstr "Mensajes"
-
 #. TRANS: Label for user statistics.
 #. TRANS: Average count of posts made per day since account registration.
 msgid "Daily average"
@@ -9798,9 +9036,8 @@ msgid "Groups"
 msgstr "Grupos"
 
 #. TRANS: H2 text for user list membership statistics.
-#, fuzzy
 msgid "Lists"
-msgstr "Límites"
+msgstr "Listas"
 
 #. TRANS: Server error displayed when using an unimplemented method.
 msgid "Unimplemented method."
@@ -9811,7 +9048,6 @@ msgid "User groups"
 msgstr "Grupos de usuario"
 
 #. TRANS: Menu item in search group navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Recent tags"
 msgstr "Etiquetas recientes"
@@ -9821,13 +9057,11 @@ msgid "Recent tags"
 msgstr "Etiquetas recientes"
 
 #. TRANS: Menu item in search group navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Featured"
-msgstr "Destacado"
+msgstr "Destacados"
 
 #. TRANS: Menu item in search group navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Popular"
 msgstr "Popular"
@@ -9835,7 +9069,7 @@ msgstr "Popular"
 #. TRANS: Title for inbox tag cloud section.
 msgctxt "TITLE"
 msgid "Trending topics"
-msgstr ""
+msgstr "Temas de tendencias"
 
 #. TRANS: Client error displayed when return-to was defined without a target.
 msgid "No return-to arguments."
@@ -9846,7 +9080,6 @@ msgid "Repeat this notice?"
 msgstr "Repetir este mensaje?"
 
 #. TRANS: Button title to repeat a notice on notice repeat form.
-#, fuzzy
 msgid "Repeat this notice."
 msgstr "Repetir este mensaje."
 
@@ -9856,15 +9089,13 @@ msgid "Revoke the \"%s\" role from this user"
 msgstr "Revocar el rol \"%s\" de este usuario"
 
 #. TRANS: Client error on action trying to visit a non-existing page.
-#, fuzzy
 msgid "Page not found."
-msgstr "Método de API no encontrado."
+msgstr "Página no encontrada."
 
 #. TRANS: Title of form to sandbox a user.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Sandbox"
-msgstr "Restringir"
+msgstr "Zona de pruebas"
 
 #. TRANS: Description of form to sandbox a user.
 msgid "Sandbox this user"
@@ -9880,6 +9111,7 @@ msgid "Keyword(s)"
 msgstr "Palabra(s) clave"
 
 #. TRANS: Button text for searching site.
+#. TRANS: Button text for search button on search form.
 #. TRANS: Button text to search profiles.
 msgctxt "BUTTON"
 msgid "Search"
@@ -9892,6 +9124,10 @@ msgid ""
 "* Try more general keywords.\n"
 "* Try fewer keywords."
 msgstr ""
+"* Asegúrese de que todas las palabras estén escritas correctamente.\n"
+"* Pruebe con palabras clave diferentes.\n"
+"* Pruebe con palabras clave más generales.\n"
+"* Pruebe con menos palabras clave."
 
 #. TRANS: Standard search suggestions shown when a search does not give any results.
 #, php-format
@@ -9905,19 +9141,25 @@ msgid ""
 "* [Yahoo](http://search.yahoo.com/search?p=site%%3A%%%%site.server%%%%+%s)\n"
 "* [Collecta](http://collecta.com/#q=%s)"
 msgstr ""
+"También puede intentar buscar en otro motores de búsqueda :\n"
+"\n"
+"* [Twingly](http://www.twingly.com/search?q=%s&content=microblog&site=%%%%"
+"site.server%%%%)\n"
+"* [Tweet scan](http://www.tweetscan.com/indexi.php?s=%s)\n"
+"* [Google](http://www.google.com/search?q=site%%3A%%%%site.server%%%%+%s)\n"
+"* [Yahoo](http://search.yahoo.com/search?p=site%%3A%%%%site.server%%%%+%s)\n"
+"* [Collecta](http://collecta.com/#q=%s)"
 
 #. TRANS: Menu item in search group navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "People"
-msgstr "Gente"
+msgstr "Personas"
 
 #. TRANS: Menu item title in search group navigation panel.
 msgid "Find people on this site"
 msgstr "Encontrar gente en este sitio"
 
 #. TRANS: Menu item in search group navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Notices"
 msgstr "Mensajes"
@@ -9930,60 +9172,26 @@ msgstr "Buscar en el contenido de mensajes"
 msgid "Find groups on this site"
 msgstr "Encontrar grupos en este sitio"
 
-#. TRANS: Secondary navigation menu item leading to help on StatusNet.
-msgctxt "MENU"
-msgid "Help"
-msgstr "Ayuda"
-
-#. TRANS: Secondary navigation menu item leading to text about StatusNet site.
-#, fuzzy
-msgctxt "MENU"
-msgid "About"
-msgstr "Acerca de"
-
-#. TRANS: Secondary navigation menu item leading to Frequently Asked Questions.
-#, fuzzy
-msgctxt "MENU"
-msgid "FAQ"
-msgstr "Preguntas Frecuentes"
-
 #. TRANS: Secondary navigation menu item leading to Terms of Service.
-#, fuzzy
 msgctxt "MENU"
 msgid "TOS"
 msgstr "TOS"
 
 #. TRANS: Secondary navigation menu item leading to privacy policy.
-#, fuzzy
 msgctxt "MENU"
 msgid "Privacy"
 msgstr "Privacidad"
 
 #. TRANS: Secondary navigation menu item. Leads to information about StatusNet and its license.
-#, fuzzy
 msgctxt "MENU"
 msgid "Source"
 msgstr "Fuente"
 
 #. TRANS: Secondary navigation menu item leading to version information on the StatusNet site.
-#, fuzzy
 msgctxt "MENU"
 msgid "Version"
 msgstr "Versión"
 
-#. TRANS: Secondary navigation menu item leading to e-mail contact information on the
-#. TRANS: StatusNet site, where to report bugs, ...
-#, fuzzy
-msgctxt "MENU"
-msgid "Contact"
-msgstr "Ponerse en contacto"
-
-#. TRANS: Secondary navigation menu item. Leads to information about embedding a timeline widget.
-#, fuzzy
-msgctxt "MENU"
-msgid "Badge"
-msgstr "Insignia"
-
 #. TRANS: Default title for section/sidebar widget.
 msgid "Untitled section"
 msgstr "Sección sin título"
@@ -9993,17 +9201,15 @@ msgid "More..."
 msgstr "Más..."
 
 #. TRANS: Header in settings navigation panel.
-#, fuzzy
 msgctxt "HEADER"
 msgid "Settings"
-msgstr "Configuración de SMS"
+msgstr "Ajustes"
 
 #. TRANS: Menu item title in settings navigation panel.
 msgid "Change your profile settings"
 msgstr "Cambia tus opciones de perfil"
 
 #. TRANS: Menu item in settings navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Avatar"
 msgstr "Imagen"
@@ -10013,7 +9219,6 @@ msgid "Upload an avatar"
 msgstr "Subir una imagen."
 
 #. TRANS: Menu item in settings navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Password"
 msgstr "Contraseña"
@@ -10023,7 +9228,6 @@ msgid "Change your password"
 msgstr "Cambia tu contraseña"
 
 #. TRANS: Menu item in settings navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Email"
 msgstr "Correo electrónico"
@@ -10032,10 +9236,6 @@ msgstr "Correo electrónico"
 msgid "Change email handling"
 msgstr "Cambiar el manejo del correo."
 
-#. TRANS: Menu item title in settings navigation panel.
-msgid "Design your profile"
-msgstr "Diseñar tu perfil"
-
 #. TRANS: Menu item in settings navigation panel.
 msgctxt "MENU"
 msgid "URL"
@@ -10046,7 +9246,6 @@ msgid "URL shorteners"
 msgstr "Acortadores de URL"
 
 #. TRANS: Menu item in settings navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "IM"
 msgstr "IM"
@@ -10056,7 +9255,6 @@ msgid "Updates by instant messenger (IM)"
 msgstr "Actualizaciones por mensajería instantánea"
 
 #. TRANS: Menu item in settings navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "SMS"
 msgstr "SMS"
@@ -10066,17 +9264,24 @@ msgid "Updates by SMS"
 msgstr "Actualizaciones por sms"
 
 #. TRANS: Menu item in settings navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Connections"
-msgstr "Conecciones"
+msgstr "Conexiones"
 
 #. TRANS: Menu item title in settings navigation panel.
 msgid "Authorized connected applications"
 msgstr "Aplicaciones conectadas autorizadas"
 
+#. TRANS: Menu item in settings navigation panel.
+msgctxt "MENU"
+msgid "Old school"
+msgstr "Vieja escuela"
+
+#. TRANS: Menu item title in settings navigation panel.
+msgid "UI tweaks for old-school users"
+msgstr "Ajustes de interfaz de usuario para los usuarios de la vieja escuela"
+
 #. TRANS: Title of form to silence a user.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Silence"
 msgstr "Silenciar"
@@ -10085,21 +9290,55 @@ msgstr "Silenciar"
 msgid "Silence this user"
 msgstr "Silenciar a este usuario"
 
+#. TRANS: Server error displayed when trying to create an anynymous OAuth consumer.
+msgid "Could not create anonymous consumer."
+msgstr "No fue posible crear usuario anónimo."
+
+#. TRANS: Server error displayed when trying to create an anynymous OAuth application.
+msgid "Could not create anonymous OAuth application."
+msgstr "No se pudo crear la aplicación de OAuth anónimo."
+
+#. TRANS: Exception thrown when no token association could be found.
+msgid ""
+"Could not find a profile and application associated with the request token."
+msgstr ""
+"No se pudo encontrar un perfil y una aplicación asociada con el token de "
+"petición."
+
+#. TRANS: Exception thrown when no access token can be issued.
+msgid "Could not issue access token."
+msgstr "No se podría emitir el token de acceso."
+
+#. TRANS: Exception thrown when a database error occurs.
+msgid "Database error inserting OAuth application user."
+msgstr "Error de base de datos al insertar usuario de la aplicación OAuth."
+
+#. TRANS: Exception thrown when a database error occurs.
+msgid "Database error updating OAuth application user."
+msgstr "Error de base de datos al actualizar usuario de aplicaciones OAuth."
+
+#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
+msgid "Tried to revoke unknown token."
+msgstr "Se intentó revocar un token desconocido."
+
+#. TRANS: Exception thrown when an attempt is made to remove a revoked token.
+msgid "Failed to delete revoked token."
+msgstr "No se pudo eliminar el token revocado."
+
 #. TRANS: Menu item in local navigation menu.
-#, fuzzy
 msgctxt "MENU"
 msgid "Subscriptions"
 msgstr "Suscripciones"
 
 #. TRANS: Menu item title in local navigation menu.
 #. TRANS: %s is a user nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "People %s subscribes to."
 msgstr "Personas a las que %s está suscrito"
 
 #. TRANS: Menu item title in local navigation menu.
 #. TRANS: %s is a user nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "People subscribed to %s."
 msgstr "Personas suscritas a %s"
 
@@ -10108,24 +9347,24 @@ msgstr "Personas suscritas a %s"
 #, php-format
 msgctxt "MENU"
 msgid "Pending (%d)"
-msgstr ""
+msgstr "Pendiente (%d)"
 
 #. TRANS: Menu item title in local navigation menu.
 #, php-format
 msgid "Approve pending subscription requests."
-msgstr ""
+msgstr "Aprobar solicitudes pendientes de suscripción."
 
 #. TRANS: Menu item title in local navigation menu.
 #. TRANS: %s is a user nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "Groups %s is a member of."
 msgstr "%s es miembro de los grupos"
 
 #. TRANS: Menu item title in local navigation menu.
 #. TRANS: %s is a user nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "List subscriptions by %s."
-msgstr "Personas suscritas a %s"
+msgstr "Lista de suscripciones de  %s ."
 
 #. TRANS: Menu item in local navigation menu.
 msgctxt "MENU"
@@ -10134,14 +9373,24 @@ msgstr "Invitar"
 
 #. TRANS: Menu item title in local navigation menu.
 #. TRANS: %s is the StatusNet sitename.
-#, fuzzy, php-format
+#, php-format
 msgid "Invite friends and colleagues to join you on %s."
-msgstr "Invita a amigos y colegas a unirse a %s"
+msgstr "Invitar a amigos y colegas a unirse con usted en  %s ."
 
 #. TRANS: Form of form to subscribe to a user.
 msgid "Subscribe to this user"
 msgstr "Suscribirse a este usuario"
 
+#. TRANS: Button text to subscribe to a user.
+#. TRANS: Button text for subscribing to a list.
+msgctxt "BUTTON"
+msgid "Subscribe"
+msgstr "Suscribirse"
+
+#. TRANS: Button title to subscribe to a user.
+msgid "Subscribe to this user."
+msgstr "Suscribirse a este usuario."
+
 #. TRANS: Title of personal tag cloud section.
 msgid "People Tagcloud as self-tagged"
 msgstr "Nube de etiquetas de personas auto-etiquetadas"
@@ -10151,15 +9400,13 @@ msgid "People Tagcloud as tagged"
 msgstr "Nube de etiquetas de personas etiquetadas"
 
 #. TRANS: Content displayed in a tag cloud section if there are no tags.
-#, fuzzy
 msgctxt "NOTAGS"
 msgid "None"
 msgstr "Ninguno"
 
 #. TRANS: Server exception displayed if a theme name was invalid.
-#, fuzzy
 msgid "Invalid theme name."
-msgstr "Nombre de archivo inválido."
+msgstr "Nombre del tema no válido."
 
 #. TRANS: Exception thrown when a compressed theme is uploaded while no support present in PHP configuration.
 msgid "This server cannot handle theme uploads without ZIP support."
@@ -10175,23 +9422,23 @@ msgid "Failed saving theme."
 msgstr "Grabado de tema errado."
 
 #. TRANS: Server exception thrown when an uploaded theme has an incorrect structure.
-#, fuzzy
 msgid "Invalid theme: Bad directory structure."
-msgstr "Tema inválido: mala estructura de directorio."
+msgstr "Tema no válido: estructura de directorio incorrecto."
 
 #. TRANS: Client exception thrown when an uploaded theme is larger than the limit.
 #. TRANS: %d is the number of bytes of the uncompressed theme.
-#, fuzzy, php-format
+#, php-format
 msgid "Uploaded theme is too large; must be less than %d byte uncompressed."
 msgid_plural ""
 "Uploaded theme is too large; must be less than %d bytes uncompressed."
 msgstr[0] ""
-"Tema subido es demasiado grande; debe ser menor que %d bytes sin comprimir."
+"Tema cargado es demasiado grande; debe ser inferior a %d bytes sin "
+"compresión."
 msgstr[1] ""
-"Tema subido es demasiado grande; debe ser menor que %d bytes sin comprimir."
+"Tema cargado es demasiado grande; debe ser inferior a %d bytes sin "
+"compresión."
 
 #. TRANS: Server exception thrown when an uploaded theme is incomplete.
-#, fuzzy
 msgid "Invalid theme archive: Missing file css/display.css"
 msgstr "Archivo de tema inválido: archivo perdido css/display.css"
 
@@ -10211,7 +9458,7 @@ msgstr ""
 
 #. TRANS: Server exception thrown when an uploaded theme contains a file type that is not allowed.
 #. TRANS: %s is the file type that is not allowed.
-#, fuzzy, php-format
+#, php-format
 msgid "Theme contains file of type \".%s\", which is not allowed."
 msgstr "El tema contiene archivo de tipo '.%s', que no está permitido."
 
@@ -10220,18 +9467,17 @@ msgid "Error opening theme archive."
 msgstr "Error al abrir archivo de tema."
 
 #. TRANS: Header for Notices section.
-#, fuzzy
 msgctxt "HEADER"
 msgid "Notices"
 msgstr "Mensajes"
 
 #. TRANS: Link to show replies for a notice.
 #. TRANS: %d is the number of replies to a notice and used for plural.
-#, fuzzy, php-format
+#, php-format
 msgid "Show reply"
 msgid_plural "Show all %d replies"
-msgstr[0] "Ver más"
-msgstr[1] "Ver más"
+msgstr[0] "Mostrar respuesta"
+msgstr[1] "Mostrar todas %d  respuestas"
 
 #. TRANS: Reference to the logged in user in favourite list.
 msgctxt "FAVELIST"
@@ -10240,16 +9486,15 @@ msgstr "Usted"
 
 #. TRANS: For building a list such as "Jim, Bob, Mary and 5 others like this".
 #. TRANS: %1$s is a list of users, separated by a separator (default: ", "), %2$s is the last user in the list.
-#, fuzzy, php-format
+#, php-format
 msgctxt "FAVELIST"
 msgid "%1$s and %2$s"
-msgstr "%1$s - %2$s"
+msgstr "%1$s y %2$s"
 
 #. TRANS: List message for notice favoured by logged in user.
-#, fuzzy
 msgctxt "FAVELIST"
 msgid "You like this."
-msgstr "Mensajes populares"
+msgstr "Te gusta esto."
 
 #. TRANS: List message for when more than 4 people like something.
 #. TRANS: %%s is a list of users liking a notice, %d is the number over 4 that like the notice.
@@ -10257,8 +9502,8 @@ msgstr "Mensajes populares"
 #, php-format
 msgid "%%s and %d others like this."
 msgid_plural "%%s and %d others like this."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] " A %%s y %d les gusta esto."
+msgstr[1] "A %%s y %d les gusta esto."
 
 #. TRANS: List message for favoured notices.
 #. TRANS: %%s is a list of users liking a notice.
@@ -10266,63 +9511,69 @@ msgstr[1] ""
 #, php-format
 msgid "%%s likes this."
 msgid_plural "%%s like this."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "A %%s le gusta esto."
+msgstr[1] "A %%s le gusta esto."
 
 #. TRANS: List message for notice repeated by logged in user.
-#, fuzzy
 msgctxt "REPEATLIST"
-msgid "You have repeated this notice."
-msgstr "Ya has repetido este mensaje."
+msgid "You repeated this."
+msgstr "Se repite esto."
 
-#. TRANS: List message for repeated notices.
-#. TRANS: %d is the number of users that have repeated a notice.
-#, fuzzy, php-format
-msgid "One person has repeated this notice."
-msgid_plural "%d people have repeated this notice."
-msgstr[0] "Este mensaje ya se ha repetido."
-msgstr[1] "Este mensaje ya se ha repetido."
+#. TRANS: List message for when more than 4 people repeat something.
+#. TRANS: %%s is a list of users liking a notice, %d is the number over 4 that like the notice.
+#. TRANS: Plural is decided on the total number of users liking the notice (count of %%s + %d).
+#, php-format
+msgid "%%s and %d other repeated this."
+msgid_plural "%%s and %d others repeated this."
+msgstr[0] "%%s y %d repitió esto."
+msgstr[1] "%%s y %d repitió esto."
+
+#. TRANS: List message for favoured notices.
+#. TRANS: %%s is a list of users liking a notice.
+#. TRANS: Plural is based on the number of of users that have favoured a notice.
+#, php-format
+msgid "%%s repeated this."
+msgid_plural "%%s repeated this."
+msgstr[0] "%%s repitió esto."
+msgstr[1] "%%s repitió esto."
 
 #. TRANS: Form legend.
-#, fuzzy, php-format
+#, php-format
 msgid "Search and list people"
-msgstr "Buscar sitio"
+msgstr "Búsqueda y lista de personas"
 
 #. TRANS: Dropdown option for searching in profiles.
 msgid "Everything"
-msgstr ""
+msgstr "Todo"
 
 #. TRANS: Dropdown option for searching in profiles.
-#, fuzzy
 msgid "Fullname"
 msgstr "Nombre completo"
 
 #. TRANS: Dropdown option for searching in profiles.
 msgid "URI (Remote users)"
-msgstr ""
+msgstr "URI (los usuarios remotos)"
 
 #. TRANS: Dropdown field label.
-#, fuzzy
 msgctxt "LABEL"
 msgid "Search in"
-msgstr "Buscar sitio"
+msgstr "Buscar en"
 
 #. TRANS: Dropdown field title.
-#, fuzzy
 msgid "Choose a field to search."
-msgstr "Elegir una etiqueta para reducir la lista"
+msgstr "Seleccione un campo de búsqueda."
 
 #. TRANS: Form legend.
 #. TRANS: %1$s is a nickname, $2$s is a list.
-#, fuzzy, php-format
+#, php-format
 msgid "Remove %1$s from list %2$s"
-msgstr "%1$s - %2$s"
+msgstr "Eliminar  %1$s  de lista %2$s"
 
 #. TRANS: Legend on form to add a profile to a list.
 #. TRANS: %1$s is a nickname, %2$s is a list.
-#, fuzzy, php-format
+#, php-format
 msgid "Add %1$s to list %2$s"
-msgstr "%1$s - %2$s"
+msgstr "Agregar  %1$s  a la lista %2$s"
 
 #. TRANS: Title for top posters section.
 msgid "Top posters"
@@ -10337,23 +9588,21 @@ msgstr "Todo el mundo"
 #. TRANS: %s is a StatusNet sitename.
 #, php-format
 msgid "My colleagues at %s"
-msgstr ""
+msgstr "Mis amigos en %s"
 
 #. TRANS: Label for drop-down of potential addressees.
-#, fuzzy
 msgctxt "LABEL"
 msgid "To:"
-msgstr "Para"
+msgstr "Para:"
 
 #. TRANS: Checkbox label in widget for selecting potential addressees to mark the notice private.
-#, fuzzy
 msgid "Private?"
-msgstr "Privado"
+msgstr "¿Privado?"
 
 #. TRANS: Client exception thrown in widget for selecting potential addressees when an invalid fill option was received.
-#, fuzzy, php-format
+#, php-format
 msgid "Unknown to value: \"%s\"."
-msgstr "Idioma desconocido \"%s\"."
+msgstr "Desconocido al valor: \" %s \"."
 
 #. TRANS: Title for the form to unblock a user.
 msgctxt "TITLE"
@@ -10361,10 +9610,9 @@ msgid "Unblock"
 msgstr "Desbloquear"
 
 #. TRANS: Title for unsandbox form.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Unsandbox"
-msgstr "Eliminar restricciones"
+msgstr "Eliminar zona de pruebas"
 
 #. TRANS: Description for unsandbox form.
 msgid "Unsandbox this user"
@@ -10379,27 +9627,28 @@ msgid "Unsilence this user"
 msgstr "Dejar de silenciar este usuario"
 
 #. TRANS: Form legend on unsubscribe form.
-#. TRANS: Button title on unsubscribe form.
 msgid "Unsubscribe from this user"
 msgstr "Desuscribirse de este usuario"
 
 #. TRANS: Button text on unsubscribe form.
 #. TRANS: Button text for unsubscribing from a list.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Unsubscribe"
-msgstr "Cancelar suscripción"
+msgstr "Cancelar la suscripción"
+
+#. TRANS: Button title on unsubscribe form.
+msgid "Unsubscribe from this user."
+msgstr "Desuscribirse de este usuario"
 
 #. TRANS: Exception text shown when no profile can be found for a user.
 #. TRANS: %1$s is a user nickname, $2$d is a user ID (number).
-#, fuzzy, php-format
+#, php-format
 msgid "User %1$s (%2$d) has no profile record."
-msgstr "El usuario no tiene un perfil."
+msgstr "Usuario  %1$s  ( %2$d ) no tiene ningún registro de perfil."
 
 #. TRANS: Authorisation exception thrown when a user a not allowed to login.
-#, fuzzy
 msgid "Not allowed to log in."
-msgstr "No conectado."
+msgstr "No puede iniciar sesión."
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 msgid "a few seconds ago"
@@ -10455,26 +9704,23 @@ msgstr "hace un año"
 
 #. TRANS: Web color exception thrown when a hexadecimal color code does not validate.
 #. TRANS: %s is the provided (invalid) color code.
-#, fuzzy, php-format
+#, php-format
 msgid "%s is not a valid color! Use 3 or 6 hex characters."
-msgstr "%s no es un color válido! Usar 3 o 6 caracteres hexagesimales"
+msgstr "%s no es un color válido! Usar 3 o 6 caracteres hexadecimales."
 
 #. TRANS: Exception.
-#, fuzzy
 msgid "Invalid XML."
-msgstr "Tamaño inválido."
+msgstr "XML no válido."
 
 #. TRANS: Exception.
 msgid "Invalid XML, missing XRD root."
-msgstr ""
+msgstr "XML no válido, falta de raíz XRD."
 
 #. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
 #, php-format
 msgid "Getting backup from file '%s'."
-msgstr ""
+msgstr "Obtener copia de seguridad del archivo ' %s '."
 
-#~ msgid "%1$s and friends, page %2$d"
-#~ msgstr "%1$s y sus amistades, página %2$d"
-
-#~ msgid "You and friends"
-#~ msgstr "Tú y tus amistades"
+#
+#~ msgid " "
+#~ msgstr " "
diff --git a/locale/eu/LC_MESSAGES/statusnet.po b/locale/eu/LC_MESSAGES/statusnet.po
new file mode 100644
index 0000000000..aa94615cbb
--- /dev/null
+++ b/locale/eu/LC_MESSAGES/statusnet.po
@@ -0,0 +1,9699 @@
+# Translation of StatusNet - Core to Basque (euskara)
+# Exported from translatewiki.net
+#
+# Author: An13sa
+# Author: Artsuaga
+# Author: Bengoa
+# Author: Txopi
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Core\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:54+0000\n"
+"Language-Team: Basque <https://translatewiki.net/wiki/Portal:eu>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2012-04-22 22:02:21+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: eu\n"
+"X-Message-Group: #out-statusnet-core\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Database error message.
+#, php-format
+msgid ""
+"The database for %1$s is not responding correctly, so the site will not work "
+"properly. The site admins probably know about the problem, but you can "
+"contact them at %2$s to make sure. Otherwise, wait a few minutes and try "
+"again."
+msgstr ""
+"%1$s datu-baseak ondo erantzuten ez duenez, gunea ez da ondo ibiliko. "
+"Gunearen administratzaileak jakinaren gainean egongo dira ziurrenik, baina "
+"nahi baduzu %2$s helbidean jar zaitezke harremanetan beraiekin. Bestela "
+"minutu batzuk itxaron eta saiatu berriro."
+
+#. TRANS: Error message.
+msgid "An error occurred."
+msgstr "Errorea gertatu da."
+
+#. TRANS: Error message displayed when there is no StatusNet configuration file.
+#, php-format
+msgid ""
+"No configuration file found. Try running the installation program first."
+msgstr ""
+"Ez da konfigurazio-fitxategirik aurkitu. Saiatu lehenengo instalazio-"
+"programa exekutatzen."
+
+#. TRANS: Error message displayed when trying to access a non-existing page.
+msgid "Unknown page"
+msgstr "Orri ezezaguna"
+
+#. TRANS: Error message displayed when trying to perform an undefined action.
+#. TRANS: Title for password recovery page when an unknown action has been specified.
+msgid "Unknown action"
+msgstr "Ekintza ezezaguna"
+
+#. TRANS: Page title for Access admin panel that allows configuring site access.
+msgid "Access"
+msgstr "Sarbidea"
+
+#. TRANS: Page notice.
+msgid "Site access settings"
+msgstr "Gunea atzitzeko ezarpenak"
+
+#. TRANS: Form legend for registration form.
+msgid "Registration"
+msgstr "Izen-ematea"
+
+#. TRANS: Checkbox instructions for admin setting "Private".
+msgid "Prohibit anonymous users (not logged in) from viewing site?"
+msgstr ""
+"Galarazi erabiltzaile ezezagunek (saioa hasi gabeek) gunea ikus dezaten?"
+
+#. TRANS: Checkbox label for prohibiting anonymous users from viewing site.
+#. TRANS: Checkbox label to show private tags.
+#. TRANS: Checkbox field label on group edit form to mark a group private.
+msgctxt "LABEL"
+msgid "Private"
+msgstr "Pribatua"
+
+#. TRANS: Checkbox instructions for admin setting "Invite only".
+msgid "Make registration invitation only."
+msgstr "Izena emateko gonbidapena soilik."
+
+#. TRANS: Checkbox label for configuring site as invite only.
+msgid "Invite only"
+msgstr "Gonbidapen bidez soilik"
+
+#. TRANS: Checkbox instructions for admin setting "Closed" (no new registrations).
+msgid "Disable new registrations."
+msgstr "Ezgaitu izen-emate berriak."
+
+#. TRANS: Checkbox label for disabling new user registrations.
+msgid "Closed"
+msgstr "Itxita"
+
+#. TRANS: Button title to save access settings in site admin panel.
+msgid "Save access settings."
+msgstr "Gorde atzipen-ezarpenak."
+
+#. TRANS: Button text to save access settings in site admin panel.
+#. TRANS: Button label to save e-mail preferences.
+#. TRANS: Button label to save IM preferences.
+#. TRANS: Button text in the license admin panel.
+#. TRANS: Button text to store form data in the Paths admin panel.
+#. TRANS: Button to save input in profile settings.
+#. TRANS: Submit button text on the sessions administration panel.
+#. TRANS: Button text for saving site settings.
+#. TRANS: Button text for saving site notice in admin panel.
+#. TRANS: Button label to save SMS preferences.
+#. TRANS: Button text to save snapshot settings.
+#. TRANS: Save button for settings for a profile in a subscriptions list.
+#. TRANS: Button text to save lists.
+#. TRANS: Button text for saving "Other settings" in profile.
+#. TRANS: Button text to save user settings in user admin panel.
+#. TRANS: Button label in the "Edit application" form.
+#. TRANS: Text for save button on group edit form.
+#. TRANS: Button text to save tags for a profile.
+msgctxt "BUTTON"
+msgid "Save"
+msgstr "Gorde"
+
+#. TRANS: Client error displayed when the session token does not match or is not given.
+#. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
+#. TRANS: Client error displayed when the session token does not match or is not given.
+#. TRANS: Form validation error message.
+#. TRANS: Client error displayed when the session token does not match or is not given.
+#. TRANS: Form validation error.
+#. TRANS: Form validation error message.
+#. TRANS: Client error displayed when the session token does not match or is not given.
+#. TRANS: Client error displayed when the session token is not okay.
+#. TRANS: Client error displayed when the session token does not match or is not given.
+msgid "There was a problem with your session token. Try again, please."
+msgstr "Arazoa egon da zure saio-tokenarekin. Saiatu berriro"
+
+#. TRANS: Error message displayed when trying to perform an action that requires a logged in user.
+msgid "Not logged in."
+msgstr "Saioa hasi gabe."
+
+#. TRANS: Client error displayed trying to perform an action related to a non-existing profile.
+#. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
+#. TRANS: Client exception.
+#. TRANS: Client error displayed when referring to a non-existing profile.
+#. TRANS: Client error displayed trying to subscribe to a non-existing profile.
+#. TRANS: Client error displayed trying to perform an action related to a non-existing profile.
+msgid "No such profile."
+msgstr "Profil hori ez dago."
+
+#. TRANS: Client error displayed trying to reference a non-existing list.
+#. TRANS: Client error displayed when referring to a non-existing list.
+#. TRANS: Client error displayed trying to reference a non-existing list.
+msgid "No such list."
+msgstr "Zerrenda hori ez dago."
+
+#. TRANS: Client error displayed when an unknown error occurs when adding a user to a list.
+#. TRANS: %s is a username.
+#, php-format
+msgid "There was an unexpected error while listing %s."
+msgstr "Espero ez zen errorea gertatu da %s zerrendatzean."
+
+#. TRANS: Client error displayed when an unknown error occurs when adding a user to a list.
+#. TRANS: %s is a profile URL.
+#, php-format
+msgid ""
+"There was a problem listing %s. The remote server is probably not responding "
+"correctly. Please try retrying later."
+msgstr ""
+"%s zerrendatzean akatsa egon da. Ziurrenik urruneko zerbitzariak ez du ondo "
+"erantzuten. Saiatu geroago berriro."
+
+#. TRANS: Title after adding a user to a list.
+msgctxt "TITLE"
+msgid "Listed"
+msgstr "Zerrendatuta"
+
+#. TRANS: Server error when page not found (404).
+#. TRANS: Server error when page not found (404)
+#. TRANS: Server error when page not found (404).
+msgid "No such page."
+msgstr "Orri hori ez dago."
+
+#. TRANS: Client error when user not found for an action.
+#. TRANS: Client error when user not found for an rss related action.
+#. TRANS: Client error displayed when no existing user is provided for a user's delivery device setting.
+#. TRANS: Client error displayed if a user could not be found.
+#. TRANS: Client error displayed updating profile image without having a user object.
+#. TRANS: Client error displayed when making an Atom API request for an unknown user.
+#. TRANS: Client error displayed when trying to block a non-existing user or a user from another site.
+#. TRANS: Client error when user not found for an API action to remove a block for a user.
+#. TRANS: Client error given when a user was not found (404).
+#. TRANS: Client error when user not found for an API direct message action.
+#. TRANS: Client error given when a user was not found (404).
+#. TRANS: Client error displayed when checking group membership for a non-existing user.
+#. TRANS: Client error displayed when trying to have a non-existing user join a group.
+#. TRANS: Client error displayed when trying to have a non-existing user leave a group.
+#. TRANS: Client error displayed when user not found for an action.
+#. TRANS: Client error displayed when not providing a user or an invalid user.
+#. TRANS: Client error displayed when referring to a non-existing user.
+#. TRANS: Client error displayed trying to perform an action related to a non-existing user.
+#. TRANS: Client error displayed when updating a status for a non-existing user.
+#. TRANS: Client error displayed when requesting a list of followers for a non-existing user.
+#. TRANS: Client error displayed when requesting most recent favourite notices by a user for a non-existing user.
+#. TRANS: Client error displayed when requesting dents of a user and friends for a user that does not exist.
+#. TRANS: Client error displayed when requesting most recent dents by user and friends for a non-existing user.
+#. TRANS: Client error displayed when requesting most recent mentions for a non-existing user.
+#. TRANS: Client error displayed requesting most recent notices for a non-existing user.
+#. TRANS: Client error displayed trying to get an avatar for a non-existing user.
+#. TRANS: Client error displayed when trying to get the RSS feed with favorites of a user that does not exist.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed without providing a user nickname.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed for an object that is not a user.
+#. TRANS: Client error displayed trying to make a micro summary without providing a valid user.
+#. TRANS: Client error displayed trying to send a direct message to a non-existing user.
+#. TRANS: Client error displayed trying to use "one time password login" without using an existing user.
+#. TRANS: Client error displayed when referring to non-existing user.
+#. TRANS: Client error displayed trying to perform an action related to a non-existing user.
+#. TRANS: Client error displayed when trying to reply to a non-exsting user.
+#. TRANS: Client error displayed when providing a non-existing nickname in a RSS 1.0 action.
+#. TRANS: Client error.
+#. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
+#. TRANS: Client error displayed trying to perform an action related to a non-existing user.
+#. TRANS: Client error displayed trying to find a user by ID for a non-existing ID.
+#. TRANS: Client error displayed requesting groups for a non-existing user.
+#. TRANS: Client error displayed when user not found for an action.
+#. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
+#. TRANS: Client error displayed when trying to perform a gallery action with an unknown user.
+#. TRANS: Client error displayed when trying to access a mailbox without providing a user.
+#. TRANS: Client error displayed when calling a profile action without specifying a user.
+msgid "No such user."
+msgstr "Erabiltzaile hori ez dago."
+
+#. TRANS: Title of a user's own start page.
+msgid "Home timeline"
+msgstr "Etxeko denbora-lerroa"
+
+#. TRANS: Title of another user's start page.
+#. TRANS: %s is the other user's name.
+#, php-format
+msgid "%s's home timeline"
+msgstr "%s(r)en etxeko denbora-lerroa"
+
+#. TRANS: %s is user nickname.
+#. TRANS: Feed title.
+#. TRANS: %s is tagger's nickname.
+#, php-format
+msgid "Feed for friends of %s (Activity Streams JSON)"
+msgstr "%s(r)en lagunen jarioa (Activity Streams JSON)"
+
+#. TRANS: %s is user nickname.
+#, php-format
+msgid "Feed for friends of %s (RSS 1.0)"
+msgstr "%s(r)en lagunen jarioa (RSS 1.0)"
+
+#. TRANS: %s is user nickname.
+#. TRANS: Feed title.
+#. TRANS: %s is tagger's nickname.
+#, php-format
+msgid "Feed for friends of %s (RSS 2.0)"
+msgstr "%s(r)en lagunen jarioa (RSS 2.0)"
+
+#. TRANS: %s is user nickname.
+#, php-format
+msgid "Feed for friends of %s (Atom)"
+msgstr "%s(r)en lagunen jarioa (Atom)"
+
+#. TRANS: Empty list message. %s is a user nickname.
+#, php-format
+msgid ""
+"This is the timeline for %s and friends but no one has posted anything yet."
+msgstr ""
+"%s(r)en eta bere lagunen denbora-lerroa da hau baina oraindik ez du inork "
+"mezurik idatzi."
+
+#. TRANS: Encouragement displayed on logged in user's empty timeline.
+#. TRANS: This message contains Markdown links. Keep "](" together.
+#, php-format
+msgid ""
+"Try subscribing to more people, [join a group](%%action.groups%%) or post "
+"something yourself."
+msgstr ""
+"Saiatu jende gehiago jarraitzen, [elkartu talde batekin](%%action.groups%%) "
+"edo idatzi zerbait zure arbelean."
+
+#. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@".
+#. TRANS: This message contains Markdown links. Keep "](" together.
+#, php-format
+msgid ""
+"You can try to [nudge %1$s](../%2$s) from their profile or [post something "
+"to them](%%%%action.newnotice%%%%?status_textarea=%3$s)."
+msgstr ""
+"Saiatu: [zirikatu %1$s](../%2$s) bere profiletik edo [idatzi zerbait haiei](%"
+"%%%action.newnotice%%%%?status_textarea=%3$s)."
+
+#. TRANS: Encouragement displayed on empty timeline user pages for anonymous users.
+#. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
+#. TRANS: Empty list message for page with replies for a user for not logged in users.
+#. TRANS: %1$s is a user nickname. This message contains a Markdown link in the form [link text](link).
+#. TRANS: Second sentence of empty message for anonymous users. %s is a user nickname.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#, php-format
+msgid ""
+"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
+"post a notice to them."
+msgstr ""
+"Zergatik ez [kontu bat ireki](%%%%action.register%%%%) eta ondoren %s "
+"zirikatu edo ohar bat bidali."
+
+#. TRANS: Button text for inviting more users to the StatusNet instance.
+#. TRANS: Less business/enterprise-oriented language for public sites.
+msgctxt "BUTTON"
+msgid "Send invite"
+msgstr "Bidali gonbidapena"
+
+#. TRANS: Message is used as link title. %s is a user nickname.
+#. TRANS: Title of API timeline for a user and friends.
+#. TRANS: %s is a username.
+#. TRANS: Timeline title for user and friends. %s is a user nickname.
+#. TRANS: Menu item title in administrator navigation panel.
+#. TRANS: %s is a username.
+#. TRANS: Menu item title in personal group navigation menu.
+#. TRANS: %s is a username.
+#, php-format
+msgid "%s and friends"
+msgstr "%s eta lagunak"
+
+#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
+#. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name.
+#, php-format
+msgid "Updates from %1$s and friends on %2$s!"
+msgstr "%2$s(e)n %1$s(e)k eta bere lagunek bidalitako azken mezuak!"
+
+#. TRANS: Client error displayed when coming across a non-supported API method.
+#. TRANS: Client error displayed when trying to handle an unknown API method.
+#. TRANS: Client error displayed when coming across a non-supported API method.
+msgid "API method not found."
+msgstr "API metodoa ez da aurkitu."
+
+#. TRANS: Client error message. POST is a HTTP command. It should not be translated.
+#. TRANS: Client error. POST is a HTTP command. It should not be translated.
+#. TRANS: Client error message. POST is a HTTP command. It should not be translated.
+#. TRANS: Client error. POST is a HTTP command. It should not be translated.
+msgid "This method requires a POST."
+msgstr "Metodo honek POST behar du."
+
+#. TRANS: Client error displayed when no valid device parameter is provided for a user's delivery device setting.
+msgid ""
+"You must specify a parameter named 'device' with a value of one of: sms, im, "
+"none."
+msgstr ""
+"Adi, 'device' izeneko parametro bat definitu behar zenuke ondorengo balioren "
+"batekin: sms, im, ezer ez."
+
+#. TRANS: Server error displayed when a user's delivery device cannot be updated.
+#. TRANS: Server error displayed when confirming an e-mail address or IM address fails.
+#. TRANS: Server error thrown on database error updating e-mail preferences.
+#. TRANS: Server error thrown on database error removing a registered e-mail address.
+#. TRANS: Server error thrown when user profile settings could not be updated.
+#. TRANS: Server error thrown on database error updating SMS preferences.
+#. TRANS: Server error thrown on database error removing a registered SMS phone number.
+#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
+msgid "Could not update user."
+msgstr "Ezin da erabiltzailea eguneratu."
+
+#. TRANS: Error message displayed when referring to a user without a profile.
+msgid "User has no profile."
+msgstr "Erabiltzaileak ez du profilik."
+
+#. TRANS: Server error displayed if a user profile could not be saved.
+#. TRANS: Server error thrown when user profile settings could not be saved.
+msgid "Could not save profile."
+msgstr "Ezin izan da profila gorde."
+
+#. TRANS: Client error displayed when the number of bytes in a POST request exceeds a limit.
+#. TRANS: %s is the number of bytes of the CONTENT_LENGTH.
+#, php-format
+msgid ""
+"The server was unable to handle that much POST data (%s byte) due to its "
+"current configuration."
+msgid_plural ""
+"The server was unable to handle that much POST data (%s bytes) due to its "
+"current configuration."
+msgstr[0] ""
+"Zerbitzariak ezin izan du hainbeste POST informazio jasan (byte %s) uneko "
+"ezarpenekin."
+msgstr[1] ""
+"Zerbitzariak ezin izan du hainbeste POST informazio jasan (%s bytes) uneko "
+"ezarpenekin."
+
+#. TRANS: Title for Atom feed.
+msgctxt "ATOM"
+msgid "Main"
+msgstr "Nagusia"
+
+#. TRANS: Title for Atom feed. %s is a user nickname.
+#. TRANS: Message is used as link title. %s is a user nickname.
+#. TRANS: Title in atom group notice feed. %s is a group name.
+#. TRANS: Title in atom user notice feed. %s is a user name.
+#, php-format
+msgid "%s timeline"
+msgstr "%s denbora-lerroa"
+
+#. TRANS: Title for Atom feed with a user's subscriptions. %s is a user nickname.
+#. TRANS: Title for Atom subscription feed.
+#. TRANS: %s is a user nickname.
+#. TRANS: Header for subscriptions overview for a user (first page).
+#. TRANS: %s is a user nickname.
+#, php-format
+msgid "%s subscriptions"
+msgstr "%s harpidetza"
+
+#. TRANS: Title for Atom feed with a user's favorite notices. %s is a user nickname.
+#. TRANS: Title for Atom favorites feed.
+#. TRANS: %s is a user nickname.
+#, php-format
+msgid "%s favorites"
+msgstr "%s gogoko"
+
+#. TRANS: Title for Atom feed with a user's memberships. %s is a user nickname.
+#, php-format
+msgid "%s memberships"
+msgstr "%s taldeko kide"
+
+#. TRANS: Client error displayed when users try to block themselves.
+msgid "You cannot block yourself!"
+msgstr "Ezin duzu zure burua blokeatu!"
+
+#. TRANS: Server error displayed when blocking a user has failed.
+msgid "Block user failed."
+msgstr "Erabiltzailea blokeatzeak huts egin du."
+
+#. TRANS: Server error displayed when unblocking a user has failed.
+msgid "Unblock user failed."
+msgstr "Erabiltzailea desblokeatzeak huts egin du."
+
+#. TRANS: Client exception thrown when no conversation ID is given.
+msgid "No conversation ID."
+msgstr "Ez dago elkarrizketa IDrik."
+
+#. TRANS: Client exception thrown when referring to a non-existing conversation ID (%d).
+#, php-format
+msgid "No conversation with ID %d."
+msgstr "Ez dago %d IDa duen elkarrizketarik."
+
+#. TRANS: Title for conversion timeline.
+msgctxt "TITLE"
+msgid "Conversation"
+msgstr "Elkarrizketa"
+
+#. TRANS: Title. %s is a user nickname.
+#, php-format
+msgid "Direct messages from %s"
+msgstr "%s(r)en zuzeneko mezua"
+
+#. TRANS: Subtitle. %s is a user nickname.
+#, php-format
+msgid "All the direct messages sent from %s"
+msgstr "%s(r)en zuzeneko mezu guztiak"
+
+#. TRANS: Title. %s is a user nickname.
+#, php-format
+msgid "Direct messages to %s"
+msgstr "Bidali mezua zuzenean %s(r)i"
+
+#. TRANS: Subtitle. %s is a user nickname.
+#, php-format
+msgid "All the direct messages sent to %s"
+msgstr "%s(r)i zuzenean bidalitako mezu guztiak"
+
+#. TRANS: Client error displayed when no message text was submitted (406).
+msgid "No message text!"
+msgstr "Testurik ez mezuan!"
+
+#. TRANS: Client error displayed when message content is too long.
+#. TRANS: %d is the maximum number of characters for a message.
+#. TRANS: Form validation error displayed when message content is too long.
+#. TRANS: %d is the maximum number of characters for a message.
+#, php-format
+msgid "That's too long. Maximum message size is %d character."
+msgid_plural "That's too long. Maximum message size is %d characters."
+msgstr[0] "Luzeegia da hori. Mezuaren tamaina maximoa karaktere %d da."
+msgstr[1] "Luzeegia da hori. Mezuaren tamaina maximoa %d karaktere dira."
+
+#. TRANS: Client error displayed if a recipient user could not be found (403).
+msgid "Recipient user not found."
+msgstr "Ez da hartzailea aurkitu."
+
+#. TRANS: Client error displayed trying to direct message another user who's not a friend (403).
+msgid "Cannot send direct messages to users who aren't your friend."
+msgstr "Ezin dizkiozu zure lagunak ez direnei zuzeneko mezuak bidali."
+
+#. TRANS: Client error displayed trying to direct message self (403).
+#. TRANS: Client error displayed trying to send a direct message to self.
+#. TRANS: Error text shown when trying to send a direct message to self.
+msgid ""
+"Do not send a message to yourself; just say it to yourself quietly instead."
+msgstr ""
+"Etzaiozu zure buruari mezurik bidali; zure buruari isiltasunean esatea "
+"nahiko da."
+
+#. TRANS: Client error displayed when requesting a status with a non-existing ID.
+#. TRANS: Client error displayed when trying to remove a favourite with an invalid ID.
+#. TRANS: Client error displayed trying to delete a status with an invalid ID.
+msgid "No status found with that ID."
+msgstr "Ez da egoerarik aurkitu ID horrekin."
+
+#. TRANS: Client error displayed when trying to mark a notice favourite that already is a favourite.
+msgid "This status is already a favorite."
+msgstr "Egoera hau gogokoa da dagoeneko."
+
+#. TRANS: Client error displayed when marking a notice as favourite fails.
+#. TRANS: Server error displayed when trying to mark a notice as favorite fails in the database.
+#. TRANS: Error message text shown when a favorite could not be set.
+msgid "Could not create favorite."
+msgstr "Ezin da gogokoa sortu."
+
+#. TRANS: Client error displayed when trying to remove a favourite that was not a favourite.
+msgid "That status is not a favorite."
+msgstr "Egoera hori ez da gogokoetakoa."
+
+#. TRANS: Client error displayed when removing a favourite has failed.
+#. TRANS: Server error displayed when removing a favorite from the database fails.
+msgid "Could not delete favorite."
+msgstr "Ezin da gogokoa ezabatu."
+
+#. TRANS: Client error displayed when trying follow who's profile could not be found.
+msgid "Could not follow user: profile not found."
+msgstr "Ezin da erabiltzailea jarraitu: ez da profila aurkitu."
+
+#. TRANS: Client error displayed when trying to follow a user that's already being followed.
+#. TRANS: %s is the nickname of the user that is already being followed.
+#, php-format
+msgid "Could not follow user: %s is already on your list."
+msgstr "Ezin da erabiltzailea jarraitu: %s dagoeneko zure zerrendan dago."
+
+#. TRANS: Client error displayed when trying to unfollow a user that cannot be found.
+msgid "Could not unfollow user: User not found."
+msgstr "Ezin da zerrendatik kendu: erabiltzailea ez da aurkitu."
+
+#. TRANS: Client error displayed when trying to unfollow self.
+msgid "You cannot unfollow yourself."
+msgstr "Ezin diozu zure burua jarraitzeari utzi."
+
+#. TRANS: Client error displayed when supplying invalid parameters to an API call checking if a friendship exists.
+msgid "Two valid IDs or nick names must be supplied."
+msgstr "Baliozko bi ID edo pantaila_izen hornituak izan behar dira."
+
+#. TRANS: Client error displayed when a source user could not be determined showing friendship.
+msgid "Could not determine source user."
+msgstr "Ezin da jatorrizko erabiltzailea lortu."
+
+#. TRANS: Client error displayed when a target user could not be determined showing friendship.
+msgid "Could not find target user."
+msgstr "Ezin da helburu erabiltzailea aurkitu."
+
+#. TRANS: Client error trying to create a group with a nickname this is already in use.
+#. TRANS: API validation exception thrown when nickname is already used.
+#. TRANS: Group edit form validation error.
+#. TRANS: Group create form validation error.
+#. TRANS: Validation error in form for profile settings.
+#. TRANS: Form validation error displayed when trying to register with an existing nickname.
+msgid "Nickname already in use. Try another one."
+msgstr "Erabiltzaile-izena norbaitek hartu du. Saiatu beste batekin."
+
+#. TRANS: Client error in form for group creation.
+#. TRANS: API validation exception thrown when nickname does not validate.
+#. TRANS: Group edit form validation error.
+#. TRANS: Group create form validation error.
+#. TRANS: Validation error in form for profile settings.
+#. TRANS: Form validation error displayed when trying to register with an invalid nickname.
+msgid "Not a valid nickname."
+msgstr "Erabiltzaile izena ez da baliozkoa."
+
+#. TRANS: Client error in form for group creation.
+#. TRANS: API validation exception thrown when homepage URL does not validate.
+#. TRANS: Validation error shown when providing an invalid homepage URL in the "Edit application" form.
+#. TRANS: Group edit form validation error.
+#. TRANS: Validation error shown when providing an invalid homepage URL in the "New application" form.
+#. TRANS: Group create form validation error.
+#. TRANS: Validation error in form for profile settings.
+#. TRANS: Form validation error displayed when trying to register with an invalid homepage URL.
+msgid "Homepage is not a valid URL."
+msgstr "Hasiera-orria ez da baliozko URLa."
+
+#. TRANS: Client error in form for group creation.
+#. TRANS: API validation exception thrown when full name does not validate.
+#. TRANS: Group edit form validation error.
+#. TRANS: Group create form validation error.
+#. TRANS: Validation error in form for profile settings.
+#. TRANS: Form validation error displayed when trying to register with a too long full name.
+msgid "Full name is too long (maximum 255 characters)."
+msgstr "Izen osoa luzeegia da (gehienez 255 karakere)."
+
+#. TRANS: Client error shown when providing too long a description during group creation.
+#. TRANS: %d is the maximum number of allowed characters.
+#. TRANS: API validation exception thrown when description does not validate.
+#. TRANS: %d is the maximum description length and used for plural.
+#. TRANS: Validation error shown when providing too long a description in the "Edit application" form.
+#. TRANS: %d is the maximum number of allowed characters.
+#. TRANS: Group edit form validation error.
+#. TRANS: Client error shown when providing too long a description when editing a list.
+#. TRANS: %d is the maximum number of allowed characters.
+#. TRANS: Form validation error in New application form.
+#. TRANS: %d is the maximum number of characters for the description.
+#. TRANS: Group create form validation error.
+#. TRANS: %d is the maximum number of allowed characters.
+#, php-format
+msgid "Description is too long (maximum %d character)."
+msgid_plural "Description is too long (maximum %d characters)."
+msgstr[0] "Deskribapena luzeegia da (gehienez karakere %d)."
+msgstr[1] "Deskribapena luzeegia da (gehienez %d karakere)."
+
+#. TRANS: Client error shown when providing too long a location during group creation.
+#. TRANS: API validation exception thrown when location does not validate.
+#. TRANS: Group edit form validation error.
+#. TRANS: Group create form validation error.
+#. TRANS: Validation error in form for profile settings.
+#. TRANS: Form validation error displayed when trying to register with a too long location.
+msgid "Location is too long (maximum 255 characters)."
+msgstr "Kokalekua luzeegia (gehienez 255 karakere)."
+
+#. TRANS: Client error shown when providing too many aliases during group creation.
+#. TRANS: %d is the maximum number of allowed aliases.
+#. TRANS: API validation exception thrown when aliases do not validate.
+#. TRANS: %d is the maximum number of aliases and used for plural.
+#. TRANS: Group edit form validation error.
+#. TRANS: %d is the maximum number of allowed aliases.
+#. TRANS: Group create form validation error.
+#. TRANS: %d is the maximum number of allowed aliases.
+#, php-format
+msgid "Too many aliases! Maximum %d allowed."
+msgid_plural "Too many aliases! Maximum %d allowed."
+msgstr[0] "Alias gehiegi! Gehienez %d onartzen dira."
+msgstr[1] "Alias gehiegi! Gehienez %d onartzen dira."
+
+#. TRANS: Client error shown when providing an invalid alias during group creation.
+#. TRANS: %s is the invalid alias.
+#. TRANS: API validation exception thrown when aliases does not validate.
+#. TRANS: %s is the invalid alias.
+#, php-format
+msgid "Invalid alias: \"%s\"."
+msgstr "Alias baliogabea: \"%s\"."
+
+#. TRANS: Client error displayed when trying to use an alias during group creation that is already in use.
+#. TRANS: %s is the alias that is already in use.
+#. TRANS: API validation exception thrown when aliases is already used.
+#. TRANS: %s is the already used alias.
+#. TRANS: Group edit form validation error.
+#. TRANS: Group create form validation error. %s is the already used alias.
+#, php-format
+msgid "Alias \"%s\" already in use. Try another one."
+msgstr "\"%s\" aliasa norbaitek hartu du. Saiatu beste batekin."
+
+#. TRANS: Client error displayed when trying to use an alias during group creation that is the same as the group's nickname.
+#. TRANS: Group edit form validation error.
+msgid "Alias can't be the same as nickname."
+msgstr "Aliasa eta ezizena ezin dira berdinak izan."
+
+#. TRANS: Client error displayed when checking group membership for a non-existing group.
+#. TRANS: Client error displayed when trying to join a group that does not exist.
+#. TRANS: Client error displayed when trying to leave a group that does not exist.
+#. TRANS: Client error displayed trying to show group membership on a non-existing group.
+#. TRANS: Client error displayed when not providing a group or an invalid group.
+#. TRANS: Client error displayed when trying to show a group that could not be found.
+#. TRANS: Client error displayed requesting most recent notices to a group for a non-existing group.
+msgid "Group not found."
+msgstr "Taldea ez da aurkitu."
+
+#. TRANS: Server error displayed when trying to join a group the user is already a member of.
+#. TRANS: Client error displayed when trying to join a group while already a member.
+#. TRANS: Error text shown a user tries to join a group they already are a member of.
+msgid "You are already a member of that group."
+msgstr "Dagoeneko talde horretako partaide zara."
+
+#. TRANS: Server error displayed when trying to join a group the user is blocked from joining.
+#. TRANS: Client error displayed when trying to join a group while being blocked form joining it.
+#. TRANS: Error text shown when a user tries to join a group they are blocked from joining.
+msgid "You have been blocked from that group by the admin."
+msgstr "Administratzaileak talde horretan blokeatu egin zaitu."
+
+#. TRANS: Server error displayed when joining a group failed in the database.
+#. TRANS: %1$s is the joining user's nickname, $2$s is the group nickname for which the join failed.
+#. TRANS: Message given having failed to add a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#, php-format
+msgid "Could not join user %1$s to group %2$s."
+msgstr "%1$s erabiltzailea ezin da %2$s taldearekin elkartu."
+
+#. TRANS: Server error displayed when trying to leave a group the user is not a member of.
+msgid "You are not a member of this group."
+msgstr "Ez zara talde horretako partaide."
+
+#. TRANS: Server error displayed when leaving a group failed in the database.
+#. TRANS: %1$s is the leaving user's nickname, $2$s is the group nickname for which the leave failed.
+#. TRANS: Message given having failed to remove a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#, php-format
+msgid "Could not remove user %1$s from group %2$s."
+msgstr "%1$s ezin da %2$s taldetik ezabatu."
+
+#. TRANS: Used as title in check for group membership. %s is a user name.
+#, php-format
+msgid "%s's groups"
+msgstr "%s(r)en taldeak"
+
+#. TRANS: Used as subtitle in check for group membership. %1$s is the site name, %2$s is a user name.
+#, php-format
+msgid "%1$s groups %2$s is a member of."
+msgstr "%2$s kidea den %1$s(e)ko taldeak."
+
+#. TRANS: Message is used as a title when listing the lastest 20 groups. %s is a site name.
+#. TRANS: Page title for first page of groups for a user.
+#. TRANS: %s is a nickname.
+#, php-format
+msgid "%s groups"
+msgstr "%s talde"
+
+#. TRANS: Message is used as a subtitle when listing the latest 20 groups. %s is a site name.
+#, php-format
+msgid "groups on %s"
+msgstr "%s(e)ko taldeak"
+
+#. TRANS: Client error displayed when trying to edit a group without being an admin.
+#. TRANS: Client error displayed trying to edit a group while not being a group admin.
+#. TRANS: Client error displayed when trying to change group logo settings while not being a group admin.
+msgid "You must be an admin to edit the group."
+msgstr "Talde bat aldatzeko administratzailea izan behar zara."
+
+#. TRANS: Server error displayed when group update fails.
+#. TRANS: Server error displayed when editing a group fails.
+msgid "Could not update group."
+msgstr "Ezin da taldea eguneratu."
+
+#. TRANS: Server error displayed when adding group aliases fails.
+#. TRANS: Server error displayed when group aliases could not be added.
+#. TRANS: Server exception thrown when creating group aliases failed.
+msgid "Could not create aliases."
+msgstr "Ezin izan da aliasa sortu."
+
+#. TRANS: API validation exception thrown when nickname does not validate.
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+msgid "Nickname must have only lowercase letters and numbers and no spaces."
+msgstr ""
+"Erabiltzaile izenak hizki xeheak eta zenbakiak eduki ditzake soilik, "
+"zuriunerik gabe."
+
+#. TRANS: API validation exception thrown when alias is the same as nickname.
+#. TRANS: Group create form validation error.
+msgid "Alias cannot be the same as nickname."
+msgstr "Aliasa eta ezizena ezin dira berdinak izan."
+
+#. TRANS: Client error displayed when referring to a non-existing list.
+#. TRANS: Client error displayed trying to perform an action related to a non-existing list.
+#. TRANS: Client error displayed when referring to a non-existing list.
+msgid "List not found."
+msgstr "Zerrenda ez da aurkitu."
+
+#. TRANS: Client error displayed when trying to update another user's list.
+msgid "You cannot update lists that do not belong to you."
+msgstr "Ezin dituzu zureak ez diren zerrendak eguneratu."
+
+#. TRANS: Client error displayed when an unknown error occurs updating a list.
+#. TRANS: Client error displayed when an unknown error occurs viewing list members.
+#. TRANS: Client error displayed when an unknown error occurs in the list subscribers action.
+#. TRANS: Client error displayed when an unknown error occurs unsubscribing from a list.
+msgid "An error occured."
+msgstr "Errorea gertatu da."
+
+#. TRANS: Client error displayed when trying to delete another user's list.
+msgid "You cannot delete lists that do not belong to you."
+msgstr "Ezin dituzu zureak ez diren zerrendak ezabatu."
+
+#. TRANS: Client error displayed when referring to a non-list member.
+msgid "The specified user is not a member of this list."
+msgstr "Adierazitako erabiltzailea ez da zerrenda honetako kidea."
+
+#. TRANS: Client error displayed when trying to add members to a list without having the right to do so.
+msgid "You are not allowed to add members to this list."
+msgstr "Ez duzu zerrenda honetara erabiltzaileak gehitzeko baimenik."
+
+#. TRANS: Client error displayed when trying to modify list members without specifying them.
+msgid "You must specify a member."
+msgstr "Kide bat adierazi behar duzu."
+
+#. TRANS: Client error displayed when trying to remove members from a list without having the right to do so.
+msgid "You are not allowed to remove members from this list."
+msgstr "Ez duzu zerrenda honetako kideak kentzeko baimenik."
+
+#. TRANS: Client error displayed when trying to remove a list member that is not part of a list.
+msgid "The user you are trying to remove from the list is not a member."
+msgstr "Zerrendatik kentzen saiatzen ari zaren erabiltzailea ez da kidea."
+
+#. TRANS: Client error displayed when trying to create a list without a name.
+msgid "A list must have a name."
+msgstr "Zerrendek izena eduki behar dute."
+
+#. TRANS: Client error displayed when a membership check for a user is nagative.
+msgid "The specified user is not a subscriber of this list."
+msgstr "Adierazitako erabiltzailea ez da zerrenda honetako harpideduna."
+
+#. TRANS: Client error displayed when trying to unsubscribe from a non-subscribed list.
+msgid "You are not subscribed to this list."
+msgstr "Ez zaude zerrenda honetara harpidetuta."
+
+#. TRANS: Client error displayed when uploading a media file has failed.
+msgid "Upload failed."
+msgstr "Igoerak huts egin du."
+
+#. TRANS: Client error given from the OAuth API when the request token or verifier is invalid.
+msgid "Invalid request token or verifier."
+msgstr "Token-eskaera edo baieztatzaile okerra."
+
+#. TRANS: Client error given when no oauth_token was passed to the OAuth API.
+msgid "No oauth_token parameter provided."
+msgstr "Ez da oauth_token parametroa eman."
+
+#. TRANS: Client error given when an invalid request token was passed to the OAuth API.
+msgid "Invalid request token."
+msgstr "Token okerra."
+
+#. TRANS: Client error given when an invalid request token was passed to the OAuth API.
+msgid "Request token already authorized."
+msgstr "Token-eskaera dagoeneko baimendua."
+
+#. TRANS: Form validation error given when an invalid username and/or password was passed to the OAuth API.
+msgid "Invalid nickname / password!"
+msgstr "Erabailtzaile / pasahitz okerra!"
+
+#. TRANS: Server error displayed when a database action fails.
+msgid "Database error inserting oauth_token_association."
+msgstr "Datu-base errorea oauth_token_association txertatzean."
+
+#. TRANS: Client error given on when invalid data was passed through a form in the OAuth API.
+#. TRANS: Unexpected validation error on avatar upload form.
+#. TRANS: Client error displayed submitting invalid form data for edit application.
+#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
+#. TRANS: Form validation error message when an unsupported argument is used.
+#. TRANS: Message given submitting a form with an unknown action in Instant Messaging settings.
+#. TRANS: Client error displayed when encountering an unexpected action on form submission.
+#. TRANS: Client error when submitting a form with unexpected information.
+#. TRANS: Client error displayed when unexpected data is posted in the password recovery form.
+#. TRANS: Message given submitting a form with an unknown action in SMS settings.
+msgid "Unexpected form submission."
+msgstr "Espero ez zen formularioaren bidalketa."
+
+#. TRANS: Title for a page where a user can confirm/deny account access by an external application.
+msgid "An application would like to connect to your account"
+msgstr "Aplikazio batek zure kontuarekin konektatu nahi du"
+
+#. TRANS: Fieldset legend.
+msgid "Allow or deny access"
+msgstr "Sarrera baimendu edo galarazi"
+
+#. TRANS: User notification of external application requesting account access.
+#. TRANS: %3$s is the access type requested (read-write or read-only), %4$s is the StatusNet sitename.
+#, php-format
+msgid ""
+"An application would like the ability to <strong>%3$s</strong> your %4$s "
+"account data. You should only give access to your %4$s account to third "
+"parties you trust."
+msgstr ""
+"Aplikazio batek, %4$s(e)n duzun kontuko datuetan, ondoko eragiketa egin nahi "
+"du: <strong>%3$s</strong>. Fidatzen zaren hirugarrenei soilik eman behar "
+"zenieke sarrera %4$s(e)n duzun kontura."
+
+#. TRANS: User notification of external application requesting account access.
+#. TRANS: %1$s is the application name requesting access, %2$s is the organisation behind the application,
+#. TRANS: %3$s is the access type requested, %4$s is the StatusNet sitename.
+#, php-format
+msgid ""
+"The application <strong>%1$s</strong> by <strong>%2$s</strong> would like "
+"the ability to <strong>%3$s</strong> your %4$s account data. You should only "
+"give access to your %4$s account to third parties you trust."
+msgstr ""
+"<strong>%2$s</strong>(r)en <strong>%1$s</strong> aplikazioak eskertuko luke "
+"zure %4$s kontuko datuak  <strong>%3$s</strong>t(z)ea. Fidatzen zaren "
+"hirugarrenei soilik eman behar zenieke sarrera %4$s(e)n duzun kontura."
+
+#. TRANS: Fieldset legend.
+msgctxt "LEGEND"
+msgid "Account"
+msgstr "Kontua"
+
+#. TRANS: Field label on OAuth API authorisation form.
+#. TRANS: Field label in form for profile settings.
+#. TRANS: Field label on account registration page.
+#. TRANS: Field label on group edit form.
+#. TRANS: Dropdown option for searching in profiles.
+msgid "Nickname"
+msgstr "Ezizena"
+
+#. TRANS: Field label on OAuth API authorisation form.
+#. TRANS: Field label on login page.
+#. TRANS: Field label on account registration page.
+msgid "Password"
+msgstr "Pasahitza"
+
+#. TRANS: Button text that when clicked will cancel the process of allowing access to an account
+#. TRANS: by an external application.
+#. TRANS: Button label to cancel an e-mail address confirmation procedure.
+#. TRANS: Button label to cancel an IM address confirmation procedure.
+#. TRANS: Button label to cancel a SMS address confirmation procedure.
+#. TRANS: Button label in the "Edit application" form.
+msgctxt "BUTTON"
+msgid "Cancel"
+msgstr "Utzi"
+
+#. TRANS: Button text that when clicked will allow access to an account by an external application.
+msgctxt "BUTTON"
+msgid "Allow"
+msgstr "Baimendu"
+
+#. TRANS: Form instructions.
+msgid "Authorize access to your account information."
+msgstr "Sarbidea baimendu zure kontuko informaziora."
+
+#. TRANS: Header for user notification after revoking OAuth access to an application.
+msgid "Authorization canceled."
+msgstr "Baimena ezeztatua."
+
+#. TRANS: User notification after revoking OAuth access to an application.
+#. TRANS: %s is an OAuth token.
+#, php-format
+msgid "The request token %s has been revoked."
+msgstr "Eskatutako %s tokena kendu egin da."
+
+#. TRANS: Title of the page notifying the user that an anonymous client application was successfully authorized to access the user's account with OAuth.
+msgid "You have successfully authorized the application"
+msgstr "Aplikazioa ondo baimendu duzu"
+
+#. TRANS: Message notifying the user that an anonymous client application was successfully authorized to access the user's account with OAuth.
+msgid ""
+"Please return to the application and enter the following security code to "
+"complete the process."
+msgstr ""
+"Itzuli aplikaziora eta sartu ondoko segurtasun kodea prozesua osatzeko."
+
+#. TRANS: Title of the page notifying the user that the client application was successfully authorized to access the user's account with OAuth.
+#. TRANS: %s is the authorised application name.
+#, php-format
+msgid "You have successfully authorized %s"
+msgstr "%s ondo baimendu duzu"
+
+#. TRANS: Message notifying the user that the client application was successfully authorized to access the user's account with OAuth.
+#. TRANS: %s is the authorised application name.
+#, php-format
+msgid ""
+"Please return to %s and enter the following security code to complete the "
+"process."
+msgstr "Itzuli %s(e)ra eta sartu ondoko segurtasun kodea prozesua osatzeko."
+
+#. TRANS: Client error displayed trying to delete a status not using POST or DELETE.
+#. TRANS: POST and DELETE should not be translated.
+msgid "This method requires a POST or DELETE."
+msgstr "Metodo honek POST edo DELETE bat behar du."
+
+#. TRANS: Client error displayed trying to delete a status of another user.
+msgid "You may not delete another user's status."
+msgstr "Ezin duzu beste erabiltzaile baten egoera ezabatu."
+
+#. TRANS: Client error displayed trying to repeat a non-existing notice through the API.
+#. TRANS: Client error displayed trying to display redents of a non-exiting notice.
+#. TRANS: Client exception thrown when referencing a non-existing notice.
+#. TRANS: Error message displayed trying to delete a non-existing notice.
+#. TRANS: Client error displayed trying to show a non-existing notice.
+msgid "No such notice."
+msgstr "Ohar hori ez dago."
+
+#. TRANS: Client error displayed calling an unsupported HTTP error in API status show.
+#. TRANS: Client exception thrown when using an unsupported HTTP method.
+#. TRANS: Client exception thrown using an unsupported HTTP method.
+#. TRANS: Client exception thrown when using an unsupported HTTP method.
+#. TRANS: Client error shown when using a non-supported HTTP method.
+#. TRANS: Client exception thrown when using an unsupported HTTP method.
+msgid "HTTP method not supported."
+msgstr "HTTP metodoa ez da onertzen."
+
+#. TRANS: Exception thrown requesting an unsupported notice output format.
+#. TRANS: %s is the requested output format.
+#, php-format
+msgid "Unsupported format: %s."
+msgstr "Formatu ez onartua: %s."
+
+#. TRANS: Client error displayed requesting a deleted status.
+msgid "Status deleted."
+msgstr "Egoera ezabatua."
+
+#. TRANS: Client error displayed requesting a status with an invalid ID.
+msgid "No status with that ID found."
+msgstr "Ez da egoerarik aurkitu ID horrekin."
+
+#. TRANS: Client error displayed when trying to delete a notice not using the Atom format.
+msgid "Can only delete using the Atom format."
+msgstr "Atom formatua erabiliz bakarrik ezabatu daiteke."
+
+#. TRANS: Client error displayed when a user has no rights to delete notices of other users.
+#. TRANS: Error message displayed trying to delete a notice that was not made by the current user.
+msgid "Cannot delete this notice."
+msgstr "Oharra ezabatzea ezinezkoa izan da."
+
+#. TRANS: Confirmation of notice deletion in API. %d is the ID (number) of the deleted notice.
+#, php-format
+msgid "Deleted notice %d"
+msgstr "%d oharra ezabatua"
+
+#. TRANS: Client error displayed when the parameter "status" is missing.
+msgid "Client must provide a 'status' parameter with a value."
+msgstr "Bezeroak 'status' parametro bat eman behar du balio batekin."
+
+#. TRANS: Client error displayed exceeding the maximum notice length.
+#. TRANS: %d is the maximum length for a notice.
+#. TRANS: Client error displayed when the parameter "status" is missing.
+#. TRANS: %d is the maximum number of character for a notice.
+#. TRANS: Error message in incoming mail handler used when an incoming e-mail contains too many characters.
+#, php-format
+msgid "That's too long. Maximum notice size is %d character."
+msgid_plural "That's too long. Maximum notice size is %d characters."
+msgstr[0] "Luzeegia da hori. Oharren luzera gehienez karaktere %d da."
+msgstr[1] "Luzeegia da hori. Oharren luzera gehienez %d karaktere dira."
+
+#. TRANS: Client error displayed when replying to a non-existing notice.
+msgid "Parent notice not found."
+msgstr "Guraso-oharra ez da aurkitu."
+
+#. TRANS: Client error displayed exceeding the maximum notice length.
+#. TRANS: %d is the maximum lenth for a notice.
+#. TRANS: Client error displayed exceeding the maximum notice length.
+#. TRANS: %d is the maximum length for a notice.
+#, php-format
+msgid "Maximum notice size is %d character, including attachment URL."
+msgid_plural "Maximum notice size is %d characters, including attachment URL."
+msgstr[0] "Oharren luzera gehienez karaktere %d da, URL eranskinak barne."
+msgstr[1] "Oharren luzera gehienez %d karaktere dira, URL eranskinak barne."
+
+#. TRANS: Client error displayed when requesting profiles of followers in an unsupported format.
+#. TRANS: Client error displayed when requesting IDs of followers in an unsupported format.
+msgid "Unsupported format."
+msgstr "Formatu ezezaguna."
+
+#. TRANS: Title for timeline of most recent favourite notices by a user.
+#. TRANS: %1$s is the StatusNet sitename, %2$s is a user nickname.
+#, php-format
+msgid "%1$s / Favorites from %2$s"
+msgstr "%1$s / %2$s(r)en gogokoak"
+
+#. TRANS: Subtitle for timeline of most recent favourite notices by a user.
+#. TRANS: %1$s is the StatusNet sitename, %2$s is a user's full name,
+#. TRANS: %3$s is a user nickname.
+#, php-format
+msgid "%1$s updates favorited by %2$s / %3$s."
+msgstr "%1$s(e)n %2$s(e)k (%3$s) gogoko markatutako azken mezuak."
+
+#. TRANS: Server error displayed whe trying to get a timeline fails.
+#. TRANS: %s is the error message.
+#, php-format
+msgid "Could not generate feed for list - %s"
+msgstr "Taldearen jarioa ezin izan da sortu - %s"
+
+#. TRANS: Title for timeline of most recent mentions of a user.
+#. TRANS: %1$s is the StatusNet sitename, %2$s is a user nickname.
+#, php-format
+msgid "%1$s / Updates mentioning %2$s"
+msgstr "%1$s / %2$s aipatzen duten azken mezuak"
+
+#. TRANS: Subtitle for timeline of most recent mentions of a user.
+#. TRANS: %1$s is the StatusNet sitename, %2$s is a user nickname,
+#. TRANS: %3$s is a user's full name.
+#, php-format
+msgid "%1$s updates that reply to updates from %2$s / %3$s."
+msgstr "%1$s(e)n %2$s(r)en (%3$s) azken mezuei erantzuten dieten azken mezuak."
+
+#. TRANS: Title for site timeline. %s is the StatusNet sitename.
+#. TRANS: Public RSS feed title. %s is the StatusNet site name.
+#, php-format
+msgid "%s public timeline"
+msgstr "%s denbora-lerro publikoa"
+
+#. TRANS: Subtitle for site timeline. %s is the StatusNet sitename.
+#, php-format
+msgid "%s updates from everyone!"
+msgstr "%s(e)n denon artean bidalitako azken mezuak!"
+
+#. TRANS: Server error displayed calling unimplemented API method for 'retweeted by me'.
+msgid "Unimplemented."
+msgstr "Inplementatu gabea."
+
+#. TRANS: Title for Atom feed "repeated to me". %s is the user nickname.
+#, php-format
+msgid "Repeated to %s"
+msgstr "%s(e)ra errepikatuta"
+
+#. TRANS: Subtitle for API action that shows most recent notices that are repeats in user's inbox.
+#. TRANS: %1$s is the sitename, %2$s is a user nickname, %3$s is a user profile name.
+#, php-format
+msgid "%1$s notices that were to repeated to %2$s / %3$s."
+msgstr "%2$s / %3$s(r)i errepikatutako oharrak %1$s(e)n."
+
+#. TRANS: Title of list of repeated notices of the logged in user.
+#. TRANS: %s is the nickname of the logged in user.
+#, php-format
+msgid "Repeats of %s"
+msgstr "%s(r)en errepikapenak"
+
+#. TRANS: Subtitle of API time with retweets of me.
+#. TRANS: %1$s is the StatusNet sitename, %2$s is the user nickname, %3$s is the user profile name.
+#, php-format
+msgid "%1$s notices that %2$s / %3$s has repeated."
+msgstr "%2$s / %3$s(e)k errepikatutako %1$s oharrak."
+
+#. TRANS: Title for timeline with lastest notices with a given tag.
+#. TRANS: %s is the tag.
+#. TRANS: Title for first page of notices with tags.
+#. TRANS: %s is the tag.
+#, php-format
+msgid "Notices tagged with %s"
+msgstr "%s(r)ekin etiketatutako oharrak"
+
+#. TRANS: Subtitle for timeline with lastest notices with a given tag.
+#. TRANS: %1$s is the tag, $2$s is the StatusNet sitename.
+#. TRANS: Tag feed description.
+#. TRANS: %1$s is the tag name, %2$s is the StatusNet sitename.
+#, php-format
+msgid "Updates tagged with %1$s on %2$s!"
+msgstr "%2$s(e)n %1$s etiketarekin bidalitako azken mezuak!"
+
+#. TRANS: Client error displayed trying to add a notice to another user's timeline.
+msgid "Only the user can add to their own timeline."
+msgstr "Erabiltzaileak berak soilik gehitu dezake bere denbora-lerroan."
+
+#. TRANS: Client error displayed when using another format than AtomPub.
+msgid "Only accept AtomPub for Atom feeds."
+msgstr "AtomPub bakarrik onartu Atom-eko jarioetzat."
+
+#. TRANS: Client error displayed attempting to post an empty API notice.
+msgid "Atom post must not be empty."
+msgstr "Atom bidalketa ezin da hutsik egon."
+
+#. TRANS: Client error displayed attempting to post an API that is not well-formed XML.
+msgid "Atom post must be well-formed XML."
+msgstr "Atom bidalketa ondo formatutako XMLa izan behar da."
+
+#. TRANS: Client error displayed when not using an Atom entry.
+msgid "Atom post must be an Atom entry."
+msgstr "Atom bidalketa Atom sarrera bat izan behar da."
+
+#. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
+msgid "Can only handle POST activities."
+msgstr "POST jarduerak bakarrik kudeatu daitezke."
+
+#. TRANS: Client error displayed when using an unsupported activity object type.
+#. TRANS: %s is the unsupported activity object type.
+#, php-format
+msgid "Cannot handle activity object type \"%s\"."
+msgstr "Ezin da \"%s\" ekintza objektua exekutatu."
+
+#. TRANS: Client error displayed when posting a notice without content through the API.
+#. TRANS: %d is the notice ID (number).
+#, php-format
+msgid "No content for notice %d."
+msgstr "%d oharrak ez du edukirik."
+
+#. TRANS: Client error displayed when using another format than AtomPub.
+#. TRANS: %s is the notice URI.
+#, php-format
+msgid "Notice with URI \"%s\" already exists."
+msgstr "\"%s\" URIdun oharra jadanik badago."
+
+#. TRANS: Server error for unfinished API method showTrends.
+msgid "API method under construction."
+msgstr "APIko metodoa eraikitzen dago."
+
+#. TRANS: Client error displayed when requesting user information for a non-existing user.
+msgid "User not found."
+msgstr "Erabiltzailea ez da aurkitu."
+
+#. TRANS: Client error displayed when trying to leave a group while not logged in.
+msgid "You must be logged in to leave a group."
+msgstr "Saioa hasi behar duzu taldea uzteko."
+
+#. TRANS: Client error displayed when trying to leave a non-local group.
+#. TRANS: Client error displayed when trying to leave a non-existing group.
+#. TRANS: Client exception thrown when referencing a non-existing group.
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
+#. TRANS: Client error displayed when trying to leave a non-local group.
+#. TRANS: Client error displayed when trying to leave a non-existing group.
+#. TRANS: Client error when trying to delete a non-local group.
+#. TRANS: Client error when trying to delete a non-existing group.
+#. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed without providing a group nickname.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed for a non-local group.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed for a nickname that is not a group.
+#. TRANS: Client error displayed trying to block a user from a group while specifying a non-existing group.
+#. TRANS: Client error displayed referring to a group's permalink for a non-existing group ID.
+#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
+#. TRANS: Client error displayed when trying to view group members for a non-existing group.
+#. TRANS: Client error displayed when trying to view group members for an object that is not a group.
+#. TRANS: Client error displayed when requesting a group RSS feed for group that does not exist.
+#. TRANS: Client error displayed when requesting a group RSS feed for an object that is not a group.
+#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
+#. TRANS: Client error displayed when trying to join a non-local group.
+#. TRANS: Client error displayed when trying to join a non-existing group.
+#. TRANS: Client error displayed when trying to leave a non-local group.
+#. TRANS: Client error displayed when trying to leave a non-existing group.
+#. TRANS: Client error displayed when providing an invalid group ID on the Make Admin page.
+#. TRANS: Command exception text shown when a group is requested that does not exist.
+#. TRANS: Error text shown when trying to leave a group that does not exist.
+#. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
+#. TRANS: Client error displayed if no local group with a given name was found requesting group page.
+msgid "No such group."
+msgstr "Talde hori ez dago."
+
+#. TRANS: Client error displayed when trying to leave a group without providing a group name or group ID.
+#. TRANS: Client error when trying to delete a group without providing a nickname or ID for the group.
+#. TRANS: Client error displayed when trying to join a group without providing a group name or group ID.
+#. TRANS: Client error displayed when trying to leave a group without providing a group name or group ID.
+msgid "No nickname or ID."
+msgstr "Erabiltzaile izen edo IDrik ez."
+
+#. TRANS: Client error displayed trying to approve group membership while not logged in.
+#. TRANS: Client error displayed when trying to leave a group while not logged in.
+msgid "Must be logged in."
+msgstr "Saioa hasi behar duzu."
+
+#. TRANS: Client error displayed trying to approve group membership while not a group administrator.
+#. TRANS: Client error displayed when trying to approve or cancel a group join request without
+#. TRANS: being a group administrator.
+msgid "Only group admin can approve or cancel join requests."
+msgstr ""
+"Talde-administratzaileak soilik onartu edo ezeztatu ditzake elkartze-"
+"eskariak."
+
+#. TRANS: Client error displayed trying to approve group membership without specifying a profile to approve.
+#. TRANS: Client error displayed trying to approve subscriptionswithout specifying a profile to approve.
+msgid "Must specify a profile."
+msgstr "Profil bat zehaztu behar duzu."
+
+#. TRANS: Client error displayed trying to approve group membership for a non-existing request.
+#. TRANS: %s is a nickname.
+#. TRANS: Client error displayed when trying to approve a non-existing group join request.
+#. TRANS: %s is a user nickname.
+#, php-format
+msgid "%s is not in the moderation queue for this group."
+msgstr "%s ez dago talde honen moderazio-ilaran."
+
+#. TRANS: Client error displayed trying to approve/deny group membership.
+#. TRANS: Client error displayed trying to approve/deny subscription.
+msgid "Internal error: received neither cancel nor abort."
+msgstr "Barne-errorea: ez da ez ezeztatzerik ez abortatzerik jaso."
+
+#. TRANS: Client error displayed trying to approve/deny group membership.
+#. TRANS: Client error displayed trying to approve/deny  subscription
+msgid "Internal error: received both cancel and abort."
+msgstr "Barne-errorea: ezeztatzea eta abortatzea, biak jaso dira."
+
+#. TRANS: Server error displayed when cancelling a queued group join request fails.
+#. TRANS: %1$s is the leaving user's nickname, $2$s is the group nickname for which the leave failed.
+#, php-format
+msgid "Could not cancel request for user %1$s to join group %2$s."
+msgstr ""
+"Ezin izan da %2$s taldearekin elkartzeko %1$s erabiltzaileren eskaera "
+"ezeztatu."
+
+#. TRANS: Title for leave group page after group join request is approved/disapproved.
+#. TRANS: %1$s is the user nickname, %2$s is the group nickname.
+#, php-format
+msgctxt "TITLE"
+msgid "%1$s's request for %2$s"
+msgstr "%1$s(r)en eskaera %2$s talderako"
+
+#. TRANS: Message on page for group admin after approving a join request.
+msgid "Join request approved."
+msgstr "Elkartze-eskaria onartu da."
+
+#. TRANS: Message on page for group admin after rejecting a join request.
+msgid "Join request canceled."
+msgstr "Elkartze-eskaria utzi egin da."
+
+#. TRANS: Client error displayed trying to approve subscription for a non-existing request.
+#. TRANS: %s is a user nickname.
+#, php-format
+msgid "%s is not in the moderation queue for your subscriptions."
+msgstr "%s ez dago moderazio-ilaran zure harpidetzetarako."
+
+#. TRANS: Server error displayed when cancelling a queued subscription request fails.
+#. TRANS: %1$s is the leaving user's nickname, $2$s is the nickname for which the leave failed.
+#, php-format
+msgid "Could not cancel or approve request for user %1$s to join group %2$s."
+msgstr ""
+"Ezin izan da %1$s erabiltzailea %2$s taldearekin elkartzeko eskaera ezeztatu "
+"edo onartu."
+
+#. TRANS: Title for subscription approval ajax return
+#. TRANS: %1$s is the approved user's nickname
+#, php-format
+msgctxt "TITLE"
+msgid "%1$s's request"
+msgstr "%1$s(r)en eskaerak"
+
+#. TRANS: Message on page for user after approving a subscription request.
+msgid "Subscription approved."
+msgstr "Harpidetza onartu da."
+
+#. TRANS: Message on page for user after rejecting a subscription request.
+msgid "Subscription canceled."
+msgstr "Harpidetza utzi da."
+
+#. TRANS: Subtitle for Atom favorites feed.
+#. TRANS: %1$s is a user nickname, %2$s is the StatusNet sitename.
+#, php-format
+msgid "Notices %1$s has favorited on %2$s"
+msgstr "%2$s(e)n %1$s(e)k gogoko markatutako oharrak"
+
+#. TRANS: Client exception thrown when trying to set a favorite for another user.
+#. TRANS: Client exception thrown when trying to subscribe another user.
+msgid "Cannot add someone else's subscription."
+msgstr "Ezin duzu beste baten harpidetza gehitu."
+
+#. TRANS: Client exception thrown when trying use an incorrect activity verb for the Atom pub method.
+msgid "Can only handle favorite activities."
+msgstr "Gogokoen jarduerak bakarrik kudeatu daitezke."
+
+#. TRANS: Client exception thrown when trying favorite an object that is not a notice.
+msgid "Can only fave notices."
+msgstr "Oharrak soilik egin daitezke gogoko."
+
+#. TRANS: Client exception thrown when trying favorite a notice without content.
+msgid "Unknown notice."
+msgstr "Ohar ezezaguna."
+
+#. TRANS: Client exception thrown when trying favorite an already favorited notice.
+msgid "Already a favorite."
+msgstr "Dagoeneko gogokoa."
+
+#. TRANS: Title for group membership feed.
+#. TRANS: %s is a username.
+#, php-format
+msgid "Group memberships of %s"
+msgstr "%s erabiltzailearen taldeak"
+
+#. TRANS: Subtitle for group membership feed.
+#. TRANS: %1$s is a username, %2$s is the StatusNet sitename.
+#, php-format
+msgid "Groups %1$s is a member of on %2$s"
+msgstr "%1$s kide den %2$s(e)ko taldeak"
+
+#. TRANS: Client exception thrown when trying subscribe someone else to a group.
+msgid "Cannot add someone else's membership."
+msgstr "Ezin duzu beste baten harpidetza gehitu."
+
+#. TRANS: Client error displayed when not using the join verb.
+msgid "Can only handle join activities."
+msgstr "Elkartze-jarduerak soilik kudea daitezke."
+
+#. TRANS: Client exception thrown when trying to subscribe to a non-existing group.
+msgid "Unknown group."
+msgstr "Talde ezezaguna."
+
+#. TRANS: Client exception thrown when trying to subscribe to an already subscribed group.
+msgid "Already a member."
+msgstr "Dagoeneko kidea zara."
+
+#. TRANS: Client exception thrown when trying to subscribe to group while blocked from that group.
+msgid "Blocked by admin."
+msgstr "Administratzaileak blokeatua."
+
+#. TRANS: Client exception thrown when referencing a non-existing favorite.
+msgid "No such favorite."
+msgstr "Gogoko hori ez dago."
+
+#. TRANS: Client exception thrown when trying to remove a favorite notice of another user.
+msgid "Cannot delete someone else's favorite."
+msgstr "Ezin duzu beste baten gogokoa ezabatu."
+
+#. TRANS: Client exception thrown when trying to show membership of a non-subscribed group
+msgid "Not a member."
+msgstr "Ez zara kidea."
+
+#. TRANS: Client exception thrown when deleting someone else's membership.
+msgid "Cannot delete someone else's membership."
+msgstr "Ezin duzu beste baten harpidetza ezabatu."
+
+#. TRANS: Client exception thrown when trying to display a subscription for a non-existing profile ID.
+#. TRANS: %d is the non-existing profile ID number.
+#, php-format
+msgid "No such profile id: %d."
+msgstr "Ez dago profil horren IDrik: %d."
+
+#. TRANS: Client exception thrown when trying to display a subscription for a non-subscribed profile ID.
+#. TRANS: %1$d is the non-existing subscriber ID number, $2$d is the ID of the profile that was not subscribed to.
+#, php-format
+msgid "Profile %1$d not subscribed to profile %2$d."
+msgstr "%1$d profila ez dago %2$d profilera harpidetuta."
+
+#. TRANS: Client exception thrown when trying to delete a subscription of another user.
+msgid "Cannot delete someone else's subscription."
+msgstr "Ezin duzu beste baten harpidetza ezabatu."
+
+#. TRANS: Subtitle for Atom subscription feed.
+#. TRANS: %1$s is a user nickname, %s$s is the StatusNet sitename.
+#, php-format
+msgid "People %1$s has subscribed to on %2$s"
+msgstr "%2$s(e)n %1$s(e)k jarraitzen duen jendea"
+
+#. TRANS: Client error displayed when not using the follow verb.
+msgid "Can only handle Follow activities."
+msgstr "Jarraipen jarduerak bakarrik kudeatu daitezke."
+
+#. TRANS: Client exception thrown when subscribing to an object that is not a person.
+msgid "Can only follow people."
+msgstr "Jendea bakarrik jarraitu daiteke."
+
+#. TRANS: Client exception thrown when subscribing to a non-existing profile.
+#. TRANS: %s is the unknown profile ID.
+#, php-format
+msgid "Unknown profile %s."
+msgstr "%s profil ezezaguna."
+
+#. TRANS: Client error displayed trying to subscribe to an already subscribed profile.
+#. TRANS: %s is the profile the user already has a subscription on.
+#, php-format
+msgid "Already subscribed to %s."
+msgstr "Dagoeneko %s(e)ra harpidetuta."
+
+#. TRANS: Client error displayed trying to get a non-existing attachment.
+msgid "No such attachment."
+msgstr "Eranskin hori ez dago."
+
+#. TRANS: Client error displayed trying to get an avatar without providing a nickname.
+#. TRANS: Client error displayed when requesting a list of blocked users for a group without providing a group nickname.
+#. TRANS: Client error displayed trying to edit a group while not proving a nickname for the group to edit.
+#. TRANS: Client error displayed when trying to change group logo settings without providing a nickname.
+#. TRANS: Client error displayed when trying to view group members without providing a group nickname.
+#. TRANS: Client error displayed when requesting a group RSS feed without providing a group nickname.
+#. TRANS: Client error displayed if no nickname argument was given requesting a group page.
+msgid "No nickname."
+msgstr "Erabiltzaile izenik ez."
+
+#. TRANS: Client error displayed trying to get an avatar without providing an avatar size.
+msgid "No size."
+msgstr "Tamainarik ez."
+
+#. TRANS: Client error displayed trying to get an avatar providing an invalid avatar size.
+msgid "Invalid size."
+msgstr "Tamaina okerra."
+
+#. TRANS: Title for avatar upload page.
+msgid "Avatar"
+msgstr "Avatarra"
+
+#. TRANS: Instruction for avatar upload page.
+#. TRANS: %s is the maximum file size, for example "500b", "10kB" or "2MB".
+#, php-format
+msgid "You can upload your personal avatar. The maximum file size is %s."
+msgstr "Zure avatarra igo dezakezu. Fitxategiaren gehieneko tamaina %s da."
+
+#. TRANS: Avatar upload page form legend.
+#. TRANS: Avatar upload page crop form legend.
+#. TRANS: Legend for group logo settings fieldset.
+msgid "Avatar settings"
+msgstr "Avatar-ezarpenak"
+
+#. TRANS: Header on avatar upload page for thumbnail of originally uploaded avatar (h2).
+#. TRANS: Header on avatar upload crop form for thumbnail of originally uploaded avatar (h2).
+#. TRANS: Uploaded original file in group logo form.
+#. TRANS: Header for originally uploaded file before a crop on the group logo page.
+msgid "Original"
+msgstr "Jatorrizkoa"
+
+#. TRANS: Header on avatar upload page for thumbnail of to be used rendition of uploaded avatar (h2).
+#. TRANS: Header on avatar upload crop form for thumbnail of to be used rendition of uploaded avatar (h2).
+#. TRANS: Header for preview of to be displayed group logo.
+#. TRANS: Header for the cropped group logo on the group logo page.
+msgid "Preview"
+msgstr "Aurreikusi"
+
+#. TRANS: Button on avatar upload page to delete current avatar.
+#. TRANS: Button text for user account deletion.
+#. TRANS: Submit button text the OAuth application page to delete an application.
+#. TRANS: Button text for deleting a group.
+#. TRANS: Button text to delete a list.
+msgctxt "BUTTON"
+msgid "Delete"
+msgstr "Ezabatu"
+
+#. TRANS: Button on avatar upload page to upload an avatar.
+#. TRANS: Submit button to confirm upload of a user backup file for account restore.
+msgctxt "BUTTON"
+msgid "Upload"
+msgstr "Igo"
+
+#. TRANS: Button on avatar upload crop form to confirm a selected crop as avatar.
+msgctxt "BUTTON"
+msgid "Crop"
+msgstr "Moztu"
+
+#. TRANS: Validation error on avatar upload form when no file was uploaded.
+msgid "No file uploaded."
+msgstr "Ez da fitxategirik igo."
+
+#. TRANS: Avatar upload form instruction after uploading a file.
+msgid "Pick a square area of the image to be your avatar."
+msgstr "Zure avatarraren eramua laukiaren bidez mugatu."
+
+#. TRANS: Server error displayed if an avatar upload went wrong somehow server side.
+#. TRANS: Server error displayed trying to crop an uploaded group logo that is no longer present.
+msgid "Lost our file data."
+msgstr "Datuen fitxategia galdu dugu."
+
+#. TRANS: Success message for having updated a user avatar.
+msgid "Avatar updated."
+msgstr "Avatarra eguneratua."
+
+#. TRANS: Error displayed on the avatar upload page if the avatar could not be updated for an unknown reason.
+msgid "Failed updating avatar."
+msgstr "Avatarraren eguneraketak huts egin du."
+
+#. TRANS: Success message for deleting a user avatar.
+msgid "Avatar deleted."
+msgstr "Avatarra ezabatua."
+
+#. TRANS: Title for backup account page.
+#. TRANS: Option in profile settings to create a backup of the account of the currently logged in user.
+msgid "Backup account"
+msgstr "Kontuaren babeskopia egin"
+
+#. TRANS: Client exception thrown when trying to backup an account while not logged in.
+msgid "Only logged-in users can backup their account."
+msgstr ""
+"Saioa hasi duten erabiltzaileek bakarrik egin dezakete bere kontuaren "
+"babeskopia."
+
+#. TRANS: Client exception thrown when trying to backup an account without having backup rights.
+msgid "You may not backup your account."
+msgstr "Ezin duzu zure kontuaren babeskopiarik egin."
+
+#. TRANS: Information displayed on the backup account page.
+msgid ""
+"You can backup your account data in <a href=\"http://activitystrea.ms/"
+"\">Activity Streams</a> format. This is an experimental feature and provides "
+"an incomplete backup; private account information like email and IM "
+"addresses is not backed up. Additionally, uploaded files and direct messages "
+"are not backed up."
+msgstr ""
+"<a href=\"http://activitystrea.ms/\">Activity Streams</a> formatuan zure "
+"kontuaren babeskopia egin dezakezu. Ezaugarri hau esperimentazio moduan dago "
+"eta ez du babeskopia osoa egiten; helbide elektronikoa eta IM helbidea "
+"bezalako informazio pribatuen babeskopia ez du egiten. Gainera, ez du "
+"igotako fitxategien eta mezu zuzenen kopiarik egiten."
+
+#. TRANS: Submit button to backup an account on the backup account page.
+msgctxt "BUTTON"
+msgid "Backup"
+msgstr "Babeskopia"
+
+#. TRANS: Title for submit button to backup an account on the backup account page.
+msgid "Backup your account."
+msgstr "Egin zure kontuaren babeskopia."
+
+#. TRANS: Client error displayed when blocking a user that has already been blocked.
+msgid "You already blocked that user."
+msgstr "Jadanik blokeatu duzu erabiltzaile hori."
+
+#. TRANS: Title for block user page.
+#. TRANS: Legend for block user form.
+#. TRANS: Fieldset legend for block user from group form.
+msgid "Block user"
+msgstr "Blokeatu erabiltzailea"
+
+#. TRANS: Explanation of consequences when blocking a user on the block user page.
+msgid ""
+"Are you sure you want to block this user? Afterwards, they will be "
+"unsubscribed from you, unable to subscribe to you in the future, and you "
+"will not be notified of any @-replies from them."
+msgstr ""
+"Seguru zaude erabiltzaile hau blokeatu nahi duzula? Ondoren, berak zurekiko "
+"duen harpidetza ezeztuko da, ezin izango zaitu etorkizunean idatzi eta ez "
+"zaizkizu jakinaraziko bere @-erantzunak."
+
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete group form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+msgctxt "BUTTON"
+msgid "No"
+msgstr "Ez"
+
+#. TRANS: Submit button title for 'No' when blocking a user.
+msgid "Do not block this user."
+msgstr "Ez blokeatu erabiltzaile hau."
+
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete group form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#. TRANS: Button text to repeat a notice on notice repeat form.
+msgctxt "BUTTON"
+msgid "Yes"
+msgstr "Bai"
+
+#. TRANS: Submit button title for 'Yes' when blocking a user.
+msgid "Block this user."
+msgstr "Blokeatu erabiltzaile hau."
+
+#. TRANS: Server error displayed when blocking a user fails.
+msgid "Failed to save block information."
+msgstr "Huts blokeo-informazioa gordetzean."
+
+#. TRANS: Title for first page with list of users blocked from a group.
+#. TRANS: %s is a group nickname.
+#, php-format
+msgid "%s blocked profiles"
+msgstr "%s profil blokeatuta"
+
+#. TRANS: Title for any but the first page with list of users blocked from a group.
+#. TRANS: %1$s is a group nickname, %2$d is a page number.
+#, php-format
+msgid "%1$s blocked profiles, page %2$d"
+msgstr "%1$s profil bokeatuta, %2$d orria"
+
+#. TRANS: Instructions for list of users blocked from a group.
+msgid "A list of the users blocked from joining this group."
+msgstr "Talde honekin elkartzea blokeatuta duten erabiltzaileen zerrenda."
+
+#. TRANS: Form legend for unblocking a user from a group.
+msgid "Unblock user from group"
+msgstr "Desblokeatu erabiltzailea taldean"
+
+#. TRANS: Button text for unblocking a user from a group.
+msgctxt "BUTTON"
+msgid "Unblock"
+msgstr "Desblokeatu"
+
+#. TRANS: Tooltip for button for unblocking a user from a group.
+#. TRANS: Description of the form to unblock a user.
+msgid "Unblock this user"
+msgstr "Desblokeatu erabiltzaile hau"
+
+#. TRANS: Title for mini-posting window loaded from bookmarklet.
+#. TRANS: %s is the StatusNet site name.
+#, php-format
+msgid "Post to %s"
+msgstr "Idatzi %s(r)i"
+
+#. TRANS: Title for leave group page after leaving.
+#. TRANS: %s$s is the leaving user's name, %2$s is the group name.
+#. TRANS: Title for leave group page after leaving.
+#, php-format
+msgctxt "TITLE"
+msgid "%1$s left group %2$s"
+msgstr "%1$s erabiltzaileak %2$s taldea utzi du"
+
+#. TRANS: Client error displayed when trying to leave a group without specifying an ID.
+#. TRANS: Client error displayed when trying to unsubscribe without providing a profile ID.
+msgid "No profile ID in request."
+msgstr "Ez dago profil IDrik eskarian."
+
+#. TRANS: Client error displayed when trying to leave a non-existing group.
+#. TRANS: Client error displayed trying to block a user from a group while specifying a non-existing profile.
+#. TRANS: Client error displayed when trying to unblock a user from a group without providing an existing profile.
+#. TRANS: Client error displayed when specifying an invalid profile ID on the Make Admin page.
+#. TRANS: Client error displayed trying a change a subscription for a non-existant profile ID.
+#. TRANS: Client error displayed when referring to non-existing profile ID.
+#. TRANS: Client error displayed when trying to unsubscribe while providing a non-existing profile ID.
+#. TRANS: Client error displayed when trying to change user options without specifying an existing user to work on.
+msgid "No profile with that ID."
+msgstr "Ez dago ID hori duen profilik."
+
+#. TRANS: Title after unsubscribing from a group.
+msgctxt "TITLE"
+msgid "Unsubscribed"
+msgstr "Harpidetu gabea"
+
+#. TRANS: Client error displayed when not providing a confirmation code in the contact address confirmation action.
+msgid "No confirmation code."
+msgstr "Baieztapen koderik ez."
+
+#. TRANS: Client error displayed when providing a non-existing confirmation code in the contact address confirmation action.
+msgid "Confirmation code not found."
+msgstr "Ez da baieztapen koderik aurkitu."
+
+#. TRANS: Client error displayed when not providing a confirmation code for another user in the contact address confirmation action.
+msgid "That confirmation code is not for you!"
+msgstr "Baieztapen-kode hori ez da zuretzat!"
+
+#. TRANS: Server error for an unknown address type, which can be 'email', 'sms', or the name of an IM network (such as 'xmpp' or 'aim')
+#, php-format
+msgid "Unrecognized address type %s"
+msgstr "%s helbide-mota ez da ezaguna"
+
+#. TRANS: Client error for an already confirmed email/jabber/sms address.
+#. TRANS: Client error for an already confirmed IM address.
+msgid "That address has already been confirmed."
+msgstr "Helbide hori dagoeneko baieztatu da."
+
+#. TRANS: Server error displayed when updating IM preferences fails.
+#. TRANS: Server error thrown on database error removing a registered IM address.
+msgid "Could not update user IM preferences."
+msgstr "Ezin izan dira eguneratu erabiltzailearen IM hobespenak."
+
+#. TRANS: Server error displayed when adding IM preferences fails.
+msgid "Could not insert user IM preferences."
+msgstr "Ezin izan dira txertatu erabiltzailearen IM hobespenak."
+
+#. TRANS: Server error displayed when an address confirmation code deletion from the
+#. TRANS: database fails in the contact address confirmation action.
+msgid "Could not delete address confirmation."
+msgstr "Ezin izan da helbide baieztapena ezabatu."
+
+#. TRANS: Title for the contact address confirmation action.
+msgid "Confirm address"
+msgstr "Baieztatu helbidea"
+
+#. TRANS: Success message for the contact address confirmation action.
+#. TRANS: %s can be 'email', 'jabber', or 'sms'.
+#, php-format
+msgid "The address \"%s\" has been confirmed for your account."
+msgstr "\"%s\" helbidea baieztatua izan da zure kontuarentzako."
+
+#. TRANS: Title for page with a conversion (multiple notices in context).
+msgid "Conversation"
+msgstr "Elkarrizketa"
+
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+msgid "Conversation feed (Activity Streams JSON)"
+msgstr "Elkarrizketa jarioa (Activity Streams JSON)"
+
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+msgid "Conversation feed (RSS 2.0)"
+msgstr "Elkarrizketa jarioa (RSS 2.0)"
+
+#. TRANS: Title for conversation page.
+#. TRANS: Title for page that shows a notice.
+msgctxt "TITLE"
+msgid "Notice"
+msgstr "Oharra"
+
+#. TRANS: Client exception displayed trying to delete a user account while not logged in.
+msgid "Only logged-in users can delete their account."
+msgstr "Saioa hasitako erabiltzaileek bakarrik ezabatu dezakete bere kontua."
+
+#. TRANS: Client exception displayed trying to delete a user account without have the rights to do that.
+msgid "You cannot delete your account."
+msgstr "Ezin duzu zure kontua ezabatu."
+
+#. TRANS: Confirmation text for user deletion. The user has to type this exactly the same, including punctuation.
+msgid "I am sure."
+msgstr "Seguru nago."
+
+#. TRANS: Notification for user about the text that must be input to be able to delete a user account.
+#. TRANS: %s is the text that needs to be input.
+#, php-format
+msgid "You must write \"%s\" exactly in the box."
+msgstr "Kutxan zehazki \"%s\" idatzi behar duzu."
+
+#. TRANS: Confirmation that a user account has been deleted.
+msgid "Account deleted."
+msgstr "Kontua ezabatua."
+
+#. TRANS: Page title for page on which a user account can be deleted.
+#. TRANS: Option in profile settings to delete the account of the currently logged in user.
+msgid "Delete account"
+msgstr "Ezabatu kontua"
+
+#. TRANS: Form text for user deletion form.
+msgid ""
+"This will <strong>permanently delete</strong> your account data from this "
+"server."
+msgstr ""
+"Honek zure kontua <strong>behin betiko ezabatuko</strong> du zerbitzari "
+"honetatik."
+
+#. TRANS: Additional form text for user deletion form shown if a user has account backup rights.
+#. TRANS: %s is a URL to the backup page.
+#, php-format
+msgid ""
+"You are strongly advised to <a href=\"%s\">back up your data</a> before "
+"deletion."
+msgstr ""
+"Ezabaketaren aurretik <a href=\"%s\">zure datuen segurtasun kopia</a> egin "
+"dezazun biziki gomendatzen da."
+
+#. TRANS: Field label for delete account confirmation entry.
+#. TRANS: Field label for password reset form where the password has to be typed again.
+msgid "Confirm"
+msgstr "Baieztatu"
+
+#. TRANS: Input title for the delete account field.
+#. TRANS: %s is the text that needs to be input.
+#, php-format
+msgid "Enter \"%s\" to confirm that you want to delete your account."
+msgstr "Sartu \"%s\" zure kontua ezabatu nahi duzula baieztatzeko."
+
+#. TRANS: Button title for user account deletion.
+msgid "Permanently delete your account."
+msgstr "Zure kontua behin betiko ezabatu."
+
+#. TRANS: Client error displayed trying to delete an application while not logged in.
+msgid "You must be logged in to delete an application."
+msgstr "Aplikazio bat ezabatzeko saioa hasi behar duzu."
+
+#. TRANS: Client error displayed trying to delete an application that does not exist.
+msgid "Application not found."
+msgstr "Ez da aplikazioa aurkitu."
+
+#. TRANS: Client error displayed trying to delete an application the current user does not own.
+#. TRANS: Client error displayed trying to edit an application while not being its owner.
+#. TRANS: Client error displayed trying to display an OAuth application for which the logged in user is not the owner.
+msgid "You are not the owner of this application."
+msgstr "Ez zara aplikazio honen jabea."
+
+#. TRANS: Client error displayed when the session token does not match or is not given.
+#. TRANS: Client error text when there is a problem with the session token.
+msgid "There was a problem with your session token."
+msgstr "Arazoa egon da zure saio-tokenarekin."
+
+#. TRANS: Title for delete application page.
+#. TRANS: Fieldset legend on delete application page.
+msgid "Delete application"
+msgstr "Ezabatu aplikazioa"
+
+#. TRANS: Confirmation text on delete application page.
+msgid ""
+"Are you sure you want to delete this application? This will clear all data "
+"about the application from the database, including all existing user "
+"connections."
+msgstr ""
+"Seguru zaude aplikazioa ezabatu nahi duzula? Aplikazioko datu guztiak "
+"ezabatuko dira datu-basetik, erabiltzaile-konexioak barne."
+
+#. TRANS: Submit button title for 'No' when deleting an application.
+msgid "Do not delete this application."
+msgstr "Ez ezabatu aplikazio hau."
+
+#. TRANS: Submit button title for 'Yes' when deleting an application.
+msgid "Delete this application."
+msgstr "Ezabatu aplikazio hau."
+
+#. TRANS: Client error when trying to delete group while not logged in.
+msgid "You must be logged in to delete a group."
+msgstr "Saioa hasi behar duzu talde bat ezabatzeko."
+
+#. TRANS: Client error when trying to delete a group without having the rights to delete it.
+msgid "You are not allowed to delete this group."
+msgstr "Ez duzu talde hau ezabatzeko baimenik."
+
+#. TRANS: Server error displayed if a group could not be deleted.
+#. TRANS: %s is the name of the group that could not be deleted.
+#, php-format
+msgid "Could not delete group %s."
+msgstr "%s taldea ezin izan da ezabatu."
+
+#. TRANS: Message given after deleting a group.
+#. TRANS: %s is the deleted group's name.
+#, php-format
+msgid "Deleted group %s"
+msgstr "%s taldea ezabatua"
+
+#. TRANS: Title of delete group page.
+#. TRANS: Form legend for deleting a group.
+msgid "Delete group"
+msgstr "Taldea ezabatu"
+
+#. TRANS: Warning in form for deleleting a group.
+msgid ""
+"Are you sure you want to delete this group? This will clear all data about "
+"the group from the database, without a backup. Public posts to this group "
+"will still appear in individual timelines."
+msgstr ""
+"Seguru zaude talde hau ezabatu nahi duzula? Erabiltzaile honen informazio "
+"guztia ezabatuko da datu-basetik, atzera egiteko aukerarik gabe. Talde honen "
+"mezu publikoek banakako denbora-lerroetan agertzen jarraituko dute."
+
+#. TRANS: Submit button title for 'No' when deleting a group.
+msgid "Do not delete this group."
+msgstr "Ez ezabatu talde hau."
+
+#. TRANS: Submit button title for 'Yes' when deleting a group.
+msgid "Delete this group."
+msgstr "Ezabatu talde hau."
+
+#. TRANS: Instructions for deleting a notice.
+msgid ""
+"You are about to permanently delete a notice. Once this is done, it cannot "
+"be undone."
+msgstr ""
+"Ohar bat behin-betiko ezabatzera zoaz. Hau egin ondoren, ezingo duzu desegin."
+
+#. TRANS: Page title when deleting a notice.
+#. TRANS: Fieldset legend for the delete notice form.
+msgid "Delete notice"
+msgstr "Ezbatu oharra"
+
+#. TRANS: Message for the delete notice form.
+msgid "Are you sure you want to delete this notice?"
+msgstr "Seguru zaude ohar hau ezabatu nahi duzula?"
+
+#. TRANS: Submit button title for 'No' when deleting a notice.
+msgid "Do not delete this notice."
+msgstr "Ez ezabatu ohar hau."
+
+#. TRANS: Submit button title for 'Yes' when deleting a notice.
+msgid "Delete this notice."
+msgstr "Ezabatu ohar hau."
+
+#. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
+msgid "You cannot delete users."
+msgstr "Ezin dituzu erabiltzaleak ezabatu."
+
+#. TRANS: Client error displayed when trying to delete a non-local user.
+msgid "You can only delete local users."
+msgstr "Ezin duzu erabiltzailerik ezabatu."
+
+#. TRANS: Title of delete user page.
+msgctxt "TITLE"
+msgid "Delete user"
+msgstr "Erabiltzailea ezabatu"
+
+#. TRANS: Fieldset legend on delete user page.
+msgid "Delete user"
+msgstr "Erabiltzailea ezabatu"
+
+#. TRANS: Information text to request if a user is certain that the described action has to be performed.
+msgid ""
+"Are you sure you want to delete this user? This will clear all data about "
+"the user from the database, without a backup."
+msgstr ""
+"Seguru zaude erabiltzaile hau ezabatu nahi duzula? Erabiltzaile honen "
+"informazio guztia ezabatuko da datu-basetik, atzera egiteko aukerarik gabe."
+
+#. TRANS: Submit button title for 'No' when deleting a user.
+msgid "Do not delete this user."
+msgstr "Ez ezabatu erabiltzaile hau."
+
+#. TRANS: Submit button title for 'Yes' when deleting a user.
+msgid "Delete this user."
+msgstr "Ezabatu erabiltzaile hau."
+
+#. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
+msgid "This notice is not a favorite!"
+msgstr "Ohar hau ez da gogoko bat!"
+
+#. TRANS: Title for page on which favorites can be added.
+msgid "Add to favorites"
+msgstr "Gehitu gogokoetara"
+
+#. TRANS: Client exception thrown when requesting a document from the documentation that does not exist.
+#. TRANS: %s is the non-existing document.
+#, php-format
+msgid "No such document \"%s\"."
+msgstr "\"%s\" dokumentua ez dago."
+
+#. TRANS: Menu item in administrator navigation panel.
+#. TRANS: Menu item in default local navigation panel.
+#. TRANS: Menu item in personal group navigation menu.
+msgctxt "MENU"
+msgid "Home"
+msgstr "Hasiera"
+
+msgctxt "MENU"
+msgid "Docs"
+msgstr "Dokumentuak"
+
+#. TRANS: Secondary navigation menu item leading to help on StatusNet.
+msgctxt "MENU"
+msgid "Help"
+msgstr "Laguntza"
+
+msgid "Getting started"
+msgstr "Lehen urratsak"
+
+#. TRANS: Secondary navigation menu item leading to text about StatusNet site.
+msgctxt "MENU"
+msgid "About"
+msgstr "Honi buruz"
+
+msgid "About this site"
+msgstr "Gune honi buruz"
+
+#. TRANS: Secondary navigation menu item leading to Frequently Asked Questions.
+msgctxt "MENU"
+msgid "FAQ"
+msgstr "FAQ"
+
+msgid "Frequently asked questions"
+msgstr "Ohiko galderak"
+
+#. TRANS: Secondary navigation menu item leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+msgctxt "MENU"
+msgid "Contact"
+msgstr "Kontaktatu"
+
+msgid "Contact info"
+msgstr "Kontaktatu"
+
+msgctxt "MENU"
+msgid "Tags"
+msgstr "Etiketak"
+
+msgid "Using tags"
+msgstr "Etiketa erabiliak"
+
+#. TRANS: Menu item in default local navigation panel.
+#. TRANS: Menu item in search group navigation panel.
+#. TRANS: Menu item in local navigation menu.
+msgctxt "MENU"
+msgid "Groups"
+msgstr "Taldeak"
+
+msgid "Using groups"
+msgstr "Talde erabiliak"
+
+msgctxt "MENU"
+msgid "API"
+msgstr "API"
+
+msgid "RESTful API"
+msgstr "RESTful API"
+
+#. TRANS: Title for "Edit application" form.
+#. TRANS: Form legend.
+msgid "Edit application"
+msgstr "Editatu aplikazioa"
+
+#. TRANS: Client error displayed trying to edit an application while not logged in.
+msgid "You must be logged in to edit an application."
+msgstr "Saioa hasi behar duzu aplikazio bat editatzeko."
+
+#. TRANS: Client error displayed trying to edit an application that does not exist.
+#. TRANS: Client error displayed trying to display a non-existing OAuth application.
+msgid "No such application."
+msgstr "Aplikazio hori ez dago."
+
+#. TRANS: Instructions for "Edit application" form.
+msgid "Use this form to edit your application."
+msgstr "Erabili formulario hau zure aplikazioa editatzeko."
+
+#. TRANS: Validation error shown when not providing a name in the "Edit application" form.
+#. TRANS: Validation error shown when not providing a name in the "New application" form.
+msgid "Name is required."
+msgstr "Izena beharrezkoa da."
+
+#. TRANS: Validation error shown when providing too long a name in the "Edit application" form.
+#. TRANS: Validation error shown when providing too long a name in the "New application" form.
+msgid "Name is too long (maximum 255 characters)."
+msgstr "Izena luzeegia da (gehienez 255 karaktere)."
+
+#. TRANS: Validation error shown when providing a name for an application that already exists in the "Edit application" form.
+#. TRANS: Validation error shown when providing a name for an application that already exists in the "New application" form.
+msgid "Name already in use. Try another one."
+msgstr "Izena beste norbaitek dauka. Saiatu beste batekin."
+
+#. TRANS: Validation error shown when not providing a description in the "Edit application" form.
+#. TRANS: Validation error shown when not providing a description in the "New application" form.
+msgid "Description is required."
+msgstr "Deskribapena beharrezkoa da."
+
+#. TRANS: Validation error shown when providing too long a source URL in the "Edit application" form.
+msgid "Source URL is too long."
+msgstr "Iturburu URLa luzeegia da."
+
+#. TRANS: Validation error shown when providing an invalid source URL in the "Edit application" form.
+#. TRANS: Validation error shown when providing an invalid source URL in the "New application" form.
+msgid "Source URL is not valid."
+msgstr "Iturburu URLa ez da baliozkoa."
+
+#. TRANS: Validation error shown when not providing an organisation in the "Edit application" form.
+#. TRANS: Validation error shown when not providing an organisation in the "New application" form.
+msgid "Organization is required."
+msgstr "Erakundea beharrezkoa da."
+
+#. TRANS: Validation error shown when providing too long an arganisation name in the "Edit application" form.
+msgid "Organization is too long (maximum 255 characters)."
+msgstr "Erakundea luzeegia da (gehienez 255 karaktere)."
+
+#. TRANS: Form validation error show when an organisation name has not been provided in the edit application form.
+#. TRANS: Form validation error show when an organisation name has not been provided in the new application form.
+msgid "Organization homepage is required."
+msgstr "Erakundearen webgunea derrigorrezkoa da."
+
+#. TRANS: Validation error shown when providing too long a callback URL in the "Edit application" form.
+#. TRANS: Validation error shown when providing too long a callback URL in the "New application" form.
+msgid "Callback is too long."
+msgstr "Callback-a luzeegia da."
+
+#. TRANS: Validation error shown when providing an invalid callback URL in the "Edit application" form.
+#. TRANS: Validation error shown when providing an invalid callback URL in the "New application" form.
+msgid "Callback URL is not valid."
+msgstr "Callback URLa ez da baliozkoa."
+
+#. TRANS: Server error occuring when an application could not be updated from the "Edit application" form.
+msgid "Could not update application."
+msgstr "Ezin da aplikazioa eguneratu."
+
+#. TRANS: Title for form to edit a group. %s is a group nickname.
+#, php-format
+msgid "Edit %s group"
+msgstr "Editatu %s taldea"
+
+#. TRANS: Client error displayed trying to edit a group while not logged in.
+#. TRANS: Client error displayed when trying to create a group while not logged in.
+#. TRANS: Client error displayed trying to create a group while not logged in.
+msgid "You must be logged in to create a group."
+msgstr "Talde bat sortzeko saioa hasi behar duzu."
+
+#. TRANS: Form instructions for group edit form.
+msgid "Use this form to edit the group."
+msgstr "Erabili formulario hau taldea aldatzeko."
+
+#. TRANS: Group edit form validation error.
+#. TRANS: Group create form validation error.
+#. TRANS: %s is the invalid alias.
+#, php-format
+msgid "Invalid alias: \"%s\""
+msgstr "Alias okerra: \"%s\""
+
+#. TRANS: Group edit form success message.
+#. TRANS: Edit list form success message.
+msgid "Options saved."
+msgstr "Aukerak gordeta."
+
+#. TRANS: Title for edit list page after deleting a tag.
+#. TRANS: %s is a list.
+#, php-format
+msgid "Delete %s list"
+msgstr "Ezabatu %s zerrenda"
+
+#. TRANS: Title for edit list page.
+#. TRANS: %s is a list.
+#. TRANS: Form legend for list edit form.
+#. TRANS: %s is a list.
+#, php-format
+msgid "Edit list %s"
+msgstr "Editatu %s zerrenda"
+
+#. TRANS: Error message displayed when trying to perform an action that requires a tagging user or ID.
+msgid "No tagger or ID."
+msgstr "Etiketatzailea edo IDa falta da."
+
+#. TRANS: Client error displayed when referring to non-local user.
+msgid "Not a local user."
+msgstr "Ez da erabiltzaile lokala."
+
+#. TRANS: Client error displayed when reting to edit a tag that was not self-created.
+msgid "You must be the creator of the tag to edit it."
+msgstr "Etiketaren sortzailea izan behar duzu editatu nahi baduzu."
+
+#. TRANS: Form instruction for edit list form.
+msgid "Use this form to edit the list."
+msgstr "Erabili inprimaki hau zerrenda editatzeko."
+
+#. TRANS: Form validation error displayed if the form data for deleting a tag was incorrect.
+msgid "Delete aborted."
+msgstr "Ezabatzea abortatu da."
+
+#. TRANS: Text in confirmation dialog for deleting a tag.
+msgid ""
+"Deleting this tag will permanantly remove all its subscription and "
+"membership records. Do you still want to continue?"
+msgstr ""
+"Etiketa hau ezabatzean behin-betiko kenduko dira bere harpidetza eta kidetza-"
+"erregistro guztiak. Jarraitu nahi duzu?"
+
+#. TRANS: Form validation error displayed if a given tag is invalid.
+msgid "Invalid tag."
+msgstr "Etiketa baliogabea."
+
+#. TRANS: Form validation error displayed if a given tag is already present.
+#. TRANS: %s is the already present tag.
+#, php-format
+msgid "You already have a tag named %s."
+msgstr "Jadanik baduzu %s izeneko etiketa."
+
+#. TRANS: Text in confirmation dialog for setting a tag from public to private.
+msgid ""
+"Setting a public tag as private will permanently remove all the existing "
+"subscriptions to it. Do you still want to continue?"
+msgstr ""
+"Etiketa publiko bat pribatu bihurtuz gero, haren harpidetza guztiak "
+"ezabatuko dituzu. Jarraitu nahi duzu?"
+
+#. TRANS: Server error displayed when updating a list fails.
+msgid "Could not update list."
+msgstr "Ezin izan da zerrenda eguneratu."
+
+#. TRANS: Title for e-mail settings.
+msgid "Email settings"
+msgstr "Posta elektronikoaren ezarpenak"
+
+#. TRANS: E-mail settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#, php-format
+msgid "Manage how you get email from %%site.name%%."
+msgstr "Kudeatu nola jasoko duzun posta elektronikoa %%site.name%% gunetik."
+
+#. TRANS: Form legend for e-mail settings form.
+#. TRANS: Field label for e-mail address input in e-mail settings form.
+msgid "Email address"
+msgstr "Helbide elektronikoa"
+
+#. TRANS: Form note in e-mail settings form.
+msgid "Current confirmed email address."
+msgstr "Berretsitako uneko helbide elektronikoa."
+
+#. TRANS: Button label to remove a confirmed e-mail address.
+#. TRANS: Button label for removing a set sender e-mail address to post notices from.
+#. TRANS: Button label to remove a confirmed IM address.
+#. TRANS: Button label to remove a confirmed SMS address.
+#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
+#. TRANS: Button text to untag a profile.
+msgctxt "BUTTON"
+msgid "Remove"
+msgstr "Kendu"
+
+#. TRANS: Form note in e-mail settings form.
+msgid ""
+"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
+"a message with further instructions."
+msgstr ""
+"Helbide honen berrespenaren zain. Begiratu zure sarrera-ontzia (baita spam-"
+"ontzia ere!) argibideak dituen mezua irakurtzeko."
+
+#. TRANS: Instructions for e-mail address input form. Do not translate
+#. TRANS: "example.org". It is one of the domain names reserved for
+#. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
+#. TRANS: Any other domain may be owned by a legitimate person or
+#. TRANS: organization.
+msgid "Email address, like \"UserName@example.org\""
+msgstr "Helbide elektronikoa, adibidez \"erabiltzailea@adibidea.org\""
+
+#. TRANS: Button label for adding an e-mail address in e-mail settings form.
+#. TRANS: Button label for adding an IM address in IM settings form.
+#. TRANS: Button label for adding a SMS phone number in SMS settings form.
+#. TRANS: Button text to tag a profile.
+msgctxt "BUTTON"
+msgid "Add"
+msgstr "Gehitu"
+
+#. TRANS: Form legend for incoming e-mail settings form.
+#. TRANS: Form legend for incoming SMS settings form.
+msgid "Incoming email"
+msgstr "Jasotzeko posta elektronikoa"
+
+#. TRANS: Checkbox label in e-mail preferences form.
+msgid "I want to post notices by email."
+msgstr "Oharrak posta elektroniko bidez bidali nahi ditut."
+
+#. TRANS: Form instructions for incoming e-mail form in e-mail settings.
+#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
+msgid "Send email to this address to post new notices."
+msgstr "Bidali mezu elektronikoak helbide honetara ohar berriak argitaratzeko."
+
+#. TRANS: Instructions for incoming e-mail address input form, when an address has already been assigned.
+#. TRANS: Instructions for incoming SMS e-mail address input form.
+msgid "Make a new email address for posting to; cancels the old one."
+msgstr ""
+"Sortu bidalketetarako helbide elektroniko berria; zaharra bertan behera "
+"uzten du."
+
+#. TRANS: Instructions for incoming e-mail address input form.
+msgid ""
+"To send notices via email, we need to create a unique email address for you "
+"on this server:"
+msgstr ""
+"Posta elektroniko bidez oharrak argitaratu ahal izateko, helbide elektroniko "
+"bakarra sortu beharra daukagu zerbitzari honetan:"
+
+#. TRANS: Button label for adding an e-mail address to send notices from.
+#. TRANS: Button label for adding an SMS e-mail address to send notices from.
+msgctxt "BUTTON"
+msgid "New"
+msgstr "Berria"
+
+#. TRANS: Form legend for e-mail preferences form.
+msgid "Email preferences"
+msgstr "Posta-hobespenak"
+
+#. TRANS: Checkbox label in e-mail preferences form.
+msgid "Send me notices of new subscriptions through email."
+msgstr "Harpidetza berrien oharrak posta elektroniko bitartez jaso nahi ditut."
+
+#. TRANS: Checkbox label in e-mail preferences form.
+msgid "Send me email when someone adds my notice as a favorite."
+msgstr ""
+"Norbaitek nire ohar bat gogoko bezala gehitzen duenean posta-mezu bat jaso "
+"nahi dut."
+
+#. TRANS: Checkbox label in e-mail preferences form.
+msgid "Send me email when someone sends me a private message."
+msgstr ""
+"Norbaitek mezu pribatu bat bidaltzen didanean posta-mezu bat jaso nahi dut."
+
+#. TRANS: Checkbox label in e-mail preferences form.
+msgid "Send me email when someone sends me an \"@-reply\"."
+msgstr ""
+"Norbaitek \"@-erantzun\" bat bidaltzen didanean posta-mezu bat jaso nahi dut."
+
+#. TRANS: Checkbox label in e-mail preferences form.
+msgid "Allow friends to nudge me and send me an email."
+msgstr "Lagunak ni zirikatzea eta mezu elektronikoak bidaltzea baimendu."
+
+#. TRANS: Checkbox label in e-mail preferences form.
+msgid "Publish a MicroID for my email address."
+msgstr "Argitaratu nire helbide elektronikorako MicroID bat."
+
+#. TRANS: Confirmation message for successful e-mail preferences save.
+msgid "Email preferences saved."
+msgstr "Posta-hobespenak gorde dira."
+
+#. TRANS: Message given saving e-mail address without having provided one.
+msgid "No email address."
+msgstr "Helbide elektronikoa falta da."
+
+#. TRANS: Message given saving e-mail address that cannot be normalised.
+msgid "Cannot normalize that email address."
+msgstr "Ezin da helbide elektronikoa normaldu."
+
+#. TRANS: Message given saving e-mail address that not valid.
+#. TRANS: Form validation error displayed when trying to register without a valid e-mail address.
+#. TRANS: Client error displayed trying to save site settings without a valid contact address.
+msgid "Not a valid email address."
+msgstr "Helbide elektronikoa okerra da."
+
+#. TRANS: Message given saving e-mail address that is already set.
+msgid "That is already your email address."
+msgstr "Dagoeneko hori da zure helbide elektronikoa."
+
+#. TRANS: Message given saving e-mail address that is already set for another user.
+msgid "That email address already belongs to another user."
+msgstr "Helbide elektroniko hori dagoeneko beste erabiltzaile batek hartu du."
+
+#. TRANS: Server error thrown on database error adding e-mail confirmation code.
+#. TRANS: Server error thrown on database error adding Instant Messaging confirmation code.
+#. TRANS: Server error thrown on database error adding SMS confirmation code.
+msgid "Could not insert confirmation code."
+msgstr "Baieztapen kodea ezin izan da txertatu."
+
+#. TRANS: Message given saving valid e-mail address that is to be confirmed.
+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 ""
+"Gehitu duzun helbide elektronikora baieztapen kode bat bidali da. Begiratu "
+"zure sarrera-ontzia (baita spam-ontzia ere!) kodea eta jarraibideak dituen "
+"mezuaren bila."
+
+#. TRANS: Message given canceling e-mail address confirmation that is not pending.
+#. TRANS: Message given canceling Instant Messaging address confirmation that is not pending.
+#. TRANS: Message given canceling SMS phone number confirmation that is not pending.
+msgid "No pending confirmation to cancel."
+msgstr "Ez dago baieztapenik ezeztatzeko."
+
+#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
+msgid "That is the wrong email address."
+msgstr "Helbide elektroniko hori okerrekoa da."
+
+#. TRANS: Server error thrown on database error canceling e-mail address confirmation.
+msgid "Could not delete email confirmation."
+msgstr "Ezin izan da posta-baieztapena ezabatu."
+
+#. TRANS: Message given after successfully canceling e-mail address confirmation.
+msgid "Email confirmation cancelled."
+msgstr "Posta-baieztapena ezeztatua."
+
+#. TRANS: Message given trying to remove an e-mail address that is not
+#. TRANS: registered for the active user.
+msgid "That is not your email address."
+msgstr "Hori ez da zure helbide elektronikoa."
+
+#. TRANS: Message given after successfully removing a registered e-mail address.
+msgid "The email address was removed."
+msgstr "Helbide elektronikoa kendu egin da."
+
+#. TRANS: Form validation error displayed when trying to remove an incoming e-mail address while no address has been set.
+msgid "No incoming email address."
+msgstr "Ez dago jasotzeko helbide elektronikorik."
+
+#. TRANS: Server error thrown on database error removing incoming e-mail address.
+#. TRANS: Server error thrown on database error adding incoming e-mail address.
+#. TRANS: Server error displayed when the user could not be updated in SMS settings.
+msgid "Could not update user record."
+msgstr "Ezin da erabiltzailearen erregistroa eguneratu."
+
+#. TRANS: Message given after successfully removing an incoming e-mail address.
+#. TRANS: Confirmation text after updating SMS settings.
+msgid "Incoming email address removed."
+msgstr "Jasotzeko helbide elektronikoa kendu egin da."
+
+#. TRANS: Message given after successfully adding an incoming e-mail address.
+#. TRANS: Confirmation text after updating SMS settings.
+msgid "New incoming email address added."
+msgstr "Jasotzeko helbide elektroniko berria gehitu da."
+
+#. TRANS: Client error displayed when trying to mark a notice as favorite that already is a favorite.
+msgid "This notice is already a favorite!"
+msgstr "Ohar hau dagoeneko gogokoa da!"
+
+#. TRANS: Page title for page on which favorite notices can be unfavourited.
+msgid "Disfavor favorite."
+msgstr "Gogokoa gogokoetatik atera."
+
+#. TRANS: Page title for first page of favorited notices.
+#. TRANS: Title for favourited notices section.
+#. TRANS: Menu item title in search group navigation panel.
+msgid "Popular notices"
+msgstr "Ohar nabarmenak"
+
+#. TRANS: Page title for all but first page of favorited notices.
+#. TRANS: %d is the page number being displayed.
+#, php-format
+msgid "Popular notices, page %d"
+msgstr "Ohar nabarmenak, %d. orria"
+
+#. TRANS: Description on page displaying favorited notices.
+msgid "The most popular notices on the site right now."
+msgstr "Eskuin aldeko ohar nabarmenenak orain."
+
+#. TRANS: Text displayed instead of a list when a site does not yet have any favourited notices.
+msgid "Favorite notices appear on this page but no one has favorited one yet."
+msgstr ""
+"Gogoko oharrak orri honetan agertzen dira, baina oraingoz inork ez du gogoko "
+"oharrik."
+
+#. TRANS: Additional text displayed instead of a list when a site does not yet have any favourited notices for logged in users.
+msgid ""
+"Be the first to add a notice to your favorites by clicking the fave button "
+"next to any notice you like."
+msgstr ""
+"Edozein oharretik gertu dagoen gogoko botoia sakatuz, izan zaitez lehenengoa "
+"gogoko ohar bat gehitzen."
+
+#. TRANS: Additional text displayed instead of a list when a site does not yet have any favourited notices for not logged in users.
+#. TRANS: %%action.register%% is a registration link. "[link text](link)" is Mark Down. Do not change the formatting.
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and be the first to add a "
+"notice to your favorites!"
+msgstr ""
+"[Izena eman](%%action.register%%) eta izan zaitez lehenbizikoa gogoko ohar "
+"bat gehitzen!"
+
+#. TRANS: Title of RSS feed with favourite notices of a user.
+#. TRANS: %s is a user's nickname.
+#. TRANS: Title for first page of favourite notices of a user.
+#. TRANS: %s is the user for whom the favourite notices are displayed.
+#. TRANS: Menu item title in personal group navigation menu.
+#. TRANS: %s is a username.
+#, php-format
+msgid "%s's favorite notices"
+msgstr "\"%s(r)en gogoko oharrak"
+
+#. TRANS: Desciption of RSS feed with favourite notices of a user.
+#. TRANS: %1$s is a user's nickname, %2$s is the name of the StatusNet site.
+#, php-format
+msgid "Updates favored by %1$s on %2$s!"
+msgstr "%2$s(e)n %1$s(e)k gogoko markatutako azken mezuak!"
+
+#. TRANS: Page title for first page of featured users.
+#. TRANS: Title for featured users section.
+#. TRANS: Menu item title in search group navigation panel.
+msgid "Featured users"
+msgstr "Bereizitako erabiltzaileak"
+
+#. TRANS: Page title for all but first page of featured users.
+#. TRANS: %d is the page number being displayed.
+#, php-format
+msgid "Featured users, page %d"
+msgstr "Bereizitako erabiltzaileak, %d. orria"
+
+#. TRANS: Description on page displaying featured users.
+#, php-format
+msgid "A selection of some great users on %s."
+msgstr "Erabiltzaile nabarmenen hautapen bat %s(e)n."
+
+#. TRANS: Client error displayed when no notice ID was given trying do display a file.
+msgid "No notice ID."
+msgstr "Oharraren IDrik ez."
+
+#. TRANS: Client error displayed when an invalid notice ID was given trying do display a file.
+msgid "No notice."
+msgstr "Oharrik ez."
+
+#. TRANS: Client error displayed when trying do display a file for a notice without a file attachement.
+msgid "No attachments."
+msgstr "Eranskinik ez."
+
+#. TRANS: Client error displayed when trying do display a file for a notice with file attachements
+#. TRANS: that could not be found.
+msgid "No uploaded attachments."
+msgstr "Kargaturiko eranskinik ez."
+
+#. TRANS: Client error displayed when requesting a non-existent file.
+msgid "No such file."
+msgstr "Fitxategi hori ez dago."
+
+#. TRANS: Client error displayed when requesting a file without having read access to it.
+msgid "Cannot read file."
+msgstr "Ezin da fitxategia irakurri."
+
+#. TRANS: Client error displayed when trying to assign an invalid role to a user.
+#. TRANS: Client error displayed when trying to revoke an invalid role.
+msgid "Invalid role."
+msgstr "Rol baliogabea."
+
+#. TRANS: Client error displayed when trying to assign an reserved role to a user.
+#. TRANS: Client error displayed when trying to revoke a reserved role.
+msgid "This role is reserved and cannot be set."
+msgstr "Rol hau gordeta dago eta ezin da ezarri."
+
+#. TRANS: Client error displayed when trying to assign a role to a user while not being allowed to set roles.
+msgid "You cannot grant user roles on this site."
+msgstr "Gune honetan ezin duzu erabiltzaile-rolik eman."
+
+#. TRANS: Client error displayed when trying to assign a role to a user that already has that role.
+msgid "User already has this role."
+msgstr "Erabiltzaileak badauka rol hau."
+
+#. TRANS: Client error displayed trying to block a user from a group while not specifying a to be blocked user profile.
+#. TRANS: Client error displayed when trying to unblock a user from a group without providing a profile.
+#. TRANS: Client error displayed when not providing a profile ID on the Make Admin page.
+#. TRANS: Client error displayed trying a change a subscription without providing a profile.
+#. TRANS: Client error displayed when trying to change user options without specifying a user to work on.
+msgid "No profile specified."
+msgstr "Ez da profilik zehaztu."
+
+#. TRANS: Client error displayed trying to block a user from a group while not specifying a group to block a profile from.
+#. TRANS: Client error displayed when trying to unblock a user from a group without providing a group.
+#. TRANS: Client error displayed when not providing a group ID on the Make Admin page.
+msgid "No group specified."
+msgstr "Ez da talderik zehaztu."
+
+#. TRANS: Client error displayed trying to block a user from a group while not being an admin user.
+msgid "Only an admin can block group members."
+msgstr "Administratzaileak soilik blokea ditzake taldekideak."
+
+#. TRANS: Client error displayed trying to block a user from a group while user is already blocked from the given group.
+msgid "User is already blocked from group."
+msgstr "Erabiltzailea dagoeneko blokeatuta dago taldean."
+
+#. TRANS: Client error displayed trying to block a user from a group while user is not a member of given group.
+msgid "User is not a member of group."
+msgstr "Erabiltzailea ez da taldekidea."
+
+#. TRANS: Title for block user from group page.
+#. TRANS: Form legend for form to block user from a group.
+msgid "Block user from group"
+msgstr "Blokeatu erabiltzailea taldean"
+
+#. TRANS: Explanatory text for block user from group form before setting the block.
+#. TRANS: %1$s is that to be blocked user, %2$s is the group the user will be blocked from.
+#, php-format
+msgid ""
+"Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They "
+"will be removed from the group, unable to post, and unable to subscribe to "
+"the group in the future."
+msgstr ""
+"Ziur zaude \"%1$s\" erabiltzailea \"%2$s\" taldean blokeatu nahi duzula?  "
+"Taldetik ezabatua izango da, ezingo du bidalketarik egin eta ezingo da "
+"etorkizuenean taldera harpidetu."
+
+#. TRANS: Submit button title for 'No' when blocking a user from a group.
+msgid "Do not block this user from this group."
+msgstr "Ez blokeatu erabiltzaile hau talde honetan."
+
+#. TRANS: Submit button title for 'Yes' when blocking a user from a group.
+msgid "Block this user from this group."
+msgstr "Blokeatu erabiltzaile hau talde honetan."
+
+#. TRANS: Server error displayed when trying to block a user from a group fails because of an application error.
+msgid "Database error blocking user from group."
+msgstr "Datu-base errorea erabiltzailea taldean blokeatzerakoan."
+
+#. TRANS: Client error displayed referring to a group's permalink without providing a group ID.
+#. TRANS: Client error displayed trying to perform an action without providing an ID.
+#. TRANS: Client error displayed trying to find a user by ID without providing an ID.
+msgid "No ID."
+msgstr "IDrik ez."
+
+#. TRANS: Title for group logo settings page.
+#. TRANS: Group logo form legend.
+msgid "Group logo"
+msgstr "Taldearen logoa"
+
+#. TRANS: Instructions for group logo page.
+#. TRANS: %s is the maximum file size for that site.
+#, php-format
+msgid ""
+"You can upload a logo image for your group. The maximum file size is %s."
+msgstr ""
+"Zure talderako logoa igo dezakezu. Fitxategiaren gehieneko tamaina %s da."
+
+#. TRANS: Submit button for uploading a group logo.
+msgid "Upload"
+msgstr "Igo"
+
+#. TRANS: Button text for cropping an uploaded group logo.
+msgid "Crop"
+msgstr "Moztu"
+
+#. TRANS: Form instructions on the group logo page.
+msgid "Pick a square area of the image to be the logo."
+msgstr "Hautatu logoa izango den irudiko eremu laukia."
+
+#. TRANS: Form success message after updating a group logo.
+msgid "Logo updated."
+msgstr "Logoa eguneratuta."
+
+#. TRANS: Form failure message after failing to update a group logo.
+msgid "Failed updating logo."
+msgstr "Huts egin du logoa eguneratzean."
+
+#. TRANS: Title of the page showing group members.
+#. TRANS: %s is the name of the group.
+#, php-format
+msgid "%s group members"
+msgstr "%s taldeko kideak"
+
+#. TRANS: Title of the page showing group members.
+#. TRANS: %1$s is the name of the group, %2$d is the page number of the members list.
+#, php-format
+msgid "%1$s group members, page %2$d"
+msgstr "%1$s taldeko kideak, %2$d. orria"
+
+#. TRANS: Page notice for group members page.
+msgid "A list of the users in this group."
+msgstr "Talde honetako erabiltzaile-zerrenda."
+
+#. TRANS: Client error displayed when trying to approve group applicants without being a group administrator.
+msgid "Only the group admin may approve users."
+msgstr ""
+"Taldeko administrazaileak soilik onartu beharko lituzke erabiltzaileak."
+
+#. TRANS: Title of the first page showing pending group members still awaiting approval to join the group.
+#. TRANS: %s is the name of the group.
+#, php-format
+msgid "%s group members awaiting approval"
+msgstr "%s taldeko erabiltzaileak onarpenaren zai"
+
+#. TRANS: Title of all but the first page showing pending group members still awaiting approval to join the group.
+#. TRANS: %1$s is the name of the group, %2$d is the page number of the members list.
+#, php-format
+msgid "%1$s group members awaiting approval, page %2$d"
+msgstr "%1$s taldeko erabiltzaileak onarpenaren zain, %2$d. orria"
+
+#. TRANS: Page notice for group members page.
+msgid "A list of users awaiting approval to join this group."
+msgstr "Talde honekin elkartzeko onarpen zain dauden erabiltzaileen zerrenda."
+
+#. TRANS: Message is used as link description. %1$s is a group name, %2$s is a site name.
+#, php-format
+msgid "Updates from members of %1$s on %2$s!"
+msgstr "%2$s(e)n %1$s(e)ko kideek bidalitako azken mezuak!"
+
+#. TRANS: Title for first page of the groups list.
+msgctxt "TITLE"
+msgid "Groups"
+msgstr "Taldeak"
+
+#. TRANS: Title for all but the first page of the groups list.
+#. TRANS: %d is the page number.
+#, php-format
+msgctxt "TITLE"
+msgid "Groups, page %d"
+msgstr "Taldeak, %d. orria"
+
+#. TRANS: Page notice of group list. %%%%site.name%%%% is the StatusNet site name,
+#. TRANS: %%%%action.groupsearch%%%% and %%%%action.newgroup%%%% are URLs. Do not change them.
+#. TRANS: This message contains Markdown links in the form [link text](link).
+#, php-format
+msgid ""
+"%%%%site.name%%%% groups let you find and talk with people of similar "
+"interests. After you join a group you can send messages to all other members "
+"using the syntax \"!groupname\". Don't see a group you like? Try [searching "
+"for one](%%%%action.groupsearch%%%%) or [start your own](%%%%action.newgroup%"
+"%%%)!"
+msgstr ""
+"%%%%site.name%%%% taldeek interes berdineko lagunak aurkitu eta haiekin hitz "
+"egitea ahalbidetuko dizute. Talde batekin elkartzean, \"!taldeizena\" "
+"sintaxia erabiliz taldekide guztiei mezuak bidaltzeko aukera izango duzu. Ez "
+"duzu gustuko talderik aurkitzen? Saiatu [bat bilatzen](%%%%action.groupsearch"
+"%%%%) edo [sortu bat](%%%%action.newgroup%%%%)!"
+
+#. TRANS: Link to create a new group on the group list page.
+#. TRANS: Link text on group page to create a new group.
+#. TRANS: Form legend for group edit form.
+msgid "Create a new group"
+msgstr "Sortu talde berria"
+
+#. TRANS: Instructions for page where groups can be searched. %%site.name%% is the name of the StatusNet site.
+#, php-format
+msgid ""
+"Search for groups on %%site.name%% by their name, location, or description. "
+"Separate the terms by spaces; they must be 3 characters or more."
+msgstr ""
+"Bilatu taldeak %%site.name%% gunean izenaren, kokapenaren edo "
+"deskribapenaren bidez. Banandu hitzak zuriuneekin; 3 karaktere edo gehiago "
+"eduki behar dituzte."
+
+#. TRANS: Title for page where groups can be searched.
+msgid "Group search"
+msgstr "Talde bilaketa"
+
+#. TRANS: Text on page where groups can be searched if no results were found for a query.
+#. TRANS: Text for notice search results is the query had no results.
+#. TRANS: Message on the "People search" page where a query has no results.
+#. TRANS: Output when there are no results for a search.
+msgid "No results."
+msgstr "Emaitzarik ez."
+
+#. TRANS: Additional text on page where groups can be searched if no results were found for a query for a logged in user.
+#. TRANS: This message contains Markdown links in the form [link text](link).
+#, php-format
+msgid ""
+"If you cannot find the group you're looking for, you can [create it](%%"
+"action.newgroup%%) yourself."
+msgstr ""
+"Bilatzen ari zaren taldea aurkitzen ez baduzu, zuk zeuk [sortu](%%action."
+"newgroup%%) dezakezu."
+
+#. TRANS: Additional text on page where groups can be searched if no results were found for a query for a not logged in user.
+#. TRANS: This message contains Markdown links in the form [link text](link).
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and [create the group](%%"
+"action.newgroup%%) yourself!"
+msgstr ""
+"Zergatik ez duzu [izen ematen](%%action.register%%) eta [taldea sortzen](%%"
+"action.newgroup%%) zerorrek!"
+
+#. TRANS: Client error displayed when trying to unblock a user from a group without being an administrator for the group.
+msgid "Only an admin can unblock group members."
+msgstr "Administratzaileak soilik desblokea ditzake taldekideak."
+
+#. TRANS: Client error displayed when trying to unblock a non-blocked user from a group.
+msgid "User is not blocked from group."
+msgstr "Erabiltzailea ez dago taldean blokeatuta."
+
+#. TRANS: Server error displayed when unblocking a user from a group fails because of an unknown error.
+#. TRANS: Server error displayed when removing a user block.
+msgid "Error removing the block."
+msgstr "Errorea blokeoa kentzean."
+
+#. TRANS: Title for Instant Messaging settings.
+msgid "IM settings"
+msgstr "BM ezarpenak"
+
+#. TRANS: Instant messaging settings page instructions.
+#. TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link.
+#. TRANS: the order and formatting of link text and link should remain unchanged.
+#, php-format
+msgid ""
+"You can send and receive notices through [instant messaging](%%doc.im%%). "
+"Configure your addresses and settings below."
+msgstr ""
+"Oharrak bidal eta jaso ditzakezu [berehalako mezualaritza bidez](%%doc.im%"
+"%). Konfiguratu zure helbidea eta ezarpenak azpian."
+
+#. TRANS: Message given in the IM settings if IM is not enabled on the site.
+msgid "IM is not available."
+msgstr "BM ez dago erabilgarri."
+
+#. TRANS: Form note in IM settings form. %s is the type of IM address that was confirmed.
+#, php-format
+msgid "Current confirmed %s address."
+msgstr "Berretsitako uneko %s helbidea."
+
+#. TRANS: Form note in IM settings form.
+#. TRANS: %s is the IM service name, %2$s is the IM address set.
+#, php-format
+msgid ""
+"Awaiting confirmation on this address. Check your %1$s account for a message "
+"with further instructions. (Did you add %2$s to your buddy list?)"
+msgstr ""
+"Helbide honen berrespenaren zain. Beegiratu zure %1$s kontua argibide "
+"gehiago dituen mezua ikusteko. (Gehitu duzu %2$s zure lagunen zerrendan?)"
+
+#. TRANS: Field label for IM address.
+msgid "IM address"
+msgstr "BM helbidea"
+
+#. TRANS: Field title for IM address. %s is the IM service name.
+#, php-format
+msgid "%s screenname."
+msgstr "%s pantaila-izena."
+
+#. TRANS: Header for IM preferences form.
+msgid "IM Preferences"
+msgstr "BM hobespenak"
+
+#. TRANS: Checkbox label in IM preferences form.
+msgid "Send me notices"
+msgstr "Bidali oharrak niri"
+
+#. TRANS: Checkbox label in IM preferences form.
+msgid "Post a notice when my status changes."
+msgstr "Bidali oharra nire egoera aldatzen denean."
+
+#. TRANS: Checkbox label in IM preferences form.
+msgid "Send me replies from people I'm not subscribed to."
+msgstr "Bidali harpidetuta ez nagoen jendearen erantzunak."
+
+#. TRANS: Checkbox label in IM preferences form.
+msgid "Publish a MicroID"
+msgstr "Argitaratu MicroID bat"
+
+#. TRANS: Server error thrown on database error updating IM preferences.
+msgid "Could not update IM preferences."
+msgstr "Ezin izan dira IM hobespenak eguneratu."
+
+#. TRANS: Confirmation message for successful IM preferences save.
+#. TRANS: Confirmation message after saving preferences.
+msgid "Preferences saved."
+msgstr "Hobespenak gorde dira."
+
+#. TRANS: Message given saving IM address without having provided one.
+msgid "No screenname."
+msgstr "Pantaila-izenik ez."
+
+#. TRANS: Form validation error when no transport is available setting an IM address.
+msgid "No transport."
+msgstr "Garraiorik ez."
+
+#. TRANS: Message given saving IM address that cannot be normalised.
+msgid "Cannot normalize that screenname."
+msgstr "Ezin izan da pantaila-izen hori normalizatu."
+
+#. TRANS: Message given saving IM address that not valid.
+msgid "Not a valid screenname."
+msgstr "Ez da baliozko pantaila-izena."
+
+#. TRANS: Message given saving IM address that is already set for another user.
+msgid "Screenname already belongs to another user."
+msgstr "Pantaila-izena beste erabiltzaile batena da."
+
+#. TRANS: Message given saving valid IM address that is to be confirmed.
+msgid "A confirmation code was sent to the IM address you added."
+msgstr "Gehitu duzun BM helbidera berrespen-kodea bidali da."
+
+#. TRANS: Message given canceling IM address confirmation for the wrong IM address.
+msgid "That is the wrong IM address."
+msgstr "BM helbide hori okerra da."
+
+#. TRANS: Server error thrown on database error canceling IM address confirmation.
+msgid "Could not delete confirmation."
+msgstr "Ezin izan da baieztapena ezabatu."
+
+#. TRANS: Message given after successfully canceling IM address confirmation.
+msgid "IM confirmation cancelled."
+msgstr "BM baieztapena ezeztatua."
+
+#. TRANS: Message given trying to remove an IM address that is not
+#. TRANS: registered for the active user.
+msgid "That is not your screenname."
+msgstr "Hori ez da zure pantaila-izena."
+
+#. TRANS: Message given after successfully removing a registered Instant Messaging address.
+msgid "The IM address was removed."
+msgstr "BM helbidea kendu egin da."
+
+#. TRANS: Title for all but the first page of the inbox page.
+#. TRANS: %1$s is the user's nickname, %2$s is the page number.
+#, php-format
+msgid "Inbox for %1$s - page %2$d"
+msgstr "%1$s(r)en sarrera-ontzia - %2$d. orria"
+
+#. TRANS: Title for the first page of the inbox page.
+#. TRANS: %s is the user's nickname.
+#, php-format
+msgid "Inbox for %s"
+msgstr "%s(r)en sarrera-ontzia"
+
+#. TRANS: Instructions for user inbox page.
+msgid "This is your inbox, which lists your incoming private messages."
+msgstr "Hau zure sarrera-ontzia da, jasotako mezu pribatuak erakusten dituena."
+
+#. TRANS: Client error displayed when trying to sent invites while they have been disabled.
+msgid "Invites have been disabled."
+msgstr "Gonbidapenak desgaitu egin dira."
+
+#. TRANS: Client error displayed when trying to sent invites while not logged in.
+#. TRANS: %s is the StatusNet site name.
+#, php-format
+msgid "You must be logged in to invite other users to use %s."
+msgstr ""
+"Saioa hasi behar duzu beste erabiltzaileak %s erabiltzera gonbidatzeko."
+
+#. TRANS: Form validation message when providing an e-mail address that does not validate.
+#. TRANS: %s is an invalid e-mail address.
+#, php-format
+msgid "Invalid email address: %s."
+msgstr "Posta-helbide baliogabea: %s."
+
+#. TRANS: Page title when invitations have been sent.
+msgid "Invitations sent"
+msgstr "Gonbidapenak bidaliak"
+
+#. TRANS: Page title when inviting potential users.
+msgid "Invite new users"
+msgstr "Gonbidatu erabiltzaile berriak"
+
+#. TRANS: Message displayed inviting users to use a StatusNet site while the inviting user
+#. TRANS: is already subscribed to one or more users with the given e-mail address(es).
+#. TRANS: Plural form is based on the number of reported already subscribed e-mail addresses.
+#. TRANS: Followed by a bullet list.
+msgid "You are already subscribed to this user:"
+msgid_plural "You are already subscribed to these users:"
+msgstr[0] "Jadanik erabiltzaile horren harpideduna zara:"
+msgstr[1] "Jadanik erabiltzaile horien harpideduna zara:"
+
+#. TRANS: Used as list item for already subscribed users (%1$s is nickname, %2$s is e-mail address).
+#. TRANS: Used as list item for already registered people (%1$s is nickname, %2$s is e-mail address).
+#, php-format
+msgctxt "INVITE"
+msgid "%1$s (%2$s)"
+msgstr "%1$s (%2$s)"
+
+#. TRANS: Message displayed inviting users to use a StatusNet site while the invited user
+#. TRANS: already uses a this StatusNet site. Plural form is based on the number of
+#. TRANS: reported already present people. Followed by a bullet list.
+msgid "This person is already a user and you were automatically subscribed:"
+msgid_plural ""
+"These people are already users and you were automatically subscribed to them:"
+msgstr[0] ""
+"Pertsona hori jadanik erabiltzailea da eta hari automatikoki harpidetuta "
+"zaude:"
+msgstr[1] ""
+"Pertsona horiek jadanik erabiltzaileak dira eta haiei automatikoki "
+"harpidetuta zaude:"
+
+#. TRANS: Message displayed inviting users to use a StatusNet site. Plural form is
+#. TRANS: based on the number of invitations sent. Followed by a bullet list of
+#. TRANS: e-mail addresses to which invitations were sent.
+msgid "Invitation sent to the following person:"
+msgid_plural "Invitations sent to the following people:"
+msgstr[0] "Gonbidapena bidali zaio pertsona honi:"
+msgstr[1] "Gonbidapena bidali zaie pertsona hauei:"
+
+#. TRANS: Generic message displayed after sending out one or more invitations to
+#. TRANS: people to join a StatusNet site.
+msgid ""
+"You will be notified when your invitees accept the invitation and register "
+"on the site. Thanks for growing the community!"
+msgstr ""
+"Oharra bidaliko zaizu zure gonbidatuek gonbidapena onartzen dutenean eta "
+"gunean izen ematen dutenean. Eskerrik asko komunitatea hazten laguntzeagatik!"
+
+#. TRANS: Form instructions.
+msgid ""
+"Use this form to invite your friends and colleagues to use this service."
+msgstr ""
+"Erabili formulario hau zure lagunak eta lankideak zerbitzu hau erabiltzera "
+"gonbidatzeko."
+
+#. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral
+#. TRANS: singular 3rd-person pronoun in English. %1$s is the inviting user, $2$s is
+#. TRANS: the StatusNet sitename.
+#, php-format
+msgid "%1$s has invited you to join them on %2$s"
+msgstr "%1$s(e)k %2$s gunean haiekin elkartzera gonbidatu zaitu"
+
+#. TRANS: Client error displayed when trying to join a group while not logged in.
+msgid "You must be logged in to join a group."
+msgstr "Saioa hasi behar duzu taldearekin elkartzeko."
+
+#. TRANS: Title for join group page after joining.
+#, php-format
+msgctxt "TITLE"
+msgid "%1$s joined group %2$s"
+msgstr "%1$s %2$s taldearekin elkartu da"
+
+#. TRANS: Exception thrown when there is an unknown error joining a group.
+msgid "Unknown error joining group."
+msgstr "Errore ezezaguna taldearekin elkartzean."
+
+#. TRANS: Client error displayed when trying to join a group while already a member.
+#. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
+msgid "You are not a member of that group."
+msgstr "Ez zara talde horretako kidea."
+
+#. TRANS: User admin panel title
+msgctxt "TITLE"
+msgid "License"
+msgstr "Lizentzia"
+
+#. TRANS: Form instructions for the site license admin panel.
+msgid "License for this StatusNet site"
+msgstr "StatusNet gune honentzako lizentzia"
+
+#. TRANS: Client error displayed selecting an invalid license in the license admin panel.
+msgid "Invalid license selection."
+msgstr "Lizentzia-hautapen baliogabea."
+
+#. TRANS: Client error displayed when not specifying an owner for the all rights reserved license in the license admin panel.
+msgid ""
+"You must specify the owner of the content when using the All Rights Reserved "
+"license."
+msgstr ""
+"Edukiaren jabea adierazi behar duzu Eskubide Guztiak Erreserbatuta lizentzia "
+"erabiltzean."
+
+#. TRANS: Client error displayed selecting a too long license title in the license admin panel.
+msgid "Invalid license title. Maximum length is 255 characters."
+msgstr "Lizentzia-izenburu baliogabea. Luzera maximoa 255 karakterekoa da."
+
+#. TRANS: Client error displayed specifying an invalid license URL in the license admin panel.
+msgid "Invalid license URL."
+msgstr "Lizentziaren URL baliogabea."
+
+#. TRANS: Client error displayed specifying an invalid license image URL in the license admin panel.
+msgid "Invalid license image URL."
+msgstr "Lizentziaren irudiaren URL baliogabea."
+
+#. TRANS: Client error displayed specifying an invalid license URL in the license admin panel.
+msgid "License URL must be blank or a valid URL."
+msgstr "Lizentziaren URLa zuri utzi behar da eta baliozkoa izan behar da."
+
+#. TRANS: Client error displayed specifying an invalid license image URL in the license admin panel.
+msgid "License image must be blank or valid URL."
+msgstr ""
+"Lizentziaren irudia zuri utzi behar da edo baliozko URLa izan behar da."
+
+#. TRANS: Form legend in the license admin panel.
+msgid "License selection"
+msgstr "Lizentziaren aukeraketa"
+
+#. TRANS: License option in the license admin panel.
+#. TRANS: Checkbox label to mark a list private.
+msgid "Private"
+msgstr "Pribatua"
+
+#. TRANS: License option in the license admin panel.
+msgid "All Rights Reserved"
+msgstr "Eskubide guztiak gordeak"
+
+#. TRANS: License option in the license admin panel.
+msgid "Creative Commons"
+msgstr "Creative Commons"
+
+#. TRANS: Dropdown field label in the license admin panel.
+msgid "Type"
+msgstr "Mota"
+
+#. TRANS: Dropdown field instructions in the license admin panel.
+msgid "Select a license."
+msgstr "Hautatu lizentzia bat."
+
+#. TRANS: Form legend in the license admin panel.
+msgid "License details"
+msgstr "Lizentziaren xehetasunak"
+
+#. TRANS: Field label in the license admin panel.
+msgid "Owner"
+msgstr "Jabea"
+
+#. TRANS: Field title in the license admin panel.
+msgid "Name of the owner of the site's content (if applicable)."
+msgstr "Guneko edukiaren jabearen izena (aplikagarria denean)."
+
+#. TRANS: Field label in the license admin panel.
+msgid "License Title"
+msgstr "Lizentzia izenburua"
+
+#. TRANS: Field title in the license admin panel.
+msgid "The title of the license."
+msgstr "Lizentziaren izenburua."
+
+#. TRANS: Field label in the license admin panel.
+msgid "License URL"
+msgstr "Lizentziaren URLa"
+
+#. TRANS: Field title in the license admin panel.
+msgid "URL for more information about the license."
+msgstr "Lizentziaren argibide gehiago jasotzeko URLa."
+
+#. TRANS: Field label in the license admin panel.
+msgid "License Image URL"
+msgstr "Lizentziaren irudiaren URLa"
+
+#. TRANS: Field title in the license admin panel.
+msgid "URL for an image to display with the license."
+msgstr "Lizentziarekin batera bistaratzeko irudiaren URLa."
+
+#. TRANS: Button title in the license admin panel.
+msgid "Save license settings."
+msgstr "Gorde lizentzia-ezarpenak."
+
+#. TRANS: Form validation error displayed when trying to log in with incorrect credentials.
+msgid "Incorrect username or password."
+msgstr "Erabiltzaile-izen edo pasahitz okerra."
+
+#. TRANS: Server error displayed when during login a server error occurs.
+#. TRANS: Server error displayed when a user object could not be created trying to login using "one time password login".
+msgid "Error setting user. You are probably not authorized."
+msgstr "Errorea erabiltzailea ezartzean. Seguru asko ez daukazu baimenik."
+
+#. TRANS: Page title for login page.
+msgid "Login"
+msgstr "Izena eman"
+
+#. TRANS: Form legend on login page.
+msgid "Login to site"
+msgstr "Gunean saioa hasi"
+
+#. TRANS: Field label on login page.
+msgid "Username or email address"
+msgstr "Erabiltzaile-izena edo posta-helbidea"
+
+#. TRANS: Checkbox label label on login page.
+#. TRANS: Checkbox label on account registration page.
+msgid "Remember me"
+msgstr "Saioa gogoratu"
+
+#. TRANS: Checkbox title on login page.
+#. TRANS: Checkbox title on account registration page.
+msgid "Automatically login in the future; not for shared computers!"
+msgstr ""
+"Saioa automatikoki hasi etorkizunean; ez erabili hau ordenagailu publikoetan!"
+
+#. TRANS: Button text for log in on login page.
+msgctxt "BUTTON"
+msgid "Login"
+msgstr "Izena eman"
+
+#. TRANS: Link text for link to "reset password" on login page.
+msgid "Lost or forgotten password?"
+msgstr "Pasahitza galdu edo ahaztu duzu?"
+
+#. TRANS: Form instructions on login page before being able to change user settings.
+msgid ""
+"For security reasons, please re-enter your user name and password before "
+"changing your settings."
+msgstr ""
+"Segurtasun arrazoiengatik, berridatzi zure erabiltzaile-izen eta pasahitza "
+"ezarpenak aldatu aurretik."
+
+#. TRANS: Form instructions on login page.
+msgid "Login with your username and password."
+msgstr "Hasi saioa zure erabiltzaile-izen eta pasahitzarekin."
+
+#. TRANS: Form instructions on login page. This message contains Markdown links in the form [Link text](Link).
+#. TRANS: %%action.register%% is a link to the registration page.
+#, php-format
+msgid ""
+"Don't have a username yet? [Register](%%action.register%%) a new account."
+msgstr ""
+"Ez daukazu erabiltzailerik oraindik? [Izena eman](%%action.register%%) kontu "
+"berria sortzeko."
+
+#. TRANS: Client error displayed when trying to make another user admin on the Make Admin page while not an admin.
+msgid "Only an admin can make another user an admin."
+msgstr ""
+"Administratzaile batek soilik bihur dezake beste erabiltzaile bat "
+"administratzaile."
+
+#. TRANS: Client error displayed when trying to make another user admin on the Make Admin page who already is admin.
+#. TRANS: %1$s is the user that is already admin, %2$s is the group user is already admin for.
+#, php-format
+msgid "%1$s is already an admin for group \"%2$s\"."
+msgstr "%1$s jadanik \"%2$s\" taldearen administratzailea da."
+
+#. TRANS: Server error displayed when trying to make another user admin on the Make Admin page fails
+#. TRANS: because the group membership record could not be gotten.
+#. TRANS: %1$s is the to be admin user, %2$s is the group user should be admin for.
+#, php-format
+msgid "Can't get membership record for %1$s in group %2$s."
+msgstr "Ezin izan %1$s(r)en kidetasunaren erregistroa lortu %2$s talderako."
+
+#. TRANS: Server error displayed when trying to make another user admin on the Make Admin page fails
+#. TRANS: because the group adminship record coud not be saved properly.
+#. TRANS: %1$s is the to be admin user, %2$s is the group user is already admin for.
+#, php-format
+msgid "Can't make %1$s an admin for group %2$s."
+msgstr "Ezin izan da %1$s %2$s taldeko administrazaile egin."
+
+#. TRANS: Client error displayed trying to make a micro summary without providing a status.
+msgid "No current status."
+msgstr "Uneko egoerarik ez."
+
+#. TRANS: This is the title of the form for adding a new application.
+msgid "New application"
+msgstr "Aplikazio berria"
+
+#. TRANS: Client error displayed trying to add a new application while not logged in.
+msgid "You must be logged in to register an application."
+msgstr "Saioa hasita egon behar duzu aplikazio bat erregistratzeko."
+
+#. TRANS: Form instructions for registering a new application.
+msgid "Use this form to register a new application."
+msgstr "Erabili formulario hau aplikazio berri bat erregistratzeko."
+
+#. TRANS: Validation error shown when not providing a source URL in the "New application" form.
+msgid "Source URL is required."
+msgstr "Iturburu URLa ezinbestekoa da."
+
+#. TRANS: Server error displayed when an application could not be registered in the database through the "New application" form.
+msgid "Could not create application."
+msgstr "Ezin izan da aplikazioa sortu."
+
+#. TRANS: Form validation error messages displayed when uploading an invalid application logo.
+msgid "Invalid image."
+msgstr "Irudi baliogabea."
+
+#. TRANS: Title for form to create a group.
+msgid "New group"
+msgstr "Talde berria"
+
+#. TRANS: Client exception thrown when a user tries to create a group while banned.
+msgid "You are not allowed to create groups on this site."
+msgstr "Gune honetan ez duzu talde berriak sortzeko baimenik."
+
+#. TRANS: Form instructions for group create form.
+msgid "Use this form to create a new group."
+msgstr "Erabili formulario hau talde berri bat sortzeko."
+
+#. TRANS: Page title for new direct message page.
+#. TRANS: Page title on page for sending a direct message.
+msgid "New message"
+msgstr "Mezu berria"
+
+#. TRANS: Client error displayed trying to send a direct message to a user while sender and
+#. TRANS: receiver are not subscribed to each other.
+msgid "You cannot send a message to this user."
+msgstr "Erabiltzaile honi ezin diozu mezurik bidali."
+
+#. TRANS: Form validator error displayed trying to send a direct message without content.
+#. TRANS: Client error displayed trying to send a notice without content.
+#. TRANS: Command exception text shown when trying to send a direct message to another user without content.
+#. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
+msgid "No content!"
+msgstr "Edukirik ez!"
+
+#. TRANS: Form validation error displayed trying to send a direct message without specifying a recipient.
+msgid "No recipient specified."
+msgstr "Ez da hartzailerik zehaztu."
+
+#. TRANS: Page title after sending a direct message.
+msgid "Message sent"
+msgstr "Mezua bidalia"
+
+#. TRANS: Confirmation text after sending a direct message.
+#. TRANS: %s is the direct message recipient.
+#. TRANS: Message given have sent a direct message to another user.
+#. TRANS: %s is the name of the other user.
+#, php-format
+msgid "Direct message to %s sent."
+msgstr "%s(r)i mezu zuzena bidalia."
+
+#. TRANS: Page title after an AJAX error occurred on the "send direct message" page.
+#. TRANS: Page title after an AJAX error occurs on the send notice page.
+msgid "Ajax Error"
+msgstr "Ajax errorea"
+
+#. TRANS: Page title for sending a new notice.
+#. TRANS: Title for form to send a new notice.
+msgctxt "TITLE"
+msgid "New notice"
+msgstr "Ohar berria"
+
+#. TRANS: Page title after sending a notice.
+msgid "Notice posted"
+msgstr "Oharra bidalia"
+
+#. TRANS: Instructions for Notice search page.
+#. TRANS: %%site.name%% is the name of the StatusNet site.
+#, 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%% gunean oharrak edukiz bilatu. Banandu bilaketa-terminoak "
+"zuriuneekin; terminoek hiru karaktere baino gehiago beharko dituzte."
+
+#. TRANS: Title of the page where users can search for notices.
+msgid "Text search"
+msgstr "Testu bilaketa"
+
+#. TRANS: Test in RSS notice search.
+#. TRANS: %1$s is the query, %2$s is the StatusNet site name.
+#, php-format
+msgid "Search results for \"%1$s\" on %2$s"
+msgstr "%2$s(e)n \"%1$s\" testuaren bilaketaren emaitzak"
+
+#. TRANS: Text for logged in users making a query for notices without results.
+#. TRANS: This message contains a Markdown link.
+#, php-format
+msgid ""
+"Be the first to [post on this topic](%%%%action.newnotice%%%%?"
+"status_textarea=%s)!"
+msgstr ""
+"Izan zaitez lehena [gai honen inguruan idazten](%%%%action.newnotice%%%%?"
+"status_textarea=%s)!"
+
+#. TRANS: Text for not logged in users making a query for notices without results.
+#. TRANS: This message contains Markdown links.
+#, php-format
+msgid ""
+"Why not [register an account](%%%%action.register%%%%) and be the first to "
+"[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
+msgstr ""
+"Zergatik ez [izena eman](%%%%action.register%%%%) eta [gaiaren inguruan "
+"idazten](%%%%action.newnotice%%%%?status_textarea=%s) lehena izan!"
+
+#. TRANS: RSS notice search feed title. %s is the query.
+#, php-format
+msgid "Updates with \"%s\""
+msgstr "\"%s\"(r)ekin eguneraketak"
+
+#. TRANS: RSS notice search feed description.
+#. TRANS: %1$s is the query, %2$s is the StatusNet site name.
+#, php-format
+msgid "Updates matching search term \"%1$s\" on %2$s."
+msgstr "\"%1$s\" bilaketa terminoari dagozkion eguneraketak \"%2$s\"(e)n."
+
+#. TRANS: Client error displayed trying to nudge a user that cannot be nudged.
+msgid ""
+"This user doesn't allow nudges or hasn't confirmed or set their email "
+"address yet."
+msgstr ""
+"Erabiltzaile honek ez du zirikatua izan nahi edo ez du bere posta-helcidea "
+"sartu oraindik."
+
+#. TRANS: Page title after sending a nudge.
+msgid "Nudge sent"
+msgstr "Zirikatua"
+
+#. TRANS: Confirmation text after sending a nudge.
+msgid "Nudge sent!"
+msgstr "Zirikatua!"
+
+#. TRANS: Message displayed to an anonymous user trying to view OAuth application list.
+msgid "You must be logged in to list your applications."
+msgstr "Zure aplikazioak zerrendatzeko saioa hasi behar duzu."
+
+#. TRANS: Page title for OAuth applications
+msgid "OAuth applications"
+msgstr "OAuth aplikazioak"
+
+#. TRANS: Page instructions for OAuth applications
+msgid "Applications you have registered"
+msgstr "Erregistratu dituzun aplikazioak"
+
+#. TRANS: Empty list message on page with OAuth applications.
+#, php-format
+msgid "You have not registered any applications yet."
+msgstr "Ez duzu aplikaziorik erregistratu oraindik."
+
+#. TRANS: Title for OAuth connection settings.
+msgid "Connected applications"
+msgstr "Konektaturiko aplikazioak"
+
+#. TRANS: Instructions for OAuth connection settings.
+msgid "The following connections exist for your account."
+msgstr "Zure kontuak ondorengo konexioak ditu."
+
+#. TRANS: Client error when trying to revoke access for an application while not being a user of it.
+msgid "You are not a user of that application."
+msgstr "Ez zara aplikazio horren erabiltzailea."
+
+#. TRANS: Client error when revoking access has failed for some reason.
+#. TRANS: %s is the application ID revoking access failed for.
+#, php-format
+msgid "Unable to revoke access for application: %s."
+msgstr "%s aplikaziora atzipena ezin da ezeztatu."
+
+#. TRANS: Success message after revoking access for an application.
+#. TRANS: %1$s is the application name, %2$s is the first part of the user token.
+#, php-format
+msgid ""
+"You have successfully revoked access for %1$s and the access token starting "
+"with %2$s."
+msgstr ""
+"%2$s hasten den tokena eta %1$s aplikazioari sarbidea ondo ezeztatu diozu."
+
+#. TRANS: Empty list message when no applications have been authorised yet.
+msgid "You have not authorized any applications to use your account."
+msgstr "Ez duzu aplikaziorik baimendu zure kontua erabil dezan."
+
+#. TRANS: Note for developers in the OAuth connection settings form.
+#. TRANS: This message contains a Markdown link. Do not separate "](".
+#. TRANS: %s is the URL to the OAuth settings.
+#, php-format
+msgid ""
+"Are you a developer? [Register an OAuth client application](%s) to use with "
+"this instance of StatusNet."
+msgstr ""
+"Garatzailea zara?  [Erregistratu OAuth bezero-aplikazio bat](%s) StatusNet-"
+"en instantzia honekin erabilia izateko."
+
+#. TRANS: Server error displayed in oEmbed action when path not found.
+#. TRANS: %s is a path.
+#, php-format
+msgid "\"%s\" not found."
+msgstr "Ez da \"%s\" aurkitu."
+
+#. TRANS: Server error displayed in oEmbed action when notice not found.
+#. TRANS: %s is a notice.
+#, php-format
+msgid "Notice %s not found."
+msgstr "%s oharra ez da aurkitu."
+
+#. TRANS: Server error displayed in oEmbed action when notice has not profile.
+#. TRANS: Server error displayed trying to show a notice without a connected profile.
+msgid "Notice has no profile."
+msgstr "Oharrak ez du profilik."
+
+#. TRANS: oEmbed title. %1$s is the author name, %2$s is the creation date.
+#. TRANS: Title of the page that shows a notice.
+#. TRANS: %1$s is a user name, %2$s is the notice creation date/time.
+#, php-format
+msgid "%1$s's status on %2$s"
+msgstr "%1$s(r)en status-a, %2$s"
+
+#. TRANS: Server error displayed in oEmbed action when attachment not found.
+#. TRANS: %d is an attachment ID.
+#, php-format
+msgid "Attachment %s not found."
+msgstr "Ez da %s eranskina aurkitu."
+
+#. TRANS: Server error displayed in oEmbed request when a path is not supported.
+#. TRANS: %s is a path.
+#, php-format
+msgid "\"%s\" not supported for oembed requests."
+msgstr "\"%s\" helbidea ez da onartzen oembed eskaeretarako."
+
+#. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
+#, php-format
+msgid "Content type %s not supported."
+msgstr "%s eduki-mota ez dago onartuta."
+
+#. TRANS: Error message displaying attachments. %s is the site's base URL.
+#, php-format
+msgid "Only %s URLs over plain HTTP please."
+msgstr "Mesedez, %s URLak soilik HTTP arrunta erabiliz."
+
+#. TRANS: Server error displayed in oEmbed action when request specifies an unsupported data format.
+#. TRANS: Client error on an API request with an unsupported data format.
+msgid "Not a supported data format."
+msgstr "Onartzen ez den datu-formatua."
+
+#. TRANS: Page title for profile settings.
+msgid "Old school UI settings"
+msgstr "BM ezarpenak aintzinako eran"
+
+#. TRANS: Usage instructions for profile settings.
+msgid "If you like it \"the old way\", you can set that here."
+msgstr "\"Aintzinako eran\" nahiago baduzu, hemen aukera dezakezu."
+
+#. TRANS: Confirmation shown when user profile settings are saved.
+#. TRANS: Message after successful saving of administrative settings.
+msgid "Settings saved."
+msgstr "Ezarpenak gordeak."
+
+msgid "Only stream mode (no conversations) in timelines"
+msgstr "Jario modua soilik (elkarrizketarik gabe)"
+
+msgid "Show conversation page as hierarchical trees"
+msgstr "Erakutsi konbertsazio orria zuhaitz hierarkikoekin"
+
+msgid "Show nicknames (not full names) in timelines"
+msgstr "Erakutsi goitizena (ez izen osoak) jarioetan"
+
+#. TRANS: Button text to save a list.
+msgid "Save"
+msgstr "Gorde"
+
+#. TRANS: ShortName in the OpenSearch interface when trying to find users.
+msgid "People Search"
+msgstr "Jendearen bilaketa"
+
+#. TRANS: ShortName in the OpenSearch interface when trying to find notices.
+msgid "Notice Search"
+msgstr "Oharren bilaketa"
+
+#. TRANS: Client error displayed trying to use "one time password login" when already logged in.
+#. TRANS: Client error displayed when trying to register while already logged in.
+msgid "Already logged in."
+msgstr "Dagoeneko saioa hasita."
+
+#. TRANS: Client error displayed trying to use "one time password login" without specifying a user.
+msgid "No user ID specified."
+msgstr "Ez da erabiltzaile IDrik adierazi."
+
+#. TRANS: Client error displayed trying to use "one time password login" without specifying a login token.
+msgid "No login token specified."
+msgstr "Ez da saioa hasteko tokenik adierazi."
+
+#. TRANS: Client error displayed trying to use "one time password login" without requesting a login token.
+msgid "No login token requested."
+msgstr "Ez da saioa hasteko tokenik eskatu."
+
+#. TRANS: Client error displayed trying to use "one time password login" while specifying an invalid login token.
+msgid "Invalid login token specified."
+msgstr "Saioa hasteko baliogabeko tokena adierazi da."
+
+#. TRANS: Client error displayed trying to use "one time password login" while specifying an expired login token.
+msgid "Login token expired."
+msgstr "Saioa hasteko tokena iraungita dago."
+
+#. TRANS: Title for outbox for any but the fist page.
+#. TRANS: %1$s is the user nickname, %2$d is the page number.
+#, php-format
+msgid "Outbox for %1$s - page %2$d"
+msgstr "%1$s-(e)n irteera-kutxa - %2$d. orria"
+
+#. TRANS: Title for first page of outbox.
+#, php-format
+msgid "Outbox for %s"
+msgstr "%s-(e)n irteera-kutxa"
+
+#. TRANS: Instructions for outbox.
+msgid "This is your outbox, which lists private messages you have sent."
+msgstr ""
+"Hau zure irteera-kutxa da, bidali dituzun mezu pribatuen zerrenda erakusten "
+"duena."
+
+#. TRANS: Title for page where to change password.
+msgctxt "TITLE"
+msgid "Change password"
+msgstr "Aldatu pasahitza"
+
+#. TRANS: Instructions for page where to change password.
+msgid "Change your password."
+msgstr "Zure pasahitza aldatu."
+
+#. TRANS: Fieldset legend on page where to change password.
+#. TRANS: Fieldset legend for password reset form.
+msgid "Password change"
+msgstr "Pasahitz aldaketa"
+
+#. TRANS: Field label on page where to change password.
+msgid "Old password"
+msgstr "Pasahitz zaharra"
+
+#. TRANS: Field label on page where to change password.
+#. TRANS: Field label for password reset form.
+msgid "New password"
+msgstr "Pasahitz berria"
+
+#. TRANS: Field title on page where to change password.
+#. TRANS: Field title on account registration page.
+msgid "6 or more characters."
+msgstr "6 karaktere edo gehiago."
+
+#. TRANS: Field label on page where to change password. In this field the new password should be typed a second time.
+msgctxt "LABEL"
+msgid "Confirm"
+msgstr "Baieztatu"
+
+#. TRANS: Field title on page where to change password.
+#. TRANS: Title for field label for password reset form where the password has to be typed again.
+#. TRANS: Field title on account registration page.
+msgid "Same as password above."
+msgstr "Gohiko pasahitz berbera."
+
+#. TRANS: Button text on page where to change password.
+msgctxt "BUTTON"
+msgid "Change"
+msgstr "Aldatu"
+
+#. TRANS: Form validation error on page where to change password.
+#. TRANS: Form validation error displayed when trying to register with too short a password.
+msgid "Password must be 6 or more characters."
+msgstr "Pasahitzak 6 karaktere edo gehiago izan behar ditu."
+
+#. TRANS: Form validation error on password change when password confirmation does not match.
+#. TRANS: Form validation error displayed when trying to register with non-matching passwords.
+msgid "Passwords do not match."
+msgstr "Pasahitzak ez datoz bat."
+
+#. TRANS: Form validation error on page where to change password.
+msgid "Incorrect old password."
+msgstr "Pasahitz zahar okerra."
+
+#. TRANS: Form validation error on page where to change password.
+msgid "Error saving user; invalid."
+msgstr "Errorea erabiltzailea gordetzean; baliogabea."
+
+#. TRANS: Server error displayed on page where to change password when password change
+#. TRANS: could not be made because of a server error.
+#. TRANS: Reset password form validation error message.
+msgid "Cannot save new password."
+msgstr "Ezin da pasahitz berria gorde."
+
+#. TRANS: Form validation notice on page where to change password.
+msgid "Password saved."
+msgstr "Pasahitza gordea."
+
+#. TRANS: Title for Paths admin panel.
+msgid "Paths"
+msgstr "Bideak"
+
+#. TRANS: Form instructions for Path admin panel.
+msgid "Path and server settings for this StatusNet site"
+msgstr "StatusNet gune honen bide- eta zerbitzari-ezarpenak"
+
+#. TRANS: Client error in Paths admin panel.
+#. TRANS: %s is the directory that could not be read from.
+#, php-format
+msgid "Theme directory not readable: %s."
+msgstr "Ezin da irakurri gaien direktorioa: %s."
+
+#. TRANS: Client error in Paths admin panel.
+#. TRANS: %s is the avatar directory that could not be written to.
+#, php-format
+msgid "Avatar directory not writable: %s."
+msgstr "Ezin da idatzi avatarren direktorioan: %s."
+
+#. TRANS: Client error in Paths admin panel.
+#. TRANS: %s is the locales directory that could not be read from.
+#, php-format
+msgid "Locales directory not readable: %s."
+msgstr "Ezin da irakurri locale-en direktorioa: %s."
+
+#. TRANS: Client error in Paths admin panel.
+#. TRANS: %s is the SSL server URL that is too long.
+msgid "Invalid SSL server. The maximum length is 255 characters."
+msgstr "SSL zerbitzari baliogabea. Gehieneko luzera 255 karakterekoa da."
+
+#. TRANS: Fieldset legend in Paths admin panel.
+msgid "Site"
+msgstr "Gunea"
+
+#. TRANS: Field label in Paths admin panel.
+msgid "Server"
+msgstr "Zerbitzaria"
+
+#. TRANS: Field title in Paths admin panel.
+msgid "Site's server hostname."
+msgstr "Gunearen zerbitzariaren ostalari-izena."
+
+#. TRANS: Field label in Paths admin panel.
+msgid "Path"
+msgstr "Bidea"
+
+#. TRANS: Field title in Paths admin panel.
+msgid "Site path."
+msgstr "Gunearen bidea."
+
+#. TRANS: Field label in Paths admin panel.
+msgid "Locale directory"
+msgstr "Direktorio lokala"
+
+#. TRANS: Field title in Paths admin panel.
+msgid "Directory path to locales."
+msgstr "Locale-en direktorio-bidea."
+
+#. TRANS: Checkbox label in Paths admin panel.
+msgid "Fancy URLs"
+msgstr "URL atseginak"
+
+#. TRANS: Field title in Paths admin panel.
+msgid "Use fancy URLs (more readable and memorable)?"
+msgstr "Erabili URL atseginak (irakurterrazagoak eta gogoratzeko errazagoak)?"
+
+#. TRANS: Fieldset legend in Paths admin panel.
+msgctxt "LEGEND"
+msgid "Theme"
+msgstr "Itxura"
+
+#. TRANS: Tooltip for field label in Paths admin panel.
+msgid "Server for themes."
+msgstr "Itxurentzako zerbitzaria."
+
+#. TRANS: Tooltip for field label in Paths admin panel.
+msgid "Web path to themes."
+msgstr "Itxurentzako web bidea."
+
+#. TRANS: Field label in Paths admin panel.
+msgid "SSL server"
+msgstr "SSL zerbitzaria"
+
+#. TRANS: Tooltip for field label in Paths admin panel.
+msgid "SSL server for themes (default: SSL server)."
+msgstr "Itxurentzako SSL zerbitzaria (lehenetsia: SSL zerbitzaria)."
+
+#. TRANS: Field label in Paths admin panel.
+msgid "SSL path"
+msgstr "SSL bidea"
+
+#. TRANS: Tooltip for field label in Paths admin panel.
+msgid "SSL path to themes (default: /theme/)."
+msgstr "Itxurentzako SSL bidea (lehenetsia: /theme/)."
+
+#. TRANS: Field label in Paths admin panel.
+msgid "Directory"
+msgstr "Direktorioa"
+
+#. TRANS: Tooltip for field label in Paths admin panel.
+msgid "Directory where themes are located."
+msgstr "Itxurak kokatuak dauden direktorioa."
+
+#. TRANS: Fieldset legend in Paths admin panel.
+msgid "Avatars"
+msgstr "Abatarrak"
+
+#. TRANS: Field label in Paths admin panel.
+msgid "Avatar server"
+msgstr "Abatar zerbitzaria"
+
+#. TRANS: Tooltip for field label in Paths admin panel.
+msgid "Server for avatars."
+msgstr "Abatarren zerbitzaria."
+
+#. TRANS: Field label in Paths admin panel.
+msgid "Avatar path"
+msgstr "Avatarraren bidea"
+
+#. TRANS: Tooltip for field label in Paths admin panel.
+msgid "Web path to avatars."
+msgstr "Avatarren web-bidea."
+
+#. TRANS: Field label in Paths admin panel.
+msgid "Avatar directory"
+msgstr "Avatarraren directorioa"
+
+#. TRANS: Tooltip for field label in Paths admin panel.
+msgid "Directory where avatars are located."
+msgstr "Avatarrak dauden direktorioa."
+
+#. TRANS: Fieldset legens in Paths admin panel.
+msgid "Attachments"
+msgstr "Eranskinak"
+
+#. TRANS: Tooltip for field label in Paths admin panel.
+msgid "Server for attachments."
+msgstr "Eranskinen zerbitzaria."
+
+#. TRANS: Tooltip for field label in Paths admin panel.
+msgid "Web path to attachments."
+msgstr "Eranskinen web bidea."
+
+#. TRANS: Tooltip for field label in Paths admin panel.
+msgid "Server for attachments on SSL pages."
+msgstr "SSL orrietako eranskinen zerbitzaria."
+
+#. TRANS: Tooltip for field label in Paths admin panel.
+msgid "Web path to attachments on SSL pages."
+msgstr "SSL orrietako eranskinen web bidea."
+
+#. TRANS: Tooltip for field label in Paths admin panel.
+msgid "Directory where attachments are located."
+msgstr "Eranskinak gordetzen diren direktorioa."
+
+#. TRANS: Fieldset legend in Paths admin panel.
+msgctxt "LEGEND"
+msgid "SSL"
+msgstr "SSL"
+
+#. TRANS: Drop down option in Paths admin panel (option for "When to use SSL").
+#. TRANS: Option in dropdown for snapshot method in admin panel for snapshots.
+msgid "Never"
+msgstr "Inoiz ez"
+
+#. TRANS: Drop down option in Paths admin panel (option for "When to use SSL").
+msgid "Sometimes"
+msgstr "Batzutan"
+
+#. TRANS: Drop down option in Paths admin panel (option for "When to use SSL").
+msgid "Always"
+msgstr "Beti"
+
+#. TRANS: Drop down label in Paths admin panel.
+msgid "Use SSL"
+msgstr "Erabili SSL"
+
+#. TRANS: Tooltip for field label in Paths admin panel.
+msgid "When to use SSL."
+msgstr "Noiz erabili SSL."
+
+#. TRANS: Tooltip for field label in Paths admin panel.
+msgid "Server to direct SSL requests to."
+msgstr "SSL eskariak bideratzeko zerbitzaria."
+
+#. TRANS: Button title text to store form data in the Paths admin panel.
+msgid "Save path settings."
+msgstr "Gorde helbide ezarpenak."
+
+#. TRANS: Instructions for the "People search" page.
+#. TRANS: %%site.name%% is the name of the StatusNet site.
+#, 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 ""
+"Bilatu jendea %%site.name%% gunean bere izen, kokapen edo interesen arabera. "
+"Banandu hitzak zuriuneekin; 3 karaktere edo gehiago eduki behar dituzte."
+
+#. TRANS: Title of a page where users can search for other users.
+msgid "People search"
+msgstr "Jendearen bilaketa"
+
+#. TRANS: Title for list page.
+#. TRANS: %s is a list.
+#, php-format
+msgid "Public list %s"
+msgstr "%s zerrenda publikoa"
+
+#. TRANS: Title for list page.
+#. TRANS: %1$s is a list, %2$d is a page number.
+#, php-format
+msgid "Public list %1$s, page %2$d"
+msgstr "%1$s zerrenda publikoa, %2$d. orria"
+
+#. TRANS: Message for anonymous users on list page.
+#. TRANS: This message contains Markdown links in the form [description](link).
+#, php-format
+msgid ""
+"Lists are how you sort similar people on %%site.name%%, a [micro-blogging]"
+"(http://en.wikipedia.org/wiki/Micro-blogging) service based on the Free "
+"Software [StatusNet](http://status.net/) tool. You can then easily keep "
+"track of what they are doing by subscribing to the list's timeline."
+msgstr ""
+"Zerrendekin antzeko jendea sailkatuko duzu %%site.name%% gunean, [StatusNet]"
+"(http://status.net/) software librea darabilen [mikroblogging zerbitzuan]"
+"(http://eu.wikipedia.org/wiki/Mikroblogging). Zer egiten duten erraz "
+"jarraituko ahal izango duzu zerrendaren denbora-lerrora harpidetuz."
+
+#. TRANS: Client error displayed when a tagger is expected but not provided.
+msgid "No tagger."
+msgstr "Ez dago etiketatzailerik."
+
+#. TRANS: Title for list of people listed by the user.
+#. TRANS: %1$s is a list, %2$s is a username.
+#, php-format
+msgid "People listed in %1$s by %2$s"
+msgstr "%2$s(r)en %1$s zerrendakoak"
+
+#. TRANS: Title for list of people listed by the user.
+#. TRANS: %1$s is a list, %2$s is a username, %2$s is a page number.
+#, php-format
+msgid "People listed in %1$s by %2$s, page %3$d"
+msgstr "%2$s(r)en %1$s zerrendakoak, %3$d. orria"
+
+#. TRANS: Addition in tag membership list for creator of a tag.
+#. TRANS: Addition in tag subscribers list for creator of a tag.
+msgid "Creator"
+msgstr "Egilea"
+
+#. TRANS: Title for lists by a user page for a private tag.
+msgid "Private lists by you"
+msgstr "Zure zerrenda pribatuak"
+
+#. TRANS: Title for lists by a user page for a public tag.
+msgid "Public lists by you"
+msgstr "Zure zerrenda publikoak"
+
+#. TRANS: Title for lists by a user page.
+msgid "Lists by you"
+msgstr "Zure zerrendak"
+
+#. TRANS: Title for lists by a user page.
+#. TRANS: %s is a user nickname.
+#, php-format
+msgid "Lists by %s"
+msgstr "%s(r)en zerrendak"
+
+#. TRANS: Title for lists by a user page.
+#. TRANS: %1$s is a user nickname, %2$d is a page number.
+#, php-format
+msgid "Lists by %1$s, page %2$d"
+msgstr "%1$s(r)en zerrendak, %2$d orria"
+
+#. TRANS: Client error displayed when trying view another user's private lists.
+msgid "You cannot view others' private lists"
+msgstr "Ezin dituzu besteen zerrenda pribatuak ikusi"
+
+#. TRANS: Mode selector label.
+msgid "Mode"
+msgstr "Modua"
+
+#. TRANS: Link text to show lists for user %s.
+#, php-format
+msgid "Lists for %s"
+msgstr "%s(e)ren zerrendak"
+
+#. TRANS: Fieldset legend.
+#. TRANS: Fieldset legend on gallery action page.
+msgid "Select tag to filter"
+msgstr "Hautatu etiketa iragazteko"
+
+#. TRANS: Checkbox title.
+msgid "Show private tags."
+msgstr "Erakutsi etiketa pribatuak."
+
+#. TRANS: Checkbox label to show public tags.
+msgctxt "LABEL"
+msgid "Public"
+msgstr "Publikoa"
+
+#. TRANS: Checkbox title.
+msgid "Show public tags."
+msgstr "Erakutsi etiketa publikoak."
+
+#. TRANS: Submit button text for tag filter form.
+#. TRANS: Submit button text on gallery action page.
+msgctxt "BUTTON"
+msgid "Go"
+msgstr "Joan"
+
+#. TRANS: Message displayed for anonymous users on page that displays lists by a user.
+#. TRANS: This message contains Markdown links in the form [description](links).
+#. TRANS: %s is a tagger nickname.
+#, php-format
+msgid ""
+"These are lists created by **%s**. Lists are how you sort similar people on %"
+"%%%site.name%%%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
+"blogging) service based on the Free Software [StatusNet](http://status.net/) "
+"tool. You can easily keep track of what they are doing by subscribing to the "
+"list's timeline."
+msgstr ""
+"Zerrenda hauek **%s** bidez sortzen dira.  Zerrendekin antzeko jendea "
+"sailkatuko duzu %%site.name%% gunean, [StatusNet](http://status.net/) "
+"software librea darabilen [mikroblogintza-zerbitzuan](http://eu.wikipedia."
+"org/wiki/Mikroblogintza). Zer egiten duten erraz jarraituko ahal izango duzu "
+"etiketaren denbora-lerrora harpidetuz."
+
+#. TRANS: Message displayed on page that displays lists by a user when there are none.
+#. TRANS: This message contains Markdown links in the form [description](links).
+#. TRANS: %s is a tagger nickname.
+#, php-format
+msgid "%s has not created any [lists](%%%%doc.lists%%%%) yet."
+msgstr "%s(e)k ez du [zerrendarik](%%%%doc.lists%%%%) sortu oraindik."
+
+#. TRANS: Page title. %s is a tagged user's nickname.
+#, php-format
+msgid "Lists with %s in them"
+msgstr "%s dagoen zerrendak"
+
+#. TRANS: Page title. %1$s is a tagged user's nickname, %2$s is a page number.
+#, php-format
+msgid "Lists with %1$s, page %2$d"
+msgstr "%1$s dagoen zerrendak, %2$d. orria"
+
+#. TRANS: Message displayed for anonymous users on page that displays lists for a user.
+#. TRANS: This message contains Markdown links in the form [description](links).
+#. TRANS: %s is a tagger nickname.
+#, php-format
+msgid ""
+"These are lists for **%s**. lists are how you sort similar people on %%%%"
+"site.name%%%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
+"blogging) service based on the Free Software [StatusNet](http://status.net/) "
+"tool. You can easily keep track of what they are doing by subscribing to the "
+"list's timeline."
+msgstr ""
+"Hauek **%s**(e)ren zerrendak dira. Zerrendekin antzeko jendea sailkatuko "
+"duzu %%site.name%% gunean, [StatusNet](http://status.net/) software librea "
+"darabilen [mikroblogintza-zerbitzuan](http://eu.wikipedia.org/wiki/"
+"Mikroblogintza). Zer egiten duten erraz jarraituko ahal izango duzu "
+"etiketaren denbora-lerrora harpidetuz."
+
+#. TRANS: Message displayed on page that displays lists a user was added to when there are none.
+#. TRANS: This message contains Markdown links in the form [description](links).
+#. TRANS: %s is a user nickname.
+#, php-format
+msgid "%s has not been [listed](%%%%doc.lists%%%%) by anyone yet."
+msgstr "%s ez du inork [zerrendatu](%%%%doc.lists%%%%) oraingoz."
+
+#. TRANS: Page title for list of list subscribers.
+#. TRANS: %1$s is a list, %2$s is a user nickname.
+#, php-format
+msgid "Subscribers to list %1$s by %2$s"
+msgstr "%2$s(r)en %1$s zerrendako harpidedunak."
+
+#. TRANS: Page title for list of list subscribers.
+#. TRANS: %1$s is a list, %2$s is a user nickname, %3$d is a page number.
+#, php-format
+msgid "Subscribers to list %1$s by %2$s, page %3$d"
+msgstr "%2$s(r)en %1$s zerrendako harpidedunak, %3$d. orria"
+
+#. TRANS: Title for page that displays lists subscribed to by a user.
+#. TRANS: %s is a profile nickname.
+#, php-format
+msgid "Lists subscribed to by %s"
+msgstr "%s harpidetu den zerrendak"
+
+#. TRANS: Title for page that displays lists subscribed to by a user.
+#. TRANS: %1$s is a profile nickname, %2$d is a page number.
+#, php-format
+msgid "Lists subscribed to by %1$s, page %2$d"
+msgstr "%1$s harpidetuta dagoen zerrendak, %2$d. orria"
+
+#. TRANS: Message displayed for anonymous users on page that displays lists subscribed to by a user.
+#. TRANS: This message contains Markdown links in the form [description](links).
+#. TRANS: %s is a profile nickname.
+#, php-format
+msgid ""
+"These are lists subscribed to by **%s**. Lists are how you sort similar "
+"people on %%%%site.name%%%%, a [micro-blogging](http://en.wikipedia.org/wiki/"
+"Micro-blogging) service based on the Free Software [StatusNet](http://status."
+"net/) tool. You can easily keep track of what they are doing by subscribing "
+"to the list's timeline."
+msgstr ""
+"Hauek **%s** harpidetu diren zerrendak dira. Zerrendekin antzeko jendea "
+"sailkatuko duzu %%site.name%% gunean, [StatusNet](http://status.net/) "
+"software librea darabilen [mikroblogintza-zerbitzuan](http://eu.wikipedia."
+"org/wiki/Mikroblogintza). Zer egiten duten erraz jarraituko ahal izango duzu "
+"zerrendaren denbora-lerrora harpidetuz."
+
+#. TRANS: Page title for AJAX form return when a disabling a plugin.
+msgctxt "plugin"
+msgid "Disabled"
+msgstr "Desgaitua"
+
+#. TRANS: Client error displayed when trying to use another method than POST.
+#. TRANS: Do not translate POST.
+#. TRANS: Client error displayed trying to perform any request method other than POST.
+#. TRANS: Do not translate POST.
+#. TRANS: Client error displayed when trying to use another method than POST.
+msgid "This action only accepts POST requests."
+msgstr "Ekintza honek POST eskariak soilik onartzen ditu."
+
+#. TRANS: Client error displayed when trying to enable or disable a plugin without access rights.
+msgid "You cannot administer plugins."
+msgstr "Ezin dituzu pluginak administratu."
+
+#. TRANS: Client error displayed when trying to enable or disable a non-existing plugin.
+msgid "No such plugin."
+msgstr "Ez dago halako pluginik."
+
+#. TRANS: Page title for AJAX form return when enabling a plugin.
+msgctxt "plugin"
+msgid "Enabled"
+msgstr "Gaitua"
+
+#. TRANS: Tab and title for plugins admin panel.
+msgctxt "TITLE"
+msgid "Plugins"
+msgstr "Pluginak"
+
+#. TRANS: Instructions at top of plugin admin page.
+msgid ""
+"Additional plugins can be enabled and configured manually. See the <a href="
+"\"http://status.net/wiki/Plugins\">online plugin documentation</a> for more "
+"details."
+msgstr ""
+"Plugin gehigarriak gaitu eta konfiguratu ditzakezu eskuz. Ikusi <a href="
+"\"http://status.net/wiki/Plugins\">pluginen dokumentazioa sarean</a> "
+"xehetasun gehiagorako."
+
+#. TRANS: Admin form section header
+msgid "Default plugins"
+msgstr "Plugin lehenetsiak"
+
+#. TRANS: Text displayed on plugin admin page when no plugin are enabled.
+msgid ""
+"All default plugins have been disabled from the site's configuration file."
+msgstr ""
+"Plugin lehenetsi guztiak desgaitu egin dira gunearen konfigurazio-"
+"fitxategitik."
+
+#. TRANS: Client error displayed when trying to add an unindentified field to profile.
+#. TRANS: %s is a field name.
+#, php-format
+msgid "Unidentified field %s."
+msgstr "Identifikatu gabeko %s eremua."
+
+#. TRANS: Page title.
+msgctxt "TITLE"
+msgid "Search results"
+msgstr "Bilaketaren emaitzak"
+
+#. TRANS: Error message in case a search is shorter than three characters.
+msgid "The search string must be at least 3 characters long."
+msgstr "Bilaketa-kateak gutxienez 3 karaktereko luzera izan behar du."
+
+#. TRANS: Page title for profile settings.
+msgid "Profile settings"
+msgstr "Profilaren ezarpenak"
+
+#. TRANS: Usage instructions for profile settings.
+msgid ""
+"You can update your personal profile info here so people know more about you."
+msgstr ""
+"Zure profil pertsonaleko informazioa hementxe eguneratu dezakezu, jendeak "
+"zutaz gehiago jakin dezan."
+
+#. TRANS: Profile settings form legend.
+msgid "Profile information"
+msgstr "Profilaren informazioa"
+
+#. TRANS: Tooltip for field label in form for profile settings.
+#. TRANS: Field title on account registration page.
+#. TRANS: Field title on group edit form.
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
+msgstr "1-64 letra xehe edo zenbaki, puntuazio edo espaziorik gabe."
+
+#. TRANS: Field label in form for profile settings.
+#. TRANS: Field label on account registration page.
+#. TRANS: Field label on group edit form.
+msgid "Full name"
+msgstr "Izen osoa"
+
+#. TRANS: Field label in form for profile settings.
+#. TRANS: Field label on account registration page.
+#. TRANS: Form input field label.
+#. TRANS: Field label on group edit form; points to "more info" for a group.
+msgid "Homepage"
+msgstr "Webgunea"
+
+#. TRANS: Tooltip for field label in form for profile settings.
+#. TRANS: Field title on account registration page.
+msgid "URL of your homepage, blog, or profile on another site."
+msgstr "Zure webguneko, blogeko edo beste webgune bateko profilaren URLa."
+
+#. TRANS: Tooltip for field label in form for profile settings. Plural
+#. TRANS: is decided by the number of characters available for the
+#. TRANS: biography (%d).
+#. TRANS: Text area title in form for account registration. Plural
+#. TRANS: is decided by the number of characters available for the
+#. TRANS: biography (%d).
+#, php-format
+msgid "Describe yourself and your interests in %d character."
+msgid_plural "Describe yourself and your interests in %d characters."
+msgstr[0] "Deskribatu zeure burua eta zaletasunak karaktere %dean."
+msgstr[1] "Deskribatu zeure burua eta zaletasunak %d karakteretan."
+
+#. TRANS: Tooltip for field label in form for profile settings.
+#. TRANS: Text area title on account registration page.
+msgid "Describe yourself and your interests."
+msgstr "Deskribatu zure burua eta zure interesak."
+
+#. TRANS: Text area label in form for profile settings where users can provide
+#. TRANS: their biography.
+#. TRANS: Text area label on account registration page.
+msgid "Bio"
+msgstr "Bio"
+
+#. TRANS: Field label in form for profile settings.
+#. TRANS: Field label on account registration page.
+#. TRANS: Field label on group edit form.
+#. TRANS: Dropdown option for searching in profiles.
+msgid "Location"
+msgstr "Kokapena"
+
+#. TRANS: Tooltip for field label in form for profile settings.
+#. TRANS: Field title on account registration page.
+msgid "Where you are, like \"City, State (or Region), Country\"."
+msgstr "Non zauden, adibidez \"Hiria, Probintzia, Herrialdea\""
+
+#. TRANS: Checkbox label in form for profile settings.
+msgid "Share my current location when posting notices"
+msgstr "Partekatu nire uneko kokalekua oharrak bidaltzean"
+
+#. TRANS: Field label in form for profile settings.
+#. TRANS: Title for group tag cloud section.
+#. TRANS: %s is a group name.
+msgid "Tags"
+msgstr "Etiketak"
+
+#. TRANS: Tooltip for field label in form for profile settings.
+msgid ""
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- "
+"separated."
+msgstr ""
+"Etiketak zuretzat (letrak, zenbakiak, -, ., eta _), komekin edo espazioakin "
+"banatuak."
+
+#. TRANS: Dropdownlist label in form for profile settings.
+msgid "Language"
+msgstr "Hizkuntza"
+
+#. TRANS: Tooltip for dropdown list label in form for profile settings.
+msgid "Preferred language."
+msgstr "Nahiago duzun hizkuntza."
+
+#. TRANS: Dropdownlist label in form for profile settings.
+msgid "Timezone"
+msgstr "Ordu-eremua"
+
+#. TRANS: Tooltip for dropdown list label in form for profile settings.
+msgid "What timezone are you normally in?"
+msgstr "Zein ordu-eremutan zaude normalean?"
+
+#. TRANS: Checkbox label in form for profile settings.
+msgid ""
+"Automatically subscribe to whoever subscribes to me (best for non-humans)"
+msgstr ""
+"Automatikoki harpidetu nere harpidedun egiten direnei (gizaki ez direnentzat "
+"egokia)."
+
+#. TRANS: Dropdown field label on profile settings, for what policies to apply when someone else tries to subscribe to your updates.
+msgid "Subscription policy"
+msgstr "Harpidetza-politika"
+
+#. TRANS: Dropdown field option for following policy.
+msgid "Let anyone follow me"
+msgstr "Utzi edonor nire jarraitzaile izan dadin"
+
+#. TRANS: Dropdown field option for following policy.
+msgid "Ask me first"
+msgstr "Galdetu niri lehenago"
+
+#. TRANS: Dropdown field title on group edit form.
+msgid "Whether other users need your permission to follow your updates."
+msgstr ""
+"Beste erabiltzaileek zure baimena behar duten ala ez zure eguneraketak "
+"jarraitzeko."
+
+#. TRANS: Checkbox label in profile settings.
+msgid "Make updates visible only to my followers"
+msgstr "Eguneraketak nire jarraitzaileek soilik ikus ditzatela"
+
+#. TRANS: Validation error in form for profile settings.
+#. TRANS: Plural form is used based on the maximum number of allowed
+#. TRANS: characters for the biography (%d).
+#. TRANS: Form validation error on registration page when providing too long a bio text.
+#. TRANS: %d is the maximum number of characters for bio; used for plural.
+#, php-format
+msgid "Bio is too long (maximum %d character)."
+msgid_plural "Bio is too long (maximum %d characters)."
+msgstr[0] "Bio luzeegia da (gehienez karaktere %d)."
+msgstr[1] "Bio luzeegia da (gehienez %d karaktere)."
+
+#. TRANS: Validation error in form for profile settings.
+#. TRANS: Client error displayed trying to save site settings without a timezone.
+msgid "Timezone not selected."
+msgstr "Ez da ordu-eremua hautatu."
+
+#. TRANS: Validation error in form for profile settings.
+msgid "Language is too long (maximum 50 characters)."
+msgstr "Hizkuntza luzeegia da (gehienez 50 karaktere)."
+
+#. TRANS: Validation error in form for profile settings.
+#. TRANS: %s is an invalid tag.
+#. TRANS: Form validation error displayed if a given tag is invalid.
+#. TRANS: %s is the invalid tag.
+#. TRANS: Error displayed if a given tag is invalid.
+#. TRANS: %s is the invalid tag.
+#, php-format
+msgid "Invalid tag: \"%s\"."
+msgstr "Etiketa baliogabea: \"%s\"."
+
+#. TRANS: Server error thrown when user profile settings could not be updated to
+#. TRANS: automatically subscribe to any subscriber.
+msgid "Could not update user for autosubscribe or subscribe_policy."
+msgstr ""
+"Ezin izan da eguneratu erabiltzailea auto-harpidetzeko edo "
+"harpidetza_politika."
+
+#. TRANS: Server error thrown when user profile location preference settings could not be updated.
+msgid "Could not save location prefs."
+msgstr "Ezin izan dira kokapen-hobespenak gorde."
+
+#. TRANS: Server error thrown when user profile settings tags could not be saved.
+msgid "Could not save tags."
+msgstr "Ezin izan dira etiketak gorde."
+
+#. TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
+#. TRANS: Page title for page where a user account can be restored from backup.
+msgid "Restore account"
+msgstr "Leheneratu babeskopiatik"
+
+#. TRANS: Client error displayed when requesting a public timeline page beyond the page limit.
+#. TRANS: %s is the page limit.
+#, php-format
+msgid "Beyond the page limit (%s)."
+msgstr "Orriaren muga gainditua (%s)."
+
+#. TRANS: Server error displayed when a public timeline cannot be retrieved.
+msgid "Could not retrieve public timeline."
+msgstr "Ezin izan da korronte publikoa eskuratu."
+
+#. TRANS: Title for all public timeline pages but the first.
+#. TRANS: %d is the page number.
+#, php-format
+msgid "Public timeline, page %d"
+msgstr "Denbora-lerro publikoa, %d. orria"
+
+#. TRANS: Title for the first public timeline page.
+#. TRANS: Menu item title in search group navigation panel.
+msgid "Public timeline"
+msgstr "Denbora-lerro publikoa"
+
+#. TRANS: Link description for public timeline feed.
+msgid "Public Timeline Feed (Activity Streams JSON)"
+msgstr "Korronte-jario Publikoa (Activity Streams JSON)"
+
+#. TRANS: Link description for public timeline feed.
+msgid "Public Timeline Feed (RSS 1.0)"
+msgstr "Korronte-jario Publikoa (RSS 1.0)"
+
+#. TRANS: Link description for public timeline feed.
+msgid "Public Timeline Feed (RSS 2.0)"
+msgstr "Korronte-jario Publikoa (RSS 2.0)"
+
+#. TRANS: Link description for public timeline feed.
+msgid "Public Timeline Feed (Atom)"
+msgstr "Korronte-jario Publikoa (Atom)"
+
+#. TRANS: Text displayed for public feed when there are no public notices.
+#, php-format
+msgid ""
+"This is the public timeline for %%site.name%% but no one has posted anything "
+"yet."
+msgstr ""
+"Hau %%site.name%% gunearen denbora-lerroa da, baina inork ez du oraindik "
+"ezer idatzi."
+
+#. TRANS: Additional text displayed for public feed when there are no public notices for a logged in user.
+msgid "Be the first to post!"
+msgstr "Izan zaitez idazten lehena!"
+
+#. TRANS: Additional text displayed for public feed when there are no public notices for a not logged in user.
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and be the first to post!"
+msgstr ""
+"Zergatik ez [kontu bat ireki](%%action.register%%) eta idazten lehena izan!"
+
+#. TRANS: Message for not logged in users at an invite-only site trying to view the public feed of notices.
+#. TRANS: This message contains Markdown links. Please mind the formatting.
+#, php-format
+msgid ""
+"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
+"blogging) service based on the Free Software [StatusNet](http://status.net/) "
+"tool. [Join now](%%action.register%%) to share notices about yourself with "
+"friends, family, and colleagues! ([Read more](%%doc.help%%))"
+msgstr ""
+"Hau %%site.name%% da, [StatusNet](http://status.net/) software librean "
+"oinarritutako [mikroblogging](http://eu.wikipedia.org/wiki/Mikroblogging) "
+"zerbitzu bat. [Elkartu orain](%%action.register%%) eta oharrak elkarbanatzen "
+"hasi zure lagun, familia eta lankideekin! ([Gehiago irakurri](%%doc.help%%))"
+
+#. TRANS: Message for not logged in users at a closed site trying to view the public feed of notices.
+#. TRANS: This message contains Markdown links. Please mind the formatting.
+#, php-format
+msgid ""
+"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
+"blogging) service based on the Free Software [StatusNet](http://status.net/) "
+"tool."
+msgstr ""
+"Hau %%site.name%% da, [StatusNet](http://status.net/) software librean "
+"oinarritutako [mikroblogging](http://eu.wikipedia.org/wiki/Mikroblogging) "
+"zerbitzu bat."
+
+#. TRANS: Public RSS feed description. %s is the StatusNet site name.
+#, php-format
+msgid "%s updates from everyone."
+msgstr "%s eguneraketa guztiak."
+
+#. TRANS: Title for public tag cloud.
+msgid "Public tag cloud"
+msgstr "Etiketa-hodei publikoa"
+
+#. TRANS: Instructions (more used like an explanation/header).
+#. TRANS: %s is the StatusNet sitename.
+#, php-format
+msgid "These are most popular recent tags on %s"
+msgstr "Hauek dira %s(e)ko etiketa berrietan nabarmenenak"
+
+#. TRANS: This message contains a Markdown URL. The link description is between
+#. TRANS: square brackets, and the link between parentheses. Do not separate "]("
+#. TRANS: and do not change the URL part.
+#, php-format
+msgid "No one has posted a notice with a [hashtag](%%doc.tags%%) yet."
+msgstr "Oraindik inork ez du oharrik idatzi [hashtag](%%doc.tags%%) batekin."
+
+#. TRANS: Message shown to a logged in user for the public tag cloud
+#. TRANS: while no tags exist yet. "One" refers to the non-existing hashtag.
+msgid "Be the first to post one!"
+msgstr "Izan zaitez lehena bat idazten!"
+
+#. TRANS: Message shown to a anonymous user for the public tag cloud
+#. TRANS: while no tags exist yet. "One" refers to the non-existing hashtag.
+#. TRANS: This message contains a Markdown URL. The link description is between
+#. TRANS: square brackets, and the link between parentheses. Do not separate "]("
+#. TRANS: and do not change the URL part.
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and be the first to post "
+"one!"
+msgstr ""
+"Zergatik ez [kontu bat ireki](%%action.register%%) eta bat idazten lehena "
+"izan!"
+
+#. TRANS: Client error displayed trying to recover password while already logged in.
+msgid "You are already logged in!"
+msgstr "Dagoeneko saioa hasi duzu!"
+
+#. TRANS: Client error displayed when password recovery code is not correct.
+msgid "No such recovery code."
+msgstr "Ez dago halako berreskuratze-koderik."
+
+#. TRANS: Client error displayed when no proper password recovery code was submitted.
+msgid "Not a recovery code."
+msgstr "Ez dago berreskuratze-kodea."
+
+#. TRANS: Server error displayed trying to recover password without providing a user.
+msgid "Recovery code for unknown user."
+msgstr "Berreskuratze-kodeak ez du erabiltzaile ezagunik."
+
+#. TRANS: Server error displayed removing a password recovery code from the database.
+msgid "Error with confirmation code."
+msgstr "Errorea baieztapen-kodearekin."
+
+#. TRANS: Client error displayed trying to recover password with too old a recovery code.
+msgid "This confirmation code is too old. Please start again."
+msgstr "Baieztapen-kode hau zaharregia da. Saiatu berriro."
+
+#. TRANS: Server error displayed when updating a user's e-mail address in the database fails while recovering a password.
+msgid "Could not update user with confirmed email address."
+msgstr ""
+"Ezin izan da erabiltzailea eguneratu baieztatutako posta-helbidearekin."
+
+#. TRANS: Page notice for password recovery page.
+msgid ""
+"If you have forgotten or lost your password, you can get a new one sent to "
+"the email address you have stored in your account."
+msgstr ""
+"Zure pasahitza ahaztu edo galdu baduzu, zure kontuan gordetako helbide "
+"elektronikora berri bat bidaltzea eska dezakezu."
+
+#. TRANS: Page notice for password change page.
+msgid "You have been identified. Enter a new password below."
+msgstr "Identifikatua izan zara. Sartu pasahitz berria azpian."
+
+#. TRANS: Fieldset legend for password recovery page.
+msgid "Password recovery"
+msgstr "Pasahitzaren berreskuraketa"
+
+#. TRANS: Field label on password recovery page.
+msgid "Nickname or email address"
+msgstr "Ezizena edo posta-helbidea"
+
+#. TRANS: Title for field label on password recovery page.
+msgid "Your nickname on this server, or your registered email address."
+msgstr ""
+"Zerbitzari honetan duzun ezizena, edo izen emateko erabilitako posta-"
+"helbidea."
+
+#. TRANS: Field label on password recovery page.
+msgid "Recover"
+msgstr "Berreskuratu"
+
+#. TRANS: Button text on password recovery page.
+msgctxt "BUTTON"
+msgid "Recover"
+msgstr "Berreskuratu"
+
+#. TRANS: Title for password recovery page in password reset mode.
+msgid "Reset password"
+msgstr "Pasahitza berrezarri"
+
+#. TRANS: Title for password recovery page in password recover mode.
+msgid "Recover password"
+msgstr "Pasahitza berreskuratu"
+
+#. TRANS: Title for password recovery page in email sent mode.
+#. TRANS: Subject for password recovery e-mail.
+msgid "Password recovery requested"
+msgstr "Pasahitza berreskuratzea eskatua"
+
+#. TRANS: Title for password recovery page in password saved mode.
+msgid "Password saved"
+msgstr "Pasahitza gordea"
+
+#. TRANS: Title for field label for password reset form.
+msgid "6 or more characters, and do not forget it!"
+msgstr "6 karaktere edo gehiago eta etzazu ahaztu!"
+
+#. TRANS: Button text for password reset form.
+msgctxt "BUTTON"
+msgid "Reset"
+msgstr "Hasieratu"
+
+#. TRANS: Form instructions for password recovery form.
+msgid "Enter a nickname or email address."
+msgstr "Sartu ezizen bat edo posta-helbide bat."
+
+#. TRANS: User notification after an e-mail with instructions was sent from the password recovery form.
+msgid ""
+"Instructions for recovering your password have been sent to the email "
+"address registered to your account."
+msgstr ""
+"Zure pasahitza berreskuratzeko argibideak bidali dira zure kontuari lotutako "
+"posta-helbidera."
+
+#. TRANS: Client error displayed when trying to reset as password without providing a user.
+msgid "Unexpected password reset."
+msgstr "Espero gabeko pasahitz-berrezarpena."
+
+#. TRANS: Reset password form validation error message.
+msgid "Password must be 6 characters or more."
+msgstr "Pasahitzak 6 karaktere edo gehiago eduki behar ditu."
+
+#. TRANS: Reset password form validation error message.
+msgid "Password and confirmation do not match."
+msgstr "Pasahitza eta baieztapena ez datoz bat."
+
+#. TRANS: Server error displayed when something does wrong with the user object during password reset.
+#. TRANS: Server error displayed when saving fails during user registration.
+msgid "Error setting user."
+msgstr "Errorea erabiltzailea ezartzean."
+
+#. TRANS: Success message for user after password reset.
+msgid "New password successfully saved. You are now logged in."
+msgstr "Pasahitz berria ongi gorde da. Saioa hasita zaude."
+
+#. TRANS: Client exception thrown when no ID parameter was provided.
+msgid "No id parameter."
+msgstr "Id parametrorik ez."
+
+#. TRANS: Client exception thrown when an invalid ID parameter was provided for a file.
+#. TRANS: %d is the provided ID for which the file is not present (number).
+#, php-format
+msgid "No such file \"%d\"."
+msgstr "\"%d\" fitxategirik ez dago."
+
+#. TRANS: Client error displayed when trying to register to an invite-only site without an invitation.
+msgid "Sorry, only invited people can register."
+msgstr "Barkatu, gonbidatutako jendeak soilik izen eman dezake."
+
+#. TRANS: Client error displayed when trying to register to an invite-only site without a valid invitation.
+msgid "Sorry, invalid invitation code."
+msgstr "Barkatu, baliogabeko gonbidapen-kodea."
+
+#. TRANS: Title for registration page after a succesful registration.
+msgid "Registration successful"
+msgstr "Erregistroa ongi burutu da"
+
+#. TRANS: Title for registration page.
+msgctxt "TITLE"
+msgid "Register"
+msgstr "Izena eman"
+
+#. TRANS: Client error displayed when trying to register to a closed site.
+msgid "Registration not allowed."
+msgstr "Erregistroa ez dago baimenduta."
+
+#. TRANS: Form validation error displayed when trying to register without agreeing to the site license.
+msgid "You cannot register if you do not agree to the license."
+msgstr "Ezin duzu izenik eman lizentzia onartzen ez baduzu."
+
+#. TRANS: Form validation error displayed when trying to register with an already registered e-mail address.
+msgid "Email address already exists."
+msgstr "Posta-helbide hori dagoeneko existitzen da."
+
+#. TRANS: Form validation error displayed when trying to register with an invalid username or password.
+msgid "Invalid username or password."
+msgstr "Baliogabeko erabiltzaile edo pasahitza."
+
+#. TRANS: Page notice on registration page.
+msgid ""
+"With this form you can create a new account. You can then post notices and "
+"link up to friends and colleagues."
+msgstr ""
+"Inprimaki honekin kontu berri bat sor dezakezu. Ondoren oharrak idatzi eta "
+"lagun eta lankideekin elkar zaitezke."
+
+#. TRANS: Field label on account registration page. In this field the password has to be entered a second time.
+msgctxt "PASSWORD"
+msgid "Confirm"
+msgstr "Baieztatu"
+
+#. TRANS: Field label on account registration page.
+msgctxt "LABEL"
+msgid "Email"
+msgstr "Posta elektronikoa"
+
+#. TRANS: Field title on account registration page.
+msgid "Used only for updates, announcements, and password recovery."
+msgstr ""
+"Eguneraketetarako, iragarkietarako eta pasahitza berreskuratzeko soilik "
+"erabiltzen da."
+
+#. TRANS: Field title on account registration page.
+msgid "Longer name, preferably your \"real\" name."
+msgstr "Izen luzeagoa, ahal izanez gero zure \"benetako\" izena."
+
+#. TRANS: Button text to register a user on account registration page.
+msgctxt "BUTTON"
+msgid "Register"
+msgstr "Izena eman"
+
+#. TRANS: Copyright checkbox label in registration dialog, for private sites.
+#. TRANS: %1$s is the StatusNet sitename.
+#, php-format
+msgid ""
+"I understand that content and data of %1$s are private and confidential."
+msgstr ""
+"%1$s-(e)n edukiak eta datuak pribatuak eta isilpekoak direla ulertzen dut."
+
+#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with a specified copyright owner.
+#. TRANS: %1$s is the license owner.
+#, php-format
+msgid "My text and files are copyright by %1$s."
+msgstr "Nire testu eta fitxategiek %1$s-(e)n copyright-a daukate."
+
+#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
+msgid "My text and files remain under my own copyright."
+msgstr "Nire testu eta fitxategiek nire copyright propioa daukate."
+
+#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
+msgid "All rights reserved."
+msgstr "Eskubide guztiak erreserbatuta."
+
+#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
+#, php-format
+msgid ""
+"My text and files are available under %s except this private data: password, "
+"email address, IM address, and phone number."
+msgstr ""
+"Nire testu eta fitxategiak %s lizentziapean daude, datu pribatu hauek izan "
+"ezik: pasahitza, helbide elektronikoa, BM helbidea eta telefono zenbakia."
+
+#. TRANS: Text displayed after successful account registration.
+#. TRANS: %1$s is the registered nickname, %2$s is the profile URL.
+#. TRANS: This message contains Markdown links in the form [link text](link)
+#. TRANS: and variables in the form %%%%variable%%%%. Please mind the syntax.
+#, php-format
+msgid ""
+"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
+"want to...\n"
+"\n"
+"* Go to [your profile](%2$s) and post your first message.\n"
+"* Add a [Jabber/GTalk address](%%%%action.imsettings%%%%) so you can send "
+"notices through instant messages.\n"
+"* [Search for people](%%%%action.peoplesearch%%%%) that you may know or that "
+"share your interests. \n"
+"* Update your [profile settings](%%%%action.profilesettings%%%%) to tell "
+"others more about you. \n"
+"* Read over the [online docs](%%%%doc.help%%%%) for features you may have "
+"missed. \n"
+"\n"
+"Thanks for signing up and we hope you enjoy using this service."
+msgstr ""
+"Zoroinak, %1$s! Eta ongi etorri %%%%site.name%%%% gunera. Hemendik aurrera, "
+"agian hurrengo egin nahi izango duzu...\n"
+"\n"
+"* Zure [profilera](%2$s) joan eta zure lehen mezua bidali.\n"
+"* Gehitu [Jabber/GTalk helbidea](%%%%action.imsettings%%%%), oharrak "
+"berehalako mezularitza bidez bidali ahal izateko.\n"
+"* Ezagutzen duzun edo zure interes berak dituen [jendea bilatu](%%%%action."
+"peoplesearch%%%%). \n"
+"* Zure [profil-ezarpenak](%%%%action.profilesettings%%%%) eguneratu, "
+"gainerakoak zutaz gehiago ezagutu dezaten. \n"
+"* [Lineako dokumentuak](%%%%doc.help%%%%) irakurri, ezagutzen ez dituzun "
+"ezaugarriak ikasteko. \n"
+"\n"
+"Eskerrik asko izena emateagatik, zerbitzu hau erabiltzen ongi pasatuko "
+"duzula espero dugu."
+
+#. TRANS: Instruction text on how to deal with the e-mail address confirmation e-mail.
+msgid ""
+"(You should receive a message by email momentarily, with instructions on how "
+"to confirm your email address.)"
+msgstr ""
+"(Batetik bestera posta-mezu bat jaso behar zenuke, zure helbide elektronikoa "
+"egiaztatzeko xehetasunekin.)"
+
+#. TRANS: Client error displayed when an unknown error occurs while delisting a user.
+#. TRANS: %s is a username.
+#, php-format
+msgid "There was an unexpected error while delisting %s."
+msgstr "%s zerrendatik kentzean espero ez zen akatsa egon da."
+
+#. TRANS: Client error displayed when an unknown error occurs while listing a user.
+#. TRANS: %s is a profile URL.
+#, php-format
+msgid ""
+"There was a problem listing %s. The remote server is probably not responding "
+"correctly, please try retrying later."
+msgstr ""
+"%s zerrendatzean akatsa egon da. Ziurrenik urruneko zerbitzariak ez du ondo "
+"erantzuten, saiatu berriro geroago."
+
+#. TRANS: Title after removing a user from a list.
+msgid "Unlisted"
+msgstr "Zerrendatik kendua"
+
+#. TRANS: Client error displayed when trying to repeat a notice while not logged in.
+msgid "Only logged-in users can repeat notices."
+msgstr "Saioa hasitako erabiltzaileek soilik errepika ditzakete oharrak."
+
+#. TRANS: Client error displayed when trying to repeat a notice while not providing a notice ID.
+#. TRANS: Client error displayed when trying to repeat a non-existing notice.
+msgid "No notice specified."
+msgstr "Ez da oharrik adierazi."
+
+#. TRANS: Title after repeating a notice.
+#. TRANS: Repeat form status in notice list when a notice has been repeated.
+msgid "Repeated"
+msgstr "Errepikatua"
+
+#. TRANS: Confirmation text after repeating a notice.
+msgid "Repeated!"
+msgstr "Errepikatua!"
+
+#. TRANS: Title for first page of replies for a user.
+#. TRANS: %s is a user nickname.
+#. TRANS: RSS reply feed title. %s is a user nickname.
+#. TRANS: Menu item title in personal group navigation menu.
+#. TRANS: %s is a username.
+#, php-format
+msgid "Replies to %s"
+msgstr "Erantzunak %s(r)i"
+
+#. TRANS: Title for all but the first page of replies for a user.
+#. TRANS: %1$s is a user nickname, %2$d is a page number.
+#, php-format
+msgid "Replies to %1$s, page %2$d"
+msgstr "%1$s(e) ri erantzunak, %2$d. orria"
+
+#. TRANS: Link for feed with replies for a user.
+#. TRANS: %s is a user nickname.
+#, php-format
+msgid "Replies feed for %s (Activity Streams JSON)"
+msgstr "Erantzunen jarioa %s(r)entzat  (Activity Streams JSON)"
+
+#. TRANS: Link for feed with replies for a user.
+#. TRANS: %s is a user nickname.
+#, php-format
+msgid "Replies feed for %s (RSS 1.0)"
+msgstr "Erantzunen jarioa %s(r)entzat (RSS 1.0)"
+
+#. TRANS: Link for feed with replies for a user.
+#. TRANS: %s is a user nickname.
+#, php-format
+msgid "Replies feed for %s (RSS 2.0)"
+msgstr "Erantzunen jarioa %s(r)entzat (RSS 2.0)"
+
+#. TRANS: Link for feed with replies for a user.
+#. TRANS: %s is a user nickname.
+#, php-format
+msgid "Replies feed for %s (Atom)"
+msgstr "Erantzunen jarioa %s(r)entzat (Atom)"
+
+#. TRANS: Empty list message for page with replies for a user.
+#. TRANS: %1$s and %s$s are the user nickname.
+#, php-format
+msgid ""
+"This is the timeline showing replies to %1$s but %2$s hasn't received a "
+"notice to them yet."
+msgstr ""
+"Hau %1$s(r)i emandako erantzunen denbora-lerroa da baina %2$s(e)k ez du "
+"hauen oharrik jaso oraindik."
+
+#. TRANS: Empty list message for page with replies for a user for the logged in user.
+#. TRANS: This message contains a Markdown link in the form [link text](link).
+#, php-format
+msgid ""
+"You can engage other users in a conversation, subscribe to more people or "
+"[join groups](%%action.groups%%)."
+msgstr ""
+"Beste erabiltzaileak erakar ditzakezu solasaldi batera, harpidetu jende "
+"gehiagora edo [taldeekin elkartu](%%action.groups%%)."
+
+#. TRANS: Empty list message for page with replies for a user for all logged in users but the user themselves.
+#. TRANS: %1$s, %2$s and %3$s are a user nickname. This message contains a Markdown link in the form [link text](link).
+#, php-format
+msgid ""
+"You can try to [nudge %1$s](../%2$s) or [post something to them](%%%%action."
+"newnotice%%%%?status_textarea=%3$s)."
+msgstr ""
+"[%1$s](../%2$s) zirikatzen saia zaitezke edo [idatz iezaiezu zerbait](%%%%"
+"action.newnotice%%%%?status_textarea=%3$s)."
+
+#. TRANS: RSS reply feed description.
+#. TRANS: %1$s is a user nickname, %2$s is the StatusNet site name.
+#, php-format
+msgid "Replies to %1$s on %2$s."
+msgstr "Erantzunak %1$s(r)i %2$s(e)n."
+
+#. TRANS: Client exception displayed when trying to restore an account while not logged in.
+msgid "Only logged-in users can restore their account."
+msgstr ""
+"Saioa hasitako erabiltzaileek soilik berrezarri dezakete beraien kontua."
+
+#. TRANS: Client exception displayed when trying to restore an account without having restore rights.
+msgid "You may not restore your account."
+msgstr "Agian ez zenuke zure kontua berrezarri behar."
+
+#. TRANS: Client exception displayed trying to restore an account while something went wrong uploading a file.
+#. TRANS: Client exception. No file; probably just a non-AJAX submission.
+msgid "No uploaded file."
+msgstr "Igotako fitxategirik ez dago."
+
+#. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
+msgstr ""
+"Igotako fitxategiak upload_max_filesize balioa gainditzen du php.ini "
+"fitxategian."
+
+#. TRANS: Client exception.
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form."
+msgstr ""
+"Igotako fitxategiak HTML inprimakian zehaztutako MAX_FILE_SIZE balioa "
+"gainditzen du."
+
+#. TRANS: Client exception.
+msgid "The uploaded file was only partially uploaded."
+msgstr "Fitxategiaren zati bat baino ez da igo."
+
+#. TRANS: Client exception thrown when a temporary folder is not present to store a file upload.
+msgid "Missing a temporary folder."
+msgstr "Aldi bataerako karpeta falta da."
+
+#. TRANS: Client exception thrown when writing to disk is not possible during a file upload operation.
+msgid "Failed to write file to disk."
+msgstr "Ezin izan da fitxategia diskoan idatzi."
+
+#. TRANS: Client exception thrown when a file upload operation has been stopped by an extension.
+msgid "File upload stopped by extension."
+msgstr "Hedapen batek fitxategiaren igoera gelditu du."
+
+#. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
+#. TRANS: Exception thrown when uploading an image fails for an unknown reason.
+#. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
+msgid "System error uploading file."
+msgstr "Sistema-errorea fitxategia igotzean."
+
+#. TRANS: Client exception thrown when a feed is not an Atom feed.
+#. TRANS: Client exception thrown when an imported feed is not an Atom feed.
+msgid "Not an Atom feed."
+msgstr "Ez da Atom jarioa."
+
+#. TRANS: Success message when a feed has been restored.
+msgid ""
+"Feed has been restored. Your old posts should now appear in search and your "
+"profile page."
+msgstr ""
+"Jarioa leheneratu da. Zure mezu zaharrak bilaketan eta profil-orrian agertu "
+"beharko lirateke."
+
+#. TRANS: Message when a feed restore is in progress.
+msgid "Feed will be restored. Please wait a few minutes for results."
+msgstr "Jarioa leheneratu egingo da. Itxaron minutu batzuk emaitzak jasotzeko."
+
+#. TRANS: Form instructions for feed restore.
+msgid ""
+"You can upload a backed-up timeline in <a href=\"http://activitystrea.ms/"
+"\">Activity Streams</a> format."
+msgstr ""
+"<a href=\"http://activitystrea.ms/\">Activity Streams</a> formatuan igo "
+"dezakezu babeskopia egindako korronte bat."
+
+#. TRANS: Title for submit button to confirm upload of a user backup file for account restore.
+msgid "Upload the file"
+msgstr "Igo fitxategia"
+
+#. TRANS: Client error displayed when trying to revoke a role without having the right to do that.
+msgid "You cannot revoke user roles on this site."
+msgstr "Ezin dituzu erabiltzaile-zereginak indargabetu gune honetan."
+
+#. TRANS: Client error displayed when trying to revoke a role that is not set.
+msgid "User does not have this role."
+msgstr "Erabiltzaileak ez du zeregin hori."
+
+#. TRANS: Engine name for RSD.
+#. TRANS: Engine name.
+msgid "StatusNet"
+msgstr "StatusNet"
+
+#. TRANS: Client error displayed trying to sandbox users on a site where the feature is not enabled.
+#. TRANS: Client error on page to unsandbox a user when the feature is not enabled.
+msgid "You cannot sandbox users on this site."
+msgstr "Ezin dituzu erabiltzaileak isolatu gune honetan."
+
+#. TRANS: Client error displayed trying to sandbox an already sandboxed user.
+msgid "User is already sandboxed."
+msgstr "Erabiltzailea isolaturik dagoeneko."
+
+#. TRANS: Client error displayed when trying to list a profile with an invalid list.
+#. TRANS: %s is the invalid list name.
+#, php-format
+msgid "Not a valid list: %s."
+msgstr "Zerrenda ez da baliogarria: %s."
+
+#. TRANS: Page title for page showing self tags.
+#. TRANS: %1$s is a tag, %2$d is a page number.
+#, php-format
+msgid "Users self-tagged with %1$s, page %2$d"
+msgstr "%1$s gisa euren burua etiketatu duten erabiltzaileak, %2$d. orria"
+
+#. TRANS: Title for the sessions administration panel.
+msgctxt "TITLE"
+msgid "Sessions"
+msgstr "Saioak"
+
+#. TRANS: Instructions for the sessions administration panel.
+msgid "Session settings for this StatusNet site"
+msgstr "Saio-ezarpenak StatusNet gune honetarako"
+
+#. TRANS: Fieldset legend on the sessions administration panel.
+msgctxt "LEGEND"
+msgid "Sessions"
+msgstr "Saioak"
+
+#. TRANS: Checkbox title on the sessions administration panel.
+#. TRANS: Indicates if StatusNet should handle session administration.
+msgid "Handle sessions"
+msgstr "Kudeatu saioak"
+
+#. TRANS: Checkbox title on the sessions administration panel.
+#. TRANS: Indicates if StatusNet should handle session administration.
+msgid "Handle sessions ourselves."
+msgstr "Kudeatu saioak gure kabuz."
+
+#. TRANS: Checkbox label on the sessions administration panel.
+#. TRANS: Indicates if StatusNet should write session debugging output.
+msgid "Session debugging"
+msgstr "Saio-arazketa"
+
+#. TRANS: Checkbox title on the sessions administration panel.
+msgid "Enable debugging output for sessions."
+msgstr "Gaitu arazketaren emaitzen irteera saioetarako."
+
+#. TRANS: Title for submit button on the sessions administration panel.
+msgid "Save session settings"
+msgstr "Gorde saio-ezarpenak"
+
+#. TRANS: Client error displayed trying to display an OAuth application while not logged in.
+msgid "You must be logged in to view an application."
+msgstr "Saioa hasita egon behar duzu aplikazio bai ikusteko."
+
+#. TRANS: Header on the OAuth application page.
+msgid "Application profile"
+msgstr "Aplikazio-profila"
+
+#. TRANS: Information output on an OAuth application page.
+#. TRANS: %1$s is the application creator, %2$s is "read-only" or "read-write",
+#. TRANS: %3$d is the number of users using the OAuth application.
+#, php-format
+msgid "Created by %1$s - %2$s access by default - %3$d user"
+msgid_plural "Created by %1$s - %2$s access by default - %3$d users"
+msgstr[0] "%1$s(e)k sortua - baimen lehenetsia: %2$s - erabiltzaile %3$d"
+msgstr[1] "%1$s(e)k sortua - baimen lehenetsia: %2$s - %3$d erabiltzaile"
+
+#. TRANS: Header on the OAuth application page.
+msgid "Application actions"
+msgstr "Aplikazio-ekintzak"
+
+#. TRANS: Link text to edit application on the OAuth application page.
+msgctxt "EDITAPP"
+msgid "Edit"
+msgstr "Aldatu"
+
+#. TRANS: Button text on the OAuth application page.
+#. TRANS: Resets the OAuth consumer key and secret.
+msgid "Reset key & secret"
+msgstr "Berrezarri gakoa eta sekretua"
+
+#. TRANS: Header on the OAuth application page.
+msgid "Application info"
+msgstr "Aplikazioaren informazioa"
+
+#. TRANS: Field label on application page.
+msgid "Consumer key"
+msgstr "Kontsumitzaile gakoa"
+
+#. TRANS: Field label on application page.
+msgid "Consumer secret"
+msgstr "Kontsumitzaile sekretua"
+
+#. TRANS: Field label on application page.
+msgid "Request token URL"
+msgstr "URL token eskaera"
+
+#. TRANS: Field label on application page.
+msgid "Access token URL"
+msgstr "Atzipen-token URLa"
+
+#. TRANS: Field label on application page.
+msgid "Authorize URL"
+msgstr "URLa baimendu"
+
+#. TRANS: Note on the OAuth application page about signature support.
+msgid ""
+"Note: HMAC-SHA1 signatures are supported. The plaintext signature method is "
+"not supported."
+msgstr ""
+"Oharra: HMAC-SHA1 sinadurak onartzen dira. Testu arrunteko sinadura-metodoa "
+"ez da onartzen."
+
+#. TRANS: Text in confirmation dialog to reset consumer key and secret for an OAuth application.
+msgid "Are you sure you want to reset your consumer key and secret?"
+msgstr ""
+"Seguru zaude zure kontsumitzaile-gakoa eta sekretua berrezarri nahi dituzula?"
+
+#. TRANS: Title for all but the first page of favourite notices of a user.
+#. TRANS: %1$s is the user for whom the favourite notices are displayed, %2$d is the page number.
+#, php-format
+msgid "%1$s's favorite notices, page %2$d"
+msgstr "%1$s(r)en gogoko oharrak, %2$d. orria"
+
+#. TRANS: Server error displayed when favourite notices could not be retrieved from the database.
+msgid "Could not retrieve favorite notices."
+msgstr "Ezin izan dira gogoko oharrak eskuratu."
+
+#. TRANS: Feed link text. %s is a username.
+#, php-format
+msgid "Feed for favorites of %s (Activity Streams JSON)"
+msgstr "%s(r)en gogokoenen jarioa  (Activity Streams JSON)"
+
+#. TRANS: Feed link text. %s is a username.
+#, php-format
+msgid "Feed for favorites of %s (RSS 1.0)"
+msgstr "%s(r)en gogokoenen jarioa (RSS 1.0)"
+
+#. TRANS: Feed link text. %s is a username.
+#, php-format
+msgid "Feed for favorites of %s (RSS 2.0)"
+msgstr "%s(r)en gogokoenen jarioa (RSS 2.0)"
+
+#. TRANS: Feed link text. %s is a username.
+#, php-format
+msgid "Feed for favorites of %s (Atom)"
+msgstr "%s(r)en gogokoenen jarioa (Atom)"
+
+#. TRANS: Text displayed instead of favourite notices for the current logged in user that has no favourites.
+msgid ""
+"You haven't chosen any favorite notices yet. Click the fave button on "
+"notices you like to bookmark them for later or shed a spotlight on them."
+msgstr ""
+"Ez duzu gogoko oharrik aukeratu oraindik. Egin klik gustuko dituzun oharren "
+"gogoko botoietan, oharrak markatzeko eta geroago begirada bat bota ahal "
+"izateko."
+
+#. TRANS: Text displayed instead of favourite notices for a user that has no favourites while logged in.
+#. TRANS: %s is a username.
+#, php-format
+msgid ""
+"%s hasn't added any favorite notices yet. Post something interesting they "
+"would add to their favorites :)"
+msgstr ""
+"%s(e)k ez du oraindik gogoko oharrik gehitu. Idatzi zerbait interesgarria "
+"bere gogokoetara gehitu dezan :)"
+
+#. TRANS: Text displayed instead of favourite notices for a user that has no favourites while not logged in.
+#. TRANS: %s is a username, %%%%action.register%%%% is a link to the user registration page.
+#. TRANS: (link text)[link] is a Mark Down link.
+#, php-format
+msgid ""
+"%s hasn't added any favorite notices yet. Why not [register an account](%%%%"
+"action.register%%%%) and then post something interesting they would add to "
+"their favorites :)"
+msgstr ""
+"%s(e)k ez du oraindik gogoko oharrik gehitu. Zergatik ez [izena eman](%%%%"
+"action.register%%%%) eta zerbait interesgarria idatzi bere gogokoenetara "
+"gehitu dezan :)"
+
+#. TRANS: Page notice for show favourites page.
+msgid "This is a way to share what you like."
+msgstr "Gogoko duzuna partekatzeko era bat da hau."
+
+#. TRANS: Page title for first group page. %s is a group name.
+#, php-format
+msgid "%s group"
+msgstr "%s taldea"
+
+#. TRANS: Page title for any but first group page.
+#. TRANS: %1$s is a group name, $2$s is a page number.
+#, php-format
+msgid "%1$s group, page %2$d"
+msgstr "%1$s taldea, %2$d orria"
+
+#. TRANS: Tooltip for feed link. %s is a group nickname.
+#, php-format
+msgid "Notice feed for %s group (Activity Streams JSON)"
+msgstr "Oharren jarioa %s taldearentzat (Activity Streams JSON)"
+
+#. TRANS: Tooltip for feed link. %s is a group nickname.
+#, php-format
+msgid "Notice feed for %s group (RSS 1.0)"
+msgstr "Oharren jarioa %s taldearentzat (RSS 1.0)"
+
+#. TRANS: Tooltip for feed link. %s is a group nickname.
+#, php-format
+msgid "Notice feed for %s group (RSS 2.0)"
+msgstr "Oharren jarioa %s taldearentzat (RSS 2.0)"
+
+#. TRANS: Tooltip for feed link. %s is a group nickname.
+#, php-format
+msgid "Notice feed for %s group (Atom)"
+msgstr "Oharren jarioa %s taldearentzat (Atom)"
+
+#. TRANS: Tooltip for feed link. %s is a group nickname.
+#, php-format
+msgid "FOAF for %s group"
+msgstr "FOAF %s taldearentzat"
+
+#. TRANS: Notice on group pages for anonymous users for StatusNet sites that accept new registrations.
+#. TRANS: %s is the group name, %%%%site.name%%%% is the site name,
+#. TRANS: %%%%action.register%%%% is the URL for registration, %%%%doc.help%%%% is a URL to help.
+#. TRANS: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
+#, php-format
+msgid ""
+"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. Its members share short messages about "
+"their life and interests. [Join now](%%%%action.register%%%%) to become part "
+"of this group and many more! ([Read more](%%%%doc.help%%%%))"
+msgstr ""
+"**%s** [StatusNet](http://status.net/) software librean oinarritutako "
+"[mikroblogintza](http://eu.wikipedia.org/wiki/Mikroblogintza) %%%%site.name%%"
+"%% guneko erabiltzaile-talde bat da,  Taldekideek mezu laburrak partekatzen "
+"dituzte beren bizitza eta zaletasunen inguruan. [Elkartu orain](%%%%action."
+"register%%%%) talde honetako partaide izateko eta askoz gehiagorako! "
+"([Irakurri gehiago](%%%%doc.help%%%%))"
+
+#. TRANS: Notice on group pages for anonymous users for StatusNet sites that accept no new registrations.
+#. TRANS: %s is the group name, %%%%site.name%%%% is the site name,
+#. TRANS: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
+#, php-format
+msgid ""
+"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. Its members share short messages about "
+"their life and interests."
+msgstr ""
+"**%s** erabiltzaile-talde bat da %%%%site.name%%%% gunean, [StatusNet]"
+"(http://status.net/) software librean oinarritutako [mikroblogintza](http://"
+"eu.wikipedia.org/wiki/Mikroblogintza) zerbitzuan. Bere taldekideek mezu "
+"laburrak partekatzen dituzte euren bizitza eta zaletasunen inguruan."
+
+#. TRANS: Client error displayed requesting a single message that does not exist.
+msgid "No such message."
+msgstr "Ez dago halako mezurik."
+
+#. TRANS: Client error displayed requesting a single direct message the requesting user was not a party in.
+msgid "Only the sender and recipient may read this message."
+msgstr "Bidaltzaileak eta jasotzaileak soilik irakur dezakete mezu hau."
+
+#. TRANS: Page title for single direct message display when viewing user is the sender.
+#. TRANS: %1$s is the addressed user's nickname, $2$s is a timestamp.
+#, php-format
+msgid "Message to %1$s on %2$s"
+msgstr "%1$s(r)i mezua, %2$s(e)n"
+
+#. TRANS: Page title for single message display.
+#. TRANS: %1$s is the sending user's nickname, $2$s is a timestamp.
+#, php-format
+msgid "Message from %1$s on %2$s"
+msgstr "%1$s(r)en mezua, %2$s(e)n"
+
+#. TRANS: Client exception thrown when trying a view a notice the user has no access to.
+msgid "Not available."
+msgstr "Ez dago eskuragarri."
+
+#. TRANS: Client error displayed trying to show a deleted notice.
+msgid "Notice deleted."
+msgstr "Oharra ezabatu da."
+
+#. TRANS: Title for private list timeline.
+#. TRANS: %1$s is a list, %2$s is a page number.
+#, php-format
+msgid "Private timeline for %1$s list by you, page %2$d"
+msgstr "Zuk sortutako %1$s zerrendaren denbora-lerro pribatua, %2$d. orria"
+
+#. TRANS: Title for public list timeline where the viewer is the tagger.
+#. TRANS: %1$s is a list, %2$s is a page number.
+#, php-format
+msgid "Timeline for %1$s list by you, page %2$d"
+msgstr "Zuk sortutako %1$s zerrendaren denbora-lerroa, %2$d. orria"
+
+#. TRANS: Title for private list timeline.
+#. TRANS: %1$s is a list, %2$s is the tagger's nickname, %3$d is a page number.
+#, php-format
+msgid "Timeline for %1$s list by %2$s, page %3$d"
+msgstr ""
+"%2$s erabiltzaileak sortutako %1$s zerrendaren denbora-lerroa, %3$d. orria"
+
+#. TRANS: Title for private list timeline.
+#. TRANS: %s is a list.
+#, php-format
+msgid "Private timeline of %s list by you"
+msgstr "Zuk sortutako %s zerrendaren denbora-lerro pribatua"
+
+#. TRANS: Title for public list timeline where the viewer is the tagger.
+#. TRANS: %s is a list.
+#, php-format
+msgid "Timeline for %s list by you"
+msgstr "Zuk sortutako %s zerrendaren denbora-lerroa"
+
+#. TRANS: Title for private list timeline.
+#. TRANS: %1$s is a list, %2$s is the tagger's nickname.
+#, php-format
+msgid "Timeline for %1$s list by %2$s"
+msgstr "%2$s erabiltzaileak sortutako %1$s zerrendaren denbora-lerroa"
+
+#. TRANS: Feed title.
+#. TRANS: %1$s is a list, %2$s is tagger's nickname.
+#, php-format
+msgid "Feed for %1$s list by %2$s (Atom)"
+msgstr "%2$s erabiltzaileak sortutako %1$s zerrendaren jarioa (Atom)"
+
+#. TRANS: Empty list message for list timeline.
+#. TRANS: %1$s is a list, %2$s is a tagger's nickname.
+#, php-format
+msgid ""
+"This is the timeline for %1$s list by %2$s but no one has posted anything "
+"yet."
+msgstr ""
+"%2$s erabiltzaileak sortutako %1$s zerrendaren denbora-lerroa da hau, baina "
+"oraindik inork ez du ezer idatzi."
+
+#. TRANS: Additional empty list message for list timeline for currently logged in user tagged tags.
+msgid "Try tagging more people."
+msgstr "Saiatu jende gehiago etiketatzen."
+
+#. TRANS: Additional empty list message for list timeline.
+#. TRANS: This message contains Markdown links in the form [description](link).
+#, php-format
+msgid ""
+"Why not [register an account](%%%%action.register%%%%) and start following "
+"this timeline!"
+msgstr ""
+"Zergatik ez [izena eman](%%%%action.register%%%%) eta denbora-lerro hau "
+"jarraitzen hasi!"
+
+#. TRANS: Header on show list page.
+#. TRANS: Link description for link to list of users tagged with a tag (so part of a list).
+msgid "Listed"
+msgstr "Zerrendatuak"
+
+#. TRANS: Content of "Listed" page if there are no listed users.
+#. TRANS: Content of "People following tag x" if there are no subscribed users.
+#. TRANS: Description for mini list of group members on a group page when the group has no members.
+#. TRANS: Empty list message for tags.
+#. TRANS: Text for user subscription statistics if the user has no subscriptions.
+#. TRANS: Text for user subscriber statistics if user has no subscribers.
+#. TRANS: Text for user user group membership statistics if user is not a member of any group.
+#. TRANS: Default content for section/sidebar widget.
+msgid "(None)"
+msgstr "(Bat ere ez)"
+
+#. TRANS: Link for more "People in list x by a user"
+#. TRANS: if there are more than the mini list's maximum.
+msgid "Show all"
+msgstr "Erakutsi dena"
+
+#. TRANS: Header for tag subscribers.
+#. TRANS: Link description for link to list of users subscribed to a tag.
+msgid "Subscribers"
+msgstr "Harpidetuak"
+
+#. TRANS: Page title showing tagged notices in one user's timeline.
+#. TRANS: %1$s is the username, %2$s is the hash tag.
+#, php-format
+msgid "Notices by %1$s tagged %2$s"
+msgstr "%1$s(r)en oharrak %2$s etiketarekin"
+
+#. TRANS: Page title showing tagged notices in one user's timeline.
+#. TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number.
+#, php-format
+msgid "Notices by %1$s tagged %2$s, page %3$d"
+msgstr "%1$s(r)en oharrak %2$s etiketarekin, %3$d. orria"
+
+#. TRANS: Extended page title showing tagged notices in one user's timeline.
+#. TRANS: %1$s is the username, %2$d is the page number.
+#, php-format
+msgid "Notices by %1$s, page %2$d"
+msgstr "%1$s(r)en oharrak, %2$d. orria"
+
+#. TRANS: Title for link to notice feed.
+#. TRANS: %1$s is a user nickname, %2$s is a hashtag.
+#, php-format
+msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
+msgstr "%1$s(r)en ohar-jarioa %2$s etiketarekin (RSS 1.0)"
+
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#, php-format
+msgid "Notice feed for %s (Activity Streams JSON)"
+msgstr "%s(r)en ohar-jarioa (Activity Streams JSON)"
+
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#, php-format
+msgid "Notice feed for %s (RSS 1.0)"
+msgstr "%s(r)en ohar-jarioa (RSS 1.0)"
+
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#, php-format
+msgid "Notice feed for %s (RSS 2.0)"
+msgstr "%s(r)en ohar-jarioa (RSS 2.0)"
+
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#, php-format
+msgid "Notice feed for %s (Atom)"
+msgstr "%s(r)en ohar-jarioa (Atom)"
+
+#. TRANS: Title for link to notice feed. FOAF stands for Friend of a Friend.
+#. TRANS: More information at http://www.foaf-project.org. %s is a user nickname.
+#, php-format
+msgid "FOAF for %s"
+msgstr "%s(r)en FOAF"
+
+#. TRANS: First sentence of empty list message for a timeline. $1%s is a user nickname.
+#, php-format
+msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
+msgstr ""
+"Hau %1$s(r)en denbora-lerroa da, baina %1$s(e)k ez du ezer idatzi oraindik."
+
+#. TRANS: Second sentence of empty list message for a stream for the user themselves.
+msgid ""
+"Seen anything interesting recently? You haven't posted any notices yet, now "
+"would be a good time to start :)"
+msgstr ""
+"Zer berri? Oraindik ez duzu oharrik argitaratu, hasteko momentu ona izan "
+"daiteke :)"
+
+#. TRANS: Second sentence of empty  list message for a non-self timeline. %1$s is a user nickname, %2$s is a part of a URL.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#, php-format
+msgid ""
+"You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
+"%?status_textarea=%2$s)."
+msgstr ""
+"%1$s zirikatu dezakezu edo [zerbait idatz diezaiokezu](%%%%action.newnotice%%"
+"%%?status_textarea=%2$s)."
+
+#. TRANS: Announcement for anonymous users showing a timeline if site registrations are open.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#, php-format
+msgid ""
+"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. [Join now](%%%%action.register%%%%) to "
+"follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))"
+msgstr ""
+"**%s**(e)k kontu bat du %%%%site.name%%%%n, [StatusNet](http://status.net/) "
+"software librean oinarritutako [mikroblogging](http://eu.wikipedia.org/wiki/"
+"Mikroblogging) zerbitzuan. [Elkartu orain](%%%%action.register%%%%) **%s**(e)"
+"n oharrak jarraitzeko eta gauza gehiagotarako! ([Irakurri gehiago](%%%%doc."
+"help%%%%))"
+
+#. TRANS: Announcement for anonymous users showing a timeline if site registrations are closed or invite only.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#, php-format
+msgid ""
+"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool."
+msgstr ""
+"**%s**(e)k kontu bat du %%%%site.name%%%%n, [StatusNet](http://status.net/) "
+"software librean oinarritutako [mikroblogging](http://eu.wikipedia.org/wiki/"
+"Mikroblogging) zerbitzuan."
+
+#. TRANS: Link to the author of a repeated notice. %s is a linked nickname.
+#, php-format
+msgid "Repeat of %s"
+msgstr "%s errepikaturik"
+
+#. TRANS: Client error displayed trying to silence a user on a site where the feature is not enabled.
+#. TRANS: Client error on page to unsilence a user when the feature is not enabled.
+msgid "You cannot silence users on this site."
+msgstr "Ezin dituzu gune honetako erabiltzaileak isildu."
+
+#. TRANS: Client error displayed trying to silence an already silenced user.
+msgid "User is already silenced."
+msgstr "Erabiltzailea jadanik isilduta dago."
+
+#. TRANS: Title for site administration panel.
+msgctxt "TITLE"
+msgid "Site"
+msgstr "Gunea"
+
+#. TRANS: Instructions for site administration panel.
+msgid "Basic settings for this StatusNet site"
+msgstr "Oinarrizko ezarpenak StatusNet gune honetarako"
+
+#. TRANS: Client error displayed trying to save an empty site name.
+msgid "Site name must have non-zero length."
+msgstr "Gunearen izenak ezin du zero luzera eduki."
+
+#. TRANS: Client error displayed trying to save site settings without a contact address.
+msgid "You must have a valid contact email address."
+msgstr "Harremanetarako posta-helbide baliogarria eduki behar duzu."
+
+#. TRANS: Client error displayed when a logo URL is not valid.
+msgid "Invalid logo URL."
+msgstr "Logoaren URL baliogabea."
+
+#. TRANS: Client error displayed when a SSL logo URL is invalid.
+msgid "Invalid SSL logo URL."
+msgstr "Logoaren SSL URL baliogabea."
+
+#. TRANS: Client error displayed trying to save site settings with an invalid language code.
+#. TRANS: %s is the invalid language code.
+#, php-format
+msgid "Unknown language \"%s\"."
+msgstr "\"%s\" hizkuntza ezezaguna."
+
+#. TRANS: Client error displayed trying to save site settings with a text limit below 0.
+msgid "Minimum text limit is 0 (unlimited)."
+msgstr "Gehieneko testu-muga 0 (mugagabea) da."
+
+#. TRANS: Client error displayed trying to save site settings with a text limit below 1.
+msgid "Dupe limit must be one or more seconds."
+msgstr "Bikoiztuen mugak segundo bat edo gehiago izan behar du."
+
+#. TRANS: Fieldset legend on site settings panel.
+msgctxt "LEGEND"
+msgid "General"
+msgstr "Orokorra"
+
+#. TRANS: Field label on site settings panel.
+msgctxt "LABEL"
+msgid "Site name"
+msgstr "Gunearen izena"
+
+#. TRANS: Field title on site settings panel.
+msgid "The name of your site, like \"Yourcompany Microblog\"."
+msgstr "Zure gunearen izena, adibidez \"Librezaleren mikrobloga\"."
+
+#. TRANS: Field label on site settings panel.
+msgid "Brought by"
+msgstr "Egileak:"
+
+#. TRANS: Field title on site settings panel.
+msgid "Text used for credits link in footer of each page."
+msgstr "Orri bakoitzaren oineko kredituen estekan erabilitako testua."
+
+#. TRANS: Field label on site settings panel.
+msgid "Brought by URL"
+msgstr "Egileen URLa:"
+
+#. TRANS: Field title on site settings panel.
+msgid "URL used for credits link in footer of each page."
+msgstr "Orri bakoitzaren oineko kredituen estekan erabilitako URLa."
+
+#. TRANS: Field label on site settings panel.
+msgid "Email"
+msgstr "Posta elektronikoa"
+
+#. TRANS: Field title on site settings panel.
+msgid "Contact email address for your site."
+msgstr "Zure gunearen harremanetarako posta-helbidea."
+
+#. TRANS: Fieldset legend on site settings panel.
+msgctxt "LEGEND"
+msgid "Local"
+msgstr "Lokala"
+
+#. TRANS: Dropdown label on site settings panel.
+msgid "Default timezone"
+msgstr "Ordu-eremu lehenetsia"
+
+#. TRANS: Dropdown title on site settings panel.
+msgid "Default timezone for the site; usually UTC."
+msgstr "Gunearen ordu-eremu lehenetsia; normalean UTC."
+
+#. TRANS: Dropdown label on site settings panel.
+msgid "Default language"
+msgstr "Hizkuntza lehenetsia"
+
+#. TRANS: Dropdown title on site settings panel.
+msgid ""
+"The site language when autodetection from browser settings is not available."
+msgstr ""
+"Gunearen hizkuntza, nabigatzailearen ezarpenetan hizkuntza ezarrita ez "
+"dagoenerako."
+
+#. TRANS: Fieldset legend on site settings panel.
+msgctxt "LEGEND"
+msgid "Limits"
+msgstr "Mugak"
+
+#. TRANS: Field label on site settings panel.
+msgid "Text limit"
+msgstr "Testu-muga"
+
+#. TRANS: Field title on site settings panel.
+msgid "Maximum number of characters for notices."
+msgstr "Gehieneko karaktere-kopurua oharretarako."
+
+#. TRANS: Field label on site settings panel.
+msgid "Dupe limit"
+msgstr "Bikoiztuen muga"
+
+#. TRANS: Field title on site settings panel.
+msgid "How long users must wait (in seconds) to post the same thing again."
+msgstr ""
+"Zenbat denbora (segundotan) itxaron beharko duten erabiltzaileek gauza bera "
+"idazteko."
+
+#. TRANS: Fieldset legend for form to change logo.
+msgid "Logo"
+msgstr "Logotipoa"
+
+#. TRANS: Field label for StatusNet site logo.
+msgid "Site logo"
+msgstr "Gunearen logoa"
+
+#. TRANS: Field label for SSL StatusNet site logo.
+msgid "SSL logo"
+msgstr "SSL logoa"
+
+#. TRANS: Button title for saving site settings.
+msgid "Save the site settings."
+msgstr "Gorde gunearen ezarpenak."
+
+#. TRANS: Page title for site-wide notice tab in admin panel.
+msgid "Site Notice"
+msgstr "Gunearen oharra"
+
+#. TRANS: Instructions for site-wide notice tab in admin panel.
+msgid "Edit site-wide message"
+msgstr "Editatu gune osoaren mezua"
+
+#. TRANS: Server error displayed when saving a site-wide notice was impossible.
+msgid "Unable to save site notice."
+msgstr "Ezinezkoa izan da gunearen oharra gordetzea."
+
+#. TRANS: Client error displayed when a site-wide notice was longer than allowed.
+msgid "Maximum length for the site-wide notice is 255 characters."
+msgstr "Gune osoaren oharraren luzera maximoa 255 karaktere da."
+
+#. TRANS: Label for site-wide notice text field in admin panel.
+msgid "Site notice text"
+msgstr "Gunearen oharraren testua"
+
+#. TRANS: Tooltip for site-wide notice text field in admin panel.
+msgid "Site-wide notice text (255 characters maximum; HTML allowed)"
+msgstr ""
+"Gune osoaren oharraren testua (gehienez 255 karaktere; HTMLa baimendua)"
+
+#. TRANS: Button title to save site notice in admin panel.
+msgid "Save site notice."
+msgstr "Gorde gunearen oharra."
+
+#. TRANS: Title for SMS settings.
+msgid "SMS settings"
+msgstr "SMS ezarpenak"
+
+#. TRANS: SMS settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#, php-format
+msgid "You can receive SMS messages through email from %%site.name%%."
+msgstr "%%site.name%% gunetik SMS mezuak jaso ditzakezu posta bidez."
+
+#. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
+msgid "SMS is not available."
+msgstr "SMS ez dago erabilgarri."
+
+#. TRANS: Form legend for SMS settings form.
+msgid "SMS address"
+msgstr "SMS helbidea"
+
+#. TRANS: Form guide in SMS settings form.
+msgid "Current confirmed SMS-enabled phone number."
+msgstr "SMStarako gaitutako uneko telefono-zenbaki baieztatua."
+
+#. TRANS: Form guide in IM settings form.
+msgid "Awaiting confirmation on this phone number."
+msgstr "Telefono-zenbaki honen baieztapenaren zain."
+
+#. TRANS: Field label for SMS address input in SMS settings form.
+msgid "Confirmation code"
+msgstr "Baieztapen-kodea"
+
+#. TRANS: Form field instructions in SMS settings form.
+msgid "Enter the code you received on your phone."
+msgstr "Sartu zure mugikorrean jasotako kodea."
+
+#. TRANS: Button label to confirm SMS confirmation code in SMS settings.
+msgctxt "BUTTON"
+msgid "Confirm"
+msgstr "Baieztatu"
+
+#. TRANS: Field label for SMS phone number input in SMS settings form.
+msgid "SMS phone number"
+msgstr "SMS telefono-zenbakia"
+
+#. TRANS: SMS phone number input field instructions in SMS settings form.
+msgid "Phone number, no punctuation or spaces, with area code."
+msgstr "Telefono zenbakia, puntuazio edo espaziorik gabe, lurralde-kodearekin."
+
+#. TRANS: Form legend for SMS preferences form.
+msgid "SMS preferences"
+msgstr "SMS hobespenak"
+
+#. TRANS: Checkbox label in SMS preferences form.
+msgid ""
+"Send me notices through SMS; I understand I may incur exorbitant charges "
+"from my carrier."
+msgstr ""
+"Bidali oharrak SMS bidez; jakinaren gainean nago nire konpainiak gehiegizko "
+"faktura bidal diezadakela."
+
+#. TRANS: Confirmation message for successful SMS preferences save.
+msgid "SMS preferences saved."
+msgstr "SMS hobespenak gordeak."
+
+#. TRANS: Message given saving SMS phone number without having provided one.
+msgid "No phone number."
+msgstr "Telefono-zenbakirik ez."
+
+#. TRANS: Message given saving SMS phone number without having selected a carrier.
+msgid "No carrier selected."
+msgstr "Ez da enpresa aukeratu."
+
+#. TRANS: Message given saving SMS phone number that is already set.
+msgid "That is already your phone number."
+msgstr "Hori dagoeneko zure telefono-zenbakia da."
+
+#. TRANS: Message given saving SMS phone number that is already set for another user.
+msgid "That phone number already belongs to another user."
+msgstr "Telefono-zenbaki hori dagoeneko beste erabiltzaile batena da."
+
+#. TRANS: Message given saving valid SMS phone number that is to be confirmed.
+msgid ""
+"A confirmation code was sent to the phone number you added. Check your phone "
+"for the code and instructions on how to use it."
+msgstr ""
+"Baieztapen-kode bat bidali zaizu zure telefono-zenbakira. Bilatu zure "
+"telefonoan kodea eta hura erabiltzeko argibideak."
+
+#. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
+msgid "That is the wrong confirmation number."
+msgstr "Posta-helbide hori okerra da."
+
+#. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
+msgid "Could not delete SMS confirmation."
+msgstr "Ezin izan da SMS baieztapena ezabatu."
+
+#. TRANS: Message given after successfully canceling SMS phone number confirmation.
+msgid "SMS confirmation cancelled."
+msgstr "SMS baieztapena ezeztatuta."
+
+#. TRANS: Message given trying to remove an SMS phone number that is not
+#. TRANS: registered for the active user.
+msgid "That is not your phone number."
+msgstr "Hori ez da zure telefono-zenbakia."
+
+#. TRANS: Message given after successfully removing a registered SMS phone number.
+msgid "The SMS phone number was removed."
+msgstr "SMS telefono-zenbakia kendu da."
+
+#. TRANS: Label for mobile carrier dropdown menu in SMS settings.
+msgid "Mobile carrier"
+msgstr "Mugikorren konpainia"
+
+#. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
+msgid "Select a carrier"
+msgstr "Aukeratu enpresa bat"
+
+#. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
+#. TRANS: %s is an administrative contact's e-mail address.
+#, 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 ""
+"Mugikorren konpainia zure telefonorako. SMSak email bidez onartzen dituen "
+"konpainia bat ezagutzen baduzu eta hemen zerrendatuta ez badago, jakinarazi "
+"iezaguzu hemen: %s."
+
+#. TRANS: Message given saving SMS phone number confirmation code without having provided one.
+msgid "No code entered."
+msgstr "Ez da koderik sartu."
+
+#. TRANS: Title for admin panel to configure snapshots.
+msgctxt "TITLE"
+msgid "Snapshots"
+msgstr "Kapturak"
+
+#. TRANS: Instructions for admin panel to configure snapshots.
+msgid "Manage snapshot configuration"
+msgstr "Kapturen konfigurazioa kudeatu"
+
+#. TRANS: Client error displayed on admin panel for snapshots when providing an invalid run value.
+msgid "Invalid snapshot run value."
+msgstr "Kapturaren baliogabeko exekuzio-balioa."
+
+#. TRANS: Client error displayed on admin panel for snapshots when providing an invalid value for frequency.
+msgid "Snapshot frequency must be a number."
+msgstr "Kapturen maiztasuna zenbaki bat izan behar da."
+
+#. TRANS: Client error displayed on admin panel for snapshots when providing an invalid report URL.
+msgid "Invalid snapshot report URL."
+msgstr "Kapturaren baliogabeko jakinarazpen URLa."
+
+#. TRANS: Fieldset legend on admin panel for snapshots.
+msgctxt "LEGEND"
+msgid "Snapshots"
+msgstr "Kapturak"
+
+#. TRANS: Option in dropdown for snapshot method in admin panel for snapshots.
+msgid "Randomly during web hit"
+msgstr "Ausaz web bisita bitartean"
+
+#. TRANS: Option in dropdown for snapshot method in admin panel for snapshots.
+msgid "In a scheduled job"
+msgstr "Programatutako ataza batean"
+
+#. TRANS: Dropdown label for snapshot method in admin panel for snapshots.
+msgid "Data snapshots"
+msgstr "Datu kapturak"
+
+#. TRANS: Dropdown title for snapshot method in admin panel for snapshots.
+msgid "When to send statistical data to status.net servers."
+msgstr "Noiz bidali datu estatistikoak status.net-en zerbitzarietara."
+
+#. TRANS: Input field label for snapshot frequency in admin panel for snapshots.
+msgid "Frequency"
+msgstr "Maiztasuna"
+
+#. TRANS: Input field title for snapshot frequency in admin panel for snapshots.
+msgid "Snapshots will be sent once every N web hits."
+msgstr "Kapturak N web-sarreratik behin bidaliko dira."
+
+#. TRANS: Input field label for snapshot report URL in admin panel for snapshots.
+msgid "Report URL"
+msgstr "Jakinarazpenetarako URLa"
+
+#. TRANS: Input field title for snapshot report URL in admin panel for snapshots.
+msgid "Snapshots will be sent to this URL."
+msgstr "URL honetara bidaliko dira kapturak."
+
+#. TRANS: Button title to save snapshot settings.
+msgid "Save snapshot settings."
+msgstr "Gorde gunearen ezarpenak."
+
+#. TRANS: Client error displayed trying a change a subscription for a non-subscribed profile.
+msgid "You are not subscribed to that profile."
+msgstr "Ez zaude profil horretara harpidetua."
+
+#. TRANS: Server error displayed when updating a subscription fails with a database error.
+#. TRANS: Exception thrown when a subscription could not be stored on the server.
+msgid "Could not save subscription."
+msgstr "Ezin izan da harpidetza gorde."
+
+#. TRANS: Client error displayed when trying to approve group applicants without being a group administrator.
+msgid "You may only approve your own pending subscriptions."
+msgstr "Onartzeke dauden harpidetzetan zureak soilik onartu beharko zenituzke."
+
+#. TRANS: Title of the first page showing pending subscribers still awaiting approval.
+#. TRANS: %s is the name of the user.
+#, php-format
+msgid "%s subscribers awaiting approval"
+msgstr "%s harpidedun onarpenaren zain"
+
+#. TRANS: Title of all but the first page showing pending subscribersmembers still awaiting approval.
+#. TRANS: %1$s is the name of the user, %2$d is the page number of the members list.
+#, php-format
+msgid "%1$s subscribers awaiting approval, page %2$d"
+msgstr "%1$s harpidedun onarpenaren zain, %2$d. orria"
+
+#. TRANS: Page notice for group members page.
+msgid "A list of users awaiting approval to subscribe to you."
+msgstr "Zure harpidetza onartzeko zain daudenen zerrenda."
+
+#. TRANS: Page title when subscription succeeded.
+msgid "Subscribed"
+msgstr "Harpidetua"
+
+#. TRANS: Client error displayed when trying to perform an action while not logged in.
+msgid "You must be logged in to unsubscribe from a list."
+msgstr "Izena eman behar duzu zerrenda baten harpidetza eteteko."
+
+#. TRANS: Client error displayed when trying to perform an action without providing an ID.
+msgid "No ID given."
+msgstr "Ez da IDrik sartu."
+
+#. TRANS: Server error displayed subscribing to a list fails.
+#. TRANS: %1$s is a user nickname, %2$s is a list, %3$s is the error message (no period).
+#, php-format
+msgid "Could not subscribe user %1$s to list %2$s: %3$s"
+msgstr "Ezin izan da %1$s erabiltzailea %2$s zerrendara harpidetu: %3$s"
+
+#. TRANS: Title of form to subscribe to a list.
+#. TRANS: %1%s is a user nickname, %2$s is a list, %3$s is a tagger nickname.
+#, php-format
+msgid "%1$s subscribed to list %2$s by %3$s"
+msgstr "%1$s erabiltzailea %3$s(e)n %2$s zerrendara harpidetu da"
+
+#. TRANS: Header for list of subscribers for a user (first page).
+#. TRANS: %s is the user's nickname.
+#, php-format
+msgid "%s subscribers"
+msgstr "%s harpidedun"
+
+#. TRANS: Header for list of subscribers for a user (not first page).
+#. TRANS: %1$s is the user's nickname, $2$d is the page number.
+#, php-format
+msgid "%1$s subscribers, page %2$d"
+msgstr "%1$s harpidedun, %2$d. orria"
+
+#. TRANS: Page notice for page with an overview of all subscribers
+#. TRANS: of the logged in user's own profile.
+msgid "These are the people who listen to your notices."
+msgstr "Hauek zure oharrak jarraitzen dituzten pertsonak dira."
+
+#. TRANS: Page notice for page with an overview of all subscribers of a user other
+#. TRANS: than the logged in user. %s is the user nickname.
+#, php-format
+msgid "These are the people who listen to %s's notices."
+msgstr "Hauek %s(r)en oharrak jarraitzen dituzten pertsonak dira."
+
+#. TRANS: Subscriber list text when the logged in user has no subscribers.
+msgid ""
+"You have no subscribers. Try subscribing to people you know and they might "
+"return the favor."
+msgstr ""
+"Ez daukazu harpidedunik. Saiatu ezagutzen duzun pertsonetara harpidetzen eta "
+"baliteke mesedea itzultzea."
+
+#. TRANS: Subscriber list text when looking at the subscribers for a of a user other
+#. TRANS: than the logged in user that has no subscribers. %s is the user nickname.
+#, php-format
+msgid "%s has no subscribers. Want to be the first?"
+msgstr "%s erabiltzaileak ez dauka harpidedunik. Lehena izan nahi?"
+
+#. TRANS: Subscriber list text when looking at the subscribers for a of a user that has none
+#. TRANS: as an anonymous user. %s is the user nickname.
+#. TRANS: This message contains a Markdown URL. The link description is between
+#. TRANS: square brackets, and the link between parentheses. Do not separate "]("
+#. TRANS: and do not change the URL part.
+#, php-format
+msgid ""
+"%s has no subscribers. Why not [register an account](%%%%action.register%%%"
+"%) and be the first?"
+msgstr ""
+"%s erabiltzaileak ez dauka harpidedunik. Zergatik ez [kontu bat ireki](%%%%"
+"action.register%%%%) eta lehena izan?"
+
+#. TRANS: Header for subscriptions overview for a user (not first page).
+#. TRANS: %1$s is a user nickname, %2$d is the page number.
+#, php-format
+msgid "%1$s subscriptions, page %2$d"
+msgstr "%1$s harpidetza,%2$d orria"
+
+#. TRANS: Page notice for page with an overview of all subscriptions
+#. TRANS: of the logged in user's own profile.
+msgid "These are the people whose notices you listen to."
+msgstr "Pertsona hauen oharrak jarraitzen dituzu."
+
+#. TRANS: Page notice for page with an overview of all subscriptions of a user other
+#. TRANS: than the logged in user. %s is the user nickname.
+#, php-format
+msgid "These are the people whose notices %s listens to."
+msgstr "%s erabiltzaileak jende hauen oharrak jarraitzen ditu."
+
+#. TRANS: Subscription list text when the logged in user has no subscriptions.
+#. TRANS: This message contains Markdown URLs. The link description is between
+#. TRANS: square brackets, and the link between parentheses. Do not separate "]("
+#. TRANS: and do not change the URL part.
+#, php-format
+msgid ""
+"You're not listening to anyone's notices right now, try subscribing to "
+"people you know. Try [people search](%%action.peoplesearch%%), look for "
+"members in groups you're interested in and in our [featured users](%%action."
+"featured%%)."
+msgstr ""
+"Oraintxe bertan ez dituzu inoren oharrak jarraitzen, saiatu ezagutzen duzun "
+"jendera harpidetzen.  Saiatu [jendea bilatzen](%%action.peoplesearch%%), "
+"bilatu zure intereseko taldeetako kideak eta gure [erabiltzaile berezienak](%"
+"%action.featured%%)."
+
+#. TRANS: Subscription list text when looking at the subscriptions for a of a user other
+#. TRANS: than the logged in user that has no subscriptions. %s is the user nickname.
+#. TRANS: Subscription list text when looking at the subscriptions for a of a user that has none
+#. TRANS: as an anonymous user. %s is the user nickname.
+#, php-format
+msgid "%s is not listening to anyone."
+msgstr "%s(e)k ez du inor jarraitzen."
+
+#. TRANS: Atom feed title. %s is a profile nickname.
+#, php-format
+msgid "Subscription feed for %s (Atom)"
+msgstr "%s(e)n harpidetza-jarioa (Atom)"
+
+#. TRANS: Checkbox label for enabling IM messages for a profile in a subscriptions list.
+msgctxt "LABEL"
+msgid "IM"
+msgstr "BM"
+
+#. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
+msgid "SMS"
+msgstr "SMS"
+
+#. TRANS: Title for all but the first page of notices with tags.
+#. TRANS: %1$s is the tag, %2$d is the page number.
+#, php-format
+msgid "Notices tagged with %1$s, page %2$d"
+msgstr "%1$s(r)ekin etiketatutako oharrak, %2$d. orria"
+
+#. TRANS: Link label for feed on "notices with tag" page.
+#. TRANS: %s is the tag the feed is for.
+#, php-format
+msgid "Notice feed for tag %s (Activity Streams JSON)"
+msgstr "%s etiketaren ohar-jarioa (Activity Streams JSON)"
+
+#. TRANS: Link label for feed on "notices with tag" page.
+#. TRANS: %s is the tag the feed is for.
+#, php-format
+msgid "Notice feed for tag %s (RSS 1.0)"
+msgstr "%s etiketaren ohar-jarioa (RSS 1.0)"
+
+#. TRANS: Link label for feed on "notices with tag" page.
+#. TRANS: %s is the tag the feed is for.
+#, php-format
+msgid "Notice feed for tag %s (RSS 2.0)"
+msgstr "%s etiketaren ohar-jarioa (RSS 2.0)"
+
+#. TRANS: Link label for feed on "notices with tag" page.
+#. TRANS: %s is the tag the feed is for.
+#, php-format
+msgid "Notice feed for tag %s (Atom)"
+msgstr "%s etiketaren ohar-jarioa (Atom)"
+
+#. TRANS: Client error displayed when trying to tag a user that cannot be tagged.
+#. TRANS: Client exception thrown trying to set a tag for a user that cannot be tagged.
+#. TRANS: Error displayed when trying to tag a user that cannot be tagged.
+msgid "You cannot tag this user."
+msgstr "Ezin duzu erabiltzaile hau etiketatu."
+
+#. TRANS: Title for list form when not on a profile page.
+msgid "List a profile"
+msgstr "Zerrendatu profil bat"
+
+#. TRANS: Title for list form when on a profile page.
+#. TRANS: %s is a profile nickname.
+#, php-format
+msgctxt "ADDTOLIST"
+msgid "List %s"
+msgstr "Zerrendatu %s"
+
+#. TRANS: Title for list form when an error has occurred.
+msgctxt "TITLE"
+msgid "Error"
+msgstr "Errorea"
+
+#. TRANS: Header in list form.
+msgid "User profile"
+msgstr "Erabiltzaile-profila"
+
+#. TRANS: Fieldset legend for list form.
+msgid "List user"
+msgstr "Zerrenda-erabiltzailea"
+
+#. TRANS: Field label on list form.
+msgctxt "LABEL"
+msgid "Lists"
+msgstr "Zerrendak"
+
+#. TRANS: Field title on list form.
+msgid ""
+"Lists for this user (letters, numbers, -, ., and _), comma- or space- "
+"separated."
+msgstr ""
+"Erabiltzaile honentzako zerrendak (hizkiak, zenbakia, -, ., eta _), komaz "
+"edo zuriunez bananduak."
+
+#. TRANS: Title for personal tag cloud section.
+msgctxt "TITLE"
+msgid "Tags"
+msgstr "Etiketak"
+
+#. TRANS: Success message if lists are saved.
+msgid "Lists saved."
+msgstr "Zerrendak gorde dira."
+
+#. TRANS: Page notice.
+msgid "Use this form to add your subscribers or subscriptions to lists."
+msgstr ""
+"Erabili formulario hau zure harpidedunak edo harpidetzak zerrendetan "
+"sartzeko."
+
+#. TRANS: Client error when requesting a tag feed for a non-existing tag.
+msgid "No such tag."
+msgstr "Etiketa hori ez dago."
+
+#. TRANS: Client error displayed when trying to unblock a non-blocked user.
+msgid "You haven't blocked that user."
+msgstr "Ez duzu erabiltzaile hori blokeatu."
+
+#. TRANS: Client error on page to unsilence a user when the to be unsandboxed user has not been sandboxed.
+msgid "User is not sandboxed."
+msgstr "Erabiltzailea ez dago isolatuta."
+
+#. TRANS: Client error on page to unsilence a user when the to be unsilenced user has not been silenced.
+msgid "User is not silenced."
+msgstr "Erabiltzailea ez da isilarazi."
+
+#. TRANS: Page title for page to unsubscribe.
+msgid "Unsubscribed"
+msgstr "Harpidetu gabea"
+
+#. TRANS: Page title for form that allows unsubscribing from a list.
+#. TRANS: %1$s is a nickname, %2$s is a list, %3$s is a tagger nickname.
+#, php-format
+msgid "%1$s unsubscribed from list %2$s by %3$s"
+msgstr "%1$s erabiltzaileak %3$s(r)en %2$s zerrendan zuen harpidetza eten da"
+
+#. TRANS: Title of URL settings tab in profile settings.
+msgid "URL settings"
+msgstr "URL ezarpenak"
+
+#. TRANS: Instructions for tab "Other" in user profile settings.
+msgid "Manage various other options."
+msgstr "Kudeatu bestelako aukera batzuk."
+
+#. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
+#. TRANS: user's profile settings. This message has one space at the beginning. Use your
+#. TRANS: language's word separator here if it has one (most likely a single space).
+msgid " (free service)"
+msgstr " (zerbitzu askea)"
+
+#. TRANS: Default value for URL shortening settings.
+msgid "[none]"
+msgstr "[bat ere ez]"
+
+#. TRANS: Default value for URL shortening settings.
+msgid "[internal]"
+msgstr "[barnekoa]"
+
+#. TRANS: Label for dropdown with URL shortener services.
+msgid "Shorten URLs with"
+msgstr "Laburtu URLak honekin:"
+
+#. TRANS: Tooltip for for dropdown with URL shortener services.
+msgid "Automatic shortening service to use."
+msgstr "Laburtze automatikorako erabiliko den zerbitzua."
+
+#. TRANS: Field label in URL settings in profile.
+msgid "URL longer than"
+msgstr "Hau baino URL luzeagoak:"
+
+#. TRANS: Field title in URL settings in profile.
+msgid "URLs longer than this will be shortened, 0 means always shorten."
+msgstr ""
+"Hau baino luzeagoak diren URLak laburtuko dira, 0 bada, beti laburtuko dira."
+
+#. TRANS: Field label in URL settings in profile.
+msgid "Text longer than"
+msgstr "Hau baino testu luzegoak:"
+
+#. TRANS: Field title in URL settings in profile.
+msgid ""
+"URLs in notices longer than this will be shortened, 0 means always shorten."
+msgstr ""
+"Hau baino ohar luzeagoetan URLak laburtuko dira, 0 bada, beti laburtuko dira."
+
+#. TRANS: Form validation error for form "Other settings" in user profile.
+msgid "URL shortening service is too long (maximum 50 characters)."
+msgstr "URLak laburtzeko zerbitzua luzeegia da (gehienez 50 karaktere)."
+
+#. TRANS: Client exception thrown when the maximum URL settings value is invalid in profile URL settings.
+msgid "Invalid number for maximum URL length."
+msgstr "Zenbaki baliogabea gehieneko URL luzera adierazteko."
+
+#. TRANS: Client exception thrown when the maximum notice length settings value is invalid in profile URL settings.
+msgid "Invalid number for maximum notice length."
+msgstr "Zenbaki baliogabea oharren gehieneko luzera adierazteko."
+
+#. TRANS: Server exception thrown in profile URL settings when preferences could not be saved.
+msgid "Error saving user URL shortening preferences."
+msgstr "Errorea URLa laburtzeko hobespenak gordetzean."
+
+#. TRANS: User admin panel title.
+msgctxt "TITLE"
+msgid "User"
+msgstr "Erabiltzailea"
+
+#. TRANS: Instruction for user admin panel.
+msgid "User settings for this StatusNet site"
+msgstr "Erabiltzailearen ezarpenak StatusNet gune honetarako"
+
+#. TRANS: Form validation error in user admin panel when a non-numeric character limit was set.
+msgid "Invalid bio limit. Must be numeric."
+msgstr "Biografia-luzera baliogabea. Zenbakia izan behar da."
+
+#. TRANS: Form validation error in user admin panel when welcome text is too long.
+msgid "Invalid welcome text. Maximum length is 255 characters."
+msgstr "Sarrera testu baliogabea. Luzera maximoa 255 karakterekoa da."
+
+#. TRANS: Client error displayed when trying to set a non-existing user as default subscription for new
+#. TRANS: users in user admin panel. %1$s is the invalid nickname.
+#, php-format
+msgid "Invalid default subscripton: \"%1$s\" is not a user."
+msgstr "Baliogabeko harpidetza lehenetsia: \"%1$s\" ez da erabiltzaile bat."
+
+#. TRANS: Fieldset legend in user administration panel.
+msgctxt "LEGEND"
+msgid "Profile"
+msgstr "Profila"
+
+#. TRANS: Field label in user admin panel for setting the character limit for the bio field.
+msgid "Bio Limit"
+msgstr "Biografiaren muga"
+
+#. TRANS: Tooltip in user admin panel for setting the character limit for the bio field.
+msgid "Maximum length of a profile bio in characters."
+msgstr "Profileko biografiaren luzera maximoa karakteretan."
+
+#. TRANS: Form legend in user admin panel.
+msgid "New users"
+msgstr "Erabiltzaile berriak"
+
+#. TRANS: Field label in user admin panel for setting new user welcome text.
+msgid "New user welcome"
+msgstr "Erabiltzaile berriari ongi etorria"
+
+#. TRANS: Tooltip in user admin panel for setting new user welcome text.
+msgid "Welcome text for new users (maximum 255 characters)."
+msgstr "Ongi etorri testua erabiltzaile berrientzat (gehienez 255 karaktere)."
+
+#. TRANS: Field label in user admin panel for setting default subscription for new users.
+msgid "Default subscription"
+msgstr "Harpidetza lehenetsia"
+
+#. TRANS: Tooltip in user admin panel for setting default subscription for new users.
+msgid "Automatically subscribe new users to this user."
+msgstr "Erabiltzaile berriak beste hauetara harpidetu automatikoki."
+
+#. TRANS: Form legend in user admin panel.
+msgid "Invitations"
+msgstr "Gonbidapenak"
+
+#. TRANS: Field label for checkbox in user admin panel for allowing users to invite friend using site e-mail.
+msgid "Invitations enabled"
+msgstr "Gonbidapenak gaituta"
+
+#. TRANS: Tooltip for checkbox in user admin panel for allowing users to invite friend using site e-mail.
+msgid "Whether to allow users to invite new users."
+msgstr "Onartu erabiltzaileek beste erabiltzaile batzuk gonbidatzea."
+
+#. TRANS: Button title to save user settings in user admin panel.
+msgid "Save user settings."
+msgstr "Gorde erabiltzailearen ezarpenak."
+
+#. TRANS: Page title for all but the first page of groups for a user.
+#. TRANS: %1$s is a nickname, %2$d is a page number.
+#, php-format
+msgid "%1$s groups, page %2$d"
+msgstr "%1$s talde, %2$d. orria"
+
+#. TRANS: Link text on group page to search for groups.
+msgid "Search for more groups"
+msgstr "Talde gehiago bilatu"
+
+#. TRANS: Text on group page for a user that is not a member of any group.
+#. TRANS: %s is a user nickname.
+#, php-format
+msgid "%s is not a member of any group."
+msgstr "%s ez da talde bateko kide egin."
+
+#. TRANS: Text on group page for a user that is not a member of any group. This message contains
+#. TRANS: a Markdown link in the form [link text](link) and a variable that should not be changed.
+#, php-format
+msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
+msgstr ""
+"Saiatu [taldeak bilatzen](%%action.groupsearch%%) eta beraiekin elkartzen."
+
+#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
+#. TRANS: Message is used as a subtitle in atom group notice feed.
+#. TRANS: %1$s is a group name, %2$s is a site name.
+#. TRANS: Message is used as a subtitle in atom user notice feed.
+#. TRANS: %1$s is a user name, %2$s is a site name.
+#, php-format
+msgid "Updates from %1$s on %2$s!"
+msgstr "%2$s(e)n %1$s(e)k bidalitako azken mezuak!"
+
+#. TRANS: Title for version page. %s is the StatusNet version.
+#, php-format
+msgid "StatusNet %s"
+msgstr "StatusNet %s"
+
+#. TRANS: Content part of StatusNet version page.
+#. TRANS: %1$s is the engine name (StatusNet) and %2$s is the StatusNet version.
+#, php-format
+msgid ""
+"This site is powered by %1$s version %2$s, Copyright 2008-2011 StatusNet, "
+"Inc. and contributors."
+msgstr ""
+"Gune hau %1$s(e)n %2$s bertsioak kudeatzen du, Copyright 2008-2011 "
+"StatusNet, Inc. eta bere laguntzaileena."
+
+#. TRANS: Header for StatusNet contributors section on the version page.
+msgid "Contributors"
+msgstr "Laguntzaileak"
+
+#. TRANS: Header for StatusNet license section on the version page.
+msgid "License"
+msgstr "Lizentzia"
+
+#. TRANS: Content part of StatusNet version page.
+msgid ""
+"StatusNet is free software: you can redistribute it and/or modify it under "
+"the terms of the GNU Affero General Public License as published by the Free "
+"Software Foundation, either version 3 of the License, or (at your option) "
+"any later version."
+msgstr ""
+"StatusNet software librea da: banatu edo aldatu dezakezu, Free Software "
+"Foundationak bezela, GNU Affero General Public License erabilita, baita "
+"lizentziaren 3 bertsiopean, edo (nahi baduzu) bertsio berriagoetan."
+
+#. TRANS: Content part of StatusNet version page.
+msgid ""
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License "
+"for more details."
+msgstr ""
+"Programa hau erabilgarria izateko itxaropenarekin zabaldu da, baina INOLAKO "
+"BERMERIK GABE; iradokitako MERKATURATZE edo PROPOSAMEN JAKIN BATERAKO "
+"EGOKITASUNIK gabe.  Ikusi GNU Affero General Public License xehetasun "
+"gehiagotarako."
+
+#. TRANS: Content part of StatusNet version page.
+#. TRANS: %s is a link to the AGPL license with link description "http://www.gnu.org/licenses/agpl.html".
+#, php-format
+msgid ""
+"You should have received a copy of the GNU Affero General Public License "
+"along with this program.  If not, see %s."
+msgstr ""
+"Programa honekin batera GNU Affero General Public Licenseren kopia bat jaso "
+"behar izan duzu.  Aurkitzen ez baduzu, ikusi %s."
+
+#. TRANS: Header for StatusNet plugins section on the version page.
+msgid "Plugins"
+msgstr "Pluginak"
+
+#. TRANS: Column header for plugins table on version page.
+msgctxt "HEADER"
+msgid "Name"
+msgstr "Izena"
+
+#. TRANS: Column header for plugins table on version page.
+msgctxt "HEADER"
+msgid "Version"
+msgstr "Bertsioa"
+
+#. TRANS: Column header for plugins table on version page.
+msgctxt "HEADER"
+msgid "Author(s)"
+msgstr "Egilea(k)"
+
+#. TRANS: Column header for plugins table on version page.
+msgctxt "HEADER"
+msgid "Description"
+msgstr "Deskripzioa"
+
+#. TRANS: Activity title when marking a notice as favorite.
+msgid "Favor"
+msgstr "Onetsi"
+
+#. TRANS: Ntofication given when a user marks a notice as favorite.
+#. TRANS: %1$s is a user nickname or full name, %2$s is a notice URI.
+#, php-format
+msgid "%1$s marked notice %2$s as a favorite."
+msgstr "%1$s(e)k %2$s oharra gogoko bezela markatu du."
+
+#. TRANS: Server exception thrown when a URL cannot be processed.
+#, php-format
+msgid "Cannot process URL '%s'"
+msgstr "'%s' URLa ezin da prozesatu"
+
+#. TRANS: Server exception thrown when... Robin thinks something is impossible!
+msgid "Robin thinks something is impossible."
+msgstr "Aitorrek zerbait ezinezkoa dela uste du."
+
+#. TRANS: Message used to be inserted as %2$s in  the text "No file may
+#. TRANS: be larger than %1$d byte and the file you sent was %2$s.".
+#. TRANS: %1$d is the number of bytes of an uploaded file.
+#, php-format
+msgid "%1$d byte"
+msgid_plural "%1$d bytes"
+msgstr[0] "byte %1$d"
+msgstr[1] "%1$d byte"
+
+#. TRANS: Message given if an upload is larger than the configured maximum.
+#. TRANS: %1$d (used for plural) is the byte limit for uploads,
+#. TRANS: %2$s is the proper form of "n bytes". This is the only ways to have
+#. TRANS: gettext support multiple plurals in the same message, unfortunately...
+#, php-format
+msgid ""
+"No file may be larger than %1$d byte and the file you sent was %2$s. Try to "
+"upload a smaller version."
+msgid_plural ""
+"No file may be larger than %1$d bytes and the file you sent was %2$s. Try to "
+"upload a smaller version."
+msgstr[0] ""
+"Fitxategiek ezin dute byte %1$detik gorako tamainarik izan eta bidali "
+"duzunak %2$s dauzka. Saiatu fitxategi txikiagoa igotzen."
+msgstr[1] ""
+"Fitxategiek ezin dute %1$d bytetik gorako tamainarik izan eta bidali duzunak "
+"%2$s dauzka. Saiatu fitxategi txikiagoa igotzen."
+
+#. TRANS: Message given if an upload would exceed user quota.
+#. TRANS: %d (number) is the user quota in bytes and is used for plural.
+#, php-format
+msgid "A file this large would exceed your user quota of %d byte."
+msgid_plural "A file this large would exceed your user quota of %d bytes."
+msgstr[0] "Neurri honetako fitxategiak zure byte %deko kuota gainditu lezake."
+msgstr[1] "Neurri honetako fitxategiak zure %d byteko kuota gainditu lezake."
+
+#. TRANS: Message given id an upload would exceed a user's monthly quota.
+#. TRANS: $d (number) is the monthly user quota in bytes and is used for plural.
+#, php-format
+msgid "A file this large would exceed your monthly quota of %d byte."
+msgid_plural "A file this large would exceed your monthly quota of %d bytes."
+msgstr[0] ""
+"Neurri honetako fitxategiak zure hileko byte %deko kuota gainditu lezake."
+msgstr[1] ""
+"Neurri honetako fitxategiak zure hileko %d byteko kuota gainditu lezake."
+
+#. TRANS: Client exception thrown if a file upload does not have a valid name.
+msgid "Invalid filename."
+msgstr "Fitxategi-izen baliogabea."
+
+#. TRANS: Exception thrown providing an invalid profile ID.
+#. TRANS: %s is the invalid profile ID.
+#, php-format
+msgid "Profile ID %s is invalid."
+msgstr "%s profil IDa baliogabea da."
+
+#. TRANS: Exception thrown providing an invalid group ID.
+#. TRANS: %s is the invalid group ID.
+#, php-format
+msgid "Group ID %s is invalid."
+msgstr "%s talde IDa baliogabea da."
+
+#. TRANS: Exception thrown when joining a group fails.
+msgid "Group join failed."
+msgstr "Taldearekin elkartzeak huts egin du."
+
+#. TRANS: Exception thrown when trying to leave a group the user is not a member of.
+msgid "Not part of group."
+msgstr "Ez da taldeko kidea."
+
+#. TRANS: Exception thrown when trying to leave a group fails.
+msgid "Group leave failed."
+msgstr "Taldea uzteak huts egin du."
+
+#. TRANS: Activity title.
+msgid "Join"
+msgstr "Elkartu"
+
+#. TRANS: Success message for subscribe to group attempt through OStatus.
+#. TRANS: %1$s is the member name, %2$s is the subscribed group's name.
+#, php-format
+msgid "%1$s has joined group %2$s."
+msgstr "%1$s %2$s taldearekin elkartu da."
+
+#. TRANS: Server exception thrown when updating a local group fails.
+msgid "Could not update local group."
+msgstr "Ezin izan da talde lokala eguneratu."
+
+#. TRANS: Exception thrown when trying creating a login token failed.
+#. TRANS: %s is the user nickname for which token creation failed.
+#, php-format
+msgid "Could not create login token for %s"
+msgstr "Ezin izan da saioa hasteko tokena sortu %s(e)rako"
+
+#. TRANS: Exception thrown when a program code class (%s) cannot be instantiated.
+#, php-format
+msgid "Cannot instantiate class %s."
+msgstr "%s klasea ezin da instantziatu."
+
+#. TRANS: Exception thrown when database name or Data Source Name could not be found.
+msgid "No database name or DSN found anywhere."
+msgstr "Ez da datubase izenik edo DSNrik aurkitu inon."
+
+#. TRANS: Client exception thrown when a user tries to send a direct message while being banned from sending them.
+msgid "You are banned from sending direct messages."
+msgstr "Debekaturik duzu mezu zuzenak bidaltzea."
+
+#. TRANS: Message given when a message could not be stored on the server.
+msgid "Could not insert message."
+msgstr "Ezin izan da mezua txertatu."
+
+#. TRANS: Message given when a message could not be updated on the server.
+msgid "Could not update message with new URI."
+msgstr "URI berriarekin ezin izan da mezua eguneratu."
+
+#. TRANS: Server exception thrown when a user profile for a notice cannot be found.
+#. TRANS: %1$d is a profile ID (number), %2$d is a notice ID (number).
+#, php-format
+msgid "No such profile (%1$d) for notice (%2$d)."
+msgstr "Ez dago halako profilik (%1$d) oharrerako (%2$d)."
+
+#. TRANS: Server exception. %s are the error details.
+#, php-format
+msgid "Database error inserting hashtag: %s."
+msgstr "Errorea datu-basean hashtag-a txertatzean: %s."
+
+#. TRANS: Client exception thrown if a notice contains too many characters.
+msgid "Problem saving notice. Too long."
+msgstr "Arazoa oharra gordetzean. Luzeegia."
+
+#. TRANS: Client exception thrown when trying to save a notice for an unknown user.
+msgid "Problem saving notice. Unknown user."
+msgstr "Arazoa oharra gordetzean. Erabiltzaile ezezaguna."
+
+#. TRANS: Client exception thrown when a user tries to post too many notices in a given time frame.
+msgid ""
+"Too many notices too fast; take a breather and post again in a few minutes."
+msgstr ""
+"Ohar gehiegi eta azkarregi; hartu atseden eta bidali oharrak berriro minutu "
+"batzuk igaro ondoren."
+
+#. TRANS: Client exception thrown when a user tries to post too many duplicate notices in a given time frame.
+msgid ""
+"Too many duplicate messages too quickly; take a breather and post again in a "
+"few minutes."
+msgstr ""
+"Mezu bikoiztu gehiegi eta azkarregi; hartu atseden eta bidali oharrak "
+"berriro minutu batzuk igaro ondoren."
+
+#. TRANS: Client exception thrown when a user tries to post while being banned.
+msgid "You are banned from posting notices on this site."
+msgstr "Debekaturik duzu gune honetara oharrak bidaltzea."
+
+#. TRANS: Client exception thrown in notice when trying to repeat a missing or deleted notice.
+msgid "Cannot repeat; original notice is missing or deleted."
+msgstr "Ezin da errepikatu; jatorrizko oharra galdu edo ezabatu egin da."
+
+#. TRANS: Client error displayed when trying to repeat an own notice.
+msgid "You cannot repeat your own notice."
+msgstr "Ezin duzu zure ohar bera errepikatu."
+
+#. TRANS: Client error displayed when trying to repeat a non-public notice.
+msgid "Cannot repeat a private notice."
+msgstr "Ezin da ohar pribatu bat errepikatu."
+
+#. TRANS: Client error displayed when trying to repeat a notice you cannot access.
+msgid "Cannot repeat a notice you cannot read."
+msgstr "Ezin duzu errepikatu irakurri ezin duzun ohar bat."
+
+#. TRANS: Client error displayed when trying to repeat an already repeated notice.
+msgid "You already repeated that notice."
+msgstr "Jadanik errepikatu duzu ohar hori."
+
+#. TRANS: Client error displayed when trying to reply to a notice a the target has no access to.
+#. TRANS: %1$s is a user nickname, %2$d is a notice ID (number).
+#, php-format
+msgid "%1$s has no access to notice %2$d."
+msgstr "%1$s(e)k ezin du %2$d oharra atzitu."
+
+#. TRANS: Server exception thrown when a notice cannot be saved.
+#. TRANS: Server exception thrown when a notice cannot be updated.
+msgid "Problem saving notice."
+msgstr "Arazoa oharra gordetzean."
+
+#. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
+msgid "Bad type provided to saveKnownGroups."
+msgstr "Mota okerra eman da saveKnownGroups-erako."
+
+#. TRANS: Server exception thrown when an update for a group inbox fails.
+msgid "Problem saving group inbox."
+msgstr "Arazoa taldearen sarrera-kutxa gordetzean."
+
+#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
+#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
+#, php-format
+msgid "RT @%1$s %2$s"
+msgstr "RT @%1$s %2$s"
+
+#. TRANS: Full name of a profile or group (%1$s) followed by nickname (%2$s) in parentheses.
+#. TRANS: Full name of a profile or group followed by nickname in parens
+#, php-format
+msgctxt "FANCYNAME"
+msgid "%1$s (%2$s)"
+msgstr "%1$s (%2$s)"
+
+#. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
+#. TRANS: %1$s is the role name, %2$s is the user ID (number).
+#, php-format
+msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
+msgstr "#%2$d erabiltzaileari ezin zaio \"%1$s\" rola kendu; ez da existitzen."
+
+#. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
+#. TRANS: %1$s is the role name, %2$s is the user ID (number).
+#, php-format
+msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
+msgstr ""
+"#%2$d erabiltzaileari ezin zaio \"%1$s\" rola kendu; errorea datu-basean."
+
+#. TRANS: Server exception.
+msgid "The tag you are trying to rename to already exists."
+msgstr ""
+"Etiketa berrizendatzeko erabiltzen ari zaren hitza jadanik badago etiketa "
+"modura."
+
+#. TRANS: Server exception saving new tag without having a tagger specified.
+msgid "No tagger specified."
+msgstr "Ez da etiketatzailerik adierazi."
+
+#. TRANS: Server exception saving new tag without having a tag specified.
+msgid "No tag specified."
+msgstr "Ez da etiketarik adierazi."
+
+#. TRANS: Server exception saving new tag.
+msgid "Could not create profile tag."
+msgstr "Ezin izan da profil-etiketa sortu."
+
+#. TRANS: Server exception saving new tag.
+msgid "Could not set profile tag URI."
+msgstr "Ezin izan da profil-etiketaren URIa ezarri."
+
+#. TRANS: Server exception saving new tag.
+msgid "Could not set profile tag mainpage."
+msgstr "Ezin izan da ezarri profil-etiketaren orri nagusia."
+
+#. TRANS: Client exception thrown trying to set more tags than allowed.
+#, php-format
+msgid ""
+"You already have created %d or more tags which is the maximum allowed number "
+"of tags. Try using or deleting some existing tags."
+msgstr ""
+"Jadanik %d etiketa edo gehiago sortu dituzu eta onartutako gehieneko etiketa-"
+"kopurura iritsi zara. Saiatu etiketa batzuk ezabatzen edo existitzen direnak "
+"erabiltzen."
+
+#. TRANS: Client exception thrown when trying to add more people than allowed to a list.
+#, php-format
+msgid ""
+"You already have %1$d or more people in list %2$s, which is the maximum "
+"allowed number. Try unlisting others first."
+msgstr ""
+"Jadanik %1$d lagun edo gehiago dituzu %2$s zerrendan, eta onartutako "
+"gehieneko kopurura iritsi zara. Saiatu aurretik beste lagun batzuk "
+"zerrendatik kenduta."
+
+#. TRANS: Exception thrown when inserting a list subscription in the database fails.
+msgid "Adding list subscription failed."
+msgstr "Harpidetza-zerrenda gehitzeak huts egin du."
+
+#. TRANS: Exception thrown when deleting a list subscription from the database fails.
+msgid "Removing list subscription failed."
+msgstr "Harpidetza-zerrenda kentzeak huts egin du."
+
+#. TRANS: Exception thrown when a right for a non-existing user profile is checked.
+msgid "Missing profile."
+msgstr "Erabiltzaileak ez du profilik."
+
+#. TRANS: Exception thrown when a tag cannot be saved.
+msgid "Unable to save tag."
+msgstr "Ezin izan da etiketa gorde."
+
+#. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
+msgid "You have been banned from subscribing."
+msgstr "Erabiltzaileak ez dizu harpidetza uzten."
+
+#. TRANS: Exception thrown when trying to subscribe while already subscribed.
+msgid "Already subscribed!"
+msgstr "Dagoeneko harpidetua!"
+
+#. TRANS: Exception thrown when trying to subscribe to a user who has blocked the subscribing user.
+msgid "User has blocked you."
+msgstr "Lankideak blokeatu zaitu."
+
+#. TRANS: Exception thrown when trying to unsibscribe without a subscription.
+msgid "Not subscribed!"
+msgstr "Harpidetu gabea!"
+
+#. TRANS: Exception thrown when trying to unsubscribe a user from themselves.
+msgid "Could not delete self-subscription."
+msgstr "Ezin izan da norberaren harpidetza ezabatu."
+
+#. TRANS: Exception thrown when a subscription could not be deleted on the server.
+msgid "Could not delete subscription."
+msgstr "Ezin izan da harpidetza ezabatu."
+
+#. TRANS: Activity title when subscribing to another person.
+msgctxt "TITLE"
+msgid "Follow"
+msgstr "Jarraitu"
+
+#. TRANS: Notification given when one person starts following another.
+#. TRANS: %1$s is the subscriber, %2$s is the subscribed.
+#, php-format
+msgid "%1$s is now following %2$s."
+msgstr "%1$s(e)k orain %2$s jarraitzen du."
+
+#. TRANS: Notice given on user registration.
+#. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
+#, php-format
+msgid "Welcome to %1$s, @%2$s!"
+msgstr "Ongi etorri %1$s(e)ra, @%2$s!"
+
+#. TRANS: Exception thrown when trying view "repeated to me".
+msgid "Not implemented since inbox change."
+msgstr "Ez da inplementatu sarrera-kutxa aldatu denetik."
+
+#. TRANS: Server exception.
+msgid "No single user defined for single-user mode."
+msgstr "Ez da erabiltzaile bakarrik definitu erabiltzaile bakarreko modurako."
+
+#. TRANS: Server exception.
+msgid "Single-user mode code called when not enabled."
+msgstr ""
+"Erabiltzaile bakarreko moduaren kodeari deitu zaio baina ez dago gaituta."
+
+#. TRANS: Information on password recovery form if no known username or e-mail address was specified.
+msgid "No user with that email address or username."
+msgstr "Ez dago posta-helbide edo erabiltzaile-izen hori duen erabiltzailerik."
+
+#. TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.
+msgid "No registered email address for that user."
+msgstr "Ez du inork izenik eman eposta helbide horrekin."
+
+#. TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.
+msgid "Error saving address confirmation."
+msgstr "Errorea helbide-baieztapena gordetzean."
+
+#. TRANS: Server exception thrown when creating a group failed.
+msgid "Could not create group."
+msgstr "Ezin izan da taldea sortu."
+
+#. TRANS: Server exception thrown when updating a group URI failed.
+msgid "Could not set group URI."
+msgstr "Ezin izan da taldearen URIa ezarri."
+
+#. TRANS: Server exception thrown when setting group membership failed.
+msgid "Could not set group membership."
+msgstr "Ezin izan da talde-kidetzarik ezarri."
+
+#. TRANS: Server exception thrown when saving local group information failed.
+msgid "Could not save local group info."
+msgstr "Ezin izan da talde lokalaren informazioa gorde."
+
+#. TRANS: Exception thrown when an account could not be located when it should be moved.
+#. TRANS: %s is the remote site.
+#, php-format
+msgid "Cannot locate account %s."
+msgstr "Ezin izan da %s kontua aurkitu."
+
+#. TRANS: Exception thrown when a service document could not be located account move.
+#. TRANS: %s is the remote site.
+#, php-format
+msgid "Cannot find XRD for %s."
+msgstr "Ezin da XRD aurkitu %s(e)rako."
+
+#. TRANS: Exception thrown when an account could not be located when it should be moved.
+#. TRANS: %s is the remote site.
+#, php-format
+msgid "No AtomPub API service for %s."
+msgstr "Ez dago AtomPub API zerbitzurik %s(e)rako."
+
+#. TRANS: H2 for user actions in a profile.
+#. TRANS: H2 for entity actions in a profile.
+msgid "User actions"
+msgstr "Erabiltzailearen ekintzak"
+
+#. TRANS: Text shown in user profile of not yet compeltely deleted users.
+msgid "User deletion in progress..."
+msgstr "Erabiltzaile-ezabapena abian..."
+
+#. TRANS: Link title for link on user profile.
+msgid "Edit profile settings."
+msgstr "Editatu profil-ezarpenak."
+
+#. TRANS: Link text for link on user profile.
+msgctxt "BUTTON"
+msgid "Edit"
+msgstr "Aldatu"
+
+#. TRANS: Link title for link on user profile.
+msgid "Send a direct message to this user."
+msgstr "Bidali mezu bat zuzenean erabiltzaile honi."
+
+#. TRANS: Link text for link on user profile.
+msgctxt "BUTTON"
+msgid "Message"
+msgstr "Mezua"
+
+#. TRANS: Label text on user profile to select a user role.
+msgid "Moderate"
+msgstr "Moderatu"
+
+#. TRANS: Label text on user profile to select a user role.
+msgid "User role"
+msgstr "Erabiltzaile-zeregina"
+
+#. TRANS: Role that can be set for a user profile.
+msgctxt "role"
+msgid "Administrator"
+msgstr "Administratzailea"
+
+#. TRANS: Role that can be set for a user profile.
+msgctxt "role"
+msgid "Moderator"
+msgstr "Moderatzailea"
+
+#. TRANS: Page title. %1$s is the title, %2$s is the site name.
+#, php-format
+msgid "%1$s - %2$s"
+msgstr "%1$s - %2$s"
+
+#. TRANS: Page title for a page without a title set.
+msgid "Untitled page"
+msgstr "Izenik gabeko orria"
+
+#. TRANS: Localized tooltip for '...' expansion button on overlong remote messages.
+msgctxt "TOOLTIP"
+msgid "Show more"
+msgstr "Erakutsi gehiago"
+
+#. TRANS: Inline reply form submit button: submits a reply comment.
+msgctxt "BUTTON"
+msgid "Reply"
+msgstr "Erantzun"
+
+#. TRANS: Placeholder text for inline reply form. Clicking in this box will turn it into a mini notice form.
+#. TRANS: Field label for reply mini form.
+msgid "Write a reply..."
+msgstr "Erantzuna idatzi..."
+
+#. TRANS: Tab on the notice form.
+msgctxt "TAB"
+msgid "Status"
+msgstr "Egoera"
+
+#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
+#. TRANS: Text between [] is a link description, text between () is the link itself.
+#. TRANS: Make sure there is no whitespace between "]" and "(".
+#. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
+#, php-format
+msgid ""
+"**%%site.name%%** is a microblogging service brought to you by [%%site."
+"broughtby%%](%%site.broughtbyurl%%)."
+msgstr ""
+"**%%site.name%%** [%%site.broughtby%%](%%site.broughtbyurl%%) taldeak "
+"eskaintzen dizun mikroblogintza-zerbitzu bat da."
+
+#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
+#, php-format
+msgid "**%%site.name%%** is a microblogging service."
+msgstr "**%%site.name%%** mikroblogintza-zerbitzu bat da."
+
+#. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license.
+#. TRANS: Make sure there is no whitespace between "]" and "(".
+#. TRANS: Text between [] is a link description, text between () is the link itself.
+#. TRANS: %s is the version of StatusNet that is being used.
+#, php-format
+msgid ""
+"It runs the [StatusNet](http://status.net/) microblogging software, version %"
+"s, available under the [GNU Affero General Public License](http://www.fsf."
+"org/licensing/licenses/agpl-3.0.html)."
+msgstr ""
+"[StatusNet](http://status.net/) mikroblogintza-softwarearen %s bertsioan "
+"oinarrituta dago, [GNU Affero General Public License](http://www.fsf.org/"
+"licensing/licenses/agpl-3.0.html) lizentzia darabilena."
+
+#. TRANS: Content license displayed when license is set to 'private'.
+#. TRANS: %1$s is the site name.
+#, php-format
+msgid "Content and data of %1$s are private and confidential."
+msgstr "%1$s(r)en datuak eta edukia pribatuak eta isilpekoak dira."
+
+#. TRANS: Content license displayed when license is set to 'allrightsreserved'.
+#. TRANS: %1$s is the copyright owner.
+#, php-format
+msgid "Content and data copyright by %1$s. All rights reserved."
+msgstr ""
+"%1$s(r)en copyright-arekin babestutako eduki eta datuak. Eskubide guztiak "
+"erreserbatuta."
+
+#. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
+msgid "Content and data copyright by contributors. All rights reserved."
+msgstr ""
+"Edukien eta datuen copyright-a egileena. Eskubide guztiak erreserbatuta."
+
+#. TRANS: license message in footer.
+#. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
+#, php-format
+msgid "All %1$s content and data are available under the %2$s license."
+msgstr "%1$s eduki eta datu guztiak %2$s lizentziapean erabil daitezke."
+
+#. TRANS: Pagination message to go to a page displaying information more in the
+#. TRANS: present than the currently displayed information.
+msgid "After"
+msgstr "Ondorengoak"
+
+#. TRANS: Pagination message to go to a page displaying information more in the
+#. TRANS: past than the currently displayed information.
+msgid "Before"
+msgstr "Aurrekoak"
+
+#. TRANS: Client exception thrown when a feed instance is a DOMDocument.
+msgid "Expecting a root feed element but got a whole XML document."
+msgstr ""
+"Jarioaren erro-elementu bat espero zen, baina XML dokumentu osoa jaso da."
+
+#. TRANS: Client exception thrown when using an unknown verb for the activity importer.
+#, php-format
+msgid "Unknown verb: \"%s\"."
+msgstr "Hizkuntza ezezaguna: \"%s\"."
+
+#. TRANS: Client exception thrown when trying to force a subscription for an untrusted user.
+msgid "Cannot force subscription for untrusted user."
+msgstr "Ezin da harpidetza behartu fidagarria ez den erabiltzaileentzako."
+
+#. TRANS: Client exception thrown when trying to force a remote user to subscribe.
+msgid "Cannot force remote user to subscribe."
+msgstr "Ezin da behartu urruneko erabiltzailea harpidetu dadin."
+
+#. TRANS: Client exception thrown when trying to subscribe to an unknown profile.
+msgid "Unknown profile."
+msgstr "Profil ezezaguna."
+
+#. TRANS: Client exception thrown when trying to import an event not related to the importing user.
+msgid "This activity seems unrelated to our user."
+msgstr "Dirudienez jarduera honek ez du zerikusirik gure erabiltzailearekin."
+
+#. TRANS: Client exception thrown when trying to join a remote group that is not a group.
+msgid "Remote profile is not a group!"
+msgstr "Urruneko profila ez da talde bat!"
+
+#. TRANS: Client exception thrown when trying to join a group the importing user is already a member of.
+msgid "User is already a member of this group."
+msgstr "Erabiltzailea dagoeneko talde honetako partaidea da."
+
+#. TRANS: Client exception thrown when trying to import a notice by another user.
+#. TRANS: %1$s is the source URI of the notice, %2$s is the URI of the author.
+#, php-format
+msgid "Already know about notice %1$s and  it has a different author %2$s."
+msgstr "Jadanik ezagutzen da %1$s oharra eta beste %2$s egile bat dauka."
+
+#. TRANS: Client exception thrown when trying to overwrite the author information for a non-trusted user during import.
+msgid "Not overwriting author info for non-trusted user."
+msgstr ""
+"Ez gainidazten egile-informazioa fidagarria ez den erabiltzailearentzako."
+
+#. TRANS: Client exception thrown when trying to import a notice without content.
+#. TRANS: %s is the notice URI.
+#, php-format
+msgid "No content for notice %s."
+msgstr "%s oharrak ez du edukirik."
+
+#. TRANS: Exception thrown if a non-existing user is provided. %s is a user ID.
+#, php-format
+msgid "No such user \"%s\"."
+msgstr "Ez dago \"%s\" erabiltzailerik."
+
+#. TRANS: Client exception thrown when post to collection fails with a 400 status.
+#. TRANS: %1$s is a URL, %2$s is the status, %s$s is the fail reason.
+#. TRANS: Server exception thrown when post to collection fails with a 500 status.
+#. TRANS: %1$s is a URL, %2$s is the status, %s$s is the fail reason.
+#. TRANS: Exception thrown when post to collection fails with a status that is not handled.
+#. TRANS: %1$s is a URL, %2$s is the status, %s$s is the fail reason.
+#, php-format
+msgctxt "URLSTATUSREASON"
+msgid "%1$s %2$s %3$s"
+msgstr "%1$s %2$s %3$s"
+
+#. TRANS: Client exception thrown when there is no source attribute.
+msgid "Can't handle remote content yet."
+msgstr "Ezin da urruneko edukia maneiatu oraindik."
+
+#. TRANS: Client exception thrown when there embedded XML content is found that cannot be processed yet.
+msgid "Can't handle embedded XML content yet."
+msgstr "Ezin da XML eduki txertatua maneiatu oraindik."
+
+#. TRANS: Client exception thrown when base64 encoded content is found that cannot be processed yet.
+msgid "Can't handle embedded Base64 content yet."
+msgstr "Ezin da Base64 eduki txertatua maneiatu oraindik."
+
+#. TRANS: Client error message thrown when a user tries to change admin settings but has no access rights.
+msgid "You cannot make changes to this site."
+msgstr "Ezin dituzu aldaketak egin gune honetan."
+
+#. TRANS: Client error message throw when a certain panel's settings cannot be changed.
+msgid "Changes to that panel are not allowed."
+msgstr "Ez dago onartuta panel horretan aldaketak egitea."
+
+#. TRANS: Client error message.
+msgid "showForm() not implemented."
+msgstr "showForm() ez dago inplementaturik."
+
+#. TRANS: Client error message
+msgid "saveSettings() not implemented."
+msgstr "saveSettings() ez dago inplementaturik."
+
+#. TRANS: Header in administrator navigation panel.
+msgctxt "HEADER"
+msgid "Home"
+msgstr "Hasiera"
+
+#. TRANS: Header in administrator navigation panel.
+msgctxt "HEADER"
+msgid "Admin"
+msgstr "Admin"
+
+#. TRANS: Menu item title in administrator navigation panel.
+msgid "Basic site configuration"
+msgstr "Gunearen oinarrizko konfigurazioa"
+
+#. TRANS: Menu item in administrator navigation panel.
+msgctxt "MENU"
+msgid "Site"
+msgstr "Gunea"
+
+#. TRANS: Menu item title in administrator navigation panel.
+msgid "User configuration"
+msgstr "Erabiltzailearen konfigurazioa"
+
+#. TRANS: Menu item in administrator navigation panel.
+msgctxt "MENU"
+msgid "User"
+msgstr "Erabiltzailea"
+
+#. TRANS: Menu item title in administrator navigation panel.
+msgid "Access configuration"
+msgstr "Sarbidearen konfigurazioa"
+
+#. TRANS: Menu item in administrator navigation panel.
+msgctxt "MENU"
+msgid "Access"
+msgstr "Sarbidea"
+
+#. TRANS: Menu item title in administrator navigation panel.
+msgid "Paths configuration"
+msgstr "Bideen konfigurazioa"
+
+#. TRANS: Menu item in administrator navigation panel.
+msgctxt "MENU"
+msgid "Paths"
+msgstr "Bideak"
+
+#. TRANS: Menu item title in administrator navigation panel.
+msgid "Sessions configuration"
+msgstr "Saioen konfigurazioa"
+
+#. TRANS: Menu item in administrator navigation panel.
+msgctxt "MENU"
+msgid "Sessions"
+msgstr "Saioak"
+
+#. TRANS: Menu item title in administrator navigation panel.
+msgid "Edit site notice"
+msgstr "Aldatu gunearen oharra"
+
+#. TRANS: Menu item in administrator navigation panel.
+msgctxt "MENU"
+msgid "Site notice"
+msgstr "Gunearen oharra"
+
+#. TRANS: Menu item title in administrator navigation panel.
+msgid "Snapshots configuration"
+msgstr "Kapturen konfigurazioa"
+
+#. TRANS: Menu item in administrator navigation panel.
+msgctxt "MENU"
+msgid "Snapshots"
+msgstr "Kapturak"
+
+#. TRANS: Menu item title in administrator navigation panel.
+msgid "Set site license"
+msgstr "Ezarri gunearen lizentzia"
+
+#. TRANS: Menu item in administrator navigation panel.
+msgctxt "MENU"
+msgid "License"
+msgstr "Lizentzia"
+
+#. TRANS: Menu item title in administrator navigation panel.
+msgid "Plugins configuration"
+msgstr "Pluginen konfigurazioa"
+
+#. TRANS: Menu item in administrator navigation panel.
+msgctxt "MENU"
+msgid "Plugins"
+msgstr "Pluginak"
+
+#. TRANS: Client error 401.
+msgid "API resource requires read-write access, but you only have read access."
+msgstr ""
+"API baliabideak irakurri-idatzi atzipena behar du, baina zuk irakurtzeko "
+"baimena soilik daukazu."
+
+#. TRANS: OAuth exception thrown when no application is found for a given consumer key.
+msgid "No application for that consumer key."
+msgstr "Ez dago aplikaziorik kontsumitzaile-gako horretarako."
+
+#. TRANS: Authorization exception thrown when a user without API access tries to access the API.
+msgid "Not allowed to use API."
+msgstr "APIa erabiltzeko onarpenik ez."
+
+#. TRANS: OAuth exception given when an incorrect access token was given for a user.
+msgid "Bad access token."
+msgstr "Atzipen-token okerra."
+
+#. TRANS: OAuth exception given when no user was found for a given token (no token was found).
+msgid "No user for that token."
+msgstr "Ez dago erabiltzailerik token horretarako."
+
+#. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel".
+#. TRANS: Client error thrown when authentication fails.
+msgid "Could not authenticate you."
+msgstr "Zure autentifikazioak huts egin du."
+
+#. TRANS: Form input field label for application icon.
+msgid "Icon"
+msgstr "Ikonoa"
+
+#. TRANS: Form guide.
+msgid "Icon for this application"
+msgstr "Aplikazio honen ikonoa"
+
+#. TRANS: Form input field label for application name.
+msgid "Name"
+msgstr "Izena"
+
+#. TRANS: Form input field instructions.
+#. TRANS: %d is the number of available characters for the description.
+#, php-format
+msgid "Describe your application in %d character"
+msgid_plural "Describe your application in %d characters"
+msgstr[0] "Deskribatu zure aplikazioa karaktere %dean"
+msgstr[1] "Deskribatu zure aplikazioa %d karakteretan"
+
+#. TRANS: Form input field instructions.
+msgid "Describe your application"
+msgstr "Deskribatu zure aplikazioa"
+
+#. TRANS: Form input field label.
+#. TRANS: Text area label on group edit form; contains description of group.
+#. TRANS: Field label for description of list.
+#. TRANS: Dropdown option for searching in profiles.
+msgid "Description"
+msgstr "Deskripzioa"
+
+#. TRANS: Form input field instructions.
+msgid "URL of the homepage of this application"
+msgstr "Aplikazio honen orri nagusiaren URLa"
+
+#. TRANS: Form input field label.
+msgid "Source URL"
+msgstr "Iturburu URLa"
+
+#. TRANS: Form input field instructions.
+msgid "Organization responsible for this application"
+msgstr "Aplikazio honen erantzule den erakundea"
+
+#. TRANS: Form input field label.
+msgid "Organization"
+msgstr "Erakundea"
+
+#. TRANS: Form input field instructions.
+msgid "URL for the homepage of the organization"
+msgstr "Erakundearen orri nagusiaren URLa"
+
+#. TRANS: Form input field instructions.
+msgid "URL to redirect to after authentication"
+msgstr "Autentifikazioaren ondoren nora berbideratuko den URLa"
+
+#. TRANS: Radio button label for application type
+msgid "Browser"
+msgstr "Nabigatzailea"
+
+#. TRANS: Radio button label for application type
+msgid "Desktop"
+msgstr "Mahaigaina"
+
+#. TRANS: Form guide.
+msgid "Type of application, browser or desktop"
+msgstr "Aplikazio-mota, nabigatzailea ala mahaigainekoa"
+
+#. TRANS: Radio button label for access type.
+msgid "Read-only"
+msgstr "Irakurtzeko bakarrik"
+
+#. TRANS: Radio button label for access type.
+msgid "Read-write"
+msgstr "Irakurri-idatzi"
+
+#. TRANS: Form guide.
+msgid "Default access for this application: read-only, or read-write"
+msgstr ""
+"Aplikazioaren lehenetsitako atzipen baimenak: irakurtzeko bakarrik, edo "
+"irakurri-idatzi"
+
+#. TRANS: Submit button title.
+msgid "Cancel application changes."
+msgstr "Ezeztatu aplikazio aldaketak."
+
+#. TRANS: Submit button title.
+msgid "Save application changes."
+msgstr "Gorde aplikazio aldaketak."
+
+#. TRANS: Name for an anonymous application in application list.
+msgid "Unknown application"
+msgstr "Aplikazio ezezaguna"
+
+#. TRANS: Message has a leading space and a trailing space. Used in application list.
+#. TRANS: Before this message the application name is put, behind it the organisation that manages it.
+msgid " by "
+msgstr "- "
+
+#. TRANS: Application access type
+msgid "read-write"
+msgstr "irakurri-idatzi"
+
+#. TRANS: Application access type
+msgid "read-only"
+msgstr "irakurtzeko bakarrik"
+
+#. TRANS: Used in application list. %1$s is a modified date, %2$s is access type ("read-write" or "read-only")
+#, php-format
+msgid "Approved %1$s - \"%2$s\" access."
+msgstr "Onarpen-data: %1$s - Baimena: \"%2$s\"."
+
+#. TRANS: Access token in the application list.
+#. TRANS: %s are the first 7 characters of the access token.
+#, php-format
+msgid "Access token starting with: %s"
+msgstr "Atzipen-tokenaren hasiera: %s"
+
+#. TRANS: Button label in application list to revoke access to user data.
+msgctxt "BUTTON"
+msgid "Revoke"
+msgstr "Kendu"
+
+#. TRANS: Submit button text to accept a group membership request on approve group form.
+#. TRANS: Submit button text to accept a subscription request on approve sub form.
+msgctxt "BUTTON"
+msgid "Accept"
+msgstr "Onartu"
+
+#. TRANS: Submit button text to reject a group membership request on approve group form.
+#. TRANS: Submit button text to reject a subscription request on approve sub form.
+msgctxt "BUTTON"
+msgid "Reject"
+msgstr "Uko egin"
+
+#. TRANS: Atom feed exception thrown when an author element does not contain a name element.
+msgid "Author element must contain a name element."
+msgstr "Egile elementuak izen elementu bat eduki behar du."
+
+#. TRANS: Server exception thrown when using the method setActivitySubject() in the class Atom10Feed.
+msgid "Do not use this method!"
+msgstr "Ez erabili metodo hau!"
+
+#. TRANS: Title in atom list notice feed. %1$s is a list name, %2$s is a tagger's nickname.
+#, php-format
+msgid "Timeline for people in list %1$s by %2$s"
+msgstr "%2$s(r)en %1$s zerrendaren denbora-lerroa."
+
+#. TRANS: Message is used as a subtitle in atom list notice feed.
+#. TRANS: %1$s is a tagger's nickname, %2$s is a list name, %3$s is a site name.
+#, php-format
+msgid "Updates from %1$s's list %2$s on %3$s!"
+msgstr "%3$s(e)ko %1$s(r)en %2$s zerrendako eguneraketak!"
+
+#. TRANS: Title.
+msgid "Notices where this attachment appears"
+msgstr "Eranksin hau agertzen den oharrak"
+
+#. TRANS: Title.
+msgid "Tags for this attachment"
+msgstr "Eranskin honetarako etiketak"
+
+#. TRANS: Exception thrown when a password change fails.
+msgid "Password changing failed."
+msgstr "Pasahitz-aldaketak huts egin du."
+
+#. TRANS: Exception thrown when a password change attempt fails because it is not allowed.
+msgid "Password changing is not allowed."
+msgstr "Pasahitz-aldaketa ez dago baimendurik."
+
+#. TRANS: Title for the form to block a user.
+msgid "Block"
+msgstr "Blokeatu"
+
+#. TRANS: Description of the form to block a user.
+msgid "Block this user"
+msgstr "Blokeatu erabiltzaile hau"
+
+#. TRANS: Submit button text on form to cancel group join request.
+msgctxt "BUTTON"
+msgid "Cancel join request"
+msgstr "Utzi elkartze-eskaria"
+
+#. TRANS: Button text for form action to cancel a subscription request.
+msgctxt "BUTTON"
+msgid "Cancel subscription request"
+msgstr "Utzi harpidetze-eskaria"
+
+#. TRANS: Title for command results.
+msgid "Command results"
+msgstr "Aginduaren emaitzak"
+
+#. TRANS: Title for command results.
+msgid "AJAX error"
+msgstr "AJAX errorea"
+
+#. TRANS: E-mail subject when a command has completed.
+#. TRANS: E-mail subject for reply to an e-mail command.
+msgid "Command complete"
+msgstr "Agindua burutua"
+
+#. TRANS: E-mail subject when a command has failed.
+msgid "Command failed"
+msgstr "Aginduak huts egin du"
+
+#. TRANS: Command exception text shown when a notice ID is requested that does not exist.
+msgid "Notice with that id does not exist."
+msgstr "Id hori duen oharra ez da existitzen."
+
+#. TRANS: Command exception text shown when a last user notice is requested and it does not exist.
+#. TRANS: Error text shown when a last user notice is requested and it does not exist.
+msgid "User has no last notice."
+msgstr "Erabiltzaileak azken oharrik ez du."
+
+#. TRANS: Message given requesting a profile for a non-existing user.
+#. TRANS: %s is the nickname of the user for which the profile could not be found.
+#, php-format
+msgid "Could not find a user with nickname %s."
+msgstr "Ezin izan da %s nick-a duen erabiltzailea aurkitu."
+
+#. TRANS: Message given getting a non-existing user.
+#. TRANS: %s is the nickname of the user that could not be found.
+#, php-format
+msgid "Could not find a local user with nickname %s."
+msgstr "Ezin izan da %s nick-a duen erabiltzaile lokala aurkitu."
+
+#. TRANS: Error text shown when an unimplemented command is given.
+msgid "Sorry, this command is not yet implemented."
+msgstr "Barkatu, agindu hau ez dago implementaturik."
+
+#. TRANS: Command exception text shown when a user tries to nudge themselves.
+msgid "It does not make a lot of sense to nudge yourself!"
+msgstr "Zure burua zirikatzeak ez du zentzu gehiegirik!"
+
+#. TRANS: Message given having nudged another user.
+#. TRANS: %s is the nickname of the user that was nudged.
+#, php-format
+msgid "Nudge sent to %s."
+msgstr "%s zirikatu da."
+
+#. TRANS: User statistics text.
+#. TRANS: %1$s is the number of other user the user is subscribed to.
+#. TRANS: %2$s is the number of users that are subscribed to the user.
+#. TRANS: %3$s is the number of notices the user has sent.
+#, php-format
+msgid ""
+"Subscriptions: %1$s\n"
+"Subscribers: %2$s\n"
+"Notices: %3$s"
+msgstr ""
+"Harpidetzak: %1$s\n"
+"Harpidedunak: %2$s\n"
+"Oharrak: %3$s"
+
+#. TRANS: Error message text shown when a favorite could not be set because it has already been favorited.
+msgid "Could not create favorite: Already favorited."
+msgstr "Ezin izan da gogokoa sortu: dagoeneko sortuta zegoen."
+
+#. TRANS: Text shown when a notice has been marked as favourite successfully.
+msgid "Notice marked as fave."
+msgstr "Oharra gogoko bezala markatua."
+
+#. TRANS: Message given having added a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#, php-format
+msgid "%1$s joined group %2$s."
+msgstr "%1$s %2$s taldearekin elkartu da."
+
+#. TRANS: Message given having removed a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#, php-format
+msgid "%1$s left group %2$s."
+msgstr "%1$s(e)k %2$s taldea utzi du."
+
+#. TRANS: Error displayed if tagging a user fails.
+#. TRANS: %1$s is the tagged user, %2$s is the error message (no punctuation).
+#, php-format
+msgid "Error tagging %1$s: %2$s"
+msgstr "%1$s etiketatzen akatsa: %2$s"
+
+#. TRANS: Succes message displayed if tagging a user succeeds.
+#. TRANS: %1$s is the tagged user's nickname, %2$s is a list of tags.
+#. TRANS: Plural is decided based on the number of tags added (not part of message).
+#, php-format
+msgid "%1$s was tagged %2$s"
+msgid_plural "%1$s was tagged %2$s"
+msgstr[0] "%1$s %2$s gisa etiketatu da"
+msgstr[1] "%1$s %2$s gisa etiketatu da"
+
+#. TRANS: Separator for list of tags.
+#. TRANS: Separator in list of user names like "Jim, Bob, Mary".
+msgid ", "
+msgstr ", "
+
+#. TRANS: Error displayed if a given tag is invalid.
+#. TRANS: %s is the invalid tag.
+#, php-format
+msgid "Invalid tag: \"%s\""
+msgstr "Etiketa okerra: \"%s\""
+
+#. TRANS: Error displayed if untagging a user fails.
+#. TRANS: %1$s is the untagged user, %2$s is the error message (no punctuation).
+#, php-format
+msgid "Error untagging %1$s: %2$s"
+msgstr "Errorea %1$s(r)i etiketa kentzen: %2$s"
+
+#. TRANS: Succes message displayed if untagging a user succeeds.
+#. TRANS: %1$s is the untagged user's nickname, %2$s is a list of tags.
+#. TRANS: Plural is decided based on the number of tags removed (not part of message).
+#, php-format
+msgid "The following tag was removed from user %1$s: %2$s."
+msgid_plural "The following tags were removed from user %1$s: %2$s."
+msgstr[0] "%1$s erabiltzalieari kendutako etiketa: %2$s."
+msgstr[1] "%1$s erabiltzalieari kendutako etiketak: %2$s."
+
+#. TRANS: Whois output.
+#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
+#, php-format
+msgctxt "WHOIS"
+msgid "%1$s (%2$s)"
+msgstr "%1$s (%2$s)"
+
+#. TRANS: Whois output. %s is the full name of the queried user.
+#, php-format
+msgid "Fullname: %s"
+msgstr "Izen osoa: %s"
+
+#. TRANS: Whois output. %s is the location of the queried user.
+#. TRANS: Profile info line in notification e-mail.
+#. TRANS: %s is a location.
+#, php-format
+msgid "Location: %s"
+msgstr "Kokalekua: %s"
+
+#. TRANS: Whois output. %s is the homepage of the queried user.
+#. TRANS: Profile info line in notification e-mail.
+#. TRANS: %s is a homepage.
+#, php-format
+msgid "Homepage: %s"
+msgstr "Orri nagusia: %s"
+
+#. TRANS: Whois output. %s is the bio information of the queried user.
+#, php-format
+msgid "About: %s"
+msgstr "Honi buruz: %s"
+
+#. TRANS: Command exception text shown when trying to send a direct message to a remote user (a user not registered at the current server).
+#. TRANS: %s is a remote profile.
+#, php-format
+msgid ""
+"%s is a remote profile; you can only send direct messages to users on the "
+"same server."
+msgstr ""
+"%s urruneko profil bat da: zure zerbitzari barruan soilik bidal ditzakezu "
+"mezu zuzenak."
+
+#. TRANS: Message given if content is too long. %1$sd is used for plural.
+#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
+#. TRANS: Message given when a status is too long. %1$s is the maximum number of characters,
+#. TRANS: %2$s is the number of characters sent (used for plural).
+#, php-format
+msgid "Message too long - maximum is %1$d character, you sent %2$d."
+msgid_plural "Message too long - maximum is %1$d characters, you sent %2$d."
+msgstr[0] ""
+"Mezu luzeegia - gehieneko muga karaktere %1$d da, zuk %2$d didali dituzu."
+msgstr[1] ""
+"Mezu luzeegia - gehieneko muga %1$d karaktere dira, zuk %2$d didali dituzu."
+
+#. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
+msgid "You can't send a message to this user."
+msgstr "Ezin diozu mezurik bidali erabiltzaile honi."
+
+#. TRANS: Error text shown sending a direct message fails with an unknown reason.
+msgid "Error sending direct message."
+msgstr "Errorea zuzeneko mezua bidaltzean."
+
+#. TRANS: Message given having repeated a notice from another user.
+#. TRANS: %s is the name of the user for which the notice was repeated.
+#, php-format
+msgid "Notice from %s repeated."
+msgstr "%s(r)en oharra errepikatua."
+
+#. TRANS: Message given if content of a notice for a reply is too long. %1$d is used for plural.
+#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
+#, php-format
+msgid "Notice too long - maximum is %1$d character, you sent %2$d."
+msgid_plural "Notice too long - maximum is %1$d characters, you sent %2$d."
+msgstr[0] ""
+"Ohar luzeegia - gehieneko muga karaktere %1$d da, zuk %2$d bidali dituzu."
+msgstr[1] ""
+"Ohar luzeegia - gehieneko muga %1$d karaktere dira, zuk %2$d bidali dituzu."
+
+#. TRANS: Text shown having sent a reply to a notice successfully.
+#. TRANS: %s is the nickname of the user of the notice the reply was sent to.
+#, php-format
+msgid "Reply to %s sent."
+msgstr "%s(r)i erantzuna bidalia."
+
+#. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
+msgid "Error saving notice."
+msgstr "Oharra gordetzen errorea."
+
+#. TRANS: Error text shown when no username was provided when issuing a subscribe command.
+msgid "Specify the name of the user to subscribe to."
+msgstr "Harpidetu nahi duzun erabiltzailearen izena zehaztu."
+
+#. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
+msgid "Can't subscribe to OMB profiles by command."
+msgstr "Ezin da OMB profiletara komando bidez harpidetu."
+
+#. TRANS: Text shown after having subscribed to another user successfully.
+#. TRANS: %s is the name of the user the subscription was requested for.
+#, php-format
+msgid "Subscribed to %s."
+msgstr "%s(r)en kontura harpidetuta."
+
+#. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
+#. TRANS: Error text shown when no username was provided when issuing the command.
+msgid "Specify the name of the user to unsubscribe from."
+msgstr "Harpidetza eten nahi duzun erabiltzailearen izena zehaztu."
+
+#. TRANS: Text shown after having unsubscribed from another user successfully.
+#. TRANS: %s is the name of the user the unsubscription was requested for.
+#, php-format
+msgid "Unsubscribed from %s."
+msgstr "%s(r)en kontuaren harpidetza eten da."
+
+#. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
+#. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
+msgid "Command not yet implemented."
+msgstr "Komandoa inplementatu gabe oraindik."
+
+#. TRANS: Text shown when issuing the command "off" successfully.
+msgid "Notification off."
+msgstr "Jakinarazpena ezgaitua."
+
+#. TRANS: Error text shown when the command "off" fails for an unknown reason.
+msgid "Can't turn off notification."
+msgstr "Ezin da jakinarazpena ezgaitu."
+
+#. TRANS: Text shown when issuing the command "on" successfully.
+msgid "Notification on."
+msgstr "Jakinarazpena gaituta."
+
+#. TRANS: Error text shown when the command "on" fails for an unknown reason.
+msgid "Can't turn on notification."
+msgstr "Ezin da jakinarazpena gaitu."
+
+#. TRANS: Error text shown when issuing the login command while login is disabled.
+msgid "Login command is disabled."
+msgstr "Saio-hasiera komandoa ezgaituta."
+
+#. TRANS: Text shown after issuing the login command successfully.
+#. TRANS: %s is a logon link..
+#, php-format
+msgid "This link is useable only once and is valid for only 2 minutes: %s."
+msgstr ""
+"Esteka hau behin bakarrik erabili liteke eta 2 minutuz soilik egongo da "
+"erabilgarri: %s."
+
+#. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
+#. TRANS: %s is the name of the user the unsubscription was requested for.
+#, php-format
+msgid "Unsubscribed %s."
+msgstr "%s erabiltzailearen harpidetza eten da."
+
+#. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
+msgid "You are not subscribed to anyone."
+msgstr "Ez zaude inora harpidetuta."
+
+#. TRANS: Text shown after requesting other users a user is subscribed to.
+#. TRANS: This message supports plural forms. This message is followed by a
+#. TRANS: hard coded space and a comma separated list of subscribed users.
+msgid "You are subscribed to this person:"
+msgid_plural "You are subscribed to these people:"
+msgstr[0] "Pertsona honetara harpidetuta zaude:"
+msgstr[1] "Pertsona hauetara harpidetuta zaude:"
+
+#. TRANS: Text shown after requesting other users that are subscribed to a user
+#. TRANS: (followers) without having any subscribers.
+msgid "No one is subscribed to you."
+msgstr "Inor ez dago zuri harpidetuta."
+
+#. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
+#. TRANS: This message supports plural forms. This message is followed by a
+#. TRANS: hard coded space and a comma separated list of subscribing users.
+msgid "This person is subscribed to you:"
+msgid_plural "These people are subscribed to you:"
+msgstr[0] "Pertsona hau zuri harpidetuta dago:"
+msgstr[1] "Pertsona hauek zuri harpidetuta daude:"
+
+#. TRANS: Text shown after requesting groups a user is subscribed to without having
+#. TRANS: any group subscriptions.
+msgid "You are not a member of any groups."
+msgstr "Ez zara inongo taldeko kide."
+
+#. TRANS: Text shown after requesting groups a user is subscribed to.
+#. TRANS: This message supports plural forms. This message is followed by a
+#. TRANS: hard coded space and a comma separated list of subscribed groups.
+msgid "You are a member of this group:"
+msgid_plural "You are a member of these groups:"
+msgstr[0] "Talde honetako kide zara:"
+msgstr[1] "Talde hauetako kide zara:"
+
+#. TRANS: Header line of help text for commands.
+msgctxt "COMMANDHELP"
+msgid "Commands:"
+msgstr "Komandoak:"
+
+#. TRANS: Help message for IM/SMS command "on".
+msgctxt "COMMANDHELP"
+msgid "turn on notifications"
+msgstr "gaitu jakinarazpenak"
+
+#. TRANS: Help message for IM/SMS command "off".
+msgctxt "COMMANDHELP"
+msgid "turn off notifications"
+msgstr "desgaitu jakinarazpenak"
+
+#. TRANS: Help message for IM/SMS command "help".
+msgctxt "COMMANDHELP"
+msgid "show this help"
+msgstr "laguntza hau erakutsi"
+
+#. TRANS: Help message for IM/SMS command "follow <nickname>".
+msgctxt "COMMANDHELP"
+msgid "subscribe to user"
+msgstr "erabiltzaile batera harpidetu"
+
+#. TRANS: Help message for IM/SMS command "groups".
+msgctxt "COMMANDHELP"
+msgid "lists the groups you have joined"
+msgstr "zein talderekin elkartu zaren zerrendatzen du"
+
+#. TRANS: Help message for IM/SMS command "tag".
+msgctxt "COMMANDHELP"
+msgid "tag a user"
+msgstr "erabiltzailea etiketatu"
+
+#. TRANS: Help message for IM/SMS command "untag".
+msgctxt "COMMANDHELP"
+msgid "untag a user"
+msgstr "erabiltzaile bati etiketa kendu"
+
+#. TRANS: Help message for IM/SMS command "subscriptions".
+msgctxt "COMMANDHELP"
+msgid "list the people you follow"
+msgstr "jarraitzen duzun jendea zerrendatu"
+
+#. TRANS: Help message for IM/SMS command "subscribers".
+msgctxt "COMMANDHELP"
+msgid "list the people that follow you"
+msgstr "jarraitzen zaituen jendea zerrendatu"
+
+#. TRANS: Help message for IM/SMS command "leave <nickname>".
+msgctxt "COMMANDHELP"
+msgid "unsubscribe from user"
+msgstr "erabiltzaile baten harpidetza eten"
+
+#. TRANS: Help message for IM/SMS command "d <nickname> <text>".
+msgctxt "COMMANDHELP"
+msgid "direct message to user"
+msgstr "erabiltzaileari mezu zuzena"
+
+#. TRANS: Help message for IM/SMS command "get <nickname>".
+msgctxt "COMMANDHELP"
+msgid "get last notice from user"
+msgstr "erabiltzailearen azken oharra jaso"
+
+#. TRANS: Help message for IM/SMS command "whois <nickname>".
+msgctxt "COMMANDHELP"
+msgid "get profile info on user"
+msgstr "erabiltzailearen profileko infoa jaso"
+
+#. TRANS: Help message for IM/SMS command "lose <nickname>".
+msgctxt "COMMANDHELP"
+msgid "force user to stop following you"
+msgstr "behartu erabiltzaileak zu jarraitzeari utz diezaion"
+
+#. TRANS: Help message for IM/SMS command "fav <nickname>".
+msgctxt "COMMANDHELP"
+msgid "add user's last notice as a 'fave'"
+msgstr "gehitu erabiltzailearen azken oharra 'gogoko' gisa"
+
+#. TRANS: Help message for IM/SMS command "fav #<notice_id>".
+msgctxt "COMMANDHELP"
+msgid "add notice with the given id as a 'fave'"
+msgstr "emandako id-a duen oharra 'gogoko' gisa gehitu"
+
+#. TRANS: Help message for IM/SMS command "repeat #<notice_id>".
+msgctxt "COMMANDHELP"
+msgid "repeat a notice with a given id"
+msgstr "errepikatu emandako id-a duen oharra"
+
+#. TRANS: Help message for IM/SMS command "repeat <nickname>".
+msgctxt "COMMANDHELP"
+msgid "repeat the last notice from user"
+msgstr "errepikatu erabiltzailearen azken oharra"
+
+#. TRANS: Help message for IM/SMS command "reply #<notice_id>".
+msgctxt "COMMANDHELP"
+msgid "reply to notice with a given id"
+msgstr "erantzun emandako id-a duen oharrari"
+
+#. TRANS: Help message for IM/SMS command "reply <nickname>".
+msgctxt "COMMANDHELP"
+msgid "reply to the last notice from user"
+msgstr "erantzun erabiltzailearen azken oharrari"
+
+#. TRANS: Help message for IM/SMS command "join <group>".
+msgctxt "COMMANDHELP"
+msgid "join group"
+msgstr "elkartu taldearekin"
+
+#. TRANS: Help message for IM/SMS command "login".
+msgctxt "COMMANDHELP"
+msgid "Get a link to login to the web interface"
+msgstr "Lortu saioa hasteko esteka bat web-interfazetik"
+
+#. TRANS: Help message for IM/SMS command "drop <group>".
+msgctxt "COMMANDHELP"
+msgid "leave group"
+msgstr "utzi taldea"
+
+#. TRANS: Help message for IM/SMS command "stats".
+msgctxt "COMMANDHELP"
+msgid "get your stats"
+msgstr "eskuratu zure estatistikak"
+
+#. TRANS: Help message for IM/SMS command "stop".
+#. TRANS: Help message for IM/SMS command "quit".
+msgctxt "COMMANDHELP"
+msgid "same as 'off'"
+msgstr "'off' aginduan bezala"
+
+#. TRANS: Help message for IM/SMS command "sub <nickname>".
+msgctxt "COMMANDHELP"
+msgid "same as 'follow'"
+msgstr "'follow' aginduan bezala"
+
+#. TRANS: Help message for IM/SMS command "unsub <nickname>".
+msgctxt "COMMANDHELP"
+msgid "same as 'leave'"
+msgstr "'leave' aginduan bezala"
+
+#. TRANS: Help message for IM/SMS command "last <nickname>".
+msgctxt "COMMANDHELP"
+msgid "same as 'get'"
+msgstr "'get' aginduan bezala"
+
+#. TRANS: Help message for IM/SMS command "on <nickname>".
+#. TRANS: Help message for IM/SMS command "off <nickname>".
+#. TRANS: Help message for IM/SMS command "invite <phone number>".
+#. TRANS: Help message for IM/SMS command "track <word>".
+#. TRANS: Help message for IM/SMS command "untrack <word>".
+#. TRANS: Help message for IM/SMS command "track off".
+#. TRANS: Help message for IM/SMS command "untrack all".
+#. TRANS: Help message for IM/SMS command "tracks".
+#. TRANS: Help message for IM/SMS command "tracking".
+msgctxt "COMMANDHELP"
+msgid "not yet implemented."
+msgstr "oraindik inplementatu gabe."
+
+#. TRANS: Help message for IM/SMS command "nudge <nickname>".
+msgctxt "COMMANDHELP"
+msgid "remind a user to update."
+msgstr "gogorarazi erabiltzaile bati eguneratu behar duela."
+
+#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
+msgid "No configuration file found."
+msgstr "Ez da konfigurazio-fitxategirik aurkitu."
+
+#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
+#. TRANS: Is followed by a list of directories (separated by HTML breaks).
+msgid "I looked for configuration files in the following places:"
+msgstr "Konfigurazio-fitxategiak hurrengo tokietan bilatu ditut:"
+
+#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
+msgid "You may wish to run the installer to fix this."
+msgstr "Instalatzailea exekuta zenezake arazo hau konpontzeko."
+
+#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
+#. TRANS: The text is link text that leads to the installer page.
+msgid "Go to the installer."
+msgstr "Joan instalatzailera."
+
+#. TRANS: Header on conversation page. Hidden by default (h2).
+#. TRANS: Label for user statistics.
+msgid "Notices"
+msgstr "Oharrak"
+
+#. TRANS: Page title for when a database error occurs.
+msgid "Database error"
+msgstr "Errorea datu-basean"
+
+#. TRANS: Menu item in default local navigation panel.
+#. TRANS: Menu item in search group navigation panel.
+msgctxt "MENU"
+msgid "Public"
+msgstr "Publikoa"
+
+#. TRANS: Menu item in default local navigation panel.
+#. TRANS: Menu item title in local navigation menu.
+msgctxt "MENU"
+msgid "Lists"
+msgstr "Zerrendak"
+
+#. TRANS: Title of form for deleting a user.
+#. TRANS: Link text in notice list item to delete a notice.
+msgid "Delete"
+msgstr "Ezabatu"
+
+#. TRANS: Description of form for deleting a user.
+msgid "Delete this user"
+msgstr "Ezabatu erabiltzaile hau"
+
+#. TRANS: Exception. %s is an ID.
+#, php-format
+msgid "Unable to find services for %s."
+msgstr "Ezin izan dira %s(r)ako zerbitzuak aurkitu."
+
+#. TRANS: Form legend for removing the favourite status for a favourite notice.
+msgid "Disfavor this notice"
+msgstr "Gaitzetsi ohar hau"
+
+#. TRANS: Button text for removing the favourite status for a favourite notice.
+msgctxt "BUTTON"
+msgid "Disfavor favorite"
+msgstr "Gaitzetsi gogokoa"
+
+#. TRANS: Button title for removing the favourite status for a favourite notice.
+msgid "Remove this notice from your list of favorite notices."
+msgstr "Ezabatu ohar hau zure gogoko oharretatik."
+
+#. TRANS: Form legend for adding the favourite status to a notice.
+msgid "Favor this notice"
+msgstr "Onetsi ohar hau"
+
+#. TRANS: Button text for adding the favourite status to a notice.
+msgctxt "BUTTON"
+msgid "Favor"
+msgstr "Onetsi"
+
+#. TRANS: Button title for adding the favourite status to a notice.
+msgid "Add this notice to your list of favorite notices."
+msgstr "Gehitu ohar hau zure gogoko oharren zerrendara."
+
+#. TRANS: Feed type name.
+msgid "RSS 1.0"
+msgstr "RSS 1.0"
+
+#. TRANS: Feed type name.
+msgid "RSS 2.0"
+msgstr "RSS 2.0"
+
+#. TRANS: Feed type name.
+msgid "Atom"
+msgstr "Atom"
+
+#. TRANS: Feed type name. FOAF stands for Friend of a Friend.
+msgid "FOAF"
+msgstr "FOAF"
+
+#. TRANS: Feed type name. See http://activitystrea.ms/
+msgid "Activity Streams"
+msgstr "Activity Streams"
+
+#. TRANS: Client exception thrown when an imported feed does not have an author.
+msgid "No author in the feed."
+msgstr "Ez dago egilerik jarioan."
+
+#. TRANS: Client exception thrown when an imported feed does not have an author that
+#. TRANS: can be associated with a user.
+msgid "Cannot import without a user."
+msgstr "Ezin da inportatu erabiltzaile bat ez badago."
+
+#. TRANS: Header for feed links (h2).
+msgid "Feeds"
+msgstr "Jarioak"
+
+#. TRANS: List element on gallery action page to show all tags.
+msgctxt "TAGS"
+msgid "All"
+msgstr "Guztiak"
+
+#. TRANS: Dropdown field label on gallery action page for a list containing tags.
+msgid "Tag"
+msgstr "Etiketa"
+
+#. TRANS: Dropdown field title on gallery action page for a list containing tags.
+msgid "Choose a tag to narrow list."
+msgstr "Hautatu etiketa bat zerrenda mugatzeko."
+
+#. TRANS: Description on form for granting a role.
+#, php-format
+msgid "Grant this user the \"%s\" role"
+msgstr "Eman \"%s\" rola erabiltzaile honi"
+
+#. TRANS: Header for mini list of group members on a group page (h2).
+msgid "Members"
+msgstr "Kideak"
+
+#. TRANS: Link to all group members from mini list of group members if group has more than n members.
+msgid "All members"
+msgstr "Kide guztiak"
+
+#. TRANS: Header for mini list of users with a pending membership request on a group page (h2).
+msgid "Pending"
+msgstr "Erabakitzeke"
+
+#. TRANS: Header for mini list of users that are blocked in a group page (h2).
+msgid "Blocked"
+msgstr "Blokeatuta"
+
+#. TRANS: Title for list of group administrators on a group page.
+msgctxt "TITLE"
+msgid "Admins"
+msgstr "Administratzaileak"
+
+#. TRANS: Button text for the form that will block a user from a group.
+msgctxt "BUTTON"
+msgid "Block"
+msgstr "Blokeatu"
+
+#. TRANS: Submit button title.
+msgctxt "TOOLTIP"
+msgid "Block this user so that they can no longer post messages to it."
+msgstr "Blokeatu erabiltzaile hau mezu gehiago bidali ez diezaioten."
+
+#. TRANS: Field title on group edit form.
+msgid "URL of the homepage or blog of the group or topic."
+msgstr "Taldearen edo gaiaren orri nagusiaren edo blogaren URLa."
+
+#. TRANS: Text area title for group description when there is no text limit.
+msgid "Describe the group or topic."
+msgstr "Deskribatu taldea edo gaia."
+
+#. TRANS: Text area title for group description.
+#. TRANS: %d is the number of characters available for the description.
+#, php-format
+msgid "Describe the group or topic in %d character or less."
+msgid_plural "Describe the group or topic in %d characters or less."
+msgstr[0] "Deskribatu taldea edo gaia karaktere %d edo gutxiago erabiliz."
+msgstr[1] "Deskribatu taldea edo gaia %d karaktere edo gutxiago erabiliz."
+
+#. TRANS: Field title on group edit form.
+msgid ""
+"Location for the group, if any, like \"City, State (or Region), Country\"."
+msgstr ""
+"Taldearen kokapena, existitzen bada, esaterako \"Herria, Eskualdea, "
+"Herrialdea\"."
+
+#. TRANS: Field label on group edit form.
+msgid "Aliases"
+msgstr "Aliasak"
+
+#. TRANS: Input field title for group aliases.
+#. TRANS: %d is the maximum number of group aliases available.
+#, php-format
+msgid ""
+"Extra nicknames for the group, separated with commas or spaces. Maximum %d "
+"alias allowed."
+msgid_plural ""
+"Extra nicknames for the group, separated with commas or spaces. Maximum %d "
+"aliases allowed."
+msgstr[0] ""
+"Ezizen gehigarriak talderako, komaz edo zuriunez bananduta. Gehienez alias %"
+"d onartzen da."
+msgstr[1] ""
+"Ezizen gehigarriak talderako, komaz edo zuriunez bananduta. Gehienez %d "
+"alias onartzen dira."
+
+#. TRANS: Checkbox field title on group edit form to mark a group private.
+msgid ""
+"New members must be approved by admin and all posts are forced to be private."
+msgstr ""
+"Kide berriek administratzailearen onarpena behar dute eta mezu guztiak "
+"pribatu izatera behartuko dira."
+
+#. TRANS: Indicator in group members list that this user is a group administrator.
+msgctxt "GROUPADMIN"
+msgid "Admin"
+msgstr "Admin"
+
+#. TRANS: Group actions header (h2). Text hidden by default.
+msgid "Group actions"
+msgstr "Talde-ekintzak"
+
+#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
+#. TRANS: %s is the nickname of the group.
+#, php-format
+msgctxt "TOOLTIP"
+msgid "Edit %s group properties"
+msgstr "Editatu %s taldearen ezaugarriak"
+
+#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
+#. TRANS: %s is the nickname of the group.
+#, php-format
+msgctxt "TOOLTIP"
+msgid "Add or edit %s logo"
+msgstr "Gehitu edo aldatu %s(r)en logoa"
+
+#. TRANS: Link text for link on user profile.
+msgctxt "MENU"
+msgid "Logo"
+msgstr "Logotipoa"
+
+#. TRANS: Title for groups with the most members section.
+msgid "Popular groups"
+msgstr "Talde ospetsuak"
+
+#. TRANS: Title for groups with the most posts section.
+msgid "Active groups"
+msgstr "Talde aktiboak"
+
+#. TRANS: Link description for seeing all groups.
+#. TRANS: Link description for seeing all lists.
+msgid "See all"
+msgstr "Erakutsi dena"
+
+#. TRANS: Link title for seeing all groups.
+msgid "See all groups you belong to."
+msgstr "Partaide zaren taldeak ikusi."
+
+#. TRANS: Menu item title in personal group navigation menu.
+#. TRANS: %s is a username.
+msgid "Back to top"
+msgstr "Itzuli gora"
+
+#. TRANS: Client exception 406
+msgid "This page is not available in a media type you accept"
+msgstr "Orri hau ez dago eskuragarri zuk onartutako multimedia-motetan."
+
+#. TRANS: Exception thrown when trying to upload an unsupported image file format.
+msgid "Unsupported image file format."
+msgstr "Onartuta ez dagoen irudien fitxategi-formatua."
+
+#. TRANS: Exception thrown when too large a file is uploaded.
+#. TRANS: %s is the maximum file size, for example "500b", "10kB" or "2MB".
+#, php-format
+msgid "That file is too big. The maximum file size is %s."
+msgstr "Fitxategi hori handiegia da. Fitxategiaren gehieneko tamaina %s da."
+
+#. TRANS: Exception thrown when uploading an image and that action could not be completed.
+msgid "Partial upload."
+msgstr "Igotze partziala."
+
+#. TRANS: Exception thrown when uploading a file as image that is not an image or is a corrupt file.
+msgid "Not an image or corrupt file."
+msgstr "Ez da irudia edo fitxategia hondatuta dago."
+
+#. TRANS: Exception thrown during resize when image has been registered as present, but is no longer there.
+msgid "Lost our file."
+msgstr "Galdu egin dugu gure fitxategia."
+
+#. TRANS: Exception thrown when trying to resize an unknown file type.
+#. TRANS: Exception thrown when trying resize an unknown file type.
+msgid "Unknown file type"
+msgstr "Fitxategi-mota ezezaguna"
+
+#. TRANS: Number of megabytes. %d is the number.
+#, php-format
+msgid "%dMB"
+msgid_plural "%dMB"
+msgstr[0] "%dMB"
+msgstr[1] "%dMB"
+
+#. TRANS: Number of kilobytes. %d is the number.
+#, php-format
+msgid "%dkB"
+msgid_plural "%dkB"
+msgstr[0] "%dkB"
+msgstr[1] "%dkB"
+
+#. TRANS: Number of bytes. %d is the number.
+#, php-format
+msgid "%dB"
+msgid_plural "%dB"
+msgstr[0] "%dB"
+msgstr[1] "%dB"
+
+#. TRANS: Body text for confirmation code e-mail.
+#. TRANS: %1$s is a user nickname, %2$s is the StatusNet sitename,
+#. TRANS: %3$s is the display name of an IM plugin.
+#, php-format
+msgid ""
+"User \"%1$s\" on %2$s has said that your %3$s screenname belongs to them. If "
+"that is true, you can confirm by clicking on this URL: %4$s . (If you cannot "
+"click it, copy-and-paste it into the address bar of your browser). If that "
+"user is not you, or if you did not request this confirmation, just ignore "
+"this message."
+msgstr ""
+"%2$s guneko %1$s erabiltzaileak %3$s izena berea dela dio. Egia bada, URL "
+"honetan klik eginda baiezta dezakezu: %4$s . (Ezin baduzu klik egin, kopiatu "
+"eta zure nabigatzailearen helbide barran itsatsi).  Erailtzaile hori zu ez "
+"bazara, edo ez baduzu baieztapen-eskaririk egin, ez egin jaramonik mezu honi."
+
+#. TRANS: Exception thrown when trying to deliver a notice to an unknown inbox.
+#. TRANS: %d is the unknown inbox ID (number).
+#, php-format
+msgid "Unknown inbox source %d."
+msgstr "Sarrera ontziko jatorri ezezaguna %d."
+
+#. TRANS: Server exception thrown trying to initialise an IM plugin without meeting all prerequisites.
+msgid "Queueing must be enabled to use IM plugins."
+msgstr "Ilarek gaituta egon behar dute IM pluginak erabili ahal izateko."
+
+#. TRANS: Server exception thrown trying to initialise an IM plugin without a transport method.
+msgid "Transport cannot be null."
+msgstr "Garraioak ezin du nulua izan."
+
+#. TRANS: Title for inbox tag cloud section.
+msgctxt "TITLE"
+msgid "Trends"
+msgstr "Joerak"
+
+#. TRANS: Default button text for inviting more users to the StatusNet instance.
+msgctxt "BUTTON"
+msgid "Invite more colleagues"
+msgstr "Gonbidatu lankide gehiago"
+
+#. TRANS: Form legend.
+msgid "Invite collegues"
+msgstr "Gonbidatu lankideak"
+
+#. TRANS: Field label for a list of e-mail addresses.
+msgid "Email addresses"
+msgstr "Posta-helbideak"
+
+#. TRANS: Field title for a list of e-mail addresses.
+msgid "Addresses of friends to invite (one per line)."
+msgstr "Gonbidatu nahi diren lagunen helbideak (bat lerroko)."
+
+#. TRANS: Field label for a personal message to send to invitees.
+msgid "Personal message"
+msgstr "Mezu pertsonala"
+
+#. TRANS: Field title for a personal message to send to invitees.
+msgid "Optionally add a personal message to the invitation."
+msgstr "Aukeran, gehitu mezu pertsonal bat gonbidapenari."
+
+#. TRANS: Send button for inviting friends
+#. TRANS: Button text for sending notice.
+msgctxt "BUTTON"
+msgid "Send"
+msgstr "Bidali"
+
+#. TRANS: Submit button title.
+msgid "Send invitations."
+msgstr "Bidali gonbidapenak."
+
+#. TRANS: Button text for joining a group.
+msgctxt "BUTTON"
+msgid "Join"
+msgstr "Elkartu"
+
+#. TRANS: Button text on form to leave a group.
+msgctxt "BUTTON"
+msgid "Leave"
+msgstr "Utzi"
+
+#. TRANS: Link title for seeing all lists.
+msgid "See all lists you have created."
+msgstr "Sortu dituzun zerrendak ikusi."
+
+#. TRANS: Menu item for logging in to the StatusNet site.
+#. TRANS: Menu item in primary navigation panel.
+msgctxt "MENU"
+msgid "Login"
+msgstr "Saioa hasi"
+
+#. TRANS: Title for menu item for logging in to the StatusNet site.
+msgid "Login with a username and password"
+msgstr "Hasi saioa erabiltzaile-izen eta pasahitz batekin"
+
+#. TRANS: Menu item for registering with the StatusNet site.
+msgctxt "MENU"
+msgid "Register"
+msgstr "Izena eman"
+
+#. TRANS: Title for menu item for registering with the StatusNet site.
+msgid "Sign up for a new account"
+msgstr "Eman izena kontu berri bat lortzeko"
+
+#. TRANS: Subject for address confirmation email.
+msgid "Email address confirmation"
+msgstr "Eposta helbidea berretsi"
+
+#. TRANS: Body for address confirmation email.
+#. TRANS: %1$s is the addressed user's nickname, %2$s is the StatusNet sitename,
+#. TRANS: %3$s is the URL to confirm at.
+#, php-format
+msgid ""
+"Hey, %1$s.\n"
+"\n"
+"Someone just entered this email address on %2$s.\n"
+"\n"
+"If it was you, and you want to confirm your entry, use the URL below:\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"If not, just ignore this message.\n"
+"\n"
+"Thanks for your time, \n"
+"%2$s\n"
+msgstr ""
+"Aizu, %1$s.\n"
+"\n"
+"Norbaitek posta-helbide hau sartu du %2$s(e)n.\n"
+"\n"
+"Zu izan bazara, eta zure sarrera baieztatu nahi baduzu, erabili beheko "
+"URLa:\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"Bestela, ez egin jaramonik mezu honi.\n"
+"\n"
+"Mila esker zure arretagatik, \n"
+"%2$s\n"
+
+#. TRANS: Subject of new-subscriber notification e-mail.
+#. TRANS: %1$s is the subscribing user's nickname, %2$s is the StatusNet sitename.
+#. TRANS: Main body of new-subscriber notification e-mail.
+#. TRANS: %1$s is the subscriber's long name, %2$s is the StatusNet sitename.
+#, php-format
+msgid "%1$s is now following you on %2$s."
+msgstr "%1$s(e)k %2$s(e)n jarraitzen zaitu orain."
+
+#. TRANS: Subject of pending new-subscriber notification e-mail.
+#. TRANS: %1$s is the subscribing user's nickname, %2$s is the StatusNet sitename.
+#, php-format
+msgid "%1$s would like to listen to your notices on %2$s."
+msgstr "%1$s(e)k zure oharrak jarraitu nahiko lituzke %2$s(e)n."
+
+#. TRANS: Main body of pending new-subscriber notification e-mail.
+#. TRANS: %1$s is the subscriber's long name, %2$s is the StatusNet sitename.
+#, php-format
+msgid ""
+"%1$s would like to listen to your notices on %2$s. You may approve or reject "
+"their subscription at %3$s"
+msgstr ""
+"%1$s(e)k zure oharrak jarraitu nahiko lituzke %2$s(e)n. Bere harpidetza "
+"onartu edo baztertu dezakezu hemen: %3$s"
+
+#. TRANS: Common footer block for StatusNet notification emails.
+#. TRANS: %1$s is the StatusNet sitename,
+#. TRANS: %2$s is a link to the addressed user's e-mail settings.
+#, php-format
+msgid ""
+"Faithfully yours,\n"
+"%1$s.\n"
+"\n"
+"----\n"
+"Change your email address or notification options at %2$s"
+msgstr ""
+"Jaso agur bero bat,\n"
+"%1$s.\n"
+"\n"
+"----\n"
+"\n"
+"Aldatu zure posta-helbidea edo jakinarazpen-aukerak hemen: %2$s"
+
+#. TRANS: Profile info line in notification e-mail.
+#. TRANS: %s is a URL.
+#, php-format
+msgid "Profile: %s"
+msgstr "Profila: %s"
+
+#. TRANS: Profile info line in notification e-mail.
+#. TRANS: %s is biographical information.
+#, php-format
+msgid "Bio: %s"
+msgstr "Biografia: %s"
+
+#. TRANS: This is a paragraph in a new-subscriber e-mail.
+#. TRANS: %s is a URL where the subscriber can be reported as abusive.
+#, php-format
+msgid ""
+"If you believe this account is being used abusively, you can block them from "
+"your subscribers list and report as spam to site administrators at %s."
+msgstr ""
+"Kontu hau era iraingarri edo desegokian erabiltzen dela uste baduzu, zure "
+"harpidedunetatik blokeatu dezakezu eta %s guneko administratzaileei spam "
+"gisa salatu."
+
+#. TRANS: Subject of notification mail for new posting email address.
+#. TRANS: %s is the StatusNet sitename.
+#, php-format
+msgid "New email address for posting to %s"
+msgstr "%s(e)ra mezua bidaltzeko posta-helbide berria"
+
+#. TRANS: Body of notification mail for new posting email address.
+#. TRANS: %1$s is the StatusNet sitename, %2$s is the e-mail address to send
+#. TRANS: to to post by e-mail, %3$s is a URL to more instructions.
+#, 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."
+msgstr ""
+"%1$s(e)n idazteko posta-helbide berria duzu.\n"
+"\n"
+"Bidali mezuak %2$s helbidera mezu berriak idazteko.\n"
+"\n"
+"Posta elektronikoaren azalpen gehiagorako, begiratu %3$s."
+
+#. TRANS: Subject line for SMS-by-email notification messages.
+#. TRANS: %s is the posting user's nickname.
+#, php-format
+msgid "%s status"
+msgstr "%s(en) egoera"
+
+#. TRANS: Subject line for SMS-by-email address confirmation message.
+msgid "SMS confirmation"
+msgstr "SMS berrespena"
+
+#. TRANS: Main body heading for SMS-by-email address confirmation message.
+#. TRANS: %s is the addressed user's nickname.
+#, php-format
+msgid "%s: confirm you own this phone number with this code:"
+msgstr "%s: berretsi telefono hau zurea dela kode honekin:"
+
+#. TRANS: Subject for 'nudge' notification email.
+#. TRANS: %s is the nudging user.
+#, php-format
+msgid "You have been nudged by %s"
+msgstr "%s(e)k zirikatu zaitu"
+
+#. TRANS: Body for 'nudge' notification email.
+#. TRANS: %1$s is the nuding user's long name, $2$s is the nudging user's nickname,
+#. TRANS: %3$s is a URL to post notices at.
+#, php-format
+msgid ""
+"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
+"to post some news.\n"
+"\n"
+"So let's hear from you :)\n"
+"\n"
+"%3$s\n"
+"\n"
+"Don't reply to this email; it won't get to them."
+msgstr ""
+"%1$s (%2$s) azkenaldian zer ote zabiltzan pentsatzen dabil eta zerbait "
+"idaztera gonbidatu zaitu.\n"
+"\n"
+"Botaiozu zerbait ba! :)\n"
+"\n"
+"%3$s\n"
+"\n"
+"Ez erantzun mezu honi; ez da inora iritsiko eta."
+
+#. TRANS: Subject for direct-message notification email.
+#. TRANS: %s is the sending user's nickname.
+#, php-format
+msgid "New private message from %s"
+msgstr "%s(r)en mezu pribatu berria"
+
+#. TRANS: Body for direct-message notification email.
+#. TRANS: %1$s is the sending user's long name, %2$s is the sending user's nickname,
+#. TRANS: %3$s is the message content, %4$s a URL to the message,
+#, php-format
+msgid ""
+"%1$s (%2$s) sent you a private message:\n"
+"\n"
+"------------------------------------------------------\n"
+"%3$s\n"
+"------------------------------------------------------\n"
+"\n"
+"You can reply to their message here:\n"
+"\n"
+"%4$s\n"
+"\n"
+"Don't reply to this email; it won't get to them."
+msgstr ""
+"%1$s(e)k (%2$s) mezu pribatu bat bidali dizu:\n"
+"\n"
+"------------------------------------------------------\n"
+"%3$s\n"
+"------------------------------------------------------\n"
+"\n"
+"Hemen erantzun diezaiokezu bere mezuari:\n"
+"\n"
+"%4$s\n"
+"\n"
+"Ez erantzun mezu honi; ez da inora iritsiko eta."
+
+#. TRANS: Subject for favorite notification e-mail.
+#. TRANS: %1$s is the adding user's long name, %2$s is the adding user's nickname.
+#, php-format
+msgid "%1$s (@%2$s) added your notice as a favorite"
+msgstr "%1$s(e)k (@%2$s) zure ohar bat gogoko gisa gehitu du"
+
+#. TRANS: Body for favorite notification e-mail.
+#. TRANS: %1$s is the adding user's long name, $2$s is the date the notice was created,
+#. TRANS: %3$s is a URL to the faved notice, %4$s is the faved notice text,
+#. TRANS: %5$s is a URL to all faves of the adding user, %6$s is the StatusNet sitename,
+#. TRANS: %7$s is the adding user's nickname.
+#, php-format
+msgid ""
+"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
+"\n"
+"The URL of your notice is:\n"
+"\n"
+"%3$s\n"
+"\n"
+"The text of your notice is:\n"
+"\n"
+"%4$s\n"
+"\n"
+"You can see the list of %1$s's favorites here:\n"
+"\n"
+"%5$s"
+msgstr ""
+"%1$s(e)k (@%7$s) %2$s data duen zure oharra gogoko gisa gehitu du.\n"
+"\n"
+"Zure oharraren URLa:\n"
+"\n"
+"%3$s\n"
+"\n"
+"Zure oharraren testua:\n"
+"\n"
+"%4$s\n"
+"\n"
+"%1$s(e)n gogokoen zerrenda hemen ikus dezakezu:\n"
+"\n"
+"%5$s"
+
+#. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
+#, php-format
+msgid ""
+"The full conversation can be read here:\n"
+"\n"
+"\t%s"
+msgstr ""
+"Elkarrizketa osoa hemen irakur daiteke:\n"
+"\n"
+"\t %s"
+
+#. TRANS: E-mail subject for notice notification.
+#. TRANS: %1$s is the sending user's long name, %2$s is the adding user's nickname.
+#, php-format
+msgid "%1$s (@%2$s) sent a notice to your attention"
+msgstr "%1$s(e)k (@%2$s) ohar bat bidali dizu"
+
+#. TRANS: Body of @-reply notification e-mail.
+#. TRANS: %1$s is the sending user's name, $2$s is the StatusNet sitename,
+#. TRANS: %3$s is a URL to the notice, %4$s is the notice text,
+#. TRANS: %5$s is the text "The full conversation can be read here:" and a URL to the full conversion if it exists (otherwise empty),
+#. TRANS: %6$s is a URL to reply to the notice, %7$s is a URL to all @-replies for the addressed user,
+#, php-format
+msgid ""
+"%1$s just sent a notice to your attention (an '@-reply') on %2$s.\n"
+"\n"
+"The notice is here:\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"It reads:\n"
+"\n"
+"\t%4$s\n"
+"\n"
+"%5$sYou can reply back here:\n"
+"\n"
+"\t%6$s\n"
+"\n"
+"The list of all @-replies for you here:\n"
+"\n"
+"%7$s"
+msgstr ""
+"%1$s(e)k (@%2$s) ohar bat bidali dizu ('@-erantzun' bat) %2$s(e)n.\n"
+"\n"
+"Oharra helbide honetan dago:\n"
+"\n"
+"\t %3$s\n"
+"\n"
+"Honela dio:\n"
+"\n"
+"\t %4$s\n"
+"\n"
+"%5$sHemen erantzun dezakezu:\n"
+"\n"
+"\t %6$s\n"
+"\n"
+"Zuretzako diren @-erantzunen zerrenda:\n"
+"\n"
+"%7$s"
+
+#. TRANS: Subject of group join notification e-mail.
+#. TRANS: %1$s is the joining user's nickname, %2$s is the group name, and %3$s is the StatusNet sitename.
+#, php-format
+msgid "%1$s has joined your group %2$s on %3$s"
+msgstr "%1$s zure %2$s taldearekin elkartu da %3$s(e)n."
+
+#. TRANS: Main body of group join notification e-mail.
+#. TRANS: %1$s is the subscriber's long name, %2$s is the group name, and %3$s is the StatusNet sitename,
+#. TRANS: %4$s is a block of profile info about the subscriber.
+#. TRANS: %5$s is a link to the addressed user's e-mail settings.
+#, php-format
+msgid "%1$s has joined your group %2$s on %3$s."
+msgstr "%1$s zure %2$s taldearekin elkartu da %3$s(e)n."
+
+#. TRANS: Subject of pending group join request notification e-mail.
+#. TRANS: %1$s is the joining user's nickname, %2$s is the group name, and %3$s is the StatusNet sitename.
+#, php-format
+msgid "%1$s wants to join your group %2$s on %3$s."
+msgstr "%1$s(e)k zure %2$s taldearekin elkartu nahi du %3$s(e)n."
+
+#. TRANS: Main body of pending group join request notification e-mail.
+#. TRANS: %1$s is the subscriber's long name, %2$s is the group name, and %3$s is the StatusNet sitename,
+#. TRANS: %4$s is the URL to the moderation queue page.
+#, php-format
+msgid ""
+"%1$s would like to join your group %2$s on %3$s. You may approve or reject "
+"their group membership at %4$s"
+msgstr ""
+"%1$s(e)k zure %2$s taldearekin elkartu nahi du %3$s(e)n. Taldean onartu edo "
+"bertatik baztertu dezakezu hemen: %4$s"
+
+#. TRANS: Client error displayed when trying to access a mailbox that is not of the logged in user.
+msgid "Only the user can read their own mailboxes."
+msgstr "Erabiltzaileak soilik irakur ditzake bere postontziak."
+
+#. TRANS: Message displayed when there are no private messages in the inbox of a user.
+msgid ""
+"You have no private messages. You can send private message to engage other "
+"users in conversation. People can send you messages for your eyes only."
+msgstr ""
+"Ez duzu mezu pribaturik. Mezu pribatuak bidal ditzakezu beste "
+"erabiltzaileekin solasean aritzeko. Zuk soilik ikus ditzakezun mezuak bidali "
+"diezazkizuke jendeak."
+
+#. TRANS: Menu item in mailbox menu. Leads to incoming private messages.
+msgctxt "MENU"
+msgid "Inbox"
+msgstr "Sarrera-ontzia"
+
+#. TRANS: Menu item title in mailbox menu. Leads to incoming private messages.
+msgid "Your incoming messages."
+msgstr "Jaso dituzun mezuak."
+
+#. TRANS: Menu item in mailbox menu. Leads to outgoing private messages.
+msgctxt "MENU"
+msgid "Outbox"
+msgstr "Bidalitakoak"
+
+#. TRANS: Menu item title in mailbox menu. Leads to outgoing private messages.
+msgid "Your sent messages."
+msgstr "Bidali dituzun mezuak."
+
+#. TRANS: Error message in incoming mail handler used when an incoming e-mail cannot be processed.
+msgid "Could not parse message."
+msgstr "Ezin izan da mezua analizatu."
+
+#. TRANS: Error message in incoming mail handler used when an incoming e-mail is not from a registered user.
+msgid "Not a registered user."
+msgstr "Izenik eman gabeko erabiltzailea."
+
+#. TRANS: Error message in incoming mail handler used when an incoming e-mail is not from a user's incoming e-mail address.
+msgid "Sorry, that is not your incoming email address."
+msgstr "Barkatu, hori ez da sarreretarako duzun posta-helbidea."
+
+#. TRANS: Error message in incoming mail handler used when no incoming e-mail is allowed.
+msgid "Sorry, no incoming email allowed."
+msgstr "Barkatu, sarrerako posta ez dago onartuta."
+
+#. TRANS: Error message in incoming mail handler used when an incoming e-mail is of an unsupported type.
+#. TRANS: %s is the unsupported type.
+#, php-format
+msgid "Unsupported message type: %s."
+msgstr "Mezu mota ez onartua: %s."
+
+#. TRANS: Form legend for form to make a user a group admin.
+msgid "Make user an admin of the group"
+msgstr "Bihurtu erabiltzaile bat taldearen administratzailea"
+
+#. TRANS: Button text for the form that will make a user administrator.
+msgctxt "BUTTON"
+msgid "Make Admin"
+msgstr "Bihurtu administratzaile"
+
+#. TRANS: Submit button title.
+msgctxt "TOOLTIP"
+msgid "Make this user an admin."
+msgstr "Bihurtu erabiltzaile hau administratzaile."
+
+#. TRANS: Client exception thrown when a database error was thrown during a file upload operation.
+msgid "There was a database error while saving your file. Please try again."
+msgstr ""
+"Errore bat egon da fitxategia datubasean gordetzerakoan. Saiatau berriro."
+
+#. TRANS: Client exception thrown when a file upload operation would cause a user to exceed a set quota.
+msgid "File exceeds user's quota."
+msgstr "Fitxategiak erabiltzailearen kuota gainditu du."
+
+#. TRANS: Client exception thrown when a file upload operation fails because the file could
+#. TRANS: not be moved from the temporary folder to the permanent file location.
+msgid "File could not be moved to destination directory."
+msgstr "Fitxategia ezin izan da mugitu helburu-direktoriora."
+
+#. TRANS: Client exception thrown when a file upload operation has been stopped because the MIME
+#. TRANS: type of the uploaded file could not be determined.
+msgid "Could not determine file's MIME type."
+msgstr "Ezin izan da zehaztu fitxategiaren MIME mota."
+
+#. TRANS: Client exception thrown trying to upload a forbidden MIME type.
+#. TRANS: %1$s is the file type that was denied, %2$s is the application part of
+#. TRANS: the MIME type that was denied.
+#, php-format
+msgid ""
+"\"%1$s\" is not a supported file type on this server. Try using another %2$s "
+"format."
+msgstr ""
+"\"%1$s\" fitxategi-mota ez dago onartuta zerbitzari honetan. Saiatu beste %2"
+"$s formatu bat erabiltzen."
+
+#. TRANS: Client exception thrown trying to upload a forbidden MIME type.
+#. TRANS: %s is the file type that was denied.
+#, php-format
+msgid "\"%s\" is not a supported file type on this server."
+msgstr "\"%s\" fitxategi-mota ez dago onartuta zerbitzari honetan."
+
+#. TRANS: Form legend for direct notice.
+msgid "Send a direct notice"
+msgstr "Bidali zuzeneko oharra"
+
+#. TRANS: Label entry in drop-down selection box in direct-message inbox/outbox.
+#. TRANS: This is the default entry in the drop-down box, doubling as instructions
+#. TRANS: and a brake against accidental submissions with the first user in the list.
+msgid "Select recipient:"
+msgstr "Hartzailea aukeratu:"
+
+#. TRANS: Entry in drop-down selection box in direct-message inbox/outbox when no one is available to message.
+msgid "No mutual subscribers."
+msgstr "Elkar harpidetzarik ez."
+
+#. TRANS: Dropdown label in direct notice form.
+msgid "To"
+msgstr "Nori"
+
+#. TRANS: Button text for sending a direct notice.
+msgctxt "Send button for sending notice"
+msgid "Send"
+msgstr "Bidali"
+
+#. TRANS: Header in message list.
+msgid "Messages"
+msgstr "Mezuak"
+
+#. TRANS: Followed by notice source (usually the client used to send the notice).
+#. TRANS: Followed by notice source.
+msgid "from"
+msgstr "jatorria"
+
+#. TRANS: A possible notice source (web interface).
+msgctxt "SOURCE"
+msgid "web"
+msgstr "web gunea"
+
+#. TRANS: A possible notice source (XMPP).
+msgctxt "SOURCE"
+msgid "xmpp"
+msgstr "xmpp"
+
+#. TRANS: A possible notice source (e-mail).
+msgctxt "SOURCE"
+msgid "mail"
+msgstr "mail"
+
+#. TRANS: A possible notice source (OpenMicroBlogging).
+msgctxt "SOURCE"
+msgid "omb"
+msgstr "omb"
+
+#. TRANS: A possible notice source (Application Programming Interface).
+msgctxt "SOURCE"
+msgid "api"
+msgstr "api"
+
+#. TRANS: Client exception thrown when no author for an activity was found.
+msgid "Cannot get author for activity."
+msgstr "Ezin izan da jardueraren egilea aurkitu."
+
+#. TRANS: Client exception thrown when ...
+msgid "Bookmark not posted to this group."
+msgstr "Laster-marka ez da bidali talde honetara."
+
+#. TRANS: Client exception when ...
+msgid "Object not posted to this user."
+msgstr "Objektua ez zaio bidali erabiltzaile honi."
+
+#. TRANS: Server exception thrown when a micro app plugin uses a target that cannot be handled.
+msgid "Do not know how to handle this kind of target."
+msgstr "Ez da ezaguna nola maneiatu behar diren mota honetako jomugak."
+
+#. TRANS: Server exception thrown when a micro app plugin developer has not done his job too well.
+msgid "You must implement either adaptNoticeListItem() or showNotice()."
+msgstr "adaptNoticeListItem() edo showNotice() implementatu beharko zenuke."
+
+#. TRANS: Link description to show more items in a list.
+msgid "More â–¼"
+msgstr "Gehiago â–¼"
+
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+msgid "Nickname cannot be empty."
+msgstr "Nick-a ezin da hutsik egon."
+
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+#, php-format
+msgid "Nickname cannot be more than %d character long."
+msgid_plural "Nickname cannot be more than %d characters long."
+msgstr[0] "Nick-a ezin da karaktere %d bainio luzeago izan."
+msgstr[1] "Nick-a ezin da %d karaktere bainio luzeago izan."
+
+#. TRANS: Form legend for notice form.
+msgid "Send a notice"
+msgstr "Bidali ohar bat"
+
+#. TRANS: Title for notice label. %s is the user's nickname.
+#, php-format
+msgid "What's up, %s?"
+msgstr "Zer berri, %s?"
+
+#. TRANS: Input label in notice form for adding an attachment.
+msgid "Attach"
+msgstr "Atxikitu"
+
+#. TRANS: Title for input field to attach a file to a notice.
+msgid "Attach a file."
+msgstr "Atxikitu fitxategi bat."
+
+#. TRANS: Field label to add location to a notice.
+msgid "Share my location"
+msgstr "Nire kokalekua zabaldu"
+
+#. TRANS: Text to not share location for a notice in notice form.
+msgid "Do not share my location"
+msgstr "Ez zabaldu nire kokalekua"
+
+#. TRANS: Timeout error text for location retrieval in notice form.
+msgid ""
+"Sorry, retrieving your geo location is taking longer than expected, please "
+"try again later"
+msgstr ""
+"Barkatu, zure kokalekua eskuratzeak behar baino denbora gehiago eraman du, "
+"saiatu beranduago."
+
+#. TRANS: Separator in profile addressees list.
+msgctxt "SEPARATOR"
+msgid ", "
+msgstr ", "
+
+#. TRANS: Used in coordinates as abbreviation of north.
+msgid "N"
+msgstr "I"
+
+#. TRANS: Used in coordinates as abbreviation of south.
+msgid "S"
+msgstr "H"
+
+#. TRANS: Used in coordinates as abbreviation of east.
+msgid "E"
+msgstr "E"
+
+#. TRANS: Used in coordinates as abbreviation of west.
+msgid "W"
+msgstr "M"
+
+#. TRANS: Coordinates message.
+#. TRANS: %1$s is lattitude degrees, %2$s is lattitude minutes,
+#. TRANS: %3$s is lattitude seconds, %4$s is N (north) or S (south) depending on lattitude,
+#. TRANS: %5$s is longitude degrees, %6$s is longitude minutes,
+#. TRANS: %7$s is longitude seconds, %8$s is E (east) or W (west) depending on longitude,
+#, php-format
+msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
+msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
+
+#. TRANS: Followed by geo location.
+msgid "at"
+msgstr "-"
+
+#. TRANS: Addition in notice list item if notice is part of a conversation.
+msgid "in context"
+msgstr "testuinguruan"
+
+#. TRANS: Addition in notice list item if notice was repeated. Followed by a span with a nickname.
+msgid "Repeated by"
+msgstr "Errepikatzailea"
+
+#. TRANS: Link title in notice list item to reply to a notice.
+msgid "Reply to this notice."
+msgstr "Erantzun ohar honi."
+
+#. TRANS: Link text in notice list item to reply to a notice.
+msgid "Reply"
+msgstr "Erantzun"
+
+#. TRANS: Link title in notice list item to delete a notice.
+msgid "Delete this notice from the timeline."
+msgstr "Ezabatu ohar hau denboralerrotik."
+
+#. TRANS: Title for repeat form status in notice list when a notice has been repeated.
+msgid "Notice repeated."
+msgstr "Errepikatutako oharra."
+
+#. TRANS: Field label for notice text.
+msgid "Update your status..."
+msgstr "Zure egoera eguneratu..."
+
+#. TRANS: Form legend of form to nudge/ping another user.
+msgid "Nudge this user"
+msgstr "Zirikatu erabiltzaile hau"
+
+#. TRANS: Button text to nudge/ping another user.
+msgctxt "BUTTON"
+msgid "Nudge"
+msgstr "Zirikatu"
+
+#. TRANS: Button title to nudge/ping another user.
+msgid "Send a nudge to this user."
+msgstr "Zirikatu erabiltzaile hau."
+
+#. TRANS: Server exception thrown in oEmbed action if no API endpoint is available.
+msgid "No oEmbed API endpoint available."
+msgstr "Ez dago oEmbed APIaren amaiera-puntu erabilgarririk."
+
+#. TRANS: Field label for list.
+msgctxt "LABEL"
+msgid "List"
+msgstr "Zerrenda"
+
+#. TRANS: Field title for list.
+msgid "Change the list (letters, numbers, -, ., and _ are allowed)."
+msgstr "Zerrenda aldatu (letrak, zenbakiak, -, ., eta _ onartzen dira)."
+
+#. TRANS: Field title for description of list.
+msgid "Describe the list or topic."
+msgstr "Deskribatu zerrenda edo gaia."
+
+#. TRANS: Field title for description of list.
+#. TRANS: %d is the maximum number of characters for the description.
+#, php-format
+msgid "Describe the list or topic in %d character."
+msgid_plural "Describe the list or topic in %d characters."
+msgstr[0] "Deskribatu zerrenda edo gaia karaktere %dean."
+msgstr[1] "Deskribatu zerrenda edo gaia %d karakteretan."
+
+#. TRANS: Button title to delete a list.
+msgid "Delete this list."
+msgstr "Ezabatu zerrenda hau."
+
+#. TRANS: Header in list edit form.
+msgid "Add or remove people"
+msgstr "Gehitu edo ezabatu jendea"
+
+#. TRANS: Header in list edit form.
+msgctxt "HEADER"
+msgid "Search"
+msgstr "Bilatu"
+
+#. TRANS: Menu item in list navigation panel.
+msgctxt "MENU"
+msgid "List"
+msgstr "Zerrenda"
+
+#. TRANS: Menu item title in list navigation panel.
+#. TRANS: %1$s is a list, %2$s is a nickname.
+#, php-format
+msgid "%1$s list by %2$s."
+msgstr "%2$s(e)n %1$s zerrenda."
+
+#. TRANS: Menu item in list navigation panel.
+msgctxt "MENU"
+msgid "Listed"
+msgstr "Zerrendatuta"
+
+#. TRANS: Menu item in list navigation panel.
+#. TRANS: Menu item in local navigation menu.
+msgctxt "MENU"
+msgid "Subscribers"
+msgstr "Harpidetuak"
+
+#. TRANS: Menu item title in list navigation panel.
+#. TRANS: %1$s is a list, %2$s is a nickname.
+#, php-format
+msgid "Subscribers to %1$s list by %2$s."
+msgstr "%2$s(e)n %1$s zerrendara harpidetuak."
+
+#. TRANS: Menu item in list navigation panel.
+msgctxt "MENU"
+msgid "Edit"
+msgstr "Aldatu"
+
+#. TRANS: Menu item title in list navigation panel.
+#. TRANS: %s is a list.
+#, php-format
+msgid "Edit %s list by you."
+msgstr "Edittau zure %s zerrenda."
+
+#. TRANS: Title for link to edit list settings.
+msgid "Edit list settings."
+msgstr "Editatu zerrenda ezarpenak."
+
+#. TRANS: Text for link to edit list settings.
+msgid "Edit"
+msgstr "Aldatu"
+
+#. TRANS: Privacy mode text in list list item for private list.
+msgctxt "MODE"
+msgid "Private"
+msgstr "Pribatua"
+
+#. TRANS: Menu item in the group navigation page.
+msgctxt "MENU"
+msgid "List Subscriptions"
+msgstr "Harpidetzak zerrendatu"
+
+#. TRANS: Tooltip for menu item in the group navigation page.
+#. TRANS: %s is a user nickname.
+#, php-format
+msgctxt "TOOLTIP"
+msgid "Lists subscribed to by %s."
+msgstr "%s harpidetu den zerrendak."
+
+#. TRANS: Menu item in the group navigation page.
+#. TRANS: %s is a user nickname.
+#, php-format
+msgctxt "MENU"
+msgid "Lists with %s"
+msgstr "%s barne hartzen duten zerrendak"
+
+#. TRANS: Tooltip for menu item in the group navigation page.
+#. TRANS: %s is a user nickname.
+#, php-format
+msgctxt "TOOLTIP"
+msgid "Lists with %s."
+msgstr "Zerrendak %s(r)ekin."
+
+#. TRANS: Menu item in the group navigation page.
+#. TRANS: %s is a user nickname.
+#, php-format
+msgctxt "MENU"
+msgid "Lists by %s"
+msgstr "%s(r)en zerrendak"
+
+#. TRANS: Tooltip for menu item in the group navigation page.
+#. TRANS: %s is a user nickname.
+#, php-format
+msgctxt "TOOLTIP"
+msgid "Lists by %s."
+msgstr "%s(r)en zerrendak."
+
+#. TRANS: Label in lists widget.
+msgctxt "LABEL"
+msgid "Your lists"
+msgstr "Zure zerrendak"
+
+#. TRANS: Fieldset legend in lists widget.
+msgctxt "LEGEND"
+msgid "Edit lists"
+msgstr "Editatu zerrendak"
+
+#. TRANS: Label in self tags widget.
+msgctxt "LABEL"
+msgid "Tags"
+msgstr "Etiketak"
+
+#. TRANS: Title for section contaning lists with the most subscribers.
+msgid "Popular lists"
+msgstr "Zerrenda nabarmenak"
+
+#. TRANS: List summary. %1$d is the number of users in the list,
+#. TRANS: %2$d is the number of subscribers to the list.
+#, php-format
+msgid "Listed: %1$d Subscribers: %2$d"
+msgstr "Zerrendatuak: %1$d Harpidedunak: %2$d"
+
+#. TRANS: Title for page that displays which lists current user is part of.
+#, php-format
+msgid "Lists with you"
+msgstr "Zu barne hartzen zaituzten zerrendak"
+
+#. TRANS: Title for page that displays which lists a user is part of.
+#. TRANS: %s is a profile name.
+#, php-format
+msgid "Lists with %s"
+msgstr "%s barne hartzen duten zerrendak"
+
+#. TRANS: Title for page that displays lists a user has subscribed to.
+msgid "List subscriptions"
+msgstr "Zerrendatu harpidetzak"
+
+#. TRANS: Menu item in personal group navigation menu.
+#. TRANS: Menu item in settings navigation panel.
+#. TRANS: Menu item in local navigation menu.
+msgctxt "MENU"
+msgid "Profile"
+msgstr "Profila"
+
+#. TRANS: Menu item title in personal group navigation menu.
+msgid "Your profile"
+msgstr "Zure profila"
+
+#. TRANS: Menu item in personal group navigation menu.
+msgctxt "MENU"
+msgid "Replies"
+msgstr "Erantzunak"
+
+#. TRANS: Menu item in personal group navigation menu.
+msgctxt "MENU"
+msgid "Favorites"
+msgstr "Gogokoenak"
+
+#. TRANS: Replaces %s in '%s\'s favorite notices'. (Yes, we know we need to fix this.)
+msgctxt "FIXME"
+msgid "User"
+msgstr "Erabiltzailea"
+
+#. TRANS: Menu item in personal group navigation menu.
+msgctxt "MENU"
+msgid "Messages"
+msgstr "Mezuak"
+
+#. TRANS: Menu item title in personal group navigation menu.
+msgid "Your incoming messages"
+msgstr "Jaso dituzun mezuak"
+
+#. TRANS: Displayed as version information for a plugin if no version information was found.
+msgid "Unknown"
+msgstr "Ezezaguna"
+
+#. TRANS: Plugin admin panel controls
+msgctxt "plugin"
+msgid "Disable"
+msgstr "Ezgaitu"
+
+#. TRANS: Plugin admin panel controls
+msgctxt "plugin"
+msgid "Enable"
+msgstr "Gaitu"
+
+#. TRANS: Plugin description for a disabled plugin.
+msgctxt "plugin-description"
+msgid ""
+"(The plugin description is unavailable when a plugin has been disabled.)"
+msgstr ""
+"(Pluginaren deskribapena ez dago eskuragarri plugina desgaitzen denean.)"
+
+#. TRANS: Menu item in primary navigation panel.
+msgctxt "MENU"
+msgid "Settings"
+msgstr "Ezarpenak"
+
+#. TRANS: Menu item title in primary navigation panel.
+msgid "Change your personal settings."
+msgstr "Aldatu zure ezarpen pertsonalak."
+
+#. TRANS: Menu item in primary navigation panel.
+msgctxt "MENU"
+msgid "Admin"
+msgstr "Admin"
+
+#. TRANS: Menu item title in primary navigation panel.
+msgid "Site configuration."
+msgstr "Gune konfigurazioa."
+
+#. TRANS: Menu item in primary navigation panel.
+msgctxt "MENU"
+msgid "Logout"
+msgstr "Saioa itxi"
+
+#. TRANS: Menu item title in primary navigation panel.
+msgid "Logout from the site."
+msgstr "Saioa itxi gunean."
+
+#. TRANS: Menu item title in primary navigation panel.
+msgid "Login to the site."
+msgstr "Saioa hasi gunean."
+
+msgid "This profile has been silenced by site moderators"
+msgstr "Profil hau moderatzaileek isilarazi dute"
+
+#. TRANS: H2 text for user subscription statistics.
+msgid "Following"
+msgstr "Jarraituak"
+
+#. TRANS: H2 text for user subscriber statistics.
+msgid "Followers"
+msgstr "Jarraitzaileak"
+
+#. TRANS: H2 text for user statistics.
+msgid "Statistics"
+msgstr "Estatistikak"
+
+#. TRANS: Label for user statistics.
+msgid "User ID"
+msgstr "Erabiltzaile IDa"
+
+#. TRANS: Label for user statistics.
+msgid "Member since"
+msgstr "Izen emate data"
+
+#. TRANS: Label for user statistics.
+#. TRANS: Average count of posts made per day since account registration.
+msgid "Daily average"
+msgstr "Eguneko batez bestekoa"
+
+#. TRANS: H2 text for user group membership statistics.
+msgid "Groups"
+msgstr "Taldeak"
+
+#. TRANS: H2 text for user list membership statistics.
+msgid "Lists"
+msgstr "Zerrendak"
+
+#. TRANS: Server error displayed when using an unimplemented method.
+msgid "Unimplemented method."
+msgstr "Metodo implementatu gabea."
+
+#. TRANS: Menu item title in search group navigation panel.
+msgid "User groups"
+msgstr "Erabiltzailearen taldeak"
+
+#. TRANS: Menu item in search group navigation panel.
+msgctxt "MENU"
+msgid "Recent tags"
+msgstr "Etiketa berriak"
+
+#. TRANS: Menu item title in search group navigation panel.
+msgid "Recent tags"
+msgstr "Etiketa berriak"
+
+#. TRANS: Menu item in search group navigation panel.
+msgctxt "MENU"
+msgid "Featured"
+msgstr "Bereizitakoa"
+
+#. TRANS: Menu item in search group navigation panel.
+msgctxt "MENU"
+msgid "Popular"
+msgstr "Nabarmenak"
+
+#. TRANS: Title for inbox tag cloud section.
+msgctxt "TITLE"
+msgid "Trending topics"
+msgstr "Modako gaiak"
+
+#. TRANS: Client error displayed when return-to was defined without a target.
+msgid "No return-to arguments."
+msgstr "Ez dago itzulketarako argumenturik."
+
+#. TRANS: For legend for notice repeat form.
+msgid "Repeat this notice?"
+msgstr "Ohar hau errepikatu?"
+
+#. TRANS: Button title to repeat a notice on notice repeat form.
+msgid "Repeat this notice."
+msgstr "Errepikatu ohar hau."
+
+#. TRANS: Description of role revoke form. %s is the role to be revoked.
+#, php-format
+msgid "Revoke the \"%s\" role from this user"
+msgstr "Erabiltzaile honi  \"%s\" rola kendu"
+
+#. TRANS: Client error on action trying to visit a non-existing page.
+msgid "Page not found."
+msgstr "Orria ez da aurkitu."
+
+#. TRANS: Title of form to sandbox a user.
+msgctxt "TITLE"
+msgid "Sandbox"
+msgstr "Isolatu"
+
+#. TRANS: Description of form to sandbox a user.
+msgid "Sandbox this user"
+msgstr "Erabiltzailea isolatu"
+
+#. TRANS: Fieldset legend for the search form.
+msgid "Search site"
+msgstr "Guneak bilaketa"
+
+#. TRANS: Used as a field label for the field where one or more keywords
+#. TRANS: for searching can be entered.
+msgid "Keyword(s)"
+msgstr "Hitz gakoa(k)"
+
+#. TRANS: Button text for searching site.
+#. TRANS: Button text for search button on search form.
+#. TRANS: Button text to search profiles.
+msgctxt "BUTTON"
+msgid "Search"
+msgstr "Bilatu"
+
+#. TRANS: Standard search suggestions shown when a search does not give any results.
+msgid ""
+"* Make sure all words are spelled correctly.\n"
+"* Try different keywords.\n"
+"* Try more general keywords.\n"
+"* Try fewer keywords."
+msgstr ""
+"* Segurtatu hitz guztiak zuzen idatzi dituzula.\n"
+"* Saiatu gako-hitz ezberdinekin.\n"
+"* Saiatu gako-hitz orokorragoekin.\n"
+"* Saiatu gako-hitz gutxiagorekin."
+
+#. TRANS: Standard search suggestions shown when a search does not give any results.
+#, php-format
+msgid ""
+"You can also try your search on other engines:\n"
+"\n"
+"* [Twingly](http://www.twingly.com/search?q=%s&content=microblog&site=%%%%"
+"site.server%%%%)\n"
+"* [Tweet scan](http://www.tweetscan.com/indexi.php?s=%s)\n"
+"* [Google](http://www.google.com/search?q=site%%3A%%%%site.server%%%%+%s)\n"
+"* [Yahoo](http://search.yahoo.com/search?p=site%%3A%%%%site.server%%%%+%s)\n"
+"* [Collecta](http://collecta.com/#q=%s)"
+msgstr ""
+"Beste bilaketa-tresnekin saia zaitezke:\n"
+"\n"
+"* [Twingly](http://www.twingly.com/search?q=%s&content=microblog&site=%%%%"
+"site.server%%%%)\n"
+"* [Tweet scan](http://www.tweetscan.com/indexi.php?s=%s)\n"
+"* [Google](http://www.google.com/search?q=site%%3A%%%%site.server%%%%+%s)\n"
+"* [Yahoo](http://search.yahoo.com/search?p=site%%3A%%%%site.server%%%%+%s)\n"
+"* [Collecta](http://collecta.com/#q=%s)"
+
+#. TRANS: Menu item in search group navigation panel.
+msgctxt "MENU"
+msgid "People"
+msgstr "Jendea"
+
+#. TRANS: Menu item title in search group navigation panel.
+msgid "Find people on this site"
+msgstr "Bilatu jendea gune honetan"
+
+#. TRANS: Menu item in search group navigation panel.
+msgctxt "MENU"
+msgid "Notices"
+msgstr "Oharrak"
+
+#. TRANS: Menu item title in search group navigation panel.
+msgid "Find content of notices"
+msgstr "Bilatu oharren edukiak"
+
+#. TRANS: Menu item title in search group navigation panel.
+msgid "Find groups on this site"
+msgstr "Bilatu taldeak gune honetan"
+
+#. TRANS: Secondary navigation menu item leading to Terms of Service.
+msgctxt "MENU"
+msgid "TOS"
+msgstr "TOS"
+
+#. TRANS: Secondary navigation menu item leading to privacy policy.
+msgctxt "MENU"
+msgid "Privacy"
+msgstr "Pribatutasuna"
+
+#. TRANS: Secondary navigation menu item. Leads to information about StatusNet and its license.
+msgctxt "MENU"
+msgid "Source"
+msgstr "Iturria"
+
+#. TRANS: Secondary navigation menu item leading to version information on the StatusNet site.
+msgctxt "MENU"
+msgid "Version"
+msgstr "Bertsioa"
+
+#. TRANS: Default title for section/sidebar widget.
+msgid "Untitled section"
+msgstr "Izenik gabeko atala"
+
+#. TRANS: Default "More..." title for section/sidebar widget.
+msgid "More..."
+msgstr "Gehiago..."
+
+#. TRANS: Header in settings navigation panel.
+msgctxt "HEADER"
+msgid "Settings"
+msgstr "Ezarpenak"
+
+#. TRANS: Menu item title in settings navigation panel.
+msgid "Change your profile settings"
+msgstr "Aldatu zure profilaren ezarpenak"
+
+#. TRANS: Menu item in settings navigation panel.
+msgctxt "MENU"
+msgid "Avatar"
+msgstr "Avatarra"
+
+#. TRANS: Menu item title in settings navigation panel.
+msgid "Upload an avatar"
+msgstr "Igo avatar bat"
+
+#. TRANS: Menu item in settings navigation panel.
+msgctxt "MENU"
+msgid "Password"
+msgstr "Pasahitza"
+
+#. TRANS: Menu item title in settings navigation panel.
+msgid "Change your password"
+msgstr "Aldatu zure pasahitza"
+
+#. TRANS: Menu item in settings navigation panel.
+msgctxt "MENU"
+msgid "Email"
+msgstr "Posta elektronikoa"
+
+#. TRANS: Menu item title in settings navigation panel.
+msgid "Change email handling"
+msgstr "Aldatu posta elektronikoa nola maneiatzen den"
+
+#. TRANS: Menu item in settings navigation panel.
+msgctxt "MENU"
+msgid "URL"
+msgstr "URL"
+
+#. TRANS: Menu item title in settings navigation panel.
+msgid "URL shorteners"
+msgstr "URL moztaileak"
+
+#. TRANS: Menu item in settings navigation panel.
+msgctxt "MENU"
+msgid "IM"
+msgstr "BM"
+
+#. TRANS: Menu item title in settings navigation panel.
+msgid "Updates by instant messenger (IM)"
+msgstr "Bapateko mezularitza (BM) bidezko eguneraketak"
+
+#. TRANS: Menu item in settings navigation panel.
+msgctxt "MENU"
+msgid "SMS"
+msgstr "SMS"
+
+#. TRANS: Menu item title in settings navigation panel.
+msgid "Updates by SMS"
+msgstr "SMS bidezko eguneraketak"
+
+#. TRANS: Menu item in settings navigation panel.
+msgctxt "MENU"
+msgid "Connections"
+msgstr "Konexioak"
+
+#. TRANS: Menu item title in settings navigation panel.
+msgid "Authorized connected applications"
+msgstr "Baimendutako konektatutako aplikazioak"
+
+#. TRANS: Menu item in settings navigation panel.
+msgctxt "MENU"
+msgid "Old school"
+msgstr "Aintzinako eran"
+
+#. TRANS: Menu item title in settings navigation panel.
+msgid "UI tweaks for old-school users"
+msgstr "Erabiltzaile zaharrentzako interfaze doiketak"
+
+#. TRANS: Title of form to silence a user.
+msgctxt "TITLE"
+msgid "Silence"
+msgstr "Isilik"
+
+#. TRANS: Description of form to silence a user.
+msgid "Silence this user"
+msgstr "Isilarazi erabiltzaile hau"
+
+#. TRANS: Server error displayed when trying to create an anynymous OAuth consumer.
+msgid "Could not create anonymous consumer."
+msgstr "Ezin izan da kontsumitzaile anonimoa sortu."
+
+#. TRANS: Server error displayed when trying to create an anynymous OAuth application.
+msgid "Could not create anonymous OAuth application."
+msgstr "Ezin izan da OAuth aplikazio anonimoa sortu."
+
+#. TRANS: Exception thrown when no token association could be found.
+msgid ""
+"Could not find a profile and application associated with the request token."
+msgstr ""
+"Ezin izan da eskariaren tokenarekin lotutako profila eta aplikazioa aurkitu."
+
+#. TRANS: Exception thrown when no access token can be issued.
+msgid "Could not issue access token."
+msgstr "Ezin izan da jaulki atzipen-tokena."
+
+#. TRANS: Exception thrown when a database error occurs.
+msgid "Database error inserting OAuth application user."
+msgstr "OAuth Aplikazioaren lankidea ezartzean datu basearen errorea."
+
+#. TRANS: Exception thrown when a database error occurs.
+msgid "Database error updating OAuth application user."
+msgstr "Errorea datu-basean OAuth aplikazio-erabiltzailea eguneratzean."
+
+#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
+msgid "Tried to revoke unknown token."
+msgstr "Token ezezaguna errebokatzeko saialdia."
+
+#. TRANS: Exception thrown when an attempt is made to remove a revoked token.
+msgid "Failed to delete revoked token."
+msgstr "Huts egin du errebokatutako tokenaren ezabaketak."
+
+#. TRANS: Menu item in local navigation menu.
+msgctxt "MENU"
+msgid "Subscriptions"
+msgstr "Harpidetzak"
+
+#. TRANS: Menu item title in local navigation menu.
+#. TRANS: %s is a user nickname.
+#, php-format
+msgid "People %s subscribes to."
+msgstr "%s zein jenderi harpidetu den."
+
+#. TRANS: Menu item title in local navigation menu.
+#. TRANS: %s is a user nickname.
+#, php-format
+msgid "People subscribed to %s."
+msgstr "%s(e)ra harpidetutako jendea."
+
+#. TRANS: Menu item in local navigation menu.
+#. TRANS: %d is the number of pending subscription requests.
+#, php-format
+msgctxt "MENU"
+msgid "Pending (%d)"
+msgstr "Erabakitzeke (%d)"
+
+#. TRANS: Menu item title in local navigation menu.
+#, php-format
+msgid "Approve pending subscription requests."
+msgstr "Onartu erabakitzeke dauden harpidetza eskaerak."
+
+#. TRANS: Menu item title in local navigation menu.
+#. TRANS: %s is a user nickname.
+#, php-format
+msgid "Groups %s is a member of."
+msgstr "%s kide den taldeak."
+
+#. TRANS: Menu item title in local navigation menu.
+#. TRANS: %s is a user nickname.
+#, php-format
+msgid "List subscriptions by %s."
+msgstr "%s(e)n zerrenda harpidetzak."
+
+#. TRANS: Menu item in local navigation menu.
+msgctxt "MENU"
+msgid "Invite"
+msgstr "Gonbidatu"
+
+#. TRANS: Menu item title in local navigation menu.
+#. TRANS: %s is the StatusNet sitename.
+#, php-format
+msgid "Invite friends and colleagues to join you on %s."
+msgstr "Gonbidatu lagunak eta lankideak zurekin elkartzera %s(e)n."
+
+#. TRANS: Form of form to subscribe to a user.
+msgid "Subscribe to this user"
+msgstr "Harpidetu erabiltzaile honetara"
+
+#. TRANS: Button text to subscribe to a user.
+#. TRANS: Button text for subscribing to a list.
+msgctxt "BUTTON"
+msgid "Subscribe"
+msgstr "Harpidetu"
+
+#. TRANS: Button title to subscribe to a user.
+msgid "Subscribe to this user."
+msgstr "Erabiltzaile hau jarraitu."
+
+#. TRANS: Title of personal tag cloud section.
+msgid "People Tagcloud as self-tagged"
+msgstr "Auto-etiketatu diren pertsonen etiketa lainoa"
+
+#. TRANS: Title of personal tag cloud section.
+msgid "People Tagcloud as tagged"
+msgstr "Etiketaturiko pertsonen etiketa lainoa"
+
+#. TRANS: Content displayed in a tag cloud section if there are no tags.
+msgctxt "NOTAGS"
+msgid "None"
+msgstr "Bat ere ez"
+
+#. TRANS: Server exception displayed if a theme name was invalid.
+msgid "Invalid theme name."
+msgstr "Okerreko itxura izena."
+
+#. TRANS: Exception thrown when a compressed theme is uploaded while no support present in PHP configuration.
+msgid "This server cannot handle theme uploads without ZIP support."
+msgstr "Zerbitzari honek ezin du gaien igoera kudeatu ZIP euskarririk ez badu."
+
+#. TRANS: Server exception thrown when uploading a theme fails.
+msgid "The theme file is missing or the upload failed."
+msgstr "Itxuraren fitxategia falta da edo gaizki igo da."
+
+#. TRANS: Server exception thrown when saving an uploaded theme after decompressing it fails.
+#. TRANS: Server exception thrown when an uploaded theme cannot be saved during extraction.
+msgid "Failed saving theme."
+msgstr "Gaia gordetzean hutsegitea."
+
+#. TRANS: Server exception thrown when an uploaded theme has an incorrect structure.
+msgid "Invalid theme: Bad directory structure."
+msgstr "Itxura okerra: direktorio egitura okerra du."
+
+#. TRANS: Client exception thrown when an uploaded theme is larger than the limit.
+#. TRANS: %d is the number of bytes of the uncompressed theme.
+#, php-format
+msgid "Uploaded theme is too large; must be less than %d byte uncompressed."
+msgid_plural ""
+"Uploaded theme is too large; must be less than %d bytes uncompressed."
+msgstr[0] ""
+"Igotako itxura handiegia da; erauzitako fitxategiaren tamaina byte %d baino "
+"txikiagoa izan behar da."
+msgstr[1] ""
+"Igotako itxura handiegia da; erauzitako fitxategiaren tamaina %d byte baino "
+"txikiagoa izan behar da."
+
+#. TRANS: Server exception thrown when an uploaded theme is incomplete.
+msgid "Invalid theme archive: Missing file css/display.css"
+msgstr "Itxura fitxategi okerra: css/display.css fitxategia falta da"
+
+#. TRANS: Server exception thrown when an uploaded theme has an incorrect file or folder name.
+msgid ""
+"Theme contains invalid file or folder name. Stick with ASCII letters, "
+"digits, underscore, and minus sign."
+msgstr ""
+"Gaiak baliogabeko fitxategi edo karpeta izenen bat du. Erabili ASCII letrak, "
+"digituak, marra baxua eta gidoia."
+
+#. TRANS: Server exception thrown when an uploaded theme contains files with unsafe file extensions.
+msgid "Theme contains unsafe file extension names; may be unsafe."
+msgstr ""
+"Gaiak seguruak ez diren luzapen-izenak ditu fitxategietan; arriskutsua izan "
+"daiteke."
+
+#. TRANS: Server exception thrown when an uploaded theme contains a file type that is not allowed.
+#. TRANS: %s is the file type that is not allowed.
+#, php-format
+msgid "Theme contains file of type \".%s\", which is not allowed."
+msgstr "Itxurak \".%s\" motako fitxategia du, onartzen ez dena."
+
+#. TRANS: Server exception thrown when an uploaded compressed theme cannot be opened.
+msgid "Error opening theme archive."
+msgstr "Akatsa gaiaren fitxategia irekitzean."
+
+#. TRANS: Header for Notices section.
+msgctxt "HEADER"
+msgid "Notices"
+msgstr "Oharrak"
+
+#. TRANS: Link to show replies for a notice.
+#. TRANS: %d is the number of replies to a notice and used for plural.
+#, php-format
+msgid "Show reply"
+msgid_plural "Show all %d replies"
+msgstr[0] "Erakutsi erantzuna"
+msgstr[1] "Erakutsi %d erantzunak"
+
+#. TRANS: Reference to the logged in user in favourite list.
+msgctxt "FAVELIST"
+msgid "You"
+msgstr "Zu"
+
+#. TRANS: For building a list such as "Jim, Bob, Mary and 5 others like this".
+#. TRANS: %1$s is a list of users, separated by a separator (default: ", "), %2$s is the last user in the list.
+#, php-format
+msgctxt "FAVELIST"
+msgid "%1$s and %2$s"
+msgstr "%1$s eta %2$s"
+
+#. TRANS: List message for notice favoured by logged in user.
+msgctxt "FAVELIST"
+msgid "You like this."
+msgstr "Atsegin duzu."
+
+#. TRANS: List message for when more than 4 people like something.
+#. TRANS: %%s is a list of users liking a notice, %d is the number over 4 that like the notice.
+#. TRANS: Plural is decided on the total number of users liking the notice (count of %%s + %d).
+#, php-format
+msgid "%%s and %d others like this."
+msgid_plural "%%s and %d others like this."
+msgstr[0] "%%s eta hau bezalako beste %d."
+msgstr[1] "%%s eta hau bezalako beste %d."
+
+#. TRANS: List message for favoured notices.
+#. TRANS: %%s is a list of users liking a notice.
+#. TRANS: Plural is based on the number of of users that have favoured a notice.
+#, php-format
+msgid "%%s likes this."
+msgid_plural "%%s like this."
+msgstr[0] "%%s(e)k hau atsegin du."
+msgstr[1] "%%s(e)k hau atsegin dute/duzue."
+
+#. TRANS: List message for notice repeated by logged in user.
+msgctxt "REPEATLIST"
+msgid "You repeated this."
+msgstr "Ohar hau errepikatu duzu."
+
+#. TRANS: List message for when more than 4 people repeat something.
+#. TRANS: %%s is a list of users liking a notice, %d is the number over 4 that like the notice.
+#. TRANS: Plural is decided on the total number of users liking the notice (count of %%s + %d).
+#, php-format
+msgid "%%s and %d other repeated this."
+msgid_plural "%%s and %d others repeated this."
+msgstr[0] "%%s eta %d gehiagok errepikatu dute/duzue hau."
+msgstr[1] "%%s eta %d gehiagok errepikatu dute/duzue hau."
+
+#. TRANS: List message for favoured notices.
+#. TRANS: %%s is a list of users liking a notice.
+#. TRANS: Plural is based on the number of of users that have favoured a notice.
+#, php-format
+msgid "%%s repeated this."
+msgid_plural "%%s repeated this."
+msgstr[0] "%%s(e)k hau errepikatu du."
+msgstr[1] "%%s(e)k hau errepikatu dute."
+
+#. TRANS: Form legend.
+#, php-format
+msgid "Search and list people"
+msgstr "Bilatu eta zerrendatu jendea"
+
+#. TRANS: Dropdown option for searching in profiles.
+msgid "Everything"
+msgstr "Guztia"
+
+#. TRANS: Dropdown option for searching in profiles.
+msgid "Fullname"
+msgstr "Izen osoa"
+
+#. TRANS: Dropdown option for searching in profiles.
+msgid "URI (Remote users)"
+msgstr "URI (Urruneko erabiltzaileak)"
+
+#. TRANS: Dropdown field label.
+msgctxt "LABEL"
+msgid "Search in"
+msgstr "Bilatu hemen:"
+
+#. TRANS: Dropdown field title.
+msgid "Choose a field to search."
+msgstr "Hautatu eremu bat bilaketa egiteko."
+
+#. TRANS: Form legend.
+#. TRANS: %1$s is a nickname, $2$s is a list.
+#, php-format
+msgid "Remove %1$s from list %2$s"
+msgstr "Kendu %1$s %2$s zerrendatik"
+
+#. TRANS: Legend on form to add a profile to a list.
+#. TRANS: %1$s is a nickname, %2$s is a list.
+#, php-format
+msgid "Add %1$s to list %2$s"
+msgstr "Gehitu %1$s %2$s zerrendara"
+
+#. TRANS: Title for top posters section.
+msgid "Top posters"
+msgstr "Bidaltzaile nagusiak"
+
+#. TRANS: Option in drop-down of potential addressees.
+msgctxt "SENDTO"
+msgid "Everyone"
+msgstr "Edozein"
+
+#. TRANS: Option in drop-down of potential addressees.
+#. TRANS: %s is a StatusNet sitename.
+#, php-format
+msgid "My colleagues at %s"
+msgstr "%s guneko nire lankideak"
+
+#. TRANS: Label for drop-down of potential addressees.
+msgctxt "LABEL"
+msgid "To:"
+msgstr "Nori:"
+
+#. TRANS: Checkbox label in widget for selecting potential addressees to mark the notice private.
+msgid "Private?"
+msgstr "Pribatua?"
+
+#. TRANS: Client exception thrown in widget for selecting potential addressees when an invalid fill option was received.
+#, php-format
+msgid "Unknown to value: \"%s\"."
+msgstr "Ezezaguna balio honetarako: \"%s\"."
+
+#. TRANS: Title for the form to unblock a user.
+msgctxt "TITLE"
+msgid "Unblock"
+msgstr "Desblokeatu"
+
+#. TRANS: Title for unsandbox form.
+msgctxt "TITLE"
+msgid "Unsandbox"
+msgstr "Atera isolamendutik"
+
+#. TRANS: Description for unsandbox form.
+msgid "Unsandbox this user"
+msgstr "Atera erabiltzaile hau isolamendutik"
+
+#. TRANS: Title for unsilence form.
+msgid "Unsilence"
+msgstr "Kendu isiltasuna"
+
+#. TRANS: Form description for unsilence form.
+msgid "Unsilence this user"
+msgstr "Kendu isiltasuna erabiltzaile honi"
+
+#. TRANS: Form legend on unsubscribe form.
+msgid "Unsubscribe from this user"
+msgstr "Kendu erabiltzaile honekiko harpidetza"
+
+#. TRANS: Button text on unsubscribe form.
+#. TRANS: Button text for unsubscribing from a list.
+msgctxt "BUTTON"
+msgid "Unsubscribe"
+msgstr "Harpidetza kendu"
+
+#. TRANS: Button title on unsubscribe form.
+msgid "Unsubscribe from this user."
+msgstr "Kendu erabiltzaile honekiko harpidetza."
+
+#. TRANS: Exception text shown when no profile can be found for a user.
+#. TRANS: %1$s is a user nickname, $2$d is a user ID (number).
+#, php-format
+msgid "User %1$s (%2$d) has no profile record."
+msgstr "%1$s erabiltzaileak (%2$d) ez dauka profil-erregistrorik."
+
+#. TRANS: Authorisation exception thrown when a user a not allowed to login.
+msgid "Not allowed to log in."
+msgstr "Saioa hasteko baimenik ez."
+
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+msgid "a few seconds ago"
+msgstr "orain dela segundu gutxi batzuk"
+
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+msgid "about a minute ago"
+msgstr "orain dela minutu bat inguru"
+
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#, php-format
+msgid "about one minute ago"
+msgid_plural "about %d minutes ago"
+msgstr[0] "orain dela minutu inguru"
+msgstr[1] "orain dela %d minutu inguru"
+
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+msgid "about an hour ago"
+msgstr "orain dela ordu bat inguru"
+
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#, php-format
+msgid "about one hour ago"
+msgid_plural "about %d hours ago"
+msgstr[0] "orain dela ordubete inguru"
+msgstr[1] "orain dela %d ordu inguru"
+
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+msgid "about a day ago"
+msgstr "orain dela egun bat inguru"
+
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#, php-format
+msgid "about one day ago"
+msgid_plural "about %d days ago"
+msgstr[0] "orain dela egun bat inguru"
+msgstr[1] "orain dela %d egun inguru"
+
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+msgid "about a month ago"
+msgstr "orain dela hilabete bat inguru"
+
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#, php-format
+msgid "about one month ago"
+msgid_plural "about %d months ago"
+msgstr[0] "orain dela hilabete bat inguru"
+msgstr[1] "orain dela %d hilabete inguru"
+
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+msgid "about a year ago"
+msgstr "orain dela urte bat inguru"
+
+#. TRANS: Web color exception thrown when a hexadecimal color code does not validate.
+#. TRANS: %s is the provided (invalid) color code.
+#, php-format
+msgid "%s is not a valid color! Use 3 or 6 hex characters."
+msgstr "%s ez da baliozko kolorea! Erabili 3 edo 6 hex karaktere. "
+
+#. TRANS: Exception.
+msgid "Invalid XML."
+msgstr "XML baliogabea"
+
+#. TRANS: Exception.
+msgid "Invalid XML, missing XRD root."
+msgstr "XML baliogabea, XRD erroa falta da."
+
+#. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
+#, php-format
+msgid "Getting backup from file '%s'."
+msgstr "'%s'-ren babeskopia eskuratzen."
+
+#
+#~ msgid " "
+#~ msgstr " "
diff --git a/locale/fa/LC_MESSAGES/statusnet.po b/locale/fa/LC_MESSAGES/statusnet.po
index 58a6a578ab..430b543b0b 100644
--- a/locale/fa/LC_MESSAGES/statusnet.po
+++ b/locale/fa/LC_MESSAGES/statusnet.po
@@ -7,6 +7,7 @@
 # Author: Choxos
 # Author: Ebraminio
 # Author: Everplays
+# Author: Huji
 # Author: Mjbmr
 # Author: Narcissus
 # Author: Sahim
@@ -18,19 +19,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:00+0000\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:57+0000\n"
 "Last-Translator: Ahmad Sufi Mahmudi\n"
-"Language-Team: Persian <http://translatewiki.net/wiki/Portal:fa>\n"
+"Language-Team: Persian <https://translatewiki.net/wiki/Portal:fa>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Language-Code: fa\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
-"X-POT-Import-Date: 2011-05-05 10:52:40+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-POT-Import-Date: 2012-04-22 22:02:21+0000\n"
 
 #. TRANS: Database error message.
 #, php-format
@@ -40,16 +41,14 @@ msgid ""
 "contact them at %2$s to make sure. Otherwise, wait a few minutes and try "
 "again."
 msgstr ""
-
-#. TRANS: Error message.
-msgid ""
-"An important error occured, probably related to email setup. Check logfiles "
-"for more info."
-msgstr ""
+"پایگاه داده برای %1$s قادر به پاسخگویی درست نیست و بنابراین وبگاه به‌درستی "
+"پاسخ نمی‌دهد. مدیران وبگاه احتمالاً از مشکل آگاه هستند، اما می‌توانید برای "
+"اطمینان در %2$s با آن‌ها تماس بگیرید. در غیر اینصورت چند دقیقه صبر و دوباره "
+"امتحان کنید."
 
 #. TRANS: Error message.
 msgid "An error occurred."
-msgstr ""
+msgstr "خطایی رخ داد."
 
 #. TRANS: Error message displayed when there is no StatusNet configuration file.
 #, php-format
@@ -58,9 +57,8 @@ msgid ""
 msgstr ""
 
 #. TRANS: Error message displayed when trying to access a non-existing page.
-#, fuzzy
 msgid "Unknown page"
-msgstr "ناشناخته"
+msgstr "ص�حهٔ ناشناخته"
 
 #. TRANS: Error message displayed when trying to perform an undefined action.
 #. TRANS: Title for password recovery page when an unknown action has been specified.
@@ -106,12 +104,11 @@ msgstr "غیر �عال کردن نام‌نوبسی تازه"
 msgid "Closed"
 msgstr "بسته‌شده"
 
-#. TRANS: Title for button to save access settings in site admin panel.
-msgid "Save access settings"
-msgstr "ذخیرهٔ تنظیمات دسترسی"
+#. TRANS: Button title to save access settings in site admin panel.
+msgid "Save access settings."
+msgstr "ذخیرهٔ تنظیمات دسترسی."
 
-#. TRANS: Tooltip for button to save access settings in site admin panel.
-#. TRANS: Button text for saving theme settings.
+#. TRANS: Button text to save access settings in site admin panel.
 #. TRANS: Button label to save e-mail preferences.
 #. TRANS: Button label to save IM preferences.
 #. TRANS: Button text in the license admin panel.
@@ -127,7 +124,6 @@ msgstr "ذخیرهٔ تنظیمات دسترسی"
 #. TRANS: Button text for saving "Other settings" in profile.
 #. TRANS: Button text to save user settings in user admin panel.
 #. TRANS: Button label in the "Edit application" form.
-#. TRANS: Button text on profile design page to save settings.
 #. TRANS: Text for save button on group edit form.
 #. TRANS: Button text to save tags for a profile.
 msgctxt "BUTTON"
@@ -163,14 +159,8 @@ msgstr "چنین نمایه‌ای وجود ندارد."
 #. TRANS: Client error displayed trying to reference a non-existing list.
 #. TRANS: Client error displayed when referring to a non-existing list.
 #. TRANS: Client error displayed trying to reference a non-existing list.
-#, fuzzy
 msgid "No such list."
-msgstr "چنین برچسبی وجود ندارد."
-
-#. TRANS: Client error displayed when trying to add an OMB 0.1 remote profile to a list.
-#, fuzzy
-msgid "You cannot list an OMB 0.1 remote profile with this action."
-msgstr "نمی‌توان با این کار مشترک یک نمایهٔ از راه دور OMB 0.1شد."
+msgstr "چنین �هرستی وجود ندارد."
 
 #. TRANS: Client error displayed when an unknown error occurs when adding a user to a list.
 #. TRANS: %s is a username.
@@ -187,10 +177,9 @@ msgid ""
 msgstr ""
 
 #. TRANS: Title after adding a user to a list.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Listed"
-msgstr "مجوز"
+msgstr "ذکر شده"
 
 #. TRANS: Server error when page not found (404).
 #. TRANS: Server error when page not found (404)
@@ -202,7 +191,6 @@ msgstr "چنین ص�حه‌ای وجود ندارد."
 #. TRANS: Client error when user not found for an rss related action.
 #. TRANS: Client error displayed when no existing user is provided for a user's delivery device setting.
 #. TRANS: Client error displayed if a user could not be found.
-#. TRANS: Client error when user not found updating a profile background image.
 #. TRANS: Client error displayed updating profile image without having a user object.
 #. TRANS: Client error displayed when making an Atom API request for an unknown user.
 #. TRANS: Client error displayed when trying to block a non-existing user or a user from another site.
@@ -228,14 +216,11 @@ msgstr "چنین ص�حه‌ای وجود ندارد."
 #. TRANS: Client error displayed when trying to get the RSS feed with favorites of a user that does not exist.
 #. TRANS: Client error displayed when requesting Friends of a Friend feed without providing a user nickname.
 #. TRANS: Client error displayed when requesting Friends of a Friend feed for an object that is not a user.
-#. TRANS: Client error displayed when trying to get a user hCard for a non-existing user.
 #. TRANS: Client error displayed trying to make a micro summary without providing a valid user.
 #. TRANS: Client error displayed trying to send a direct message to a non-existing user.
 #. TRANS: Client error displayed trying to use "one time password login" without using an existing user.
 #. TRANS: Client error displayed when referring to non-existing user.
 #. TRANS: Client error displayed trying to perform an action related to a non-existing user.
-#. TRANS: Form validation error on page for remote subscribe when no user was provided.
-#. TRANS: Form validation error on page for remote subscribe when no user profile was found.
 #. TRANS: Client error displayed when trying to reply to a non-exsting user.
 #. TRANS: Client error displayed when providing a non-existing nickname in a RSS 1.0 action.
 #. TRANS: Client error.
@@ -244,7 +229,6 @@ msgstr "چنین ص�حه‌ای وجود ندارد."
 #. TRANS: Client error displayed trying to find a user by ID for a non-existing ID.
 #. TRANS: Client error displayed requesting groups for a non-existing user.
 #. TRANS: Client error displayed when user not found for an action.
-#. TRANS: Client error displayed providing a non-existing nickname.
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #. TRANS: Client error displayed when trying to perform a gallery action with an unknown user.
 #. TRANS: Client error displayed when trying to access a mailbox without providing a user.
@@ -253,9 +237,8 @@ msgid "No such user."
 msgstr "چنین کاربری وجود ندارد."
 
 #. TRANS: Title of a user's own start page.
-#, fuzzy
 msgid "Home timeline"
-msgstr "خط‌زمانی %s"
+msgstr "خط زمانی خانه"
 
 #. TRANS: Title of another user's start page.
 #. TRANS: %s is the other user's name.
@@ -263,6 +246,13 @@ msgstr "خط‌زمانی %s"
 msgid "%s's home timeline"
 msgstr "خط‌زمانی %s"
 
+#. TRANS: %s is user nickname.
+#. TRANS: Feed title.
+#. TRANS: %s is tagger's nickname.
+#, fuzzy, php-format
+msgid "Feed for friends of %s (Activity Streams JSON)"
+msgstr "خوراک دوستان %s (Atom)"
+
 #. TRANS: %s is user nickname.
 #, php-format
 msgid "Feed for friends of %s (RSS 1.0)"
@@ -306,7 +296,7 @@ msgstr ""
 "اولین کسی باشید که در [این موضوع](%%%%action.newnotice%%%%?status_textarea=%"
 "s) پیام می‌�رستد."
 
-#. TRANS: Encoutagement displayed on empty timeline user pages for anonymous users.
+#. TRANS: Encouragement displayed on empty timeline user pages for anonymous users.
 #. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
 #. TRANS: Empty list message for page with replies for a user for not logged in users.
 #. TRANS: %1$s is a user nickname. This message contains a Markdown link in the form [link text](link).
@@ -320,6 +310,13 @@ msgstr ""
 "چرا به [باز کردن یک حساب](%%action.register%%) اقدام نمی‌کنید و اولین ن�ری "
 "باشید که چیزی می‌�رستد!"
 
+#. TRANS: Button text for inviting more users to the StatusNet instance.
+#. TRANS: Less business/enterprise-oriented language for public sites.
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Send invite"
+msgstr "دعوت‌نامه‌ها"
+
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Title of API timeline for a user and friends.
 #. TRANS: %s is a username.
@@ -328,8 +325,6 @@ msgstr ""
 #. TRANS: %s is a username.
 #. TRANS: Menu item title in personal group navigation menu.
 #. TRANS: %s is a username.
-#. TRANS: Menu item title in settings navigation panel.
-#. TRANS: %s is a username.
 #, php-format
 msgid "%s and friends"
 msgstr "%s و دوستان"
@@ -368,7 +363,6 @@ msgstr ""
 #. TRANS: Server error thrown on database error updating SMS preferences.
 #. TRANS: Server error thrown on database error removing a registered SMS phone number.
 #. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
-#. TRANS: Server exception thrown on Profile design page when updating design settings fails.
 msgid "Could not update user."
 msgstr "نمی‌توان کاربر را به‌هنگام‌سازی کرد."
 
@@ -383,7 +377,6 @@ msgstr "نمی‌توان نمایه را ذخیره کرد."
 
 #. TRANS: Client error displayed when the number of bytes in a POST request exceeds a limit.
 #. TRANS: %s is the number of bytes of the CONTENT_LENGTH.
-#. TRANS: Form validation error in design settings form. POST should remain untranslated.
 #, fuzzy, php-format
 msgid ""
 "The server was unable to handle that much POST data (%s byte) due to its "
@@ -394,24 +387,6 @@ msgid_plural ""
 msgstr[0] ""
 "به دلیل تنظبمات، سرور نمی‌تواند این مقدار اطلاعات (%s بایت( را دریا�ت کند."
 
-#. TRANS: Client error displayed when saving design settings fails because of an empty id.
-#. TRANS: Client error displayed when saving design settings fails because of an empty result.
-#. TRANS: Client error displayed when a database error occurs inserting profile colours.
-#. TRANS: Client error displayed when a database error occurs updating profile colours.
-#. TRANS: Form validation error displayed when group design settings could not be saved because of an application issue.
-#. TRANS: Form validation error on Profile design page when saving design settings has failed.
-#. TRANS: Form validation error on Profile design page when updating design settings has failed.
-msgid "Unable to save your design settings."
-msgstr "نمی‌توان تنظیمات طرح‌تان را ذخیره کرد."
-
-#. TRANS: Error displayed when updating design settings fails.
-#. TRANS: Client error displayed when a database error occurs updating profile colours.
-#. TRANS: Form validation error on Profile design page when updating design settings has failed.
-#. TRANS: Error message displayed if design settings could not be saved.
-#. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
-msgid "Could not update your design."
-msgstr "نمی‌توان طرح‌تان به‌هنگام‌سازی کرد."
-
 #. TRANS: Title for Atom feed.
 msgctxt "ATOM"
 msgid "Main"
@@ -458,6 +433,22 @@ msgstr "مسدود کردن کاربر شکست خورد."
 msgid "Unblock user failed."
 msgstr "باز کردن کاربر نامو�ق بود."
 
+#. TRANS: Client exception thrown when no conversation ID is given.
+#, fuzzy
+msgid "No conversation ID."
+msgstr "مکالمه"
+
+#. TRANS: Client exception thrown when referring to a non-existing conversation ID (%d).
+#, fuzzy, php-format
+msgid "No conversation with ID %d."
+msgstr "مکالمه"
+
+#. TRANS: Title for conversion timeline.
+#, fuzzy
+msgctxt "TITLE"
+msgid "Conversation"
+msgstr "مکالمه"
+
 #. TRANS: Title. %s is a user nickname.
 #, php-format
 msgid "Direct messages from %s"
@@ -500,6 +491,8 @@ msgid "Cannot send direct messages to users who aren't your friend."
 msgstr "نمی‌توان پیام مستقیم را به کاربرانی که دوست شما نیستند، �رستاد."
 
 #. TRANS: Client error displayed trying to direct message self (403).
+#. TRANS: Client error displayed trying to send a direct message to self.
+#. TRANS: Error text shown when trying to send a direct message to self.
 #, fuzzy
 msgid ""
 "Do not send a message to yourself; just say it to yourself quietly instead."
@@ -612,10 +605,10 @@ msgstr "نام کامل خیلی طولانی است (حداکثر ۲۵۵ نوی
 #. TRANS: %d is the maximum number of characters for the description.
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed characters.
-#, fuzzy, php-format
+#, php-format
 msgid "Description is too long (maximum %d character)."
 msgid_plural "Description is too long (maximum %d characters)."
-msgstr[0] "توصی� خیلی طولانی است (حداکثر %d نویسه)"
+msgstr[0] "توضیح خیلی طولانی است (حداکثر %d نویسه)."
 
 #. TRANS: Client error shown when providing too long a location during group creation.
 #. TRANS: API validation exception thrown when location does not validate.
@@ -729,7 +722,6 @@ msgstr "گروه‌ها در %s"
 
 #. TRANS: Client error displayed when trying to edit a group without being an admin.
 #. TRANS: Client error displayed trying to edit a group while not being a group admin.
-#. TRANS: Client error displayed trying to change group design settings without being a (group) admin.
 #. TRANS: Client error displayed when trying to change group logo settings while not being a group admin.
 msgid "You must be an admin to edit the group."
 msgstr "برای ویرایش گروه باید یک مدیر باشید."
@@ -849,7 +841,6 @@ msgstr "هنگام ا�زودن کاربر برنامهٔ OAuth در پایگا
 
 #. TRANS: Client error given on when invalid data was passed through a form in the OAuth API.
 #. TRANS: Unexpected validation error on avatar upload form.
-#. TRANS: Client error displayed when the submitted form contains unexpected data.
 #. TRANS: Client error displayed submitting invalid form data for edit application.
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
 #. TRANS: Form validation error message when an unsupported argument is used.
@@ -858,7 +849,6 @@ msgstr "هنگام ا�زودن کاربر برنامهٔ OAuth در پایگا
 #. TRANS: Client error when submitting a form with unexpected information.
 #. TRANS: Client error displayed when unexpected data is posted in the password recovery form.
 #. TRANS: Message given submitting a form with an unknown action in SMS settings.
-#. TRANS: Unknown form validation error in design settings form.
 msgid "Unexpected form submission."
 msgstr "ارسال غیر قابل انتظار �رم."
 
@@ -905,7 +895,6 @@ msgstr "حساب کاربری"
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Field label on account registration page.
-#. TRANS: Label for nickname on user authorisation page.
 #. TRANS: Field label on group edit form.
 #. TRANS: Dropdown option for searching in profiles.
 msgid "Nickname"
@@ -1221,12 +1210,9 @@ msgstr "برای ترک یک گروه، شما باید وارد شده باشی
 #. TRANS: Client error displayed when requesting Friends of a Friend feed for a nickname that is not a group.
 #. TRANS: Client error displayed trying to block a user from a group while specifying a non-existing group.
 #. TRANS: Client error displayed referring to a group's permalink for a non-existing group ID.
-#. TRANS: Client error displayed trying to change group design settings while providing a nickname for a non-existing group.
 #. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
 #. TRANS: Client error displayed when trying to view group members for a non-existing group.
 #. TRANS: Client error displayed when trying to view group members for an object that is not a group.
-#. TRANS: Client error displayed when trying to view group members for a non-existing group.
-#. TRANS: Client error displayed when trying to view group members for an object that is not a group.
 #. TRANS: Client error displayed when requesting a group RSS feed for group that does not exist.
 #. TRANS: Client error displayed when requesting a group RSS feed for an object that is not a group.
 #. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
@@ -1235,10 +1221,10 @@ msgstr "برای ترک یک گروه، شما باید وارد شده باشی
 #. TRANS: Client error displayed when trying to leave a non-local group.
 #. TRANS: Client error displayed when trying to leave a non-existing group.
 #. TRANS: Client error displayed when providing an invalid group ID on the Make Admin page.
-#. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
-#. TRANS: Client error displayed if no local group with a given name was found requesting group page.
 #. TRANS: Command exception text shown when a group is requested that does not exist.
 #. TRANS: Error text shown when trying to leave a group that does not exist.
+#. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
+#. TRANS: Client error displayed if no local group with a given name was found requesting group page.
 msgid "No such group."
 msgstr "چنین گروهی وجود ندارد."
 
@@ -1307,6 +1293,7 @@ msgid "Join request canceled."
 msgstr "درخواست عضویت لغو شد."
 
 #. TRANS: Client error displayed trying to approve subscription for a non-existing request.
+#. TRANS: %s is a user nickname.
 #, fuzzy, php-format
 msgid "%s is not in the moderation queue for your subscriptions."
 msgstr "یک �هرست از کاربران در این گروه"
@@ -1453,9 +1440,9 @@ msgstr ""
 
 #. TRANS: Client exception thrown when subscribing to a non-existing profile.
 #. TRANS: %s is the unknown profile ID.
-#, fuzzy, php-format
+#, php-format
 msgid "Unknown profile %s."
-msgstr "نوع �ایل پشتیبانی نشده"
+msgstr "پرو�ایل ناشناخته %s."
 
 #. TRANS: Client error displayed trying to subscribe to an already subscribed profile.
 #. TRANS: %s is the profile the user already has a subscription on.
@@ -1470,7 +1457,6 @@ msgstr "چنین پیوستی وجود ندارد."
 #. TRANS: Client error displayed trying to get an avatar without providing a nickname.
 #. TRANS: Client error displayed when requesting a list of blocked users for a group without providing a group nickname.
 #. TRANS: Client error displayed trying to edit a group while not proving a nickname for the group to edit.
-#. TRANS: Client error displayed trying to change group design settings without providing a group nickname.
 #. TRANS: Client error displayed when trying to change group logo settings without providing a nickname.
 #. TRANS: Client error displayed when trying to view group members without providing a group nickname.
 #. TRANS: Client error displayed when requesting a group RSS feed without providing a group nickname.
@@ -1769,6 +1755,18 @@ msgstr "نشانی «%s« برای شما تصدیق شد."
 msgid "Conversation"
 msgstr "مکالمه"
 
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#, fuzzy
+msgid "Conversation feed (Activity Streams JSON)"
+msgstr "خوراک پیام‌های %s (Atom)"
+
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#, fuzzy
+msgid "Conversation feed (RSS 2.0)"
+msgstr "خوراک پیام‌های %s (RSS 2.0)"
+
 #. TRANS: Title for conversation page.
 #. TRANS: Title for page that shows a notice.
 #, fuzzy
@@ -1830,7 +1828,7 @@ msgstr "«%s» را برای تأیید اینکه می‌خواهید حساب
 
 #. TRANS: Button title for user account deletion.
 #, fuzzy
-msgid "Permanently delete your account"
+msgid "Permanently delete your account."
 msgstr "شما نمی‌توانید کاربران را پاک کنید."
 
 #. TRANS: Client error displayed trying to delete an application while not logged in.
@@ -1982,159 +1980,6 @@ msgstr "این کاربر را حذ� نکن"
 msgid "Delete this user."
 msgstr "این کاربر حذ� شود."
 
-#. TRANS: Message used as title for design settings for the site.
-msgid "Design"
-msgstr "طرح"
-
-#. TRANS: Instructions for design adminsitration panel.
-msgid "Design settings for this StatusNet site"
-msgstr ""
-
-#. TRANS: Client error displayed when a logo URL does is not valid.
-msgid "Invalid logo URL."
-msgstr "نشانی اینترنتی نشان نامعتبر است."
-
-#. TRANS: Client error displayed when an SSL logo URL is invalid.
-#, fuzzy
-msgid "Invalid SSL logo URL."
-msgstr "نشانی اینترنتی نشان نامعتبر است."
-
-#. TRANS: Client error displayed when a theme is submitted through the form that is not in the theme list.
-#. TRANS: %s is the chosen unavailable theme.
-#, php-format
-msgid "Theme not available: %s."
-msgstr "پوسته در دسترس نیست: %s."
-
-#. TRANS: Fieldset legend for form to change logo.
-msgid "Change logo"
-msgstr "تغییر نشان"
-
-#. TRANS: Field label for StatusNet site logo.
-msgid "Site logo"
-msgstr "نشان وب‌گاه"
-
-#. TRANS: Field label for SSL StatusNet site logo.
-#, fuzzy
-msgid "SSL logo"
-msgstr "نشان وب‌گاه"
-
-#. TRANS: Fieldset legend for form change StatusNet site's theme.
-msgid "Change theme"
-msgstr "تغییر پوسته"
-
-#. TRANS: Field label for dropdown to choose site theme.
-msgid "Site theme"
-msgstr "پوستهٔ وب‌گاه"
-
-#. TRANS: Title for field label for dropdown to choose site theme.
-msgid "Theme for the site."
-msgstr "پوسته برای وب‌گاه"
-
-#. TRANS: Field label for uploading a cutom theme.
-msgid "Custom theme"
-msgstr "پوستهٔ اختصاصی"
-
-#. TRANS: Form instructions for uploading a cutom StatusNet theme.
-msgid "You can upload a custom StatusNet theme as a .ZIP archive."
-msgstr ""
-"شما می‌توانید یک پوستهٔ اختصاصی StatusNet را به‌عنوان یک آرشیو .ZIP بارگذاری "
-"کنید."
-
-#. TRANS: Fieldset legend for theme background image.
-msgid "Change background image"
-msgstr "تغییر تصویر پیش‌زمینه"
-
-#. TRANS: Field label for background image on theme designer page.
-#. TRANS: Field label for background color selector.
-#. TRANS: Label on profile design page for setting a profile page background colour.
-msgid "Background"
-msgstr "پیش‌زمینه"
-
-#. TRANS: Form guide for background image upload form on theme designer page.
-#, php-format
-msgid ""
-"You can upload a background image for the site. The maximum file size is %1"
-"$s."
-msgstr ""
-"شما می‌توانید یک تصویر پیش‌زمینه را برای وب‌گاه بارگذاری کنید. بیشینهٔ اندازهٔ "
-"پرونده %1 $s است."
-
-#. TRANS: Used as radio button label to add a background image.
-msgid "On"
-msgstr "روشن"
-
-#. TRANS: Used as radio button label to not add a background image.
-msgid "Off"
-msgstr "خاموش"
-
-#. TRANS: Form guide for turning background image on or off on theme designer page.
-#. TRANS: Form guide for a set of radio buttons on the profile design page that will enable or disable
-#. TRANS: use of the uploaded profile image.
-msgid "Turn background image on or off."
-msgstr "تصویر پیش‌زمینه را �عال یا غیر�عال کنید."
-
-#. TRANS: Checkbox label to title background image on theme designer page.
-#. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
-msgid "Tile background image"
-msgstr "تصویر پیش‌زمینهٔ موزاییکی"
-
-#. TRANS: Fieldset legend for theme colors.
-#, fuzzy
-msgid "Change colors"
-msgstr "تغییر رنگ‌ها"
-
-#. TRANS: Field label for content color selector.
-#. TRANS: Label on profile design page for setting a profile page content colour.
-msgid "Content"
-msgstr "محتوا"
-
-#. TRANS: Field label for sidebar color selector.
-#. TRANS: Label on profile design page for setting a profile page sidebar colour.
-msgid "Sidebar"
-msgstr "ستون کناری"
-
-#. TRANS: Field label for text color selector.
-#. TRANS: Label on profile design page for setting a profile page text colour.
-msgid "Text"
-msgstr "متن"
-
-#. TRANS: Field label for link color selector.
-#. TRANS: Label on profile design page for setting a profile page links colour.
-msgid "Links"
-msgstr "پیوندها"
-
-#. TRANS: Fieldset legend for advanced theme design settings.
-msgid "Advanced"
-msgstr "پیشر�ته"
-
-#. TRANS: Field label for custom CSS.
-msgid "Custom CSS"
-msgstr "CSS اختصاصی"
-
-#. TRANS: Button text for resetting theme settings.
-#, fuzzy
-msgctxt "BUTTON"
-msgid "Use defaults"
-msgstr "است�اده‌کردن از پیش‌�رض‌ها"
-
-#. TRANS: Title for button for resetting theme settings.
-#. TRANS: Title for button on profile design page to reset all colour settings to default.
-#, fuzzy
-msgid "Restore default designs."
-msgstr "بازگرداندن طرح‌های پیش‌�رض"
-
-#. TRANS: Title for button for resetting theme settings.
-#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#, fuzzy
-msgid "Reset back to default."
-msgstr "برگشت به حالت پیش گزیده"
-
-#. TRANS: Title for button for saving theme settings.
-#. TRANS: Title for button on profile design page to save settings.
-#, fuzzy
-msgid "Save design."
-msgstr "ذخیره‌کردن طرح"
-
 #. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
 msgid "This notice is not a favorite!"
 msgstr "این پیام یک پیام برگزیده نیست!"
@@ -2149,6 +1994,84 @@ msgstr "ا�زودن به برگزیده‌ها"
 msgid "No such document \"%s\"."
 msgstr "چنین پیوستی وجود ندارد."
 
+#. TRANS: Menu item in administrator navigation panel.
+#. TRANS: Menu item in default local navigation panel.
+#. TRANS: Menu item in personal group navigation menu.
+#, fuzzy
+msgctxt "MENU"
+msgid "Home"
+msgstr "خانه"
+
+msgctxt "MENU"
+msgid "Docs"
+msgstr ""
+
+#. TRANS: Secondary navigation menu item leading to help on StatusNet.
+msgctxt "MENU"
+msgid "Help"
+msgstr "Ú©Ù…Ú©"
+
+#, fuzzy
+msgid "Getting started"
+msgstr "تنظیمات ذخیره شد."
+
+#. TRANS: Secondary navigation menu item leading to text about StatusNet site.
+#, fuzzy
+msgctxt "MENU"
+msgid "About"
+msgstr "دربارهٔ"
+
+#, fuzzy
+msgid "About this site"
+msgstr "آزاد سازی کاربر"
+
+#. TRANS: Secondary navigation menu item leading to Frequently Asked Questions.
+#, fuzzy
+msgctxt "MENU"
+msgid "FAQ"
+msgstr "سوال‌های رایج"
+
+msgid "Frequently asked questions"
+msgstr ""
+
+#. TRANS: Secondary navigation menu item leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+#, fuzzy
+msgctxt "MENU"
+msgid "Contact"
+msgstr "تماس"
+
+#, fuzzy
+msgid "Contact info"
+msgstr "تماس"
+
+#, fuzzy
+msgctxt "MENU"
+msgid "Tags"
+msgstr "برچسب‌ها"
+
+msgid "Using tags"
+msgstr ""
+
+#. TRANS: Menu item in default local navigation panel.
+#. TRANS: Menu item in search group navigation panel.
+#. TRANS: Menu item in local navigation menu.
+#, fuzzy
+msgctxt "MENU"
+msgid "Groups"
+msgstr "گروه‌ها"
+
+#, fuzzy
+msgid "Using groups"
+msgstr "گروه‌های کاربر"
+
+msgctxt "MENU"
+msgid "API"
+msgstr ""
+
+msgid "RESTful API"
+msgstr ""
+
 #. TRANS: Title for "Edit application" form.
 #. TRANS: Form legend.
 msgid "Edit application"
@@ -2317,7 +2240,7 @@ msgid ""
 "subscriptions to it. Do you still want to continue?"
 msgstr ""
 
-#. TRANS: TRANS: Server error displayed when updating a list fails.
+#. TRANS: Server error displayed when updating a list fails.
 #, fuzzy
 msgid "Could not update list."
 msgstr "نمی‌توان کاربر را به‌هنگام‌سازی کرد."
@@ -2339,7 +2262,7 @@ msgstr "نشانی پست الکترونیک"
 
 #. TRANS: Form note in e-mail settings form.
 msgid "Current confirmed email address."
-msgstr "نشانی پست الکترونیکی تایید شدهٔ کنونی"
+msgstr "نشانی رایانامه تأیید شدهٔ کنونی"
 
 #. TRANS: Button label to remove a confirmed e-mail address.
 #. TRANS: Button label for removing a set sender e-mail address to post notices from.
@@ -2478,7 +2401,7 @@ msgid ""
 "A confirmation code was sent to the email address you added. Check your "
 "inbox (and spam box!) for the code and instructions on how to use it."
 msgstr ""
-"کد تایید به نشانی شما �رستاده شد. صندوق ورودی (و صندوق هرزنامه‌تان!) را برای "
+"کد تأیید به نشانی شما �رستاده شد. صندوق ورودی (و صندوق هرزنامه‌تان!) را برای "
 "کد و راهنمای است�ادهٔ آن بررسی کنید."
 
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
@@ -2629,40 +2552,6 @@ msgstr "هیچ پیوستی وجود ندارد."
 msgid "No uploaded attachments."
 msgstr "هیچ پیوست بارگذاری شده‌ای وجود ندارد."
 
-#. TRANS: Client error displayed when subscribing to a remote profile and an unexpected response is received.
-msgid "Not expecting this response!"
-msgstr "انتظار چنین واکنشی وجود نداشت!"
-
-#. TRANS: Client error displayed when subscribing to a remote profile that does not exist.
-msgid "User being listened to does not exist."
-msgstr "کاربری که دنبالش هستید وجود ندارد."
-
-#. TRANS: Client error displayed when subscribing to a remote profile that is a local profile.
-#. TRANS: Client error displayed when using remote subscribe for a local entity.
-msgid "You can use the local subscription!"
-msgstr "شما می‌توانید از دنبال کردن محلی است�اده کنید!"
-
-#. TRANS: Client error displayed when subscribing to a remote profile that is blocked form subscribing to.
-msgid "That user has blocked you from subscribing."
-msgstr "این کاربر شما را از دنبال کردن خودش منع کرده است."
-
-#. TRANS: Client error displayed when subscribing to a remote profile without providing an authorised token.
-msgid "You are not authorized."
-msgstr "شما شناسایی نشده اید."
-
-#. TRANS: Client error displayed when subscribing to a remote profile and conversion of the request token to access token fails.
-msgid "Could not convert request token to access token."
-msgstr "نمی‌توان نشانهٔ درخواست شما را به نشانهٔ دسترسی تبدیل کرد."
-
-#. TRANS: Client error displayed when subscribing to a remote profile fails because of an unsupported version of the OMB protocol.
-msgid "Remote service uses unknown version of OMB protocol."
-msgstr "خدمات مورد نظر از نسخهٔ نام�هومی از قرارداد OMB است�اده می‌کند."
-
-#. TRANS: Server error displayed when subscribing to a remote profile fails because the remote profile could not be updated.
-#. TRANS: Exception thrown when updating a remote profile fails in OAuth store.
-msgid "Error updating remote profile."
-msgstr "خطا هنگام به‌هنگام‌سازی نمایهٔ از راه دور."
-
 #. TRANS: Client error displayed when requesting a non-existent file.
 msgid "No such file."
 msgstr "چنین پرونده‌ای وجود ندارد."
@@ -2752,30 +2641,6 @@ msgstr "اشکال پایگاه داده در مسدود کردن کاربر"
 msgid "No ID."
 msgstr "هیچ ID وجود ندارد."
 
-#. TRANS: Client error displayed trying to change group design settings while not logged in.
-msgid "You must be logged in to edit a group."
-msgstr "برای ویرایش گروه باید وارد شوید."
-
-#. TRANS: Title group design settings page.
-msgid "Group design"
-msgstr "ظاهر گروه"
-
-#. TRANS: Instructions for group design settings page.
-msgid ""
-"Customize the way your group looks with a background image and a colour "
-"palette of your choice."
-msgstr "ظاهر گروه را تغییر دهید تا شما را راضی کند."
-
-#. TRANS: Form validation error displayed when group design settings could not be updated because of an application issue.
-#, fuzzy
-msgid "Unable to update your design settings."
-msgstr "نمی‌توان تنظیمات طرح‌تان را ذخیره کرد."
-
-#. TRANS: Form text to confirm saved group design settings.
-#. TRANS: Confirmation message on Profile design page when saving design settings has succeeded.
-msgid "Design preferences saved."
-msgstr "ترجیحات طرح ذخیره شد."
-
 #. TRANS: Title for group logo settings page.
 #. TRANS: Group logo form legend.
 msgid "Group logo"
@@ -2893,7 +2758,7 @@ msgid ""
 "Separate the terms by spaces; they must be 3 characters or more."
 msgstr ""
 "برای جست‌وجوی گروه‌ها در %%site.name%% از نام، مکان یا توصی�‌شان است�اده کنید. "
-"عبارت‌ها را با �اصله جدا کنید؛ آن‌ها باید ۳ نویسه یا بیش‌تر باشند."
+"عبارت‌ها را با �اصله جدا کنید؛ آن‌ها باید ۳ نویسه یا بیشتر باشند."
 
 #. TRANS: Title for page where groups can be searched.
 msgid "Group search"
@@ -2948,8 +2813,8 @@ msgstr "تنظیمات پیام‌رسان �وری"
 #. TRANS: the order and formatting of link text and link should remain unchanged.
 #, fuzzy, php-format
 msgid ""
-"You can send and receive notices through instant messaging [instant messages]"
-"(%%doc.im%%). Configure your addresses and settings below."
+"You can send and receive notices through [instant messaging](%%doc.im%%). "
+"Configure your addresses and settings below."
 msgstr ""
 "شما می‌توانید پیام‌های خود را با است�اده از [پیام‌رسان‌های](%%doc.im%%) Jabber "
 "یا Gtalk ارسال/دریا�ت کنید. نشانی خود را در این قسمت تنظیم کنید"
@@ -2971,7 +2836,7 @@ msgid ""
 "with further instructions. (Did you add %2$s to your buddy list?)"
 msgstr ""
 "منتظر تایید این نشانی هستیم. لط�ا Jabber/Gtalk خود را برای دریا�ت توضیحات "
-"بیش‌تر بررسی کنید. (آیا %s را به �هرست خود اضا�ه کرده اید؟) "
+"بیشتر بررسی کنید. (آیا %s را به �هرست خود اضا�ه کرده اید؟)"
 
 #. TRANS: Field label for IM address.
 msgid "IM address"
@@ -3161,29 +3026,6 @@ msgid ""
 msgstr ""
 "برای دعوت دوستان و تشویق آن‌ها به است�اده از خدمات از �رم زیر است�اده کنید."
 
-#. TRANS: Field label for a list of e-mail addresses.
-msgid "Email addresses"
-msgstr "نشانی‌های پست الکترونیکی"
-
-#. TRANS: Tooltip for field label for a list of e-mail addresses.
-#, fuzzy
-msgid "Addresses of friends to invite (one per line)."
-msgstr "نشانی دوستان (یک نشانی در هر خط("
-
-#. TRANS: Field label for a personal message to send to invitees.
-msgid "Personal message"
-msgstr "پیام خصوصی"
-
-#. TRANS: Tooltip for field label for a personal message to send to invitees.
-msgid "Optionally add a personal message to the invitation."
-msgstr "در صورت تمایل می‌توانید یک پیام به همراه دعوت نامه ب�رستید."
-
-#. TRANS: Send button for inviting friends
-#. TRANS: Button text for sending notice.
-msgctxt "BUTTON"
-msgid "Send"
-msgstr "�رستادن"
-
 #. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral
 #. TRANS: singular 3rd-person pronoun in English. %1$s is the inviting user, $2$s is
 #. TRANS: the StatusNet sitename.
@@ -3320,12 +3162,6 @@ msgstr ""
 msgid "Save license settings."
 msgstr "ذخیرهٔ تنظیمات وب‌گاه"
 
-#. TRANS: Client error displayed when trying to log in while already logged in.
-#. TRANS: Client error displayed trying to use "one time password login" when already logged in.
-#. TRANS: Client error displayed when trying to register while already logged in.
-msgid "Already logged in."
-msgstr "قبلا وارد شده"
-
 #. TRANS: Form validation error displayed when trying to log in with incorrect credentials.
 msgid "Incorrect username or password."
 msgstr "نام کاربری یا گذرواژه نادرست است."
@@ -3437,6 +3273,7 @@ msgstr "نشانی اینترنتی منبع مورد نیاز است."
 msgid "Could not create application."
 msgstr "نمی‌توان برنامه را ساخت."
 
+#. TRANS: Form validation error messages displayed when uploading an invalid application logo.
 #, fuzzy
 msgid "Invalid image."
 msgstr "اندازه نادرست است."
@@ -3476,12 +3313,6 @@ msgstr "محتوایی وحود ندارد!"
 msgid "No recipient specified."
 msgstr "هیچ گیرنده ای مشخص نشده"
 
-#. TRANS: Client error displayed trying to send a direct message to self.
-#. TRANS: Error text shown when trying to send a direct message to self.
-msgid ""
-"Don't send a message to yourself; just say it to yourself quietly instead."
-msgstr "یک پیام را به خودتان ن�رستید؛ در عوض آن را آهسته برای خود بگویید."
-
 #. TRANS: Page title after sending a direct message.
 msgid "Message sent"
 msgstr "پیام �رستاده‌شد"
@@ -3685,6 +3516,33 @@ msgstr "لط�ا تنها از نشانی‌های اینترنتی %s از را
 msgid "Not a supported data format."
 msgstr "یک قالب دادهٔ پشتیبانی‌شده نیست."
 
+#. TRANS: Page title for profile settings.
+#, fuzzy
+msgid "Old school UI settings"
+msgstr "تنظیمات پیام‌رسان �وری"
+
+#. TRANS: Usage instructions for profile settings.
+msgid "If you like it \"the old way\", you can set that here."
+msgstr ""
+
+#. TRANS: Confirmation shown when user profile settings are saved.
+#. TRANS: Message after successful saving of administrative settings.
+msgid "Settings saved."
+msgstr "تنظیمات ذخیره شد."
+
+msgid "Only stream mode (no conversations) in timelines"
+msgstr ""
+
+msgid "Show conversation page as hierarchical trees"
+msgstr ""
+
+msgid "Show nicknames (not full names) in timelines"
+msgstr ""
+
+#. TRANS: Button text to save a list.
+msgid "Save"
+msgstr "ذخیره‌کردن"
+
 #. TRANS: ShortName in the OpenSearch interface when trying to find users.
 msgid "People Search"
 msgstr "جست‌وجوی کاربران"
@@ -3693,6 +3551,11 @@ msgstr "جست‌وجوی کاربران"
 msgid "Notice Search"
 msgstr "جست‌وجوی پیام‌ها"
 
+#. TRANS: Client error displayed trying to use "one time password login" when already logged in.
+#. TRANS: Client error displayed when trying to register while already logged in.
+msgid "Already logged in."
+msgstr "قبلا وارد شده"
+
 #. TRANS: Client error displayed trying to use "one time password login" without specifying a user.
 msgid "No user ID specified."
 msgstr "هیچ شناسهٔ کاربری مشخص نشده است."
@@ -3767,7 +3630,7 @@ msgid "Confirm"
 msgstr "تایید"
 
 #. TRANS: Field title on page where to change password.
-#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
+#. TRANS: Title for field label for password reset form where the password has to be typed again.
 #. TRANS: Field title on account registration page.
 #, fuzzy
 msgid "Same as password above."
@@ -3830,12 +3693,6 @@ msgstr "شاخهٔ پوسته‌ها قابل خواندن نیست: %s."
 msgid "Avatar directory not writable: %s."
 msgstr "شاخهٔ تصویر چهره‌ها قابل نوشتن نیست: %s."
 
-#. TRANS: Client error in Paths admin panel.
-#. TRANS: %s is the background directory that could not be written to.
-#, php-format
-msgid "Background directory not writable: %s."
-msgstr "شاخهٔ پس زمینه‌ها قابل نوشتن نیست: %s."
-
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the locales directory that could not be read from.
 #, php-format
@@ -3960,32 +3817,6 @@ msgstr "شاخهٔ نیم‌رخ"
 msgid "Directory where avatars are located."
 msgstr "مسیر پوشه برای زبان‌های محلی"
 
-#. TRANS: Fieldset legend in Paths admin panel.
-msgid "Backgrounds"
-msgstr "پس زمینه‌ها"
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-#, fuzzy
-msgid "Server for backgrounds."
-msgstr "پوسته برای وب‌گاه"
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-msgid "Web path to backgrounds."
-msgstr ""
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-msgid "Server for backgrounds on SSL pages."
-msgstr ""
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-msgid "Web path to backgrounds on SSL pages."
-msgstr ""
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-#, fuzzy
-msgid "Directory where backgrounds are located."
-msgstr "مسیر پوشه برای زبان‌های محلی"
-
 #. TRANS: Fieldset legens in Paths admin panel.
 msgid "Attachments"
 msgstr "ضمائم"
@@ -4048,8 +3879,9 @@ msgid "Server to direct SSL requests to."
 msgstr "کارگزار برای هدایت درخواست‌های SSL به"
 
 #. TRANS: Button title text to store form data in the Paths admin panel.
-msgid "Save paths"
-msgstr "نشانی ذخیره سازی"
+#, fuzzy
+msgid "Save path settings."
+msgstr "ذخیرهٔ تنظیمات وب‌گاه"
 
 #. TRANS: Instructions for the "People search" page.
 #. TRANS: %%site.name%% is the name of the StatusNet site.
@@ -4192,7 +4024,7 @@ msgid ""
 "%%%site.name%%%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
 "blogging) service based on the Free Software [StatusNet](http://status.net/) "
 "tool. You can easily keep track of what they are doing by subscribing to the "
-"tag's timeline."
+"list's timeline."
 msgstr ""
 "**%s** یک گروه کاربری در %%%%site.name%%%%، یک سرویس [میکروبلاگینگ](http://"
 "fa.wikipedia.org/wiki/%D9%85%DB%8C%DA%A9%D8%B1%D9%88%D8%A8%D9%84%D8%A7%DA%AF%"
@@ -4226,7 +4058,7 @@ msgid ""
 "site.name%%%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
 "blogging) service based on the Free Software [StatusNet](http://status.net/) "
 "tool. You can easily keep track of what they are doing by subscribing to the "
-"tag's timeline."
+"list's timeline."
 msgstr ""
 "**%s** یک گروه کاربری در %%%%site.name%%%%، یک سرویس [میکروبلاگینگ](http://"
 "fa.wikipedia.org/wiki/%D9%85%DB%8C%DA%A9%D8%B1%D9%88%D8%A8%D9%84%D8%A7%DA%AF%"
@@ -4333,16 +4165,6 @@ msgid ""
 "All default plugins have been disabled from the site's configuration file."
 msgstr ""
 
-#. TRANS: Client error displayed if the notice posted has too many characters.
-msgid "Invalid notice content."
-msgstr "محتوای پیام نامعتبر است."
-
-#. TRANS: Exception thrown if a notice's license is not compatible with the StatusNet site license.
-#. TRANS: %1$s is the notice license, %2$s is the StatusNet site's license.
-#, fuzzy, php-format
-msgid "Notice license \"%1$s\" is not compatible with site license \"%2$s\"."
-msgstr "مجوز پیام «%1$s» با مجوز وب‌گاه «%2$s» سازگار نیست."
-
 #. TRANS: Client error displayed when trying to add an unindentified field to profile.
 #. TRANS: %s is a field name.
 #, php-format
@@ -4441,6 +4263,8 @@ msgid "Share my current location when posting notices"
 msgstr "مکان کنونی من هنگام �رستادن پیام‌ها به اشتراک گذاشته شود"
 
 #. TRANS: Field label in form for profile settings.
+#. TRANS: Title for group tag cloud section.
+#. TRANS: %s is a group name.
 msgid "Tags"
 msgstr "برچسب‌ها"
 
@@ -4470,9 +4294,8 @@ msgid "What timezone are you normally in?"
 msgstr "شما معمولا در کدام منطقهٔ زمانی هستید؟"
 
 #. TRANS: Checkbox label in form for profile settings.
-#, fuzzy
 msgid ""
-"Automatically subscribe to whoever subscribes to me (best for non-humans)."
+"Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr ""
 "به صورت خودکار مشترک هر کسی بشو که مشترک من می‌شود (بهترین برای غیر انسان‌ها)"
 
@@ -4542,11 +4365,6 @@ msgstr "نمی‌توان تنظیمات مکانی را تنظیم کرد."
 msgid "Could not save tags."
 msgstr "نمی‌توان برچسب‌ها را ذخیره کرد."
 
-#. TRANS: Confirmation shown when user profile settings are saved.
-#. TRANS: Message after successful saving of administrative settings.
-msgid "Settings saved."
-msgstr "تنظیمات ذخیره شد."
-
 #. TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
 #. TRANS: Page title for page where a user account can be restored from backup.
 #, fuzzy
@@ -4560,7 +4378,8 @@ msgid "Beyond the page limit (%s)."
 msgstr ""
 
 #. TRANS: Server error displayed when a public timeline cannot be retrieved.
-msgid "Could not retrieve public stream."
+#, fuzzy
+msgid "Could not retrieve public timeline."
 msgstr "نمی‌توان جریان عمومی را دریا�ت کرد."
 
 #. TRANS: Title for all public timeline pages but the first.
@@ -4575,15 +4394,23 @@ msgid "Public timeline"
 msgstr "خط‌زمانی عمومی"
 
 #. TRANS: Link description for public timeline feed.
-msgid "Public Stream Feed (RSS 1.0)"
+#, fuzzy
+msgid "Public Timeline Feed (Activity Streams JSON)"
+msgstr "خوراک جریان عمومی (Atom)"
+
+#. TRANS: Link description for public timeline feed.
+#, fuzzy
+msgid "Public Timeline Feed (RSS 1.0)"
 msgstr "خوراک جریان عمومی (RSS 1.0)"
 
 #. TRANS: Link description for public timeline feed.
-msgid "Public Stream Feed (RSS 2.0)"
+#, fuzzy
+msgid "Public Timeline Feed (RSS 2.0)"
 msgstr "خوراک جریان عمومی (RSS 2.0)"
 
 #. TRANS: Link description for public timeline feed.
-msgid "Public Stream Feed (Atom)"
+#, fuzzy
+msgid "Public Timeline Feed (Atom)"
 msgstr "خوراک جریان عمومی (Atom)"
 
 #. TRANS: Text displayed for public feed when there are no public notices.
@@ -4631,49 +4458,6 @@ msgstr ""
 "85%DB%8C%DA%A9%D8%B1%D9%88%D8%A8%D9%84%D8%A7%DA%AF%DB%8C%D9%86%DA%AF) بر "
 "پایهٔ نرم‌ا�زار آزاد [StatusNet](http://status.net/) است."
 
-#. TRANS: Title for page with public list cloud.
-#, fuzzy
-msgid "Public list cloud"
-msgstr "ابر برچسب عمومی"
-
-#. TRANS: Page notice for page with public list cloud.
-#. TRANS: %s is a StatusNet sitename.
-#, fuzzy, php-format
-msgid "These are largest lists on %s"
-msgstr "این‌ها محبوب‌ترین برچسب‌های اخیر روی %s هستند "
-
-#. TRANS: Empty list message on page with public list cloud.
-#. TRANS: This message contains Markdown links in the form [description](link).
-#, fuzzy, php-format
-msgid "No one has [listed](%%doc.tags%%) anyone yet."
-msgstr "هیچ‌کس هنوز پیامی با یک [برچسب](%%doc.tags%%) ن�رستاده است."
-
-#. TRANS: Additional empty list message on page with public list cloud for logged in users.
-#, fuzzy
-msgid "Be the first to list someone!"
-msgstr "اولین ن�ری باشید که چیزی می‌�رستد!"
-
-#. TRANS: Additional empty list message on page with public list cloud for anonymous users.
-#. TRANS: This message contains Markdown links in the form [description](link).
-#, fuzzy, php-format
-msgid ""
-"Why not [register an account](%%action.register%%) and be the first to list "
-"someone!"
-msgstr ""
-"چرا به [باز کردن یک حساب](%%action.register%%) اقدام نمی‌کنید و اولین ن�ری "
-"باشید که چیزی می‌�رستد!"
-
-#. TRANS: DT element on on page with public list cloud.
-#, fuzzy
-msgid "List cloud"
-msgstr "رابط مورد نظر پیدا نشد."
-
-#. TRANS: Link title for number of listed people. %d is the number of listed people.
-#, php-format
-msgid "1 person listed"
-msgid_plural "%d people listed"
-msgstr[0] ""
-
 #. TRANS: Public RSS feed description. %s is the StatusNet site name.
 #, fuzzy, php-format
 msgid "%s updates from everyone."
@@ -4801,28 +4585,14 @@ msgid "6 or more characters, and do not forget it!"
 msgstr "۶ نویسه یا بیش‌تر، و این را �راموش نکنید!"
 
 #. TRANS: Button text for password reset form.
-#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Reset"
-msgstr "بازنشاندن"
+msgstr "بازنشانی"
 
 #. TRANS: Form instructions for password recovery form.
 msgid "Enter a nickname or email address."
 msgstr "یک نام کاربری یا نشانی پست الکترونیکی وارد کنید."
 
-#. TRANS: Information on password recovery form if no known username or e-mail address was specified.
-msgid "No user with that email address or username."
-msgstr "هیچ کاربری با آن نشانی پست الکترونیکی یا نام کاربری وجود ندارد."
-
-#. TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.
-msgid "No registered email address for that user."
-msgstr "برای آن کاربر نشانی پست الکترونیکی ثبت شده وجود ندارد."
-
-#. TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.
-msgid "Error saving address confirmation."
-msgstr "هنگام ذخیرهٔ تایید نشانی خطا رخ داد."
-
 #. TRANS: User notification after an e-mail with instructions was sent from the password recovery form.
 msgid ""
 "Instructions for recovering your password have been sent to the email "
@@ -5011,80 +4781,6 @@ msgstr ""
 "(شما هر لحظه باید یک پیام با پست الکترونیکی با راهنمای چگونگی تایید نشانی "
 "پست الکترونیک‌تان دریا�ت کنید.)"
 
-#. TRANS: Page notice for remote subscribe. This message contains Markdown links.
-#. TRANS: Ensure to keep the correct markup of [link description](link).
-#, php-format
-msgid ""
-"To subscribe, you can [login](%%action.login%%), or [register](%%action."
-"register%%) a new  account. If you already have an account  on a [compatible "
-"microblogging site](%%doc.openmublog%%),  enter your profile URL below."
-msgstr ""
-"برای اشتراک، شما می‌توانید ]وارد[(%%action.login%%) شوید، یا یک حساب جدید ]"
-"ثبت کنید[(%%action.register%%). اگر شما یک حساب در یک ]وب‌گاه میکروبلاگینگ "
-"سازگار[(%%doc.openmublog%%) دارید، نشانی نمایهٔ خود را در زیر وارد کنید."
-
-#. TRANS: Page title for Remote subscribe.
-msgid "Remote subscribe"
-msgstr "اشتراک از راه دور"
-
-#. TRANS: Field legend on page for remote subscribe.
-msgid "Subscribe to a remote user"
-msgstr "اشتراک یک کاربر از راه دور"
-
-#. TRANS: Field label on page for remote subscribe.
-msgid "User nickname"
-msgstr "نام کاربری کاربر"
-
-#. TRANS: Field title on page for remote subscribe.
-#, fuzzy
-msgid "Nickname of the user you want to follow."
-msgstr "نام کاربری، کاربری که می خواهید او را دنبال کنید"
-
-#. TRANS: Field label on page for remote subscribe.
-msgid "Profile URL"
-msgstr "نشانی نمایه"
-
-#. TRANS: Field title on page for remote subscribe.
-#, fuzzy
-msgid "URL of your profile on another compatible microblogging service."
-msgstr "نشانی اینترنتی نمایهٔ شما در سرویس میکروبلاگینگ سازگار دیگری"
-
-#. TRANS: Button text on page for remote subscribe.
-#. TRANS: Link text for link that will subscribe to a remote profile.
-#. TRANS: Button text to subscribe to a user.
-#. TRANS: Button text for subscribing to a list.
-#, fuzzy
-msgctxt "BUTTON"
-msgid "Subscribe"
-msgstr "اشتراک"
-
-#. TRANS: Form validation error on page for remote subscribe when an invalid profile URL was provided.
-#, fuzzy
-msgid "Invalid profile URL (bad format)."
-msgstr "نشانی اینترنتی نمایه نامعتبر است (�رمت نامناسب است)"
-
-#. TRANS: Form validation error on page for remote subscribe when no the provided profile URL
-#. TRANS: does not contain expected data.
-msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
-msgstr ""
-"این یک نشانی نمایهٔ صحیح نیست (هیچ سند YADIS وجود ندارد و یا XRDS مشخص شده "
-"نامعتبر است)."
-
-#. TRANS: Form validation error on page for remote subscribe.
-#, fuzzy
-msgid "That is a local profile! Login to subscribe."
-msgstr "این یک نمایهٔ محلی است! برای اشتراک وارد شوید."
-
-#. TRANS: Form validation error on page for remote subscribe when the remote service is not providing a request token.
-#, fuzzy
-msgid "Could not get a request token."
-msgstr "نمی‌توان یک نشانهٔ درخواست را به‌دست آورد."
-
-#. TRANS: Client error displayed when trying to (un)list an OMB 0.1 remote profile.
-#, fuzzy
-msgid "You cannot (un)list an OMB 0.1 remote profile with this action."
-msgstr "نمی‌توان با این کار مشترک یک نمایهٔ از راه دور OMB 0.1شد."
-
 #. TRANS: Client error displayed when an unknown error occurs while delisting a user.
 #. TRANS: %s is a username.
 #, php-format
@@ -5137,6 +4833,12 @@ msgstr "پاسخ‌های به %s"
 msgid "Replies to %1$s, page %2$d"
 msgstr "پاسخ‌های به %1$s، ص�حهٔ %2$d"
 
+#. TRANS: Link for feed with replies for a user.
+#. TRANS: %s is a user nickname.
+#, fuzzy, php-format
+msgid "Replies feed for %s (Activity Streams JSON)"
+msgstr "خوراک پاسخ‌ها برای %s (Atom)"
+
 #. TRANS: Link for feed with replies for a user.
 #. TRANS: %s is a user nickname.
 #, php-format
@@ -5255,7 +4957,7 @@ msgstr ""
 
 #. TRANS: Form instructions for feed restore.
 msgid ""
-"You can upload a backed-up stream in <a href=\"http://activitystrea.ms/"
+"You can upload a backed-up timeline in <a href=\"http://activitystrea.ms/"
 "\">Activity Streams</a> format."
 msgstr ""
 
@@ -5378,6 +5080,26 @@ msgstr ""
 msgid "Application info"
 msgstr "اطلاعات برنامه"
 
+#. TRANS: Field label on application page.
+msgid "Consumer key"
+msgstr "کلید مصر�‌کننده"
+
+#. TRANS: Field label on application page.
+msgid "Consumer secret"
+msgstr "رمز مصر�‌کننده"
+
+#. TRANS: Field label on application page.
+msgid "Request token URL"
+msgstr "نشانی اینترنتی شناسهٔ درخواست"
+
+#. TRANS: Field label on application page.
+msgid "Access token URL"
+msgstr "نشانی اینترنتی نشانهٔ درخواست"
+
+#. TRANS: Field label on application page.
+msgid "Authorize URL"
+msgstr "نشانی اجازه‌دادن"
+
 #. TRANS: Note on the OAuth application page about signature support.
 #, fuzzy
 msgid ""
@@ -5401,6 +5123,11 @@ msgstr "پیام‌های برگزیدهٔ %1$s، ص�حهٔ %2$d"
 msgid "Could not retrieve favorite notices."
 msgstr "نمی‌توان پیام‌های برگزیده را دریا�ت کرد."
 
+#. TRANS: Feed link text. %s is a username.
+#, fuzzy, php-format
+msgid "Feed for favorites of %s (Activity Streams JSON)"
+msgstr "خوراک برای برگزیده‌های %s (Atom)"
+
 #. TRANS: Feed link text. %s is a username.
 #, php-format
 msgid "Feed for favorites of %s (RSS 1.0)"
@@ -5462,6 +5189,11 @@ msgstr "گروه %s"
 msgid "%1$s group, page %2$d"
 msgstr "گروه %1$s، ص�حهٔ %2$d"
 
+#. TRANS: Tooltip for feed link. %s is a group nickname.
+#, fuzzy, php-format
+msgid "Notice feed for %s group (Activity Streams JSON)"
+msgstr "خوراک پیام برای گروه %s (Atom)"
+
 #. TRANS: Tooltip for feed link. %s is a group nickname.
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
@@ -5482,44 +5214,8 @@ msgstr "خوراک پیام برای گروه %s (Atom)"
 msgid "FOAF for %s group"
 msgstr "FOAF برای گروه %s"
 
-#. TRANS: Header for mini list of group members on a group page (h2).
-msgid "Members"
-msgstr "اعضا"
-
-#. TRANS: Description for mini list of group members on a group page when the group has no members.
-#. TRANS: Content of "Listed" page if there are no listed users.
-#. TRANS: Content of "People following tag x" if there are no subscribed users.
-#. TRANS: Empty list message for tags.
-#. TRANS: Text for user subscription statistics if the user has no subscriptions.
-#. TRANS: Text for user subscriber statistics if user has no subscribers.
-#. TRANS: Text for user user group membership statistics if user is not a member of any group.
-#. TRANS: Default content for section/sidebar widget.
-msgid "(None)"
-msgstr "هیچ"
-
-#. TRANS: Link to all group members from mini list of group members if group has more than n members.
-msgid "All members"
-msgstr "همهٔ اعضا"
-
-#. TRANS: Header for group statistics on a group page (h2).
-#. TRANS: H2 text for user statistics.
-msgid "Statistics"
-msgstr "آمار"
-
-#. TRANS: Label for group creation date.
-#, fuzzy
-msgctxt "LABEL"
-msgid "Created"
-msgstr "ساخته شد"
-
-#. TRANS: Label for member count in statistics on group page.
-#, fuzzy
-msgctxt "LABEL"
-msgid "Members"
-msgstr "اعضا"
-
 #. TRANS: Notice on group pages for anonymous users for StatusNet sites that accept new registrations.
-#. TRANS: **%s** is the group alias, %%%%site.name%%%% is the site name,
+#. TRANS: %s is the group name, %%%%site.name%%%% is the site name,
 #. TRANS: %%%%action.register%%%% is the URL for registration, %%%%doc.help%%%% is a URL to help.
 #. TRANS: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
 #, php-format
@@ -5538,14 +5234,14 @@ msgstr ""
 "گروه و بلکه بیش‌تر بشوید! ([بیش‌تر بخوانید](%%%%doc.help%%%%))"
 
 #. TRANS: Notice on group pages for anonymous users for StatusNet sites that accept no new registrations.
-#. TRANS: **%s** is the group alias, %%%%site.name%%%% is the site name,
+#. TRANS: %s is the group name, %%%%site.name%%%% is the site name,
 #. TRANS: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
-#, php-format
+#, fuzzy, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
 "wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
 "[StatusNet](http://status.net/) tool. Its members share short messages about "
-"their life and interests. "
+"their life and interests."
 msgstr ""
 "**%s** یک گروه کاربری در %%%%site.name%%%%، یک سرویس [میکروبلاگینگ](http://"
 "fa.wikipedia.org/wiki/%D9%85%DB%8C%DA%A9%D8%B1%D9%88%D8%A8%D9%84%D8%A7%DA%AF%"
@@ -5553,12 +5249,6 @@ msgstr ""
 "است. کاربران آن پیام‌های کوتاهی را دربارهٔ زندگی و علاقه‌مندی‌هایشان به اشتراک "
 "می‌گذارند. "
 
-#. TRANS: Title for list of group administrators on a group page.
-#, fuzzy
-msgctxt "TITLE"
-msgid "Admins"
-msgstr "مدیران"
-
 #. TRANS: Client error displayed requesting a single message that does not exist.
 msgid "No such message."
 msgstr "چنین پیغامی وجود ندارد."
@@ -5653,10 +5343,22 @@ msgstr ""
 "باشید که چیزی می‌�رستد!"
 
 #. TRANS: Header on show list page.
+#. TRANS: Link description for link to list of users tagged with a tag (so part of a list).
 #, fuzzy
 msgid "Listed"
 msgstr "مجوز"
 
+#. TRANS: Content of "Listed" page if there are no listed users.
+#. TRANS: Content of "People following tag x" if there are no subscribed users.
+#. TRANS: Description for mini list of group members on a group page when the group has no members.
+#. TRANS: Empty list message for tags.
+#. TRANS: Text for user subscription statistics if the user has no subscriptions.
+#. TRANS: Text for user subscriber statistics if user has no subscribers.
+#. TRANS: Text for user user group membership statistics if user is not a member of any group.
+#. TRANS: Default content for section/sidebar widget.
+msgid "(None)"
+msgstr "هیچ"
+
 #. TRANS: Link for more "People in list x by a user"
 #. TRANS: if there are more than the mini list's maximum.
 msgid "Show all"
@@ -5667,24 +5369,19 @@ msgstr ""
 msgid "Subscribers"
 msgstr "مشترک‌ها"
 
-#. TRANS: Link for more "People following tag x"
-#. TRANS: if there are more than the mini list's maximum.
-msgid "All subscribers"
-msgstr "تمام مشترک‌ها"
-
-#. TRANS: Page title showing tagged notices in one user's stream.
+#. TRANS: Page title showing tagged notices in one user's timeline.
 #. TRANS: %1$s is the username, %2$s is the hash tag.
 #, fuzzy, php-format
 msgid "Notices by %1$s tagged %2$s"
 msgstr "%1$s، ص�حهٔ %2$d"
 
-#. TRANS: Page title showing tagged notices in one user's stream.
+#. TRANS: Page title showing tagged notices in one user's timeline.
 #. TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number.
 #, fuzzy, php-format
 msgid "Notices by %1$s tagged %2$s, page %3$d"
 msgstr "پیام‌های برچسب‌دار شده با %1$s، ص�حهٔ %2$d"
 
-#. TRANS: Extended page title showing tagged notices in one user's stream.
+#. TRANS: Extended page title showing tagged notices in one user's timeline.
 #. TRANS: %1$s is the username, %2$d is the page number.
 #, fuzzy, php-format
 msgid "Notices by %1$s, page %2$d"
@@ -5696,6 +5393,12 @@ msgstr "پیام‌های برچسب‌دار شده با %1$s، ص�حهٔ %2$d
 msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
 msgstr "خوراک پیام‌های %1$s دارای برچسب %2$s (RSS 1.0)"
 
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#, fuzzy, php-format
+msgid "Notice feed for %s (Activity Streams JSON)"
+msgstr "خوراک پیام‌های %s (Atom)"
+
 #. TRANS: Title for link to notice feed.
 #. TRANS: %s is a user nickname.
 #, php-format
@@ -5720,7 +5423,7 @@ msgstr "خوراک پیام‌های %s (Atom)"
 msgid "FOAF for %s"
 msgstr "FOAF برای %s"
 
-#. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
+#. TRANS: First sentence of empty list message for a timeline. $1%s is a user nickname.
 #, fuzzy, php-format
 msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
 msgstr "این خط‌زمانی %1$s است، اما %2$s تاکنون چیزی ن�رستاده است."
@@ -5733,7 +5436,7 @@ msgstr ""
 "اخیرا چیز جالب توجهی دیده‌اید؟ شما تاکنون پیامی ن�رستاده‌اید، الان می‌تواند "
 "زمان خوبی برای شروع باشد :)"
 
-#. TRANS: Second sentence of empty  list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
+#. TRANS: Second sentence of empty  list message for a non-self timeline. %1$s is a user nickname, %2$s is a part of a URL.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
 #, php-format
 msgid ""
@@ -5743,7 +5446,7 @@ msgstr ""
 "اولین کسی باشید که در [این موضوع](%%%%action.newnotice%%%%?status_textarea=%"
 "s) پیام می‌�رستد."
 
-#. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
+#. TRANS: Announcement for anonymous users showing a timeline if site registrations are open.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
 #, php-format
 msgid ""
@@ -5758,13 +5461,13 @@ msgstr ""
 "،دارد. ]اکنون بپیوندید[(%%%%action.register%%%%) تا پیام‌های **%s** و بلکه "
 "بیش‌تر را دنبال کنید! (]بیش‌تر بخوانید[(%%%%doc.help%%%%))"
 
-#. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
+#. TRANS: Announcement for anonymous users showing a timeline if site registrations are closed or invite only.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#, php-format
+#, fuzzy, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
 "wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
-"[StatusNet](http://status.net/) tool. "
+"[StatusNet](http://status.net/) tool."
 msgstr ""
 "**%s** یک حساب در %%%%site.name%%%%، یک سرویس ]میکروبلاگینگ[(http://fa."
 "wikipedia.org/wiki/%D9%85%DB%8C%DA%A9%D8%B1%D9%88%D8%A8%D9%84%D8%A7%DA%AF%DB%"
@@ -5802,6 +5505,15 @@ msgstr "نام وب‌گاه باید طولی غیر ص�ر داشته باشد
 msgid "You must have a valid contact email address."
 msgstr "شما باید یک نشانی پست الکترونیکی معتبر برای ارتباط داشته باشید."
 
+#. TRANS: Client error displayed when a logo URL is not valid.
+msgid "Invalid logo URL."
+msgstr "نشانی اینترنتی نشان نامعتبر است."
+
+#. TRANS: Client error displayed when a SSL logo URL is invalid.
+#, fuzzy
+msgid "Invalid SSL logo URL."
+msgstr "نشانی اینترنتی نشان نامعتبر است."
+
 #. TRANS: Client error displayed trying to save site settings with an invalid language code.
 #. TRANS: %s is the invalid language code.
 #, php-format
@@ -5879,7 +5591,9 @@ msgid "Default language"
 msgstr "زبان پیش‌�رض"
 
 #. TRANS: Dropdown title on site settings panel.
-msgid "Site language when autodetection from browser settings is not available"
+#, fuzzy
+msgid ""
+"The site language when autodetection from browser settings is not available."
 msgstr "شناسایی خودکار زبان وب‌گاه از راه تنظیمات مرورگر در دسترس نیست."
 
 #. TRANS: Fieldset legend on site settings panel.
@@ -5906,8 +5620,22 @@ msgid "How long users must wait (in seconds) to post the same thing again."
 msgstr ""
 "چه مدت کاربران باید منتظر بمانند (به ثانیه) تا همان چیز را دوباره ب�رستند."
 
+#. TRANS: Fieldset legend for form to change logo.
+msgid "Logo"
+msgstr "خروج"
+
+#. TRANS: Field label for StatusNet site logo.
+msgid "Site logo"
+msgstr "نشان وب‌گاه"
+
+#. TRANS: Field label for SSL StatusNet site logo.
+#, fuzzy
+msgid "SSL logo"
+msgstr "نشان وب‌گاه"
+
 #. TRANS: Button title for saving site settings.
-msgid "Save site settings"
+#, fuzzy
+msgid "Save the site settings."
 msgstr "ذخیرهٔ تنظیمات وب‌گاه"
 
 #. TRANS: Page title for site-wide notice tab in admin panel.
@@ -5936,7 +5664,7 @@ msgstr "متن پیام وب‌گاه"
 msgid "Site-wide notice text (255 characters maximum; HTML allowed)"
 msgstr "متن پیام عمومی وب‌گاه (حداکثر ۲۵۵ نویسه؛ می‌توان از HTML است�اده کرد)"
 
-#. TRANS: Title for button to save site notice in admin panel.
+#. TRANS: Button title to save site notice in admin panel.
 #, fuzzy
 msgid "Save site notice."
 msgstr "ذخیرهٔ پیام وب‌گاه"
@@ -6138,7 +5866,7 @@ msgstr "نشانی اینترنتی گزارش"
 msgid "Snapshots will be sent to this URL."
 msgstr "تصاویر لحظه‌ای به این نشانی اینترنتی �رستاده می‌شوند"
 
-#. TRANS: Title for button to save snapshot settings.
+#. TRANS: Button title to save snapshot settings.
 #, fuzzy
 msgid "Save snapshot settings."
 msgstr "ذخیرهٔ تنظیمات تصویر لحظه‌ای"
@@ -6173,10 +5901,6 @@ msgstr "اعضای گروه %1$s، ص�حهٔ %2$d"
 msgid "A list of users awaiting approval to subscribe to you."
 msgstr "یک �هرست از کاربران در این گروه"
 
-#. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
-msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
-msgstr "نمی‌توان با این کار مشترک یک نمایهٔ از راه دور OMB 0.1شد."
-
 #. TRANS: Page title when subscription succeeded.
 msgid "Subscribed"
 msgstr "مشترک‌شده"
@@ -6275,13 +5999,12 @@ msgstr "این‌ها کسانی هستند که %s پیام‌هایشان را
 #. TRANS: This message contains Markdown URLs. The link description is between
 #. TRANS: square brackets, and the link between parentheses. Do not separate "]("
 #. TRANS: and do not change the URL part.
-#, php-format
+#, fuzzy, php-format
 msgid ""
 "You're not listening to anyone's notices right now, try subscribing to "
 "people you know. Try [people search](%%action.peoplesearch%%), look for "
 "members in groups you're interested in and in our [featured users](%%action."
-"featured%%). If you're a [Twitter user](%%action.twittersettings%%), you can "
-"automatically subscribe to people you already follow there."
+"featured%%)."
 msgstr ""
 "شما در حال حاضر پیام‌های هیچ‌کس را دنبال نمی‌کنید، تلاش کنید که مشترک ا�رادی که "
 "می‌شناسید شوید. [جست‌وجوی ا�راد](%%action.peoplesearch%%) را امتحان کنید، "
@@ -6319,6 +6042,12 @@ msgstr "پیامک"
 msgid "Notices tagged with %1$s, page %2$d"
 msgstr "پیام‌های برچسب‌دار شده با %1$s، ص�حهٔ %2$d"
 
+#. TRANS: Link label for feed on "notices with tag" page.
+#. TRANS: %s is the tag the feed is for.
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (Activity Streams JSON)"
+msgstr "خوراک پیام برای برچسب %s (Atom)"
+
 #. TRANS: Link label for feed on "notices with tag" page.
 #. TRANS: %s is the tag the feed is for.
 #, php-format
@@ -6428,16 +6157,6 @@ msgstr "لغو اشتراک شده"
 msgid "%1$s unsubscribed from list %2$s by %3$s"
 msgstr "مشترک‌های %1$s، ص�حهٔ %2$d"
 
-#. TRANS: Client error displayed when trying to update profile with an incompatible license.
-#. TRANS: %1$s is the license incompatible with site license %2$s.
-#. TRANS: Exception thrown when licenses are not compatible for an authorisation request.
-#. TRANS: %1$s is the license for the listenee, %2$s is the license for "this" StatusNet site.
-#, fuzzy, php-format
-msgid ""
-"Listenee stream license \"%1$s\" is not compatible with site license \"%2$s"
-"\"."
-msgstr "مجوز پیام «%1$s» با مجوز وب‌گاه «%2$s» سازگار نیست."
-
 #. TRANS: Title of URL settings tab in profile settings.
 #, fuzzy
 msgid "URL settings"
@@ -6576,157 +6295,11 @@ msgstr "دعوت نامه ها �عال شدند"
 msgid "Whether to allow users to invite new users."
 msgstr "چنان‌که به کاربران اجازهٔ دعوت‌کردن کاربران تازه داده شود."
 
-#. TRANS: Title for button to save user settings in user admin panel.
+#. TRANS: Button title to save user settings in user admin panel.
 #, fuzzy
 msgid "Save user settings."
 msgstr "ذخیرهٔ تنظیمات وب‌گاه"
 
-#. TRANS: Page title.
-msgid "Authorize subscription"
-msgstr "تصدیق اشتراک"
-
-#. TRANS: Page notice on "Authorize subscription" page.
-#, fuzzy
-msgid ""
-"Please check these details to make sure that you want to subscribe to this "
-"user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
-"click \"Reject\"."
-msgstr ""
-"لط�ا این جزئیات را برای اطمینان از این‌که می‌خواهید مشترک پیام‌های این کاربر "
-"شوید، بررسی کنید. اگر شما درخواست اشتراک پیام‌های کسی را نداده‌اید، روی «رد "
-"کردن» کلیک کنید."
-
-#. TRANS: Button text on Authorise Subscription page.
-#. TRANS: Submit button text to accept a group membership request on approve group form.
-#. TRANS: Submit button text to accept a subscription request on approve sub form.
-#, fuzzy
-msgctxt "BUTTON"
-msgid "Accept"
-msgstr "پذیر�تن"
-
-#. TRANS: Title for button on Authorise Subscription page.
-#. TRANS: Button title to subscribe to a user.
-#, fuzzy
-msgid "Subscribe to this user."
-msgstr "مشترک شدن این کاربر"
-
-#. TRANS: Button text on Authorise Subscription page.
-#. TRANS: Submit button text to reject a group membership request on approve group form.
-#. TRANS: Submit button text to reject a subscription request on approve sub form.
-#, fuzzy
-msgctxt "BUTTON"
-msgid "Reject"
-msgstr "رد کردن"
-
-#. TRANS: Title for button on Authorise Subscription page.
-#, fuzzy
-msgid "Reject this subscription."
-msgstr "رد کردن این اشتراک"
-
-#. TRANS: Client error displayed for an empty authorisation request.
-msgid "No authorization request!"
-msgstr "هیچ درخواست اجازه‌ای وجود ندارد!"
-
-#. TRANS: Accept message header from Authorise subscription page.
-msgid "Subscription authorized"
-msgstr "اشتراک تصدیق شد"
-
-#. TRANS: Accept message text from Authorise subscription page.
-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 ""
-
-#. TRANS: Reject message header from Authorise subscription page.
-msgid "Subscription rejected"
-msgstr "اشتراک پذیر�ته نشد"
-
-#. TRANS: Reject message from Authorise subscription page.
-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 ""
-
-#. TRANS: Exception thrown when no valid user is found for an authorisation request.
-#. TRANS: %s is a listener URI.
-#, fuzzy, php-format
-msgid "Listener URI \"%s\" not found here."
-msgstr "نشانی تصویر چهره «%s» معتبر نیست."
-
-#. TRANS: Exception thrown when listenee URI is too long for an authorisation request.
-#. TRANS: %s is a listenee URI.
-#, fuzzy, php-format
-msgid "Listenee URI \"%s\" is too long."
-msgstr "نشانی تصویر چهره «%s» معتبر نیست."
-
-#. TRANS: Exception thrown when listenee URI is a local user for an authorisation request.
-#. TRANS: %s is a listenee URI.
-#, fuzzy, php-format
-msgid "Listenee URI \"%s\" is a local user."
-msgstr "نشانی اینترنتی نمایهٔ «%s» برای یک کاربر محلی است."
-
-#. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
-#. TRANS: %s is a profile URL.
-#, fuzzy, php-format
-msgid "Profile URL \"%s\" is for a local user."
-msgstr "نشانی اینترنتی نمایهٔ «%s» برای یک کاربر محلی است."
-
-#. TRANS: Exception thrown when avatar URL is invalid for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#, fuzzy, php-format
-msgid "Avatar URL \"%s\" is not valid."
-msgstr "نشانی تصویر چهره «%s» معتبر نیست."
-
-#. TRANS: Exception thrown when avatar URL could not be read for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#, fuzzy, php-format
-msgid "Cannot read avatar URL \"%s\"."
-msgstr "نمی‌توان نشانی اینترنتی چهره را خواند«%s»."
-
-#. TRANS: Exception thrown when avatar URL return an invalid image type for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#, fuzzy, php-format
-msgid "Wrong image type for avatar URL \"%s\"."
-msgstr "نوع تصویر برای نشانی اینترنتی چهره نادرست است «%s»."
-
-#. TRANS: Title for profile design page.
-#. TRANS: Page title for profile design page.
-msgid "Profile design"
-msgstr "طراحی نمایه"
-
-#. TRANS: Instructions for Profile design page.
-#. TRANS: Instructions for profile design page.
-msgid ""
-"Customize the way your profile looks with a background image and a colour "
-"palette of your choice."
-msgstr ""
-"شیوهٔ نمایش نمایهٔ خود را با یک تصویر پیش‌زمینه و یک رنگ از جعبهٔ رنگ‌ها به "
-"انتخاب خودتان س�ارشی‌سازی کنید."
-
-#. TRANS: Succes message on Profile design page when finding an easter egg.
-msgid "Enjoy your hotdog!"
-msgstr "از هات داگ خود لذت ببرید!"
-
-#. TRANS: Form legend on Profile design page.
-#, fuzzy
-msgid "Design settings"
-msgstr "ذخیرهٔ تنظیمات وب‌گاه"
-
-#. TRANS: Checkbox label on Profile design page.
-msgid "View profile designs"
-msgstr "نمایش طراحی‌های نمایه"
-
-#. TRANS: Title for checkbox on Profile design page.
-msgid "Show or hide profile designs."
-msgstr "نمایش دادن یا پنهان کردن طراحی‌های نمایه."
-
-#. TRANS: Form legend on Profile design page for form to choose a background image.
-#, fuzzy
-msgid "Background file"
-msgstr "پیش‌زمینه"
-
 #. TRANS: Page title for all but the first page of groups for a user.
 #. TRANS: %1$s is a nickname, %2$d is a page number.
 #, php-format
@@ -6766,9 +6339,9 @@ msgstr "StatusNet %s"
 
 #. TRANS: Content part of StatusNet version page.
 #. TRANS: %1$s is the engine name (StatusNet) and %2$s is the StatusNet version.
-#, php-format
+#, fuzzy, php-format
 msgid ""
-"This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, "
+"This site is powered by %1$s version %2$s, Copyright 2008-2011 StatusNet, "
 "Inc. and contributors."
 msgstr ""
 "این وب‌گاه برگر�ته از قدرت %1$s نسخهٔ %2$s دارای حق تکثیر ۲۰۰۸−۲۰۰۹ StatusNet "
@@ -6783,22 +6356,24 @@ msgid "License"
 msgstr "مجوز"
 
 #. TRANS: Content part of StatusNet version page.
+#, fuzzy
 msgid ""
 "StatusNet is free software: you can redistribute it and/or modify it under "
 "the terms of the GNU Affero General Public License as published by the Free "
 "Software Foundation, either version 3 of the License, or (at your option) "
-"any later version. "
+"any later version."
 msgstr ""
 "StatusNet یک نرم‌ا�زار آزاد است: شما می‌توانید آن را بازتوزیع کنید و/یا آن را "
 "تحت شرایط مجوز GNU Affero General Public License نسخهٔ ۳، یا (به انتخاب شما) "
 "هر نسخهٔ بعدی دیگری، که توسط بنیاد نرم‌ا�زارهای آزاد منتشر شده است، ویرایش کنید"
 
 #. TRANS: Content part of StatusNet version page.
+#, fuzzy
 msgid ""
 "This program is distributed in the hope that it will be useful, but WITHOUT "
 "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
 "FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License "
-"for more details. "
+"for more details."
 msgstr ""
 "این برنامه به امید این‌که سودمند خواهد بود، توزیع شده است، اما بدون ضمانت؛ "
 "حتی بدون ضمانت جزئی دارای کی�یت �روش یا مناسب بودن برای هد�ی خاص. برای "
@@ -6861,16 +6436,25 @@ msgstr ""
 msgid "Robin thinks something is impossible."
 msgstr ""
 
+#. TRANS: Message used to be inserted as %2$s in  the text "No file may
+#. TRANS: be larger than %1$d byte and the file you sent was %2$s.".
+#. TRANS: %1$d is the number of bytes of an uploaded file.
+#, php-format
+msgid "%1$d byte"
+msgid_plural "%1$d bytes"
+msgstr[0] ""
+
 #. TRANS: Message given if an upload is larger than the configured maximum.
-#. TRANS: %1$d is the byte limit for uploads, %2$d is the byte count for the uploaded file.
-#. TRANS: %1$s is used for plural.
+#. TRANS: %1$d (used for plural) is the byte limit for uploads,
+#. TRANS: %2$s is the proper form of "n bytes". This is the only ways to have
+#. TRANS: gettext support multiple plurals in the same message, unfortunately...
 #, fuzzy, php-format
 msgid ""
-"No file may be larger than %1$d byte and the file you sent was %2$d bytes. "
-"Try to upload a smaller version."
+"No file may be larger than %1$d byte and the file you sent was %2$s. Try to "
+"upload a smaller version."
 msgid_plural ""
-"No file may be larger than %1$d bytes and the file you sent was %2$d bytes. "
-"Try to upload a smaller version."
+"No file may be larger than %1$d bytes and the file you sent was %2$s. Try to "
+"upload a smaller version."
 msgstr[0] ""
 "هیچ پرونده‌ای نباید بزرگ‌تر از %d بایت باشد و پرونده‌ای که شما �رستادید %d بایت "
 "بود. بارگذاری یک نسخهٔ کوچک‌تر را امتحان کنید."
@@ -6940,6 +6524,11 @@ msgstr "نمی‌توان گروه محلی را به‌هنگام‌سازی ک
 msgid "Could not create login token for %s"
 msgstr "نمی‌توان رمز ورود را برای %s ایجاد کرد"
 
+#. TRANS: Exception thrown when a program code class (%s) cannot be instantiated.
+#, fuzzy, php-format
+msgid "Cannot instantiate class %s."
+msgstr "نمی‌توان گذرواژهٔ جدید را ذخیره کرد."
+
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.
 msgid "No database name or DSN found anywhere."
 msgstr "هیچ پایگاه‌داده یا DSN هیچ‌جا پیدا نشد."
@@ -7104,7 +6693,7 @@ msgstr ""
 #, php-format
 msgid ""
 "You already have %1$d or more people in list %2$s, which is the maximum "
-"allowed number.Try unlisting others first."
+"allowed number. Try unlisting others first."
 msgstr ""
 
 #. TRANS: Exception thrown when inserting a list subscription in the database fails.
@@ -7127,7 +6716,6 @@ msgid "Unable to save tag."
 msgstr "نمی‌توان پیام وب‌گاه را ذخیره کرد."
 
 #. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
-#. TRANS: Error message displayed to a banned user when they try to subscribe.
 msgid "You have been banned from subscribing."
 msgstr "شما از اشتراک منع شده‌اید."
 
@@ -7147,10 +6735,6 @@ msgstr "تایید نشده!"
 msgid "Could not delete self-subscription."
 msgstr "نمی‌توان اشتراک را ذخیره کرد."
 
-#. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
-msgid "Could not delete subscription OMB token."
-msgstr "نمی‌توان اشتراک را ذخیره کرد."
-
 #. TRANS: Exception thrown when a subscription could not be deleted on the server.
 msgid "Could not delete subscription."
 msgstr "نمی‌توان اشتراک را ذخیره کرد."
@@ -7185,6 +6769,18 @@ msgstr "هیچ کاربر تنهایی برای حالت تک کاربره مش
 msgid "Single-user mode code called when not enabled."
 msgstr ""
 
+#. TRANS: Information on password recovery form if no known username or e-mail address was specified.
+msgid "No user with that email address or username."
+msgstr "هیچ کاربری با آن نشانی پست الکترونیکی یا نام کاربری وجود ندارد."
+
+#. TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.
+msgid "No registered email address for that user."
+msgstr "برای آن کاربر نشانی پست الکترونیکی ثبت شده وجود ندارد."
+
+#. TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.
+msgid "Error saving address confirmation."
+msgstr "هنگام ذخیرهٔ تایید نشانی خطا رخ داد."
+
 #. TRANS: Server exception thrown when creating a group failed.
 msgid "Could not create group."
 msgstr "نمیتوان گروه را تشکیل داد"
@@ -7460,27 +7056,12 @@ msgstr "showForm() پیاده نشده است."
 msgid "saveSettings() not implemented."
 msgstr "saveSettings() پیاده نشده است."
 
-#. TRANS: Client error message thrown if design settings could not be deleted in
-#. TRANS: the admin panel Design.
-msgid "Unable to delete design setting."
-msgstr "نمی توان تنظیمات طراحی شده را پاک کرد ."
-
 #. TRANS: Header in administrator navigation panel.
-#. TRANS: Header in settings navigation panel.
 #, fuzzy
 msgctxt "HEADER"
 msgid "Home"
 msgstr "خانه"
 
-#. TRANS: Menu item in administrator navigation panel.
-#. TRANS: Menu item in default local navigation panel.
-#. TRANS: Menu item in personal group navigation menu.
-#. TRANS: Menu item in settings navigation panel.
-#, fuzzy
-msgctxt "MENU"
-msgid "Home"
-msgstr "خانه"
-
 #. TRANS: Header in administrator navigation panel.
 #, fuzzy
 msgctxt "HEADER"
@@ -7496,17 +7077,6 @@ msgctxt "MENU"
 msgid "Site"
 msgstr "وب‌گاه"
 
-#. TRANS: Menu item title in administrator navigation panel.
-msgid "Design configuration"
-msgstr "پیکربندی طرح"
-
-#. TRANS: Menu item in administrator navigation panel.
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: Menu item in settings navigation panel.
-msgctxt "MENU"
-msgid "Design"
-msgstr "طرح"
-
 #. TRANS: Menu item title in administrator navigation panel.
 msgid "User configuration"
 msgstr "پیکربندی کاربر"
@@ -7614,43 +7184,6 @@ msgstr ""
 msgid "Could not authenticate you."
 msgstr ""
 
-#. TRANS: Server error displayed when trying to create an anynymous OAuth consumer.
-#, fuzzy
-msgid "Could not create anonymous consumer."
-msgstr "نمی‌توان نام‌های مستعار را ساخت."
-
-#. TRANS: Server error displayed when trying to create an anynymous OAuth application.
-#, fuzzy
-msgid "Could not create anonymous OAuth application."
-msgstr "نمی‌توان برنامه را ساخت."
-
-#. TRANS: Exception thrown when no token association could be found.
-msgid ""
-"Could not find a profile and application associated with the request token."
-msgstr ""
-
-#. TRANS: Exception thrown when no access token can be issued.
-#, fuzzy
-msgid "Could not issue access token."
-msgstr "پیغام نمی تواند درج گردد"
-
-#. TRANS: Exception thrown when a database error occurs.
-msgid "Database error inserting OAuth application user."
-msgstr "هنگام ا�زودن کاربر برنامهٔ OAuth در پایگاه داده خطایی رخ داد."
-
-#. TRANS: Exception thrown when a database error occurs.
-#, fuzzy
-msgid "Database error updating OAuth application user."
-msgstr "هنگام ا�زودن کاربر برنامهٔ OAuth در پایگاه داده خطایی رخ داد."
-
-#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
-msgid "Tried to revoke unknown token."
-msgstr ""
-
-#. TRANS: Exception thrown when an attempt is made to remove a revoked token.
-msgid "Failed to delete revoked token."
-msgstr ""
-
 #. TRANS: Form input field label for application icon.
 msgid "Icon"
 msgstr "شمایل"
@@ -7730,13 +7263,14 @@ msgid "Default access for this application: read-only, or read-write"
 msgstr "دسترسی پیش‌�رض برای این برنامه: تنها خواندنی یا خواندن-نوشتن"
 
 #. TRANS: Submit button title.
-msgid "Cancel"
-msgstr "انصرا�"
+#, fuzzy
+msgid "Cancel application changes."
+msgstr "برنامه‌های وصل‌شده"
 
 #. TRANS: Submit button title.
-#. TRANS: Button text to save a list.
-msgid "Save"
-msgstr "ذخیره‌کردن"
+#, fuzzy
+msgid "Save application changes."
+msgstr "برنامهٔ تازه"
 
 #. TRANS: Name for an anonymous application in application list.
 #, fuzzy
@@ -7772,6 +7306,19 @@ msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "لغو کردن"
 
+#. TRANS: Submit button text to accept a group membership request on approve group form.
+#. TRANS: Submit button text to accept a subscription request on approve sub form.
+msgctxt "BUTTON"
+msgid "Accept"
+msgstr "پذیر�تن"
+
+#. TRANS: Submit button text to reject a group membership request on approve group form.
+#. TRANS: Submit button text to reject a subscription request on approve sub form.
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Reject"
+msgstr "رد کردن"
+
 #. TRANS: Atom feed exception thrown when an author element does not contain a name element.
 msgid "Author element must contain a name element."
 msgstr ""
@@ -8338,6 +7885,11 @@ msgstr "شما ممکن است بخواهید نصاب را اجرا کنید ت
 msgid "Go to the installer."
 msgstr "برو به نصاب."
 
+#. TRANS: Header on conversation page. Hidden by default (h2).
+#. TRANS: Label for user statistics.
+msgid "Notices"
+msgstr "پیام‌ها"
+
 #. TRANS: Page title for when a database error occurs.
 msgid "Database error"
 msgstr "خطای پایگاه داده"
@@ -8349,14 +7901,6 @@ msgctxt "MENU"
 msgid "Public"
 msgstr "عمومی"
 
-#. TRANS: Menu item in default local navigation panel.
-#. TRANS: Menu item in search group navigation panel.
-#. TRANS: Menu item in local navigation menu.
-#, fuzzy
-msgctxt "MENU"
-msgid "Groups"
-msgstr "گروه‌ها"
-
 #. TRANS: Menu item in default local navigation panel.
 #. TRANS: Menu item title in local navigation menu.
 #, fuzzy
@@ -8373,54 +7917,12 @@ msgstr "حذ�"
 msgid "Delete this user"
 msgstr "حذ� این کاربر"
 
-#. TRANS: Form legend of form for changing the page design.
-#, fuzzy
-msgid "Change design"
-msgstr "ذخیره‌کردن طرح"
-
-#. TRANS: Fieldset legend on profile design page to change profile page colours.
-msgid "Change colours"
-msgstr "تغییر رنگ‌ها"
-
-#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-msgid "Use defaults"
-msgstr "است�اده‌کردن از پیش‌�رض‌ها"
-
-#. TRANS: Label in form on profile design page.
-#. TRANS: Field contains file name on user's computer that could be that user's custom profile background image.
-msgid "Upload file"
-msgstr "بارگذاری پرونده"
-
-#. TRANS: Instructions for form on profile design page.
-msgid ""
-"You can upload your personal background image. The maximum file size is 2MB."
-msgstr ""
-"شما می‌توانید تصویر پیش‌زمینهٔ شخصی خود را بارگذاری کنید. بیشینهٔ اندازهٔ پرونده "
-"۲ مگابایت است."
-
-#. TRANS: Radio button on profile design page that will enable use of the uploaded profile image.
-#, fuzzy
-msgctxt "RADIO"
-msgid "On"
-msgstr "روشن"
-
-#. TRANS: Radio button on profile design page that will disable use of the uploaded profile image.
-#, fuzzy
-msgctxt "RADIO"
-msgid "Off"
-msgstr "خاموش"
-
-#. TRANS: Success message displayed if design settings were saved after clicking "Use defaults".
-msgid "Design defaults restored."
-msgstr "پیش‌�رض‌های طراحی برگردانده شدند."
-
 #. TRANS: Exception. %s is an ID.
 #, fuzzy, php-format
 msgid "Unable to find services for %s."
 msgstr "نمی‌توان دسترسی را برای برنامهٔ %s لغو کرد."
 
 #. TRANS: Form legend for removing the favourite status for a favourite notice.
-#. TRANS: Title for button text for removing the favourite status for a favourite notice.
 msgid "Disfavor this notice"
 msgstr "خارج‌کردن این پیام از برگزیده‌ها"
 
@@ -8430,8 +7932,12 @@ msgctxt "BUTTON"
 msgid "Disfavor favorite"
 msgstr "خارج‌کردن از برگزیده‌ها"
 
+#. TRANS: Button title for removing the favourite status for a favourite notice.
+#, fuzzy
+msgid "Remove this notice from your list of favorite notices."
+msgstr "نمی‌توان پیام‌های برگزیده را دریا�ت کرد."
+
 #. TRANS: Form legend for adding the favourite status to a notice.
-#. TRANS: Title for button text for adding the favourite status to a notice.
 msgid "Favor this notice"
 msgstr "برگزیده‌کردن این پیام"
 
@@ -8441,6 +7947,11 @@ msgctxt "BUTTON"
 msgid "Favor"
 msgstr "برگزیده‌کردن"
 
+#. TRANS: Button title for adding the favourite status to a notice.
+#, fuzzy
+msgid "Add this notice to your list of favorite notices."
+msgstr "نمی‌توان پیام‌های برگزیده را دریا�ت کرد."
+
 #. TRANS: Feed type name.
 msgid "RSS 1.0"
 msgstr ""
@@ -8458,6 +7969,10 @@ msgstr "مؤل�"
 msgid "FOAF"
 msgstr ""
 
+#. TRANS: Feed type name. See http://activitystrea.ms/
+msgid "Activity Streams"
+msgstr ""
+
 #. TRANS: Client exception thrown when an imported feed does not have an author.
 msgid "No author in the feed."
 msgstr ""
@@ -8491,6 +8006,28 @@ msgstr "یک برچسب را برای محدود کردن �هرست انتخا
 msgid "Grant this user the \"%s\" role"
 msgstr ""
 
+#. TRANS: Header for mini list of group members on a group page (h2).
+msgid "Members"
+msgstr "اعضا"
+
+#. TRANS: Link to all group members from mini list of group members if group has more than n members.
+msgid "All members"
+msgstr "همهٔ اعضا"
+
+#. TRANS: Header for mini list of users with a pending membership request on a group page (h2).
+msgid "Pending"
+msgstr ""
+
+#. TRANS: Header for mini list of users that are blocked in a group page (h2).
+msgid "Blocked"
+msgstr "مسدود شده"
+
+#. TRANS: Title for list of group administrators on a group page.
+#, fuzzy
+msgctxt "TITLE"
+msgid "Admins"
+msgstr "مدیران"
+
 #. TRANS: Button text for the form that will block a user from a group.
 msgctxt "BUTTON"
 msgid "Block"
@@ -8498,8 +8035,8 @@ msgstr ""
 
 #. TRANS: Submit button title.
 msgctxt "TOOLTIP"
-msgid "Block this user"
-msgstr "بستن کاربر"
+msgid "Block this user so that they can no longer post messages to it."
+msgstr ""
 
 #. TRANS: Field title on group edit form.
 #, fuzzy
@@ -8551,62 +8088,9 @@ msgctxt "GROUPADMIN"
 msgid "Admin"
 msgstr "مدیر"
 
-#. TRANS: Menu item in the group navigation page.
-msgctxt "MENU"
-msgid "Group"
-msgstr ""
-
-#. TRANS: Tooltip for menu item in the group navigation page.
-#. TRANS: %s is the nickname of the group.
-#, php-format
-msgctxt "TOOLTIP"
-msgid "%s group"
-msgstr ""
-
-#. TRANS: Menu item in the group navigation page.
-msgctxt "MENU"
-msgid "Members"
-msgstr ""
-
-#. TRANS: Tooltip for menu item in the group navigation page.
-#. TRANS: %s is the nickname of the group.
-#, php-format
-msgctxt "TOOLTIP"
-msgid "%s group members"
-msgstr ""
-
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: %d is the number of pending members.
-#, php-format
-msgctxt "MENU"
-msgid "Pending members (%d)"
-msgid_plural "Pending members (%d)"
-msgstr[0] ""
-
-#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: %s is the nickname of the group.
-#, fuzzy, php-format
-msgctxt "TOOLTIP"
-msgid "%s pending members"
-msgstr "اعضای گروه %s"
-
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-msgctxt "MENU"
-msgid "Blocked"
-msgstr ""
-
-#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: %s is the nickname of the group.
-#, php-format
-msgctxt "TOOLTIP"
-msgid "%s blocked users"
-msgstr ""
-
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: Menu item in primary navigation panel.
-msgctxt "MENU"
-msgid "Admin"
-msgstr "مدیر"
+#. TRANS: Group actions header (h2). Text hidden by default.
+msgid "Group actions"
+msgstr "اعمال گروه"
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
@@ -8615,11 +8099,6 @@ msgctxt "TOOLTIP"
 msgid "Edit %s group properties"
 msgstr ""
 
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-msgctxt "MENU"
-msgid "Logo"
-msgstr ""
-
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
 #, php-format
@@ -8627,17 +8106,11 @@ msgctxt "TOOLTIP"
 msgid "Add or edit %s logo"
 msgstr ""
 
-#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: %s is the nickname of the group.
-#, php-format
-msgctxt "TOOLTIP"
-msgid "Add or edit %s design"
+#. TRANS: Link text for link on user profile.
+msgctxt "MENU"
+msgid "Logo"
 msgstr ""
 
-#. TRANS: Group actions header (h2). Text hidden by default.
-msgid "Group actions"
-msgstr "اعمال گروه"
-
 #. TRANS: Title for groups with the most members section.
 #, fuzzy
 msgid "Popular groups"
@@ -8648,11 +8121,19 @@ msgstr "پیام‌های برگزیده"
 msgid "Active groups"
 msgstr "تمام گروه‌ها"
 
-#. TRANS: Title for group tag cloud section.
-#. TRANS: %s is a group name.
-#, php-format
-msgid "Tags in %s group's notices"
-msgstr "برچسب‌ها در پیام‌های گروه %s"
+#. TRANS: Link description for seeing all groups.
+#. TRANS: Link description for seeing all lists.
+msgid "See all"
+msgstr ""
+
+#. TRANS: Link title for seeing all groups.
+msgid "See all groups you belong to."
+msgstr ""
+
+#. TRANS: Menu item title in personal group navigation menu.
+#. TRANS: %s is a username.
+msgid "Back to top"
+msgstr ""
 
 #. TRANS: Client exception 406
 msgid "This page is not available in a media type you accept"
@@ -8735,12 +8216,45 @@ msgctxt "TITLE"
 msgid "Trends"
 msgstr ""
 
-#. TRANS: Button text for inviting more users to the StatusNet instance.
+#. TRANS: Default button text for inviting more users to the StatusNet instance.
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Invite more colleagues"
 msgstr "دعوت کردن کاربران تازه"
 
+#. TRANS: Form legend.
+#, fuzzy
+msgid "Invite collegues"
+msgstr "دعوت کردن کاربران تازه"
+
+#. TRANS: Field label for a list of e-mail addresses.
+msgid "Email addresses"
+msgstr "نشانی‌های پست الکترونیکی"
+
+#. TRANS: Field title for a list of e-mail addresses.
+#, fuzzy
+msgid "Addresses of friends to invite (one per line)."
+msgstr "نشانی دوستان (یک نشانی در هر خط("
+
+#. TRANS: Field label for a personal message to send to invitees.
+msgid "Personal message"
+msgstr "پیام خصوصی"
+
+#. TRANS: Field title for a personal message to send to invitees.
+msgid "Optionally add a personal message to the invitation."
+msgstr "در صورت تمایل می‌توانید یک پیام به همراه دعوت نامه ب�رستید."
+
+#. TRANS: Send button for inviting friends
+#. TRANS: Button text for sending notice.
+msgctxt "BUTTON"
+msgid "Send"
+msgstr "�رستادن"
+
+#. TRANS: Submit button title.
+#, fuzzy
+msgid "Send invitations."
+msgstr "دعوت‌نامه‌ها"
+
 #. TRANS: Button text for joining a group.
 #, fuzzy
 msgctxt "BUTTON"
@@ -8753,6 +8267,11 @@ msgctxt "BUTTON"
 msgid "Leave"
 msgstr "ترک کردن"
 
+#. TRANS: Link title for seeing all lists.
+#, fuzzy
+msgid "See all lists you have created."
+msgstr "برنامه‌هایی که ثبت کرده‌اید"
+
 #. TRANS: Menu item for logging in to the StatusNet site.
 #. TRANS: Menu item in primary navigation panel.
 msgctxt "MENU"
@@ -8812,8 +8331,8 @@ msgstr ""
 #. TRANS: %1$s is the subscribing user's nickname, %2$s is the StatusNet sitename.
 #. TRANS: Main body of new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscriber's long name, %2$s is the StatusNet sitename.
-#, php-format
-msgid "%1$s is now listening to your notices on %2$s."
+#, fuzzy, php-format
+msgid "%1$s is now following you on %2$s."
 msgstr "%1$s اکنون پیام‌های شما را در %2$s دنبال می‌کند."
 
 #. TRANS: Subject of pending new-subscriber notification e-mail.
@@ -8982,7 +8501,7 @@ msgstr ""
 "به این پست الکترونیک پاسخ ندهید، چون پاسخ شما به آن‌ها نمی‌رسد.\n"
 "\n"
 "با احترام،\n"
-"%5$s\n"
+"%5$s"
 
 #. TRANS: Subject for favorite notification e-mail.
 #. TRANS: %1$s is the adding user's long name, %2$s is the adding user's nickname.
@@ -9052,7 +8571,7 @@ msgstr "%s (@%s) به توجه شما یک پیام �رستاد"
 #. TRANS: Body of @-reply notification e-mail.
 #. TRANS: %1$s is the sending user's name, $2$s is the StatusNet sitename,
 #. TRANS: %3$s is a URL to the notice, %4$s is the notice text,
-#. TRANS: %5$s is a URL to the full conversion if it exists (otherwise empty),
+#. TRANS: %5$s is the text "The full conversation can be read here:" and a URL to the full conversion if it exists (otherwise empty),
 #. TRANS: %6$s is a URL to reply to the notice, %7$s is a URL to all @-replies for the addressed user,
 #, fuzzy, php-format
 msgid ""
@@ -9099,6 +8618,10 @@ msgstr ""
 
 #. TRANS: Subject of group join notification e-mail.
 #. TRANS: %1$s is the joining user's nickname, %2$s is the group name, and %3$s is the StatusNet sitename.
+#, fuzzy, php-format
+msgid "%1$s has joined your group %2$s on %3$s"
+msgstr "%1$s به گروه %2$s پیوست."
+
 #. TRANS: Main body of group join notification e-mail.
 #. TRANS: %1$s is the subscriber's long name, %2$s is the group name, and %3$s is the StatusNet sitename,
 #. TRANS: %4$s is a block of profile info about the subscriber.
@@ -9186,8 +8709,9 @@ msgid "Make Admin"
 msgstr ""
 
 #. TRANS: Submit button title.
+#, fuzzy
 msgctxt "TOOLTIP"
-msgid "Make this user an admin"
+msgid "Make this user an admin."
 msgstr "کاربر را مدیر کن"
 
 #. TRANS: Client exception thrown when a database error was thrown during a file upload operation.
@@ -9235,7 +8759,7 @@ msgstr "�رستادن یک پیام مستقیم"
 msgid "Select recipient:"
 msgstr "یک اپراتور را انتخاب کنید"
 
-#. TRANS Entry in drop-down selection box in direct-message inbox/outbox when no one is available to message.
+#. TRANS: Entry in drop-down selection box in direct-message inbox/outbox when no one is available to message.
 #, fuzzy
 msgid "No mutual subscribers."
 msgstr "تایید نشده!"
@@ -9307,6 +8831,10 @@ msgstr ""
 msgid "You must implement either adaptNoticeListItem() or showNotice()."
 msgstr ""
 
+#. TRANS: Link description to show more items in a list.
+msgid "More â–¼"
+msgstr ""
+
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 msgid "Nickname cannot be empty."
 msgstr ""
@@ -9356,10 +8884,6 @@ msgctxt "SEPARATOR"
 msgid ", "
 msgstr ""
 
-#. TRANS: Start of profile addressees list.
-msgid " â–¸ "
-msgstr ""
-
 #. TRANS: Used in coordinates as abbreviation of north.
 #, fuzzy
 msgid "N"
@@ -9399,7 +8923,8 @@ msgid "Repeated by"
 msgstr "تکرار از"
 
 #. TRANS: Link title in notice list item to reply to a notice.
-msgid "Reply to this notice"
+#, fuzzy
+msgid "Reply to this notice."
 msgstr "به این پیام پاسخ دهید"
 
 #. TRANS: Link text in notice list item to reply to a notice.
@@ -9407,7 +8932,8 @@ msgid "Reply"
 msgstr "پاسخ"
 
 #. TRANS: Link title in notice list item to delete a notice.
-msgid "Delete this notice"
+#, fuzzy
+msgid "Delete this notice from the timeline."
 msgstr "این پیام را پاک کن"
 
 #. TRANS: Title for repeat form status in notice list when a notice has been repeated.
@@ -9434,27 +8960,6 @@ msgstr "یادآوری‌کردن"
 msgid "Send a nudge to this user."
 msgstr "یک یادآوری به این کاربر �رستاده شود"
 
-#. TRANS: Exception thrown when creating a new profile fails in OAuth store.
-msgid "Error inserting new profile."
-msgstr ""
-
-#. TRANS: Exception thrown when creating a new avatar fails in OAuth store.
-msgid "Error inserting avatar."
-msgstr ""
-
-#. TRANS: Exception thrown when creating a remote profile fails in OAuth store.
-msgid "Error inserting remote profile."
-msgstr ""
-
-#. TRANS: Exception thrown when a notice is denied because it has been sent before.
-msgid "Duplicate notice."
-msgstr ""
-
-#. TRANS: Exception thrown when creating a new subscription fails in OAuth store.
-#, fuzzy
-msgid "Could not insert new subscription."
-msgstr "نمی‌توان اشتراک تازه‌ای ا�زود."
-
 #. TRANS: Server exception thrown in oEmbed action if no API endpoint is available.
 #, fuzzy
 msgid "No oEmbed API endpoint available."
@@ -9542,11 +9047,6 @@ msgstr "ویرایش"
 msgid "Edit %s list by you."
 msgstr "ویرایش گروه %s"
 
-#. TRANS: Link description for link to list of users tagged with a tag.
-#, fuzzy
-msgid "Tagged"
-msgstr "برچسب"
-
 #. TRANS: Title for link to edit list settings.
 #, fuzzy
 msgid "Edit list settings."
@@ -9703,8 +9203,10 @@ msgctxt "plugin"
 msgid "Enable"
 msgstr ""
 
+#. TRANS: Plugin description for a disabled plugin.
 msgctxt "plugin-description"
-msgid "(Plugin descriptions unavailable when disabled.)"
+msgid ""
+"(The plugin description is unavailable when a plugin has been disabled.)"
 msgstr ""
 
 #. TRANS: Menu item in primary navigation panel.
@@ -9718,6 +9220,11 @@ msgstr "تنظیمات پیامک"
 msgid "Change your personal settings."
 msgstr "تنظیمات نمایه‌تان را تغییر دهید"
 
+#. TRANS: Menu item in primary navigation panel.
+msgctxt "MENU"
+msgid "Admin"
+msgstr "مدیر"
+
 #. TRANS: Menu item title in primary navigation panel.
 #, fuzzy
 msgid "Site configuration."
@@ -9738,15 +9245,8 @@ msgstr "خارج شدن از سایت ."
 msgid "Login to the site."
 msgstr "ورود به وب‌گاه"
 
-#. TRANS: Menu item in primary navigation panel.
-msgctxt "MENU"
-msgid "Search"
-msgstr "جست‌وجو"
-
-#. TRANS: Menu item title in primary navigation panel.
-#, fuzzy
-msgid "Search the site."
-msgstr "جست‌وجوی وب‌گاه"
+msgid "This profile has been silenced by site moderators"
+msgstr ""
 
 #. TRANS: H2 text for user subscription statistics.
 #, fuzzy
@@ -9758,6 +9258,10 @@ msgstr "اجازه دادن"
 msgid "Followers"
 msgstr "اجازه دادن"
 
+#. TRANS: H2 text for user statistics.
+msgid "Statistics"
+msgstr "آمار"
+
 #. TRANS: Label for user statistics.
 msgid "User ID"
 msgstr "شناسه کاربر"
@@ -9766,10 +9270,6 @@ msgstr "شناسه کاربر"
 msgid "Member since"
 msgstr "عضو شده از"
 
-#. TRANS: Label for user statistics.
-msgid "Notices"
-msgstr "پیام‌ها"
-
 #. TRANS: Label for user statistics.
 #. TRANS: Average count of posts made per day since account registration.
 msgid "Daily average"
@@ -9864,6 +9364,7 @@ msgid "Keyword(s)"
 msgstr "کلمه(های) کلیدی"
 
 #. TRANS: Button text for searching site.
+#. TRANS: Button text for search button on search form.
 #. TRANS: Button text to search profiles.
 msgctxt "BUTTON"
 msgid "Search"
@@ -9914,23 +9415,6 @@ msgstr "پیدا کردن محتوای پیام‌ها"
 msgid "Find groups on this site"
 msgstr "پیدا کردن گروه‌ها در این وب‌گاه"
 
-#. TRANS: Secondary navigation menu item leading to help on StatusNet.
-msgctxt "MENU"
-msgid "Help"
-msgstr "Ú©Ù…Ú©"
-
-#. TRANS: Secondary navigation menu item leading to text about StatusNet site.
-#, fuzzy
-msgctxt "MENU"
-msgid "About"
-msgstr "دربارهٔ"
-
-#. TRANS: Secondary navigation menu item leading to Frequently Asked Questions.
-#, fuzzy
-msgctxt "MENU"
-msgid "FAQ"
-msgstr "سوال‌های رایج"
-
 #. TRANS: Secondary navigation menu item leading to Terms of Service.
 #, fuzzy
 msgctxt "MENU"
@@ -9955,19 +9439,6 @@ msgctxt "MENU"
 msgid "Version"
 msgstr "نسخه"
 
-#. TRANS: Secondary navigation menu item leading to e-mail contact information on the
-#. TRANS: StatusNet site, where to report bugs, ...
-#, fuzzy
-msgctxt "MENU"
-msgid "Contact"
-msgstr "تماس"
-
-#. TRANS: Secondary navigation menu item. Leads to information about embedding a timeline widget.
-#, fuzzy
-msgctxt "MENU"
-msgid "Badge"
-msgstr "نشان"
-
 #. TRANS: Default title for section/sidebar widget.
 msgid "Untitled section"
 msgstr "بخش بی‌نام"
@@ -10016,10 +9487,6 @@ msgstr "پست الکترونیکی"
 msgid "Change email handling"
 msgstr "تغیر تنظیمات ایمل ."
 
-#. TRANS: Menu item title in settings navigation panel.
-msgid "Design your profile"
-msgstr "نمایهٔ خود را طراحی کنید"
-
 #. TRANS: Menu item in settings navigation panel.
 #, fuzzy
 msgctxt "MENU"
@@ -10060,6 +9527,15 @@ msgstr "اتصال‌ها"
 msgid "Authorized connected applications"
 msgstr "برنامه‌های وصل‌شدهٔ مجاز"
 
+#. TRANS: Menu item in settings navigation panel.
+msgctxt "MENU"
+msgid "Old school"
+msgstr ""
+
+#. TRANS: Menu item title in settings navigation panel.
+msgid "UI tweaks for old-school users"
+msgstr ""
+
 #. TRANS: Title of form to silence a user.
 #, fuzzy
 msgctxt "TITLE"
@@ -10070,6 +9546,43 @@ msgstr "ساکت کردن"
 msgid "Silence this user"
 msgstr "ساکت کردن این کاربر"
 
+#. TRANS: Server error displayed when trying to create an anynymous OAuth consumer.
+#, fuzzy
+msgid "Could not create anonymous consumer."
+msgstr "نمی‌توان نام‌های مستعار را ساخت."
+
+#. TRANS: Server error displayed when trying to create an anynymous OAuth application.
+#, fuzzy
+msgid "Could not create anonymous OAuth application."
+msgstr "نمی‌توان برنامه را ساخت."
+
+#. TRANS: Exception thrown when no token association could be found.
+msgid ""
+"Could not find a profile and application associated with the request token."
+msgstr ""
+
+#. TRANS: Exception thrown when no access token can be issued.
+#, fuzzy
+msgid "Could not issue access token."
+msgstr "پیغام نمی تواند درج گردد"
+
+#. TRANS: Exception thrown when a database error occurs.
+msgid "Database error inserting OAuth application user."
+msgstr "هنگام ا�زودن کاربر برنامهٔ OAuth در پایگاه داده خطایی رخ داد."
+
+#. TRANS: Exception thrown when a database error occurs.
+#, fuzzy
+msgid "Database error updating OAuth application user."
+msgstr "هنگام ا�زودن کاربر برنامهٔ OAuth در پایگاه داده خطایی رخ داد."
+
+#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
+msgid "Tried to revoke unknown token."
+msgstr ""
+
+#. TRANS: Exception thrown when an attempt is made to remove a revoked token.
+msgid "Failed to delete revoked token."
+msgstr ""
+
 #. TRANS: Menu item in local navigation menu.
 #, fuzzy
 msgctxt "MENU"
@@ -10127,6 +9640,18 @@ msgstr "به شما ملحق شوند  %s دوستان و همکاران را د
 msgid "Subscribe to this user"
 msgstr "مشترک شدن این کاربر"
 
+#. TRANS: Button text to subscribe to a user.
+#. TRANS: Button text for subscribing to a list.
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Subscribe"
+msgstr "اشتراک"
+
+#. TRANS: Button title to subscribe to a user.
+#, fuzzy
+msgid "Subscribe to this user."
+msgstr "مشترک شدن این کاربر"
+
 #. TRANS: Title of personal tag cloud section.
 msgid "People Tagcloud as self-tagged"
 msgstr ""
@@ -10247,15 +9772,24 @@ msgstr[0] ""
 #. TRANS: List message for notice repeated by logged in user.
 #, fuzzy
 msgctxt "REPEATLIST"
-msgid "You have repeated this notice."
+msgid "You repeated this."
 msgstr "شما قبلا آن پیام را تکرار کرده‌اید."
 
-#. TRANS: List message for repeated notices.
-#. TRANS: %d is the number of users that have repeated a notice.
+#. TRANS: List message for when more than 4 people repeat something.
+#. TRANS: %%s is a list of users liking a notice, %d is the number over 4 that like the notice.
+#. TRANS: Plural is decided on the total number of users liking the notice (count of %%s + %d).
+#, php-format
+msgid "%%s and %d other repeated this."
+msgid_plural "%%s and %d others repeated this."
+msgstr[0] ""
+
+#. TRANS: List message for favoured notices.
+#. TRANS: %%s is a list of users liking a notice.
+#. TRANS: Plural is based on the number of of users that have favoured a notice.
 #, fuzzy, php-format
-msgid "One person has repeated this notice."
-msgid_plural "%d people have repeated this notice."
-msgstr[0] "قبلا آن پیام تکرار شده است."
+msgid "%%s repeated this."
+msgid_plural "%%s repeated this."
+msgstr[0] "تکرار شده به %s"
 
 #. TRANS: Form legend.
 #, fuzzy, php-format
@@ -10355,7 +9889,6 @@ msgid "Unsilence this user"
 msgstr "این کاربر از حالت سکوت خارج شود"
 
 #. TRANS: Form legend on unsubscribe form.
-#. TRANS: Button title on unsubscribe form.
 msgid "Unsubscribe from this user"
 msgstr "لغو مشترک‌شدن از این کاربر"
 
@@ -10366,6 +9899,11 @@ msgctxt "BUTTON"
 msgid "Unsubscribe"
 msgstr "لغو اشتراک"
 
+#. TRANS: Button title on unsubscribe form.
+#, fuzzy
+msgid "Unsubscribe from this user."
+msgstr "لغو مشترک‌شدن از این کاربر"
+
 #. TRANS: Exception text shown when no profile can be found for a user.
 #. TRANS: %1$s is a user nickname, $2$d is a user ID (number).
 #, fuzzy, php-format
@@ -10444,9 +9982,3 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
-
-#~ msgid "%1$s and friends, page %2$d"
-#~ msgstr "%1$s و دوستان، ص�حهٔ %2$d"
-
-#~ msgid "You and friends"
-#~ msgstr "شما و دوستان"
diff --git a/locale/fi/LC_MESSAGES/statusnet.po b/locale/fi/LC_MESSAGES/statusnet.po
index c0a0deffa0..016b533358 100644
--- a/locale/fi/LC_MESSAGES/statusnet.po
+++ b/locale/fi/LC_MESSAGES/statusnet.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Core to Finnish (Suomi)
+# Translation of StatusNet - Core to Finnish (suomi)
 # Exported from translatewiki.net
 #
 # Author: Crt
@@ -6,7 +6,10 @@
 # Author: Josutus
 # Author: McDutchie
 # Author: Nike
+# Author: Silvonen
 # Author: Str4nd
+# Author: Tne
+# Author: Tomi Toivio
 # Author: Wwwwolf
 # Author: XTL
 # --
@@ -16,32 +19,30 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:03+0000\n"
-"Language-Team: Finnish <http://translatewiki.net/wiki/Portal:fi>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:59+0000\n"
+"Language-Team: Finnish <https://translatewiki.net/wiki/Portal:fi>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: fi\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-05-05 10:52:40+0000\n"
+"X-POT-Import-Date: 2012-04-22 22:02:21+0000\n"
 
 #. TRANS: Database error message.
-#, php-format
+#, fuzzy, php-format
 msgid ""
 "The database for %1$s is not responding correctly, so the site will not work "
 "properly. The site admins probably know about the problem, but you can "
 "contact them at %2$s to make sure. Otherwise, wait a few minutes and try "
 "again."
 msgstr ""
-
-#. TRANS: Error message.
-msgid ""
-"An important error occured, probably related to email setup. Check logfiles "
-"for more info."
-msgstr ""
+"Sivuston %1s tietokanta ei vastaa oikein joten sivusto ei toimi kunnolla. "
+"Ylläpitäjät tietävät todennäköisesti ongelmasta mutta voit ottaa heihin "
+"varmuuden vuoksi yhteyttä osoitteella %2$s. Muussa tapauksessa odota muutama "
+"minuutti ja yritä uudelleen."
 
 #. TRANS: Error message.
 msgid "An error occurred."
@@ -102,12 +103,12 @@ msgstr "Estä uusien käyttäjien rekisteröityminen."
 msgid "Closed"
 msgstr "Suljettu"
 
-#. TRANS: Title for button to save access settings in site admin panel.
-msgid "Save access settings"
+#. TRANS: Button title to save access settings in site admin panel.
+#, fuzzy
+msgid "Save access settings."
 msgstr "Tallenna käyttöoikeusasetukset"
 
-#. TRANS: Tooltip for button to save access settings in site admin panel.
-#. TRANS: Button text for saving theme settings.
+#. TRANS: Button text to save access settings in site admin panel.
 #. TRANS: Button label to save e-mail preferences.
 #. TRANS: Button label to save IM preferences.
 #. TRANS: Button text in the license admin panel.
@@ -123,7 +124,6 @@ msgstr "Tallenna käyttöoikeusasetukset"
 #. TRANS: Button text for saving "Other settings" in profile.
 #. TRANS: Button text to save user settings in user admin panel.
 #. TRANS: Button label in the "Edit application" form.
-#. TRANS: Button text on profile design page to save settings.
 #. TRANS: Text for save button on group edit form.
 #. TRANS: Button text to save tags for a profile.
 msgctxt "BUTTON"
@@ -164,15 +164,11 @@ msgstr "Profiilia ei löydy."
 msgid "No such list."
 msgstr "Luetteloa ei ole olemassa."
 
-#. TRANS: Client error displayed when trying to add an OMB 0.1 remote profile to a list.
-msgid "You cannot list an OMB 0.1 remote profile with this action."
-msgstr "Et voi pyytää OMB 0.1 -etäprofiilia tällä toiminnolla."
-
 #. TRANS: Client error displayed when an unknown error occurs when adding a user to a list.
 #. TRANS: %s is a username.
 #, php-format
 msgid "There was an unexpected error while listing %s."
-msgstr ""
+msgstr "Odottamaton virhe listattaessa käyttäjää %s."
 
 #. TRANS: Client error displayed when an unknown error occurs when adding a user to a list.
 #. TRANS: %s is a profile URL.
@@ -181,6 +177,8 @@ msgid ""
 "There was a problem listing %s. The remote server is probably not responding "
 "correctly. Please try retrying later."
 msgstr ""
+"Virhe listattaessa URL:ia %s. Etäpalvelin ei todennäköisesti vastaa oikein. "
+"Ole hyvä ja yritä myöhemmin uudelleen."
 
 #. TRANS: Title after adding a user to a list.
 msgctxt "TITLE"
@@ -197,7 +195,6 @@ msgstr "Sivua ei ole."
 #. TRANS: Client error when user not found for an rss related action.
 #. TRANS: Client error displayed when no existing user is provided for a user's delivery device setting.
 #. TRANS: Client error displayed if a user could not be found.
-#. TRANS: Client error when user not found updating a profile background image.
 #. TRANS: Client error displayed updating profile image without having a user object.
 #. TRANS: Client error displayed when making an Atom API request for an unknown user.
 #. TRANS: Client error displayed when trying to block a non-existing user or a user from another site.
@@ -223,14 +220,11 @@ msgstr "Sivua ei ole."
 #. TRANS: Client error displayed when trying to get the RSS feed with favorites of a user that does not exist.
 #. TRANS: Client error displayed when requesting Friends of a Friend feed without providing a user nickname.
 #. TRANS: Client error displayed when requesting Friends of a Friend feed for an object that is not a user.
-#. TRANS: Client error displayed when trying to get a user hCard for a non-existing user.
 #. TRANS: Client error displayed trying to make a micro summary without providing a valid user.
 #. TRANS: Client error displayed trying to send a direct message to a non-existing user.
 #. TRANS: Client error displayed trying to use "one time password login" without using an existing user.
 #. TRANS: Client error displayed when referring to non-existing user.
 #. TRANS: Client error displayed trying to perform an action related to a non-existing user.
-#. TRANS: Form validation error on page for remote subscribe when no user was provided.
-#. TRANS: Form validation error on page for remote subscribe when no user profile was found.
 #. TRANS: Client error displayed when trying to reply to a non-exsting user.
 #. TRANS: Client error displayed when providing a non-existing nickname in a RSS 1.0 action.
 #. TRANS: Client error.
@@ -239,7 +233,6 @@ msgstr "Sivua ei ole."
 #. TRANS: Client error displayed trying to find a user by ID for a non-existing ID.
 #. TRANS: Client error displayed requesting groups for a non-existing user.
 #. TRANS: Client error displayed when user not found for an action.
-#. TRANS: Client error displayed providing a non-existing nickname.
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #. TRANS: Client error displayed when trying to perform a gallery action with an unknown user.
 #. TRANS: Client error displayed when trying to access a mailbox without providing a user.
@@ -248,15 +241,21 @@ msgid "No such user."
 msgstr "Käyttäjää ei ole."
 
 #. TRANS: Title of a user's own start page.
-#, fuzzy
 msgid "Home timeline"
-msgstr "%s aikajana"
+msgstr "Kotisivun aikajana"
 
 #. TRANS: Title of another user's start page.
 #. TRANS: %s is the other user's name.
-#, fuzzy, php-format
+#, php-format
 msgid "%s's home timeline"
-msgstr "%s aikajana"
+msgstr "%s:n kotisivun aikajana"
+
+#. TRANS: %s is user nickname.
+#. TRANS: Feed title.
+#. TRANS: %s is tagger's nickname.
+#, fuzzy, php-format
+msgid "Feed for friends of %s (Activity Streams JSON)"
+msgstr "Käyttäjän %s kavereiden syöte (Activity Streams JSON)"
 
 #. TRANS: %s is user nickname.
 #, php-format
@@ -295,15 +294,15 @@ msgstr ""
 
 #. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@".
 #. TRANS: This message contains Markdown links. Keep "](" together.
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "You can try to [nudge %1$s](../%2$s) from their profile or [post something "
 "to them](%%%%action.newnotice%%%%?status_textarea=%3$s)."
 msgstr ""
-"Ole ensimmäinen joka [lähettää päivityksen tästä aiheesta](%%%%action."
-"newnotice%%%%?status_textarea=%s)!"
+"Voit yrittää [nykäistä %1$s](../%2$s) heidän profiilinsa kautta tai [lähetä "
+"heille viesti](%%%%action.newnotice%%%%?status_textarea=%3$s)."
 
-#. TRANS: Encoutagement displayed on empty timeline user pages for anonymous users.
+#. TRANS: Encouragement displayed on empty timeline user pages for anonymous users.
 #. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
 #. TRANS: Empty list message for page with replies for a user for not logged in users.
 #. TRANS: %1$s is a user nickname. This message contains a Markdown link in the form [link text](link).
@@ -317,6 +316,12 @@ msgstr ""
 "Miksi et [loisi tunnusta](%%%%action.register%%%%) ja tökkäisi käyttäjää %s "
 "tai lähettää ilmoituksen hänelle?"
 
+#. TRANS: Button text for inviting more users to the StatusNet instance.
+#. TRANS: Less business/enterprise-oriented language for public sites.
+msgctxt "BUTTON"
+msgid "Send invite"
+msgstr "Lähetä kutsu"
+
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Title of API timeline for a user and friends.
 #. TRANS: %s is a username.
@@ -325,8 +330,6 @@ msgstr ""
 #. TRANS: %s is a username.
 #. TRANS: Menu item title in personal group navigation menu.
 #. TRANS: %s is a username.
-#. TRANS: Menu item title in settings navigation panel.
-#. TRANS: %s is a username.
 #, php-format
 msgid "%s and friends"
 msgstr "%s ja kaverit"
@@ -365,7 +368,6 @@ msgstr ""
 #. TRANS: Server error thrown on database error updating SMS preferences.
 #. TRANS: Server error thrown on database error removing a registered SMS phone number.
 #. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
-#. TRANS: Server exception thrown on Profile design page when updating design settings fails.
 msgid "Could not update user."
 msgstr "Käyttäjän päivitys epäonnistui."
 
@@ -380,7 +382,6 @@ msgstr "Profiilin tallennus epäonnistui."
 
 #. TRANS: Client error displayed when the number of bytes in a POST request exceeds a limit.
 #. TRANS: %s is the number of bytes of the CONTENT_LENGTH.
-#. TRANS: Form validation error in design settings form. POST should remain untranslated.
 #, php-format
 msgid ""
 "The server was unable to handle that much POST data (%s byte) due to its "
@@ -395,28 +396,10 @@ msgstr[1] ""
 "Nykyisien asetusten johdosta palvelin ei voinut käsitellä näin paljoa POST-"
 "dataa (%s tavua)."
 
-#. TRANS: Client error displayed when saving design settings fails because of an empty id.
-#. TRANS: Client error displayed when saving design settings fails because of an empty result.
-#. TRANS: Client error displayed when a database error occurs inserting profile colours.
-#. TRANS: Client error displayed when a database error occurs updating profile colours.
-#. TRANS: Form validation error displayed when group design settings could not be saved because of an application issue.
-#. TRANS: Form validation error on Profile design page when saving design settings has failed.
-#. TRANS: Form validation error on Profile design page when updating design settings has failed.
-msgid "Unable to save your design settings."
-msgstr "Ulkoasun tallennus epäonnistui."
-
-#. TRANS: Error displayed when updating design settings fails.
-#. TRANS: Client error displayed when a database error occurs updating profile colours.
-#. TRANS: Form validation error on Profile design page when updating design settings has failed.
-#. TRANS: Error message displayed if design settings could not be saved.
-#. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
-msgid "Could not update your design."
-msgstr "Ulkoasua ei voitu päivittää."
-
 #. TRANS: Title for Atom feed.
 msgctxt "ATOM"
 msgid "Main"
-msgstr ""
+msgstr "Pääsivu"
 
 #. TRANS: Title for Atom feed. %s is a user nickname.
 #. TRANS: Message is used as link title. %s is a user nickname.
@@ -459,6 +442,21 @@ msgstr "Käyttäjän esto epäonnistui."
 msgid "Unblock user failed."
 msgstr "Käyttäjän eston poisto epäonnistui."
 
+#. TRANS: Client exception thrown when no conversation ID is given.
+msgid "No conversation ID."
+msgstr "Keskustelun ID puuttuu."
+
+#. TRANS: Client exception thrown when referring to a non-existing conversation ID (%d).
+#, php-format
+msgid "No conversation with ID %d."
+msgstr "Ei keskustelua ID-tunnuksella %d."
+
+#. TRANS: Title for conversion timeline.
+#, fuzzy
+msgctxt "TITLE"
+msgid "Conversation"
+msgstr "Keskustelu"
+
 #. TRANS: Title. %s is a user nickname.
 #, php-format
 msgid "Direct messages from %s"
@@ -503,6 +501,8 @@ msgstr ""
 "Et voi lähettää suoraa viestiä käyttäjälle, jonka kanssa et ole vielä kaveri."
 
 #. TRANS: Client error displayed trying to direct message self (403).
+#. TRANS: Client error displayed trying to send a direct message to self.
+#. TRANS: Error text shown when trying to send a direct message to self.
 msgid ""
 "Do not send a message to yourself; just say it to yourself quietly instead."
 msgstr "Et voi lähettää viestiä itsellesi. Kuiskaa se hiljaa itsellesi."
@@ -616,8 +616,8 @@ msgstr "Koko nimi on liian pitkä (max 255 merkkiä)."
 #, fuzzy, php-format
 msgid "Description is too long (maximum %d character)."
 msgid_plural "Description is too long (maximum %d characters)."
-msgstr[0] "kuvaus on liian pitkä (max %d merkkiä)."
-msgstr[1] "kuvaus on liian pitkä (max %d merkkiä)."
+msgstr[0] "Kuvaus on liian pitkä (maksimipituus %d merkkiä)."
+msgstr[1] "Kuvaus on liian pitkä (maksimipituus %d merkkiä)."
 
 #. TRANS: Client error shown when providing too long a location during group creation.
 #. TRANS: API validation exception thrown when location does not validate.
@@ -731,7 +731,6 @@ msgstr "sivun %s ryhmiä"
 
 #. TRANS: Client error displayed when trying to edit a group without being an admin.
 #. TRANS: Client error displayed trying to edit a group while not being a group admin.
-#. TRANS: Client error displayed trying to change group design settings without being a (group) admin.
 #. TRANS: Client error displayed when trying to change group logo settings while not being a group admin.
 msgid "You must be an admin to edit the group."
 msgstr ""
@@ -757,9 +756,8 @@ msgstr ""
 
 #. TRANS: API validation exception thrown when alias is the same as nickname.
 #. TRANS: Group create form validation error.
-#, fuzzy
 msgid "Alias cannot be the same as nickname."
-msgstr "Alias ei voi olla sama kuin ryhmätunnus."
+msgstr "Alias ei voi olla sama kuin käyttäjänimi."
 
 #. TRANS: Client error displayed when referring to a non-existing list.
 #. TRANS: Client error displayed trying to perform an action related to a non-existing list.
@@ -776,31 +774,27 @@ msgstr "Et voi päivittää luetteloita, joita et omista."
 #. TRANS: Client error displayed when an unknown error occurs in the list subscribers action.
 #. TRANS: Client error displayed when an unknown error occurs unsubscribing from a list.
 msgid "An error occured."
-msgstr ""
+msgstr "Tapahtui virhe."
 
 #. TRANS: Client error displayed when trying to delete another user's list.
 msgid "You cannot delete lists that do not belong to you."
 msgstr "Et voi poistaa luetteloita, joita et omista."
 
 #. TRANS: Client error displayed when referring to a non-list member.
-#, fuzzy
 msgid "The specified user is not a member of this list."
-msgstr "Käyttäjä ei kuulu tähän ryhmään."
+msgstr "Käyttäjä ei kuulu ole listan jäsen."
 
 #. TRANS: Client error displayed when trying to add members to a list without having the right to do so.
-#, fuzzy
 msgid "You are not allowed to add members to this list."
-msgstr "Sinä et kuulu tähän ryhmään."
+msgstr "Sinulla ei ole oikeuksia lisätä jäseniä listalle."
 
 #. TRANS: Client error displayed when trying to modify list members without specifying them.
-#, fuzzy
 msgid "You must specify a member."
-msgstr "Profiili on pakollinen."
+msgstr "Sinun pitää valita jäsen."
 
 #. TRANS: Client error displayed when trying to remove members from a list without having the right to do so.
-#, fuzzy
 msgid "You are not allowed to remove members from this list."
-msgstr "Sinä et kuulu tähän ryhmään."
+msgstr "Sinulla ei ole oikeuksia poistaa jäseniä listalta."
 
 #. TRANS: Client error displayed when trying to remove a list member that is not part of a list.
 msgid "The user you are trying to remove from the list is not a member."
@@ -812,12 +806,11 @@ msgstr "Luettelolla pitää olla nimi."
 
 #. TRANS: Client error displayed when a membership check for a user is nagative.
 msgid "The specified user is not a subscriber of this list."
-msgstr ""
+msgstr "Annettu käyttäjä ei ole tämän listan tilaaja."
 
 #. TRANS: Client error displayed when trying to unsubscribe from a non-subscribed list.
-#, fuzzy
 msgid "You are not subscribed to this list."
-msgstr "Et ole tilannut tämän käyttäjän päivityksiä."
+msgstr "Et ole tilaajana tällä listalla."
 
 #. TRANS: Client error displayed when uploading a media file has failed.
 msgid "Upload failed."
@@ -849,7 +842,6 @@ msgstr "Tietokantavirhe lisättäessä oauth_token_association-arvoa."
 
 #. TRANS: Client error given on when invalid data was passed through a form in the OAuth API.
 #. TRANS: Unexpected validation error on avatar upload form.
-#. TRANS: Client error displayed when the submitted form contains unexpected data.
 #. TRANS: Client error displayed submitting invalid form data for edit application.
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
 #. TRANS: Form validation error message when an unsupported argument is used.
@@ -858,7 +850,6 @@ msgstr "Tietokantavirhe lisättäessä oauth_token_association-arvoa."
 #. TRANS: Client error when submitting a form with unexpected information.
 #. TRANS: Client error displayed when unexpected data is posted in the password recovery form.
 #. TRANS: Message given submitting a form with an unknown action in SMS settings.
-#. TRANS: Unknown form validation error in design settings form.
 msgid "Unexpected form submission."
 msgstr "Odottamaton lomakkeen lähetys."
 
@@ -903,7 +894,6 @@ msgstr "Käyttäjätili"
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Field label on account registration page.
-#. TRANS: Label for nickname on user authorisation page.
 #. TRANS: Field label on group edit form.
 #. TRANS: Dropdown option for searching in profiles.
 msgid "Nickname"
@@ -1035,11 +1025,11 @@ msgstr "Asiakasohjelman on annettava 'status'-parametri arvoineen."
 #. TRANS: Client error displayed when the parameter "status" is missing.
 #. TRANS: %d is the maximum number of character for a notice.
 #. TRANS: Error message in incoming mail handler used when an incoming e-mail contains too many characters.
-#, fuzzy, php-format
+#, php-format
 msgid "That's too long. Maximum notice size is %d character."
 msgid_plural "That's too long. Maximum notice size is %d characters."
-msgstr[0] "Päivitys on liian pitkä. Maksimipituus on %d merkkiä."
-msgstr[1] "Päivitys on liian pitkä. Maksimipituus on %d merkkiä."
+msgstr[0] "Viesti on liian pitkä. Viestin enimmäispituus on %d merkki."
+msgstr[1] "Viesti on liian pitkä. Viestin enimmäispituus on %d merkkiä."
 
 #. TRANS: Client error displayed when replying to a non-existing notice.
 msgid "Parent notice not found."
@@ -1049,11 +1039,11 @@ msgstr "Viestiä, johon vastataan, ei löytynyt."
 #. TRANS: %d is the maximum lenth for a notice.
 #. TRANS: Client error displayed exceeding the maximum notice length.
 #. TRANS: %d is the maximum length for a notice.
-#, fuzzy, php-format
+#, php-format
 msgid "Maximum notice size is %d character, including attachment URL."
 msgid_plural "Maximum notice size is %d characters, including attachment URL."
-msgstr[0] "Maksimikoko päivitykselle on %d merkkiä, mukaan lukien URL-osoite."
-msgstr[1] "Maksimikoko päivitykselle on %d merkkiä, mukaan lukien URL-osoite."
+msgstr[0] "Päivityksen enimmäispituus on %d merkki mukaan lukien URL-osoite."
+msgstr[1] "Päivityksen enimmäispituus on %d merkkiä mukaan lukien URL-osoite."
 
 #. TRANS: Client error displayed when requesting profiles of followers in an unsupported format.
 #. TRANS: Client error displayed when requesting IDs of followers in an unsupported format.
@@ -1115,10 +1105,9 @@ msgstr "Toistettu käyttäjälle %s"
 
 #. TRANS: Subtitle for API action that shows most recent notices that are repeats in user's inbox.
 #. TRANS: %1$s is the sitename, %2$s is a user nickname, %3$s is a user profile name.
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s notices that were to repeated to %2$s / %3$s."
-msgstr ""
-"%1$s -päivitykset, jotka on vastauksia käyttäjän %2$s / %3$s päivityksiin."
+msgstr "Sivuston %1$s päivitykset, jotka toistettiin käyttäjälle %2$s / %3$s."
 
 #. TRANS: Title of list of repeated notices of the logged in user.
 #. TRANS: %s is the nickname of the logged in user.
@@ -1128,9 +1117,9 @@ msgstr "Toistot käyttäjältä %s"
 
 #. TRANS: Subtitle of API time with retweets of me.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is the user nickname, %3$s is the user profile name.
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s notices that %2$s / %3$s has repeated."
-msgstr "Lähetä sähköpostia, jos joku lisää päivitykseni suosikiksi."
+msgstr "Sivuston %1$s päivitykset, jotka %2$s / %3$s on toistanut."
 
 #. TRANS: Title for timeline with lastest notices with a given tag.
 #. TRANS: %s is the tag.
@@ -1217,12 +1206,9 @@ msgstr "Sinun pitää olla kirjautunut sisään, jotta voit erota ryhmästä."
 #. TRANS: Client error displayed when requesting Friends of a Friend feed for a nickname that is not a group.
 #. TRANS: Client error displayed trying to block a user from a group while specifying a non-existing group.
 #. TRANS: Client error displayed referring to a group's permalink for a non-existing group ID.
-#. TRANS: Client error displayed trying to change group design settings while providing a nickname for a non-existing group.
 #. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
 #. TRANS: Client error displayed when trying to view group members for a non-existing group.
 #. TRANS: Client error displayed when trying to view group members for an object that is not a group.
-#. TRANS: Client error displayed when trying to view group members for a non-existing group.
-#. TRANS: Client error displayed when trying to view group members for an object that is not a group.
 #. TRANS: Client error displayed when requesting a group RSS feed for group that does not exist.
 #. TRANS: Client error displayed when requesting a group RSS feed for an object that is not a group.
 #. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
@@ -1231,10 +1217,10 @@ msgstr "Sinun pitää olla kirjautunut sisään, jotta voit erota ryhmästä."
 #. TRANS: Client error displayed when trying to leave a non-local group.
 #. TRANS: Client error displayed when trying to leave a non-existing group.
 #. TRANS: Client error displayed when providing an invalid group ID on the Make Admin page.
-#. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
-#. TRANS: Client error displayed if no local group with a given name was found requesting group page.
 #. TRANS: Command exception text shown when a group is requested that does not exist.
 #. TRANS: Error text shown when trying to leave a group that does not exist.
+#. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
+#. TRANS: Client error displayed if no local group with a given name was found requesting group page.
 msgid "No such group."
 msgstr "Tuota ryhmää ei ole."
 
@@ -1254,7 +1240,7 @@ msgstr "Et ole kirjautunut sisään."
 #. TRANS: Client error displayed when trying to approve or cancel a group join request without
 #. TRANS: being a group administrator.
 msgid "Only group admin can approve or cancel join requests."
-msgstr ""
+msgstr "Vain ryhmän ylläpitäjä voi hyväksyä tai hylätä liittymispyyntöjä."
 
 #. TRANS: Client error displayed trying to approve group membership without specifying a profile to approve.
 #. TRANS: Client error displayed trying to approve subscriptionswithout specifying a profile to approve.
@@ -1265,9 +1251,9 @@ msgstr "Profiili on pakollinen."
 #. TRANS: %s is a nickname.
 #. TRANS: Client error displayed when trying to approve a non-existing group join request.
 #. TRANS: %s is a user nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "%s is not in the moderation queue for this group."
-msgstr "Lista ryhmän käyttäjistä."
+msgstr "%s ei ole ryhmän moderointijonossa."
 
 #. TRANS: Client error displayed trying to approve/deny group membership.
 #. TRANS: Client error displayed trying to approve/deny subscription.
@@ -1289,10 +1275,10 @@ msgstr ""
 
 #. TRANS: Title for leave group page after group join request is approved/disapproved.
 #. TRANS: %1$s is the user nickname, %2$s is the group nickname.
-#, fuzzy, php-format
+#, php-format
 msgctxt "TITLE"
 msgid "%1$s's request for %2$s"
-msgstr "Käyttäjän %1$s päivitys %2$s"
+msgstr "Käyttäjän %1$s liittymispyyntö ryhmään %2$s"
 
 #. TRANS: Message on page for group admin after approving a join request.
 msgid "Join request approved."
@@ -1303,22 +1289,24 @@ msgid "Join request canceled."
 msgstr "Liittymispyyntö peruttu."
 
 #. TRANS: Client error displayed trying to approve subscription for a non-existing request.
-#, fuzzy, php-format
+#. TRANS: %s is a user nickname.
+#, php-format
 msgid "%s is not in the moderation queue for your subscriptions."
-msgstr "Lista ryhmän käyttäjistä."
+msgstr "Käyttäjä %s ei ole hyväksyttävien listalla tilauksiisi."
 
 #. TRANS: Server error displayed when cancelling a queued subscription request fails.
 #. TRANS: %1$s is the leaving user's nickname, $2$s is the nickname for which the leave failed.
-#, fuzzy, php-format
+#, php-format
 msgid "Could not cancel or approve request for user %1$s to join group %2$s."
-msgstr "Käyttäjä %1$s ei voinut liittyä ryhmään %2$s."
+msgstr ""
+"Käyttäjän %1$s pyyntöä liittyä ryhmään %2$s ei voitu hylätä tai hyväksyä."
 
 #. TRANS: Title for subscription approval ajax return
 #. TRANS: %1$s is the approved user's nickname
-#, fuzzy, php-format
+#, php-format
 msgctxt "TITLE"
 msgid "%1$s's request"
-msgstr "Käyttäjän %1$s päivitys %2$s"
+msgstr "Käyttäjän %1$s pyyntö"
 
 #. TRANS: Message on page for user after approving a subscription request.
 msgid "Subscription approved."
@@ -1357,7 +1345,7 @@ msgstr "Tämä päivitys on jo suosikkina."
 
 #. TRANS: Title for group membership feed.
 #. TRANS: %s is a username.
-#, fuzzy, php-format
+#, php-format
 msgid "Group memberships of %s"
 msgstr "Käyttäjän %s ryhmäjäsenyydet"
 
@@ -1411,9 +1399,9 @@ msgstr "Ei profiilia tällä tunnuksella: %d."
 
 #. TRANS: Client exception thrown when trying to display a subscription for a non-subscribed profile ID.
 #. TRANS: %1$d is the non-existing subscriber ID number, $2$d is the ID of the profile that was not subscribed to.
-#, fuzzy, php-format
+#, php-format
 msgid "Profile %1$d not subscribed to profile %2$d."
-msgstr "Et ole tilannut tämän käyttäjän päivityksiä."
+msgstr "Profiili %1$d ei ole profiilin %2$d tilaaja."
 
 #. TRANS: Client exception thrown when trying to delete a subscription of another user.
 msgid "Cannot delete someone else's subscription."
@@ -1421,9 +1409,9 @@ msgstr "Et voi toisen vieraan käyttäjän tilausta."
 
 #. TRANS: Subtitle for Atom subscription feed.
 #. TRANS: %1$s is a user nickname, %s$s is the StatusNet sitename.
-#, fuzzy, php-format
+#, php-format
 msgid "People %1$s has subscribed to on %2$s"
-msgstr "Ihmiset jotka ovat käyttäjän %s tilaajia"
+msgstr "Henkilöt joita %1$s seuraa sivustolla %2$s"
 
 #. TRANS: Client error displayed when not using the follow verb.
 msgid "Can only handle Follow activities."
@@ -1452,7 +1440,6 @@ msgstr "Liitettä ei ole."
 #. TRANS: Client error displayed trying to get an avatar without providing a nickname.
 #. TRANS: Client error displayed when requesting a list of blocked users for a group without providing a group nickname.
 #. TRANS: Client error displayed trying to edit a group while not proving a nickname for the group to edit.
-#. TRANS: Client error displayed trying to change group design settings without providing a group nickname.
 #. TRANS: Client error displayed when trying to change group logo settings without providing a nickname.
 #. TRANS: Client error displayed when trying to view group members without providing a group nickname.
 #. TRANS: Client error displayed when requesting a group RSS feed without providing a group nickname.
@@ -1671,10 +1658,10 @@ msgstr "Vastaukset käyttäjälle %s"
 #. TRANS: Title for leave group page after leaving.
 #. TRANS: %s$s is the leaving user's name, %2$s is the group name.
 #. TRANS: Title for leave group page after leaving.
-#, fuzzy, php-format
+#, php-format
 msgctxt "TITLE"
 msgid "%1$s left group %2$s"
-msgstr "Käyttäjän %1$s päivitys %2$s"
+msgstr "%1$s poistui ryhmästä %2$s"
 
 #. TRANS: Client error displayed when trying to leave a group without specifying an ID.
 #. TRANS: Client error displayed when trying to unsubscribe without providing a profile ID.
@@ -1721,14 +1708,12 @@ msgstr "Tämä osoite on jo vahvistettu."
 
 #. TRANS: Server error displayed when updating IM preferences fails.
 #. TRANS: Server error thrown on database error removing a registered IM address.
-#, fuzzy
 msgid "Could not update user IM preferences."
-msgstr "Ei voitu päivittää käyttäjän asetuksia."
+msgstr "Käyttäjän pikaviestinasetuksia ei voitu päivittää."
 
 #. TRANS: Server error displayed when adding IM preferences fails.
-#, fuzzy
 msgid "Could not insert user IM preferences."
-msgstr "Ei voitu lisätä uutta tilausta."
+msgstr "Käyttäjän pikaviestinasetuksia ei voitu lisätä."
 
 #. TRANS: Server error displayed when an address confirmation code deletion from the
 #. TRANS: database fails in the contact address confirmation action.
@@ -1749,6 +1734,17 @@ msgstr "Osoite \"%s\" on vahvistettu sinun käyttäjätunnuksellesi."
 msgid "Conversation"
 msgstr "Keskustelu"
 
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#, fuzzy
+msgid "Conversation feed (Activity Streams JSON)"
+msgstr "Syöte ryhmän %s päivityksille (Atom)"
+
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+msgid "Conversation feed (RSS 2.0)"
+msgstr "Keskustelun syöte (RSS 2.0)"
+
 #. TRANS: Title for conversation page.
 #. TRANS: Title for page that shows a notice.
 msgctxt "TITLE"
@@ -1812,8 +1808,8 @@ msgid "Enter \"%s\" to confirm that you want to delete your account."
 msgstr "Kirjoita �%s�, jos haluat todella poistaa käyttäjätilisi."
 
 #. TRANS: Button title for user account deletion.
-msgid "Permanently delete your account"
-msgstr "Poista käyttäjätilini lopullisesti"
+msgid "Permanently delete your account."
+msgstr "Poista käyttäjätilisi lopullisesti"
 
 #. TRANS: Client error displayed trying to delete an application while not logged in.
 msgid "You must be logged in to delete an application."
@@ -1958,148 +1954,6 @@ msgstr "Älä poista tätä käyttäjää."
 msgid "Delete this user."
 msgstr "Poista tämä käyttäjä."
 
-#. TRANS: Message used as title for design settings for the site.
-msgid "Design"
-msgstr "Ulkoasu"
-
-#. TRANS: Instructions for design adminsitration panel.
-msgid "Design settings for this StatusNet site"
-msgstr "Ulkoasuasetukset tälle StatusNet-sivustolle"
-
-#. TRANS: Client error displayed when a logo URL does is not valid.
-msgid "Invalid logo URL."
-msgstr "Virheellinen logon URL-osoite."
-
-#. TRANS: Client error displayed when an SSL logo URL is invalid.
-msgid "Invalid SSL logo URL."
-msgstr "Virheellinen logon salattu URL-osoite."
-
-#. TRANS: Client error displayed when a theme is submitted through the form that is not in the theme list.
-#. TRANS: %s is the chosen unavailable theme.
-#, php-format
-msgid "Theme not available: %s."
-msgstr "Teema ei ole käytettävissä: %s."
-
-#. TRANS: Fieldset legend for form to change logo.
-msgid "Change logo"
-msgstr "Vaihda väriä"
-
-#. TRANS: Field label for StatusNet site logo.
-msgid "Site logo"
-msgstr "Sivuston logo"
-
-#. TRANS: Field label for SSL StatusNet site logo.
-msgid "SSL logo"
-msgstr "SSL-logo"
-
-#. TRANS: Fieldset legend for form change StatusNet site's theme.
-msgid "Change theme"
-msgstr "Teeman vaihto"
-
-#. TRANS: Field label for dropdown to choose site theme.
-msgid "Site theme"
-msgstr "Sivuston teema"
-
-#. TRANS: Title for field label for dropdown to choose site theme.
-msgid "Theme for the site."
-msgstr "Teema sivustolle."
-
-#. TRANS: Field label for uploading a cutom theme.
-msgid "Custom theme"
-msgstr "Mukautettu ulkoasu"
-
-#. TRANS: Form instructions for uploading a cutom StatusNet theme.
-msgid "You can upload a custom StatusNet theme as a .ZIP archive."
-msgstr "Voit ladata mukautetun StatusNet-teeman .ZIP-pakettina."
-
-#. TRANS: Fieldset legend for theme background image.
-msgid "Change background image"
-msgstr "Vaihda tautakuva"
-
-#. TRANS: Field label for background image on theme designer page.
-#. TRANS: Field label for background color selector.
-#. TRANS: Label on profile design page for setting a profile page background colour.
-msgid "Background"
-msgstr "Tausta"
-
-#. TRANS: Form guide for background image upload form on theme designer page.
-#, php-format
-msgid ""
-"You can upload a background image for the site. The maximum file size is %1"
-"$s."
-msgstr "Voit ladata ryhmälle taustakuvan. Enimmäiskoko on %1$s."
-
-#. TRANS: Used as radio button label to add a background image.
-msgid "On"
-msgstr "On"
-
-#. TRANS: Used as radio button label to not add a background image.
-msgid "Off"
-msgstr "Off"
-
-#. TRANS: Form guide for turning background image on or off on theme designer page.
-#. TRANS: Form guide for a set of radio buttons on the profile design page that will enable or disable
-#. TRANS: use of the uploaded profile image.
-msgid "Turn background image on or off."
-msgstr "Kytke taustakuva päälle tai pois päältä."
-
-#. TRANS: Checkbox label to title background image on theme designer page.
-#. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
-msgid "Tile background image"
-msgstr "Taustakuvan toisto vierekkäin"
-
-#. TRANS: Fieldset legend for theme colors.
-msgid "Change colors"
-msgstr "Vaihda värejä"
-
-#. TRANS: Field label for content color selector.
-#. TRANS: Label on profile design page for setting a profile page content colour.
-msgid "Content"
-msgstr "Sisältö"
-
-#. TRANS: Field label for sidebar color selector.
-#. TRANS: Label on profile design page for setting a profile page sidebar colour.
-msgid "Sidebar"
-msgstr "Sivupalkki"
-
-#. TRANS: Field label for text color selector.
-#. TRANS: Label on profile design page for setting a profile page text colour.
-msgid "Text"
-msgstr "Teksti"
-
-#. TRANS: Field label for link color selector.
-#. TRANS: Label on profile design page for setting a profile page links colour.
-msgid "Links"
-msgstr "Linkit"
-
-#. TRANS: Fieldset legend for advanced theme design settings.
-msgid "Advanced"
-msgstr "Lisäasetukset"
-
-#. TRANS: Field label for custom CSS.
-msgid "Custom CSS"
-msgstr "Mukautettu CSS"
-
-#. TRANS: Button text for resetting theme settings.
-msgctxt "BUTTON"
-msgid "Use defaults"
-msgstr "Käytä oletusasetuksia"
-
-#. TRANS: Title for button for resetting theme settings.
-#. TRANS: Title for button on profile design page to reset all colour settings to default.
-msgid "Restore default designs."
-msgstr "Palauta oletusulkonäkö."
-
-#. TRANS: Title for button for resetting theme settings.
-#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-msgid "Reset back to default."
-msgstr "Palauta oletusulkoasu."
-
-#. TRANS: Title for button for saving theme settings.
-#. TRANS: Title for button on profile design page to save settings.
-msgid "Save design."
-msgstr "Tallenna ulkoasu."
-
 #. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
 msgid "This notice is not a favorite!"
 msgstr "Tämä päivitys ei ole suosikki!"
@@ -2114,6 +1968,74 @@ msgstr "Lisää suosikkeihin"
 msgid "No such document \"%s\"."
 msgstr "Dokumenttia �%s� ei ole."
 
+#. TRANS: Menu item in administrator navigation panel.
+#. TRANS: Menu item in default local navigation panel.
+#. TRANS: Menu item in personal group navigation menu.
+msgctxt "MENU"
+msgid "Home"
+msgstr "Koti"
+
+msgctxt "MENU"
+msgid "Docs"
+msgstr "Dokumentaatio"
+
+#. TRANS: Secondary navigation menu item leading to help on StatusNet.
+msgctxt "MENU"
+msgid "Help"
+msgstr "Ohje"
+
+msgid "Getting started"
+msgstr "Aloittaminen"
+
+#. TRANS: Secondary navigation menu item leading to text about StatusNet site.
+msgctxt "MENU"
+msgid "About"
+msgstr "Tietoa"
+
+msgid "About this site"
+msgstr "Tietoa tästä sivusta"
+
+#. TRANS: Secondary navigation menu item leading to Frequently Asked Questions.
+msgctxt "MENU"
+msgid "FAQ"
+msgstr "UKK"
+
+msgid "Frequently asked questions"
+msgstr "Usein kysytyt kysymykset"
+
+#. TRANS: Secondary navigation menu item leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+msgctxt "MENU"
+msgid "Contact"
+msgstr "Ota yhteyttä"
+
+msgid "Contact info"
+msgstr "Yhteystiedot"
+
+msgctxt "MENU"
+msgid "Tags"
+msgstr "Tagit"
+
+msgid "Using tags"
+msgstr "Tagien käyttö"
+
+#. TRANS: Menu item in default local navigation panel.
+#. TRANS: Menu item in search group navigation panel.
+#. TRANS: Menu item in local navigation menu.
+msgctxt "MENU"
+msgid "Groups"
+msgstr "Ryhmät"
+
+msgid "Using groups"
+msgstr "Ryhmien käyttö"
+
+msgctxt "MENU"
+msgid "API"
+msgstr "API"
+
+msgid "RESTful API"
+msgstr "RESTful API"
+
 #. TRANS: Title for "Edit application" form.
 #. TRANS: Form legend.
 msgid "Edit application"
@@ -2178,12 +2100,12 @@ msgstr "Organisaation kotisivu on pakollinen."
 #. TRANS: Validation error shown when providing too long a callback URL in the "Edit application" form.
 #. TRANS: Validation error shown when providing too long a callback URL in the "New application" form.
 msgid "Callback is too long."
-msgstr ""
+msgstr "Takaisinsoitto-osoite on liian pitkä."
 
 #. TRANS: Validation error shown when providing an invalid callback URL in the "Edit application" form.
 #. TRANS: Validation error shown when providing an invalid callback URL in the "New application" form.
 msgid "Callback URL is not valid."
-msgstr ""
+msgstr "Takaisinsoitto-osoite ei kelpaa."
 
 #. TRANS: Server error occuring when an application could not be updated from the "Edit application" form.
 msgid "Could not update application."
@@ -2218,20 +2140,19 @@ msgstr "Asetukset tallennettu."
 
 #. TRANS: Title for edit list page after deleting a tag.
 #. TRANS: %s is a list.
-#, fuzzy, php-format
+#, php-format
 msgid "Delete %s list"
-msgstr "Poista käyttäjä"
+msgstr "Listan %s poistaminen"
 
 #. TRANS: Title for edit list page.
 #. TRANS: %s is a list.
 #. TRANS: Form legend for list edit form.
 #. TRANS: %s is a list.
-#, fuzzy, php-format
+#, php-format
 msgid "Edit list %s"
-msgstr "Tuo ei ole kelvollinen sähköpostiosoite."
+msgstr "Listan %s muokkaus"
 
 #. TRANS: Error message displayed when trying to perform an action that requires a tagging user or ID.
-#, fuzzy
 msgid "No tagger or ID."
 msgstr "Tunnusta tai ID:tä ei ole."
 
@@ -2240,15 +2161,12 @@ msgid "Not a local user."
 msgstr "Käyttäjää ei ole."
 
 #. TRANS: Client error displayed when reting to edit a tag that was not self-created.
-#, fuzzy
 msgid "You must be the creator of the tag to edit it."
-msgstr ""
-"Sinun pitää olla kirjautunut sisään, jotta voit muuttaa ryhmän tietoja."
+msgstr "Vain tagien luojat voivat muokata tageja."
 
 #. TRANS: Form instruction for edit list form.
-#, fuzzy
 msgid "Use this form to edit the list."
-msgstr "Käytä tätä lomaketta muokataksesi ryhmää."
+msgstr "Muokkaa listaa tällä lomakkeella."
 
 #. TRANS: Form validation error displayed if the form data for deleting a tag was incorrect.
 msgid "Delete aborted."
@@ -2259,25 +2177,28 @@ msgid ""
 "Deleting this tag will permanantly remove all its subscription and "
 "membership records. Do you still want to continue?"
 msgstr ""
+"Tagin poistaminen poistaa pysyvästi kaikki sen tilaaja- ja jäsentiedot. "
+"Haluatko silti jatkaa?"
 
 #. TRANS: Form validation error displayed if a given tag is invalid.
-#, fuzzy
 msgid "Invalid tag."
-msgstr "Koko ei kelpaa."
+msgstr "Virheellinen tagi."
 
 #. TRANS: Form validation error displayed if a given tag is already present.
 #. TRANS: %s is the already present tag.
-#, fuzzy, php-format
+#, php-format
 msgid "You already have a tag named %s."
-msgstr "Sinä kuulut jo tähän ryhmään."
+msgstr "Sinulla on jo tagi nimeltä %s."
 
 #. TRANS: Text in confirmation dialog for setting a tag from public to private.
 msgid ""
 "Setting a public tag as private will permanently remove all the existing "
 "subscriptions to it. Do you still want to continue?"
 msgstr ""
+"Julkisen tagin muuttaminen yksityiseksi poistaa pysyvästi siihen liittyvät "
+"tilaukset. Haluatko silti jatkaa?"
 
-#. TRANS: TRANS: Server error displayed when updating a list fails.
+#. TRANS: Server error displayed when updating a list fails.
 msgid "Could not update list."
 msgstr "Luettelon päivittäminen epäonnistui."
 
@@ -2521,6 +2442,8 @@ msgid ""
 "Be the first to add a notice to your favorites by clicking the fave button "
 "next to any notice you like."
 msgstr ""
+"Ole ensimmmäinen ja lisää viesti suosikkeihisi napsauttamalla tykkää-"
+"painiketta haluamasi viestin vieressä."
 
 #. TRANS: Additional text displayed instead of a list when a site does not yet have any favourited notices for not logged in users.
 #. TRANS: %%action.register%% is a registration link. "[link text](link)" is Mark Down. Do not change the formatting.
@@ -2529,6 +2452,8 @@ msgid ""
 "Why not [register an account](%%action.register%%) and be the first to add a "
 "notice to your favorites!"
 msgstr ""
+"Mikset [rekisteröidy](%%action.register%%) ja ole ensimmäinen, joka lisää "
+"viestin suosikkeihinsa?"
 
 #. TRANS: Title of RSS feed with favourite notices of a user.
 #. TRANS: %s is a user's nickname.
@@ -2580,40 +2505,6 @@ msgstr "Liitettä ei ole."
 msgid "No uploaded attachments."
 msgstr "Liitettä ei ole."
 
-#. TRANS: Client error displayed when subscribing to a remote profile and an unexpected response is received.
-msgid "Not expecting this response!"
-msgstr "Odottamaton vastaus saatu!"
-
-#. TRANS: Client error displayed when subscribing to a remote profile that does not exist.
-msgid "User being listened to does not exist."
-msgstr "Seurattua käyttäjää ei ole olemassa."
-
-#. TRANS: Client error displayed when subscribing to a remote profile that is a local profile.
-#. TRANS: Client error displayed when using remote subscribe for a local entity.
-msgid "You can use the local subscription!"
-msgstr "Voit käyttää paikallista tilausta!"
-
-#. TRANS: Client error displayed when subscribing to a remote profile that is blocked form subscribing to.
-msgid "That user has blocked you from subscribing."
-msgstr "Käyttäjä on estänyt sinua tilaamasta päivityksiä."
-
-#. TRANS: Client error displayed when subscribing to a remote profile without providing an authorised token.
-msgid "You are not authorized."
-msgstr "Sinulla ei ole valtuutusta tähän."
-
-#. TRANS: Client error displayed when subscribing to a remote profile and conversion of the request token to access token fails.
-msgid "Could not convert request token to access token."
-msgstr "Ei saatu request tokenia."
-
-#. TRANS: Client error displayed when subscribing to a remote profile fails because of an unsupported version of the OMB protocol.
-msgid "Remote service uses unknown version of OMB protocol."
-msgstr "Etäpalvelu käyttää tuntematonta OMB-protokollan versiota."
-
-#. TRANS: Server error displayed when subscribing to a remote profile fails because the remote profile could not be updated.
-#. TRANS: Exception thrown when updating a remote profile fails in OAuth store.
-msgid "Error updating remote profile."
-msgstr "Virhe tapahtui päivitettäessä etäprofiilia."
-
 #. TRANS: Client error displayed when requesting a non-existent file.
 msgid "No such file."
 msgstr "Tiedostoa ei ole."
@@ -2700,30 +2591,6 @@ msgstr "Tietokantavirhe estettäessä käyttäjää ryhmästä."
 msgid "No ID."
 msgstr "Ei ID:tä."
 
-#. TRANS: Client error displayed trying to change group design settings while not logged in.
-msgid "You must be logged in to edit a group."
-msgstr ""
-"Sinun pitää olla kirjautunut sisään, jotta voit muuttaa ryhmän tietoja."
-
-#. TRANS: Title group design settings page.
-msgid "Group design"
-msgstr "Ryhmän ulkoasu"
-
-#. TRANS: Instructions for group design settings page.
-msgid ""
-"Customize the way your group looks with a background image and a colour "
-"palette of your choice."
-msgstr "Mukauta ryhmäsi ulkonäköä taustakuvan ja väripaletin valinnalla."
-
-#. TRANS: Form validation error displayed when group design settings could not be updated because of an application issue.
-msgid "Unable to update your design settings."
-msgstr "Ulkoasun tallennus epäonnistui."
-
-#. TRANS: Form text to confirm saved group design settings.
-#. TRANS: Confirmation message on Profile design page when saving design settings has succeeded.
-msgid "Design preferences saved."
-msgstr "Ulkoasuasetukset tallennettu."
-
 #. TRANS: Title for group logo settings page.
 #. TRANS: Group logo form legend.
 msgid "Group logo"
@@ -2778,15 +2645,15 @@ msgstr "Vain ​​ryhmän ylläpitäjä voi hyväksyä käyttäjiä."
 
 #. TRANS: Title of the first page showing pending group members still awaiting approval to join the group.
 #. TRANS: %s is the name of the group.
-#, fuzzy, php-format
+#, php-format
 msgid "%s group members awaiting approval"
-msgstr "%s ryhmien jäsenyydet"
+msgstr "%shyväksyntää odottavat ryhmän jäsenten"
 
 #. TRANS: Title of all but the first page showing pending group members still awaiting approval to join the group.
 #. TRANS: %1$s is the name of the group, %2$d is the page number of the members list.
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s group members awaiting approval, page %2$d"
-msgstr "Ryhmän %s jäsenet"
+msgstr "Hyväksymistä odottavat ryhmän %1$s jäsenet, sivu %2$d"
 
 #. TRANS: Page notice for group members page.
 msgid "A list of users awaiting approval to join this group."
@@ -2820,6 +2687,11 @@ msgid ""
 "for one](%%%%action.groupsearch%%%%) or [start your own](%%%%action.newgroup%"
 "%%%)!"
 msgstr ""
+"Sivuston %%%%site.name%%%% ryhmistä voit löytää samoista asioista "
+"kiinnostuneita ihmisiä ja keskustella heidän kanssaan. Liityttyäsi ryhmään "
+"voit lähettää viestejä sen muille jäsenille lisäämällä viestiin tagin !"
+"ryhmännimi. Jos et näe haluamaasi ryhmää, kokeile [hakea ryhmää](%%%%action."
+"groupsearch%%%%) tai [perusta oma ryhmä](%%%%action.newgroup%%%%)!"
 
 #. TRANS: Link to create a new group on the group list page.
 #. TRANS: Link text on group page to create a new group.
@@ -2855,6 +2727,7 @@ msgid ""
 "If you cannot find the group you're looking for, you can [create it](%%"
 "action.newgroup%%) yourself."
 msgstr ""
+"Jos et löydä etsimääsi ryhmää voit [luoda](%%action.newgroup%%) sellaisen."
 
 #. TRANS: Additional text on page where groups can be searched if no results were found for a query for a not logged in user.
 #. TRANS: This message contains Markdown links in the form [link text](link).
@@ -2863,6 +2736,8 @@ msgid ""
 "Why not [register an account](%%action.register%%) and [create the group](%%"
 "action.newgroup%%) yourself!"
 msgstr ""
+"[Rekisteröidy käyttäjäksi](%%action.register%%) ja [luo ryhmä](%%action."
+"newgroup%%) ihan itse!"
 
 #. TRANS: Client error displayed when trying to unblock a user from a group without being an administrator for the group.
 msgid "Only an admin can unblock group members."
@@ -2886,8 +2761,8 @@ msgstr "Profiilikuva-asetukset"
 #. TRANS: the order and formatting of link text and link should remain unchanged.
 #, fuzzy, php-format
 msgid ""
-"You can send and receive notices through instant messaging [instant messages]"
-"(%%doc.im%%). Configure your addresses and settings below."
+"You can send and receive notices through [instant messaging](%%doc.im%%). "
+"Configure your addresses and settings below."
 msgstr ""
 "Voit lähettää ja vastaanottaa päivityksiä Jabber/GTalk-[pikaviestintä](%%doc."
 "im%%) käyttäen. Alla voit määrittää osoitteesi ja asetuksesi. "
@@ -2897,9 +2772,9 @@ msgid "IM is not available."
 msgstr "Pikaviestin ei ole käytettävissä."
 
 #. TRANS: Form note in IM settings form. %s is the type of IM address that was confirmed.
-#, fuzzy, php-format
+#, php-format
 msgid "Current confirmed %s address."
-msgstr "Tämän hetken vahvistettu sähköpostiosoite."
+msgstr "Nykyinen vahvistettu %s osoite."
 
 #. TRANS: Form note in IM settings form.
 #. TRANS: %s is the IM service name, %2$s is the IM address set.
@@ -3099,29 +2974,6 @@ msgstr ""
 "Käytä tätä lomaketta, jos haluat kutsua kavereita ja työkavereita käyttämään "
 "tätä palvelua."
 
-#. TRANS: Field label for a list of e-mail addresses.
-msgid "Email addresses"
-msgstr "Sähköpostiosoitteet"
-
-#. TRANS: Tooltip for field label for a list of e-mail addresses.
-#, fuzzy
-msgid "Addresses of friends to invite (one per line)."
-msgstr "Kutsuttavien kavereiden osoitteet (yksi per rivi)"
-
-#. TRANS: Field label for a personal message to send to invitees.
-msgid "Personal message"
-msgstr "Henkilökohtainen viesti"
-
-#. TRANS: Tooltip for field label for a personal message to send to invitees.
-msgid "Optionally add a personal message to the invitation."
-msgstr "Voit myös lisätä oman viestisi kutsuun"
-
-#. TRANS: Send button for inviting friends
-#. TRANS: Button text for sending notice.
-msgctxt "BUTTON"
-msgid "Send"
-msgstr "Lähetä"
-
 #. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral
 #. TRANS: singular 3rd-person pronoun in English. %1$s is the inviting user, $2$s is
 #. TRANS: the StatusNet sitename.
@@ -3134,10 +2986,10 @@ msgid "You must be logged in to join a group."
 msgstr "Sinun pitää olla kirjautunut sisään, jos haluat liittyä ryhmään."
 
 #. TRANS: Title for join group page after joining.
-#, fuzzy, php-format
+#, php-format
 msgctxt "TITLE"
 msgid "%1$s joined group %2$s"
-msgstr "%s liittyi ryhmään %s"
+msgstr "%1$s liittyi ryhmään %2$s"
 
 #. TRANS: Exception thrown when there is an unknown error joining a group.
 #, fuzzy
@@ -3172,7 +3024,7 @@ msgstr ""
 
 #. TRANS: Client error displayed selecting a too long license title in the license admin panel.
 msgid "Invalid license title. Maximum length is 255 characters."
-msgstr "Lisenssin nimi on liian pitkä. Maksimipituus 255 merkkiä."
+msgstr "Lisenssin nimi on liian pitkä. Enimmäispituus on 255 merkkiä."
 
 #. TRANS: Client error displayed specifying an invalid license URL in the license admin panel.
 msgid "Invalid license URL."
@@ -3255,12 +3107,6 @@ msgstr "URL, jossa lisenssin yhteydessä näytettävä kuva."
 msgid "Save license settings."
 msgstr "Tallenna lisenssin asetukset."
 
-#. TRANS: Client error displayed when trying to log in while already logged in.
-#. TRANS: Client error displayed trying to use "one time password login" when already logged in.
-#. TRANS: Client error displayed when trying to register while already logged in.
-msgid "Already logged in."
-msgstr "Olet jo kirjautunut sisään."
-
 #. TRANS: Form validation error displayed when trying to log in with incorrect credentials.
 msgid "Incorrect username or password."
 msgstr "Väärä käyttäjätunnus tai salasana"
@@ -3379,9 +3225,9 @@ msgstr ""
 msgid "Could not create application."
 msgstr "Ei voitu lisätä aliasta."
 
-#, fuzzy
+#. TRANS: Form validation error messages displayed when uploading an invalid application logo.
 msgid "Invalid image."
-msgstr "Koko ei kelpaa."
+msgstr "Virheellinen kuva."
 
 #. TRANS: Title for form to create a group.
 msgid "New group"
@@ -3418,12 +3264,6 @@ msgstr "Ei sisältöä!"
 msgid "No recipient specified."
 msgstr "Vastaanottajaa ei ole määritelty."
 
-#. TRANS: Client error displayed trying to send a direct message to self.
-#. TRANS: Error text shown when trying to send a direct message to self.
-msgid ""
-"Don't send a message to yourself; just say it to yourself quietly instead."
-msgstr "Älä lähetä viestiä itsellesi, vaan kuiskaa se vain hiljaa itsellesi."
-
 #. TRANS: Page title after sending a direct message.
 msgid "Message sent"
 msgstr "Viesti lähetetty"
@@ -3498,9 +3338,9 @@ msgstr "Käyttäjän %1$s päivitykset palvelussa %2$s!"
 
 #. TRANS: RSS notice search feed description.
 #. TRANS: %1$s is the query, %2$s is the StatusNet site name.
-#, fuzzy, php-format
+#, php-format
 msgid "Updates matching search term \"%1$s\" on %2$s."
-msgstr "Käyttäjän %1$s päivitykset palvelussa %2$s!"
+msgstr "Hakua %1$s vastaavat päivitykset palvelussa %2$s."
 
 #. TRANS: Client error displayed trying to nudge a user that cannot be nudged.
 #, fuzzy
@@ -3531,12 +3371,12 @@ msgstr "OAuth-sovellukset"
 
 #. TRANS: Page instructions for OAuth applications
 msgid "Applications you have registered"
-msgstr ""
+msgstr "Rekisteröimäsi sovellukset"
 
 #. TRANS: Empty list message on page with OAuth applications.
 #, php-format
 msgid "You have not registered any applications yet."
-msgstr ""
+msgstr "Et ole vielä rekisteröinyt sovelluksia."
 
 #. TRANS: Title for OAuth connection settings.
 msgid "Connected applications"
@@ -3629,6 +3469,33 @@ msgstr ""
 msgid "Not a supported data format."
 msgstr "Tuo ei ole tuettu tietomuoto."
 
+#. TRANS: Page title for profile settings.
+#, fuzzy
+msgid "Old school UI settings"
+msgstr "Profiilikuva-asetukset"
+
+#. TRANS: Usage instructions for profile settings.
+msgid "If you like it \"the old way\", you can set that here."
+msgstr ""
+
+#. TRANS: Confirmation shown when user profile settings are saved.
+#. TRANS: Message after successful saving of administrative settings.
+msgid "Settings saved."
+msgstr "Asetukset tallennettu."
+
+msgid "Only stream mode (no conversations) in timelines"
+msgstr ""
+
+msgid "Show conversation page as hierarchical trees"
+msgstr ""
+
+msgid "Show nicknames (not full names) in timelines"
+msgstr ""
+
+#. TRANS: Button text to save a list.
+msgid "Save"
+msgstr "Tallenna"
+
 #. TRANS: ShortName in the OpenSearch interface when trying to find users.
 msgid "People Search"
 msgstr "Etsi ihmisiä"
@@ -3637,35 +3504,36 @@ msgstr "Etsi ihmisiä"
 msgid "Notice Search"
 msgstr "Etsi Päivityksistä"
 
+#. TRANS: Client error displayed trying to use "one time password login" when already logged in.
+#. TRANS: Client error displayed when trying to register while already logged in.
+msgid "Already logged in."
+msgstr "Olet jo kirjautunut sisään."
+
 #. TRANS: Client error displayed trying to use "one time password login" without specifying a user.
-#, fuzzy
 msgid "No user ID specified."
-msgstr "Ryhmää ei ole määritelty."
+msgstr "Käyttäjätunnus puuttuu."
 
 #. TRANS: Client error displayed trying to use "one time password login" without specifying a login token.
-#, fuzzy
 msgid "No login token specified."
-msgstr "Profiilia ei ole määritelty."
+msgstr "Kirjautumiskoodi puuttuu."
 
 #. TRANS: Client error displayed trying to use "one time password login" without requesting a login token.
 msgid "No login token requested."
 msgstr "Ei valtuutuspyyntöä!"
 
 #. TRANS: Client error displayed trying to use "one time password login" while specifying an invalid login token.
-#, fuzzy
 msgid "Invalid login token specified."
-msgstr "Päivityksen sisältö ei kelpaa"
+msgstr "Virheellinen kirjautumiskoodi."
 
 #. TRANS: Client error displayed trying to use "one time password login" while specifying an expired login token.
-#, fuzzy
 msgid "Login token expired."
-msgstr "Kirjaudu sisään"
+msgstr "Vanhentunut kirjautumiskoodi."
 
 #. TRANS: Title for outbox for any but the fist page.
 #. TRANS: %1$s is the user nickname, %2$d is the page number.
-#, fuzzy, php-format
+#, php-format
 msgid "Outbox for %1$s - page %2$d"
-msgstr "Käyttäjän %s lähetetyt viestit"
+msgstr "Käyttäjän %1$s lähetetyt viestit - sivu %2$d"
 
 #. TRANS: Title for first page of outbox.
 #, php-format
@@ -3677,10 +3545,9 @@ msgid "This is your outbox, which lists private messages you have sent."
 msgstr "Tämä on postilaatikkosi, jossa on lähettämäsi yksityisviestit."
 
 #. TRANS: Title for page where to change password.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Change password"
-msgstr "Vaihda salasana"
+msgstr "Salasanan vaihto"
 
 #. TRANS: Instructions for page where to change password.
 msgid "Change your password."
@@ -3702,25 +3569,21 @@ msgstr "Uusi salasana"
 
 #. TRANS: Field title on page where to change password.
 #. TRANS: Field title on account registration page.
-#, fuzzy
 msgid "6 or more characters."
-msgstr "6 tai useampia merkkejä"
+msgstr "vähintään 6 merkkiä"
 
 #. TRANS: Field label on page where to change password. In this field the new password should be typed a second time.
-#, fuzzy
 msgctxt "LABEL"
 msgid "Confirm"
-msgstr "Vahvista"
+msgstr "Uudestaan"
 
 #. TRANS: Field title on page where to change password.
-#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
+#. TRANS: Title for field label for password reset form where the password has to be typed again.
 #. TRANS: Field title on account registration page.
-#, fuzzy
 msgid "Same as password above."
 msgstr "Sama kuin ylläoleva salasana"
 
 #. TRANS: Button text on page where to change password.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Change"
 msgstr "Vaihda"
@@ -3732,14 +3595,12 @@ msgstr "Salasanassa pitää olla 6 tai useampia merkkejä."
 
 #. TRANS: Form validation error on password change when password confirmation does not match.
 #. TRANS: Form validation error displayed when trying to register with non-matching passwords.
-#, fuzzy
 msgid "Passwords do not match."
 msgstr "Salasanat eivät täsmää."
 
 #. TRANS: Form validation error on page where to change password.
-#, fuzzy
 msgid "Incorrect old password."
-msgstr "Väärä vanha salasana"
+msgstr "Väärä vanha salasana."
 
 #. TRANS: Form validation error on page where to change password.
 msgid "Error saving user; invalid."
@@ -3748,7 +3609,6 @@ msgstr "Virhe tapahtui käyttäjän tallentamisessa; epäkelpo."
 #. TRANS: Server error displayed on page where to change password when password change
 #. TRANS: could not be made because of a server error.
 #. TRANS: Reset password form validation error message.
-#, fuzzy
 msgid "Cannot save new password."
 msgstr "Uutta salasanaa ei voida tallentaa."
 
@@ -3762,143 +3622,123 @@ msgstr "Polut"
 
 #. TRANS: Form instructions for Path admin panel.
 msgid "Path and server settings for this StatusNet site"
-msgstr ""
+msgstr "StatusNet sivuston polku- ja palvelinasetukset"
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the directory that could not be read from.
-#, fuzzy, php-format
+#, php-format
 msgid "Theme directory not readable: %s."
-msgstr "Pikaviestin ei ole käytettävissä."
+msgstr "Teemahakemisto ei ole luettavissa: %s."
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the avatar directory that could not be written to.
-#, fuzzy, php-format
+#, php-format
 msgid "Avatar directory not writable: %s."
-msgstr "Pikaviestin ei ole käytettävissä."
-
-#. TRANS: Client error in Paths admin panel.
-#. TRANS: %s is the background directory that could not be written to.
-#, fuzzy, php-format
-msgid "Background directory not writable: %s."
-msgstr "Taustakuvan hakemisto"
+msgstr "Avatar-hakemistoon ei voi kirjoittaa: %s."
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the locales directory that could not be read from.
-#, fuzzy, php-format
+#, php-format
 msgid "Locales directory not readable: %s."
-msgstr "Pikaviestin ei ole käytettävissä."
+msgstr "Paikallisasetustohakemistoon ei voi kirjoittaa: %s."
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the SSL server URL that is too long.
 msgid "Invalid SSL server. The maximum length is 255 characters."
-msgstr ""
+msgstr "Virheellinen SSL-palvelin. Enimmäispituus on 255 merkkiä."
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#, fuzzy
 msgid "Site"
-msgstr "Kutsu"
+msgstr "Sivusto"
 
 #. TRANS: Field label in Paths admin panel.
-#, fuzzy
 msgid "Server"
-msgstr "Palauta"
+msgstr "Palvelin"
 
 #. TRANS: Field title in Paths admin panel.
 msgid "Site's server hostname."
-msgstr ""
+msgstr "Sivuston palvelinnimi."
 
 #. TRANS: Field label in Paths admin panel.
-#, fuzzy
 msgid "Path"
-msgstr "Polut"
+msgstr "Polku"
 
 #. TRANS: Field title in Paths admin panel.
-#, fuzzy
 msgid "Site path."
-msgstr "Palvelun ilmoitus"
+msgstr "Sivuston polku."
 
 #. TRANS: Field label in Paths admin panel.
-#, fuzzy
 msgid "Locale directory"
-msgstr "Taustakuvan hakemisto"
+msgstr "Paikallisasetustohakemisto"
 
 #. TRANS: Field title in Paths admin panel.
 msgid "Directory path to locales."
-msgstr ""
+msgstr "Polku paikallisasetustohin."
 
 #. TRANS: Checkbox label in Paths admin panel.
 msgid "Fancy URLs"
-msgstr ""
+msgstr "Lyhyet osoitteet"
 
 #. TRANS: Field title in Paths admin panel.
 msgid "Use fancy URLs (more readable and memorable)?"
-msgstr ""
+msgstr "Käytetäänkö lyhyitä URL-osoitteita (luettavampia ja muistettavampia)?"
 
 #. TRANS: Fieldset legend in Paths admin panel.
 msgctxt "LEGEND"
 msgid "Theme"
-msgstr ""
+msgstr "Teema"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#, fuzzy
 msgid "Server for themes."
-msgstr "Kirjaudu ulos palvelusta"
+msgstr "Teemojen palvelin."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
 msgid "Web path to themes."
-msgstr ""
+msgstr "Www-polku teemoille."
 
 #. TRANS: Field label in Paths admin panel.
-#, fuzzy
 msgid "SSL server"
-msgstr "Palauta"
+msgstr "SSL-palvelin"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
 msgid "SSL server for themes (default: SSL server)."
-msgstr ""
+msgstr "Teemojen SSL-palvelin (oletus: SSL-palvelin)."
 
 #. TRANS: Field label in Paths admin panel.
-#, fuzzy
 msgid "SSL path"
-msgstr "Palvelun ilmoitus"
+msgstr "SSL-polku"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
 msgid "SSL path to themes (default: /theme/)."
-msgstr ""
+msgstr "Teemojen SSL-polku (oletus: /theme/)"
 
 #. TRANS: Field label in Paths admin panel.
-#, fuzzy
 msgid "Directory"
-msgstr "Taustakuvan hakemisto"
+msgstr "Hakemisto"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
 msgid "Directory where themes are located."
-msgstr ""
+msgstr "Hakemisto jossa teemat sijaitsevat."
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#, fuzzy
 msgid "Avatars"
-msgstr "Kuva"
+msgstr "Avatarit"
 
 #. TRANS: Field label in Paths admin panel.
-#, fuzzy
 msgid "Avatar server"
-msgstr "Profiilikuva-asetukset"
+msgstr "Avatar-palvelin"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#, fuzzy
 msgid "Server for avatars."
-msgstr "Kirjaudu ulos palvelusta"
+msgstr "Palvelin jolla avatarit sijaitsevat."
 
 #. TRANS: Field label in Paths admin panel.
-#, fuzzy
 msgid "Avatar path"
-msgstr "Kuva päivitetty."
+msgstr "Avatarien polku"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#, fuzzy
 msgid "Web path to avatars."
-msgstr "Profiilikuvan päivittäminen epäonnistui."
+msgstr "Www-polku avatarien luo."
 
 #. TRANS: Field label in Paths admin panel.
 msgid "Avatar directory"
@@ -3906,32 +3746,7 @@ msgstr "Taustakuvan hakemisto"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
 msgid "Directory where avatars are located."
-msgstr ""
-
-#. TRANS: Fieldset legend in Paths admin panel.
-msgid "Backgrounds"
-msgstr "Taustakuvat"
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-#, fuzzy
-msgid "Server for backgrounds."
-msgstr "Kirjaudu ulos palvelusta"
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-msgid "Web path to backgrounds."
-msgstr ""
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-msgid "Server for backgrounds on SSL pages."
-msgstr ""
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-msgid "Web path to backgrounds on SSL pages."
-msgstr ""
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-msgid "Directory where backgrounds are located."
-msgstr ""
+msgstr "Hakemisto jossa avatarit sijaitsevat."
 
 #. TRANS: Fieldset legens in Paths admin panel.
 msgid "Attachments"
@@ -3961,10 +3776,9 @@ msgid "Directory where attachments are located."
 msgstr ""
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#, fuzzy
 msgctxt "LEGEND"
 msgid "SSL"
-msgstr "SMS"
+msgstr "SSL"
 
 #. TRANS: Drop down option in Paths admin panel (option for "When to use SSL").
 #. TRANS: Option in dropdown for snapshot method in admin panel for snapshots.
@@ -3978,9 +3792,8 @@ msgid "Sometimes"
 msgstr "Päivitykset"
 
 #. TRANS: Drop down option in Paths admin panel (option for "When to use SSL").
-#, fuzzy
 msgid "Always"
-msgstr "Aliakset"
+msgstr "Aina"
 
 #. TRANS: Drop down label in Paths admin panel.
 msgid "Use SSL"
@@ -3995,8 +3808,9 @@ msgid "Server to direct SSL requests to."
 msgstr "Palvelin jolle SSL-pyynnöt lähetetään."
 
 #. TRANS: Button title text to store form data in the Paths admin panel.
-msgid "Save paths"
-msgstr "Tallenna polut"
+#, fuzzy
+msgid "Save path settings."
+msgstr "Profiilikuva-asetukset"
 
 #. TRANS: Instructions for the "People search" page.
 #. TRANS: %%site.name%% is the name of the StatusNet site.
@@ -4123,10 +3937,9 @@ msgstr "Tuota tagia ei ole."
 
 #. TRANS: Submit button text for tag filter form.
 #. TRANS: Submit button text on gallery action page.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Go"
-msgstr "Mene"
+msgstr "Siirry"
 
 #. TRANS: Message displayed for anonymous users on page that displays lists by a user.
 #. TRANS: This message contains Markdown links in the form [description](links).
@@ -4137,7 +3950,7 @@ msgid ""
 "%%%site.name%%%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
 "blogging) service based on the Free Software [StatusNet](http://status.net/) "
 "tool. You can easily keep track of what they are doing by subscribing to the "
-"tag's timeline."
+"list's timeline."
 msgstr ""
 "**%s** on ryhmä palvelussa %%%%site.name%%%%, joka on [mikroblogauspalvelu]"
 "(http://en.wikipedia.org/wiki/Micro-blogging)"
@@ -4170,7 +3983,7 @@ msgid ""
 "site.name%%%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
 "blogging) service based on the Free Software [StatusNet](http://status.net/) "
 "tool. You can easily keep track of what they are doing by subscribing to the "
-"tag's timeline."
+"list's timeline."
 msgstr ""
 "**%s** on ryhmä palvelussa %%%%site.name%%%%, joka on [mikroblogauspalvelu]"
 "(http://en.wikipedia.org/wiki/Micro-blogging)"
@@ -4273,16 +4086,6 @@ msgid ""
 msgstr ""
 "Kaikki oletusliitännäiset on poistettu käytöstä sivuston määritystiedostossa."
 
-#. TRANS: Client error displayed if the notice posted has too many characters.
-msgid "Invalid notice content."
-msgstr "Koko ei kelpaa."
-
-#. TRANS: Exception thrown if a notice's license is not compatible with the StatusNet site license.
-#. TRANS: %1$s is the notice license, %2$s is the StatusNet site's license.
-#, php-format
-msgid "Notice license \"%1$s\" is not compatible with site license \"%2$s\"."
-msgstr ""
-
 #. TRANS: Client error displayed when trying to add an unindentified field to profile.
 #. TRANS: %s is a field name.
 #, php-format
@@ -4290,10 +4093,9 @@ msgid "Unidentified field %s."
 msgstr ""
 
 #. TRANS: Page title.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Search results"
-msgstr "Haku"
+msgstr "Hakutulokset"
 
 #. TRANS: Error message in case a search is shorter than three characters.
 msgid "The search string must be at least 3 characters long."
@@ -4381,9 +4183,11 @@ msgstr "Olinpaikka kuten \"Kaupunki, Maakunta (tai Lääni), Maa\""
 
 #. TRANS: Checkbox label in form for profile settings.
 msgid "Share my current location when posting notices"
-msgstr ""
+msgstr "Jaa nykyinen sijaintini viestejä lähettäessä."
 
 #. TRANS: Field label in form for profile settings.
+#. TRANS: Title for group tag cloud section.
+#. TRANS: %s is a group name.
 msgid "Tags"
 msgstr "Tagit"
 
@@ -4401,9 +4205,8 @@ msgid "Language"
 msgstr "Kieli"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#, fuzzy
 msgid "Preferred language."
-msgstr "Ensisijainen kieli"
+msgstr "Ensisijainen kieli."
 
 #. TRANS: Dropdownlist label in form for profile settings.
 msgid "Timezone"
@@ -4414,9 +4217,8 @@ msgid "What timezone are you normally in?"
 msgstr "Millä aikavyöhykkeellä olet tavallisesti?"
 
 #. TRANS: Checkbox label in form for profile settings.
-#, fuzzy
 msgid ""
-"Automatically subscribe to whoever subscribes to me (best for non-humans)."
+"Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr ""
 "Tilaa automaattisesti kaikki, jotka tilaavat päivitykseni (ei sovi hyvin "
 "ihmiskäyttäjille)"
@@ -4427,32 +4229,31 @@ msgid "Subscription policy"
 msgstr "Tilaukset"
 
 #. TRANS: Dropdown field option for following policy.
-#, fuzzy
 msgid "Let anyone follow me"
-msgstr "Vain henkilöitä voi seurata."
+msgstr "Anna kenen tahansa seurata minua"
 
 #. TRANS: Dropdown field option for following policy.
 msgid "Ask me first"
-msgstr ""
+msgstr "Kysy minulta ensin"
 
 #. TRANS: Dropdown field title on group edit form.
 msgid "Whether other users need your permission to follow your updates."
-msgstr ""
+msgstr "Tarvitsevatko muut käyttäjät lupaa seuratakseen päivityksiäsi."
 
 #. TRANS: Checkbox label in profile settings.
 msgid "Make updates visible only to my followers"
-msgstr ""
+msgstr "Näytä päivitykset vain seuraajilleni."
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Plural form is used based on the maximum number of allowed
 #. TRANS: characters for the biography (%d).
 #. TRANS: Form validation error on registration page when providing too long a bio text.
 #. TRANS: %d is the maximum number of characters for bio; used for plural.
-#, fuzzy, php-format
+#, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
-msgstr[0] "kuvaus on liian pitkä (max %d merkkiä)."
-msgstr[1] "kuvaus on liian pitkä (max %d merkkiä)."
+msgstr[0] "Kuvaus on liian pitkä (korkeintaan %d merkkiä)."
+msgstr[1] "Kuvaus on liian pitkä (korkeintaan %d merkkiä)."
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Client error displayed trying to save site settings without a timezone.
@@ -4460,7 +4261,6 @@ msgid "Timezone not selected."
 msgstr "Aikavyöhykettä ei ole valittu."
 
 #. TRANS: Validation error in form for profile settings.
-#, fuzzy
 msgid "Language is too long (maximum 50 characters)."
 msgstr "Kieli on liian pitkä (enintään 50 merkkiä)."
 
@@ -4470,7 +4270,7 @@ msgstr "Kieli on liian pitkä (enintään 50 merkkiä)."
 #. TRANS: %s is the invalid tag.
 #. TRANS: Error displayed if a given tag is invalid.
 #. TRANS: %s is the invalid tag.
-#, fuzzy, php-format
+#, php-format
 msgid "Invalid tag: \"%s\"."
 msgstr "Virheellinen tagi: \"%s\""
 
@@ -4481,34 +4281,27 @@ msgid "Could not update user for autosubscribe or subscribe_policy."
 msgstr "Ei voitu asettaa käyttäjälle automaattista tilausta."
 
 #. TRANS: Server error thrown when user profile location preference settings could not be updated.
-#, fuzzy
 msgid "Could not save location prefs."
-msgstr "Tageja ei voitu tallentaa."
+msgstr "Ei voitu tallentaa sijaintivalintoja."
 
 #. TRANS: Server error thrown when user profile settings tags could not be saved.
 msgid "Could not save tags."
 msgstr "Tagien tallennus epäonnistui."
 
-#. TRANS: Confirmation shown when user profile settings are saved.
-#. TRANS: Message after successful saving of administrative settings.
-msgid "Settings saved."
-msgstr "Asetukset tallennettu."
-
 #. TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
 #. TRANS: Page title for page where a user account can be restored from backup.
-#, fuzzy
 msgid "Restore account"
-msgstr "Luo uusi ryhmä"
+msgstr "Palauta käyttäjätili"
 
 #. TRANS: Client error displayed when requesting a public timeline page beyond the page limit.
 #. TRANS: %s is the page limit.
 #, php-format
 msgid "Beyond the page limit (%s)."
-msgstr ""
+msgstr "Ylittää sivun rajan ( %s )."
 
 #. TRANS: Server error displayed when a public timeline cannot be retrieved.
-msgid "Could not retrieve public stream."
-msgstr "Julkista päivitysvirtaa ei saatu."
+msgid "Could not retrieve public timeline."
+msgstr "Ei voi noutaa julkista aikajanaa."
 
 #. TRANS: Title for all public timeline pages but the first.
 #. TRANS: %d is the page number.
@@ -4522,25 +4315,29 @@ msgid "Public timeline"
 msgstr "Julkinen aikajana"
 
 #. TRANS: Link description for public timeline feed.
-msgid "Public Stream Feed (RSS 1.0)"
-msgstr "Julkinen syöte (RSS 1.0)"
+msgid "Public Timeline Feed (Activity Streams JSON)"
+msgstr "Julkisen aikajanan syöte (Activity Streams JSON)"
 
 #. TRANS: Link description for public timeline feed.
-msgid "Public Stream Feed (RSS 2.0)"
+msgid "Public Timeline Feed (RSS 1.0)"
+msgstr "Julkisen aikajanan syöte (RSS 1.0)"
+
+#. TRANS: Link description for public timeline feed.
+msgid "Public Timeline Feed (RSS 2.0)"
 msgstr "Julkisen Aikajanan Syöte (RSS 2.0)"
 
 #. TRANS: Link description for public timeline feed.
-msgid "Public Stream Feed (Atom)"
-msgstr "Julkinen syöte (Atom)"
+msgid "Public Timeline Feed (Atom)"
+msgstr "Julkisen aikajanan syöte (Atom)"
 
 #. TRANS: Text displayed for public feed when there are no public notices.
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "This is the public timeline for %%site.name%% but no one has posted anything "
 "yet."
 msgstr ""
-"Tämä on käyttäjän %s ja kavereiden aikajana, mutta kukaan ei ole lähettyänyt "
-"vielä mitään."
+"Tämä on julkinen aikajana sivustolle %%site.name%% mutta kukaan ei ole vielä "
+"lähettänyt viestiä."
 
 #. TRANS: Additional text displayed for public feed when there are no public notices for a logged in user.
 msgid "Be the first to post!"
@@ -4551,6 +4348,8 @@ msgstr "Ole ensimmäinen joka lähettää päivityksen!"
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to post!"
 msgstr ""
+"Miksi et [rekisteröisi käyttäjätunnusta](%%action.register%%) ja lähettäisi "
+"ensimmäistä viestiä!"
 
 #. TRANS: Message for not logged in users at an invite-only site trying to view the public feed of notices.
 #. TRANS: This message contains Markdown links. Please mind the formatting.
@@ -4561,6 +4360,11 @@ msgid ""
 "tool. [Join now](%%action.register%%) to share notices about yourself with "
 "friends, family, and colleagues! ([Read more](%%doc.help%%))"
 msgstr ""
+"Tämä on %%site.name%%, [mikroblogauspalvelu](http://fi.wikipedia.org/wiki/"
+"Blogi#Mikroblogi), joka perustuu vapaaseen ohjelmistoon [StatusNet](http://"
+"status.net/). [Liity nyt](%%action.register%%) jakaaksesi päivityksiä "
+"itsestäsi ystävillesi, perheellesi ja kollegoillesi! ([Lue lisää](%%doc.help%"
+"%))"
 
 #. TRANS: Message for not logged in users at a closed site trying to view the public feed of notices.
 #. TRANS: This message contains Markdown links. Please mind the formatting.
@@ -4573,56 +4377,10 @@ msgstr ""
 "Tämä on %%site.name%%, [mikroblogaus](http://en.wikipedia.org/wiki/Micro-"
 "blogging)palvelu "
 
-#. TRANS: Title for page with public list cloud.
-#, fuzzy
-msgid "Public list cloud"
-msgstr "Julkinen tagipilvi"
-
-#. TRANS: Page notice for page with public list cloud.
-#. TRANS: %s is a StatusNet sitename.
-#, fuzzy, php-format
-msgid "These are largest lists on %s"
-msgstr "Nämä ovat suosituimmat viimeaikaiset tagit %s -palvelussa"
-
-#. TRANS: Empty list message on page with public list cloud.
-#. TRANS: This message contains Markdown links in the form [description](link).
-#, fuzzy, php-format
-msgid "No one has [listed](%%doc.tags%%) anyone yet."
-msgstr ""
-"Kukaan ei ole vielä lähettänyt päivitystä tagilla [hashtag](%%doc.tags%%) "
-"vielä."
-
-#. TRANS: Additional empty list message on page with public list cloud for logged in users.
-#, fuzzy
-msgid "Be the first to list someone!"
-msgstr "Ole ensimmäinen joka lähettää päivityksen!"
-
-#. TRANS: Additional empty list message on page with public list cloud for anonymous users.
-#. TRANS: This message contains Markdown links in the form [description](link).
-#, fuzzy, php-format
-msgid ""
-"Why not [register an account](%%action.register%%) and be the first to list "
-"someone!"
-msgstr ""
-"Ole ensimmäinen joka [lähettää päivityksen tästä aiheesta](%%%%action."
-"newnotice%%%%?status_textarea=%s)!"
-
-#. TRANS: DT element on on page with public list cloud.
-#, fuzzy
-msgid "List cloud"
-msgstr "API-metodia ei löytynyt."
-
-#. TRANS: Link title for number of listed people. %d is the number of listed people.
-#, php-format
-msgid "1 person listed"
-msgid_plural "%d people listed"
-msgstr[0] ""
-msgstr[1] ""
-
 #. TRANS: Public RSS feed description. %s is the StatusNet site name.
-#, fuzzy, php-format
+#, php-format
 msgid "%s updates from everyone."
-msgstr "%s päivitykset kaikilta!"
+msgstr "Sivuston %s kaikkien käyttäjien päivitykset."
 
 #. TRANS: Title for public tag cloud.
 msgid "Public tag cloud"
@@ -4630,7 +4388,7 @@ msgstr "Julkinen tagipilvi"
 
 #. TRANS: Instructions (more used like an explanation/header).
 #. TRANS: %s is the StatusNet sitename.
-#, fuzzy, php-format
+#, php-format
 msgid "These are most popular recent tags on %s"
 msgstr "Nämä ovat suosituimmat viimeaikaiset tagit %s -palvelussa"
 
@@ -4658,6 +4416,8 @@ msgid ""
 "Why not [register an account](%%action.register%%) and be the first to post "
 "one!"
 msgstr ""
+"Miksi et [rekisteröisi käyttäjätunnusta](%%action.register%%) ja lähettäisi "
+"ensimmäistä viestiä!"
 
 #. TRANS: Client error displayed trying to recover password while already logged in.
 msgid "You are already logged in!"
@@ -4688,13 +4448,12 @@ msgid "Could not update user with confirmed email address."
 msgstr "Ei voitu päivittää käyttäjälle vahvistettua sähköpostiosoitetta."
 
 #. TRANS: Page notice for password recovery page.
-#, fuzzy
 msgid ""
 "If you have forgotten or lost your password, you can get a new one sent to "
 "the email address you have stored in your account."
 msgstr ""
-"Ohjeet salasanan palauttamiseksi on lähetetty sähköpostiisiosoitteeseen, "
-"joka on rekisteröity käyttäjätunnuksellesi."
+"Jos olet unohtanut tai hukannut salasanasi, saat uuden "
+"sähköpostiosoitteeseen, jonka olet rekisteröinyt käyttäjätunnuksellesi."
 
 #. TRANS: Page notice for password change page.
 msgid "You have been identified. Enter a new password below."
@@ -4718,7 +4477,6 @@ msgid "Recover"
 msgstr "Palauta"
 
 #. TRANS: Button text on password recovery page.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Recover"
 msgstr "Palauta"
@@ -4737,38 +4495,22 @@ msgid "Password recovery requested"
 msgstr "Salasanan palautuspyyntö lähetetty."
 
 #. TRANS: Title for password recovery page in password saved mode.
-#, fuzzy
 msgid "Password saved"
-msgstr "Salasana tallennettu."
+msgstr "Salasana tallennettu"
 
 #. TRANS: Title for field label for password reset form.
-#, fuzzy
 msgid "6 or more characters, and do not forget it!"
-msgstr "6 tai useampia merkkejä äläkä unohda mitä kirjoitit!"
+msgstr "6 merkkiä tai enemmän, älä unohda sitä!"
 
 #. TRANS: Button text for password reset form.
-#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Reset"
-msgstr "Vaihda"
+msgstr "Palauta"
 
 #. TRANS: Form instructions for password recovery form.
 msgid "Enter a nickname or email address."
 msgstr "Syötä käyttäjätunnus tai sähköpostiosoite"
 
-#. TRANS: Information on password recovery form if no known username or e-mail address was specified.
-msgid "No user with that email address or username."
-msgstr "Käyttäjää tuolla sähköpostilla tai käyttäjätunnuksella ei ole."
-
-#. TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.
-msgid "No registered email address for that user."
-msgstr "Rekisteröityä sähköpostiosoitetta ei ole tälle käyttäjälle."
-
-#. TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.
-msgid "Error saving address confirmation."
-msgstr "Virhe tapahtui osoitevahvistuksen tallentamisessa"
-
 #. TRANS: User notification after an e-mail with instructions was sent from the password recovery form.
 msgid ""
 "Instructions for recovering your password have been sent to the email "
@@ -4782,9 +4524,8 @@ msgid "Unexpected password reset."
 msgstr "Odottamaton salasanan uudelleenasetus."
 
 #. TRANS: Reset password form validation error message.
-#, fuzzy
 msgid "Password must be 6 characters or more."
-msgstr "Salasanassa pitää olla 6 tai useampia merkkejä."
+msgstr "Salasanassa täytyy olla 6 merkkiä tai enemmän."
 
 #. TRANS: Reset password form validation error message.
 msgid "Password and confirmation do not match."
@@ -4801,15 +4542,14 @@ msgstr ""
 "Uusi salasana tallennettiin onnistuneesti. Olet nyt kirjautunut sisään."
 
 #. TRANS: Client exception thrown when no ID parameter was provided.
-#, fuzzy
 msgid "No id parameter."
-msgstr "Ei id parametria."
+msgstr "Ei id-parametria."
 
 #. TRANS: Client exception thrown when an invalid ID parameter was provided for a file.
 #. TRANS: %d is the provided ID for which the file is not present (number).
-#, fuzzy, php-format
+#, php-format
 msgid "No such file \"%d\"."
-msgstr "Tiedostoa ei ole."
+msgstr "Ei ole tiedostoa \"%d\"."
 
 #. TRANS: Client error displayed when trying to register to an invite-only site without an invitation.
 msgid "Sorry, only invited people can register."
@@ -4824,7 +4564,6 @@ msgid "Registration successful"
 msgstr "Rekisteröityminen onnistui"
 
 #. TRANS: Title for registration page.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Register"
 msgstr "Rekisteröidy"
@@ -4834,9 +4573,8 @@ msgid "Registration not allowed."
 msgstr "Rekisteröityminen ei ole sallittu."
 
 #. TRANS: Form validation error displayed when trying to register without agreeing to the site license.
-#, fuzzy
 msgid "You cannot register if you do not agree to the license."
-msgstr "Et voi rekisteröityä, jos et hyväksy lisenssiehtoja."
+msgstr "Et voi rekisteröityä, jos et hyväksy lisenssiä."
 
 #. TRANS: Form validation error displayed when trying to register with an already registered e-mail address.
 msgid "Email address already exists."
@@ -4851,30 +4589,26 @@ msgid ""
 "With this form you can create a new account. You can then post notices and "
 "link up to friends and colleagues."
 msgstr ""
+"Tämän lomakkeen avulla voit luoda uuden tilin. Sen jälkeen voit lähettää "
+"viestejä ja ottaa yhteyttä ystäviin ja työtovereihin."
 
 #. TRANS: Field label on account registration page. In this field the password has to be entered a second time.
-#, fuzzy
 msgctxt "PASSWORD"
 msgid "Confirm"
 msgstr "Vahvista"
 
 #. TRANS: Field label on account registration page.
-#, fuzzy
 msgctxt "LABEL"
 msgid "Email"
 msgstr "Sähköposti"
 
 #. TRANS: Field title on account registration page.
-#, fuzzy
 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."
+msgstr "Käytetään vain päivityksiin, ilmoituksiin ja salasanan palauttamiseen."
 
 #. TRANS: Field title on account registration page.
-#, fuzzy
 msgid "Longer name, preferably your \"real\" name."
-msgstr "Pitempi nimi, mieluiten oikea nimesi"
+msgstr "Pidempi nimesi, mieluiten \"oikea\" nimesi."
 
 #. TRANS: Button text to register a user on account registration page.
 msgctxt "BUTTON"
@@ -4892,23 +4626,24 @@ msgstr ""
 #. TRANS: %1$s is the license owner.
 #, php-format
 msgid "My text and files are copyright by %1$s."
-msgstr ""
+msgstr "Tekstieni ja tiedostojeni tekijänoikeuksien haltija on %1$s."
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
 msgid "My text and files remain under my own copyright."
-msgstr ""
+msgstr "Tekstini ja tiedostoni pysyvät oman tekijänoikeuteni alaisena."
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
 msgid "All rights reserved."
-msgstr ""
+msgstr "Kaikki oikeudet pidätetään."
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
 "email address, IM address, and phone number."
 msgstr ""
-"poislukien yksityinen tieto: salasana, sähköpostiosoite, IM-osoite, "
+"Tekstini ja tiedostoni ovat saatavilla %s alaisuudessa, paitsi tämä "
+"yksityinen tieto: salasana, sähköpostiosoite, pikaviestitunnus ja "
 "puhelinnumero."
 
 #. TRANS: Text displayed after successful account registration.
@@ -4955,83 +4690,6 @@ msgstr ""
 "(Saat pian sähköpostiisi viestin, jonka ohjeita seuraamalla voit vahvistaa "
 "sähköpostiosoitteesi.)"
 
-#. TRANS: Page notice for remote subscribe. This message contains Markdown links.
-#. TRANS: Ensure to keep the correct markup of [link description](link).
-#, 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  jossain [yhteensopivassa mikroblogauspalvelussa](%%doc."
-"openmublog%%),  syötä profiilisi URL-osoite alla olevaan kenttään."
-
-#. TRANS: Page title for Remote subscribe.
-msgid "Remote subscribe"
-msgstr "Etätilaus"
-
-#. TRANS: Field legend on page for remote subscribe.
-msgid "Subscribe to a remote user"
-msgstr "Tilaa tämä etäkäyttäjä"
-
-#. TRANS: Field label on page for remote subscribe.
-msgid "User nickname"
-msgstr "Käyttäjätunnus"
-
-#. TRANS: Field title on page for remote subscribe.
-#, fuzzy
-msgid "Nickname of the user you want to follow."
-msgstr "Käyttäjän, jota haluat seurata, käyttäjätunnus"
-
-#. TRANS: Field label on page for remote subscribe.
-msgid "Profile URL"
-msgstr "Profiilin URL"
-
-#. TRANS: Field title on page for remote subscribe.
-#, fuzzy
-msgid "URL of your profile on another compatible microblogging service."
-msgstr "Profiilisi URL-osoite toisessa yhteensopivassa mikroblogauspalvelussa"
-
-#. TRANS: Button text on page for remote subscribe.
-#. TRANS: Link text for link that will subscribe to a remote profile.
-#. TRANS: Button text to subscribe to a user.
-#. TRANS: Button text for subscribing to a list.
-#, fuzzy
-msgctxt "BUTTON"
-msgid "Subscribe"
-msgstr "Tilaa"
-
-#. TRANS: Form validation error on page for remote subscribe when an invalid profile URL was provided.
-#, fuzzy
-msgid "Invalid profile URL (bad format)."
-msgstr "Profiilin URL-osoite '%s' ei kelpaa (virheellinen muoto)."
-
-#. TRANS: Form validation error on page for remote subscribe when no the provided profile URL
-#. TRANS: does not contain expected data.
-#, fuzzy
-msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
-msgstr ""
-"Tuo ei ole kelvollinen profiilin verkko-osoite (YADIS dokumenttia ei "
-"löytynyt)."
-
-#. TRANS: Form validation error on page for remote subscribe.
-#, fuzzy
-msgid "That is a local profile! Login to subscribe."
-msgstr ""
-"Tämä on paikallinen profiili. Kirjaudu sisään, jotta voit tilata päivitykset."
-
-#. TRANS: Form validation error on page for remote subscribe when the remote service is not providing a request token.
-#, fuzzy
-msgid "Could not get a request token."
-msgstr "Ei saatu request tokenia."
-
-#. TRANS: Client error displayed when trying to (un)list an OMB 0.1 remote profile.
-#, fuzzy
-msgid "You cannot (un)list an OMB 0.1 remote profile with this action."
-msgstr "Et ole tilannut tämän käyttäjän päivityksiä."
-
 #. TRANS: Client error displayed when an unknown error occurs while delisting a user.
 #. TRANS: %s is a username.
 #, php-format
@@ -5088,6 +4746,12 @@ msgstr "Vastaukset käyttäjälle %s"
 msgid "Replies to %1$s, page %2$d"
 msgstr "Vastaukset käyttäjälle %s"
 
+#. TRANS: Link for feed with replies for a user.
+#. TRANS: %s is a user nickname.
+#, fuzzy, php-format
+msgid "Replies feed for %s (Activity Streams JSON)"
+msgstr "Päivityksien syöte käyttäjälle %s"
+
 #. TRANS: Link for feed with replies for a user.
 #. TRANS: %s is a user nickname.
 #, fuzzy, php-format
@@ -5172,11 +4836,11 @@ msgstr ""
 
 #. TRANS: Client exception thrown when a temporary folder is not present to store a file upload.
 msgid "Missing a temporary folder."
-msgstr ""
+msgstr "Väliaikaiskansio puuttuu."
 
 #. TRANS: Client exception thrown when writing to disk is not possible during a file upload operation.
 msgid "Failed to write file to disk."
-msgstr ""
+msgstr "Tiedoston kirjoittaminen levylle epäonnistui."
 
 #. TRANS: Client exception thrown when a file upload operation has been stopped by an extension.
 msgid "File upload stopped by extension."
@@ -5206,7 +4870,7 @@ msgstr ""
 
 #. TRANS: Form instructions for feed restore.
 msgid ""
-"You can upload a backed-up stream in <a href=\"http://activitystrea.ms/"
+"You can upload a backed-up timeline in <a href=\"http://activitystrea.ms/"
 "\">Activity Streams</a> format."
 msgstr ""
 
@@ -5319,7 +4983,7 @@ msgstr ""
 #. TRANS: Link text to edit application on the OAuth application page.
 msgctxt "EDITAPP"
 msgid "Edit"
-msgstr ""
+msgstr "Muokkaa"
 
 #. TRANS: Button text on the OAuth application page.
 #. TRANS: Resets the OAuth consumer key and secret.
@@ -5330,6 +4994,28 @@ msgstr ""
 msgid "Application info"
 msgstr ""
 
+#. TRANS: Field label on application page.
+msgid "Consumer key"
+msgstr ""
+
+#. TRANS: Field label on application page.
+msgid "Consumer secret"
+msgstr ""
+
+#. TRANS: Field label on application page.
+#, fuzzy
+msgid "Request token URL"
+msgstr "Virheellinen pyyntötunniste."
+
+#. TRANS: Field label on application page.
+msgid "Access token URL"
+msgstr ""
+
+#. TRANS: Field label on application page.
+#, fuzzy
+msgid "Authorize URL"
+msgstr "Lähdekoodi"
+
 #. TRANS: Note on the OAuth application page about signature support.
 msgid ""
 "Note: HMAC-SHA1 signatures are supported. The plaintext signature method is "
@@ -5351,6 +5037,11 @@ msgstr "Käyttäjän %s suosikkipäivitykset"
 msgid "Could not retrieve favorite notices."
 msgstr "Ei saatu haettua suosikkipäivityksiä."
 
+#. TRANS: Feed link text. %s is a username.
+#, fuzzy, php-format
+msgid "Feed for favorites of %s (Activity Streams JSON)"
+msgstr "Käyttäjän %s kavereiden syöte (Atom)"
+
 #. TRANS: Feed link text. %s is a username.
 #, php-format
 msgid "Feed for favorites of %s (RSS 1.0)"
@@ -5405,6 +5096,11 @@ msgstr "Ryhmä %s"
 msgid "%1$s group, page %2$d"
 msgstr "Ryhmät, sivu %d"
 
+#. TRANS: Tooltip for feed link. %s is a group nickname.
+#, fuzzy, php-format
+msgid "Notice feed for %s group (Activity Streams JSON)"
+msgstr "Syöte ryhmän %s päivityksille (Atom)"
+
 #. TRANS: Tooltip for feed link. %s is a group nickname.
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
@@ -5425,45 +5121,8 @@ msgstr "Syöte ryhmän %s päivityksille (Atom)"
 msgid "FOAF for %s group"
 msgstr "Käyttäjän %s lähetetyt viestit"
 
-#. TRANS: Header for mini list of group members on a group page (h2).
-msgid "Members"
-msgstr "Jäsenet"
-
-#. TRANS: Description for mini list of group members on a group page when the group has no members.
-#. TRANS: Content of "Listed" page if there are no listed users.
-#. TRANS: Content of "People following tag x" if there are no subscribed users.
-#. TRANS: Empty list message for tags.
-#. TRANS: Text for user subscription statistics if the user has no subscriptions.
-#. TRANS: Text for user subscriber statistics if user has no subscribers.
-#. TRANS: Text for user user group membership statistics if user is not a member of any group.
-#. TRANS: Default content for section/sidebar widget.
-#, fuzzy
-msgid "(None)"
-msgstr "(Tyhjä)"
-
-#. TRANS: Link to all group members from mini list of group members if group has more than n members.
-msgid "All members"
-msgstr "Kaikki jäsenet"
-
-#. TRANS: Header for group statistics on a group page (h2).
-#. TRANS: H2 text for user statistics.
-msgid "Statistics"
-msgstr "Tilastot"
-
-#. TRANS: Label for group creation date.
-#, fuzzy
-msgctxt "LABEL"
-msgid "Created"
-msgstr "Luotu"
-
-#. TRANS: Label for member count in statistics on group page.
-#, fuzzy
-msgctxt "LABEL"
-msgid "Members"
-msgstr "Jäsenet"
-
 #. TRANS: Notice on group pages for anonymous users for StatusNet sites that accept new registrations.
-#. TRANS: **%s** is the group alias, %%%%site.name%%%% is the site name,
+#. TRANS: %s is the group name, %%%%site.name%%%% is the site name,
 #. TRANS: %%%%action.register%%%% is the URL for registration, %%%%doc.help%%%% is a URL to help.
 #. TRANS: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
 #, php-format
@@ -5476,24 +5135,18 @@ msgid ""
 msgstr ""
 
 #. TRANS: Notice on group pages for anonymous users for StatusNet sites that accept no new registrations.
-#. TRANS: **%s** is the group alias, %%%%site.name%%%% is the site name,
+#. TRANS: %s is the group name, %%%%site.name%%%% is the site name,
 #. TRANS: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
 #, fuzzy, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
 "wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
 "[StatusNet](http://status.net/) tool. Its members share short messages about "
-"their life and interests. "
+"their life and interests."
 msgstr ""
 "**%s** on ryhmä palvelussa %%%%site.name%%%%, joka on [mikroblogauspalvelu]"
 "(http://en.wikipedia.org/wiki/Micro-blogging)"
 
-#. TRANS: Title for list of group administrators on a group page.
-#, fuzzy
-msgctxt "TITLE"
-msgid "Admins"
-msgstr "Ylläpitäjät"
-
 #. TRANS: Client error displayed requesting a single message that does not exist.
 msgid "No such message."
 msgstr "Tuota viestiä ei ole."
@@ -5590,38 +5243,46 @@ msgstr ""
 "newnotice%%%%?status_textarea=%s)!"
 
 #. TRANS: Header on show list page.
+#. TRANS: Link description for link to list of users tagged with a tag (so part of a list).
 #, fuzzy
 msgid "Listed"
 msgstr "Lisenssi"
 
+#. TRANS: Content of "Listed" page if there are no listed users.
+#. TRANS: Content of "People following tag x" if there are no subscribed users.
+#. TRANS: Description for mini list of group members on a group page when the group has no members.
+#. TRANS: Empty list message for tags.
+#. TRANS: Text for user subscription statistics if the user has no subscriptions.
+#. TRANS: Text for user subscriber statistics if user has no subscribers.
+#. TRANS: Text for user user group membership statistics if user is not a member of any group.
+#. TRANS: Default content for section/sidebar widget.
+#, fuzzy
+msgid "(None)"
+msgstr "(Tyhjä)"
+
 #. TRANS: Link for more "People in list x by a user"
 #. TRANS: if there are more than the mini list's maximum.
 msgid "Show all"
-msgstr ""
+msgstr "Näytä kaikki"
 
 #. TRANS: Header for tag subscribers.
 #. TRANS: Link description for link to list of users subscribed to a tag.
 msgid "Subscribers"
 msgstr "Tilaajat"
 
-#. TRANS: Link for more "People following tag x"
-#. TRANS: if there are more than the mini list's maximum.
-msgid "All subscribers"
-msgstr "Kaikki tilaajat"
-
-#. TRANS: Page title showing tagged notices in one user's stream.
+#. TRANS: Page title showing tagged notices in one user's timeline.
 #. TRANS: %1$s is the username, %2$s is the hash tag.
 #, fuzzy, php-format
 msgid "Notices by %1$s tagged %2$s"
 msgstr "Ryhmät, sivu %d"
 
-#. TRANS: Page title showing tagged notices in one user's stream.
+#. TRANS: Page title showing tagged notices in one user's timeline.
 #. TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number.
 #, fuzzy, php-format
 msgid "Notices by %1$s tagged %2$s, page %3$d"
 msgstr "Päivitykset joilla on tagi %s"
 
-#. TRANS: Extended page title showing tagged notices in one user's stream.
+#. TRANS: Extended page title showing tagged notices in one user's timeline.
 #. TRANS: %1$s is the username, %2$d is the page number.
 #, fuzzy, php-format
 msgid "Notices by %1$s, page %2$d"
@@ -5633,6 +5294,12 @@ msgstr "Päivitykset joilla on tagi %s"
 msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
 msgstr "Syöte ryhmän %s päivityksille (RSS 1.0)"
 
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#, fuzzy, php-format
+msgid "Notice feed for %s (Activity Streams JSON)"
+msgstr "Syöte ryhmän %s päivityksille (Atom)"
+
 #. TRANS: Title for link to notice feed.
 #. TRANS: %s is a user nickname.
 #, php-format
@@ -5657,7 +5324,7 @@ msgstr "Syöte ryhmän %s päivityksille (Atom)"
 msgid "FOAF for %s"
 msgstr "Käyttäjän %s lähetetyt viestit"
 
-#. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
+#. TRANS: First sentence of empty list message for a timeline. $1%s is a user nickname.
 #, fuzzy, php-format
 msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
 msgstr ""
@@ -5670,7 +5337,7 @@ msgid ""
 "would be a good time to start :)"
 msgstr ""
 
-#. TRANS: Second sentence of empty  list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
+#. TRANS: Second sentence of empty  list message for a non-self timeline. %1$s is a user nickname, %2$s is a part of a URL.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
 #, fuzzy, php-format
 msgid ""
@@ -5680,7 +5347,7 @@ msgstr ""
 "Ole ensimmäinen joka [lähettää päivityksen tästä aiheesta](%%%%action."
 "newnotice%%%%?status_textarea=%s)!"
 
-#. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
+#. TRANS: Announcement for anonymous users showing a timeline if site registrations are open.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
 #, php-format
 msgid ""
@@ -5690,13 +5357,13 @@ msgid ""
 "follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))"
 msgstr ""
 
-#. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
+#. TRANS: Announcement for anonymous users showing a timeline if site registrations are closed or invite only.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
 #, fuzzy, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
 "wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
-"[StatusNet](http://status.net/) tool. "
+"[StatusNet](http://status.net/) tool."
 msgstr ""
 "Käyttäjällä **%s** on käyttäjätili palvelussa %%%%site.name%%%%, joka on "
 "[mikroblogauspalvelu](http://en.wikipedia.org/wiki/Micro-blogging)"
@@ -5736,6 +5403,14 @@ msgstr ""
 msgid "You must have a valid contact email address."
 msgstr "Tuo ei ole kelvollinen sähköpostiosoite."
 
+#. TRANS: Client error displayed when a logo URL is not valid.
+msgid "Invalid logo URL."
+msgstr "Virheellinen logon URL-osoite."
+
+#. TRANS: Client error displayed when a SSL logo URL is invalid.
+msgid "Invalid SSL logo URL."
+msgstr "Virheellinen logon salattu URL-osoite."
+
 #. TRANS: Client error displayed trying to save site settings with an invalid language code.
 #. TRANS: %s is the invalid language code.
 #, php-format
@@ -5809,7 +5484,8 @@ msgid "Default language"
 msgstr "Ensisijainen kieli"
 
 #. TRANS: Dropdown title on site settings panel.
-msgid "Site language when autodetection from browser settings is not available"
+msgid ""
+"The site language when autodetection from browser settings is not available."
 msgstr ""
 
 #. TRANS: Fieldset legend on site settings panel.
@@ -5833,9 +5509,21 @@ msgstr ""
 msgid "How long users must wait (in seconds) to post the same thing again."
 msgstr ""
 
+#. TRANS: Fieldset legend for form to change logo.
+msgid "Logo"
+msgstr "Kirjaudu ulos"
+
+#. TRANS: Field label for StatusNet site logo.
+msgid "Site logo"
+msgstr "Sivuston logo"
+
+#. TRANS: Field label for SSL StatusNet site logo.
+msgid "SSL logo"
+msgstr "SSL-logo"
+
 #. TRANS: Button title for saving site settings.
 #, fuzzy
-msgid "Save site settings"
+msgid "Save the site settings."
 msgstr "Profiilikuva-asetukset"
 
 #. TRANS: Page title for site-wide notice tab in admin panel.
@@ -5863,7 +5551,7 @@ msgid "Site-wide notice text (255 characters maximum; HTML allowed)"
 msgstr ""
 "Kaikilla sivuilla näkyvä ilmoitusteksti (enintään 255 merkkiä; HTML sallittu)"
 
-#. TRANS: Title for button to save site notice in admin panel.
+#. TRANS: Button title to save site notice in admin panel.
 msgid "Save site notice."
 msgstr "Tallenna ilmoitus."
 
@@ -5903,7 +5591,6 @@ msgid "Enter the code you received on your phone."
 msgstr "Syötä koodi jonka sait puhelimeesi."
 
 #. TRANS: Button label to confirm SMS confirmation code in SMS settings.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Confirm"
 msgstr "Vahvista"
@@ -6063,7 +5750,7 @@ msgstr ""
 msgid "Snapshots will be sent to this URL."
 msgstr ""
 
-#. TRANS: Title for button to save snapshot settings.
+#. TRANS: Button title to save snapshot settings.
 #, fuzzy
 msgid "Save snapshot settings."
 msgstr "Profiilikuva-asetukset"
@@ -6098,11 +5785,6 @@ msgstr "Ryhmän %s jäsenet"
 msgid "A list of users awaiting approval to subscribe to you."
 msgstr "Lista ryhmän käyttäjistä."
 
-#. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
-#, fuzzy
-msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
-msgstr "Et ole tilannut tämän käyttäjän päivityksiä."
-
 #. TRANS: Page title when subscription succeeded.
 msgid "Subscribed"
 msgstr "Tilattu"
@@ -6201,8 +5883,7 @@ msgid ""
 "You're not listening to anyone's notices right now, try subscribing to "
 "people you know. Try [people search](%%action.peoplesearch%%), look for "
 "members in groups you're interested in and in our [featured users](%%action."
-"featured%%). If you're a [Twitter user](%%action.twittersettings%%), you can "
-"automatically subscribe to people you already follow there."
+"featured%%)."
 msgstr ""
 
 #. TRANS: Subscription list text when looking at the subscriptions for a of a user other
@@ -6234,6 +5915,12 @@ msgstr "SMS"
 msgid "Notices tagged with %1$s, page %2$d"
 msgstr "Päivitykset joilla on tagi %s"
 
+#. TRANS: Link label for feed on "notices with tag" page.
+#. TRANS: %s is the tag the feed is for.
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (Activity Streams JSON)"
+msgstr "Syöte ryhmän %s päivityksille (Atom)"
+
 #. TRANS: Link label for feed on "notices with tag" page.
 #. TRANS: %s is the tag the feed is for.
 #, php-format
@@ -6272,10 +5959,9 @@ msgid "List %s"
 msgstr "Linkit"
 
 #. TRANS: Title for list form when an error has occurred.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Error"
-msgstr "Ajax-virhe"
+msgstr "Virhe"
 
 #. TRANS: Header in list form.
 msgid "User profile"
@@ -6347,16 +6033,6 @@ msgstr "Tilaus lopetettu"
 msgid "%1$s unsubscribed from list %2$s by %3$s"
 msgstr "Käyttäjän %s tilaajat"
 
-#. TRANS: Client error displayed when trying to update profile with an incompatible license.
-#. TRANS: %1$s is the license incompatible with site license %2$s.
-#. TRANS: Exception thrown when licenses are not compatible for an authorisation request.
-#. TRANS: %1$s is the license for the listenee, %2$s is the license for "this" StatusNet site.
-#, php-format
-msgid ""
-"Listenee stream license \"%1$s\" is not compatible with site license \"%2$s"
-"\"."
-msgstr ""
-
 #. TRANS: Title of URL settings tab in profile settings.
 #, fuzzy
 msgid "URL settings"
@@ -6426,7 +6102,6 @@ msgid "Error saving user URL shortening preferences."
 msgstr ""
 
 #. TRANS: User admin panel title.
-#, fuzzy
 msgctxt "TITLE"
 msgid "User"
 msgstr "Käyttäjä"
@@ -6450,7 +6125,6 @@ msgid "Invalid default subscripton: \"%1$s\" is not a user."
 msgstr ""
 
 #. TRANS: Fieldset legend in user administration panel.
-#, fuzzy
 msgctxt "LEGEND"
 msgid "Profile"
 msgstr "Profiili"
@@ -6503,161 +6177,11 @@ msgstr "Kutsu(t) lähetettiin"
 msgid "Whether to allow users to invite new users."
 msgstr ""
 
-#. TRANS: Title for button to save user settings in user admin panel.
+#. TRANS: Button title to save user settings in user admin panel.
 #, fuzzy
 msgid "Save user settings."
 msgstr "Profiilikuva-asetukset"
 
-#. TRANS: Page title.
-msgid "Authorize subscription"
-msgstr "Valtuuta tilaus"
-
-#. TRANS: Page notice on "Authorize subscription" page.
-#, fuzzy
-msgid ""
-"Please check these details to make sure that you want to subscribe to this "
-"user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
-"click \"Reject\"."
-msgstr ""
-"Tarkista nämä tiedot varmistaaksesi, että haluat tilata tämän käyttäjän "
-"päivitykset. Jos et valinnut haluavasi tilata jonkin käyttäjän päivityksiä, "
-"paina \"Peruuta\"."
-
-#. TRANS: Button text on Authorise Subscription page.
-#. TRANS: Submit button text to accept a group membership request on approve group form.
-#. TRANS: Submit button text to accept a subscription request on approve sub form.
-#, fuzzy
-msgctxt "BUTTON"
-msgid "Accept"
-msgstr "Hyväksy"
-
-#. TRANS: Title for button on Authorise Subscription page.
-#. TRANS: Button title to subscribe to a user.
-#, fuzzy
-msgid "Subscribe to this user."
-msgstr "Tilaa tämä käyttäjä"
-
-#. TRANS: Button text on Authorise Subscription page.
-#. TRANS: Submit button text to reject a group membership request on approve group form.
-#. TRANS: Submit button text to reject a subscription request on approve sub form.
-#, fuzzy
-msgctxt "BUTTON"
-msgid "Reject"
-msgstr "Hylkää"
-
-#. TRANS: Title for button on Authorise Subscription page.
-#, fuzzy
-msgid "Reject this subscription."
-msgstr "Käyttäjän %s tilaukset"
-
-#. TRANS: Client error displayed for an empty authorisation request.
-msgid "No authorization request!"
-msgstr "Ei valtuutuspyyntöä!"
-
-#. TRANS: Accept message header from Authorise subscription page.
-msgid "Subscription authorized"
-msgstr "Tilaus sallittu"
-
-#. TRANS: Accept message text from Authorise subscription page.
-msgid ""
-"The subscription has been authorized, but no callback URL was passed. Check "
-"with the site's instructions for details on how to authorize the "
-"subscription. Your subscription token is:"
-msgstr ""
-"Päivityksen tilaus on hyväksytty, mutta callback-osoitetta palveluun ei ole "
-"saatu. Tarkista sivuston ohjeet miten päivityksen tilaus hyväksytään. "
-"Tilauskoodisi on:"
-
-#. TRANS: Reject message header from Authorise subscription page.
-msgid "Subscription rejected"
-msgstr "Tilaus hylätty"
-
-#. TRANS: Reject message from Authorise subscription page.
-msgid ""
-"The subscription has been rejected, but no callback URL was passed. Check "
-"with the site's instructions for details on how to fully reject the "
-"subscription."
-msgstr ""
-"Päivityksen tilaus on hylätty, mutta callback-osoitetta palveluun ei ole "
-"saatu. Tarkista sivuston ohjeet miten päivityksen tilaus hylätään kokonaan."
-
-#. TRANS: Exception thrown when no valid user is found for an authorisation request.
-#. TRANS: %s is a listener URI.
-#, php-format
-msgid "Listener URI \"%s\" not found here."
-msgstr ""
-
-#. TRANS: Exception thrown when listenee URI is too long for an authorisation request.
-#. TRANS: %s is a listenee URI.
-#, php-format
-msgid "Listenee URI \"%s\" is too long."
-msgstr ""
-
-#. TRANS: Exception thrown when listenee URI is a local user for an authorisation request.
-#. TRANS: %s is a listenee URI.
-#, php-format
-msgid "Listenee URI \"%s\" is a local user."
-msgstr ""
-
-#. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
-#. TRANS: %s is a profile URL.
-#, php-format
-msgid "Profile URL \"%s\" is for a local user."
-msgstr ""
-
-#. TRANS: Exception thrown when avatar URL is invalid for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#, fuzzy, php-format
-msgid "Avatar URL \"%s\" is not valid."
-msgstr "Kotisivun verkko-osoite ei ole toimiva."
-
-#. TRANS: Exception thrown when avatar URL could not be read for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#, fuzzy, php-format
-msgid "Cannot read avatar URL \"%s\"."
-msgstr "Kuvan URL-osoitetta '%s' ei voi avata."
-
-#. TRANS: Exception thrown when avatar URL return an invalid image type for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#, fuzzy, php-format
-msgid "Wrong image type for avatar URL \"%s\"."
-msgstr "Kuvan '%s' tyyppi on väärä"
-
-#. TRANS: Title for profile design page.
-#. TRANS: Page title for profile design page.
-#, fuzzy
-msgid "Profile design"
-msgstr "Profiiliasetukset"
-
-#. TRANS: Instructions for Profile design page.
-#. TRANS: Instructions for profile design page.
-msgid ""
-"Customize the way your profile looks with a background image and a colour "
-"palette of your choice."
-msgstr ""
-
-#. TRANS: Succes message on Profile design page when finding an easter egg.
-msgid "Enjoy your hotdog!"
-msgstr ""
-
-#. TRANS: Form legend on Profile design page.
-#, fuzzy
-msgid "Design settings"
-msgstr "Profiilikuva-asetukset"
-
-#. TRANS: Checkbox label on Profile design page.
-msgid "View profile designs"
-msgstr "Näytä tai piillota profiilin ulkoasu."
-
-#. TRANS: Title for checkbox on Profile design page.
-msgid "Show or hide profile designs."
-msgstr "Näytä tai piillota profiilin ulkoasu."
-
-#. TRANS: Form legend on Profile design page for form to choose a background image.
-#, fuzzy
-msgid "Background file"
-msgstr "Tausta"
-
 #. TRANS: Page title for all but the first page of groups for a user.
 #. TRANS: %1$s is a nickname, %2$d is a page number.
 #, php-format
@@ -6690,15 +6214,15 @@ msgid "Updates from %1$s on %2$s!"
 msgstr "Käyttäjän %1$s päivitykset palvelussa %2$s!"
 
 #. TRANS: Title for version page. %s is the StatusNet version.
-#, fuzzy, php-format
+#, php-format
 msgid "StatusNet %s"
-msgstr "Tilastot"
+msgstr "StatusNet %s"
 
 #. TRANS: Content part of StatusNet version page.
 #. TRANS: %1$s is the engine name (StatusNet) and %2$s is the StatusNet version.
 #, php-format
 msgid ""
-"This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, "
+"This site is powered by %1$s version %2$s, Copyright 2008-2011 StatusNet, "
 "Inc. and contributors."
 msgstr ""
 
@@ -6715,7 +6239,7 @@ msgid ""
 "StatusNet is free software: you can redistribute it and/or modify it under "
 "the terms of the GNU Affero General Public License as published by the Free "
 "Software Foundation, either version 3 of the License, or (at your option) "
-"any later version. "
+"any later version."
 msgstr ""
 
 #. TRANS: Content part of StatusNet version page.
@@ -6723,7 +6247,7 @@ msgid ""
 "This program is distributed in the hope that it will be useful, but WITHOUT "
 "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
 "FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License "
-"for more details. "
+"for more details."
 msgstr ""
 
 #. TRANS: Content part of StatusNet version page.
@@ -6756,7 +6280,6 @@ msgid "Author(s)"
 msgstr ""
 
 #. TRANS: Column header for plugins table on version page.
-#, fuzzy
 msgctxt "HEADER"
 msgid "Description"
 msgstr "Kuvaus"
@@ -6780,16 +6303,26 @@ msgstr ""
 msgid "Robin thinks something is impossible."
 msgstr ""
 
+#. TRANS: Message used to be inserted as %2$s in  the text "No file may
+#. TRANS: be larger than %1$d byte and the file you sent was %2$s.".
+#. TRANS: %1$d is the number of bytes of an uploaded file.
+#, php-format
+msgid "%1$d byte"
+msgid_plural "%1$d bytes"
+msgstr[0] ""
+msgstr[1] ""
+
 #. TRANS: Message given if an upload is larger than the configured maximum.
-#. TRANS: %1$d is the byte limit for uploads, %2$d is the byte count for the uploaded file.
-#. TRANS: %1$s is used for plural.
+#. TRANS: %1$d (used for plural) is the byte limit for uploads,
+#. TRANS: %2$s is the proper form of "n bytes". This is the only ways to have
+#. TRANS: gettext support multiple plurals in the same message, unfortunately...
 #, php-format
 msgid ""
-"No file may be larger than %1$d byte and the file you sent was %2$d bytes. "
-"Try to upload a smaller version."
+"No file may be larger than %1$d byte and the file you sent was %2$s. Try to "
+"upload a smaller version."
 msgid_plural ""
-"No file may be larger than %1$d bytes and the file you sent was %2$d bytes. "
-"Try to upload a smaller version."
+"No file may be larger than %1$d bytes and the file you sent was %2$s. Try to "
+"upload a smaller version."
 msgstr[0] ""
 msgstr[1] ""
 
@@ -6862,6 +6395,11 @@ msgstr "Ei voitu päivittää ryhmää."
 msgid "Could not create login token for %s"
 msgstr "Ei voitu lisätä aliasta."
 
+#. TRANS: Exception thrown when a program code class (%s) cannot be instantiated.
+#, fuzzy, php-format
+msgid "Cannot instantiate class %s."
+msgstr "Uutta salasanaa ei voida tallentaa."
+
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.
 msgid "No database name or DSN found anywhere."
 msgstr ""
@@ -6886,14 +6424,13 @@ msgid "No such profile (%1$d) for notice (%2$d)."
 msgstr ""
 
 #. TRANS: Server exception. %s are the error details.
-#, fuzzy, php-format
+#, php-format
 msgid "Database error inserting hashtag: %s."
-msgstr "Virhe tapahtui profiilikuvan lisäämisessä"
+msgstr "Virhe lisätessä hashtagia %s"
 
 #. TRANS: Client exception thrown if a notice contains too many characters.
-#, fuzzy
 msgid "Problem saving notice. Too long."
-msgstr "Ongelma päivityksen tallentamisessa."
+msgstr "Virhe viestin tallennuksessa. Liian pitkä viesti."
 
 #. TRANS: Client exception thrown when trying to save a notice for an unknown user.
 msgid "Problem saving notice. Unknown user."
@@ -6919,24 +6456,20 @@ msgid "You are banned from posting notices on this site."
 msgstr "Päivityksesi tähän palveluun on estetty."
 
 #. TRANS: Client exception thrown in notice when trying to repeat a missing or deleted notice.
-#, fuzzy
 msgid "Cannot repeat; original notice is missing or deleted."
-msgstr "Et voi lähettää uudelleen omaa viestiäsi."
+msgstr "Ei voi toistaa; alkuperäinen ilmoitus puuttuu tai se on poistettu."
 
 #. TRANS: Client error displayed when trying to repeat an own notice.
-#, fuzzy
 msgid "You cannot repeat your own notice."
-msgstr "Et voi rekisteröityä, jos et hyväksy lisenssiehtoja."
+msgstr "Et voi toistaa omia viestejäsi."
 
 #. TRANS: Client error displayed when trying to repeat a non-public notice.
-#, fuzzy
 msgid "Cannot repeat a private notice."
-msgstr "Et voi lähettää uudelleen omaa viestiäsi."
+msgstr "Et voi toistaa yksityisviestiä."
 
 #. TRANS: Client error displayed when trying to repeat a notice you cannot access.
-#, fuzzy
 msgid "Cannot repeat a notice you cannot read."
-msgstr "Et voi lähettää uudelleen omaa viestiäsi."
+msgstr "Et voi toistaa viestiä, jota et voi lukea."
 
 #. TRANS: Client error displayed when trying to repeat an already repeated notice.
 msgid "You already repeated that notice."
@@ -6944,9 +6477,9 @@ msgstr "Sinä kuulut jo tähän ryhmään."
 
 #. TRANS: Client error displayed when trying to reply to a notice a the target has no access to.
 #. TRANS: %1$s is a user nickname, %2$d is a notice ID (number).
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s has no access to notice %2$d."
-msgstr "Käyttäjällä ei ole viimeistä päivitystä"
+msgstr "Käyttäjällä %1$s ei ole oikeuksia lukea viestiä %2$d."
 
 #. TRANS: Server exception thrown when a notice cannot be saved.
 #. TRANS: Server exception thrown when a notice cannot be updated.
@@ -6955,12 +6488,11 @@ msgstr "Ongelma päivityksen tallentamisessa."
 
 #. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
 msgid "Bad type provided to saveKnownGroups."
-msgstr ""
+msgstr "Virheellinen tyyppi annettu metodille saveKnownGroups."
 
 #. TRANS: Server exception thrown when an update for a group inbox fails.
-#, fuzzy
 msgid "Problem saving group inbox."
-msgstr "Ongelma päivityksen tallentamisessa."
+msgstr "Virhe ryhmän saapuneiden viestien tallennuksessa."
 
 #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
 #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
@@ -6970,7 +6502,7 @@ msgstr "RT @%1$s %2$s"
 
 #. TRANS: Full name of a profile or group (%1$s) followed by nickname (%2$s) in parentheses.
 #. TRANS: Full name of a profile or group followed by nickname in parens
-#, fuzzy, php-format
+#, php-format
 msgctxt "FANCYNAME"
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
@@ -7027,7 +6559,7 @@ msgstr ""
 #, php-format
 msgid ""
 "You already have %1$d or more people in list %2$s, which is the maximum "
-"allowed number.Try unlisting others first."
+"allowed number. Try unlisting others first."
 msgstr ""
 
 #. TRANS: Exception thrown when inserting a list subscription in the database fails.
@@ -7047,10 +6579,9 @@ msgstr "Käyttäjällä ei ole profiilia."
 
 #. TRANS: Exception thrown when a tag cannot be saved.
 msgid "Unable to save tag."
-msgstr "Tagien tallennus epäonnistui."
+msgstr "Tagin tallennus epäonnistui."
 
 #. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
-#. TRANS: Error message displayed to a banned user when they try to subscribe.
 #, fuzzy
 msgid "You have been banned from subscribing."
 msgstr "Käyttäjä on estänyt sinua tilaamasta päivityksiä."
@@ -7073,19 +6604,14 @@ msgstr "Ei ole tilattu!."
 msgid "Could not delete self-subscription."
 msgstr "Tilausta ei onnistuttu tallentamaan."
 
-#. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
-msgid "Could not delete subscription OMB token."
-msgstr "Tilausta ei onnistuttu tallentamaan."
-
 #. TRANS: Exception thrown when a subscription could not be deleted on the server.
 msgid "Could not delete subscription."
 msgstr "Tilausta ei onnistuttu tallentamaan."
 
 #. TRANS: Activity title when subscribing to another person.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Follow"
-msgstr "Salli"
+msgstr "Seuraa"
 
 #. TRANS: Notification given when one person starts following another.
 #. TRANS: %1$s is the subscriber, %2$s is the subscribed.
@@ -7111,6 +6637,18 @@ msgstr ""
 msgid "Single-user mode code called when not enabled."
 msgstr ""
 
+#. TRANS: Information on password recovery form if no known username or e-mail address was specified.
+msgid "No user with that email address or username."
+msgstr "Käyttäjää tuolla sähköpostilla tai käyttäjätunnuksella ei ole."
+
+#. TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.
+msgid "No registered email address for that user."
+msgstr "Rekisteröityä sähköpostiosoitetta ei ole tälle käyttäjälle."
+
+#. TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.
+msgid "Error saving address confirmation."
+msgstr "Virhe tapahtui osoitevahvistuksen tallentamisessa"
+
 #. TRANS: Server exception thrown when creating a group failed.
 msgid "Could not create group."
 msgstr "Ryhmän luonti ei onnistunut."
@@ -7163,7 +6701,7 @@ msgstr "Profiiliasetukset"
 #. TRANS: Link text for link on user profile.
 msgctxt "BUTTON"
 msgid "Edit"
-msgstr ""
+msgstr "Muokkaa"
 
 #. TRANS: Link title for link on user profile.
 #, fuzzy
@@ -7211,15 +6749,14 @@ msgid "Show more"
 msgstr ""
 
 #. TRANS: Inline reply form submit button: submits a reply comment.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Reply"
-msgstr "Vastaus"
+msgstr "Vastaa"
 
 #. TRANS: Placeholder text for inline reply form. Clicking in this box will turn it into a mini notice form.
 #. TRANS: Field label for reply mini form.
 msgid "Write a reply..."
-msgstr ""
+msgstr "Kirjoita vastaus..."
 
 #. TRANS: Tab on the notice form.
 #, fuzzy
@@ -7322,9 +6859,8 @@ msgid "Remote profile is not a group!"
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to join a group the importing user is already a member of.
-#, fuzzy
 msgid "User is already a member of this group."
-msgstr "Sinä kuulut jo tähän ryhmään."
+msgstr "Käyttäjä on jo tämän ryhmän jäsen."
 
 #. TRANS: Client exception thrown when trying to import a notice by another user.
 #. TRANS: %1$s is the source URI of the notice, %2$s is the URI of the author.
@@ -7371,92 +6907,52 @@ msgid "Can't handle embedded Base64 content yet."
 msgstr ""
 
 #. TRANS: Client error message thrown when a user tries to change admin settings but has no access rights.
-#, fuzzy
 msgid "You cannot make changes to this site."
-msgstr "Et voi lähettää viestiä tälle käyttäjälle."
+msgstr "Et voi tehdä muutoksia sivustoon."
 
 #. TRANS: Client error message throw when a certain panel's settings cannot be changed.
-#, fuzzy
 msgid "Changes to that panel are not allowed."
-msgstr "Rekisteröityminen ei ole sallittu."
+msgstr "Et voi tehdä muutoksia paneeliin."
 
 #. TRANS: Client error message.
-#, fuzzy
 msgid "showForm() not implemented."
-msgstr "Komentoa ei ole vielä toteutettu."
+msgstr "Komentoa showForm() ei ole toteutettu."
 
 #. TRANS: Client error message
-#, fuzzy
 msgid "saveSettings() not implemented."
-msgstr "Komentoa ei ole vielä toteutettu."
-
-#. TRANS: Client error message thrown if design settings could not be deleted in
-#. TRANS: the admin panel Design.
-#, fuzzy
-msgid "Unable to delete design setting."
-msgstr "Twitter-asetuksia ei voitu tallentaa!"
+msgstr "Komentoa saveSettings() ei ole toteutettu."
 
 #. TRANS: Header in administrator navigation panel.
-#. TRANS: Header in settings navigation panel.
-#, fuzzy
 msgctxt "HEADER"
 msgid "Home"
-msgstr "Kotisivu"
-
-#. TRANS: Menu item in administrator navigation panel.
-#. TRANS: Menu item in default local navigation panel.
-#. TRANS: Menu item in personal group navigation menu.
-#. TRANS: Menu item in settings navigation panel.
-#, fuzzy
-msgctxt "MENU"
-msgid "Home"
-msgstr "Kotisivu"
+msgstr "Koti"
 
 #. TRANS: Header in administrator navigation panel.
-#, fuzzy
 msgctxt "HEADER"
 msgid "Admin"
 msgstr "Ylläpito"
 
 #. TRANS: Menu item title in administrator navigation panel.
-#, fuzzy
 msgid "Basic site configuration"
-msgstr "Sähköpostiosoitteen vahvistus"
+msgstr "Sivuston perusasetukset"
 
 #. TRANS: Menu item in administrator navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Site"
-msgstr "Kutsu"
+msgstr "Sivusto"
 
 #. TRANS: Menu item title in administrator navigation panel.
-#, fuzzy
-msgid "Design configuration"
-msgstr "SMS vahvistus"
-
-#. TRANS: Menu item in administrator navigation panel.
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: Menu item in settings navigation panel.
-#, fuzzy
-msgctxt "MENU"
-msgid "Design"
-msgstr "Ulkoasu"
-
-#. TRANS: Menu item title in administrator navigation panel.
-#, fuzzy
 msgid "User configuration"
-msgstr "SMS vahvistus"
+msgstr "Käyttäjäasetukset"
 
 #. TRANS: Menu item in administrator navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "User"
 msgstr "Käyttäjä"
 
 #. TRANS: Menu item title in administrator navigation panel.
-#, fuzzy
 msgid "Access configuration"
-msgstr "SMS vahvistus"
+msgstr "Käyttöoikeudet"
 
 #. TRANS: Menu item in administrator navigation panel.
 msgctxt "MENU"
@@ -7464,26 +6960,22 @@ msgid "Access"
 msgstr "Käyttöoikeudet"
 
 #. TRANS: Menu item title in administrator navigation panel.
-#, fuzzy
 msgid "Paths configuration"
-msgstr "SMS vahvistus"
+msgstr "Polkujen asetukset"
 
 #. TRANS: Menu item in administrator navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Paths"
 msgstr "Polut"
 
 #. TRANS: Menu item title in administrator navigation panel.
-#, fuzzy
 msgid "Sessions configuration"
-msgstr "SMS vahvistus"
+msgstr "Istuntojen asetukset"
 
 #. TRANS: Menu item in administrator navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Sessions"
-msgstr "Omat"
+msgstr "Istunnot"
 
 #. TRANS: Menu item title in administrator navigation panel.
 msgid "Edit site notice"
@@ -7495,29 +6987,26 @@ msgid "Site notice"
 msgstr "Ilmoitukset"
 
 #. TRANS: Menu item title in administrator navigation panel.
-#, fuzzy
 msgid "Snapshots configuration"
-msgstr "SMS vahvistus"
+msgstr "Tilannekuvien asetukset"
 
 #. TRANS: Menu item in administrator navigation panel.
 msgctxt "MENU"
 msgid "Snapshots"
-msgstr ""
+msgstr "Tilannekuvat"
 
 #. TRANS: Menu item title in administrator navigation panel.
 msgid "Set site license"
-msgstr ""
+msgstr "Aseta sivuston lisenssi"
 
 #. TRANS: Menu item in administrator navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "License"
 msgstr "Lisenssi"
 
 #. TRANS: Menu item title in administrator navigation panel.
-#, fuzzy
 msgid "Plugins configuration"
-msgstr "SMS vahvistus"
+msgstr "Liitännäiset"
 
 #. TRANS: Menu item in administrator navigation panel.
 #, fuzzy
@@ -7550,51 +7039,13 @@ msgstr ""
 msgid "Could not authenticate you."
 msgstr ""
 
-#. TRANS: Server error displayed when trying to create an anynymous OAuth consumer.
-#, fuzzy
-msgid "Could not create anonymous consumer."
-msgstr "Ei voitu lisätä aliasta."
-
-#. TRANS: Server error displayed when trying to create an anynymous OAuth application.
-#, fuzzy
-msgid "Could not create anonymous OAuth application."
-msgstr "Ei voitu lisätä aliasta."
-
-#. TRANS: Exception thrown when no token association could be found.
-msgid ""
-"Could not find a profile and application associated with the request token."
-msgstr ""
-
-#. TRANS: Exception thrown when no access token can be issued.
-#, fuzzy
-msgid "Could not issue access token."
-msgstr "Viestin tallennus ei onnistunut."
-
-#. TRANS: Exception thrown when a database error occurs.
-#, fuzzy
-msgid "Database error inserting OAuth application user."
-msgstr "Tietokantavirhe tallennettaessa risutagiä: %s"
-
-#. TRANS: Exception thrown when a database error occurs.
-#, fuzzy
-msgid "Database error updating OAuth application user."
-msgstr "Tietokantavirhe tallennettaessa risutagiä: %s"
-
-#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
-msgid "Tried to revoke unknown token."
-msgstr ""
-
-#. TRANS: Exception thrown when an attempt is made to remove a revoked token.
-msgid "Failed to delete revoked token."
-msgstr ""
-
 #. TRANS: Form input field label for application icon.
 msgid "Icon"
-msgstr ""
+msgstr "Kuvake"
 
 #. TRANS: Form guide.
 msgid "Icon for this application"
-msgstr ""
+msgstr "Tämän sovelluksen kuvake"
 
 #. TRANS: Form input field label for application name.
 #, fuzzy
@@ -7650,7 +7101,7 @@ msgstr ""
 
 #. TRANS: Radio button label for application type
 msgid "Browser"
-msgstr ""
+msgstr "Selain"
 
 #. TRANS: Radio button label for application type
 msgid "Desktop"
@@ -7673,13 +7124,14 @@ msgid "Default access for this application: read-only, or read-write"
 msgstr ""
 
 #. TRANS: Submit button title.
-msgid "Cancel"
-msgstr "Peruuta"
+#, fuzzy
+msgid "Cancel application changes."
+msgstr "Poista sovellus"
 
 #. TRANS: Submit button title.
-#. TRANS: Button text to save a list.
-msgid "Save"
-msgstr "Tallenna"
+#, fuzzy
+msgid "Save application changes."
+msgstr "Uusi sovellus"
 
 #. TRANS: Name for an anonymous application in application list.
 #, fuzzy
@@ -7716,6 +7168,18 @@ msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "Poista"
 
+#. TRANS: Submit button text to accept a group membership request on approve group form.
+#. TRANS: Submit button text to accept a subscription request on approve sub form.
+msgctxt "BUTTON"
+msgid "Accept"
+msgstr "Hyväksy"
+
+#. TRANS: Submit button text to reject a group membership request on approve group form.
+#. TRANS: Submit button text to reject a subscription request on approve sub form.
+msgctxt "BUTTON"
+msgid "Reject"
+msgstr "Hylkää"
+
 #. TRANS: Atom feed exception thrown when an author element does not contain a name element.
 msgid "Author element must contain a name element."
 msgstr ""
@@ -8080,9 +7544,8 @@ msgstr[1] "Toista ei voitu asettaa tilaamaan sinua."
 
 #. TRANS: Text shown after requesting groups a user is subscribed to without having
 #. TRANS: any group subscriptions.
-#, fuzzy
 msgid "You are not a member of any groups."
-msgstr "Sinä et kuulu tähän ryhmään."
+msgstr "Et kuulu mihinkään ryhmään."
 
 #. TRANS: Text shown after requesting groups a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
@@ -8209,10 +7672,9 @@ msgid "reply to the last notice from user"
 msgstr "Vastaa tähän päivitykseen"
 
 #. TRANS: Help message for IM/SMS command "join <group>".
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "join group"
-msgstr "Tuntematon ryhmä."
+msgstr "liity ryhmään"
 
 #. TRANS: Help message for IM/SMS command "login".
 msgctxt "COMMANDHELP"
@@ -8220,10 +7682,9 @@ msgid "Get a link to login to the web interface"
 msgstr ""
 
 #. TRANS: Help message for IM/SMS command "drop <group>".
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "leave group"
-msgstr "Poista ryhmä"
+msgstr "eroa ryhmästä"
 
 #. TRANS: Help message for IM/SMS command "stats".
 msgctxt "COMMANDHELP"
@@ -8291,6 +7752,11 @@ msgstr ""
 msgid "Go to the installer."
 msgstr "Kirjaudu sisään palveluun"
 
+#. TRANS: Header on conversation page. Hidden by default (h2).
+#. TRANS: Label for user statistics.
+msgid "Notices"
+msgstr "Päivitykset"
+
 #. TRANS: Page title for when a database error occurs.
 msgid "Database error"
 msgstr "Tietokantavirhe"
@@ -8302,14 +7768,6 @@ msgctxt "MENU"
 msgid "Public"
 msgstr "Julkinen"
 
-#. TRANS: Menu item in default local navigation panel.
-#. TRANS: Menu item in search group navigation panel.
-#. TRANS: Menu item in local navigation menu.
-#, fuzzy
-msgctxt "MENU"
-msgid "Groups"
-msgstr "Ryhmät"
-
 #. TRANS: Menu item in default local navigation panel.
 #. TRANS: Menu item title in local navigation menu.
 #, fuzzy
@@ -8326,75 +7784,39 @@ msgstr "Poista"
 msgid "Delete this user"
 msgstr "Poista käyttäjä"
 
-#. TRANS: Form legend of form for changing the page design.
-#, fuzzy
-msgid "Change design"
-msgstr "Ryhmän ulkoasu"
-
-#. TRANS: Fieldset legend on profile design page to change profile page colours.
-msgid "Change colours"
-msgstr "Vaihda väriä"
-
-#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-msgid "Use defaults"
-msgstr "Käytä oletusasetuksia"
-
-#. TRANS: Label in form on profile design page.
-#. TRANS: Field contains file name on user's computer that could be that user's custom profile background image.
-#, fuzzy
-msgid "Upload file"
-msgstr "Lataa"
-
-#. TRANS: Instructions for form on profile design page.
-#, fuzzy
-msgid ""
-"You can upload your personal background image. The maximum file size is 2MB."
-msgstr "Voit ladata oman profiilikuvasi. Maksimikoko on %s."
-
-#. TRANS: Radio button on profile design page that will enable use of the uploaded profile image.
-#, fuzzy
-msgctxt "RADIO"
-msgid "On"
-msgstr "On"
-
-#. TRANS: Radio button on profile design page that will disable use of the uploaded profile image.
-#, fuzzy
-msgctxt "RADIO"
-msgid "Off"
-msgstr "Off"
-
-#. TRANS: Success message displayed if design settings were saved after clicking "Use defaults".
-#, fuzzy
-msgid "Design defaults restored."
-msgstr "Ulkoasuasetukset tallennettu."
-
 #. TRANS: Exception. %s is an ID.
 #, fuzzy, php-format
 msgid "Unable to find services for %s."
 msgstr "Käytä tätä lomaketta muokataksesi ryhmää."
 
 #. TRANS: Form legend for removing the favourite status for a favourite notice.
-#. TRANS: Title for button text for removing the favourite status for a favourite notice.
 msgid "Disfavor this notice"
 msgstr "Poista tämä päivitys suosikeista"
 
 #. TRANS: Button text for removing the favourite status for a favourite notice.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Disfavor favorite"
 msgstr "Poista suosikeista"
 
+#. TRANS: Button title for removing the favourite status for a favourite notice.
+#, fuzzy
+msgid "Remove this notice from your list of favorite notices."
+msgstr "Ei saatu haettua suosikkipäivityksiä."
+
 #. TRANS: Form legend for adding the favourite status to a notice.
-#. TRANS: Title for button text for adding the favourite status to a notice.
 msgid "Favor this notice"
 msgstr "Merkitse päivitys suosikkeihin"
 
 #. TRANS: Button text for adding the favourite status to a notice.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Favor"
 msgstr "Lisää suosikiksi"
 
+#. TRANS: Button title for adding the favourite status to a notice.
+#, fuzzy
+msgid "Add this notice to your list of favorite notices."
+msgstr "Ei saatu haettua suosikkipäivityksiä."
+
 #. TRANS: Feed type name.
 msgid "RSS 1.0"
 msgstr "RSS 1.0"
@@ -8411,6 +7833,10 @@ msgstr "Atom"
 msgid "FOAF"
 msgstr "FOAF"
 
+#. TRANS: Feed type name. See http://activitystrea.ms/
+msgid "Activity Streams"
+msgstr ""
+
 #. TRANS: Client exception thrown when an imported feed does not have an author.
 msgid "No author in the feed."
 msgstr ""
@@ -8444,6 +7870,29 @@ msgstr "Valitse tagi lyhentääksesi listaa"
 msgid "Grant this user the \"%s\" role"
 msgstr ""
 
+#. TRANS: Header for mini list of group members on a group page (h2).
+msgid "Members"
+msgstr "Jäsenet"
+
+#. TRANS: Link to all group members from mini list of group members if group has more than n members.
+msgid "All members"
+msgstr "Kaikki jäsenet"
+
+#. TRANS: Header for mini list of users with a pending membership request on a group page (h2).
+msgid "Pending"
+msgstr ""
+
+#. TRANS: Header for mini list of users that are blocked in a group page (h2).
+#, fuzzy
+msgid "Blocked"
+msgstr "Estä"
+
+#. TRANS: Title for list of group administrators on a group page.
+#, fuzzy
+msgctxt "TITLE"
+msgid "Admins"
+msgstr "Ylläpitäjät"
+
 #. TRANS: Button text for the form that will block a user from a group.
 msgctxt "BUTTON"
 msgid "Block"
@@ -8451,8 +7900,8 @@ msgstr "Estä"
 
 #. TRANS: Submit button title.
 msgctxt "TOOLTIP"
-msgid "Block this user"
-msgstr "Estä tämä käyttäjä"
+msgid "Block this user so that they can no longer post messages to it."
+msgstr ""
 
 #. TRANS: Field title on group edit form.
 #, fuzzy
@@ -8507,76 +7956,16 @@ msgctxt "GROUPADMIN"
 msgid "Admin"
 msgstr "Ylläpito"
 
-#. TRANS: Menu item in the group navigation page.
-msgctxt "MENU"
-msgid "Group"
-msgstr ""
-
-#. TRANS: Tooltip for menu item in the group navigation page.
-#. TRANS: %s is the nickname of the group.
-#, php-format
-msgctxt "TOOLTIP"
-msgid "%s group"
-msgstr ""
-
-#. TRANS: Menu item in the group navigation page.
-msgctxt "MENU"
-msgid "Members"
-msgstr ""
-
-#. TRANS: Tooltip for menu item in the group navigation page.
-#. TRANS: %s is the nickname of the group.
-#, php-format
-msgctxt "TOOLTIP"
-msgid "%s group members"
-msgstr ""
-
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: %d is the number of pending members.
-#, php-format
-msgctxt "MENU"
-msgid "Pending members (%d)"
-msgid_plural "Pending members (%d)"
-msgstr[0] ""
-msgstr[1] ""
-
-#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: %s is the nickname of the group.
-#, fuzzy, php-format
-msgctxt "TOOLTIP"
-msgid "%s pending members"
-msgstr "Ryhmän %s jäsenet"
-
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-msgctxt "MENU"
-msgid "Blocked"
-msgstr ""
-
-#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: %s is the nickname of the group.
-#, php-format
-msgctxt "TOOLTIP"
-msgid "%s blocked users"
-msgstr ""
-
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: Menu item in primary navigation panel.
-#, fuzzy
-msgctxt "MENU"
-msgid "Admin"
-msgstr "Ylläpito"
+#. TRANS: Group actions header (h2). Text hidden by default.
+msgid "Group actions"
+msgstr "Ryhmän toiminnot"
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Edit %s group properties"
-msgstr ""
-
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-msgctxt "MENU"
-msgid "Logo"
-msgstr ""
+msgstr "Muokkaa ryhmän %s ominaisuuksia"
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
@@ -8585,32 +7974,33 @@ msgctxt "TOOLTIP"
 msgid "Add or edit %s logo"
 msgstr ""
 
-#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: %s is the nickname of the group.
-#, php-format
-msgctxt "TOOLTIP"
-msgid "Add or edit %s design"
+#. TRANS: Link text for link on user profile.
+msgctxt "MENU"
+msgid "Logo"
 msgstr ""
 
-#. TRANS: Group actions header (h2). Text hidden by default.
-msgid "Group actions"
-msgstr "Ryhmän toiminnot"
-
 #. TRANS: Title for groups with the most members section.
-#, fuzzy
 msgid "Popular groups"
-msgstr "Suosituimmat päivitykset"
+msgstr "Suositut ryhmät"
 
 #. TRANS: Title for groups with the most posts section.
-#, fuzzy
 msgid "Active groups"
-msgstr "Kaikki ryhmät"
+msgstr "Aktiiviset ryhmät"
 
-#. TRANS: Title for group tag cloud section.
-#. TRANS: %s is a group name.
-#, php-format
-msgid "Tags in %s group's notices"
-msgstr "Tagit ryhmän %s päivityksissä"
+#. TRANS: Link description for seeing all groups.
+#. TRANS: Link description for seeing all lists.
+#, fuzzy
+msgid "See all"
+msgstr "Näytä kaikki"
+
+#. TRANS: Link title for seeing all groups.
+msgid "See all groups you belong to."
+msgstr ""
+
+#. TRANS: Menu item title in personal group navigation menu.
+#. TRANS: %s is a username.
+msgid "Back to top"
+msgstr ""
 
 #. TRANS: Client exception 406
 msgid "This page is not available in a media type you accept"
@@ -8695,24 +8085,60 @@ msgctxt "TITLE"
 msgid "Trends"
 msgstr ""
 
-#. TRANS: Button text for inviting more users to the StatusNet instance.
+#. TRANS: Default button text for inviting more users to the StatusNet instance.
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Invite more colleagues"
 msgstr "Kutsu uusia käyttäjiä"
 
-#. TRANS: Button text for joining a group.
+#. TRANS: Form legend.
 #, fuzzy
+msgid "Invite collegues"
+msgstr "Kutsu uusia käyttäjiä"
+
+#. TRANS: Field label for a list of e-mail addresses.
+msgid "Email addresses"
+msgstr "Sähköpostiosoitteet"
+
+#. TRANS: Field title for a list of e-mail addresses.
+#, fuzzy
+msgid "Addresses of friends to invite (one per line)."
+msgstr "Kutsuttavien kavereiden osoitteet (yksi per rivi)"
+
+#. TRANS: Field label for a personal message to send to invitees.
+msgid "Personal message"
+msgstr "Henkilökohtainen viesti"
+
+#. TRANS: Field title for a personal message to send to invitees.
+msgid "Optionally add a personal message to the invitation."
+msgstr "Voit myös lisätä oman viestisi kutsuun"
+
+#. TRANS: Send button for inviting friends
+#. TRANS: Button text for sending notice.
+msgctxt "BUTTON"
+msgid "Send"
+msgstr "Lähetä"
+
+#. TRANS: Submit button title.
+#, fuzzy
+msgid "Send invitations."
+msgstr "Kutsu(t) lähetettiin"
+
+#. TRANS: Button text for joining a group.
 msgctxt "BUTTON"
 msgid "Join"
 msgstr "Liity"
 
 #. TRANS: Button text on form to leave a group.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Leave"
 msgstr "Eroa"
 
+#. TRANS: Link title for seeing all lists.
+#, fuzzy
+msgid "See all lists you have created."
+msgstr "Rekisteröimäsi sovellukset"
+
 #. TRANS: Menu item for logging in to the StatusNet site.
 #. TRANS: Menu item in primary navigation panel.
 #, fuzzy
@@ -8725,7 +8151,6 @@ msgid "Login with a username and password"
 msgstr "Kirjaudu sisään käyttäjätunnuksella ja salasanalla"
 
 #. TRANS: Menu item for registering with the StatusNet site.
-#, fuzzy
 msgctxt "MENU"
 msgid "Register"
 msgstr "Rekisteröidy"
@@ -8761,8 +8186,8 @@ msgstr ""
 #. TRANS: %1$s is the subscribing user's nickname, %2$s is the StatusNet sitename.
 #. TRANS: Main body of new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscriber's long name, %2$s is the StatusNet sitename.
-#, php-format
-msgid "%1$s is now listening to your notices on %2$s."
+#, fuzzy, php-format
+msgid "%1$s is now following you on %2$s."
 msgstr "%1$s seuraa nyt päivityksiäsi palvelussa %2$s."
 
 #. TRANS: Subject of pending new-subscriber notification e-mail.
@@ -8953,7 +8378,7 @@ msgstr ""
 #. TRANS: Body of @-reply notification e-mail.
 #. TRANS: %1$s is the sending user's name, $2$s is the StatusNet sitename,
 #. TRANS: %3$s is a URL to the notice, %4$s is the notice text,
-#. TRANS: %5$s is a URL to the full conversion if it exists (otherwise empty),
+#. TRANS: %5$s is the text "The full conversation can be read here:" and a URL to the full conversion if it exists (otherwise empty),
 #. TRANS: %6$s is a URL to reply to the notice, %7$s is a URL to all @-replies for the addressed user,
 #, php-format
 msgid ""
@@ -8978,6 +8403,10 @@ msgstr ""
 
 #. TRANS: Subject of group join notification e-mail.
 #. TRANS: %1$s is the joining user's nickname, %2$s is the group name, and %3$s is the StatusNet sitename.
+#, fuzzy, php-format
+msgid "%1$s has joined your group %2$s on %3$s"
+msgstr "%s liittyi ryhmään %s"
+
 #. TRANS: Main body of group join notification e-mail.
 #. TRANS: %1$s is the subscriber's long name, %2$s is the group name, and %3$s is the StatusNet sitename,
 #. TRANS: %4$s is a block of profile info about the subscriber.
@@ -9012,7 +8441,6 @@ msgid ""
 msgstr ""
 
 #. TRANS: Menu item in mailbox menu. Leads to incoming private messages.
-#, fuzzy
 msgctxt "MENU"
 msgid "Inbox"
 msgstr "Saapuneet"
@@ -9065,8 +8493,9 @@ msgid "Make Admin"
 msgstr "Tee ylläpitäjäksi"
 
 #. TRANS: Submit button title.
+#, fuzzy
 msgctxt "TOOLTIP"
-msgid "Make this user an admin"
+msgid "Make this user an admin."
 msgstr "Tee tästä käyttäjästä ylläpitäjä"
 
 #. TRANS: Client exception thrown when a database error was thrown during a file upload operation.
@@ -9109,11 +8538,10 @@ msgstr "Lähetä suora viesti"
 #. TRANS: Label entry in drop-down selection box in direct-message inbox/outbox.
 #. TRANS: This is the default entry in the drop-down box, doubling as instructions
 #. TRANS: and a brake against accidental submissions with the first user in the list.
-#, fuzzy
 msgid "Select recipient:"
-msgstr "Valitse operaattori"
+msgstr "Valitse vastaanottaja:"
 
-#. TRANS Entry in drop-down selection box in direct-message inbox/outbox when no one is available to message.
+#. TRANS: Entry in drop-down selection box in direct-message inbox/outbox when no one is available to message.
 #, fuzzy
 msgid "No mutual subscribers."
 msgstr "Ei ole tilattu!."
@@ -9186,6 +8614,10 @@ msgstr ""
 msgid "You must implement either adaptNoticeListItem() or showNotice()."
 msgstr ""
 
+#. TRANS: Link description to show more items in a list.
+msgid "More â–¼"
+msgstr ""
+
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 msgid "Nickname cannot be empty."
 msgstr ""
@@ -9208,7 +8640,7 @@ msgstr "Mitä teet juuri nyt, %s?"
 
 #. TRANS: Input label in notice form for adding an attachment.
 msgid "Attach"
-msgstr ""
+msgstr "Liitä"
 
 #. TRANS: Title for input field to attach a file to a notice.
 msgid "Attach a file."
@@ -9235,10 +8667,6 @@ msgctxt "SEPARATOR"
 msgid ", "
 msgstr ""
 
-#. TRANS: Start of profile addressees list.
-msgid " â–¸ "
-msgstr ""
-
 #. TRANS: Used in coordinates as abbreviation of north.
 #, fuzzy
 msgid "N"
@@ -9280,7 +8708,8 @@ msgid "Repeated by"
 msgstr "Luotu"
 
 #. TRANS: Link title in notice list item to reply to a notice.
-msgid "Reply to this notice"
+#, fuzzy
+msgid "Reply to this notice."
 msgstr "Vastaa tähän päivitykseen"
 
 #. TRANS: Link text in notice list item to reply to a notice.
@@ -9288,8 +8717,9 @@ msgid "Reply"
 msgstr "Vastaus"
 
 #. TRANS: Link title in notice list item to delete a notice.
-msgid "Delete this notice"
-msgstr "Poista tämä päivitys"
+#, fuzzy
+msgid "Delete this notice from the timeline."
+msgstr "Poista tämä päivitys."
 
 #. TRANS: Title for repeat form status in notice list when a notice has been repeated.
 #, fuzzy
@@ -9315,27 +8745,6 @@ msgstr "Tönäise"
 msgid "Send a nudge to this user."
 msgstr "Lähetä tönäisy tälle käyttäjälle"
 
-#. TRANS: Exception thrown when creating a new profile fails in OAuth store.
-msgid "Error inserting new profile."
-msgstr ""
-
-#. TRANS: Exception thrown when creating a new avatar fails in OAuth store.
-msgid "Error inserting avatar."
-msgstr ""
-
-#. TRANS: Exception thrown when creating a remote profile fails in OAuth store.
-msgid "Error inserting remote profile."
-msgstr ""
-
-#. TRANS: Exception thrown when a notice is denied because it has been sent before.
-msgid "Duplicate notice."
-msgstr ""
-
-#. TRANS: Exception thrown when creating a new subscription fails in OAuth store.
-#, fuzzy
-msgid "Could not insert new subscription."
-msgstr "Ei voitu lisätä uutta tilausta."
-
 #. TRANS: Server exception thrown in oEmbed action if no API endpoint is available.
 #, fuzzy
 msgid "No oEmbed API endpoint available."
@@ -9374,166 +8783,148 @@ msgstr "Poista tämä käyttäjä."
 
 #. TRANS: Header in list edit form.
 msgid "Add or remove people"
-msgstr ""
+msgstr "Lisää tai poista käyttäjiä"
 
 #. TRANS: Header in list edit form.
-#, fuzzy
 msgctxt "HEADER"
 msgid "Search"
 msgstr "Haku"
 
 #. TRANS: Menu item in list navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "List"
-msgstr "Linkit"
+msgstr "Lista"
 
 #. TRANS: Menu item title in list navigation panel.
 #. TRANS: %1$s is a list, %2$s is a nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s list by %2$s."
-msgstr "%1$s (%2$s)"
+msgstr "Käyttäjän %2$s lista %1$s."
 
 #. TRANS: Menu item in list navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Listed"
-msgstr "Lisenssi"
+msgstr "Listatut"
 
 #. TRANS: Menu item in list navigation panel.
 #. TRANS: Menu item in local navigation menu.
-#, fuzzy
 msgctxt "MENU"
 msgid "Subscribers"
 msgstr "Tilaajat"
 
 #. TRANS: Menu item title in list navigation panel.
 #. TRANS: %1$s is a list, %2$s is a nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "Subscribers to %1$s list by %2$s."
-msgstr "Viesti käyttäjälle %1$s, %2$s"
+msgstr "Käyttäjän %2$s listan %1$s tilaajat."
 
 #. TRANS: Menu item in list navigation panel.
 msgctxt "MENU"
 msgid "Edit"
-msgstr ""
+msgstr "Muokkaa"
 
 #. TRANS: Menu item title in list navigation panel.
 #. TRANS: %s is a list.
-#, fuzzy, php-format
+#, php-format
 msgid "Edit %s list by you."
-msgstr "Muokkaa ryhmää %s"
-
-#. TRANS: Link description for link to list of users tagged with a tag.
-#, fuzzy
-msgid "Tagged"
-msgstr "Tagi"
+msgstr "Muokkaa omaa listaa %s."
 
 #. TRANS: Title for link to edit list settings.
-#, fuzzy
 msgid "Edit list settings."
-msgstr "Profiiliasetukset"
+msgstr "Muokkaa listan asetuksia."
 
 #. TRANS: Text for link to edit list settings.
 msgid "Edit"
-msgstr ""
+msgstr "Muokkaa"
 
 #. TRANS: Privacy mode text in list list item for private list.
-#, fuzzy
 msgctxt "MODE"
 msgid "Private"
-msgstr "Yksityisyys"
+msgstr "Yksityinen"
 
 #. TRANS: Menu item in the group navigation page.
-#, fuzzy
 msgctxt "MENU"
 msgid "List Subscriptions"
-msgstr "Tilaukset"
+msgstr "Listan tilaukset"
 
 #. TRANS: Tooltip for menu item in the group navigation page.
 #. TRANS: %s is a user nickname.
-#, fuzzy, php-format
+#, php-format
 msgctxt "TOOLTIP"
 msgid "Lists subscribed to by %s."
-msgstr "Ihmiset jotka ovat käyttäjän %s tilaajia"
+msgstr "Käyttäjän %s tilaamat listat."
 
 #. TRANS: Menu item in the group navigation page.
 #. TRANS: %s is a user nickname.
-#, fuzzy, php-format
+#, php-format
 msgctxt "MENU"
 msgid "Lists with %s"
-msgstr "Käyttäjän %1$s päivitykset palvelussa %2$s!"
+msgstr "Listat joilla esiintyy käyttäjä %s"
 
 #. TRANS: Tooltip for menu item in the group navigation page.
 #. TRANS: %s is a user nickname.
-#, fuzzy, php-format
+#, php-format
 msgctxt "TOOLTIP"
 msgid "Lists with %s."
-msgstr "Käyttäjän %1$s päivitykset palvelussa %2$s!"
+msgstr "Listat joilla esiintyy käyttäjä %s."
 
 #. TRANS: Menu item in the group navigation page.
 #. TRANS: %s is a user nickname.
 #, php-format
 msgctxt "MENU"
 msgid "Lists by %s"
-msgstr ""
+msgstr "Käyttäjän %s luomat listat"
 
 #. TRANS: Tooltip for menu item in the group navigation page.
 #. TRANS: %s is a user nickname.
-#, fuzzy, php-format
+#, php-format
 msgctxt "TOOLTIP"
 msgid "Lists by %s."
-msgstr "%1$s (%2$s)"
+msgstr "Käyttäjän %s listat."
 
 #. TRANS: Label in lists widget.
-#, fuzzy
 msgctxt "LABEL"
 msgid "Your lists"
-msgstr "Suosituimmat päivitykset"
+msgstr "Omat listat"
 
 #. TRANS: Fieldset legend in lists widget.
-#, fuzzy
 msgctxt "LEGEND"
 msgid "Edit lists"
-msgstr "Tuo ei ole kelvollinen sähköpostiosoite."
+msgstr "Muokkaa listoja"
 
 #. TRANS: Label in self tags widget.
-#, fuzzy
 msgctxt "LABEL"
 msgid "Tags"
 msgstr "Tagit"
 
 #. TRANS: Title for section contaning lists with the most subscribers.
-#, fuzzy
 msgid "Popular lists"
-msgstr "Suosituimmat päivitykset"
+msgstr "Suosituimmat listat"
 
 #. TRANS: List summary. %1$d is the number of users in the list,
 #. TRANS: %2$d is the number of subscribers to the list.
-#, fuzzy, php-format
+#, php-format
 msgid "Listed: %1$d Subscribers: %2$d"
-msgstr "Käyttäjän %s tilaajat"
+msgstr "Listalla: %1$d Tilaajia: %2$d"
 
 #. TRANS: Title for page that displays which lists current user is part of.
-#, fuzzy, php-format
+#, php-format
 msgid "Lists with you"
-msgstr "API-metodia ei löytynyt."
+msgstr "Listat joilla esiinnyt"
 
 #. TRANS: Title for page that displays which lists a user is part of.
 #. TRANS: %s is a profile name.
-#, fuzzy, php-format
+#, php-format
 msgid "Lists with %s"
-msgstr "Käyttäjän %1$s päivitykset palvelussa %2$s!"
+msgstr "Listat joilla %s esiintyy"
 
 #. TRANS: Title for page that displays lists a user has subscribed to.
-#, fuzzy
 msgid "List subscriptions"
-msgstr "Käyttäjän %s tilaukset"
+msgstr "Listojen tilaukset"
 
 #. TRANS: Menu item in personal group navigation menu.
 #. TRANS: Menu item in settings navigation panel.
 #. TRANS: Menu item in local navigation menu.
-#, fuzzy
 msgctxt "MENU"
 msgid "Profile"
 msgstr "Profiili"
@@ -9543,67 +8934,68 @@ msgid "Your profile"
 msgstr "Sinun profiilisi"
 
 #. TRANS: Menu item in personal group navigation menu.
-#, fuzzy
 msgctxt "MENU"
 msgid "Replies"
 msgstr "Vastaukset"
 
 #. TRANS: Menu item in personal group navigation menu.
-#, fuzzy
 msgctxt "MENU"
 msgid "Favorites"
 msgstr "Suosikit"
 
 #. TRANS: Replaces %s in '%s\'s favorite notices'. (Yes, we know we need to fix this.)
-#, fuzzy
 msgctxt "FIXME"
 msgid "User"
 msgstr "Käyttäjä"
 
 #. TRANS: Menu item in personal group navigation menu.
-#, fuzzy
 msgctxt "MENU"
 msgid "Messages"
-msgstr "Viesti"
+msgstr "Viestit"
 
 #. TRANS: Menu item title in personal group navigation menu.
 msgid "Your incoming messages"
 msgstr "Sinulle saapuneet viestit"
 
 #. TRANS: Displayed as version information for a plugin if no version information was found.
-#, fuzzy
 msgid "Unknown"
-msgstr "Tuntematon toiminto"
+msgstr "Tuntematon"
 
 #. TRANS: Plugin admin panel controls
 msgctxt "plugin"
 msgid "Disable"
-msgstr ""
+msgstr "Poista käytöstä"
 
 #. TRANS: Plugin admin panel controls
 msgctxt "plugin"
 msgid "Enable"
-msgstr ""
+msgstr "Ota käyttöön"
 
+#. TRANS: Plugin description for a disabled plugin.
+#, fuzzy
 msgctxt "plugin-description"
-msgid "(Plugin descriptions unavailable when disabled.)"
-msgstr ""
+msgid ""
+"(The plugin description is unavailable when a plugin has been disabled.)"
+msgstr "(Liitännäinen ei ole käytössä.)"
+
+#. TRANS: Menu item in primary navigation panel.
+msgctxt "MENU"
+msgid "Settings"
+msgstr "Asetukset"
+
+#. TRANS: Menu item title in primary navigation panel.
+msgid "Change your personal settings."
+msgstr "Muuta henkilökohtaisia asetuksia."
 
 #. TRANS: Menu item in primary navigation panel.
 #, fuzzy
 msgctxt "MENU"
-msgid "Settings"
-msgstr "Profiilikuva-asetukset"
+msgid "Admin"
+msgstr "Ylläpito"
 
 #. TRANS: Menu item title in primary navigation panel.
-#, fuzzy
-msgid "Change your personal settings."
-msgstr "Vaihda profiiliasetuksesi"
-
-#. TRANS: Menu item title in primary navigation panel.
-#, fuzzy
 msgid "Site configuration."
-msgstr "SMS vahvistus"
+msgstr "Sivuston asetukset."
 
 #. TRANS: Menu item in primary navigation panel.
 msgctxt "MENU"
@@ -9611,35 +9003,27 @@ msgid "Logout"
 msgstr "Kirjaudu ulos"
 
 #. TRANS: Menu item title in primary navigation panel.
-#, fuzzy
 msgid "Logout from the site."
-msgstr "Kirjaudu sisään"
+msgstr "Kirjaudu ulos sivustolta."
 
 #. TRANS: Menu item title in primary navigation panel.
-#, fuzzy
 msgid "Login to the site."
-msgstr "Kirjaudu sisään"
+msgstr "Kirjaudu sisään sivustolle."
 
-#. TRANS: Menu item in primary navigation panel.
-#, fuzzy
-msgctxt "MENU"
-msgid "Search"
-msgstr "Haku"
-
-#. TRANS: Menu item title in primary navigation panel.
-#, fuzzy
-msgid "Search the site."
-msgstr "Haku"
+msgid "This profile has been silenced by site moderators"
+msgstr ""
 
 #. TRANS: H2 text for user subscription statistics.
-#, fuzzy
 msgid "Following"
-msgstr "Salli"
+msgstr "Seuratut"
 
 #. TRANS: H2 text for user subscriber statistics.
-#, fuzzy
 msgid "Followers"
-msgstr "Salli"
+msgstr "Seuraajat"
+
+#. TRANS: H2 text for user statistics.
+msgid "Statistics"
+msgstr "Tilastot"
 
 #. TRANS: Label for user statistics.
 #, fuzzy
@@ -9650,10 +9034,6 @@ msgstr "Käyttäjä"
 msgid "Member since"
 msgstr "Käyttäjänä alkaen"
 
-#. TRANS: Label for user statistics.
-msgid "Notices"
-msgstr "Päivitykset"
-
 #. TRANS: Label for user statistics.
 #. TRANS: Average count of posts made per day since account registration.
 msgid "Daily average"
@@ -9750,6 +9130,7 @@ msgid "Keyword(s)"
 msgstr ""
 
 #. TRANS: Button text for searching site.
+#. TRANS: Button text for search button on search form.
 #. TRANS: Button text to search profiles.
 msgctxt "BUTTON"
 msgid "Search"
@@ -9800,23 +9181,6 @@ msgstr "Hae päivityksien sisällöstä"
 msgid "Find groups on this site"
 msgstr "Etsi ryhmiä tästä palvelusta"
 
-#. TRANS: Secondary navigation menu item leading to help on StatusNet.
-msgctxt "MENU"
-msgid "Help"
-msgstr "Ohje"
-
-#. TRANS: Secondary navigation menu item leading to text about StatusNet site.
-#, fuzzy
-msgctxt "MENU"
-msgid "About"
-msgstr "Tietoa"
-
-#. TRANS: Secondary navigation menu item leading to Frequently Asked Questions.
-#, fuzzy
-msgctxt "MENU"
-msgid "FAQ"
-msgstr "UKK"
-
 #. TRANS: Secondary navigation menu item leading to Terms of Service.
 msgctxt "MENU"
 msgid "TOS"
@@ -9840,19 +9204,6 @@ msgctxt "MENU"
 msgid "Version"
 msgstr "Omat"
 
-#. TRANS: Secondary navigation menu item leading to e-mail contact information on the
-#. TRANS: StatusNet site, where to report bugs, ...
-#, fuzzy
-msgctxt "MENU"
-msgid "Contact"
-msgstr "Ota yhteyttä"
-
-#. TRANS: Secondary navigation menu item. Leads to information about embedding a timeline widget.
-#, fuzzy
-msgctxt "MENU"
-msgid "Badge"
-msgstr "Tönäise"
-
 #. TRANS: Default title for section/sidebar widget.
 msgid "Untitled section"
 msgstr "Nimetön osa"
@@ -9882,7 +9233,6 @@ msgid "Upload an avatar"
 msgstr "Lataa kuva"
 
 #. TRANS: Menu item in settings navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Password"
 msgstr "Salasana"
@@ -9901,11 +9251,6 @@ msgstr "Sähköposti"
 msgid "Change email handling"
 msgstr "Muuta sähköpostin käsittelyasetuksia."
 
-#. TRANS: Menu item title in settings navigation panel.
-#, fuzzy
-msgid "Design your profile"
-msgstr "Käyttäjän profiili"
-
 #. TRANS: Menu item in settings navigation panel.
 #, fuzzy
 msgctxt "MENU"
@@ -9927,7 +9272,6 @@ msgid "Updates by instant messenger (IM)"
 msgstr "Päivitykset pikaviestintä käyttäen (IM)"
 
 #. TRANS: Menu item in settings navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "SMS"
 msgstr "SMS"
@@ -9946,16 +9290,61 @@ msgstr "Yhdistä"
 msgid "Authorized connected applications"
 msgstr ""
 
+#. TRANS: Menu item in settings navigation panel.
+msgctxt "MENU"
+msgid "Old school"
+msgstr ""
+
+#. TRANS: Menu item title in settings navigation panel.
+msgid "UI tweaks for old-school users"
+msgstr ""
+
 #. TRANS: Title of form to silence a user.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Silence"
-msgstr "Palvelun ilmoitus"
+msgstr "Hiljennä"
 
 #. TRANS: Description of form to silence a user.
-#, fuzzy
 msgid "Silence this user"
-msgstr "Estä tämä käyttäjä"
+msgstr "Hiljennä tämä käyttäjä"
+
+#. TRANS: Server error displayed when trying to create an anynymous OAuth consumer.
+#, fuzzy
+msgid "Could not create anonymous consumer."
+msgstr "Ei voitu lisätä aliasta."
+
+#. TRANS: Server error displayed when trying to create an anynymous OAuth application.
+#, fuzzy
+msgid "Could not create anonymous OAuth application."
+msgstr "Ei voitu lisätä aliasta."
+
+#. TRANS: Exception thrown when no token association could be found.
+msgid ""
+"Could not find a profile and application associated with the request token."
+msgstr ""
+
+#. TRANS: Exception thrown when no access token can be issued.
+#, fuzzy
+msgid "Could not issue access token."
+msgstr "Viestin tallennus ei onnistunut."
+
+#. TRANS: Exception thrown when a database error occurs.
+#, fuzzy
+msgid "Database error inserting OAuth application user."
+msgstr "Tietokantavirhe tallennettaessa risutagiä: %s"
+
+#. TRANS: Exception thrown when a database error occurs.
+#, fuzzy
+msgid "Database error updating OAuth application user."
+msgstr "Tietokantavirhe tallennettaessa risutagiä: %s"
+
+#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
+msgid "Tried to revoke unknown token."
+msgstr ""
+
+#. TRANS: Exception thrown when an attempt is made to remove a revoked token.
+msgid "Failed to delete revoked token."
+msgstr ""
 
 #. TRANS: Menu item in local navigation menu.
 #, fuzzy
@@ -10015,6 +9404,17 @@ msgstr "Kutsu kavereita ja työkavereita liittymään palveluun %s"
 msgid "Subscribe to this user"
 msgstr "Tilaa tämä käyttäjä"
 
+#. TRANS: Button text to subscribe to a user.
+#. TRANS: Button text for subscribing to a list.
+msgctxt "BUTTON"
+msgid "Subscribe"
+msgstr "Tilaa"
+
+#. TRANS: Button title to subscribe to a user.
+#, fuzzy
+msgid "Subscribe to this user."
+msgstr "Tilaa tämä käyttäjä"
+
 #. TRANS: Title of personal tag cloud section.
 msgid "People Tagcloud as self-tagged"
 msgstr ""
@@ -10030,9 +9430,8 @@ msgid "None"
 msgstr "Ei mitään"
 
 #. TRANS: Server exception displayed if a theme name was invalid.
-#, fuzzy
 msgid "Invalid theme name."
-msgstr "Koko ei kelpaa."
+msgstr "Teeman nimi ei kelpaa."
 
 #. TRANS: Exception thrown when a compressed theme is uploaded while no support present in PHP configuration.
 msgid "This server cannot handle theme uploads without ZIP support."
@@ -10138,16 +9537,26 @@ msgstr[1] ""
 #. TRANS: List message for notice repeated by logged in user.
 #, fuzzy
 msgctxt "REPEATLIST"
-msgid "You have repeated this notice."
+msgid "You repeated this."
 msgstr "Sinä kuulut jo tähän ryhmään."
 
-#. TRANS: List message for repeated notices.
-#. TRANS: %d is the number of users that have repeated a notice.
+#. TRANS: List message for when more than 4 people repeat something.
+#. TRANS: %%s is a list of users liking a notice, %d is the number over 4 that like the notice.
+#. TRANS: Plural is decided on the total number of users liking the notice (count of %%s + %d).
+#, php-format
+msgid "%%s and %d other repeated this."
+msgid_plural "%%s and %d others repeated this."
+msgstr[0] ""
+msgstr[1] ""
+
+#. TRANS: List message for favoured notices.
+#. TRANS: %%s is a list of users liking a notice.
+#. TRANS: Plural is based on the number of of users that have favoured a notice.
 #, fuzzy, php-format
-msgid "One person has repeated this notice."
-msgid_plural "%d people have repeated this notice."
-msgstr[0] "Tätä päivitystä ei voi poistaa."
-msgstr[1] "Tätä päivitystä ei voi poistaa."
+msgid "%%s repeated this."
+msgid_plural "%%s repeated this."
+msgstr[0] "Toistettu käyttäjälle %s"
+msgstr[1] "Toistettu käyttäjälle %s"
 
 #. TRANS: Form legend.
 #, fuzzy, php-format
@@ -10240,15 +9649,13 @@ msgstr "Poista esto tältä käyttäjältä"
 
 #. TRANS: Title for unsilence form.
 msgid "Unsilence"
-msgstr ""
+msgstr "Poista hiljennys"
 
 #. TRANS: Form description for unsilence form.
-#, fuzzy
 msgid "Unsilence this user"
-msgstr "Poista esto tältä käyttäjältä"
+msgstr "Poista tämän käyttäjän hiljennys"
 
 #. TRANS: Form legend on unsubscribe form.
-#. TRANS: Button title on unsubscribe form.
 msgid "Unsubscribe from this user"
 msgstr "Peruuta tämän käyttäjän tilaus"
 
@@ -10259,6 +9666,11 @@ msgctxt "BUTTON"
 msgid "Unsubscribe"
 msgstr "Peruuta tilaus"
 
+#. TRANS: Button title on unsubscribe form.
+#, fuzzy
+msgid "Unsubscribe from this user."
+msgstr "Peruuta tämän käyttäjän tilaus"
+
 #. TRANS: Exception text shown when no profile can be found for a user.
 #. TRANS: %1$s is a user nickname, $2$d is a user ID (number).
 #, fuzzy, php-format
@@ -10341,9 +9753,3 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
-
-#~ msgid "%1$s and friends, page %2$d"
-#~ msgstr "%1$s ja kaverit, sivu %2$d"
-
-#~ msgid "You and friends"
-#~ msgstr "Sinä ja kaverisi"
diff --git a/locale/fr/LC_MESSAGES/statusnet.po b/locale/fr/LC_MESSAGES/statusnet.po
index 244c46fe4c..7d0b9868ce 100644
--- a/locale/fr/LC_MESSAGES/statusnet.po
+++ b/locale/fr/LC_MESSAGES/statusnet.po
@@ -1,25 +1,33 @@
-# Translation of StatusNet - Core to French (Français)
+# Translation of StatusNet - Core to French (français)
 # Exported from translatewiki.net
 #
+# Author: Balzac 40
 # Author: Brion
 # Author: Brunoperel
 # Author: Crochet.david
+# Author: DavidL
+# Author: Gomoko
 # Author: Hashar
 # Author: IAlex
 # Author: Iketsi
 # Author: Isoph
 # Author: Jean-Frédéric
+# Author: Joshuajohnlee
 # Author: Julien C
 # Author: Lockal
 # Author: McDutchie
 # Author: Netantho
 # Author: Notafish
 # Author: Od1n
+# Author: OngolaBoy
+# Author: Otourly
 # Author: Patcito
 # Author: Peter17
 # Author: Sherbrooke
+# Author: Valeryan 24
 # Author: Verdy p
 # Author: Y-M D
+# Author: Zebulon84
 # --
 # This file is distributed under the same license as the StatusNet package.
 #
@@ -27,17 +35,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:05+0000\n"
-"Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:00+0000\n"
+"Language-Team: French <https://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-POT-Import-Date: 2011-05-05 10:52:40+0000\n"
+"X-POT-Import-Date: 2012-04-22 22:02:21+0000\n"
 
 #. TRANS: Database error message.
 #, php-format
@@ -52,14 +60,6 @@ msgstr ""
 "au courant du problème, mais vous pouvez les contacter à l'adresse %2$s pour "
 "être sûr. Sinon, attendez quelques minutes et essayez à nouveau."
 
-#. TRANS: Error message.
-msgid ""
-"An important error occured, probably related to email setup. Check logfiles "
-"for more info."
-msgstr ""
-"Une erreur importante s'est produite, probablement liées à la configuration "
-"du courriel. Vérifiez les fichiers journaux pour plus d'infos."
-
 #. TRANS: Error message.
 msgid "An error occurred."
 msgstr "Une erreur est survenue"
@@ -120,12 +120,11 @@ msgstr "Désactiver les nouvelles inscriptions."
 msgid "Closed"
 msgstr "Fermé"
 
-#. TRANS: Title for button to save access settings in site admin panel.
-msgid "Save access settings"
+#. TRANS: Button title to save access settings in site admin panel.
+msgid "Save access settings."
 msgstr "Sauvegarder les paramètres d’accès"
 
-#. TRANS: Tooltip for button to save access settings in site admin panel.
-#. TRANS: Button text for saving theme settings.
+#. TRANS: Button text to save access settings in site admin panel.
 #. TRANS: Button label to save e-mail preferences.
 #. TRANS: Button label to save IM preferences.
 #. TRANS: Button text in the license admin panel.
@@ -141,7 +140,6 @@ msgstr "Sauvegarder les paramètres d’accès"
 #. TRANS: Button text for saving "Other settings" in profile.
 #. TRANS: Button text to save user settings in user admin panel.
 #. TRANS: Button label in the "Edit application" form.
-#. TRANS: Button text on profile design page to save settings.
 #. TRANS: Text for save button on group edit form.
 #. TRANS: Button text to save tags for a profile.
 msgctxt "BUTTON"
@@ -174,7 +172,7 @@ msgstr "Non connecté."
 #. TRANS: Client error displayed trying to subscribe to a non-existing profile.
 #. TRANS: Client error displayed trying to perform an action related to a non-existing profile.
 msgid "No such profile."
-msgstr "Profil non-trouvé."
+msgstr "Profil non trouvé."
 
 #. TRANS: Client error displayed trying to reference a non-existing list.
 #. TRANS: Client error displayed when referring to a non-existing list.
@@ -182,11 +180,6 @@ msgstr "Profil non-trouvé."
 msgid "No such list."
 msgstr "Aucune telle liste."
 
-#. TRANS: Client error displayed when trying to add an OMB 0.1 remote profile to a list.
-msgid "You cannot list an OMB 0.1 remote profile with this action."
-msgstr ""
-"Vous ne pouvez pas lister à un profil OMB 0.1 distant avec cette action."
-
 #. TRANS: Client error displayed when an unknown error occurs when adding a user to a list.
 #. TRANS: %s is a username.
 #, php-format
@@ -218,7 +211,6 @@ msgstr "Page non trouvée."
 #. TRANS: Client error when user not found for an rss related action.
 #. TRANS: Client error displayed when no existing user is provided for a user's delivery device setting.
 #. TRANS: Client error displayed if a user could not be found.
-#. TRANS: Client error when user not found updating a profile background image.
 #. TRANS: Client error displayed updating profile image without having a user object.
 #. TRANS: Client error displayed when making an Atom API request for an unknown user.
 #. TRANS: Client error displayed when trying to block a non-existing user or a user from another site.
@@ -244,14 +236,11 @@ msgstr "Page non trouvée."
 #. TRANS: Client error displayed when trying to get the RSS feed with favorites of a user that does not exist.
 #. TRANS: Client error displayed when requesting Friends of a Friend feed without providing a user nickname.
 #. TRANS: Client error displayed when requesting Friends of a Friend feed for an object that is not a user.
-#. TRANS: Client error displayed when trying to get a user hCard for a non-existing user.
 #. TRANS: Client error displayed trying to make a micro summary without providing a valid user.
 #. TRANS: Client error displayed trying to send a direct message to a non-existing user.
 #. TRANS: Client error displayed trying to use "one time password login" without using an existing user.
 #. TRANS: Client error displayed when referring to non-existing user.
 #. TRANS: Client error displayed trying to perform an action related to a non-existing user.
-#. TRANS: Form validation error on page for remote subscribe when no user was provided.
-#. TRANS: Form validation error on page for remote subscribe when no user profile was found.
 #. TRANS: Client error displayed when trying to reply to a non-exsting user.
 #. TRANS: Client error displayed when providing a non-existing nickname in a RSS 1.0 action.
 #. TRANS: Client error.
@@ -260,7 +249,6 @@ msgstr "Page non trouvée."
 #. TRANS: Client error displayed trying to find a user by ID for a non-existing ID.
 #. TRANS: Client error displayed requesting groups for a non-existing user.
 #. TRANS: Client error displayed when user not found for an action.
-#. TRANS: Client error displayed providing a non-existing nickname.
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #. TRANS: Client error displayed when trying to perform a gallery action with an unknown user.
 #. TRANS: Client error displayed when trying to access a mailbox without providing a user.
@@ -269,15 +257,21 @@ msgid "No such user."
 msgstr "Utilisateur non trouvé."
 
 #. TRANS: Title of a user's own start page.
-#, fuzzy
 msgid "Home timeline"
-msgstr "Activité de %s"
+msgstr "Accueil - Fil"
 
 #. TRANS: Title of another user's start page.
 #. TRANS: %s is the other user's name.
-#, fuzzy, php-format
+#, php-format
 msgid "%s's home timeline"
-msgstr "Activité de %s"
+msgstr "Fil d'activité de %s"
+
+#. TRANS: %s is user nickname.
+#. TRANS: Feed title.
+#. TRANS: %s is tagger's nickname.
+#, php-format
+msgid "Feed for friends of %s (Activity Streams JSON)"
+msgstr "Flux des amis de %s (flux d’activité JSON)"
 
 #. TRANS: %s is user nickname.
 #, php-format
@@ -325,7 +319,7 @@ msgstr ""
 "profil ou [poster quelque chose à son intention](%%%%action.newnotice%%%%?"
 "status_textarea=%3$s)."
 
-#. TRANS: Encoutagement displayed on empty timeline user pages for anonymous users.
+#. TRANS: Encouragement displayed on empty timeline user pages for anonymous users.
 #. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
 #. TRANS: Empty list message for page with replies for a user for not logged in users.
 #. TRANS: %1$s is a user nickname. This message contains a Markdown link in the form [link text](link).
@@ -339,6 +333,12 @@ msgstr ""
 "Pourquoi ne pas [créer un compte](%%%%action.register%%%%) et faire ensuite "
 "un clin d’œil à %s ou poster un avis à son intention."
 
+#. TRANS: Button text for inviting more users to the StatusNet instance.
+#. TRANS: Less business/enterprise-oriented language for public sites.
+msgctxt "BUTTON"
+msgid "Send invite"
+msgstr "Envoyer des invitations"
+
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Title of API timeline for a user and friends.
 #. TRANS: %s is a username.
@@ -347,8 +347,6 @@ msgstr ""
 #. TRANS: %s is a username.
 #. TRANS: Menu item title in personal group navigation menu.
 #. TRANS: %s is a username.
-#. TRANS: Menu item title in settings navigation panel.
-#. TRANS: %s is a username.
 #, php-format
 msgid "%s and friends"
 msgstr "%s et ses amis"
@@ -388,7 +386,6 @@ msgstr ""
 #. TRANS: Server error thrown on database error updating SMS preferences.
 #. TRANS: Server error thrown on database error removing a registered SMS phone number.
 #. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
-#. TRANS: Server exception thrown on Profile design page when updating design settings fails.
 msgid "Could not update user."
 msgstr "Impossible de mettre à jour l’utilisateur."
 
@@ -403,7 +400,6 @@ msgstr "Impossible d’enregistrer le profil."
 
 #. TRANS: Client error displayed when the number of bytes in a POST request exceeds a limit.
 #. TRANS: %s is the number of bytes of the CONTENT_LENGTH.
-#. TRANS: Form validation error in design settings form. POST should remain untranslated.
 #, php-format
 msgid ""
 "The server was unable to handle that much POST data (%s byte) due to its "
@@ -418,24 +414,6 @@ msgstr[1] ""
 "Le serveur n’a pas pu gérer autant de données de POST (%s octets) en raison "
 "de sa configuration actuelle."
 
-#. TRANS: Client error displayed when saving design settings fails because of an empty id.
-#. TRANS: Client error displayed when saving design settings fails because of an empty result.
-#. TRANS: Client error displayed when a database error occurs inserting profile colours.
-#. TRANS: Client error displayed when a database error occurs updating profile colours.
-#. TRANS: Form validation error displayed when group design settings could not be saved because of an application issue.
-#. TRANS: Form validation error on Profile design page when saving design settings has failed.
-#. TRANS: Form validation error on Profile design page when updating design settings has failed.
-msgid "Unable to save your design settings."
-msgstr "Échec de la sauvegarde de vos paramètres de conception."
-
-#. TRANS: Error displayed when updating design settings fails.
-#. TRANS: Client error displayed when a database error occurs updating profile colours.
-#. TRANS: Form validation error on Profile design page when updating design settings has failed.
-#. TRANS: Error message displayed if design settings could not be saved.
-#. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
-msgid "Could not update your design."
-msgstr "Impossible de mettre à jour votre conception."
-
 #. TRANS: Title for Atom feed.
 msgctxt "ATOM"
 msgid "Main"
@@ -482,6 +460,20 @@ msgstr "Le blocage de l’utilisateur a échoué."
 msgid "Unblock user failed."
 msgstr "Le déblocage de l’utilisateur a échoué."
 
+#. TRANS: Client exception thrown when no conversation ID is given.
+msgid "No conversation ID."
+msgstr "Pas d'identifiant de conversation."
+
+#. TRANS: Client exception thrown when referring to a non-existing conversation ID (%d).
+#, php-format
+msgid "No conversation with ID %d."
+msgstr "Aucune conversation avec l’ID %d."
+
+#. TRANS: Title for conversion timeline.
+msgctxt "TITLE"
+msgid "Conversation"
+msgstr "Conversation"
+
 #. TRANS: Title. %s is a user nickname.
 #, php-format
 msgid "Direct messages from %s"
@@ -513,8 +505,8 @@ msgstr "Message sans texte !"
 #, php-format
 msgid "That's too long. Maximum message size is %d character."
 msgid_plural "That's too long. Maximum message size is %d characters."
-msgstr[0] "C’est trop long ! La taille du message est limitée à %d caractère"
-msgstr[1] "C’est trop long ! La taille du message est limitée à %d caractères"
+msgstr[0] "C’est trop long ! La taille du message est limitée à %d caractère."
+msgstr[1] "C’est trop long ! La taille du message est limitée à %d caractères."
 
 #. TRANS: Client error displayed if a recipient user could not be found (403).
 msgid "Recipient user not found."
@@ -527,6 +519,8 @@ msgstr ""
 "pas votre ami."
 
 #. TRANS: Client error displayed trying to direct message self (403).
+#. TRANS: Client error displayed trying to send a direct message to self.
+#. TRANS: Error text shown when trying to send a direct message to self.
 msgid ""
 "Do not send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
@@ -757,7 +751,6 @@ msgstr "groupes sur %s"
 
 #. TRANS: Client error displayed when trying to edit a group without being an admin.
 #. TRANS: Client error displayed trying to edit a group while not being a group admin.
-#. TRANS: Client error displayed trying to change group design settings without being a (group) admin.
 #. TRANS: Client error displayed when trying to change group logo settings while not being a group admin.
 msgid "You must be an admin to edit the group."
 msgstr "Vous devez être administrateur pour modifier le groupe."
@@ -872,7 +865,6 @@ msgstr ""
 
 #. TRANS: Client error given on when invalid data was passed through a form in the OAuth API.
 #. TRANS: Unexpected validation error on avatar upload form.
-#. TRANS: Client error displayed when the submitted form contains unexpected data.
 #. TRANS: Client error displayed submitting invalid form data for edit application.
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
 #. TRANS: Form validation error message when an unsupported argument is used.
@@ -881,7 +873,6 @@ msgstr ""
 #. TRANS: Client error when submitting a form with unexpected information.
 #. TRANS: Client error displayed when unexpected data is posted in the password recovery form.
 #. TRANS: Message given submitting a form with an unknown action in SMS settings.
-#. TRANS: Unknown form validation error in design settings form.
 msgid "Unexpected form submission."
 msgstr "Soumission de formulaire inattendue."
 
@@ -928,7 +919,6 @@ msgstr "Compte"
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Field label on account registration page.
-#. TRANS: Label for nickname on user authorisation page.
 #. TRANS: Field label on group edit form.
 #. TRANS: Dropdown option for searching in profiles.
 msgid "Nickname"
@@ -1246,12 +1236,9 @@ msgstr "Vous devez ouvrir une session pour quitter un groupe."
 #. TRANS: Client error displayed when requesting Friends of a Friend feed for a nickname that is not a group.
 #. TRANS: Client error displayed trying to block a user from a group while specifying a non-existing group.
 #. TRANS: Client error displayed referring to a group's permalink for a non-existing group ID.
-#. TRANS: Client error displayed trying to change group design settings while providing a nickname for a non-existing group.
 #. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
 #. TRANS: Client error displayed when trying to view group members for a non-existing group.
 #. TRANS: Client error displayed when trying to view group members for an object that is not a group.
-#. TRANS: Client error displayed when trying to view group members for a non-existing group.
-#. TRANS: Client error displayed when trying to view group members for an object that is not a group.
 #. TRANS: Client error displayed when requesting a group RSS feed for group that does not exist.
 #. TRANS: Client error displayed when requesting a group RSS feed for an object that is not a group.
 #. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
@@ -1260,10 +1247,10 @@ msgstr "Vous devez ouvrir une session pour quitter un groupe."
 #. TRANS: Client error displayed when trying to leave a non-local group.
 #. TRANS: Client error displayed when trying to leave a non-existing group.
 #. TRANS: Client error displayed when providing an invalid group ID on the Make Admin page.
-#. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
-#. TRANS: Client error displayed if no local group with a given name was found requesting group page.
 #. TRANS: Command exception text shown when a group is requested that does not exist.
 #. TRANS: Error text shown when trying to leave a group that does not exist.
+#. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
+#. TRANS: Client error displayed if no local group with a given name was found requesting group page.
 msgid "No such group."
 msgstr "Aucun groupe trouvé."
 
@@ -1334,6 +1321,7 @@ msgid "Join request canceled."
 msgstr "Requête d’adhésion refusée."
 
 #. TRANS: Client error displayed trying to approve subscription for a non-existing request.
+#. TRANS: %s is a user nickname.
 #, php-format
 msgid "%s is not in the moderation queue for your subscriptions."
 msgstr "%s n'est pas dans la file de modération pour vos abonnements."
@@ -1363,25 +1351,22 @@ msgstr "Abonnement annulé."
 
 #. TRANS: Subtitle for Atom favorites feed.
 #. TRANS: %1$s is a user nickname, %2$s is the StatusNet sitename.
-#, fuzzy, php-format
+#, php-format
 msgid "Notices %1$s has favorited on %2$s"
-msgstr "Statuts de %1$s et ses amis dans %2$s!"
+msgstr "Les annonces de %1$s ont été favorisées dans %2$s"
 
 #. TRANS: Client exception thrown when trying to set a favorite for another user.
 #. TRANS: Client exception thrown when trying to subscribe another user.
-#, fuzzy
 msgid "Cannot add someone else's subscription."
-msgstr "Impossible d’insérer un nouvel abonnement."
+msgstr "Impossible d’ajouter un autre abonnement."
 
 #. TRANS: Client exception thrown when trying use an incorrect activity verb for the Atom pub method.
-#, fuzzy
 msgid "Can only handle favorite activities."
-msgstr "Ne peut gérer que les activités de publication."
+msgstr "Peut gérer seulement les activités favorites."
 
 #. TRANS: Client exception thrown when trying favorite an object that is not a notice.
-#, fuzzy
 msgid "Can only fave notices."
-msgstr "Ne peut gérer que les activités de publication."
+msgstr "Seules les annonces peuvent être favorisées."
 
 #. TRANS: Client exception thrown when trying favorite a notice without content.
 msgid "Unknown notice."
@@ -1399,18 +1384,17 @@ msgstr "Groupes de %s"
 
 #. TRANS: Subtitle for group membership feed.
 #. TRANS: %1$s is a username, %2$s is the StatusNet sitename.
-#, fuzzy, php-format
+#, php-format
 msgid "Groups %1$s is a member of on %2$s"
-msgstr "Groupes de %s"
+msgstr "Groupes %1$s est membre sur %2$s"
 
 #. TRANS: Client exception thrown when trying subscribe someone else to a group.
 msgid "Cannot add someone else's membership."
 msgstr "Impossible d'ajouter l'adhésion de quelqu'un d'autre."
 
 #. TRANS: Client error displayed when not using the join verb.
-#, fuzzy
 msgid "Can only handle join activities."
-msgstr "Ne peut gérer que les activités de publication."
+msgstr "Seules les activités de jointure peuvent être gérées."
 
 #. TRANS: Client exception thrown when trying to subscribe to a non-existing group.
 msgid "Unknown group."
@@ -1448,23 +1432,21 @@ msgstr "Aucun ID de profil type: %d."
 
 #. TRANS: Client exception thrown when trying to display a subscription for a non-subscribed profile ID.
 #. TRANS: %1$d is the non-existing subscriber ID number, $2$d is the ID of the profile that was not subscribed to.
-#, fuzzy, php-format
+#, php-format
 msgid "Profile %1$d not subscribed to profile %2$d."
-msgstr "Vous n’êtes pas abonné(e) à ce profil."
+msgstr "Le profil %1$d n’est pas abonné au profil %2$d."
 
 #. TRANS: Client exception thrown when trying to delete a subscription of another user.
-#, fuzzy
 msgid "Cannot delete someone else's subscription."
-msgstr "Impossible de supprimer l’abonnement à soi-même."
+msgstr "Impossible de supprimer l’abonnement de quelqu’un d’autre."
 
 #. TRANS: Subtitle for Atom subscription feed.
 #. TRANS: %1$s is a user nickname, %s$s is the StatusNet sitename.
-#, fuzzy, php-format
+#, php-format
 msgid "People %1$s has subscribed to on %2$s"
-msgstr "Abonnés de %s"
+msgstr "%1$s s'est abonné à %2$s"
 
 #. TRANS: Client error displayed when not using the follow verb.
-#, fuzzy
 msgid "Can only handle Follow activities."
 msgstr "Ne peut gérer que les activités de publication."
 
@@ -1474,15 +1456,15 @@ msgstr "Seules les personnes peuvent être suivies."
 
 #. TRANS: Client exception thrown when subscribing to a non-existing profile.
 #. TRANS: %s is the unknown profile ID.
-#, fuzzy, php-format
+#, php-format
 msgid "Unknown profile %s."
-msgstr "Type de fichier inconnu"
+msgstr "Profil inconnu %s."
 
 #. TRANS: Client error displayed trying to subscribe to an already subscribed profile.
 #. TRANS: %s is the profile the user already has a subscription on.
-#, fuzzy, php-format
+#, php-format
 msgid "Already subscribed to %s."
-msgstr "Déjà abonné !"
+msgstr "Déjà abonné à %s."
 
 #. TRANS: Client error displayed trying to get a non-existing attachment.
 msgid "No such attachment."
@@ -1491,7 +1473,6 @@ msgstr "Pièce jointe non trouvée."
 #. TRANS: Client error displayed trying to get an avatar without providing a nickname.
 #. TRANS: Client error displayed when requesting a list of blocked users for a group without providing a group nickname.
 #. TRANS: Client error displayed trying to edit a group while not proving a nickname for the group to edit.
-#. TRANS: Client error displayed trying to change group design settings without providing a group nickname.
 #. TRANS: Client error displayed when trying to change group logo settings without providing a nickname.
 #. TRANS: Client error displayed when trying to view group members without providing a group nickname.
 #. TRANS: Client error displayed when requesting a group RSS feed without providing a group nickname.
@@ -1564,9 +1545,8 @@ msgid "No file uploaded."
 msgstr "Aucun fichier n’a été téléversé."
 
 #. TRANS: Avatar upload form instruction after uploading a file.
-#, fuzzy
 msgid "Pick a square area of the image to be your avatar."
-msgstr "Sélectionnez une zone de forme carrée pour définir votre avatar"
+msgstr "Sélectionner une zone carrée de l’image pour être votre avatar."
 
 #. TRANS: Server error displayed if an avatar upload went wrong somehow server side.
 #. TRANS: Server error displayed trying to crop an uploaded group logo that is no longer present.
@@ -1591,9 +1571,8 @@ msgid "Backup account"
 msgstr "Sauvegarder le compte"
 
 #. TRANS: Client exception thrown when trying to backup an account while not logged in.
-#, fuzzy
 msgid "Only logged-in users can backup their account."
-msgstr "Seuls  les utilisateurs identifiés peuvent reprendre des avis."
+msgstr "Seuls les utilisateurs enregistrés peuvent sauvegarder leur compte."
 
 #. TRANS: Client exception thrown when trying to backup an account without having backup rights.
 msgid "You may not backup your account."
@@ -1615,10 +1594,9 @@ msgstr ""
 "ne sont pas sauvegardés."
 
 #. TRANS: Submit button to backup an account on the backup account page.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Backup"
-msgstr "Arrière plan"
+msgstr "Sauvegarde"
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
 msgid "Backup your account."
@@ -1766,14 +1744,12 @@ msgstr "Cette adresse a déjà été confirmée."
 
 #. TRANS: Server error displayed when updating IM preferences fails.
 #. TRANS: Server error thrown on database error removing a registered IM address.
-#, fuzzy
 msgid "Could not update user IM preferences."
-msgstr "Impossible de mettre à jour le dossier de l’utilisateur."
+msgstr "Impossible de mettre à jour les préférences de messagerie instantanée."
 
 #. TRANS: Server error displayed when adding IM preferences fails.
-#, fuzzy
 msgid "Could not insert user IM preferences."
-msgstr "Impossible d’insérer un nouvel abonnement."
+msgstr "Impossible d'insérer les préférences IM de l'utilisateur."
 
 #. TRANS: Server error displayed when an address confirmation code deletion from the
 #. TRANS: database fails in the contact address confirmation action.
@@ -1794,17 +1770,25 @@ msgstr "L'adresse \"%s\" a été validée pour votre compte."
 msgid "Conversation"
 msgstr "Conversation"
 
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+msgid "Conversation feed (Activity Streams JSON)"
+msgstr "Flux de conversation (Flux d'activité JSON)"
+
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+msgid "Conversation feed (RSS 2.0)"
+msgstr "Flux de conversation (RSS 2.0)"
+
 #. TRANS: Title for conversation page.
 #. TRANS: Title for page that shows a notice.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Notice"
 msgstr "Avis"
 
 #. TRANS: Client exception displayed trying to delete a user account while not logged in.
-#, fuzzy
 msgid "Only logged-in users can delete their account."
-msgstr "Seuls  les utilisateurs identifiés peuvent reprendre des avis."
+msgstr "Seuls les utilisateurs connectés peuvent supprimer leur compte."
 
 #. TRANS: Client exception displayed trying to delete a user account without have the rights to do that.
 msgid "You cannot delete your account."
@@ -1859,7 +1843,7 @@ msgid "Enter \"%s\" to confirm that you want to delete your account."
 msgstr "Entrez « %s » pour confirmer que vous souhaitez supprimer votre compte."
 
 #. TRANS: Button title for user account deletion.
-msgid "Permanently delete your account"
+msgid "Permanently delete your account."
 msgstr "Supprimer définitivement votre compte"
 
 #. TRANS: Client error displayed trying to delete an application while not logged in.
@@ -2006,151 +1990,6 @@ msgstr "Ne pas supprimer ce groupe"
 msgid "Delete this user."
 msgstr "Supprimer cet utilisateur"
 
-#. TRANS: Message used as title for design settings for the site.
-msgid "Design"
-msgstr "Conception"
-
-#. TRANS: Instructions for design adminsitration panel.
-msgid "Design settings for this StatusNet site"
-msgstr "Paramètres de conception pour ce site StatusNet"
-
-#. TRANS: Client error displayed when a logo URL does is not valid.
-msgid "Invalid logo URL."
-msgstr "URL du logo invalide."
-
-#. TRANS: Client error displayed when an SSL logo URL is invalid.
-msgid "Invalid SSL logo URL."
-msgstr "Adresse URL du logo SSL invalide."
-
-#. TRANS: Client error displayed when a theme is submitted through the form that is not in the theme list.
-#. TRANS: %s is the chosen unavailable theme.
-#, php-format
-msgid "Theme not available: %s."
-msgstr "Le thème n’est pas disponible : %s."
-
-#. TRANS: Fieldset legend for form to change logo.
-msgid "Change logo"
-msgstr "Modifier le logo"
-
-#. TRANS: Field label for StatusNet site logo.
-msgid "Site logo"
-msgstr "Logo du site"
-
-#. TRANS: Field label for SSL StatusNet site logo.
-msgid "SSL logo"
-msgstr "Logo SSL"
-
-#. TRANS: Fieldset legend for form change StatusNet site's theme.
-msgid "Change theme"
-msgstr "Modifier le thème"
-
-#. TRANS: Field label for dropdown to choose site theme.
-msgid "Site theme"
-msgstr "Thème du site"
-
-#. TRANS: Title for field label for dropdown to choose site theme.
-msgid "Theme for the site."
-msgstr "Thème pour le site."
-
-#. TRANS: Field label for uploading a cutom theme.
-msgid "Custom theme"
-msgstr "Thème personnalisé"
-
-#. TRANS: Form instructions for uploading a cutom StatusNet theme.
-msgid "You can upload a custom StatusNet theme as a .ZIP archive."
-msgstr ""
-"Vous pouvez importer un thème StatusNet personnalisé dans une archive .ZIP."
-
-#. TRANS: Fieldset legend for theme background image.
-msgid "Change background image"
-msgstr "Changer l’image d’arrière plan"
-
-#. TRANS: Field label for background image on theme designer page.
-#. TRANS: Field label for background color selector.
-#. TRANS: Label on profile design page for setting a profile page background colour.
-msgid "Background"
-msgstr "Arrière plan"
-
-#. TRANS: Form guide for background image upload form on theme designer page.
-#, php-format
-msgid ""
-"You can upload a background image for the site. The maximum file size is %1"
-"$s."
-msgstr ""
-"Vous pouvez importer une image d’arrière plan pour ce site. La taille "
-"maximale du fichier est de %1$s."
-
-#. TRANS: Used as radio button label to add a background image.
-msgid "On"
-msgstr "Activé"
-
-#. TRANS: Used as radio button label to not add a background image.
-msgid "Off"
-msgstr "Désactivé"
-
-#. TRANS: Form guide for turning background image on or off on theme designer page.
-#. TRANS: Form guide for a set of radio buttons on the profile design page that will enable or disable
-#. TRANS: use of the uploaded profile image.
-msgid "Turn background image on or off."
-msgstr "Activer ou désactiver l’image d’arrière plan."
-
-#. TRANS: Checkbox label to title background image on theme designer page.
-#. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
-msgid "Tile background image"
-msgstr "Répéter l’image d’arrière plan"
-
-#. TRANS: Fieldset legend for theme colors.
-msgid "Change colors"
-msgstr "Modifier les couleurs"
-
-#. TRANS: Field label for content color selector.
-#. TRANS: Label on profile design page for setting a profile page content colour.
-msgid "Content"
-msgstr "Contenu"
-
-#. TRANS: Field label for sidebar color selector.
-#. TRANS: Label on profile design page for setting a profile page sidebar colour.
-msgid "Sidebar"
-msgstr "Barre latérale"
-
-#. TRANS: Field label for text color selector.
-#. TRANS: Label on profile design page for setting a profile page text colour.
-msgid "Text"
-msgstr "Texte"
-
-#. TRANS: Field label for link color selector.
-#. TRANS: Label on profile design page for setting a profile page links colour.
-msgid "Links"
-msgstr "Liens"
-
-#. TRANS: Fieldset legend for advanced theme design settings.
-msgid "Advanced"
-msgstr "Avancé"
-
-#. TRANS: Field label for custom CSS.
-msgid "Custom CSS"
-msgstr "CSS personnalisé"
-
-#. TRANS: Button text for resetting theme settings.
-msgctxt "BUTTON"
-msgid "Use defaults"
-msgstr "Utiliser les valeurs par défaut"
-
-#. TRANS: Title for button for resetting theme settings.
-#. TRANS: Title for button on profile design page to reset all colour settings to default.
-msgid "Restore default designs."
-msgstr "Restaurer les conceptions par défaut."
-
-#. TRANS: Title for button for resetting theme settings.
-#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-msgid "Reset back to default."
-msgstr "Revenir aux valeurs par défaut."
-
-#. TRANS: Title for button for saving theme settings.
-#. TRANS: Title for button on profile design page to save settings.
-msgid "Save design."
-msgstr "Sauvegarder la conception."
-
 #. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
 msgid "This notice is not a favorite!"
 msgstr "Cet avis n’est pas un favori !"
@@ -2161,9 +2000,77 @@ msgstr "Ajouter aux favoris"
 
 #. TRANS: Client exception thrown when requesting a document from the documentation that does not exist.
 #. TRANS: %s is the non-existing document.
-#, fuzzy, php-format
+#, php-format
 msgid "No such document \"%s\"."
-msgstr "Document « %s » non trouvé."
+msgstr "Aucun document de ce type \" %s \"."
+
+#. TRANS: Menu item in administrator navigation panel.
+#. TRANS: Menu item in default local navigation panel.
+#. TRANS: Menu item in personal group navigation menu.
+msgctxt "MENU"
+msgid "Home"
+msgstr "Accueil"
+
+msgctxt "MENU"
+msgid "Docs"
+msgstr "Documentation"
+
+#. TRANS: Secondary navigation menu item leading to help on StatusNet.
+msgctxt "MENU"
+msgid "Help"
+msgstr "Aide"
+
+msgid "Getting started"
+msgstr "Pour commencer"
+
+#. TRANS: Secondary navigation menu item leading to text about StatusNet site.
+msgctxt "MENU"
+msgid "About"
+msgstr "À propos"
+
+msgid "About this site"
+msgstr "À propos de ce site"
+
+#. TRANS: Secondary navigation menu item leading to Frequently Asked Questions.
+msgctxt "MENU"
+msgid "FAQ"
+msgstr "FAQ"
+
+msgid "Frequently asked questions"
+msgstr "Foire aux questions"
+
+#. TRANS: Secondary navigation menu item leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+msgctxt "MENU"
+msgid "Contact"
+msgstr "Contact"
+
+msgid "Contact info"
+msgstr "Infos de contact"
+
+msgctxt "MENU"
+msgid "Tags"
+msgstr "Balises"
+
+msgid "Using tags"
+msgstr "Utiliser des balises"
+
+#. TRANS: Menu item in default local navigation panel.
+#. TRANS: Menu item in search group navigation panel.
+#. TRANS: Menu item in local navigation menu.
+msgctxt "MENU"
+msgid "Groups"
+msgstr "Groupes"
+
+msgid "Using groups"
+msgstr "Utiliser des groupes"
+
+msgctxt "MENU"
+msgid "API"
+msgstr "API"
+
+msgid "RESTful API"
+msgstr "API RESTful"
 
 #. TRANS: Title for "Edit application" form.
 #. TRANS: Form legend.
@@ -2277,58 +2184,57 @@ msgstr "Supprimer la liste %s"
 #. TRANS: %s is a list.
 #. TRANS: Form legend for list edit form.
 #. TRANS: %s is a list.
-#, fuzzy, php-format
+#, php-format
 msgid "Edit list %s"
-msgstr "Cette marque est invalide : %s."
+msgstr "Liste de modification %s"
 
 #. TRANS: Error message displayed when trying to perform an action that requires a tagging user or ID.
-#, fuzzy
 msgid "No tagger or ID."
-msgstr "Aucun pseudo ou ID."
+msgstr "Aucun balisage ou ID."
 
 #. TRANS: Client error displayed when referring to non-local user.
 msgid "Not a local user."
 msgstr "Ceci n’est pas un utilisateur local."
 
 #. TRANS: Client error displayed when reting to edit a tag that was not self-created.
-#, fuzzy
 msgid "You must be the creator of the tag to edit it."
-msgstr "Vous devez être administrateur pour modifier le groupe."
+msgstr "Vous devez être le créateur de la balise pour le modifier."
 
 #. TRANS: Form instruction for edit list form.
-#, fuzzy
 msgid "Use this form to edit the list."
-msgstr "Remplissez ce formulaire pour modifier les options du groupe."
+msgstr "Utilisez ce formulaire pour modifier la liste."
 
 #. TRANS: Form validation error displayed if the form data for deleting a tag was incorrect.
-#, fuzzy
 msgid "Delete aborted."
-msgstr "Supprimer cet avis"
+msgstr "Suppression annulée."
 
 #. TRANS: Text in confirmation dialog for deleting a tag.
 msgid ""
 "Deleting this tag will permanantly remove all its subscription and "
 "membership records. Do you still want to continue?"
 msgstr ""
+"L'effacement de cette marque effacera définitivement toutes ses données "
+"d'abonnement et d’adhésion. Souhaitez-vous vraiment continuer?"
 
 #. TRANS: Form validation error displayed if a given tag is invalid.
-#, fuzzy
 msgid "Invalid tag."
-msgstr "Taille incorrecte."
+msgstr "Balise non valide."
 
 #. TRANS: Form validation error displayed if a given tag is already present.
 #. TRANS: %s is the already present tag.
-#, fuzzy, php-format
+#, php-format
 msgid "You already have a tag named %s."
-msgstr "Vous avez déjà repris cet avis."
+msgstr "Vous avez déjà une balise nommée  %s ."
 
 #. TRANS: Text in confirmation dialog for setting a tag from public to private.
 msgid ""
 "Setting a public tag as private will permanently remove all the existing "
 "subscriptions to it. Do you still want to continue?"
 msgstr ""
+"Définir une étiquette publique comme privée supprimera définitivement tous "
+"les abonnements existants. Voulez-vous toujours continuer ?"
 
-#. TRANS: TRANS: Server error displayed when updating a list fails.
+#. TRANS: Server error displayed when updating a list fails.
 msgid "Could not update list."
 msgstr "Impossible de mettre à jour la liste."
 
@@ -2541,7 +2447,7 @@ msgstr "Cet avis a déjà été ajouté à vos favoris !"
 
 #. TRANS: Page title for page on which favorite notices can be unfavourited.
 msgid "Disfavor favorite."
-msgstr "Retirer ce favori."
+msgstr "Retirer le favori."
 
 #. TRANS: Page title for first page of favorited notices.
 #. TRANS: Title for favourited notices section.
@@ -2612,9 +2518,9 @@ msgid "Featured users, page %d"
 msgstr "Utilisateurs en vedette - page %d"
 
 #. TRANS: Description on page displaying featured users.
-#, fuzzy, php-format
+#, php-format
 msgid "A selection of some great users on %s."
-msgstr "Une sélection d’utilisateurs à ne pas manquer dans %s"
+msgstr "Une sélection d’utilisateurs importants sur %s."
 
 #. TRANS: Client error displayed when no notice ID was given trying do display a file.
 msgid "No notice ID."
@@ -2633,40 +2539,6 @@ msgstr "Aucune pièce jointe."
 msgid "No uploaded attachments."
 msgstr "Aucune pièce jointe importée."
 
-#. TRANS: Client error displayed when subscribing to a remote profile and an unexpected response is received.
-msgid "Not expecting this response!"
-msgstr "Réponse inattendue !"
-
-#. TRANS: Client error displayed when subscribing to a remote profile that does not exist.
-msgid "User being listened to does not exist."
-msgstr "L’utilisateur suivi n’existe pas."
-
-#. TRANS: Client error displayed when subscribing to a remote profile that is a local profile.
-#. TRANS: Client error displayed when using remote subscribe for a local entity.
-msgid "You can use the local subscription!"
-msgstr "Vous pouvez utiliser l’abonnement local."
-
-#. TRANS: Client error displayed when subscribing to a remote profile that is blocked form subscribing to.
-msgid "That user has blocked you from subscribing."
-msgstr "Cet utilisateur vous a empêché de vous inscrire."
-
-#. TRANS: Client error displayed when subscribing to a remote profile without providing an authorised token.
-msgid "You are not authorized."
-msgstr "Vous n’êtes pas autorisé."
-
-#. TRANS: Client error displayed when subscribing to a remote profile and conversion of the request token to access token fails.
-msgid "Could not convert request token to access token."
-msgstr "Impossible de convertir le jeton de requête en jeton d’accès."
-
-#. TRANS: Client error displayed when subscribing to a remote profile fails because of an unsupported version of the OMB protocol.
-msgid "Remote service uses unknown version of OMB protocol."
-msgstr "Le service distant utilise une version inconnue du protocole OMB."
-
-#. TRANS: Server error displayed when subscribing to a remote profile fails because the remote profile could not be updated.
-#. TRANS: Exception thrown when updating a remote profile fails in OAuth store.
-msgid "Error updating remote profile."
-msgstr "Erreur lors de la mise à jour du profil distant."
-
 #. TRANS: Client error displayed when requesting a non-existent file.
 msgid "No such file."
 msgstr "Fichier non trouvé."
@@ -2755,31 +2627,6 @@ msgstr ""
 msgid "No ID."
 msgstr "Aucun identifiant."
 
-#. TRANS: Client error displayed trying to change group design settings while not logged in.
-msgid "You must be logged in to edit a group."
-msgstr "Vous devez ouvrir une session pour modifier un groupe."
-
-#. TRANS: Title group design settings page.
-msgid "Group design"
-msgstr "Conception du groupe"
-
-#. TRANS: Instructions for group design settings page.
-msgid ""
-"Customize the way your group looks with a background image and a colour "
-"palette of your choice."
-msgstr ""
-"Personnalisez l’apparence de votre groupe avec une image d’arrière plan et "
-"une palette de couleurs de votre choix"
-
-#. TRANS: Form validation error displayed when group design settings could not be updated because of an application issue.
-msgid "Unable to update your design settings."
-msgstr "Échec de la mise à jour de vos paramètres de conception."
-
-#. TRANS: Form text to confirm saved group design settings.
-#. TRANS: Confirmation message on Profile design page when saving design settings has succeeded.
-msgid "Design preferences saved."
-msgstr "Préférences de conception enregistrées."
-
 #. TRANS: Title for group logo settings page.
 #. TRANS: Group logo form legend.
 msgid "Group logo"
@@ -2872,7 +2719,7 @@ msgstr "Groupes, page %d"
 #. TRANS: Page notice of group list. %%%%site.name%%%% is the StatusNet site name,
 #. TRANS: %%%%action.groupsearch%%%% and %%%%action.newgroup%%%% are URLs. Do not change them.
 #. TRANS: This message contains Markdown links in the form [link text](link).
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "%%%%site.name%%%% groups let you find and talk with people of similar "
 "interests. After you join a group you can send messages to all other members "
@@ -2885,7 +2732,7 @@ msgstr ""
 "groupe, vous pouvez envoyer des messages à tous les autres membres en "
 "utilisant la syntaxe « !nomdugroupe ». Vous ne voyez aucun groupe qui vous "
 "intéresse ? Essayez d’en [rechercher un](%%%%action.groupsearch%%%%) ou de "
-"[créer le vôtre !](%%%%action.newgroup%%%%)"
+"[créer le vôtre](%%%%action.newgroup%%%%) !"
 
 #. TRANS: Link to create a new group on the group list page.
 #. TRANS: Link text on group page to create a new group.
@@ -2916,13 +2763,13 @@ msgstr "Aucun résultat."
 
 #. TRANS: Additional text on page where groups can be searched if no results were found for a query for a logged in user.
 #. TRANS: This message contains Markdown links in the form [link text](link).
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "If you cannot find the group you're looking for, you can [create it](%%"
 "action.newgroup%%) yourself."
 msgstr ""
-"Si vous ne trouvez pas le groupe que vous recherchez, vous pouvez [le créer]"
-"(%%action.newgroup%%) vous-même."
+"Si vous ne trouvez pas le groupe que vous cherchez pour, vous pouvez le "
+"[créer] (%%action.newgroup%%) vous-même."
 
 #. TRANS: Additional text on page where groups can be searched if no results were found for a query for a not logged in user.
 #. TRANS: This message contains Markdown links in the form [link text](link).
@@ -2954,33 +2801,32 @@ msgstr "Paramètres de messagerie instantanée"
 #. TRANS: Instant messaging settings page instructions.
 #. TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link.
 #. TRANS: the order and formatting of link text and link should remain unchanged.
-#, fuzzy, php-format
+#, php-format
 msgid ""
-"You can send and receive notices through instant messaging [instant messages]"
-"(%%doc.im%%). Configure your addresses and settings below."
+"You can send and receive notices through [instant messaging](%%doc.im%%). "
+"Configure your addresses 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."
+"Vous pouvez envoyer et recevoir des annonces via [la messagerie instantanée]"
+"(%%doc.im%%). Configurez votre adresse et vos paramètres ci-dessous."
 
 #. TRANS: Message given in the IM settings if IM is not enabled on the site.
 msgid "IM is not available."
 msgstr "La messagerie instantanée n’est pas disponible."
 
 #. TRANS: Form note in IM settings form. %s is the type of IM address that was confirmed.
-#, fuzzy, php-format
+#, php-format
 msgid "Current confirmed %s address."
-msgstr "Adresse courriel actuellement confirmée."
+msgstr "Adresse %s actuellement confirmée."
 
 #. TRANS: Form note in IM settings form.
 #. TRANS: %s is the IM service name, %2$s is the IM address set.
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your %1$s account for a message "
 "with further instructions. (Did you add %2$s to your buddy list?)"
 msgstr ""
-"En attente d’une confirmation pour cette adresse. Vérifiez votre compte "
-"Jabber/GTalk pour recevoir de nouvelles instructions. (Avez-vous ajouté %s à "
+"En attente d’une confirmation pour cette adresse. Vérifiez votre compte %1$s "
+"pour un message avec la suite des instructions. (Avez-vous ajouté %2$s à "
 "votre liste de contacts ?)"
 
 #. TRANS: Field label for IM address.
@@ -2997,9 +2843,8 @@ msgid "IM Preferences"
 msgstr "Préférences de messagerie instantanée"
 
 #. TRANS: Checkbox label in IM preferences form.
-#, fuzzy
 msgid "Send me notices"
-msgstr "Envoyer un avis"
+msgstr "M’envoyer un avis"
 
 #. TRANS: Checkbox label in IM preferences form.
 msgid "Post a notice when my status changes."
@@ -3011,9 +2856,8 @@ msgstr ""
 "Envoyez-moi des réponses de gens auprès desquels je ne suis pas abonné."
 
 #. TRANS: Checkbox label in IM preferences form.
-#, fuzzy
 msgid "Publish a MicroID"
-msgstr "Publier un MicroID pour mon adresse courriel."
+msgstr "Publier un MicroID"
 
 #. TRANS: Server error thrown on database error updating IM preferences.
 msgid "Could not update IM preferences."
@@ -3029,19 +2873,16 @@ msgid "No screenname."
 msgstr "Aucun pseudo."
 
 #. TRANS: Form validation error when no transport is available setting an IM address.
-#, fuzzy
 msgid "No transport."
-msgstr "Aucun avis."
+msgstr "Aucun transport."
 
 #. TRANS: Message given saving IM address that cannot be normalised.
-#, fuzzy
 msgid "Cannot normalize that screenname."
-msgstr "Impossible d’utiliser cet identifiant Jabber"
+msgstr "Impossible de normaliser ce nom d'écran."
 
 #. TRANS: Message given saving IM address that not valid.
-#, fuzzy
 msgid "Not a valid screenname."
-msgstr "Pseudo invalide."
+msgstr "Nom d'écran non valide."
 
 #. TRANS: Message given saving IM address that is already set for another user.
 msgid "Screenname already belongs to another user."
@@ -3171,29 +3012,6 @@ msgstr ""
 "Remplissez ce formulaire pour inviter vos amis et collègues à utiliser ce "
 "service."
 
-#. TRANS: Field label for a list of e-mail addresses.
-msgid "Email addresses"
-msgstr "Adresses courriel"
-
-#. TRANS: Tooltip for field label for a list of e-mail addresses.
-#, fuzzy
-msgid "Addresses of friends to invite (one per line)."
-msgstr "Adresses d’amis à inviter (un par ligne)"
-
-#. TRANS: Field label for a personal message to send to invitees.
-msgid "Personal message"
-msgstr "Message personnel"
-
-#. TRANS: Tooltip for field label for a personal message to send to invitees.
-msgid "Optionally add a personal message to the invitation."
-msgstr "Ajouter un message personnel à l’invitation (optionnel)."
-
-#. TRANS: Send button for inviting friends
-#. TRANS: Button text for sending notice.
-msgctxt "BUTTON"
-msgid "Send"
-msgstr "Envoyer"
-
 #. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral
 #. TRANS: singular 3rd-person pronoun in English. %1$s is the inviting user, $2$s is
 #. TRANS: the StatusNet sitename.
@@ -3212,9 +3030,8 @@ msgid "%1$s joined group %2$s"
 msgstr "%1$s a rejoint le groupe %2$s"
 
 #. TRANS: Exception thrown when there is an unknown error joining a group.
-#, fuzzy
 msgid "Unknown error joining group."
-msgstr "Inconnu"
+msgstr "Erreur inconnue en rejoignant le groupe."
 
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
@@ -3284,7 +3101,6 @@ msgid "Type"
 msgstr "Type"
 
 #. TRANS: Dropdown field instructions in the license admin panel.
-#, fuzzy
 msgid "Select a license."
 msgstr "Sélectionner une licence"
 
@@ -3325,15 +3141,8 @@ msgid "URL for an image to display with the license."
 msgstr "URL d’une image à afficher avec la licence."
 
 #. TRANS: Button title in the license admin panel.
-#, fuzzy
 msgid "Save license settings."
-msgstr "Enregistrer les paramètres de licence"
-
-#. TRANS: Client error displayed when trying to log in while already logged in.
-#. TRANS: Client error displayed trying to use "one time password login" when already logged in.
-#. TRANS: Client error displayed when trying to register while already logged in.
-msgid "Already logged in."
-msgstr "Déjà connecté."
+msgstr "Enregistrer les paramètres de licence."
 
 #. TRANS: Form validation error displayed when trying to log in with incorrect credentials.
 msgid "Incorrect username or password."
@@ -3355,9 +3164,8 @@ msgid "Login to site"
 msgstr "Ouverture de session"
 
 #. TRANS: Field label on login page.
-#, fuzzy
 msgid "Username or email address"
-msgstr "Pseudo ou adresse de courriel"
+msgstr "Nom d’utilisateur ou adresse courriel"
 
 #. TRANS: Checkbox label label on login page.
 #. TRANS: Checkbox label on account registration page.
@@ -3372,10 +3180,9 @@ msgstr ""
 "ordinateurs publics ou partagés)"
 
 #. TRANS: Button text for log in on login page.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Login"
-msgstr "Ouvrir une session"
+msgstr "Se connecter"
 
 #. TRANS: Link text for link to "reset password" on login page.
 msgid "Lost or forgotten password?"
@@ -3453,18 +3260,17 @@ msgstr "L’URL source est requise."
 msgid "Could not create application."
 msgstr "Impossible de créer l’application."
 
-#, fuzzy
+#. TRANS: Form validation error messages displayed when uploading an invalid application logo.
 msgid "Invalid image."
-msgstr "Taille incorrecte."
+msgstr "Image non valide."
 
 #. TRANS: Title for form to create a group.
 msgid "New group"
 msgstr "Nouveau groupe"
 
 #. TRANS: Client exception thrown when a user tries to create a group while banned.
-#, fuzzy
 msgid "You are not allowed to create groups on this site."
-msgstr "Vous n’êtes pas autorisé à supprimer ce groupe."
+msgstr "Vous ne sont pas autorisés à créer des groupes sur ce site"
 
 #. TRANS: Form instructions for group create form.
 msgid "Use this form to create a new group."
@@ -3477,7 +3283,6 @@ msgstr "Nouveau message"
 
 #. TRANS: Client error displayed trying to send a direct message to a user while sender and
 #. TRANS: receiver are not subscribed to each other.
-#, fuzzy
 msgid "You cannot send a message to this user."
 msgstr "Vous ne pouvez pas envoyer de messages à cet utilisateur."
 
@@ -3492,13 +3297,6 @@ msgstr "Aucun contenu !"
 msgid "No recipient specified."
 msgstr "Aucun destinataire n’a été spécifié."
 
-#. TRANS: Client error displayed trying to send a direct message to self.
-#. TRANS: Error text shown when trying to send a direct message to self.
-msgid ""
-"Don't send a message to yourself; just say it to yourself quietly instead."
-msgstr ""
-"N’envoyez pas de message à vous-même ; dites-le plutôt dans votre tête..."
-
 #. TRANS: Page title after sending a direct message.
 msgid "Message sent"
 msgstr "Message envoyé"
@@ -3518,7 +3316,6 @@ msgstr "Erreur Ajax"
 
 #. TRANS: Page title for sending a new notice.
 #. TRANS: Title for form to send a new notice.
-#, fuzzy
 msgctxt "TITLE"
 msgid "New notice"
 msgstr "Nouvel avis"
@@ -3575,9 +3372,9 @@ msgstr "Mises à jour avec « %s »"
 
 #. TRANS: RSS notice search feed description.
 #. TRANS: %1$s is the query, %2$s is the StatusNet site name.
-#, fuzzy, php-format
+#, php-format
 msgid "Updates matching search term \"%1$s\" on %2$s."
-msgstr "mises à jour correspondant au(x) terme(s) « %1$s » sur %2$s !"
+msgstr "Mises à jour correspondant au critère de recherche \"%1$s\" sur %2$s."
 
 #. TRANS: Client error displayed trying to nudge a user that cannot be nudged.
 msgid ""
@@ -3682,9 +3479,9 @@ msgstr "Statut de %1$s sur %2$s"
 
 #. TRANS: Server error displayed in oEmbed action when attachment not found.
 #. TRANS: %d is an attachment ID.
-#, fuzzy, php-format
+#, php-format
 msgid "Attachment %s not found."
-msgstr "Destinataire non trouvé."
+msgstr "Pièce jointe %s non trouvée."
 
 #. TRANS: Server error displayed in oEmbed request when a path is not supported.
 #. TRANS: %s is a path.
@@ -3707,6 +3504,33 @@ msgstr "Veuillez n'utiliser que des URL HTTP complètes en %s."
 msgid "Not a supported data format."
 msgstr "Format de données non supporté."
 
+#. TRANS: Page title for profile settings.
+msgid "Old school UI settings"
+msgstr "Paramètres d'IHM ancienne école"
+
+#. TRANS: Usage instructions for profile settings.
+msgid "If you like it \"the old way\", you can set that here."
+msgstr "Si vous préfèrez \"l'ancien style\", vous pouvez le définir ici"
+
+#. TRANS: Confirmation shown when user profile settings are saved.
+#. TRANS: Message after successful saving of administrative settings.
+msgid "Settings saved."
+msgstr "Préférences enregistrées."
+
+msgid "Only stream mode (no conversations) in timelines"
+msgstr ""
+"Mode fil de l'eau uniquement (pas de conversations) dans les chronologies"
+
+msgid "Show conversation page as hierarchical trees"
+msgstr "Afficher la page de conversation sous forme d'arbres hiérarchiques"
+
+msgid "Show nicknames (not full names) in timelines"
+msgstr "Montrer les surnoms (et non les noms complets) dans les flux"
+
+#. TRANS: Button text to save a list.
+msgid "Save"
+msgstr "Enregistrer"
+
 #. TRANS: ShortName in the OpenSearch interface when trying to find users.
 msgid "People Search"
 msgstr "Recherche de personnes"
@@ -3715,6 +3539,11 @@ msgstr "Recherche de personnes"
 msgid "Notice Search"
 msgstr "Recherche d’avis"
 
+#. TRANS: Client error displayed trying to use "one time password login" when already logged in.
+#. TRANS: Client error displayed when trying to register while already logged in.
+msgid "Already logged in."
+msgstr "Déjà connecté."
+
 #. TRANS: Client error displayed trying to use "one time password login" without specifying a user.
 msgid "No user ID specified."
 msgstr "Aucun identifiant d’utilisateur n’a été spécifié."
@@ -3785,7 +3614,7 @@ msgid "Confirm"
 msgstr "Confirmer"
 
 #. TRANS: Field title on page where to change password.
-#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
+#. TRANS: Title for field label for password reset form where the password has to be typed again.
 #. TRANS: Field title on account registration page.
 msgid "Same as password above."
 msgstr "Identique au mot de passe ci-dessus."
@@ -3843,12 +3672,6 @@ msgstr "Dossier des thème non lisible : %s."
 msgid "Avatar directory not writable: %s."
 msgstr "Dossier des avatars non inscriptible : %s."
 
-#. TRANS: Client error in Paths admin panel.
-#. TRANS: %s is the background directory that could not be written to.
-#, php-format
-msgid "Background directory not writable: %s."
-msgstr "Dossier des arrière plans non inscriptible : %s."
-
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the locales directory that could not be read from.
 #, php-format
@@ -3961,30 +3784,6 @@ msgstr "Dossier des avatars"
 msgid "Directory where avatars are located."
 msgstr "Le répertoire où les avatars sont stockés."
 
-#. TRANS: Fieldset legend in Paths admin panel.
-msgid "Backgrounds"
-msgstr "Arrière plans"
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-msgid "Server for backgrounds."
-msgstr "Serveur pour les fonds d’écran."
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-msgid "Web path to backgrounds."
-msgstr "Chemin d’accès Internet vers les fonds d’écran."
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-msgid "Server for backgrounds on SSL pages."
-msgstr "Serveur pour les fonds d’écran sur les pages SSL."
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-msgid "Web path to backgrounds on SSL pages."
-msgstr "Chemin d’accès Internet vers les fonds d’écran sur les pages SSL."
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-msgid "Directory where backgrounds are located."
-msgstr "Le répertoire où les fonds d’écran sont stockés."
-
 #. TRANS: Fieldset legens in Paths admin panel.
 msgid "Attachments"
 msgstr "Pièces jointes"
@@ -4040,8 +3839,8 @@ msgid "Server to direct SSL requests to."
 msgstr "Serveur vers lequel diriger les requêtes SSL."
 
 #. TRANS: Button title text to store form data in the Paths admin panel.
-msgid "Save paths"
-msgstr "Enregistrer les chemins."
+msgid "Save path settings."
+msgstr "Sauvegarder les paramètres du chemin."
 
 #. TRANS: Instructions for the "People search" page.
 #. TRANS: %%site.name%% is the name of the StatusNet site.
@@ -4072,17 +3871,18 @@ msgstr "Liste publique %1$s, page %2$d"
 
 #. TRANS: Message for anonymous users on list page.
 #. TRANS: This message contains Markdown links in the form [description](link).
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "Lists are how you sort similar people on %%site.name%%, a [micro-blogging]"
 "(http://en.wikipedia.org/wiki/Micro-blogging) service based on the Free "
 "Software [StatusNet](http://status.net/) tool. You can then easily keep "
 "track of what they are doing by subscribing to the list's timeline."
 msgstr ""
-"**%s** est un groupe d’utilisateurs sur %%%%site.name%%%%, un service de "
-"[micro-blogging](http://fr.wikipedia.org/wiki/Microblog)  basé sur le "
-"logiciel libre [StatusNet](http://status.net/). Ses membres partagent des "
-"messages courts à propos de leur vie et leurs intérêts. "
+"Les listes sont la manière dont vous triez des personnes similaires sur %%"
+"site.name%%, un service de [micro-blogging](http://en.wikipedia.org/wiki/"
+"Micro-blogging) basé sur l'outil libre [StatusNet](http://status.net/). Vous "
+"pouvez alors facilement garder trace de ce qu'elles font en s'abonnant à la "
+"chronologie de la liste."
 
 #. TRANS: Client error displayed when a tagger is expected but not provided.
 msgid "No tagger."
@@ -4110,40 +3910,37 @@ msgid "Private lists by you"
 msgstr "Listes privées par vous"
 
 #. TRANS: Title for lists by a user page for a public tag.
-#, fuzzy
 msgid "Public lists by you"
-msgstr "Nuage de marques public"
+msgstr "Listes publiques de votre part"
 
 #. TRANS: Title for lists by a user page.
-#, fuzzy
 msgid "Lists by you"
-msgstr "Modifier le groupe %s"
+msgstr "Listes de votre part"
 
 #. TRANS: Title for lists by a user page.
 #. TRANS: %s is a user nickname.
 #, php-format
 msgid "Lists by %s"
-msgstr ""
+msgstr "Listes de %s"
 
 #. TRANS: Title for lists by a user page.
 #. TRANS: %1$s is a user nickname, %2$d is a page number.
-#, fuzzy, php-format
+#, php-format
 msgid "Lists by %1$s, page %2$d"
-msgstr "Avis marqués avec %1$s, page %2$d"
+msgstr "Listes par %1$s, page %2$d"
 
 #. TRANS: Client error displayed when trying view another user's private lists.
 msgid "You cannot view others' private lists"
 msgstr "Vous ne pouvez pas voir les listes privées des autres utilisateurs"
 
 #. TRANS: Mode selector label.
-#, fuzzy
 msgid "Mode"
-msgstr "Modérer"
+msgstr "Mode"
 
 #. TRANS: Link text to show lists for user %s.
-#, fuzzy, php-format
+#, php-format
 msgid "Lists for %s"
-msgstr "Boîte d’envoi de %s"
+msgstr "Listes pour %s"
 
 #. TRANS: Fieldset legend.
 #. TRANS: Fieldset legend on gallery action page.
@@ -4152,22 +3949,19 @@ msgstr "Sélectionner une marque à filtrer"
 
 #. TRANS: Checkbox title.
 msgid "Show private tags."
-msgstr ""
+msgstr "Afficher les notices privées."
 
 #. TRANS: Checkbox label to show public tags.
-#, fuzzy
 msgctxt "LABEL"
 msgid "Public"
 msgstr "Public"
 
 #. TRANS: Checkbox title.
-#, fuzzy
 msgid "Show public tags."
-msgstr "Cette marque n’existe pas."
+msgstr "Afficher les balises publics."
 
 #. TRANS: Submit button text for tag filter form.
 #. TRANS: Submit button text on gallery action page.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Go"
 msgstr "Aller"
@@ -4175,89 +3969,90 @@ msgstr "Aller"
 #. TRANS: Message displayed for anonymous users on page that displays lists by a user.
 #. TRANS: This message contains Markdown links in the form [description](links).
 #. TRANS: %s is a tagger nickname.
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "These are lists created by **%s**. Lists are how you sort similar people on %"
 "%%%site.name%%%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
 "blogging) service based on the Free Software [StatusNet](http://status.net/) "
 "tool. You can easily keep track of what they are doing by subscribing to the "
-"tag's timeline."
+"list's timeline."
 msgstr ""
-"**%s** est un groupe d’utilisateurs sur %%%%site.name%%%%, un service de "
-"[micro-blogging](http://fr.wikipedia.org/wiki/Microblog)  basé sur le "
-"logiciel libre [StatusNet](http://status.net/). Ses membres partagent des "
-"messages courts à propos de leur vie et leurs intérêts. "
+"Voici les listes créées par **%s**. Les listes sont la manière dont vous "
+"triez les gens semblables sur %%%%site.name%%%%, un service de [micro-"
+"blogging](http://en.wikipedia.org/wiki/Micro-blogging) basé sur l'outil "
+"libre [StatusNet](http://status.net/). Vous pouvez facilement garder trace "
+"de ce qu'elles font en vous abonnant à la chronologie de la liste."
 
 #. TRANS: Message displayed on page that displays lists by a user when there are none.
 #. TRANS: This message contains Markdown links in the form [description](links).
 #. TRANS: %s is a tagger nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "%s has not created any [lists](%%%%doc.lists%%%%) yet."
-msgstr ""
-"Personne n’a encore posté d’avis avec une [marque (hashtag)](%%doc.tags%%)."
+msgstr "%s n'a encore créé aucune [liste](%%%%doc.lists%%%%)."
 
 #. TRANS: Page title. %s is a tagged user's nickname.
 #, php-format
 msgid "Lists with %s in them"
-msgstr ""
+msgstr "Listes contenant %s"
 
 #. TRANS: Page title. %1$s is a tagged user's nickname, %2$s is a page number.
-#, fuzzy, php-format
+#, php-format
 msgid "Lists with %1$s, page %2$d"
-msgstr "Avis marqués avec %1$s, page %2$d"
+msgstr "Listes avec %1$s, page %2$d"
 
 #. TRANS: Message displayed for anonymous users on page that displays lists for a user.
 #. TRANS: This message contains Markdown links in the form [description](links).
 #. TRANS: %s is a tagger nickname.
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "These are lists for **%s**. lists are how you sort similar people on %%%%"
 "site.name%%%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
 "blogging) service based on the Free Software [StatusNet](http://status.net/) "
 "tool. You can easily keep track of what they are doing by subscribing to the "
-"tag's timeline."
+"list's timeline."
 msgstr ""
-"**%s** est un groupe d’utilisateurs sur %%%%site.name%%%%, un service de "
-"[micro-blogging](http://fr.wikipedia.org/wiki/Microblog)  basé sur le "
-"logiciel libre [StatusNet](http://status.net/). Ses membres partagent des "
-"messages courts à propos de leur vie et leurs intérêts. "
+"Voici les listes pour ** %s **. Les listes sont la manière dont vous triez "
+"les gens semblables sur %%%%site.name%%%%, un service de [micro-blogging]"
+"(http://en.wikipedia.org/wiki/Micro-blogging) basé sur l'outil libre "
+"[StatusNet](http://status.net/). Vous pouvez facilement garder trace de ce "
+"qu'elles font en vous abonnant à la chronologie de la liste."
 
 #. TRANS: Message displayed on page that displays lists a user was added to when there are none.
 #. TRANS: This message contains Markdown links in the form [description](links).
 #. TRANS: %s is a user nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "%s has not been [listed](%%%%doc.lists%%%%) by anyone yet."
 msgstr ""
-"Personne n’a encore posté d’avis avec une [marque (hashtag)](%%doc.tags%%)."
+"%s n'a pas encore été [ajouté à la liste](%%%%doc.lists%%%%) par quelqu'un."
 
 #. TRANS: Page title for list of list subscribers.
 #. TRANS: %1$s is a list, %2$s is a user nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "Subscribers to list %1$s by %2$s"
-msgstr "Abonné à %s."
+msgstr "Abonnés à la liste %1$s par %2$s"
 
 #. TRANS: Page title for list of list subscribers.
 #. TRANS: %1$s is a list, %2$s is a user nickname, %3$d is a page number.
-#, fuzzy, php-format
+#, php-format
 msgid "Subscribers to list %1$s by %2$s, page %3$d"
-msgstr "%1$s a marqué « %2$s » la page %3$d"
+msgstr "Abonnés à la liste %1$s par %2$s, page %3$d"
 
 #. TRANS: Title for page that displays lists subscribed to by a user.
 #. TRANS: %s is a profile nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "Lists subscribed to by %s"
-msgstr "Abonné à %s."
+msgstr "Listes auxquelles s'est abonné %s"
 
 #. TRANS: Title for page that displays lists subscribed to by a user.
 #. TRANS: %1$s is a profile nickname, %2$d is a page number.
-#, fuzzy, php-format
+#, php-format
 msgid "Lists subscribed to by %1$s, page %2$d"
-msgstr "Abonnements de %1$s - page %2$d"
+msgstr "Listes auxquelles s'est abonné %1$s, page %2$d"
 
 #. TRANS: Message displayed for anonymous users on page that displays lists subscribed to by a user.
 #. TRANS: This message contains Markdown links in the form [description](links).
 #. TRANS: %s is a profile nickname.
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "These are lists subscribed to by **%s**. Lists are how you sort similar "
 "people on %%%%site.name%%%%, a [micro-blogging](http://en.wikipedia.org/wiki/"
@@ -4265,10 +4060,11 @@ msgid ""
 "net/) tool. You can easily keep track of what they are doing by subscribing "
 "to the list's timeline."
 msgstr ""
-"**%s** est un groupe d’utilisateurs sur %%%%site.name%%%%, un service de "
-"[micro-blogging](http://fr.wikipedia.org/wiki/Microblog)  basé sur le "
-"logiciel libre [StatusNet](http://status.net/). Ses membres partagent des "
-"messages courts à propos de leur vie et leurs intérêts. "
+"Voici les listes auxquelles a souscrit **%s**. Les listes sont la manière "
+"dont vous triez les gens semblables sur %%%%site.name%%%%, un service de "
+"[micro-blogging](http://en.wikipedia.org/wiki/Micro-blogging) basé sur "
+"l'outil libre [StatusNet](http://status.net/). Vous pouvez facilement garder "
+"trace de ce qu'elles font en vous abonnant à la chronologie de la liste."
 
 #. TRANS: Page title for AJAX form return when a disabling a plugin.
 msgctxt "plugin"
@@ -4284,14 +4080,12 @@ msgid "This action only accepts POST requests."
 msgstr "Cette action n'accepte que les requêtes de type POST."
 
 #. TRANS: Client error displayed when trying to enable or disable a plugin without access rights.
-#, fuzzy
 msgid "You cannot administer plugins."
-msgstr "Vous ne pouvez pas supprimer des utilisateurs."
+msgstr "Vous ne pouvez pas gérer les modules complémentaires."
 
 #. TRANS: Client error displayed when trying to enable or disable a non-existing plugin.
-#, fuzzy
 msgid "No such plugin."
-msgstr "Page non trouvée."
+msgstr "Plugiciel inconnu."
 
 #. TRANS: Page title for AJAX form return when enabling a plugin.
 msgctxt "plugin"
@@ -4301,7 +4095,7 @@ msgstr "Activé"
 #. TRANS: Tab and title for plugins admin panel.
 msgctxt "TITLE"
 msgid "Plugins"
-msgstr "Extensions"
+msgstr "Greffons"
 
 #. TRANS: Instructions at top of plugin admin page.
 msgid ""
@@ -4309,6 +4103,9 @@ msgid ""
 "\"http://status.net/wiki/Plugins\">online plugin documentation</a> for more "
 "details."
 msgstr ""
+"Des plugins additionnels peuvent être activés et configurés manuellement. "
+"Consultez la <a href=\"http://status.net/wiki/Plugins\">documentation du "
+"plugin en ligne</a> pour plus de détails."
 
 #. TRANS: Admin form section header
 msgid "Default plugins"
@@ -4318,34 +4115,23 @@ msgstr "Extensions par défaut"
 msgid ""
 "All default plugins have been disabled from the site's configuration file."
 msgstr ""
-
-#. TRANS: Client error displayed if the notice posted has too many characters.
-msgid "Invalid notice content."
-msgstr "Contenu de l’avis invalide."
-
-#. TRANS: Exception thrown if a notice's license is not compatible with the StatusNet site license.
-#. TRANS: %1$s is the notice license, %2$s is the StatusNet site's license.
-#, fuzzy, php-format
-msgid "Notice license \"%1$s\" is not compatible with site license \"%2$s\"."
-msgstr ""
-"La licence des avis « %1$s » n’est pas compatible avec la licence du site « %2"
-"$s »."
+"Tous les plugins par défaut ont été désactivés depuis le fichier de "
+"configuration du site."
 
 #. TRANS: Client error displayed when trying to add an unindentified field to profile.
 #. TRANS: %s is a field name.
 #, php-format
 msgid "Unidentified field %s."
-msgstr ""
+msgstr "Champ non identifié %s ."
 
 #. TRANS: Page title.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Search results"
-msgstr "Rechercher sur le site"
+msgstr "Résultats de la recherche"
 
 #. TRANS: Error message in case a search is shorter than three characters.
 msgid "The search string must be at least 3 characters long."
-msgstr ""
+msgstr "Le terme recherché doit avoir au moins 3 caractères."
 
 #. TRANS: Page title for profile settings.
 msgid "Profile settings"
@@ -4360,7 +4146,7 @@ msgstr ""
 
 #. TRANS: Profile settings form legend.
 msgid "Profile information"
-msgstr "Information de profil"
+msgstr "Informations sur le profil"
 
 #. TRANS: Tooltip for field label in form for profile settings.
 #. TRANS: Field title on account registration page.
@@ -4393,17 +4179,16 @@ msgstr ""
 #. TRANS: Text area title in form for account registration. Plural
 #. TRANS: is decided by the number of characters available for the
 #. TRANS: biography (%d).
-#, fuzzy, php-format
+#, php-format
 msgid "Describe yourself and your interests in %d character."
 msgid_plural "Describe yourself and your interests in %d characters."
-msgstr[0] "Décrivez-vous avec vos intérêts en %d caractère"
-msgstr[1] "Décrivez-vous avec vos intérêts en %d caractères"
+msgstr[0] "Décrivez-vous avec vos centres d’intérêt en %d caractère."
+msgstr[1] "Décrivez-vous avec vos centres d’intérêt en %d caractères."
 
 #. TRANS: Tooltip for field label in form for profile settings.
 #. TRANS: Text area title on account registration page.
-#, fuzzy
 msgid "Describe yourself and your interests."
-msgstr "Décrivez vous et vos interêts"
+msgstr "Décrivez-vous et indiquez vos centres d'intérêt."
 
 #. TRANS: Text area label in form for profile settings where users can provide
 #. TRANS: their biography.
@@ -4420,25 +4205,25 @@ msgstr "Emplacement"
 
 #. TRANS: Tooltip for field label in form for profile settings.
 #. TRANS: Field title on account registration page.
-#, fuzzy
 msgid "Where you are, like \"City, State (or Region), Country\"."
-msgstr "Indiquez votre emplacement, ex.: « Ville, État (ou région), Pays »"
+msgstr "Où vous habitez, par exemple \"Ville, État (ou Région), Pays\"."
 
 #. TRANS: Checkbox label in form for profile settings.
 msgid "Share my current location when posting notices"
 msgstr "Partager ma localisation lorsque je poste des avis"
 
 #. TRANS: Field label in form for profile settings.
+#. TRANS: Title for group tag cloud section.
+#. TRANS: %s is a group name.
 msgid "Tags"
 msgstr "Balises"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#, fuzzy
 msgid ""
 "Tags for yourself (letters, numbers, -, ., and _), comma- or space- "
 "separated."
 msgstr ""
-"Marques pour vous-même (lettres, chiffres, -, ., et _), séparées par des "
+"Balises pour vous-même (lettres, chiffres, -, ., et _), séparées par des "
 "virgules ou des espaces"
 
 #. TRANS: Dropdownlist label in form for profile settings.
@@ -4458,17 +4243,15 @@ msgid "What timezone are you normally in?"
 msgstr "Quel est votre fuseau horaire habituel ?"
 
 #. TRANS: Checkbox label in form for profile settings.
-#, fuzzy
 msgid ""
-"Automatically subscribe to whoever subscribes to me (best for non-humans)."
+"Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr ""
 "M’abonner automatiquement à tous ceux qui s’abonnent à moi (recommandé pour "
 "les utilisateurs non-humains)"
 
 #. TRANS: Dropdown field label on profile settings, for what policies to apply when someone else tries to subscribe to your updates.
-#, fuzzy
 msgid "Subscription policy"
-msgstr "Abonnements"
+msgstr "Politique d’abonnement"
 
 #. TRANS: Dropdown field option for following policy.
 msgid "Let anyone follow me"
@@ -4481,6 +4264,8 @@ msgstr "Me demander d’abord"
 #. TRANS: Dropdown field title on group edit form.
 msgid "Whether other users need your permission to follow your updates."
 msgstr ""
+"Si les autres utilisateurs doivent avoir votre permission de suivre vos "
+"mises à jour."
 
 #. TRANS: Checkbox label in profile settings.
 msgid "Make updates visible only to my followers"
@@ -4512,18 +4297,18 @@ msgstr "La langue est trop longue (limitée à 50 caractères maximum)."
 #. TRANS: %s is the invalid tag.
 #. TRANS: Error displayed if a given tag is invalid.
 #. TRANS: %s is the invalid tag.
-#, fuzzy, php-format
+#, php-format
 msgid "Invalid tag: \"%s\"."
-msgstr "Marque invalide : « %s »"
+msgstr "Balise invalide: \"%s\"."
 
 #. TRANS: Server error thrown when user profile settings could not be updated to
 #. TRANS: automatically subscribe to any subscriber.
-#, fuzzy
 msgid "Could not update user for autosubscribe or subscribe_policy."
-msgstr "Impossible de mettre à jour l’auto-abonnement."
+msgstr ""
+"Impossible de mettre à jour l’utilisateur pour s'abonner automatiquement ou "
+"pour subscribe_policy."
 
 #. TRANS: Server error thrown when user profile location preference settings could not be updated.
-#, fuzzy
 msgid "Could not save location prefs."
 msgstr "Impossible d’enregistrer les préférences de localisation."
 
@@ -4531,16 +4316,10 @@ msgstr "Impossible d’enregistrer les préférences de localisation."
 msgid "Could not save tags."
 msgstr "Impossible d’enregistrer les marques."
 
-#. TRANS: Confirmation shown when user profile settings are saved.
-#. TRANS: Message after successful saving of administrative settings.
-msgid "Settings saved."
-msgstr "Préférences enregistrées."
-
 #. TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
 #. TRANS: Page title for page where a user account can be restored from backup.
-#, fuzzy
 msgid "Restore account"
-msgstr "Créer un compte"
+msgstr "Restaurer le compte"
 
 #. TRANS: Client error displayed when requesting a public timeline page beyond the page limit.
 #. TRANS: %s is the page limit.
@@ -4549,8 +4328,8 @@ msgid "Beyond the page limit (%s)."
 msgstr "Au-delà de la limite de page (%s)."
 
 #. TRANS: Server error displayed when a public timeline cannot be retrieved.
-msgid "Could not retrieve public stream."
-msgstr "Impossible de récupérer le flux public."
+msgid "Could not retrieve public timeline."
+msgstr "Impossible de récupérer la chronologie publique."
 
 #. TRANS: Title for all public timeline pages but the first.
 #. TRANS: %d is the page number.
@@ -4564,16 +4343,20 @@ msgid "Public timeline"
 msgstr "Flux public"
 
 #. TRANS: Link description for public timeline feed.
-msgid "Public Stream Feed (RSS 1.0)"
-msgstr "Fil du flux public (RSS 1.0)"
+msgid "Public Timeline Feed (Activity Streams JSON)"
+msgstr "Flux public (Atom)"
 
 #. TRANS: Link description for public timeline feed.
-msgid "Public Stream Feed (RSS 2.0)"
-msgstr "Fil du flux public (RSS 2.0)"
+msgid "Public Timeline Feed (RSS 1.0)"
+msgstr "Flux public (RSS 1.0)"
 
 #. TRANS: Link description for public timeline feed.
-msgid "Public Stream Feed (Atom)"
-msgstr "Fil du flux public (Atom)"
+msgid "Public Timeline Feed (RSS 2.0)"
+msgstr "Flux public (RSS 2.0)"
+
+#. TRANS: Link description for public timeline feed.
+msgid "Public Timeline Feed (Atom)"
+msgstr "Flux public (Atom)"
 
 #. TRANS: Text displayed for public feed when there are no public notices.
 #, php-format
@@ -4622,55 +4405,10 @@ msgstr ""
 "%%site.name%% est un service de [micro-blogging](http://fr.wikipedia.org/"
 "wiki/Microblog) basé sur le logiciel libre [StatusNet](http://status.net/)."
 
-#. TRANS: Title for page with public list cloud.
-#, fuzzy
-msgid "Public list cloud"
-msgstr "Nuage de marques public"
-
-#. TRANS: Page notice for page with public list cloud.
-#. TRANS: %s is a StatusNet sitename.
-#, fuzzy, php-format
-msgid "These are largest lists on %s"
-msgstr "Ces étiquettes récentes sont les plus populaires sur %s"
-
-#. TRANS: Empty list message on page with public list cloud.
-#. TRANS: This message contains Markdown links in the form [description](link).
-#, fuzzy, php-format
-msgid "No one has [listed](%%doc.tags%%) anyone yet."
-msgstr ""
-"Personne n’a encore posté d’avis avec une [marque (hashtag)](%%doc.tags%%)."
-
-#. TRANS: Additional empty list message on page with public list cloud for logged in users.
-#, fuzzy
-msgid "Be the first to list someone!"
-msgstr "Soyez le premier à en poster une !"
-
-#. TRANS: Additional empty list message on page with public list cloud for anonymous users.
-#. TRANS: This message contains Markdown links in the form [description](link).
-#, fuzzy, php-format
-msgid ""
-"Why not [register an account](%%action.register%%) and be the first to list "
-"someone!"
-msgstr ""
-"Pourquoi ne pas [créer un compte](%%action.register%%) et être le premier à "
-"en poster un !"
-
-#. TRANS: DT element on on page with public list cloud.
-#, fuzzy
-msgid "List cloud"
-msgstr "Page non trouvée."
-
-#. TRANS: Link title for number of listed people. %d is the number of listed people.
-#, php-format
-msgid "1 person listed"
-msgid_plural "%d people listed"
-msgstr[0] "1 personne listée"
-msgstr[1] "%d personnes listées"
-
 #. TRANS: Public RSS feed description. %s is the StatusNet site name.
-#, fuzzy, php-format
+#, php-format
 msgid "%s updates from everyone."
-msgstr "%s statuts de tout le monde !"
+msgstr "%s mises à jour de tout le monde."
 
 #. TRANS: Title for public tag cloud.
 msgid "Public tag cloud"
@@ -4790,12 +4528,10 @@ msgid "Password saved"
 msgstr "Mot de passe enregistré."
 
 #. TRANS: Title for field label for password reset form.
-#, fuzzy
 msgid "6 or more characters, and do not forget it!"
 msgstr "6 caractères ou plus, et ne l’oubliez pas !"
 
 #. TRANS: Button text for password reset form.
-#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
 msgctxt "BUTTON"
 msgid "Reset"
 msgstr "Réinitialiser"
@@ -4804,18 +4540,6 @@ msgstr "Réinitialiser"
 msgid "Enter a nickname or email address."
 msgstr "Entrez un pseudo ou une adresse courriel."
 
-#. TRANS: Information on password recovery form if no known username or e-mail address was specified.
-msgid "No user with that email address or username."
-msgstr "Aucun utilisateur trouvé avec ce courriel ou ce nom."
-
-#. TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.
-msgid "No registered email address for that user."
-msgstr "Aucune adresse courriel enregistrée pour cet utilisateur."
-
-#. TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.
-msgid "Error saving address confirmation."
-msgstr "Erreur lors de l’enregistrement de la confirmation du courriel."
-
 #. TRANS: User notification after an e-mail with instructions was sent from the password recovery form.
 msgid ""
 "Instructions for recovering your password have been sent to the email "
@@ -4847,15 +4571,14 @@ msgstr ""
 "Nouveau mot de passe créé avec succès. Votre session est maintenant ouverte."
 
 #. TRANS: Client exception thrown when no ID parameter was provided.
-#, fuzzy
 msgid "No id parameter."
-msgstr "Aucun argument d’identifiant."
+msgstr "Aucun paramètre id."
 
 #. TRANS: Client exception thrown when an invalid ID parameter was provided for a file.
 #. TRANS: %d is the provided ID for which the file is not present (number).
-#, fuzzy, php-format
+#, php-format
 msgid "No such file \"%d\"."
-msgstr "Fichier non trouvé."
+msgstr "Aucun fichier « %d » ."
 
 #. TRANS: Client error displayed when trying to register to an invite-only site without an invitation.
 msgid "Sorry, only invited people can register."
@@ -4870,17 +4593,15 @@ msgid "Registration successful"
 msgstr "Compte créé avec succès"
 
 #. TRANS: Title for registration page.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Register"
-msgstr "Créer un compte"
+msgstr "S’inscrire"
 
 #. TRANS: Client error displayed when trying to register to a closed site.
 msgid "Registration not allowed."
 msgstr "Inscription non autorisée."
 
 #. TRANS: Form validation error displayed when trying to register without agreeing to the site license.
-#, fuzzy
 msgid "You cannot register if you do not agree to the license."
 msgstr "Vous ne pouvez pas vous inscrire si vous n’acceptez pas la licence."
 
@@ -4893,16 +4614,14 @@ msgid "Invalid username or password."
 msgstr "Identifiant ou mot de passe incorrect."
 
 #. TRANS: Page notice on registration page.
-#, fuzzy
 msgid ""
 "With this form you can create a new account. You can then post notices and "
 "link up to friends and colleagues."
 msgstr ""
-"Avec ce formulaire vous pouvez créer un nouveau compte. Vous pourrez ensuite "
-"poster des avis and et vous relier à des amis et collègues. "
+"Avec ce formulaire, vous pouvez créer un nouveau compte. Vous pouvez ensuite "
+"afficher des avis et vous liez à vos amis et collègues."
 
 #. TRANS: Field label on account registration page. In this field the password has to be entered a second time.
-#, fuzzy
 msgctxt "PASSWORD"
 msgid "Confirm"
 msgstr "Confirmer"
@@ -4919,15 +4638,13 @@ msgstr ""
 "de mot de passe."
 
 #. TRANS: Field title on account registration page.
-#, fuzzy
 msgid "Longer name, preferably your \"real\" name."
-msgstr "Nom plus long, votre \"vrai\" nom de préférence"
+msgstr "Nom plus long, de préférence votre « vrai » nom."
 
 #. TRANS: Button text to register a user on account registration page.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Register"
-msgstr "Créer un compte"
+msgstr "S’inscrire"
 
 #. TRANS: Copyright checkbox label in registration dialog, for private sites.
 #. TRANS: %1$s is the StatusNet sitename.
@@ -5007,85 +4724,9 @@ msgstr ""
 "(Vous recevrez bientôt un courriel contenant les instructions pour confirmer "
 "votre adresse.)"
 
-#. TRANS: Page notice for remote subscribe. This message contains Markdown links.
-#. TRANS: Ensure to keep the correct markup of [link description](link).
-#, php-format
-msgid ""
-"To subscribe, you can [login](%%action.login%%), or [register](%%action."
-"register%%) a new  account. If you already have an account  on a [compatible "
-"microblogging site](%%doc.openmublog%%),  enter your profile URL below."
-msgstr ""
-"Pour vous abonner, vous devez [ouvrir une session](%%action.login%%), ou "
-"[créer un nouveau compte](%%action.register%%). Si vous avez déjà un compte "
-"sur un [site de micro-blogging compatible](%%doc.openmublog%%), entrez l’URL "
-"de votre profil ci-dessous."
-
-#. TRANS: Page title for Remote subscribe.
-msgid "Remote subscribe"
-msgstr "Abonnement à distance"
-
-#. TRANS: Field legend on page for remote subscribe.
-msgid "Subscribe to a remote user"
-msgstr "S’abonner à un utilisateur distant"
-
-#. TRANS: Field label on page for remote subscribe.
-msgid "User nickname"
-msgstr "Pseudo de l’utilisateur"
-
-#. TRANS: Field title on page for remote subscribe.
-#, fuzzy
-msgid "Nickname of the user you want to follow."
-msgstr "Pseudo de l’utilisateur que vous voulez suivre"
-
-#. TRANS: Field label on page for remote subscribe.
-msgid "Profile URL"
-msgstr "URL du profil"
-
-#. TRANS: Field title on page for remote subscribe.
-#, fuzzy
-msgid "URL of your profile on another compatible microblogging service."
-msgstr "URL de votre profil sur un autre service de micro-blogging compatible"
-
-#. TRANS: Button text on page for remote subscribe.
-#. TRANS: Link text for link that will subscribe to a remote profile.
-#. TRANS: Button text to subscribe to a user.
-#. TRANS: Button text for subscribing to a list.
-#, fuzzy
-msgctxt "BUTTON"
-msgid "Subscribe"
-msgstr "S’abonner"
-
-#. TRANS: Form validation error on page for remote subscribe when an invalid profile URL was provided.
-#, fuzzy
-msgid "Invalid profile URL (bad format)."
-msgstr "URL du profil invalide (mauvais format)"
-
-#. TRANS: Form validation error on page for remote subscribe when no the provided profile URL
-#. TRANS: does not contain expected data.
-msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
-msgstr ""
-"URL de profil invalide (aucun document YADIS ou définition XRDS invalide)."
-
-#. TRANS: Form validation error on page for remote subscribe.
-#, fuzzy
-msgid "That is a local profile! Login to subscribe."
-msgstr "Ce profil est local ! Connectez-vous pour vous abonner."
-
-#. TRANS: Form validation error on page for remote subscribe when the remote service is not providing a request token.
-#, fuzzy
-msgid "Could not get a request token."
-msgstr "Impossible d’obtenir un jeton de requête."
-
-#. TRANS: Client error displayed when trying to (un)list an OMB 0.1 remote profile.
-#, fuzzy
-msgid "You cannot (un)list an OMB 0.1 remote profile with this action."
-msgstr ""
-"Vous ne pouvez pas vous abonner  à un profil OMB 0.1 distant par cette "
-"action."
-
 #. TRANS: Client error displayed when an unknown error occurs while delisting a user.
 #. TRANS: %s is a username.
-#, fuzzy, php-format
+#, php-format
 msgid "There was an unexpected error while delisting %s."
 msgstr "Une erreur inattendue est survenue lors du listage de %s."
 
@@ -5096,11 +4737,12 @@ msgid ""
 "There was a problem listing %s. The remote server is probably not responding "
 "correctly, please try retrying later."
 msgstr ""
+"Il y a eu un problème pour faire apparaitre %s. Le serveur distant ne répond "
+"probablement pas correctement; veuillez réessayer plus tard."
 
 #. TRANS: Title after removing a user from a list.
-#, fuzzy
 msgid "Unlisted"
-msgstr "Licence"
+msgstr "Non listé"
 
 #. TRANS: Client error displayed when trying to repeat a notice while not logged in.
 msgid "Only logged-in users can repeat notices."
@@ -5135,6 +4777,12 @@ msgstr "Réponses à %s"
 msgid "Replies to %1$s, page %2$d"
 msgstr "Réponses à %1$s, page %2$d"
 
+#. TRANS: Link for feed with replies for a user.
+#. TRANS: %s is a user nickname.
+#, php-format
+msgid "Replies feed for %s (Activity Streams JSON)"
+msgstr "Flux des réponses pour %s (Flux d'activité JSON)"
+
 #. TRANS: Link for feed with replies for a user.
 #. TRANS: %s is a user nickname.
 #, php-format
@@ -5187,25 +4835,22 @@ msgstr ""
 
 #. TRANS: RSS reply feed description.
 #. TRANS: %1$s is a user nickname, %2$s is the StatusNet site name.
-#, fuzzy, php-format
+#, php-format
 msgid "Replies to %1$s on %2$s."
 msgstr "Réponses à %1$s sur %2$s !"
 
 #. TRANS: Client exception displayed when trying to restore an account while not logged in.
-#, fuzzy
 msgid "Only logged-in users can restore their account."
-msgstr "Seuls  les utilisateurs identifiés peuvent reprendre des avis."
+msgstr "Seuls  les utilisateurs connectés peuvent reprendre leur compte."
 
 #. TRANS: Client exception displayed when trying to restore an account without having restore rights.
-#, fuzzy
 msgid "You may not restore your account."
-msgstr "Vous n’avez encore enregistré aucune application."
+msgstr "Vous ne pouvez pas restaurer votre compte."
 
 #. TRANS: Client exception displayed trying to restore an account while something went wrong uploading a file.
 #. TRANS: Client exception. No file; probably just a non-AJAX submission.
-#, fuzzy
 msgid "No uploaded file."
-msgstr "Importer un fichier"
+msgstr "Aucun fichier chargé."
 
 #. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
@@ -5243,37 +4888,39 @@ msgstr "Erreur système lors du transfert du fichier."
 
 #. TRANS: Client exception thrown when a feed is not an Atom feed.
 #. TRANS: Client exception thrown when an imported feed is not an Atom feed.
-#, fuzzy
 msgid "Not an Atom feed."
-msgstr "Tous les membres"
+msgstr "Pas un flux Atom."
 
 #. TRANS: Success message when a feed has been restored.
 msgid ""
 "Feed has been restored. Your old posts should now appear in search and your "
 "profile page."
 msgstr ""
+"Le fil a été restauré. Vos anciens messages devraient maintenant apparaître "
+"dans la recherche et la page de votre profil."
 
 #. TRANS: Message when a feed restore is in progress.
 msgid "Feed will be restored. Please wait a few minutes for results."
 msgstr ""
+"Le fil sera restauré. Veuillez patienter quelques minutes pour les résultats."
 
 #. TRANS: Form instructions for feed restore.
 msgid ""
-"You can upload a backed-up stream in <a href=\"http://activitystrea.ms/"
+"You can upload a backed-up timeline in <a href=\"http://activitystrea.ms/"
 "\">Activity Streams</a> format."
 msgstr ""
+"Vous pouvez télécharger une chronologie sauvegardée au format <a href="
+"\"http://activitystrea.ms/\">Flux d'activité</a>."
 
 #. TRANS: Title for submit button to confirm upload of a user backup file for account restore.
-#, fuzzy
 msgid "Upload the file"
-msgstr "Importer un fichier"
+msgstr "Téléverser le fichier"
 
 #. TRANS: Client error displayed when trying to revoke a role without having the right to do that.
 msgid "You cannot revoke user roles on this site."
 msgstr "Vous ne pouvez pas révoquer les rôles des utilisateurs sur ce site."
 
 #. TRANS: Client error displayed when trying to revoke a role that is not set.
-#, fuzzy
 msgid "User does not have this role."
 msgstr "L'utilisateur ne possède pas ce rôle."
 
@@ -5294,18 +4941,17 @@ msgstr "L’utilisateur est déjà dans le bac à sable."
 
 #. TRANS: Client error displayed when trying to list a profile with an invalid list.
 #. TRANS: %s is the invalid list name.
-#, fuzzy, php-format
+#, php-format
 msgid "Not a valid list: %s."
-msgstr "Cette marque est invalide : %s."
+msgstr "Cette liste est invalide : %s."
 
 #. TRANS: Page title for page showing self tags.
 #. TRANS: %1$s is a tag, %2$d is a page number.
-#, fuzzy, php-format
+#, php-format
 msgid "Users self-tagged with %1$s, page %2$d"
-msgstr "Utilisateurs marqués par eux-mêmes avec %1$s - page %2$d"
+msgstr "Utilisateurs marqués par eux-mêmes avec %1$s, page %2$d"
 
 #. TRANS: Title for the sessions administration panel.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Sessions"
 msgstr "Sessions"
@@ -5315,7 +4961,6 @@ msgid "Session settings for this StatusNet site"
 msgstr "Paramètres de session pour ce site StatusNet"
 
 #. TRANS: Fieldset legend on the sessions administration panel.
-#, fuzzy
 msgctxt "LEGEND"
 msgid "Sessions"
 msgstr "Sessions"
@@ -5327,9 +4972,8 @@ msgstr "Gérer les sessions"
 
 #. TRANS: Checkbox title on the sessions administration panel.
 #. TRANS: Indicates if StatusNet should handle session administration.
-#, fuzzy
 msgid "Handle sessions ourselves."
-msgstr "S’il faut gérer les sessions nous-même."
+msgstr "Gérer les sessions nous-mêmes."
 
 #. TRANS: Checkbox label on the sessions administration panel.
 #. TRANS: Indicates if StatusNet should write session debugging output.
@@ -5337,14 +4981,12 @@ msgid "Session debugging"
 msgstr "Déboguage de session"
 
 #. TRANS: Checkbox title on the sessions administration panel.
-#, fuzzy
 msgid "Enable debugging output for sessions."
-msgstr "Activer la sortie de déboguage pour les sessions."
+msgstr "Activer la sortie de débogage pour les sessions."
 
 #. TRANS: Title for submit button on the sessions administration panel.
-#, fuzzy
 msgid "Save session settings"
-msgstr "Sauvegarder les paramètres d’accès"
+msgstr "Enregistrer les paramètres de session"
 
 #. TRANS: Client error displayed trying to display an OAuth application while not logged in.
 msgid "You must be logged in to view an application."
@@ -5357,18 +4999,17 @@ msgstr "Profil de l’application"
 #. TRANS: Information output on an OAuth application page.
 #. TRANS: %1$s is the application creator, %2$s is "read-only" or "read-write",
 #. TRANS: %3$d is the number of users using the OAuth application.
-#, fuzzy, php-format
+#, php-format
 msgid "Created by %1$s - %2$s access by default - %3$d user"
 msgid_plural "Created by %1$s - %2$s access by default - %3$d users"
-msgstr[0] "Créé par %1$s - accès %2$s par défaut - %3$d utilisateurs"
-msgstr[1] "Créé par %1$s - accès %2$s par défaut - %3$d utilisateurs"
+msgstr[0] "Créé par %1$s, accès %2$s par défaut, %3$d utilisateur"
+msgstr[1] "Créé par %1$s, accès %2$s par défaut, %3$d utilisateurs"
 
 #. TRANS: Header on the OAuth application page.
 msgid "Application actions"
 msgstr "Actions de l’application"
 
 #. TRANS: Link text to edit application on the OAuth application page.
-#, fuzzy
 msgctxt "EDITAPP"
 msgid "Edit"
 msgstr "Modifier"
@@ -5382,14 +5023,33 @@ msgstr "Réinitialiser la clé et le secret"
 msgid "Application info"
 msgstr "Informations sur l’application"
 
+#. TRANS: Field label on application page.
+msgid "Consumer key"
+msgstr "Clé de l’utilisateur"
+
+#. TRANS: Field label on application page.
+msgid "Consumer secret"
+msgstr "Secret de l’utilisateur"
+
+#. TRANS: Field label on application page.
+msgid "Request token URL"
+msgstr "URL du jeton de requête"
+
+#. TRANS: Field label on application page.
+msgid "Access token URL"
+msgstr "URL du jeton d’accès"
+
+#. TRANS: Field label on application page.
+msgid "Authorize URL"
+msgstr "Autoriser l’URL"
+
 #. TRANS: Note on the OAuth application page about signature support.
-#, fuzzy
 msgid ""
 "Note: HMAC-SHA1 signatures are supported. The plaintext signature method is "
 "not supported."
 msgstr ""
-"Note : Nous utilisons les signatures HMAC-SHA1. Nous n’utilisons pas la "
-"méthode de signature en texte clair."
+"Note : Les signatures HMAC-SHA1 sont supportées. La méthode de signature en "
+"clair n'est pas supportée."
 
 #. TRANS: Text in confirmation dialog to reset consumer key and secret for an OAuth application.
 msgid "Are you sure you want to reset your consumer key and secret?"
@@ -5405,6 +5065,11 @@ msgstr "Avis favoris de %1$s, page %2$d"
 msgid "Could not retrieve favorite notices."
 msgstr "Impossible d’afficher les favoris."
 
+#. TRANS: Feed link text. %s is a username.
+#, php-format
+msgid "Feed for favorites of %s (Activity Streams JSON)"
+msgstr "Flux des favoris de %s (flux d’activité JSON)"
+
 #. TRANS: Feed link text. %s is a username.
 #, php-format
 msgid "Feed for favorites of %s (RSS 1.0)"
@@ -5467,6 +5132,11 @@ msgstr "Groupe %s"
 msgid "%1$s group, page %2$d"
 msgstr "Groupe %1$s, page %2$d"
 
+#. TRANS: Tooltip for feed link. %s is a group nickname.
+#, php-format
+msgid "Notice feed for %s group (Activity Streams JSON)"
+msgstr "Flux des avis du groupe %s (flux d’activité JSON)"
+
 #. TRANS: Tooltip for feed link. %s is a group nickname.
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
@@ -5487,42 +5157,8 @@ msgstr "Fil des avis du groupe %s (Atom)"
 msgid "FOAF for %s group"
 msgstr "ami d’un ami pour le groupe %s"
 
-#. TRANS: Header for mini list of group members on a group page (h2).
-msgid "Members"
-msgstr "Membres"
-
-#. TRANS: Description for mini list of group members on a group page when the group has no members.
-#. TRANS: Content of "Listed" page if there are no listed users.
-#. TRANS: Content of "People following tag x" if there are no subscribed users.
-#. TRANS: Empty list message for tags.
-#. TRANS: Text for user subscription statistics if the user has no subscriptions.
-#. TRANS: Text for user subscriber statistics if user has no subscribers.
-#. TRANS: Text for user user group membership statistics if user is not a member of any group.
-#. TRANS: Default content for section/sidebar widget.
-msgid "(None)"
-msgstr "(aucun)"
-
-#. TRANS: Link to all group members from mini list of group members if group has more than n members.
-msgid "All members"
-msgstr "Tous les membres"
-
-#. TRANS: Header for group statistics on a group page (h2).
-#. TRANS: H2 text for user statistics.
-msgid "Statistics"
-msgstr "Statistiques"
-
-#. TRANS: Label for group creation date.
-msgctxt "LABEL"
-msgid "Created"
-msgstr "Créé"
-
-#. TRANS: Label for member count in statistics on group page.
-msgctxt "LABEL"
-msgid "Members"
-msgstr "Membres"
-
 #. TRANS: Notice on group pages for anonymous users for StatusNet sites that accept new registrations.
-#. TRANS: **%s** is the group alias, %%%%site.name%%%% is the site name,
+#. TRANS: %s is the group name, %%%%site.name%%%% is the site name,
 #. TRANS: %%%%action.register%%%% is the URL for registration, %%%%doc.help%%%% is a URL to help.
 #. TRANS: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
 #, php-format
@@ -5541,25 +5177,19 @@ msgstr ""
 "lire plus](%%%%doc.help%%%%))"
 
 #. TRANS: Notice on group pages for anonymous users for StatusNet sites that accept no new registrations.
-#. TRANS: **%s** is the group alias, %%%%site.name%%%% is the site name,
+#. TRANS: %s is the group name, %%%%site.name%%%% is the site name,
 #. TRANS: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
 "wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
 "[StatusNet](http://status.net/) tool. Its members share short messages about "
-"their life and interests. "
+"their life and interests."
 msgstr ""
 "**%s** est un groupe d’utilisateurs sur %%%%site.name%%%%, un service de "
-"[micro-blogging](http://fr.wikipedia.org/wiki/Microblog)  basé sur le "
+"[microblogging](http://fr.wikipedia.org/wiki/Microblog)  basé sur le "
 "logiciel libre [StatusNet](http://status.net/). Ses membres partagent des "
-"messages courts à propos de leur vie et leurs intérêts. "
-
-#. TRANS: Title for list of group administrators on a group page.
-#, fuzzy
-msgctxt "TITLE"
-msgid "Admins"
-msgstr "Administrateurs"
+"messages courts au sujet de de leur vie et de leurs intérêts."
 
 #. TRANS: Client error displayed requesting a single message that does not exist.
 msgid "No such message."
@@ -5584,9 +5214,8 @@ msgid "Message from %1$s on %2$s"
 msgstr "Message reçu de %1$s le %2$s"
 
 #. TRANS: Client exception thrown when trying a view a notice the user has no access to.
-#, fuzzy
 msgid "Not available."
-msgstr "La messagerie instantanée n’est pas disponible."
+msgstr "Non disponible."
 
 #. TRANS: Client error displayed trying to show a deleted notice.
 msgid "Notice deleted."
@@ -5594,108 +5223,113 @@ msgstr "Avis supprimé."
 
 #. TRANS: Title for private list timeline.
 #. TRANS: %1$s is a list, %2$s is a page number.
-#, fuzzy, php-format
+#, php-format
 msgid "Private timeline for %1$s list by you, page %2$d"
-msgstr "Utilisateurs marqués par eux-mêmes avec %1$s - page %2$d"
+msgstr "Fil d’actualités privé de votre liste « %1$s », page %2$d"
 
 #. TRANS: Title for public list timeline where the viewer is the tagger.
 #. TRANS: %1$s is a list, %2$s is a page number.
-#, fuzzy, php-format
+#, php-format
 msgid "Timeline for %1$s list by you, page %2$d"
-msgstr "Utilisateurs marqués par eux-mêmes avec %1$s - page %2$d"
+msgstr "Fil d’actualités de votre liste « %1$s », page %2$d"
 
 #. TRANS: Title for private list timeline.
 #. TRANS: %1$s is a list, %2$s is the tagger's nickname, %3$d is a page number.
-#, fuzzy, php-format
+#, php-format
 msgid "Timeline for %1$s list by %2$s, page %3$d"
-msgstr "%1$s a marqué « %2$s » la page %3$d"
+msgstr "Fil d’actualités de la liste « %1$s » de %2$s, page %3$d"
 
 #. TRANS: Title for private list timeline.
 #. TRANS: %s is a list.
 #, php-format
 msgid "Private timeline of %s list by you"
-msgstr ""
+msgstr "Fil d’actualités privé de votre liste %s"
 
 #. TRANS: Title for public list timeline where the viewer is the tagger.
 #. TRANS: %s is a list.
 #, php-format
 msgid "Timeline for %s list by you"
-msgstr ""
+msgstr "Fil d’actualités de votre liste « %s »"
 
 #. TRANS: Title for private list timeline.
 #. TRANS: %1$s is a list, %2$s is the tagger's nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "Timeline for %1$s list by %2$s"
-msgstr "Réponses à %1$s sur %2$s !"
+msgstr "Fil d’actualités de la liste « %1$s » de %2$s"
 
 #. TRANS: Feed title.
 #. TRANS: %1$s is a list, %2$s is tagger's nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "Feed for %1$s list by %2$s (Atom)"
-msgstr "Flux pour les amis de %s (Atom)"
+msgstr "Flux de la liste « %1$s » de %2$s (Atom)"
 
 #. TRANS: Empty list message for list timeline.
 #. TRANS: %1$s is a list, %2$s is a tagger's nickname.
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "This is the timeline for %1$s list by %2$s but no one has posted anything "
 "yet."
 msgstr ""
-"Ceci est le flux pour %s et ses amis mais personne n’a rien posté pour le "
-"moment."
+"Ceci est de fil d’actualités de la liste « %1$s » de %2$s, mais personne n’y "
+"a rien posté pour le moment."
 
 #. TRANS: Additional empty list message for list timeline for currently logged in user tagged tags.
 msgid "Try tagging more people."
-msgstr ""
+msgstr "Essayez de marquer davantage de personnes."
 
 #. TRANS: Additional empty list message for list timeline.
 #. TRANS: This message contains Markdown links in the form [description](link).
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and start following "
 "this timeline!"
 msgstr ""
-"Pourquoi ne pas [créer un compte](%%action.register%%) et être le premier à "
-"en poster un !"
+"Pourquoi ne pas [créer un compte](%%action.register%%) et commencer à suivre "
+"ce fil d’actualités !"
 
 #. TRANS: Header on show list page.
-#, fuzzy
+#. TRANS: Link description for link to list of users tagged with a tag (so part of a list).
 msgid "Listed"
-msgstr "Licence"
+msgstr "Listé"
+
+#. TRANS: Content of "Listed" page if there are no listed users.
+#. TRANS: Content of "People following tag x" if there are no subscribed users.
+#. TRANS: Description for mini list of group members on a group page when the group has no members.
+#. TRANS: Empty list message for tags.
+#. TRANS: Text for user subscription statistics if the user has no subscriptions.
+#. TRANS: Text for user subscriber statistics if user has no subscribers.
+#. TRANS: Text for user user group membership statistics if user is not a member of any group.
+#. TRANS: Default content for section/sidebar widget.
+msgid "(None)"
+msgstr "(aucun)"
 
 #. TRANS: Link for more "People in list x by a user"
 #. TRANS: if there are more than the mini list's maximum.
-#, fuzzy
 msgid "Show all"
-msgstr "Voir davantage"
+msgstr "Tout afficher"
 
 #. TRANS: Header for tag subscribers.
 #. TRANS: Link description for link to list of users subscribed to a tag.
 msgid "Subscribers"
 msgstr "Abonnés"
 
-#. TRANS: Link for more "People following tag x"
-#. TRANS: if there are more than the mini list's maximum.
-msgid "All subscribers"
-msgstr "Tous les abonnés"
-
-#. TRANS: Page title showing tagged notices in one user's stream.
+#. TRANS: Page title showing tagged notices in one user's timeline.
 #. TRANS: %1$s is the username, %2$s is the hash tag.
-#, fuzzy, php-format
+#, php-format
 msgid "Notices by %1$s tagged %2$s"
-msgstr "%1$s a marqué « %2$s »"
+msgstr "Avis de %1$s marqués « %2$s »"
 
-#. TRANS: Page title showing tagged notices in one user's stream.
+#. TRANS: Page title showing tagged notices in one user's timeline.
 #. TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number.
-#, fuzzy, php-format
+#, php-format
 msgid "Notices by %1$s tagged %2$s, page %3$d"
-msgstr "%1$s a marqué « %2$s » la page %3$d"
+msgstr "Avis de %1$s marqués « %2$s », page %3$d"
 
-#. TRANS: Extended page title showing tagged notices in one user's stream.
+#. TRANS: Extended page title showing tagged notices in one user's timeline.
 #. TRANS: %1$s is the username, %2$d is the page number.
-#, fuzzy, php-format
+#, php-format
 msgid "Notices by %1$s, page %2$d"
-msgstr "Avis marqués avec %1$s, page %2$d"
+msgstr "Avis de %1$s, page %2$d"
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %1$s is a user nickname, %2$s is a hashtag.
@@ -5703,6 +5337,12 @@ msgstr "Avis marqués avec %1$s, page %2$d"
 msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
 msgstr "Fil des avis pour %1$s marqués %2$s (RSS 1.0)"
 
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#, php-format
+msgid "Notice feed for %s (Activity Streams JSON)"
+msgstr "Flux des avis de %s (flux d’activités JSON)"
+
 #. TRANS: Title for link to notice feed.
 #. TRANS: %s is a user nickname.
 #, php-format
@@ -5727,7 +5367,7 @@ msgstr "Flux des avis de %s (Atom)"
 msgid "FOAF for %s"
 msgstr "ami d’un ami pour %s"
 
-#. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
+#. TRANS: First sentence of empty list message for a timeline. $1%s is a user nickname.
 #, php-format
 msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
 msgstr ""
@@ -5741,7 +5381,7 @@ msgstr ""
 "Avez-vous vu quelque chose d’intéressant récemment ? Vous n’avez pas publié "
 "d’avis pour le moment, vous pourriez commencer maintenant :)"
 
-#. TRANS: Second sentence of empty  list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
+#. TRANS: Second sentence of empty  list message for a non-self timeline. %1$s is a user nickname, %2$s is a part of a URL.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
 #, php-format
 msgid ""
@@ -5751,7 +5391,7 @@ msgstr ""
 "Vous pouvez essayer de faire un clin d’œil à %1$s ou de [poster quelque "
 "chose à son intention](%%%%action.newnotice%%%%?status_textarea=%2$s)."
 
-#. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
+#. TRANS: Announcement for anonymous users showing a timeline if site registrations are open.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
 #, php-format
 msgid ""
@@ -5766,17 +5406,17 @@ msgstr ""
 "register%%%%) pour suivre les avis de **%s** et bien plus ! ([En lire plus](%"
 "%%%doc.help%%%%))"
 
-#. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
+#. TRANS: Announcement for anonymous users showing a timeline if site registrations are closed or invite only.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
 "wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
-"[StatusNet](http://status.net/) tool. "
+"[StatusNet](http://status.net/) tool."
 msgstr ""
-"**%s** est inscrit à %%%%site.name%%%%, service de [microblogging](http://fr."
-"wikipedia.org/wiki/Microblog)  basé sur le logiciel libre [StatusNet](http://"
-"status.net/). "
+"**%s** est inscrit à %%%%site.name%%%%, un service de [microblogging](http://"
+"fr.wikipedia.org/wiki/Microblog) basé sur le logiciel libre [StatusNet]"
+"(http://status.net/)."
 
 #. TRANS: Link to the author of a repeated notice. %s is a linked nickname.
 #, php-format
@@ -5793,7 +5433,6 @@ msgid "User is already silenced."
 msgstr "Cet utilisateur est déjà réduit au silence."
 
 #. TRANS: Title for site administration panel.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Site"
 msgstr "Site"
@@ -5810,6 +5449,14 @@ msgstr "Le nom du site ne peut pas être vide."
 msgid "You must have a valid contact email address."
 msgstr "Vous devez avoir une adresse électronique de contact valide."
 
+#. TRANS: Client error displayed when a logo URL is not valid.
+msgid "Invalid logo URL."
+msgstr "URL du logo invalide."
+
+#. TRANS: Client error displayed when a SSL logo URL is invalid.
+msgid "Invalid SSL logo URL."
+msgstr "Adresse URL du logo SSL invalide."
+
 #. TRANS: Client error displayed trying to save site settings with an invalid language code.
 #. TRANS: %s is the invalid language code.
 #, php-format
@@ -5825,48 +5472,46 @@ msgid "Dupe limit must be one or more seconds."
 msgstr "La limite de doublon doit être d’une seconde ou plus."
 
 #. TRANS: Fieldset legend on site settings panel.
-#, fuzzy
 msgctxt "LEGEND"
 msgid "General"
 msgstr "Général"
 
 #. TRANS: Field label on site settings panel.
-#, fuzzy
 msgctxt "LABEL"
 msgid "Site name"
 msgstr "Nom du site"
 
 #. TRANS: Field title on site settings panel.
-#, fuzzy
 msgid "The name of your site, like \"Yourcompany Microblog\"."
-msgstr "Le nom de votre site, comme « Microblog de votre compagnie »"
+msgstr "Le nom de votre site, tel que « Microblog de VotreSociété »."
 
 #. TRANS: Field label on site settings panel.
 msgid "Brought by"
 msgstr "Apporté par"
 
 #. TRANS: Field title on site settings panel.
-#, fuzzy
 msgid "Text used for credits link in footer of each page."
-msgstr "Texte utilisé pour le lien de crédits au bas de chaque page"
+msgstr ""
+"Texte utilisé pour le lien vers les attributions de crédit en bas de chaque "
+"page."
 
 #. TRANS: Field label on site settings panel.
 msgid "Brought by URL"
 msgstr "Apporté par URL"
 
 #. TRANS: Field title on site settings panel.
-#, fuzzy
 msgid "URL used for credits link in footer of each page."
-msgstr "URL utilisée pour le lien de crédits au bas de chaque page"
+msgstr ""
+"URL utilisée pour le lien vers les attributions de crédits en bas de chaque "
+"page"
 
 #. TRANS: Field label on site settings panel.
 msgid "Email"
 msgstr "Courriel"
 
 #. TRANS: Field title on site settings panel.
-#, fuzzy
 msgid "Contact email address for your site."
-msgstr "Adresse de courriel de contact de votre site"
+msgstr "Adresse de courriel de contact de votre site."
 
 #. TRANS: Fieldset legend on site settings panel.
 msgctxt "LEGEND"
@@ -5886,13 +5531,13 @@ msgid "Default language"
 msgstr "Langue par défaut"
 
 #. TRANS: Dropdown title on site settings panel.
-msgid "Site language when autodetection from browser settings is not available"
+msgid ""
+"The site language when autodetection from browser settings is not available."
 msgstr ""
 "Langue du site lorsque la détection automatique des paramètres du navigateur "
-"n'est pas disponible"
+"n’est pas disponible."
 
 #. TRANS: Fieldset legend on site settings panel.
-#, fuzzy
 msgctxt "LEGEND"
 msgid "Limits"
 msgstr "Limites"
@@ -5915,9 +5560,21 @@ msgstr ""
 "Combien de temps (en secondes) les utilisateurs doivent attendre pour poster "
 "la même chose de nouveau."
 
+#. TRANS: Fieldset legend for form to change logo.
+msgid "Logo"
+msgstr "Logo"
+
+#. TRANS: Field label for StatusNet site logo.
+msgid "Site logo"
+msgstr "Logo du site"
+
+#. TRANS: Field label for SSL StatusNet site logo.
+msgid "SSL logo"
+msgstr "Logo SSL"
+
 #. TRANS: Button title for saving site settings.
-msgid "Save site settings"
-msgstr "Sauvegarder les paramètres du site"
+msgid "Save the site settings."
+msgstr "Enregistrer les paramètres du site."
 
 #. TRANS: Page title for site-wide notice tab in admin panel.
 msgid "Site Notice"
@@ -5947,10 +5604,9 @@ msgstr ""
 "Texte de l’avis publié sur l’ensemble du site (maximum 255 caractères ; HTML "
 "autorisé)"
 
-#. TRANS: Title for button to save site notice in admin panel.
-#, fuzzy
+#. TRANS: Button title to save site notice in admin panel.
 msgid "Save site notice."
-msgstr "Enregistrer l'avis du site"
+msgstr "Enregistrer l’avis du site."
 
 #. TRANS: Title for SMS settings.
 msgid "SMS settings"
@@ -5998,10 +5654,9 @@ msgid "SMS phone number"
 msgstr "Numéro de téléphone pour les SMS"
 
 #. TRANS: SMS phone number input field instructions in SMS settings form.
-#, fuzzy
 msgid "Phone number, no punctuation or spaces, with area code."
 msgstr ""
-"Numéro de téléphone, sans ponctuation ni espaces, incluant le code régional"
+"Numéro de téléphone, sans ponctuation ni espaces, avec le code régional."
 
 #. TRANS: Form legend for SMS preferences form.
 msgid "SMS preferences"
@@ -6049,7 +5704,6 @@ msgid "That is the wrong confirmation number."
 msgstr "Ce code de confirmation est incorrect."
 
 #. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
-#, fuzzy
 msgid "Could not delete SMS confirmation."
 msgstr "Impossible de supprimer la confirmation de messagerie instantanée."
 
@@ -6086,12 +5740,10 @@ msgstr ""
 "écrivez-nous à %s."
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
-#, fuzzy
 msgid "No code entered."
-msgstr "Aucun code entré"
+msgstr "Aucun code entré."
 
 #. TRANS: Title for admin panel to configure snapshots.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Snapshots"
 msgstr "Instantanés"
@@ -6113,7 +5765,6 @@ msgid "Invalid snapshot report URL."
 msgstr "URL de rapport d’instantanés invalide."
 
 #. TRANS: Fieldset legend on admin panel for snapshots.
-#, fuzzy
 msgctxt "LEGEND"
 msgid "Snapshots"
 msgstr "Instantanés"
@@ -6131,32 +5782,28 @@ msgid "Data snapshots"
 msgstr "Instantanés de données"
 
 #. TRANS: Dropdown title for snapshot method in admin panel for snapshots.
-#, fuzzy
 msgid "When to send statistical data to status.net servers."
-msgstr "Quand envoyer des données statistiques aux serveurs status.net"
+msgstr "Quand envoyer des données statistiques aux serveurs status.net."
 
 #. TRANS: Input field label for snapshot frequency in admin panel for snapshots.
 msgid "Frequency"
 msgstr "Fréquence"
 
 #. TRANS: Input field title for snapshot frequency in admin panel for snapshots.
-#, fuzzy
 msgid "Snapshots will be sent once every N web hits."
-msgstr "Les instantanés seront envoyés une fois tous les N requêtes"
+msgstr "Des instantanés seront envoyés une fois toutes les N visites du site."
 
 #. TRANS: Input field label for snapshot report URL in admin panel for snapshots.
 msgid "Report URL"
 msgstr "URL de rapport"
 
 #. TRANS: Input field title for snapshot report URL in admin panel for snapshots.
-#, fuzzy
 msgid "Snapshots will be sent to this URL."
-msgstr "Les instantanés seront envoyés à cette URL"
+msgstr "Des instantanés seront envoyés à cette URL."
 
-#. TRANS: Title for button to save snapshot settings.
-#, fuzzy
+#. TRANS: Button title to save snapshot settings.
 msgid "Save snapshot settings."
-msgstr "Sauvegarder les paramètres des instantanés"
+msgstr "Enregistrer les paramètres des instantanés."
 
 #. TRANS: Client error displayed trying a change a subscription for a non-subscribed profile.
 msgid "You are not subscribed to that profile."
@@ -6173,52 +5820,45 @@ msgstr "Vous ne pouvez approuver que vos propres abonnements en attente."
 
 #. TRANS: Title of the first page showing pending subscribers still awaiting approval.
 #. TRANS: %s is the name of the user.
-#, fuzzy, php-format
+#, php-format
 msgid "%s subscribers awaiting approval"
-msgstr "Membres du groupe %s"
+msgstr "Abonnés au groupe « %s » en attente d’approbation"
 
 #. TRANS: Title of all but the first page showing pending subscribersmembers still awaiting approval.
 #. TRANS: %1$s is the name of the user, %2$d is the page number of the members list.
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s subscribers awaiting approval, page %2$d"
-msgstr "Membres du groupe %1$s - page %2$d"
+msgstr "Abonnés au groupe « %1$s » en attente d’approbation, page %2$d"
 
 #. TRANS: Page notice for group members page.
-#, fuzzy
 msgid "A list of users awaiting approval to subscribe to you."
-msgstr "Liste des utilisateurs inscrits à ce groupe."
-
-#. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
-msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
 msgstr ""
-"Vous ne pouvez pas vous abonner  à un profil OMB 0.1 distant par cette "
-"action."
+"Liste des utilisateurs en attente d’approbation pour s’abonner à votre fil "
+"d’actualité."
 
 #. TRANS: Page title when subscription succeeded.
 msgid "Subscribed"
 msgstr "Abonné"
 
 #. TRANS: Client error displayed when trying to perform an action while not logged in.
-#, fuzzy
 msgid "You must be logged in to unsubscribe from a list."
-msgstr "Vous devez ouvrir une session pour créer un groupe."
+msgstr "Vous devez vous connecter pour vous désabonner d’une liste."
 
 #. TRANS: Client error displayed when trying to perform an action without providing an ID.
-#, fuzzy
 msgid "No ID given."
-msgstr "Aucun argument d’identifiant."
+msgstr "Aucun identifiant fourni."
 
 #. TRANS: Server error displayed subscribing to a list fails.
 #. TRANS: %1$s is a user nickname, %2$s is a list, %3$s is the error message (no period).
-#, fuzzy, php-format
+#, php-format
 msgid "Could not subscribe user %1$s to list %2$s: %3$s"
-msgstr "Impossible d’inscrire l’utilisateur %1$s au groupe %2$s."
+msgstr "Impossible d’abonner l’utilisateur %1$s à la liste « %2$s » : %3$s"
 
 #. TRANS: Title of form to subscribe to a list.
 #. TRANS: %1%s is a user nickname, %2$s is a list, %3$s is a tagger nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s subscribed to list %2$s by %3$s"
-msgstr "Abonnés à %1$s - page %2$d"
+msgstr "%1$s s’est abonné à la liste « %2$s » de %3$s"
 
 #. TRANS: Header for list of subscribers for a user (first page).
 #. TRANS: %s is the user's nickname.
@@ -6296,15 +5936,12 @@ msgid ""
 "You're not listening to anyone's notices right now, try subscribing to "
 "people you know. Try [people search](%%action.peoplesearch%%), look for "
 "members in groups you're interested in and in our [featured users](%%action."
-"featured%%). If you're a [Twitter user](%%action.twittersettings%%), you can "
-"automatically subscribe to people you already follow there."
+"featured%%)."
 msgstr ""
 "Vous ne suivez les avis de personne pour le moment, essayez de vous abonnez "
-"à des gens que vous connaissez. Essayez la [recherche de personnes](%%action."
-"peoplesearch%%), cherchez les membres de groupes auquels vous vous "
-"intéressez et nos [utilisateurs en vedette](%%action.featured%%). Si vous "
-"êtes un [utilisateur de Twitter](%%action.twittersettings%%), vous pouvez "
-"vous abonner automatiquement aux gens auquels vous êtes déjà abonné là-bas."
+"à des personnes que vous connaissez. Essayez la [recherche de personnes](%%"
+"action.peoplesearch%%), cherchez les membres de groupes auxquels vous vous "
+"intéressez et nos [utilisateurs en vedette](%%action.featured%%)."
 
 #. TRANS: Subscription list text when looking at the subscriptions for a of a user other
 #. TRANS: than the logged in user that has no subscriptions. %s is the user nickname.
@@ -6315,15 +5952,14 @@ msgid "%s is not listening to anyone."
 msgstr "%s ne suit actuellement personne."
 
 #. TRANS: Atom feed title. %s is a profile nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "Subscription feed for %s (Atom)"
-msgstr "Flux des avis de %s (Atom)"
+msgstr "Flux d’abonnement de %s (Atom)"
 
 #. TRANS: Checkbox label for enabling IM messages for a profile in a subscriptions list.
-#, fuzzy
 msgctxt "LABEL"
 msgid "IM"
-msgstr "IM"
+msgstr "Messagerie instantanée"
 
 #. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
 msgid "SMS"
@@ -6335,6 +5971,12 @@ msgstr "SMS"
 msgid "Notices tagged with %1$s, page %2$d"
 msgstr "Avis marqués avec %1$s, page %2$d"
 
+#. TRANS: Link label for feed on "notices with tag" page.
+#. TRANS: %s is the tag the feed is for.
+#, php-format
+msgid "Notice feed for tag %s (Activity Streams JSON)"
+msgstr "Flux des avis pour la marque %s (flux d’activités JSON)"
+
 #. TRANS: Link label for feed on "notices with tag" page.
 #. TRANS: %s is the tag the feed is for.
 #, php-format
@@ -6356,21 +5998,19 @@ msgstr "Flux des avis pour la marque %s (Atom)"
 #. TRANS: Client error displayed when trying to tag a user that cannot be tagged.
 #. TRANS: Client exception thrown trying to set a tag for a user that cannot be tagged.
 #. TRANS: Error displayed when trying to tag a user that cannot be tagged.
-#, fuzzy
 msgid "You cannot tag this user."
-msgstr "Vous ne pouvez pas envoyer de messages à cet utilisateur."
+msgstr "Vous ne pouvez pas marquer cet utilisateur."
 
 #. TRANS: Title for list form when not on a profile page.
-#, fuzzy
 msgid "List a profile"
-msgstr "Profil de l’utilisateur"
+msgstr "Lister un profil"
 
 #. TRANS: Title for list form when on a profile page.
 #. TRANS: %s is a profile nickname.
-#, fuzzy, php-format
+#, php-format
 msgctxt "ADDTOLIST"
 msgid "List %s"
-msgstr "Limites"
+msgstr "Liste « %s »"
 
 #. TRANS: Title for list form when an error has occurred.
 msgctxt "TITLE"
@@ -6382,41 +6022,36 @@ msgid "User profile"
 msgstr "Profil de l’utilisateur"
 
 #. TRANS: Fieldset legend for list form.
-#, fuzzy
 msgid "List user"
-msgstr "Limites"
+msgstr "Liste utilisateur"
 
 #. TRANS: Field label on list form.
-#, fuzzy
 msgctxt "LABEL"
 msgid "Lists"
-msgstr "Limites"
+msgstr "Listes"
 
 #. TRANS: Field title on list form.
-#, fuzzy
 msgid ""
 "Lists for this user (letters, numbers, -, ., and _), comma- or space- "
 "separated."
 msgstr ""
-"Marques pour vous-même (lettres, chiffres, -, ., et _), séparées par des "
-"virgules ou des espaces"
+"Listes de cet utilisateur (lettres, chiffres, -, ., et _) séparées par des "
+"virgules ou des espaces."
 
 #. TRANS: Title for personal tag cloud section.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Tags"
 msgstr "Balises"
 
 #. TRANS: Success message if lists are saved.
-#, fuzzy
 msgid "Lists saved."
-msgstr "Mot de passe enregistré."
+msgstr "Listes enregistrées."
 
 #. TRANS: Page notice.
-#, fuzzy
 msgid "Use this form to add your subscribers or subscriptions to lists."
 msgstr ""
-"Remplissez les champs suivants pour marquer vos abonnés ou vos abonnements."
+"Remplissez ce formulaire pour ajouter vos abonnés ou vos abonnements aux "
+"listes."
 
 #. TRANS: Client error when requesting a tag feed for a non-existing tag.
 msgid "No such tag."
@@ -6440,26 +6075,13 @@ msgstr "Désabonné"
 
 #. TRANS: Page title for form that allows unsubscribing from a list.
 #. TRANS: %1$s is a nickname, %2$s is a list, %3$s is a tagger nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s unsubscribed from list %2$s by %3$s"
-msgstr "Abonnés à %1$s - page %2$d"
-
-#. TRANS: Client error displayed when trying to update profile with an incompatible license.
-#. TRANS: %1$s is the license incompatible with site license %2$s.
-#. TRANS: Exception thrown when licenses are not compatible for an authorisation request.
-#. TRANS: %1$s is the license for the listenee, %2$s is the license for "this" StatusNet site.
-#, fuzzy, php-format
-msgid ""
-"Listenee stream license \"%1$s\" is not compatible with site license \"%2$s"
-"\"."
-msgstr ""
-"La licence du flux auquel vous êtes abonné(e), « %1$s », n’est pas compatible "
-"avec la licence du site « %2$s »."
+msgstr "%1$s s’est désabonné de la liste « %2$s » de %3$s"
 
 #. TRANS: Title of URL settings tab in profile settings.
-#, fuzzy
 msgid "URL settings"
-msgstr "Paramètres de messagerie instantanée"
+msgstr "Paramètres des URL"
 
 #. TRANS: Instructions for tab "Other" in user profile settings.
 msgid "Manage various other options."
@@ -6494,8 +6116,8 @@ msgstr "URL plus longue que"
 #. TRANS: Field title in URL settings in profile.
 msgid "URLs longer than this will be shortened, 0 means always shorten."
 msgstr ""
-"Les URL plus longues que cela seront raccourcies, 0 signifie toujours "
-"raccourcir."
+"Les URL dans les avis plus longues que ceci seront raccourcies, 0 signifie "
+"toujours raccourcir."
 
 #. TRANS: Field label in URL settings in profile.
 msgid "Text longer than"
@@ -6505,24 +6127,26 @@ msgstr "Texte plus long que"
 msgid ""
 "URLs in notices longer than this will be shortened, 0 means always shorten."
 msgstr ""
+"Les URL dans les avis plus longues que ceci seront raccourcies, 0 signifie "
+"toujours raccourcir."
 
 #. TRANS: Form validation error for form "Other settings" in user profile.
 msgid "URL shortening service is too long (maximum 50 characters)."
 msgstr "Le service de réduction d’URL est trop long (50 caractères maximum)."
 
 #. TRANS: Client exception thrown when the maximum URL settings value is invalid in profile URL settings.
-#, fuzzy
 msgid "Invalid number for maximum URL length."
-msgstr "Contenu de l’avis invalide."
+msgstr "Nombre non valide pour la longueur maximale des URL."
 
 #. TRANS: Client exception thrown when the maximum notice length settings value is invalid in profile URL settings.
-#, fuzzy
 msgid "Invalid number for maximum notice length."
-msgstr "Contenu de l’avis invalide."
+msgstr "Nombre non valide pour la longueur maximale des avis."
 
 #. TRANS: Server exception thrown in profile URL settings when preferences could not be saved.
 msgid "Error saving user URL shortening preferences."
 msgstr ""
+"Erreur lors de l’enregistrement des préférences de raccourcissement des URL "
+"de l’utilisateur."
 
 #. TRANS: User admin panel title.
 msgctxt "TITLE"
@@ -6543,12 +6167,11 @@ msgstr "Texte de bienvenue invalide. La taille maximale est de 255 caractères."
 
 #. TRANS: Client error displayed when trying to set a non-existing user as default subscription for new
 #. TRANS: users in user admin panel. %1$s is the invalid nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "Invalid default subscripton: \"%1$s\" is not a user."
-msgstr "Abonnement par défaut invalide : « %1$s » n’est pas un utilisateur."
+msgstr "Abonnement par défaut non valide : « %1$s » n’est pas un utilisateur."
 
 #. TRANS: Fieldset legend in user administration panel.
-#, fuzzy
 msgctxt "LEGEND"
 msgid "Profile"
 msgstr "Profil"
@@ -6595,163 +6218,9 @@ msgid "Whether to allow users to invite new users."
 msgstr ""
 "S’il faut autoriser les utilisateurs à inviter de nouveaux utilisateurs."
 
-#. TRANS: Title for button to save user settings in user admin panel.
-#, fuzzy
+#. TRANS: Button title to save user settings in user admin panel.
 msgid "Save user settings."
-msgstr "Sauvegarder les paramètres utilisateur"
-
-#. TRANS: Page title.
-msgid "Authorize subscription"
-msgstr "Autoriser l’abonnement"
-
-#. TRANS: Page notice on "Authorize subscription" page.
-#, fuzzy
-msgid ""
-"Please check these details to make sure that you want to subscribe to this "
-"user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
-"click \"Reject\"."
-msgstr ""
-"Veuillez vérifier ces détails pour vous assurer que vous souhaitez vous "
-"abonner aux avis de cet utilisateur. Si vous n’avez pas demandé à vous "
-"abonner aux avis de quelqu’un, cliquez « Rejeter »."
-
-#. TRANS: Button text on Authorise Subscription page.
-#. TRANS: Submit button text to accept a group membership request on approve group form.
-#. TRANS: Submit button text to accept a subscription request on approve sub form.
-#, fuzzy
-msgctxt "BUTTON"
-msgid "Accept"
-msgstr "Accepter"
-
-#. TRANS: Title for button on Authorise Subscription page.
-#. TRANS: Button title to subscribe to a user.
-#, fuzzy
-msgid "Subscribe to this user."
-msgstr "S’abonner à cet utilisateur"
-
-#. TRANS: Button text on Authorise Subscription page.
-#. TRANS: Submit button text to reject a group membership request on approve group form.
-#. TRANS: Submit button text to reject a subscription request on approve sub form.
-#, fuzzy
-msgctxt "BUTTON"
-msgid "Reject"
-msgstr "Refuser"
-
-#. TRANS: Title for button on Authorise Subscription page.
-#, fuzzy
-msgid "Reject this subscription."
-msgstr "Rejeter cet abonnement"
-
-#. TRANS: Client error displayed for an empty authorisation request.
-msgid "No authorization request!"
-msgstr "Pas de requête d’autorisation !"
-
-#. TRANS: Accept message header from Authorise subscription page.
-msgid "Subscription authorized"
-msgstr "Abonnement autorisé"
-
-#. TRANS: Accept message text from Authorise subscription page.
-msgid ""
-"The subscription has been authorized, but no callback URL was passed. Check "
-"with the site's instructions for details on how to authorize the "
-"subscription. Your subscription token is:"
-msgstr ""
-"L’abonnement a été autorisé, mais aucune URL de rappel n’a pas été passée. "
-"Vérifiez les instructions du site pour savoir comment compléter "
-"l’autorisation de l’abonnement. Votre jeton d’abonnement est :"
-
-#. TRANS: Reject message header from Authorise subscription page.
-msgid "Subscription rejected"
-msgstr "Abonnement refusé"
-
-#. TRANS: Reject message from Authorise subscription page.
-msgid ""
-"The subscription has been rejected, but no callback URL was passed. Check "
-"with the site's instructions for details on how to fully reject the "
-"subscription."
-msgstr ""
-"L’abonnement a été refusé, mais aucune URL de rappel n’a pas été passée. "
-"Vérifiez les instructions du site pour savoir comment refuser pleinement "
-"l’abonnement."
-
-#. TRANS: Exception thrown when no valid user is found for an authorisation request.
-#. TRANS: %s is a listener URI.
-#, fuzzy, php-format
-msgid "Listener URI \"%s\" not found here."
-msgstr "L’URI de l’auditeur ‘%s’ n’a pas été trouvée ici."
-
-#. TRANS: Exception thrown when listenee URI is too long for an authorisation request.
-#. TRANS: %s is a listenee URI.
-#, fuzzy, php-format
-msgid "Listenee URI \"%s\" is too long."
-msgstr "L’URI à laquelle vous vous êtes abonné(e) ‘%s’ est trop longue."
-
-#. TRANS: Exception thrown when listenee URI is a local user for an authorisation request.
-#. TRANS: %s is a listenee URI.
-#, fuzzy, php-format
-msgid "Listenee URI \"%s\" is a local user."
-msgstr ""
-"L’URI à laquelle vous vous êtes abonné(e) ‘%s’ est un utilisateur local."
-
-#. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
-#. TRANS: %s is a profile URL.
-#, fuzzy, php-format
-msgid "Profile URL \"%s\" is for a local user."
-msgstr "L’URL du profil ‘%s’ est pour un utilisateur local."
-
-#. TRANS: Exception thrown when avatar URL is invalid for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#, fuzzy, php-format
-msgid "Avatar URL \"%s\" is not valid."
-msgstr "L’URL de l’avatar ‘%s’ n’est pas valide."
-
-#. TRANS: Exception thrown when avatar URL could not be read for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#, fuzzy, php-format
-msgid "Cannot read avatar URL \"%s\"."
-msgstr "Impossible de lire l’URL de l’avatar « %s »."
-
-#. TRANS: Exception thrown when avatar URL return an invalid image type for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#, fuzzy, php-format
-msgid "Wrong image type for avatar URL \"%s\"."
-msgstr "Format d’image invalide pour l’URL de l’avatar « %s »."
-
-#. TRANS: Title for profile design page.
-#. TRANS: Page title for profile design page.
-msgid "Profile design"
-msgstr "Conception de profil"
-
-#. TRANS: Instructions for Profile design page.
-#. TRANS: Instructions for profile design page.
-msgid ""
-"Customize the way your profile looks with a background image and a colour "
-"palette of your choice."
-msgstr ""
-"Personnalisez l’apparence de votre profil avec une image d’arrière plan et "
-"une palette de couleurs de votre choix."
-
-#. TRANS: Succes message on Profile design page when finding an easter egg.
-msgid "Enjoy your hotdog!"
-msgstr "Bon appétit !"
-
-#. TRANS: Form legend on Profile design page.
-#, fuzzy
-msgid "Design settings"
-msgstr "Sauvegarder les paramètres du site"
-
-#. TRANS: Checkbox label on Profile design page.
-msgid "View profile designs"
-msgstr "Afficher les conceptions de profils"
-
-#. TRANS: Title for checkbox on Profile design page.
-msgid "Show or hide profile designs."
-msgstr "Afficher ou masquer les paramètres de conception."
-
-#. TRANS: Form legend on Profile design page for form to choose a background image.
-#, fuzzy
-msgid "Background file"
-msgstr "Arrière plan"
+msgstr "Enregistrer les paramètres utilisateur."
 
 #. TRANS: Page title for all but the first page of groups for a user.
 #. TRANS: %1$s is a nickname, %2$d is a page number.
@@ -6795,10 +6264,10 @@ msgstr "StatusNet %s"
 #. TRANS: %1$s is the engine name (StatusNet) and %2$s is the StatusNet version.
 #, php-format
 msgid ""
-"This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, "
+"This site is powered by %1$s version %2$s, Copyright 2008-2011 StatusNet, "
 "Inc. and contributors."
 msgstr ""
-"Ce site est propulsé par %1$s, version %2$s, Copyright 2008-2010 StatusNet, "
+"Ce site est propulsé par %1$s version %2$s. Copyright 2008–2010 StatusNet, "
 "Inc. et ses contributeurs."
 
 #. TRANS: Header for StatusNet contributors section on the version page.
@@ -6814,24 +6283,24 @@ msgid ""
 "StatusNet is free software: you can redistribute it and/or modify it under "
 "the terms of the GNU Affero General Public License as published by the Free "
 "Software Foundation, either version 3 of the License, or (at your option) "
-"any later version. "
+"any later version."
 msgstr ""
 "StatusNet est un logiciel libre : vous pouvez le redistribuer et/ou le "
-"modifier en respectant les termes de la licence Licence Publique Générale "
-"GNU Affero telle qu’elle a été publiée par la Free Software Foundation, dans "
-"sa version 3 ou (comme vous le souhaitez) toute version plus récente. "
+"modifier en respectant les termes de la Licence Publique Générale GNU Affero "
+"telle qu’elle a été publiée par la Free Software Foundation, dans sa version "
+"3 ou (à votre convenance) toute version ultérieure."
 
 #. TRANS: Content part of StatusNet version page.
 msgid ""
 "This program is distributed in the hope that it will be useful, but WITHOUT "
 "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
 "FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License "
-"for more details. "
+"for more details."
 msgstr ""
 "Ce programme est distribué dans l’espoir qu’il sera utile, mais SANS AUCUNE "
-"GARANTIE ; sans même la garantie implicite de COMMERCIALISATION ou "
-"D’ADAPTATION À UN BUT PARTICULIER. Pour plus de détails, voir la Licence "
-"Publique Générale GNU Affero."
+"GARANTIE ; sans même la garantie implicite de COMMERCIALISABILITÉ ni "
+"d’ADAPTATION À UN BUT PARTICULIER. Consultez la Licence Publique Générale "
+"GNU Affero pour plus de détails."
 
 #. TRANS: Content part of StatusNet version page.
 #. TRANS: %s is a link to the AGPL license with link description "http://www.gnu.org/licenses/agpl.html".
@@ -6845,7 +6314,7 @@ msgstr ""
 
 #. TRANS: Header for StatusNet plugins section on the version page.
 msgid "Plugins"
-msgstr "Extensions"
+msgstr "Greffons"
 
 #. TRANS: Column header for plugins table on version page.
 msgctxt "HEADER"
@@ -6886,24 +6355,32 @@ msgstr "Impossible de traiter l’URL « %s »"
 msgid "Robin thinks something is impossible."
 msgstr "Robin pense que quelque chose est impossible."
 
+#. TRANS: Message used to be inserted as %2$s in  the text "No file may
+#. TRANS: be larger than %1$d byte and the file you sent was %2$s.".
+#. TRANS: %1$d is the number of bytes of an uploaded file.
+#, php-format
+msgid "%1$d byte"
+msgid_plural "%1$d bytes"
+msgstr[0] "%1$d octet"
+msgstr[1] " %1$d  octets"
+
 #. TRANS: Message given if an upload is larger than the configured maximum.
-#. TRANS: %1$d is the byte limit for uploads, %2$d is the byte count for the uploaded file.
-#. TRANS: %1$s is used for plural.
+#. TRANS: %1$d (used for plural) is the byte limit for uploads,
+#. TRANS: %2$s is the proper form of "n bytes". This is the only ways to have
+#. TRANS: gettext support multiple plurals in the same message, unfortunately...
 #, php-format
 msgid ""
-"No file may be larger than %1$d byte and the file you sent was %2$d bytes. "
-"Try to upload a smaller version."
+"No file may be larger than %1$d byte and the file you sent was %2$s. Try to "
+"upload a smaller version."
 msgid_plural ""
-"No file may be larger than %1$d bytes and the file you sent was %2$d bytes. "
-"Try to upload a smaller version."
+"No file may be larger than %1$d bytes and the file you sent was %2$s. Try to "
+"upload a smaller version."
 msgstr[0] ""
-"Un fichier ne peut pas occuper plus de %1$d octet et le fichier que vous "
-"avez envoyé occupait %2$d octets. Essayez de téléverser une version moins "
-"lourde."
+"Aucun fichier ne peut occuper plus de %1$d octet et le fichier que vous avez "
+"envoyé occupait %2$s. Essayez de téléverser une version moins lourde."
 msgstr[1] ""
-"Un fichier ne peut pas occuper plus de %1$d octets et le fichier que vous "
-"avez envoyé occupait %2$d octets. Essayez de téléverser une version moins "
-"lourde."
+"Aucun fichier ne peut occuper plus de %1$d octets et le fichier que vous "
+"avez envoyé occupait %2$s. Essayez de téléverser une version moins lourde."
 
 #. TRANS: Message given if an upload would exceed user quota.
 #. TRANS: %d (number) is the user quota in bytes and is used for plural.
@@ -6971,6 +6448,11 @@ msgstr "Impossible de mettre à jour le groupe local."
 msgid "Could not create login token for %s"
 msgstr "Impossible de créer le jeton d’identification pour %s"
 
+#. TRANS: Exception thrown when a program code class (%s) cannot be instantiated.
+#, php-format
+msgid "Cannot instantiate class %s."
+msgstr "Impossible d’instancier la classe %s."
+
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.
 msgid "No database name or DSN found anywhere."
 msgstr "Aucun nom de base de données ou DSN trouvé nulle part."
@@ -6994,9 +6476,11 @@ msgid "No such profile (%1$d) for notice (%2$d)."
 msgstr "Impossible de trouver le profil (%1$d) pour l’avis (%2$d)."
 
 #. TRANS: Server exception. %s are the error details.
-#, fuzzy, php-format
+#, php-format
 msgid "Database error inserting hashtag: %s."
-msgstr "Erreur de base de donnée en insérant la marque (hashtag) : %s"
+msgstr ""
+"Une erreur a été retournée par la base de données lors de l’insertion de la "
+"marque « %s »."
 
 #. TRANS: Client exception thrown if a notice contains too many characters.
 msgid "Problem saving notice. Too long."
@@ -7026,24 +6510,21 @@ msgid "You are banned from posting notices on this site."
 msgstr "Il vous est interdit de poster des avis sur ce site."
 
 #. TRANS: Client exception thrown in notice when trying to repeat a missing or deleted notice.
-#, fuzzy
 msgid "Cannot repeat; original notice is missing or deleted."
-msgstr "Vous ne pouvez pas reprendre votre propre avis."
+msgstr ""
+"Impossible de reprendre l’avis ; l’avis original est manquant ou supprimé."
 
 #. TRANS: Client error displayed when trying to repeat an own notice.
-#, fuzzy
 msgid "You cannot repeat your own notice."
 msgstr "Vous ne pouvez pas reprendre votre propre avis."
 
 #. TRANS: Client error displayed when trying to repeat a non-public notice.
-#, fuzzy
 msgid "Cannot repeat a private notice."
-msgstr "Vous ne pouvez pas reprendre votre propre avis."
+msgstr "Vous ne pouvez pas reprendre un avis privé."
 
 #. TRANS: Client error displayed when trying to repeat a notice you cannot access.
-#, fuzzy
 msgid "Cannot repeat a notice you cannot read."
-msgstr "Vous ne pouvez pas reprendre votre propre avis."
+msgstr "Vous ne pouvez pas reprendre un avis que vous ne pouvez pas lire."
 
 #. TRANS: Client error displayed when trying to repeat an already repeated notice.
 msgid "You already repeated that notice."
@@ -7051,9 +6532,9 @@ msgstr "Vous avez déjà repris cet avis."
 
 #. TRANS: Client error displayed when trying to reply to a notice a the target has no access to.
 #. TRANS: %1$s is a user nickname, %2$d is a notice ID (number).
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s has no access to notice %2$d."
-msgstr "Aucun avis récent pour cet utilisateur."
+msgstr "%1$s n’a pas accès à l’avis numéro %2$d."
 
 #. TRANS: Server exception thrown when a notice cannot be saved.
 #. TRANS: Server exception thrown when a notice cannot be updated.
@@ -7099,32 +6580,27 @@ msgstr ""
 
 #. TRANS: Server exception.
 msgid "The tag you are trying to rename to already exists."
-msgstr ""
+msgstr "Le nom vers lequel vous tentez de renommer la marque existe déjà."
 
 #. TRANS: Server exception saving new tag without having a tagger specified.
-#, fuzzy
 msgid "No tagger specified."
-msgstr "Aucun groupe n’a été spécifié."
+msgstr "Aucun marqueur n’a été spécifié."
 
 #. TRANS: Server exception saving new tag without having a tag specified.
-#, fuzzy
 msgid "No tag specified."
-msgstr "Aucun groupe n’a été spécifié."
+msgstr "Aucune marque n’a été spécifiée."
 
 #. TRANS: Server exception saving new tag.
-#, fuzzy
 msgid "Could not create profile tag."
-msgstr "Impossible d’enregistrer le profil."
+msgstr "Impossible de créer la marque de profil."
 
 #. TRANS: Server exception saving new tag.
-#, fuzzy
 msgid "Could not set profile tag URI."
-msgstr "Impossible d’enregistrer le profil."
+msgstr "Impossible de définir l’URI de la marque de profil."
 
 #. TRANS: Server exception saving new tag.
-#, fuzzy
 msgid "Could not set profile tag mainpage."
-msgstr "Impossible d’enregistrer le profil."
+msgstr "Impossible de définir la page principale de la marque de profil."
 
 #. TRANS: Client exception thrown trying to set more tags than allowed.
 #, php-format
@@ -7132,23 +6608,27 @@ msgid ""
 "You already have created %d or more tags which is the maximum allowed number "
 "of tags. Try using or deleting some existing tags."
 msgstr ""
+"Vous avez déjà créé  au moins %d  marques qui est le nombre maximum de "
+"marques autorisé. Essayez en réutilisant ou supprimant certaines marques "
+"existantes."
 
 #. TRANS: Client exception thrown when trying to add more people than allowed to a list.
 #, php-format
 msgid ""
 "You already have %1$d or more people in list %2$s, which is the maximum "
-"allowed number.Try unlisting others first."
+"allowed number. Try unlisting others first."
 msgstr ""
+"Vous avez déjà  au moins %1$d  personnes dans la liste « %2$s » , ce qui est "
+"le nombre maximum de personnes autorisé. Essayez d’abord de retirer quelques "
+"autres personnes de la liste."
 
 #. TRANS: Exception thrown when inserting a list subscription in the database fails.
-#, fuzzy
 msgid "Adding list subscription failed."
-msgstr "Impossible de supprimer l’abonnement"
+msgstr "Impossible d’ajouter l’abonnement à la liste."
 
 #. TRANS: Exception thrown when deleting a list subscription from the database fails.
-#, fuzzy
 msgid "Removing list subscription failed."
-msgstr "Impossible de supprimer l’abonnement"
+msgstr "Impossible de supprimer l’abonnement à la liste"
 
 #. TRANS: Exception thrown when a right for a non-existing user profile is checked.
 msgid "Missing profile."
@@ -7159,7 +6639,6 @@ msgid "Unable to save tag."
 msgstr "Impossible d’enregistrer l’étiquette."
 
 #. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
-#. TRANS: Error message displayed to a banned user when they try to subscribe.
 msgid "You have been banned from subscribing."
 msgstr "Il vous a été interdit de vous abonner."
 
@@ -7179,16 +6658,11 @@ msgstr "Pas abonné !"
 msgid "Could not delete self-subscription."
 msgstr "Impossible de supprimer l’abonnement à soi-même."
 
-#. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
-msgid "Could not delete subscription OMB token."
-msgstr "Impossible de supprimer le jeton OMB de l'abonnement."
-
 #. TRANS: Exception thrown when a subscription could not be deleted on the server.
 msgid "Could not delete subscription."
 msgstr "Impossible de supprimer l’abonnement"
 
 #. TRANS: Activity title when subscribing to another person.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Follow"
 msgstr "Suivre"
@@ -7207,7 +6681,7 @@ msgstr "Bienvenue à %1$s, @%2$s !"
 
 #. TRANS: Exception thrown when trying view "repeated to me".
 msgid "Not implemented since inbox change."
-msgstr ""
+msgstr "Non mis en œuvre à partir d’un changement de la boîte de réception."
 
 #. TRANS: Server exception.
 msgid "No single user defined for single-user mode."
@@ -7217,6 +6691,18 @@ msgstr "Aucun utilisateur unique défini pour le mode mono-utilisateur."
 msgid "Single-user mode code called when not enabled."
 msgstr "Code en mode mono-utilisateur appelé quand ce n’est pas autorisé."
 
+#. TRANS: Information on password recovery form if no known username or e-mail address was specified.
+msgid "No user with that email address or username."
+msgstr "Aucun utilisateur trouvé avec ce courriel ou ce nom."
+
+#. TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.
+msgid "No registered email address for that user."
+msgstr "Aucune adresse courriel enregistrée pour cet utilisateur."
+
+#. TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.
+msgid "Error saving address confirmation."
+msgstr "Erreur lors de l’enregistrement de la confirmation du courriel."
+
 #. TRANS: Server exception thrown when creating a group failed.
 msgid "Could not create group."
 msgstr "Impossible de créer le groupe."
@@ -7235,21 +6721,21 @@ msgstr "Impossible d’enregistrer les informations du groupe local."
 
 #. TRANS: Exception thrown when an account could not be located when it should be moved.
 #. TRANS: %s is the remote site.
-#, fuzzy, php-format
+#, php-format
 msgid "Cannot locate account %s."
-msgstr "Vous ne pouvez pas supprimer des utilisateurs."
+msgstr "Impossible de localiser le compte %s."
 
 #. TRANS: Exception thrown when a service document could not be located account move.
 #. TRANS: %s is the remote site.
 #, php-format
 msgid "Cannot find XRD for %s."
-msgstr ""
+msgstr "Impossible de trouver le XRD pour le site « %s »."
 
 #. TRANS: Exception thrown when an account could not be located when it should be moved.
 #. TRANS: %s is the remote site.
 #, php-format
 msgid "No AtomPub API service for %s."
-msgstr ""
+msgstr "Aucun service API AtomPub pour le site « %s »."
 
 #. TRANS: H2 for user actions in a profile.
 #. TRANS: H2 for entity actions in a profile.
@@ -7261,23 +6747,19 @@ msgid "User deletion in progress..."
 msgstr "Suppression de l'utilisateur en cours..."
 
 #. TRANS: Link title for link on user profile.
-#, fuzzy
 msgid "Edit profile settings."
-msgstr "Modifier les paramètres du profil"
+msgstr "Modifier les paramètres du profil."
 
 #. TRANS: Link text for link on user profile.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Edit"
 msgstr "Modifier"
 
 #. TRANS: Link title for link on user profile.
-#, fuzzy
 msgid "Send a direct message to this user."
-msgstr "Envoyer un message à cet utilisateur"
+msgstr "Envoyer un message directement à cet utilisateur."
 
 #. TRANS: Link text for link on user profile.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Message"
 msgstr "Message"
@@ -7315,7 +6797,6 @@ msgid "Show more"
 msgstr "Voir davantage"
 
 #. TRANS: Inline reply form submit button: submits a reply comment.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Reply"
 msgstr "Répondre"
@@ -7326,10 +6807,9 @@ msgid "Write a reply..."
 msgstr "Écrire une réponse..."
 
 #. TRANS: Tab on the notice form.
-#, fuzzy
 msgctxt "TAB"
 msgid "Status"
-msgstr "StatusNet"
+msgstr "Statut"
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
 #. TRANS: Text between [] is a link description, text between () is the link itself.
@@ -7404,57 +6884,56 @@ msgid "Expecting a root feed element but got a whole XML document."
 msgstr "Attendait un élément racine mais a reçu tout un document XML."
 
 #. TRANS: Client exception thrown when using an unknown verb for the activity importer.
-#, fuzzy, php-format
+#, php-format
 msgid "Unknown verb: \"%s\"."
-msgstr "Langue « %s » inconnue."
+msgstr "Verbe inconnu : « %s »."
 
 #. TRANS: Client exception thrown when trying to force a subscription for an untrusted user.
 msgid "Cannot force subscription for untrusted user."
-msgstr ""
+msgstr "Impossible de forcer l’abonnement pour un utilisateur non fiable."
 
 #. TRANS: Client exception thrown when trying to force a remote user to subscribe.
-#, fuzzy
 msgid "Cannot force remote user to subscribe."
-msgstr "Indiquez le nom de l’utilisateur auquel vous souhaitez vous abonner."
+msgstr "Impossible de forcer un utilisateur distant à s’abonner."
 
 #. TRANS: Client exception thrown when trying to subscribe to an unknown profile.
-#, fuzzy
 msgid "Unknown profile."
-msgstr "Type de fichier inconnu"
+msgstr "Profil inconnu."
 
 #. TRANS: Client exception thrown when trying to import an event not related to the importing user.
 msgid "This activity seems unrelated to our user."
-msgstr ""
+msgstr "Cette activité semble sans rapport avec notre utilisateur."
 
 #. TRANS: Client exception thrown when trying to join a remote group that is not a group.
 msgid "Remote profile is not a group!"
-msgstr ""
+msgstr "Le profil distant n’est pas un groupe !"
 
 #. TRANS: Client exception thrown when trying to join a group the importing user is already a member of.
-#, fuzzy
 msgid "User is already a member of this group."
-msgstr "Vous êtes déjà membre de ce groupe."
+msgstr "L’utilisateur est déjà membre de ce groupe."
 
 #. TRANS: Client exception thrown when trying to import a notice by another user.
 #. TRANS: %1$s is the source URI of the notice, %2$s is the URI of the author.
 #, php-format
 msgid "Already know about notice %1$s and  it has a different author %2$s."
-msgstr ""
+msgstr "Avis « %1$s » déjà connu et qui a un autre auteur %2$s ."
 
 #. TRANS: Client exception thrown when trying to overwrite the author information for a non-trusted user during import.
 msgid "Not overwriting author info for non-trusted user."
 msgstr ""
+"Impossible pour un utilisateur non fiable de remplacer les informations sur "
+"l’auteur."
 
 #. TRANS: Client exception thrown when trying to import a notice without content.
 #. TRANS: %s is the notice URI.
-#, fuzzy, php-format
+#, php-format
 msgid "No content for notice %s."
-msgstr "Chercher dans le contenu des avis"
+msgstr "Aucun contenu dans l’avis « %s »."
 
 #. TRANS: Exception thrown if a non-existing user is provided. %s is a user ID.
-#, fuzzy, php-format
+#, php-format
 msgid "No such user \"%s\"."
-msgstr "Utilisateur non trouvé."
+msgstr "Aucun utilisateur « %s »."
 
 #. TRANS: Client exception thrown when post to collection fails with a 400 status.
 #. TRANS: %1$s is a URL, %2$s is the status, %s$s is the fail reason.
@@ -7462,10 +6941,10 @@ msgstr "Utilisateur non trouvé."
 #. TRANS: %1$s is a URL, %2$s is the status, %s$s is the fail reason.
 #. TRANS: Exception thrown when post to collection fails with a status that is not handled.
 #. TRANS: %1$s is a URL, %2$s is the status, %s$s is the fail reason.
-#, fuzzy, php-format
+#, php-format
 msgctxt "URLSTATUSREASON"
 msgid "%1$s %2$s %3$s"
-msgstr "%1$s - %2$s"
+msgstr "%1$s %2$s %3$s"
 
 #. TRANS: Client exception thrown when there is no source attribute.
 msgid "Can't handle remote content yet."
@@ -7495,32 +6974,15 @@ msgstr "showForm() n’a pas été implémentée."
 msgid "saveSettings() not implemented."
 msgstr "saveSettings() n’a pas été implémentée."
 
-#. TRANS: Client error message thrown if design settings could not be deleted in
-#. TRANS: the admin panel Design.
-msgid "Unable to delete design setting."
-msgstr "Impossible de supprimer les paramètres de conception."
-
 #. TRANS: Header in administrator navigation panel.
-#. TRANS: Header in settings navigation panel.
-#, fuzzy
 msgctxt "HEADER"
 msgid "Home"
-msgstr "Site personnel"
-
-#. TRANS: Menu item in administrator navigation panel.
-#. TRANS: Menu item in default local navigation panel.
-#. TRANS: Menu item in personal group navigation menu.
-#. TRANS: Menu item in settings navigation panel.
-#, fuzzy
-msgctxt "MENU"
-msgid "Home"
-msgstr "Site personnel"
+msgstr "Accueil"
 
 #. TRANS: Header in administrator navigation panel.
-#, fuzzy
 msgctxt "HEADER"
 msgid "Admin"
-msgstr "Administrer"
+msgstr "Administrateur"
 
 #. TRANS: Menu item title in administrator navigation panel.
 msgid "Basic site configuration"
@@ -7531,17 +6993,6 @@ msgctxt "MENU"
 msgid "Site"
 msgstr "Site"
 
-#. TRANS: Menu item title in administrator navigation panel.
-msgid "Design configuration"
-msgstr "Configuration de la conception"
-
-#. TRANS: Menu item in administrator navigation panel.
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: Menu item in settings navigation panel.
-msgctxt "MENU"
-msgid "Design"
-msgstr "Conception"
-
 #. TRANS: Menu item title in administrator navigation panel.
 msgid "User configuration"
 msgstr "Configuration utilisateur"
@@ -7583,17 +7034,15 @@ msgid "Edit site notice"
 msgstr "Modifier l'avis du site"
 
 #. TRANS: Menu item in administrator navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Site notice"
-msgstr "Notice du site"
+msgstr "Avis du site"
 
 #. TRANS: Menu item title in administrator navigation panel.
 msgid "Snapshots configuration"
 msgstr "Configuration des instantanés"
 
 #. TRANS: Menu item in administrator navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Snapshots"
 msgstr "Instantanés"
@@ -7603,21 +7052,18 @@ msgid "Set site license"
 msgstr "Définir la licence du site"
 
 #. TRANS: Menu item in administrator navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "License"
 msgstr "Licence"
 
 #. TRANS: Menu item title in administrator navigation panel.
-#, fuzzy
 msgid "Plugins configuration"
-msgstr "Configuration des chemins"
+msgstr "Configuration des greffons"
 
 #. TRANS: Menu item in administrator navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Plugins"
-msgstr "Extensions"
+msgstr "Greffons"
 
 #. TRANS: Client error 401.
 msgid "API resource requires read-write access, but you only have read access."
@@ -7646,44 +7092,6 @@ msgstr "Aucun utilisateur associé à ce jeton."
 msgid "Could not authenticate you."
 msgstr "Impossible de vous authentifier."
 
-#. TRANS: Server error displayed when trying to create an anynymous OAuth consumer.
-msgid "Could not create anonymous consumer."
-msgstr "Impossible de créer un consommateur anonyme."
-
-#. TRANS: Server error displayed when trying to create an anynymous OAuth application.
-msgid "Could not create anonymous OAuth application."
-msgstr "Impossible de créer l’application OAuth anonyme."
-
-#. TRANS: Exception thrown when no token association could be found.
-msgid ""
-"Could not find a profile and application associated with the request token."
-msgstr ""
-"Impossible de trouver le profil et l’application associés au jeton de "
-"requête."
-
-#. TRANS: Exception thrown when no access token can be issued.
-msgid "Could not issue access token."
-msgstr "Impossible d’émettre le jeton d’accès."
-
-#. TRANS: Exception thrown when a database error occurs.
-msgid "Database error inserting OAuth application user."
-msgstr ""
-"Erreur de base de donnée en insérant l’utilisateur de l’application OAuth"
-
-#. TRANS: Exception thrown when a database error occurs.
-#, fuzzy
-msgid "Database error updating OAuth application user."
-msgstr ""
-"Erreur de base de donnée en insérant l’utilisateur de l’application OAuth"
-
-#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
-msgid "Tried to revoke unknown token."
-msgstr "Révocation essayée d’un jeton inconnu."
-
-#. TRANS: Exception thrown when an attempt is made to remove a revoked token.
-msgid "Failed to delete revoked token."
-msgstr "Impossible de supprimer un jeton révoqué."
-
 #. TRANS: Form input field label for application icon.
 msgid "Icon"
 msgstr "Icône"
@@ -7766,18 +7174,16 @@ msgstr ""
 "écriture"
 
 #. TRANS: Submit button title.
-msgid "Cancel"
-msgstr "Annuler"
+msgid "Cancel application changes."
+msgstr "Annuler les modifications de l’application."
 
 #. TRANS: Submit button title.
-#. TRANS: Button text to save a list.
-msgid "Save"
-msgstr "Enregistrer"
+msgid "Save application changes."
+msgstr "Enregistrer les modifications de l’application."
 
 #. TRANS: Name for an anonymous application in application list.
-#, fuzzy
 msgid "Unknown application"
-msgstr "Action inconnue"
+msgstr "Application inconnue"
 
 #. TRANS: Message has a leading space and a trailing space. Used in application list.
 #. TRANS: Before this message the application name is put, behind it the organisation that manages it.
@@ -7808,26 +7214,37 @@ msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "Révoquer"
 
+#. TRANS: Submit button text to accept a group membership request on approve group form.
+#. TRANS: Submit button text to accept a subscription request on approve sub form.
+msgctxt "BUTTON"
+msgid "Accept"
+msgstr "Accepter"
+
+#. TRANS: Submit button text to reject a group membership request on approve group form.
+#. TRANS: Submit button text to reject a subscription request on approve sub form.
+msgctxt "BUTTON"
+msgid "Reject"
+msgstr "Rejeter"
+
 #. TRANS: Atom feed exception thrown when an author element does not contain a name element.
-#, fuzzy
 msgid "Author element must contain a name element."
-msgstr "l’élément « author » doit contenir un élément « name »."
+msgstr ""
+"L’élément <code>author</code> doit contenir un élément <code>name</code>."
 
 #. TRANS: Server exception thrown when using the method setActivitySubject() in the class Atom10Feed.
-#, fuzzy
 msgid "Do not use this method!"
-msgstr "Ne pas supprimer ce groupe"
+msgstr "Ne pas utiliser cette méthode !"
 
 #. TRANS: Title in atom list notice feed. %1$s is a list name, %2$s is a tagger's nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "Timeline for people in list %1$s by %2$s"
-msgstr "Réponses à %1$s sur %2$s !"
+msgstr "Fil d’actualités des personnes dans la liste « %1$s » de %2$s"
 
 #. TRANS: Message is used as a subtitle in atom list notice feed.
 #. TRANS: %1$s is a tagger's nickname, %2$s is a list name, %3$s is a site name.
-#, fuzzy, php-format
+#, php-format
 msgid "Updates from %1$s's list %2$s on %3$s!"
-msgstr "Statuts de %1$s dans %2$s!"
+msgstr "Mises à jour de la liste « %2$s » de %1$s sur le site %3$s !"
 
 #. TRANS: Title.
 msgid "Notices where this attachment appears"
@@ -7859,10 +7276,9 @@ msgid "Cancel join request"
 msgstr "Annuler la requête d’adhésion"
 
 #. TRANS: Button text for form action to cancel a subscription request.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Cancel subscription request"
-msgstr "Tous les abonnements"
+msgstr "Annuler la requête d’abonnement"
 
 #. TRANS: Title for command results.
 msgid "Command results"
@@ -7931,9 +7347,8 @@ msgstr ""
 "Messages : %3$s"
 
 #. TRANS: Error message text shown when a favorite could not be set because it has already been favorited.
-#, fuzzy
 msgid "Could not create favorite: Already favorited."
-msgstr "Impossible de créer le favori."
+msgstr "Impossible de créer le favori : il est déjà parmi les favoris."
 
 #. TRANS: Text shown when a notice has been marked as favourite successfully.
 msgid "Notice marked as fave."
@@ -7955,16 +7370,16 @@ msgstr "%1$s a quitté le groupe %2$s."
 #. TRANS: %1$s is the tagged user, %2$s is the error message (no punctuation).
 #, php-format
 msgid "Error tagging %1$s: %2$s"
-msgstr ""
+msgstr "Erreur lors du marquage de %1$s : %2$s"
 
 #. TRANS: Succes message displayed if tagging a user succeeds.
 #. TRANS: %1$s is the tagged user's nickname, %2$s is a list of tags.
 #. TRANS: Plural is decided based on the number of tags added (not part of message).
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s was tagged %2$s"
 msgid_plural "%1$s was tagged %2$s"
-msgstr[0] "%1$s - %2$s"
-msgstr[1] "%1$s - %2$s"
+msgstr[0] "La marque suivante a été ajoutée à l’utilisateur %1$s : %2$s."
+msgstr[1] "Les marques suivantes ont été ajoutées à l’utilisateur %1$s : %2$s."
 
 #. TRANS: Separator for list of tags.
 #. TRANS: Separator in list of user names like "Jim, Bob, Mary".
@@ -7981,7 +7396,7 @@ msgstr "Marque invalide : « %s »"
 #. TRANS: %1$s is the untagged user, %2$s is the error message (no punctuation).
 #, php-format
 msgid "Error untagging %1$s: %2$s"
-msgstr ""
+msgstr "Erreur lors du démarquage de %1$s : %2$s"
 
 #. TRANS: Succes message displayed if untagging a user succeeds.
 #. TRANS: %1$s is the untagged user's nickname, %2$s is a list of tags.
@@ -7989,8 +7404,9 @@ msgstr ""
 #, php-format
 msgid "The following tag was removed from user %1$s: %2$s."
 msgid_plural "The following tags were removed from user %1$s: %2$s."
-msgstr[0] ""
+msgstr[0] "La marque suivante a été retirée de l’utilisateur %1$s : %2$s."
 msgstr[1] ""
+"Les marques suivantes ont été retirées de l’utilisateur %1$s : %2$s."
 
 #. TRANS: Whois output.
 #. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
@@ -8187,163 +7603,150 @@ msgstr[0] "Vous êtes membre de ce groupe :"
 msgstr[1] "Vous êtes membre de ces groupes :"
 
 #. TRANS: Header line of help text for commands.
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "Commands:"
-msgstr "Résultats de la commande"
+msgstr "Commandes :"
 
 #. TRANS: Help message for IM/SMS command "on".
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "turn on notifications"
-msgstr "Impossible d’activer les avertissements."
+msgstr "activer les notifications"
 
 #. TRANS: Help message for IM/SMS command "off".
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "turn off notifications"
-msgstr "Impossible de désactiver les avertissements."
+msgstr "désactiver les notifications"
 
 #. TRANS: Help message for IM/SMS command "help".
 msgctxt "COMMANDHELP"
 msgid "show this help"
-msgstr ""
+msgstr "afficher cette aide"
 
 #. TRANS: Help message for IM/SMS command "follow <nickname>".
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "subscribe to user"
-msgstr "S’abonner à cet utilisateur"
+msgstr "s’abonner à l’utilisateur"
 
 #. TRANS: Help message for IM/SMS command "groups".
 msgctxt "COMMANDHELP"
 msgid "lists the groups you have joined"
-msgstr ""
+msgstr "répertorie les groupes que vous avez rejoints"
 
 #. TRANS: Help message for IM/SMS command "tag".
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "tag a user"
-msgstr "Marquer l’utilisateur"
+msgstr "marquer un utilisateur"
 
 #. TRANS: Help message for IM/SMS command "untag".
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "untag a user"
-msgstr "Marquer l’utilisateur"
+msgstr "démarquer un utilisateur"
 
 #. TRANS: Help message for IM/SMS command "subscriptions".
 msgctxt "COMMANDHELP"
 msgid "list the people you follow"
-msgstr ""
+msgstr "répertorie les personnes que vous suivez"
 
 #. TRANS: Help message for IM/SMS command "subscribers".
 msgctxt "COMMANDHELP"
 msgid "list the people that follow you"
-msgstr ""
+msgstr "répertorie les personnes qui vous suivent"
 
 #. TRANS: Help message for IM/SMS command "leave <nickname>".
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "unsubscribe from user"
-msgstr "Ne plus suivre cet utilisateur"
+msgstr "se désabonner de cet utilisateur"
 
 #. TRANS: Help message for IM/SMS command "d <nickname> <text>".
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "direct message to user"
-msgstr "Messages directs envoyés à %s"
+msgstr "message direct à l’utilisateur"
 
 #. TRANS: Help message for IM/SMS command "get <nickname>".
 msgctxt "COMMANDHELP"
 msgid "get last notice from user"
-msgstr ""
+msgstr "obtenir le dernier avis de l’utilisateur"
 
 #. TRANS: Help message for IM/SMS command "whois <nickname>".
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "get profile info on user"
-msgstr "Information de profil"
+msgstr "obtenir les informations de profil sur l’utilisateur"
 
 #. TRANS: Help message for IM/SMS command "lose <nickname>".
 msgctxt "COMMANDHELP"
 msgid "force user to stop following you"
-msgstr ""
+msgstr "obliger l’utilisateur à arrêter de vous suivre"
 
 #. TRANS: Help message for IM/SMS command "fav <nickname>".
 msgctxt "COMMANDHELP"
 msgid "add user's last notice as a 'fave'"
-msgstr ""
+msgstr "ajouter le dernier avis de l’utilisateur parmi les favoris"
 
 #. TRANS: Help message for IM/SMS command "fav #<notice_id>".
 msgctxt "COMMANDHELP"
 msgid "add notice with the given id as a 'fave'"
-msgstr ""
+msgstr "ajouter l’avis ayant l’identifiant donné parmi les favoris"
 
 #. TRANS: Help message for IM/SMS command "repeat #<notice_id>".
 msgctxt "COMMANDHELP"
 msgid "repeat a notice with a given id"
-msgstr ""
+msgstr "reprendre l’avis ayant un identifiant donné"
 
 #. TRANS: Help message for IM/SMS command "repeat <nickname>".
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "repeat the last notice from user"
-msgstr "Reprendre cet avis"
+msgstr "reprendre le dernier avis de l’utilisateur"
 
 #. TRANS: Help message for IM/SMS command "reply #<notice_id>".
 msgctxt "COMMANDHELP"
 msgid "reply to notice with a given id"
-msgstr ""
+msgstr "répondre à l’avis ayant un identifiant donné"
 
 #. TRANS: Help message for IM/SMS command "reply <nickname>".
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "reply to the last notice from user"
-msgstr "Répondre à cet avis"
+msgstr "répondre au dernier avis de l’utilisateur"
 
 #. TRANS: Help message for IM/SMS command "join <group>".
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "join group"
-msgstr "Inconnu"
+msgstr "rejoindre le groupe"
 
 #. TRANS: Help message for IM/SMS command "login".
 msgctxt "COMMANDHELP"
 msgid "Get a link to login to the web interface"
-msgstr ""
+msgstr "Obtenir un lien pour se connecter et s’identifier à l’interface Web"
 
 #. TRANS: Help message for IM/SMS command "drop <group>".
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "leave group"
-msgstr "Supprimer le groupe"
+msgstr "quitter le groupe"
 
 #. TRANS: Help message for IM/SMS command "stats".
 msgctxt "COMMANDHELP"
 msgid "get your stats"
-msgstr ""
+msgstr "obtenir vos statistiques"
 
 #. TRANS: Help message for IM/SMS command "stop".
 #. TRANS: Help message for IM/SMS command "quit".
 msgctxt "COMMANDHELP"
 msgid "same as 'off'"
-msgstr ""
+msgstr "équivalent à la commande <code>off </code>"
 
 #. TRANS: Help message for IM/SMS command "sub <nickname>".
 msgctxt "COMMANDHELP"
 msgid "same as 'follow'"
-msgstr ""
+msgstr "équivalent à la commande <code>follow</code>"
 
 #. TRANS: Help message for IM/SMS command "unsub <nickname>".
 msgctxt "COMMANDHELP"
 msgid "same as 'leave'"
-msgstr ""
+msgstr "équivalent à la commande <code>leave </code>"
 
 #. TRANS: Help message for IM/SMS command "last <nickname>".
 msgctxt "COMMANDHELP"
 msgid "same as 'get'"
-msgstr ""
+msgstr "équivalent à la commande <code>get </code>"
 
 #. TRANS: Help message for IM/SMS command "on <nickname>".
 #. TRANS: Help message for IM/SMS command "off <nickname>".
@@ -8354,15 +7757,14 @@ msgstr ""
 #. TRANS: Help message for IM/SMS command "untrack all".
 #. TRANS: Help message for IM/SMS command "tracks".
 #. TRANS: Help message for IM/SMS command "tracking".
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "not yet implemented."
-msgstr "Cette commande n’a pas encore été implémentée."
+msgstr "pas encore pris en charge."
 
 #. TRANS: Help message for IM/SMS command "nudge <nickname>".
 msgctxt "COMMANDHELP"
 msgid "remind a user to update."
-msgstr ""
+msgstr "rappeler à un utilisateur de mettre à jour."
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 msgid "No configuration file found."
@@ -8383,31 +7785,26 @@ msgstr "Vous pouvez essayer de lancer l’installeur pour régler ce problème."
 msgid "Go to the installer."
 msgstr "Aller au programme d’installation"
 
+#. TRANS: Header on conversation page. Hidden by default (h2).
+#. TRANS: Label for user statistics.
+msgid "Notices"
+msgstr "Avis"
+
 #. TRANS: Page title for when a database error occurs.
 msgid "Database error"
 msgstr "Erreur de la base de données"
 
 #. TRANS: Menu item in default local navigation panel.
 #. TRANS: Menu item in search group navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Public"
 msgstr "Public"
 
-#. TRANS: Menu item in default local navigation panel.
-#. TRANS: Menu item in search group navigation panel.
-#. TRANS: Menu item in local navigation menu.
-#, fuzzy
-msgctxt "MENU"
-msgid "Groups"
-msgstr "Groupes"
-
 #. TRANS: Menu item in default local navigation panel.
 #. TRANS: Menu item title in local navigation menu.
-#, fuzzy
 msgctxt "MENU"
 msgid "Lists"
-msgstr "Limites"
+msgstr "Listes"
 
 #. TRANS: Title of form for deleting a user.
 #. TRANS: Link text in notice list item to delete a notice.
@@ -8418,71 +7815,36 @@ msgstr "Supprimer"
 msgid "Delete this user"
 msgstr "Supprimer cet utilisateur"
 
-#. TRANS: Form legend of form for changing the page design.
-#, fuzzy
-msgid "Change design"
-msgstr "Sauvegarder la conception"
-
-#. TRANS: Fieldset legend on profile design page to change profile page colours.
-msgid "Change colours"
-msgstr "Modifier les couleurs"
-
-#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-msgid "Use defaults"
-msgstr "Utiliser les valeurs par défaut"
-
-#. TRANS: Label in form on profile design page.
-#. TRANS: Field contains file name on user's computer that could be that user's custom profile background image.
-msgid "Upload file"
-msgstr "Importer un fichier"
-
-#. TRANS: Instructions for form on profile design page.
-msgid ""
-"You can upload your personal background image. The maximum file size is 2MB."
-msgstr ""
-"Vous pouvez importer votre image d’arrière plan personnelle. La taille "
-"maximale du fichier est de 2 Mo."
-
-#. TRANS: Radio button on profile design page that will enable use of the uploaded profile image.
-msgctxt "RADIO"
-msgid "On"
-msgstr "Activé"
-
-#. TRANS: Radio button on profile design page that will disable use of the uploaded profile image.
-msgctxt "RADIO"
-msgid "Off"
-msgstr "Désactivé"
-
-#. TRANS: Success message displayed if design settings were saved after clicking "Use defaults".
-msgid "Design defaults restored."
-msgstr "Les paramètre par défaut de la conception ont été restaurés."
-
 #. TRANS: Exception. %s is an ID.
-#, fuzzy, php-format
+#, php-format
 msgid "Unable to find services for %s."
-msgstr "Impossible de révoquer l’accès par l’application : %s."
+msgstr "Impossible de trouver les services pour l’identifiant %s."
 
 #. TRANS: Form legend for removing the favourite status for a favourite notice.
-#. TRANS: Title for button text for removing the favourite status for a favourite notice.
 msgid "Disfavor this notice"
 msgstr "Retirer des favoris"
 
 #. TRANS: Button text for removing the favourite status for a favourite notice.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Disfavor favorite"
-msgstr "Retirer ce favori"
+msgstr "Retirer le favori"
+
+#. TRANS: Button title for removing the favourite status for a favourite notice.
+msgid "Remove this notice from your list of favorite notices."
+msgstr "Retire cet avis de votre liste d’avis favoris."
 
 #. TRANS: Form legend for adding the favourite status to a notice.
-#. TRANS: Title for button text for adding the favourite status to a notice.
 msgid "Favor this notice"
 msgstr "Ajouter aux favoris"
 
 #. TRANS: Button text for adding the favourite status to a notice.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Favor"
-msgstr "Ajouter à mes favoris"
+msgstr "Ajouter aux favoris"
+
+#. TRANS: Button title for adding the favourite status to a notice.
+msgid "Add this notice to your list of favorite notices."
+msgstr "Ajoute cet avis à votre liste d’avis favoris."
 
 #. TRANS: Feed type name.
 msgid "RSS 1.0"
@@ -8500,9 +7862,13 @@ msgstr "Atom"
 msgid "FOAF"
 msgstr "Ami d’un ami"
 
+#. TRANS: Feed type name. See http://activitystrea.ms/
+msgid "Activity Streams"
+msgstr "Flux d’activités"
+
 #. TRANS: Client exception thrown when an imported feed does not have an author.
 msgid "No author in the feed."
-msgstr ""
+msgstr "Aucun auteur dans le flux."
 
 #. TRANS: Client exception thrown when an imported feed does not have an author that
 #. TRANS: can be associated with a user.
@@ -8514,25 +7880,44 @@ msgid "Feeds"
 msgstr "Flux d’informations"
 
 #. TRANS: List element on gallery action page to show all tags.
-#, fuzzy
 msgctxt "TAGS"
 msgid "All"
-msgstr "Tous"
+msgstr "Toutes"
 
 #. TRANS: Dropdown field label on gallery action page for a list containing tags.
 msgid "Tag"
 msgstr "Marque"
 
 #. TRANS: Dropdown field title on gallery action page for a list containing tags.
-#, fuzzy
 msgid "Choose a tag to narrow list."
-msgstr "Choissez une marque pour réduire la liste"
+msgstr "Choisissez une marque pour restreindre la liste."
 
 #. TRANS: Description on form for granting a role.
 #, php-format
 msgid "Grant this user the \"%s\" role"
 msgstr "Accorder le rôle « %s » à cet utilisateur"
 
+#. TRANS: Header for mini list of group members on a group page (h2).
+msgid "Members"
+msgstr "Membres"
+
+#. TRANS: Link to all group members from mini list of group members if group has more than n members.
+msgid "All members"
+msgstr "Tous les membres"
+
+#. TRANS: Header for mini list of users with a pending membership request on a group page (h2).
+msgid "Pending"
+msgstr "En attente"
+
+#. TRANS: Header for mini list of users that are blocked in a group page (h2).
+msgid "Blocked"
+msgstr "Bloqué"
+
+#. TRANS: Title for list of group administrators on a group page.
+msgctxt "TITLE"
+msgid "Admins"
+msgstr "Administrateurs"
+
 #. TRANS: Button text for the form that will block a user from a group.
 msgctxt "BUTTON"
 msgid "Block"
@@ -8540,25 +7925,25 @@ msgstr "Bloquer"
 
 #. TRANS: Submit button title.
 msgctxt "TOOLTIP"
-msgid "Block this user"
-msgstr "Bloquer cet utilisateur"
+msgid "Block this user so that they can no longer post messages to it."
+msgstr ""
+"Bloquer cet utilisateur afin qu’il ne puisse plus poster de messages ici."
 
 #. TRANS: Field title on group edit form.
 msgid "URL of the homepage or blog of the group or topic."
 msgstr "Adresse URL du site web ou blogue pour le groupe ou sujet."
 
 #. TRANS: Text area title for group description when there is no text limit.
-#, fuzzy
 msgid "Describe the group or topic."
-msgstr "Description du groupe ou du sujet"
+msgstr "Décrivez la liste ou le sujet."
 
 #. TRANS: Text area title for group description.
 #. TRANS: %d is the number of characters available for the description.
-#, fuzzy, php-format
+#, php-format
 msgid "Describe the group or topic in %d character or less."
 msgid_plural "Describe the group or topic in %d characters or less."
-msgstr[0] "Description du groupe ou du sujet, en %d caractère ou moins"
-msgstr[1] "Description du groupe ou du sujet, en %d caractères ou moins"
+msgstr[0] "Décrivez la liste ou le sujet en %d caractère ou moins."
+msgstr[1] "Décrivez la liste ou le sujet en %d caractères ou moins."
 
 #. TRANS: Field title on group edit form.
 msgid ""
@@ -8591,70 +7976,17 @@ msgstr[1] ""
 msgid ""
 "New members must be approved by admin and all posts are forced to be private."
 msgstr ""
+"Les nouveaux membres doivent être approuvés par un administrateur et tous "
+"les envois sont forcés d’être privés."
 
 #. TRANS: Indicator in group members list that this user is a group administrator.
-#, fuzzy
 msgctxt "GROUPADMIN"
 msgid "Admin"
-msgstr "Administrer"
+msgstr "Administrateur"
 
-#. TRANS: Menu item in the group navigation page.
-msgctxt "MENU"
-msgid "Group"
-msgstr "Groupe"
-
-#. TRANS: Tooltip for menu item in the group navigation page.
-#. TRANS: %s is the nickname of the group.
-#, php-format
-msgctxt "TOOLTIP"
-msgid "%s group"
-msgstr "Groupe « %s »"
-
-#. TRANS: Menu item in the group navigation page.
-msgctxt "MENU"
-msgid "Members"
-msgstr "Membres"
-
-#. TRANS: Tooltip for menu item in the group navigation page.
-#. TRANS: %s is the nickname of the group.
-#, php-format
-msgctxt "TOOLTIP"
-msgid "%s group members"
-msgstr "Membres du groupe « %s »"
-
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: %d is the number of pending members.
-#, php-format
-msgctxt "MENU"
-msgid "Pending members (%d)"
-msgid_plural "Pending members (%d)"
-msgstr[0] ""
-msgstr[1] ""
-
-#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: %s is the nickname of the group.
-#, fuzzy, php-format
-msgctxt "TOOLTIP"
-msgid "%s pending members"
-msgstr "Membres du groupe %s"
-
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-msgctxt "MENU"
-msgid "Blocked"
-msgstr "Bloqué"
-
-#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: %s is the nickname of the group.
-#, php-format
-msgctxt "TOOLTIP"
-msgid "%s blocked users"
-msgstr "Utilisateurs bloqués du groupe « %s »"
-
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: Menu item in primary navigation panel.
-msgctxt "MENU"
-msgid "Admin"
-msgstr "Administrer"
+#. TRANS: Group actions header (h2). Text hidden by default.
+msgid "Group actions"
+msgstr "Actions du groupe"
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
@@ -8663,11 +7995,6 @@ msgctxt "TOOLTIP"
 msgid "Edit %s group properties"
 msgstr "Modifier les propriétés du groupe « %s »"
 
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-msgctxt "MENU"
-msgid "Logo"
-msgstr "Logo"
-
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
 #, php-format
@@ -8675,32 +8002,32 @@ msgctxt "TOOLTIP"
 msgid "Add or edit %s logo"
 msgstr "Ajouter ou modifier le logo du groupe « %s »"
 
-#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: %s is the nickname of the group.
-#, php-format
-msgctxt "TOOLTIP"
-msgid "Add or edit %s design"
-msgstr "Ajouter ou modifier l’apparence du groupe « %s »"
-
-#. TRANS: Group actions header (h2). Text hidden by default.
-msgid "Group actions"
-msgstr "Actions du groupe"
+#. TRANS: Link text for link on user profile.
+msgctxt "MENU"
+msgid "Logo"
+msgstr "Logo"
 
 #. TRANS: Title for groups with the most members section.
-#, fuzzy
 msgid "Popular groups"
-msgstr "Avis populaires"
+msgstr "Groupes populaires"
 
 #. TRANS: Title for groups with the most posts section.
-#, fuzzy
 msgid "Active groups"
-msgstr "Tous les groupes"
+msgstr "Groupes actifs"
 
-#. TRANS: Title for group tag cloud section.
-#. TRANS: %s is a group name.
-#, php-format
-msgid "Tags in %s group's notices"
-msgstr "Marques dans les avis du groupe %s"
+#. TRANS: Link description for seeing all groups.
+#. TRANS: Link description for seeing all lists.
+msgid "See all"
+msgstr "Tout visualiser"
+
+#. TRANS: Link title for seeing all groups.
+msgid "See all groups you belong to."
+msgstr "Voir tous les groupes dont vous êtes membre."
+
+#. TRANS: Menu item title in personal group navigation menu.
+#. TRANS: %s is a username.
+msgid "Back to top"
+msgstr "Retour en haut de page"
 
 #. TRANS: Client exception 406
 msgid "This page is not available in a media type you accept"
@@ -8766,6 +8093,12 @@ msgid ""
 "user is not you, or if you did not request this confirmation, just ignore "
 "this message."
 msgstr ""
+"L’utilisateur « %1$s » enregistré sur %2$s a déclaré que le nom affiché « %3$s "
+"» lui appartient. Si ce nom vous appartient, vous pouvez confirmer en "
+"cliquant sur cette URL : %4$s (Si vous ne pouvez pas cliquer dessus, copiez-"
+"collez l’URL vers la barre d’adresse de votre navigateur). Si cet "
+"utilisateur n’est pas vous ou si vous n’avez pas vous-même demandé cette "
+"confirmation, veuillez simplement ignorer ce message."
 
 #. TRANS: Exception thrown when trying to deliver a notice to an unknown inbox.
 #. TRANS: %d is the unknown inbox ID (number).
@@ -8776,6 +8109,8 @@ msgstr "Source %d inconnue pour la boîte de réception."
 #. TRANS: Server exception thrown trying to initialise an IM plugin without meeting all prerequisites.
 msgid "Queueing must be enabled to use IM plugins."
 msgstr ""
+"La gestion des files d’attente doit être activée pour utiliser des greffons "
+"de messagerie instantanée."
 
 #. TRANS: Server exception thrown trying to initialise an IM plugin without a transport method.
 msgid "Transport cannot be null."
@@ -8786,24 +8121,55 @@ msgctxt "TITLE"
 msgid "Trends"
 msgstr "Tendances"
 
-#. TRANS: Button text for inviting more users to the StatusNet instance.
-#, fuzzy
+#. TRANS: Default button text for inviting more users to the StatusNet instance.
 msgctxt "BUTTON"
 msgid "Invite more colleagues"
-msgstr "Inviter de nouveaux utilisateurs"
+msgstr "Inviter davantage de collègues"
+
+#. TRANS: Form legend.
+msgid "Invite collegues"
+msgstr "Inviter des collègues"
+
+#. TRANS: Field label for a list of e-mail addresses.
+msgid "Email addresses"
+msgstr "Adresses courriel"
+
+#. TRANS: Field title for a list of e-mail addresses.
+msgid "Addresses of friends to invite (one per line)."
+msgstr "Adresses des amis à inviter (un par ligne)."
+
+#. TRANS: Field label for a personal message to send to invitees.
+msgid "Personal message"
+msgstr "Message personnel"
+
+#. TRANS: Field title for a personal message to send to invitees.
+msgid "Optionally add a personal message to the invitation."
+msgstr "Ajouter un message personnel à l’invitation (optionnel)."
+
+#. TRANS: Send button for inviting friends
+#. TRANS: Button text for sending notice.
+msgctxt "BUTTON"
+msgid "Send"
+msgstr "Envoyer"
+
+#. TRANS: Submit button title.
+msgid "Send invitations."
+msgstr "Envoyer les invitations."
 
 #. TRANS: Button text for joining a group.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Join"
 msgstr "Rejoindre"
 
 #. TRANS: Button text on form to leave a group.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Leave"
 msgstr "Quitter"
 
+#. TRANS: Link title for seeing all lists.
+msgid "See all lists you have created."
+msgstr "Voir toutes les listes que vous avez créées."
+
 #. TRANS: Menu item for logging in to the StatusNet site.
 #. TRANS: Menu item in primary navigation panel.
 msgctxt "MENU"
@@ -8864,14 +8230,14 @@ msgstr ""
 #. TRANS: Main body of new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscriber's long name, %2$s is the StatusNet sitename.
 #, php-format
-msgid "%1$s is now listening to your notices on %2$s."
-msgstr "%1$s suit maintenant vos avis sur %2$s."
+msgid "%1$s is now following you on %2$s."
+msgstr "%1$s vous suit maintenant sur %2$s."
 
 #. TRANS: Subject of pending new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscribing user's nickname, %2$s is the StatusNet sitename.
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s would like to listen to your notices on %2$s."
-msgstr "%1$s suit maintenant vos avis sur %2$s."
+msgstr "%1$s voudrait suivre vos avis sur %2$s."
 
 #. TRANS: Main body of pending new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscriber's long name, %2$s is the StatusNet sitename.
@@ -8880,11 +8246,13 @@ msgid ""
 "%1$s would like to listen to your notices on %2$s. You may approve or reject "
 "their subscription at %3$s"
 msgstr ""
+"%1$s voudrait suivre vos avis sur %2$s. Vous pouvez approuver ou rejeter sa "
+"demande d’abonnement sur %3$s"
 
 #. TRANS: Common footer block for StatusNet notification emails.
 #. TRANS: %1$s is the StatusNet sitename,
 #. TRANS: %2$s is a link to the addressed user's e-mail settings.
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "Faithfully yours,\n"
 "%1$s.\n"
@@ -8892,23 +8260,18 @@ msgid ""
 "----\n"
 "Change your email address or notification options at %2$s"
 msgstr ""
-"%1$s suit dorénavant vos avis sur %2$s.\n"
-"\n"
-"%3$s\n"
-"\n"
-"%4$s%5$s%6$s\n"
 "Cordialement,\n"
-"%2$s.\n"
+"%1$s.\n"
 "\n"
 "----\n"
-"Vous pouvez changer votre adresse de courriel ou vos options de notification "
-"sur %7$s\n"
+"Vous pouvez modifier votre adresse de courriel ou vos options de "
+"notification sur %2$s"
 
 #. TRANS: Profile info line in notification e-mail.
 #. TRANS: %s is a URL.
-#, fuzzy, php-format
+#, php-format
 msgid "Profile: %s"
-msgstr "Profil"
+msgstr "Profil : %s"
 
 #. TRANS: Profile info line in notification e-mail.
 #. TRANS: %s is biographical information.
@@ -8918,7 +8281,7 @@ msgstr "Bio : %s"
 
 #. TRANS: This is a paragraph in a new-subscriber e-mail.
 #. TRANS: %s is a URL where the subscriber can be reported as abusive.
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "If you believe this account is being used abusively, you can block them from "
 "your subscribers list and report as spam to site administrators at %s."
@@ -8936,7 +8299,7 @@ msgstr "Nouvelle adresse courriel pour poster dans %s"
 #. TRANS: Body of notification mail for new posting email address.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is the e-mail address to send
 #. TRANS: to to post by e-mail, %3$s is a URL to more instructions.
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
 "\n"
@@ -8948,10 +8311,7 @@ msgstr ""
 "\n"
 "Adressez vos courriels à %2$s pour poster de nouveaux avis.\n"
 "\n"
-"Davantage d’instructions sur les courriels sont sur %3$s.\n"
-"\n"
-"Cordialement,\n"
-"%1$s"
+"Davantage d’instructions sur les courriels sont sur %3$s."
 
 #. TRANS: Subject line for SMS-by-email notification messages.
 #. TRANS: %s is the posting user's nickname.
@@ -8972,14 +8332,14 @@ msgstr ""
 
 #. TRANS: Subject for 'nudge' notification email.
 #. TRANS: %s is the nudging user.
-#, fuzzy, php-format
+#, php-format
 msgid "You have been nudged by %s"
-msgstr "Vous avez reçu un clin d’œil de %s"
+msgstr "Vous avez reçu une félicitation de %s"
 
 #. TRANS: Body for 'nudge' notification email.
 #. TRANS: %1$s is the nuding user's long name, $2$s is the nudging user's nickname,
 #. TRANS: %3$s is a URL to post notices at.
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "%1$s (%2$s) is wondering what you are up to these days and is inviting you "
 "to post some news.\n"
@@ -8993,14 +8353,11 @@ msgstr ""
 "%1$s (%2$s) se demande ce que vous devenez ces temps-ci et vous invite à "
 "poster des nouvelles.\n"
 "\n"
-"Donc on vous écoute :)\n"
+"Donc on vous écoute. :)\n"
 "\n"
 "%3$s\n"
 "\n"
-"Ne répondez pas à ce courriel ; il ne sera pas envoyé.\n"
-"\n"
-"Bien à vous,\n"
-"%4$s\n"
+"Ne répondez pas directement à ce courriel, il ne serait pas transmis."
 
 #. TRANS: Subject for direct-message notification email.
 #. TRANS: %s is the sending user's nickname.
@@ -9011,7 +8368,7 @@ msgstr "Nouveau message personnel de %s"
 #. TRANS: Body for direct-message notification email.
 #. TRANS: %1$s is the sending user's long name, %2$s is the sending user's nickname,
 #. TRANS: %3$s is the message content, %4$s a URL to the message,
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
 "\n"
@@ -9025,20 +8382,17 @@ msgid ""
 "\n"
 "Don't reply to this email; it won't get to them."
 msgstr ""
-"%1$s (%2$s) vous a envoyé un message privé:\n"
+"%1$s (%2$s) vous a envoyé un message privé :\n"
 "\n"
 "------------------------------------------------------\n"
 "%3$s\n"
 "------------------------------------------------------\n"
 "\n"
-"Vous pouvez répondre à ce message ici:\n"
+"Vous pouvez répondre à ce message ici :\n"
 "\n"
 "%4$s\n"
 "\n"
-"Ne répondez pas à ce courriel ; il ne sera pas envoyé.\n"
-"\n"
-"Bien à vous,\n"
-"%5$s\n"
+"Ne répondez pas directement à ce courriel, il ne serait pas transmis."
 
 #. TRANS: Subject for favorite notification e-mail.
 #. TRANS: %1$s is the adding user's long name, %2$s is the adding user's nickname.
@@ -9051,7 +8405,7 @@ msgstr "%1$s (@%2$s) a ajouté votre avis à ses favoris"
 #. TRANS: %3$s is a URL to the faved notice, %4$s is the faved notice text,
 #. TRANS: %5$s is a URL to all faves of the adding user, %6$s is the StatusNet sitename,
 #. TRANS: %7$s is the adding user's nickname.
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
 "\n"
@@ -9067,23 +8421,19 @@ msgid ""
 "\n"
 "%5$s"
 msgstr ""
-"%1$s (@%7$s) vient de marquer votre message de %2$s comme un de ses "
-"favoris.\n"
+"%1$s (@%7$s) vient d’ajouter votre avis sur %2$s parmi ses favoris.\n"
 "\n"
-"L’URL de votre message est :\n"
+"L’URL de votre avis est :\n"
 "\n"
 "%3$s\n"
 "\n"
-"Le texte de votre message est :\n"
+"Le texte de votre avis est :\n"
 "\n"
 "%4$s\n"
 "\n"
 "Vous pouvez voir la liste des favoris de %1$s ici :\n"
 "\n"
-"%5$s\n"
-"\n"
-"Cordialement,\n"
-"%6$s\n"
+"%5$s"
 
 #. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
 #, php-format
@@ -9105,9 +8455,9 @@ msgstr "%1$s (@%2$s) a envoyé un avis à votre attention"
 #. TRANS: Body of @-reply notification e-mail.
 #. TRANS: %1$s is the sending user's name, $2$s is the StatusNet sitename,
 #. TRANS: %3$s is a URL to the notice, %4$s is the notice text,
-#. TRANS: %5$s is a URL to the full conversion if it exists (otherwise empty),
+#. TRANS: %5$s is the text "The full conversation can be read here:" and a URL to the full conversion if it exists (otherwise empty),
 #. TRANS: %6$s is a URL to reply to the notice, %7$s is a URL to all @-replies for the addressed user,
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "%1$s just sent a notice to your attention (an '@-reply') on %2$s.\n"
 "\n"
@@ -9127,8 +8477,7 @@ msgid ""
 "\n"
 "%7$s"
 msgstr ""
-"%1$s (@%9$s) vient de soumettre un avis à votre attention (un « @-reply ») "
-"sur %2$s.\n"
+"%1$s vient de soumettre un avis à votre attention (un « @-reply ») sur %2$s.\n"
 "\n"
 "L'avis est ici :\n"
 "\n"
@@ -9144,28 +8493,27 @@ msgstr ""
 "\n"
 "La liste des @-replies qui vous sont destinées est ici :\n"
 "\n"
-"%7$s\n"
-"\n"
-"Cordialement,\n"
-"%2$s\n"
-"\n"
-"P.S. Vous pouvez désactiver ces notifications électroniques ici : %8$s\n"
+"%7$s"
 
 #. TRANS: Subject of group join notification e-mail.
 #. TRANS: %1$s is the joining user's nickname, %2$s is the group name, and %3$s is the StatusNet sitename.
+#, php-format
+msgid "%1$s has joined your group %2$s on %3$s"
+msgstr "%1$s a rejoint votre groupe %2$s sur %3$s"
+
 #. TRANS: Main body of group join notification e-mail.
 #. TRANS: %1$s is the subscriber's long name, %2$s is the group name, and %3$s is the StatusNet sitename,
 #. TRANS: %4$s is a block of profile info about the subscriber.
 #. TRANS: %5$s is a link to the addressed user's e-mail settings.
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s has joined your group %2$s on %3$s."
-msgstr "%1$s a rejoint le groupe %2$s."
+msgstr "%1$s a rejoint votre groupe %2$s sur %3$s."
 
 #. TRANS: Subject of pending group join request notification e-mail.
 #. TRANS: %1$s is the joining user's nickname, %2$s is the group name, and %3$s is the StatusNet sitename.
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s wants to join your group %2$s on %3$s."
-msgstr "%1$s a rejoint le groupe %2$s."
+msgstr "%1$s souhaite rejoindre votre groupe %2$s sur %3$s."
 
 #. TRANS: Main body of pending group join request notification e-mail.
 #. TRANS: %1$s is the subscriber's long name, %2$s is the group name, and %3$s is the StatusNet sitename,
@@ -9175,6 +8523,8 @@ msgid ""
 "%1$s would like to join your group %2$s on %3$s. You may approve or reject "
 "their group membership at %4$s"
 msgstr ""
+"%1$s voudrait rejoindre votre groupe « %2$s » sur %3$s. Vous pouvez approuver "
+"ou rejeter leur demande d’adhésion sur %4$s"
 
 #. TRANS: Client error displayed when trying to access a mailbox that is not of the logged in user.
 msgid "Only the user can read their own mailboxes."
@@ -9190,26 +8540,22 @@ msgstr ""
 "vous envoyer des messages destinés à vous seul(e)."
 
 #. TRANS: Menu item in mailbox menu. Leads to incoming private messages.
-#, fuzzy
 msgctxt "MENU"
 msgid "Inbox"
 msgstr "Boîte de réception"
 
 #. TRANS: Menu item title in mailbox menu. Leads to incoming private messages.
-#, fuzzy
 msgid "Your incoming messages."
-msgstr "Vos messages reçus"
+msgstr "Vos messages reçus."
 
 #. TRANS: Menu item in mailbox menu. Leads to outgoing private messages.
-#, fuzzy
 msgctxt "MENU"
 msgid "Outbox"
 msgstr "Boîte d’envoi"
 
 #. TRANS: Menu item title in mailbox menu. Leads to outgoing private messages.
-#, fuzzy
 msgid "Your sent messages."
-msgstr "Vos messages envoyés"
+msgstr "Vos messages envoyés."
 
 #. TRANS: Error message in incoming mail handler used when an incoming e-mail cannot be processed.
 msgid "Could not parse message."
@@ -9229,9 +8575,9 @@ msgstr "Désolé, la réception de courriels n’est pas permise."
 
 #. TRANS: Error message in incoming mail handler used when an incoming e-mail is of an unsupported type.
 #. TRANS: %s is the unsupported type.
-#, fuzzy, php-format
+#, php-format
 msgid "Unsupported message type: %s."
-msgstr "Type de message non supporté : %s"
+msgstr "Type de message non supporté : %s.."
 
 #. TRANS: Form legend for form to make a user a group admin.
 msgid "Make user an admin of the group"
@@ -9244,8 +8590,8 @@ msgstr "Rendre administrateur"
 
 #. TRANS: Submit button title.
 msgctxt "TOOLTIP"
-msgid "Make this user an admin"
-msgstr "Faire de cet utilisateur un administrateur"
+msgid "Make this user an admin."
+msgstr "Faire de cet utilisateur un administrateur."
 
 #. TRANS: Client exception thrown when a database error was thrown during a file upload operation.
 msgid "There was a database error while saving your file. Please try again."
@@ -9294,7 +8640,7 @@ msgstr "Envoyer un message direct"
 msgid "Select recipient:"
 msgstr "Sélectionner le destinataire :"
 
-#. TRANS Entry in drop-down selection box in direct-message inbox/outbox when no one is available to message.
+#. TRANS: Entry in drop-down selection box in direct-message inbox/outbox when no one is available to message.
 msgid "No mutual subscribers."
 msgstr "Aucun abonné réciproque."
 
@@ -9308,9 +8654,8 @@ msgid "Send"
 msgstr "Envoyer"
 
 #. TRANS: Header in message list.
-#, fuzzy
 msgid "Messages"
-msgstr "Message"
+msgstr "Messages"
 
 #. TRANS: Followed by notice source (usually the client used to send the notice).
 #. TRANS: Followed by notice source.
@@ -9318,7 +8663,6 @@ msgid "from"
 msgstr "de"
 
 #. TRANS: A possible notice source (web interface).
-#, fuzzy
 msgctxt "SOURCE"
 msgid "web"
 msgstr "web"
@@ -9329,42 +8673,45 @@ msgid "xmpp"
 msgstr "xmpp"
 
 #. TRANS: A possible notice source (e-mail).
-#, fuzzy
 msgctxt "SOURCE"
 msgid "mail"
-msgstr "Courriel"
+msgstr "courriel"
 
 #. TRANS: A possible notice source (OpenMicroBlogging).
 msgctxt "SOURCE"
 msgid "omb"
-msgstr ""
+msgstr "OMB"
 
 #. TRANS: A possible notice source (Application Programming Interface).
 msgctxt "SOURCE"
 msgid "api"
-msgstr ""
+msgstr "API"
 
 #. TRANS: Client exception thrown when no author for an activity was found.
 msgid "Cannot get author for activity."
-msgstr ""
+msgstr "Impossible d’obtenir l’auteur de l’activité."
 
 #. TRANS: Client exception thrown when ...
-#, fuzzy
 msgid "Bookmark not posted to this group."
-msgstr "Vous n’êtes pas autorisé à supprimer ce groupe."
+msgstr "Signet non posté à ce groupe."
 
 #. TRANS: Client exception when ...
-#, fuzzy
 msgid "Object not posted to this user."
-msgstr "Ne pas supprimer ce groupe"
+msgstr "Objet non posté à cet utilisateur."
 
 #. TRANS: Server exception thrown when a micro app plugin uses a target that cannot be handled.
 msgid "Do not know how to handle this kind of target."
-msgstr ""
+msgstr "Ne sait pas comment gérer ce genre de cible."
 
 #. TRANS: Server exception thrown when a micro app plugin developer has not done his job too well.
 msgid "You must implement either adaptNoticeListItem() or showNotice()."
 msgstr ""
+"Vous devez implémenter soit <code>adaptNoticeListItem()</code>, soit "
+"<code>showNotice()</code>."
+
+#. TRANS: Link description to show more items in a list.
+msgid "More â–¼"
+msgstr "Plus"
 
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 msgid "Nickname cannot be empty."
@@ -9391,9 +8738,8 @@ msgid "Attach"
 msgstr "Attacher"
 
 #. TRANS: Title for input field to attach a file to a notice.
-#, fuzzy
 msgid "Attach a file."
-msgstr "Joindre un fichier"
+msgstr "Joindre un fichier."
 
 #. TRANS: Field label to add location to a notice.
 msgid "Share my location"
@@ -9416,10 +8762,6 @@ msgctxt "SEPARATOR"
 msgid ", "
 msgstr ", "
 
-#. TRANS: Start of profile addressees list.
-msgid " â–¸ "
-msgstr " â–¸ "
-
 #. TRANS: Used in coordinates as abbreviation of north.
 msgid "N"
 msgstr "N"
@@ -9458,21 +8800,20 @@ msgid "Repeated by"
 msgstr "Repris par"
 
 #. TRANS: Link title in notice list item to reply to a notice.
-msgid "Reply to this notice"
-msgstr "Répondre à cet avis"
+msgid "Reply to this notice."
+msgstr "Répondre à cet avis."
 
 #. TRANS: Link text in notice list item to reply to a notice.
 msgid "Reply"
 msgstr "Répondre"
 
 #. TRANS: Link title in notice list item to delete a notice.
-msgid "Delete this notice"
-msgstr "Supprimer cet avis"
+msgid "Delete this notice from the timeline."
+msgstr "Supprimer cet avis du fil d’actualités."
 
 #. TRANS: Title for repeat form status in notice list when a notice has been repeated.
-#, fuzzy
 msgid "Notice repeated."
-msgstr "Avis repris"
+msgstr "Avis repris."
 
 #. TRANS: Field label for notice text.
 msgid "Update your status..."
@@ -9483,236 +8824,187 @@ msgid "Nudge this user"
 msgstr "Envoyer un clin d’œil à cet utilisateur"
 
 #. TRANS: Button text to nudge/ping another user.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Nudge"
-msgstr "Clin d’œil"
+msgstr "Féliciter"
 
 #. TRANS: Button title to nudge/ping another user.
-#, fuzzy
 msgid "Send a nudge to this user."
-msgstr "Envoyer un clin d’œil à cet utilisateur"
-
-#. TRANS: Exception thrown when creating a new profile fails in OAuth store.
-msgid "Error inserting new profile."
-msgstr "Erreur lors de l’insertion du nouveau profil."
-
-#. TRANS: Exception thrown when creating a new avatar fails in OAuth store.
-msgid "Error inserting avatar."
-msgstr "Erreur lors de l’insertion de l’avatar."
-
-#. TRANS: Exception thrown when creating a remote profile fails in OAuth store.
-msgid "Error inserting remote profile."
-msgstr "Erreur lors de l’insertion du profil distant."
-
-#. TRANS: Exception thrown when a notice is denied because it has been sent before.
-msgid "Duplicate notice."
-msgstr "Avis en doublon."
-
-#. TRANS: Exception thrown when creating a new subscription fails in OAuth store.
-#, fuzzy
-msgid "Could not insert new subscription."
-msgstr "Impossible d’insérer un nouvel abonnement."
+msgstr "Envoyer une félicitation à cet utilisateur."
 
 #. TRANS: Server exception thrown in oEmbed action if no API endpoint is available.
-#, fuzzy
 msgid "No oEmbed API endpoint available."
-msgstr "La messagerie instantanée n’est pas disponible."
+msgstr "Aucune terminaison pour l’API oEmbed n’est disponible."
 
 #. TRANS: Field label for list.
-#, fuzzy
 msgctxt "LABEL"
 msgid "List"
-msgstr "Liens"
+msgstr "Liste"
 
 #. TRANS: Field title for list.
-#, fuzzy
 msgid "Change the list (letters, numbers, -, ., and _ are allowed)."
-msgstr ""
-"Marques pour cet utilisateur (lettres, chiffres, -, ., et _), séparées par "
-"des virgules ou des espaces"
+msgstr "Modifier la liste (lettres, chiffres, -, ., et _ sont autorisés)."
 
 #. TRANS: Field title for description of list.
-#, fuzzy
 msgid "Describe the list or topic."
-msgstr "Description du groupe ou du sujet"
+msgstr "Décrivez la liste ou le sujet."
 
 #. TRANS: Field title for description of list.
 #. TRANS: %d is the maximum number of characters for the description.
-#, fuzzy, php-format
+#, php-format
 msgid "Describe the list or topic in %d character."
 msgid_plural "Describe the list or topic in %d characters."
-msgstr[0] "Description du groupe ou du sujet, en %d caractère ou moins"
-msgstr[1] "Description du groupe ou du sujet, en %d caractères ou moins"
+msgstr[0] "Décrivez la liste ou le sujet en %d caractère."
+msgstr[1] "Décrivez la liste ou le sujet en %d caractères."
 
 #. TRANS: Button title to delete a list.
-#, fuzzy
 msgid "Delete this list."
-msgstr "Supprimer cet utilisateur"
+msgstr "Supprimer cette liste."
 
 #. TRANS: Header in list edit form.
 msgid "Add or remove people"
 msgstr "Ajouter ou supprimer des personnes"
 
 #. TRANS: Header in list edit form.
-#, fuzzy
 msgctxt "HEADER"
 msgid "Search"
 msgstr "Rechercher"
 
 #. TRANS: Menu item in list navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "List"
-msgstr "Liens"
+msgstr "Liste"
 
 #. TRANS: Menu item title in list navigation panel.
 #. TRANS: %1$s is a list, %2$s is a nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s list by %2$s."
-msgstr "%1$s - %2$s"
+msgstr "Liste « %1$s » de %2$s."
 
 #. TRANS: Menu item in list navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Listed"
-msgstr "Licence"
+msgstr "Listé(s)"
 
 #. TRANS: Menu item in list navigation panel.
 #. TRANS: Menu item in local navigation menu.
-#, fuzzy
 msgctxt "MENU"
 msgid "Subscribers"
 msgstr "Abonnés"
 
 #. TRANS: Menu item title in list navigation panel.
 #. TRANS: %1$s is a list, %2$s is a nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "Subscribers to %1$s list by %2$s."
-msgstr "Abonné à %s."
+msgstr "Abonnés à la liste « %1$s » de %2$s."
 
 #. TRANS: Menu item in list navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Edit"
 msgstr "Modifier"
 
 #. TRANS: Menu item title in list navigation panel.
 #. TRANS: %s is a list.
-#, fuzzy, php-format
+#, php-format
 msgid "Edit %s list by you."
-msgstr "Modifier le groupe %s"
-
-#. TRANS: Link description for link to list of users tagged with a tag.
-#, fuzzy
-msgid "Tagged"
-msgstr "Marque"
+msgstr "Modifier votre liste « %s »."
 
 #. TRANS: Title for link to edit list settings.
-#, fuzzy
 msgid "Edit list settings."
-msgstr "Modifier les paramètres du profil"
+msgstr "Modifier les paramètres de la liste."
 
 #. TRANS: Text for link to edit list settings.
 msgid "Edit"
 msgstr "Modifier"
 
 #. TRANS: Privacy mode text in list list item for private list.
-#, fuzzy
 msgctxt "MODE"
 msgid "Private"
 msgstr "Privé"
 
 #. TRANS: Menu item in the group navigation page.
-#, fuzzy
 msgctxt "MENU"
 msgid "List Subscriptions"
-msgstr "Abonnements"
+msgstr "Liste des abonnements"
 
 #. TRANS: Tooltip for menu item in the group navigation page.
 #. TRANS: %s is a user nickname.
-#, fuzzy, php-format
+#, php-format
 msgctxt "TOOLTIP"
 msgid "Lists subscribed to by %s."
-msgstr "Abonné à %s."
+msgstr "Listes auxquelles %s s’est abonné."
 
 #. TRANS: Menu item in the group navigation page.
 #. TRANS: %s is a user nickname.
-#, fuzzy, php-format
+#, php-format
 msgctxt "MENU"
 msgid "Lists with %s"
-msgstr "Mises à jour avec « %s »"
+msgstr "Listes dont l’utilisateur %s est membre"
 
 #. TRANS: Tooltip for menu item in the group navigation page.
 #. TRANS: %s is a user nickname.
-#, fuzzy, php-format
+#, php-format
 msgctxt "TOOLTIP"
 msgid "Lists with %s."
-msgstr "Mises à jour avec « %s »"
+msgstr "Listes dont l’utilisateur %s est membre."
 
 #. TRANS: Menu item in the group navigation page.
 #. TRANS: %s is a user nickname.
 #, php-format
 msgctxt "MENU"
 msgid "Lists by %s"
-msgstr ""
+msgstr "Listes de %s"
 
 #. TRANS: Tooltip for menu item in the group navigation page.
 #. TRANS: %s is a user nickname.
-#, fuzzy, php-format
+#, php-format
 msgctxt "TOOLTIP"
 msgid "Lists by %s."
-msgstr "%1$s - %2$s"
+msgstr "Listes de l’utilisateur %s."
 
 #. TRANS: Label in lists widget.
-#, fuzzy
 msgctxt "LABEL"
 msgid "Your lists"
-msgstr "Avis populaires"
+msgstr "Vos listes"
 
 #. TRANS: Fieldset legend in lists widget.
-#, fuzzy
 msgctxt "LEGEND"
 msgid "Edit lists"
-msgstr "Cette marque est invalide : %s."
+msgstr "Modifier les listes"
 
 #. TRANS: Label in self tags widget.
-#, fuzzy
 msgctxt "LABEL"
 msgid "Tags"
 msgstr "Balises"
 
 #. TRANS: Title for section contaning lists with the most subscribers.
-#, fuzzy
 msgid "Popular lists"
-msgstr "Avis populaires"
+msgstr "Listes populaires"
 
 #. TRANS: List summary. %1$d is the number of users in the list,
 #. TRANS: %2$d is the number of subscribers to the list.
-#, fuzzy, php-format
+#, php-format
 msgid "Listed: %1$d Subscribers: %2$d"
-msgstr "Abonnés à %1$s - page %2$d"
+msgstr "%1$d utilisateurs membres, %2$d abonnés"
 
 #. TRANS: Title for page that displays which lists current user is part of.
-#, fuzzy, php-format
+#, php-format
 msgid "Lists with you"
-msgstr "Page non trouvée."
+msgstr "Listes dont vous êtes membre"
 
 #. TRANS: Title for page that displays which lists a user is part of.
 #. TRANS: %s is a profile name.
-#, fuzzy, php-format
+#, php-format
 msgid "Lists with %s"
-msgstr "Mises à jour avec « %s »"
+msgstr "Listes dont %s est membre"
 
 #. TRANS: Title for page that displays lists a user has subscribed to.
-#, fuzzy
 msgid "List subscriptions"
-msgstr "Abonnements de %s"
+msgstr "Abonnements à la liste"
 
 #. TRANS: Menu item in personal group navigation menu.
 #. TRANS: Menu item in settings navigation panel.
 #. TRANS: Menu item in local navigation menu.
-#, fuzzy
 msgctxt "MENU"
 msgid "Profile"
 msgstr "Profil"
@@ -9722,28 +9014,24 @@ msgid "Your profile"
 msgstr "Votre profil"
 
 #. TRANS: Menu item in personal group navigation menu.
-#, fuzzy
 msgctxt "MENU"
 msgid "Replies"
 msgstr "Réponses"
 
 #. TRANS: Menu item in personal group navigation menu.
-#, fuzzy
 msgctxt "MENU"
 msgid "Favorites"
 msgstr "Favoris"
 
 #. TRANS: Replaces %s in '%s\'s favorite notices'. (Yes, we know we need to fix this.)
-#, fuzzy
 msgctxt "FIXME"
 msgid "User"
 msgstr "Utilisateur"
 
 #. TRANS: Menu item in personal group navigation menu.
-#, fuzzy
 msgctxt "MENU"
 msgid "Messages"
-msgstr "Message"
+msgstr "Messages"
 
 #. TRANS: Menu item title in personal group navigation menu.
 msgid "Your incoming messages"
@@ -9763,25 +9051,30 @@ msgctxt "plugin"
 msgid "Enable"
 msgstr "Activer"
 
+#. TRANS: Plugin description for a disabled plugin.
 msgctxt "plugin-description"
-msgid "(Plugin descriptions unavailable when disabled.)"
+msgid ""
+"(The plugin description is unavailable when a plugin has been disabled.)"
 msgstr ""
+"(La description du greffon est indisponible lorsque celui-ci est désactivé.)"
 
 #. TRANS: Menu item in primary navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Settings"
-msgstr "Paramètres SMS"
+msgstr "Configuration"
 
 #. TRANS: Menu item title in primary navigation panel.
-#, fuzzy
 msgid "Change your personal settings."
-msgstr "Modifier vos paramètres de profil"
+msgstr "Modifier vos paramètres personnels."
+
+#. TRANS: Menu item in primary navigation panel.
+msgctxt "MENU"
+msgid "Admin"
+msgstr "Administration"
 
 #. TRANS: Menu item title in primary navigation panel.
-#, fuzzy
 msgid "Site configuration."
-msgstr "Configuration utilisateur"
+msgstr "Configuration du site."
 
 #. TRANS: Menu item in primary navigation panel.
 msgctxt "MENU"
@@ -9789,34 +9082,27 @@ msgid "Logout"
 msgstr "Déconnexion"
 
 #. TRANS: Menu item title in primary navigation panel.
-#, fuzzy
 msgid "Logout from the site."
-msgstr "Fermer la session"
+msgstr "Se déconnecter du site."
 
 #. TRANS: Menu item title in primary navigation panel.
-#, fuzzy
 msgid "Login to the site."
-msgstr "Ouvrir une session"
+msgstr "S’identifier sur le site."
 
-#. TRANS: Menu item in primary navigation panel.
-msgctxt "MENU"
-msgid "Search"
-msgstr "Rechercher"
-
-#. TRANS: Menu item title in primary navigation panel.
-#, fuzzy
-msgid "Search the site."
-msgstr "Rechercher sur le site"
+msgid "This profile has been silenced by site moderators"
+msgstr "Ce profil a été réduit au silence par les modérateurs du site."
 
 #. TRANS: H2 text for user subscription statistics.
-#, fuzzy
 msgid "Following"
-msgstr "Suivre"
+msgstr "Suivi"
 
 #. TRANS: H2 text for user subscriber statistics.
-#, fuzzy
 msgid "Followers"
-msgstr "Suivre"
+msgstr "Suiveurs"
+
+#. TRANS: H2 text for user statistics.
+msgid "Statistics"
+msgstr "Statistiques"
 
 #. TRANS: Label for user statistics.
 msgid "User ID"
@@ -9826,10 +9112,6 @@ msgstr "ID de l’utilisateur"
 msgid "Member since"
 msgstr "Membre depuis"
 
-#. TRANS: Label for user statistics.
-msgid "Notices"
-msgstr "Avis"
-
 #. TRANS: Label for user statistics.
 #. TRANS: Average count of posts made per day since account registration.
 msgid "Daily average"
@@ -9840,9 +9122,8 @@ msgid "Groups"
 msgstr "Groupes"
 
 #. TRANS: H2 text for user list membership statistics.
-#, fuzzy
 msgid "Lists"
-msgstr "Limites"
+msgstr "Listes"
 
 #. TRANS: Server error displayed when using an unimplemented method.
 msgid "Unimplemented method."
@@ -9853,7 +9134,6 @@ msgid "User groups"
 msgstr "Groupes d’utilisateurs"
 
 #. TRANS: Menu item in search group navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Recent tags"
 msgstr "Marques récentes"
@@ -9863,21 +9143,19 @@ msgid "Recent tags"
 msgstr "Marques récentes"
 
 #. TRANS: Menu item in search group navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Featured"
 msgstr "En vedette"
 
 #. TRANS: Menu item in search group navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Popular"
-msgstr "Populaires"
+msgstr "Populaire"
 
 #. TRANS: Title for inbox tag cloud section.
 msgctxt "TITLE"
 msgid "Trending topics"
-msgstr ""
+msgstr "Tendances"
 
 #. TRANS: Client error displayed when return-to was defined without a target.
 msgid "No return-to arguments."
@@ -9888,9 +9166,8 @@ msgid "Repeat this notice?"
 msgstr "Reprendre cet avis ?"
 
 #. TRANS: Button title to repeat a notice on notice repeat form.
-#, fuzzy
 msgid "Repeat this notice."
-msgstr "Reprendre cet avis"
+msgstr "Reprendre cet avis."
 
 #. TRANS: Description of role revoke form. %s is the role to be revoked.
 #, php-format
@@ -9902,7 +9179,6 @@ msgid "Page not found."
 msgstr "Page non trouvée."
 
 #. TRANS: Title of form to sandbox a user.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Sandbox"
 msgstr "Bac à sable"
@@ -9921,6 +9197,7 @@ msgid "Keyword(s)"
 msgstr "Mot(s) clef(s)"
 
 #. TRANS: Button text for searching site.
+#. TRANS: Button text for search button on search form.
 #. TRANS: Button text to search profiles.
 msgctxt "BUTTON"
 msgid "Search"
@@ -9933,6 +9210,10 @@ msgid ""
 "* Try more general keywords.\n"
 "* Try fewer keywords."
 msgstr ""
+"* Assurez-vous que tous les mots sont correctement orthographiés.\n"
+"* Essayez avec des mots-clés différents.\n"
+"* Essayez avec des mots-clés plus généraux.\n"
+"* Essayez avec moins de mots-clés."
 
 #. TRANS: Standard search suggestions shown when a search does not give any results.
 #, php-format
@@ -9946,9 +9227,16 @@ msgid ""
 "* [Yahoo](http://search.yahoo.com/search?p=site%%3A%%%%site.server%%%%+%s)\n"
 "* [Collecta](http://collecta.com/#q=%s)"
 msgstr ""
+"Vous pouvez également tenter votre recherche sur d’autres moteurs : \n"
+"\n"
+"* [Twingly](http://www.twingly.com/search?q=%s&content=microblog&site=%%%%"
+"site.server%%%%)\n"
+"* [Tweet scan](http://www.tweetscan.com/indexi.php?s=%s)\n"
+"* [Google](http://www.google.com/search?q=site%%3A%%%%site.server%%%%+%s)\n"
+"* [Yahoo](http://search.yahoo.com/search?p=site%%3A%%%%site.server%%%%+%s)\n"
+"* [Collecta](http://collecta.com/#q=%s)"
 
 #. TRANS: Menu item in search group navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "People"
 msgstr "Personnes"
@@ -9958,7 +9246,6 @@ msgid "Find people on this site"
 msgstr "Chercher des personnes sur ce site"
 
 #. TRANS: Menu item in search group navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Notices"
 msgstr "Avis"
@@ -9971,37 +9258,17 @@ msgstr "Chercher dans le contenu des avis"
 msgid "Find groups on this site"
 msgstr "Rechercher des groupes sur ce site"
 
-#. TRANS: Secondary navigation menu item leading to help on StatusNet.
-msgctxt "MENU"
-msgid "Help"
-msgstr "Aide"
-
-#. TRANS: Secondary navigation menu item leading to text about StatusNet site.
-#, fuzzy
-msgctxt "MENU"
-msgid "About"
-msgstr "À propos"
-
-#. TRANS: Secondary navigation menu item leading to Frequently Asked Questions.
-#, fuzzy
-msgctxt "MENU"
-msgid "FAQ"
-msgstr "FAQ"
-
 #. TRANS: Secondary navigation menu item leading to Terms of Service.
-#, fuzzy
 msgctxt "MENU"
 msgid "TOS"
 msgstr "CGU"
 
 #. TRANS: Secondary navigation menu item leading to privacy policy.
-#, fuzzy
 msgctxt "MENU"
 msgid "Privacy"
 msgstr "Confidentialité"
 
 #. TRANS: Secondary navigation menu item. Leads to information about StatusNet and its license.
-#, fuzzy
 msgctxt "MENU"
 msgid "Source"
 msgstr "Source"
@@ -10011,19 +9278,6 @@ msgctxt "MENU"
 msgid "Version"
 msgstr "Version"
 
-#. TRANS: Secondary navigation menu item leading to e-mail contact information on the
-#. TRANS: StatusNet site, where to report bugs, ...
-#, fuzzy
-msgctxt "MENU"
-msgid "Contact"
-msgstr "Contact"
-
-#. TRANS: Secondary navigation menu item. Leads to information about embedding a timeline widget.
-#, fuzzy
-msgctxt "MENU"
-msgid "Badge"
-msgstr "Insigne"
-
 #. TRANS: Default title for section/sidebar widget.
 msgid "Untitled section"
 msgstr "Section sans titre"
@@ -10033,17 +9287,15 @@ msgid "More..."
 msgstr "Plus..."
 
 #. TRANS: Header in settings navigation panel.
-#, fuzzy
 msgctxt "HEADER"
 msgid "Settings"
-msgstr "Paramètres SMS"
+msgstr "Configuration"
 
 #. TRANS: Menu item title in settings navigation panel.
 msgid "Change your profile settings"
 msgstr "Modifier vos paramètres de profil"
 
 #. TRANS: Menu item in settings navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Avatar"
 msgstr "Avatar"
@@ -10053,7 +9305,6 @@ msgid "Upload an avatar"
 msgstr "Ajouter un avatar"
 
 #. TRANS: Menu item in settings navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Password"
 msgstr "Mot de passe"
@@ -10071,10 +9322,6 @@ msgstr "Courriel"
 msgid "Change email handling"
 msgstr "Modifier le traitement des courriels"
 
-#. TRANS: Menu item title in settings navigation panel.
-msgid "Design your profile"
-msgstr "Concevez votre profil"
-
 #. TRANS: Menu item in settings navigation panel.
 msgctxt "MENU"
 msgid "URL"
@@ -10087,7 +9334,7 @@ msgstr "Raccourcisseurs d’URL"
 #. TRANS: Menu item in settings navigation panel.
 msgctxt "MENU"
 msgid "IM"
-msgstr "IM"
+msgstr "Messagerie instantanée"
 
 #. TRANS: Menu item title in settings navigation panel.
 msgid "Updates by instant messenger (IM)"
@@ -10111,8 +9358,17 @@ msgstr "Connexions"
 msgid "Authorized connected applications"
 msgstr "Applications autorisées connectées"
 
+#. TRANS: Menu item in settings navigation panel.
+msgctxt "MENU"
+msgid "Old school"
+msgstr "Ancienne école"
+
+#. TRANS: Menu item title in settings navigation panel.
+msgid "UI tweaks for old-school users"
+msgstr ""
+"Réglages de l’interface utilisateur pour les utilisateurs de l’ancienne école"
+
 #. TRANS: Title of form to silence a user.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Silence"
 msgstr "Silence"
@@ -10121,6 +9377,44 @@ msgstr "Silence"
 msgid "Silence this user"
 msgstr "Réduire cet utilisateur au silence"
 
+#. TRANS: Server error displayed when trying to create an anynymous OAuth consumer.
+msgid "Could not create anonymous consumer."
+msgstr "Impossible de créer un consommateur anonyme."
+
+#. TRANS: Server error displayed when trying to create an anynymous OAuth application.
+msgid "Could not create anonymous OAuth application."
+msgstr "Impossible de créer l’application OAuth anonyme."
+
+#. TRANS: Exception thrown when no token association could be found.
+msgid ""
+"Could not find a profile and application associated with the request token."
+msgstr ""
+"Impossible de trouver le profil et l’application associés au jeton de "
+"requête."
+
+#. TRANS: Exception thrown when no access token can be issued.
+msgid "Could not issue access token."
+msgstr "Impossible d’émettre le jeton d’accès."
+
+#. TRANS: Exception thrown when a database error occurs.
+msgid "Database error inserting OAuth application user."
+msgstr ""
+"Erreur de base de donnée en insérant l’utilisateur de l’application OAuth"
+
+#. TRANS: Exception thrown when a database error occurs.
+msgid "Database error updating OAuth application user."
+msgstr ""
+"Une erreur de base de données a été retournée lors de la mise à jour de "
+"l’utilisateur de l’application OAuth."
+
+#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
+msgid "Tried to revoke unknown token."
+msgstr "Révocation essayée d’un jeton inconnu."
+
+#. TRANS: Exception thrown when an attempt is made to remove a revoked token.
+msgid "Failed to delete revoked token."
+msgstr "Impossible de supprimer un jeton révoqué."
+
 #. TRANS: Menu item in local navigation menu.
 msgctxt "MENU"
 msgid "Subscriptions"
@@ -10128,15 +9422,15 @@ msgstr "Abonnements"
 
 #. TRANS: Menu item title in local navigation menu.
 #. TRANS: %s is a user nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "People %s subscribes to."
-msgstr "Abonnements de %s"
+msgstr "Personnes suivies par %s."
 
 #. TRANS: Menu item title in local navigation menu.
 #. TRANS: %s is a user nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "People subscribed to %s."
-msgstr "Abonnés de %s"
+msgstr "Personnes abonnées à %s."
 
 #. TRANS: Menu item in local navigation menu.
 #. TRANS: %d is the number of pending subscription requests.
@@ -10152,15 +9446,15 @@ msgstr "Approuver les demandes d’adhésion en attente."
 
 #. TRANS: Menu item title in local navigation menu.
 #. TRANS: %s is a user nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "Groups %s is a member of."
-msgstr "Groupes de %s"
+msgstr "Groupes dont %s est membre."
 
 #. TRANS: Menu item title in local navigation menu.
 #. TRANS: %s is a user nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "List subscriptions by %s."
-msgstr "Abonnés de %s"
+msgstr "Liste des abonnements de %s."
 
 #. TRANS: Menu item in local navigation menu.
 msgctxt "MENU"
@@ -10169,14 +9463,24 @@ msgstr "Inviter"
 
 #. TRANS: Menu item title in local navigation menu.
 #. TRANS: %s is the StatusNet sitename.
-#, fuzzy, php-format
+#, php-format
 msgid "Invite friends and colleagues to join you on %s."
-msgstr "Inviter des amis et collègues à vous rejoindre dans %s"
+msgstr "Inviter des amis et collègues à vous rejoindre sur %s."
 
 #. TRANS: Form of form to subscribe to a user.
 msgid "Subscribe to this user"
 msgstr "S’abonner à cet utilisateur"
 
+#. TRANS: Button text to subscribe to a user.
+#. TRANS: Button text for subscribing to a list.
+msgctxt "BUTTON"
+msgid "Subscribe"
+msgstr "S’abonner"
+
+#. TRANS: Button title to subscribe to a user.
+msgid "Subscribe to this user."
+msgstr "S’abonner à cet utilisateur."
+
 #. TRANS: Title of personal tag cloud section.
 msgid "People Tagcloud as self-tagged"
 msgstr "Nuage de marques pour une personne (ajoutées par eux-même)"
@@ -10186,7 +9490,6 @@ msgid "People Tagcloud as tagged"
 msgstr "Nuage de marques pour une personne"
 
 #. TRANS: Content displayed in a tag cloud section if there are no tags.
-#, fuzzy
 msgctxt "NOTAGS"
 msgid "None"
 msgstr "Aucun"
@@ -10211,9 +9514,8 @@ msgid "Failed saving theme."
 msgstr "L’enregistrement du thème a échoué."
 
 #. TRANS: Server exception thrown when an uploaded theme has an incorrect structure.
-#, fuzzy
 msgid "Invalid theme: Bad directory structure."
-msgstr "Thème invalide : mauvaise arborescence."
+msgstr "Thème non valide : mauvaise structure des répertoires."
 
 #. TRANS: Client exception thrown when an uploaded theme is larger than the limit.
 #. TRANS: %d is the number of bytes of the uncompressed theme.
@@ -10229,9 +9531,8 @@ msgstr[1] ""
 "une fois décompressé."
 
 #. TRANS: Server exception thrown when an uploaded theme is incomplete.
-#, fuzzy
 msgid "Invalid theme archive: Missing file css/display.css"
-msgstr "Archive de thème invalide : fichier css/display.css manquant"
+msgstr "Archive de thème non valide : le fichier css/display.css est manquant"
 
 #. TRANS: Server exception thrown when an uploaded theme has an incorrect file or folder name.
 msgid ""
@@ -10249,27 +9550,26 @@ msgstr ""
 
 #. TRANS: Server exception thrown when an uploaded theme contains a file type that is not allowed.
 #. TRANS: %s is the file type that is not allowed.
-#, fuzzy, php-format
+#, php-format
 msgid "Theme contains file of type \".%s\", which is not allowed."
-msgstr "Le thème contient un fichier de type « .%s », qui n'est pas autorisé."
+msgstr "Le thème contient un fichier de type « .%s » qui n’est pas autorisé."
 
 #. TRANS: Server exception thrown when an uploaded compressed theme cannot be opened.
 msgid "Error opening theme archive."
 msgstr "Erreur lors de l’ouverture de l’archive du thème."
 
 #. TRANS: Header for Notices section.
-#, fuzzy
 msgctxt "HEADER"
 msgid "Notices"
 msgstr "Avis"
 
 #. TRANS: Link to show replies for a notice.
 #. TRANS: %d is the number of replies to a notice and used for plural.
-#, fuzzy, php-format
+#, php-format
 msgid "Show reply"
 msgid_plural "Show all %d replies"
-msgstr[0] "Voir davantage"
-msgstr[1] "Voir davantage"
+msgstr[0] "Montrer la réponse"
+msgstr[1] "Montrer toutes les %d réponses"
 
 #. TRANS: Reference to the logged in user in favourite list.
 msgctxt "FAVELIST"
@@ -10278,16 +9578,15 @@ msgstr "Vous"
 
 #. TRANS: For building a list such as "Jim, Bob, Mary and 5 others like this".
 #. TRANS: %1$s is a list of users, separated by a separator (default: ", "), %2$s is the last user in the list.
-#, fuzzy, php-format
+#, php-format
 msgctxt "FAVELIST"
 msgid "%1$s and %2$s"
-msgstr "%1$s - %2$s"
+msgstr "%1$s et %2$s"
 
 #. TRANS: List message for notice favoured by logged in user.
-#, fuzzy
 msgctxt "FAVELIST"
 msgid "You like this."
-msgstr "Avis populaires"
+msgstr "Vous aimez ceci."
 
 #. TRANS: List message for when more than 4 people like something.
 #. TRANS: %%s is a list of users liking a notice, %d is the number over 4 that like the notice.
@@ -10295,8 +9594,8 @@ msgstr "Avis populaires"
 #, php-format
 msgid "%%s and %d others like this."
 msgid_plural "%%s and %d others like this."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%%s et %d autres ont aimé ceci."
+msgstr[1] "%%s et %d autres ont aimé ceci."
 
 #. TRANS: List message for favoured notices.
 #. TRANS: %%s is a list of users liking a notice.
@@ -10304,27 +9603,36 @@ msgstr[1] ""
 #, php-format
 msgid "%%s likes this."
 msgid_plural "%%s like this."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%%s aime ceci."
+msgstr[1] "%%s aiment ceci."
 
 #. TRANS: List message for notice repeated by logged in user.
-#, fuzzy
 msgctxt "REPEATLIST"
-msgid "You have repeated this notice."
-msgstr "Vous avez déjà repris cet avis."
+msgid "You repeated this."
+msgstr "Vous avez repris cet avis."
 
-#. TRANS: List message for repeated notices.
-#. TRANS: %d is the number of users that have repeated a notice.
-#, fuzzy, php-format
-msgid "One person has repeated this notice."
-msgid_plural "%d people have repeated this notice."
-msgstr[0] "Vous avez déjà repris cet avis."
-msgstr[1] "Vous avez déjà repris cet avis."
+#. TRANS: List message for when more than 4 people repeat something.
+#. TRANS: %%s is a list of users liking a notice, %d is the number over 4 that like the notice.
+#. TRANS: Plural is decided on the total number of users liking the notice (count of %%s + %d).
+#, php-format
+msgid "%%s and %d other repeated this."
+msgid_plural "%%s and %d others repeated this."
+msgstr[0] "%%s et %d autre ont repris ceci."
+msgstr[1] "%%s et %d autres ont repris ceci."
+
+#. TRANS: List message for favoured notices.
+#. TRANS: %%s is a list of users liking a notice.
+#. TRANS: Plural is based on the number of of users that have favoured a notice.
+#, php-format
+msgid "%%s repeated this."
+msgid_plural "%%s repeated this."
+msgstr[0] "%%s a repris ceci."
+msgstr[1] "%%s ont repris ceci."
 
 #. TRANS: Form legend.
-#, fuzzy, php-format
+#, php-format
 msgid "Search and list people"
-msgstr "Rechercher sur le site"
+msgstr "Rechercher et lister des personnes"
 
 #. TRANS: Dropdown option for searching in profiles.
 msgid "Everything"
@@ -10336,30 +9644,28 @@ msgstr "Nom complet"
 
 #. TRANS: Dropdown option for searching in profiles.
 msgid "URI (Remote users)"
-msgstr ""
+msgstr "URI (utilisateurs distants)"
 
 #. TRANS: Dropdown field label.
-#, fuzzy
 msgctxt "LABEL"
 msgid "Search in"
-msgstr "Rechercher sur le site"
+msgstr "Rechercher dans"
 
 #. TRANS: Dropdown field title.
-#, fuzzy
 msgid "Choose a field to search."
-msgstr "Choissez une marque pour réduire la liste"
+msgstr "Choisissez un champ pour la recherche."
 
 #. TRANS: Form legend.
 #. TRANS: %1$s is a nickname, $2$s is a list.
-#, fuzzy, php-format
+#, php-format
 msgid "Remove %1$s from list %2$s"
-msgstr "%1$s - %2$s"
+msgstr "Retirer %1$s de la liste « %2$s »"
 
 #. TRANS: Legend on form to add a profile to a list.
 #. TRANS: %1$s is a nickname, %2$s is a list.
-#, fuzzy, php-format
+#, php-format
 msgid "Add %1$s to list %2$s"
-msgstr "%1$s - %2$s"
+msgstr "Ajouter %1$s à la liste « %2$s »"
 
 #. TRANS: Title for top posters section.
 msgid "Top posters"
@@ -10377,20 +9683,18 @@ msgid "My colleagues at %s"
 msgstr "Mes collègues sur %s"
 
 #. TRANS: Label for drop-down of potential addressees.
-#, fuzzy
 msgctxt "LABEL"
 msgid "To:"
-msgstr "À"
+msgstr "À :"
 
 #. TRANS: Checkbox label in widget for selecting potential addressees to mark the notice private.
-#, fuzzy
 msgid "Private?"
-msgstr "Privé"
+msgstr "Privé ?"
 
 #. TRANS: Client exception thrown in widget for selecting potential addressees when an invalid fill option was received.
-#, fuzzy, php-format
+#, php-format
 msgid "Unknown to value: \"%s\"."
-msgstr "Langue « %s » inconnue."
+msgstr "Type de destinataire « %s » inconnu."
 
 #. TRANS: Title for the form to unblock a user.
 msgctxt "TITLE"
@@ -10398,7 +9702,6 @@ msgid "Unblock"
 msgstr "Débloquer"
 
 #. TRANS: Title for unsandbox form.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Unsandbox"
 msgstr "Sortir du bac à sable"
@@ -10416,16 +9719,18 @@ msgid "Unsilence this user"
 msgstr "Sortir cet utilisateur du silence"
 
 #. TRANS: Form legend on unsubscribe form.
-#. TRANS: Button title on unsubscribe form.
 msgid "Unsubscribe from this user"
 msgstr "Ne plus suivre cet utilisateur"
 
 #. TRANS: Button text on unsubscribe form.
 #. TRANS: Button text for unsubscribing from a list.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Unsubscribe"
-msgstr "Désabonnement"
+msgstr "Se désabonner"
+
+#. TRANS: Button title on unsubscribe form.
+msgid "Unsubscribe from this user."
+msgstr "Ne plus suivre cet utilisateur"
 
 #. TRANS: Exception text shown when no profile can be found for a user.
 #. TRANS: %1$s is a user nickname, $2$d is a user ID (number).
@@ -10434,9 +9739,8 @@ msgid "User %1$s (%2$d) has no profile record."
 msgstr "L’utilisateur %1$s (%2$d) n’a pas de profil."
 
 #. TRANS: Authorisation exception thrown when a user a not allowed to login.
-#, fuzzy
 msgid "Not allowed to log in."
-msgstr "Non connecté."
+msgstr "Pas autorisé à se connecter."
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 msgid "a few seconds ago"
@@ -10510,8 +9814,6 @@ msgstr "XML invalide, racine XRD manquante."
 msgid "Getting backup from file '%s'."
 msgstr "Obtention de la sauvegarde depuis le fichier « %s »."
 
-#~ msgid "%1$s and friends, page %2$d"
-#~ msgstr "%1$s et ses amis, page %2$d"
-
-#~ msgid "You and friends"
-#~ msgstr "Vous et vos amis"
+#
+#~ msgid " "
+#~ msgstr " "
diff --git a/locale/fur/LC_MESSAGES/statusnet.po b/locale/fur/LC_MESSAGES/statusnet.po
index d788f92115..8bf37ba868 100644
--- a/locale/fur/LC_MESSAGES/statusnet.po
+++ b/locale/fur/LC_MESSAGES/statusnet.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Core to Friulian (Furlan)
+# Translation of StatusNet - Core to Friulian (furlan)
 # Exported from translatewiki.net
 #
 # Author: Klenje
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:07+0000\n"
-"Language-Team: Friulian <http://translatewiki.net/wiki/Portal:fur>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:02+0000\n"
+"Language-Team: Friulian <https://translatewiki.net/wiki/Portal:fur>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-05-05 10:52:40+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2012-04-22 22:02:21+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: fur\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -34,12 +34,6 @@ msgstr ""
 "dal probleme, ma tu ju puedis contatâ su %2$s par jessi sigûr. Se no, spiete "
 "cualchi minût par tornâ a provâ."
 
-#. TRANS: Error message.
-msgid ""
-"An important error occured, probably related to email setup. Check logfiles "
-"for more info."
-msgstr ""
-
 #. TRANS: Error message.
 msgid "An error occurred."
 msgstr "Al è sucedût un erôr."
@@ -57,7 +51,7 @@ msgstr "Pagjine no cognossude"
 #. TRANS: Error message displayed when trying to perform an undefined action.
 #. TRANS: Title for password recovery page when an unknown action has been specified.
 msgid "Unknown action"
-msgstr ""
+msgstr "Azion no cognossude"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 msgid "Access"
@@ -92,18 +86,17 @@ msgstr "Dome invîts"
 
 #. TRANS: Checkbox instructions for admin setting "Closed" (no new registrations).
 msgid "Disable new registrations."
-msgstr ""
+msgstr "Disative lis gnovis regjistrazions."
 
 #. TRANS: Checkbox label for disabling new user registrations.
 msgid "Closed"
 msgstr "Sierât"
 
-#. TRANS: Title for button to save access settings in site admin panel.
-msgid "Save access settings"
-msgstr "Salve lis impuestazions di acès"
+#. TRANS: Button title to save access settings in site admin panel.
+msgid "Save access settings."
+msgstr "Salve lis impuestazions di acès."
 
-#. TRANS: Tooltip for button to save access settings in site admin panel.
-#. TRANS: Button text for saving theme settings.
+#. TRANS: Button text to save access settings in site admin panel.
 #. TRANS: Button label to save e-mail preferences.
 #. TRANS: Button label to save IM preferences.
 #. TRANS: Button text in the license admin panel.
@@ -119,7 +112,6 @@ msgstr "Salve lis impuestazions di acès"
 #. TRANS: Button text for saving "Other settings" in profile.
 #. TRANS: Button text to save user settings in user admin panel.
 #. TRANS: Button label in the "Edit application" form.
-#. TRANS: Button text on profile design page to save settings.
 #. TRANS: Text for save button on group edit form.
 #. TRANS: Button text to save tags for a profile.
 msgctxt "BUTTON"
@@ -158,10 +150,6 @@ msgstr "Il profîl nol esist."
 msgid "No such list."
 msgstr "La liste no esist."
 
-#. TRANS: Client error displayed when trying to add an OMB 0.1 remote profile to a list.
-msgid "You cannot list an OMB 0.1 remote profile with this action."
-msgstr ""
-
 #. TRANS: Client error displayed when an unknown error occurs when adding a user to a list.
 #. TRANS: %s is a username.
 #, php-format
@@ -191,7 +179,6 @@ msgstr "La pagjine no esist."
 #. TRANS: Client error when user not found for an rss related action.
 #. TRANS: Client error displayed when no existing user is provided for a user's delivery device setting.
 #. TRANS: Client error displayed if a user could not be found.
-#. TRANS: Client error when user not found updating a profile background image.
 #. TRANS: Client error displayed updating profile image without having a user object.
 #. TRANS: Client error displayed when making an Atom API request for an unknown user.
 #. TRANS: Client error displayed when trying to block a non-existing user or a user from another site.
@@ -217,14 +204,11 @@ msgstr "La pagjine no esist."
 #. TRANS: Client error displayed when trying to get the RSS feed with favorites of a user that does not exist.
 #. TRANS: Client error displayed when requesting Friends of a Friend feed without providing a user nickname.
 #. TRANS: Client error displayed when requesting Friends of a Friend feed for an object that is not a user.
-#. TRANS: Client error displayed when trying to get a user hCard for a non-existing user.
 #. TRANS: Client error displayed trying to make a micro summary without providing a valid user.
 #. TRANS: Client error displayed trying to send a direct message to a non-existing user.
 #. TRANS: Client error displayed trying to use "one time password login" without using an existing user.
 #. TRANS: Client error displayed when referring to non-existing user.
 #. TRANS: Client error displayed trying to perform an action related to a non-existing user.
-#. TRANS: Form validation error on page for remote subscribe when no user was provided.
-#. TRANS: Form validation error on page for remote subscribe when no user profile was found.
 #. TRANS: Client error displayed when trying to reply to a non-exsting user.
 #. TRANS: Client error displayed when providing a non-existing nickname in a RSS 1.0 action.
 #. TRANS: Client error.
@@ -233,7 +217,6 @@ msgstr "La pagjine no esist."
 #. TRANS: Client error displayed trying to find a user by ID for a non-existing ID.
 #. TRANS: Client error displayed requesting groups for a non-existing user.
 #. TRANS: Client error displayed when user not found for an action.
-#. TRANS: Client error displayed providing a non-existing nickname.
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #. TRANS: Client error displayed when trying to perform a gallery action with an unknown user.
 #. TRANS: Client error displayed when trying to access a mailbox without providing a user.
@@ -242,15 +225,21 @@ msgid "No such user."
 msgstr "Utent no cjatât."
 
 #. TRANS: Title of a user's own start page.
-#, fuzzy
 msgid "Home timeline"
-msgstr "Ativitât di %s"
+msgstr "Pagjine iniziâl de ativitât"
 
 #. TRANS: Title of another user's start page.
 #. TRANS: %s is the other user's name.
-#, fuzzy, php-format
+#, php-format
 msgid "%s's home timeline"
-msgstr "Ativitât di %s"
+msgstr "Pagjine iniziâl de ativitât di %s"
+
+#. TRANS: %s is user nickname.
+#. TRANS: Feed title.
+#. TRANS: %s is tagger's nickname.
+#, php-format
+msgid "Feed for friends of %s (Activity Streams JSON)"
+msgstr "Canâl dai amîs di %s (Activity Streams JSON)"
 
 #. TRANS: %s is user nickname.
 #, php-format
@@ -297,7 +286,7 @@ msgstr ""
 "Tu puedis provâ a [pocâ %1$s](../%2$s) dal so profîl o ben [mandâi un avîs](%"
 "%%%action.newnotice%%%%?status_textarea=%3$s)."
 
-#. TRANS: Encoutagement displayed on empty timeline user pages for anonymous users.
+#. TRANS: Encouragement displayed on empty timeline user pages for anonymous users.
 #. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
 #. TRANS: Empty list message for page with replies for a user for not logged in users.
 #. TRANS: %1$s is a user nickname. This message contains a Markdown link in the form [link text](link).
@@ -311,6 +300,12 @@ msgstr ""
 "Parcè no [tu regjistris une identitât](%%%%action.register%%%%) e po tu "
 "pochis %s o tu i publichis un avîs."
 
+#. TRANS: Button text for inviting more users to the StatusNet instance.
+#. TRANS: Less business/enterprise-oriented language for public sites.
+msgctxt "BUTTON"
+msgid "Send invite"
+msgstr "Invide"
+
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Title of API timeline for a user and friends.
 #. TRANS: %s is a username.
@@ -319,8 +314,6 @@ msgstr ""
 #. TRANS: %s is a username.
 #. TRANS: Menu item title in personal group navigation menu.
 #. TRANS: %s is a username.
-#. TRANS: Menu item title in settings navigation panel.
-#. TRANS: %s is a username.
 #, php-format
 msgid "%s and friends"
 msgstr "%s e amîs"
@@ -358,7 +351,6 @@ msgstr ""
 #. TRANS: Server error thrown on database error updating SMS preferences.
 #. TRANS: Server error thrown on database error removing a registered SMS phone number.
 #. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
-#. TRANS: Server exception thrown on Profile design page when updating design settings fails.
 msgid "Could not update user."
 msgstr "No si à podût inzornâ l'utent."
 
@@ -373,7 +365,6 @@ msgstr "No si à podût salvâ il profîl."
 
 #. TRANS: Client error displayed when the number of bytes in a POST request exceeds a limit.
 #. TRANS: %s is the number of bytes of the CONTENT_LENGTH.
-#. TRANS: Form validation error in design settings form. POST should remain untranslated.
 #, php-format
 msgid ""
 "The server was unable to handle that much POST data (%s byte) due to its "
@@ -384,24 +375,6 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#. TRANS: Client error displayed when saving design settings fails because of an empty id.
-#. TRANS: Client error displayed when saving design settings fails because of an empty result.
-#. TRANS: Client error displayed when a database error occurs inserting profile colours.
-#. TRANS: Client error displayed when a database error occurs updating profile colours.
-#. TRANS: Form validation error displayed when group design settings could not be saved because of an application issue.
-#. TRANS: Form validation error on Profile design page when saving design settings has failed.
-#. TRANS: Form validation error on Profile design page when updating design settings has failed.
-msgid "Unable to save your design settings."
-msgstr ""
-
-#. TRANS: Error displayed when updating design settings fails.
-#. TRANS: Client error displayed when a database error occurs updating profile colours.
-#. TRANS: Form validation error on Profile design page when updating design settings has failed.
-#. TRANS: Error message displayed if design settings could not be saved.
-#. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
-msgid "Could not update your design."
-msgstr ""
-
 #. TRANS: Title for Atom feed.
 msgctxt "ATOM"
 msgid "Main"
@@ -448,6 +421,20 @@ msgstr ""
 msgid "Unblock user failed."
 msgstr ""
 
+#. TRANS: Client exception thrown when no conversation ID is given.
+msgid "No conversation ID."
+msgstr "Nissun ID de tabaiade."
+
+#. TRANS: Client exception thrown when referring to a non-existing conversation ID (%d).
+#, php-format
+msgid "No conversation with ID %d."
+msgstr "Nissune conversazion cun ID %d."
+
+#. TRANS: Title for conversion timeline.
+msgctxt "TITLE"
+msgid "Conversation"
+msgstr "Tabaiade"
+
 #. TRANS: Title. %s is a user nickname.
 #, php-format
 msgid "Direct messages from %s"
@@ -493,6 +480,8 @@ msgid "Cannot send direct messages to users who aren't your friend."
 msgstr ""
 
 #. TRANS: Client error displayed trying to direct message self (403).
+#. TRANS: Client error displayed trying to send a direct message to self.
+#. TRANS: Error text shown when trying to send a direct message to self.
 msgid ""
 "Do not send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
@@ -721,7 +710,6 @@ msgstr "grups su %s"
 
 #. TRANS: Client error displayed when trying to edit a group without being an admin.
 #. TRANS: Client error displayed trying to edit a group while not being a group admin.
-#. TRANS: Client error displayed trying to change group design settings without being a (group) admin.
 #. TRANS: Client error displayed when trying to change group logo settings while not being a group admin.
 msgid "You must be an admin to edit the group."
 msgstr ""
@@ -830,7 +818,6 @@ msgstr ""
 
 #. TRANS: Client error given on when invalid data was passed through a form in the OAuth API.
 #. TRANS: Unexpected validation error on avatar upload form.
-#. TRANS: Client error displayed when the submitted form contains unexpected data.
 #. TRANS: Client error displayed submitting invalid form data for edit application.
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
 #. TRANS: Form validation error message when an unsupported argument is used.
@@ -839,17 +826,16 @@ msgstr ""
 #. TRANS: Client error when submitting a form with unexpected information.
 #. TRANS: Client error displayed when unexpected data is posted in the password recovery form.
 #. TRANS: Message given submitting a form with an unknown action in SMS settings.
-#. TRANS: Unknown form validation error in design settings form.
 msgid "Unexpected form submission."
 msgstr ""
 
 #. TRANS: Title for a page where a user can confirm/deny account access by an external application.
 msgid "An application would like to connect to your account"
-msgstr ""
+msgstr "Une aplicazion e volarès conetisi ae tô identitât"
 
 #. TRANS: Fieldset legend.
 msgid "Allow or deny access"
-msgstr ""
+msgstr "Permet o dinee l'acès"
 
 #. TRANS: User notification of external application requesting account access.
 #. TRANS: %3$s is the access type requested (read-write or read-only), %4$s is the StatusNet sitename.
@@ -878,7 +864,6 @@ msgstr "Identitât"
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Field label on account registration page.
-#. TRANS: Label for nickname on user authorisation page.
 #. TRANS: Field label on group edit form.
 #. TRANS: Dropdown option for searching in profiles.
 msgid "Nickname"
@@ -907,7 +892,7 @@ msgstr "Permet"
 
 #. TRANS: Form instructions.
 msgid "Authorize access to your account information."
-msgstr ""
+msgstr "Permet l'acès aes informazions de tô identitât"
 
 #. TRANS: Header for user notification after revoking OAuth access to an application.
 msgid "Authorization canceled."
@@ -921,19 +906,21 @@ msgstr ""
 
 #. TRANS: Title of the page notifying the user that an anonymous client application was successfully authorized to access the user's account with OAuth.
 msgid "You have successfully authorized the application"
-msgstr ""
+msgstr "Tu âs dât l'autorizazion ae aplicazion"
 
 #. TRANS: Message notifying the user that an anonymous client application was successfully authorized to access the user's account with OAuth.
 msgid ""
 "Please return to the application and enter the following security code to "
 "complete the process."
 msgstr ""
+"Par plasê torne ae aplicazion e inserìs il codiç di sigurece ca sot par finî "
+"il procès."
 
 #. TRANS: Title of the page notifying the user that the client application was successfully authorized to access the user's account with OAuth.
 #. TRANS: %s is the authorised application name.
 #, php-format
 msgid "You have successfully authorized %s"
-msgstr ""
+msgstr "Tu âs dât l'autorizazion a %s"
 
 #. TRANS: Message notifying the user that the client application was successfully authorized to access the user's account with OAuth.
 #. TRANS: %s is the authorised application name.
@@ -942,6 +929,8 @@ msgid ""
 "Please return to %s and enter the following security code to complete the "
 "process."
 msgstr ""
+"Par plasê torne ae %s e inserìs il codiç di sigurece ca sot par finî il "
+"procès."
 
 #. TRANS: Client error displayed trying to delete a status not using POST or DELETE.
 #. TRANS: POST and DELETE should not be translated.
@@ -1050,7 +1039,7 @@ msgstr "%1$s inzornaments preferîts di %2$s / %3$s."
 #. TRANS: %s is the error message.
 #, php-format
 msgid "Could not generate feed for list - %s"
-msgstr ""
+msgstr "No si à podût gjenerâ il canâl pe liste - %s"
 
 #. TRANS: Title for timeline of most recent mentions of a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user nickname.
@@ -1121,7 +1110,7 @@ msgstr "Inzornaments etichetâts cun %1$s su %2$s!"
 
 #. TRANS: Client error displayed trying to add a notice to another user's timeline.
 msgid "Only the user can add to their own timeline."
-msgstr ""
+msgstr "Dome l'utent al pues zontâ alc ae sô ativitât."
 
 #. TRANS: Client error displayed when using another format than AtomPub.
 msgid "Only accept AtomPub for Atom feeds."
@@ -1188,12 +1177,9 @@ msgstr "Tu scugnis jessi jentrât par lassâ un grup."
 #. TRANS: Client error displayed when requesting Friends of a Friend feed for a nickname that is not a group.
 #. TRANS: Client error displayed trying to block a user from a group while specifying a non-existing group.
 #. TRANS: Client error displayed referring to a group's permalink for a non-existing group ID.
-#. TRANS: Client error displayed trying to change group design settings while providing a nickname for a non-existing group.
 #. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
 #. TRANS: Client error displayed when trying to view group members for a non-existing group.
 #. TRANS: Client error displayed when trying to view group members for an object that is not a group.
-#. TRANS: Client error displayed when trying to view group members for a non-existing group.
-#. TRANS: Client error displayed when trying to view group members for an object that is not a group.
 #. TRANS: Client error displayed when requesting a group RSS feed for group that does not exist.
 #. TRANS: Client error displayed when requesting a group RSS feed for an object that is not a group.
 #. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
@@ -1202,10 +1188,10 @@ msgstr "Tu scugnis jessi jentrât par lassâ un grup."
 #. TRANS: Client error displayed when trying to leave a non-local group.
 #. TRANS: Client error displayed when trying to leave a non-existing group.
 #. TRANS: Client error displayed when providing an invalid group ID on the Make Admin page.
-#. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
-#. TRANS: Client error displayed if no local group with a given name was found requesting group page.
 #. TRANS: Command exception text shown when a group is requested that does not exist.
 #. TRANS: Error text shown when trying to leave a group that does not exist.
+#. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
+#. TRANS: Client error displayed if no local group with a given name was found requesting group page.
 msgid "No such group."
 msgstr "Il grup nol esist."
 
@@ -1272,6 +1258,7 @@ msgid "Join request canceled."
 msgstr "Richieste di union scancelade."
 
 #. TRANS: Client error displayed trying to approve subscription for a non-existing request.
+#. TRANS: %s is a user nickname.
 #, php-format
 msgid "%s is not in the moderation queue for your subscriptions."
 msgstr "%s nol è te code di moderazion pes tôs sotscrizions."
@@ -1423,7 +1410,6 @@ msgstr ""
 #. TRANS: Client error displayed trying to get an avatar without providing a nickname.
 #. TRANS: Client error displayed when requesting a list of blocked users for a group without providing a group nickname.
 #. TRANS: Client error displayed trying to edit a group while not proving a nickname for the group to edit.
-#. TRANS: Client error displayed trying to change group design settings without providing a group nickname.
 #. TRANS: Client error displayed when trying to change group logo settings without providing a nickname.
 #. TRANS: Client error displayed when trying to view group members without providing a group nickname.
 #. TRANS: Client error displayed when requesting a group RSS feed without providing a group nickname.
@@ -1714,6 +1700,16 @@ msgstr "La direzion \"%s\" e je stade confermade pe tô identitât."
 msgid "Conversation"
 msgstr "Tabaiade"
 
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+msgid "Conversation feed (Activity Streams JSON)"
+msgstr "Canâl des tabaiadis (flus di ativitât JSON)"
+
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+msgid "Conversation feed (RSS 2.0)"
+msgstr "Canâl des tabaiadis (RSS 2.0)"
+
 #. TRANS: Title for conversation page.
 #. TRANS: Title for page that shows a notice.
 msgctxt "TITLE"
@@ -1775,8 +1771,8 @@ msgid "Enter \"%s\" to confirm that you want to delete your account."
 msgstr "Inserìs \"%s\" par confermâ che tu vuelis eliminâ la tô identitât."
 
 #. TRANS: Button title for user account deletion.
-msgid "Permanently delete your account"
-msgstr "Elimine par simpri la tô identitât"
+msgid "Permanently delete your account."
+msgstr "Elimine par simpri la tô identitât."
 
 #. TRANS: Client error displayed trying to delete an application while not logged in.
 msgid "You must be logged in to delete an application."
@@ -1784,7 +1780,7 @@ msgstr ""
 
 #. TRANS: Client error displayed trying to delete an application that does not exist.
 msgid "Application not found."
-msgstr ""
+msgstr "La aplicazion no je stade cjatade."
 
 #. TRANS: Client error displayed trying to delete an application the current user does not own.
 #. TRANS: Client error displayed trying to edit an application while not being its owner.
@@ -1913,148 +1909,6 @@ msgstr "No stâ eliminâ chest utent"
 msgid "Delete this user."
 msgstr "Elimine chest utent"
 
-#. TRANS: Message used as title for design settings for the site.
-msgid "Design"
-msgstr "Grafiche"
-
-#. TRANS: Instructions for design adminsitration panel.
-msgid "Design settings for this StatusNet site"
-msgstr "Impuestazions de grafiche par chest sît StatusNet"
-
-#. TRANS: Client error displayed when a logo URL does is not valid.
-msgid "Invalid logo URL."
-msgstr ""
-
-#. TRANS: Client error displayed when an SSL logo URL is invalid.
-msgid "Invalid SSL logo URL."
-msgstr ""
-
-#. TRANS: Client error displayed when a theme is submitted through the form that is not in the theme list.
-#. TRANS: %s is the chosen unavailable theme.
-#, php-format
-msgid "Theme not available: %s."
-msgstr ""
-
-#. TRANS: Fieldset legend for form to change logo.
-msgid "Change logo"
-msgstr "Cambie il logo"
-
-#. TRANS: Field label for StatusNet site logo.
-msgid "Site logo"
-msgstr "Logo dal sît"
-
-#. TRANS: Field label for SSL StatusNet site logo.
-msgid "SSL logo"
-msgstr "Logo SSL"
-
-#. TRANS: Fieldset legend for form change StatusNet site's theme.
-msgid "Change theme"
-msgstr "Cambie il teme"
-
-#. TRANS: Field label for dropdown to choose site theme.
-msgid "Site theme"
-msgstr "Teme dal sît"
-
-#. TRANS: Title for field label for dropdown to choose site theme.
-msgid "Theme for the site."
-msgstr "Teme pal sît."
-
-#. TRANS: Field label for uploading a cutom theme.
-msgid "Custom theme"
-msgstr "Teme personalizât"
-
-#. TRANS: Form instructions for uploading a cutom StatusNet theme.
-msgid "You can upload a custom StatusNet theme as a .ZIP archive."
-msgstr ""
-
-#. TRANS: Fieldset legend for theme background image.
-msgid "Change background image"
-msgstr "Cambie la figure di sfont"
-
-#. TRANS: Field label for background image on theme designer page.
-#. TRANS: Field label for background color selector.
-#. TRANS: Label on profile design page for setting a profile page background colour.
-msgid "Background"
-msgstr "Sfont"
-
-#. TRANS: Form guide for background image upload form on theme designer page.
-#, php-format
-msgid ""
-"You can upload a background image for the site. The maximum file size is %1"
-"$s."
-msgstr ""
-
-#. TRANS: Used as radio button label to add a background image.
-msgid "On"
-msgstr "Ativade"
-
-#. TRANS: Used as radio button label to not add a background image.
-msgid "Off"
-msgstr "Disativade"
-
-#. TRANS: Form guide for turning background image on or off on theme designer page.
-#. TRANS: Form guide for a set of radio buttons on the profile design page that will enable or disable
-#. TRANS: use of the uploaded profile image.
-msgid "Turn background image on or off."
-msgstr ""
-
-#. TRANS: Checkbox label to title background image on theme designer page.
-#. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
-msgid "Tile background image"
-msgstr ""
-
-#. TRANS: Fieldset legend for theme colors.
-msgid "Change colors"
-msgstr "Cambie i colôrs"
-
-#. TRANS: Field label for content color selector.
-#. TRANS: Label on profile design page for setting a profile page content colour.
-msgid "Content"
-msgstr "Contignût"
-
-#. TRANS: Field label for sidebar color selector.
-#. TRANS: Label on profile design page for setting a profile page sidebar colour.
-msgid "Sidebar"
-msgstr "Bare in bande"
-
-#. TRANS: Field label for text color selector.
-#. TRANS: Label on profile design page for setting a profile page text colour.
-msgid "Text"
-msgstr "Test"
-
-#. TRANS: Field label for link color selector.
-#. TRANS: Label on profile design page for setting a profile page links colour.
-msgid "Links"
-msgstr "Leams"
-
-#. TRANS: Fieldset legend for advanced theme design settings.
-msgid "Advanced"
-msgstr "Avançadis"
-
-#. TRANS: Field label for custom CSS.
-msgid "Custom CSS"
-msgstr "CSS personalizât"
-
-#. TRANS: Button text for resetting theme settings.
-msgctxt "BUTTON"
-msgid "Use defaults"
-msgstr "Dopre i parametris predeterminâts"
-
-#. TRANS: Title for button for resetting theme settings.
-#. TRANS: Title for button on profile design page to reset all colour settings to default.
-msgid "Restore default designs."
-msgstr ""
-
-#. TRANS: Title for button for resetting theme settings.
-#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-msgid "Reset back to default."
-msgstr ""
-
-#. TRANS: Title for button for saving theme settings.
-#. TRANS: Title for button on profile design page to save settings.
-msgid "Save design."
-msgstr "Salve la grafiche"
-
 #. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
 msgid "This notice is not a favorite!"
 msgstr ""
@@ -2069,6 +1923,74 @@ msgstr "Zonte ai preferîts"
 msgid "No such document \"%s\"."
 msgstr ""
 
+#. TRANS: Menu item in administrator navigation panel.
+#. TRANS: Menu item in default local navigation panel.
+#. TRANS: Menu item in personal group navigation menu.
+msgctxt "MENU"
+msgid "Home"
+msgstr "Inizi"
+
+msgctxt "MENU"
+msgid "Docs"
+msgstr ""
+
+#. TRANS: Secondary navigation menu item leading to help on StatusNet.
+msgctxt "MENU"
+msgid "Help"
+msgstr "Jutori"
+
+msgid "Getting started"
+msgstr "Par scomençâ"
+
+#. TRANS: Secondary navigation menu item leading to text about StatusNet site.
+msgctxt "MENU"
+msgid "About"
+msgstr "Informazions"
+
+msgid "About this site"
+msgstr "Informazions su chest sît"
+
+#. TRANS: Secondary navigation menu item leading to Frequently Asked Questions.
+msgctxt "MENU"
+msgid "FAQ"
+msgstr "Domandis plui frecuentis"
+
+msgid "Frequently asked questions"
+msgstr "Domandis fatis plui spes"
+
+#. TRANS: Secondary navigation menu item leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+msgctxt "MENU"
+msgid "Contact"
+msgstr "Contats"
+
+msgid "Contact info"
+msgstr "Informazions di contat"
+
+msgctxt "MENU"
+msgid "Tags"
+msgstr "Etichetis"
+
+msgid "Using tags"
+msgstr "Ûs des etichetis"
+
+#. TRANS: Menu item in default local navigation panel.
+#. TRANS: Menu item in search group navigation panel.
+#. TRANS: Menu item in local navigation menu.
+msgctxt "MENU"
+msgid "Groups"
+msgstr "Grups"
+
+msgid "Using groups"
+msgstr "Ûs dai grups"
+
+msgctxt "MENU"
+msgid "API"
+msgstr "API"
+
+msgid "RESTful API"
+msgstr "API RESTful"
+
 #. TRANS: Title for "Edit application" form.
 #. TRANS: Form legend.
 msgid "Edit application"
@@ -2119,7 +2041,7 @@ msgstr "La URL sorzint no je valide."
 #. TRANS: Validation error shown when not providing an organisation in the "Edit application" form.
 #. TRANS: Validation error shown when not providing an organisation in the "New application" form.
 msgid "Organization is required."
-msgstr ""
+msgstr "E covente une organizazion."
 
 #. TRANS: Validation error shown when providing too long an arganisation name in the "Edit application" form.
 msgid "Organization is too long (maximum 255 characters)."
@@ -2153,7 +2075,7 @@ msgstr "Cambie il grup %s"
 #. TRANS: Client error displayed when trying to create a group while not logged in.
 #. TRANS: Client error displayed trying to create a group while not logged in.
 msgid "You must be logged in to create a group."
-msgstr ""
+msgstr "Tu scugnis jessi jentrât par creâ un grup."
 
 #. TRANS: Form instructions for group edit form.
 msgid "Use this form to edit the group."
@@ -2227,7 +2149,7 @@ msgid ""
 "subscriptions to it. Do you still want to continue?"
 msgstr ""
 
-#. TRANS: TRANS: Server error displayed when updating a list fails.
+#. TRANS: Server error displayed when updating a list fails.
 msgid "Could not update list."
 msgstr "No si à podût inzornâ la liste."
 
@@ -2516,7 +2438,7 @@ msgstr ""
 
 #. TRANS: Client error displayed when an invalid notice ID was given trying do display a file.
 msgid "No notice."
-msgstr ""
+msgstr "Nissun avîs."
 
 #. TRANS: Client error displayed when trying do display a file for a notice without a file attachement.
 msgid "No attachments."
@@ -2527,40 +2449,6 @@ msgstr ""
 msgid "No uploaded attachments."
 msgstr ""
 
-#. TRANS: Client error displayed when subscribing to a remote profile and an unexpected response is received.
-msgid "Not expecting this response!"
-msgstr ""
-
-#. TRANS: Client error displayed when subscribing to a remote profile that does not exist.
-msgid "User being listened to does not exist."
-msgstr ""
-
-#. TRANS: Client error displayed when subscribing to a remote profile that is a local profile.
-#. TRANS: Client error displayed when using remote subscribe for a local entity.
-msgid "You can use the local subscription!"
-msgstr ""
-
-#. TRANS: Client error displayed when subscribing to a remote profile that is blocked form subscribing to.
-msgid "That user has blocked you from subscribing."
-msgstr "Chest utent ti à blocât e no tu puedis sotscrivilu."
-
-#. TRANS: Client error displayed when subscribing to a remote profile without providing an authorised token.
-msgid "You are not authorized."
-msgstr "No tu sês autorizât."
-
-#. TRANS: Client error displayed when subscribing to a remote profile and conversion of the request token to access token fails.
-msgid "Could not convert request token to access token."
-msgstr ""
-
-#. TRANS: Client error displayed when subscribing to a remote profile fails because of an unsupported version of the OMB protocol.
-msgid "Remote service uses unknown version of OMB protocol."
-msgstr ""
-
-#. TRANS: Server error displayed when subscribing to a remote profile fails because the remote profile could not be updated.
-#. TRANS: Exception thrown when updating a remote profile fails in OAuth store.
-msgid "Error updating remote profile."
-msgstr ""
-
 #. TRANS: Client error displayed when requesting a non-existent file.
 msgid "No such file."
 msgstr "Il file nol esist."
@@ -2643,30 +2531,7 @@ msgstr ""
 #. TRANS: Client error displayed trying to perform an action without providing an ID.
 #. TRANS: Client error displayed trying to find a user by ID without providing an ID.
 msgid "No ID."
-msgstr ""
-
-#. TRANS: Client error displayed trying to change group design settings while not logged in.
-msgid "You must be logged in to edit a group."
-msgstr ""
-
-#. TRANS: Title group design settings page.
-msgid "Group design"
-msgstr "Grafiche dal grup"
-
-#. TRANS: Instructions for group design settings page.
-msgid ""
-"Customize the way your group looks with a background image and a colour "
-"palette of your choice."
-msgstr ""
-
-#. TRANS: Form validation error displayed when group design settings could not be updated because of an application issue.
-msgid "Unable to update your design settings."
-msgstr ""
-
-#. TRANS: Form text to confirm saved group design settings.
-#. TRANS: Confirmation message on Profile design page when saving design settings has succeeded.
-msgid "Design preferences saved."
-msgstr "Preferencis pe grafiche salvadis."
+msgstr "Nissun ID."
 
 #. TRANS: Title for group logo settings page.
 #. TRANS: Group logo form legend.
@@ -2764,8 +2629,8 @@ msgid ""
 "for one](%%%%action.groupsearch%%%%) or [start your own](%%%%action.newgroup%"
 "%%%)!"
 msgstr ""
-"I grups di %%%%site.name%%%% ti permetin cjatâ e tabaiâ cun int che e à "
-"interès simîi. Daspò che tu ti unissis a un grup tu puedis mandâ messaçs a "
+"I grups di %%%%site.name%%%% ti permetin di cjatâ e tabaiâ cun int che e à "
+"interès simii. Daspò che tu ti unissis a un grup tu puedis mandâ messaçs a "
 "ducj chei altris membris dal grup doprant la scurte \"!groupname\". No son "
 "grups che ti plasin? Prove a [cirint un](%%%%action.groupsearch%%%%) o "
 "[scomence il to](%%%%action.newgroup%%%%)!"
@@ -2838,11 +2703,11 @@ msgstr "Impuestazions IM"
 #. TRANS: the order and formatting of link text and link should remain unchanged.
 #, php-format
 msgid ""
-"You can send and receive notices through instant messaging [instant messages]"
-"(%%doc.im%%). Configure your addresses and settings below."
+"You can send and receive notices through [instant messaging](%%doc.im%%). "
+"Configure your addresses and settings below."
 msgstr ""
 "Tu puedis mandâ e ricevi avîs par mieç di [messaçs istantaniis](%%doc.im%%). "
-"Configure ca sot la tô direzion e lis impuestazions."
+"Configure ca sot lis tôs direzions e lis impuestazions."
 
 #. TRANS: Message given in the IM settings if IM is not enabled on the site.
 msgid "IM is not available."
@@ -3033,34 +2898,12 @@ msgid ""
 "Use this form to invite your friends and colleagues to use this service."
 msgstr "Dopre chest modul par invidâ amîs e coleghis a doprâ il servizi."
 
-#. TRANS: Field label for a list of e-mail addresses.
-msgid "Email addresses"
-msgstr "Direzions di pueste eletroniche"
-
-#. TRANS: Tooltip for field label for a list of e-mail addresses.
-msgid "Addresses of friends to invite (one per line)."
-msgstr "Direzions dai amîs di invidâ (une par rie)."
-
-#. TRANS: Field label for a personal message to send to invitees.
-msgid "Personal message"
-msgstr "Messaç personâl"
-
-#. TRANS: Tooltip for field label for a personal message to send to invitees.
-msgid "Optionally add a personal message to the invitation."
-msgstr "Se tu vuelis, tu puedis zontâ un messaç personâl tal invît."
-
-#. TRANS: Send button for inviting friends
-#. TRANS: Button text for sending notice.
-msgctxt "BUTTON"
-msgid "Send"
-msgstr "Mande"
-
 #. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral
 #. TRANS: singular 3rd-person pronoun in English. %1$s is the inviting user, $2$s is
 #. TRANS: the StatusNet sitename.
 #, php-format
 msgid "%1$s has invited you to join them on %2$s"
-msgstr ""
+msgstr "%1$s ti à invidât a iscriviti su %2$s"
 
 #. TRANS: Client error displayed when trying to join a group while not logged in.
 msgid "You must be logged in to join a group."
@@ -3185,12 +3028,6 @@ msgstr ""
 msgid "Save license settings."
 msgstr "Salve lis impuestazions de licence."
 
-#. TRANS: Client error displayed when trying to log in while already logged in.
-#. TRANS: Client error displayed trying to use "one time password login" when already logged in.
-#. TRANS: Client error displayed when trying to register while already logged in.
-msgid "Already logged in."
-msgstr "Tu sês za jentrât."
-
 #. TRANS: Form validation error displayed when trying to log in with incorrect credentials.
 msgid "Incorrect username or password."
 msgstr "Il non utent o la password no son juscj."
@@ -3209,9 +3046,8 @@ msgid "Login to site"
 msgstr "Jentre tal sît"
 
 #. TRANS: Field label on login page.
-#, fuzzy
 msgid "Username or email address"
-msgstr "Sorenon o direzion di pueste"
+msgstr "Non utent o direzion di pueste"
 
 #. TRANS: Checkbox label label on login page.
 #. TRANS: Checkbox label on account registration page.
@@ -3302,6 +3138,7 @@ msgstr ""
 msgid "Could not create application."
 msgstr ""
 
+#. TRANS: Form validation error messages displayed when uploading an invalid application logo.
 msgid "Invalid image."
 msgstr "La figure no je valide."
 
@@ -3338,12 +3175,6 @@ msgstr ""
 msgid "No recipient specified."
 msgstr ""
 
-#. TRANS: Client error displayed trying to send a direct message to self.
-#. TRANS: Error text shown when trying to send a direct message to self.
-msgid ""
-"Don't send a message to yourself; just say it to yourself quietly instead."
-msgstr ""
-
 #. TRANS: Page title after sending a direct message.
 msgid "Message sent"
 msgstr "Messaç mandât"
@@ -3440,11 +3271,11 @@ msgstr ""
 
 #. TRANS: Page title for OAuth applications
 msgid "OAuth applications"
-msgstr ""
+msgstr "Aplicazions OAuth"
 
 #. TRANS: Page instructions for OAuth applications
 msgid "Applications you have registered"
-msgstr ""
+msgstr "Lis aplicazions che tu âs regjistrât"
 
 #. TRANS: Empty list message on page with OAuth applications.
 #, php-format
@@ -3453,7 +3284,7 @@ msgstr ""
 
 #. TRANS: Title for OAuth connection settings.
 msgid "Connected applications"
-msgstr ""
+msgstr "Aplicazions conetudis"
 
 #. TRANS: Instructions for OAuth connection settings.
 msgid "The following connections exist for your account."
@@ -3479,7 +3310,7 @@ msgstr ""
 
 #. TRANS: Empty list message when no applications have been authorised yet.
 msgid "You have not authorized any applications to use your account."
-msgstr ""
+msgstr "No tu âs autorizât nissune aplicazion a doprâ la tô identitât."
 
 #. TRANS: Note for developers in the OAuth connection settings form.
 #. TRANS: This message contains a Markdown link. Do not separate "](".
@@ -3494,7 +3325,7 @@ msgstr ""
 #. TRANS: %s is a path.
 #, php-format
 msgid "\"%s\" not found."
-msgstr ""
+msgstr "\"%s\" nol è stât cjatât."
 
 #. TRANS: Server error displayed in oEmbed action when notice not found.
 #. TRANS: %s is a notice.
@@ -3541,6 +3372,33 @@ msgstr ""
 msgid "Not a supported data format."
 msgstr ""
 
+#. TRANS: Page title for profile settings.
+msgid "Old school UI settings"
+msgstr "Impuestazions pe viere muse"
+
+#. TRANS: Usage instructions for profile settings.
+msgid "If you like it \"the old way\", you can set that here."
+msgstr ""
+"Se ti plaseve di plui la grafiche di une volte, tu puedis configurâle culì."
+
+#. TRANS: Confirmation shown when user profile settings are saved.
+#. TRANS: Message after successful saving of administrative settings.
+msgid "Settings saved."
+msgstr "Impuestazions salvadis."
+
+msgid "Only stream mode (no conversations) in timelines"
+msgstr ""
+
+msgid "Show conversation page as hierarchical trees"
+msgstr ""
+
+msgid "Show nicknames (not full names) in timelines"
+msgstr ""
+
+#. TRANS: Button text to save a list.
+msgid "Save"
+msgstr "Salve"
+
 #. TRANS: ShortName in the OpenSearch interface when trying to find users.
 msgid "People Search"
 msgstr "Cîr personis"
@@ -3549,6 +3407,11 @@ msgstr "Cîr personis"
 msgid "Notice Search"
 msgstr "Cîr avîs"
 
+#. TRANS: Client error displayed trying to use "one time password login" when already logged in.
+#. TRANS: Client error displayed when trying to register while already logged in.
+msgid "Already logged in."
+msgstr "Tu sês za jentrât."
+
 #. TRANS: Client error displayed trying to use "one time password login" without specifying a user.
 msgid "No user ID specified."
 msgstr ""
@@ -3620,7 +3483,7 @@ msgid "Confirm"
 msgstr "Conferme"
 
 #. TRANS: Field title on page where to change password.
-#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
+#. TRANS: Title for field label for password reset form where the password has to be typed again.
 #. TRANS: Field title on account registration page.
 msgid "Same as password above."
 msgstr "Compagn che la password parsore"
@@ -3678,12 +3541,6 @@ msgstr ""
 msgid "Avatar directory not writable: %s."
 msgstr ""
 
-#. TRANS: Client error in Paths admin panel.
-#. TRANS: %s is the background directory that could not be written to.
-#, php-format
-msgid "Background directory not writable: %s."
-msgstr ""
-
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the locales directory that could not be read from.
 #, php-format
@@ -3796,30 +3653,6 @@ msgstr "Cartele pai avatars"
 msgid "Directory where avatars are located."
 msgstr ""
 
-#. TRANS: Fieldset legend in Paths admin panel.
-msgid "Backgrounds"
-msgstr "Sfonts"
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-msgid "Server for backgrounds."
-msgstr ""
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-msgid "Web path to backgrounds."
-msgstr ""
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-msgid "Server for backgrounds on SSL pages."
-msgstr ""
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-msgid "Web path to backgrounds on SSL pages."
-msgstr ""
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-msgid "Directory where backgrounds are located."
-msgstr ""
-
 #. TRANS: Fieldset legens in Paths admin panel.
 msgid "Attachments"
 msgstr "Alegâts"
@@ -3875,8 +3708,8 @@ msgid "Server to direct SSL requests to."
 msgstr ""
 
 #. TRANS: Button title text to store form data in the Paths admin panel.
-msgid "Save paths"
-msgstr ""
+msgid "Save path settings."
+msgstr "Salve lis impuestazions dal percors."
 
 #. TRANS: Instructions for the "People search" page.
 #. TRANS: %%site.name%% is the name of the StatusNet site.
@@ -4009,7 +3842,7 @@ msgid ""
 "%%%site.name%%%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
 "blogging) service based on the Free Software [StatusNet](http://status.net/) "
 "tool. You can easily keep track of what they are doing by subscribing to the "
-"tag's timeline."
+"list's timeline."
 msgstr ""
 "Chestis a son lis listis creadis di **%s**. Lis listis a son un mût par meti "
 "in ordin personis similis su %%site.name%%, un servizi di [microblogging]"
@@ -4043,13 +3876,13 @@ msgid ""
 "site.name%%%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
 "blogging) service based on the Free Software [StatusNet](http://status.net/) "
 "tool. You can easily keep track of what they are doing by subscribing to the "
-"tag's timeline."
+"list's timeline."
 msgstr ""
 "Chestis a son lis listis par **%s**. Lis listis a son un mût par meti in "
 "ordin personis similis su %%site.name%%, un servizi di [microblogging]"
 "(http://en.wikipedia.org/wiki/Micro-blogging) basât sul imprest libar "
 "[StatusNet](http://status.net/). Tu puedis tignî di voli ce che a stan "
-"fasint sotscrivinti ae ativitât de etichete."
+"fasint sotscrivinti ae ativitât de liste."
 
 #. TRANS: Message displayed on page that displays lists a user was added to when there are none.
 #. TRANS: This message contains Markdown links in the form [description](links).
@@ -4147,16 +3980,6 @@ msgid ""
 "All default plugins have been disabled from the site's configuration file."
 msgstr ""
 
-#. TRANS: Client error displayed if the notice posted has too many characters.
-msgid "Invalid notice content."
-msgstr ""
-
-#. TRANS: Exception thrown if a notice's license is not compatible with the StatusNet site license.
-#. TRANS: %1$s is the notice license, %2$s is the StatusNet site's license.
-#, php-format
-msgid "Notice license \"%1$s\" is not compatible with site license \"%2$s\"."
-msgstr ""
-
 #. TRANS: Client error displayed when trying to add an unindentified field to profile.
 #. TRANS: %s is a field name.
 #, php-format
@@ -4251,6 +4074,8 @@ msgid "Share my current location when posting notices"
 msgstr "Condivît il lûc dulà che mi cjati cuant che o publichi avîs"
 
 #. TRANS: Field label in form for profile settings.
+#. TRANS: Title for group tag cloud section.
+#. TRANS: %s is a group name.
 msgid "Tags"
 msgstr "Etichetis"
 
@@ -4279,9 +4104,12 @@ msgid "What timezone are you normally in?"
 msgstr "In ce fûs orari ti cjatistu par solit?"
 
 #. TRANS: Checkbox label in form for profile settings.
+#, fuzzy
 msgid ""
-"Automatically subscribe to whoever subscribes to me (best for non-humans)."
+"Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr ""
+"Sotscrîf in automatic a ducj chei che si sotscrivin a mi (ideâl par non "
+"umans)."
 
 #. TRANS: Dropdown field label on profile settings, for what policies to apply when someone else tries to subscribe to your updates.
 msgid "Subscription policy"
@@ -4297,11 +4125,11 @@ msgstr "Domandimi prime"
 
 #. TRANS: Dropdown field title on group edit form.
 msgid "Whether other users need your permission to follow your updates."
-msgstr ""
+msgstr "Se i altris utents a àn di vê il permès par seguî i tiei inzornaments."
 
 #. TRANS: Checkbox label in profile settings.
 msgid "Make updates visible only to my followers"
-msgstr ""
+msgstr "Mostre i inzornaments dome a chei che mi seguissin"
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Plural form is used based on the maximum number of allowed
@@ -4346,11 +4174,6 @@ msgstr ""
 msgid "Could not save tags."
 msgstr ""
 
-#. TRANS: Confirmation shown when user profile settings are saved.
-#. TRANS: Message after successful saving of administrative settings.
-msgid "Settings saved."
-msgstr "Impuestazions salvadis."
-
 #. TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
 #. TRANS: Page title for page where a user account can be restored from backup.
 msgid "Restore account"
@@ -4363,8 +4186,8 @@ msgid "Beyond the page limit (%s)."
 msgstr ""
 
 #. TRANS: Server error displayed when a public timeline cannot be retrieved.
-msgid "Could not retrieve public stream."
-msgstr ""
+msgid "Could not retrieve public timeline."
+msgstr "No si à podût recuperâ la ativitât publiche."
 
 #. TRANS: Title for all public timeline pages but the first.
 #. TRANS: %d is the page number.
@@ -4378,15 +4201,19 @@ msgid "Public timeline"
 msgstr "Ativitât publiche"
 
 #. TRANS: Link description for public timeline feed.
-msgid "Public Stream Feed (RSS 1.0)"
+msgid "Public Timeline Feed (Activity Streams JSON)"
+msgstr "Canâl de ativitât publiche (flus di ativitât JSON)"
+
+#. TRANS: Link description for public timeline feed.
+msgid "Public Timeline Feed (RSS 1.0)"
 msgstr "Canâl de ativitât publiche (RSS 1.0)"
 
 #. TRANS: Link description for public timeline feed.
-msgid "Public Stream Feed (RSS 2.0)"
+msgid "Public Timeline Feed (RSS 2.0)"
 msgstr "Canâl de ativitât publiche (RSS 2.0)"
 
 #. TRANS: Link description for public timeline feed.
-msgid "Public Stream Feed (Atom)"
+msgid "Public Timeline Feed (Atom)"
 msgstr "Canâl de ativitât publiche (Atom)"
 
 #. TRANS: Text displayed for public feed when there are no public notices.
@@ -4398,7 +4225,7 @@ msgstr ""
 
 #. TRANS: Additional text displayed for public feed when there are no public notices for a logged in user.
 msgid "Be the first to post!"
-msgstr "Publiche alc par prin !"
+msgstr "Publiche alc par prin!"
 
 #. TRANS: Additional text displayed for public feed when there are no public notices for a not logged in user.
 #, php-format
@@ -4432,47 +4259,6 @@ msgstr ""
 "org/wiki/Micro-blogging) basât sul imprest libar [StatusNet](http://status."
 "net/)."
 
-#. TRANS: Title for page with public list cloud.
-msgid "Public list cloud"
-msgstr "Nûl des listis publichis"
-
-#. TRANS: Page notice for page with public list cloud.
-#. TRANS: %s is a StatusNet sitename.
-#, php-format
-msgid "These are largest lists on %s"
-msgstr "Chestis a son lis listis plui popolârs su %s"
-
-#. TRANS: Empty list message on page with public list cloud.
-#. TRANS: This message contains Markdown links in the form [description](link).
-#, php-format
-msgid "No one has [listed](%%doc.tags%%) anyone yet."
-msgstr "Nissun nol à ancjemò metût altris in [listis](%%%%doc.tags%%%%)."
-
-#. TRANS: Additional empty list message on page with public list cloud for logged in users.
-msgid "Be the first to list someone!"
-msgstr "Met cualchidun in liste par prin!"
-
-#. TRANS: Additional empty list message on page with public list cloud for anonymous users.
-#. TRANS: This message contains Markdown links in the form [description](link).
-#, php-format
-msgid ""
-"Why not [register an account](%%action.register%%) and be the first to list "
-"someone!"
-msgstr ""
-"Parcè no [tu regjistris une identitât](%%%%action.register%%%%) e tu metis "
-"cualchidun in liste par prin!"
-
-#. TRANS: DT element on on page with public list cloud.
-msgid "List cloud"
-msgstr "Nûl des listis"
-
-#. TRANS: Link title for number of listed people. %d is the number of listed people.
-#, php-format
-msgid "1 person listed"
-msgid_plural "%d people listed"
-msgstr[0] "1 persone in liste"
-msgstr[1] "%d personis in liste"
-
 #. TRANS: Public RSS feed description. %s is the StatusNet site name.
 #, php-format
 msgid "%s updates from everyone."
@@ -4498,7 +4284,7 @@ msgstr ""
 #. TRANS: Message shown to a logged in user for the public tag cloud
 #. TRANS: while no tags exist yet. "One" refers to the non-existing hashtag.
 msgid "Be the first to post one!"
-msgstr ""
+msgstr "Publiche alc par prin!"
 
 #. TRANS: Message shown to a anonymous user for the public tag cloud
 #. TRANS: while no tags exist yet. "One" refers to the non-existing hashtag.
@@ -4592,7 +4378,6 @@ msgid "6 or more characters, and do not forget it!"
 msgstr ""
 
 #. TRANS: Button text for password reset form.
-#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
 msgctxt "BUTTON"
 msgid "Reset"
 msgstr ""
@@ -4601,18 +4386,6 @@ msgstr ""
 msgid "Enter a nickname or email address."
 msgstr "Inserìs un sorenon o une direzion di pueste eletroniche."
 
-#. TRANS: Information on password recovery form if no known username or e-mail address was specified.
-msgid "No user with that email address or username."
-msgstr ""
-
-#. TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.
-msgid "No registered email address for that user."
-msgstr ""
-
-#. TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.
-msgid "Error saving address confirmation."
-msgstr ""
-
 #. TRANS: User notification after an e-mail with instructions was sent from the password recovery form.
 msgid ""
 "Instructions for recovering your password have been sent to the email "
@@ -4786,72 +4559,6 @@ msgstr ""
 "(Tu varessis di ricevi a moments un messaç di pueste cun istruzions par "
 "confermâ la tô direzion di pueste eletroniche.)"
 
-#. TRANS: Page notice for remote subscribe. This message contains Markdown links.
-#. TRANS: Ensure to keep the correct markup of [link description](link).
-#, 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 ""
-"Par sotscriviti, tu puedis [jentrâ](%%action.login%%), o [regjistrâ](%%"
-"action.register%%) une gnove identitât. Se tu âs za une identitât suntun "
-"[sît di microblogging compatibil](%%doc.openmublog%%),  inserìs ca sot la "
-"URL dal to profîl."
-
-#. TRANS: Page title for Remote subscribe.
-msgid "Remote subscribe"
-msgstr "Sotscrizion remote"
-
-#. TRANS: Field legend on page for remote subscribe.
-msgid "Subscribe to a remote user"
-msgstr "Sostscriviti a un utent remot"
-
-#. TRANS: Field label on page for remote subscribe.
-msgid "User nickname"
-msgstr "Sorenon dal utent"
-
-#. TRANS: Field title on page for remote subscribe.
-msgid "Nickname of the user you want to follow."
-msgstr "Sorenon dal utent che tu vuelis seguî."
-
-#. TRANS: Field label on page for remote subscribe.
-msgid "Profile URL"
-msgstr "URL dal profîl"
-
-#. TRANS: Field title on page for remote subscribe.
-msgid "URL of your profile on another compatible microblogging service."
-msgstr "URL dal to profîl suntun altri servizi di microblogging compatibil."
-
-#. TRANS: Button text on page for remote subscribe.
-#. TRANS: Link text for link that will subscribe to a remote profile.
-#. TRANS: Button text to subscribe to a user.
-#. TRANS: Button text for subscribing to a list.
-msgctxt "BUTTON"
-msgid "Subscribe"
-msgstr "Sotscrivimi"
-
-#. TRANS: Form validation error on page for remote subscribe when an invalid profile URL was provided.
-msgid "Invalid profile URL (bad format)."
-msgstr ""
-
-#. TRANS: Form validation error on page for remote subscribe when no the provided profile URL
-#. TRANS: does not contain expected data.
-msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
-msgstr ""
-
-#. TRANS: Form validation error on page for remote subscribe.
-msgid "That is a local profile! Login to subscribe."
-msgstr ""
-
-#. TRANS: Form validation error on page for remote subscribe when the remote service is not providing a request token.
-msgid "Could not get a request token."
-msgstr ""
-
-#. TRANS: Client error displayed when trying to (un)list an OMB 0.1 remote profile.
-msgid "You cannot (un)list an OMB 0.1 remote profile with this action."
-msgstr ""
-
 #. TRANS: Client error displayed when an unknown error occurs while delisting a user.
 #. TRANS: %s is a username.
 #, php-format
@@ -4903,6 +4610,12 @@ msgstr "Rispuestis a %s"
 msgid "Replies to %1$s, page %2$d"
 msgstr "Rispuestis a %1$s, pagjine %2$d"
 
+#. TRANS: Link for feed with replies for a user.
+#. TRANS: %s is a user nickname.
+#, php-format
+msgid "Replies feed for %s (Activity Streams JSON)"
+msgstr "Canâl des rispuestis di %s (Activity Streams JSON)"
+
 #. TRANS: Link for feed with replies for a user.
 #. TRANS: %s is a user nickname.
 #, php-format
@@ -5015,7 +4728,7 @@ msgstr ""
 
 #. TRANS: Form instructions for feed restore.
 msgid ""
-"You can upload a backed-up stream in <a href=\"http://activitystrea.ms/"
+"You can upload a backed-up timeline in <a href=\"http://activitystrea.ms/"
 "\">Activity Streams</a> format."
 msgstr ""
 
@@ -5100,7 +4813,7 @@ msgstr ""
 
 #. TRANS: Header on the OAuth application page.
 msgid "Application profile"
-msgstr ""
+msgstr "Profîl de aplicazion"
 
 #. TRANS: Information output on an OAuth application page.
 #. TRANS: %1$s is the application creator, %2$s is "read-only" or "read-write",
@@ -5129,6 +4842,26 @@ msgstr ""
 msgid "Application info"
 msgstr ""
 
+#. TRANS: Field label on application page.
+msgid "Consumer key"
+msgstr ""
+
+#. TRANS: Field label on application page.
+msgid "Consumer secret"
+msgstr ""
+
+#. TRANS: Field label on application page.
+msgid "Request token URL"
+msgstr ""
+
+#. TRANS: Field label on application page.
+msgid "Access token URL"
+msgstr ""
+
+#. TRANS: Field label on application page.
+msgid "Authorize URL"
+msgstr ""
+
 #. TRANS: Note on the OAuth application page about signature support.
 msgid ""
 "Note: HMAC-SHA1 signatures are supported. The plaintext signature method is "
@@ -5149,6 +4882,11 @@ msgstr "Avîs preferîts di %1$s, pagjine %2$d"
 msgid "Could not retrieve favorite notices."
 msgstr ""
 
+#. TRANS: Feed link text. %s is a username.
+#, php-format
+msgid "Feed for favorites of %s (Activity Streams JSON)"
+msgstr "Canâl pai preferîts di %s (Activity Streams JSON)"
+
 #. TRANS: Feed link text. %s is a username.
 #, php-format
 msgid "Feed for favorites of %s (RSS 1.0)"
@@ -5205,6 +4943,11 @@ msgstr "Grup %s"
 msgid "%1$s group, page %2$d"
 msgstr "Grup %1$s, pagjine %2$d"
 
+#. TRANS: Tooltip for feed link. %s is a group nickname.
+#, php-format
+msgid "Notice feed for %s group (Activity Streams JSON)"
+msgstr "Canâl dai avîs pal grup %s (Activity Streams JSON)"
+
 #. TRANS: Tooltip for feed link. %s is a group nickname.
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
@@ -5225,42 +4968,8 @@ msgstr "Canâl dai avîs pal grup %s (Atom)"
 msgid "FOAF for %s group"
 msgstr "FOAF pal grup %s"
 
-#. TRANS: Header for mini list of group members on a group page (h2).
-msgid "Members"
-msgstr "Membris"
-
-#. TRANS: Description for mini list of group members on a group page when the group has no members.
-#. TRANS: Content of "Listed" page if there are no listed users.
-#. TRANS: Content of "People following tag x" if there are no subscribed users.
-#. TRANS: Empty list message for tags.
-#. TRANS: Text for user subscription statistics if the user has no subscriptions.
-#. TRANS: Text for user subscriber statistics if user has no subscribers.
-#. TRANS: Text for user user group membership statistics if user is not a member of any group.
-#. TRANS: Default content for section/sidebar widget.
-msgid "(None)"
-msgstr "(Nissun)"
-
-#. TRANS: Link to all group members from mini list of group members if group has more than n members.
-msgid "All members"
-msgstr "Ducj i membris"
-
-#. TRANS: Header for group statistics on a group page (h2).
-#. TRANS: H2 text for user statistics.
-msgid "Statistics"
-msgstr "Statistichis"
-
-#. TRANS: Label for group creation date.
-msgctxt "LABEL"
-msgid "Created"
-msgstr "Creât"
-
-#. TRANS: Label for member count in statistics on group page.
-msgctxt "LABEL"
-msgid "Members"
-msgstr "Membris"
-
 #. TRANS: Notice on group pages for anonymous users for StatusNet sites that accept new registrations.
-#. TRANS: **%s** is the group alias, %%%%site.name%%%% is the site name,
+#. TRANS: %s is the group name, %%%%site.name%%%% is the site name,
 #. TRANS: %%%%action.register%%%% is the URL for registration, %%%%doc.help%%%% is a URL to help.
 #. TRANS: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
 #, php-format
@@ -5279,24 +4988,19 @@ msgstr ""
 "help%%))"
 
 #. TRANS: Notice on group pages for anonymous users for StatusNet sites that accept no new registrations.
-#. TRANS: **%s** is the group alias, %%%%site.name%%%% is the site name,
+#. TRANS: %s is the group name, %%%%site.name%%%% is the site name,
 #. TRANS: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
 "wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
 "[StatusNet](http://status.net/) tool. Its members share short messages about "
-"their life and interests. "
+"their life and interests."
 msgstr ""
 "**%s** al è un grup di utents su %%site.name%%, un servizi di [microblogging]"
 "(http://en.wikipedia.org/wiki/Micro-blogging) basât sul imprest libar "
 "[StatusNet](http://status.net/). I siei membris a condividin messaçs curts "
-"su la vite e i lôr interès. "
-
-#. TRANS: Title for list of group administrators on a group page.
-msgctxt "TITLE"
-msgid "Admins"
-msgstr "Aministradôrs"
+"su la vite e i lôr interès."
 
 #. TRANS: Client error displayed requesting a single message that does not exist.
 msgid "No such message."
@@ -5393,9 +5097,21 @@ msgstr ""
 "scomencis a seguî cheste ativitât!"
 
 #. TRANS: Header on show list page.
+#. TRANS: Link description for link to list of users tagged with a tag (so part of a list).
 msgid "Listed"
 msgstr "Metût te liste"
 
+#. TRANS: Content of "Listed" page if there are no listed users.
+#. TRANS: Content of "People following tag x" if there are no subscribed users.
+#. TRANS: Description for mini list of group members on a group page when the group has no members.
+#. TRANS: Empty list message for tags.
+#. TRANS: Text for user subscription statistics if the user has no subscriptions.
+#. TRANS: Text for user subscriber statistics if user has no subscribers.
+#. TRANS: Text for user user group membership statistics if user is not a member of any group.
+#. TRANS: Default content for section/sidebar widget.
+msgid "(None)"
+msgstr "(Nissun)"
+
 #. TRANS: Link for more "People in list x by a user"
 #. TRANS: if there are more than the mini list's maximum.
 msgid "Show all"
@@ -5406,24 +5122,19 @@ msgstr "Mostre dut"
 msgid "Subscribers"
 msgstr "Sotscritôrs"
 
-#. TRANS: Link for more "People following tag x"
-#. TRANS: if there are more than the mini list's maximum.
-msgid "All subscribers"
-msgstr "Ducj i sotscritôrs"
-
-#. TRANS: Page title showing tagged notices in one user's stream.
+#. TRANS: Page title showing tagged notices in one user's timeline.
 #. TRANS: %1$s is the username, %2$s is the hash tag.
 #, php-format
 msgid "Notices by %1$s tagged %2$s"
 msgstr "Avîs di %1$s cun etichete %2$s"
 
-#. TRANS: Page title showing tagged notices in one user's stream.
+#. TRANS: Page title showing tagged notices in one user's timeline.
 #. TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number.
 #, php-format
 msgid "Notices by %1$s tagged %2$s, page %3$d"
 msgstr "Avîs di %1$s cun etichete %2$s, pagjine %3$d"
 
-#. TRANS: Extended page title showing tagged notices in one user's stream.
+#. TRANS: Extended page title showing tagged notices in one user's timeline.
 #. TRANS: %1$s is the username, %2$d is the page number.
 #, php-format
 msgid "Notices by %1$s, page %2$d"
@@ -5435,6 +5146,12 @@ msgstr "Avîs di %1$s, pagjine %2$d"
 msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
 msgstr "Canâl dai avîs par %1$s cun etichete %2$s (RSS 1.0)"
 
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#, php-format
+msgid "Notice feed for %s (Activity Streams JSON)"
+msgstr "Canâl dai avîs par %s (Activity Streams JSON)"
+
 #. TRANS: Title for link to notice feed.
 #. TRANS: %s is a user nickname.
 #, php-format
@@ -5459,7 +5176,7 @@ msgstr "Canâl dai avîs par %s (Atom)"
 msgid "FOAF for %s"
 msgstr "FOAF di %s"
 
-#. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
+#. TRANS: First sentence of empty list message for a timeline. $1%s is a user nickname.
 #, php-format
 msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
 msgstr "Cheste e je la ativitât di %1$s, ma %1$s nol à ancjemò publicât nuie."
@@ -5472,7 +5189,7 @@ msgstr ""
 "No âstu viodût nuie di interessant tai ultins timps? No tu âs publicât "
 "ancjemò nissun avîs, cumò al sarès un bon moment par scomençâ :)"
 
-#. TRANS: Second sentence of empty  list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
+#. TRANS: Second sentence of empty  list message for a non-self timeline. %1$s is a user nickname, %2$s is a part of a URL.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
 #, php-format
 msgid ""
@@ -5482,7 +5199,7 @@ msgstr ""
 "Tu puedis provâ a pocâ %1$s o ben [mandâi un avîs](%%%%action.newnotice%%%%?"
 "status_textarea=%2$s)."
 
-#. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
+#. TRANS: Announcement for anonymous users showing a timeline if site registrations are open.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
 #, php-format
 msgid ""
@@ -5496,13 +5213,13 @@ msgstr ""
 "[StatusNet](http://status.net/) tool. [Join now](%%%%action.register%%%%) to "
 "follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))"
 
-#. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
+#. TRANS: Announcement for anonymous users showing a timeline if site registrations are closed or invite only.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
 "wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
-"[StatusNet](http://status.net/) tool. "
+"[StatusNet](http://status.net/) tool."
 msgstr ""
 "**%s** al à une identitât su %%site.name%%, un servizi di [microblogging]"
 "(http://en.wikipedia.org/wiki/Micro-blogging) basât sul imprest libar "
@@ -5539,11 +5256,19 @@ msgstr ""
 msgid "You must have a valid contact email address."
 msgstr "Tu scugnis vê une direzion di pueste eletroniche valide pai contats."
 
+#. TRANS: Client error displayed when a logo URL is not valid.
+msgid "Invalid logo URL."
+msgstr ""
+
+#. TRANS: Client error displayed when a SSL logo URL is invalid.
+msgid "Invalid SSL logo URL."
+msgstr ""
+
 #. TRANS: Client error displayed trying to save site settings with an invalid language code.
 #. TRANS: %s is the invalid language code.
 #, php-format
 msgid "Unknown language \"%s\"."
-msgstr ""
+msgstr "Lenghe \"%s\" no cognossude."
 
 #. TRANS: Client error displayed trying to save site settings with a text limit below 0.
 msgid "Minimum text limit is 0 (unlimited)."
@@ -5609,10 +5334,11 @@ msgid "Default language"
 msgstr "Lenghe predeterminade"
 
 #. TRANS: Dropdown title on site settings panel.
-msgid "Site language when autodetection from browser settings is not available"
+msgid ""
+"The site language when autodetection from browser settings is not available."
 msgstr ""
-"Lenghe dal sît cuant che il rilevament automatic da lis impuestazions dal "
-"sgarfadôr nol è disponibil"
+"La lenghe dal sît cuant che il rilevament automatic da lis impuestazions dal "
+"sgarfadôr nol è disponibil."
 
 #. TRANS: Fieldset legend on site settings panel.
 msgctxt "LEGEND"
@@ -5635,9 +5361,21 @@ msgstr ""
 msgid "How long users must wait (in seconds) to post the same thing again."
 msgstr ""
 
+#. TRANS: Fieldset legend for form to change logo.
+msgid "Logo"
+msgstr "Logo"
+
+#. TRANS: Field label for StatusNet site logo.
+msgid "Site logo"
+msgstr "Logo dal sît"
+
+#. TRANS: Field label for SSL StatusNet site logo.
+msgid "SSL logo"
+msgstr "Logo SSL"
+
 #. TRANS: Button title for saving site settings.
-msgid "Save site settings"
-msgstr "Salve lis impuestazions dal sît"
+msgid "Save the site settings."
+msgstr "Salve lis impuestazions dal sît."
 
 #. TRANS: Page title for site-wide notice tab in admin panel.
 msgid "Site Notice"
@@ -5663,7 +5401,7 @@ msgstr ""
 msgid "Site-wide notice text (255 characters maximum; HTML allowed)"
 msgstr ""
 
-#. TRANS: Title for button to save site notice in admin panel.
+#. TRANS: Button title to save site notice in admin panel.
 msgid "Save site notice."
 msgstr ""
 
@@ -5844,13 +5582,13 @@ msgstr ""
 
 #. TRANS: Input field label for snapshot report URL in admin panel for snapshots.
 msgid "Report URL"
-msgstr ""
+msgstr "Segnale URL"
 
 #. TRANS: Input field title for snapshot report URL in admin panel for snapshots.
 msgid "Snapshots will be sent to this URL."
 msgstr ""
 
-#. TRANS: Title for button to save snapshot settings.
+#. TRANS: Button title to save snapshot settings.
 msgid "Save snapshot settings."
 msgstr ""
 
@@ -5883,10 +5621,6 @@ msgstr "Sotscritôrs di %1$s in spiete di aprovazion, pagjine %2$d"
 msgid "A list of users awaiting approval to subscribe to you."
 msgstr "Une liste dai utents in spiete de aprovazion par sotscriviti."
 
-#. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
-msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
-msgstr ""
-
 #. TRANS: Page title when subscription succeeded.
 msgid "Subscribed"
 msgstr "Sotscrivût"
@@ -5987,14 +5721,12 @@ msgid ""
 "You're not listening to anyone's notices right now, try subscribing to "
 "people you know. Try [people search](%%action.peoplesearch%%), look for "
 "members in groups you're interested in and in our [featured users](%%action."
-"featured%%). If you're a [Twitter user](%%action.twittersettings%%), you can "
-"automatically subscribe to people you already follow there."
+"featured%%)."
 msgstr ""
 "No tu stâs seguint i avîs di nissun par cumò, prove a sotscrivi cualchidun "
 "che tu cognossis. Prove a [cirî int](%%action.peoplesearch%%), cjalâ i "
 "membris di grups che ti interessin e i [utents plui famôs](%%action.featured%"
-"%). Se tu sês un [utent di Twitter](%%action.twittersettings%%), tu puedis "
-"in automatic sotscriviti ae int che tu seguivis di là."
+"%)."
 
 #. TRANS: Subscription list text when looking at the subscriptions for a of a user other
 #. TRANS: than the logged in user that has no subscriptions. %s is the user nickname.
@@ -6024,6 +5756,12 @@ msgstr "SMS"
 msgid "Notices tagged with %1$s, page %2$d"
 msgstr "Avîs etichetâts cun %1$s, pagjine %2$d"
 
+#. TRANS: Link label for feed on "notices with tag" page.
+#. TRANS: %s is the tag the feed is for.
+#, php-format
+msgid "Notice feed for tag %s (Activity Streams JSON)"
+msgstr "Canâl dai avîs pe etichete %s (Activity Streams JSON)"
+
 #. TRANS: Link label for feed on "notices with tag" page.
 #. TRANS: %s is the tag the feed is for.
 #, php-format
@@ -6124,16 +5862,6 @@ msgstr "Sotscrizion anulade"
 msgid "%1$s unsubscribed from list %2$s by %3$s"
 msgstr "%1$s al à anulât la sotscrizion ae liste %2$s di %3$s"
 
-#. TRANS: Client error displayed when trying to update profile with an incompatible license.
-#. TRANS: %1$s is the license incompatible with site license %2$s.
-#. TRANS: Exception thrown when licenses are not compatible for an authorisation request.
-#. TRANS: %1$s is the license for the listenee, %2$s is the license for "this" StatusNet site.
-#, php-format
-msgid ""
-"Listenee stream license \"%1$s\" is not compatible with site license \"%2$s"
-"\"."
-msgstr ""
-
 #. TRANS: Title of URL settings tab in profile settings.
 msgid "URL settings"
 msgstr "Impuestazions URL"
@@ -6241,7 +5969,7 @@ msgstr "Gnûfs utents"
 
 #. TRANS: Field label in user admin panel for setting new user welcome text.
 msgid "New user welcome"
-msgstr ""
+msgstr "Benvignût pai gnûfs utents"
 
 #. TRANS: Tooltip in user admin panel for setting new user welcome text.
 msgid "Welcome text for new users (maximum 255 characters)."
@@ -6267,144 +5995,10 @@ msgstr "Invîts ativâts"
 msgid "Whether to allow users to invite new users."
 msgstr ""
 
-#. TRANS: Title for button to save user settings in user admin panel.
+#. TRANS: Button title to save user settings in user admin panel.
 msgid "Save user settings."
 msgstr "Salve lis impuestazions dal utent"
 
-#. TRANS: Page title.
-msgid "Authorize subscription"
-msgstr "Autorize la sotscrizion"
-
-#. TRANS: Page notice on "Authorize subscription" page.
-msgid ""
-"Please check these details to make sure that you want to subscribe to this "
-"user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
-"click \"Reject\"."
-msgstr ""
-
-#. TRANS: Button text on Authorise Subscription page.
-#. TRANS: Submit button text to accept a group membership request on approve group form.
-#. TRANS: Submit button text to accept a subscription request on approve sub form.
-msgctxt "BUTTON"
-msgid "Accept"
-msgstr "Acete"
-
-#. TRANS: Title for button on Authorise Subscription page.
-#. TRANS: Button title to subscribe to a user.
-msgid "Subscribe to this user."
-msgstr "Sotscrivimi a chest utent."
-
-#. TRANS: Button text on Authorise Subscription page.
-#. TRANS: Submit button text to reject a group membership request on approve group form.
-#. TRANS: Submit button text to reject a subscription request on approve sub form.
-msgctxt "BUTTON"
-msgid "Reject"
-msgstr "Refude"
-
-#. TRANS: Title for button on Authorise Subscription page.
-msgid "Reject this subscription."
-msgstr "Refude la sotscrizion"
-
-#. TRANS: Client error displayed for an empty authorisation request.
-msgid "No authorization request!"
-msgstr ""
-
-#. TRANS: Accept message header from Authorise subscription page.
-msgid "Subscription authorized"
-msgstr "Sotscrizion autorizade"
-
-#. TRANS: Accept message text from Authorise subscription page.
-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 ""
-
-#. TRANS: Reject message header from Authorise subscription page.
-msgid "Subscription rejected"
-msgstr "Sotscrizion refudade"
-
-#. TRANS: Reject message from Authorise subscription page.
-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 ""
-
-#. TRANS: Exception thrown when no valid user is found for an authorisation request.
-#. TRANS: %s is a listener URI.
-#, php-format
-msgid "Listener URI \"%s\" not found here."
-msgstr ""
-
-#. TRANS: Exception thrown when listenee URI is too long for an authorisation request.
-#. TRANS: %s is a listenee URI.
-#, php-format
-msgid "Listenee URI \"%s\" is too long."
-msgstr ""
-
-#. TRANS: Exception thrown when listenee URI is a local user for an authorisation request.
-#. TRANS: %s is a listenee URI.
-#, php-format
-msgid "Listenee URI \"%s\" is a local user."
-msgstr ""
-
-#. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
-#. TRANS: %s is a profile URL.
-#, php-format
-msgid "Profile URL \"%s\" is for a local user."
-msgstr ""
-
-#. TRANS: Exception thrown when avatar URL is invalid for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#, php-format
-msgid "Avatar URL \"%s\" is not valid."
-msgstr ""
-
-#. TRANS: Exception thrown when avatar URL could not be read for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#, php-format
-msgid "Cannot read avatar URL \"%s\"."
-msgstr ""
-
-#. TRANS: Exception thrown when avatar URL return an invalid image type for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#, php-format
-msgid "Wrong image type for avatar URL \"%s\"."
-msgstr ""
-
-#. TRANS: Title for profile design page.
-#. TRANS: Page title for profile design page.
-msgid "Profile design"
-msgstr "Grafiche dal profîl"
-
-#. TRANS: Instructions for Profile design page.
-#. TRANS: Instructions for profile design page.
-msgid ""
-"Customize the way your profile looks with a background image and a colour "
-"palette of your choice."
-msgstr ""
-
-#. TRANS: Succes message on Profile design page when finding an easter egg.
-msgid "Enjoy your hotdog!"
-msgstr ""
-
-#. TRANS: Form legend on Profile design page.
-msgid "Design settings"
-msgstr "Impuestazions grafichis"
-
-#. TRANS: Checkbox label on Profile design page.
-msgid "View profile designs"
-msgstr "Cjale grafichis dai profîi"
-
-#. TRANS: Title for checkbox on Profile design page.
-msgid "Show or hide profile designs."
-msgstr ""
-
-#. TRANS: Form legend on Profile design page for form to choose a background image.
-msgid "Background file"
-msgstr "File dal sfont"
-
 #. TRANS: Page title for all but the first page of groups for a user.
 #. TRANS: %1$s is a nickname, %2$d is a page number.
 #, php-format
@@ -6445,10 +6039,10 @@ msgstr "StatusNet %s"
 #. TRANS: %1$s is the engine name (StatusNet) and %2$s is the StatusNet version.
 #, php-format
 msgid ""
-"This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, "
+"This site is powered by %1$s version %2$s, Copyright 2008-2011 StatusNet, "
 "Inc. and contributors."
 msgstr ""
-"Chest sît al funzione graziis a %1$s version %2$s, Copyright 2008-2010 "
+"Chest sît al funzione graziis a %1$s version %2$s, Copyright 2008-2011 "
 "StatusNet, Inc. e i colaboradôrs."
 
 #. TRANS: Header for StatusNet contributors section on the version page.
@@ -6464,19 +6058,19 @@ msgid ""
 "StatusNet is free software: you can redistribute it and/or modify it under "
 "the terms of the GNU Affero General Public License as published by the Free "
 "Software Foundation, either version 3 of the License, or (at your option) "
-"any later version. "
+"any later version."
 msgstr ""
 "StatusNet al è software libar: tu puedis tornâ a distribuîlu e/o modificâlu "
 "sot dai tiermins de GNU Affero General Public License come che e je "
 "publicade de Free Software Foundation, sei te version 3 de Licence sei (a tô "
-"discrezion) cualsisei version posteriôr. "
+"discrezion) cualsisei version posteriôr."
 
 #. TRANS: Content part of StatusNet version page.
 msgid ""
 "This program is distributed in the hope that it will be useful, but WITHOUT "
 "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
 "FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License "
-"for more details. "
+"for more details."
 msgstr ""
 
 #. TRANS: Content part of StatusNet version page.
@@ -6532,16 +6126,26 @@ msgstr ""
 msgid "Robin thinks something is impossible."
 msgstr ""
 
+#. TRANS: Message used to be inserted as %2$s in  the text "No file may
+#. TRANS: be larger than %1$d byte and the file you sent was %2$s.".
+#. TRANS: %1$d is the number of bytes of an uploaded file.
+#, php-format
+msgid "%1$d byte"
+msgid_plural "%1$d bytes"
+msgstr[0] ""
+msgstr[1] ""
+
 #. TRANS: Message given if an upload is larger than the configured maximum.
-#. TRANS: %1$d is the byte limit for uploads, %2$d is the byte count for the uploaded file.
-#. TRANS: %1$s is used for plural.
+#. TRANS: %1$d (used for plural) is the byte limit for uploads,
+#. TRANS: %2$s is the proper form of "n bytes". This is the only ways to have
+#. TRANS: gettext support multiple plurals in the same message, unfortunately...
 #, php-format
 msgid ""
-"No file may be larger than %1$d byte and the file you sent was %2$d bytes. "
-"Try to upload a smaller version."
+"No file may be larger than %1$d byte and the file you sent was %2$s. Try to "
+"upload a smaller version."
 msgid_plural ""
-"No file may be larger than %1$d bytes and the file you sent was %2$d bytes. "
-"Try to upload a smaller version."
+"No file may be larger than %1$d bytes and the file you sent was %2$s. Try to "
+"upload a smaller version."
 msgstr[0] ""
 msgstr[1] ""
 
@@ -6609,6 +6213,11 @@ msgstr ""
 msgid "Could not create login token for %s"
 msgstr ""
 
+#. TRANS: Exception thrown when a program code class (%s) cannot be instantiated.
+#, php-format
+msgid "Cannot instantiate class %s."
+msgstr "No si pues istanziâ la clas %s."
+
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.
 msgid "No database name or DSN found anywhere."
 msgstr ""
@@ -6758,7 +6367,7 @@ msgstr ""
 #, php-format
 msgid ""
 "You already have %1$d or more people in list %2$s, which is the maximum "
-"allowed number.Try unlisting others first."
+"allowed number. Try unlisting others first."
 msgstr ""
 
 #. TRANS: Exception thrown when inserting a list subscription in the database fails.
@@ -6778,7 +6387,6 @@ msgid "Unable to save tag."
 msgstr ""
 
 #. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
-#. TRANS: Error message displayed to a banned user when they try to subscribe.
 msgid "You have been banned from subscribing."
 msgstr ""
 
@@ -6798,10 +6406,6 @@ msgstr ""
 msgid "Could not delete self-subscription."
 msgstr ""
 
-#. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
-msgid "Could not delete subscription OMB token."
-msgstr ""
-
 #. TRANS: Exception thrown when a subscription could not be deleted on the server.
 msgid "Could not delete subscription."
 msgstr ""
@@ -6835,6 +6439,18 @@ msgstr ""
 msgid "Single-user mode code called when not enabled."
 msgstr ""
 
+#. TRANS: Information on password recovery form if no known username or e-mail address was specified.
+msgid "No user with that email address or username."
+msgstr ""
+
+#. TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.
+msgid "No registered email address for that user."
+msgstr ""
+
+#. TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.
+msgid "Error saving address confirmation."
+msgstr ""
+
 #. TRANS: Server exception thrown when creating a group failed.
 msgid "Could not create group."
 msgstr ""
@@ -7103,25 +6719,11 @@ msgstr ""
 msgid "saveSettings() not implemented."
 msgstr ""
 
-#. TRANS: Client error message thrown if design settings could not be deleted in
-#. TRANS: the admin panel Design.
-msgid "Unable to delete design setting."
-msgstr ""
-
 #. TRANS: Header in administrator navigation panel.
-#. TRANS: Header in settings navigation panel.
 msgctxt "HEADER"
 msgid "Home"
 msgstr "Inizi"
 
-#. TRANS: Menu item in administrator navigation panel.
-#. TRANS: Menu item in default local navigation panel.
-#. TRANS: Menu item in personal group navigation menu.
-#. TRANS: Menu item in settings navigation panel.
-msgctxt "MENU"
-msgid "Home"
-msgstr "Inizi"
-
 #. TRANS: Header in administrator navigation panel.
 msgctxt "HEADER"
 msgid "Admin"
@@ -7136,17 +6738,6 @@ msgctxt "MENU"
 msgid "Site"
 msgstr "Sît"
 
-#. TRANS: Menu item title in administrator navigation panel.
-msgid "Design configuration"
-msgstr ""
-
-#. TRANS: Menu item in administrator navigation panel.
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: Menu item in settings navigation panel.
-msgctxt "MENU"
-msgid "Design"
-msgstr "Grafiche"
-
 #. TRANS: Menu item title in administrator navigation panel.
 msgid "User configuration"
 msgstr ""
@@ -7244,46 +6835,13 @@ msgstr ""
 msgid "Could not authenticate you."
 msgstr ""
 
-#. TRANS: Server error displayed when trying to create an anynymous OAuth consumer.
-msgid "Could not create anonymous consumer."
-msgstr ""
-
-#. TRANS: Server error displayed when trying to create an anynymous OAuth application.
-msgid "Could not create anonymous OAuth application."
-msgstr ""
-
-#. TRANS: Exception thrown when no token association could be found.
-msgid ""
-"Could not find a profile and application associated with the request token."
-msgstr ""
-
-#. TRANS: Exception thrown when no access token can be issued.
-msgid "Could not issue access token."
-msgstr ""
-
-#. TRANS: Exception thrown when a database error occurs.
-msgid "Database error inserting OAuth application user."
-msgstr ""
-
-#. TRANS: Exception thrown when a database error occurs.
-msgid "Database error updating OAuth application user."
-msgstr ""
-
-#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
-msgid "Tried to revoke unknown token."
-msgstr ""
-
-#. TRANS: Exception thrown when an attempt is made to remove a revoked token.
-msgid "Failed to delete revoked token."
-msgstr ""
-
 #. TRANS: Form input field label for application icon.
 msgid "Icon"
 msgstr "Icone"
 
 #. TRANS: Form guide.
 msgid "Icon for this application"
-msgstr ""
+msgstr "Icone de aplicazion"
 
 #. TRANS: Form input field label for application name.
 msgid "Name"
@@ -7334,7 +6892,7 @@ msgstr ""
 
 #. TRANS: Radio button label for application type
 msgid "Browser"
-msgstr ""
+msgstr "Sgarfadôr"
 
 #. TRANS: Radio button label for application type
 msgid "Desktop"
@@ -7346,24 +6904,23 @@ msgstr ""
 
 #. TRANS: Radio button label for access type.
 msgid "Read-only"
-msgstr ""
+msgstr "Dome in leture"
 
 #. TRANS: Radio button label for access type.
 msgid "Read-write"
-msgstr ""
+msgstr "Leture e scriture"
 
 #. TRANS: Form guide.
 msgid "Default access for this application: read-only, or read-write"
 msgstr ""
 
 #. TRANS: Submit button title.
-msgid "Cancel"
-msgstr "Scancele"
+msgid "Cancel application changes."
+msgstr "Anule i cambiaments ae aplicazion."
 
 #. TRANS: Submit button title.
-#. TRANS: Button text to save a list.
-msgid "Save"
-msgstr "Salve"
+msgid "Save application changes."
+msgstr "Salve i cambiaments ae aplicazion."
 
 #. TRANS: Name for an anonymous application in application list.
 msgid "Unknown application"
@@ -7376,16 +6933,16 @@ msgstr " di "
 
 #. TRANS: Application access type
 msgid "read-write"
-msgstr ""
+msgstr "in leture e scriture"
 
 #. TRANS: Application access type
 msgid "read-only"
-msgstr ""
+msgstr "dome in leture"
 
 #. TRANS: Used in application list. %1$s is a modified date, %2$s is access type ("read-write" or "read-only")
 #, php-format
 msgid "Approved %1$s - \"%2$s\" access."
-msgstr ""
+msgstr "Aprovât %1$s - acès \"%2$s\"."
 
 #. TRANS: Access token in the application list.
 #. TRANS: %s are the first 7 characters of the access token.
@@ -7396,7 +6953,19 @@ msgstr ""
 #. TRANS: Button label in application list to revoke access to user data.
 msgctxt "BUTTON"
 msgid "Revoke"
-msgstr ""
+msgstr "Revoche"
+
+#. TRANS: Submit button text to accept a group membership request on approve group form.
+#. TRANS: Submit button text to accept a subscription request on approve sub form.
+msgctxt "BUTTON"
+msgid "Accept"
+msgstr "Acete"
+
+#. TRANS: Submit button text to reject a group membership request on approve group form.
+#. TRANS: Submit button text to reject a subscription request on approve sub form.
+msgctxt "BUTTON"
+msgid "Reject"
+msgstr "Refude"
 
 #. TRANS: Atom feed exception thrown when an author element does not contain a name element.
 msgid "Author element must contain a name element."
@@ -7949,6 +7518,11 @@ msgstr ""
 msgid "Go to the installer."
 msgstr ""
 
+#. TRANS: Header on conversation page. Hidden by default (h2).
+#. TRANS: Label for user statistics.
+msgid "Notices"
+msgstr "Avîs"
+
 #. TRANS: Page title for when a database error occurs.
 msgid "Database error"
 msgstr "Erôr de base di dâts"
@@ -7959,13 +7533,6 @@ msgctxt "MENU"
 msgid "Public"
 msgstr "Public"
 
-#. TRANS: Menu item in default local navigation panel.
-#. TRANS: Menu item in search group navigation panel.
-#. TRANS: Menu item in local navigation menu.
-msgctxt "MENU"
-msgid "Groups"
-msgstr "Grups"
-
 #. TRANS: Menu item in default local navigation panel.
 #. TRANS: Menu item title in local navigation menu.
 msgctxt "MENU"
@@ -7981,49 +7548,12 @@ msgstr "Elimine"
 msgid "Delete this user"
 msgstr "Elimine chest utent"
 
-#. TRANS: Form legend of form for changing the page design.
-msgid "Change design"
-msgstr "Cambie la grafiche"
-
-#. TRANS: Fieldset legend on profile design page to change profile page colours.
-msgid "Change colours"
-msgstr "Cambie i colôrs"
-
-#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-msgid "Use defaults"
-msgstr "Dopre valôrs predeterminâts"
-
-#. TRANS: Label in form on profile design page.
-#. TRANS: Field contains file name on user's computer that could be that user's custom profile background image.
-msgid "Upload file"
-msgstr "Cjame sù un file"
-
-#. TRANS: Instructions for form on profile design page.
-msgid ""
-"You can upload your personal background image. The maximum file size is 2MB."
-msgstr ""
-
-#. TRANS: Radio button on profile design page that will enable use of the uploaded profile image.
-msgctxt "RADIO"
-msgid "On"
-msgstr "Ativade"
-
-#. TRANS: Radio button on profile design page that will disable use of the uploaded profile image.
-msgctxt "RADIO"
-msgid "Off"
-msgstr "Disativade"
-
-#. TRANS: Success message displayed if design settings were saved after clicking "Use defaults".
-msgid "Design defaults restored."
-msgstr ""
-
 #. TRANS: Exception. %s is an ID.
 #, php-format
 msgid "Unable to find services for %s."
 msgstr ""
 
 #. TRANS: Form legend for removing the favourite status for a favourite notice.
-#. TRANS: Title for button text for removing the favourite status for a favourite notice.
 msgid "Disfavor this notice"
 msgstr "Gjave dai preferîts chest avîs"
 
@@ -8032,8 +7562,11 @@ msgctxt "BUTTON"
 msgid "Disfavor favorite"
 msgstr "Gjave dai preferîts"
 
+#. TRANS: Button title for removing the favourite status for a favourite notice.
+msgid "Remove this notice from your list of favorite notices."
+msgstr "Gjave chest avîs de tô liste dai avîs preferîts."
+
 #. TRANS: Form legend for adding the favourite status to a notice.
-#. TRANS: Title for button text for adding the favourite status to a notice.
 msgid "Favor this notice"
 msgstr "Preferìs chest avîs"
 
@@ -8042,6 +7575,10 @@ msgctxt "BUTTON"
 msgid "Favor"
 msgstr "Preferìs"
 
+#. TRANS: Button title for adding the favourite status to a notice.
+msgid "Add this notice to your list of favorite notices."
+msgstr "Zonte chest avîs ae tô liste dai avîs preferîts."
+
 #. TRANS: Feed type name.
 msgid "RSS 1.0"
 msgstr "RSS 1.0"
@@ -8058,6 +7595,10 @@ msgstr "Atom"
 msgid "FOAF"
 msgstr "FOAF"
 
+#. TRANS: Feed type name. See http://activitystrea.ms/
+msgid "Activity Streams"
+msgstr "Flus di ativitâts"
+
 #. TRANS: Client exception thrown when an imported feed does not have an author.
 msgid "No author in the feed."
 msgstr ""
@@ -8089,6 +7630,27 @@ msgstr "Sielç une etichete par scurtâ la liste."
 msgid "Grant this user the \"%s\" role"
 msgstr ""
 
+#. TRANS: Header for mini list of group members on a group page (h2).
+msgid "Members"
+msgstr "Membris"
+
+#. TRANS: Link to all group members from mini list of group members if group has more than n members.
+msgid "All members"
+msgstr "Ducj i membris"
+
+#. TRANS: Header for mini list of users with a pending membership request on a group page (h2).
+msgid "Pending"
+msgstr "In spiete"
+
+#. TRANS: Header for mini list of users that are blocked in a group page (h2).
+msgid "Blocked"
+msgstr "Blocâts"
+
+#. TRANS: Title for list of group administrators on a group page.
+msgctxt "TITLE"
+msgid "Admins"
+msgstr "Aministradôrs"
+
 #. TRANS: Button text for the form that will block a user from a group.
 msgctxt "BUTTON"
 msgid "Block"
@@ -8096,8 +7658,8 @@ msgstr "Bloche"
 
 #. TRANS: Submit button title.
 msgctxt "TOOLTIP"
-msgid "Block this user"
-msgstr "Bloche chest utent"
+msgid "Block this user so that they can no longer post messages to it."
+msgstr ""
 
 #. TRANS: Field title on group edit form.
 msgid "URL of the homepage or blog of the group or topic."
@@ -8146,63 +7708,9 @@ msgctxt "GROUPADMIN"
 msgid "Admin"
 msgstr "Aministradôr"
 
-#. TRANS: Menu item in the group navigation page.
-msgctxt "MENU"
-msgid "Group"
-msgstr "Grup"
-
-#. TRANS: Tooltip for menu item in the group navigation page.
-#. TRANS: %s is the nickname of the group.
-#, php-format
-msgctxt "TOOLTIP"
-msgid "%s group"
-msgstr "Grup %s"
-
-#. TRANS: Menu item in the group navigation page.
-msgctxt "MENU"
-msgid "Members"
-msgstr "Membris"
-
-#. TRANS: Tooltip for menu item in the group navigation page.
-#. TRANS: %s is the nickname of the group.
-#, php-format
-msgctxt "TOOLTIP"
-msgid "%s group members"
-msgstr "Membris dal grup %s"
-
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: %d is the number of pending members.
-#, php-format
-msgctxt "MENU"
-msgid "Pending members (%d)"
-msgid_plural "Pending members (%d)"
-msgstr[0] "Membri in spiete (%d)"
-msgstr[1] "Membris in spiete (%d)"
-
-#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: %s is the nickname of the group.
-#, php-format
-msgctxt "TOOLTIP"
-msgid "%s pending members"
-msgstr "membris in spiete su %s"
-
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-msgctxt "MENU"
-msgid "Blocked"
-msgstr "Blocâts"
-
-#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: %s is the nickname of the group.
-#, php-format
-msgctxt "TOOLTIP"
-msgid "%s blocked users"
-msgstr "Utents blocâts in %s"
-
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: Menu item in primary navigation panel.
-msgctxt "MENU"
-msgid "Admin"
-msgstr "Aministradôr"
+#. TRANS: Group actions header (h2). Text hidden by default.
+msgid "Group actions"
+msgstr "Azions dal grup"
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
@@ -8211,11 +7719,6 @@ msgctxt "TOOLTIP"
 msgid "Edit %s group properties"
 msgstr "Cambie lis propietâts dal grup %s"
 
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-msgctxt "MENU"
-msgid "Logo"
-msgstr "Logo"
-
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
 #, php-format
@@ -8223,16 +7726,10 @@ msgctxt "TOOLTIP"
 msgid "Add or edit %s logo"
 msgstr "Zonte o cambie il logo di %s"
 
-#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: %s is the nickname of the group.
-#, php-format
-msgctxt "TOOLTIP"
-msgid "Add or edit %s design"
-msgstr "Zonte o cambie la grafiche di %s"
-
-#. TRANS: Group actions header (h2). Text hidden by default.
-msgid "Group actions"
-msgstr "Azions dal grup"
+#. TRANS: Link text for link on user profile.
+msgctxt "MENU"
+msgid "Logo"
+msgstr "Logo"
 
 #. TRANS: Title for groups with the most members section.
 msgid "Popular groups"
@@ -8242,11 +7739,19 @@ msgstr "Grups popolârs"
 msgid "Active groups"
 msgstr "Grups atîfs"
 
-#. TRANS: Title for group tag cloud section.
-#. TRANS: %s is a group name.
-#, php-format
-msgid "Tags in %s group's notices"
-msgstr "Etichetis dai avîs dal grup %s"
+#. TRANS: Link description for seeing all groups.
+#. TRANS: Link description for seeing all lists.
+msgid "See all"
+msgstr "Viôt dut"
+
+#. TRANS: Link title for seeing all groups.
+msgid "See all groups you belong to."
+msgstr ""
+
+#. TRANS: Menu item title in personal group navigation menu.
+#. TRANS: %s is a username.
+msgid "Back to top"
+msgstr ""
 
 #. TRANS: Client exception 406
 msgid "This page is not available in a media type you accept"
@@ -8329,13 +7834,43 @@ msgstr ""
 #. TRANS: Title for inbox tag cloud section.
 msgctxt "TITLE"
 msgid "Trends"
-msgstr ""
+msgstr "Tendencis"
 
-#. TRANS: Button text for inviting more users to the StatusNet instance.
+#. TRANS: Default button text for inviting more users to the StatusNet instance.
 msgctxt "BUTTON"
 msgid "Invite more colleagues"
 msgstr "Invide gnûfs coleghis"
 
+#. TRANS: Form legend.
+msgid "Invite collegues"
+msgstr "Invide i tiei coleghis"
+
+#. TRANS: Field label for a list of e-mail addresses.
+msgid "Email addresses"
+msgstr "Direzions di pueste eletroniche"
+
+#. TRANS: Field title for a list of e-mail addresses.
+msgid "Addresses of friends to invite (one per line)."
+msgstr "Direzions dai amîs di invidâ (une par rie)."
+
+#. TRANS: Field label for a personal message to send to invitees.
+msgid "Personal message"
+msgstr "Messaç personâl"
+
+#. TRANS: Field title for a personal message to send to invitees.
+msgid "Optionally add a personal message to the invitation."
+msgstr "Se tu vuelis, tu puedis zontâ un messaç personâl tal invît."
+
+#. TRANS: Send button for inviting friends
+#. TRANS: Button text for sending notice.
+msgctxt "BUTTON"
+msgid "Send"
+msgstr "Mande"
+
+#. TRANS: Submit button title.
+msgid "Send invitations."
+msgstr "Mande invîts."
+
 #. TRANS: Button text for joining a group.
 msgctxt "BUTTON"
 msgid "Join"
@@ -8346,6 +7881,10 @@ msgctxt "BUTTON"
 msgid "Leave"
 msgstr "Lasse"
 
+#. TRANS: Link title for seeing all lists.
+msgid "See all lists you have created."
+msgstr "Cjale dutis lis listis che tu âs creât."
+
 #. TRANS: Menu item for logging in to the StatusNet site.
 #. TRANS: Menu item in primary navigation panel.
 msgctxt "MENU"
@@ -8393,8 +7932,8 @@ msgstr ""
 #. TRANS: Main body of new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscriber's long name, %2$s is the StatusNet sitename.
 #, php-format
-msgid "%1$s is now listening to your notices on %2$s."
-msgstr ""
+msgid "%1$s is now following you on %2$s."
+msgstr "%1$s cumò ti seguìs su %2$s."
 
 #. TRANS: Subject of pending new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscribing user's nickname, %2$s is the StatusNet sitename.
@@ -8556,6 +8095,9 @@ msgid ""
 "\n"
 "\t%s"
 msgstr ""
+"La tabaiade complete e pues jessi lete culì:\n"
+"\n"
+"%s"
 
 #. TRANS: E-mail subject for notice notification.
 #. TRANS: %1$s is the sending user's long name, %2$s is the adding user's nickname.
@@ -8566,7 +8108,7 @@ msgstr ""
 #. TRANS: Body of @-reply notification e-mail.
 #. TRANS: %1$s is the sending user's name, $2$s is the StatusNet sitename,
 #. TRANS: %3$s is a URL to the notice, %4$s is the notice text,
-#. TRANS: %5$s is a URL to the full conversion if it exists (otherwise empty),
+#. TRANS: %5$s is the text "The full conversation can be read here:" and a URL to the full conversion if it exists (otherwise empty),
 #. TRANS: %6$s is a URL to reply to the notice, %7$s is a URL to all @-replies for the addressed user,
 #, php-format
 msgid ""
@@ -8591,6 +8133,10 @@ msgstr ""
 
 #. TRANS: Subject of group join notification e-mail.
 #. TRANS: %1$s is the joining user's nickname, %2$s is the group name, and %3$s is the StatusNet sitename.
+#, php-format
+msgid "%1$s has joined your group %2$s on %3$s"
+msgstr "%1$s si à unît al to grup %2$s su %3$s"
+
 #. TRANS: Main body of group join notification e-mail.
 #. TRANS: %1$s is the subscriber's long name, %2$s is the group name, and %3$s is the StatusNet sitename,
 #. TRANS: %4$s is a block of profile info about the subscriber.
@@ -8623,6 +8169,8 @@ msgid ""
 "You have no private messages. You can send private message to engage other "
 "users in conversation. People can send you messages for your eyes only."
 msgstr ""
+"No tu âs nissun messaç privât. Tu puedis mandâ messaçs privâts par scomençâ "
+"tabaiadis cun altris utents. La int e pues mandâti messaçs dome pai tiei vôi."
 
 #. TRANS: Menu item in mailbox menu. Leads to incoming private messages.
 msgctxt "MENU"
@@ -8675,8 +8223,8 @@ msgstr ""
 
 #. TRANS: Submit button title.
 msgctxt "TOOLTIP"
-msgid "Make this user an admin"
-msgstr ""
+msgid "Make this user an admin."
+msgstr "Promôf chest utent a aministradôr."
 
 #. TRANS: Client exception thrown when a database error was thrown during a file upload operation.
 msgid "There was a database error while saving your file. Please try again."
@@ -8721,7 +8269,7 @@ msgstr ""
 msgid "Select recipient:"
 msgstr "Sielç il destinatari:"
 
-#. TRANS Entry in drop-down selection box in direct-message inbox/outbox when no one is available to message.
+#. TRANS: Entry in drop-down selection box in direct-message inbox/outbox when no one is available to message.
 msgid "No mutual subscribers."
 msgstr ""
 
@@ -8788,6 +8336,10 @@ msgstr ""
 msgid "You must implement either adaptNoticeListItem() or showNotice()."
 msgstr ""
 
+#. TRANS: Link description to show more items in a list.
+msgid "More â–¼"
+msgstr "Plui â–¼"
+
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 msgid "Nickname cannot be empty."
 msgstr ""
@@ -8837,10 +8389,6 @@ msgctxt "SEPARATOR"
 msgid ", "
 msgstr ", "
 
-#. TRANS: Start of profile addressees list.
-msgid " â–¸ "
-msgstr ""
-
 #. TRANS: Used in coordinates as abbreviation of north.
 msgid "N"
 msgstr "N"
@@ -8879,16 +8427,16 @@ msgid "Repeated by"
 msgstr "Ripetût di"
 
 #. TRANS: Link title in notice list item to reply to a notice.
-msgid "Reply to this notice"
-msgstr "Rispuint a chest avîs"
+msgid "Reply to this notice."
+msgstr "Rispuint a chest avîs."
 
 #. TRANS: Link text in notice list item to reply to a notice.
 msgid "Reply"
 msgstr "Rispuint"
 
 #. TRANS: Link title in notice list item to delete a notice.
-msgid "Delete this notice"
-msgstr "Elimine chest avîs"
+msgid "Delete this notice from the timeline."
+msgstr "Elimine chest avîs de ativitât."
 
 #. TRANS: Title for repeat form status in notice list when a notice has been repeated.
 msgid "Notice repeated."
@@ -8911,26 +8459,6 @@ msgstr "Poche"
 msgid "Send a nudge to this user."
 msgstr "Poche chest utent."
 
-#. TRANS: Exception thrown when creating a new profile fails in OAuth store.
-msgid "Error inserting new profile."
-msgstr ""
-
-#. TRANS: Exception thrown when creating a new avatar fails in OAuth store.
-msgid "Error inserting avatar."
-msgstr ""
-
-#. TRANS: Exception thrown when creating a remote profile fails in OAuth store.
-msgid "Error inserting remote profile."
-msgstr ""
-
-#. TRANS: Exception thrown when a notice is denied because it has been sent before.
-msgid "Duplicate notice."
-msgstr ""
-
-#. TRANS: Exception thrown when creating a new subscription fails in OAuth store.
-msgid "Could not insert new subscription."
-msgstr ""
-
 #. TRANS: Server exception thrown in oEmbed action if no API endpoint is available.
 msgid "No oEmbed API endpoint available."
 msgstr ""
@@ -9008,10 +8536,6 @@ msgstr "Cambie"
 msgid "Edit %s list by you."
 msgstr "Cambie la tô liste %s."
 
-#. TRANS: Link description for link to list of users tagged with a tag.
-msgid "Tagged"
-msgstr "Etichetât"
-
 #. TRANS: Title for link to edit list settings.
 msgid "Edit list settings."
 msgstr "Cambie lis impuestazions de liste."
@@ -9154,8 +8678,10 @@ msgctxt "plugin"
 msgid "Enable"
 msgstr "Ative"
 
+#. TRANS: Plugin description for a disabled plugin.
 msgctxt "plugin-description"
-msgid "(Plugin descriptions unavailable when disabled.)"
+msgid ""
+"(The plugin description is unavailable when a plugin has been disabled.)"
 msgstr ""
 
 #. TRANS: Menu item in primary navigation panel.
@@ -9167,6 +8693,11 @@ msgstr "Impuestazions"
 msgid "Change your personal settings."
 msgstr "Cambie lis tôs impuestazions personâls."
 
+#. TRANS: Menu item in primary navigation panel.
+msgctxt "MENU"
+msgid "Admin"
+msgstr "Aministradôr"
+
 #. TRANS: Menu item title in primary navigation panel.
 msgid "Site configuration."
 msgstr "Configurazion dal sît."
@@ -9184,14 +8715,8 @@ msgstr "Jes dal sît"
 msgid "Login to the site."
 msgstr "Jentre tal sît"
 
-#. TRANS: Menu item in primary navigation panel.
-msgctxt "MENU"
-msgid "Search"
-msgstr "Cîr"
-
-#. TRANS: Menu item title in primary navigation panel.
-msgid "Search the site."
-msgstr "Cîr tal sît"
+msgid "This profile has been silenced by site moderators"
+msgstr ""
 
 #. TRANS: H2 text for user subscription statistics.
 msgid "Following"
@@ -9201,6 +8726,10 @@ msgstr "Al seguìs"
 msgid "Followers"
 msgstr "Lu seguissin"
 
+#. TRANS: H2 text for user statistics.
+msgid "Statistics"
+msgstr "Statistichis"
+
 #. TRANS: Label for user statistics.
 msgid "User ID"
 msgstr "ID utent"
@@ -9209,10 +8738,6 @@ msgstr "ID utent"
 msgid "Member since"
 msgstr "Membri dai"
 
-#. TRANS: Label for user statistics.
-msgid "Notices"
-msgstr "Avîs"
-
 #. TRANS: Label for user statistics.
 #. TRANS: Average count of posts made per day since account registration.
 msgid "Daily average"
@@ -9256,7 +8781,7 @@ msgstr "Popolâr"
 #. TRANS: Title for inbox tag cloud section.
 msgctxt "TITLE"
 msgid "Trending topics"
-msgstr ""
+msgstr "Argoments di tendence"
 
 #. TRANS: Client error displayed when return-to was defined without a target.
 msgid "No return-to arguments."
@@ -9298,13 +8823,13 @@ msgid "Keyword(s)"
 msgstr "Peraulis clâfs"
 
 #. TRANS: Button text for searching site.
+#. TRANS: Button text for search button on search form.
 #. TRANS: Button text to search profiles.
 msgctxt "BUTTON"
 msgid "Search"
 msgstr "Cîr"
 
 #. TRANS: Standard search suggestions shown when a search does not give any results.
-#, fuzzy
 msgid ""
 "* Make sure all words are spelled correctly.\n"
 "* Try different keywords.\n"
@@ -9314,7 +8839,7 @@ msgstr ""
 "* Siguriti di vê scrit just dutis lis peraulis.\n"
 "* Prove peraulis clâfs difarentis.\n"
 "* Prove peraulis clâfs plui gjenerâls.\n"
-"* Prove mancul peraulis clâfs.\n"
+"* Prove mancul peraulis clâfs."
 
 #. TRANS: Standard search suggestions shown when a search does not give any results.
 #, php-format
@@ -9351,21 +8876,6 @@ msgstr "Cjate il contignût di avîs"
 msgid "Find groups on this site"
 msgstr "Cjate grups in chest sît"
 
-#. TRANS: Secondary navigation menu item leading to help on StatusNet.
-msgctxt "MENU"
-msgid "Help"
-msgstr "Jutori"
-
-#. TRANS: Secondary navigation menu item leading to text about StatusNet site.
-msgctxt "MENU"
-msgid "About"
-msgstr "Informazions"
-
-#. TRANS: Secondary navigation menu item leading to Frequently Asked Questions.
-msgctxt "MENU"
-msgid "FAQ"
-msgstr "Domandis plui frecuentis"
-
 #. TRANS: Secondary navigation menu item leading to Terms of Service.
 msgctxt "MENU"
 msgid "TOS"
@@ -9386,17 +8896,6 @@ msgctxt "MENU"
 msgid "Version"
 msgstr "Version"
 
-#. TRANS: Secondary navigation menu item leading to e-mail contact information on the
-#. TRANS: StatusNet site, where to report bugs, ...
-msgctxt "MENU"
-msgid "Contact"
-msgstr "Contats"
-
-#. TRANS: Secondary navigation menu item. Leads to information about embedding a timeline widget.
-msgctxt "MENU"
-msgid "Badge"
-msgstr ""
-
 #. TRANS: Default title for section/sidebar widget.
 msgid "Untitled section"
 msgstr "Sezion cence non"
@@ -9441,10 +8940,6 @@ msgstr "Pueste eletroniche"
 msgid "Change email handling"
 msgstr "Cambie la gjestion de pueste eletroniche"
 
-#. TRANS: Menu item title in settings navigation panel.
-msgid "Design your profile"
-msgstr "Disegne il to profîl"
-
 #. TRANS: Menu item in settings navigation panel.
 msgctxt "MENU"
 msgid "URL"
@@ -9481,6 +8976,15 @@ msgstr "Conessions"
 msgid "Authorized connected applications"
 msgstr ""
 
+#. TRANS: Menu item in settings navigation panel.
+msgctxt "MENU"
+msgid "Old school"
+msgstr "Come une volte"
+
+#. TRANS: Menu item title in settings navigation panel.
+msgid "UI tweaks for old-school users"
+msgstr "Impuestazions de grafiche pai utents des vieris versions"
+
 #. TRANS: Title of form to silence a user.
 msgctxt "TITLE"
 msgid "Silence"
@@ -9490,6 +8994,39 @@ msgstr "Fâs tasê"
 msgid "Silence this user"
 msgstr "Fâs tasê chest utent"
 
+#. TRANS: Server error displayed when trying to create an anynymous OAuth consumer.
+msgid "Could not create anonymous consumer."
+msgstr ""
+
+#. TRANS: Server error displayed when trying to create an anynymous OAuth application.
+msgid "Could not create anonymous OAuth application."
+msgstr ""
+
+#. TRANS: Exception thrown when no token association could be found.
+msgid ""
+"Could not find a profile and application associated with the request token."
+msgstr ""
+
+#. TRANS: Exception thrown when no access token can be issued.
+msgid "Could not issue access token."
+msgstr ""
+
+#. TRANS: Exception thrown when a database error occurs.
+msgid "Database error inserting OAuth application user."
+msgstr ""
+
+#. TRANS: Exception thrown when a database error occurs.
+msgid "Database error updating OAuth application user."
+msgstr ""
+
+#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
+msgid "Tried to revoke unknown token."
+msgstr ""
+
+#. TRANS: Exception thrown when an attempt is made to remove a revoked token.
+msgid "Failed to delete revoked token."
+msgstr ""
+
 #. TRANS: Menu item in local navigation menu.
 msgctxt "MENU"
 msgid "Subscriptions"
@@ -9546,6 +9083,16 @@ msgstr "Invide amîs e coleghis di lavôr a partecipâ a %s"
 msgid "Subscribe to this user"
 msgstr "Sotscrivimi a chest utent"
 
+#. TRANS: Button text to subscribe to a user.
+#. TRANS: Button text for subscribing to a list.
+msgctxt "BUTTON"
+msgid "Subscribe"
+msgstr "Sotscrivimi"
+
+#. TRANS: Button title to subscribe to a user.
+msgid "Subscribe to this user."
+msgstr "Sotscrivimi a chest utent."
+
 #. TRANS: Title of personal tag cloud section.
 msgid "People Tagcloud as self-tagged"
 msgstr ""
@@ -9663,16 +9210,26 @@ msgstr[1] "Chest i plâs a %%s."
 
 #. TRANS: List message for notice repeated by logged in user.
 msgctxt "REPEATLIST"
-msgid "You have repeated this notice."
-msgstr "Tu âs ripetût chest avîs."
+msgid "You repeated this."
+msgstr "Tu lu âs ripetût."
 
-#. TRANS: List message for repeated notices.
-#. TRANS: %d is the number of users that have repeated a notice.
+#. TRANS: List message for when more than 4 people repeat something.
+#. TRANS: %%s is a list of users liking a notice, %d is the number over 4 that like the notice.
+#. TRANS: Plural is decided on the total number of users liking the notice (count of %%s + %d).
 #, php-format
-msgid "One person has repeated this notice."
-msgid_plural "%d people have repeated this notice."
-msgstr[0] "Une persone e à ripetût chest avîs."
-msgstr[1] "%d personis a àn ripetût chest avîs."
+msgid "%%s and %d other repeated this."
+msgid_plural "%%s and %d others repeated this."
+msgstr[0] "Ripetût di %%s e %d altri."
+msgstr[1] "Ripetût di %%s e %d altris."
+
+#. TRANS: List message for favoured notices.
+#. TRANS: %%s is a list of users liking a notice.
+#. TRANS: Plural is based on the number of of users that have favoured a notice.
+#, php-format
+msgid "%%s repeated this."
+msgid_plural "%%s repeated this."
+msgstr[0] "%%s lu à ripetût."
+msgstr[1] "%%s lu àn ripetût."
 
 #. TRANS: Form legend.
 #, php-format
@@ -9764,7 +9321,6 @@ msgid "Unsilence this user"
 msgstr "No stâ plui fâ tasê chest utent"
 
 #. TRANS: Form legend on unsubscribe form.
-#. TRANS: Button title on unsubscribe form.
 msgid "Unsubscribe from this user"
 msgstr "Anule la sotscrizion a chest utent"
 
@@ -9774,6 +9330,10 @@ msgctxt "BUTTON"
 msgid "Unsubscribe"
 msgstr "Anule la sotscrizion"
 
+#. TRANS: Button title on unsubscribe form.
+msgid "Unsubscribe from this user."
+msgstr "Anule la sotscrizion a chest utent."
+
 #. TRANS: Exception text shown when no profile can be found for a user.
 #. TRANS: %1$s is a user nickname, $2$d is a user ID (number).
 #, php-format
@@ -9855,8 +9415,6 @@ msgstr ""
 msgid "Getting backup from file '%s'."
 msgstr ""
 
-#~ msgid "%1$s and friends, page %2$d"
-#~ msgstr "%1$s e amîs, pagjine %2$d"
-
-#~ msgid "You and friends"
-#~ msgstr "Tu e i tiei amîs"
+#
+#~ msgid " "
+#~ msgstr " "
diff --git a/locale/gl/LC_MESSAGES/statusnet.po b/locale/gl/LC_MESSAGES/statusnet.po
index d7446186bf..232e94e88c 100644
--- a/locale/gl/LC_MESSAGES/statusnet.po
+++ b/locale/gl/LC_MESSAGES/statusnet.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Core to Galician (Galego)
+# Translation of StatusNet - Core to Galician (galego)
 # Exported from translatewiki.net
 #
 # Author: Brion
@@ -12,17 +12,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:09+0000\n"
-"Language-Team: Galician <http://translatewiki.net/wiki/Portal:gl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:04+0000\n"
+"Language-Team: Galician <https://translatewiki.net/wiki/Portal:gl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: gl\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-05-05 10:52:40+0000\n"
+"X-POT-Import-Date: 2012-04-22 22:02:21+0000\n"
 
 #. TRANS: Database error message.
 #, php-format
@@ -32,12 +32,10 @@ msgid ""
 "contact them at %2$s to make sure. Otherwise, wait a few minutes and try "
 "again."
 msgstr ""
-
-#. TRANS: Error message.
-msgid ""
-"An important error occured, probably related to email setup. Check logfiles "
-"for more info."
-msgstr ""
+"A base de datos de %1$s non responde correctamente, de modo que o sitio non "
+"traballará adecuadamente. Probablemente os administradores do sitio xa "
+"saiban do problema, pero pode poñerse en contacto con eles en %2$s para "
+"asegurarse. Senón, agarde uns minutos e inténteo de novo."
 
 #. TRANS: Error message.
 msgid "An error occurred."
@@ -48,11 +46,12 @@ msgstr "Houbo un erro."
 msgid ""
 "No configuration file found. Try running the installation program first."
 msgstr ""
+"Non se atopou o ficheiro de configuración. Inténteo executando o programa de "
+"instalación primeiro."
 
 #. TRANS: Error message displayed when trying to access a non-existing page.
-#, fuzzy
 msgid "Unknown page"
-msgstr "Descoñecida"
+msgstr "Páxina descoñecida"
 
 #. TRANS: Error message displayed when trying to perform an undefined action.
 #. TRANS: Title for password recovery page when an unknown action has been specified.
@@ -98,12 +97,11 @@ msgstr "Desactivar os novos rexistros."
 msgid "Closed"
 msgstr "Pechado"
 
-#. TRANS: Title for button to save access settings in site admin panel.
-msgid "Save access settings"
-msgstr "Gardar a configuración de acceso"
+#. TRANS: Button title to save access settings in site admin panel.
+msgid "Save access settings."
+msgstr "Gardar a configuración de acceso."
 
-#. TRANS: Tooltip for button to save access settings in site admin panel.
-#. TRANS: Button text for saving theme settings.
+#. TRANS: Button text to save access settings in site admin panel.
 #. TRANS: Button label to save e-mail preferences.
 #. TRANS: Button label to save IM preferences.
 #. TRANS: Button text in the license admin panel.
@@ -119,7 +117,6 @@ msgstr "Gardar a configuración de acceso"
 #. TRANS: Button text for saving "Other settings" in profile.
 #. TRANS: Button text to save user settings in user admin panel.
 #. TRANS: Button label in the "Edit application" form.
-#. TRANS: Button text on profile design page to save settings.
 #. TRANS: Text for save button on group edit form.
 #. TRANS: Button text to save tags for a profile.
 msgctxt "BUTTON"
@@ -155,20 +152,14 @@ msgstr "Non existe ese perfil."
 #. TRANS: Client error displayed trying to reference a non-existing list.
 #. TRANS: Client error displayed when referring to a non-existing list.
 #. TRANS: Client error displayed trying to reference a non-existing list.
-#, fuzzy
 msgid "No such list."
-msgstr "Esa etiqueta non existe."
-
-#. TRANS: Client error displayed when trying to add an OMB 0.1 remote profile to a list.
-#, fuzzy
-msgid "You cannot list an OMB 0.1 remote profile with this action."
-msgstr "Non se pode subscribir a un perfil remoto OMB 0.1 con esta acción."
+msgstr "Non existe tal lista."
 
 #. TRANS: Client error displayed when an unknown error occurs when adding a user to a list.
 #. TRANS: %s is a username.
 #, php-format
 msgid "There was an unexpected error while listing %s."
-msgstr ""
+msgstr "Houbo un erro inesperado ao engadir a %s á lista."
 
 #. TRANS: Client error displayed when an unknown error occurs when adding a user to a list.
 #. TRANS: %s is a profile URL.
@@ -177,24 +168,24 @@ msgid ""
 "There was a problem listing %s. The remote server is probably not responding "
 "correctly. Please try retrying later."
 msgstr ""
+"Houbo un problema ao engadir a %s á lista. Probablemente o servidor remoto "
+"non estea respondendo correctamente. Inténteo de novo máis tarde."
 
 #. TRANS: Title after adding a user to a list.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Listed"
-msgstr "Licenza"
+msgstr "Listado"
 
 #. TRANS: Server error when page not found (404).
 #. TRANS: Server error when page not found (404)
 #. TRANS: Server error when page not found (404).
 msgid "No such page."
-msgstr "Esa páxina non existe."
+msgstr "Non existe esa páxina."
 
 #. TRANS: Client error when user not found for an action.
 #. TRANS: Client error when user not found for an rss related action.
 #. TRANS: Client error displayed when no existing user is provided for a user's delivery device setting.
 #. TRANS: Client error displayed if a user could not be found.
-#. TRANS: Client error when user not found updating a profile background image.
 #. TRANS: Client error displayed updating profile image without having a user object.
 #. TRANS: Client error displayed when making an Atom API request for an unknown user.
 #. TRANS: Client error displayed when trying to block a non-existing user or a user from another site.
@@ -220,14 +211,11 @@ msgstr "Esa páxina non existe."
 #. TRANS: Client error displayed when trying to get the RSS feed with favorites of a user that does not exist.
 #. TRANS: Client error displayed when requesting Friends of a Friend feed without providing a user nickname.
 #. TRANS: Client error displayed when requesting Friends of a Friend feed for an object that is not a user.
-#. TRANS: Client error displayed when trying to get a user hCard for a non-existing user.
 #. TRANS: Client error displayed trying to make a micro summary without providing a valid user.
 #. TRANS: Client error displayed trying to send a direct message to a non-existing user.
 #. TRANS: Client error displayed trying to use "one time password login" without using an existing user.
 #. TRANS: Client error displayed when referring to non-existing user.
 #. TRANS: Client error displayed trying to perform an action related to a non-existing user.
-#. TRANS: Form validation error on page for remote subscribe when no user was provided.
-#. TRANS: Form validation error on page for remote subscribe when no user profile was found.
 #. TRANS: Client error displayed when trying to reply to a non-exsting user.
 #. TRANS: Client error displayed when providing a non-existing nickname in a RSS 1.0 action.
 #. TRANS: Client error.
@@ -236,7 +224,6 @@ msgstr "Esa páxina non existe."
 #. TRANS: Client error displayed trying to find a user by ID for a non-existing ID.
 #. TRANS: Client error displayed requesting groups for a non-existing user.
 #. TRANS: Client error displayed when user not found for an action.
-#. TRANS: Client error displayed providing a non-existing nickname.
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #. TRANS: Client error displayed when trying to perform a gallery action with an unknown user.
 #. TRANS: Client error displayed when trying to access a mailbox without providing a user.
@@ -245,15 +232,21 @@ msgid "No such user."
 msgstr "Non existe tal usuario."
 
 #. TRANS: Title of a user's own start page.
-#, fuzzy
 msgid "Home timeline"
-msgstr "Liña do tempo de %s"
+msgstr "Liña do tempo inicial"
 
 #. TRANS: Title of another user's start page.
 #. TRANS: %s is the other user's name.
-#, fuzzy, php-format
+#, php-format
 msgid "%s's home timeline"
-msgstr "Liña do tempo de %s"
+msgstr "Liña do tempo inicial de %s"
+
+#. TRANS: %s is user nickname.
+#. TRANS: Feed title.
+#. TRANS: %s is tagger's nickname.
+#, php-format
+msgid "Feed for friends of %s (Activity Streams JSON)"
+msgstr "Fonte de novas dos amigos de %s (fluxos de actividade JSON)"
 
 #. TRANS: %s is user nickname.
 #, php-format
@@ -277,7 +270,7 @@ msgstr "Fonte de novas dos amigos de %s (Atom)"
 msgid ""
 "This is the timeline for %s and friends but no one has posted anything yet."
 msgstr ""
-"Esta é a liña do tempo de %s e amigos pero ninguén publicou nada aínda."
+"Esta é a liña do tempo de %s e amigos, pero ninguén publicou nada aínda."
 
 #. TRANS: Encouragement displayed on logged in user's empty timeline.
 #. TRANS: This message contains Markdown links. Keep "](" together.
@@ -300,7 +293,7 @@ msgstr ""
 "[publicar algo dirixido a el ou ela](%%%%action.newnotice%%%%?"
 "status_textarea=%3$s)."
 
-#. TRANS: Encoutagement displayed on empty timeline user pages for anonymous users.
+#. TRANS: Encouragement displayed on empty timeline user pages for anonymous users.
 #. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
 #. TRANS: Empty list message for page with replies for a user for not logged in users.
 #. TRANS: %1$s is a user nickname. This message contains a Markdown link in the form [link text](link).
@@ -314,6 +307,12 @@ msgstr ""
 "Por que non [rexistrar unha conta](%%%%action.register%%%%) e entón facerlle "
 "un aceno a %s ou publicar unha nota dirixida a el ou ela?"
 
+#. TRANS: Button text for inviting more users to the StatusNet instance.
+#. TRANS: Less business/enterprise-oriented language for public sites.
+msgctxt "BUTTON"
+msgid "Send invite"
+msgstr "Enviar as invitacións"
+
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Title of API timeline for a user and friends.
 #. TRANS: %s is a username.
@@ -322,8 +321,6 @@ msgstr ""
 #. TRANS: %s is a username.
 #. TRANS: Menu item title in personal group navigation menu.
 #. TRANS: %s is a username.
-#. TRANS: Menu item title in settings navigation panel.
-#. TRANS: %s is a username.
 #, php-format
 msgid "%s and friends"
 msgstr "%s e amigos"
@@ -345,7 +342,7 @@ msgstr "Non se atopou o método da API."
 #. TRANS: Client error message. POST is a HTTP command. It should not be translated.
 #. TRANS: Client error. POST is a HTTP command. It should not be translated.
 msgid "This method requires a POST."
-msgstr "Este método require un POST."
+msgstr "Este método require un comando HTTP POST."
 
 #. TRANS: Client error displayed when no valid device parameter is provided for a user's delivery device setting.
 msgid ""
@@ -363,7 +360,6 @@ msgstr ""
 #. TRANS: Server error thrown on database error updating SMS preferences.
 #. TRANS: Server error thrown on database error removing a registered SMS phone number.
 #. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
-#. TRANS: Server exception thrown on Profile design page when updating design settings fails.
 msgid "Could not update user."
 msgstr "Non se puido actualizar o usuario."
 
@@ -378,7 +374,6 @@ msgstr "Non se puido gardar o perfil."
 
 #. TRANS: Client error displayed when the number of bytes in a POST request exceeds a limit.
 #. TRANS: %s is the number of bytes of the CONTENT_LENGTH.
-#. TRANS: Form validation error in design settings form. POST should remain untranslated.
 #, php-format
 msgid ""
 "The server was unable to handle that much POST data (%s byte) due to its "
@@ -393,24 +388,6 @@ msgstr[1] ""
 "O servidor non puido manexar tantos datos POST (%s bytes) por mor da súa "
 "configuración actual."
 
-#. TRANS: Client error displayed when saving design settings fails because of an empty id.
-#. TRANS: Client error displayed when saving design settings fails because of an empty result.
-#. TRANS: Client error displayed when a database error occurs inserting profile colours.
-#. TRANS: Client error displayed when a database error occurs updating profile colours.
-#. TRANS: Form validation error displayed when group design settings could not be saved because of an application issue.
-#. TRANS: Form validation error on Profile design page when saving design settings has failed.
-#. TRANS: Form validation error on Profile design page when updating design settings has failed.
-msgid "Unable to save your design settings."
-msgstr "Non se puido gardar a súa configuración de deseño."
-
-#. TRANS: Error displayed when updating design settings fails.
-#. TRANS: Client error displayed when a database error occurs updating profile colours.
-#. TRANS: Form validation error on Profile design page when updating design settings has failed.
-#. TRANS: Error message displayed if design settings could not be saved.
-#. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
-msgid "Could not update your design."
-msgstr "Non se puido actualizar o seu deseño."
-
 #. TRANS: Title for Atom feed.
 msgctxt "ATOM"
 msgid "Main"
@@ -457,6 +434,20 @@ msgstr "Non se puido bloquear o usuario."
 msgid "Unblock user failed."
 msgstr "Non se puido desbloquear o usuario."
 
+#. TRANS: Client exception thrown when no conversation ID is given.
+msgid "No conversation ID."
+msgstr "Sen identificador da conversa."
+
+#. TRANS: Client exception thrown when referring to a non-existing conversation ID (%d).
+#, php-format
+msgid "No conversation with ID %d."
+msgstr "Non hai ningunha conversa do ID %d."
+
+#. TRANS: Title for conversion timeline.
+msgctxt "TITLE"
+msgid "Conversation"
+msgstr "Conversa"
+
 #. TRANS: Title. %s is a user nickname.
 #, php-format
 msgid "Direct messages from %s"
@@ -503,6 +494,8 @@ msgstr ""
 "Non pode enviar mensaxes directas a usuarios que non sexan amigos seus."
 
 #. TRANS: Client error displayed trying to direct message self (403).
+#. TRANS: Client error displayed trying to send a direct message to self.
+#. TRANS: Error text shown when trying to send a direct message to self.
 msgid ""
 "Do not send a message to yourself; just say it to yourself quietly instead."
 msgstr "Non se envíe unha mensaxe, limítese a pensar nela."
@@ -616,7 +609,7 @@ msgstr "O nome completo é longo de máis (o máximo son 255 caracteres)."
 #, php-format
 msgid "Description is too long (maximum %d character)."
 msgid_plural "Description is too long (maximum %d characters)."
-msgstr[0] "A descrición é longa de máis (o máximo son %d caracteres)."
+msgstr[0] "A descrición é longa de máis (o máximo é %d carácter)."
 msgstr[1] "A descrición é longa de máis (o máximo son %d caracteres)."
 
 #. TRANS: Client error shown when providing too long a location during group creation.
@@ -731,7 +724,6 @@ msgstr "grupos en %s"
 
 #. TRANS: Client error displayed when trying to edit a group without being an admin.
 #. TRANS: Client error displayed trying to edit a group while not being a group admin.
-#. TRANS: Client error displayed trying to change group design settings without being a (group) admin.
 #. TRANS: Client error displayed when trying to change group logo settings while not being a group admin.
 msgid "You must be an admin to edit the group."
 msgstr "Ten que ser administrador para editar o grupo."
@@ -762,13 +754,12 @@ msgstr "O pseudónimo non pode coincidir co alcume."
 #. TRANS: Client error displayed when referring to a non-existing list.
 #. TRANS: Client error displayed trying to perform an action related to a non-existing list.
 #. TRANS: Client error displayed when referring to a non-existing list.
-#, fuzzy
 msgid "List not found."
-msgstr "Non se atopou o método da API."
+msgstr "Non se atopou a lista."
 
 #. TRANS: Client error displayed when trying to update another user's list.
 msgid "You cannot update lists that do not belong to you."
-msgstr ""
+msgstr "Non pode actualizar as listas que non lle pertencen."
 
 #. TRANS: Client error displayed when an unknown error occurs updating a list.
 #. TRANS: Client error displayed when an unknown error occurs viewing list members.
@@ -779,45 +770,39 @@ msgstr "Houbo un erro."
 
 #. TRANS: Client error displayed when trying to delete another user's list.
 msgid "You cannot delete lists that do not belong to you."
-msgstr ""
+msgstr "Non pode borrar as listas que non lle pertencen."
 
 #. TRANS: Client error displayed when referring to a non-list member.
-#, fuzzy
 msgid "The specified user is not a member of this list."
-msgstr "O usuario non pertence ao grupo."
+msgstr "O usuario especificado non é membro desta lista."
 
 #. TRANS: Client error displayed when trying to add members to a list without having the right to do so.
-#, fuzzy
 msgid "You are not allowed to add members to this list."
-msgstr "Vostede non pertence a este grupo."
+msgstr "Non ten os permisos necesarios para engadir membros a esta lista."
 
 #. TRANS: Client error displayed when trying to modify list members without specifying them.
-#, fuzzy
 msgid "You must specify a member."
-msgstr "Falta o perfil de usuario."
+msgstr "Cómpre especificar un membro."
 
 #. TRANS: Client error displayed when trying to remove members from a list without having the right to do so.
-#, fuzzy
 msgid "You are not allowed to remove members from this list."
-msgstr "Vostede non pertence a este grupo."
+msgstr "Non ten os permisos necesarios para eliminar membros desta lista."
 
 #. TRANS: Client error displayed when trying to remove a list member that is not part of a list.
 msgid "The user you are trying to remove from the list is not a member."
-msgstr ""
+msgstr "O usuario que intenta eliminar non pertence á lista."
 
 #. TRANS: Client error displayed when trying to create a list without a name.
-#, fuzzy
 msgid "A list must have a name."
-msgstr "O pseudónimo non pode coincidir co alcume."
+msgstr "A lista debe ter un nome."
 
 #. TRANS: Client error displayed when a membership check for a user is nagative.
 msgid "The specified user is not a subscriber of this list."
-msgstr ""
+msgstr "O usuario especificado non é subscritor desta lista."
 
 #. TRANS: Client error displayed when trying to unsubscribe from a non-subscribed list.
-#, fuzzy
 msgid "You are not subscribed to this list."
-msgstr "Non está subscrito a ese perfil."
+msgstr "Non está subscrito a esa lista."
 
 #. TRANS: Client error displayed when uploading a media file has failed.
 msgid "Upload failed."
@@ -850,7 +835,6 @@ msgstr ""
 
 #. TRANS: Client error given on when invalid data was passed through a form in the OAuth API.
 #. TRANS: Unexpected validation error on avatar upload form.
-#. TRANS: Client error displayed when the submitted form contains unexpected data.
 #. TRANS: Client error displayed submitting invalid form data for edit application.
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
 #. TRANS: Form validation error message when an unsupported argument is used.
@@ -859,7 +843,6 @@ msgstr ""
 #. TRANS: Client error when submitting a form with unexpected information.
 #. TRANS: Client error displayed when unexpected data is posted in the password recovery form.
 #. TRANS: Message given submitting a form with an unknown action in SMS settings.
-#. TRANS: Unknown form validation error in design settings form.
 msgid "Unexpected form submission."
 msgstr "Envío de formulario inesperado."
 
@@ -873,15 +856,14 @@ msgstr "Permitir ou denegar o acceso"
 
 #. TRANS: User notification of external application requesting account access.
 #. TRANS: %3$s is the access type requested (read-write or read-only), %4$s is the StatusNet sitename.
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "An application would like the ability to <strong>%3$s</strong> your %4$s "
 "account data. You should only give access to your %4$s account to third "
 "parties you trust."
 msgstr ""
-"A aplicación <strong>%1$s</strong> de <strong>%2$s</strong> quere poder "
-"<strong>%3$s</strong> os datos da súa conta %4$s. Só debería permitir o "
-"acceso á súa conta %4$s a xente de confianza."
+"Unha aplicación quere poder <strong>%3$s</strong> os datos da súa conta %4"
+"$s. Só debería permitir o acceso á súa conta %4$s a xente de confianza."
 
 #. TRANS: User notification of external application requesting account access.
 #. TRANS: %1$s is the application name requesting access, %2$s is the organisation behind the application,
@@ -904,7 +886,6 @@ msgstr "Conta"
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Field label on account registration page.
-#. TRANS: Label for nickname on user authorisation page.
 #. TRANS: Field label on group edit form.
 #. TRANS: Dropdown option for searching in profiles.
 msgid "Nickname"
@@ -946,21 +927,22 @@ msgid "The request token %s has been revoked."
 msgstr "Denegouse o pase da solicitude %s."
 
 #. TRANS: Title of the page notifying the user that an anonymous client application was successfully authorized to access the user's account with OAuth.
-#, fuzzy
 msgid "You have successfully authorized the application"
-msgstr "Non está autorizado."
+msgstr "Deu autorización á aplicación correctamente"
 
 #. TRANS: Message notifying the user that an anonymous client application was successfully authorized to access the user's account with OAuth.
 msgid ""
 "Please return to the application and enter the following security code to "
 "complete the process."
 msgstr ""
+"Volva á aplicación e insira o seguinte código de seguridade para completar o "
+"proceso."
 
 #. TRANS: Title of the page notifying the user that the client application was successfully authorized to access the user's account with OAuth.
 #. TRANS: %s is the authorised application name.
-#, fuzzy, php-format
+#, php-format
 msgid "You have successfully authorized %s"
-msgstr "Non está autorizado."
+msgstr "Deu autorización a %s correctamente"
 
 #. TRANS: Message notifying the user that the client application was successfully authorized to access the user's account with OAuth.
 #. TRANS: %s is the authorised application name.
@@ -969,6 +951,7 @@ msgid ""
 "Please return to %s and enter the following security code to complete the "
 "process."
 msgstr ""
+"Volva a %s e insira o seguinte código de seguridade para completar o proceso."
 
 #. TRANS: Client error displayed trying to delete a status not using POST or DELETE.
 #. TRANS: POST and DELETE should not be translated.
@@ -985,7 +968,7 @@ msgstr "Non pode borrar o estado doutro usuario."
 #. TRANS: Error message displayed trying to delete a non-existing notice.
 #. TRANS: Client error displayed trying to show a non-existing notice.
 msgid "No such notice."
-msgstr "Non existe tal nota."
+msgstr "Non existe esa nota."
 
 #. TRANS: Client error displayed calling an unsupported HTTP error in API status show.
 #. TRANS: Client exception thrown when using an unsupported HTTP method.
@@ -993,15 +976,14 @@ msgstr "Non existe tal nota."
 #. TRANS: Client exception thrown when using an unsupported HTTP method.
 #. TRANS: Client error shown when using a non-supported HTTP method.
 #. TRANS: Client exception thrown when using an unsupported HTTP method.
-#, fuzzy
 msgid "HTTP method not supported."
-msgstr "Non se atopou o método da API."
+msgstr "Non se soporta o método HTTP."
 
 #. TRANS: Exception thrown requesting an unsupported notice output format.
 #. TRANS: %s is the requested output format.
-#, fuzzy, php-format
+#, php-format
 msgid "Unsupported format: %s."
-msgstr "Formato non soportado."
+msgstr "Formato non soportado: %s."
 
 #. TRANS: Client error displayed requesting a deleted status.
 msgid "Status deleted."
@@ -1013,7 +995,7 @@ msgstr "Non se atopou ningún estado con esa ID."
 
 #. TRANS: Client error displayed when trying to delete a notice not using the Atom format.
 msgid "Can only delete using the Atom format."
-msgstr ""
+msgstr "Unicamente se pode borrar mediante o formato Atom."
 
 #. TRANS: Client error displayed when a user has no rights to delete notices of other users.
 #. TRANS: Error message displayed trying to delete a notice that was not made by the current user.
@@ -1034,26 +1016,25 @@ msgstr "O cliente debe proporcionar un parámetro de \"estado\" cun valor."
 #. TRANS: Client error displayed when the parameter "status" is missing.
 #. TRANS: %d is the maximum number of character for a notice.
 #. TRANS: Error message in incoming mail handler used when an incoming e-mail contains too many characters.
-#, fuzzy, php-format
+#, php-format
 msgid "That's too long. Maximum notice size is %d character."
 msgid_plural "That's too long. Maximum notice size is %d characters."
 msgstr[0] "Iso é longo de máis. A nota non pode exceder os %d caracteres."
 msgstr[1] "Iso é longo de máis. A nota non pode exceder os %d caracteres."
 
 #. TRANS: Client error displayed when replying to a non-existing notice.
-#, fuzzy
 msgid "Parent notice not found."
-msgstr "Non se atopou o método da API."
+msgstr "Non se atopou a nota pai."
 
 #. TRANS: Client error displayed exceeding the maximum notice length.
 #. TRANS: %d is the maximum lenth for a notice.
 #. TRANS: Client error displayed exceeding the maximum notice length.
 #. TRANS: %d is the maximum length for a notice.
-#, fuzzy, php-format
+#, php-format
 msgid "Maximum notice size is %d character, including attachment URL."
 msgid_plural "Maximum notice size is %d characters, including attachment URL."
 msgstr[0] ""
-"A lonxitude máxima das notas é de %d caracteres, incluído o URL do dato "
+"A lonxitude máxima das notas é de %d carácter, incluído o URL do dato "
 "adxunto."
 msgstr[1] ""
 "A lonxitude máxima das notas é de %d caracteres, incluído o URL do dato "
@@ -1073,15 +1054,15 @@ msgstr "%1$s / Favoritos de %2$s"
 #. TRANS: Subtitle for timeline of most recent favourite notices by a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user's full name,
 #. TRANS: %3$s is a user nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s updates favorited by %2$s / %3$s."
-msgstr "%1$s actualizacións marcadas como favoritas por %2$s / %2$s."
+msgstr "Actualizacións de %1$s marcadas como favoritas por %2$s / %3$s."
 
 #. TRANS: Server error displayed whe trying to get a timeline fails.
 #. TRANS: %s is the error message.
-#, fuzzy, php-format
+#, php-format
 msgid "Could not generate feed for list - %s"
-msgstr "Non se puido crear un pase de sesión para %s"
+msgstr "Non se puido crear unha fonte de novas para a lista: %s"
 
 #. TRANS: Title for timeline of most recent mentions of a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user nickname.
@@ -1108,9 +1089,8 @@ msgid "%s updates from everyone!"
 msgstr "%s actualizacións de todos!"
 
 #. TRANS: Server error displayed calling unimplemented API method for 'retweeted by me'.
-#, fuzzy
 msgid "Unimplemented."
-msgstr "Aínda non se implantou o método."
+msgstr "Non implantado."
 
 #. TRANS: Title for Atom feed "repeated to me". %s is the user nickname.
 #, php-format
@@ -1119,9 +1099,9 @@ msgstr "Repetiu a %s"
 
 #. TRANS: Subtitle for API action that shows most recent notices that are repeats in user's inbox.
 #. TRANS: %1$s is the sitename, %2$s is a user nickname, %3$s is a user profile name.
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s notices that were to repeated to %2$s / %3$s."
-msgstr "%1$s actualizacións que responden a actualizacións de %2$s / %3$s."
+msgstr "Notas de %1$s que foron repetidas a %2$s / %3$s."
 
 #. TRANS: Title of list of repeated notices of the logged in user.
 #. TRANS: %s is the nickname of the logged in user.
@@ -1131,9 +1111,9 @@ msgstr "Repeticións de %s"
 
 #. TRANS: Subtitle of API time with retweets of me.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is the user nickname, %3$s is the user profile name.
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s notices that %2$s / %3$s has repeated."
-msgstr "%1$s marcou a nota %2$s como favorita"
+msgstr "Notas de %1$s que %2$s / %3$s repetiu."
 
 #. TRANS: Title for timeline with lastest notices with a given tag.
 #. TRANS: %s is the tag.
@@ -1152,25 +1132,24 @@ msgid "Updates tagged with %1$s on %2$s!"
 msgstr "Actualizacións etiquetadas con %1$s en %2$s!"
 
 #. TRANS: Client error displayed trying to add a notice to another user's timeline.
-#, fuzzy
 msgid "Only the user can add to their own timeline."
-msgstr "Só o usuario pode ler as súas caixas de entrada."
+msgstr "Só o usuario pode engadir elementos á súa liña do tempo."
 
 #. TRANS: Client error displayed when using another format than AtomPub.
 msgid "Only accept AtomPub for Atom feeds."
-msgstr ""
+msgstr "Aceptar unicamente AtomPub para as fontes de novas Atom."
 
 #. TRANS: Client error displayed attempting to post an empty API notice.
 msgid "Atom post must not be empty."
-msgstr ""
+msgstr "A mensaxe de Atom non pode estar baleira."
 
 #. TRANS: Client error displayed attempting to post an API that is not well-formed XML.
 msgid "Atom post must be well-formed XML."
-msgstr ""
+msgstr "A mensaxe de Atom debe estar en formato XML."
 
 #. TRANS: Client error displayed when not using an Atom entry.
 msgid "Atom post must be an Atom entry."
-msgstr ""
+msgstr "A publicación do Atom debe ser unha entrada de Atom."
 
 #. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
 msgid "Can only handle POST activities."
@@ -1180,28 +1159,27 @@ msgstr "Só pode manexar actividades POST."
 #. TRANS: %s is the unsupported activity object type.
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
-msgstr ""
+msgstr "Non se pode manexar o obxecto de actividade do tipo \"%s\"."
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
 #. TRANS: %d is the notice ID (number).
-#, fuzzy, php-format
+#, php-format
 msgid "No content for notice %d."
-msgstr "Buscar nos contidos das notas"
+msgstr "A nota %d non ten ningún contido."
 
 #. TRANS: Client error displayed when using another format than AtomPub.
 #. TRANS: %s is the notice URI.
-#, fuzzy, php-format
+#, php-format
 msgid "Notice with URI \"%s\" already exists."
-msgstr "Non hai ningunha nota con esa id."
+msgstr "Xa existe a nota co URI \"%s\"."
 
 #. TRANS: Server error for unfinished API method showTrends.
 msgid "API method under construction."
 msgstr "Método API en desenvolvemento."
 
 #. TRANS: Client error displayed when requesting user information for a non-existing user.
-#, fuzzy
 msgid "User not found."
-msgstr "Non se atopou o método da API."
+msgstr "Non se atopou o usuario."
 
 #. TRANS: Client error displayed when trying to leave a group while not logged in.
 msgid "You must be logged in to leave a group."
@@ -1222,12 +1200,9 @@ msgstr "Ten que identificarse para deixar un grupo."
 #. TRANS: Client error displayed when requesting Friends of a Friend feed for a nickname that is not a group.
 #. TRANS: Client error displayed trying to block a user from a group while specifying a non-existing group.
 #. TRANS: Client error displayed referring to a group's permalink for a non-existing group ID.
-#. TRANS: Client error displayed trying to change group design settings while providing a nickname for a non-existing group.
 #. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
 #. TRANS: Client error displayed when trying to view group members for a non-existing group.
 #. TRANS: Client error displayed when trying to view group members for an object that is not a group.
-#. TRANS: Client error displayed when trying to view group members for a non-existing group.
-#. TRANS: Client error displayed when trying to view group members for an object that is not a group.
 #. TRANS: Client error displayed when requesting a group RSS feed for group that does not exist.
 #. TRANS: Client error displayed when requesting a group RSS feed for an object that is not a group.
 #. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
@@ -1236,10 +1211,10 @@ msgstr "Ten que identificarse para deixar un grupo."
 #. TRANS: Client error displayed when trying to leave a non-local group.
 #. TRANS: Client error displayed when trying to leave a non-existing group.
 #. TRANS: Client error displayed when providing an invalid group ID on the Make Admin page.
-#. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
-#. TRANS: Client error displayed if no local group with a given name was found requesting group page.
 #. TRANS: Command exception text shown when a group is requested that does not exist.
 #. TRANS: Error text shown when trying to leave a group that does not exist.
+#. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
+#. TRANS: Client error displayed if no local group with a given name was found requesting group page.
 msgid "No such group."
 msgstr "Non existe tal grupo."
 
@@ -1252,219 +1227,207 @@ msgstr "Nin alcume nin ID."
 
 #. TRANS: Client error displayed trying to approve group membership while not logged in.
 #. TRANS: Client error displayed when trying to leave a group while not logged in.
-#, fuzzy
 msgid "Must be logged in."
-msgstr "Non iniciou sesión."
+msgstr "Cómpre acceder ao sistema."
 
 #. TRANS: Client error displayed trying to approve group membership while not a group administrator.
 #. TRANS: Client error displayed when trying to approve or cancel a group join request without
 #. TRANS: being a group administrator.
 msgid "Only group admin can approve or cancel join requests."
 msgstr ""
+"Soamente os administradores do grupo poden aprobar ou rexeitar solicitudes "
+"de ingreso."
 
 #. TRANS: Client error displayed trying to approve group membership without specifying a profile to approve.
 #. TRANS: Client error displayed trying to approve subscriptionswithout specifying a profile to approve.
-#, fuzzy
 msgid "Must specify a profile."
-msgstr "Falta o perfil de usuario."
+msgstr "Cómpre especificar un perfil."
 
 #. TRANS: Client error displayed trying to approve group membership for a non-existing request.
 #. TRANS: %s is a nickname.
 #. TRANS: Client error displayed when trying to approve a non-existing group join request.
 #. TRANS: %s is a user nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "%s is not in the moderation queue for this group."
-msgstr "Unha lista dos usuarios pertencentes a este grupo."
+msgstr "%s non está na lista de moderación deste grupo."
 
 #. TRANS: Client error displayed trying to approve/deny group membership.
 #. TRANS: Client error displayed trying to approve/deny subscription.
 msgid "Internal error: received neither cancel nor abort."
-msgstr ""
+msgstr "Erro interno: Non se recibiu orde de rexeitar nin de abortar."
 
 #. TRANS: Client error displayed trying to approve/deny group membership.
 #. TRANS: Client error displayed trying to approve/deny  subscription
 msgid "Internal error: received both cancel and abort."
-msgstr ""
+msgstr "Erro interno: Recibiuse orde de rexeitar e de abortar."
 
 #. TRANS: Server error displayed when cancelling a queued group join request fails.
 #. TRANS: %1$s is the leaving user's nickname, $2$s is the group nickname for which the leave failed.
-#, fuzzy, php-format
+#, php-format
 msgid "Could not cancel request for user %1$s to join group %2$s."
-msgstr "O usuario %1$s non se puido engadir ao grupo %2$s."
+msgstr ""
+"Non se puido rexeitar a solicitude do usuario %1$s de unirse ao grupo %2$s."
 
 #. TRANS: Title for leave group page after group join request is approved/disapproved.
 #. TRANS: %1$s is the user nickname, %2$s is the group nickname.
-#, fuzzy, php-format
+#, php-format
 msgctxt "TITLE"
 msgid "%1$s's request for %2$s"
-msgstr "Estado de %1$s en %2$s"
+msgstr "Solicitude de %1$s en %2$s"
 
 #. TRANS: Message on page for group admin after approving a join request.
 msgid "Join request approved."
-msgstr ""
+msgstr "Solicitude de ingreso aprobada."
 
 #. TRANS: Message on page for group admin after rejecting a join request.
 msgid "Join request canceled."
-msgstr ""
+msgstr "Solicitude de ingreso rexeitada."
 
 #. TRANS: Client error displayed trying to approve subscription for a non-existing request.
-#, fuzzy, php-format
+#. TRANS: %s is a user nickname.
+#, php-format
 msgid "%s is not in the moderation queue for your subscriptions."
-msgstr "Unha lista dos usuarios pertencentes a este grupo."
+msgstr "%s non está na lista de moderación das súas subscricións."
 
 #. TRANS: Server error displayed when cancelling a queued subscription request fails.
 #. TRANS: %1$s is the leaving user's nickname, $2$s is the nickname for which the leave failed.
-#, fuzzy, php-format
+#, php-format
 msgid "Could not cancel or approve request for user %1$s to join group %2$s."
-msgstr "O usuario %1$s non se puido engadir ao grupo %2$s."
+msgstr ""
+"Non se puido rexeitar ou aprobar a solicitude do usuario %1$s de unirse ao "
+"grupo %2$s."
 
 #. TRANS: Title for subscription approval ajax return
 #. TRANS: %1$s is the approved user's nickname
-#, fuzzy, php-format
+#, php-format
 msgctxt "TITLE"
 msgid "%1$s's request"
-msgstr "Estado de %1$s en %2$s"
+msgstr "Solicitude de %1$s"
 
 #. TRANS: Message on page for user after approving a subscription request.
-#, fuzzy
 msgid "Subscription approved."
-msgstr "Autorizouse a subscrición"
+msgstr "Aprobouse a subscrición."
 
 #. TRANS: Message on page for user after rejecting a subscription request.
-#, fuzzy
 msgid "Subscription canceled."
-msgstr "Autorización cancelada."
+msgstr "Rexeitouse a subscrición."
 
 #. TRANS: Subtitle for Atom favorites feed.
 #. TRANS: %1$s is a user nickname, %2$s is the StatusNet sitename.
-#, fuzzy, php-format
+#, php-format
 msgid "Notices %1$s has favorited on %2$s"
-msgstr "Actualizacións de %1$s e amigos en %2$s!"
+msgstr "Notas que %1$s marcou como favoritas en %2$s!"
 
 #. TRANS: Client exception thrown when trying to set a favorite for another user.
 #. TRANS: Client exception thrown when trying to subscribe another user.
-#, fuzzy
 msgid "Cannot add someone else's subscription."
-msgstr "Non se puido inserir unha subscrición nova."
+msgstr "Non pode engadir unha subscrición a outra persoa."
 
 #. TRANS: Client exception thrown when trying use an incorrect activity verb for the Atom pub method.
-#, fuzzy
 msgid "Can only handle favorite activities."
-msgstr "Buscar nos contidos das notas"
+msgstr "Só pode manexar actividades de favoritos."
 
 #. TRANS: Client exception thrown when trying favorite an object that is not a notice.
-#, fuzzy
 msgid "Can only fave notices."
-msgstr "Buscar nos contidos das notas"
+msgstr "Só pode engadir notas aos favoritos."
 
 #. TRANS: Client exception thrown when trying favorite a notice without content.
-#, fuzzy
 msgid "Unknown notice."
-msgstr "Descoñecida"
+msgstr "Nota descoñecida."
 
 #. TRANS: Client exception thrown when trying favorite an already favorited notice.
-#, fuzzy
 msgid "Already a favorite."
-msgstr "Engadir aos favoritos"
+msgstr "Xa está nos favoritos."
 
 #. TRANS: Title for group membership feed.
 #. TRANS: %s is a username.
-#, fuzzy, php-format
+#, php-format
 msgid "Group memberships of %s"
-msgstr "Membros do grupo %s"
+msgstr "Grupos aos que pertence %s"
 
 #. TRANS: Subtitle for group membership feed.
 #. TRANS: %1$s is a username, %2$s is the StatusNet sitename.
-#, fuzzy, php-format
+#, php-format
 msgid "Groups %1$s is a member of on %2$s"
-msgstr "Grupos aos que pertence %s"
+msgstr "Grupos aos que pertence %1$s en %2$s"
 
 #. TRANS: Client exception thrown when trying subscribe someone else to a group.
-#, fuzzy
 msgid "Cannot add someone else's membership."
-msgstr "Non se puido inserir unha subscrición nova."
+msgstr "Non pode meter no grupo a outra persoa."
 
 #. TRANS: Client error displayed when not using the join verb.
-#, fuzzy
 msgid "Can only handle join activities."
-msgstr "Buscar nos contidos das notas"
+msgstr "Só pode manexar actividades de ingreso."
 
 #. TRANS: Client exception thrown when trying to subscribe to a non-existing group.
-#, fuzzy
 msgid "Unknown group."
-msgstr "Descoñecida"
+msgstr "Grupo descoñecido."
 
 #. TRANS: Client exception thrown when trying to subscribe to an already subscribed group.
-#, fuzzy
 msgid "Already a member."
-msgstr "Todos os membros"
+msgstr "Xa é membro."
 
 #. TRANS: Client exception thrown when trying to subscribe to group while blocked from that group.
 msgid "Blocked by admin."
-msgstr ""
+msgstr "Bloqueado polo administrador."
 
 #. TRANS: Client exception thrown when referencing a non-existing favorite.
-#, fuzzy
 msgid "No such favorite."
-msgstr "Non existe tal ficheiro."
+msgstr "Non existe tal favorito."
 
 #. TRANS: Client exception thrown when trying to remove a favorite notice of another user.
-#, fuzzy
 msgid "Cannot delete someone else's favorite."
-msgstr "Non se puido eliminar o favorito."
+msgstr "Non pode borrar o favorito doutra persoa."
 
 #. TRANS: Client exception thrown when trying to show membership of a non-subscribed group
-#, fuzzy
 msgid "Not a member."
-msgstr "Todos os membros"
+msgstr "Non é membro."
 
 #. TRANS: Client exception thrown when deleting someone else's membership.
-#, fuzzy
 msgid "Cannot delete someone else's membership."
-msgstr "Non se puido borrar a subscrición a si mesmo."
+msgstr "Non pode quitar do grupo a outra persoa."
 
 #. TRANS: Client exception thrown when trying to display a subscription for a non-existing profile ID.
 #. TRANS: %d is the non-existing profile ID number.
-#, fuzzy, php-format
+#, php-format
 msgid "No such profile id: %d."
-msgstr "Non existe ese perfil."
+msgstr "Non existe perfil ningún co identificador: %d."
 
 #. TRANS: Client exception thrown when trying to display a subscription for a non-subscribed profile ID.
 #. TRANS: %1$d is the non-existing subscriber ID number, $2$d is the ID of the profile that was not subscribed to.
-#, fuzzy, php-format
+#, php-format
 msgid "Profile %1$d not subscribed to profile %2$d."
-msgstr "Non está subscrito a ese perfil."
+msgstr "O perfil %1$d non está subscrito ao perfil %2$d."
 
 #. TRANS: Client exception thrown when trying to delete a subscription of another user.
-#, fuzzy
 msgid "Cannot delete someone else's subscription."
-msgstr "Non se puido borrar a subscrición a si mesmo."
+msgstr "Non pode borrar a subscrición doutra persoa."
 
 #. TRANS: Subtitle for Atom subscription feed.
 #. TRANS: %1$s is a user nickname, %s$s is the StatusNet sitename.
-#, fuzzy, php-format
+#, php-format
 msgid "People %1$s has subscribed to on %2$s"
-msgstr "Persoas subscritas a %s"
+msgstr "Persoas ás que %1$s está subscrito en %2$s"
 
 #. TRANS: Client error displayed when not using the follow verb.
 msgid "Can only handle Follow activities."
-msgstr ""
+msgstr "Só pode manexar actividades de seguimento."
 
 #. TRANS: Client exception thrown when subscribing to an object that is not a person.
 msgid "Can only follow people."
-msgstr ""
+msgstr "Só pode seguir xente."
 
 #. TRANS: Client exception thrown when subscribing to a non-existing profile.
 #. TRANS: %s is the unknown profile ID.
-#, fuzzy, php-format
+#, php-format
 msgid "Unknown profile %s."
-msgstr "Non se coñece o tipo de ficheiro"
+msgstr "Perfil descoñecido %s."
 
 #. TRANS: Client error displayed trying to subscribe to an already subscribed profile.
 #. TRANS: %s is the profile the user already has a subscription on.
-#, fuzzy, php-format
+#, php-format
 msgid "Already subscribed to %s."
-msgstr "Xa está subscrito!"
+msgstr "Xa está subscrito a %s."
 
 #. TRANS: Client error displayed trying to get a non-existing attachment.
 msgid "No such attachment."
@@ -1473,7 +1436,6 @@ msgstr "Non existe tal dato adxunto."
 #. TRANS: Client error displayed trying to get an avatar without providing a nickname.
 #. TRANS: Client error displayed when requesting a list of blocked users for a group without providing a group nickname.
 #. TRANS: Client error displayed trying to edit a group while not proving a nickname for the group to edit.
-#. TRANS: Client error displayed trying to change group design settings without providing a group nickname.
 #. TRANS: Client error displayed when trying to change group logo settings without providing a nickname.
 #. TRANS: Client error displayed when trying to view group members without providing a group nickname.
 #. TRANS: Client error displayed when requesting a group RSS feed without providing a group nickname.
@@ -1546,9 +1508,8 @@ msgid "No file uploaded."
 msgstr "Non se subiu ficheiro ningún."
 
 #. TRANS: Avatar upload form instruction after uploading a file.
-#, fuzzy
 msgid "Pick a square area of the image to be your avatar."
-msgstr "Escolla unha zona cadrada da imaxe para usala como avatar"
+msgstr "Escolla unha zona cadrada da imaxe para usala como avatar."
 
 #. TRANS: Server error displayed if an avatar upload went wrong somehow server side.
 #. TRANS: Server error displayed trying to crop an uploaded group logo that is no longer present.
@@ -1570,16 +1531,17 @@ msgstr "Borrouse o avatar."
 #. TRANS: Title for backup account page.
 #. TRANS: Option in profile settings to create a backup of the account of the currently logged in user.
 msgid "Backup account"
-msgstr ""
+msgstr "Copia de seguridade da conta"
 
 #. TRANS: Client exception thrown when trying to backup an account while not logged in.
-#, fuzzy
 msgid "Only logged-in users can backup their account."
-msgstr "Só os usuarios identificados poden repetir notas."
+msgstr ""
+"Só os usuarios identificados poden facer unha copia de seguridade da súa "
+"conta."
 
 #. TRANS: Client exception thrown when trying to backup an account without having backup rights.
 msgid "You may not backup your account."
-msgstr ""
+msgstr "Non pode facer unha copia de seguridade da súa conta."
 
 #. TRANS: Information displayed on the backup account page.
 msgid ""
@@ -1589,16 +1551,21 @@ msgid ""
 "addresses is not backed up. Additionally, uploaded files and direct messages "
 "are not backed up."
 msgstr ""
+"Pode facer unha copia de seguridade dos datos da súa conta en formato <a "
+"href=\"http://activitystrea.ms/\">Activity Streams</a>. Esta é unha "
+"característica experimental e proporciona unha copia incompleta; a "
+"información privada da conta como os enderezos de correo electrónico e "
+"mensaxería instantánea non se copian. Ademais, os ficheiros cargados e as "
+"mensaxes directas tampouco se gardan."
 
 #. TRANS: Submit button to backup an account on the backup account page.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Backup"
-msgstr "Fondo"
+msgstr "Copia de seguridade"
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
 msgid "Backup your account."
-msgstr ""
+msgstr "Copia de seguridade da súa conta."
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
 msgid "You already blocked that user."
@@ -1631,7 +1598,6 @@ msgid "No"
 msgstr "Non"
 
 #. TRANS: Submit button title for 'No' when blocking a user.
-#, fuzzy
 msgid "Do not block this user."
 msgstr "Non bloquear este usuario"
 
@@ -1647,9 +1613,8 @@ msgid "Yes"
 msgstr "Si"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
-#, fuzzy
 msgid "Block this user."
-msgstr "Bloquear este usuario"
+msgstr "Bloquear este usuario."
 
 #. TRANS: Server error displayed when blocking a user fails.
 msgid "Failed to save block information."
@@ -1694,7 +1659,7 @@ msgstr "Publicar en %s"
 #. TRANS: Title for leave group page after leaving.
 #. TRANS: %s$s is the leaving user's name, %2$s is the group name.
 #. TRANS: Title for leave group page after leaving.
-#, fuzzy, php-format
+#, php-format
 msgctxt "TITLE"
 msgid "%1$s left group %2$s"
 msgstr "%1$s deixou o grupo %2$s"
@@ -1713,10 +1678,9 @@ msgstr "� solicitude fáltalle o ID do perfil."
 #. TRANS: Client error displayed when trying to unsubscribe while providing a non-existing profile ID.
 #. TRANS: Client error displayed when trying to change user options without specifying an existing user to work on.
 msgid "No profile with that ID."
-msgstr "Ningún perfil ten esa ID."
+msgstr "Non hai ningún perfil con ese ID."
 
 #. TRANS: Title after unsubscribing from a group.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Unsubscribed"
 msgstr "Cancelouse a subscrición"
@@ -1745,20 +1709,17 @@ msgstr "Ese enderezo xa se confirmou."
 
 #. TRANS: Server error displayed when updating IM preferences fails.
 #. TRANS: Server error thrown on database error removing a registered IM address.
-#, fuzzy
 msgid "Could not update user IM preferences."
-msgstr "Non se puido actualizar o rexistro do usuario."
+msgstr "Non se puideron actualizar as preferencias de mensaxería instantánea."
 
 #. TRANS: Server error displayed when adding IM preferences fails.
-#, fuzzy
 msgid "Could not insert user IM preferences."
-msgstr "Non se puido inserir unha subscrición nova."
+msgstr "Non se puideron inserir as preferencias de mensaxería instantánea."
 
 #. TRANS: Server error displayed when an address confirmation code deletion from the
 #. TRANS: database fails in the contact address confirmation action.
-#, fuzzy
 msgid "Could not delete address confirmation."
-msgstr "Non se puido borrar a confirmación por mensaxería instantánea."
+msgstr "Non se puido borrar a confirmación do enderezo."
 
 #. TRANS: Title for the contact address confirmation action.
 msgid "Confirm address"
@@ -1774,22 +1735,29 @@ msgstr "Confirmouse o enderezo \"%s\" para a súa conta."
 msgid "Conversation"
 msgstr "Conversa"
 
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+msgid "Conversation feed (Activity Streams JSON)"
+msgstr "Fonte de novas da conversa (fluxos de actividade JSON)"
+
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+msgid "Conversation feed (RSS 2.0)"
+msgstr "Fonte de novas da conversa (RSS 2.0)"
+
 #. TRANS: Title for conversation page.
 #. TRANS: Title for page that shows a notice.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Notice"
-msgstr "Notas"
+msgstr "Nota"
 
 #. TRANS: Client exception displayed trying to delete a user account while not logged in.
-#, fuzzy
 msgid "Only logged-in users can delete their account."
-msgstr "Só os usuarios identificados poden repetir notas."
+msgstr "Só os usuarios identificados poden borrar a súa conta."
 
 #. TRANS: Client exception displayed trying to delete a user account without have the rights to do that.
-#, fuzzy
 msgid "You cannot delete your account."
-msgstr "Non pode borrar usuarios."
+msgstr "Non pode borrar a súa conta."
 
 #. TRANS: Confirmation text for user deletion. The user has to type this exactly the same, including punctuation.
 msgid "I am sure."
@@ -1799,24 +1767,24 @@ msgstr "Estou seguro."
 #. TRANS: %s is the text that needs to be input.
 #, php-format
 msgid "You must write \"%s\" exactly in the box."
-msgstr ""
+msgstr "Debe escribir exactamente \"%s\" na caixa."
 
 #. TRANS: Confirmation that a user account has been deleted.
-#, fuzzy
 msgid "Account deleted."
-msgstr "Borrouse o avatar."
+msgstr "Conta borrada."
 
 #. TRANS: Page title for page on which a user account can be deleted.
 #. TRANS: Option in profile settings to delete the account of the currently logged in user.
-#, fuzzy
 msgid "Delete account"
-msgstr "Crear unha conta"
+msgstr "Borrar a conta"
 
 #. TRANS: Form text for user deletion form.
 msgid ""
 "This will <strong>permanently delete</strong> your account data from this "
 "server."
 msgstr ""
+"Isto <strong>borrará permanentemente</strong> os datos da súa conta do "
+"servidor."
 
 #. TRANS: Additional form text for user deletion form shown if a user has account backup rights.
 #. TRANS: %s is a URL to the backup page.
@@ -1825,6 +1793,8 @@ msgid ""
 "You are strongly advised to <a href=\"%s\">back up your data</a> before "
 "deletion."
 msgstr ""
+"Recoméndase encarecidamente que faga unha <a href=\"%s\">copia de seguridade "
+"dos datos</a> antes da eliminación."
 
 #. TRANS: Field label for delete account confirmation entry.
 #. TRANS: Field label for password reset form where the password has to be typed again.
@@ -1833,14 +1803,13 @@ msgstr "Confirmar"
 
 #. TRANS: Input title for the delete account field.
 #. TRANS: %s is the text that needs to be input.
-#, fuzzy, php-format
+#, php-format
 msgid "Enter \"%s\" to confirm that you want to delete your account."
-msgstr "Non pode borrar usuarios."
+msgstr "Insira \"%s\" para confirmar que quere borrar a conta."
 
 #. TRANS: Button title for user account deletion.
-#, fuzzy
-msgid "Permanently delete your account"
-msgstr "Non pode borrar usuarios."
+msgid "Permanently delete your account."
+msgstr "Borrar permanentemente a conta."
 
 #. TRANS: Client error displayed trying to delete an application while not logged in.
 msgid "You must be logged in to delete an application."
@@ -1877,36 +1846,32 @@ msgstr ""
 "usuario existentes."
 
 #. TRANS: Submit button title for 'No' when deleting an application.
-#, fuzzy
 msgid "Do not delete this application."
-msgstr "Non borrar a aplicación"
+msgstr "Non borrar a aplicación."
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
-#, fuzzy
 msgid "Delete this application."
-msgstr "Borrar a aplicación"
+msgstr "Borrar a aplicación."
 
 #. TRANS: Client error when trying to delete group while not logged in.
-#, fuzzy
 msgid "You must be logged in to delete a group."
-msgstr "Ten que identificarse para deixar un grupo."
+msgstr "Ten que identificarse para borrar un grupo."
 
 #. TRANS: Client error when trying to delete a group without having the rights to delete it.
-#, fuzzy
 msgid "You are not allowed to delete this group."
-msgstr "Vostede non pertence a este grupo."
+msgstr "Non lle está permitido borrar este grupo."
 
 #. TRANS: Server error displayed if a group could not be deleted.
 #. TRANS: %s is the name of the group that could not be deleted.
-#, fuzzy, php-format
+#, php-format
 msgid "Could not delete group %s."
-msgstr "Non se puido actualizar o grupo."
+msgstr "Non se puido borrar o grupo %s."
 
 #. TRANS: Message given after deleting a group.
 #. TRANS: %s is the deleted group's name.
-#, fuzzy, php-format
+#, php-format
 msgid "Deleted group %s"
-msgstr "%1$s deixou o grupo %2$s"
+msgstr "Borrouse o grupo %s"
 
 #. TRANS: Title of delete group page.
 #. TRANS: Form legend for deleting a group.
@@ -1914,24 +1879,22 @@ msgid "Delete group"
 msgstr "Borrar un grupo"
 
 #. TRANS: Warning in form for deleleting a group.
-#, fuzzy
 msgid ""
 "Are you sure you want to delete this group? This will clear all data about "
 "the group from the database, without a backup. Public posts to this group "
 "will still appear in individual timelines."
 msgstr ""
-"Está seguro de querer borrar este usuario? Isto borrará todos os datos do "
-"usuario da base de datos, sen posibilidade de recuperalos."
+"Está seguro de querer borrar este grupo? Isto borrará todos os datos do "
+"grupo da base de datos, sen posibilidade de recuperalos. As mensaxes "
+"públicas deste grupo seguirán aparecendo nas liñas do tempo individuais."
 
 #. TRANS: Submit button title for 'No' when deleting a group.
-#, fuzzy
 msgid "Do not delete this group."
-msgstr "Non borrar esta nota"
+msgstr "Non borrar este grupo."
 
 #. TRANS: Submit button title for 'Yes' when deleting a group.
-#, fuzzy
 msgid "Delete this group."
-msgstr "Borrar o usuario"
+msgstr "Borrar o grupo."
 
 #. TRANS: Instructions for deleting a notice.
 msgid ""
@@ -1955,9 +1918,8 @@ msgid "Do not delete this notice."
 msgstr "Non borrar esta nota."
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#, fuzzy
 msgid "Delete this notice."
-msgstr "Borrar esta nota"
+msgstr "Borrar esta nota."
 
 #. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
 msgid "You cannot delete users."
@@ -1968,7 +1930,6 @@ msgid "You can only delete local users."
 msgstr "Só pode borrar usuarios locais."
 
 #. TRANS: Title of delete user page.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Delete user"
 msgstr "Borrar o usuario"
@@ -1986,166 +1947,12 @@ msgstr ""
 "usuario da base de datos, sen posibilidade de recuperalos."
 
 #. TRANS: Submit button title for 'No' when deleting a user.
-#, fuzzy
 msgid "Do not delete this user."
-msgstr "Non borrar esta nota"
+msgstr "Non borrar este usuario."
 
 #. TRANS: Submit button title for 'Yes' when deleting a user.
-#, fuzzy
 msgid "Delete this user."
-msgstr "Borrar o usuario"
-
-#. TRANS: Message used as title for design settings for the site.
-msgid "Design"
-msgstr "Deseño"
-
-#. TRANS: Instructions for design adminsitration panel.
-msgid "Design settings for this StatusNet site"
-msgstr "Configuración de deseño para este sitio StatusNet"
-
-#. TRANS: Client error displayed when a logo URL does is not valid.
-msgid "Invalid logo URL."
-msgstr "URL do logo incorrecto."
-
-#. TRANS: Client error displayed when an SSL logo URL is invalid.
-#, fuzzy
-msgid "Invalid SSL logo URL."
-msgstr "URL do logo incorrecto."
-
-#. TRANS: Client error displayed when a theme is submitted through the form that is not in the theme list.
-#. TRANS: %s is the chosen unavailable theme.
-#, php-format
-msgid "Theme not available: %s."
-msgstr "O tema visual non está dispoñible: %s."
-
-#. TRANS: Fieldset legend for form to change logo.
-msgid "Change logo"
-msgstr "Cambiar o logo"
-
-#. TRANS: Field label for StatusNet site logo.
-msgid "Site logo"
-msgstr "Logo do sitio"
-
-#. TRANS: Field label for SSL StatusNet site logo.
-#, fuzzy
-msgid "SSL logo"
-msgstr "Logo do sitio"
-
-#. TRANS: Fieldset legend for form change StatusNet site's theme.
-msgid "Change theme"
-msgstr "Cambiar o tema visual"
-
-#. TRANS: Field label for dropdown to choose site theme.
-msgid "Site theme"
-msgstr "Tema visual do sitio"
-
-#. TRANS: Title for field label for dropdown to choose site theme.
-msgid "Theme for the site."
-msgstr "Tema visual para o sitio."
-
-#. TRANS: Field label for uploading a cutom theme.
-msgid "Custom theme"
-msgstr "Tema visual personalizado"
-
-#. TRANS: Form instructions for uploading a cutom StatusNet theme.
-msgid "You can upload a custom StatusNet theme as a .ZIP archive."
-msgstr ""
-"Pode cargar como arquivo .ZIP un tema visual personalizado para StatusNet"
-
-#. TRANS: Fieldset legend for theme background image.
-msgid "Change background image"
-msgstr "Cambiar a imaxe de fondo"
-
-#. TRANS: Field label for background image on theme designer page.
-#. TRANS: Field label for background color selector.
-#. TRANS: Label on profile design page for setting a profile page background colour.
-msgid "Background"
-msgstr "Fondo"
-
-#. TRANS: Form guide for background image upload form on theme designer page.
-#, php-format
-msgid ""
-"You can upload a background image for the site. The maximum file size is %1"
-"$s."
-msgstr ""
-"Pode cargar unha imaxe de fondo para o sitio. O tamaño máximo para o "
-"ficheiro é de %1$s."
-
-#. TRANS: Used as radio button label to add a background image.
-msgid "On"
-msgstr "Activado"
-
-#. TRANS: Used as radio button label to not add a background image.
-msgid "Off"
-msgstr "Desactivado"
-
-#. TRANS: Form guide for turning background image on or off on theme designer page.
-#. TRANS: Form guide for a set of radio buttons on the profile design page that will enable or disable
-#. TRANS: use of the uploaded profile image.
-msgid "Turn background image on or off."
-msgstr "Activar ou desactivar a imaxe de fondo."
-
-#. TRANS: Checkbox label to title background image on theme designer page.
-#. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
-msgid "Tile background image"
-msgstr "Imaxe de fondo en mosaico"
-
-#. TRANS: Fieldset legend for theme colors.
-#, fuzzy
-msgid "Change colors"
-msgstr "Cambiar as cores"
-
-#. TRANS: Field label for content color selector.
-#. TRANS: Label on profile design page for setting a profile page content colour.
-msgid "Content"
-msgstr "Contido"
-
-#. TRANS: Field label for sidebar color selector.
-#. TRANS: Label on profile design page for setting a profile page sidebar colour.
-msgid "Sidebar"
-msgstr "Barra lateral"
-
-#. TRANS: Field label for text color selector.
-#. TRANS: Label on profile design page for setting a profile page text colour.
-msgid "Text"
-msgstr "Texto"
-
-#. TRANS: Field label for link color selector.
-#. TRANS: Label on profile design page for setting a profile page links colour.
-msgid "Links"
-msgstr "Ligazóns"
-
-#. TRANS: Fieldset legend for advanced theme design settings.
-msgid "Advanced"
-msgstr "Avanzado"
-
-#. TRANS: Field label for custom CSS.
-msgid "Custom CSS"
-msgstr "CSS personalizado"
-
-#. TRANS: Button text for resetting theme settings.
-#, fuzzy
-msgctxt "BUTTON"
-msgid "Use defaults"
-msgstr "Utilizar os valores por defecto"
-
-#. TRANS: Title for button for resetting theme settings.
-#. TRANS: Title for button on profile design page to reset all colour settings to default.
-#, fuzzy
-msgid "Restore default designs."
-msgstr "Restaurar o deseño por defecto"
-
-#. TRANS: Title for button for resetting theme settings.
-#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#, fuzzy
-msgid "Reset back to default."
-msgstr "Volver ao deseño por defecto"
-
-#. TRANS: Title for button for saving theme settings.
-#. TRANS: Title for button on profile design page to save settings.
-#, fuzzy
-msgid "Save design."
-msgstr "Gardar o deseño"
+msgstr "Borrar o usuario."
 
 #. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
 msgid "This notice is not a favorite!"
@@ -2157,9 +1964,77 @@ msgstr "Engadir aos favoritos"
 
 #. TRANS: Client exception thrown when requesting a document from the documentation that does not exist.
 #. TRANS: %s is the non-existing document.
-#, fuzzy, php-format
+#, php-format
 msgid "No such document \"%s\"."
-msgstr "Non hai ningún documento \"%s\""
+msgstr "Non hai ningún documento \"%s\"."
+
+#. TRANS: Menu item in administrator navigation panel.
+#. TRANS: Menu item in default local navigation panel.
+#. TRANS: Menu item in personal group navigation menu.
+msgctxt "MENU"
+msgid "Home"
+msgstr "Inicio"
+
+msgctxt "MENU"
+msgid "Docs"
+msgstr "Documentos"
+
+#. TRANS: Secondary navigation menu item leading to help on StatusNet.
+msgctxt "MENU"
+msgid "Help"
+msgstr "Axuda"
+
+msgid "Getting started"
+msgstr "Primeiros pasos"
+
+#. TRANS: Secondary navigation menu item leading to text about StatusNet site.
+msgctxt "MENU"
+msgid "About"
+msgstr "Acerca de"
+
+msgid "About this site"
+msgstr "Acerca deste sitio"
+
+#. TRANS: Secondary navigation menu item leading to Frequently Asked Questions.
+msgctxt "MENU"
+msgid "FAQ"
+msgstr "Preguntas máis frecuentes"
+
+msgid "Frequently asked questions"
+msgstr "Preguntas máis frecuentes"
+
+#. TRANS: Secondary navigation menu item leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+msgctxt "MENU"
+msgid "Contact"
+msgstr "Contacto"
+
+msgid "Contact info"
+msgstr "Información de contacto"
+
+msgctxt "MENU"
+msgid "Tags"
+msgstr "Etiquetas"
+
+msgid "Using tags"
+msgstr "Uso de etiquetas"
+
+#. TRANS: Menu item in default local navigation panel.
+#. TRANS: Menu item in search group navigation panel.
+#. TRANS: Menu item in local navigation menu.
+msgctxt "MENU"
+msgid "Groups"
+msgstr "Grupos"
+
+msgid "Using groups"
+msgstr "Uso de grupos"
+
+msgctxt "MENU"
+msgid "API"
+msgstr "API"
+
+msgid "RESTful API"
+msgstr "API conforme a REST"
 
 #. TRANS: Title for "Edit application" form.
 #. TRANS: Form legend.
@@ -2186,7 +2061,6 @@ msgstr "Fai falla un nome."
 
 #. TRANS: Validation error shown when providing too long a name in the "Edit application" form.
 #. TRANS: Validation error shown when providing too long a name in the "New application" form.
-#, fuzzy
 msgid "Name is too long (maximum 255 characters)."
 msgstr "O nome é longo de máis (o límite é de 255 caracteres)."
 
@@ -2215,7 +2089,6 @@ msgid "Organization is required."
 msgstr "Fai falla unha organización."
 
 #. TRANS: Validation error shown when providing too long an arganisation name in the "Edit application" form.
-#, fuzzy
 msgid "Organization is too long (maximum 255 characters)."
 msgstr "A organización é longa de máis (o límite é de 255 caracteres)."
 
@@ -2247,7 +2120,7 @@ msgstr "Editar o grupo %s"
 #. TRANS: Client error displayed when trying to create a group while not logged in.
 #. TRANS: Client error displayed trying to create a group while not logged in.
 msgid "You must be logged in to create a group."
-msgstr "Ten que iniciar sesión para crear un grupo."
+msgstr "Ten que identificarse para crear un grupo."
 
 #. TRANS: Form instructions for group edit form.
 msgid "Use this form to edit the group."
@@ -2267,70 +2140,67 @@ msgstr "Gardáronse as preferencias."
 
 #. TRANS: Title for edit list page after deleting a tag.
 #. TRANS: %s is a list.
-#, fuzzy, php-format
+#, php-format
 msgid "Delete %s list"
-msgstr "Borrar o usuario"
+msgstr "Borrar a lista %s"
 
 #. TRANS: Title for edit list page.
 #. TRANS: %s is a list.
 #. TRANS: Form legend for list edit form.
 #. TRANS: %s is a list.
-#, fuzzy, php-format
+#, php-format
 msgid "Edit list %s"
-msgstr "A etiqueta de persoa non é correcta: %s."
+msgstr "Editar a lista %s"
 
 #. TRANS: Error message displayed when trying to perform an action that requires a tagging user or ID.
-#, fuzzy
 msgid "No tagger or ID."
-msgstr "Nin alcume nin ID."
+msgstr "Nin etiquetador nin ID."
 
 #. TRANS: Client error displayed when referring to non-local user.
-#, fuzzy
 msgid "Not a local user."
-msgstr "Non existe tal usuario."
+msgstr "Non é un usuario local."
 
 #. TRANS: Client error displayed when reting to edit a tag that was not self-created.
-#, fuzzy
 msgid "You must be the creator of the tag to edit it."
-msgstr "Ten que ser administrador para editar o grupo."
+msgstr "Ten que ser o creador da etiqueta para editala."
 
 #. TRANS: Form instruction for edit list form.
-#, fuzzy
 msgid "Use this form to edit the list."
-msgstr "Utilice este formulario para editar o grupo."
+msgstr "Utilice este formulario para editar a lista."
 
 #. TRANS: Form validation error displayed if the form data for deleting a tag was incorrect.
-#, fuzzy
 msgid "Delete aborted."
-msgstr "Borrar a nota"
+msgstr "Abortouse a eliminación."
 
 #. TRANS: Text in confirmation dialog for deleting a tag.
 msgid ""
 "Deleting this tag will permanantly remove all its subscription and "
 "membership records. Do you still want to continue?"
 msgstr ""
+"Borrar esta etiqueta eliminará permanentemente todas as subscricións e os "
+"rexistros de pertenza. Quere continuar?"
 
 #. TRANS: Form validation error displayed if a given tag is invalid.
-#, fuzzy
 msgid "Invalid tag."
-msgstr "Tamaño non válido."
+msgstr "Etiqueta non válida."
 
 #. TRANS: Form validation error displayed if a given tag is already present.
 #. TRANS: %s is the already present tag.
-#, fuzzy, php-format
+#, php-format
 msgid "You already have a tag named %s."
-msgstr "Xa repetiu esa nota."
+msgstr "Xa ten unha nota chamada %s."
 
 #. TRANS: Text in confirmation dialog for setting a tag from public to private.
 msgid ""
 "Setting a public tag as private will permanently remove all the existing "
 "subscriptions to it. Do you still want to continue?"
 msgstr ""
+"Definir unha etiqueta pública como privada eliminará permanentemente todas "
+"as subscricións a ela. Quere continuar?"
 
-#. TRANS: TRANS: Server error displayed when updating a list fails.
-#, fuzzy
+#. TRANS: Server error displayed when updating a list fails.
 msgid "Could not update list."
-msgstr "Non se puido actualizar o usuario."
+msgstr "Non se puido actualizar a lista."
 
 #. TRANS: Title for e-mail settings.
 msgid "Email settings"
@@ -2359,7 +2229,7 @@ msgstr "Enderezo de correo electrónico confirmado actualmente."
 #. TRANS: Button text to untag a profile.
 msgctxt "BUTTON"
 msgid "Remove"
-msgstr "Borrar"
+msgstr "Eliminar"
 
 #. TRANS: Form note in e-mail settings form.
 msgid ""
@@ -2412,6 +2282,8 @@ msgid ""
 "To send notices via email, we need to create a unique email address for you "
 "on this server:"
 msgstr ""
+"Para enviar notas mediante correo electrónico, necesitamos crear un enderezo "
+"de correo electrónico único para vostede neste servidor:"
 
 #. TRANS: Button label for adding an e-mail address to send notices from.
 #. TRANS: Button label for adding an SMS e-mail address to send notices from.
@@ -2460,9 +2332,8 @@ msgid "No email address."
 msgstr "Non hai enderezo de correo electrónico."
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
-#, fuzzy
 msgid "Cannot normalize that email address."
-msgstr "Non se pode normalizar ese enderezo de correo electrónico"
+msgstr "Non se pode normalizar ese enderezo de correo electrónico."
 
 #. TRANS: Message given saving e-mail address that not valid.
 #. TRANS: Form validation error displayed when trying to register without a valid e-mail address.
@@ -2481,7 +2352,6 @@ msgstr "Ese enderezo de correo electrónico xa pertence a outro usuario."
 #. TRANS: Server error thrown on database error adding e-mail confirmation code.
 #. TRANS: Server error thrown on database error adding Instant Messaging confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
-#, fuzzy
 msgid "Could not insert confirmation code."
 msgstr "Non se puido inserir o código de confirmación."
 
@@ -2505,9 +2375,8 @@ msgid "That is the wrong email address."
 msgstr "Ese enderezo de correo electrónico é incorrecto."
 
 #. TRANS: Server error thrown on database error canceling e-mail address confirmation.
-#, fuzzy
 msgid "Could not delete email confirmation."
-msgstr "Non se puido borrar a confirmación por correo electrónico."
+msgstr "Non se puido borrar a confirmación do correo electrónico."
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
 msgid "Email confirmation cancelled."
@@ -2529,7 +2398,6 @@ msgstr "Non hai ningún enderezo ao que enviar."
 #. TRANS: Server error thrown on database error removing incoming e-mail address.
 #. TRANS: Server error thrown on database error adding incoming e-mail address.
 #. TRANS: Server error displayed when the user could not be updated in SMS settings.
-#, fuzzy
 msgid "Could not update user record."
 msgstr "Non se puido actualizar o rexistro do usuario."
 
@@ -2548,9 +2416,8 @@ msgid "This notice is already a favorite!"
 msgstr "A nota xa é unha das súas favoritas!"
 
 #. TRANS: Page title for page on which favorite notices can be unfavourited.
-#, fuzzy
 msgid "Disfavor favorite."
-msgstr "Desmarcar como favorita"
+msgstr "Desmarcar como favorita."
 
 #. TRANS: Page title for first page of favorited notices.
 #. TRANS: Title for favourited notices section.
@@ -2619,9 +2486,9 @@ msgid "Featured users, page %d"
 msgstr "Usuarios do momento, páxina %d"
 
 #. TRANS: Description on page displaying featured users.
-#, fuzzy, php-format
+#, php-format
 msgid "A selection of some great users on %s."
-msgstr "Unha selección dalgúns bos usuarios en %s"
+msgstr "Unha selección dalgúns bos usuarios en %s."
 
 #. TRANS: Client error displayed when no notice ID was given trying do display a file.
 msgid "No notice ID."
@@ -2640,43 +2507,9 @@ msgstr "Non hai ningún dato adxunto."
 msgid "No uploaded attachments."
 msgstr "Non se cargou ningún dato adxunto."
 
-#. TRANS: Client error displayed when subscribing to a remote profile and an unexpected response is received.
-msgid "Not expecting this response!"
-msgstr "Non se esperaba esta resposta!"
-
-#. TRANS: Client error displayed when subscribing to a remote profile that does not exist.
-msgid "User being listened to does not exist."
-msgstr "Non existe o usuario ao que está seguindo."
-
-#. TRANS: Client error displayed when subscribing to a remote profile that is a local profile.
-#. TRANS: Client error displayed when using remote subscribe for a local entity.
-msgid "You can use the local subscription!"
-msgstr "Pode usar a subscrición local!"
-
-#. TRANS: Client error displayed when subscribing to a remote profile that is blocked form subscribing to.
-msgid "That user has blocked you from subscribing."
-msgstr "Ese usuario bloqueouno fronte á subscrición a el."
-
-#. TRANS: Client error displayed when subscribing to a remote profile without providing an authorised token.
-msgid "You are not authorized."
-msgstr "Non está autorizado."
-
-#. TRANS: Client error displayed when subscribing to a remote profile and conversion of the request token to access token fails.
-msgid "Could not convert request token to access token."
-msgstr "Non se puido converter a ficha da solicitude nun pase."
-
-#. TRANS: Client error displayed when subscribing to a remote profile fails because of an unsupported version of the OMB protocol.
-msgid "Remote service uses unknown version of OMB protocol."
-msgstr "O servizo remoto utiliza unha versión descoñecida do protocolo OMB."
-
-#. TRANS: Server error displayed when subscribing to a remote profile fails because the remote profile could not be updated.
-#. TRANS: Exception thrown when updating a remote profile fails in OAuth store.
-msgid "Error updating remote profile."
-msgstr "Houbo un erro ao actualizar o perfil remoto."
-
 #. TRANS: Client error displayed when requesting a non-existent file.
 msgid "No such file."
-msgstr "Non existe tal ficheiro."
+msgstr "Non existe ese ficheiro."
 
 #. TRANS: Client error displayed when requesting a file without having read access to it.
 msgid "Cannot read file."
@@ -2744,14 +2577,12 @@ msgstr ""
 "el no futuro."
 
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
-#, fuzzy
 msgid "Do not block this user from this group."
-msgstr "Non excluír deste grupo a este usuario"
+msgstr "Non excluír deste grupo a este usuario."
 
 #. TRANS: Submit button title for 'Yes' when blocking a user from a group.
-#, fuzzy
 msgid "Block this user from this group."
-msgstr "Excluír deste grupo a este usuario"
+msgstr "Excluír deste grupo a este usuario."
 
 #. TRANS: Server error displayed when trying to block a user from a group fails because of an application error.
 msgid "Database error blocking user from group."
@@ -2763,32 +2594,6 @@ msgstr "Houbo un erro na base de datos ao excluír do grupo ao usuario."
 msgid "No ID."
 msgstr "Sen ID."
 
-#. TRANS: Client error displayed trying to change group design settings while not logged in.
-msgid "You must be logged in to edit a group."
-msgstr "Ten que estar identificado para editar un grupo."
-
-#. TRANS: Title group design settings page.
-msgid "Group design"
-msgstr "Deseño do grupo"
-
-#. TRANS: Instructions for group design settings page.
-msgid ""
-"Customize the way your group looks with a background image and a colour "
-"palette of your choice."
-msgstr ""
-"Personaliza o aspecto do grupo cunha imaxe de fondo e unha paleta de cores "
-"da súa escolla."
-
-#. TRANS: Form validation error displayed when group design settings could not be updated because of an application issue.
-#, fuzzy
-msgid "Unable to update your design settings."
-msgstr "Non se puido gardar a súa configuración de deseño."
-
-#. TRANS: Form text to confirm saved group design settings.
-#. TRANS: Confirmation message on Profile design page when saving design settings has succeeded.
-msgid "Design preferences saved."
-msgstr "Gardáronse as preferencias de deseño."
-
 #. TRANS: Title for group logo settings page.
 #. TRANS: Group logo form legend.
 msgid "Group logo"
@@ -2841,24 +2646,24 @@ msgstr "Unha lista dos usuarios pertencentes a este grupo."
 
 #. TRANS: Client error displayed when trying to approve group applicants without being a group administrator.
 msgid "Only the group admin may approve users."
-msgstr ""
+msgstr "Só os administradores do grupo poden aprobar usuarios."
 
 #. TRANS: Title of the first page showing pending group members still awaiting approval to join the group.
 #. TRANS: %s is the name of the group.
-#, fuzzy, php-format
+#, php-format
 msgid "%s group members awaiting approval"
-msgstr "Membros do grupo %s"
+msgstr "Membros do grupo %s á espera de aprobación"
 
 #. TRANS: Title of all but the first page showing pending group members still awaiting approval to join the group.
 #. TRANS: %1$s is the name of the group, %2$d is the page number of the members list.
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s group members awaiting approval, page %2$d"
-msgstr "Membros do grupo %1$s, páxina %2$d"
+msgstr "Membros do grupo %1$s á espera de aprobación, páxina %2$d"
 
 #. TRANS: Page notice for group members page.
-#, fuzzy
 msgid "A list of users awaiting approval to join this group."
-msgstr "Unha lista dos usuarios pertencentes a este grupo."
+msgstr ""
+"Unha lista dos usuarios á espera de aprobación para ingresar neste grupo."
 
 #. TRANS: Message is used as link description. %1$s is a group name, %2$s is a site name.
 #, php-format
@@ -2866,14 +2671,13 @@ msgid "Updates from members of %1$s on %2$s!"
 msgstr "Actualizacións de membros de %1$s en %2$s!"
 
 #. TRANS: Title for first page of the groups list.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Groups"
 msgstr "Grupos"
 
 #. TRANS: Title for all but the first page of the groups list.
 #. TRANS: %d is the page number.
-#, fuzzy, php-format
+#, php-format
 msgctxt "TITLE"
 msgid "Groups, page %d"
 msgstr "Grupos, páxina %d"
@@ -2881,7 +2685,7 @@ msgstr "Grupos, páxina %d"
 #. TRANS: Page notice of group list. %%%%site.name%%%% is the StatusNet site name,
 #. TRANS: %%%%action.groupsearch%%%% and %%%%action.newgroup%%%% are URLs. Do not change them.
 #. TRANS: This message contains Markdown links in the form [link text](link).
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "%%%%site.name%%%% groups let you find and talk with people of similar "
 "interests. After you join a group you can send messages to all other members "
@@ -2893,13 +2697,13 @@ msgstr ""
 "persoas de intereses similares aos seus. Tras unirse a un grupo pode enviar "
 "mensaxes a todos os membros utilizando a sintaxe \"!nomedogrupo\". Non atopa "
 "un grupo que lle guste? Probe a [buscar un](%%%%action.groupsearch%%%%) ou "
-"[crear un pola súa conta!](%%%%action.newgroup%%%%)"
+"[crear o seu](%%%%action.newgroup%%%%)!"
 
 #. TRANS: Link to create a new group on the group list page.
 #. TRANS: Link text on group page to create a new group.
 #. TRANS: Form legend for group edit form.
 msgid "Create a new group"
-msgstr "Crear un grupo novo"
+msgstr "Crear un novo grupo"
 
 #. TRANS: Instructions for page where groups can be searched. %%site.name%% is the name of the StatusNet site.
 #, php-format
@@ -2920,15 +2724,16 @@ msgstr "Busca de grupos"
 #. TRANS: Message on the "People search" page where a query has no results.
 #. TRANS: Output when there are no results for a search.
 msgid "No results."
-msgstr "Non houbo resultados."
+msgstr "Non hai resultados."
 
 #. TRANS: Additional text on page where groups can be searched if no results were found for a query for a logged in user.
 #. TRANS: This message contains Markdown links in the form [link text](link).
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "If you cannot find the group you're looking for, you can [create it](%%"
 "action.newgroup%%) yourself."
-msgstr "Se non atopa o grupo que busca, pode [crealo](%%action.newgroup%%)."
+msgstr ""
+"Se non atopa o grupo que busca, pode [crealo](%%action.newgroup%%) vostede."
 
 #. TRANS: Additional text on page where groups can be searched if no results were found for a query for a not logged in user.
 #. TRANS: This message contains Markdown links in the form [link text](link).
@@ -2960,33 +2765,32 @@ msgstr "Configuración da mensaxería instantánea"
 #. TRANS: Instant messaging settings page instructions.
 #. TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link.
 #. TRANS: the order and formatting of link text and link should remain unchanged.
-#, fuzzy, php-format
+#, php-format
 msgid ""
-"You can send and receive notices through instant messaging [instant messages]"
-"(%%doc.im%%). Configure your addresses and settings below."
+"You can send and receive notices through [instant messaging](%%doc.im%%). "
+"Configure your addresses and settings below."
 msgstr ""
-"Pode enviar e recibir notas mediante [mensaxes instantáneas](%%doc.im%%) de "
-"Jabber/GTalk. Configure a continuación o seu enderezo e preferencias."
+"Pode enviar e recibir notas mediante [mensaxes instantáneas](%%doc.im%%). "
+"Configure a continuación o seu enderezo e as súas preferencias."
 
 #. TRANS: Message given in the IM settings if IM is not enabled on the site.
 msgid "IM is not available."
 msgstr "A mensaxería instantánea non está dispoñible."
 
 #. TRANS: Form note in IM settings form. %s is the type of IM address that was confirmed.
-#, fuzzy, php-format
+#, php-format
 msgid "Current confirmed %s address."
-msgstr "Enderezo de correo electrónico confirmado actualmente."
+msgstr "Enderezo de correo electrónico de %s confirmado actualmente."
 
 #. TRANS: Form note in IM settings form.
 #. TRANS: %s is the IM service name, %2$s is the IM address set.
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your %1$s account for a message "
 "with further instructions. (Did you add %2$s to your buddy list?)"
 msgstr ""
-"Agardando pola confirmación deste enderezo. Busque na cúa conta de Jabber/"
-"GTalk unha mensaxe con máis instrucións. (Engadiu a %s á súa lista de "
-"amigos?)"
+"Agardando pola confirmación deste enderezo. Busque na cúa conta de %1$s unha "
+"mensaxe con máis instrucións. (Engadiu a %2$s á súa lista de amigos?)"
 
 #. TRANS: Field label for IM address.
 msgid "IM address"
@@ -2995,39 +2799,31 @@ msgstr "Enderezo de mensaxería instantánea"
 #. TRANS: Field title for IM address. %s is the IM service name.
 #, php-format
 msgid "%s screenname."
-msgstr ""
+msgstr "Alcume %s."
 
 #. TRANS: Header for IM preferences form.
-#, fuzzy
 msgid "IM Preferences"
 msgstr "Preferencias de mensaxería instantánea"
 
 #. TRANS: Checkbox label in IM preferences form.
-#, fuzzy
 msgid "Send me notices"
-msgstr "Enviar unha nota"
+msgstr "Enviádeme notas"
 
 #. TRANS: Checkbox label in IM preferences form.
-#, fuzzy
 msgid "Post a notice when my status changes."
-msgstr "Publicar unha nota cando cambie o meu estado en Jabber ou GTalk."
+msgstr "Publicar unha nota cando cambie o meu estado."
 
 #. TRANS: Checkbox label in IM preferences form.
-#, fuzzy
 msgid "Send me replies from people I'm not subscribed to."
-msgstr ""
-"Enviádeme as respostas mediante Jabber ou GTalk da xente á que non estou "
-"subscrita."
+msgstr "Enviádeme as respostas da xente á que non estou subscrito."
 
 #. TRANS: Checkbox label in IM preferences form.
-#, fuzzy
 msgid "Publish a MicroID"
-msgstr "Publicar unha MicroID para o meu enderezo de correo electrónico."
+msgstr "Publicar un MicroID"
 
 #. TRANS: Server error thrown on database error updating IM preferences.
-#, fuzzy
 msgid "Could not update IM preferences."
-msgstr "Non se puido actualizar o usuario."
+msgstr "Non se puideron actualizar as preferencias de mensaxería instantánea."
 
 #. TRANS: Confirmation message for successful IM preferences save.
 #. TRANS: Confirmation message after saving preferences.
@@ -3035,45 +2831,38 @@ msgid "Preferences saved."
 msgstr "Gardáronse as preferencias."
 
 #. TRANS: Message given saving IM address without having provided one.
-#, fuzzy
 msgid "No screenname."
 msgstr "Sen alcume."
 
 #. TRANS: Form validation error when no transport is available setting an IM address.
-#, fuzzy
 msgid "No transport."
-msgstr "Non hai ningunha nota."
+msgstr "Sen transporte."
 
 #. TRANS: Message given saving IM address that cannot be normalised.
-#, fuzzy
 msgid "Cannot normalize that screenname."
-msgstr "Non se pode normalizar esa ID de Jabber"
+msgstr "Non se pode normalizar ese alcume."
 
 #. TRANS: Message given saving IM address that not valid.
-#, fuzzy
 msgid "Not a valid screenname."
-msgstr "O formato do alcume non é correcto."
+msgstr "O alcume non é válido."
 
 #. TRANS: Message given saving IM address that is already set for another user.
-#, fuzzy
 msgid "Screenname already belongs to another user."
-msgstr "Esa ID de Jabber xa corresponde a un usuario."
+msgstr "Ese alcume xa corresponde a un usuario."
 
 #. TRANS: Message given saving valid IM address that is to be confirmed.
-#, fuzzy
 msgid "A confirmation code was sent to the IM address you added."
 msgstr ""
 "Enviouse un código de confirmación ao enderezo de mensaxería instantánea que "
-"engadiu. Ten que aprobar que %s lle envíe mensaxes."
+"engadiu."
 
 #. TRANS: Message given canceling IM address confirmation for the wrong IM address.
 msgid "That is the wrong IM address."
 msgstr "Ese enderezo de mensaxería instantánea é incorrecto."
 
 #. TRANS: Server error thrown on database error canceling IM address confirmation.
-#, fuzzy
 msgid "Could not delete confirmation."
-msgstr "Non se puido borrar a confirmación por mensaxería instantánea."
+msgstr "Non se puido borrar a confirmación."
 
 #. TRANS: Message given after successfully canceling IM address confirmation.
 msgid "IM confirmation cancelled."
@@ -3081,9 +2870,8 @@ msgstr "Cancelouse a confirmación por mensaxería instantánea."
 
 #. TRANS: Message given trying to remove an IM address that is not
 #. TRANS: registered for the active user.
-#, fuzzy
 msgid "That is not your screenname."
-msgstr "Ese número de teléfono non é seu."
+msgstr "Ese alcume non é seu."
 
 #. TRANS: Message given after successfully removing a registered Instant Messaging address.
 msgid "The IM address was removed."
@@ -3118,12 +2906,11 @@ msgstr "Ten que identificarse para invitar a outros a usar %s."
 
 #. TRANS: Form validation message when providing an e-mail address that does not validate.
 #. TRANS: %s is an invalid e-mail address.
-#, fuzzy, php-format
+#, php-format
 msgid "Invalid email address: %s."
-msgstr "Enderezo de correo electrónico incorrecto: %s"
+msgstr "Enderezo de correo electrónico incorrecto: %s."
 
 #. TRANS: Page title when invitations have been sent.
-#, fuzzy
 msgid "Invitations sent"
 msgstr "Enviáronse as invitacións"
 
@@ -3135,10 +2922,9 @@ msgstr "Invitar a novos usuarios"
 #. TRANS: is already subscribed to one or more users with the given e-mail address(es).
 #. TRANS: Plural form is based on the number of reported already subscribed e-mail addresses.
 #. TRANS: Followed by a bullet list.
-#, fuzzy
 msgid "You are already subscribed to this user:"
 msgid_plural "You are already subscribed to these users:"
-msgstr[0] "Xa está subscrito aos seguintes usuarios:"
+msgstr[0] "Xa está subscrito ao seguinte usuario:"
 msgstr[1] "Xa está subscrito aos seguintes usuarios:"
 
 #. TRANS: Used as list item for already subscribed users (%1$s is nickname, %2$s is e-mail address).
@@ -3151,22 +2937,19 @@ msgstr "%1$s (%2$s)"
 #. TRANS: Message displayed inviting users to use a StatusNet site while the invited user
 #. TRANS: already uses a this StatusNet site. Plural form is based on the number of
 #. TRANS: reported already present people. Followed by a bullet list.
-#, fuzzy
 msgid "This person is already a user and you were automatically subscribed:"
 msgid_plural ""
 "These people are already users and you were automatically subscribed to them:"
-msgstr[0] ""
-"Estas persoas xa son usuarios e subscribíuselle automaticamente a elas:"
+msgstr[0] "Esta persoa xa é usuario e subscribíuselle automaticamente a ela:"
 msgstr[1] ""
 "Estas persoas xa son usuarios e subscribíuselle automaticamente a elas:"
 
 #. TRANS: Message displayed inviting users to use a StatusNet site. Plural form is
 #. TRANS: based on the number of invitations sent. Followed by a bullet list of
 #. TRANS: e-mail addresses to which invitations were sent.
-#, fuzzy
 msgid "Invitation sent to the following person:"
 msgid_plural "Invitations sent to the following people:"
-msgstr[0] "Enviáronse invitacións ás seguintes persoas:"
+msgstr[0] "Enviouse unha invitación á seguinte persoa:"
 msgstr[1] "Enviáronse invitacións ás seguintes persoas:"
 
 #. TRANS: Generic message displayed after sending out one or more invitations to
@@ -3185,29 +2968,6 @@ msgstr ""
 "Utilice o seguinte formulario para invitar aos seus amigos e compañeiros a "
 "utilizar este servizo."
 
-#. TRANS: Field label for a list of e-mail addresses.
-msgid "Email addresses"
-msgstr "Enderezos de correo electrónico"
-
-#. TRANS: Tooltip for field label for a list of e-mail addresses.
-#, fuzzy
-msgid "Addresses of friends to invite (one per line)."
-msgstr "Enderezos de amigos aos que invitar (un por liña)"
-
-#. TRANS: Field label for a personal message to send to invitees.
-msgid "Personal message"
-msgstr "Mensaxe persoal"
-
-#. TRANS: Tooltip for field label for a personal message to send to invitees.
-msgid "Optionally add a personal message to the invitation."
-msgstr "Engadir opcionalmente unha mensaxe persoal á invitación."
-
-#. TRANS: Send button for inviting friends
-#. TRANS: Button text for sending notice.
-msgctxt "BUTTON"
-msgid "Send"
-msgstr "Enviar"
-
 #. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral
 #. TRANS: singular 3rd-person pronoun in English. %1$s is the inviting user, $2$s is
 #. TRANS: the StatusNet sitename.
@@ -3220,15 +2980,14 @@ msgid "You must be logged in to join a group."
 msgstr "Ten que identificarse para unirse a un grupo."
 
 #. TRANS: Title for join group page after joining.
-#, fuzzy, php-format
+#, php-format
 msgctxt "TITLE"
 msgid "%1$s joined group %2$s"
 msgstr "%1$s uniuse ao grupo %2$s"
 
 #. TRANS: Exception thrown when there is an unknown error joining a group.
-#, fuzzy
 msgid "Unknown error joining group."
-msgstr "Descoñecida"
+msgstr "Erro descoñecido ao unirse ao grupo."
 
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
@@ -3257,7 +3016,6 @@ msgstr ""
 "os dereitos reservados\"."
 
 #. TRANS: Client error displayed selecting a too long license title in the license admin panel.
-#, fuzzy
 msgid "Invalid license title. Maximum length is 255 characters."
 msgstr "Título de licenza incorrecto. A extensión máxima é de 255 caracteres."
 
@@ -3299,9 +3057,8 @@ msgid "Type"
 msgstr "Tipo"
 
 #. TRANS: Dropdown field instructions in the license admin panel.
-#, fuzzy
 msgid "Select a license."
-msgstr "Seleccionar unha licenza"
+msgstr "Seleccione unha licenza."
 
 #. TRANS: Form legend in the license admin panel.
 msgid "License details"
@@ -3340,15 +3097,8 @@ msgid "URL for an image to display with the license."
 msgstr "URL dunha imaxe a mostrar coa licenza."
 
 #. TRANS: Button title in the license admin panel.
-#, fuzzy
 msgid "Save license settings."
-msgstr "Gardar a configuración de licenza"
-
-#. TRANS: Client error displayed when trying to log in while already logged in.
-#. TRANS: Client error displayed trying to use "one time password login" when already logged in.
-#. TRANS: Client error displayed when trying to register while already logged in.
-msgid "Already logged in."
-msgstr "Xa se identificou."
+msgstr "Gardar a configuración de licenza."
 
 #. TRANS: Form validation error displayed when trying to log in with incorrect credentials.
 msgid "Incorrect username or password."
@@ -3370,9 +3120,8 @@ msgid "Login to site"
 msgstr "Identificarse no sitio"
 
 #. TRANS: Field label on login page.
-#, fuzzy
 msgid "Username or email address"
-msgstr "Alcume ou enderezo de correo electrónico"
+msgstr "Nome de usuario ou enderezo de correo electrónico"
 
 #. TRANS: Checkbox label label on login page.
 #. TRANS: Checkbox label on account registration page.
@@ -3383,11 +3132,10 @@ msgstr "Lembrádeme"
 #. TRANS: Checkbox title on account registration page.
 msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
-"Identificarse automaticamente no futuro. Non se aconsella en computadoras "
-"compartidas!"
+"Identificarse automaticamente no futuro. Non se aconsella en computadores "
+"compartidos!"
 
 #. TRANS: Button text for log in on login page.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Login"
 msgstr "Identificarse"
@@ -3447,7 +3195,6 @@ msgid "No current status."
 msgstr "Sen estado actual."
 
 #. TRANS: This is the title of the form for adding a new application.
-#, fuzzy
 msgid "New application"
 msgstr "Aplicación nova"
 
@@ -3467,18 +3214,17 @@ msgstr "Necesítase o URL de orixe."
 msgid "Could not create application."
 msgstr "Non se puido crear a aplicación."
 
-#, fuzzy
+#. TRANS: Form validation error messages displayed when uploading an invalid application logo.
 msgid "Invalid image."
-msgstr "Tamaño non válido."
+msgstr "Imaxe non válida."
 
 #. TRANS: Title for form to create a group.
 msgid "New group"
 msgstr "Novo grupo"
 
 #. TRANS: Client exception thrown when a user tries to create a group while banned.
-#, fuzzy
 msgid "You are not allowed to create groups on this site."
-msgstr "Vostede non pertence a este grupo."
+msgstr "Non se lle permite crear grupos neste sitio."
 
 #. TRANS: Form instructions for group create form.
 msgid "Use this form to create a new group."
@@ -3491,7 +3237,6 @@ msgstr "Mensaxe nova"
 
 #. TRANS: Client error displayed trying to send a direct message to a user while sender and
 #. TRANS: receiver are not subscribed to each other.
-#, fuzzy
 msgid "You cannot send a message to this user."
 msgstr "Non pode enviarlle unha mensaxe a este usuario."
 
@@ -3506,12 +3251,6 @@ msgstr "Non hai contido ningún!"
 msgid "No recipient specified."
 msgstr "Non se especificou ningún destinatario."
 
-#. TRANS: Client error displayed trying to send a direct message to self.
-#. TRANS: Error text shown when trying to send a direct message to self.
-msgid ""
-"Don't send a message to yourself; just say it to yourself quietly instead."
-msgstr "Non se envíe unha mensaxe, limítese a pensar nela."
-
 #. TRANS: Page title after sending a direct message.
 msgid "Message sent"
 msgstr "Enviouse a mensaxe"
@@ -3531,7 +3270,6 @@ msgstr "Houbo un erro de AJAX"
 
 #. TRANS: Page title for sending a new notice.
 #. TRANS: Title for form to send a new notice.
-#, fuzzy
 msgctxt "TITLE"
 msgid "New notice"
 msgstr "Nova nota"
@@ -3548,7 +3286,8 @@ msgid ""
 "by spaces; they must be 3 characters or more."
 msgstr ""
 "Buscar notas en %%site.name%% polo seu contido. Separe os termos de busca "
-"con espazos en branco. Teñen que ter tres ou máis caracteres."
+"con espazos en branco. Cada termo ten que estar formado por tres ou máis "
+"caracteres."
 
 #. TRANS: Title of the page where users can search for notices.
 msgid "Text search"
@@ -3587,12 +3326,11 @@ msgstr "Actualizacións con \"%s\""
 
 #. TRANS: RSS notice search feed description.
 #. TRANS: %1$s is the query, %2$s is the StatusNet site name.
-#, fuzzy, php-format
+#, php-format
 msgid "Updates matching search term \"%1$s\" on %2$s."
-msgstr "Actualizacións que conteñen o termo \"%1$s\" en %2$s!"
+msgstr "Actualizacións que conteñen o termo \"%1$s\" en %2$s."
 
 #. TRANS: Client error displayed trying to nudge a user that cannot be nudged.
-#, fuzzy
 msgid ""
 "This user doesn't allow nudges or hasn't confirmed or set their email "
 "address yet."
@@ -3630,7 +3368,6 @@ msgid "Connected applications"
 msgstr "Aplicacións conectadas"
 
 #. TRANS: Instructions for OAuth connection settings.
-#, fuzzy
 msgid "The following connections exist for your account."
 msgstr "Permitiulle o acceso á súa conta ás seguintes aplicacións."
 
@@ -3640,7 +3377,7 @@ msgstr "Non é usuario desa aplicación."
 
 #. TRANS: Client error when revoking access has failed for some reason.
 #. TRANS: %s is the application ID revoking access failed for.
-#, fuzzy, php-format
+#, php-format
 msgid "Unable to revoke access for application: %s."
 msgstr "Non se puido revogar o acceso da aplicación: %s."
 
@@ -3651,6 +3388,8 @@ msgid ""
 "You have successfully revoked access for %1$s and the access token starting "
 "with %2$s."
 msgstr ""
+"Revogou correctamente o acceso de %1$s e o pase de acceso que comeza por %2"
+"$s."
 
 #. TRANS: Empty list message when no applications have been authorised yet.
 msgid "You have not authorized any applications to use your account."
@@ -3664,18 +3403,20 @@ msgid ""
 "Are you a developer? [Register an OAuth client application](%s) to use with "
 "this instance of StatusNet."
 msgstr ""
+"É un desenvolvedor? [Rexistre unha aplicación de cliente de OAuth](%s) para "
+"usala con esta instancia de StatusNet."
 
 #. TRANS: Server error displayed in oEmbed action when path not found.
 #. TRANS: %s is a path.
-#, fuzzy, php-format
+#, php-format
 msgid "\"%s\" not found."
-msgstr "Non se atopou o método da API."
+msgstr "Non se atopou \"%s\"."
 
 #. TRANS: Server error displayed in oEmbed action when notice not found.
 #. TRANS: %s is a notice.
-#, fuzzy, php-format
+#, php-format
 msgid "Notice %s not found."
-msgstr "Non se atopou o método da API."
+msgstr "Non se atopou a nota %s."
 
 #. TRANS: Server error displayed in oEmbed action when notice has not profile.
 #. TRANS: Server error displayed trying to show a notice without a connected profile.
@@ -3691,15 +3432,15 @@ msgstr "Estado de %1$s en %2$s"
 
 #. TRANS: Server error displayed in oEmbed action when attachment not found.
 #. TRANS: %d is an attachment ID.
-#, fuzzy, php-format
+#, php-format
 msgid "Attachment %s not found."
-msgstr "Non se atopou o destinatario."
+msgstr "Non se atopou o anexo %s."
 
 #. TRANS: Server error displayed in oEmbed request when a path is not supported.
 #. TRANS: %s is a path.
 #, php-format
 msgid "\"%s\" not supported for oembed requests."
-msgstr ""
+msgstr "\"%s\" non está soportado nas solicitudes oEmbed."
 
 #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
 #, php-format
@@ -3716,6 +3457,32 @@ msgstr "Só %s enderezos URL sobre HTTP simple."
 msgid "Not a supported data format."
 msgstr "Non se soporta ese formato de datos."
 
+#. TRANS: Page title for profile settings.
+msgid "Old school UI settings"
+msgstr "Configuración da interface antiga"
+
+#. TRANS: Usage instructions for profile settings.
+msgid "If you like it \"the old way\", you can set that here."
+msgstr "Se prefire o estilo vello pode establecelo aquí."
+
+#. TRANS: Confirmation shown when user profile settings are saved.
+#. TRANS: Message after successful saving of administrative settings.
+msgid "Settings saved."
+msgstr "Gardouse a configuración."
+
+msgid "Only stream mode (no conversations) in timelines"
+msgstr "Só modo de fluxo (sen conversas) nas liñas do tempo"
+
+msgid "Show conversation page as hierarchical trees"
+msgstr "Mostrar a páxina de conversa como árbore xerárquica"
+
+msgid "Show nicknames (not full names) in timelines"
+msgstr "Mostrar os alcumes (non os nomes completos) nas liñas do tempo"
+
+#. TRANS: Button text to save a list.
+msgid "Save"
+msgstr "Gardar"
+
 #. TRANS: ShortName in the OpenSearch interface when trying to find users.
 msgid "People Search"
 msgstr "Busca de xente"
@@ -3724,6 +3491,11 @@ msgstr "Busca de xente"
 msgid "Notice Search"
 msgstr "Busca de notas"
 
+#. TRANS: Client error displayed trying to use "one time password login" when already logged in.
+#. TRANS: Client error displayed when trying to register while already logged in.
+msgid "Already logged in."
+msgstr "Xa se identificou."
+
 #. TRANS: Client error displayed trying to use "one time password login" without specifying a user.
 msgid "No user ID specified."
 msgstr "Non se especificou ningunha ID de usuario."
@@ -3761,7 +3533,6 @@ msgstr ""
 "Esta é a súa caixa de saída. Nela lístanse as mensaxes privadas que enviou."
 
 #. TRANS: Title for page where to change password.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Change password"
 msgstr "Cambiar o contrasinal"
@@ -3777,7 +3548,7 @@ msgstr "Cambio de contrasinal"
 
 #. TRANS: Field label on page where to change password.
 msgid "Old password"
-msgstr "Contrasinal anterior"
+msgstr "Contrasinal antigo"
 
 #. TRANS: Field label on page where to change password.
 #. TRANS: Field label for password reset form.
@@ -3786,25 +3557,21 @@ msgstr "Novo contrasinal"
 
 #. TRANS: Field title on page where to change password.
 #. TRANS: Field title on account registration page.
-#, fuzzy
 msgid "6 or more characters."
-msgstr "Seis ou máis caracteres"
+msgstr "Seis ou máis caracteres."
 
 #. TRANS: Field label on page where to change password. In this field the new password should be typed a second time.
-#, fuzzy
 msgctxt "LABEL"
 msgid "Confirm"
 msgstr "Confirmar"
 
 #. TRANS: Field title on page where to change password.
-#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
+#. TRANS: Title for field label for password reset form where the password has to be typed again.
 #. TRANS: Field title on account registration page.
-#, fuzzy
 msgid "Same as password above."
-msgstr "Igual ao contrasinal anterior"
+msgstr "Igual ao contrasinal anterior."
 
 #. TRANS: Button text on page where to change password.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Change"
 msgstr "Cambiar"
@@ -3816,14 +3583,12 @@ msgstr "O contrasinal debe conter seis ou máis caracteres."
 
 #. TRANS: Form validation error on password change when password confirmation does not match.
 #. TRANS: Form validation error displayed when trying to register with non-matching passwords.
-#, fuzzy
 msgid "Passwords do not match."
 msgstr "Os contrasinais non coinciden."
 
 #. TRANS: Form validation error on page where to change password.
-#, fuzzy
 msgid "Incorrect old password."
-msgstr "O contrasinal anterior non é correcto"
+msgstr "O contrasinal anterior non é correcto."
 
 #. TRANS: Form validation error on page where to change password.
 msgid "Error saving user; invalid."
@@ -3832,7 +3597,6 @@ msgstr "Houbo un erro ao gardar o usuario. Incorrecto."
 #. TRANS: Server error displayed on page where to change password when password change
 #. TRANS: could not be made because of a server error.
 #. TRANS: Reset password form validation error message.
-#, fuzzy
 msgid "Cannot save new password."
 msgstr "Non se puido gardar o novo contrasinal."
 
@@ -3860,12 +3624,6 @@ msgstr "Non se pode ler o directorio de temas visuais: %s."
 msgid "Avatar directory not writable: %s."
 msgstr "Non se pode escribir no directorio de avatares: %s."
 
-#. TRANS: Client error in Paths admin panel.
-#. TRANS: %s is the background directory that could not be written to.
-#, php-format
-msgid "Background directory not writable: %s."
-msgstr "Non se pode escribir no directorio de fondos: %s."
-
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the locales directory that could not be read from.
 #, php-format
@@ -3910,12 +3668,10 @@ msgid "Fancy URLs"
 msgstr "Enderezos URL elegantes"
 
 #. TRANS: Field title in Paths admin panel.
-#, fuzzy
 msgid "Use fancy URLs (more readable and memorable)?"
 msgstr "Quere utilizar os enderezos URL elegantes (mellores de ler e lembrar)?"
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#, fuzzy
 msgctxt "LEGEND"
 msgid "Theme"
 msgstr "Tema visual"
@@ -3926,7 +3682,7 @@ msgstr "Servidor para os temas visuais."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
 msgid "Web path to themes."
-msgstr ""
+msgstr "Ruta de acceso aos temas visuais."
 
 #. TRANS: Field label in Paths admin panel.
 msgid "SSL server"
@@ -3934,7 +3690,7 @@ msgstr "Servidor SSL"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
 msgid "SSL server for themes (default: SSL server)."
-msgstr ""
+msgstr "Servidor SSL dos temas visuais (por defecto: servidor SSL)."
 
 #. TRANS: Field label in Paths admin panel.
 msgid "SSL path"
@@ -3942,17 +3698,15 @@ msgstr "Ruta de acceso SSL"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
 msgid "SSL path to themes (default: /theme/)."
-msgstr ""
+msgstr "Ruta de acceso SSL dos temas visuais (por defecto: /theme/)."
 
 #. TRANS: Field label in Paths admin panel.
-#, fuzzy
 msgid "Directory"
-msgstr "Directorio de temas visuais"
+msgstr "Directorio"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#, fuzzy
 msgid "Directory where themes are located."
-msgstr "Ruta do directorio das traducións"
+msgstr "Directorio dos temas visuais."
 
 #. TRANS: Fieldset legend in Paths admin panel.
 msgid "Avatars"
@@ -3963,84 +3717,50 @@ msgid "Avatar server"
 msgstr "Servidor de avatares"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#, fuzzy
 msgid "Server for avatars."
-msgstr "Tema visual para o sitio."
+msgstr "Servidor dos avatares."
 
 #. TRANS: Field label in Paths admin panel.
 msgid "Avatar path"
 msgstr "Ruta do avatar"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#, fuzzy
 msgid "Web path to avatars."
-msgstr "Non se puido actualizar o avatar."
+msgstr "Ruta de acceso aos avatares."
 
 #. TRANS: Field label in Paths admin panel.
 msgid "Avatar directory"
 msgstr "Directorio de avatares"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#, fuzzy
 msgid "Directory where avatars are located."
-msgstr "Ruta do directorio das traducións"
-
-#. TRANS: Fieldset legend in Paths admin panel.
-msgid "Backgrounds"
-msgstr "Fondos"
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-#, fuzzy
-msgid "Server for backgrounds."
-msgstr "Tema visual para o sitio."
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-msgid "Web path to backgrounds."
-msgstr ""
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-msgid "Server for backgrounds on SSL pages."
-msgstr ""
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-msgid "Web path to backgrounds on SSL pages."
-msgstr ""
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-#, fuzzy
-msgid "Directory where backgrounds are located."
-msgstr "Ruta do directorio das traducións"
+msgstr "Directorio dos avatares."
 
 #. TRANS: Fieldset legens in Paths admin panel.
 msgid "Attachments"
 msgstr "Ficheiros anexos"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#, fuzzy
 msgid "Server for attachments."
-msgstr "Tema visual para o sitio."
+msgstr "Servidor dos anexos."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#, fuzzy
 msgid "Web path to attachments."
-msgstr "Non hai ningún dato adxunto."
+msgstr "Ruta de acceso aos anexos."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#, fuzzy
 msgid "Server for attachments on SSL pages."
-msgstr "Tema visual para o sitio."
+msgstr "Servidor para os anexos nas páxinas SSL."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
 msgid "Web path to attachments on SSL pages."
-msgstr ""
+msgstr "Ruta de acceso cara aos anexos nas páxinas SSL."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#, fuzzy
 msgid "Directory where attachments are located."
-msgstr "Ruta do directorio das traducións"
+msgstr "Directorio dos anexos."
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#, fuzzy
 msgctxt "LEGEND"
 msgid "SSL"
 msgstr "SSL"
@@ -4063,18 +3783,16 @@ msgid "Use SSL"
 msgstr "Utilizar SSL"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#, fuzzy
 msgid "When to use SSL."
-msgstr "Cando utilizar SSL"
+msgstr "Cando utilizar SSL."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#, fuzzy
 msgid "Server to direct SSL requests to."
-msgstr "Servidor ao que dirixir as solicitudes SSL"
+msgstr "Servidor ao que dirixir as solicitudes SSL."
 
 #. TRANS: Button title text to store form data in the Paths admin panel.
-msgid "Save paths"
-msgstr "Gardar as rutas"
+msgid "Save path settings."
+msgstr "Gardar a configuración da ruta."
 
 #. TRANS: Instructions for the "People search" page.
 #. TRANS: %%site.name%% is the name of the StatusNet site.
@@ -4084,7 +3802,8 @@ msgid ""
 "Separate the terms by spaces; they must be 3 characters or more."
 msgstr ""
 "Buscar xente en %%site.name%% por nome, lugar ou intereses. Separe os termos "
-"con espazos en branco. Teñen que ter tres ou máis caracteres."
+"con espazos en branco. Cada termo ten que estar formado por tres ou máis "
+"caracteres."
 
 #. TRANS: Title of a page where users can search for other users.
 msgid "People search"
@@ -4092,93 +3811,88 @@ msgstr "Busca de xente"
 
 #. TRANS: Title for list page.
 #. TRANS: %s is a list.
-#, fuzzy, php-format
+#, php-format
 msgid "Public list %s"
-msgstr "Nube de etiquetas públicas"
+msgstr "Lista pública %s"
 
 #. TRANS: Title for list page.
 #. TRANS: %1$s is a list, %2$d is a page number.
-#, fuzzy, php-format
+#, php-format
 msgid "Public list %1$s, page %2$d"
-msgstr "Respostas a %1$s, páxina %2$d"
+msgstr "Lista pública %1$s, páxina %2$d"
 
 #. TRANS: Message for anonymous users on list page.
 #. TRANS: This message contains Markdown links in the form [description](link).
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "Lists are how you sort similar people on %%site.name%%, a [micro-blogging]"
 "(http://en.wikipedia.org/wiki/Micro-blogging) service based on the Free "
 "Software [StatusNet](http://status.net/) tool. You can then easily keep "
 "track of what they are doing by subscribing to the list's timeline."
 msgstr ""
-"**%s** é un grupo de usuarios de %%%%site.name%%%%, un servizo de [mensaxes "
-"de blogue curtas](http://en.wikipedia.org/wiki/Microblogging) (en inglés) "
-"baseado na ferramenta de software libre [StatusNet](http://status.net/). Os "
-"seus membros comparten mensaxes curtas sobre as súas vidas e intereses. "
+"As listas son o medio de clasificar xente similar en %%site.name%%, un "
+"servizo de [mensaxes de blogue curtas](http://en.wikipedia.org/wiki/"
+"Microblogging) (en inglés) baseado na ferramenta de software libre "
+"[StatusNet](http://status.net/). Pode facer un seguimento do que fan "
+"subscribíndose á liña do tempo da lista."
 
 #. TRANS: Client error displayed when a tagger is expected but not provided.
-#, fuzzy
 msgid "No tagger."
-msgstr "Esa etiqueta non existe."
+msgstr "Sen etiquetador."
 
 #. TRANS: Title for list of people listed by the user.
 #. TRANS: %1$s is a list, %2$s is a username.
-#, fuzzy, php-format
+#, php-format
 msgid "People listed in %1$s by %2$s"
-msgstr "Respostas a %1$s en %2$s!"
+msgstr "Persoas listadas en %1$s de %2$s"
 
 #. TRANS: Title for list of people listed by the user.
 #. TRANS: %1$s is a list, %2$s is a username, %2$s is a page number.
-#, fuzzy, php-format
+#, php-format
 msgid "People listed in %1$s by %2$s, page %3$d"
-msgstr "Respostas a %1$s, páxina %2$d"
+msgstr "Persoas listadas en %1$s de %2$s, páxina %3$d"
 
 #. TRANS: Addition in tag membership list for creator of a tag.
 #. TRANS: Addition in tag subscribers list for creator of a tag.
-#, fuzzy
 msgid "Creator"
-msgstr "Creado"
+msgstr "Creador"
 
 #. TRANS: Title for lists by a user page for a private tag.
-#, fuzzy
 msgid "Private lists by you"
-msgstr "Editar o grupo %s"
+msgstr "As súas listas privadas"
 
 #. TRANS: Title for lists by a user page for a public tag.
-#, fuzzy
 msgid "Public lists by you"
-msgstr "Nube de etiquetas públicas"
+msgstr "As súas listas públicas"
 
 #. TRANS: Title for lists by a user page.
-#, fuzzy
 msgid "Lists by you"
-msgstr "Editar o grupo %s"
+msgstr "As súas listas"
 
 #. TRANS: Title for lists by a user page.
 #. TRANS: %s is a user nickname.
 #, php-format
 msgid "Lists by %s"
-msgstr ""
+msgstr "Listas de %s"
 
 #. TRANS: Title for lists by a user page.
 #. TRANS: %1$s is a user nickname, %2$d is a page number.
-#, fuzzy, php-format
+#, php-format
 msgid "Lists by %1$s, page %2$d"
-msgstr "Notas etiquetadas con %1$s, páxina %2$d"
+msgstr "Listas de %1$s, páxina %2$d"
 
 #. TRANS: Client error displayed when trying view another user's private lists.
 msgid "You cannot view others' private lists"
-msgstr ""
+msgstr "Non pode ver as listas privadas doutros"
 
 #. TRANS: Mode selector label.
-#, fuzzy
 msgid "Mode"
-msgstr "Moderar"
+msgstr "Modo"
 
 #. TRANS: Link text to show lists for user %s.
-#, fuzzy, php-format
+#, php-format
 msgid "Lists for %s"
-msgstr "Caixa de saída de %s"
+msgstr "Listas de %s"
 
 #. TRANS: Fieldset legend.
 #. TRANS: Fieldset legend on gallery action page.
@@ -4187,22 +3901,19 @@ msgstr "Escolla unha etiqueta a filtrar"
 
 #. TRANS: Checkbox title.
 msgid "Show private tags."
-msgstr ""
+msgstr "Mostrar as etiquetas privadas."
 
 #. TRANS: Checkbox label to show public tags.
-#, fuzzy
 msgctxt "LABEL"
 msgid "Public"
 msgstr "Públicas"
 
 #. TRANS: Checkbox title.
-#, fuzzy
 msgid "Show public tags."
-msgstr "Esa etiqueta non existe."
+msgstr "Mostrar as etiquetas públicas."
 
 #. TRANS: Submit button text for tag filter form.
 #. TRANS: Submit button text on gallery action page.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Go"
 msgstr "Continuar"
@@ -4210,87 +3921,89 @@ msgstr "Continuar"
 #. TRANS: Message displayed for anonymous users on page that displays lists by a user.
 #. TRANS: This message contains Markdown links in the form [description](links).
 #. TRANS: %s is a tagger nickname.
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "These are lists created by **%s**. Lists are how you sort similar people on %"
 "%%%site.name%%%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
 "blogging) service based on the Free Software [StatusNet](http://status.net/) "
 "tool. You can easily keep track of what they are doing by subscribing to the "
-"tag's timeline."
+"list's timeline."
 msgstr ""
-"**%s** é un grupo de usuarios de %%%%site.name%%%%, un servizo de [mensaxes "
-"de blogue curtas](http://en.wikipedia.org/wiki/Microblogging) (en inglés) "
-"baseado na ferramenta de software libre [StatusNet](http://status.net/). Os "
-"seus membros comparten mensaxes curtas sobre as súas vidas e intereses. "
+"Estas son as listas creadas por **%s**. As listas son o medio de clasificar "
+"xente similar en %%%%site.name%%%%, un servizo de [mensaxes de blogue curtas]"
+"(http://en.wikipedia.org/wiki/Microblogging) (en inglés) baseado na "
+"ferramenta de software libre [StatusNet](http://status.net/). Pode facer un "
+"seguimento do que fan subscribíndose á liña do tempo da lista."
 
 #. TRANS: Message displayed on page that displays lists by a user when there are none.
 #. TRANS: This message contains Markdown links in the form [description](links).
 #. TRANS: %s is a tagger nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "%s has not created any [lists](%%%%doc.lists%%%%) yet."
-msgstr "Ninguén publicou aínda ningunha nota cunha [etiqueta](%%doc.tags%%)."
+msgstr "%s aínda non creou ningunha [lista](%%%%doc.lists%%%%)."
 
 #. TRANS: Page title. %s is a tagged user's nickname.
 #, php-format
 msgid "Lists with %s in them"
-msgstr ""
+msgstr "Listas con %s nelas"
 
 #. TRANS: Page title. %1$s is a tagged user's nickname, %2$s is a page number.
-#, fuzzy, php-format
+#, php-format
 msgid "Lists with %1$s, page %2$d"
-msgstr "Notas etiquetadas con %1$s, páxina %2$d"
+msgstr "Listas con %1$s, páxina %2$d"
 
 #. TRANS: Message displayed for anonymous users on page that displays lists for a user.
 #. TRANS: This message contains Markdown links in the form [description](links).
 #. TRANS: %s is a tagger nickname.
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "These are lists for **%s**. lists are how you sort similar people on %%%%"
 "site.name%%%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
 "blogging) service based on the Free Software [StatusNet](http://status.net/) "
 "tool. You can easily keep track of what they are doing by subscribing to the "
-"tag's timeline."
+"list's timeline."
 msgstr ""
-"**%s** é un grupo de usuarios de %%%%site.name%%%%, un servizo de [mensaxes "
-"de blogue curtas](http://en.wikipedia.org/wiki/Microblogging) (en inglés) "
-"baseado na ferramenta de software libre [StatusNet](http://status.net/). Os "
-"seus membros comparten mensaxes curtas sobre as súas vidas e intereses. "
+"Estas son as listas de **%s**. As listas son o medio de clasificar xente "
+"similar en %%%%site.name%%%%, un servizo de [mensaxes de blogue curtas]"
+"(http://en.wikipedia.org/wiki/Microblogging) (en inglés) baseado na "
+"ferramenta de software libre [StatusNet](http://status.net/). Pode facer un "
+"seguimento do que fan subscribíndose á liña do tempo da lista."
 
 #. TRANS: Message displayed on page that displays lists a user was added to when there are none.
 #. TRANS: This message contains Markdown links in the form [description](links).
 #. TRANS: %s is a user nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "%s has not been [listed](%%%%doc.lists%%%%) by anyone yet."
-msgstr "Ninguén publicou aínda ningunha nota cunha [etiqueta](%%doc.tags%%)."
+msgstr "Ninguén [listou](%%%%doc.lists%%%%) a %s aínda."
 
 #. TRANS: Page title for list of list subscribers.
 #. TRANS: %1$s is a list, %2$s is a user nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "Subscribers to list %1$s by %2$s"
-msgstr "Subscribiuse a %s."
+msgstr "Subscritores da lista %1$s de %2$s"
 
 #. TRANS: Page title for list of list subscribers.
 #. TRANS: %1$s is a list, %2$s is a user nickname, %3$d is a page number.
-#, fuzzy, php-format
+#, php-format
 msgid "Subscribers to list %1$s by %2$s, page %3$d"
-msgstr "Notas etiquetadas con %1$s, páxina %2$d"
+msgstr "Subscritores da lista %1$s de %2$s, páxina %3$d"
 
 #. TRANS: Title for page that displays lists subscribed to by a user.
 #. TRANS: %s is a profile nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "Lists subscribed to by %s"
-msgstr "Subscribiuse a %s."
+msgstr "Listas ás que %s está subscrito"
 
 #. TRANS: Title for page that displays lists subscribed to by a user.
 #. TRANS: %1$s is a profile nickname, %2$d is a page number.
-#, fuzzy, php-format
+#, php-format
 msgid "Lists subscribed to by %1$s, page %2$d"
-msgstr "%1$s subscricións, páxina %2$d"
+msgstr "Listas ás que %1$s está subscrito, páxina %2$d"
 
 #. TRANS: Message displayed for anonymous users on page that displays lists subscribed to by a user.
 #. TRANS: This message contains Markdown links in the form [description](links).
 #. TRANS: %s is a profile nickname.
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "These are lists subscribed to by **%s**. Lists are how you sort similar "
 "people on %%%%site.name%%%%, a [micro-blogging](http://en.wikipedia.org/wiki/"
@@ -4298,10 +4011,11 @@ msgid ""
 "net/) tool. You can easily keep track of what they are doing by subscribing "
 "to the list's timeline."
 msgstr ""
-"**%s** é un grupo de usuarios de %%%%site.name%%%%, un servizo de [mensaxes "
-"de blogue curtas](http://en.wikipedia.org/wiki/Microblogging) (en inglés) "
-"baseado na ferramenta de software libre [StatusNet](http://status.net/). Os "
-"seus membros comparten mensaxes curtas sobre as súas vidas e intereses. "
+"Estas son as listas ás que **%s** está subscrito. As listas son o medio de "
+"clasificar xente similar en %%%%site.name%%%%, un servizo de [mensaxes de "
+"blogue curtas](http://en.wikipedia.org/wiki/Microblogging) (en inglés) "
+"baseado na ferramenta de software libre [StatusNet](http://status.net/). "
+"Pode facer un seguimento do que fan subscribíndose á liña do tempo da lista."
 
 #. TRANS: Page title for AJAX form return when a disabling a plugin.
 msgctxt "plugin"
@@ -4317,14 +4031,12 @@ msgid "This action only accepts POST requests."
 msgstr "Esta acción só permite solicitudes POST."
 
 #. TRANS: Client error displayed when trying to enable or disable a plugin without access rights.
-#, fuzzy
 msgid "You cannot administer plugins."
-msgstr "Non pode borrar usuarios."
+msgstr "Non pode administrar os complementos."
 
 #. TRANS: Client error displayed when trying to enable or disable a non-existing plugin.
-#, fuzzy
 msgid "No such plugin."
-msgstr "Esa páxina non existe."
+msgstr "Ese complemento non existe."
 
 #. TRANS: Page title for AJAX form return when enabling a plugin.
 msgctxt "plugin"
@@ -4332,7 +4044,6 @@ msgid "Enabled"
 msgstr "Activado"
 
 #. TRANS: Tab and title for plugins admin panel.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Plugins"
 msgstr "Complementos"
@@ -4343,43 +4054,35 @@ msgid ""
 "\"http://status.net/wiki/Plugins\">online plugin documentation</a> for more "
 "details."
 msgstr ""
+"Pódense activar complementos adicionais e configuralos manualmente. Bote "
+"unha ollada á <a href=\"http://status.net/wiki/Plugins\">documentación en "
+"liña</a> para obter máis información."
 
 #. TRANS: Admin form section header
-#, fuzzy
 msgid "Default plugins"
-msgstr "Lingua por defecto"
+msgstr "Complementos por defecto"
 
 #. TRANS: Text displayed on plugin admin page when no plugin are enabled.
 msgid ""
 "All default plugins have been disabled from the site's configuration file."
 msgstr ""
-
-#. TRANS: Client error displayed if the notice posted has too many characters.
-msgid "Invalid notice content."
-msgstr "O contido da nota é incorrecto."
-
-#. TRANS: Exception thrown if a notice's license is not compatible with the StatusNet site license.
-#. TRANS: %1$s is the notice license, %2$s is the StatusNet site's license.
-#, fuzzy, php-format
-msgid "Notice license \"%1$s\" is not compatible with site license \"%2$s\"."
-msgstr ""
-"A licenza \"%1$s\" da nota non é compatible coa licenza \"%2$s\" do sitio."
+"Todos os complementos por defecto foron desactivados do ficheiro de "
+"configuración do sitio."
 
 #. TRANS: Client error displayed when trying to add an unindentified field to profile.
 #. TRANS: %s is a field name.
 #, php-format
 msgid "Unidentified field %s."
-msgstr ""
+msgstr "Campo \"%s\" non identificado."
 
 #. TRANS: Page title.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Search results"
-msgstr "Buscar no sitio"
+msgstr "Resultados da procura"
 
 #. TRANS: Error message in case a search is shorter than three characters.
 msgid "The search string must be at least 3 characters long."
-msgstr ""
+msgstr "O texto de procura debe conter un mínimo de 3 caracteres."
 
 #. TRANS: Page title for profile settings.
 msgid "Profile settings"
@@ -4399,11 +4102,10 @@ msgstr "Información do perfil"
 #. TRANS: Tooltip for field label in form for profile settings.
 #. TRANS: Field title on account registration page.
 #. TRANS: Field title on group edit form.
-#, fuzzy
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr ""
 "Entre 1 e 64 letras minúsculas ou números, sen signos de puntuación, "
-"espazos, tiles ou eñes"
+"espazos, tiles ou eñes."
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Field label on account registration page.
@@ -4420,9 +4122,8 @@ msgstr "Páxina persoal"
 
 #. TRANS: Tooltip for field label in form for profile settings.
 #. TRANS: Field title on account registration page.
-#, fuzzy
 msgid "URL of your homepage, blog, or profile on another site."
-msgstr "URL da súa páxina persoal, blogue ou perfil noutro sitio"
+msgstr "URL da súa páxina persoal, blogue ou perfil noutro sitio."
 
 #. TRANS: Tooltip for field label in form for profile settings. Plural
 #. TRANS: is decided by the number of characters available for the
@@ -4430,17 +4131,16 @@ msgstr "URL da súa páxina persoal, blogue ou perfil noutro sitio"
 #. TRANS: Text area title in form for account registration. Plural
 #. TRANS: is decided by the number of characters available for the
 #. TRANS: biography (%d).
-#, fuzzy, php-format
+#, php-format
 msgid "Describe yourself and your interests in %d character."
 msgid_plural "Describe yourself and your interests in %d characters."
-msgstr[0] "Descríbase a vostede e mailos seus intereses en %d caracteres"
-msgstr[1] "Descríbase a vostede e mailos seus intereses en %d caracteres"
+msgstr[0] "Descríbase a vostede e mailos seus intereses en %d carácter."
+msgstr[1] "Descríbase a vostede e mailos seus intereses en %d caracteres."
 
 #. TRANS: Tooltip for field label in form for profile settings.
 #. TRANS: Text area title on account registration page.
-#, fuzzy
 msgid "Describe yourself and your interests."
-msgstr "Descríbase a vostede e mailos seus intereses"
+msgstr "Descríbase a vostede e mailos seus intereses."
 
 #. TRANS: Text area label in form for profile settings where users can provide
 #. TRANS: their biography.
@@ -4453,39 +4153,39 @@ msgstr "Biografía"
 #. TRANS: Field label on group edit form.
 #. TRANS: Dropdown option for searching in profiles.
 msgid "Location"
-msgstr "Lugar"
+msgstr "Localización"
 
 #. TRANS: Tooltip for field label in form for profile settings.
 #. TRANS: Field title on account registration page.
-#, fuzzy
 msgid "Where you are, like \"City, State (or Region), Country\"."
-msgstr "Onde está a vivir, coma “localidade, provincia (ou comunidade), país�"
+msgstr ""
+"Onde está a vivir, coma \"localidade, provincia (ou comunidade), país\"."
 
 #. TRANS: Checkbox label in form for profile settings.
 msgid "Share my current location when posting notices"
 msgstr "Compartir o lugar onde vivo ao publicar notas"
 
 #. TRANS: Field label in form for profile settings.
+#. TRANS: Title for group tag cloud section.
+#. TRANS: %s is a group name.
 msgid "Tags"
 msgstr "Etiquetas"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#, fuzzy
 msgid ""
 "Tags for yourself (letters, numbers, -, ., and _), comma- or space- "
 "separated."
 msgstr ""
 "Etiquetas para vostede (letras salvo eñes e tiles, números, puntos, guións e "
-"guións baixos), separados por comas ou espazos"
+"guións baixos), separados por comas ou espazos."
 
 #. TRANS: Dropdownlist label in form for profile settings.
 msgid "Language"
 msgstr "Lingua"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#, fuzzy
 msgid "Preferred language."
-msgstr "Lingua escollida"
+msgstr "Lingua preferida."
 
 #. TRANS: Dropdownlist label in form for profile settings.
 msgid "Timezone"
@@ -4496,43 +4196,44 @@ msgid "What timezone are you normally in?"
 msgstr "En que fuso horario adoita estar?"
 
 #. TRANS: Checkbox label in form for profile settings.
-#, fuzzy
 msgid ""
-"Automatically subscribe to whoever subscribes to me (best for non-humans)."
+"Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr ""
 "Subscribirse automaticamente a quen se subscriba a min (o mellor para os "
 "bots)"
 
 #. TRANS: Dropdown field label on profile settings, for what policies to apply when someone else tries to subscribe to your updates.
-#, fuzzy
 msgid "Subscription policy"
-msgstr "Subscricións"
+msgstr "Política de subscrición"
 
 #. TRANS: Dropdown field option for following policy.
 msgid "Let anyone follow me"
-msgstr ""
+msgstr "Permitir que calquera me siga"
 
 #. TRANS: Dropdown field option for following policy.
 msgid "Ask me first"
-msgstr ""
+msgstr "Preguntarme primeiro"
 
 #. TRANS: Dropdown field title on group edit form.
 msgid "Whether other users need your permission to follow your updates."
 msgstr ""
+"Se os outros usuarios necesitan o seu permiso para seguir as súas "
+"actualizacións ou non."
 
 #. TRANS: Checkbox label in profile settings.
 msgid "Make updates visible only to my followers"
 msgstr ""
+"Facer as miñas actualizacións visibles unicamente para os meus seguidores"
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Plural form is used based on the maximum number of allowed
 #. TRANS: characters for the biography (%d).
 #. TRANS: Form validation error on registration page when providing too long a bio text.
 #. TRANS: %d is the maximum number of characters for bio; used for plural.
-#, fuzzy, php-format
+#, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
-msgstr[0] "A biografía é longa de máis (o límite son %d caracteres)."
+msgstr[0] "A biografía é longa de máis (o límite é %d carácter)."
 msgstr[1] "A biografía é longa de máis (o límite son %d caracteres)."
 
 #. TRANS: Validation error in form for profile settings.
@@ -4541,7 +4242,6 @@ msgid "Timezone not selected."
 msgstr "Non se escolleu ningún fuso horario."
 
 #. TRANS: Validation error in form for profile settings.
-#, fuzzy
 msgid "Language is too long (maximum 50 characters)."
 msgstr "A lingua é longa de máis (o límite é de 50 caracteres)."
 
@@ -4551,35 +4251,29 @@ msgstr "A lingua é longa de máis (o límite é de 50 caracteres)."
 #. TRANS: %s is the invalid tag.
 #. TRANS: Error displayed if a given tag is invalid.
 #. TRANS: %s is the invalid tag.
-#, fuzzy, php-format
+#, php-format
 msgid "Invalid tag: \"%s\"."
-msgstr "Etiqueta incorrecta: \"%s\""
+msgstr "Etiqueta incorrecta: \"%s\"."
 
 #. TRANS: Server error thrown when user profile settings could not be updated to
 #. TRANS: automatically subscribe to any subscriber.
-#, fuzzy
 msgid "Could not update user for autosubscribe or subscribe_policy."
-msgstr "Non se puido actualizar o usuario para subscribirse automaticamente."
+msgstr ""
+"Non se puido actualizar o usuario para subscribirse automaticamente ou "
+"política de subscrición."
 
 #. TRANS: Server error thrown when user profile location preference settings could not be updated.
-#, fuzzy
 msgid "Could not save location prefs."
-msgstr "Non se puideron gardar as preferencias de lugar."
+msgstr "Non se puideron gardar as preferencias de localización."
 
 #. TRANS: Server error thrown when user profile settings tags could not be saved.
 msgid "Could not save tags."
 msgstr "Non se puideron gardar as etiquetas."
 
-#. TRANS: Confirmation shown when user profile settings are saved.
-#. TRANS: Message after successful saving of administrative settings.
-msgid "Settings saved."
-msgstr "Gardouse a configuración."
-
 #. TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
 #. TRANS: Page title for page where a user account can be restored from backup.
-#, fuzzy
 msgid "Restore account"
-msgstr "Crear unha conta"
+msgstr "Restaurar a conta"
 
 #. TRANS: Client error displayed when requesting a public timeline page beyond the page limit.
 #. TRANS: %s is the page limit.
@@ -4588,8 +4282,8 @@ msgid "Beyond the page limit (%s)."
 msgstr "Alén do límite da páxina (%s)."
 
 #. TRANS: Server error displayed when a public timeline cannot be retrieved.
-msgid "Could not retrieve public stream."
-msgstr "Non se puido obter o fluxo público."
+msgid "Could not retrieve public timeline."
+msgstr "Non se puido obter a liña do tempo pública."
 
 #. TRANS: Title for all public timeline pages but the first.
 #. TRANS: %d is the page number.
@@ -4603,16 +4297,20 @@ msgid "Public timeline"
 msgstr "Liña do tempo pública"
 
 #. TRANS: Link description for public timeline feed.
-msgid "Public Stream Feed (RSS 1.0)"
-msgstr "Fonte de novas no fluxo público (RSS 1.0)"
+msgid "Public Timeline Feed (Activity Streams JSON)"
+msgstr "Fonte de novas da liña temporal pública (fluxo de actividade JSON)"
 
 #. TRANS: Link description for public timeline feed.
-msgid "Public Stream Feed (RSS 2.0)"
-msgstr "Fonte de novas no fluxo público (RSS 2.0)"
+msgid "Public Timeline Feed (RSS 1.0)"
+msgstr "Fonte de novas da liña temporal pública (RSS 1.0)"
 
 #. TRANS: Link description for public timeline feed.
-msgid "Public Stream Feed (Atom)"
-msgstr "Fonte de novas no fluxo público (Atom)"
+msgid "Public Timeline Feed (RSS 2.0)"
+msgstr "Fonte de novas da liña temporal pública (RSS 2.0)"
+
+#. TRANS: Link description for public timeline feed.
+msgid "Public Timeline Feed (Atom)"
+msgstr "Fonte de novas da liña temporal pública (Atom)"
 
 #. TRANS: Text displayed for public feed when there are no public notices.
 #, php-format
@@ -4620,7 +4318,7 @@ msgid ""
 "This is the public timeline for %%site.name%% but no one has posted anything "
 "yet."
 msgstr ""
-"Esta é a liña do tempo pública para %%site.name%% pero ninguén publicou nada "
+"Esta é a liña do tempo pública de %%site.name%%, pero ninguén publicou nada "
 "aínda."
 
 #. TRANS: Additional text displayed for public feed when there are no public notices for a logged in user.
@@ -4662,54 +4360,10 @@ msgstr ""
 "wikipedia.org/wiki/Microblogging) (en inglés) baseado na ferramenta de "
 "software libre [StatusNet](http://status.net/)."
 
-#. TRANS: Title for page with public list cloud.
-#, fuzzy
-msgid "Public list cloud"
-msgstr "Nube de etiquetas públicas"
-
-#. TRANS: Page notice for page with public list cloud.
-#. TRANS: %s is a StatusNet sitename.
-#, fuzzy, php-format
-msgid "These are largest lists on %s"
-msgstr "Estas son as etiquetas máis populares en %s "
-
-#. TRANS: Empty list message on page with public list cloud.
-#. TRANS: This message contains Markdown links in the form [description](link).
-#, fuzzy, php-format
-msgid "No one has [listed](%%doc.tags%%) anyone yet."
-msgstr "Ninguén publicou aínda ningunha nota cunha [etiqueta](%%doc.tags%%)."
-
-#. TRANS: Additional empty list message on page with public list cloud for logged in users.
-#, fuzzy
-msgid "Be the first to list someone!"
-msgstr "Sexa o primeiro en publicar unha!"
-
-#. TRANS: Additional empty list message on page with public list cloud for anonymous users.
-#. TRANS: This message contains Markdown links in the form [description](link).
-#, fuzzy, php-format
-msgid ""
-"Why not [register an account](%%action.register%%) and be the first to list "
-"someone!"
-msgstr ""
-"Por que non [rexistrar unha conta](%%action.register%%) e ser o primeiro en "
-"publicar unha?"
-
-#. TRANS: DT element on on page with public list cloud.
-#, fuzzy
-msgid "List cloud"
-msgstr "Non se atopou o método da API."
-
-#. TRANS: Link title for number of listed people. %d is the number of listed people.
-#, php-format
-msgid "1 person listed"
-msgid_plural "%d people listed"
-msgstr[0] ""
-msgstr[1] ""
-
 #. TRANS: Public RSS feed description. %s is the StatusNet site name.
-#, fuzzy, php-format
+#, php-format
 msgid "%s updates from everyone."
-msgstr "%s actualizacións de todos!"
+msgstr "%s actualizacións de todos."
 
 #. TRANS: Title for public tag cloud.
 msgid "Public tag cloud"
@@ -4717,9 +4371,9 @@ msgstr "Nube de etiquetas públicas"
 
 #. TRANS: Instructions (more used like an explanation/header).
 #. TRANS: %s is the StatusNet sitename.
-#, fuzzy, php-format
+#, php-format
 msgid "These are most popular recent tags on %s"
-msgstr "Estas son as etiquetas máis populares en %s "
+msgstr "Estas son as etiquetas máis populares en %s"
 
 #. TRANS: This message contains a Markdown URL. The link description is between
 #. TRANS: square brackets, and the link between parentheses. Do not separate "]("
@@ -4807,7 +4461,6 @@ msgid "Recover"
 msgstr "Recuperar"
 
 #. TRANS: Button text on password recovery page.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Recover"
 msgstr "Recuperar"
@@ -4826,17 +4479,14 @@ msgid "Password recovery requested"
 msgstr "Solicitouse a recuperación do contrasinal"
 
 #. TRANS: Title for password recovery page in password saved mode.
-#, fuzzy
 msgid "Password saved"
-msgstr "Gardouse o contrasinal."
+msgstr "Gardouse o contrasinal"
 
 #. TRANS: Title for field label for password reset form.
-#, fuzzy
 msgid "6 or more characters, and do not forget it!"
 msgstr "Seis ou máis caracteres, e non o esqueza!"
 
 #. TRANS: Button text for password reset form.
-#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
 msgctxt "BUTTON"
 msgid "Reset"
 msgstr "Restablecer"
@@ -4845,20 +4495,6 @@ msgstr "Restablecer"
 msgid "Enter a nickname or email address."
 msgstr "Introduza un alcume ou enderezo de correo electrónico."
 
-#. TRANS: Information on password recovery form if no known username or e-mail address was specified.
-msgid "No user with that email address or username."
-msgstr ""
-"Non hai ningún usuario con ese enderezo de correo electrónico ou alcume."
-
-#. TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.
-msgid "No registered email address for that user."
-msgstr ""
-"Non se rexistrou ningún enderezo de correo electrónico para ese usuario."
-
-#. TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.
-msgid "Error saving address confirmation."
-msgstr "Houbo un erro ao gardar a confirmación do enderezo."
-
 #. TRANS: User notification after an e-mail with instructions was sent from the password recovery form.
 msgid ""
 "Instructions for recovering your password have been sent to the email "
@@ -4872,7 +4508,6 @@ msgid "Unexpected password reset."
 msgstr "Restablecemento de contrasinal inesperado."
 
 #. TRANS: Reset password form validation error message.
-#, fuzzy
 msgid "Password must be 6 characters or more."
 msgstr "O contrasinal debe ter seis ou máis caracteres."
 
@@ -4890,15 +4525,14 @@ msgid "New password successfully saved. You are now logged in."
 msgstr "O novo contrasinal gardouse correctamente. Agora está identificado."
 
 #. TRANS: Client exception thrown when no ID parameter was provided.
-#, fuzzy
 msgid "No id parameter."
 msgstr "Sen argumento ID."
 
 #. TRANS: Client exception thrown when an invalid ID parameter was provided for a file.
 #. TRANS: %d is the provided ID for which the file is not present (number).
-#, fuzzy, php-format
+#, php-format
 msgid "No such file \"%d\"."
-msgstr "Non existe tal ficheiro."
+msgstr "Non existe o ficheiro \"%d\"."
 
 #. TRANS: Client error displayed when trying to register to an invite-only site without an invitation.
 msgid "Sorry, only invited people can register."
@@ -4913,7 +4547,6 @@ msgid "Registration successful"
 msgstr "Rexistrouse correctamente"
 
 #. TRANS: Title for registration page.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Register"
 msgstr "Rexistrarse"
@@ -4923,7 +4556,6 @@ msgid "Registration not allowed."
 msgstr "Non se permite o rexistro."
 
 #. TRANS: Form validation error displayed when trying to register without agreeing to the site license.
-#, fuzzy
 msgid "You cannot register if you do not agree to the license."
 msgstr "Non pode rexistrarse se non acepta a licenza."
 
@@ -4936,39 +4568,33 @@ msgid "Invalid username or password."
 msgstr "O nome de usuario ou contrasinal non son correctos."
 
 #. TRANS: Page notice on registration page.
-#, fuzzy
 msgid ""
 "With this form you can create a new account. You can then post notices and "
 "link up to friends and colleagues."
 msgstr ""
 "Con este formulario pode crear unha conta nova. Entón poderá publicar notas "
-"e porse en contacto con amigos e compañeiros. "
+"e porse en contacto con amigos e compañeiros."
 
 #. TRANS: Field label on account registration page. In this field the password has to be entered a second time.
-#, fuzzy
 msgctxt "PASSWORD"
 msgid "Confirm"
 msgstr "Confirmar"
 
 #. TRANS: Field label on account registration page.
-#, fuzzy
 msgctxt "LABEL"
 msgid "Email"
 msgstr "Correo electrónico"
 
 #. TRANS: Field title on account registration page.
-#, fuzzy
 msgid "Used only for updates, announcements, and password recovery."
 msgstr ""
-"Só se utiliza para actualizacións, anuncios e recuperación de contrasinais"
+"Só se utiliza para actualizacións, anuncios e recuperación de contrasinais."
 
 #. TRANS: Field title on account registration page.
-#, fuzzy
 msgid "Longer name, preferably your \"real\" name."
-msgstr "Nome longo, preferiblemente o seu nome \"real\""
+msgstr "Nome longo, preferiblemente o seu nome \"real\"."
 
 #. TRANS: Button text to register a user on account registration page.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Register"
 msgstr "Rexistrarse"
@@ -5050,87 +4676,11 @@ msgstr ""
 "(Debería recibir unha mensaxe por correo electrónico nuns intres, con "
 "instrucións para a confirmación do seu enderezo de correo electrónico.)"
 
-#. TRANS: Page notice for remote subscribe. This message contains Markdown links.
-#. TRANS: Ensure to keep the correct markup of [link description](link).
-#, php-format
-msgid ""
-"To subscribe, you can [login](%%action.login%%), or [register](%%action."
-"register%%) a new  account. If you already have an account  on a [compatible "
-"microblogging site](%%doc.openmublog%%),  enter your profile URL below."
-msgstr ""
-"Para subscribirse, pode [identificarse](%%action.login%%) ou [rexistrar](%%"
-"action.register%%) unha conta nova. Se xa ten unha conta nun [sitio de "
-"mensaxes de blogue curtas compatible](%%doc.openmublog%%), introduza a "
-"continuación o URL do seu perfil."
-
-#. TRANS: Page title for Remote subscribe.
-msgid "Remote subscribe"
-msgstr "Subscribirse remotamente"
-
-#. TRANS: Field legend on page for remote subscribe.
-msgid "Subscribe to a remote user"
-msgstr "Subscribirse a un usuario remoto"
-
-#. TRANS: Field label on page for remote subscribe.
-msgid "User nickname"
-msgstr "Alcume do usuario"
-
-#. TRANS: Field title on page for remote subscribe.
-#, fuzzy
-msgid "Nickname of the user you want to follow."
-msgstr "Alcume do usuario ao que quere seguir"
-
-#. TRANS: Field label on page for remote subscribe.
-msgid "Profile URL"
-msgstr "URL do perfil"
-
-#. TRANS: Field title on page for remote subscribe.
-#, fuzzy
-msgid "URL of your profile on another compatible microblogging service."
-msgstr ""
-"URL do seu perfil noutro servizo de mensaxes de blogue curtas compatible"
-
-#. TRANS: Button text on page for remote subscribe.
-#. TRANS: Link text for link that will subscribe to a remote profile.
-#. TRANS: Button text to subscribe to a user.
-#. TRANS: Button text for subscribing to a list.
-#, fuzzy
-msgctxt "BUTTON"
-msgid "Subscribe"
-msgstr "Subscribirse"
-
-#. TRANS: Form validation error on page for remote subscribe when an invalid profile URL was provided.
-#, fuzzy
-msgid "Invalid profile URL (bad format)."
-msgstr "O enderezo URL do perfil é incorrecto (formato erróneo)"
-
-#. TRANS: Form validation error on page for remote subscribe when no the provided profile URL
-#. TRANS: does not contain expected data.
-msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
-msgstr ""
-"Non é un URL de perfil correcto (non hai un documento YADIS ou definiuse un "
-"XRDS incorrecto)."
-
-#. TRANS: Form validation error on page for remote subscribe.
-#, fuzzy
-msgid "That is a local profile! Login to subscribe."
-msgstr "Ese é un perfil local! Identifíquese para subscribirse."
-
-#. TRANS: Form validation error on page for remote subscribe when the remote service is not providing a request token.
-#, fuzzy
-msgid "Could not get a request token."
-msgstr "Non se puido obter o pase solicitado."
-
-#. TRANS: Client error displayed when trying to (un)list an OMB 0.1 remote profile.
-#, fuzzy
-msgid "You cannot (un)list an OMB 0.1 remote profile with this action."
-msgstr "Non se pode subscribir a un perfil remoto OMB 0.1 con esta acción."
-
 #. TRANS: Client error displayed when an unknown error occurs while delisting a user.
 #. TRANS: %s is a username.
 #, php-format
 msgid "There was an unexpected error while delisting %s."
-msgstr ""
+msgstr "Houbo un erro inesperado ao retirar a %s da lista."
 
 #. TRANS: Client error displayed when an unknown error occurs while listing a user.
 #. TRANS: %s is a profile URL.
@@ -5139,11 +4689,12 @@ msgid ""
 "There was a problem listing %s. The remote server is probably not responding "
 "correctly, please try retrying later."
 msgstr ""
+"Houbo un problema ao engadir a %s á lista. Probablemente o servidor remoto "
+"non estea respondendo correctamente. Inténteo de novo máis tarde."
 
 #. TRANS: Title after removing a user from a list.
-#, fuzzy
 msgid "Unlisted"
-msgstr "Licenza"
+msgstr "Non listado"
 
 #. TRANS: Client error displayed when trying to repeat a notice while not logged in.
 msgid "Only logged-in users can repeat notices."
@@ -5178,6 +4729,12 @@ msgstr "Respostas a %s"
 msgid "Replies to %1$s, page %2$d"
 msgstr "Respostas a %1$s, páxina %2$d"
 
+#. TRANS: Link for feed with replies for a user.
+#. TRANS: %s is a user nickname.
+#, php-format
+msgid "Replies feed for %s (Activity Streams JSON)"
+msgstr "Fonte de novas coas respostas a %s (fluxo de actividade JSON)"
+
 #. TRANS: Link for feed with replies for a user.
 #. TRANS: %s is a user nickname.
 #, php-format
@@ -5228,25 +4785,22 @@ msgstr ""
 
 #. TRANS: RSS reply feed description.
 #. TRANS: %1$s is a user nickname, %2$s is the StatusNet site name.
-#, fuzzy, php-format
+#, php-format
 msgid "Replies to %1$s on %2$s."
-msgstr "Respostas a %1$s en %2$s!"
+msgstr "Respostas a %1$s en %2$s."
 
 #. TRANS: Client exception displayed when trying to restore an account while not logged in.
-#, fuzzy
 msgid "Only logged-in users can restore their account."
-msgstr "Só os usuarios identificados poden repetir notas."
+msgstr "Só os usuarios identificados poden restaurar a súa conta."
 
 #. TRANS: Client exception displayed when trying to restore an account without having restore rights.
-#, fuzzy
 msgid "You may not restore your account."
-msgstr "Aínda non rexistrou ningunha aplicación."
+msgstr "Non pode restaurar a súa conta."
 
 #. TRANS: Client exception displayed trying to restore an account while something went wrong uploading a file.
 #. TRANS: Client exception. No file; probably just a non-AJAX submission.
-#, fuzzy
 msgid "No uploaded file."
-msgstr "Cargar un ficheiro"
+msgstr "Ningún ficheiro cargado."
 
 #. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
@@ -5284,37 +4838,38 @@ msgstr "Houbo un erro no sistema ao cargar o ficheiro."
 
 #. TRANS: Client exception thrown when a feed is not an Atom feed.
 #. TRANS: Client exception thrown when an imported feed is not an Atom feed.
-#, fuzzy
 msgid "Not an Atom feed."
-msgstr "Todos os membros"
+msgstr "Non é unha fonte de novas Atom."
 
 #. TRANS: Success message when a feed has been restored.
 msgid ""
 "Feed has been restored. Your old posts should now appear in search and your "
 "profile page."
 msgstr ""
+"Restaurouse a fonte de novas. As súas mensaxes vellas debería aparecer agora "
+"na procura e na súa páxina de perfil."
 
 #. TRANS: Message when a feed restore is in progress.
 msgid "Feed will be restored. Please wait a few minutes for results."
-msgstr ""
+msgstr "A fonte de novas será restaurada. Agarde uns minutos."
 
 #. TRANS: Form instructions for feed restore.
 msgid ""
-"You can upload a backed-up stream in <a href=\"http://activitystrea.ms/"
+"You can upload a backed-up timeline in <a href=\"http://activitystrea.ms/"
 "\">Activity Streams</a> format."
 msgstr ""
+"Pode cargar unha copia de seguridade da liña do tempo en formato <a href="
+"\"http://activitystrea.ms/\">Activity Streams</a>."
 
 #. TRANS: Title for submit button to confirm upload of a user backup file for account restore.
-#, fuzzy
 msgid "Upload the file"
-msgstr "Cargar un ficheiro"
+msgstr "Cargar o ficheiro"
 
 #. TRANS: Client error displayed when trying to revoke a role without having the right to do that.
 msgid "You cannot revoke user roles on this site."
 msgstr "Non pode revogar os roles dos usuarios neste sitio."
 
 #. TRANS: Client error displayed when trying to revoke a role that is not set.
-#, fuzzy
 msgid "User does not have this role."
 msgstr "O usuario non ten este rol."
 
@@ -5334,18 +4889,17 @@ msgstr "O usuario xa está illado."
 
 #. TRANS: Client error displayed when trying to list a profile with an invalid list.
 #. TRANS: %s is the invalid list name.
-#, fuzzy, php-format
+#, php-format
 msgid "Not a valid list: %s."
-msgstr "A etiqueta de persoa non é correcta: %s."
+msgstr "A lista non é correcta: %s."
 
 #. TRANS: Page title for page showing self tags.
 #. TRANS: %1$s is a tag, %2$d is a page number.
-#, fuzzy, php-format
+#, php-format
 msgid "Users self-tagged with %1$s, page %2$d"
-msgstr "Usuarios etiquetados por si mesmos con %1$s - páxina %2$d"
+msgstr "Usuarios etiquetados por si mesmos con %1$s, páxina %2$d"
 
 #. TRANS: Title for the sessions administration panel.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Sessions"
 msgstr "Sesións"
@@ -5355,7 +4909,6 @@ msgid "Session settings for this StatusNet site"
 msgstr "Configuración de sesión para este sitio StatusNet"
 
 #. TRANS: Fieldset legend on the sessions administration panel.
-#, fuzzy
 msgctxt "LEGEND"
 msgid "Sessions"
 msgstr "Sesións"
@@ -5367,9 +4920,8 @@ msgstr "Manexar as sesións"
 
 #. TRANS: Checkbox title on the sessions administration panel.
 #. TRANS: Indicates if StatusNet should handle session administration.
-#, fuzzy
 msgid "Handle sessions ourselves."
-msgstr "Manexar ou non as sesións nós mesmos."
+msgstr "Manexar as sesións nós mesmos."
 
 #. TRANS: Checkbox label on the sessions administration panel.
 #. TRANS: Indicates if StatusNet should write session debugging output.
@@ -5377,14 +4929,12 @@ msgid "Session debugging"
 msgstr "Depuración da sesión"
 
 #. TRANS: Checkbox title on the sessions administration panel.
-#, fuzzy
 msgid "Enable debugging output for sessions."
 msgstr "Activar a saída de depuración para as sesións."
 
 #. TRANS: Title for submit button on the sessions administration panel.
-#, fuzzy
 msgid "Save session settings"
-msgstr "Gardar a configuración de acceso"
+msgstr "Gardar a configuración da sesión"
 
 #. TRANS: Client error displayed trying to display an OAuth application while not logged in.
 msgid "You must be logged in to view an application."
@@ -5397,10 +4947,10 @@ msgstr "Perfil da aplicación"
 #. TRANS: Information output on an OAuth application page.
 #. TRANS: %1$s is the application creator, %2$s is "read-only" or "read-write",
 #. TRANS: %3$d is the number of users using the OAuth application.
-#, fuzzy, php-format
+#, php-format
 msgid "Created by %1$s - %2$s access by default - %3$d user"
 msgid_plural "Created by %1$s - %2$s access by default - %3$d users"
-msgstr[0] "Creado por %1$s - acceso %2$s por defecto - %3$d usuarios"
+msgstr[0] "Creado por %1$s - acceso %2$s por defecto - %3$d usuario"
 msgstr[1] "Creado por %1$s - acceso %2$s por defecto - %3$d usuarios"
 
 #. TRANS: Header on the OAuth application page.
@@ -5408,10 +4958,9 @@ msgid "Application actions"
 msgstr "Accións da aplicación"
 
 #. TRANS: Link text to edit application on the OAuth application page.
-#, fuzzy
 msgctxt "EDITAPP"
 msgid "Edit"
-msgstr "Modificar"
+msgstr "Editar"
 
 #. TRANS: Button text on the OAuth application page.
 #. TRANS: Resets the OAuth consumer key and secret.
@@ -5422,13 +4971,32 @@ msgstr "Restablecer o contrasinal ou a pregunta secreta"
 msgid "Application info"
 msgstr "Información da aplicación"
 
+#. TRANS: Field label on application page.
+msgid "Consumer key"
+msgstr "Clave do consumidor"
+
+#. TRANS: Field label on application page.
+msgid "Consumer secret"
+msgstr "Pregunta secreta do consumidor"
+
+#. TRANS: Field label on application page.
+msgid "Request token URL"
+msgstr "Solicitar un URL de pase"
+
+#. TRANS: Field label on application page.
+msgid "Access token URL"
+msgstr "Acceder ao URL do pase"
+
+#. TRANS: Field label on application page.
+msgid "Authorize URL"
+msgstr "Autorizar o URL"
+
 #. TRANS: Note on the OAuth application page about signature support.
-#, fuzzy
 msgid ""
 "Note: HMAC-SHA1 signatures are supported. The plaintext signature method is "
 "not supported."
 msgstr ""
-"Nota: sopórtanse as sinaturas HMAC-SHA1. Non se soporta o método de asinado "
+"Nota: Sopórtanse as sinaturas HMAC-SHA1. Non se soporta o método de asinado "
 "con texto sinxelo."
 
 #. TRANS: Text in confirmation dialog to reset consumer key and secret for an OAuth application.
@@ -5447,6 +5015,11 @@ msgstr "Notas favoritas de %1$s, páxina %2$d"
 msgid "Could not retrieve favorite notices."
 msgstr "Non se puideron obter as notas favoritas."
 
+#. TRANS: Feed link text. %s is a username.
+#, php-format
+msgid "Feed for favorites of %s (Activity Streams JSON)"
+msgstr "Fonte de novas dos favoritos de %s (fluxos de actividade JSON)"
+
 #. TRANS: Feed link text. %s is a username.
 #, php-format
 msgid "Feed for favorites of %s (RSS 1.0)"
@@ -5508,6 +5081,11 @@ msgstr "Grupo %s"
 msgid "%1$s group, page %2$d"
 msgstr "Grupo %1$s, páxina %2$d"
 
+#. TRANS: Tooltip for feed link. %s is a group nickname.
+#, php-format
+msgid "Notice feed for %s group (Activity Streams JSON)"
+msgstr "Fonte de novas das notas do grupo %s (fluxos de actividade JSON)"
+
 #. TRANS: Tooltip for feed link. %s is a group nickname.
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
@@ -5528,43 +5106,8 @@ msgstr "Fonte de novas das notas do grupo %s (Atom)"
 msgid "FOAF for %s group"
 msgstr "Amigo dun amigo para o grupo %s"
 
-#. TRANS: Header for mini list of group members on a group page (h2).
-msgid "Members"
-msgstr "Membros"
-
-#. TRANS: Description for mini list of group members on a group page when the group has no members.
-#. TRANS: Content of "Listed" page if there are no listed users.
-#. TRANS: Content of "People following tag x" if there are no subscribed users.
-#. TRANS: Empty list message for tags.
-#. TRANS: Text for user subscription statistics if the user has no subscriptions.
-#. TRANS: Text for user subscriber statistics if user has no subscribers.
-#. TRANS: Text for user user group membership statistics if user is not a member of any group.
-#. TRANS: Default content for section/sidebar widget.
-msgid "(None)"
-msgstr "(Ningún)"
-
-#. TRANS: Link to all group members from mini list of group members if group has more than n members.
-msgid "All members"
-msgstr "Todos os membros"
-
-#. TRANS: Header for group statistics on a group page (h2).
-#. TRANS: H2 text for user statistics.
-msgid "Statistics"
-msgstr "Estatísticas"
-
-#. TRANS: Label for group creation date.
-#, fuzzy
-msgctxt "LABEL"
-msgid "Created"
-msgstr "Creado"
-
-#. TRANS: Label for member count in statistics on group page.
-msgctxt "LABEL"
-msgid "Members"
-msgstr "Membros"
-
 #. TRANS: Notice on group pages for anonymous users for StatusNet sites that accept new registrations.
-#. TRANS: **%s** is the group alias, %%%%site.name%%%% is the site name,
+#. TRANS: %s is the group name, %%%%site.name%%%% is the site name,
 #. TRANS: %%%%action.register%%%% is the URL for registration, %%%%doc.help%%%% is a URL to help.
 #. TRANS: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
 #, php-format
@@ -5583,25 +5126,19 @@ msgstr ""
 "e de moitos máis! ([Máis información](%%%%doc.help%%%%))"
 
 #. TRANS: Notice on group pages for anonymous users for StatusNet sites that accept no new registrations.
-#. TRANS: **%s** is the group alias, %%%%site.name%%%% is the site name,
+#. TRANS: %s is the group name, %%%%site.name%%%% is the site name,
 #. TRANS: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
 "wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
 "[StatusNet](http://status.net/) tool. Its members share short messages about "
-"their life and interests. "
+"their life and interests."
 msgstr ""
 "**%s** é un grupo de usuarios de %%%%site.name%%%%, un servizo de [mensaxes "
 "de blogue curtas](http://en.wikipedia.org/wiki/Microblogging) (en inglés) "
 "baseado na ferramenta de software libre [StatusNet](http://status.net/). Os "
-"seus membros comparten mensaxes curtas sobre as súas vidas e intereses. "
-
-#. TRANS: Title for list of group administrators on a group page.
-#, fuzzy
-msgctxt "TITLE"
-msgid "Admins"
-msgstr "Administradores"
+"seus membros comparten mensaxes curtas sobre as súas vidas e intereses."
 
 #. TRANS: Client error displayed requesting a single message that does not exist.
 msgid "No such message."
@@ -5624,9 +5161,8 @@ msgid "Message from %1$s on %2$s"
 msgstr "Mensaxe de %1$s en %2$s"
 
 #. TRANS: Client exception thrown when trying a view a notice the user has no access to.
-#, fuzzy
 msgid "Not available."
-msgstr "A mensaxería instantánea non está dispoñible."
+msgstr "Non dispoñible."
 
 #. TRANS: Client error displayed trying to show a deleted notice.
 msgid "Notice deleted."
@@ -5634,107 +5170,113 @@ msgstr "Borrouse a nota."
 
 #. TRANS: Title for private list timeline.
 #. TRANS: %1$s is a list, %2$s is a page number.
-#, fuzzy, php-format
+#, php-format
 msgid "Private timeline for %1$s list by you, page %2$d"
-msgstr "Usuarios etiquetados por si mesmos con %1$s - páxina %2$d"
+msgstr "Liña do tempo privada da súa lista %1$s, páxina %2$d"
 
 #. TRANS: Title for public list timeline where the viewer is the tagger.
 #. TRANS: %1$s is a list, %2$s is a page number.
-#, fuzzy, php-format
+#, php-format
 msgid "Timeline for %1$s list by you, page %2$d"
-msgstr "Usuarios etiquetados por si mesmos con %1$s - páxina %2$d"
+msgstr "Liña do tempo da súa lista %1$s, páxina %2$d"
 
 #. TRANS: Title for private list timeline.
 #. TRANS: %1$s is a list, %2$s is the tagger's nickname, %3$d is a page number.
-#, fuzzy, php-format
+#, php-format
 msgid "Timeline for %1$s list by %2$s, page %3$d"
-msgstr "Notas etiquetadas con %1$s, páxina %2$d"
+msgstr "Liña do tempo da lista %1$s de %2$s, páxina %3$d"
 
 #. TRANS: Title for private list timeline.
 #. TRANS: %s is a list.
 #, php-format
 msgid "Private timeline of %s list by you"
-msgstr ""
+msgstr "Liña do tempo privada da súa lista %s"
 
 #. TRANS: Title for public list timeline where the viewer is the tagger.
 #. TRANS: %s is a list.
 #, php-format
 msgid "Timeline for %s list by you"
-msgstr ""
+msgstr "Liña do tempo da súa lista %s"
 
 #. TRANS: Title for private list timeline.
 #. TRANS: %1$s is a list, %2$s is the tagger's nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "Timeline for %1$s list by %2$s"
-msgstr "Respostas a %1$s en %2$s!"
+msgstr "Liña do tempo da lista %1$s de %2$s"
 
 #. TRANS: Feed title.
 #. TRANS: %1$s is a list, %2$s is tagger's nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "Feed for %1$s list by %2$s (Atom)"
-msgstr "Fonte de novas dos favoritos de %s (Atom)"
+msgstr "Fonte de novas da lista %1$s de %2$s (Atom)"
 
 #. TRANS: Empty list message for list timeline.
 #. TRANS: %1$s is a list, %2$s is a tagger's nickname.
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "This is the timeline for %1$s list by %2$s but no one has posted anything "
 "yet."
 msgstr ""
-"Esta é a liña do tempo de %s e amigos pero ninguén publicou nada aínda."
+"Esta é a liña do tempo da lista %1$s de %2$s, pero ninguén publicou nada "
+"aínda."
 
 #. TRANS: Additional empty list message for list timeline for currently logged in user tagged tags.
 msgid "Try tagging more people."
-msgstr ""
+msgstr "Probe a etiquetar máis persoas."
 
 #. TRANS: Additional empty list message for list timeline.
 #. TRANS: This message contains Markdown links in the form [description](link).
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and start following "
 "this timeline!"
 msgstr ""
-"Por que non [rexistrar unha conta](%%action.register%%) e ser o primeiro en "
-"publicar unha?"
+"Por que non [rexistrar unha conta](%%action.register%%) e comezar a seguir "
+"esta liña do tempo?"
 
 #. TRANS: Header on show list page.
-#, fuzzy
+#. TRANS: Link description for link to list of users tagged with a tag (so part of a list).
 msgid "Listed"
-msgstr "Licenza"
+msgstr "Listado"
+
+#. TRANS: Content of "Listed" page if there are no listed users.
+#. TRANS: Content of "People following tag x" if there are no subscribed users.
+#. TRANS: Description for mini list of group members on a group page when the group has no members.
+#. TRANS: Empty list message for tags.
+#. TRANS: Text for user subscription statistics if the user has no subscriptions.
+#. TRANS: Text for user subscriber statistics if user has no subscribers.
+#. TRANS: Text for user user group membership statistics if user is not a member of any group.
+#. TRANS: Default content for section/sidebar widget.
+msgid "(None)"
+msgstr "(Ningún)"
 
 #. TRANS: Link for more "People in list x by a user"
 #. TRANS: if there are more than the mini list's maximum.
-#, fuzzy
 msgid "Show all"
-msgstr "Mostrar máis"
+msgstr "Mostrar todo"
 
 #. TRANS: Header for tag subscribers.
 #. TRANS: Link description for link to list of users subscribed to a tag.
 msgid "Subscribers"
 msgstr "Subscritores"
 
-#. TRANS: Link for more "People following tag x"
-#. TRANS: if there are more than the mini list's maximum.
-msgid "All subscribers"
-msgstr "Todos os subscritores"
-
-#. TRANS: Page title showing tagged notices in one user's stream.
+#. TRANS: Page title showing tagged notices in one user's timeline.
 #. TRANS: %1$s is the username, %2$s is the hash tag.
-#, fuzzy, php-format
+#, php-format
 msgid "Notices by %1$s tagged %2$s"
-msgstr "%1$s, páxina %2$d"
+msgstr "Notas de %1$s etiquetadas con %2$s"
 
-#. TRANS: Page title showing tagged notices in one user's stream.
+#. TRANS: Page title showing tagged notices in one user's timeline.
 #. TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number.
-#, fuzzy, php-format
+#, php-format
 msgid "Notices by %1$s tagged %2$s, page %3$d"
-msgstr "Notas etiquetadas con %1$s, páxina %2$d"
+msgstr "Notas de %1$s etiquetadas con %2$s, páxina %3$d"
 
-#. TRANS: Extended page title showing tagged notices in one user's stream.
+#. TRANS: Extended page title showing tagged notices in one user's timeline.
 #. TRANS: %1$s is the username, %2$d is the page number.
-#, fuzzy, php-format
+#, php-format
 msgid "Notices by %1$s, page %2$d"
-msgstr "Notas etiquetadas con %1$s, páxina %2$d"
+msgstr "Notas de %1$s, páxina %2$d"
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %1$s is a user nickname, %2$s is a hashtag.
@@ -5742,6 +5284,12 @@ msgstr "Notas etiquetadas con %1$s, páxina %2$d"
 msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
 msgstr "Fonte de novas das notas para %1$s etiquetadas con %2$s (RSS 1.0)"
 
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#, php-format
+msgid "Notice feed for %s (Activity Streams JSON)"
+msgstr "Fonte de novas das notas para %s (fluxos de actividade JSON)"
+
 #. TRANS: Title for link to notice feed.
 #. TRANS: %s is a user nickname.
 #, php-format
@@ -5766,10 +5314,10 @@ msgstr "Fonte de novas das notas para %s (Atom)"
 msgid "FOAF for %s"
 msgstr "Amigo dun amigo para %s"
 
-#. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
-#, fuzzy, php-format
+#. TRANS: First sentence of empty list message for a timeline. $1%s is a user nickname.
+#, php-format
 msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
-msgstr "Esta é a liña do tempo para %1$s pero %2$s aínda non publicou nada."
+msgstr "Esta é a liña do tempo de %1$s, pero %1$s aínda non publicou nada."
 
 #. TRANS: Second sentence of empty list message for a stream for the user themselves.
 msgid ""
@@ -5779,7 +5327,7 @@ msgstr ""
 "Viu algo interesante hoxe? Aínda non publicou ningunha nota, este sería un "
 "bo momento para comezar :)"
 
-#. TRANS: Second sentence of empty  list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
+#. TRANS: Second sentence of empty  list message for a non-self timeline. %1$s is a user nickname, %2$s is a part of a URL.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
 #, php-format
 msgid ""
@@ -5789,7 +5337,7 @@ msgstr ""
 "Pode probar a facerlle un aceno a %1$s ou [publicar algo dirixido a el ou "
 "ela](%%%%action.newnotice%%%%?status_textarea=%2$s)."
 
-#. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
+#. TRANS: Announcement for anonymous users showing a timeline if site registrations are open.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
 #, php-format
 msgid ""
@@ -5804,17 +5352,17 @@ msgstr ""
 "[Únase agora](%%%%action.register%%%%) para seguir as notas de **%s** e de "
 "moita máis xente! ([Máis información](%%%%doc.help%%%%))"
 
-#. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
+#. TRANS: Announcement for anonymous users showing a timeline if site registrations are closed or invite only.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
 "wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
-"[StatusNet](http://status.net/) tool. "
+"[StatusNet](http://status.net/) tool."
 msgstr ""
 "**%s** ten unha conta en %%%%site.name%%%%, un servizo de [mensaxes de "
 "blogue curtas](http://en.wikipedia.org/wiki/Microblogging) (en inglés) "
-"baseado na ferramenta de software libre [StatusNet](http://status.net/). "
+"baseado na ferramenta de software libre [StatusNet](http://status.net/)."
 
 #. TRANS: Link to the author of a repeated notice. %s is a linked nickname.
 #, php-format
@@ -5831,7 +5379,6 @@ msgid "User is already silenced."
 msgstr "O usuario xa está silenciado."
 
 #. TRANS: Title for site administration panel.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Site"
 msgstr "Sitio"
@@ -5848,6 +5395,14 @@ msgstr "O nome do sitio non pode quedar baleiro."
 msgid "You must have a valid contact email address."
 msgstr "Ten que ter un enderezo de correo electrónico de contacto correcto."
 
+#. TRANS: Client error displayed when a logo URL is not valid.
+msgid "Invalid logo URL."
+msgstr "URL do logo incorrecto."
+
+#. TRANS: Client error displayed when a SSL logo URL is invalid.
+msgid "Invalid SSL logo URL."
+msgstr "Enderezo URL do logo SSL incorrecto."
+
 #. TRANS: Client error displayed trying to save site settings with an invalid language code.
 #. TRANS: %s is the invalid language code.
 #, php-format
@@ -5863,53 +5418,46 @@ msgid "Dupe limit must be one or more seconds."
 msgstr "O tempo límite de repetición debe ser de 1 ou máis segundos."
 
 #. TRANS: Fieldset legend on site settings panel.
-#, fuzzy
 msgctxt "LEGEND"
 msgid "General"
 msgstr "Xeral"
 
 #. TRANS: Field label on site settings panel.
-#, fuzzy
 msgctxt "LABEL"
 msgid "Site name"
 msgstr "Nome do sitio"
 
 #. TRANS: Field title on site settings panel.
-#, fuzzy
 msgid "The name of your site, like \"Yourcompany Microblog\"."
 msgstr ""
 "O nome do seu sitio, como por exemplo \"O sitio de mensaxes de blogue curtas "
-"da miña empresa\""
+"da miña empresa\"."
 
 #. TRANS: Field label on site settings panel.
 msgid "Brought by"
 msgstr "Publicado por"
 
 #. TRANS: Field title on site settings panel.
-#, fuzzy
 msgid "Text used for credits link in footer of each page."
-msgstr "Texto utilizado para a ligazón aos créditos ao pé de cada páxina"
+msgstr "Texto utilizado para a ligazón aos créditos ao pé de cada páxina."
 
 #. TRANS: Field label on site settings panel.
 msgid "Brought by URL"
 msgstr "URL do publicador"
 
 #. TRANS: Field title on site settings panel.
-#, fuzzy
 msgid "URL used for credits link in footer of each page."
-msgstr "URL utilizado para a ligazón aos créditos ao pé de cada páxina"
+msgstr "URL utilizado para a ligazón aos créditos ao pé de cada páxina."
 
 #. TRANS: Field label on site settings panel.
 msgid "Email"
 msgstr "Correo electrónico"
 
 #. TRANS: Field title on site settings panel.
-#, fuzzy
 msgid "Contact email address for your site."
-msgstr "Enderezo de correo electrónico de contacto para o seu sitio"
+msgstr "Enderezo de correo electrónico de contacto para o seu sitio."
 
 #. TRANS: Fieldset legend on site settings panel.
-#, fuzzy
 msgctxt "LEGEND"
 msgid "Local"
 msgstr "Local"
@@ -5927,13 +5475,13 @@ msgid "Default language"
 msgstr "Lingua por defecto"
 
 #. TRANS: Dropdown title on site settings panel.
-msgid "Site language when autodetection from browser settings is not available"
+msgid ""
+"The site language when autodetection from browser settings is not available."
 msgstr ""
 "Lingua do sitio para cando a detección automática a partir do navegador non "
-"sexa posible"
+"sexa posible."
 
 #. TRANS: Fieldset legend on site settings panel.
-#, fuzzy
 msgctxt "LEGEND"
 msgid "Limits"
 msgstr "Límites"
@@ -5956,9 +5504,21 @@ msgstr ""
 "Tempo (en segundos) que teñen que agardar os usuarios para publicar unha "
 "nota de novo."
 
+#. TRANS: Fieldset legend for form to change logo.
+msgid "Logo"
+msgstr "Logotipo"
+
+#. TRANS: Field label for StatusNet site logo.
+msgid "Site logo"
+msgstr "Logo do sitio"
+
+#. TRANS: Field label for SSL StatusNet site logo.
+msgid "SSL logo"
+msgstr "Logo SSL"
+
 #. TRANS: Button title for saving site settings.
-msgid "Save site settings"
-msgstr "Gardar a configuración do sitio"
+msgid "Save the site settings."
+msgstr "Gardar a configuración do sitio."
 
 #. TRANS: Page title for site-wide notice tab in admin panel.
 msgid "Site Notice"
@@ -5973,7 +5533,6 @@ msgid "Unable to save site notice."
 msgstr "Non se puido gardar a nota do sitio."
 
 #. TRANS: Client error displayed when a site-wide notice was longer than allowed.
-#, fuzzy
 msgid "Maximum length for the site-wide notice is 255 characters."
 msgstr "O tamaño máximo da nota global do sitio é de 255 caracteres."
 
@@ -5982,15 +5541,13 @@ msgid "Site notice text"
 msgstr "Texto da nota do sitio"
 
 #. TRANS: Tooltip for site-wide notice text field in admin panel.
-#, fuzzy
 msgid "Site-wide notice text (255 characters maximum; HTML allowed)"
 msgstr ""
 "Texto da nota global do sitio (255 caracteres como máximo, pode conter HTML)"
 
-#. TRANS: Title for button to save site notice in admin panel.
-#, fuzzy
+#. TRANS: Button title to save site notice in admin panel.
 msgid "Save site notice."
-msgstr "Gardar a nota do sitio"
+msgstr "Gardar a nota do sitio."
 
 #. TRANS: Title for SMS settings.
 msgid "SMS settings"
@@ -6036,11 +5593,10 @@ msgid "SMS phone number"
 msgstr "Número de teléfono para os SMS"
 
 #. TRANS: SMS phone number input field instructions in SMS settings form.
-#, fuzzy
 msgid "Phone number, no punctuation or spaces, with area code."
 msgstr ""
 "Número de teléfono, sen signos de puntuación nin espazos en branco, co "
-"código da zona"
+"código da zona."
 
 #. TRANS: Form legend for SMS preferences form.
 msgid "SMS preferences"
@@ -6087,9 +5643,8 @@ msgid "That is the wrong confirmation number."
 msgstr "Ese número de confirmación é incorrecto."
 
 #. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
-#, fuzzy
 msgid "Could not delete SMS confirmation."
-msgstr "Non se puido borrar a confirmación por mensaxería instantánea."
+msgstr "Non se puido borrar a confirmación por SMS."
 
 #. TRANS: Message given after successfully canceling SMS phone number confirmation.
 msgid "SMS confirmation cancelled."
@@ -6124,12 +5679,10 @@ msgstr ""
 "nesta lista, envíenos un correo electrónico para notificárnolo a %s."
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
-#, fuzzy
 msgid "No code entered."
-msgstr "Non se introduciu ningún código"
+msgstr "Non se introduciu ningún código."
 
 #. TRANS: Title for admin panel to configure snapshots.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Snapshots"
 msgstr "Instantáneas"
@@ -6151,7 +5704,6 @@ msgid "Invalid snapshot report URL."
 msgstr "URL de envío das instantáneas incorrecto."
 
 #. TRANS: Fieldset legend on admin panel for snapshots.
-#, fuzzy
 msgctxt "LEGEND"
 msgid "Snapshots"
 msgstr "Instantáneas"
@@ -6169,32 +5721,28 @@ msgid "Data snapshots"
 msgstr "Instantáneas de datos"
 
 #. TRANS: Dropdown title for snapshot method in admin panel for snapshots.
-#, fuzzy
 msgid "When to send statistical data to status.net servers."
-msgstr "Cando enviar información estatística aos servidores status.net"
+msgstr "Cando enviar información estatística aos servidores status.net."
 
 #. TRANS: Input field label for snapshot frequency in admin panel for snapshots.
 msgid "Frequency"
 msgstr "Frecuencia"
 
 #. TRANS: Input field title for snapshot frequency in admin panel for snapshots.
-#, fuzzy
 msgid "Snapshots will be sent once every N web hits."
-msgstr "As instantáneas enviaranse unha vez cada N accesos á rede"
+msgstr "As instantáneas enviaranse unha vez cada N accesos á rede."
 
 #. TRANS: Input field label for snapshot report URL in admin panel for snapshots.
 msgid "Report URL"
 msgstr "URL de envío"
 
 #. TRANS: Input field title for snapshot report URL in admin panel for snapshots.
-#, fuzzy
 msgid "Snapshots will be sent to this URL."
-msgstr "As instantáneas enviaranse a este URL"
+msgstr "As instantáneas enviaranse a este URL."
 
-#. TRANS: Title for button to save snapshot settings.
-#, fuzzy
+#. TRANS: Button title to save snapshot settings.
 msgid "Save snapshot settings."
-msgstr "Gardar a configuración das instantáneas"
+msgstr "Gardar a configuración das instantáneas."
 
 #. TRANS: Client error displayed trying a change a subscription for a non-subscribed profile.
 msgid "You are not subscribed to that profile."
@@ -6207,54 +5755,48 @@ msgstr "Non se puido gardar a subscrición."
 
 #. TRANS: Client error displayed when trying to approve group applicants without being a group administrator.
 msgid "You may only approve your own pending subscriptions."
-msgstr ""
+msgstr "Unicamente pode aprobar as súas propias subscricións pendentes."
 
 #. TRANS: Title of the first page showing pending subscribers still awaiting approval.
 #. TRANS: %s is the name of the user.
-#, fuzzy, php-format
+#, php-format
 msgid "%s subscribers awaiting approval"
-msgstr "Membros do grupo %s"
+msgstr "Subscritores de %s á espera de aprobación"
 
 #. TRANS: Title of all but the first page showing pending subscribersmembers still awaiting approval.
 #. TRANS: %1$s is the name of the user, %2$d is the page number of the members list.
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s subscribers awaiting approval, page %2$d"
-msgstr "Membros do grupo %1$s, páxina %2$d"
+msgstr "Subscritores de %1$s á espera de aprobación, páxina %2$d"
 
 #. TRANS: Page notice for group members page.
-#, fuzzy
 msgid "A list of users awaiting approval to subscribe to you."
-msgstr "Unha lista dos usuarios pertencentes a este grupo."
-
-#. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
-msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
-msgstr "Non se pode subscribir a un perfil remoto OMB 0.1 con esta acción."
+msgstr ""
+"Unha lista dos usuarios á espera de aprobación para subscribirse a vostede."
 
 #. TRANS: Page title when subscription succeeded.
 msgid "Subscribed"
 msgstr "Subscrito"
 
 #. TRANS: Client error displayed when trying to perform an action while not logged in.
-#, fuzzy
 msgid "You must be logged in to unsubscribe from a list."
-msgstr "Ten que iniciar sesión para crear un grupo."
+msgstr "Ten que iniciar sesión para cancelar a subscrición a unha lista."
 
 #. TRANS: Client error displayed when trying to perform an action without providing an ID.
-#, fuzzy
 msgid "No ID given."
 msgstr "Sen argumento ID."
 
 #. TRANS: Server error displayed subscribing to a list fails.
 #. TRANS: %1$s is a user nickname, %2$s is a list, %3$s is the error message (no period).
-#, fuzzy, php-format
+#, php-format
 msgid "Could not subscribe user %1$s to list %2$s: %3$s"
-msgstr "O usuario %1$s non se puido engadir ao grupo %2$s."
+msgstr "O usuario %1$s non se puido subscribir á lista %2$s: %3$s"
 
 #. TRANS: Title of form to subscribe to a list.
 #. TRANS: %1%s is a user nickname, %2$s is a list, %3$s is a tagger nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s subscribed to list %2$s by %3$s"
-msgstr "%1$s subscritores, páxina %2$d"
+msgstr "%1$s subscrito á lista %2$s de %3$s"
 
 #. TRANS: Header for list of subscribers for a user (first page).
 #. TRANS: %s is the user's nickname.
@@ -6280,13 +5822,12 @@ msgid "These are the people who listen to %s's notices."
 msgstr "Estas son as persoas que están seguindo as notas de %s."
 
 #. TRANS: Subscriber list text when the logged in user has no subscribers.
-#, fuzzy
 msgid ""
 "You have no subscribers. Try subscribing to people you know and they might "
 "return the favor."
 msgstr ""
 "Non ten subscritores. Probe a subscribirse a xente que coñeza e pode que lle "
-"devolvan o favor"
+"devolvan o favor."
 
 #. TRANS: Subscriber list text when looking at the subscribers for a of a user other
 #. TRANS: than the logged in user that has no subscribers. %s is the user nickname.
@@ -6333,14 +5874,12 @@ msgid ""
 "You're not listening to anyone's notices right now, try subscribing to "
 "people you know. Try [people search](%%action.peoplesearch%%), look for "
 "members in groups you're interested in and in our [featured users](%%action."
-"featured%%). If you're a [Twitter user](%%action.twittersettings%%), you can "
-"automatically subscribe to people you already follow there."
+"featured%%)."
 msgstr ""
 "Agora mesmo non está a seguir as notas de ninguén, probe a subscribirse a "
 "xente que coñeza. Intente [buscar xente](%%action.peoplesearch%%), buscar "
 "xente en grupos que lle interesen e nos nosos [usuarios destacados](%%action."
-"featured%%). Se é [usuario do Twitter](%%action.twittersettings%%), pode "
-"subscribirse automaticamente á xente que segue alí."
+"featured%%)."
 
 #. TRANS: Subscription list text when looking at the subscriptions for a of a user other
 #. TRANS: than the logged in user that has no subscriptions. %s is the user nickname.
@@ -6351,12 +5890,11 @@ msgid "%s is not listening to anyone."
 msgstr "%s non está seguindo a ninguén."
 
 #. TRANS: Atom feed title. %s is a profile nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "Subscription feed for %s (Atom)"
-msgstr "Fonte de novas das notas para %s (Atom)"
+msgstr "Fonte de novas de subscrición para %s (Atom)"
 
 #. TRANS: Checkbox label for enabling IM messages for a profile in a subscriptions list.
-#, fuzzy
 msgctxt "LABEL"
 msgid "IM"
 msgstr "MI"
@@ -6371,6 +5909,13 @@ msgstr "SMS"
 msgid "Notices tagged with %1$s, page %2$d"
 msgstr "Notas etiquetadas con %1$s, páxina %2$d"
 
+#. TRANS: Link label for feed on "notices with tag" page.
+#. TRANS: %s is the tag the feed is for.
+#, php-format
+msgid "Notice feed for tag %s (Activity Streams JSON)"
+msgstr ""
+"Fonte de novas das notas para a etiqueta %s (fluxos de actividade JSON)"
+
 #. TRANS: Link label for feed on "notices with tag" page.
 #. TRANS: %s is the tag the feed is for.
 #, php-format
@@ -6392,69 +5937,59 @@ msgstr "Fonte de novas das notas para a etiqueta %s (Atom)"
 #. TRANS: Client error displayed when trying to tag a user that cannot be tagged.
 #. TRANS: Client exception thrown trying to set a tag for a user that cannot be tagged.
 #. TRANS: Error displayed when trying to tag a user that cannot be tagged.
-#, fuzzy
 msgid "You cannot tag this user."
-msgstr "Non pode enviarlle unha mensaxe a este usuario."
+msgstr "Non pode etiquetar este usuario."
 
 #. TRANS: Title for list form when not on a profile page.
-#, fuzzy
 msgid "List a profile"
-msgstr "Perfil do usuario"
+msgstr "Listar un perfil"
 
 #. TRANS: Title for list form when on a profile page.
 #. TRANS: %s is a profile nickname.
-#, fuzzy, php-format
+#, php-format
 msgctxt "ADDTOLIST"
 msgid "List %s"
-msgstr "Límites"
+msgstr "Lista %s"
 
 #. TRANS: Title for list form when an error has occurred.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Error"
-msgstr "Houbo un erro de AJAX"
+msgstr "Erro"
 
 #. TRANS: Header in list form.
 msgid "User profile"
 msgstr "Perfil do usuario"
 
 #. TRANS: Fieldset legend for list form.
-#, fuzzy
 msgid "List user"
-msgstr "Límites"
+msgstr "Listar un usuario"
 
 #. TRANS: Field label on list form.
-#, fuzzy
 msgctxt "LABEL"
 msgid "Lists"
-msgstr "Límites"
+msgstr "Listas"
 
 #. TRANS: Field title on list form.
-#, fuzzy
 msgid ""
 "Lists for this user (letters, numbers, -, ., and _), comma- or space- "
 "separated."
 msgstr ""
-"Etiquetas para vostede (letras salvo eñes e tiles, números, puntos, guións e "
-"guións baixos), separados por comas ou espazos"
+"Listas para este usuario (letras salvo eñes e tiles, números, puntos, guións "
+"e guións baixos), separados por comas ou espazos."
 
 #. TRANS: Title for personal tag cloud section.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Tags"
 msgstr "Etiquetas"
 
 #. TRANS: Success message if lists are saved.
-#, fuzzy
 msgid "Lists saved."
-msgstr "Gardouse o contrasinal."
+msgstr "Listas gardadas."
 
 #. TRANS: Page notice.
-#, fuzzy
 msgid "Use this form to add your subscribers or subscriptions to lists."
 msgstr ""
-"Utilice este formulario para engadir etiquetas aos seus subscritores ou "
-"subscricións."
+"Utilice este formulario para engadir subscritores ou subscricións ás listas."
 
 #. TRANS: Client error when requesting a tag feed for a non-existing tag.
 msgid "No such tag."
@@ -6478,26 +6013,13 @@ msgstr "Cancelouse a subscrición"
 
 #. TRANS: Page title for form that allows unsubscribing from a list.
 #. TRANS: %1$s is a nickname, %2$s is a list, %3$s is a tagger nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s unsubscribed from list %2$s by %3$s"
-msgstr "%1$s subscritores, páxina %2$d"
-
-#. TRANS: Client error displayed when trying to update profile with an incompatible license.
-#. TRANS: %1$s is the license incompatible with site license %2$s.
-#. TRANS: Exception thrown when licenses are not compatible for an authorisation request.
-#. TRANS: %1$s is the license for the listenee, %2$s is the license for "this" StatusNet site.
-#, fuzzy, php-format
-msgid ""
-"Listenee stream license \"%1$s\" is not compatible with site license \"%2$s"
-"\"."
-msgstr ""
-"A licenza \"%1$s\" das transmisións da persoa seguida non é compatible coa "
-"licenza deste sitio: \"%2$s\"."
+msgstr "%1$s non subscrito á lista %2$s de %3$s"
 
 #. TRANS: Title of URL settings tab in profile settings.
-#, fuzzy
 msgid "URL settings"
-msgstr "Configuración da mensaxería instantánea"
+msgstr "Configuración do URL"
 
 #. TRANS: Instructions for tab "Other" in user profile settings.
 msgid "Manage various other options."
@@ -6510,9 +6032,8 @@ msgid " (free service)"
 msgstr " (servizo libre)"
 
 #. TRANS: Default value for URL shortening settings.
-#, fuzzy
 msgid "[none]"
-msgstr "Ningún"
+msgstr "[ningún]"
 
 #. TRANS: Default value for URL shortening settings.
 msgid "[internal]"
@@ -6528,41 +6049,44 @@ msgstr "Servizo de abreviación automática a usar."
 
 #. TRANS: Field label in URL settings in profile.
 msgid "URL longer than"
-msgstr ""
+msgstr "URL máis longo que"
 
 #. TRANS: Field title in URL settings in profile.
 msgid "URLs longer than this will be shortened, 0 means always shorten."
 msgstr ""
+"Os enderezos URL máis longos que isto serán acurtados. 0 significa que se "
+"acurtan sempre."
 
 #. TRANS: Field label in URL settings in profile.
 msgid "Text longer than"
-msgstr ""
+msgstr "Texto máis longo que"
 
 #. TRANS: Field title in URL settings in profile.
 msgid ""
 "URLs in notices longer than this will be shortened, 0 means always shorten."
 msgstr ""
+"Os enderezos URL nas notas máis longos que isto serán acurtados. 0 significa "
+"que se acurtan sempre."
 
 #. TRANS: Form validation error for form "Other settings" in user profile.
-#, fuzzy
 msgid "URL shortening service is too long (maximum 50 characters)."
 msgstr ""
 "O servizo de abreviación de enderezos URL é longo de máis (o límite está en "
 "50 caracteres)."
 
 #. TRANS: Client exception thrown when the maximum URL settings value is invalid in profile URL settings.
-#, fuzzy
 msgid "Invalid number for maximum URL length."
-msgstr "O contido da nota é incorrecto."
+msgstr "Número inválido para a lonxitude máxima do URL."
 
 #. TRANS: Client exception thrown when the maximum notice length settings value is invalid in profile URL settings.
-#, fuzzy
 msgid "Invalid number for maximum notice length."
-msgstr "O contido da nota é incorrecto."
+msgstr "Número inválido para a lonxitude máxima da nota."
 
 #. TRANS: Server exception thrown in profile URL settings when preferences could not be saved.
 msgid "Error saving user URL shortening preferences."
 msgstr ""
+"Erro ao gardar as preferencias de usuario sobre a abreviación de enderezos "
+"URL."
 
 #. TRANS: User admin panel title.
 msgctxt "TITLE"
@@ -6578,18 +6102,16 @@ msgid "Invalid bio limit. Must be numeric."
 msgstr "Límite da biografía incorrecto. Debe ser numérico."
 
 #. TRANS: Form validation error in user admin panel when welcome text is too long.
-#, fuzzy
 msgid "Invalid welcome text. Maximum length is 255 characters."
 msgstr "Texto de benvida incorrecto. A extensión máxima é de 255 caracteres."
 
 #. TRANS: Client error displayed when trying to set a non-existing user as default subscription for new
 #. TRANS: users in user admin panel. %1$s is the invalid nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "Invalid default subscripton: \"%1$s\" is not a user."
-msgstr "Subscrición por defecto incorrecta. \"%1$s\" non é un usuario."
+msgstr "Subscrición por defecto incorrecta: \"%1$s\" non é un usuario."
 
 #. TRANS: Fieldset legend in user administration panel.
-#, fuzzy
 msgctxt "LEGEND"
 msgid "Profile"
 msgstr "Perfil"
@@ -6611,7 +6133,6 @@ msgid "New user welcome"
 msgstr "Nova benvida para os usuarios"
 
 #. TRANS: Tooltip in user admin panel for setting new user welcome text.
-#, fuzzy
 msgid "Welcome text for new users (maximum 255 characters)."
 msgstr "Texto de benvida para os novos usuarios (255 caracteres como máximo)."
 
@@ -6635,164 +6156,9 @@ msgstr "Activáronse as invitacións"
 msgid "Whether to allow users to invite new users."
 msgstr "Permitir ou non que os usuarios poidan invitar a novos usuarios."
 
-#. TRANS: Title for button to save user settings in user admin panel.
-#, fuzzy
+#. TRANS: Button title to save user settings in user admin panel.
 msgid "Save user settings."
-msgstr "Gardar a configuración do usuario"
-
-#. TRANS: Page title.
-msgid "Authorize subscription"
-msgstr "Autorizar a subscrición"
-
-#. TRANS: Page notice on "Authorize subscription" page.
-#, fuzzy
-msgid ""
-"Please check these details to make sure that you want to subscribe to this "
-"user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
-"click \"Reject\"."
-msgstr ""
-"Verifique estes detalles para certificar que quere subscribirse ás notas "
-"deste usuario. Se non pediu a subscrición ás notas de alguén, prema en "
-"\"Rexeitar\"."
-
-#. TRANS: Button text on Authorise Subscription page.
-#. TRANS: Submit button text to accept a group membership request on approve group form.
-#. TRANS: Submit button text to accept a subscription request on approve sub form.
-#, fuzzy
-msgctxt "BUTTON"
-msgid "Accept"
-msgstr "Aceptar"
-
-#. TRANS: Title for button on Authorise Subscription page.
-#. TRANS: Button title to subscribe to a user.
-#, fuzzy
-msgid "Subscribe to this user."
-msgstr "Subscribirse a este usuario"
-
-#. TRANS: Button text on Authorise Subscription page.
-#. TRANS: Submit button text to reject a group membership request on approve group form.
-#. TRANS: Submit button text to reject a subscription request on approve sub form.
-#, fuzzy
-msgctxt "BUTTON"
-msgid "Reject"
-msgstr "Rexeitar"
-
-#. TRANS: Title for button on Authorise Subscription page.
-#, fuzzy
-msgid "Reject this subscription."
-msgstr "Rexeitar esta subscrición"
-
-#. TRANS: Client error displayed for an empty authorisation request.
-msgid "No authorization request!"
-msgstr "Non se solicitou a autorización!"
-
-#. TRANS: Accept message header from Authorise subscription page.
-msgid "Subscription authorized"
-msgstr "Autorizouse a subscrición"
-
-#. TRANS: Accept message text from Authorise subscription page.
-#, 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 ""
-"Autorizouse a subscrición, pero non se devolveu ningún URL. Bote unha ollada "
-"ás instrucións do sitio para saber máis sobre como autorizar a subscrición. "
-"O pase da súa subscrición é:"
-
-#. TRANS: Reject message header from Authorise subscription page.
-msgid "Subscription rejected"
-msgstr "Rexeitouse a subscrición"
-
-#. TRANS: Reject message from Authorise subscription page.
-#, 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 ""
-"Rexeitouse a subscrición, pero non se devolveu ningún URL. Bote unha ollada "
-"ás instrucións do sitio para obter máis información sobre como rexeitar "
-"completamente a subscrición."
-
-#. TRANS: Exception thrown when no valid user is found for an authorisation request.
-#. TRANS: %s is a listener URI.
-#, fuzzy, php-format
-msgid "Listener URI \"%s\" not found here."
-msgstr "Non se atopou o URI do seguidor, \"%s\", aquí."
-
-#. TRANS: Exception thrown when listenee URI is too long for an authorisation request.
-#. TRANS: %s is a listenee URI.
-#, fuzzy, php-format
-msgid "Listenee URI \"%s\" is too long."
-msgstr "O URI do seguidor, \"%s\", é longo de máis."
-
-#. TRANS: Exception thrown when listenee URI is a local user for an authorisation request.
-#. TRANS: %s is a listenee URI.
-#, fuzzy, php-format
-msgid "Listenee URI \"%s\" is a local user."
-msgstr "O URI do seguidor, \"%s\", é dun usuario local."
-
-#. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
-#. TRANS: %s is a profile URL.
-#, fuzzy, php-format
-msgid "Profile URL \"%s\" is for a local user."
-msgstr "O URL do perfil, \"%s\", pertence a un usuario local."
-
-#. TRANS: Exception thrown when avatar URL is invalid for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#, fuzzy, php-format
-msgid "Avatar URL \"%s\" is not valid."
-msgstr "O URL do avatar, \"%s\", é incorrecto."
-
-#. TRANS: Exception thrown when avatar URL could not be read for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#, fuzzy, php-format
-msgid "Cannot read avatar URL \"%s\"."
-msgstr "Non se puido ler o URL do avatar, \"%s\"."
-
-#. TRANS: Exception thrown when avatar URL return an invalid image type for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#, fuzzy, php-format
-msgid "Wrong image type for avatar URL \"%s\"."
-msgstr "O tipo de imaxe do URL do avatar, \"%s\", é incorrecto."
-
-#. TRANS: Title for profile design page.
-#. TRANS: Page title for profile design page.
-msgid "Profile design"
-msgstr "Deseño do perfil"
-
-#. TRANS: Instructions for Profile design page.
-#. TRANS: Instructions for profile design page.
-msgid ""
-"Customize the way your profile looks with a background image and a colour "
-"palette of your choice."
-msgstr ""
-"Personalice a aparencia do seu perfil cunha imaxe de fondo e unha paleta de "
-"cores escollida por vostede."
-
-#. TRANS: Succes message on Profile design page when finding an easter egg.
-msgid "Enjoy your hotdog!"
-msgstr "Bo proveito!"
-
-#. TRANS: Form legend on Profile design page.
-#, fuzzy
-msgid "Design settings"
-msgstr "Gardar a configuración do sitio"
-
-#. TRANS: Checkbox label on Profile design page.
-msgid "View profile designs"
-msgstr "Deseños visuais do perfil"
-
-#. TRANS: Title for checkbox on Profile design page.
-msgid "Show or hide profile designs."
-msgstr "Amosar ou agochar os deseños do perfil."
-
-#. TRANS: Form legend on Profile design page for form to choose a background image.
-#, fuzzy
-msgid "Background file"
-msgstr "Fondo"
+msgstr "Gardar a configuración do usuario."
 
 #. TRANS: Page title for all but the first page of groups for a user.
 #. TRANS: %1$s is a nickname, %2$d is a page number.
@@ -6834,11 +6200,11 @@ msgstr "%s de StatusNet"
 #. TRANS: %1$s is the engine name (StatusNet) and %2$s is the StatusNet version.
 #, php-format
 msgid ""
-"This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, "
+"This site is powered by %1$s version %2$s, Copyright 2008-2011 StatusNet, "
 "Inc. and contributors."
 msgstr ""
 "Este sitio foi desenvolvido sobre a versión %2$s de %1$s, propiedade de "
-"StatusNet, Inc. e colaboradores, 2008-2010."
+"StatusNet, Inc. e colaboradores, 2008-2011."
 
 #. TRANS: Header for StatusNet contributors section on the version page.
 msgid "Contributors"
@@ -6853,24 +6219,24 @@ msgid ""
 "StatusNet is free software: you can redistribute it and/or modify it under "
 "the terms of the GNU Affero General Public License as published by the Free "
 "Software Foundation, either version 3 of the License, or (at your option) "
-"any later version. "
+"any later version."
 msgstr ""
-"StatusNet é software libre: pode redistribuílo e modificalo baixo os termos "
-"da Licenza Pública Xeral Affero de GNU, tal e como a publicou a Free "
+"StatusNet é software libre: Pode redistribuílo e/ou modificalo baixo os "
+"termos da licenza pública xeral Affero de GNU, tal e como a publicou a Free "
 "Software Foundation, versión 3 ou calquera versión posterior (a elección do "
-"usuario) da licenza. "
+"usuario) da licenza."
 
 #. TRANS: Content part of StatusNet version page.
 msgid ""
 "This program is distributed in the hope that it will be useful, but WITHOUT "
 "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
 "FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License "
-"for more details. "
+"for more details."
 msgstr ""
 "Este programa distribúese coa esperanza de que resulte útil, pero SEN "
 "NINGUNHA GARANT�A, nin sequera as garantías implícitas de COMERCIALIZACIÓN "
-"ou IDONEIDADE PARA UN PROPÓSITO PARTICULAR. Lea a Licenza Pública Xeral "
-"Affero de GNU para máis información. "
+"ou IDONEIDADE PARA UN PROPÓSITO PARTICULAR. Lea a licenza pública xeral "
+"Affero de GNU para obter máis información."
 
 #. TRANS: Content part of StatusNet version page.
 #. TRANS: %s is a link to the AGPL license with link description "http://www.gnu.org/licenses/agpl.html".
@@ -6887,25 +6253,21 @@ msgid "Plugins"
 msgstr "Complementos"
 
 #. TRANS: Column header for plugins table on version page.
-#, fuzzy
 msgctxt "HEADER"
 msgid "Name"
 msgstr "Nome"
 
 #. TRANS: Column header for plugins table on version page.
-#, fuzzy
 msgctxt "HEADER"
 msgid "Version"
 msgstr "Versión"
 
 #. TRANS: Column header for plugins table on version page.
-#, fuzzy
 msgctxt "HEADER"
 msgid "Author(s)"
-msgstr "Autores"
+msgstr "Autor(es)"
 
 #. TRANS: Column header for plugins table on version page.
-#, fuzzy
 msgctxt "HEADER"
 msgid "Description"
 msgstr "Descrición"
@@ -6929,39 +6291,49 @@ msgstr "Non se pode procesar o URL \"%s\""
 msgid "Robin thinks something is impossible."
 msgstr "Robin pensa que algo é imposible."
 
+#. TRANS: Message used to be inserted as %2$s in  the text "No file may
+#. TRANS: be larger than %1$d byte and the file you sent was %2$s.".
+#. TRANS: %1$d is the number of bytes of an uploaded file.
+#, php-format
+msgid "%1$d byte"
+msgid_plural "%1$d bytes"
+msgstr[0] "%1$d byte"
+msgstr[1] "%1$d bytes"
+
 #. TRANS: Message given if an upload is larger than the configured maximum.
-#. TRANS: %1$d is the byte limit for uploads, %2$d is the byte count for the uploaded file.
-#. TRANS: %1$s is used for plural.
-#, fuzzy, php-format
+#. TRANS: %1$d (used for plural) is the byte limit for uploads,
+#. TRANS: %2$s is the proper form of "n bytes". This is the only ways to have
+#. TRANS: gettext support multiple plurals in the same message, unfortunately...
+#, php-format
 msgid ""
-"No file may be larger than %1$d byte and the file you sent was %2$d bytes. "
-"Try to upload a smaller version."
+"No file may be larger than %1$d byte and the file you sent was %2$s. Try to "
+"upload a smaller version."
 msgid_plural ""
-"No file may be larger than %1$d bytes and the file you sent was %2$d bytes. "
-"Try to upload a smaller version."
+"No file may be larger than %1$d bytes and the file you sent was %2$s. Try to "
+"upload a smaller version."
 msgstr[0] ""
-"Ningún ficheiro pode superar os %1$d bytes e o que enviou ocupaba %2$d. "
-"Probe a subir un ficheiro máis pequeno."
+"Ningún ficheiro pode superar o tamaño de %1$d byte e o que enviou ocupaba %2"
+"$s. Probe a subir un ficheiro máis pequeno."
 msgstr[1] ""
-"Ningún ficheiro pode superar os %1$d bytes e o que enviou ocupaba %2$d. "
+"Ningún ficheiro pode superar os %1$d bytes e o que enviou ocupaba %2$s. "
 "Probe a subir un ficheiro máis pequeno."
 
 #. TRANS: Message given if an upload would exceed user quota.
 #. TRANS: %d (number) is the user quota in bytes and is used for plural.
-#, fuzzy, php-format
+#, php-format
 msgid "A file this large would exceed your user quota of %d byte."
 msgid_plural "A file this large would exceed your user quota of %d bytes."
 msgstr[0] ""
-"Un ficheiro deste tamaño excedería a súa cota de usuario, que é de %d bytes."
+"Un ficheiro deste tamaño excedería a súa cota de usuario, que é de %d byte."
 msgstr[1] ""
 "Un ficheiro deste tamaño excedería a súa cota de usuario, que é de %d bytes."
 
 #. TRANS: Message given id an upload would exceed a user's monthly quota.
 #. TRANS: $d (number) is the monthly user quota in bytes and is used for plural.
-#, fuzzy, php-format
+#, php-format
 msgid "A file this large would exceed your monthly quota of %d byte."
 msgid_plural "A file this large would exceed your monthly quota of %d bytes."
-msgstr[0] "Un ficheiro deste tamaño excedería a súa cota mensual de %d bytes."
+msgstr[0] "Un ficheiro deste tamaño excedería a súa cota mensual de %d byte."
 msgstr[1] "Un ficheiro deste tamaño excedería a súa cota mensual de %d bytes."
 
 #. TRANS: Client exception thrown if a file upload does not have a valid name.
@@ -6972,13 +6344,13 @@ msgstr "Nome de ficheiro incorrecto."
 #. TRANS: %s is the invalid profile ID.
 #, php-format
 msgid "Profile ID %s is invalid."
-msgstr "A identificación do perfil, %s, é incorrecta."
+msgstr "O identificador do perfil, %s, é incorrecto."
 
 #. TRANS: Exception thrown providing an invalid group ID.
 #. TRANS: %s is the invalid group ID.
-#, fuzzy, php-format
+#, php-format
 msgid "Group ID %s is invalid."
-msgstr "Houbo un erro ao gardar o usuario. Incorrecto."
+msgstr "O identificador do grupo, %s, é incorrecto."
 
 #. TRANS: Exception thrown when joining a group fails.
 msgid "Group join failed."
@@ -7012,6 +6384,11 @@ msgstr "Non se puido actualizar o grupo local."
 msgid "Could not create login token for %s"
 msgstr "Non se puido crear un pase de sesión para %s"
 
+#. TRANS: Exception thrown when a program code class (%s) cannot be instantiated.
+#, php-format
+msgid "Cannot instantiate class %s."
+msgstr "Non se pode crear a instancia da clase %s."
+
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.
 msgid "No database name or DSN found anywhere."
 msgstr "Non se atopou por ningures o nome da base de datos ou DSN."
@@ -7035,9 +6412,9 @@ msgid "No such profile (%1$d) for notice (%2$d)."
 msgstr "Non existe tal perfil (%1$d) para a nota (%2$d)."
 
 #. TRANS: Server exception. %s are the error details.
-#, fuzzy, php-format
+#, php-format
 msgid "Database error inserting hashtag: %s."
-msgstr "Houbo un erro na base de datos ao intentar inserir a etiqueta: %s"
+msgstr "Houbo un erro na base de datos ao intentar inserir a etiqueta: %s."
 
 #. TRANS: Client exception thrown if a notice contains too many characters.
 msgid "Problem saving notice. Too long."
@@ -7067,24 +6444,20 @@ msgid "You are banned from posting notices on this site."
 msgstr "Prohibíuselle publicar notas neste sitio de momento."
 
 #. TRANS: Client exception thrown in notice when trying to repeat a missing or deleted notice.
-#, fuzzy
 msgid "Cannot repeat; original notice is missing or deleted."
-msgstr "Non pode repetir a súa propia nota."
+msgstr "Non se pode repetir; falta a nota orixinal ou esta foi borrada."
 
 #. TRANS: Client error displayed when trying to repeat an own notice.
-#, fuzzy
 msgid "You cannot repeat your own notice."
 msgstr "Non pode repetir a súa propia nota."
 
 #. TRANS: Client error displayed when trying to repeat a non-public notice.
-#, fuzzy
 msgid "Cannot repeat a private notice."
-msgstr "Non pode repetir a súa propia nota."
+msgstr "Non pode repetir unha nota privada."
 
 #. TRANS: Client error displayed when trying to repeat a notice you cannot access.
-#, fuzzy
 msgid "Cannot repeat a notice you cannot read."
-msgstr "Non pode repetir a súa propia nota."
+msgstr "Non pode repetir unha nota que non pode ler."
 
 #. TRANS: Client error displayed when trying to repeat an already repeated notice.
 msgid "You already repeated that notice."
@@ -7092,9 +6465,9 @@ msgstr "Xa repetiu esa nota."
 
 #. TRANS: Client error displayed when trying to reply to a notice a the target has no access to.
 #. TRANS: %1$s is a user nickname, %2$d is a notice ID (number).
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s has no access to notice %2$d."
-msgstr "O usuario non ten ningunha última nota."
+msgstr "%1$s non ten acceso á nota %2$d."
 
 #. TRANS: Server exception thrown when a notice cannot be saved.
 #. TRANS: Server exception thrown when a notice cannot be updated.
@@ -7102,9 +6475,8 @@ msgid "Problem saving notice."
 msgstr "Houbo un problema ao gardar a nota."
 
 #. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#, fuzzy
 msgid "Bad type provided to saveKnownGroups."
-msgstr "O tipo dado para saveKnownGroups era incorrecto"
+msgstr "O tipo dado para saveKnownGroups era incorrecto."
 
 #. TRANS: Server exception thrown when an update for a group inbox fails.
 msgid "Problem saving group inbox."
@@ -7118,7 +6490,7 @@ msgstr "RT @%1$s %2$s"
 
 #. TRANS: Full name of a profile or group (%1$s) followed by nickname (%2$s) in parentheses.
 #. TRANS: Full name of a profile or group followed by nickname in parens
-#, fuzzy, php-format
+#, php-format
 msgctxt "FANCYNAME"
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
@@ -7139,32 +6511,27 @@ msgstr ""
 
 #. TRANS: Server exception.
 msgid "The tag you are trying to rename to already exists."
-msgstr ""
+msgstr "A etiqueta á que intenta mudar o nome xa existe."
 
 #. TRANS: Server exception saving new tag without having a tagger specified.
-#, fuzzy
 msgid "No tagger specified."
-msgstr "Non se especificou ningún grupo."
+msgstr "Non se especificou ningún etiquetador."
 
 #. TRANS: Server exception saving new tag without having a tag specified.
-#, fuzzy
 msgid "No tag specified."
-msgstr "Non se especificou ningún grupo."
+msgstr "Non se especificou ningunha etiqueta."
 
 #. TRANS: Server exception saving new tag.
-#, fuzzy
 msgid "Could not create profile tag."
-msgstr "Non se puido gardar o perfil."
+msgstr "Non se puido crear a etiqueta de perfil."
 
 #. TRANS: Server exception saving new tag.
-#, fuzzy
 msgid "Could not set profile tag URI."
-msgstr "Non se puido gardar o perfil."
+msgstr "Non se puido definir o URI da etiqueta de perfil."
 
 #. TRANS: Server exception saving new tag.
-#, fuzzy
 msgid "Could not set profile tag mainpage."
-msgstr "Non se puido gardar o perfil."
+msgstr "Non se puido definir a páxina principal da etiqueta de perfil."
 
 #. TRANS: Client exception thrown trying to set more tags than allowed.
 #, php-format
@@ -7172,23 +6539,25 @@ msgid ""
 "You already have created %d or more tags which is the maximum allowed number "
 "of tags. Try using or deleting some existing tags."
 msgstr ""
+"Vostede xa creou %d ou máis etiquetas, que é o número máximo permitido. "
+"Intente usar ou borrar algunha das que xa existen."
 
 #. TRANS: Client exception thrown when trying to add more people than allowed to a list.
 #, php-format
 msgid ""
 "You already have %1$d or more people in list %2$s, which is the maximum "
-"allowed number.Try unlisting others first."
+"allowed number. Try unlisting others first."
 msgstr ""
+"Vostede xa ten %1$d ou máis persoas na lista %2$s, que é o número máximo "
+"permitido. Intente retirar algún da lista primeiro."
 
 #. TRANS: Exception thrown when inserting a list subscription in the database fails.
-#, fuzzy
 msgid "Adding list subscription failed."
-msgstr "Non se puido borrar a subscrición."
+msgstr "Erro ao engadir a subscrición á lista."
 
 #. TRANS: Exception thrown when deleting a list subscription from the database fails.
-#, fuzzy
 msgid "Removing list subscription failed."
-msgstr "Non se puido borrar a subscrición."
+msgstr "Erro ao eliminar a subscrición á lista."
 
 #. TRANS: Exception thrown when a right for a non-existing user profile is checked.
 msgid "Missing profile."
@@ -7199,7 +6568,6 @@ msgid "Unable to save tag."
 msgstr "Non se puido gardar a nota do sitio."
 
 #. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
-#. TRANS: Error message displayed to a banned user when they try to subscribe.
 msgid "You have been banned from subscribing."
 msgstr "Prohibíuselle realizar subscricións de momento."
 
@@ -7219,16 +6587,11 @@ msgstr "Non está subscrito!"
 msgid "Could not delete self-subscription."
 msgstr "Non se puido borrar a subscrición a si mesmo."
 
-#. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
-msgid "Could not delete subscription OMB token."
-msgstr "Non se puido borrar o pase de subscrición OMB."
-
 #. TRANS: Exception thrown when a subscription could not be deleted on the server.
 msgid "Could not delete subscription."
 msgstr "Non se puido borrar a subscrición."
 
 #. TRANS: Activity title when subscribing to another person.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Follow"
 msgstr "Seguir"
@@ -7247,7 +6610,7 @@ msgstr "Benvido a %1$s, @%2$s!"
 
 #. TRANS: Exception thrown when trying view "repeated to me".
 msgid "Not implemented since inbox change."
-msgstr ""
+msgstr "Non se integrou desde o cambio na caixa de entrada."
 
 #. TRANS: Server exception.
 msgid "No single user defined for single-user mode."
@@ -7255,7 +6618,21 @@ msgstr "Non se estableceu ningún usuario único para o modo de usuario único."
 
 #. TRANS: Server exception.
 msgid "Single-user mode code called when not enabled."
+msgstr "Chamouse ao código do modo de usuario único cando non estaba activado."
+
+#. TRANS: Information on password recovery form if no known username or e-mail address was specified.
+msgid "No user with that email address or username."
 msgstr ""
+"Non hai ningún usuario con ese enderezo de correo electrónico ou alcume."
+
+#. TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.
+msgid "No registered email address for that user."
+msgstr ""
+"Non se rexistrou ningún enderezo de correo electrónico para ese usuario."
+
+#. TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.
+msgid "Error saving address confirmation."
+msgstr "Houbo un erro ao gardar a confirmación do enderezo."
 
 #. TRANS: Server exception thrown when creating a group failed.
 msgid "Could not create group."
@@ -7275,21 +6652,21 @@ msgstr "Non se puido gardar a información do grupo local."
 
 #. TRANS: Exception thrown when an account could not be located when it should be moved.
 #. TRANS: %s is the remote site.
-#, fuzzy, php-format
+#, php-format
 msgid "Cannot locate account %s."
-msgstr "Non pode borrar usuarios."
+msgstr "Non se pode localizar a conta %s."
 
 #. TRANS: Exception thrown when a service document could not be located account move.
 #. TRANS: %s is the remote site.
 #, php-format
 msgid "Cannot find XRD for %s."
-msgstr ""
+msgstr "Non se pode atopar o XRD para %s."
 
 #. TRANS: Exception thrown when an account could not be located when it should be moved.
 #. TRANS: %s is the remote site.
 #, php-format
 msgid "No AtomPub API service for %s."
-msgstr ""
+msgstr "Non hai ningún servizo API de AtomPub para %s."
 
 #. TRANS: H2 for user actions in a profile.
 #. TRANS: H2 for entity actions in a profile.
@@ -7301,23 +6678,19 @@ msgid "User deletion in progress..."
 msgstr "Procedendo a borrar o usuario..."
 
 #. TRANS: Link title for link on user profile.
-#, fuzzy
 msgid "Edit profile settings."
-msgstr "Modificar a configuración do perfil"
+msgstr "Modificar a configuración do perfil."
 
 #. TRANS: Link text for link on user profile.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Edit"
 msgstr "Modificar"
 
 #. TRANS: Link title for link on user profile.
-#, fuzzy
 msgid "Send a direct message to this user."
-msgstr "Enviarlle unha mensaxe directa a este usuario"
+msgstr "Enviarlle unha mensaxe directa a este usuario."
 
 #. TRANS: Link text for link on user profile.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Message"
 msgstr "Mensaxe"
@@ -7355,7 +6728,6 @@ msgid "Show more"
 msgstr "Mostrar máis"
 
 #. TRANS: Inline reply form submit button: submits a reply comment.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Reply"
 msgstr "Responder"
@@ -7363,13 +6735,12 @@ msgstr "Responder"
 #. TRANS: Placeholder text for inline reply form. Clicking in this box will turn it into a mini notice form.
 #. TRANS: Field label for reply mini form.
 msgid "Write a reply..."
-msgstr ""
+msgstr "Escribir unha resposta..."
 
 #. TRANS: Tab on the notice form.
-#, fuzzy
 msgctxt "TAB"
 msgid "Status"
-msgstr "StatusNet"
+msgstr "Estado"
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
 #. TRANS: Text between [] is a link description, text between () is the link itself.
@@ -7445,57 +6816,55 @@ msgstr ""
 "Esperábase unha fonte de novas raíz pero recibiuse un documento XML completo."
 
 #. TRANS: Client exception thrown when using an unknown verb for the activity importer.
-#, fuzzy, php-format
+#, php-format
 msgid "Unknown verb: \"%s\"."
-msgstr "Non se coñece a lingua \"%s\"."
+msgstr "Verbo descoñecido: \"%s\"."
 
 #. TRANS: Client exception thrown when trying to force a subscription for an untrusted user.
 msgid "Cannot force subscription for untrusted user."
-msgstr ""
+msgstr "Non se pode forzar a subscrición a un usuario que non é de confianza."
 
 #. TRANS: Client exception thrown when trying to force a remote user to subscribe.
-#, fuzzy
 msgid "Cannot force remote user to subscribe."
-msgstr "Introduza o nome do usuario ao que quere subscribirse."
+msgstr "Non se pode forzar ao usuario remoto a que se subscriba."
 
 #. TRANS: Client exception thrown when trying to subscribe to an unknown profile.
-#, fuzzy
 msgid "Unknown profile."
-msgstr "Non se coñece o tipo de ficheiro"
+msgstr "Perfil descoñecido."
 
 #. TRANS: Client exception thrown when trying to import an event not related to the importing user.
 msgid "This activity seems unrelated to our user."
-msgstr ""
+msgstr "Semella que a actividade non está relacionada co noso usuario."
 
 #. TRANS: Client exception thrown when trying to join a remote group that is not a group.
 msgid "Remote profile is not a group!"
-msgstr ""
+msgstr "O perfil remoto non é un grupo!"
 
 #. TRANS: Client exception thrown when trying to join a group the importing user is already a member of.
-#, fuzzy
 msgid "User is already a member of this group."
-msgstr "Xa forma parte dese grupo."
+msgstr "O usuario xa forma parte dese grupo."
 
 #. TRANS: Client exception thrown when trying to import a notice by another user.
 #. TRANS: %1$s is the source URI of the notice, %2$s is the URI of the author.
 #, php-format
 msgid "Already know about notice %1$s and  it has a different author %2$s."
-msgstr ""
+msgstr "A nota %1$s xa é coñecida e ten un autor diferente %2$s."
 
 #. TRANS: Client exception thrown when trying to overwrite the author information for a non-trusted user during import.
 msgid "Not overwriting author info for non-trusted user."
 msgstr ""
+"Non se sobrescribiu a información de autor do usuario que non é de confianza."
 
 #. TRANS: Client exception thrown when trying to import a notice without content.
 #. TRANS: %s is the notice URI.
-#, fuzzy, php-format
+#, php-format
 msgid "No content for notice %s."
-msgstr "Buscar nos contidos das notas"
+msgstr "A nota %s non ten ningún contido."
 
 #. TRANS: Exception thrown if a non-existing user is provided. %s is a user ID.
-#, fuzzy, php-format
+#, php-format
 msgid "No such user \"%s\"."
-msgstr "Non existe tal usuario."
+msgstr "Non hai tal usuario \"%s\"."
 
 #. TRANS: Client exception thrown when post to collection fails with a 400 status.
 #. TRANS: %1$s is a URL, %2$s is the status, %s$s is the fail reason.
@@ -7503,10 +6872,10 @@ msgstr "Non existe tal usuario."
 #. TRANS: %1$s is a URL, %2$s is the status, %s$s is the fail reason.
 #. TRANS: Exception thrown when post to collection fails with a status that is not handled.
 #. TRANS: %1$s is a URL, %2$s is the status, %s$s is the fail reason.
-#, fuzzy, php-format
+#, php-format
 msgctxt "URLSTATUSREASON"
 msgid "%1$s %2$s %3$s"
-msgstr "%1$s - %2$s"
+msgstr "%1$s %2$s %3$s"
 
 #. TRANS: Client exception thrown when there is no source attribute.
 msgid "Can't handle remote content yet."
@@ -7536,29 +6905,12 @@ msgstr "showForm() non está integrado."
 msgid "saveSettings() not implemented."
 msgstr "saveSettings() non está integrado."
 
-#. TRANS: Client error message thrown if design settings could not be deleted in
-#. TRANS: the admin panel Design.
-msgid "Unable to delete design setting."
-msgstr "Non se puido borrar a configuración do deseño."
-
 #. TRANS: Header in administrator navigation panel.
-#. TRANS: Header in settings navigation panel.
-#, fuzzy
 msgctxt "HEADER"
 msgid "Home"
 msgstr "Inicio"
 
-#. TRANS: Menu item in administrator navigation panel.
-#. TRANS: Menu item in default local navigation panel.
-#. TRANS: Menu item in personal group navigation menu.
-#. TRANS: Menu item in settings navigation panel.
-#, fuzzy
-msgctxt "MENU"
-msgid "Home"
-msgstr "Inicio"
-
 #. TRANS: Header in administrator navigation panel.
-#, fuzzy
 msgctxt "HEADER"
 msgid "Admin"
 msgstr "Administrador"
@@ -7572,23 +6924,11 @@ msgctxt "MENU"
 msgid "Site"
 msgstr "Sitio"
 
-#. TRANS: Menu item title in administrator navigation panel.
-msgid "Design configuration"
-msgstr "Configuración do deseño"
-
-#. TRANS: Menu item in administrator navigation panel.
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: Menu item in settings navigation panel.
-msgctxt "MENU"
-msgid "Design"
-msgstr "Deseño"
-
 #. TRANS: Menu item title in administrator navigation panel.
 msgid "User configuration"
 msgstr "Configuración do usuario"
 
 #. TRANS: Menu item in administrator navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "User"
 msgstr "Usuario"
@@ -7598,7 +6938,6 @@ msgid "Access configuration"
 msgstr "Configuración de acceso"
 
 #. TRANS: Menu item in administrator navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Access"
 msgstr "Acceso"
@@ -7608,7 +6947,6 @@ msgid "Paths configuration"
 msgstr "Configuración das rutas"
 
 #. TRANS: Menu item in administrator navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Paths"
 msgstr "Rutas"
@@ -7618,7 +6956,6 @@ msgid "Sessions configuration"
 msgstr "Configuración das sesións"
 
 #. TRANS: Menu item in administrator navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Sessions"
 msgstr "Sesións"
@@ -7628,7 +6965,6 @@ msgid "Edit site notice"
 msgstr "Modificar a nota do sitio"
 
 #. TRANS: Menu item in administrator navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Site notice"
 msgstr "Nota do sitio"
@@ -7638,7 +6974,6 @@ msgid "Snapshots configuration"
 msgstr "Configuración das instantáneas"
 
 #. TRANS: Menu item in administrator navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Snapshots"
 msgstr "Instantáneas"
@@ -7648,18 +6983,15 @@ msgid "Set site license"
 msgstr "Definir a licenza do sitio"
 
 #. TRANS: Menu item in administrator navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "License"
 msgstr "Licenza"
 
 #. TRANS: Menu item title in administrator navigation panel.
-#, fuzzy
 msgid "Plugins configuration"
-msgstr "Configuración das rutas"
+msgstr "Configuración dos complementos"
 
 #. TRANS: Menu item in administrator navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Plugins"
 msgstr "Complementos"
@@ -7676,7 +7008,7 @@ msgstr "Non hai ningunha aplicación para esa clave."
 
 #. TRANS: Authorization exception thrown when a user without API access tries to access the API.
 msgid "Not allowed to use API."
-msgstr ""
+msgstr "Non ten permiso para usar a API."
 
 #. TRANS: OAuth exception given when an incorrect access token was given for a user.
 msgid "Bad access token."
@@ -7691,47 +7023,6 @@ msgstr "Non hai ningún usuario para ese pase."
 msgid "Could not authenticate you."
 msgstr "Non puidemos autenticalo."
 
-#. TRANS: Server error displayed when trying to create an anynymous OAuth consumer.
-#, fuzzy
-msgid "Could not create anonymous consumer."
-msgstr "Non se puideron crear os pseudónimos."
-
-#. TRANS: Server error displayed when trying to create an anynymous OAuth application.
-#, fuzzy
-msgid "Could not create anonymous OAuth application."
-msgstr "Non se puido crear a aplicación."
-
-#. TRANS: Exception thrown when no token association could be found.
-msgid ""
-"Could not find a profile and application associated with the request token."
-msgstr ""
-
-#. TRANS: Exception thrown when no access token can be issued.
-#, fuzzy
-msgid "Could not issue access token."
-msgstr "Non se puido inserir a mensaxe."
-
-#. TRANS: Exception thrown when a database error occurs.
-msgid "Database error inserting OAuth application user."
-msgstr ""
-"Houbo un erro na base de datos ao intentar inserir o usuario da aplicación "
-"OAuth."
-
-#. TRANS: Exception thrown when a database error occurs.
-#, fuzzy
-msgid "Database error updating OAuth application user."
-msgstr ""
-"Houbo un erro na base de datos ao intentar inserir o usuario da aplicación "
-"OAuth."
-
-#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
-msgid "Tried to revoke unknown token."
-msgstr "Intentouse revogar un pase descoñecido."
-
-#. TRANS: Exception thrown when an attempt is made to remove a revoked token.
-msgid "Failed to delete revoked token."
-msgstr "Erro ao borrar o pase revogado."
-
 #. TRANS: Form input field label for application icon.
 msgid "Icon"
 msgstr "Icona"
@@ -7746,10 +7037,10 @@ msgstr "Nome"
 
 #. TRANS: Form input field instructions.
 #. TRANS: %d is the number of available characters for the description.
-#, fuzzy, php-format
+#, php-format
 msgid "Describe your application in %d character"
 msgid_plural "Describe your application in %d characters"
-msgstr[0] "Describa a súa aplicación en %d caracteres"
+msgstr[0] "Describa a súa aplicación en %d carácter"
 msgstr[1] "Describa a súa aplicación en %d caracteres"
 
 #. TRANS: Form input field instructions.
@@ -7813,23 +7104,21 @@ msgstr ""
 "Permisos por defecto para esta aplicación: lectura ou lectura e escritura"
 
 #. TRANS: Submit button title.
-msgid "Cancel"
-msgstr "Cancelar"
+msgid "Cancel application changes."
+msgstr "Rexeitar os cambios na aplicación."
 
 #. TRANS: Submit button title.
-#. TRANS: Button text to save a list.
-msgid "Save"
-msgstr "Gardar"
+msgid "Save application changes."
+msgstr "Gardar os cambios na aplicación."
 
 #. TRANS: Name for an anonymous application in application list.
-#, fuzzy
 msgid "Unknown application"
-msgstr "Non se coñece esa acción"
+msgstr "Aplicación descoñecida"
 
 #. TRANS: Message has a leading space and a trailing space. Used in application list.
 #. TRANS: Before this message the application name is put, behind it the organisation that manages it.
 msgid " by "
-msgstr ""
+msgstr " por "
 
 #. TRANS: Application access type
 msgid "read-write"
@@ -7848,33 +7137,43 @@ msgstr "Aprobado o %1$s - permisos de \"%2$s\"."
 #. TRANS: %s are the first 7 characters of the access token.
 #, php-format
 msgid "Access token starting with: %s"
-msgstr ""
+msgstr "Pase de acceso que comeza por: %s"
 
 #. TRANS: Button label in application list to revoke access to user data.
 msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "Revogar"
 
+#. TRANS: Submit button text to accept a group membership request on approve group form.
+#. TRANS: Submit button text to accept a subscription request on approve sub form.
+msgctxt "BUTTON"
+msgid "Accept"
+msgstr "Aceptar"
+
+#. TRANS: Submit button text to reject a group membership request on approve group form.
+#. TRANS: Submit button text to reject a subscription request on approve sub form.
+msgctxt "BUTTON"
+msgid "Reject"
+msgstr "Rexeitar"
+
 #. TRANS: Atom feed exception thrown when an author element does not contain a name element.
-#, fuzzy
 msgid "Author element must contain a name element."
-msgstr "o elemento \"autor\" debe conter un nome."
+msgstr "O elemento \"author\" debe conter un elemento \"name\"."
 
 #. TRANS: Server exception thrown when using the method setActivitySubject() in the class Atom10Feed.
-#, fuzzy
 msgid "Do not use this method!"
-msgstr "Non borrar esta nota"
+msgstr "Non use ese método!"
 
 #. TRANS: Title in atom list notice feed. %1$s is a list name, %2$s is a tagger's nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "Timeline for people in list %1$s by %2$s"
-msgstr "Respostas a %1$s en %2$s!"
+msgstr "Liña do tempo da xente na lista %1$s de %2$s"
 
 #. TRANS: Message is used as a subtitle in atom list notice feed.
 #. TRANS: %1$s is a tagger's nickname, %2$s is a list name, %3$s is a site name.
-#, fuzzy, php-format
+#, php-format
 msgid "Updates from %1$s's list %2$s on %3$s!"
-msgstr "Actualizacións de %1$s en %2$s!"
+msgstr "Actualizacións da lista %2$s de %1$s en %3$s!"
 
 #. TRANS: Title.
 msgid "Notices where this attachment appears"
@@ -7885,14 +7184,12 @@ msgid "Tags for this attachment"
 msgstr "Etiquetas para este ficheiro"
 
 #. TRANS: Exception thrown when a password change fails.
-#, fuzzy
 msgid "Password changing failed."
-msgstr "Non se puido cambiar o contrasinal"
+msgstr "Non se puido cambiar o contrasinal."
 
 #. TRANS: Exception thrown when a password change attempt fails because it is not allowed.
-#, fuzzy
 msgid "Password changing is not allowed."
-msgstr "Non se permite cambiar o contrasinal"
+msgstr "Non se permite cambiar o contrasinal."
 
 #. TRANS: Title for the form to block a user.
 msgid "Block"
@@ -7905,22 +7202,20 @@ msgstr "Bloquear este usuario"
 #. TRANS: Submit button text on form to cancel group join request.
 msgctxt "BUTTON"
 msgid "Cancel join request"
-msgstr ""
+msgstr "Cancelar a solicitude de ingreso"
 
 #. TRANS: Button text for form action to cancel a subscription request.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Cancel subscription request"
-msgstr "Todas as subscricións"
+msgstr "Cancelar a solicitude de subscrición"
 
 #. TRANS: Title for command results.
 msgid "Command results"
 msgstr "Resultados da orde"
 
 #. TRANS: Title for command results.
-#, fuzzy
 msgid "AJAX error"
-msgstr "Houbo un erro de AJAX"
+msgstr "Erro de AJAX"
 
 #. TRANS: E-mail subject when a command has completed.
 #. TRANS: E-mail subject for reply to an e-mail command.
@@ -7981,9 +7276,8 @@ msgstr ""
 "Notas: %3$s"
 
 #. TRANS: Error message text shown when a favorite could not be set because it has already been favorited.
-#, fuzzy
 msgid "Could not create favorite: Already favorited."
-msgstr "Non se puido crear o favorito."
+msgstr "Non se puido crear o favorito: Xa está nos favoritos."
 
 #. TRANS: Text shown when a notice has been marked as favourite successfully.
 msgid "Notice marked as fave."
@@ -8005,21 +7299,21 @@ msgstr "%1$s deixou o grupo %2$s."
 #. TRANS: %1$s is the tagged user, %2$s is the error message (no punctuation).
 #, php-format
 msgid "Error tagging %1$s: %2$s"
-msgstr ""
+msgstr "Erro ao etiquetar a %1$s: %2$s"
 
 #. TRANS: Succes message displayed if tagging a user succeeds.
 #. TRANS: %1$s is the tagged user's nickname, %2$s is a list of tags.
 #. TRANS: Plural is decided based on the number of tags added (not part of message).
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s was tagged %2$s"
 msgid_plural "%1$s was tagged %2$s"
-msgstr[0] "%1$s - %2$s"
-msgstr[1] "%1$s - %2$s"
+msgstr[0] "%1$s foi etiquetado con %2$s"
+msgstr[1] "%1$s foi etiquetado con %2$s"
 
 #. TRANS: Separator for list of tags.
 #. TRANS: Separator in list of user names like "Jim, Bob, Mary".
 msgid ", "
-msgstr ""
+msgstr ", "
 
 #. TRANS: Error displayed if a given tag is invalid.
 #. TRANS: %s is the invalid tag.
@@ -8031,7 +7325,7 @@ msgstr "Etiqueta incorrecta: \"%s\""
 #. TRANS: %1$s is the untagged user, %2$s is the error message (no punctuation).
 #, php-format
 msgid "Error untagging %1$s: %2$s"
-msgstr ""
+msgstr "Erro ao desetiquetar a %1$s: %2$s"
 
 #. TRANS: Succes message displayed if untagging a user succeeds.
 #. TRANS: %1$s is the untagged user's nickname, %2$s is a list of tags.
@@ -8039,12 +7333,12 @@ msgstr ""
 #, php-format
 msgid "The following tag was removed from user %1$s: %2$s."
 msgid_plural "The following tags were removed from user %1$s: %2$s."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Eliminouse esta etiqueta do usuario %1$s: %2$s."
+msgstr[1] "Elimináronse estas etiquetas do usuario %1$s: %2$s."
 
 #. TRANS: Whois output.
 #. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#, fuzzy, php-format
+#, php-format
 msgctxt "WHOIS"
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
@@ -8087,13 +7381,12 @@ msgstr ""
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
 #. TRANS: Message given when a status is too long. %1$s is the maximum number of characters,
 #. TRANS: %2$s is the number of characters sent (used for plural).
-#, fuzzy, php-format
+#, php-format
 msgid "Message too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Message too long - maximum is %1$d characters, you sent %2$d."
-msgstr[0] ""
-"A mensaxe é longa de máis, o límite de caracteres é de %1$d, e enviou %2$d."
+msgstr[0] "A mensaxe é longa de máis. O límite é %1$d carácter, e enviou %2$d."
 msgstr[1] ""
-"A mensaxe é longa de máis, o límite de caracteres é de %1$d, e enviou %2$d."
+"A mensaxe é longa de máis. O límite son %1$d caracteres, e enviou %2$d."
 
 #. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
 msgid "You can't send a message to this user."
@@ -8111,11 +7404,10 @@ msgstr "Repetiuse a nota de %s."
 
 #. TRANS: Message given if content of a notice for a reply is too long. %1$d is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#, fuzzy, php-format
+#, php-format
 msgid "Notice too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Notice too long - maximum is %1$d characters, you sent %2$d."
-msgstr[0] ""
-"A nota é longa de máis. O límite son %1$d caracteres, e enviou %2$d."
+msgstr[0] "A nota é longa de máis. O límite é %1$d carácter, e enviou %2$d."
 msgstr[1] ""
 "A nota é longa de máis. O límite son %1$d caracteres, e enviou %2$d."
 
@@ -8232,163 +7524,150 @@ msgstr[0] "Vostede pertence a este grupo:"
 msgstr[1] "Vostede pertence a estes grupos:"
 
 #. TRANS: Header line of help text for commands.
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "Commands:"
-msgstr "Resultados da orde"
+msgstr "Comandos:"
 
 #. TRANS: Help message for IM/SMS command "on".
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "turn on notifications"
-msgstr "Non se pode activar a notificación."
+msgstr "activar as notificacións"
 
 #. TRANS: Help message for IM/SMS command "off".
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "turn off notifications"
-msgstr "Non se pode desactivar a notificación."
+msgstr "desactivar as notificacións"
 
 #. TRANS: Help message for IM/SMS command "help".
 msgctxt "COMMANDHELP"
 msgid "show this help"
-msgstr ""
+msgstr "mostrar esta axuda"
 
 #. TRANS: Help message for IM/SMS command "follow <nickname>".
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "subscribe to user"
-msgstr "Subscribirse a este usuario"
+msgstr "subscribirse ao usuario"
 
 #. TRANS: Help message for IM/SMS command "groups".
 msgctxt "COMMANDHELP"
 msgid "lists the groups you have joined"
-msgstr ""
+msgstr "listar os grupos aos que se uniu"
 
 #. TRANS: Help message for IM/SMS command "tag".
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "tag a user"
-msgstr "Etiquetar ao usuario"
+msgstr "etiquetar ao usuario"
 
 #. TRANS: Help message for IM/SMS command "untag".
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "untag a user"
-msgstr "Etiquetar ao usuario"
+msgstr "desetiquetar ao usuario"
 
 #. TRANS: Help message for IM/SMS command "subscriptions".
 msgctxt "COMMANDHELP"
 msgid "list the people you follow"
-msgstr ""
+msgstr "listar a xente á que segue"
 
 #. TRANS: Help message for IM/SMS command "subscribers".
 msgctxt "COMMANDHELP"
 msgid "list the people that follow you"
-msgstr ""
+msgstr "listar a xente que o segue"
 
 #. TRANS: Help message for IM/SMS command "leave <nickname>".
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "unsubscribe from user"
-msgstr "Cancelar a subscrición a este usuario"
+msgstr "cancelar a subscrición ao usuario"
 
 #. TRANS: Help message for IM/SMS command "d <nickname> <text>".
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "direct message to user"
-msgstr "Mensaxes directas a %s"
+msgstr "mensaxe directa ao usuario"
 
 #. TRANS: Help message for IM/SMS command "get <nickname>".
 msgctxt "COMMANDHELP"
 msgid "get last notice from user"
-msgstr ""
+msgstr "obter a última nota do usuario"
 
 #. TRANS: Help message for IM/SMS command "whois <nickname>".
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "get profile info on user"
-msgstr "Información do perfil"
+msgstr "obter a información do perfil do usuario"
 
 #. TRANS: Help message for IM/SMS command "lose <nickname>".
 msgctxt "COMMANDHELP"
 msgid "force user to stop following you"
-msgstr ""
+msgstr "forzar o usuario a deixar de seguilo"
 
 #. TRANS: Help message for IM/SMS command "fav <nickname>".
 msgctxt "COMMANDHELP"
 msgid "add user's last notice as a 'fave'"
-msgstr ""
+msgstr "engadir a última nota do usuario como favorita"
 
 #. TRANS: Help message for IM/SMS command "fav #<notice_id>".
 msgctxt "COMMANDHELP"
 msgid "add notice with the given id as a 'fave'"
-msgstr ""
+msgstr "engadir a nota co identificador especificado como favorita"
 
 #. TRANS: Help message for IM/SMS command "repeat #<notice_id>".
 msgctxt "COMMANDHELP"
 msgid "repeat a notice with a given id"
-msgstr ""
+msgstr "repetir a nota cun identificador especificado"
 
 #. TRANS: Help message for IM/SMS command "repeat <nickname>".
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "repeat the last notice from user"
-msgstr "Repetir esta nota"
+msgstr "repetir a última nota do usuario"
 
 #. TRANS: Help message for IM/SMS command "reply #<notice_id>".
 msgctxt "COMMANDHELP"
 msgid "reply to notice with a given id"
-msgstr ""
+msgstr "responder á nota cun identificador especificado"
 
 #. TRANS: Help message for IM/SMS command "reply <nickname>".
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "reply to the last notice from user"
-msgstr "Responder a esta nota"
+msgstr "responder á última nota do usuario"
 
 #. TRANS: Help message for IM/SMS command "join <group>".
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "join group"
-msgstr "Descoñecida"
+msgstr "unirse ao grupo"
 
 #. TRANS: Help message for IM/SMS command "login".
 msgctxt "COMMANDHELP"
 msgid "Get a link to login to the web interface"
-msgstr ""
+msgstr "Obter unha ligazón para iniciar sesión"
 
 #. TRANS: Help message for IM/SMS command "drop <group>".
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "leave group"
-msgstr "Borrar un grupo"
+msgstr "deixar o grupo"
 
 #. TRANS: Help message for IM/SMS command "stats".
 msgctxt "COMMANDHELP"
 msgid "get your stats"
-msgstr ""
+msgstr "obter as súas estatísticas"
 
 #. TRANS: Help message for IM/SMS command "stop".
 #. TRANS: Help message for IM/SMS command "quit".
 msgctxt "COMMANDHELP"
 msgid "same as 'off'"
-msgstr ""
+msgstr "igual que \"off\""
 
 #. TRANS: Help message for IM/SMS command "sub <nickname>".
 msgctxt "COMMANDHELP"
 msgid "same as 'follow'"
-msgstr ""
+msgstr "igual que \"follow\""
 
 #. TRANS: Help message for IM/SMS command "unsub <nickname>".
 msgctxt "COMMANDHELP"
 msgid "same as 'leave'"
-msgstr ""
+msgstr "igual que \"leave\""
 
 #. TRANS: Help message for IM/SMS command "last <nickname>".
 msgctxt "COMMANDHELP"
 msgid "same as 'get'"
-msgstr ""
+msgstr "igual que \"get\""
 
 #. TRANS: Help message for IM/SMS command "on <nickname>".
 #. TRANS: Help message for IM/SMS command "off <nickname>".
@@ -8399,26 +7678,23 @@ msgstr ""
 #. TRANS: Help message for IM/SMS command "untrack all".
 #. TRANS: Help message for IM/SMS command "tracks".
 #. TRANS: Help message for IM/SMS command "tracking".
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "not yet implemented."
-msgstr "Aínda non se integrou esa orde."
+msgstr "aínda non se integrou."
 
 #. TRANS: Help message for IM/SMS command "nudge <nickname>".
 msgctxt "COMMANDHELP"
 msgid "remind a user to update."
-msgstr ""
+msgstr "recordar un usuario a que actualice."
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#, fuzzy
 msgid "No configuration file found."
-msgstr "Non se atopou ningún ficheiro de configuración. "
+msgstr "Non se atopou ningún ficheiro de configuración."
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: Is followed by a list of directories (separated by HTML breaks).
-#, fuzzy
 msgid "I looked for configuration files in the following places:"
-msgstr "Buscáronse ficheiros de configuración nos seguintes lugares: "
+msgstr "Buscáronse ficheiros de configuración nos seguintes lugares:"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 msgid "You may wish to run the installer to fix this."
@@ -8429,31 +7705,26 @@ msgstr "Pode que queira executar o instalador para arranxalo."
 msgid "Go to the installer."
 msgstr "Ir ao instalador."
 
+#. TRANS: Header on conversation page. Hidden by default (h2).
+#. TRANS: Label for user statistics.
+msgid "Notices"
+msgstr "Notas"
+
 #. TRANS: Page title for when a database error occurs.
 msgid "Database error"
 msgstr "Houbo un erro na base de datos"
 
 #. TRANS: Menu item in default local navigation panel.
 #. TRANS: Menu item in search group navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Public"
 msgstr "Públicas"
 
-#. TRANS: Menu item in default local navigation panel.
-#. TRANS: Menu item in search group navigation panel.
-#. TRANS: Menu item in local navigation menu.
-#, fuzzy
-msgctxt "MENU"
-msgid "Groups"
-msgstr "Grupos"
-
 #. TRANS: Menu item in default local navigation panel.
 #. TRANS: Menu item title in local navigation menu.
-#, fuzzy
 msgctxt "MENU"
 msgid "Lists"
-msgstr "Límites"
+msgstr "Listas"
 
 #. TRANS: Title of form for deleting a user.
 #. TRANS: Link text in notice list item to delete a notice.
@@ -8464,74 +7735,37 @@ msgstr "Borrar"
 msgid "Delete this user"
 msgstr "Borrar o usuario"
 
-#. TRANS: Form legend of form for changing the page design.
-#, fuzzy
-msgid "Change design"
-msgstr "Gardar o deseño"
-
-#. TRANS: Fieldset legend on profile design page to change profile page colours.
-msgid "Change colours"
-msgstr "Cambiar as cores"
-
-#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-msgid "Use defaults"
-msgstr "Utilizar os valores por defecto"
-
-#. TRANS: Label in form on profile design page.
-#. TRANS: Field contains file name on user's computer that could be that user's custom profile background image.
-msgid "Upload file"
-msgstr "Cargar un ficheiro"
-
-#. TRANS: Instructions for form on profile design page.
-msgid ""
-"You can upload your personal background image. The maximum file size is 2MB."
-msgstr ""
-"Pode cargar a súa imaxe de fondo persoal. O ficheiro non pode ocupar máis de "
-"2MB."
-
-#. TRANS: Radio button on profile design page that will enable use of the uploaded profile image.
-#, fuzzy
-msgctxt "RADIO"
-msgid "On"
-msgstr "Activado"
-
-#. TRANS: Radio button on profile design page that will disable use of the uploaded profile image.
-#, fuzzy
-msgctxt "RADIO"
-msgid "Off"
-msgstr "Desactivado"
-
-#. TRANS: Success message displayed if design settings were saved after clicking "Use defaults".
-msgid "Design defaults restored."
-msgstr "Restableceuse o deseño por defecto."
-
 #. TRANS: Exception. %s is an ID.
-#, fuzzy, php-format
+#, php-format
 msgid "Unable to find services for %s."
-msgstr "Non se puido revogar o acceso da aplicación: %s."
+msgstr "Non se puideron atopar os servizos de %s."
 
 #. TRANS: Form legend for removing the favourite status for a favourite notice.
-#. TRANS: Title for button text for removing the favourite status for a favourite notice.
 msgid "Disfavor this notice"
 msgstr "Desmarcar esta nota como favorita"
 
 #. TRANS: Button text for removing the favourite status for a favourite notice.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Disfavor favorite"
 msgstr "Desmarcar como favorita"
 
+#. TRANS: Button title for removing the favourite status for a favourite notice.
+msgid "Remove this notice from your list of favorite notices."
+msgstr "Eliminar esta nota da lista de notas favoritas."
+
 #. TRANS: Form legend for adding the favourite status to a notice.
-#. TRANS: Title for button text for adding the favourite status to a notice.
 msgid "Favor this notice"
 msgstr "Marcar esta nota como favorita"
 
 #. TRANS: Button text for adding the favourite status to a notice.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Favor"
 msgstr "Marcar como favorito"
 
+#. TRANS: Button title for adding the favourite status to a notice.
+msgid "Add this notice to your list of favorite notices."
+msgstr "Engadir esta nota á lista de notas favoritas."
+
 #. TRANS: Feed type name.
 msgid "RSS 1.0"
 msgstr "RSS 1.0"
@@ -8548,21 +7782,24 @@ msgstr "Atom"
 msgid "FOAF"
 msgstr "Amigo dun amigo"
 
+#. TRANS: Feed type name. See http://activitystrea.ms/
+msgid "Activity Streams"
+msgstr "Fluxos de actividade"
+
 #. TRANS: Client exception thrown when an imported feed does not have an author.
 msgid "No author in the feed."
-msgstr ""
+msgstr "Non hai autor ningún na fonte de novas."
 
 #. TRANS: Client exception thrown when an imported feed does not have an author that
 #. TRANS: can be associated with a user.
 msgid "Cannot import without a user."
-msgstr ""
+msgstr "Non se pode importar sen un usuario."
 
 #. TRANS: Header for feed links (h2).
 msgid "Feeds"
 msgstr "Fontes de novas"
 
 #. TRANS: List element on gallery action page to show all tags.
-#, fuzzy
 msgctxt "TAGS"
 msgid "All"
 msgstr "Todas"
@@ -8572,15 +7809,35 @@ msgid "Tag"
 msgstr "Etiqueta"
 
 #. TRANS: Dropdown field title on gallery action page for a list containing tags.
-#, fuzzy
 msgid "Choose a tag to narrow list."
-msgstr "Escolla unha etiqueta para reducir a lista"
+msgstr "Escolla unha etiqueta para reducir a lista."
 
 #. TRANS: Description on form for granting a role.
 #, php-format
 msgid "Grant this user the \"%s\" role"
 msgstr "Outorgarlle a este usuario o rol \"%s\""
 
+#. TRANS: Header for mini list of group members on a group page (h2).
+msgid "Members"
+msgstr "Membros"
+
+#. TRANS: Link to all group members from mini list of group members if group has more than n members.
+msgid "All members"
+msgstr "Todos os membros"
+
+#. TRANS: Header for mini list of users with a pending membership request on a group page (h2).
+msgid "Pending"
+msgstr "Pendentes"
+
+#. TRANS: Header for mini list of users that are blocked in a group page (h2).
+msgid "Blocked"
+msgstr "Bloqueado"
+
+#. TRANS: Title for list of group administrators on a group page.
+msgctxt "TITLE"
+msgid "Admins"
+msgstr "Administradores"
+
 #. TRANS: Button text for the form that will block a user from a group.
 msgctxt "BUTTON"
 msgid "Block"
@@ -8588,34 +7845,31 @@ msgstr "Bloquear"
 
 #. TRANS: Submit button title.
 msgctxt "TOOLTIP"
-msgid "Block this user"
-msgstr "Bloquear este usuario"
+msgid "Block this user so that they can no longer post messages to it."
+msgstr "Bloquear este usuario de xeito que non poida publicar máis mensaxes."
 
 #. TRANS: Field title on group edit form.
-#, fuzzy
 msgid "URL of the homepage or blog of the group or topic."
-msgstr "URL do sitio web persoal ou blogue do grupo ou tema"
+msgstr "URL do sitio web persoal ou blogue do grupo ou tema."
 
 #. TRANS: Text area title for group description when there is no text limit.
-#, fuzzy
 msgid "Describe the group or topic."
-msgstr "Describa o grupo ou o tema"
+msgstr "Describa o grupo ou o tema."
 
 #. TRANS: Text area title for group description.
 #. TRANS: %d is the number of characters available for the description.
-#, fuzzy, php-format
+#, php-format
 msgid "Describe the group or topic in %d character or less."
 msgid_plural "Describe the group or topic in %d characters or less."
-msgstr[0] "Describa o grupo ou o tema en %d caracteres"
-msgstr[1] "Describa o grupo ou o tema en %d caracteres"
+msgstr[0] "Describa o grupo ou o tema en %d carácter ou menos."
+msgstr[1] "Describa o grupo ou o tema en %d caracteres ou menos."
 
 #. TRANS: Field title on group edit form.
-#, fuzzy
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\"."
 msgstr ""
 "Localidade do grupo, se a ten, como por exemplo \"Cidade, Provincia, "
-"Comunidade, País\""
+"Comunidade, País\"."
 
 #. TRANS: Field label on group edit form.
 msgid "Aliases"
@@ -8623,7 +7877,7 @@ msgstr "Pseudónimos"
 
 #. TRANS: Input field title for group aliases.
 #. TRANS: %d is the maximum number of group aliases available.
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
 "alias allowed."
@@ -8631,80 +7885,27 @@ msgid_plural ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
 "aliases allowed."
 msgstr[0] ""
-"Alcumes adicionais para o grupo, separados por comas ou espazos, %d como "
-"máximo"
+"Alcumes adicionais para o grupo, separados por comas ou espazos. %d como "
+"máximo."
 msgstr[1] ""
-"Alcumes adicionais para o grupo, separados por comas ou espazos, %d como "
-"máximo"
+"Alcumes adicionais para o grupo, separados por comas ou espazos. %d como "
+"máximo."
 
 #. TRANS: Checkbox field title on group edit form to mark a group private.
 msgid ""
 "New members must be approved by admin and all posts are forced to be private."
 msgstr ""
+"Os novos membros deben ser aprobados por un administrador e todas as "
+"mensaxes fórzanse a ser privadas."
 
 #. TRANS: Indicator in group members list that this user is a group administrator.
-#, fuzzy
 msgctxt "GROUPADMIN"
 msgid "Admin"
 msgstr "Administrador"
 
-#. TRANS: Menu item in the group navigation page.
-msgctxt "MENU"
-msgid "Group"
-msgstr "Grupo"
-
-#. TRANS: Tooltip for menu item in the group navigation page.
-#. TRANS: %s is the nickname of the group.
-#, php-format
-msgctxt "TOOLTIP"
-msgid "%s group"
-msgstr "Grupo %s"
-
-#. TRANS: Menu item in the group navigation page.
-msgctxt "MENU"
-msgid "Members"
-msgstr "Membros"
-
-#. TRANS: Tooltip for menu item in the group navigation page.
-#. TRANS: %s is the nickname of the group.
-#, php-format
-msgctxt "TOOLTIP"
-msgid "%s group members"
-msgstr "Membros do grupo %s"
-
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: %d is the number of pending members.
-#, php-format
-msgctxt "MENU"
-msgid "Pending members (%d)"
-msgid_plural "Pending members (%d)"
-msgstr[0] ""
-msgstr[1] ""
-
-#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: %s is the nickname of the group.
-#, fuzzy, php-format
-msgctxt "TOOLTIP"
-msgid "%s pending members"
-msgstr "Membros do grupo %s"
-
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-msgctxt "MENU"
-msgid "Blocked"
-msgstr "Bloqueado"
-
-#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: %s is the nickname of the group.
-#, php-format
-msgctxt "TOOLTIP"
-msgid "%s blocked users"
-msgstr "Usuarios bloqueados en %s"
-
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: Menu item in primary navigation panel.
-msgctxt "MENU"
-msgid "Admin"
-msgstr "Administrador"
+#. TRANS: Group actions header (h2). Text hidden by default.
+msgid "Group actions"
+msgstr "Accións do grupo"
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
@@ -8713,11 +7914,6 @@ msgctxt "TOOLTIP"
 msgid "Edit %s group properties"
 msgstr "Modificar as propiedades do grupo %s"
 
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-msgctxt "MENU"
-msgid "Logo"
-msgstr "Logotipo"
-
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
 #, php-format
@@ -8725,32 +7921,32 @@ msgctxt "TOOLTIP"
 msgid "Add or edit %s logo"
 msgstr "Engadir ou modificar o logotipo de %s"
 
-#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: %s is the nickname of the group.
-#, php-format
-msgctxt "TOOLTIP"
-msgid "Add or edit %s design"
-msgstr "Engadir ou modificar o deseño de %s"
-
-#. TRANS: Group actions header (h2). Text hidden by default.
-msgid "Group actions"
-msgstr "Accións do grupo"
+#. TRANS: Link text for link on user profile.
+msgctxt "MENU"
+msgid "Logo"
+msgstr "Logotipo"
 
 #. TRANS: Title for groups with the most members section.
-#, fuzzy
 msgid "Popular groups"
-msgstr "Notas populares"
+msgstr "Grupos populares"
 
 #. TRANS: Title for groups with the most posts section.
-#, fuzzy
 msgid "Active groups"
-msgstr "Todos os grupos"
+msgstr "Grupos activos"
 
-#. TRANS: Title for group tag cloud section.
-#. TRANS: %s is a group name.
-#, php-format
-msgid "Tags in %s group's notices"
-msgstr "Etiquetas nas notas do grupo %s"
+#. TRANS: Link description for seeing all groups.
+#. TRANS: Link description for seeing all lists.
+msgid "See all"
+msgstr "Ollar todos"
+
+#. TRANS: Link title for seeing all groups.
+msgid "See all groups you belong to."
+msgstr "Olle todos os grupos aos que pertence."
+
+#. TRANS: Menu item title in personal group navigation menu.
+#. TRANS: %s is a username.
+msgid "Back to top"
+msgstr "Volver arriba"
 
 #. TRANS: Client exception 406
 msgid "This page is not available in a media type you accept"
@@ -8784,25 +7980,25 @@ msgid "Unknown file type"
 msgstr "Non se coñece o tipo de ficheiro"
 
 #. TRANS: Number of megabytes. %d is the number.
-#, fuzzy, php-format
+#, php-format
 msgid "%dMB"
 msgid_plural "%dMB"
-msgstr[0] "MB"
-msgstr[1] "MB"
+msgstr[0] "%dMB"
+msgstr[1] "%dMB"
 
 #. TRANS: Number of kilobytes. %d is the number.
-#, fuzzy, php-format
+#, php-format
 msgid "%dkB"
 msgid_plural "%dkB"
-msgstr[0] "kB"
-msgstr[1] "kB"
+msgstr[0] "%dkB"
+msgstr[1] "%dkB"
 
 #. TRANS: Number of bytes. %d is the number.
 #, php-format
 msgid "%dB"
 msgid_plural "%dB"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%dB"
+msgstr[1] "%dB"
 
 #. TRANS: Body text for confirmation code e-mail.
 #. TRANS: %1$s is a user nickname, %2$s is the StatusNet sitename,
@@ -8815,6 +8011,11 @@ msgid ""
 "user is not you, or if you did not request this confirmation, just ignore "
 "this message."
 msgstr ""
+"O usuario \"%1$s\" de %2$s dixo que o pseudónimo %3$s perténcelle a el ou "
+"ela. Se é certo, pódeo confirmar premendo neste enderezo URL: %4$s. (Se non "
+"pode premer nel, copie e pegue o enderezo na barra de enderezos do "
+"navegador.) Se ese usuario non é vostede ou se non solicitou esta "
+"confirmación, ignore esta mensaxe."
 
 #. TRANS: Exception thrown when trying to deliver a notice to an unknown inbox.
 #. TRANS: %d is the unknown inbox ID (number).
@@ -8825,34 +8026,67 @@ msgstr "Non se coñece a fonte %d da caixa de entrada."
 #. TRANS: Server exception thrown trying to initialise an IM plugin without meeting all prerequisites.
 msgid "Queueing must be enabled to use IM plugins."
 msgstr ""
+"Cómpre activar a cola para empregar os complementos de mensaxería "
+"instantánea."
 
 #. TRANS: Server exception thrown trying to initialise an IM plugin without a transport method.
 msgid "Transport cannot be null."
-msgstr ""
+msgstr "O transporte non pode ser nulo."
 
 #. TRANS: Title for inbox tag cloud section.
 msgctxt "TITLE"
 msgid "Trends"
-msgstr ""
+msgstr "Tendencias"
 
-#. TRANS: Button text for inviting more users to the StatusNet instance.
-#, fuzzy
+#. TRANS: Default button text for inviting more users to the StatusNet instance.
 msgctxt "BUTTON"
 msgid "Invite more colleagues"
-msgstr "Invitar a novos usuarios"
+msgstr "Convidar máis colegas"
+
+#. TRANS: Form legend.
+msgid "Invite collegues"
+msgstr "Convidar colegas"
+
+#. TRANS: Field label for a list of e-mail addresses.
+msgid "Email addresses"
+msgstr "Enderezos de correo electrónico"
+
+#. TRANS: Field title for a list of e-mail addresses.
+msgid "Addresses of friends to invite (one per line)."
+msgstr "Enderezos de amigos aos que convidar (un por liña)."
+
+#. TRANS: Field label for a personal message to send to invitees.
+msgid "Personal message"
+msgstr "Mensaxe persoal"
+
+#. TRANS: Field title for a personal message to send to invitees.
+msgid "Optionally add a personal message to the invitation."
+msgstr "Engadir opcionalmente unha mensaxe persoal á invitación."
+
+#. TRANS: Send button for inviting friends
+#. TRANS: Button text for sending notice.
+msgctxt "BUTTON"
+msgid "Send"
+msgstr "Enviar"
+
+#. TRANS: Submit button title.
+msgid "Send invitations."
+msgstr "Enviar as invitacións."
 
 #. TRANS: Button text for joining a group.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Join"
 msgstr "Unirse"
 
 #. TRANS: Button text on form to leave a group.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Leave"
 msgstr "Deixar"
 
+#. TRANS: Link title for seeing all lists.
+msgid "See all lists you have created."
+msgstr "Ver todas as listas que creou."
+
 #. TRANS: Menu item for logging in to the StatusNet site.
 #. TRANS: Menu item in primary navigation panel.
 msgctxt "MENU"
@@ -8879,7 +8113,7 @@ msgstr "Confirmación do enderezo de correo electrónico"
 #. TRANS: Body for address confirmation email.
 #. TRANS: %1$s is the addressed user's nickname, %2$s is the StatusNet sitename,
 #. TRANS: %3$s is the URL to confirm at.
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "Hey, %1$s.\n"
 "\n"
@@ -8894,32 +8128,32 @@ msgid ""
 "Thanks for your time, \n"
 "%2$s\n"
 msgstr ""
-"Ola, %s:\n"
+"Ola, %1$s:\n"
 "\n"
-"Alguén acaba de introducir este enderezo de correo electrónico en %s.\n"
+"Alguén acaba de introducir este enderezo de correo electrónico en %2$s.\n"
 "\n"
 "Se foi vostede, e quere confirmalo, utilice o seguinte URL:\n"
 "\n"
-"%s\n"
+"%3$s\n"
 "\n"
 "En caso contrario, simplemente ignore esta mensaxe.\n"
 "\n"
 "Grazas polo seu tempo, \n"
-"%s\n"
+"%2$s\n"
 
 #. TRANS: Subject of new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscribing user's nickname, %2$s is the StatusNet sitename.
 #. TRANS: Main body of new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscriber's long name, %2$s is the StatusNet sitename.
 #, php-format
-msgid "%1$s is now listening to your notices on %2$s."
-msgstr "Agora %1$s segue as súas notas en %2$s."
+msgid "%1$s is now following you on %2$s."
+msgstr "%1$s xa o está seguindo a vostede en %2$s."
 
 #. TRANS: Subject of pending new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscribing user's nickname, %2$s is the StatusNet sitename.
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s would like to listen to your notices on %2$s."
-msgstr "Agora %1$s segue as súas notas en %2$s."
+msgstr "%1$s quere seguir as súas notas en %2$s."
 
 #. TRANS: Main body of pending new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscriber's long name, %2$s is the StatusNet sitename.
@@ -8928,11 +8162,13 @@ msgid ""
 "%1$s would like to listen to your notices on %2$s. You may approve or reject "
 "their subscription at %3$s"
 msgstr ""
+"%1$s quere seguir as súas notas en %2$s. Pode aprobar ou rexeitar esta "
+"subscrición en %3$s"
 
 #. TRANS: Common footer block for StatusNet notification emails.
 #. TRANS: %1$s is the StatusNet sitename,
 #. TRANS: %2$s is a link to the addressed user's e-mail settings.
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "Faithfully yours,\n"
 "%1$s.\n"
@@ -8940,23 +8176,18 @@ msgid ""
 "----\n"
 "Change your email address or notification options at %2$s"
 msgstr ""
-"Agora %1$s segue as súas notas en %2$s.\n"
-"\n"
-"%3$s\n"
-"\n"
-"%4$s%5$s%6$s\n"
 "Atentamente,\n"
-"%7$s.\n"
+"%1$s.\n"
 "\n"
 "----\n"
 "Modifique o seu enderezo de correo electrónico ou as súas preferencias de "
-"notificación en %8$s\n"
+"notificación en %2$s"
 
 #. TRANS: Profile info line in notification e-mail.
 #. TRANS: %s is a URL.
-#, fuzzy, php-format
+#, php-format
 msgid "Profile: %s"
-msgstr "Perfil"
+msgstr "Perfil: %s"
 
 #. TRANS: Profile info line in notification e-mail.
 #. TRANS: %s is biographical information.
@@ -8966,13 +8197,13 @@ msgstr "Biografía: %s"
 
 #. TRANS: This is a paragraph in a new-subscriber e-mail.
 #. TRANS: %s is a URL where the subscriber can be reported as abusive.
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "If you believe this account is being used abusively, you can block them from "
 "your subscribers list and report as spam to site administrators at %s."
 msgstr ""
 "Se cre que esta conta se está usando con fins abusivos, pode bloquear a súa "
-"lista de subscritores e informar disto aos administradores do sitio en %s"
+"lista de subscritores e informar disto aos administradores do sitio en %s."
 
 #. TRANS: Subject of notification mail for new posting email address.
 #. TRANS: %s is the StatusNet sitename.
@@ -8983,7 +8214,7 @@ msgstr "Novo enderezo de correo electrónico para publicar en %s"
 #. TRANS: Body of notification mail for new posting email address.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is the e-mail address to send
 #. TRANS: to to post by e-mail, %3$s is a URL to more instructions.
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
 "\n"
@@ -8995,10 +8226,7 @@ msgstr ""
 "\n"
 "Envíe un correo electrónico a %2$s para publicar mensaxes novas.\n"
 "\n"
-"Máis información en %3$s.\n"
-"\n"
-"Atentamente,\n"
-"%4$s"
+"Máis información en %3$s."
 
 #. TRANS: Subject line for SMS-by-email notification messages.
 #. TRANS: %s is the posting user's nickname.
@@ -9019,14 +8247,14 @@ msgstr ""
 
 #. TRANS: Subject for 'nudge' notification email.
 #. TRANS: %s is the nudging user.
-#, fuzzy, php-format
+#, php-format
 msgid "You have been nudged by %s"
 msgstr "%s fíxolle un aceno"
 
 #. TRANS: Body for 'nudge' notification email.
 #. TRANS: %1$s is the nuding user's long name, $2$s is the nudging user's nickname,
 #. TRANS: %3$s is a URL to post notices at.
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "%1$s (%2$s) is wondering what you are up to these days and is inviting you "
 "to post some news.\n"
@@ -9044,10 +8272,7 @@ msgstr ""
 "\n"
 "%3$s\n"
 "\n"
-"Non responda a esta mensaxe, non lle chegará ao remitente.\n"
-"\n"
-"Atentamente,\n"
-"%4$s\n"
+"Non responda a esta mensaxe, non lle chegará ao remitente."
 
 #. TRANS: Subject for direct-message notification email.
 #. TRANS: %s is the sending user's nickname.
@@ -9058,7 +8283,7 @@ msgstr "Nova mensaxe privada de %s"
 #. TRANS: Body for direct-message notification email.
 #. TRANS: %1$s is the sending user's long name, %2$s is the sending user's nickname,
 #. TRANS: %3$s is the message content, %4$s a URL to the message,
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
 "\n"
@@ -9082,23 +8307,20 @@ msgstr ""
 "\n"
 "%4$s\n"
 "\n"
-"Non responda a esta mensaxe, non lle chegará ao remitente.\n"
-"\n"
-"Atentamente,\n"
-"%5$s\n"
+"Non responda a este correo electrónico, non lle chegará ao remitente."
 
 #. TRANS: Subject for favorite notification e-mail.
 #. TRANS: %1$s is the adding user's long name, %2$s is the adding user's nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s (@%2$s) added your notice as a favorite"
-msgstr "%s (@%s) marcou a súa nota como favorita"
+msgstr "%1$s (@%2$s) marcou a súa nota como favorita"
 
 #. TRANS: Body for favorite notification e-mail.
 #. TRANS: %1$s is the adding user's long name, $2$s is the date the notice was created,
 #. TRANS: %3$s is a URL to the faved notice, %4$s is the faved notice text,
 #. TRANS: %5$s is a URL to all faves of the adding user, %6$s is the StatusNet sitename,
 #. TRANS: %7$s is the adding user's nickname.
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
 "\n"
@@ -9127,10 +8349,7 @@ msgstr ""
 "\n"
 "Pode ver a lista das notas favoritas de %1$s en:\n"
 "\n"
-"%5$s\n"
-"\n"
-"Atentamente,\n"
-"%6$s\n"
+"%5$s"
 
 #. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
 #, php-format
@@ -9145,16 +8364,16 @@ msgstr ""
 
 #. TRANS: E-mail subject for notice notification.
 #. TRANS: %1$s is the sending user's long name, %2$s is the adding user's nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s (@%2$s) sent a notice to your attention"
-msgstr "%s (@%s) enviou unha nota á súa atención"
+msgstr "%1$s (@%2$s) enviou unha nota á súa atención"
 
 #. TRANS: Body of @-reply notification e-mail.
 #. TRANS: %1$s is the sending user's name, $2$s is the StatusNet sitename,
 #. TRANS: %3$s is a URL to the notice, %4$s is the notice text,
-#. TRANS: %5$s is a URL to the full conversion if it exists (otherwise empty),
+#. TRANS: %5$s is the text "The full conversation can be read here:" and a URL to the full conversion if it exists (otherwise empty),
 #. TRANS: %6$s is a URL to reply to the notice, %7$s is a URL to all @-replies for the addressed user,
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "%1$s just sent a notice to your attention (an '@-reply') on %2$s.\n"
 "\n"
@@ -9174,8 +8393,7 @@ msgid ""
 "\n"
 "%7$s"
 msgstr ""
-"%1$s (@%9$s) acaba de enviar unha nota á súa atención (unha resposta) en %2"
-"$s.\n"
+"%1$s acaba de enviar unha nota á súa atención (unha resposta) en %2$s.\n"
 "\n"
 "A nota está en:\n"
 "\n"
@@ -9191,28 +8409,27 @@ msgstr ""
 "\n"
 "A lista de todas as respostas está en:\n"
 "\n"
-"%7$s\n"
-"\n"
-"Atentamente,\n"
-"%2$s\n"
-"\n"
-"P.S.: pode desactivar estas notificacións por correo electrónico en %8$s\n"
+"%7$s"
 
 #. TRANS: Subject of group join notification e-mail.
 #. TRANS: %1$s is the joining user's nickname, %2$s is the group name, and %3$s is the StatusNet sitename.
+#, php-format
+msgid "%1$s has joined your group %2$s on %3$s"
+msgstr "%1$s uniuse ao seu grupo %2$s en %3$s"
+
 #. TRANS: Main body of group join notification e-mail.
 #. TRANS: %1$s is the subscriber's long name, %2$s is the group name, and %3$s is the StatusNet sitename,
 #. TRANS: %4$s is a block of profile info about the subscriber.
 #. TRANS: %5$s is a link to the addressed user's e-mail settings.
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s has joined your group %2$s on %3$s."
-msgstr "%1$s uniuse ao grupo %2$s."
+msgstr "%1$s uniuse ao seu grupo %2$s en %3$s."
 
 #. TRANS: Subject of pending group join request notification e-mail.
 #. TRANS: %1$s is the joining user's nickname, %2$s is the group name, and %3$s is the StatusNet sitename.
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s wants to join your group %2$s on %3$s."
-msgstr "%1$s uniuse ao grupo %2$s."
+msgstr "%1$s quere unirse ao seu grupo %2$s en %3$s."
 
 #. TRANS: Main body of pending group join request notification e-mail.
 #. TRANS: %1$s is the subscriber's long name, %2$s is the group name, and %3$s is the StatusNet sitename,
@@ -9222,6 +8439,8 @@ msgid ""
 "%1$s would like to join your group %2$s on %3$s. You may approve or reject "
 "their group membership at %4$s"
 msgstr ""
+"%1$s quere unirse ao seu grupo %2$s en %3$s. Pode aprobar ou rexeitar este "
+"ingreso en %4$s"
 
 #. TRANS: Client error displayed when trying to access a mailbox that is not of the logged in user.
 msgid "Only the user can read their own mailboxes."
@@ -9236,26 +8455,22 @@ msgstr ""
 "outros usuarios. A xente pode enviarlle mensaxes para que só as lea vostede."
 
 #. TRANS: Menu item in mailbox menu. Leads to incoming private messages.
-#, fuzzy
 msgctxt "MENU"
 msgid "Inbox"
 msgstr "Caixa de entrada"
 
 #. TRANS: Menu item title in mailbox menu. Leads to incoming private messages.
-#, fuzzy
 msgid "Your incoming messages."
-msgstr "As mensaxes recibidas"
+msgstr "As mensaxes recibidas."
 
 #. TRANS: Menu item in mailbox menu. Leads to outgoing private messages.
-#, fuzzy
 msgctxt "MENU"
 msgid "Outbox"
 msgstr "Caixa de saída"
 
 #. TRANS: Menu item title in mailbox menu. Leads to outgoing private messages.
-#, fuzzy
 msgid "Your sent messages."
-msgstr "As mensaxes enviadas"
+msgstr "As mensaxes enviadas."
 
 #. TRANS: Error message in incoming mail handler used when an incoming e-mail cannot be processed.
 msgid "Could not parse message."
@@ -9275,9 +8490,9 @@ msgstr "Non se permite recibir correo electrónico."
 
 #. TRANS: Error message in incoming mail handler used when an incoming e-mail is of an unsupported type.
 #. TRANS: %s is the unsupported type.
-#, fuzzy, php-format
+#, php-format
 msgid "Unsupported message type: %s."
-msgstr "Non se soporta o tipo de mensaxe: %s"
+msgstr "Non se soporta o tipo de mensaxe: %s."
 
 #. TRANS: Form legend for form to make a user a group admin.
 msgid "Make user an admin of the group"
@@ -9290,8 +8505,8 @@ msgstr "Converter en administrador"
 
 #. TRANS: Submit button title.
 msgctxt "TOOLTIP"
-msgid "Make this user an admin"
-msgstr "Converter a este usuario en administrador"
+msgid "Make this user an admin."
+msgstr "Converter a este usuario en administrador."
 
 #. TRANS: Client exception thrown when a database error was thrown during a file upload operation.
 msgid "There was a database error while saving your file. Please try again."
@@ -9336,14 +8551,12 @@ msgstr "Enviar unha nota directa"
 #. TRANS: Label entry in drop-down selection box in direct-message inbox/outbox.
 #. TRANS: This is the default entry in the drop-down box, doubling as instructions
 #. TRANS: and a brake against accidental submissions with the first user in the list.
-#, fuzzy
 msgid "Select recipient:"
-msgstr "Seleccionar unha licenza"
+msgstr "Seleccionar o destinatario:"
 
-#. TRANS Entry in drop-down selection box in direct-message inbox/outbox when no one is available to message.
-#, fuzzy
+#. TRANS: Entry in drop-down selection box in direct-message inbox/outbox when no one is available to message.
 msgid "No mutual subscribers."
-msgstr "Non está subscrito!"
+msgstr "Non hai subscritores mutuos."
 
 #. TRANS: Dropdown label in direct notice form.
 msgid "To"
@@ -9355,9 +8568,8 @@ msgid "Send"
 msgstr "Enviar"
 
 #. TRANS: Header in message list.
-#, fuzzy
 msgid "Messages"
-msgstr "Mensaxe"
+msgstr "Mensaxes"
 
 #. TRANS: Followed by notice source (usually the client used to send the notice).
 #. TRANS: Followed by notice source.
@@ -9365,7 +8577,6 @@ msgid "from"
 msgstr "de"
 
 #. TRANS: A possible notice source (web interface).
-#, fuzzy
 msgctxt "SOURCE"
 msgid "web"
 msgstr "web"
@@ -9373,56 +8584,57 @@ msgstr "web"
 #. TRANS: A possible notice source (XMPP).
 msgctxt "SOURCE"
 msgid "xmpp"
-msgstr ""
+msgstr "xmpp"
 
 #. TRANS: A possible notice source (e-mail).
-#, fuzzy
 msgctxt "SOURCE"
 msgid "mail"
-msgstr "Correo electrónico"
+msgstr "correo"
 
 #. TRANS: A possible notice source (OpenMicroBlogging).
 msgctxt "SOURCE"
 msgid "omb"
-msgstr ""
+msgstr "omb"
 
 #. TRANS: A possible notice source (Application Programming Interface).
 msgctxt "SOURCE"
 msgid "api"
-msgstr ""
+msgstr "api"
 
 #. TRANS: Client exception thrown when no author for an activity was found.
 msgid "Cannot get author for activity."
-msgstr ""
+msgstr "Non se pode obter o autor da actividade."
 
 #. TRANS: Client exception thrown when ...
-#, fuzzy
 msgid "Bookmark not posted to this group."
-msgstr "Vostede non pertence a este grupo."
+msgstr "O favorito non se publicou no grupo."
 
 #. TRANS: Client exception when ...
-#, fuzzy
 msgid "Object not posted to this user."
-msgstr "Non borrar esta nota"
+msgstr "O obxecto non se publicou neste usuario."
 
 #. TRANS: Server exception thrown when a micro app plugin uses a target that cannot be handled.
 msgid "Do not know how to handle this kind of target."
-msgstr ""
+msgstr "Non se sabe como manexar este tipo de obxectivo."
 
 #. TRANS: Server exception thrown when a micro app plugin developer has not done his job too well.
 msgid "You must implement either adaptNoticeListItem() or showNotice()."
-msgstr ""
+msgstr "Pode introducir adaptNoticeListItem() ou ben showNotice()."
+
+#. TRANS: Link description to show more items in a list.
+msgid "More â–¼"
+msgstr "Máis ▼"
 
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 msgid "Nickname cannot be empty."
-msgstr ""
+msgstr "O alcume non pode estar baleiro."
 
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 #, php-format
 msgid "Nickname cannot be more than %d character long."
 msgid_plural "Nickname cannot be more than %d characters long."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "O alcume non pode superar %d carácter."
+msgstr[1] "O alcume non pode superar os %d caracteres."
 
 #. TRANS: Form legend for notice form.
 msgid "Send a notice"
@@ -9438,9 +8650,8 @@ msgid "Attach"
 msgstr "Anexar"
 
 #. TRANS: Title for input field to attach a file to a notice.
-#, fuzzy
 msgid "Attach a file."
-msgstr "Anexar un ficheiro"
+msgstr "Anexar un ficheiro."
 
 #. TRANS: Field label to add location to a notice.
 msgid "Share my location"
@@ -9461,11 +8672,7 @@ msgstr ""
 #. TRANS: Separator in profile addressees list.
 msgctxt "SEPARATOR"
 msgid ", "
-msgstr ""
-
-#. TRANS: Start of profile addressees list.
-msgid " â–¸ "
-msgstr ""
+msgstr ", "
 
 #. TRANS: Used in coordinates as abbreviation of north.
 msgid "N"
@@ -9505,293 +8712,238 @@ msgid "Repeated by"
 msgstr "Repetida por"
 
 #. TRANS: Link title in notice list item to reply to a notice.
-msgid "Reply to this notice"
-msgstr "Responder a esta nota"
+msgid "Reply to this notice."
+msgstr "Responder a esta nota."
 
 #. TRANS: Link text in notice list item to reply to a notice.
 msgid "Reply"
 msgstr "Responder"
 
 #. TRANS: Link title in notice list item to delete a notice.
-msgid "Delete this notice"
-msgstr "Borrar esta nota"
+msgid "Delete this notice from the timeline."
+msgstr "Borrar esta nota da liña do tempo."
 
 #. TRANS: Title for repeat form status in notice list when a notice has been repeated.
-#, fuzzy
 msgid "Notice repeated."
-msgstr "Repetiuse a nota"
+msgstr "Repetiuse a nota."
 
 #. TRANS: Field label for notice text.
 msgid "Update your status..."
-msgstr ""
+msgstr "Actualice o seu estado..."
 
 #. TRANS: Form legend of form to nudge/ping another user.
 msgid "Nudge this user"
 msgstr "Facerlle un aceno a este usuario"
 
 #. TRANS: Button text to nudge/ping another user.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Nudge"
 msgstr "Facer un aceno"
 
 #. TRANS: Button title to nudge/ping another user.
-#, fuzzy
 msgid "Send a nudge to this user."
-msgstr "Facerlle un aceno a este usuario"
-
-#. TRANS: Exception thrown when creating a new profile fails in OAuth store.
-msgid "Error inserting new profile."
-msgstr "Houbo un erro ao inserir o novo perfil."
-
-#. TRANS: Exception thrown when creating a new avatar fails in OAuth store.
-msgid "Error inserting avatar."
-msgstr "Houbo un erro ao inserir o avatar."
-
-#. TRANS: Exception thrown when creating a remote profile fails in OAuth store.
-msgid "Error inserting remote profile."
-msgstr "Houbo un erro ao inserir o perfil remoto."
-
-#. TRANS: Exception thrown when a notice is denied because it has been sent before.
-msgid "Duplicate notice."
-msgstr "Nota duplicada."
-
-#. TRANS: Exception thrown when creating a new subscription fails in OAuth store.
-#, fuzzy
-msgid "Could not insert new subscription."
-msgstr "Non se puido inserir unha subscrición nova."
+msgstr "Facerlle un aceno a este usuario."
 
 #. TRANS: Server exception thrown in oEmbed action if no API endpoint is available.
-#, fuzzy
 msgid "No oEmbed API endpoint available."
-msgstr "A mensaxería instantánea non está dispoñible."
+msgstr "Non hai dispoñible ningún punto de fin da API de oEmbed."
 
 #. TRANS: Field label for list.
-#, fuzzy
 msgctxt "LABEL"
 msgid "List"
-msgstr "Ligazóns"
+msgstr "Lista"
 
 #. TRANS: Field title for list.
-#, fuzzy
 msgid "Change the list (letters, numbers, -, ., and _ are allowed)."
-msgstr ""
-"Etiquetas para este usuario (letras, números, -, ., e _), separadas por "
-"comas ou espazos en branco"
+msgstr "Cambiar a lista (letras, números, -, . e _ están permitidos)."
 
 #. TRANS: Field title for description of list.
-#, fuzzy
 msgid "Describe the list or topic."
-msgstr "Describa o grupo ou o tema"
+msgstr "Describa a lista ou o tema."
 
 #. TRANS: Field title for description of list.
 #. TRANS: %d is the maximum number of characters for the description.
-#, fuzzy, php-format
+#, php-format
 msgid "Describe the list or topic in %d character."
 msgid_plural "Describe the list or topic in %d characters."
-msgstr[0] "Describa o grupo ou o tema en %d caracteres"
-msgstr[1] "Describa o grupo ou o tema en %d caracteres"
+msgstr[0] "Describa a lista ou o tema en %d carácter."
+msgstr[1] "Describa a lista ou o tema en %d caracteres."
 
 #. TRANS: Button title to delete a list.
-#, fuzzy
 msgid "Delete this list."
-msgstr "Borrar o usuario"
+msgstr "Borrar a lista."
 
 #. TRANS: Header in list edit form.
 msgid "Add or remove people"
-msgstr ""
+msgstr "Engadir ou eliminar xente"
 
 #. TRANS: Header in list edit form.
-#, fuzzy
 msgctxt "HEADER"
 msgid "Search"
-msgstr "Buscar"
+msgstr "Procura"
 
 #. TRANS: Menu item in list navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "List"
-msgstr "Ligazóns"
+msgstr "Lista"
 
 #. TRANS: Menu item title in list navigation panel.
 #. TRANS: %1$s is a list, %2$s is a nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s list by %2$s."
-msgstr "%1$s - %2$s"
+msgstr "%1$s lista por %2$s."
 
 #. TRANS: Menu item in list navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Listed"
-msgstr "Licenza"
+msgstr "Listado"
 
 #. TRANS: Menu item in list navigation panel.
 #. TRANS: Menu item in local navigation menu.
-#, fuzzy
 msgctxt "MENU"
 msgid "Subscribers"
 msgstr "Subscritores"
 
 #. TRANS: Menu item title in list navigation panel.
 #. TRANS: %1$s is a list, %2$s is a nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "Subscribers to %1$s list by %2$s."
-msgstr "Subscribiuse a %s."
+msgstr "Subscritores da lista %1$s de %2$s."
 
 #. TRANS: Menu item in list navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Edit"
 msgstr "Modificar"
 
 #. TRANS: Menu item title in list navigation panel.
 #. TRANS: %s is a list.
-#, fuzzy, php-format
+#, php-format
 msgid "Edit %s list by you."
-msgstr "Editar o grupo %s"
-
-#. TRANS: Link description for link to list of users tagged with a tag.
-#, fuzzy
-msgid "Tagged"
-msgstr "Etiqueta"
+msgstr "Editar a súa lista %s."
 
 #. TRANS: Title for link to edit list settings.
-#, fuzzy
 msgid "Edit list settings."
-msgstr "Modificar a configuración do perfil"
+msgstr "Modificar a configuración da lista."
 
 #. TRANS: Text for link to edit list settings.
 msgid "Edit"
 msgstr "Modificar"
 
 #. TRANS: Privacy mode text in list list item for private list.
-#, fuzzy
 msgctxt "MODE"
 msgid "Private"
 msgstr "Privado"
 
 #. TRANS: Menu item in the group navigation page.
-#, fuzzy
 msgctxt "MENU"
 msgid "List Subscriptions"
-msgstr "Subscricións"
+msgstr "Subscricións á lista"
 
 #. TRANS: Tooltip for menu item in the group navigation page.
 #. TRANS: %s is a user nickname.
-#, fuzzy, php-format
+#, php-format
 msgctxt "TOOLTIP"
 msgid "Lists subscribed to by %s."
-msgstr "Subscribiuse a %s."
+msgstr "Listas ás que %s está subscrito."
 
 #. TRANS: Menu item in the group navigation page.
 #. TRANS: %s is a user nickname.
-#, fuzzy, php-format
+#, php-format
 msgctxt "MENU"
 msgid "Lists with %s"
-msgstr "Actualizacións con \"%s\""
+msgstr "Listas con %s"
 
 #. TRANS: Tooltip for menu item in the group navigation page.
 #. TRANS: %s is a user nickname.
-#, fuzzy, php-format
+#, php-format
 msgctxt "TOOLTIP"
 msgid "Lists with %s."
-msgstr "Actualizacións con \"%s\""
+msgstr "Listas con %s."
 
 #. TRANS: Menu item in the group navigation page.
 #. TRANS: %s is a user nickname.
 #, php-format
 msgctxt "MENU"
 msgid "Lists by %s"
-msgstr ""
+msgstr "Listas de %s"
 
 #. TRANS: Tooltip for menu item in the group navigation page.
 #. TRANS: %s is a user nickname.
-#, fuzzy, php-format
+#, php-format
 msgctxt "TOOLTIP"
 msgid "Lists by %s."
-msgstr "%1$s - %2$s"
+msgstr "Listas de %s."
 
 #. TRANS: Label in lists widget.
-#, fuzzy
 msgctxt "LABEL"
 msgid "Your lists"
-msgstr "Notas populares"
+msgstr "As súas listas"
 
 #. TRANS: Fieldset legend in lists widget.
-#, fuzzy
 msgctxt "LEGEND"
 msgid "Edit lists"
-msgstr "A etiqueta de persoa non é correcta: %s."
+msgstr "Editar as listas"
 
 #. TRANS: Label in self tags widget.
-#, fuzzy
 msgctxt "LABEL"
 msgid "Tags"
 msgstr "Etiquetas"
 
 #. TRANS: Title for section contaning lists with the most subscribers.
-#, fuzzy
 msgid "Popular lists"
-msgstr "Notas populares"
+msgstr "Listas populares"
 
 #. TRANS: List summary. %1$d is the number of users in the list,
 #. TRANS: %2$d is the number of subscribers to the list.
-#, fuzzy, php-format
+#, php-format
 msgid "Listed: %1$d Subscribers: %2$d"
-msgstr "%1$s subscritores, páxina %2$d"
+msgstr "Usuarios na lista: %1$d Subscritores: %2$d"
 
 #. TRANS: Title for page that displays which lists current user is part of.
-#, fuzzy, php-format
+#, php-format
 msgid "Lists with you"
-msgstr "Non se atopou o método da API."
+msgstr "Listas con vostede"
 
 #. TRANS: Title for page that displays which lists a user is part of.
 #. TRANS: %s is a profile name.
-#, fuzzy, php-format
+#, php-format
 msgid "Lists with %s"
-msgstr "Actualizacións con \"%s\""
+msgstr "Listas con %s"
 
 #. TRANS: Title for page that displays lists a user has subscribed to.
-#, fuzzy
 msgid "List subscriptions"
-msgstr "%s subscricións"
+msgstr "Subscricións á lista"
 
 #. TRANS: Menu item in personal group navigation menu.
 #. TRANS: Menu item in settings navigation panel.
 #. TRANS: Menu item in local navigation menu.
-#, fuzzy
 msgctxt "MENU"
 msgid "Profile"
 msgstr "Perfil"
 
 #. TRANS: Menu item title in personal group navigation menu.
-#, fuzzy
 msgid "Your profile"
-msgstr "Perfil do grupo"
+msgstr "O seu perfil"
 
 #. TRANS: Menu item in personal group navigation menu.
-#, fuzzy
 msgctxt "MENU"
 msgid "Replies"
 msgstr "Respostas"
 
 #. TRANS: Menu item in personal group navigation menu.
-#, fuzzy
 msgctxt "MENU"
 msgid "Favorites"
-msgstr "Favoritas"
+msgstr "Favoritos"
 
 #. TRANS: Replaces %s in '%s\'s favorite notices'. (Yes, we know we need to fix this.)
-#, fuzzy
 msgctxt "FIXME"
 msgid "User"
 msgstr "Usuario"
 
 #. TRANS: Menu item in personal group navigation menu.
-#, fuzzy
 msgctxt "MENU"
 msgid "Messages"
-msgstr "Mensaxe"
+msgstr "Mensaxes"
 
 #. TRANS: Menu item title in personal group navigation menu.
 msgid "Your incoming messages"
@@ -9804,32 +8956,37 @@ msgstr "Descoñecida"
 #. TRANS: Plugin admin panel controls
 msgctxt "plugin"
 msgid "Disable"
-msgstr ""
+msgstr "Desactivar"
 
 #. TRANS: Plugin admin panel controls
 msgctxt "plugin"
 msgid "Enable"
-msgstr ""
+msgstr "Activar"
 
+#. TRANS: Plugin description for a disabled plugin.
 msgctxt "plugin-description"
-msgid "(Plugin descriptions unavailable when disabled.)"
+msgid ""
+"(The plugin description is unavailable when a plugin has been disabled.)"
 msgstr ""
+"(A descrición do complemento non está dispoñible ao estar desactivado.)"
 
 #. TRANS: Menu item in primary navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Settings"
-msgstr "Configuración dos SMS"
+msgstr "Configuracións"
 
 #. TRANS: Menu item title in primary navigation panel.
-#, fuzzy
 msgid "Change your personal settings."
-msgstr "Cambie a configuración do seu perfil"
+msgstr "Cambie a súa configuración persoal."
+
+#. TRANS: Menu item in primary navigation panel.
+msgctxt "MENU"
+msgid "Admin"
+msgstr "Administrador"
 
 #. TRANS: Menu item title in primary navigation panel.
-#, fuzzy
 msgid "Site configuration."
-msgstr "Configuración do usuario"
+msgstr "Configuración do sitio."
 
 #. TRANS: Menu item in primary navigation panel.
 msgctxt "MENU"
@@ -9837,34 +8994,27 @@ msgid "Logout"
 msgstr "Saír"
 
 #. TRANS: Menu item title in primary navigation panel.
-#, fuzzy
 msgid "Logout from the site."
-msgstr "Saír ao anonimato"
+msgstr "Saír ao anonimato."
 
 #. TRANS: Menu item title in primary navigation panel.
-#, fuzzy
 msgid "Login to the site."
-msgstr "Identificarse no sitio"
+msgstr "Identificarse no sitio."
 
-#. TRANS: Menu item in primary navigation panel.
-msgctxt "MENU"
-msgid "Search"
-msgstr "Buscar"
-
-#. TRANS: Menu item title in primary navigation panel.
-#, fuzzy
-msgid "Search the site."
-msgstr "Buscar no sitio"
+msgid "This profile has been silenced by site moderators"
+msgstr "Os moderadores do sitio silenciaron este perfil"
 
 #. TRANS: H2 text for user subscription statistics.
-#, fuzzy
 msgid "Following"
-msgstr "Seguir"
+msgstr "Seguindo"
 
 #. TRANS: H2 text for user subscriber statistics.
-#, fuzzy
 msgid "Followers"
-msgstr "Seguir"
+msgstr "Seguidores"
+
+#. TRANS: H2 text for user statistics.
+msgid "Statistics"
+msgstr "Estatísticas"
 
 #. TRANS: Label for user statistics.
 msgid "User ID"
@@ -9874,10 +9024,6 @@ msgstr "ID do usuario"
 msgid "Member since"
 msgstr "Membro dende"
 
-#. TRANS: Label for user statistics.
-msgid "Notices"
-msgstr "Notas"
-
 #. TRANS: Label for user statistics.
 #. TRANS: Average count of posts made per day since account registration.
 msgid "Daily average"
@@ -9888,20 +9034,18 @@ msgid "Groups"
 msgstr "Grupos"
 
 #. TRANS: H2 text for user list membership statistics.
-#, fuzzy
 msgid "Lists"
-msgstr "Límites"
+msgstr "Listas"
 
 #. TRANS: Server error displayed when using an unimplemented method.
 msgid "Unimplemented method."
-msgstr "Aínda non se implantou o método."
+msgstr "Aínda non se integrou o método."
 
 #. TRANS: Menu item title in search group navigation panel.
 msgid "User groups"
 msgstr "Grupos do usuario"
 
 #. TRANS: Menu item in search group navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Recent tags"
 msgstr "Últimas etiquetas"
@@ -9911,13 +9055,11 @@ msgid "Recent tags"
 msgstr "Últimas etiquetas"
 
 #. TRANS: Menu item in search group navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Featured"
 msgstr "Salientadas"
 
 #. TRANS: Menu item in search group navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Popular"
 msgstr "Populares"
@@ -9925,7 +9067,7 @@ msgstr "Populares"
 #. TRANS: Title for inbox tag cloud section.
 msgctxt "TITLE"
 msgid "Trending topics"
-msgstr ""
+msgstr "Temas do momento"
 
 #. TRANS: Client error displayed when return-to was defined without a target.
 msgid "No return-to arguments."
@@ -9936,9 +9078,8 @@ msgid "Repeat this notice?"
 msgstr "Quere repetir esta nota?"
 
 #. TRANS: Button title to repeat a notice on notice repeat form.
-#, fuzzy
 msgid "Repeat this notice."
-msgstr "Repetir esta nota"
+msgstr "Repetir esta nota."
 
 #. TRANS: Description of role revoke form. %s is the role to be revoked.
 #, php-format
@@ -9950,10 +9091,9 @@ msgid "Page not found."
 msgstr "Non se atopou a páxina."
 
 #. TRANS: Title of form to sandbox a user.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Sandbox"
-msgstr "Illar"
+msgstr "Zona de probas"
 
 #. TRANS: Description of form to sandbox a user.
 msgid "Sandbox this user"
@@ -9969,6 +9109,7 @@ msgid "Keyword(s)"
 msgstr "Termos de busca"
 
 #. TRANS: Button text for searching site.
+#. TRANS: Button text for search button on search form.
 #. TRANS: Button text to search profiles.
 msgctxt "BUTTON"
 msgid "Search"
@@ -9981,6 +9122,10 @@ msgid ""
 "* Try more general keywords.\n"
 "* Try fewer keywords."
 msgstr ""
+"* Asegúrese de que non haxa faltas de ortografía.\n"
+"* Probe con palabras clave diferentes.\n"
+"* Probe con máis palabras clave xerais.\n"
+"* Probe con menos palabras clave."
 
 #. TRANS: Standard search suggestions shown when a search does not give any results.
 #, php-format
@@ -9994,9 +9139,16 @@ msgid ""
 "* [Yahoo](http://search.yahoo.com/search?p=site%%3A%%%%site.server%%%%+%s)\n"
 "* [Collecta](http://collecta.com/#q=%s)"
 msgstr ""
+"Tamén pode probar a súa procura noutros motores:\n"
+"\n"
+"* [Twingly](http://www.twingly.com/search?q=%s&content=microblog&site=%%%%"
+"site.server%%%%)\n"
+"* [Tweet scan](http://www.tweetscan.com/indexi.php?s=%s)\n"
+"* [Google](http://www.google.com/search?q=site%%3A%%%%site.server%%%%+%s)\n"
+"* [Yahoo](http://search.yahoo.com/search?p=site%%3A%%%%site.server%%%%+%s)\n"
+"* [Collecta](http://collecta.com/#q=%s)"
 
 #. TRANS: Menu item in search group navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "People"
 msgstr "Xente"
@@ -10006,7 +9158,6 @@ msgid "Find people on this site"
 msgstr "Atopar xente neste sitio"
 
 #. TRANS: Menu item in search group navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Notices"
 msgstr "Notas"
@@ -10019,60 +9170,26 @@ msgstr "Buscar nos contidos das notas"
 msgid "Find groups on this site"
 msgstr "Buscar grupos neste sitio"
 
-#. TRANS: Secondary navigation menu item leading to help on StatusNet.
-msgctxt "MENU"
-msgid "Help"
-msgstr "Axuda"
-
-#. TRANS: Secondary navigation menu item leading to text about StatusNet site.
-#, fuzzy
-msgctxt "MENU"
-msgid "About"
-msgstr "Acerca de"
-
-#. TRANS: Secondary navigation menu item leading to Frequently Asked Questions.
-#, fuzzy
-msgctxt "MENU"
-msgid "FAQ"
-msgstr "Preguntas máis frecuentes"
-
 #. TRANS: Secondary navigation menu item leading to Terms of Service.
-#, fuzzy
 msgctxt "MENU"
 msgid "TOS"
-msgstr "Condicións do servicio"
+msgstr "Condicións do servizo"
 
 #. TRANS: Secondary navigation menu item leading to privacy policy.
-#, fuzzy
 msgctxt "MENU"
 msgid "Privacy"
 msgstr "Protección de datos"
 
 #. TRANS: Secondary navigation menu item. Leads to information about StatusNet and its license.
-#, fuzzy
 msgctxt "MENU"
 msgid "Source"
 msgstr "Código fonte"
 
 #. TRANS: Secondary navigation menu item leading to version information on the StatusNet site.
-#, fuzzy
 msgctxt "MENU"
 msgid "Version"
 msgstr "Versión"
 
-#. TRANS: Secondary navigation menu item leading to e-mail contact information on the
-#. TRANS: StatusNet site, where to report bugs, ...
-#, fuzzy
-msgctxt "MENU"
-msgid "Contact"
-msgstr "Contacto"
-
-#. TRANS: Secondary navigation menu item. Leads to information about embedding a timeline widget.
-#, fuzzy
-msgctxt "MENU"
-msgid "Badge"
-msgstr "Insignia"
-
 #. TRANS: Default title for section/sidebar widget.
 msgid "Untitled section"
 msgstr "Sección sen título"
@@ -10082,27 +9199,24 @@ msgid "More..."
 msgstr "Máis..."
 
 #. TRANS: Header in settings navigation panel.
-#, fuzzy
 msgctxt "HEADER"
 msgid "Settings"
-msgstr "Configuración dos SMS"
+msgstr "Configuracións"
 
 #. TRANS: Menu item title in settings navigation panel.
 msgid "Change your profile settings"
 msgstr "Cambie a configuración do seu perfil"
 
 #. TRANS: Menu item in settings navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Avatar"
 msgstr "Avatar"
 
 #. TRANS: Menu item title in settings navigation panel.
 msgid "Upload an avatar"
-msgstr "Cargue un avatar"
+msgstr "Cargar un avatar"
 
 #. TRANS: Menu item in settings navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Password"
 msgstr "Contrasinal"
@@ -10112,7 +9226,6 @@ msgid "Change your password"
 msgstr "Cambie o seu contrasinal"
 
 #. TRANS: Menu item in settings navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Email"
 msgstr "Correo electrónico"
@@ -10121,22 +9234,16 @@ msgstr "Correo electrónico"
 msgid "Change email handling"
 msgstr "Cambie a xestión do correo electrónico"
 
-#. TRANS: Menu item title in settings navigation panel.
-msgid "Design your profile"
-msgstr "Deseñe o seu perfil"
-
 #. TRANS: Menu item in settings navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "URL"
 msgstr "URL"
 
 #. TRANS: Menu item title in settings navigation panel.
 msgid "URL shorteners"
-msgstr ""
+msgstr "Redutores de URL"
 
 #. TRANS: Menu item in settings navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "IM"
 msgstr "MI"
@@ -10146,7 +9253,6 @@ msgid "Updates by instant messenger (IM)"
 msgstr "Actualizacións por mensaxería instantánea (MI)"
 
 #. TRANS: Menu item in settings navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "SMS"
 msgstr "SMS"
@@ -10156,7 +9262,6 @@ msgid "Updates by SMS"
 msgstr "Actualizacións por SMS"
 
 #. TRANS: Menu item in settings navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Connections"
 msgstr "Conexións"
@@ -10165,8 +9270,16 @@ msgstr "Conexións"
 msgid "Authorized connected applications"
 msgstr "Aplicacións conectadas autorizadas"
 
+#. TRANS: Menu item in settings navigation panel.
+msgctxt "MENU"
+msgid "Old school"
+msgstr "Interface antiga"
+
+#. TRANS: Menu item title in settings navigation panel.
+msgid "UI tweaks for old-school users"
+msgstr "Axustes da interface antiga para os usuarios"
+
 #. TRANS: Title of form to silence a user.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Silence"
 msgstr "Silenciar"
@@ -10175,47 +9288,84 @@ msgstr "Silenciar"
 msgid "Silence this user"
 msgstr "Silenciar a este usuario"
 
+#. TRANS: Server error displayed when trying to create an anynymous OAuth consumer.
+msgid "Could not create anonymous consumer."
+msgstr "Non se puideron crear os consumidores anónimos."
+
+#. TRANS: Server error displayed when trying to create an anynymous OAuth application.
+msgid "Could not create anonymous OAuth application."
+msgstr "Non se puido crear a aplicación de OAuth anónima."
+
+#. TRANS: Exception thrown when no token association could be found.
+msgid ""
+"Could not find a profile and application associated with the request token."
+msgstr ""
+"Non se puideron atopar perfís ou aplicacións asociados ao pase da solicitude."
+
+#. TRANS: Exception thrown when no access token can be issued.
+msgid "Could not issue access token."
+msgstr "Non se puido emitir o pase de acceso."
+
+#. TRANS: Exception thrown when a database error occurs.
+msgid "Database error inserting OAuth application user."
+msgstr ""
+"Houbo un erro na base de datos ao intentar inserir o usuario da aplicación "
+"OAuth."
+
+#. TRANS: Exception thrown when a database error occurs.
+msgid "Database error updating OAuth application user."
+msgstr ""
+"Houbo un erro na base de datos ao intentar actualizar o usuario da "
+"aplicación OAuth."
+
+#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
+msgid "Tried to revoke unknown token."
+msgstr "Intentouse revogar un pase descoñecido."
+
+#. TRANS: Exception thrown when an attempt is made to remove a revoked token.
+msgid "Failed to delete revoked token."
+msgstr "Erro ao borrar o pase revogado."
+
 #. TRANS: Menu item in local navigation menu.
-#, fuzzy
 msgctxt "MENU"
 msgid "Subscriptions"
 msgstr "Subscricións"
 
 #. TRANS: Menu item title in local navigation menu.
 #. TRANS: %s is a user nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "People %s subscribes to."
-msgstr "Persoas ás que está subscrito %s"
+msgstr "Persoas ás que está subscrito %s."
 
 #. TRANS: Menu item title in local navigation menu.
 #. TRANS: %s is a user nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "People subscribed to %s."
-msgstr "Persoas subscritas a %s"
+msgstr "Persoas subscritas a %s."
 
 #. TRANS: Menu item in local navigation menu.
 #. TRANS: %d is the number of pending subscription requests.
 #, php-format
 msgctxt "MENU"
 msgid "Pending (%d)"
-msgstr ""
+msgstr "Pendentes (%d)"
 
 #. TRANS: Menu item title in local navigation menu.
 #, php-format
 msgid "Approve pending subscription requests."
-msgstr ""
+msgstr "Aprobar as peticións de subscrición pendentes."
 
 #. TRANS: Menu item title in local navigation menu.
 #. TRANS: %s is a user nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "Groups %s is a member of."
-msgstr "Grupos aos que pertence %s"
+msgstr "Grupos aos que pertence %s."
 
 #. TRANS: Menu item title in local navigation menu.
 #. TRANS: %s is a user nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "List subscriptions by %s."
-msgstr "Persoas subscritas a %s"
+msgstr "Lista de subscricións de %s."
 
 #. TRANS: Menu item in local navigation menu.
 msgctxt "MENU"
@@ -10224,14 +9374,24 @@ msgstr "Convidar"
 
 #. TRANS: Menu item title in local navigation menu.
 #. TRANS: %s is the StatusNet sitename.
-#, fuzzy, php-format
+#, php-format
 msgid "Invite friends and colleagues to join you on %s."
-msgstr "Convide a amigos e compañeiros a unírselle en %s"
+msgstr "Convide a amigos e compañeiros a unírselle en %s."
 
 #. TRANS: Form of form to subscribe to a user.
 msgid "Subscribe to this user"
 msgstr "Subscribirse a este usuario"
 
+#. TRANS: Button text to subscribe to a user.
+#. TRANS: Button text for subscribing to a list.
+msgctxt "BUTTON"
+msgid "Subscribe"
+msgstr "Subscribirse"
+
+#. TRANS: Button title to subscribe to a user.
+msgid "Subscribe to this user."
+msgstr "Subscribirse a este usuario."
+
 #. TRANS: Title of personal tag cloud section.
 msgid "People Tagcloud as self-tagged"
 msgstr "Nube de etiquetas que as persoas se puxeron a si mesmas"
@@ -10241,15 +9401,13 @@ msgid "People Tagcloud as tagged"
 msgstr "Nube de etiquetas que lle puxo a outras persoas"
 
 #. TRANS: Content displayed in a tag cloud section if there are no tags.
-#, fuzzy
 msgctxt "NOTAGS"
 msgid "None"
 msgstr "Ningún"
 
 #. TRANS: Server exception displayed if a theme name was invalid.
-#, fuzzy
 msgid "Invalid theme name."
-msgstr "Nome de ficheiro incorrecto."
+msgstr "Nome de tema visual incorrecto."
 
 #. TRANS: Exception thrown when a compressed theme is uploaded while no support present in PHP configuration.
 msgid "This server cannot handle theme uploads without ZIP support."
@@ -10267,27 +9425,25 @@ msgid "Failed saving theme."
 msgstr "Non se puido gardar o tema visual."
 
 #. TRANS: Server exception thrown when an uploaded theme has an incorrect structure.
-#, fuzzy
 msgid "Invalid theme: Bad directory structure."
-msgstr "Tema visual inválido: a estrutura do directorio é incorrecta"
+msgstr "Tema visual inválido: A estrutura do directorio é incorrecta."
 
 #. TRANS: Client exception thrown when an uploaded theme is larger than the limit.
 #. TRANS: %d is the number of bytes of the uncompressed theme.
-#, fuzzy, php-format
+#, php-format
 msgid "Uploaded theme is too large; must be less than %d byte uncompressed."
 msgid_plural ""
 "Uploaded theme is too large; must be less than %d bytes uncompressed."
 msgstr[0] ""
 "O tema visual cargado é grande de máis; o tamaño descomprimido non pode "
-"superar os %d bytes."
+"superar %d byte."
 msgstr[1] ""
 "O tema visual cargado é grande de máis; o tamaño descomprimido non pode "
 "superar os %d bytes."
 
 #. TRANS: Server exception thrown when an uploaded theme is incomplete.
-#, fuzzy
 msgid "Invalid theme archive: Missing file css/display.css"
-msgstr "Arquivo de tema visual inválido: falta o ficheiro css/display.css"
+msgstr "Arquivo de tema visual inválido: Falta o ficheiro css/display.css"
 
 #. TRANS: Server exception thrown when an uploaded theme has an incorrect file or folder name.
 msgid ""
@@ -10303,7 +9459,7 @@ msgstr "O tema visual contén nomes de extensión inseguros."
 
 #. TRANS: Server exception thrown when an uploaded theme contains a file type that is not allowed.
 #. TRANS: %s is the file type that is not allowed.
-#, fuzzy, php-format
+#, php-format
 msgid "Theme contains file of type \".%s\", which is not allowed."
 msgstr "O tema visual contén o tipo de ficheiro \".%s\". Non está permitido."
 
@@ -10312,36 +9468,34 @@ msgid "Error opening theme archive."
 msgstr "Houbo un erro ao abrir o arquivo do tema visual."
 
 #. TRANS: Header for Notices section.
-#, fuzzy
 msgctxt "HEADER"
 msgid "Notices"
 msgstr "Notas"
 
 #. TRANS: Link to show replies for a notice.
 #. TRANS: %d is the number of replies to a notice and used for plural.
-#, fuzzy, php-format
+#, php-format
 msgid "Show reply"
 msgid_plural "Show all %d replies"
-msgstr[0] "Mostrar máis"
-msgstr[1] "Mostrar máis"
+msgstr[0] "Mostrar a resposta"
+msgstr[1] "Mostrar as %d respostas"
 
 #. TRANS: Reference to the logged in user in favourite list.
 msgctxt "FAVELIST"
 msgid "You"
-msgstr ""
+msgstr "Vostede"
 
 #. TRANS: For building a list such as "Jim, Bob, Mary and 5 others like this".
 #. TRANS: %1$s is a list of users, separated by a separator (default: ", "), %2$s is the last user in the list.
-#, fuzzy, php-format
+#, php-format
 msgctxt "FAVELIST"
 msgid "%1$s and %2$s"
-msgstr "%1$s - %2$s"
+msgstr "%1$s e %2$s"
 
 #. TRANS: List message for notice favoured by logged in user.
-#, fuzzy
 msgctxt "FAVELIST"
 msgid "You like this."
-msgstr "Notas populares"
+msgstr "Gústalle isto."
 
 #. TRANS: List message for when more than 4 people like something.
 #. TRANS: %%s is a list of users liking a notice, %d is the number over 4 that like the notice.
@@ -10349,8 +9503,8 @@ msgstr "Notas populares"
 #, php-format
 msgid "%%s and %d others like this."
 msgid_plural "%%s and %d others like this."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%%s e outros %d gustan disto."
+msgstr[1] "%%s e outros %d gustan disto."
 
 #. TRANS: List message for favoured notices.
 #. TRANS: %%s is a list of users liking a notice.
@@ -10358,63 +9512,69 @@ msgstr[1] ""
 #, php-format
 msgid "%%s likes this."
 msgid_plural "%%s like this."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%%s gusta disto."
+msgstr[1] "%%s gustan disto."
 
 #. TRANS: List message for notice repeated by logged in user.
-#, fuzzy
 msgctxt "REPEATLIST"
-msgid "You have repeated this notice."
+msgid "You repeated this."
 msgstr "Xa repetiu esa nota."
 
-#. TRANS: List message for repeated notices.
-#. TRANS: %d is the number of users that have repeated a notice.
-#, fuzzy, php-format
-msgid "One person has repeated this notice."
-msgid_plural "%d people have repeated this notice."
-msgstr[0] "Xa repetiu esa nota."
-msgstr[1] "Xa repetiu esa nota."
+#. TRANS: List message for when more than 4 people repeat something.
+#. TRANS: %%s is a list of users liking a notice, %d is the number over 4 that like the notice.
+#. TRANS: Plural is decided on the total number of users liking the notice (count of %%s + %d).
+#, php-format
+msgid "%%s and %d other repeated this."
+msgid_plural "%%s and %d others repeated this."
+msgstr[0] "%%s e outros %d repetiron isto."
+msgstr[1] "%%s e outros %d repetiron isto."
+
+#. TRANS: List message for favoured notices.
+#. TRANS: %%s is a list of users liking a notice.
+#. TRANS: Plural is based on the number of of users that have favoured a notice.
+#, php-format
+msgid "%%s repeated this."
+msgid_plural "%%s repeated this."
+msgstr[0] "%%s repetiu isto."
+msgstr[1] "%%s repetiron isto."
 
 #. TRANS: Form legend.
-#, fuzzy, php-format
+#, php-format
 msgid "Search and list people"
-msgstr "Buscar no sitio"
+msgstr "Buscar e listar persoas"
 
 #. TRANS: Dropdown option for searching in profiles.
 msgid "Everything"
-msgstr ""
+msgstr "Todo"
 
 #. TRANS: Dropdown option for searching in profiles.
-#, fuzzy
 msgid "Fullname"
 msgstr "Nome completo"
 
 #. TRANS: Dropdown option for searching in profiles.
 msgid "URI (Remote users)"
-msgstr ""
+msgstr "URI (usuarios remotos)"
 
 #. TRANS: Dropdown field label.
-#, fuzzy
 msgctxt "LABEL"
 msgid "Search in"
-msgstr "Buscar no sitio"
+msgstr "Buscar en"
 
 #. TRANS: Dropdown field title.
-#, fuzzy
 msgid "Choose a field to search."
-msgstr "Escolla unha etiqueta para reducir a lista"
+msgstr "Elixa un campo para a procura."
 
 #. TRANS: Form legend.
 #. TRANS: %1$s is a nickname, $2$s is a list.
-#, fuzzy, php-format
+#, php-format
 msgid "Remove %1$s from list %2$s"
-msgstr "%1$s - %2$s"
+msgstr "Eliminar %1$s da lista %2$s"
 
 #. TRANS: Legend on form to add a profile to a list.
 #. TRANS: %1$s is a nickname, %2$s is a list.
-#, fuzzy, php-format
+#, php-format
 msgid "Add %1$s to list %2$s"
-msgstr "%1$s - %2$s"
+msgstr "Engadir %1$s á lista %2$s"
 
 #. TRANS: Title for top posters section.
 msgid "Top posters"
@@ -10423,38 +9583,34 @@ msgstr "Os que máis publican"
 #. TRANS: Option in drop-down of potential addressees.
 msgctxt "SENDTO"
 msgid "Everyone"
-msgstr ""
+msgstr "Todos"
 
 #. TRANS: Option in drop-down of potential addressees.
 #. TRANS: %s is a StatusNet sitename.
 #, php-format
 msgid "My colleagues at %s"
-msgstr ""
+msgstr "Os meus compañeiros en %s"
 
 #. TRANS: Label for drop-down of potential addressees.
-#, fuzzy
 msgctxt "LABEL"
 msgid "To:"
-msgstr "A"
+msgstr "A:"
 
 #. TRANS: Checkbox label in widget for selecting potential addressees to mark the notice private.
-#, fuzzy
 msgid "Private?"
-msgstr "Privado"
+msgstr "Privada?"
 
 #. TRANS: Client exception thrown in widget for selecting potential addressees when an invalid fill option was received.
-#, fuzzy, php-format
+#, php-format
 msgid "Unknown to value: \"%s\"."
-msgstr "Non se coñece a lingua \"%s\"."
+msgstr "Descoñécese o valor: \"%s\"."
 
 #. TRANS: Title for the form to unblock a user.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Unblock"
 msgstr "Desbloquear"
 
 #. TRANS: Title for unsandbox form.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Unsandbox"
 msgstr "Deixar de illar"
@@ -10472,17 +9628,19 @@ msgid "Unsilence this user"
 msgstr "Darlle voz a este usuario"
 
 #. TRANS: Form legend on unsubscribe form.
-#. TRANS: Button title on unsubscribe form.
 msgid "Unsubscribe from this user"
 msgstr "Cancelar a subscrición a este usuario"
 
 #. TRANS: Button text on unsubscribe form.
 #. TRANS: Button text for unsubscribing from a list.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Unsubscribe"
 msgstr "Cancelar a subscrición"
 
+#. TRANS: Button title on unsubscribe form.
+msgid "Unsubscribe from this user."
+msgstr "Cancelar a subscrición a este usuario."
+
 #. TRANS: Exception text shown when no profile can be found for a user.
 #. TRANS: %1$s is a user nickname, $2$d is a user ID (number).
 #, php-format
@@ -10490,9 +9648,8 @@ msgid "User %1$s (%2$d) has no profile record."
 msgstr "O usuario %1$s (%2$d) non ten perfil."
 
 #. TRANS: Authorisation exception thrown when a user a not allowed to login.
-#, fuzzy
 msgid "Not allowed to log in."
-msgstr "Non iniciou sesión."
+msgstr "Non se lle permite iniciar sesión."
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 msgid "a few seconds ago"
@@ -10548,26 +9705,23 @@ msgstr "hai como un ano"
 
 #. TRANS: Web color exception thrown when a hexadecimal color code does not validate.
 #. TRANS: %s is the provided (invalid) color code.
-#, fuzzy, php-format
+#, php-format
 msgid "%s is not a valid color! Use 3 or 6 hex characters."
 msgstr "%s non é unha cor correcta! Use 3 ou 6 caracteres hexadecimais."
 
 #. TRANS: Exception.
-#, fuzzy
 msgid "Invalid XML."
-msgstr "Tamaño non válido."
+msgstr "XML inválido."
 
 #. TRANS: Exception.
 msgid "Invalid XML, missing XRD root."
-msgstr ""
+msgstr "XML inválido, falta a raíz XRD."
 
 #. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
 #, php-format
 msgid "Getting backup from file '%s'."
-msgstr ""
+msgstr "Obtendo a copia de seguridade desde o ficheiro \"%s\"."
 
-#~ msgid "%1$s and friends, page %2$d"
-#~ msgstr "%1$s e amigos, páxina %2$d"
-
-#~ msgid "You and friends"
-#~ msgstr "Vostede e mailos seus amigos"
+#
+#~ msgid " "
+#~ msgstr " "
diff --git a/locale/he/LC_MESSAGES/statusnet.po b/locale/he/LC_MESSAGES/statusnet.po
index 37977510c6..416fb38dd2 100644
--- a/locale/he/LC_MESSAGES/statusnet.po
+++ b/locale/he/LC_MESSAGES/statusnet.po
@@ -1,6 +1,7 @@
 # Translation of StatusNet - Core to Hebrew (עברית)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
+# Author: Amire80
 # Author: YaronSh
 # --
 # This file is distributed under the same license as the StatusNet package.
@@ -9,101 +10,169 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-15 00:20+0000\n"
-"PO-Revision-Date: 2011-01-15 00:22:37+0000\n"
-"Language-Team: Hebrew <http://translatewiki.net/wiki/Portal:he>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:06+0000\n"
+"Language-Team: Hebrew <https://translatewiki.net/wiki/Portal:he>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r80364); Translate extension (2010-09-17)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: he\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-01-15 00:06:50+0000\n"
+"X-POT-Import-Date: 2012-04-22 22:02:21+0000\n"
+
+#. TRANS: Database error message.
+#, php-format
+msgid ""
+"The database for %1$s is not responding correctly, so the site will not work "
+"properly. The site admins probably know about the problem, but you can "
+"contact them at %2$s to make sure. Otherwise, wait a few minutes and try "
+"again."
+msgstr ""
+"מסד הנתוני� של %1$s �ינו מגיב ב�ופן תקין, �ז ה�תר �ינו יכול לעבוד כר�וי. "
+"מנהלי ה�תר כנר�ה יודעי� על הבעיה הז�ת, �בל �פשר ליצור �ִת� קשר דרך %2$s כדי "
+"לווד�. �פשר להמתין מספר דקות ולנסות שוב."
+
+#. TRANS: Error message.
+msgid "An error occurred."
+msgstr "�ירעה שגי�ה."
+
+#. TRANS: Error message displayed when there is no StatusNet configuration file.
+#, php-format
+msgid ""
+"No configuration file found. Try running the installation program first."
+msgstr "ל� נמצ� קובץ ההגדרות. נסה להפעיל �ת תכנת ההתקנה קוד�."
+
+#. TRANS: Error message displayed when trying to access a non-existing page.
+msgid "Unknown page"
+msgstr "דף ל� ידוע"
+
+#. TRANS: Error message displayed when trying to perform an undefined action.
+#. TRANS: Title for password recovery page when an unknown action has been specified.
+msgid "Unknown action"
+msgstr "פעולה ל� ידועה"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
-#. TRANS: Menu item for site administration
-#: actions/accessadminpanel.php:53 lib/adminpanelaction.php:363
 msgid "Access"
 msgstr "גישה"
 
 #. TRANS: Page notice.
-#: actions/accessadminpanel.php:64
 msgid "Site access settings"
-msgstr "הגדרות הפרופיל"
+msgstr "הגדרות גישה ל�תר"
 
 #. TRANS: Form legend for registration form.
-#: actions/accessadminpanel.php:151
 msgid "Registration"
 msgstr "הרשמה"
 
 #. TRANS: Checkbox instructions for admin setting "Private".
-#: actions/accessadminpanel.php:155
 msgid "Prohibit anonymous users (not logged in) from viewing site?"
-msgstr ""
+msgstr "ל�סור על משתמשי� �למוניי� (של� נכנסו לחשבון) לצפות ב�תר?"
 
 #. TRANS: Checkbox label for prohibiting anonymous users from viewing site.
-#: actions/accessadminpanel.php:157
-#, fuzzy
+#. TRANS: Checkbox label to show private tags.
+#. TRANS: Checkbox field label on group edit form to mark a group private.
 msgctxt "LABEL"
 msgid "Private"
-msgstr "פרטיות"
+msgstr "פרטי"
 
 #. TRANS: Checkbox instructions for admin setting "Invite only".
-#: actions/accessadminpanel.php:164
 msgid "Make registration invitation only."
-msgstr ""
+msgstr "רישו� רק לפי הזמנה."
 
 #. TRANS: Checkbox label for configuring site as invite only.
-#: actions/accessadminpanel.php:166
 msgid "Invite only"
-msgstr ""
+msgstr "רק לפי הזמנה"
 
 #. TRANS: Checkbox instructions for admin setting "Closed" (no new registrations).
-#: actions/accessadminpanel.php:173
 msgid "Disable new registrations."
-msgstr ""
+msgstr "ל� ל�פשר הרשמות חדשות."
 
 #. TRANS: Checkbox label for disabling new user registrations.
-#: actions/accessadminpanel.php:175
-#, fuzzy
 msgid "Closed"
-msgstr "�ין משתמש כזה."
+msgstr "סגורה"
 
-#. TRANS: Title for button to save access settings in site admin panel.
-#: actions/accessadminpanel.php:191
-#, fuzzy
-msgid "Save access settings"
-msgstr "הגדרות"
+#. TRANS: Button title to save access settings in site admin panel.
+msgid "Save access settings."
+msgstr "שמירת הגדרות גישה."
 
-#. TRANS: Tooltip for button to save access settings in site admin panel.
+#. TRANS: Button text to save access settings in site admin panel.
 #. TRANS: Button label to save e-mail preferences.
 #. TRANS: Button label to save IM preferences.
-#. TRANS: Button text for saving "Other settings" in profile.
+#. TRANS: Button text in the license admin panel.
 #. TRANS: Button text to store form data in the Paths admin panel.
 #. TRANS: Button to save input in profile settings.
+#. TRANS: Submit button text on the sessions administration panel.
+#. TRANS: Button text for saving site settings.
 #. TRANS: Button text for saving site notice in admin panel.
 #. TRANS: Button label to save SMS preferences.
+#. TRANS: Button text to save snapshot settings.
 #. TRANS: Save button for settings for a profile in a subscriptions list.
+#. TRANS: Button text to save lists.
+#. TRANS: Button text for saving "Other settings" in profile.
 #. TRANS: Button text to save user settings in user admin panel.
 #. TRANS: Button label in the "Edit application" form.
-#. TRANS: Button text on profile design page to save settings.
-#: actions/accessadminpanel.php:193 actions/emailsettings.php:254
-#: actions/imsettings.php:187 actions/othersettings.php:134
-#: actions/pathsadminpanel.php:512 actions/profilesettings.php:201
-#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:209
-#: actions/subscriptions.php:262 actions/useradminpanel.php:298
-#: lib/applicationeditform.php:355 lib/designsettings.php:270
-#: lib/groupeditform.php:207
-#, fuzzy
+#. TRANS: Text for save button on group edit form.
+#. TRANS: Button text to save tags for a profile.
 msgctxt "BUTTON"
 msgid "Save"
-msgstr "שמור"
+msgstr "שמירה"
+
+#. TRANS: Client error displayed when the session token does not match or is not given.
+#. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
+#. TRANS: Client error displayed when the session token does not match or is not given.
+#. TRANS: Form validation error message.
+#. TRANS: Client error displayed when the session token does not match or is not given.
+#. TRANS: Form validation error.
+#. TRANS: Form validation error message.
+#. TRANS: Client error displayed when the session token does not match or is not given.
+#. TRANS: Client error displayed when the session token is not okay.
+#. TRANS: Client error displayed when the session token does not match or is not given.
+msgid "There was a problem with your session token. Try again, please."
+msgstr "הייתה בעיה ע� �סימון השיח שלך. נ� לנסות שוב."
+
+#. TRANS: Error message displayed when trying to perform an action that requires a logged in user.
+msgid "Not logged in."
+msgstr "ל� מחובר."
+
+#. TRANS: Client error displayed trying to perform an action related to a non-existing profile.
+#. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
+#. TRANS: Client exception.
+#. TRANS: Client error displayed when referring to a non-existing profile.
+#. TRANS: Client error displayed trying to subscribe to a non-existing profile.
+#. TRANS: Client error displayed trying to perform an action related to a non-existing profile.
+msgid "No such profile."
+msgstr "�ין דף משתמש כזה."
+
+#. TRANS: Client error displayed trying to reference a non-existing list.
+#. TRANS: Client error displayed when referring to a non-existing list.
+#. TRANS: Client error displayed trying to reference a non-existing list.
+msgid "No such list."
+msgstr "�ין רשימה כז�ת."
+
+#. TRANS: Client error displayed when an unknown error occurs when adding a user to a list.
+#. TRANS: %s is a username.
+#, php-format
+msgid "There was an unexpected error while listing %s."
+msgstr "�ירעה שגי�ה ל� צפויה בזמן רישו� %s."
+
+#. TRANS: Client error displayed when an unknown error occurs when adding a user to a list.
+#. TRANS: %s is a profile URL.
+#, php-format
+msgid ""
+"There was a problem listing %s. The remote server is probably not responding "
+"correctly. Please try retrying later."
+msgstr ""
+"הייתה בעיה ברישו� %s. השרת המרוחק כנר�ה ל� מגיב נכון. נ� לנסות מ�וחר יותר."
+
+#. TRANS: Title after adding a user to a list.
+msgctxt "TITLE"
+msgid "Listed"
+msgstr "נרש�"
 
 #. TRANS: Server error when page not found (404).
 #. TRANS: Server error when page not found (404)
-#: actions/all.php:68 actions/public.php:98 actions/replies.php:93
-#: actions/showfavorites.php:138 actions/tag.php:52
+#. TRANS: Server error when page not found (404).
 msgid "No such page."
 msgstr "�ין משתמש כזה."
 
@@ -111,8 +180,9 @@ msgstr "�ין משתמש כזה."
 #. TRANS: Client error when user not found for an rss related action.
 #. TRANS: Client error displayed when no existing user is provided for a user's delivery device setting.
 #. TRANS: Client error displayed if a user could not be found.
-#. TRANS: Client error when user not found updating a profile background image.
 #. TRANS: Client error displayed updating profile image without having a user object.
+#. TRANS: Client error displayed when making an Atom API request for an unknown user.
+#. TRANS: Client error displayed when trying to block a non-existing user or a user from another site.
 #. TRANS: Client error when user not found for an API action to remove a block for a user.
 #. TRANS: Client error given when a user was not found (404).
 #. TRANS: Client error when user not found for an API direct message action.
@@ -120,6 +190,10 @@ msgstr "�ין משתמש כזה."
 #. TRANS: Client error displayed when checking group membership for a non-existing user.
 #. TRANS: Client error displayed when trying to have a non-existing user join a group.
 #. TRANS: Client error displayed when trying to have a non-existing user leave a group.
+#. TRANS: Client error displayed when user not found for an action.
+#. TRANS: Client error displayed when not providing a user or an invalid user.
+#. TRANS: Client error displayed when referring to a non-existing user.
+#. TRANS: Client error displayed trying to perform an action related to a non-existing user.
 #. TRANS: Client error displayed when updating a status for a non-existing user.
 #. TRANS: Client error displayed when requesting a list of followers for a non-existing user.
 #. TRANS: Client error displayed when requesting most recent favourite notices by a user for a non-existing user.
@@ -128,222 +202,168 @@ msgstr "�ין משתמש כזה."
 #. TRANS: Client error displayed when requesting most recent mentions for a non-existing user.
 #. TRANS: Client error displayed requesting most recent notices for a non-existing user.
 #. TRANS: Client error displayed trying to get an avatar for a non-existing user.
+#. TRANS: Client error displayed when trying to get the RSS feed with favorites of a user that does not exist.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed without providing a user nickname.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed for an object that is not a user.
+#. TRANS: Client error displayed trying to make a micro summary without providing a valid user.
+#. TRANS: Client error displayed trying to send a direct message to a non-existing user.
+#. TRANS: Client error displayed trying to use "one time password login" without using an existing user.
+#. TRANS: Client error displayed when referring to non-existing user.
+#. TRANS: Client error displayed trying to perform an action related to a non-existing user.
+#. TRANS: Client error displayed when trying to reply to a non-exsting user.
+#. TRANS: Client error displayed when providing a non-existing nickname in a RSS 1.0 action.
+#. TRANS: Client error.
+#. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
+#. TRANS: Client error displayed trying to perform an action related to a non-existing user.
+#. TRANS: Client error displayed trying to find a user by ID for a non-existing ID.
+#. TRANS: Client error displayed requesting groups for a non-existing user.
+#. TRANS: Client error displayed when user not found for an action.
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
-#: actions/all.php:80 actions/allrss.php:69
-#: actions/apiaccountupdatedeliverydevice.php:110
-#: actions/apiaccountupdateprofile.php:103
-#: actions/apiaccountupdateprofilebackgroundimage.php:118
-#: actions/apiaccountupdateprofileimage.php:104 actions/apiatomservice.php:60
-#: actions/apiblockcreate.php:95 actions/apiblockdestroy.php:94
-#: actions/apidirectmessage.php:75 actions/apidirectmessagenew.php:72
-#: actions/apigroupcreate.php:111 actions/apigroupismember.php:89
-#: actions/apigroupjoin.php:98 actions/apigroupleave.php:98
-#: actions/apigrouplist.php:70 actions/apistatusesupdate.php:230
-#: actions/apisubscriptions.php:85 actions/apitimelinefavorites.php:70
-#: actions/apitimelinefriends.php:173 actions/apitimelinehome.php:78
-#: actions/apitimelinementions.php:77 actions/apitimelineuser.php:79
-#: actions/avatarbynickname.php:79 actions/favoritesrss.php:74
-#: actions/foaf.php:40 actions/foaf.php:58 actions/hcard.php:67
-#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
-#: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154
-#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:116
-#: actions/showfavorites.php:105 actions/userbyid.php:74
-#: actions/usergroups.php:93 actions/userrss.php:40 actions/userxrd.php:59
-#: actions/xrds.php:71 lib/command.php:497 lib/galleryaction.php:59
-#: lib/mailbox.php:82 lib/profileaction.php:77
+#. TRANS: Client error displayed when trying to perform a gallery action with an unknown user.
+#. TRANS: Client error displayed when trying to access a mailbox without providing a user.
+#. TRANS: Client error displayed when calling a profile action without specifying a user.
 msgid "No such user."
 msgstr "�ין משתמש כזה."
 
-#. TRANS: Page title. %1$s is user nickname, %2$d is page number
-#: actions/all.php:91
-#, fuzzy, php-format
-msgid "%1$s and friends, page %2$d"
-msgstr "%s וחברי�"
+#. TRANS: Title of a user's own start page.
+msgid "Home timeline"
+msgstr "ציר הזמן בדף הבית"
 
-#. TRANS: Page title. %s is user nickname
-#. TRANS: H1 text for page. %s is a user nickname.
-#. TRANS: Message is used as link title. %s is a user nickname.
-#. TRANS: Timeline title for user and friends. %s is a user nickname.
-#: actions/all.php:94 actions/all.php:191 actions/allrss.php:117
-#: actions/apitimelinefriends.php:207 actions/apitimelinehome.php:113
-#: lib/personalgroupnav.php:103
+#. TRANS: Title of another user's start page.
+#. TRANS: %s is the other user's name.
 #, php-format
-msgid "%s and friends"
-msgstr "%s וחברי�"
+msgid "%s's home timeline"
+msgstr "ציר הזמן בדף הבית של %s"
 
 #. TRANS: %s is user nickname.
-#: actions/all.php:108
-#, fuzzy, php-format
+#. TRANS: Feed title.
+#. TRANS: %s is tagger's nickname.
+#, php-format
+msgid "Feed for friends of %s (Activity Streams JSON)"
+msgstr "הזנה עבור החברי� של %s� (Activity Streams JSON)"
+
+#. TRANS: %s is user nickname.
+#, php-format
 msgid "Feed for friends of %s (RSS 1.0)"
-msgstr "הזנות החברי� של %s"
+msgstr "הזנות עבור החברי� של %s� (RSS 1.0)"
 
 #. TRANS: %s is user nickname.
-#: actions/all.php:117
-#, fuzzy, php-format
+#. TRANS: Feed title.
+#. TRANS: %s is tagger's nickname.
+#, php-format
 msgid "Feed for friends of %s (RSS 2.0)"
-msgstr "הזנות החברי� של %s"
+msgstr "הזנות עבור החברי� של %s� (RSS 2.0)"
 
 #. TRANS: %s is user nickname.
-#: actions/all.php:126
-#, fuzzy, php-format
+#, php-format
 msgid "Feed for friends of %s (Atom)"
-msgstr "הזנות החברי� של %s"
+msgstr "הזנות עבור החברי� של %s� (Atom)"
 
 #. TRANS: Empty list message. %s is a user nickname.
-#: actions/all.php:139
 #, php-format
 msgid ""
 "This is the timeline for %s and friends but no one has posted anything yet."
-msgstr ""
+msgstr "זהו ציר הזמן עבור %s וידידיו, �בל �יש ל� כתב פה שו� דבר עדיין"
 
 #. TRANS: Encouragement displayed on logged in user's empty timeline.
 #. TRANS: This message contains Markdown links. Keep "](" together.
-#: actions/all.php:146
 #, php-format
 msgid ""
 "Try subscribing to more people, [join a group](%%action.groups%%) or post "
 "something yourself."
 msgstr ""
+"נסה להירש� ליותר �נשי�, [להצטרף לקבוצה](%%action.groups%%) �ו לפרס� משהו "
+"שימושי בעצמך."
 
 #. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@".
 #. TRANS: This message contains Markdown links. Keep "](" together.
-#: actions/all.php:150
 #, php-format
 msgid ""
 "You can try to [nudge %1$s](../%2$s) from their profile or [post something "
 "to them](%%%%action.newnotice%%%%?status_textarea=%3$s)."
 msgstr ""
+"�פשר לנסות [לדחוף �ת %1$s](../%2$s) מדף המשתמש שלה� �ו [לשלוח לה� משהו](%%%%"
+"action.newnotice%%%%?status_textarea=%3$s)."
 
-#. TRANS: Encoutagement displayed on empty timeline user pages for anonymous users.
+#. TRANS: Encouragement displayed on empty timeline user pages for anonymous users.
 #. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
+#. TRANS: Empty list message for page with replies for a user for not logged in users.
+#. TRANS: %1$s is a user nickname. This message contains a Markdown link in the form [link text](link).
 #. TRANS: Second sentence of empty message for anonymous users. %s is a user nickname.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:227
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
 "post a notice to them."
 msgstr ""
+"למה ל� [ליצור חשבון](%%%%action.register%%%%) ו�ז להטריד �ת %s �ו לשלוח לה� "
+"עדכון."
 
-#. TRANS: H1 text for page when viewing a list for self.
-#: actions/all.php:188
-#, fuzzy
-msgid "You and friends"
+#. TRANS: Button text for inviting more users to the StatusNet instance.
+#. TRANS: Less business/enterprise-oriented language for public sites.
+msgctxt "BUTTON"
+msgid "Send invite"
+msgstr "שליחת הזמנה"
+
+#. TRANS: Message is used as link title. %s is a user nickname.
+#. TRANS: Title of API timeline for a user and friends.
+#. TRANS: %s is a username.
+#. TRANS: Timeline title for user and friends. %s is a user nickname.
+#. TRANS: Menu item title in administrator navigation panel.
+#. TRANS: %s is a username.
+#. TRANS: Menu item title in personal group navigation menu.
+#. TRANS: %s is a username.
+#, php-format
+msgid "%s and friends"
 msgstr "%s וחברי�"
 
 #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
 #. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name.
-#: actions/allrss.php:122 actions/apitimelinefriends.php:213
-#: actions/apitimelinehome.php:119
 #, php-format
 msgid "Updates from %1$s and friends on %2$s!"
-msgstr ""
+msgstr "עדכון מ�ת %1$s וידידיו ב�תר %2$s!"
 
-#. TRANS: Client error displayed handling a non-existing API method.
+#. TRANS: Client error displayed when coming across a non-supported API method.
 #. TRANS: Client error displayed when trying to handle an unknown API method.
-#. TRANS: Client error displayed trying to execute an unknown API method updating profile colours.
-#. TRANS: Client error displayed trying to execute an unknown API method verifying user credentials.
-#. TRANS: Client error given when an API method was not found (404).
-#. TRANS: Client error displayed when trying to handle an unknown API method.
-#. TRANS: Client error displayed trying to execute an unknown API method showing friendship.
-#. TRANS: Client error given when an API method was not found (404).
-#. TRANS: Client error displayed trying to execute an unknown API method showing group membership.
-#. TRANS: Client error displayed trying to execute an unknown API method joining a group.
-#. TRANS: Client error displayed trying to execute an unknown API method leaving a group.
-#. TRANS: Client error displayed trying to execute an unknown API method checking group membership.
-#. TRANS: Client error displayed trying to execute an unknown API method listing the latest 20 groups.
-#. TRANS: Client error displayed trying to execute an unknown API method showing group membership.
-#. TRANS: Client error displayed trying to execute an unknown API method showing a group.
-#. TRANS: Client error displayed trying to execute an unknown API method testing API connectivity.
-#. TRANS: Client error displayed trying to execute an unknown API method deleting a status.
-#. TRANS: Client error displayed when trying to handle an unknown API method.
-#: actions/apiaccountratelimitstatus.php:69
-#: actions/apiaccountupdatedeliverydevice.php:92
-#: actions/apiaccountupdateprofile.php:94
-#: actions/apiaccountupdateprofilebackgroundimage.php:92
-#: actions/apiaccountupdateprofilecolors.php:115
-#: actions/apiaccountverifycredentials.php:68 actions/apidirectmessage.php:157
-#: actions/apifavoritecreate.php:98 actions/apifavoritedestroy.php:98
-#: actions/apifriendshipscreate.php:99 actions/apifriendshipsdestroy.php:99
-#: actions/apifriendshipsshow.php:124 actions/apigroupcreate.php:138
-#: actions/apigroupismember.php:115 actions/apigroupjoin.php:160
-#: actions/apigroupleave.php:145 actions/apigrouplist.php:134
-#: actions/apigrouplistall.php:120 actions/apigroupmembership.php:105
-#: actions/apigroupshow.php:114 actions/apihelptest.php:84
-#: actions/apistatusesdestroy.php:101 actions/apistatusesretweets.php:110
-#: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:138
-#: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
-#: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:268
-#: actions/apitimelinegroup.php:147 actions/apitimelinehome.php:173
-#: actions/apitimelinementions.php:174 actions/apitimelinepublic.php:239
-#: actions/apitimelineretweetedtome.php:118
-#: actions/apitimelineretweetsofme.php:150 actions/apitimelinetag.php:159
-#: actions/apitimelineuser.php:206 actions/apiusershow.php:100
-#, fuzzy
+#. TRANS: Client error displayed when coming across a non-supported API method.
 msgid "API method not found."
-msgstr "קוד ה�ישור ל� נמצ�."
+msgstr "שיטת API ל� נמצ�ה."
 
 #. TRANS: Client error message. POST is a HTTP command. It should not be translated.
 #. TRANS: Client error. POST is a HTTP command. It should not be translated.
-#: actions/apiaccountupdatedeliverydevice.php:83
-#: actions/apiaccountupdateprofile.php:85
-#: actions/apiaccountupdateprofilebackgroundimage.php:83
-#: actions/apiaccountupdateprofilecolors.php:106
-#: actions/apiaccountupdateprofileimage.php:80 actions/apiblockcreate.php:87
-#: actions/apiblockdestroy.php:85 actions/apidirectmessagenew.php:107
-#: actions/apifavoritecreate.php:88 actions/apifavoritedestroy.php:88
-#: actions/apifriendshipscreate.php:89 actions/apifriendshipsdestroy.php:89
-#: actions/apigroupcreate.php:102 actions/apigroupjoin.php:89
-#: actions/apigroupleave.php:89 actions/apimediaupload.php:66
-#: actions/apistatusesretweet.php:63 actions/apistatusesupdate.php:194
+#. TRANS: Client error message. POST is a HTTP command. It should not be translated.
+#. TRANS: Client error. POST is a HTTP command. It should not be translated.
 msgid "This method requires a POST."
-msgstr ""
+msgstr "השיטה הז�ת דורשת POST."
 
 #. TRANS: Client error displayed when no valid device parameter is provided for a user's delivery device setting.
-#: actions/apiaccountupdatedeliverydevice.php:103
 msgid ""
 "You must specify a parameter named 'device' with a value of one of: sms, im, "
 "none."
-msgstr ""
+msgstr "יש להגדיר פרמטר בש� 'device' ע� �חד מהערכי� הבעי�: sms�, im�, none."
 
 #. TRANS: Server error displayed when a user's delivery device cannot be updated.
-#: actions/apiaccountupdatedeliverydevice.php:130
-#, fuzzy
+#. TRANS: Server error displayed when confirming an e-mail address or IM address fails.
+#. TRANS: Server error thrown on database error updating e-mail preferences.
+#. TRANS: Server error thrown on database error removing a registered e-mail address.
+#. TRANS: Server error thrown when user profile settings could not be updated.
+#. TRANS: Server error thrown on database error updating SMS preferences.
+#. TRANS: Server error thrown on database error removing a registered SMS phone number.
+#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
 msgid "Could not update user."
-msgstr "עידכון המשתמש נכשל."
+msgstr "עדכון המשתמש נכשל."
 
-#. TRANS: Client error displayed if a user profile could not be found.
-#. TRANS: Client error displayed when a user has no profile.
-#. TRANS: Client error displayed a user has no profile updating profile colours.
-#. TRANS: Client error displayed if a user profile could not be found updating a profile image.
-#. TRANS: Client error displayed when requesting user information for a user without a profile.
-#. TRANS: Client error displayed trying to get an avatar for a user without a profile.
-#: actions/apiaccountupdateprofile.php:111
-#: actions/apiaccountupdateprofilebackgroundimage.php:199
-#: actions/apiaccountupdateprofilecolors.php:183
-#: actions/apiaccountupdateprofileimage.php:130
-#: actions/apiuserprofileimage.php:88 actions/apiusershow.php:108
-#: actions/avatarbynickname.php:85 actions/foaf.php:65 actions/hcard.php:74
-#: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
-#: lib/profileaction.php:84
+#. TRANS: Error message displayed when referring to a user without a profile.
 msgid "User has no profile."
 msgstr "למשתמש �ין פרופיל."
 
 #. TRANS: Server error displayed if a user profile could not be saved.
-#: actions/apiaccountupdateprofile.php:147
-#, fuzzy
+#. TRANS: Server error thrown when user profile settings could not be saved.
 msgid "Could not save profile."
 msgstr "שמירת הפרופיל נכשלה."
 
 #. TRANS: Client error displayed when the number of bytes in a POST request exceeds a limit.
 #. TRANS: %s is the number of bytes of the CONTENT_LENGTH.
-#. TRANS: Form validation error in design settings form. POST should remain untranslated.
-#: actions/apiaccountupdateprofilebackgroundimage.php:108
-#: actions/apiaccountupdateprofileimage.php:95 actions/apimediaupload.php:81
-#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269
-#: actions/designadminpanel.php:125 actions/editapplication.php:121
-#: actions/newapplication.php:104 actions/newnotice.php:95
-#: lib/designsettings.php:298
 #, php-format
 msgid ""
 "The server was unable to handle that much POST data (%s byte) due to its "
@@ -352,113 +372,98 @@ msgid_plural ""
 "The server was unable to handle that much POST data (%s bytes) due to its "
 "current configuration."
 msgstr[0] ""
+"השרת ל� היה מסוגל לטפל במידע POST כה רב (בית �חד) בשל תצורתו הנוכחית."
 msgstr[1] ""
+"השרת ל� היה מסוגל לטפל במידע POST כה רב (%s בתי�) בשל תצורתו הנוכחית."
 
-#. TRANS: Client error displayed when saving design settings fails because of an empty id.
-#. TRANS: Client error displayed when saving design settings fails because of an empty result.
-#. TRANS: Client error displayed when a database error occurs inserting profile colours.
-#. TRANS: Client error displayed when a database error occurs updating profile colours.
-#: actions/apiaccountupdateprofilebackgroundimage.php:138
-#: actions/apiaccountupdateprofilebackgroundimage.php:149
-#: actions/apiaccountupdateprofilecolors.php:160
-#: actions/apiaccountupdateprofilecolors.php:171
-#: actions/groupdesignsettings.php:290 actions/groupdesignsettings.php:300
-#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
-#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
-msgid "Unable to save your design settings."
-msgstr ""
-
-#. TRANS: Error displayed when updating design settings fails.
-#. TRANS: Client error displayed when a database error occurs updating profile colours.
-#: actions/apiaccountupdateprofilebackgroundimage.php:191
-#: actions/apiaccountupdateprofilecolors.php:139
-#, fuzzy
-msgid "Could not update your design."
-msgstr "עידכון המשתמש נכשל."
-
-#: actions/apiatomservice.php:86
+#. TRANS: Title for Atom feed.
+msgctxt "ATOM"
 msgid "Main"
-msgstr ""
+msgstr "ר�שי"
 
+#. TRANS: Title for Atom feed. %s is a user nickname.
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Title in atom group notice feed. %s is a group name.
 #. TRANS: Title in atom user notice feed. %s is a user name.
-#: actions/apiatomservice.php:93 actions/grouprss.php:139
-#: actions/userrss.php:94 lib/atomgroupnoticefeed.php:63
-#: lib/atomusernoticefeed.php:68
-#, fuzzy, php-format
+#, php-format
 msgid "%s timeline"
-msgstr "קו זמן ציבורי"
+msgstr "קן זמן %s"
 
+#. TRANS: Title for Atom feed with a user's subscriptions. %s is a user nickname.
+#. TRANS: Title for Atom subscription feed.
+#. TRANS: %s is a user nickname.
 #. TRANS: Header for subscriptions overview for a user (first page).
 #. TRANS: %s is a user nickname.
-#: actions/apiatomservice.php:103 actions/atompubsubscriptionfeed.php:147
-#: actions/subscriptions.php:51
-#, fuzzy, php-format
+#, php-format
 msgid "%s subscriptions"
-msgstr "כל המנויי�"
+msgstr "מינויי� של %s"
 
-#: actions/apiatomservice.php:113 actions/atompubfavoritefeed.php:142
+#. TRANS: Title for Atom feed with a user's favorite notices. %s is a user nickname.
+#. TRANS: Title for Atom favorites feed.
+#. TRANS: %s is a user nickname.
 #, php-format
 msgid "%s favorites"
-msgstr ""
+msgstr "%s – מועדפי�"
 
-#: actions/apiatomservice.php:123
+#. TRANS: Title for Atom feed with a user's memberships. %s is a user nickname.
 #, php-format
 msgid "%s memberships"
-msgstr ""
+msgstr "%s – חברויות"
 
 #. TRANS: Client error displayed when users try to block themselves.
-#: actions/apiblockcreate.php:104
-#, fuzzy
 msgid "You cannot block yourself!"
-msgstr "עידכון המשתמש נכשל."
+msgstr "משתמש ל� יכול לחסו� �ת עצמו!"
 
 #. TRANS: Server error displayed when blocking a user has failed.
-#: actions/apiblockcreate.php:126
 msgid "Block user failed."
-msgstr ""
+msgstr "חסימת משתמש נכשלה."
 
 #. TRANS: Server error displayed when unblocking a user has failed.
-#: actions/apiblockdestroy.php:113
 msgid "Unblock user failed."
-msgstr ""
+msgstr "הסרת החסימה ממשתמש נכשלה."
+
+#. TRANS: Client exception thrown when no conversation ID is given.
+msgid "No conversation ID."
+msgstr "�ין מזהה שיחה."
+
+#. TRANS: Client exception thrown when referring to a non-existing conversation ID (%d).
+#, php-format
+msgid "No conversation with ID %d."
+msgstr "�ין שיחה ע� מזהה %d."
+
+#. TRANS: Title for conversion timeline.
+msgctxt "TITLE"
+msgid "Conversation"
+msgstr "שיחה"
 
 #. TRANS: Title. %s is a user nickname.
-#: actions/apidirectmessage.php:88
 #, php-format
 msgid "Direct messages from %s"
-msgstr ""
+msgstr "הודעות ישירות מ�ת %s"
 
 #. TRANS: Subtitle. %s is a user nickname.
-#: actions/apidirectmessage.php:93
 #, php-format
 msgid "All the direct messages sent from %s"
-msgstr ""
+msgstr "כל ההודעות הישירות שנשלחו מ�ת %s"
 
 #. TRANS: Title. %s is a user nickname.
-#: actions/apidirectmessage.php:102
 #, php-format
 msgid "Direct messages to %s"
-msgstr ""
+msgstr "הודעות ישירות �ל %s"
 
 #. TRANS: Subtitle. %s is a user nickname.
-#: actions/apidirectmessage.php:107
 #, php-format
 msgid "All the direct messages sent to %s"
-msgstr ""
+msgstr "כל ההודעות הישירות שנשלחו �ל %s"
 
 #. TRANS: Client error displayed when no message text was submitted (406).
-#: actions/apidirectmessagenew.php:117
-#, fuzzy
 msgid "No message text!"
-msgstr "הודעה חדשה"
+msgstr "�ין טקסט הודעה"
 
 #. TRANS: Client error displayed when message content is too long.
 #. TRANS: %d is the maximum number of characters for a message.
 #. TRANS: Form validation error displayed when message content is too long.
 #. TRANS: %d is the maximum number of characters for a message.
-#: actions/apidirectmessagenew.php:127 actions/newmessage.php:152
 #, php-format
 msgid "That's too long. Maximum message size is %d character."
 msgid_plural "That's too long. Maximum message size is %d characters."
@@ -466,172 +471,149 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Client error displayed if a recipient user could not be found (403).
-#: actions/apidirectmessagenew.php:139
-#, fuzzy
 msgid "Recipient user not found."
-msgstr "קוד ה�ישור ל� נמצ�."
+msgstr "משתמש הנמען ל� נמצ�"
 
 #. TRANS: Client error displayed trying to direct message another user who's not a friend (403).
-#: actions/apidirectmessagenew.php:144
-msgid "Can't send direct messages to users who aren't your friend."
-msgstr ""
+msgid "Cannot send direct messages to users who aren't your friend."
+msgstr "ל� ניתן לשלוח הודעות ישירות למשתמשי� ש�ינ� נמני� ע� החברי� שלך."
 
 #. TRANS: Client error displayed trying to direct message self (403).
-#: actions/apidirectmessagenew.php:154
+#. TRANS: Client error displayed trying to send a direct message to self.
+#. TRANS: Error text shown when trying to send a direct message to self.
 msgid ""
 "Do not send a message to yourself; just say it to yourself quietly instead."
-msgstr ""
+msgstr "�ל תשלח לעצמך הודעה; פשוט �מור �ת זה לעצמך בשקט."
 
 #. TRANS: Client error displayed when requesting a status with a non-existing ID.
 #. TRANS: Client error displayed when trying to remove a favourite with an invalid ID.
 #. TRANS: Client error displayed trying to delete a status with an invalid ID.
-#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:108
-#: actions/apistatusesdestroy.php:121
 msgid "No status found with that ID."
-msgstr ""
+msgstr "�ין מצב ע� מזהה כזה."
 
 #. TRANS: Client error displayed when trying to mark a notice favourite that already is a favourite.
-#: actions/apifavoritecreate.php:120
-#, fuzzy
 msgid "This status is already a favorite."
-msgstr "זהו כבר זיהוי ה-Jabber שלך."
+msgstr "עדכון המצב הזה כבר מסומן כמועדף"
 
 #. TRANS: Client error displayed when marking a notice as favourite fails.
+#. TRANS: Server error displayed when trying to mark a notice as favorite fails in the database.
 #. TRANS: Error message text shown when a favorite could not be set.
-#: actions/apifavoritecreate.php:132 actions/favor.php:84 lib/command.php:294
-#, fuzzy
 msgid "Could not create favorite."
-msgstr "שמירת הפרופיל נכשלה."
+msgstr "שג�ה ביצירת מועדף."
 
 #. TRANS: Client error displayed when trying to remove a favourite that was not a favourite.
-#: actions/apifavoritedestroy.php:122
 msgid "That status is not a favorite."
-msgstr ""
+msgstr "העדכון הזה �ינו מועדף."
 
 #. TRANS: Client error displayed when removing a favourite has failed.
-#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
-#, fuzzy
+#. TRANS: Server error displayed when removing a favorite from the database fails.
 msgid "Could not delete favorite."
-msgstr "עידכון המשתמש נכשל."
+msgstr "שגי�ה במחיקת מועדף."
 
 #. TRANS: Client error displayed when trying follow who's profile could not be found.
-#: actions/apifriendshipscreate.php:109
 msgid "Could not follow user: profile not found."
 msgstr "שמירת הפרופיל נכשלה."
 
 #. TRANS: Client error displayed when trying to follow a user that's already being followed.
 #. TRANS: %s is the nickname of the user that is already being followed.
-#: actions/apifriendshipscreate.php:120
 #, php-format
 msgid "Could not follow user: %s is already on your list."
-msgstr ""
+msgstr "�י־�פשר לעקוב �חרי משתמש: %s כבר ברשימה שלך."
 
 #. TRANS: Client error displayed when trying to unfollow a user that cannot be found.
-#: actions/apifriendshipsdestroy.php:109
-#, fuzzy
 msgid "Could not unfollow user: User not found."
-msgstr "נכשלה ההפניה לשרת: %s"
+msgstr "שגי�ה בניתוק ממשתמש: משתמש ל� נמצ�."
 
 #. TRANS: Client error displayed when trying to unfollow self.
-#: actions/apifriendshipsdestroy.php:121
-#, fuzzy
 msgid "You cannot unfollow yourself."
-msgstr "עידכון המשתמש נכשל."
+msgstr "�י־�פשר להתנתק מכצמך."
 
 #. TRANS: Client error displayed when supplying invalid parameters to an API call checking if a friendship exists.
-#: actions/apifriendshipsexists.php:88
 msgid "Two valid IDs or nick names must be supplied."
-msgstr ""
+msgstr "יש לספק שני מזהי� �ו שני שמות משתמש תקיני�."
 
 #. TRANS: Client error displayed when a source user could not be determined showing friendship.
-#: actions/apifriendshipsshow.php:131
-#, fuzzy
 msgid "Could not determine source user."
-msgstr "עידכון המשתמש נכשל."
+msgstr "ל� הצלחתי להבין מיהו משתמש המקור."
 
 #. TRANS: Client error displayed when a target user could not be determined showing friendship.
-#: actions/apifriendshipsshow.php:140
-#, fuzzy
 msgid "Could not find target user."
-msgstr "עידכון המשתמש נכשל."
+msgstr "ל� נמצ� משתמש היעד."
 
 #. TRANS: Client error trying to create a group with a nickname this is already in use.
+#. TRANS: API validation exception thrown when nickname is already used.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:156 actions/editgroup.php:189
-#: actions/newgroup.php:136 actions/profilesettings.php:277
-#: actions/register.php:214
+#. TRANS: Form validation error displayed when trying to register with an existing nickname.
 msgid "Nickname already in use. Try another one."
 msgstr "כינוי זה כבר תפוס. נסה כינוי �חר."
 
 #. TRANS: Client error in form for group creation.
+#. TRANS: API validation exception thrown when nickname does not validate.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:164 actions/editgroup.php:193
-#: actions/newgroup.php:140 actions/profilesettings.php:247
-#: actions/register.php:216
+#. TRANS: Form validation error displayed when trying to register with an invalid nickname.
 msgid "Not a valid nickname."
-msgstr "ש� משתמש ל� חוקי."
+msgstr "ש� משתמש ל� תקין."
 
 #. TRANS: Client error in form for group creation.
+#. TRANS: API validation exception thrown when homepage URL does not validate.
 #. TRANS: Validation error shown when providing an invalid homepage URL in the "Edit application" form.
 #. TRANS: Group edit form validation error.
+#. TRANS: Validation error shown when providing an invalid homepage URL in the "New application" form.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:181 actions/editapplication.php:233
-#: actions/editgroup.php:200 actions/newapplication.php:211
-#: actions/newgroup.php:147 actions/profilesettings.php:252
-#: actions/register.php:223
+#. TRANS: Form validation error displayed when trying to register with an invalid homepage URL.
 msgid "Homepage is not a valid URL."
-msgstr "ל�תר הבית יש כתובת ל� חוקית."
+msgstr "כתובת �תר הבית �ינה תקינה."
 
 #. TRANS: Client error in form for group creation.
+#. TRANS: API validation exception thrown when full name does not validate.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:191 actions/editgroup.php:204
-#: actions/newgroup.php:151 actions/profilesettings.php:256
-#: actions/register.php:226
+#. TRANS: Form validation error displayed when trying to register with a too long full name.
 msgid "Full name is too long (maximum 255 characters)."
-msgstr ""
+msgstr "הש� המל� �רוך מדי (מותר 255 תווי� לכל היותר)."
 
 #. TRANS: Client error shown when providing too long a description during group creation.
 #. TRANS: %d is the maximum number of allowed characters.
+#. TRANS: API validation exception thrown when description does not validate.
+#. TRANS: %d is the maximum description length and used for plural.
 #. TRANS: Validation error shown when providing too long a description in the "Edit application" form.
+#. TRANS: %d is the maximum number of allowed characters.
 #. TRANS: Group edit form validation error.
+#. TRANS: Client error shown when providing too long a description when editing a list.
+#. TRANS: %d is the maximum number of allowed characters.
 #. TRANS: Form validation error in New application form.
 #. TRANS: %d is the maximum number of characters for the description.
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed characters.
-#: actions/apigroupcreate.php:201 actions/editapplication.php:201
-#: actions/editgroup.php:209 actions/newapplication.php:178
-#: actions/newgroup.php:156
 #, php-format
 msgid "Description is too long (maximum %d character)."
 msgid_plural "Description is too long (maximum %d characters)."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "התי�ור �רוך מדי (מותר תו �חד לכל היותר)."
+msgstr[1] "התי�ור �רוך מדי (מותר %d תווי� לכל היותר)."
 
 #. TRANS: Client error shown when providing too long a location during group creation.
+#. TRANS: API validation exception thrown when location does not validate.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:215 actions/editgroup.php:216
-#: actions/newgroup.php:163 actions/profilesettings.php:269
-#: actions/register.php:235
+#. TRANS: Form validation error displayed when trying to register with a too long location.
 msgid "Location is too long (maximum 255 characters)."
-msgstr ""
+msgstr "המיקו� �רוך מדי (255 תווי� לכל היותר)."
 
 #. TRANS: Client error shown when providing too many aliases during group creation.
 #. TRANS: %d is the maximum number of allowed aliases.
+#. TRANS: API validation exception thrown when aliases do not validate.
+#. TRANS: %d is the maximum number of aliases and used for plural.
 #. TRANS: Group edit form validation error.
 #. TRANS: %d is the maximum number of allowed aliases.
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed aliases.
-#: actions/apigroupcreate.php:236 actions/editgroup.php:229
-#: actions/newgroup.php:176
 #, php-format
 msgid "Too many aliases! Maximum %d allowed."
 msgid_plural "Too many aliases! Maximum %d allowed."
@@ -640,26 +622,24 @@ msgstr[1] ""
 
 #. TRANS: Client error shown when providing an invalid alias during group creation.
 #. TRANS: %s is the invalid alias.
-#: actions/apigroupcreate.php:253
+#. TRANS: API validation exception thrown when aliases does not validate.
+#. TRANS: %s is the invalid alias.
 #, php-format
 msgid "Invalid alias: \"%s\"."
-msgstr "גודל ל� חוקי."
+msgstr "כינוי ל� תקין: \"%s\"."
 
 #. TRANS: Client error displayed when trying to use an alias during group creation that is already in use.
 #. TRANS: %s is the alias that is already in use.
+#. TRANS: API validation exception thrown when aliases is already used.
+#. TRANS: %s is the already used alias.
 #. TRANS: Group edit form validation error.
-#. TRANS: Group create form validation error.
-#: actions/apigroupcreate.php:264 actions/editgroup.php:244
-#: actions/newgroup.php:191
-#, fuzzy, php-format
+#. TRANS: Group create form validation error. %s is the already used alias.
+#, php-format
 msgid "Alias \"%s\" already in use. Try another one."
-msgstr "כינוי זה כבר תפוס. נסה כינוי �חר."
+msgstr "הכינוי \"%s\" כבר בשימוש. נסה לבחור כינוי �חר."
 
 #. TRANS: Client error displayed when trying to use an alias during group creation that is the same as the group's nickname.
 #. TRANS: Group edit form validation error.
-#. TRANS: Group create form validation error.
-#: actions/apigroupcreate.php:278 actions/editgroup.php:251
-#: actions/newgroup.php:198
 msgid "Alias can't be the same as nickname."
 msgstr ""
 
@@ -667,129 +647,171 @@ msgstr ""
 #. TRANS: Client error displayed when trying to join a group that does not exist.
 #. TRANS: Client error displayed when trying to leave a group that does not exist.
 #. TRANS: Client error displayed trying to show group membership on a non-existing group.
+#. TRANS: Client error displayed when not providing a group or an invalid group.
 #. TRANS: Client error displayed when trying to show a group that could not be found.
 #. TRANS: Client error displayed requesting most recent notices to a group for a non-existing group.
-#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
-#: actions/apigroupleave.php:104 actions/apigroupmembership.php:89
-#: actions/apigroupshow.php:81 actions/apitimelinegroup.php:89
 msgid "Group not found."
 msgstr "קוד ה�ישור ל� נמצ�."
 
 #. TRANS: Server error displayed when trying to join a group the user is already a member of.
+#. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown a user tries to join a group they already are a member of.
-#: actions/apigroupjoin.php:111 actions/joingroup.php:100 lib/command.php:333
 msgid "You are already a member of that group."
 msgstr "ל� שלחנו �לינו �ת הפרופיל הזה"
 
 #. TRANS: Server error displayed when trying to join a group the user is blocked from joining.
+#. TRANS: Client error displayed when trying to join a group while being blocked form joining it.
 #. TRANS: Error text shown when a user tries to join a group they are blocked from joining.
-#: actions/apigroupjoin.php:121 actions/joingroup.php:105 lib/command.php:338
 msgid "You have been blocked from that group by the admin."
-msgstr ""
+msgstr "נחסמת מקבוצה זו על־ידי המנהל."
 
-#. TRANS: Server error displayed when joining a group fails.
-#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
+#. TRANS: Server error displayed when joining a group failed in the database.
+#. TRANS: %1$s is the joining user's nickname, $2$s is the group nickname for which the join failed.
 #. TRANS: Message given having failed to add a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupjoin.php:142 actions/joingroup.php:134 lib/command.php:350
-#, fuzzy, php-format
+#, php-format
 msgid "Could not join user %1$s to group %2$s."
-msgstr "נכשלה ההפניה לשרת: %s"
+msgstr "שגי�ה בצירוף משתמש %1$s לקבוצה %2$s."
 
 #. TRANS: Server error displayed when trying to leave a group the user is not a member of.
-#: actions/apigroupleave.php:115
-#, fuzzy
 msgid "You are not a member of this group."
-msgstr "ל� שלחנו �לינו �ת הפרופיל הזה"
+msgstr "�ינך חבר בקבוצה הז�ת."
 
-#. TRANS: Server error displayed when leaving a group fails.
-#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
+#. TRANS: Server error displayed when leaving a group failed in the database.
+#. TRANS: %1$s is the leaving user's nickname, $2$s is the group nickname for which the leave failed.
 #. TRANS: Message given having failed to remove a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupleave.php:127 actions/leavegroup.php:129
-#: lib/command.php:398
-#, fuzzy, php-format
+#, php-format
 msgid "Could not remove user %1$s from group %2$s."
-msgstr "נכשלה יצירת OpenID מתוך: %s"
+msgstr "נכשלה הוצ�ת משתמש %1$s מהקבוצה %2$s."
 
 #. TRANS: Used as title in check for group membership. %s is a user name.
-#: actions/apigrouplist.php:94
-#, fuzzy, php-format
+#, php-format
 msgid "%s's groups"
-msgstr "פרופיל"
+msgstr "הקבוצות של %s"
 
-#. TRANS: Used as subtitle in check for group membership. %1$s is a user name, %2$s is the site name.
-#: actions/apigrouplist.php:104
-#, fuzzy, php-format
+#. TRANS: Used as subtitle in check for group membership. %1$s is the site name, %2$s is a user name.
+#, php-format
 msgid "%1$s groups %2$s is a member of."
-msgstr "ל� שלחנו �לינו �ת הפרופיל הזה"
+msgstr "קבוצות %1$s שהמשתמש %2$s חבר בהן."
 
 #. TRANS: Message is used as a title when listing the lastest 20 groups. %s is a site name.
-#. TRANS: Message is used as a page title. %s is a nick name.
-#: actions/apigrouplistall.php:88 actions/usergroups.php:63
-#, fuzzy, php-format
+#. TRANS: Page title for first page of groups for a user.
+#. TRANS: %s is a nickname.
+#, php-format
 msgid "%s groups"
-msgstr "קבוצות"
+msgstr "קבוצות %s"
 
-#. TRANS: Message is used as a subtitle when listing the lastest 20 groups. %s is a site name.
-#: actions/apigrouplistall.php:93
+#. TRANS: Message is used as a subtitle when listing the latest 20 groups. %s is a site name.
 #, php-format
 msgid "groups on %s"
+msgstr "קבוצות ב�תר %s"
+
+#. TRANS: Client error displayed when trying to edit a group without being an admin.
+#. TRANS: Client error displayed trying to edit a group while not being a group admin.
+#. TRANS: Client error displayed when trying to change group logo settings while not being a group admin.
+msgid "You must be an admin to edit the group."
+msgstr "עליך להיות מנהל כדי לערוך �ת הקבוצה."
+
+#. TRANS: Server error displayed when group update fails.
+#. TRANS: Server error displayed when editing a group fails.
+msgid "Could not update group."
+msgstr "עדכון הקבוצה נכשל."
+
+#. TRANS: Server error displayed when adding group aliases fails.
+#. TRANS: Server error displayed when group aliases could not be added.
+#. TRANS: Server exception thrown when creating group aliases failed.
+msgid "Could not create aliases."
+msgstr "יצירת כינויי� נכשלה."
+
+#. TRANS: API validation exception thrown when nickname does not validate.
+#. TRANS: Validation error in form for registration, profile and group settings, etc.
+msgid "Nickname must have only lowercase letters and numbers and no spaces."
+msgstr "כינוי יכול להכיל רק �ותיות �נגליות קטנות ומספרי�, ולל� רווחי�."
+
+#. TRANS: API validation exception thrown when alias is the same as nickname.
+#. TRANS: Group create form validation error.
+msgid "Alias cannot be the same as nickname."
+msgstr ""
+
+#. TRANS: Client error displayed when referring to a non-existing list.
+#. TRANS: Client error displayed trying to perform an action related to a non-existing list.
+#. TRANS: Client error displayed when referring to a non-existing list.
+msgid "List not found."
+msgstr "הרשימה ל� נמצ�ה"
+
+#. TRANS: Client error displayed when trying to update another user's list.
+msgid "You cannot update lists that do not belong to you."
+msgstr ""
+
+#. TRANS: Client error displayed when an unknown error occurs updating a list.
+#. TRANS: Client error displayed when an unknown error occurs viewing list members.
+#. TRANS: Client error displayed when an unknown error occurs in the list subscribers action.
+#. TRANS: Client error displayed when an unknown error occurs unsubscribing from a list.
+msgid "An error occured."
+msgstr "�ירעה שגי�ה."
+
+#. TRANS: Client error displayed when trying to delete another user's list.
+msgid "You cannot delete lists that do not belong to you."
+msgstr ""
+
+#. TRANS: Client error displayed when referring to a non-list member.
+msgid "The specified user is not a member of this list."
+msgstr ""
+
+#. TRANS: Client error displayed when trying to add members to a list without having the right to do so.
+msgid "You are not allowed to add members to this list."
+msgstr ""
+
+#. TRANS: Client error displayed when trying to modify list members without specifying them.
+msgid "You must specify a member."
+msgstr ""
+
+#. TRANS: Client error displayed when trying to remove members from a list without having the right to do so.
+msgid "You are not allowed to remove members from this list."
+msgstr ""
+
+#. TRANS: Client error displayed when trying to remove a list member that is not part of a list.
+msgid "The user you are trying to remove from the list is not a member."
+msgstr ""
+
+#. TRANS: Client error displayed when trying to create a list without a name.
+msgid "A list must have a name."
+msgstr "לרשימה צריך להיות ש�."
+
+#. TRANS: Client error displayed when a membership check for a user is nagative.
+msgid "The specified user is not a subscriber of this list."
+msgstr ""
+
+#. TRANS: Client error displayed when trying to unsubscribe from a non-subscribed list.
+msgid "You are not subscribed to this list."
 msgstr ""
 
 #. TRANS: Client error displayed when uploading a media file has failed.
-#: actions/apimediaupload.php:101
-#, fuzzy
 msgid "Upload failed."
-msgstr "ההעלה"
+msgstr "ההעל�ה נכשלה."
 
 #. TRANS: Client error given from the OAuth API when the request token or verifier is invalid.
-#: actions/apioauthaccesstoken.php:101
 msgid "Invalid request token or verifier."
 msgstr ""
 
 #. TRANS: Client error given when no oauth_token was passed to the OAuth API.
-#: actions/apioauthauthorize.php:107
 msgid "No oauth_token parameter provided."
 msgstr ""
 
 #. TRANS: Client error given when an invalid request token was passed to the OAuth API.
-#: actions/apioauthauthorize.php:115 actions/apioauthauthorize.php:129
 msgid "Invalid request token."
-msgstr ""
+msgstr "�סימון בקשה בלתי־תקין."
 
 #. TRANS: Client error given when an invalid request token was passed to the OAuth API.
-#: actions/apioauthauthorize.php:121
 msgid "Request token already authorized."
 msgstr ""
 
-#. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
-#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:177 actions/disfavor.php:74
-#: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
-#: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:65 actions/imsettings.php:230
-#: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
-#: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
-#: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
-#: actions/othersettings.php:153 actions/passwordsettings.php:138
-#: actions/profilesettings.php:221 actions/recoverpassword.php:350
-#: actions/register.php:172 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:40
-#: actions/subscribe.php:86 actions/tagother.php:166
-#: actions/unsubscribe.php:69 actions/userauthorization.php:52
-#: lib/designsettings.php:310
-msgid "There was a problem with your session token. Try again, please."
-msgstr ""
-
 #. TRANS: Form validation error given when an invalid username and/or password was passed to the OAuth API.
-#: actions/apioauthauthorize.php:168
-#, fuzzy
 msgid "Invalid nickname / password!"
-msgstr "ש� המשתמש �ו הסיסמה ל� חוקיי�"
+msgstr "ש� המשתמש �ו הססמה �ינ� תקיני�!"
 
 #. TRANS: Server error displayed when a database action fails.
-#: actions/apioauthauthorize.php:217
 msgid "Database error inserting oauth_token_association."
 msgstr ""
 
@@ -797,32 +819,25 @@ msgstr ""
 #. TRANS: Unexpected validation error on avatar upload form.
 #. TRANS: Client error displayed submitting invalid form data for edit application.
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
-#. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Form validation error message when an unsupported argument is used.
+#. TRANS: Message given submitting a form with an unknown action in Instant Messaging settings.
+#. TRANS: Client error displayed when encountering an unexpected action on form submission.
 #. TRANS: Client error when submitting a form with unexpected information.
+#. TRANS: Client error displayed when unexpected data is posted in the password recovery form.
 #. TRANS: Message given submitting a form with an unknown action in SMS settings.
-#. TRANS: Unknown form validation error in design settings form.
-#: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294
-#: actions/designadminpanel.php:104 actions/editapplication.php:144
-#: actions/emailsettings.php:316 actions/grouplogo.php:322
-#: actions/imsettings.php:245 actions/newapplication.php:125
-#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
-#: actions/smssettings.php:277 lib/designsettings.php:321
 msgid "Unexpected form submission."
 msgstr "הגשת טופס ל� צפויה."
 
 #. TRANS: Title for a page where a user can confirm/deny account access by an external application.
-#: actions/apioauthauthorize.php:387
 msgid "An application would like to connect to your account"
 msgstr ""
 
 #. TRANS: Fieldset legend.
-#: actions/apioauthauthorize.php:404
 msgid "Allow or deny access"
-msgstr ""
+msgstr "ל�פשר �ו למנוע גישה."
 
 #. TRANS: User notification of external application requesting account access.
 #. TRANS: %3$s is the access type requested (read-write or read-only), %4$s is the StatusNet sitename.
-#: actions/apioauthauthorize.php:425
 #, php-format
 msgid ""
 "An application would like the ability to <strong>%3$s</strong> your %4$s "
@@ -833,7 +848,6 @@ msgstr ""
 #. TRANS: User notification of external application requesting account access.
 #. TRANS: %1$s is the application name requesting access, %2$s is the organisation behind the application,
 #. TRANS: %3$s is the access type requested, %4$s is the StatusNet sitename.
-#: actions/apioauthauthorize.php:433
 #, php-format
 msgid ""
 "The application <strong>%1$s</strong> by <strong>%2$s</strong> would like "
@@ -842,28 +856,23 @@ msgid ""
 msgstr ""
 
 #. TRANS: Fieldset legend.
-#: actions/apioauthauthorize.php:455
 msgctxt "LEGEND"
 msgid "Account"
-msgstr ""
+msgstr "חשבון"
 
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Field label in form for profile settings.
-#. TRANS: Label for group nickname (dt). Text hidden by default.
-#: actions/apioauthauthorize.php:459 actions/login.php:252
-#: actions/profilesettings.php:110 actions/register.php:432
-#: actions/showgroup.php:240 actions/tagother.php:94
-#: actions/userauthorization.php:145 lib/groupeditform.php:152
-#: lib/userprofile.php:134
+#. TRANS: Field label on account registration page.
+#. TRANS: Field label on group edit form.
+#. TRANS: Dropdown option for searching in profiles.
 msgid "Nickname"
 msgstr "כינוי"
 
 #. TRANS: Field label on OAuth API authorisation form.
-#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:463 actions/login.php:255
-#: actions/register.php:437 lib/accountsettingsaction.php:120
+#. TRANS: Field label on login page.
+#. TRANS: Field label on account registration page.
 msgid "Password"
-msgstr "סיסמה"
+msgstr "ססמה"
 
 #. TRANS: Button text that when clicked will cancel the process of allowing access to an account
 #. TRANS: by an external application.
@@ -871,44 +880,34 @@ msgstr "סיסמה"
 #. TRANS: Button label to cancel an IM address confirmation procedure.
 #. TRANS: Button label to cancel a SMS address confirmation procedure.
 #. TRANS: Button label in the "Edit application" form.
-#: actions/apioauthauthorize.php:478 actions/emailsettings.php:128
-#: actions/imsettings.php:131 actions/smssettings.php:137
-#: lib/applicationeditform.php:351
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Cancel"
-msgstr "בטל"
+msgstr "ביטול"
 
 #. TRANS: Button text that when clicked will allow access to an account by an external application.
-#: actions/apioauthauthorize.php:485
 msgctxt "BUTTON"
 msgid "Allow"
-msgstr ""
+msgstr "ל�פשר"
 
 #. TRANS: Form instructions.
-#: actions/apioauthauthorize.php:502
 msgid "Authorize access to your account information."
 msgstr ""
 
 #. TRANS: Header for user notification after revoking OAuth access to an application.
-#: actions/apioauthauthorize.php:594
 msgid "Authorization canceled."
 msgstr ""
 
 #. TRANS: User notification after revoking OAuth access to an application.
 #. TRANS: %s is an OAuth token.
-#: actions/apioauthauthorize.php:598
 #, php-format
 msgid "The request token %s has been revoked."
 msgstr ""
 
 #. TRANS: Title of the page notifying the user that an anonymous client application was successfully authorized to access the user's account with OAuth.
-#: actions/apioauthauthorize.php:621
 msgid "You have successfully authorized the application"
 msgstr ""
 
 #. TRANS: Message notifying the user that an anonymous client application was successfully authorized to access the user's account with OAuth.
-#: actions/apioauthauthorize.php:625
 msgid ""
 "Please return to the application and enter the following security code to "
 "complete the process."
@@ -916,14 +915,12 @@ msgstr ""
 
 #. TRANS: Title of the page notifying the user that the client application was successfully authorized to access the user's account with OAuth.
 #. TRANS: %s is the authorised application name.
-#: actions/apioauthauthorize.php:632
 #, php-format
 msgid "You have successfully authorized %s"
 msgstr ""
 
 #. TRANS: Message notifying the user that the client application was successfully authorized to access the user's account with OAuth.
 #. TRANS: %s is the authorised application name.
-#: actions/apioauthauthorize.php:639
 #, php-format
 msgid ""
 "Please return to %s and enter the following security code to complete the "
@@ -932,85 +929,67 @@ msgstr ""
 
 #. TRANS: Client error displayed trying to delete a status not using POST or DELETE.
 #. TRANS: POST and DELETE should not be translated.
-#: actions/apistatusesdestroy.php:111
 msgid "This method requires a POST or DELETE."
 msgstr ""
 
 #. TRANS: Client error displayed trying to delete a status of another user.
-#: actions/apistatusesdestroy.php:136
 msgid "You may not delete another user's status."
 msgstr ""
 
 #. TRANS: Client error displayed trying to repeat a non-existing notice through the API.
 #. TRANS: Client error displayed trying to display redents of a non-exiting notice.
+#. TRANS: Client exception thrown when referencing a non-existing notice.
 #. TRANS: Error message displayed trying to delete a non-existing notice.
-#: actions/apistatusesretweet.php:74 actions/apistatusesretweets.php:70
-#: actions/atompubshowfavorite.php:82 actions/deletenotice.php:61
-#: actions/shownotice.php:92
+#. TRANS: Client error displayed trying to show a non-existing notice.
 msgid "No such notice."
-msgstr "�ין הודעה כזו."
-
-#. TRANS: Client error displayed trying to repeat an own notice through the API.
-#. TRANS: Error text shown when trying to repeat an own notice.
-#: actions/apistatusesretweet.php:83 lib/command.php:537
-#, fuzzy
-msgid "Cannot repeat your own notice."
-msgstr "ל� ניתן להירש� לל� הסכמה לרשיון"
-
-#. TRANS: Client error displayed trying to re-repeat a notice through the API.
-#. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
-#: actions/apistatusesretweet.php:92 lib/command.php:543
-#, fuzzy
-msgid "Already repeated that notice."
-msgstr "כבר נכנסת למערכת!"
+msgstr "�ין עדכון כזה."
 
+#. TRANS: Client error displayed calling an unsupported HTTP error in API status show.
+#. TRANS: Client exception thrown when using an unsupported HTTP method.
+#. TRANS: Client exception thrown using an unsupported HTTP method.
+#. TRANS: Client exception thrown when using an unsupported HTTP method.
 #. TRANS: Client error shown when using a non-supported HTTP method.
-#: actions/apistatusesshow.php:117 actions/atompubfavoritefeed.php:104
-#: actions/atompubmembershipfeed.php:106 actions/atompubshowfavorite.php:116
-#: actions/atompubshowsubscription.php:122
-#: actions/atompubsubscriptionfeed.php:109
+#. TRANS: Client exception thrown when using an unsupported HTTP method.
 msgid "HTTP method not supported."
-msgstr ""
+msgstr "שיטת HTTP �ינה נתמכת."
 
-#: actions/apistatusesshow.php:141
+#. TRANS: Exception thrown requesting an unsupported notice output format.
+#. TRANS: %s is the requested output format.
 #, php-format
-msgid "Unsupported format: %s"
-msgstr ""
+msgid "Unsupported format: %s."
+msgstr "תסדיר ל� נתמך: %s."
 
 #. TRANS: Client error displayed requesting a deleted status.
-#: actions/apistatusesshow.php:152
-#, fuzzy
 msgid "Status deleted."
-msgstr "התמונה עודכנה."
+msgstr "עדכון המצב נמחק."
 
 #. TRANS: Client error displayed requesting a status with an invalid ID.
-#: actions/apistatusesshow.php:159
 msgid "No status with that ID found."
-msgstr ""
+msgstr "ל� נמצ� מצב ע� מזהה כזה."
 
-#: actions/apistatusesshow.php:223
+#. TRANS: Client error displayed when trying to delete a notice not using the Atom format.
 msgid "Can only delete using the Atom format."
-msgstr ""
+msgstr "�פשר למחוק רק בתסדיר Atom."
 
+#. TRANS: Client error displayed when a user has no rights to delete notices of other users.
 #. TRANS: Error message displayed trying to delete a notice that was not made by the current user.
-#: actions/apistatusesshow.php:230 actions/deletenotice.php:78
-msgid "Can't delete this notice."
-msgstr ""
+msgid "Cannot delete this notice."
+msgstr "ל� ניתן למחוק �ת העדכון הזה."
 
-#: actions/apistatusesshow.php:243
+#. TRANS: Confirmation of notice deletion in API. %d is the ID (number) of the deleted notice.
 #, php-format
 msgid "Deleted notice %d"
-msgstr ""
+msgstr "העדכון %d נמחק"
 
 #. TRANS: Client error displayed when the parameter "status" is missing.
-#: actions/apistatusesupdate.php:221
 msgid "Client must provide a 'status' parameter with a value."
-msgstr ""
+msgstr "הלקוח צריך לספק פרמטר 'status' בעל ערך."
 
+#. TRANS: Client error displayed exceeding the maximum notice length.
+#. TRANS: %d is the maximum length for a notice.
 #. TRANS: Client error displayed when the parameter "status" is missing.
 #. TRANS: %d is the maximum number of character for a notice.
-#: actions/apistatusesupdate.php:244 actions/newnotice.php:161
-#: lib/mailhandler.php:60
+#. TRANS: Error message in incoming mail handler used when an incoming e-mail contains too many characters.
 #, php-format
 msgid "That's too long. Maximum notice size is %d character."
 msgid_plural "That's too long. Maximum notice size is %d characters."
@@ -1018,13 +997,13 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Client error displayed when replying to a non-existing notice.
-#: actions/apistatusesupdate.php:284
 msgid "Parent notice not found."
 msgstr ""
 
 #. TRANS: Client error displayed exceeding the maximum notice length.
 #. TRANS: %d is the maximum lenth for a notice.
-#: actions/apistatusesupdate.php:308 actions/newnotice.php:184
+#. TRANS: Client error displayed exceeding the maximum notice length.
+#. TRANS: %d is the maximum length for a notice.
 #, php-format
 msgid "Maximum notice size is %d character, including attachment URL."
 msgid_plural "Maximum notice size is %d characters, including attachment URL."
@@ -1033,459 +1012,527 @@ msgstr[1] ""
 
 #. TRANS: Client error displayed when requesting profiles of followers in an unsupported format.
 #. TRANS: Client error displayed when requesting IDs of followers in an unsupported format.
-#: actions/apisubscriptions.php:228 actions/apisubscriptions.php:258
-#, fuzzy
 msgid "Unsupported format."
-msgstr "פורמט התמונה �ינו נתמך."
+msgstr "סוג קובץ התמונה �ינו נתמך."
 
 #. TRANS: Title for timeline of most recent favourite notices by a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user nickname.
-#: actions/apitimelinefavorites.php:108
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s / Favorites from %2$s"
-msgstr "הסטטוס של %1$s ב-%2$s "
+msgstr "%1$s / מועדפי� ממשתמש %2$s"
 
 #. TRANS: Subtitle for timeline of most recent favourite notices by a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user's full name,
 #. TRANS: %3$s is a user nickname.
-#: actions/apitimelinefavorites.php:120
 #, php-format
 msgid "%1$s updates favorited by %2$s / %3$s."
 msgstr ""
 
-#. TRANS: Server error displayed when generating an Atom feed fails.
-#. TRANS: %s is the error.
-#: actions/apitimelinegroup.php:134
+#. TRANS: Server error displayed whe trying to get a timeline fails.
+#. TRANS: %s is the error message.
 #, php-format
-msgid "Could not generate feed for group - %s"
+msgid "Could not generate feed for list - %s"
 msgstr ""
 
 #. TRANS: Title for timeline of most recent mentions of a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user nickname.
-#: actions/apitimelinementions.php:115
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s / Updates mentioning %2$s"
-msgstr "הסטטוס של %1$s ב-%2$s "
+msgstr "%1$s / עדכוני� שהמשתמש %2$s מוזכר בה�"
 
 #. TRANS: Subtitle for timeline of most recent mentions of a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user nickname,
 #. TRANS: %3$s is a user's full name.
-#: actions/apitimelinementions.php:131
 #, php-format
 msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr ""
 
 #. TRANS: Title for site timeline. %s is the StatusNet sitename.
-#: actions/apitimelinepublic.php:193 actions/publicrss.php:103
-#, fuzzy, php-format
+#. TRANS: Public RSS feed title. %s is the StatusNet site name.
+#, php-format
 msgid "%s public timeline"
-msgstr "קו זמן ציבורי"
+msgstr "קו זמן ציבורי ב�תר %s"
 
 #. TRANS: Subtitle for site timeline. %s is the StatusNet sitename.
-#: actions/apitimelinepublic.php:199 actions/publicrss.php:105
 #, php-format
 msgid "%s updates from everyone!"
 msgstr ""
 
 #. TRANS: Server error displayed calling unimplemented API method for 'retweeted by me'.
-#: actions/apitimelineretweetedbyme.php:71
 msgid "Unimplemented."
-msgstr ""
+msgstr "ל� מיוש�."
 
 #. TRANS: Title for Atom feed "repeated to me". %s is the user nickname.
-#: actions/apitimelineretweetedtome.php:108
-#, fuzzy, php-format
+#, php-format
 msgid "Repeated to %s"
-msgstr "תגובת עבור %s"
+msgstr "הודהד �ל %s"
+
+#. TRANS: Subtitle for API action that shows most recent notices that are repeats in user's inbox.
+#. TRANS: %1$s is the sitename, %2$s is a user nickname, %3$s is a user profile name.
+#, php-format
+msgid "%1$s notices that were to repeated to %2$s / %3$s."
+msgstr "%1$s עדכוני� שהודהדו �ל %2$s / %3$s."
 
 #. TRANS: Title of list of repeated notices of the logged in user.
 #. TRANS: %s is the nickname of the logged in user.
-#: actions/apitimelineretweetsofme.php:112
-#, fuzzy, php-format
+#, php-format
 msgid "Repeats of %s"
-msgstr "תגובת עבור %s"
+msgstr "הדהודי� של %s"
+
+#. TRANS: Subtitle of API time with retweets of me.
+#. TRANS: %1$s is the StatusNet sitename, %2$s is the user nickname, %3$s is the user profile name.
+#, php-format
+msgid "%1$s notices that %2$s / %3$s has repeated."
+msgstr "%1$s עדכוני� ש־%2$s / %3$s הדהד."
 
 #. TRANS: Title for timeline with lastest notices with a given tag.
 #. TRANS: %s is the tag.
-#: actions/apitimelinetag.php:101 actions/tag.php:67
+#. TRANS: Title for first page of notices with tags.
+#. TRANS: %s is the tag.
 #, php-format
 msgid "Notices tagged with %s"
-msgstr ""
+msgstr "עדכוני� ע� התג %s"
 
 #. TRANS: Subtitle for timeline with lastest notices with a given tag.
 #. TRANS: %1$s is the tag, $2$s is the StatusNet sitename.
-#: actions/apitimelinetag.php:105 actions/tagrss.php:65
-#, fuzzy, php-format
+#. TRANS: Tag feed description.
+#. TRANS: %1$s is the tag name, %2$s is the StatusNet sitename.
+#, php-format
 msgid "Updates tagged with %1$s on %2$s!"
-msgstr "מיקרובלוג מ�ת %s"
+msgstr "עדכוני� ע� התג %1$s ב�תר %2$s!"
 
 #. TRANS: Client error displayed trying to add a notice to another user's timeline.
-#: actions/apitimelineuser.php:297
 msgid "Only the user can add to their own timeline."
 msgstr ""
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:304
 msgid "Only accept AtomPub for Atom feeds."
 msgstr ""
 
-#: actions/apitimelineuser.php:310
+#. TRANS: Client error displayed attempting to post an empty API notice.
 msgid "Atom post must not be empty."
 msgstr ""
 
-#: actions/apitimelineuser.php:315
+#. TRANS: Client error displayed attempting to post an API that is not well-formed XML.
 msgid "Atom post must be well-formed XML."
 msgstr ""
 
 #. TRANS: Client error displayed when not using an Atom entry.
-#: actions/apitimelineuser.php:321 actions/atompubfavoritefeed.php:226
-#: actions/atompubmembershipfeed.php:228
-#: actions/atompubsubscriptionfeed.php:233
 msgid "Atom post must be an Atom entry."
 msgstr ""
 
-#. TRANS: Client error displayed when not using the POST verb.
-#. TRANS: Do not translate POST.
-#: actions/apitimelineuser.php:334
+#. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
 msgid "Can only handle POST activities."
 msgstr ""
 
 #. TRANS: Client error displayed when using an unsupported activity object type.
 #. TRANS: %s is the unsupported activity object type.
-#: actions/apitimelineuser.php:345
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr ""
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
-#: actions/apitimelineuser.php:378
+#. TRANS: %d is the notice ID (number).
 #, php-format
 msgid "No content for notice %d."
 msgstr ""
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:406
+#. TRANS: %s is the notice URI.
 #, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr ""
 
-#: actions/apitimelineuser.php:437
-#, php-format
-msgid "AtomPub post with unknown attention URI %s"
-msgstr ""
-
 #. TRANS: Server error for unfinished API method showTrends.
-#: actions/apitrends.php:85
-#, fuzzy
 msgid "API method under construction."
-msgstr "קוד ה�ישור ל� נמצ�."
+msgstr "שיטת API בבנייה."
 
 #. TRANS: Client error displayed when requesting user information for a non-existing user.
-#: actions/apiuserprofileimage.php:80 actions/apiusershow.php:94
 msgid "User not found."
+msgstr "המשתמש ל� נמצ�."
+
+#. TRANS: Client error displayed when trying to leave a group while not logged in.
+msgid "You must be logged in to leave a group."
+msgstr "צריך להיכנס לחשבון כדי לעזוב קבוצה."
+
+#. TRANS: Client error displayed when trying to leave a non-local group.
+#. TRANS: Client error displayed when trying to leave a non-existing group.
+#. TRANS: Client exception thrown when referencing a non-existing group.
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
+#. TRANS: Client error displayed when trying to leave a non-local group.
+#. TRANS: Client error displayed when trying to leave a non-existing group.
+#. TRANS: Client error when trying to delete a non-local group.
+#. TRANS: Client error when trying to delete a non-existing group.
+#. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed without providing a group nickname.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed for a non-local group.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed for a nickname that is not a group.
+#. TRANS: Client error displayed trying to block a user from a group while specifying a non-existing group.
+#. TRANS: Client error displayed referring to a group's permalink for a non-existing group ID.
+#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
+#. TRANS: Client error displayed when trying to view group members for a non-existing group.
+#. TRANS: Client error displayed when trying to view group members for an object that is not a group.
+#. TRANS: Client error displayed when requesting a group RSS feed for group that does not exist.
+#. TRANS: Client error displayed when requesting a group RSS feed for an object that is not a group.
+#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
+#. TRANS: Client error displayed when trying to join a non-local group.
+#. TRANS: Client error displayed when trying to join a non-existing group.
+#. TRANS: Client error displayed when trying to leave a non-local group.
+#. TRANS: Client error displayed when trying to leave a non-existing group.
+#. TRANS: Client error displayed when providing an invalid group ID on the Make Admin page.
+#. TRANS: Command exception text shown when a group is requested that does not exist.
+#. TRANS: Error text shown when trying to leave a group that does not exist.
+#. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
+#. TRANS: Client error displayed if no local group with a given name was found requesting group page.
+msgid "No such group."
+msgstr "�ין משתמש כזה."
+
+#. TRANS: Client error displayed when trying to leave a group without providing a group name or group ID.
+#. TRANS: Client error when trying to delete a group without providing a nickname or ID for the group.
+#. TRANS: Client error displayed when trying to join a group without providing a group name or group ID.
+#. TRANS: Client error displayed when trying to leave a group without providing a group name or group ID.
+msgid "No nickname or ID."
+msgstr "�ין כינוי �ו מזהה."
+
+#. TRANS: Client error displayed trying to approve group membership while not logged in.
+#. TRANS: Client error displayed when trying to leave a group while not logged in.
+msgid "Must be logged in."
+msgstr "צריך להיכנס לחשבון."
+
+#. TRANS: Client error displayed trying to approve group membership while not a group administrator.
+#. TRANS: Client error displayed when trying to approve or cancel a group join request without
+#. TRANS: being a group administrator.
+msgid "Only group admin can approve or cancel join requests."
 msgstr ""
 
-#: actions/atompubfavoritefeed.php:70
-msgid "No such profile"
+#. TRANS: Client error displayed trying to approve group membership without specifying a profile to approve.
+#. TRANS: Client error displayed trying to approve subscriptionswithout specifying a profile to approve.
+msgid "Must specify a profile."
 msgstr ""
 
-#: actions/atompubfavoritefeed.php:145
+#. TRANS: Client error displayed trying to approve group membership for a non-existing request.
+#. TRANS: %s is a nickname.
+#. TRANS: Client error displayed when trying to approve a non-existing group join request.
+#. TRANS: %s is a user nickname.
 #, php-format
-msgid "Notices %s has favorited to on %s"
+msgid "%s is not in the moderation queue for this group."
 msgstr ""
 
-#: actions/atompubfavoritefeed.php:215 actions/atompubsubscriptionfeed.php:222
-msgid "Can't add someone else's subscription"
+#. TRANS: Client error displayed trying to approve/deny group membership.
+#. TRANS: Client error displayed trying to approve/deny subscription.
+msgid "Internal error: received neither cancel nor abort."
 msgstr ""
 
-#. TRANS: Client error displayed when not using the POST verb.
-#. TRANS: Do not translate POST.
-#: actions/atompubfavoritefeed.php:239
-msgid "Can only handle Favorite activities."
+#. TRANS: Client error displayed trying to approve/deny group membership.
+#. TRANS: Client error displayed trying to approve/deny  subscription
+msgid "Internal error: received both cancel and abort."
 msgstr ""
 
-#: actions/atompubfavoritefeed.php:248 actions/atompubmembershipfeed.php:248
+#. TRANS: Server error displayed when cancelling a queued group join request fails.
+#. TRANS: %1$s is the leaving user's nickname, $2$s is the group nickname for which the leave failed.
+#, php-format
+msgid "Could not cancel request for user %1$s to join group %2$s."
+msgstr ""
+
+#. TRANS: Title for leave group page after group join request is approved/disapproved.
+#. TRANS: %1$s is the user nickname, %2$s is the group nickname.
+#, php-format
+msgctxt "TITLE"
+msgid "%1$s's request for %2$s"
+msgstr ""
+
+#. TRANS: Message on page for group admin after approving a join request.
+msgid "Join request approved."
+msgstr "בקשת ההצטרפות �ושרה."
+
+#. TRANS: Message on page for group admin after rejecting a join request.
+msgid "Join request canceled."
+msgstr "בקשת ההצטרפות בוטלה."
+
+#. TRANS: Client error displayed trying to approve subscription for a non-existing request.
+#. TRANS: %s is a user nickname.
+#, php-format
+msgid "%s is not in the moderation queue for your subscriptions."
+msgstr ""
+
+#. TRANS: Server error displayed when cancelling a queued subscription request fails.
+#. TRANS: %1$s is the leaving user's nickname, $2$s is the nickname for which the leave failed.
+#, php-format
+msgid "Could not cancel or approve request for user %1$s to join group %2$s."
+msgstr ""
+
+#. TRANS: Title for subscription approval ajax return
+#. TRANS: %1$s is the approved user's nickname
+#, php-format
+msgctxt "TITLE"
+msgid "%1$s's request"
+msgstr ""
+
+#. TRANS: Message on page for user after approving a subscription request.
+msgid "Subscription approved."
+msgstr ""
+
+#. TRANS: Message on page for user after rejecting a subscription request.
+msgid "Subscription canceled."
+msgstr ""
+
+#. TRANS: Subtitle for Atom favorites feed.
+#. TRANS: %1$s is a user nickname, %2$s is the StatusNet sitename.
+#, php-format
+msgid "Notices %1$s has favorited on %2$s"
+msgstr ""
+
+#. TRANS: Client exception thrown when trying to set a favorite for another user.
+#. TRANS: Client exception thrown when trying to subscribe another user.
+msgid "Cannot add someone else's subscription."
+msgstr ""
+
+#. TRANS: Client exception thrown when trying use an incorrect activity verb for the Atom pub method.
+msgid "Can only handle favorite activities."
+msgstr ""
+
+#. TRANS: Client exception thrown when trying favorite an object that is not a notice.
 msgid "Can only fave notices."
 msgstr ""
 
-#: actions/atompubfavoritefeed.php:256
-msgid "Unknown note."
+#. TRANS: Client exception thrown when trying favorite a notice without content.
+msgid "Unknown notice."
 msgstr ""
 
-#: actions/atompubfavoritefeed.php:263
+#. TRANS: Client exception thrown when trying favorite an already favorited notice.
 msgid "Already a favorite."
 msgstr ""
 
-#: actions/atompubmembershipfeed.php:72 actions/atompubshowfavorite.php:76
-#: actions/atompubshowmembership.php:73 actions/subscribe.php:107
-#, fuzzy
-msgid "No such profile."
-msgstr "�ין הודעה כזו."
-
-#: actions/atompubmembershipfeed.php:144
+#. TRANS: Title for group membership feed.
+#. TRANS: %s is a username.
 #, php-format
-msgid "%s group memberships"
+msgid "Group memberships of %s"
 msgstr ""
 
-#: actions/atompubmembershipfeed.php:147
+#. TRANS: Subtitle for group membership feed.
+#. TRANS: %1$s is a username, %2$s is the StatusNet sitename.
 #, php-format
-msgid "Groups %s is a member of on %s"
+msgid "Groups %1$s is a member of on %2$s"
 msgstr ""
 
-#: actions/atompubmembershipfeed.php:217
-msgid "Can't add someone else's membership"
+#. TRANS: Client exception thrown when trying subscribe someone else to a group.
+msgid "Cannot add someone else's membership."
 msgstr ""
 
-#. TRANS: Client error displayed when not using the POST verb.
-#. TRANS: Do not translate POST.
-#: actions/atompubmembershipfeed.php:241
-msgid "Can only handle Join activities."
+#. TRANS: Client error displayed when not using the join verb.
+msgid "Can only handle join activities."
 msgstr ""
 
-#: actions/atompubmembershipfeed.php:256
+#. TRANS: Client exception thrown when trying to subscribe to a non-existing group.
 msgid "Unknown group."
-msgstr ""
+msgstr "קבוצה ל� ידועה."
 
-#: actions/atompubmembershipfeed.php:263
+#. TRANS: Client exception thrown when trying to subscribe to an already subscribed group.
 msgid "Already a member."
-msgstr ""
+msgstr "כבר חבר."
 
-#: actions/atompubmembershipfeed.php:270
+#. TRANS: Client exception thrown when trying to subscribe to group while blocked from that group.
 msgid "Blocked by admin."
-msgstr ""
+msgstr "נחס� על־ידי מנהל."
 
-#: actions/atompubshowfavorite.php:89
+#. TRANS: Client exception thrown when referencing a non-existing favorite.
 msgid "No such favorite."
+msgstr "�ין מועדף כזה."
+
+#. TRANS: Client exception thrown when trying to remove a favorite notice of another user.
+msgid "Cannot delete someone else's favorite."
 msgstr ""
 
-#: actions/atompubshowfavorite.php:151
-msgid "Can't delete someone else's favorite"
+#. TRANS: Client exception thrown when trying to show membership of a non-subscribed group
+msgid "Not a member."
 msgstr ""
 
-#: actions/atompubshowmembership.php:81
-#, fuzzy
-msgid "No such group"
-msgstr "�ין הודעה כזו."
-
-#: actions/atompubshowmembership.php:90
-msgid "Not a member"
-msgstr ""
-
-#: actions/atompubshowmembership.php:115
-msgid "Method not supported"
-msgstr ""
-
-#: actions/atompubshowmembership.php:150
-msgid "Can't delete someone else's membership"
+#. TRANS: Client exception thrown when deleting someone else's membership.
+msgid "Cannot delete someone else's membership."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to display a subscription for a non-existing profile ID.
 #. TRANS: %d is the non-existing profile ID number.
-#: actions/atompubshowsubscription.php:72
-#: actions/atompubshowsubscription.php:83
-#: actions/atompubsubscriptionfeed.php:74
 #, php-format
-msgid "No such profile id: %d"
+msgid "No such profile id: %d."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to display a subscription for a non-subscribed profile ID.
 #. TRANS: %1$d is the non-existing subscriber ID number, $2$d is the ID of the profile that was not subscribed to.
-#: actions/atompubshowsubscription.php:94
 #, php-format
-msgid "Profile %1$d not subscribed to profile %2$d"
+msgid "Profile %1$d not subscribed to profile %2$d."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to delete a subscription of another user.
-#: actions/atompubshowsubscription.php:157
-msgid "Cannot delete someone else's subscription"
+msgid "Cannot delete someone else's subscription."
 msgstr ""
 
-#: actions/atompubsubscriptionfeed.php:150
+#. TRANS: Subtitle for Atom subscription feed.
+#. TRANS: %1$s is a user nickname, %s$s is the StatusNet sitename.
 #, php-format
-msgid "People %s has subscribed to on %s"
+msgid "People %1$s has subscribed to on %2$s"
 msgstr ""
 
-#. TRANS: Client error displayed when not using the POST verb.
-#. TRANS: Do not translate POST.
-#: actions/atompubsubscriptionfeed.php:246
+#. TRANS: Client error displayed when not using the follow verb.
 msgid "Can only handle Follow activities."
 msgstr ""
 
-#: actions/atompubsubscriptionfeed.php:253
+#. TRANS: Client exception thrown when subscribing to an object that is not a person.
 msgid "Can only follow people."
 msgstr ""
 
-#: actions/atompubsubscriptionfeed.php:262
+#. TRANS: Client exception thrown when subscribing to a non-existing profile.
+#. TRANS: %s is the unknown profile ID.
 #, php-format
-msgid "Unknown profile %s"
+msgid "Unknown profile %s."
+msgstr ""
+
+#. TRANS: Client error displayed trying to subscribe to an already subscribed profile.
+#. TRANS: %s is the profile the user already has a subscription on.
+#, php-format
+msgid "Already subscribed to %s."
 msgstr ""
 
 #. TRANS: Client error displayed trying to get a non-existing attachment.
-#: actions/attachment.php:73
 msgid "No such attachment."
 msgstr "�ין הודעה כזו."
 
 #. TRANS: Client error displayed trying to get an avatar without providing a nickname.
 #. TRANS: Client error displayed when requesting a list of blocked users for a group without providing a group nickname.
 #. TRANS: Client error displayed trying to edit a group while not proving a nickname for the group to edit.
+#. TRANS: Client error displayed when trying to change group logo settings without providing a nickname.
+#. TRANS: Client error displayed when trying to view group members without providing a group nickname.
+#. TRANS: Client error displayed when requesting a group RSS feed without providing a group nickname.
 #. TRANS: Client error displayed if no nickname argument was given requesting a group page.
-#: actions/avatarbynickname.php:60 actions/blockedfromgroup.php:73
-#: actions/editgroup.php:85 actions/groupdesignsettings.php:84
-#: actions/grouplogo.php:86 actions/groupmembers.php:76
-#: actions/grouprss.php:91 actions/showgroup.php:116
 msgid "No nickname."
 msgstr "�ין כינוי"
 
 #. TRANS: Client error displayed trying to get an avatar without providing an avatar size.
-#: actions/avatarbynickname.php:66
 msgid "No size."
 msgstr "�ין גודל."
 
 #. TRANS: Client error displayed trying to get an avatar providing an invalid avatar size.
-#: actions/avatarbynickname.php:72
 msgid "Invalid size."
-msgstr "גודל ל� חוקי."
+msgstr "גודל ל� תקין."
 
 #. TRANS: Title for avatar upload page.
-#. TRANS: Label for group avatar (dt). Text hidden by default.
-#. TRANS: Link description in user account settings menu.
-#: actions/avatarsettings.php:66 actions/showgroup.php:224
-#: lib/accountsettingsaction.php:113
 msgid "Avatar"
 msgstr "תמונה"
 
 #. TRANS: Instruction for avatar upload page.
 #. TRANS: %s is the maximum file size, for example "500b", "10kB" or "2MB".
-#: actions/avatarsettings.php:78
-#, fuzzy, php-format
+#, php-format
 msgid "You can upload your personal avatar. The maximum file size is %s."
-msgstr "זה �רוך מידי. �ורך מירבי להודעה הו� 140 �ותיות."
-
-#. TRANS: Server error displayed in avatar upload page when no matching profile can be found for a user.
-#: actions/avatarsettings.php:108 actions/avatarsettings.php:192
-#: actions/grouplogo.php:181 actions/remotesubscribe.php:191
-#: actions/userauthorization.php:72 actions/userrss.php:108
-#, fuzzy
-msgid "User without matching profile."
-msgstr "למשתמש �ין פרופיל."
+msgstr "�פשר להעלות תמונת משתמש של עצמך. גודל התמונה המרבי הו� %s."
 
 #. TRANS: Avatar upload page form legend.
 #. TRANS: Avatar upload page crop form legend.
-#: actions/avatarsettings.php:122 actions/avatarsettings.php:205
-#: actions/grouplogo.php:254
+#. TRANS: Legend for group logo settings fieldset.
 msgid "Avatar settings"
 msgstr "הגדרות הפרופיל"
 
 #. TRANS: Header on avatar upload page for thumbnail of originally uploaded avatar (h2).
 #. TRANS: Header on avatar upload crop form for thumbnail of originally uploaded avatar (h2).
-#: actions/avatarsettings.php:131 actions/avatarsettings.php:214
-#: actions/grouplogo.php:202 actions/grouplogo.php:262
+#. TRANS: Uploaded original file in group logo form.
+#. TRANS: Header for originally uploaded file before a crop on the group logo page.
 msgid "Original"
-msgstr ""
+msgstr "מקורי"
 
 #. TRANS: Header on avatar upload page for thumbnail of to be used rendition of uploaded avatar (h2).
 #. TRANS: Header on avatar upload crop form for thumbnail of to be used rendition of uploaded avatar (h2).
-#: actions/avatarsettings.php:147 actions/avatarsettings.php:227
-#: actions/grouplogo.php:213 actions/grouplogo.php:274
+#. TRANS: Header for preview of to be displayed group logo.
+#. TRANS: Header for the cropped group logo on the group logo page.
 msgid "Preview"
-msgstr ""
+msgstr "תצוגה מקדימה"
 
 #. TRANS: Button on avatar upload page to delete current avatar.
 #. TRANS: Button text for user account deletion.
-#: actions/avatarsettings.php:155 actions/deleteaccount.php:319
+#. TRANS: Submit button text the OAuth application page to delete an application.
+#. TRANS: Button text for deleting a group.
+#. TRANS: Button text to delete a list.
 msgctxt "BUTTON"
 msgid "Delete"
-msgstr ""
+msgstr "למחוק"
 
 #. TRANS: Button on avatar upload page to upload an avatar.
 #. TRANS: Submit button to confirm upload of a user backup file for account restore.
-#: actions/avatarsettings.php:173 actions/restoreaccount.php:369
 msgctxt "BUTTON"
 msgid "Upload"
-msgstr ""
+msgstr "להעלות"
 
 #. TRANS: Button on avatar upload crop form to confirm a selected crop as avatar.
-#: actions/avatarsettings.php:243
 msgctxt "BUTTON"
 msgid "Crop"
-msgstr ""
+msgstr "חיתוך"
 
 #. TRANS: Validation error on avatar upload form when no file was uploaded.
-#: actions/avatarsettings.php:318
-#, fuzzy
 msgid "No file uploaded."
-msgstr "העל�ה חלקית."
+msgstr "ל� הועלה שו� קובץ."
 
-#. TRANS: Avatar upload form unstruction after uploading a file.
-#: actions/avatarsettings.php:346
-msgid "Pick a square area of the image to be your avatar"
+#. TRANS: Avatar upload form instruction after uploading a file.
+msgid "Pick a square area of the image to be your avatar."
 msgstr ""
 
 #. TRANS: Server error displayed if an avatar upload went wrong somehow server side.
-#: actions/avatarsettings.php:361 actions/grouplogo.php:380
+#. TRANS: Server error displayed trying to crop an uploaded group logo that is no longer present.
 msgid "Lost our file data."
 msgstr ""
 
 #. TRANS: Success message for having updated a user avatar.
-#: actions/avatarsettings.php:385
 msgid "Avatar updated."
 msgstr "התמונה עודכנה."
 
 #. TRANS: Error displayed on the avatar upload page if the avatar could not be updated for an unknown reason.
-#: actions/avatarsettings.php:389
 msgid "Failed updating avatar."
 msgstr "עדכון התמונה נכשל."
 
 #. TRANS: Success message for deleting a user avatar.
-#: actions/avatarsettings.php:413
-#, fuzzy
 msgid "Avatar deleted."
-msgstr "התמונה עודכנה."
+msgstr "תמונת המשתמש נמחקה."
 
-#: actions/backupaccount.php:62 actions/profilesettings.php:467
+#. TRANS: Title for backup account page.
+#. TRANS: Option in profile settings to create a backup of the account of the currently logged in user.
 msgid "Backup account"
-msgstr ""
+msgstr "גיבוי חשבון"
 
-#: actions/backupaccount.php:80
+#. TRANS: Client exception thrown when trying to backup an account while not logged in.
 msgid "Only logged-in users can backup their account."
 msgstr ""
 
-#: actions/backupaccount.php:84
+#. TRANS: Client exception thrown when trying to backup an account without having backup rights.
 msgid "You may not backup your account."
 msgstr ""
 
-#: actions/backupaccount.php:232
+#. TRANS: Information displayed on the backup account page.
 msgid ""
 "You can backup your account data in <a href=\"http://activitystrea.ms/"
-"\">Activity Streams</a> format.  This is an experimental feature and "
-"provides an incomplete backup; private account information like email and IM "
+"\">Activity Streams</a> format. This is an experimental feature and provides "
+"an incomplete backup; private account information like email and IM "
 "addresses is not backed up. Additionally, uploaded files and direct messages "
 "are not backed up."
 msgstr ""
 
-#: actions/backupaccount.php:255
+#. TRANS: Submit button to backup an account on the backup account page.
 msgctxt "BUTTON"
 msgid "Backup"
 msgstr ""
 
-#: actions/backupaccount.php:258
-msgid "Backup your account"
+#. TRANS: Title for submit button to backup an account on the backup account page.
+msgid "Backup your account."
 msgstr ""
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
-#: actions/block.php:68
 msgid "You already blocked that user."
 msgstr "זיהוי ה-Jabber כבר שייך למשתמש �חר."
 
 #. TRANS: Title for block user page.
 #. TRANS: Legend for block user form.
-#: actions/block.php:106 actions/block.php:136 actions/groupblock.php:158
-#, fuzzy
+#. TRANS: Fieldset legend for block user from group form.
 msgid "Block user"
-msgstr "�ין משתמש כזה."
+msgstr "חסימת משתמש"
 
 #. TRANS: Explanation of consequences when blocking a user on the block user page.
-#: actions/block.php:139
 msgid ""
 "Are you sure you want to block this user? Afterwards, they will be "
 "unsubscribed from you, unable to subscribe to you in the future, and you "
@@ -1498,20 +1545,13 @@ msgstr ""
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:154 actions/deleteapplication.php:157
-#: actions/deletegroup.php:220 actions/deletenotice.php:155
-#: actions/deleteuser.php:152 actions/groupblock.php:178
-#, fuzzy
 msgctxt "BUTTON"
 msgid "No"
 msgstr "ל�"
 
 #. TRANS: Submit button title for 'No' when blocking a user.
-#. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/block.php:158 actions/deleteuser.php:156
-#, fuzzy
-msgid "Do not block this user"
-msgstr "�ין משתמש כזה."
+msgid "Do not block this user."
+msgstr "ל� לחסו� �ת המשתמש הזה."
 
 #. TRANS: Button label on the user block form.
 #. TRANS: Button label on the delete application form.
@@ -1519,203 +1559,178 @@ msgstr "�ין משתמש כזה."
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:161 actions/deleteapplication.php:164
-#: actions/deletegroup.php:227 actions/deletenotice.php:162
-#: actions/deleteuser.php:159 actions/groupblock.php:185
-#, fuzzy
+#. TRANS: Button text to repeat a notice on notice repeat form.
 msgctxt "BUTTON"
 msgid "Yes"
 msgstr "כן"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
-#. TRANS: Description of the form to block a user.
-#: actions/block.php:165 lib/blockform.php:79
-#, fuzzy
-msgid "Block this user"
-msgstr "�ין משתמש כזה."
+msgid "Block this user."
+msgstr "לחסו� �ת המשתמש הזה."
 
 #. TRANS: Server error displayed when blocking a user fails.
-#: actions/block.php:189
 msgid "Failed to save block information."
 msgstr ""
 
-#. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
-#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
-#. TRANS: Client error when trying to delete a non-local group.
-#. TRANS: Client error when trying to delete a non-existing group.
-#. TRANS: Client error displayed trying to edit a non-existing group.
-#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
-#. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
-#. TRANS: Client error displayed if no local group with a given name was found requesting group page.
-#. TRANS: Command exception text shown when a group is requested that does not exist.
-#. TRANS: Error text shown when trying to leave a group that does not exist.
-#: actions/blockedfromgroup.php:81 actions/blockedfromgroup.php:89
-#: actions/deletegroup.php:87 actions/deletegroup.php:100
-#: actions/editgroup.php:102 actions/foafgroup.php:44 actions/foafgroup.php:62
-#: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:100 actions/grouplogo.php:102
-#: actions/groupmembers.php:83 actions/groupmembers.php:90
-#: actions/grouprss.php:98 actions/grouprss.php:105
-#: actions/groupunblock.php:88 actions/joingroup.php:82
-#: actions/joingroup.php:93 actions/leavegroup.php:82
-#: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
-#: lib/command.php:380
-msgid "No such group."
-msgstr "�ין משתמש כזה."
-
 #. TRANS: Title for first page with list of users blocked from a group.
 #. TRANS: %s is a group nickname.
-#: actions/blockedfromgroup.php:101
-#, fuzzy, php-format
+#, php-format
 msgid "%s blocked profiles"
-msgstr "למשתמש �ין פרופיל."
+msgstr "דפי משתמשי� חסומי� בקבוצה %s"
 
 #. TRANS: Title for any but the first page with list of users blocked from a group.
 #. TRANS: %1$s is a group nickname, %2$d is a page number.
-#: actions/blockedfromgroup.php:106
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s blocked profiles, page %2$d"
-msgstr "%s וחברי�"
+msgstr "דפי משתמשי� חסומי� בקבוצה %1$s, דף %2$d"
 
 #. TRANS: Instructions for list of users blocked from a group.
-#: actions/blockedfromgroup.php:122
 msgid "A list of the users blocked from joining this group."
 msgstr ""
 
 #. TRANS: Form legend for unblocking a user from a group.
-#: actions/blockedfromgroup.php:291
-#, fuzzy
 msgid "Unblock user from group"
-msgstr "�ין משתמש כזה."
+msgstr "לבטל חסימה של משתמש מקבוצה"
 
 #. TRANS: Button text for unblocking a user from a group.
-#: actions/blockedfromgroup.php:323
 msgctxt "BUTTON"
 msgid "Unblock"
-msgstr ""
+msgstr "שחרור חסימה"
 
 #. TRANS: Tooltip for button for unblocking a user from a group.
 #. TRANS: Description of the form to unblock a user.
-#: actions/blockedfromgroup.php:327 lib/unblockform.php:78
-#, fuzzy
 msgid "Unblock this user"
-msgstr "�ין משתמש כזה."
+msgstr "לבטל חסימת משתמש"
 
 #. TRANS: Title for mini-posting window loaded from bookmarklet.
 #. TRANS: %s is the StatusNet site name.
-#: actions/bookmarklet.php:51
-#, fuzzy, php-format
+#, php-format
 msgid "Post to %s"
-msgstr "תגובת עבור %s"
+msgstr "לשלוח ל�תר %s"
+
+#. TRANS: Title for leave group page after leaving.
+#. TRANS: %s$s is the leaving user's name, %2$s is the group name.
+#. TRANS: Title for leave group page after leaving.
+#, php-format
+msgctxt "TITLE"
+msgid "%1$s left group %2$s"
+msgstr ""
+
+#. TRANS: Client error displayed when trying to leave a group without specifying an ID.
+#. TRANS: Client error displayed when trying to unsubscribe without providing a profile ID.
+msgid "No profile ID in request."
+msgstr "ל� התבקש �ישור!"
+
+#. TRANS: Client error displayed when trying to leave a non-existing group.
+#. TRANS: Client error displayed trying to block a user from a group while specifying a non-existing profile.
+#. TRANS: Client error displayed when trying to unblock a user from a group without providing an existing profile.
+#. TRANS: Client error displayed when specifying an invalid profile ID on the Make Admin page.
+#. TRANS: Client error displayed trying a change a subscription for a non-existant profile ID.
+#. TRANS: Client error displayed when referring to non-existing profile ID.
+#. TRANS: Client error displayed when trying to unsubscribe while providing a non-existing profile ID.
+#. TRANS: Client error displayed when trying to change user options without specifying an existing user to work on.
+msgid "No profile with that ID."
+msgstr ""
+
+#. TRANS: Title after unsubscribing from a group.
+msgctxt "TITLE"
+msgid "Unsubscribed"
+msgstr "המינוי בוטל"
 
 #. TRANS: Client error displayed when not providing a confirmation code in the contact address confirmation action.
-#: actions/confirmaddress.php:74
 msgid "No confirmation code."
 msgstr "�ין קוד �ישור."
 
 #. TRANS: Client error displayed when providing a non-existing confirmation code in the contact address confirmation action.
-#: actions/confirmaddress.php:80
 msgid "Confirmation code not found."
 msgstr "קוד ה�ישור ל� נמצ�."
 
 #. TRANS: Client error displayed when not providing a confirmation code for another user in the contact address confirmation action.
-#: actions/confirmaddress.php:86
 msgid "That confirmation code is not for you!"
 msgstr "קוד ה�ישור הזה �ינו מיועד לך!"
 
-#. TRANS: Server error for a unknow address type %s, which can be 'email', 'jabber', or 'sms'.
-#: actions/confirmaddress.php:92
-#, fuzzy, php-format
-msgid "Unrecognized address type %s."
+#. TRANS: Server error for an unknown address type, which can be 'email', 'sms', or the name of an IM network (such as 'xmpp' or 'aim')
+#, php-format
+msgid "Unrecognized address type %s"
 msgstr "סוג ל� מזוהה של כתובת %s"
 
 #. TRANS: Client error for an already confirmed email/jabber/sms address.
-#: actions/confirmaddress.php:97
+#. TRANS: Client error for an already confirmed IM address.
 msgid "That address has already been confirmed."
 msgstr "כתובת זו כבר �ושרה."
 
-#. TRANS: Server error displayed when a user update to the database fails in the contact address confirmation action.
-#. TRANS: Server error thrown on database error updating e-mail preferences.
-#. TRANS: Server error thrown on database error removing a registered e-mail address.
-#. TRANS: Server error thrown on database error updating IM preferences.
+#. TRANS: Server error displayed when updating IM preferences fails.
 #. TRANS: Server error thrown on database error removing a registered IM address.
-#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
-#. TRANS: Server error thrown when user profile settings could not be updated.
-#. TRANS: Server error thrown on database error updating SMS preferences.
-#. TRANS: Server error thrown on database error removing a registered SMS phone number.
-#: actions/confirmaddress.php:118 actions/emailsettings.php:359
-#: actions/emailsettings.php:508 actions/imsettings.php:283
-#: actions/imsettings.php:442 actions/othersettings.php:184
-#: actions/profilesettings.php:326 actions/smssettings.php:308
-#: actions/smssettings.php:464
-msgid "Couldn't update user."
-msgstr "עידכון המשתמש נכשל."
+msgid "Could not update user IM preferences."
+msgstr ""
+
+#. TRANS: Server error displayed when adding IM preferences fails.
+msgid "Could not insert user IM preferences."
+msgstr ""
 
 #. TRANS: Server error displayed when an address confirmation code deletion from the
 #. TRANS: database fails in the contact address confirmation action.
-#: actions/confirmaddress.php:132
 msgid "Could not delete address confirmation."
 msgstr ""
 
 #. TRANS: Title for the contact address confirmation action.
-#: actions/confirmaddress.php:150
 msgid "Confirm address"
 msgstr "�שר"
 
 #. TRANS: Success message for the contact address confirmation action.
 #. TRANS: %s can be 'email', 'jabber', or 'sms'.
-#: actions/confirmaddress.php:166
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr "הכתובת \"%s\" �ושרה עבור חשבונך."
 
 #. TRANS: Title for page with a conversion (multiple notices in context).
-#: actions/conversation.php:96
-#, fuzzy
 msgid "Conversation"
-msgstr "מיקו�"
+msgstr "שיחה"
 
-#. TRANS: Header on conversation page. Hidden by default (h2).
-#: actions/conversation.php:149 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:229 lib/searchgroupnav.php:82
-msgid "Notices"
-msgstr "הודעות"
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+msgid "Conversation feed (Activity Streams JSON)"
+msgstr "הזנת שיחות (Activity Streams JSON)"
+
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+msgid "Conversation feed (RSS 2.0)"
+msgstr "הזנת שיחות (RSS 2.0)"
+
+#. TRANS: Title for conversation page.
+#. TRANS: Title for page that shows a notice.
+msgctxt "TITLE"
+msgid "Notice"
+msgstr "עדכון"
 
 #. TRANS: Client exception displayed trying to delete a user account while not logged in.
-#: actions/deleteaccount.php:71
 msgid "Only logged-in users can delete their account."
 msgstr ""
 
 #. TRANS: Client exception displayed trying to delete a user account without have the rights to do that.
-#: actions/deleteaccount.php:77
 msgid "You cannot delete your account."
 msgstr ""
 
 #. TRANS: Confirmation text for user deletion. The user has to type this exactly the same, including punctuation.
-#: actions/deleteaccount.php:160 actions/deleteaccount.php:297
 msgid "I am sure."
-msgstr ""
+msgstr "�ני בטוח."
 
 #. TRANS: Notification for user about the text that must be input to be able to delete a user account.
 #. TRANS: %s is the text that needs to be input.
-#: actions/deleteaccount.php:164
 #, php-format
-msgid "You must write  \"%s\" exactly in the box."
+msgid "You must write \"%s\" exactly in the box."
 msgstr ""
 
 #. TRANS: Confirmation that a user account has been deleted.
-#: actions/deleteaccount.php:206
 msgid "Account deleted."
-msgstr ""
+msgstr "החשבון נמחק."
 
 #. TRANS: Page title for page on which a user account can be deleted.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:474
+#. TRANS: Option in profile settings to delete the account of the currently logged in user.
 msgid "Delete account"
 msgstr ""
 
 #. TRANS: Form text for user deletion form.
-#: actions/deleteaccount.php:279
 msgid ""
 "This will <strong>permanently delete</strong> your account data from this "
 "server."
@@ -1723,7 +1738,6 @@ msgstr ""
 
 #. TRANS: Additional form text for user deletion form shown if a user has account backup rights.
 #. TRANS: %s is a URL to the backup page.
-#: actions/deleteaccount.php:285
 #, php-format
 msgid ""
 "You are strongly advised to <a href=\"%s\">back up your data</a> before "
@@ -1731,58 +1745,45 @@ msgid ""
 msgstr ""
 
 #. TRANS: Field label for delete account confirmation entry.
-#: actions/deleteaccount.php:300 actions/passwordsettings.php:112
-#: actions/recoverpassword.php:239 actions/register.php:441
+#. TRANS: Field label for password reset form where the password has to be typed again.
 msgid "Confirm"
 msgstr "�שר"
 
 #. TRANS: Input title for the delete account field.
 #. TRANS: %s is the text that needs to be input.
-#: actions/deleteaccount.php:304
 #, php-format
 msgid "Enter \"%s\" to confirm that you want to delete your account."
 msgstr ""
 
 #. TRANS: Button title for user account deletion.
-#: actions/deleteaccount.php:323
-msgid "Permanently delete your account"
+msgid "Permanently delete your account."
 msgstr ""
 
 #. TRANS: Client error displayed trying to delete an application while not logged in.
-#: actions/deleteapplication.php:62
-#, fuzzy
 msgid "You must be logged in to delete an application."
-msgstr "עידכון המשתמש נכשל."
+msgstr "צריך להיכנס כדי למחוק יישו�."
 
 #. TRANS: Client error displayed trying to delete an application that does not exist.
-#: actions/deleteapplication.php:71
 msgid "Application not found."
 msgstr "קוד ה�ישור ל� נמצ�."
 
 #. TRANS: Client error displayed trying to delete an application the current user does not own.
 #. TRANS: Client error displayed trying to edit an application while not being its owner.
-#: actions/deleteapplication.php:79 actions/editapplication.php:78
-#: actions/showapplication.php:94
-#, fuzzy
+#. TRANS: Client error displayed trying to display an OAuth application for which the logged in user is not the owner.
 msgid "You are not the owner of this application."
-msgstr "ל� שלחנו �לינו �ת הפרופיל הזה"
+msgstr "�ינך הבעלי� של היישו� הזה."
 
+#. TRANS: Client error displayed when the session token does not match or is not given.
 #. TRANS: Client error text when there is a problem with the session token.
-#: actions/deleteapplication.php:102 actions/editapplication.php:131
-#: actions/newapplication.php:114 actions/showapplication.php:118
-#: lib/action.php:1409
 msgid "There was a problem with your session token."
 msgstr ""
 
 #. TRANS: Title for delete application page.
 #. TRANS: Fieldset legend on delete application page.
-#: actions/deleteapplication.php:124 actions/deleteapplication.php:149
-#, fuzzy
 msgid "Delete application"
-msgstr "�ין הודעה כזו."
+msgstr "מחיקת יישו�"
 
 #. TRANS: Confirmation text on delete application page.
-#: actions/deleteapplication.php:152
 msgid ""
 "Are you sure you want to delete this application? This will clear all data "
 "about the application from the database, including all existing user "
@@ -1790,56 +1791,39 @@ msgid ""
 msgstr ""
 
 #. TRANS: Submit button title for 'No' when deleting an application.
-#: actions/deleteapplication.php:161
-#, fuzzy
-msgid "Do not delete this application"
-msgstr "�ין הודעה כזו."
+msgid "Do not delete this application."
+msgstr ""
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
-#: actions/deleteapplication.php:167
-#, fuzzy
-msgid "Delete this application"
-msgstr "ת�ר �ת עצמך ו�ת נוש�י העניין שלך ב-140 �ותיות"
+msgid "Delete this application."
+msgstr ""
 
 #. TRANS: Client error when trying to delete group while not logged in.
-#: actions/deletegroup.php:64
 msgid "You must be logged in to delete a group."
 msgstr ""
 
-#. TRANS: Client error when trying to delete a group without providing a nickname or ID for the group.
-#: actions/deletegroup.php:94 actions/joingroup.php:88
-#: actions/leavegroup.php:88
-#, fuzzy
-msgid "No nickname or ID."
-msgstr "�ין כינוי"
-
 #. TRANS: Client error when trying to delete a group without having the rights to delete it.
-#: actions/deletegroup.php:107
 msgid "You are not allowed to delete this group."
 msgstr ""
 
 #. TRANS: Server error displayed if a group could not be deleted.
 #. TRANS: %s is the name of the group that could not be deleted.
-#: actions/deletegroup.php:150
 #, php-format
 msgid "Could not delete group %s."
 msgstr ""
 
 #. TRANS: Message given after deleting a group.
 #. TRANS: %s is the deleted group's name.
-#: actions/deletegroup.php:159
 #, php-format
 msgid "Deleted group %s"
 msgstr ""
 
 #. TRANS: Title of delete group page.
 #. TRANS: Form legend for deleting a group.
-#: actions/deletegroup.php:176 actions/deletegroup.php:202
 msgid "Delete group"
 msgstr ""
 
 #. TRANS: Warning in form for deleleting a group.
-#: actions/deletegroup.php:206
 msgid ""
 "Are you sure you want to delete this group? This will clear all data about "
 "the group from the database, without a backup. Public posts to this group "
@@ -1847,31 +1831,14 @@ msgid ""
 msgstr ""
 
 #. TRANS: Submit button title for 'No' when deleting a group.
-#: actions/deletegroup.php:224
-msgid "Do not delete this group"
+msgid "Do not delete this group."
 msgstr ""
 
 #. TRANS: Submit button title for 'Yes' when deleting a group.
-#: actions/deletegroup.php:231
-msgid "Delete this group"
+msgid "Delete this group."
 msgstr ""
 
-#. TRANS: Error message displayed trying to delete a notice while not logged in.
-#. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
-#. TRANS: Client error displayed trying a change a subscription while not logged in.
-#. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
-#: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
-#: actions/groupblock.php:61 actions/groupunblock.php:60 actions/logout.php:69
-#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
-#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
-#: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:71 lib/profileformaction.php:64
-#: lib/settingsaction.php:72
-msgid "Not logged in."
-msgstr "ל� מחובר."
-
 #. TRANS: Instructions for deleting a notice.
-#: actions/deletenotice.php:110
 msgid ""
 "You are about to permanently delete a notice. Once this is done, it cannot "
 "be undone."
@@ -1879,455 +1846,369 @@ msgstr ""
 
 #. TRANS: Page title when deleting a notice.
 #. TRANS: Fieldset legend for the delete notice form.
-#: actions/deletenotice.php:117 actions/deletenotice.php:148
-#, fuzzy
 msgid "Delete notice"
-msgstr "הודעה חדשה"
+msgstr "מחיקת עדכון"
 
 #. TRANS: Message for the delete notice form.
-#: actions/deletenotice.php:152
 msgid "Are you sure you want to delete this notice?"
 msgstr ""
 
 #. TRANS: Submit button title for 'No' when deleting a notice.
-#: actions/deletenotice.php:159
-#, fuzzy
-msgid "Do not delete this notice"
-msgstr "�ין הודעה כזו."
+msgid "Do not delete this notice."
+msgstr "ל� למחוק �ת העדכון הזה."
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:166 lib/noticelist.php:673
-msgid "Delete this notice"
-msgstr ""
+msgid "Delete this notice."
+msgstr "למחוק �ת העדכון הזה."
 
-#: actions/deleteuser.php:67
-#, fuzzy
+#. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
 msgid "You cannot delete users."
-msgstr "עידכון המשתמש נכשל."
+msgstr "�ינך יכול למחוק משתמשי�."
 
-#: actions/deleteuser.php:74
-#, fuzzy
+#. TRANS: Client error displayed when trying to delete a non-local user.
 msgid "You can only delete local users."
-msgstr "ניתן להשתמש במנוי המקומי!"
+msgstr "�תה יכול למחוק רק משתמשי� מקומיי�."
 
-#: actions/deleteuser.php:110 actions/deleteuser.php:133
-#, fuzzy
+#. TRANS: Title of delete user page.
+msgctxt "TITLE"
 msgid "Delete user"
-msgstr "מחק"
+msgstr "למחוק משתמש"
 
-#: actions/deleteuser.php:136
+#. TRANS: Fieldset legend on delete user page.
+msgid "Delete user"
+msgstr "מחיקת משתמש"
+
+#. TRANS: Information text to request if a user is certain that the described action has to be performed.
 msgid ""
 "Are you sure you want to delete this user? This will clear all data about "
 "the user from the database, without a backup."
 msgstr ""
 
+#. TRANS: Submit button title for 'No' when deleting a user.
+msgid "Do not delete this user."
+msgstr ""
+
 #. TRANS: Submit button title for 'Yes' when deleting a user.
-#: actions/deleteuser.php:163 lib/deleteuserform.php:77
-#, fuzzy
-msgid "Delete this user"
-msgstr "�ין משתמש כזה."
-
-#. TRANS: Message used as title for design settings for the site.
-#. TRANS: Link description in user account settings menu.
-#: actions/designadminpanel.php:63 lib/accountsettingsaction.php:134
-msgid "Design"
+msgid "Delete this user."
 msgstr ""
 
-#: actions/designadminpanel.php:74
-msgid "Design settings for this StatusNet site"
-msgstr ""
-
-#: actions/designadminpanel.php:335
-#, fuzzy
-msgid "Invalid logo URL."
-msgstr "גודל ל� חוקי."
-
-#: actions/designadminpanel.php:340
-msgid "Invalid SSL logo URL."
-msgstr ""
-
-#: actions/designadminpanel.php:344
-#, fuzzy, php-format
-msgid "Theme not available: %s."
-msgstr "עמוד זה �ינו זמין בסוג מדיה ש�תה יכול לקבל"
-
-#: actions/designadminpanel.php:448
-msgid "Change logo"
-msgstr "שנה"
-
-#: actions/designadminpanel.php:453
-#, fuzzy
-msgid "Site logo"
-msgstr "הודעה חדשה"
-
-#: actions/designadminpanel.php:457
-msgid "SSL logo"
-msgstr ""
-
-#: actions/designadminpanel.php:469
-#, fuzzy
-msgid "Change theme"
-msgstr "שנה"
-
-#: actions/designadminpanel.php:486
-#, fuzzy
-msgid "Site theme"
-msgstr "הודעה חדשה"
-
-#: actions/designadminpanel.php:487
-msgid "Theme for the site."
-msgstr ""
-
-#: actions/designadminpanel.php:493
-#, fuzzy
-msgid "Custom theme"
-msgstr "הודעה חדשה"
-
-#: actions/designadminpanel.php:497
-msgid "You can upload a custom StatusNet theme as a .ZIP archive."
-msgstr ""
-
-#. TRANS: Fieldset legend on profile design page.
-#: actions/designadminpanel.php:512 lib/designsettings.php:98
-msgid "Change background image"
-msgstr ""
-
-#. TRANS: Label on profile design page for setting a profile page background colour.
-#: actions/designadminpanel.php:517 actions/designadminpanel.php:600
-#: lib/designsettings.php:183
-msgid "Background"
-msgstr ""
-
-#: actions/designadminpanel.php:522
-#, fuzzy, php-format
-msgid ""
-"You can upload a background image for the site. The maximum file size is %1"
-"$s."
-msgstr "זה �רוך מידי. �ורך מירבי להודעה הו� 140 �ותיות."
-
-#. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:553
-msgid "On"
-msgstr ""
-
-#. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:570
-msgid "Off"
-msgstr ""
-
-#. TRANS: Form guide for a set of radio buttons on the profile design page that will enable or disable
-#. TRANS: use of the uploaded profile image.
-#: actions/designadminpanel.php:571 lib/designsettings.php:159
-msgid "Turn background image on or off."
-msgstr ""
-
-#. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
-#: actions/designadminpanel.php:576 lib/designsettings.php:165
-msgid "Tile background image"
-msgstr ""
-
-#. TRANS: Fieldset legend on profile design page to change profile page colours.
-#: actions/designadminpanel.php:590 lib/designsettings.php:175
-#, fuzzy
-msgid "Change colours"
-msgstr "שנה סיסמה"
-
-#. TRANS: Label on profile design page for setting a profile page content colour.
-#: actions/designadminpanel.php:613 lib/designsettings.php:197
-#, fuzzy
-msgid "Content"
-msgstr "התחבר"
-
-#. TRANS: Label on profile design page for setting a profile page sidebar colour.
-#: actions/designadminpanel.php:626 lib/designsettings.php:211
-#, fuzzy
-msgid "Sidebar"
-msgstr "חיפוש"
-
-#. TRANS: Label on profile design page for setting a profile page text colour.
-#: actions/designadminpanel.php:639 lib/designsettings.php:225
-msgid "Text"
-msgstr "טקסט"
-
-#. TRANS: Label on profile design page for setting a profile page links colour.
-#: actions/designadminpanel.php:652 lib/designsettings.php:239
-#, fuzzy
-msgid "Links"
-msgstr "היכנס"
-
-#: actions/designadminpanel.php:677
-msgid "Advanced"
-msgstr ""
-
-#: actions/designadminpanel.php:681
-msgid "Custom CSS"
-msgstr ""
-
-#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-#: actions/designadminpanel.php:702 lib/designsettings.php:257
-msgid "Use defaults"
-msgstr ""
-
-#. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: actions/designadminpanel.php:703 lib/designsettings.php:259
-msgid "Restore default designs"
-msgstr ""
-
-#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: actions/designadminpanel.php:709 lib/designsettings.php:267
-msgid "Reset back to default"
-msgstr ""
-
-#. TRANS: Submit button title.
-#: actions/designadminpanel.php:711 actions/licenseadminpanel.php:319
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/snapshotadminpanel.php:245 actions/tagother.php:154
-#: lib/applicationeditform.php:357
-msgid "Save"
-msgstr "שמור"
-
-#. TRANS: Title for button on profile design page to save settings.
-#: actions/designadminpanel.php:712 lib/designsettings.php:272
-msgid "Save design"
-msgstr ""
-
-#: actions/disfavor.php:81
+#. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
 msgid "This notice is not a favorite!"
 msgstr ""
 
-#: actions/disfavor.php:94
-#, fuzzy
+#. TRANS: Title for page on which favorites can be added.
 msgid "Add to favorites"
-msgstr "מועדפי�"
+msgstr "הוספה למועדפי�"
 
-#: actions/doc.php:158
+#. TRANS: Client exception thrown when requesting a document from the documentation that does not exist.
+#. TRANS: %s is the non-existing document.
 #, php-format
-msgid "No such document \"%s\""
-msgstr "�ין הודעה כזו."
+msgid "No such document \"%s\"."
+msgstr ""
+
+#. TRANS: Menu item in administrator navigation panel.
+#. TRANS: Menu item in default local navigation panel.
+#. TRANS: Menu item in personal group navigation menu.
+msgctxt "MENU"
+msgid "Home"
+msgstr ""
+
+msgctxt "MENU"
+msgid "Docs"
+msgstr ""
+
+#. TRANS: Secondary navigation menu item leading to help on StatusNet.
+msgctxt "MENU"
+msgid "Help"
+msgstr "עזרה"
+
+msgid "Getting started"
+msgstr "תחילת עבודה"
+
+#. TRANS: Secondary navigation menu item leading to text about StatusNet site.
+msgctxt "MENU"
+msgid "About"
+msgstr ""
+
+msgid "About this site"
+msgstr "�ודות ה�תר הזה"
+
+#. TRANS: Secondary navigation menu item leading to Frequently Asked Questions.
+msgctxt "MENU"
+msgid "FAQ"
+msgstr ""
+
+msgid "Frequently asked questions"
+msgstr ""
+
+#. TRANS: Secondary navigation menu item leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+msgctxt "MENU"
+msgid "Contact"
+msgstr ""
+
+msgid "Contact info"
+msgstr ""
+
+msgctxt "MENU"
+msgid "Tags"
+msgstr ""
+
+msgid "Using tags"
+msgstr ""
+
+#. TRANS: Menu item in default local navigation panel.
+#. TRANS: Menu item in search group navigation panel.
+#. TRANS: Menu item in local navigation menu.
+msgctxt "MENU"
+msgid "Groups"
+msgstr ""
+
+msgid "Using groups"
+msgstr "שימוש בקבוצות"
+
+msgctxt "MENU"
+msgid "API"
+msgstr ""
+
+msgid "RESTful API"
+msgstr ""
 
 #. TRANS: Title for "Edit application" form.
 #. TRANS: Form legend.
-#: actions/editapplication.php:54 lib/applicationeditform.php:129
 msgid "Edit application"
 msgstr ""
 
 #. TRANS: Client error displayed trying to edit an application while not logged in.
-#: actions/editapplication.php:66
 msgid "You must be logged in to edit an application."
 msgstr ""
 
 #. TRANS: Client error displayed trying to edit an application that does not exist.
-#: actions/editapplication.php:83 actions/showapplication.php:87
-#, fuzzy
+#. TRANS: Client error displayed trying to display a non-existing OAuth application.
 msgid "No such application."
-msgstr "�ין הודעה כזו."
+msgstr "�ין יישו� כזה."
 
 #. TRANS: Instructions for "Edit application" form.
-#: actions/editapplication.php:167
 msgid "Use this form to edit your application."
 msgstr ""
 
 #. TRANS: Validation error shown when not providing a name in the "Edit application" form.
-#: actions/editapplication.php:184 actions/newapplication.php:163
+#. TRANS: Validation error shown when not providing a name in the "New application" form.
 msgid "Name is required."
 msgstr ""
 
 #. TRANS: Validation error shown when providing too long a name in the "Edit application" form.
-#: actions/editapplication.php:188 actions/newapplication.php:169
+#. TRANS: Validation error shown when providing too long a name in the "New application" form.
 msgid "Name is too long (maximum 255 characters)."
 msgstr ""
 
 #. TRANS: Validation error shown when providing a name for an application that already exists in the "Edit application" form.
-#: actions/editapplication.php:192 actions/newapplication.php:166
-#, fuzzy
+#. TRANS: Validation error shown when providing a name for an application that already exists in the "New application" form.
 msgid "Name already in use. Try another one."
-msgstr "כינוי זה כבר תפוס. נסה כינוי �חר."
+msgstr "הש� כבר בשימוש. נסה ש� �חר."
 
 #. TRANS: Validation error shown when not providing a description in the "Edit application" form.
-#: actions/editapplication.php:196 actions/newapplication.php:172
+#. TRANS: Validation error shown when not providing a description in the "New application" form.
 msgid "Description is required."
 msgstr "ההרשמה נדחתה"
 
 #. TRANS: Validation error shown when providing too long a source URL in the "Edit application" form.
-#: actions/editapplication.php:208
 msgid "Source URL is too long."
 msgstr ""
 
 #. TRANS: Validation error shown when providing an invalid source URL in the "Edit application" form.
-#: actions/editapplication.php:215 actions/newapplication.php:193
-#, fuzzy
+#. TRANS: Validation error shown when providing an invalid source URL in the "New application" form.
 msgid "Source URL is not valid."
-msgstr "ל�תר הבית יש כתובת ל� חוקית."
+msgstr "כתובת המקור �ינה תקינה."
 
 #. TRANS: Validation error shown when not providing an organisation in the "Edit application" form.
-#: actions/editapplication.php:219 actions/newapplication.php:196
+#. TRANS: Validation error shown when not providing an organisation in the "New application" form.
 msgid "Organization is required."
 msgstr ""
 
 #. TRANS: Validation error shown when providing too long an arganisation name in the "Edit application" form.
-#: actions/editapplication.php:223 actions/newapplication.php:199
 msgid "Organization is too long (maximum 255 characters)."
 msgstr ""
 
-#: actions/editapplication.php:226 actions/newapplication.php:202
+#. TRANS: Form validation error show when an organisation name has not been provided in the edit application form.
+#. TRANS: Form validation error show when an organisation name has not been provided in the new application form.
 msgid "Organization homepage is required."
 msgstr ""
 
 #. TRANS: Validation error shown when providing too long a callback URL in the "Edit application" form.
-#: actions/editapplication.php:237 actions/newapplication.php:214
+#. TRANS: Validation error shown when providing too long a callback URL in the "New application" form.
 msgid "Callback is too long."
 msgstr ""
 
 #. TRANS: Validation error shown when providing an invalid callback URL in the "Edit application" form.
-#: actions/editapplication.php:245 actions/newapplication.php:223
+#. TRANS: Validation error shown when providing an invalid callback URL in the "New application" form.
 msgid "Callback URL is not valid."
 msgstr ""
 
 #. TRANS: Server error occuring when an application could not be updated from the "Edit application" form.
-#: actions/editapplication.php:282
-#, fuzzy
 msgid "Could not update application."
-msgstr "עידכון המשתמש נכשל."
+msgstr "עדכון היישו� נכשל."
 
 #. TRANS: Title for form to edit a group. %s is a group nickname.
-#: actions/editgroup.php:55
 #, php-format
 msgid "Edit %s group"
 msgstr ""
 
 #. TRANS: Client error displayed trying to edit a group while not logged in.
+#. TRANS: Client error displayed when trying to create a group while not logged in.
 #. TRANS: Client error displayed trying to create a group while not logged in.
-#: actions/editgroup.php:68 actions/grouplogo.php:70 actions/newgroup.php:65
 msgid "You must be logged in to create a group."
 msgstr ""
 
-#. TRANS: Client error displayed trying to edit a group while not being a group admin.
-#: actions/editgroup.php:110 actions/editgroup.php:176
-#: actions/groupdesignsettings.php:107 actions/grouplogo.php:109
-msgid "You must be an admin to edit the group."
-msgstr ""
-
 #. TRANS: Form instructions for group edit form.
-#: actions/editgroup.php:161
 msgid "Use this form to edit the group."
 msgstr ""
 
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
-#: actions/editgroup.php:239 actions/newgroup.php:186
-#, fuzzy, php-format
+#. TRANS: %s is the invalid alias.
+#, php-format
 msgid "Invalid alias: \"%s\""
-msgstr "כתובת �תר הבית '%s' �ינה חוקית"
-
-#. TRANS: Server error displayed when editing a group fails.
-#: actions/editgroup.php:272
-#, fuzzy
-msgid "Could not update group."
-msgstr "עידכון המשתמש נכשל."
-
-#. TRANS: Server error displayed when group aliases could not be added.
-#. TRANS: Server exception thrown when creating group aliases failed.
-#: actions/editgroup.php:279 classes/User_group.php:534
-msgid "Could not create aliases."
-msgstr "עידכון המשתמש נכשל."
+msgstr "כינוי ל� תקין: \"%s\""
 
 #. TRANS: Group edit form success message.
-#: actions/editgroup.php:296
-#, fuzzy
+#. TRANS: Edit list form success message.
 msgid "Options saved."
-msgstr "ההגדרות נשמרו."
+msgstr "ה�פשרויות נשמרו."
+
+#. TRANS: Title for edit list page after deleting a tag.
+#. TRANS: %s is a list.
+#, php-format
+msgid "Delete %s list"
+msgstr ""
+
+#. TRANS: Title for edit list page.
+#. TRANS: %s is a list.
+#. TRANS: Form legend for list edit form.
+#. TRANS: %s is a list.
+#, php-format
+msgid "Edit list %s"
+msgstr ""
+
+#. TRANS: Error message displayed when trying to perform an action that requires a tagging user or ID.
+msgid "No tagger or ID."
+msgstr ""
+
+#. TRANS: Client error displayed when referring to non-local user.
+msgid "Not a local user."
+msgstr "זה ל� משתמש מקומי."
+
+#. TRANS: Client error displayed when reting to edit a tag that was not self-created.
+msgid "You must be the creator of the tag to edit it."
+msgstr ""
+
+#. TRANS: Form instruction for edit list form.
+msgid "Use this form to edit the list."
+msgstr ""
+
+#. TRANS: Form validation error displayed if the form data for deleting a tag was incorrect.
+msgid "Delete aborted."
+msgstr ""
+
+#. TRANS: Text in confirmation dialog for deleting a tag.
+msgid ""
+"Deleting this tag will permanantly remove all its subscription and "
+"membership records. Do you still want to continue?"
+msgstr ""
+
+#. TRANS: Form validation error displayed if a given tag is invalid.
+msgid "Invalid tag."
+msgstr "תג ל� תקין."
+
+#. TRANS: Form validation error displayed if a given tag is already present.
+#. TRANS: %s is the already present tag.
+#, php-format
+msgid "You already have a tag named %s."
+msgstr ""
+
+#. TRANS: Text in confirmation dialog for setting a tag from public to private.
+msgid ""
+"Setting a public tag as private will permanently remove all the existing "
+"subscriptions to it. Do you still want to continue?"
+msgstr ""
+
+#. TRANS: Server error displayed when updating a list fails.
+msgid "Could not update list."
+msgstr ""
 
 #. TRANS: Title for e-mail settings.
-#: actions/emailsettings.php:61
-#, fuzzy
 msgid "Email settings"
-msgstr "הגדרות הפרופיל"
+msgstr "הגדרות דו�ר �לקטרוני"
 
 #. TRANS: E-mail settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/emailsettings.php:76
 #, php-format
 msgid "Manage how you get email from %%site.name%%."
 msgstr ""
 
 #. TRANS: Form legend for e-mail settings form.
 #. TRANS: Field label for e-mail address input in e-mail settings form.
-#: actions/emailsettings.php:107 actions/emailsettings.php:133
-#, fuzzy
 msgid "Email address"
-msgstr "כתובת מסרי� מידיי�"
+msgstr "כתובת דו�ר �לקטרוני"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:113
-#, fuzzy
 msgid "Current confirmed email address."
-msgstr "כתובת מ�ושרת נוכחית של Jabber/GTalk."
+msgstr "כתובת דו�ר �לקטרוני מ�ושרת נוכחית."
 
 #. TRANS: Button label to remove a confirmed e-mail address.
 #. TRANS: Button label for removing a set sender e-mail address to post notices from.
 #. TRANS: Button label to remove a confirmed IM address.
 #. TRANS: Button label to remove a confirmed SMS address.
 #. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
-#: actions/emailsettings.php:116 actions/emailsettings.php:183
-#: actions/imsettings.php:116 actions/smssettings.php:124
-#: actions/smssettings.php:180
+#. TRANS: Button text to untag a profile.
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "שיחזור"
 
-#: actions/emailsettings.php:123
-#, fuzzy
+#. TRANS: Form note in e-mail settings form.
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
 msgstr ""
-"מחכה ל�ישור כתובת זו. בדוק �ת חשבון ה-Jabber/GTalk שלך לקבלת מסר ע� הור�ות "
-"נוספותץ (ה�� הוספת �ת %s לרשימת החברי� שלך?)"
+"מחכה ל�ימות כתובת זו. בדוק �ת תיבת הדו�ר הנכנס שלך (ו�ת תיבת דו�ר הזבל!) "
+"להודעה ע� הור�ות להמשך העבודה."
 
 #. TRANS: Instructions for e-mail address input form. Do not translate
 #. TRANS: "example.org". It is one of the domain names reserved for
 #. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
 #. TRANS: Any other domain may be owned by a legitimate person or
 #. TRANS: organization.
-#: actions/emailsettings.php:140
 msgid "Email address, like \"UserName@example.org\""
 msgstr ""
 
 #. TRANS: Button label for adding an e-mail address in e-mail settings form.
 #. TRANS: Button label for adding an IM address in IM settings form.
 #. TRANS: Button label for adding a SMS phone number in SMS settings form.
-#: actions/emailsettings.php:144 actions/imsettings.php:151
-#: actions/smssettings.php:162
-#, fuzzy
+#. TRANS: Button text to tag a profile.
 msgctxt "BUTTON"
 msgid "Add"
-msgstr "הוסף"
+msgstr "הוספה"
 
 #. TRANS: Form legend for incoming e-mail settings form.
 #. TRANS: Form legend for incoming SMS settings form.
-#: actions/emailsettings.php:152 actions/smssettings.php:171
 msgid "Incoming email"
 msgstr ""
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:158
 msgid "I want to post notices by email."
 msgstr ""
 
 #. TRANS: Form instructions for incoming e-mail form in e-mail settings.
 #. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
-#: actions/emailsettings.php:180 actions/smssettings.php:178
 msgid "Send email to this address to post new notices."
 msgstr ""
 
 #. TRANS: Instructions for incoming e-mail address input form, when an address has already been assigned.
 #. TRANS: Instructions for incoming SMS e-mail address input form.
-#: actions/emailsettings.php:189 actions/smssettings.php:186
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr ""
 
 #. TRANS: Instructions for incoming e-mail address input form.
-#: actions/emailsettings.php:193
 msgid ""
 "To send notices via email, we need to create a unique email address for you "
 "on this server:"
@@ -2335,352 +2216,276 @@ msgstr ""
 
 #. TRANS: Button label for adding an e-mail address to send notices from.
 #. TRANS: Button label for adding an SMS e-mail address to send notices from.
-#: actions/emailsettings.php:199 actions/smssettings.php:189
-#, fuzzy
 msgctxt "BUTTON"
 msgid "New"
 msgstr "חדש"
 
 #. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:208
-#, fuzzy
 msgid "Email preferences"
-msgstr "העדפות"
+msgstr "העדפות דו�ר �לקטרוני"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:216
-#, fuzzy
 msgid "Send me notices of new subscriptions through email."
-msgstr "שלח לי הודעות דרך Jabber/GTalk."
+msgstr "לשלוח לי הודעות על נרשמי� חדשי� בדו�ר �לקטרוני."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:222
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr ""
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:229
 msgid "Send me email when someone sends me a private message."
 msgstr ""
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:235
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr ""
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:241
 msgid "Allow friends to nudge me and send me an email."
-msgstr ""
+msgstr "ל�פשר לחברי� לדחוף �ותי ולשלוח לי דו�״ל."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:247
 msgid "Publish a MicroID for my email address."
 msgstr ""
 
 #. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:368
-#, fuzzy
 msgid "Email preferences saved."
-msgstr "העדפות נשמרו."
+msgstr "העדפות דו�ר �לקטרוני נשמרו."
 
 #. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:388
 msgid "No email address."
 msgstr ""
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:396
-#, fuzzy
-msgid "Cannot normalize that email address"
-msgstr "ל� ניתן לנרמל �ת זהות ה-Jabber הזה"
+msgid "Cannot normalize that email address."
+msgstr ""
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:401 actions/register.php:212
-#: actions/siteadminpanel.php:144
-#, fuzzy
+#. TRANS: Form validation error displayed when trying to register without a valid e-mail address.
+#. TRANS: Client error displayed trying to save site settings without a valid contact address.
 msgid "Not a valid email address."
-msgstr "ש� משתמש ל� חוקי."
+msgstr "כתובת דו�ר �לקטרוני ל� תקינה."
 
 #. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:405
-#, fuzzy
 msgid "That is already your email address."
-msgstr "זהו כבר זיהוי ה-Jabber שלך."
+msgstr "זוהי כבר כתובת הדו�ר ה�לקטרוני שלך."
 
 #. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:409
-#, fuzzy
 msgid "That email address already belongs to another user."
-msgstr "זיהוי ה-Jabber כבר שייך למשתמש �חר."
+msgstr "כתובת הדו�ר ה�לקטרוני הז�ת כבר שייכת למשתמש �חר."
 
 #. TRANS: Server error thrown on database error adding e-mail confirmation code.
-#. TRANS: Server error thrown on database error adding IM confirmation code.
+#. TRANS: Server error thrown on database error adding Instant Messaging confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:426 actions/imsettings.php:351
-#: actions/smssettings.php:373
-msgid "Couldn't insert confirmation code."
-msgstr "הכנסת קוד ה�ישור נכשלה."
+msgid "Could not insert confirmation code."
+msgstr ""
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:433
-#, fuzzy
 msgid ""
 "A confirmation code was sent to the email address you added. Check your "
 "inbox (and spam box!) for the code and instructions on how to use it."
 msgstr ""
-"קוד �ישור נשלח �ל כתובת המסרי� המידיי� שהוספת. עליך ל�שר �ת %s לשליחת מסרי� "
-"מידיי� �ליך."
+"קוד �ימות נשלח �ל כתובת הדו�ר ה�לקטרוני שהוספת. חפש בתיבת הדו�ר הנכנס שלך "
+"(ובתיבת דו�ר הזבל!) �ת הקוד ו�ת ההור�ות לשימוש בו."
 
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
-#. TRANS: Message given canceling IM address confirmation that is not pending.
+#. TRANS: Message given canceling Instant Messaging address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:454 actions/imsettings.php:386
-#: actions/smssettings.php:408
 msgid "No pending confirmation to cancel."
 msgstr "�ין �ישור ממתין שניתן לבטל."
 
 #. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:459
-#, fuzzy
 msgid "That is the wrong email address."
-msgstr "זוהי כתובת מסרי� מידיי� שגויה."
+msgstr "כתובת הדו�ר ה�לקטרוני הז�ת שגויה."
 
 #. TRANS: Server error thrown on database error canceling e-mail address confirmation.
-#. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
-#: actions/emailsettings.php:468 actions/smssettings.php:422
-#, fuzzy
-msgid "Couldn't delete email confirmation."
-msgstr "הכנסת קוד ה�ישור נכשלה."
+msgid "Could not delete email confirmation."
+msgstr ""
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:473
 msgid "Email confirmation cancelled."
 msgstr "�ין �ישור ממתין שניתן לבטל."
 
 #. TRANS: Message given trying to remove an e-mail address that is not
 #. TRANS: registered for the active user.
-#: actions/emailsettings.php:493
-#, fuzzy
 msgid "That is not your email address."
-msgstr "זוהי כתובת מסרי� מידיי� שגויה."
+msgstr "כתובת הדו�ר ה�לקטרוני הז�ת �ינה שלך."
 
 #. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:514
 msgid "The email address was removed."
 msgstr "כתובת זו כבר �ושרה."
 
-#: actions/emailsettings.php:528 actions/smssettings.php:568
+#. TRANS: Form validation error displayed when trying to remove an incoming e-mail address while no address has been set.
 msgid "No incoming email address."
 msgstr ""
 
 #. TRANS: Server error thrown on database error removing incoming e-mail address.
 #. TRANS: Server error thrown on database error adding incoming e-mail address.
-#: actions/emailsettings.php:540 actions/emailsettings.php:565
-#: actions/smssettings.php:578 actions/smssettings.php:602
-#, fuzzy
-msgid "Couldn't update user record."
-msgstr "עידכון המשתמש נכשל."
+#. TRANS: Server error displayed when the user could not be updated in SMS settings.
+msgid "Could not update user record."
+msgstr ""
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
-#: actions/emailsettings.php:544 actions/smssettings.php:581
+#. TRANS: Confirmation text after updating SMS settings.
 msgid "Incoming email address removed."
 msgstr ""
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
-#: actions/emailsettings.php:569 actions/smssettings.php:605
+#. TRANS: Confirmation text after updating SMS settings.
 msgid "New incoming email address added."
 msgstr ""
 
-#: actions/favor.php:79
+#. TRANS: Client error displayed when trying to mark a notice as favorite that already is a favorite.
 msgid "This notice is already a favorite!"
 msgstr ""
 
-#: actions/favor.php:92 lib/disfavorform.php:144
-msgid "Disfavor favorite"
+#. TRANS: Page title for page on which favorite notices can be unfavourited.
+msgid "Disfavor favorite."
 msgstr ""
 
-#: actions/favorited.php:65 lib/popularnoticesection.php:62
-#: lib/publicgroupnav.php:93
-#, fuzzy
+#. TRANS: Page title for first page of favorited notices.
+#. TRANS: Title for favourited notices section.
+#. TRANS: Menu item title in search group navigation panel.
 msgid "Popular notices"
-msgstr "�ין הודעה כזו."
+msgstr "עדכוני� פופולריי�"
 
-#: actions/favorited.php:67
-#, fuzzy, php-format
+#. TRANS: Page title for all but first page of favorited notices.
+#. TRANS: %d is the page number being displayed.
+#, php-format
 msgid "Popular notices, page %d"
-msgstr "�ין הודעה כזו."
+msgstr "עדכוני� פופולריי�, עמוד %d"
 
-#: actions/favorited.php:79
+#. TRANS: Description on page displaying favorited notices.
 msgid "The most popular notices on the site right now."
 msgstr ""
 
-#: actions/favorited.php:150
+#. TRANS: Text displayed instead of a list when a site does not yet have any favourited notices.
 msgid "Favorite notices appear on this page but no one has favorited one yet."
 msgstr ""
 
-#: actions/favorited.php:153
+#. TRANS: Additional text displayed instead of a list when a site does not yet have any favourited notices for logged in users.
 msgid ""
 "Be the first to add a notice to your favorites by clicking the fave button "
 "next to any notice you like."
 msgstr ""
 
-#: actions/favorited.php:156
+#. TRANS: Additional text displayed instead of a list when a site does not yet have any favourited notices for not logged in users.
+#. TRANS: %%action.register%% is a registration link. "[link text](link)" is Mark Down. Do not change the formatting.
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to add a "
 "notice to your favorites!"
 msgstr ""
 
-#: actions/favoritesrss.php:111 actions/showfavorites.php:77
-#: lib/personalgroupnav.php:118
+#. TRANS: Title of RSS feed with favourite notices of a user.
+#. TRANS: %s is a user's nickname.
+#. TRANS: Title for first page of favourite notices of a user.
+#. TRANS: %s is the user for whom the favourite notices are displayed.
+#. TRANS: Menu item title in personal group navigation menu.
+#. TRANS: %s is a username.
 #, php-format
 msgid "%s's favorite notices"
 msgstr ""
 
-#: actions/favoritesrss.php:115
-#, fuzzy, php-format
+#. TRANS: Desciption of RSS feed with favourite notices of a user.
+#. TRANS: %1$s is a user's nickname, %2$s is the name of the StatusNet site.
+#, php-format
 msgid "Updates favored by %1$s on %2$s!"
-msgstr "מיקרובלוג מ�ת %s"
+msgstr "עדכוני� שסומנו כמועדפי� על־ידי %1$s ב־%2$s!"
 
-#: actions/featured.php:69 lib/featureduserssection.php:87
-#: lib/publicgroupnav.php:89
+#. TRANS: Page title for first page of featured users.
+#. TRANS: Title for featured users section.
+#. TRANS: Menu item title in search group navigation panel.
 msgid "Featured users"
 msgstr ""
 
-#: actions/featured.php:71
+#. TRANS: Page title for all but first page of featured users.
+#. TRANS: %d is the page number being displayed.
 #, php-format
 msgid "Featured users, page %d"
 msgstr ""
 
-#: actions/featured.php:99
+#. TRANS: Description on page displaying featured users.
 #, php-format
-msgid "A selection of some great users on %s"
+msgid "A selection of some great users on %s."
 msgstr ""
 
-#: actions/file.php:34
+#. TRANS: Client error displayed when no notice ID was given trying do display a file.
 msgid "No notice ID."
-msgstr "�ין הודעה כזו."
+msgstr "�ין מזהה עדכון."
 
-#: actions/file.php:38
+#. TRANS: Client error displayed when an invalid notice ID was given trying do display a file.
 msgid "No notice."
-msgstr "�ין הודעה כזו."
+msgstr "�ין עדכון."
 
-#: actions/file.php:42
-#, fuzzy
+#. TRANS: Client error displayed when trying do display a file for a notice without a file attachement.
 msgid "No attachments."
-msgstr "�ין מסמך כזה."
+msgstr "�ין צרופות."
 
-#: actions/file.php:51
-#, fuzzy
+#. TRANS: Client error displayed when trying do display a file for a notice with file attachements
+#. TRANS: that could not be found.
 msgid "No uploaded attachments."
-msgstr "�ין מסמך כזה."
+msgstr "ל� הועלו צרופות."
 
-#: actions/finishremotesubscribe.php:69
-msgid "Not expecting this response!"
-msgstr "זו תגובה ל� צפויה!"
-
-#: actions/finishremotesubscribe.php:80
-#, fuzzy
-msgid "User being listened to does not exist."
-msgstr "המשתמש �ליו �תה מ�זין �ינו קיי�."
-
-#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59
-msgid "You can use the local subscription!"
-msgstr "ניתן להשתמש במנוי המקומי!"
-
-#: actions/finishremotesubscribe.php:99
-msgid "That user has blocked you from subscribing."
-msgstr ""
-
-#: actions/finishremotesubscribe.php:110
-msgid "You are not authorized."
-msgstr "ההרשמה �ושרה"
-
-#: actions/finishremotesubscribe.php:113
-#, fuzzy
-msgid "Could not convert request token to access token."
-msgstr "המרת �סימון הבקשה ל�סימון גישה ל� הצליחה."
-
-#: actions/finishremotesubscribe.php:118
-#, fuzzy
-msgid "Remote service uses unknown version of OMB protocol."
-msgstr "גירסה ל� מוכרת של פרוטוקול OMB"
-
-#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:317
-#, fuzzy
-msgid "Error updating remote profile."
-msgstr "שגי�ה בעדכון פרופיל מרוחק"
-
-#: actions/getfile.php:79
-#, fuzzy
+#. TRANS: Client error displayed when requesting a non-existent file.
 msgid "No such file."
-msgstr "�ין הודעה כזו."
+msgstr "�ין קובץ כזה."
 
-#: actions/getfile.php:83
+#. TRANS: Client error displayed when requesting a file without having read access to it.
 msgid "Cannot read file."
 msgstr "שמירת הפרופיל נכשלה."
 
-#: actions/grantrole.php:62 actions/revokerole.php:62
-#, fuzzy
+#. TRANS: Client error displayed when trying to assign an invalid role to a user.
+#. TRANS: Client error displayed when trying to revoke an invalid role.
 msgid "Invalid role."
-msgstr "גודל ל� חוקי."
+msgstr "תפקיד ל� תקין."
 
-#: actions/grantrole.php:66 actions/revokerole.php:66
+#. TRANS: Client error displayed when trying to assign an reserved role to a user.
+#. TRANS: Client error displayed when trying to revoke a reserved role.
 msgid "This role is reserved and cannot be set."
 msgstr ""
 
-#: actions/grantrole.php:75
-#, fuzzy
+#. TRANS: Client error displayed when trying to assign a role to a user while not being allowed to set roles.
 msgid "You cannot grant user roles on this site."
-msgstr "ל� שלחנו �לינו �ת הפרופיל הזה"
+msgstr "�ינך יכול להקצות תפקידי� למשתמשי� ב�תר הזה."
 
-#: actions/grantrole.php:82
-#, fuzzy
+#. TRANS: Client error displayed when trying to assign a role to a user that already has that role.
 msgid "User already has this role."
-msgstr "למשתמש �ין פרופיל."
+msgstr "למשתמש כבר יש תפקיד כזה."
 
+#. TRANS: Client error displayed trying to block a user from a group while not specifying a to be blocked user profile.
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing a profile.
+#. TRANS: Client error displayed when not providing a profile ID on the Make Admin page.
 #. TRANS: Client error displayed trying a change a subscription without providing a profile.
-#: actions/groupblock.php:71 actions/groupunblock.php:71
-#: actions/makeadmin.php:71 actions/subedit.php:49
-#: lib/profileformaction.php:79
+#. TRANS: Client error displayed when trying to change user options without specifying a user to work on.
 msgid "No profile specified."
 msgstr ""
 
-#. TRANS: Client error displayed when trying to unblock a user from a group without providing an existing profile.
-#. TRANS: Client error displayed trying a change a subscription for a non-existant profile ID.
-#: actions/groupblock.php:76 actions/groupunblock.php:77
-#: actions/makeadmin.php:76 actions/subedit.php:57 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:86
-msgid "No profile with that ID."
-msgstr ""
-
-#: actions/groupblock.php:81 actions/groupunblock.php:82
-#: actions/makeadmin.php:81
+#. TRANS: Client error displayed trying to block a user from a group while not specifying a group to block a profile from.
+#. TRANS: Client error displayed when trying to unblock a user from a group without providing a group.
+#. TRANS: Client error displayed when not providing a group ID on the Make Admin page.
 msgid "No group specified."
 msgstr ""
 
-#: actions/groupblock.php:91
+#. TRANS: Client error displayed trying to block a user from a group while not being an admin user.
 msgid "Only an admin can block group members."
 msgstr ""
 
-#: actions/groupblock.php:95
-#, fuzzy
+#. TRANS: Client error displayed trying to block a user from a group while user is already blocked from the given group.
 msgid "User is already blocked from group."
-msgstr "למשתמש �ין פרופיל."
+msgstr "המשתמש כבר חסו� בקבוצה."
 
-#: actions/groupblock.php:100
-#, fuzzy
+#. TRANS: Client error displayed trying to block a user from a group while user is not a member of given group.
 msgid "User is not a member of group."
-msgstr "ל� שלחנו �לינו �ת הפרופיל הזה"
+msgstr "המשתמש �ינו חבר בקבוצה."
 
-#: actions/groupblock.php:134 actions/groupmembers.php:364
-#, fuzzy
+#. TRANS: Title for block user from group page.
+#. TRANS: Form legend for form to block user from a group.
 msgid "Block user from group"
-msgstr "�ין משתמש כזה."
+msgstr "לחסו� משתמש מקבוצה."
 
-#: actions/groupblock.php:160
+#. TRANS: Explanatory text for block user from group form before setting the block.
+#. TRANS: %1$s is that to be blocked user, %2$s is the group the user will be blocked from.
 #, php-format
 msgid ""
 "Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They "
@@ -2689,196 +2494,156 @@ msgid ""
 msgstr ""
 
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
-#: actions/groupblock.php:182
-#, fuzzy
-msgid "Do not block this user from this group"
-msgstr "נכשלה ההפניה לשרת: %s"
+msgid "Do not block this user from this group."
+msgstr ""
 
 #. TRANS: Submit button title for 'Yes' when blocking a user from a group.
-#: actions/groupblock.php:189
-#, fuzzy
-msgid "Block this user from this group"
-msgstr "�ין משתמש כזה."
+msgid "Block this user from this group."
+msgstr ""
 
-#: actions/groupblock.php:206
+#. TRANS: Server error displayed when trying to block a user from a group fails because of an application error.
 msgid "Database error blocking user from group."
 msgstr ""
 
-#: actions/groupbyid.php:74 actions/userbyid.php:70
+#. TRANS: Client error displayed referring to a group's permalink without providing a group ID.
+#. TRANS: Client error displayed trying to perform an action without providing an ID.
+#. TRANS: Client error displayed trying to find a user by ID without providing an ID.
 msgid "No ID."
 msgstr "�ין זיהוי Jabber כזה."
 
-#: actions/groupdesignsettings.php:68
-msgid "You must be logged in to edit a group."
-msgstr ""
-
-#: actions/groupdesignsettings.php:144
-#, fuzzy
-msgid "Group design"
-msgstr "קבוצות"
-
-#: actions/groupdesignsettings.php:155
-msgid ""
-"Customize the way your group looks with a background image and a colour "
-"palette of your choice."
-msgstr ""
-
-#. TRANS: Error message displayed if design settings could not be saved.
-#. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
-#: actions/groupdesignsettings.php:266 actions/userdesignsettings.php:186
-#: lib/designsettings.php:405 lib/designsettings.php:427
-#, fuzzy
-msgid "Couldn't update your design."
-msgstr "עידכון המשתמש נכשל."
-
-#: actions/groupdesignsettings.php:311 actions/userdesignsettings.php:231
-#, fuzzy
-msgid "Design preferences saved."
-msgstr "העדפות נשמרו."
-
-#: actions/grouplogo.php:142 actions/grouplogo.php:195
-#, fuzzy
+#. TRANS: Title for group logo settings page.
+#. TRANS: Group logo form legend.
 msgid "Group logo"
-msgstr "קבוצות"
+msgstr "סמל הקבוצה"
 
-#: actions/grouplogo.php:153
-#, fuzzy, php-format
+#. TRANS: Instructions for group logo page.
+#. TRANS: %s is the maximum file size for that site.
+#, php-format
 msgid ""
 "You can upload a logo image for your group. The maximum file size is %s."
-msgstr "זה �רוך מידי. �ורך מירבי להודעה הו� 140 �ותיות."
+msgstr "�פשר להעלות סמל לקבוצה שלך. גודל הקובץ המרבי הו� %s."
 
-#: actions/grouplogo.php:236
+#. TRANS: Submit button for uploading a group logo.
 msgid "Upload"
 msgstr "העל�ה"
 
-#: actions/grouplogo.php:289
-#, fuzzy
+#. TRANS: Button text for cropping an uploaded group logo.
 msgid "Crop"
-msgstr "קבוצות"
+msgstr "חיתוך"
 
-#: actions/grouplogo.php:365
+#. TRANS: Form instructions on the group logo page.
 msgid "Pick a square area of the image to be the logo."
 msgstr ""
 
-#: actions/grouplogo.php:399
-#, fuzzy
+#. TRANS: Form success message after updating a group logo.
 msgid "Logo updated."
-msgstr "התמונה עודכנה."
+msgstr "הסמל עודכן."
 
-#: actions/grouplogo.php:401
-#, fuzzy
+#. TRANS: Form failure message after failing to update a group logo.
 msgid "Failed updating logo."
-msgstr "עדכון התמונה נכשל."
+msgstr "עדכון הסמל נכשל."
 
 #. TRANS: Title of the page showing group members.
 #. TRANS: %s is the name of the group.
-#: actions/groupmembers.php:102
 #, php-format
 msgid "%s group members"
 msgstr ""
 
 #. TRANS: Title of the page showing group members.
 #. TRANS: %1$s is the name of the group, %2$d is the page number of the members list.
-#: actions/groupmembers.php:107
 #, php-format
 msgid "%1$s group members, page %2$d"
 msgstr ""
 
-#: actions/groupmembers.php:122
+#. TRANS: Page notice for group members page.
 msgid "A list of the users in this group."
 msgstr ""
 
-#: actions/groupmembers.php:186
-msgid "Admin"
+#. TRANS: Client error displayed when trying to approve group applicants without being a group administrator.
+msgid "Only the group admin may approve users."
 msgstr ""
 
-#. TRANS: Button text for the form that will block a user from a group.
-#: actions/groupmembers.php:399
-msgctxt "BUTTON"
-msgid "Block"
-msgstr ""
-
-#. TRANS: Submit button title.
-#: actions/groupmembers.php:403
-msgctxt "TOOLTIP"
-msgid "Block this user"
-msgstr ""
-
-#: actions/groupmembers.php:498
-msgid "Make user an admin of the group"
-msgstr ""
-
-#. TRANS: Button text for the form that will make a user administrator.
-#: actions/groupmembers.php:533
-msgctxt "BUTTON"
-msgid "Make Admin"
-msgstr ""
-
-#. TRANS: Submit button title.
-#: actions/groupmembers.php:537
-msgctxt "TOOLTIP"
-msgid "Make this user an admin"
-msgstr ""
-
-#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
-#: actions/grouprss.php:142
-#, fuzzy, php-format
-msgid "Updates from members of %1$s on %2$s!"
-msgstr "מיקרובלוג מ�ת %s"
-
-#: actions/groups.php:62 lib/profileaction.php:223 lib/profileaction.php:249
-#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
-msgid "Groups"
-msgstr "קבוצות"
-
-#: actions/groups.php:64
+#. TRANS: Title of the first page showing pending group members still awaiting approval to join the group.
+#. TRANS: %s is the name of the group.
 #, php-format
+msgid "%s group members awaiting approval"
+msgstr ""
+
+#. TRANS: Title of all but the first page showing pending group members still awaiting approval to join the group.
+#. TRANS: %1$s is the name of the group, %2$d is the page number of the members list.
+#, php-format
+msgid "%1$s group members awaiting approval, page %2$d"
+msgstr ""
+
+#. TRANS: Page notice for group members page.
+msgid "A list of users awaiting approval to join this group."
+msgstr ""
+
+#. TRANS: Message is used as link description. %1$s is a group name, %2$s is a site name.
+#, php-format
+msgid "Updates from members of %1$s on %2$s!"
+msgstr "עדכוני� מחברי %1$s ב�תר %2$s!"
+
+#. TRANS: Title for first page of the groups list.
+msgctxt "TITLE"
+msgid "Groups"
+msgstr ""
+
+#. TRANS: Title for all but the first page of the groups list.
+#. TRANS: %d is the page number.
+#, php-format
+msgctxt "TITLE"
 msgid "Groups, page %d"
 msgstr ""
 
-#: actions/groups.php:90
+#. TRANS: Page notice of group list. %%%%site.name%%%% is the StatusNet site name,
+#. TRANS: %%%%action.groupsearch%%%% and %%%%action.newgroup%%%% are URLs. Do not change them.
+#. TRANS: This message contains Markdown links in the form [link text](link).
 #, php-format
 msgid ""
 "%%%%site.name%%%% groups let you find and talk with people of similar "
 "interests. After you join a group you can send messages to all other members "
 "using the syntax \"!groupname\". Don't see a group you like? Try [searching "
-"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup"
-"%%%%)"
+"for one](%%%%action.groupsearch%%%%) or [start your own](%%%%action.newgroup%"
+"%%%)!"
 msgstr ""
 
-#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:122
-#, fuzzy
+#. TRANS: Link to create a new group on the group list page.
+#. TRANS: Link text on group page to create a new group.
+#. TRANS: Form legend for group edit form.
 msgid "Create a new group"
-msgstr "צור חשבון חדש"
+msgstr "יצירת קבוצה חדשה"
 
-#: actions/groupsearch.php:52
-#, fuzzy, php-format
+#. TRANS: Instructions for page where groups can be searched. %%site.name%% is the name of the StatusNet site.
+#, php-format
 msgid ""
 "Search for groups on %%site.name%% by their name, location, or description. "
 "Separate the terms by spaces; they must be 3 characters or more."
 msgstr ""
-"חפש �נשי� ב-%%site.name%% לפי ש�, מיקו�, �ו תחומי עניין. הפרד בעזרת רווחי� "
-"בין הביטויי�; עליה� להיות בני לפחות 3 �ותיות."
+"חפש קבוצות ב־%%site.name%% לפי ש�, מיקו�, �ו תי�ור. הפרד בעזרת רווחי� בין "
+"הביטויי�; עליה� להיות בני לפחות 3 �ותיות."
 
-#: actions/groupsearch.php:58
-#, fuzzy
+#. TRANS: Title for page where groups can be searched.
 msgid "Group search"
-msgstr "חיפוש סיסמה"
+msgstr "חיפוש קבוצה"
 
-#: actions/groupsearch.php:79 actions/noticesearch.php:117
-#: actions/peoplesearch.php:83
-#, fuzzy
+#. TRANS: Text on page where groups can be searched if no results were found for a query.
+#. TRANS: Text for notice search results is the query had no results.
+#. TRANS: Message on the "People search" page where a query has no results.
+#. TRANS: Output when there are no results for a search.
 msgid "No results."
 msgstr "�ין תוצ�ות"
 
-#: actions/groupsearch.php:82
+#. TRANS: Additional text on page where groups can be searched if no results were found for a query for a logged in user.
+#. TRANS: This message contains Markdown links in the form [link text](link).
 #, php-format
 msgid ""
-"If you can't find the group you're looking for, you can [create it](%%action."
-"newgroup%%) yourself."
+"If you cannot find the group you're looking for, you can [create it](%%"
+"action.newgroup%%) yourself."
 msgstr ""
 
-#: actions/groupsearch.php:85
+#. TRANS: Additional text on page where groups can be searched if no results were found for a query for a not logged in user.
+#. TRANS: This message contains Markdown links in the form [link text](link).
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and [create the group](%%"
@@ -2886,217 +2651,168 @@ msgid ""
 msgstr ""
 
 #. TRANS: Client error displayed when trying to unblock a user from a group without being an administrator for the group.
-#: actions/groupunblock.php:94
 msgid "Only an admin can unblock group members."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to unblock a non-blocked user from a group.
-#: actions/groupunblock.php:99
-#, fuzzy
 msgid "User is not blocked from group."
-msgstr "למשתמש �ין פרופיל."
+msgstr "המשתמש �ינו חסו� מקבוצה"
 
 #. TRANS: Server error displayed when unblocking a user from a group fails because of an unknown error.
-#: actions/groupunblock.php:131 actions/unblock.php:86
-#, fuzzy
+#. TRANS: Server error displayed when removing a user block.
 msgid "Error removing the block."
-msgstr "שגי�ה בשמירת המשתמש."
+msgstr "שגי�ה בביטול חסימה."
 
-#. TRANS: Title for instance messaging settings.
-#: actions/imsettings.php:60
+#. TRANS: Title for Instant Messaging settings.
 msgid "IM settings"
 msgstr "הגדרות הפרופיל"
 
 #. TRANS: Instant messaging settings page instructions.
 #. TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link.
 #. TRANS: the order and formatting of link text and link should remain unchanged.
-#: actions/imsettings.php:74
 #, php-format
 msgid ""
-"You can send and receive notices through Jabber/GTalk [instant messages](%%"
-"doc.im%%). Configure your address and settings below."
+"You can send and receive notices through [instant messaging](%%doc.im%%). "
+"Configure your addresses and settings below."
 msgstr ""
-"�פשר לשלוח ולקבל בודעות דרך Jabber/GTalk [instant messages](%%doc.im%%) הגדר "
-"�ת כתובתך והעדפותיך למטה."
 
-#. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
-#: actions/imsettings.php:94
-#, fuzzy
+#. TRANS: Message given in the IM settings if IM is not enabled on the site.
 msgid "IM is not available."
-msgstr "עמוד זה �ינו זמין בסוג מדיה ש�תה יכול לקבל"
+msgstr "מסרי� מידיי� �ינ� זמיני�."
 
-#. TRANS: Form legend for IM settings form.
-#. TRANS: Field label for IM address input in IM settings form.
-#: actions/imsettings.php:106 actions/imsettings.php:136
-#, fuzzy
+#. TRANS: Form note in IM settings form. %s is the type of IM address that was confirmed.
+#, php-format
+msgid "Current confirmed %s address."
+msgstr ""
+
+#. TRANS: Form note in IM settings form.
+#. TRANS: %s is the IM service name, %2$s is the IM address set.
+#, php-format
+msgid ""
+"Awaiting confirmation on this address. Check your %1$s account for a message "
+"with further instructions. (Did you add %2$s to your buddy list?)"
+msgstr ""
+
+#. TRANS: Field label for IM address.
 msgid "IM address"
 msgstr "כתובת מסרי� מידיי�"
 
-#: actions/imsettings.php:113
-msgid "Current confirmed Jabber/GTalk address."
-msgstr "כתובת מ�ושרת נוכחית של Jabber/GTalk."
-
-#. TRANS: Form note in IM settings form.
-#. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:124
+#. TRANS: Field title for IM address. %s is the IM service name.
 #, php-format
-msgid ""
-"Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
-"message with further instructions. (Did you add %s to your buddy list?)"
+msgid "%s screenname."
 msgstr ""
-"מחכה ל�ישור כתובת זו. בדוק �ת חשבון ה-Jabber/GTalk שלך לקבלת מסר ע� הור�ות "
-"נוספותץ (ה�� הוספת �ת %s לרשימת החברי� שלך?)"
 
-#. TRANS: IM address input field instructions in IM settings form.
-#. TRANS: %s is the IM address set for the site.
-#. TRANS: Do not translate "example.org". It is one of the domain names reserved for use in examples by
-#. TRANS: http://www.rfc-editor.org/rfc/rfc2606.txt. Any other domain may be owned by a legitimate
-#. TRANS: person or organization.
-#: actions/imsettings.php:143
-#, php-format
-msgid ""
-"Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
-"add %s to your buddy list in your IM client or on GTalk."
+#. TRANS: Header for IM preferences form.
+msgid "IM Preferences"
 msgstr ""
-"כתובת Jabber �ו GTalk, כגון \"UserName@example.org\". הוסף �ת %s �ל רשימת "
-"החברי� בתוכנת ההמסרי� המידיי� �ו GTalk שלך."
-
-#. TRANS: Form legend for IM preferences form.
-#: actions/imsettings.php:158
-msgid "IM preferences"
-msgstr "העדפות נשמרו."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:163
-msgid "Send me notices through Jabber/GTalk."
-msgstr "שלח לי הודעות דרך Jabber/GTalk."
+msgid "Send me notices"
+msgstr ""
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:169
-msgid "Post a notice when my Jabber/GTalk status changes."
-msgstr "פרס� הודעה כששורת הסטטוס שלי ב-Jabber/GTalk מתעדכנת."
+msgid "Post a notice when my status changes."
+msgstr ""
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:175
-#, fuzzy
-msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
-msgstr "שלח לי הודעות דרך Jabber/GTalk."
+msgid "Send me replies from people I'm not subscribed to."
+msgstr ""
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:182
-#, fuzzy
-msgid "Publish a MicroID for my Jabber/GTalk address."
-msgstr "כתובת מ�ושרת נוכחית של Jabber/GTalk."
+msgid "Publish a MicroID"
+msgstr ""
+
+#. TRANS: Server error thrown on database error updating IM preferences.
+msgid "Could not update IM preferences."
+msgstr ""
 
 #. TRANS: Confirmation message for successful IM preferences save.
-#: actions/imsettings.php:290 actions/othersettings.php:190
+#. TRANS: Confirmation message after saving preferences.
 msgid "Preferences saved."
 msgstr "העדפות נשמרו."
 
 #. TRANS: Message given saving IM address without having provided one.
-#: actions/imsettings.php:312
-msgid "No Jabber ID."
-msgstr "�ין זיהוי Jabber כזה."
+msgid "No screenname."
+msgstr ""
+
+#. TRANS: Form validation error when no transport is available setting an IM address.
+msgid "No transport."
+msgstr ""
 
 #. TRANS: Message given saving IM address that cannot be normalised.
-#: actions/imsettings.php:320
-msgid "Cannot normalize that Jabber ID"
-msgstr "ל� ניתן לנרמל �ת זהות ה-Jabber הזה"
+msgid "Cannot normalize that screenname."
+msgstr ""
 
 #. TRANS: Message given saving IM address that not valid.
-#: actions/imsettings.php:325
-msgid "Not a valid Jabber ID"
-msgstr "ל� עומד בכללי� לזיהוי Jabber"
-
-#. TRANS: Message given saving IM address that is already set.
-#: actions/imsettings.php:329
-msgid "That is already your Jabber ID."
-msgstr "זהו כבר זיהוי ה-Jabber שלך."
+msgid "Not a valid screenname."
+msgstr ""
 
 #. TRANS: Message given saving IM address that is already set for another user.
-#: actions/imsettings.php:333
-msgid "Jabber ID already belongs to another user."
-msgstr "זיהוי ה-Jabber כבר שייך למשתמש �חר."
+msgid "Screenname already belongs to another user."
+msgstr ""
 
 #. TRANS: Message given saving valid IM address that is to be confirmed.
-#. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:361
-#, php-format
-msgid ""
-"A confirmation code was sent to the IM address you added. You must approve %"
-"s for sending messages to you."
+msgid "A confirmation code was sent to the IM address you added."
 msgstr ""
-"קוד �ישור נשלח �ל כתובת המסרי� המידיי� שהוספת. עליך ל�שר �ת %s לשליחת מסרי� "
-"מידיי� �ליך."
 
 #. TRANS: Message given canceling IM address confirmation for the wrong IM address.
-#: actions/imsettings.php:391
 msgid "That is the wrong IM address."
 msgstr "זוהי כתובת מסרי� מידיי� שגויה."
 
 #. TRANS: Server error thrown on database error canceling IM address confirmation.
-#: actions/imsettings.php:400
-#, fuzzy
-msgid "Couldn't delete IM confirmation."
-msgstr "הכנסת קוד ה�ישור נכשלה."
+msgid "Could not delete confirmation."
+msgstr ""
 
 #. TRANS: Message given after successfully canceling IM address confirmation.
-#: actions/imsettings.php:405
 msgid "IM confirmation cancelled."
 msgstr "�ין קוד �ישור."
 
 #. TRANS: Message given trying to remove an IM address that is not
 #. TRANS: registered for the active user.
-#: actions/imsettings.php:427
-msgid "That is not your Jabber ID."
-msgstr "זהו ל� זיהוי ה-Jabber שלך."
+msgid "That is not your screenname."
+msgstr ""
 
-#. TRANS: Message given after successfully removing a registered IM address.
-#: actions/imsettings.php:450
-#, fuzzy
+#. TRANS: Message given after successfully removing a registered Instant Messaging address.
 msgid "The IM address was removed."
-msgstr "הכתובת הוסרה."
+msgstr "כתובת המסרי� המידיי� הוסרה."
 
-#: actions/inbox.php:59
+#. TRANS: Title for all but the first page of the inbox page.
+#. TRANS: %1$s is the user's nickname, %2$s is the page number.
 #, php-format
 msgid "Inbox for %1$s - page %2$d"
 msgstr ""
 
-#: actions/inbox.php:62
+#. TRANS: Title for the first page of the inbox page.
+#. TRANS: %s is the user's nickname.
 #, php-format
 msgid "Inbox for %s"
 msgstr ""
 
-#: actions/inbox.php:115
+#. TRANS: Instructions for user inbox page.
 msgid "This is your inbox, which lists your incoming private messages."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to sent invites while they have been disabled.
-#: actions/invite.php:40
 msgid "Invites have been disabled."
-msgstr ""
+msgstr "הזמנות כובו."
 
 #. TRANS: Client error displayed when trying to sent invites while not logged in.
 #. TRANS: %s is the StatusNet site name.
-#: actions/invite.php:44
-#, fuzzy, php-format
+#, php-format
 msgid "You must be logged in to invite other users to use %s."
-msgstr "עידכון המשתמש נכשל."
+msgstr "צריל להיכנס לחשבון כדי להזמין משתמשי� �חרי� להשתמש ב�תר %s."
 
 #. TRANS: Form validation message when providing an e-mail address that does not validate.
 #. TRANS: %s is an invalid e-mail address.
-#: actions/invite.php:77
 #, php-format
 msgid "Invalid email address: %s."
 msgstr ""
 
 #. TRANS: Page title when invitations have been sent.
-#: actions/invite.php:116
 msgid "Invitations sent"
 msgstr ""
 
 #. TRANS: Page title when inviting potential users.
-#: actions/invite.php:119
 msgid "Invite new users"
 msgstr ""
 
@@ -3104,7 +2820,6 @@ msgstr ""
 #. TRANS: is already subscribed to one or more users with the given e-mail address(es).
 #. TRANS: Plural form is based on the number of reported already subscribed e-mail addresses.
 #. TRANS: Followed by a bullet list.
-#: actions/invite.php:139
 msgid "You are already subscribed to this user:"
 msgid_plural "You are already subscribed to these users:"
 msgstr[0] ""
@@ -3112,7 +2827,6 @@ msgstr[1] ""
 
 #. TRANS: Used as list item for already subscribed users (%1$s is nickname, %2$s is e-mail address).
 #. TRANS: Used as list item for already registered people (%1$s is nickname, %2$s is e-mail address).
-#: actions/invite.php:145 actions/invite.php:159
 #, php-format
 msgctxt "INVITE"
 msgid "%1$s (%2$s)"
@@ -3121,7 +2835,6 @@ msgstr ""
 #. TRANS: Message displayed inviting users to use a StatusNet site while the invited user
 #. TRANS: already uses a this StatusNet site. Plural form is based on the number of
 #. TRANS: reported already present people. Followed by a bullet list.
-#: actions/invite.php:153
 msgid "This person is already a user and you were automatically subscribed:"
 msgid_plural ""
 "These people are already users and you were automatically subscribed to them:"
@@ -3131,7 +2844,6 @@ msgstr[1] ""
 #. TRANS: Message displayed inviting users to use a StatusNet site. Plural form is
 #. TRANS: based on the number of invitations sent. Followed by a bullet list of
 #. TRANS: e-mail addresses to which invitations were sent.
-#: actions/invite.php:167
 msgid "Invitation sent to the following person:"
 msgid_plural "Invitations sent to the following people:"
 msgstr[0] ""
@@ -3139,486 +2851,418 @@ msgstr[1] ""
 
 #. TRANS: Generic message displayed after sending out one or more invitations to
 #. TRANS: people to join a StatusNet site.
-#: actions/invite.php:177
 msgid ""
 "You will be notified when your invitees accept the invitation and register "
 "on the site. Thanks for growing the community!"
 msgstr ""
 
 #. TRANS: Form instructions.
-#: actions/invite.php:190
 msgid ""
 "Use this form to invite your friends and colleagues to use this service."
 msgstr ""
 
-#. TRANS: Field label for a list of e-mail addresses.
-#: actions/invite.php:217
-msgid "Email addresses"
-msgstr ""
-
-#. TRANS: Tooltip for field label for a list of e-mail addresses.
-#: actions/invite.php:220
-msgid "Addresses of friends to invite (one per line)"
-msgstr ""
-
-#. TRANS: Field label for a personal message to send to invitees.
-#: actions/invite.php:224
-#, fuzzy
-msgid "Personal message"
-msgstr "הודעה חדשה"
-
-#. TRANS: Tooltip for field label for a personal message to send to invitees.
-#: actions/invite.php:227
-msgid "Optionally add a personal message to the invitation."
-msgstr ""
-
-#. TRANS: Send button for inviting friends
-#: actions/invite.php:231
-#, fuzzy
-msgctxt "BUTTON"
-msgid "Send"
-msgstr "שלח"
-
 #. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral
 #. TRANS: singular 3rd-person pronoun in English. %1$s is the inviting user, $2$s is
 #. TRANS: the StatusNet sitename.
-#: actions/invite.php:263
-#, fuzzy, php-format
-msgid "%1$s has invited you to join them on %2$s"
-msgstr "%1$s כעת מ�זין להודעות שלך ב-%2$s"
-
-#. TRANS: Body text for invitation email. Note that 'them' is correct as a gender-neutral
-#. TRANS: singular 3rd-person pronoun in English. %1$s is the inviting user, %2$s is the
-#. TRANS: StatusNet sitename, %3$s is the site URL, %4$s is the personal message from the
-#. TRANS: inviting user, %s%5 a link to the timeline for the inviting user, %s$6 is a link
-#. TRANS: to register with the StatusNet site.
-#: actions/invite.php:270
 #, php-format
-msgid ""
-"%1$s has invited you to join them on %2$s (%3$s).\n"
-"\n"
-"%2$s is a micro-blogging service that lets you keep up-to-date with people "
-"you know and people who interest you.\n"
-"\n"
-"You can also share news about yourself, your thoughts, or your life online "
-"with people who know about you. It's also great for meeting new people who "
-"share your interests.\n"
-"\n"
-"%1$s said:\n"
-"\n"
-"%4$s\n"
-"\n"
-"You can see %1$s's profile page on %2$s here:\n"
-"\n"
-"%5$s\n"
-"\n"
-"If you'd like to try the service, click on the link below to accept the "
-"invitation.\n"
-"\n"
-"%6$s\n"
-"\n"
-"If not, you can ignore this message. Thanks for your patience and your "
-"time.\n"
-"\n"
-"Sincerely, %2$s\n"
-msgstr ""
+msgid "%1$s has invited you to join them on %2$s"
+msgstr "%1$s הזמין �ותך להצטרף �ליה� ב�תר %2$s"
 
-#: actions/joingroup.php:60
+#. TRANS: Client error displayed when trying to join a group while not logged in.
 msgid "You must be logged in to join a group."
 msgstr ""
 
-#: actions/joingroup.php:141
+#. TRANS: Title for join group page after joining.
 #, php-format
+msgctxt "TITLE"
 msgid "%1$s joined group %2$s"
 msgstr ""
 
-#: actions/leavegroup.php:60
-msgid "You must be logged in to leave a group."
+#. TRANS: Exception thrown when there is an unknown error joining a group.
+msgid "Unknown error joining group."
 msgstr ""
 
+#. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
-#: actions/leavegroup.php:100 lib/command.php:386
-#, fuzzy
 msgid "You are not a member of that group."
-msgstr "ל� שלחנו �לינו �ת הפרופיל הזה"
-
-#: actions/leavegroup.php:137
-#, fuzzy, php-format
-msgid "%1$s left group %2$s"
-msgstr "הסטטוס של %1$s ב-%2$s "
+msgstr "�ינך חבר בקבוצה ההי�."
 
 #. TRANS: User admin panel title
-#: actions/licenseadminpanel.php:56
 msgctxt "TITLE"
 msgid "License"
 msgstr ""
 
-#: actions/licenseadminpanel.php:67
+#. TRANS: Form instructions for the site license admin panel.
 msgid "License for this StatusNet site"
 msgstr ""
 
-#: actions/licenseadminpanel.php:139
+#. TRANS: Client error displayed selecting an invalid license in the license admin panel.
 msgid "Invalid license selection."
 msgstr ""
 
-#: actions/licenseadminpanel.php:149
+#. TRANS: Client error displayed when not specifying an owner for the all rights reserved license in the license admin panel.
 msgid ""
 "You must specify the owner of the content when using the All Rights Reserved "
 "license."
 msgstr ""
 
-#: actions/licenseadminpanel.php:156
+#. TRANS: Client error displayed selecting a too long license title in the license admin panel.
 msgid "Invalid license title. Maximum length is 255 characters."
 msgstr ""
 
-#: actions/licenseadminpanel.php:168
+#. TRANS: Client error displayed specifying an invalid license URL in the license admin panel.
 msgid "Invalid license URL."
-msgstr ""
+msgstr "כתובת רישיון ל� תקינה."
 
-#: actions/licenseadminpanel.php:171
+#. TRANS: Client error displayed specifying an invalid license image URL in the license admin panel.
 msgid "Invalid license image URL."
-msgstr ""
+msgstr "כתובת תמונת רישיון ל� תקינה."
 
-#: actions/licenseadminpanel.php:179
+#. TRANS: Client error displayed specifying an invalid license URL in the license admin panel.
 msgid "License URL must be blank or a valid URL."
 msgstr ""
 
-#: actions/licenseadminpanel.php:187
+#. TRANS: Client error displayed specifying an invalid license image URL in the license admin panel.
 msgid "License image must be blank or valid URL."
 msgstr ""
 
-#: actions/licenseadminpanel.php:239
+#. TRANS: Form legend in the license admin panel.
 msgid "License selection"
 msgstr ""
 
-#: actions/licenseadminpanel.php:245
-#, fuzzy
+#. TRANS: License option in the license admin panel.
+#. TRANS: Checkbox label to mark a list private.
 msgid "Private"
-msgstr "פרטיות"
+msgstr "פרטי"
 
-#: actions/licenseadminpanel.php:246
+#. TRANS: License option in the license admin panel.
 msgid "All Rights Reserved"
 msgstr ""
 
-#: actions/licenseadminpanel.php:247
+#. TRANS: License option in the license admin panel.
 msgid "Creative Commons"
 msgstr ""
 
-#: actions/licenseadminpanel.php:252
+#. TRANS: Dropdown field label in the license admin panel.
 msgid "Type"
-msgstr ""
+msgstr "סוג"
 
-#: actions/licenseadminpanel.php:254
-msgid "Select license"
-msgstr ""
+#. TRANS: Dropdown field instructions in the license admin panel.
+msgid "Select a license."
+msgstr "בחירת רישיון."
 
-#: actions/licenseadminpanel.php:268
+#. TRANS: Form legend in the license admin panel.
 msgid "License details"
-msgstr ""
+msgstr "פרטי רישיון"
 
-#: actions/licenseadminpanel.php:274
+#. TRANS: Field label in the license admin panel.
 msgid "Owner"
-msgstr ""
+msgstr "בעלי�"
 
-#: actions/licenseadminpanel.php:275
+#. TRANS: Field title in the license admin panel.
 msgid "Name of the owner of the site's content (if applicable)."
-msgstr ""
+msgstr "ש� בעלי תוכן ה�תר (�� זמין)."
 
-#: actions/licenseadminpanel.php:283
+#. TRANS: Field label in the license admin panel.
 msgid "License Title"
 msgstr ""
 
-#: actions/licenseadminpanel.php:284
+#. TRANS: Field title in the license admin panel.
 msgid "The title of the license."
 msgstr ""
 
-#: actions/licenseadminpanel.php:292
+#. TRANS: Field label in the license admin panel.
 msgid "License URL"
 msgstr ""
 
-#: actions/licenseadminpanel.php:293
+#. TRANS: Field title in the license admin panel.
 msgid "URL for more information about the license."
 msgstr ""
 
-#: actions/licenseadminpanel.php:300
+#. TRANS: Field label in the license admin panel.
 msgid "License Image URL"
 msgstr ""
 
-#: actions/licenseadminpanel.php:301
+#. TRANS: Field title in the license admin panel.
 msgid "URL for an image to display with the license."
 msgstr ""
 
-#: actions/licenseadminpanel.php:319
-msgid "Save license settings"
+#. TRANS: Button title in the license admin panel.
+msgid "Save license settings."
 msgstr ""
 
-#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
-msgid "Already logged in."
-msgstr "כבר מחובר."
-
-#: actions/login.php:148
+#. TRANS: Form validation error displayed when trying to log in with incorrect credentials.
 msgid "Incorrect username or password."
-msgstr "ש� משתמש �ו סיסמה ל� נכוני�."
+msgstr "ש� משתמש �ו ססמה ל� נכוני�."
 
-#: actions/login.php:154 actions/otp.php:120
-#, fuzzy
+#. TRANS: Server error displayed when during login a server error occurs.
+#. TRANS: Server error displayed when a user object could not be created trying to login using "one time password login".
 msgid "Error setting user. You are probably not authorized."
-msgstr "ל� מורשה."
+msgstr "שגי�ה בשליחת משתמש. כנר�ה �ין לך �ישור לכך."
 
-#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
+#. TRANS: Page title for login page.
 msgid "Login"
 msgstr "היכנס"
 
-#: actions/login.php:249
+#. TRANS: Form legend on login page.
 msgid "Login to site"
 msgstr ""
 
-#: actions/login.php:258 actions/register.php:491
+#. TRANS: Field label on login page.
+msgid "Username or email address"
+msgstr ""
+
+#. TRANS: Checkbox label label on login page.
+#. TRANS: Checkbox label on account registration page.
 msgid "Remember me"
 msgstr "זכור �ותי"
 
-#: actions/login.php:259 actions/register.php:493
+#. TRANS: Checkbox title on login page.
+#. TRANS: Checkbox title on account registration page.
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "בעתיד התחבר �וטומטית; ל� לשימוש במחשבי� ציבוריי�!"
 
-#: actions/login.php:269
-msgid "Lost or forgotten password?"
-msgstr "שכחת �ו �יבדת �ת הסיסמה?"
+#. TRANS: Button text for log in on login page.
+msgctxt "BUTTON"
+msgid "Login"
+msgstr ""
 
-#: actions/login.php:288
+#. TRANS: Link text for link to "reset password" on login page.
+msgid "Lost or forgotten password?"
+msgstr "ססמה נשכחה �ו הלכה ל�יבוד?"
+
+#. TRANS: Form instructions on login page before being able to change user settings.
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
-msgstr "לצרכי �בטחה, הכנס מחדש �ת ש� המשתמש והסיסמה לפני שתשנה �ת ההגדרות."
+msgstr "לצורכי �בטחה, הכנס מחדש �ת ש� המשתמש והססמה לפני שתשנה �ת ההגדרות."
 
-#: actions/login.php:292
+#. TRANS: Form instructions on login page.
 msgid "Login with your username and password."
-msgstr "ש� משתמש �ו סיסמה ל� נכוני�."
+msgstr "יש להיכנס ע� ש� משתמש וססמה."
 
-#: actions/login.php:295
-#, fuzzy, php-format
+#. TRANS: Form instructions on login page. This message contains Markdown links in the form [Link text](Link).
+#. TRANS: %%action.register%% is a link to the registration page.
+#, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
-msgstr ""
-"היכנס בעזרת ש� המשתמש והסיסמה שלך. עדיין �ין לך ש� משתמש? [הרש�](%%action."
-"register%%) לחשבון "
+msgstr "עדיין �ין לך ש� משתמש? [הירש�](%%action.register%%) לחשבון חדש"
 
-#: actions/makeadmin.php:92
+#. TRANS: Client error displayed when trying to make another user admin on the Make Admin page while not an admin.
 msgid "Only an admin can make another user an admin."
 msgstr ""
 
-#: actions/makeadmin.php:96
-#, fuzzy, php-format
+#. TRANS: Client error displayed when trying to make another user admin on the Make Admin page who already is admin.
+#. TRANS: %1$s is the user that is already admin, %2$s is the group user is already admin for.
+#, php-format
 msgid "%1$s is already an admin for group \"%2$s\"."
-msgstr "למשתמש �ין פרופיל."
+msgstr "%1$s הו� כבר מנהל בקבוצה \"%2$s\"."
 
-#: actions/makeadmin.php:133
-#, fuzzy, php-format
+#. TRANS: Server error displayed when trying to make another user admin on the Make Admin page fails
+#. TRANS: because the group membership record could not be gotten.
+#. TRANS: %1$s is the to be admin user, %2$s is the group user should be admin for.
+#, php-format
 msgid "Can't get membership record for %1$s in group %2$s."
-msgstr "נכשלה יצירת OpenID מתוך: %s"
+msgstr "ל� הצלחתי לקבל רישו� חברות עבור %1$s בקבוצה %2$s."
 
-#: actions/makeadmin.php:146
-#, fuzzy, php-format
+#. TRANS: Server error displayed when trying to make another user admin on the Make Admin page fails
+#. TRANS: because the group adminship record coud not be saved properly.
+#. TRANS: %1$s is the to be admin user, %2$s is the group user is already admin for.
+#, php-format
 msgid "Can't make %1$s an admin for group %2$s."
-msgstr "למשתמש �ין פרופיל."
+msgstr "ל� ניתן להפוך �ת %1$s למנהל של הקבוצה %2$s."
 
-#: actions/microsummary.php:69
-#, fuzzy
+#. TRANS: Client error displayed trying to make a micro summary without providing a status.
 msgid "No current status."
-msgstr "�ין תוצ�ות"
+msgstr "�ין מצב נוכחי."
 
 #. TRANS: This is the title of the form for adding a new application.
-#: actions/newapplication.php:52
 msgid "New application"
 msgstr ""
 
 #. TRANS: Client error displayed trying to add a new application while not logged in.
-#: actions/newapplication.php:65
 msgid "You must be logged in to register an application."
 msgstr ""
 
-#: actions/newapplication.php:147
+#. TRANS: Form instructions for registering a new application.
 msgid "Use this form to register a new application."
 msgstr ""
 
-#: actions/newapplication.php:184
+#. TRANS: Validation error shown when not providing a source URL in the "New application" form.
 msgid "Source URL is required."
 msgstr ""
 
-#: actions/newapplication.php:266 actions/newapplication.php:275
+#. TRANS: Server error displayed when an application could not be registered in the database through the "New application" form.
 msgid "Could not create application."
 msgstr "שמירת הפרופיל נכשלה."
 
+#. TRANS: Form validation error messages displayed when uploading an invalid application logo.
+msgid "Invalid image."
+msgstr "תמונה ל� תקינה."
+
 #. TRANS: Title for form to create a group.
-#: actions/newgroup.php:53
 msgid "New group"
-msgstr ""
+msgstr "קבוצה חדשה"
 
 #. TRANS: Client exception thrown when a user tries to create a group while banned.
-#: actions/newgroup.php:73 classes/User_group.php:485
 msgid "You are not allowed to create groups on this site."
-msgstr ""
+msgstr "�ינך מורשה ליצור קבוצות ב�תר הזה."
 
 #. TRANS: Form instructions for group create form.
-#: actions/newgroup.php:117
 msgid "Use this form to create a new group."
-msgstr ""
+msgstr "השתמש בטופס הזה כדי ליצור קבוצה חדשה."
 
-#: actions/newmessage.php:71 actions/newmessage.php:234
+#. TRANS: Page title for new direct message page.
+#. TRANS: Page title on page for sending a direct message.
 msgid "New message"
 msgstr "הודעה חדשה"
 
-#. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
-#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:501
-#, fuzzy
-msgid "You can't send a message to this user."
-msgstr "ל� שלחנו �לינו �ת הפרופיל הזה"
+#. TRANS: Client error displayed trying to send a direct message to a user while sender and
+#. TRANS: receiver are not subscribed to each other.
+msgid "You cannot send a message to this user."
+msgstr "�ינך יכול לשלוח הודעה למשתמש הזה."
 
+#. TRANS: Form validator error displayed trying to send a direct message without content.
+#. TRANS: Client error displayed trying to send a notice without content.
 #. TRANS: Command exception text shown when trying to send a direct message to another user without content.
 #. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
-#: actions/newmessage.php:144 actions/newnotice.php:140 lib/command.php:478
-#: lib/command.php:581
 msgid "No content!"
 msgstr "�ין תוכן!"
 
-#: actions/newmessage.php:161
+#. TRANS: Form validation error displayed trying to send a direct message without specifying a recipient.
 msgid "No recipient specified."
-msgstr ""
+msgstr "ל� הוגדר מקבל."
 
-#. TRANS: Error text shown when trying to send a direct message to self.
-#: actions/newmessage.php:167 lib/command.php:505
-msgid ""
-"Don't send a message to yourself; just say it to yourself quietly instead."
-msgstr ""
-
-#: actions/newmessage.php:184
-#, fuzzy
+#. TRANS: Page title after sending a direct message.
 msgid "Message sent"
-msgstr "הודעה חדשה"
+msgstr "ההודעה נשלחה"
 
+#. TRANS: Confirmation text after sending a direct message.
+#. TRANS: %s is the direct message recipient.
 #. TRANS: Message given have sent a direct message to another user.
 #. TRANS: %s is the name of the other user.
-#: actions/newmessage.php:188 lib/command.php:513
 #, php-format
 msgid "Direct message to %s sent."
-msgstr ""
+msgstr "הודעה ישירה �ל %s נשלחה."
 
-#: actions/newmessage.php:213 actions/newnotice.php:264
+#. TRANS: Page title after an AJAX error occurred on the "send direct message" page.
+#. TRANS: Page title after an AJAX error occurs on the send notice page.
 msgid "Ajax Error"
-msgstr ""
+msgstr "שגי�ת AJAX"
 
-#: actions/newnotice.php:69
+#. TRANS: Page title for sending a new notice.
+#. TRANS: Title for form to send a new notice.
+msgctxt "TITLE"
 msgid "New notice"
-msgstr "הודעה חדשה"
+msgstr "עדכון חדש"
 
-#: actions/newnotice.php:230
-#, fuzzy
+#. TRANS: Page title after sending a notice.
 msgid "Notice posted"
-msgstr "הודעות"
+msgstr "העדכון פורס�"
 
-#: actions/noticesearch.php:68
+#. TRANS: Instructions for Notice search page.
+#. TRANS: %%site.name%% is the name of the StatusNet site.
 #, 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/noticesearch.php:78
+#. TRANS: Title of the page where users can search for notices.
 msgid "Text search"
 msgstr "חיפוש טקסט"
 
-#: actions/noticesearch.php:91
-#, fuzzy, php-format
+#. TRANS: Test in RSS notice search.
+#. TRANS: %1$s is the query, %2$s is the StatusNet site name.
+#, php-format
 msgid "Search results for \"%1$s\" on %2$s"
-msgstr "חיפוש ברצף �חרי \"%s\""
+msgstr "הצגת תוצ�ות עבור \"%1$s\" ב�תר %2$s"
 
-#: actions/noticesearch.php:121
+#. TRANS: Text for logged in users making a query for notices without results.
+#. TRANS: This message contains a Markdown link.
 #, php-format
 msgid ""
 "Be the first to [post on this topic](%%%%action.newnotice%%%%?"
 "status_textarea=%s)!"
 msgstr ""
+"בו� להיות הר�שון ש[מפרס� על הנוש� הזה](%%%%action.newnotice%%%%?"
+"status_textarea=%s)!"
 
-#: actions/noticesearch.php:124
+#. TRANS: Text for not logged in users making a query for notices without results.
+#. TRANS: This message contains Markdown links.
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and be the first to "
 "[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
 msgstr ""
+"למה ל� [להירש� לחשבון](%%%%action.register%%%%) ולהיות הר�שון ש[מפרס� על "
+"הנוש� הזה](%%%%action.newnotice%%%%?status_textarea=%s)!"
 
-#: actions/noticesearchrss.php:96
-#, fuzzy, php-format
+#. TRANS: RSS notice search feed title. %s is the query.
+#, php-format
 msgid "Updates with \"%s\""
-msgstr "מיקרובלוג מ�ת %s"
+msgstr "עדכוני� ע� \"%s\""
 
-#: actions/noticesearchrss.php:98
-#, fuzzy, php-format
-msgid "Updates matching search term \"%1$s\" on %2$s!"
-msgstr "כל העידכוני� התו�מי� �ת החיפוש �חרי \"%s\""
+#. TRANS: RSS notice search feed description.
+#. TRANS: %1$s is the query, %2$s is the StatusNet site name.
+#, php-format
+msgid "Updates matching search term \"%1$s\" on %2$s."
+msgstr "עדכוני� שתו�מי� למילת החיפוש \"%1$s\" ב�תר %2$s."
 
-#: actions/nudge.php:85
+#. TRANS: Client error displayed trying to nudge a user that cannot be nudged.
 msgid ""
 "This user doesn't allow nudges or hasn't confirmed or set their email "
 "address yet."
 msgstr ""
+"המשתמש הזה ל� מ�פשר דחיפות �ו ל� �ימת �ו ל� הגדיר �ת כתובת הדו�״ל שלו עדיין."
 
-#: actions/nudge.php:94
+#. TRANS: Page title after sending a nudge.
 msgid "Nudge sent"
-msgstr ""
+msgstr "דחיפה נשלחה"
 
-#: actions/nudge.php:97
+#. TRANS: Confirmation text after sending a nudge.
 msgid "Nudge sent!"
-msgstr ""
+msgstr "דחיפה נשלחה!"
 
 #. TRANS: Message displayed to an anonymous user trying to view OAuth application list.
-#: actions/oauthappssettings.php:60
 msgid "You must be logged in to list your applications."
 msgstr ""
 
 #. TRANS: Page title for OAuth applications
-#: actions/oauthappssettings.php:76
 msgid "OAuth applications"
 msgstr ""
 
 #. TRANS: Page instructions for OAuth applications
-#: actions/oauthappssettings.php:88
 msgid "Applications you have registered"
 msgstr ""
 
 #. TRANS: Empty list message on page with OAuth applications.
-#: actions/oauthappssettings.php:141
 #, php-format
 msgid "You have not registered any applications yet."
 msgstr ""
 
 #. TRANS: Title for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:71
 msgid "Connected applications"
 msgstr ""
 
 #. TRANS: Instructions for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:83
 msgid "The following connections exist for your account."
 msgstr ""
 
 #. TRANS: Client error when trying to revoke access for an application while not being a user of it.
-#: actions/oauthconnectionssettings.php:168
-#, fuzzy
 msgid "You are not a user of that application."
-msgstr "ל� שלחנו �לינו �ת הפרופיל הזה"
+msgstr "�ינך משתמש ביישו� ההו�"
 
 #. TRANS: Client error when revoking access has failed for some reason.
 #. TRANS: %s is the application ID revoking access failed for.
-#: actions/oauthconnectionssettings.php:183
 #, php-format
 msgid "Unable to revoke access for application: %s."
-msgstr ""
+msgstr "�ין �פשרות לשלול גישה מיישו�: %s."
 
 #. TRANS: Success message after revoking access for an application.
 #. TRANS: %1$s is the application name, %2$s is the first part of the user token.
-#: actions/oauthconnectionssettings.php:202
 #, php-format
 msgid ""
 "You have successfully revoked access for %1$s and the access token starting "
@@ -3626,475 +3270,409 @@ msgid ""
 msgstr ""
 
 #. TRANS: Empty list message when no applications have been authorised yet.
-#: actions/oauthconnectionssettings.php:213
 msgid "You have not authorized any applications to use your account."
 msgstr ""
 
 #. TRANS: Note for developers in the OAuth connection settings form.
 #. TRANS: This message contains a Markdown link. Do not separate "](".
 #. TRANS: %s is the URL to the OAuth settings.
-#: actions/oauthconnectionssettings.php:233
 #, php-format
 msgid ""
 "Are you a developer? [Register an OAuth client application](%s) to use with "
 "this instance of StatusNet."
 msgstr ""
 
-#: actions/oembed.php:80 actions/shownotice.php:100
-msgid "Notice has no profile."
-msgstr "למשתמש �ין פרופיל."
+#. TRANS: Server error displayed in oEmbed action when path not found.
+#. TRANS: %s is a path.
+#, php-format
+msgid "\"%s\" not found."
+msgstr ""
 
-#: actions/oembed.php:83 actions/shownotice.php:172
+#. TRANS: Server error displayed in oEmbed action when notice not found.
+#. TRANS: %s is a notice.
+#, php-format
+msgid "Notice %s not found."
+msgstr ""
+
+#. TRANS: Server error displayed in oEmbed action when notice has not profile.
+#. TRANS: Server error displayed trying to show a notice without a connected profile.
+msgid "Notice has no profile."
+msgstr "לעדכון �ין פרופיל."
+
+#. TRANS: oEmbed title. %1$s is the author name, %2$s is the creation date.
+#. TRANS: Title of the page that shows a notice.
+#. TRANS: %1$s is a user name, %2$s is the notice creation date/time.
 #, php-format
 msgid "%1$s's status on %2$s"
 msgstr "הסטטוס של %1$s ב-%2$s "
 
+#. TRANS: Server error displayed in oEmbed action when attachment not found.
+#. TRANS: %d is an attachment ID.
+#, php-format
+msgid "Attachment %s not found."
+msgstr ""
+
+#. TRANS: Server error displayed in oEmbed request when a path is not supported.
+#. TRANS: %s is a path.
+#, php-format
+msgid "\"%s\" not supported for oembed requests."
+msgstr ""
+
 #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
-#: actions/oembed.php:168
-#, fuzzy, php-format
+#, php-format
 msgid "Content type %s not supported."
-msgstr "התחבר"
+msgstr "סוג תוגן %s �ינו נתמך"
 
 #. TRANS: Error message displaying attachments. %s is the site's base URL.
-#: actions/oembed.php:172
 #, php-format
 msgid "Only %s URLs over plain HTTP please."
 msgstr ""
 
+#. TRANS: Server error displayed in oEmbed action when request specifies an unsupported data format.
 #. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:193 actions/oembed.php:212 lib/apiaction.php:1206
-#: lib/apiaction.php:1233 lib/apiaction.php:1362
-#, fuzzy
 msgid "Not a supported data format."
-msgstr "פורמט התמונה �ינו נתמך."
+msgstr "תסדיר המידע ל� נתמך."
 
-#: actions/opensearch.php:64
+#. TRANS: Page title for profile settings.
+#, fuzzy
+msgid "Old school UI settings"
+msgstr "הגדרות הפרופיל"
+
+#. TRANS: Usage instructions for profile settings.
+msgid "If you like it \"the old way\", you can set that here."
+msgstr ""
+
+#. TRANS: Confirmation shown when user profile settings are saved.
+#. TRANS: Message after successful saving of administrative settings.
+msgid "Settings saved."
+msgstr "ההגדרות נשמרו."
+
+msgid "Only stream mode (no conversations) in timelines"
+msgstr ""
+
+msgid "Show conversation page as hierarchical trees"
+msgstr ""
+
+msgid "Show nicknames (not full names) in timelines"
+msgstr ""
+
+#. TRANS: Button text to save a list.
+msgid "Save"
+msgstr "שמור"
+
+#. TRANS: ShortName in the OpenSearch interface when trying to find users.
 msgid "People Search"
 msgstr "חיפוש �נשי�"
 
-#: actions/opensearch.php:67
-#, fuzzy
+#. TRANS: ShortName in the OpenSearch interface when trying to find notices.
 msgid "Notice Search"
-msgstr "חיפוש �נשי�"
+msgstr "חיפוש עדכוני�"
 
-#: actions/othersettings.php:59
-msgid "Other settings"
-msgstr "הגדרות הפרופיל"
+#. TRANS: Client error displayed trying to use "one time password login" when already logged in.
+#. TRANS: Client error displayed when trying to register while already logged in.
+msgid "Already logged in."
+msgstr "כבר מחובר."
 
-#. TRANS: Instructions for tab "Other" in user profile settings.
-#: actions/othersettings.php:71
-msgid "Manage various other options."
-msgstr ""
-
-#. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
-#. TRANS: user's profile settings. This message has one space at the beginning. Use your
-#. TRANS: language's word separator here if it has one (most likely a single space).
-#: actions/othersettings.php:111
-msgid " (free service)"
-msgstr ""
-
-#. TRANS: Label for dropdown with URL shortener services.
-#: actions/othersettings.php:120
-msgid "Shorten URLs with"
-msgstr ""
-
-#. TRANS: Tooltip for for dropdown with URL shortener services.
-#: actions/othersettings.php:122
-msgid "Automatic shortening service to use."
-msgstr ""
-
-#. TRANS: Label for checkbox.
-#: actions/othersettings.php:128
-#, fuzzy
-msgid "View profile designs"
-msgstr "הגדרות הפרופיל"
-
-#. TRANS: Tooltip for checkbox.
-#: actions/othersettings.php:130
-msgid "Show or hide profile designs."
-msgstr ""
-
-#. TRANS: Form validation error for form "Other settings" in user profile.
-#: actions/othersettings.php:162
-msgid "URL shortening service is too long (maximum 50 characters)."
-msgstr ""
-
-#: actions/otp.php:69
-#, fuzzy
+#. TRANS: Client error displayed trying to use "one time password login" without specifying a user.
 msgid "No user ID specified."
-msgstr "הודעה חדשה"
+msgstr "ל� צוין מזהה משתמש"
 
-#: actions/otp.php:83
-#, fuzzy
+#. TRANS: Client error displayed trying to use "one time password login" without specifying a login token.
 msgid "No login token specified."
-msgstr "הודעה חדשה"
+msgstr "ל� צוין �סימון התחברות."
 
-#: actions/otp.php:90
+#. TRANS: Client error displayed trying to use "one time password login" without requesting a login token.
 msgid "No login token requested."
 msgstr "ל� התבקש �ישור!"
 
-#: actions/otp.php:95
-#, fuzzy
+#. TRANS: Client error displayed trying to use "one time password login" while specifying an invalid login token.
 msgid "Invalid login token specified."
-msgstr "תוכן ההודעה ל� חוקי"
+msgstr "צוין �סימון התחברות ל� תקין."
 
-#: actions/otp.php:104
+#. TRANS: Client error displayed trying to use "one time password login" while specifying an expired login token.
 msgid "Login token expired."
 msgstr ""
 
-#: actions/outbox.php:58
+#. TRANS: Title for outbox for any but the fist page.
+#. TRANS: %1$s is the user nickname, %2$d is the page number.
 #, php-format
 msgid "Outbox for %1$s - page %2$d"
 msgstr ""
 
-#: actions/outbox.php:61
+#. TRANS: Title for first page of outbox.
 #, php-format
 msgid "Outbox for %s"
 msgstr ""
 
-#: actions/outbox.php:116
+#. TRANS: Instructions for outbox.
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr ""
 
-#: actions/passwordsettings.php:58
+#. TRANS: Title for page where to change password.
+msgctxt "TITLE"
 msgid "Change password"
-msgstr "שנה סיסמה"
+msgstr ""
 
-#: actions/passwordsettings.php:69
-#, fuzzy
+#. TRANS: Instructions for page where to change password.
 msgid "Change your password."
-msgstr "שנה סיסמה"
+msgstr "שינוי ססמה"
 
-#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
-#, fuzzy
+#. TRANS: Fieldset legend on page where to change password.
+#. TRANS: Fieldset legend for password reset form.
 msgid "Password change"
-msgstr "הסיסמה נשמרה."
+msgstr "שינוי ססמה"
 
-#: actions/passwordsettings.php:104
+#. TRANS: Field label on page where to change password.
 msgid "Old password"
-msgstr "סיסמה ישנה"
+msgstr "ססמה ישנה"
 
-#: actions/passwordsettings.php:108 actions/recoverpassword.php:235
+#. TRANS: Field label on page where to change password.
+#. TRANS: Field label for password reset form.
 msgid "New password"
-msgstr "סיסמה חדשה"
+msgstr "ססמה חדשה"
 
-#: actions/passwordsettings.php:109
-msgid "6 or more characters"
-msgstr "לפחות 6 �ותיות"
+#. TRANS: Field title on page where to change password.
+#. TRANS: Field title on account registration page.
+msgid "6 or more characters."
+msgstr ""
 
-#: actions/passwordsettings.php:113 actions/recoverpassword.php:240
-msgid "Same as password above"
-msgstr "זהה לסיסמה למעלה"
+#. TRANS: Field label on page where to change password. In this field the new password should be typed a second time.
+msgctxt "LABEL"
+msgid "Confirm"
+msgstr ""
 
-#: actions/passwordsettings.php:117
+#. TRANS: Field title on page where to change password.
+#. TRANS: Title for field label for password reset form where the password has to be typed again.
+#. TRANS: Field title on account registration page.
+msgid "Same as password above."
+msgstr ""
+
+#. TRANS: Button text on page where to change password.
+msgctxt "BUTTON"
 msgid "Change"
-msgstr "שנה"
+msgstr ""
 
-#: actions/passwordsettings.php:154 actions/register.php:238
-#, fuzzy
+#. TRANS: Form validation error on page where to change password.
+#. TRANS: Form validation error displayed when trying to register with too short a password.
 msgid "Password must be 6 or more characters."
-msgstr "הסיסמה חייבת להיות בת לפחות 6 �ותיות."
+msgstr "הססמה חייבת להיות בת 6 תווי� �ו יותר."
 
-#: actions/passwordsettings.php:157 actions/register.php:241
-msgid "Passwords don't match."
-msgstr "הסיסמ�ות ל� תו�מות."
+#. TRANS: Form validation error on password change when password confirmation does not match.
+#. TRANS: Form validation error displayed when trying to register with non-matching passwords.
+msgid "Passwords do not match."
+msgstr ""
 
-#: actions/passwordsettings.php:165
-msgid "Incorrect old password"
-msgstr "הסיסמה הישנה ל� נכונה"
+#. TRANS: Form validation error on page where to change password.
+msgid "Incorrect old password."
+msgstr ""
 
-#: actions/passwordsettings.php:181
+#. TRANS: Form validation error on page where to change password.
 msgid "Error saving user; invalid."
 msgstr "שגי�ה בשמירת ש� המשתמש, ל� עומד בכללי�."
 
-#: actions/passwordsettings.php:186 actions/recoverpassword.php:381
-msgid "Can't save new password."
-msgstr "ל� ניתן לשמור �ת הסיסמה"
+#. TRANS: Server error displayed on page where to change password when password change
+#. TRANS: could not be made because of a server error.
+#. TRANS: Reset password form validation error message.
+msgid "Cannot save new password."
+msgstr ""
 
-#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
+#. TRANS: Form validation notice on page where to change password.
 msgid "Password saved."
-msgstr "הסיסמה נשמרה."
+msgstr "הססמה נשמרה."
 
 #. TRANS: Title for Paths admin panel.
-#. TRANS: Menu item for site administration
-#: actions/pathsadminpanel.php:58 lib/adminpanelaction.php:371
 msgid "Paths"
 msgstr ""
 
 #. TRANS: Form instructions for Path admin panel.
-#: actions/pathsadminpanel.php:69
 msgid "Path and server settings for this StatusNet site"
 msgstr ""
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the directory that could not be read from.
-#: actions/pathsadminpanel.php:155
-#, fuzzy, php-format
+#, php-format
 msgid "Theme directory not readable: %s."
-msgstr "עמוד זה �ינו זמין בסוג מדיה ש�תה יכול לקבל"
+msgstr "תיקיית ערכות נוש� �ינה קרי�ה: %s."
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the avatar directory that could not be written to.
-#: actions/pathsadminpanel.php:163
-#, fuzzy, php-format
+#, php-format
 msgid "Avatar directory not writable: %s."
-msgstr "עמוד זה �ינו זמין בסוג מדיה ש�תה יכול לקבל"
-
-#. TRANS: Client error in Paths admin panel.
-#. TRANS: %s is the background directory that could not be written to.
-#: actions/pathsadminpanel.php:171
-#, fuzzy, php-format
-msgid "Background directory not writable: %s."
-msgstr "עמוד זה �ינו זמין בסוג מדיה ש�תה יכול לקבל"
+msgstr "תיקיית תמונות משתמש �ינה ניתנת לכתיבה: %s."
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the locales directory that could not be read from.
-#: actions/pathsadminpanel.php:181
-#, fuzzy, php-format
+#, php-format
 msgid "Locales directory not readable: %s."
-msgstr "עמוד זה �ינו זמין בסוג מדיה ש�תה יכול לקבל"
+msgstr "תיקיית הגדרות �זוריות �ינה קרי�ה: %s."
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the SSL server URL that is too long.
-#: actions/pathsadminpanel.php:189
 msgid "Invalid SSL server. The maximum length is 255 characters."
 msgstr ""
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#: actions/pathsadminpanel.php:235 actions/siteadminpanel.php:58
 msgid "Site"
 msgstr ""
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:241 actions/pathsadminpanel.php:279
-#: actions/pathsadminpanel.php:370 actions/pathsadminpanel.php:425
-#, fuzzy
 msgid "Server"
-msgstr "שיחזור"
+msgstr "שרת"
 
-#: actions/pathsadminpanel.php:242
+#. TRANS: Field title in Paths admin panel.
 msgid "Site's server hostname."
 msgstr ""
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:248 actions/pathsadminpanel.php:288
-#: actions/pathsadminpanel.php:379 actions/pathsadminpanel.php:434
 msgid "Path"
 msgstr ""
 
-#: actions/pathsadminpanel.php:249
+#. TRANS: Field title in Paths admin panel.
 msgid "Site path."
 msgstr ""
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:255
 msgid "Locale directory"
 msgstr ""
 
-#: actions/pathsadminpanel.php:256
+#. TRANS: Field title in Paths admin panel.
 msgid "Directory path to locales."
 msgstr ""
 
 #. TRANS: Checkbox label in Paths admin panel.
-#: actions/pathsadminpanel.php:263
 msgid "Fancy URLs"
 msgstr ""
 
-#: actions/pathsadminpanel.php:265
-msgid "Use fancy (more readable and memorable) URLs?"
+#. TRANS: Field title in Paths admin panel.
+msgid "Use fancy URLs (more readable and memorable)?"
 msgstr ""
 
-#: actions/pathsadminpanel.php:272
+#. TRANS: Fieldset legend in Paths admin panel.
+msgctxt "LEGEND"
 msgid "Theme"
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:281
 msgid "Server for themes."
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:290
 msgid "Web path to themes."
 msgstr ""
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:297 actions/pathsadminpanel.php:388
-#: actions/pathsadminpanel.php:443 actions/pathsadminpanel.php:495
-#, fuzzy
 msgid "SSL server"
-msgstr "שיחזור"
+msgstr "שרת SSL"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:299
 msgid "SSL server for themes (default: SSL server)."
 msgstr ""
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:306 actions/pathsadminpanel.php:397
-#: actions/pathsadminpanel.php:452
 msgid "SSL path"
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:308
 msgid "SSL path to themes (default: /theme/)."
 msgstr ""
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:315 actions/pathsadminpanel.php:406
-#: actions/pathsadminpanel.php:461
 msgid "Directory"
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:317
 msgid "Directory where themes are located."
 msgstr ""
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#: actions/pathsadminpanel.php:326
-#, fuzzy
 msgid "Avatars"
-msgstr "תמונה"
+msgstr "תמונות משתמש"
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:333
 msgid "Avatar server"
 msgstr "תמונה"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:335
 msgid "Server for avatars."
 msgstr ""
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:342
-#, fuzzy
 msgid "Avatar path"
-msgstr "התמונה עודכנה."
+msgstr "נתיב לתמונת משתמש"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:344
 msgid "Web path to avatars."
 msgstr ""
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:351
-#, fuzzy
 msgid "Avatar directory"
-msgstr "התמונה עודכנה."
+msgstr "תיקיית תמונות משתמש"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:353
 msgid "Directory where avatars are located."
 msgstr ""
 
-#. TRANS: Fieldset legend in Paths admin panel.
-#: actions/pathsadminpanel.php:364
-msgid "Backgrounds"
-msgstr ""
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:372
-msgid "Server for backgrounds."
-msgstr ""
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:381
-msgid "Web path to backgrounds."
-msgstr ""
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:390
-msgid "Server for backgrounds on SSL pages."
-msgstr ""
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:399
-msgid "Web path to backgrounds on SSL pages."
-msgstr ""
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:408
-msgid "Directory where backgrounds are located."
-msgstr ""
-
 #. TRANS: Fieldset legens in Paths admin panel.
-#. TRANS: DT element label in attachment list.
-#: actions/pathsadminpanel.php:419 lib/attachmentlist.php:99
 msgid "Attachments"
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:427
 msgid "Server for attachments."
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:436
 msgid "Web path to attachments."
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:445
 msgid "Server for attachments on SSL pages."
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:454
 msgid "Web path to attachments on SSL pages."
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:463
 msgid "Directory where attachments are located."
 msgstr ""
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#: actions/pathsadminpanel.php:472
-#, fuzzy
+msgctxt "LEGEND"
 msgid "SSL"
-msgstr "סמס"
+msgstr ""
 
 #. TRANS: Drop down option in Paths admin panel (option for "When to use SSL").
-#: actions/pathsadminpanel.php:477 actions/snapshotadminpanel.php:202
-#, fuzzy
+#. TRANS: Option in dropdown for snapshot method in admin panel for snapshots.
 msgid "Never"
-msgstr "שיחזור"
+msgstr "לעול� ל�"
 
 #. TRANS: Drop down option in Paths admin panel (option for "When to use SSL").
-#: actions/pathsadminpanel.php:479
-#, fuzzy
 msgid "Sometimes"
-msgstr "הודעות"
+msgstr "לפעמי�"
 
 #. TRANS: Drop down option in Paths admin panel (option for "When to use SSL").
-#: actions/pathsadminpanel.php:481
 msgid "Always"
 msgstr ""
 
-#: actions/pathsadminpanel.php:485
+#. TRANS: Drop down label in Paths admin panel.
 msgid "Use SSL"
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:487
 msgid "When to use SSL."
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:497
 msgid "Server to direct SSL requests to."
 msgstr ""
 
 #. TRANS: Button title text to store form data in the Paths admin panel.
-#: actions/pathsadminpanel.php:514
 #, fuzzy
-msgid "Save paths"
-msgstr "הודעה חדשה"
+msgid "Save path settings."
+msgstr "שמירת הגדרות �תר."
 
-#: actions/peoplesearch.php:52
+#. TRANS: Instructions for the "People search" page.
+#. TRANS: %%site.name%% is the name of the StatusNet site.
 #, php-format
 msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
@@ -4103,154 +3681,395 @@ msgstr ""
 "חפש �נשי� ב-%%site.name%% לפי ש�, מיקו�, �ו תחומי עניין. הפרד בעזרת רווחי� "
 "בין הביטויי�; עליה� להיות בני לפחות 3 �ותיות."
 
-#: actions/peoplesearch.php:58
+#. TRANS: Title of a page where users can search for other users.
 msgid "People search"
-msgstr "חיפוש סיסמה"
+msgstr "חיפוש �נשי�"
 
-#: actions/peopletag.php:68
-#, fuzzy, php-format
-msgid "Not a valid people tag: %s."
-msgstr "ל� עומד בכללי� ל-OpenID."
-
-#: actions/peopletag.php:142
-#, fuzzy, php-format
-msgid "Users self-tagged with %1$s - page %2$d"
-msgstr "מיקרובלוג מ�ת %s"
-
-#: actions/postnotice.php:95
-msgid "Invalid notice content."
-msgstr "גודל ל� חוקי."
-
-#: actions/postnotice.php:101
+#. TRANS: Title for list page.
+#. TRANS: %s is a list.
 #, php-format
-msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’."
+msgid "Public list %s"
+msgstr ""
+
+#. TRANS: Title for list page.
+#. TRANS: %1$s is a list, %2$d is a page number.
+#, php-format
+msgid "Public list %1$s, page %2$d"
+msgstr ""
+
+#. TRANS: Message for anonymous users on list page.
+#. TRANS: This message contains Markdown links in the form [description](link).
+#, php-format
+msgid ""
+"Lists are how you sort similar people on %%site.name%%, a [micro-blogging]"
+"(http://en.wikipedia.org/wiki/Micro-blogging) service based on the Free "
+"Software [StatusNet](http://status.net/) tool. You can then easily keep "
+"track of what they are doing by subscribing to the list's timeline."
+msgstr ""
+
+#. TRANS: Client error displayed when a tagger is expected but not provided.
+msgid "No tagger."
+msgstr ""
+
+#. TRANS: Title for list of people listed by the user.
+#. TRANS: %1$s is a list, %2$s is a username.
+#, php-format
+msgid "People listed in %1$s by %2$s"
+msgstr ""
+
+#. TRANS: Title for list of people listed by the user.
+#. TRANS: %1$s is a list, %2$s is a username, %2$s is a page number.
+#, php-format
+msgid "People listed in %1$s by %2$s, page %3$d"
+msgstr ""
+
+#. TRANS: Addition in tag membership list for creator of a tag.
+#. TRANS: Addition in tag subscribers list for creator of a tag.
+msgid "Creator"
+msgstr ""
+
+#. TRANS: Title for lists by a user page for a private tag.
+msgid "Private lists by you"
+msgstr ""
+
+#. TRANS: Title for lists by a user page for a public tag.
+msgid "Public lists by you"
+msgstr ""
+
+#. TRANS: Title for lists by a user page.
+msgid "Lists by you"
+msgstr ""
+
+#. TRANS: Title for lists by a user page.
+#. TRANS: %s is a user nickname.
+#, php-format
+msgid "Lists by %s"
+msgstr ""
+
+#. TRANS: Title for lists by a user page.
+#. TRANS: %1$s is a user nickname, %2$d is a page number.
+#, php-format
+msgid "Lists by %1$s, page %2$d"
+msgstr ""
+
+#. TRANS: Client error displayed when trying view another user's private lists.
+msgid "You cannot view others' private lists"
+msgstr ""
+
+#. TRANS: Mode selector label.
+msgid "Mode"
+msgstr ""
+
+#. TRANS: Link text to show lists for user %s.
+#, php-format
+msgid "Lists for %s"
+msgstr ""
+
+#. TRANS: Fieldset legend.
+#. TRANS: Fieldset legend on gallery action page.
+msgid "Select tag to filter"
+msgstr ""
+
+#. TRANS: Checkbox title.
+msgid "Show private tags."
+msgstr ""
+
+#. TRANS: Checkbox label to show public tags.
+msgctxt "LABEL"
+msgid "Public"
+msgstr ""
+
+#. TRANS: Checkbox title.
+msgid "Show public tags."
+msgstr ""
+
+#. TRANS: Submit button text for tag filter form.
+#. TRANS: Submit button text on gallery action page.
+msgctxt "BUTTON"
+msgid "Go"
+msgstr ""
+
+#. TRANS: Message displayed for anonymous users on page that displays lists by a user.
+#. TRANS: This message contains Markdown links in the form [description](links).
+#. TRANS: %s is a tagger nickname.
+#, php-format
+msgid ""
+"These are lists created by **%s**. Lists are how you sort similar people on %"
+"%%%site.name%%%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
+"blogging) service based on the Free Software [StatusNet](http://status.net/) "
+"tool. You can easily keep track of what they are doing by subscribing to the "
+"list's timeline."
+msgstr ""
+
+#. TRANS: Message displayed on page that displays lists by a user when there are none.
+#. TRANS: This message contains Markdown links in the form [description](links).
+#. TRANS: %s is a tagger nickname.
+#, php-format
+msgid "%s has not created any [lists](%%%%doc.lists%%%%) yet."
+msgstr ""
+
+#. TRANS: Page title. %s is a tagged user's nickname.
+#, php-format
+msgid "Lists with %s in them"
+msgstr ""
+
+#. TRANS: Page title. %1$s is a tagged user's nickname, %2$s is a page number.
+#, php-format
+msgid "Lists with %1$s, page %2$d"
+msgstr ""
+
+#. TRANS: Message displayed for anonymous users on page that displays lists for a user.
+#. TRANS: This message contains Markdown links in the form [description](links).
+#. TRANS: %s is a tagger nickname.
+#, php-format
+msgid ""
+"These are lists for **%s**. lists are how you sort similar people on %%%%"
+"site.name%%%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
+"blogging) service based on the Free Software [StatusNet](http://status.net/) "
+"tool. You can easily keep track of what they are doing by subscribing to the "
+"list's timeline."
+msgstr ""
+
+#. TRANS: Message displayed on page that displays lists a user was added to when there are none.
+#. TRANS: This message contains Markdown links in the form [description](links).
+#. TRANS: %s is a user nickname.
+#, php-format
+msgid "%s has not been [listed](%%%%doc.lists%%%%) by anyone yet."
+msgstr ""
+
+#. TRANS: Page title for list of list subscribers.
+#. TRANS: %1$s is a list, %2$s is a user nickname.
+#, php-format
+msgid "Subscribers to list %1$s by %2$s"
+msgstr ""
+
+#. TRANS: Page title for list of list subscribers.
+#. TRANS: %1$s is a list, %2$s is a user nickname, %3$d is a page number.
+#, php-format
+msgid "Subscribers to list %1$s by %2$s, page %3$d"
+msgstr ""
+
+#. TRANS: Title for page that displays lists subscribed to by a user.
+#. TRANS: %s is a profile nickname.
+#, php-format
+msgid "Lists subscribed to by %s"
+msgstr ""
+
+#. TRANS: Title for page that displays lists subscribed to by a user.
+#. TRANS: %1$s is a profile nickname, %2$d is a page number.
+#, php-format
+msgid "Lists subscribed to by %1$s, page %2$d"
+msgstr ""
+
+#. TRANS: Message displayed for anonymous users on page that displays lists subscribed to by a user.
+#. TRANS: This message contains Markdown links in the form [description](links).
+#. TRANS: %s is a profile nickname.
+#, php-format
+msgid ""
+"These are lists subscribed to by **%s**. Lists are how you sort similar "
+"people on %%%%site.name%%%%, a [micro-blogging](http://en.wikipedia.org/wiki/"
+"Micro-blogging) service based on the Free Software [StatusNet](http://status."
+"net/) tool. You can easily keep track of what they are doing by subscribing "
+"to the list's timeline."
+msgstr ""
+
+#. TRANS: Page title for AJAX form return when a disabling a plugin.
+msgctxt "plugin"
+msgid "Disabled"
+msgstr ""
+
+#. TRANS: Client error displayed when trying to use another method than POST.
+#. TRANS: Do not translate POST.
+#. TRANS: Client error displayed trying to perform any request method other than POST.
+#. TRANS: Do not translate POST.
+#. TRANS: Client error displayed when trying to use another method than POST.
+msgid "This action only accepts POST requests."
+msgstr ""
+
+#. TRANS: Client error displayed when trying to enable or disable a plugin without access rights.
+msgid "You cannot administer plugins."
+msgstr ""
+
+#. TRANS: Client error displayed when trying to enable or disable a non-existing plugin.
+msgid "No such plugin."
+msgstr ""
+
+#. TRANS: Page title for AJAX form return when enabling a plugin.
+msgctxt "plugin"
+msgid "Enabled"
+msgstr ""
+
+#. TRANS: Tab and title for plugins admin panel.
+msgctxt "TITLE"
+msgid "Plugins"
+msgstr ""
+
+#. TRANS: Instructions at top of plugin admin page.
+msgid ""
+"Additional plugins can be enabled and configured manually. See the <a href="
+"\"http://status.net/wiki/Plugins\">online plugin documentation</a> for more "
+"details."
+msgstr ""
+
+#. TRANS: Admin form section header
+msgid "Default plugins"
+msgstr ""
+
+#. TRANS: Text displayed on plugin admin page when no plugin are enabled.
+msgid ""
+"All default plugins have been disabled from the site's configuration file."
+msgstr ""
+
+#. TRANS: Client error displayed when trying to add an unindentified field to profile.
+#. TRANS: %s is a field name.
+#, php-format
+msgid "Unidentified field %s."
+msgstr ""
+
+#. TRANS: Page title.
+msgctxt "TITLE"
+msgid "Search results"
+msgstr ""
+
+#. TRANS: Error message in case a search is shorter than three characters.
+msgid "The search string must be at least 3 characters long."
 msgstr ""
 
 #. TRANS: Page title for profile settings.
-#: actions/profilesettings.php:61
 msgid "Profile settings"
 msgstr "הגדרות הפרופיל"
 
 #. TRANS: Usage instructions for profile settings.
-#: actions/profilesettings.php:73
 msgid ""
 "You can update your personal profile info here so people know more about you."
 msgstr "עדכן �ת הפרופיל ה�ישי שלך כ�ן, על מנת ש�נשי� יוכלו לדעת עליך יותר."
 
 #. TRANS: Profile settings form legend.
-#: actions/profilesettings.php:102
 msgid "Profile information"
 msgstr "הגדרות הפרופיל"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:113
+#. TRANS: Field title on account registration page.
+#. TRANS: Field title on group edit form.
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr ""
 
 #. TRANS: Field label in form for profile settings.
-#. TRANS: Label for full group name (dt). Text hidden by default.
-#: actions/profilesettings.php:117 actions/register.php:456
-#: actions/showgroup.php:252 actions/tagother.php:104
-#: lib/groupeditform.php:157 lib/userprofile.php:152
+#. TRANS: Field label on account registration page.
+#. TRANS: Field label on group edit form.
 msgid "Full name"
 msgstr "ש� מל�"
 
 #. TRANS: Field label in form for profile settings.
+#. TRANS: Field label on account registration page.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:122 actions/register.php:461
-#: lib/applicationeditform.php:236 lib/groupeditform.php:161
+#. TRANS: Field label on group edit form; points to "more info" for a group.
 msgid "Homepage"
 msgstr "�תר בית"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:125
+#. TRANS: Field title on account registration page.
 msgid "URL of your homepage, blog, or profile on another site."
 msgstr ""
 
 #. TRANS: Tooltip for field label in form for profile settings. Plural
 #. TRANS: is decided by the number of characters available for the
 #. TRANS: biography (%d).
-#: actions/profilesettings.php:133 actions/register.php:472
+#. TRANS: Text area title in form for account registration. Plural
+#. TRANS: is decided by the number of characters available for the
+#. TRANS: biography (%d).
 #, php-format
-msgid "Describe yourself and your interests in %d character"
-msgid_plural "Describe yourself and your interests in %d characters"
+msgid "Describe yourself and your interests in %d character."
+msgid_plural "Describe yourself and your interests in %d characters."
 msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:139 actions/register.php:477
-#, fuzzy
-msgid "Describe yourself and your interests"
-msgstr "ת�ר �ת עצמך ו�ת נוש�י העניין שלך ב-140 �ותיות"
+#. TRANS: Text area title on account registration page.
+msgid "Describe yourself and your interests."
+msgstr ""
 
-#. TRANS: Text area label in form for profile settings where users can provide.
+#. TRANS: Text area label in form for profile settings where users can provide
 #. TRANS: their biography.
-#: actions/profilesettings.php:143 actions/register.php:479
+#. TRANS: Text area label on account registration page.
 msgid "Bio"
 msgstr "ביוגרפיה"
 
 #. TRANS: Field label in form for profile settings.
-#. TRANS: Label for group location (dt). Text hidden by default.
-#: actions/profilesettings.php:149 actions/register.php:484
-#: actions/showgroup.php:262 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:180
-#: lib/userprofile.php:167
+#. TRANS: Field label on account registration page.
+#. TRANS: Field label on group edit form.
+#. TRANS: Dropdown option for searching in profiles.
 msgid "Location"
 msgstr "מיקו�"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:152 actions/register.php:486
-msgid "Where you are, like \"City, State (or Region), Country\""
-msgstr "מיקומך, למשל \"עיר, מדינה �ו מחוז, �רץ\""
+#. TRANS: Field title on account registration page.
+msgid "Where you are, like \"City, State (or Region), Country\"."
+msgstr ""
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:157
 msgid "Share my current location when posting notices"
 msgstr ""
 
 #. TRANS: Field label in form for profile settings.
-#: actions/profilesettings.php:165 actions/tagother.php:149
-#: actions/tagother.php:209 lib/subscriptionlist.php:106
-#: lib/subscriptionlist.php:108 lib/userprofile.php:212
+#. TRANS: Title for group tag cloud section.
+#. TRANS: %s is a group name.
 msgid "Tags"
 msgstr ""
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:168
 msgid ""
-"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- "
+"separated."
 msgstr ""
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:173
 msgid "Language"
 msgstr "שפה"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:175
-msgid "Preferred language"
+msgid "Preferred language."
 msgstr ""
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:185
 msgid "Timezone"
 msgstr ""
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:187
 msgid "What timezone are you normally in?"
 msgstr ""
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:193
+#, fuzzy
 msgid ""
 "Automatically subscribe to whoever subscribes to me (best for non-humans)"
+msgstr "לרשו� משתמשי� חדשי� למשתמש הזה ב�ופן �וטומטי."
+
+#. TRANS: Dropdown field label on profile settings, for what policies to apply when someone else tries to subscribe to your updates.
+msgid "Subscription policy"
+msgstr ""
+
+#. TRANS: Dropdown field option for following policy.
+msgid "Let anyone follow me"
+msgstr ""
+
+#. TRANS: Dropdown field option for following policy.
+msgid "Ask me first"
+msgstr ""
+
+#. TRANS: Dropdown field title on group edit form.
+msgid "Whether other users need your permission to follow your updates."
+msgstr ""
+
+#. TRANS: Checkbox label in profile settings.
+msgid "Make updates visible only to my followers"
 msgstr ""
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Plural form is used based on the maximum number of allowed
 #. TRANS: characters for the biography (%d).
-#: actions/profilesettings.php:262 actions/register.php:229
+#. TRANS: Form validation error on registration page when providing too long a bio text.
+#. TRANS: %d is the maximum number of characters for bio; used for plural.
 #, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4258,109 +4077,103 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:273 actions/siteadminpanel.php:151
+#. TRANS: Client error displayed trying to save site settings without a timezone.
 msgid "Timezone not selected."
 msgstr ""
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:281
 msgid "Language is too long (maximum 50 characters)."
 msgstr ""
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
-#: actions/profilesettings.php:295 actions/tagother.php:178
+#. TRANS: Form validation error displayed if a given tag is invalid.
+#. TRANS: %s is the invalid tag.
+#. TRANS: Error displayed if a given tag is invalid.
+#. TRANS: %s is the invalid tag.
 #, php-format
-msgid "Invalid tag: \"%s\""
-msgstr "גודל ל� חוקי."
+msgid "Invalid tag: \"%s\"."
+msgstr ""
 
 #. TRANS: Server error thrown when user profile settings could not be updated to
 #. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:351
-#, fuzzy
-msgid "Couldn't update user for autosubscribe."
-msgstr "עידכון המשתמש נכשל."
+msgid "Could not update user for autosubscribe or subscribe_policy."
+msgstr ""
 
 #. TRANS: Server error thrown when user profile location preference settings could not be updated.
-#: actions/profilesettings.php:409
-#, fuzzy
-msgid "Couldn't save location prefs."
-msgstr "שמירת הפרופיל נכשלה."
-
-#. TRANS: Server error thrown when user profile settings could not be saved.
-#: actions/profilesettings.php:422
-msgid "Couldn't save profile."
-msgstr "שמירת הפרופיל נכשלה."
+msgid "Could not save location prefs."
+msgstr ""
 
 #. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:431
-#, fuzzy
-msgid "Couldn't save tags."
+msgid "Could not save tags."
 msgstr "שמירת הפרופיל נכשלה."
 
-#. TRANS: Confirmation shown when user profile settings are saved.
-#. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:440 lib/adminpanelaction.php:138
-msgid "Settings saved."
-msgstr "ההגדרות נשמרו."
-
+#. TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
 #. TRANS: Page title for page where a user account can be restored from backup.
-#: actions/profilesettings.php:481 actions/restoreaccount.php:60
 msgid "Restore account"
 msgstr ""
 
-#: actions/public.php:83
+#. TRANS: Client error displayed when requesting a public timeline page beyond the page limit.
+#. TRANS: %s is the page limit.
 #, php-format
 msgid "Beyond the page limit (%s)."
 msgstr ""
 
-#: actions/public.php:92
+#. TRANS: Server error displayed when a public timeline cannot be retrieved.
 #, fuzzy
-msgid "Could not retrieve public stream."
-msgstr "עידכון המשתמש נכשל."
+msgid "Could not retrieve public timeline."
+msgstr "�חזור זר� ציבורי נכשל."
 
-#: actions/public.php:130
-#, fuzzy, php-format
+#. TRANS: Title for all public timeline pages but the first.
+#. TRANS: %d is the page number.
+#, php-format
 msgid "Public timeline, page %d"
-msgstr "קו זמן ציבורי"
+msgstr "קו זמן ציבורי, דף %d"
 
-#: actions/public.php:132 lib/publicgroupnav.php:79
+#. TRANS: Title for the first public timeline page.
+#. TRANS: Menu item title in search group navigation panel.
 msgid "Public timeline"
 msgstr "קו זמן ציבורי"
 
-#: actions/public.php:160
+#. TRANS: Link description for public timeline feed.
 #, fuzzy
-msgid "Public Stream Feed (RSS 1.0)"
-msgstr "הזנת זר� הציבורי"
+msgid "Public Timeline Feed (Activity Streams JSON)"
+msgstr "הזנת זר� ציבורי (Activity Streams JSON)"
 
-#: actions/public.php:164
+#. TRANS: Link description for public timeline feed.
 #, fuzzy
-msgid "Public Stream Feed (RSS 2.0)"
-msgstr "הזנת זר� הציבורי"
+msgid "Public Timeline Feed (RSS 1.0)"
+msgstr "הזנת זר� ציבורי (RSS 1.0)"
 
-#: actions/public.php:168
+#. TRANS: Link description for public timeline feed.
 #, fuzzy
-msgid "Public Stream Feed (Atom)"
-msgstr "הזנת זר� הציבורי"
+msgid "Public Timeline Feed (RSS 2.0)"
+msgstr "הזנת זר� ציבורי (RSS 1.0)"
 
-#: actions/public.php:188
+#. TRANS: Link description for public timeline feed.
+#, fuzzy
+msgid "Public Timeline Feed (Atom)"
+msgstr "הזנת זר� ציבורי (Atom)"
+
+#. TRANS: Text displayed for public feed when there are no public notices.
 #, php-format
 msgid ""
 "This is the public timeline for %%site.name%% but no one has posted anything "
 "yet."
 msgstr ""
 
-#: actions/public.php:191
+#. TRANS: Additional text displayed for public feed when there are no public notices for a logged in user.
 msgid "Be the first to post!"
 msgstr ""
 
-#: actions/public.php:195
+#. TRANS: Additional text displayed for public feed when there are no public notices for a not logged in user.
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to post!"
 msgstr ""
 
-#: actions/public.php:242
+#. TRANS: Message for not logged in users at an invite-only site trying to view the public feed of notices.
+#. TRANS: This message contains Markdown links. Please mind the formatting.
 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -4369,7 +4182,8 @@ msgid ""
 "friends, family, and colleagues! ([Read more](%%doc.help%%))"
 msgstr ""
 
-#: actions/public.php:247
+#. TRANS: Message for not logged in users at a closed site trying to view the public feed of notices.
+#. TRANS: This message contains Markdown links. Please mind the formatting.
 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -4377,15 +4191,17 @@ msgid ""
 "tool."
 msgstr ""
 
+#. TRANS: Public RSS feed description. %s is the StatusNet site name.
+#, php-format
+msgid "%s updates from everyone."
+msgstr ""
+
 #. TRANS: Title for public tag cloud.
-#: actions/publictagcloud.php:57
-#, fuzzy
 msgid "Public tag cloud"
-msgstr "הזנת זר� הציבורי"
+msgstr "ענן תגי� ציבורי"
 
 #. TRANS: Instructions (more used like an explanation/header).
 #. TRANS: %s is the StatusNet sitename.
-#: actions/publictagcloud.php:65
 #, php-format
 msgid "These are most popular recent tags on %s"
 msgstr ""
@@ -4393,14 +4209,12 @@ msgstr ""
 #. TRANS: This message contains a Markdown URL. The link description is between
 #. TRANS: square brackets, and the link between parentheses. Do not separate "]("
 #. TRANS: and do not change the URL part.
-#: actions/publictagcloud.php:74
 #, php-format
 msgid "No one has posted a notice with a [hashtag](%%doc.tags%%) yet."
 msgstr ""
 
 #. TRANS: Message shown to a logged in user for the public tag cloud
 #. TRANS: while no tags exist yet. "One" refers to the non-existing hashtag.
-#: actions/publictagcloud.php:79
 msgid "Be the first to post one!"
 msgstr ""
 
@@ -4409,241 +4223,232 @@ msgstr ""
 #. TRANS: This message contains a Markdown URL. The link description is between
 #. TRANS: square brackets, and the link between parentheses. Do not separate "]("
 #. TRANS: and do not change the URL part.
-#: actions/publictagcloud.php:87
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to post "
 "one!"
 msgstr ""
 
-#: actions/publictagcloud.php:146
-msgid "Tag cloud"
-msgstr ""
-
-#: actions/recoverpassword.php:36
+#. TRANS: Client error displayed trying to recover password while already logged in.
 msgid "You are already logged in!"
 msgstr "כבר נכנסת למערכת!"
 
-#: actions/recoverpassword.php:62
+#. TRANS: Client error displayed when password recovery code is not correct.
 msgid "No such recovery code."
 msgstr "�ין קוד שיחזור כזה."
 
-#: actions/recoverpassword.php:66
+#. TRANS: Client error displayed when no proper password recovery code was submitted.
 msgid "Not a recovery code."
 msgstr "זהו ל� קוד �ישור."
 
-#: actions/recoverpassword.php:73
+#. TRANS: Server error displayed trying to recover password without providing a user.
 msgid "Recovery code for unknown user."
 msgstr "קוד שיחזור למשתמש ל� ידוע."
 
-#: actions/recoverpassword.php:86
+#. TRANS: Server error displayed removing a password recovery code from the database.
 msgid "Error with confirmation code."
 msgstr "שגי�ה ב�ישור הקוד."
 
-#: actions/recoverpassword.php:97
+#. TRANS: Client error displayed trying to recover password with too old a recovery code.
 msgid "This confirmation code is too old. Please start again."
 msgstr "קוד �ישור זה ישן מידי. �נ� התחל מחדש."
 
-#: actions/recoverpassword.php:111
-#, fuzzy
+#. TRANS: Server error displayed when updating a user's e-mail address in the database fails while recovering a password.
 msgid "Could not update user with confirmed email address."
-msgstr "עידכון המשתמש נכשל."
+msgstr "עדכון משתמש ע� כתובת דו�ר �לקטרוני מ�ושרת ל� הצליחה."
 
-#: actions/recoverpassword.php:152
+#. TRANS: Page notice for password recovery page.
 msgid ""
 "If you have forgotten or lost your password, you can get a new one sent to "
 "the email address you have stored in your account."
 msgstr ""
 
-#: actions/recoverpassword.php:158
-msgid "You have been identified. Enter a new password below. "
+#. TRANS: Page notice for password change page.
+msgid "You have been identified. Enter a new password below."
 msgstr ""
 
-#: actions/recoverpassword.php:188
-#, fuzzy
+#. TRANS: Fieldset legend for password recovery page.
 msgid "Password recovery"
-msgstr "התבקש שיחזור סיסמה"
+msgstr "שחזור ססמה"
 
-#: actions/recoverpassword.php:191
+#. TRANS: Field label on password recovery page.
 msgid "Nickname or email address"
 msgstr ""
 
-#: actions/recoverpassword.php:193
+#. TRANS: Title for field label on password recovery page.
 msgid "Your nickname on this server, or your registered email address."
 msgstr ""
 
-#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
+#. TRANS: Field label on password recovery page.
 msgid "Recover"
 msgstr "שיחזור"
 
-#: actions/recoverpassword.php:208
-msgid "Reset password"
-msgstr "�יפוס סיסמה"
-
-#: actions/recoverpassword.php:209
-msgid "Recover password"
-msgstr "סיסמת שיחזור"
-
-#: actions/recoverpassword.php:210 actions/recoverpassword.php:335
-msgid "Password recovery requested"
-msgstr "התבקש שיחזור סיסמה"
-
-#: actions/recoverpassword.php:213
-msgid "Unknown action"
+#. TRANS: Button text on password recovery page.
+msgctxt "BUTTON"
+msgid "Recover"
 msgstr ""
 
-#: actions/recoverpassword.php:236
-msgid "6 or more characters, and don't forget it!"
-msgstr "לפחות 6 �ותיות, �ל תשכח!"
+#. TRANS: Title for password recovery page in password reset mode.
+msgid "Reset password"
+msgstr "�יפוס ססמה"
 
-#: actions/recoverpassword.php:243
+#. TRANS: Title for password recovery page in password recover mode.
+msgid "Recover password"
+msgstr "שחזור ססמה"
+
+#. TRANS: Title for password recovery page in email sent mode.
+#. TRANS: Subject for password recovery e-mail.
+msgid "Password recovery requested"
+msgstr "התבקש שחזור ססמה"
+
+#. TRANS: Title for password recovery page in password saved mode.
+msgid "Password saved"
+msgstr ""
+
+#. TRANS: Title for field label for password reset form.
+msgid "6 or more characters, and do not forget it!"
+msgstr ""
+
+#. TRANS: Button text for password reset form.
+msgctxt "BUTTON"
 msgid "Reset"
-msgstr "�יפוס"
+msgstr ""
 
-#: actions/recoverpassword.php:252
+#. TRANS: Form instructions for password recovery form.
 msgid "Enter a nickname or email address."
 msgstr ""
 
-#: actions/recoverpassword.php:282
-msgid "No user with that email address or username."
-msgstr ""
-
-#: actions/recoverpassword.php:299
-msgid "No registered email address for that user."
-msgstr ""
-
-#: actions/recoverpassword.php:313
-msgid "Error saving address confirmation."
-msgstr "שגי�ה בשמירת �ישור הכתובת."
-
-#: actions/recoverpassword.php:338
+#. TRANS: User notification after an e-mail with instructions was sent from the password recovery form.
 msgid ""
 "Instructions for recovering your password have been sent to the email "
 "address registered to your account."
 msgstr ""
 
-#: actions/recoverpassword.php:357
+#. TRANS: Client error displayed when trying to reset as password without providing a user.
 msgid "Unexpected password reset."
-msgstr "�יפוס סיסמה ל� צפוי."
+msgstr "�יפוס ססמה ל� צפוי."
 
-#: actions/recoverpassword.php:365
+#. TRANS: Reset password form validation error message.
 msgid "Password must be 6 characters or more."
 msgstr ""
 
-#: actions/recoverpassword.php:369
+#. TRANS: Reset password form validation error message.
 msgid "Password and confirmation do not match."
-msgstr "הסיסמה ו�ישורה �ינן תו�מות."
+msgstr "�ין הת�מה בין הססמה לבין �ישורה."
 
-#: actions/recoverpassword.php:388 actions/register.php:256
+#. TRANS: Server error displayed when something does wrong with the user object during password reset.
+#. TRANS: Server error displayed when saving fails during user registration.
 msgid "Error setting user."
 msgstr "שגי�ה ביצירת ש� המשתמש."
 
-#: actions/recoverpassword.php:395
+#. TRANS: Success message for user after password reset.
 msgid "New password successfully saved. You are now logged in."
-msgstr "הסיסמה החדשה נשמרה בהצלחה. �תה מחובר למערכת."
+msgstr "הססמה החדשה נשמרה בהצלחה. נכנסת עכשיו למערכת."
 
-#: actions/register.php:92 actions/register.php:196 actions/register.php:413
+#. TRANS: Client exception thrown when no ID parameter was provided.
+msgid "No id parameter."
+msgstr ""
+
+#. TRANS: Client exception thrown when an invalid ID parameter was provided for a file.
+#. TRANS: %d is the provided ID for which the file is not present (number).
+#, php-format
+msgid "No such file \"%d\"."
+msgstr ""
+
+#. TRANS: Client error displayed when trying to register to an invite-only site without an invitation.
 msgid "Sorry, only invited people can register."
 msgstr ""
 
-#: actions/register.php:99
-#, fuzzy
+#. TRANS: Client error displayed when trying to register to an invite-only site without a valid invitation.
 msgid "Sorry, invalid invitation code."
-msgstr "שגי�ה ב�ישור הקוד."
+msgstr "סליחה, קוד ה�ימות �ינו תקין."
 
-#: actions/register.php:119
+#. TRANS: Title for registration page after a succesful registration.
 msgid "Registration successful"
 msgstr ""
 
-#: actions/register.php:121 actions/register.php:512 lib/logingroupnav.php:85
+#. TRANS: Title for registration page.
+msgctxt "TITLE"
 msgid "Register"
-msgstr "הירש�"
+msgstr ""
 
-#: actions/register.php:142
+#. TRANS: Client error displayed when trying to register to a closed site.
 msgid "Registration not allowed."
 msgstr ""
 
-#: actions/register.php:209
-msgid "You can't register if you don't agree to the license."
-msgstr "ל� ניתן להירש� לל� הסכמה לרשיון"
-
-#: actions/register.php:218
-#, fuzzy
-msgid "Email address already exists."
-msgstr "כתובת זו כבר �ושרה."
-
-#: actions/register.php:251 actions/register.php:273
-msgid "Invalid username or password."
-msgstr "ש� המשתמש �ו הסיסמה ל� חוקיי�"
-
-#: actions/register.php:351
-msgid ""
-"With this form you can create a new account. You can then post notices and "
-"link up to friends and colleagues. "
+#. TRANS: Form validation error displayed when trying to register without agreeing to the site license.
+msgid "You cannot register if you do not agree to the license."
 msgstr ""
 
-#: actions/register.php:433
-#, fuzzy
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr "1 עד 64 �ותיות �נגליות קטנות �ו מספרי�, לל� סימני פיסוק �ו רווחי�."
+#. TRANS: Form validation error displayed when trying to register with an already registered e-mail address.
+msgid "Email address already exists."
+msgstr "כתובת זו כבר קיימת."
 
-#: actions/register.php:438
-msgid "6 or more characters. Required."
-msgstr " לפחות 6 �ותיות. שדה חובה."
+#. TRANS: Form validation error displayed when trying to register with an invalid username or password.
+msgid "Invalid username or password."
+msgstr "ש� המשתמש �ו הססמה ל� תקיני�."
 
-#: actions/register.php:442
-#, fuzzy
-msgid "Same as password above. Required."
-msgstr "זהה לסיסמה למעלה"
+#. TRANS: Page notice on registration page.
+msgid ""
+"With this form you can create a new account. You can then post notices and "
+"link up to friends and colleagues."
+msgstr ""
 
-#. TRANS: Link description in user account settings menu.
-#: actions/register.php:446 actions/register.php:450
-#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
+#. TRANS: Field label on account registration page. In this field the password has to be entered a second time.
+msgctxt "PASSWORD"
+msgid "Confirm"
+msgstr ""
+
+#. TRANS: Field label on account registration page.
+msgctxt "LABEL"
 msgid "Email"
 msgstr ""
 
-#: actions/register.php:447 actions/register.php:451
-msgid "Used only for updates, announcements, and password recovery"
-msgstr "לשימוש רק במקרי� של עידכוני�, הודעות מערכת, ושיחזורי סיסמ�ות"
-
-#: actions/register.php:458
-msgid "Longer name, preferably your \"real\" name"
+#. TRANS: Field title on account registration page.
+msgid "Used only for updates, announcements, and password recovery."
 msgstr ""
 
-#: actions/register.php:463
-msgid "URL of your homepage, blog, or profile on another site"
-msgstr "הכתובת של �תר הבית שלך, בלוג, �ו פרופיל ב�תר �חר "
+#. TRANS: Field title on account registration page.
+msgid "Longer name, preferably your \"real\" name."
+msgstr ""
 
-#: actions/register.php:524
+#. TRANS: Button text to register a user on account registration page.
+msgctxt "BUTTON"
+msgid "Register"
+msgstr ""
+
+#. TRANS: Copyright checkbox label in registration dialog, for private sites.
+#. TRANS: %1$s is the StatusNet sitename.
 #, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
 msgstr ""
 
-#: actions/register.php:534
+#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with a specified copyright owner.
+#. TRANS: %1$s is the license owner.
 #, php-format
 msgid "My text and files are copyright by %1$s."
 msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:538
 msgid "My text and files remain under my own copyright."
 msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:541
 msgid "All rights reserved."
 msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:546
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
 "email address, IM address, and phone number."
 msgstr ""
 
-#: actions/register.php:589
+#. TRANS: Text displayed after successful account registration.
+#. TRANS: %1$s is the registered nickname, %2$s is the profile URL.
+#. TRANS: This message contains Markdown links in the form [link text](link)
+#. TRANS: and variables in the form %%%%variable%%%%. Please mind the syntax.
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -4662,419 +4467,374 @@ msgid ""
 "Thanks for signing up and we hope you enjoy using this service."
 msgstr ""
 
-#: actions/register.php:613
+#. TRANS: Instruction text on how to deal with the e-mail address confirmation e-mail.
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
 msgstr ""
 
-#: actions/remotesubscribe.php:98
+#. TRANS: Client error displayed when an unknown error occurs while delisting a user.
+#. TRANS: %s is a username.
+#, php-format
+msgid "There was an unexpected error while delisting %s."
+msgstr ""
+
+#. TRANS: Client error displayed when an unknown error occurs while listing a user.
+#. TRANS: %s is a profile URL.
 #, php-format
 msgid ""
-"To subscribe, you can [login](%%action.login%%), or [register](%%action."
-"register%%) a new  account. If you already have an account  on a [compatible "
-"microblogging site](%%doc.openmublog%%),  enter your profile URL below."
-msgstr ""
-"כדי לעשות מנוי, עליך [להיכנס למערכת](%%action.login%%), �ו [להירש�](%%action."
-"register%%) לחשבון חדשה. �� יש לך כבר חשבון [במערכת מיקרובלוג תו�מת](%%doc."
-"openmublog%%), הכנס �ת כתובת הפרופיל שלך למטה. "
-
-#: actions/remotesubscribe.php:112
-msgid "Remote subscribe"
-msgstr "הרשמה מרוחקת"
-
-#: actions/remotesubscribe.php:124
-#, fuzzy
-msgid "Subscribe to a remote user"
-msgstr "ההרשמה �ושרה"
-
-#: actions/remotesubscribe.php:129
-msgid "User nickname"
-msgstr "כינוי משתמש"
-
-#: actions/remotesubscribe.php:130
-msgid "Nickname of the user you want to follow"
-msgstr "כינויו של המשתמש �חריו �תה רוצה לעקוב"
-
-#: actions/remotesubscribe.php:133
-msgid "Profile URL"
-msgstr "כתובת הפרופיל"
-
-#: actions/remotesubscribe.php:134
-msgid "URL of your profile on another compatible microblogging service"
-msgstr "כתובת הפרופיל שלך בשרות ביקרובלוג תו�� �חר"
-
-#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:411
-msgid "Subscribe"
-msgstr "הירש� כמנוי"
-
-#: actions/remotesubscribe.php:159
-msgid "Invalid profile URL (bad format)"
-msgstr "כתובת פרופיל ל� חוקית (פורמט ל� תקין)"
-
-#: actions/remotesubscribe.php:168
-#, fuzzy
-msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
-msgstr "Not a valid profile URL (no YADIS document)."
-
-#: actions/remotesubscribe.php:176
-msgid "That’s a local profile! Login to subscribe."
+"There was a problem listing %s. The remote server is probably not responding "
+"correctly, please try retrying later."
 msgstr ""
 
-#: actions/remotesubscribe.php:183
-#, fuzzy
-msgid "Couldn’t get a request token."
-msgstr "�סימון הבקשה ל� התקבל."
+#. TRANS: Title after removing a user from a list.
+msgid "Unlisted"
+msgstr ""
 
-#: actions/repeat.php:57
+#. TRANS: Client error displayed when trying to repeat a notice while not logged in.
 msgid "Only logged-in users can repeat notices."
-msgstr ""
+msgstr "רק משתמשי� שנכנסו לחשבון יכולי� להדהד עדכוני�."
 
-#: actions/repeat.php:64 actions/repeat.php:71
-#, fuzzy
+#. TRANS: Client error displayed when trying to repeat a notice while not providing a notice ID.
+#. TRANS: Client error displayed when trying to repeat a non-existing notice.
 msgid "No notice specified."
-msgstr "הודעה חדשה"
+msgstr "ל� צוין עדכון."
 
-#: actions/repeat.php:76
-#, fuzzy
-msgid "You can't repeat your own notice."
-msgstr "ל� ניתן להירש� לל� הסכמה לרשיון"
-
-#: actions/repeat.php:90
-#, fuzzy
-msgid "You already repeated that notice."
-msgstr "כבר נכנסת למערכת!"
-
-#: actions/repeat.php:114 lib/noticelist.php:692
+#. TRANS: Title after repeating a notice.
+#. TRANS: Repeat form status in notice list when a notice has been repeated.
 msgid "Repeated"
-msgstr "�יפוס"
+msgstr "הודהד"
 
-#: actions/repeat.php:119
-#, fuzzy
+#. TRANS: Confirmation text after repeating a notice.
 msgid "Repeated!"
-msgstr "צור"
+msgstr "הודהד!"
 
-#: actions/replies.php:126 actions/repliesrss.php:68
-#: lib/personalgroupnav.php:108
+#. TRANS: Title for first page of replies for a user.
+#. TRANS: %s is a user nickname.
+#. TRANS: RSS reply feed title. %s is a user nickname.
+#. TRANS: Menu item title in personal group navigation menu.
+#. TRANS: %s is a username.
 #, php-format
 msgid "Replies to %s"
 msgstr "תגובת עבור %s"
 
-#: actions/replies.php:128
-#, fuzzy, php-format
+#. TRANS: Title for all but the first page of replies for a user.
+#. TRANS: %1$s is a user nickname, %2$d is a page number.
+#, php-format
 msgid "Replies to %1$s, page %2$d"
-msgstr "תגובת עבור %s"
+msgstr "תגובות למשתמש %1$s, דף %2$d"
 
-#: actions/replies.php:145
-#, fuzzy, php-format
+#. TRANS: Link for feed with replies for a user.
+#. TRANS: %s is a user nickname.
+#, php-format
+msgid "Replies feed for %s (Activity Streams JSON)"
+msgstr "הזנת תגובות עבור %s� (Activity Streams JSON)"
+
+#. TRANS: Link for feed with replies for a user.
+#. TRANS: %s is a user nickname.
+#, php-format
 msgid "Replies feed for %s (RSS 1.0)"
-msgstr "הזנת הודעות של %s"
+msgstr "הזנת תגובות של %s� (RSS 1.0)"
 
-#: actions/replies.php:152
-#, fuzzy, php-format
+#. TRANS: Link for feed with replies for a user.
+#. TRANS: %s is a user nickname.
+#, php-format
 msgid "Replies feed for %s (RSS 2.0)"
-msgstr "הזנת הודעות של %s"
+msgstr "הזנת תגובות של %s� (RSS 2.0)"
 
-#: actions/replies.php:159
+#. TRANS: Link for feed with replies for a user.
+#. TRANS: %s is a user nickname.
 #, php-format
 msgid "Replies feed for %s (Atom)"
 msgstr "תגובת עבור %s"
 
-#: actions/replies.php:199
+#. TRANS: Empty list message for page with replies for a user.
+#. TRANS: %1$s and %s$s are the user nickname.
 #, php-format
 msgid ""
 "This is the timeline showing replies to %1$s but %2$s hasn't received a "
 "notice to them yet."
 msgstr ""
 
-#: actions/replies.php:204
+#. TRANS: Empty list message for page with replies for a user for the logged in user.
+#. TRANS: This message contains a Markdown link in the form [link text](link).
 #, php-format
 msgid ""
 "You can engage other users in a conversation, subscribe to more people or "
 "[join groups](%%action.groups%%)."
 msgstr ""
 
-#: actions/replies.php:206
+#. TRANS: Empty list message for page with replies for a user for all logged in users but the user themselves.
+#. TRANS: %1$s, %2$s and %3$s are a user nickname. This message contains a Markdown link in the form [link text](link).
 #, php-format
 msgid ""
 "You can try to [nudge %1$s](../%2$s) or [post something to them](%%%%action."
 "newnotice%%%%?status_textarea=%3$s)."
 msgstr ""
+"�פשר לנסות [לדחוף �ת %1$s](../%2$s) �ו [לשלוח לה� משהו](%%%%action.newnotice%"
+"%%%?status_textarea=%3$s)."
 
-#: actions/repliesrss.php:72
-#, fuzzy, php-format
-msgid "Replies to %1$s on %2$s!"
-msgstr "תגובת עבור %s"
+#. TRANS: RSS reply feed description.
+#. TRANS: %1$s is a user nickname, %2$s is the StatusNet site name.
+#, php-format
+msgid "Replies to %1$s on %2$s."
+msgstr ""
 
 #. TRANS: Client exception displayed when trying to restore an account while not logged in.
-#: actions/restoreaccount.php:78
 msgid "Only logged-in users can restore their account."
 msgstr ""
 
 #. TRANS: Client exception displayed when trying to restore an account without having restore rights.
-#: actions/restoreaccount.php:83
 msgid "You may not restore your account."
 msgstr ""
 
 #. TRANS: Client exception displayed trying to restore an account while something went wrong uploading a file.
 #. TRANS: Client exception. No file; probably just a non-AJAX submission.
-#: actions/restoreaccount.php:121 actions/restoreaccount.php:146
 msgid "No uploaded file."
 msgstr ""
 
 #. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
-#: actions/restoreaccount.php:129 lib/mediafile.php:194
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
 msgstr ""
 
 #. TRANS: Client exception.
-#: actions/restoreaccount.php:135 lib/mediafile.php:200
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form."
 msgstr ""
 
 #. TRANS: Client exception.
-#: actions/restoreaccount.php:141 lib/mediafile.php:206
 msgid "The uploaded file was only partially uploaded."
 msgstr ""
 
 #. TRANS: Client exception thrown when a temporary folder is not present to store a file upload.
-#: actions/restoreaccount.php:150 lib/mediafile.php:214
 msgid "Missing a temporary folder."
 msgstr ""
 
 #. TRANS: Client exception thrown when writing to disk is not possible during a file upload operation.
-#: actions/restoreaccount.php:154 lib/mediafile.php:218
 msgid "Failed to write file to disk."
 msgstr ""
 
 #. TRANS: Client exception thrown when a file upload operation has been stopped by an extension.
-#: actions/restoreaccount.php:158 lib/mediafile.php:222
 msgid "File upload stopped by extension."
 msgstr ""
 
 #. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
-#: actions/restoreaccount.php:164 lib/imagefile.php:103 lib/mediafile.php:228
+#. TRANS: Exception thrown when uploading an image fails for an unknown reason.
+#. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
 msgid "System error uploading file."
 msgstr "שגי�ת מערכת בהעל�ת הקובץ."
 
 #. TRANS: Client exception thrown when a feed is not an Atom feed.
-#: actions/restoreaccount.php:207
+#. TRANS: Client exception thrown when an imported feed is not an Atom feed.
 msgid "Not an Atom feed."
 msgstr ""
 
 #. TRANS: Success message when a feed has been restored.
-#: actions/restoreaccount.php:241
 msgid ""
 "Feed has been restored. Your old posts should now appear in search and your "
 "profile page."
 msgstr ""
 
 #. TRANS: Message when a feed restore is in progress.
-#: actions/restoreaccount.php:245
 msgid "Feed will be restored. Please wait a few minutes for results."
 msgstr ""
 
 #. TRANS: Form instructions for feed restore.
-#: actions/restoreaccount.php:342
 msgid ""
-"You can upload a backed-up stream in <a href=\"http://activitystrea.ms/"
+"You can upload a backed-up timeline in <a href=\"http://activitystrea.ms/"
 "\">Activity Streams</a> format."
 msgstr ""
 
 #. TRANS: Title for submit button to confirm upload of a user backup file for account restore.
-#: actions/restoreaccount.php:373
 msgid "Upload the file"
 msgstr ""
 
-#: actions/revokerole.php:75
-#, fuzzy
+#. TRANS: Client error displayed when trying to revoke a role without having the right to do that.
 msgid "You cannot revoke user roles on this site."
-msgstr "ל� שלחנו �לינו �ת הפרופיל הזה"
+msgstr "�ינך יכול לבטל תפקידי משתמש ב�תר הזה."
 
-#: actions/revokerole.php:82
-#, fuzzy
-msgid "User doesn't have this role."
-msgstr "למשתמש �ין פרופיל."
+#. TRANS: Client error displayed when trying to revoke a role that is not set.
+msgid "User does not have this role."
+msgstr ""
 
-#: actions/rsd.php:146 actions/version.php:159
+#. TRANS: Engine name for RSD.
+#. TRANS: Engine name.
 msgid "StatusNet"
 msgstr "סטטיסטיקה"
 
-#: actions/sandbox.php:65 actions/unsandbox.php:65
-#, fuzzy
+#. TRANS: Client error displayed trying to sandbox users on a site where the feature is not enabled.
+#. TRANS: Client error on page to unsandbox a user when the feature is not enabled.
 msgid "You cannot sandbox users on this site."
-msgstr "ל� שלחנו �לינו �ת הפרופיל הזה"
+msgstr "�ינל יכול להכניס משתמשי� ל�רגז חול ב�תר הזה."
 
-#: actions/sandbox.php:72
-#, fuzzy
+#. TRANS: Client error displayed trying to sandbox an already sandboxed user.
 msgid "User is already sandboxed."
-msgstr "למשתמש �ין פרופיל."
+msgstr "המשתמש כבר הוכנס ל�רגז חול."
 
-#. TRANS: Menu item for site administration
-#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
-#: lib/adminpanelaction.php:379
+#. TRANS: Client error displayed when trying to list a profile with an invalid list.
+#. TRANS: %s is the invalid list name.
+#, php-format
+msgid "Not a valid list: %s."
+msgstr ""
+
+#. TRANS: Page title for page showing self tags.
+#. TRANS: %1$s is a tag, %2$d is a page number.
+#, php-format
+msgid "Users self-tagged with %1$s, page %2$d"
+msgstr ""
+
+#. TRANS: Title for the sessions administration panel.
+msgctxt "TITLE"
 msgid "Sessions"
 msgstr ""
 
-#: actions/sessionsadminpanel.php:65
+#. TRANS: Instructions for the sessions administration panel.
 msgid "Session settings for this StatusNet site"
 msgstr ""
 
-#: actions/sessionsadminpanel.php:175
+#. TRANS: Fieldset legend on the sessions administration panel.
+msgctxt "LEGEND"
+msgid "Sessions"
+msgstr ""
+
+#. TRANS: Checkbox title on the sessions administration panel.
+#. TRANS: Indicates if StatusNet should handle session administration.
 msgid "Handle sessions"
 msgstr ""
 
-#: actions/sessionsadminpanel.php:177
-msgid "Whether to handle sessions ourselves."
+#. TRANS: Checkbox title on the sessions administration panel.
+#. TRANS: Indicates if StatusNet should handle session administration.
+msgid "Handle sessions ourselves."
 msgstr ""
 
-#: actions/sessionsadminpanel.php:181
+#. TRANS: Checkbox label on the sessions administration panel.
+#. TRANS: Indicates if StatusNet should write session debugging output.
 msgid "Session debugging"
 msgstr ""
 
-#: actions/sessionsadminpanel.php:183
-msgid "Turn on debugging output for sessions."
+#. TRANS: Checkbox title on the sessions administration panel.
+msgid "Enable debugging output for sessions."
 msgstr ""
 
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-msgid "Save site settings"
-msgstr "הגדרות הפרופיל"
+#. TRANS: Title for submit button on the sessions administration panel.
+msgid "Save session settings"
+msgstr ""
 
-#: actions/showapplication.php:82
+#. TRANS: Client error displayed trying to display an OAuth application while not logged in.
 msgid "You must be logged in to view an application."
 msgstr ""
 
-#: actions/showapplication.php:157
-#, fuzzy
+#. TRANS: Header on the OAuth application page.
 msgid "Application profile"
-msgstr "להודעה �ין פרופיל"
+msgstr "דף יישו�"
 
-#. TRANS: Form input field label for application icon.
-#: actions/showapplication.php:159 lib/applicationeditform.php:173
-msgid "Icon"
-msgstr ""
-
-#. TRANS: Form input field label for application name.
-#: actions/showapplication.php:169 actions/version.php:197
-#: lib/applicationeditform.php:190
-#, fuzzy
-msgid "Name"
-msgstr "כינוי"
-
-#. TRANS: Form input field label.
-#: actions/showapplication.php:178 lib/applicationeditform.php:227
-#, fuzzy
-msgid "Organization"
-msgstr "מיקו�"
-
-#. TRANS: Form input field label.
-#: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:175
-#, fuzzy
-msgid "Description"
-msgstr "הרשמות"
-
-#. TRANS: Header for group statistics on a group page (h2).
-#: actions/showapplication.php:192 actions/showgroup.php:448
-#: lib/profileaction.php:187
-msgid "Statistics"
-msgstr "סטטיסטיקה"
-
-#: actions/showapplication.php:203
+#. TRANS: Information output on an OAuth application page.
+#. TRANS: %1$s is the application creator, %2$s is "read-only" or "read-write",
+#. TRANS: %3$d is the number of users using the OAuth application.
 #, php-format
-msgid "Created by %1$s - %2$s access by default - %3$d users"
-msgstr ""
+msgid "Created by %1$s - %2$s access by default - %3$d user"
+msgid_plural "Created by %1$s - %2$s access by default - %3$d users"
+msgstr[0] ""
+msgstr[1] ""
 
-#: actions/showapplication.php:213
+#. TRANS: Header on the OAuth application page.
 msgid "Application actions"
 msgstr ""
 
-#: actions/showapplication.php:236
+#. TRANS: Link text to edit application on the OAuth application page.
+msgctxt "EDITAPP"
+msgid "Edit"
+msgstr ""
+
+#. TRANS: Button text on the OAuth application page.
+#. TRANS: Resets the OAuth consumer key and secret.
 msgid "Reset key & secret"
 msgstr ""
 
-#: actions/showapplication.php:252 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:66 lib/noticelist.php:673
-#, fuzzy
-msgid "Delete"
-msgstr "מחק"
-
-#: actions/showapplication.php:261
+#. TRANS: Header on the OAuth application page.
 msgid "Application info"
 msgstr ""
 
-#: actions/showapplication.php:263
+#. TRANS: Field label on application page.
 msgid "Consumer key"
 msgstr ""
 
-#: actions/showapplication.php:268
+#. TRANS: Field label on application page.
 msgid "Consumer secret"
 msgstr ""
 
-#: actions/showapplication.php:273
+#. TRANS: Field label on application page.
+#, fuzzy
 msgid "Request token URL"
-msgstr ""
+msgstr "�סימון בקשה בלתי־תקין."
 
-#: actions/showapplication.php:278
+#. TRANS: Field label on application page.
 msgid "Access token URL"
 msgstr ""
 
-#: actions/showapplication.php:283
+#. TRANS: Field label on application page.
+#, fuzzy
 msgid "Authorize URL"
-msgstr ""
+msgstr "כתובת המקור"
 
-#: actions/showapplication.php:288
+#. TRANS: Note on the OAuth application page about signature support.
 msgid ""
-"Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
-"signature method."
+"Note: HMAC-SHA1 signatures are supported. The plaintext signature method is "
+"not supported."
 msgstr ""
 
-#: actions/showapplication.php:309
+#. TRANS: Text in confirmation dialog to reset consumer key and secret for an OAuth application.
 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr ""
 
-#: actions/showfavorites.php:79
-#, fuzzy, php-format
+#. TRANS: Title for all but the first page of favourite notices of a user.
+#. TRANS: %1$s is the user for whom the favourite notices are displayed, %2$d is the page number.
+#, php-format
 msgid "%1$s's favorite notices, page %2$d"
-msgstr "%s וחברי�"
+msgstr "העדכוני� ה�הובי� של %1$s, דף %2$d"
 
-#: actions/showfavorites.php:132
-#, fuzzy
+#. TRANS: Server error displayed when favourite notices could not be retrieved from the database.
 msgid "Could not retrieve favorite notices."
-msgstr "שמירת הפרופיל נכשלה."
+msgstr "�חזור עדכוני� �הובי� ל� הצליח."
 
-#: actions/showfavorites.php:171
-#, fuzzy, php-format
+#. TRANS: Feed link text. %s is a username.
+#, php-format
+msgid "Feed for favorites of %s (Activity Streams JSON)"
+msgstr "הזנות ה�הובי� של %s� (Activity Streams JSON)"
+
+#. TRANS: Feed link text. %s is a username.
+#, php-format
 msgid "Feed for favorites of %s (RSS 1.0)"
-msgstr "הזנות החברי� של %s"
+msgstr "הזנת ה�הובי� של %s� (RSS 1.0)"
 
-#: actions/showfavorites.php:178
-#, fuzzy, php-format
+#. TRANS: Feed link text. %s is a username.
+#, php-format
 msgid "Feed for favorites of %s (RSS 2.0)"
-msgstr "הזנות החברי� של %s"
+msgstr "הזנות ה�הובי� של %s� (RSS 2.0)"
 
-#: actions/showfavorites.php:185
-#, fuzzy, php-format
+#. TRANS: Feed link text. %s is a username.
+#, php-format
 msgid "Feed for favorites of %s (Atom)"
-msgstr "הזנות החברי� של %s"
+msgstr "הזנות ה�הובי� של %s� (Atom)"
 
-#: actions/showfavorites.php:206
+#. TRANS: Text displayed instead of favourite notices for the current logged in user that has no favourites.
 msgid ""
 "You haven't chosen any favorite notices yet. Click the fave button on "
 "notices you like to bookmark them for later or shed a spotlight on them."
 msgstr ""
 
-#: actions/showfavorites.php:208
+#. TRANS: Text displayed instead of favourite notices for a user that has no favourites while logged in.
+#. TRANS: %s is a username.
 #, php-format
 msgid ""
 "%s hasn't added any favorite notices yet. Post something interesting they "
 "would add to their favorites :)"
 msgstr ""
 
-#: actions/showfavorites.php:212
+#. TRANS: Text displayed instead of favourite notices for a user that has no favourites while not logged in.
+#. TRANS: %s is a username, %%%%action.register%%%% is a link to the user registration page.
+#. TRANS: (link text)[link] is a Mark Down link.
 #, php-format
 msgid ""
 "%s hasn't added any favorite notices yet. Why not [register an account](%%%%"
@@ -5082,111 +4842,50 @@ msgid ""
 "their favorites :)"
 msgstr ""
 
-#: actions/showfavorites.php:243
+#. TRANS: Page notice for show favourites page.
 msgid "This is a way to share what you like."
 msgstr ""
 
 #. TRANS: Page title for first group page. %s is a group name.
-#: actions/showgroup.php:75
 #, php-format
 msgid "%s group"
 msgstr ""
 
 #. TRANS: Page title for any but first group page.
 #. TRANS: %1$s is a group name, $2$s is a page number.
-#: actions/showgroup.php:79
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s group, page %2$d"
-msgstr "כל המנויי�"
-
-#. TRANS: Group profile header (h2). Text hidden by default.
-#: actions/showgroup.php:220
-msgid "Group profile"
-msgstr "למשתמש �ין פרופיל."
-
-#. TRANS: Label for group URL (dt). Text hidden by default.
-#: actions/showgroup.php:270 actions/tagother.php:118
-#: actions/userauthorization.php:175 lib/userprofile.php:180
-msgid "URL"
-msgstr ""
-
-#. TRANS: Label for group description or group note (dt). Text hidden by default.
-#: actions/showgroup.php:282 actions/tagother.php:128
-#: actions/userauthorization.php:187 lib/userprofile.php:197
-#, fuzzy
-msgid "Note"
-msgstr "הודעות"
-
-#. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:293 lib/groupeditform.php:187
-msgid "Aliases"
-msgstr ""
-
-#. TRANS: Group actions header (h2). Text hidden by default.
-#: actions/showgroup.php:304
-#, fuzzy
-msgid "Group actions"
-msgstr "קבוצות"
+msgstr "הקבוצה %1$s, דף %2$d"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:345
-#, fuzzy, php-format
+#, php-format
+msgid "Notice feed for %s group (Activity Streams JSON)"
+msgstr "הזנת עדכוני� של הקבוצה %s� (Activity Streams JSON)"
+
+#. TRANS: Tooltip for feed link. %s is a group nickname.
+#, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
-msgstr "הזנת הודעות של %s"
+msgstr "הזנת עדכוני� של הקבוצה %s� (RSS 1.0)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:352
-#, fuzzy, php-format
+#, php-format
 msgid "Notice feed for %s group (RSS 2.0)"
-msgstr "הזנת הודעות של %s"
+msgstr "הזנת עדכוני� של הקבוצה %s� (RSS 2.0)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:359
-#, fuzzy, php-format
+#, php-format
 msgid "Notice feed for %s group (Atom)"
-msgstr "הזנת הודעות של %s"
+msgstr "הזנת עדכוני� של הקבוצה %s� (Atom)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:365
-#, fuzzy, php-format
+#, php-format
 msgid "FOAF for %s group"
-msgstr "הזנת הודעות של %s"
-
-#. TRANS: Header for mini list of group members on a group page (h2).
-#: actions/showgroup.php:402
-#, fuzzy
-msgid "Members"
-msgstr "חבר מ�ז"
-
-#. TRANS: Description for mini list of group members on a group page when the group has no members.
-#: actions/showgroup.php:408 lib/profileaction.php:117
-#: lib/profileaction.php:152 lib/profileaction.php:255 lib/section.php:95
-#: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71
-msgid "(None)"
-msgstr ""
-
-#. TRANS: Link to all group members from mini list of group members if group has more than n members.
-#: actions/showgroup.php:417
-msgid "All members"
-msgstr ""
-
-#. TRANS: Label for creation date in statistics on group page.
-#: actions/showgroup.php:453
-msgctxt "LABEL"
-msgid "Created"
-msgstr ""
-
-#. TRANS: Label for member count in statistics on group page.
-#: actions/showgroup.php:461
-msgctxt "LABEL"
-msgid "Members"
-msgstr ""
+msgstr "חברי� של חברי� עבר הקבוצה %s"
 
 #. TRANS: Notice on group pages for anonymous users for StatusNet sites that accept new registrations.
-#. TRANS: **%s** is the group alias, %%%%site.name%%%% is the site name,
+#. TRANS: %s is the group name, %%%%site.name%%%% is the site name,
 #. TRANS: %%%%action.register%%%% is the URL for registration, %%%%doc.help%%%% is a URL to help.
 #. TRANS: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
-#: actions/showgroup.php:476
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5197,130 +4896,209 @@ msgid ""
 msgstr ""
 
 #. TRANS: Notice on group pages for anonymous users for StatusNet sites that accept no new registrations.
-#. TRANS: **%s** is the group alias, %%%%site.name%%%% is the site name,
+#. TRANS: %s is the group name, %%%%site.name%%%% is the site name,
 #. TRANS: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
-#: actions/showgroup.php:486
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
 "wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
 "[StatusNet](http://status.net/) tool. Its members share short messages about "
-"their life and interests. "
-msgstr ""
-
-#. TRANS: Header for list of group administrators on a group page (h2).
-#: actions/showgroup.php:515
-msgid "Admins"
+"their life and interests."
 msgstr ""
 
 #. TRANS: Client error displayed requesting a single message that does not exist.
-#: actions/showmessage.php:79
-#, fuzzy
 msgid "No such message."
-msgstr "�ין משתמש כזה."
+msgstr "�ין הודעה כז�ת."
 
 #. TRANS: Client error displayed requesting a single direct message the requesting user was not a party in.
-#: actions/showmessage.php:97
 msgid "Only the sender and recipient may read this message."
 msgstr ""
 
 #. TRANS: Page title for single direct message display when viewing user is the sender.
 #. TRANS: %1$s is the addressed user's nickname, $2$s is a timestamp.
-#: actions/showmessage.php:110
 #, php-format
 msgid "Message to %1$s on %2$s"
 msgstr ""
 
 #. TRANS: Page title for single message display.
 #. TRANS: %1$s is the sending user's nickname, $2$s is a timestamp.
-#: actions/showmessage.php:118
 #, php-format
 msgid "Message from %1$s on %2$s"
 msgstr ""
 
-#: actions/shownotice.php:90
-#, fuzzy
+#. TRANS: Client exception thrown when trying a view a notice the user has no access to.
+msgid "Not available."
+msgstr ""
+
+#. TRANS: Client error displayed trying to show a deleted notice.
 msgid "Notice deleted."
-msgstr "הודעות"
+msgstr "העדכון נמחק."
 
-#. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
-#: actions/showstream.php:70
+#. TRANS: Title for private list timeline.
+#. TRANS: %1$s is a list, %2$s is a page number.
 #, php-format
-msgid "%1$s tagged %2$s"
+msgid "Private timeline for %1$s list by you, page %2$d"
 msgstr ""
 
-#. TRANS: Page title showing tagged notices in one user's stream.
-#. TRANS: %1$s is the username, %2$s is the hash tag, %1$d is the page number.
-#: actions/showstream.php:74
+#. TRANS: Title for public list timeline where the viewer is the tagger.
+#. TRANS: %1$s is a list, %2$s is a page number.
 #, php-format
-msgid "%1$s tagged %2$s, page %3$d"
+msgid "Timeline for %1$s list by you, page %2$d"
 msgstr ""
 
-#. TRANS: Extended page title showing tagged notices in one user's stream.
+#. TRANS: Title for private list timeline.
+#. TRANS: %1$s is a list, %2$s is the tagger's nickname, %3$d is a page number.
+#, php-format
+msgid "Timeline for %1$s list by %2$s, page %3$d"
+msgstr ""
+
+#. TRANS: Title for private list timeline.
+#. TRANS: %s is a list.
+#, php-format
+msgid "Private timeline of %s list by you"
+msgstr ""
+
+#. TRANS: Title for public list timeline where the viewer is the tagger.
+#. TRANS: %s is a list.
+#, php-format
+msgid "Timeline for %s list by you"
+msgstr ""
+
+#. TRANS: Title for private list timeline.
+#. TRANS: %1$s is a list, %2$s is the tagger's nickname.
+#, php-format
+msgid "Timeline for %1$s list by %2$s"
+msgstr ""
+
+#. TRANS: Feed title.
+#. TRANS: %1$s is a list, %2$s is tagger's nickname.
+#, php-format
+msgid "Feed for %1$s list by %2$s (Atom)"
+msgstr ""
+
+#. TRANS: Empty list message for list timeline.
+#. TRANS: %1$s is a list, %2$s is a tagger's nickname.
+#, php-format
+msgid ""
+"This is the timeline for %1$s list by %2$s but no one has posted anything "
+"yet."
+msgstr ""
+
+#. TRANS: Additional empty list message for list timeline for currently logged in user tagged tags.
+msgid "Try tagging more people."
+msgstr ""
+
+#. TRANS: Additional empty list message for list timeline.
+#. TRANS: This message contains Markdown links in the form [description](link).
+#, php-format
+msgid ""
+"Why not [register an account](%%%%action.register%%%%) and start following "
+"this timeline!"
+msgstr ""
+
+#. TRANS: Header on show list page.
+#. TRANS: Link description for link to list of users tagged with a tag (so part of a list).
+msgid "Listed"
+msgstr ""
+
+#. TRANS: Content of "Listed" page if there are no listed users.
+#. TRANS: Content of "People following tag x" if there are no subscribed users.
+#. TRANS: Description for mini list of group members on a group page when the group has no members.
+#. TRANS: Empty list message for tags.
+#. TRANS: Text for user subscription statistics if the user has no subscriptions.
+#. TRANS: Text for user subscriber statistics if user has no subscribers.
+#. TRANS: Text for user user group membership statistics if user is not a member of any group.
+#. TRANS: Default content for section/sidebar widget.
+msgid "(None)"
+msgstr ""
+
+#. TRANS: Link for more "People in list x by a user"
+#. TRANS: if there are more than the mini list's maximum.
+msgid "Show all"
+msgstr ""
+
+#. TRANS: Header for tag subscribers.
+#. TRANS: Link description for link to list of users subscribed to a tag.
+msgid "Subscribers"
+msgstr "מנויי�"
+
+#. TRANS: Page title showing tagged notices in one user's timeline.
+#. TRANS: %1$s is the username, %2$s is the hash tag.
+#, php-format
+msgid "Notices by %1$s tagged %2$s"
+msgstr ""
+
+#. TRANS: Page title showing tagged notices in one user's timeline.
+#. TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number.
+#, php-format
+msgid "Notices by %1$s tagged %2$s, page %3$d"
+msgstr ""
+
+#. TRANS: Extended page title showing tagged notices in one user's timeline.
 #. TRANS: %1$s is the username, %2$d is the page number.
-#: actions/showstream.php:82
-#, fuzzy, php-format
-msgid "%1$s, page %2$d"
-msgstr "%s וחברי�"
+#, php-format
+msgid "Notices by %1$s, page %2$d"
+msgstr ""
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %1$s is a user nickname, %2$s is a hashtag.
-#: actions/showstream.php:127
-#, fuzzy, php-format
+#, php-format
 msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
-msgstr "הזנת הודעות של %s"
+msgstr "הזנת עדכוני� של %1$s ע� התג %2$s� (RSS 1.0)"
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %s is a user nickname.
-#: actions/showstream.php:136
-#, fuzzy, php-format
+#, php-format
+msgid "Notice feed for %s (Activity Streams JSON)"
+msgstr "הזנת עדכוני� של %s� (Activity Streams JSON)"
+
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#, php-format
 msgid "Notice feed for %s (RSS 1.0)"
-msgstr "הזנת הודעות של %s"
+msgstr "הזנת עדכוני� של %s� (RSS 1.0)"
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %s is a user nickname.
-#: actions/showstream.php:145
-#, fuzzy, php-format
+#, php-format
 msgid "Notice feed for %s (RSS 2.0)"
-msgstr "הזנת הודעות של %s"
+msgstr "הזנת עדכוני� של %s� (RSS 2.0)"
 
-#: actions/showstream.php:152
-#, fuzzy, php-format
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#, php-format
 msgid "Notice feed for %s (Atom)"
-msgstr "הזנת הודעות של %s"
+msgstr "הזנת עדכוני� של %s� (Atom)"
 
 #. TRANS: Title for link to notice feed. FOAF stands for Friend of a Friend.
 #. TRANS: More information at http://www.foaf-project.org. %s is a user nickname.
-#: actions/showstream.php:159
 #, php-format
 msgid "FOAF for %s"
 msgstr ""
 
-#. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
-#: actions/showstream.php:211
+#. TRANS: First sentence of empty list message for a timeline. $1%s is a user nickname.
 #, php-format
 msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
 msgstr ""
 
 #. TRANS: Second sentence of empty list message for a stream for the user themselves.
-#: actions/showstream.php:217
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
 msgstr ""
 
-#. TRANS: Second sentence of empty  list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
+#. TRANS: Second sentence of empty  list message for a non-self timeline. %1$s is a user nickname, %2$s is a part of a URL.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:221
 #, php-format
 msgid ""
 "You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
 "%?status_textarea=%2$s)."
 msgstr ""
+"�פשר לנסות לדחוף �ת %1$s �ו [לשלוח לה� משהו](%%%%action.newnotice%%%%?"
+"status_textarea=%2$s)."
 
-#. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
+#. TRANS: Announcement for anonymous users showing a timeline if site registrations are open.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:264
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5329,275 +5107,271 @@ msgid ""
 "follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))"
 msgstr ""
 
-#. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
+#. TRANS: Announcement for anonymous users showing a timeline if site registrations are closed or invite only.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:271
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
 "wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
-"[StatusNet](http://status.net/) tool. "
+"[StatusNet](http://status.net/) tool."
 msgstr ""
 
 #. TRANS: Link to the author of a repeated notice. %s is a linked nickname.
-#: actions/showstream.php:328
-#, fuzzy, php-format
+#, php-format
 msgid "Repeat of %s"
-msgstr "תגובת עבור %s"
+msgstr "הדהוד של %s"
 
-#: actions/silence.php:65 actions/unsilence.php:65
+#. TRANS: Client error displayed trying to silence a user on a site where the feature is not enabled.
+#. TRANS: Client error on page to unsilence a user when the feature is not enabled.
 msgid "You cannot silence users on this site."
 msgstr ""
 
-#: actions/silence.php:72
-#, fuzzy
+#. TRANS: Client error displayed trying to silence an already silenced user.
 msgid "User is already silenced."
-msgstr "למשתמש �ין פרופיל."
+msgstr "המשתמש כבר הושתק"
 
-#: actions/siteadminpanel.php:69
+#. TRANS: Title for site administration panel.
+msgctxt "TITLE"
+msgid "Site"
+msgstr ""
+
+#. TRANS: Instructions for site administration panel.
 msgid "Basic settings for this StatusNet site"
 msgstr ""
 
-#: actions/siteadminpanel.php:133
+#. TRANS: Client error displayed trying to save an empty site name.
 msgid "Site name must have non-zero length."
 msgstr ""
 
-#: actions/siteadminpanel.php:141
+#. TRANS: Client error displayed trying to save site settings without a contact address.
 msgid "You must have a valid contact email address."
 msgstr ""
 
-#: actions/siteadminpanel.php:159
+#. TRANS: Client error displayed when a logo URL is not valid.
+msgid "Invalid logo URL."
+msgstr "כתובת סמל בלתי תקינה."
+
+#. TRANS: Client error displayed when a SSL logo URL is invalid.
+msgid "Invalid SSL logo URL."
+msgstr ""
+
+#. TRANS: Client error displayed trying to save site settings with an invalid language code.
+#. TRANS: %s is the invalid language code.
 #, php-format
 msgid "Unknown language \"%s\"."
 msgstr ""
 
-#: actions/siteadminpanel.php:165
+#. TRANS: Client error displayed trying to save site settings with a text limit below 0.
 msgid "Minimum text limit is 0 (unlimited)."
 msgstr ""
 
-#: actions/siteadminpanel.php:171
+#. TRANS: Client error displayed trying to save site settings with a text limit below 1.
 msgid "Dupe limit must be one or more seconds."
 msgstr ""
 
-#: actions/siteadminpanel.php:221
+#. TRANS: Fieldset legend on site settings panel.
+msgctxt "LEGEND"
 msgid "General"
 msgstr ""
 
-#: actions/siteadminpanel.php:224
-#, fuzzy
+#. TRANS: Field label on site settings panel.
+msgctxt "LABEL"
 msgid "Site name"
-msgstr "הודעה חדשה"
-
-#: actions/siteadminpanel.php:225
-msgid "The name of your site, like \"Yourcompany Microblog\""
 msgstr ""
 
-#: actions/siteadminpanel.php:229
+#. TRANS: Field title on site settings panel.
+msgid "The name of your site, like \"Yourcompany Microblog\"."
+msgstr ""
+
+#. TRANS: Field label on site settings panel.
 msgid "Brought by"
 msgstr ""
 
-#: actions/siteadminpanel.php:230
-msgid "Text used for credits link in footer of each page"
+#. TRANS: Field title on site settings panel.
+msgid "Text used for credits link in footer of each page."
 msgstr ""
 
-#: actions/siteadminpanel.php:234
+#. TRANS: Field label on site settings panel.
 msgid "Brought by URL"
 msgstr ""
 
-#: actions/siteadminpanel.php:235
-msgid "URL used for credits link in footer of each page"
+#. TRANS: Field title on site settings panel.
+msgid "URL used for credits link in footer of each page."
 msgstr ""
 
-#: actions/siteadminpanel.php:239
-msgid "Contact email address for your site"
+#. TRANS: Field label on site settings panel.
+msgid "Email"
 msgstr ""
 
-#: actions/siteadminpanel.php:245
-#, fuzzy
+#. TRANS: Field title on site settings panel.
+msgid "Contact email address for your site."
+msgstr ""
+
+#. TRANS: Fieldset legend on site settings panel.
+msgctxt "LEGEND"
 msgid "Local"
-msgstr "מיקו�"
+msgstr ""
 
-#: actions/siteadminpanel.php:256
+#. TRANS: Dropdown label on site settings panel.
 msgid "Default timezone"
 msgstr ""
 
-#: actions/siteadminpanel.php:257
+#. TRANS: Dropdown title on site settings panel.
 msgid "Default timezone for the site; usually UTC."
 msgstr ""
 
-#: actions/siteadminpanel.php:262
+#. TRANS: Dropdown label on site settings panel.
 msgid "Default language"
 msgstr ""
 
-#: actions/siteadminpanel.php:263
-msgid "Site language when autodetection from browser settings is not available"
+#. TRANS: Dropdown title on site settings panel.
+msgid ""
+"The site language when autodetection from browser settings is not available."
 msgstr ""
 
-#: actions/siteadminpanel.php:271
+#. TRANS: Fieldset legend on site settings panel.
+msgctxt "LEGEND"
 msgid "Limits"
 msgstr ""
 
-#: actions/siteadminpanel.php:274
+#. TRANS: Field label on site settings panel.
 msgid "Text limit"
 msgstr ""
 
-#: actions/siteadminpanel.php:274
+#. TRANS: Field title on site settings panel.
 msgid "Maximum number of characters for notices."
 msgstr ""
 
-#: actions/siteadminpanel.php:278
+#. TRANS: Field label on site settings panel.
 msgid "Dupe limit"
 msgstr ""
 
-#: actions/siteadminpanel.php:278
+#. TRANS: Field title on site settings panel.
 msgid "How long users must wait (in seconds) to post the same thing again."
 msgstr ""
 
+#. TRANS: Fieldset legend for form to change logo.
+msgid "Logo"
+msgstr "יצי�ה"
+
+#. TRANS: Field label for StatusNet site logo.
+msgid "Site logo"
+msgstr "סמל �תר"
+
+#. TRANS: Field label for SSL StatusNet site logo.
+msgid "SSL logo"
+msgstr ""
+
+#. TRANS: Button title for saving site settings.
+msgid "Save the site settings."
+msgstr "שמירת הגדרות �תר."
+
 #. TRANS: Page title for site-wide notice tab in admin panel.
-#: actions/sitenoticeadminpanel.php:55
 msgid "Site Notice"
-msgstr "הודעות"
+msgstr "הודעה לכל ה�תר"
 
 #. TRANS: Instructions for site-wide notice tab in admin panel.
-#: actions/sitenoticeadminpanel.php:66
-#, fuzzy
 msgid "Edit site-wide message"
-msgstr "הודעה חדשה"
+msgstr "עריכת הודעת לכל ה�תר"
 
 #. TRANS: Server error displayed when saving a site-wide notice was impossible.
-#: actions/sitenoticeadminpanel.php:101
-#, fuzzy
 msgid "Unable to save site notice."
-msgstr "בעיה בשמירת ההודעה."
+msgstr "ל� ניתן לשמור �ת ההודעה ל�תר."
 
 #. TRANS: Client error displayed when a site-wide notice was longer than allowed.
-#: actions/sitenoticeadminpanel.php:112
 msgid "Maximum length for the site-wide notice is 255 characters."
 msgstr ""
 
 #. TRANS: Label for site-wide notice text field in admin panel.
-#: actions/sitenoticeadminpanel.php:176
-#, fuzzy
 msgid "Site notice text"
-msgstr "הודעה חדשה"
+msgstr "טקסט ההודעה ל�תר"
 
 #. TRANS: Tooltip for site-wide notice text field in admin panel.
-#: actions/sitenoticeadminpanel.php:179
 msgid "Site-wide notice text (255 characters maximum; HTML allowed)"
 msgstr ""
 
-#. TRANS: Title for button to save site notice in admin panel.
-#: actions/sitenoticeadminpanel.php:201
-#, fuzzy
-msgid "Save site notice"
-msgstr "הודעה חדשה"
+#. TRANS: Button title to save site notice in admin panel.
+msgid "Save site notice."
+msgstr ""
 
 #. TRANS: Title for SMS settings.
-#: actions/smssettings.php:59
 msgid "SMS settings"
 msgstr "הגדרות הפרופיל"
 
 #. TRANS: SMS settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/smssettings.php:74
 #, php-format
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr ""
 
 #. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
-#: actions/smssettings.php:97
-#, fuzzy
 msgid "SMS is not available."
-msgstr "עמוד זה �ינו זמין בסוג מדיה ש�תה יכול לקבל"
+msgstr "שירות המסרוני� מבוטל."
 
 #. TRANS: Form legend for SMS settings form.
-#: actions/smssettings.php:111
-#, fuzzy
 msgid "SMS address"
-msgstr "כתובת מסרי� מידיי�"
+msgstr "כתובת מסרוני�"
 
 #. TRANS: Form guide in SMS settings form.
-#: actions/smssettings.php:120
 msgid "Current confirmed SMS-enabled phone number."
 msgstr ""
 
 #. TRANS: Form guide in IM settings form.
-#: actions/smssettings.php:133
 msgid "Awaiting confirmation on this phone number."
 msgstr ""
 
 #. TRANS: Field label for SMS address input in SMS settings form.
-#: actions/smssettings.php:142
-#, fuzzy
 msgid "Confirmation code"
-msgstr "�ין קוד �ישור."
+msgstr "קוד �ימות"
 
 #. TRANS: Form field instructions in SMS settings form.
-#: actions/smssettings.php:144
 msgid "Enter the code you received on your phone."
 msgstr ""
 
 #. TRANS: Button label to confirm SMS confirmation code in SMS settings.
-#: actions/smssettings.php:148
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Confirm"
-msgstr "�שר"
+msgstr "ל�מת"
 
 #. TRANS: Field label for SMS phone number input in SMS settings form.
-#: actions/smssettings.php:153
 msgid "SMS phone number"
 msgstr ""
 
 #. TRANS: SMS phone number input field instructions in SMS settings form.
-#: actions/smssettings.php:156
-#, fuzzy
-msgid "Phone number, no punctuation or spaces, with area code"
-msgstr "1 עד 64 �ותיות �נגליות קטנות �ו מספרי�, לל� סימני פיסוק �ו רווחי�."
+msgid "Phone number, no punctuation or spaces, with area code."
+msgstr ""
 
 #. TRANS: Form legend for SMS preferences form.
-#: actions/smssettings.php:195
 msgid "SMS preferences"
 msgstr "העדפות נשמרו."
 
 #. TRANS: Checkbox label in SMS preferences form.
-#: actions/smssettings.php:201
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
 msgstr ""
 
 #. TRANS: Confirmation message for successful SMS preferences save.
-#: actions/smssettings.php:315
-#, fuzzy
 msgid "SMS preferences saved."
-msgstr "העדפות נשמרו."
+msgstr "העדפות המסרוני� נשמרו."
 
 #. TRANS: Message given saving SMS phone number without having provided one.
-#: actions/smssettings.php:338
-#, fuzzy
 msgid "No phone number."
-msgstr "�ין משתמש כזה."
+msgstr "�ין מספר טלפון."
 
 #. TRANS: Message given saving SMS phone number without having selected a carrier.
-#: actions/smssettings.php:344
 msgid "No carrier selected."
 msgstr ""
 
 #. TRANS: Message given saving SMS phone number that is already set.
-#: actions/smssettings.php:352
-#, fuzzy
 msgid "That is already your phone number."
-msgstr "זהו כבר זיהוי ה-Jabber שלך."
+msgstr "זה כבר מספר הטלפון שלך."
 
 #. TRANS: Message given saving SMS phone number that is already set for another user.
-#: actions/smssettings.php:356
-#, fuzzy
 msgid "That phone number already belongs to another user."
-msgstr "זיהוי ה-Jabber כבר שייך למשתמש �חר."
+msgstr "מספר הטלפון הזה כבר שייך למשתמש �חר."
 
 #. TRANS: Message given saving valid SMS phone number that is to be confirmed.
-#: actions/smssettings.php:384
 msgid ""
 "A confirmation code was sent to the phone number you added. Check your phone "
 "for the code and instructions on how to use it."
@@ -5606,42 +5380,36 @@ msgstr ""
 "מידיי� �ליך."
 
 #. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
-#: actions/smssettings.php:413
-#, fuzzy
 msgid "That is the wrong confirmation number."
-msgstr "זוהי כתובת מסרי� מידיי� שגויה."
+msgstr "מספר ה�ימות הזה שגוי."
+
+#. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
+msgid "Could not delete SMS confirmation."
+msgstr ""
 
 #. TRANS: Message given after successfully canceling SMS phone number confirmation.
-#: actions/smssettings.php:427
 msgid "SMS confirmation cancelled."
 msgstr "�ין קוד �ישור."
 
 #. TRANS: Message given trying to remove an SMS phone number that is not
 #. TRANS: registered for the active user.
-#: actions/smssettings.php:448
-#, fuzzy
 msgid "That is not your phone number."
-msgstr "זהו ל� זיהוי ה-Jabber שלך."
+msgstr "זהו ל� מספר הטלפון שלך."
 
 #. TRANS: Message given after successfully removing a registered SMS phone number.
-#: actions/smssettings.php:470
-#, fuzzy
 msgid "The SMS phone number was removed."
-msgstr "הכתובת הוסרה."
+msgstr "מספר הטלפון למסרוני� נמחק."
 
 #. TRANS: Label for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:511
 msgid "Mobile carrier"
 msgstr ""
 
 #. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:516
 msgid "Select a carrier"
 msgstr ""
 
 #. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
 #. TRANS: %s is an administrative contact's e-mail address.
-#: actions/smssettings.php:525
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -5649,126 +5417,148 @@ msgid ""
 msgstr ""
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
-#: actions/smssettings.php:548
-#, fuzzy
-msgid "No code entered"
-msgstr "�ין תוכן!"
+msgid "No code entered."
+msgstr ""
 
-#. TRANS: Menu item for site administration
-#: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
-#: lib/adminpanelaction.php:395
+#. TRANS: Title for admin panel to configure snapshots.
+msgctxt "TITLE"
 msgid "Snapshots"
 msgstr ""
 
-#: actions/snapshotadminpanel.php:65
-#, fuzzy
+#. TRANS: Instructions for admin panel to configure snapshots.
 msgid "Manage snapshot configuration"
-msgstr "הרשמות"
+msgstr "ניהול תצורת היטל־בזק"
 
-#: actions/snapshotadminpanel.php:127
+#. TRANS: Client error displayed on admin panel for snapshots when providing an invalid run value.
 msgid "Invalid snapshot run value."
 msgstr ""
 
-#: actions/snapshotadminpanel.php:133
+#. TRANS: Client error displayed on admin panel for snapshots when providing an invalid value for frequency.
 msgid "Snapshot frequency must be a number."
 msgstr ""
 
-#: actions/snapshotadminpanel.php:144
+#. TRANS: Client error displayed on admin panel for snapshots when providing an invalid report URL.
 msgid "Invalid snapshot report URL."
 msgstr ""
 
-#: actions/snapshotadminpanel.php:200
+#. TRANS: Fieldset legend on admin panel for snapshots.
+msgctxt "LEGEND"
+msgid "Snapshots"
+msgstr ""
+
+#. TRANS: Option in dropdown for snapshot method in admin panel for snapshots.
 msgid "Randomly during web hit"
 msgstr ""
 
-#: actions/snapshotadminpanel.php:201
+#. TRANS: Option in dropdown for snapshot method in admin panel for snapshots.
 msgid "In a scheduled job"
 msgstr ""
 
-#: actions/snapshotadminpanel.php:206
+#. TRANS: Dropdown label for snapshot method in admin panel for snapshots.
 msgid "Data snapshots"
 msgstr ""
 
-#: actions/snapshotadminpanel.php:208
-msgid "When to send statistical data to status.net servers"
+#. TRANS: Dropdown title for snapshot method in admin panel for snapshots.
+msgid "When to send statistical data to status.net servers."
 msgstr ""
 
-#: actions/snapshotadminpanel.php:217
+#. TRANS: Input field label for snapshot frequency in admin panel for snapshots.
 msgid "Frequency"
 msgstr ""
 
-#: actions/snapshotadminpanel.php:218
-msgid "Snapshots will be sent once every N web hits"
+#. TRANS: Input field title for snapshot frequency in admin panel for snapshots.
+msgid "Snapshots will be sent once every N web hits."
 msgstr ""
 
-#: actions/snapshotadminpanel.php:226
+#. TRANS: Input field label for snapshot report URL in admin panel for snapshots.
 msgid "Report URL"
 msgstr ""
 
-#: actions/snapshotadminpanel.php:227
-msgid "Snapshots will be sent to this URL"
+#. TRANS: Input field title for snapshot report URL in admin panel for snapshots.
+msgid "Snapshots will be sent to this URL."
 msgstr ""
 
-#: actions/snapshotadminpanel.php:248
-#, fuzzy
-msgid "Save snapshot settings"
-msgstr "הגדרות"
+#. TRANS: Button title to save snapshot settings.
+msgid "Save snapshot settings."
+msgstr ""
 
 #. TRANS: Client error displayed trying a change a subscription for a non-subscribed profile.
-#: actions/subedit.php:75
-#, fuzzy
 msgid "You are not subscribed to that profile."
-msgstr "ל� שלחנו �לינו �ת הפרופיל הזה"
+msgstr "�ינך מנוי לפרופיל הזה."
 
 #. TRANS: Server error displayed when updating a subscription fails with a database error.
 #. TRANS: Exception thrown when a subscription could not be stored on the server.
-#: actions/subedit.php:89 classes/Subscription.php:141
 msgid "Could not save subscription."
 msgstr "הכנסת מנוי חדש נכשלה."
 
-#: actions/subscribe.php:77
-msgid "This action only accepts POST requests."
+#. TRANS: Client error displayed when trying to approve group applicants without being a group administrator.
+msgid "You may only approve your own pending subscriptions."
 msgstr ""
 
-#: actions/subscribe.php:117
-#, fuzzy
-msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
-msgstr "ל� שלחנו �לינו �ת הפרופיל הזה"
+#. TRANS: Title of the first page showing pending subscribers still awaiting approval.
+#. TRANS: %s is the name of the user.
+#, php-format
+msgid "%s subscribers awaiting approval"
+msgstr ""
 
-#: actions/subscribe.php:145
-#, fuzzy
+#. TRANS: Title of all but the first page showing pending subscribersmembers still awaiting approval.
+#. TRANS: %1$s is the name of the user, %2$d is the page number of the members list.
+#, php-format
+msgid "%1$s subscribers awaiting approval, page %2$d"
+msgstr ""
+
+#. TRANS: Page notice for group members page.
+msgid "A list of users awaiting approval to subscribe to you."
+msgstr ""
+
+#. TRANS: Page title when subscription succeeded.
 msgid "Subscribed"
-msgstr "הירש� כמנוי"
+msgstr "רשו�"
+
+#. TRANS: Client error displayed when trying to perform an action while not logged in.
+msgid "You must be logged in to unsubscribe from a list."
+msgstr ""
+
+#. TRANS: Client error displayed when trying to perform an action without providing an ID.
+msgid "No ID given."
+msgstr ""
+
+#. TRANS: Server error displayed subscribing to a list fails.
+#. TRANS: %1$s is a user nickname, %2$s is a list, %3$s is the error message (no period).
+#, php-format
+msgid "Could not subscribe user %1$s to list %2$s: %3$s"
+msgstr ""
+
+#. TRANS: Title of form to subscribe to a list.
+#. TRANS: %1%s is a user nickname, %2$s is a list, %3$s is a tagger nickname.
+#, php-format
+msgid "%1$s subscribed to list %2$s by %3$s"
+msgstr ""
 
 #. TRANS: Header for list of subscribers for a user (first page).
 #. TRANS: %s is the user's nickname.
-#: actions/subscribers.php:51
-#, fuzzy, php-format
+#, php-format
 msgid "%s subscribers"
-msgstr "מנויי�"
+msgstr "%s מנויי�"
 
 #. TRANS: Header for list of subscribers for a user (not first page).
 #. TRANS: %1$s is the user's nickname, $2$d is the page number.
-#: actions/subscribers.php:55
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s subscribers, page %2$d"
-msgstr "כל המנויי�"
+msgstr "%1$s מנויי�, דף %2$d"
 
 #. TRANS: Page notice for page with an overview of all subscribers
 #. TRANS: of the logged in user's own profile.
-#: actions/subscribers.php:68
 msgid "These are the people who listen to your notices."
-msgstr "�לה ה�נשי� המ�זיני� להודעות שלך."
+msgstr "�לה ה�נשי� שמ�זיני� לעדכוני� שלך."
 
 #. TRANS: Page notice for page with an overview of all subscribers of a user other
 #. TRANS: than the logged in user. %s is the user nickname.
-#: actions/subscribers.php:74
 #, php-format
 msgid "These are the people who listen to %s's notices."
-msgstr "�לה ה�נשי� במ�זיני� להודעות של %s."
+msgstr "�לה ה�נשי� שמ�זיני� לעדכוני� של %s."
 
 #. TRANS: Subscriber list text when the logged in user has no subscribers.
-#: actions/subscribers.php:116
 msgid ""
 "You have no subscribers. Try subscribing to people you know and they might "
 "return the favor."
@@ -5776,7 +5566,6 @@ msgstr ""
 
 #. TRANS: Subscriber list text when looking at the subscribers for a of a user other
 #. TRANS: than the logged in user that has no subscribers. %s is the user nickname.
-#: actions/subscribers.php:120
 #, php-format
 msgid "%s has no subscribers. Want to be the first?"
 msgstr ""
@@ -5786,7 +5575,6 @@ msgstr ""
 #. TRANS: This message contains a Markdown URL. The link description is between
 #. TRANS: square brackets, and the link between parentheses. Do not separate "]("
 #. TRANS: and do not change the URL part.
-#: actions/subscribers.php:129
 #, php-format
 msgid ""
 "%s has no subscribers. Why not [register an account](%%%%action.register%%%"
@@ -5795,390 +5583,318 @@ msgstr ""
 
 #. TRANS: Header for subscriptions overview for a user (not first page).
 #. TRANS: %1$s is a user nickname, %2$d is the page number.
-#: actions/subscriptions.php:55
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s subscriptions, page %2$d"
-msgstr "כל המנויי�"
+msgstr "%1$s הרשמות, דף %2$d"
 
 #. TRANS: Page notice for page with an overview of all subscriptions
 #. TRANS: of the logged in user's own profile.
-#: actions/subscriptions.php:68
 msgid "These are the people whose notices you listen to."
-msgstr "�לה ה�נשי� שלהודעות שלה� �תה מ�זין."
+msgstr "�לה ה�נשי� ש�תה מ�זין לעדכוני� שלה�."
 
 #. TRANS: Page notice for page with an overview of all subscriptions of a user other
 #. TRANS: than the logged in user. %s is the user nickname.
-#: actions/subscriptions.php:74
 #, php-format
 msgid "These are the people whose notices %s listens to."
-msgstr "�לה ה�נשי� ש%s מ�זין להודעות שלה�."
+msgstr "�לה ה�נשי� שמשתמש %s מ�זין לעדכוני� שלה�."
 
 #. TRANS: Subscription list text when the logged in user has no subscriptions.
 #. TRANS: This message contains Markdown URLs. The link description is between
 #. TRANS: square brackets, and the link between parentheses. Do not separate "]("
 #. TRANS: and do not change the URL part.
-#: actions/subscriptions.php:135
 #, php-format
 msgid ""
 "You're not listening to anyone's notices right now, try subscribing to "
 "people you know. Try [people search](%%action.peoplesearch%%), look for "
 "members in groups you're interested in and in our [featured users](%%action."
-"featured%%). If you're a [Twitter user](%%action.twittersettings%%), you can "
-"automatically subscribe to people you already follow there."
+"featured%%)."
 msgstr ""
 
 #. TRANS: Subscription list text when looking at the subscriptions for a of a user other
 #. TRANS: than the logged in user that has no subscriptions. %s is the user nickname.
 #. TRANS: Subscription list text when looking at the subscriptions for a of a user that has none
 #. TRANS: as an anonymous user. %s is the user nickname.
-#: actions/subscriptions.php:143 actions/subscriptions.php:149
-#, fuzzy, php-format
+#, php-format
 msgid "%s is not listening to anyone."
-msgstr "%1$s כעת מ�זין להודעות שלך ב-%2$s"
+msgstr "%s �ינו מ�זין ל�יש."
 
-#: actions/subscriptions.php:178
+#. TRANS: Atom feed title. %s is a profile nickname.
 #, php-format
 msgid "Subscription feed for %s (Atom)"
 msgstr ""
 
-#. TRANS: Checkbox label for enabling Jabber messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:242
-#, fuzzy
-msgid "Jabber"
-msgstr "�ין זיהוי Jabber כזה."
+#. TRANS: Checkbox label for enabling IM messages for a profile in a subscriptions list.
+msgctxt "LABEL"
+msgid "IM"
+msgstr ""
 
 #. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:257
 msgid "SMS"
 msgstr "סמס"
 
-#: actions/tag.php:69
-#, fuzzy, php-format
+#. TRANS: Title for all but the first page of notices with tags.
+#. TRANS: %1$s is the tag, %2$d is the page number.
+#, php-format
 msgid "Notices tagged with %1$s, page %2$d"
-msgstr "מיקרובלוג מ�ת %s"
+msgstr "עדכוני� ע� התג %1$s, דף %2$d"
 
-#: actions/tag.php:87
-#, fuzzy, php-format
+#. TRANS: Link label for feed on "notices with tag" page.
+#. TRANS: %s is the tag the feed is for.
+#, php-format
+msgid "Notice feed for tag %s (Activity Streams JSON)"
+msgstr "הזנת עדכוני� לתג %s� (Activity Streams JSON)"
+
+#. TRANS: Link label for feed on "notices with tag" page.
+#. TRANS: %s is the tag the feed is for.
+#, php-format
 msgid "Notice feed for tag %s (RSS 1.0)"
-msgstr "הזנת הודעות של %s"
+msgstr "הזנת עדכוני� לתג %s� (RSS 1.0)"
 
-#: actions/tag.php:93
-#, fuzzy, php-format
+#. TRANS: Link label for feed on "notices with tag" page.
+#. TRANS: %s is the tag the feed is for.
+#, php-format
 msgid "Notice feed for tag %s (RSS 2.0)"
-msgstr "הזנת הודעות של %s"
+msgstr "הזנת עדכוני� לתג %s� (RSS 2.0)"
 
-#: actions/tag.php:99
-#, fuzzy, php-format
+#. TRANS: Link label for feed on "notices with tag" page.
+#. TRANS: %s is the tag the feed is for.
+#, php-format
 msgid "Notice feed for tag %s (Atom)"
-msgstr "הזנת הודעות של %s"
+msgstr "הזנת עדכוני� לתג %s� (Atom)"
 
-#: actions/tagother.php:39
-#, fuzzy
-msgid "No ID argument."
-msgstr "�ין מסמך כזה."
-
-#: actions/tagother.php:65
-#, php-format
-msgid "Tag %s"
+#. TRANS: Client error displayed when trying to tag a user that cannot be tagged.
+#. TRANS: Client exception thrown trying to set a tag for a user that cannot be tagged.
+#. TRANS: Error displayed when trying to tag a user that cannot be tagged.
+msgid "You cannot tag this user."
 msgstr ""
 
-#: actions/tagother.php:77 lib/userprofile.php:76
-#, fuzzy
+#. TRANS: Title for list form when not on a profile page.
+msgid "List a profile"
+msgstr ""
+
+#. TRANS: Title for list form when on a profile page.
+#. TRANS: %s is a profile nickname.
+#, php-format
+msgctxt "ADDTOLIST"
+msgid "List %s"
+msgstr ""
+
+#. TRANS: Title for list form when an error has occurred.
+msgctxt "TITLE"
+msgid "Error"
+msgstr ""
+
+#. TRANS: Header in list form.
 msgid "User profile"
-msgstr "למשתמש �ין פרופיל."
+msgstr "דף משתמש."
 
-#: actions/tagother.php:81 actions/userauthorization.php:132
-#: lib/userprofile.php:107
-msgid "Photo"
+#. TRANS: Fieldset legend for list form.
+msgid "List user"
 msgstr ""
 
-#: actions/tagother.php:141
-msgid "Tag user"
+#. TRANS: Field label on list form.
+msgctxt "LABEL"
+msgid "Lists"
 msgstr ""
 
-#: actions/tagother.php:151
+#. TRANS: Field title on list form.
 msgid ""
-"Tags for this user (letters, numbers, -, ., and _), comma- or space- "
-"separated"
+"Lists for this user (letters, numbers, -, ., and _), comma- or space- "
+"separated."
 msgstr ""
 
-#: actions/tagother.php:193
-msgid ""
-"You can only tag people you are subscribed to or who are subscribed to you."
+#. TRANS: Title for personal tag cloud section.
+msgctxt "TITLE"
+msgid "Tags"
 msgstr ""
 
-#: actions/tagother.php:200
-msgid "Could not save tags."
-msgstr "שמירת הפרופיל נכשלה."
-
-#: actions/tagother.php:236
-msgid "Use this form to add tags to your subscribers or subscriptions."
+#. TRANS: Success message if lists are saved.
+msgid "Lists saved."
 msgstr ""
 
-#: actions/tagrss.php:35
-#, fuzzy
+#. TRANS: Page notice.
+msgid "Use this form to add your subscribers or subscriptions to lists."
+msgstr ""
+
+#. TRANS: Client error when requesting a tag feed for a non-existing tag.
 msgid "No such tag."
-msgstr "�ין הודעה כזו."
+msgstr "�ין תג כזה."
 
-#: actions/unblock.php:59
-#, fuzzy
+#. TRANS: Client error displayed when trying to unblock a non-blocked user.
 msgid "You haven't blocked that user."
-msgstr "כבר נכנסת למערכת!"
+msgstr "ל� חסמת �ת המשתמש הזה."
 
-#: actions/unsandbox.php:72
-#, fuzzy
+#. TRANS: Client error on page to unsilence a user when the to be unsandboxed user has not been sandboxed.
 msgid "User is not sandboxed."
-msgstr "למשתמש �ין פרופיל."
+msgstr "המשתמש ל� ב�רגז חול."
 
-#: actions/unsilence.php:72
-#, fuzzy
+#. TRANS: Client error on page to unsilence a user when the to be unsilenced user has not been silenced.
 msgid "User is not silenced."
-msgstr "למשתמש �ין פרופיל."
+msgstr "המשתמש ל� מושתק."
 
-#: actions/unsubscribe.php:77
-msgid "No profile ID in request."
-msgstr "ל� התבקש �ישור!"
-
-#: actions/unsubscribe.php:98
-#, fuzzy
+#. TRANS: Page title for page to unsubscribe.
 msgid "Unsubscribed"
-msgstr "בטל מנוי"
+msgstr "המינוי בוטל"
 
-#: actions/updateprofile.php:64 actions/userauthorization.php:337
+#. TRANS: Page title for form that allows unsubscribing from a list.
+#. TRANS: %1$s is a nickname, %2$s is a list, %3$s is a tagger nickname.
 #, php-format
-msgid ""
-"Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
+msgid "%1$s unsubscribed from list %2$s by %3$s"
 msgstr ""
 
-#. TRANS: User admin panel title
-#: actions/useradminpanel.php:58
+#. TRANS: Title of URL settings tab in profile settings.
+msgid "URL settings"
+msgstr ""
+
+#. TRANS: Instructions for tab "Other" in user profile settings.
+msgid "Manage various other options."
+msgstr ""
+
+#. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
+#. TRANS: user's profile settings. This message has one space at the beginning. Use your
+#. TRANS: language's word separator here if it has one (most likely a single space).
+msgid " (free service)"
+msgstr ""
+
+#. TRANS: Default value for URL shortening settings.
+msgid "[none]"
+msgstr ""
+
+#. TRANS: Default value for URL shortening settings.
+msgid "[internal]"
+msgstr ""
+
+#. TRANS: Label for dropdown with URL shortener services.
+msgid "Shorten URLs with"
+msgstr ""
+
+#. TRANS: Tooltip for for dropdown with URL shortener services.
+msgid "Automatic shortening service to use."
+msgstr ""
+
+#. TRANS: Field label in URL settings in profile.
+msgid "URL longer than"
+msgstr ""
+
+#. TRANS: Field title in URL settings in profile.
+msgid "URLs longer than this will be shortened, 0 means always shorten."
+msgstr ""
+
+#. TRANS: Field label in URL settings in profile.
+msgid "Text longer than"
+msgstr ""
+
+#. TRANS: Field title in URL settings in profile.
+msgid ""
+"URLs in notices longer than this will be shortened, 0 means always shorten."
+msgstr ""
+
+#. TRANS: Form validation error for form "Other settings" in user profile.
+msgid "URL shortening service is too long (maximum 50 characters)."
+msgstr ""
+
+#. TRANS: Client exception thrown when the maximum URL settings value is invalid in profile URL settings.
+msgid "Invalid number for maximum URL length."
+msgstr ""
+
+#. TRANS: Client exception thrown when the maximum notice length settings value is invalid in profile URL settings.
+msgid "Invalid number for maximum notice length."
+msgstr ""
+
+#. TRANS: Server exception thrown in profile URL settings when preferences could not be saved.
+msgid "Error saving user URL shortening preferences."
+msgstr ""
+
+#. TRANS: User admin panel title.
 msgctxt "TITLE"
 msgid "User"
 msgstr "משתמש"
 
 #. TRANS: Instruction for user admin panel.
-#: actions/useradminpanel.php:69
 msgid "User settings for this StatusNet site"
 msgstr ""
 
 #. TRANS: Form validation error in user admin panel when a non-numeric character limit was set.
-#: actions/useradminpanel.php:147
 msgid "Invalid bio limit. Must be numeric."
 msgstr ""
 
 #. TRANS: Form validation error in user admin panel when welcome text is too long.
-#: actions/useradminpanel.php:154
 msgid "Invalid welcome text. Maximum length is 255 characters."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to set a non-existing user as default subscription for new
 #. TRANS: users in user admin panel. %1$s is the invalid nickname.
-#: actions/useradminpanel.php:166
 #, php-format
-msgid "Invalid default subscripton: '%1$s' is not a user."
+msgid "Invalid default subscripton: \"%1$s\" is not a user."
 msgstr ""
 
-#. TRANS: Link description in user account settings menu.
-#: actions/useradminpanel.php:215 lib/accountsettingsaction.php:106
-#: lib/personalgroupnav.php:112
+#. TRANS: Fieldset legend in user administration panel.
+msgctxt "LEGEND"
 msgid "Profile"
-msgstr "פרופיל"
+msgstr ""
 
 #. TRANS: Field label in user admin panel for setting the character limit for the bio field.
-#: actions/useradminpanel.php:220
 msgid "Bio Limit"
 msgstr ""
 
 #. TRANS: Tooltip in user admin panel for setting the character limit for the bio field.
-#: actions/useradminpanel.php:222
 msgid "Maximum length of a profile bio in characters."
 msgstr ""
 
 #. TRANS: Form legend in user admin panel.
-#: actions/useradminpanel.php:231
 msgid "New users"
 msgstr "הודעה חדשה"
 
 #. TRANS: Field label in user admin panel for setting new user welcome text.
-#: actions/useradminpanel.php:236
 msgid "New user welcome"
 msgstr ""
 
 #. TRANS: Tooltip in user admin panel for setting new user welcome text.
-#: actions/useradminpanel.php:238
 msgid "Welcome text for new users (maximum 255 characters)."
 msgstr ""
 
 #. TRANS: Field label in user admin panel for setting default subscription for new users.
-#: actions/useradminpanel.php:244
-#, fuzzy
 msgid "Default subscription"
-msgstr "כל המנויי�"
+msgstr "מינוי בררת מחדל"
 
 #. TRANS: Tooltip in user admin panel for setting default subscription for new users.
-#: actions/useradminpanel.php:246
-#, fuzzy
 msgid "Automatically subscribe new users to this user."
-msgstr "ההרשמה �ושרה"
+msgstr "לרשו� משתמשי� חדשי� למשתמש הזה ב�ופן �וטומטי."
 
 #. TRANS: Form legend in user admin panel.
-#: actions/useradminpanel.php:256
-#, fuzzy
 msgid "Invitations"
-msgstr "מיקו�"
+msgstr "הזמנות"
 
 #. TRANS: Field label for checkbox in user admin panel for allowing users to invite friend using site e-mail.
-#: actions/useradminpanel.php:262
 msgid "Invitations enabled"
 msgstr ""
 
 #. TRANS: Tooltip for checkbox in user admin panel for allowing users to invite friend using site e-mail.
-#: actions/useradminpanel.php:265
 msgid "Whether to allow users to invite new users."
 msgstr ""
 
-#. TRANS: Title for button to save user settings in user admin panel.
-#: actions/useradminpanel.php:302
-msgid "Save user settings"
+#. TRANS: Button title to save user settings in user admin panel.
+msgid "Save user settings."
 msgstr ""
 
-#: actions/userauthorization.php:105
-msgid "Authorize subscription"
-msgstr "�שר מנוי"
-
-#: actions/userauthorization.php:110
-#, fuzzy
-msgid ""
-"Please check these details to make sure that you want to subscribe to this "
-"user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
-"click “Reject�."
-msgstr ""
-"בדוק �ת הפרטי� כדי לווד� שברצונך להירש� כמנוי להודעות משתמש זה. �� �ינך רוצה "
-"להירש�, לחץ \"בטל\"."
-
-#. TRANS: Menu item for site administration
-#: actions/userauthorization.php:196 actions/version.php:167
-#: lib/adminpanelaction.php:403
-msgid "License"
-msgstr ""
-
-#: actions/userauthorization.php:217
-msgid "Accept"
-msgstr "קבל"
-
-#: actions/userauthorization.php:218 lib/subscribeform.php:115
-#: lib/subscribeform.php:139
-msgid "Subscribe to this user"
-msgstr "ל� שלחנו �לינו �ת הפרופיל הזה"
-
-#: actions/userauthorization.php:219
-msgid "Reject"
-msgstr "דחה"
-
-#: actions/userauthorization.php:220
-msgid "Reject this subscription"
-msgstr "�שר מנוי"
-
-#: actions/userauthorization.php:232
-msgid "No authorization request!"
-msgstr "ל� התבקש �ישור!"
-
-#: actions/userauthorization.php:254
-msgid "Subscription authorized"
-msgstr "ההרשמה �ושרה"
-
-#: actions/userauthorization.php:256
-#, fuzzy
-msgid ""
-"The subscription has been authorized, but no callback URL was passed. Check "
-"with the site’s instructions for details on how to authorize the "
-"subscription. Your subscription token is:"
-msgstr ""
-"המנוי �ושר, �בל ל� התקבלה כתובת �ליה ניתן לחזור. בדוק �ת הור�ות ה�תר וחפש "
-"כיצד ל�שר מנוי. �סימון המנוי שלך הו�:"
-
-#: actions/userauthorization.php:266
-msgid "Subscription rejected"
-msgstr "ההרשמה נדחתה"
-
-#: actions/userauthorization.php:268
-#, fuzzy
-msgid ""
-"The subscription has been rejected, but no callback URL was passed. Check "
-"with the site’s instructions for details on how to fully reject the "
-"subscription."
-msgstr ""
-"המנוי נדחה, �בל ל� התקבלה כתובת לחזרה. בדוק �ת הור�ות ה�תר וחפש כיצד להשלי� "
-"דחיית מנוי."
-
-#: actions/userauthorization.php:303
+#. TRANS: Page title for all but the first page of groups for a user.
+#. TRANS: %1$s is a nickname, %2$d is a page number.
 #, php-format
-msgid "Listener URI ‘%s’ not found here."
-msgstr ""
-
-#: actions/userauthorization.php:308
-#, php-format
-msgid "Listenee URI ‘%s’ is too long."
-msgstr ""
-
-#: actions/userauthorization.php:314
-#, php-format
-msgid "Listenee URI ‘%s’ is a local user."
-msgstr ""
-
-#: actions/userauthorization.php:329
-#, php-format
-msgid "Profile URL ‘%s’ is for a local user."
-msgstr ""
-
-#: actions/userauthorization.php:345
-#, php-format
-msgid "Avatar URL ‘%s’ is not valid."
-msgstr ""
-
-#: actions/userauthorization.php:350
-#, fuzzy, php-format
-msgid "Can’t read avatar URL ‘%s’."
-msgstr "ל� ניתן לקרו� �ת ה-URL '%s' של התמונה"
-
-#: actions/userauthorization.php:355
-#, fuzzy, php-format
-msgid "Wrong image type for avatar URL ‘%s’."
-msgstr "סוג התמונה של '%s' �ינו מת�י�"
-
-#. TRANS: Page title for profile design page.
-#: actions/userdesignsettings.php:76 lib/designsettings.php:63
-#, fuzzy
-msgid "Profile design"
-msgstr "הגדרות הפרופיל"
-
-#. TRANS: Instructions for profile design page.
-#: actions/userdesignsettings.php:87 lib/designsettings.php:74
-msgid ""
-"Customize the way your profile looks with a background image and a colour "
-"palette of your choice."
-msgstr ""
-
-#: actions/userdesignsettings.php:282
-msgid "Enjoy your hotdog!"
-msgstr ""
-
-#. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number.
-#: actions/usergroups.php:66
-#, fuzzy, php-format
 msgid "%1$s groups, page %2$d"
-msgstr "כל המנויי�"
+msgstr "%1$s קבוצת, דף %2$d"
 
-#: actions/usergroups.php:132
+#. TRANS: Link text on group page to search for groups.
 msgid "Search for more groups"
 msgstr ""
 
-#: actions/usergroups.php:159
-#, fuzzy, php-format
+#. TRANS: Text on group page for a user that is not a member of any group.
+#. TRANS: %s is a user nickname.
+#, php-format
 msgid "%s is not a member of any group."
-msgstr "ל� שלחנו �לינו �ת הפרופיל הזה"
+msgstr "%s �ינו חבר בשו� קבוצה."
 
-#: actions/usergroups.php:164
+#. TRANS: Text on group page for a user that is not a member of any group. This message contains
+#. TRANS: a Markdown link in the form [link text](link) and a variable that should not be changed.
 #, php-format
 msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
 msgstr ""
@@ -6188,106 +5904,123 @@ msgstr ""
 #. TRANS: %1$s is a group name, %2$s is a site name.
 #. TRANS: Message is used as a subtitle in atom user notice feed.
 #. TRANS: %1$s is a user name, %2$s is a site name.
-#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:70
-#: lib/atomusernoticefeed.php:75
 #, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr ""
 
-#: actions/version.php:75
-#, fuzzy, php-format
+#. TRANS: Title for version page. %s is the StatusNet version.
+#, php-format
 msgid "StatusNet %s"
-msgstr "סטטיסטיקה"
+msgstr "StatusNet %s"
 
-#: actions/version.php:155
+#. TRANS: Content part of StatusNet version page.
+#. TRANS: %1$s is the engine name (StatusNet) and %2$s is the StatusNet version.
 #, php-format
 msgid ""
-"This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, "
+"This site is powered by %1$s version %2$s, Copyright 2008-2011 StatusNet, "
 "Inc. and contributors."
 msgstr ""
 
-#: actions/version.php:163
+#. TRANS: Header for StatusNet contributors section on the version page.
 msgid "Contributors"
 msgstr ""
 
-#: actions/version.php:170
+#. TRANS: Header for StatusNet license section on the version page.
+msgid "License"
+msgstr ""
+
+#. TRANS: Content part of StatusNet version page.
 msgid ""
 "StatusNet is free software: you can redistribute it and/or modify it under "
 "the terms of the GNU Affero General Public License as published by the Free "
 "Software Foundation, either version 3 of the License, or (at your option) "
-"any later version. "
+"any later version."
 msgstr ""
 
-#: actions/version.php:176
+#. TRANS: Content part of StatusNet version page.
 msgid ""
 "This program is distributed in the hope that it will be useful, but WITHOUT "
 "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
 "FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License "
-"for more details. "
+"for more details."
 msgstr ""
 
-#: actions/version.php:182
+#. TRANS: Content part of StatusNet version page.
+#. TRANS: %s is a link to the AGPL license with link description "http://www.gnu.org/licenses/agpl.html".
 #, php-format
 msgid ""
 "You should have received a copy of the GNU Affero General Public License "
 "along with this program.  If not, see %s."
 msgstr ""
 
-#: actions/version.php:191
+#. TRANS: Header for StatusNet plugins section on the version page.
 msgid "Plugins"
 msgstr ""
 
-#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:885
-#, fuzzy
-msgid "Version"
-msgstr "�ישי"
+#. TRANS: Column header for plugins table on version page.
+msgctxt "HEADER"
+msgid "Name"
+msgstr ""
 
-#: actions/version.php:199
+#. TRANS: Column header for plugins table on version page.
+msgctxt "HEADER"
+msgid "Version"
+msgstr ""
+
+#. TRANS: Column header for plugins table on version page.
+msgctxt "HEADER"
 msgid "Author(s)"
 msgstr ""
 
+#. TRANS: Column header for plugins table on version page.
+msgctxt "HEADER"
+msgid "Description"
+msgstr ""
+
 #. TRANS: Activity title when marking a notice as favorite.
-#: classes/Fave.php:164 lib/favorform.php:143
-#, fuzzy
 msgid "Favor"
-msgstr "מועדפי�"
+msgstr "ל�הוב"
 
 #. TRANS: Ntofication given when a user marks a notice as favorite.
 #. TRANS: %1$s is a user nickname or full name, %2$s is a notice URI.
-#: classes/Fave.php:167
 #, php-format
 msgid "%1$s marked notice %2$s as a favorite."
 msgstr ""
 
 #. TRANS: Server exception thrown when a URL cannot be processed.
-#: classes/File.php:156
 #, php-format
 msgid "Cannot process URL '%s'"
 msgstr ""
 
 #. TRANS: Server exception thrown when... Robin thinks something is impossible!
-#: classes/File.php:188
 msgid "Robin thinks something is impossible."
 msgstr ""
 
+#. TRANS: Message used to be inserted as %2$s in  the text "No file may
+#. TRANS: be larger than %1$d byte and the file you sent was %2$s.".
+#. TRANS: %1$d is the number of bytes of an uploaded file.
+#, php-format
+msgid "%1$d byte"
+msgid_plural "%1$d bytes"
+msgstr[0] ""
+msgstr[1] ""
+
 #. TRANS: Message given if an upload is larger than the configured maximum.
-#. TRANS: %1$d is the byte limit for uploads, %2$d is the byte count for the uploaded file.
-#. TRANS: %1$s is used for plural.
-#: classes/File.php:204
+#. TRANS: %1$d (used for plural) is the byte limit for uploads,
+#. TRANS: %2$s is the proper form of "n bytes". This is the only ways to have
+#. TRANS: gettext support multiple plurals in the same message, unfortunately...
 #, php-format
 msgid ""
-"No file may be larger than %1$d byte and the file you sent was %2$d bytes. "
-"Try to upload a smaller version."
+"No file may be larger than %1$d byte and the file you sent was %2$s. Try to "
+"upload a smaller version."
 msgid_plural ""
-"No file may be larger than %1$d bytes and the file you sent was %2$d bytes. "
-"Try to upload a smaller version."
+"No file may be larger than %1$d bytes and the file you sent was %2$s. Try to "
+"upload a smaller version."
 msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Message given if an upload would exceed user quota.
 #. TRANS: %d (number) is the user quota in bytes and is used for plural.
-#: classes/File.php:217
 #, php-format
 msgid "A file this large would exceed your user quota of %d byte."
 msgid_plural "A file this large would exceed your user quota of %d bytes."
@@ -6296,7 +6029,6 @@ msgstr[1] ""
 
 #. TRANS: Message given id an upload would exceed a user's monthly quota.
 #. TRANS: $d (number) is the monthly user quota in bytes and is used for plural.
-#: classes/File.php:229
 #, php-format
 msgid "A file this large would exceed your monthly quota of %d byte."
 msgid_plural "A file this large would exceed your monthly quota of %d bytes."
@@ -6304,167 +6036,155 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Client exception thrown if a file upload does not have a valid name.
-#: classes/File.php:276 classes/File.php:291
-#, fuzzy
 msgid "Invalid filename."
-msgstr "גודל ל� חוקי."
-
-#. TRANS: Exception thrown when joining a group fails.
-#: classes/Group_member.php:51
-#, fuzzy
-msgid "Group join failed."
-msgstr "�ין הודעה כזו."
-
-#. TRANS: Exception thrown when trying to leave a group the user is not a member of.
-#: classes/Group_member.php:64
-#, fuzzy
-msgid "Not part of group."
-msgstr "עידכון המשתמש נכשל."
-
-#. TRANS: Exception thrown when trying to leave a group fails.
-#: classes/Group_member.php:72
-#, fuzzy
-msgid "Group leave failed."
-msgstr "�ין הודעה כזו."
+msgstr "ש� קובץ ל� תקין."
 
 #. TRANS: Exception thrown providing an invalid profile ID.
 #. TRANS: %s is the invalid profile ID.
-#: classes/Group_member.php:85
 #, php-format
 msgid "Profile ID %s is invalid."
 msgstr ""
 
 #. TRANS: Exception thrown providing an invalid group ID.
 #. TRANS: %s is the invalid group ID.
-#: classes/Group_member.php:98
 #, php-format
 msgid "Group ID %s is invalid."
 msgstr ""
 
+#. TRANS: Exception thrown when joining a group fails.
+msgid "Group join failed."
+msgstr "הצטרפות לקבוצה נכשלה."
+
+#. TRANS: Exception thrown when trying to leave a group the user is not a member of.
+msgid "Not part of group."
+msgstr "ל� חלק מקבוצה."
+
+#. TRANS: Exception thrown when trying to leave a group fails.
+msgid "Group leave failed."
+msgstr "עזיבת הקבוצה נכשלה."
+
 #. TRANS: Activity title.
-#: classes/Group_member.php:147 lib/joinform.php:114
-#, fuzzy
 msgid "Join"
-msgstr "היכנס"
+msgstr "להצטרף"
 
 #. TRANS: Success message for subscribe to group attempt through OStatus.
 #. TRANS: %1$s is the member name, %2$s is the subscribed group's name.
-#: classes/Group_member.php:151
 #, php-format
 msgid "%1$s has joined group %2$s."
 msgstr ""
 
 #. TRANS: Server exception thrown when updating a local group fails.
-#: classes/Local_group.php:42
-#, fuzzy
 msgid "Could not update local group."
-msgstr "עידכון המשתמש נכשל."
+msgstr "ל� הצליח עדכון קבוצה מקומית."
 
 #. TRANS: Exception thrown when trying creating a login token failed.
 #. TRANS: %s is the user nickname for which token creation failed.
-#: classes/Login_token.php:78
-#, fuzzy, php-format
+#, php-format
 msgid "Could not create login token for %s"
-msgstr "שמירת מידע התמונה נכשל"
+msgstr "ל� הצליחה יצירת �סימון התחברות עבור %s"
+
+#. TRANS: Exception thrown when a program code class (%s) cannot be instantiated.
+#, php-format
+msgid "Cannot instantiate class %s."
+msgstr ""
 
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.
-#: classes/Memcached_DataObject.php:537
 msgid "No database name or DSN found anywhere."
 msgstr ""
 
 #. TRANS: Client exception thrown when a user tries to send a direct message while being banned from sending them.
-#: classes/Message.php:45
 msgid "You are banned from sending direct messages."
 msgstr ""
 
 #. TRANS: Message given when a message could not be stored on the server.
-#: classes/Message.php:69
-#, fuzzy
 msgid "Could not insert message."
-msgstr "הכנסת מנוי חדש נכשלה."
+msgstr "ל� הצליחה הכנסת הודעה."
 
 #. TRANS: Message given when a message could not be updated on the server.
-#: classes/Message.php:80
-#, fuzzy
 msgid "Could not update message with new URI."
-msgstr "עידכון המשתמש נכשל."
+msgstr "ל� הצליח עדכון ההודעה ע� כתובת חדשה."
 
 #. TRANS: Server exception thrown when a user profile for a notice cannot be found.
 #. TRANS: %1$d is a profile ID (number), %2$d is a notice ID (number).
-#: classes/Notice.php:98
 #, php-format
 msgid "No such profile (%1$d) for notice (%2$d)."
 msgstr ""
 
 #. TRANS: Server exception. %s are the error details.
-#: classes/Notice.php:199
 #, php-format
-msgid "Database error inserting hashtag: %s"
-msgstr "שגי�ה בהכנסת התמונה."
+msgid "Database error inserting hashtag: %s."
+msgstr ""
 
 #. TRANS: Client exception thrown if a notice contains too many characters.
-#: classes/Notice.php:279
-#, fuzzy
 msgid "Problem saving notice. Too long."
-msgstr "בעיה בשמירת ההודעה."
+msgstr "בעיה בשמירת העדכון. �רוך מדי."
 
 #. TRANS: Client exception thrown when trying to save a notice for an unknown user.
-#: classes/Notice.php:284
-#, fuzzy
 msgid "Problem saving notice. Unknown user."
-msgstr "בעיה בשמירת ההודעה."
+msgstr "בעיה בשמירת העדכון. משתמש ל� ידוע."
 
 #. TRANS: Client exception thrown when a user tries to post too many notices in a given time frame.
-#: classes/Notice.php:290
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
 
 #. TRANS: Client exception thrown when a user tries to post too many duplicate notices in a given time frame.
-#: classes/Notice.php:297
 msgid ""
 "Too many duplicate messages too quickly; take a breather and post again in a "
 "few minutes."
 msgstr ""
 
 #. TRANS: Client exception thrown when a user tries to post while being banned.
-#: classes/Notice.php:305
 msgid "You are banned from posting notices on this site."
 msgstr ""
 
+#. TRANS: Client exception thrown in notice when trying to repeat a missing or deleted notice.
+msgid "Cannot repeat; original notice is missing or deleted."
+msgstr "�י־�פשר להדהד; העדכון המקורי חסר �ו נמחק."
+
+#. TRANS: Client error displayed when trying to repeat an own notice.
+msgid "You cannot repeat your own notice."
+msgstr "�י־�פשר להדהד הודעה של עצמך."
+
+#. TRANS: Client error displayed when trying to repeat a non-public notice.
+msgid "Cannot repeat a private notice."
+msgstr "�י־�פשר להדהד עדכון פרטי."
+
+#. TRANS: Client error displayed when trying to repeat a notice you cannot access.
+msgid "Cannot repeat a notice you cannot read."
+msgstr "�י־�פשר להדהד עדכון ש�ינך יכולה לקרו�."
+
+#. TRANS: Client error displayed when trying to repeat an already repeated notice.
+msgid "You already repeated that notice."
+msgstr "כבר הדהדת �ת העדכון הזה."
+
+#. TRANS: Client error displayed when trying to reply to a notice a the target has no access to.
+#. TRANS: %1$s is a user nickname, %2$d is a notice ID (number).
+#, php-format
+msgid "%1$s has no access to notice %2$d."
+msgstr ""
+
 #. TRANS: Server exception thrown when a notice cannot be saved.
 #. TRANS: Server exception thrown when a notice cannot be updated.
-#: classes/Notice.php:372 classes/Notice.php:399
 msgid "Problem saving notice."
-msgstr "בעיה בשמירת ההודעה."
+msgstr "בעיה בשמירת העדכון."
 
 #. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:914
 msgid "Bad type provided to saveKnownGroups."
 msgstr ""
 
 #. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:1013
-#, fuzzy
 msgid "Problem saving group inbox."
-msgstr "בעיה בשמירת ההודעה."
-
-#. TRANS: Server exception thrown when a reply cannot be saved.
-#. TRANS: %1$d is a notice ID, %2$d is the ID of the mentioned user.
-#: classes/Notice.php:1127
-#, php-format
-msgid "Could not save reply for %1$d, %2$d."
-msgstr ""
+msgstr "בעיה בשמירת תיבת ההודעות הנכנסות של הקבוצה."
 
 #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
 #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1646
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr ""
 
+#. TRANS: Full name of a profile or group (%1$s) followed by nickname (%2$s) in parentheses.
 #. TRANS: Full name of a profile or group followed by nickname in parens
-#: classes/Profile.php:172 classes/User_group.php:242
 #, php-format
 msgctxt "FANCYNAME"
 msgid "%1$s (%2$s)"
@@ -6472,405 +6192,264 @@ msgstr ""
 
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:765
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr ""
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:774
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
 
+#. TRANS: Server exception.
+msgid "The tag you are trying to rename to already exists."
+msgstr ""
+
+#. TRANS: Server exception saving new tag without having a tagger specified.
+msgid "No tagger specified."
+msgstr ""
+
+#. TRANS: Server exception saving new tag without having a tag specified.
+msgid "No tag specified."
+msgstr ""
+
+#. TRANS: Server exception saving new tag.
+msgid "Could not create profile tag."
+msgstr ""
+
+#. TRANS: Server exception saving new tag.
+msgid "Could not set profile tag URI."
+msgstr ""
+
+#. TRANS: Server exception saving new tag.
+msgid "Could not set profile tag mainpage."
+msgstr ""
+
+#. TRANS: Client exception thrown trying to set more tags than allowed.
+#, php-format
+msgid ""
+"You already have created %d or more tags which is the maximum allowed number "
+"of tags. Try using or deleting some existing tags."
+msgstr ""
+
+#. TRANS: Client exception thrown when trying to add more people than allowed to a list.
+#, php-format
+msgid ""
+"You already have %1$d or more people in list %2$s, which is the maximum "
+"allowed number. Try unlisting others first."
+msgstr ""
+
+#. TRANS: Exception thrown when inserting a list subscription in the database fails.
+msgid "Adding list subscription failed."
+msgstr ""
+
+#. TRANS: Exception thrown when deleting a list subscription from the database fails.
+msgid "Removing list subscription failed."
+msgstr ""
+
 #. TRANS: Exception thrown when a right for a non-existing user profile is checked.
-#: classes/Remote_profile.php:54
-#, fuzzy
 msgid "Missing profile."
-msgstr "למשתמש �ין פרופיל."
+msgstr "דף משתמש חסר."
 
 #. TRANS: Exception thrown when a tag cannot be saved.
-#: classes/Status_network.php:338
-#, fuzzy
 msgid "Unable to save tag."
-msgstr "בעיה בשמירת ההודעה."
+msgstr "ל� מצליח לשמור תג."
 
 #. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
-#: classes/Subscription.php:77 lib/oauthstore.php:482
 msgid "You have been banned from subscribing."
 msgstr ""
 
 #. TRANS: Exception thrown when trying to subscribe while already subscribed.
-#: classes/Subscription.php:82
-#, fuzzy
 msgid "Already subscribed!"
-msgstr "ל� מנוי!"
+msgstr "כבר מנוי!"
 
 #. TRANS: Exception thrown when trying to subscribe to a user who has blocked the subscribing user.
-#: classes/Subscription.php:87
-#, fuzzy
 msgid "User has blocked you."
-msgstr "למשתמש �ין פרופיל."
+msgstr "המשתמש חס� �ותך."
 
 #. TRANS: Exception thrown when trying to unsibscribe without a subscription.
-#: classes/Subscription.php:176
-#, fuzzy
 msgid "Not subscribed!"
 msgstr "ל� מנוי!"
 
 #. TRANS: Exception thrown when trying to unsubscribe a user from themselves.
-#: classes/Subscription.php:183
 msgid "Could not delete self-subscription."
 msgstr "הכנסת מנוי חדש נכשלה."
 
-#. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
-#: classes/Subscription.php:211
-msgid "Could not delete subscription OMB token."
-msgstr "הכנסת מנוי חדש נכשלה."
-
 #. TRANS: Exception thrown when a subscription could not be deleted on the server.
-#: classes/Subscription.php:223
 msgid "Could not delete subscription."
 msgstr "הכנסת מנוי חדש נכשלה."
 
-#. TRANS: Activity tile when subscribing to another person.
-#: classes/Subscription.php:265
+#. TRANS: Activity title when subscribing to another person.
+msgctxt "TITLE"
 msgid "Follow"
 msgstr ""
 
 #. TRANS: Notification given when one person starts following another.
 #. TRANS: %1$s is the subscriber, %2$s is the subscribed.
-#: classes/Subscription.php:268
 #, php-format
 msgid "%1$s is now following %2$s."
 msgstr ""
 
 #. TRANS: Notice given on user registration.
 #. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
-#: classes/User.php:395
 #, php-format
 msgid "Welcome to %1$s, @%2$s!"
 msgstr ""
 
+#. TRANS: Exception thrown when trying view "repeated to me".
+msgid "Not implemented since inbox change."
+msgstr ""
+
 #. TRANS: Server exception.
-#: classes/User.php:918
 msgid "No single user defined for single-user mode."
 msgstr ""
 
 #. TRANS: Server exception.
-#: classes/User.php:922
 msgid "Single-user mode code called when not enabled."
 msgstr ""
 
+#. TRANS: Information on password recovery form if no known username or e-mail address was specified.
+msgid "No user with that email address or username."
+msgstr ""
+
+#. TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.
+msgid "No registered email address for that user."
+msgstr ""
+
+#. TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.
+msgid "Error saving address confirmation."
+msgstr "שגי�ה בשמירת �ישור הכתובת."
+
 #. TRANS: Server exception thrown when creating a group failed.
-#: classes/User_group.php:516
 msgid "Could not create group."
 msgstr "עידכון המשתמש נכשל."
 
 #. TRANS: Server exception thrown when updating a group URI failed.
-#: classes/User_group.php:526
 msgid "Could not set group URI."
 msgstr "שמירת הפרופיל נכשלה."
 
 #. TRANS: Server exception thrown when setting group membership failed.
-#: classes/User_group.php:549
 msgid "Could not set group membership."
 msgstr "עידכון המשתמש נכשל."
 
 #. TRANS: Server exception thrown when saving local group information failed.
-#: classes/User_group.php:564
 msgid "Could not save local group info."
 msgstr "שמירת הפרופיל נכשלה."
 
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:104
-#, fuzzy
-msgid "Change your profile settings"
-msgstr "הגדרות הפרופיל"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:111
-#, fuzzy
-msgid "Upload an avatar"
-msgstr "עדכון התמונה נכשל."
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:118
-#, fuzzy
-msgid "Change your password"
-msgstr "שנה סיסמה"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:125
-msgid "Change email handling"
+#. TRANS: Exception thrown when an account could not be located when it should be moved.
+#. TRANS: %s is the remote site.
+#, php-format
+msgid "Cannot locate account %s."
 msgstr ""
 
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:132
-#, fuzzy
-msgid "Design your profile"
-msgstr "למשתמש �ין פרופיל."
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:139
-msgid "Other options"
+#. TRANS: Exception thrown when a service document could not be located account move.
+#. TRANS: %s is the remote site.
+#, php-format
+msgid "Cannot find XRD for %s."
 msgstr ""
 
-#. TRANS: Link description in user account settings menu.
-#: lib/accountsettingsaction.php:141
-msgid "Other"
+#. TRANS: Exception thrown when an account could not be located when it should be moved.
+#. TRANS: %s is the remote site.
+#, php-format
+msgid "No AtomPub API service for %s."
+msgstr ""
+
+#. TRANS: H2 for user actions in a profile.
+#. TRANS: H2 for entity actions in a profile.
+msgid "User actions"
+msgstr ""
+
+#. TRANS: Text shown in user profile of not yet compeltely deleted users.
+msgid "User deletion in progress..."
+msgstr ""
+
+#. TRANS: Link title for link on user profile.
+msgid "Edit profile settings."
+msgstr ""
+
+#. TRANS: Link text for link on user profile.
+msgctxt "BUTTON"
+msgid "Edit"
+msgstr ""
+
+#. TRANS: Link title for link on user profile.
+msgid "Send a direct message to this user."
+msgstr ""
+
+#. TRANS: Link text for link on user profile.
+msgctxt "BUTTON"
+msgid "Message"
+msgstr ""
+
+#. TRANS: Label text on user profile to select a user role.
+msgid "Moderate"
+msgstr ""
+
+#. TRANS: Label text on user profile to select a user role.
+msgid "User role"
+msgstr "תפקיד משתמש"
+
+#. TRANS: Role that can be set for a user profile.
+msgctxt "role"
+msgid "Administrator"
+msgstr ""
+
+#. TRANS: Role that can be set for a user profile.
+msgctxt "role"
+msgid "Moderator"
 msgstr ""
 
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
-#: lib/action.php:148
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s - %2$s"
-msgstr "הסטטוס של %1$s ב-%2$s "
+msgstr "%1$s� – %2$s"
 
 #. TRANS: Page title for a page without a title set.
-#: lib/action.php:164
 msgid "Untitled page"
 msgstr ""
 
 #. TRANS: Localized tooltip for '...' expansion button on overlong remote messages.
-#: lib/action.php:312
 msgctxt "TOOLTIP"
 msgid "Show more"
 msgstr ""
 
-#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:531
-msgid "Primary site navigation"
+#. TRANS: Inline reply form submit button: submits a reply comment.
+msgctxt "BUTTON"
+msgid "Reply"
 msgstr ""
 
-#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:537
-msgctxt "TOOLTIP"
-msgid "Personal profile and friends timeline"
+#. TRANS: Placeholder text for inline reply form. Clicking in this box will turn it into a mini notice form.
+#. TRANS: Field label for reply mini form.
+msgid "Write a reply..."
 msgstr ""
 
-#. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:540
-#, fuzzy
-msgctxt "MENU"
-msgid "Personal"
-msgstr "�ישי"
-
-#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:542
-#, fuzzy
-msgctxt "TOOLTIP"
-msgid "Change your email, avatar, password, profile"
-msgstr "שנה סיסמה"
-
-#. TRANS: Main menu option when logged in for access to user settings
-#: lib/action.php:545
-#, fuzzy
-msgid "Account"
-msgstr "�ודות"
-
-#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:547
-#, fuzzy
-msgctxt "TOOLTIP"
-msgid "Connect to services"
-msgstr "נכשלה ההפניה לשרת: %s"
-
-#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
-#: lib/action.php:550
-msgid "Connect"
-msgstr "התחבר"
-
-#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:553
-#, fuzzy
-msgctxt "TOOLTIP"
-msgid "Change site configuration"
-msgstr "הרשמות"
-
-#. TRANS: Main menu option when logged in and site admin for access to site configuration
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/action.php:556 lib/groupnav.php:117
-msgctxt "MENU"
-msgid "Admin"
-msgstr ""
-
-#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:560
-#, php-format
-msgctxt "TOOLTIP"
-msgid "Invite friends and colleagues to join you on %s"
-msgstr ""
-
-#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-#: lib/action.php:563
-#, fuzzy
-msgctxt "MENU"
-msgid "Invite"
-msgstr "גודל ל� חוקי."
-
-#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:569
-msgctxt "TOOLTIP"
-msgid "Logout from the site"
-msgstr ""
-
-#. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:572
-#, fuzzy
-msgctxt "MENU"
-msgid "Logout"
-msgstr "צ�"
-
-#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:577
-#, fuzzy
-msgctxt "TOOLTIP"
-msgid "Create an account"
-msgstr "צור חשבון חדש"
-
-#. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:580
-#, fuzzy
-msgctxt "MENU"
-msgid "Register"
-msgstr "הירש�"
-
-#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:583
-msgctxt "TOOLTIP"
-msgid "Login to the site"
-msgstr ""
-
-#. TRANS: Main menu option when not logged in to log in
-#: lib/action.php:586
-#, fuzzy
-msgctxt "MENU"
-msgid "Login"
-msgstr "היכנס"
-
-#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:589
-#, fuzzy
-msgctxt "TOOLTIP"
-msgid "Help me!"
-msgstr "עזרה"
-
-#. TRANS: Main menu option for help on the StatusNet site
-#: lib/action.php:592
-#, fuzzy
-msgctxt "MENU"
-msgid "Help"
-msgstr "עזרה"
-
-#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:595
-msgctxt "TOOLTIP"
-msgid "Search for people or text"
-msgstr ""
-
-#. TRANS: Main menu option when logged in or when the StatusNet instance is not private
-#: lib/action.php:598
-#, fuzzy
-msgctxt "MENU"
-msgid "Search"
-msgstr "חיפוש"
-
-#. TRANS: DT element for site notice. String is hidden in default CSS.
-#. TRANS: Menu item for site administration
-#: lib/action.php:620 lib/adminpanelaction.php:387
-#, fuzzy
-msgid "Site notice"
-msgstr "הודעה חדשה"
-
-#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:687
-msgid "Local views"
-msgstr ""
-
-#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:757
-#, fuzzy
-msgid "Page notice"
-msgstr "הודעה חדשה"
-
-#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:858
-#, fuzzy
-msgid "Secondary site navigation"
-msgstr "הרשמות"
-
-#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:864
-msgid "Help"
-msgstr "עזרה"
-
-#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:867
-msgid "About"
-msgstr "�ודות"
-
-#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:870
-msgid "FAQ"
-msgstr "רשימת ש�לות נפוצות"
-
-#. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:875
-msgid "TOS"
-msgstr ""
-
-#. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:879
-msgid "Privacy"
-msgstr "פרטיות"
-
-#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-#: lib/action.php:882
-msgid "Source"
-msgstr "מקור"
-
-#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
-#. TRANS: StatusNet site, where to report bugs, ...
-#: lib/action.php:889
-msgid "Contact"
-msgstr "צור קשר"
-
-#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#: lib/action.php:892
-msgid "Badge"
-msgstr ""
-
-#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:921
-msgid "StatusNet software license"
+#. TRANS: Tab on the notice form.
+msgctxt "TAB"
+msgid "Status"
 msgstr ""
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:928
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
 "broughtby%%](%%site.broughtbyurl%%)."
 msgstr ""
-"**%%site.name%%** הו� שרות ביקרובלוג הניתן על ידי [%%site.broughtby%%](%%"
+"**%%site.name%%** הו� שירות מיקרובלוג הניתן על־ידי [%%site.broughtby%%](%%"
 "site.broughtbyurl%%)."
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:931
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
-msgstr "**%%site.name%%** הו� שרות ביקרובלוג."
+msgstr "**%%site.name%%** הו� שרות מיקרובלוג."
 
 #. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:938
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -6881,291 +6460,261 @@ msgstr ""
 "s, המופצת תחת רשיון [GNU Affero General Public License](http://www.fsf.org/"
 "licensing/licenses/agpl-3.0.html)"
 
-#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:954
-#, fuzzy
-msgid "Site content license"
-msgstr "הודעה חדשה"
-
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:961
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:968
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:972
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:1004
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr ""
 
-#. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1340
-msgid "Pagination"
-msgstr ""
-
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1351
-#, fuzzy
 msgid "After"
-msgstr "<< �חרי"
+msgstr "חדש יותר"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1361
-#, fuzzy
 msgid "Before"
-msgstr "לפני >>"
+msgstr "ישן יותר"
 
 #. TRANS: Client exception thrown when a feed instance is a DOMDocument.
-#: lib/activity.php:125
 msgid "Expecting a root feed element but got a whole XML document."
 msgstr ""
 
 #. TRANS: Client exception thrown when using an unknown verb for the activity importer.
-#: lib/activityimporter.php:81
 #, php-format
 msgid "Unknown verb: \"%s\"."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to force a subscription for an untrusted user.
-#: lib/activityimporter.php:107
 msgid "Cannot force subscription for untrusted user."
 msgstr ""
 
-#. TRANS: Client exception thrown when trying to for a remote user to subscribe.
-#: lib/activityimporter.php:117
+#. TRANS: Client exception thrown when trying to force a remote user to subscribe.
 msgid "Cannot force remote user to subscribe."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to subscribe to an unknown profile.
-#: lib/activityimporter.php:132
 msgid "Unknown profile."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to import an event not related to the importing user.
-#: lib/activityimporter.php:138
 msgid "This activity seems unrelated to our user."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to join a remote group that is not a group.
-#: lib/activityimporter.php:154
 msgid "Remote profile is not a group!"
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to join a group the importing user is already a member of.
-#: lib/activityimporter.php:163
 msgid "User is already a member of this group."
 msgstr ""
 
+#. TRANS: Client exception thrown when trying to import a notice by another user.
+#. TRANS: %1$s is the source URI of the notice, %2$s is the URI of the author.
+#, php-format
+msgid "Already know about notice %1$s and  it has a different author %2$s."
+msgstr ""
+
 #. TRANS: Client exception thrown when trying to overwrite the author information for a non-trusted user during import.
-#: lib/activityimporter.php:207
 msgid "Not overwriting author info for non-trusted user."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to import a notice without content.
 #. TRANS: %s is the notice URI.
-#: lib/activityimporter.php:223
 #, php-format
 msgid "No content for notice %s."
 msgstr ""
 
+#. TRANS: Exception thrown if a non-existing user is provided. %s is a user ID.
+#, php-format
+msgid "No such user \"%s\"."
+msgstr ""
+
+#. TRANS: Client exception thrown when post to collection fails with a 400 status.
+#. TRANS: %1$s is a URL, %2$s is the status, %s$s is the fail reason.
+#. TRANS: Server exception thrown when post to collection fails with a 500 status.
+#. TRANS: %1$s is a URL, %2$s is the status, %s$s is the fail reason.
+#. TRANS: Exception thrown when post to collection fails with a status that is not handled.
+#. TRANS: %1$s is a URL, %2$s is the status, %s$s is the fail reason.
+#, php-format
+msgctxt "URLSTATUSREASON"
+msgid "%1$s %2$s %3$s"
+msgstr ""
+
 #. TRANS: Client exception thrown when there is no source attribute.
-#: lib/activityutils.php:200
 msgid "Can't handle remote content yet."
 msgstr ""
 
 #. TRANS: Client exception thrown when there embedded XML content is found that cannot be processed yet.
-#: lib/activityutils.php:237
 msgid "Can't handle embedded XML content yet."
 msgstr ""
 
 #. TRANS: Client exception thrown when base64 encoded content is found that cannot be processed yet.
-#: lib/activityutils.php:242
 msgid "Can't handle embedded Base64 content yet."
 msgstr ""
 
 #. TRANS: Client error message thrown when a user tries to change admin settings but has no access rights.
-#: lib/adminpanelaction.php:96
 msgid "You cannot make changes to this site."
 msgstr ""
 
 #. TRANS: Client error message throw when a certain panel's settings cannot be changed.
-#: lib/adminpanelaction.php:108
 msgid "Changes to that panel are not allowed."
 msgstr ""
 
 #. TRANS: Client error message.
-#: lib/adminpanelaction.php:222
 msgid "showForm() not implemented."
 msgstr ""
 
 #. TRANS: Client error message
-#: lib/adminpanelaction.php:250
 msgid "saveSettings() not implemented."
 msgstr ""
 
-#. TRANS: Client error message thrown if design settings could not be deleted in
-#. TRANS: the admin panel Design.
-#: lib/adminpanelaction.php:274
-msgid "Unable to delete design setting."
+#. TRANS: Header in administrator navigation panel.
+msgctxt "HEADER"
+msgid "Home"
 msgstr ""
 
-#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:337
-#, fuzzy
-msgid "Basic site configuration"
-msgstr "הרשמות"
+#. TRANS: Header in administrator navigation panel.
+msgctxt "HEADER"
+msgid "Admin"
+msgstr ""
 
-#. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:339
-#, fuzzy
+#. TRANS: Menu item title in administrator navigation panel.
+msgid "Basic site configuration"
+msgstr "תצורת �תר בסיסית"
+
+#. TRANS: Menu item in administrator navigation panel.
 msgctxt "MENU"
 msgid "Site"
-msgstr "הודעה חדשה"
+msgstr "�תר"
 
-#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:345
-msgid "Design configuration"
-msgstr ""
-
-#. TRANS: Menu item for site administration
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/adminpanelaction.php:347 lib/groupnav.php:135
-#, fuzzy
-msgctxt "MENU"
-msgid "Design"
-msgstr "�ישי"
-
-#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:353
+#. TRANS: Menu item title in administrator navigation panel.
 msgid "User configuration"
 msgstr "�ין קוד �ישור."
 
-#. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:118
+#. TRANS: Menu item in administrator navigation panel.
+msgctxt "MENU"
 msgid "User"
-msgstr "משתמש"
+msgstr "מתשמש"
 
-#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:361
-#, fuzzy
+#. TRANS: Menu item title in administrator navigation panel.
 msgid "Access configuration"
-msgstr "הרשמות"
+msgstr "תצורת גישה"
 
-#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:369
+#. TRANS: Menu item in administrator navigation panel.
+msgctxt "MENU"
+msgid "Access"
+msgstr "גישה"
+
+#. TRANS: Menu item title in administrator navigation panel.
 msgid "Paths configuration"
 msgstr "�ין קוד �ישור."
 
-#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:377
+#. TRANS: Menu item in administrator navigation panel.
+msgctxt "MENU"
+msgid "Paths"
+msgstr ""
+
+#. TRANS: Menu item title in administrator navigation panel.
 msgid "Sessions configuration"
 msgstr "�ין קוד �ישור."
 
-#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:385
-#, fuzzy
+#. TRANS: Menu item in administrator navigation panel.
+msgctxt "MENU"
+msgid "Sessions"
+msgstr "התחברויות"
+
+#. TRANS: Menu item title in administrator navigation panel.
 msgid "Edit site notice"
-msgstr "הודעה חדשה"
+msgstr "עריכת הודעת �תר"
 
-#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:393
-#, fuzzy
+#. TRANS: Menu item in administrator navigation panel.
+msgctxt "MENU"
+msgid "Site notice"
+msgstr ""
+
+#. TRANS: Menu item title in administrator navigation panel.
 msgid "Snapshots configuration"
-msgstr "הרשמות"
+msgstr "תצורת היטל־בזק"
 
-#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:401
+#. TRANS: Menu item in administrator navigation panel.
+msgctxt "MENU"
+msgid "Snapshots"
+msgstr ""
+
+#. TRANS: Menu item title in administrator navigation panel.
 msgid "Set site license"
 msgstr ""
 
+#. TRANS: Menu item in administrator navigation panel.
+msgctxt "MENU"
+msgid "License"
+msgstr ""
+
+#. TRANS: Menu item title in administrator navigation panel.
+msgid "Plugins configuration"
+msgstr ""
+
+#. TRANS: Menu item in administrator navigation panel.
+msgctxt "MENU"
+msgid "Plugins"
+msgstr ""
+
 #. TRANS: Client error 401.
-#: lib/apiauth.php:111
 msgid "API resource requires read-write access, but you only have read access."
 msgstr ""
 
 #. TRANS: OAuth exception thrown when no application is found for a given consumer key.
-#: lib/apiauth.php:177
 msgid "No application for that consumer key."
 msgstr ""
 
+#. TRANS: Authorization exception thrown when a user without API access tries to access the API.
+msgid "Not allowed to use API."
+msgstr ""
+
 #. TRANS: OAuth exception given when an incorrect access token was given for a user.
-#: lib/apiauth.php:219
 msgid "Bad access token."
 msgstr ""
 
 #. TRANS: OAuth exception given when no user was found for a given token (no token was found).
-#: lib/apiauth.php:224
 msgid "No user for that token."
 msgstr ""
 
 #. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel".
 #. TRANS: Client error thrown when authentication fails.
-#: lib/apiauth.php:266 lib/apiauth.php:293
 msgid "Could not authenticate you."
 msgstr ""
 
-#. TRANS: Server error displayed when trying to create an anynymous OAuth consumer.
-#: lib/apioauthstore.php:45
-msgid "Could not create anonymous consumer."
-msgstr ""
-
-#. TRANS: Server error displayed when trying to create an anynymous OAuth application.
-#: lib/apioauthstore.php:69
-msgid "Could not create anonymous OAuth application."
-msgstr ""
-
-#. TRANS: Exception thrown when no token association could be found.
-#: lib/apioauthstore.php:151
-msgid ""
-"Could not find a profile and application associated with the request token."
-msgstr ""
-
-#. TRANS: Exception thrown when no access token can be issued.
-#: lib/apioauthstore.php:186
-msgid "Could not issue access token."
-msgstr ""
-
-#. TRANS: Server error displayed when a database error occurs.
-#: lib/apioauthstore.php:243
-#, fuzzy
-msgid "Database error inserting OAuth application user."
-msgstr "שגי�ת מסד נתוני� בהכנסת התגובה: %s"
-
-#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
-#: lib/apioauthstore.php:285
-msgid "Tried to revoke unknown token."
-msgstr ""
-
-#. TRANS: Exception thrown when an attempt is made to remove a revoked token.
-#: lib/apioauthstore.php:290
-msgid "Failed to delete revoked token."
+#. TRANS: Form input field label for application icon.
+msgid "Icon"
 msgstr ""
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:178
 msgid "Icon for this application"
 msgstr ""
 
+#. TRANS: Form input field label for application name.
+msgid "Name"
+msgstr "ש�"
+
 #. TRANS: Form input field instructions.
 #. TRANS: %d is the number of available characters for the description.
-#: lib/applicationeditform.php:201
 #, php-format
 msgid "Describe your application in %d character"
 msgid_plural "Describe your application in %d characters"
@@ -7173,221 +6722,228 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:205
-#, fuzzy
 msgid "Describe your application"
-msgstr "ת�ר �ת עצמך ו�ת נוש�י העניין שלך ב-140 �ותיות"
-
-#. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:216
-#, fuzzy
-msgid "URL of the homepage of this application"
-msgstr "הכתובת של �תר הבית שלך, בלוג, �ו פרופיל ב�תר �חר "
+msgstr "תי�ור היישו� שלך"
 
 #. TRANS: Form input field label.
-#: lib/applicationeditform.php:218
-#, fuzzy
-msgid "Source URL"
-msgstr "מקור"
+#. TRANS: Text area label on group edit form; contains description of group.
+#. TRANS: Field label for description of list.
+#. TRANS: Dropdown option for searching in profiles.
+msgid "Description"
+msgstr "תי�ור"
+
+#. TRANS: Form input field instructions.
+msgid "URL of the homepage of this application"
+msgstr "כתובת �תר הבית של היישו� הזה"
+
+#. TRANS: Form input field label.
+msgid "Source URL"
+msgstr "כתובת המקור"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:225
 msgid "Organization responsible for this application"
 msgstr ""
 
-#. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:234
-#, fuzzy
-msgid "URL for the homepage of the organization"
-msgstr "הכתובת של �תר הבית שלך, בלוג, �ו פרופיל ב�תר �חר "
+#. TRANS: Form input field label.
+msgid "Organization"
+msgstr "�רגון"
+
+#. TRANS: Form input field instructions.
+msgid "URL for the homepage of the organization"
+msgstr "הכתובת של �תר הבית של ה�רגון"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:243
 msgid "URL to redirect to after authentication"
 msgstr ""
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:271
 msgid "Browser"
 msgstr ""
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:288
 msgid "Desktop"
 msgstr ""
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:290
 msgid "Type of application, browser or desktop"
 msgstr ""
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:314
 msgid "Read-only"
 msgstr ""
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:334
 msgid "Read-write"
 msgstr ""
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:336
 msgid "Default access for this application: read-only, or read-write"
 msgstr ""
 
 #. TRANS: Submit button title.
-#: lib/applicationeditform.php:353
-msgid "Cancel"
-msgstr "בטל"
+#, fuzzy
+msgid "Cancel application changes."
+msgstr "מחיקת יישו�"
 
-#: lib/applicationlist.php:247
+#. TRANS: Submit button title.
+#, fuzzy
+msgid "Save application changes."
+msgstr "מחיקת יישו�"
+
+#. TRANS: Name for an anonymous application in application list.
+msgid "Unknown application"
+msgstr ""
+
+#. TRANS: Message has a leading space and a trailing space. Used in application list.
+#. TRANS: Before this message the application name is put, behind it the organisation that manages it.
 msgid " by "
 msgstr ""
 
 #. TRANS: Application access type
-#: lib/applicationlist.php:260
 msgid "read-write"
 msgstr ""
 
 #. TRANS: Application access type
-#: lib/applicationlist.php:262
 msgid "read-only"
 msgstr ""
 
 #. TRANS: Used in application list. %1$s is a modified date, %2$s is access type ("read-write" or "read-only")
-#: lib/applicationlist.php:268
 #, php-format
 msgid "Approved %1$s - \"%2$s\" access."
 msgstr ""
 
 #. TRANS: Access token in the application list.
 #. TRANS: %s are the first 7 characters of the access token.
-#: lib/applicationlist.php:282
 #, php-format
 msgid "Access token starting with: %s"
 msgstr ""
 
-#. TRANS: Button label
-#: lib/applicationlist.php:298
+#. TRANS: Button label in application list to revoke access to user data.
 msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "שיחזור"
 
-#: lib/atom10feed.php:113
+#. TRANS: Submit button text to accept a group membership request on approve group form.
+#. TRANS: Submit button text to accept a subscription request on approve sub form.
+msgctxt "BUTTON"
+msgid "Accept"
+msgstr ""
+
+#. TRANS: Submit button text to reject a group membership request on approve group form.
+#. TRANS: Submit button text to reject a subscription request on approve sub form.
+msgctxt "BUTTON"
+msgid "Reject"
+msgstr ""
+
+#. TRANS: Atom feed exception thrown when an author element does not contain a name element.
 msgid "Author element must contain a name element."
 msgstr ""
 
 #. TRANS: Server exception thrown when using the method setActivitySubject() in the class Atom10Feed.
-#: lib/atom10feed.php:160
 msgid "Do not use this method!"
 msgstr ""
 
-#. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:294
-msgid "Author"
+#. TRANS: Title in atom list notice feed. %1$s is a list name, %2$s is a tagger's nickname.
+#, php-format
+msgid "Timeline for people in list %1$s by %2$s"
 msgstr ""
 
-#. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:308
-#, fuzzy
-msgid "Provider"
-msgstr "פרופיל"
+#. TRANS: Message is used as a subtitle in atom list notice feed.
+#. TRANS: %1$s is a tagger's nickname, %2$s is a list name, %3$s is a site name.
+#, php-format
+msgid "Updates from %1$s's list %2$s on %3$s!"
+msgstr ""
 
 #. TRANS: Title.
-#: lib/attachmentnoticesection.php:67
 msgid "Notices where this attachment appears"
 msgstr ""
 
 #. TRANS: Title.
-#: lib/attachmenttagcloudsection.php:48
 msgid "Tags for this attachment"
 msgstr ""
 
 #. TRANS: Exception thrown when a password change fails.
-#: lib/authenticationplugin.php:221 lib/authenticationplugin.php:227
 msgid "Password changing failed."
 msgstr ""
 
 #. TRANS: Exception thrown when a password change attempt fails because it is not allowed.
-#: lib/authenticationplugin.php:238
 msgid "Password changing is not allowed."
 msgstr ""
 
 #. TRANS: Title for the form to block a user.
-#: lib/blockform.php:68
 msgid "Block"
 msgstr ""
 
+#. TRANS: Description of the form to block a user.
+msgid "Block this user"
+msgstr "לחסו� �ת המשתמש הזה"
+
+#. TRANS: Submit button text on form to cancel group join request.
+msgctxt "BUTTON"
+msgid "Cancel join request"
+msgstr ""
+
+#. TRANS: Button text for form action to cancel a subscription request.
+msgctxt "BUTTON"
+msgid "Cancel subscription request"
+msgstr ""
+
 #. TRANS: Title for command results.
-#: lib/channel.php:160 lib/channel.php:181
 msgid "Command results"
 msgstr ""
 
 #. TRANS: Title for command results.
-#: lib/channel.php:194
 msgid "AJAX error"
 msgstr ""
 
 #. TRANS: E-mail subject when a command has completed.
-#: lib/channel.php:233 lib/mailhandler.php:143
+#. TRANS: E-mail subject for reply to an e-mail command.
 msgid "Command complete"
 msgstr ""
 
 #. TRANS: E-mail subject when a command has failed.
-#: lib/channel.php:244
 msgid "Command failed"
 msgstr ""
 
 #. TRANS: Command exception text shown when a notice ID is requested that does not exist.
-#: lib/command.php:82 lib/command.php:106
-#, fuzzy
 msgid "Notice with that id does not exist."
-msgstr "�ין פרופיל תו�� לפרופיל המרוחק "
+msgstr "עדכון ע� המזהה הזה �ינו קיי�."
 
 #. TRANS: Command exception text shown when a last user notice is requested and it does not exist.
 #. TRANS: Error text shown when a last user notice is requested and it does not exist.
-#: lib/command.php:99 lib/command.php:630
-#, fuzzy
 msgid "User has no last notice."
-msgstr "למשתמש �ין פרופיל."
+msgstr "למשתמש �ין עדכון �חרון."
 
 #. TRANS: Message given requesting a profile for a non-existing user.
 #. TRANS: %s is the nickname of the user for which the profile could not be found.
-#: lib/command.php:128
-#, fuzzy, php-format
+#, php-format
 msgid "Could not find a user with nickname %s."
-msgstr "עידכון המשתמש נכשל."
+msgstr "ל� המצ� משתמש ע� הכינוי %s."
 
 #. TRANS: Message given getting a non-existing user.
 #. TRANS: %s is the nickname of the user that could not be found.
-#: lib/command.php:148
 #, php-format
 msgid "Could not find a local user with nickname %s."
 msgstr ""
 
 #. TRANS: Error text shown when an unimplemented command is given.
-#: lib/command.php:183
 msgid "Sorry, this command is not yet implemented."
 msgstr ""
 
 #. TRANS: Command exception text shown when a user tries to nudge themselves.
-#: lib/command.php:229
 msgid "It does not make a lot of sense to nudge yourself!"
-msgstr ""
+msgstr "ל� הגיוני כל־כך להטריד �ת עצמך!"
 
 #. TRANS: Message given having nudged another user.
 #. TRANS: %s is the nickname of the user that was nudged.
-#: lib/command.php:238
 #, php-format
 msgid "Nudge sent to %s."
-msgstr ""
+msgstr "דחיפה נשלחה �ל %s."
 
 #. TRANS: User statistics text.
 #. TRANS: %1$s is the number of other user the user is subscribed to.
 #. TRANS: %2$s is the number of users that are subscribed to the user.
 #. TRANS: %3$s is the number of notices the user has sent.
-#: lib/command.php:268
 #, php-format
 msgid ""
 "Subscriptions: %1$s\n"
@@ -7395,64 +6951,100 @@ msgid ""
 "Notices: %3$s"
 msgstr ""
 
+#. TRANS: Error message text shown when a favorite could not be set because it has already been favorited.
+msgid "Could not create favorite: Already favorited."
+msgstr ""
+
 #. TRANS: Text shown when a notice has been marked as favourite successfully.
-#: lib/command.php:312
 msgid "Notice marked as fave."
 msgstr ""
 
 #. TRANS: Message given having added a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:357
 #, php-format
 msgid "%1$s joined group %2$s."
 msgstr ""
 
 #. TRANS: Message given having removed a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:405
 #, php-format
 msgid "%1$s left group %2$s."
 msgstr ""
 
+#. TRANS: Error displayed if tagging a user fails.
+#. TRANS: %1$s is the tagged user, %2$s is the error message (no punctuation).
+#, php-format
+msgid "Error tagging %1$s: %2$s"
+msgstr ""
+
+#. TRANS: Succes message displayed if tagging a user succeeds.
+#. TRANS: %1$s is the tagged user's nickname, %2$s is a list of tags.
+#. TRANS: Plural is decided based on the number of tags added (not part of message).
+#, php-format
+msgid "%1$s was tagged %2$s"
+msgid_plural "%1$s was tagged %2$s"
+msgstr[0] ""
+msgstr[1] ""
+
+#. TRANS: Separator for list of tags.
+#. TRANS: Separator in list of user names like "Jim, Bob, Mary".
+msgid ", "
+msgstr ""
+
+#. TRANS: Error displayed if a given tag is invalid.
+#. TRANS: %s is the invalid tag.
+#, php-format
+msgid "Invalid tag: \"%s\""
+msgstr "תג ל� תקין: \"%s\""
+
+#. TRANS: Error displayed if untagging a user fails.
+#. TRANS: %1$s is the untagged user, %2$s is the error message (no punctuation).
+#, php-format
+msgid "Error untagging %1$s: %2$s"
+msgstr ""
+
+#. TRANS: Succes message displayed if untagging a user succeeds.
+#. TRANS: %1$s is the untagged user's nickname, %2$s is a list of tags.
+#. TRANS: Plural is decided based on the number of tags removed (not part of message).
+#, php-format
+msgid "The following tag was removed from user %1$s: %2$s."
+msgid_plural "The following tags were removed from user %1$s: %2$s."
+msgstr[0] ""
+msgstr[1] ""
+
 #. TRANS: Whois output.
 #. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: lib/command.php:426
 #, php-format
 msgctxt "WHOIS"
 msgid "%1$s (%2$s)"
 msgstr ""
 
 #. TRANS: Whois output. %s is the full name of the queried user.
-#: lib/command.php:430
-#, fuzzy, php-format
+#, php-format
 msgid "Fullname: %s"
-msgstr "ש� מל�"
+msgstr "ש� מל�: %s"
 
 #. TRANS: Whois output. %s is the location of the queried user.
-#. TRANS: Profile info line in new-subscriber notification e-mail.
+#. TRANS: Profile info line in notification e-mail.
 #. TRANS: %s is a location.
-#: lib/command.php:434 lib/mail.php:278
-#, fuzzy, php-format
+#, php-format
 msgid "Location: %s"
-msgstr "מיקו�"
+msgstr "מיקו�: %s"
 
 #. TRANS: Whois output. %s is the homepage of the queried user.
-#. TRANS: Profile info line in new-subscriber notification e-mail.
+#. TRANS: Profile info line in notification e-mail.
 #. TRANS: %s is a homepage.
-#: lib/command.php:438 lib/mail.php:282
-#, fuzzy, php-format
+#, php-format
 msgid "Homepage: %s"
-msgstr "�תר בית"
+msgstr "�תר בית: %s"
 
 #. TRANS: Whois output. %s is the bio information of the queried user.
-#: lib/command.php:442
 #, php-format
 msgid "About: %s"
 msgstr "�ודות: %s"
 
 #. TRANS: Command exception text shown when trying to send a direct message to a remote user (a user not registered at the current server).
 #. TRANS: %s is a remote profile.
-#: lib/command.php:471
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
@@ -7461,34 +7053,30 @@ msgstr ""
 
 #. TRANS: Message given if content is too long. %1$sd is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:488
+#. TRANS: Message given when a status is too long. %1$s is the maximum number of characters,
+#. TRANS: %2$s is the number of characters sent (used for plural).
 #, php-format
 msgid "Message too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Message too long - maximum is %1$d characters, you sent %2$d."
 msgstr[0] ""
 msgstr[1] ""
 
+#. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
+msgid "You can't send a message to this user."
+msgstr "�ינך יכול לשלוח הודעה למשתמש הזה."
+
 #. TRANS: Error text shown sending a direct message fails with an unknown reason.
-#: lib/command.php:516
-#, fuzzy
 msgid "Error sending direct message."
-msgstr "שגי�ה ביצירת ש� המשתמש."
+msgstr "שגי�ה בשליחת הודעה ישיר."
 
 #. TRANS: Message given having repeated a notice from another user.
 #. TRANS: %s is the name of the user for which the notice was repeated.
-#: lib/command.php:553
-#, fuzzy, php-format
+#, php-format
 msgid "Notice from %s repeated."
-msgstr "הודעות"
-
-#. TRANS: Error text shown when repeating a notice fails with an unknown reason.
-#: lib/command.php:556
-msgid "Error repeating notice."
-msgstr "שגי�ה ביצירת ש� המשתמש."
+msgstr "עדכון מ־%s הודהד."
 
 #. TRANS: Message given if content of a notice for a reply is too long. %1$d is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:591
 #, php-format
 msgid "Notice too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Notice too long - maximum is %1$d characters, you sent %2$d."
@@ -7497,105 +7085,83 @@ msgstr[1] ""
 
 #. TRANS: Text shown having sent a reply to a notice successfully.
 #. TRANS: %s is the nickname of the user of the notice the reply was sent to.
-#: lib/command.php:604
-#, fuzzy, php-format
+#, php-format
 msgid "Reply to %s sent."
-msgstr "תגובת עבור %s"
+msgstr "תשובה ל־%s נשלחה."
 
 #. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
-#: lib/command.php:607
-#, fuzzy
 msgid "Error saving notice."
-msgstr "בעיה בשמירת ההודעה."
+msgstr "שגי�ה בשמירת העדכון."
 
 #. TRANS: Error text shown when no username was provided when issuing a subscribe command.
-#: lib/command.php:654
 msgid "Specify the name of the user to subscribe to."
 msgstr ""
 
 #. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
-#: lib/command.php:663
-#, fuzzy
 msgid "Can't subscribe to OMB profiles by command."
-msgstr "ל� שלחנו �לינו �ת הפרופיל הזה"
+msgstr "ל� ניתן להירש� לפרופילי OMB על־ידי הפקודה הז�ת."
 
 #. TRANS: Text shown after having subscribed to another user successfully.
 #. TRANS: %s is the name of the user the subscription was requested for.
-#: lib/command.php:671
 #, php-format
 msgid "Subscribed to %s."
 msgstr ""
 
 #. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
 #. TRANS: Error text shown when no username was provided when issuing the command.
-#: lib/command.php:692 lib/command.php:803
 msgid "Specify the name of the user to unsubscribe from."
 msgstr ""
 
 #. TRANS: Text shown after having unsubscribed from another user successfully.
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:703
 #, php-format
 msgid "Unsubscribed from %s."
 msgstr ""
 
 #. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
 #. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
-#: lib/command.php:723 lib/command.php:749
 msgid "Command not yet implemented."
 msgstr ""
 
 #. TRANS: Text shown when issuing the command "off" successfully.
-#: lib/command.php:727
-#, fuzzy
 msgid "Notification off."
-msgstr "�ין קוד �ישור."
+msgstr "ההודעות כובו."
 
 #. TRANS: Error text shown when the command "off" fails for an unknown reason.
-#: lib/command.php:730
 msgid "Can't turn off notification."
 msgstr ""
 
 #. TRANS: Text shown when issuing the command "on" successfully.
-#: lib/command.php:753
-#, fuzzy
 msgid "Notification on."
-msgstr "�ין קוד �ישור."
+msgstr "ההודעות הופעלו."
 
 #. TRANS: Error text shown when the command "on" fails for an unknown reason.
-#: lib/command.php:756
 msgid "Can't turn on notification."
 msgstr ""
 
 #. TRANS: Error text shown when issuing the login command while login is disabled.
-#: lib/command.php:770
 msgid "Login command is disabled."
 msgstr ""
 
 #. TRANS: Text shown after issuing the login command successfully.
 #. TRANS: %s is a logon link..
-#: lib/command.php:783
 #, php-format
 msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr ""
 
 #. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:812
 #, php-format
 msgid "Unsubscribed %s."
 msgstr ""
 
 #. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
-#: lib/command.php:830
-#, fuzzy
 msgid "You are not subscribed to anyone."
-msgstr "ל� שלחנו �לינו �ת הפרופיל הזה"
+msgstr "�ינך מנוי ל�יש."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed users.
-#: lib/command.php:835
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "ל� שלחנו �לינו �ת הפרופיל הזה"
@@ -7603,15 +7169,12 @@ msgstr[1] "ל� שלחנו �לינו �ת הפרופיל הזה"
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user
 #. TRANS: (followers) without having any subscribers.
-#: lib/command.php:857
-#, fuzzy
 msgid "No one is subscribed to you."
-msgstr "הרשמה מרוחקת"
+msgstr "�יש ל� מנוי �ליך."
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.
-#: lib/command.php:862
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "הרשמה מרוחקת"
@@ -7619,256 +7182,371 @@ msgstr[1] "הרשמה מרוחקת"
 
 #. TRANS: Text shown after requesting groups a user is subscribed to without having
 #. TRANS: any group subscriptions.
-#: lib/command.php:884
-#, fuzzy
 msgid "You are not a member of any groups."
-msgstr "ל� שלחנו �לינו �ת הפרופיל הזה"
+msgstr "�ינך חבר בשו� קבוצה."
 
 #. TRANS: Text shown after requesting groups a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.
-#: lib/command.php:889
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "ל� שלחנו �לינו �ת הפרופיל הזה"
 msgstr[1] "ל� שלחנו �לינו �ת הפרופיל הזה"
 
-#. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-#: lib/command.php:904
-msgid ""
-"Commands:\n"
-"on - turn on notifications\n"
-"off - turn off notifications\n"
-"help - show this help\n"
-"follow <nickname> - subscribe to user\n"
-"groups - lists the groups you have joined\n"
-"subscriptions - list the people you follow\n"
-"subscribers - list the people that follow you\n"
-"leave <nickname> - unsubscribe from user\n"
-"d <nickname> <text> - direct message to user\n"
-"get <nickname> - get last notice from user\n"
-"whois <nickname> - get profile info on user\n"
-"lose <nickname> - force user to stop following you\n"
-"fav <nickname> - add user's last notice as a 'fave'\n"
-"fav #<notice_id> - add notice with the given id as a 'fave'\n"
-"repeat #<notice_id> - repeat a notice with a given id\n"
-"repeat <nickname> - repeat the last notice from user\n"
-"reply #<notice_id> - reply to notice with a given id\n"
-"reply <nickname> - reply to the last notice from user\n"
-"join <group> - join group\n"
-"login - Get a link to login to the web interface\n"
-"drop <group> - leave group\n"
-"stats - get your stats\n"
-"stop - same as 'off'\n"
-"quit - same as 'off'\n"
-"sub <nickname> - same as 'follow'\n"
-"unsub <nickname> - same as 'leave'\n"
-"last <nickname> - same as 'get'\n"
-"on <nickname> - not yet implemented.\n"
-"off <nickname> - not yet implemented.\n"
-"nudge <nickname> - remind a user to update.\n"
-"invite <phone number> - not yet implemented.\n"
-"track <word> - not yet implemented.\n"
-"untrack <word> - not yet implemented.\n"
-"track off - not yet implemented.\n"
-"untrack all - not yet implemented.\n"
-"tracks - not yet implemented.\n"
-"tracking - not yet implemented.\n"
+#. TRANS: Header line of help text for commands.
+msgctxt "COMMANDHELP"
+msgid "Commands:"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "on".
+msgctxt "COMMANDHELP"
+msgid "turn on notifications"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "off".
+msgctxt "COMMANDHELP"
+msgid "turn off notifications"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "help".
+msgctxt "COMMANDHELP"
+msgid "show this help"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "follow <nickname>".
+msgctxt "COMMANDHELP"
+msgid "subscribe to user"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "groups".
+msgctxt "COMMANDHELP"
+msgid "lists the groups you have joined"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "tag".
+msgctxt "COMMANDHELP"
+msgid "tag a user"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "untag".
+msgctxt "COMMANDHELP"
+msgid "untag a user"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "subscriptions".
+msgctxt "COMMANDHELP"
+msgid "list the people you follow"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "subscribers".
+msgctxt "COMMANDHELP"
+msgid "list the people that follow you"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "leave <nickname>".
+msgctxt "COMMANDHELP"
+msgid "unsubscribe from user"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "d <nickname> <text>".
+msgctxt "COMMANDHELP"
+msgid "direct message to user"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "get <nickname>".
+msgctxt "COMMANDHELP"
+msgid "get last notice from user"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "whois <nickname>".
+msgctxt "COMMANDHELP"
+msgid "get profile info on user"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "lose <nickname>".
+msgctxt "COMMANDHELP"
+msgid "force user to stop following you"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "fav <nickname>".
+msgctxt "COMMANDHELP"
+msgid "add user's last notice as a 'fave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "fav #<notice_id>".
+msgctxt "COMMANDHELP"
+msgid "add notice with the given id as a 'fave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "repeat #<notice_id>".
+msgctxt "COMMANDHELP"
+msgid "repeat a notice with a given id"
+msgstr "להדהד עדכון ע� מזהה נתון"
+
+#. TRANS: Help message for IM/SMS command "repeat <nickname>".
+msgctxt "COMMANDHELP"
+msgid "repeat the last notice from user"
+msgstr "להדהד �ת העדכון ה�חרון ממשתמש"
+
+#. TRANS: Help message for IM/SMS command "reply #<notice_id>".
+msgctxt "COMMANDHELP"
+msgid "reply to notice with a given id"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "reply <nickname>".
+msgctxt "COMMANDHELP"
+msgid "reply to the last notice from user"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "join <group>".
+msgctxt "COMMANDHELP"
+msgid "join group"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "login".
+msgctxt "COMMANDHELP"
+msgid "Get a link to login to the web interface"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "drop <group>".
+msgctxt "COMMANDHELP"
+msgid "leave group"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "stats".
+msgctxt "COMMANDHELP"
+msgid "get your stats"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "stop".
+#. TRANS: Help message for IM/SMS command "quit".
+msgctxt "COMMANDHELP"
+msgid "same as 'off'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "sub <nickname>".
+msgctxt "COMMANDHELP"
+msgid "same as 'follow'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "unsub <nickname>".
+msgctxt "COMMANDHELP"
+msgid "same as 'leave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "last <nickname>".
+msgctxt "COMMANDHELP"
+msgid "same as 'get'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "on <nickname>".
+#. TRANS: Help message for IM/SMS command "off <nickname>".
+#. TRANS: Help message for IM/SMS command "invite <phone number>".
+#. TRANS: Help message for IM/SMS command "track <word>".
+#. TRANS: Help message for IM/SMS command "untrack <word>".
+#. TRANS: Help message for IM/SMS command "track off".
+#. TRANS: Help message for IM/SMS command "untrack all".
+#. TRANS: Help message for IM/SMS command "tracks".
+#. TRANS: Help message for IM/SMS command "tracking".
+msgctxt "COMMANDHELP"
+msgid "not yet implemented."
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "nudge <nickname>".
+msgctxt "COMMANDHELP"
+msgid "remind a user to update."
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:150
 msgid "No configuration file found."
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: Is followed by a list of directories (separated by HTML breaks).
-#: lib/common.php:153
 msgid "I looked for configuration files in the following places:"
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:156
 msgid "You may wish to run the installer to fix this."
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: The text is link text that leads to the installer page.
-#: lib/common.php:160
 msgid "Go to the installer."
 msgstr ""
 
-#. TRANS: Menu item for Instant Messaging settings.
-#: lib/connectsettingsaction.php:106
-msgctxt "MENU"
-msgid "IM"
-msgstr ""
+#. TRANS: Header on conversation page. Hidden by default (h2).
+#. TRANS: Label for user statistics.
+msgid "Notices"
+msgstr "עדכוני�"
 
-#. TRANS: Tooltip for Instant Messaging menu item.
-#: lib/connectsettingsaction.php:108
-msgid "Updates by instant messenger (IM)"
-msgstr ""
-
-#. TRANS: Menu item for Short Message Service settings.
-#: lib/connectsettingsaction.php:113
-msgctxt "MENU"
-msgid "SMS"
-msgstr ""
-
-#. TRANS: Tooltip for Short Message Service menu item.
-#: lib/connectsettingsaction.php:115
-msgid "Updates by SMS"
-msgstr ""
-
-#. TRANS: Menu item for OuAth connection settings.
-#: lib/connectsettingsaction.php:120
-msgctxt "MENU"
-msgid "Connections"
-msgstr ""
-
-#. TRANS: Tooltip for connected applications (Connections through OAuth) menu item.
-#: lib/connectsettingsaction.php:122
-msgid "Authorized connected applications"
-msgstr ""
-
-#: lib/dberroraction.php:59
+#. TRANS: Page title for when a database error occurs.
 msgid "Database error"
 msgstr ""
 
-#. TRANS: Label in form on profile design page.
-#. TRANS: Field contains file name on user's computer that could be that user's custom profile background image.
-#: lib/designsettings.php:104
-#, fuzzy
-msgid "Upload file"
-msgstr "ההעלה"
-
-#. TRANS: Instructions for form on profile design page.
-#: lib/designsettings.php:109
-#, fuzzy
-msgid ""
-"You can upload your personal background image. The maximum file size is 2MB."
-msgstr "זה �רוך מידי. �ורך מירבי להודעה הו� 140 �ותיות."
-
-#. TRANS: Radio button on profile design page that will enable use of the uploaded profile image.
-#: lib/designsettings.php:139
-msgctxt "RADIO"
-msgid "On"
+#. TRANS: Menu item in default local navigation panel.
+#. TRANS: Menu item in search group navigation panel.
+msgctxt "MENU"
+msgid "Public"
 msgstr ""
 
-#. TRANS: Radio button on profile design page that will disable use of the uploaded profile image.
-#: lib/designsettings.php:156
-msgctxt "RADIO"
-msgid "Off"
+#. TRANS: Menu item in default local navigation panel.
+#. TRANS: Menu item title in local navigation menu.
+msgctxt "MENU"
+msgid "Lists"
 msgstr ""
 
-#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
-#: lib/designsettings.php:264
-msgctxt "BUTTON"
-msgid "Reset"
+#. TRANS: Title of form for deleting a user.
+#. TRANS: Link text in notice list item to delete a notice.
+msgid "Delete"
+msgstr "מחק"
+
+#. TRANS: Description of form for deleting a user.
+msgid "Delete this user"
+msgstr "למחוק �ת המשתמש הזה"
+
+#. TRANS: Exception. %s is an ID.
+#, php-format
+msgid "Unable to find services for %s."
 msgstr ""
 
-#. TRANS: Success message displayed if design settings were saved after clicking "Use defaults".
-#: lib/designsettings.php:433
-msgid "Design defaults restored."
-msgstr ""
-
-#: lib/disfavorform.php:114 lib/disfavorform.php:144
+#. TRANS: Form legend for removing the favourite status for a favourite notice.
 msgid "Disfavor this notice"
 msgstr ""
 
-#: lib/favorform.php:114 lib/favorform.php:143
-#, fuzzy
-msgid "Favor this notice"
-msgstr "�ין הודעה כזו."
+#. TRANS: Button text for removing the favourite status for a favourite notice.
+msgctxt "BUTTON"
+msgid "Disfavor favorite"
+msgstr ""
 
-#: lib/feed.php:84
+#. TRANS: Button title for removing the favourite status for a favourite notice.
+#, fuzzy
+msgid "Remove this notice from your list of favorite notices."
+msgstr "�חזור עדכוני� �הובי� ל� הצליח."
+
+#. TRANS: Form legend for adding the favourite status to a notice.
+msgid "Favor this notice"
+msgstr "ל�הוב �ת העדכון הזה"
+
+#. TRANS: Button text for adding the favourite status to a notice.
+msgctxt "BUTTON"
+msgid "Favor"
+msgstr ""
+
+#. TRANS: Button title for adding the favourite status to a notice.
+#, fuzzy
+msgid "Add this notice to your list of favorite notices."
+msgstr "�חזור עדכוני� �הובי� ל� הצליח."
+
+#. TRANS: Feed type name.
 msgid "RSS 1.0"
 msgstr ""
 
-#: lib/feed.php:86
+#. TRANS: Feed type name.
 msgid "RSS 2.0"
 msgstr ""
 
-#: lib/feed.php:88
+#. TRANS: Feed type name.
 msgid "Atom"
 msgstr ""
 
-#: lib/feed.php:90
+#. TRANS: Feed type name. FOAF stands for Friend of a Friend.
 msgid "FOAF"
 msgstr ""
 
-#: lib/feedimporter.php:75
-msgid "Not an atom feed."
+#. TRANS: Feed type name. See http://activitystrea.ms/
+msgid "Activity Streams"
 msgstr ""
 
-#: lib/feedimporter.php:82
+#. TRANS: Client exception thrown when an imported feed does not have an author.
 msgid "No author in the feed."
 msgstr ""
 
-#: lib/feedimporter.php:89
-msgid "Can't import without a user."
+#. TRANS: Client exception thrown when an imported feed does not have an author that
+#. TRANS: can be associated with a user.
+msgid "Cannot import without a user."
 msgstr ""
 
 #. TRANS: Header for feed links (h2).
-#: lib/feedlist.php:66
 msgid "Feeds"
 msgstr ""
 
-#: lib/galleryaction.php:121
-msgid "Filter tags"
-msgstr ""
-
-#: lib/galleryaction.php:131
+#. TRANS: List element on gallery action page to show all tags.
+msgctxt "TAGS"
 msgid "All"
 msgstr ""
 
-#: lib/galleryaction.php:139
-msgid "Select tag to filter"
-msgstr ""
-
-#: lib/galleryaction.php:140
+#. TRANS: Dropdown field label on gallery action page for a list containing tags.
 msgid "Tag"
 msgstr ""
 
-#: lib/galleryaction.php:141
-msgid "Choose a tag to narrow list"
+#. TRANS: Dropdown field title on gallery action page for a list containing tags.
+msgid "Choose a tag to narrow list."
 msgstr ""
 
-#: lib/galleryaction.php:143
-msgid "Go"
-msgstr ""
-
-#: lib/grantroleform.php:91
+#. TRANS: Description on form for granting a role.
 #, php-format
 msgid "Grant this user the \"%s\" role"
 msgstr ""
 
-#: lib/groupeditform.php:154
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr "1 עד 64 �ותיות �נגליות קטנות �ו מספרי�, לל� סימני פיסוק �ו רווחי�."
+#. TRANS: Header for mini list of group members on a group page (h2).
+msgid "Members"
+msgstr "חברי�"
 
-#: lib/groupeditform.php:163
+#. TRANS: Link to all group members from mini list of group members if group has more than n members.
+msgid "All members"
+msgstr ""
+
+#. TRANS: Header for mini list of users with a pending membership request on a group page (h2).
+msgid "Pending"
+msgstr ""
+
+#. TRANS: Header for mini list of users that are blocked in a group page (h2).
+msgid "Blocked"
+msgstr "חסימת משתמש"
+
+#. TRANS: Title for list of group administrators on a group page.
+msgctxt "TITLE"
+msgid "Admins"
+msgstr ""
+
+#. TRANS: Button text for the form that will block a user from a group.
+msgctxt "BUTTON"
+msgid "Block"
+msgstr ""
+
+#. TRANS: Submit button title.
+msgctxt "TOOLTIP"
+msgid "Block this user so that they can no longer post messages to it."
+msgstr ""
+
+#. TRANS: Field title on group edit form.
 msgid "URL of the homepage or blog of the group or topic."
 msgstr ""
 
-#: lib/groupeditform.php:168
-#, fuzzy
-msgid "Describe the group or topic"
-msgstr "ת�ר �ת עצמך ו�ת נוש�י העניין שלך ב-140 �ותיות"
+#. TRANS: Text area title for group description when there is no text limit.
+msgid "Describe the group or topic."
+msgstr ""
 
-#: lib/groupeditform.php:170
+#. TRANS: Text area title for group description.
+#. TRANS: %d is the number of characters available for the description.
 #, php-format
-msgid "Describe the group or topic in %d character or less"
-msgid_plural "Describe the group or topic in %d characters or less"
+msgid "Describe the group or topic in %d character or less."
+msgid_plural "Describe the group or topic in %d characters or less."
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/groupeditform.php:182
+#. TRANS: Field title on group edit form.
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\"."
 msgstr ""
 
-#: lib/groupeditform.php:190
+#. TRANS: Field label on group edit form.
+msgid "Aliases"
+msgstr ""
+
+#. TRANS: Input field title for group aliases.
+#. TRANS: %d is the maximum number of group aliases available.
 #, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -7879,130 +7557,93 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#. TRANS: Menu item in the group navigation page.
-#: lib/groupnav.php:86
-msgctxt "MENU"
-msgid "Group"
+#. TRANS: Checkbox field title on group edit form to mark a group private.
+msgid ""
+"New members must be approved by admin and all posts are forced to be private."
 msgstr ""
 
-#. TRANS: Tooltip for menu item in the group navigation page.
-#. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:89
-#, php-format
-msgctxt "TOOLTIP"
-msgid "%s group"
+#. TRANS: Indicator in group members list that this user is a group administrator.
+msgctxt "GROUPADMIN"
+msgid "Admin"
 msgstr ""
 
-#. TRANS: Menu item in the group navigation page.
-#: lib/groupnav.php:95
-msgctxt "MENU"
-msgid "Members"
-msgstr ""
-
-#. TRANS: Tooltip for menu item in the group navigation page.
-#. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:98
-#, php-format
-msgctxt "TOOLTIP"
-msgid "%s group members"
-msgstr ""
-
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/groupnav.php:108
-msgctxt "MENU"
-msgid "Blocked"
-msgstr ""
+#. TRANS: Group actions header (h2). Text hidden by default.
+msgid "Group actions"
+msgstr "פעולות על קבוצה"
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:111
-#, php-format
-msgctxt "TOOLTIP"
-msgid "%s blocked users"
-msgstr ""
-
-#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:120
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Edit %s group properties"
 msgstr ""
 
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/groupnav.php:126
-msgctxt "MENU"
-msgid "Logo"
-msgstr ""
-
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:129
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Add or edit %s logo"
 msgstr ""
 
-#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:138
-#, php-format
-msgctxt "TOOLTIP"
-msgid "Add or edit %s design"
+#. TRANS: Link text for link on user profile.
+msgctxt "MENU"
+msgid "Logo"
 msgstr ""
 
 #. TRANS: Title for groups with the most members section.
-#: lib/groupsbymemberssection.php:71
-msgid "Groups with most members"
+msgid "Popular groups"
 msgstr ""
 
 #. TRANS: Title for groups with the most posts section.
-#: lib/groupsbypostssection.php:71
-msgid "Groups with most posts"
+msgid "Active groups"
 msgstr ""
 
-#. TRANS: Title for group tag cloud section.
-#. TRANS: %s is a group name.
-#: lib/grouptagcloudsection.php:57
-#, php-format
-msgid "Tags in %s group's notices"
+#. TRANS: Link description for seeing all groups.
+#. TRANS: Link description for seeing all lists.
+msgid "See all"
+msgstr ""
+
+#. TRANS: Link title for seeing all groups.
+msgid "See all groups you belong to."
+msgstr ""
+
+#. TRANS: Menu item title in personal group navigation menu.
+#. TRANS: %s is a username.
+msgid "Back to top"
 msgstr ""
 
 #. TRANS: Client exception 406
-#: lib/htmloutputter.php:104
 msgid "This page is not available in a media type you accept"
 msgstr "עמוד זה �ינו זמין בסוג מדיה ש�תה יכול לקבל"
 
-#: lib/imagefile.php:72
+#. TRANS: Exception thrown when trying to upload an unsupported image file format.
 msgid "Unsupported image file format."
 msgstr "פורמט התמונה �ינו נתמך."
 
 #. TRANS: Exception thrown when too large a file is uploaded.
 #. TRANS: %s is the maximum file size, for example "500b", "10kB" or "2MB".
-#: lib/imagefile.php:90
-#, fuzzy, php-format
+#, php-format
 msgid "That file is too big. The maximum file size is %s."
-msgstr "זה �רוך מידי. �ורך מירבי להודעה הו� 140 �ותיות."
+msgstr "הקובץ גדול מדי. גודל הקובץ המרבי הו� %s."
 
-#: lib/imagefile.php:95
+#. TRANS: Exception thrown when uploading an image and that action could not be completed.
 msgid "Partial upload."
 msgstr "העל�ה חלקית."
 
-#: lib/imagefile.php:111
+#. TRANS: Exception thrown when uploading a file as image that is not an image or is a corrupt file.
 msgid "Not an image or corrupt file."
 msgstr "זהו ל� קובץ תמונה, �ו שחל בו שיבוש."
 
-#: lib/imagefile.php:160
-#, fuzzy
+#. TRANS: Exception thrown during resize when image has been registered as present, but is no longer there.
 msgid "Lost our file."
-msgstr "�ין הודעה כזו."
+msgstr "�יבדנו �ת הקובץ שלנו."
 
-#: lib/imagefile.php:197 lib/imagefile.php:237
+#. TRANS: Exception thrown when trying to resize an unknown file type.
+#. TRANS: Exception thrown when trying resize an unknown file type.
 msgid "Unknown file type"
 msgstr ""
 
 #. TRANS: Number of megabytes. %d is the number.
-#: lib/imagefile.php:283
 #, php-format
 msgid "%dMB"
 msgid_plural "%dMB"
@@ -8010,7 +7651,6 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Number of kilobytes. %d is the number.
-#: lib/imagefile.php:287
 #, php-format
 msgid "%dkB"
 msgid_plural "%dkB"
@@ -8018,48 +7658,118 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Number of bytes. %d is the number.
-#: lib/imagefile.php:290
 #, php-format
 msgid "%dB"
 msgid_plural "%dB"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/jabber.php:387
+#. TRANS: Body text for confirmation code e-mail.
+#. TRANS: %1$s is a user nickname, %2$s is the StatusNet sitename,
+#. TRANS: %3$s is the display name of an IM plugin.
 #, php-format
-msgid "[%s]"
+msgid ""
+"User \"%1$s\" on %2$s has said that your %3$s screenname belongs to them. If "
+"that is true, you can confirm by clicking on this URL: %4$s . (If you cannot "
+"click it, copy-and-paste it into the address bar of your browser). If that "
+"user is not you, or if you did not request this confirmation, just ignore "
+"this message."
 msgstr ""
 
-#: lib/jabber.php:567
+#. TRANS: Exception thrown when trying to deliver a notice to an unknown inbox.
+#. TRANS: %d is the unknown inbox ID (number).
 #, php-format
 msgid "Unknown inbox source %d."
 msgstr ""
 
-#: lib/leaveform.php:114
-#, fuzzy
+#. TRANS: Server exception thrown trying to initialise an IM plugin without meeting all prerequisites.
+msgid "Queueing must be enabled to use IM plugins."
+msgstr ""
+
+#. TRANS: Server exception thrown trying to initialise an IM plugin without a transport method.
+msgid "Transport cannot be null."
+msgstr ""
+
+#. TRANS: Title for inbox tag cloud section.
+msgctxt "TITLE"
+msgid "Trends"
+msgstr ""
+
+#. TRANS: Default button text for inviting more users to the StatusNet instance.
+msgctxt "BUTTON"
+msgid "Invite more colleagues"
+msgstr ""
+
+#. TRANS: Form legend.
+msgid "Invite collegues"
+msgstr ""
+
+#. TRANS: Field label for a list of e-mail addresses.
+msgid "Email addresses"
+msgstr ""
+
+#. TRANS: Field title for a list of e-mail addresses.
+msgid "Addresses of friends to invite (one per line)."
+msgstr ""
+
+#. TRANS: Field label for a personal message to send to invitees.
+msgid "Personal message"
+msgstr "הודעה פרטית"
+
+#. TRANS: Field title for a personal message to send to invitees.
+msgid "Optionally add a personal message to the invitation."
+msgstr ""
+
+#. TRANS: Send button for inviting friends
+#. TRANS: Button text for sending notice.
+msgctxt "BUTTON"
+msgid "Send"
+msgstr "שליחה"
+
+#. TRANS: Submit button title.
+msgid "Send invitations."
+msgstr ""
+
+#. TRANS: Button text for joining a group.
+msgctxt "BUTTON"
+msgid "Join"
+msgstr ""
+
+#. TRANS: Button text on form to leave a group.
+msgctxt "BUTTON"
 msgid "Leave"
-msgstr "שמור"
+msgstr ""
 
-#: lib/logingroupnav.php:80
-#, fuzzy
+#. TRANS: Link title for seeing all lists.
+msgid "See all lists you have created."
+msgstr ""
+
+#. TRANS: Menu item for logging in to the StatusNet site.
+#. TRANS: Menu item in primary navigation panel.
+msgctxt "MENU"
+msgid "Login"
+msgstr "כניסה"
+
+#. TRANS: Title for menu item for logging in to the StatusNet site.
 msgid "Login with a username and password"
-msgstr "ש� המשתמש �ו הסיסמה ל� חוקיי�"
+msgstr "כניסה ע� ש� משתמש וססמה"
 
-#: lib/logingroupnav.php:86
-#, fuzzy
+#. TRANS: Menu item for registering with the StatusNet site.
+msgctxt "MENU"
+msgid "Register"
+msgstr "הרשמה"
+
+#. TRANS: Title for menu item for registering with the StatusNet site.
 msgid "Sign up for a new account"
-msgstr "צור חשבון חדש"
+msgstr "הרשמה לחשבון חדש"
 
 #. TRANS: Subject for address confirmation email.
-#: lib/mail.php:174
-#, fuzzy
 msgid "Email address confirmation"
-msgstr "שגי�ה בשמירת �ישור הכתובת."
+msgstr "שליחת �ימות כתובת בדו�״ל"
 
 #. TRANS: Body for address confirmation email.
 #. TRANS: %1$s is the addressed user's nickname, %2$s is the StatusNet sitename,
 #. TRANS: %3$s is the URL to confirm at.
-#: lib/mail.php:179
 #, php-format
 msgid ""
 "Hey, %1$s.\n"
@@ -8078,50 +7788,60 @@ msgstr ""
 
 #. TRANS: Subject of new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscribing user's nickname, %2$s is the StatusNet sitename.
-#: lib/mail.php:246
+#. TRANS: Main body of new-subscriber notification e-mail.
+#. TRANS: %1$s is the subscriber's long name, %2$s is the StatusNet sitename.
 #, php-format
-msgid "%1$s is now listening to your notices on %2$s."
-msgstr "%1$s כעת מ�זין להודעות שלך ב-%2$s"
-
-#. TRANS: This is a paragraph in a new-subscriber e-mail.
-#. TRANS: %s is a URL where the subscriber can be reported as abusive.
-#: lib/mail.php:253
-#, php-format
-msgid ""
-"If you believe this account is being used abusively, you can block them from "
-"your subscribers list and report as spam to site administrators at %s"
+msgid "%1$s is now following you on %2$s."
 msgstr ""
 
-#. TRANS: Main body of new-subscriber notification e-mail.
-#. TRANS: %1$s is the subscriber's long name, %2$s is the StatusNet sitename,
-#. TRANS: %3$s is the subscriber's profile URL, %4$s is the subscriber's location (or empty)
-#. TRANS: %5$s is the subscriber's homepage URL (or empty), %6%s is the subscriber's bio (or empty)
-#. TRANS: %7$s is a link to the addressed user's e-mail settings.
-#: lib/mail.php:263
+#. TRANS: Subject of pending new-subscriber notification e-mail.
+#. TRANS: %1$s is the subscribing user's nickname, %2$s is the StatusNet sitename.
+#, php-format
+msgid "%1$s would like to listen to your notices on %2$s."
+msgstr ""
+
+#. TRANS: Main body of pending new-subscriber notification e-mail.
+#. TRANS: %1$s is the subscriber's long name, %2$s is the StatusNet sitename.
+#, php-format
+msgid ""
+"%1$s would like to listen to your notices on %2$s. You may approve or reject "
+"their subscription at %3$s"
+msgstr ""
+
+#. TRANS: Common footer block for StatusNet notification emails.
+#. TRANS: %1$s is the StatusNet sitename,
+#. TRANS: %2$s is a link to the addressed user's e-mail settings.
 #, php-format
 msgid ""
-"%1$s is now listening to your notices on %2$s.\n"
-"\n"
-"\t%3$s\n"
-"\n"
-"%4$s%5$s%6$s\n"
 "Faithfully yours,\n"
-"%2$s.\n"
+"%1$s.\n"
 "\n"
 "----\n"
-"Change your email address or notification options at %7$s\n"
+"Change your email address or notification options at %2$s"
 msgstr ""
 
-#. TRANS: Profile info line in new-subscriber notification e-mail.
+#. TRANS: Profile info line in notification e-mail.
+#. TRANS: %s is a URL.
+#, php-format
+msgid "Profile: %s"
+msgstr ""
+
+#. TRANS: Profile info line in notification e-mail.
 #. TRANS: %s is biographical information.
-#: lib/mail.php:286
-#, fuzzy, php-format
+#, php-format
 msgid "Bio: %s"
 msgstr "�ודות: %s"
 
+#. TRANS: This is a paragraph in a new-subscriber e-mail.
+#. TRANS: %s is a URL where the subscriber can be reported as abusive.
+#, php-format
+msgid ""
+"If you believe this account is being used abusively, you can block them from "
+"your subscribers list and report as spam to site administrators at %s."
+msgstr ""
+
 #. TRANS: Subject of notification mail for new posting email address.
 #. TRANS: %s is the StatusNet sitename.
-#: lib/mail.php:315
 #, php-format
 msgid "New email address for posting to %s"
 msgstr ""
@@ -8129,50 +7849,40 @@ msgstr ""
 #. TRANS: Body of notification mail for new posting email address.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is the e-mail address to send
 #. TRANS: to to post by e-mail, %3$s is a URL to more instructions.
-#: lib/mail.php:321
 #, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
 "\n"
 "Send email to %2$s to post new messages.\n"
 "\n"
-"More email instructions at %3$s.\n"
-"\n"
-"Faithfully yours,\n"
-"%1$s"
+"More email instructions at %3$s."
 msgstr ""
 
 #. TRANS: Subject line for SMS-by-email notification messages.
 #. TRANS: %s is the posting user's nickname.
-#: lib/mail.php:442
-#, fuzzy, php-format
+#, php-format
 msgid "%s status"
-msgstr "הסטטוס של %1$s ב-%2$s "
+msgstr "המצב של %s"
 
 #. TRANS: Subject line for SMS-by-email address confirmation message.
-#: lib/mail.php:468
-#, fuzzy
 msgid "SMS confirmation"
-msgstr "�ין קוד �ישור."
+msgstr "�ימות במסרון"
 
 #. TRANS: Main body heading for SMS-by-email address confirmation message.
 #. TRANS: %s is the addressed user's nickname.
-#: lib/mail.php:472
 #, php-format
 msgid "%s: confirm you own this phone number with this code:"
 msgstr ""
 
 #. TRANS: Subject for 'nudge' notification email.
 #. TRANS: %s is the nudging user.
-#: lib/mail.php:493
 #, php-format
-msgid "You've been nudged by %s"
-msgstr ""
+msgid "You have been nudged by %s"
+msgstr "נדחפת על־ידי %s"
 
 #. TRANS: Body for 'nudge' notification email.
 #. TRANS: %1$s is the nuding user's long name, $2$s is the nudging user's nickname,
-#. TRANS: %3$s is a URL to post notices at, %4$s is the StatusNet sitename.
-#: lib/mail.php:500
+#. TRANS: %3$s is a URL to post notices at.
 #, php-format
 msgid ""
 "%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -8182,15 +7892,11 @@ msgid ""
 "\n"
 "%3$s\n"
 "\n"
-"Don't reply to this email; it won't get to them.\n"
-"\n"
-"With kind regards,\n"
-"%4$s\n"
+"Don't reply to this email; it won't get to them."
 msgstr ""
 
 #. TRANS: Subject for direct-message notification email.
 #. TRANS: %s is the sending user's nickname.
-#: lib/mail.php:547
 #, php-format
 msgid "New private message from %s"
 msgstr ""
@@ -8198,8 +7904,6 @@ msgstr ""
 #. TRANS: Body for direct-message notification email.
 #. TRANS: %1$s is the sending user's long name, %2$s is the sending user's nickname,
 #. TRANS: %3$s is the message content, %4$s a URL to the message,
-#. TRANS: %5$s is the StatusNet sitename.
-#: lib/mail.php:555
 #, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
@@ -8212,15 +7916,11 @@ msgid ""
 "\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"
+"Don't reply to this email; it won't get to them."
 msgstr ""
 
 #. TRANS: Subject for favorite notification e-mail.
 #. TRANS: %1$s is the adding user's long name, %2$s is the adding user's nickname.
-#: lib/mail.php:607
 #, php-format
 msgid "%1$s (@%2$s) added your notice as a favorite"
 msgstr ""
@@ -8230,7 +7930,6 @@ msgstr ""
 #. TRANS: %3$s is a URL to the faved notice, %4$s is the faved notice text,
 #. TRANS: %5$s is a URL to all faves of the adding user, %6$s is the StatusNet sitename,
 #. TRANS: %7$s is the adding user's nickname.
-#: lib/mail.php:614
 #, php-format
 msgid ""
 "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -8245,14 +7944,10 @@ msgid ""
 "\n"
 "You can see the list of %1$s's favorites here:\n"
 "\n"
-"%5$s\n"
-"\n"
-"Faithfully yours,\n"
-"%6$s\n"
+"%5$s"
 msgstr ""
 
 #. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:672
 #, php-format
 msgid ""
 "The full conversation can be read here:\n"
@@ -8262,21 +7957,18 @@ msgstr ""
 
 #. TRANS: E-mail subject for notice notification.
 #. TRANS: %1$s is the sending user's long name, %2$s is the adding user's nickname.
-#: lib/mail.php:680
 #, php-format
 msgid "%1$s (@%2$s) sent a notice to your attention"
 msgstr ""
 
 #. TRANS: Body of @-reply notification e-mail.
-#. TRANS: %1$s is the sending user's long name, $2$s is the StatusNet sitename,
+#. TRANS: %1$s is the sending user's name, $2$s is the StatusNet sitename,
 #. TRANS: %3$s is a URL to the notice, %4$s is the notice text,
-#. TRANS: %5$s is a URL to the full conversion if it exists (otherwise empty),
-#. TRANS: %6$s is a URL to reply to the notice, %7$s is a URL to all @-replied for the addressed user,
-#. TRANS: %8$s is a URL to the addressed user's e-mail settings, %9$s is the sender's nickname.
-#: lib/mail.php:688
+#. TRANS: %5$s is the text "The full conversation can be read here:" and a URL to the full conversion if it exists (otherwise empty),
+#. TRANS: %6$s is a URL to reply to the notice, %7$s is a URL to all @-replies for the addressed user,
 #, php-format
 msgid ""
-"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
+"%1$s just sent a notice to your attention (an '@-reply') on %2$s.\n"
 "\n"
 "The notice is here:\n"
 "\n"
@@ -8292,79 +7984,124 @@ msgid ""
 "\n"
 "The list of all @-replies for you here:\n"
 "\n"
-"%7$s\n"
-"\n"
-"Faithfully yours,\n"
-"%2$s\n"
-"\n"
-"P.S. You can turn off these email notifications here: %8$s\n"
+"%7$s"
 msgstr ""
 
-#: lib/mailbox.php:89
+#. TRANS: Subject of group join notification e-mail.
+#. TRANS: %1$s is the joining user's nickname, %2$s is the group name, and %3$s is the StatusNet sitename.
+#, fuzzy, php-format
+msgid "%1$s has joined your group %2$s on %3$s"
+msgstr "%1$s הזמין �ותך להצטרף �ליה� ב�תר %2$s"
+
+#. TRANS: Main body of group join notification e-mail.
+#. TRANS: %1$s is the subscriber's long name, %2$s is the group name, and %3$s is the StatusNet sitename,
+#. TRANS: %4$s is a block of profile info about the subscriber.
+#. TRANS: %5$s is a link to the addressed user's e-mail settings.
+#, php-format
+msgid "%1$s has joined your group %2$s on %3$s."
+msgstr ""
+
+#. TRANS: Subject of pending group join request notification e-mail.
+#. TRANS: %1$s is the joining user's nickname, %2$s is the group name, and %3$s is the StatusNet sitename.
+#, php-format
+msgid "%1$s wants to join your group %2$s on %3$s."
+msgstr ""
+
+#. TRANS: Main body of pending group join request notification e-mail.
+#. TRANS: %1$s is the subscriber's long name, %2$s is the group name, and %3$s is the StatusNet sitename,
+#. TRANS: %4$s is the URL to the moderation queue page.
+#, php-format
+msgid ""
+"%1$s would like to join your group %2$s on %3$s. You may approve or reject "
+"their group membership at %4$s"
+msgstr ""
+
+#. TRANS: Client error displayed when trying to access a mailbox that is not of the logged in user.
 msgid "Only the user can read their own mailboxes."
 msgstr ""
 
-#: lib/mailbox.php:139
+#. TRANS: Message displayed when there are no private messages in the inbox of a user.
 msgid ""
 "You have no private messages. You can send private message to engage other "
 "users in conversation. People can send you messages for your eyes only."
 msgstr ""
 
-#: lib/mailbox.php:228 lib/noticelist.php:522
-msgid "from"
+#. TRANS: Menu item in mailbox menu. Leads to incoming private messages.
+msgctxt "MENU"
+msgid "Inbox"
 msgstr ""
 
-#: lib/mailhandler.php:37
-#, fuzzy
+#. TRANS: Menu item title in mailbox menu. Leads to incoming private messages.
+msgid "Your incoming messages."
+msgstr ""
+
+#. TRANS: Menu item in mailbox menu. Leads to outgoing private messages.
+msgctxt "MENU"
+msgid "Outbox"
+msgstr ""
+
+#. TRANS: Menu item title in mailbox menu. Leads to outgoing private messages.
+msgid "Your sent messages."
+msgstr ""
+
+#. TRANS: Error message in incoming mail handler used when an incoming e-mail cannot be processed.
 msgid "Could not parse message."
-msgstr "עידכון המשתמש נכשל."
+msgstr "ל� הצליח פענוח ההודעה."
 
-#: lib/mailhandler.php:42
-#, fuzzy
+#. TRANS: Error message in incoming mail handler used when an incoming e-mail is not from a registered user.
 msgid "Not a registered user."
-msgstr "זהו ל� קוד �ישור."
+msgstr "ל� משתמש רשו�."
 
-#: lib/mailhandler.php:46
-#, fuzzy
+#. TRANS: Error message in incoming mail handler used when an incoming e-mail is not from a user's incoming e-mail address.
 msgid "Sorry, that is not your incoming email address."
-msgstr "זוהי כתובת מסרי� מידיי� שגויה."
+msgstr "סילחה, �בל ז�ת ל� כתובת הדו�״ל הנכנסת שלך."
 
-#: lib/mailhandler.php:50
+#. TRANS: Error message in incoming mail handler used when no incoming e-mail is allowed.
 msgid "Sorry, no incoming email allowed."
 msgstr ""
 
-#: lib/mailhandler.php:229
-#, fuzzy, php-format
-msgid "Unsupported message type: %s"
-msgstr "פורמט התמונה �ינו נתמך."
+#. TRANS: Error message in incoming mail handler used when an incoming e-mail is of an unsupported type.
+#. TRANS: %s is the unsupported type.
+#, php-format
+msgid "Unsupported message type: %s."
+msgstr ""
+
+#. TRANS: Form legend for form to make a user a group admin.
+msgid "Make user an admin of the group"
+msgstr ""
+
+#. TRANS: Button text for the form that will make a user administrator.
+msgctxt "BUTTON"
+msgid "Make Admin"
+msgstr ""
+
+#. TRANS: Submit button title.
+#, fuzzy
+msgctxt "TOOLTIP"
+msgid "Make this user an admin."
+msgstr "לחסו� �ת המשתמש הזה."
 
 #. TRANS: Client exception thrown when a database error was thrown during a file upload operation.
-#: lib/mediafile.php:102 lib/mediafile.php:174
 msgid "There was a database error while saving your file. Please try again."
 msgstr ""
 
 #. TRANS: Client exception thrown when a file upload operation would cause a user to exceed a set quota.
-#: lib/mediafile.php:238 lib/mediafile.php:281
 msgid "File exceeds user's quota."
 msgstr ""
 
 #. TRANS: Client exception thrown when a file upload operation fails because the file could
 #. TRANS: not be moved from the temporary folder to the permanent file location.
-#: lib/mediafile.php:258 lib/mediafile.php:300
 msgid "File could not be moved to destination directory."
 msgstr ""
 
 #. TRANS: Client exception thrown when a file upload operation has been stopped because the MIME
 #. TRANS: type of the uploaded file could not be determined.
-#: lib/mediafile.php:265 lib/mediafile.php:306
-#, fuzzy
 msgid "Could not determine file's MIME type."
-msgstr "עידכון המשתמש נכשל."
+msgstr "ל� הצליח זיהוי סוג ה־MIME של הקובץ."
 
 #. TRANS: Client exception thrown trying to upload a forbidden MIME type.
 #. TRANS: %1$s is the file type that was denied, %2$s is the application part of
 #. TRANS: the MIME type that was denied.
-#: lib/mediafile.php:396
 #, php-format
 msgid ""
 "\"%1$s\" is not a supported file type on this server. Try using another %2$s "
@@ -8373,442 +8110,874 @@ msgstr ""
 
 #. TRANS: Client exception thrown trying to upload a forbidden MIME type.
 #. TRANS: %s is the file type that was denied.
-#: lib/mediafile.php:401
 #, php-format
 msgid "\"%s\" is not a supported file type on this server."
 msgstr ""
 
-#: lib/messageform.php:120
+#. TRANS: Form legend for direct notice.
 msgid "Send a direct notice"
 msgstr ""
 
-#. TRANS Label entry in drop-down selection box in direct-message inbox/outbox. This is the default entry in the drop-down box, doubling as instructions and a brake against accidental submissions with the first user in the list.
-#: lib/messageform.php:137
+#. TRANS: Label entry in drop-down selection box in direct-message inbox/outbox.
+#. TRANS: This is the default entry in the drop-down box, doubling as instructions
+#. TRANS: and a brake against accidental submissions with the first user in the list.
 msgid "Select recipient:"
 msgstr ""
 
-#. TRANS Entry in drop-down selection box in direct-message inbox/outbox when no one is available to message.
-#: lib/messageform.php:150
+#. TRANS: Entry in drop-down selection box in direct-message inbox/outbox when no one is available to message.
 msgid "No mutual subscribers."
 msgstr ""
 
-#: lib/messageform.php:153
+#. TRANS: Dropdown label in direct notice form.
 msgid "To"
 msgstr "�ל"
 
-#: lib/messageform.php:166 lib/noticeform.php:186
-#, fuzzy
-msgid "Available characters"
-msgstr "לפחות 6 �ותיות"
-
-#: lib/messageform.php:185 lib/noticeform.php:237
-#, fuzzy
+#. TRANS: Button text for sending a direct notice.
 msgctxt "Send button for sending notice"
 msgid "Send"
-msgstr "שלח"
+msgstr "שליחה"
+
+#. TRANS: Header in message list.
+msgid "Messages"
+msgstr ""
+
+#. TRANS: Followed by notice source (usually the client used to send the notice).
+#. TRANS: Followed by notice source.
+msgid "from"
+msgstr "מ�ת"
+
+#. TRANS: A possible notice source (web interface).
+msgctxt "SOURCE"
+msgid "web"
+msgstr "וב"
+
+#. TRANS: A possible notice source (XMPP).
+msgctxt "SOURCE"
+msgid "xmpp"
+msgstr "xmpp"
+
+#. TRANS: A possible notice source (e-mail).
+msgctxt "SOURCE"
+msgid "mail"
+msgstr "דו�״ל"
+
+#. TRANS: A possible notice source (OpenMicroBlogging).
+msgctxt "SOURCE"
+msgid "omb"
+msgstr "omb"
+
+#. TRANS: A possible notice source (Application Programming Interface).
+msgctxt "SOURCE"
+msgid "api"
+msgstr "api"
+
+#. TRANS: Client exception thrown when no author for an activity was found.
+msgid "Cannot get author for activity."
+msgstr ""
+
+#. TRANS: Client exception thrown when ...
+msgid "Bookmark not posted to this group."
+msgstr ""
+
+#. TRANS: Client exception when ...
+msgid "Object not posted to this user."
+msgstr ""
+
+#. TRANS: Server exception thrown when a micro app plugin uses a target that cannot be handled.
+msgid "Do not know how to handle this kind of target."
+msgstr ""
+
+#. TRANS: Server exception thrown when a micro app plugin developer has not done his job too well.
+msgid "You must implement either adaptNoticeListItem() or showNotice()."
+msgstr ""
+
+#. TRANS: Link description to show more items in a list.
+msgid "More â–¼"
+msgstr ""
 
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:165
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
-msgstr "כינוי יכול להכיל רק �ותיות �נגליות קטנות ומספרי�, ולל� רווחי�."
-
-#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:178
 msgid "Nickname cannot be empty."
 msgstr ""
 
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:191
 #, php-format
 msgid "Nickname cannot be more than %d character long."
 msgid_plural "Nickname cannot be more than %d characters long."
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/noticeform.php:160
-#, fuzzy
+#. TRANS: Form legend for notice form.
 msgid "Send a notice"
-msgstr "הודעה חדשה"
+msgstr "שליחת עדכון"
 
-#: lib/noticeform.php:174
+#. TRANS: Title for notice label. %s is the user's nickname.
 #, php-format
 msgid "What's up, %s?"
 msgstr "מה המצב %s?"
 
-#: lib/noticeform.php:193
+#. TRANS: Input label in notice form for adding an attachment.
 msgid "Attach"
 msgstr ""
 
-#: lib/noticeform.php:197
-msgid "Attach a file"
+#. TRANS: Title for input field to attach a file to a notice.
+msgid "Attach a file."
 msgstr ""
 
-#: lib/noticeform.php:213
-#, fuzzy
+#. TRANS: Field label to add location to a notice.
 msgid "Share my location"
-msgstr "שמירת הפרופיל נכשלה."
+msgstr "לשתף �ת המיקו� שלי"
 
-#: lib/noticeform.php:216
-#, fuzzy
+#. TRANS: Text to not share location for a notice in notice form.
 msgid "Do not share my location"
-msgstr "שמירת הפרופיל נכשלה."
+msgstr "ל� לשתף �ת המיקו� שלי"
 
-#: lib/noticeform.php:217
+#. TRANS: Timeout error text for location retrieval in notice form.
 msgid ""
 "Sorry, retrieving your geo location is taking longer than expected, please "
 "try again later"
 msgstr ""
 
-#. TRANS: Used in coordinates as abbreviation of north
-#: lib/noticelist.php:452
-#, fuzzy
+#. TRANS: Separator in profile addressees list.
+msgctxt "SEPARATOR"
+msgid ", "
+msgstr ""
+
+#. TRANS: Used in coordinates as abbreviation of north.
 msgid "N"
-msgstr "ל�"
+msgstr "צפ׳"
 
-#. TRANS: Used in coordinates as abbreviation of south
-#: lib/noticelist.php:454
+#. TRANS: Used in coordinates as abbreviation of south.
 msgid "S"
-msgstr ""
+msgstr "דר׳"
 
-#. TRANS: Used in coordinates as abbreviation of east
-#: lib/noticelist.php:456
+#. TRANS: Used in coordinates as abbreviation of east.
 msgid "E"
-msgstr ""
+msgstr "מז׳"
 
-#. TRANS: Used in coordinates as abbreviation of west
-#: lib/noticelist.php:458
+#. TRANS: Used in coordinates as abbreviation of west.
 msgid "W"
-msgstr ""
+msgstr "מע׳"
 
-#: lib/noticelist.php:460
+#. TRANS: Coordinates message.
+#. TRANS: %1$s is lattitude degrees, %2$s is lattitude minutes,
+#. TRANS: %3$s is lattitude seconds, %4$s is N (north) or S (south) depending on lattitude,
+#. TRANS: %5$s is longitude degrees, %6$s is longitude minutes,
+#. TRANS: %7$s is longitude seconds, %8$s is E (east) or W (west) depending on longitude,
 #, php-format
 msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 msgstr ""
 
-#: lib/noticelist.php:469
+#. TRANS: Followed by geo location.
 msgid "at"
 msgstr ""
 
-#: lib/noticelist.php:518
-msgid "web"
-msgstr ""
-
-#: lib/noticelist.php:584
-#, fuzzy
+#. TRANS: Addition in notice list item if notice is part of a conversation.
 msgid "in context"
-msgstr "�ין תוכן!"
+msgstr "בהקשר"
 
-#: lib/noticelist.php:619
-#, fuzzy
+#. TRANS: Addition in notice list item if notice was repeated. Followed by a span with a nickname.
 msgid "Repeated by"
-msgstr "צור"
+msgstr "הודהד על־ידי"
 
-#: lib/noticelist.php:646
-msgid "Reply to this notice"
-msgstr ""
+#. TRANS: Link title in notice list item to reply to a notice.
+msgid "Reply to this notice."
+msgstr "להגיב לעדכון הזה।"
 
-#: lib/noticelist.php:647
+#. TRANS: Link text in notice list item to reply to a notice.
 msgid "Reply"
 msgstr "תגובות"
 
-#: lib/noticelist.php:691
-#, fuzzy
-msgid "Notice repeated"
-msgstr "הודעות"
+#. TRANS: Link title in notice list item to delete a notice.
+msgid "Delete this notice from the timeline."
+msgstr "למחוק �ת העדכון הזה מציר הזמן."
 
-#: lib/nudgeform.php:116
+#. TRANS: Title for repeat form status in notice list when a notice has been repeated.
+msgid "Notice repeated."
+msgstr "העדכון הודהד."
+
+#. TRANS: Field label for notice text.
+msgid "Update your status..."
+msgstr "עדכון מצב॥।"
+
+#. TRANS: Form legend of form to nudge/ping another user.
 msgid "Nudge this user"
-msgstr ""
+msgstr "לדחוף �ת המשתמש הזה"
 
-#: lib/nudgeform.php:128
+#. TRANS: Button text to nudge/ping another user.
+msgctxt "BUTTON"
 msgid "Nudge"
+msgstr "לדחוף"
+
+#. TRANS: Button title to nudge/ping another user.
+msgid "Send a nudge to this user."
+msgstr "לשלוח דחיפה למשתמש הזה."
+
+#. TRANS: Server exception thrown in oEmbed action if no API endpoint is available.
+msgid "No oEmbed API endpoint available."
 msgstr ""
 
-#: lib/nudgeform.php:128
-msgid "Send a nudge to this user"
+#. TRANS: Field label for list.
+msgctxt "LABEL"
+msgid "List"
 msgstr ""
 
-#: lib/oauthstore.php:294
-msgid "Error inserting new profile."
+#. TRANS: Field title for list.
+msgid "Change the list (letters, numbers, -, ., and _ are allowed)."
 msgstr ""
 
-#: lib/oauthstore.php:302
-msgid "Error inserting avatar."
+#. TRANS: Field title for description of list.
+msgid "Describe the list or topic."
 msgstr ""
 
-#: lib/oauthstore.php:322
-msgid "Error inserting remote profile."
+#. TRANS: Field title for description of list.
+#. TRANS: %d is the maximum number of characters for the description.
+#, php-format
+msgid "Describe the list or topic in %d character."
+msgid_plural "Describe the list or topic in %d characters."
+msgstr[0] ""
+msgstr[1] ""
+
+#. TRANS: Button title to delete a list.
+msgid "Delete this list."
 msgstr ""
 
-#. TRANS: Exception thrown when a notice is denied because it has been sent before.
-#: lib/oauthstore.php:362
-msgid "Duplicate notice."
+#. TRANS: Header in list edit form.
+msgid "Add or remove people"
 msgstr ""
 
-#: lib/oauthstore.php:507
-msgid "Couldn't insert new subscription."
-msgstr "הכנסת מנוי חדש נכשלה."
+#. TRANS: Header in list edit form.
+msgctxt "HEADER"
+msgid "Search"
+msgstr ""
 
-#: lib/personalgroupnav.php:102
-msgid "Personal"
-msgstr "�ישי"
+#. TRANS: Menu item in list navigation panel.
+msgctxt "MENU"
+msgid "List"
+msgstr ""
 
-#: lib/personalgroupnav.php:107
+#. TRANS: Menu item title in list navigation panel.
+#. TRANS: %1$s is a list, %2$s is a nickname.
+#, php-format
+msgid "%1$s list by %2$s."
+msgstr ""
+
+#. TRANS: Menu item in list navigation panel.
+msgctxt "MENU"
+msgid "Listed"
+msgstr ""
+
+#. TRANS: Menu item in list navigation panel.
+#. TRANS: Menu item in local navigation menu.
+msgctxt "MENU"
+msgid "Subscribers"
+msgstr ""
+
+#. TRANS: Menu item title in list navigation panel.
+#. TRANS: %1$s is a list, %2$s is a nickname.
+#, php-format
+msgid "Subscribers to %1$s list by %2$s."
+msgstr ""
+
+#. TRANS: Menu item in list navigation panel.
+msgctxt "MENU"
+msgid "Edit"
+msgstr ""
+
+#. TRANS: Menu item title in list navigation panel.
+#. TRANS: %s is a list.
+#, php-format
+msgid "Edit %s list by you."
+msgstr ""
+
+#. TRANS: Title for link to edit list settings.
+msgid "Edit list settings."
+msgstr ""
+
+#. TRANS: Text for link to edit list settings.
+msgid "Edit"
+msgstr ""
+
+#. TRANS: Privacy mode text in list list item for private list.
+msgctxt "MODE"
+msgid "Private"
+msgstr ""
+
+#. TRANS: Menu item in the group navigation page.
+msgctxt "MENU"
+msgid "List Subscriptions"
+msgstr ""
+
+#. TRANS: Tooltip for menu item in the group navigation page.
+#. TRANS: %s is a user nickname.
+#, php-format
+msgctxt "TOOLTIP"
+msgid "Lists subscribed to by %s."
+msgstr ""
+
+#. TRANS: Menu item in the group navigation page.
+#. TRANS: %s is a user nickname.
+#, php-format
+msgctxt "MENU"
+msgid "Lists with %s"
+msgstr ""
+
+#. TRANS: Tooltip for menu item in the group navigation page.
+#. TRANS: %s is a user nickname.
+#, php-format
+msgctxt "TOOLTIP"
+msgid "Lists with %s."
+msgstr ""
+
+#. TRANS: Menu item in the group navigation page.
+#. TRANS: %s is a user nickname.
+#, php-format
+msgctxt "MENU"
+msgid "Lists by %s"
+msgstr ""
+
+#. TRANS: Tooltip for menu item in the group navigation page.
+#. TRANS: %s is a user nickname.
+#, php-format
+msgctxt "TOOLTIP"
+msgid "Lists by %s."
+msgstr ""
+
+#. TRANS: Label in lists widget.
+msgctxt "LABEL"
+msgid "Your lists"
+msgstr ""
+
+#. TRANS: Fieldset legend in lists widget.
+msgctxt "LEGEND"
+msgid "Edit lists"
+msgstr ""
+
+#. TRANS: Label in self tags widget.
+msgctxt "LABEL"
+msgid "Tags"
+msgstr ""
+
+#. TRANS: Title for section contaning lists with the most subscribers.
+msgid "Popular lists"
+msgstr ""
+
+#. TRANS: List summary. %1$d is the number of users in the list,
+#. TRANS: %2$d is the number of subscribers to the list.
+#, php-format
+msgid "Listed: %1$d Subscribers: %2$d"
+msgstr ""
+
+#. TRANS: Title for page that displays which lists current user is part of.
+#, php-format
+msgid "Lists with you"
+msgstr ""
+
+#. TRANS: Title for page that displays which lists a user is part of.
+#. TRANS: %s is a profile name.
+#, php-format
+msgid "Lists with %s"
+msgstr ""
+
+#. TRANS: Title for page that displays lists a user has subscribed to.
+msgid "List subscriptions"
+msgstr ""
+
+#. TRANS: Menu item in personal group navigation menu.
+#. TRANS: Menu item in settings navigation panel.
+#. TRANS: Menu item in local navigation menu.
+msgctxt "MENU"
+msgid "Profile"
+msgstr ""
+
+#. TRANS: Menu item title in personal group navigation menu.
+msgid "Your profile"
+msgstr "דף המשתמש שלך"
+
+#. TRANS: Menu item in personal group navigation menu.
+msgctxt "MENU"
 msgid "Replies"
-msgstr "תגובות"
-
-#: lib/personalgroupnav.php:117
-msgid "Favorites"
-msgstr "מועדפי�"
-
-#: lib/personalgroupnav.php:128
-msgid "Inbox"
 msgstr ""
 
-#: lib/personalgroupnav.php:129
+#. TRANS: Menu item in personal group navigation menu.
+msgctxt "MENU"
+msgid "Favorites"
+msgstr ""
+
+#. TRANS: Replaces %s in '%s\'s favorite notices'. (Yes, we know we need to fix this.)
+msgctxt "FIXME"
+msgid "User"
+msgstr ""
+
+#. TRANS: Menu item in personal group navigation menu.
+msgctxt "MENU"
+msgid "Messages"
+msgstr ""
+
+#. TRANS: Menu item title in personal group navigation menu.
 msgid "Your incoming messages"
 msgstr ""
 
-#: lib/personalgroupnav.php:133
-msgid "Outbox"
-msgstr ""
-
-#: lib/personalgroupnav.php:134
-#, fuzzy
-msgid "Your sent messages"
-msgstr "הודעה חדשה"
-
-#: lib/personaltagcloudsection.php:56
-#, php-format
-msgid "Tags in %s's notices"
-msgstr ""
-
 #. TRANS: Displayed as version information for a plugin if no version information was found.
-#: lib/plugin.php:121
 msgid "Unknown"
 msgstr ""
 
-#: lib/profileaction.php:109 lib/profileaction.php:205 lib/subgroupnav.php:82
-msgid "Subscriptions"
-msgstr "הרשמות"
+#. TRANS: Plugin admin panel controls
+msgctxt "plugin"
+msgid "Disable"
+msgstr ""
 
-#: lib/profileaction.php:126
-msgid "All subscriptions"
-msgstr "כל המנויי�"
+#. TRANS: Plugin admin panel controls
+msgctxt "plugin"
+msgid "Enable"
+msgstr ""
 
-#: lib/profileaction.php:144 lib/profileaction.php:214 lib/subgroupnav.php:90
-msgid "Subscribers"
-msgstr "מנויי�"
+#. TRANS: Plugin description for a disabled plugin.
+msgctxt "plugin-description"
+msgid ""
+"(The plugin description is unavailable when a plugin has been disabled.)"
+msgstr ""
 
-#: lib/profileaction.php:161
-#, fuzzy
-msgid "All subscribers"
-msgstr "מנויי�"
+#. TRANS: Menu item in primary navigation panel.
+msgctxt "MENU"
+msgid "Settings"
+msgstr ""
 
-#: lib/profileaction.php:191
-#, fuzzy
+#. TRANS: Menu item title in primary navigation panel.
+msgid "Change your personal settings."
+msgstr ""
+
+#. TRANS: Menu item in primary navigation panel.
+msgctxt "MENU"
+msgid "Admin"
+msgstr ""
+
+#. TRANS: Menu item title in primary navigation panel.
+msgid "Site configuration."
+msgstr ""
+
+#. TRANS: Menu item in primary navigation panel.
+msgctxt "MENU"
+msgid "Logout"
+msgstr "יצי�ה"
+
+#. TRANS: Menu item title in primary navigation panel.
+msgid "Logout from the site."
+msgstr ""
+
+#. TRANS: Menu item title in primary navigation panel.
+msgid "Login to the site."
+msgstr ""
+
+msgid "This profile has been silenced by site moderators"
+msgstr ""
+
+#. TRANS: H2 text for user subscription statistics.
+msgid "Following"
+msgstr ""
+
+#. TRANS: H2 text for user subscriber statistics.
+msgid "Followers"
+msgstr ""
+
+#. TRANS: H2 text for user statistics.
+msgid "Statistics"
+msgstr "סטטיסטיקה"
+
+#. TRANS: Label for user statistics.
 msgid "User ID"
-msgstr "מתשמש"
+msgstr "מזהה משתמש"
 
-#: lib/profileaction.php:196
+#. TRANS: Label for user statistics.
 msgid "Member since"
 msgstr "חבר מ�ז"
 
-#. TRANS: Average count of posts made per day since account registration
-#: lib/profileaction.php:235
+#. TRANS: Label for user statistics.
+#. TRANS: Average count of posts made per day since account registration.
 msgid "Daily average"
 msgstr ""
 
-#: lib/profileaction.php:264
-#, fuzzy
-msgid "All groups"
+#. TRANS: H2 text for user group membership statistics.
+msgid "Groups"
 msgstr "קבוצות"
 
-#: lib/profileformaction.php:123
+#. TRANS: H2 text for user list membership statistics.
+msgid "Lists"
+msgstr ""
+
+#. TRANS: Server error displayed when using an unimplemented method.
 msgid "Unimplemented method."
 msgstr ""
 
-#: lib/publicgroupnav.php:78
-msgid "Public"
-msgstr "ציבורי"
-
-#: lib/publicgroupnav.php:82
+#. TRANS: Menu item title in search group navigation panel.
 msgid "User groups"
 msgstr ""
 
-#: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85
+#. TRANS: Menu item in search group navigation panel.
+msgctxt "MENU"
 msgid "Recent tags"
 msgstr ""
 
-#: lib/publicgroupnav.php:88
+#. TRANS: Menu item title in search group navigation panel.
+msgid "Recent tags"
+msgstr ""
+
+#. TRANS: Menu item in search group navigation panel.
+msgctxt "MENU"
 msgid "Featured"
 msgstr ""
 
-#: lib/publicgroupnav.php:92
-#, fuzzy
+#. TRANS: Menu item in search group navigation panel.
+msgctxt "MENU"
 msgid "Popular"
-msgstr "�נשי�"
+msgstr ""
 
-#: lib/redirectingaction.php:95
-#, fuzzy
+#. TRANS: Title for inbox tag cloud section.
+msgctxt "TITLE"
+msgid "Trending topics"
+msgstr ""
+
+#. TRANS: Client error displayed when return-to was defined without a target.
 msgid "No return-to arguments."
-msgstr "�ין מסמך כזה."
+msgstr "חסר משתנה return-to."
 
-#: lib/repeatform.php:107
-#, fuzzy
+#. TRANS: For legend for notice repeat form.
 msgid "Repeat this notice?"
-msgstr "�ין הודעה כזו."
+msgstr "להדהד �ת העדכון הזה?"
 
-#: lib/repeatform.php:132
-msgid "Yes"
-msgstr "כן"
+#. TRANS: Button title to repeat a notice on notice repeat form.
+msgid "Repeat this notice."
+msgstr "להדהד �ת העדכון הזה."
 
-#: lib/repeatform.php:132
-#, fuzzy
-msgid "Repeat this notice"
-msgstr "�ין הודעה כזו."
-
-#: lib/revokeroleform.php:91
-#, fuzzy, php-format
+#. TRANS: Description of role revoke form. %s is the role to be revoked.
+#, php-format
 msgid "Revoke the \"%s\" role from this user"
-msgstr "�ין משתמש כזה."
+msgstr "ליטול �ת התפקיד \"%s\" מהמשתמש הזה"
 
 #. TRANS: Client error on action trying to visit a non-existing page.
-#: lib/router.php:974
 msgid "Page not found."
 msgstr ""
 
-#: lib/sandboxform.php:67
+#. TRANS: Title of form to sandbox a user.
+msgctxt "TITLE"
 msgid "Sandbox"
 msgstr ""
 
-#: lib/sandboxform.php:78
-#, fuzzy
+#. TRANS: Description of form to sandbox a user.
 msgid "Sandbox this user"
-msgstr "�ין משתמש כזה."
+msgstr "להכניס �ת המשתמש ל�רגז חול"
 
 #. TRANS: Fieldset legend for the search form.
-#: lib/searchaction.php:120
-#, fuzzy
 msgid "Search site"
-msgstr "חיפוש"
+msgstr "חיפוש ב�תר"
 
 #. TRANS: Used as a field label for the field where one or more keywords
 #. TRANS: for searching can be entered.
-#: lib/searchaction.php:128
 msgid "Keyword(s)"
 msgstr ""
 
 #. TRANS: Button text for searching site.
-#: lib/searchaction.php:130
+#. TRANS: Button text for search button on search form.
+#. TRANS: Button text to search profiles.
 msgctxt "BUTTON"
 msgid "Search"
 msgstr ""
 
-#. TRANS: Definition list item with instructions on how to get (better) search results.
-#: lib/searchaction.php:170
-#, fuzzy
-msgid "Search help"
-msgstr "חיפוש"
+#. TRANS: Standard search suggestions shown when a search does not give any results.
+msgid ""
+"* Make sure all words are spelled correctly.\n"
+"* Try different keywords.\n"
+"* Try more general keywords.\n"
+"* Try fewer keywords."
+msgstr ""
 
-#: lib/searchgroupnav.php:80
+#. TRANS: Standard search suggestions shown when a search does not give any results.
+#, php-format
+msgid ""
+"You can also try your search on other engines:\n"
+"\n"
+"* [Twingly](http://www.twingly.com/search?q=%s&content=microblog&site=%%%%"
+"site.server%%%%)\n"
+"* [Tweet scan](http://www.tweetscan.com/indexi.php?s=%s)\n"
+"* [Google](http://www.google.com/search?q=site%%3A%%%%site.server%%%%+%s)\n"
+"* [Yahoo](http://search.yahoo.com/search?p=site%%3A%%%%site.server%%%%+%s)\n"
+"* [Collecta](http://collecta.com/#q=%s)"
+msgstr ""
+
+#. TRANS: Menu item in search group navigation panel.
+msgctxt "MENU"
 msgid "People"
-msgstr "�נשי�"
+msgstr ""
 
-#: lib/searchgroupnav.php:81
+#. TRANS: Menu item title in search group navigation panel.
 msgid "Find people on this site"
 msgstr ""
 
-#: lib/searchgroupnav.php:83
+#. TRANS: Menu item in search group navigation panel.
+msgctxt "MENU"
+msgid "Notices"
+msgstr ""
+
+#. TRANS: Menu item title in search group navigation panel.
 msgid "Find content of notices"
 msgstr ""
 
-#: lib/searchgroupnav.php:85
+#. TRANS: Menu item title in search group navigation panel.
 msgid "Find groups on this site"
 msgstr ""
 
-#: lib/section.php:89
+#. TRANS: Secondary navigation menu item leading to Terms of Service.
+msgctxt "MENU"
+msgid "TOS"
+msgstr ""
+
+#. TRANS: Secondary navigation menu item leading to privacy policy.
+msgctxt "MENU"
+msgid "Privacy"
+msgstr ""
+
+#. TRANS: Secondary navigation menu item. Leads to information about StatusNet and its license.
+msgctxt "MENU"
+msgid "Source"
+msgstr ""
+
+#. TRANS: Secondary navigation menu item leading to version information on the StatusNet site.
+msgctxt "MENU"
+msgid "Version"
+msgstr ""
+
+#. TRANS: Default title for section/sidebar widget.
 msgid "Untitled section"
 msgstr ""
 
-#: lib/section.php:106
+#. TRANS: Default "More..." title for section/sidebar widget.
 msgid "More..."
 msgstr ""
 
-#: lib/silenceform.php:67
-#, fuzzy
+#. TRANS: Header in settings navigation panel.
+msgctxt "HEADER"
+msgid "Settings"
+msgstr ""
+
+#. TRANS: Menu item title in settings navigation panel.
+msgid "Change your profile settings"
+msgstr "שינוי הגדרות דף המשתמש"
+
+#. TRANS: Menu item in settings navigation panel.
+msgctxt "MENU"
+msgid "Avatar"
+msgstr ""
+
+#. TRANS: Menu item title in settings navigation panel.
+msgid "Upload an avatar"
+msgstr "העל�ת תמונה"
+
+#. TRANS: Menu item in settings navigation panel.
+msgctxt "MENU"
+msgid "Password"
+msgstr ""
+
+#. TRANS: Menu item title in settings navigation panel.
+msgid "Change your password"
+msgstr "שינוי ססמה"
+
+#. TRANS: Menu item in settings navigation panel.
+msgctxt "MENU"
+msgid "Email"
+msgstr ""
+
+#. TRANS: Menu item title in settings navigation panel.
+msgid "Change email handling"
+msgstr ""
+
+#. TRANS: Menu item in settings navigation panel.
+msgctxt "MENU"
+msgid "URL"
+msgstr ""
+
+#. TRANS: Menu item title in settings navigation panel.
+msgid "URL shorteners"
+msgstr ""
+
+#. TRANS: Menu item in settings navigation panel.
+msgctxt "MENU"
+msgid "IM"
+msgstr ""
+
+#. TRANS: Menu item title in settings navigation panel.
+msgid "Updates by instant messenger (IM)"
+msgstr ""
+
+#. TRANS: Menu item in settings navigation panel.
+msgctxt "MENU"
+msgid "SMS"
+msgstr ""
+
+#. TRANS: Menu item title in settings navigation panel.
+msgid "Updates by SMS"
+msgstr ""
+
+#. TRANS: Menu item in settings navigation panel.
+msgctxt "MENU"
+msgid "Connections"
+msgstr ""
+
+#. TRANS: Menu item title in settings navigation panel.
+msgid "Authorized connected applications"
+msgstr ""
+
+#. TRANS: Menu item in settings navigation panel.
+msgctxt "MENU"
+msgid "Old school"
+msgstr ""
+
+#. TRANS: Menu item title in settings navigation panel.
+msgid "UI tweaks for old-school users"
+msgstr ""
+
+#. TRANS: Title of form to silence a user.
+msgctxt "TITLE"
 msgid "Silence"
-msgstr "הודעה חדשה"
+msgstr ""
 
-#: lib/silenceform.php:78
-#, fuzzy
+#. TRANS: Description of form to silence a user.
 msgid "Silence this user"
-msgstr "�ין משתמש כזה."
+msgstr "להשתיק �ת המשתמש הזה"
 
-#: lib/subgroupnav.php:83
-#, fuzzy, php-format
-msgid "People %s subscribes to"
-msgstr "הרשמה מרוחקת"
-
-#: lib/subgroupnav.php:91
-#, fuzzy, php-format
-msgid "People subscribed to %s"
-msgstr "הרשמה מרוחקת"
-
-#: lib/subgroupnav.php:99
-#, php-format
-msgid "Groups %s is a member of"
+#. TRANS: Server error displayed when trying to create an anynymous OAuth consumer.
+msgid "Could not create anonymous consumer."
 msgstr ""
 
-#: lib/subgroupnav.php:105
+#. TRANS: Server error displayed when trying to create an anynymous OAuth application.
+msgid "Could not create anonymous OAuth application."
+msgstr ""
+
+#. TRANS: Exception thrown when no token association could be found.
+msgid ""
+"Could not find a profile and application associated with the request token."
+msgstr ""
+
+#. TRANS: Exception thrown when no access token can be issued.
+msgid "Could not issue access token."
+msgstr ""
+
+#. TRANS: Exception thrown when a database error occurs.
+msgid "Database error inserting OAuth application user."
+msgstr "שגי�ת מסד נתוני� בהכנסת משתמש יישו� OAuth."
+
+#. TRANS: Exception thrown when a database error occurs.
+msgid "Database error updating OAuth application user."
+msgstr ""
+
+#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
+msgid "Tried to revoke unknown token."
+msgstr ""
+
+#. TRANS: Exception thrown when an attempt is made to remove a revoked token.
+msgid "Failed to delete revoked token."
+msgstr ""
+
+#. TRANS: Menu item in local navigation menu.
+msgctxt "MENU"
+msgid "Subscriptions"
+msgstr "מינויי�"
+
+#. TRANS: Menu item title in local navigation menu.
+#. TRANS: %s is a user nickname.
+#, php-format
+msgid "People %s subscribes to."
+msgstr ""
+
+#. TRANS: Menu item title in local navigation menu.
+#. TRANS: %s is a user nickname.
+#, php-format
+msgid "People subscribed to %s."
+msgstr ""
+
+#. TRANS: Menu item in local navigation menu.
+#. TRANS: %d is the number of pending subscription requests.
+#, php-format
+msgctxt "MENU"
+msgid "Pending (%d)"
+msgstr ""
+
+#. TRANS: Menu item title in local navigation menu.
+#, php-format
+msgid "Approve pending subscription requests."
+msgstr ""
+
+#. TRANS: Menu item title in local navigation menu.
+#. TRANS: %s is a user nickname.
+#, php-format
+msgid "Groups %s is a member of."
+msgstr ""
+
+#. TRANS: Menu item title in local navigation menu.
+#. TRANS: %s is a user nickname.
+#, php-format
+msgid "List subscriptions by %s."
+msgstr ""
+
+#. TRANS: Menu item in local navigation menu.
+msgctxt "MENU"
 msgid "Invite"
-msgstr ""
+msgstr "הזמנה"
 
-#: lib/subgroupnav.php:106
+#. TRANS: Menu item title in local navigation menu.
+#. TRANS: %s is the StatusNet sitename.
 #, php-format
-msgid "Invite friends and colleagues to join you on %s"
+msgid "Invite friends and colleagues to join you on %s."
 msgstr ""
 
-#: lib/subscriberspeopleselftagcloudsection.php:48
-#: lib/subscriptionspeopleselftagcloudsection.php:48
+#. TRANS: Form of form to subscribe to a user.
+msgid "Subscribe to this user"
+msgstr "ל� שלחנו �לינו �ת הפרופיל הזה"
+
+#. TRANS: Button text to subscribe to a user.
+#. TRANS: Button text for subscribing to a list.
+msgctxt "BUTTON"
+msgid "Subscribe"
+msgstr ""
+
+#. TRANS: Button title to subscribe to a user.
+msgid "Subscribe to this user."
+msgstr ""
+
+#. TRANS: Title of personal tag cloud section.
 msgid "People Tagcloud as self-tagged"
 msgstr ""
 
-#: lib/subscriberspeopletagcloudsection.php:48
-#: lib/subscriptionspeopletagcloudsection.php:48
+#. TRANS: Title of personal tag cloud section.
 msgid "People Tagcloud as tagged"
 msgstr ""
 
-#: lib/tagcloudsection.php:56
-#, fuzzy
+#. TRANS: Content displayed in a tag cloud section if there are no tags.
+msgctxt "NOTAGS"
 msgid "None"
-msgstr "ל�"
+msgstr ""
 
 #. TRANS: Server exception displayed if a theme name was invalid.
-#: lib/theme.php:74
 msgid "Invalid theme name."
 msgstr ""
 
-#: lib/themeuploader.php:50
+#. TRANS: Exception thrown when a compressed theme is uploaded while no support present in PHP configuration.
 msgid "This server cannot handle theme uploads without ZIP support."
 msgstr ""
 
-#: lib/themeuploader.php:58 lib/themeuploader.php:61
+#. TRANS: Server exception thrown when uploading a theme fails.
 msgid "The theme file is missing or the upload failed."
 msgstr ""
 
-#: lib/themeuploader.php:91 lib/themeuploader.php:102
-#: lib/themeuploader.php:279 lib/themeuploader.php:283
-#: lib/themeuploader.php:291 lib/themeuploader.php:298
-#, fuzzy
+#. TRANS: Server exception thrown when saving an uploaded theme after decompressing it fails.
+#. TRANS: Server exception thrown when an uploaded theme cannot be saved during extraction.
 msgid "Failed saving theme."
-msgstr "עדכון התמונה נכשל."
+msgstr "שמירת ערכת הנוש� נכשלה."
 
-#: lib/themeuploader.php:147
-msgid "Invalid theme: bad directory structure."
+#. TRANS: Server exception thrown when an uploaded theme has an incorrect structure.
+msgid "Invalid theme: Bad directory structure."
 msgstr ""
 
-#: lib/themeuploader.php:166
+#. TRANS: Client exception thrown when an uploaded theme is larger than the limit.
+#. TRANS: %d is the number of bytes of the uncompressed theme.
 #, php-format
 msgid "Uploaded theme is too large; must be less than %d byte uncompressed."
 msgid_plural ""
@@ -8816,136 +8985,225 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/themeuploader.php:179
-msgid "Invalid theme archive: missing file css/display.css"
+#. TRANS: Server exception thrown when an uploaded theme is incomplete.
+msgid "Invalid theme archive: Missing file css/display.css"
 msgstr ""
 
-#: lib/themeuploader.php:219
+#. TRANS: Server exception thrown when an uploaded theme has an incorrect file or folder name.
 msgid ""
 "Theme contains invalid file or folder name. Stick with ASCII letters, "
 "digits, underscore, and minus sign."
 msgstr ""
 
-#: lib/themeuploader.php:225
+#. TRANS: Server exception thrown when an uploaded theme contains files with unsafe file extensions.
 msgid "Theme contains unsafe file extension names; may be unsafe."
 msgstr ""
 
-#: lib/themeuploader.php:242
+#. TRANS: Server exception thrown when an uploaded theme contains a file type that is not allowed.
+#. TRANS: %s is the file type that is not allowed.
 #, php-format
-msgid "Theme contains file of type '.%s', which is not allowed."
+msgid "Theme contains file of type \".%s\", which is not allowed."
 msgstr ""
 
-#: lib/themeuploader.php:260
-#, fuzzy
+#. TRANS: Server exception thrown when an uploaded compressed theme cannot be opened.
 msgid "Error opening theme archive."
-msgstr "שגי�ה בעדכון פרופיל מרוחק"
+msgstr "שגי�ה בפתיחת �רכיון הנוש� הזה"
 
-#: lib/topposterssection.php:74
+#. TRANS: Header for Notices section.
+msgctxt "HEADER"
+msgid "Notices"
+msgstr ""
+
+#. TRANS: Link to show replies for a notice.
+#. TRANS: %d is the number of replies to a notice and used for plural.
+#, php-format
+msgid "Show reply"
+msgid_plural "Show all %d replies"
+msgstr[0] ""
+msgstr[1] ""
+
+#. TRANS: Reference to the logged in user in favourite list.
+msgctxt "FAVELIST"
+msgid "You"
+msgstr "�ני"
+
+#. TRANS: For building a list such as "Jim, Bob, Mary and 5 others like this".
+#. TRANS: %1$s is a list of users, separated by a separator (default: ", "), %2$s is the last user in the list.
+#, php-format
+msgctxt "FAVELIST"
+msgid "%1$s and %2$s"
+msgstr ""
+
+#. TRANS: List message for notice favoured by logged in user.
+msgctxt "FAVELIST"
+msgid "You like this."
+msgstr "�הבת �ת זה."
+
+#. TRANS: List message for when more than 4 people like something.
+#. TRANS: %%s is a list of users liking a notice, %d is the number over 4 that like the notice.
+#. TRANS: Plural is decided on the total number of users liking the notice (count of %%s + %d).
+#, php-format
+msgid "%%s and %d others like this."
+msgid_plural "%%s and %d others like this."
+msgstr[0] ""
+msgstr[1] ""
+
+#. TRANS: List message for favoured notices.
+#. TRANS: %%s is a list of users liking a notice.
+#. TRANS: Plural is based on the number of of users that have favoured a notice.
+#, php-format
+msgid "%%s likes this."
+msgid_plural "%%s like this."
+msgstr[0] ""
+msgstr[1] ""
+
+#. TRANS: List message for notice repeated by logged in user.
+#, fuzzy
+msgctxt "REPEATLIST"
+msgid "You repeated this."
+msgstr "הדהדת �ת העדכון הזה."
+
+#. TRANS: List message for when more than 4 people repeat something.
+#. TRANS: %%s is a list of users liking a notice, %d is the number over 4 that like the notice.
+#. TRANS: Plural is decided on the total number of users liking the notice (count of %%s + %d).
+#, php-format
+msgid "%%s and %d other repeated this."
+msgid_plural "%%s and %d others repeated this."
+msgstr[0] ""
+msgstr[1] ""
+
+#. TRANS: List message for favoured notices.
+#. TRANS: %%s is a list of users liking a notice.
+#. TRANS: Plural is based on the number of of users that have favoured a notice.
+#, fuzzy, php-format
+msgid "%%s repeated this."
+msgid_plural "%%s repeated this."
+msgstr[0] "הודהד �ל %s"
+msgstr[1] "הודהד �ל %s"
+
+#. TRANS: Form legend.
+#, php-format
+msgid "Search and list people"
+msgstr ""
+
+#. TRANS: Dropdown option for searching in profiles.
+msgid "Everything"
+msgstr "הכול"
+
+#. TRANS: Dropdown option for searching in profiles.
+msgid "Fullname"
+msgstr "ש� מל�"
+
+#. TRANS: Dropdown option for searching in profiles.
+msgid "URI (Remote users)"
+msgstr ""
+
+#. TRANS: Dropdown field label.
+msgctxt "LABEL"
+msgid "Search in"
+msgstr "חיפוש בתוך"
+
+#. TRANS: Dropdown field title.
+msgid "Choose a field to search."
+msgstr ""
+
+#. TRANS: Form legend.
+#. TRANS: %1$s is a nickname, $2$s is a list.
+#, php-format
+msgid "Remove %1$s from list %2$s"
+msgstr ""
+
+#. TRANS: Legend on form to add a profile to a list.
+#. TRANS: %1$s is a nickname, %2$s is a list.
+#, php-format
+msgid "Add %1$s to list %2$s"
+msgstr ""
+
+#. TRANS: Title for top posters section.
 msgid "Top posters"
+msgstr "כותבי� ר�שיי�"
+
+#. TRANS: Option in drop-down of potential addressees.
+msgctxt "SENDTO"
+msgid "Everyone"
+msgstr "כול�"
+
+#. TRANS: Option in drop-down of potential addressees.
+#. TRANS: %s is a StatusNet sitename.
+#, php-format
+msgid "My colleagues at %s"
+msgstr ""
+
+#. TRANS: Label for drop-down of potential addressees.
+msgctxt "LABEL"
+msgid "To:"
+msgstr "�ל:"
+
+#. TRANS: Checkbox label in widget for selecting potential addressees to mark the notice private.
+msgid "Private?"
+msgstr "פרטי?"
+
+#. TRANS: Client exception thrown in widget for selecting potential addressees when an invalid fill option was received.
+#, php-format
+msgid "Unknown to value: \"%s\"."
 msgstr ""
 
 #. TRANS: Title for the form to unblock a user.
-#: lib/unblockform.php:67
 msgctxt "TITLE"
 msgid "Unblock"
-msgstr ""
+msgstr "ביטול חסימה"
 
-#: lib/unsandboxform.php:69
+#. TRANS: Title for unsandbox form.
+msgctxt "TITLE"
 msgid "Unsandbox"
-msgstr ""
+msgstr "הוצ�ה מ�רגז חול"
 
-#: lib/unsandboxform.php:80
-#, fuzzy
+#. TRANS: Description for unsandbox form.
 msgid "Unsandbox this user"
-msgstr "�ין משתמש כזה."
+msgstr "להוצי� �ת המשתמש הזה מ�רגז החול"
 
-#: lib/unsilenceform.php:67
+#. TRANS: Title for unsilence form.
 msgid "Unsilence"
-msgstr ""
+msgstr "ביטול השתקה"
 
-#: lib/unsilenceform.php:78
-#, fuzzy
+#. TRANS: Form description for unsilence form.
 msgid "Unsilence this user"
-msgstr "�ין משתמש כזה."
+msgstr "לבטל �ת השתקת המשתמש הזה"
 
-#: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
-#, fuzzy
+#. TRANS: Form legend on unsubscribe form.
 msgid "Unsubscribe from this user"
-msgstr "ל� שלחנו �לינו �ת הפרופיל הזה"
+msgstr "לבטל �ת הרישו� למשתמש הזה"
 
-#: lib/unsubscribeform.php:137
+#. TRANS: Button text on unsubscribe form.
+#. TRANS: Button text for unsubscribing from a list.
+msgctxt "BUTTON"
 msgid "Unsubscribe"
-msgstr "בטל מנוי"
+msgstr "ביטול מינוי"
+
+#. TRANS: Button title on unsubscribe form.
+#, fuzzy
+msgid "Unsubscribe from this user."
+msgstr "לבטל �ת הרישו� למשתמש הזה"
 
 #. TRANS: Exception text shown when no profile can be found for a user.
 #. TRANS: %1$s is a user nickname, $2$d is a user ID (number).
-#: lib/usernoprofileexception.php:60
 #, php-format
 msgid "User %1$s (%2$d) has no profile record."
 msgstr ""
 
-#: lib/userprofile.php:119
-#, fuzzy
-msgid "Edit Avatar"
-msgstr "תמונה"
-
-#: lib/userprofile.php:236 lib/userprofile.php:250
-msgid "User actions"
-msgstr ""
-
-#: lib/userprofile.php:239
-msgid "User deletion in progress..."
-msgstr ""
-
-#: lib/userprofile.php:265
-#, fuzzy
-msgid "Edit profile settings"
-msgstr "הגדרות הפרופיל"
-
-#: lib/userprofile.php:266
-msgid "Edit"
-msgstr ""
-
-#: lib/userprofile.php:289
-msgid "Send a direct message to this user"
-msgstr ""
-
-#: lib/userprofile.php:290
-#, fuzzy
-msgid "Message"
-msgstr "הודעה חדשה"
-
-#: lib/userprofile.php:331
-msgid "Moderate"
-msgstr ""
-
-#: lib/userprofile.php:369
-#, fuzzy
-msgid "User role"
-msgstr "למשתמש �ין פרופיל."
-
-#: lib/userprofile.php:371
-msgctxt "role"
-msgid "Administrator"
-msgstr ""
-
-#: lib/userprofile.php:372
-msgctxt "role"
-msgid "Moderator"
+#. TRANS: Authorisation exception thrown when a user a not allowed to login.
+msgid "Not allowed to log in."
 msgstr ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1306
 msgid "a few seconds ago"
 msgstr "לפני מספר שניות"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1309
 msgid "about a minute ago"
 msgstr "לפני כדקה"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1313
 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"
@@ -8953,12 +9211,10 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1316
 msgid "about an hour ago"
 msgstr "לפני כשעה"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1320
 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"
@@ -8966,12 +9222,10 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1323
 msgid "about a day ago"
 msgstr "לפני כיו�"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1327
 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"
@@ -8979,12 +9233,10 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1330
 msgid "about a month ago"
 msgstr "לפני כחודש"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1334
 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"
@@ -8992,49 +9244,24 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1337
 msgid "about a year ago"
 msgstr "לפני כשנה"
 
-#: lib/webcolor.php:80
-#, fuzzy, php-format
-msgid "%s is not a valid color!"
-msgstr "ל�תר הבית יש כתובת ל� חוקית."
-
-#. TRANS: Validation error for a web colour.
-#. TRANS: %s is the provided (invalid) text for colour.
-#: lib/webcolor.php:120
+#. TRANS: Web color exception thrown when a hexadecimal color code does not validate.
+#. TRANS: %s is the provided (invalid) color code.
 #, php-format
 msgid "%s is not a valid color! Use 3 or 6 hex characters."
 msgstr ""
 
-#. TRANS: %s is the URL to the StatusNet site's Instant Messaging settings.
-#: lib/xmppmanager.php:287
-#, php-format
-msgid "Unknown user. Go to %s to add your address to your account"
-msgstr ""
-
-#. TRANS: Response to XMPP source when it sent too long a message.
-#. TRANS: %1$d the maximum number of allowed characters (used for plural), %2$d is the sent number.
-#: lib/xmppmanager.php:406
-#, php-format
-msgid "Message too long. Maximum is %1$d character, you sent %2$d."
-msgid_plural "Message too long. Maximum is %1$d characters, you sent %2$d."
-msgstr[0] ""
-msgstr[1] ""
-
 #. TRANS: Exception.
-#: lib/xrd.php:64
 msgid "Invalid XML."
-msgstr ""
+msgstr "XML בלתי־תקין."
 
 #. TRANS: Exception.
-#: lib/xrd.php:69
 msgid "Invalid XML, missing XRD root."
 msgstr ""
 
 #. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
-#: scripts/restoreuser.php:62
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
diff --git a/locale/hsb/LC_MESSAGES/statusnet.po b/locale/hsb/LC_MESSAGES/statusnet.po
index ba7d4d97e5..5ab2c20f69 100644
--- a/locale/hsb/LC_MESSAGES/statusnet.po
+++ b/locale/hsb/LC_MESSAGES/statusnet.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Core to Upper Sorbian (Hornjoserbsce)
+# Translation of StatusNet - Core to Upper Sorbian (hornjoserbsce)
 # Exported from translatewiki.net
 #
 # Author: Brion
@@ -12,18 +12,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:12+0000\n"
-"Language-Team: Upper Sorbian <http://translatewiki.net/wiki/Portal:hsb>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:08+0000\n"
+"Language-Team: Upper Sorbian <https://translatewiki.net/wiki/Portal:hsb>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: hsb\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : (n%100==3 || "
 "n%100==4) ? 2 : 3)\n"
-"X-POT-Import-Date: 2011-05-05 10:52:40+0000\n"
+"X-POT-Import-Date: 2012-04-22 22:02:21+0000\n"
 
 #. TRANS: Database error message.
 #, php-format
@@ -34,26 +34,21 @@ msgid ""
 "again."
 msgstr ""
 
-#. TRANS: Error message.
-msgid ""
-"An important error occured, probably related to email setup. Check logfiles "
-"for more info."
-msgstr ""
-
 #. TRANS: Error message.
 msgid "An error occurred."
-msgstr ""
+msgstr "Zmylk je wustupił."
 
 #. TRANS: Error message displayed when there is no StatusNet configuration file.
 #, php-format
 msgid ""
 "No configuration file found. Try running the installation program first."
 msgstr ""
+"Žana konfiguraciska dataja njenamakana. Spytajće najprjedy instalaciski "
+"program wuwjesć."
 
 #. TRANS: Error message displayed when trying to access a non-existing page.
-#, fuzzy
 msgid "Unknown page"
-msgstr "Njeznaty"
+msgstr "Njeznata strona"
 
 #. TRANS: Error message displayed when trying to perform an undefined action.
 #. TRANS: Title for password recovery page when an unknown action has been specified.
@@ -99,12 +94,11 @@ msgstr "Nowe registrowanja znjemóžnić."
 msgid "Closed"
 msgstr "Za�injeny"
 
-#. TRANS: Title for button to save access settings in site admin panel.
-msgid "Save access settings"
-msgstr "Přistupne nastajenja składować"
+#. TRANS: Button title to save access settings in site admin panel.
+msgid "Save access settings."
+msgstr "Přistupne nastajenja składować."
 
-#. TRANS: Tooltip for button to save access settings in site admin panel.
-#. TRANS: Button text for saving theme settings.
+#. TRANS: Button text to save access settings in site admin panel.
 #. TRANS: Button label to save e-mail preferences.
 #. TRANS: Button label to save IM preferences.
 #. TRANS: Button text in the license admin panel.
@@ -120,7 +114,6 @@ msgstr "Přistupne nastajenja składować"
 #. TRANS: Button text for saving "Other settings" in profile.
 #. TRANS: Button text to save user settings in user admin panel.
 #. TRANS: Button label in the "Edit application" form.
-#. TRANS: Button text on profile design page to save settings.
 #. TRANS: Text for save button on group edit form.
 #. TRANS: Button text to save tags for a profile.
 msgctxt "BUTTON"
@@ -138,7 +131,7 @@ msgstr "Składować"
 #. TRANS: Client error displayed when the session token is not okay.
 #. TRANS: Client error displayed when the session token does not match or is not given.
 msgid "There was a problem with your session token. Try again, please."
-msgstr ""
+msgstr "Bě problem z twojim posedźenskim tokenom. Spytaj prošu hišće raz."
 
 #. TRANS: Error message displayed when trying to perform an action that requires a logged in user.
 msgid "Not logged in."
@@ -156,20 +149,14 @@ msgstr "Profil njeeksistuje."
 #. TRANS: Client error displayed trying to reference a non-existing list.
 #. TRANS: Client error displayed when referring to a non-existing list.
 #. TRANS: Client error displayed trying to reference a non-existing list.
-#, fuzzy
 msgid "No such list."
-msgstr "Tafli�ka njeeksistuje."
-
-#. TRANS: Client error displayed when trying to add an OMB 0.1 remote profile to a list.
-#, fuzzy
-msgid "You cannot list an OMB 0.1 remote profile with this action."
-msgstr "Njemóžeš zdaleny profil OMB 0.1 z tutej akciju abonować."
+msgstr "Lisćina njeeksistuje."
 
 #. TRANS: Client error displayed when an unknown error occurs when adding a user to a list.
 #. TRANS: %s is a username.
 #, php-format
 msgid "There was an unexpected error while listing %s."
-msgstr ""
+msgstr "Při listowanju %s je njewo�akowany zmylk wustupił."
 
 #. TRANS: Client error displayed when an unknown error occurs when adding a user to a list.
 #. TRANS: %s is a profile URL.
@@ -180,10 +167,9 @@ msgid ""
 msgstr ""
 
 #. TRANS: Title after adding a user to a list.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Listed"
-msgstr "Licenca"
+msgstr "Nalistowany"
 
 #. TRANS: Server error when page not found (404).
 #. TRANS: Server error when page not found (404)
@@ -195,7 +181,6 @@ msgstr "Strona njeeksistuje."
 #. TRANS: Client error when user not found for an rss related action.
 #. TRANS: Client error displayed when no existing user is provided for a user's delivery device setting.
 #. TRANS: Client error displayed if a user could not be found.
-#. TRANS: Client error when user not found updating a profile background image.
 #. TRANS: Client error displayed updating profile image without having a user object.
 #. TRANS: Client error displayed when making an Atom API request for an unknown user.
 #. TRANS: Client error displayed when trying to block a non-existing user or a user from another site.
@@ -221,14 +206,11 @@ msgstr "Strona njeeksistuje."
 #. TRANS: Client error displayed when trying to get the RSS feed with favorites of a user that does not exist.
 #. TRANS: Client error displayed when requesting Friends of a Friend feed without providing a user nickname.
 #. TRANS: Client error displayed when requesting Friends of a Friend feed for an object that is not a user.
-#. TRANS: Client error displayed when trying to get a user hCard for a non-existing user.
 #. TRANS: Client error displayed trying to make a micro summary without providing a valid user.
 #. TRANS: Client error displayed trying to send a direct message to a non-existing user.
 #. TRANS: Client error displayed trying to use "one time password login" without using an existing user.
 #. TRANS: Client error displayed when referring to non-existing user.
 #. TRANS: Client error displayed trying to perform an action related to a non-existing user.
-#. TRANS: Form validation error on page for remote subscribe when no user was provided.
-#. TRANS: Form validation error on page for remote subscribe when no user profile was found.
 #. TRANS: Client error displayed when trying to reply to a non-exsting user.
 #. TRANS: Client error displayed when providing a non-existing nickname in a RSS 1.0 action.
 #. TRANS: Client error.
@@ -237,7 +219,6 @@ msgstr "Strona njeeksistuje."
 #. TRANS: Client error displayed trying to find a user by ID for a non-existing ID.
 #. TRANS: Client error displayed requesting groups for a non-existing user.
 #. TRANS: Client error displayed when user not found for an action.
-#. TRANS: Client error displayed providing a non-existing nickname.
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #. TRANS: Client error displayed when trying to perform a gallery action with an unknown user.
 #. TRANS: Client error displayed when trying to access a mailbox without providing a user.
@@ -246,9 +227,8 @@ msgid "No such user."
 msgstr "Wužiwar njeeksistuje"
 
 #. TRANS: Title of a user's own start page.
-#, fuzzy
 msgid "Home timeline"
-msgstr "Druhdy"
+msgstr "Swójska �asowa lajsta"
 
 #. TRANS: Title of another user's start page.
 #. TRANS: %s is the other user's name.
@@ -256,6 +236,13 @@ msgstr "Druhdy"
 msgid "%s's home timeline"
 msgstr ""
 
+#. TRANS: %s is user nickname.
+#. TRANS: Feed title.
+#. TRANS: %s is tagger's nickname.
+#, php-format
+msgid "Feed for friends of %s (Activity Streams JSON)"
+msgstr "Kanal za přećelow wužiwarja %s (Activity Streams JSON)"
+
 #. TRANS: %s is user nickname.
 #, php-format
 msgid "Feed for friends of %s (RSS 1.0)"
@@ -295,7 +282,7 @@ msgid ""
 "to them](%%%%action.newnotice%%%%?status_textarea=%3$s)."
 msgstr ""
 
-#. TRANS: Encoutagement displayed on empty timeline user pages for anonymous users.
+#. TRANS: Encouragement displayed on empty timeline user pages for anonymous users.
 #. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
 #. TRANS: Empty list message for page with replies for a user for not logged in users.
 #. TRANS: %1$s is a user nickname. This message contains a Markdown link in the form [link text](link).
@@ -307,6 +294,12 @@ msgid ""
 "post a notice to them."
 msgstr ""
 
+#. TRANS: Button text for inviting more users to the StatusNet instance.
+#. TRANS: Less business/enterprise-oriented language for public sites.
+msgctxt "BUTTON"
+msgid "Send invite"
+msgstr "Přeprošenje pósłać"
+
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Title of API timeline for a user and friends.
 #. TRANS: %s is a username.
@@ -315,8 +308,6 @@ msgstr ""
 #. TRANS: %s is a username.
 #. TRANS: Menu item title in personal group navigation menu.
 #. TRANS: %s is a username.
-#. TRANS: Menu item title in settings navigation panel.
-#. TRANS: %s is a username.
 #, php-format
 msgid "%s and friends"
 msgstr "%s a přećeljo"
@@ -356,7 +347,6 @@ msgstr ""
 #. TRANS: Server error thrown on database error updating SMS preferences.
 #. TRANS: Server error thrown on database error removing a registered SMS phone number.
 #. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
-#. TRANS: Server exception thrown on Profile design page when updating design settings fails.
 msgid "Could not update user."
 msgstr "Wužiwar njeje so dał aktualizować."
 
@@ -371,7 +361,6 @@ msgstr "Profil njeje so składować dał."
 
 #. TRANS: Client error displayed when the number of bytes in a POST request exceeds a limit.
 #. TRANS: %s is the number of bytes of the CONTENT_LENGTH.
-#. TRANS: Form validation error in design settings form. POST should remain untranslated.
 #, php-format
 msgid ""
 "The server was unable to handle that much POST data (%s byte) due to its "
@@ -384,24 +373,6 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#. TRANS: Client error displayed when saving design settings fails because of an empty id.
-#. TRANS: Client error displayed when saving design settings fails because of an empty result.
-#. TRANS: Client error displayed when a database error occurs inserting profile colours.
-#. TRANS: Client error displayed when a database error occurs updating profile colours.
-#. TRANS: Form validation error displayed when group design settings could not be saved because of an application issue.
-#. TRANS: Form validation error on Profile design page when saving design settings has failed.
-#. TRANS: Form validation error on Profile design page when updating design settings has failed.
-msgid "Unable to save your design settings."
-msgstr "Njeje móžno, designowe nastajenja składować."
-
-#. TRANS: Error displayed when updating design settings fails.
-#. TRANS: Client error displayed when a database error occurs updating profile colours.
-#. TRANS: Form validation error on Profile design page when updating design settings has failed.
-#. TRANS: Error message displayed if design settings could not be saved.
-#. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
-msgid "Could not update your design."
-msgstr "Design njeda so aktualizować."
-
 #. TRANS: Title for Atom feed.
 msgctxt "ATOM"
 msgid "Main"
@@ -448,6 +419,20 @@ msgstr "Blokowanje wužiwarja je so njeporadźiło."
 msgid "Unblock user failed."
 msgstr "Wotblokowanje wužiwarja je so njeporadźiło."
 
+#. TRANS: Client exception thrown when no conversation ID is given.
+msgid "No conversation ID."
+msgstr "Žadyn konwersaciski ID."
+
+#. TRANS: Client exception thrown when referring to a non-existing conversation ID (%d).
+#, php-format
+msgid "No conversation with ID %d."
+msgstr "Žana konwersacija z ID %d."
+
+#. TRANS: Title for conversion timeline.
+msgctxt "TITLE"
+msgid "Conversation"
+msgstr "Konwersacija"
+
 #. TRANS: Title. %s is a user nickname.
 #, php-format
 msgid "Direct messages from %s"
@@ -495,6 +480,8 @@ msgstr ""
 "njejsu."
 
 #. TRANS: Client error displayed trying to direct message self (403).
+#. TRANS: Client error displayed trying to send a direct message to self.
+#. TRANS: Error text shown when trying to send a direct message to self.
 msgid ""
 "Do not send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
@@ -727,7 +714,6 @@ msgstr "skupiny na %s"
 
 #. TRANS: Client error displayed when trying to edit a group without being an admin.
 #. TRANS: Client error displayed trying to edit a group while not being a group admin.
-#. TRANS: Client error displayed trying to change group design settings without being a (group) admin.
 #. TRANS: Client error displayed when trying to change group logo settings while not being a group admin.
 msgid "You must be an admin to edit the group."
 msgstr "Dyrbiš administrator być, zo by skupinu wobdźěłał."
@@ -757,62 +743,55 @@ msgstr "Alias njemóže samsne kaž přimjeno być."
 #. TRANS: Client error displayed when referring to a non-existing list.
 #. TRANS: Client error displayed trying to perform an action related to a non-existing list.
 #. TRANS: Client error displayed when referring to a non-existing list.
-#, fuzzy
 msgid "List not found."
-msgstr "Wužiwar njenamakany."
+msgstr "Lisćina njenamakana."
 
 #. TRANS: Client error displayed when trying to update another user's list.
 msgid "You cannot update lists that do not belong to you."
-msgstr ""
+msgstr "Njemóžeš lisćiny aktualizować, kotrež ći njesłušeja."
 
 #. TRANS: Client error displayed when an unknown error occurs updating a list.
 #. TRANS: Client error displayed when an unknown error occurs viewing list members.
 #. TRANS: Client error displayed when an unknown error occurs in the list subscribers action.
 #. TRANS: Client error displayed when an unknown error occurs unsubscribing from a list.
 msgid "An error occured."
-msgstr ""
+msgstr "Zmylk je wustupił."
 
 #. TRANS: Client error displayed when trying to delete another user's list.
 msgid "You cannot delete lists that do not belong to you."
-msgstr ""
+msgstr "Njemóžeš lisćiny zhašeć, kotrež ći njesłušeja."
 
 #. TRANS: Client error displayed when referring to a non-list member.
-#, fuzzy
 msgid "The specified user is not a member of this list."
-msgstr "Wužiwar njeje �łon skupiny."
+msgstr "Podaty wužiwar njeje �łon tuteje lisćiny."
 
 #. TRANS: Client error displayed when trying to add members to a list without having the right to do so.
-#, fuzzy
 msgid "You are not allowed to add members to this list."
-msgstr "Njesměš skupiny na tutym sydle zhašeć."
+msgstr "Njesměš tutej lisćinje �łonow přidać."
 
 #. TRANS: Client error displayed when trying to modify list members without specifying them.
-#, fuzzy
 msgid "You must specify a member."
-msgstr "Falowacy profil."
+msgstr "Dyrbiš �łon podać."
 
 #. TRANS: Client error displayed when trying to remove members from a list without having the right to do so.
-#, fuzzy
 msgid "You are not allowed to remove members from this list."
-msgstr "Njesměš skupiny na tutym sydle zhašeć."
+msgstr "Njesměš �łonow z tuteje lisćiny wotstronić."
 
 #. TRANS: Client error displayed when trying to remove a list member that is not part of a list.
 msgid "The user you are trying to remove from the list is not a member."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to create a list without a name.
-#, fuzzy
 msgid "A list must have a name."
-msgstr "Póst za Atom dyrbi  zapisk z Atoma być."
+msgstr "Lisćina dyrbi mjeno měć."
 
 #. TRANS: Client error displayed when a membership check for a user is nagative.
 msgid "The specified user is not a subscriber of this list."
-msgstr ""
+msgstr "Podaty wužiwar njeje abonent tuteje lisćiny."
 
 #. TRANS: Client error displayed when trying to unsubscribe from a non-subscribed list.
-#, fuzzy
 msgid "You are not subscribed to this list."
-msgstr "Njejsy tón profil abonował."
+msgstr "Njejsy tutu lisćinu abonował."
 
 #. TRANS: Client error displayed when uploading a media file has failed.
 msgid "Upload failed."
@@ -824,7 +803,7 @@ msgstr "Njepłaćiwe přizjewjenske znamješka."
 
 #. TRANS: Client error given when no oauth_token was passed to the OAuth API.
 msgid "No oauth_token parameter provided."
-msgstr ""
+msgstr "Žadyn parameter ouath_token njepodaty."
 
 #. TRANS: Client error given when an invalid request token was passed to the OAuth API.
 msgid "Invalid request token."
@@ -844,7 +823,6 @@ msgstr "Zmylk datoweje banki při zasunjenju oauth_token_association."
 
 #. TRANS: Client error given on when invalid data was passed through a form in the OAuth API.
 #. TRANS: Unexpected validation error on avatar upload form.
-#. TRANS: Client error displayed when the submitted form contains unexpected data.
 #. TRANS: Client error displayed submitting invalid form data for edit application.
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
 #. TRANS: Form validation error message when an unsupported argument is used.
@@ -853,7 +831,6 @@ msgstr "Zmylk datoweje banki při zasunjenju oauth_token_association."
 #. TRANS: Client error when submitting a form with unexpected information.
 #. TRANS: Client error displayed when unexpected data is posted in the password recovery form.
 #. TRANS: Message given submitting a form with an unknown action in SMS settings.
-#. TRANS: Unknown form validation error in design settings form.
 msgid "Unexpected form submission."
 msgstr "Njewo�akowane wotpósłanje formulara."
 
@@ -892,7 +869,6 @@ msgstr "Konto"
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Field label on account registration page.
-#. TRANS: Label for nickname on user authorisation page.
 #. TRANS: Field label on group edit form.
 #. TRANS: Dropdown option for searching in profiles.
 msgid "Nickname"
@@ -1064,9 +1040,9 @@ msgstr "Aktualizacije z %1$s  wot %2$s / %3$s faworizowane"
 
 #. TRANS: Server error displayed whe trying to get a timeline fails.
 #. TRANS: %s is the error message.
-#, fuzzy, php-format
+#, php-format
 msgid "Could not generate feed for list - %s"
-msgstr "Njeje móžno było, přizjewjenske znamješko za %s wutworić"
+msgstr "Njeje móžno było, kanal za tutu lisćinu wutworić - %s"
 
 #. TRANS: Title for timeline of most recent mentions of a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user nickname.
@@ -1103,9 +1079,9 @@ msgstr "Do %s wospjetowany"
 
 #. TRANS: Subtitle for API action that shows most recent notices that are repeats in user's inbox.
 #. TRANS: %1$s is the sitename, %2$s is a user nickname, %3$s is a user profile name.
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s notices that were to repeated to %2$s / %3$s."
-msgstr "Aktualizacije z %1$s  wot %2$s / %3$s faworizowane"
+msgstr "%1$s - zdźělenki, kotrež su so na %2$s / %3$s wospjetowali"
 
 #. TRANS: Title of list of repeated notices of the logged in user.
 #. TRANS: %s is the nickname of the logged in user.
@@ -1115,9 +1091,9 @@ msgstr "Wospjetowanja wot %s"
 
 #. TRANS: Subtitle of API time with retweets of me.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is the user nickname, %3$s is the user profile name.
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s notices that %2$s / %3$s has repeated."
-msgstr "%1$s je zdźělenku %2$s jako faworit markěrował."
+msgstr "%1$s - zdźělenki, kotrež  %2$s / %3$s je wospjetował."
 
 #. TRANS: Title for timeline with lastest notices with a given tag.
 #. TRANS: %s is the tag.
@@ -1204,12 +1180,9 @@ msgstr "Dyrbiš přizjewjeny być, zo by skupinu wopušćił."
 #. TRANS: Client error displayed when requesting Friends of a Friend feed for a nickname that is not a group.
 #. TRANS: Client error displayed trying to block a user from a group while specifying a non-existing group.
 #. TRANS: Client error displayed referring to a group's permalink for a non-existing group ID.
-#. TRANS: Client error displayed trying to change group design settings while providing a nickname for a non-existing group.
 #. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
 #. TRANS: Client error displayed when trying to view group members for a non-existing group.
 #. TRANS: Client error displayed when trying to view group members for an object that is not a group.
-#. TRANS: Client error displayed when trying to view group members for a non-existing group.
-#. TRANS: Client error displayed when trying to view group members for an object that is not a group.
 #. TRANS: Client error displayed when requesting a group RSS feed for group that does not exist.
 #. TRANS: Client error displayed when requesting a group RSS feed for an object that is not a group.
 #. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
@@ -1218,10 +1191,10 @@ msgstr "Dyrbiš přizjewjeny być, zo by skupinu wopušćił."
 #. TRANS: Client error displayed when trying to leave a non-local group.
 #. TRANS: Client error displayed when trying to leave a non-existing group.
 #. TRANS: Client error displayed when providing an invalid group ID on the Make Admin page.
-#. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
-#. TRANS: Client error displayed if no local group with a given name was found requesting group page.
 #. TRANS: Command exception text shown when a group is requested that does not exist.
 #. TRANS: Error text shown when trying to leave a group that does not exist.
+#. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
+#. TRANS: Client error displayed if no local group with a given name was found requesting group page.
 msgid "No such group."
 msgstr "Skupina njeeksistuje."
 
@@ -1234,9 +1207,8 @@ msgstr "Žane přimjeno abo žadyn ID."
 
 #. TRANS: Client error displayed trying to approve group membership while not logged in.
 #. TRANS: Client error displayed when trying to leave a group while not logged in.
-#, fuzzy
 msgid "Must be logged in."
-msgstr "Njepřizjewjeny."
+msgstr "Dyrbiš přizjewjeny być."
 
 #. TRANS: Client error displayed trying to approve group membership while not a group administrator.
 #. TRANS: Client error displayed when trying to approve or cancel a group join request without
@@ -1246,17 +1218,16 @@ msgstr ""
 
 #. TRANS: Client error displayed trying to approve group membership without specifying a profile to approve.
 #. TRANS: Client error displayed trying to approve subscriptionswithout specifying a profile to approve.
-#, fuzzy
 msgid "Must specify a profile."
-msgstr "Falowacy profil."
+msgstr "Dyrbiš profil podać."
 
 #. TRANS: Client error displayed trying to approve group membership for a non-existing request.
 #. TRANS: %s is a nickname.
 #. TRANS: Client error displayed when trying to approve a non-existing group join request.
 #. TRANS: %s is a user nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "%s is not in the moderation queue for this group."
-msgstr "Lisćina wužiwarjow w tutej skupinje."
+msgstr "%s w moderaciskej lisćinje za tutu skupinu njeje."
 
 #. TRANS: Client error displayed trying to approve/deny group membership.
 #. TRANS: Client error displayed trying to approve/deny subscription.
@@ -1270,16 +1241,17 @@ msgstr ""
 
 #. TRANS: Server error displayed when cancelling a queued group join request fails.
 #. TRANS: %1$s is the leaving user's nickname, $2$s is the group nickname for which the leave failed.
-#, fuzzy, php-format
+#, php-format
 msgid "Could not cancel request for user %1$s to join group %2$s."
-msgstr "Njebě móžno wužiwarja %1$s skupinje %2%s přidać."
+msgstr ""
+"Próstwa wo přistupje k skupinje %2$s za wužiwarja %1$s njeda so přetorhnyć"
 
 #. TRANS: Title for leave group page after group join request is approved/disapproved.
 #. TRANS: %1$s is the user nickname, %2$s is the group nickname.
-#, fuzzy, php-format
+#, php-format
 msgctxt "TITLE"
 msgid "%1$s's request for %2$s"
-msgstr "Status %1$s na %2$s"
+msgstr "Naprašowanje wužiwarja %1$s za %2$s"
 
 #. TRANS: Message on page for group admin after approving a join request.
 msgid "Join request approved."
@@ -1290,32 +1262,33 @@ msgid "Join request canceled."
 msgstr ""
 
 #. TRANS: Client error displayed trying to approve subscription for a non-existing request.
-#, fuzzy, php-format
+#. TRANS: %s is a user nickname.
+#, php-format
 msgid "%s is not in the moderation queue for your subscriptions."
-msgstr "Lisćina wužiwarjow w tutej skupinje."
+msgstr "%s w moderaciskej lisćinje za waše abonementy njeje."
 
 #. TRANS: Server error displayed when cancelling a queued subscription request fails.
 #. TRANS: %1$s is the leaving user's nickname, $2$s is the nickname for which the leave failed.
-#, fuzzy, php-format
+#, php-format
 msgid "Could not cancel or approve request for user %1$s to join group %2$s."
-msgstr "Njebě móžno wužiwarja %1$s skupinje %2%s přidać."
+msgstr ""
+"Próstwa wo přistupje k skupinje %2$s za wužiwarja %1$s njeda so přetorhnyć "
+"abo schwalić."
 
 #. TRANS: Title for subscription approval ajax return
 #. TRANS: %1$s is the approved user's nickname
-#, fuzzy, php-format
+#, php-format
 msgctxt "TITLE"
 msgid "%1$s's request"
-msgstr "Status %1$s na %2$s"
+msgstr "Naprašowanje wužiwarja %1$s"
 
 #. TRANS: Message on page for user after approving a subscription request.
-#, fuzzy
 msgid "Subscription approved."
-msgstr "Abonement awtorizowany"
+msgstr "Abonement schwaleny"
 
 #. TRANS: Message on page for user after rejecting a subscription request.
-#, fuzzy
 msgid "Subscription canceled."
-msgstr "Awtorizacija přetorhnjena."
+msgstr "Abonement přetorhnjeny."
 
 #. TRANS: Subtitle for Atom favorites feed.
 #. TRANS: %1$s is a user nickname, %2$s is the StatusNet sitename.
@@ -1346,9 +1319,9 @@ msgstr "Je hižo faworit."
 
 #. TRANS: Title for group membership feed.
 #. TRANS: %s is a username.
-#, fuzzy, php-format
+#, php-format
 msgid "Group memberships of %s"
-msgstr "%s skupisnkich �łonstwow"
+msgstr "Skupinske �łonstwa wužiwarja %s"
 
 #. TRANS: Subtitle for group membership feed.
 #. TRANS: %1$s is a username, %2$s is the StatusNet sitename.
@@ -1441,7 +1414,6 @@ msgstr "Přiwěšk njeeksistuje."
 #. TRANS: Client error displayed trying to get an avatar without providing a nickname.
 #. TRANS: Client error displayed when requesting a list of blocked users for a group without providing a group nickname.
 #. TRANS: Client error displayed trying to edit a group while not proving a nickname for the group to edit.
-#. TRANS: Client error displayed trying to change group design settings without providing a group nickname.
 #. TRANS: Client error displayed when trying to change group logo settings without providing a nickname.
 #. TRANS: Client error displayed when trying to view group members without providing a group nickname.
 #. TRANS: Client error displayed when requesting a group RSS feed without providing a group nickname.
@@ -1675,7 +1647,6 @@ msgid "No profile with that ID."
 msgstr "Žadyn profil z tym ID."
 
 #. TRANS: Title after unsubscribing from a group.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Unsubscribed"
 msgstr "Wotskazany"
@@ -1730,6 +1701,16 @@ msgstr "Adresa \"%s\" bu za twoje konto wobkrućena."
 msgid "Conversation"
 msgstr "Konwersacija"
 
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+msgid "Conversation feed (Activity Streams JSON)"
+msgstr "Konwersaciski kanal (Activity Streams JSON)"
+
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+msgid "Conversation feed (RSS 2.0)"
+msgstr "Konwersaciski kanal (RSS 2.0)"
+
 #. TRANS: Title for conversation page.
 #. TRANS: Title for page that shows a notice.
 msgctxt "TITLE"
@@ -1791,8 +1772,8 @@ msgid "Enter \"%s\" to confirm that you want to delete your account."
 msgstr "Zapodaj \"%s\", zo by wobkrućił, zo chceš swoje konto zhašeć."
 
 #. TRANS: Button title for user account deletion.
-msgid "Permanently delete your account"
-msgstr "Twoje konto na přeco zhašeć"
+msgid "Permanently delete your account."
+msgstr "Twoje konto na přeco zhašeć."
 
 #. TRANS: Client error displayed trying to delete an application while not logged in.
 msgid "You must be logged in to delete an application."
@@ -1928,149 +1909,6 @@ msgstr "Tutoho wužiwarja njezhašeć."
 msgid "Delete this user."
 msgstr "Tutoho wužiwarja zhašeć"
 
-#. TRANS: Message used as title for design settings for the site.
-msgid "Design"
-msgstr "Design"
-
-#. TRANS: Instructions for design adminsitration panel.
-msgid "Design settings for this StatusNet site"
-msgstr "Designowe nastajenja za tute sydło StatusNet"
-
-#. TRANS: Client error displayed when a logo URL does is not valid.
-msgid "Invalid logo URL."
-msgstr "Njepłaćiwy logowy URL."
-
-#. TRANS: Client error displayed when an SSL logo URL is invalid.
-msgid "Invalid SSL logo URL."
-msgstr "Njepłaćiwy SSL-URL loga."
-
-#. TRANS: Client error displayed when a theme is submitted through the form that is not in the theme list.
-#. TRANS: %s is the chosen unavailable theme.
-#, php-format
-msgid "Theme not available: %s."
-msgstr "Å at njesteji k dispoziciji: %s."
-
-#. TRANS: Fieldset legend for form to change logo.
-msgid "Change logo"
-msgstr "Logo změnić"
-
-#. TRANS: Field label for StatusNet site logo.
-msgid "Site logo"
-msgstr "Logo sydła"
-
-#. TRANS: Field label for SSL StatusNet site logo.
-msgid "SSL logo"
-msgstr "SSL-logo"
-
-#. TRANS: Fieldset legend for form change StatusNet site's theme.
-msgid "Change theme"
-msgstr "Šat změnić"
-
-#. TRANS: Field label for dropdown to choose site theme.
-msgid "Site theme"
-msgstr "Šat sydła"
-
-#. TRANS: Title for field label for dropdown to choose site theme.
-msgid "Theme for the site."
-msgstr "Šat za sydło."
-
-#. TRANS: Field label for uploading a cutom theme.
-msgid "Custom theme"
-msgstr "Swójski šat"
-
-#. TRANS: Form instructions for uploading a cutom StatusNet theme.
-msgid "You can upload a custom StatusNet theme as a .ZIP archive."
-msgstr "Móžeš swójski šat StatusNet jako .ZIP-archiw nahrać."
-
-#. TRANS: Fieldset legend for theme background image.
-msgid "Change background image"
-msgstr "Pozadkowy wobraz změnić"
-
-#. TRANS: Field label for background image on theme designer page.
-#. TRANS: Field label for background color selector.
-#. TRANS: Label on profile design page for setting a profile page background colour.
-msgid "Background"
-msgstr "Pozadk"
-
-#. TRANS: Form guide for background image upload form on theme designer page.
-#, php-format
-msgid ""
-"You can upload a background image for the site. The maximum file size is %1"
-"$s."
-msgstr ""
-"Móžeš pozadkowy wobraz za sydło nahrać. Maksimalna datajowa wulkosć je %1$s."
-
-#. TRANS: Used as radio button label to add a background image.
-msgid "On"
-msgstr "Zapinjeny"
-
-#. TRANS: Used as radio button label to not add a background image.
-msgid "Off"
-msgstr "Wupinjeny"
-
-#. TRANS: Form guide for turning background image on or off on theme designer page.
-#. TRANS: Form guide for a set of radio buttons on the profile design page that will enable or disable
-#. TRANS: use of the uploaded profile image.
-msgid "Turn background image on or off."
-msgstr "Pozadkowy wobraz zmóžnić abo znjemóžnić."
-
-#. TRANS: Checkbox label to title background image on theme designer page.
-#. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
-msgid "Tile background image"
-msgstr "Pozadkowy wobraz kachlicować"
-
-#. TRANS: Fieldset legend for theme colors.
-msgid "Change colors"
-msgstr "Barby změnić"
-
-#. TRANS: Field label for content color selector.
-#. TRANS: Label on profile design page for setting a profile page content colour.
-msgid "Content"
-msgstr "Wobsah"
-
-#. TRANS: Field label for sidebar color selector.
-#. TRANS: Label on profile design page for setting a profile page sidebar colour.
-msgid "Sidebar"
-msgstr "Bó�nica"
-
-#. TRANS: Field label for text color selector.
-#. TRANS: Label on profile design page for setting a profile page text colour.
-msgid "Text"
-msgstr "Tekst"
-
-#. TRANS: Field label for link color selector.
-#. TRANS: Label on profile design page for setting a profile page links colour.
-msgid "Links"
-msgstr "Wotkazy"
-
-#. TRANS: Fieldset legend for advanced theme design settings.
-msgid "Advanced"
-msgstr "Rozšěrjeny"
-
-#. TRANS: Field label for custom CSS.
-msgid "Custom CSS"
-msgstr "Swójski CSS"
-
-#. TRANS: Button text for resetting theme settings.
-msgctxt "BUTTON"
-msgid "Use defaults"
-msgstr "Standardne hódnoty wužiwać"
-
-#. TRANS: Title for button for resetting theme settings.
-#. TRANS: Title for button on profile design page to reset all colour settings to default.
-msgid "Restore default designs."
-msgstr "Standardne designy wobnowić."
-
-#. TRANS: Title for button for resetting theme settings.
-#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-msgid "Reset back to default."
-msgstr "Na standard wróćo stajić."
-
-#. TRANS: Title for button for saving theme settings.
-#. TRANS: Title for button on profile design page to save settings.
-msgid "Save design."
-msgstr "Design składować."
-
 #. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
 msgid "This notice is not a favorite!"
 msgstr "Tuta zdźělenka faworit njeje!"
@@ -2085,6 +1923,74 @@ msgstr "K faworitam přidać"
 msgid "No such document \"%s\"."
 msgstr "Dokument \"%s\" njeeksistuje."
 
+#. TRANS: Menu item in administrator navigation panel.
+#. TRANS: Menu item in default local navigation panel.
+#. TRANS: Menu item in personal group navigation menu.
+msgctxt "MENU"
+msgid "Home"
+msgstr "Startowa strona"
+
+msgctxt "MENU"
+msgid "Docs"
+msgstr "Dokumentacija"
+
+#. TRANS: Secondary navigation menu item leading to help on StatusNet.
+msgctxt "MENU"
+msgid "Help"
+msgstr "Pomoc"
+
+msgid "Getting started"
+msgstr "Prěnje kroki"
+
+#. TRANS: Secondary navigation menu item leading to text about StatusNet site.
+msgctxt "MENU"
+msgid "About"
+msgstr "Wo"
+
+msgid "About this site"
+msgstr "Wo tutym sydle"
+
+#. TRANS: Secondary navigation menu item leading to Frequently Asked Questions.
+msgctxt "MENU"
+msgid "FAQ"
+msgstr "Huste prašenja"
+
+msgid "Frequently asked questions"
+msgstr "Huste prašenja"
+
+#. TRANS: Secondary navigation menu item leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+msgctxt "MENU"
+msgid "Contact"
+msgstr "Kontakt"
+
+msgid "Contact info"
+msgstr "Kontaktne informacije"
+
+msgctxt "MENU"
+msgid "Tags"
+msgstr ""
+
+msgid "Using tags"
+msgstr ""
+
+#. TRANS: Menu item in default local navigation panel.
+#. TRANS: Menu item in search group navigation panel.
+#. TRANS: Menu item in local navigation menu.
+msgctxt "MENU"
+msgid "Groups"
+msgstr "Skupiny"
+
+msgid "Using groups"
+msgstr "Skupiny wužiwać"
+
+msgctxt "MENU"
+msgid "API"
+msgstr "API"
+
+msgid "RESTful API"
+msgstr "RESTful API"
+
 #. TRANS: Title for "Edit application" form.
 #. TRANS: Form legend.
 msgid "Edit application"
@@ -2189,41 +2095,37 @@ msgstr "Opcije składowane."
 
 #. TRANS: Title for edit list page after deleting a tag.
 #. TRANS: %s is a list.
-#, fuzzy, php-format
+#, php-format
 msgid "Delete %s list"
-msgstr "Tutoho wužiwarja wušmórnyć"
+msgstr "Lisćinu %s zhašeć"
 
 #. TRANS: Title for edit list page.
 #. TRANS: %s is a list.
 #. TRANS: Form legend for list edit form.
 #. TRANS: %s is a list.
-#, fuzzy, php-format
+#, php-format
 msgid "Edit list %s"
-msgstr "Njepłaćiwa wosobowa tafli�ka: %s."
+msgstr "Lisćinu %s wobdźěłać"
 
 #. TRANS: Error message displayed when trying to perform an action that requires a tagging user or ID.
-#, fuzzy
 msgid "No tagger or ID."
-msgstr "Žane přimjeno abo žadyn ID."
+msgstr "Žane wužiwarske mjeno abo žadyn ID."
 
 #. TRANS: Client error displayed when referring to non-local user.
 msgid "Not a local user."
 msgstr "Njeje lokalny wužiwar."
 
 #. TRANS: Client error displayed when reting to edit a tag that was not self-created.
-#, fuzzy
 msgid "You must be the creator of the tag to edit it."
-msgstr "Dyrbiš administrator być, zo by skupinu wobdźěłał."
+msgstr "Dyrbiš tworićel tuteje tafli�ki być, zo by ju wobdźěłał."
 
 #. TRANS: Form instruction for edit list form.
-#, fuzzy
 msgid "Use this form to edit the list."
-msgstr "Wuž tutón formular, zo by skupinu wobdźěłał."
+msgstr "Wužij tutón formular, zo by lisćinu wobdźěłał."
 
 #. TRANS: Form validation error displayed if the form data for deleting a tag was incorrect.
-#, fuzzy
 msgid "Delete aborted."
-msgstr "Zdźělenku wušmórnyć"
+msgstr "Zhašenje přetorhnjene."
 
 #. TRANS: Text in confirmation dialog for deleting a tag.
 msgid ""
@@ -2232,15 +2134,14 @@ msgid ""
 msgstr ""
 
 #. TRANS: Form validation error displayed if a given tag is invalid.
-#, fuzzy
 msgid "Invalid tag."
-msgstr "Njepłaćiwy wobraz."
+msgstr "Njepłaćiwa tafli�ka."
 
 #. TRANS: Form validation error displayed if a given tag is already present.
 #. TRANS: %s is the already present tag.
-#, fuzzy, php-format
+#, php-format
 msgid "You already have a tag named %s."
-msgstr "Sy tutu zdźělenku hižo wospjetował."
+msgstr "Maš hižo tafli�ku z mjenom %s."
 
 #. TRANS: Text in confirmation dialog for setting a tag from public to private.
 msgid ""
@@ -2248,10 +2149,9 @@ msgid ""
 "subscriptions to it. Do you still want to continue?"
 msgstr ""
 
-#. TRANS: TRANS: Server error displayed when updating a list fails.
-#, fuzzy
+#. TRANS: Server error displayed when updating a list fails.
 msgid "Could not update list."
-msgstr "Wužiwar njeje so dał aktualizować."
+msgstr "Lisćina njeda so aktualizować."
 
 #. TRANS: Title for e-mail settings.
 msgid "Email settings"
@@ -2540,40 +2440,6 @@ msgstr "Žane přiwěški."
 msgid "No uploaded attachments."
 msgstr "Žane nahrate přiwěški."
 
-#. TRANS: Client error displayed when subscribing to a remote profile and an unexpected response is received.
-msgid "Not expecting this response!"
-msgstr "Njewo�akowana wotmołwa!"
-
-#. TRANS: Client error displayed when subscribing to a remote profile that does not exist.
-msgid "User being listened to does not exist."
-msgstr ""
-
-#. TRANS: Client error displayed when subscribing to a remote profile that is a local profile.
-#. TRANS: Client error displayed when using remote subscribe for a local entity.
-msgid "You can use the local subscription!"
-msgstr "Móžeš lokalny abonement wužiwać!"
-
-#. TRANS: Client error displayed when subscribing to a remote profile that is blocked form subscribing to.
-msgid "That user has blocked you from subscribing."
-msgstr "Tutón wužiwar ći abonowanje njedowoli."
-
-#. TRANS: Client error displayed when subscribing to a remote profile without providing an authorised token.
-msgid "You are not authorized."
-msgstr "Njejsy awtorizowany."
-
-#. TRANS: Client error displayed when subscribing to a remote profile and conversion of the request token to access token fails.
-msgid "Could not convert request token to access token."
-msgstr ""
-
-#. TRANS: Client error displayed when subscribing to a remote profile fails because of an unsupported version of the OMB protocol.
-msgid "Remote service uses unknown version of OMB protocol."
-msgstr ""
-
-#. TRANS: Server error displayed when subscribing to a remote profile fails because the remote profile could not be updated.
-#. TRANS: Exception thrown when updating a remote profile fails in OAuth store.
-msgid "Error updating remote profile."
-msgstr "Zmylk při aktualizaciji zdaleneho profila."
-
 #. TRANS: Client error displayed when requesting a non-existent file.
 msgid "No such file."
 msgstr "Dataja njeeksistuje."
@@ -2658,29 +2524,6 @@ msgstr "Zmylk datoweje banki blokuje wužiwarja za skupinu."
 msgid "No ID."
 msgstr "Žadyn ID."
 
-#. TRANS: Client error displayed trying to change group design settings while not logged in.
-msgid "You must be logged in to edit a group."
-msgstr "Dyrbiš přizjewjeny być, zo by skupinu wobdźěłał."
-
-#. TRANS: Title group design settings page.
-msgid "Group design"
-msgstr "Skupinski design"
-
-#. TRANS: Instructions for group design settings page.
-msgid ""
-"Customize the way your group looks with a background image and a colour "
-"palette of your choice."
-msgstr ""
-
-#. TRANS: Form validation error displayed when group design settings could not be updated because of an application issue.
-msgid "Unable to update your design settings."
-msgstr "Njeje móžno, twoje designowe nastajenja aktualizować."
-
-#. TRANS: Form text to confirm saved group design settings.
-#. TRANS: Confirmation message on Profile design page when saving design settings has succeeded.
-msgid "Design preferences saved."
-msgstr "Designowe nastajenja składowane."
-
 #. TRANS: Title for group logo settings page.
 #. TRANS: Group logo form legend.
 msgid "Group logo"
@@ -2733,24 +2576,25 @@ msgstr "Lisćina wužiwarjow w tutej skupinje."
 
 #. TRANS: Client error displayed when trying to approve group applicants without being a group administrator.
 msgid "Only the group admin may approve users."
-msgstr ""
+msgstr "Jenož skupinski administrator móže wužiwarjow dopušćić."
 
 #. TRANS: Title of the first page showing pending group members still awaiting approval to join the group.
 #. TRANS: %s is the name of the group.
-#, fuzzy, php-format
+#, php-format
 msgid "%s group members awaiting approval"
-msgstr "%s skupisnkich �łonstwow"
+msgstr "Čłonojo skupiny %s �akaja na schwalenje"
 
 #. TRANS: Title of all but the first page showing pending group members still awaiting approval to join the group.
 #. TRANS: %1$s is the name of the group, %2$d is the page number of the members list.
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s group members awaiting approval, page %2$d"
-msgstr "%1$s skupinskich �łonow, strona %2$d"
+msgstr "Čłonojo skupiny %1$s �akaja na schwalenje, strona %2$d"
 
 #. TRANS: Page notice for group members page.
-#, fuzzy
 msgid "A list of users awaiting approval to join this group."
-msgstr "Lisćina wužiwarjow w tutej skupinje."
+msgstr ""
+"Lisćina wužiwarjow, kotřiž na schwalenje �akaja, zo bychu do tuteje skupiny "
+"zastupili."
 
 #. TRANS: Message is used as link description. %1$s is a group name, %2$s is a site name.
 #, php-format
@@ -2845,8 +2689,8 @@ msgstr "IM-nastajenja"
 #. TRANS: the order and formatting of link text and link should remain unchanged.
 #, php-format
 msgid ""
-"You can send and receive notices through instant messaging [instant messages]"
-"(%%doc.im%%). Configure your addresses and settings below."
+"You can send and receive notices through [instant messaging](%%doc.im%%). "
+"Configure your addresses and settings below."
 msgstr ""
 
 #. TRANS: Message given in the IM settings if IM is not enabled on the site.
@@ -2880,31 +2724,24 @@ msgid "IM Preferences"
 msgstr "M-nastajenja"
 
 #. TRANS: Checkbox label in IM preferences form.
-#, fuzzy
 msgid "Send me notices"
-msgstr "Zdźělenku pósłać"
+msgstr "Mi zdźělenki pósłać"
 
 #. TRANS: Checkbox label in IM preferences form.
-#, fuzzy
 msgid "Post a notice when my status changes."
-msgstr "Powěsć pósłac, hdyž so mój status Jabber/Google Talk změni."
+msgstr "Powěsć pósłac, hdyž so mój status změni."
 
 #. TRANS: Checkbox label in IM preferences form.
-#, fuzzy
 msgid "Send me replies from people I'm not subscribed to."
-msgstr ""
-"Pósćel mi wotmołwy přez Jabber/Google Talk wot ludźi, kotrychž njejsym "
-"abonował."
+msgstr "Pósćel mi wotmołwy wot ludźi, kotrychž njejsym abonował."
 
 #. TRANS: Checkbox label in IM preferences form.
-#, fuzzy
 msgid "Publish a MicroID"
-msgstr "MicroID za moju e-mejlowu adresu publikować"
+msgstr "MicroID wozjewić"
 
 #. TRANS: Server error thrown on database error updating IM preferences.
-#, fuzzy
 msgid "Could not update IM preferences."
-msgstr "Wužiwar njeje so dał aktualizować."
+msgstr "IM-nastajenja njedachu so aktualizować."
 
 #. TRANS: Confirmation message for successful IM preferences save.
 #. TRANS: Confirmation message after saving preferences.
@@ -2912,43 +2749,36 @@ msgid "Preferences saved."
 msgstr "Nastajenja składowane."
 
 #. TRANS: Message given saving IM address without having provided one.
-#, fuzzy
 msgid "No screenname."
 msgstr "Žane přimjeno."
 
 #. TRANS: Form validation error when no transport is available setting an IM address.
-#, fuzzy
 msgid "No transport."
-msgstr "Žana zdźělenka."
+msgstr "Žane přenjesenje k dispoziciji"
 
 #. TRANS: Message given saving IM address that cannot be normalised.
-#, fuzzy
 msgid "Cannot normalize that screenname."
-msgstr "Tutón Jabber-ID njehodźi so normalizować"
+msgstr "Přimjeno njehodźi so normalizować."
 
 #. TRANS: Message given saving IM address that not valid.
-#, fuzzy
 msgid "Not a valid screenname."
 msgstr "Žane płaćiwe přimjeno."
 
 #. TRANS: Message given saving IM address that is already set for another user.
-#, fuzzy
 msgid "Screenname already belongs to another user."
-msgstr "Jabber-ID hižo druhemu wužiwarjej słuša."
+msgstr "Wužiwarske mjeno hižo druhemu wužiwarjej słuša."
 
 #. TRANS: Message given saving valid IM address that is to be confirmed.
-#, fuzzy
 msgid "A confirmation code was sent to the IM address you added."
-msgstr "Tutón wobkrućenski kod njeje za tebje!"
+msgstr "Wobkrućenski kod je so na IM-adresu pósłał, kotruž sy přidał."
 
 #. TRANS: Message given canceling IM address confirmation for the wrong IM address.
 msgid "That is the wrong IM address."
 msgstr "to je wopa�na IM-adresa."
 
 #. TRANS: Server error thrown on database error canceling IM address confirmation.
-#, fuzzy
 msgid "Could not delete confirmation."
-msgstr "IM-wobkrućenje njeda so zhašeć."
+msgstr "Wobkrućenje njeda so zhašeć."
 
 #. TRANS: Message given after successfully canceling IM address confirmation.
 msgid "IM confirmation cancelled."
@@ -2956,9 +2786,8 @@ msgstr "IM-wobkrućenje přetorhnjene."
 
 #. TRANS: Message given trying to remove an IM address that is not
 #. TRANS: registered for the active user.
-#, fuzzy
 msgid "That is not your screenname."
-msgstr "To twoje telefonowe �isło njeje."
+msgstr "To twoje wužiwarske mjeno njeje."
 
 #. TRANS: Message given after successfully removing a registered Instant Messaging address.
 msgid "The IM address was removed."
@@ -3061,28 +2890,6 @@ msgstr ""
 "Wužij tutón formular, zo by swojich přećelow a kolegow přeprosył, zo bychu "
 "tutu słužbu wužiwali."
 
-#. TRANS: Field label for a list of e-mail addresses.
-msgid "Email addresses"
-msgstr "E-mejlowe adresy"
-
-#. TRANS: Tooltip for field label for a list of e-mail addresses.
-msgid "Addresses of friends to invite (one per line)."
-msgstr "Adresy přećelow, kotřiž maja so přeprosyć (jedna na linku)"
-
-#. TRANS: Field label for a personal message to send to invitees.
-msgid "Personal message"
-msgstr "Wosobinska powěsć"
-
-#. TRANS: Tooltip for field label for a personal message to send to invitees.
-msgid "Optionally add a personal message to the invitation."
-msgstr "Wosobinsku powěsć po dobrozdaću přeprošenju přidać."
-
-#. TRANS: Send button for inviting friends
-#. TRANS: Button text for sending notice.
-msgctxt "BUTTON"
-msgid "Send"
-msgstr "Pósłać"
-
 #. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral
 #. TRANS: singular 3rd-person pronoun in English. %1$s is the inviting user, $2$s is
 #. TRANS: the StatusNet sitename.
@@ -3101,9 +2908,8 @@ msgid "%1$s joined group %2$s"
 msgstr "%1$s je do skupiny %2$s zastupił"
 
 #. TRANS: Exception thrown when there is an unknown error joining a group.
-#, fuzzy
 msgid "Unknown error joining group."
-msgstr "Njeznata skupina"
+msgstr "Njeznaty zmylk při zastupjenju do skupiny wustupił."
 
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
@@ -3214,12 +3020,6 @@ msgstr "URL za wobraz, kotryž ma so z licencu zwobraznić."
 msgid "Save license settings."
 msgstr "Licencne nastajenja składować."
 
-#. TRANS: Client error displayed when trying to log in while already logged in.
-#. TRANS: Client error displayed trying to use "one time password login" when already logged in.
-#. TRANS: Client error displayed when trying to register while already logged in.
-msgid "Already logged in."
-msgstr "Hižo přizjewjeny."
-
 #. TRANS: Form validation error displayed when trying to log in with incorrect credentials.
 msgid "Incorrect username or password."
 msgstr "Wopa�ne wužiwarske mjeno abo hesło."
@@ -3238,9 +3038,8 @@ msgid "Login to site"
 msgstr "Při sydle přizjewić"
 
 #. TRANS: Field label on login page.
-#, fuzzy
 msgid "Username or email address"
-msgstr "Přimjeno abo e-mejlowa adresa"
+msgstr "Wužiwarske mjeno abo e-mejlowa adresa"
 
 #. TRANS: Checkbox label label on login page.
 #. TRANS: Checkbox label on account registration page.
@@ -3329,6 +3128,7 @@ msgstr "Žórłowy URL je trěbny."
 msgid "Could not create application."
 msgstr "Aplikacija njeda so wutworić."
 
+#. TRANS: Form validation error messages displayed when uploading an invalid application logo.
 msgid "Invalid image."
 msgstr "Njepłaćiwy wobraz."
 
@@ -3365,12 +3165,6 @@ msgstr "Žadyn wobsah!"
 msgid "No recipient specified."
 msgstr "Žadyn přijimowar podaty."
 
-#. TRANS: Client error displayed trying to send a direct message to self.
-#. TRANS: Error text shown when trying to send a direct message to self.
-msgid ""
-"Don't send a message to yourself; just say it to yourself quietly instead."
-msgstr ""
-
 #. TRANS: Page title after sending a direct message.
 msgid "Message sent"
 msgstr "Powěsć pósłana"
@@ -3390,7 +3184,6 @@ msgstr "Zmylk Ajax"
 
 #. TRANS: Page title for sending a new notice.
 #. TRANS: Title for form to send a new notice.
-#, fuzzy
 msgctxt "TITLE"
 msgid "New notice"
 msgstr "Nowa zdźělenka"
@@ -3566,6 +3359,32 @@ msgstr ""
 msgid "Not a supported data format."
 msgstr "Njeje podpěrany datowy format."
 
+#. TRANS: Page title for profile settings.
+msgid "Old school UI settings"
+msgstr "Stare UI-nastajenja"
+
+#. TRANS: Usage instructions for profile settings.
+msgid "If you like it \"the old way\", you can set that here."
+msgstr ""
+
+#. TRANS: Confirmation shown when user profile settings are saved.
+#. TRANS: Message after successful saving of administrative settings.
+msgid "Settings saved."
+msgstr "Nastajenja składowane."
+
+msgid "Only stream mode (no conversations) in timelines"
+msgstr ""
+
+msgid "Show conversation page as hierarchical trees"
+msgstr "Konwersacisku stronu jako hierarchiski štom pokazać"
+
+msgid "Show nicknames (not full names) in timelines"
+msgstr ""
+
+#. TRANS: Button text to save a list.
+msgid "Save"
+msgstr "Składować"
+
 #. TRANS: ShortName in the OpenSearch interface when trying to find users.
 msgid "People Search"
 msgstr "Ludźi pytać"
@@ -3574,6 +3393,11 @@ msgstr "Ludźi pytać"
 msgid "Notice Search"
 msgstr "Zdźělenku pytać"
 
+#. TRANS: Client error displayed trying to use "one time password login" when already logged in.
+#. TRANS: Client error displayed when trying to register while already logged in.
+msgid "Already logged in."
+msgstr "Hižo přizjewjeny."
+
 #. TRANS: Client error displayed trying to use "one time password login" without specifying a user.
 msgid "No user ID specified."
 msgstr "Žadyn wužiwarski ID podaty."
@@ -3645,7 +3469,7 @@ msgid "Confirm"
 msgstr "Wobkrućić"
 
 #. TRANS: Field title on page where to change password.
-#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
+#. TRANS: Title for field label for password reset form where the password has to be typed again.
 #. TRANS: Field title on account registration page.
 msgid "Same as password above."
 msgstr "Samsne hesło kaž horjeka."
@@ -3703,12 +3527,6 @@ msgstr "Šatowy zapis njeda so �itać: %s"
 msgid "Avatar directory not writable: %s."
 msgstr "Do awataroweho zapisa njeda so pisać: %s."
 
-#. TRANS: Client error in Paths admin panel.
-#. TRANS: %s is the background directory that could not be written to.
-#, php-format
-msgid "Background directory not writable: %s."
-msgstr "Do pozadkoweho zapisa njeda so pisać: %s."
-
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the locales directory that could not be read from.
 #, php-format
@@ -3821,30 +3639,6 @@ msgstr "Awatarowy zapis"
 msgid "Directory where avatars are located."
 msgstr "Zapis, hdźež awatary su."
 
-#. TRANS: Fieldset legend in Paths admin panel.
-msgid "Backgrounds"
-msgstr "Pozadki"
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-msgid "Server for backgrounds."
-msgstr "Serwer za pozadki."
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-msgid "Web path to backgrounds."
-msgstr "Webšćežka k pozadkam."
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-msgid "Server for backgrounds on SSL pages."
-msgstr "Serwer za pozadki na SSL-stronach."
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-msgid "Web path to backgrounds on SSL pages."
-msgstr "Webšćežka k pozadkam na SSL-stronach."
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-msgid "Directory where backgrounds are located."
-msgstr "Zapis, hdźež pozadki su."
-
 #. TRANS: Fieldset legens in Paths admin panel.
 msgid "Attachments"
 msgstr "Přiwěški"
@@ -3893,15 +3687,15 @@ msgstr "SSL wužiwać"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
 msgid "When to use SSL."
-msgstr ""
+msgstr "Hdy ma so SSL wužiwać."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
 msgid "Server to direct SSL requests to."
 msgstr ""
 
 #. TRANS: Button title text to store form data in the Paths admin panel.
-msgid "Save paths"
-msgstr "Šćežki składować"
+msgid "Save path settings."
+msgstr "Pućikowe nastajenja składować."
 
 #. TRANS: Instructions for the "People search" page.
 #. TRANS: %%site.name%% is the name of the StatusNet site.
@@ -3917,15 +3711,15 @@ msgstr "Za ludźimi pytać"
 
 #. TRANS: Title for list page.
 #. TRANS: %s is a list.
-#, fuzzy, php-format
+#, php-format
 msgid "Public list %s"
-msgstr "Zjawna �asowa lajsta, strona %d"
+msgstr "Zjawna lisćina %s"
 
 #. TRANS: Title for list page.
 #. TRANS: %1$s is a list, %2$d is a page number.
-#, fuzzy, php-format
+#, php-format
 msgid "Public list %1$s, page %2$d"
-msgstr "Wotmołwy na %1$s, strona %2$d"
+msgstr "Zjawna lisćina %1$s, strona %2$d"
 
 #. TRANS: Message for anonymous users on list page.
 #. TRANS: This message contains Markdown links in the form [description](link).
@@ -3938,67 +3732,62 @@ msgid ""
 msgstr ""
 
 #. TRANS: Client error displayed when a tagger is expected but not provided.
-#, fuzzy
 msgid "No tagger."
-msgstr "Tafli�ka njeeksistuje."
+msgstr "Wužiwar njeeksistuje."
 
 #. TRANS: Title for list of people listed by the user.
 #. TRANS: %1$s is a list, %2$s is a username.
-#, fuzzy, php-format
+#, php-format
 msgid "People listed in %1$s by %2$s"
-msgstr "Wotmołwy na %1$s na %2$s."
+msgstr "Ludźo nalistowani w %1$s wot %2$s"
 
 #. TRANS: Title for list of people listed by the user.
 #. TRANS: %1$s is a list, %2$s is a username, %2$s is a page number.
-#, fuzzy, php-format
+#, php-format
 msgid "People listed in %1$s by %2$s, page %3$d"
-msgstr "Wotmołwy na %1$s, strona %2$d"
+msgstr "Ludźo nalistowani w %1$s wot %2$s, strona %3$d"
 
 #. TRANS: Addition in tag membership list for creator of a tag.
 #. TRANS: Addition in tag subscribers list for creator of a tag.
-#, fuzzy
 msgid "Creator"
-msgstr "Wutworjeny"
+msgstr "Tworićel"
 
 #. TRANS: Title for lists by a user page for a private tag.
-#, fuzzy
 msgid "Private lists by you"
-msgstr "Skupinu %s wobdźěłać"
+msgstr "Twoje priwatne lisćiny"
 
 #. TRANS: Title for lists by a user page for a public tag.
 msgid "Public lists by you"
-msgstr ""
+msgstr "Twoje zjawne lisćiny"
 
 #. TRANS: Title for lists by a user page.
-#, fuzzy
 msgid "Lists by you"
-msgstr "Skupinu %s wobdźěłać"
+msgstr "Twoje lisćiny"
 
 #. TRANS: Title for lists by a user page.
 #. TRANS: %s is a user nickname.
 #, php-format
 msgid "Lists by %s"
-msgstr ""
+msgstr "Lisćiny wot %s"
 
 #. TRANS: Title for lists by a user page.
 #. TRANS: %1$s is a user nickname, %2$d is a page number.
-#, fuzzy, php-format
+#, php-format
 msgid "Lists by %1$s, page %2$d"
-msgstr "Zdźělenki su z %1$s woznamjenjene, strona %2$d"
+msgstr "Lisćiny wot %1$s, strona %2$d"
 
 #. TRANS: Client error displayed when trying view another user's private lists.
 msgid "You cannot view others' private lists"
-msgstr ""
+msgstr "Njemóžeš sej lisćiny druhich ludźi wobhladać"
 
 #. TRANS: Mode selector label.
-#, fuzzy
 msgid "Mode"
-msgstr "Moderěrować"
+msgstr "Modus"
 
 #. TRANS: Link text to show lists for user %s.
-#, fuzzy, php-format
+#, php-format
 msgid "Lists for %s"
-msgstr "Wuchadny póst za %s"
+msgstr "Lisćiny za %s"
 
 #. TRANS: Fieldset legend.
 #. TRANS: Fieldset legend on gallery action page.
@@ -4010,22 +3799,19 @@ msgid "Show private tags."
 msgstr ""
 
 #. TRANS: Checkbox label to show public tags.
-#, fuzzy
 msgctxt "LABEL"
 msgid "Public"
 msgstr "Zjawny"
 
 #. TRANS: Checkbox title.
-#, fuzzy
 msgid "Show public tags."
-msgstr "Tafli�ka njeeksistuje."
+msgstr "Zjawne tafli�ki pokazać."
 
 #. TRANS: Submit button text for tag filter form.
 #. TRANS: Submit button text on gallery action page.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Go"
-msgstr "Start"
+msgstr "Wotpósłać"
 
 #. TRANS: Message displayed for anonymous users on page that displays lists by a user.
 #. TRANS: This message contains Markdown links in the form [description](links).
@@ -4036,7 +3822,7 @@ msgid ""
 "%%%site.name%%%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
 "blogging) service based on the Free Software [StatusNet](http://status.net/) "
 "tool. You can easily keep track of what they are doing by subscribing to the "
-"tag's timeline."
+"list's timeline."
 msgstr ""
 
 #. TRANS: Message displayed on page that displays lists by a user when there are none.
@@ -4052,9 +3838,9 @@ msgid "Lists with %s in them"
 msgstr ""
 
 #. TRANS: Page title. %1$s is a tagged user's nickname, %2$s is a page number.
-#, fuzzy, php-format
+#, php-format
 msgid "Lists with %1$s, page %2$d"
-msgstr "Zdźělenki su z %1$s woznamjenjene, strona %2$d"
+msgstr "Lisćiny z %1$s, strona %2$d"
 
 #. TRANS: Message displayed for anonymous users on page that displays lists for a user.
 #. TRANS: This message contains Markdown links in the form [description](links).
@@ -4065,7 +3851,7 @@ msgid ""
 "site.name%%%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
 "blogging) service based on the Free Software [StatusNet](http://status.net/) "
 "tool. You can easily keep track of what they are doing by subscribing to the "
-"tag's timeline."
+"list's timeline."
 msgstr ""
 
 #. TRANS: Message displayed on page that displays lists a user was added to when there are none.
@@ -4077,27 +3863,27 @@ msgstr ""
 
 #. TRANS: Page title for list of list subscribers.
 #. TRANS: %1$s is a list, %2$s is a user nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "Subscribers to list %1$s by %2$s"
-msgstr "%s abonowany."
+msgstr "Abonenća lisćiny %1$s wot %2$s"
 
 #. TRANS: Page title for list of list subscribers.
 #. TRANS: %1$s is a list, %2$s is a user nickname, %3$d is a page number.
-#, fuzzy, php-format
+#, php-format
 msgid "Subscribers to list %1$s by %2$s, page %3$d"
-msgstr "%1$s z %2$s markěrowany, strona %3$d"
+msgstr "Abonenća lisćiny %1$s wot %2$s, strona %3$d"
 
 #. TRANS: Title for page that displays lists subscribed to by a user.
 #. TRANS: %s is a profile nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "Lists subscribed to by %s"
-msgstr "%s abonowany."
+msgstr "Wot %s abonowane lisćiny"
 
 #. TRANS: Title for page that displays lists subscribed to by a user.
 #. TRANS: %1$s is a profile nickname, %2$d is a page number.
-#, fuzzy, php-format
+#, php-format
 msgid "Lists subscribed to by %1$s, page %2$d"
-msgstr "%1$s abonementow, strona %2$d"
+msgstr "Wot %1$s abonowanych lisćiny, strona %2$d"
 
 #. TRANS: Message displayed for anonymous users on page that displays lists subscribed to by a user.
 #. TRANS: This message contains Markdown links in the form [description](links).
@@ -4114,7 +3900,7 @@ msgstr ""
 #. TRANS: Page title for AJAX form return when a disabling a plugin.
 msgctxt "plugin"
 msgid "Disabled"
-msgstr ""
+msgstr "Znjemóžnjeny"
 
 #. TRANS: Client error displayed when trying to use another method than POST.
 #. TRANS: Do not translate POST.
@@ -4122,7 +3908,7 @@ msgstr ""
 #. TRANS: Do not translate POST.
 #. TRANS: Client error displayed when trying to use another method than POST.
 msgid "This action only accepts POST requests."
-msgstr ""
+msgstr "Tuta akcija jenož POST-naprašowanja akceptuje."
 
 #. TRANS: Client error displayed when trying to enable or disable a plugin without access rights.
 msgid "You cannot administer plugins."
@@ -4135,7 +3921,7 @@ msgstr "Tyka� njeeksistuje."
 #. TRANS: Page title for AJAX form return when enabling a plugin.
 msgctxt "plugin"
 msgid "Enabled"
-msgstr ""
+msgstr "Zmóžnjeny"
 
 #. TRANS: Tab and title for plugins admin panel.
 msgctxt "TITLE"
@@ -4158,31 +3944,20 @@ msgid ""
 "All default plugins have been disabled from the site's configuration file."
 msgstr ""
 
-#. TRANS: Client error displayed if the notice posted has too many characters.
-msgid "Invalid notice content."
-msgstr "Njepłaćiwy wobsah zdźělenki."
-
-#. TRANS: Exception thrown if a notice's license is not compatible with the StatusNet site license.
-#. TRANS: %1$s is the notice license, %2$s is the StatusNet site's license.
-#, php-format
-msgid "Notice license \"%1$s\" is not compatible with site license \"%2$s\"."
-msgstr ""
-
 #. TRANS: Client error displayed when trying to add an unindentified field to profile.
 #. TRANS: %s is a field name.
 #, php-format
 msgid "Unidentified field %s."
-msgstr ""
+msgstr "Njeidentifikowane polo %s."
 
 #. TRANS: Page title.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Search results"
-msgstr "Pytanske sydło"
+msgstr "Pytanske wuslědki"
 
 #. TRANS: Error message in case a search is shorter than three characters.
 msgid "The search string must be at least 3 characters long."
-msgstr ""
+msgstr "Pytanski wuraz dyrbi znajmjeńša 3 znamješka dołhe być."
 
 #. TRANS: Page title for profile settings.
 msgid "Profile settings"
@@ -4231,19 +4006,18 @@ msgstr "URL twojeje startoweje strony, bloga abo profila na druhim sydle."
 #. TRANS: Text area title in form for account registration. Plural
 #. TRANS: is decided by the number of characters available for the
 #. TRANS: biography (%d).
-#, fuzzy, php-format
+#, php-format
 msgid "Describe yourself and your interests in %d character."
 msgid_plural "Describe yourself and your interests in %d characters."
 msgstr[0] "Wopisaj sebje a swoje zajimy z %d znamješkom"
 msgstr[1] "Wopisaj sebje a swoje zajimy z %d znamješkomaj"
 msgstr[2] "Wopisaj sebje a swoje zajimy z %d znamješkami"
-msgstr[3] "Wopisaj sebje a swoje zajimy z %d znamješkami"
+msgstr[3] "Wopisaj sebje a swoje zajimy z %d znamješkami."
 
 #. TRANS: Tooltip for field label in form for profile settings.
 #. TRANS: Text area title on account registration page.
-#, fuzzy
 msgid "Describe yourself and your interests."
-msgstr "Wopisaj sebje a swoje zajimy"
+msgstr "Wopisaj sebje a swoje zajimy."
 
 #. TRANS: Text area label in form for profile settings where users can provide
 #. TRANS: their biography.
@@ -4268,6 +4042,8 @@ msgid "Share my current location when posting notices"
 msgstr ""
 
 #. TRANS: Field label in form for profile settings.
+#. TRANS: Title for group tag cloud section.
+#. TRANS: %s is a group name.
 msgid "Tags"
 msgstr ""
 
@@ -4295,23 +4071,21 @@ msgstr "W kotrym �asowym pasmje sy zwjetša?"
 
 #. TRANS: Checkbox label in form for profile settings.
 msgid ""
-"Automatically subscribe to whoever subscribes to me (best for non-humans)."
+"Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr ""
-"Awtomatisce kóždeho abonować, kotryž  mje abonuje (najlěpše za \"njeludźi\")."
+"Awtomatisce kóždeho abonować, kotryž  mje abonuje (najlěpše za \"njeludźi\")"
 
 #. TRANS: Dropdown field label on profile settings, for what policies to apply when someone else tries to subscribe to your updates.
-#, fuzzy
 msgid "Subscription policy"
-msgstr "Abonementy"
+msgstr "Abonementowe nastajenja"
 
 #. TRANS: Dropdown field option for following policy.
-#, fuzzy
 msgid "Let anyone follow me"
-msgstr "Móžeš jenož wosobam slědować."
+msgstr "Kóždy smě mje abonować"
 
 #. TRANS: Dropdown field option for following policy.
 msgid "Ask me first"
-msgstr ""
+msgstr "Prjedy so prašeć"
 
 #. TRANS: Dropdown field title on group edit form.
 msgid "Whether other users need your permission to follow your updates."
@@ -4355,9 +4129,9 @@ msgstr "Njepłaćiwa tafli�ka: \"%s\"."
 
 #. TRANS: Server error thrown when user profile settings could not be updated to
 #. TRANS: automatically subscribe to any subscriber.
-#, fuzzy
 msgid "Could not update user for autosubscribe or subscribe_policy."
-msgstr "Wužiwar njeda so za awtomatiske abonowanje aktualizować."
+msgstr ""
+"Wužiwar njeda so za awtomatiske abonowanje abo subscribe_policy aktualizować."
 
 #. TRANS: Server error thrown when user profile location preference settings could not be updated.
 msgid "Could not save location prefs."
@@ -4367,11 +4141,6 @@ msgstr "Nastajenja městna njedachu so składować."
 msgid "Could not save tags."
 msgstr "Tafli�ki njedadźa so składować."
 
-#. TRANS: Confirmation shown when user profile settings are saved.
-#. TRANS: Message after successful saving of administrative settings.
-msgid "Settings saved."
-msgstr "Nastajenja składowane."
-
 #. TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
 #. TRANS: Page title for page where a user account can be restored from backup.
 msgid "Restore account"
@@ -4384,8 +4153,8 @@ msgid "Beyond the page limit (%s)."
 msgstr "Limit stronow (%s) překro�eny."
 
 #. TRANS: Server error displayed when a public timeline cannot be retrieved.
-msgid "Could not retrieve public stream."
-msgstr "Zjawny prud njeda so wotwołać."
+msgid "Could not retrieve public timeline."
+msgstr "Zjawna �asowa lajsta njeda so wotwołać."
 
 #. TRANS: Title for all public timeline pages but the first.
 #. TRANS: %d is the page number.
@@ -4399,16 +4168,20 @@ msgid "Public timeline"
 msgstr ""
 
 #. TRANS: Link description for public timeline feed.
-msgid "Public Stream Feed (RSS 1.0)"
-msgstr "Kanal zjawneho pruda (RSS 1.0)"
+msgid "Public Timeline Feed (Activity Streams JSON)"
+msgstr "Kanal zjawneje �asoweje lajsty (Activity Streams JSON)"
 
 #. TRANS: Link description for public timeline feed.
-msgid "Public Stream Feed (RSS 2.0)"
-msgstr "Kanal zjawneho pruda (RSS 2.0)"
+msgid "Public Timeline Feed (RSS 1.0)"
+msgstr "Kanal zjawneje �asoweje lajsty (RSS 1.0)"
 
 #. TRANS: Link description for public timeline feed.
-msgid "Public Stream Feed (Atom)"
-msgstr "Kanal zjawneho pruda (Atom)"
+msgid "Public Timeline Feed (RSS 2.0)"
+msgstr "Kanal zjawneje �asoweje lajsty (RSS 2.0)"
+
+#. TRANS: Link description for public timeline feed.
+msgid "Public Timeline Feed (Atom)"
+msgstr "Kanal zjawneje �asoweje lajsty (Atom)"
 
 #. TRANS: Text displayed for public feed when there are no public notices.
 #, php-format
@@ -4446,52 +4219,6 @@ msgid ""
 "tool."
 msgstr ""
 
-#. TRANS: Title for page with public list cloud.
-#, fuzzy
-msgid "Public list cloud"
-msgstr "Zjawna �asowa lajsta, strona %d"
-
-#. TRANS: Page notice for page with public list cloud.
-#. TRANS: %s is a StatusNet sitename.
-#, php-format
-msgid "These are largest lists on %s"
-msgstr ""
-
-#. TRANS: Empty list message on page with public list cloud.
-#. TRANS: This message contains Markdown links in the form [description](link).
-#, php-format
-msgid "No one has [listed](%%doc.tags%%) anyone yet."
-msgstr ""
-
-#. TRANS: Additional empty list message on page with public list cloud for logged in users.
-#, fuzzy
-msgid "Be the first to list someone!"
-msgstr "Budź prěni, kiž tajki pisa!"
-
-#. TRANS: Additional empty list message on page with public list cloud for anonymous users.
-#. TRANS: This message contains Markdown links in the form [description](link).
-#, fuzzy, php-format
-msgid ""
-"Why not [register an account](%%action.register%%) and be the first to list "
-"someone!"
-msgstr ""
-"%s nima abonentow. Čehodla nochceš [konto registrować] (%%%%action.register%%"
-"%%) a prěni być?"
-
-#. TRANS: DT element on on page with public list cloud.
-#, fuzzy
-msgid "List cloud"
-msgstr "Wužiwar njenamakany."
-
-#. TRANS: Link title for number of listed people. %d is the number of listed people.
-#, php-format
-msgid "1 person listed"
-msgid_plural "%d people listed"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-
 #. TRANS: Public RSS feed description. %s is the StatusNet site name.
 #, php-format
 msgid "%s updates from everyone."
@@ -4529,6 +4256,8 @@ msgid ""
 "Why not [register an account](%%action.register%%) and be the first to post "
 "one!"
 msgstr ""
+"Čehodla [njeregistruješ konto](%%action.register%%) a sy prěni, kiž powěsć "
+"wotpósćele!"
 
 #. TRANS: Client error displayed trying to recover password while already logged in.
 msgid "You are already logged in!"
@@ -4612,7 +4341,6 @@ msgid "6 or more characters, and do not forget it!"
 msgstr "6 abo wjace znamješkow, a njezabudź jo!"
 
 #. TRANS: Button text for password reset form.
-#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
 msgctxt "BUTTON"
 msgid "Reset"
 msgstr "Wróćo stajić"
@@ -4621,19 +4349,6 @@ msgstr "Wróćo stajić"
 msgid "Enter a nickname or email address."
 msgstr "Zapodaj přimjeno abo e-mejlowu adresu."
 
-#. TRANS: Information on password recovery form if no known username or e-mail address was specified.
-msgid "No user with that email address or username."
-msgstr ""
-"Wužiwar z tej e-mejlowej adresu abo tym wužiwarskim mjenom njeeksistuje."
-
-#. TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.
-msgid "No registered email address for that user."
-msgstr "Wužiwar nima žanu zregistrowanu e-mejlowu adresu."
-
-#. TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.
-msgid "Error saving address confirmation."
-msgstr "Zmylk při składowanju adresoweho wobkrućenja."
-
 #. TRANS: User notification after an e-mail with instructions was sent from the password recovery form.
 msgid ""
 "Instructions for recovering your password have been sent to the email "
@@ -4662,15 +4377,14 @@ msgid "New password successfully saved. You are now logged in."
 msgstr "Nowe hesło bu wuspěšnje składowane. Sy nětko přizjewjeny."
 
 #. TRANS: Client exception thrown when no ID parameter was provided.
-#, fuzzy
 msgid "No id parameter."
-msgstr "Žadyn argument ID."
+msgstr "Žadyn parameter ID."
 
 #. TRANS: Client exception thrown when an invalid ID parameter was provided for a file.
 #. TRANS: %d is the provided ID for which the file is not present (number).
-#, fuzzy, php-format
+#, php-format
 msgid "No such file \"%d\"."
-msgstr "Dataja njeeksistuje."
+msgstr "Dataja \"%d\" njeeksistuje."
 
 #. TRANS: Client error displayed when trying to register to an invite-only site without an invitation.
 msgid "Sorry, only invited people can register."
@@ -4685,7 +4399,6 @@ msgid "Registration successful"
 msgstr "Registrowanje wuspěšne"
 
 #. TRANS: Title for registration page.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Register"
 msgstr "Registrować"
@@ -4695,9 +4408,8 @@ msgid "Registration not allowed."
 msgstr "Registracija njedowolena."
 
 #. TRANS: Form validation error displayed when trying to register without agreeing to the site license.
-#, fuzzy
 msgid "You cannot register if you do not agree to the license."
-msgstr "Njemóžeš so registrować, jeli njepřizwoleš do licency."
+msgstr "Njemóžeš so registrować, jeli njezwoliš do licency."
 
 #. TRANS: Form validation error displayed when trying to register with an already registered e-mail address.
 msgid "Email address already exists."
@@ -4714,13 +4426,11 @@ msgid ""
 msgstr ""
 
 #. TRANS: Field label on account registration page. In this field the password has to be entered a second time.
-#, fuzzy
 msgctxt "PASSWORD"
 msgid "Confirm"
 msgstr "Wobkrućić"
 
 #. TRANS: Field label on account registration page.
-#, fuzzy
 msgctxt "LABEL"
 msgid "Email"
 msgstr "E-mejl"
@@ -4734,7 +4444,6 @@ msgid "Longer name, preferably your \"real\" name."
 msgstr "Dlěše mjeno, wosebje twoje \"woprawdźite\" mjeno."
 
 #. TRANS: Button text to register a user on account registration page.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Register"
 msgstr "Registrować"
@@ -4750,7 +4459,7 @@ msgstr "Rozumju, zo wobsah a daty wot %1$s su priwatne a dowěrliwe."
 #. TRANS: %1$s is the license owner.
 #, php-format
 msgid "My text and files are copyright by %1$s."
-msgstr ""
+msgstr "%1$s ma awtorske prawo na mojim tekstom a mojimi datajemi."
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
 msgid "My text and files remain under my own copyright."
@@ -4795,71 +4504,6 @@ msgid ""
 "to confirm your email address.)"
 msgstr ""
 
-#. TRANS: Page notice for remote subscribe. This message contains Markdown links.
-#. TRANS: Ensure to keep the correct markup of [link description](link).
-#, 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 ""
-
-#. TRANS: Page title for Remote subscribe.
-msgid "Remote subscribe"
-msgstr "Zdaleny abonement"
-
-#. TRANS: Field legend on page for remote subscribe.
-msgid "Subscribe to a remote user"
-msgstr "Zdaleneho wužiwarja abonować"
-
-#. TRANS: Field label on page for remote subscribe.
-msgid "User nickname"
-msgstr "Wužiwarske přimjeno"
-
-#. TRANS: Field title on page for remote subscribe.
-msgid "Nickname of the user you want to follow."
-msgstr "Přimjeno wužiwarja, kotremuž chceš slědować."
-
-#. TRANS: Field label on page for remote subscribe.
-msgid "Profile URL"
-msgstr "URL profila"
-
-#. TRANS: Field title on page for remote subscribe.
-msgid "URL of your profile on another compatible microblogging service."
-msgstr ""
-"URL twojeho profila při druhej kompatibelnej mikroblogowanskej słužbje."
-
-#. TRANS: Button text on page for remote subscribe.
-#. TRANS: Link text for link that will subscribe to a remote profile.
-#. TRANS: Button text to subscribe to a user.
-#. TRANS: Button text for subscribing to a list.
-#, fuzzy
-msgctxt "BUTTON"
-msgid "Subscribe"
-msgstr "Abonować"
-
-#. TRANS: Form validation error on page for remote subscribe when an invalid profile URL was provided.
-msgid "Invalid profile URL (bad format)."
-msgstr "Njepłaćiwy profilowy URL (wopa�ny format)."
-
-#. TRANS: Form validation error on page for remote subscribe when no the provided profile URL
-#. TRANS: does not contain expected data.
-msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
-msgstr ""
-
-#. TRANS: Form validation error on page for remote subscribe.
-msgid "That is a local profile! Login to subscribe."
-msgstr "To je lokalny profil! Přizjew so, zo by abonował."
-
-#. TRANS: Form validation error on page for remote subscribe when the remote service is not providing a request token.
-msgid "Could not get a request token."
-msgstr "Přistupny token njeda so wobstarać."
-
-#. TRANS: Client error displayed when trying to (un)list an OMB 0.1 remote profile.
-#, fuzzy
-msgid "You cannot (un)list an OMB 0.1 remote profile with this action."
-msgstr "Njemóžeš zdaleny profil OMB 0.1 z tutej akciju abonować."
-
 #. TRANS: Client error displayed when an unknown error occurs while delisting a user.
 #. TRANS: %s is a username.
 #, php-format
@@ -4875,9 +4519,8 @@ msgid ""
 msgstr ""
 
 #. TRANS: Title after removing a user from a list.
-#, fuzzy
 msgid "Unlisted"
-msgstr "Licenca"
+msgstr "Njeje w lisćinje"
 
 #. TRANS: Client error displayed when trying to repeat a notice while not logged in.
 msgid "Only logged-in users can repeat notices."
@@ -4912,6 +4555,12 @@ msgstr "Wotmołwy na %s"
 msgid "Replies to %1$s, page %2$d"
 msgstr "Wotmołwy na %1$s, strona %2$d"
 
+#. TRANS: Link for feed with replies for a user.
+#. TRANS: %s is a user nickname.
+#, php-format
+msgid "Replies feed for %s (Activity Streams JSON)"
+msgstr "Kanal wotmołwow za %s (Activity Streams JSON)"
+
 #. TRANS: Link for feed with replies for a user.
 #. TRANS: %s is a user nickname.
 #, php-format
@@ -5022,7 +4671,7 @@ msgstr "Kanal so wobnowi. Prošu po�akaj něšto mjeńšin za wuslědki."
 
 #. TRANS: Form instructions for feed restore.
 msgid ""
-"You can upload a backed-up stream in <a href=\"http://activitystrea.ms/"
+"You can upload a backed-up timeline in <a href=\"http://activitystrea.ms/"
 "\">Activity Streams</a> format."
 msgstr ""
 
@@ -5035,7 +4684,6 @@ msgid "You cannot revoke user roles on this site."
 msgstr "Njemóžeš wužiwarske róle na tutym sydle wotwołać."
 
 #. TRANS: Client error displayed when trying to revoke a role that is not set.
-#, fuzzy
 msgid "User does not have this role."
 msgstr "Wužiwar nima tutu rólu."
 
@@ -5055,18 +4703,17 @@ msgstr "Wužiwar je hižo w pěskowym kašćiku."
 
 #. TRANS: Client error displayed when trying to list a profile with an invalid list.
 #. TRANS: %s is the invalid list name.
-#, fuzzy, php-format
+#, php-format
 msgid "Not a valid list: %s."
-msgstr "Njepłaćiwa wosobowa tafli�ka: %s."
+msgstr "Njepłaćiwa lisćina: %s."
 
 #. TRANS: Page title for page showing self tags.
 #. TRANS: %1$s is a tag, %2$d is a page number.
-#, fuzzy, php-format
+#, php-format
 msgid "Users self-tagged with %1$s, page %2$d"
-msgstr "Zdźělenki su z %1$s woznamjenjene, strona %2$d"
+msgstr "Wužiwarjo, kotřiž su so z %1$s woznamjenili, strona %2$d"
 
 #. TRANS: Title for the sessions administration panel.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Sessions"
 msgstr "Posedźenja"
@@ -5076,7 +4723,6 @@ msgid "Session settings for this StatusNet site"
 msgstr "Nastajenja posedźenja za tute sydło StatusNet."
 
 #. TRANS: Fieldset legend on the sessions administration panel.
-#, fuzzy
 msgctxt "LEGEND"
 msgid "Sessions"
 msgstr "Posedźenja"
@@ -5088,9 +4734,8 @@ msgstr "Z posedźenjemi wobchadźeć"
 
 #. TRANS: Checkbox title on the sessions administration panel.
 #. TRANS: Indicates if StatusNet should handle session administration.
-#, fuzzy
 msgid "Handle sessions ourselves."
-msgstr "Z posedźenjemi wobchadźeć"
+msgstr "Posedźenja sam zrjadować"
 
 #. TRANS: Checkbox label on the sessions administration panel.
 #. TRANS: Indicates if StatusNet should write session debugging output.
@@ -5102,9 +4747,8 @@ msgid "Enable debugging output for sessions."
 msgstr ""
 
 #. TRANS: Title for submit button on the sessions administration panel.
-#, fuzzy
 msgid "Save session settings"
-msgstr "Přistupne nastajenja składować"
+msgstr "Posedźenske nastajenja składować"
 
 #. TRANS: Client error displayed trying to display an OAuth application while not logged in.
 msgid "You must be logged in to view an application."
@@ -5130,7 +4774,6 @@ msgid "Application actions"
 msgstr "Aplikaciske akcije"
 
 #. TRANS: Link text to edit application on the OAuth application page.
-#, fuzzy
 msgctxt "EDITAPP"
 msgid "Edit"
 msgstr "Wobdźěłać"
@@ -5144,6 +4787,26 @@ msgstr ""
 msgid "Application info"
 msgstr "Aplikaciske informacije"
 
+#. TRANS: Field label on application page.
+msgid "Consumer key"
+msgstr "Klu� přetrjebowarja"
+
+#. TRANS: Field label on application page.
+msgid "Consumer secret"
+msgstr "Potajnstwo přetrjebowarja"
+
+#. TRANS: Field label on application page.
+msgid "Request token URL"
+msgstr "URL za naprašowanski token"
+
+#. TRANS: Field label on application page.
+msgid "Access token URL"
+msgstr ""
+
+#. TRANS: Field label on application page.
+msgid "Authorize URL"
+msgstr "URL awtorizować"
+
 #. TRANS: Note on the OAuth application page about signature support.
 msgid ""
 "Note: HMAC-SHA1 signatures are supported. The plaintext signature method is "
@@ -5164,6 +4827,11 @@ msgstr "Preferowane zdźělenki wot %1$s, strona %2$d"
 msgid "Could not retrieve favorite notices."
 msgstr "Preferowane zdźělenki njedadźa so wobstarać."
 
+#. TRANS: Feed link text. %s is a username.
+#, php-format
+msgid "Feed for favorites of %s (Activity Streams JSON)"
+msgstr "Kanal za fawority wužiwarja %s (Activity Streams JSON)"
+
 #. TRANS: Feed link text. %s is a username.
 #, php-format
 msgid "Feed for favorites of %s (RSS 1.0)"
@@ -5218,6 +4886,11 @@ msgstr "skupina %s"
 msgid "%1$s group, page %2$d"
 msgstr "%1$s skupina, strona %2$d"
 
+#. TRANS: Tooltip for feed link. %s is a group nickname.
+#, php-format
+msgid "Notice feed for %s group (Activity Streams JSON)"
+msgstr "Zdźělenski kanal za skupinu %s (Activity Streams JSON)"
+
 #. TRANS: Tooltip for feed link. %s is a group nickname.
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
@@ -5238,42 +4911,8 @@ msgstr "Zdźělenski kanal za skupinu %s (Atom)"
 msgid "FOAF for %s group"
 msgstr "FOAF za skupinu %s"
 
-#. TRANS: Header for mini list of group members on a group page (h2).
-msgid "Members"
-msgstr "Čłonojo"
-
-#. TRANS: Description for mini list of group members on a group page when the group has no members.
-#. TRANS: Content of "Listed" page if there are no listed users.
-#. TRANS: Content of "People following tag x" if there are no subscribed users.
-#. TRANS: Empty list message for tags.
-#. TRANS: Text for user subscription statistics if the user has no subscriptions.
-#. TRANS: Text for user subscriber statistics if user has no subscribers.
-#. TRANS: Text for user user group membership statistics if user is not a member of any group.
-#. TRANS: Default content for section/sidebar widget.
-msgid "(None)"
-msgstr "(Žadyn)"
-
-#. TRANS: Link to all group members from mini list of group members if group has more than n members.
-msgid "All members"
-msgstr "Wšitcy �łonojo"
-
-#. TRANS: Header for group statistics on a group page (h2).
-#. TRANS: H2 text for user statistics.
-msgid "Statistics"
-msgstr "Statistika"
-
-#. TRANS: Label for group creation date.
-msgctxt "LABEL"
-msgid "Created"
-msgstr "Wutworjeny"
-
-#. TRANS: Label for member count in statistics on group page.
-msgctxt "LABEL"
-msgid "Members"
-msgstr "Čłonojo"
-
 #. TRANS: Notice on group pages for anonymous users for StatusNet sites that accept new registrations.
-#. TRANS: **%s** is the group alias, %%%%site.name%%%% is the site name,
+#. TRANS: %s is the group name, %%%%site.name%%%% is the site name,
 #. TRANS: %%%%action.register%%%% is the URL for registration, %%%%doc.help%%%% is a URL to help.
 #. TRANS: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
 #, php-format
@@ -5286,22 +4925,16 @@ msgid ""
 msgstr ""
 
 #. TRANS: Notice on group pages for anonymous users for StatusNet sites that accept no new registrations.
-#. TRANS: **%s** is the group alias, %%%%site.name%%%% is the site name,
+#. TRANS: %s is the group name, %%%%site.name%%%% is the site name,
 #. TRANS: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
 "wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
 "[StatusNet](http://status.net/) tool. Its members share short messages about "
-"their life and interests. "
+"their life and interests."
 msgstr ""
 
-#. TRANS: Title for list of group administrators on a group page.
-#, fuzzy
-msgctxt "TITLE"
-msgid "Admins"
-msgstr "Administratorojo"
-
 #. TRANS: Client error displayed requesting a single message that does not exist.
 msgid "No such message."
 msgstr "Powěsć njeeksistuje."
@@ -5323,9 +4956,8 @@ msgid "Message from %1$s on %2$s"
 msgstr "Powěsć wot %1$s na %2$s"
 
 #. TRANS: Client exception thrown when trying a view a notice the user has no access to.
-#, fuzzy
 msgid "Not available."
-msgstr "IM k dispoziciji njesteji."
+msgstr "Nic k dispoziciji"
 
 #. TRANS: Client error displayed trying to show a deleted notice.
 msgid "Notice deleted."
@@ -5333,21 +4965,21 @@ msgstr "Zdźělenka zni�ena."
 
 #. TRANS: Title for private list timeline.
 #. TRANS: %1$s is a list, %2$s is a page number.
-#, fuzzy, php-format
+#, php-format
 msgid "Private timeline for %1$s list by you, page %2$d"
-msgstr "%1$s z %2$s markěrowany, strona %3$d"
+msgstr "Priwatna �asowa lajsta za lisćinu %1$s wot tebje, strona %2$d"
 
 #. TRANS: Title for public list timeline where the viewer is the tagger.
 #. TRANS: %1$s is a list, %2$s is a page number.
-#, fuzzy, php-format
+#, php-format
 msgid "Timeline for %1$s list by you, page %2$d"
-msgstr "%1$s z %2$s markěrowany, strona %3$d"
+msgstr "Časowa lajsta za lisćinu %1$s wot tebje, strona %2$d"
 
 #. TRANS: Title for private list timeline.
 #. TRANS: %1$s is a list, %2$s is the tagger's nickname, %3$d is a page number.
-#, fuzzy, php-format
+#, php-format
 msgid "Timeline for %1$s list by %2$s, page %3$d"
-msgstr "%1$s z %2$s markěrowany, strona %3$d"
+msgstr "Časowa lajsta za lisćinu %1$s wot %2$s, strona %3$d"
 
 #. TRANS: Title for private list timeline.
 #. TRANS: %s is a list.
@@ -5363,15 +4995,15 @@ msgstr ""
 
 #. TRANS: Title for private list timeline.
 #. TRANS: %1$s is a list, %2$s is the tagger's nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "Timeline for %1$s list by %2$s"
-msgstr "Wotmołwy na %1$s na %2$s."
+msgstr "Časowa lajsta za lisćinu %1$s wot %2$s"
 
 #. TRANS: Feed title.
 #. TRANS: %1$s is a list, %2$s is tagger's nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "Feed for %1$s list by %2$s (Atom)"
-msgstr "Kanal za fawority wužiwarja %s (Atom)"
+msgstr "Kanal za lisćinu %1$s wot %2$s (Atom)"
 
 #. TRANS: Empty list message for list timeline.
 #. TRANS: %1$s is a list, %2$s is a tagger's nickname.
@@ -5387,52 +5019,57 @@ msgstr ""
 
 #. TRANS: Additional empty list message for list timeline.
 #. TRANS: This message contains Markdown links in the form [description](link).
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and start following "
 "this timeline!"
 msgstr ""
-"%s nima abonentow. Čehodla nochceš [konto registrować] (%%%%action.register%%"
-"%%) a prěni być?"
+"Čehodla [njeregistruješ konto] (%%%%action.register%%%%) a zapo�nješ �asowej "
+"lajsće slědować?"
 
 #. TRANS: Header on show list page.
-#, fuzzy
+#. TRANS: Link description for link to list of users tagged with a tag (so part of a list).
 msgid "Listed"
-msgstr "Licenca"
+msgstr "Nalistowany"
+
+#. TRANS: Content of "Listed" page if there are no listed users.
+#. TRANS: Content of "People following tag x" if there are no subscribed users.
+#. TRANS: Description for mini list of group members on a group page when the group has no members.
+#. TRANS: Empty list message for tags.
+#. TRANS: Text for user subscription statistics if the user has no subscriptions.
+#. TRANS: Text for user subscriber statistics if user has no subscribers.
+#. TRANS: Text for user user group membership statistics if user is not a member of any group.
+#. TRANS: Default content for section/sidebar widget.
+msgid "(None)"
+msgstr "(Žadyn)"
 
 #. TRANS: Link for more "People in list x by a user"
 #. TRANS: if there are more than the mini list's maximum.
-#, fuzzy
 msgid "Show all"
-msgstr "Wjace pokazać"
+msgstr "Wšě pokazać"
 
 #. TRANS: Header for tag subscribers.
 #. TRANS: Link description for link to list of users subscribed to a tag.
 msgid "Subscribers"
 msgstr "Abonenća"
 
-#. TRANS: Link for more "People following tag x"
-#. TRANS: if there are more than the mini list's maximum.
-msgid "All subscribers"
-msgstr "Wšitcy abonenća"
-
-#. TRANS: Page title showing tagged notices in one user's stream.
+#. TRANS: Page title showing tagged notices in one user's timeline.
 #. TRANS: %1$s is the username, %2$s is the hash tag.
-#, fuzzy, php-format
+#, php-format
 msgid "Notices by %1$s tagged %2$s"
-msgstr "%1$s z %2$s woznamjenjeny"
+msgstr "Zdźělenki wot %1$s z %2$s woznamjenjene"
 
-#. TRANS: Page title showing tagged notices in one user's stream.
+#. TRANS: Page title showing tagged notices in one user's timeline.
 #. TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number.
-#, fuzzy, php-format
+#, php-format
 msgid "Notices by %1$s tagged %2$s, page %3$d"
-msgstr "%1$s z %2$s markěrowany, strona %3$d"
+msgstr "Zdźělenki wot %1$s z %2$s woznamjenjene, strona %3$d"
 
-#. TRANS: Extended page title showing tagged notices in one user's stream.
+#. TRANS: Extended page title showing tagged notices in one user's timeline.
 #. TRANS: %1$s is the username, %2$d is the page number.
-#, fuzzy, php-format
+#, php-format
 msgid "Notices by %1$s, page %2$d"
-msgstr "Zdźělenki su z %1$s woznamjenjene, strona %2$d"
+msgstr "Zdźělenki wot %1$s, strona %2$d"
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %1$s is a user nickname, %2$s is a hashtag.
@@ -5440,6 +5077,12 @@ msgstr "Zdźělenki su z %1$s woznamjenjene, strona %2$d"
 msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
 msgstr "Powěsćowy kanal za %1$s je %2$s (RSS 1.0) markěrował"
 
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#, php-format
+msgid "Notice feed for %s (Activity Streams JSON)"
+msgstr "Zdźělenski kanal za %s (Activity Streams JSON)"
+
 #. TRANS: Title for link to notice feed.
 #. TRANS: %s is a user nickname.
 #, php-format
@@ -5464,7 +5107,7 @@ msgstr "Zdźělenski kanal za %s (Atom)"
 msgid "FOAF for %s"
 msgstr "FOAF za %s"
 
-#. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
+#. TRANS: First sentence of empty list message for a timeline. $1%s is a user nickname.
 #, php-format
 msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
 msgstr ""
@@ -5475,7 +5118,7 @@ msgid ""
 "would be a good time to start :)"
 msgstr ""
 
-#. TRANS: Second sentence of empty  list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
+#. TRANS: Second sentence of empty  list message for a non-self timeline. %1$s is a user nickname, %2$s is a part of a URL.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
 #, php-format
 msgid ""
@@ -5483,7 +5126,7 @@ msgid ""
 "%?status_textarea=%2$s)."
 msgstr ""
 
-#. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
+#. TRANS: Announcement for anonymous users showing a timeline if site registrations are open.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
 #, php-format
 msgid ""
@@ -5493,13 +5136,13 @@ msgid ""
 "follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))"
 msgstr ""
 
-#. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
+#. TRANS: Announcement for anonymous users showing a timeline if site registrations are closed or invite only.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
 "wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
-"[StatusNet](http://status.net/) tool. "
+"[StatusNet](http://status.net/) tool."
 msgstr ""
 
 #. TRANS: Link to the author of a repeated notice. %s is a linked nickname.
@@ -5517,7 +5160,6 @@ msgid "User is already silenced."
 msgstr "Wužiwarjej je hižo huba zatykana."
 
 #. TRANS: Title for site administration panel.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Site"
 msgstr "Sydło"
@@ -5534,6 +5176,14 @@ msgstr "Sydłowe mjeno njesmě prózdne być."
 msgid "You must have a valid contact email address."
 msgstr "Dyrbiš płaćiwu kontaktowu e-mejlowu adresu měć."
 
+#. TRANS: Client error displayed when a logo URL is not valid.
+msgid "Invalid logo URL."
+msgstr "Njepłaćiwy logowy URL."
+
+#. TRANS: Client error displayed when a SSL logo URL is invalid.
+msgid "Invalid SSL logo URL."
+msgstr "Njepłaćiwy SSL-URL loga."
+
 #. TRANS: Client error displayed trying to save site settings with an invalid language code.
 #. TRANS: %s is the invalid language code.
 #, php-format
@@ -5549,25 +5199,22 @@ msgid "Dupe limit must be one or more seconds."
 msgstr ""
 
 #. TRANS: Fieldset legend on site settings panel.
-#, fuzzy
 msgctxt "LEGEND"
 msgid "General"
 msgstr "Powšitkowny"
 
 #. TRANS: Field label on site settings panel.
-#, fuzzy
 msgctxt "LABEL"
 msgid "Site name"
 msgstr "Sydłowe mjeno"
 
 #. TRANS: Field title on site settings panel.
-#, fuzzy
 msgid "The name of your site, like \"Yourcompany Microblog\"."
-msgstr "Mjeno twojeho sydła, kaž \"TwojePředewzaće Microblog\""
+msgstr "Mjeno twojeho sydła, kaž \"TwojePředewzaće - Mikroblog\"."
 
 #. TRANS: Field label on site settings panel.
 msgid "Brought by"
-msgstr ""
+msgstr "Dodaty wot"
 
 #. TRANS: Field title on site settings panel.
 msgid "Text used for credits link in footer of each page."
@@ -5575,7 +5222,7 @@ msgstr ""
 
 #. TRANS: Field label on site settings panel.
 msgid "Brought by URL"
-msgstr ""
+msgstr "Dodaty wot URL"
 
 #. TRANS: Field title on site settings panel.
 msgid "URL used for credits link in footer of each page."
@@ -5586,12 +5233,10 @@ msgid "Email"
 msgstr "E-mejl"
 
 #. TRANS: Field title on site settings panel.
-#, fuzzy
 msgid "Contact email address for your site."
-msgstr "Kontaktowa e-mejlowa adresa za twoje sydło"
+msgstr "Kontaktna e-mejlowa adresa za twoje sydło."
 
 #. TRANS: Fieldset legend on site settings panel.
-#, fuzzy
 msgctxt "LEGEND"
 msgid "Local"
 msgstr "Lokalny"
@@ -5609,13 +5254,13 @@ msgid "Default language"
 msgstr "Standardna rě�"
 
 #. TRANS: Dropdown title on site settings panel.
-msgid "Site language when autodetection from browser settings is not available"
+msgid ""
+"The site language when autodetection from browser settings is not available."
 msgstr ""
 "Rě� sydła, jeli awtomatiske spóznawanje po nastajenjach wobhladowaka k "
-"dispoziciji njesteji"
+"dispoziciji njesteji."
 
 #. TRANS: Fieldset legend on site settings panel.
-#, fuzzy
 msgctxt "LEGEND"
 msgid "Limits"
 msgstr "Limity"
@@ -5635,10 +5280,24 @@ msgstr "Limit duplikatow"
 #. TRANS: Field title on site settings panel.
 msgid "How long users must wait (in seconds) to post the same thing again."
 msgstr ""
+"Kak dołho wužiwar dyrbi �akać (w sekundach), zo by móhł samsnu powěsć hišće "
+"raz pósłać."
+
+#. TRANS: Fieldset legend for form to change logo.
+msgid "Logo"
+msgstr "Logo"
+
+#. TRANS: Field label for StatusNet site logo.
+msgid "Site logo"
+msgstr "Logo sydła"
+
+#. TRANS: Field label for SSL StatusNet site logo.
+msgid "SSL logo"
+msgstr "SSL-logo"
 
 #. TRANS: Button title for saving site settings.
-msgid "Save site settings"
-msgstr "Sydłowe nastajenja składować"
+msgid "Save the site settings."
+msgstr "Sydłowe nastajenja składować."
 
 #. TRANS: Page title for site-wide notice tab in admin panel.
 msgid "Site Notice"
@@ -5664,7 +5323,7 @@ msgstr "Tekst sydłoweje zdźělenki"
 msgid "Site-wide notice text (255 characters maximum; HTML allowed)"
 msgstr ""
 
-#. TRANS: Title for button to save site notice in admin panel.
+#. TRANS: Button title to save site notice in admin panel.
 msgid "Save site notice."
 msgstr "Sydłowu zdźělenku składować."
 
@@ -5676,7 +5335,7 @@ msgstr "SMS-nastajenja"
 #. TRANS: %%site.name%% is the name of the site.
 #, php-format
 msgid "You can receive SMS messages through email from %%site.name%%."
-msgstr ""
+msgstr "Móžeš SMS-powěsće přez e-mejl wot %%site.name%% přijeć."
 
 #. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
 msgid "SMS is not available."
@@ -5756,9 +5415,8 @@ msgid "That is the wrong confirmation number."
 msgstr "To je wopa�ne wobkrućenske �isło."
 
 #. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
-#, fuzzy
 msgid "Could not delete SMS confirmation."
-msgstr "IM-wobkrućenje njeda so zhašeć."
+msgstr "SMS-wobkrućenje njeda so zhašeć."
 
 #. TRANS: Message given after successfully canceling SMS phone number confirmation.
 msgid "SMS confirmation cancelled."
@@ -5794,7 +5452,6 @@ msgid "No code entered."
 msgstr "Žadyn kod zapodaty."
 
 #. TRANS: Title for admin panel to configure snapshots.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Snapshots"
 msgstr "Njejapke fota"
@@ -5816,7 +5473,6 @@ msgid "Invalid snapshot report URL."
 msgstr "Njepłaćiwy URL rozprawy njejapkeho fota."
 
 #. TRANS: Fieldset legend on admin panel for snapshots.
-#, fuzzy
 msgctxt "LEGEND"
 msgid "Snapshots"
 msgstr "Njejapke fota"
@@ -5842,23 +5498,20 @@ msgid "Frequency"
 msgstr "Frekwenca"
 
 #. TRANS: Input field title for snapshot frequency in admin panel for snapshots.
-#, fuzzy
 msgid "Snapshots will be sent once every N web hits."
-msgstr "Njejapke fotki budu so do tutoho URL słać."
+msgstr "Njejapke fotki budu so jónu při kóždym N-ym wopyće webstrony słać."
 
 #. TRANS: Input field label for snapshot report URL in admin panel for snapshots.
 msgid "Report URL"
 msgstr "URL rozprawy"
 
 #. TRANS: Input field title for snapshot report URL in admin panel for snapshots.
-#, fuzzy
 msgid "Snapshots will be sent to this URL."
 msgstr "Njejapke fotki budu so do tutoho URL słać."
 
-#. TRANS: Title for button to save snapshot settings.
-#, fuzzy
+#. TRANS: Button title to save snapshot settings.
 msgid "Save snapshot settings."
-msgstr "Nastajenja wobrazowkoweho fota składować"
+msgstr "Nastajenja njejapkich fotow składować."
 
 #. TRANS: Client error displayed trying a change a subscription for a non-subscribed profile.
 msgid "You are not subscribed to that profile."
@@ -5875,50 +5528,43 @@ msgstr ""
 
 #. TRANS: Title of the first page showing pending subscribers still awaiting approval.
 #. TRANS: %s is the name of the user.
-#, fuzzy, php-format
+#, php-format
 msgid "%s subscribers awaiting approval"
-msgstr "%s skupisnkich �łonstwow"
+msgstr "%s skupinskich �łonstwow, kotřiž na schwalenje �akaja"
 
 #. TRANS: Title of all but the first page showing pending subscribersmembers still awaiting approval.
 #. TRANS: %1$s is the name of the user, %2$d is the page number of the members list.
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s subscribers awaiting approval, page %2$d"
-msgstr "%1$s skupinskich �łonow, strona %2$d"
+msgstr "Abonenća wužiwarja %1$s, kotřiž na schwalenje �akaja, strona %2$d"
 
 #. TRANS: Page notice for group members page.
-#, fuzzy
 msgid "A list of users awaiting approval to subscribe to you."
-msgstr "Lisćina wužiwarjow w tutej skupinje."
-
-#. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
-msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
-msgstr "Njemóžeš zdaleny profil OMB 0.1 z tutej akciju abonować."
+msgstr "Lisćina wužiwarjow, kotřiž na schwalenje �akaja, će abonować."
 
 #. TRANS: Page title when subscription succeeded.
 msgid "Subscribed"
 msgstr "Abonowany"
 
 #. TRANS: Client error displayed when trying to perform an action while not logged in.
-#, fuzzy
 msgid "You must be logged in to unsubscribe from a list."
-msgstr "Dyrbiš přizjewjeny być, zo by skupinu wutworił."
+msgstr "Dyrbiš přizjewjeny być, zo by so z lisćiny wotskazał."
 
 #. TRANS: Client error displayed when trying to perform an action without providing an ID.
-#, fuzzy
 msgid "No ID given."
-msgstr "Žadyn argument ID."
+msgstr "Žadyn ID podaty."
 
 #. TRANS: Server error displayed subscribing to a list fails.
 #. TRANS: %1$s is a user nickname, %2$s is a list, %3$s is the error message (no period).
-#, fuzzy, php-format
+#, php-format
 msgid "Could not subscribe user %1$s to list %2$s: %3$s"
-msgstr "Njebě móžno wužiwarja %1$s skupinje %2%s přidać."
+msgstr "Wužiwar %1$s njeda so lisćinje %2$s přidać: %3$s"
 
 #. TRANS: Title of form to subscribe to a list.
 #. TRANS: %1%s is a user nickname, %2$s is a list, %3$s is a tagger nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s subscribed to list %2$s by %3$s"
-msgstr "%1$s abonentow, strona %2$d"
+msgstr "%1$s je lisćinu %2$s jako %3$s abonował"
 
 #. TRANS: Header for list of subscribers for a user (first page).
 #. TRANS: %s is the user's nickname.
@@ -5935,13 +5581,13 @@ msgstr "%1$s abonentow, strona %2$d"
 #. TRANS: Page notice for page with an overview of all subscribers
 #. TRANS: of the logged in user's own profile.
 msgid "These are the people who listen to your notices."
-msgstr ""
+msgstr "To su ludźo, kotřiž twoje zdźělenki �itaja."
 
 #. TRANS: Page notice for page with an overview of all subscribers of a user other
 #. TRANS: than the logged in user. %s is the user nickname.
 #, php-format
 msgid "These are the people who listen to %s's notices."
-msgstr ""
+msgstr "To su ludźo, kotřiž zdźělenki wužiwarja %s �itaja."
 
 #. TRANS: Subscriber list text when the logged in user has no subscribers.
 msgid ""
@@ -5977,13 +5623,13 @@ msgstr "%1$s abonementow, strona %2$d"
 #. TRANS: Page notice for page with an overview of all subscriptions
 #. TRANS: of the logged in user's own profile.
 msgid "These are the people whose notices you listen to."
-msgstr ""
+msgstr "To su ludźo, kotrychž zdźělenki �itaš."
 
 #. TRANS: Page notice for page with an overview of all subscriptions of a user other
 #. TRANS: than the logged in user. %s is the user nickname.
 #, php-format
 msgid "These are the people whose notices %s listens to."
-msgstr ""
+msgstr "To su ludźo, kotrychž zdźělenki %s �ita."
 
 #. TRANS: Subscription list text when the logged in user has no subscriptions.
 #. TRANS: This message contains Markdown URLs. The link description is between
@@ -5994,8 +5640,7 @@ msgid ""
 "You're not listening to anyone's notices right now, try subscribing to "
 "people you know. Try [people search](%%action.peoplesearch%%), look for "
 "members in groups you're interested in and in our [featured users](%%action."
-"featured%%). If you're a [Twitter user](%%action.twittersettings%%), you can "
-"automatically subscribe to people you already follow there."
+"featured%%)."
 msgstr ""
 
 #. TRANS: Subscription list text when looking at the subscriptions for a of a user other
@@ -6012,7 +5657,6 @@ msgid "Subscription feed for %s (Atom)"
 msgstr "Abonowanski kanal za %s (Atom)"
 
 #. TRANS: Checkbox label for enabling IM messages for a profile in a subscriptions list.
-#, fuzzy
 msgctxt "LABEL"
 msgid "IM"
 msgstr "IM"
@@ -6027,6 +5671,12 @@ msgstr "SMS"
 msgid "Notices tagged with %1$s, page %2$d"
 msgstr "Zdźělenki su z %1$s woznamjenjene, strona %2$d"
 
+#. TRANS: Link label for feed on "notices with tag" page.
+#. TRANS: %s is the tag the feed is for.
+#, php-format
+msgid "Notice feed for tag %s (Activity Streams JSON)"
+msgstr "Zdźělenski kanal za tafli�ku %s (Activity Streams JSON)"
+
 #. TRANS: Link label for feed on "notices with tag" page.
 #. TRANS: %s is the tag the feed is for.
 #, php-format
@@ -6048,42 +5698,37 @@ msgstr "Zdźělenski kanal za tafli�ku %s (Atom)"
 #. TRANS: Client error displayed when trying to tag a user that cannot be tagged.
 #. TRANS: Client exception thrown trying to set a tag for a user that cannot be tagged.
 #. TRANS: Error displayed when trying to tag a user that cannot be tagged.
-#, fuzzy
 msgid "You cannot tag this user."
-msgstr "Njemóžeš tutomu wužiwarju powěsć pósłać."
+msgstr "Njemóžeš tutoho wužiwarja woznamjenić."
 
 #. TRANS: Title for list form when not on a profile page.
-#, fuzzy
 msgid "List a profile"
-msgstr "Wužiwarski profil"
+msgstr "Profil podać"
 
 #. TRANS: Title for list form when on a profile page.
 #. TRANS: %s is a profile nickname.
-#, fuzzy, php-format
+#, php-format
 msgctxt "ADDTOLIST"
 msgid "List %s"
-msgstr "Limity"
+msgstr "%s podać"
 
 #. TRANS: Title for list form when an error has occurred.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Error"
-msgstr "Zmylk Ajax"
+msgstr "Zmylk"
 
 #. TRANS: Header in list form.
 msgid "User profile"
 msgstr "Wužiwarski profil"
 
 #. TRANS: Fieldset legend for list form.
-#, fuzzy
 msgid "List user"
-msgstr "Limity"
+msgstr "Wužiwarja podać"
 
 #. TRANS: Field label on list form.
-#, fuzzy
 msgctxt "LABEL"
 msgid "Lists"
-msgstr "Limity"
+msgstr "Lisćiny"
 
 #. TRANS: Field title on list form.
 msgid ""
@@ -6097,15 +5742,14 @@ msgid "Tags"
 msgstr ""
 
 #. TRANS: Success message if lists are saved.
-#, fuzzy
 msgid "Lists saved."
-msgstr "Hesło składowane."
+msgstr "Lisćiny składowane."
 
 #. TRANS: Page notice.
-#, fuzzy
 msgid "Use this form to add your subscribers or subscriptions to lists."
 msgstr ""
-"wužij tutón formular, zo by swojim abonentam abo abonementam tafli�ki přidał."
+"Wužij tutón formular, zo by swojich abonentow abo swoje abonementy lisćinam "
+"přidał."
 
 #. TRANS: Client error when requesting a tag feed for a non-existing tag.
 msgid "No such tag."
@@ -6129,24 +5773,13 @@ msgstr "Wotskazany"
 
 #. TRANS: Page title for form that allows unsubscribing from a list.
 #. TRANS: %1$s is a nickname, %2$s is a list, %3$s is a tagger nickname.
-#, fuzzy, php-format
-msgid "%1$s unsubscribed from list %2$s by %3$s"
-msgstr "%1$s abonentow, strona %2$d"
-
-#. TRANS: Client error displayed when trying to update profile with an incompatible license.
-#. TRANS: %1$s is the license incompatible with site license %2$s.
-#. TRANS: Exception thrown when licenses are not compatible for an authorisation request.
-#. TRANS: %1$s is the license for the listenee, %2$s is the license for "this" StatusNet site.
 #, php-format
-msgid ""
-"Listenee stream license \"%1$s\" is not compatible with site license \"%2$s"
-"\"."
-msgstr ""
+msgid "%1$s unsubscribed from list %2$s by %3$s"
+msgstr "%1$s je so jako %3$s z lisćiny %2$s wotskazał"
 
 #. TRANS: Title of URL settings tab in profile settings.
-#, fuzzy
 msgid "URL settings"
-msgstr "IM-nastajenja"
+msgstr "URL-nastajenja"
 
 #. TRANS: Instructions for tab "Other" in user profile settings.
 msgid "Manage various other options."
@@ -6159,13 +5792,12 @@ msgid " (free service)"
 msgstr " (swobodna słužba)"
 
 #. TRANS: Default value for URL shortening settings.
-#, fuzzy
 msgid "[none]"
-msgstr "Žadyn"
+msgstr "[žadyn]"
 
 #. TRANS: Default value for URL shortening settings.
 msgid "[internal]"
-msgstr ""
+msgstr "[internal]"
 
 #. TRANS: Label for dropdown with URL shortener services.
 msgid "Shorten URLs with"
@@ -6177,7 +5809,7 @@ msgstr ""
 
 #. TRANS: Field label in URL settings in profile.
 msgid "URL longer than"
-msgstr ""
+msgstr "URL dlěši ha�"
 
 #. TRANS: Field title in URL settings in profile.
 msgid "URLs longer than this will be shortened, 0 means always shorten."
@@ -6185,7 +5817,7 @@ msgstr ""
 
 #. TRANS: Field label in URL settings in profile.
 msgid "Text longer than"
-msgstr ""
+msgstr "Tekst dlěši ha�"
 
 #. TRANS: Field title in URL settings in profile.
 msgid ""
@@ -6197,14 +5829,12 @@ msgid "URL shortening service is too long (maximum 50 characters)."
 msgstr "Krótšenska słužba za URL je předołha (maks. 50 znamješkow)."
 
 #. TRANS: Client exception thrown when the maximum URL settings value is invalid in profile URL settings.
-#, fuzzy
 msgid "Invalid number for maximum URL length."
-msgstr "Njepłaćiwy wobsah zdźělenki."
+msgstr "Njepłaćiwa li�ba za maksimalnu URL-dołhosć."
 
 #. TRANS: Client exception thrown when the maximum notice length settings value is invalid in profile URL settings.
-#, fuzzy
 msgid "Invalid number for maximum notice length."
-msgstr "Njepłaćiwy wobsah zdźělenki."
+msgstr "Njepłaćiwa li�ba za maksimalnu dołhosć zdźělenki."
 
 #. TRANS: Server exception thrown in profile URL settings when preferences could not be saved.
 msgid "Error saving user URL shortening preferences."
@@ -6234,7 +5864,6 @@ msgid "Invalid default subscripton: \"%1$s\" is not a user."
 msgstr "Njepłaćiwy standardny abonement: \"%1$s\" wužiwar njeje."
 
 #. TRANS: Fieldset legend in user administration panel.
-#, fuzzy
 msgctxt "LEGEND"
 msgid "Profile"
 msgstr "Profil"
@@ -6277,148 +5906,12 @@ msgstr "Přeprošenja zmóžnjene"
 
 #. TRANS: Tooltip for checkbox in user admin panel for allowing users to invite friend using site e-mail.
 msgid "Whether to allow users to invite new users."
-msgstr ""
+msgstr "Ha� je dowolene, nowych wužiwarjow přeprosyć."
 
-#. TRANS: Title for button to save user settings in user admin panel.
+#. TRANS: Button title to save user settings in user admin panel.
 msgid "Save user settings."
 msgstr "Wužiwarske nastajenja składować."
 
-#. TRANS: Page title.
-msgid "Authorize subscription"
-msgstr "Abonement awtorizować"
-
-#. TRANS: Page notice on "Authorize subscription" page.
-msgid ""
-"Please check these details to make sure that you want to subscribe to this "
-"user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
-"click \"Reject\"."
-msgstr ""
-
-#. TRANS: Button text on Authorise Subscription page.
-#. TRANS: Submit button text to accept a group membership request on approve group form.
-#. TRANS: Submit button text to accept a subscription request on approve sub form.
-msgctxt "BUTTON"
-msgid "Accept"
-msgstr "Akceptować"
-
-#. TRANS: Title for button on Authorise Subscription page.
-#. TRANS: Button title to subscribe to a user.
-msgid "Subscribe to this user."
-msgstr "Tutoho wužiwarja abonować."
-
-#. TRANS: Button text on Authorise Subscription page.
-#. TRANS: Submit button text to reject a group membership request on approve group form.
-#. TRANS: Submit button text to reject a subscription request on approve sub form.
-msgctxt "BUTTON"
-msgid "Reject"
-msgstr "Wotpokazać"
-
-#. TRANS: Title for button on Authorise Subscription page.
-msgid "Reject this subscription."
-msgstr "Tutón abonement wotpokazać."
-
-#. TRANS: Client error displayed for an empty authorisation request.
-msgid "No authorization request!"
-msgstr "Žane awtorizaciske naprašowanje!"
-
-#. TRANS: Accept message header from Authorise subscription page.
-msgid "Subscription authorized"
-msgstr "Abonement awtorizowany"
-
-#. TRANS: Accept message text from Authorise subscription page.
-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 ""
-
-#. TRANS: Reject message header from Authorise subscription page.
-msgid "Subscription rejected"
-msgstr "Abonement wotpokazany"
-
-#. TRANS: Reject message from Authorise subscription page.
-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 ""
-
-#. TRANS: Exception thrown when no valid user is found for an authorisation request.
-#. TRANS: %s is a listener URI.
-#, php-format
-msgid "Listener URI \"%s\" not found here."
-msgstr "URI posłucharja \"%s\" njebu tu namakany."
-
-#. TRANS: Exception thrown when listenee URI is too long for an authorisation request.
-#. TRANS: %s is a listenee URI.
-#, php-format
-msgid "Listenee URI \"%s\" is too long."
-msgstr "URI posłucharki \"%s\" je předołhi."
-
-#. TRANS: Exception thrown when listenee URI is a local user for an authorisation request.
-#. TRANS: %s is a listenee URI.
-#, php-format
-msgid "Listenee URI \"%s\" is a local user."
-msgstr "URI posłucharki \"%s\" je lokalny wužiwar.."
-
-#. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
-#. TRANS: %s is a profile URL.
-#, php-format
-msgid "Profile URL \"%s\" is for a local user."
-msgstr "Profilowy URL \"%s\" je za lokalneho wužiwarja."
-
-#. TRANS: Exception thrown when avatar URL is invalid for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#, php-format
-msgid "Avatar URL \"%s\" is not valid."
-msgstr "URL awatara \"%s\" njeje płaćiwy."
-
-#. TRANS: Exception thrown when avatar URL could not be read for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#, php-format
-msgid "Cannot read avatar URL \"%s\"."
-msgstr "Awatarowy URL \"%s\" njeda so �itać."
-
-#. TRANS: Exception thrown when avatar URL return an invalid image type for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#, php-format
-msgid "Wrong image type for avatar URL \"%s\"."
-msgstr "Wopa�ny wobrazowy typ za awatarowy URL \"%s\"."
-
-#. TRANS: Title for profile design page.
-#. TRANS: Page title for profile design page.
-msgid "Profile design"
-msgstr "Profilowy design"
-
-#. TRANS: Instructions for Profile design page.
-#. TRANS: Instructions for profile design page.
-msgid ""
-"Customize the way your profile looks with a background image and a colour "
-"palette of your choice."
-msgstr ""
-
-#. TRANS: Succes message on Profile design page when finding an easter egg.
-msgid "Enjoy your hotdog!"
-msgstr "Wjele wjesela!"
-
-#. TRANS: Form legend on Profile design page.
-#, fuzzy
-msgid "Design settings"
-msgstr "Sydłowe nastajenja składować"
-
-#. TRANS: Checkbox label on Profile design page.
-msgid "View profile designs"
-msgstr "Profilowe designy sej wobhladać"
-
-#. TRANS: Title for checkbox on Profile design page.
-msgid "Show or hide profile designs."
-msgstr "Profilowe designy pokazać abo schować."
-
-#. TRANS: Form legend on Profile design page for form to choose a background image.
-#, fuzzy
-msgid "Background file"
-msgstr "Pozadk"
-
 #. TRANS: Page title for all but the first page of groups for a user.
 #. TRANS: %1$s is a nickname, %2$d is a page number.
 #, php-format
@@ -6459,7 +5952,7 @@ msgstr "StatusNet %s"
 #. TRANS: %1$s is the engine name (StatusNet) and %2$s is the StatusNet version.
 #, php-format
 msgid ""
-"This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, "
+"This site is powered by %1$s version %2$s, Copyright 2008-2011 StatusNet, "
 "Inc. and contributors."
 msgstr ""
 
@@ -6476,7 +5969,7 @@ msgid ""
 "StatusNet is free software: you can redistribute it and/or modify it under "
 "the terms of the GNU Affero General Public License as published by the Free "
 "Software Foundation, either version 3 of the License, or (at your option) "
-"any later version. "
+"any later version."
 msgstr ""
 
 #. TRANS: Content part of StatusNet version page.
@@ -6484,7 +5977,7 @@ msgid ""
 "This program is distributed in the hope that it will be useful, but WITHOUT "
 "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
 "FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License "
-"for more details. "
+"for more details."
 msgstr ""
 
 #. TRANS: Content part of StatusNet version page.
@@ -6500,25 +5993,21 @@ msgid "Plugins"
 msgstr "Tyka�e"
 
 #. TRANS: Column header for plugins table on version page.
-#, fuzzy
 msgctxt "HEADER"
 msgid "Name"
 msgstr "Mjeno"
 
 #. TRANS: Column header for plugins table on version page.
-#, fuzzy
 msgctxt "HEADER"
 msgid "Version"
 msgstr "Wersija"
 
 #. TRANS: Column header for plugins table on version page.
-#, fuzzy
 msgctxt "HEADER"
 msgid "Author(s)"
 msgstr "Awtorojo"
 
 #. TRANS: Column header for plugins table on version page.
-#, fuzzy
 msgctxt "HEADER"
 msgid "Description"
 msgstr "Wopisanje"
@@ -6542,16 +6031,28 @@ msgstr "URL '%s' njeda so předźěłać"
 msgid "Robin thinks something is impossible."
 msgstr "Robin měni, zo něšto je njemóžno."
 
+#. TRANS: Message used to be inserted as %2$s in  the text "No file may
+#. TRANS: be larger than %1$d byte and the file you sent was %2$s.".
+#. TRANS: %1$d is the number of bytes of an uploaded file.
+#, php-format
+msgid "%1$d byte"
+msgid_plural "%1$d bytes"
+msgstr[0] "%1$d bajt"
+msgstr[1] "%1$d bajtaj"
+msgstr[2] "%1d bajty"
+msgstr[3] "%1$d bajtow"
+
 #. TRANS: Message given if an upload is larger than the configured maximum.
-#. TRANS: %1$d is the byte limit for uploads, %2$d is the byte count for the uploaded file.
-#. TRANS: %1$s is used for plural.
+#. TRANS: %1$d (used for plural) is the byte limit for uploads,
+#. TRANS: %2$s is the proper form of "n bytes". This is the only ways to have
+#. TRANS: gettext support multiple plurals in the same message, unfortunately...
 #, php-format
 msgid ""
-"No file may be larger than %1$d byte and the file you sent was %2$d bytes. "
-"Try to upload a smaller version."
+"No file may be larger than %1$d byte and the file you sent was %2$s. Try to "
+"upload a smaller version."
 msgid_plural ""
-"No file may be larger than %1$d bytes and the file you sent was %2$d bytes. "
-"Try to upload a smaller version."
+"No file may be larger than %1$d bytes and the file you sent was %2$s. Try to "
+"upload a smaller version."
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
@@ -6625,6 +6126,11 @@ msgstr "Lokalna skupina njeda so aktualizować."
 msgid "Could not create login token for %s"
 msgstr "Njeje móžno było, přizjewjenske znamješko za %s wutworić"
 
+#. TRANS: Exception thrown when a program code class (%s) cannot be instantiated.
+#, php-format
+msgid "Cannot instantiate class %s."
+msgstr "Njeda so instanca za klasu %s tworić."
+
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.
 msgid "No database name or DSN found anywhere."
 msgstr "Žane mjeno datoweje banki namakane abo žadyn DSN namakany."
@@ -6648,9 +6154,9 @@ msgid "No such profile (%1$d) for notice (%2$d)."
 msgstr "Žadyn profil (%1$d) za zdźělenku (%2$d)."
 
 #. TRANS: Server exception. %s are the error details.
-#, fuzzy, php-format
+#, php-format
 msgid "Database error inserting hashtag: %s."
-msgstr "Zmylk datoweje banki při zasunjenju hašeje tafli�ki: %s"
+msgstr "Zmylk datoweje banki při zasunjenju hašeje tafli�ki: %s."
 
 #. TRANS: Client exception thrown if a notice contains too many characters.
 msgid "Problem saving notice. Too long."
@@ -6676,23 +6182,20 @@ msgid "You are banned from posting notices on this site."
 msgstr "Słanje zdźělenkow na tutym sydle je ći zakazane."
 
 #. TRANS: Client exception thrown in notice when trying to repeat a missing or deleted notice.
-#, fuzzy
 msgid "Cannot repeat; original notice is missing or deleted."
-msgstr "Njemóžno twoju zdźělenku wospjetować."
+msgstr "Njeda so wospjetować: prěnjotna zdźělenka faluje abo je zhašana."
 
 #. TRANS: Client error displayed when trying to repeat an own notice.
 msgid "You cannot repeat your own notice."
 msgstr "Njemóžeš swójsku zdźělenku wospjetować."
 
 #. TRANS: Client error displayed when trying to repeat a non-public notice.
-#, fuzzy
 msgid "Cannot repeat a private notice."
-msgstr "Njemóžno twoju zdźělenku wospjetować."
+msgstr "Priwatna zdźělenka njeda so wospjetować."
 
 #. TRANS: Client error displayed when trying to repeat a notice you cannot access.
-#, fuzzy
 msgid "Cannot repeat a notice you cannot read."
-msgstr "Njemóžno twoju zdźělenku wospjetować."
+msgstr "Zdźělenka, kotruž njemóžeš �itać, njeda so wospjetować."
 
 #. TRANS: Client error displayed when trying to repeat an already repeated notice.
 msgid "You already repeated that notice."
@@ -6700,9 +6203,9 @@ msgstr "Sy tutu zdźělenku hižo wospjetował."
 
 #. TRANS: Client error displayed when trying to reply to a notice a the target has no access to.
 #. TRANS: %1$s is a user nickname, %2$d is a notice ID (number).
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s has no access to notice %2$d."
-msgstr "Wužiwar nima poslednju powěsć."
+msgstr "%1$s nima přistup na zdźělenku %2$d."
 
 #. TRANS: Server exception thrown when a notice cannot be saved.
 #. TRANS: Server exception thrown when a notice cannot be updated.
@@ -6747,29 +6250,24 @@ msgid "The tag you are trying to rename to already exists."
 msgstr ""
 
 #. TRANS: Server exception saving new tag without having a tagger specified.
-#, fuzzy
 msgid "No tagger specified."
-msgstr "Žana skupina podata."
+msgstr "Žadyn markěrowar podaty."
 
 #. TRANS: Server exception saving new tag without having a tag specified.
-#, fuzzy
 msgid "No tag specified."
-msgstr "Žana skupina podata."
+msgstr "Žana tafli�ka podata."
 
 #. TRANS: Server exception saving new tag.
-#, fuzzy
 msgid "Could not create profile tag."
-msgstr "Profil njeje so składować dał."
+msgstr "Profilowa tafli�ka njeda so wutworić."
 
 #. TRANS: Server exception saving new tag.
-#, fuzzy
 msgid "Could not set profile tag URI."
-msgstr "Profil njeje so składować dał."
+msgstr "URI profiloweje tafli�ki njeda so nastajić."
 
 #. TRANS: Server exception saving new tag.
-#, fuzzy
 msgid "Could not set profile tag mainpage."
-msgstr "Profil njeje so składować dał."
+msgstr "Hłowna strona profiloweje tafli�ki njeda so nastajić."
 
 #. TRANS: Client exception thrown trying to set more tags than allowed.
 #, php-format
@@ -6782,18 +6280,16 @@ msgstr ""
 #, php-format
 msgid ""
 "You already have %1$d or more people in list %2$s, which is the maximum "
-"allowed number.Try unlisting others first."
+"allowed number. Try unlisting others first."
 msgstr ""
 
 #. TRANS: Exception thrown when inserting a list subscription in the database fails.
-#, fuzzy
 msgid "Adding list subscription failed."
-msgstr "Abonoment njeda so zhašeć ."
+msgstr "Abonement lisćiny njeda so přidać."
 
 #. TRANS: Exception thrown when deleting a list subscription from the database fails.
-#, fuzzy
 msgid "Removing list subscription failed."
-msgstr "Abonoment njeda so zhašeć ."
+msgstr "Abonement lisćiny njeda so wotstronić."
 
 #. TRANS: Exception thrown when a right for a non-existing user profile is checked.
 msgid "Missing profile."
@@ -6804,7 +6300,6 @@ msgid "Unable to save tag."
 msgstr "Njeje móžno, tafli�ku składować."
 
 #. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
-#. TRANS: Error message displayed to a banned user when they try to subscribe.
 msgid "You have been banned from subscribing."
 msgstr "Abonowanje je ći zakazane."
 
@@ -6824,16 +6319,11 @@ msgstr "Njeje abonowany!"
 msgid "Could not delete self-subscription."
 msgstr "Sebjeabonement njeda so zhašeć."
 
-#. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
-msgid "Could not delete subscription OMB token."
-msgstr "Znamjo OMB-abonementa njeda so zhašeć."
-
 #. TRANS: Exception thrown when a subscription could not be deleted on the server.
 msgid "Could not delete subscription."
 msgstr "Abonoment njeda so zhašeć ."
 
 #. TRANS: Activity title when subscribing to another person.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Follow"
 msgstr "Slědować"
@@ -6862,6 +6352,19 @@ msgstr "Žadyn jednotliwy wužiwar za modus jednotliweho wužiwarja definowany."
 msgid "Single-user mode code called when not enabled."
 msgstr ""
 
+#. TRANS: Information on password recovery form if no known username or e-mail address was specified.
+msgid "No user with that email address or username."
+msgstr ""
+"Wužiwar z tej e-mejlowej adresu abo tym wužiwarskim mjenom njeeksistuje."
+
+#. TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.
+msgid "No registered email address for that user."
+msgstr "Wužiwar nima žanu zregistrowanu e-mejlowu adresu."
+
+#. TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.
+msgid "Error saving address confirmation."
+msgstr "Zmylk při składowanju adresoweho wobkrućenja."
+
 #. TRANS: Server exception thrown when creating a group failed.
 msgid "Could not create group."
 msgstr "Skupina njeda so wutowrić."
@@ -6906,23 +6409,19 @@ msgid "User deletion in progress..."
 msgstr "Wužiwar so haša..."
 
 #. TRANS: Link title for link on user profile.
-#, fuzzy
 msgid "Edit profile settings."
-msgstr "Profilowe nastajenja wobdźěłać"
+msgstr "Profilowe nastajenja wobdźěłać."
 
 #. TRANS: Link text for link on user profile.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Edit"
 msgstr "Wobdźěłać"
 
 #. TRANS: Link title for link on user profile.
-#, fuzzy
 msgid "Send a direct message to this user."
-msgstr "Tutomu wužiwarja direktnu powěsć pósłać"
+msgstr "Tutomu wužiwarja direktnu powěsć pósłać."
 
 #. TRANS: Link text for link on user profile.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Message"
 msgstr "Powěsć"
@@ -6960,7 +6459,6 @@ msgid "Show more"
 msgstr "Wjace pokazać"
 
 #. TRANS: Inline reply form submit button: submits a reply comment.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Reply"
 msgstr "Wotmołwić"
@@ -6968,13 +6466,12 @@ msgstr "Wotmołwić"
 #. TRANS: Placeholder text for inline reply form. Clicking in this box will turn it into a mini notice form.
 #. TRANS: Field label for reply mini form.
 msgid "Write a reply..."
-msgstr ""
+msgstr "Wotmołwu pisać..."
 
 #. TRANS: Tab on the notice form.
-#, fuzzy
 msgctxt "TAB"
 msgid "Status"
-msgstr "StatusNet"
+msgstr "Status"
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
 #. TRANS: Text between [] is a link description, text between () is the link itself.
@@ -7084,9 +6581,9 @@ msgid "No content for notice %s."
 msgstr "!Žadyn wobsah za powěsć %s."
 
 #. TRANS: Exception thrown if a non-existing user is provided. %s is a user ID.
-#, fuzzy, php-format
+#, php-format
 msgid "No such user \"%s\"."
-msgstr "Wužiwar %s njeeksistuje."
+msgstr "Wužiwar \"%s\" njeeksistuje."
 
 #. TRANS: Client exception thrown when post to collection fails with a 400 status.
 #. TRANS: %1$s is a URL, %2$s is the status, %s$s is the fail reason.
@@ -7127,29 +6624,12 @@ msgstr "showForm() njeimplementowany."
 msgid "saveSettings() not implemented."
 msgstr "saveSettings() njeimplementowany."
 
-#. TRANS: Client error message thrown if design settings could not be deleted in
-#. TRANS: the admin panel Design.
-msgid "Unable to delete design setting."
-msgstr "Njeje móžno, designowe nastajenje zhašeć."
-
 #. TRANS: Header in administrator navigation panel.
-#. TRANS: Header in settings navigation panel.
-#, fuzzy
 msgctxt "HEADER"
 msgid "Home"
 msgstr "Startowa strona"
 
-#. TRANS: Menu item in administrator navigation panel.
-#. TRANS: Menu item in default local navigation panel.
-#. TRANS: Menu item in personal group navigation menu.
-#. TRANS: Menu item in settings navigation panel.
-#, fuzzy
-msgctxt "MENU"
-msgid "Home"
-msgstr "Startowa strona"
-
 #. TRANS: Header in administrator navigation panel.
-#, fuzzy
 msgctxt "HEADER"
 msgid "Admin"
 msgstr "Administrator"
@@ -7163,23 +6643,11 @@ msgctxt "MENU"
 msgid "Site"
 msgstr "Sydło"
 
-#. TRANS: Menu item title in administrator navigation panel.
-msgid "Design configuration"
-msgstr "Designowa konfiguracija"
-
-#. TRANS: Menu item in administrator navigation panel.
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: Menu item in settings navigation panel.
-msgctxt "MENU"
-msgid "Design"
-msgstr "Design"
-
 #. TRANS: Menu item title in administrator navigation panel.
 msgid "User configuration"
 msgstr "Wužiwarska konfiguracija"
 
 #. TRANS: Menu item in administrator navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "User"
 msgstr "Wužiwar"
@@ -7189,7 +6657,6 @@ msgid "Access configuration"
 msgstr "Přistupna konfiguracija"
 
 #. TRANS: Menu item in administrator navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Access"
 msgstr "Přistup"
@@ -7199,7 +6666,6 @@ msgid "Paths configuration"
 msgstr "Konfiguracija šćežkow"
 
 #. TRANS: Menu item in administrator navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Paths"
 msgstr "Šćežki"
@@ -7209,7 +6675,6 @@ msgid "Sessions configuration"
 msgstr "Konfiguracija posedźenjow"
 
 #. TRANS: Menu item in administrator navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Sessions"
 msgstr "Posedźenja"
@@ -7219,7 +6684,6 @@ msgid "Edit site notice"
 msgstr "Sydłowu zdźělenku wobdźěłać"
 
 #. TRANS: Menu item in administrator navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Site notice"
 msgstr "Sydłowa zdźělenka"
@@ -7229,7 +6693,6 @@ msgid "Snapshots configuration"
 msgstr "Konfiguracija wobrazowkowych fotow"
 
 #. TRANS: Menu item in administrator navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Snapshots"
 msgstr "Njejapke fota"
@@ -7239,18 +6702,15 @@ msgid "Set site license"
 msgstr "Licencu sydła nastajić"
 
 #. TRANS: Menu item in administrator navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "License"
 msgstr "Licenca"
 
 #. TRANS: Menu item title in administrator navigation panel.
-#, fuzzy
 msgid "Plugins configuration"
-msgstr "Konfiguracija šćežkow"
+msgstr "Konfiguracija tyka�ow"
 
 #. TRANS: Menu item in administrator navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Plugins"
 msgstr "Tyka�e"
@@ -7265,7 +6725,7 @@ msgstr "Žana aplikacija za tón klu� přetrjebowarja."
 
 #. TRANS: Authorization exception thrown when a user without API access tries to access the API.
 msgid "Not allowed to use API."
-msgstr ""
+msgstr "Wužiwanje API njeje dowolene."
 
 #. TRANS: OAuth exception given when an incorrect access token was given for a user.
 msgid "Bad access token."
@@ -7280,39 +6740,6 @@ msgstr ""
 msgid "Could not authenticate you."
 msgstr "Njebě móžno će awtentifikować."
 
-#. TRANS: Server error displayed when trying to create an anynymous OAuth consumer.
-msgid "Could not create anonymous consumer."
-msgstr "Anonymny přetrjebowar njeda so wutworić."
-
-#. TRANS: Server error displayed when trying to create an anynymous OAuth application.
-msgid "Could not create anonymous OAuth application."
-msgstr "Anonymna OAuth-aplikacija njeda so wutworić."
-
-#. TRANS: Exception thrown when no token association could be found.
-msgid ""
-"Could not find a profile and application associated with the request token."
-msgstr ""
-
-#. TRANS: Exception thrown when no access token can be issued.
-msgid "Could not issue access token."
-msgstr "Přistupny token njeda so wudać."
-
-#. TRANS: Exception thrown when a database error occurs.
-msgid "Database error inserting OAuth application user."
-msgstr "Zmylk datoweje banki při zasunjenju wužiwarja OAuth-aplikacije."
-
-#. TRANS: Exception thrown when a database error occurs.
-msgid "Database error updating OAuth application user."
-msgstr "Zmylk datoweje banki při aktualizowanju wužiwarja OAuth-aplikacije."
-
-#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
-msgid "Tried to revoke unknown token."
-msgstr ""
-
-#. TRANS: Exception thrown when an attempt is made to remove a revoked token.
-msgid "Failed to delete revoked token."
-msgstr ""
-
 #. TRANS: Form input field label for application icon.
 msgid "Icon"
 msgstr "Symbol"
@@ -7393,20 +6820,19 @@ msgstr "Popisujomny"
 #. TRANS: Form guide.
 msgid "Default access for this application: read-only, or read-write"
 msgstr ""
+"Standardny přistup za tutón program: jenož �itajomny abo �itajomny-pisajomny"
 
 #. TRANS: Submit button title.
-msgid "Cancel"
-msgstr "Přetorhnyć"
+msgid "Cancel application changes."
+msgstr "Změny aplikacijow přetorhnyć."
 
 #. TRANS: Submit button title.
-#. TRANS: Button text to save a list.
-msgid "Save"
-msgstr "Składować"
+msgid "Save application changes."
+msgstr "Změny aplikacijow składować."
 
 #. TRANS: Name for an anonymous application in application list.
-#, fuzzy
 msgid "Unknown application"
-msgstr "Njeznata akcija"
+msgstr "Njeznata aplikacija"
 
 #. TRANS: Message has a leading space and a trailing space. Used in application list.
 #. TRANS: Before this message the application name is put, behind it the organisation that manages it.
@@ -7437,6 +6863,18 @@ msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "Wotwołać"
 
+#. TRANS: Submit button text to accept a group membership request on approve group form.
+#. TRANS: Submit button text to accept a subscription request on approve sub form.
+msgctxt "BUTTON"
+msgid "Accept"
+msgstr "Akceptować"
+
+#. TRANS: Submit button text to reject a group membership request on approve group form.
+#. TRANS: Submit button text to reject a subscription request on approve sub form.
+msgctxt "BUTTON"
+msgid "Reject"
+msgstr "Wotpokazać"
+
 #. TRANS: Atom feed exception thrown when an author element does not contain a name element.
 msgid "Author element must contain a name element."
 msgstr "Element \"author\" dyrbi element \"name\" wobsahować."
@@ -7446,15 +6884,15 @@ msgid "Do not use this method!"
 msgstr "Njewužij tutu metodu!"
 
 #. TRANS: Title in atom list notice feed. %1$s is a list name, %2$s is a tagger's nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "Timeline for people in list %1$s by %2$s"
-msgstr "Wotmołwy na %1$s na %2$s."
+msgstr "Časowa lajsta za ludźi w lisćinje %1$s wot %2$s."
 
 #. TRANS: Message is used as a subtitle in atom list notice feed.
 #. TRANS: %1$s is a tagger's nickname, %2$s is a list name, %3$s is a site name.
-#, fuzzy, php-format
+#, php-format
 msgid "Updates from %1$s's list %2$s on %3$s!"
-msgstr "Aktualizacije wot %1$s na %2$s!"
+msgstr "Aktualizacije lisćiny %3$s wužiwarja %1$s na %2$s!"
 
 #. TRANS: Title.
 msgid "Notices where this attachment appears"
@@ -7486,10 +6924,9 @@ msgid "Cancel join request"
 msgstr ""
 
 #. TRANS: Button text for form action to cancel a subscription request.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Cancel subscription request"
-msgstr "WÅ¡Ä› abonementy"
+msgstr "Abonowanske naprašowanje přetorhnyć"
 
 #. TRANS: Title for command results.
 msgid "Command results"
@@ -7535,7 +6972,7 @@ msgstr "Tutón přikaz hišće njeje implementowany."
 
 #. TRANS: Command exception text shown when a user tries to nudge themselves.
 msgid "It does not make a lot of sense to nudge yourself!"
-msgstr ""
+msgstr "Je bjez zmysła, so samoho stor�ić!"
 
 #. TRANS: Message given having nudged another user.
 #. TRANS: %s is the nickname of the user that was nudged.
@@ -7558,9 +6995,8 @@ msgstr ""
 "Zdźělenki: %3$s"
 
 #. TRANS: Error message text shown when a favorite could not be set because it has already been favorited.
-#, fuzzy
 msgid "Could not create favorite: Already favorited."
-msgstr "Faworit njeda so wutworić."
+msgstr "Faworit njeda so wutworić: Je hižo faworit."
 
 #. TRANS: Text shown when a notice has been marked as favourite successfully.
 msgid "Notice marked as fave."
@@ -7587,18 +7023,18 @@ msgstr ""
 #. TRANS: Succes message displayed if tagging a user succeeds.
 #. TRANS: %1$s is the tagged user's nickname, %2$s is a list of tags.
 #. TRANS: Plural is decided based on the number of tags added (not part of message).
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s was tagged %2$s"
 msgid_plural "%1$s was tagged %2$s"
-msgstr[0] "%1$s - %2$s"
-msgstr[1] "%1$s - %2$s"
-msgstr[2] "%1$s - %2$s"
-msgstr[3] "%1$s - %2$s"
+msgstr[0] "%1$s je přez %2$s woznamjenił"
+msgstr[1] "%1$s je přez %2$s woznamjenił"
+msgstr[2] "%1$s je přez %2$s woznamjenił"
+msgstr[3] "%1$s je přez %2$s woznamjenił"
 
 #. TRANS: Separator for list of tags.
 #. TRANS: Separator in list of user names like "Jim, Bob, Mary".
 msgid ", "
-msgstr ""
+msgstr ", "
 
 #. TRANS: Error displayed if a given tag is invalid.
 #. TRANS: %s is the invalid tag.
@@ -7661,6 +7097,8 @@ msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
 "same server."
 msgstr ""
+"%s je zdaleny profil; móžeš jenož wužiwarjam na samsnym serwerje direktne "
+"powěsće pósłać."
 
 #. TRANS: Message given if content is too long. %1$sd is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
@@ -7829,38 +7267,34 @@ msgstr[2] "Sy �łon tutych skupinow:"
 msgstr[3] "Sy �łon tutych skupinow:"
 
 #. TRANS: Header line of help text for commands.
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "Commands:"
-msgstr "Přikazowe wuslědki"
+msgstr "Přikazy:"
 
 #. TRANS: Help message for IM/SMS command "on".
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "turn on notifications"
-msgstr "Zdźělenje njeda so zmóžnić."
+msgstr "Zdźělenja zmóžnić"
 
 #. TRANS: Help message for IM/SMS command "off".
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "turn off notifications"
-msgstr "Zdźělenje njeda so znjemóžnić."
+msgstr "Zdźělenja znjemóžnić"
 
 #. TRANS: Help message for IM/SMS command "help".
 msgctxt "COMMANDHELP"
 msgid "show this help"
-msgstr ""
+msgstr "tutu pomoc pokazać"
 
 #. TRANS: Help message for IM/SMS command "follow <nickname>".
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "subscribe to user"
-msgstr "Tutoho wužiwarja abonować"
+msgstr "Wužiwarja abonować"
 
 #. TRANS: Help message for IM/SMS command "groups".
 msgctxt "COMMANDHELP"
 msgid "lists the groups you have joined"
-msgstr ""
+msgstr "nalistuje skupiny, do kotrychž sy zastupił"
 
 #. TRANS: Help message for IM/SMS command "tag".
 msgctxt "COMMANDHELP"
@@ -7875,40 +7309,37 @@ msgstr ""
 #. TRANS: Help message for IM/SMS command "subscriptions".
 msgctxt "COMMANDHELP"
 msgid "list the people you follow"
-msgstr ""
+msgstr "ludźi nalistować, kotrymž slěduješ"
 
 #. TRANS: Help message for IM/SMS command "subscribers".
 msgctxt "COMMANDHELP"
 msgid "list the people that follow you"
-msgstr ""
+msgstr "Ludźi nalistować, kotřiž ći slěduja"
 
 #. TRANS: Help message for IM/SMS command "leave <nickname>".
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "unsubscribe from user"
-msgstr "Tutoho wužiwarja wotskazać"
+msgstr "Wužiwarja wotskazać"
 
 #. TRANS: Help message for IM/SMS command "d <nickname> <text>".
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "direct message to user"
-msgstr "Direktne powěsće do %s"
+msgstr "Direktna powěsć wužiwarjej"
 
 #. TRANS: Help message for IM/SMS command "get <nickname>".
 msgctxt "COMMANDHELP"
 msgid "get last notice from user"
-msgstr ""
+msgstr "poslednju zdźělenku wužiwarja wotwołać"
 
 #. TRANS: Help message for IM/SMS command "whois <nickname>".
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "get profile info on user"
-msgstr "Zdaleny profil skupina njeje!"
+msgstr "Profilowe informacije wo wužiwarju wotwołać"
 
 #. TRANS: Help message for IM/SMS command "lose <nickname>".
 msgctxt "COMMANDHELP"
 msgid "force user to stop following you"
-msgstr ""
+msgstr "wužiwarja nuzować, tebje wjace njeslědować"
 
 #. TRANS: Help message for IM/SMS command "fav <nickname>".
 msgctxt "COMMANDHELP"
@@ -7923,30 +7354,27 @@ msgstr ""
 #. TRANS: Help message for IM/SMS command "repeat #<notice_id>".
 msgctxt "COMMANDHELP"
 msgid "repeat a notice with a given id"
-msgstr ""
+msgstr "zdźělenku z datym ID wospjetować"
 
 #. TRANS: Help message for IM/SMS command "repeat <nickname>".
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "repeat the last notice from user"
-msgstr "Tutu zdźělenku wospjetować"
+msgstr "Poslednju zdźělenku wužiwarja wospjetować"
 
 #. TRANS: Help message for IM/SMS command "reply #<notice_id>".
 msgctxt "COMMANDHELP"
 msgid "reply to notice with a given id"
-msgstr ""
+msgstr "na zdźělenku z datym ID wotmołwić"
 
 #. TRANS: Help message for IM/SMS command "reply <nickname>".
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "reply to the last notice from user"
-msgstr "Na tutu zdźělenku wotmołwić"
+msgstr "Na poslednju zdźělenku wužiwarja wotmołwić"
 
 #. TRANS: Help message for IM/SMS command "join <group>".
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "join group"
-msgstr "Njeznata skupina"
+msgstr "Do skupiny zastupić"
 
 #. TRANS: Help message for IM/SMS command "login".
 msgctxt "COMMANDHELP"
@@ -7954,15 +7382,14 @@ msgid "Get a link to login to the web interface"
 msgstr ""
 
 #. TRANS: Help message for IM/SMS command "drop <group>".
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "leave group"
-msgstr "Skupinu zhašeć"
+msgstr "Skupinu wopušćić"
 
 #. TRANS: Help message for IM/SMS command "stats".
 msgctxt "COMMANDHELP"
 msgid "get your stats"
-msgstr ""
+msgstr "twoju statistiku wotwołać"
 
 #. TRANS: Help message for IM/SMS command "stop".
 #. TRANS: Help message for IM/SMS command "quit".
@@ -7994,15 +7421,14 @@ msgstr ""
 #. TRANS: Help message for IM/SMS command "untrack all".
 #. TRANS: Help message for IM/SMS command "tracks".
 #. TRANS: Help message for IM/SMS command "tracking".
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "not yet implemented."
-msgstr "Přikaz hišće njeimplementowany."
+msgstr "hišće njeimplementowany."
 
 #. TRANS: Help message for IM/SMS command "nudge <nickname>".
 msgctxt "COMMANDHELP"
 msgid "remind a user to update."
-msgstr ""
+msgstr "wužiwarja na aktualizaciju dopomnić."
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 msgid "No configuration file found."
@@ -8022,31 +7448,26 @@ msgstr "Móže być, zo chceš instalaciski program startować, zo by to porjed
 msgid "Go to the installer."
 msgstr "K instalaciji"
 
+#. TRANS: Header on conversation page. Hidden by default (h2).
+#. TRANS: Label for user statistics.
+msgid "Notices"
+msgstr "Zdźělenki"
+
 #. TRANS: Page title for when a database error occurs.
 msgid "Database error"
 msgstr "Zmylk w datowej bance"
 
 #. TRANS: Menu item in default local navigation panel.
 #. TRANS: Menu item in search group navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Public"
 msgstr "Zjawny"
 
-#. TRANS: Menu item in default local navigation panel.
-#. TRANS: Menu item in search group navigation panel.
-#. TRANS: Menu item in local navigation menu.
-#, fuzzy
-msgctxt "MENU"
-msgid "Groups"
-msgstr "Skupiny"
-
 #. TRANS: Menu item in default local navigation panel.
 #. TRANS: Menu item title in local navigation menu.
-#, fuzzy
 msgctxt "MENU"
 msgid "Lists"
-msgstr "Limity"
+msgstr "Lisćiny"
 
 #. TRANS: Title of form for deleting a user.
 #. TRANS: Link text in notice list item to delete a notice.
@@ -8057,52 +7478,12 @@ msgstr "Zni�ić"
 msgid "Delete this user"
 msgstr "Tutoho wužiwarja wušmórnyć"
 
-#. TRANS: Form legend of form for changing the page design.
-#, fuzzy
-msgid "Change design"
-msgstr "Design składować"
-
-#. TRANS: Fieldset legend on profile design page to change profile page colours.
-msgid "Change colours"
-msgstr "Barby změnić"
-
-#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-msgid "Use defaults"
-msgstr "Standardne hódnoty wužiwać"
-
-#. TRANS: Label in form on profile design page.
-#. TRANS: Field contains file name on user's computer that could be that user's custom profile background image.
-msgid "Upload file"
-msgstr "Dataju nahrać"
-
-#. TRANS: Instructions for form on profile design page.
-msgid ""
-"You can upload your personal background image. The maximum file size is 2MB."
-msgstr ""
-"Móžeš swój wosobinski pozadkowy wobraz nahrać. Maksimalna datajowa wulkosć "
-"je 2 MB."
-
-#. TRANS: Radio button on profile design page that will enable use of the uploaded profile image.
-msgctxt "RADIO"
-msgid "On"
-msgstr "Zapinjeny"
-
-#. TRANS: Radio button on profile design page that will disable use of the uploaded profile image.
-msgctxt "RADIO"
-msgid "Off"
-msgstr "Wupinjeny"
-
-#. TRANS: Success message displayed if design settings were saved after clicking "Use defaults".
-msgid "Design defaults restored."
-msgstr "Designowe standardne nastajenja wobnowjene."
-
 #. TRANS: Exception. %s is an ID.
 #, php-format
 msgid "Unable to find services for %s."
 msgstr "Njemóžno słužby za %s namakać."
 
 #. TRANS: Form legend for removing the favourite status for a favourite notice.
-#. TRANS: Title for button text for removing the favourite status for a favourite notice.
 msgid "Disfavor this notice"
 msgstr "Tutu zdźělenku z faworitow wotstronić"
 
@@ -8111,8 +7492,11 @@ msgctxt "BUTTON"
 msgid "Disfavor favorite"
 msgstr "Z faworitow wotstronić"
 
+#. TRANS: Button title for removing the favourite status for a favourite notice.
+msgid "Remove this notice from your list of favorite notices."
+msgstr "Tutu zdźělenku z lisćiny woblubowanych zdźělenkow wotstronić."
+
 #. TRANS: Form legend for adding the favourite status to a notice.
-#. TRANS: Title for button text for adding the favourite status to a notice.
 msgid "Favor this notice"
 msgstr "Tutu zdźělenku faworitam přidać"
 
@@ -8121,6 +7505,10 @@ msgctxt "BUTTON"
 msgid "Favor"
 msgstr "Faworit"
 
+#. TRANS: Button title for adding the favourite status to a notice.
+msgid "Add this notice to your list of favorite notices."
+msgstr "Tutu zdźělenku lisćinje woblubowanych zdźělenkow přidać."
+
 #. TRANS: Feed type name.
 msgid "RSS 1.0"
 msgstr "RSS 1.0"
@@ -8137,13 +7525,16 @@ msgstr "Atom"
 msgid "FOAF"
 msgstr "FOAF"
 
+#. TRANS: Feed type name. See http://activitystrea.ms/
+msgid "Activity Streams"
+msgstr ""
+
 #. TRANS: Client exception thrown when an imported feed does not have an author.
 msgid "No author in the feed."
 msgstr "Žadyn awtor w kanalu njeje."
 
 #. TRANS: Client exception thrown when an imported feed does not have an author that
 #. TRANS: can be associated with a user.
-#, fuzzy
 msgid "Cannot import without a user."
 msgstr "Import bjez wužiwarja njemóžno."
 
@@ -8152,7 +7543,6 @@ msgid "Feeds"
 msgstr "Kanale"
 
 #. TRANS: List element on gallery action page to show all tags.
-#, fuzzy
 msgctxt "TAGS"
 msgid "All"
 msgstr "WÅ¡Ä›"
@@ -8170,6 +7560,27 @@ msgstr ""
 msgid "Grant this user the \"%s\" role"
 msgstr "Tutomu wužiwarjej rólu \"%s\" dać"
 
+#. TRANS: Header for mini list of group members on a group page (h2).
+msgid "Members"
+msgstr "Čłonojo"
+
+#. TRANS: Link to all group members from mini list of group members if group has more than n members.
+msgid "All members"
+msgstr "Wšitcy �łonojo"
+
+#. TRANS: Header for mini list of users with a pending membership request on a group page (h2).
+msgid "Pending"
+msgstr "Njes�injeny"
+
+#. TRANS: Header for mini list of users that are blocked in a group page (h2).
+msgid "Blocked"
+msgstr "Blokowany"
+
+#. TRANS: Title for list of group administrators on a group page.
+msgctxt "TITLE"
+msgid "Admins"
+msgstr "Administratorojo"
+
 #. TRANS: Button text for the form that will block a user from a group.
 msgctxt "BUTTON"
 msgid "Block"
@@ -8177,17 +7588,16 @@ msgstr "Blokować"
 
 #. TRANS: Submit button title.
 msgctxt "TOOLTIP"
-msgid "Block this user"
-msgstr "Tutoho wužiwarja blokować"
+msgid "Block this user so that they can no longer post messages to it."
+msgstr ""
 
 #. TRANS: Field title on group edit form.
 msgid "URL of the homepage or blog of the group or topic."
 msgstr "URL startoweje strony abo bloga skupiny abo temy."
 
 #. TRANS: Text area title for group description when there is no text limit.
-#, fuzzy
 msgid "Describe the group or topic."
-msgstr "Skupinu abo temu wopisać"
+msgstr "Skupinu abo temu wopisać."
 
 #. TRANS: Text area title for group description.
 #. TRANS: %d is the number of characters available for the description.
@@ -8228,72 +7638,17 @@ msgstr[3] ""
 msgid ""
 "New members must be approved by admin and all posts are forced to be private."
 msgstr ""
+"Nowi �łonojo dyrbja so wot administratora akceptować a wšě powěsće su "
+"priwatne."
 
 #. TRANS: Indicator in group members list that this user is a group administrator.
-#, fuzzy
 msgctxt "GROUPADMIN"
 msgid "Admin"
 msgstr "Administrator"
 
-#. TRANS: Menu item in the group navigation page.
-msgctxt "MENU"
-msgid "Group"
-msgstr "Skupina"
-
-#. TRANS: Tooltip for menu item in the group navigation page.
-#. TRANS: %s is the nickname of the group.
-#, php-format
-msgctxt "TOOLTIP"
-msgid "%s group"
-msgstr "Skupina %s"
-
-#. TRANS: Menu item in the group navigation page.
-msgctxt "MENU"
-msgid "Members"
-msgstr "Čłonojo"
-
-#. TRANS: Tooltip for menu item in the group navigation page.
-#. TRANS: %s is the nickname of the group.
-#, php-format
-msgctxt "TOOLTIP"
-msgid "%s group members"
-msgstr "Čłonojo skupiny %s"
-
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: %d is the number of pending members.
-#, php-format
-msgctxt "MENU"
-msgid "Pending members (%d)"
-msgid_plural "Pending members (%d)"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-
-#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: %s is the nickname of the group.
-#, fuzzy, php-format
-msgctxt "TOOLTIP"
-msgid "%s pending members"
-msgstr "%s skupinskich �łonow"
-
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-msgctxt "MENU"
-msgid "Blocked"
-msgstr "Zablokowany"
-
-#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: %s is the nickname of the group.
-#, php-format
-msgctxt "TOOLTIP"
-msgid "%s blocked users"
-msgstr "Zablokowani wužiwarjo skupiny %s"
-
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: Menu item in primary navigation panel.
-msgctxt "MENU"
-msgid "Admin"
-msgstr "Administrator"
+#. TRANS: Group actions header (h2). Text hidden by default.
+msgid "Group actions"
+msgstr "Skupinske akcije"
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
@@ -8302,11 +7657,6 @@ msgctxt "TOOLTIP"
 msgid "Edit %s group properties"
 msgstr "Kajkosće skupiny %s wobdźěłać"
 
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-msgctxt "MENU"
-msgid "Logo"
-msgstr "Logo"
-
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
 #, php-format
@@ -8314,32 +7664,32 @@ msgctxt "TOOLTIP"
 msgid "Add or edit %s logo"
 msgstr "Logo skupiny %s přidać abo wobdźěłać"
 
-#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: %s is the nickname of the group.
-#, php-format
-msgctxt "TOOLTIP"
-msgid "Add or edit %s design"
-msgstr "Design skupiny %s přidać abo wobdźěłać"
-
-#. TRANS: Group actions header (h2). Text hidden by default.
-msgid "Group actions"
-msgstr "Skupinske akcije"
+#. TRANS: Link text for link on user profile.
+msgctxt "MENU"
+msgid "Logo"
+msgstr "Logo"
 
 #. TRANS: Title for groups with the most members section.
-#, fuzzy
 msgid "Popular groups"
-msgstr "Woblubowane zdźělenki"
+msgstr "Woblubowane skupiny"
 
 #. TRANS: Title for groups with the most posts section.
-#, fuzzy
 msgid "Active groups"
-msgstr "WÅ¡Ä› skupiny"
+msgstr "Aktiwne skupiny"
 
-#. TRANS: Title for group tag cloud section.
-#. TRANS: %s is a group name.
-#, php-format
-msgid "Tags in %s group's notices"
-msgstr "Tafli�ki w zdźělenkach skupiny %s"
+#. TRANS: Link description for seeing all groups.
+#. TRANS: Link description for seeing all lists.
+msgid "See all"
+msgstr "Wšě pokazać"
+
+#. TRANS: Link title for seeing all groups.
+msgid "See all groups you belong to."
+msgstr "Wšě skupiny pokazać, ke kotrymž słušeš."
+
+#. TRANS: Menu item title in personal group navigation menu.
+#. TRANS: %s is a username.
+msgid "Back to top"
+msgstr "Wróćo horje"
 
 #. TRANS: Client exception 406
 msgid "This page is not available in a media type you accept"
@@ -8425,31 +7775,62 @@ msgstr ""
 
 #. TRANS: Server exception thrown trying to initialise an IM plugin without a transport method.
 msgid "Transport cannot be null."
-msgstr ""
+msgstr "Transport njemóže prózdny być."
 
 #. TRANS: Title for inbox tag cloud section.
 msgctxt "TITLE"
 msgid "Trends"
-msgstr ""
+msgstr "Trendy"
 
-#. TRANS: Button text for inviting more users to the StatusNet instance.
-#, fuzzy
+#. TRANS: Default button text for inviting more users to the StatusNet instance.
 msgctxt "BUTTON"
 msgid "Invite more colleagues"
-msgstr "Nowych wužiwarjow přeprosyć"
+msgstr "Dalšich kolegow přeprosyć"
+
+#. TRANS: Form legend.
+msgid "Invite collegues"
+msgstr "Kolegow přeprosyć"
+
+#. TRANS: Field label for a list of e-mail addresses.
+msgid "Email addresses"
+msgstr "E-mejlowe adresy"
+
+#. TRANS: Field title for a list of e-mail addresses.
+msgid "Addresses of friends to invite (one per line)."
+msgstr "Adresy přećelow, kotřiž maja so přeprosyć (jedna na linku)"
+
+#. TRANS: Field label for a personal message to send to invitees.
+msgid "Personal message"
+msgstr "Wosobinska powěsć"
+
+#. TRANS: Field title for a personal message to send to invitees.
+msgid "Optionally add a personal message to the invitation."
+msgstr "Wosobinsku powěsć po dobrozdaću přeprošenju přidać."
+
+#. TRANS: Send button for inviting friends
+#. TRANS: Button text for sending notice.
+msgctxt "BUTTON"
+msgid "Send"
+msgstr "Pósłać"
+
+#. TRANS: Submit button title.
+msgid "Send invitations."
+msgstr "Přeprošenja pósłać."
 
 #. TRANS: Button text for joining a group.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Join"
 msgstr "Zastupić"
 
 #. TRANS: Button text on form to leave a group.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Leave"
 msgstr "Wopušćić"
 
+#. TRANS: Link title for seeing all lists.
+msgid "See all lists you have created."
+msgstr "Wšě lisćiny pokazać, kotrež sy wutworił."
+
 #. TRANS: Menu item for logging in to the StatusNet site.
 #. TRANS: Menu item in primary navigation panel.
 msgctxt "MENU"
@@ -8497,14 +7878,14 @@ msgstr ""
 #. TRANS: Main body of new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscriber's long name, %2$s is the StatusNet sitename.
 #, php-format
-msgid "%1$s is now listening to your notices on %2$s."
-msgstr "%1$s slěduje twoje zdźělenki na %2$s."
+msgid "%1$s is now following you on %2$s."
+msgstr "%1$s će nětko na %2$s slěduje."
 
 #. TRANS: Subject of pending new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscribing user's nickname, %2$s is the StatusNet sitename.
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s would like to listen to your notices on %2$s."
-msgstr "%1$s slěduje twoje zdźělenki na %2$s."
+msgstr "%1$s by rady twoje zdźělenki na %2$s abonował."
 
 #. TRANS: Main body of pending new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscriber's long name, %2$s is the StatusNet sitename.
@@ -8513,6 +7894,8 @@ msgid ""
 "%1$s would like to listen to your notices on %2$s. You may approve or reject "
 "their subscription at %3$s"
 msgstr ""
+"%1$s by rady twoje zdźělenki na %2$s slědował. Móžeš jeho abonement na %3$s "
+"přiwzać abo wotpokazać"
 
 #. TRANS: Common footer block for StatusNet notification emails.
 #. TRANS: %1$s is the StatusNet sitename,
@@ -8528,9 +7911,9 @@ msgstr ""
 
 #. TRANS: Profile info line in notification e-mail.
 #. TRANS: %s is a URL.
-#, fuzzy, php-format
+#, php-format
 msgid "Profile: %s"
-msgstr "Profil"
+msgstr "Profil: %s"
 
 #. TRANS: Profile info line in notification e-mail.
 #. TRANS: %s is biographical information.
@@ -8673,7 +8056,7 @@ msgstr "%1$s (@%2$s) je zdźělenku k twojej kedźbnosći pósłał"
 #. TRANS: Body of @-reply notification e-mail.
 #. TRANS: %1$s is the sending user's name, $2$s is the StatusNet sitename,
 #. TRANS: %3$s is a URL to the notice, %4$s is the notice text,
-#. TRANS: %5$s is a URL to the full conversion if it exists (otherwise empty),
+#. TRANS: %5$s is the text "The full conversation can be read here:" and a URL to the full conversion if it exists (otherwise empty),
 #. TRANS: %6$s is a URL to reply to the notice, %7$s is a URL to all @-replies for the addressed user,
 #, php-format
 msgid ""
@@ -8698,19 +8081,23 @@ msgstr ""
 
 #. TRANS: Subject of group join notification e-mail.
 #. TRANS: %1$s is the joining user's nickname, %2$s is the group name, and %3$s is the StatusNet sitename.
+#, php-format
+msgid "%1$s has joined your group %2$s on %3$s"
+msgstr "%1$s je do swojeje skupiny %2$s na %3$s zastupił"
+
 #. TRANS: Main body of group join notification e-mail.
 #. TRANS: %1$s is the subscriber's long name, %2$s is the group name, and %3$s is the StatusNet sitename,
 #. TRANS: %4$s is a block of profile info about the subscriber.
 #. TRANS: %5$s is a link to the addressed user's e-mail settings.
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s has joined your group %2$s on %3$s."
-msgstr "%1$s je do skupiny %2$s zastupił."
+msgstr "%1$s je do twojeje skupiny %2$s na %3$s zastupił."
 
 #. TRANS: Subject of pending group join request notification e-mail.
 #. TRANS: %1$s is the joining user's nickname, %2$s is the group name, and %3$s is the StatusNet sitename.
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s wants to join your group %2$s on %3$s."
-msgstr "%1$s je do skupiny %2$s zastupił."
+msgstr "%1$s chce do twojeje skupiny %2$s na %3$s zastupić."
 
 #. TRANS: Main body of pending group join request notification e-mail.
 #. TRANS: %1$s is the subscriber's long name, %2$s is the group name, and %3$s is the StatusNet sitename,
@@ -8740,9 +8127,8 @@ msgid "Inbox"
 msgstr "Dochadny póst"
 
 #. TRANS: Menu item title in mailbox menu. Leads to incoming private messages.
-#, fuzzy
 msgid "Your incoming messages."
-msgstr "Twoje dochadźace powěsće"
+msgstr "Twoje dochadźace powěsće."
 
 #. TRANS: Menu item in mailbox menu. Leads to outgoing private messages.
 msgctxt "MENU"
@@ -8750,9 +8136,8 @@ msgid "Outbox"
 msgstr "Wuchadny póst"
 
 #. TRANS: Menu item title in mailbox menu. Leads to outgoing private messages.
-#, fuzzy
 msgid "Your sent messages."
-msgstr "Twoje pósłane powěsće"
+msgstr "Twoje pósłane powěsće."
 
 #. TRANS: Error message in incoming mail handler used when an incoming e-mail cannot be processed.
 msgid "Could not parse message."
@@ -8772,9 +8157,9 @@ msgstr "Wodaj, dochadźaće e-mejle njejsu dowolene."
 
 #. TRANS: Error message in incoming mail handler used when an incoming e-mail is of an unsupported type.
 #. TRANS: %s is the unsupported type.
-#, fuzzy, php-format
+#, php-format
 msgid "Unsupported message type: %s."
-msgstr "Njepodpěrany powěsćowy typ: %s"
+msgstr "Njepodpěrany powěsćowy typ: %s."
 
 #. TRANS: Form legend for form to make a user a group admin.
 msgid "Make user an admin of the group"
@@ -8787,8 +8172,8 @@ msgstr "K administratorej �inić"
 
 #. TRANS: Submit button title.
 msgctxt "TOOLTIP"
-msgid "Make this user an admin"
-msgstr "Tutoho wužiwarja k administratorej �inić"
+msgid "Make this user an admin."
+msgstr "Tutoho wužiwarja k administratorej �inić."
 
 #. TRANS: Client exception thrown when a database error was thrown during a file upload operation.
 msgid "There was a database error while saving your file. Please try again."
@@ -8837,7 +8222,7 @@ msgstr "Direktnu zdźělenku pósłać"
 msgid "Select recipient:"
 msgstr "Přijimowarja wubrać:"
 
-#. TRANS Entry in drop-down selection box in direct-message inbox/outbox when no one is available to message.
+#. TRANS: Entry in drop-down selection box in direct-message inbox/outbox when no one is available to message.
 msgid "No mutual subscribers."
 msgstr "Žani wzajomni abonenća."
 
@@ -8860,7 +8245,6 @@ msgid "from"
 msgstr "wot"
 
 #. TRANS: A possible notice source (web interface).
-#, fuzzy
 msgctxt "SOURCE"
 msgid "web"
 msgstr "Web"
@@ -8868,46 +8252,47 @@ msgstr "Web"
 #. TRANS: A possible notice source (XMPP).
 msgctxt "SOURCE"
 msgid "xmpp"
-msgstr ""
+msgstr "XMPP"
 
 #. TRANS: A possible notice source (e-mail).
-#, fuzzy
 msgctxt "SOURCE"
 msgid "mail"
-msgstr "E-mejl"
+msgstr "Póst"
 
 #. TRANS: A possible notice source (OpenMicroBlogging).
 msgctxt "SOURCE"
 msgid "omb"
-msgstr ""
+msgstr "OMB"
 
 #. TRANS: A possible notice source (Application Programming Interface).
 msgctxt "SOURCE"
 msgid "api"
-msgstr ""
+msgstr "API"
 
 #. TRANS: Client exception thrown when no author for an activity was found.
 msgid "Cannot get author for activity."
-msgstr ""
+msgstr "Za tutu aktiwitu awtor k dispoziciji njesteji."
 
 #. TRANS: Client exception thrown when ...
-#, fuzzy
 msgid "Bookmark not posted to this group."
-msgstr "Njesměš tutu skupinu zhašeć."
+msgstr "Zapołožka njeje so do tuteje skupiny pósłała."
 
 #. TRANS: Client exception when ...
-#, fuzzy
 msgid "Object not posted to this user."
-msgstr "Tutoho wužiwarja njezhašeć."
+msgstr "Objekt njeje so k tutomu wužiwarjej pósłał."
 
 #. TRANS: Server exception thrown when a micro app plugin uses a target that cannot be handled.
 msgid "Do not know how to handle this kind of target."
-msgstr ""
+msgstr "Njewěm, kaž mam z tutej družinu cila wobchadźeć."
 
 #. TRANS: Server exception thrown when a micro app plugin developer has not done his job too well.
 msgid "You must implement either adaptNoticeListItem() or showNotice()."
 msgstr ""
 
+#. TRANS: Link description to show more items in a list.
+msgid "More â–¼"
+msgstr "Wjace â–¼"
+
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 msgid "Nickname cannot be empty."
 msgstr "Přimjeno njemóže prózdne być."
@@ -8935,9 +8320,8 @@ msgid "Attach"
 msgstr "Připowěsnyć"
 
 #. TRANS: Title for input field to attach a file to a notice.
-#, fuzzy
 msgid "Attach a file."
-msgstr "Dataju připowěsnyć"
+msgstr "Dataju připowěsnyć."
 
 #. TRANS: Field label to add location to a notice.
 msgid "Share my location"
@@ -8956,11 +8340,7 @@ msgstr ""
 #. TRANS: Separator in profile addressees list.
 msgctxt "SEPARATOR"
 msgid ", "
-msgstr ""
-
-#. TRANS: Start of profile addressees list.
-msgid " â–¸ "
-msgstr ""
+msgstr ", "
 
 #. TRANS: Used in coordinates as abbreviation of north.
 msgid "N"
@@ -9000,221 +8380,179 @@ msgid "Repeated by"
 msgstr "Wospjetowany wot"
 
 #. TRANS: Link title in notice list item to reply to a notice.
-msgid "Reply to this notice"
-msgstr "Na tutu zdźělenku wotmołwić"
+msgid "Reply to this notice."
+msgstr "Na tutu zdźělenku wotmołwić."
 
 #. TRANS: Link text in notice list item to reply to a notice.
 msgid "Reply"
 msgstr "Wotmołwić"
 
 #. TRANS: Link title in notice list item to delete a notice.
-msgid "Delete this notice"
-msgstr "Tutu zdźělenku wušmórnyć"
+msgid "Delete this notice from the timeline."
+msgstr "Tutu zdźělenku z �asoweje lajsty zhašeć."
 
 #. TRANS: Title for repeat form status in notice list when a notice has been repeated.
-#, fuzzy
 msgid "Notice repeated."
-msgstr "Zdźělenka wospjetowana"
+msgstr "Zdźělenka wospjetowana."
 
 #. TRANS: Field label for notice text.
 msgid "Update your status..."
-msgstr ""
+msgstr "Waš status aktualizować..."
 
 #. TRANS: Form legend of form to nudge/ping another user.
 msgid "Nudge this user"
 msgstr "Tutoho wužiwarja stor�ić"
 
 #. TRANS: Button text to nudge/ping another user.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Nudge"
 msgstr "Stork"
 
 #. TRANS: Button title to nudge/ping another user.
-#, fuzzy
 msgid "Send a nudge to this user."
-msgstr "Tutomu wužiwarjej stork pósłać"
-
-#. TRANS: Exception thrown when creating a new profile fails in OAuth store.
-msgid "Error inserting new profile."
-msgstr "Zmylk při zasunjenju noweho profila."
-
-#. TRANS: Exception thrown when creating a new avatar fails in OAuth store.
-msgid "Error inserting avatar."
-msgstr "Zmylk při zasunjenju awatara."
-
-#. TRANS: Exception thrown when creating a remote profile fails in OAuth store.
-msgid "Error inserting remote profile."
-msgstr "Zmylk při zasunjenju zdaleneho profila."
-
-#. TRANS: Exception thrown when a notice is denied because it has been sent before.
-msgid "Duplicate notice."
-msgstr "Dwójna zdźělenka."
-
-#. TRANS: Exception thrown when creating a new subscription fails in OAuth store.
-#, fuzzy
-msgid "Could not insert new subscription."
-msgstr "Nowy abonement njeda so zasunyć."
+msgstr "Tutomu wužiwarjej stork pósłać."
 
 #. TRANS: Server exception thrown in oEmbed action if no API endpoint is available.
-#, fuzzy
 msgid "No oEmbed API endpoint available."
-msgstr "IM k dispoziciji njesteji."
+msgstr "Kón�ny dypk oEmbed API k dispoziciji njesteji."
 
 #. TRANS: Field label for list.
-#, fuzzy
 msgctxt "LABEL"
 msgid "List"
-msgstr "Wotkazy"
+msgstr "Lisćina"
 
 #. TRANS: Field title for list.
 msgid "Change the list (letters, numbers, -, ., and _ are allowed)."
-msgstr ""
+msgstr "Lisćinu změnić (pismiki, li�by, -, ., a _ su dowolene)."
 
 #. TRANS: Field title for description of list.
-#, fuzzy
 msgid "Describe the list or topic."
-msgstr "Skupinu abo temu wopisać"
+msgstr "Lisćinu abo temu wopisać."
 
 #. TRANS: Field title for description of list.
 #. TRANS: %d is the maximum number of characters for the description.
-#, fuzzy, php-format
+#, php-format
 msgid "Describe the list or topic in %d character."
 msgid_plural "Describe the list or topic in %d characters."
-msgstr[0] "Skupinu abo temu w %d znamješce abo mjenje wopisać"
-msgstr[1] "Skupinu abo temu w %d znamješkomaj abo mjenje wopisać"
-msgstr[2] "Skupinu abo temu w %d znamješkach abo mjenje wopisać"
-msgstr[3] "Skupinu abo temu w %d znamješkach abo mjenje wopisać"
+msgstr[0] "Lisćinu abo temu w %d znamješce wopisać"
+msgstr[1] "Lisćinu abo temu w %d znamješkomaj wopisać"
+msgstr[2] "Lisćinu abo temu w %d znamješkach wopisać"
+msgstr[3] "Lisćinu abo temu w %d znamješkach wopisać"
 
 #. TRANS: Button title to delete a list.
-#, fuzzy
 msgid "Delete this list."
-msgstr "Tutoho wužiwarja zhašeć"
+msgstr "Tutu lisćinu zhašeć."
 
 #. TRANS: Header in list edit form.
 msgid "Add or remove people"
-msgstr ""
+msgstr "Ludźi přidać abo wotstronić"
 
 #. TRANS: Header in list edit form.
-#, fuzzy
 msgctxt "HEADER"
 msgid "Search"
 msgstr "Pytać"
 
 #. TRANS: Menu item in list navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "List"
-msgstr "Wotkazy"
+msgstr "Lisćina"
 
 #. TRANS: Menu item title in list navigation panel.
 #. TRANS: %1$s is a list, %2$s is a nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s list by %2$s."
-msgstr "%1$s - %2$s"
+msgstr "Lisćina %1$s wot %2$s."
 
 #. TRANS: Menu item in list navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Listed"
-msgstr "Licenca"
+msgstr "Nalistowany"
 
 #. TRANS: Menu item in list navigation panel.
 #. TRANS: Menu item in local navigation menu.
-#, fuzzy
 msgctxt "MENU"
 msgid "Subscribers"
 msgstr "Abonenća"
 
 #. TRANS: Menu item title in list navigation panel.
 #. TRANS: %1$s is a list, %2$s is a nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "Subscribers to %1$s list by %2$s."
-msgstr "%s abonowany."
+msgstr "Abonenća lisćiny %1$s wot %2$s."
 
 #. TRANS: Menu item in list navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Edit"
 msgstr "Wobdźěłać"
 
 #. TRANS: Menu item title in list navigation panel.
 #. TRANS: %s is a list.
-#, fuzzy, php-format
+#, php-format
 msgid "Edit %s list by you."
-msgstr "Skupinu %s wobdźěłać"
-
-#. TRANS: Link description for link to list of users tagged with a tag.
-msgid "Tagged"
-msgstr ""
+msgstr "Twoju lisćinu %s wobdźěłać."
 
 #. TRANS: Title for link to edit list settings.
-#, fuzzy
 msgid "Edit list settings."
-msgstr "Profilowe nastajenja wobdźěłać"
+msgstr "Lisćinowe nastajenja wobdźěłać."
 
 #. TRANS: Text for link to edit list settings.
 msgid "Edit"
 msgstr "Wobdźěłać"
 
 #. TRANS: Privacy mode text in list list item for private list.
-#, fuzzy
 msgctxt "MODE"
 msgid "Private"
 msgstr "Priwatny"
 
 #. TRANS: Menu item in the group navigation page.
-#, fuzzy
 msgctxt "MENU"
 msgid "List Subscriptions"
-msgstr "Abonementy"
+msgstr "Abonementy nalistować"
 
 #. TRANS: Tooltip for menu item in the group navigation page.
 #. TRANS: %s is a user nickname.
-#, fuzzy, php-format
+#, php-format
 msgctxt "TOOLTIP"
 msgid "Lists subscribed to by %s."
-msgstr "%s abonowany."
+msgstr "Wot %s abonowane lisćiny."
 
 #. TRANS: Menu item in the group navigation page.
 #. TRANS: %s is a user nickname.
-#, fuzzy, php-format
+#, php-format
 msgctxt "MENU"
 msgid "Lists with %s"
-msgstr "Aktualizacije z \"%s\""
+msgstr "Lisćiny z %s"
 
 #. TRANS: Tooltip for menu item in the group navigation page.
 #. TRANS: %s is a user nickname.
-#, fuzzy, php-format
+#, php-format
 msgctxt "TOOLTIP"
 msgid "Lists with %s."
-msgstr "Aktualizacije z \"%s\""
+msgstr "Lisćiny z %s."
 
 #. TRANS: Menu item in the group navigation page.
 #. TRANS: %s is a user nickname.
 #, php-format
 msgctxt "MENU"
 msgid "Lists by %s"
-msgstr ""
+msgstr "Lisćiny wot %s"
 
 #. TRANS: Tooltip for menu item in the group navigation page.
 #. TRANS: %s is a user nickname.
-#, fuzzy, php-format
+#, php-format
 msgctxt "TOOLTIP"
 msgid "Lists by %s."
-msgstr "%1$s - %2$s"
+msgstr "Lisćiny wot %s."
 
 #. TRANS: Label in lists widget.
-#, fuzzy
 msgctxt "LABEL"
 msgid "Your lists"
-msgstr "Woblubowane zdźělenki"
+msgstr "Twoje lisćiny"
 
 #. TRANS: Fieldset legend in lists widget.
-#, fuzzy
 msgctxt "LEGEND"
 msgid "Edit lists"
-msgstr "Njepłaćiwa wosobowa tafli�ka: %s."
+msgstr "Lisćiny wobdźěłać"
 
 #. TRANS: Label in self tags widget.
 msgctxt "LABEL"
@@ -9222,31 +8560,29 @@ msgid "Tags"
 msgstr ""
 
 #. TRANS: Title for section contaning lists with the most subscribers.
-#, fuzzy
 msgid "Popular lists"
-msgstr "Woblubowane zdźělenki"
+msgstr "Woblubowane lisćiny"
 
 #. TRANS: List summary. %1$d is the number of users in the list,
 #. TRANS: %2$d is the number of subscribers to the list.
-#, fuzzy, php-format
+#, php-format
 msgid "Listed: %1$d Subscribers: %2$d"
-msgstr "%1$s abonentow, strona %2$d"
+msgstr "Nalistowane: %1$d: Abonenća: %2$d"
 
 #. TRANS: Title for page that displays which lists current user is part of.
-#, fuzzy, php-format
+#, php-format
 msgid "Lists with you"
-msgstr "Wužiwar njenamakany."
+msgstr "Lisćiny, w kotrychž sy"
 
 #. TRANS: Title for page that displays which lists a user is part of.
 #. TRANS: %s is a profile name.
-#, fuzzy, php-format
+#, php-format
 msgid "Lists with %s"
-msgstr "Aktualizacije z \"%s\""
+msgstr "Lisćiny, w kotrychž wužiwar %s je"
 
 #. TRANS: Title for page that displays lists a user has subscribed to.
-#, fuzzy
 msgid "List subscriptions"
-msgstr "%s abonementow"
+msgstr "Abonementy nalistować"
 
 #. TRANS: Menu item in personal group navigation menu.
 #. TRANS: Menu item in settings navigation panel.
@@ -9256,9 +8592,8 @@ msgid "Profile"
 msgstr "Profil"
 
 #. TRANS: Menu item title in personal group navigation menu.
-#, fuzzy
 msgid "Your profile"
-msgstr "Skupinski profil"
+msgstr "Twój profil"
 
 #. TRANS: Menu item in personal group navigation menu.
 msgctxt "MENU"
@@ -9271,13 +8606,11 @@ msgid "Favorites"
 msgstr "Fawority"
 
 #. TRANS: Replaces %s in '%s\'s favorite notices'. (Yes, we know we need to fix this.)
-#, fuzzy
 msgctxt "FIXME"
 msgid "User"
 msgstr "Wužiwar"
 
 #. TRANS: Menu item in personal group navigation menu.
-#, fuzzy
 msgctxt "MENU"
 msgid "Messages"
 msgstr "Powěsće"
@@ -9293,32 +8626,36 @@ msgstr "Njeznaty"
 #. TRANS: Plugin admin panel controls
 msgctxt "plugin"
 msgid "Disable"
-msgstr ""
+msgstr "Znjemóžnić"
 
 #. TRANS: Plugin admin panel controls
 msgctxt "plugin"
 msgid "Enable"
-msgstr ""
+msgstr "Zmóžnić"
 
+#. TRANS: Plugin description for a disabled plugin.
 msgctxt "plugin-description"
-msgid "(Plugin descriptions unavailable when disabled.)"
+msgid ""
+"(The plugin description is unavailable when a plugin has been disabled.)"
 msgstr ""
 
 #. TRANS: Menu item in primary navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Settings"
-msgstr "SMS-nastajenja"
+msgstr "Nastajenja"
 
 #. TRANS: Menu item title in primary navigation panel.
-#, fuzzy
 msgid "Change your personal settings."
-msgstr "Twoje profilowe nastajenja změnić"
+msgstr "Twoje wosobinske nastajenja změnić."
+
+#. TRANS: Menu item in primary navigation panel.
+msgctxt "MENU"
+msgid "Admin"
+msgstr "Administrator"
 
 #. TRANS: Menu item title in primary navigation panel.
-#, fuzzy
 msgid "Site configuration."
-msgstr "Wužiwarska konfiguracija"
+msgstr "Sydłowa konfiguracija."
 
 #. TRANS: Menu item in primary navigation panel.
 msgctxt "MENU"
@@ -9326,34 +8663,27 @@ msgid "Logout"
 msgstr "Wotzjewić"
 
 #. TRANS: Menu item title in primary navigation panel.
-#, fuzzy
 msgid "Logout from the site."
-msgstr "Ze sydła wotzjewić"
+msgstr "Ze sydła wotzjewić."
 
 #. TRANS: Menu item title in primary navigation panel.
-#, fuzzy
 msgid "Login to the site."
-msgstr "Při sydle přizjewić"
+msgstr "Pola sydla přizjewić."
 
-#. TRANS: Menu item in primary navigation panel.
-msgctxt "MENU"
-msgid "Search"
-msgstr "Pytać"
-
-#. TRANS: Menu item title in primary navigation panel.
-#, fuzzy
-msgid "Search the site."
-msgstr "Pytanske sydło"
+msgid "This profile has been silenced by site moderators"
+msgstr ""
 
 #. TRANS: H2 text for user subscription statistics.
-#, fuzzy
 msgid "Following"
-msgstr "Slědować"
+msgstr "Slědowacy"
 
 #. TRANS: H2 text for user subscriber statistics.
-#, fuzzy
 msgid "Followers"
-msgstr "Slědować"
+msgstr "Slědowace"
+
+#. TRANS: H2 text for user statistics.
+msgid "Statistics"
+msgstr "Statistika"
 
 #. TRANS: Label for user statistics.
 msgid "User ID"
@@ -9363,10 +8693,6 @@ msgstr "Wužiwarski ID"
 msgid "Member since"
 msgstr "Čłon wot"
 
-#. TRANS: Label for user statistics.
-msgid "Notices"
-msgstr "Zdźělenki"
-
 #. TRANS: Label for user statistics.
 #. TRANS: Average count of posts made per day since account registration.
 msgid "Daily average"
@@ -9377,9 +8703,8 @@ msgid "Groups"
 msgstr "Skupiny"
 
 #. TRANS: H2 text for user list membership statistics.
-#, fuzzy
 msgid "Lists"
-msgstr "Limity"
+msgstr "Lisćiny"
 
 #. TRANS: Server error displayed when using an unimplemented method.
 msgid "Unimplemented method."
@@ -9399,13 +8724,11 @@ msgid "Recent tags"
 msgstr ""
 
 #. TRANS: Menu item in search group navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Featured"
 msgstr "Wuběrne"
 
 #. TRANS: Menu item in search group navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Popular"
 msgstr "Woblubowany"
@@ -9413,7 +8736,7 @@ msgstr "Woblubowany"
 #. TRANS: Title for inbox tag cloud section.
 msgctxt "TITLE"
 msgid "Trending topics"
-msgstr ""
+msgstr "Woblubowane temy"
 
 #. TRANS: Client error displayed when return-to was defined without a target.
 msgid "No return-to arguments."
@@ -9424,9 +8747,8 @@ msgid "Repeat this notice?"
 msgstr "Tutu zdźělenku wospjetować?"
 
 #. TRANS: Button title to repeat a notice on notice repeat form.
-#, fuzzy
 msgid "Repeat this notice."
-msgstr "Tutu zdźělenku wospjetować"
+msgstr "Tutu zdźělenku wospjetować."
 
 #. TRANS: Description of role revoke form. %s is the role to be revoked.
 #, php-format
@@ -9438,10 +8760,9 @@ msgid "Page not found."
 msgstr "Strona njenamakana."
 
 #. TRANS: Title of form to sandbox a user.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Sandbox"
-msgstr "Pěskowy kašćik"
+msgstr "Hrajkanišćo"
 
 #. TRANS: Description of form to sandbox a user.
 msgid "Sandbox this user"
@@ -9457,6 +8778,7 @@ msgid "Keyword(s)"
 msgstr "Klu�owe hesła"
 
 #. TRANS: Button text for searching site.
+#. TRANS: Button text for search button on search form.
 #. TRANS: Button text to search profiles.
 msgctxt "BUTTON"
 msgid "Search"
@@ -9484,7 +8806,6 @@ msgid ""
 msgstr ""
 
 #. TRANS: Menu item in search group navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "People"
 msgstr "Ludźo"
@@ -9494,7 +8815,6 @@ msgid "Find people on this site"
 msgstr "Ludźi na tutym sydle pytać"
 
 #. TRANS: Menu item in search group navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Notices"
 msgstr "Zdźělenki"
@@ -9507,60 +8827,26 @@ msgstr "Wobsah zdźělenkow přepytać"
 msgid "Find groups on this site"
 msgstr "Skupiny na tutym sydle pytać"
 
-#. TRANS: Secondary navigation menu item leading to help on StatusNet.
-msgctxt "MENU"
-msgid "Help"
-msgstr "Pomoc"
-
-#. TRANS: Secondary navigation menu item leading to text about StatusNet site.
-#, fuzzy
-msgctxt "MENU"
-msgid "About"
-msgstr "Wo"
-
-#. TRANS: Secondary navigation menu item leading to Frequently Asked Questions.
-#, fuzzy
-msgctxt "MENU"
-msgid "FAQ"
-msgstr "Huste prašenja"
-
 #. TRANS: Secondary navigation menu item leading to Terms of Service.
-#, fuzzy
 msgctxt "MENU"
 msgid "TOS"
 msgstr "Wužiwarske wuměnjenja"
 
 #. TRANS: Secondary navigation menu item leading to privacy policy.
-#, fuzzy
 msgctxt "MENU"
 msgid "Privacy"
 msgstr "Priwatnosć"
 
 #. TRANS: Secondary navigation menu item. Leads to information about StatusNet and its license.
-#, fuzzy
 msgctxt "MENU"
 msgid "Source"
-msgstr "Žórło"
+msgstr "Žórłowy kod"
 
 #. TRANS: Secondary navigation menu item leading to version information on the StatusNet site.
-#, fuzzy
 msgctxt "MENU"
 msgid "Version"
 msgstr "Wersija"
 
-#. TRANS: Secondary navigation menu item leading to e-mail contact information on the
-#. TRANS: StatusNet site, where to report bugs, ...
-#, fuzzy
-msgctxt "MENU"
-msgid "Contact"
-msgstr "Kontakt"
-
-#. TRANS: Secondary navigation menu item. Leads to information about embedding a timeline widget.
-#, fuzzy
-msgctxt "MENU"
-msgid "Badge"
-msgstr "Plaketa"
-
 #. TRANS: Default title for section/sidebar widget.
 msgid "Untitled section"
 msgstr "Wotrězk bjez titula"
@@ -9570,17 +8856,15 @@ msgid "More..."
 msgstr "Wjace..."
 
 #. TRANS: Header in settings navigation panel.
-#, fuzzy
 msgctxt "HEADER"
 msgid "Settings"
-msgstr "SMS-nastajenja"
+msgstr "Nastajenja"
 
 #. TRANS: Menu item title in settings navigation panel.
 msgid "Change your profile settings"
 msgstr "Twoje profilowe nastajenja změnić"
 
 #. TRANS: Menu item in settings navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Avatar"
 msgstr "Awatar"
@@ -9590,7 +8874,6 @@ msgid "Upload an avatar"
 msgstr "Awatar nahrać"
 
 #. TRANS: Menu item in settings navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Password"
 msgstr "Hesło"
@@ -9600,21 +8883,15 @@ msgid "Change your password"
 msgstr "Twoje hesło změnić"
 
 #. TRANS: Menu item in settings navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Email"
 msgstr "E-mejl"
 
 #. TRANS: Menu item title in settings navigation panel.
 msgid "Change email handling"
-msgstr ""
-
-#. TRANS: Menu item title in settings navigation panel.
-msgid "Design your profile"
-msgstr "Twój profil wuhotować"
+msgstr "Wobchad z e-mejlu změnić"
 
 #. TRANS: Menu item in settings navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "URL"
 msgstr "URL"
@@ -9650,8 +8927,16 @@ msgstr "Zwiski"
 msgid "Authorized connected applications"
 msgstr "Awtorizowane zwjazane aplikacije"
 
+#. TRANS: Menu item in settings navigation panel.
+msgctxt "MENU"
+msgid "Old school"
+msgstr "Stara Å¡ula"
+
+#. TRANS: Menu item title in settings navigation panel.
+msgid "UI tweaks for old-school users"
+msgstr ""
+
 #. TRANS: Title of form to silence a user.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Silence"
 msgstr "Hubu zatykać"
@@ -9660,30 +8945,62 @@ msgstr "Hubu zatykać"
 msgid "Silence this user"
 msgstr "Tutomu wužiwarjej hubu zatykać"
 
+#. TRANS: Server error displayed when trying to create an anynymous OAuth consumer.
+msgid "Could not create anonymous consumer."
+msgstr "Anonymny přetrjebowar njeda so wutworić."
+
+#. TRANS: Server error displayed when trying to create an anynymous OAuth application.
+msgid "Could not create anonymous OAuth application."
+msgstr "Anonymna OAuth-aplikacija njeda so wutworić."
+
+#. TRANS: Exception thrown when no token association could be found.
+msgid ""
+"Could not find a profile and application associated with the request token."
+msgstr ""
+
+#. TRANS: Exception thrown when no access token can be issued.
+msgid "Could not issue access token."
+msgstr "Přistupny token njeda so wudać."
+
+#. TRANS: Exception thrown when a database error occurs.
+msgid "Database error inserting OAuth application user."
+msgstr "Zmylk datoweje banki při zasunjenju wužiwarja OAuth-aplikacije."
+
+#. TRANS: Exception thrown when a database error occurs.
+msgid "Database error updating OAuth application user."
+msgstr "Zmylk datoweje banki při aktualizowanju wužiwarja OAuth-aplikacije."
+
+#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
+msgid "Tried to revoke unknown token."
+msgstr ""
+
+#. TRANS: Exception thrown when an attempt is made to remove a revoked token.
+msgid "Failed to delete revoked token."
+msgstr ""
+
 #. TRANS: Menu item in local navigation menu.
-#, fuzzy
 msgctxt "MENU"
 msgid "Subscriptions"
 msgstr "Abonementy"
 
 #. TRANS: Menu item title in local navigation menu.
 #. TRANS: %s is a user nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "People %s subscribes to."
-msgstr "Ludźo, kotrychž %s abonuje"
+msgstr "Ludźo, kotrychž %s abonuje."
 
 #. TRANS: Menu item title in local navigation menu.
 #. TRANS: %s is a user nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "People subscribed to %s."
-msgstr "Ludźo, kotřiž su %s abonowali"
+msgstr "Ludźo, kotřiž su %s abonowali."
 
 #. TRANS: Menu item in local navigation menu.
 #. TRANS: %d is the number of pending subscription requests.
 #, php-format
 msgctxt "MENU"
 msgid "Pending (%d)"
-msgstr ""
+msgstr "Njes�injeny (%d)"
 
 #. TRANS: Menu item title in local navigation menu.
 #, php-format
@@ -9692,15 +9009,15 @@ msgstr ""
 
 #. TRANS: Menu item title in local navigation menu.
 #. TRANS: %s is a user nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "Groups %s is a member of."
-msgstr "Skupiny, w kotrychž %s je �łon"
+msgstr "Skupiny, w kotrychž %s je �łon."
 
 #. TRANS: Menu item title in local navigation menu.
 #. TRANS: %s is a user nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "List subscriptions by %s."
-msgstr "Ludźo, kotřiž su %s abonowali"
+msgstr "Abonomenty wot %s nalistować."
 
 #. TRANS: Menu item in local navigation menu.
 msgctxt "MENU"
@@ -9709,14 +9026,24 @@ msgstr "Přeprosyć"
 
 #. TRANS: Menu item title in local navigation menu.
 #. TRANS: %s is the StatusNet sitename.
-#, fuzzy, php-format
+#, php-format
 msgid "Invite friends and colleagues to join you on %s."
-msgstr "Přećelow a kolegow přeprosyć, so tebi na %s  přidružić"
+msgstr "Přećelow a kolegow přeprosyć, so tebi na %s  přidružić."
 
 #. TRANS: Form of form to subscribe to a user.
 msgid "Subscribe to this user"
 msgstr "Tutoho wužiwarja abonować"
 
+#. TRANS: Button text to subscribe to a user.
+#. TRANS: Button text for subscribing to a list.
+msgctxt "BUTTON"
+msgid "Subscribe"
+msgstr "Abonować"
+
+#. TRANS: Button title to subscribe to a user.
+msgid "Subscribe to this user."
+msgstr "Tutoho wužiwarja abonować."
+
 #. TRANS: Title of personal tag cloud section.
 msgid "People Tagcloud as self-tagged"
 msgstr ""
@@ -9726,10 +9053,9 @@ msgid "People Tagcloud as tagged"
 msgstr ""
 
 #. TRANS: Content displayed in a tag cloud section if there are no tags.
-#, fuzzy
 msgctxt "NOTAGS"
 msgid "None"
-msgstr "Žadyn"
+msgstr "Žana"
 
 #. TRANS: Server exception displayed if a theme name was invalid.
 msgid "Invalid theme name."
@@ -9738,6 +9064,7 @@ msgstr "Njepłaćiwe šatowe mjeno."
 #. TRANS: Exception thrown when a compressed theme is uploaded while no support present in PHP configuration.
 msgid "This server cannot handle theme uploads without ZIP support."
 msgstr ""
+"Tutón serwer njemóže z drastowymi nahraćemi bjez ZIP-podpěry wobchadźeć."
 
 #. TRANS: Server exception thrown when uploading a theme fails.
 msgid "The theme file is missing or the upload failed."
@@ -9749,9 +9076,8 @@ msgid "Failed saving theme."
 msgstr "Składowanje šata je so njeporadźiło."
 
 #. TRANS: Server exception thrown when an uploaded theme has an incorrect structure.
-#, fuzzy
 msgid "Invalid theme: Bad directory structure."
-msgstr "Njepłaćiwy šat: špatna rjadowakowa struktura."
+msgstr "Njepłaćiwa drasta: Špatna rjadowakowa struktura."
 
 #. TRANS: Client exception thrown when an uploaded theme is larger than the limit.
 #. TRANS: %d is the number of bytes of the uncompressed theme.
@@ -9765,9 +9091,8 @@ msgstr[2] ""
 msgstr[3] ""
 
 #. TRANS: Server exception thrown when an uploaded theme is incomplete.
-#, fuzzy
 msgid "Invalid theme archive: Missing file css/display.css"
-msgstr "Njepłaćiwy šatowy archiw: falowaca css-dataja/display.css"
+msgstr "Njepłaćiwy drastowy archiw: Falowaca css-dataja/display.css"
 
 #. TRANS: Server exception thrown when an uploaded theme has an incorrect file or folder name.
 msgid ""
@@ -9781,47 +9106,45 @@ msgstr "Šat wobsahuje njewěste datajowe sufiksy; to móhło njewěste być."
 
 #. TRANS: Server exception thrown when an uploaded theme contains a file type that is not allowed.
 #. TRANS: %s is the file type that is not allowed.
-#, fuzzy, php-format
+#, php-format
 msgid "Theme contains file of type \".%s\", which is not allowed."
-msgstr "Šat wobsahuje dataju typa '.%s', kotryž njeje dowoleny."
+msgstr "Drasta wobsahuje dataju typa \".%s\", kotryž njeje dowoleny."
 
 #. TRANS: Server exception thrown when an uploaded compressed theme cannot be opened.
 msgid "Error opening theme archive."
 msgstr "Zmylk při wo�injenju šatoweho archiwa."
 
 #. TRANS: Header for Notices section.
-#, fuzzy
 msgctxt "HEADER"
 msgid "Notices"
 msgstr "Zdźělenki"
 
 #. TRANS: Link to show replies for a notice.
 #. TRANS: %d is the number of replies to a notice and used for plural.
-#, fuzzy, php-format
+#, php-format
 msgid "Show reply"
 msgid_plural "Show all %d replies"
-msgstr[0] "Wjace pokazać"
-msgstr[1] "Wjace pokazać"
-msgstr[2] "Wjace pokazać"
-msgstr[3] "Wjace pokazać"
+msgstr[0] "Wotmołwu pokazać"
+msgstr[1] "Wšě %d wotmołwje pokazać"
+msgstr[2] "Wšě %d wotmołwy pokazać"
+msgstr[3] "Wšě %d wotmołwow pokazać"
 
 #. TRANS: Reference to the logged in user in favourite list.
 msgctxt "FAVELIST"
 msgid "You"
-msgstr ""
+msgstr "Ty"
 
 #. TRANS: For building a list such as "Jim, Bob, Mary and 5 others like this".
 #. TRANS: %1$s is a list of users, separated by a separator (default: ", "), %2$s is the last user in the list.
-#, fuzzy, php-format
+#, php-format
 msgctxt "FAVELIST"
 msgid "%1$s and %2$s"
-msgstr "%1$s - %2$s"
+msgstr "%1$s a %2$s"
 
 #. TRANS: List message for notice favoured by logged in user.
-#, fuzzy
 msgctxt "FAVELIST"
 msgid "You like this."
-msgstr "Woblubowane zdźělenki"
+msgstr "To ći lubi."
 
 #. TRANS: List message for when more than 4 people like something.
 #. TRANS: %%s is a list of users liking a notice, %d is the number over 4 that like the notice.
@@ -9846,60 +9169,69 @@ msgstr[2] ""
 msgstr[3] ""
 
 #. TRANS: List message for notice repeated by logged in user.
-#, fuzzy
 msgctxt "REPEATLIST"
-msgid "You have repeated this notice."
-msgstr "Sy tutu zdźělenku hižo wospjetował."
+msgid "You repeated this."
+msgstr "Sy to wospjetował."
 
-#. TRANS: List message for repeated notices.
-#. TRANS: %d is the number of users that have repeated a notice.
-#, fuzzy, php-format
-msgid "One person has repeated this notice."
-msgid_plural "%d people have repeated this notice."
-msgstr[0] "Tuta zdźělenka bu hižo wospjetowana."
-msgstr[1] "Tuta zdźělenka bu hižo wospjetowana."
-msgstr[2] "Tuta zdźělenka bu hižo wospjetowana."
-msgstr[3] "Tuta zdźělenka bu hižo wospjetowana."
+#. TRANS: List message for when more than 4 people repeat something.
+#. TRANS: %%s is a list of users liking a notice, %d is the number over 4 that like the notice.
+#. TRANS: Plural is decided on the total number of users liking the notice (count of %%s + %d).
+#, php-format
+msgid "%%s and %d other repeated this."
+msgid_plural "%%s and %d others repeated this."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#. TRANS: List message for favoured notices.
+#. TRANS: %%s is a list of users liking a notice.
+#. TRANS: Plural is based on the number of of users that have favoured a notice.
+#, php-format
+msgid "%%s repeated this."
+msgid_plural "%%s repeated this."
+msgstr[0] "%%s je to wospjetował."
+msgstr[1] "%%s stej to wospjetowałoj."
+msgstr[2] "%%s su to wospjetowali."
+msgstr[3] "%%s su to wospjetowali."
 
 #. TRANS: Form legend.
-#, fuzzy, php-format
+#, php-format
 msgid "Search and list people"
-msgstr "Pytanske sydło"
+msgstr "Ludźi pytać a nalistować"
 
 #. TRANS: Dropdown option for searching in profiles.
 msgid "Everything"
-msgstr ""
+msgstr "WÅ¡itko"
 
 #. TRANS: Dropdown option for searching in profiles.
-#, fuzzy
 msgid "Fullname"
 msgstr "Dospołne mjeno"
 
 #. TRANS: Dropdown option for searching in profiles.
 msgid "URI (Remote users)"
-msgstr ""
+msgstr "URI (Zdaleni wužiwarjo)"
 
 #. TRANS: Dropdown field label.
-#, fuzzy
 msgctxt "LABEL"
 msgid "Search in"
-msgstr "Pytanske sydło"
+msgstr "Pytać w"
 
 #. TRANS: Dropdown field title.
 msgid "Choose a field to search."
-msgstr ""
+msgstr "wubjerće polo za pytanje."
 
 #. TRANS: Form legend.
 #. TRANS: %1$s is a nickname, $2$s is a list.
-#, fuzzy, php-format
+#, php-format
 msgid "Remove %1$s from list %2$s"
-msgstr "%1$s - %2$s"
+msgstr "%1$s z lisćiny %2$s wotstronić"
 
 #. TRANS: Legend on form to add a profile to a list.
 #. TRANS: %1$s is a nickname, %2$s is a list.
-#, fuzzy, php-format
+#, php-format
 msgid "Add %1$s to list %2$s"
-msgstr "%1$s - %2$s"
+msgstr "%1$s lisćinje %2$s přidać"
 
 #. TRANS: Title for top posters section.
 msgid "Top posters"
@@ -9908,29 +9240,27 @@ msgstr ""
 #. TRANS: Option in drop-down of potential addressees.
 msgctxt "SENDTO"
 msgid "Everyone"
-msgstr ""
+msgstr "Kóždy"
 
 #. TRANS: Option in drop-down of potential addressees.
 #. TRANS: %s is a StatusNet sitename.
 #, php-format
 msgid "My colleagues at %s"
-msgstr ""
+msgstr "Moji kolegojo pola %s"
 
 #. TRANS: Label for drop-down of potential addressees.
-#, fuzzy
 msgctxt "LABEL"
 msgid "To:"
-msgstr "Komu"
+msgstr "Komu:"
 
 #. TRANS: Checkbox label in widget for selecting potential addressees to mark the notice private.
-#, fuzzy
 msgid "Private?"
-msgstr "Priwatny"
+msgstr "Priwatny?"
 
 #. TRANS: Client exception thrown in widget for selecting potential addressees when an invalid fill option was received.
-#, fuzzy, php-format
+#, php-format
 msgid "Unknown to value: \"%s\"."
-msgstr "Njeznaty werb: \"%s\"."
+msgstr "Hódnoće njeznaty: \"%s\"."
 
 #. TRANS: Title for the form to unblock a user.
 msgctxt "TITLE"
@@ -9938,10 +9268,9 @@ msgid "Unblock"
 msgstr "Wotblokować"
 
 #. TRANS: Title for unsandbox form.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Unsandbox"
-msgstr "Pěskowy kašćik"
+msgstr "Z hrajkanišća wotstronić"
 
 #. TRANS: Description for unsandbox form.
 msgid "Unsandbox this user"
@@ -9956,17 +9285,19 @@ msgid "Unsilence this user"
 msgstr "Tutoho wužiwarja wotprancować"
 
 #. TRANS: Form legend on unsubscribe form.
-#. TRANS: Button title on unsubscribe form.
 msgid "Unsubscribe from this user"
 msgstr "Tutoho wužiwarja wotskazać"
 
 #. TRANS: Button text on unsubscribe form.
 #. TRANS: Button text for unsubscribing from a list.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Unsubscribe"
 msgstr "Wotskazać"
 
+#. TRANS: Button title on unsubscribe form.
+msgid "Unsubscribe from this user."
+msgstr "Tutoho wužiwarja wotskazać."
+
 #. TRANS: Exception text shown when no profile can be found for a user.
 #. TRANS: %1$s is a user nickname, $2$d is a user ID (number).
 #, php-format
@@ -10058,8 +9389,6 @@ msgstr "Njepłaćiwy XML, korjeń XRD faluje."
 msgid "Getting backup from file '%s'."
 msgstr "Wobstaruje so zawěsćenje z dataje \"%s\"-"
 
-#~ msgid "%1$s and friends, page %2$d"
-#~ msgstr "%1$s a přećeljo, strona %2$d"
-
-#~ msgid "You and friends"
-#~ msgstr "Ty a přećeljo"
+#
+#~ msgid " "
+#~ msgstr " "
diff --git a/locale/hu/LC_MESSAGES/statusnet.po b/locale/hu/LC_MESSAGES/statusnet.po
index bf5866448a..0008489bc7 100644
--- a/locale/hu/LC_MESSAGES/statusnet.po
+++ b/locale/hu/LC_MESSAGES/statusnet.po
@@ -1,10 +1,12 @@
-# Translation of StatusNet - Core to Hungarian (Magyar)
+# Translation of StatusNet - Core to Hungarian (magyar)
 # Exported from translatewiki.net
 #
 # Author: Bdamokos
 # Author: Dani
+# Author: Dj
 # Author: Gerymate
 # Author: Glanthor Reviol
+# Author: Tgr
 # --
 # This file is distributed under the same license as the StatusNet package.
 #
@@ -12,14 +14,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:14+0000\n"
-"Language-Team: Hungarian <http://translatewiki.net/wiki/Portal:hu>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:10+0000\n"
+"Language-Team: Hungarian <https://translatewiki.net/wiki/Portal:hu>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-05-05 10:52:40+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2012-04-22 22:02:21+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: hu\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -33,12 +35,6 @@ msgid ""
 "again."
 msgstr ""
 
-#. TRANS: Error message.
-msgid ""
-"An important error occured, probably related to email setup. Check logfiles "
-"for more info."
-msgstr ""
-
 #. TRANS: Error message.
 msgid "An error occurred."
 msgstr "Hiba történt."
@@ -50,9 +46,8 @@ msgid ""
 msgstr ""
 
 #. TRANS: Error message displayed when trying to access a non-existing page.
-#, fuzzy
 msgid "Unknown page"
-msgstr "Ismeretlen fájltípus"
+msgstr "Ismeretlen oldal"
 
 #. TRANS: Error message displayed when trying to perform an undefined action.
 #. TRANS: Title for password recovery page when an unknown action has been specified.
@@ -100,12 +95,11 @@ msgstr "Új regisztrációk tiltása."
 msgid "Closed"
 msgstr "Zárva"
 
-#. TRANS: Title for button to save access settings in site admin panel.
-msgid "Save access settings"
-msgstr "Hozzáférések beállításainak mentése"
+#. TRANS: Button title to save access settings in site admin panel.
+msgid "Save access settings."
+msgstr "Hozzáférések beállításainak mentése."
 
-#. TRANS: Tooltip for button to save access settings in site admin panel.
-#. TRANS: Button text for saving theme settings.
+#. TRANS: Button text to save access settings in site admin panel.
 #. TRANS: Button label to save e-mail preferences.
 #. TRANS: Button label to save IM preferences.
 #. TRANS: Button text in the license admin panel.
@@ -121,7 +115,6 @@ msgstr "Hozzáférések beállításainak mentése"
 #. TRANS: Button text for saving "Other settings" in profile.
 #. TRANS: Button text to save user settings in user admin panel.
 #. TRANS: Button label in the "Edit application" form.
-#. TRANS: Button text on profile design page to save settings.
 #. TRANS: Text for save button on group edit form.
 #. TRANS: Button text to save tags for a profile.
 msgctxt "BUTTON"
@@ -160,10 +153,6 @@ msgstr "Nincs ilyen profil."
 msgid "No such list."
 msgstr "Nincs ilyen lista."
 
-#. TRANS: Client error displayed when trying to add an OMB 0.1 remote profile to a list.
-msgid "You cannot list an OMB 0.1 remote profile with this action."
-msgstr ""
-
 #. TRANS: Client error displayed when an unknown error occurs when adding a user to a list.
 #. TRANS: %s is a username.
 #, php-format
@@ -193,7 +182,6 @@ msgstr "Nincs ilyen lap."
 #. TRANS: Client error when user not found for an rss related action.
 #. TRANS: Client error displayed when no existing user is provided for a user's delivery device setting.
 #. TRANS: Client error displayed if a user could not be found.
-#. TRANS: Client error when user not found updating a profile background image.
 #. TRANS: Client error displayed updating profile image without having a user object.
 #. TRANS: Client error displayed when making an Atom API request for an unknown user.
 #. TRANS: Client error displayed when trying to block a non-existing user or a user from another site.
@@ -219,14 +207,11 @@ msgstr "Nincs ilyen lap."
 #. TRANS: Client error displayed when trying to get the RSS feed with favorites of a user that does not exist.
 #. TRANS: Client error displayed when requesting Friends of a Friend feed without providing a user nickname.
 #. TRANS: Client error displayed when requesting Friends of a Friend feed for an object that is not a user.
-#. TRANS: Client error displayed when trying to get a user hCard for a non-existing user.
 #. TRANS: Client error displayed trying to make a micro summary without providing a valid user.
 #. TRANS: Client error displayed trying to send a direct message to a non-existing user.
 #. TRANS: Client error displayed trying to use "one time password login" without using an existing user.
 #. TRANS: Client error displayed when referring to non-existing user.
 #. TRANS: Client error displayed trying to perform an action related to a non-existing user.
-#. TRANS: Form validation error on page for remote subscribe when no user was provided.
-#. TRANS: Form validation error on page for remote subscribe when no user profile was found.
 #. TRANS: Client error displayed when trying to reply to a non-exsting user.
 #. TRANS: Client error displayed when providing a non-existing nickname in a RSS 1.0 action.
 #. TRANS: Client error.
@@ -235,7 +220,6 @@ msgstr "Nincs ilyen lap."
 #. TRANS: Client error displayed trying to find a user by ID for a non-existing ID.
 #. TRANS: Client error displayed requesting groups for a non-existing user.
 #. TRANS: Client error displayed when user not found for an action.
-#. TRANS: Client error displayed providing a non-existing nickname.
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #. TRANS: Client error displayed when trying to perform a gallery action with an unknown user.
 #. TRANS: Client error displayed when trying to access a mailbox without providing a user.
@@ -254,6 +238,13 @@ msgstr "%s története"
 msgid "%s's home timeline"
 msgstr "%s története"
 
+#. TRANS: %s is user nickname.
+#. TRANS: Feed title.
+#. TRANS: %s is tagger's nickname.
+#, fuzzy, php-format
+msgid "Feed for friends of %s (Activity Streams JSON)"
+msgstr "%s barátainak hírcsatornája (Atom)"
+
 #. TRANS: %s is user nickname.
 #, php-format
 msgid "Feed for friends of %s (RSS 1.0)"
@@ -297,7 +288,7 @@ msgid ""
 "to them](%%%%action.newnotice%%%%?status_textarea=%3$s)."
 msgstr ""
 
-#. TRANS: Encoutagement displayed on empty timeline user pages for anonymous users.
+#. TRANS: Encouragement displayed on empty timeline user pages for anonymous users.
 #. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
 #. TRANS: Empty list message for page with replies for a user for not logged in users.
 #. TRANS: %1$s is a user nickname. This message contains a Markdown link in the form [link text](link).
@@ -309,6 +300,13 @@ msgid ""
 "post a notice to them."
 msgstr ""
 
+#. TRANS: Button text for inviting more users to the StatusNet instance.
+#. TRANS: Less business/enterprise-oriented language for public sites.
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Send invite"
+msgstr "Meghívások"
+
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Title of API timeline for a user and friends.
 #. TRANS: %s is a username.
@@ -317,8 +315,6 @@ msgstr ""
 #. TRANS: %s is a username.
 #. TRANS: Menu item title in personal group navigation menu.
 #. TRANS: %s is a username.
-#. TRANS: Menu item title in settings navigation panel.
-#. TRANS: %s is a username.
 #, php-format
 msgid "%s and friends"
 msgstr "%s és barátai"
@@ -356,7 +352,6 @@ msgstr ""
 #. TRANS: Server error thrown on database error updating SMS preferences.
 #. TRANS: Server error thrown on database error removing a registered SMS phone number.
 #. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
-#. TRANS: Server exception thrown on Profile design page when updating design settings fails.
 msgid "Could not update user."
 msgstr "Nem sikerült frissíteni a felhasználót."
 
@@ -371,7 +366,6 @@ msgstr "Nem sikerült menteni a profilt."
 
 #. TRANS: Client error displayed when the number of bytes in a POST request exceeds a limit.
 #. TRANS: %s is the number of bytes of the CONTENT_LENGTH.
-#. TRANS: Form validation error in design settings form. POST should remain untranslated.
 #, fuzzy, php-format
 msgid ""
 "The server was unable to handle that much POST data (%s byte) due to its "
@@ -386,24 +380,6 @@ msgstr[1] ""
 "A szerver nem tudott feldolgozni ennyi POST-adatot (%s bájtot) a jelenlegi "
 "konfigurációja miatt."
 
-#. TRANS: Client error displayed when saving design settings fails because of an empty id.
-#. TRANS: Client error displayed when saving design settings fails because of an empty result.
-#. TRANS: Client error displayed when a database error occurs inserting profile colours.
-#. TRANS: Client error displayed when a database error occurs updating profile colours.
-#. TRANS: Form validation error displayed when group design settings could not be saved because of an application issue.
-#. TRANS: Form validation error on Profile design page when saving design settings has failed.
-#. TRANS: Form validation error on Profile design page when updating design settings has failed.
-msgid "Unable to save your design settings."
-msgstr "Nem sikerült elmenteni a megjelenítési beállításaid."
-
-#. TRANS: Error displayed when updating design settings fails.
-#. TRANS: Client error displayed when a database error occurs updating profile colours.
-#. TRANS: Form validation error on Profile design page when updating design settings has failed.
-#. TRANS: Error message displayed if design settings could not be saved.
-#. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
-msgid "Could not update your design."
-msgstr "Nem sikerült frissíteni a megjelenítést."
-
 #. TRANS: Title for Atom feed.
 msgctxt "ATOM"
 msgid "Main"
@@ -450,6 +426,22 @@ msgstr "Nem sikerült a felhasználó blokkolása."
 msgid "Unblock user failed."
 msgstr "Nem sikerült a felhasználó blokkjának feloldása."
 
+#. TRANS: Client exception thrown when no conversation ID is given.
+#, fuzzy
+msgid "No conversation ID."
+msgstr "Beszélgetés"
+
+#. TRANS: Client exception thrown when referring to a non-existing conversation ID (%d).
+#, fuzzy, php-format
+msgid "No conversation with ID %d."
+msgstr "Beszélgetés"
+
+#. TRANS: Title for conversion timeline.
+#, fuzzy
+msgctxt "TITLE"
+msgid "Conversation"
+msgstr "Beszélgetés"
+
 #. TRANS: Title. %s is a user nickname.
 #, php-format
 msgid "Direct messages from %s"
@@ -495,6 +487,8 @@ msgstr ""
 "Nem küldhetsz közvetlen üzenetet olyan felhasználóknak, akik nem a barátaid."
 
 #. TRANS: Client error displayed trying to direct message self (403).
+#. TRANS: Client error displayed trying to send a direct message to self.
+#. TRANS: Error text shown when trying to send a direct message to self.
 #, fuzzy
 msgid ""
 "Do not send a message to yourself; just say it to yourself quietly instead."
@@ -726,7 +720,6 @@ msgstr "%s csoportok"
 
 #. TRANS: Client error displayed when trying to edit a group without being an admin.
 #. TRANS: Client error displayed trying to edit a group while not being a group admin.
-#. TRANS: Client error displayed trying to change group design settings without being a (group) admin.
 #. TRANS: Client error displayed when trying to change group logo settings while not being a group admin.
 msgid "You must be an admin to edit the group."
 msgstr "A csoport szerkesztéséhez adminisztrátornak kell lenned."
@@ -835,7 +828,6 @@ msgstr "Adatbázishiba történt az oauth_toke_association behelyezésekor."
 
 #. TRANS: Client error given on when invalid data was passed through a form in the OAuth API.
 #. TRANS: Unexpected validation error on avatar upload form.
-#. TRANS: Client error displayed when the submitted form contains unexpected data.
 #. TRANS: Client error displayed submitting invalid form data for edit application.
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
 #. TRANS: Form validation error message when an unsupported argument is used.
@@ -844,7 +836,6 @@ msgstr "Adatbázishiba történt az oauth_toke_association behelyezésekor."
 #. TRANS: Client error when submitting a form with unexpected information.
 #. TRANS: Client error displayed when unexpected data is posted in the password recovery form.
 #. TRANS: Message given submitting a form with an unknown action in SMS settings.
-#. TRANS: Unknown form validation error in design settings form.
 msgid "Unexpected form submission."
 msgstr "Váratlan űrlapbeküldés."
 
@@ -885,7 +876,6 @@ msgstr "Fiók"
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Field label on account registration page.
-#. TRANS: Label for nickname on user authorisation page.
 #. TRANS: Field label on group edit form.
 #. TRANS: Dropdown option for searching in profiles.
 msgid "Nickname"
@@ -1204,12 +1194,9 @@ msgstr "Be kell jelentkezned hogy elhagyhass egy csoportot."
 #. TRANS: Client error displayed when requesting Friends of a Friend feed for a nickname that is not a group.
 #. TRANS: Client error displayed trying to block a user from a group while specifying a non-existing group.
 #. TRANS: Client error displayed referring to a group's permalink for a non-existing group ID.
-#. TRANS: Client error displayed trying to change group design settings while providing a nickname for a non-existing group.
 #. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
 #. TRANS: Client error displayed when trying to view group members for a non-existing group.
 #. TRANS: Client error displayed when trying to view group members for an object that is not a group.
-#. TRANS: Client error displayed when trying to view group members for a non-existing group.
-#. TRANS: Client error displayed when trying to view group members for an object that is not a group.
 #. TRANS: Client error displayed when requesting a group RSS feed for group that does not exist.
 #. TRANS: Client error displayed when requesting a group RSS feed for an object that is not a group.
 #. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
@@ -1218,10 +1205,10 @@ msgstr "Be kell jelentkezned hogy elhagyhass egy csoportot."
 #. TRANS: Client error displayed when trying to leave a non-local group.
 #. TRANS: Client error displayed when trying to leave a non-existing group.
 #. TRANS: Client error displayed when providing an invalid group ID on the Make Admin page.
-#. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
-#. TRANS: Client error displayed if no local group with a given name was found requesting group page.
 #. TRANS: Command exception text shown when a group is requested that does not exist.
 #. TRANS: Error text shown when trying to leave a group that does not exist.
+#. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
+#. TRANS: Client error displayed if no local group with a given name was found requesting group page.
 msgid "No such group."
 msgstr "Nincs ilyen csoport."
 
@@ -1261,7 +1248,7 @@ msgstr "A csoportban lévő felhasználók listája."
 #. TRANS: Client error displayed trying to approve/deny group membership.
 #. TRANS: Client error displayed trying to approve/deny subscription.
 msgid "Internal error: received neither cancel nor abort."
-msgstr ""
+msgstr "Belső hiba: se cancel se abort nem érkezett."
 
 #. TRANS: Client error displayed trying to approve/deny group membership.
 #. TRANS: Client error displayed trying to approve/deny  subscription
@@ -1290,6 +1277,7 @@ msgid "Join request canceled."
 msgstr "Csatlakozási kérelem jóváhagyva."
 
 #. TRANS: Client error displayed trying to approve subscription for a non-existing request.
+#. TRANS: %s is a user nickname.
 #, fuzzy, php-format
 msgid "%s is not in the moderation queue for your subscriptions."
 msgstr "A csoportban lévő felhasználók listája."
@@ -1455,7 +1443,6 @@ msgstr "Nincs ilyen csatolmány."
 #. TRANS: Client error displayed trying to get an avatar without providing a nickname.
 #. TRANS: Client error displayed when requesting a list of blocked users for a group without providing a group nickname.
 #. TRANS: Client error displayed trying to edit a group while not proving a nickname for the group to edit.
-#. TRANS: Client error displayed trying to change group design settings without providing a group nickname.
 #. TRANS: Client error displayed when trying to change group logo settings without providing a nickname.
 #. TRANS: Client error displayed when trying to view group members without providing a group nickname.
 #. TRANS: Client error displayed when requesting a group RSS feed without providing a group nickname.
@@ -1755,6 +1742,18 @@ msgstr "A(z) „%s� cím meg van erősítve a fiókodhoz."
 msgid "Conversation"
 msgstr "Beszélgetés"
 
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#, fuzzy
+msgid "Conversation feed (Activity Streams JSON)"
+msgstr "%s Atom hírcsatornája"
+
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#, fuzzy
+msgid "Conversation feed (RSS 2.0)"
+msgstr "%s RSS 2.0 hírcsatornája"
+
 #. TRANS: Title for conversation page.
 #. TRANS: Title for page that shows a notice.
 #, fuzzy
@@ -1820,7 +1819,7 @@ msgstr "Nem törölhetsz felhasználókat."
 
 #. TRANS: Button title for user account deletion.
 #, fuzzy
-msgid "Permanently delete your account"
+msgid "Permanently delete your account."
 msgstr "Nem törölhetsz felhasználókat."
 
 #. TRANS: Client error displayed trying to delete an application while not logged in.
@@ -1975,151 +1974,6 @@ msgstr "Ne töröljük ezt a hírt"
 msgid "Delete this user."
 msgstr "Töröljük ezt a felhasználót"
 
-#. TRANS: Message used as title for design settings for the site.
-msgid "Design"
-msgstr "Megjelenés"
-
-#. TRANS: Instructions for design adminsitration panel.
-msgid "Design settings for this StatusNet site"
-msgstr "A StatusNet-oldal kinézetének beállítása"
-
-#. TRANS: Client error displayed when a logo URL does is not valid.
-msgid "Invalid logo URL."
-msgstr "Érvénytelen logó URL."
-
-#. TRANS: Client error displayed when an SSL logo URL is invalid.
-#, fuzzy
-msgid "Invalid SSL logo URL."
-msgstr "Érvénytelen logó URL."
-
-#. TRANS: Client error displayed when a theme is submitted through the form that is not in the theme list.
-#. TRANS: %s is the chosen unavailable theme.
-#, php-format
-msgid "Theme not available: %s."
-msgstr "A téma nem áll rendelkezésre: %s."
-
-#. TRANS: Fieldset legend for form to change logo.
-msgid "Change logo"
-msgstr "Logó megváltoztatása"
-
-#. TRANS: Field label for StatusNet site logo.
-msgid "Site logo"
-msgstr "Oldal logója"
-
-#. TRANS: Field label for SSL StatusNet site logo.
-#, fuzzy
-msgid "SSL logo"
-msgstr "Oldal logója"
-
-#. TRANS: Fieldset legend for form change StatusNet site's theme.
-msgid "Change theme"
-msgstr "Téma megváltoztatása"
-
-#. TRANS: Field label for dropdown to choose site theme.
-msgid "Site theme"
-msgstr "Webhely-téma"
-
-#. TRANS: Title for field label for dropdown to choose site theme.
-msgid "Theme for the site."
-msgstr "A webhely témája."
-
-#. TRANS: Field label for uploading a cutom theme.
-msgid "Custom theme"
-msgstr "Egyéni téma"
-
-#. TRANS: Form instructions for uploading a cutom StatusNet theme.
-msgid "You can upload a custom StatusNet theme as a .ZIP archive."
-msgstr "Feltölthetsz egy egyedi StatusNet-témát ZIP archívumon keresztül."
-
-#. TRANS: Fieldset legend for theme background image.
-msgid "Change background image"
-msgstr "Háttérkép megváltoztatása"
-
-#. TRANS: Field label for background image on theme designer page.
-#. TRANS: Field label for background color selector.
-#. TRANS: Label on profile design page for setting a profile page background colour.
-msgid "Background"
-msgstr "Háttér"
-
-#. TRANS: Form guide for background image upload form on theme designer page.
-#, php-format
-msgid ""
-"You can upload a background image for the site. The maximum file size is %1"
-"$s."
-msgstr ""
-"Feltölthetsz egy háttérképet az oldalnak. A fájl maximális mérete %1$s lehet."
-
-#. TRANS: Used as radio button label to add a background image.
-msgid "On"
-msgstr "Be"
-
-#. TRANS: Used as radio button label to not add a background image.
-msgid "Off"
-msgstr "Ki"
-
-#. TRANS: Form guide for turning background image on or off on theme designer page.
-#. TRANS: Form guide for a set of radio buttons on the profile design page that will enable or disable
-#. TRANS: use of the uploaded profile image.
-msgid "Turn background image on or off."
-msgstr "Háttérkép be- vagy kikapcsolása."
-
-#. TRANS: Checkbox label to title background image on theme designer page.
-#. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
-msgid "Tile background image"
-msgstr "Háttérkép csempézése"
-
-#. TRANS: Fieldset legend for theme colors.
-msgid "Change colors"
-msgstr "Színek módosítása"
-
-#. TRANS: Field label for content color selector.
-#. TRANS: Label on profile design page for setting a profile page content colour.
-msgid "Content"
-msgstr "Tartalom"
-
-#. TRANS: Field label for sidebar color selector.
-#. TRANS: Label on profile design page for setting a profile page sidebar colour.
-msgid "Sidebar"
-msgstr "Oldalsáv"
-
-#. TRANS: Field label for text color selector.
-#. TRANS: Label on profile design page for setting a profile page text colour.
-msgid "Text"
-msgstr "Szöveg"
-
-#. TRANS: Field label for link color selector.
-#. TRANS: Label on profile design page for setting a profile page links colour.
-msgid "Links"
-msgstr "Hivatkozások"
-
-#. TRANS: Fieldset legend for advanced theme design settings.
-msgid "Advanced"
-msgstr "Haladó"
-
-#. TRANS: Field label for custom CSS.
-msgid "Custom CSS"
-msgstr "Egyedi CSS"
-
-#. TRANS: Button text for resetting theme settings.
-msgctxt "BUTTON"
-msgid "Use defaults"
-msgstr "Alapértelmezett beállítások használata"
-
-#. TRANS: Title for button for resetting theme settings.
-#. TRANS: Title for button on profile design page to reset all colour settings to default.
-msgid "Restore default designs."
-msgstr "Alapértelmezett beállítások használata"
-
-#. TRANS: Title for button for resetting theme settings.
-#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-msgid "Reset back to default."
-msgstr "Alapértelmezett beállítások visszaállítása"
-
-#. TRANS: Title for button for saving theme settings.
-#. TRANS: Title for button on profile design page to save settings.
-msgid "Save design."
-msgstr "A kinézet mentése."
-
 #. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
 msgid "This notice is not a favorite!"
 msgstr "Ez a hír nincs a kedvenceid között!"
@@ -2134,6 +1988,85 @@ msgstr "Hozzáadás a kedvencekhez"
 msgid "No such document \"%s\"."
 msgstr "Nincs ilyen dokumentum: „%s�"
 
+#. TRANS: Menu item in administrator navigation panel.
+#. TRANS: Menu item in default local navigation panel.
+#. TRANS: Menu item in personal group navigation menu.
+#, fuzzy
+msgctxt "MENU"
+msgid "Home"
+msgstr "Otthon"
+
+msgctxt "MENU"
+msgid "Docs"
+msgstr ""
+
+#. TRANS: Secondary navigation menu item leading to help on StatusNet.
+#, fuzzy
+msgctxt "MENU"
+msgid "Help"
+msgstr "Súgó"
+
+#, fuzzy
+msgid "Getting started"
+msgstr "A beállításokat elmentettük."
+
+#. TRANS: Secondary navigation menu item leading to text about StatusNet site.
+#, fuzzy
+msgctxt "MENU"
+msgid "About"
+msgstr "Névjegy"
+
+#, fuzzy
+msgid "About this site"
+msgstr "Ezen felhasználó blokkjának feloldása"
+
+#. TRANS: Secondary navigation menu item leading to Frequently Asked Questions.
+#, fuzzy
+msgctxt "MENU"
+msgid "FAQ"
+msgstr "GyIK"
+
+msgid "Frequently asked questions"
+msgstr ""
+
+#. TRANS: Secondary navigation menu item leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+#, fuzzy
+msgctxt "MENU"
+msgid "Contact"
+msgstr "Kapcsolat"
+
+#, fuzzy
+msgid "Contact info"
+msgstr "Kapcsolat"
+
+#, fuzzy
+msgctxt "MENU"
+msgid "Tags"
+msgstr "Címkék"
+
+msgid "Using tags"
+msgstr ""
+
+#. TRANS: Menu item in default local navigation panel.
+#. TRANS: Menu item in search group navigation panel.
+#. TRANS: Menu item in local navigation menu.
+#, fuzzy
+msgctxt "MENU"
+msgid "Groups"
+msgstr "Csoportok"
+
+#, fuzzy
+msgid "Using groups"
+msgstr "A felhasználó csoportjai"
+
+msgctxt "MENU"
+msgid "API"
+msgstr ""
+
+msgid "RESTful API"
+msgstr ""
+
 #. TRANS: Title for "Edit application" form.
 #. TRANS: Form legend.
 msgid "Edit application"
@@ -2296,7 +2229,7 @@ msgid ""
 "subscriptions to it. Do you still want to continue?"
 msgstr ""
 
-#. TRANS: TRANS: Server error displayed when updating a list fails.
+#. TRANS: Server error displayed when updating a list fails.
 msgid "Could not update list."
 msgstr ""
 
@@ -2313,7 +2246,7 @@ msgstr "Beállíthatod, milyen email-eket kapj a(z) %%site.name%% webhelyről."
 #. TRANS: Form legend for e-mail settings form.
 #. TRANS: Field label for e-mail address input in e-mail settings form.
 msgid "Email address"
-msgstr "Email-cím"
+msgstr "E-mail cím"
 
 #. TRANS: Form note in e-mail settings form.
 msgid "Current confirmed email address."
@@ -2493,7 +2426,6 @@ msgstr "Nincs bejövő e-mail cím."
 #. TRANS: Server error thrown on database error removing incoming e-mail address.
 #. TRANS: Server error thrown on database error adding incoming e-mail address.
 #. TRANS: Server error displayed when the user could not be updated in SMS settings.
-#, fuzzy
 msgid "Could not update user record."
 msgstr "Nem sikerült frissíteni a felhasználó rekordját."
 
@@ -2601,40 +2533,6 @@ msgstr "Nincs melléklet."
 msgid "No uploaded attachments."
 msgstr "Nincs feltöltött melléklet."
 
-#. TRANS: Client error displayed when subscribing to a remote profile and an unexpected response is received.
-msgid "Not expecting this response!"
-msgstr "Nem várt válasz!"
-
-#. TRANS: Client error displayed when subscribing to a remote profile that does not exist.
-msgid "User being listened to does not exist."
-msgstr "A felhasználó akire figyelsz nem létezik."
-
-#. TRANS: Client error displayed when subscribing to a remote profile that is a local profile.
-#. TRANS: Client error displayed when using remote subscribe for a local entity.
-msgid "You can use the local subscription!"
-msgstr "Figyelemmel követheted helyben!"
-
-#. TRANS: Client error displayed when subscribing to a remote profile that is blocked form subscribing to.
-msgid "That user has blocked you from subscribing."
-msgstr "Az a felhasználó blokkolta hogy figyelemmel kövesd."
-
-#. TRANS: Client error displayed when subscribing to a remote profile without providing an authorised token.
-msgid "You are not authorized."
-msgstr "Nincs jogosultságod."
-
-#. TRANS: Client error displayed when subscribing to a remote profile and conversion of the request token to access token fails.
-msgid "Could not convert request token to access token."
-msgstr ""
-
-#. TRANS: Client error displayed when subscribing to a remote profile fails because of an unsupported version of the OMB protocol.
-msgid "Remote service uses unknown version of OMB protocol."
-msgstr ""
-
-#. TRANS: Server error displayed when subscribing to a remote profile fails because the remote profile could not be updated.
-#. TRANS: Exception thrown when updating a remote profile fails in OAuth store.
-msgid "Error updating remote profile."
-msgstr "Nem sikerült frissíteni a távoli profilt."
-
 #. TRANS: Client error displayed when requesting a non-existent file.
 msgid "No such file."
 msgstr "Nincs ilyen fájl."
@@ -2725,30 +2623,6 @@ msgstr ""
 msgid "No ID."
 msgstr "Nincs ID."
 
-#. TRANS: Client error displayed trying to change group design settings while not logged in.
-msgid "You must be logged in to edit a group."
-msgstr "Csoport szerkesztéséhez be kell jelentkezned."
-
-#. TRANS: Title group design settings page.
-msgid "Group design"
-msgstr "A csoport megjelenése"
-
-#. TRANS: Instructions for group design settings page.
-msgid ""
-"Customize the way your group looks with a background image and a colour "
-"palette of your choice."
-msgstr ""
-
-#. TRANS: Form validation error displayed when group design settings could not be updated because of an application issue.
-#, fuzzy
-msgid "Unable to update your design settings."
-msgstr "Nem sikerült elmenteni a megjelenítési beállításaid."
-
-#. TRANS: Form text to confirm saved group design settings.
-#. TRANS: Confirmation message on Profile design page when saving design settings has succeeded.
-msgid "Design preferences saved."
-msgstr "Design beállítások elmentve."
-
 #. TRANS: Title for group logo settings page.
 #. TRANS: Group logo form legend.
 msgid "Group logo"
@@ -2914,8 +2788,8 @@ msgstr "IM beállítások"
 #. TRANS: the order and formatting of link text and link should remain unchanged.
 #, php-format
 msgid ""
-"You can send and receive notices through instant messaging [instant messages]"
-"(%%doc.im%%). Configure your addresses and settings below."
+"You can send and receive notices through [instant messaging](%%doc.im%%). "
+"Configure your addresses and settings below."
 msgstr ""
 
 #. TRANS: Message given in the IM settings if IM is not enabled on the site.
@@ -3126,29 +3000,6 @@ msgstr ""
 "Ezen űrlap segítségével meghívhatsz barátokat és kollégákat erre a "
 "szolgáltatásra."
 
-#. TRANS: Field label for a list of e-mail addresses.
-msgid "Email addresses"
-msgstr "E-mail címek"
-
-#. TRANS: Tooltip for field label for a list of e-mail addresses.
-#, fuzzy
-msgid "Addresses of friends to invite (one per line)."
-msgstr "A meghívandó barátaid címei (soronként egy)"
-
-#. TRANS: Field label for a personal message to send to invitees.
-msgid "Personal message"
-msgstr "Személyes üzenet"
-
-#. TRANS: Tooltip for field label for a personal message to send to invitees.
-msgid "Optionally add a personal message to the invitation."
-msgstr "Megadhatsz egy személyes üzenetet a meghívóhoz."
-
-#. TRANS: Send button for inviting friends
-#. TRANS: Button text for sending notice.
-msgctxt "BUTTON"
-msgid "Send"
-msgstr "Küldés"
-
 #. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral
 #. TRANS: singular 3rd-person pronoun in English. %1$s is the inviting user, $2$s is
 #. TRANS: the StatusNet sitename.
@@ -3284,12 +3135,6 @@ msgstr "A licenc mellett megjelenő kép URL-címe."
 msgid "Save license settings."
 msgstr "Licencbeállítások mentése"
 
-#. TRANS: Client error displayed when trying to log in while already logged in.
-#. TRANS: Client error displayed trying to use "one time password login" when already logged in.
-#. TRANS: Client error displayed when trying to register while already logged in.
-msgid "Already logged in."
-msgstr "Már be vagy jelentkezve."
-
 #. TRANS: Form validation error displayed when trying to log in with incorrect credentials.
 msgid "Incorrect username or password."
 msgstr "Rossz felhasználónév vagy jelszó."
@@ -3404,9 +3249,9 @@ msgstr "Meg kell adnod forrás URL-t."
 msgid "Could not create application."
 msgstr "Nem sikerült létrehozni az alkalmazást."
 
-#, fuzzy
+#. TRANS: Form validation error messages displayed when uploading an invalid application logo.
 msgid "Invalid image."
-msgstr "Érvénytelen méret."
+msgstr "Érvénytelen kép."
 
 #. TRANS: Title for form to create a group.
 msgid "New group"
@@ -3443,12 +3288,6 @@ msgstr "Nincs tartalom!"
 msgid "No recipient specified."
 msgstr "Nincs címzett megadva."
 
-#. TRANS: Client error displayed trying to send a direct message to self.
-#. TRANS: Error text shown when trying to send a direct message to self.
-msgid ""
-"Don't send a message to yourself; just say it to yourself quietly instead."
-msgstr "Ne küldj üzenetet magadnak, helyette mondd el halkan."
-
 #. TRANS: Page title after sending a direct message.
 msgid "Message sent"
 msgstr "Üzenet elküldve"
@@ -3647,6 +3486,33 @@ msgstr "Csak %s URL-címeket, sima HTTP-n keresztül! Köszi!"
 msgid "Not a supported data format."
 msgstr "Nem támogatott adatformátum."
 
+#. TRANS: Page title for profile settings.
+#, fuzzy
+msgid "Old school UI settings"
+msgstr "IM beállítások"
+
+#. TRANS: Usage instructions for profile settings.
+msgid "If you like it \"the old way\", you can set that here."
+msgstr ""
+
+#. TRANS: Confirmation shown when user profile settings are saved.
+#. TRANS: Message after successful saving of administrative settings.
+msgid "Settings saved."
+msgstr "A beállításokat elmentettük."
+
+msgid "Only stream mode (no conversations) in timelines"
+msgstr ""
+
+msgid "Show conversation page as hierarchical trees"
+msgstr ""
+
+msgid "Show nicknames (not full names) in timelines"
+msgstr ""
+
+#. TRANS: Button text to save a list.
+msgid "Save"
+msgstr "Mentés"
+
 #. TRANS: ShortName in the OpenSearch interface when trying to find users.
 msgid "People Search"
 msgstr "Emberek keresése"
@@ -3655,6 +3521,11 @@ msgstr "Emberek keresése"
 msgid "Notice Search"
 msgstr "Hírek keresése"
 
+#. TRANS: Client error displayed trying to use "one time password login" when already logged in.
+#. TRANS: Client error displayed when trying to register while already logged in.
+msgid "Already logged in."
+msgstr "Már be vagy jelentkezve."
+
 #. TRANS: Client error displayed trying to use "one time password login" without specifying a user.
 msgid "No user ID specified."
 msgstr "Nincs megadva a felhasználó azonosítója."
@@ -3724,7 +3595,7 @@ msgid "Confirm"
 msgstr "Megerősítés"
 
 #. TRANS: Field title on page where to change password.
-#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
+#. TRANS: Title for field label for password reset form where the password has to be typed again.
 #. TRANS: Field title on account registration page.
 msgid "Same as password above."
 msgstr "Ugyanaz, mint a fenti jelszó."
@@ -3782,12 +3653,6 @@ msgstr "A témakönyvtár nem olvasható: %s."
 msgid "Avatar directory not writable: %s."
 msgstr "Az avatárkönyvtár nem írható: %s."
 
-#. TRANS: Client error in Paths admin panel.
-#. TRANS: %s is the background directory that could not be written to.
-#, php-format
-msgid "Background directory not writable: %s."
-msgstr "A háttérkönyvtár nem írható: %s."
-
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the locales directory that could not be read from.
 #, php-format
@@ -3911,32 +3776,6 @@ msgstr "Avatar-könyvtár"
 msgid "Directory where avatars are located."
 msgstr "A nyelvi fájlok elérési útvonala"
 
-#. TRANS: Fieldset legend in Paths admin panel.
-msgid "Backgrounds"
-msgstr "Hátterek"
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-#, fuzzy
-msgid "Server for backgrounds."
-msgstr "A webhely témája."
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-msgid "Web path to backgrounds."
-msgstr "Hátterek webes elérési útja."
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-msgid "Server for backgrounds on SSL pages."
-msgstr ""
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-msgid "Web path to backgrounds on SSL pages."
-msgstr ""
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-#, fuzzy
-msgid "Directory where backgrounds are located."
-msgstr "A nyelvi fájlok elérési útvonala"
-
 #. TRANS: Fieldset legens in Paths admin panel.
 msgid "Attachments"
 msgstr "Csatolmányok"
@@ -3966,7 +3805,6 @@ msgid "Directory where attachments are located."
 msgstr "A nyelvi fájlok elérési útvonala"
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#, fuzzy
 msgctxt "LEGEND"
 msgid "SSL"
 msgstr "SSL"
@@ -3998,8 +3836,9 @@ msgid "Server to direct SSL requests to."
 msgstr ""
 
 #. TRANS: Button title text to store form data in the Paths admin panel.
-msgid "Save paths"
-msgstr "Elérési útvonalak mentése"
+#, fuzzy
+msgid "Save path settings."
+msgstr "Mentsük el a webhely beállításait"
 
 #. TRANS: Instructions for the "People search" page.
 #. TRANS: %%site.name%% is the name of the StatusNet site.
@@ -4124,14 +3963,17 @@ msgstr "Menjünk"
 #. TRANS: Message displayed for anonymous users on page that displays lists by a user.
 #. TRANS: This message contains Markdown links in the form [description](links).
 #. TRANS: %s is a tagger nickname.
-#, php-format
+#, fuzzy, php-format
 msgid ""
 "These are lists created by **%s**. Lists are how you sort similar people on %"
 "%%%site.name%%%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
 "blogging) service based on the Free Software [StatusNet](http://status.net/) "
 "tool. You can easily keep track of what they are doing by subscribing to the "
-"tag's timeline."
+"list's timeline."
 msgstr ""
+"**%s** %%%%site.name%%%% felhasználó, [mikroblogot](http://hu.wikipedia.org/"
+"wiki/Mikroblog#Mikroblog) ír egy webhelyen, ami a szabad [StatusNet](http://"
+"status.net/) szoftverre épült. "
 
 #. TRANS: Message displayed on page that displays lists by a user when there are none.
 #. TRANS: This message contains Markdown links in the form [description](links).
@@ -4153,14 +3995,17 @@ msgstr ""
 #. TRANS: Message displayed for anonymous users on page that displays lists for a user.
 #. TRANS: This message contains Markdown links in the form [description](links).
 #. TRANS: %s is a tagger nickname.
-#, php-format
+#, fuzzy, php-format
 msgid ""
 "These are lists for **%s**. lists are how you sort similar people on %%%%"
 "site.name%%%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
 "blogging) service based on the Free Software [StatusNet](http://status.net/) "
 "tool. You can easily keep track of what they are doing by subscribing to the "
-"tag's timeline."
+"list's timeline."
 msgstr ""
+"**%s** %%%%site.name%%%% felhasználó, [mikroblogot](http://hu.wikipedia.org/"
+"wiki/Mikroblog#Mikroblog) ír egy webhelyen, ami a szabad [StatusNet](http://"
+"status.net/) szoftverre épült. "
 
 #. TRANS: Message displayed on page that displays lists a user was added to when there are none.
 #. TRANS: This message contains Markdown links in the form [description](links).
@@ -4255,16 +4100,6 @@ msgid ""
 "All default plugins have been disabled from the site's configuration file."
 msgstr ""
 
-#. TRANS: Client error displayed if the notice posted has too many characters.
-msgid "Invalid notice content."
-msgstr "Érvénytelen megjegyzéstartalom."
-
-#. TRANS: Exception thrown if a notice's license is not compatible with the StatusNet site license.
-#. TRANS: %1$s is the notice license, %2$s is the StatusNet site's license.
-#, fuzzy, php-format
-msgid "Notice license \"%1$s\" is not compatible with site license \"%2$s\"."
-msgstr "A hír licence ‘%1$s’ nem kompatibilis a webhely licencével ‘%2$s’."
-
 #. TRANS: Client error displayed when trying to add an unindentified field to profile.
 #. TRANS: %s is a field name.
 #, php-format
@@ -4365,6 +4200,8 @@ msgid "Share my current location when posting notices"
 msgstr "Tegyük közzé az aktuális tartózkodási helyem amikor híreket küldök"
 
 #. TRANS: Field label in form for profile settings.
+#. TRANS: Title for group tag cloud section.
+#. TRANS: %s is a group name.
 msgid "Tags"
 msgstr "Címkék"
 
@@ -4382,9 +4219,8 @@ msgid "Language"
 msgstr "Nyelv"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#, fuzzy
 msgid "Preferred language."
-msgstr "Előnyben részesített nyelv"
+msgstr "Előnyben részesített nyelv."
 
 #. TRANS: Dropdownlist label in form for profile settings.
 msgid "Timezone"
@@ -4395,9 +4231,8 @@ msgid "What timezone are you normally in?"
 msgstr "�ltalában melyik időzónában vagy?"
 
 #. TRANS: Checkbox label in form for profile settings.
-#, fuzzy
 msgid ""
-"Automatically subscribe to whoever subscribes to me (best for non-humans)."
+"Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr ""
 "Automatikusan iratkozzunk fel mindazok híreire, aki feliratkoznak a mieinkre "
 "(nem embereknek való)"
@@ -4469,11 +4304,6 @@ msgstr "Nem sikerült a helyszín beállításait elmenteni."
 msgid "Could not save tags."
 msgstr "Nem sikerült elmenteni a címkéket."
 
-#. TRANS: Confirmation shown when user profile settings are saved.
-#. TRANS: Message after successful saving of administrative settings.
-msgid "Settings saved."
-msgstr "A beállításokat elmentettük."
-
 #. TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
 #. TRANS: Page title for page where a user account can be restored from backup.
 msgid "Restore account"
@@ -4486,7 +4316,8 @@ msgid "Beyond the page limit (%s)."
 msgstr "A lapkorláton túl (%s)"
 
 #. TRANS: Server error displayed when a public timeline cannot be retrieved.
-msgid "Could not retrieve public stream."
+#, fuzzy
+msgid "Could not retrieve public timeline."
 msgstr "Nem sikerült lekérni a nyilvános adatfolyamot."
 
 #. TRANS: Title for all public timeline pages but the first.
@@ -4501,16 +4332,24 @@ msgid "Public timeline"
 msgstr "Közösségi történet"
 
 #. TRANS: Link description for public timeline feed.
-msgid "Public Stream Feed (RSS 1.0)"
-msgstr ""
+#, fuzzy
+msgid "Public Timeline Feed (Activity Streams JSON)"
+msgstr "%s Atom hírcsatornája"
 
 #. TRANS: Link description for public timeline feed.
-msgid "Public Stream Feed (RSS 2.0)"
-msgstr ""
+#, fuzzy
+msgid "Public Timeline Feed (RSS 1.0)"
+msgstr "Közösségi történet, %d. oldal"
 
 #. TRANS: Link description for public timeline feed.
-msgid "Public Stream Feed (Atom)"
-msgstr ""
+#, fuzzy
+msgid "Public Timeline Feed (RSS 2.0)"
+msgstr "Közösségi történet, %d. oldal"
+
+#. TRANS: Link description for public timeline feed.
+#, fuzzy
+msgid "Public Timeline Feed (Atom)"
+msgstr "Közösségi történet, %d. oldal"
 
 #. TRANS: Text displayed for public feed when there are no public notices.
 #, php-format
@@ -4553,45 +4392,6 @@ msgid ""
 "tool."
 msgstr ""
 
-#. TRANS: Title for page with public list cloud.
-msgid "Public list cloud"
-msgstr ""
-
-#. TRANS: Page notice for page with public list cloud.
-#. TRANS: %s is a StatusNet sitename.
-#, php-format
-msgid "These are largest lists on %s"
-msgstr ""
-
-#. TRANS: Empty list message on page with public list cloud.
-#. TRANS: This message contains Markdown links in the form [description](link).
-#, php-format
-msgid "No one has [listed](%%doc.tags%%) anyone yet."
-msgstr ""
-
-#. TRANS: Additional empty list message on page with public list cloud for logged in users.
-msgid "Be the first to list someone!"
-msgstr ""
-
-#. TRANS: Additional empty list message on page with public list cloud for anonymous users.
-#. TRANS: This message contains Markdown links in the form [description](link).
-#, php-format
-msgid ""
-"Why not [register an account](%%action.register%%) and be the first to list "
-"someone!"
-msgstr ""
-
-#. TRANS: DT element on on page with public list cloud.
-msgid "List cloud"
-msgstr "Listafelhő"
-
-#. TRANS: Link title for number of listed people. %d is the number of listed people.
-#, php-format
-msgid "1 person listed"
-msgid_plural "%d people listed"
-msgstr[0] ""
-msgstr[1] ""
-
 #. TRANS: Public RSS feed description. %s is the StatusNet site name.
 #, fuzzy, php-format
 msgid "%s updates from everyone."
@@ -4714,7 +4514,6 @@ msgid "6 or more characters, and do not forget it!"
 msgstr "6 vagy több karakter, és ne felejtsd el!"
 
 #. TRANS: Button text for password reset form.
-#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Reset"
@@ -4724,18 +4523,6 @@ msgstr "Alaphelyzet"
 msgid "Enter a nickname or email address."
 msgstr "Adj meg egy nicknevet vagy email címet."
 
-#. TRANS: Information on password recovery form if no known username or e-mail address was specified.
-msgid "No user with that email address or username."
-msgstr ""
-
-#. TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.
-msgid "No registered email address for that user."
-msgstr ""
-
-#. TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.
-msgid "Error saving address confirmation."
-msgstr ""
-
 #. TRANS: User notification after an e-mail with instructions was sent from the password recovery form.
 msgid ""
 "Instructions for recovering your password have been sent to the email "
@@ -4904,71 +4691,6 @@ msgstr ""
 "(Hamarosan kapnod kell egy e-mailt az e-mail címed megerősítésére vonatkozó "
 "utasításokkal.)"
 
-#. TRANS: Page notice for remote subscribe. This message contains Markdown links.
-#. TRANS: Ensure to keep the correct markup of [link description](link).
-#, 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 ""
-
-#. TRANS: Page title for Remote subscribe.
-msgid "Remote subscribe"
-msgstr "Távoli feliratkozás"
-
-#. TRANS: Field legend on page for remote subscribe.
-msgid "Subscribe to a remote user"
-msgstr ""
-
-#. TRANS: Field label on page for remote subscribe.
-msgid "User nickname"
-msgstr "Felhasználó beceneve"
-
-#. TRANS: Field title on page for remote subscribe.
-msgid "Nickname of the user you want to follow."
-msgstr ""
-
-#. TRANS: Field label on page for remote subscribe.
-msgid "Profile URL"
-msgstr "Profil URL"
-
-#. TRANS: Field title on page for remote subscribe.
-msgid "URL of your profile on another compatible microblogging service."
-msgstr ""
-
-#. TRANS: Button text on page for remote subscribe.
-#. TRANS: Link text for link that will subscribe to a remote profile.
-#. TRANS: Button text to subscribe to a user.
-#. TRANS: Button text for subscribing to a list.
-#, fuzzy
-msgctxt "BUTTON"
-msgid "Subscribe"
-msgstr "Kövessük"
-
-#. TRANS: Form validation error on page for remote subscribe when an invalid profile URL was provided.
-msgid "Invalid profile URL (bad format)."
-msgstr "Érvénytelen profil URL-cím (hibás formátum)."
-
-#. TRANS: Form validation error on page for remote subscribe when no the provided profile URL
-#. TRANS: does not contain expected data.
-msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
-msgstr ""
-
-#. TRANS: Form validation error on page for remote subscribe.
-#, fuzzy
-msgid "That is a local profile! Login to subscribe."
-msgstr "Az a felhasználó blokkolta hogy figyelemmel kövesd."
-
-#. TRANS: Form validation error on page for remote subscribe when the remote service is not providing a request token.
-#, fuzzy
-msgid "Could not get a request token."
-msgstr "Nem sikerült az üzenetet feldolgozni."
-
-#. TRANS: Client error displayed when trying to (un)list an OMB 0.1 remote profile.
-msgid "You cannot (un)list an OMB 0.1 remote profile with this action."
-msgstr ""
-
 #. TRANS: Client error displayed when an unknown error occurs while delisting a user.
 #. TRANS: %s is a username.
 #, php-format
@@ -5020,6 +4742,12 @@ msgstr ""
 msgid "Replies to %1$s, page %2$d"
 msgstr ""
 
+#. TRANS: Link for feed with replies for a user.
+#. TRANS: %s is a user nickname.
+#, php-format
+msgid "Replies feed for %s (Activity Streams JSON)"
+msgstr ""
+
 #. TRANS: Link for feed with replies for a user.
 #. TRANS: %s is a user nickname.
 #, php-format
@@ -5134,7 +4862,7 @@ msgstr ""
 
 #. TRANS: Form instructions for feed restore.
 msgid ""
-"You can upload a backed-up stream in <a href=\"http://activitystrea.ms/"
+"You can upload a backed-up timeline in <a href=\"http://activitystrea.ms/"
 "\">Activity Streams</a> format."
 msgstr ""
 
@@ -5255,6 +4983,29 @@ msgstr ""
 msgid "Application info"
 msgstr ""
 
+#. TRANS: Field label on application page.
+msgid "Consumer key"
+msgstr ""
+
+#. TRANS: Field label on application page.
+msgid "Consumer secret"
+msgstr ""
+
+#. TRANS: Field label on application page.
+#, fuzzy
+msgid "Request token URL"
+msgstr "Érvénytelen kéréstoken."
+
+#. TRANS: Field label on application page.
+#, fuzzy
+msgid "Access token URL"
+msgstr "Hibás hozzáférési token."
+
+#. TRANS: Field label on application page.
+#, fuzzy
+msgid "Authorize URL"
+msgstr "A forrás URL-címe"
+
 #. TRANS: Note on the OAuth application page about signature support.
 msgid ""
 "Note: HMAC-SHA1 signatures are supported. The plaintext signature method is "
@@ -5275,6 +5026,11 @@ msgstr ""
 msgid "Could not retrieve favorite notices."
 msgstr "Nem sikerült a kedvenc híreket lekérni."
 
+#. TRANS: Feed link text. %s is a username.
+#, fuzzy, php-format
+msgid "Feed for favorites of %s (Activity Streams JSON)"
+msgstr "%s kedvenceinek Atom hírcsatornája"
+
 #. TRANS: Feed link text. %s is a username.
 #, php-format
 msgid "Feed for favorites of %s (RSS 1.0)"
@@ -5329,6 +5085,11 @@ msgstr "%s csoport"
 msgid "%1$s group, page %2$d"
 msgstr "%1$s csoport, %2$d. oldal"
 
+#. TRANS: Tooltip for feed link. %s is a group nickname.
+#, fuzzy, php-format
+msgid "Notice feed for %s group (Activity Streams JSON)"
+msgstr "%s csoport Atom hírcsatornája"
+
 #. TRANS: Tooltip for feed link. %s is a group nickname.
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
@@ -5349,44 +5110,8 @@ msgstr "%s csoport Atom hírcsatornája"
 msgid "FOAF for %s group"
 msgstr "FOAF a %s csoportnak"
 
-#. TRANS: Header for mini list of group members on a group page (h2).
-msgid "Members"
-msgstr "Tagok"
-
-#. TRANS: Description for mini list of group members on a group page when the group has no members.
-#. TRANS: Content of "Listed" page if there are no listed users.
-#. TRANS: Content of "People following tag x" if there are no subscribed users.
-#. TRANS: Empty list message for tags.
-#. TRANS: Text for user subscription statistics if the user has no subscriptions.
-#. TRANS: Text for user subscriber statistics if user has no subscribers.
-#. TRANS: Text for user user group membership statistics if user is not a member of any group.
-#. TRANS: Default content for section/sidebar widget.
-msgid "(None)"
-msgstr "(nincs)"
-
-#. TRANS: Link to all group members from mini list of group members if group has more than n members.
-msgid "All members"
-msgstr "Összes tag"
-
-#. TRANS: Header for group statistics on a group page (h2).
-#. TRANS: H2 text for user statistics.
-msgid "Statistics"
-msgstr "Statisztika"
-
-#. TRANS: Label for group creation date.
-#, fuzzy
-msgctxt "LABEL"
-msgid "Created"
-msgstr "Létrehoztuk"
-
-#. TRANS: Label for member count in statistics on group page.
-#, fuzzy
-msgctxt "LABEL"
-msgid "Members"
-msgstr "Tagok"
-
 #. TRANS: Notice on group pages for anonymous users for StatusNet sites that accept new registrations.
-#. TRANS: **%s** is the group alias, %%%%site.name%%%% is the site name,
+#. TRANS: %s is the group name, %%%%site.name%%%% is the site name,
 #. TRANS: %%%%action.register%%%% is the URL for registration, %%%%doc.help%%%% is a URL to help.
 #. TRANS: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
 #, php-format
@@ -5405,21 +5130,21 @@ msgstr ""
 "még sok másiknak is! ([Tudj meg többet](%%%%doc.help%%%%))"
 
 #. TRANS: Notice on group pages for anonymous users for StatusNet sites that accept no new registrations.
-#. TRANS: **%s** is the group alias, %%%%site.name%%%% is the site name,
+#. TRANS: %s is the group name, %%%%site.name%%%% is the site name,
 #. TRANS: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
-#, php-format
+#, fuzzy, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
 "wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
 "[StatusNet](http://status.net/) tool. Its members share short messages about "
-"their life and interests. "
+"their life and interests."
 msgstr ""
-
-#. TRANS: Title for list of group administrators on a group page.
-#, fuzzy
-msgctxt "TITLE"
-msgid "Admins"
-msgstr "Adminisztrátorok"
+"**%s** egy felhasználói csoport a %%%%site.name%%%% webhelyen - ami egy "
+"[mikroblog](http://hu.wikipedia.org/wiki/Mikroblog#Mikroblog), mely a szabad "
+"[StatusNet](http://status.net/) szoftveren fut. A csoport tagjai rövid "
+"üzeneteket írnak az életükről és az érdeklődési körükkel kapcsolatban.\n"
+"[Csatlakozz](%%%%action.register%%%%), és légy tagja ennek a csoportnak - és "
+"még sok másiknak is! ([Tudj meg többet](%%%%doc.help%%%%))"
 
 #. TRANS: Client error displayed requesting a single message that does not exist.
 msgid "No such message."
@@ -5513,9 +5238,21 @@ msgid ""
 msgstr ""
 
 #. TRANS: Header on show list page.
+#. TRANS: Link description for link to list of users tagged with a tag (so part of a list).
 msgid "Listed"
 msgstr ""
 
+#. TRANS: Content of "Listed" page if there are no listed users.
+#. TRANS: Content of "People following tag x" if there are no subscribed users.
+#. TRANS: Description for mini list of group members on a group page when the group has no members.
+#. TRANS: Empty list message for tags.
+#. TRANS: Text for user subscription statistics if the user has no subscriptions.
+#. TRANS: Text for user subscriber statistics if user has no subscribers.
+#. TRANS: Text for user user group membership statistics if user is not a member of any group.
+#. TRANS: Default content for section/sidebar widget.
+msgid "(None)"
+msgstr "(nincs)"
+
 #. TRANS: Link for more "People in list x by a user"
 #. TRANS: if there are more than the mini list's maximum.
 msgid "Show all"
@@ -5526,24 +5263,19 @@ msgstr "Összes megjelenítése"
 msgid "Subscribers"
 msgstr "Feliratkozók"
 
-#. TRANS: Link for more "People following tag x"
-#. TRANS: if there are more than the mini list's maximum.
-msgid "All subscribers"
-msgstr "Minden feliratkozott"
-
-#. TRANS: Page title showing tagged notices in one user's stream.
+#. TRANS: Page title showing tagged notices in one user's timeline.
 #. TRANS: %1$s is the username, %2$s is the hash tag.
 #, fuzzy, php-format
 msgid "Notices by %1$s tagged %2$s"
 msgstr "  %s megcímkézve"
 
-#. TRANS: Page title showing tagged notices in one user's stream.
+#. TRANS: Page title showing tagged notices in one user's timeline.
 #. TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number.
 #, fuzzy, php-format
 msgid "Notices by %1$s tagged %2$s, page %3$d"
 msgstr "%1$s és barátai, %2$d oldal"
 
-#. TRANS: Extended page title showing tagged notices in one user's stream.
+#. TRANS: Extended page title showing tagged notices in one user's timeline.
 #. TRANS: %1$s is the username, %2$d is the page number.
 #, fuzzy, php-format
 msgid "Notices by %1$s, page %2$d"
@@ -5555,6 +5287,12 @@ msgstr "%1$s kimenő postafiókja - %2$d. oldal"
 msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
 msgstr "RSS 1.0 csatorna %1$s %2$s címkéjű híreiből"
 
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#, fuzzy, php-format
+msgid "Notice feed for %s (Activity Streams JSON)"
+msgstr "%s Atom hírcsatornája"
+
 #. TRANS: Title for link to notice feed.
 #. TRANS: %s is a user nickname.
 #, php-format
@@ -5579,7 +5317,7 @@ msgstr "%s Atom hírcsatornája"
 msgid "FOAF for %s"
 msgstr ""
 
-#. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
+#. TRANS: First sentence of empty list message for a timeline. $1%s is a user nickname.
 #, fuzzy, php-format
 msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
 msgstr "Ez %1$s története, de %2$s még nem tett közzé hírt."
@@ -5590,7 +5328,7 @@ msgid ""
 "would be a good time to start :)"
 msgstr ""
 
-#. TRANS: Second sentence of empty  list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
+#. TRANS: Second sentence of empty  list message for a non-self timeline. %1$s is a user nickname, %2$s is a part of a URL.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
 #, php-format
 msgid ""
@@ -5598,7 +5336,7 @@ msgid ""
 "%?status_textarea=%2$s)."
 msgstr ""
 
-#. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
+#. TRANS: Announcement for anonymous users showing a timeline if site registrations are open.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
 #, php-format
 msgid ""
@@ -5613,13 +5351,13 @@ msgstr ""
 "register%%%%) és kövesd nyomon **%s** pletykáit - és még rengeteg mást! "
 "([Tudj meg többet](%%%%doc.help%%%%))"
 
-#. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
+#. TRANS: Announcement for anonymous users showing a timeline if site registrations are closed or invite only.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#, php-format
+#, fuzzy, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
 "wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
-"[StatusNet](http://status.net/) tool. "
+"[StatusNet](http://status.net/) tool."
 msgstr ""
 "**%s** %%%%site.name%%%% felhasználó, [mikroblogot](http://hu.wikipedia.org/"
 "wiki/Mikroblog#Mikroblog) ír egy webhelyen, ami a szabad [StatusNet](http://"
@@ -5657,6 +5395,15 @@ msgstr "A webhely nevének legalább egy karakter hosszúnak kell lennie."
 msgid "You must have a valid contact email address."
 msgstr "Valódi kapcsolattartó email címet kell megadnod."
 
+#. TRANS: Client error displayed when a logo URL is not valid.
+msgid "Invalid logo URL."
+msgstr "Érvénytelen logó URL."
+
+#. TRANS: Client error displayed when a SSL logo URL is invalid.
+#, fuzzy
+msgid "Invalid SSL logo URL."
+msgstr "Érvénytelen logó URL."
+
 #. TRANS: Client error displayed trying to save site settings with an invalid language code.
 #. TRANS: %s is the invalid language code.
 #, php-format
@@ -5731,7 +5478,8 @@ msgid "Default language"
 msgstr "Alapértelmezett nyelv"
 
 #. TRANS: Dropdown title on site settings panel.
-msgid "Site language when autodetection from browser settings is not available"
+msgid ""
+"The site language when autodetection from browser settings is not available."
 msgstr ""
 
 #. TRANS: Fieldset legend on site settings panel.
@@ -5756,8 +5504,23 @@ msgstr "Duplázások korlátja"
 msgid "How long users must wait (in seconds) to post the same thing again."
 msgstr ""
 
+#. TRANS: Fieldset legend for form to change logo.
+#, fuzzy
+msgid "Logo"
+msgstr "Logó"
+
+#. TRANS: Field label for StatusNet site logo.
+msgid "Site logo"
+msgstr "Oldal logója"
+
+#. TRANS: Field label for SSL StatusNet site logo.
+#, fuzzy
+msgid "SSL logo"
+msgstr "Oldal logója"
+
 #. TRANS: Button title for saving site settings.
-msgid "Save site settings"
+#, fuzzy
+msgid "Save the site settings."
 msgstr "Mentsük el a webhely beállításait"
 
 #. TRANS: Page title for site-wide notice tab in admin panel.
@@ -5784,7 +5547,7 @@ msgstr ""
 msgid "Site-wide notice text (255 characters maximum; HTML allowed)"
 msgstr ""
 
-#. TRANS: Title for button to save site notice in admin panel.
+#. TRANS: Button title to save site notice in admin panel.
 #, fuzzy
 msgid "Save site notice."
 msgstr "A webhely híre"
@@ -5976,7 +5739,7 @@ msgstr "URL jelentése"
 msgid "Snapshots will be sent to this URL."
 msgstr ""
 
-#. TRANS: Title for button to save snapshot settings.
+#. TRANS: Button title to save snapshot settings.
 #, fuzzy
 msgid "Save snapshot settings."
 msgstr "Mentsük el a webhely beállításait"
@@ -6011,10 +5774,6 @@ msgstr "%1$s csoport, %2$d. oldal"
 msgid "A list of users awaiting approval to subscribe to you."
 msgstr "A csoportban lévő felhasználók listája."
 
-#. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
-msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
-msgstr ""
-
 #. TRANS: Page title when subscription succeeded.
 msgid "Subscribed"
 msgstr "Feliratkozott"
@@ -6111,8 +5870,7 @@ msgid ""
 "You're not listening to anyone's notices right now, try subscribing to "
 "people you know. Try [people search](%%action.peoplesearch%%), look for "
 "members in groups you're interested in and in our [featured users](%%action."
-"featured%%). If you're a [Twitter user](%%action.twittersettings%%), you can "
-"automatically subscribe to people you already follow there."
+"featured%%)."
 msgstr ""
 
 #. TRANS: Subscription list text when looking at the subscriptions for a of a user other
@@ -6143,6 +5901,12 @@ msgstr "SMS"
 msgid "Notices tagged with %1$s, page %2$d"
 msgstr ""
 
+#. TRANS: Link label for feed on "notices with tag" page.
+#. TRANS: %s is the tag the feed is for.
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (Activity Streams JSON)"
+msgstr "%s címke Atom hírcsatornája"
+
 #. TRANS: Link label for feed on "notices with tag" page.
 #. TRANS: %s is the tag the feed is for.
 #, php-format
@@ -6242,16 +6006,6 @@ msgstr ""
 msgid "%1$s unsubscribed from list %2$s by %3$s"
 msgstr ""
 
-#. TRANS: Client error displayed when trying to update profile with an incompatible license.
-#. TRANS: %1$s is the license incompatible with site license %2$s.
-#. TRANS: Exception thrown when licenses are not compatible for an authorisation request.
-#. TRANS: %1$s is the license for the listenee, %2$s is the license for "this" StatusNet site.
-#, fuzzy, php-format
-msgid ""
-"Listenee stream license \"%1$s\" is not compatible with site license \"%2$s"
-"\"."
-msgstr "A hír licence ‘%1$s’ nem kompatibilis a webhely licencével ‘%2$s’."
-
 #. TRANS: Title of URL settings tab in profile settings.
 #, fuzzy
 msgid "URL settings"
@@ -6390,151 +6144,11 @@ msgstr "A meghívások engedélyezve vannak"
 msgid "Whether to allow users to invite new users."
 msgstr ""
 
-#. TRANS: Title for button to save user settings in user admin panel.
+#. TRANS: Button title to save user settings in user admin panel.
 #, fuzzy
 msgid "Save user settings."
 msgstr "Mentsük el a webhely beállításait"
 
-#. TRANS: Page title.
-msgid "Authorize subscription"
-msgstr "Feliratkozás engedélyezése"
-
-#. TRANS: Page notice on "Authorize subscription" page.
-msgid ""
-"Please check these details to make sure that you want to subscribe to this "
-"user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
-"click \"Reject\"."
-msgstr ""
-
-#. TRANS: Button text on Authorise Subscription page.
-#. TRANS: Submit button text to accept a group membership request on approve group form.
-#. TRANS: Submit button text to accept a subscription request on approve sub form.
-#, fuzzy
-msgctxt "BUTTON"
-msgid "Accept"
-msgstr "Elfogadás"
-
-#. TRANS: Title for button on Authorise Subscription page.
-#. TRANS: Button title to subscribe to a user.
-#, fuzzy
-msgid "Subscribe to this user."
-msgstr "Ezen felhasználók híreire már feliratkoztál:"
-
-#. TRANS: Button text on Authorise Subscription page.
-#. TRANS: Submit button text to reject a group membership request on approve group form.
-#. TRANS: Submit button text to reject a subscription request on approve sub form.
-#, fuzzy
-msgctxt "BUTTON"
-msgid "Reject"
-msgstr "Visszautasítás"
-
-#. TRANS: Title for button on Authorise Subscription page.
-#, fuzzy
-msgid "Reject this subscription."
-msgstr "Feliratkozás engedélyezése"
-
-#. TRANS: Client error displayed for an empty authorisation request.
-msgid "No authorization request!"
-msgstr ""
-
-#. TRANS: Accept message header from Authorise subscription page.
-msgid "Subscription authorized"
-msgstr ""
-
-#. TRANS: Accept message text from Authorise subscription page.
-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 ""
-
-#. TRANS: Reject message header from Authorise subscription page.
-msgid "Subscription rejected"
-msgstr "Feliratkozás visszautasítva"
-
-#. TRANS: Reject message from Authorise subscription page.
-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 ""
-
-#. TRANS: Exception thrown when no valid user is found for an authorisation request.
-#. TRANS: %s is a listener URI.
-#, php-format
-msgid "Listener URI \"%s\" not found here."
-msgstr ""
-
-#. TRANS: Exception thrown when listenee URI is too long for an authorisation request.
-#. TRANS: %s is a listenee URI.
-#, fuzzy, php-format
-msgid "Listenee URI \"%s\" is too long."
-msgstr "A forrás URL túl hosszú."
-
-#. TRANS: Exception thrown when listenee URI is a local user for an authorisation request.
-#. TRANS: %s is a listenee URI.
-#, php-format
-msgid "Listenee URI \"%s\" is a local user."
-msgstr ""
-
-#. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
-#. TRANS: %s is a profile URL.
-#, php-format
-msgid "Profile URL \"%s\" is for a local user."
-msgstr ""
-
-#. TRANS: Exception thrown when avatar URL is invalid for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#, fuzzy, php-format
-msgid "Avatar URL \"%s\" is not valid."
-msgstr "A forrás URL nem érvényes."
-
-#. TRANS: Exception thrown when avatar URL could not be read for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#, php-format
-msgid "Cannot read avatar URL \"%s\"."
-msgstr ""
-
-#. TRANS: Exception thrown when avatar URL return an invalid image type for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#, php-format
-msgid "Wrong image type for avatar URL \"%s\"."
-msgstr ""
-
-#. TRANS: Title for profile design page.
-#. TRANS: Page title for profile design page.
-msgid "Profile design"
-msgstr "Profilterv"
-
-#. TRANS: Instructions for Profile design page.
-#. TRANS: Instructions for profile design page.
-msgid ""
-"Customize the way your profile looks with a background image and a colour "
-"palette of your choice."
-msgstr ""
-
-#. TRANS: Succes message on Profile design page when finding an easter egg.
-msgid "Enjoy your hotdog!"
-msgstr ""
-
-#. TRANS: Form legend on Profile design page.
-#, fuzzy
-msgid "Design settings"
-msgstr "Mentsük el a webhely beállításait"
-
-#. TRANS: Checkbox label on Profile design page.
-msgid "View profile designs"
-msgstr "Profiltervek megtekintése"
-
-#. TRANS: Title for checkbox on Profile design page.
-msgid "Show or hide profile designs."
-msgstr "Profiltervek megjelenítése vagy elrejtése"
-
-#. TRANS: Form legend on Profile design page for form to choose a background image.
-#, fuzzy
-msgid "Background file"
-msgstr "Háttér"
-
 #. TRANS: Page title for all but the first page of groups for a user.
 #. TRANS: %1$s is a nickname, %2$d is a page number.
 #, php-format
@@ -6575,7 +6189,7 @@ msgstr "StatusNet %s"
 #. TRANS: %1$s is the engine name (StatusNet) and %2$s is the StatusNet version.
 #, php-format
 msgid ""
-"This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, "
+"This site is powered by %1$s version %2$s, Copyright 2008-2011 StatusNet, "
 "Inc. and contributors."
 msgstr ""
 
@@ -6592,7 +6206,7 @@ msgid ""
 "StatusNet is free software: you can redistribute it and/or modify it under "
 "the terms of the GNU Affero General Public License as published by the Free "
 "Software Foundation, either version 3 of the License, or (at your option) "
-"any later version. "
+"any later version."
 msgstr ""
 
 #. TRANS: Content part of StatusNet version page.
@@ -6600,7 +6214,7 @@ msgid ""
 "This program is distributed in the hope that it will be useful, but WITHOUT "
 "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
 "FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License "
-"for more details. "
+"for more details."
 msgstr ""
 
 #. TRANS: Content part of StatusNet version page.
@@ -6658,16 +6272,26 @@ msgstr ""
 msgid "Robin thinks something is impossible."
 msgstr ""
 
+#. TRANS: Message used to be inserted as %2$s in  the text "No file may
+#. TRANS: be larger than %1$d byte and the file you sent was %2$s.".
+#. TRANS: %1$d is the number of bytes of an uploaded file.
+#, php-format
+msgid "%1$d byte"
+msgid_plural "%1$d bytes"
+msgstr[0] ""
+msgstr[1] ""
+
 #. TRANS: Message given if an upload is larger than the configured maximum.
-#. TRANS: %1$d is the byte limit for uploads, %2$d is the byte count for the uploaded file.
-#. TRANS: %1$s is used for plural.
+#. TRANS: %1$d (used for plural) is the byte limit for uploads,
+#. TRANS: %2$s is the proper form of "n bytes". This is the only ways to have
+#. TRANS: gettext support multiple plurals in the same message, unfortunately...
 #, php-format
 msgid ""
-"No file may be larger than %1$d byte and the file you sent was %2$d bytes. "
-"Try to upload a smaller version."
+"No file may be larger than %1$d byte and the file you sent was %2$s. Try to "
+"upload a smaller version."
 msgid_plural ""
-"No file may be larger than %1$d bytes and the file you sent was %2$d bytes. "
-"Try to upload a smaller version."
+"No file may be larger than %1$d bytes and the file you sent was %2$s. Try to "
+"upload a smaller version."
 msgstr[0] ""
 msgstr[1] ""
 
@@ -6735,6 +6359,11 @@ msgstr "Nem sikerült frissíteni a helyi csoportot."
 msgid "Could not create login token for %s"
 msgstr "Nem sikerült létrehozni %s bejelentkezési tokenjét."
 
+#. TRANS: Exception thrown when a program code class (%s) cannot be instantiated.
+#, fuzzy, php-format
+msgid "Cannot instantiate class %s."
+msgstr "Nem sikerült elmenteni az új jelszót."
+
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.
 msgid "No database name or DSN found anywhere."
 msgstr ""
@@ -6888,7 +6517,7 @@ msgstr ""
 #, php-format
 msgid ""
 "You already have %1$d or more people in list %2$s, which is the maximum "
-"allowed number.Try unlisting others first."
+"allowed number. Try unlisting others first."
 msgstr ""
 
 #. TRANS: Exception thrown when inserting a list subscription in the database fails.
@@ -6908,7 +6537,6 @@ msgid "Unable to save tag."
 msgstr "Nem sikerült elmenteni a címkét."
 
 #. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
-#. TRANS: Error message displayed to a banned user when they try to subscribe.
 msgid "You have been banned from subscribing."
 msgstr "Eltiltottak a feliratkozástól."
 
@@ -6928,10 +6556,6 @@ msgstr "Nem követed figyelemmel!"
 msgid "Could not delete self-subscription."
 msgstr ""
 
-#. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
-msgid "Could not delete subscription OMB token."
-msgstr ""
-
 #. TRANS: Exception thrown when a subscription could not be deleted on the server.
 msgid "Could not delete subscription."
 msgstr ""
@@ -6966,6 +6590,18 @@ msgstr ""
 msgid "Single-user mode code called when not enabled."
 msgstr ""
 
+#. TRANS: Information on password recovery form if no known username or e-mail address was specified.
+msgid "No user with that email address or username."
+msgstr ""
+
+#. TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.
+msgid "No registered email address for that user."
+msgstr ""
+
+#. TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.
+msgid "Error saving address confirmation."
+msgstr ""
+
 #. TRANS: Server exception thrown when creating a group failed.
 msgid "Could not create group."
 msgstr "Nem sikerült létrehozni a csoportot."
@@ -7234,27 +6870,12 @@ msgstr "a showForm() nincs megvalósítva."
 msgid "saveSettings() not implemented."
 msgstr "a saveSettings() nincs megvalósítva."
 
-#. TRANS: Client error message thrown if design settings could not be deleted in
-#. TRANS: the admin panel Design.
-msgid "Unable to delete design setting."
-msgstr "Nem sikerült törölni a megjelenés beállításait."
-
 #. TRANS: Header in administrator navigation panel.
-#. TRANS: Header in settings navigation panel.
 #, fuzzy
 msgctxt "HEADER"
 msgid "Home"
 msgstr "Otthon"
 
-#. TRANS: Menu item in administrator navigation panel.
-#. TRANS: Menu item in default local navigation panel.
-#. TRANS: Menu item in personal group navigation menu.
-#. TRANS: Menu item in settings navigation panel.
-#, fuzzy
-msgctxt "MENU"
-msgid "Home"
-msgstr "Otthon"
-
 #. TRANS: Header in administrator navigation panel.
 #, fuzzy
 msgctxt "HEADER"
@@ -7270,17 +6891,6 @@ msgctxt "MENU"
 msgid "Site"
 msgstr "Oldal"
 
-#. TRANS: Menu item title in administrator navigation panel.
-msgid "Design configuration"
-msgstr "A megjelenés beállításai"
-
-#. TRANS: Menu item in administrator navigation panel.
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: Menu item in settings navigation panel.
-msgctxt "MENU"
-msgid "Design"
-msgstr ""
-
 #. TRANS: Menu item title in administrator navigation panel.
 msgid "User configuration"
 msgstr "A felhasználók beállításai"
@@ -7388,42 +6998,6 @@ msgstr "Nincs felhasználó a tokenhez társítva."
 msgid "Could not authenticate you."
 msgstr "Nem sikerült hitelesítenünk téged."
 
-#. TRANS: Server error displayed when trying to create an anynymous OAuth consumer.
-#, fuzzy
-msgid "Could not create anonymous consumer."
-msgstr "Nem sikerült létrehozni az álneveket."
-
-#. TRANS: Server error displayed when trying to create an anynymous OAuth application.
-#, fuzzy
-msgid "Could not create anonymous OAuth application."
-msgstr "Nem sikerült létrehozni az alkalmazást."
-
-#. TRANS: Exception thrown when no token association could be found.
-msgid ""
-"Could not find a profile and application associated with the request token."
-msgstr ""
-
-#. TRANS: Exception thrown when no access token can be issued.
-#, fuzzy
-msgid "Could not issue access token."
-msgstr "Nem sikerült az üzenetet feldolgozni."
-
-#. TRANS: Exception thrown when a database error occurs.
-msgid "Database error inserting OAuth application user."
-msgstr ""
-
-#. TRANS: Exception thrown when a database error occurs.
-msgid "Database error updating OAuth application user."
-msgstr ""
-
-#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
-msgid "Tried to revoke unknown token."
-msgstr ""
-
-#. TRANS: Exception thrown when an attempt is made to remove a revoked token.
-msgid "Failed to delete revoked token."
-msgstr ""
-
 #. TRANS: Form input field label for application icon.
 msgid "Icon"
 msgstr "Ikon"
@@ -7505,13 +7079,14 @@ msgstr ""
 "Az alkalmazás alapvető hozzáférési módja: csak olvasás, vagy írás és olvasás"
 
 #. TRANS: Submit button title.
-msgid "Cancel"
-msgstr "Mégse"
+#, fuzzy
+msgid "Cancel application changes."
+msgstr "Összekapcsolt alkalmazások"
 
 #. TRANS: Submit button title.
-#. TRANS: Button text to save a list.
-msgid "Save"
-msgstr "Mentés"
+#, fuzzy
+msgid "Save application changes."
+msgstr "Új alkalmazás"
 
 #. TRANS: Name for an anonymous application in application list.
 #, fuzzy
@@ -7547,6 +7122,20 @@ msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "Visszavonás"
 
+#. TRANS: Submit button text to accept a group membership request on approve group form.
+#. TRANS: Submit button text to accept a subscription request on approve sub form.
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Accept"
+msgstr "Elfogadás"
+
+#. TRANS: Submit button text to reject a group membership request on approve group form.
+#. TRANS: Submit button text to reject a subscription request on approve sub form.
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Reject"
+msgstr "Visszautasítás"
+
 #. TRANS: Atom feed exception thrown when an author element does not contain a name element.
 msgid "Author element must contain a name element."
 msgstr ""
@@ -8105,6 +7694,11 @@ msgstr "A telepítő futtatása kijavíthatja ezt."
 msgid "Go to the installer."
 msgstr "Menj a telepítőhöz."
 
+#. TRANS: Header on conversation page. Hidden by default (h2).
+#. TRANS: Label for user statistics.
+msgid "Notices"
+msgstr "Hírek"
+
 #. TRANS: Page title for when a database error occurs.
 msgid "Database error"
 msgstr "Adatbázishiba"
@@ -8115,14 +7709,6 @@ msgctxt "MENU"
 msgid "Public"
 msgstr "Nyilvános"
 
-#. TRANS: Menu item in default local navigation panel.
-#. TRANS: Menu item in search group navigation panel.
-#. TRANS: Menu item in local navigation menu.
-#, fuzzy
-msgctxt "MENU"
-msgid "Groups"
-msgstr "Csoportok"
-
 #. TRANS: Menu item in default local navigation panel.
 #. TRANS: Menu item title in local navigation menu.
 msgctxt "MENU"
@@ -8138,53 +7724,12 @@ msgstr "Törlés"
 msgid "Delete this user"
 msgstr "Töröljük ezt a felhasználót"
 
-#. TRANS: Form legend of form for changing the page design.
-#, fuzzy
-msgid "Change design"
-msgstr "Design mentése"
-
-#. TRANS: Fieldset legend on profile design page to change profile page colours.
-msgid "Change colours"
-msgstr "Színek megváltoztatása"
-
-#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-msgid "Use defaults"
-msgstr "Alapértelmezések használata"
-
-#. TRANS: Label in form on profile design page.
-#. TRANS: Field contains file name on user's computer that could be that user's custom profile background image.
-msgid "Upload file"
-msgstr "Fájl feltöltése"
-
-#. TRANS: Instructions for form on profile design page.
-#, fuzzy
-msgid ""
-"You can upload your personal background image. The maximum file size is 2MB."
-msgstr "Feltöltheted a személyes avatarodat. A fájl maximális mérete %s lehet."
-
-#. TRANS: Radio button on profile design page that will enable use of the uploaded profile image.
-#, fuzzy
-msgctxt "RADIO"
-msgid "On"
-msgstr "Be"
-
-#. TRANS: Radio button on profile design page that will disable use of the uploaded profile image.
-#, fuzzy
-msgctxt "RADIO"
-msgid "Off"
-msgstr "Ki"
-
-#. TRANS: Success message displayed if design settings were saved after clicking "Use defaults".
-msgid "Design defaults restored."
-msgstr ""
-
 #. TRANS: Exception. %s is an ID.
 #, php-format
 msgid "Unable to find services for %s."
 msgstr ""
 
 #. TRANS: Form legend for removing the favourite status for a favourite notice.
-#. TRANS: Title for button text for removing the favourite status for a favourite notice.
 msgid "Disfavor this notice"
 msgstr "Nem kedvelem ezt a hírt"
 
@@ -8194,8 +7739,12 @@ msgctxt "BUTTON"
 msgid "Disfavor favorite"
 msgstr "Kedvenc eltávolítása"
 
+#. TRANS: Button title for removing the favourite status for a favourite notice.
+#, fuzzy
+msgid "Remove this notice from your list of favorite notices."
+msgstr "Nem sikerült a kedvenc híreket lekérni."
+
 #. TRANS: Form legend for adding the favourite status to a notice.
-#. TRANS: Title for button text for adding the favourite status to a notice.
 msgid "Favor this notice"
 msgstr "Kedvelem ezt a hírt"
 
@@ -8205,6 +7754,11 @@ msgctxt "BUTTON"
 msgid "Favor"
 msgstr "Kedvelem"
 
+#. TRANS: Button title for adding the favourite status to a notice.
+#, fuzzy
+msgid "Add this notice to your list of favorite notices."
+msgstr "Nem sikerült a kedvenc híreket lekérni."
+
 #. TRANS: Feed type name.
 msgid "RSS 1.0"
 msgstr "RSS 1.0"
@@ -8221,6 +7775,10 @@ msgstr "Atom"
 msgid "FOAF"
 msgstr ""
 
+#. TRANS: Feed type name. See http://activitystrea.ms/
+msgid "Activity Streams"
+msgstr ""
+
 #. TRANS: Client exception thrown when an imported feed does not have an author.
 msgid "No author in the feed."
 msgstr ""
@@ -8254,6 +7812,29 @@ msgstr "Válassz egy címkét hogy szűkítsük a listát"
 msgid "Grant this user the \"%s\" role"
 msgstr ""
 
+#. TRANS: Header for mini list of group members on a group page (h2).
+msgid "Members"
+msgstr "Tagok"
+
+#. TRANS: Link to all group members from mini list of group members if group has more than n members.
+msgid "All members"
+msgstr "Összes tag"
+
+#. TRANS: Header for mini list of users with a pending membership request on a group page (h2).
+#, fuzzy
+msgid "Pending"
+msgstr "Függőben (%d)"
+
+#. TRANS: Header for mini list of users that are blocked in a group page (h2).
+msgid "Blocked"
+msgstr "Blokkolva"
+
+#. TRANS: Title for list of group administrators on a group page.
+#, fuzzy
+msgctxt "TITLE"
+msgid "Admins"
+msgstr "Adminisztrátorok"
+
 #. TRANS: Button text for the form that will block a user from a group.
 msgctxt "BUTTON"
 msgid "Block"
@@ -8261,8 +7842,8 @@ msgstr "Blokkolás"
 
 #. TRANS: Submit button title.
 msgctxt "TOOLTIP"
-msgid "Block this user"
-msgstr "Felhasználó blokkolása"
+msgid "Block this user so that they can no longer post messages to it."
+msgstr ""
 
 #. TRANS: Field title on group edit form.
 #, fuzzy
@@ -8321,63 +7902,9 @@ msgctxt "GROUPADMIN"
 msgid "Admin"
 msgstr "Adminisztrátor"
 
-#. TRANS: Menu item in the group navigation page.
-msgctxt "MENU"
-msgid "Group"
-msgstr "Csoport"
-
-#. TRANS: Tooltip for menu item in the group navigation page.
-#. TRANS: %s is the nickname of the group.
-#, php-format
-msgctxt "TOOLTIP"
-msgid "%s group"
-msgstr "Csoport: %s"
-
-#. TRANS: Menu item in the group navigation page.
-msgctxt "MENU"
-msgid "Members"
-msgstr "Tagok"
-
-#. TRANS: Tooltip for menu item in the group navigation page.
-#. TRANS: %s is the nickname of the group.
-#, php-format
-msgctxt "TOOLTIP"
-msgid "%s group members"
-msgstr "Csopottagok: %s"
-
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: %d is the number of pending members.
-#, php-format
-msgctxt "MENU"
-msgid "Pending members (%d)"
-msgid_plural "Pending members (%d)"
-msgstr[0] ""
-msgstr[1] ""
-
-#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: %s is the nickname of the group.
-#, fuzzy, php-format
-msgctxt "TOOLTIP"
-msgid "%s pending members"
-msgstr "%s csoport tagjai"
-
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-msgctxt "MENU"
-msgid "Blocked"
-msgstr "Blokkolva"
-
-#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: %s is the nickname of the group.
-#, php-format
-msgctxt "TOOLTIP"
-msgid "%s blocked users"
-msgstr "%s blokkolt felhasználó"
-
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: Menu item in primary navigation panel.
-msgctxt "MENU"
-msgid "Admin"
-msgstr "Adminisztrátor"
+#. TRANS: Group actions header (h2). Text hidden by default.
+msgid "Group actions"
+msgstr "Csoport-tevékenységek"
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
@@ -8386,11 +7913,6 @@ msgctxt "TOOLTIP"
 msgid "Edit %s group properties"
 msgstr ""
 
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-msgctxt "MENU"
-msgid "Logo"
-msgstr "Logó"
-
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
 #, php-format
@@ -8398,16 +7920,10 @@ msgctxt "TOOLTIP"
 msgid "Add or edit %s logo"
 msgstr ""
 
-#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: %s is the nickname of the group.
-#, php-format
-msgctxt "TOOLTIP"
-msgid "Add or edit %s design"
-msgstr ""
-
-#. TRANS: Group actions header (h2). Text hidden by default.
-msgid "Group actions"
-msgstr "Csoport-tevékenységek"
+#. TRANS: Link text for link on user profile.
+msgctxt "MENU"
+msgid "Logo"
+msgstr "Logó"
 
 #. TRANS: Title for groups with the most members section.
 msgid "Popular groups"
@@ -8417,11 +7933,20 @@ msgstr "Népszerű csoportok"
 msgid "Active groups"
 msgstr "Aktív csoportok"
 
-#. TRANS: Title for group tag cloud section.
-#. TRANS: %s is a group name.
-#, php-format
-msgid "Tags in %s group's notices"
-msgstr "Címkék a(z) %s csoport híreiben"
+#. TRANS: Link description for seeing all groups.
+#. TRANS: Link description for seeing all lists.
+#, fuzzy
+msgid "See all"
+msgstr "Összes megjelenítése"
+
+#. TRANS: Link title for seeing all groups.
+msgid "See all groups you belong to."
+msgstr ""
+
+#. TRANS: Menu item title in personal group navigation menu.
+#. TRANS: %s is a username.
+msgid "Back to top"
+msgstr ""
 
 #. TRANS: Client exception 406
 msgid "This page is not available in a media type you accept"
@@ -8506,11 +8031,44 @@ msgctxt "TITLE"
 msgid "Trends"
 msgstr "Trendek"
 
-#. TRANS: Button text for inviting more users to the StatusNet instance.
+#. TRANS: Default button text for inviting more users to the StatusNet instance.
 msgctxt "BUTTON"
 msgid "Invite more colleagues"
 msgstr "További kollégák meghívása"
 
+#. TRANS: Form legend.
+#, fuzzy
+msgid "Invite collegues"
+msgstr "További kollégák meghívása"
+
+#. TRANS: Field label for a list of e-mail addresses.
+msgid "Email addresses"
+msgstr "E-mail címek"
+
+#. TRANS: Field title for a list of e-mail addresses.
+#, fuzzy
+msgid "Addresses of friends to invite (one per line)."
+msgstr "A meghívandó barátaid címei (soronként egy)"
+
+#. TRANS: Field label for a personal message to send to invitees.
+msgid "Personal message"
+msgstr "Személyes üzenet"
+
+#. TRANS: Field title for a personal message to send to invitees.
+msgid "Optionally add a personal message to the invitation."
+msgstr "Megadhatsz egy személyes üzenetet a meghívóhoz."
+
+#. TRANS: Send button for inviting friends
+#. TRANS: Button text for sending notice.
+msgctxt "BUTTON"
+msgid "Send"
+msgstr "Küldés"
+
+#. TRANS: Submit button title.
+#, fuzzy
+msgid "Send invitations."
+msgstr "Meghívások"
+
 #. TRANS: Button text for joining a group.
 #, fuzzy
 msgctxt "BUTTON"
@@ -8523,6 +8081,11 @@ msgctxt "BUTTON"
 msgid "Leave"
 msgstr "Távozzunk"
 
+#. TRANS: Link title for seeing all lists.
+#, fuzzy
+msgid "See all lists you have created."
+msgstr "�ltalad regisztrált alkalmazások"
+
 #. TRANS: Menu item for logging in to the StatusNet site.
 #. TRANS: Menu item in primary navigation panel.
 msgctxt "MENU"
@@ -8582,8 +8145,8 @@ msgstr ""
 #. TRANS: %1$s is the subscribing user's nickname, %2$s is the StatusNet sitename.
 #. TRANS: Main body of new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscriber's long name, %2$s is the StatusNet sitename.
-#, php-format
-msgid "%1$s is now listening to your notices on %2$s."
+#, fuzzy, php-format
+msgid "%1$s is now following you on %2$s."
 msgstr "%1$s feliratkozott a híreidre a %2$s webhelyen."
 
 #. TRANS: Subject of pending new-subscriber notification e-mail.
@@ -8745,7 +8308,7 @@ msgstr ""
 "Ne erre az email-re válaszolj; az nem jut el a címzetthez.\n"
 "\n"
 "Mély tisztelettel,\n"
-"%5$s\n"
+"%5$s"
 
 #. TRANS: Subject for favorite notification e-mail.
 #. TRANS: %1$s is the adding user's long name, %2$s is the adding user's nickname.
@@ -8808,7 +8371,7 @@ msgstr "%s (@%s) figyelmedbe ajánlott egy hírt"
 #. TRANS: Body of @-reply notification e-mail.
 #. TRANS: %1$s is the sending user's name, $2$s is the StatusNet sitename,
 #. TRANS: %3$s is a URL to the notice, %4$s is the notice text,
-#. TRANS: %5$s is a URL to the full conversion if it exists (otherwise empty),
+#. TRANS: %5$s is the text "The full conversation can be read here:" and a URL to the full conversion if it exists (otherwise empty),
 #. TRANS: %6$s is a URL to reply to the notice, %7$s is a URL to all @-replies for the addressed user,
 #, php-format
 msgid ""
@@ -8833,6 +8396,10 @@ msgstr ""
 
 #. TRANS: Subject of group join notification e-mail.
 #. TRANS: %1$s is the joining user's nickname, %2$s is the group name, and %3$s is the StatusNet sitename.
+#, fuzzy, php-format
+msgid "%1$s has joined your group %2$s on %3$s"
+msgstr "%1$s csatlakozott a(z) %2$s csoporthoz"
+
 #. TRANS: Main body of group join notification e-mail.
 #. TRANS: %1$s is the subscriber's long name, %2$s is the group name, and %3$s is the StatusNet sitename,
 #. TRANS: %4$s is a block of profile info about the subscriber.
@@ -8923,9 +8490,10 @@ msgid "Make Admin"
 msgstr ""
 
 #. TRANS: Submit button title.
+#, fuzzy
 msgctxt "TOOLTIP"
-msgid "Make this user an admin"
-msgstr ""
+msgid "Make this user an admin."
+msgstr "A felhasználó legyen a csoport kezelője"
 
 #. TRANS: Client exception thrown when a database error was thrown during a file upload operation.
 msgid "There was a database error while saving your file. Please try again."
@@ -8971,7 +8539,7 @@ msgstr "Küldjünk egy üzenetet közvetlenül"
 msgid "Select recipient:"
 msgstr "Válassz egy szolgáltatót"
 
-#. TRANS Entry in drop-down selection box in direct-message inbox/outbox when no one is available to message.
+#. TRANS: Entry in drop-down selection box in direct-message inbox/outbox when no one is available to message.
 #, fuzzy
 msgid "No mutual subscribers."
 msgstr "Nem követed figyelemmel!"
@@ -9042,6 +8610,10 @@ msgstr ""
 msgid "You must implement either adaptNoticeListItem() or showNotice()."
 msgstr ""
 
+#. TRANS: Link description to show more items in a list.
+msgid "More â–¼"
+msgstr ""
+
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 msgid "Nickname cannot be empty."
 msgstr ""
@@ -9090,10 +8662,6 @@ msgctxt "SEPARATOR"
 msgid ", "
 msgstr ", "
 
-#. TRANS: Start of profile addressees list.
-msgid " â–¸ "
-msgstr " â–¸ "
-
 #. TRANS: Used in coordinates as abbreviation of north.
 msgid "N"
 msgstr "É"
@@ -9132,7 +8700,8 @@ msgid "Repeated by"
 msgstr "Megismételte:"
 
 #. TRANS: Link title in notice list item to reply to a notice.
-msgid "Reply to this notice"
+#, fuzzy
+msgid "Reply to this notice."
 msgstr "Válaszoljunk erre a hírre"
 
 #. TRANS: Link text in notice list item to reply to a notice.
@@ -9140,7 +8709,8 @@ msgid "Reply"
 msgstr "Válasz"
 
 #. TRANS: Link title in notice list item to delete a notice.
-msgid "Delete this notice"
+#, fuzzy
+msgid "Delete this notice from the timeline."
 msgstr "Töröljük ezt a hírt"
 
 #. TRANS: Title for repeat form status in notice list when a notice has been repeated.
@@ -9167,27 +8737,6 @@ msgstr "Megbök"
 msgid "Send a nudge to this user."
 msgstr "Bökjük meg ezt a felhasználót"
 
-#. TRANS: Exception thrown when creating a new profile fails in OAuth store.
-msgid "Error inserting new profile."
-msgstr "Hiba az új profil beszúrásakor."
-
-#. TRANS: Exception thrown when creating a new avatar fails in OAuth store.
-msgid "Error inserting avatar."
-msgstr "Hiba az avatár beszúrásakor."
-
-#. TRANS: Exception thrown when creating a remote profile fails in OAuth store.
-msgid "Error inserting remote profile."
-msgstr "Hiba a távoli profil beszúrásakor."
-
-#. TRANS: Exception thrown when a notice is denied because it has been sent before.
-msgid "Duplicate notice."
-msgstr ""
-
-#. TRANS: Exception thrown when creating a new subscription fails in OAuth store.
-#, fuzzy
-msgid "Could not insert new subscription."
-msgstr "Nem sikerült beilleszteni a megerősítő kódot."
-
 #. TRANS: Server exception thrown in oEmbed action if no API endpoint is available.
 msgid "No oEmbed API endpoint available."
 msgstr ""
@@ -9266,10 +8815,6 @@ msgstr "Szerkesztés"
 msgid "Edit %s list by you."
 msgstr ""
 
-#. TRANS: Link description for link to list of users tagged with a tag.
-msgid "Tagged"
-msgstr "Címkézve"
-
 #. TRANS: Title for link to edit list settings.
 msgid "Edit list settings."
 msgstr "Listabeállítások szerkesztése."
@@ -9418,8 +8963,11 @@ msgctxt "plugin"
 msgid "Enable"
 msgstr "Engedélyezés"
 
+#. TRANS: Plugin description for a disabled plugin.
+#, fuzzy
 msgctxt "plugin-description"
-msgid "(Plugin descriptions unavailable when disabled.)"
+msgid ""
+"(The plugin description is unavailable when a plugin has been disabled.)"
 msgstr "(A kiegészítők leírásai nem elérhetőek, ha le vannak tiltva.)"
 
 #. TRANS: Menu item in primary navigation panel.
@@ -9433,6 +8981,11 @@ msgstr "SMS beállítások"
 msgid "Change your personal settings."
 msgstr "Változtasd meg a jelszavad"
 
+#. TRANS: Menu item in primary navigation panel.
+msgctxt "MENU"
+msgid "Admin"
+msgstr "Adminisztrátor"
+
 #. TRANS: Menu item title in primary navigation panel.
 #, fuzzy
 msgid "Site configuration."
@@ -9454,16 +9007,8 @@ msgstr "Kijelentkezés a webhelyről"
 msgid "Login to the site."
 msgstr "Bejelentkezés a webhelyre"
 
-#. TRANS: Menu item in primary navigation panel.
-#, fuzzy
-msgctxt "MENU"
-msgid "Search"
-msgstr "Keresés"
-
-#. TRANS: Menu item title in primary navigation panel.
-#, fuzzy
-msgid "Search the site."
-msgstr "A webhely témája."
+msgid "This profile has been silenced by site moderators"
+msgstr ""
 
 #. TRANS: H2 text for user subscription statistics.
 msgid "Following"
@@ -9473,6 +9018,10 @@ msgstr "Követ"
 msgid "Followers"
 msgstr "Követők"
 
+#. TRANS: H2 text for user statistics.
+msgid "Statistics"
+msgstr "Statisztika"
+
 #. TRANS: Label for user statistics.
 msgid "User ID"
 msgstr "Felhasználói azonosító"
@@ -9481,10 +9030,6 @@ msgstr "Felhasználói azonosító"
 msgid "Member since"
 msgstr "Tagság kezdete:"
 
-#. TRANS: Label for user statistics.
-msgid "Notices"
-msgstr "Hírek"
-
 #. TRANS: Label for user statistics.
 #. TRANS: Average count of posts made per day since account registration.
 msgid "Daily average"
@@ -9575,6 +9120,7 @@ msgid "Keyword(s)"
 msgstr "Kulcsszavak"
 
 #. TRANS: Button text for searching site.
+#. TRANS: Button text for search button on search form.
 #. TRANS: Button text to search profiles.
 msgctxt "BUTTON"
 msgid "Search"
@@ -9625,24 +9171,6 @@ msgstr "Keressünk a hírek tartalmában"
 msgid "Find groups on this site"
 msgstr "Csoportok keresése az oldalon"
 
-#. TRANS: Secondary navigation menu item leading to help on StatusNet.
-#, fuzzy
-msgctxt "MENU"
-msgid "Help"
-msgstr "Súgó"
-
-#. TRANS: Secondary navigation menu item leading to text about StatusNet site.
-#, fuzzy
-msgctxt "MENU"
-msgid "About"
-msgstr "Névjegy"
-
-#. TRANS: Secondary navigation menu item leading to Frequently Asked Questions.
-#, fuzzy
-msgctxt "MENU"
-msgid "FAQ"
-msgstr "GyIK"
-
 #. TRANS: Secondary navigation menu item leading to Terms of Service.
 #, fuzzy
 msgctxt "MENU"
@@ -9667,19 +9195,6 @@ msgctxt "MENU"
 msgid "Version"
 msgstr "Munkamenetek"
 
-#. TRANS: Secondary navigation menu item leading to e-mail contact information on the
-#. TRANS: StatusNet site, where to report bugs, ...
-#, fuzzy
-msgctxt "MENU"
-msgid "Contact"
-msgstr "Kapcsolat"
-
-#. TRANS: Secondary navigation menu item. Leads to information about embedding a timeline widget.
-#, fuzzy
-msgctxt "MENU"
-msgid "Badge"
-msgstr "Megbök"
-
 #. TRANS: Default title for section/sidebar widget.
 msgid "Untitled section"
 msgstr "Névtelen szakasz"
@@ -9728,10 +9243,6 @@ msgstr "E-mail"
 msgid "Change email handling"
 msgstr "Email kezelés megváltoztatása"
 
-#. TRANS: Menu item title in settings navigation panel.
-msgid "Design your profile"
-msgstr "Profil tervezése"
-
 #. TRANS: Menu item in settings navigation panel.
 #, fuzzy
 msgctxt "MENU"
@@ -9771,6 +9282,15 @@ msgstr "Kapcsolatok"
 msgid "Authorized connected applications"
 msgstr ""
 
+#. TRANS: Menu item in settings navigation panel.
+msgctxt "MENU"
+msgid "Old school"
+msgstr ""
+
+#. TRANS: Menu item title in settings navigation panel.
+msgid "UI tweaks for old-school users"
+msgstr ""
+
 #. TRANS: Title of form to silence a user.
 #, fuzzy
 msgctxt "TITLE"
@@ -9781,6 +9301,42 @@ msgstr "A webhely híre"
 msgid "Silence this user"
 msgstr ""
 
+#. TRANS: Server error displayed when trying to create an anynymous OAuth consumer.
+#, fuzzy
+msgid "Could not create anonymous consumer."
+msgstr "Nem sikerült létrehozni az álneveket."
+
+#. TRANS: Server error displayed when trying to create an anynymous OAuth application.
+#, fuzzy
+msgid "Could not create anonymous OAuth application."
+msgstr "Nem sikerült létrehozni az alkalmazást."
+
+#. TRANS: Exception thrown when no token association could be found.
+msgid ""
+"Could not find a profile and application associated with the request token."
+msgstr ""
+
+#. TRANS: Exception thrown when no access token can be issued.
+#, fuzzy
+msgid "Could not issue access token."
+msgstr "Nem sikerült az üzenetet feldolgozni."
+
+#. TRANS: Exception thrown when a database error occurs.
+msgid "Database error inserting OAuth application user."
+msgstr ""
+
+#. TRANS: Exception thrown when a database error occurs.
+msgid "Database error updating OAuth application user."
+msgstr ""
+
+#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
+msgid "Tried to revoke unknown token."
+msgstr ""
+
+#. TRANS: Exception thrown when an attempt is made to remove a revoked token.
+msgid "Failed to delete revoked token."
+msgstr ""
+
 #. TRANS: Menu item in local navigation menu.
 #, fuzzy
 msgctxt "MENU"
@@ -9841,6 +9397,18 @@ msgstr ""
 msgid "Subscribe to this user"
 msgstr "Feliratkozás a felhasználóra"
 
+#. TRANS: Button text to subscribe to a user.
+#. TRANS: Button text for subscribing to a list.
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Subscribe"
+msgstr "Kövessük"
+
+#. TRANS: Button title to subscribe to a user.
+#, fuzzy
+msgid "Subscribe to this user."
+msgstr "Ezen felhasználók híreire már feliratkoztál:"
+
 #. TRANS: Title of personal tag cloud section.
 msgid "People Tagcloud as self-tagged"
 msgstr ""
@@ -9962,16 +9530,26 @@ msgstr[1] ""
 #. TRANS: List message for notice repeated by logged in user.
 #, fuzzy
 msgctxt "REPEATLIST"
-msgid "You have repeated this notice."
+msgid "You repeated this."
 msgstr "Ne töröljük ezt a hírt"
 
-#. TRANS: List message for repeated notices.
-#. TRANS: %d is the number of users that have repeated a notice.
+#. TRANS: List message for when more than 4 people repeat something.
+#. TRANS: %%s is a list of users liking a notice, %d is the number over 4 that like the notice.
+#. TRANS: Plural is decided on the total number of users liking the notice (count of %%s + %d).
+#, php-format
+msgid "%%s and %d other repeated this."
+msgid_plural "%%s and %d others repeated this."
+msgstr[0] ""
+msgstr[1] ""
+
+#. TRANS: List message for favoured notices.
+#. TRANS: %%s is a list of users liking a notice.
+#. TRANS: Plural is based on the number of of users that have favoured a notice.
 #, fuzzy, php-format
-msgid "One person has repeated this notice."
-msgid_plural "%d people have repeated this notice."
-msgstr[0] "Már megismételted azt a hírt."
-msgstr[1] "Már megismételted azt a hírt."
+msgid "%%s repeated this."
+msgid_plural "%%s repeated this."
+msgstr[0] "Ne töröljük ezt a hírt"
+msgstr[1] "Ne töröljük ezt a hírt"
 
 #. TRANS: Form legend.
 #, php-format
@@ -10066,7 +9644,6 @@ msgid "Unsilence this user"
 msgstr ""
 
 #. TRANS: Form legend on unsubscribe form.
-#. TRANS: Button title on unsubscribe form.
 msgid "Unsubscribe from this user"
 msgstr ""
 
@@ -10077,6 +9654,11 @@ msgctxt "BUTTON"
 msgid "Unsubscribe"
 msgstr "Kövessük"
 
+#. TRANS: Button title on unsubscribe form.
+#, fuzzy
+msgid "Unsubscribe from this user."
+msgstr "Ezen felhasználók híreire már feliratkoztál:"
+
 #. TRANS: Exception text shown when no profile can be found for a user.
 #. TRANS: %1$s is a user nickname, $2$d is a user ID (number).
 #, fuzzy, php-format
@@ -10160,8 +9742,6 @@ msgstr "Érvénytelen XML, hiányzó XRD gyökér."
 msgid "Getting backup from file '%s'."
 msgstr ""
 
-#~ msgid "%1$s and friends, page %2$d"
-#~ msgstr "%1$s és barátai, %2$d oldal"
-
-#~ msgid "You and friends"
-#~ msgstr "Te és a barátaid"
+#, fuzzy
+#~ msgid " "
+#~ msgstr ", "
diff --git a/locale/ia/LC_MESSAGES/statusnet.po b/locale/ia/LC_MESSAGES/statusnet.po
index 9d93afd887..9138f9c400 100644
--- a/locale/ia/LC_MESSAGES/statusnet.po
+++ b/locale/ia/LC_MESSAGES/statusnet.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Core to Interlingua (Interlingua)
+# Translation of StatusNet - Core to Interlingua (interlingua)
 # Exported from translatewiki.net
 #
 # Author: McDutchie
@@ -9,17 +9,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:16+0000\n"
-"Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:11+0000\n"
+"Language-Team: Interlingua <https://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-05-05 10:52:40+0000\n"
+"X-POT-Import-Date: 2012-04-22 22:02:21+0000\n"
 
 #. TRANS: Database error message.
 #, php-format
@@ -34,14 +34,6 @@ msgstr ""
 "problema, ma tu pote contactar les a %2$s pro assecurar te de isto. "
 "Alternativemente, attende alcun minutas e reproba."
 
-#. TRANS: Error message.
-msgid ""
-"An important error occured, probably related to email setup. Check logfiles "
-"for more info."
-msgstr ""
-"Un error importante occurreva, probabilemente connexe al configuration de e-"
-"mail. Examina le files de registro pro plus informationes."
-
 #. TRANS: Error message.
 msgid "An error occurred."
 msgstr "Un error ha occurrite."
@@ -102,12 +94,11 @@ msgstr "Disactivar le creation de nove contos."
 msgid "Closed"
 msgstr "Claudite"
 
-#. TRANS: Title for button to save access settings in site admin panel.
-msgid "Save access settings"
-msgstr "Salveguardar configurationes de accesso"
+#. TRANS: Button title to save access settings in site admin panel.
+msgid "Save access settings."
+msgstr "Salveguardar configurationes de accesso."
 
-#. TRANS: Tooltip for button to save access settings in site admin panel.
-#. TRANS: Button text for saving theme settings.
+#. TRANS: Button text to save access settings in site admin panel.
 #. TRANS: Button label to save e-mail preferences.
 #. TRANS: Button label to save IM preferences.
 #. TRANS: Button text in the license admin panel.
@@ -123,7 +114,6 @@ msgstr "Salveguardar configurationes de accesso"
 #. TRANS: Button text for saving "Other settings" in profile.
 #. TRANS: Button text to save user settings in user admin panel.
 #. TRANS: Button label in the "Edit application" form.
-#. TRANS: Button text on profile design page to save settings.
 #. TRANS: Text for save button on group edit form.
 #. TRANS: Button text to save tags for a profile.
 msgctxt "BUTTON"
@@ -162,10 +152,6 @@ msgstr "Profilo non existe."
 msgid "No such list."
 msgstr "Lista non existe."
 
-#. TRANS: Client error displayed when trying to add an OMB 0.1 remote profile to a list.
-msgid "You cannot list an OMB 0.1 remote profile with this action."
-msgstr "Tu non pote listar un profilo remote OMB 0.1 con iste action."
-
 #. TRANS: Client error displayed when an unknown error occurs when adding a user to a list.
 #. TRANS: %s is a username.
 #, php-format
@@ -197,7 +183,6 @@ msgstr "Pagina non existe."
 #. TRANS: Client error when user not found for an rss related action.
 #. TRANS: Client error displayed when no existing user is provided for a user's delivery device setting.
 #. TRANS: Client error displayed if a user could not be found.
-#. TRANS: Client error when user not found updating a profile background image.
 #. TRANS: Client error displayed updating profile image without having a user object.
 #. TRANS: Client error displayed when making an Atom API request for an unknown user.
 #. TRANS: Client error displayed when trying to block a non-existing user or a user from another site.
@@ -223,14 +208,11 @@ msgstr "Pagina non existe."
 #. TRANS: Client error displayed when trying to get the RSS feed with favorites of a user that does not exist.
 #. TRANS: Client error displayed when requesting Friends of a Friend feed without providing a user nickname.
 #. TRANS: Client error displayed when requesting Friends of a Friend feed for an object that is not a user.
-#. TRANS: Client error displayed when trying to get a user hCard for a non-existing user.
 #. TRANS: Client error displayed trying to make a micro summary without providing a valid user.
 #. TRANS: Client error displayed trying to send a direct message to a non-existing user.
 #. TRANS: Client error displayed trying to use "one time password login" without using an existing user.
 #. TRANS: Client error displayed when referring to non-existing user.
 #. TRANS: Client error displayed trying to perform an action related to a non-existing user.
-#. TRANS: Form validation error on page for remote subscribe when no user was provided.
-#. TRANS: Form validation error on page for remote subscribe when no user profile was found.
 #. TRANS: Client error displayed when trying to reply to a non-exsting user.
 #. TRANS: Client error displayed when providing a non-existing nickname in a RSS 1.0 action.
 #. TRANS: Client error.
@@ -239,7 +221,6 @@ msgstr "Pagina non existe."
 #. TRANS: Client error displayed trying to find a user by ID for a non-existing ID.
 #. TRANS: Client error displayed requesting groups for a non-existing user.
 #. TRANS: Client error displayed when user not found for an action.
-#. TRANS: Client error displayed providing a non-existing nickname.
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #. TRANS: Client error displayed when trying to perform a gallery action with an unknown user.
 #. TRANS: Client error displayed when trying to access a mailbox without providing a user.
@@ -248,15 +229,21 @@ msgid "No such user."
 msgstr "Iste usator non existe."
 
 #. TRANS: Title of a user's own start page.
-#, fuzzy
 msgid "Home timeline"
-msgstr "Chronologia de %s"
+msgstr "Chronologia initial"
 
 #. TRANS: Title of another user's start page.
 #. TRANS: %s is the other user's name.
-#, fuzzy, php-format
+#, php-format
 msgid "%s's home timeline"
-msgstr "Chronologia de %s"
+msgstr "Chronologia initial de %s"
+
+#. TRANS: %s is user nickname.
+#. TRANS: Feed title.
+#. TRANS: %s is tagger's nickname.
+#, php-format
+msgid "Feed for friends of %s (Activity Streams JSON)"
+msgstr "Syndication pro le amicos de %s (Activity Streams JSON)"
 
 #. TRANS: %s is user nickname.
 #, php-format
@@ -303,7 +290,7 @@ msgstr ""
 "Tu pote tentar [dar un pulsata a %1$s](../%2$s) in su profilo o [publicar un "
 "message a su attention](%%%%action.newnotice%%%%?status_textarea=%3$s)."
 
-#. TRANS: Encoutagement displayed on empty timeline user pages for anonymous users.
+#. TRANS: Encouragement displayed on empty timeline user pages for anonymous users.
 #. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
 #. TRANS: Empty list message for page with replies for a user for not logged in users.
 #. TRANS: %1$s is a user nickname. This message contains a Markdown link in the form [link text](link).
@@ -317,6 +304,12 @@ msgstr ""
 "Proque non [registrar un conto](%%%%action.register%%%%) e postea dar un "
 "pulsata a %s o publicar un message a su attention."
 
+#. TRANS: Button text for inviting more users to the StatusNet instance.
+#. TRANS: Less business/enterprise-oriented language for public sites.
+msgctxt "BUTTON"
+msgid "Send invite"
+msgstr "Inviar invitation"
+
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Title of API timeline for a user and friends.
 #. TRANS: %s is a username.
@@ -325,8 +318,6 @@ msgstr ""
 #. TRANS: %s is a username.
 #. TRANS: Menu item title in personal group navigation menu.
 #. TRANS: %s is a username.
-#. TRANS: Menu item title in settings navigation panel.
-#. TRANS: %s is a username.
 #, php-format
 msgid "%s and friends"
 msgstr "%s e amicos"
@@ -366,7 +357,6 @@ msgstr ""
 #. TRANS: Server error thrown on database error updating SMS preferences.
 #. TRANS: Server error thrown on database error removing a registered SMS phone number.
 #. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
-#. TRANS: Server exception thrown on Profile design page when updating design settings fails.
 msgid "Could not update user."
 msgstr "Non poteva actualisar le usator."
 
@@ -381,7 +371,6 @@ msgstr "Non poteva salveguardar le profilo."
 
 #. TRANS: Client error displayed when the number of bytes in a POST request exceeds a limit.
 #. TRANS: %s is the number of bytes of the CONTENT_LENGTH.
-#. TRANS: Form validation error in design settings form. POST should remain untranslated.
 #, php-format
 msgid ""
 "The server was unable to handle that much POST data (%s byte) due to its "
@@ -396,24 +385,6 @@ msgstr[1] ""
 "Le servitor non ha potite tractar tante datos POST (%s bytes) a causa de su "
 "configuration actual."
 
-#. TRANS: Client error displayed when saving design settings fails because of an empty id.
-#. TRANS: Client error displayed when saving design settings fails because of an empty result.
-#. TRANS: Client error displayed when a database error occurs inserting profile colours.
-#. TRANS: Client error displayed when a database error occurs updating profile colours.
-#. TRANS: Form validation error displayed when group design settings could not be saved because of an application issue.
-#. TRANS: Form validation error on Profile design page when saving design settings has failed.
-#. TRANS: Form validation error on Profile design page when updating design settings has failed.
-msgid "Unable to save your design settings."
-msgstr "Impossibile salveguardar le configurationes del apparentia."
-
-#. TRANS: Error displayed when updating design settings fails.
-#. TRANS: Client error displayed when a database error occurs updating profile colours.
-#. TRANS: Form validation error on Profile design page when updating design settings has failed.
-#. TRANS: Error message displayed if design settings could not be saved.
-#. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
-msgid "Could not update your design."
-msgstr "Non poteva actualisar le apparentia."
-
 #. TRANS: Title for Atom feed.
 msgctxt "ATOM"
 msgid "Main"
@@ -460,6 +431,20 @@ msgstr "Le blocada del usator ha fallite."
 msgid "Unblock user failed."
 msgstr "Le disblocada del usator ha fallite."
 
+#. TRANS: Client exception thrown when no conversation ID is given.
+msgid "No conversation ID."
+msgstr "Nulle ID de conversation."
+
+#. TRANS: Client exception thrown when referring to a non-existing conversation ID (%d).
+#, php-format
+msgid "No conversation with ID %d."
+msgstr "Il non ha un conversation con ID %d."
+
+#. TRANS: Title for conversion timeline.
+msgctxt "TITLE"
+msgid "Conversation"
+msgstr "Conversation"
+
 #. TRANS: Title. %s is a user nickname.
 #, php-format
 msgid "Direct messages from %s"
@@ -505,6 +490,8 @@ msgid "Cannot send direct messages to users who aren't your friend."
 msgstr "Non pote inviar messages directe a usatores que non es tu amicos."
 
 #. TRANS: Client error displayed trying to direct message self (403).
+#. TRANS: Client error displayed trying to send a direct message to self.
+#. TRANS: Error text shown when trying to send a direct message to self.
 msgid ""
 "Do not send a message to yourself; just say it to yourself quietly instead."
 msgstr "Non invia un message a te mesme; il suffice susurrar lo discretemente."
@@ -618,7 +605,7 @@ msgstr "Le nomine complete es troppo longe (maximo 255 characteres)."
 #, php-format
 msgid "Description is too long (maximum %d character)."
 msgid_plural "Description is too long (maximum %d characters)."
-msgstr[0] "Description es troppo longe (maximo %d characteres)."
+msgstr[0] "Description es troppo longe (maximo %d character)."
 msgstr[1] "Description es troppo longe (maximo %d characteres)."
 
 #. TRANS: Client error shown when providing too long a location during group creation.
@@ -733,7 +720,6 @@ msgstr "gruppos in %s"
 
 #. TRANS: Client error displayed when trying to edit a group without being an admin.
 #. TRANS: Client error displayed trying to edit a group while not being a group admin.
-#. TRANS: Client error displayed trying to change group design settings without being a (group) admin.
 #. TRANS: Client error displayed when trying to change group logo settings while not being a group admin.
 msgid "You must be an admin to edit the group."
 msgstr "Tu debe esser administrator pro modificar le gruppo."
@@ -843,7 +829,6 @@ msgstr ""
 
 #. TRANS: Client error given on when invalid data was passed through a form in the OAuth API.
 #. TRANS: Unexpected validation error on avatar upload form.
-#. TRANS: Client error displayed when the submitted form contains unexpected data.
 #. TRANS: Client error displayed submitting invalid form data for edit application.
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
 #. TRANS: Form validation error message when an unsupported argument is used.
@@ -852,7 +837,6 @@ msgstr ""
 #. TRANS: Client error when submitting a form with unexpected information.
 #. TRANS: Client error displayed when unexpected data is posted in the password recovery form.
 #. TRANS: Message given submitting a form with an unknown action in SMS settings.
-#. TRANS: Unknown form validation error in design settings form.
 msgid "Unexpected form submission."
 msgstr "Submission de formulario inexpectate."
 
@@ -897,7 +881,6 @@ msgstr "Conto"
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Field label on account registration page.
-#. TRANS: Label for nickname on user authorisation page.
 #. TRANS: Field label on group edit form.
 #. TRANS: Dropdown option for searching in profiles.
 msgid "Nickname"
@@ -1197,7 +1180,7 @@ msgstr "Usator non trovate."
 
 #. TRANS: Client error displayed when trying to leave a group while not logged in.
 msgid "You must be logged in to leave a group."
-msgstr "Tu debe aperir un session pro quitar un gruppo."
+msgstr "Tu debe aperir un session pro poter quitar un gruppo."
 
 #. TRANS: Client error displayed when trying to leave a non-local group.
 #. TRANS: Client error displayed when trying to leave a non-existing group.
@@ -1214,12 +1197,9 @@ msgstr "Tu debe aperir un session pro quitar un gruppo."
 #. TRANS: Client error displayed when requesting Friends of a Friend feed for a nickname that is not a group.
 #. TRANS: Client error displayed trying to block a user from a group while specifying a non-existing group.
 #. TRANS: Client error displayed referring to a group's permalink for a non-existing group ID.
-#. TRANS: Client error displayed trying to change group design settings while providing a nickname for a non-existing group.
 #. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
 #. TRANS: Client error displayed when trying to view group members for a non-existing group.
 #. TRANS: Client error displayed when trying to view group members for an object that is not a group.
-#. TRANS: Client error displayed when trying to view group members for a non-existing group.
-#. TRANS: Client error displayed when trying to view group members for an object that is not a group.
 #. TRANS: Client error displayed when requesting a group RSS feed for group that does not exist.
 #. TRANS: Client error displayed when requesting a group RSS feed for an object that is not a group.
 #. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
@@ -1228,10 +1208,10 @@ msgstr "Tu debe aperir un session pro quitar un gruppo."
 #. TRANS: Client error displayed when trying to leave a non-local group.
 #. TRANS: Client error displayed when trying to leave a non-existing group.
 #. TRANS: Client error displayed when providing an invalid group ID on the Make Admin page.
-#. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
-#. TRANS: Client error displayed if no local group with a given name was found requesting group page.
 #. TRANS: Command exception text shown when a group is requested that does not exist.
 #. TRANS: Error text shown when trying to leave a group that does not exist.
+#. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
+#. TRANS: Client error displayed if no local group with a given name was found requesting group page.
 msgid "No such group."
 msgstr "Gruppo non existe."
 
@@ -1301,6 +1281,7 @@ msgid "Join request canceled."
 msgstr "Requesta de adhesion cancellate."
 
 #. TRANS: Client error displayed trying to approve subscription for a non-existing request.
+#. TRANS: %s is a user nickname.
 #, php-format
 msgid "%s is not in the moderation queue for your subscriptions."
 msgstr "%s non es in le cauda de moderation pro tu subscriptiones."
@@ -1452,7 +1433,6 @@ msgstr "Annexo non existe."
 #. TRANS: Client error displayed trying to get an avatar without providing a nickname.
 #. TRANS: Client error displayed when requesting a list of blocked users for a group without providing a group nickname.
 #. TRANS: Client error displayed trying to edit a group while not proving a nickname for the group to edit.
-#. TRANS: Client error displayed trying to change group design settings without providing a group nickname.
 #. TRANS: Client error displayed when trying to change group logo settings without providing a nickname.
 #. TRANS: Client error displayed when trying to view group members without providing a group nickname.
 #. TRANS: Client error displayed when requesting a group RSS feed without providing a group nickname.
@@ -1749,6 +1729,16 @@ msgstr "Le adresse \"%s\" ha essite confirmate pro tu conto."
 msgid "Conversation"
 msgstr "Conversation"
 
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+msgid "Conversation feed (Activity Streams JSON)"
+msgstr "Syndication de conversationes (Activity Streams JSON)"
+
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+msgid "Conversation feed (RSS 2.0)"
+msgstr "Syndication de conversationes (RSS 2.0)"
+
 #. TRANS: Title for conversation page.
 #. TRANS: Title for page that shows a notice.
 msgctxt "TITLE"
@@ -1812,8 +1802,8 @@ msgid "Enter \"%s\" to confirm that you want to delete your account."
 msgstr "Entra \"%s\" pro confirmar que tu vole deler tu conto."
 
 #. TRANS: Button title for user account deletion.
-msgid "Permanently delete your account"
-msgstr "Deler permanentemente tu conto"
+msgid "Permanently delete your account."
+msgstr "Deler permanentemente tu conto."
 
 #. TRANS: Client error displayed trying to delete an application while not logged in.
 msgid "You must be logged in to delete an application."
@@ -1859,7 +1849,7 @@ msgstr "Deler iste application."
 
 #. TRANS: Client error when trying to delete group while not logged in.
 msgid "You must be logged in to delete a group."
-msgstr "Tu debe aperir un session pro deler un gruppo."
+msgstr "Tu debe aperir un session pro poter deler un gruppo."
 
 #. TRANS: Client error when trying to delete a group without having the rights to delete it.
 msgid "You are not allowed to delete this group."
@@ -1958,152 +1948,6 @@ msgstr "Non deler iste usator."
 msgid "Delete this user."
 msgstr "Deler iste usator."
 
-#. TRANS: Message used as title for design settings for the site.
-msgid "Design"
-msgstr "Apparentia"
-
-#. TRANS: Instructions for design adminsitration panel.
-msgid "Design settings for this StatusNet site"
-msgstr "Configuration del apparentia de iste sito StatusNet"
-
-#. TRANS: Client error displayed when a logo URL does is not valid.
-msgid "Invalid logo URL."
-msgstr "URL de logotypo invalide."
-
-#. TRANS: Client error displayed when an SSL logo URL is invalid.
-msgid "Invalid SSL logo URL."
-msgstr "URL de logotypo SSL invalide."
-
-#. TRANS: Client error displayed when a theme is submitted through the form that is not in the theme list.
-#. TRANS: %s is the chosen unavailable theme.
-#, php-format
-msgid "Theme not available: %s."
-msgstr "Thema non disponibile: %s."
-
-#. TRANS: Fieldset legend for form to change logo.
-msgid "Change logo"
-msgstr "Cambiar logotypo"
-
-#. TRANS: Field label for StatusNet site logo.
-msgid "Site logo"
-msgstr "Logotypo del sito"
-
-#. TRANS: Field label for SSL StatusNet site logo.
-msgid "SSL logo"
-msgstr "Logotypo SSL"
-
-#. TRANS: Fieldset legend for form change StatusNet site's theme.
-msgid "Change theme"
-msgstr "Cambiar thema"
-
-#. TRANS: Field label for dropdown to choose site theme.
-msgid "Site theme"
-msgstr "Thema del sito"
-
-#. TRANS: Title for field label for dropdown to choose site theme.
-msgid "Theme for the site."
-msgstr "Le thema de apparentia pro le sito."
-
-#. TRANS: Field label for uploading a cutom theme.
-msgid "Custom theme"
-msgstr "Apparentia personalisate"
-
-#. TRANS: Form instructions for uploading a cutom StatusNet theme.
-msgid "You can upload a custom StatusNet theme as a .ZIP archive."
-msgstr ""
-"Es possibile incargar un apparentia personalisate de StatusNet in un "
-"archivo .ZIP."
-
-#. TRANS: Fieldset legend for theme background image.
-msgid "Change background image"
-msgstr "Cambiar imagine de fundo"
-
-#. TRANS: Field label for background image on theme designer page.
-#. TRANS: Field label for background color selector.
-#. TRANS: Label on profile design page for setting a profile page background colour.
-msgid "Background"
-msgstr "Fundo"
-
-#. TRANS: Form guide for background image upload form on theme designer page.
-#, php-format
-msgid ""
-"You can upload a background image for the site. The maximum file size is %1"
-"$s."
-msgstr ""
-"Tu pote incargar un imagine de fundo pro le sito. Le dimension maximal del "
-"file es %1$s."
-
-#. TRANS: Used as radio button label to add a background image.
-msgid "On"
-msgstr "Active"
-
-#. TRANS: Used as radio button label to not add a background image.
-msgid "Off"
-msgstr "Non active"
-
-#. TRANS: Form guide for turning background image on or off on theme designer page.
-#. TRANS: Form guide for a set of radio buttons on the profile design page that will enable or disable
-#. TRANS: use of the uploaded profile image.
-msgid "Turn background image on or off."
-msgstr "Activar o disactivar le imagine de fundo."
-
-#. TRANS: Checkbox label to title background image on theme designer page.
-#. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
-msgid "Tile background image"
-msgstr "Tegular le imagine de fundo"
-
-#. TRANS: Fieldset legend for theme colors.
-msgid "Change colors"
-msgstr "Cambiar colores"
-
-#. TRANS: Field label for content color selector.
-#. TRANS: Label on profile design page for setting a profile page content colour.
-msgid "Content"
-msgstr "Contento"
-
-#. TRANS: Field label for sidebar color selector.
-#. TRANS: Label on profile design page for setting a profile page sidebar colour.
-msgid "Sidebar"
-msgstr "Barra lateral"
-
-#. TRANS: Field label for text color selector.
-#. TRANS: Label on profile design page for setting a profile page text colour.
-msgid "Text"
-msgstr "Texto"
-
-#. TRANS: Field label for link color selector.
-#. TRANS: Label on profile design page for setting a profile page links colour.
-msgid "Links"
-msgstr "Ligamines"
-
-#. TRANS: Fieldset legend for advanced theme design settings.
-msgid "Advanced"
-msgstr "Avantiate"
-
-#. TRANS: Field label for custom CSS.
-msgid "Custom CSS"
-msgstr "CSS personalisate"
-
-#. TRANS: Button text for resetting theme settings.
-msgctxt "BUTTON"
-msgid "Use defaults"
-msgstr "Usar predefinitiones"
-
-#. TRANS: Title for button for resetting theme settings.
-#. TRANS: Title for button on profile design page to reset all colour settings to default.
-msgid "Restore default designs."
-msgstr "Restaurar apparentias predefinite."
-
-#. TRANS: Title for button for resetting theme settings.
-#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-msgid "Reset back to default."
-msgstr "Revenir al predefinitiones."
-
-#. TRANS: Title for button for saving theme settings.
-#. TRANS: Title for button on profile design page to save settings.
-msgid "Save design."
-msgstr "Salveguardar apparentia."
-
 #. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
 msgid "This notice is not a favorite!"
 msgstr "Iste nota non es favorite!"
@@ -2118,6 +1962,74 @@ msgstr "Adder al favorites"
 msgid "No such document \"%s\"."
 msgstr "Le documento \"%s\" non existe."
 
+#. TRANS: Menu item in administrator navigation panel.
+#. TRANS: Menu item in default local navigation panel.
+#. TRANS: Menu item in personal group navigation menu.
+msgctxt "MENU"
+msgid "Home"
+msgstr "Initio"
+
+msgctxt "MENU"
+msgid "Docs"
+msgstr "Documentation"
+
+#. TRANS: Secondary navigation menu item leading to help on StatusNet.
+msgctxt "MENU"
+msgid "Help"
+msgstr "Adjuta"
+
+msgid "Getting started"
+msgstr "Como initiar"
+
+#. TRANS: Secondary navigation menu item leading to text about StatusNet site.
+msgctxt "MENU"
+msgid "About"
+msgstr "A proposito"
+
+msgid "About this site"
+msgstr "A proposito de iste sito"
+
+#. TRANS: Secondary navigation menu item leading to Frequently Asked Questions.
+msgctxt "MENU"
+msgid "FAQ"
+msgstr "FAQ"
+
+msgid "Frequently asked questions"
+msgstr "Folio a questiones"
+
+#. TRANS: Secondary navigation menu item leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+msgctxt "MENU"
+msgid "Contact"
+msgstr "Contacto"
+
+msgid "Contact info"
+msgstr "Information de contacto"
+
+msgctxt "MENU"
+msgid "Tags"
+msgstr "Etiquettas"
+
+msgid "Using tags"
+msgstr "Como usar etiquettas"
+
+#. TRANS: Menu item in default local navigation panel.
+#. TRANS: Menu item in search group navigation panel.
+#. TRANS: Menu item in local navigation menu.
+msgctxt "MENU"
+msgid "Groups"
+msgstr "Gruppos"
+
+msgid "Using groups"
+msgstr "Como usar gruppos"
+
+msgctxt "MENU"
+msgid "API"
+msgstr "API"
+
+msgid "RESTful API"
+msgstr "API conforme a REST"
+
 #. TRANS: Title for "Edit application" form.
 #. TRANS: Form legend.
 msgid "Edit application"
@@ -2202,7 +2114,7 @@ msgstr "Modificar gruppo %s"
 #. TRANS: Client error displayed when trying to create a group while not logged in.
 #. TRANS: Client error displayed trying to create a group while not logged in.
 msgid "You must be logged in to create a group."
-msgstr "Tu debe aperir un session pro crear un gruppo."
+msgstr "Tu debe aperir un session pro poter crear un gruppo."
 
 #. TRANS: Form instructions for group edit form.
 msgid "Use this form to edit the group."
@@ -2280,7 +2192,7 @@ msgstr ""
 "Si tu mitte un etiquetta public a private, tote le subscriptiones existente "
 "a illo essera permanentemente cancellate. Es tu secur de voler continuar?"
 
-#. TRANS: TRANS: Server error displayed when updating a list fails.
+#. TRANS: Server error displayed when updating a list fails.
 msgid "Could not update list."
 msgstr "Non poteva actualisar le lista."
 
@@ -2584,40 +2496,6 @@ msgstr "Nulle annexo."
 msgid "No uploaded attachments."
 msgstr "Nulle annexo incargate."
 
-#. TRANS: Client error displayed when subscribing to a remote profile and an unexpected response is received.
-msgid "Not expecting this response!"
-msgstr "Non expectava iste responsa!"
-
-#. TRANS: Client error displayed when subscribing to a remote profile that does not exist.
-msgid "User being listened to does not exist."
-msgstr "Le usator sequite non existe."
-
-#. TRANS: Client error displayed when subscribing to a remote profile that is a local profile.
-#. TRANS: Client error displayed when using remote subscribe for a local entity.
-msgid "You can use the local subscription!"
-msgstr "Tu pote usar le subscription local!"
-
-#. TRANS: Client error displayed when subscribing to a remote profile that is blocked form subscribing to.
-msgid "That user has blocked you from subscribing."
-msgstr "Iste usator te ha blocate de subscriber."
-
-#. TRANS: Client error displayed when subscribing to a remote profile without providing an authorised token.
-msgid "You are not authorized."
-msgstr "Tu non es autorisate."
-
-#. TRANS: Client error displayed when subscribing to a remote profile and conversion of the request token to access token fails.
-msgid "Could not convert request token to access token."
-msgstr "Non poteva converter le indicio de requesta in un indicio de accesso."
-
-#. TRANS: Client error displayed when subscribing to a remote profile fails because of an unsupported version of the OMB protocol.
-msgid "Remote service uses unknown version of OMB protocol."
-msgstr "Le servicio remote usa un version incognite del protocollo OMB."
-
-#. TRANS: Server error displayed when subscribing to a remote profile fails because the remote profile could not be updated.
-#. TRANS: Exception thrown when updating a remote profile fails in OAuth store.
-msgid "Error updating remote profile."
-msgstr "Error durante le actualisation del profilo remote."
-
 #. TRANS: Client error displayed when requesting a non-existent file.
 msgid "No such file."
 msgstr "File non existe."
@@ -2705,31 +2583,6 @@ msgstr "Error del base de datos al blocar le usator del gruppo."
 msgid "No ID."
 msgstr "Nulle ID."
 
-#. TRANS: Client error displayed trying to change group design settings while not logged in.
-msgid "You must be logged in to edit a group."
-msgstr "Tu debe aperir un session pro modificar un gruppo."
-
-#. TRANS: Title group design settings page.
-msgid "Group design"
-msgstr "Apparentia del gruppo"
-
-#. TRANS: Instructions for group design settings page.
-msgid ""
-"Customize the way your group looks with a background image and a colour "
-"palette of your choice."
-msgstr ""
-"Personalisa le apparentia de tu gruppo con un imagine de fundo e un paletta "
-"de colores de tu preferentia."
-
-#. TRANS: Form validation error displayed when group design settings could not be updated because of an application issue.
-msgid "Unable to update your design settings."
-msgstr "Impossibile actualisar le configurationes del apparentia."
-
-#. TRANS: Form text to confirm saved group design settings.
-#. TRANS: Confirmation message on Profile design page when saving design settings has succeeded.
-msgid "Design preferences saved."
-msgstr "Preferentias de apparentia salveguardate."
-
 #. TRANS: Title for group logo settings page.
 #. TRANS: Group logo form legend.
 msgid "Group logo"
@@ -2902,8 +2755,8 @@ msgstr "Configuration de messageria instantanee"
 #. TRANS: the order and formatting of link text and link should remain unchanged.
 #, php-format
 msgid ""
-"You can send and receive notices through instant messaging [instant messages]"
-"(%%doc.im%%). Configure your addresses and settings below."
+"You can send and receive notices through [instant messaging](%%doc.im%%). "
+"Configure your addresses and settings below."
 msgstr ""
 "Tu pote inviar e reciper notas per [messageria instantanee](%%doc.im%%). "
 "Configura tu adresse e parametros hic infra."
@@ -3105,28 +2958,6 @@ msgid ""
 msgstr ""
 "Usa iste formulario pro invitar tu amicos e collegas a usar iste servicio."
 
-#. TRANS: Field label for a list of e-mail addresses.
-msgid "Email addresses"
-msgstr "Adresses de e-mail"
-
-#. TRANS: Tooltip for field label for a list of e-mail addresses.
-msgid "Addresses of friends to invite (one per line)."
-msgstr "Adresses de amicos a invitar (un per linea)."
-
-#. TRANS: Field label for a personal message to send to invitees.
-msgid "Personal message"
-msgstr "Message personal"
-
-#. TRANS: Tooltip for field label for a personal message to send to invitees.
-msgid "Optionally add a personal message to the invitation."
-msgstr "Si tu vole, adde un message personal al invitation."
-
-#. TRANS: Send button for inviting friends
-#. TRANS: Button text for sending notice.
-msgctxt "BUTTON"
-msgid "Send"
-msgstr "Inviar"
-
 #. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral
 #. TRANS: singular 3rd-person pronoun in English. %1$s is the inviting user, $2$s is
 #. TRANS: the StatusNet sitename.
@@ -3259,12 +3090,6 @@ msgstr "Le URL de un imagine a monstrar con le licentia."
 msgid "Save license settings."
 msgstr "Salveguardar configurationes de licentia."
 
-#. TRANS: Client error displayed when trying to log in while already logged in.
-#. TRANS: Client error displayed trying to use "one time password login" when already logged in.
-#. TRANS: Client error displayed when trying to register while already logged in.
-msgid "Already logged in."
-msgstr "Tu es jam authenticate."
-
 #. TRANS: Form validation error displayed when trying to log in with incorrect credentials.
 msgid "Incorrect username or password."
 msgstr "Nomine de usator o contrasigno incorrecte."
@@ -3284,9 +3109,8 @@ msgid "Login to site"
 msgstr "Authenticar te a iste sito"
 
 #. TRANS: Field label on login page.
-#, fuzzy
 msgid "Username or email address"
-msgstr "Pseudonymo o adresse de e-mail"
+msgstr "Nomine de usator o adresse de e-mail"
 
 #. TRANS: Checkbox label label on login page.
 #. TRANS: Checkbox label on account registration page.
@@ -3377,6 +3201,7 @@ msgstr "Le URL de origine es requirite."
 msgid "Could not create application."
 msgstr "Non poteva crear application."
 
+#. TRANS: Form validation error messages displayed when uploading an invalid application logo.
 msgid "Invalid image."
 msgstr "Imagine invalide."
 
@@ -3413,12 +3238,6 @@ msgstr "Nulle contento!"
 msgid "No recipient specified."
 msgstr "Nulle destinatario specificate."
 
-#. TRANS: Client error displayed trying to send a direct message to self.
-#. TRANS: Error text shown when trying to send a direct message to self.
-msgid ""
-"Don't send a message to yourself; just say it to yourself quietly instead."
-msgstr "Non invia un message a te mesme; il suffice susurrar lo discretemente."
-
 #. TRANS: Page title after sending a direct message.
 msgid "Message sent"
 msgstr "Message inviate"
@@ -3625,6 +3444,32 @@ msgstr "Solmente le URLs %s es permittite super HTTP simple."
 msgid "Not a supported data format."
 msgstr "Formato de datos non supportate."
 
+#. TRANS: Page title for profile settings.
+msgid "Old school UI settings"
+msgstr "Configuration del ancian interfacie"
+
+#. TRANS: Usage instructions for profile settings.
+msgid "If you like it \"the old way\", you can set that here."
+msgstr "Si tu prefere \"le vetule maniera\", tu pote indicar lo hic."
+
+#. TRANS: Confirmation shown when user profile settings are saved.
+#. TRANS: Message after successful saving of administrative settings.
+msgid "Settings saved."
+msgstr "Preferentias confirmate."
+
+msgid "Only stream mode (no conversations) in timelines"
+msgstr "Solmente modo de fluxo (sin conversationes) in chronologias"
+
+msgid "Show conversation page as hierarchical trees"
+msgstr "Monstrar pagina de conversation como arbore hierarchic"
+
+msgid "Show nicknames (not full names) in timelines"
+msgstr "Monstrar pseudonymos (non nomines complete) in chronologias"
+
+#. TRANS: Button text to save a list.
+msgid "Save"
+msgstr "Salveguardar"
+
 #. TRANS: ShortName in the OpenSearch interface when trying to find users.
 msgid "People Search"
 msgstr "Recerca de personas"
@@ -3633,6 +3478,11 @@ msgstr "Recerca de personas"
 msgid "Notice Search"
 msgstr "Rercerca de notas"
 
+#. TRANS: Client error displayed trying to use "one time password login" when already logged in.
+#. TRANS: Client error displayed when trying to register while already logged in.
+msgid "Already logged in."
+msgstr "Tu es jam authenticate."
+
 #. TRANS: Client error displayed trying to use "one time password login" without specifying a user.
 msgid "No user ID specified."
 msgstr "Nulle identificator de usator specificate."
@@ -3703,7 +3553,7 @@ msgid "Confirm"
 msgstr "Confirmar"
 
 #. TRANS: Field title on page where to change password.
-#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
+#. TRANS: Title for field label for password reset form where the password has to be typed again.
 #. TRANS: Field title on account registration page.
 msgid "Same as password above."
 msgstr "Identic al contrasigno hic supra."
@@ -3761,12 +3611,6 @@ msgstr "Directorio de thema non legibile: %s."
 msgid "Avatar directory not writable: %s."
 msgstr "Directorio de avatar non scriptibile: %s."
 
-#. TRANS: Client error in Paths admin panel.
-#. TRANS: %s is the background directory that could not be written to.
-#, php-format
-msgid "Background directory not writable: %s."
-msgstr "Directorio de fundo non scriptibile: %s."
-
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the locales directory that could not be read from.
 #, php-format
@@ -3879,30 +3723,6 @@ msgstr "Directorio del avatares"
 msgid "Directory where avatars are located."
 msgstr "Cammino a ubi se trova le avatares."
 
-#. TRANS: Fieldset legend in Paths admin panel.
-msgid "Backgrounds"
-msgstr "Fundos"
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-msgid "Server for backgrounds."
-msgstr "Servitor pro fundos de schermo."
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-msgid "Web path to backgrounds."
-msgstr "Cammino web verso fundos de schermo."
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-msgid "Server for backgrounds on SSL pages."
-msgstr "Servitor pro fundos de schermo in paginas SSL."
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-msgid "Web path to backgrounds on SSL pages."
-msgstr "Cammino web verso fundos de schermo in paginas SSL."
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-msgid "Directory where backgrounds are located."
-msgstr "Cammino a ubi se trova le fundos de schermo."
-
 #. TRANS: Fieldset legens in Paths admin panel.
 msgid "Attachments"
 msgstr "Annexos"
@@ -3958,8 +3778,8 @@ msgid "Server to direct SSL requests to."
 msgstr "Servitor verso le qual diriger le requestas SSL."
 
 #. TRANS: Button title text to store form data in the Paths admin panel.
-msgid "Save paths"
-msgstr "Salveguardar camminos"
+msgid "Save path settings."
+msgstr "Salveguardar camminos."
 
 #. TRANS: Instructions for the "People search" page.
 #. TRANS: %%site.name%% is the name of the StatusNet site.
@@ -4082,7 +3902,7 @@ msgstr "Monstrar etiquettas public."
 #. TRANS: Submit button text on gallery action page.
 msgctxt "BUTTON"
 msgid "Go"
-msgstr "Ir"
+msgstr "Va"
 
 #. TRANS: Message displayed for anonymous users on page that displays lists by a user.
 #. TRANS: This message contains Markdown links in the form [description](links).
@@ -4093,13 +3913,13 @@ msgid ""
 "%%%site.name%%%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
 "blogging) service based on the Free Software [StatusNet](http://status.net/) "
 "tool. You can easily keep track of what they are doing by subscribing to the "
-"tag's timeline."
+"list's timeline."
 msgstr ""
 "Istes es listas create per **%s**. Le listas es le medio de classificar "
 "personas similar in %%%%site.name%%%%, un servicio de [micro-blogging]"
 "(http://ia.wikipedia.org/wiki/Microblog) a base del software libere "
-"[StatusNet](http://status.net/). Tu pote facilemente traciar le activitates "
-"de personas similar per subscriber te al chronologia de un lista."
+"[StatusNet](http://status.net/). Tu pote facilemente sequer su activitates "
+"per subscriber te al chronologia del lista."
 
 #. TRANS: Message displayed on page that displays lists by a user when there are none.
 #. TRANS: This message contains Markdown links in the form [description](links).
@@ -4127,13 +3947,13 @@ msgid ""
 "site.name%%%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
 "blogging) service based on the Free Software [StatusNet](http://status.net/) "
 "tool. You can easily keep track of what they are doing by subscribing to the "
-"tag's timeline."
+"list's timeline."
 msgstr ""
 "Istes es listas pro **%s**. Le listas es le medio de classificar personas "
 "similar in %%%%site.name%%%%, un servicio de [micro-blogging](http://ia."
 "wikipedia.org/wiki/Microblog) a base del software libere [StatusNet](http://"
-"status.net/). Tu pote facilemente traciar le activitates de personas similar "
-"per subscriber te al chronologia de un lista."
+"status.net/). Tu pote facilemente sequer su activitates per subscriber te al "
+"chronologia del lista."
 
 #. TRANS: Message displayed on page that displays lists a user was added to when there are none.
 #. TRANS: This message contains Markdown links in the form [description](links).
@@ -4235,18 +4055,6 @@ msgstr ""
 "Tote le plug-ins predefinite ha essite disactivate in le file de "
 "configuration del sito."
 
-#. TRANS: Client error displayed if the notice posted has too many characters.
-msgid "Invalid notice content."
-msgstr "Le contento del nota es invalide."
-
-#. TRANS: Exception thrown if a notice's license is not compatible with the StatusNet site license.
-#. TRANS: %1$s is the notice license, %2$s is the StatusNet site's license.
-#, php-format
-msgid "Notice license \"%1$s\" is not compatible with site license \"%2$s\"."
-msgstr ""
-"Le licentia del nota \"%1$s\" non es compatibile con le licentia del sito \"%"
-"2$s\"."
-
 #. TRANS: Client error displayed when trying to add an unindentified field to profile.
 #. TRANS: %s is a field name.
 #, php-format
@@ -4341,6 +4149,8 @@ msgid "Share my current location when posting notices"
 msgstr "Divulgar mi loco actual quando io publica notas"
 
 #. TRANS: Field label in form for profile settings.
+#. TRANS: Title for group tag cloud section.
+#. TRANS: %s is a group name.
 msgid "Tags"
 msgstr "Etiquettas"
 
@@ -4370,10 +4180,9 @@ msgstr "In que fuso horari es tu normalmente?"
 
 #. TRANS: Checkbox label in form for profile settings.
 msgid ""
-"Automatically subscribe to whoever subscribes to me (best for non-humans)."
+"Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr ""
-"Subscriber me automaticamente a qui se subscribe a me (utile pro non-"
-"humanos)."
+"Subscriber me automaticamente a qui se subscribe a me (utile pro non-humanos)"
 
 #. TRANS: Dropdown field label on profile settings, for what policies to apply when someone else tries to subscribe to your updates.
 msgid "Subscription policy"
@@ -4440,11 +4249,6 @@ msgstr "Non poteva salveguardar le preferentias de loco."
 msgid "Could not save tags."
 msgstr "Non poteva salveguardar etiquettas."
 
-#. TRANS: Confirmation shown when user profile settings are saved.
-#. TRANS: Message after successful saving of administrative settings.
-msgid "Settings saved."
-msgstr "Preferentias confirmate."
-
 #. TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
 #. TRANS: Page title for page where a user account can be restored from backup.
 msgid "Restore account"
@@ -4457,8 +4261,8 @@ msgid "Beyond the page limit (%s)."
 msgstr "Ultra le limite de pagina (%s)."
 
 #. TRANS: Server error displayed when a public timeline cannot be retrieved.
-msgid "Could not retrieve public stream."
-msgstr "Non poteva recuperar le fluxo public."
+msgid "Could not retrieve public timeline."
+msgstr "Non poteva recuperar le chronologia public."
 
 #. TRANS: Title for all public timeline pages but the first.
 #. TRANS: %d is the page number.
@@ -4472,16 +4276,20 @@ msgid "Public timeline"
 msgstr "Chronologia public"
 
 #. TRANS: Link description for public timeline feed.
-msgid "Public Stream Feed (RSS 1.0)"
-msgstr "Syndication del fluxo public (RSS 1.0)"
+msgid "Public Timeline Feed (Activity Streams JSON)"
+msgstr "Syndication del chronologia public (Activity Streams JSON)"
 
 #. TRANS: Link description for public timeline feed.
-msgid "Public Stream Feed (RSS 2.0)"
-msgstr "Syndication del fluxo public (RSS 2.0)"
+msgid "Public Timeline Feed (RSS 1.0)"
+msgstr "Syndication del chronologia public (RSS 1.0)"
 
 #. TRANS: Link description for public timeline feed.
-msgid "Public Stream Feed (Atom)"
-msgstr "Syndication del fluxo public (Atom)"
+msgid "Public Timeline Feed (RSS 2.0)"
+msgstr "Syndication del chronologia public (RSS 2.0)"
+
+#. TRANS: Link description for public timeline feed.
+msgid "Public Timeline Feed (Atom)"
+msgstr "Syndication del chronologia public (Atom)"
 
 #. TRANS: Text displayed for public feed when there are no public notices.
 #, php-format
@@ -4515,7 +4323,7 @@ msgid ""
 msgstr ""
 "Isto es %%site.name%%, un servicio de [micro-blog](http://ia.wikipedia.org/"
 "wiki/Microblog) a base del software libere [StatusNet](http://status.net/). "
-"[Inscribe te ora](%%action.register%%) pro condivider notas super te con "
+"[Inscribe te ora](%%action.register%%) pro divider notas super te con "
 "amicos, familia e collegas! ([Leger plus](%%doc.help%%))"
 
 #. TRANS: Message for not logged in users at a closed site trying to view the public feed of notices.
@@ -4529,47 +4337,6 @@ msgstr ""
 "Isto es %%site.name%%, un servicio de [micro-blog](http://ia.wikipedia.org/"
 "wiki/Microblog) a base del software libere [StatusNet](http://status.net/)."
 
-#. TRANS: Title for page with public list cloud.
-msgid "Public list cloud"
-msgstr "Listario public"
-
-#. TRANS: Page notice for page with public list cloud.
-#. TRANS: %s is a StatusNet sitename.
-#, php-format
-msgid "These are largest lists on %s"
-msgstr "Istes es le listas le plus grande in %s"
-
-#. TRANS: Empty list message on page with public list cloud.
-#. TRANS: This message contains Markdown links in the form [description](link).
-#, php-format
-msgid "No one has [listed](%%doc.tags%%) anyone yet."
-msgstr "Nemo ha ancora [listate](%%doc.tags%%) alcuno."
-
-#. TRANS: Additional empty list message on page with public list cloud for logged in users.
-msgid "Be the first to list someone!"
-msgstr "Sia le prime a listar alcuno!"
-
-#. TRANS: Additional empty list message on page with public list cloud for anonymous users.
-#. TRANS: This message contains Markdown links in the form [description](link).
-#, php-format
-msgid ""
-"Why not [register an account](%%action.register%%) and be the first to list "
-"someone!"
-msgstr ""
-"!Proque non [crear un conto](%%action.register%%) e devenir le prime a "
-"listar alcuno?"
-
-#. TRANS: DT element on on page with public list cloud.
-msgid "List cloud"
-msgstr "Listario"
-
-#. TRANS: Link title for number of listed people. %d is the number of listed people.
-#, php-format
-msgid "1 person listed"
-msgid_plural "%d people listed"
-msgstr[0] "1 persona listate"
-msgstr[1] "%d personas listate"
-
 #. TRANS: Public RSS feed description. %s is the StatusNet site name.
 #, php-format
 msgid "%s updates from everyone."
@@ -4694,7 +4461,6 @@ msgid "6 or more characters, and do not forget it!"
 msgstr "6 o plus characteres, e non oblida lo!"
 
 #. TRANS: Button text for password reset form.
-#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
 msgctxt "BUTTON"
 msgid "Reset"
 msgstr "Reinitialisar"
@@ -4703,18 +4469,6 @@ msgstr "Reinitialisar"
 msgid "Enter a nickname or email address."
 msgstr "Entra un pseudonymo o adresse de e-mail."
 
-#. TRANS: Information on password recovery form if no known username or e-mail address was specified.
-msgid "No user with that email address or username."
-msgstr "Nulle usator existe con iste adresse de e-mail o nomine de usator."
-
-#. TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.
-msgid "No registered email address for that user."
-msgstr "Nulle adresse de e-mail registrate pro iste usator."
-
-#. TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.
-msgid "Error saving address confirmation."
-msgstr "Error al salveguardar le confirmation del adresse."
-
 #. TRANS: User notification after an e-mail with instructions was sent from the password recovery form.
 msgid ""
 "Instructions for recovering your password have been sent to the email "
@@ -4756,7 +4510,7 @@ msgstr "File \"%d\" non existe."
 
 #. TRANS: Client error displayed when trying to register to an invite-only site without an invitation.
 msgid "Sorry, only invited people can register."
-msgstr "Pardono, solmente le personas invitate pote registrar se."
+msgstr "Pardono, solmente personas invitate pote crear un conto."
 
 #. TRANS: Client error displayed when trying to register to an invite-only site without a valid invitation.
 msgid "Sorry, invalid invitation code."
@@ -4895,74 +4649,6 @@ msgstr ""
 "(Tu recipera tosto un message de e-mail con instructiones pro confirmar tu "
 "adresse de e-mail.)"
 
-#. TRANS: Page notice for remote subscribe. This message contains Markdown links.
-#. TRANS: Ensure to keep the correct markup of [link description](link).
-#, php-format
-msgid ""
-"To subscribe, you can [login](%%action.login%%), or [register](%%action."
-"register%%) a new  account. If you already have an account  on a [compatible "
-"microblogging site](%%doc.openmublog%%),  enter your profile URL below."
-msgstr ""
-"Pro subscriber te, tu pote [aperir un session](%%action.login%%), o "
-"[registrar](%%action.register%%) un nove conto. Si tu ha ja un conto a un "
-"[sito de microblogging compatibile](%%doc.openmublog%%), entra hic infra le "
-"URL de tu profilo."
-
-#. TRANS: Page title for Remote subscribe.
-msgid "Remote subscribe"
-msgstr "Subscription remote"
-
-#. TRANS: Field legend on page for remote subscribe.
-msgid "Subscribe to a remote user"
-msgstr "Subscriber te a un usator remote"
-
-#. TRANS: Field label on page for remote subscribe.
-msgid "User nickname"
-msgstr "Pseudonymo del usator"
-
-#. TRANS: Field title on page for remote subscribe.
-msgid "Nickname of the user you want to follow."
-msgstr "Le pseudonymo del usator que tu vole sequer."
-
-#. TRANS: Field label on page for remote subscribe.
-msgid "Profile URL"
-msgstr "URL del profilo"
-
-#. TRANS: Field title on page for remote subscribe.
-msgid "URL of your profile on another compatible microblogging service."
-msgstr "URL de tu profilo in un altere servicio de microblogging compatibile."
-
-#. TRANS: Button text on page for remote subscribe.
-#. TRANS: Link text for link that will subscribe to a remote profile.
-#. TRANS: Button text to subscribe to a user.
-#. TRANS: Button text for subscribing to a list.
-msgctxt "BUTTON"
-msgid "Subscribe"
-msgstr "Subscriber"
-
-#. TRANS: Form validation error on page for remote subscribe when an invalid profile URL was provided.
-msgid "Invalid profile URL (bad format)."
-msgstr "URL de profilo invalide (mal formato)."
-
-#. TRANS: Form validation error on page for remote subscribe when no the provided profile URL
-#. TRANS: does not contain expected data.
-msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
-msgstr ""
-"URL de profilo invalide (non es un documento YADIS o esseva definite un XRDS "
-"invalide)."
-
-#. TRANS: Form validation error on page for remote subscribe.
-msgid "That is a local profile! Login to subscribe."
-msgstr "Isto es un profilo local! Aperi session pro subscriber."
-
-#. TRANS: Form validation error on page for remote subscribe when the remote service is not providing a request token.
-msgid "Could not get a request token."
-msgstr "Non poteva obtener un indicio de requesta."
-
-#. TRANS: Client error displayed when trying to (un)list an OMB 0.1 remote profile.
-msgid "You cannot (un)list an OMB 0.1 remote profile with this action."
-msgstr "Tu non pote (dis)listar un profilo remote OMB 0.1 con iste action."
-
 #. TRANS: Client error displayed when an unknown error occurs while delisting a user.
 #. TRANS: %s is a username.
 #, php-format
@@ -5016,6 +4702,12 @@ msgstr "Responsas a %s"
 msgid "Replies to %1$s, page %2$d"
 msgstr "Responsas a %1$s, pagina %2$d"
 
+#. TRANS: Link for feed with replies for a user.
+#. TRANS: %s is a user nickname.
+#, php-format
+msgid "Replies feed for %s (Activity Streams JSON)"
+msgstr "Syndication de responsas pro %s (Activity Streams JSON)"
+
 #. TRANS: Link for feed with replies for a user.
 #. TRANS: %s is a user nickname.
 #, php-format
@@ -5136,11 +4828,11 @@ msgstr "Le syndication essera restaurate. Per favor attende qualque minutas."
 
 #. TRANS: Form instructions for feed restore.
 msgid ""
-"You can upload a backed-up stream in <a href=\"http://activitystrea.ms/"
+"You can upload a backed-up timeline in <a href=\"http://activitystrea.ms/"
 "\">Activity Streams</a> format."
 msgstr ""
-"Tu pote incargar un copia de reserva de un fluxo in formato <a href=\"http://"
-"activitystrea.ms/\">Activity Streams</a>."
+"Tu pote incargar un copia de reserva de un chronologia in formato <a href="
+"\"http://activitystrea.ms/\">Activity Streams</a>."
 
 #. TRANS: Title for submit button to confirm upload of a user backup file for account restore.
 msgid "Upload the file"
@@ -5252,6 +4944,26 @@ msgstr "Reinitialisar clave e secreto"
 msgid "Application info"
 msgstr "Info del application"
 
+#. TRANS: Field label on application page.
+msgid "Consumer key"
+msgstr "Clave de consumitor"
+
+#. TRANS: Field label on application page.
+msgid "Consumer secret"
+msgstr "Secreto de consumitor"
+
+#. TRANS: Field label on application page.
+msgid "Request token URL"
+msgstr "URL del indicio de requesta"
+
+#. TRANS: Field label on application page.
+msgid "Access token URL"
+msgstr "URL del indicio de accesso"
+
+#. TRANS: Field label on application page.
+msgid "Authorize URL"
+msgstr "URL de autorisation"
+
 #. TRANS: Note on the OAuth application page about signature support.
 msgid ""
 "Note: HMAC-SHA1 signatures are supported. The plaintext signature method is "
@@ -5274,6 +4986,11 @@ msgstr "Notas favorite de %1$s, pagina %2$d"
 msgid "Could not retrieve favorite notices."
 msgstr "Non poteva recuperar notas favorite."
 
+#. TRANS: Feed link text. %s is a username.
+#, php-format
+msgid "Feed for favorites of %s (Activity Streams JSON)"
+msgstr "Syndication del favorites de %s (Activity Streams JSON)"
+
 #. TRANS: Feed link text. %s is a username.
 #, php-format
 msgid "Feed for favorites of %s (RSS 1.0)"
@@ -5323,7 +5040,7 @@ msgstr ""
 
 #. TRANS: Page notice for show favourites page.
 msgid "This is a way to share what you like."
-msgstr "Isto es un modo de condivider lo que te place."
+msgstr "Isto es un modo de divider lo que te place."
 
 #. TRANS: Page title for first group page. %s is a group name.
 #, php-format
@@ -5336,6 +5053,11 @@ msgstr "Gruppo %s"
 msgid "%1$s group, page %2$d"
 msgstr "Gruppo %1$s, pagina %2$d"
 
+#. TRANS: Tooltip for feed link. %s is a group nickname.
+#, php-format
+msgid "Notice feed for %s group (Activity Streams JSON)"
+msgstr "Syndication de notas pro le gruppo %s (Activity Streams JSON)"
+
 #. TRANS: Tooltip for feed link. %s is a group nickname.
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
@@ -5356,42 +5078,8 @@ msgstr "Syndication de notas pro le gruppo %s (Atom)"
 msgid "FOAF for %s group"
 msgstr "Amico de un amico pro le gruppo %s"
 
-#. TRANS: Header for mini list of group members on a group page (h2).
-msgid "Members"
-msgstr "Membros"
-
-#. TRANS: Description for mini list of group members on a group page when the group has no members.
-#. TRANS: Content of "Listed" page if there are no listed users.
-#. TRANS: Content of "People following tag x" if there are no subscribed users.
-#. TRANS: Empty list message for tags.
-#. TRANS: Text for user subscription statistics if the user has no subscriptions.
-#. TRANS: Text for user subscriber statistics if user has no subscribers.
-#. TRANS: Text for user user group membership statistics if user is not a member of any group.
-#. TRANS: Default content for section/sidebar widget.
-msgid "(None)"
-msgstr "(Nulle)"
-
-#. TRANS: Link to all group members from mini list of group members if group has more than n members.
-msgid "All members"
-msgstr "Tote le membros"
-
-#. TRANS: Header for group statistics on a group page (h2).
-#. TRANS: H2 text for user statistics.
-msgid "Statistics"
-msgstr "Statisticas"
-
-#. TRANS: Label for group creation date.
-msgctxt "LABEL"
-msgid "Created"
-msgstr "Create"
-
-#. TRANS: Label for member count in statistics on group page.
-msgctxt "LABEL"
-msgid "Members"
-msgstr "Membros"
-
 #. TRANS: Notice on group pages for anonymous users for StatusNet sites that accept new registrations.
-#. TRANS: **%s** is the group alias, %%%%site.name%%%% is the site name,
+#. TRANS: %s is the group name, %%%%site.name%%%% is the site name,
 #. TRANS: %%%%action.register%%%% is the URL for registration, %%%%doc.help%%%% is a URL to help.
 #. TRANS: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
 #, php-format
@@ -5404,29 +5092,24 @@ msgid ""
 msgstr ""
 "**%s** es un gruppo de usatores in %%%%site.name%%%%, un servicio de [micro-"
 "blogging](http://ia.wikipedia.org/wiki/Microblog) a base del software libere "
-"[StatusNet](http://status.net/). Su membros condivide breve messages super "
-"lor vita e interesses. [Crea un conto](%%%%action.register%%%%) pro devenir "
+"[StatusNet](http://status.net/). Su membros divide breve messages super lor "
+"vita e interesses. [Crea un conto](%%%%action.register%%%%) pro devenir "
 "parte de iste gruppo e multe alteres! ([Lege plus](%%%%doc.help%%%%))"
 
 #. TRANS: Notice on group pages for anonymous users for StatusNet sites that accept no new registrations.
-#. TRANS: **%s** is the group alias, %%%%site.name%%%% is the site name,
+#. TRANS: %s is the group name, %%%%site.name%%%% is the site name,
 #. TRANS: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
 "wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
 "[StatusNet](http://status.net/) tool. Its members share short messages about "
-"their life and interests. "
+"their life and interests."
 msgstr ""
 "**%s** es un gruppo de usatores in %%%%site.name%%%%, un servicio de [micro-"
 "blogging](http://ia.wikipedia.org/wiki/Microblog) a base del software libere "
-"[StatusNet](http://status.net/). Su membros condivide breve messages super "
-"lor vita e interesses. "
-
-#. TRANS: Title for list of group administrators on a group page.
-msgctxt "TITLE"
-msgid "Admins"
-msgstr "Administratores"
+"[StatusNet](http://status.net/). Su membros intercambia breve messages super "
+"lor vita e interesses."
 
 #. TRANS: Client error displayed requesting a single message that does not exist.
 msgid "No such message."
@@ -5523,9 +5206,21 @@ msgstr ""
 "chronologia?"
 
 #. TRANS: Header on show list page.
+#. TRANS: Link description for link to list of users tagged with a tag (so part of a list).
 msgid "Listed"
 msgstr "Listate"
 
+#. TRANS: Content of "Listed" page if there are no listed users.
+#. TRANS: Content of "People following tag x" if there are no subscribed users.
+#. TRANS: Description for mini list of group members on a group page when the group has no members.
+#. TRANS: Empty list message for tags.
+#. TRANS: Text for user subscription statistics if the user has no subscriptions.
+#. TRANS: Text for user subscriber statistics if user has no subscribers.
+#. TRANS: Text for user user group membership statistics if user is not a member of any group.
+#. TRANS: Default content for section/sidebar widget.
+msgid "(None)"
+msgstr "(Nulle)"
+
 #. TRANS: Link for more "People in list x by a user"
 #. TRANS: if there are more than the mini list's maximum.
 msgid "Show all"
@@ -5536,24 +5231,19 @@ msgstr "Monstrar totes"
 msgid "Subscribers"
 msgstr "Subscriptores"
 
-#. TRANS: Link for more "People following tag x"
-#. TRANS: if there are more than the mini list's maximum.
-msgid "All subscribers"
-msgstr "Tote le subscriptores"
-
-#. TRANS: Page title showing tagged notices in one user's stream.
+#. TRANS: Page title showing tagged notices in one user's timeline.
 #. TRANS: %1$s is the username, %2$s is the hash tag.
 #, php-format
 msgid "Notices by %1$s tagged %2$s"
 msgstr "Notas per %1$s etiquettate con %2$s"
 
-#. TRANS: Page title showing tagged notices in one user's stream.
+#. TRANS: Page title showing tagged notices in one user's timeline.
 #. TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number.
 #, php-format
 msgid "Notices by %1$s tagged %2$s, page %3$d"
 msgstr "Notas per %1$s etiquettate con %2$s, pagina %3$d"
 
-#. TRANS: Extended page title showing tagged notices in one user's stream.
+#. TRANS: Extended page title showing tagged notices in one user's timeline.
 #. TRANS: %1$s is the username, %2$d is the page number.
 #, php-format
 msgid "Notices by %1$s, page %2$d"
@@ -5565,6 +5255,12 @@ msgstr "Notas per %1$s, pagina %2$d"
 msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
 msgstr "Syndication de notas pro %1$s con etiquetta %2$s (RSS 1.0)"
 
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#, php-format
+msgid "Notice feed for %s (Activity Streams JSON)"
+msgstr "Syndication de notas pro %s (Activity Streams JSON)"
+
 #. TRANS: Title for link to notice feed.
 #. TRANS: %s is a user nickname.
 #, php-format
@@ -5589,7 +5285,7 @@ msgstr "Syndication de notas pro %s (Atom)"
 msgid "FOAF for %s"
 msgstr "Amico de un amico pro %s"
 
-#. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
+#. TRANS: First sentence of empty list message for a timeline. $1%s is a user nickname.
 #, php-format
 msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
 msgstr ""
@@ -5603,7 +5299,7 @@ msgstr ""
 "Videva tu qualcosa de interessante recentemente? Tu non ha ancora publicate "
 "alcun nota, dunque iste es un bon momento pro comenciar :)"
 
-#. TRANS: Second sentence of empty  list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
+#. TRANS: Second sentence of empty  list message for a non-self timeline. %1$s is a user nickname, %2$s is a part of a URL.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
 #, php-format
 msgid ""
@@ -5613,7 +5309,7 @@ msgstr ""
 "Tu pote tentar dar un pulsata a %1$s o [publicar un nota a su attention](%%%%"
 "action.newnotice%%%%?status_textarea=%2$s)."
 
-#. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
+#. TRANS: Announcement for anonymous users showing a timeline if site registrations are open.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
 #, php-format
 msgid ""
@@ -5628,17 +5324,17 @@ msgstr ""
 "pro sequer le notas de **%s** e multe alteres! ([Lege plus](%%%%doc.help%%%"
 "%))"
 
-#. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
+#. TRANS: Announcement for anonymous users showing a timeline if site registrations are closed or invite only.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
 "wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
-"[StatusNet](http://status.net/) tool. "
+"[StatusNet](http://status.net/) tool."
 msgstr ""
 "**%s** ha un conto in %%%%site.name%%%%, un servicio de [micro-blogging]"
-"(http://en.wikipedia.org/wiki/Microblog) a base del software libere "
-"[StatusNet](http://status.net/). "
+"(http://ia.wikipedia.org/wiki/Microblog) a base del software libere "
+"[StatusNet](http://status.net/)."
 
 #. TRANS: Link to the author of a repeated notice. %s is a linked nickname.
 #, php-format
@@ -5671,6 +5367,14 @@ msgstr "Le longitude del nomine del sito debe esser plus que zero."
 msgid "You must have a valid contact email address."
 msgstr "Tu debe haber un valide adresse de e-mail pro contacto."
 
+#. TRANS: Client error displayed when a logo URL is not valid.
+msgid "Invalid logo URL."
+msgstr "URL de logotypo invalide."
+
+#. TRANS: Client error displayed when a SSL logo URL is invalid.
+msgid "Invalid SSL logo URL."
+msgstr "URL de logotypo SSL invalide."
+
 #. TRANS: Client error displayed trying to save site settings with an invalid language code.
 #. TRANS: %s is the invalid language code.
 #, php-format
@@ -5741,10 +5445,11 @@ msgid "Default language"
 msgstr "Lingua predefinite"
 
 #. TRANS: Dropdown title on site settings panel.
-msgid "Site language when autodetection from browser settings is not available"
+msgid ""
+"The site language when autodetection from browser settings is not available."
 msgstr ""
-"Le lingua del sito quando le detection automatic ex le configuration del "
-"navigator non es disponibile"
+"Le lingua del sito si le detection automatic ex le configuration del "
+"navigator non es disponibile."
 
 #. TRANS: Fieldset legend on site settings panel.
 msgctxt "LEGEND"
@@ -5769,9 +5474,21 @@ msgstr ""
 "Quante tempore (in secundas) le usatores debe attender ante de poter "
 "publicar le mesme cosa de novo."
 
+#. TRANS: Fieldset legend for form to change logo.
+msgid "Logo"
+msgstr "Logotypo"
+
+#. TRANS: Field label for StatusNet site logo.
+msgid "Site logo"
+msgstr "Logotypo del sito"
+
+#. TRANS: Field label for SSL StatusNet site logo.
+msgid "SSL logo"
+msgstr "Logotypo SSL"
+
 #. TRANS: Button title for saving site settings.
-msgid "Save site settings"
-msgstr "Salveguardar configurationes del sito"
+msgid "Save the site settings."
+msgstr "Salveguardar configurationes del sito."
 
 #. TRANS: Page title for site-wide notice tab in admin panel.
 msgid "Site Notice"
@@ -5798,7 +5515,7 @@ msgid "Site-wide notice text (255 characters maximum; HTML allowed)"
 msgstr ""
 "Le texto del aviso a tote le sito (maximo 255 characteres; HTML permittite)"
 
-#. TRANS: Title for button to save site notice in admin panel.
+#. TRANS: Button title to save site notice in admin panel.
 msgid "Save site notice."
 msgstr "Salveguardar aviso del sito."
 
@@ -5991,7 +5708,7 @@ msgstr "URL pro reporto"
 msgid "Snapshots will be sent to this URL."
 msgstr "Le instantaneos essera inviate a iste URL."
 
-#. TRANS: Title for button to save snapshot settings.
+#. TRANS: Button title to save snapshot settings.
 msgid "Save snapshot settings."
 msgstr "Salveguardar configuration de instantaneos."
 
@@ -6024,10 +5741,6 @@ msgstr "Subscriptores de %1$s attendente approbation, pagina %2$d"
 msgid "A list of users awaiting approval to subscribe to you."
 msgstr "Un lista de usatores attendente approbation a subscriber a te."
 
-#. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
-msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
-msgstr "Tu non pote subscriber te a un profilo remote OMB 0.1 con iste action."
-
 #. TRANS: Page title when subscription succeeded.
 msgid "Subscribed"
 msgstr "Subscribite"
@@ -6128,15 +5841,12 @@ msgid ""
 "You're not listening to anyone's notices right now, try subscribing to "
 "people you know. Try [people search](%%action.peoplesearch%%), look for "
 "members in groups you're interested in and in our [featured users](%%action."
-"featured%%). If you're a [Twitter user](%%action.twittersettings%%), you can "
-"automatically subscribe to people you already follow there."
+"featured%%)."
 msgstr ""
 "Tu non seque le notas de alcuno in iste momento. Tenta subscriber te a "
 "personas que tu cognosce. Proba [le recerca de personas](%%action."
 "peoplesearch%%), cerca membros in le gruppos de tu interesse e in le "
-"[usatores in evidentia](%%action.featured%%). Si tu es [usator de Twitter](%%"
-"action.twittersettings%%), tu pote automaticamente subscriber te a personas "
-"que tu ja seque la."
+"[usatores in evidentia](%%action.featured%%)."
 
 #. TRANS: Subscription list text when looking at the subscriptions for a of a user other
 #. TRANS: than the logged in user that has no subscriptions. %s is the user nickname.
@@ -6166,6 +5876,12 @@ msgstr "SMS"
 msgid "Notices tagged with %1$s, page %2$d"
 msgstr "Notas etiquettate con %1$s, pagina %2$d"
 
+#. TRANS: Link label for feed on "notices with tag" page.
+#. TRANS: %s is the tag the feed is for.
+#, php-format
+msgid "Notice feed for tag %s (Activity Streams JSON)"
+msgstr "Syndication de notas pro le etiquetta %s (Activity Streams JSON)"
+
 #. TRANS: Link label for feed on "notices with tag" page.
 #. TRANS: %s is the tag the feed is for.
 #, php-format
@@ -6267,18 +5983,6 @@ msgstr "Subscription cancellate"
 msgid "%1$s unsubscribed from list %2$s by %3$s"
 msgstr "%1$s removite del lista %2$s per %3$s"
 
-#. TRANS: Client error displayed when trying to update profile with an incompatible license.
-#. TRANS: %1$s is the license incompatible with site license %2$s.
-#. TRANS: Exception thrown when licenses are not compatible for an authorisation request.
-#. TRANS: %1$s is the license for the listenee, %2$s is the license for "this" StatusNet site.
-#, php-format
-msgid ""
-"Listenee stream license \"%1$s\" is not compatible with site license \"%2$s"
-"\"."
-msgstr ""
-"Le licentia del fluxo que tu ascolta, \"%1$s\", non es compatibile con le "
-"licentia del sito \"%2$s\"."
-
 #. TRANS: Title of URL settings tab in profile settings.
 msgid "URL settings"
 msgstr "Configuration de URL"
@@ -6416,155 +6120,10 @@ msgstr "Invitationes activate"
 msgid "Whether to allow users to invite new users."
 msgstr "Si le usatores pote invitar nove usatores."
 
-#. TRANS: Title for button to save user settings in user admin panel.
+#. TRANS: Button title to save user settings in user admin panel.
 msgid "Save user settings."
 msgstr "Salveguardar configurationes de usator."
 
-#. TRANS: Page title.
-msgid "Authorize subscription"
-msgstr "Autorisar subscription"
-
-#. TRANS: Page notice on "Authorize subscription" page.
-msgid ""
-"Please check these details to make sure that you want to subscribe to this "
-"user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
-"click \"Reject\"."
-msgstr ""
-"Per favor verifica iste detalios pro assecurar que tu vole subscriber al "
-"notas de iste usator. Si tu non ha justo requestate de subscriber al notas "
-"de alcuno, clicca \"Rejectar\"."
-
-#. TRANS: Button text on Authorise Subscription page.
-#. TRANS: Submit button text to accept a group membership request on approve group form.
-#. TRANS: Submit button text to accept a subscription request on approve sub form.
-msgctxt "BUTTON"
-msgid "Accept"
-msgstr "Acceptar"
-
-#. TRANS: Title for button on Authorise Subscription page.
-#. TRANS: Button title to subscribe to a user.
-msgid "Subscribe to this user."
-msgstr "Subscriber a iste usator."
-
-#. TRANS: Button text on Authorise Subscription page.
-#. TRANS: Submit button text to reject a group membership request on approve group form.
-#. TRANS: Submit button text to reject a subscription request on approve sub form.
-msgctxt "BUTTON"
-msgid "Reject"
-msgstr "Rejectar"
-
-#. TRANS: Title for button on Authorise Subscription page.
-msgid "Reject this subscription."
-msgstr "Rejectar iste subscription."
-
-#. TRANS: Client error displayed for an empty authorisation request.
-msgid "No authorization request!"
-msgstr "Nulle requesta de autorisation!"
-
-#. TRANS: Accept message header from Authorise subscription page.
-msgid "Subscription authorized"
-msgstr "Subscription autorisate"
-
-#. TRANS: Accept message text from Authorise subscription page.
-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 ""
-"Le subscription ha essite autorisate, ma nulle URL de retorno ha essite "
-"recipite. Lege in le instructiones del sito in question como autorisar le "
-"subscription. Tu indicio de subscription es:"
-
-#. TRANS: Reject message header from Authorise subscription page.
-msgid "Subscription rejected"
-msgstr "Subscription rejectate"
-
-#. TRANS: Reject message from Authorise subscription page.
-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 ""
-"Le subscription ha essite rejectate, ma nulle URL de retorno ha essite "
-"recipite. Lege in le instructiones del sito in question como rejectar "
-"completemente le subscription."
-
-#. TRANS: Exception thrown when no valid user is found for an authorisation request.
-#. TRANS: %s is a listener URI.
-#, php-format
-msgid "Listener URI \"%s\" not found here."
-msgstr "URI de ascoltator \"%s\" non trovate hic."
-
-#. TRANS: Exception thrown when listenee URI is too long for an authorisation request.
-#. TRANS: %s is a listenee URI.
-#, php-format
-msgid "Listenee URI \"%s\" is too long."
-msgstr "URI de ascoltato \"%s\" es troppo longe."
-
-#. TRANS: Exception thrown when listenee URI is a local user for an authorisation request.
-#. TRANS: %s is a listenee URI.
-#, php-format
-msgid "Listenee URI \"%s\" is a local user."
-msgstr "URI de ascoltato \"%s\" es un usator local."
-
-#. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
-#. TRANS: %s is a profile URL.
-#, php-format
-msgid "Profile URL \"%s\" is for a local user."
-msgstr "URL de profilo \"%s\" es de un usator local."
-
-#. TRANS: Exception thrown when avatar URL is invalid for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#, php-format
-msgid "Avatar URL \"%s\" is not valid."
-msgstr "URL de avatar \"%s\" non es valide."
-
-#. TRANS: Exception thrown when avatar URL could not be read for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#, php-format
-msgid "Cannot read avatar URL \"%s\"."
-msgstr "Non pote leger URL de avatar \"%s\"."
-
-#. TRANS: Exception thrown when avatar URL return an invalid image type for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#, php-format
-msgid "Wrong image type for avatar URL \"%s\"."
-msgstr "Typo de imagine incorrecte pro URL de avatar \"%s\"."
-
-#. TRANS: Title for profile design page.
-#. TRANS: Page title for profile design page.
-msgid "Profile design"
-msgstr "Apparentia del profilo"
-
-#. TRANS: Instructions for Profile design page.
-#. TRANS: Instructions for profile design page.
-msgid ""
-"Customize the way your profile looks with a background image and a colour "
-"palette of your choice."
-msgstr ""
-"Personalisa le apparentia de tu profilo con un imagine de fundo e un paletta "
-"de colores de tu preferentia."
-
-#. TRANS: Succes message on Profile design page when finding an easter egg.
-msgid "Enjoy your hotdog!"
-msgstr "Bon appetito!"
-
-#. TRANS: Form legend on Profile design page.
-msgid "Design settings"
-msgstr "Configuration del apparentia"
-
-#. TRANS: Checkbox label on Profile design page.
-msgid "View profile designs"
-msgstr "Vider apparentias de profilo"
-
-#. TRANS: Title for checkbox on Profile design page.
-msgid "Show or hide profile designs."
-msgstr "Monstrar o celar apparentias de profilo."
-
-#. TRANS: Form legend on Profile design page for form to choose a background image.
-msgid "Background file"
-msgstr "File de fundo"
-
 #. TRANS: Page title for all but the first page of groups for a user.
 #. TRANS: %1$s is a nickname, %2$d is a page number.
 #, php-format
@@ -6606,10 +6165,10 @@ msgstr "StatusNet %s"
 #. TRANS: %1$s is the engine name (StatusNet) and %2$s is the StatusNet version.
 #, php-format
 msgid ""
-"This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, "
+"This site is powered by %1$s version %2$s, Copyright 2008-2011 StatusNet, "
 "Inc. and contributors."
 msgstr ""
-"Iste sito es realisate per %1$s version %2$s, copyright 2008-2010 StatusNet, "
+"Iste sito es realisate per %1$s version %2$s, copyright 2008-2011 StatusNet, "
 "Inc. e contributores."
 
 #. TRANS: Header for StatusNet contributors section on the version page.
@@ -6625,24 +6184,24 @@ msgid ""
 "StatusNet is free software: you can redistribute it and/or modify it under "
 "the terms of the GNU Affero General Public License as published by the Free "
 "Software Foundation, either version 3 of the License, or (at your option) "
-"any later version. "
+"any later version."
 msgstr ""
 "StatusNet es software libere: vos pote redistribuer lo e/o modificar lo sub "
 "le conditiones del GNU Affero General Public License como publicate per le "
 "Free Software Foundation, o version 3 de iste licentia, o (a vostre "
-"election) omne version plus recente. "
+"election) omne version plus recente."
 
 #. TRANS: Content part of StatusNet version page.
 msgid ""
 "This program is distributed in the hope that it will be useful, but WITHOUT "
 "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
 "FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License "
-"for more details. "
+"for more details."
 msgstr ""
 "Iste programma es distribuite in le sperantia que illo essera utile, ma SIN "
 "ALCUN GARANTIA; sin mesmo le garantia implicite de COMMERCIABILITATE o de "
 "USABILITATE PRO UN PARTICULAR SCOPO. Vide le GNU Affero General Public "
-"License pro ulterior detalios. "
+"License pro ulterior detalios."
 
 #. TRANS: Content part of StatusNet version page.
 #. TRANS: %s is a link to the AGPL license with link description "http://www.gnu.org/licenses/agpl.html".
@@ -6697,22 +6256,32 @@ msgstr "Impossibile processar le URL '%s'"
 msgid "Robin thinks something is impossible."
 msgstr "Robin pensa que alique es impossibile."
 
+#. TRANS: Message used to be inserted as %2$s in  the text "No file may
+#. TRANS: be larger than %1$d byte and the file you sent was %2$s.".
+#. TRANS: %1$d is the number of bytes of an uploaded file.
+#, php-format
+msgid "%1$d byte"
+msgid_plural "%1$d bytes"
+msgstr[0] "%1$d byte"
+msgstr[1] "%1$d bytes"
+
 #. TRANS: Message given if an upload is larger than the configured maximum.
-#. TRANS: %1$d is the byte limit for uploads, %2$d is the byte count for the uploaded file.
-#. TRANS: %1$s is used for plural.
+#. TRANS: %1$d (used for plural) is the byte limit for uploads,
+#. TRANS: %2$s is the proper form of "n bytes". This is the only ways to have
+#. TRANS: gettext support multiple plurals in the same message, unfortunately...
 #, php-format
 msgid ""
-"No file may be larger than %1$d byte and the file you sent was %2$d bytes. "
-"Try to upload a smaller version."
+"No file may be larger than %1$d byte and the file you sent was %2$s. Try to "
+"upload a smaller version."
 msgid_plural ""
-"No file may be larger than %1$d bytes and the file you sent was %2$d bytes. "
-"Try to upload a smaller version."
+"No file may be larger than %1$d bytes and the file you sent was %2$s. Try to "
+"upload a smaller version."
 msgstr[0] ""
 "Nulle file pote esser plus grande que %1$d byte e le file que tu inviava ha %"
-"2$d bytes. Tenta incargar un version minus grande."
+"2$s. Tenta incargar un version minus grande."
 msgstr[1] ""
 "Nulle file pote esser plus grande que %1$d bytes e le file que tu inviava ha "
-"%2$d bytes. Tenta incargar un version minus grande."
+"%2$s. Tenta incargar un version minus grande."
 
 #. TRANS: Message given if an upload would exceed user quota.
 #. TRANS: %d (number) is the user quota in bytes and is used for plural.
@@ -6778,6 +6347,11 @@ msgstr "Non poteva actualisar gruppo local."
 msgid "Could not create login token for %s"
 msgstr "Non poteva crear indicio de identification pro %s"
 
+#. TRANS: Exception thrown when a program code class (%s) cannot be instantiated.
+#, php-format
+msgid "Cannot instantiate class %s."
+msgstr "Impossibile crear un instantia del classe %s."
+
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.
 msgid "No database name or DSN found anywhere."
 msgstr "Nulle nomine de base de datos o DSN trovate."
@@ -6935,10 +6509,10 @@ msgstr ""
 #, php-format
 msgid ""
 "You already have %1$d or more people in list %2$s, which is the maximum "
-"allowed number.Try unlisting others first."
+"allowed number. Try unlisting others first."
 msgstr ""
-"Il ha jam %1$d o plus personas in le lista %2$s, que es le numero maxime "
-"permittite. Tenta primo remover alteres del lista."
+"Il ha jam %1$d o plus personas in le lista %2$s, que es le maximo "
+"permittite. Remove alteres del lista primo."
 
 #. TRANS: Exception thrown when inserting a list subscription in the database fails.
 msgid "Adding list subscription failed."
@@ -6957,7 +6531,6 @@ msgid "Unable to save tag."
 msgstr "Impossibile salveguardar le etiquetta."
 
 #. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
-#. TRANS: Error message displayed to a banned user when they try to subscribe.
 msgid "You have been banned from subscribing."
 msgstr "Tu ha essite blocate del subscription."
 
@@ -6977,10 +6550,6 @@ msgstr "Non subscribite!"
 msgid "Could not delete self-subscription."
 msgstr "Non poteva deler auto-subscription."
 
-#. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
-msgid "Could not delete subscription OMB token."
-msgstr "Non poteva deler le indicio OMB del subscription."
-
 #. TRANS: Exception thrown when a subscription could not be deleted on the server.
 msgid "Could not delete subscription."
 msgstr "Non poteva deler subscription."
@@ -7014,6 +6583,18 @@ msgstr "Nulle signule usator definite pro le modo de singule usator."
 msgid "Single-user mode code called when not enabled."
 msgstr "Codice in modo de usator singule appellate sin esser activate."
 
+#. TRANS: Information on password recovery form if no known username or e-mail address was specified.
+msgid "No user with that email address or username."
+msgstr "Nulle usator existe con iste adresse de e-mail o nomine de usator."
+
+#. TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.
+msgid "No registered email address for that user."
+msgstr "Nulle adresse de e-mail registrate pro iste usator."
+
+#. TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.
+msgid "Error saving address confirmation."
+msgstr "Error al salveguardar le confirmation del adresse."
+
 #. TRANS: Server exception thrown when creating a group failed.
 msgid "Could not create group."
 msgstr "Non poteva crear gruppo."
@@ -7283,25 +6864,11 @@ msgstr "showForm() non implementate."
 msgid "saveSettings() not implemented."
 msgstr "saveSettings() non implementate."
 
-#. TRANS: Client error message thrown if design settings could not be deleted in
-#. TRANS: the admin panel Design.
-msgid "Unable to delete design setting."
-msgstr "Impossibile deler configuration de apparentia."
-
 #. TRANS: Header in administrator navigation panel.
-#. TRANS: Header in settings navigation panel.
 msgctxt "HEADER"
 msgid "Home"
 msgstr "Initio"
 
-#. TRANS: Menu item in administrator navigation panel.
-#. TRANS: Menu item in default local navigation panel.
-#. TRANS: Menu item in personal group navigation menu.
-#. TRANS: Menu item in settings navigation panel.
-msgctxt "MENU"
-msgid "Home"
-msgstr "Initio"
-
 #. TRANS: Header in administrator navigation panel.
 msgctxt "HEADER"
 msgid "Admin"
@@ -7316,17 +6883,6 @@ msgctxt "MENU"
 msgid "Site"
 msgstr "Sito"
 
-#. TRANS: Menu item title in administrator navigation panel.
-msgid "Design configuration"
-msgstr "Configuration del apparentia"
-
-#. TRANS: Menu item in administrator navigation panel.
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: Menu item in settings navigation panel.
-msgctxt "MENU"
-msgid "Design"
-msgstr "Apparentia"
-
 #. TRANS: Menu item title in administrator navigation panel.
 msgid "User configuration"
 msgstr "Configuration del usator"
@@ -7426,45 +6982,6 @@ msgstr "Nulle usator pro iste indicio."
 msgid "Could not authenticate you."
 msgstr "Non poteva authenticar te."
 
-#. TRANS: Server error displayed when trying to create an anynymous OAuth consumer.
-msgid "Could not create anonymous consumer."
-msgstr "Non poteva crear consumitor anonyme."
-
-#. TRANS: Server error displayed when trying to create an anynymous OAuth application.
-msgid "Could not create anonymous OAuth application."
-msgstr "Non poteva crear application OAuth anonyme."
-
-#. TRANS: Exception thrown when no token association could be found.
-msgid ""
-"Could not find a profile and application associated with the request token."
-msgstr ""
-"Non poteva trovar un profilo e application associate con le indicio de "
-"requesta."
-
-#. TRANS: Exception thrown when no access token can be issued.
-msgid "Could not issue access token."
-msgstr "Non poteva emitter le indicio de accesso."
-
-#. TRANS: Exception thrown when a database error occurs.
-msgid "Database error inserting OAuth application user."
-msgstr ""
-"Error del base de datos durante le insertion del usator del application "
-"OAuth."
-
-#. TRANS: Exception thrown when a database error occurs.
-msgid "Database error updating OAuth application user."
-msgstr ""
-"Error del base de datos durante le actualisation del usator del application "
-"OAuth."
-
-#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
-msgid "Tried to revoke unknown token."
-msgstr "Tentava revocar un indicio non cognoscite."
-
-#. TRANS: Exception thrown when an attempt is made to remove a revoked token.
-msgid "Failed to delete revoked token."
-msgstr "Falleva de deler le indicio revocate."
-
 #. TRANS: Form input field label for application icon.
 msgid "Icon"
 msgstr "Icone"
@@ -7547,13 +7064,12 @@ msgstr ""
 "scriptura"
 
 #. TRANS: Submit button title.
-msgid "Cancel"
-msgstr "Cancellar"
+msgid "Cancel application changes."
+msgstr "Cancellar cambios del application."
 
 #. TRANS: Submit button title.
-#. TRANS: Button text to save a list.
-msgid "Save"
-msgstr "Salveguardar"
+msgid "Save application changes."
+msgstr "Salveguardar cambios del application."
 
 #. TRANS: Name for an anonymous application in application list.
 msgid "Unknown application"
@@ -7588,6 +7104,18 @@ msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "Revocar"
 
+#. TRANS: Submit button text to accept a group membership request on approve group form.
+#. TRANS: Submit button text to accept a subscription request on approve sub form.
+msgctxt "BUTTON"
+msgid "Accept"
+msgstr "Acceptar"
+
+#. TRANS: Submit button text to reject a group membership request on approve group form.
+#. TRANS: Submit button text to reject a subscription request on approve sub form.
+msgctxt "BUTTON"
+msgid "Reject"
+msgstr "Rejectar"
+
 #. TRANS: Atom feed exception thrown when an author element does not contain a name element.
 msgid "Author element must contain a name element."
 msgstr "Le elemento \"author\" debe continer un elemento \"name\"."
@@ -8135,6 +7663,11 @@ msgstr "Considera executar le installator pro reparar isto."
 msgid "Go to the installer."
 msgstr "Ir al installator."
 
+#. TRANS: Header on conversation page. Hidden by default (h2).
+#. TRANS: Label for user statistics.
+msgid "Notices"
+msgstr "Notas"
+
 #. TRANS: Page title for when a database error occurs.
 msgid "Database error"
 msgstr "Error de base de datos"
@@ -8145,13 +7678,6 @@ msgctxt "MENU"
 msgid "Public"
 msgstr "Public"
 
-#. TRANS: Menu item in default local navigation panel.
-#. TRANS: Menu item in search group navigation panel.
-#. TRANS: Menu item in local navigation menu.
-msgctxt "MENU"
-msgid "Groups"
-msgstr "Gruppos"
-
 #. TRANS: Menu item in default local navigation panel.
 #. TRANS: Menu item title in local navigation menu.
 msgctxt "MENU"
@@ -8167,51 +7693,12 @@ msgstr "Deler"
 msgid "Delete this user"
 msgstr "Deler iste usator"
 
-#. TRANS: Form legend of form for changing the page design.
-msgid "Change design"
-msgstr "Cambiar de apparentia"
-
-#. TRANS: Fieldset legend on profile design page to change profile page colours.
-msgid "Change colours"
-msgstr "Cambiar colores"
-
-#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-msgid "Use defaults"
-msgstr "Usar predefinitiones"
-
-#. TRANS: Label in form on profile design page.
-#. TRANS: Field contains file name on user's computer that could be that user's custom profile background image.
-msgid "Upload file"
-msgstr "Incargar file"
-
-#. TRANS: Instructions for form on profile design page.
-msgid ""
-"You can upload your personal background image. The maximum file size is 2MB."
-msgstr ""
-"Tu pote actualisar tu imagine de fundo personal. Le dimension maximal del "
-"file es 2MB."
-
-#. TRANS: Radio button on profile design page that will enable use of the uploaded profile image.
-msgctxt "RADIO"
-msgid "On"
-msgstr "Active"
-
-#. TRANS: Radio button on profile design page that will disable use of the uploaded profile image.
-msgctxt "RADIO"
-msgid "Off"
-msgstr "Non active"
-
-#. TRANS: Success message displayed if design settings were saved after clicking "Use defaults".
-msgid "Design defaults restored."
-msgstr "Apparentia predefinite restaurate."
-
 #. TRANS: Exception. %s is an ID.
 #, php-format
 msgid "Unable to find services for %s."
 msgstr "Incapace de trovar servicios pro %s."
 
 #. TRANS: Form legend for removing the favourite status for a favourite notice.
-#. TRANS: Title for button text for removing the favourite status for a favourite notice.
 msgid "Disfavor this notice"
 msgstr "Disfavorir iste nota"
 
@@ -8220,8 +7707,11 @@ msgctxt "BUTTON"
 msgid "Disfavor favorite"
 msgstr "Disfavorir favorite"
 
+#. TRANS: Button title for removing the favourite status for a favourite notice.
+msgid "Remove this notice from your list of favorite notices."
+msgstr "Remover iste nota de tu lista de notas favorite."
+
 #. TRANS: Form legend for adding the favourite status to a notice.
-#. TRANS: Title for button text for adding the favourite status to a notice.
 msgid "Favor this notice"
 msgstr "Favorir iste nota"
 
@@ -8230,6 +7720,10 @@ msgctxt "BUTTON"
 msgid "Favor"
 msgstr "Favorir"
 
+#. TRANS: Button title for adding the favourite status to a notice.
+msgid "Add this notice to your list of favorite notices."
+msgstr "Adder iste nota a tu lista de notas favorite."
+
 #. TRANS: Feed type name.
 msgid "RSS 1.0"
 msgstr "RSS 1.0"
@@ -8246,6 +7740,10 @@ msgstr "Atom"
 msgid "FOAF"
 msgstr "Amico de un amico"
 
+#. TRANS: Feed type name. See http://activitystrea.ms/
+msgid "Activity Streams"
+msgstr "Activity Streams"
+
 #. TRANS: Client exception thrown when an imported feed does not have an author.
 msgid "No author in the feed."
 msgstr "Il non ha un autor in le syndication."
@@ -8277,6 +7775,27 @@ msgstr "Selige un etiquetta pro reducer le lista."
 msgid "Grant this user the \"%s\" role"
 msgstr "Conceder le rolo \"%s\" a iste usator"
 
+#. TRANS: Header for mini list of group members on a group page (h2).
+msgid "Members"
+msgstr "Membros"
+
+#. TRANS: Link to all group members from mini list of group members if group has more than n members.
+msgid "All members"
+msgstr "Tote le membros"
+
+#. TRANS: Header for mini list of users with a pending membership request on a group page (h2).
+msgid "Pending"
+msgstr "Pendente"
+
+#. TRANS: Header for mini list of users that are blocked in a group page (h2).
+msgid "Blocked"
+msgstr "Blocate"
+
+#. TRANS: Title for list of group administrators on a group page.
+msgctxt "TITLE"
+msgid "Admins"
+msgstr "Administratores"
+
 #. TRANS: Button text for the form that will block a user from a group.
 msgctxt "BUTTON"
 msgid "Block"
@@ -8284,8 +7803,9 @@ msgstr "Blocar"
 
 #. TRANS: Submit button title.
 msgctxt "TOOLTIP"
-msgid "Block this user"
-msgstr "Blocar iste usator"
+msgid "Block this user so that they can no longer post messages to it."
+msgstr ""
+"Blocar iste usator de sorta que ille non plus pote publicar messages in illo."
 
 #. TRANS: Field title on group edit form.
 msgid "URL of the homepage or blog of the group or topic."
@@ -8340,63 +7860,9 @@ msgctxt "GROUPADMIN"
 msgid "Admin"
 msgstr "Administrator"
 
-#. TRANS: Menu item in the group navigation page.
-msgctxt "MENU"
-msgid "Group"
-msgstr "Gruppo"
-
-#. TRANS: Tooltip for menu item in the group navigation page.
-#. TRANS: %s is the nickname of the group.
-#, php-format
-msgctxt "TOOLTIP"
-msgid "%s group"
-msgstr "Gruppo %s"
-
-#. TRANS: Menu item in the group navigation page.
-msgctxt "MENU"
-msgid "Members"
-msgstr "Membros"
-
-#. TRANS: Tooltip for menu item in the group navigation page.
-#. TRANS: %s is the nickname of the group.
-#, php-format
-msgctxt "TOOLTIP"
-msgid "%s group members"
-msgstr "Membros del gruppo %s"
-
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: %d is the number of pending members.
-#, php-format
-msgctxt "MENU"
-msgid "Pending members (%d)"
-msgid_plural "Pending members (%d)"
-msgstr[0] "Membro pendente"
-msgstr[1] "Membros pendente (%d)"
-
-#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: %s is the nickname of the group.
-#, php-format
-msgctxt "TOOLTIP"
-msgid "%s pending members"
-msgstr "%s membros pendente"
-
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-msgctxt "MENU"
-msgid "Blocked"
-msgstr "Blocate"
-
-#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: %s is the nickname of the group.
-#, php-format
-msgctxt "TOOLTIP"
-msgid "%s blocked users"
-msgstr "%s usatores blocate"
-
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: Menu item in primary navigation panel.
-msgctxt "MENU"
-msgid "Admin"
-msgstr "Admin"
+#. TRANS: Group actions header (h2). Text hidden by default.
+msgid "Group actions"
+msgstr "Actiones del gruppo"
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
@@ -8405,11 +7871,6 @@ msgctxt "TOOLTIP"
 msgid "Edit %s group properties"
 msgstr "Modificar proprietates del gruppo %s"
 
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-msgctxt "MENU"
-msgid "Logo"
-msgstr "Logotypo"
-
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
 #, php-format
@@ -8417,16 +7878,10 @@ msgctxt "TOOLTIP"
 msgid "Add or edit %s logo"
 msgstr "Adder o modificar logotypo de %s"
 
-#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: %s is the nickname of the group.
-#, php-format
-msgctxt "TOOLTIP"
-msgid "Add or edit %s design"
-msgstr "Adder o modificar apparentia de %s"
-
-#. TRANS: Group actions header (h2). Text hidden by default.
-msgid "Group actions"
-msgstr "Actiones del gruppo"
+#. TRANS: Link text for link on user profile.
+msgctxt "MENU"
+msgid "Logo"
+msgstr "Logotypo"
 
 #. TRANS: Title for groups with the most members section.
 msgid "Popular groups"
@@ -8436,11 +7891,19 @@ msgstr "Gruppos popular"
 msgid "Active groups"
 msgstr "Gruppos active"
 
-#. TRANS: Title for group tag cloud section.
-#. TRANS: %s is a group name.
-#, php-format
-msgid "Tags in %s group's notices"
-msgstr "Etiquettas in le notas del gruppo %s"
+#. TRANS: Link description for seeing all groups.
+#. TRANS: Link description for seeing all lists.
+msgid "See all"
+msgstr "Vider totes"
+
+#. TRANS: Link title for seeing all groups.
+msgid "See all groups you belong to."
+msgstr "Vider tote le gruppos al quales tu pertine."
+
+#. TRANS: Menu item title in personal group navigation menu.
+#. TRANS: %s is a username.
+msgid "Back to top"
+msgstr "Retornar in alto"
 
 #. TRANS: Client exception 406
 msgid "This page is not available in a media type you accept"
@@ -8532,11 +7995,41 @@ msgctxt "TITLE"
 msgid "Trends"
 msgstr "Tendentias"
 
-#. TRANS: Button text for inviting more users to the StatusNet instance.
+#. TRANS: Default button text for inviting more users to the StatusNet instance.
 msgctxt "BUTTON"
 msgid "Invite more colleagues"
 msgstr "Invitar plus collegas"
 
+#. TRANS: Form legend.
+msgid "Invite collegues"
+msgstr "Invitar collegas"
+
+#. TRANS: Field label for a list of e-mail addresses.
+msgid "Email addresses"
+msgstr "Adresses de e-mail"
+
+#. TRANS: Field title for a list of e-mail addresses.
+msgid "Addresses of friends to invite (one per line)."
+msgstr "Adresses de amicos a invitar (un per linea)."
+
+#. TRANS: Field label for a personal message to send to invitees.
+msgid "Personal message"
+msgstr "Message personal"
+
+#. TRANS: Field title for a personal message to send to invitees.
+msgid "Optionally add a personal message to the invitation."
+msgstr "Si tu vole, adde un message personal al invitation."
+
+#. TRANS: Send button for inviting friends
+#. TRANS: Button text for sending notice.
+msgctxt "BUTTON"
+msgid "Send"
+msgstr "Inviar"
+
+#. TRANS: Submit button title.
+msgid "Send invitations."
+msgstr "Inviar invitationes."
+
 #. TRANS: Button text for joining a group.
 msgctxt "BUTTON"
 msgid "Join"
@@ -8547,6 +8040,10 @@ msgctxt "BUTTON"
 msgid "Leave"
 msgstr "Quitar"
 
+#. TRANS: Link title for seeing all lists.
+msgid "See all lists you have created."
+msgstr "Vider tote le listas que tu ha create."
+
 #. TRANS: Menu item for logging in to the StatusNet site.
 #. TRANS: Menu item in primary navigation panel.
 msgctxt "MENU"
@@ -8606,8 +8103,8 @@ msgstr ""
 #. TRANS: Main body of new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscriber's long name, %2$s is the StatusNet sitename.
 #, php-format
-msgid "%1$s is now listening to your notices on %2$s."
-msgstr "%1$s seque ora tu notas in %2$s."
+msgid "%1$s is now following you on %2$s."
+msgstr "%1$s te seque ora in %2$s."
 
 #. TRANS: Subject of pending new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscribing user's nickname, %2$s is the StatusNet sitename.
@@ -8829,7 +8326,7 @@ msgstr "%1$s (@%2$s) ha inviate un nota a tu attention"
 #. TRANS: Body of @-reply notification e-mail.
 #. TRANS: %1$s is the sending user's name, $2$s is the StatusNet sitename,
 #. TRANS: %3$s is a URL to the notice, %4$s is the notice text,
-#. TRANS: %5$s is a URL to the full conversion if it exists (otherwise empty),
+#. TRANS: %5$s is the text "The full conversation can be read here:" and a URL to the full conversion if it exists (otherwise empty),
 #. TRANS: %6$s is a URL to reply to the notice, %7$s is a URL to all @-replies for the addressed user,
 #, php-format
 msgid ""
@@ -8871,6 +8368,10 @@ msgstr ""
 
 #. TRANS: Subject of group join notification e-mail.
 #. TRANS: %1$s is the joining user's nickname, %2$s is the group name, and %3$s is the StatusNet sitename.
+#, php-format
+msgid "%1$s has joined your group %2$s on %3$s"
+msgstr "%1$s ha adherite a tu gruppo %2$s in %3$s"
+
 #. TRANS: Main body of group join notification e-mail.
 #. TRANS: %1$s is the subscriber's long name, %2$s is the group name, and %3$s is the StatusNet sitename,
 #. TRANS: %4$s is a block of profile info about the subscriber.
@@ -8960,8 +8461,8 @@ msgstr "Facer admin"
 
 #. TRANS: Submit button title.
 msgctxt "TOOLTIP"
-msgid "Make this user an admin"
-msgstr "Facer iste usator un administrator"
+msgid "Make this user an admin."
+msgstr "Facer iste usator administrator."
 
 #. TRANS: Client exception thrown when a database error was thrown during a file upload operation.
 msgid "There was a database error while saving your file. Please try again."
@@ -9010,7 +8511,7 @@ msgstr "Inviar un nota directe"
 msgid "Select recipient:"
 msgstr "Selige destinatario:"
 
-#. TRANS Entry in drop-down selection box in direct-message inbox/outbox when no one is available to message.
+#. TRANS: Entry in drop-down selection box in direct-message inbox/outbox when no one is available to message.
 msgid "No mutual subscribers."
 msgstr "Nulle subscriptores mutual."
 
@@ -9077,6 +8578,10 @@ msgstr "Non sape manear iste typo de destination."
 msgid "You must implement either adaptNoticeListItem() or showNotice()."
 msgstr "Es necessari implementar o adaptNoticeListItem() o showNotice()."
 
+#. TRANS: Link description to show more items in a list.
+msgid "More â–¼"
+msgstr "Plus â–¼"
+
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 msgid "Nickname cannot be empty."
 msgstr "Le pseudonymo non pote esser vacue."
@@ -9126,10 +8631,6 @@ msgctxt "SEPARATOR"
 msgid ", "
 msgstr ", "
 
-#. TRANS: Start of profile addressees list.
-msgid " â–¸ "
-msgstr " â–¸ "
-
 #. TRANS: Used in coordinates as abbreviation of north.
 msgid "N"
 msgstr "N"
@@ -9168,16 +8669,16 @@ msgid "Repeated by"
 msgstr "Repetite per"
 
 #. TRANS: Link title in notice list item to reply to a notice.
-msgid "Reply to this notice"
-msgstr "Responder a iste nota"
+msgid "Reply to this notice."
+msgstr "Responder a iste nota."
 
 #. TRANS: Link text in notice list item to reply to a notice.
 msgid "Reply"
 msgstr "Responder"
 
 #. TRANS: Link title in notice list item to delete a notice.
-msgid "Delete this notice"
-msgstr "Deler iste nota"
+msgid "Delete this notice from the timeline."
+msgstr "Deler iste nota del chronologia."
 
 #. TRANS: Title for repeat form status in notice list when a notice has been repeated.
 msgid "Notice repeated."
@@ -9200,26 +8701,6 @@ msgstr "Pulsar"
 msgid "Send a nudge to this user."
 msgstr "Inviar un pulsata a iste usator."
 
-#. TRANS: Exception thrown when creating a new profile fails in OAuth store.
-msgid "Error inserting new profile."
-msgstr "Error durante le insertion del nove profilo."
-
-#. TRANS: Exception thrown when creating a new avatar fails in OAuth store.
-msgid "Error inserting avatar."
-msgstr "Error durante le insertion del avatar."
-
-#. TRANS: Exception thrown when creating a remote profile fails in OAuth store.
-msgid "Error inserting remote profile."
-msgstr "Error durante le insertion del profilo remote."
-
-#. TRANS: Exception thrown when a notice is denied because it has been sent before.
-msgid "Duplicate notice."
-msgstr "Nota duplicate."
-
-#. TRANS: Exception thrown when creating a new subscription fails in OAuth store.
-msgid "Could not insert new subscription."
-msgstr "Non poteva inserer nove subscription."
-
 #. TRANS: Server exception thrown in oEmbed action if no API endpoint is available.
 msgid "No oEmbed API endpoint available."
 msgstr "Nulle puncto de fin del API de oEmbed es disponibile."
@@ -9297,10 +8778,6 @@ msgstr "Modificar"
 msgid "Edit %s list by you."
 msgstr "Modificar tu lista \"%s\"."
 
-#. TRANS: Link description for link to list of users tagged with a tag.
-msgid "Tagged"
-msgstr "Etiquettate"
-
 #. TRANS: Title for link to edit list settings.
 msgid "Edit list settings."
 msgstr "Modificar configuration de lista."
@@ -9443,9 +8920,12 @@ msgctxt "plugin"
 msgid "Enable"
 msgstr "Activar"
 
+#. TRANS: Plugin description for a disabled plugin.
 msgctxt "plugin-description"
-msgid "(Plugin descriptions unavailable when disabled.)"
-msgstr "(Le descriptiones de plug-ins non es disponibile si disactivate.)"
+msgid ""
+"(The plugin description is unavailable when a plugin has been disabled.)"
+msgstr ""
+"(Le description de un plug-in non es disponibile si illo es disactivate.)"
 
 #. TRANS: Menu item in primary navigation panel.
 msgctxt "MENU"
@@ -9456,6 +8936,11 @@ msgstr "Configurationes"
 msgid "Change your personal settings."
 msgstr "Cambiar tu optiones personal."
 
+#. TRANS: Menu item in primary navigation panel.
+msgctxt "MENU"
+msgid "Admin"
+msgstr "Admin"
+
 #. TRANS: Menu item title in primary navigation panel.
 msgid "Site configuration."
 msgstr "Configuration del sito."
@@ -9473,14 +8958,8 @@ msgstr "Terminar le session del sito."
 msgid "Login to the site."
 msgstr "Authenticar te a iste sito."
 
-#. TRANS: Menu item in primary navigation panel.
-msgctxt "MENU"
-msgid "Search"
-msgstr "Cercar"
-
-#. TRANS: Menu item title in primary navigation panel.
-msgid "Search the site."
-msgstr "Cercar in le sito."
+msgid "This profile has been silenced by site moderators"
+msgstr "Iste profilo ha essite silentiate per le moderatores del sito"
 
 #. TRANS: H2 text for user subscription statistics.
 msgid "Following"
@@ -9490,6 +8969,10 @@ msgstr "Seque"
 msgid "Followers"
 msgstr "Sequitores"
 
+#. TRANS: H2 text for user statistics.
+msgid "Statistics"
+msgstr "Statisticas"
+
 #. TRANS: Label for user statistics.
 msgid "User ID"
 msgstr "ID del usator"
@@ -9498,10 +8981,6 @@ msgstr "ID del usator"
 msgid "Member since"
 msgstr "Membro depost"
 
-#. TRANS: Label for user statistics.
-msgid "Notices"
-msgstr "Notas"
-
 #. TRANS: Label for user statistics.
 #. TRANS: Average count of posts made per day since account registration.
 msgid "Daily average"
@@ -9587,13 +9066,13 @@ msgid "Keyword(s)"
 msgstr "Parola(s)-clave"
 
 #. TRANS: Button text for searching site.
+#. TRANS: Button text for search button on search form.
 #. TRANS: Button text to search profiles.
 msgctxt "BUTTON"
 msgid "Search"
 msgstr "Cercar"
 
 #. TRANS: Standard search suggestions shown when a search does not give any results.
-#, fuzzy
 msgid ""
 "* Make sure all words are spelled correctly.\n"
 "* Try different keywords.\n"
@@ -9603,10 +9082,10 @@ msgstr ""
 "* Verifica que tote le parolas es orthographiate correctemente.\n"
 "* Proba differente parolas-clave.\n"
 "* Proba parolas-clave plus general.\n"
-"* Proba minus parolas-clave.\n"
+"* Proba minus parolas-clave."
 
 #. TRANS: Standard search suggestions shown when a search does not give any results.
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "You can also try your search on other engines:\n"
 "\n"
@@ -9625,7 +9104,7 @@ msgstr ""
 "* [Google](http://www.google.com/search?hl=ia&q=site%%3A%%%%site.server%%%%+%"
 "s)\n"
 "* [Yahoo](http://search.yahoo.com/search?p=site%%3A%%%%site.server%%%%+%s)\n"
-"* [Collecta](http://collecta.com/#q=%s)\n"
+"* [Collecta](http://collecta.com/#q=%s)"
 
 #. TRANS: Menu item in search group navigation panel.
 msgctxt "MENU"
@@ -9649,21 +9128,6 @@ msgstr "Cercar in contento de notas"
 msgid "Find groups on this site"
 msgstr "Cercar gruppos in iste sito"
 
-#. TRANS: Secondary navigation menu item leading to help on StatusNet.
-msgctxt "MENU"
-msgid "Help"
-msgstr "Adjuta"
-
-#. TRANS: Secondary navigation menu item leading to text about StatusNet site.
-msgctxt "MENU"
-msgid "About"
-msgstr "A proposito"
-
-#. TRANS: Secondary navigation menu item leading to Frequently Asked Questions.
-msgctxt "MENU"
-msgid "FAQ"
-msgstr "FAQ"
-
 #. TRANS: Secondary navigation menu item leading to Terms of Service.
 msgctxt "MENU"
 msgid "TOS"
@@ -9684,17 +9148,6 @@ msgctxt "MENU"
 msgid "Version"
 msgstr "Version"
 
-#. TRANS: Secondary navigation menu item leading to e-mail contact information on the
-#. TRANS: StatusNet site, where to report bugs, ...
-msgctxt "MENU"
-msgid "Contact"
-msgstr "Contacto"
-
-#. TRANS: Secondary navigation menu item. Leads to information about embedding a timeline widget.
-msgctxt "MENU"
-msgid "Badge"
-msgstr "Insignia"
-
 #. TRANS: Default title for section/sidebar widget.
 msgid "Untitled section"
 msgstr "Section sin titulo"
@@ -9739,10 +9192,6 @@ msgstr "E-mail"
 msgid "Change email handling"
 msgstr "Modificar le tractamento de e-mail"
 
-#. TRANS: Menu item title in settings navigation panel.
-msgid "Design your profile"
-msgstr "Designar tu profilo"
-
 #. TRANS: Menu item in settings navigation panel.
 msgctxt "MENU"
 msgid "URL"
@@ -9779,6 +9228,15 @@ msgstr "Connexiones"
 msgid "Authorized connected applications"
 msgstr "Applicationes autorisate connectite"
 
+#. TRANS: Menu item in settings navigation panel.
+msgctxt "MENU"
+msgid "Old school"
+msgstr "Interfacie ancian"
+
+#. TRANS: Menu item title in settings navigation panel.
+msgid "UI tweaks for old-school users"
+msgstr "Adjustamentos de interfacie pro usatores del vetule maniera"
+
 #. TRANS: Title of form to silence a user.
 msgctxt "TITLE"
 msgid "Silence"
@@ -9788,6 +9246,45 @@ msgstr "Silentiar"
 msgid "Silence this user"
 msgstr "Silentiar iste usator"
 
+#. TRANS: Server error displayed when trying to create an anynymous OAuth consumer.
+msgid "Could not create anonymous consumer."
+msgstr "Non poteva crear consumitor anonyme."
+
+#. TRANS: Server error displayed when trying to create an anynymous OAuth application.
+msgid "Could not create anonymous OAuth application."
+msgstr "Non poteva crear application OAuth anonyme."
+
+#. TRANS: Exception thrown when no token association could be found.
+msgid ""
+"Could not find a profile and application associated with the request token."
+msgstr ""
+"Non poteva trovar un profilo e application associate con le indicio de "
+"requesta."
+
+#. TRANS: Exception thrown when no access token can be issued.
+msgid "Could not issue access token."
+msgstr "Non poteva emitter le indicio de accesso."
+
+#. TRANS: Exception thrown when a database error occurs.
+msgid "Database error inserting OAuth application user."
+msgstr ""
+"Error del base de datos durante le insertion del usator del application "
+"OAuth."
+
+#. TRANS: Exception thrown when a database error occurs.
+msgid "Database error updating OAuth application user."
+msgstr ""
+"Error del base de datos durante le actualisation del usator del application "
+"OAuth."
+
+#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
+msgid "Tried to revoke unknown token."
+msgstr "Tentava revocar un indicio non cognoscite."
+
+#. TRANS: Exception thrown when an attempt is made to remove a revoked token.
+msgid "Failed to delete revoked token."
+msgstr "Falleva de deler le indicio revocate."
+
 #. TRANS: Menu item in local navigation menu.
 msgctxt "MENU"
 msgid "Subscriptions"
@@ -9842,7 +9339,17 @@ msgstr "Invitar amicos e collegas a accompaniar te in %s."
 
 #. TRANS: Form of form to subscribe to a user.
 msgid "Subscribe to this user"
-msgstr "Subscriber a iste usator"
+msgstr "Subscriber se a iste usator"
+
+#. TRANS: Button text to subscribe to a user.
+#. TRANS: Button text for subscribing to a list.
+msgctxt "BUTTON"
+msgid "Subscribe"
+msgstr "Sequer"
+
+#. TRANS: Button title to subscribe to a user.
+msgid "Subscribe to this user."
+msgstr "Subscriber se a iste usator."
 
 #. TRANS: Title of personal tag cloud section.
 msgid "People Tagcloud as self-tagged"
@@ -9949,7 +9456,7 @@ msgstr "%1$s e %2$s"
 #. TRANS: List message for notice favoured by logged in user.
 msgctxt "FAVELIST"
 msgid "You like this."
-msgstr "Isto te place."
+msgstr "Tu apprecia isto."
 
 #. TRANS: List message for when more than 4 people like something.
 #. TRANS: %%s is a list of users liking a notice, %d is the number over 4 that like the notice.
@@ -9957,8 +9464,8 @@ msgstr "Isto te place."
 #, php-format
 msgid "%%s and %d others like this."
 msgid_plural "%%s and %d others like this."
-msgstr[0] "Isto place a %%s e a %d alteres."
-msgstr[1] "Isto place a %%s e a %d alteres."
+msgstr[0] "%%s e %d altere apprecia isto."
+msgstr[1] "%%s e %d alteres apprecia isto."
 
 #. TRANS: List message for favoured notices.
 #. TRANS: %%s is a list of users liking a notice.
@@ -9966,21 +9473,31 @@ msgstr[1] "Isto place a %%s e a %d alteres."
 #, php-format
 msgid "%%s likes this."
 msgid_plural "%%s like this."
-msgstr[0] "%%s ama isto."
-msgstr[1] "%%s ama isto."
+msgstr[0] "%%s apprecia isto."
+msgstr[1] "%%s apprecia isto."
 
 #. TRANS: List message for notice repeated by logged in user.
 msgctxt "REPEATLIST"
-msgid "You have repeated this notice."
-msgstr "Tu ha repetite iste nota."
+msgid "You repeated this."
+msgstr "Tu ha repetite isto."
 
-#. TRANS: List message for repeated notices.
-#. TRANS: %d is the number of users that have repeated a notice.
+#. TRANS: List message for when more than 4 people repeat something.
+#. TRANS: %%s is a list of users liking a notice, %d is the number over 4 that like the notice.
+#. TRANS: Plural is decided on the total number of users liking the notice (count of %%s + %d).
 #, php-format
-msgid "One person has repeated this notice."
-msgid_plural "%d people have repeated this notice."
-msgstr[0] "Un persona ha repetite iste nota."
-msgstr[1] "%d personas ha repetite iste nota."
+msgid "%%s and %d other repeated this."
+msgid_plural "%%s and %d others repeated this."
+msgstr[0] "%%s e %d alteres ha repetite isto."
+msgstr[1] "%%s e %d alteres ha repetite isto."
+
+#. TRANS: List message for favoured notices.
+#. TRANS: %%s is a list of users liking a notice.
+#. TRANS: Plural is based on the number of of users that have favoured a notice.
+#, php-format
+msgid "%%s repeated this."
+msgid_plural "%%s repeated this."
+msgstr[0] "%%s ha repetite isto."
+msgstr[1] "%%s ha repetite isto."
 
 #. TRANS: Form legend.
 #, php-format
@@ -10072,7 +9589,6 @@ msgid "Unsilence this user"
 msgstr "Non plus silentiar iste usator"
 
 #. TRANS: Form legend on unsubscribe form.
-#. TRANS: Button title on unsubscribe form.
 msgid "Unsubscribe from this user"
 msgstr "Cancellar subscription a iste usator"
 
@@ -10080,7 +9596,11 @@ msgstr "Cancellar subscription a iste usator"
 #. TRANS: Button text for unsubscribing from a list.
 msgctxt "BUTTON"
 msgid "Unsubscribe"
-msgstr "Cancellar subscription"
+msgstr "Non sequer"
+
+#. TRANS: Button title on unsubscribe form.
+msgid "Unsubscribe from this user."
+msgstr "Cancellar subscription a iste usator."
 
 #. TRANS: Exception text shown when no profile can be found for a user.
 #. TRANS: %1$s is a user nickname, $2$d is a user ID (number).
@@ -10163,8 +9683,6 @@ msgstr "XML invalide, radice XRD mancante."
 msgid "Getting backup from file '%s'."
 msgstr "Obtene copia de reserva ex file '%s'."
 
-#~ msgid "%1$s and friends, page %2$d"
-#~ msgstr "%1$s e amicos, pagina %2$d"
-
-#~ msgid "You and friends"
-#~ msgstr "Tu e amicos"
+#
+#~ msgid " "
+#~ msgstr " "
diff --git a/locale/it/LC_MESSAGES/statusnet.po b/locale/it/LC_MESSAGES/statusnet.po
index fdb695370a..6f9c3c0130 100644
--- a/locale/it/LC_MESSAGES/statusnet.po
+++ b/locale/it/LC_MESSAGES/statusnet.po
@@ -1,10 +1,16 @@
-# Translation of StatusNet - Core to Italian (Italiano)
+# Translation of StatusNet - Core to Italian (italiano)
 # Exported from translatewiki.net
 #
+# Author: Beta16
+# Author: Gianfranco
 # Author: HalphaZ
 # Author: Milocasagrande
+# Author: Mpitt
 # Author: Nemo bis
 # Author: Od1n
+# Author: Rippitippi
+# Author: Ximo17
+# Author: 1009
 # --
 # This file is distributed under the same license as the StatusNet package.
 #
@@ -12,17 +18,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:18+0000\n"
-"Language-Team: Italian <http://translatewiki.net/wiki/Portal:it>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:13+0000\n"
+"Language-Team: Italian <https://translatewiki.net/wiki/Portal:it>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: it\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-05-05 10:52:40+0000\n"
+"X-POT-Import-Date: 2012-04-22 22:02:21+0000\n"
 
 #. TRANS: Database error message.
 #, php-format
@@ -32,27 +38,26 @@ msgid ""
 "contact them at %2$s to make sure. Otherwise, wait a few minutes and try "
 "again."
 msgstr ""
-
-#. TRANS: Error message.
-msgid ""
-"An important error occured, probably related to email setup. Check logfiles "
-"for more info."
-msgstr ""
+"Il database per %1$s non risponde correttamente, quindi il sito non "
+"funzionerà correttamente. Gli amministratori del sito probabilmente sono a "
+"conoscenza del problema, ma è possibile contattarli a %2$s per accertarsene. "
+"Altrimenti, attendere qualche minuto e riprovare."
 
 #. TRANS: Error message.
 msgid "An error occurred."
-msgstr ""
+msgstr "Si è verificato un errore."
 
 #. TRANS: Error message displayed when there is no StatusNet configuration file.
 #, php-format
 msgid ""
 "No configuration file found. Try running the installation program first."
 msgstr ""
+"Nessun file di configurazione trovato. Provare ad eseguire prima il "
+"programma di installazione."
 
 #. TRANS: Error message displayed when trying to access a non-existing page.
-#, fuzzy
 msgid "Unknown page"
-msgstr "Sconosciuto"
+msgstr "Pagina sconosciuta"
 
 #. TRANS: Error message displayed when trying to perform an undefined action.
 #. TRANS: Title for password recovery page when an unknown action has been specified.
@@ -86,26 +91,25 @@ msgstr "Privato"
 
 #. TRANS: Checkbox instructions for admin setting "Invite only".
 msgid "Make registration invitation only."
-msgstr "Rende la registrazione solo su invito"
+msgstr "Permettere la registrazione solo su invito."
 
 #. TRANS: Checkbox label for configuring site as invite only.
 msgid "Invite only"
-msgstr "Solo invito"
+msgstr "Solo su invito"
 
 #. TRANS: Checkbox instructions for admin setting "Closed" (no new registrations).
 msgid "Disable new registrations."
-msgstr "Disabilita la creazione di nuovi account"
+msgstr "Disabilita la creazione di nuovi account."
 
 #. TRANS: Checkbox label for disabling new user registrations.
 msgid "Closed"
 msgstr "Chiuso"
 
-#. TRANS: Title for button to save access settings in site admin panel.
-msgid "Save access settings"
-msgstr "Salva impostazioni di accesso"
+#. TRANS: Button title to save access settings in site admin panel.
+msgid "Save access settings."
+msgstr "Salva le impostazioni di accesso."
 
-#. TRANS: Tooltip for button to save access settings in site admin panel.
-#. TRANS: Button text for saving theme settings.
+#. TRANS: Button text to save access settings in site admin panel.
 #. TRANS: Button label to save e-mail preferences.
 #. TRANS: Button label to save IM preferences.
 #. TRANS: Button text in the license admin panel.
@@ -121,7 +125,6 @@ msgstr "Salva impostazioni di accesso"
 #. TRANS: Button text for saving "Other settings" in profile.
 #. TRANS: Button text to save user settings in user admin panel.
 #. TRANS: Button label in the "Edit application" form.
-#. TRANS: Button text on profile design page to save settings.
 #. TRANS: Text for save button on group edit form.
 #. TRANS: Button text to save tags for a profile.
 msgctxt "BUTTON"
@@ -158,21 +161,14 @@ msgstr "Nessun profilo."
 #. TRANS: Client error displayed trying to reference a non-existing list.
 #. TRANS: Client error displayed when referring to a non-existing list.
 #. TRANS: Client error displayed trying to reference a non-existing list.
-#, fuzzy
 msgid "No such list."
-msgstr "Nessuna etichetta."
-
-#. TRANS: Client error displayed when trying to add an OMB 0.1 remote profile to a list.
-#, fuzzy
-msgid "You cannot list an OMB 0.1 remote profile with this action."
-msgstr ""
-"Non è possibile abbonarsi a un profilo remoto OMB 0.1 con quest'azione."
+msgstr "Nessun elenco del genere."
 
 #. TRANS: Client error displayed when an unknown error occurs when adding a user to a list.
 #. TRANS: %s is a username.
 #, php-format
 msgid "There was an unexpected error while listing %s."
-msgstr ""
+msgstr "Si è verificato un errore imprevisto nell'aggiungere %s ad una lista."
 
 #. TRANS: Client error displayed when an unknown error occurs when adding a user to a list.
 #. TRANS: %s is a profile URL.
@@ -181,12 +177,13 @@ msgid ""
 "There was a problem listing %s. The remote server is probably not responding "
 "correctly. Please try retrying later."
 msgstr ""
+"Si è verificato un problema nell'aggiungere %s alla lista. Il server remoto "
+"probabilmente non risponde correttamente. Si prega di riprovare più tardi."
 
 #. TRANS: Title after adding a user to a list.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Listed"
-msgstr "Licenza"
+msgstr "Aggiunto alla lista"
 
 #. TRANS: Server error when page not found (404).
 #. TRANS: Server error when page not found (404)
@@ -198,7 +195,6 @@ msgstr "Pagina inesistente."
 #. TRANS: Client error when user not found for an rss related action.
 #. TRANS: Client error displayed when no existing user is provided for a user's delivery device setting.
 #. TRANS: Client error displayed if a user could not be found.
-#. TRANS: Client error when user not found updating a profile background image.
 #. TRANS: Client error displayed updating profile image without having a user object.
 #. TRANS: Client error displayed when making an Atom API request for an unknown user.
 #. TRANS: Client error displayed when trying to block a non-existing user or a user from another site.
@@ -224,14 +220,11 @@ msgstr "Pagina inesistente."
 #. TRANS: Client error displayed when trying to get the RSS feed with favorites of a user that does not exist.
 #. TRANS: Client error displayed when requesting Friends of a Friend feed without providing a user nickname.
 #. TRANS: Client error displayed when requesting Friends of a Friend feed for an object that is not a user.
-#. TRANS: Client error displayed when trying to get a user hCard for a non-existing user.
 #. TRANS: Client error displayed trying to make a micro summary without providing a valid user.
 #. TRANS: Client error displayed trying to send a direct message to a non-existing user.
 #. TRANS: Client error displayed trying to use "one time password login" without using an existing user.
 #. TRANS: Client error displayed when referring to non-existing user.
 #. TRANS: Client error displayed trying to perform an action related to a non-existing user.
-#. TRANS: Form validation error on page for remote subscribe when no user was provided.
-#. TRANS: Form validation error on page for remote subscribe when no user profile was found.
 #. TRANS: Client error displayed when trying to reply to a non-exsting user.
 #. TRANS: Client error displayed when providing a non-existing nickname in a RSS 1.0 action.
 #. TRANS: Client error.
@@ -240,7 +233,6 @@ msgstr "Pagina inesistente."
 #. TRANS: Client error displayed trying to find a user by ID for a non-existing ID.
 #. TRANS: Client error displayed requesting groups for a non-existing user.
 #. TRANS: Client error displayed when user not found for an action.
-#. TRANS: Client error displayed providing a non-existing nickname.
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #. TRANS: Client error displayed when trying to perform a gallery action with an unknown user.
 #. TRANS: Client error displayed when trying to access a mailbox without providing a user.
@@ -249,15 +241,21 @@ msgid "No such user."
 msgstr "Utente inesistente."
 
 #. TRANS: Title of a user's own start page.
-#, fuzzy
 msgid "Home timeline"
-msgstr "Attività di %s"
+msgstr "Cronologia della Home"
 
 #. TRANS: Title of another user's start page.
 #. TRANS: %s is the other user's name.
-#, fuzzy, php-format
+#, php-format
 msgid "%s's home timeline"
-msgstr "Attività di %s"
+msgstr "Cronologia della Home di %s"
+
+#. TRANS: %s is user nickname.
+#. TRANS: Feed title.
+#. TRANS: %s is tagger's nickname.
+#, php-format
+msgid "Feed for friends of %s (Activity Streams JSON)"
+msgstr "Feed per gli amici di %s (Activity Streams JSON)"
 
 #. TRANS: %s is user nickname.
 #, php-format
@@ -282,7 +280,7 @@ msgid ""
 "This is the timeline for %s and friends but no one has posted anything yet."
 msgstr ""
 "Questa è l'attività di %s e i suoi amici, ma nessuno ha ancora scritto "
-"qualche cosa."
+"qualcosa."
 
 #. TRANS: Encouragement displayed on logged in user's empty timeline.
 #. TRANS: This message contains Markdown links. Keep "](" together.
@@ -291,7 +289,7 @@ msgid ""
 "Try subscribing to more people, [join a group](%%action.groups%%) or post "
 "something yourself."
 msgstr ""
-"Prova ad abbonarti a più persone, [entra in un gruppo](%%action.groups%%) o "
+"Prova ad iscriverti a più persone, [entra in un gruppo](%%action.groups%%) o "
 "scrivi un messaggio."
 
 #. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@".
@@ -301,10 +299,10 @@ msgid ""
 "You can try to [nudge %1$s](../%2$s) from their profile or [post something "
 "to them](%%%%action.newnotice%%%%?status_textarea=%3$s)."
 msgstr ""
-"[Scrivi qualche cosa](%%%%action.newnotice%%%%?status_textarea=%s) su questo "
-"argomento!"
+"Puoi provare a [trillare a %1$s](../%2$s) dal loro profilo oppure a "
+"[postargli qualcosa](%%%%action.newnotice%%%%?status_textarea=%3$s)."
 
-#. TRANS: Encoutagement displayed on empty timeline user pages for anonymous users.
+#. TRANS: Encouragement displayed on empty timeline user pages for anonymous users.
 #. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
 #. TRANS: Empty list message for page with replies for a user for not logged in users.
 #. TRANS: %1$s is a user nickname. This message contains a Markdown link in the form [link text](link).
@@ -314,7 +312,15 @@ msgstr ""
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
 "post a notice to them."
-msgstr "Perché non [crei un accout](%%action.register%%) e ne scrivi uno tu!"
+msgstr ""
+"Perché non [registri un account](%%%%action.register%%%%) e poi dai una "
+"gomitata a %s oppure gli invii una notifica."
+
+#. TRANS: Button text for inviting more users to the StatusNet instance.
+#. TRANS: Less business/enterprise-oriented language for public sites.
+msgctxt "BUTTON"
+msgid "Send invite"
+msgstr "Manda un invito"
 
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Title of API timeline for a user and friends.
@@ -324,8 +330,6 @@ msgstr "Perché non [crei un accout](%%action.register%%) e ne scrivi uno tu!"
 #. TRANS: %s is a username.
 #. TRANS: Menu item title in personal group navigation menu.
 #. TRANS: %s is a username.
-#. TRANS: Menu item title in settings navigation panel.
-#. TRANS: %s is a username.
 #, php-format
 msgid "%s and friends"
 msgstr "%s e amici"
@@ -334,28 +338,28 @@ msgstr "%s e amici"
 #. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name.
 #, php-format
 msgid "Updates from %1$s and friends on %2$s!"
-msgstr "Messaggi da %1$s e amici su %2$s!"
+msgstr "Aggiornamenti da %1$s e amici su %2$s!"
 
 #. TRANS: Client error displayed when coming across a non-supported API method.
 #. TRANS: Client error displayed when trying to handle an unknown API method.
 #. TRANS: Client error displayed when coming across a non-supported API method.
 msgid "API method not found."
-msgstr "Metodo delle API non trovato."
+msgstr "Metodo di API non trovato."
 
 #. TRANS: Client error message. POST is a HTTP command. It should not be translated.
 #. TRANS: Client error. POST is a HTTP command. It should not be translated.
 #. TRANS: Client error message. POST is a HTTP command. It should not be translated.
 #. TRANS: Client error. POST is a HTTP command. It should not be translated.
 msgid "This method requires a POST."
-msgstr "Questo metodo richiede POST."
+msgstr "Questo metodo richiede un POST."
 
 #. TRANS: Client error displayed when no valid device parameter is provided for a user's delivery device setting.
 msgid ""
 "You must specify a parameter named 'device' with a value of one of: sms, im, "
 "none."
 msgstr ""
-"È necessario specificare un parametro chiamato \"device\" con un valore tra: "
-"\"sms\", \"im\" o \"none\"."
+"È necessario specificare un parametro chiamato 'device' con un valore tra: "
+"sms, im o none."
 
 #. TRANS: Server error displayed when a user's delivery device cannot be updated.
 #. TRANS: Server error displayed when confirming an e-mail address or IM address fails.
@@ -365,7 +369,6 @@ msgstr ""
 #. TRANS: Server error thrown on database error updating SMS preferences.
 #. TRANS: Server error thrown on database error removing a registered SMS phone number.
 #. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
-#. TRANS: Server exception thrown on Profile design page when updating design settings fails.
 msgid "Could not update user."
 msgstr "Impossibile aggiornare l'utente."
 
@@ -380,8 +383,7 @@ msgstr "Impossibile salvare il profilo."
 
 #. TRANS: Client error displayed when the number of bytes in a POST request exceeds a limit.
 #. TRANS: %s is the number of bytes of the CONTENT_LENGTH.
-#. TRANS: Form validation error in design settings form. POST should remain untranslated.
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "The server was unable to handle that much POST data (%s byte) due to its "
 "current configuration."
@@ -389,29 +391,11 @@ msgid_plural ""
 "The server was unable to handle that much POST data (%s bytes) due to its "
 "current configuration."
 msgstr[0] ""
-"Il server non è in grado di gestire tutti quei dati POST (%s byte) con la "
-"configurazione attuale."
+"Il server non è stato in grado di gestire tutti quei dati di POST (%s byte) "
+"per la sua attuale configurazione."
 msgstr[1] ""
-"Il server non è in grado di gestire tutti quei dati POST (%s byte) con la "
-"configurazione attuale."
-
-#. TRANS: Client error displayed when saving design settings fails because of an empty id.
-#. TRANS: Client error displayed when saving design settings fails because of an empty result.
-#. TRANS: Client error displayed when a database error occurs inserting profile colours.
-#. TRANS: Client error displayed when a database error occurs updating profile colours.
-#. TRANS: Form validation error displayed when group design settings could not be saved because of an application issue.
-#. TRANS: Form validation error on Profile design page when saving design settings has failed.
-#. TRANS: Form validation error on Profile design page when updating design settings has failed.
-msgid "Unable to save your design settings."
-msgstr "Impossibile salvare la impostazioni dell'aspetto."
-
-#. TRANS: Error displayed when updating design settings fails.
-#. TRANS: Client error displayed when a database error occurs updating profile colours.
-#. TRANS: Form validation error on Profile design page when updating design settings has failed.
-#. TRANS: Error message displayed if design settings could not be saved.
-#. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
-msgid "Could not update your design."
-msgstr "Impossibile aggiornare l'aspetto."
+"Il server non è stato in grado di gestire tutti quei dati di POST (%s byte) "
+"per la sua attuale configurazione."
 
 #. TRANS: Title for Atom feed.
 msgctxt "ATOM"
@@ -424,7 +408,7 @@ msgstr "Principale"
 #. TRANS: Title in atom user notice feed. %s is a user name.
 #, php-format
 msgid "%s timeline"
-msgstr "Attività di %s"
+msgstr "Cronologia di %s"
 
 #. TRANS: Title for Atom feed with a user's subscriptions. %s is a user nickname.
 #. TRANS: Title for Atom subscription feed.
@@ -433,19 +417,19 @@ msgstr "Attività di %s"
 #. TRANS: %s is a user nickname.
 #, php-format
 msgid "%s subscriptions"
-msgstr "Abbonamenti di %s"
+msgstr "Iscrizioni di %s"
 
 #. TRANS: Title for Atom feed with a user's favorite notices. %s is a user nickname.
 #. TRANS: Title for Atom favorites feed.
 #. TRANS: %s is a user nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "%s favorites"
-msgstr "Preferiti"
+msgstr "Preferiti di %s"
 
 #. TRANS: Title for Atom feed with a user's memberships. %s is a user nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "%s memberships"
-msgstr "Membri del gruppo %s"
+msgstr "Membri di %s"
 
 #. TRANS: Client error displayed when users try to block themselves.
 msgid "You cannot block yourself!"
@@ -459,6 +443,20 @@ msgstr "Blocco dell'utente non riuscito."
 msgid "Unblock user failed."
 msgstr "Sblocco dell'utente non riuscito."
 
+#. TRANS: Client exception thrown when no conversation ID is given.
+msgid "No conversation ID."
+msgstr "Nessun ID di conversazione."
+
+#. TRANS: Client exception thrown when referring to a non-existing conversation ID (%d).
+#, php-format
+msgid "No conversation with ID %d."
+msgstr "Nessuna conversazione con ID %d."
+
+#. TRANS: Title for conversion timeline.
+msgctxt "TITLE"
+msgid "Conversation"
+msgstr "Conversazione"
+
 #. TRANS: Title. %s is a user nickname.
 #, php-format
 msgid "Direct messages from %s"
@@ -487,7 +485,7 @@ msgstr "Nessun testo nel messaggio!"
 #. TRANS: %d is the maximum number of characters for a message.
 #. TRANS: Form validation error displayed when message content is too long.
 #. TRANS: %d is the maximum number of characters for a message.
-#, fuzzy, php-format
+#, php-format
 msgid "That's too long. Maximum message size is %d character."
 msgid_plural "That's too long. Maximum message size is %d characters."
 msgstr[0] ""
@@ -500,15 +498,17 @@ msgid "Recipient user not found."
 msgstr "Destinatario non trovato."
 
 #. TRANS: Client error displayed trying to direct message another user who's not a friend (403).
-#, fuzzy
 msgid "Cannot send direct messages to users who aren't your friend."
-msgstr "Non puoi inviare messaggi diretti a utenti che non sono tuoi amici."
+msgstr ""
+"Non è possibile inviare messaggi diretti ad utenti che non sono tuoi amici."
 
 #. TRANS: Client error displayed trying to direct message self (403).
-#, fuzzy
+#. TRANS: Client error displayed trying to send a direct message to self.
+#. TRANS: Error text shown when trying to send a direct message to self.
 msgid ""
 "Do not send a message to yourself; just say it to yourself quietly instead."
-msgstr "Non inviarti un messaggio, piuttosto ripetilo a voce dolcemente."
+msgstr ""
+"Non inviarti un messaggio da solo, puoi tranquillamente ripetertelo a voce."
 
 #. TRANS: Client error displayed when requesting a status with a non-existing ID.
 #. TRANS: Client error displayed when trying to remove a favourite with an invalid ID.
@@ -547,16 +547,15 @@ msgstr "Impossibile seguire l'utente: %s è già nel tuo elenco."
 
 #. TRANS: Client error displayed when trying to unfollow a user that cannot be found.
 msgid "Could not unfollow user: User not found."
-msgstr "Impossibile non seguire l'utente: utente non trovato."
+msgstr "Impossibile smettere di seguire l'utente: utente non trovato."
 
 #. TRANS: Client error displayed when trying to unfollow self.
 msgid "You cannot unfollow yourself."
-msgstr "Non puoi non seguirti."
+msgstr "Non puoi smettere di seguirti."
 
 #. TRANS: Client error displayed when supplying invalid parameters to an API call checking if a friendship exists.
-#, fuzzy
 msgid "Two valid IDs or nick names must be supplied."
-msgstr "Devono essere forniti due ID o screen_names."
+msgstr "Devono essere forniti due ID o nick names validi."
 
 #. TRANS: Client error displayed when a source user could not be determined showing friendship.
 msgid "Could not determine source user."
@@ -573,7 +572,7 @@ msgstr "Impossibile trovare l'utente destinazione."
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Form validation error displayed when trying to register with an existing nickname.
 msgid "Nickname already in use. Try another one."
-msgstr "Soprannome già in uso. Prova con un altro."
+msgstr "Nickname già in uso. Prova con un altro."
 
 #. TRANS: Client error in form for group creation.
 #. TRANS: API validation exception thrown when nickname does not validate.
@@ -582,7 +581,7 @@ msgstr "Soprannome già in uso. Prova con un altro."
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Form validation error displayed when trying to register with an invalid nickname.
 msgid "Not a valid nickname."
-msgstr "Non è un soprannome valido."
+msgstr "Non è un nickname valido."
 
 #. TRANS: Client error in form for group creation.
 #. TRANS: API validation exception thrown when homepage URL does not validate.
@@ -601,9 +600,8 @@ msgstr "L'indirizzo della pagina web non è valido."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Form validation error displayed when trying to register with a too long full name.
-#, fuzzy
 msgid "Full name is too long (maximum 255 characters)."
-msgstr "Nome troppo lungo (max 255 caratteri)."
+msgstr "Nome e cognome troppo lungo (massimo 255 caratteri)."
 
 #. TRANS: Client error shown when providing too long a description during group creation.
 #. TRANS: %d is the maximum number of allowed characters.
@@ -618,11 +616,11 @@ msgstr "Nome troppo lungo (max 255 caratteri)."
 #. TRANS: %d is the maximum number of characters for the description.
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed characters.
-#, fuzzy, php-format
+#, php-format
 msgid "Description is too long (maximum %d character)."
 msgid_plural "Description is too long (maximum %d characters)."
-msgstr[0] "La descrizione è troppo lunga (max %d caratteri)."
-msgstr[1] "La descrizione è troppo lunga (max %d caratteri)."
+msgstr[0] "La descrizione è troppo lunga (massimo %d caratteri)."
+msgstr[1] "La descrizione è troppo lunga (massimo %d caratteri)."
 
 #. TRANS: Client error shown when providing too long a location during group creation.
 #. TRANS: API validation exception thrown when location does not validate.
@@ -630,9 +628,8 @@ msgstr[1] "La descrizione è troppo lunga (max %d caratteri)."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Form validation error displayed when trying to register with a too long location.
-#, fuzzy
 msgid "Location is too long (maximum 255 characters)."
-msgstr "Ubicazione troppo lunga (max 255 caratteri)."
+msgstr "L'indirizzo è troppo lungo (max 255 caratteri)."
 
 #. TRANS: Client error shown when providing too many aliases during group creation.
 #. TRANS: %d is the maximum number of allowed aliases.
@@ -642,11 +639,11 @@ msgstr "Ubicazione troppo lunga (max 255 caratteri)."
 #. TRANS: %d is the maximum number of allowed aliases.
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed aliases.
-#, fuzzy, php-format
+#, php-format
 msgid "Too many aliases! Maximum %d allowed."
 msgid_plural "Too many aliases! Maximum %d allowed."
-msgstr[0] "Troppi alias! Massimo %d."
-msgstr[1] "Troppi alias! Massimo %d."
+msgstr[0] "Troppi alias! Ne sono permessi al massimo %d."
+msgstr[1] "Troppi alias! Ne sono permessi al massimo %d."
 
 #. TRANS: Client error shown when providing an invalid alias during group creation.
 #. TRANS: %s is the invalid alias.
@@ -737,7 +734,6 @@ msgstr "Gruppi su %s"
 
 #. TRANS: Client error displayed when trying to edit a group without being an admin.
 #. TRANS: Client error displayed trying to edit a group while not being a group admin.
-#. TRANS: Client error displayed trying to change group design settings without being a (group) admin.
 #. TRANS: Client error displayed when trying to change group logo settings while not being a group admin.
 msgid "You must be an admin to edit the group."
 msgstr "Devi essere amministratore per modificare il gruppo."
@@ -762,105 +758,92 @@ msgstr ""
 
 #. TRANS: API validation exception thrown when alias is the same as nickname.
 #. TRANS: Group create form validation error.
-#, fuzzy
 msgid "Alias cannot be the same as nickname."
-msgstr "L'alias non può essere lo stesso del soprannome."
+msgstr "Il soprannome non può essere lo stesso del nome utente"
 
 #. TRANS: Client error displayed when referring to a non-existing list.
 #. TRANS: Client error displayed trying to perform an action related to a non-existing list.
 #. TRANS: Client error displayed when referring to a non-existing list.
-#, fuzzy
 msgid "List not found."
-msgstr "Metodo delle API non trovato."
+msgstr "Elenco non trovato."
 
 #. TRANS: Client error displayed when trying to update another user's list.
 msgid "You cannot update lists that do not belong to you."
-msgstr ""
+msgstr "Non puoi aggiornare liste che non ti appartengono."
 
 #. TRANS: Client error displayed when an unknown error occurs updating a list.
 #. TRANS: Client error displayed when an unknown error occurs viewing list members.
 #. TRANS: Client error displayed when an unknown error occurs in the list subscribers action.
 #. TRANS: Client error displayed when an unknown error occurs unsubscribing from a list.
 msgid "An error occured."
-msgstr ""
+msgstr "Si è verificato un errore."
 
 #. TRANS: Client error displayed when trying to delete another user's list.
 msgid "You cannot delete lists that do not belong to you."
-msgstr ""
+msgstr "Non puoi cancellare liste che non ti appartengono."
 
 #. TRANS: Client error displayed when referring to a non-list member.
-#, fuzzy
 msgid "The specified user is not a member of this list."
-msgstr "L'utente non fa parte del gruppo."
+msgstr "L'utente specificato non fa parte di questa lista."
 
 #. TRANS: Client error displayed when trying to add members to a list without having the right to do so.
-#, fuzzy
 msgid "You are not allowed to add members to this list."
-msgstr "Non fai parte di questo gruppo."
+msgstr "Non ti è permesso aggiungere utenti a questa lista."
 
 #. TRANS: Client error displayed when trying to modify list members without specifying them.
-#, fuzzy
 msgid "You must specify a member."
-msgstr "Profilo mancante."
+msgstr "È necessario specificare un utente."
 
 #. TRANS: Client error displayed when trying to remove members from a list without having the right to do so.
-#, fuzzy
 msgid "You are not allowed to remove members from this list."
-msgstr "Non fai parte di questo gruppo."
+msgstr "Non ti è permesso di rimuovere gli utenti da questa lista."
 
 #. TRANS: Client error displayed when trying to remove a list member that is not part of a list.
 msgid "The user you are trying to remove from the list is not a member."
-msgstr ""
+msgstr "L'utente che stai cercando di rimuovere dalla lista non è un membro."
 
 #. TRANS: Client error displayed when trying to create a list without a name.
-#, fuzzy
 msgid "A list must have a name."
-msgstr "L'alias non può essere lo stesso del soprannome."
+msgstr "Una lista deve avere un nome."
 
 #. TRANS: Client error displayed when a membership check for a user is nagative.
 msgid "The specified user is not a subscriber of this list."
-msgstr ""
+msgstr "L'utente indicato non fa parte di questa lista."
 
 #. TRANS: Client error displayed when trying to unsubscribe from a non-subscribed list.
-#, fuzzy
 msgid "You are not subscribed to this list."
-msgstr "Non hai una abbonamento a quel profilo."
+msgstr "Non sei iscritto a questa lista."
 
 #. TRANS: Client error displayed when uploading a media file has failed.
 msgid "Upload failed."
 msgstr "Caricamento non riuscito."
 
 #. TRANS: Client error given from the OAuth API when the request token or verifier is invalid.
-#, fuzzy
 msgid "Invalid request token or verifier."
-msgstr "Token di accesso specificato non valido."
+msgstr "Token di richiesta o verificatore non valido."
 
 #. TRANS: Client error given when no oauth_token was passed to the OAuth API.
 msgid "No oauth_token parameter provided."
 msgstr "Nessun parametro oauth_token fornito."
 
 #. TRANS: Client error given when an invalid request token was passed to the OAuth API.
-#, fuzzy
 msgid "Invalid request token."
 msgstr "Token non valido."
 
 #. TRANS: Client error given when an invalid request token was passed to the OAuth API.
-#, fuzzy
 msgid "Request token already authorized."
-msgstr "Autorizzazione non presente."
+msgstr "Il token è già stato autorizzato."
 
 #. TRANS: Form validation error given when an invalid username and/or password was passed to the OAuth API.
 msgid "Invalid nickname / password!"
 msgstr "Nome utente o password non valido."
 
 #. TRANS: Server error displayed when a database action fails.
-#, fuzzy
 msgid "Database error inserting oauth_token_association."
-msgstr "Errore nel database nell'inserire l'applicazione utente OAuth."
+msgstr "Errore nell'inserimento nel database di oauth_token_association."
 
 #. TRANS: Client error given on when invalid data was passed through a form in the OAuth API.
 #. TRANS: Unexpected validation error on avatar upload form.
-#. TRANS: Client error displayed when the submitted form contains unexpected data.
 #. TRANS: Client error displayed submitting invalid form data for edit application.
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
 #. TRANS: Form validation error message when an unsupported argument is used.
@@ -869,7 +852,6 @@ msgstr "Errore nel database nell'inserire l'applicazione utente OAuth."
 #. TRANS: Client error when submitting a form with unexpected information.
 #. TRANS: Client error displayed when unexpected data is posted in the password recovery form.
 #. TRANS: Message given submitting a form with an unknown action in SMS settings.
-#. TRANS: Unknown form validation error in design settings form.
 msgid "Unexpected form submission."
 msgstr "Invio del modulo inaspettato."
 
@@ -883,15 +865,15 @@ msgstr "Consenti o nega l'accesso"
 
 #. TRANS: User notification of external application requesting account access.
 #. TRANS: %3$s is the access type requested (read-write or read-only), %4$s is the StatusNet sitename.
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "An application would like the ability to <strong>%3$s</strong> your %4$s "
 "account data. You should only give access to your %4$s account to third "
 "parties you trust."
 msgstr ""
-"L'applicazione <strong>%1$s</strong> di <strong>%2$s</strong> vorrebbe poter "
-"<strong>%3$s</strong> ai dati del tuo account %4$s. È consigliato fornire "
-"accesso al proprio account %4$s solo ad applicazioni di cui ci si può fidare."
+"Un'applicazione richiede il tuo permesso per <strong>%3$s</strong> i dati "
+"del tuo account %4$s. Dovresti consentire l'accesso al tuo account %4$s solo "
+"a terze parti fidate."
 
 #. TRANS: User notification of external application requesting account access.
 #. TRANS: %1$s is the application name requesting access, %2$s is the organisation behind the application,
@@ -907,7 +889,6 @@ msgstr ""
 "accesso al proprio account %4$s solo ad applicazioni di cui ci si può fidare."
 
 #. TRANS: Fieldset legend.
-#, fuzzy
 msgctxt "LEGEND"
 msgid "Account"
 msgstr "Account"
@@ -915,7 +896,6 @@ msgstr "Account"
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Field label on account registration page.
-#. TRANS: Label for nickname on user authorisation page.
 #. TRANS: Field label on group edit form.
 #. TRANS: Dropdown option for searching in profiles.
 msgid "Nickname"
@@ -938,43 +918,41 @@ msgid "Cancel"
 msgstr "Annulla"
 
 #. TRANS: Button text that when clicked will allow access to an account by an external application.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Allow"
 msgstr "Consenti"
 
 #. TRANS: Form instructions.
-#, fuzzy
 msgid "Authorize access to your account information."
 msgstr "Consenti o nega l'accesso alle informazioni del tuo account."
 
 #. TRANS: Header for user notification after revoking OAuth access to an application.
-#, fuzzy
 msgid "Authorization canceled."
-msgstr "Conferma della messaggistica annullata."
+msgstr "Autorizzazione annullata."
 
 #. TRANS: User notification after revoking OAuth access to an application.
 #. TRANS: %s is an OAuth token.
-#, fuzzy, php-format
+#, php-format
 msgid "The request token %s has been revoked."
-msgstr "Il token di richiesta %s è stato rifiutato o revocato."
+msgstr "Il token di richiesta %s è stato revocato."
 
 #. TRANS: Title of the page notifying the user that an anonymous client application was successfully authorized to access the user's account with OAuth.
-#, fuzzy
 msgid "You have successfully authorized the application"
-msgstr "Autorizzazione non presente."
+msgstr "Applicazione autorizzata con successo."
 
 #. TRANS: Message notifying the user that an anonymous client application was successfully authorized to access the user's account with OAuth.
 msgid ""
 "Please return to the application and enter the following security code to "
 "complete the process."
 msgstr ""
+"Si prega di tornare all'applicazione e immettere il seguente codice di "
+"sicurezza per completare il processo."
 
 #. TRANS: Title of the page notifying the user that the client application was successfully authorized to access the user's account with OAuth.
 #. TRANS: %s is the authorised application name.
-#, fuzzy, php-format
+#, php-format
 msgid "You have successfully authorized %s"
-msgstr "Autorizzazione non presente."
+msgstr "L'applicazione %s è stata autorizzata"
 
 #. TRANS: Message notifying the user that the client application was successfully authorized to access the user's account with OAuth.
 #. TRANS: %s is the authorised application name.
@@ -983,6 +961,8 @@ msgid ""
 "Please return to %s and enter the following security code to complete the "
 "process."
 msgstr ""
+"Si prega di restituire a %s e immettere il seguente codice di sicurezza per "
+"completare il processo."
 
 #. TRANS: Client error displayed trying to delete a status not using POST or DELETE.
 #. TRANS: POST and DELETE should not be translated.
@@ -1007,15 +987,14 @@ msgstr "Nessun messaggio."
 #. TRANS: Client exception thrown when using an unsupported HTTP method.
 #. TRANS: Client error shown when using a non-supported HTTP method.
 #. TRANS: Client exception thrown when using an unsupported HTTP method.
-#, fuzzy
 msgid "HTTP method not supported."
-msgstr "Metodo delle API non trovato."
+msgstr "Metodo HTTP non supportato."
 
 #. TRANS: Exception thrown requesting an unsupported notice output format.
 #. TRANS: %s is the requested output format.
-#, fuzzy, php-format
+#, php-format
 msgid "Unsupported format: %s."
-msgstr "Formato non supportato."
+msgstr "Formato non supportato: %s."
 
 #. TRANS: Client error displayed requesting a deleted status.
 msgid "Status deleted."
@@ -1027,18 +1006,17 @@ msgstr "Nessuno stato trovato con quel ID."
 
 #. TRANS: Client error displayed when trying to delete a notice not using the Atom format.
 msgid "Can only delete using the Atom format."
-msgstr ""
+msgstr "È possibile eliminare solo usando il formato Atom."
 
 #. TRANS: Client error displayed when a user has no rights to delete notices of other users.
 #. TRANS: Error message displayed trying to delete a notice that was not made by the current user.
-#, fuzzy
 msgid "Cannot delete this notice."
 msgstr "Impossibile eliminare questo messaggio."
 
 #. TRANS: Confirmation of notice deletion in API. %d is the ID (number) of the deleted notice.
-#, fuzzy, php-format
+#, php-format
 msgid "Deleted notice %d"
-msgstr "Elimina messaggio"
+msgstr "Messaggio eliminato%d"
 
 #. TRANS: Client error displayed when the parameter "status" is missing.
 msgid "Client must provide a 'status' parameter with a value."
@@ -1049,26 +1027,25 @@ msgstr "Il client deve fornire un parametro \"status\" con un valore."
 #. TRANS: Client error displayed when the parameter "status" is missing.
 #. TRANS: %d is the maximum number of character for a notice.
 #. TRANS: Error message in incoming mail handler used when an incoming e-mail contains too many characters.
-#, fuzzy, php-format
+#, php-format
 msgid "That's too long. Maximum notice size is %d character."
 msgid_plural "That's too long. Maximum notice size is %d characters."
-msgstr[0] "Troppo lungo. Lunghezza massima %d caratteri."
-msgstr[1] "Troppo lungo. Lunghezza massima %d caratteri."
+msgstr[0] "Troppo lungo. La massima lunghezza consentita è di %d carattere."
+msgstr[1] "Troppo lungo. La massima lunghezza consentita è di %d caratteri."
 
 #. TRANS: Client error displayed when replying to a non-existing notice.
-#, fuzzy
 msgid "Parent notice not found."
-msgstr "Metodo delle API non trovato."
+msgstr "Messaggio originario non trovato."
 
 #. TRANS: Client error displayed exceeding the maximum notice length.
 #. TRANS: %d is the maximum lenth for a notice.
 #. TRANS: Client error displayed exceeding the maximum notice length.
 #. TRANS: %d is the maximum length for a notice.
-#, fuzzy, php-format
+#, php-format
 msgid "Maximum notice size is %d character, including attachment URL."
 msgid_plural "Maximum notice size is %d characters, including attachment URL."
 msgstr[0] ""
-"La dimensione massima di un messaggio è di %d caratteri, compreso l'URL."
+"La dimensione massima di un messaggio è di %d carattere, compreso l'URL."
 msgstr[1] ""
 "La dimensione massima di un messaggio è di %d caratteri, compreso l'URL."
 
@@ -1086,15 +1063,15 @@ msgstr "%1$s / Preferiti da %2$s"
 #. TRANS: Subtitle for timeline of most recent favourite notices by a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user's full name,
 #. TRANS: %3$s is a user nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s updates favorited by %2$s / %3$s."
-msgstr "%1$s aggiornamenti preferiti da %2$s / %3$s"
+msgstr "%1$s aggiornamenti favoriti da %2$s / %3$s."
 
 #. TRANS: Server error displayed whe trying to get a timeline fails.
 #. TRANS: %s is the error message.
-#, fuzzy, php-format
+#, php-format
 msgid "Could not generate feed for list - %s"
-msgstr "Impossibile creare il token di accesso per %s"
+msgstr "Impossibile generare il feed per la lista %s"
 
 #. TRANS: Title for timeline of most recent mentions of a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user nickname.
@@ -1121,9 +1098,8 @@ msgid "%s updates from everyone!"
 msgstr "Aggiornamenti di %s da tutti!"
 
 #. TRANS: Server error displayed calling unimplemented API method for 'retweeted by me'.
-#, fuzzy
 msgid "Unimplemented."
-msgstr "Metodo non implementato"
+msgstr "Non implementato."
 
 #. TRANS: Title for Atom feed "repeated to me". %s is the user nickname.
 #, php-format
@@ -1132,9 +1108,11 @@ msgstr "Ripetuto a %s"
 
 #. TRANS: Subtitle for API action that shows most recent notices that are repeats in user's inbox.
 #. TRANS: %1$s is the sitename, %2$s is a user nickname, %3$s is a user profile name.
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s notices that were to repeated to %2$s / %3$s."
-msgstr "%1$s messaggi in risposta a quelli da %2$s / %3$s"
+msgstr ""
+"notifiche del sito %1$s che si sono ripetute nella inbox dell'utente %2$s / %"
+"3$s."
 
 #. TRANS: Title of list of repeated notices of the logged in user.
 #. TRANS: %s is the nickname of the logged in user.
@@ -1144,9 +1122,10 @@ msgstr "Ripetizioni di %s"
 
 #. TRANS: Subtitle of API time with retweets of me.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is the user nickname, %3$s is the user profile name.
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s notices that %2$s / %3$s has repeated."
-msgstr "%s (@%s) ha aggiunto il tuo messaggio tra i suoi preferiti"
+msgstr ""
+"notifiche del sito %1$s che sono state ripetute dall'utente %2$s / %3$s."
 
 #. TRANS: Title for timeline with lastest notices with a given tag.
 #. TRANS: %s is the tag.
@@ -1165,47 +1144,46 @@ msgid "Updates tagged with %1$s on %2$s!"
 msgstr "Messaggi etichettati con %1$s su %2$s!"
 
 #. TRANS: Client error displayed trying to add a notice to another user's timeline.
-#, fuzzy
 msgid "Only the user can add to their own timeline."
-msgstr "Solo l'utente può leggere la propria casella di posta."
+msgstr "Solo l'utente può aggiungere alla propria timeline."
 
 #. TRANS: Client error displayed when using another format than AtomPub.
 msgid "Only accept AtomPub for Atom feeds."
-msgstr ""
+msgstr "Per i feed Atom sono accettati solo AtomPub."
 
 #. TRANS: Client error displayed attempting to post an empty API notice.
 msgid "Atom post must not be empty."
-msgstr ""
+msgstr "Un post Atom non può essere vuoto."
 
 #. TRANS: Client error displayed attempting to post an API that is not well-formed XML.
 msgid "Atom post must be well-formed XML."
-msgstr ""
+msgstr "Il post Atom deve essere un XML ben formato."
 
 #. TRANS: Client error displayed when not using an Atom entry.
 msgid "Atom post must be an Atom entry."
-msgstr ""
+msgstr "Il post Atom deve essere una voce di Atom."
 
 #. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
 msgid "Can only handle POST activities."
-msgstr ""
+msgstr "Può gestire solo le attività di POST."
 
 #. TRANS: Client error displayed when using an unsupported activity object type.
 #. TRANS: %s is the unsupported activity object type.
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
-msgstr ""
+msgstr "Attività non in grado di gestire tipo di oggetto \"%s\"."
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
 #. TRANS: %d is the notice ID (number).
-#, fuzzy, php-format
+#, php-format
 msgid "No content for notice %d."
-msgstr "Trova contenuto dei messaggi"
+msgstr "Nessun contenuto per avviso di %d."
 
 #. TRANS: Client error displayed when using another format than AtomPub.
 #. TRANS: %s is the notice URI.
-#, fuzzy, php-format
+#, php-format
 msgid "Notice with URI \"%s\" already exists."
-msgstr "Un messaggio con quel ID non esiste."
+msgstr "Un avviso con URI \"%s\" esiste già."
 
 #. TRANS: Server error for unfinished API method showTrends.
 msgid "API method under construction."
@@ -1234,12 +1212,9 @@ msgstr "Devi eseguire l'accesso per lasciare un gruppo."
 #. TRANS: Client error displayed when requesting Friends of a Friend feed for a nickname that is not a group.
 #. TRANS: Client error displayed trying to block a user from a group while specifying a non-existing group.
 #. TRANS: Client error displayed referring to a group's permalink for a non-existing group ID.
-#. TRANS: Client error displayed trying to change group design settings while providing a nickname for a non-existing group.
 #. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
 #. TRANS: Client error displayed when trying to view group members for a non-existing group.
 #. TRANS: Client error displayed when trying to view group members for an object that is not a group.
-#. TRANS: Client error displayed when trying to view group members for a non-existing group.
-#. TRANS: Client error displayed when trying to view group members for an object that is not a group.
 #. TRANS: Client error displayed when requesting a group RSS feed for group that does not exist.
 #. TRANS: Client error displayed when requesting a group RSS feed for an object that is not a group.
 #. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
@@ -1248,10 +1223,10 @@ msgstr "Devi eseguire l'accesso per lasciare un gruppo."
 #. TRANS: Client error displayed when trying to leave a non-local group.
 #. TRANS: Client error displayed when trying to leave a non-existing group.
 #. TRANS: Client error displayed when providing an invalid group ID on the Make Admin page.
-#. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
-#. TRANS: Client error displayed if no local group with a given name was found requesting group page.
 #. TRANS: Command exception text shown when a group is requested that does not exist.
 #. TRANS: Error text shown when trying to leave a group that does not exist.
+#. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
+#. TRANS: Client error displayed if no local group with a given name was found requesting group page.
 msgid "No such group."
 msgstr "Nessuna gruppo."
 
@@ -1264,219 +1239,211 @@ msgstr "Nessun soprannome o ID."
 
 #. TRANS: Client error displayed trying to approve group membership while not logged in.
 #. TRANS: Client error displayed when trying to leave a group while not logged in.
-#, fuzzy
 msgid "Must be logged in."
-msgstr "Accesso non effettuato."
+msgstr "Devi prima effettuare l'accesso."
 
 #. TRANS: Client error displayed trying to approve group membership while not a group administrator.
 #. TRANS: Client error displayed when trying to approve or cancel a group join request without
 #. TRANS: being a group administrator.
 msgid "Only group admin can approve or cancel join requests."
 msgstr ""
+"Solo gli admin di gruppo possono approvare o respingere le richieste di "
+"adesione."
 
 #. TRANS: Client error displayed trying to approve group membership without specifying a profile to approve.
 #. TRANS: Client error displayed trying to approve subscriptionswithout specifying a profile to approve.
-#, fuzzy
 msgid "Must specify a profile."
-msgstr "Profilo mancante."
+msgstr "Devi specificare un profilo."
 
 #. TRANS: Client error displayed trying to approve group membership for a non-existing request.
 #. TRANS: %s is a nickname.
 #. TRANS: Client error displayed when trying to approve a non-existing group join request.
 #. TRANS: %s is a user nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "%s is not in the moderation queue for this group."
-msgstr "Un elenco degli utenti in questo gruppo."
+msgstr "%s non è nella coda di moderazione per questo gruppo."
 
 #. TRANS: Client error displayed trying to approve/deny group membership.
 #. TRANS: Client error displayed trying to approve/deny subscription.
 msgid "Internal error: received neither cancel nor abort."
 msgstr ""
+"Errore interno: non è stato ricevuto comando né di cancellazione né di "
+"annullamento."
 
 #. TRANS: Client error displayed trying to approve/deny group membership.
 #. TRANS: Client error displayed trying to approve/deny  subscription
 msgid "Internal error: received both cancel and abort."
 msgstr ""
+"Errore interno: ricevuti comandi sia di cancellazione che di interruzione."
 
 #. TRANS: Server error displayed when cancelling a queued group join request fails.
 #. TRANS: %1$s is the leaving user's nickname, $2$s is the group nickname for which the leave failed.
-#, fuzzy, php-format
+#, php-format
 msgid "Could not cancel request for user %1$s to join group %2$s."
-msgstr "Impossibile iscrivere l'utente %1$s al gruppo %2$s."
+msgstr ""
+"Impossibile eliminare la richiesta di iscrizione al gruppo %2$s effettuata "
+"dell'utente %1$s."
 
 #. TRANS: Title for leave group page after group join request is approved/disapproved.
 #. TRANS: %1$s is the user nickname, %2$s is the group nickname.
-#, fuzzy, php-format
+#, php-format
 msgctxt "TITLE"
 msgid "%1$s's request for %2$s"
-msgstr "Stato di %1$s su %2$s"
+msgstr "Richieste dell'utente %1$s per il gruppo %2$s"
 
 #. TRANS: Message on page for group admin after approving a join request.
 msgid "Join request approved."
-msgstr ""
+msgstr "Richiesta di iscrizione approvata."
 
 #. TRANS: Message on page for group admin after rejecting a join request.
 msgid "Join request canceled."
-msgstr ""
+msgstr "Richiesta di iscrizione rifiutata."
 
 #. TRANS: Client error displayed trying to approve subscription for a non-existing request.
-#, fuzzy, php-format
+#. TRANS: %s is a user nickname.
+#, php-format
 msgid "%s is not in the moderation queue for your subscriptions."
-msgstr "Un elenco degli utenti in questo gruppo."
+msgstr "%s non è nella coda di moderazione per i tuoi abbonamenti."
 
 #. TRANS: Server error displayed when cancelling a queued subscription request fails.
 #. TRANS: %1$s is the leaving user's nickname, $2$s is the nickname for which the leave failed.
-#, fuzzy, php-format
+#, php-format
 msgid "Could not cancel or approve request for user %1$s to join group %2$s."
-msgstr "Impossibile iscrivere l'utente %1$s al gruppo %2$s."
+msgstr ""
+"Impossibile eliminare o approvare le richieste di iscrizione dell'utente %1"
+"$s al gruppo %2$s."
 
 #. TRANS: Title for subscription approval ajax return
 #. TRANS: %1$s is the approved user's nickname
-#, fuzzy, php-format
+#, php-format
 msgctxt "TITLE"
 msgid "%1$s's request"
-msgstr "Stato di %1$s su %2$s"
+msgstr "Richieste di %1$s"
 
 #. TRANS: Message on page for user after approving a subscription request.
-#, fuzzy
 msgid "Subscription approved."
-msgstr "Abbonamento autorizzato"
+msgstr "Abbonamento approvato."
 
 #. TRANS: Message on page for user after rejecting a subscription request.
-#, fuzzy
 msgid "Subscription canceled."
-msgstr "Conferma della messaggistica annullata."
+msgstr "Abbonamento cancellato."
 
 #. TRANS: Subtitle for Atom favorites feed.
 #. TRANS: %1$s is a user nickname, %2$s is the StatusNet sitename.
-#, fuzzy, php-format
+#, php-format
 msgid "Notices %1$s has favorited on %2$s"
-msgstr "Messaggi da %1$s e amici su %2$s!"
+msgstr "Le notifiche %1$s ha aggiunto tra i favoriti su %2$s"
 
 #. TRANS: Client exception thrown when trying to set a favorite for another user.
 #. TRANS: Client exception thrown when trying to subscribe another user.
-#, fuzzy
 msgid "Cannot add someone else's subscription."
-msgstr "Impossibile inserire un nuovo abbonamento."
+msgstr "Non è possibile aggiungere l'iscrizione di qualcun altro."
 
 #. TRANS: Client exception thrown when trying use an incorrect activity verb for the Atom pub method.
-#, fuzzy
 msgid "Can only handle favorite activities."
-msgstr "Trova contenuto dei messaggi"
+msgstr "Si possono gestire solo le attività preferite."
 
 #. TRANS: Client exception thrown when trying favorite an object that is not a notice.
-#, fuzzy
 msgid "Can only fave notices."
-msgstr "Trova contenuto dei messaggi"
+msgstr "Puoi aggiungere tra i preferiti solo le notifiche."
 
 #. TRANS: Client exception thrown when trying favorite a notice without content.
-#, fuzzy
 msgid "Unknown notice."
-msgstr "Sconosciuto"
+msgstr "Avviso sconosciuto."
 
 #. TRANS: Client exception thrown when trying favorite an already favorited notice.
-#, fuzzy
 msgid "Already a favorite."
-msgstr "Aggiungi ai preferiti"
+msgstr "Già tra i preferiti."
 
 #. TRANS: Title for group membership feed.
 #. TRANS: %s is a username.
-#, fuzzy, php-format
+#, php-format
 msgid "Group memberships of %s"
-msgstr "Membri del gruppo %s"
+msgstr "Membri del gruppo di %s"
 
 #. TRANS: Subtitle for group membership feed.
 #. TRANS: %1$s is a username, %2$s is the StatusNet sitename.
-#, fuzzy, php-format
+#, php-format
 msgid "Groups %1$s is a member of on %2$s"
-msgstr "Gruppi di cui %s fa parte"
+msgstr "%1$s è un membro dei gruppi su %2$s"
 
 #. TRANS: Client exception thrown when trying subscribe someone else to a group.
-#, fuzzy
 msgid "Cannot add someone else's membership."
-msgstr "Impossibile inserire un nuovo abbonamento."
+msgstr "Impossibile aggiungere altri membri."
 
 #. TRANS: Client error displayed when not using the join verb.
-#, fuzzy
 msgid "Can only handle join activities."
-msgstr "Trova contenuto dei messaggi"
+msgstr "Puoi gestire solo la partecipazione alle attività."
 
 #. TRANS: Client exception thrown when trying to subscribe to a non-existing group.
-#, fuzzy
 msgid "Unknown group."
-msgstr "Sconosciuto"
+msgstr "Gruppo sconosciuto."
 
 #. TRANS: Client exception thrown when trying to subscribe to an already subscribed group.
-#, fuzzy
 msgid "Already a member."
-msgstr "Tutti i membri"
+msgstr "Già membro."
 
 #. TRANS: Client exception thrown when trying to subscribe to group while blocked from that group.
 msgid "Blocked by admin."
-msgstr ""
+msgstr "Bloccato da un admin."
 
 #. TRANS: Client exception thrown when referencing a non-existing favorite.
-#, fuzzy
 msgid "No such favorite."
-msgstr "Nessun file."
+msgstr "Quel preferito non esiste."
 
 #. TRANS: Client exception thrown when trying to remove a favorite notice of another user.
-#, fuzzy
 msgid "Cannot delete someone else's favorite."
-msgstr "Impossibile eliminare un preferito."
+msgstr "Impossibile eliminare un preferito altrui."
 
 #. TRANS: Client exception thrown when trying to show membership of a non-subscribed group
-#, fuzzy
 msgid "Not a member."
-msgstr "Tutti i membri"
+msgstr "Non un membro."
 
 #. TRANS: Client exception thrown when deleting someone else's membership.
-#, fuzzy
 msgid "Cannot delete someone else's membership."
-msgstr "Impossibile salvare l'abbonamento."
+msgstr "Impossibile cancellare l'iscrizione di un altro membro."
 
 #. TRANS: Client exception thrown when trying to display a subscription for a non-existing profile ID.
 #. TRANS: %d is the non-existing profile ID number.
-#, fuzzy, php-format
+#, php-format
 msgid "No such profile id: %d."
-msgstr "Nessun profilo."
+msgstr "Non esiste quell'id di profilo: %d."
 
 #. TRANS: Client exception thrown when trying to display a subscription for a non-subscribed profile ID.
 #. TRANS: %1$d is the non-existing subscriber ID number, $2$d is the ID of the profile that was not subscribed to.
-#, fuzzy, php-format
+#, php-format
 msgid "Profile %1$d not subscribed to profile %2$d."
-msgstr "Non hai una abbonamento a quel profilo."
+msgstr "Il profilo %1$d non è iscritto al profilo %2$d."
 
 #. TRANS: Client exception thrown when trying to delete a subscription of another user.
-#, fuzzy
 msgid "Cannot delete someone else's subscription."
-msgstr "Impossibile salvare l'abbonamento."
+msgstr "Non è possibile eliminare la sottoscrizione di qualcun altro."
 
 #. TRANS: Subtitle for Atom subscription feed.
 #. TRANS: %1$s is a user nickname, %s$s is the StatusNet sitename.
-#, fuzzy, php-format
+#, php-format
 msgid "People %1$s has subscribed to on %2$s"
-msgstr "Persone abbonate a %s"
+msgstr "Persone alle quali %1$s si è iscritto sul sito %2$s"
 
 #. TRANS: Client error displayed when not using the follow verb.
 msgid "Can only handle Follow activities."
-msgstr ""
+msgstr "Puoi gestire solo le attività di Segui."
 
 #. TRANS: Client exception thrown when subscribing to an object that is not a person.
 msgid "Can only follow people."
-msgstr ""
+msgstr "Puoi seguire solo le persone."
 
 #. TRANS: Client exception thrown when subscribing to a non-existing profile.
 #. TRANS: %s is the unknown profile ID.
-#, fuzzy, php-format
+#, php-format
 msgid "Unknown profile %s."
-msgstr "Tipo di file sconosciuto"
+msgstr "Profilo sconosciuto %s."
 
 #. TRANS: Client error displayed trying to subscribe to an already subscribed profile.
 #. TRANS: %s is the profile the user already has a subscription on.
-#, fuzzy, php-format
+#, php-format
 msgid "Already subscribed to %s."
-msgstr "Hai già l'abbonamento!"
+msgstr "Già iscritto a %s."
 
 #. TRANS: Client error displayed trying to get a non-existing attachment.
 msgid "No such attachment."
@@ -1485,13 +1452,12 @@ msgstr "Nessun allegato."
 #. TRANS: Client error displayed trying to get an avatar without providing a nickname.
 #. TRANS: Client error displayed when requesting a list of blocked users for a group without providing a group nickname.
 #. TRANS: Client error displayed trying to edit a group while not proving a nickname for the group to edit.
-#. TRANS: Client error displayed trying to change group design settings without providing a group nickname.
 #. TRANS: Client error displayed when trying to change group logo settings without providing a nickname.
 #. TRANS: Client error displayed when trying to view group members without providing a group nickname.
 #. TRANS: Client error displayed when requesting a group RSS feed without providing a group nickname.
 #. TRANS: Client error displayed if no nickname argument was given requesting a group page.
 msgid "No nickname."
-msgstr "Nessun soprannome."
+msgstr "Nessun nickname."
 
 #. TRANS: Client error displayed trying to get an avatar without providing an avatar size.
 msgid "No size."
@@ -1537,20 +1503,17 @@ msgstr "Anteprima"
 #. TRANS: Submit button text the OAuth application page to delete an application.
 #. TRANS: Button text for deleting a group.
 #. TRANS: Button text to delete a list.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Delete"
-msgstr "Elimina"
+msgstr "Cancella"
 
 #. TRANS: Button on avatar upload page to upload an avatar.
 #. TRANS: Submit button to confirm upload of a user backup file for account restore.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Upload"
 msgstr "Carica"
 
 #. TRANS: Button on avatar upload crop form to confirm a selected crop as avatar.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Crop"
 msgstr "Ritaglia"
@@ -1560,9 +1523,9 @@ msgid "No file uploaded."
 msgstr "Nessun file caricato."
 
 #. TRANS: Avatar upload form instruction after uploading a file.
-#, fuzzy
 msgid "Pick a square area of the image to be your avatar."
-msgstr "Scegli un'area quadrata per la tua immagine personale"
+msgstr ""
+"Prendi un'area quadrata dell'immagine per farla diventare il tuo avatar."
 
 #. TRANS: Server error displayed if an avatar upload went wrong somehow server side.
 #. TRANS: Server error displayed trying to crop an uploaded group logo that is no longer present.
@@ -1584,16 +1547,17 @@ msgstr "Immagine eliminata."
 #. TRANS: Title for backup account page.
 #. TRANS: Option in profile settings to create a backup of the account of the currently logged in user.
 msgid "Backup account"
-msgstr ""
+msgstr "Fai un backup dell'account"
 
 #. TRANS: Client exception thrown when trying to backup an account while not logged in.
-#, fuzzy
 msgid "Only logged-in users can backup their account."
-msgstr "Solo gli utenti collegati possono ripetere i messaggi."
+msgstr ""
+"Il backup del proprio account può essere fatto solo dopo aver eseguito "
+"l'accesso."
 
 #. TRANS: Client exception thrown when trying to backup an account without having backup rights.
 msgid "You may not backup your account."
-msgstr ""
+msgstr "Non puoi effettuare il backup del tuo account."
 
 #. TRANS: Information displayed on the backup account page.
 msgid ""
@@ -1603,16 +1567,20 @@ msgid ""
 "addresses is not backed up. Additionally, uploaded files and direct messages "
 "are not backed up."
 msgstr ""
+"E' possibile effettuare il backup dei dati del tuo account nel formato <a "
+"href=\"http://activitystrea.ms/\">Activity Streams</a>. Questa è una "
+"funzione sperimentale e fornisce un backup non completo; non verrà eseguito "
+"per le informazioni private dell'account come l'email e l'indirizzo IM, come "
+"anche per i files caricati e i messaggi diretti."
 
 #. TRANS: Submit button to backup an account on the backup account page.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Backup"
-msgstr "Sfondo"
+msgstr "Backup"
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
 msgid "Backup your account."
-msgstr ""
+msgstr "Esegui backup del tuo account."
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
 msgid "You already blocked that user."
@@ -1630,9 +1598,8 @@ msgid ""
 "unsubscribed from you, unable to subscribe to you in the future, and you "
 "will not be notified of any @-replies from them."
 msgstr ""
-"Vuoi bloccare questo utente? In seguito gli verrà tolto l'abbonamento ai "
-"tuoi messaggi, non potrà più abbonarsi e non riceverai notifica delle @-"
-"risposte che ti invierà."
+"Vuoi bloccare questo utente? Non sarà più iscritto a te, non potrà più "
+"iscriversi e non riceverai la notifica delle @-risposte che ti invierà."
 
 #. TRANS: Button label on the user block form.
 #. TRANS: Button label on the delete application form.
@@ -1645,9 +1612,8 @@ msgid "No"
 msgstr "No"
 
 #. TRANS: Submit button title for 'No' when blocking a user.
-#, fuzzy
 msgid "Do not block this user."
-msgstr "Non bloccare questo utente"
+msgstr "Non bloccare questo utente."
 
 #. TRANS: Button label on the user block form.
 #. TRANS: Button label on the delete application form.
@@ -1661,9 +1627,8 @@ msgid "Yes"
 msgstr "Sì"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
-#, fuzzy
 msgid "Block this user."
-msgstr "Blocca questo utente"
+msgstr "Blocca questo utente."
 
 #. TRANS: Server error displayed when blocking a user fails.
 msgid "Failed to save block information."
@@ -1690,7 +1655,6 @@ msgid "Unblock user from group"
 msgstr "Sblocca l'utente dal gruppo"
 
 #. TRANS: Button text for unblocking a user from a group.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Unblock"
 msgstr "Sblocca"
@@ -1709,7 +1673,7 @@ msgstr "Invia a %s"
 #. TRANS: Title for leave group page after leaving.
 #. TRANS: %s$s is the leaving user's name, %2$s is the group name.
 #. TRANS: Title for leave group page after leaving.
-#, fuzzy, php-format
+#, php-format
 msgctxt "TITLE"
 msgid "%1$s left group %2$s"
 msgstr "%1$s ha lasciato il gruppo %2$s"
@@ -1731,7 +1695,6 @@ msgid "No profile with that ID."
 msgstr "Nessun profilo con quel ID."
 
 #. TRANS: Title after unsubscribing from a group.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Unsubscribed"
 msgstr "Abbonamento annullato"
@@ -1760,20 +1723,19 @@ msgstr "Quell'indirizzo è già stato confermato."
 
 #. TRANS: Server error displayed when updating IM preferences fails.
 #. TRANS: Server error thrown on database error removing a registered IM address.
-#, fuzzy
 msgid "Could not update user IM preferences."
-msgstr "Impossibile aggiornare il record dell'utente."
+msgstr ""
+"Impossibile aggiornare le preferenze utente relative alla messaggistica "
+"istantanea."
 
 #. TRANS: Server error displayed when adding IM preferences fails.
-#, fuzzy
 msgid "Could not insert user IM preferences."
-msgstr "Impossibile inserire un nuovo abbonamento."
+msgstr "Impossibile aggiornare le preferenze utente relative alla IM."
 
 #. TRANS: Server error displayed when an address confirmation code deletion from the
 #. TRANS: database fails in the contact address confirmation action.
-#, fuzzy
 msgid "Could not delete address confirmation."
-msgstr "Impossibile eliminare la conferma della messaggistica."
+msgstr "Impossibile eliminare la conferma dell'indirizzo."
 
 #. TRANS: Title for the contact address confirmation action.
 msgid "Confirm address"
@@ -1789,49 +1751,58 @@ msgstr "L'indirizzo \"%s\" è stato confermato per il tuo account."
 msgid "Conversation"
 msgstr "Conversazione"
 
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+msgid "Conversation feed (Activity Streams JSON)"
+msgstr "Feed di conversazione (Activity Streams JSON)"
+
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+msgid "Conversation feed (RSS 2.0)"
+msgstr "Feed di conversazione (RSS 2.0)"
+
 #. TRANS: Title for conversation page.
 #. TRANS: Title for page that shows a notice.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Notice"
-msgstr "Messaggi"
+msgstr "Avviso"
 
 #. TRANS: Client exception displayed trying to delete a user account while not logged in.
-#, fuzzy
 msgid "Only logged-in users can delete their account."
-msgstr "Solo gli utenti collegati possono ripetere i messaggi."
+msgstr ""
+"La cancellazione del proprio account può essere fatta solo dopo aver "
+"eseguito l'accesso."
 
 #. TRANS: Client exception displayed trying to delete a user account without have the rights to do that.
-#, fuzzy
 msgid "You cannot delete your account."
-msgstr "Non puoi eliminare utenti."
+msgstr "Non puoi cancellare il tuo account."
 
 #. TRANS: Confirmation text for user deletion. The user has to type this exactly the same, including punctuation.
 msgid "I am sure."
-msgstr ""
+msgstr "Sono sicuro."
 
 #. TRANS: Notification for user about the text that must be input to be able to delete a user account.
 #. TRANS: %s is the text that needs to be input.
 #, php-format
 msgid "You must write \"%s\" exactly in the box."
-msgstr ""
+msgstr "E' necessario scrivere esattamente \"%s\" nella casella."
 
 #. TRANS: Confirmation that a user account has been deleted.
-#, fuzzy
 msgid "Account deleted."
-msgstr "Immagine eliminata."
+msgstr "Account eliminato."
 
 #. TRANS: Page title for page on which a user account can be deleted.
 #. TRANS: Option in profile settings to delete the account of the currently logged in user.
-#, fuzzy
 msgid "Delete account"
-msgstr "Crea un account"
+msgstr "Elimina account"
 
 #. TRANS: Form text for user deletion form.
 msgid ""
 "This will <strong>permanently delete</strong> your account data from this "
 "server."
 msgstr ""
+"Questo <strong>cancellerà definitivamente</strong> i dati del tuo account da "
+"questo server."
 
 #. TRANS: Additional form text for user deletion form shown if a user has account backup rights.
 #. TRANS: %s is a URL to the backup page.
@@ -1840,6 +1811,8 @@ msgid ""
 "You are strongly advised to <a href=\"%s\">back up your data</a> before "
 "deletion."
 msgstr ""
+"Si consiglia vivamente di <a href=\"%s\">eseguire il backup dei dati</a> "
+"prima dell'eliminazione."
 
 #. TRANS: Field label for delete account confirmation entry.
 #. TRANS: Field label for password reset form where the password has to be typed again.
@@ -1848,14 +1821,14 @@ msgstr "Conferma"
 
 #. TRANS: Input title for the delete account field.
 #. TRANS: %s is the text that needs to be input.
-#, fuzzy, php-format
+#, php-format
 msgid "Enter \"%s\" to confirm that you want to delete your account."
-msgstr "Non puoi eliminare utenti."
+msgstr ""
+"Immetti \"%s\" per confermare che davvero desideri cancellare il tuo account."
 
 #. TRANS: Button title for user account deletion.
-#, fuzzy
-msgid "Permanently delete your account"
-msgstr "Non puoi eliminare utenti."
+msgid "Permanently delete your account."
+msgstr "Elimina definitivamente il tuo account."
 
 #. TRANS: Client error displayed trying to delete an application while not logged in.
 msgid "You must be logged in to delete an application."
@@ -1891,62 +1864,55 @@ msgstr ""
 "riguardo all'applicazione dal database, comprese tutte le connessioni utente."
 
 #. TRANS: Submit button title for 'No' when deleting an application.
-#, fuzzy
 msgid "Do not delete this application."
-msgstr "Non eliminare l'applicazione"
+msgstr "Non eliminare questa applicazione."
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
-#, fuzzy
 msgid "Delete this application."
-msgstr "Elimina l'applicazione"
+msgstr "Elimina questa applicazione."
 
 #. TRANS: Client error when trying to delete group while not logged in.
-#, fuzzy
 msgid "You must be logged in to delete a group."
-msgstr "Devi eseguire l'accesso per lasciare un gruppo."
+msgstr "Devi eseguire l'accesso per cancellare un gruppo."
 
 #. TRANS: Client error when trying to delete a group without having the rights to delete it.
-#, fuzzy
 msgid "You are not allowed to delete this group."
-msgstr "Non fai parte di questo gruppo."
+msgstr "Non sei autorizzato a cancellare questo gruppo."
 
 #. TRANS: Server error displayed if a group could not be deleted.
 #. TRANS: %s is the name of the group that could not be deleted.
-#, fuzzy, php-format
+#, php-format
 msgid "Could not delete group %s."
-msgstr "Impossibile aggiornare il gruppo."
+msgstr "Impossibile eliminare il gruppo %s."
 
 #. TRANS: Message given after deleting a group.
 #. TRANS: %s is the deleted group's name.
-#, fuzzy, php-format
+#, php-format
 msgid "Deleted group %s"
-msgstr "%1$s ha lasciato il gruppo %2$s"
+msgstr "Il gruppo %s è stato cancellato."
 
 #. TRANS: Title of delete group page.
 #. TRANS: Form legend for deleting a group.
-#, fuzzy
 msgid "Delete group"
-msgstr "Elimina utente"
+msgstr "Elimina gruppo"
 
 #. TRANS: Warning in form for deleleting a group.
-#, fuzzy
 msgid ""
 "Are you sure you want to delete this group? This will clear all data about "
 "the group from the database, without a backup. Public posts to this group "
 "will still appear in individual timelines."
 msgstr ""
-"Vuoi eliminare questo utente? Questa azione eliminerà tutti i dati "
-"dell'utente dal database, senza una copia di sicurezza."
+"Sei sicuro di voler eliminare questo gruppo? Questa azione eliminerà tutti i "
+"dati del gruppo dal database, senza un backup. I post pubblici di questo "
+"gruppo appariranno nella cronologia individuale."
 
 #. TRANS: Submit button title for 'No' when deleting a group.
-#, fuzzy
 msgid "Do not delete this group."
-msgstr "Non eliminare il messaggio"
+msgstr "Non eliminare questo gruppo."
 
 #. TRANS: Submit button title for 'Yes' when deleting a group.
-#, fuzzy
 msgid "Delete this group."
-msgstr "Elimina questo utente"
+msgstr "Elimina questo gruppo."
 
 #. TRANS: Instructions for deleting a notice.
 msgid ""
@@ -1966,14 +1932,12 @@ msgid "Are you sure you want to delete this notice?"
 msgstr "Vuoi eliminare questo messaggio?"
 
 #. TRANS: Submit button title for 'No' when deleting a notice.
-#, fuzzy
 msgid "Do not delete this notice."
-msgstr "Non eliminare il messaggio"
+msgstr "Non eliminare questa notifica."
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#, fuzzy
 msgid "Delete this notice."
-msgstr "Elimina questo messaggio"
+msgstr "Elimina questa notifica."
 
 #. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
 msgid "You cannot delete users."
@@ -1984,7 +1948,6 @@ msgid "You can only delete local users."
 msgstr "Puoi eliminare solo gli utenti locali."
 
 #. TRANS: Title of delete user page.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Delete user"
 msgstr "Elimina utente"
@@ -2002,165 +1965,12 @@ msgstr ""
 "dell'utente dal database, senza una copia di sicurezza."
 
 #. TRANS: Submit button title for 'No' when deleting a user.
-#, fuzzy
 msgid "Do not delete this user."
-msgstr "Non eliminare il messaggio"
+msgstr "Non eliminare questo utente."
 
 #. TRANS: Submit button title for 'Yes' when deleting a user.
-#, fuzzy
 msgid "Delete this user."
-msgstr "Elimina questo utente"
-
-#. TRANS: Message used as title for design settings for the site.
-msgid "Design"
-msgstr "Aspetto"
-
-#. TRANS: Instructions for design adminsitration panel.
-msgid "Design settings for this StatusNet site"
-msgstr "Impostazioni dell'aspetto per questo sito StatusNet"
-
-#. TRANS: Client error displayed when a logo URL does is not valid.
-msgid "Invalid logo URL."
-msgstr "URL del logo non valido."
-
-#. TRANS: Client error displayed when an SSL logo URL is invalid.
-#, fuzzy
-msgid "Invalid SSL logo URL."
-msgstr "URL del logo non valido."
-
-#. TRANS: Client error displayed when a theme is submitted through the form that is not in the theme list.
-#. TRANS: %s is the chosen unavailable theme.
-#, php-format
-msgid "Theme not available: %s."
-msgstr "Tema non disponibile: %s."
-
-#. TRANS: Fieldset legend for form to change logo.
-msgid "Change logo"
-msgstr "Modifica logo"
-
-#. TRANS: Field label for StatusNet site logo.
-msgid "Site logo"
-msgstr "Logo del sito"
-
-#. TRANS: Field label for SSL StatusNet site logo.
-#, fuzzy
-msgid "SSL logo"
-msgstr "Logo del sito"
-
-#. TRANS: Fieldset legend for form change StatusNet site's theme.
-msgid "Change theme"
-msgstr "Modifica tema"
-
-#. TRANS: Field label for dropdown to choose site theme.
-msgid "Site theme"
-msgstr "Tema del sito"
-
-#. TRANS: Title for field label for dropdown to choose site theme.
-msgid "Theme for the site."
-msgstr "Tema per questo sito."
-
-#. TRANS: Field label for uploading a cutom theme.
-msgid "Custom theme"
-msgstr "Tema personalizzato"
-
-#. TRANS: Form instructions for uploading a cutom StatusNet theme.
-msgid "You can upload a custom StatusNet theme as a .ZIP archive."
-msgstr "Puoi caricare un tema per StatusNet personalizzato come un file ZIP."
-
-#. TRANS: Fieldset legend for theme background image.
-msgid "Change background image"
-msgstr "Modifica l'immagine di sfondo"
-
-#. TRANS: Field label for background image on theme designer page.
-#. TRANS: Field label for background color selector.
-#. TRANS: Label on profile design page for setting a profile page background colour.
-msgid "Background"
-msgstr "Sfondo"
-
-#. TRANS: Form guide for background image upload form on theme designer page.
-#, php-format
-msgid ""
-"You can upload a background image for the site. The maximum file size is %1"
-"$s."
-msgstr ""
-"Puoi caricare un'immagine di sfondo per il sito. La dimensione massima del "
-"file è di %1$s."
-
-#. TRANS: Used as radio button label to add a background image.
-msgid "On"
-msgstr "On"
-
-#. TRANS: Used as radio button label to not add a background image.
-msgid "Off"
-msgstr "Off"
-
-#. TRANS: Form guide for turning background image on or off on theme designer page.
-#. TRANS: Form guide for a set of radio buttons on the profile design page that will enable or disable
-#. TRANS: use of the uploaded profile image.
-msgid "Turn background image on or off."
-msgstr "Abilita o disabilita l'immagine di sfondo."
-
-#. TRANS: Checkbox label to title background image on theme designer page.
-#. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
-msgid "Tile background image"
-msgstr "Affianca l'immagine di sfondo"
-
-#. TRANS: Fieldset legend for theme colors.
-#, fuzzy
-msgid "Change colors"
-msgstr "Modifica colori"
-
-#. TRANS: Field label for content color selector.
-#. TRANS: Label on profile design page for setting a profile page content colour.
-msgid "Content"
-msgstr "Contenuto"
-
-#. TRANS: Field label for sidebar color selector.
-#. TRANS: Label on profile design page for setting a profile page sidebar colour.
-msgid "Sidebar"
-msgstr "Barra laterale"
-
-#. TRANS: Field label for text color selector.
-#. TRANS: Label on profile design page for setting a profile page text colour.
-msgid "Text"
-msgstr "Testo"
-
-#. TRANS: Field label for link color selector.
-#. TRANS: Label on profile design page for setting a profile page links colour.
-msgid "Links"
-msgstr "Collegamenti"
-
-#. TRANS: Fieldset legend for advanced theme design settings.
-msgid "Advanced"
-msgstr "Avanzate"
-
-#. TRANS: Field label for custom CSS.
-msgid "Custom CSS"
-msgstr "CSS personalizzato"
-
-#. TRANS: Button text for resetting theme settings.
-#, fuzzy
-msgctxt "BUTTON"
-msgid "Use defaults"
-msgstr "Usa predefiniti"
-
-#. TRANS: Title for button for resetting theme settings.
-#. TRANS: Title for button on profile design page to reset all colour settings to default.
-#, fuzzy
-msgid "Restore default designs."
-msgstr "Ripristina i valori predefiniti"
-
-#. TRANS: Title for button for resetting theme settings.
-#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#, fuzzy
-msgid "Reset back to default."
-msgstr "Reimposta i valori predefiniti"
-
-#. TRANS: Title for button for saving theme settings.
-#. TRANS: Title for button on profile design page to save settings.
-#, fuzzy
-msgid "Save design."
-msgstr "Salva aspetto"
+msgstr "Elimina questo utente."
 
 #. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
 msgid "This notice is not a favorite!"
@@ -2172,9 +1982,77 @@ msgstr "Aggiungi ai preferiti"
 
 #. TRANS: Client exception thrown when requesting a document from the documentation that does not exist.
 #. TRANS: %s is the non-existing document.
-#, fuzzy, php-format
+#, php-format
 msgid "No such document \"%s\"."
-msgstr "Nessun documento \"%s\""
+msgstr "Non è stato trovato alcun documento \"%s\"."
+
+#. TRANS: Menu item in administrator navigation panel.
+#. TRANS: Menu item in default local navigation panel.
+#. TRANS: Menu item in personal group navigation menu.
+msgctxt "MENU"
+msgid "Home"
+msgstr "Home"
+
+msgctxt "MENU"
+msgid "Docs"
+msgstr "Documenti"
+
+#. TRANS: Secondary navigation menu item leading to help on StatusNet.
+msgctxt "MENU"
+msgid "Help"
+msgstr "Aiuto"
+
+msgid "Getting started"
+msgstr "Guida introduttiva"
+
+#. TRANS: Secondary navigation menu item leading to text about StatusNet site.
+msgctxt "MENU"
+msgid "About"
+msgstr "Informazioni"
+
+msgid "About this site"
+msgstr "A proposito di questo sito"
+
+#. TRANS: Secondary navigation menu item leading to Frequently Asked Questions.
+msgctxt "MENU"
+msgid "FAQ"
+msgstr "FAQ"
+
+msgid "Frequently asked questions"
+msgstr "Domande frequenti"
+
+#. TRANS: Secondary navigation menu item leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+msgctxt "MENU"
+msgid "Contact"
+msgstr "Contattaci"
+
+msgid "Contact info"
+msgstr "Info di contatto"
+
+msgctxt "MENU"
+msgid "Tags"
+msgstr "Tag"
+
+msgid "Using tags"
+msgstr "Uso dei Tag"
+
+#. TRANS: Menu item in default local navigation panel.
+#. TRANS: Menu item in search group navigation panel.
+#. TRANS: Menu item in local navigation menu.
+msgctxt "MENU"
+msgid "Groups"
+msgstr "Gruppi"
+
+msgid "Using groups"
+msgstr "Uso dei gruppi"
+
+msgctxt "MENU"
+msgid "API"
+msgstr "API"
+
+msgid "RESTful API"
+msgstr "RESTful API"
 
 #. TRANS: Title for "Edit application" form.
 #. TRANS: Form legend.
@@ -2201,7 +2079,6 @@ msgstr "Il nome è richiesto."
 
 #. TRANS: Validation error shown when providing too long a name in the "Edit application" form.
 #. TRANS: Validation error shown when providing too long a name in the "New application" form.
-#, fuzzy
 msgid "Name is too long (maximum 255 characters)."
 msgstr "Il nome è troppo lungo (max 255 caratteri)."
 
@@ -2230,7 +2107,6 @@ msgid "Organization is required."
 msgstr "L'organizzazione è richiesta."
 
 #. TRANS: Validation error shown when providing too long an arganisation name in the "Edit application" form.
-#, fuzzy
 msgid "Organization is too long (maximum 255 characters)."
 msgstr "L'organizzazione è troppo lunga (max 255 caratteri)."
 
@@ -2282,69 +2158,67 @@ msgstr "Opzioni salvate."
 
 #. TRANS: Title for edit list page after deleting a tag.
 #. TRANS: %s is a list.
-#, fuzzy, php-format
+#, php-format
 msgid "Delete %s list"
-msgstr "Elimina questo utente"
+msgstr "Elimina la lista %s"
 
 #. TRANS: Title for edit list page.
 #. TRANS: %s is a list.
 #. TRANS: Form legend for list edit form.
 #. TRANS: %s is a list.
-#, fuzzy, php-format
+#, php-format
 msgid "Edit list %s"
-msgstr "Non è un'etichetta valida di persona: %s."
+msgstr "Modifica la lista %s"
 
 #. TRANS: Error message displayed when trying to perform an action that requires a tagging user or ID.
-#, fuzzy
 msgid "No tagger or ID."
-msgstr "Nessun soprannome o ID."
+msgstr "Nessun tagger o ID."
 
 #. TRANS: Client error displayed when referring to non-local user.
 msgid "Not a local user."
 msgstr "Utente inesistente."
 
 #. TRANS: Client error displayed when reting to edit a tag that was not self-created.
-#, fuzzy
 msgid "You must be the creator of the tag to edit it."
-msgstr "Devi essere amministratore per modificare il gruppo."
+msgstr "Devi essere il creatore del tag per poterlo modificare."
 
 #. TRANS: Form instruction for edit list form.
-#, fuzzy
 msgid "Use this form to edit the list."
-msgstr "Usa questo modulo per modificare il gruppo."
+msgstr "Usa questo modulo per modificare la lista."
 
 #. TRANS: Form validation error displayed if the form data for deleting a tag was incorrect.
-#, fuzzy
 msgid "Delete aborted."
-msgstr "Elimina messaggio"
+msgstr "Eliminazione interrotta."
 
 #. TRANS: Text in confirmation dialog for deleting a tag.
 msgid ""
 "Deleting this tag will permanantly remove all its subscription and "
 "membership records. Do you still want to continue?"
 msgstr ""
+"Eliminando questo tag verranno definitivamente rimosse tutte le iscrizioni e "
+"le note dei membri ad esso correlate. Desideri continuare?"
 
 #. TRANS: Form validation error displayed if a given tag is invalid.
-#, fuzzy
 msgid "Invalid tag."
-msgstr "Dimensione non valida."
+msgstr "Tag non valido."
 
 #. TRANS: Form validation error displayed if a given tag is already present.
 #. TRANS: %s is the already present tag.
-#, fuzzy, php-format
+#, php-format
 msgid "You already have a tag named %s."
-msgstr "Hai già ripetuto quel messaggio."
+msgstr "Hai già un tag chiamato %s."
 
 #. TRANS: Text in confirmation dialog for setting a tag from public to private.
 msgid ""
 "Setting a public tag as private will permanently remove all the existing "
 "subscriptions to it. Do you still want to continue?"
 msgstr ""
+"Impostando un tag pubblico come privato rimuoverà definitivamente tutte le "
+"iscrizioni ad esso correlate. Desideri continuare?"
 
-#. TRANS: TRANS: Server error displayed when updating a list fails.
-#, fuzzy
+#. TRANS: Server error displayed when updating a list fails.
 msgid "Could not update list."
-msgstr "Impossibile aggiornare l'utente."
+msgstr "Impossibile aggiornare la lista."
 
 #. TRANS: Title for e-mail settings.
 msgid "Email settings"
@@ -2381,7 +2255,7 @@ msgid ""
 "a message with further instructions."
 msgstr ""
 "In attesa della conferma per questo indirizzo. Controlla la tua casella di "
-"posta (e anche la posta indesiderata!) per un messaggio con ulteriori "
+"posta (e anche la casella dello spam!) per un messaggio con ulteriori "
 "istruzioni."
 
 #. TRANS: Instructions for e-mail address input form. Do not translate
@@ -2426,6 +2300,8 @@ msgid ""
 "To send notices via email, we need to create a unique email address for you "
 "on this server:"
 msgstr ""
+"Per inviare avvisi via email, abbiamo bisogno di creare un indirizzo email "
+"univoco per te su questo server:"
 
 #. TRANS: Button label for adding an e-mail address to send notices from.
 #. TRANS: Button label for adding an SMS e-mail address to send notices from.
@@ -2439,7 +2315,7 @@ msgstr "Preferenze dell'email"
 
 #. TRANS: Checkbox label in e-mail preferences form.
 msgid "Send me notices of new subscriptions through email."
-msgstr "Inviami avvisi di nuovi abbonamenti via email"
+msgstr "Inviami avvisi di nuove iscrizioni via email"
 
 #. TRANS: Checkbox label in e-mail preferences form.
 msgid "Send me email when someone adds my notice as a favorite."
@@ -2456,7 +2332,7 @@ msgstr "Inviami un'email quando qualcuno mi invia una \"@-risposta\""
 
 #. TRANS: Checkbox label in e-mail preferences form.
 msgid "Allow friends to nudge me and send me an email."
-msgstr "Consenti ai miei amici di richiamarmi e inviami un'email"
+msgstr "Consenti ai miei amici di trillarmi e inviami un'email"
 
 #. TRANS: Checkbox label in e-mail preferences form.
 msgid "Publish a MicroID for my email address."
@@ -2471,9 +2347,8 @@ msgid "No email address."
 msgstr "Nessun indirizzo email."
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
-#, fuzzy
 msgid "Cannot normalize that email address."
-msgstr "Impossibile normalizzare quell'indirizzo email"
+msgstr "Impossibile normalizzare quell'indirizzo email."
 
 #. TRANS: Message given saving e-mail address that not valid.
 #. TRANS: Form validation error displayed when trying to register without a valid e-mail address.
@@ -2492,9 +2367,8 @@ msgstr "Quell'indirizzo email appartiene già a un altro utente."
 #. TRANS: Server error thrown on database error adding e-mail confirmation code.
 #. TRANS: Server error thrown on database error adding Instant Messaging confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
-#, fuzzy
 msgid "Could not insert confirmation code."
-msgstr "Impossibile inserire il codice di conferma."
+msgstr "Impossibile inserire codice di conferma."
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
 msgid ""
@@ -2516,7 +2390,6 @@ msgid "That is the wrong email address."
 msgstr "Quello è l'indirizzo email sbagliato."
 
 #. TRANS: Server error thrown on database error canceling e-mail address confirmation.
-#, fuzzy
 msgid "Could not delete email confirmation."
 msgstr "Impossibile eliminare l'email di conferma."
 
@@ -2540,9 +2413,8 @@ msgstr "Nessun indirizzo email di ricezione."
 #. TRANS: Server error thrown on database error removing incoming e-mail address.
 #. TRANS: Server error thrown on database error adding incoming e-mail address.
 #. TRANS: Server error displayed when the user could not be updated in SMS settings.
-#, fuzzy
 msgid "Could not update user record."
-msgstr "Impossibile aggiornare il record dell'utente."
+msgstr "Impossibile aggiornare le impostazioni dell'utente."
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
 #. TRANS: Confirmation text after updating SMS settings.
@@ -2559,9 +2431,8 @@ msgid "This notice is already a favorite!"
 msgstr "Questo messaggio è già un preferito!"
 
 #. TRANS: Page title for page on which favorite notices can be unfavourited.
-#, fuzzy
 msgid "Disfavor favorite."
-msgstr "Rimuovi preferito"
+msgstr "Rimuovi dai preferiti."
 
 #. TRANS: Page title for first page of favorited notices.
 #. TRANS: Title for favourited notices section.
@@ -2632,9 +2503,9 @@ msgid "Featured users, page %d"
 msgstr "Utenti in evidenza, pagina %d"
 
 #. TRANS: Description on page displaying featured users.
-#, fuzzy, php-format
+#, php-format
 msgid "A selection of some great users on %s."
-msgstr "Una selezione di alcuni dei migliori utenti su %s"
+msgstr "Una selezione di alcuni dei migliori utenti su %s."
 
 #. TRANS: Client error displayed when no notice ID was given trying do display a file.
 msgid "No notice ID."
@@ -2653,40 +2524,6 @@ msgstr "Nessun allegato."
 msgid "No uploaded attachments."
 msgstr "Nessun allegato caricato."
 
-#. TRANS: Client error displayed when subscribing to a remote profile and an unexpected response is received.
-msgid "Not expecting this response!"
-msgstr "Risposta non attesa!"
-
-#. TRANS: Client error displayed when subscribing to a remote profile that does not exist.
-msgid "User being listened to does not exist."
-msgstr "L'utente che intendi seguire non esiste."
-
-#. TRANS: Client error displayed when subscribing to a remote profile that is a local profile.
-#. TRANS: Client error displayed when using remote subscribe for a local entity.
-msgid "You can use the local subscription!"
-msgstr "Puoi usare l'abbonamento locale!"
-
-#. TRANS: Client error displayed when subscribing to a remote profile that is blocked form subscribing to.
-msgid "That user has blocked you from subscribing."
-msgstr "Quell'utente ti ha bloccato dall'abbonarti."
-
-#. TRANS: Client error displayed when subscribing to a remote profile without providing an authorised token.
-msgid "You are not authorized."
-msgstr "Autorizzazione non presente."
-
-#. TRANS: Client error displayed when subscribing to a remote profile and conversion of the request token to access token fails.
-msgid "Could not convert request token to access token."
-msgstr "Impossibile convertire il token di richiesta in uno di accesso."
-
-#. TRANS: Client error displayed when subscribing to a remote profile fails because of an unsupported version of the OMB protocol.
-msgid "Remote service uses unknown version of OMB protocol."
-msgstr "Il servizio remoto usa una versione del protocollo OMB sconosciuta."
-
-#. TRANS: Server error displayed when subscribing to a remote profile fails because the remote profile could not be updated.
-#. TRANS: Exception thrown when updating a remote profile fails in OAuth store.
-msgid "Error updating remote profile."
-msgstr "Errore nell'aggiornare il profilo remoto."
-
 #. TRANS: Client error displayed when requesting a non-existent file.
 msgid "No such file."
 msgstr "Nessun file."
@@ -2757,14 +2594,12 @@ msgstr ""
 "gruppo."
 
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
-#, fuzzy
 msgid "Do not block this user from this group."
-msgstr "Non bloccare l'utente da questo gruppo"
+msgstr "Non bloccare questo utente in questo gruppo."
 
 #. TRANS: Submit button title for 'Yes' when blocking a user from a group.
-#, fuzzy
 msgid "Block this user from this group."
-msgstr "Blocca l'utente da questo gruppo"
+msgstr "Blocca l'utente in questo gruppo."
 
 #. TRANS: Server error displayed when trying to block a user from a group fails because of an application error.
 msgid "Database error blocking user from group."
@@ -2776,32 +2611,6 @@ msgstr "Errore del database nel bloccare l'utente dal gruppo."
 msgid "No ID."
 msgstr "Nessun ID."
 
-#. TRANS: Client error displayed trying to change group design settings while not logged in.
-msgid "You must be logged in to edit a group."
-msgstr "Devi eseguire l'accesso per modificare un gruppo."
-
-#. TRANS: Title group design settings page.
-msgid "Group design"
-msgstr "Aspetto del gruppo"
-
-#. TRANS: Instructions for group design settings page.
-msgid ""
-"Customize the way your group looks with a background image and a colour "
-"palette of your choice."
-msgstr ""
-"Personalizza l'aspetto del tuo gruppo con un'immagine di sfondo e dei colori "
-"personalizzati."
-
-#. TRANS: Form validation error displayed when group design settings could not be updated because of an application issue.
-#, fuzzy
-msgid "Unable to update your design settings."
-msgstr "Impossibile salvare la impostazioni dell'aspetto."
-
-#. TRANS: Form text to confirm saved group design settings.
-#. TRANS: Confirmation message on Profile design page when saving design settings has succeeded.
-msgid "Design preferences saved."
-msgstr "Preferenze dell'aspetto salvate."
-
 #. TRANS: Title for group logo settings page.
 #. TRANS: Group logo form legend.
 msgid "Group logo"
@@ -2854,24 +2663,25 @@ msgstr "Un elenco degli utenti in questo gruppo."
 
 #. TRANS: Client error displayed when trying to approve group applicants without being a group administrator.
 msgid "Only the group admin may approve users."
-msgstr ""
+msgstr "Solo gli admin del gruppo possono approvare gli utenti."
 
 #. TRANS: Title of the first page showing pending group members still awaiting approval to join the group.
 #. TRANS: %s is the name of the group.
-#, fuzzy, php-format
+#, php-format
 msgid "%s group members awaiting approval"
-msgstr "Membri del gruppo %s"
+msgstr "Membri del gruppo %s che attendono approvazione"
 
 #. TRANS: Title of all but the first page showing pending group members still awaiting approval to join the group.
 #. TRANS: %1$s is the name of the group, %2$d is the page number of the members list.
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s group members awaiting approval, page %2$d"
-msgstr "Membri del gruppo %1$s, pagina %2$d"
+msgstr "Membri del gruppo %1$s in attesa di approvazione, pagina %2$d"
 
 #. TRANS: Page notice for group members page.
-#, fuzzy
 msgid "A list of users awaiting approval to join this group."
-msgstr "Un elenco degli utenti in questo gruppo."
+msgstr ""
+"Un elenco degli utenti in attesa di approvazione per accedere a questo "
+"gruppo."
 
 #. TRANS: Message is used as link description. %1$s is a group name, %2$s is a site name.
 #, php-format
@@ -2879,14 +2689,13 @@ msgid "Updates from members of %1$s on %2$s!"
 msgstr "Messaggi dai membri di %1$s su %2$s!"
 
 #. TRANS: Title for first page of the groups list.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Groups"
 msgstr "Gruppi"
 
 #. TRANS: Title for all but the first page of the groups list.
 #. TRANS: %d is the page number.
-#, fuzzy, php-format
+#, php-format
 msgctxt "TITLE"
 msgid "Groups, page %d"
 msgstr "Gruppi, pagina %d"
@@ -2894,7 +2703,7 @@ msgstr "Gruppi, pagina %d"
 #. TRANS: Page notice of group list. %%%%site.name%%%% is the StatusNet site name,
 #. TRANS: %%%%action.groupsearch%%%% and %%%%action.newgroup%%%% are URLs. Do not change them.
 #. TRANS: This message contains Markdown links in the form [link text](link).
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "%%%%site.name%%%% groups let you find and talk with people of similar "
 "interests. After you join a group you can send messages to all other members "
@@ -2902,11 +2711,11 @@ msgid ""
 "for one](%%%%action.groupsearch%%%%) or [start your own](%%%%action.newgroup%"
 "%%%)!"
 msgstr ""
-"I gruppi di %%%%site.name%%%% ti consentono di trovare e parlare con persone "
-"che condividono i tuoi stessi interessi. Quando fai parte di un gruppo, puoi "
-"inviare messaggi a tutti i membri del gruppo utilizzando la sintassi \"!"
-"nomegruppo\". Non trovi un gruppo che ti piace? Prova a [cercarne uno](%%%%"
-"action.groupsearch%%%%) o [crea il tuo!](%%%%action.newgroup%%%%)"
+"I gruppi del sito %%%%site.name%%%% ti permettono di trovare ed entrare in "
+"contatto con persone con i tuoi stessi interessi. Dopo aver aderito ad un "
+"gruppo puoi inviare messaggi agli altri membri usando la sintassi \"!"
+"groupname\". Non trovi gruppi di tuo gradimento? Prova a [cercare ancora](%%%"
+"%action.groupsearch%%%%) o [creane uno tu](%%%%action.newgroup%%%%)!"
 
 #. TRANS: Link to create a new group on the group list page.
 #. TRANS: Link text on group page to create a new group.
@@ -2936,7 +2745,7 @@ msgstr "Nessun risultato."
 
 #. TRANS: Additional text on page where groups can be searched if no results were found for a query for a logged in user.
 #. TRANS: This message contains Markdown links in the form [link text](link).
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "If you cannot find the group you're looking for, you can [create it](%%"
 "action.newgroup%%) yourself."
@@ -2951,8 +2760,8 @@ msgid ""
 "Why not [register an account](%%action.register%%) and [create the group](%%"
 "action.newgroup%%) yourself!"
 msgstr ""
-"Perché non [crei un account](%%action.register%%) e [crei tu il gruppo](%%"
-"action.newgroup%%)!"
+"Perché non provi a [registrare un account](%%action.register%%) e a [creare "
+"tu un gruppo](%%action.newgroup%%)?"
 
 #. TRANS: Client error displayed when trying to unblock a user from a group without being an administrator for the group.
 msgid "Only an admin can unblock group members."
@@ -2974,73 +2783,67 @@ msgstr "Impostazioni messaggistica istantanea"
 #. TRANS: Instant messaging settings page instructions.
 #. TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link.
 #. TRANS: the order and formatting of link text and link should remain unchanged.
-#, fuzzy, php-format
+#, php-format
 msgid ""
-"You can send and receive notices through instant messaging [instant messages]"
-"(%%doc.im%%). Configure your addresses and settings below."
+"You can send and receive notices through [instant messaging](%%doc.im%%). "
+"Configure your addresses and settings below."
 msgstr ""
-"Puoi inviare e ricevere messaggi attraverso i servizi di [messaggistica "
-"istantanea](%%doc.im%%) Jabber/GTalk. Configura il tuo indirizzo e le "
-"impostazioni qui di seguito."
+"Puoi inviare e ricevere messaggi attraverso i servizi di Messaggistica "
+"Istantanea [IM](%%doc.im%%). Configura il tuo indirizzo e le impostazioni "
+"qui di seguito."
 
 #. TRANS: Message given in the IM settings if IM is not enabled on the site.
 msgid "IM is not available."
-msgstr "Messaggistica istantanea non disponibile."
+msgstr "IM non disponibile."
 
 #. TRANS: Form note in IM settings form. %s is the type of IM address that was confirmed.
-#, fuzzy, php-format
+#, php-format
 msgid "Current confirmed %s address."
-msgstr "Indirizzo email attualmente confermato."
+msgstr "Indirizzo email %s attualmente confermato."
 
 #. TRANS: Form note in IM settings form.
 #. TRANS: %s is the IM service name, %2$s is the IM address set.
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your %1$s account for a message "
 "with further instructions. (Did you add %2$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?"
+"Indirizzo in attesa di conferma. Controlla il tuo account %1$s per un "
+"messaggio con ulteriori istruzioni. (Hai aggiunto %2$s al tuo elenco "
+"contatti?)"
 
 #. TRANS: Field label for IM address.
 msgid "IM address"
-msgstr "Indirizzo di messaggistica istantanea"
+msgstr "Indirizzo IM"
 
 #. TRANS: Field title for IM address. %s is the IM service name.
 #, php-format
 msgid "%s screenname."
-msgstr ""
+msgstr "Nome visualizzato di %s."
 
 #. TRANS: Header for IM preferences form.
-#, fuzzy
 msgid "IM Preferences"
-msgstr "Preferenze messaggistica"
+msgstr "Preferenze IM"
 
 #. TRANS: Checkbox label in IM preferences form.
-#, fuzzy
 msgid "Send me notices"
-msgstr "Invia un messaggio"
+msgstr "Inviami gli avvisi"
 
 #. TRANS: Checkbox label in IM preferences form.
-#, fuzzy
 msgid "Post a notice when my status changes."
-msgstr "Pubblica un messaggio quando il mio stato Jabber/GTalk cambia"
+msgstr "Inviami una notifica quando il mio stato cambia."
 
 #. TRANS: Checkbox label in IM preferences form.
-#, fuzzy
 msgid "Send me replies from people I'm not subscribed to."
-msgstr "Inviami le risposte delle persone a cui sono abbonato via Jabber/GTalk"
+msgstr "Inviami le risposte delle persone alle quali non sono iscritto."
 
 #. TRANS: Checkbox label in IM preferences form.
-#, fuzzy
 msgid "Publish a MicroID"
-msgstr "Pubblica un MicroID per il mio indirizzo email"
+msgstr "Pubblica un MicroID"
 
 #. TRANS: Server error thrown on database error updating IM preferences.
-#, fuzzy
 msgid "Could not update IM preferences."
-msgstr "Impossibile aggiornare l'utente."
+msgstr "Impossibile aggiornare le preferenze della IM."
 
 #. TRANS: Confirmation message for successful IM preferences save.
 #. TRANS: Confirmation message after saving preferences.
@@ -3048,77 +2851,66 @@ msgid "Preferences saved."
 msgstr "Preferenze salvate."
 
 #. TRANS: Message given saving IM address without having provided one.
-#, fuzzy
 msgid "No screenname."
-msgstr "Nessun soprannome."
+msgstr "Nessun nome visualizzato."
 
 #. TRANS: Form validation error when no transport is available setting an IM address.
-#, fuzzy
 msgid "No transport."
-msgstr "Nessun messaggio."
+msgstr "Nessun trasporto."
 
 #. TRANS: Message given saving IM address that cannot be normalised.
-#, fuzzy
 msgid "Cannot normalize that screenname."
-msgstr "Impossibile normalizzare quell'ID Jabber"
+msgstr "Impossibile normalizzare quel nome visualizzato."
 
 #. TRANS: Message given saving IM address that not valid.
-#, fuzzy
 msgid "Not a valid screenname."
-msgstr "Non è un soprannome valido."
+msgstr "Il nome visualizzato non è valido."
 
 #. TRANS: Message given saving IM address that is already set for another user.
-#, fuzzy
 msgid "Screenname already belongs to another user."
-msgstr "ID Jabber già assegnato a un altro utente."
+msgstr "Il nome visualizzato appartiene già ad un altro utente."
 
 #. TRANS: Message given saving valid IM address that is to be confirmed.
-#, fuzzy
 msgid "A confirmation code was sent to the IM address you added."
 msgstr ""
-"Un codice di conferma è stato inviato all'indirizzo di messaggistica "
-"istantanea che hai aggiunto. Devi approvare %s affinché ti invii messaggi."
+"Un codice di conferma è stato inviato all'indirizzo IM che hai aggiunto."
 
 #. TRANS: Message given canceling IM address confirmation for the wrong IM address.
 msgid "That is the wrong IM address."
-msgstr "Quello è l'indirizzo di messaggistica sbagliato."
+msgstr "Quello è l'IM sbagliato."
 
 #. TRANS: Server error thrown on database error canceling IM address confirmation.
-#, fuzzy
 msgid "Could not delete confirmation."
-msgstr "Impossibile eliminare la conferma della messaggistica."
+msgstr "Impossibile eliminare la conferma."
 
 #. TRANS: Message given after successfully canceling IM address confirmation.
 msgid "IM confirmation cancelled."
-msgstr "Conferma della messaggistica annullata."
+msgstr "Conferma della IM annullata."
 
 #. TRANS: Message given trying to remove an IM address that is not
 #. TRANS: registered for the active user.
-#, fuzzy
 msgid "That is not your screenname."
-msgstr "Quello non è il tuo numero di telefono."
+msgstr "Quello non è il tuo nome utente visualizzato."
 
 #. TRANS: Message given after successfully removing a registered Instant Messaging address.
 msgid "The IM address was removed."
-msgstr "L'indirizzo di messaggistica è stato rimosso."
+msgstr "L'indirizzo di IM è stato rimosso."
 
 #. TRANS: Title for all but the first page of the inbox page.
 #. TRANS: %1$s is the user's nickname, %2$s is the page number.
 #, php-format
 msgid "Inbox for %1$s - page %2$d"
-msgstr "Casella posta in arrivo di %1$s - pagina %2$d"
+msgstr "Posta in arrivo di %1$s - pagina %2$d"
 
 #. TRANS: Title for the first page of the inbox page.
 #. TRANS: %s is the user's nickname.
 #, php-format
 msgid "Inbox for %s"
-msgstr "Casella posta in arrivo di %s"
+msgstr "Posta in arrivo di %s"
 
 #. TRANS: Instructions for user inbox page.
 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."
+msgstr "Questa è la tua Posta in arrivo, contiene i messaggi privati ricevuti."
 
 #. TRANS: Client error displayed when trying to sent invites while they have been disabled.
 msgid "Invites have been disabled."
@@ -3132,12 +2924,11 @@ msgstr "Devi eseguire l'accesso per invitare altri utenti a usare %s."
 
 #. TRANS: Form validation message when providing an e-mail address that does not validate.
 #. TRANS: %s is an invalid e-mail address.
-#, fuzzy, php-format
+#, php-format
 msgid "Invalid email address: %s."
-msgstr "Indirizzo email non valido: %s"
+msgstr "Indirizzo email non valido: %s."
 
 #. TRANS: Page title when invitations have been sent.
-#, fuzzy
 msgid "Invitations sent"
 msgstr "Inviti inviati"
 
@@ -3149,15 +2940,14 @@ msgstr "Invita nuovi utenti"
 #. TRANS: is already subscribed to one or more users with the given e-mail address(es).
 #. TRANS: Plural form is based on the number of reported already subscribed e-mail addresses.
 #. TRANS: Followed by a bullet list.
-#, fuzzy
 msgid "You are already subscribed to this user:"
 msgid_plural "You are already subscribed to these users:"
-msgstr[0] "Hai già un abbonamento a questi utenti:"
-msgstr[1] "Hai già un abbonamento a questi utenti:"
+msgstr[0] "Sei già iscritto a questo utente:"
+msgstr[1] "Sei già iscritto a questi utenti:"
 
 #. TRANS: Used as list item for already subscribed users (%1$s is nickname, %2$s is e-mail address).
 #. TRANS: Used as list item for already registered people (%1$s is nickname, %2$s is e-mail address).
-#, fuzzy, php-format
+#, php-format
 msgctxt "INVITE"
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
@@ -3165,22 +2955,20 @@ msgstr "%1$s (%2$s)"
 #. TRANS: Message displayed inviting users to use a StatusNet site while the invited user
 #. TRANS: already uses a this StatusNet site. Plural form is based on the number of
 #. TRANS: reported already present people. Followed by a bullet list.
-#, fuzzy
 msgid "This person is already a user and you were automatically subscribed:"
 msgid_plural ""
 "These people are already users and you were automatically subscribed to them:"
 msgstr[0] ""
-"Queste persone sono già utenti e hai un abbonamento automatico a loro:"
+"Questa persona è già un utente e sei stato ad essa automaticamente iscritto:"
 msgstr[1] ""
-"Queste persone sono già utenti e hai un abbonamento automatico a loro:"
+"Queste persone sono già utenti e sei stato ad essi automaticamente iscritto:"
 
 #. TRANS: Message displayed inviting users to use a StatusNet site. Plural form is
 #. TRANS: based on the number of invitations sent. Followed by a bullet list of
 #. TRANS: e-mail addresses to which invitations were sent.
-#, fuzzy
 msgid "Invitation sent to the following person:"
 msgid_plural "Invitations sent to the following people:"
-msgstr[0] "Inviti inviati alle seguenti persone:"
+msgstr[0] "Inviti inviati alla seguente persona:"
 msgstr[1] "Inviti inviati alle seguenti persone:"
 
 #. TRANS: Generic message displayed after sending out one or more invitations to
@@ -3190,7 +2978,7 @@ msgid ""
 "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à!"
+"registreranno sul sito. Grazie per aiutarci ad accrescere la comunità!"
 
 #. TRANS: Form instructions.
 msgid ""
@@ -3199,29 +2987,6 @@ msgstr ""
 "Usa questo modulo per invitare i tuoi amici e colleghi a usare questo "
 "servizio."
 
-#. TRANS: Field label for a list of e-mail addresses.
-msgid "Email addresses"
-msgstr "Indirizzi email"
-
-#. TRANS: Tooltip for field label for a list of e-mail addresses.
-#, fuzzy
-msgid "Addresses of friends to invite (one per line)."
-msgstr "Indirizzi email di amici da invitare (uno per riga)"
-
-#. TRANS: Field label for a personal message to send to invitees.
-msgid "Personal message"
-msgstr "Messaggio personale"
-
-#. TRANS: Tooltip for field label for a personal message to send to invitees.
-msgid "Optionally add a personal message to the invitation."
-msgstr "Puoi aggiungere un messaggio personale agli inviti."
-
-#. TRANS: Send button for inviting friends
-#. TRANS: Button text for sending notice.
-msgctxt "BUTTON"
-msgid "Send"
-msgstr "Invia"
-
 #. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral
 #. TRANS: singular 3rd-person pronoun in English. %1$s is the inviting user, $2$s is
 #. TRANS: the StatusNet sitename.
@@ -3234,15 +2999,14 @@ msgid "You must be logged in to join a group."
 msgstr "Devi eseguire l'accesso per iscriverti a un gruppo."
 
 #. TRANS: Title for join group page after joining.
-#, fuzzy, php-format
+#, php-format
 msgctxt "TITLE"
 msgid "%1$s joined group %2$s"
 msgstr "%1$s fa ora parte del gruppo %2$s"
 
 #. TRANS: Exception thrown when there is an unknown error joining a group.
-#, fuzzy
 msgid "Unknown error joining group."
-msgstr "Sconosciuto"
+msgstr "Errore sconosciuto nell'adesione al gruppo."
 
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
@@ -3271,9 +3035,8 @@ msgstr ""
 "licenza \"Tutti i diritti riservati\"."
 
 #. TRANS: Client error displayed selecting a too long license title in the license admin panel.
-#, fuzzy
 msgid "Invalid license title. Maximum length is 255 characters."
-msgstr "Titolo della licenza non valido. Lunghezza massima 255 caratteri."
+msgstr "Titolo di licenza non valido. La lunghezza massima è di 255 caratteri."
 
 #. TRANS: Client error displayed specifying an invalid license URL in the license admin panel.
 msgid "Invalid license URL."
@@ -3313,9 +3076,8 @@ msgid "Type"
 msgstr "Tipo"
 
 #. TRANS: Dropdown field instructions in the license admin panel.
-#, fuzzy
 msgid "Select a license."
-msgstr "Seleziona licenza"
+msgstr "Seleziona una licenza."
 
 #. TRANS: Form legend in the license admin panel.
 msgid "License details"
@@ -3354,15 +3116,8 @@ msgid "URL for an image to display with the license."
 msgstr "Indirizzo di un'immagine da visualizzare con la licenza."
 
 #. TRANS: Button title in the license admin panel.
-#, fuzzy
 msgid "Save license settings."
-msgstr "Salva impostazioni licenza"
-
-#. TRANS: Client error displayed when trying to log in while already logged in.
-#. TRANS: Client error displayed trying to use "one time password login" when already logged in.
-#. TRANS: Client error displayed when trying to register while already logged in.
-msgid "Already logged in."
-msgstr "Accesso già effettuato."
+msgstr "Salva le impostazioni di licenza."
 
 #. TRANS: Form validation error displayed when trying to log in with incorrect credentials.
 msgid "Incorrect username or password."
@@ -3382,9 +3137,8 @@ msgid "Login to site"
 msgstr "Accedi al sito"
 
 #. TRANS: Field label on login page.
-#, fuzzy
 msgid "Username or email address"
-msgstr "Soprannome o indirizzo email"
+msgstr "Nome utente o indirizzo email"
 
 #. TRANS: Checkbox label label on login page.
 #. TRANS: Checkbox label on account registration page.
@@ -3397,7 +3151,6 @@ msgid "Automatically login in the future; not for shared computers!"
 msgstr "Accedi automaticamente in futuro; non per computer condivisi!"
 
 #. TRANS: Button text for log in on login page.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Login"
 msgstr "Accedi"
@@ -3453,10 +3206,9 @@ msgstr "Impossibile rendere %1$s un amministratore del gruppo %2$s"
 
 #. TRANS: Client error displayed trying to make a micro summary without providing a status.
 msgid "No current status."
-msgstr "Nessun messaggio corrente."
+msgstr "Nessun messaggio attuale."
 
 #. TRANS: This is the title of the form for adding a new application.
-#, fuzzy
 msgid "New application"
 msgstr "Nuova applicazione"
 
@@ -3476,18 +3228,17 @@ msgstr "L'URL sorgente è richiesto."
 msgid "Could not create application."
 msgstr "Impossibile creare l'applicazione."
 
-#, fuzzy
+#. TRANS: Form validation error messages displayed when uploading an invalid application logo.
 msgid "Invalid image."
-msgstr "Dimensione non valida."
+msgstr "Immagine non valida."
 
 #. TRANS: Title for form to create a group.
 msgid "New group"
 msgstr "Nuovo gruppo"
 
 #. TRANS: Client exception thrown when a user tries to create a group while banned.
-#, fuzzy
 msgid "You are not allowed to create groups on this site."
-msgstr "Non fai parte di questo gruppo."
+msgstr "Non sei autorizzato a creare gruppi su questo sito."
 
 #. TRANS: Form instructions for group create form.
 msgid "Use this form to create a new group."
@@ -3500,7 +3251,6 @@ msgstr "Nuovo messaggio"
 
 #. TRANS: Client error displayed trying to send a direct message to a user while sender and
 #. TRANS: receiver are not subscribed to each other.
-#, fuzzy
 msgid "You cannot send a message to this user."
 msgstr "Non puoi inviare un messaggio a questo utente."
 
@@ -3515,12 +3265,6 @@ msgstr "Nessun contenuto!"
 msgid "No recipient specified."
 msgstr "Nessun destinatario specificato."
 
-#. TRANS: Client error displayed trying to send a direct message to self.
-#. TRANS: Error text shown when trying to send a direct message to self.
-msgid ""
-"Don't send a message to yourself; just say it to yourself quietly instead."
-msgstr "Non inviarti un messaggio, piuttosto ripetilo a voce dolcemente."
-
 #. TRANS: Page title after sending a direct message.
 msgid "Message sent"
 msgstr "Messaggio inviato"
@@ -3540,10 +3284,9 @@ msgstr "Errore di Ajax"
 
 #. TRANS: Page title for sending a new notice.
 #. TRANS: Title for form to send a new notice.
-#, fuzzy
 msgctxt "TITLE"
 msgid "New notice"
-msgstr "Nuovo messaggio"
+msgstr "Nuovo avviso"
 
 #. TRANS: Page title after sending a notice.
 msgid "Notice posted"
@@ -3596,26 +3339,25 @@ msgstr "Messaggi con \"%s\""
 
 #. TRANS: RSS notice search feed description.
 #. TRANS: %1$s is the query, %2$s is the StatusNet site name.
-#, fuzzy, php-format
+#, php-format
 msgid "Updates matching search term \"%1$s\" on %2$s."
-msgstr "Messaggi che corrispondono al termine \"%1$s\" su %2$s!"
+msgstr "Aggiornamenti che contengono il termine \"%1$s\" nel sito %2$s."
 
 #. TRANS: Client error displayed trying to nudge a user that cannot be nudged.
-#, fuzzy
 msgid ""
 "This user doesn't allow nudges or hasn't confirmed or set their email "
 "address yet."
 msgstr ""
-"Questo utente non consente i richiami oppure non ha confermato o impostato "
+"Questo utente non consente i trilli oppure non ha confermato o impostato "
 "ancora il suo indirizzo email."
 
 #. TRANS: Page title after sending a nudge.
 msgid "Nudge sent"
-msgstr "Richiamo inviato"
+msgstr "Trillo inviato"
 
 #. TRANS: Confirmation text after sending a nudge.
 msgid "Nudge sent!"
-msgstr "Richiamo inviato!"
+msgstr "Trillo inviato!"
 
 #. TRANS: Message displayed to an anonymous user trying to view OAuth application list.
 msgid "You must be logged in to list your applications."
@@ -3639,9 +3381,8 @@ msgid "Connected applications"
 msgstr "Applicazioni collegate"
 
 #. TRANS: Instructions for OAuth connection settings.
-#, fuzzy
 msgid "The following connections exist for your account."
-msgstr "Hai consentito alle seguenti applicazioni di accedere al tuo account."
+msgstr "Per il tuo account esistono i seguenti collegamenti."
 
 #. TRANS: Client error when trying to revoke access for an application while not being a user of it.
 msgid "You are not a user of that application."
@@ -3649,9 +3390,9 @@ msgstr "Non sei un utente di quella applicazione."
 
 #. TRANS: Client error when revoking access has failed for some reason.
 #. TRANS: %s is the application ID revoking access failed for.
-#, fuzzy, php-format
+#, php-format
 msgid "Unable to revoke access for application: %s."
-msgstr "Impossibile revocare l'accesso per l'applicazione: %s."
+msgstr "Non abilitato a revocare l'accesso per l'applicazione: %s."
 
 #. TRANS: Success message after revoking access for an application.
 #. TRANS: %1$s is the application name, %2$s is the first part of the user token.
@@ -3660,6 +3401,8 @@ msgid ""
 "You have successfully revoked access for %1$s and the access token starting "
 "with %2$s."
 msgstr ""
+"Hai revocato con successo l'accesso all'applicazione %1$s e il token "
+"d'accesso a partire da %2$s."
 
 #. TRANS: Empty list message when no applications have been authorised yet.
 msgid "You have not authorized any applications to use your account."
@@ -3673,18 +3416,20 @@ msgid ""
 "Are you a developer? [Register an OAuth client application](%s) to use with "
 "this instance of StatusNet."
 msgstr ""
+"Sei uno sviluppatore? [Registra un'applicazione client OAuth] (%s) da "
+"utilizzare con questa istanza di StatusNet."
 
 #. TRANS: Server error displayed in oEmbed action when path not found.
 #. TRANS: %s is a path.
-#, fuzzy, php-format
+#, php-format
 msgid "\"%s\" not found."
-msgstr "Metodo delle API non trovato."
+msgstr "\"%s\" non trovato."
 
 #. TRANS: Server error displayed in oEmbed action when notice not found.
 #. TRANS: %s is a notice.
-#, fuzzy, php-format
+#, php-format
 msgid "Notice %s not found."
-msgstr "Metodo delle API non trovato."
+msgstr "Notifica %s non trovata."
 
 #. TRANS: Server error displayed in oEmbed action when notice has not profile.
 #. TRANS: Server error displayed trying to show a notice without a connected profile.
@@ -3700,15 +3445,15 @@ msgstr "Stato di %1$s su %2$s"
 
 #. TRANS: Server error displayed in oEmbed action when attachment not found.
 #. TRANS: %d is an attachment ID.
-#, fuzzy, php-format
+#, php-format
 msgid "Attachment %s not found."
-msgstr "Destinatario non trovato."
+msgstr "Allegato %s non trovato."
 
 #. TRANS: Server error displayed in oEmbed request when a path is not supported.
 #. TRANS: %s is a path.
 #, php-format
 msgid "\"%s\" not supported for oembed requests."
-msgstr ""
+msgstr "\"%s\" non è supportata per le richieste oembed."
 
 #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
 #, php-format
@@ -3725,6 +3470,33 @@ msgstr "Solo URL %s attraverso HTTP semplice."
 msgid "Not a supported data format."
 msgstr "Non è un formato di dati supportato."
 
+#. TRANS: Page title for profile settings.
+msgid "Old school UI settings"
+msgstr "Impostazioni old school UI"
+
+#. TRANS: Usage instructions for profile settings.
+msgid "If you like it \"the old way\", you can set that here."
+msgstr "Se preferisci il \"vecchio stile\", puoi impostarlo qui."
+
+#. TRANS: Confirmation shown when user profile settings are saved.
+#. TRANS: Message after successful saving of administrative settings.
+msgid "Settings saved."
+msgstr "Impostazioni salvate."
+
+msgid "Only stream mode (no conversations) in timelines"
+msgstr "Solo la modalità corrente nelle cronologie ( no conversazioni)"
+
+msgid "Show conversation page as hierarchical trees"
+msgstr ""
+"Mostra la pagina delle conversazioni sotto forma di strutture gerarchiche"
+
+msgid "Show nicknames (not full names) in timelines"
+msgstr "Mostra cronologia dei nickname (non nomi completi)"
+
+#. TRANS: Button text to save a list.
+msgid "Save"
+msgstr "Salva"
+
 #. TRANS: ShortName in the OpenSearch interface when trying to find users.
 msgid "People Search"
 msgstr "Cerca persone"
@@ -3733,6 +3505,11 @@ msgstr "Cerca persone"
 msgid "Notice Search"
 msgstr "Cerca messaggi"
 
+#. TRANS: Client error displayed trying to use "one time password login" when already logged in.
+#. TRANS: Client error displayed when trying to register while already logged in.
+msgid "Already logged in."
+msgstr "Accesso già effettuato."
+
 #. TRANS: Client error displayed trying to use "one time password login" without specifying a user.
 msgid "No user ID specified."
 msgstr "Nessun ID utente specificato."
@@ -3771,7 +3548,6 @@ msgstr ""
 "hai inviato."
 
 #. TRANS: Title for page where to change password.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Change password"
 msgstr "Modifica password"
@@ -3796,25 +3572,21 @@ msgstr "Nuova password"
 
 #. TRANS: Field title on page where to change password.
 #. TRANS: Field title on account registration page.
-#, fuzzy
 msgid "6 or more characters."
-msgstr "6 o più caratteri"
+msgstr "6 o più caratteri."
 
 #. TRANS: Field label on page where to change password. In this field the new password should be typed a second time.
-#, fuzzy
 msgctxt "LABEL"
 msgid "Confirm"
 msgstr "Conferma"
 
 #. TRANS: Field title on page where to change password.
-#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
+#. TRANS: Title for field label for password reset form where the password has to be typed again.
 #. TRANS: Field title on account registration page.
-#, fuzzy
 msgid "Same as password above."
-msgstr "Stessa password di sopra"
+msgstr "Ripetere password."
 
 #. TRANS: Button text on page where to change password.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Change"
 msgstr "Modifica"
@@ -3826,14 +3598,12 @@ msgstr "La password deve essere di 6 o più caratteri."
 
 #. TRANS: Form validation error on password change when password confirmation does not match.
 #. TRANS: Form validation error displayed when trying to register with non-matching passwords.
-#, fuzzy
 msgid "Passwords do not match."
 msgstr "Le password non corrispondono."
 
 #. TRANS: Form validation error on page where to change password.
-#, fuzzy
 msgid "Incorrect old password."
-msgstr "Vecchia password non corretta"
+msgstr "Vecchia password non corretta."
 
 #. TRANS: Form validation error on page where to change password.
 msgid "Error saving user; invalid."
@@ -3842,7 +3612,6 @@ msgstr "Errore nel salvare l'utente; non valido."
 #. TRANS: Server error displayed on page where to change password when password change
 #. TRANS: could not be made because of a server error.
 #. TRANS: Reset password form validation error message.
-#, fuzzy
 msgid "Cannot save new password."
 msgstr "Impossibile salvare la nuova password."
 
@@ -3870,12 +3639,6 @@ msgstr "Directory del tema non leggibile: %s."
 msgid "Avatar directory not writable: %s."
 msgstr "Directory delle immagini degli utenti non scrivibile: %s."
 
-#. TRANS: Client error in Paths admin panel.
-#. TRANS: %s is the background directory that could not be written to.
-#, php-format
-msgid "Background directory not writable: %s."
-msgstr "Directory degli sfondi non scrivibile: %s."
-
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the locales directory that could not be read from.
 #, php-format
@@ -3904,43 +3667,37 @@ msgid "Path"
 msgstr "Percorso"
 
 #. TRANS: Field title in Paths admin panel.
-#, fuzzy
 msgid "Site path."
-msgstr "Percorso del sito"
+msgstr "Percorso del sito."
 
 #. TRANS: Field label in Paths admin panel.
-#, fuzzy
 msgid "Locale directory"
-msgstr "Directory del tema"
+msgstr "Directory locale"
 
 #. TRANS: Field title in Paths admin panel.
-#, fuzzy
 msgid "Directory path to locales."
-msgstr "Percorso della directory alle localizzazioni"
+msgstr "Percorso della directory alle località."
 
 #. TRANS: Checkbox label in Paths admin panel.
 msgid "Fancy URLs"
 msgstr "URL semplici"
 
 #. TRANS: Field title in Paths admin panel.
-#, fuzzy
 msgid "Use fancy URLs (more readable and memorable)?"
 msgstr "Usare gli URL semplici (più leggibili e facili da ricordare)?"
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#, fuzzy
 msgctxt "LEGEND"
 msgid "Theme"
 msgstr "Tema"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#, fuzzy
 msgid "Server for themes."
-msgstr "Tema per questo sito."
+msgstr "Server per temi."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
 msgid "Web path to themes."
-msgstr ""
+msgstr "Percorso web per i temi."
 
 #. TRANS: Field label in Paths admin panel.
 msgid "SSL server"
@@ -3948,26 +3705,23 @@ msgstr "Server SSL"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
 msgid "SSL server for themes (default: SSL server)."
-msgstr ""
+msgstr "Server SSL per i temi (predefinito: SSL server)."
 
 #. TRANS: Field label in Paths admin panel.
-#, fuzzy
 msgid "SSL path"
-msgstr "Percorso del sito"
+msgstr "Percorso SSL"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
 msgid "SSL path to themes (default: /theme/)."
-msgstr ""
+msgstr "Percorso SSL per i temi (predefinito: / tema /)."
 
 #. TRANS: Field label in Paths admin panel.
-#, fuzzy
 msgid "Directory"
-msgstr "Directory del tema"
+msgstr "Directory"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#, fuzzy
 msgid "Directory where themes are located."
-msgstr "Percorso della directory alle localizzazioni"
+msgstr "Directory dove si trovano i temi."
 
 #. TRANS: Fieldset legend in Paths admin panel.
 msgid "Avatars"
@@ -3978,84 +3732,50 @@ msgid "Avatar server"
 msgstr "Server dell'immagine"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#, fuzzy
 msgid "Server for avatars."
-msgstr "Tema per questo sito."
+msgstr "Server per gli avatars."
 
 #. TRANS: Field label in Paths admin panel.
 msgid "Avatar path"
 msgstr "Percorso dell'immagine"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#, fuzzy
 msgid "Web path to avatars."
-msgstr "Aggiornamento dell'immagine non riuscito."
+msgstr "Percorso web per gli avatars."
 
 #. TRANS: Field label in Paths admin panel.
 msgid "Avatar directory"
 msgstr "Directory dell'immagine"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#, fuzzy
 msgid "Directory where avatars are located."
-msgstr "Percorso della directory alle localizzazioni"
-
-#. TRANS: Fieldset legend in Paths admin panel.
-msgid "Backgrounds"
-msgstr "Sfondi"
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-#, fuzzy
-msgid "Server for backgrounds."
-msgstr "Tema per questo sito."
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-msgid "Web path to backgrounds."
-msgstr ""
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-msgid "Server for backgrounds on SSL pages."
-msgstr ""
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-msgid "Web path to backgrounds on SSL pages."
-msgstr ""
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-#, fuzzy
-msgid "Directory where backgrounds are located."
-msgstr "Percorso della directory alle localizzazioni"
+msgstr "Directory degli avatar"
 
 #. TRANS: Fieldset legens in Paths admin panel.
 msgid "Attachments"
 msgstr "Allegati"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#, fuzzy
 msgid "Server for attachments."
-msgstr "Tema per questo sito."
+msgstr "Server per gli allegati."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#, fuzzy
 msgid "Web path to attachments."
-msgstr "Nessun allegato."
+msgstr "Percorso web relativo agli allegati."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#, fuzzy
 msgid "Server for attachments on SSL pages."
-msgstr "Tema per questo sito."
+msgstr "Server per gli allegati nelle pagine SSL."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
 msgid "Web path to attachments on SSL pages."
-msgstr ""
+msgstr "Percorso web per gli allegati su pagine SSL."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#, fuzzy
 msgid "Directory where attachments are located."
-msgstr "Percorso della directory alle localizzazioni"
+msgstr "Directory dove sono presenti gli allegati."
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#, fuzzy
 msgctxt "LEGEND"
 msgid "SSL"
 msgstr "SSL"
@@ -4078,18 +3798,16 @@ msgid "Use SSL"
 msgstr "Usa SSL"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#, fuzzy
 msgid "When to use SSL."
-msgstr "Quando usare SSL"
+msgstr "Quando utilizzare SSL."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#, fuzzy
 msgid "Server to direct SSL requests to."
-msgstr "Server a cui dirigere le richieste SSL"
+msgstr "Server a cui dirigere le richieste SSL."
 
 #. TRANS: Button title text to store form data in the Paths admin panel.
-msgid "Save paths"
-msgstr "Salva percorsi"
+msgid "Save path settings."
+msgstr "Salva impostazioni."
 
 #. TRANS: Instructions for the "People search" page.
 #. TRANS: %%site.name%% is the name of the StatusNet site.
@@ -4107,92 +3825,88 @@ msgstr "Cerca persone"
 
 #. TRANS: Title for list page.
 #. TRANS: %s is a list.
-#, fuzzy, php-format
+#, php-format
 msgid "Public list %s"
-msgstr "Insieme delle etichette"
+msgstr "Lista pubblica %s"
 
 #. TRANS: Title for list page.
 #. TRANS: %1$s is a list, %2$d is a page number.
-#, fuzzy, php-format
+#, php-format
 msgid "Public list %1$s, page %2$d"
-msgstr "Risposte a %1$s, pagina %2$d"
+msgstr "Lista pubblica %1$s, pagina %2$d"
 
 #. TRANS: Message for anonymous users on list page.
 #. TRANS: This message contains Markdown links in the form [description](link).
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "Lists are how you sort similar people on %%site.name%%, a [micro-blogging]"
 "(http://en.wikipedia.org/wiki/Micro-blogging) service based on the Free "
 "Software [StatusNet](http://status.net/) tool. You can then easily keep "
 "track of what they are doing by subscribing to the list's timeline."
 msgstr ""
-"**%s** è un gruppo di utenti su %%%%site.name%%%%, un servizio di [microblog]"
-"(http://it.wikipedia.org/wiki/Microblogging) basato sul software libero "
-"[StatusNet](http://status.net/)."
+"Le liste ti serviranno a raggruppare persone con caratteristiche simili sul "
+"sito %%site.name%%, che è un servizio di [microblog](http://en.wikipedia.org/"
+"wiki/Micro-blogging) basato sul software libero [StatusNet](http://status."
+"net/). Iscrivendosi alla cronologia della lista ci si può facilmente tenere "
+"aggiornati su ciò che tali persone stanno facendo."
 
 #. TRANS: Client error displayed when a tagger is expected but not provided.
-#, fuzzy
 msgid "No tagger."
-msgstr "Nessuna etichetta."
+msgstr "Impossibile taggare."
 
 #. TRANS: Title for list of people listed by the user.
 #. TRANS: %1$s is a list, %2$s is a username.
-#, fuzzy, php-format
+#, php-format
 msgid "People listed in %1$s by %2$s"
-msgstr "Risposte a %1$s su %2$s!"
+msgstr "Persone aggiunte alla lista %1$s da %2$s"
 
 #. TRANS: Title for list of people listed by the user.
 #. TRANS: %1$s is a list, %2$s is a username, %2$s is a page number.
-#, fuzzy, php-format
+#, php-format
 msgid "People listed in %1$s by %2$s, page %3$d"
-msgstr "Risposte a %1$s, pagina %2$d"
+msgstr "Persone aggiunte alla lista %1$s da %2$s, pagina %3$d"
 
 #. TRANS: Addition in tag membership list for creator of a tag.
 #. TRANS: Addition in tag subscribers list for creator of a tag.
-#, fuzzy
 msgid "Creator"
-msgstr "Creato"
+msgstr "Autore"
 
 #. TRANS: Title for lists by a user page for a private tag.
-#, fuzzy
 msgid "Private lists by you"
-msgstr "Modifica il gruppo %s"
+msgstr "Le tue liste private"
 
 #. TRANS: Title for lists by a user page for a public tag.
-#, fuzzy
 msgid "Public lists by you"
-msgstr "Insieme delle etichette"
+msgstr "Le tue liste pubbliche"
 
 #. TRANS: Title for lists by a user page.
-#, fuzzy
 msgid "Lists by you"
-msgstr "Modifica il gruppo %s"
+msgstr "Le tue liste"
 
 #. TRANS: Title for lists by a user page.
 #. TRANS: %s is a user nickname.
 #, php-format
 msgid "Lists by %s"
-msgstr ""
+msgstr "Liste di %s"
 
 #. TRANS: Title for lists by a user page.
 #. TRANS: %1$s is a user nickname, %2$d is a page number.
-#, fuzzy, php-format
+#, php-format
 msgid "Lists by %1$s, page %2$d"
-msgstr "Messaggi etichettati con %1$s, pagina %2$d"
+msgstr "Liste di %1$s, pagina %2$d"
 
 #. TRANS: Client error displayed when trying view another user's private lists.
 msgid "You cannot view others' private lists"
-msgstr ""
+msgstr "Impossibile visualizzare le liste private di altri utenti."
 
 #. TRANS: Mode selector label.
-#, fuzzy
 msgid "Mode"
-msgstr "Modera"
+msgstr "Modalità"
 
 #. TRANS: Link text to show lists for user %s.
-#, fuzzy, php-format
+#, php-format
 msgid "Lists for %s"
-msgstr "Casella posta inviata di %s"
+msgstr "Liste per %s"
 
 #. TRANS: Fieldset legend.
 #. TRANS: Fieldset legend on gallery action page.
@@ -4201,22 +3915,19 @@ msgstr "Seleziona un'etichetta da filtrare"
 
 #. TRANS: Checkbox title.
 msgid "Show private tags."
-msgstr ""
+msgstr "Mostra i tag privati."
 
 #. TRANS: Checkbox label to show public tags.
-#, fuzzy
 msgctxt "LABEL"
 msgid "Public"
 msgstr "Pubblico"
 
 #. TRANS: Checkbox title.
-#, fuzzy
 msgid "Show public tags."
-msgstr "Nessuna etichetta."
+msgstr "Mostra tag pubblici."
 
 #. TRANS: Submit button text for tag filter form.
 #. TRANS: Submit button text on gallery action page.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Go"
 msgstr "Vai"
@@ -4224,85 +3935,92 @@ msgstr "Vai"
 #. TRANS: Message displayed for anonymous users on page that displays lists by a user.
 #. TRANS: This message contains Markdown links in the form [description](links).
 #. TRANS: %s is a tagger nickname.
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "These are lists created by **%s**. Lists are how you sort similar people on %"
 "%%%site.name%%%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
 "blogging) service based on the Free Software [StatusNet](http://status.net/) "
 "tool. You can easily keep track of what they are doing by subscribing to the "
-"tag's timeline."
+"list's timeline."
 msgstr ""
-"**%s** è un gruppo di utenti su %%%%site.name%%%%, un servizio di [microblog]"
-"(http://it.wikipedia.org/wiki/Microblogging) basato sul software libero "
-"[StatusNet](http://status.net/)."
+"Queste liste sono state create da **%s**. Le liste servono a raggruppare "
+"persone con caratteristiche simili sul sito %%site.name%%, che è un servizio "
+"di [microblog](http://en.wikipedia.org/wiki/Micro-blogging) basato sul "
+"software libero [StatusNet](http://status.net/). Iscrivendosi alla "
+"cronologia della lista ci si può facilmente tenere aggiornati su ciò che "
+"tali persone stanno facendo."
 
 #. TRANS: Message displayed on page that displays lists by a user when there are none.
 #. TRANS: This message contains Markdown links in the form [description](links).
 #. TRANS: %s is a tagger nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "%s has not created any [lists](%%%%doc.lists%%%%) yet."
-msgstr "Nessuno ha ancora scritto un messaggio con un [hashtag](%%doc.tags%%)."
+msgstr "%s non ha ancora creato alcuna [lista] (%%%%doc.lists%%%%)."
 
 #. TRANS: Page title. %s is a tagged user's nickname.
 #, php-format
 msgid "Lists with %s in them"
-msgstr ""
+msgstr "Liste che contengono %s"
 
 #. TRANS: Page title. %1$s is a tagged user's nickname, %2$s is a page number.
-#, fuzzy, php-format
+#, php-format
 msgid "Lists with %1$s, page %2$d"
-msgstr "Messaggi etichettati con %1$s, pagina %2$d"
+msgstr "Liste con %1$s, pagina %2$d"
 
 #. TRANS: Message displayed for anonymous users on page that displays lists for a user.
 #. TRANS: This message contains Markdown links in the form [description](links).
 #. TRANS: %s is a tagger nickname.
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "These are lists for **%s**. lists are how you sort similar people on %%%%"
 "site.name%%%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
 "blogging) service based on the Free Software [StatusNet](http://status.net/) "
 "tool. You can easily keep track of what they are doing by subscribing to the "
-"tag's timeline."
+"list's timeline."
 msgstr ""
-"**%s** è un gruppo di utenti su %%%%site.name%%%%, un servizio di [microblog]"
-"(http://it.wikipedia.org/wiki/Microblogging) basato sul software libero "
-"[StatusNet](http://status.net/)."
+"Queste sono liste per **%s**. Le liste servono a raggruppare persone con "
+"caratteristiche simili sul sito %%site.name%%, che è un servizio di "
+"[microblog](http://en.wikipedia.org/wiki/Micro-blogging) basato sul software "
+"libero [StatusNet](http://status.net/). Iscrivendosi alla cronologia della "
+"lista ci si può facilmente tenere aggiornati su ciò che tali persone stanno "
+"facendo."
 
 #. TRANS: Message displayed on page that displays lists a user was added to when there are none.
 #. TRANS: This message contains Markdown links in the form [description](links).
 #. TRANS: %s is a user nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "%s has not been [listed](%%%%doc.lists%%%%) by anyone yet."
-msgstr "Nessuno ha ancora scritto un messaggio con un [hashtag](%%doc.tags%%)."
+msgstr ""
+"%s non è ancora stato aggiunto in [lista](%%%%doc.lists%%%%) da nessuno."
 
 #. TRANS: Page title for list of list subscribers.
 #. TRANS: %1$s is a list, %2$s is a user nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "Subscribers to list %1$s by %2$s"
-msgstr "Abbonati a %s."
+msgstr "Iscritti alla lista %1$s da %2$s"
 
 #. TRANS: Page title for list of list subscribers.
 #. TRANS: %1$s is a list, %2$s is a user nickname, %3$d is a page number.
-#, fuzzy, php-format
+#, php-format
 msgid "Subscribers to list %1$s by %2$s, page %3$d"
-msgstr "Messaggi etichettati con %1$s, pagina %2$d"
+msgstr "Iscritti alla lista %1$s da %2$s, pagina %3$d"
 
 #. TRANS: Title for page that displays lists subscribed to by a user.
 #. TRANS: %s is a profile nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "Lists subscribed to by %s"
-msgstr "Abbonati a %s."
+msgstr "Liste alle quali %s si è iscritto"
 
 #. TRANS: Title for page that displays lists subscribed to by a user.
 #. TRANS: %1$s is a profile nickname, %2$d is a page number.
-#, fuzzy, php-format
+#, php-format
 msgid "Lists subscribed to by %1$s, page %2$d"
-msgstr "Abbonamenti di %1$s, pagina %2$d"
+msgstr "Liste alle quali %1$s si è iscritto, pagina %2$d"
 
 #. TRANS: Message displayed for anonymous users on page that displays lists subscribed to by a user.
 #. TRANS: This message contains Markdown links in the form [description](links).
 #. TRANS: %s is a profile nickname.
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "These are lists subscribed to by **%s**. Lists are how you sort similar "
 "people on %%%%site.name%%%%, a [micro-blogging](http://en.wikipedia.org/wiki/"
@@ -4310,14 +4028,17 @@ msgid ""
 "net/) tool. You can easily keep track of what they are doing by subscribing "
 "to the list's timeline."
 msgstr ""
-"**%s** è un gruppo di utenti su %%%%site.name%%%%, un servizio di [microblog]"
-"(http://it.wikipedia.org/wiki/Microblogging) basato sul software libero "
-"[StatusNet](http://status.net/)."
+"Queste sono le liste alle quali **%s** si è iscritto. Le liste servono a "
+"raggruppare persone con caratteristiche simili sul sito %%site.name%%, che è "
+"un servizio di [microblog](http://en.wikipedia.org/wiki/Micro-blogging) "
+"basato sul software libero [StatusNet](http://status.net/). Iscrivendosi "
+"alla cronologia della lista ci si può facilmente tenere aggiornati su ciò "
+"che tali persone stanno facendo."
 
 #. TRANS: Page title for AJAX form return when a disabling a plugin.
 msgctxt "plugin"
 msgid "Disabled"
-msgstr ""
+msgstr "Disattivato"
 
 #. TRANS: Client error displayed when trying to use another method than POST.
 #. TRANS: Do not translate POST.
@@ -4328,22 +4049,19 @@ msgid "This action only accepts POST requests."
 msgstr "Quest'azione accetta solo richieste POST."
 
 #. TRANS: Client error displayed when trying to enable or disable a plugin without access rights.
-#, fuzzy
 msgid "You cannot administer plugins."
-msgstr "Non puoi eliminare utenti."
+msgstr "Non è possibile amministrare i plugin."
 
 #. TRANS: Client error displayed when trying to enable or disable a non-existing plugin.
-#, fuzzy
 msgid "No such plugin."
-msgstr "Pagina inesistente."
+msgstr "Plugin inesistente."
 
 #. TRANS: Page title for AJAX form return when enabling a plugin.
 msgctxt "plugin"
 msgid "Enabled"
-msgstr ""
+msgstr "Attivato"
 
 #. TRANS: Tab and title for plugins admin panel.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Plugins"
 msgstr "Plugin"
@@ -4354,44 +4072,35 @@ msgid ""
 "\"http://status.net/wiki/Plugins\">online plugin documentation</a> for more "
 "details."
 msgstr ""
+"Plugin aggiuntivi possono essere abilitati e configurati manualmente. "
+"Consultare il <a href=\"http://status.net/wiki/Plugins\">plugin di "
+"documentazione online</a> per maggiori dettagli."
 
 #. TRANS: Admin form section header
-#, fuzzy
 msgid "Default plugins"
-msgstr "Lingua predefinita"
+msgstr "Plugin predefiniti"
 
 #. TRANS: Text displayed on plugin admin page when no plugin are enabled.
 msgid ""
 "All default plugins have been disabled from the site's configuration file."
 msgstr ""
-
-#. TRANS: Client error displayed if the notice posted has too many characters.
-msgid "Invalid notice content."
-msgstr "Contenuto del messaggio non valido."
-
-#. TRANS: Exception thrown if a notice's license is not compatible with the StatusNet site license.
-#. TRANS: %1$s is the notice license, %2$s is the StatusNet site's license.
-#, fuzzy, php-format
-msgid "Notice license \"%1$s\" is not compatible with site license \"%2$s\"."
-msgstr ""
-"La licenza \"%1$s\" del messaggio non è compatibile con la licenza del sito "
-"\"%2$s\"."
+"Tutti i plugin predefiniti sono stati disabilitati dal file di "
+"configurazione del sito."
 
 #. TRANS: Client error displayed when trying to add an unindentified field to profile.
 #. TRANS: %s is a field name.
 #, php-format
 msgid "Unidentified field %s."
-msgstr ""
+msgstr "Campo %s non identificato."
 
 #. TRANS: Page title.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Search results"
-msgstr "Cerca nel sito"
+msgstr "Risultati della ricerca"
 
 #. TRANS: Error message in case a search is shorter than three characters.
 msgid "The search string must be at least 3 characters long."
-msgstr ""
+msgstr "La stringa di ricerca deve essere lunga almeno 3 caratteri."
 
 #. TRANS: Page title for profile settings.
 msgid "Profile settings"
@@ -4411,10 +4120,8 @@ msgstr "Informazioni sul profilo"
 #. TRANS: Tooltip for field label in form for profile settings.
 #. TRANS: Field title on account registration page.
 #. TRANS: Field title on group edit form.
-#, fuzzy
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
-msgstr ""
-"1-64 lettere minuscole o numeri, senza spazi o simboli di punteggiatura"
+msgstr "1-64 lettere minuscole o numeri, senza punteggiatura o spazi."
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Field label on account registration page.
@@ -4431,9 +4138,8 @@ msgstr "Pagina web"
 
 #. TRANS: Tooltip for field label in form for profile settings.
 #. TRANS: Field title on account registration page.
-#, fuzzy
 msgid "URL of your homepage, blog, or profile on another site."
-msgstr "URL della tua pagina web, blog o profilo su un altro sito"
+msgstr "URL della tua pagina web, blog o profilo su un altro sito."
 
 #. TRANS: Tooltip for field label in form for profile settings. Plural
 #. TRANS: is decided by the number of characters available for the
@@ -4441,17 +4147,16 @@ msgstr "URL della tua pagina web, blog o profilo su un altro sito"
 #. TRANS: Text area title in form for account registration. Plural
 #. TRANS: is decided by the number of characters available for the
 #. TRANS: biography (%d).
-#, fuzzy, php-format
+#, php-format
 msgid "Describe yourself and your interests in %d character."
 msgid_plural "Describe yourself and your interests in %d characters."
-msgstr[0] "Descriviti assieme ai tuoi interessi in %d caratteri"
-msgstr[1] "Descriviti assieme ai tuoi interessi in %d caratteri"
+msgstr[0] "Descrivi te stesso e i tuoi interessi in %d caratteri"
+msgstr[1] "Descrivi te stesso e i tuoi interessi in %d caratteri"
 
 #. TRANS: Tooltip for field label in form for profile settings.
 #. TRANS: Text area title on account registration page.
-#, fuzzy
 msgid "Describe yourself and your interests."
-msgstr "Descrivi te e i tuoi interessi"
+msgstr "Descrivi te stesso ed i tuoi interessi."
 
 #. TRANS: Text area label in form for profile settings where users can provide
 #. TRANS: their biography.
@@ -4468,34 +4173,32 @@ msgstr "Ubicazione"
 
 #. TRANS: Tooltip for field label in form for profile settings.
 #. TRANS: Field title on account registration page.
-#, fuzzy
 msgid "Where you are, like \"City, State (or Region), Country\"."
-msgstr "Dove ti trovi, tipo \"città, regione, stato\""
+msgstr "Dove ti trovi, ad esempio \"città, regione, stato\"."
 
 #. TRANS: Checkbox label in form for profile settings.
 msgid "Share my current location when posting notices"
 msgstr "Condividi la mia posizione attuale quando invio messaggi"
 
 #. TRANS: Field label in form for profile settings.
+#. TRANS: Title for group tag cloud section.
+#. TRANS: %s is a group name.
 msgid "Tags"
 msgstr "Etichette"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#, fuzzy
 msgid ""
 "Tags for yourself (letters, numbers, -, ., and _), comma- or space- "
 "separated."
-msgstr ""
-"Le tue etichette (lettere, numeri, -, . e _), separate da virgole o spazi"
+msgstr "Tag per te (lettere, numeri, -, ., _), separati da virgole o spazi."
 
 #. TRANS: Dropdownlist label in form for profile settings.
 msgid "Language"
 msgstr "Lingua"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#, fuzzy
 msgid "Preferred language."
-msgstr "Lingua preferita"
+msgstr "Lingua preferita."
 
 #. TRANS: Dropdownlist label in form for profile settings.
 msgid "Timezone"
@@ -4506,40 +4209,40 @@ msgid "What timezone are you normally in?"
 msgstr "In che fuso orario risiedi solitamente?"
 
 #. TRANS: Checkbox label in form for profile settings.
-#, fuzzy
 msgid ""
-"Automatically subscribe to whoever subscribes to me (best for non-humans)."
+"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)"
+"umani)."
 
 #. TRANS: Dropdown field label on profile settings, for what policies to apply when someone else tries to subscribe to your updates.
-#, fuzzy
 msgid "Subscription policy"
-msgstr "Abbonamenti"
+msgstr "Norme relative alle iscrizioni"
 
 #. TRANS: Dropdown field option for following policy.
 msgid "Let anyone follow me"
-msgstr ""
+msgstr "Lasciate che nessuno mi segua"
 
 #. TRANS: Dropdown field option for following policy.
 msgid "Ask me first"
-msgstr ""
+msgstr "Chiedimi prima conferma"
 
 #. TRANS: Dropdown field title on group edit form.
 msgid "Whether other users need your permission to follow your updates."
 msgstr ""
+"Se altri utenti hanno bisogno del tuo permesso per seguire i tuoi "
+"aggiornamenti."
 
 #. TRANS: Checkbox label in profile settings.
 msgid "Make updates visible only to my followers"
-msgstr ""
+msgstr "Rendi visibili i miei aggiornamenti solo ai miei iscritti"
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Plural form is used based on the maximum number of allowed
 #. TRANS: characters for the biography (%d).
 #. TRANS: Form validation error on registration page when providing too long a bio text.
 #. TRANS: %d is the maximum number of characters for bio; used for plural.
-#, fuzzy, php-format
+#, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
 msgstr[0] "La biografia è troppo lunga (max %d caratteri)."
@@ -4551,7 +4254,6 @@ msgid "Timezone not selected."
 msgstr "Fuso orario non selezionato"
 
 #. TRANS: Validation error in form for profile settings.
-#, fuzzy
 msgid "Language is too long (maximum 50 characters)."
 msgstr "La lingua è troppo lunga (max 50 caratteri)."
 
@@ -4561,35 +4263,28 @@ msgstr "La lingua è troppo lunga (max 50 caratteri)."
 #. TRANS: %s is the invalid tag.
 #. TRANS: Error displayed if a given tag is invalid.
 #. TRANS: %s is the invalid tag.
-#, fuzzy, php-format
+#, php-format
 msgid "Invalid tag: \"%s\"."
-msgstr "Etichetta non valida: \"%s\""
+msgstr "Tag non valido: \"%s\"."
 
 #. TRANS: Server error thrown when user profile settings could not be updated to
 #. TRANS: automatically subscribe to any subscriber.
-#, fuzzy
 msgid "Could not update user for autosubscribe or subscribe_policy."
-msgstr "Impossibile aggiornare l'utente per auto-abbonarsi."
+msgstr ""
+"Impossibile aggiornare l'utente per auto-iscrizione o norme_iscrizione."
 
 #. TRANS: Server error thrown when user profile location preference settings could not be updated.
-#, fuzzy
 msgid "Could not save location prefs."
-msgstr "Impossibile salvare le preferenze della posizione."
+msgstr "Impossibile salvare le preferenze sul luogo."
 
 #. TRANS: Server error thrown when user profile settings tags could not be saved.
 msgid "Could not save tags."
 msgstr "Impossibile salvare le etichette."
 
-#. TRANS: Confirmation shown when user profile settings are saved.
-#. TRANS: Message after successful saving of administrative settings.
-msgid "Settings saved."
-msgstr "Impostazioni salvate."
-
 #. TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
 #. TRANS: Page title for page where a user account can be restored from backup.
-#, fuzzy
 msgid "Restore account"
-msgstr "Crea un account"
+msgstr "Ripristina account"
 
 #. TRANS: Client error displayed when requesting a public timeline page beyond the page limit.
 #. TRANS: %s is the page limit.
@@ -4598,8 +4293,8 @@ msgid "Beyond the page limit (%s)."
 msgstr "Oltre il limite della pagina (%s)."
 
 #. TRANS: Server error displayed when a public timeline cannot be retrieved.
-msgid "Could not retrieve public stream."
-msgstr "Impossibile recuperare l'attività pubblica."
+msgid "Could not retrieve public timeline."
+msgstr "Impossibile recuperare la cronologia pubblica."
 
 #. TRANS: Title for all public timeline pages but the first.
 #. TRANS: %d is the page number.
@@ -4613,16 +4308,20 @@ msgid "Public timeline"
 msgstr "Attività pubblica"
 
 #. TRANS: Link description for public timeline feed.
-msgid "Public Stream Feed (RSS 1.0)"
-msgstr "Feed dell'attività pubblica (RSS 1.0)"
+msgid "Public Timeline Feed (Activity Streams JSON)"
+msgstr "Feed della cronologia pubblica (Activity Streams JSON)"
 
 #. TRANS: Link description for public timeline feed.
-msgid "Public Stream Feed (RSS 2.0)"
-msgstr "Feed dell'attività pubblica (RSS 2.0)"
+msgid "Public Timeline Feed (RSS 1.0)"
+msgstr "Feed della cronologia pubblica (RSS 1.0)"
 
 #. TRANS: Link description for public timeline feed.
-msgid "Public Stream Feed (Atom)"
-msgstr "Feed dell'attività pubblica (Atom)"
+msgid "Public Timeline Feed (RSS 2.0)"
+msgstr "Feed della cronologia pubblica (RSS 2.0)"
+
+#. TRANS: Link description for public timeline feed.
+msgid "Public Timeline Feed (Atom)"
+msgstr "Feed della cronologia pubblica (Atom)"
 
 #. TRANS: Text displayed for public feed when there are no public notices.
 #, php-format
@@ -4670,52 +4369,10 @@ msgstr ""
 "wiki/Microblogging) basato sul software libero [StatusNet](http://status."
 "net/)."
 
-#. TRANS: Title for page with public list cloud.
-#, fuzzy
-msgid "Public list cloud"
-msgstr "Insieme delle etichette"
-
-#. TRANS: Page notice for page with public list cloud.
-#. TRANS: %s is a StatusNet sitename.
-#, fuzzy, php-format
-msgid "These are largest lists on %s"
-msgstr "Queste sono le etichette più usate e recenti su %s "
-
-#. TRANS: Empty list message on page with public list cloud.
-#. TRANS: This message contains Markdown links in the form [description](link).
-#, fuzzy, php-format
-msgid "No one has [listed](%%doc.tags%%) anyone yet."
-msgstr "Nessuno ha ancora scritto un messaggio con un [hashtag](%%doc.tags%%)."
-
-#. TRANS: Additional empty list message on page with public list cloud for logged in users.
-#, fuzzy
-msgid "Be the first to list someone!"
-msgstr "Scrivilo tu!"
-
-#. TRANS: Additional empty list message on page with public list cloud for anonymous users.
-#. TRANS: This message contains Markdown links in the form [description](link).
-#, fuzzy, php-format
-msgid ""
-"Why not [register an account](%%action.register%%) and be the first to list "
-"someone!"
-msgstr "Perché non [crei un accout](%%action.register%%) e ne scrivi uno tu!"
-
-#. TRANS: DT element on on page with public list cloud.
-#, fuzzy
-msgid "List cloud"
-msgstr "Metodo delle API non trovato."
-
-#. TRANS: Link title for number of listed people. %d is the number of listed people.
-#, php-format
-msgid "1 person listed"
-msgid_plural "%d people listed"
-msgstr[0] ""
-msgstr[1] ""
-
 #. TRANS: Public RSS feed description. %s is the StatusNet site name.
-#, fuzzy, php-format
+#, php-format
 msgid "%s updates from everyone."
-msgstr "Aggiornamenti di %s da tutti!"
+msgstr "Aggiornamenti di %s da parte di tutti."
 
 #. TRANS: Title for public tag cloud.
 msgid "Public tag cloud"
@@ -4723,9 +4380,9 @@ msgstr "Insieme delle etichette"
 
 #. TRANS: Instructions (more used like an explanation/header).
 #. TRANS: %s is the StatusNet sitename.
-#, fuzzy, php-format
+#, php-format
 msgid "These are most popular recent tags on %s"
-msgstr "Queste sono le etichette più usate e recenti su %s "
+msgstr "Questi sono i tag recenti più popolari su %s"
 
 #. TRANS: This message contains a Markdown URL. The link description is between
 #. TRANS: square brackets, and the link between parentheses. Do not separate "]("
@@ -4808,7 +4465,6 @@ msgid "Recover"
 msgstr "Recupera"
 
 #. TRANS: Button text on password recovery page.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Recover"
 msgstr "Recupera"
@@ -4827,38 +4483,22 @@ msgid "Password recovery requested"
 msgstr "Richiesta password di ripristino"
 
 #. TRANS: Title for password recovery page in password saved mode.
-#, fuzzy
 msgid "Password saved"
-msgstr "Password salvata."
+msgstr "Password salvata"
 
 #. TRANS: Title for field label for password reset form.
-#, fuzzy
 msgid "6 or more characters, and do not forget it!"
 msgstr "6 o più caratteri, e non dimenticarla!"
 
 #. TRANS: Button text for password reset form.
-#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Reset"
-msgstr "Reimposta"
+msgstr "Reset"
 
 #. TRANS: Form instructions for password recovery form.
 msgid "Enter a nickname or email address."
 msgstr "Inserisci un soprannome o un indirizzo email."
 
-#. TRANS: Information on password recovery form if no known username or e-mail address was specified.
-msgid "No user with that email address or username."
-msgstr "Nessun utente con quell'email o nome utente."
-
-#. TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.
-msgid "No registered email address for that user."
-msgstr "Nessun indirizzo email registrato per quell'utente."
-
-#. TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.
-msgid "Error saving address confirmation."
-msgstr "Errore nel salvare la conferma dell'indirizzo."
-
 #. TRANS: User notification after an e-mail with instructions was sent from the password recovery form.
 msgid ""
 "Instructions for recovering your password have been sent to the email "
@@ -4872,7 +4512,6 @@ msgid "Unexpected password reset."
 msgstr "Ripristino della password inaspettato."
 
 #. TRANS: Reset password form validation error message.
-#, fuzzy
 msgid "Password must be 6 characters or more."
 msgstr "La password deve essere lunga almeno 6 caratteri."
 
@@ -4890,15 +4529,14 @@ msgid "New password successfully saved. You are now logged in."
 msgstr "Nuova password salvata con successo. Hai effettuato l'accesso."
 
 #. TRANS: Client exception thrown when no ID parameter was provided.
-#, fuzzy
 msgid "No id parameter."
-msgstr "Nessun argomento ID."
+msgstr "Nessun parametro id."
 
 #. TRANS: Client exception thrown when an invalid ID parameter was provided for a file.
 #. TRANS: %d is the provided ID for which the file is not present (number).
-#, fuzzy, php-format
+#, php-format
 msgid "No such file \"%d\"."
-msgstr "Nessun file."
+msgstr "File \"%d\" inesistente."
 
 #. TRANS: Client error displayed when trying to register to an invite-only site without an invitation.
 msgid "Sorry, only invited people can register."
@@ -4913,7 +4551,6 @@ msgid "Registration successful"
 msgstr "Registrazione riuscita"
 
 #. TRANS: Title for registration page.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Register"
 msgstr "Registrati"
@@ -4923,7 +4560,6 @@ msgid "Registration not allowed."
 msgstr "Registrazione non consentita."
 
 #. TRANS: Form validation error displayed when trying to register without agreeing to the site license.
-#, fuzzy
 msgid "You cannot register if you do not agree to the license."
 msgstr "Non puoi registrarti se non accetti la licenza."
 
@@ -4936,39 +4572,33 @@ msgid "Invalid username or password."
 msgstr "Nome utente o password non valido."
 
 #. TRANS: Page notice on registration page.
-#, fuzzy
 msgid ""
 "With this form you can create a new account. You can then post notices and "
 "link up to friends and colleagues."
 msgstr ""
-"Attraverso questo modulo puoi creare un nuovo account con cui potrai "
+"Attraverso questo modulo puoi creare un nuovo account, con cui potrai "
 "successivamente inviare messaggi e metterti in contatto con i tuoi amici e "
-"colleghi. "
+"colleghi."
 
 #. TRANS: Field label on account registration page. In this field the password has to be entered a second time.
-#, fuzzy
 msgctxt "PASSWORD"
 msgid "Confirm"
 msgstr "Conferma"
 
 #. TRANS: Field label on account registration page.
-#, fuzzy
 msgctxt "LABEL"
 msgid "Email"
 msgstr "Email"
 
 #. TRANS: Field title on account registration page.
-#, fuzzy
 msgid "Used only for updates, announcements, and password recovery."
-msgstr "Usata solo per aggiornamenti, annunci e recupero password"
+msgstr "Usata solo per aggiornamenti, annunci e recupero password."
 
 #. TRANS: Field title on account registration page.
-#, fuzzy
 msgid "Longer name, preferably your \"real\" name."
-msgstr "Nome completo, preferibilmente il tuo \"vero\" nome"
+msgstr "Nome completo, preferibilmente il tuo \"vero\" nome."
 
 #. TRANS: Button text to register a user on account registration page.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Register"
 msgstr "Registrati"
@@ -5050,87 +4680,11 @@ msgstr ""
 "(Dovresti ricevere, entro breve, un messaggio email con istruzioni su come "
 "confermare il tuo indirizzo email.)"
 
-#. TRANS: Page notice for remote subscribe. This message contains Markdown links.
-#. TRANS: Ensure to keep the correct markup of [link description](link).
-#, php-format
-msgid ""
-"To subscribe, you can [login](%%action.login%%), or [register](%%action."
-"register%%) a new  account. If you already have an account  on a [compatible "
-"microblogging site](%%doc.openmublog%%),  enter your profile URL below."
-msgstr ""
-"Per abbonarti puoi [eseguire l'accesso](%%action.login%%) oppure [creare](%%"
-"action.register%%) un nuovo account. Se ne possiedi già uno su un [sito di "
-"microblog compatibile](%%doc.openmublog%%), inserisci l'indirizzo del tuo "
-"profilo qui di seguito."
-
-#. TRANS: Page title for Remote subscribe.
-msgid "Remote subscribe"
-msgstr "Abbonamento remoto"
-
-#. TRANS: Field legend on page for remote subscribe.
-msgid "Subscribe to a remote user"
-msgstr "Abbonati a un utente remoto"
-
-#. TRANS: Field label on page for remote subscribe.
-msgid "User nickname"
-msgstr "Soprannome dell'utente"
-
-#. TRANS: Field title on page for remote subscribe.
-#, fuzzy
-msgid "Nickname of the user you want to follow."
-msgstr "Soprannome dell'utente che vuoi seguire"
-
-#. TRANS: Field label on page for remote subscribe.
-msgid "Profile URL"
-msgstr "URL del profilo"
-
-#. TRANS: Field title on page for remote subscribe.
-#, fuzzy
-msgid "URL of your profile on another compatible microblogging service."
-msgstr "URL del tuo profilo su un altro servizio di microblog compatibile"
-
-#. TRANS: Button text on page for remote subscribe.
-#. TRANS: Link text for link that will subscribe to a remote profile.
-#. TRANS: Button text to subscribe to a user.
-#. TRANS: Button text for subscribing to a list.
-#, fuzzy
-msgctxt "BUTTON"
-msgid "Subscribe"
-msgstr "Abbonati"
-
-#. TRANS: Form validation error on page for remote subscribe when an invalid profile URL was provided.
-#, fuzzy
-msgid "Invalid profile URL (bad format)."
-msgstr "URL del profilo non valido (formato errato)"
-
-#. TRANS: Form validation error on page for remote subscribe when no the provided profile URL
-#. TRANS: does not contain expected data.
-msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
-msgstr ""
-"Non è un URL di profilo valido (nessun documento YADIS o XRDS definito non "
-"valido)."
-
-#. TRANS: Form validation error on page for remote subscribe.
-#, fuzzy
-msgid "That is a local profile! Login to subscribe."
-msgstr "Quello è un profilo locale! Accedi per abbonarti."
-
-#. TRANS: Form validation error on page for remote subscribe when the remote service is not providing a request token.
-#, fuzzy
-msgid "Could not get a request token."
-msgstr "Impossibile ottenere un token di richiesta."
-
-#. TRANS: Client error displayed when trying to (un)list an OMB 0.1 remote profile.
-#, fuzzy
-msgid "You cannot (un)list an OMB 0.1 remote profile with this action."
-msgstr ""
-"Non è possibile abbonarsi a un profilo remoto OMB 0.1 con quest'azione."
-
 #. TRANS: Client error displayed when an unknown error occurs while delisting a user.
 #. TRANS: %s is a username.
 #, php-format
 msgid "There was an unexpected error while delisting %s."
-msgstr ""
+msgstr "Si è verificato un errore imprevisto nel togliere %s dalla lista."
 
 #. TRANS: Client error displayed when an unknown error occurs while listing a user.
 #. TRANS: %s is a profile URL.
@@ -5139,11 +4693,12 @@ msgid ""
 "There was a problem listing %s. The remote server is probably not responding "
 "correctly, please try retrying later."
 msgstr ""
+"Si è verificato un problema nell'aggiungere %s alla lista. Il server remoto "
+"probabilmente non risponde correttamente. Si prega di riprovare più tardi."
 
 #. TRANS: Title after removing a user from a list.
-#, fuzzy
 msgid "Unlisted"
-msgstr "Licenza"
+msgstr "Non in lista"
 
 #. TRANS: Client error displayed when trying to repeat a notice while not logged in.
 msgid "Only logged-in users can repeat notices."
@@ -5178,6 +4733,12 @@ msgstr "Risposte a %s"
 msgid "Replies to %1$s, page %2$d"
 msgstr "Risposte a %1$s, pagina %2$d"
 
+#. TRANS: Link for feed with replies for a user.
+#. TRANS: %s is a user nickname.
+#, php-format
+msgid "Replies feed for %s (Activity Streams JSON)"
+msgstr "Feed di risposta per %s (Activity Streams JSON)"
+
 #. TRANS: Link for feed with replies for a user.
 #. TRANS: %s is a user nickname.
 #, php-format
@@ -5221,30 +4782,29 @@ msgid ""
 "You can try to [nudge %1$s](../%2$s) or [post something to them](%%%%action."
 "newnotice%%%%?status_textarea=%3$s)."
 msgstr ""
-"[Scrivi qualche cosa](%%%%action.newnotice%%%%?status_textarea=%s) su questo "
-"argomento!"
+"Puoi provare a [trillare a %1$s](../%2$s) oppure puoi [scrivere loro "
+"qualcosa](%%%%action.newnotice%%%%?status_textarea=%3$s)."
 
 #. TRANS: RSS reply feed description.
 #. TRANS: %1$s is a user nickname, %2$s is the StatusNet site name.
-#, fuzzy, php-format
+#, php-format
 msgid "Replies to %1$s on %2$s."
-msgstr "Risposte a %1$s su %2$s!"
+msgstr "Risposte a %1$s sul sito %2$s."
 
 #. TRANS: Client exception displayed when trying to restore an account while not logged in.
-#, fuzzy
 msgid "Only logged-in users can restore their account."
-msgstr "Solo gli utenti collegati possono ripetere i messaggi."
+msgstr ""
+"Solo gli utenti che hanno effettuato l'accesso possono ripristinare il "
+"proprio account."
 
 #. TRANS: Client exception displayed when trying to restore an account without having restore rights.
-#, fuzzy
 msgid "You may not restore your account."
-msgstr "Non hai ancora registrato alcuna applicazione."
+msgstr "Non puoi ripristinare il tuo account."
 
 #. TRANS: Client exception displayed trying to restore an account while something went wrong uploading a file.
 #. TRANS: Client exception. No file; probably just a non-AJAX submission.
-#, fuzzy
 msgid "No uploaded file."
-msgstr "Carica file"
+msgstr "Nessun file caricato."
 
 #. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
@@ -5282,37 +4842,40 @@ msgstr "Errore di sistema nel caricare il file."
 
 #. TRANS: Client exception thrown when a feed is not an Atom feed.
 #. TRANS: Client exception thrown when an imported feed is not an Atom feed.
-#, fuzzy
 msgid "Not an Atom feed."
-msgstr "Tutti i membri"
+msgstr "Non è un feed Atom."
 
 #. TRANS: Success message when a feed has been restored.
 msgid ""
 "Feed has been restored. Your old posts should now appear in search and your "
 "profile page."
 msgstr ""
+"I feed sono stati ripristinati. I tuoi vecchi post dovrebbero apparire nella "
+"ricerca e nella pagina del tuo profilo."
 
 #. TRANS: Message when a feed restore is in progress.
 msgid "Feed will be restored. Please wait a few minutes for results."
 msgstr ""
+"I feed sono stati ripristinati. Si prega di attendere alcuni minuti per i "
+"risultati."
 
 #. TRANS: Form instructions for feed restore.
 msgid ""
-"You can upload a backed-up stream in <a href=\"http://activitystrea.ms/"
+"You can upload a backed-up timeline in <a href=\"http://activitystrea.ms/"
 "\">Activity Streams</a> format."
 msgstr ""
+"È possibile caricare una cronologia di backup in formato <a href=\"http://"
+"activitystrea.ms/\">Activity Streams</a> ."
 
 #. TRANS: Title for submit button to confirm upload of a user backup file for account restore.
-#, fuzzy
 msgid "Upload the file"
-msgstr "Carica file"
+msgstr "Carica il file"
 
 #. TRANS: Client error displayed when trying to revoke a role without having the right to do that.
 msgid "You cannot revoke user roles on this site."
 msgstr "Non puoi revocare i ruoli degli utenti su questo sito."
 
 #. TRANS: Client error displayed when trying to revoke a role that is not set.
-#, fuzzy
 msgid "User does not have this role."
 msgstr "L'utente non ricopre questo ruolo."
 
@@ -5332,18 +4895,17 @@ msgstr "L'utente è già nella \"sandbox\"."
 
 #. TRANS: Client error displayed when trying to list a profile with an invalid list.
 #. TRANS: %s is the invalid list name.
-#, fuzzy, php-format
+#, php-format
 msgid "Not a valid list: %s."
-msgstr "Non è un'etichetta valida di persona: %s."
+msgstr "Non è un elenco valido: %s."
 
 #. TRANS: Page title for page showing self tags.
 #. TRANS: %1$s is a tag, %2$d is a page number.
-#, fuzzy, php-format
+#, php-format
 msgid "Users self-tagged with %1$s, page %2$d"
-msgstr "Utenti auto-etichettati con %1$s - pagina %2$d"
+msgstr "Utenti auto-taggati con %1$s, pagina %2$d"
 
 #. TRANS: Title for the sessions administration panel.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Sessions"
 msgstr "Sessioni"
@@ -5353,7 +4915,6 @@ msgid "Session settings for this StatusNet site"
 msgstr "Impostazioni sessione per questo sito StatusNet"
 
 #. TRANS: Fieldset legend on the sessions administration panel.
-#, fuzzy
 msgctxt "LEGEND"
 msgid "Sessions"
 msgstr "Sessioni"
@@ -5365,9 +4926,8 @@ msgstr "Gestione sessioni"
 
 #. TRANS: Checkbox title on the sessions administration panel.
 #. TRANS: Indicates if StatusNet should handle session administration.
-#, fuzzy
 msgid "Handle sessions ourselves."
-msgstr "Indica se gestire autonomamente le sessioni"
+msgstr "Gestire autonomamente le sessioni."
 
 #. TRANS: Checkbox label on the sessions administration panel.
 #. TRANS: Indicates if StatusNet should write session debugging output.
@@ -5375,12 +4935,10 @@ msgid "Session debugging"
 msgstr "Debug delle sessioni"
 
 #. TRANS: Checkbox title on the sessions administration panel.
-#, fuzzy
 msgid "Enable debugging output for sessions."
-msgstr "Abilita il debug per le sessioni"
+msgstr "Abilita il debug per le sessioni."
 
 #. TRANS: Title for submit button on the sessions administration panel.
-#, fuzzy
 msgid "Save session settings"
 msgstr "Salva impostazioni di accesso"
 
@@ -5395,18 +4953,17 @@ msgstr "Profilo applicazione"
 #. TRANS: Information output on an OAuth application page.
 #. TRANS: %1$s is the application creator, %2$s is "read-only" or "read-write",
 #. TRANS: %3$d is the number of users using the OAuth application.
-#, fuzzy, php-format
+#, php-format
 msgid "Created by %1$s - %2$s access by default - %3$d user"
 msgid_plural "Created by %1$s - %2$s access by default - %3$d users"
-msgstr[0] "creata da %1$s - %2$s accessi predefiniti - %3$d utenti"
-msgstr[1] "creata da %1$s - %2$s accessi predefiniti - %3$d utenti"
+msgstr[0] "Creata da %1$s - accesso %2$s predefinito - %3$d utente"
+msgstr[1] "Creata da %1$s - accesso %2$s predefinito - %3$d utenti"
 
 #. TRANS: Header on the OAuth application page.
 msgid "Application actions"
 msgstr "Azioni applicazione"
 
 #. TRANS: Link text to edit application on the OAuth application page.
-#, fuzzy
 msgctxt "EDITAPP"
 msgid "Edit"
 msgstr "Modifica"
@@ -5420,14 +4977,33 @@ msgstr "Reimposta chiave e segreto"
 msgid "Application info"
 msgstr "Informazioni applicazione"
 
+#. TRANS: Field label on application page.
+msgid "Consumer key"
+msgstr "Chiave consumatore"
+
+#. TRANS: Field label on application page.
+msgid "Consumer secret"
+msgstr "Segreto consumatore"
+
+#. TRANS: Field label on application page.
+msgid "Request token URL"
+msgstr "URL token di richiesta"
+
+#. TRANS: Field label on application page.
+msgid "Access token URL"
+msgstr "URL token di accesso"
+
+#. TRANS: Field label on application page.
+msgid "Authorize URL"
+msgstr "URL di autorizzazione"
+
 #. TRANS: Note on the OAuth application page about signature support.
-#, fuzzy
 msgid ""
 "Note: HMAC-SHA1 signatures are supported. The plaintext signature method is "
 "not supported."
 msgstr ""
-"Nota: sono supportate firme HMAC-SHA1, ma non è supportato il metodo di "
-"firma di testo in chiaro."
+"Nota: sono supportate firme HMAC-SHA1. Il metodo di firma in chiaro non è "
+"supportato."
 
 #. TRANS: Text in confirmation dialog to reset consumer key and secret for an OAuth application.
 msgid "Are you sure you want to reset your consumer key and secret?"
@@ -5443,6 +5019,11 @@ msgstr "Messaggi preferiti di %1$s, pagina %2$d"
 msgid "Could not retrieve favorite notices."
 msgstr "Impossibile recuperare i messaggi preferiti."
 
+#. TRANS: Feed link text. %s is a username.
+#, php-format
+msgid "Feed for favorites of %s (Activity Streams JSON)"
+msgstr "Feed per i preferiti di %s (Activity Streams JSON)"
+
 #. TRANS: Feed link text. %s is a username.
 #, php-format
 msgid "Feed for favorites of %s (RSS 1.0)"
@@ -5503,6 +5084,11 @@ msgstr "Gruppo %s"
 msgid "%1$s group, page %2$d"
 msgstr "Gruppi di %1$s, pagina %2$d"
 
+#. TRANS: Tooltip for feed link. %s is a group nickname.
+#, php-format
+msgid "Notice feed for %s group (Activity Streams JSON)"
+msgstr "Feed delle notifiche per il gruppo %s (Activity Streams JSON)"
+
 #. TRANS: Tooltip for feed link. %s is a group nickname.
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
@@ -5523,44 +5109,8 @@ msgstr "Feed dei messaggi per il gruppo %s (Atom)"
 msgid "FOAF for %s group"
 msgstr "FOAF per il gruppo %s"
 
-#. TRANS: Header for mini list of group members on a group page (h2).
-msgid "Members"
-msgstr "Membri"
-
-#. TRANS: Description for mini list of group members on a group page when the group has no members.
-#. TRANS: Content of "Listed" page if there are no listed users.
-#. TRANS: Content of "People following tag x" if there are no subscribed users.
-#. TRANS: Empty list message for tags.
-#. TRANS: Text for user subscription statistics if the user has no subscriptions.
-#. TRANS: Text for user subscriber statistics if user has no subscribers.
-#. TRANS: Text for user user group membership statistics if user is not a member of any group.
-#. TRANS: Default content for section/sidebar widget.
-msgid "(None)"
-msgstr "(nessuno)"
-
-#. TRANS: Link to all group members from mini list of group members if group has more than n members.
-msgid "All members"
-msgstr "Tutti i membri"
-
-#. TRANS: Header for group statistics on a group page (h2).
-#. TRANS: H2 text for user statistics.
-msgid "Statistics"
-msgstr "Statistiche"
-
-#. TRANS: Label for group creation date.
-#, fuzzy
-msgctxt "LABEL"
-msgid "Created"
-msgstr "Creato"
-
-#. TRANS: Label for member count in statistics on group page.
-#, fuzzy
-msgctxt "LABEL"
-msgid "Members"
-msgstr "Membri"
-
 #. TRANS: Notice on group pages for anonymous users for StatusNet sites that accept new registrations.
-#. TRANS: **%s** is the group alias, %%%%site.name%%%% is the site name,
+#. TRANS: %s is the group name, %%%%site.name%%%% is the site name,
 #. TRANS: %%%%action.register%%%% is the URL for registration, %%%%doc.help%%%% is a URL to help.
 #. TRANS: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
 #, php-format
@@ -5579,24 +5129,19 @@ msgstr ""
 "altri! ([Maggiori informazioni](%%%%doc.help%%%%))"
 
 #. TRANS: Notice on group pages for anonymous users for StatusNet sites that accept no new registrations.
-#. TRANS: **%s** is the group alias, %%%%site.name%%%% is the site name,
+#. TRANS: %s is the group name, %%%%site.name%%%% is the site name,
 #. TRANS: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
 "wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
 "[StatusNet](http://status.net/) tool. Its members share short messages about "
-"their life and interests. "
+"their life and interests."
 msgstr ""
 "**%s** è un gruppo di utenti su %%%%site.name%%%%, un servizio di [microblog]"
 "(http://it.wikipedia.org/wiki/Microblogging) basato sul software libero "
-"[StatusNet](http://status.net/)."
-
-#. TRANS: Title for list of group administrators on a group page.
-#, fuzzy
-msgctxt "TITLE"
-msgid "Admins"
-msgstr "Amministratori"
+"[StatusNet](http://status.net/). I suoi membri condividono brevi messaggi "
+"riguardo la loro vita e i loro interessi."
 
 #. TRANS: Client error displayed requesting a single message that does not exist.
 msgid "No such message."
@@ -5619,9 +5164,8 @@ msgid "Message from %1$s on %2$s"
 msgstr "Messaggio da %1$s su %2$s"
 
 #. TRANS: Client exception thrown when trying a view a notice the user has no access to.
-#, fuzzy
 msgid "Not available."
-msgstr "Messaggistica istantanea non disponibile."
+msgstr "Non disponibile."
 
 #. TRANS: Client error displayed trying to show a deleted notice.
 msgid "Notice deleted."
@@ -5629,105 +5173,113 @@ msgstr "Messaggio eliminato."
 
 #. TRANS: Title for private list timeline.
 #. TRANS: %1$s is a list, %2$s is a page number.
-#, fuzzy, php-format
+#, php-format
 msgid "Private timeline for %1$s list by you, page %2$d"
-msgstr "Utenti auto-etichettati con %1$s - pagina %2$d"
+msgstr "Cronologia privata per la tua lista %1$s, pagina %2$d"
 
 #. TRANS: Title for public list timeline where the viewer is the tagger.
 #. TRANS: %1$s is a list, %2$s is a page number.
-#, fuzzy, php-format
+#, php-format
 msgid "Timeline for %1$s list by you, page %2$d"
-msgstr "Utenti auto-etichettati con %1$s - pagina %2$d"
+msgstr "Cronologia della tua lista %1$s, pagina %2$d"
 
 #. TRANS: Title for private list timeline.
 #. TRANS: %1$s is a list, %2$s is the tagger's nickname, %3$d is a page number.
-#, fuzzy, php-format
+#, php-format
 msgid "Timeline for %1$s list by %2$s, page %3$d"
-msgstr "Messaggi etichettati con %1$s, pagina %2$d"
+msgstr "Cronologia della lista %1$s di %2$s, pagina %3$d"
 
 #. TRANS: Title for private list timeline.
 #. TRANS: %s is a list.
 #, php-format
 msgid "Private timeline of %s list by you"
-msgstr ""
+msgstr "Cronologia della tua lista privata %s"
 
 #. TRANS: Title for public list timeline where the viewer is the tagger.
 #. TRANS: %s is a list.
 #, php-format
 msgid "Timeline for %s list by you"
-msgstr ""
+msgstr "Cronologia della tua lista %s"
 
 #. TRANS: Title for private list timeline.
 #. TRANS: %1$s is a list, %2$s is the tagger's nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "Timeline for %1$s list by %2$s"
-msgstr "Risposte a %1$s su %2$s!"
+msgstr "Cronologia della lista %1$s di %2$s"
 
 #. TRANS: Feed title.
 #. TRANS: %1$s is a list, %2$s is tagger's nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "Feed for %1$s list by %2$s (Atom)"
-msgstr "Feed dei preferiti di di %s (Atom)"
+msgstr "Feed della lista %1$s di %2$s (Atom)"
 
 #. TRANS: Empty list message for list timeline.
 #. TRANS: %1$s is a list, %2$s is a tagger's nickname.
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "This is the timeline for %1$s list by %2$s but no one has posted anything "
 "yet."
 msgstr ""
-"Questa è l'attività di %s e i suoi amici, ma nessuno ha ancora scritto "
-"qualche cosa."
+"Questa è la cronologia della lista %1$s di %2$s, ma nessuno ha ancora "
+"scritto qualcosa."
 
 #. TRANS: Additional empty list message for list timeline for currently logged in user tagged tags.
 msgid "Try tagging more people."
-msgstr ""
+msgstr "Prova a taggare più persone."
 
 #. TRANS: Additional empty list message for list timeline.
 #. TRANS: This message contains Markdown links in the form [description](link).
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and start following "
 "this timeline!"
-msgstr "Perché non [crei un accout](%%action.register%%) e ne scrivi uno tu!"
+msgstr ""
+"Perché non [registri un account](%%%%action.register%%%%) per iniziare a "
+"seguire questa cronologia?"
 
 #. TRANS: Header on show list page.
-#, fuzzy
+#. TRANS: Link description for link to list of users tagged with a tag (so part of a list).
 msgid "Listed"
-msgstr "Licenza"
+msgstr "Aggiunto alla lista"
+
+#. TRANS: Content of "Listed" page if there are no listed users.
+#. TRANS: Content of "People following tag x" if there are no subscribed users.
+#. TRANS: Description for mini list of group members on a group page when the group has no members.
+#. TRANS: Empty list message for tags.
+#. TRANS: Text for user subscription statistics if the user has no subscriptions.
+#. TRANS: Text for user subscriber statistics if user has no subscribers.
+#. TRANS: Text for user user group membership statistics if user is not a member of any group.
+#. TRANS: Default content for section/sidebar widget.
+msgid "(None)"
+msgstr "(nessuno)"
 
 #. TRANS: Link for more "People in list x by a user"
 #. TRANS: if there are more than the mini list's maximum.
 msgid "Show all"
-msgstr ""
+msgstr "Mostra tutto"
 
 #. TRANS: Header for tag subscribers.
 #. TRANS: Link description for link to list of users subscribed to a tag.
 msgid "Subscribers"
 msgstr "Abbonati"
 
-#. TRANS: Link for more "People following tag x"
-#. TRANS: if there are more than the mini list's maximum.
-msgid "All subscribers"
-msgstr "Tutti gli abbonati"
-
-#. TRANS: Page title showing tagged notices in one user's stream.
+#. TRANS: Page title showing tagged notices in one user's timeline.
 #. TRANS: %1$s is the username, %2$s is the hash tag.
-#, fuzzy, php-format
+#, php-format
 msgid "Notices by %1$s tagged %2$s"
-msgstr "%1$s, pagina %2$s"
+msgstr "Notifiche di %1$s taggato %2$s"
 
-#. TRANS: Page title showing tagged notices in one user's stream.
+#. TRANS: Page title showing tagged notices in one user's timeline.
 #. TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number.
-#, fuzzy, php-format
+#, php-format
 msgid "Notices by %1$s tagged %2$s, page %3$d"
-msgstr "Messaggi etichettati con %1$s, pagina %2$d"
+msgstr "Notifiche di %1$s taggate %2$s, pagina %3$d"
 
-#. TRANS: Extended page title showing tagged notices in one user's stream.
+#. TRANS: Extended page title showing tagged notices in one user's timeline.
 #. TRANS: %1$s is the username, %2$d is the page number.
-#, fuzzy, php-format
+#, php-format
 msgid "Notices by %1$s, page %2$d"
-msgstr "Messaggi etichettati con %1$s, pagina %2$d"
+msgstr "Notifiche di %1$s, pagina %2$d"
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %1$s is a user nickname, %2$s is a hashtag.
@@ -5735,6 +5287,12 @@ msgstr "Messaggi etichettati con %1$s, pagina %2$d"
 msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
 msgstr "Feed dei messaggi per %1$s etichettati con %2$s (RSS 1.0)"
 
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#, php-format
+msgid "Notice feed for %s (Activity Streams JSON)"
+msgstr "Feed delle notifiche per %s (Activity Streams JSON)"
+
 #. TRANS: Title for link to notice feed.
 #. TRANS: %s is a user nickname.
 #, php-format
@@ -5759,10 +5317,10 @@ msgstr "Feed dei messaggi per %s (Atom)"
 msgid "FOAF for %s"
 msgstr "FOAF per %s"
 
-#. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
-#, fuzzy, php-format
+#. TRANS: First sentence of empty list message for a timeline. $1%s is a user nickname.
+#, php-format
 msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
-msgstr "Questa è l'attività di %1$s, ma %2$s non ha ancora scritto nulla."
+msgstr "Questa è la cronologia di %1$s, ma %1$s non ha ancora scritto nulla."
 
 #. TRANS: Second sentence of empty list message for a stream for the user themselves.
 msgid ""
@@ -5772,17 +5330,17 @@ msgstr ""
 "Visto niente di interessante? Non hai scritto ancora alcun messaggio, questo "
 "potrebbe essere un buon momento per iniziare! :)"
 
-#. TRANS: Second sentence of empty  list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
+#. TRANS: Second sentence of empty  list message for a non-self timeline. %1$s is a user nickname, %2$s is a part of a URL.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
 #, php-format
 msgid ""
 "You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
 "%?status_textarea=%2$s)."
 msgstr ""
-"[Scrivi qualche cosa](%%%%action.newnotice%%%%?status_textarea=%s) su questo "
-"argomento!"
+"Puoi provare a trillare a %1$s oppure [scrivigli qualcosa](%%%%action."
+"newnotice%%%%?status_textarea=%2$s)."
 
-#. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
+#. TRANS: Announcement for anonymous users showing a timeline if site registrations are open.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
 #, php-format
 msgid ""
@@ -5797,17 +5355,17 @@ msgstr ""
 "i messaggi di **%s** e di molti altri! ([Maggiori informazioni](%%%%doc.help%"
 "%%%))"
 
-#. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
+#. TRANS: Announcement for anonymous users showing a timeline if site registrations are closed or invite only.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
 "wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
-"[StatusNet](http://status.net/) tool. "
+"[StatusNet](http://status.net/) tool."
 msgstr ""
 "**%s** ha un account su %%%%site.name%%%%, un servizio di [microblog](http://"
-"it.wikipedia.org/wiki/Microblogging) basato sul software libero [StatusNet]"
-"(http://status.net/). "
+"en.wikipedia.org/wiki/Micro-blogging) basato sul software libero [StatusNet]"
+"(http://status.net/)."
 
 #. TRANS: Link to the author of a repeated notice. %s is a linked nickname.
 #, php-format
@@ -5824,7 +5382,6 @@ msgid "User is already silenced."
 msgstr "L'utente è già stato zittito."
 
 #. TRANS: Title for site administration panel.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Site"
 msgstr "Sito"
@@ -5841,6 +5398,14 @@ msgstr "Il nome del sito non deve avere lunghezza parti a zero."
 msgid "You must have a valid contact email address."
 msgstr "Devi avere un'email di contatto valida."
 
+#. TRANS: Client error displayed when a logo URL is not valid.
+msgid "Invalid logo URL."
+msgstr "URL del logo non valido."
+
+#. TRANS: Client error displayed when a SSL logo URL is invalid.
+msgid "Invalid SSL logo URL."
+msgstr "URL del logo SSL non valido."
+
 #. TRANS: Client error displayed trying to save site settings with an invalid language code.
 #. TRANS: %s is the invalid language code.
 #, php-format
@@ -5856,51 +5421,46 @@ msgid "Dupe limit must be one or more seconds."
 msgstr "Il limite per i duplicati deve essere di 1 o più secondi."
 
 #. TRANS: Fieldset legend on site settings panel.
-#, fuzzy
 msgctxt "LEGEND"
 msgid "General"
 msgstr "Generale"
 
 #. TRANS: Field label on site settings panel.
-#, fuzzy
 msgctxt "LABEL"
 msgid "Site name"
 msgstr "Nome del sito"
 
 #. TRANS: Field title on site settings panel.
-#, fuzzy
 msgid "The name of your site, like \"Yourcompany Microblog\"."
-msgstr "Il nome del tuo sito, topo \"Acme Microblog\""
+msgstr "Il nome del tuo sito, come ad esempio \"Microblog NomeImpresa\"."
 
 #. TRANS: Field label on site settings panel.
 msgid "Brought by"
 msgstr "Offerto da"
 
 #. TRANS: Field title on site settings panel.
-#, fuzzy
 msgid "Text used for credits link in footer of each page."
-msgstr "Testo usato per i crediti nel piè di pagina di ogni pagina"
+msgstr ""
+"Testo usato per il collegamento dei crediti a piè di pagina di ogni pagina."
 
 #. TRANS: Field label on site settings panel.
 msgid "Brought by URL"
 msgstr "URL per offerto da"
 
 #. TRANS: Field title on site settings panel.
-#, fuzzy
 msgid "URL used for credits link in footer of each page."
-msgstr "URL usato per i crediti nel piè di pagina di ogni pagina"
+msgstr ""
+"URL usato per il collegamento dei crediti a piè di pagina di ogni pagina."
 
 #. TRANS: Field label on site settings panel.
 msgid "Email"
 msgstr "Email"
 
 #. TRANS: Field title on site settings panel.
-#, fuzzy
 msgid "Contact email address for your site."
-msgstr "Indirizzo email di contatto per il sito"
+msgstr "Indirizzo di contatto e-mail per il tuo sito."
 
 #. TRANS: Fieldset legend on site settings panel.
-#, fuzzy
 msgctxt "LEGEND"
 msgid "Local"
 msgstr "Locale"
@@ -5918,13 +5478,13 @@ msgid "Default language"
 msgstr "Lingua predefinita"
 
 #. TRANS: Dropdown title on site settings panel.
-msgid "Site language when autodetection from browser settings is not available"
+msgid ""
+"The site language when autodetection from browser settings is not available."
 msgstr ""
-"Lingua del sito quando il rilevamento automatico del browser non è "
-"disponibile"
+"La lingua del sito quando viene rilevata automaticamente dal browser non è "
+"disponibile."
 
 #. TRANS: Fieldset legend on site settings panel.
-#, fuzzy
 msgctxt "LEGEND"
 msgid "Limits"
 msgstr "Limiti"
@@ -5947,9 +5507,21 @@ msgstr ""
 "Quanto tempo gli utenti devono attendere (in secondi) prima di inviare "
 "nuovamente lo stesso messaggio"
 
+#. TRANS: Fieldset legend for form to change logo.
+msgid "Logo"
+msgstr "Logo"
+
+#. TRANS: Field label for StatusNet site logo.
+msgid "Site logo"
+msgstr "Logo del sito"
+
+#. TRANS: Field label for SSL StatusNet site logo.
+msgid "SSL logo"
+msgstr "Logo SSL"
+
 #. TRANS: Button title for saving site settings.
-msgid "Save site settings"
-msgstr "Salva impostazioni"
+msgid "Save the site settings."
+msgstr "Salva le impostazioni del sito."
 
 #. TRANS: Page title for site-wide notice tab in admin panel.
 msgid "Site Notice"
@@ -5964,23 +5536,23 @@ msgid "Unable to save site notice."
 msgstr "Impossibile salvare il messaggio del sito."
 
 #. TRANS: Client error displayed when a site-wide notice was longer than allowed.
-#, fuzzy
 msgid "Maximum length for the site-wide notice is 255 characters."
-msgstr "La dimensione massima del messaggio del sito è di 255 caratteri."
+msgstr ""
+"La dimensione massima per la notifica in tutto il sito è di 255 caratteri."
 
 #. TRANS: Label for site-wide notice text field in admin panel.
 msgid "Site notice text"
 msgstr "Testo messaggio del sito"
 
 #. TRANS: Tooltip for site-wide notice text field in admin panel.
-#, fuzzy
 msgid "Site-wide notice text (255 characters maximum; HTML allowed)"
-msgstr "Testo messaggio del sito (massimo 255 caratteri, HTML consentito)"
+msgstr ""
+"Il testo della notifica di tutto il sito (massimo 255 caratteri; HTML "
+"consentito)"
 
-#. TRANS: Title for button to save site notice in admin panel.
-#, fuzzy
+#. TRANS: Button title to save site notice in admin panel.
 msgid "Save site notice."
-msgstr "Salva messaggio"
+msgstr "Salva la notifica del sito."
 
 #. TRANS: Title for SMS settings.
 msgid "SMS settings"
@@ -6026,9 +5598,8 @@ msgid "SMS phone number"
 msgstr "Numero di telefono per SMS"
 
 #. TRANS: SMS phone number input field instructions in SMS settings form.
-#, fuzzy
 msgid "Phone number, no punctuation or spaces, with area code."
-msgstr "Numero di telefono, senza punteggiatura o spazi, con il prefisso"
+msgstr "Numero di telefono, senza punteggiatura o spazi, con il prefisso."
 
 #. TRANS: Form legend for SMS preferences form.
 msgid "SMS preferences"
@@ -6076,9 +5647,8 @@ msgid "That is the wrong confirmation number."
 msgstr "Quello è il numero di conferma errato."
 
 #. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
-#, fuzzy
 msgid "Could not delete SMS confirmation."
-msgstr "Impossibile eliminare la conferma della messaggistica."
+msgstr "Impossibile eliminare l'SMS di conferma."
 
 #. TRANS: Message given after successfully canceling SMS phone number confirmation.
 msgid "SMS confirmation cancelled."
@@ -6112,15 +5682,13 @@ msgstr ""
 "via email, ma non è elencato qui, scrivici a %s."
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
-#, fuzzy
 msgid "No code entered."
-msgstr "Nessun codice inserito"
+msgstr "Nessun codice inserito."
 
 #. TRANS: Title for admin panel to configure snapshots.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Snapshots"
-msgstr "Snapshot"
+msgstr "Istantanee"
 
 #. TRANS: Instructions for admin panel to configure snapshots.
 msgid "Manage snapshot configuration"
@@ -6139,10 +5707,9 @@ msgid "Invalid snapshot report URL."
 msgstr "URL di segnalazione snapshot non valido."
 
 #. TRANS: Fieldset legend on admin panel for snapshots.
-#, fuzzy
 msgctxt "LEGEND"
 msgid "Snapshots"
-msgstr "Snapshot"
+msgstr "Istantanee"
 
 #. TRANS: Option in dropdown for snapshot method in admin panel for snapshots.
 msgid "Randomly during web hit"
@@ -6157,32 +5724,28 @@ msgid "Data snapshots"
 msgstr "Snapshot dei dati"
 
 #. TRANS: Dropdown title for snapshot method in admin panel for snapshots.
-#, fuzzy
 msgid "When to send statistical data to status.net servers."
-msgstr "Quando inviare dati statistici a status.net"
+msgstr "Quando inviare dati statistici ai server di status.net."
 
 #. TRANS: Input field label for snapshot frequency in admin panel for snapshots.
 msgid "Frequency"
 msgstr "Frequenza"
 
 #. TRANS: Input field title for snapshot frequency in admin panel for snapshots.
-#, fuzzy
 msgid "Snapshots will be sent once every N web hits."
-msgstr "Gli snapshot verranno inviati ogni N web hit"
+msgstr "Le istantanee verranno inviate ad ogni visita."
 
 #. TRANS: Input field label for snapshot report URL in admin panel for snapshots.
 msgid "Report URL"
 msgstr "URL per la segnalazione"
 
 #. TRANS: Input field title for snapshot report URL in admin panel for snapshots.
-#, fuzzy
 msgid "Snapshots will be sent to this URL."
-msgstr "Gli snapshot verranno inviati a questo URL"
+msgstr "Le istantanee verranno inviate a questo URL."
 
-#. TRANS: Title for button to save snapshot settings.
-#, fuzzy
+#. TRANS: Button title to save snapshot settings.
 msgid "Save snapshot settings."
-msgstr "Salva impostazioni snapshot"
+msgstr "Salva impostazioni istantanee."
 
 #. TRANS: Client error displayed trying a change a subscription for a non-subscribed profile.
 msgid "You are not subscribed to that profile."
@@ -6195,55 +5758,49 @@ msgstr "Impossibile salvare l'abbonamento."
 
 #. TRANS: Client error displayed when trying to approve group applicants without being a group administrator.
 msgid "You may only approve your own pending subscriptions."
-msgstr ""
+msgstr "Puoi approvare solo le tue iscrizioni in sospeso."
 
 #. TRANS: Title of the first page showing pending subscribers still awaiting approval.
 #. TRANS: %s is the name of the user.
-#, fuzzy, php-format
+#, php-format
 msgid "%s subscribers awaiting approval"
-msgstr "Membri del gruppo %s"
+msgstr "Iscritti a %s che attendono approvazione"
 
 #. TRANS: Title of all but the first page showing pending subscribersmembers still awaiting approval.
 #. TRANS: %1$s is the name of the user, %2$d is the page number of the members list.
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s subscribers awaiting approval, page %2$d"
-msgstr "Membri del gruppo %1$s, pagina %2$d"
+msgstr "Iscritti a %1$s che attendono approvazione, pagina %2$d"
 
 #. TRANS: Page notice for group members page.
-#, fuzzy
 msgid "A list of users awaiting approval to subscribe to you."
-msgstr "Un elenco degli utenti in questo gruppo."
-
-#. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
-msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
 msgstr ""
-"Non è possibile abbonarsi a un profilo remoto OMB 0.1 con quest'azione."
+"Lista di utenti che attendono l'approvazione per l'iscrizione alla tua "
+"pagina."
 
 #. TRANS: Page title when subscription succeeded.
 msgid "Subscribed"
 msgstr "Abbonati"
 
 #. TRANS: Client error displayed when trying to perform an action while not logged in.
-#, fuzzy
 msgid "You must be logged in to unsubscribe from a list."
-msgstr "Devi eseguire l'accesso per creare un gruppo."
+msgstr "Devi eseguire l'accesso per cancellare la tua iscrizione ad una lista."
 
 #. TRANS: Client error displayed when trying to perform an action without providing an ID.
-#, fuzzy
 msgid "No ID given."
-msgstr "Nessun argomento ID."
+msgstr "Non è stato dato alcun ID."
 
 #. TRANS: Server error displayed subscribing to a list fails.
 #. TRANS: %1$s is a user nickname, %2$s is a list, %3$s is the error message (no period).
-#, fuzzy, php-format
+#, php-format
 msgid "Could not subscribe user %1$s to list %2$s: %3$s"
-msgstr "Impossibile iscrivere l'utente %1$s al gruppo %2$s."
+msgstr "Impossibile iscrivere l'utente %1$s al gruppo %2$s: %3$s"
 
 #. TRANS: Title of form to subscribe to a list.
 #. TRANS: %1%s is a user nickname, %2$s is a list, %3$s is a tagger nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s subscribed to list %2$s by %3$s"
-msgstr "Abbonati a %1$s, pagina %2$d"
+msgstr "%1$s è iscritto alla lista %2$s di %3$s"
 
 #. TRANS: Header for list of subscribers for a user (first page).
 #. TRANS: %s is the user's nickname.
@@ -6269,13 +5826,12 @@ msgid "These are the people who listen to %s's notices."
 msgstr "Queste sono le persone che seguono %s."
 
 #. TRANS: Subscriber list text when the logged in user has no subscribers.
-#, fuzzy
 msgid ""
 "You have no subscribers. Try subscribing to people you know and they might "
 "return the favor."
 msgstr ""
-"Non hai alcun abbonato. Prova ad abbonarti a qualcuno che conosci e magari "
-"loro potrebbero fare lo stesso"
+"Non hai alcun iscritto. Prova ad iscriverti a qualcuno che conosci e che "
+"magari potrebbe restituirti il favore."
 
 #. TRANS: Subscriber list text when looking at the subscribers for a of a user other
 #. TRANS: than the logged in user that has no subscribers. %s is the user nickname.
@@ -6322,14 +5878,12 @@ msgid ""
 "You're not listening to anyone's notices right now, try subscribing to "
 "people you know. Try [people search](%%action.peoplesearch%%), look for "
 "members in groups you're interested in and in our [featured users](%%action."
-"featured%%). If you're a [Twitter user](%%action.twittersettings%%), you can "
-"automatically subscribe to people you already follow there."
+"featured%%)."
 msgstr ""
-"Non stai seguendo nessuno, prova ad abbonarti a qualcuno che conosci. Prova "
-"a [cercare persone](%%action.peoplesearch%%), guarda tra i membri dei gruppi "
-"di tuo interesse e tra gli [utenti in evidenza](%%action.featured%%). Se "
-"[usi Twitter](%%action.twittersettings%%), puoi abbonarti automaticamente "
-"alle persone che già seguivi lì."
+"Non stai ricevendo le notifiche di nessuno, prova ad iscriverti a qualcuno "
+"che conosci. Prova a [cercare persone](%%action.peoplesearch%%), guarda tra "
+"i membri dei gruppi di tuo interesse e tra gli [utenti in evidenza](%%action."
+"featured%%)."
 
 #. TRANS: Subscription list text when looking at the subscriptions for a of a user other
 #. TRANS: than the logged in user that has no subscriptions. %s is the user nickname.
@@ -6340,15 +5894,14 @@ msgid "%s is not listening to anyone."
 msgstr "%s non sta seguendo nessuno."
 
 #. TRANS: Atom feed title. %s is a profile nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "Subscription feed for %s (Atom)"
-msgstr "Feed dei messaggi per %s (Atom)"
+msgstr "Iscrizione al feed di %s (Atom)"
 
 #. TRANS: Checkbox label for enabling IM messages for a profile in a subscriptions list.
-#, fuzzy
 msgctxt "LABEL"
 msgid "IM"
-msgstr "MI"
+msgstr "IM"
 
 #. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
 msgid "SMS"
@@ -6360,6 +5913,12 @@ msgstr "SMS"
 msgid "Notices tagged with %1$s, page %2$d"
 msgstr "Messaggi etichettati con %1$s, pagina %2$d"
 
+#. TRANS: Link label for feed on "notices with tag" page.
+#. TRANS: %s is the tag the feed is for.
+#, php-format
+msgid "Notice feed for tag %s (Activity Streams JSON)"
+msgstr "Feed della notifica per il tag %s (Activity Streams JSON)"
+
 #. TRANS: Link label for feed on "notices with tag" page.
 #. TRANS: %s is the tag the feed is for.
 #, php-format
@@ -6381,68 +5940,59 @@ msgstr "Feed dei messaggi per l'etichetta %s (Atom)"
 #. TRANS: Client error displayed when trying to tag a user that cannot be tagged.
 #. TRANS: Client exception thrown trying to set a tag for a user that cannot be tagged.
 #. TRANS: Error displayed when trying to tag a user that cannot be tagged.
-#, fuzzy
 msgid "You cannot tag this user."
-msgstr "Non puoi inviare un messaggio a questo utente."
+msgstr "Non puoi taggare questo utente."
 
 #. TRANS: Title for list form when not on a profile page.
-#, fuzzy
 msgid "List a profile"
-msgstr "Profilo utente"
+msgstr "Metti in lista un profilo"
 
 #. TRANS: Title for list form when on a profile page.
 #. TRANS: %s is a profile nickname.
-#, fuzzy, php-format
+#, php-format
 msgctxt "ADDTOLIST"
 msgid "List %s"
-msgstr "Limiti"
+msgstr "Metti in lista %s"
 
 #. TRANS: Title for list form when an error has occurred.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Error"
-msgstr "Errore di Ajax"
+msgstr "Errore"
 
 #. TRANS: Header in list form.
 msgid "User profile"
 msgstr "Profilo utente"
 
 #. TRANS: Fieldset legend for list form.
-#, fuzzy
 msgid "List user"
-msgstr "Limiti"
+msgstr "Metti in lista l'utente"
 
 #. TRANS: Field label on list form.
-#, fuzzy
 msgctxt "LABEL"
 msgid "Lists"
-msgstr "Limiti"
+msgstr "Liste"
 
 #. TRANS: Field title on list form.
-#, fuzzy
 msgid ""
 "Lists for this user (letters, numbers, -, ., and _), comma- or space- "
 "separated."
 msgstr ""
-"Le tue etichette (lettere, numeri, -, . e _), separate da virgole o spazi"
+"Liste di questo utente (lettere, numeri, -, . e _), separate da virgole o "
+"spazi."
 
 #. TRANS: Title for personal tag cloud section.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Tags"
-msgstr "Etichette"
+msgstr "Tag"
 
 #. TRANS: Success message if lists are saved.
-#, fuzzy
 msgid "Lists saved."
-msgstr "Password salvata."
+msgstr "Liste salvate."
 
 #. TRANS: Page notice.
-#, fuzzy
 msgid "Use this form to add your subscribers or subscriptions to lists."
 msgstr ""
-"Usa questo modulo per aggiungere etichette ai tuoi abbonati o ai tuoi "
-"abbonamenti."
+"Usa questo modulo per aggiungere i tuoi iscritti o le iscrizioni alle liste."
 
 #. TRANS: Client error when requesting a tag feed for a non-existing tag.
 msgid "No such tag."
@@ -6466,26 +6016,13 @@ msgstr "Abbonamento annullato"
 
 #. TRANS: Page title for form that allows unsubscribing from a list.
 #. TRANS: %1$s is a nickname, %2$s is a list, %3$s is a tagger nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s unsubscribed from list %2$s by %3$s"
-msgstr "Abbonati a %1$s, pagina %2$d"
-
-#. TRANS: Client error displayed when trying to update profile with an incompatible license.
-#. TRANS: %1$s is the license incompatible with site license %2$s.
-#. TRANS: Exception thrown when licenses are not compatible for an authorisation request.
-#. TRANS: %1$s is the license for the listenee, %2$s is the license for "this" StatusNet site.
-#, fuzzy, php-format
-msgid ""
-"Listenee stream license \"%1$s\" is not compatible with site license \"%2$s"
-"\"."
-msgstr ""
-"La licenza \"%1$s\" dello stream di chi ascolti non è compatibile con la "
-"licenza \"%2$s\" di questo sito."
+msgstr "%1$s è uscito dalla lista %2$s di %3$s"
 
 #. TRANS: Title of URL settings tab in profile settings.
-#, fuzzy
 msgid "URL settings"
-msgstr "Impostazioni messaggistica istantanea"
+msgstr "Impostazioni URL"
 
 #. TRANS: Instructions for tab "Other" in user profile settings.
 msgid "Manage various other options."
@@ -6498,13 +6035,12 @@ msgid " (free service)"
 msgstr " (servizio libero)"
 
 #. TRANS: Default value for URL shortening settings.
-#, fuzzy
 msgid "[none]"
-msgstr "Nessuno"
+msgstr "[nessuno]"
 
 #. TRANS: Default value for URL shortening settings.
 msgid "[internal]"
-msgstr ""
+msgstr "[interno]"
 
 #. TRANS: Label for dropdown with URL shortener services.
 msgid "Shorten URLs with"
@@ -6516,39 +6052,42 @@ msgstr "Servizio di autoriduzione da usare"
 
 #. TRANS: Field label in URL settings in profile.
 msgid "URL longer than"
-msgstr ""
+msgstr "URL più lunga di"
 
 #. TRANS: Field title in URL settings in profile.
 msgid "URLs longer than this will be shortened, 0 means always shorten."
 msgstr ""
+"Le URL più lunghe di questa saranno abbreviate, 0 significa sempre "
+"accorciare."
 
 #. TRANS: Field label in URL settings in profile.
 msgid "Text longer than"
-msgstr ""
+msgstr "Testo più lungo di"
 
 #. TRANS: Field title in URL settings in profile.
 msgid ""
 "URLs in notices longer than this will be shortened, 0 means always shorten."
 msgstr ""
+"Le URL nelle notifiche più lunghe di questa saranno abbreviate, 0 significa "
+"sempre accorciare."
 
 #. TRANS: Form validation error for form "Other settings" in user profile.
-#, fuzzy
 msgid "URL shortening service is too long (maximum 50 characters)."
 msgstr "Il servizio di riduzione degli URL è troppo lungo (max 50 caratteri)."
 
 #. TRANS: Client exception thrown when the maximum URL settings value is invalid in profile URL settings.
-#, fuzzy
 msgid "Invalid number for maximum URL length."
-msgstr "Contenuto del messaggio non valido."
+msgstr "La URL ha superato la lunghezza massima consentita."
 
 #. TRANS: Client exception thrown when the maximum notice length settings value is invalid in profile URL settings.
-#, fuzzy
 msgid "Invalid number for maximum notice length."
-msgstr "Contenuto del messaggio non valido."
+msgstr "La notifica ha superato la lunghezza massima consentita."
 
 #. TRANS: Server exception thrown in profile URL settings when preferences could not be saved.
 msgid "Error saving user URL shortening preferences."
 msgstr ""
+"Errore durante il salvataggio delle preferenze dell'utente "
+"sull'abbreviazione della URL."
 
 #. TRANS: User admin panel title.
 msgctxt "TITLE"
@@ -6564,19 +6103,17 @@ msgid "Invalid bio limit. Must be numeric."
 msgstr "Limite per la biografia non valido. Deve essere numerico."
 
 #. TRANS: Form validation error in user admin panel when welcome text is too long.
-#, fuzzy
 msgid "Invalid welcome text. Maximum length is 255 characters."
 msgstr ""
 "Testo di benvenuto non valido. La lunghezza massima è di 255 caratteri."
 
 #. TRANS: Client error displayed when trying to set a non-existing user as default subscription for new
 #. TRANS: users in user admin panel. %1$s is the invalid nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "Invalid default subscripton: \"%1$s\" is not a user."
-msgstr "Abbonamento predefinito non valido: \"%1$s\" non è un utente."
+msgstr "Iscrizione predefinita non valida: \"%1$s\" non è un utente."
 
 #. TRANS: Fieldset legend in user administration panel.
-#, fuzzy
 msgctxt "LEGEND"
 msgid "Profile"
 msgstr "Profilo"
@@ -6598,9 +6135,8 @@ msgid "New user welcome"
 msgstr "Messaggio per nuovi utenti"
 
 #. TRANS: Tooltip in user admin panel for setting new user welcome text.
-#, fuzzy
 msgid "Welcome text for new users (maximum 255 characters)."
-msgstr "Messaggio di benvenuto per nuovi utenti (max 255 caratteri)"
+msgstr "Messaggio di benvenuto per nuovi utenti (max 255 caratteri)."
 
 #. TRANS: Field label in user admin panel for setting default subscription for new users.
 msgid "Default subscription"
@@ -6622,161 +6158,9 @@ msgstr "Inviti abilitati"
 msgid "Whether to allow users to invite new users."
 msgstr "Indica se consentire agli utenti di invitarne di nuovi"
 
-#. TRANS: Title for button to save user settings in user admin panel.
-#, fuzzy
+#. TRANS: Button title to save user settings in user admin panel.
 msgid "Save user settings."
-msgstr "Salva impostazioni utente"
-
-#. TRANS: Page title.
-msgid "Authorize subscription"
-msgstr "Autorizza abbonamento"
-
-#. TRANS: Page notice on "Authorize subscription" page.
-#, fuzzy
-msgid ""
-"Please check these details to make sure that you want to subscribe to this "
-"user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
-"click \"Reject\"."
-msgstr ""
-"Controlla i dettagli seguenti per essere sicuro di volerti abbonare ai "
-"messaggi di questo utente. Se non hai richiesto ciò, fai clic su \"Rifiuta\"."
-
-#. TRANS: Button text on Authorise Subscription page.
-#. TRANS: Submit button text to accept a group membership request on approve group form.
-#. TRANS: Submit button text to accept a subscription request on approve sub form.
-#, fuzzy
-msgctxt "BUTTON"
-msgid "Accept"
-msgstr "Accetta"
-
-#. TRANS: Title for button on Authorise Subscription page.
-#. TRANS: Button title to subscribe to a user.
-#, fuzzy
-msgid "Subscribe to this user."
-msgstr "Abbonati a questo utente"
-
-#. TRANS: Button text on Authorise Subscription page.
-#. TRANS: Submit button text to reject a group membership request on approve group form.
-#. TRANS: Submit button text to reject a subscription request on approve sub form.
-#, fuzzy
-msgctxt "BUTTON"
-msgid "Reject"
-msgstr "Rifiuta"
-
-#. TRANS: Title for button on Authorise Subscription page.
-#, fuzzy
-msgid "Reject this subscription."
-msgstr "Rifiuta questo abbonamento"
-
-#. TRANS: Client error displayed for an empty authorisation request.
-msgid "No authorization request!"
-msgstr "Nessuna richiesta di autorizzazione!"
-
-#. TRANS: Accept message header from Authorise subscription page.
-msgid "Subscription authorized"
-msgstr "Abbonamento autorizzato"
-
-#. TRANS: Accept message text from Authorise subscription page.
-msgid ""
-"The subscription has been authorized, but no callback URL was passed. Check "
-"with the site's instructions for details on how to authorize the "
-"subscription. Your subscription token is:"
-msgstr ""
-"L'abbonamento è stato autorizzato, ma non è stato passato alcun URL di "
-"richiamo. Controlla le istruzioni del sito per i dettagli su come "
-"autorizzare l'abbonamento. Il tuo token per l'abbonamento è:"
-
-#. TRANS: Reject message header from Authorise subscription page.
-msgid "Subscription rejected"
-msgstr "Abbonamento rifiutato"
-
-#. TRANS: Reject message from Authorise subscription page.
-msgid ""
-"The subscription has been rejected, but no callback URL was passed. Check "
-"with the site's instructions for details on how to fully reject the "
-"subscription."
-msgstr ""
-"L'abbonamento è stato rifiutato, ma non è stato passato alcun URL di "
-"richiamo. Controlla le istruzioni del sito per i dettagli su come rifiutare "
-"completamente l'abbonamento."
-
-#. TRANS: Exception thrown when no valid user is found for an authorisation request.
-#. TRANS: %s is a listener URI.
-#, fuzzy, php-format
-msgid "Listener URI \"%s\" not found here."
-msgstr "URL \"%s\" dell'ascoltatore non trovato qui."
-
-#. TRANS: Exception thrown when listenee URI is too long for an authorisation request.
-#. TRANS: %s is a listenee URI.
-#, fuzzy, php-format
-msgid "Listenee URI \"%s\" is too long."
-msgstr "L'URI \"%s\" di colui che si ascolta è troppo lungo."
-
-#. TRANS: Exception thrown when listenee URI is a local user for an authorisation request.
-#. TRANS: %s is a listenee URI.
-#, fuzzy, php-format
-msgid "Listenee URI \"%s\" is a local user."
-msgstr "L'URI \"%s\" di colui che si ascolta è un utente locale."
-
-#. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
-#. TRANS: %s is a profile URL.
-#, fuzzy, php-format
-msgid "Profile URL \"%s\" is for a local user."
-msgstr "L'URL \"%s\" del profilo è per un utente locale."
-
-#. TRANS: Exception thrown when avatar URL is invalid for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#, fuzzy, php-format
-msgid "Avatar URL \"%s\" is not valid."
-msgstr "L'URL \"%s\" dell'immagine non è valido."
-
-#. TRANS: Exception thrown when avatar URL could not be read for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#, fuzzy, php-format
-msgid "Cannot read avatar URL \"%s\"."
-msgstr "Impossibile leggere l'URL \"%s\" dell'immagine."
-
-#. TRANS: Exception thrown when avatar URL return an invalid image type for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#, fuzzy, php-format
-msgid "Wrong image type for avatar URL \"%s\"."
-msgstr "Tipo di immagine errata per l'URL \"%s\"."
-
-#. TRANS: Title for profile design page.
-#. TRANS: Page title for profile design page.
-msgid "Profile design"
-msgstr "Aspetto del profilo"
-
-#. TRANS: Instructions for Profile design page.
-#. TRANS: Instructions for profile design page.
-msgid ""
-"Customize the way your profile looks with a background image and a colour "
-"palette of your choice."
-msgstr ""
-"Personalizza l'aspetto del tuo profilo con un'immagine di sfondo e dei "
-"colori personalizzati."
-
-#. TRANS: Succes message on Profile design page when finding an easter egg.
-msgid "Enjoy your hotdog!"
-msgstr "Gustati il tuo hotdog!"
-
-#. TRANS: Form legend on Profile design page.
-#, fuzzy
-msgid "Design settings"
-msgstr "Salva impostazioni"
-
-#. TRANS: Checkbox label on Profile design page.
-msgid "View profile designs"
-msgstr "Visualizza aspetto"
-
-#. TRANS: Title for checkbox on Profile design page.
-msgid "Show or hide profile designs."
-msgstr "Mostra o nasconde gli aspetti del profilo"
-
-#. TRANS: Form legend on Profile design page for form to choose a background image.
-#, fuzzy
-msgid "Background file"
-msgstr "Sfondo"
+msgstr "Salva impostazioni utente."
 
 #. TRANS: Page title for all but the first page of groups for a user.
 #. TRANS: %1$s is a nickname, %2$d is a page number.
@@ -6818,10 +6202,10 @@ msgstr "StatusNet %s"
 #. TRANS: %1$s is the engine name (StatusNet) and %2$s is the StatusNet version.
 #, php-format
 msgid ""
-"This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, "
+"This site is powered by %1$s version %2$s, Copyright 2008-2011 StatusNet, "
 "Inc. and contributors."
 msgstr ""
-"Questo sito esegue il software %1$s versione %2$s, Copyright 2008-2010 "
+"Questo sito è alimentato da  %1$s  versione  %2$s, Copyright 2008-2011 "
 "StatusNet, Inc. e collaboratori."
 
 #. TRANS: Header for StatusNet contributors section on the version page.
@@ -6837,24 +6221,24 @@ msgid ""
 "StatusNet is free software: you can redistribute it and/or modify it under "
 "the terms of the GNU Affero General Public License as published by the Free "
 "Software Foundation, either version 3 of the License, or (at your option) "
-"any later version. "
+"any later version."
 msgstr ""
-"StatusNet è software libero: è possibile redistribuirlo o modificarlo nei "
-"termini della GNU Affero General Public License, come pubblicata dalla Free "
-"Software Foundation, versione 3 o (a scelta) una qualsiasi versione "
-"successiva. "
+"StatusNet è un software libero: puoi ridistribuirlo e/o modificarlo nei "
+"termini stabiliti dalla GNU General Public License così come pubblicati "
+"dalla Free Software Foundation, nella versione 3 della Licenza, o (a tua "
+"scelta) in qualsiasi versione successiva."
 
 #. TRANS: Content part of StatusNet version page.
 msgid ""
 "This program is distributed in the hope that it will be useful, but WITHOUT "
 "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
 "FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License "
-"for more details. "
+"for more details."
 msgstr ""
-"Questo programma è distribuito nella speranza che possa essere utile, ma "
-"SENZA ALCUNA GARANZIA, senza anche la garanzia implicita di COMMERCIABILITÀ "
-"o di UTILIZZABILITÀ PER UN PARTICOLARE SCOPO. Per maggiori informazioni "
-"consultare la GNU Affero General Public License. "
+"Questo programma è distribuito nella speranza che sia utile, ma SENZA ALCUNA "
+"GARANZIA; senza neppure la garanzia implicita di COMMERCIABILITA' o "
+"IDONEITA' PER UNO SCOPO PARTICOLARE.  Vedi la Licenza GNU Affero General "
+"Public per maggiori dettagli."
 
 #. TRANS: Content part of StatusNet version page.
 #. TRANS: %s is a link to the AGPL license with link description "http://www.gnu.org/licenses/agpl.html".
@@ -6871,25 +6255,21 @@ msgid "Plugins"
 msgstr "Plugin"
 
 #. TRANS: Column header for plugins table on version page.
-#, fuzzy
 msgctxt "HEADER"
 msgid "Name"
 msgstr "Nome"
 
 #. TRANS: Column header for plugins table on version page.
-#, fuzzy
 msgctxt "HEADER"
 msgid "Version"
 msgstr "Versione"
 
 #. TRANS: Column header for plugins table on version page.
-#, fuzzy
 msgctxt "HEADER"
 msgid "Author(s)"
-msgstr "Autori"
+msgstr "Autore/i"
 
 #. TRANS: Column header for plugins table on version page.
-#, fuzzy
 msgctxt "HEADER"
 msgid "Description"
 msgstr "Descrizione"
@@ -6900,9 +6280,9 @@ msgstr "Preferisci"
 
 #. TRANS: Ntofication given when a user marks a notice as favorite.
 #. TRANS: %1$s is a user nickname or full name, %2$s is a notice URI.
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s marked notice %2$s as a favorite."
-msgstr "%s (@%s) ha aggiunto il tuo messaggio tra i suoi preferiti"
+msgstr "%1$s ha contrassegnato la notifica %2$s  come preferita."
 
 #. TRANS: Server exception thrown when a URL cannot be processed.
 #, php-format
@@ -6913,42 +6293,52 @@ msgstr "Impossibile elaborare l'indirizzo \"%s\""
 msgid "Robin thinks something is impossible."
 msgstr "Si è verificato qualche cosa di impossibile."
 
+#. TRANS: Message used to be inserted as %2$s in  the text "No file may
+#. TRANS: be larger than %1$d byte and the file you sent was %2$s.".
+#. TRANS: %1$d is the number of bytes of an uploaded file.
+#, php-format
+msgid "%1$d byte"
+msgid_plural "%1$d bytes"
+msgstr[0] "%1$d byte"
+msgstr[1] "%1$d bytes"
+
 #. TRANS: Message given if an upload is larger than the configured maximum.
-#. TRANS: %1$d is the byte limit for uploads, %2$d is the byte count for the uploaded file.
-#. TRANS: %1$s is used for plural.
-#, fuzzy, php-format
+#. TRANS: %1$d (used for plural) is the byte limit for uploads,
+#. TRANS: %2$s is the proper form of "n bytes". This is the only ways to have
+#. TRANS: gettext support multiple plurals in the same message, unfortunately...
+#, php-format
 msgid ""
-"No file may be larger than %1$d byte and the file you sent was %2$d bytes. "
-"Try to upload a smaller version."
+"No file may be larger than %1$d byte and the file you sent was %2$s. Try to "
+"upload a smaller version."
 msgid_plural ""
-"No file may be larger than %1$d bytes and the file you sent was %2$d bytes. "
-"Try to upload a smaller version."
+"No file may be larger than %1$d bytes and the file you sent was %2$s. Try to "
+"upload a smaller version."
 msgstr[0] ""
-"Nessun file può superare %1$d byte e il file inviato era di %2$d byte. Prova "
-"a caricarne una versione più piccola."
+"Nessun file può superare %1$d byte e il file inviato era di %2$s bytes. "
+"Prova a caricarne una versione più piccola."
 msgstr[1] ""
-"Nessun file può superare %1$d byte e il file inviato era di %2$d byte. Prova "
-"a caricarne una versione più piccola."
+"Nessun file può superare %1$d bytes e il file inviato era di %2$s bytes. "
+"Prova a caricarne una versione più piccola."
 
 #. TRANS: Message given if an upload would exceed user quota.
 #. TRANS: %d (number) is the user quota in bytes and is used for plural.
-#, fuzzy, php-format
+#, php-format
 msgid "A file this large would exceed your user quota of %d byte."
 msgid_plural "A file this large would exceed your user quota of %d bytes."
 msgstr[0] ""
 "Un file di questa dimensione supererebbe la tua quota utente di %d byte."
 msgstr[1] ""
-"Un file di questa dimensione supererebbe la tua quota utente di %d byte."
+"Un file di questa dimensione supererebbe la tua quota utente di %d bytes."
 
 #. TRANS: Message given id an upload would exceed a user's monthly quota.
 #. TRANS: $d (number) is the monthly user quota in bytes and is used for plural.
-#, fuzzy, php-format
+#, php-format
 msgid "A file this large would exceed your monthly quota of %d byte."
 msgid_plural "A file this large would exceed your monthly quota of %d bytes."
 msgstr[0] ""
 "Un file di questa dimensione supererebbe la tua quota mensile di %d byte."
 msgstr[1] ""
-"Un file di questa dimensione supererebbe la tua quota mensile di %d byte."
+"Un file di questa dimensione supererebbe la tua quota mensile di %d bytes."
 
 #. TRANS: Client exception thrown if a file upload does not have a valid name.
 msgid "Invalid filename."
@@ -6962,9 +6352,9 @@ msgstr "L'ID di profilo %s non è valido."
 
 #. TRANS: Exception thrown providing an invalid group ID.
 #. TRANS: %s is the invalid group ID.
-#, fuzzy, php-format
+#, php-format
 msgid "Group ID %s is invalid."
-msgstr "Errore nel salvare l'utente; non valido."
+msgstr "ID del gruppo  %s  non è valido."
 
 #. TRANS: Exception thrown when joining a group fails.
 msgid "Group join failed."
@@ -6998,6 +6388,11 @@ msgstr "Impossibile aggiornare il gruppo locale."
 msgid "Could not create login token for %s"
 msgstr "Impossibile creare il token di accesso per %s"
 
+#. TRANS: Exception thrown when a program code class (%s) cannot be instantiated.
+#, php-format
+msgid "Cannot instantiate class %s."
+msgstr "Non è possibile creare un'istanza di classe %s."
+
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.
 msgid "No database name or DSN found anywhere."
 msgstr "Non è stato trovato un nome di database o DNS."
@@ -7021,9 +6416,9 @@ msgid "No such profile (%1$d) for notice (%2$d)."
 msgstr "Non c'è alcun profilo (%1$d) per il messaggio (%2$d)."
 
 #. TRANS: Server exception. %s are the error details.
-#, fuzzy, php-format
+#, php-format
 msgid "Database error inserting hashtag: %s."
-msgstr "Errore del database nell'inserire un hashtag: %s"
+msgstr "Errore del database inserendo l'hashtag: %s."
 
 #. TRANS: Client exception thrown if a notice contains too many characters.
 msgid "Problem saving notice. Too long."
@@ -7053,24 +6448,21 @@ msgid "You are banned from posting notices on this site."
 msgstr "Ti è proibito inviare messaggi su questo sito."
 
 #. TRANS: Client exception thrown in notice when trying to repeat a missing or deleted notice.
-#, fuzzy
 msgid "Cannot repeat; original notice is missing or deleted."
-msgstr "Non puoi ripetere un tuo messaggio."
+msgstr ""
+"Non è possibile ripetere; l'avviso originale è mancante o è stato eliminato."
 
 #. TRANS: Client error displayed when trying to repeat an own notice.
-#, fuzzy
 msgid "You cannot repeat your own notice."
-msgstr "Non puoi ripetere i tuoi stessi messaggi."
+msgstr "Non puoi ripetere la tua stessa notifica."
 
 #. TRANS: Client error displayed when trying to repeat a non-public notice.
-#, fuzzy
 msgid "Cannot repeat a private notice."
-msgstr "Non puoi ripetere un tuo messaggio."
+msgstr "Non puoi ripetere una tua notifica privata."
 
 #. TRANS: Client error displayed when trying to repeat a notice you cannot access.
-#, fuzzy
 msgid "Cannot repeat a notice you cannot read."
-msgstr "Non puoi ripetere un tuo messaggio."
+msgstr "Non puoi ripetere una notifica che non puoi leggere."
 
 #. TRANS: Client error displayed when trying to repeat an already repeated notice.
 msgid "You already repeated that notice."
@@ -7078,9 +6470,9 @@ msgstr "Hai già ripetuto quel messaggio."
 
 #. TRANS: Client error displayed when trying to reply to a notice a the target has no access to.
 #. TRANS: %1$s is a user nickname, %2$d is a notice ID (number).
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s has no access to notice %2$d."
-msgstr "L'utente non ha un ultimo messaggio."
+msgstr "%1$s non ha alcun accesso alla notifica %2$d."
 
 #. TRANS: Server exception thrown when a notice cannot be saved.
 #. TRANS: Server exception thrown when a notice cannot be updated.
@@ -7088,9 +6480,8 @@ msgid "Problem saving notice."
 msgstr "Problema nel salvare il messaggio."
 
 #. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#, fuzzy
 msgid "Bad type provided to saveKnownGroups."
-msgstr "Fornito un tipo errato per saveKnownGroups"
+msgstr "Fornito un tipo errato per saveKnownGroups."
 
 #. TRANS: Server exception thrown when an update for a group inbox fails.
 msgid "Problem saving group inbox."
@@ -7104,7 +6495,7 @@ msgstr "RT @%1$s %2$s"
 
 #. TRANS: Full name of a profile or group (%1$s) followed by nickname (%2$s) in parentheses.
 #. TRANS: Full name of a profile or group followed by nickname in parens
-#, fuzzy, php-format
+#, php-format
 msgctxt "FANCYNAME"
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
@@ -7126,32 +6517,27 @@ msgstr ""
 
 #. TRANS: Server exception.
 msgid "The tag you are trying to rename to already exists."
-msgstr ""
+msgstr "Il tag che si sta tentando di rinominare esiste già."
 
 #. TRANS: Server exception saving new tag without having a tagger specified.
-#, fuzzy
 msgid "No tagger specified."
-msgstr "Nessun gruppo specificato."
+msgstr "Nessun tagger specificato."
 
 #. TRANS: Server exception saving new tag without having a tag specified.
-#, fuzzy
 msgid "No tag specified."
-msgstr "Nessun gruppo specificato."
+msgstr "Nessun tag specificato."
 
 #. TRANS: Server exception saving new tag.
-#, fuzzy
 msgid "Could not create profile tag."
-msgstr "Impossibile salvare il profilo."
+msgstr "Impossibile creare tag di profilo."
 
 #. TRANS: Server exception saving new tag.
-#, fuzzy
 msgid "Could not set profile tag URI."
-msgstr "Impossibile salvare il profilo."
+msgstr "Impossibile impostare il tag URI del profilo."
 
 #. TRANS: Server exception saving new tag.
-#, fuzzy
 msgid "Could not set profile tag mainpage."
-msgstr "Impossibile salvare il profilo."
+msgstr "Impossibile impostare il tag della pagina principale del profilo."
 
 #. TRANS: Client exception thrown trying to set more tags than allowed.
 #, php-format
@@ -7159,23 +6545,25 @@ msgid ""
 "You already have created %d or more tags which is the maximum allowed number "
 "of tags. Try using or deleting some existing tags."
 msgstr ""
+"hai già creato %d o più  tag che è il numero massimo consentito di tag. "
+"Prova ad usare o eliminare alcuni dei tag esistenti."
 
 #. TRANS: Client exception thrown when trying to add more people than allowed to a list.
 #, php-format
 msgid ""
 "You already have %1$d or more people in list %2$s, which is the maximum "
-"allowed number.Try unlisting others first."
+"allowed number. Try unlisting others first."
 msgstr ""
+"Hai già %1$d o più persone nella lista %2$s, che è il numero massimo "
+"consentito. Prova prima a rimuovere qualcuno dalla lista."
 
 #. TRANS: Exception thrown when inserting a list subscription in the database fails.
-#, fuzzy
 msgid "Adding list subscription failed."
-msgstr "Impossibile salvare l'abbonamento."
+msgstr "L'aggiunta di iscrizione alla lista non è riuscita."
 
 #. TRANS: Exception thrown when deleting a list subscription from the database fails.
-#, fuzzy
 msgid "Removing list subscription failed."
-msgstr "Impossibile salvare l'abbonamento."
+msgstr "La rimozione di iscrizione alla lista non è riuscita."
 
 #. TRANS: Exception thrown when a right for a non-existing user profile is checked.
 msgid "Missing profile."
@@ -7186,7 +6574,6 @@ msgid "Unable to save tag."
 msgstr "Impossibile salvare l'etichetta."
 
 #. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
-#. TRANS: Error message displayed to a banned user when they try to subscribe.
 msgid "You have been banned from subscribing."
 msgstr "Non ti è possibile abbonarti."
 
@@ -7206,25 +6593,20 @@ msgstr "Non hai l'abbonamento!"
 msgid "Could not delete self-subscription."
 msgstr "Impossibile salvare l'abbonamento."
 
-#. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
-msgid "Could not delete subscription OMB token."
-msgstr "Impossibile salvare l'abbonamento."
-
 #. TRANS: Exception thrown when a subscription could not be deleted on the server.
 msgid "Could not delete subscription."
 msgstr "Impossibile salvare l'abbonamento."
 
 #. TRANS: Activity title when subscribing to another person.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Follow"
 msgstr "Segui"
 
 #. TRANS: Notification given when one person starts following another.
 #. TRANS: %1$s is the subscriber, %2$s is the subscribed.
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s is now following %2$s."
-msgstr "L'utente %1$s è entrato nel gruppo %2$s."
+msgstr "%1$s ora segue %2$s."
 
 #. TRANS: Notice given on user registration.
 #. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
@@ -7234,7 +6616,7 @@ msgstr "Benvenuti su %1$s, @%2$s!"
 
 #. TRANS: Exception thrown when trying view "repeated to me".
 msgid "Not implemented since inbox change."
-msgstr ""
+msgstr "Non implementato dal cambiamento della posta in arrivo."
 
 #. TRANS: Server exception.
 msgid "No single user defined for single-user mode."
@@ -7242,7 +6624,19 @@ msgstr "Nessun utente singolo definito per la modalità single-user."
 
 #. TRANS: Server exception.
 msgid "Single-user mode code called when not enabled."
-msgstr ""
+msgstr "Codice di modalità utente-singolo chiamato quando non abilitato."
+
+#. TRANS: Information on password recovery form if no known username or e-mail address was specified.
+msgid "No user with that email address or username."
+msgstr "Nessun utente con quell'email o nome utente."
+
+#. TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.
+msgid "No registered email address for that user."
+msgstr "Nessun indirizzo email registrato per quell'utente."
+
+#. TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.
+msgid "Error saving address confirmation."
+msgstr "Errore nel salvare la conferma dell'indirizzo."
 
 #. TRANS: Server exception thrown when creating a group failed.
 msgid "Could not create group."
@@ -7262,21 +6656,21 @@ msgstr "Impossibile salvare le informazioni del gruppo locale."
 
 #. TRANS: Exception thrown when an account could not be located when it should be moved.
 #. TRANS: %s is the remote site.
-#, fuzzy, php-format
+#, php-format
 msgid "Cannot locate account %s."
-msgstr "Non puoi eliminare utenti."
+msgstr "Non è possibile individuare l'account %s."
 
 #. TRANS: Exception thrown when a service document could not be located account move.
 #. TRANS: %s is the remote site.
 #, php-format
 msgid "Cannot find XRD for %s."
-msgstr ""
+msgstr "Non è possibile trovare XRD per  %s."
 
 #. TRANS: Exception thrown when an account could not be located when it should be moved.
 #. TRANS: %s is the remote site.
 #, php-format
 msgid "No AtomPub API service for %s."
-msgstr ""
+msgstr "Nessun servizio API AtomPub per  %s ."
 
 #. TRANS: H2 for user actions in a profile.
 #. TRANS: H2 for entity actions in a profile.
@@ -7288,23 +6682,19 @@ msgid "User deletion in progress..."
 msgstr "Eliminazione utente..."
 
 #. TRANS: Link title for link on user profile.
-#, fuzzy
 msgid "Edit profile settings."
-msgstr "Modifica impostazioni del profilo"
+msgstr "Modificare le impostazioni del profilo."
 
 #. TRANS: Link text for link on user profile.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Edit"
 msgstr "Modifica"
 
 #. TRANS: Link title for link on user profile.
-#, fuzzy
 msgid "Send a direct message to this user."
-msgstr "Invia un messaggio diretto a questo utente"
+msgstr "Invia un messaggio privato a questo utente."
 
 #. TRANS: Link text for link on user profile.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Message"
 msgstr "Messaggio"
@@ -7339,10 +6729,9 @@ msgstr "Pagina senza nome"
 #. TRANS: Localized tooltip for '...' expansion button on overlong remote messages.
 msgctxt "TOOLTIP"
 msgid "Show more"
-msgstr ""
+msgstr "Mostra altro"
 
 #. TRANS: Inline reply form submit button: submits a reply comment.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Reply"
 msgstr "Rispondi"
@@ -7350,13 +6739,12 @@ msgstr "Rispondi"
 #. TRANS: Placeholder text for inline reply form. Clicking in this box will turn it into a mini notice form.
 #. TRANS: Field label for reply mini form.
 msgid "Write a reply..."
-msgstr ""
+msgstr "Scrivere una risposta..."
 
 #. TRANS: Tab on the notice form.
-#, fuzzy
 msgctxt "TAB"
 msgid "Status"
-msgstr "StatusNet"
+msgstr "Stato"
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
 #. TRANS: Text between [] is a link description, text between () is the link itself.
@@ -7431,57 +6819,55 @@ msgid "Expecting a root feed element but got a whole XML document."
 msgstr "Atteso un elemento root del feed, ma ricevuto un documento XML intero."
 
 #. TRANS: Client exception thrown when using an unknown verb for the activity importer.
-#, fuzzy, php-format
+#, php-format
 msgid "Unknown verb: \"%s\"."
-msgstr "Lingua \"%s\" sconosciuta."
+msgstr "Verbo sconosciuto: \"%s\"."
 
 #. TRANS: Client exception thrown when trying to force a subscription for an untrusted user.
 msgid "Cannot force subscription for untrusted user."
-msgstr ""
+msgstr "Non puoi forzare l'iscrizione per un utente non attendibile."
 
 #. TRANS: Client exception thrown when trying to force a remote user to subscribe.
-#, fuzzy
 msgid "Cannot force remote user to subscribe."
-msgstr "Specifica il nome dell'utente a cui abbonarti."
+msgstr "Non puoi costringere l'utente remoto ad iscriversi."
 
 #. TRANS: Client exception thrown when trying to subscribe to an unknown profile.
-#, fuzzy
 msgid "Unknown profile."
-msgstr "Tipo di file sconosciuto"
+msgstr "Profilo sconosciuto."
 
 #. TRANS: Client exception thrown when trying to import an event not related to the importing user.
 msgid "This activity seems unrelated to our user."
-msgstr ""
+msgstr "Questa attività sembra estranea al nostro utente."
 
 #. TRANS: Client exception thrown when trying to join a remote group that is not a group.
 msgid "Remote profile is not a group!"
-msgstr ""
+msgstr "Il profilo remoto non è un gruppo!"
 
 #. TRANS: Client exception thrown when trying to join a group the importing user is already a member of.
-#, fuzzy
 msgid "User is already a member of this group."
-msgstr "Fai già parte di quel gruppo."
+msgstr "L'utente è già un membro di questo gruppo."
 
 #. TRANS: Client exception thrown when trying to import a notice by another user.
 #. TRANS: %1$s is the source URI of the notice, %2$s is the URI of the author.
 #, php-format
 msgid "Already know about notice %1$s and  it has a different author %2$s."
-msgstr ""
+msgstr "Già a conoscenza dell'avviso  %1$s  e ha un autore diverso  %2$s ."
 
 #. TRANS: Client exception thrown when trying to overwrite the author information for a non-trusted user during import.
 msgid "Not overwriting author info for non-trusted user."
 msgstr ""
+"Non sovrascrivere le informazioni sull'autore per gli utenti non attendibili."
 
 #. TRANS: Client exception thrown when trying to import a notice without content.
 #. TRANS: %s is the notice URI.
-#, fuzzy, php-format
+#, php-format
 msgid "No content for notice %s."
-msgstr "Trova contenuto dei messaggi"
+msgstr "Nessun contenuto per la notifica %s."
 
 #. TRANS: Exception thrown if a non-existing user is provided. %s is a user ID.
-#, fuzzy, php-format
+#, php-format
 msgid "No such user \"%s\"."
-msgstr "Utente inesistente."
+msgstr "Nessun utente \"%s\"."
 
 #. TRANS: Client exception thrown when post to collection fails with a 400 status.
 #. TRANS: %1$s is a URL, %2$s is the status, %s$s is the fail reason.
@@ -7489,10 +6875,10 @@ msgstr "Utente inesistente."
 #. TRANS: %1$s is a URL, %2$s is the status, %s$s is the fail reason.
 #. TRANS: Exception thrown when post to collection fails with a status that is not handled.
 #. TRANS: %1$s is a URL, %2$s is the status, %s$s is the fail reason.
-#, fuzzy, php-format
+#, php-format
 msgctxt "URLSTATUSREASON"
 msgid "%1$s %2$s %3$s"
-msgstr "%1$s - %2$s"
+msgstr "%1$s %2$s %3$s"
 
 #. TRANS: Client exception thrown when there is no source attribute.
 msgid "Can't handle remote content yet."
@@ -7522,32 +6908,15 @@ msgstr "showForm() non implementata."
 msgid "saveSettings() not implemented."
 msgstr "saveSettings() non implementata."
 
-#. TRANS: Client error message thrown if design settings could not be deleted in
-#. TRANS: the admin panel Design.
-msgid "Unable to delete design setting."
-msgstr "Impossibile eliminare le impostazioni dell'aspetto."
-
 #. TRANS: Header in administrator navigation panel.
-#. TRANS: Header in settings navigation panel.
-#, fuzzy
 msgctxt "HEADER"
 msgid "Home"
-msgstr "Pagina web"
-
-#. TRANS: Menu item in administrator navigation panel.
-#. TRANS: Menu item in default local navigation panel.
-#. TRANS: Menu item in personal group navigation menu.
-#. TRANS: Menu item in settings navigation panel.
-#, fuzzy
-msgctxt "MENU"
-msgid "Home"
-msgstr "Pagina web"
+msgstr "Home"
 
 #. TRANS: Header in administrator navigation panel.
-#, fuzzy
 msgctxt "HEADER"
 msgid "Admin"
-msgstr "Amministra"
+msgstr "Amministratore"
 
 #. TRANS: Menu item title in administrator navigation panel.
 msgid "Basic site configuration"
@@ -7558,23 +6927,11 @@ msgctxt "MENU"
 msgid "Site"
 msgstr "Sito"
 
-#. TRANS: Menu item title in administrator navigation panel.
-msgid "Design configuration"
-msgstr "Configurazione aspetto"
-
-#. TRANS: Menu item in administrator navigation panel.
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: Menu item in settings navigation panel.
-msgctxt "MENU"
-msgid "Design"
-msgstr "Aspetto"
-
 #. TRANS: Menu item title in administrator navigation panel.
 msgid "User configuration"
 msgstr "Configurazione utente"
 
 #. TRANS: Menu item in administrator navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "User"
 msgstr "Utente"
@@ -7584,7 +6941,6 @@ msgid "Access configuration"
 msgstr "Configurazione di accesso"
 
 #. TRANS: Menu item in administrator navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Access"
 msgstr "Accesso"
@@ -7594,7 +6950,6 @@ msgid "Paths configuration"
 msgstr "Configurazione percorsi"
 
 #. TRANS: Menu item in administrator navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Paths"
 msgstr "Percorsi"
@@ -7604,7 +6959,6 @@ msgid "Sessions configuration"
 msgstr "Configurazione sessioni"
 
 #. TRANS: Menu item in administrator navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Sessions"
 msgstr "Sessioni"
@@ -7614,41 +6968,36 @@ msgid "Edit site notice"
 msgstr "Modifica messaggio del sito"
 
 #. TRANS: Menu item in administrator navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Site notice"
-msgstr "Messaggio del sito"
+msgstr "Notifica del sito"
 
 #. TRANS: Menu item title in administrator navigation panel.
 msgid "Snapshots configuration"
 msgstr "Configurazione snapshot"
 
 #. TRANS: Menu item in administrator navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Snapshots"
-msgstr "Snapshot"
+msgstr "Istantanee"
 
 #. TRANS: Menu item title in administrator navigation panel.
 msgid "Set site license"
 msgstr "Imposta licenza"
 
 #. TRANS: Menu item in administrator navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "License"
 msgstr "Licenza"
 
 #. TRANS: Menu item title in administrator navigation panel.
-#, fuzzy
 msgid "Plugins configuration"
-msgstr "Configurazione percorsi"
+msgstr "Configurazione plugins"
 
 #. TRANS: Menu item in administrator navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Plugins"
-msgstr "Plugin"
+msgstr "Plugins"
 
 #. TRANS: Client error 401.
 msgid "API resource requires read-write access, but you only have read access."
@@ -7662,7 +7011,7 @@ msgstr "Nessuna applicazione per quella chiave."
 
 #. TRANS: Authorization exception thrown when a user without API access tries to access the API.
 msgid "Not allowed to use API."
-msgstr ""
+msgstr "Non autorizzato ad utilizzare API."
 
 #. TRANS: OAuth exception given when an incorrect access token was given for a user.
 msgid "Bad access token."
@@ -7677,43 +7026,6 @@ msgstr "Nessun utente per quel token."
 msgid "Could not authenticate you."
 msgstr "Impossibile autenticarti."
 
-#. TRANS: Server error displayed when trying to create an anynymous OAuth consumer.
-#, fuzzy
-msgid "Could not create anonymous consumer."
-msgstr "Impossibile creare gli alias."
-
-#. TRANS: Server error displayed when trying to create an anynymous OAuth application.
-#, fuzzy
-msgid "Could not create anonymous OAuth application."
-msgstr "Impossibile creare l'applicazione."
-
-#. TRANS: Exception thrown when no token association could be found.
-msgid ""
-"Could not find a profile and application associated with the request token."
-msgstr ""
-
-#. TRANS: Exception thrown when no access token can be issued.
-#, fuzzy
-msgid "Could not issue access token."
-msgstr "Impossibile inserire il messaggio."
-
-#. TRANS: Exception thrown when a database error occurs.
-msgid "Database error inserting OAuth application user."
-msgstr "Errore nel database nell'inserire l'applicazione utente OAuth."
-
-#. TRANS: Exception thrown when a database error occurs.
-#, fuzzy
-msgid "Database error updating OAuth application user."
-msgstr "Errore nel database nell'inserire l'applicazione utente OAuth."
-
-#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
-msgid "Tried to revoke unknown token."
-msgstr "Tentativo di revocare un token sconosciuto."
-
-#. TRANS: Exception thrown when an attempt is made to remove a revoked token.
-msgid "Failed to delete revoked token."
-msgstr "Eliminazione del token revocato non riuscita."
-
 #. TRANS: Form input field label for application icon.
 msgid "Icon"
 msgstr "Icona"
@@ -7728,11 +7040,11 @@ msgstr "Nome"
 
 #. TRANS: Form input field instructions.
 #. TRANS: %d is the number of available characters for the description.
-#, fuzzy, php-format
+#, php-format
 msgid "Describe your application in %d character"
 msgid_plural "Describe your application in %d characters"
-msgstr[0] "Descrivi l'applicazione in %d caratteri"
-msgstr[1] "Descrivi l'applicazione in %d caratteri"
+msgstr[0] "Descrivi la tua applicazione in %d carattere"
+msgstr[1] "Descrivi la tua applicazione in %d caratteri"
 
 #. TRANS: Form input field instructions.
 msgid "Describe your application"
@@ -7795,23 +7107,21 @@ msgstr ""
 "Accesso predefinito per questa applicazione, sola lettura o lettura-scrittura"
 
 #. TRANS: Submit button title.
-msgid "Cancel"
-msgstr "Annulla"
+msgid "Cancel application changes."
+msgstr "Cancella le modifiche effettuate sull'applicazione."
 
 #. TRANS: Submit button title.
-#. TRANS: Button text to save a list.
-msgid "Save"
-msgstr "Salva"
+msgid "Save application changes."
+msgstr "Salva le modifiche effettuate sull'applicazione."
 
 #. TRANS: Name for an anonymous application in application list.
-#, fuzzy
 msgid "Unknown application"
-msgstr "Azione sconosciuta"
+msgstr "Applicazione sconosciuta"
 
 #. TRANS: Message has a leading space and a trailing space. Used in application list.
 #. TRANS: Before this message the application name is put, behind it the organisation that manages it.
 msgid " by "
-msgstr ""
+msgstr "da "
 
 #. TRANS: Application access type
 msgid "read-write"
@@ -7830,33 +7140,43 @@ msgstr "Approvata %1$s - Accesso \"%2$s\"."
 #. TRANS: %s are the first 7 characters of the access token.
 #, php-format
 msgid "Access token starting with: %s"
-msgstr ""
+msgstr "Token di accesso che iniziano con: %s"
 
 #. TRANS: Button label in application list to revoke access to user data.
 msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "Revoca"
 
+#. TRANS: Submit button text to accept a group membership request on approve group form.
+#. TRANS: Submit button text to accept a subscription request on approve sub form.
+msgctxt "BUTTON"
+msgid "Accept"
+msgstr "Accetta"
+
+#. TRANS: Submit button text to reject a group membership request on approve group form.
+#. TRANS: Submit button text to reject a subscription request on approve sub form.
+msgctxt "BUTTON"
+msgid "Reject"
+msgstr "Rifiuta"
+
 #. TRANS: Atom feed exception thrown when an author element does not contain a name element.
-#, fuzzy
 msgid "Author element must contain a name element."
-msgstr "L'elemento author deve contenere un elemento name."
+msgstr "L'elemento \"author\" deve contenere un elemento \"name\"."
 
 #. TRANS: Server exception thrown when using the method setActivitySubject() in the class Atom10Feed.
-#, fuzzy
 msgid "Do not use this method!"
-msgstr "Non eliminare il messaggio"
+msgstr "Non utilizzare questo metodo!"
 
 #. TRANS: Title in atom list notice feed. %1$s is a list name, %2$s is a tagger's nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "Timeline for people in list %1$s by %2$s"
-msgstr "Risposte a %1$s su %2$s!"
+msgstr "Cronologia per le persone della lista %1$s di %2$s"
 
 #. TRANS: Message is used as a subtitle in atom list notice feed.
 #. TRANS: %1$s is a tagger's nickname, %2$s is a list name, %3$s is a site name.
-#, fuzzy, php-format
+#, php-format
 msgid "Updates from %1$s's list %2$s on %3$s!"
-msgstr "Messaggi da %1$s su %2$s!"
+msgstr "Aggiornamenti dalla lista %2$s di %1$s su %3$s!"
 
 #. TRANS: Title.
 msgid "Notices where this attachment appears"
@@ -7867,12 +7187,10 @@ msgid "Tags for this attachment"
 msgstr "Etichette per questo allegato"
 
 #. TRANS: Exception thrown when a password change fails.
-#, fuzzy
 msgid "Password changing failed."
-msgstr "Modifica della password non riuscita"
+msgstr "Modifica della password non riuscita."
 
 #. TRANS: Exception thrown when a password change attempt fails because it is not allowed.
-#, fuzzy
 msgid "Password changing is not allowed."
 msgstr "La modifica della password non è permessa"
 
@@ -7887,20 +7205,18 @@ msgstr "Blocca questo utente"
 #. TRANS: Submit button text on form to cancel group join request.
 msgctxt "BUTTON"
 msgid "Cancel join request"
-msgstr ""
+msgstr "Cancella la richiesta d'accesso"
 
 #. TRANS: Button text for form action to cancel a subscription request.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Cancel subscription request"
-msgstr "Tutti gli abbonamenti"
+msgstr "Cancella la richiesta d'iscrizione"
 
 #. TRANS: Title for command results.
 msgid "Command results"
 msgstr "Risultati comando"
 
 #. TRANS: Title for command results.
-#, fuzzy
 msgid "AJAX error"
 msgstr "Errore di Ajax"
 
@@ -7963,9 +7279,8 @@ msgstr ""
 "Messaggi: %3$s"
 
 #. TRANS: Error message text shown when a favorite could not be set because it has already been favorited.
-#, fuzzy
 msgid "Could not create favorite: Already favorited."
-msgstr "Impossibile creare un preferito."
+msgstr "Impossibile creare un preferito: già aggiunio ai preferiti."
 
 #. TRANS: Text shown when a notice has been marked as favourite successfully.
 msgid "Notice marked as fave."
@@ -7987,16 +7302,16 @@ msgstr "%1$s ha lasciato il gruppo %2$s."
 #. TRANS: %1$s is the tagged user, %2$s is the error message (no punctuation).
 #, php-format
 msgid "Error tagging %1$s: %2$s"
-msgstr ""
+msgstr "Errore nel taggare %1$s: %2$s"
 
 #. TRANS: Succes message displayed if tagging a user succeeds.
 #. TRANS: %1$s is the tagged user's nickname, %2$s is a list of tags.
 #. TRANS: Plural is decided based on the number of tags added (not part of message).
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s was tagged %2$s"
 msgid_plural "%1$s was tagged %2$s"
-msgstr[0] "%1$s - %2$s"
-msgstr[1] "%1$s - %2$s"
+msgstr[0] "%1$s è stato taggato nella lista %2$s"
+msgstr[1] "%1$s è stato taggato nella lista %2$s"
 
 #. TRANS: Separator for list of tags.
 #. TRANS: Separator in list of user names like "Jim, Bob, Mary".
@@ -8013,7 +7328,7 @@ msgstr "Etichetta non valida: \"%s\""
 #. TRANS: %1$s is the untagged user, %2$s is the error message (no punctuation).
 #, php-format
 msgid "Error untagging %1$s: %2$s"
-msgstr ""
+msgstr "Errore nell'eliminare il tag da %1$s: %2$s"
 
 #. TRANS: Succes message displayed if untagging a user succeeds.
 #. TRANS: %1$s is the untagged user's nickname, %2$s is a list of tags.
@@ -8021,12 +7336,12 @@ msgstr ""
 #, php-format
 msgid "The following tag was removed from user %1$s: %2$s."
 msgid_plural "The following tags were removed from user %1$s: %2$s."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Il seguente tag è stato eliminato dall'utente %1$s: %2$s."
+msgstr[1] "I seguenti tag sono stati rimossi dall'utente %1$s: %2$s."
 
 #. TRANS: Whois output.
 #. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#, fuzzy, php-format
+#, php-format
 msgctxt "WHOIS"
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
@@ -8069,11 +7384,15 @@ msgstr ""
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
 #. TRANS: Message given when a status is too long. %1$s is the maximum number of characters,
 #. TRANS: %2$s is the number of characters sent (used for plural).
-#, fuzzy, php-format
+#, php-format
 msgid "Message too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Message too long - maximum is %1$d characters, you sent %2$d."
-msgstr[0] "Messaggio troppo lungo: massimo %1$d caratteri, inviati %2$d."
-msgstr[1] "Messaggio troppo lungo: massimo %1$d caratteri, inviati %2$d."
+msgstr[0] ""
+"Messaggio troppo lungo: il massimo è di %1$d carattere, tu ne hai inviati %2"
+"$d."
+msgstr[1] ""
+"Messaggio troppo lungo: il massimo è di %1$d caratteri, tu ne hai inviati %2"
+"$d."
 
 #. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
 msgid "You can't send a message to this user."
@@ -8091,11 +7410,15 @@ msgstr "Messaggio da %s ripetuto."
 
 #. TRANS: Message given if content of a notice for a reply is too long. %1$d is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#, fuzzy, php-format
+#, php-format
 msgid "Notice too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Notice too long - maximum is %1$d characters, you sent %2$d."
-msgstr[0] "Messaggio troppo lungo: massimo %1$d caratteri, inviati %2$d."
-msgstr[1] "Messaggio troppo lungo: massimo %1$d caratteri, inviati %2$d."
+msgstr[0] ""
+"Notifica troppo lunga: il massimo è di %1$d carattere, tu ne hai inviati %2"
+"$d."
+msgstr[1] ""
+"Notifica troppo lunga: il massimo è di %1$d caratteri, tu ne hai inviati %2"
+"$d."
 
 #. TRANS: Text shown having sent a reply to a notice successfully.
 #. TRANS: %s is the nickname of the user of the notice the reply was sent to.
@@ -8210,163 +7533,150 @@ msgstr[0] "Non fai parte di questo gruppo:"
 msgstr[1] "Non fai parte di questi gruppi:"
 
 #. TRANS: Header line of help text for commands.
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "Commands:"
-msgstr "Risultati comando"
+msgstr "Comandi:"
 
 #. TRANS: Help message for IM/SMS command "on".
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "turn on notifications"
-msgstr "Impossibile attivare le notifiche."
+msgstr "attivare le notifiche"
 
 #. TRANS: Help message for IM/SMS command "off".
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "turn off notifications"
-msgstr "Impossibile disattivare le notifiche."
+msgstr "disattivare le notifiche"
 
 #. TRANS: Help message for IM/SMS command "help".
 msgctxt "COMMANDHELP"
 msgid "show this help"
-msgstr ""
+msgstr "mostra questo aiuto"
 
 #. TRANS: Help message for IM/SMS command "follow <nickname>".
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "subscribe to user"
-msgstr "Abbonati a questo utente"
+msgstr "iscriviti all'utente"
 
 #. TRANS: Help message for IM/SMS command "groups".
 msgctxt "COMMANDHELP"
 msgid "lists the groups you have joined"
-msgstr ""
+msgstr "ordina nelle liste i gruppi ai quali hai accesso"
 
 #. TRANS: Help message for IM/SMS command "tag".
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "tag a user"
-msgstr "Etichette utente"
+msgstr "tagga un utente"
 
 #. TRANS: Help message for IM/SMS command "untag".
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "untag a user"
-msgstr "Etichette utente"
+msgstr "stagga un utente"
 
 #. TRANS: Help message for IM/SMS command "subscriptions".
 msgctxt "COMMANDHELP"
 msgid "list the people you follow"
-msgstr ""
+msgstr "metti in lista le persone che segui"
 
 #. TRANS: Help message for IM/SMS command "subscribers".
 msgctxt "COMMANDHELP"
 msgid "list the people that follow you"
-msgstr ""
+msgstr "metti in lista le persone che ti seguono"
 
 #. TRANS: Help message for IM/SMS command "leave <nickname>".
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "unsubscribe from user"
-msgstr "Annulla l'abbonamento da questo utente"
+msgstr "cancella l'iscrizione a questo utente"
 
 #. TRANS: Help message for IM/SMS command "d <nickname> <text>".
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "direct message to user"
-msgstr "Messaggi diretti a %s"
+msgstr "messaggio diretto all'utente"
 
 #. TRANS: Help message for IM/SMS command "get <nickname>".
 msgctxt "COMMANDHELP"
 msgid "get last notice from user"
-msgstr ""
+msgstr "ottieni l'ultima notifica dall'utente"
 
 #. TRANS: Help message for IM/SMS command "whois <nickname>".
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "get profile info on user"
-msgstr "Informazioni sul profilo"
+msgstr "ottenere informazioni sul profilo utente"
 
 #. TRANS: Help message for IM/SMS command "lose <nickname>".
 msgctxt "COMMANDHELP"
 msgid "force user to stop following you"
-msgstr ""
+msgstr "costringi l'utente a smettere di seguirti"
 
 #. TRANS: Help message for IM/SMS command "fav <nickname>".
 msgctxt "COMMANDHELP"
 msgid "add user's last notice as a 'fave'"
-msgstr ""
+msgstr "aggiungi l'ultima notifica dell'utente come 'preferito'"
 
 #. TRANS: Help message for IM/SMS command "fav #<notice_id>".
 msgctxt "COMMANDHELP"
 msgid "add notice with the given id as a 'fave'"
-msgstr ""
+msgstr "aggiungi la notifica con il dato id come 'preferito'"
 
 #. TRANS: Help message for IM/SMS command "repeat #<notice_id>".
 msgctxt "COMMANDHELP"
 msgid "repeat a notice with a given id"
-msgstr ""
+msgstr "ripeti la notifica con il dato id"
 
 #. TRANS: Help message for IM/SMS command "repeat <nickname>".
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "repeat the last notice from user"
-msgstr "Ripeti questo messaggio"
+msgstr "ripeti l'ultima notifica dell'utente"
 
 #. TRANS: Help message for IM/SMS command "reply #<notice_id>".
 msgctxt "COMMANDHELP"
 msgid "reply to notice with a given id"
-msgstr ""
+msgstr "rispondi alla notifica con un dato id"
 
 #. TRANS: Help message for IM/SMS command "reply <nickname>".
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "reply to the last notice from user"
-msgstr "Rispondi a questo messaggio"
+msgstr "rispondi all'ultima notifica dell'utente"
 
 #. TRANS: Help message for IM/SMS command "join <group>".
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "join group"
-msgstr "Sconosciuto"
+msgstr "accedi al gruppo"
 
 #. TRANS: Help message for IM/SMS command "login".
 msgctxt "COMMANDHELP"
 msgid "Get a link to login to the web interface"
-msgstr ""
+msgstr "Ottieni un link per accedere all'interfaccia web"
 
 #. TRANS: Help message for IM/SMS command "drop <group>".
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "leave group"
-msgstr "Elimina utente"
+msgstr "abbandona il gruppo"
 
 #. TRANS: Help message for IM/SMS command "stats".
 msgctxt "COMMANDHELP"
 msgid "get your stats"
-msgstr ""
+msgstr "ottieni le tue statistiche"
 
 #. TRANS: Help message for IM/SMS command "stop".
 #. TRANS: Help message for IM/SMS command "quit".
 msgctxt "COMMANDHELP"
 msgid "same as 'off'"
-msgstr ""
+msgstr "come 'off'"
 
 #. TRANS: Help message for IM/SMS command "sub <nickname>".
 msgctxt "COMMANDHELP"
 msgid "same as 'follow'"
-msgstr ""
+msgstr "come 'segui'"
 
 #. TRANS: Help message for IM/SMS command "unsub <nickname>".
 msgctxt "COMMANDHELP"
 msgid "same as 'leave'"
-msgstr ""
+msgstr "come 'lascia'"
 
 #. TRANS: Help message for IM/SMS command "last <nickname>".
 msgctxt "COMMANDHELP"
 msgid "same as 'get'"
-msgstr ""
+msgstr "come 'ottieni'"
 
 #. TRANS: Help message for IM/SMS command "on <nickname>".
 #. TRANS: Help message for IM/SMS command "off <nickname>".
@@ -8377,26 +7687,23 @@ msgstr ""
 #. TRANS: Help message for IM/SMS command "untrack all".
 #. TRANS: Help message for IM/SMS command "tracks".
 #. TRANS: Help message for IM/SMS command "tracking".
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "not yet implemented."
-msgstr "Comando non ancora implementato."
+msgstr "non ancora attuato."
 
 #. TRANS: Help message for IM/SMS command "nudge <nickname>".
 msgctxt "COMMANDHELP"
 msgid "remind a user to update."
-msgstr ""
+msgstr "ricorda l'utente di aggiornare."
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#, fuzzy
 msgid "No configuration file found."
-msgstr "Non è stato trovato alcun file di configurazione. "
+msgstr "Non è stato trovato alcun file di configurazione."
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: Is followed by a list of directories (separated by HTML breaks).
-#, fuzzy
 msgid "I looked for configuration files in the following places:"
-msgstr "I file di configurazione sono stati cercati in questi posti: "
+msgstr "I file di configurazione sono stati cercati in questi posti:"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 msgid "You may wish to run the installer to fix this."
@@ -8409,31 +7716,26 @@ msgstr ""
 msgid "Go to the installer."
 msgstr "Vai al programma d'installazione."
 
+#. TRANS: Header on conversation page. Hidden by default (h2).
+#. TRANS: Label for user statistics.
+msgid "Notices"
+msgstr "Messaggi"
+
 #. TRANS: Page title for when a database error occurs.
 msgid "Database error"
 msgstr "Errore del database"
 
 #. TRANS: Menu item in default local navigation panel.
 #. TRANS: Menu item in search group navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Public"
 msgstr "Pubblico"
 
-#. TRANS: Menu item in default local navigation panel.
-#. TRANS: Menu item in search group navigation panel.
-#. TRANS: Menu item in local navigation menu.
-#, fuzzy
-msgctxt "MENU"
-msgid "Groups"
-msgstr "Gruppi"
-
 #. TRANS: Menu item in default local navigation panel.
 #. TRANS: Menu item title in local navigation menu.
-#, fuzzy
 msgctxt "MENU"
 msgid "Lists"
-msgstr "Limiti"
+msgstr "Liste"
 
 #. TRANS: Title of form for deleting a user.
 #. TRANS: Link text in notice list item to delete a notice.
@@ -8444,74 +7746,37 @@ msgstr "Elimina"
 msgid "Delete this user"
 msgstr "Elimina questo utente"
 
-#. TRANS: Form legend of form for changing the page design.
-#, fuzzy
-msgid "Change design"
-msgstr "Salva aspetto"
-
-#. TRANS: Fieldset legend on profile design page to change profile page colours.
-msgid "Change colours"
-msgstr "Modifica colori"
-
-#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-msgid "Use defaults"
-msgstr "Usa predefiniti"
-
-#. TRANS: Label in form on profile design page.
-#. TRANS: Field contains file name on user's computer that could be that user's custom profile background image.
-msgid "Upload file"
-msgstr "Carica file"
-
-#. TRANS: Instructions for form on profile design page.
-msgid ""
-"You can upload your personal background image. The maximum file size is 2MB."
-msgstr ""
-"Puoi caricare la tua immagine di sfondo. La dimensione massima del file è di "
-"2MB."
-
-#. TRANS: Radio button on profile design page that will enable use of the uploaded profile image.
-#, fuzzy
-msgctxt "RADIO"
-msgid "On"
-msgstr "On"
-
-#. TRANS: Radio button on profile design page that will disable use of the uploaded profile image.
-#, fuzzy
-msgctxt "RADIO"
-msgid "Off"
-msgstr "Off"
-
-#. TRANS: Success message displayed if design settings were saved after clicking "Use defaults".
-msgid "Design defaults restored."
-msgstr "Valori predefiniti ripristinati."
-
 #. TRANS: Exception. %s is an ID.
-#, fuzzy, php-format
+#, php-format
 msgid "Unable to find services for %s."
-msgstr "Impossibile revocare l'accesso per l'applicazione: %s."
+msgstr "Non autorizzato a trovare servizi per: %s."
 
 #. TRANS: Form legend for removing the favourite status for a favourite notice.
-#. TRANS: Title for button text for removing the favourite status for a favourite notice.
 msgid "Disfavor this notice"
 msgstr "Togli questo messaggio dai preferiti"
 
 #. TRANS: Button text for removing the favourite status for a favourite notice.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Disfavor favorite"
-msgstr "Rimuovi preferito"
+msgstr "Rimuovi dai preferiti"
+
+#. TRANS: Button title for removing the favourite status for a favourite notice.
+msgid "Remove this notice from your list of favorite notices."
+msgstr "Rimuovi questa notifica dalla lista dei favoriti."
 
 #. TRANS: Form legend for adding the favourite status to a notice.
-#. TRANS: Title for button text for adding the favourite status to a notice.
 msgid "Favor this notice"
 msgstr "Rendi questo messaggio un preferito"
 
 #. TRANS: Button text for adding the favourite status to a notice.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Favor"
 msgstr "Preferisci"
 
+#. TRANS: Button title for adding the favourite status to a notice.
+msgid "Add this notice to your list of favorite notices."
+msgstr "Aggiungi questa notifica dalla lista dei favoriti."
+
 #. TRANS: Feed type name.
 msgid "RSS 1.0"
 msgstr "RSS 1.0"
@@ -8528,21 +7793,24 @@ msgstr "Atom"
 msgid "FOAF"
 msgstr "FOAF"
 
+#. TRANS: Feed type name. See http://activitystrea.ms/
+msgid "Activity Streams"
+msgstr "Attività Correnti"
+
 #. TRANS: Client exception thrown when an imported feed does not have an author.
 msgid "No author in the feed."
-msgstr ""
+msgstr "Nessun autore nel feed."
 
 #. TRANS: Client exception thrown when an imported feed does not have an author that
 #. TRANS: can be associated with a user.
 msgid "Cannot import without a user."
-msgstr ""
+msgstr "Impossibile importare senza un utente."
 
 #. TRANS: Header for feed links (h2).
 msgid "Feeds"
 msgstr "Feed"
 
 #. TRANS: List element on gallery action page to show all tags.
-#, fuzzy
 msgctxt "TAGS"
 msgid "All"
 msgstr "Tutto"
@@ -8552,15 +7820,35 @@ msgid "Tag"
 msgstr "Etichetta"
 
 #. TRANS: Dropdown field title on gallery action page for a list containing tags.
-#, fuzzy
 msgid "Choose a tag to narrow list."
-msgstr "Scegli un'etichetta per ridurre l'elenco"
+msgstr "Scegli un tag per ridurre la lista."
 
 #. TRANS: Description on form for granting a role.
 #, php-format
 msgid "Grant this user the \"%s\" role"
 msgstr "Concedi a questo utente il ruolo \"%s\""
 
+#. TRANS: Header for mini list of group members on a group page (h2).
+msgid "Members"
+msgstr "Membri"
+
+#. TRANS: Link to all group members from mini list of group members if group has more than n members.
+msgid "All members"
+msgstr "Tutti i membri"
+
+#. TRANS: Header for mini list of users with a pending membership request on a group page (h2).
+msgid "Pending"
+msgstr "In attesa"
+
+#. TRANS: Header for mini list of users that are blocked in a group page (h2).
+msgid "Blocked"
+msgstr "Bloccato"
+
+#. TRANS: Title for list of group administrators on a group page.
+msgctxt "TITLE"
+msgid "Admins"
+msgstr "Amministratori"
+
 #. TRANS: Button text for the form that will block a user from a group.
 msgctxt "BUTTON"
 msgid "Block"
@@ -8568,32 +7856,29 @@ msgstr "Blocca"
 
 #. TRANS: Submit button title.
 msgctxt "TOOLTIP"
-msgid "Block this user"
-msgstr "Blocca questo utente"
+msgid "Block this user so that they can no longer post messages to it."
+msgstr "Blocca questo utente in modo che non possa più scrivere dei messaggi."
 
 #. TRANS: Field title on group edit form.
-#, fuzzy
 msgid "URL of the homepage or blog of the group or topic."
-msgstr "URL della pagina web, blog del gruppo o l'argomento"
+msgstr "URL della homepage o blog del gruppo o argomento."
 
 #. TRANS: Text area title for group description when there is no text limit.
-#, fuzzy
 msgid "Describe the group or topic."
-msgstr "Descrivi il gruppo o l'argomento"
+msgstr "Descrivi il gruppo o l'argomento."
 
 #. TRANS: Text area title for group description.
 #. TRANS: %d is the number of characters available for the description.
-#, fuzzy, php-format
+#, php-format
 msgid "Describe the group or topic in %d character or less."
 msgid_plural "Describe the group or topic in %d characters or less."
-msgstr[0] "Descrivi il gruppo o l'argomento in %d caratteri"
-msgstr[1] "Descrivi il gruppo o l'argomento in %d caratteri"
+msgstr[0] "Descrivi il gruppo o l'argomento in %d carattere o meno"
+msgstr[1] "Descrivi il gruppo o l'argomento in %d caratteri o meno."
 
 #. TRANS: Field title on group edit form.
-#, fuzzy
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\"."
-msgstr "Dove è situato il gruppo, tipo \"città, regione, stato\""
+msgstr "Dove è situato il gruppo, tipo \"città, regione, stato\"."
 
 #. TRANS: Field label on group edit form.
 msgid "Aliases"
@@ -8601,7 +7886,7 @@ msgstr "Alias"
 
 #. TRANS: Input field title for group aliases.
 #. TRANS: %d is the maximum number of group aliases available.
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
 "alias allowed."
@@ -8609,78 +7894,27 @@ msgid_plural ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
 "aliases allowed."
 msgstr[0] ""
-"Soprannomi aggiuntivi per il gruppo, separati da virgole o spazi, max %d"
+"Soprannomi aggiuntivi per il gruppo, separati da virgole o spazi. Massimo %d "
+"alias consentito."
 msgstr[1] ""
-"Soprannomi aggiuntivi per il gruppo, separati da virgole o spazi, max %d"
+"Soprannomi aggiuntivi per il gruppo, separati da virgole o spazi. Massimo %d "
+"alias consentiti."
 
 #. TRANS: Checkbox field title on group edit form to mark a group private.
 msgid ""
 "New members must be approved by admin and all posts are forced to be private."
 msgstr ""
+"I nuovi membri devono essere approvati dall'amministratore e tutti i post "
+"devono essere privati."
 
 #. TRANS: Indicator in group members list that this user is a group administrator.
-#, fuzzy
 msgctxt "GROUPADMIN"
 msgid "Admin"
-msgstr "Amministra"
+msgstr "Amministratore"
 
-#. TRANS: Menu item in the group navigation page.
-msgctxt "MENU"
-msgid "Group"
-msgstr "Gruppo"
-
-#. TRANS: Tooltip for menu item in the group navigation page.
-#. TRANS: %s is the nickname of the group.
-#, php-format
-msgctxt "TOOLTIP"
-msgid "%s group"
-msgstr "Gruppo %s"
-
-#. TRANS: Menu item in the group navigation page.
-msgctxt "MENU"
-msgid "Members"
-msgstr "Membri"
-
-#. TRANS: Tooltip for menu item in the group navigation page.
-#. TRANS: %s is the nickname of the group.
-#, php-format
-msgctxt "TOOLTIP"
-msgid "%s group members"
-msgstr "Membri del gruppo %s"
-
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: %d is the number of pending members.
-#, php-format
-msgctxt "MENU"
-msgid "Pending members (%d)"
-msgid_plural "Pending members (%d)"
-msgstr[0] ""
-msgstr[1] ""
-
-#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: %s is the nickname of the group.
-#, fuzzy, php-format
-msgctxt "TOOLTIP"
-msgid "%s pending members"
-msgstr "Membri del gruppo %s"
-
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-msgctxt "MENU"
-msgid "Blocked"
-msgstr "Bloccato"
-
-#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: %s is the nickname of the group.
-#, php-format
-msgctxt "TOOLTIP"
-msgid "%s blocked users"
-msgstr "Utenti bloccati di %s"
-
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: Menu item in primary navigation panel.
-msgctxt "MENU"
-msgid "Admin"
-msgstr "Amministra"
+#. TRANS: Group actions header (h2). Text hidden by default.
+msgid "Group actions"
+msgstr "Azioni dei gruppi"
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
@@ -8689,11 +7923,6 @@ msgctxt "TOOLTIP"
 msgid "Edit %s group properties"
 msgstr "Modifica proprietà di %s"
 
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-msgctxt "MENU"
-msgid "Logo"
-msgstr "Logo"
-
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
 #, php-format
@@ -8701,32 +7930,32 @@ msgctxt "TOOLTIP"
 msgid "Add or edit %s logo"
 msgstr "Aggiungi o modifica il logo di %s"
 
-#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: %s is the nickname of the group.
-#, php-format
-msgctxt "TOOLTIP"
-msgid "Add or edit %s design"
-msgstr "Aggiungi o modifica l'aspetto di %s"
-
-#. TRANS: Group actions header (h2). Text hidden by default.
-msgid "Group actions"
-msgstr "Azioni dei gruppi"
+#. TRANS: Link text for link on user profile.
+msgctxt "MENU"
+msgid "Logo"
+msgstr "Logo"
 
 #. TRANS: Title for groups with the most members section.
-#, fuzzy
 msgid "Popular groups"
-msgstr "Messaggi famosi"
+msgstr "Gruppi popolari"
 
 #. TRANS: Title for groups with the most posts section.
-#, fuzzy
 msgid "Active groups"
-msgstr "Tutti i gruppi"
+msgstr "Gruppi attivi"
 
-#. TRANS: Title for group tag cloud section.
-#. TRANS: %s is a group name.
-#, php-format
-msgid "Tags in %s group's notices"
-msgstr "Etichette nei messaggi del gruppo %s"
+#. TRANS: Link description for seeing all groups.
+#. TRANS: Link description for seeing all lists.
+msgid "See all"
+msgstr "Vedi tutto"
+
+#. TRANS: Link title for seeing all groups.
+msgid "See all groups you belong to."
+msgstr "Vedi tutti i gruppi ai quali appartieni."
+
+#. TRANS: Menu item title in personal group navigation menu.
+#. TRANS: %s is a username.
+msgid "Back to top"
+msgstr "Torna all'inizio"
 
 #. TRANS: Client exception 406
 msgid "This page is not available in a media type you accept"
@@ -8760,25 +7989,25 @@ msgid "Unknown file type"
 msgstr "Tipo di file sconosciuto"
 
 #. TRANS: Number of megabytes. %d is the number.
-#, fuzzy, php-format
+#, php-format
 msgid "%dMB"
 msgid_plural "%dMB"
-msgstr[0] "MB"
-msgstr[1] "MB"
+msgstr[0] "%dMB"
+msgstr[1] "%dMB"
 
 #. TRANS: Number of kilobytes. %d is the number.
-#, fuzzy, php-format
+#, php-format
 msgid "%dkB"
 msgid_plural "%dkB"
-msgstr[0] "kB"
-msgstr[1] "kB"
+msgstr[0] "%dkB"
+msgstr[1] "%dkB"
 
 #. TRANS: Number of bytes. %d is the number.
 #, php-format
 msgid "%dB"
 msgid_plural "%dB"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%dB"
+msgstr[1] "%dB"
 
 #. TRANS: Body text for confirmation code e-mail.
 #. TRANS: %1$s is a user nickname, %2$s is the StatusNet sitename,
@@ -8791,6 +8020,11 @@ msgid ""
 "user is not you, or if you did not request this confirmation, just ignore "
 "this message."
 msgstr ""
+"L'utente \"%1$s\" su %2$s ha detto che il tuo nome visualizzato %3$s gli "
+"appartiene. Se è vero, devi confermare cliccando su questa URL: %4$s . (Se "
+"non riesci a cliccare, copia e incolla la URL nella barra degli indirizzi "
+"del tuo browser). Se quest'utente non sei tu, o se non hai richiesto tu "
+"questa conferma, ignora semplicemente questo messaggio."
 
 #. TRANS: Exception thrown when trying to deliver a notice to an unknown inbox.
 #. TRANS: %d is the unknown inbox ID (number).
@@ -8800,35 +8034,66 @@ msgstr "Sorgente casella in arrivo %d sconosciuta."
 
 #. TRANS: Server exception thrown trying to initialise an IM plugin without meeting all prerequisites.
 msgid "Queueing must be enabled to use IM plugins."
-msgstr ""
+msgstr "E' necessario abilitare l'accodamento per utilizzare i plugin di IM."
 
 #. TRANS: Server exception thrown trying to initialise an IM plugin without a transport method.
 msgid "Transport cannot be null."
-msgstr ""
+msgstr "Il trasporto non può essere nullo."
 
 #. TRANS: Title for inbox tag cloud section.
 msgctxt "TITLE"
 msgid "Trends"
-msgstr ""
+msgstr "Tendenze"
 
-#. TRANS: Button text for inviting more users to the StatusNet instance.
-#, fuzzy
+#. TRANS: Default button text for inviting more users to the StatusNet instance.
 msgctxt "BUTTON"
 msgid "Invite more colleagues"
-msgstr "Invita nuovi utenti"
+msgstr "Invita più colleghi"
+
+#. TRANS: Form legend.
+msgid "Invite collegues"
+msgstr "Invita colleghi"
+
+#. TRANS: Field label for a list of e-mail addresses.
+msgid "Email addresses"
+msgstr "Indirizzi email"
+
+#. TRANS: Field title for a list of e-mail addresses.
+msgid "Addresses of friends to invite (one per line)."
+msgstr "Indirizzi degli amici da invitare (uno per riga)."
+
+#. TRANS: Field label for a personal message to send to invitees.
+msgid "Personal message"
+msgstr "Messaggio personale"
+
+#. TRANS: Field title for a personal message to send to invitees.
+msgid "Optionally add a personal message to the invitation."
+msgstr "Puoi aggiungere un messaggio personale agli inviti."
+
+#. TRANS: Send button for inviting friends
+#. TRANS: Button text for sending notice.
+msgctxt "BUTTON"
+msgid "Send"
+msgstr "Invia"
+
+#. TRANS: Submit button title.
+msgid "Send invitations."
+msgstr "Manda inviti."
 
 #. TRANS: Button text for joining a group.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Join"
 msgstr "Iscriviti"
 
 #. TRANS: Button text on form to leave a group.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Leave"
 msgstr "Lascia"
 
+#. TRANS: Link title for seeing all lists.
+msgid "See all lists you have created."
+msgstr "Vedi tutte le liste che hai creato."
+
 #. TRANS: Menu item for logging in to the StatusNet site.
 #. TRANS: Menu item in primary navigation panel.
 msgctxt "MENU"
@@ -8855,7 +8120,7 @@ msgstr "Conferma indirizzo email"
 #. TRANS: Body for address confirmation email.
 #. TRANS: %1$s is the addressed user's nickname, %2$s is the StatusNet sitename,
 #. TRANS: %3$s is the URL to confirm at.
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "Hey, %1$s.\n"
 "\n"
@@ -8870,33 +8135,33 @@ msgid ""
 "Thanks for your time, \n"
 "%2$s\n"
 msgstr ""
-"Ciao %s.\n"
+"Ciao %1$s.\n"
 "\n"
-"Qualcuno ha appena inserito questo indirizzo email su %s.\n"
+"Qualcuno ha appena inserito questo indirizzo email su %2$s.\n"
 "\n"
 "Se lo hai fatto tu e vuoi confermare quanto hai fatto, utilizza il "
 "collegamento riportato qui sotto:\n"
 "\n"
-"\t%s\n"
+"%3$s\n"
 "\n"
 "Se non si tratta di te, ignora semplicemente questo messaggio.\n"
 "\n"
 "Grazie per il tuo tempo, \n"
-"%s\n"
+"%2$s\n"
 
 #. TRANS: Subject of new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscribing user's nickname, %2$s is the StatusNet sitename.
 #. TRANS: Main body of new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscriber's long name, %2$s is the StatusNet sitename.
 #, 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."
+msgid "%1$s is now following you on %2$s."
+msgstr "L'utente %1$s ora ti segue su %2$s."
 
 #. TRANS: Subject of pending new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscribing user's nickname, %2$s is the StatusNet sitename.
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s would like to listen to your notices on %2$s."
-msgstr "%1$s sta ora seguendo i tuoi messaggi su %2$s."
+msgstr "%1$s vorrebbe seguire i tuoi aggiornamenti su %2$s."
 
 #. TRANS: Main body of pending new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscriber's long name, %2$s is the StatusNet sitename.
@@ -8905,11 +8170,13 @@ msgid ""
 "%1$s would like to listen to your notices on %2$s. You may approve or reject "
 "their subscription at %3$s"
 msgstr ""
+"%1$s vorrebbe seguire i tuoi aggiornamenti su %2$s. Puoi approvare o "
+"rifiutare la sua iscrizione su %3$s"
 
 #. TRANS: Common footer block for StatusNet notification emails.
 #. TRANS: %1$s is the StatusNet sitename,
 #. TRANS: %2$s is a link to the addressed user's e-mail settings.
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "Faithfully yours,\n"
 "%1$s.\n"
@@ -8917,22 +8184,17 @@ msgid ""
 "----\n"
 "Change your email address or notification options at %2$s"
 msgstr ""
-"%1$s sta ora seguendo i tuoi messaggi su %2$s.\n"
-"\n"
-"\t%3$s\n"
-"\n"
-"%4$s%5$s%6$s\n"
-"Cordiali saluti,\n"
-"%7$s.\n"
+"Distinti saluti,\n"
+"%1$s.\n"
 "\n"
 "----\n"
-"Modifica il tuo indirizzo email o le opzioni di notifica presso %8$s\n"
+"Modifica il tuo indirizzo email o le opzioni di notifica su %2$s"
 
 #. TRANS: Profile info line in notification e-mail.
 #. TRANS: %s is a URL.
-#, fuzzy, php-format
+#, php-format
 msgid "Profile: %s"
-msgstr "Profilo"
+msgstr "Profilo: %s"
 
 #. TRANS: Profile info line in notification e-mail.
 #. TRANS: %s is biographical information.
@@ -8942,14 +8204,14 @@ msgstr "Biografia: %s"
 
 #. TRANS: This is a paragraph in a new-subscriber e-mail.
 #. TRANS: %s is a URL where the subscriber can be reported as abusive.
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "If you believe this account is being used abusively, you can block them from "
 "your subscribers list and report as spam to site administrators at %s."
 msgstr ""
 "Se credi che questo account non sia usato correttamente, puoi bloccarlo "
-"dall'elenco dei tuoi abbonati e segnalarlo come spam all'amministratore del "
-"sito presso %s"
+"dalla lista dei tuoi iscritti e segnalarlo come spam all'amministratore del "
+"sito su %s."
 
 #. TRANS: Subject of notification mail for new posting email address.
 #. TRANS: %s is the StatusNet sitename.
@@ -8960,7 +8222,7 @@ msgstr "Nuovo indirizzo email per inviare messaggi a %s"
 #. TRANS: Body of notification mail for new posting email address.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is the e-mail address to send
 #. TRANS: to to post by e-mail, %3$s is a URL to more instructions.
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
 "\n"
@@ -8968,14 +8230,11 @@ msgid ""
 "\n"
 "More email instructions at %3$s."
 msgstr ""
-"Hai un nuovo indirizzo di invio su %1$s.\n"
+"Hai un nuovo indirizzo per pubblicare su %1$s.\n"
 "\n"
-"Scrivi le email a %2$s per inviare nuovi messaggi.\n"
+"Invia le email a %2$s per pubblicare nuovi messaggi.\n"
 "\n"
-"Puoi trovare maggiori informazioni presso %3$s.\n"
-"\n"
-"Cordiali saluti,\n"
-"%4$s"
+"Puoi trovare maggiori informazioni su %3$s."
 
 #. TRANS: Subject line for SMS-by-email notification messages.
 #. TRANS: %s is the posting user's nickname.
@@ -8996,14 +8255,14 @@ msgstr ""
 
 #. TRANS: Subject for 'nudge' notification email.
 #. TRANS: %s is the nudging user.
-#, fuzzy, php-format
+#, php-format
 msgid "You have been nudged by %s"
-msgstr "%s ti ha richiamato"
+msgstr "%s ti ha trillato"
 
 #. TRANS: Body for 'nudge' notification email.
 #. TRANS: %1$s is the nuding user's long name, $2$s is the nudging user's nickname,
 #. TRANS: %3$s is a URL to post notices at.
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "%1$s (%2$s) is wondering what you are up to these days and is inviting you "
 "to post some news.\n"
@@ -9014,17 +8273,14 @@ msgid ""
 "\n"
 "Don't reply to this email; it won't get to them."
 msgstr ""
-"%1$s (%2$s) si sta chiedendo cosa tu stia facendo in questi giorni e ti "
-"invita a scrivere qualche cosa.\n"
+"%1$s (%2$s) si chiede cosa stai facendo in questi giorni e ti invita a "
+"postare qualche notizia.\n"
 "\n"
-"Fatti sentire! :)\n"
+"Quindi sentiamo un po'! :)\n"
 "\n"
 "%3$s\n"
 "\n"
-"Non rispondere a questa email, nessuno la riceverà!\n"
-"\n"
-"Cordiali saluti,\n"
-"%4$s\n"
+"Non rispondere a questa email; non arriverà a loro."
 
 #. TRANS: Subject for direct-message notification email.
 #. TRANS: %s is the sending user's nickname.
@@ -9035,7 +8291,7 @@ msgstr "Nuovo messaggio privato da %s"
 #. TRANS: Body for direct-message notification email.
 #. TRANS: %1$s is the sending user's long name, %2$s is the sending user's nickname,
 #. TRANS: %3$s is the message content, %4$s a URL to the message,
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
 "\n"
@@ -9059,23 +8315,20 @@ msgstr ""
 "\n"
 "%4$s\n"
 "\n"
-"Non rispondere a questa email, nessuno la riceverà!\n"
-"\n"
-"Cordiali saluti,\n"
-"%5$s\n"
+"Non rispondere a questa email, nessuno la riceverà!"
 
 #. TRANS: Subject for favorite notification e-mail.
 #. TRANS: %1$s is the adding user's long name, %2$s is the adding user's nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s (@%2$s) added your notice as a favorite"
-msgstr "%s (@%s) ha aggiunto il tuo messaggio tra i suoi preferiti"
+msgstr "%1$s (@%2$s) ha aggiunto la tua notizia tra i suoi preferiti"
 
 #. TRANS: Body for favorite notification e-mail.
 #. TRANS: %1$s is the adding user's long name, $2$s is the date the notice was created,
 #. TRANS: %3$s is a URL to the faved notice, %4$s is the faved notice text,
 #. TRANS: %5$s is a URL to all faves of the adding user, %6$s is the StatusNet sitename,
 #. TRANS: %7$s is the adding user's nickname.
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
 "\n"
@@ -9091,23 +8344,20 @@ msgid ""
 "\n"
 "%5$s"
 msgstr ""
-"%1$s (@%7$s) ha appena aggiunto il tuo messaggio da %2$s tra i suoi "
+"%1$s (@%7$s) ha appena aggiunto la tua notizia del %2$s tra i suoi "
 "preferiti.\n"
 "\n"
-"L'indirizzo del tuo messaggio è questo:\n"
+"L'indirizzo della tua notizia è questo:\n"
 "\n"
 "%3$s\n"
 "\n"
-"Il testo del tuo messaggio è:\n"
+"Il testo della tua notizia è:\n"
 "\n"
 "%4$s\n"
 "\n"
-"Puoi consultare l'elenco dei messaggi preferiti di %1$s qui:\n"
+"Puoi consultare l'elenco delle notizie preferite di %1$s qui:\n"
 "\n"
-"%5$s\n"
-"\n"
-"Cordiali saluti,\n"
-"%6$s\n"
+"%5$s"
 
 #. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
 #, php-format
@@ -9122,16 +8372,16 @@ msgstr ""
 
 #. TRANS: E-mail subject for notice notification.
 #. TRANS: %1$s is the sending user's long name, %2$s is the adding user's nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s (@%2$s) sent a notice to your attention"
-msgstr "%s (@%s) ti ha inviato un messaggio"
+msgstr "%1$s (@%2$s) ha inviato una notizia alla tua attenzione"
 
 #. TRANS: Body of @-reply notification e-mail.
 #. TRANS: %1$s is the sending user's name, $2$s is the StatusNet sitename,
 #. TRANS: %3$s is a URL to the notice, %4$s is the notice text,
-#. TRANS: %5$s is a URL to the full conversion if it exists (otherwise empty),
+#. TRANS: %5$s is the text "The full conversation can be read here:" and a URL to the full conversion if it exists (otherwise empty),
 #. TRANS: %6$s is a URL to reply to the notice, %7$s is a URL to all @-replies for the addressed user,
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "%1$s just sent a notice to your attention (an '@-reply') on %2$s.\n"
 "\n"
@@ -9151,8 +8401,8 @@ msgid ""
 "\n"
 "%7$s"
 msgstr ""
-"%1$s (@%9$s) ti ha appena inviato un messaggio (una \"@-risposta\") su %2"
-"$s.\n"
+"%1$s ha appena inviato una notizia alla tua attenzione (una \"@-risposta\") "
+"su %2$s.\n"
 "\n"
 "Il messaggio è qui:\n"
 "\n"
@@ -9168,28 +8418,27 @@ msgstr ""
 "\n"
 "L'elenco di tutte le tue @-risposte si trova qui:\n"
 "\n"
-"%7$s\n"
-"\n"
-"Cordiali saluti,\n"
-"%2$s\n"
-"\n"
-"P.S: puoi disabilitare le notifiche via email qui: %8$s\n"
+"%7$s"
 
 #. TRANS: Subject of group join notification e-mail.
 #. TRANS: %1$s is the joining user's nickname, %2$s is the group name, and %3$s is the StatusNet sitename.
+#, php-format
+msgid "%1$s has joined your group %2$s on %3$s"
+msgstr "L'utente %1$s è entrato nel tuo gruppo %2$s su %3$s"
+
 #. TRANS: Main body of group join notification e-mail.
 #. TRANS: %1$s is the subscriber's long name, %2$s is the group name, and %3$s is the StatusNet sitename,
 #. TRANS: %4$s is a block of profile info about the subscriber.
 #. TRANS: %5$s is a link to the addressed user's e-mail settings.
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s has joined your group %2$s on %3$s."
-msgstr "L'utente %1$s è entrato nel gruppo %2$s."
+msgstr "L'utente %1$s è entrato nel tuo gruppo %2$s su %3$s."
 
 #. TRANS: Subject of pending group join request notification e-mail.
 #. TRANS: %1$s is the joining user's nickname, %2$s is the group name, and %3$s is the StatusNet sitename.
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s wants to join your group %2$s on %3$s."
-msgstr "L'utente %1$s è entrato nel gruppo %2$s."
+msgstr "L'utente %1$s vuole entrare nel tuo gruppo %2$s su %3$s."
 
 #. TRANS: Main body of pending group join request notification e-mail.
 #. TRANS: %1$s is the subscriber's long name, %2$s is the group name, and %3$s is the StatusNet sitename,
@@ -9199,6 +8448,8 @@ msgid ""
 "%1$s would like to join your group %2$s on %3$s. You may approve or reject "
 "their group membership at %4$s"
 msgstr ""
+"%1$s vorrebbe entrare nel tuo gruppo %2$s su %3$s. Puoi approvare o "
+"rifiutare la sua richiesta su %4$s"
 
 #. TRANS: Client error displayed when trying to access a mailbox that is not of the logged in user.
 msgid "Only the user can read their own mailboxes."
@@ -9214,26 +8465,22 @@ msgstr ""
 "messaggi riservati solamente a te."
 
 #. TRANS: Menu item in mailbox menu. Leads to incoming private messages.
-#, fuzzy
 msgctxt "MENU"
 msgid "Inbox"
 msgstr "In arrivo"
 
 #. TRANS: Menu item title in mailbox menu. Leads to incoming private messages.
-#, fuzzy
 msgid "Your incoming messages."
-msgstr "I tuoi messaggi in arrivo"
+msgstr "I tuoi messaggi in arrivo."
 
 #. TRANS: Menu item in mailbox menu. Leads to outgoing private messages.
-#, fuzzy
 msgctxt "MENU"
 msgid "Outbox"
 msgstr "Inviati"
 
 #. TRANS: Menu item title in mailbox menu. Leads to outgoing private messages.
-#, fuzzy
 msgid "Your sent messages."
-msgstr "I tuoi messaggi inviati"
+msgstr "I tuoi messaggi inviati."
 
 #. TRANS: Error message in incoming mail handler used when an incoming e-mail cannot be processed.
 msgid "Could not parse message."
@@ -9253,9 +8500,9 @@ msgstr "Email di ricezione non consentita."
 
 #. TRANS: Error message in incoming mail handler used when an incoming e-mail is of an unsupported type.
 #. TRANS: %s is the unsupported type.
-#, fuzzy, php-format
+#, php-format
 msgid "Unsupported message type: %s."
-msgstr "Tipo di messaggio non supportato: %s"
+msgstr "Tipo di messaggio non supportato: %s."
 
 #. TRANS: Form legend for form to make a user a group admin.
 msgid "Make user an admin of the group"
@@ -9268,8 +8515,8 @@ msgstr "Rendi amministratore"
 
 #. TRANS: Submit button title.
 msgctxt "TOOLTIP"
-msgid "Make this user an admin"
-msgstr "Fa diventare questo utente un amministratore"
+msgid "Make this user an admin."
+msgstr "Rendi questo utente un amministratore."
 
 #. TRANS: Client exception thrown when a database error was thrown during a file upload operation.
 msgid "There was a database error while saving your file. Please try again."
@@ -9314,14 +8561,12 @@ msgstr "Invia un messaggio diretto"
 #. TRANS: Label entry in drop-down selection box in direct-message inbox/outbox.
 #. TRANS: This is the default entry in the drop-down box, doubling as instructions
 #. TRANS: and a brake against accidental submissions with the first user in the list.
-#, fuzzy
 msgid "Select recipient:"
-msgstr "Seleziona licenza"
+msgstr "Seleziona destinatario:"
 
-#. TRANS Entry in drop-down selection box in direct-message inbox/outbox when no one is available to message.
-#, fuzzy
+#. TRANS: Entry in drop-down selection box in direct-message inbox/outbox when no one is available to message.
 msgid "No mutual subscribers."
-msgstr "Non hai l'abbonamento!"
+msgstr "Nessun abbonato reciproco."
 
 #. TRANS: Dropdown label in direct notice form.
 msgid "To"
@@ -9333,9 +8578,8 @@ msgid "Send"
 msgstr "Invia"
 
 #. TRANS: Header in message list.
-#, fuzzy
 msgid "Messages"
-msgstr "Messaggio"
+msgstr "Messaggi"
 
 #. TRANS: Followed by notice source (usually the client used to send the notice).
 #. TRANS: Followed by notice source.
@@ -9343,7 +8587,6 @@ msgid "from"
 msgstr "via"
 
 #. TRANS: A possible notice source (web interface).
-#, fuzzy
 msgctxt "SOURCE"
 msgid "web"
 msgstr "web"
@@ -9354,53 +8597,54 @@ msgid "xmpp"
 msgstr "xmpp"
 
 #. TRANS: A possible notice source (e-mail).
-#, fuzzy
 msgctxt "SOURCE"
 msgid "mail"
-msgstr "Email"
+msgstr "posta"
 
 #. TRANS: A possible notice source (OpenMicroBlogging).
 msgctxt "SOURCE"
 msgid "omb"
-msgstr ""
+msgstr "omb"
 
 #. TRANS: A possible notice source (Application Programming Interface).
 msgctxt "SOURCE"
 msgid "api"
-msgstr ""
+msgstr "api"
 
 #. TRANS: Client exception thrown when no author for an activity was found.
 msgid "Cannot get author for activity."
-msgstr ""
+msgstr "Impossibile ottenere l'autore per l'attività."
 
 #. TRANS: Client exception thrown when ...
-#, fuzzy
 msgid "Bookmark not posted to this group."
-msgstr "Non fai parte di questo gruppo."
+msgstr "Segnalibro non postato in questo gruppo."
 
 #. TRANS: Client exception when ...
-#, fuzzy
 msgid "Object not posted to this user."
-msgstr "Non eliminare il messaggio"
+msgstr "Oggetto non inviato a questo utente."
 
 #. TRANS: Server exception thrown when a micro app plugin uses a target that cannot be handled.
 msgid "Do not know how to handle this kind of target."
-msgstr ""
+msgstr "Non so come gestire questo tipo di target."
 
 #. TRANS: Server exception thrown when a micro app plugin developer has not done his job too well.
 msgid "You must implement either adaptNoticeListItem() or showNotice()."
-msgstr ""
+msgstr "È necessario implementare o adaptNoticeListItem() o showNotice ()."
+
+#. TRANS: Link description to show more items in a list.
+msgid "More â–¼"
+msgstr "Altro â–¼"
 
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 msgid "Nickname cannot be empty."
-msgstr ""
+msgstr "Il nickname non può essere vuoto."
 
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 #, php-format
 msgid "Nickname cannot be more than %d character long."
 msgid_plural "Nickname cannot be more than %d characters long."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Il nickname non può essere più lungo di %d carattere."
+msgstr[1] "Il nickname non può essere più lungo di %d caratteri."
 
 #. TRANS: Form legend for notice form.
 msgid "Send a notice"
@@ -9416,9 +8660,8 @@ msgid "Attach"
 msgstr "Allega"
 
 #. TRANS: Title for input field to attach a file to a notice.
-#, fuzzy
 msgid "Attach a file."
-msgstr "Allega un file"
+msgstr "Allega un file."
 
 #. TRANS: Field label to add location to a notice.
 msgid "Share my location"
@@ -9441,10 +8684,6 @@ msgctxt "SEPARATOR"
 msgid ", "
 msgstr ", "
 
-#. TRANS: Start of profile addressees list.
-msgid " â–¸ "
-msgstr " â–¸ "
-
 #. TRANS: Used in coordinates as abbreviation of north.
 msgid "N"
 msgstr "N"
@@ -9483,293 +8722,238 @@ msgid "Repeated by"
 msgstr "Ripetuto da"
 
 #. TRANS: Link title in notice list item to reply to a notice.
-msgid "Reply to this notice"
-msgstr "Rispondi a questo messaggio"
+msgid "Reply to this notice."
+msgstr "Rispondi a questa notizia."
 
 #. TRANS: Link text in notice list item to reply to a notice.
 msgid "Reply"
 msgstr "Rispondi"
 
 #. TRANS: Link title in notice list item to delete a notice.
-msgid "Delete this notice"
-msgstr "Elimina questo messaggio"
+msgid "Delete this notice from the timeline."
+msgstr "Elimina questa notizia dalla cronologia."
 
 #. TRANS: Title for repeat form status in notice list when a notice has been repeated.
-#, fuzzy
 msgid "Notice repeated."
-msgstr "Messaggio ripetuto"
+msgstr "Notizia ripetuta."
 
 #. TRANS: Field label for notice text.
 msgid "Update your status..."
-msgstr ""
+msgstr "Aggiorna il tuo stato..."
 
 #. TRANS: Form legend of form to nudge/ping another user.
 msgid "Nudge this user"
 msgstr "Richiama questo utente"
 
 #. TRANS: Button text to nudge/ping another user.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Nudge"
-msgstr "Richiama"
+msgstr "Trilla"
 
 #. TRANS: Button title to nudge/ping another user.
-#, fuzzy
 msgid "Send a nudge to this user."
-msgstr "Invia un richiamo a questo utente"
-
-#. TRANS: Exception thrown when creating a new profile fails in OAuth store.
-msgid "Error inserting new profile."
-msgstr "Errore nell'inserire il nuovo profilo."
-
-#. TRANS: Exception thrown when creating a new avatar fails in OAuth store.
-msgid "Error inserting avatar."
-msgstr "Errore nell'inserire l'immagine."
-
-#. TRANS: Exception thrown when creating a remote profile fails in OAuth store.
-msgid "Error inserting remote profile."
-msgstr "Errore nell'inserire il profilo remoto."
-
-#. TRANS: Exception thrown when a notice is denied because it has been sent before.
-msgid "Duplicate notice."
-msgstr "Messaggio duplicato."
-
-#. TRANS: Exception thrown when creating a new subscription fails in OAuth store.
-#, fuzzy
-msgid "Could not insert new subscription."
-msgstr "Impossibile inserire un nuovo abbonamento."
+msgstr "Invia un trillo a questo utente."
 
 #. TRANS: Server exception thrown in oEmbed action if no API endpoint is available.
-#, fuzzy
 msgid "No oEmbed API endpoint available."
-msgstr "Messaggistica istantanea non disponibile."
+msgstr "Nessun termine oEmbed API disponibile."
 
 #. TRANS: Field label for list.
-#, fuzzy
 msgctxt "LABEL"
 msgid "List"
-msgstr "Collegamenti"
+msgstr "Lista"
 
 #. TRANS: Field title for list.
-#, fuzzy
 msgid "Change the list (letters, numbers, -, ., and _ are allowed)."
-msgstr ""
-"Etichette per questo utente (lettere, numeri, -, . e _), separate da virgole "
-"o spazi"
+msgstr "Modifica la lista (sono ammessi lettere, numeri, -, . e _)."
 
 #. TRANS: Field title for description of list.
-#, fuzzy
 msgid "Describe the list or topic."
-msgstr "Descrivi il gruppo o l'argomento"
+msgstr "Descrivi la lista o l'argomento."
 
 #. TRANS: Field title for description of list.
 #. TRANS: %d is the maximum number of characters for the description.
-#, fuzzy, php-format
+#, php-format
 msgid "Describe the list or topic in %d character."
 msgid_plural "Describe the list or topic in %d characters."
-msgstr[0] "Descrivi il gruppo o l'argomento in %d caratteri"
-msgstr[1] "Descrivi il gruppo o l'argomento in %d caratteri"
+msgstr[0] "Descrivi la lista o l'argomento in %d carattere"
+msgstr[1] "Descrivi la lista o l'argomento in %d caratteri"
 
 #. TRANS: Button title to delete a list.
-#, fuzzy
 msgid "Delete this list."
-msgstr "Elimina questo utente"
+msgstr "Elimina questa lista."
 
 #. TRANS: Header in list edit form.
 msgid "Add or remove people"
-msgstr ""
+msgstr "Aggiungi o rimuovi persone"
 
 #. TRANS: Header in list edit form.
-#, fuzzy
 msgctxt "HEADER"
 msgid "Search"
 msgstr "Cerca"
 
 #. TRANS: Menu item in list navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "List"
-msgstr "Collegamenti"
+msgstr "Lista"
 
 #. TRANS: Menu item title in list navigation panel.
 #. TRANS: %1$s is a list, %2$s is a nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s list by %2$s."
-msgstr "%1$s - %2$s"
+msgstr "Lista %1$s di %2$s."
 
 #. TRANS: Menu item in list navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Listed"
-msgstr "Licenza"
+msgstr "Aggiunto alla lista"
 
 #. TRANS: Menu item in list navigation panel.
 #. TRANS: Menu item in local navigation menu.
-#, fuzzy
 msgctxt "MENU"
 msgid "Subscribers"
-msgstr "Abbonati"
+msgstr "Iscritti"
 
 #. TRANS: Menu item title in list navigation panel.
 #. TRANS: %1$s is a list, %2$s is a nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "Subscribers to %1$s list by %2$s."
-msgstr "Abbonati a %s."
+msgstr "Iscritti alla lista %1$s di %2$s."
 
 #. TRANS: Menu item in list navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Edit"
 msgstr "Modifica"
 
 #. TRANS: Menu item title in list navigation panel.
 #. TRANS: %s is a list.
-#, fuzzy, php-format
+#, php-format
 msgid "Edit %s list by you."
-msgstr "Modifica il gruppo %s"
-
-#. TRANS: Link description for link to list of users tagged with a tag.
-#, fuzzy
-msgid "Tagged"
-msgstr "Etichetta"
+msgstr "Modifica la tua lista %s."
 
 #. TRANS: Title for link to edit list settings.
-#, fuzzy
 msgid "Edit list settings."
-msgstr "Modifica impostazioni del profilo"
+msgstr "Modifica impostazioni della lista."
 
 #. TRANS: Text for link to edit list settings.
 msgid "Edit"
 msgstr "Modifica"
 
 #. TRANS: Privacy mode text in list list item for private list.
-#, fuzzy
 msgctxt "MODE"
 msgid "Private"
 msgstr "Privato"
 
 #. TRANS: Menu item in the group navigation page.
-#, fuzzy
 msgctxt "MENU"
 msgid "List Subscriptions"
-msgstr "Abbonamenti"
+msgstr "Iscrizioni alla lista"
 
 #. TRANS: Tooltip for menu item in the group navigation page.
 #. TRANS: %s is a user nickname.
-#, fuzzy, php-format
+#, php-format
 msgctxt "TOOLTIP"
 msgid "Lists subscribed to by %s."
-msgstr "Abbonati a %s."
+msgstr "Liste alle quali %s si è iscritto."
 
 #. TRANS: Menu item in the group navigation page.
 #. TRANS: %s is a user nickname.
-#, fuzzy, php-format
+#, php-format
 msgctxt "MENU"
 msgid "Lists with %s"
-msgstr "Messaggi con \"%s\""
+msgstr "Liste con %s"
 
 #. TRANS: Tooltip for menu item in the group navigation page.
 #. TRANS: %s is a user nickname.
-#, fuzzy, php-format
+#, php-format
 msgctxt "TOOLTIP"
 msgid "Lists with %s."
-msgstr "Messaggi con \"%s\""
+msgstr "Liste con %s."
 
 #. TRANS: Menu item in the group navigation page.
 #. TRANS: %s is a user nickname.
 #, php-format
 msgctxt "MENU"
 msgid "Lists by %s"
-msgstr ""
+msgstr "Liste di %s"
 
 #. TRANS: Tooltip for menu item in the group navigation page.
 #. TRANS: %s is a user nickname.
-#, fuzzy, php-format
+#, php-format
 msgctxt "TOOLTIP"
 msgid "Lists by %s."
-msgstr "%1$s - %2$s"
+msgstr "Liste di %s."
 
 #. TRANS: Label in lists widget.
-#, fuzzy
 msgctxt "LABEL"
 msgid "Your lists"
-msgstr "Messaggi famosi"
+msgstr "Le tue liste"
 
 #. TRANS: Fieldset legend in lists widget.
-#, fuzzy
 msgctxt "LEGEND"
 msgid "Edit lists"
-msgstr "Non è un'etichetta valida di persona: %s."
+msgstr "Modifica liste"
 
 #. TRANS: Label in self tags widget.
-#, fuzzy
 msgctxt "LABEL"
 msgid "Tags"
-msgstr "Etichette"
+msgstr "Tag"
 
 #. TRANS: Title for section contaning lists with the most subscribers.
-#, fuzzy
 msgid "Popular lists"
-msgstr "Messaggi famosi"
+msgstr "Liste popolari"
 
 #. TRANS: List summary. %1$d is the number of users in the list,
 #. TRANS: %2$d is the number of subscribers to the list.
-#, fuzzy, php-format
+#, php-format
 msgid "Listed: %1$d Subscribers: %2$d"
-msgstr "Abbonati a %1$s, pagina %2$d"
+msgstr "Aggiunti alla lista: %1$d Iscritti: %2$d"
 
 #. TRANS: Title for page that displays which lists current user is part of.
-#, fuzzy, php-format
+#, php-format
 msgid "Lists with you"
-msgstr "Metodo delle API non trovato."
+msgstr "Liste con te"
 
 #. TRANS: Title for page that displays which lists a user is part of.
 #. TRANS: %s is a profile name.
-#, fuzzy, php-format
+#, php-format
 msgid "Lists with %s"
-msgstr "Messaggi con \"%s\""
+msgstr "Liste con %s"
 
 #. TRANS: Title for page that displays lists a user has subscribed to.
-#, fuzzy
 msgid "List subscriptions"
-msgstr "Abbonamenti di %s"
+msgstr "Iscrizioni alla lista"
 
 #. TRANS: Menu item in personal group navigation menu.
 #. TRANS: Menu item in settings navigation panel.
 #. TRANS: Menu item in local navigation menu.
-#, fuzzy
 msgctxt "MENU"
 msgid "Profile"
 msgstr "Profilo"
 
 #. TRANS: Menu item title in personal group navigation menu.
-#, fuzzy
 msgid "Your profile"
-msgstr "Profilo del gruppo"
+msgstr "Il tuo profilo"
 
 #. TRANS: Menu item in personal group navigation menu.
-#, fuzzy
 msgctxt "MENU"
 msgid "Replies"
 msgstr "Risposte"
 
 #. TRANS: Menu item in personal group navigation menu.
-#, fuzzy
 msgctxt "MENU"
 msgid "Favorites"
 msgstr "Preferiti"
 
 #. TRANS: Replaces %s in '%s\'s favorite notices'. (Yes, we know we need to fix this.)
-#, fuzzy
 msgctxt "FIXME"
 msgid "User"
 msgstr "Utente"
 
 #. TRANS: Menu item in personal group navigation menu.
-#, fuzzy
 msgctxt "MENU"
 msgid "Messages"
-msgstr "Messaggio"
+msgstr "Messaggi"
 
 #. TRANS: Menu item title in personal group navigation menu.
 msgid "Your incoming messages"
@@ -9782,32 +8966,38 @@ msgstr "Sconosciuto"
 #. TRANS: Plugin admin panel controls
 msgctxt "plugin"
 msgid "Disable"
-msgstr ""
+msgstr "Disabilita"
 
 #. TRANS: Plugin admin panel controls
 msgctxt "plugin"
 msgid "Enable"
-msgstr ""
+msgstr "Abilitato"
 
+#. TRANS: Plugin description for a disabled plugin.
 msgctxt "plugin-description"
-msgid "(Plugin descriptions unavailable when disabled.)"
+msgid ""
+"(The plugin description is unavailable when a plugin has been disabled.)"
 msgstr ""
+"(La descrizione del plugin non è disponibile quando il plugin è stato "
+"disabilitato.)"
 
 #. TRANS: Menu item in primary navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Settings"
-msgstr "Impostazioni SMS"
+msgstr "Impostazioni"
 
 #. TRANS: Menu item title in primary navigation panel.
-#, fuzzy
 msgid "Change your personal settings."
-msgstr "Modifica le impostazioni del tuo profilo"
+msgstr "Modifica le tue impostazioni personali."
+
+#. TRANS: Menu item in primary navigation panel.
+msgctxt "MENU"
+msgid "Admin"
+msgstr "Amministra"
 
 #. TRANS: Menu item title in primary navigation panel.
-#, fuzzy
 msgid "Site configuration."
-msgstr "Configurazione utente"
+msgstr "Configurazione del sito."
 
 #. TRANS: Menu item in primary navigation panel.
 msgctxt "MENU"
@@ -9815,34 +9005,27 @@ msgid "Logout"
 msgstr "Esci"
 
 #. TRANS: Menu item title in primary navigation panel.
-#, fuzzy
 msgid "Logout from the site."
-msgstr "Termina la tua sessione sul sito"
+msgstr "Esci dal sito."
 
 #. TRANS: Menu item title in primary navigation panel.
-#, fuzzy
 msgid "Login to the site."
-msgstr "Accedi al sito"
+msgstr "Accedi al sito."
 
-#. TRANS: Menu item in primary navigation panel.
-msgctxt "MENU"
-msgid "Search"
-msgstr "Cerca"
-
-#. TRANS: Menu item title in primary navigation panel.
-#, fuzzy
-msgid "Search the site."
-msgstr "Cerca nel sito"
+msgid "This profile has been silenced by site moderators"
+msgstr "Questo profilo è stato oscurato dai moderatori del sito"
 
 #. TRANS: H2 text for user subscription statistics.
-#, fuzzy
 msgid "Following"
-msgstr "Segui"
+msgstr "Seguendo"
 
 #. TRANS: H2 text for user subscriber statistics.
-#, fuzzy
 msgid "Followers"
-msgstr "Segui"
+msgstr "Seguaci"
+
+#. TRANS: H2 text for user statistics.
+msgid "Statistics"
+msgstr "Statistiche"
 
 #. TRANS: Label for user statistics.
 msgid "User ID"
@@ -9852,10 +9035,6 @@ msgstr "ID utente"
 msgid "Member since"
 msgstr "Membro dal"
 
-#. TRANS: Label for user statistics.
-msgid "Notices"
-msgstr "Messaggi"
-
 #. TRANS: Label for user statistics.
 #. TRANS: Average count of posts made per day since account registration.
 msgid "Daily average"
@@ -9866,9 +9045,8 @@ msgid "Groups"
 msgstr "Gruppi"
 
 #. TRANS: H2 text for user list membership statistics.
-#, fuzzy
 msgid "Lists"
-msgstr "Limiti"
+msgstr "Liste"
 
 #. TRANS: Server error displayed when using an unimplemented method.
 msgid "Unimplemented method."
@@ -9879,31 +9057,28 @@ msgid "User groups"
 msgstr "Gruppi dell'utente"
 
 #. TRANS: Menu item in search group navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Recent tags"
-msgstr "Etichette recenti"
+msgstr "Tag recenti"
 
 #. TRANS: Menu item title in search group navigation panel.
 msgid "Recent tags"
 msgstr "Etichette recenti"
 
 #. TRANS: Menu item in search group navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Featured"
 msgstr "In evidenza"
 
 #. TRANS: Menu item in search group navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Popular"
-msgstr "Famosi"
+msgstr "Popolare"
 
 #. TRANS: Title for inbox tag cloud section.
 msgctxt "TITLE"
 msgid "Trending topics"
-msgstr ""
+msgstr "Argomenti di tendenza"
 
 #. TRANS: Client error displayed when return-to was defined without a target.
 msgid "No return-to arguments."
@@ -9914,9 +9089,8 @@ msgid "Repeat this notice?"
 msgstr "Ripetere questo messaggio?"
 
 #. TRANS: Button title to repeat a notice on notice repeat form.
-#, fuzzy
 msgid "Repeat this notice."
-msgstr "Ripeti questo messaggio"
+msgstr "Ripeti questa notizia."
 
 #. TRANS: Description of role revoke form. %s is the role to be revoked.
 #, php-format
@@ -9924,12 +9098,10 @@ msgid "Revoke the \"%s\" role from this user"
 msgstr "Revoca il ruolo \"%s\" a questo utente"
 
 #. TRANS: Client error on action trying to visit a non-existing page.
-#, fuzzy
 msgid "Page not found."
-msgstr "Metodo delle API non trovato."
+msgstr "Pagina non trovata."
 
 #. TRANS: Title of form to sandbox a user.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Sandbox"
 msgstr "Sandbox"
@@ -9948,6 +9120,7 @@ msgid "Keyword(s)"
 msgstr "Parole"
 
 #. TRANS: Button text for searching site.
+#. TRANS: Button text for search button on search form.
 #. TRANS: Button text to search profiles.
 msgctxt "BUTTON"
 msgid "Search"
@@ -9960,6 +9133,10 @@ msgid ""
 "* Try more general keywords.\n"
 "* Try fewer keywords."
 msgstr ""
+"* Accertati che tutte le parole siano digitate correttamente.\n"
+"* Prova parole chiave differenti.\n"
+"* Prova parole chiave più generali.\n"
+"* Prova meno parole chiave."
 
 #. TRANS: Standard search suggestions shown when a search does not give any results.
 #, php-format
@@ -9973,9 +9150,16 @@ msgid ""
 "* [Yahoo](http://search.yahoo.com/search?p=site%%3A%%%%site.server%%%%+%s)\n"
 "* [Collecta](http://collecta.com/#q=%s)"
 msgstr ""
+"Puoi provare ad effettuare la tua ricerca anche su altri motori di ricerca:\n"
+"\n"
+"* [Twingly](http://www.twingly.com/search?q=%s&content=microblog&site=%%%%"
+"site.server%%%%)\n"
+"* [Tweet scan](http://www.tweetscan.com/indexi.php?s=%s)\n"
+"* [Google](http://www.google.com/search?q=site%%3A%%%%site.server%%%%+%s)\n"
+"* [Yahoo](http://search.yahoo.com/search?p=site%%3A%%%%site.server%%%%+%s)\n"
+"* [Collecta](http://collecta.com/#q=%s)"
 
 #. TRANS: Menu item in search group navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "People"
 msgstr "Persone"
@@ -9985,10 +9169,9 @@ msgid "Find people on this site"
 msgstr "Trova persone in questo sito"
 
 #. TRANS: Menu item in search group navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Notices"
-msgstr "Messaggi"
+msgstr "Avvisi"
 
 #. TRANS: Menu item title in search group navigation panel.
 msgid "Find content of notices"
@@ -9998,60 +9181,26 @@ msgstr "Trova contenuto dei messaggi"
 msgid "Find groups on this site"
 msgstr "Trova gruppi in questo sito"
 
-#. TRANS: Secondary navigation menu item leading to help on StatusNet.
-msgctxt "MENU"
-msgid "Help"
-msgstr "Aiuto"
-
-#. TRANS: Secondary navigation menu item leading to text about StatusNet site.
-#, fuzzy
-msgctxt "MENU"
-msgid "About"
-msgstr "Informazioni"
-
-#. TRANS: Secondary navigation menu item leading to Frequently Asked Questions.
-#, fuzzy
-msgctxt "MENU"
-msgid "FAQ"
-msgstr "FAQ"
-
 #. TRANS: Secondary navigation menu item leading to Terms of Service.
-#, fuzzy
 msgctxt "MENU"
 msgid "TOS"
 msgstr "TOS"
 
 #. TRANS: Secondary navigation menu item leading to privacy policy.
-#, fuzzy
 msgctxt "MENU"
 msgid "Privacy"
 msgstr "Privacy"
 
 #. TRANS: Secondary navigation menu item. Leads to information about StatusNet and its license.
-#, fuzzy
 msgctxt "MENU"
 msgid "Source"
-msgstr "Sorgenti"
+msgstr "Sorgente"
 
 #. TRANS: Secondary navigation menu item leading to version information on the StatusNet site.
-#, fuzzy
 msgctxt "MENU"
 msgid "Version"
 msgstr "Versione"
 
-#. TRANS: Secondary navigation menu item leading to e-mail contact information on the
-#. TRANS: StatusNet site, where to report bugs, ...
-#, fuzzy
-msgctxt "MENU"
-msgid "Contact"
-msgstr "Contatti"
-
-#. TRANS: Secondary navigation menu item. Leads to information about embedding a timeline widget.
-#, fuzzy
-msgctxt "MENU"
-msgid "Badge"
-msgstr "Badge"
-
 #. TRANS: Default title for section/sidebar widget.
 msgid "Untitled section"
 msgstr "Sezione senza nome"
@@ -10061,27 +9210,24 @@ msgid "More..."
 msgstr "Altro..."
 
 #. TRANS: Header in settings navigation panel.
-#, fuzzy
 msgctxt "HEADER"
 msgid "Settings"
-msgstr "Impostazioni SMS"
+msgstr "Impostazioni"
 
 #. TRANS: Menu item title in settings navigation panel.
 msgid "Change your profile settings"
 msgstr "Modifica le impostazioni del tuo profilo"
 
 #. TRANS: Menu item in settings navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Avatar"
-msgstr "Immagine"
+msgstr "Avatar"
 
 #. TRANS: Menu item title in settings navigation panel.
 msgid "Upload an avatar"
 msgstr "Carica un'immagine"
 
 #. TRANS: Menu item in settings navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Password"
 msgstr "Password"
@@ -10091,7 +9237,6 @@ msgid "Change your password"
 msgstr "Modifica la tua password"
 
 #. TRANS: Menu item in settings navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Email"
 msgstr "Email"
@@ -10100,32 +9245,25 @@ msgstr "Email"
 msgid "Change email handling"
 msgstr "Modifica la gestione dell'email"
 
-#. TRANS: Menu item title in settings navigation panel.
-msgid "Design your profile"
-msgstr "Progetta il tuo profilo"
-
 #. TRANS: Menu item in settings navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "URL"
 msgstr "URL"
 
 #. TRANS: Menu item title in settings navigation panel.
 msgid "URL shorteners"
-msgstr ""
+msgstr "Servizi di accorciamento degli URL"
 
 #. TRANS: Menu item in settings navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "IM"
-msgstr "MI"
+msgstr "IM"
 
 #. TRANS: Menu item title in settings navigation panel.
 msgid "Updates by instant messenger (IM)"
 msgstr "Messaggi via messaggistica istantanea (MI)"
 
 #. TRANS: Menu item in settings navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "SMS"
 msgstr "SMS"
@@ -10135,7 +9273,6 @@ msgid "Updates by SMS"
 msgstr "Messaggi via SMS"
 
 #. TRANS: Menu item in settings navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Connections"
 msgstr "Connessioni"
@@ -10144,57 +9281,99 @@ msgstr "Connessioni"
 msgid "Authorized connected applications"
 msgstr "Applicazioni collegate autorizzate"
 
+#. TRANS: Menu item in settings navigation panel.
+msgctxt "MENU"
+msgid "Old school"
+msgstr "Old school"
+
+#. TRANS: Menu item title in settings navigation panel.
+msgid "UI tweaks for old-school users"
+msgstr "Piccole modifiche UI per gli utenti old-school"
+
 #. TRANS: Title of form to silence a user.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Silence"
-msgstr "Zittisci"
+msgstr "Silenzio"
 
 #. TRANS: Description of form to silence a user.
 msgid "Silence this user"
 msgstr "Zittisci questo utente"
 
+#. TRANS: Server error displayed when trying to create an anynymous OAuth consumer.
+msgid "Could not create anonymous consumer."
+msgstr "Impossibile creare il consumatore anonimo."
+
+#. TRANS: Server error displayed when trying to create an anynymous OAuth application.
+msgid "Could not create anonymous OAuth application."
+msgstr "Impossibile creare un'applicazione anonima OAuth."
+
+#. TRANS: Exception thrown when no token association could be found.
+msgid ""
+"Could not find a profile and application associated with the request token."
+msgstr ""
+"Impossibile trovare un profilo e l'applicazione associata alla richiesta del "
+"token."
+
+#. TRANS: Exception thrown when no access token can be issued.
+msgid "Could not issue access token."
+msgstr "Impossibile emettere il token di accesso."
+
+#. TRANS: Exception thrown when a database error occurs.
+msgid "Database error inserting OAuth application user."
+msgstr "Errore nel database nell'inserire l'applicazione utente OAuth."
+
+#. TRANS: Exception thrown when a database error occurs.
+msgid "Database error updating OAuth application user."
+msgstr "Errore nel database nell'aggiornare l'applicazione utente OAuth."
+
+#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
+msgid "Tried to revoke unknown token."
+msgstr "Tentativo di revocare un token sconosciuto."
+
+#. TRANS: Exception thrown when an attempt is made to remove a revoked token.
+msgid "Failed to delete revoked token."
+msgstr "Eliminazione del token revocato non riuscita."
+
 #. TRANS: Menu item in local navigation menu.
-#, fuzzy
 msgctxt "MENU"
 msgid "Subscriptions"
-msgstr "Abbonamenti"
+msgstr "Iscrizioni"
 
 #. TRANS: Menu item title in local navigation menu.
 #. TRANS: %s is a user nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "People %s subscribes to."
-msgstr "Persone di cui %s ha un abbonamento"
+msgstr "Persone iscritte da %s."
 
 #. TRANS: Menu item title in local navigation menu.
 #. TRANS: %s is a user nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "People subscribed to %s."
-msgstr "Persone abbonate a %s"
+msgstr "Persone iscritte a %s."
 
 #. TRANS: Menu item in local navigation menu.
 #. TRANS: %d is the number of pending subscription requests.
 #, php-format
 msgctxt "MENU"
 msgid "Pending (%d)"
-msgstr ""
+msgstr "In sospeso (%d)"
 
 #. TRANS: Menu item title in local navigation menu.
 #, php-format
 msgid "Approve pending subscription requests."
-msgstr ""
+msgstr "Approva le richieste di iscrizione in sospeso."
 
 #. TRANS: Menu item title in local navigation menu.
 #. TRANS: %s is a user nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "Groups %s is a member of."
-msgstr "Gruppi di cui %s fa parte"
+msgstr "Gruppi di cui %s fa parte."
 
 #. TRANS: Menu item title in local navigation menu.
 #. TRANS: %s is a user nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "List subscriptions by %s."
-msgstr "Persone abbonate a %s"
+msgstr "Lista iscrizioni di %s."
 
 #. TRANS: Menu item in local navigation menu.
 msgctxt "MENU"
@@ -10203,14 +9382,24 @@ msgstr "Invita"
 
 #. TRANS: Menu item title in local navigation menu.
 #. TRANS: %s is the StatusNet sitename.
-#, fuzzy, php-format
+#, php-format
 msgid "Invite friends and colleagues to join you on %s."
-msgstr "Invita amici e colleghi a seguirti su %s"
+msgstr "Invita amici e colleghi ad unirsi a te su %s."
 
 #. TRANS: Form of form to subscribe to a user.
 msgid "Subscribe to this user"
 msgstr "Abbonati a questo utente"
 
+#. TRANS: Button text to subscribe to a user.
+#. TRANS: Button text for subscribing to a list.
+msgctxt "BUTTON"
+msgid "Subscribe"
+msgstr "Iscriviti"
+
+#. TRANS: Button title to subscribe to a user.
+msgid "Subscribe to this user."
+msgstr "Iscriviti a questo utente."
+
 #. TRANS: Title of personal tag cloud section.
 msgid "People Tagcloud as self-tagged"
 msgstr "Insieme delle etichette delle persone come auto-etichettate"
@@ -10220,15 +9409,13 @@ msgid "People Tagcloud as tagged"
 msgstr "Insieme delle etichette delle persone come etichettate"
 
 #. TRANS: Content displayed in a tag cloud section if there are no tags.
-#, fuzzy
 msgctxt "NOTAGS"
 msgid "None"
 msgstr "Nessuno"
 
 #. TRANS: Server exception displayed if a theme name was invalid.
-#, fuzzy
 msgid "Invalid theme name."
-msgstr "Nome file non valido."
+msgstr "Nome tema non valido."
 
 #. TRANS: Exception thrown when a compressed theme is uploaded while no support present in PHP configuration.
 msgid "This server cannot handle theme uploads without ZIP support."
@@ -10245,25 +9432,25 @@ msgid "Failed saving theme."
 msgstr "Salvataggio del tema non riuscito."
 
 #. TRANS: Server exception thrown when an uploaded theme has an incorrect structure.
-#, fuzzy
 msgid "Invalid theme: Bad directory structure."
-msgstr "Tema non valido: struttura directory non corretta."
+msgstr "Tema non valido: Struttura della directory non corretta."
 
 #. TRANS: Client exception thrown when an uploaded theme is larger than the limit.
 #. TRANS: %d is the number of bytes of the uncompressed theme.
-#, fuzzy, php-format
+#, php-format
 msgid "Uploaded theme is too large; must be less than %d byte uncompressed."
 msgid_plural ""
 "Uploaded theme is too large; must be less than %d bytes uncompressed."
 msgstr[0] ""
-"Il tema caricato è troppo grande, deve essere meno di %d byte non compresso."
+"Il tema caricato è troppo grande, deve essere inferiore a %d byte non "
+"compresso."
 msgstr[1] ""
-"Il tema caricato è troppo grande, deve essere meno di %d byte non compresso."
+"Il tema caricato è troppo grande, deve essere inferiore a %d bytes non "
+"compressi."
 
 #. TRANS: Server exception thrown when an uploaded theme is incomplete.
-#, fuzzy
 msgid "Invalid theme archive: Missing file css/display.css"
-msgstr "File di tema non valido: manca il file css/display.css"
+msgstr "Archivio del tema non valido: Manca il file css/display.css"
 
 #. TRANS: Server exception thrown when an uploaded theme has an incorrect file or folder name.
 msgid ""
@@ -10280,45 +9467,43 @@ msgstr ""
 
 #. TRANS: Server exception thrown when an uploaded theme contains a file type that is not allowed.
 #. TRANS: %s is the file type that is not allowed.
-#, fuzzy, php-format
+#, php-format
 msgid "Theme contains file of type \".%s\", which is not allowed."
-msgstr "Il tema contiene file di tipo \".%s\" che non sono supportati."
+msgstr "Il tema contiene file di tipo \".%s\", che non è supportato."
 
 #. TRANS: Server exception thrown when an uploaded compressed theme cannot be opened.
 msgid "Error opening theme archive."
 msgstr "Errore nell'aprire il file del tema."
 
 #. TRANS: Header for Notices section.
-#, fuzzy
 msgctxt "HEADER"
 msgid "Notices"
-msgstr "Messaggi"
+msgstr "Notizie"
 
 #. TRANS: Link to show replies for a notice.
 #. TRANS: %d is the number of replies to a notice and used for plural.
 #, php-format
 msgid "Show reply"
 msgid_plural "Show all %d replies"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Mostra la risposta"
+msgstr[1] "Mostra tutte e %d le risposte"
 
 #. TRANS: Reference to the logged in user in favourite list.
 msgctxt "FAVELIST"
 msgid "You"
-msgstr ""
+msgstr "Tu"
 
 #. TRANS: For building a list such as "Jim, Bob, Mary and 5 others like this".
 #. TRANS: %1$s is a list of users, separated by a separator (default: ", "), %2$s is the last user in the list.
-#, fuzzy, php-format
+#, php-format
 msgctxt "FAVELIST"
 msgid "%1$s and %2$s"
-msgstr "%1$s - %2$s"
+msgstr "%1$s e %2$s"
 
 #. TRANS: List message for notice favoured by logged in user.
-#, fuzzy
 msgctxt "FAVELIST"
 msgid "You like this."
-msgstr "Messaggi famosi"
+msgstr "Ti piace."
 
 #. TRANS: List message for when more than 4 people like something.
 #. TRANS: %%s is a list of users liking a notice, %d is the number over 4 that like the notice.
@@ -10326,8 +9511,8 @@ msgstr "Messaggi famosi"
 #, php-format
 msgid "%%s and %d others like this."
 msgid_plural "%%s and %d others like this."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "A %%s e a %d altro piace questo."
+msgstr[1] "A %%s e a %d altri piace questo."
 
 #. TRANS: List message for favoured notices.
 #. TRANS: %%s is a list of users liking a notice.
@@ -10335,63 +9520,69 @@ msgstr[1] ""
 #, php-format
 msgid "%%s likes this."
 msgid_plural "%%s like this."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "A %%s piace questo."
+msgstr[1] "A %%s piace questo."
 
 #. TRANS: List message for notice repeated by logged in user.
-#, fuzzy
 msgctxt "REPEATLIST"
-msgid "You have repeated this notice."
-msgstr "Hai già ripetuto quel messaggio."
+msgid "You repeated this."
+msgstr "Lo hai ripetuto."
 
-#. TRANS: List message for repeated notices.
-#. TRANS: %d is the number of users that have repeated a notice.
-#, fuzzy, php-format
-msgid "One person has repeated this notice."
-msgid_plural "%d people have repeated this notice."
-msgstr[0] "Hai già ripetuto quel messaggio."
-msgstr[1] "Hai già ripetuto quel messaggio."
+#. TRANS: List message for when more than 4 people repeat something.
+#. TRANS: %%s is a list of users liking a notice, %d is the number over 4 that like the notice.
+#. TRANS: Plural is decided on the total number of users liking the notice (count of %%s + %d).
+#, php-format
+msgid "%%s and %d other repeated this."
+msgid_plural "%%s and %d others repeated this."
+msgstr[0] "A %%s e a %d altro ripetono questo."
+msgstr[1] "A %%s e a %d altri ripetono questo."
+
+#. TRANS: List message for favoured notices.
+#. TRANS: %%s is a list of users liking a notice.
+#. TRANS: Plural is based on the number of of users that have favoured a notice.
+#, php-format
+msgid "%%s repeated this."
+msgid_plural "%%s repeated this."
+msgstr[0] "%%s ha ripetuto questo."
+msgstr[1] "%%s hanno ripetuto questo."
 
 #. TRANS: Form legend.
-#, fuzzy, php-format
+#, php-format
 msgid "Search and list people"
-msgstr "Cerca nel sito"
+msgstr "Cerca e aggiungi in lista le persone"
 
 #. TRANS: Dropdown option for searching in profiles.
 msgid "Everything"
 msgstr "Tutto"
 
 #. TRANS: Dropdown option for searching in profiles.
-#, fuzzy
 msgid "Fullname"
-msgstr "Nome"
+msgstr "Nome completo"
 
 #. TRANS: Dropdown option for searching in profiles.
 msgid "URI (Remote users)"
-msgstr ""
+msgstr "URI (Utenti remoti)"
 
 #. TRANS: Dropdown field label.
-#, fuzzy
 msgctxt "LABEL"
 msgid "Search in"
-msgstr "Cerca nel sito"
+msgstr "Cerca qui"
 
 #. TRANS: Dropdown field title.
-#, fuzzy
 msgid "Choose a field to search."
-msgstr "Scegli un'etichetta per ridurre l'elenco"
+msgstr "Scegli un campo per la ricerca."
 
 #. TRANS: Form legend.
 #. TRANS: %1$s is a nickname, $2$s is a list.
-#, fuzzy, php-format
+#, php-format
 msgid "Remove %1$s from list %2$s"
-msgstr "%1$s - %2$s"
+msgstr "Rimuovi %1$s dalla lista %2$s"
 
 #. TRANS: Legend on form to add a profile to a list.
 #. TRANS: %1$s is a nickname, %2$s is a list.
-#, fuzzy, php-format
+#, php-format
 msgid "Add %1$s to list %2$s"
-msgstr "%1$s - %2$s"
+msgstr "Aggiungi %1$s alla lista %2$s"
 
 #. TRANS: Title for top posters section.
 msgid "Top posters"
@@ -10406,32 +9597,28 @@ msgstr "Tutti"
 #. TRANS: %s is a StatusNet sitename.
 #, php-format
 msgid "My colleagues at %s"
-msgstr ""
+msgstr "I miei colleghi su %s"
 
 #. TRANS: Label for drop-down of potential addressees.
-#, fuzzy
 msgctxt "LABEL"
 msgid "To:"
-msgstr "A"
+msgstr "A:"
 
 #. TRANS: Checkbox label in widget for selecting potential addressees to mark the notice private.
-#, fuzzy
 msgid "Private?"
-msgstr "Privato"
+msgstr "Privato?"
 
 #. TRANS: Client exception thrown in widget for selecting potential addressees when an invalid fill option was received.
-#, fuzzy, php-format
+#, php-format
 msgid "Unknown to value: \"%s\"."
-msgstr "Lingua \"%s\" sconosciuta."
+msgstr "Sconosciuto al valore: \"%s\"."
 
 #. TRANS: Title for the form to unblock a user.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Unblock"
 msgstr "Sblocca"
 
 #. TRANS: Title for unsandbox form.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Unsandbox"
 msgstr "Unsandbox"
@@ -10449,27 +9636,28 @@ msgid "Unsilence this user"
 msgstr "Fai parlare nuovamente questo utente"
 
 #. TRANS: Form legend on unsubscribe form.
-#. TRANS: Button title on unsubscribe form.
 msgid "Unsubscribe from this user"
 msgstr "Annulla l'abbonamento da questo utente"
 
 #. TRANS: Button text on unsubscribe form.
 #. TRANS: Button text for unsubscribing from a list.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Unsubscribe"
-msgstr "Disabbonati"
+msgstr "Cancella iscrizione"
+
+#. TRANS: Button title on unsubscribe form.
+msgid "Unsubscribe from this user."
+msgstr "Cancellati da questo utente."
 
 #. TRANS: Exception text shown when no profile can be found for a user.
 #. TRANS: %1$s is a user nickname, $2$d is a user ID (number).
-#, fuzzy, php-format
+#, php-format
 msgid "User %1$s (%2$d) has no profile record."
-msgstr "L'utente non ha un profilo."
+msgstr "L'utente %1$s (%2$d) non ha alcun record del profilo."
 
 #. TRANS: Authorisation exception thrown when a user a not allowed to login.
-#, fuzzy
 msgid "Not allowed to log in."
-msgstr "Accesso non effettuato."
+msgstr "Accesso non consentito."
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 msgid "a few seconds ago"
@@ -10525,26 +9713,23 @@ msgstr "circa un anno fa"
 
 #. TRANS: Web color exception thrown when a hexadecimal color code does not validate.
 #. TRANS: %s is the provided (invalid) color code.
-#, fuzzy, php-format
+#, php-format
 msgid "%s is not a valid color! Use 3 or 6 hex characters."
-msgstr "%s non è un colore valido. Usa 3 o 6 caratteri esadecimali."
+msgstr "%s non è un colore valido! Usa 3 o 6 caratteri esadecimali."
 
 #. TRANS: Exception.
-#, fuzzy
 msgid "Invalid XML."
-msgstr "Dimensione non valida."
+msgstr "XML non valido."
 
 #. TRANS: Exception.
 msgid "Invalid XML, missing XRD root."
-msgstr ""
+msgstr "XML non valido, radice XRD mancante."
 
 #. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
 #, php-format
 msgid "Getting backup from file '%s'."
-msgstr ""
+msgstr "Ottenere il backup da file '%s'."
 
-#~ msgid "%1$s and friends, page %2$d"
-#~ msgstr "%1$s e amici, pagina %2$d"
-
-#~ msgid "You and friends"
-#~ msgstr "Tu e i tuoi amici"
+#
+#~ msgid " "
+#~ msgstr " "
diff --git a/locale/ja/LC_MESSAGES/statusnet.po b/locale/ja/LC_MESSAGES/statusnet.po
index 64a11fb954..2ba7e2c4df 100644
--- a/locale/ja/LC_MESSAGES/statusnet.po
+++ b/locale/ja/LC_MESSAGES/statusnet.po
@@ -4,6 +4,9 @@
 # Author: Brion
 # Author: Calamari
 # Author: Fryed-peach
+# Author: Masakiyamaguchi
+# Author: Miwa ka
+# Author: Shirayuki
 # Author: Sonoda
 # Author: Whym
 # Author: ��守歌
@@ -14,17 +17,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:21+0000\n"
-"Language-Team: Japanese <http://translatewiki.net/wiki/Portal:ja>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:15+0000\n"
+"Language-Team: Japanese <https://translatewiki.net/wiki/Portal:ja>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ja\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-POT-Import-Date: 2011-05-05 10:52:40+0000\n"
+"X-POT-Import-Date: 2012-04-22 22:02:21+0000\n"
 
 #. TRANS: Database error message.
 #, php-format
@@ -34,27 +37,25 @@ msgid ""
 "contact them at %2$s to make sure. Otherwise, wait a few minutes and try "
 "again."
 msgstr ""
-
-#. TRANS: Error message.
-msgid ""
-"An important error occured, probably related to email setup. Check logfiles "
-"for more info."
-msgstr ""
+"%1$s �データベース�正��応答������サイト�正常�動作���ん��サイ"
+"ト管�者���ら��題を知�����。%2$s を確��連絡�る�������。�"
+"����れ��数分待���ら�やり直������。"
 
 #. TRANS: Error message.
 msgid "An error occurred."
-msgstr ""
+msgstr "エラー�発生����。"
 
 #. TRANS: Error message displayed when there is no StatusNet configuration file.
 #, php-format
 msgid ""
 "No configuration file found. Try running the installation program first."
 msgstr ""
+"設定ファイル�見��り��ん���。��インストール プログラムを実行����"
+"����。"
 
 #. TRANS: Error message displayed when trying to access a non-existing page.
-#, fuzzy
 msgid "Unknown page"
-msgstr "�明"
+msgstr "�明�ページ"
 
 #. TRANS: Error message displayed when trying to perform an undefined action.
 #. TRANS: Title for password recovery page when an unknown action has been specified.
@@ -67,7 +68,7 @@ msgstr "アクセス"
 
 #. TRANS: Page notice.
 msgid "Site access settings"
-msgstr "サイトアクセス設定"
+msgstr "サイト��アクセス�設定"
 
 #. TRANS: Form legend for registration form.
 msgid "Registration"
@@ -87,7 +88,7 @@ msgstr "プライベート"
 
 #. TRANS: Checkbox instructions for admin setting "Invite only".
 msgid "Make registration invitation only."
-msgstr "招待��登録��る。"
+msgstr "招待者��登録���。"
 
 #. TRANS: Checkbox label for configuring site as invite only.
 msgid "Invite only"
@@ -95,18 +96,17 @@ msgstr "招待��"
 
 #. TRANS: Checkbox instructions for admin setting "Closed" (no new registrations).
 msgid "Disable new registrations."
-msgstr "新�登録を無効。"
+msgstr "新�登録を無効����。"
 
 #. TRANS: Checkbox label for disabling new user registrations.
 msgid "Closed"
-msgstr "閉�られ�"
+msgstr "クローズ"
 
-#. TRANS: Title for button to save access settings in site admin panel.
-msgid "Save access settings"
-msgstr "アクセス設定��存"
+#. TRANS: Button title to save access settings in site admin panel.
+msgid "Save access settings."
+msgstr "アクセス設定を�存���。"
 
-#. TRANS: Tooltip for button to save access settings in site admin panel.
-#. TRANS: Button text for saving theme settings.
+#. TRANS: Button text to save access settings in site admin panel.
 #. TRANS: Button label to save e-mail preferences.
 #. TRANS: Button label to save IM preferences.
 #. TRANS: Button text in the license admin panel.
@@ -122,7 +122,6 @@ msgstr "アクセス設定��存"
 #. TRANS: Button text for saving "Other settings" in profile.
 #. TRANS: Button text to save user settings in user admin panel.
 #. TRANS: Button label in the "Edit application" form.
-#. TRANS: Button text on profile design page to save settings.
 #. TRANS: Text for save button on group edit form.
 #. TRANS: Button text to save tags for a profile.
 msgctxt "BUTTON"
@@ -140,7 +139,7 @@ msgstr "�存"
 #. TRANS: Client error displayed when the session token is not okay.
 #. TRANS: Client error displayed when the session token does not match or is not given.
 msgid "There was a problem with your session token. Try again, please."
-msgstr "����セッショントークン��題��り���。�度�試�����。"
+msgstr "セッション トークン��題��り���。も�一度試������。"
 
 #. TRANS: Error message displayed when trying to perform an action that requires a logged in user.
 msgid "Not logged in."
@@ -152,27 +151,20 @@ msgstr "ログイン�����ん。"
 #. TRANS: Client error displayed when referring to a non-existing profile.
 #. TRANS: Client error displayed trying to subscribe to a non-existing profile.
 #. TRANS: Client error displayed trying to perform an action related to a non-existing profile.
-#, fuzzy
 msgid "No such profile."
-msgstr "��よ��ファイル��り��ん。"
+msgstr "��よ��プロファイル��り��ん。"
 
 #. TRANS: Client error displayed trying to reference a non-existing list.
 #. TRANS: Client error displayed when referring to a non-existing list.
 #. TRANS: Client error displayed trying to reference a non-existing list.
-#, fuzzy
 msgid "No such list."
-msgstr "��よ��タグ��り��ん。"
-
-#. TRANS: Client error displayed when trying to add an OMB 0.1 remote profile to a list.
-#, fuzzy
-msgid "You cannot list an OMB 0.1 remote profile with this action."
-msgstr "������プロファイル�フォロー�れ����ん。"
+msgstr "��よ��リスト��り��ん。"
 
 #. TRANS: Client error displayed when an unknown error occurs when adding a user to a list.
 #. TRANS: %s is a username.
 #, php-format
 msgid "There was an unexpected error while listing %s."
-msgstr ""
+msgstr "%s �んをリスト�追加中��予期���エラー�発生����。"
 
 #. TRANS: Client error displayed when an unknown error occurs when adding a user to a list.
 #. TRANS: %s is a profile URL.
@@ -181,12 +173,13 @@ msgid ""
 "There was a problem listing %s. The remote server is probably not responding "
 "correctly. Please try retrying later."
 msgstr ""
+"%s リスト��題��り���。リモートサー�ー���ら�正��応答�����"
+"ん。後��試行��������。"
 
 #. TRANS: Title after adding a user to a list.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Listed"
-msgstr "ライセンス"
+msgstr "リスト"
 
 #. TRANS: Server error when page not found (404).
 #. TRANS: Server error when page not found (404)
@@ -198,7 +191,6 @@ msgstr "��よ��ページ��り��ん。"
 #. TRANS: Client error when user not found for an rss related action.
 #. TRANS: Client error displayed when no existing user is provided for a user's delivery device setting.
 #. TRANS: Client error displayed if a user could not be found.
-#. TRANS: Client error when user not found updating a profile background image.
 #. TRANS: Client error displayed updating profile image without having a user object.
 #. TRANS: Client error displayed when making an Atom API request for an unknown user.
 #. TRANS: Client error displayed when trying to block a non-existing user or a user from another site.
@@ -224,14 +216,11 @@ msgstr "��よ��ページ��り��ん。"
 #. TRANS: Client error displayed when trying to get the RSS feed with favorites of a user that does not exist.
 #. TRANS: Client error displayed when requesting Friends of a Friend feed without providing a user nickname.
 #. TRANS: Client error displayed when requesting Friends of a Friend feed for an object that is not a user.
-#. TRANS: Client error displayed when trying to get a user hCard for a non-existing user.
 #. TRANS: Client error displayed trying to make a micro summary without providing a valid user.
 #. TRANS: Client error displayed trying to send a direct message to a non-existing user.
 #. TRANS: Client error displayed trying to use "one time password login" without using an existing user.
 #. TRANS: Client error displayed when referring to non-existing user.
 #. TRANS: Client error displayed trying to perform an action related to a non-existing user.
-#. TRANS: Form validation error on page for remote subscribe when no user was provided.
-#. TRANS: Form validation error on page for remote subscribe when no user profile was found.
 #. TRANS: Client error displayed when trying to reply to a non-exsting user.
 #. TRANS: Client error displayed when providing a non-existing nickname in a RSS 1.0 action.
 #. TRANS: Client error.
@@ -240,47 +229,53 @@ msgstr "��よ��ページ��り��ん。"
 #. TRANS: Client error displayed trying to find a user by ID for a non-existing ID.
 #. TRANS: Client error displayed requesting groups for a non-existing user.
 #. TRANS: Client error displayed when user not found for an action.
-#. TRANS: Client error displayed providing a non-existing nickname.
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #. TRANS: Client error displayed when trying to perform a gallery action with an unknown user.
 #. TRANS: Client error displayed when trying to access a mailbox without providing a user.
 #. TRANS: Client error displayed when calling a profile action without specifying a user.
 msgid "No such user."
-msgstr "��よ��ユーザ����ん。"
+msgstr "��よ��ユーザー����ん。"
 
 #. TRANS: Title of a user's own start page.
-#, fuzzy
 msgid "Home timeline"
-msgstr "%s �タイムライン"
+msgstr "ホームタイムライン"
 
 #. TRANS: Title of another user's start page.
 #. TRANS: %s is the other user's name.
-#, fuzzy, php-format
+#, php-format
 msgid "%s's home timeline"
-msgstr "%s �タイムライン"
+msgstr "%s �ん�ホームタイムライン"
+
+#. TRANS: %s is user nickname.
+#. TRANS: Feed title.
+#. TRANS: %s is tagger's nickname.
+#, php-format
+msgid "Feed for friends of %s (Activity Streams JSON)"
+msgstr "%s �ん��人�フィード (Activity Streams JSON)"
 
 #. TRANS: %s is user nickname.
 #, php-format
 msgid "Feed for friends of %s (RSS 1.0)"
-msgstr "%s��人�フィード(RSS 1.0)"
+msgstr "%s �ん��人�フィード (RSS 1.0)"
 
 #. TRANS: %s is user nickname.
 #. TRANS: Feed title.
 #. TRANS: %s is tagger's nickname.
 #, php-format
 msgid "Feed for friends of %s (RSS 2.0)"
-msgstr "%s��人�フィード(RSS 2.0)"
+msgstr "%s �ん��人�フィード (RSS 2.0)"
 
 #. TRANS: %s is user nickname.
 #, php-format
 msgid "Feed for friends of %s (Atom)"
-msgstr "%s��人�フィード(Atom)"
+msgstr "%s �ん��人�フィード (Atom)"
 
 #. TRANS: Empty list message. %s is a user nickname.
 #, php-format
 msgid ""
 "This is the timeline for %s and friends but no one has posted anything yet."
-msgstr "�れ�%s����人�タイムライン������誰も投稿�����ん。"
+msgstr ""
+"�れ� %s �ん����人�タイムライン������誰も投稿�����ん。"
 
 #. TRANS: Encouragement displayed on logged in user's empty timeline.
 #. TRANS: This message contains Markdown links. Keep "](" together.
@@ -299,10 +294,11 @@ msgid ""
 "You can try to [nudge %1$s](../%2$s) from their profile or [post something "
 "to them](%%%%action.newnotice%%%%?status_textarea=%3$s)."
 msgstr ""
-"最�� [��トピック投稿](%%%%action.newnotice%%%%?status_textarea=%s) を��"
-"����!"
+"��人�プロファイル�ら [%1$s �ん��図](../%2$s) ������������ "
+"[��人�何�を��や������](%%%%action.newnotice%%%%?status_textarea=%"
+"3$s)。"
 
-#. TRANS: Encoutagement displayed on empty timeline user pages for anonymous users.
+#. TRANS: Encouragement displayed on empty timeline user pages for anonymous users.
 #. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
 #. TRANS: Empty list message for page with replies for a user for not logged in users.
 #. TRANS: %1$s is a user nickname. This message contains a Markdown link in the form [link text](link).
@@ -313,8 +309,14 @@ msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
 "post a notice to them."
 msgstr ""
-"�� [アカウント登録](%%action.register%%) �������。���最��投稿を"
-"������!"
+"�� [アカウント登録](%%action.register%%) ����������後� %s �ん�"
+"�図�る����や������。"
+
+#. TRANS: Button text for inviting more users to the StatusNet instance.
+#. TRANS: Less business/enterprise-oriented language for public sites.
+msgctxt "BUTTON"
+msgid "Send invite"
+msgstr "招待状を�信"
 
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Title of API timeline for a user and friends.
@@ -324,23 +326,21 @@ msgstr ""
 #. TRANS: %s is a username.
 #. TRANS: Menu item title in personal group navigation menu.
 #. TRANS: %s is a username.
-#. TRANS: Menu item title in settings navigation panel.
-#. TRANS: %s is a username.
 #, php-format
 msgid "%s and friends"
-msgstr "%s����人"
+msgstr "%s �ん����人"
 
 #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
 #. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name.
 #, php-format
 msgid "Updates from %1$s and friends on %2$s!"
-msgstr "%2$s � %1$s ��人�ら�更新��り���"
+msgstr "%2$s 上� %1$s �ん��人�更新��り���"
 
 #. TRANS: Client error displayed when coming across a non-supported API method.
 #. TRANS: Client error displayed when trying to handle an unknown API method.
 #. TRANS: Client error displayed when coming across a non-supported API method.
 msgid "API method not found."
-msgstr "API メソッド�見��り��ん。"
+msgstr "API メソッド��り��ん。"
 
 #. TRANS: Client error message. POST is a HTTP command. It should not be translated.
 #. TRANS: Client error. POST is a HTTP command. It should not be translated.
@@ -350,13 +350,11 @@ msgid "This method requires a POST."
 msgstr "��メソッド�� POST �必���。"
 
 #. TRANS: Client error displayed when no valid device parameter is provided for a user's delivery device setting.
-#, fuzzy
 msgid ""
 "You must specify a parameter named 'device' with a value of one of: sms, im, "
 "none."
 msgstr ""
-"「device�������引数を�次�中�ら値を�ん��指定�る必���り��: "
-"sms, im, none"
+"'device' パラメータ�次�値���れ�を指定�る必���り��: sms, im, none"
 
 #. TRANS: Server error displayed when a user's delivery device cannot be updated.
 #. TRANS: Server error displayed when confirming an e-mail address or IM address fails.
@@ -366,23 +364,21 @@ msgstr ""
 #. TRANS: Server error thrown on database error updating SMS preferences.
 #. TRANS: Server error thrown on database error removing a registered SMS phone number.
 #. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
-#. TRANS: Server exception thrown on Profile design page when updating design settings fails.
 msgid "Could not update user."
-msgstr "ユーザを更新����ん���。"
+msgstr "ユーザーを更新����ん���。"
 
 #. TRANS: Error message displayed when referring to a user without a profile.
 msgid "User has no profile."
-msgstr "ユーザ�プロフィールをも�����ん。"
+msgstr "ユーザー��プロファイル��り��ん。"
 
 #. TRANS: Server error displayed if a user profile could not be saved.
 #. TRANS: Server error thrown when user profile settings could not be saved.
 msgid "Could not save profile."
-msgstr "プロフィールを�存����ん���。"
+msgstr "プロファイルを�存����ん���。"
 
 #. TRANS: Client error displayed when the number of bytes in a POST request exceeds a limit.
 #. TRANS: %s is the number of bytes of the CONTENT_LENGTH.
-#. TRANS: Form validation error in design settings form. POST should remain untranslated.
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "The server was unable to handle that much POST data (%s byte) due to its "
 "current configuration."
@@ -390,31 +386,11 @@ msgid_plural ""
 "The server was unable to handle that much POST data (%s bytes) due to its "
 "current configuration."
 msgstr[0] ""
-"サー�ー��在�構���由��大�� POST データ (%s�イト) を処��る���"
-"����ん���。"
-
-#. TRANS: Client error displayed when saving design settings fails because of an empty id.
-#. TRANS: Client error displayed when saving design settings fails because of an empty result.
-#. TRANS: Client error displayed when a database error occurs inserting profile colours.
-#. TRANS: Client error displayed when a database error occurs updating profile colours.
-#. TRANS: Form validation error displayed when group design settings could not be saved because of an application issue.
-#. TRANS: Form validation error on Profile design page when saving design settings has failed.
-#. TRANS: Form validation error on Profile design page when updating design settings has failed.
-msgid "Unable to save your design settings."
-msgstr "����デザイン設定を�存����ん。"
-
-#. TRANS: Error displayed when updating design settings fails.
-#. TRANS: Client error displayed when a database error occurs updating profile colours.
-#. TRANS: Form validation error on Profile design page when updating design settings has failed.
-#. TRANS: Error message displayed if design settings could not be saved.
-#. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
-msgid "Could not update your design."
-msgstr "デザインを更新����ん���。"
 
 #. TRANS: Title for Atom feed.
 msgctxt "ATOM"
 msgid "Main"
-msgstr ""
+msgstr "メイン"
 
 #. TRANS: Title for Atom feed. %s is a user nickname.
 #. TRANS: Message is used as link title. %s is a user nickname.
@@ -422,7 +398,7 @@ msgstr ""
 #. TRANS: Title in atom user notice feed. %s is a user name.
 #, php-format
 msgid "%s timeline"
-msgstr "%s �タイムライン"
+msgstr "%s �ん�タイムライン"
 
 #. TRANS: Title for Atom feed with a user's subscriptions. %s is a user nickname.
 #. TRANS: Title for Atom subscription feed.
@@ -431,19 +407,19 @@ msgstr "%s �タイムライン"
 #. TRANS: %s is a user nickname.
 #, php-format
 msgid "%s subscriptions"
-msgstr "%s フォロー���る"
+msgstr "%s �んをフォロー���る"
 
 #. TRANS: Title for Atom feed with a user's favorite notices. %s is a user nickname.
 #. TRANS: Title for Atom favorites feed.
 #. TRANS: %s is a user nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "%s favorites"
-msgstr "�気�入り"
+msgstr "%s �ん��気�入り"
 
 #. TRANS: Title for Atom feed with a user's memberships. %s is a user nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "%s memberships"
-msgstr "%s グループメン�ー"
+msgstr "%s �ん�メン�ーシップ"
 
 #. TRANS: Client error displayed when users try to block themselves.
 msgid "You cannot block yourself!"
@@ -451,31 +427,45 @@ msgstr "自分自身をブロック�る�������ん�"
 
 #. TRANS: Server error displayed when blocking a user has failed.
 msgid "Block user failed."
-msgstr "ユーザ�ブロック�失敗����。"
+msgstr "ユーザー�ブロック�失敗����"
 
 #. TRANS: Server error displayed when unblocking a user has failed.
 msgid "Unblock user failed."
-msgstr "ユーザ�ブロック解除�失敗����。"
+msgstr "ユーザー�ブロック解除�失敗����"
+
+#. TRANS: Client exception thrown when no conversation ID is given.
+msgid "No conversation ID."
+msgstr "conversation ID �指定�れ����ん"
+
+#. TRANS: Client exception thrown when referring to a non-existing conversation ID (%d).
+#, php-format
+msgid "No conversation with ID %d."
+msgstr "ID %d � conversation ��り��ん"
+
+#. TRANS: Title for conversion timeline.
+msgctxt "TITLE"
+msgid "Conversation"
+msgstr "会話"
 
 #. TRANS: Title. %s is a user nickname.
 #, php-format
 msgid "Direct messages from %s"
-msgstr "%s �ら�ダイレクトメッセージ"
+msgstr "%s �ん�ら�ダイレクトメッセージ"
 
 #. TRANS: Subtitle. %s is a user nickname.
 #, php-format
 msgid "All the direct messages sent from %s"
-msgstr "%s �ら�られ�全��ダイレクトメッセージ"
+msgstr "%s �ん��信������ダイレクトメッセージ"
 
 #. TRANS: Title. %s is a user nickname.
 #, php-format
 msgid "Direct messages to %s"
-msgstr "%s ��ダイレクトメッセージ"
+msgstr "%s �ん��ダイレクトメッセージ"
 
 #. TRANS: Subtitle. %s is a user nickname.
 #, php-format
 msgid "All the direct messages sent to %s"
-msgstr "%s ����全��ダイレクトメッセージ"
+msgstr "%s �ん��信������ダイレクトメッセージ"
 
 #. TRANS: Client error displayed when no message text was submitted (406).
 msgid "No message text!"
@@ -485,22 +475,22 @@ msgstr "メッセージ�本文��り��ん�"
 #. TRANS: %d is the maximum number of characters for a message.
 #. TRANS: Form validation error displayed when message content is too long.
 #. TRANS: %d is the maximum number of characters for a message.
-#, fuzzy, php-format
+#, php-format
 msgid "That's too long. Maximum message size is %d character."
 msgid_plural "That's too long. Maximum message size is %d characters."
-msgstr[0] "長����。メッセージ�最大 %d 字����。"
+msgstr[0] ""
 
 #. TRANS: Client error displayed if a recipient user could not be found (403).
 msgid "Recipient user not found."
-msgstr "���り手�ユーザ�見��り��ん。"
+msgstr "�信者�ユーザー�見��り��ん"
 
 #. TRANS: Client error displayed trying to direct message another user who's not a friend (403).
-#, fuzzy
 msgid "Cannot send direct messages to users who aren't your friend."
-msgstr "�人���ユーザ�ダイレクトメッセージを�る�������ん。"
+msgstr "�人����ユーザー�ダイレクトメッセージを�る�������ん"
 
 #. TRANS: Client error displayed trying to direct message self (403).
-#, fuzzy
+#. TRANS: Client error displayed trying to send a direct message to self.
+#. TRANS: Error text shown when trying to send a direct message to self.
 msgid ""
 "Do not send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
@@ -510,11 +500,11 @@ msgstr ""
 #. TRANS: Client error displayed when trying to remove a favourite with an invalid ID.
 #. TRANS: Client error displayed trying to delete a status with an invalid ID.
 msgid "No status found with that ID."
-msgstr "��ＩＤ�ステータス�見��り��ん。"
+msgstr "�� ID �ステータス�見��り��ん。"
 
 #. TRANS: Client error displayed when trying to mark a notice favourite that already is a favourite.
 msgid "This status is already a favorite."
-msgstr "��ステータス�����気�入り��。"
+msgstr "��ステータス�既��気�入り��。"
 
 #. TRANS: Client error displayed when marking a notice as favourite fails.
 #. TRANS: Server error displayed when trying to mark a notice as favorite fails in the database.
@@ -524,44 +514,44 @@ msgstr "�気�入りを作�����ん。"
 
 #. TRANS: Client error displayed when trying to remove a favourite that was not a favourite.
 msgid "That status is not a favorite."
-msgstr "��ステータス��気�入り���り��ん。"
+msgstr "��ステータス��気�入り���り��ん"
 
 #. TRANS: Client error displayed when removing a favourite has failed.
 #. TRANS: Server error displayed when removing a favorite from the database fails.
 msgid "Could not delete favorite."
-msgstr "�気�入りを�り消��������ん。"
+msgstr "�気�入りを削除����ん"
 
 #. TRANS: Client error displayed when trying follow who's profile could not be found.
 msgid "Could not follow user: profile not found."
-msgstr "ユーザ�フォローを�止����ん���: ユーザ�見��り��ん。"
+msgstr "ユーザーをフォロー����ん���: プロファイル�見��り��ん。"
 
 #. TRANS: Client error displayed when trying to follow a user that's already being followed.
 #. TRANS: %s is the nickname of the user that is already being followed.
 #, php-format
 msgid "Could not follow user: %s is already on your list."
 msgstr ""
-"ユーザをフォロー����ん���: %s �既�����リスト�入�����。"
+"ユーザーをフォロー����ん���: %s �ん�既�����リスト�入����"
+"�。"
 
 #. TRANS: Client error displayed when trying to unfollow a user that cannot be found.
 msgid "Could not unfollow user: User not found."
-msgstr "ユーザ�フォローを�止����ん���: ユーザ�見��り��ん。"
+msgstr "ユーザー�フォローを�止����ん���: ユーザー�見��り��ん"
 
 #. TRANS: Client error displayed when trying to unfollow self.
 msgid "You cannot unfollow yourself."
 msgstr "自分自身をフォロー�止�る�������ん。"
 
 #. TRANS: Client error displayed when supplying invalid parameters to an API call checking if a friendship exists.
-#, fuzzy
 msgid "Two valid IDs or nick names must be supplied."
-msgstr "����ＩＤ�スクリーン�ーム�必���。"
+msgstr "���� ID ���ニック�ーム�必���"
 
 #. TRANS: Client error displayed when a source user could not be determined showing friendship.
 msgid "Could not determine source user."
-msgstr "ソースユーザーを決定����ん。"
+msgstr "ソースユーザーを決定����ん"
 
 #. TRANS: Client error displayed when a target user could not be determined showing friendship.
 msgid "Could not find target user."
-msgstr "ターゲットユーザーを見��られ��ん。"
+msgstr "対象�ユーザー�見��り��ん"
 
 #. TRANS: Client error trying to create a group with a nickname this is already in use.
 #. TRANS: API validation exception thrown when nickname is already used.
@@ -570,7 +560,7 @@ msgstr "ターゲットユーザーを見��られ��ん。"
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Form validation error displayed when trying to register with an existing nickname.
 msgid "Nickname already in use. Try another one."
-msgstr "��ニック�ーム�既�使用�れ����。他�も�を試����下��。"
+msgstr "��ニック�ーム�既�使用�れ����。他�も�を試����下��"
 
 #. TRANS: Client error in form for group creation.
 #. TRANS: API validation exception thrown when nickname does not validate.
@@ -579,7 +569,7 @@ msgstr "��ニック�ーム�既�使用�れ����。他�も�
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Form validation error displayed when trying to register with an invalid nickname.
 msgid "Not a valid nickname."
-msgstr "有効�ニック�ーム���り��ん。"
+msgstr "有効�ニック�ーム���り��ん"
 
 #. TRANS: Client error in form for group creation.
 #. TRANS: API validation exception thrown when homepage URL does not validate.
@@ -590,7 +580,7 @@ msgstr "有効�ニック�ーム���り��ん。"
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Form validation error displayed when trying to register with an invalid homepage URL.
 msgid "Homepage is not a valid URL."
-msgstr "ホームページ�URL���切��。"
+msgstr "ホームページ� URL �有効���り��ん"
 
 #. TRANS: Client error in form for group creation.
 #. TRANS: API validation exception thrown when full name does not validate.
@@ -598,9 +588,8 @@ msgstr "ホームページ�URL���切��。"
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Form validation error displayed when trying to register with a too long full name.
-#, fuzzy
 msgid "Full name is too long (maximum 255 characters)."
-msgstr "フル�ーム�長����。（255字��）"
+msgstr "フル�ーム�長���� (最大 255 文字��)"
 
 #. TRANS: Client error shown when providing too long a description during group creation.
 #. TRANS: %d is the maximum number of allowed characters.
@@ -615,10 +604,10 @@ msgstr "フル�ーム�長����。（255字��）"
 #. TRANS: %d is the maximum number of characters for the description.
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed characters.
-#, fuzzy, php-format
+#, php-format
 msgid "Description is too long (maximum %d character)."
 msgid_plural "Description is too long (maximum %d characters)."
-msgstr[0] "記述�長����。（最長%d字）"
+msgstr[0] ""
 
 #. TRANS: Client error shown when providing too long a location during group creation.
 #. TRANS: API validation exception thrown when location does not validate.
@@ -626,9 +615,8 @@ msgstr[0] "記述�長����。（最長%d字）"
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Form validation error displayed when trying to register with a too long location.
-#, fuzzy
 msgid "Location is too long (maximum 255 characters)."
-msgstr "場所�長����。（255字��）"
+msgstr "場所�長���� (最大 255 文字��)。"
 
 #. TRANS: Client error shown when providing too many aliases during group creation.
 #. TRANS: %d is the maximum number of allowed aliases.
@@ -638,18 +626,18 @@ msgstr "場所�長����。（255字��）"
 #. TRANS: %d is the maximum number of allowed aliases.
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed aliases.
-#, fuzzy, php-format
+#, php-format
 msgid "Too many aliases! Maximum %d allowed."
 msgid_plural "Too many aliases! Maximum %d allowed."
-msgstr[0] "別��多����! 最大 %d。"
+msgstr[0] ""
 
 #. TRANS: Client error shown when providing an invalid alias during group creation.
 #. TRANS: %s is the invalid alias.
 #. TRANS: API validation exception thrown when aliases does not validate.
 #. TRANS: %s is the invalid alias.
-#, fuzzy, php-format
+#, php-format
 msgid "Invalid alias: \"%s\"."
-msgstr "�正�別�: \"%s\""
+msgstr "無効�別�: \"%s\""
 
 #. TRANS: Client error displayed when trying to use an alias during group creation that is already in use.
 #. TRANS: %s is the alias that is already in use.
@@ -674,13 +662,13 @@ msgstr "別��ニック�ーム���������ん。"
 #. TRANS: Client error displayed when trying to show a group that could not be found.
 #. TRANS: Client error displayed requesting most recent notices to a group for a non-existing group.
 msgid "Group not found."
-msgstr "見��り��ん。"
+msgstr "グループ�見��り��ん。"
 
 #. TRANS: Server error displayed when trying to join a group the user is already a member of.
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown a user tries to join a group they already are a member of.
 msgid "You are already a member of that group."
-msgstr "�����グループ�メン�ー��。"
+msgstr "既���グループ�メン�ー��。"
 
 #. TRANS: Server error displayed when trying to join a group the user is blocked from joining.
 #. TRANS: Client error displayed when trying to join a group while being blocked form joining it.
@@ -694,11 +682,11 @@ msgstr "管�者�よ����グループ�らブロック�れ���
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
-msgstr "ユーザ %1$s �グループ %2$s ��加����ん。"
+msgstr "ユーザー %1$s �ん�グループ %2$s ��加����ん"
 
 #. TRANS: Server error displayed when trying to leave a group the user is not a member of.
 msgid "You are not a member of this group."
-msgstr "��グループ�メン�ー���り��ん。"
+msgstr "��グループ�メン�ー���り��ん"
 
 #. TRANS: Server error displayed when leaving a group failed in the database.
 #. TRANS: %1$s is the leaving user's nickname, $2$s is the group nickname for which the leave failed.
@@ -706,17 +694,17 @@ msgstr "��グループ�メン�ー���り��ん。"
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
-msgstr "ユーザ %1$s をグループ %2$s �ら削除����ん。"
+msgstr "ユーザー %1$s �んをグループ %2$s �ら削除����ん"
 
 #. TRANS: Used as title in check for group membership. %s is a user name.
 #, php-format
 msgid "%s's groups"
-msgstr "%s �グループ"
+msgstr "%s �ん�グループ"
 
 #. TRANS: Used as subtitle in check for group membership. %1$s is the site name, %2$s is a user name.
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s groups %2$s is a member of."
-msgstr "グループ %s �メン�ー"
+msgstr "%1$s グループ %2$s �メン�ー��"
 
 #. TRANS: Message is used as a title when listing the lastest 20 groups. %s is a site name.
 #. TRANS: Page title for first page of groups for a user.
@@ -732,131 +720,116 @@ msgstr "%s 上�グループ"
 
 #. TRANS: Client error displayed when trying to edit a group without being an admin.
 #. TRANS: Client error displayed trying to edit a group while not being a group admin.
-#. TRANS: Client error displayed trying to change group design settings without being a (group) admin.
 #. TRANS: Client error displayed when trying to change group logo settings while not being a group admin.
 msgid "You must be an admin to edit the group."
-msgstr "グループを編集�る��管�者��る必���り��。"
+msgstr "グループを編集�る��管�者��る必���り��"
 
 #. TRANS: Server error displayed when group update fails.
 #. TRANS: Server error displayed when editing a group fails.
 msgid "Could not update group."
-msgstr "グループを更新����ん。"
+msgstr "グループを更新����ん"
 
 #. TRANS: Server error displayed when adding group aliases fails.
 #. TRANS: Server error displayed when group aliases could not be added.
 #. TRANS: Server exception thrown when creating group aliases failed.
 msgid "Could not create aliases."
-msgstr "別�を作�����ん。"
+msgstr "別�を作�����ん"
 
 #. TRANS: API validation exception thrown when nickname does not validate.
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr ""
-"ニック�ーム����文字アルファベット�数字��使用����。スペース�使用"
-"����ん。"
+"ニック�ーム����文字�アルファベット�数字��使用�������スペース"
+"�使用����ん。"
 
 #. TRANS: API validation exception thrown when alias is the same as nickname.
 #. TRANS: Group create form validation error.
-#, fuzzy
 msgid "Alias cannot be the same as nickname."
-msgstr "別��ニック�ーム���������ん。"
+msgstr "別��ニック�ーム�����る�������ん"
 
 #. TRANS: Client error displayed when referring to a non-existing list.
 #. TRANS: Client error displayed trying to perform an action related to a non-existing list.
 #. TRANS: Client error displayed when referring to a non-existing list.
-#, fuzzy
 msgid "List not found."
-msgstr "API メソッド�見��り��ん。"
+msgstr "リスト�見��り��ん"
 
 #. TRANS: Client error displayed when trying to update another user's list.
 msgid "You cannot update lists that do not belong to you."
-msgstr ""
+msgstr "����属�����リストを更新�る�������ん"
 
 #. TRANS: Client error displayed when an unknown error occurs updating a list.
 #. TRANS: Client error displayed when an unknown error occurs viewing list members.
 #. TRANS: Client error displayed when an unknown error occurs in the list subscribers action.
 #. TRANS: Client error displayed when an unknown error occurs unsubscribing from a list.
 msgid "An error occured."
-msgstr ""
+msgstr "エラー�発生����"
 
 #. TRANS: Client error displayed when trying to delete another user's list.
 msgid "You cannot delete lists that do not belong to you."
-msgstr ""
+msgstr "����属�����リストを削除�る�������ん"
 
 #. TRANS: Client error displayed when referring to a non-list member.
-#, fuzzy
 msgid "The specified user is not a member of this list."
-msgstr "ユーザ�グループ�メン�ー���り��ん。"
+msgstr "指定�れ�ユーザー����リスト�メン�ー���り��ん"
 
 #. TRANS: Client error displayed when trying to add members to a list without having the right to do so.
-#, fuzzy
 msgid "You are not allowed to add members to this list."
-msgstr "��グループ�メン�ー���り��ん。"
+msgstr "�������リスト�メン�ーを追加�る���許��れ����ん。"
 
 #. TRANS: Client error displayed when trying to modify list members without specifying them.
-#, fuzzy
 msgid "You must specify a member."
-msgstr "ユーザ�プロフィールをも�����ん。"
+msgstr "メン�ーを指定�る必���り��。"
 
 #. TRANS: Client error displayed when trying to remove members from a list without having the right to do so.
-#, fuzzy
 msgid "You are not allowed to remove members from this list."
-msgstr "��グループ�メン�ー���り��ん。"
+msgstr "�������リスト�らメン�ーを削除�る���許��れ����ん。"
 
 #. TRANS: Client error displayed when trying to remove a list member that is not part of a list.
 msgid "The user you are trying to remove from the list is not a member."
-msgstr ""
+msgstr "リスト�ら削除�よ�����るユーザー�メン�ー���り��ん。"
 
 #. TRANS: Client error displayed when trying to create a list without a name.
-#, fuzzy
 msgid "A list must have a name."
-msgstr "別��ニック�ーム���������ん。"
+msgstr "リスト�����必���。"
 
 #. TRANS: Client error displayed when a membership check for a user is nagative.
 msgid "The specified user is not a subscriber of this list."
-msgstr ""
+msgstr "指定�れ�ユーザー����リスト�メン�ー���り��ん。"
 
 #. TRANS: Client error displayed when trying to unsubscribe from a non-subscribed list.
-#, fuzzy
 msgid "You are not subscribed to this list."
-msgstr "������プロファイル�フォロー�れ����ん。"
+msgstr "�������リスト�登録�れ����ん。"
 
 #. TRANS: Client error displayed when uploading a media file has failed.
-#, fuzzy
 msgid "Upload failed."
-msgstr "ファイルアップロード"
+msgstr "アップロード�失敗����。"
 
 #. TRANS: Client error given from the OAuth API when the request token or verifier is invalid.
-#, fuzzy
 msgid "Invalid request token or verifier."
-msgstr "�正�ログイントークン�指定�れ����。"
+msgstr "request token ��� verifier �無効��。"
 
 #. TRANS: Client error given when no oauth_token was passed to the OAuth API.
 msgid "No oauth_token parameter provided."
 msgstr "oauth_token パラメータ��供�れ��ん���。"
 
 #. TRANS: Client error given when an invalid request token was passed to the OAuth API.
-#, fuzzy
 msgid "Invalid request token."
-msgstr "�正�トークン。"
+msgstr "リクエストトークン�無効��。"
 
 #. TRANS: Client error given when an invalid request token was passed to the OAuth API.
-#, fuzzy
 msgid "Request token already authorized."
-msgstr "�証�れ����ん。"
+msgstr "リクエストトークン�既����れ����。"
 
 #. TRANS: Form validation error given when an invalid username and/or password was passed to the OAuth API.
 msgid "Invalid nickname / password!"
-msgstr "�正�ユーザ����パスワード。"
+msgstr "無効�ニック�ーム���パスワード。"
 
 #. TRANS: Server error displayed when a database action fails.
-#, fuzzy
 msgid "Database error inserting oauth_token_association."
-msgstr "OAuth アプリケーションユーザ�追加時ＤＢエラー。"
+msgstr "oauth_token_association 追加時�データベースエラー。"
 
 #. TRANS: Client error given on when invalid data was passed through a form in the OAuth API.
 #. TRANS: Unexpected validation error on avatar upload form.
-#. TRANS: Client error displayed when the submitted form contains unexpected data.
 #. TRANS: Client error displayed submitting invalid form data for edit application.
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
 #. TRANS: Form validation error message when an unsupported argument is used.
@@ -865,17 +838,16 @@ msgstr "OAuth アプリケーションユーザ�追加時ＤＢエラー。"
 #. TRANS: Client error when submitting a form with unexpected information.
 #. TRANS: Client error displayed when unexpected data is posted in the password recovery form.
 #. TRANS: Message given submitting a form with an unknown action in SMS settings.
-#. TRANS: Unknown form validation error in design settings form.
 msgid "Unexpected form submission."
-msgstr "予期��フォーム�信��。"
+msgstr "予期���フォーム�信��。"
 
 #. TRANS: Title for a page where a user can confirm/deny account access by an external application.
 msgid "An application would like to connect to your account"
-msgstr "アプリケーション�����アカウント�接続�����"
+msgstr "アプリケーション�����アカウント��接続を希望�����"
 
 #. TRANS: Fieldset legend.
 msgid "Allow or deny access"
-msgstr "アクセスを許����拒絶"
+msgstr "アクセスを許����拒�"
 
 #. TRANS: User notification of external application requesting account access.
 #. TRANS: %3$s is the access type requested (read-write or read-only), %4$s is the StatusNet sitename.
@@ -897,7 +869,6 @@ msgid ""
 msgstr ""
 
 #. TRANS: Fieldset legend.
-#, fuzzy
 msgctxt "LEGEND"
 msgid "Account"
 msgstr "アカウント"
@@ -905,7 +876,6 @@ msgstr "アカウント"
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Field label on account registration page.
-#. TRANS: Label for nickname on user authorisation page.
 #. TRANS: Field label on group edit form.
 #. TRANS: Dropdown option for searching in profiles.
 msgid "Nickname"
@@ -923,49 +893,46 @@ msgstr "パスワード"
 #. TRANS: Button label to cancel an IM address confirmation procedure.
 #. TRANS: Button label to cancel a SMS address confirmation procedure.
 #. TRANS: Button label in the "Edit application" form.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Cancel"
-msgstr "中止"
+msgstr "キャンセル"
 
 #. TRANS: Button text that when clicked will allow access to an account by an external application.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Allow"
 msgstr "許�"
 
 #. TRANS: Form instructions.
-#, fuzzy
 msgid "Authorize access to your account information."
-msgstr "アカウント情報��アクセスを許��る�����拒絶������。"
+msgstr "アカウント情報��アクセスを許�����。"
 
 #. TRANS: Header for user notification after revoking OAuth access to an application.
-#, fuzzy
 msgid "Authorization canceled."
-msgstr "確�コード��り��ん。"
+msgstr "承�をキャンセル���。"
 
 #. TRANS: User notification after revoking OAuth access to an application.
 #. TRANS: %s is an OAuth token.
-#, fuzzy, php-format
+#, php-format
 msgid "The request token %s has been revoked."
-msgstr "リクエストトークン%s��拒��れ���り消�れ���。"
+msgstr "リクエストトークン %s ��り消�れ���。"
 
 #. TRANS: Title of the page notifying the user that an anonymous client application was successfully authorized to access the user's account with OAuth.
-#, fuzzy
 msgid "You have successfully authorized the application"
-msgstr "�証�れ����ん。"
+msgstr "アプリケーション�承���功����。"
 
 #. TRANS: Message notifying the user that an anonymous client application was successfully authorized to access the user's account with OAuth.
 msgid ""
 "Please return to the application and enter the following security code to "
 "complete the process."
 msgstr ""
+"アプリケーション�戻��下��。セキュリティーコードを入力�る�処��終�り"
+"��。"
 
 #. TRANS: Title of the page notifying the user that the client application was successfully authorized to access the user's account with OAuth.
 #. TRANS: %s is the authorised application name.
-#, fuzzy, php-format
+#, php-format
 msgid "You have successfully authorized %s"
-msgstr "�証�れ����ん。"
+msgstr "%s �承���功����。"
 
 #. TRANS: Message notifying the user that the client application was successfully authorized to access the user's account with OAuth.
 #. TRANS: %s is the authorised application name.
@@ -982,7 +949,7 @@ msgstr "��メソッド�� POST � DELETE �必���。"
 
 #. TRANS: Client error displayed trying to delete a status of another user.
 msgid "You may not delete another user's status."
-msgstr "他�ユーザ�ステータスを消��������ん。"
+msgstr "他�ユーザー�ステータスを消��������ん。"
 
 #. TRANS: Client error displayed trying to repeat a non-existing notice through the API.
 #. TRANS: Client error displayed trying to display redents of a non-exiting notice.
@@ -998,15 +965,14 @@ msgstr "��よ����や���り��ん。"
 #. TRANS: Client exception thrown when using an unsupported HTTP method.
 #. TRANS: Client error shown when using a non-supported HTTP method.
 #. TRANS: Client exception thrown when using an unsupported HTTP method.
-#, fuzzy
 msgid "HTTP method not supported."
-msgstr "API メソッド�見��り��ん。"
+msgstr "HTTPメソッド�サ�ート�れ����ん。"
 
 #. TRANS: Exception thrown requesting an unsupported notice output format.
 #. TRANS: %s is the requested output format.
-#, fuzzy, php-format
+#, php-format
 msgid "Unsupported format: %s."
-msgstr "サ�ート外�形���。"
+msgstr "サ�ート�れ����形�: %s"
 
 #. TRANS: Client error displayed requesting a deleted status.
 msgid "Status deleted."
@@ -1014,50 +980,48 @@ msgstr "ステータスを削除����。"
 
 #. TRANS: Client error displayed requesting a status with an invalid ID.
 msgid "No status with that ID found."
-msgstr "��ＩＤ��ステータス��り��ん。"
+msgstr "�� ID ��ステータス��り��ん。"
 
 #. TRANS: Client error displayed when trying to delete a notice not using the Atom format.
 msgid "Can only delete using the Atom format."
-msgstr ""
+msgstr "Atom フォーマット�時��削除��能��。"
 
 #. TRANS: Client error displayed when a user has no rights to delete notices of other users.
 #. TRANS: Error message displayed trying to delete a notice that was not made by the current user.
-#, fuzzy
 msgid "Cannot delete this notice."
-msgstr "����や�を削除����ん。"
+msgstr "����や�を削除�る�������ん。"
 
 #. TRANS: Confirmation of notice deletion in API. %d is the ID (number) of the deleted notice.
-#, fuzzy, php-format
+#, php-format
 msgid "Deleted notice %d"
-msgstr "��や�削除"
+msgstr "削除����や� %d"
 
 #. TRANS: Client error displayed when the parameter "status" is missing.
 msgid "Client must provide a 'status' parameter with a value."
-msgstr ""
+msgstr "クライアント��'status' パラメータ�値を指定�る必���り��。"
 
 #. TRANS: Client error displayed exceeding the maximum notice length.
 #. TRANS: %d is the maximum length for a notice.
 #. TRANS: Client error displayed when the parameter "status" is missing.
 #. TRANS: %d is the maximum number of character for a notice.
 #. TRANS: Error message in incoming mail handler used when an incoming e-mail contains too many characters.
-#, fuzzy, php-format
+#, php-format
 msgid "That's too long. Maximum notice size is %d character."
 msgid_plural "That's too long. Maximum notice size is %d characters."
-msgstr[0] "長����。��や��最大 %d 字����。"
+msgstr[0] ""
 
 #. TRANS: Client error displayed when replying to a non-existing notice.
-#, fuzzy
 msgid "Parent notice not found."
-msgstr "API メソッド�見��り��ん。"
+msgstr "元���や��見��り��ん。"
 
 #. TRANS: Client error displayed exceeding the maximum notice length.
 #. TRANS: %d is the maximum lenth for a notice.
 #. TRANS: Client error displayed exceeding the maximum notice length.
 #. TRANS: %d is the maximum length for a notice.
-#, fuzzy, php-format
+#, php-format
 msgid "Maximum notice size is %d character, including attachment URL."
 msgid_plural "Maximum notice size is %d characters, including attachment URL."
-msgstr[0] "��や�� URL を���最大 %d 字����。"
+msgstr[0] ""
 
 #. TRANS: Client error displayed when requesting profiles of followers in an unsupported format.
 #. TRANS: Client error displayed when requesting IDs of followers in an unsupported format.
@@ -1068,33 +1032,33 @@ msgstr "サ�ート外�形���。"
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user nickname.
 #, php-format
 msgid "%1$s / Favorites from %2$s"
-msgstr "%1$s / %2$s �ら��気�入り"
+msgstr "%1$s / %2$s �ん��気�入り"
 
 #. TRANS: Subtitle for timeline of most recent favourite notices by a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user's full name,
 #. TRANS: %3$s is a user nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s updates favorited by %2$s / %3$s."
-msgstr "%1$s � %2$s ��気�入りを更新���� / %2$s。"
+msgstr "%1$s %2$s / %3$s �ん��気�入りを更新����。"
 
 #. TRANS: Server error displayed whe trying to get a timeline fails.
 #. TRANS: %s is the error message.
-#, fuzzy, php-format
+#, php-format
 msgid "Could not generate feed for list - %s"
-msgstr "%s 用�ログイン・トークンを作�����ん���"
+msgstr "リスト�フィードを生��る�������ん��� -  %s"
 
 #. TRANS: Title for timeline of most recent mentions of a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user nickname.
 #, php-format
 msgid "%1$s / Updates mentioning %2$s"
-msgstr "%1$s / %2$s ����更新"
+msgstr "%1$s / %2$s �ん����更新"
 
 #. TRANS: Subtitle for timeline of most recent mentions of a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user nickname,
 #. TRANS: %3$s is a user's full name.
 #, php-format
 msgid "%1$s updates that reply to updates from %2$s / %3$s."
-msgstr "%2$s �らアップデート�答�る %1$s アップデート"
+msgstr "%1$s �更新�れ�%2$s / %3$s �ん�ら更新��返信�行�れ���。"
 
 #. TRANS: Title for site timeline. %s is the StatusNet sitename.
 #. TRANS: Public RSS feed title. %s is the StatusNet site name.
@@ -1105,35 +1069,34 @@ msgstr "%s �パブリックタイムライン"
 #. TRANS: Subtitle for site timeline. %s is the StatusNet sitename.
 #, php-format
 msgid "%s updates from everyone!"
-msgstr "皆�ら� %s アップデート!"
+msgstr "�ん�� %s を更新�"
 
 #. TRANS: Server error displayed calling unimplemented API method for 'retweeted by me'.
-#, fuzzy
 msgid "Unimplemented."
-msgstr "未実装�メソッド。"
+msgstr "未実装��。"
 
 #. TRANS: Title for Atom feed "repeated to me". %s is the user nickname.
 #, php-format
 msgid "Repeated to %s"
-msgstr "%s ��返信"
+msgstr "%s �ん�リピート"
 
 #. TRANS: Subtitle for API action that shows most recent notices that are repeats in user's inbox.
 #. TRANS: %1$s is the sitename, %2$s is a user nickname, %3$s is a user profile name.
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s notices that were to repeated to %2$s / %3$s."
-msgstr "%2$s �らアップデート�答�る %1$s アップデート"
+msgstr "%1$s %2$s / %3$s ���や�をリピート。"
 
 #. TRANS: Title of list of repeated notices of the logged in user.
 #. TRANS: %s is the nickname of the logged in user.
 #, php-format
 msgid "Repeats of %s"
-msgstr "%s �返信"
+msgstr "%s �ん�リピート"
 
 #. TRANS: Subtitle of API time with retweets of me.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is the user nickname, %3$s is the user profile name.
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s notices that %2$s / %3$s has repeated."
-msgstr "%s (@%s) ��気�入り���������や�を加����"
+msgstr "%1$s %2$s / %3$s �ん���や�をリピート����。"
 
 #. TRANS: Title for timeline with lastest notices with a given tag.
 #. TRANS: %s is the tag.
@@ -1149,12 +1112,12 @@ msgstr "%s �タグ付��れ���や�"
 #. TRANS: %1$s is the tag name, %2$s is the StatusNet sitename.
 #, php-format
 msgid "Updates tagged with %1$s on %2$s!"
-msgstr "%2$s � %1$s �よる更新��り���"
+msgstr "%2$s 上� %1$s �タグ付��よる更新��り���"
 
 #. TRANS: Client error displayed trying to add a notice to another user's timeline.
 #, fuzzy
 msgid "Only the user can add to their own timeline."
-msgstr "ユーザ����れら自身�メールボックスを読む�������。"
+msgstr "Only the user can add to their own timeline."
 
 #. TRANS: Client error displayed when using another format than AtomPub.
 msgid "Only accept AtomPub for Atom feeds."
@@ -1162,7 +1125,7 @@ msgstr ""
 
 #. TRANS: Client error displayed attempting to post an empty API notice.
 msgid "Atom post must not be empty."
-msgstr ""
+msgstr "Atom ��スト�空���������ん。"
 
 #. TRANS: Client error displayed attempting to post an API that is not well-formed XML.
 msgid "Atom post must be well-formed XML."
@@ -1184,24 +1147,23 @@ msgstr ""
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
 #. TRANS: %d is the notice ID (number).
-#, fuzzy, php-format
+#, php-format
 msgid "No content for notice %d."
-msgstr "��や��内容を探�"
+msgstr "��や��内容��り��ん %d"
 
 #. TRANS: Client error displayed when using another format than AtomPub.
 #. TRANS: %s is the notice URI.
-#, fuzzy, php-format
+#, php-format
 msgid "Notice with URI \"%s\" already exists."
-msgstr "�� ID �よる��や��存在�����ん"
+msgstr "URI \"%s\" を����や��既�存在���。"
 
 #. TRANS: Server error for unfinished API method showTrends.
 msgid "API method under construction."
 msgstr "API メソッド�工事中��。"
 
 #. TRANS: Client error displayed when requesting user information for a non-existing user.
-#, fuzzy
 msgid "User not found."
-msgstr "API メソッド�見��り��ん。"
+msgstr "ユーザー�見��り��ん。"
 
 #. TRANS: Client error displayed when trying to leave a group while not logged in.
 msgid "You must be logged in to leave a group."
@@ -1222,12 +1184,9 @@ msgstr "グループ�ら離れる��ログイン�����れ��り
 #. TRANS: Client error displayed when requesting Friends of a Friend feed for a nickname that is not a group.
 #. TRANS: Client error displayed trying to block a user from a group while specifying a non-existing group.
 #. TRANS: Client error displayed referring to a group's permalink for a non-existing group ID.
-#. TRANS: Client error displayed trying to change group design settings while providing a nickname for a non-existing group.
 #. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
 #. TRANS: Client error displayed when trying to view group members for a non-existing group.
 #. TRANS: Client error displayed when trying to view group members for an object that is not a group.
-#. TRANS: Client error displayed when trying to view group members for a non-existing group.
-#. TRANS: Client error displayed when trying to view group members for an object that is not a group.
 #. TRANS: Client error displayed when requesting a group RSS feed for group that does not exist.
 #. TRANS: Client error displayed when requesting a group RSS feed for an object that is not a group.
 #. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
@@ -1236,10 +1195,10 @@ msgstr "グループ�ら離れる��ログイン�����れ��り
 #. TRANS: Client error displayed when trying to leave a non-local group.
 #. TRANS: Client error displayed when trying to leave a non-existing group.
 #. TRANS: Client error displayed when providing an invalid group ID on the Make Admin page.
-#. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
-#. TRANS: Client error displayed if no local group with a given name was found requesting group page.
 #. TRANS: Command exception text shown when a group is requested that does not exist.
 #. TRANS: Error text shown when trying to leave a group that does not exist.
+#. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
+#. TRANS: Client error displayed if no local group with a given name was found requesting group page.
 msgid "No such group."
 msgstr "��よ��グループ��り��ん。"
 
@@ -1247,205 +1206,191 @@ msgstr "��よ��グループ��り��ん。"
 #. TRANS: Client error when trying to delete a group without providing a nickname or ID for the group.
 #. TRANS: Client error displayed when trying to join a group without providing a group name or group ID.
 #. TRANS: Client error displayed when trying to leave a group without providing a group name or group ID.
-#, fuzzy
 msgid "No nickname or ID."
-msgstr "ニック�ーム��り��ん。"
+msgstr "ニック�ーム��� ID ��り��ん。"
 
 #. TRANS: Client error displayed trying to approve group membership while not logged in.
 #. TRANS: Client error displayed when trying to leave a group while not logged in.
-#, fuzzy
 msgid "Must be logged in."
-msgstr "ログイン�����ん。"
+msgstr "ログイン�る必���り��。"
 
 #. TRANS: Client error displayed trying to approve group membership while not a group administrator.
 #. TRANS: Client error displayed when trying to approve or cancel a group join request without
 #. TRANS: being a group administrator.
 msgid "Only group admin can approve or cancel join requests."
 msgstr ""
+"グループ管�者����加リクエスト�対�る承����キャンセルを�る����"
+"���。"
 
 #. TRANS: Client error displayed trying to approve group membership without specifying a profile to approve.
 #. TRANS: Client error displayed trying to approve subscriptionswithout specifying a profile to approve.
-#, fuzzy
 msgid "Must specify a profile."
-msgstr "ユーザ�プロフィールをも�����ん。"
+msgstr "プロファイルを指定�る必���り��。"
 
 #. TRANS: Client error displayed trying to approve group membership for a non-existing request.
 #. TRANS: %s is a nickname.
 #. TRANS: Client error displayed when trying to approve a non-existing group join request.
 #. TRANS: %s is a user nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "%s is not in the moderation queue for this group."
-msgstr "��グループ�ユーザ�リスト。"
+msgstr "%s �ん����グループ�モデレーションキュー���り��ん."
 
 #. TRANS: Client error displayed trying to approve/deny group membership.
 #. TRANS: Client error displayed trying to approve/deny subscription.
 msgid "Internal error: received neither cancel nor abort."
-msgstr ""
+msgstr "内部エラー: キャンセルも中止も�信�����ん。"
 
 #. TRANS: Client error displayed trying to approve/deny group membership.
 #. TRANS: Client error displayed trying to approve/deny  subscription
 msgid "Internal error: received both cancel and abort."
-msgstr ""
+msgstr "内部エラー: キャンセル�中止�両方を�信����。"
 
 #. TRANS: Server error displayed when cancelling a queued group join request fails.
 #. TRANS: %1$s is the leaving user's nickname, $2$s is the group nickname for which the leave failed.
-#, fuzzy, php-format
+#, php-format
 msgid "Could not cancel request for user %1$s to join group %2$s."
-msgstr "ユーザ %1$s �グループ %2$s ��加����ん。"
+msgstr "ユーザー %1$s �グループ %2$s ���加�求をキャンセル����ん。"
 
 #. TRANS: Title for leave group page after group join request is approved/disapproved.
 #. TRANS: %1$s is the user nickname, %2$s is the group nickname.
-#, fuzzy, php-format
+#, php-format
 msgctxt "TITLE"
 msgid "%1$s's request for %2$s"
-msgstr "%2$s ���る %1$s �ステータス"
+msgstr "%2$s �ら %1$s  �リクエスト"
 
 #. TRANS: Message on page for group admin after approving a join request.
 msgid "Join request approved."
-msgstr ""
+msgstr "�加�求�承��れ���。"
 
 #. TRANS: Message on page for group admin after rejecting a join request.
 msgid "Join request canceled."
-msgstr ""
+msgstr "�加�求�キャンセル�れ���。"
 
 #. TRANS: Client error displayed trying to approve subscription for a non-existing request.
-#, fuzzy, php-format
+#. TRANS: %s is a user nickname.
+#, php-format
 msgid "%s is not in the moderation queue for your subscriptions."
-msgstr "��グループ�ユーザ�リスト。"
+msgstr ""
 
 #. TRANS: Server error displayed when cancelling a queued subscription request fails.
 #. TRANS: %1$s is the leaving user's nickname, $2$s is the nickname for which the leave failed.
-#, fuzzy, php-format
+#, php-format
 msgid "Could not cancel or approve request for user %1$s to join group %2$s."
-msgstr "ユーザ %1$s �グループ %2$s ��加����ん。"
+msgstr ""
 
 #. TRANS: Title for subscription approval ajax return
 #. TRANS: %1$s is the approved user's nickname
-#, fuzzy, php-format
+#, php-format
 msgctxt "TITLE"
 msgid "%1$s's request"
-msgstr "%2$s ���る %1$s �ステータス"
+msgstr "%1$s ��求"
 
 #. TRANS: Message on page for user after approving a subscription request.
-#, fuzzy
 msgid "Subscription approved."
-msgstr "フォロー�承��れ���"
+msgstr "フォロー�承��れ���。"
 
 #. TRANS: Message on page for user after rejecting a subscription request.
-#, fuzzy
 msgid "Subscription canceled."
-msgstr "確�コード��り��ん。"
+msgstr "フォロー�キャンセル�れ���。"
 
 #. TRANS: Subtitle for Atom favorites feed.
 #. TRANS: %1$s is a user nickname, %2$s is the StatusNet sitename.
-#, fuzzy, php-format
+#, php-format
 msgid "Notices %1$s has favorited on %2$s"
-msgstr "%2$s � %1$s ��人�ら�更新��り���"
+msgstr "��や� %1$s � %2$s ��気�入り��。"
 
 #. TRANS: Client exception thrown when trying to set a favorite for another user.
 #. TRANS: Client exception thrown when trying to subscribe another user.
-#, fuzzy
 msgid "Cannot add someone else's subscription."
-msgstr "サブスクリプションを追加����ん"
+msgstr "他�ユーザー�フォローを追加�る�������ん。"
 
 #. TRANS: Client exception thrown when trying use an incorrect activity verb for the Atom pub method.
 #, fuzzy
 msgid "Can only handle favorite activities."
-msgstr "��や��内容を探�"
+msgstr "Can only handle favorite activities."
 
 #. TRANS: Client exception thrown when trying favorite an object that is not a notice.
-#, fuzzy
 msgid "Can only fave notices."
-msgstr "��や��内容を探�"
+msgstr "人気���や����能��。"
 
 #. TRANS: Client exception thrown when trying favorite a notice without content.
-#, fuzzy
 msgid "Unknown notice."
-msgstr "�明"
+msgstr "�明���や���。"
 
 #. TRANS: Client exception thrown when trying favorite an already favorited notice.
-#, fuzzy
 msgid "Already a favorite."
-msgstr "�気�入り�加�る"
+msgstr "既��気�入り��。"
 
 #. TRANS: Title for group membership feed.
 #. TRANS: %s is a username.
-#, fuzzy, php-format
+#, php-format
 msgid "Group memberships of %s"
-msgstr "%s グループメン�ー"
+msgstr "%s �グループ会員"
 
 #. TRANS: Subtitle for group membership feed.
 #. TRANS: %1$s is a username, %2$s is the StatusNet sitename.
-#, fuzzy, php-format
+#, php-format
 msgid "Groups %1$s is a member of on %2$s"
-msgstr "グループ %s �メン�ー"
+msgstr "グループ %1$s � %2$s �メン�ー��。"
 
 #. TRANS: Client exception thrown when trying subscribe someone else to a group.
-#, fuzzy
 msgid "Cannot add someone else's membership."
-msgstr "サブスクリプションを追加����ん"
+msgstr "他�ユーザー�メン�ーシップを追加�る�������ん。"
 
 #. TRANS: Client error displayed when not using the join verb.
 #, fuzzy
 msgid "Can only handle join activities."
-msgstr "��や��内容を探�"
+msgstr "Can only handle join activities."
 
 #. TRANS: Client exception thrown when trying to subscribe to a non-existing group.
-#, fuzzy
 msgid "Unknown group."
-msgstr "�明"
+msgstr "�明�グループ。"
 
 #. TRANS: Client exception thrown when trying to subscribe to an already subscribed group.
-#, fuzzy
 msgid "Already a member."
-msgstr "全��メン�ー"
+msgstr "既�メン�ー��。"
 
 #. TRANS: Client exception thrown when trying to subscribe to group while blocked from that group.
 msgid "Blocked by admin."
-msgstr ""
+msgstr "管�者�よりブロック�れ����。"
 
 #. TRANS: Client exception thrown when referencing a non-existing favorite.
-#, fuzzy
 msgid "No such favorite."
-msgstr "��よ��ファイル��り��ん。"
+msgstr "��よ���気�入り��り��ん。"
 
 #. TRANS: Client exception thrown when trying to remove a favorite notice of another user.
-#, fuzzy
 msgid "Cannot delete someone else's favorite."
-msgstr "�気�入りを�り消��������ん。"
+msgstr "他�ユーザー��気�入りを削除�る�������ん。"
 
 #. TRANS: Client exception thrown when trying to show membership of a non-subscribed group
-#, fuzzy
 msgid "Not a member."
-msgstr "全��メン�ー"
+msgstr "メン�ー���り��ん。"
 
 #. TRANS: Client exception thrown when deleting someone else's membership.
-#, fuzzy
 msgid "Cannot delete someone else's membership."
-msgstr "フォローを�存����ん。"
+msgstr "他�ユーザー�メン�ーシップを削除�る�������ん。"
 
 #. TRANS: Client exception thrown when trying to display a subscription for a non-existing profile ID.
 #. TRANS: %d is the non-existing profile ID number.
-#, fuzzy, php-format
+#, php-format
 msgid "No such profile id: %d."
-msgstr "��よ��ファイル��り��ん。"
+msgstr "id: %d �プロファイル��り��ん。"
 
 #. TRANS: Client exception thrown when trying to display a subscription for a non-subscribed profile ID.
 #. TRANS: %1$d is the non-existing subscriber ID number, $2$d is the ID of the profile that was not subscribed to.
-#, fuzzy, php-format
+#, php-format
 msgid "Profile %1$d not subscribed to profile %2$d."
-msgstr "������プロファイル�フォロー�れ����ん。"
+msgstr "プロファイル %2$d � プロファイル %1$d をフォロー�����ん。"
 
 #. TRANS: Client exception thrown when trying to delete a subscription of another user.
-#, fuzzy
 msgid "Cannot delete someone else's subscription."
-msgstr "フォローを�存����ん。"
+msgstr "他�ユーザー�フォローを削除�る�������ん。"
 
 #. TRANS: Subtitle for Atom subscription feed.
 #. TRANS: %1$s is a user nickname, %s$s is the StatusNet sitename.
 #, fuzzy, php-format
 msgid "People %1$s has subscribed to on %2$s"
-msgstr "人々� %s をフォロー����。"
+msgstr "People %1$s has subscribed to on %2$s"
 
 #. TRANS: Client error displayed when not using the follow verb.
 msgid "Can only handle Follow activities."
@@ -1457,15 +1402,15 @@ msgstr ""
 
 #. TRANS: Client exception thrown when subscribing to a non-existing profile.
 #. TRANS: %s is the unknown profile ID.
-#, fuzzy, php-format
+#, php-format
 msgid "Unknown profile %s."
-msgstr "�明�ファイルタイプ"
+msgstr "�明�プロファイル %s。"
 
 #. TRANS: Client error displayed trying to subscribe to an already subscribed profile.
 #. TRANS: %s is the profile the user already has a subscription on.
-#, fuzzy, php-format
+#, php-format
 msgid "Already subscribed to %s."
-msgstr "���フォロー�����!"
+msgstr "既� %s をフォロー�����。"
 
 #. TRANS: Client error displayed trying to get a non-existing attachment.
 msgid "No such attachment."
@@ -1474,7 +1419,6 @@ msgstr "��よ��添付��り��ん。"
 #. TRANS: Client error displayed trying to get an avatar without providing a nickname.
 #. TRANS: Client error displayed when requesting a list of blocked users for a group without providing a group nickname.
 #. TRANS: Client error displayed trying to edit a group while not proving a nickname for the group to edit.
-#. TRANS: Client error displayed trying to change group design settings without providing a group nickname.
 #. TRANS: Client error displayed when trying to change group logo settings without providing a nickname.
 #. TRANS: Client error displayed when trying to view group members without providing a group nickname.
 #. TRANS: Client error displayed when requesting a group RSS feed without providing a group nickname.
@@ -1488,7 +1432,7 @@ msgstr "サイズ��り��ん。"
 
 #. TRANS: Client error displayed trying to get an avatar providing an invalid avatar size.
 msgid "Invalid size."
-msgstr "�正�サイズ。"
+msgstr "無効�サイズ。"
 
 #. TRANS: Title for avatar upload page.
 msgid "Avatar"
@@ -1525,33 +1469,28 @@ msgstr "プレビュー"
 #. TRANS: Submit button text the OAuth application page to delete an application.
 #. TRANS: Button text for deleting a group.
 #. TRANS: Button text to delete a list.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Delete"
 msgstr "削除"
 
 #. TRANS: Button on avatar upload page to upload an avatar.
 #. TRANS: Submit button to confirm upload of a user backup file for account restore.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Upload"
 msgstr "アップロード"
 
 #. TRANS: Button on avatar upload crop form to confirm a selected crop as avatar.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Crop"
 msgstr "切り�り"
 
 #. TRANS: Validation error on avatar upload form when no file was uploaded.
-#, fuzzy
 msgid "No file uploaded."
-msgstr "プロファイル記述��り��ん。"
+msgstr "ファイル�アップロード�れ����ん。"
 
 #. TRANS: Avatar upload form instruction after uploading a file.
-#, fuzzy
 msgid "Pick a square area of the image to be your avatar."
-msgstr "����ア�ター��るイメージを正方形�指定"
+msgstr "ア�ター��る画��正方形�領域を�択������。"
 
 #. TRANS: Server error displayed if an avatar upload went wrong somehow server side.
 #. TRANS: Server error displayed trying to crop an uploaded group logo that is no longer present.
@@ -1573,16 +1512,16 @@ msgstr "ア�ター�削除�れ���。"
 #. TRANS: Title for backup account page.
 #. TRANS: Option in profile settings to create a backup of the account of the currently logged in user.
 msgid "Backup account"
-msgstr ""
+msgstr "アカウント��ックアップ"
 
 #. TRANS: Client exception thrown when trying to backup an account while not logged in.
-#, fuzzy
 msgid "Only logged-in users can backup their account."
-msgstr "ログインユーザ�����や�を繰り返���。"
+msgstr ""
+"ログインユーザー���自分�アカウント��ックアップ�る�������。"
 
 #. TRANS: Client exception thrown when trying to backup an account without having backup rights.
 msgid "You may not backup your account."
-msgstr ""
+msgstr "����アカウント����ックアップ�る�������ん。"
 
 #. TRANS: Information displayed on the backup account page.
 msgid ""
@@ -1594,35 +1533,33 @@ msgid ""
 msgstr ""
 
 #. TRANS: Submit button to backup an account on the backup account page.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Backup"
-msgstr "�ックグラウンド"
+msgstr "�ックアップ"
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
 msgid "Backup your account."
-msgstr ""
+msgstr "アカウントを�ックアップ�る。"
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
 msgid "You already blocked that user."
-msgstr "��ユーザ����ブロック済���。"
+msgstr "��ユーザー�既�ブロック済���。"
 
 #. TRANS: Title for block user page.
 #. TRANS: Legend for block user form.
 #. TRANS: Fieldset legend for block user from group form.
 msgid "Block user"
-msgstr "ユーザをブロック"
+msgstr "ユーザーをブロック"
 
 #. TRANS: Explanation of consequences when blocking a user on the block user page.
-#, fuzzy
 msgid ""
 "Are you sure you want to block this user? Afterwards, they will be "
 "unsubscribed from you, unable to subscribe to you in the future, and you "
 "will not be notified of any @-replies from them."
 msgstr ""
-"������ユーザをブロック����を確信������? ��後��れら���"
-"��らフォローを外�れる��ょ��将������フォロー����������"
-"�ん� @-返信 ����も�れら�ら通知�れ����ょ�。"
+"��ユーザーをブロック��もよ������？  ��場������ら�フォロー"
+"を外��将���������をフォロー����������ん� @-返信 ���"
+"�も通知�れ����ょ�。"
 
 #. TRANS: Button label on the user block form.
 #. TRANS: Button label on the delete application form.
@@ -1632,12 +1569,11 @@ msgstr ""
 #. TRANS: Button label on the form to block a user from a group.
 msgctxt "BUTTON"
 msgid "No"
-msgstr "ノート"
+msgstr "���"
 
 #. TRANS: Submit button title for 'No' when blocking a user.
-#, fuzzy
 msgid "Do not block this user."
-msgstr "��ユーザをアンブロック�る"
+msgstr "��ユーザーをブロック���"
 
 #. TRANS: Button label on the user block form.
 #. TRANS: Button label on the delete application form.
@@ -1651,9 +1587,8 @@ msgid "Yes"
 msgstr "��"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
-#, fuzzy
 msgid "Block this user."
-msgstr "��ユーザをブロック�る"
+msgstr "��ユーザーをブロック�る"
 
 #. TRANS: Server error displayed when blocking a user fails.
 msgid "Failed to save block information."
@@ -1673,33 +1608,32 @@ msgstr "%1$s ブロック�れ�プロファイル�ページ %2$d"
 
 #. TRANS: Instructions for list of users blocked from a group.
 msgid "A list of the users blocked from joining this group."
-msgstr "��グループ���加をブロック�れ�ユーザ�リスト。"
+msgstr "��グループ���加をブロック�れ�ユーザー�リスト。"
 
 #. TRANS: Form legend for unblocking a user from a group.
 msgid "Unblock user from group"
-msgstr "グループ�ら�アンブロックユーザ"
+msgstr "グループ�ら�アンブロックユーザー"
 
 #. TRANS: Button text for unblocking a user from a group.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Unblock"
-msgstr "アンブロック"
+msgstr "ブロックを解除"
 
 #. TRANS: Tooltip for button for unblocking a user from a group.
 #. TRANS: Description of the form to unblock a user.
 msgid "Unblock this user"
-msgstr "��ユーザをアンブロック�る"
+msgstr "��ユーザー�ブロックを解除"
 
 #. TRANS: Title for mini-posting window loaded from bookmarklet.
 #. TRANS: %s is the StatusNet site name.
 #, php-format
 msgid "Post to %s"
-msgstr "%s 上�グループ"
+msgstr "%s 上�投稿"
 
 #. TRANS: Title for leave group page after leaving.
 #. TRANS: %s$s is the leaving user's name, %2$s is the group name.
 #. TRANS: Title for leave group page after leaving.
-#, fuzzy, php-format
+#, php-format
 msgctxt "TITLE"
 msgid "%1$s left group %2$s"
 msgstr "%1$s �グループ %2$s �残り���。"
@@ -1707,7 +1641,7 @@ msgstr "%1$s �グループ %2$s �残り���。"
 #. TRANS: Client error displayed when trying to leave a group without specifying an ID.
 #. TRANS: Client error displayed when trying to unsubscribe without providing a profile ID.
 msgid "No profile ID in request."
-msgstr "ログイントークン��求�れ����ん。"
+msgstr "リクエスト�プロファイル ID ��り��ん。"
 
 #. TRANS: Client error displayed when trying to leave a non-existing group.
 #. TRANS: Client error displayed trying to block a user from a group while specifying a non-existing profile.
@@ -1718,10 +1652,9 @@ msgstr "ログイントークン��求�れ����ん。"
 #. TRANS: Client error displayed when trying to unsubscribe while providing a non-existing profile ID.
 #. TRANS: Client error displayed when trying to change user options without specifying an existing user to work on.
 msgid "No profile with that ID."
-msgstr "��ＩＤ�プロファイル��り��ん。"
+msgstr "�� ID �プロファイル��り��ん。"
 
 #. TRANS: Title after unsubscribing from a group.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Unsubscribed"
 msgstr "フォロー解除済�"
@@ -1746,24 +1679,21 @@ msgstr "�明�アドレスタイプ %s"
 #. TRANS: Client error for an already confirmed email/jabber/sms address.
 #. TRANS: Client error for an already confirmed IM address.
 msgid "That address has already been confirmed."
-msgstr "��アドレス�既�承��れ����。"
+msgstr "��アドレス�既�確��れ���。"
 
 #. TRANS: Server error displayed when updating IM preferences fails.
 #. TRANS: Server error thrown on database error removing a registered IM address.
-#, fuzzy
 msgid "Could not update user IM preferences."
-msgstr "ユーザレコードを更新����ん。"
+msgstr "IM設定を更新����ん���。"
 
 #. TRANS: Server error displayed when adding IM preferences fails.
-#, fuzzy
 msgid "Could not insert user IM preferences."
-msgstr "サブスクリプションを追加����ん"
+msgstr "IM設定を追加����ん���。"
 
 #. TRANS: Server error displayed when an address confirmation code deletion from the
 #. TRANS: database fails in the contact address confirmation action.
-#, fuzzy
 msgid "Could not delete address confirmation."
-msgstr "メール承�を削除����ん"
+msgstr "メールアドレス確�を削除����ん。"
 
 #. TRANS: Title for the contact address confirmation action.
 msgid "Confirm address"
@@ -1773,55 +1703,61 @@ msgstr "アドレス�確�"
 #. TRANS: %s can be 'email', 'jabber', or 'sms'.
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
-msgstr "アドレス \"%s\" �����アカウント���承��れ����。"
+msgstr "アドレス \"%s\" �����アカウント���承��れ���。"
 
 #. TRANS: Title for page with a conversion (multiple notices in context).
 msgid "Conversation"
 msgstr "会話"
 
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+msgid "Conversation feed (Activity Streams JSON)"
+msgstr "会話�フィード (Activity Streams JSON)"
+
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+msgid "Conversation feed (RSS 2.0)"
+msgstr "会話�フィード (RSS 2.0)"
+
 #. TRANS: Title for conversation page.
 #. TRANS: Title for page that shows a notice.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Notice"
 msgstr "��や�"
 
 #. TRANS: Client exception displayed trying to delete a user account while not logged in.
-#, fuzzy
 msgid "Only logged-in users can delete their account."
-msgstr "ログインユーザ�����や�を繰り返���。"
+msgstr "ログインユーザー���自分�アカウントを削除����。"
 
 #. TRANS: Client exception displayed trying to delete a user account without have the rights to do that.
-#, fuzzy
 msgid "You cannot delete your account."
-msgstr "ユーザを削除����ん"
+msgstr "����アカウントを削除�る�������ん。"
 
 #. TRANS: Confirmation text for user deletion. The user has to type this exactly the same, including punctuation.
 msgid "I am sure."
-msgstr ""
+msgstr "も��ん��。"
 
 #. TRANS: Notification for user about the text that must be input to be able to delete a user account.
 #. TRANS: %s is the text that needs to be input.
 #, php-format
 msgid "You must write \"%s\" exactly in the box."
-msgstr ""
+msgstr "ボックス�正�� %s を書�必���り��。"
 
 #. TRANS: Confirmation that a user account has been deleted.
-#, fuzzy
 msgid "Account deleted."
-msgstr "ア�ター�削除�れ���。"
+msgstr "アカウントを削除����。"
 
 #. TRANS: Page title for page on which a user account can be deleted.
 #. TRANS: Option in profile settings to delete the account of the currently logged in user.
-#, fuzzy
 msgid "Delete account"
-msgstr "新��グループを作�"
+msgstr "アカウント削除"
 
 #. TRANS: Form text for user deletion form.
 msgid ""
 "This will <strong>permanently delete</strong> your account data from this "
 "server."
 msgstr ""
+"��サー��ら����アカウント�データを<strong>完全�削除</strong>���。"
 
 #. TRANS: Additional form text for user deletion form shown if a user has account backup rights.
 #. TRANS: %s is a URL to the backup page.
@@ -1830,22 +1766,25 @@ msgid ""
 "You are strongly advised to <a href=\"%s\">back up your data</a> before "
 "deletion."
 msgstr ""
+"削除�る�� <a href=\"%s\">データ��ックアップ</a> を行���を強��勧��"
+"��。"
 
 #. TRANS: Field label for delete account confirmation entry.
 #. TRANS: Field label for password reset form where the password has to be typed again.
 msgid "Confirm"
-msgstr "パスワード確�"
+msgstr "確�"
 
 #. TRANS: Input title for the delete account field.
 #. TRANS: %s is the text that needs to be input.
-#, fuzzy, php-format
+#, php-format
 msgid "Enter \"%s\" to confirm that you want to delete your account."
-msgstr "ユーザを削除����ん"
+msgstr ""
+"����アカウントを削除�����を確��る��� \"%s\" を入力�����"
+"�。"
 
 #. TRANS: Button title for user account deletion.
-#, fuzzy
-msgid "Permanently delete your account"
-msgstr "ユーザを削除����ん"
+msgid "Permanently delete your account."
+msgstr "����アカウントを完全�削除�る。"
 
 #. TRANS: Client error displayed trying to delete an application while not logged in.
 msgid "You must be logged in to delete an application."
@@ -1872,72 +1811,65 @@ msgid "Delete application"
 msgstr "アプリケーション削除"
 
 #. TRANS: Confirmation text on delete application page.
-#, fuzzy
 msgid ""
 "Are you sure you want to delete this application? This will clear all data "
 "about the application from the database, including all existing user "
 "connections."
 msgstr ""
-"����本当���ユーザを削除������? �れ��ックアップ���データ"
-"ベース�らユーザ�関�る����データをクリア���。"
+"��アプリケーションを削除��もよ����？  �れ������既存�ユーザー"
+"接続を�むデータベース�ら�アプリケーション���������データをクリア"
+"���。"
 
 #. TRANS: Submit button title for 'No' when deleting an application.
-#, fuzzy
 msgid "Do not delete this application."
-msgstr "��アプリケーションを削除��������"
+msgstr "��アプリケーションを削除���"
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
-#, fuzzy
 msgid "Delete this application."
 msgstr "��アプリケーションを削除"
 
 #. TRANS: Client error when trying to delete group while not logged in.
-#, fuzzy
 msgid "You must be logged in to delete a group."
-msgstr "グループ�ら離れる��ログイン�����れ��り��ん。"
+msgstr "グループを削除�る���ログイン�る必���り��。"
 
 #. TRANS: Client error when trying to delete a group without having the rights to delete it.
-#, fuzzy
 msgid "You are not allowed to delete this group."
-msgstr "��グループ�メン�ー���り��ん。"
+msgstr "��グループを削除�る���許��れ����ん。"
 
 #. TRANS: Server error displayed if a group could not be deleted.
 #. TRANS: %s is the name of the group that could not be deleted.
-#, fuzzy, php-format
+#, php-format
 msgid "Could not delete group %s."
-msgstr "グループを更新����ん。"
+msgstr "グループ %s を削除����ん���。"
 
 #. TRANS: Message given after deleting a group.
 #. TRANS: %s is the deleted group's name.
-#, fuzzy, php-format
+#, php-format
 msgid "Deleted group %s"
-msgstr "%1$s �グループ %2$s �残り���。"
+msgstr "グループ %s を削除����。"
 
 #. TRANS: Title of delete group page.
 #. TRANS: Form legend for deleting a group.
-#, fuzzy
 msgid "Delete group"
-msgstr "ユーザ削除"
+msgstr "グループ削除"
 
 #. TRANS: Warning in form for deleleting a group.
-#, fuzzy
 msgid ""
 "Are you sure you want to delete this group? This will clear all data about "
 "the group from the database, without a backup. Public posts to this group "
 "will still appear in individual timelines."
 msgstr ""
-"����本当���ユーザを削除������? �れ��ックアップ���データ"
-"ベース�らユーザ�関�る����データをクリア���。"
+"本当���グループを削除��もよ������？  �れ��ックアップ���デー"
+"タベース�らグループ�関�る����データをクリア���。グループ�パブリッ"
+"ク投稿�個々�タイムライン�表示�れ��。"
 
 #. TRANS: Submit button title for 'No' when deleting a group.
-#, fuzzy
 msgid "Do not delete this group."
-msgstr "����や�を削除����ん。"
+msgstr "��グループを削除���。"
 
 #. TRANS: Submit button title for 'Yes' when deleting a group.
-#, fuzzy
 msgid "Delete this group."
-msgstr "��ユーザを削除"
+msgstr "��グループを削除。"
 
 #. TRANS: Instructions for deleting a notice.
 msgid ""
@@ -1954,209 +1886,52 @@ msgstr "��や�削除"
 
 #. TRANS: Message for the delete notice form.
 msgid "Are you sure you want to delete this notice?"
-msgstr "本当�����や�を削除����？"
+msgstr "����や�を本当�削除����？"
 
 #. TRANS: Submit button title for 'No' when deleting a notice.
-#, fuzzy
 msgid "Do not delete this notice."
-msgstr "����や�を削除����ん。"
+msgstr "����や�を削除���。"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#, fuzzy
 msgid "Delete this notice."
 msgstr "����や�を削除"
 
 #. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
 msgid "You cannot delete users."
-msgstr "ユーザを削除����ん"
+msgstr "ユーザーを削除����ん"
 
 #. TRANS: Client error displayed when trying to delete a non-local user.
 msgid "You can only delete local users."
-msgstr "ローカルユーザ��削除����。"
+msgstr "ローカルユーザー��削除����。"
 
 #. TRANS: Title of delete user page.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Delete user"
-msgstr "ユーザ削除"
+msgstr "ユーザー削除"
 
 #. TRANS: Fieldset legend on delete user page.
 msgid "Delete user"
-msgstr "ユーザ削除"
+msgstr "ユーザー削除"
 
 #. TRANS: Information text to request if a user is certain that the described action has to be performed.
 msgid ""
 "Are you sure you want to delete this user? This will clear all data about "
 "the user from the database, without a backup."
 msgstr ""
-"����本当���ユーザを削除������? �れ��ックアップ���データ"
-"ベース�らユーザ�関�る����データをクリア���。"
+"本当���ユーザーを削除������？ �れ��ックアップ���データベース�"
+"らユーザー�関�る����データをクリア���。"
 
 #. TRANS: Submit button title for 'No' when deleting a user.
-#, fuzzy
 msgid "Do not delete this user."
-msgstr "����や�を削除����ん。"
+msgstr "��ユーザーを削除���。"
 
 #. TRANS: Submit button title for 'Yes' when deleting a user.
-#, fuzzy
 msgid "Delete this user."
-msgstr "��ユーザを削除"
-
-#. TRANS: Message used as title for design settings for the site.
-msgid "Design"
-msgstr "デザイン"
-
-#. TRANS: Instructions for design adminsitration panel.
-msgid "Design settings for this StatusNet site"
-msgstr ""
-
-#. TRANS: Client error displayed when a logo URL does is not valid.
-msgid "Invalid logo URL."
-msgstr "�正�ロゴ URL"
-
-#. TRANS: Client error displayed when an SSL logo URL is invalid.
-#, fuzzy
-msgid "Invalid SSL logo URL."
-msgstr "�正�ロゴ URL"
-
-#. TRANS: Client error displayed when a theme is submitted through the form that is not in the theme list.
-#. TRANS: %s is the chosen unavailable theme.
-#, php-format
-msgid "Theme not available: %s."
-msgstr "ＩＭ �利用��。"
-
-#. TRANS: Fieldset legend for form to change logo.
-msgid "Change logo"
-msgstr "ロゴ�変更"
-
-#. TRANS: Field label for StatusNet site logo.
-msgid "Site logo"
-msgstr "サイトロゴ"
-
-#. TRANS: Field label for SSL StatusNet site logo.
-#, fuzzy
-msgid "SSL logo"
-msgstr "サイトロゴ"
-
-#. TRANS: Fieldset legend for form change StatusNet site's theme.
-msgid "Change theme"
-msgstr "テーマ変更"
-
-#. TRANS: Field label for dropdown to choose site theme.
-msgid "Site theme"
-msgstr "サイトテーマ"
-
-#. TRANS: Title for field label for dropdown to choose site theme.
-msgid "Theme for the site."
-msgstr "サイト�テーマ"
-
-#. TRANS: Field label for uploading a cutom theme.
-#, fuzzy
-msgid "Custom theme"
-msgstr "サイトテーマ"
-
-#. TRANS: Form instructions for uploading a cutom StatusNet theme.
-msgid "You can upload a custom StatusNet theme as a .ZIP archive."
-msgstr ""
-
-#. TRANS: Fieldset legend for theme background image.
-msgid "Change background image"
-msgstr "�ックグラウンドイメージ�変更"
-
-#. TRANS: Field label for background image on theme designer page.
-#. TRANS: Field label for background color selector.
-#. TRANS: Label on profile design page for setting a profile page background colour.
-msgid "Background"
-msgstr "�ックグラウンド"
-
-#. TRANS: Form guide for background image upload form on theme designer page.
-#, php-format
-msgid ""
-"You can upload a background image for the site. The maximum file size is %1"
-"$s."
-msgstr ""
-"��サイト用��ックグラウンドイメージをアップロード����。最大ファイルサ"
-"イズ� %1$s。"
-
-#. TRANS: Used as radio button label to add a background image.
-msgid "On"
-msgstr "オン"
-
-#. TRANS: Used as radio button label to not add a background image.
-msgid "Off"
-msgstr "オフ"
-
-#. TRANS: Form guide for turning background image on or off on theme designer page.
-#. TRANS: Form guide for a set of radio buttons on the profile design page that will enable or disable
-#. TRANS: use of the uploaded profile image.
-msgid "Turn background image on or off."
-msgstr "�ックグラウンドイメージ�オン���オフ。"
-
-#. TRANS: Checkbox label to title background image on theme designer page.
-#. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
-msgid "Tile background image"
-msgstr "タイル�ックグラウンドイメージ"
-
-#. TRANS: Fieldset legend for theme colors.
-#, fuzzy
-msgid "Change colors"
-msgstr "色�変更"
-
-#. TRANS: Field label for content color selector.
-#. TRANS: Label on profile design page for setting a profile page content colour.
-msgid "Content"
-msgstr "内容"
-
-#. TRANS: Field label for sidebar color selector.
-#. TRANS: Label on profile design page for setting a profile page sidebar colour.
-msgid "Sidebar"
-msgstr "サイド�ー"
-
-#. TRANS: Field label for text color selector.
-#. TRANS: Label on profile design page for setting a profile page text colour.
-msgid "Text"
-msgstr "テキスト"
-
-#. TRANS: Field label for link color selector.
-#. TRANS: Label on profile design page for setting a profile page links colour.
-msgid "Links"
-msgstr "リンク"
-
-#. TRANS: Fieldset legend for advanced theme design settings.
-msgid "Advanced"
-msgstr ""
-
-#. TRANS: Field label for custom CSS.
-msgid "Custom CSS"
-msgstr ""
-
-#. TRANS: Button text for resetting theme settings.
-#, fuzzy
-msgctxt "BUTTON"
-msgid "Use defaults"
-msgstr "デフォルトを使用"
-
-#. TRANS: Title for button for resetting theme settings.
-#. TRANS: Title for button on profile design page to reset all colour settings to default.
-#, fuzzy
-msgid "Restore default designs."
-msgstr "デフォルトデザイン�戻�。"
-
-#. TRANS: Title for button for resetting theme settings.
-#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#, fuzzy
-msgid "Reset back to default."
-msgstr "デフォルト�リセット�る"
-
-#. TRANS: Title for button for saving theme settings.
-#. TRANS: Title for button on profile design page to save settings.
-#, fuzzy
-msgid "Save design."
-msgstr "デザイン��存"
+msgstr "��ユーザーを削除。"
 
 #. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
 msgid "This notice is not a favorite!"
-msgstr "����や���気�入り���り��ん!"
+msgstr "����や���気�入り���り��ん�"
 
 #. TRANS: Title for page on which favorites can be added.
 msgid "Add to favorites"
@@ -2164,9 +1939,77 @@ msgstr "�気�入り�加�る"
 
 #. TRANS: Client exception thrown when requesting a document from the documentation that does not exist.
 #. TRANS: %s is the non-existing document.
-#, fuzzy, php-format
+#, php-format
 msgid "No such document \"%s\"."
-msgstr "��よ��ドキュメント��り��ん。\"%s\""
+msgstr "ドキュメント \"%s\" ��り��ん。"
+
+#. TRANS: Menu item in administrator navigation panel.
+#. TRANS: Menu item in default local navigation panel.
+#. TRANS: Menu item in personal group navigation menu.
+msgctxt "MENU"
+msgid "Home"
+msgstr "ホーム"
+
+msgctxt "MENU"
+msgid "Docs"
+msgstr "ドキュメント"
+
+#. TRANS: Secondary navigation menu item leading to help on StatusNet.
+msgctxt "MENU"
+msgid "Help"
+msgstr "ヘルプ"
+
+msgid "Getting started"
+msgstr "����"
+
+#. TRANS: Secondary navigation menu item leading to text about StatusNet site.
+msgctxt "MENU"
+msgid "About"
+msgstr "解説"
+
+msgid "About this site"
+msgstr "��サイト����"
+
+#. TRANS: Secondary navigation menu item leading to Frequently Asked Questions.
+msgctxt "MENU"
+msgid "FAQ"
+msgstr "よ��る質��回答"
+
+msgid "Frequently asked questions"
+msgstr "よ��る質�"
+
+#. TRANS: Secondary navigation menu item leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+msgctxt "MENU"
+msgid "Contact"
+msgstr "連絡先"
+
+msgid "Contact info"
+msgstr "連絡先�情報"
+
+msgctxt "MENU"
+msgid "Tags"
+msgstr "ã‚¿ã‚°"
+
+msgid "Using tags"
+msgstr "タグ�使用"
+
+#. TRANS: Menu item in default local navigation panel.
+#. TRANS: Menu item in search group navigation panel.
+#. TRANS: Menu item in local navigation menu.
+msgctxt "MENU"
+msgid "Groups"
+msgstr "グループ"
+
+msgid "Using groups"
+msgstr "グループを使用�る"
+
+msgctxt "MENU"
+msgid "API"
+msgstr "API"
+
+msgid "RESTful API"
+msgstr ""
 
 #. TRANS: Title for "Edit application" form.
 #. TRANS: Form legend.
@@ -2189,32 +2032,31 @@ msgstr "��フォームを使��アプリケーションを編集���
 #. TRANS: Validation error shown when not providing a name in the "Edit application" form.
 #. TRANS: Validation error shown when not providing a name in the "New application" form.
 msgid "Name is required."
-msgstr "���必須��。"
+msgstr "���必���。"
 
 #. TRANS: Validation error shown when providing too long a name in the "Edit application" form.
 #. TRANS: Validation error shown when providing too long a name in the "New application" form.
-#, fuzzy
 msgid "Name is too long (maximum 255 characters)."
-msgstr "���長����。（最大255字��）"
+msgstr "���長���� (最大 255 文字��)。"
 
 #. TRANS: Validation error shown when providing a name for an application that already exists in the "Edit application" form.
 #. TRANS: Validation error shown when providing a name for an application that already exists in the "New application" form.
 msgid "Name already in use. Try another one."
-msgstr "��ニック�ーム�既�使用�れ����。他�も�を試����下��。"
+msgstr "�����既�使用�れ����。他�も�を試����下��。"
 
 #. TRANS: Validation error shown when not providing a description in the "Edit application" form.
 #. TRANS: Validation error shown when not providing a description in the "New application" form.
 msgid "Description is required."
-msgstr "概��必���。"
+msgstr "説明�必���。"
 
 #. TRANS: Validation error shown when providing too long a source URL in the "Edit application" form.
 msgid "Source URL is too long."
-msgstr "ソースＵＲＬ�長����。"
+msgstr "ソース URL �長����。"
 
 #. TRANS: Validation error shown when providing an invalid source URL in the "Edit application" form.
 #. TRANS: Validation error shown when providing an invalid source URL in the "New application" form.
 msgid "Source URL is not valid."
-msgstr "ソースＵＲＬ��正��。"
+msgstr "ソース URL �無効��。"
 
 #. TRANS: Validation error shown when not providing an organisation in the "Edit application" form.
 #. TRANS: Validation error shown when not providing an organisation in the "New application" form.
@@ -2222,9 +2064,8 @@ msgid "Organization is required."
 msgstr "組織�必���。"
 
 #. TRANS: Validation error shown when providing too long an arganisation name in the "Edit application" form.
-#, fuzzy
 msgid "Organization is too long (maximum 255 characters)."
-msgstr "組織�長����。（最大255字）"
+msgstr "組織�長���� (最大 255 文字��)。"
 
 #. TRANS: Form validation error show when an organisation name has not been provided in the edit application form.
 #. TRANS: Form validation error show when an organisation name has not been provided in the new application form.
@@ -2239,7 +2080,7 @@ msgstr "コール�ック�長����。"
 #. TRANS: Validation error shown when providing an invalid callback URL in the "Edit application" form.
 #. TRANS: Validation error shown when providing an invalid callback URL in the "New application" form.
 msgid "Callback URL is not valid."
-msgstr "コール�ックURL��正��。"
+msgstr "コール�ック URL �無効��。"
 
 #. TRANS: Server error occuring when an application could not be updated from the "Edit application" form.
 msgid "Could not update application."
@@ -2265,7 +2106,7 @@ msgstr "��フォームを使��グループを編集���。"
 #. TRANS: %s is the invalid alias.
 #, php-format
 msgid "Invalid alias: \"%s\""
-msgstr "�正�別�: \"%s\""
+msgstr "無効�別�: \"%s\""
 
 #. TRANS: Group edit form success message.
 #. TRANS: Edit list form success message.
@@ -2274,41 +2115,38 @@ msgstr "オプション��存�れ���。"
 
 #. TRANS: Title for edit list page after deleting a tag.
 #. TRANS: %s is a list.
-#, fuzzy, php-format
+#, php-format
 msgid "Delete %s list"
-msgstr "��ユーザを削除"
+msgstr "リスト %s を削除"
 
 #. TRANS: Title for edit list page.
 #. TRANS: %s is a list.
 #. TRANS: Form legend for list edit form.
 #. TRANS: %s is a list.
-#, fuzzy, php-format
+#, php-format
 msgid "Edit list %s"
-msgstr "有効�メールアドレス���り��ん。"
+msgstr "リスト %s を編集"
 
 #. TRANS: Error message displayed when trying to perform an action that requires a tagging user or ID.
 #, fuzzy
 msgid "No tagger or ID."
-msgstr "ニック�ーム��り��ん。"
+msgstr "No tagger or ID."
 
 #. TRANS: Client error displayed when referring to non-local user.
 msgid "Not a local user."
-msgstr "ローカルユーザ���り��ん。"
+msgstr "ローカルユーザー���り��ん。"
 
 #. TRANS: Client error displayed when reting to edit a tag that was not self-created.
-#, fuzzy
 msgid "You must be the creator of the tag to edit it."
-msgstr "グループを編集�る��管�者��る必���り��。"
+msgstr "タグを編集�る���タグ�作�者��る必���り��。"
 
 #. TRANS: Form instruction for edit list form.
-#, fuzzy
 msgid "Use this form to edit the list."
-msgstr "��フォームを使��グループを編集���。"
+msgstr "リストを編集�る�����フォームを使用������。"
 
 #. TRANS: Form validation error displayed if the form data for deleting a tag was incorrect.
-#, fuzzy
 msgid "Delete aborted."
-msgstr "��や�削除"
+msgstr "削除を中止����。"
 
 #. TRANS: Text in confirmation dialog for deleting a tag.
 msgid ""
@@ -2317,15 +2155,14 @@ msgid ""
 msgstr ""
 
 #. TRANS: Form validation error displayed if a given tag is invalid.
-#, fuzzy
 msgid "Invalid tag."
-msgstr "�正�サイズ。"
+msgstr "無効�タグ。"
 
 #. TRANS: Form validation error displayed if a given tag is already present.
 #. TRANS: %s is the already present tag.
-#, fuzzy, php-format
+#, php-format
 msgid "You already have a tag named %s."
-msgstr "�������や�を繰り返�����。"
+msgstr "タグ� %s �既�存在���。"
 
 #. TRANS: Text in confirmation dialog for setting a tag from public to private.
 msgid ""
@@ -2333,14 +2170,13 @@ msgid ""
 "subscriptions to it. Do you still want to continue?"
 msgstr ""
 
-#. TRANS: TRANS: Server error displayed when updating a list fails.
-#, fuzzy
+#. TRANS: Server error displayed when updating a list fails.
 msgid "Could not update list."
-msgstr "ユーザを更新����ん���。"
+msgstr "リストを更新����ん���。"
 
 #. TRANS: Title for e-mail settings.
 msgid "Email settings"
-msgstr "メール設定"
+msgstr "メール�設定"
 
 #. TRANS: E-mail settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
@@ -2365,14 +2201,14 @@ msgstr "�在確��れ��るメールアドレス。"
 #. TRANS: Button text to untag a profile.
 msgctxt "BUTTON"
 msgid "Remove"
-msgstr "回復"
+msgstr "削除"
 
 #. TRANS: Form note in e-mail settings form.
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
 msgstr ""
-"��アドレス�承�待���。�信ボックス（�スパムボックス）�追加�指示�書"
+"��アドレス�承�待���。�信ボックス（�スパムボックス）�更�る指示�書"
 "�れ�メッセージ�届������確�������。"
 
 #. TRANS: Instructions for e-mail address input form. Do not translate
@@ -2387,7 +2223,6 @@ msgstr "メールアドレス�\"UserName@example.org\" �よ��"
 #. TRANS: Button label for adding an IM address in IM settings form.
 #. TRANS: Button label for adding a SMS phone number in SMS settings form.
 #. TRANS: Button text to tag a profile.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Add"
 msgstr "追加"
@@ -2395,7 +2230,7 @@ msgstr "追加"
 #. TRANS: Form legend for incoming e-mail settings form.
 #. TRANS: Form legend for incoming SMS settings form.
 msgid "Incoming email"
-msgstr "入���るメール"
+msgstr "�信メール"
 
 #. TRANS: Checkbox label in e-mail preferences form.
 msgid "I want to post notices by email."
@@ -2409,24 +2244,25 @@ msgstr "新����や�投稿���アドレス�メール�る"
 #. TRANS: Instructions for incoming e-mail address input form, when an address has already been assigned.
 #. TRANS: Instructions for incoming SMS e-mail address input form.
 msgid "Make a new email address for posting to; cancels the old one."
-msgstr "投稿����新��Eメールアドレスを作り��; ��方を�り消���。"
+msgstr "投稿����新��メールアドレスを作����; ��方を�り消���。"
 
 #. TRANS: Instructions for incoming e-mail address input form.
 msgid ""
 "To send notices via email, we need to create a unique email address for you "
 "on this server:"
 msgstr ""
+"メール���や�を�信�る�����サー��一��メールアドレスを作��る必"
+"���り��。"
 
 #. TRANS: Button label for adding an e-mail address to send notices from.
 #. TRANS: Button label for adding an SMS e-mail address to send notices from.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "New"
-msgstr "New"
+msgstr "新�"
 
 #. TRANS: Form legend for e-mail preferences form.
 msgid "Email preferences"
-msgstr "メールアドレス"
+msgstr "メール�設定"
 
 #. TRANS: Checkbox label in e-mail preferences form.
 msgid "Send me notices of new subscriptions through email."
@@ -2453,21 +2289,19 @@ msgstr "������図�メールを�る��を許��る。"
 
 #. TRANS: Checkbox label in e-mail preferences form.
 msgid "Publish a MicroID for my email address."
-msgstr "��メールアドレス����MicroIDを発行������。"
+msgstr "��メールアドレス���� MicroID を発行������。"
 
 #. TRANS: Confirmation message for successful e-mail preferences save.
-#, fuzzy
 msgid "Email preferences saved."
-msgstr "デザイン設定��存�れ���。"
+msgstr "メール�設定を�存����。"
 
 #. TRANS: Message given saving e-mail address without having provided one.
 msgid "No email address."
 msgstr "メールアドレス��り��ん。"
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
-#, fuzzy
 msgid "Cannot normalize that email address."
-msgstr "��メールアドレスを正�化����ん"
+msgstr "メールアドレスを正�化(normalize)����ん。"
 
 #. TRANS: Message given saving e-mail address that not valid.
 #. TRANS: Form validation error displayed when trying to register without a valid e-mail address.
@@ -2477,7 +2311,7 @@ msgstr "有効�メールアドレス���り��ん。"
 
 #. TRANS: Message given saving e-mail address that is already set.
 msgid "That is already your email address."
-msgstr "�れ��������メールアドレス��。"
+msgstr "�れ�既�����メールアドレス��。"
 
 #. TRANS: Message given saving e-mail address that is already set for another user.
 msgid "That email address already belongs to another user."
@@ -2486,18 +2320,17 @@ msgstr "��メールアドレス�既�他�人�使�����。"
 #. TRANS: Server error thrown on database error adding e-mail confirmation code.
 #. TRANS: Server error thrown on database error adding Instant Messaging confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
-#, fuzzy
 msgid "Could not insert confirmation code."
-msgstr "承�コードを追加����ん"
+msgstr "承�コードを追加����ん���。"
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
 msgid ""
 "A confirmation code was sent to the email address you added. Check your "
 "inbox (and spam box!) for the code and instructions on how to use it."
 msgstr ""
-"承�コードを入力�れ�電�メールアドレス��信����。�信ボックス（�スパ"
-"ムボックス）�コード��れを��使������指示�届������確����"
-"���。"
+"入力�れ�メールアドレス�承�コードを�信����。�信ボックス（�スパム"
+"ボックス）�コード��れを��使������指示�届������確�����"
+"��。"
 
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling Instant Messaging address confirmation that is not pending.
@@ -2506,18 +2339,16 @@ msgid "No pending confirmation to cancel."
 msgstr "承�待��も���り��ん。"
 
 #. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#, fuzzy
 msgid "That is the wrong email address."
-msgstr "�� IM アドレス��正��。"
+msgstr "メールアドレス�間������。"
 
 #. TRANS: Server error thrown on database error canceling e-mail address confirmation.
-#, fuzzy
 msgid "Could not delete email confirmation."
-msgstr "メール承�を削除����ん"
+msgstr "メール承�を削除����ん。"
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
 msgid "Email confirmation cancelled."
-msgstr "承�待��も���り��ん。"
+msgstr "メール承��キャンセル�れ���。"
 
 #. TRANS: Message given trying to remove an e-mail address that is not
 #. TRANS: registered for the active user.
@@ -2526,37 +2357,35 @@ msgstr "�れ�����メールアドレス���り��ん。"
 
 #. TRANS: Message given after successfully removing a registered e-mail address.
 msgid "The email address was removed."
-msgstr "入���るメールアドレス�削除�れ���。"
+msgstr "メールアドレスを削除����。"
 
 #. TRANS: Form validation error displayed when trying to remove an incoming e-mail address while no address has been set.
 msgid "No incoming email address."
-msgstr "入���るメールアドレス���り��ん。"
+msgstr "�信メールアドレス��り��ん。"
 
 #. TRANS: Server error thrown on database error removing incoming e-mail address.
 #. TRANS: Server error thrown on database error adding incoming e-mail address.
 #. TRANS: Server error displayed when the user could not be updated in SMS settings.
-#, fuzzy
 msgid "Could not update user record."
-msgstr "ユーザレコードを更新����ん。"
+msgstr "ユーザーレコードを更新����ん���。"
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
 #. TRANS: Confirmation text after updating SMS settings.
 msgid "Incoming email address removed."
-msgstr "入���るメールアドレス�削除�れ���。"
+msgstr "�信メールアドレス�削除����。"
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
 #. TRANS: Confirmation text after updating SMS settings.
 msgid "New incoming email address added."
-msgstr "新��入���るメールアドレス�追加�れ���。"
+msgstr "新���信メールアドレスを追加����。"
 
 #. TRANS: Client error displayed when trying to mark a notice as favorite that already is a favorite.
 msgid "This notice is already a favorite!"
-msgstr "����や������気�入り��!"
+msgstr "����や��既��気�入り���"
 
 #. TRANS: Page title for page on which favorite notices can be unfavourited.
-#, fuzzy
 msgid "Disfavor favorite."
-msgstr "�気�入りをや�る"
+msgstr "�気�入りをや���。"
 
 #. TRANS: Page title for first page of favorited notices.
 #. TRANS: Title for favourited notices section.
@@ -2596,7 +2425,7 @@ msgid ""
 "notice to your favorites!"
 msgstr ""
 "�� [アカウント登録](%%action.register%%) �����������������"
-"気�入り���や�を加�る最���り��ょ�!"
+"気�入り���や�を加�る最���り��ょ��"
 
 #. TRANS: Title of RSS feed with favourite notices of a user.
 #. TRANS: %s is a user's nickname.
@@ -2606,34 +2435,34 @@ msgstr ""
 #. TRANS: %s is a username.
 #, php-format
 msgid "%s's favorite notices"
-msgstr "%s ��気�入り���や�"
+msgstr "%s �ん��気�入り���や�"
 
 #. TRANS: Desciption of RSS feed with favourite notices of a user.
 #. TRANS: %1$s is a user's nickname, %2$s is the name of the StatusNet site.
 #, php-format
 msgid "Updates favored by %1$s on %2$s!"
-msgstr "%1$s �よる %2$s 上��気�入りを更新!"
+msgstr "%1$s �よる %2$s 上��気�入りを更新�"
 
 #. TRANS: Page title for first page of featured users.
 #. TRANS: Title for featured users section.
 #. TRANS: Menu item title in search group navigation panel.
 msgid "Featured users"
-msgstr "フィー�ャー�れ�ユーザ"
+msgstr "フィー�ャー�れ�ユーザー"
 
 #. TRANS: Page title for all but first page of featured users.
 #. TRANS: %d is the page number being displayed.
 #, php-format
 msgid "Featured users, page %d"
-msgstr "フィー�ャー�れ�ユーザ�ページ %d"
+msgstr "フィー�ャー�れ�ユーザー�ページ %d"
 
 #. TRANS: Description on page displaying featured users.
-#, fuzzy, php-format
+#, php-format
 msgid "A selection of some great users on %s."
-msgstr "%s 上�優れ�ユーザ�集�り"
+msgstr "%s 上�優れ�ユーザー�集�り"
 
 #. TRANS: Client error displayed when no notice ID was given trying do display a file.
 msgid "No notice ID."
-msgstr "��や�ＩＤ��り��ん。"
+msgstr "��や� ID ��り��ん。"
 
 #. TRANS: Client error displayed when an invalid notice ID was given trying do display a file.
 msgid "No notice."
@@ -2648,42 +2477,6 @@ msgstr "��よ��添付��り��ん。"
 msgid "No uploaded attachments."
 msgstr "アップロード�れ�添付��り��ん。"
 
-#. TRANS: Client error displayed when subscribing to a remote profile and an unexpected response is received.
-msgid "Not expecting this response!"
-msgstr "想定外�レス�ンス���"
-
-#. TRANS: Client error displayed when subscribing to a remote profile that does not exist.
-msgid "User being listened to does not exist."
-msgstr "存在���よ����れ��るユーザ。"
-
-#. TRANS: Client error displayed when subscribing to a remote profile that is a local profile.
-#. TRANS: Client error displayed when using remote subscribe for a local entity.
-msgid "You can use the local subscription!"
-msgstr "ローカルサブスクリプションを使用�能���"
-
-#. TRANS: Client error displayed when subscribing to a remote profile that is blocked form subscribing to.
-msgid "That user has blocked you from subscribing."
-msgstr "��ユーザ�フォローをブロック�れ����。"
-
-#. TRANS: Client error displayed when subscribing to a remote profile without providing an authorised token.
-msgid "You are not authorized."
-msgstr "�証�れ����ん。"
-
-#. TRANS: Client error displayed when subscribing to a remote profile and conversion of the request token to access token fails.
-msgid "Could not convert request token to access token."
-msgstr "リクエストトークンをアクセストークン�変�����ん"
-
-#. TRANS: Client error displayed when subscribing to a remote profile fails because of an unsupported version of the OMB protocol.
-msgid "Remote service uses unknown version of OMB protocol."
-msgstr ""
-"リモートサービス���明��ージョン� OMB プロトコルを使用�����。"
-
-#. TRANS: Server error displayed when subscribing to a remote profile fails because the remote profile could not be updated.
-#. TRANS: Exception thrown when updating a remote profile fails in OAuth store.
-#, fuzzy
-msgid "Error updating remote profile."
-msgstr "リモートプロファイル更新エラー"
-
 #. TRANS: Client error displayed when requesting a non-existent file.
 msgid "No such file."
 msgstr "��よ��ファイル��り��ん。"
@@ -2694,24 +2487,21 @@ msgstr "ファイルを読�込���ん。"
 
 #. TRANS: Client error displayed when trying to assign an invalid role to a user.
 #. TRANS: Client error displayed when trying to revoke an invalid role.
-#, fuzzy
 msgid "Invalid role."
-msgstr "�正�トークン。"
+msgstr "無効�ロール��。"
 
 #. TRANS: Client error displayed when trying to assign an reserved role to a user.
 #. TRANS: Client error displayed when trying to revoke a reserved role.
 msgid "This role is reserved and cannot be set."
-msgstr ""
+msgstr "��ロール�予約�れ��り�設定�る�������ん。"
 
 #. TRANS: Client error displayed when trying to assign a role to a user while not being allowed to set roles.
-#, fuzzy
 msgid "You cannot grant user roles on this site."
-msgstr "������サイト�サンドボックスユーザ�����ん。"
+msgstr "��サイト��ユーザーロールを付与�る�������ん。"
 
 #. TRANS: Client error displayed when trying to assign a role to a user that already has that role.
-#, fuzzy
 msgid "User already has this role."
-msgstr "ユーザ�既�黙�����。"
+msgstr "ユーザー�既���ロールを������。"
 
 #. TRANS: Client error displayed trying to block a user from a group while not specifying a to be blocked user profile.
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing a profile.
@@ -2719,13 +2509,13 @@ msgstr "ユーザ�既�黙�����。"
 #. TRANS: Client error displayed trying a change a subscription without providing a profile.
 #. TRANS: Client error displayed when trying to change user options without specifying a user to work on.
 msgid "No profile specified."
-msgstr "プロファイル記述��り��ん。"
+msgstr "プロファイル�指定�れ����ん。"
 
 #. TRANS: Client error displayed trying to block a user from a group while not specifying a group to block a profile from.
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing a group.
 #. TRANS: Client error displayed when not providing a group ID on the Make Admin page.
 msgid "No group specified."
-msgstr "グループ記述��り��ん。"
+msgstr "グループ説明��り��ん。"
 
 #. TRANS: Client error displayed trying to block a user from a group while not being an admin user.
 msgid "Only an admin can block group members."
@@ -2733,16 +2523,16 @@ msgstr "管�者���グループメン�ーをブロック����。
 
 #. TRANS: Client error displayed trying to block a user from a group while user is already blocked from the given group.
 msgid "User is already blocked from group."
-msgstr "ユーザ����グループ�らブロック�れ����。"
+msgstr "ユーザー�既�グループ�らブロック�れ����。"
 
 #. TRANS: Client error displayed trying to block a user from a group while user is not a member of given group.
 msgid "User is not a member of group."
-msgstr "ユーザ�グループ�メン�ー���り��ん。"
+msgstr "ユーザー�グループ�メン�ー���り��ん。"
 
 #. TRANS: Title for block user from group page.
 #. TRANS: Form legend for form to block user from a group.
 msgid "Block user from group"
-msgstr "グループ�らユーザをブロック"
+msgstr "グループ�らユーザーをブロック"
 
 #. TRANS: Explanatory text for block user from group form before setting the block.
 #. TRANS: %1$s is that to be blocked user, %2$s is the group the user will be blocked from.
@@ -2752,22 +2542,20 @@ msgid ""
 "will be removed from the group, unable to post, and unable to subscribe to "
 "the group in the future."
 msgstr ""
-"本当�ユーザ %1$s をグループ %2$s �らブロック����? 彼ら�グループ�ら削"
-"除�れる�投稿�����グループをフォロー�����り��。"
+"本当�ユーザー %1$s をグループ %2$s �らブロック����？ 彼ら�グループ�ら"
+"削除�れる�投稿�����グループをフォロー�����り��。"
 
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
-#, fuzzy
 msgid "Do not block this user from this group."
-msgstr "��グループ�ら��ユーザをブロック���"
+msgstr "��グループ�ら���ユーザーをブロック���。"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user from a group.
-#, fuzzy
 msgid "Block this user from this group."
-msgstr "��グループ�ら��ユーザをブロック"
+msgstr "��グループ�ら���ユーザーをブロック�る。"
 
 #. TRANS: Server error displayed when trying to block a user from a group fails because of an application error.
 msgid "Database error blocking user from group."
-msgstr "グループ�ら�ブロックユーザ�データベースエラー"
+msgstr "グループ�ら�ブロックユーザー�データベースエラー"
 
 #. TRANS: Client error displayed referring to a group's permalink without providing a group ID.
 #. TRANS: Client error displayed trying to perform an action without providing an ID.
@@ -2775,32 +2563,6 @@ msgstr "グループ�ら�ブロックユーザ�データベースエラー
 msgid "No ID."
 msgstr "ID ��り��ん。"
 
-#. TRANS: Client error displayed trying to change group design settings while not logged in.
-msgid "You must be logged in to edit a group."
-msgstr "グループを編集�る��ログイン�����れ��り��ん。"
-
-#. TRANS: Title group design settings page.
-msgid "Group design"
-msgstr "グループデザイン"
-
-#. TRANS: Instructions for group design settings page.
-msgid ""
-"Customize the way your group looks with a background image and a colour "
-"palette of your choice."
-msgstr ""
-"�����ん�パレット�色��ックグラウンドイメージ�����グループをカス"
-"タマイズ������。"
-
-#. TRANS: Form validation error displayed when group design settings could not be updated because of an application issue.
-#, fuzzy
-msgid "Unable to update your design settings."
-msgstr "����デザイン設定を�存����ん。"
-
-#. TRANS: Form text to confirm saved group design settings.
-#. TRANS: Confirmation message on Profile design page when saving design settings has succeeded.
-msgid "Design preferences saved."
-msgstr "デザイン設定��存�れ���。"
-
 #. TRANS: Title for group logo settings page.
 #. TRANS: Group logo form legend.
 msgid "Group logo"
@@ -2849,7 +2611,7 @@ msgstr "%1$s グループメン�ー�ページ %2$d"
 
 #. TRANS: Page notice for group members page.
 msgid "A list of the users in this group."
-msgstr "��グループ�ユーザ�リスト。"
+msgstr "��グループ�ユーザー�リスト。"
 
 #. TRANS: Client error displayed when trying to approve group applicants without being a group administrator.
 msgid "Only the group admin may approve users."
@@ -2857,20 +2619,19 @@ msgstr ""
 
 #. TRANS: Title of the first page showing pending group members still awaiting approval to join the group.
 #. TRANS: %s is the name of the group.
-#, fuzzy, php-format
+#, php-format
 msgid "%s group members awaiting approval"
-msgstr "%s グループメン�ー"
+msgstr "承�を待���る %s グループ�メン�ー"
 
 #. TRANS: Title of all but the first page showing pending group members still awaiting approval to join the group.
 #. TRANS: %1$s is the name of the group, %2$d is the page number of the members list.
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s group members awaiting approval, page %2$d"
-msgstr "%1$s グループメン�ー�ページ %2$d"
+msgstr "承�を待���る %1$s グループ�メン�ー�ページ %2$d"
 
 #. TRANS: Page notice for group members page.
-#, fuzzy
 msgid "A list of users awaiting approval to join this group."
-msgstr "��グループ�ユーザ�リスト。"
+msgstr "��グループ���加�承�を待���るユーザー�一覧。"
 
 #. TRANS: Message is used as link description. %1$s is a group name, %2$s is a site name.
 #, php-format
@@ -2878,14 +2639,13 @@ msgid "Updates from members of %1$s on %2$s!"
 msgstr "%2$s 上� %1$s �メン�ー�ら更新�る"
 
 #. TRANS: Title for first page of the groups list.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Groups"
 msgstr "グループ"
 
 #. TRANS: Title for all but the first page of the groups list.
 #. TRANS: %d is the page number.
-#, fuzzy, php-format
+#, php-format
 msgctxt "TITLE"
 msgid "Groups, page %d"
 msgstr "グループ�ページ %d"
@@ -2893,7 +2653,7 @@ msgstr "グループ�ページ %d"
 #. TRANS: Page notice of group list. %%%%site.name%%%% is the StatusNet site name,
 #. TRANS: %%%%action.groupsearch%%%% and %%%%action.newgroup%%%% are URLs. Do not change them.
 #. TRANS: This message contains Markdown links in the form [link text](link).
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "%%%%site.name%%%% groups let you find and talk with people of similar "
 "interests. After you join a group you can send messages to all other members "
@@ -2902,10 +2662,10 @@ msgid ""
 "%%%)!"
 msgstr ""
 "%%%%site.name%%%% グループ�������様�関心事をも�人々を見���話を�"
-"る�������。グループ�入��後�����他�メン�ー� \"!groupname\" "
-"文法を使��メッセージを�る�������。����好��グループ��る��"
-"��[探���る](%%%%action.groupsearch%%%%)�����自身�[始������!]"
-"(%%%%action.newgroup%%%%)"
+"る�������。グループ�入��後�他�メン�ー� \"!groupname\" 文法を"
+"使��メッセージを�る�������。����好��グループ��る���� "
+"[探���る](%%%%action.groupsearch%%%%) �����自身�[始������!](%%"
+"%%action.newgroup%%%%)"
 
 #. TRANS: Link to create a new group on the group list page.
 #. TRANS: Link text on group page to create a new group.
@@ -2919,7 +2679,7 @@ msgid ""
 "Search for groups on %%site.name%% by their name, location, or description. "
 "Separate the terms by spaces; they must be 3 characters or more."
 msgstr ""
-"%%site.name%% �グループを����場所�記述�ら検索。検索語�スペース区切"
+"%%site.name%% �グループを����場所�説明�ら検索。検索語�スペース区切"
 "り。3字以上。"
 
 #. TRANS: Title for page where groups can be searched.
@@ -2931,17 +2691,17 @@ msgstr "グループ�検索"
 #. TRANS: Message on the "People search" page where a query has no results.
 #. TRANS: Output when there are no results for a search.
 msgid "No results."
-msgstr "�果��。"
+msgstr "�果��り��ん。"
 
 #. TRANS: Additional text on page where groups can be searched if no results were found for a query for a logged in user.
 #. TRANS: This message contains Markdown links in the form [link text](link).
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "If you cannot find the group you're looking for, you can [create it](%%"
 "action.newgroup%%) yourself."
 msgstr ""
-"も������探���るグループ�見��ら���������[�れを作�](%%"
-"action.newgroup%%)����。"
+"も��探���るグループ�見��ら���������グループを [作�](%%"
+"action.newgroup%%) �る�������。"
 
 #. TRANS: Additional text on page where groups can be searched if no results were found for a query for a not logged in user.
 #. TRANS: This message contains Markdown links in the form [link text](link).
@@ -2950,8 +2710,8 @@ msgid ""
 "Why not [register an account](%%action.register%%) and [create the group](%%"
 "action.newgroup%%) yourself!"
 msgstr ""
-"��[アカウント登録](%%action.register%%) や [グループ作�](%%action.newgroup"
-"%%) �����!"
+"�� [アカウント登録](%%action.register%%) や [グループ作�](%%action."
+"newgroup%%) を��������"
 
 #. TRANS: Client error displayed when trying to unblock a user from a group without being an administrator for the group.
 msgid "Only an admin can unblock group members."
@@ -2959,7 +2719,7 @@ msgstr "管�者���グループメン�ーをアンブロック���
 
 #. TRANS: Client error displayed when trying to unblock a non-blocked user from a group.
 msgid "User is not blocked from group."
-msgstr "ユーザ�グループ�らブロック�れ����ん。"
+msgstr "ユーザー�グループ�らブロック�れ����ん。"
 
 #. TRANS: Server error displayed when unblocking a user from a group fails because of an unknown error.
 #. TRANS: Server error displayed when removing a user block.
@@ -2968,78 +2728,70 @@ msgstr "ブロック�削除エラー"
 
 #. TRANS: Title for Instant Messaging settings.
 msgid "IM settings"
-msgstr "IM設定"
+msgstr "IM 設定"
 
 #. TRANS: Instant messaging settings page instructions.
 #. TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link.
 #. TRANS: the order and formatting of link text and link should remain unchanged.
-#, fuzzy, php-format
+#, php-format
 msgid ""
-"You can send and receive notices through instant messaging [instant messages]"
-"(%%doc.im%%). Configure your addresses and settings below."
+"You can send and receive notices through [instant messaging](%%doc.im%%). "
+"Configure your addresses and settings below."
 msgstr ""
-"Jabber/GTalk [instant messages](%%doc.im%%)　経由�通知��信��信��能�"
-"�。下�アドレスを設定��下��。"
+"[インスタント メッセージング](%%doc.im%%) 経由���や���信��信��能�"
+"�。����アドレス�以下�設定を行���。"
 
 #. TRANS: Message given in the IM settings if IM is not enabled on the site.
 msgid "IM is not available."
-msgstr "ＩＭ �利用��。"
+msgstr "IM �利用��。"
 
 #. TRANS: Form note in IM settings form. %s is the type of IM address that was confirmed.
-#, fuzzy, php-format
+#, php-format
 msgid "Current confirmed %s address."
-msgstr "�在確��れ��るメールアドレス。"
+msgstr "�在確��れ��る %s アドレス。"
 
 #. TRANS: Form note in IM settings form.
 #. TRANS: %s is the IM service name, %2$s is the IM address set.
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your %1$s account for a message "
 "with further instructions. (Did you add %2$s to your buddy list?)"
 msgstr ""
-"��アドレス�承�待���。Jabber � Gtalk �アカウント�追加�指示�書�れ"
-"�メッセージを確�������。(%s を�人リスト�追加�����？)"
+"��アドレス�承�待���。%1$s アカウント�追加�指示�書�れ�メッセージを"
+"確�������。(%2$s を�人リスト�追加�����？)"
 
 #. TRANS: Field label for IM address.
 msgid "IM address"
-msgstr "IMアドレス"
+msgstr "IM アドレス"
 
 #. TRANS: Field title for IM address. %s is the IM service name.
 #, php-format
 msgid "%s screenname."
-msgstr ""
+msgstr "%s スクリーン�ーム。"
 
 #. TRANS: Header for IM preferences form.
-#, fuzzy
 msgid "IM Preferences"
-msgstr "設定��存�れ���。"
+msgstr "IM �設定"
 
 #. TRANS: Checkbox label in IM preferences form.
-#, fuzzy
 msgid "Send me notices"
-msgstr "��や�を�る"
+msgstr "��や�を�信�る"
 
 #. TRANS: Checkbox label in IM preferences form.
-#, fuzzy
 msgid "Post a notice when my status changes."
-msgstr "Jabber/GTalk�ステータス�変更�れ�時�通知を�る。"
+msgstr "ステータス�変更�れ�時�通知を�る。"
 
 #. TRANS: Checkbox label in IM preferences form.
-#, fuzzy
 msgid "Send me replies from people I'm not subscribed to."
-msgstr ""
-"Jabber/GTalkを通��回答を���フォロー�れ����人々�ら��������"
-"�。"
+msgstr "��フォロー�れ����人々�ら���返信を�る。"
 
 #. TRANS: Checkbox label in IM preferences form.
-#, fuzzy
 msgid "Publish a MicroID"
-msgstr "��メールアドレス����MicroIDを発行������。"
+msgstr "MicroID を公開�る。"
 
 #. TRANS: Server error thrown on database error updating IM preferences.
-#, fuzzy
 msgid "Could not update IM preferences."
-msgstr "ユーザを更新����ん���。"
+msgstr "IM 設定を更新����ん���。"
 
 #. TRANS: Confirmation message for successful IM preferences save.
 #. TRANS: Confirmation message after saving preferences.
@@ -3047,76 +2799,66 @@ msgid "Preferences saved."
 msgstr "設定��存�れ���。"
 
 #. TRANS: Message given saving IM address without having provided one.
-#, fuzzy
 msgid "No screenname."
-msgstr "ニック�ーム��り��ん。"
+msgstr "スクリーン�ーム��り��ん。"
 
 #. TRANS: Form validation error when no transport is available setting an IM address.
-#, fuzzy
 msgid "No transport."
-msgstr "��や���り��ん。"
+msgstr "通信方法��り��ん。"
 
 #. TRANS: Message given saving IM address that cannot be normalised.
-#, fuzzy
 msgid "Cannot normalize that screenname."
-msgstr "�� Jabbar ID を正�化����ん"
+msgstr "スクリーン�ームを正�化����ん。"
 
 #. TRANS: Message given saving IM address that not valid.
-#, fuzzy
 msgid "Not a valid screenname."
-msgstr "有効�ニック�ーム���り��ん。"
+msgstr "有効�スクリーン�ーム���り��ん。"
 
 #. TRANS: Message given saving IM address that is already set for another user.
-#, fuzzy
 msgid "Screenname already belongs to another user."
-msgstr "Jabber ID ｊ�既�別�ユーザ�使用�����。"
+msgstr "スクリーン�ーム��既�別�ユーザー�使用�����。"
 
 #. TRANS: Message given saving valid IM address that is to be confirmed.
-#, fuzzy
 msgid "A confirmation code was sent to the IM address you added."
-msgstr ""
-"承�コードを入力�れ� IM アドレス��信����。����メッセージを�れる"
-"よ���る��%sを承�������。"
+msgstr "確�用コードを入力�れ� IM アドレス��信����。"
 
 #. TRANS: Message given canceling IM address confirmation for the wrong IM address.
 msgid "That is the wrong IM address."
-msgstr "�� IM アドレス��正��。"
+msgstr "IM アドレス�間������。"
 
 #. TRANS: Server error thrown on database error canceling IM address confirmation.
-#, fuzzy
 msgid "Could not delete confirmation."
-msgstr "メール承�を削除����ん"
+msgstr "メール確�を削除����ん���。"
 
 #. TRANS: Message given after successfully canceling IM address confirmation.
 msgid "IM confirmation cancelled."
-msgstr "確�コード��り��ん。"
+msgstr "IM 確��キャンセル�れ���。"
 
 #. TRANS: Message given trying to remove an IM address that is not
 #. TRANS: registered for the active user.
-#, fuzzy
 msgid "That is not your screenname."
-msgstr "�れ�����電話番����り��ん。"
+msgstr "�れ�����スクリーン�ーム���り��ん。"
 
 #. TRANS: Message given after successfully removing a registered Instant Messaging address.
 msgid "The IM address was removed."
-msgstr "入���るメールアドレス�削除�れ���。"
+msgstr "IM アドレス�削除�れ���。"
 
 #. TRANS: Title for all but the first page of the inbox page.
 #. TRANS: %1$s is the user's nickname, %2$s is the page number.
 #, php-format
 msgid "Inbox for %1$s - page %2$d"
-msgstr "%1$s ��信箱 - ページ %2$d"
+msgstr "%1$s ��信トレイ - ページ %2$d"
 
 #. TRANS: Title for the first page of the inbox page.
 #. TRANS: %s is the user's nickname.
 #, php-format
 msgid "Inbox for %s"
-msgstr "%s ��信箱"
+msgstr "%s ��信トレイ"
 
 #. TRANS: Instructions for user inbox page.
 msgid "This is your inbox, which lists your incoming private messages."
 msgstr ""
-"�れ������信箱���や����プライベートメッセージをリスト���。"
+"�れ������信トレイ����信��プライベートメッセージをリスト���。"
 
 #. TRANS: Client error displayed when trying to sent invites while they have been disabled.
 msgid "Invites have been disabled."
@@ -3126,35 +2868,33 @@ msgstr "招待�無効��れ���。"
 #. TRANS: %s is the StatusNet site name.
 #, php-format
 msgid "You must be logged in to invite other users to use %s."
-msgstr "グループを編集�る��ログイン�����れ��り��ん。"
+msgstr "%s �他�ユーザーを招待�る���ログイン�る必���り��。"
 
 #. TRANS: Form validation message when providing an e-mail address that does not validate.
 #. TRANS: %s is an invalid e-mail address.
-#, fuzzy, php-format
+#, php-format
 msgid "Invalid email address: %s."
-msgstr "�正�メールアドレス：%s'"
+msgstr "無効�メールアドレス: %s。"
 
 #. TRANS: Page title when invitations have been sent.
-#, fuzzy
 msgid "Invitations sent"
-msgstr "招待を�り���。"
+msgstr "招待状��信"
 
 #. TRANS: Page title when inviting potential users.
 msgid "Invite new users"
-msgstr "新��ユーザを招待"
+msgstr "新��ユーザーを招待"
 
 #. TRANS: Message displayed inviting users to use a StatusNet site while the inviting user
 #. TRANS: is already subscribed to one or more users with the given e-mail address(es).
 #. TRANS: Plural form is based on the number of reported already subscribed e-mail addresses.
 #. TRANS: Followed by a bullet list.
-#, fuzzy
 msgid "You are already subscribed to this user:"
 msgid_plural "You are already subscribed to these users:"
-msgstr[0] "����れら�ユーザをフォロー�����:"
+msgstr[0] "既���ユーザーをフォロー�����:"
 
 #. TRANS: Used as list item for already subscribed users (%1$s is nickname, %2$s is e-mail address).
 #. TRANS: Used as list item for already registered people (%1$s is nickname, %2$s is e-mail address).
-#, fuzzy, php-format
+#, php-format
 msgctxt "INVITE"
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
@@ -3162,21 +2902,17 @@ msgstr "%1$s (%2$s)"
 #. TRANS: Message displayed inviting users to use a StatusNet site while the invited user
 #. TRANS: already uses a this StatusNet site. Plural form is based on the number of
 #. TRANS: reported already present people. Followed by a bullet list.
-#, fuzzy
 msgid "This person is already a user and you were automatically subscribed:"
 msgid_plural ""
 "These people are already users and you were automatically subscribed to them:"
-msgstr[0] ""
-"�れら�人々�既�ユーザ�����������自動的�彼ら�フォロー�れ��"
-"�:"
+msgstr[0] "��人�既�ユーザー��。自動的�フォロー����:"
 
 #. TRANS: Message displayed inviting users to use a StatusNet site. Plural form is
 #. TRANS: based on the number of invitations sent. Followed by a bullet list of
 #. TRANS: e-mail addresses to which invitations were sent.
-#, fuzzy
 msgid "Invitation sent to the following person:"
 msgid_plural "Invitations sent to the following people:"
-msgstr[0] "招待を以下�人々��信����:"
+msgstr[0] ""
 
 #. TRANS: Generic message displayed after sending out one or more invitations to
 #. TRANS: people to join a StatusNet site.
@@ -3185,7 +2921,7 @@ msgid ""
 "on the site. Thanks for growing the community!"
 msgstr ""
 "����招待�加者�招待�応���サイト�登録�る������通知�れる�"
-"�ょ�。 コミュニティを広��������り��������!"
+"�ょ�。 コミュニティを広��������り���������"
 
 #. TRANS: Form instructions.
 msgid ""
@@ -3193,30 +2929,6 @@ msgid ""
 msgstr ""
 "�人や�僚���サービスを利用�るよ���フォームを使用��誘������。"
 
-#. TRANS: Field label for a list of e-mail addresses.
-msgid "Email addresses"
-msgstr "メールアドレス"
-
-#. TRANS: Tooltip for field label for a list of e-mail addresses.
-#, fuzzy
-msgid "Addresses of friends to invite (one per line)."
-msgstr "招待�る�人�アドレス (一行�一�)"
-
-#. TRANS: Field label for a personal message to send to invitees.
-msgid "Personal message"
-msgstr "パーソナルメッセージ"
-
-#. TRANS: Tooltip for field label for a personal message to send to invitees.
-msgid "Optionally add a personal message to the invitation."
-msgstr "任��招待�パーソナルメッセージを加������。"
-
-#. TRANS: Send button for inviting friends
-#. TRANS: Button text for sending notice.
-#, fuzzy
-msgctxt "BUTTON"
-msgid "Send"
-msgstr "投稿"
-
 #. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral
 #. TRANS: singular 3rd-person pronoun in English. %1$s is the inviting user, $2$s is
 #. TRANS: the StatusNet sitename.
@@ -3226,18 +2938,17 @@ msgstr "%1$s ����を %2$s �招待����"
 
 #. TRANS: Client error displayed when trying to join a group while not logged in.
 msgid "You must be logged in to join a group."
-msgstr "グループ�入る����ログイン���れ��り��ん。"
+msgstr "グループ�入る��ログイン�る必���り��。"
 
 #. TRANS: Title for join group page after joining.
-#, fuzzy, php-format
+#, php-format
 msgctxt "TITLE"
 msgid "%1$s joined group %2$s"
 msgstr "%1$s �グループ %2$s ��加����"
 
 #. TRANS: Exception thrown when there is an unknown error joining a group.
-#, fuzzy
 msgid "Unknown error joining group."
-msgstr "�明"
+msgstr "グループ���加����明�エラー�発生����。"
 
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
@@ -3251,11 +2962,11 @@ msgstr "ライセンス"
 
 #. TRANS: Form instructions for the site license admin panel.
 msgid "License for this StatusNet site"
-msgstr "��StatusNetサイト�ライセンス"
+msgstr "�� StatusNet サイト�ライセンス"
 
 #. TRANS: Client error displayed selecting an invalid license in the license admin panel.
 msgid "Invalid license selection."
-msgstr ""
+msgstr "無効�ライセンスを�択�����。"
 
 #. TRANS: Client error displayed when not specifying an owner for the all rights reserved license in the license admin panel.
 msgid ""
@@ -3264,29 +2975,29 @@ msgid ""
 msgstr ""
 
 #. TRANS: Client error displayed selecting a too long license title in the license admin panel.
-#, fuzzy
 msgid "Invalid license title. Maximum length is 255 characters."
-msgstr "�正�ウェルカムテキスト。最大長�255字��。"
+msgstr "ライセンス�タイトル�無効��。最大長�255 文字��。"
 
 #. TRANS: Client error displayed specifying an invalid license URL in the license admin panel.
 msgid "Invalid license URL."
-msgstr ""
+msgstr "ライセンス� URL �無効。"
 
 #. TRANS: Client error displayed specifying an invalid license image URL in the license admin panel.
 msgid "Invalid license image URL."
-msgstr ""
+msgstr "ライセンス�画� URL �無効。"
 
 #. TRANS: Client error displayed specifying an invalid license URL in the license admin panel.
 msgid "License URL must be blank or a valid URL."
-msgstr ""
+msgstr "ライセンス URL ��ブランク���有効� URL ���れ��り��ん。"
 
 #. TRANS: Client error displayed specifying an invalid license image URL in the license admin panel.
 msgid "License image must be blank or valid URL."
 msgstr ""
+"ライセンス�画� URL ��ブランク���有効� URL ���れ��り��ん。"
 
 #. TRANS: Form legend in the license admin panel.
 msgid "License selection"
-msgstr ""
+msgstr "ライセンス�択"
 
 #. TRANS: License option in the license admin panel.
 #. TRANS: Checkbox label to mark a list private.
@@ -3295,76 +3006,68 @@ msgstr "プライベート"
 
 #. TRANS: License option in the license admin panel.
 msgid "All Rights Reserved"
-msgstr ""
+msgstr "All Rights Reserved"
 
 #. TRANS: License option in the license admin panel.
 msgid "Creative Commons"
-msgstr ""
+msgstr "クリエイティブ・コモンズ"
 
 #. TRANS: Dropdown field label in the license admin panel.
 msgid "Type"
-msgstr ""
+msgstr "種類"
 
 #. TRANS: Dropdown field instructions in the license admin panel.
-#, fuzzy
 msgid "Select a license."
-msgstr "キャリア�択"
+msgstr "ライセンス�択"
 
 #. TRANS: Form legend in the license admin panel.
 msgid "License details"
-msgstr ""
+msgstr "ライセンス�詳細"
 
 #. TRANS: Field label in the license admin panel.
 msgid "Owner"
-msgstr ""
+msgstr "所有者"
 
 #. TRANS: Field title in the license admin panel.
 msgid "Name of the owner of the site's content (if applicable)."
-msgstr ""
+msgstr "サイト�コンテンツ�所有者��� (該当�る場�)。"
 
 #. TRANS: Field label in the license admin panel.
 msgid "License Title"
-msgstr ""
+msgstr "ライセンスタイトル"
 
 #. TRANS: Field title in the license admin panel.
 msgid "The title of the license."
-msgstr ""
+msgstr "ライセンス�タイトル"
 
 #. TRANS: Field label in the license admin panel.
 msgid "License URL"
-msgstr ""
+msgstr "ライセンス URL"
 
 #. TRANS: Field title in the license admin panel.
 msgid "URL for more information about the license."
-msgstr ""
+msgstr "ライセンス�����詳細情報� URL。"
 
 #. TRANS: Field label in the license admin panel.
 msgid "License Image URL"
-msgstr ""
+msgstr "ライセンス画� URL"
 
 #. TRANS: Field title in the license admin panel.
 msgid "URL for an image to display with the license."
-msgstr ""
+msgstr "ライセンスを表示�るイメージ� URL。"
 
 #. TRANS: Button title in the license admin panel.
-#, fuzzy
 msgid "Save license settings."
-msgstr "サイト設定��存"
-
-#. TRANS: Client error displayed when trying to log in while already logged in.
-#. TRANS: Client error displayed trying to use "one time password login" when already logged in.
-#. TRANS: Client error displayed when trying to register while already logged in.
-msgid "Already logged in."
-msgstr "既�ログイン�����。"
+msgstr "ライセンス設定を�存���。"
 
 #. TRANS: Form validation error displayed when trying to log in with incorrect credentials.
 msgid "Incorrect username or password."
-msgstr "ユーザ����パスワード�間������。"
+msgstr "ユーザー����パスワード�間������。"
 
 #. TRANS: Server error displayed when during login a server error occurs.
 #. TRANS: Server error displayed when a user object could not be created trying to login using "one time password login".
 msgid "Error setting user. You are probably not authorized."
-msgstr "ユーザ設定エラー。 ������ん承��れ����ん。"
+msgstr "ユーザー設定エラー。 ������ん承��れ����ん。"
 
 #. TRANS: Page title for login page.
 msgid "Login"
@@ -3375,7 +3078,6 @@ msgid "Login to site"
 msgstr "サイト�ログイン"
 
 #. TRANS: Field label on login page.
-#, fuzzy
 msgid "Username or email address"
 msgstr "ニック�ーム���メールアドレス"
 
@@ -3390,46 +3092,44 @@ msgid "Automatically login in the future; not for shared computers!"
 msgstr "以��自動的�ログイン�る。共用コンピューター������ょ��"
 
 #. TRANS: Button text for log in on login page.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Login"
 msgstr "ログイン"
 
 #. TRANS: Link text for link to "reset password" on login page.
 msgid "Lost or forgotten password?"
-msgstr "パスワードを紛失�忘れ�？"
+msgstr "パスワードを紛失����忘れ����？"
 
 #. TRANS: Form instructions on login page before being able to change user settings.
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
 msgstr ""
-"セキュリティー上��由�より�設定を変更�る��ユーザ��パスワードを入力�"
-"�下��。"
+"セキュリティー上��由�より�設定を変更�る���度ユーザー��パスワードを"
+"入力��下��。"
 
 #. TRANS: Form instructions on login page.
-#, fuzzy
 msgid "Login with your username and password."
-msgstr "ユーザ��パスワード�ログイン"
+msgstr "ユーザー��パスワード�ログイン。"
 
 #. TRANS: Form instructions on login page. This message contains Markdown links in the form [Link text](Link).
 #. TRANS: %%action.register%% is a link to the registration page.
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
 msgstr ""
-"ユーザ��パスワード��ログイン������。 ��ユーザ�を������ん"
-"�? 新��アカウントを [登録](%%action.register%%)。"
+"��ユーザー�を������ん�？ 新��アカウントを [登録](%%action."
+"register%%)������。"
 
 #. TRANS: Client error displayed when trying to make another user admin on the Make Admin page while not an admin.
 msgid "Only an admin can make another user an admin."
-msgstr "管�者���別�ユーザを管�者��る�������。"
+msgstr "管�者���別�ユーザーを管�者��る�������。"
 
 #. TRANS: Client error displayed when trying to make another user admin on the Make Admin page who already is admin.
 #. TRANS: %1$s is the user that is already admin, %2$s is the group user is already admin for.
 #, php-format
 msgid "%1$s is already an admin for group \"%2$s\"."
-msgstr "%1$s ����グループ \"%2$s\" �管�者��。"
+msgstr "%1$s �既�グループ \"%2$s\" �管�者��。"
 
 #. TRANS: Server error displayed when trying to make another user admin on the Make Admin page fails
 #. TRANS: because the group membership record could not be gotten.
@@ -3447,7 +3147,7 @@ msgstr "%1$s をグループ %2$s �管�者��る�������ん"
 
 #. TRANS: Client error displayed trying to make a micro summary without providing a status.
 msgid "No current status."
-msgstr "�果��。"
+msgstr "�在�ステータス��り��ん。"
 
 #. TRANS: This is the title of the form for adding a new application.
 msgid "New application"
@@ -3463,24 +3163,23 @@ msgstr "��フォームを使��新��アプリケーションを登録
 
 #. TRANS: Validation error shown when not providing a source URL in the "New application" form.
 msgid "Source URL is required."
-msgstr "ソースURL�必���。"
+msgstr "ソース URL �必���。"
 
 #. TRANS: Server error displayed when an application could not be registered in the database through the "New application" form.
 msgid "Could not create application."
 msgstr "アプリケーションを作�����ん。"
 
-#, fuzzy
+#. TRANS: Form validation error messages displayed when uploading an invalid application logo.
 msgid "Invalid image."
-msgstr "�正�サイズ。"
+msgstr "無効�画�。"
 
 #. TRANS: Title for form to create a group.
 msgid "New group"
 msgstr "新��グループ"
 
 #. TRANS: Client exception thrown when a user tries to create a group while banned.
-#, fuzzy
 msgid "You are not allowed to create groups on this site."
-msgstr "��グループ�メン�ー���り��ん。"
+msgstr "��サイト�グループを作��る���許��れ����ん。"
 
 #. TRANS: Form instructions for group create form.
 msgid "Use this form to create a new group."
@@ -3493,9 +3192,8 @@ msgstr "新��メッセージ"
 
 #. TRANS: Client error displayed trying to send a direct message to a user while sender and
 #. TRANS: receiver are not subscribed to each other.
-#, fuzzy
 msgid "You cannot send a message to this user."
-msgstr "��ユーザ�メッセージを�る�������ん。"
+msgstr "��ユーザー�メッセージを�信�る�������ん。"
 
 #. TRANS: Form validator error displayed trying to send a direct message without content.
 #. TRANS: Client error displayed trying to send a notice without content.
@@ -3508,13 +3206,6 @@ msgstr "コンテンツ��り��ん�"
 msgid "No recipient specified."
 msgstr "��人�書�れ����ん。"
 
-#. TRANS: Client error displayed trying to send a direct message to self.
-#. TRANS: Error text shown when trying to send a direct message to self.
-msgid ""
-"Don't send a message to yourself; just say it to yourself quietly instead."
-msgstr ""
-"自分自身�メッセージを�る�������ん; ��り�独り言を言���ょ�。"
-
 #. TRANS: Page title after sending a direct message.
 msgid "Message sent"
 msgstr "メッセージを�り���"
@@ -3534,7 +3225,6 @@ msgstr "Ajax エラー"
 
 #. TRANS: Page title for sending a new notice.
 #. TRANS: Title for form to send a new notice.
-#, fuzzy
 msgctxt "TITLE"
 msgid "New notice"
 msgstr "新����や�"
@@ -3569,8 +3259,8 @@ msgid ""
 "Be the first to [post on this topic](%%%%action.newnotice%%%%?"
 "status_textarea=%s)!"
 msgstr ""
-"最�� [��トピック投稿](%%%%action.newnotice%%%%?status_textarea=%s) を��"
-"����!"
+"最�� [��トピック�投稿](%%%%action.newnotice%%%%?status_textarea=%s) を�"
+"������"
 
 #. TRANS: Text for not logged in users making a query for notices without results.
 #. TRANS: This message contains Markdown links.
@@ -3580,7 +3270,8 @@ msgid ""
 "[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
 msgstr ""
 "�� [アカウント登録](%%%%action.register%%%%) �����������最��"
-"[��トピック投稿](%%%%action.newnotice%%%%?status_textarea=%s)������!"
+"[��トピック投稿](%%%%action.newnotice%%%%?status_textarea=%s) �����"
+"��"
 
 #. TRANS: RSS notice search feed title. %s is the query.
 #, php-format
@@ -3589,18 +3280,17 @@ msgstr "%s �更新"
 
 #. TRANS: RSS notice search feed description.
 #. TRANS: %1$s is the query, %2$s is the StatusNet site name.
-#, fuzzy, php-format
+#, php-format
 msgid "Updates matching search term \"%1$s\" on %2$s."
-msgstr "\"%2$s\" 上�検索語 \"$1$s\" �一致�る����更新"
+msgstr "\"%2$s\" 上�検索語 \"%1$s\" �一致�る����更新"
 
 #. TRANS: Client error displayed trying to nudge a user that cannot be nudged.
-#, fuzzy
 msgid ""
 "This user doesn't allow nudges or hasn't confirmed or set their email "
 "address yet."
 msgstr ""
-"��ユーザ���図を許��������確��れ���状態�����メール設定"
-"を�����ん。"
+"��ユーザ���図を許��������確��れ����状態��メールアドレス"
+"を設定�����ん。"
 
 #. TRANS: Page title after sending a nudge.
 msgid "Nudge sent"
@@ -3608,7 +3298,7 @@ msgstr "�図を���"
 
 #. TRANS: Confirmation text after sending a nudge.
 msgid "Nudge sent!"
-msgstr "�図を���!"
+msgstr "�図を����"
 
 #. TRANS: Message displayed to an anonymous user trying to view OAuth application list.
 msgid "You must be logged in to list your applications."
@@ -3637,13 +3327,13 @@ msgstr ""
 
 #. TRANS: Client error when trying to revoke access for an application while not being a user of it.
 msgid "You are not a user of that application."
-msgstr "������アプリケーション�ユーザ���り��ん。"
+msgstr "������アプリケーション�ユーザー���り��ん。"
 
 #. TRANS: Client error when revoking access has failed for some reason.
 #. TRANS: %s is the application ID revoking access failed for.
-#, fuzzy, php-format
+#, php-format
 msgid "Unable to revoke access for application: %s."
-msgstr "アプリケーション�����消�アクセス�����ん: "
+msgstr "アプリケーション�アクセスを�り消��������ん: %s。"
 
 #. TRANS: Success message after revoking access for an application.
 #. TRANS: %1$s is the application name, %2$s is the first part of the user token.
@@ -3667,23 +3357,25 @@ msgid ""
 "Are you a developer? [Register an OAuth client application](%s) to use with "
 "this instance of StatusNet."
 msgstr ""
+"����開発者���？ StatusNet ���インスタンスを [OAuth クライアントアプ"
+"リケーション�登録](%s) �使用���。"
 
 #. TRANS: Server error displayed in oEmbed action when path not found.
 #. TRANS: %s is a path.
-#, fuzzy, php-format
+#, php-format
 msgid "\"%s\" not found."
-msgstr "API メソッド�見��り��ん。"
+msgstr "\"%s\" �見��り��ん。"
 
 #. TRANS: Server error displayed in oEmbed action when notice not found.
 #. TRANS: %s is a notice.
-#, fuzzy, php-format
+#, php-format
 msgid "Notice %s not found."
-msgstr "API メソッド�見��り��ん。"
+msgstr "��や� %s �見��り��ん。"
 
 #. TRANS: Server error displayed in oEmbed action when notice has not profile.
 #. TRANS: Server error displayed trying to show a notice without a connected profile.
 msgid "Notice has no profile."
-msgstr "ユーザ�プロフィールをも�����ん。"
+msgstr "��や�プロファイルをも�����ん。"
 
 #. TRANS: oEmbed title. %1$s is the author name, %2$s is the creation date.
 #. TRANS: Title of the page that shows a notice.
@@ -3694,20 +3386,20 @@ msgstr "%2$s ���る %1$s �ステータス"
 
 #. TRANS: Server error displayed in oEmbed action when attachment not found.
 #. TRANS: %d is an attachment ID.
-#, fuzzy, php-format
+#, php-format
 msgid "Attachment %s not found."
-msgstr "���り手�ユーザ�見��り��ん。"
+msgstr "添付ファイル %s �見��り��ん。"
 
 #. TRANS: Server error displayed in oEmbed request when a path is not supported.
 #. TRANS: %s is a path.
 #, php-format
 msgid "\"%s\" not supported for oembed requests."
-msgstr ""
+msgstr " \"%s\" � oEmbed �求をサ�ート�����ん。"
 
 #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
-#, fuzzy, php-format
+#, php-format
 msgid "Content type %s not supported."
-msgstr "内容種別 "
+msgstr "コンテンツタイプ %s �サ�ート�����ん。"
 
 #. TRANS: Error message displaying attachments. %s is the site's base URL.
 #, php-format
@@ -3719,21 +3411,52 @@ msgstr ""
 msgid "Not a supported data format."
 msgstr "サ�ート�れ����データ形�。"
 
+#. TRANS: Page title for profile settings.
+msgid "Old school UI settings"
+msgstr "��学校�UI�設定"
+
+#. TRANS: Usage instructions for profile settings.
+msgid "If you like it \"the old way\", you can set that here."
+msgstr ""
+
+#. TRANS: Confirmation shown when user profile settings are saved.
+#. TRANS: Message after successful saving of administrative settings.
+msgid "Settings saved."
+msgstr "設定��存�れ���。"
+
+msgid "Only stream mode (no conversations) in timelines"
+msgstr ""
+
+msgid "Show conversation page as hierarchical trees"
+msgstr ""
+
+msgid "Show nicknames (not full names) in timelines"
+msgstr ""
+
+#. TRANS: Button text to save a list.
+msgid "Save"
+msgstr "�存"
+
 #. TRANS: ShortName in the OpenSearch interface when trying to find users.
 msgid "People Search"
-msgstr "ピープル検索"
+msgstr "ユーザー�検索"
 
 #. TRANS: ShortName in the OpenSearch interface when trying to find notices.
 msgid "Notice Search"
 msgstr "��や�検索"
 
+#. TRANS: Client error displayed trying to use "one time password login" when already logged in.
+#. TRANS: Client error displayed when trying to register while already logged in.
+msgid "Already logged in."
+msgstr "既�ログイン�����。"
+
 #. TRANS: Client error displayed trying to use "one time password login" without specifying a user.
 msgid "No user ID specified."
-msgstr "ユーザID�記述��り��ん。"
+msgstr "ユーザー ID �指定�り��ん。"
 
 #. TRANS: Client error displayed trying to use "one time password login" without specifying a login token.
 msgid "No login token specified."
-msgstr "ログイントークン�記述��り��ん。"
+msgstr "ログイントークン�指定��り��ん。"
 
 #. TRANS: Client error displayed trying to use "one time password login" without requesting a login token.
 msgid "No login token requested."
@@ -3741,34 +3464,33 @@ msgstr "ログイントークン��求�れ����ん。"
 
 #. TRANS: Client error displayed trying to use "one time password login" while specifying an invalid login token.
 msgid "Invalid login token specified."
-msgstr "�正�ログイントークン�指定�れ����。"
+msgstr "無効�ログイントークン�指定�れ����。"
 
 #. TRANS: Client error displayed trying to use "one time password login" while specifying an expired login token.
 msgid "Login token expired."
-msgstr "ログイントークン�期�切れ��・"
+msgstr "ログイントークン�期�切れ��。"
 
 #. TRANS: Title for outbox for any but the fist page.
 #. TRANS: %1$s is the user nickname, %2$d is the page number.
 #, php-format
 msgid "Outbox for %1$s - page %2$d"
-msgstr "%1$s ��信箱 - ページ %2$d"
+msgstr "%1$s ��信トレイ - ページ %2$d"
 
 #. TRANS: Title for first page of outbox.
 #, php-format
 msgid "Outbox for %s"
-msgstr "%s ��信箱"
+msgstr "%s ��信トレイ"
 
 #. TRANS: Instructions for outbox.
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr ""
-"�れ������信箱����������プライベート・メッセージをリスト��"
-"�。"
+"�れ������信トレイ����������プライベート・メッセージをリスト"
+"���。"
 
 #. TRANS: Title for page where to change password.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Change password"
-msgstr "パスワード�変更"
+msgstr "パスワードを変更"
 
 #. TRANS: Instructions for page where to change password.
 msgid "Change your password."
@@ -3790,25 +3512,21 @@ msgstr "新��パスワード"
 
 #. TRANS: Field title on page where to change password.
 #. TRANS: Field title on account registration page.
-#, fuzzy
 msgid "6 or more characters."
-msgstr "6文字以上"
+msgstr "6 文字以上。"
 
 #. TRANS: Field label on page where to change password. In this field the new password should be typed a second time.
-#, fuzzy
 msgctxt "LABEL"
 msgid "Confirm"
-msgstr "パスワード確�"
+msgstr "確�"
 
 #. TRANS: Field title on page where to change password.
-#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
+#. TRANS: Title for field label for password reset form where the password has to be typed again.
 #. TRANS: Field title on account registration page.
-#, fuzzy
 msgid "Same as password above."
-msgstr "上���パスワード"
+msgstr "上記���パスワード。"
 
 #. TRANS: Button text on page where to change password.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Change"
 msgstr "変更"
@@ -3820,23 +3538,20 @@ msgstr "パスワード�6文字以上��る必���り��。"
 
 #. TRANS: Form validation error on password change when password confirmation does not match.
 #. TRANS: Form validation error displayed when trying to register with non-matching passwords.
-#, fuzzy
 msgid "Passwords do not match."
 msgstr "パスワード�一致���ん。"
 
 #. TRANS: Form validation error on page where to change password.
-#, fuzzy
 msgid "Incorrect old password."
-msgstr "��パスワード�間������。"
+msgstr "��パスワード�正���り��ん。"
 
 #. TRANS: Form validation error on page where to change password.
 msgid "Error saving user; invalid."
-msgstr "ユーザ�存エラー; �正�ユーザ"
+msgstr "ユーザー�存エラー; 無効��。"
 
 #. TRANS: Server error displayed on page where to change password when password change
 #. TRANS: could not be made because of a server error.
 #. TRANS: Reset password form validation error message.
-#, fuzzy
 msgid "Cannot save new password."
 msgstr "新��パスワードを�存����ん。"
 
@@ -3850,36 +3565,30 @@ msgstr "パス"
 
 #. TRANS: Form instructions for Path admin panel.
 msgid "Path and server settings for this StatusNet site"
-msgstr ""
+msgstr "�� StatusNet サイト�パス�サー��設定"
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the directory that could not be read from.
 #, php-format
 msgid "Theme directory not readable: %s."
-msgstr "テーマディレクトリ"
+msgstr "テーマ�ディレクトリを読��る�������ん: %s"
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the avatar directory that could not be written to.
 #, php-format
 msgid "Avatar directory not writable: %s."
-msgstr "ア�ターディレクトリ"
-
-#. TRANS: Client error in Paths admin panel.
-#. TRANS: %s is the background directory that could not be written to.
-#, php-format
-msgid "Background directory not writable: %s."
-msgstr "�ックグラウンドディレクトリ"
+msgstr "ア�ター�ディレクトリ�書�込む�������ん: %s"
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the locales directory that could not be read from.
-#, fuzzy, php-format
+#, php-format
 msgid "Locales directory not readable: %s."
-msgstr "場所ディレクトリ�読�込���ん: %s"
+msgstr "ローカルディレクトリ�読�込���ん: %s。"
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the SSL server URL that is too long.
 msgid "Invalid SSL server. The maximum length is 255 characters."
-msgstr "�正� SSL サー�ー。最大 255 文字��。"
+msgstr "無効� SSL サー�ー。最大 255 文字��。"
 
 #. TRANS: Fieldset legend in Paths admin panel.
 msgid "Site"
@@ -3898,43 +3607,37 @@ msgid "Path"
 msgstr "パス"
 
 #. TRANS: Field title in Paths admin panel.
-#, fuzzy
 msgid "Site path."
-msgstr "サイトパス"
+msgstr "サイト�パス"
 
 #. TRANS: Field label in Paths admin panel.
-#, fuzzy
 msgid "Locale directory"
-msgstr "テーマディレクトリ"
+msgstr "ローカルディレクトリ"
 
 #. TRANS: Field title in Paths admin panel.
-#, fuzzy
 msgid "Directory path to locales."
-msgstr "ロケール��ディレクトリパス"
+msgstr "ローカル�ディレクトリパス。"
 
 #. TRANS: Checkbox label in Paths admin panel.
 msgid "Fancy URLs"
 msgstr ""
 
 #. TRANS: Field title in Paths admin panel.
-#, fuzzy
 msgid "Use fancy URLs (more readable and memorable)?"
-msgstr "Fancy URL (読�や��忘れ���) を使用����?"
+msgstr "Fancy URLs (読�や���忘れ���) を使用����？"
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#, fuzzy
 msgctxt "LEGEND"
 msgid "Theme"
 msgstr "テーマ"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#, fuzzy
 msgid "Server for themes."
-msgstr "サイト�テーマ"
+msgstr "テーマ用サー�ー"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
 msgid "Web path to themes."
-msgstr ""
+msgstr "テーマ� Web パス。"
 
 #. TRANS: Field label in Paths admin panel.
 msgid "SSL server"
@@ -3942,26 +3645,23 @@ msgstr "SSLサー�"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
 msgid "SSL server for themes (default: SSL server)."
-msgstr ""
+msgstr "テーマ用 SSL サー� ( デフォルト: SSL サー�)。"
 
 #. TRANS: Field label in Paths admin panel.
-#, fuzzy
 msgid "SSL path"
-msgstr "サイトパス"
+msgstr "SSL �パス"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
 msgid "SSL path to themes (default: /theme/)."
-msgstr ""
+msgstr "テーマ� SSL パス (デフォルト: /theme/ )。"
 
 #. TRANS: Field label in Paths admin panel.
-#, fuzzy
 msgid "Directory"
-msgstr "テーマディレクトリ"
+msgstr "ディレクトリ"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#, fuzzy
 msgid "Directory where themes are located."
-msgstr "ロケール��ディレクトリパス"
+msgstr "テーマ�置�れ��るディレクトリ"
 
 #. TRANS: Fieldset legend in Paths admin panel.
 msgid "Avatars"
@@ -3972,84 +3672,50 @@ msgid "Avatar server"
 msgstr "ア�ターサー�ー"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#, fuzzy
 msgid "Server for avatars."
-msgstr "サイト�テーマ"
+msgstr "ア�ター用サー�"
 
 #. TRANS: Field label in Paths admin panel.
 msgid "Avatar path"
 msgstr "ア�ターパス"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#, fuzzy
 msgid "Web path to avatars."
-msgstr "ア�ター�更新�失敗����。"
+msgstr "ア�ター� Web パス"
 
 #. TRANS: Field label in Paths admin panel.
 msgid "Avatar directory"
 msgstr "ア�ターディレクトリ"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#, fuzzy
 msgid "Directory where avatars are located."
-msgstr "ロケール��ディレクトリパス"
-
-#. TRANS: Fieldset legend in Paths admin panel.
-msgid "Backgrounds"
-msgstr "�ックグラウンド"
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-#, fuzzy
-msgid "Server for backgrounds."
-msgstr "サイト�テーマ"
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-msgid "Web path to backgrounds."
-msgstr ""
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-msgid "Server for backgrounds on SSL pages."
-msgstr ""
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-msgid "Web path to backgrounds on SSL pages."
-msgstr ""
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-#, fuzzy
-msgid "Directory where backgrounds are located."
-msgstr "ロケール��ディレクトリパス"
+msgstr "ア�ター�置�れ��るディレクトリ"
 
 #. TRANS: Fieldset legens in Paths admin panel.
 msgid "Attachments"
 msgstr "添付"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#, fuzzy
 msgid "Server for attachments."
-msgstr "サイト�テーマ"
+msgstr "添付ファイル用サー�"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#, fuzzy
 msgid "Web path to attachments."
-msgstr "��よ��添付��り��ん。"
+msgstr "添付ファイル�� Web パス"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#, fuzzy
 msgid "Server for attachments on SSL pages."
-msgstr "サイト�テーマ"
+msgstr "SSL ページ�添付ファイル用サー�"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
 msgid "Web path to attachments on SSL pages."
-msgstr ""
+msgstr "SSL ページを Web パス�添付���。"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#, fuzzy
 msgid "Directory where attachments are located."
-msgstr "ロケール��ディレクトリパス"
+msgstr "添付ファイル�置�れ��るディレクトリ"
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#, fuzzy
 msgctxt "LEGEND"
 msgid "SSL"
 msgstr "SSL"
@@ -4057,7 +3723,7 @@ msgstr "SSL"
 #. TRANS: Drop down option in Paths admin panel (option for "When to use SSL").
 #. TRANS: Option in dropdown for snapshot method in admin panel for snapshots.
 msgid "Never"
-msgstr ""
+msgstr "���"
 
 #. TRANS: Drop down option in Paths admin panel (option for "When to use SSL").
 msgid "Sometimes"
@@ -4065,25 +3731,23 @@ msgstr "����"
 
 #. TRANS: Drop down option in Paths admin panel (option for "When to use SSL").
 msgid "Always"
-msgstr "��も"
+msgstr "常�"
 
 #. TRANS: Drop down label in Paths admin panel.
 msgid "Use SSL"
 msgstr "SSL 使用"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#, fuzzy
 msgid "When to use SSL."
-msgstr "SSL 使用時"
+msgstr "SSL を使用�る場�。"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#, fuzzy
 msgid "Server to direct SSL requests to."
 msgstr "ダイレクト SSL リクエストを��るサー�"
 
 #. TRANS: Button title text to store form data in the Paths admin panel.
-msgid "Save paths"
-msgstr "�存パス"
+msgid "Save path settings."
+msgstr "パス設定を�存"
 
 #. TRANS: Instructions for the "People search" page.
 #. TRANS: %%site.name%% is the name of the StatusNet site.
@@ -4097,97 +3761,92 @@ msgstr ""
 
 #. TRANS: Title of a page where users can search for other users.
 msgid "People search"
-msgstr "ピープルサー�"
+msgstr "ユーザー�検索"
 
 #. TRANS: Title for list page.
 #. TRANS: %s is a list.
-#, fuzzy, php-format
+#, php-format
 msgid "Public list %s"
-msgstr "パブリックタグクラウド"
+msgstr "公開リスト %s"
 
 #. TRANS: Title for list page.
 #. TRANS: %1$s is a list, %2$d is a page number.
-#, fuzzy, php-format
+#, php-format
 msgid "Public list %1$s, page %2$d"
-msgstr "%1$s ��返信�ページ %2$s"
+msgstr "公開リスト %1$s�ページ %2$d"
 
 #. TRANS: Message for anonymous users on list page.
 #. TRANS: This message contains Markdown links in the form [description](link).
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "Lists are how you sort similar people on %%site.name%%, a [micro-blogging]"
 "(http://en.wikipedia.org/wiki/Micro-blogging) service based on the Free "
 "Software [StatusNet](http://status.net/) tool. You can then easily keep "
 "track of what they are doing by subscribing to the list's timeline."
 msgstr ""
-"**%s** � %%site.name%% 上�ユーザグループ��。フリーソフトウェアツール"
-"[StatusNet](http://status.net/)を基���[マイクロブロギング](http://en."
-"wikipedia.org/wiki/Micro-blogging) サービス。メン�ー�彼ら�暮ら��興味�関"
-"�る短�メッセージを共有���。"
+"リスト��%%site.name%% 上�人々を並�替�る方法��。フリーソフトウェアツー"
+"ル [StatusNet](http://status.net/) を基��� [ミニブログ](http://ja."
+"wikipedia.org/wiki/%%E3%%83%%9F%%E3%%83%%8B%%E3%%83%%96%%E3%%83%%AD%%E3%%82%%"
+"B0) サービス��。リスト�タイムラインをフォロー�る事���ん��何を���"
+"る�を簡��追跡�る�������。"
 
 #. TRANS: Client error displayed when a tagger is expected but not provided.
-#, fuzzy
 msgid "No tagger."
 msgstr "��よ��タグ��り��ん。"
 
 #. TRANS: Title for list of people listed by the user.
 #. TRANS: %1$s is a list, %2$s is a username.
-#, fuzzy, php-format
+#, php-format
 msgid "People listed in %1$s by %2$s"
-msgstr "%2$s 上� %1$s ��返信!"
+msgstr "%2$s � %1$s �記載�れ�人々"
 
 #. TRANS: Title for list of people listed by the user.
 #. TRANS: %1$s is a list, %2$s is a username, %2$s is a page number.
-#, fuzzy, php-format
+#, php-format
 msgid "People listed in %1$s by %2$s, page %3$d"
-msgstr "%1$s ��返信�ページ %2$s"
+msgstr "%2$s � %1$s �記載�れ�人々�ページ %3$d"
 
 #. TRANS: Addition in tag membership list for creator of a tag.
 #. TRANS: Addition in tag subscribers list for creator of a tag.
-#, fuzzy
 msgid "Creator"
-msgstr "作�日"
+msgstr "作�者"
 
 #. TRANS: Title for lists by a user page for a private tag.
-#, fuzzy
 msgid "Private lists by you"
-msgstr "%s グループを編集"
+msgstr "����プライベート�リスト"
 
 #. TRANS: Title for lists by a user page for a public tag.
-#, fuzzy
 msgid "Public lists by you"
-msgstr "パブリックタグクラウド"
+msgstr "����公開リスト"
 
 #. TRANS: Title for lists by a user page.
-#, fuzzy
 msgid "Lists by you"
-msgstr "%s グループを編集"
+msgstr "����リスト"
 
 #. TRANS: Title for lists by a user page.
 #. TRANS: %s is a user nickname.
 #, php-format
 msgid "Lists by %s"
-msgstr ""
+msgstr "%s �リスト"
 
 #. TRANS: Title for lists by a user page.
 #. TRANS: %1$s is a user nickname, %2$d is a page number.
-#, fuzzy, php-format
+#, php-format
 msgid "Lists by %1$s, page %2$d"
-msgstr "%1$s �タグ付��れ���や��ページ %2$d"
+msgstr "%1$s �リスト�ページ %2$d"
 
 #. TRANS: Client error displayed when trying view another user's private lists.
 msgid "You cannot view others' private lists"
-msgstr ""
+msgstr "他人�プライベートリストを表示�る�������ん。"
 
 #. TRANS: Mode selector label.
-#, fuzzy
 msgid "Mode"
-msgstr "管�"
+msgstr "モード"
 
 #. TRANS: Link text to show lists for user %s.
-#, fuzzy, php-format
+#, php-format
 msgid "Lists for %s"
-msgstr "%s ��信箱"
+msgstr "%s �リスト"
 
 #. TRANS: Fieldset legend.
 #. TRANS: Fieldset legend on gallery action page.
@@ -4196,49 +3855,46 @@ msgstr "フィルター���るタグを�択"
 
 #. TRANS: Checkbox title.
 msgid "Show private tags."
-msgstr ""
+msgstr "プライベートタグを表示。"
 
 #. TRANS: Checkbox label to show public tags.
-#, fuzzy
 msgctxt "LABEL"
 msgid "Public"
 msgstr "パブリック"
 
 #. TRANS: Checkbox title.
-#, fuzzy
 msgid "Show public tags."
-msgstr "��よ��タグ��り��ん。"
+msgstr "パブリック�タグを表示�る。"
 
 #. TRANS: Submit button text for tag filter form.
 #. TRANS: Submit button text on gallery action page.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Go"
-msgstr "移動"
+msgstr "実行"
 
 #. TRANS: Message displayed for anonymous users on page that displays lists by a user.
 #. TRANS: This message contains Markdown links in the form [description](links).
 #. TRANS: %s is a tagger nickname.
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "These are lists created by **%s**. Lists are how you sort similar people on %"
 "%%%site.name%%%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
 "blogging) service based on the Free Software [StatusNet](http://status.net/) "
 "tool. You can easily keep track of what they are doing by subscribing to the "
-"tag's timeline."
+"list's timeline."
 msgstr ""
-"**%s** � %%site.name%% 上�ユーザグループ��。フリーソフトウェアツール"
-"[StatusNet](http://status.net/)を基���[マイクロブロギング](http://en."
-"wikipedia.org/wiki/Micro-blogging) サービス。メン�ー�彼ら�暮ら��興味�関"
-"�る短�メッセージを共有���。"
+"�れ� **%s** �よ��作��れ�リスト��。リスト��%%%%site.name%%%% 上�"
+"人々を並�替�る方法��。フリーソフトウェアツール [StatusNet](http://status."
+"net/) を基��� [ミニブログ](http://ja.wikipedia.org/wiki/%%E3%%83%%9F%%E3%%"
+"83%%8B%%E3%%83%%96%%E3%%83%%AD%%E3%%82%%B0) サービス��。リスト�タイムライ"
+"ンをフォロー�る事���ん��何を���る��簡��追跡�る�������。"
 
 #. TRANS: Message displayed on page that displays lists by a user when there are none.
 #. TRANS: This message contains Markdown links in the form [description](links).
 #. TRANS: %s is a tagger nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "%s has not created any [lists](%%%%doc.lists%%%%) yet."
-msgstr ""
-"���れも [�ッシュタグ](%%doc.tags%%) 付����や�を投稿�����ん。"
+msgstr "%s � [lists](%%%%doc.lists%%%%) を��作������ん。"
 
 #. TRANS: Page title. %s is a tagged user's nickname.
 #, php-format
@@ -4246,62 +3902,62 @@ msgid "Lists with %s in them"
 msgstr ""
 
 #. TRANS: Page title. %1$s is a tagged user's nickname, %2$s is a page number.
-#, fuzzy, php-format
+#, php-format
 msgid "Lists with %1$s, page %2$d"
-msgstr "%1$s �タグ付��れ���や��ページ %2$d"
+msgstr "%1$s �リスト�ページ %2$d"
 
 #. TRANS: Message displayed for anonymous users on page that displays lists for a user.
 #. TRANS: This message contains Markdown links in the form [description](links).
 #. TRANS: %s is a tagger nickname.
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "These are lists for **%s**. lists are how you sort similar people on %%%%"
 "site.name%%%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
 "blogging) service based on the Free Software [StatusNet](http://status.net/) "
 "tool. You can easily keep track of what they are doing by subscribing to the "
-"tag's timeline."
+"list's timeline."
 msgstr ""
-"**%s** � %%site.name%% 上�ユーザグループ��。フリーソフトウェアツール"
-"[StatusNet](http://status.net/)を基���[マイクロブロギング](http://en."
-"wikipedia.org/wiki/Micro-blogging) サービス。メン�ー�彼ら�暮ら��興味�関"
-"�る短�メッセージを共有���。"
+"�れ� **%s** �リスト��。リスト��%%%%site.name%%%% 上�人々を並�替�る"
+"方法��。フリーソフトウェアツール [StatusNet](http://status.net/) を基��"
+"� [ミニブログ](http://ja.wikipedia.org/wiki/%%E3%%83%%9F%%E3%%83%%8B%%E3%%"
+"83%%96%%E3%%83%%AD%%E3%%82%%B0) サービス��。リスト�タイムラインをフォロー"
+"�る事���ん��何を���る��簡��追跡�る�������。"
 
 #. TRANS: Message displayed on page that displays lists a user was added to when there are none.
 #. TRANS: This message contains Markdown links in the form [description](links).
 #. TRANS: %s is a user nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "%s has not been [listed](%%%%doc.lists%%%%) by anyone yet."
-msgstr ""
-"���れも [�ッシュタグ](%%doc.tags%%) 付����や�を投稿�����ん。"
+msgstr "%s ���れも [リスト](%%%%doc.lists%%%%) ������ん。"
 
 #. TRANS: Page title for list of list subscribers.
 #. TRANS: %1$s is a list, %2$s is a user nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "Subscribers to list %1$s by %2$s"
-msgstr "%2$s 上� %1$s ��返信!"
+msgstr "%2$s � %1$s フォロー一覧"
 
 #. TRANS: Page title for list of list subscribers.
 #. TRANS: %1$s is a list, %2$s is a user nickname, %3$d is a page number.
-#, fuzzy, php-format
+#, php-format
 msgid "Subscribers to list %1$s by %2$s, page %3$d"
-msgstr "%1$s �タグ付��れ���や��ページ %2$d"
+msgstr "%2$s � %1$s フォロー一覧�ページ %3$d"
 
 #. TRANS: Title for page that displays lists subscribed to by a user.
 #. TRANS: %s is a profile nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "Lists subscribed to by %s"
-msgstr "人々� %s をフォロー����。"
+msgstr "%s �フォロー一覧"
 
 #. TRANS: Title for page that displays lists subscribed to by a user.
 #. TRANS: %1$s is a profile nickname, %2$d is a page number.
-#, fuzzy, php-format
+#, php-format
 msgid "Lists subscribed to by %1$s, page %2$d"
-msgstr "%1$s フォロー���る�ページ %2$d"
+msgstr "%1$s �フォロー一覧�ページ %2$d"
 
 #. TRANS: Message displayed for anonymous users on page that displays lists subscribed to by a user.
 #. TRANS: This message contains Markdown links in the form [description](links).
 #. TRANS: %s is a profile nickname.
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "These are lists subscribed to by **%s**. Lists are how you sort similar "
 "people on %%%%site.name%%%%, a [micro-blogging](http://en.wikipedia.org/wiki/"
@@ -4309,15 +3965,16 @@ msgid ""
 "net/) tool. You can easily keep track of what they are doing by subscribing "
 "to the list's timeline."
 msgstr ""
-"**%s** � %%site.name%% 上�ユーザグループ��。フリーソフトウェアツール"
-"[StatusNet](http://status.net/)を基���[マイクロブロギング](http://en."
-"wikipedia.org/wiki/Micro-blogging) サービス。メン�ー�彼ら�暮ら��興味�関"
-"�る短�メッセージを共有���。"
+"�れ� **%s** �フォロー���るリスト��。リスト��%%site.name%% 上�人々"
+"を並�替�る方法��。フリーソフトウェアツール [StatusNet](http://status."
+"net/) を基��� [ミニブログ](http://ja.wikipedia.org/wiki/%%E3%%83%%9F%%E3%%"
+"83%%8B%%E3%%83%%96%%E3%%83%%AD%%E3%%82%%B0) サービス��。リスト�タイムライ"
+"ンをフォロー�る事���ん��何を���る��簡��追跡�る�������。"
 
 #. TRANS: Page title for AJAX form return when a disabling a plugin.
 msgctxt "plugin"
 msgid "Disabled"
-msgstr ""
+msgstr "無効化����"
 
 #. TRANS: Client error displayed when trying to use another method than POST.
 #. TRANS: Do not translate POST.
@@ -4325,25 +3982,22 @@ msgstr ""
 #. TRANS: Do not translate POST.
 #. TRANS: Client error displayed when trying to use another method than POST.
 msgid "This action only accepts POST requests."
-msgstr ""
+msgstr "���作� POST リクエスト����付���。"
 
 #. TRANS: Client error displayed when trying to enable or disable a plugin without access rights.
-#, fuzzy
 msgid "You cannot administer plugins."
-msgstr "ユーザを削除����ん"
+msgstr "プラグインを管��る��������ん。"
 
 #. TRANS: Client error displayed when trying to enable or disable a non-existing plugin.
-#, fuzzy
 msgid "No such plugin."
-msgstr "��よ��ページ��り��ん。"
+msgstr "��よ��プラグイン��り��ん。"
 
 #. TRANS: Page title for AJAX form return when enabling a plugin.
 msgctxt "plugin"
 msgid "Enabled"
-msgstr ""
+msgstr "有効�����"
 
 #. TRANS: Tab and title for plugins admin panel.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Plugins"
 msgstr "プラグイン"
@@ -4354,43 +4008,35 @@ msgid ""
 "\"http://status.net/wiki/Plugins\">online plugin documentation</a> for more "
 "details."
 msgstr ""
+"追加�プラグインを追加�手動�設定�る�������。詳細�<a href=\"http://"
+"status.net/wiki/Plugins\">プラグイン�オンラインドキュメント(英語)</a>を�照"
+"������。"
 
 #. TRANS: Admin form section header
-#, fuzzy
 msgid "Default plugins"
-msgstr "�希望�言語"
+msgstr "デフォルト�プラグイン"
 
 #. TRANS: Text displayed on plugin admin page when no plugin are enabled.
 msgid ""
 "All default plugins have been disabled from the site's configuration file."
 msgstr ""
-
-#. TRANS: Client error displayed if the notice posted has too many characters.
-msgid "Invalid notice content."
-msgstr "�正�トークン。"
-
-#. TRANS: Exception thrown if a notice's license is not compatible with the StatusNet site license.
-#. TRANS: %1$s is the notice license, %2$s is the StatusNet site's license.
-#, fuzzy, php-format
-msgid "Notice license \"%1$s\" is not compatible with site license \"%2$s\"."
-msgstr ""
-"��や�ライセンス ‘%1$s’ �サイトライセンス ‘%2$s’ �互�性��り��ん。"
+"サイト�設定ファイル�より�����デフォルトプラグイン�無効������"
+"�。"
 
 #. TRANS: Client error displayed when trying to add an unindentified field to profile.
 #. TRANS: %s is a field name.
 #, php-format
 msgid "Unidentified field %s."
-msgstr ""
+msgstr "�明�フィールド %s。"
 
 #. TRANS: Page title.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Search results"
-msgstr "サイト検索"
+msgstr "検索�果"
 
 #. TRANS: Error message in case a search is shorter than three characters.
 msgid "The search string must be at least 3 characters long."
-msgstr ""
+msgstr "検索文字列��少���も 3 文字以上���れ��り��ん。"
 
 #. TRANS: Page title for profile settings.
 msgid "Profile settings"
@@ -4410,9 +4056,8 @@ msgstr "プロファイル情報"
 #. TRANS: Tooltip for field label in form for profile settings.
 #. TRANS: Field title on account registration page.
 #. TRANS: Field title on group edit form.
-#, fuzzy
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
-msgstr "1-64文字���文字アルファベット�数字��スペースや�読点�除�"
+msgstr "1～64 文字���文字アルファベット���数字�スペースや�読点�除�。"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Field label on account registration page.
@@ -4429,9 +4074,8 @@ msgstr "ホームページ"
 
 #. TRANS: Tooltip for field label in form for profile settings.
 #. TRANS: Field title on account registration page.
-#, fuzzy
 msgid "URL of your homepage, blog, or profile on another site."
-msgstr "ホームページ�ブログ�プロファイル���他サイト� URL"
+msgstr "ホームページ�ブログ����別�サイト�プロファイル� URL"
 
 #. TRANS: Tooltip for field label in form for profile settings. Plural
 #. TRANS: is decided by the number of characters available for the
@@ -4439,16 +4083,15 @@ msgstr "ホームページ�ブログ�プロファイル���他サイト
 #. TRANS: Text area title in form for account registration. Plural
 #. TRANS: is decided by the number of characters available for the
 #. TRANS: biography (%d).
-#, fuzzy, php-format
+#, php-format
 msgid "Describe yourself and your interests in %d character."
 msgid_plural "Describe yourself and your interests in %d characters."
-msgstr[0] "%d字以内�自分自身�自分�興味����書������"
+msgstr[0] ""
 
 #. TRANS: Tooltip for field label in form for profile settings.
 #. TRANS: Text area title on account registration page.
-#, fuzzy
 msgid "Describe yourself and your interests."
-msgstr "自分自身�自分�興味����書������"
+msgstr "自分自身�自分�興味����書������。"
 
 #. TRANS: Text area label in form for profile settings where users can provide
 #. TRANS: their biography.
@@ -4465,35 +4108,34 @@ msgstr "場所"
 
 #. TRANS: Tooltip for field label in form for profile settings.
 #. TRANS: Field title on account registration page.
-#, fuzzy
 msgid "Where you are, like \"City, State (or Region), Country\"."
-msgstr "自分��る場所。例：「都市, 都�府県 (���地域), 国�"
+msgstr "����居る場所。例：「都市, 都�府県 (���地域), 国�"
 
 #. TRANS: Checkbox label in form for profile settings.
 msgid "Share my current location when posting notices"
-msgstr "��や�を投稿�る�������在�場所を共有������"
+msgstr "��や�を投稿�る�������置情報を共有������"
 
 #. TRANS: Field label in form for profile settings.
+#. TRANS: Title for group tag cloud section.
+#. TRANS: %s is a group name.
 msgid "Tags"
 msgstr "ã‚¿ã‚°"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#, fuzzy
 msgid ""
 "Tags for yourself (letters, numbers, -, ., and _), comma- or space- "
 "separated."
 msgstr ""
-"自分自身�����タグ (アルファベット�数字�-�.�_)�カンマ���空白区切"
-"り�"
+"自分自身�����タグ (アルファベット� 数字� -� .� _)�カンマ���空白"
+"区切り�。"
 
 #. TRANS: Dropdownlist label in form for profile settings.
 msgid "Language"
 msgstr "言語"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#, fuzzy
 msgid "Preferred language."
-msgstr "�希望�言語"
+msgstr "優先�る設定。"
 
 #. TRANS: Dropdownlist label in form for profile settings.
 msgid "Timezone"
@@ -4501,26 +4143,24 @@ msgstr "タイムゾーン"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
 msgid "What timezone are you normally in?"
-msgstr "普段�タイムゾーン��れ���？"
+msgstr "通常�タイムゾーン��れ���？"
 
 #. TRANS: Checkbox label in form for profile settings.
-#, fuzzy
 msgid ""
-"Automatically subscribe to whoever subscribes to me (best for non-humans)."
+"Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr "自分をフォロー���る者を自動的�フォロー�る (BOT�最�)"
 
 #. TRANS: Dropdown field label on profile settings, for what policies to apply when someone else tries to subscribe to your updates.
-#, fuzzy
 msgid "Subscription policy"
-msgstr "フォロー"
+msgstr "フォロー�リシー"
 
 #. TRANS: Dropdown field option for following policy.
 msgid "Let anyone follow me"
-msgstr ""
+msgstr "誰�もフォロー��る。"
 
 #. TRANS: Dropdown field option for following policy.
 msgid "Ask me first"
-msgstr ""
+msgstr "��尋�る"
 
 #. TRANS: Dropdown field title on group edit form.
 msgid "Whether other users need your permission to follow your updates."
@@ -4528,27 +4168,26 @@ msgstr ""
 
 #. TRANS: Checkbox label in profile settings.
 msgid "Make updates visible only to my followers"
-msgstr ""
+msgstr "最新版を��フォロワー���表示"
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Plural form is used based on the maximum number of allowed
 #. TRANS: characters for the biography (%d).
 #. TRANS: Form validation error on registration page when providing too long a bio text.
 #. TRANS: %d is the maximum number of characters for bio; used for plural.
-#, fuzzy, php-format
+#, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
-msgstr[0] "自己紹介�長���� (最長%d文字)。"
+msgstr[0] ""
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Client error displayed trying to save site settings without a timezone.
 msgid "Timezone not selected."
-msgstr "タイムゾーン���れ����ん。"
+msgstr "タイムゾーン��択�れ����ん。"
 
 #. TRANS: Validation error in form for profile settings.
-#, fuzzy
 msgid "Language is too long (maximum 50 characters)."
-msgstr "言語�長����。(最大50字)"
+msgstr "言語�長���� (最大 50 文字��)。"
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
@@ -4556,45 +4195,39 @@ msgstr "言語�長����。(最大50字)"
 #. TRANS: %s is the invalid tag.
 #. TRANS: Error displayed if a given tag is invalid.
 #. TRANS: %s is the invalid tag.
-#, fuzzy, php-format
+#, php-format
 msgid "Invalid tag: \"%s\"."
-msgstr "�正�タグ: \"%s\""
+msgstr "無効�タグ: \"%s\"。"
 
 #. TRANS: Server error thrown when user profile settings could not be updated to
 #. TRANS: automatically subscribe to any subscriber.
-#, fuzzy
 msgid "Could not update user for autosubscribe or subscribe_policy."
-msgstr "自動フォロー����ユーザを更新����ん���。"
+msgstr ""
+"自動フォロー設定����フォロー�リシー����ユーザーを更新����ん��"
+"�。"
 
 #. TRANS: Server error thrown when user profile location preference settings could not be updated.
-#, fuzzy
 msgid "Could not save location prefs."
-msgstr "場所情報を�存����ん。"
+msgstr "�置情報を�存����ん���。"
 
 #. TRANS: Server error thrown when user profile settings tags could not be saved.
 msgid "Could not save tags."
-msgstr "タグをを�存����ん。"
-
-#. TRANS: Confirmation shown when user profile settings are saved.
-#. TRANS: Message after successful saving of administrative settings.
-msgid "Settings saved."
-msgstr "設定��存�れ���。"
+msgstr "タグを�存����ん���。"
 
 #. TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
 #. TRANS: Page title for page where a user account can be restored from backup.
-#, fuzzy
 msgid "Restore account"
-msgstr "新��グループを作�"
+msgstr "アカウントを復元"
 
 #. TRANS: Client error displayed when requesting a public timeline page beyond the page limit.
 #. TRANS: %s is the page limit.
-#, fuzzy, php-format
+#, php-format
 msgid "Beyond the page limit (%s)."
-msgstr "ページ制�を超���� (%s)"
+msgstr "ページ制�を超���� (%s)。"
 
 #. TRANS: Server error displayed when a public timeline cannot be retrieved.
-msgid "Could not retrieve public stream."
-msgstr "パブリックストリームを検索����ん。"
+msgid "Could not retrieve public timeline."
+msgstr "パブリックタイムラインを�得����ん。"
 
 #. TRANS: Title for all public timeline pages but the first.
 #. TRANS: %d is the page number.
@@ -4608,16 +4241,20 @@ msgid "Public timeline"
 msgstr "パブリックタイムライン"
 
 #. TRANS: Link description for public timeline feed.
-msgid "Public Stream Feed (RSS 1.0)"
-msgstr "パブリックストリームフィード (RSS 1.0)"
+msgid "Public Timeline Feed (Activity Streams JSON)"
+msgstr "パブリックタイムライン�フィード (Activity Streams JSON)"
 
 #. TRANS: Link description for public timeline feed.
-msgid "Public Stream Feed (RSS 2.0)"
-msgstr "パブリックストリームフィード (RSS 2.0)"
+msgid "Public Timeline Feed (RSS 1.0)"
+msgstr "パブリックタイムライン�フィード (RSS 1.0)"
 
 #. TRANS: Link description for public timeline feed.
-msgid "Public Stream Feed (Atom)"
-msgstr "パブリックストリームフィード (Atom)"
+msgid "Public Timeline Feed (RSS 2.0)"
+msgstr "パブリックタイムライン�フィード (RSS 2.0)"
+
+#. TRANS: Link description for public timeline feed.
+msgid "Public Timeline Feed (Atom)"
+msgstr "パブリックタイムライン�フィード (Atom)"
 
 #. TRANS: Text displayed for public feed when there are no public notices.
 #, php-format
@@ -4630,7 +4267,7 @@ msgstr ""
 
 #. TRANS: Additional text displayed for public feed when there are no public notices for a logged in user.
 msgid "Be the first to post!"
-msgstr "投稿�る1番目��������!"
+msgstr "投稿�る1番目���������"
 
 #. TRANS: Additional text displayed for public feed when there are no public notices for a not logged in user.
 #, php-format
@@ -4638,7 +4275,7 @@ msgid ""
 "Why not [register an account](%%action.register%%) and be the first to post!"
 msgstr ""
 "�� [アカウント登録](%%action.register%%) �����������最��投稿を"
-"������!"
+"�������"
 
 #. TRANS: Message for not logged in users at an invite-only site trying to view the public feed of notices.
 #. TRANS: This message contains Markdown links. Please mind the formatting.
@@ -4649,11 +4286,11 @@ msgid ""
 "tool. [Join now](%%action.register%%) to share notices about yourself with "
 "friends, family, and colleagues! ([Read more](%%doc.help%%))"
 msgstr ""
-"�れ� %%site.name%% ��。フリーソフトウェアツール[StatusNet](http://status."
-"net/)を基���[マイクロブロギング](http://en.wikipedia.org/wiki/Micro-"
-"blogging) サービス。[今���加](%%action.register%%)�����自身や���家"
-"�����僚���������や�を共有���ょ�! ([も��読む](%%doc.help%"
-"%))"
+"�れ� %%site.name%% ��。フリーソフトウェアツール [StatusNet](http://"
+"status.net/) を基��� [ミニブログ](http://ja.wikipedia.org/wiki/%%E3%%83%%"
+"9F%%E3%%83%%8B%%E3%%83%%96%%E3%%83%%AD%%E3%%82%%B0) サービス��。[今���"
+"加](%%action.register%%) �����自身や���家�����僚��������"
+"�や�を共有���ょ�� ([も��読む](%%doc.help%%))"
 
 #. TRANS: Message for not logged in users at a closed site trying to view the public feed of notices.
 #. TRANS: This message contains Markdown links. Please mind the formatting.
@@ -4664,57 +4301,13 @@ msgid ""
 "tool."
 msgstr ""
 "�れ� %%site.name%% ��。フリーソフトウェアツール[StatusNet](http://status."
-"net/)を基���[マイクロブロギング](http://en.wikipedia.org/wiki/Micro-"
-"blogging) サービス。"
-
-#. TRANS: Title for page with public list cloud.
-#, fuzzy
-msgid "Public list cloud"
-msgstr "パブリックタグクラウド"
-
-#. TRANS: Page notice for page with public list cloud.
-#. TRANS: %s is a StatusNet sitename.
-#, fuzzy, php-format
-msgid "These are largest lists on %s"
-msgstr "�れら� %s �人気��る最近�タグ�� "
-
-#. TRANS: Empty list message on page with public list cloud.
-#. TRANS: This message contains Markdown links in the form [description](link).
-#, fuzzy, php-format
-msgid "No one has [listed](%%doc.tags%%) anyone yet."
-msgstr ""
-"���れも [�ッシュタグ](%%doc.tags%%) 付����や�を投稿�����ん。"
-
-#. TRANS: Additional empty list message on page with public list cloud for logged in users.
-#, fuzzy
-msgid "Be the first to list someone!"
-msgstr "投稿�る1番目��������!"
-
-#. TRANS: Additional empty list message on page with public list cloud for anonymous users.
-#. TRANS: This message contains Markdown links in the form [description](link).
-#, fuzzy, php-format
-msgid ""
-"Why not [register an account](%%action.register%%) and be the first to list "
-"someone!"
-msgstr ""
-"�� [アカウント登録](%%action.register%%) �������。���最��投稿を"
-"������!"
-
-#. TRANS: DT element on on page with public list cloud.
-#, fuzzy
-msgid "List cloud"
-msgstr "API メソッド�見��り��ん。"
-
-#. TRANS: Link title for number of listed people. %d is the number of listed people.
-#, php-format
-msgid "1 person listed"
-msgid_plural "%d people listed"
-msgstr[0] ""
+"net/) を基��� [ミニブログ](http://ja.wikipedia.org/wiki/%%E3%%83%%9F%%E3%%"
+"83%%8B%%E3%%83%%96%%E3%%83%%AD%%E3%%82%%B0) サービス��。"
 
 #. TRANS: Public RSS feed description. %s is the StatusNet site name.
-#, fuzzy, php-format
+#, php-format
 msgid "%s updates from everyone."
-msgstr "皆�ら� %s アップデート!"
+msgstr "皆�ん� %s �最新�投稿"
 
 #. TRANS: Title for public tag cloud.
 msgid "Public tag cloud"
@@ -4722,9 +4315,9 @@ msgstr "パブリックタグクラウド"
 
 #. TRANS: Instructions (more used like an explanation/header).
 #. TRANS: %s is the StatusNet sitename.
-#, fuzzy, php-format
+#, php-format
 msgid "These are most popular recent tags on %s"
-msgstr "�れら� %s �人気��る最近�タグ�� "
+msgstr "�れら� %s 上�最も人気��る最近�タグ��"
 
 #. TRANS: This message contains a Markdown URL. The link description is between
 #. TRANS: square brackets, and the link between parentheses. Do not separate "]("
@@ -4737,7 +4330,7 @@ msgstr ""
 #. TRANS: Message shown to a logged in user for the public tag cloud
 #. TRANS: while no tags exist yet. "One" refers to the non-existing hashtag.
 msgid "Be the first to post one!"
-msgstr "投稿�る1番目��������!"
+msgstr "投稿�る1番目���������"
 
 #. TRANS: Message shown to a anonymous user for the public tag cloud
 #. TRANS: while no tags exist yet. "One" refers to the non-existing hashtag.
@@ -4750,11 +4343,11 @@ msgid ""
 "one!"
 msgstr ""
 "�� [アカウント登録](%%action.register%%) �������。���最��投稿を"
-"������!"
+"�������"
 
 #. TRANS: Client error displayed trying to recover password while already logged in.
 msgid "You are already logged in!"
-msgstr "既�ログイン済���。"
+msgstr "既�ログイン済����"
 
 #. TRANS: Client error displayed when password recovery code is not correct.
 msgid "No such recovery code."
@@ -4766,7 +4359,7 @@ msgstr "回復コード���り��ん。"
 
 #. TRANS: Server error displayed trying to recover password without providing a user.
 msgid "Recovery code for unknown user."
-msgstr "�明�ユーザ����回復コード。"
+msgstr "�明�ユーザー����回復コード。"
 
 #. TRANS: Server error displayed removing a password recovery code from the database.
 msgid "Error with confirmation code."
@@ -4778,15 +4371,15 @@ msgstr "確�コード������。も�一度やり直�����
 
 #. TRANS: Server error displayed when updating a user's e-mail address in the database fails while recovering a password.
 msgid "Could not update user with confirmed email address."
-msgstr "確��れ�メールアドレス�ユーザを更新����ん。"
+msgstr "確��れ�メールアドレス�ユーザーを更新����ん。"
 
 #. TRANS: Page notice for password recovery page.
 msgid ""
 "If you have forgotten or lost your password, you can get a new one sent to "
 "the email address you have stored in your account."
 msgstr ""
-"����パスワードを忘れる�紛失���ら�����アカウント�格���メール"
-"アドレス�新��も�を�ら�る�������。"
+"パスワードを忘れ����紛失��場��アカウント�格��れ�メールアドレス�"
+"新��パスワードを��り�る�������。"
 
 #. TRANS: Page notice for password change page.
 msgid "You have been identified. Enter a new password below."
@@ -4809,7 +4402,6 @@ msgid "Recover"
 msgstr "回復"
 
 #. TRANS: Button text on password recovery page.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Recover"
 msgstr "回復"
@@ -4828,18 +4420,14 @@ msgid "Password recovery requested"
 msgstr "パスワード回復�リクエスト�れ���"
 
 #. TRANS: Title for password recovery page in password saved mode.
-#, fuzzy
 msgid "Password saved"
 msgstr "パスワード��存�れ���。"
 
 #. TRANS: Title for field label for password reset form.
-#, fuzzy
 msgid "6 or more characters, and do not forget it!"
-msgstr "6文字以上。忘れ��������"
+msgstr "6文字以上�����忘れ��������"
 
 #. TRANS: Button text for password reset form.
-#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Reset"
 msgstr "リセット"
@@ -4848,18 +4436,6 @@ msgstr "リセット"
 msgid "Enter a nickname or email address."
 msgstr "ニック�ーム�メールアドレスを入力������。"
 
-#. TRANS: Information on password recovery form if no known username or e-mail address was specified.
-msgid "No user with that email address or username."
-msgstr "��メールアドレス�ユーザ�をも���るユーザ��り��ん。"
-
-#. TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.
-msgid "No registered email address for that user."
-msgstr "��ユーザ��メールアドレス�登録��り��ん。"
-
-#. TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.
-msgid "Error saving address confirmation."
-msgstr "アドレス確��存エラー"
-
 #. TRANS: User notification after an e-mail with instructions was sent from the password recovery form.
 msgid ""
 "Instructions for recovering your password have been sent to the email "
@@ -4871,9 +4447,8 @@ msgid "Unexpected password reset."
 msgstr "予期��パスワード�リセット��。"
 
 #. TRANS: Reset password form validation error message.
-#, fuzzy
 msgid "Password must be 6 characters or more."
-msgstr "パスワード�6字以上���れ�����ん。"
+msgstr "パスワード�6字以上���れ��り��ん。"
 
 #. TRANS: Reset password form validation error message.
 msgid "Password and confirmation do not match."
@@ -4882,37 +4457,35 @@ msgstr "パスワード�確��一致���ん。"
 #. TRANS: Server error displayed when something does wrong with the user object during password reset.
 #. TRANS: Server error displayed when saving fails during user registration.
 msgid "Error setting user."
-msgstr "ユーザ設定エラー"
+msgstr "ユーザー設定エラー"
 
 #. TRANS: Success message for user after password reset.
 msgid "New password successfully saved. You are now logged in."
 msgstr "新��パスワード��存��功����。ログイン�����。"
 
 #. TRANS: Client exception thrown when no ID parameter was provided.
-#, fuzzy
 msgid "No id parameter."
-msgstr "ID引数��り��ん。"
+msgstr "id 引数��り��ん。"
 
 #. TRANS: Client exception thrown when an invalid ID parameter was provided for a file.
 #. TRANS: %d is the provided ID for which the file is not present (number).
-#, fuzzy, php-format
+#, php-format
 msgid "No such file \"%d\"."
-msgstr "��よ��ファイル��り��ん。"
+msgstr "��よ��ファイル \"%d\" ��り��ん。"
 
 #. TRANS: Client error displayed when trying to register to an invite-only site without an invitation.
 msgid "Sorry, only invited people can register."
-msgstr "����ん�招待�れ�人々���登録����。"
+msgstr "申�訳�り��ん�招待�れ�人々���登録����。"
 
 #. TRANS: Client error displayed when trying to register to an invite-only site without a valid invitation.
 msgid "Sorry, invalid invitation code."
-msgstr "����ん��正�招待コード。"
+msgstr "申�訳�り��ん�無効�招待コード��。"
 
 #. TRANS: Title for registration page after a succesful registration.
 msgid "Registration successful"
 msgstr "登録�功"
 
 #. TRANS: Title for registration page.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Register"
 msgstr "登録"
@@ -4922,9 +4495,8 @@ msgid "Registration not allowed."
 msgstr "登録�許��れ����ん。"
 
 #. TRANS: Form validation error displayed when trying to register without agreeing to the site license.
-#, fuzzy
 msgid "You cannot register if you do not agree to the license."
-msgstr "ライセンス���頂���場��登録����ん。"
+msgstr "ライセンス������場��登録�る�������ん。"
 
 #. TRANS: Form validation error displayed when trying to register with an already registered e-mail address.
 msgid "Email address already exists."
@@ -4932,41 +4504,35 @@ msgstr "メールアドレス�既�存在���。"
 
 #. TRANS: Form validation error displayed when trying to register with an invalid username or password.
 msgid "Invalid username or password."
-msgstr "�正�ユーザ����パスワード。"
+msgstr "無効�ユーザー����パスワード。"
 
 #. TRANS: Page notice on registration page.
-#, fuzzy
 msgid ""
 "With this form you can create a new account. You can then post notices and "
 "link up to friends and colleagues."
 msgstr ""
 "��フォーム�新��アカウントを作�����。 次���や�を投稿����人や"
-"�僚�リンク����。 "
+"�僚�リンク����。"
 
 #. TRANS: Field label on account registration page. In this field the password has to be entered a second time.
-#, fuzzy
 msgctxt "PASSWORD"
 msgid "Confirm"
-msgstr "パスワード確�"
+msgstr "確�"
 
 #. TRANS: Field label on account registration page.
-#, fuzzy
 msgctxt "LABEL"
 msgid "Email"
 msgstr "メール"
 
 #. TRANS: Field title on account registration page.
-#, fuzzy
 msgid "Used only for updates, announcements, and password recovery."
-msgstr "更新�アナウンス�パスワードリカ�リー���使用�れ��。"
+msgstr "アップデート��知ら���よ�パスワードリカ�リー���使用�れ��。"
 
 #. TRANS: Field title on account registration page.
-#, fuzzy
 msgid "Longer name, preferably your \"real\" name."
-msgstr "長���"
+msgstr "長������れ� \"本当\" ���。"
 
 #. TRANS: Button text to register a user on account registration page.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Register"
 msgstr "登録"
@@ -4990,14 +4556,16 @@ msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
 msgid "All rights reserved."
-msgstr ""
+msgstr "All rights reserved."
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
 "email address, IM address, and phone number."
-msgstr "個人情報を除�: パスワード�メールアドレス�IMアドレス�電話番�"
+msgstr ""
+"テキスト�ファイル�以下�個人情報以外� %s �下�利用��るよ���る：パス"
+"ワード�メールメールアドレス�IMアドレス�電話番�。"
 
 #. TRANS: Text displayed after successful account registration.
 #. TRANS: %1$s is the registered nickname, %2$s is the profile URL.
@@ -5020,17 +4588,17 @@ msgid ""
 "\n"
 "Thanks for signing up and we hope you enjoy using this service."
 msgstr ""
-"%1$s �ん������������%%%%site.name%%%% �よ���。次�よ����"
-"始�る�������。\n"
+"%1$s �ん������������ %%%%site.name%%%% �よ���。次�よ���"
+"�始�る�������。\n"
 "\n"
 "* [����プロファイル](%2$s) を�照��最��メッセージを投稿�る\n"
 "* [Jabber や GTalk �アドレス](%%%%action.imsettings%%%%) を追加���インス"
 "タントメッセージを通����や�を�れるよ���る\n"
-"* ����知���る人や������興味をも���る人を[検索](%%%%action."
+"* ����知���る人や������興味をも���る人を [検索](%%%%action."
 "peoplesearch%%%%) �る\n"
 "* [プロファイル設定](%%%%action.profilesettings%%%%) を更新��他�ユーザ��"
 "�����をより詳��知ら�る\n"
-"* 探���る機能����[オンライン文書](%%%%doc.help%%%%) を読む\n"
+"* 探���る機能���� [オンラインドキュメント](%%%%doc.help%%%%) を読む\n"
 "\n"
 "�加��������り��������。����������サービスを楽�ん"
 "�使���れる��を願�����。"
@@ -5043,87 +4611,11 @@ msgstr ""
 "(メールアドレスを承��る方法を読ん�����メール�よるメッセージを���る"
 "よ��������)"
 
-#. TRANS: Page notice for remote subscribe. This message contains Markdown links.
-#. TRANS: Ensure to keep the correct markup of [link description](link).
-#, php-format
-msgid ""
-"To subscribe, you can [login](%%action.login%%), or [register](%%action."
-"register%%) a new  account. If you already have an account  on a [compatible "
-"microblogging site](%%doc.openmublog%%),  enter your profile URL below."
-msgstr ""
-"フォロー�る���[ログイン](%%action.login%%) �る�, [登録](%%action."
-"register%%) を行��下��。既� [compatible microblogging site](%%doc."
-"openmublog%%) �アカウントを����場���下�プロファイルURLを入力��下�"
-"�."
-
-#. TRANS: Page title for Remote subscribe.
-msgid "Remote subscribe"
-msgstr "リモートフォロー"
-
-#. TRANS: Field legend on page for remote subscribe.
-msgid "Subscribe to a remote user"
-msgstr "リモートユーザーをフォロー"
-
-#. TRANS: Field label on page for remote subscribe.
-msgid "User nickname"
-msgstr "ユーザ�ニック�ーム"
-
-#. TRANS: Field title on page for remote subscribe.
-#, fuzzy
-msgid "Nickname of the user you want to follow."
-msgstr "フォロー���ユーザ�ニック�ーム"
-
-#. TRANS: Field label on page for remote subscribe.
-msgid "Profile URL"
-msgstr "プロファイルURL"
-
-#. TRANS: Field title on page for remote subscribe.
-#, fuzzy
-msgid "URL of your profile on another compatible microblogging service."
-msgstr "プロファイルサービス���マイクロブロギングサービス�URL"
-
-#. TRANS: Button text on page for remote subscribe.
-#. TRANS: Link text for link that will subscribe to a remote profile.
-#. TRANS: Button text to subscribe to a user.
-#. TRANS: Button text for subscribing to a list.
-#, fuzzy
-msgctxt "BUTTON"
-msgid "Subscribe"
-msgstr "フォロー"
-
-#. TRANS: Form validation error on page for remote subscribe when an invalid profile URL was provided.
-#, fuzzy
-msgid "Invalid profile URL (bad format)."
-msgstr "�正�プロファイルURL。（形��備）"
-
-#. TRANS: Form validation error on page for remote subscribe when no the provided profile URL
-#. TRANS: does not contain expected data.
-msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
-msgstr ""
-"有効�プロファイルURL���り��ん。（YADIS ドキュメント������� �正"
-"� XRDS 定義）"
-
-#. TRANS: Form validation error on page for remote subscribe.
-#, fuzzy
-msgid "That is a local profile! Login to subscribe."
-msgstr ""
-"�れ�ローカル�プロファイル��! フォロー�る���ログイン������。"
-
-#. TRANS: Form validation error on page for remote subscribe when the remote service is not providing a request token.
-#, fuzzy
-msgid "Could not get a request token."
-msgstr "リクエストトークンを�得����ん"
-
-#. TRANS: Client error displayed when trying to (un)list an OMB 0.1 remote profile.
-#, fuzzy
-msgid "You cannot (un)list an OMB 0.1 remote profile with this action."
-msgstr "������プロファイル�フォロー�れ����ん。"
-
 #. TRANS: Client error displayed when an unknown error occurs while delisting a user.
 #. TRANS: %s is a username.
 #, php-format
 msgid "There was an unexpected error while delisting %s."
-msgstr ""
+msgstr "%s をリスト�ら除���る間�予期���エラー�発生����。"
 
 #. TRANS: Client error displayed when an unknown error occurs while listing a user.
 #. TRANS: %s is a profile URL.
@@ -5132,15 +4624,16 @@ msgid ""
 "There was a problem listing %s. The remote server is probably not responding "
 "correctly, please try retrying later."
 msgstr ""
+"%s をリスト���る時��題��り���。�ら�リモートサー��正��応答��"
+"���ん。��ら�後�試������。"
 
 #. TRANS: Title after removing a user from a list.
-#, fuzzy
 msgid "Unlisted"
-msgstr "ライセンス"
+msgstr "リスト�ら解除"
 
 #. TRANS: Client error displayed when trying to repeat a notice while not logged in.
 msgid "Only logged-in users can repeat notices."
-msgstr "ログインユーザ�����や�を繰り返���。"
+msgstr "ログインユーザー�����や�をリピート����。"
 
 #. TRANS: Client error displayed when trying to repeat a notice while not providing a notice ID.
 #. TRANS: Client error displayed when trying to repeat a non-existing notice.
@@ -5150,11 +4643,11 @@ msgstr "��や���り��ん。"
 #. TRANS: Title after repeating a notice.
 #. TRANS: Repeat form status in notice list when a notice has been repeated.
 msgid "Repeated"
-msgstr "繰り返�れ�"
+msgstr "リピート"
 
 #. TRANS: Confirmation text after repeating a notice.
 msgid "Repeated!"
-msgstr "繰り返�れ���!"
+msgstr "リピート�"
 
 #. TRANS: Title for first page of replies for a user.
 #. TRANS: %s is a user nickname.
@@ -5169,7 +4662,13 @@ msgstr "%s ��返信"
 #. TRANS: %1$s is a user nickname, %2$d is a page number.
 #, php-format
 msgid "Replies to %1$s, page %2$d"
-msgstr "%1$s ��返信�ページ %2$s"
+msgstr "%1$s ��返信�ページ %2$d"
+
+#. TRANS: Link for feed with replies for a user.
+#. TRANS: %s is a user nickname.
+#, php-format
+msgid "Replies feed for %s (Activity Streams JSON)"
+msgstr "%s �返信フィード (Activity Streams JSON)"
 
 #. TRANS: Link for feed with replies for a user.
 #. TRANS: %s is a user nickname.
@@ -5204,8 +4703,8 @@ msgid ""
 "You can engage other users in a conversation, subscribe to more people or "
 "[join groups](%%action.groups%%)."
 msgstr ""
-"�����他�ユーザを会話を�る��多��人々をフォロー�る����� [グ"
-"ループ�加�る](%%action.groups%%)�������。"
+"�����他�ユーザーを会話を�る��多��人々をフォロー�る����� [グ"
+"ループ��加](%%action.groups%%) �る�������。"
 
 #. TRANS: Empty list message for page with replies for a user for all logged in users but the user themselves.
 #. TRANS: %1$s, %2$s and %3$s are a user nickname. This message contains a Markdown link in the form [link text](link).
@@ -5214,30 +4713,27 @@ msgid ""
 "You can try to [nudge %1$s](../%2$s) or [post something to them](%%%%action."
 "newnotice%%%%?status_textarea=%3$s)."
 msgstr ""
-"最�� [��トピック投稿](%%%%action.newnotice%%%%?status_textarea=%s) を��"
-"����!"
+"[%1$s ��図](../%2$s) ��� [��人��投稿](%%%%action.newnotice%%%%?"
+"status_textarea=%3$s) を�������"
 
 #. TRANS: RSS reply feed description.
 #. TRANS: %1$s is a user nickname, %2$s is the StatusNet site name.
-#, fuzzy, php-format
+#, php-format
 msgid "Replies to %1$s on %2$s."
-msgstr "%2$s 上� %1$s ��返信!"
+msgstr "%2$s 上� %1$s ��返信"
 
 #. TRANS: Client exception displayed when trying to restore an account while not logged in.
-#, fuzzy
 msgid "Only logged-in users can restore their account."
-msgstr "ログインユーザ�����や�を繰り返���。"
+msgstr "ログインユーザー���自分�アカウントを復元�る�������。"
 
 #. TRANS: Client exception displayed when trying to restore an account without having restore rights.
-#, fuzzy
 msgid "You may not restore your account."
-msgstr "�������ん�アプリケーションも登録�����ん。"
+msgstr "����アカウント��復元�る�������ん。"
 
 #. TRANS: Client exception displayed trying to restore an account while something went wrong uploading a file.
 #. TRANS: Client exception. No file; probably just a non-AJAX submission.
-#, fuzzy
 msgid "No uploaded file."
-msgstr "ファイルアップロード"
+msgstr "アップロード�れ�ファイル��り��ん。"
 
 #. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
@@ -5250,12 +4746,12 @@ msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form."
 msgstr ""
-"アップロード�れ�ファイル�HTMLフォーム�指定�れ� MAX_FILE_SIZE ディレク"
+"アップロード�れ�ファイル� HTML フォーム�指定�れ� MAX_FILE_SIZE ディレク"
 "ティブを超�����。"
 
 #. TRANS: Client exception.
 msgid "The uploaded file was only partially uploaded."
-msgstr "アップロード�れ�ファイル�部分的�アップロード�れ�������。"
+msgstr "アップロード�れ�ファイル�一部����アップロード�れ����ん。"
 
 #. TRANS: Client exception thrown when a temporary folder is not present to store a file upload.
 msgid "Missing a temporary folder."
@@ -5277,9 +4773,8 @@ msgstr "ファイル�アップロード�システムエラー"
 
 #. TRANS: Client exception thrown when a feed is not an Atom feed.
 #. TRANS: Client exception thrown when an imported feed is not an Atom feed.
-#, fuzzy
 msgid "Not an Atom feed."
-msgstr "全��メン�ー"
+msgstr "Atom フィード���り��ん。"
 
 #. TRANS: Success message when a feed has been restored.
 msgid ""
@@ -5293,24 +4788,21 @@ msgstr ""
 
 #. TRANS: Form instructions for feed restore.
 msgid ""
-"You can upload a backed-up stream in <a href=\"http://activitystrea.ms/"
+"You can upload a backed-up timeline in <a href=\"http://activitystrea.ms/"
 "\">Activity Streams</a> format."
 msgstr ""
 
 #. TRANS: Title for submit button to confirm upload of a user backup file for account restore.
-#, fuzzy
 msgid "Upload the file"
-msgstr "ファイルアップロード"
+msgstr "ファイルをアップロード"
 
 #. TRANS: Client error displayed when trying to revoke a role without having the right to do that.
-#, fuzzy
 msgid "You cannot revoke user roles on this site."
-msgstr "������サイト�ユーザを黙ら�る�������ん。"
+msgstr "��サイト上�ユーザー�ロールを�り消��������ん。"
 
 #. TRANS: Client error displayed when trying to revoke a role that is not set.
-#, fuzzy
 msgid "User does not have this role."
-msgstr "����るプロフィール���ユーザ"
+msgstr "ユーザー���ロール�������ん。"
 
 #. TRANS: Engine name for RSD.
 #. TRANS: Engine name.
@@ -5320,36 +4812,34 @@ msgstr "StatusNet"
 #. TRANS: Client error displayed trying to sandbox users on a site where the feature is not enabled.
 #. TRANS: Client error on page to unsandbox a user when the feature is not enabled.
 msgid "You cannot sandbox users on this site."
-msgstr "������サイト�サンドボックスユーザ�����ん。"
+msgstr "������サイト�サンドボックスユーザー�����ん。"
 
 #. TRANS: Client error displayed trying to sandbox an already sandboxed user.
 msgid "User is already sandboxed."
-msgstr "ユーザ����サンドボックス��。"
+msgstr "ユーザー�既�サンドボックス��。"
 
 #. TRANS: Client error displayed when trying to list a profile with an invalid list.
 #. TRANS: %s is the invalid list name.
-#, fuzzy, php-format
+#, php-format
 msgid "Not a valid list: %s."
-msgstr "有効�メールアドレス���り��ん。"
+msgstr "有効����リスト:%s。"
 
 #. TRANS: Page title for page showing self tags.
 #. TRANS: %1$s is a tag, %2$d is a page number.
-#, fuzzy, php-format
+#, php-format
 msgid "Users self-tagged with %1$s, page %2$d"
-msgstr "ユーザ自身����タグ %1$s  - ページ %2$d"
+msgstr "ユーザー自身����タグ %1$s�ページ %2$d"
 
 #. TRANS: Title for the sessions administration panel.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Sessions"
 msgstr "セッション"
 
 #. TRANS: Instructions for the sessions administration panel.
 msgid "Session settings for this StatusNet site"
-msgstr ""
+msgstr "�� StatusNet サイト�セッション設定"
 
 #. TRANS: Fieldset legend on the sessions administration panel.
-#, fuzzy
 msgctxt "LEGEND"
 msgid "Sessions"
 msgstr "セッション"
@@ -5361,9 +4851,8 @@ msgstr "セッション�扱�"
 
 #. TRANS: Checkbox title on the sessions administration panel.
 #. TRANS: Indicates if StatusNet should handle session administration.
-#, fuzzy
 msgid "Handle sessions ourselves."
-msgstr "自分��セッションを扱����る����。"
+msgstr "自分�セッションを処��る。"
 
 #. TRANS: Checkbox label on the sessions administration panel.
 #. TRANS: Indicates if StatusNet should write session debugging output.
@@ -5371,18 +4860,16 @@ msgid "Session debugging"
 msgstr "セッションデ�ッグ"
 
 #. TRANS: Checkbox title on the sessions administration panel.
-#, fuzzy
 msgid "Enable debugging output for sessions."
-msgstr "セッション����デ�ッグ出力をオン。"
+msgstr "セッション�デ�ック出力を有効��る。"
 
 #. TRANS: Title for submit button on the sessions administration panel.
-#, fuzzy
 msgid "Save session settings"
-msgstr "アクセス設定��存"
+msgstr "セッション�設定を�存�る。"
 
 #. TRANS: Client error displayed trying to display an OAuth application while not logged in.
 msgid "You must be logged in to view an application."
-msgstr "!!アプリケーションを見る����ログイン�����れ��り��ん。"
+msgstr "アプリケーションを見る����ログイン�����れ��り��ん。"
 
 #. TRANS: Header on the OAuth application page.
 msgid "Application profile"
@@ -5401,7 +4888,6 @@ msgid "Application actions"
 msgstr "アプリケーションアクション"
 
 #. TRANS: Link text to edit application on the OAuth application page.
-#, fuzzy
 msgctxt "EDITAPP"
 msgid "Edit"
 msgstr "編集"
@@ -5415,19 +4901,37 @@ msgstr "key � secret �リセット"
 msgid "Application info"
 msgstr "アプリケーション情報"
 
+#. TRANS: Field label on application page.
+msgid "Consumer key"
+msgstr "Consumer key"
+
+#. TRANS: Field label on application page.
+msgid "Consumer secret"
+msgstr "Consumer secret"
+
+#. TRANS: Field label on application page.
+msgid "Request token URL"
+msgstr "リクエストトークンURL"
+
+#. TRANS: Field label on application page.
+msgid "Access token URL"
+msgstr "アクセストークンURL"
+
+#. TRANS: Field label on application page.
+msgid "Authorize URL"
+msgstr "承�URL"
+
 #. TRANS: Note on the OAuth application page about signature support.
-#, fuzzy
 msgid ""
 "Note: HMAC-SHA1 signatures are supported. The plaintext signature method is "
 "not supported."
 msgstr ""
-"注�: ����HMAC-SHA1署�をサ�ート���。 ����平文署�メソッドをサ"
-"�ート���ん。"
+"注: HMAC-SHA1 署�をサ�ート���。プレーンテキスト�署�メソッド�サ�ート"
+"���ん。"
 
 #. TRANS: Text in confirmation dialog to reset consumer key and secret for an OAuth application.
-#, fuzzy
 msgid "Are you sure you want to reset your consumer key and secret?"
-msgstr "本当�����や�を削除����？"
+msgstr "コンシューマーキー�シークレットをリセット��もよ������？"
 
 #. TRANS: Title for all but the first page of favourite notices of a user.
 #. TRANS: %1$s is the user for whom the favourite notices are displayed, %2$d is the page number.
@@ -5437,7 +4941,12 @@ msgstr "%1$s ��気�入り���や��ページ %2$d"
 
 #. TRANS: Server error displayed when favourite notices could not be retrieved from the database.
 msgid "Could not retrieve favorite notices."
-msgstr "�気�入り���や�を検索����ん。"
+msgstr "�気�入り���や�を�得����ん���。"
+
+#. TRANS: Feed link text. %s is a username.
+#, php-format
+msgid "Feed for favorites of %s (Activity Streams JSON)"
+msgstr "%s ��気�入り�フィード (Activity Streams JSON)"
 
 #. TRANS: Feed link text. %s is a username.
 #, php-format
@@ -5459,19 +4968,19 @@ msgid ""
 "You haven't chosen any favorite notices yet. Click the fave button on "
 "notices you like to bookmark them for later or shed a spotlight on them."
 msgstr ""
-"������少���気�入り���や�も�ん����ん。 後�ブックマークを追"
-"加�る�����れら��気�入り���や������気�入りボタンをクリック"
-"�る������れら�上�ス�ットライトを��������。"
+"�������気�入り���や�も�ん����ん。 後�ブックマーク�追加�る"
+"������や���気�入りボタンをクリック�る������れらを注目���"
+"���。"
 
 #. TRANS: Text displayed instead of favourite notices for a user that has no favourites while logged in.
 #. TRANS: %s is a username.
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "%s hasn't added any favorite notices yet. Post something interesting they "
 "would add to their favorites :)"
 msgstr ""
-"%s ���彼��気�入り�少����や�も加�����ん。 彼ら��気�入り�"
-"加�る���も���も�を投稿������:)"
+"%s ����気�入り�全���や�を追加�����ん。彼ら��気�入り�加�る"
+"よ���も���も�を投稿������:)"
 
 #. TRANS: Text displayed instead of favourite notices for a user that has no favourites while not logged in.
 #. TRANS: %s is a username, %%%%action.register%%%% is a link to the user registration page.
@@ -5482,8 +4991,9 @@ msgid ""
 "action.register%%%%) and then post something interesting they would add to "
 "their favorites :)"
 msgstr ""
-"�� [アカウント登録](%%action.register%%) �����������������"
-"気�入り���や�を加�る最���り��ょ�!"
+"%s ����気�入り���や�を追加�����ん。�� [アカウント登録](%%%%"
+"action.register%%%%) ������������何��白���や�を投稿���彼"
+"��気�入り���や�を追加��もら���ょ� :)"
 
 #. TRANS: Page notice for show favourites page.
 msgid "This is a way to share what you like."
@@ -5500,64 +5010,33 @@ msgstr "%s グループ"
 msgid "%1$s group, page %2$d"
 msgstr "%1$s グループ�ページ %2$d"
 
+#. TRANS: Tooltip for feed link. %s is a group nickname.
+#, php-format
+msgid "Notice feed for %s group (Activity Streams JSON)"
+msgstr "%s グループ���や��フィード (Activity Streams JSON)"
+
 #. TRANS: Tooltip for feed link. %s is a group nickname.
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
-msgstr "%s グループ���や�フィード (RSS 1.0)"
+msgstr "%s グループ���や��フィード (RSS 1.0)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
 #, php-format
 msgid "Notice feed for %s group (RSS 2.0)"
-msgstr "%s グループ���や�フィード (RSS 2.0)"
+msgstr "%s グループ���や��フィード (RSS 2.0)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
 #, php-format
 msgid "Notice feed for %s group (Atom)"
-msgstr "%s グループ���や�フィード (Atom)"
+msgstr "%s グループ���や��フィード (Atom)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
 #, php-format
 msgid "FOAF for %s group"
 msgstr "%s グループ� FOAF"
 
-#. TRANS: Header for mini list of group members on a group page (h2).
-msgid "Members"
-msgstr "メン�ー"
-
-#. TRANS: Description for mini list of group members on a group page when the group has no members.
-#. TRANS: Content of "Listed" page if there are no listed users.
-#. TRANS: Content of "People following tag x" if there are no subscribed users.
-#. TRANS: Empty list message for tags.
-#. TRANS: Text for user subscription statistics if the user has no subscriptions.
-#. TRANS: Text for user subscriber statistics if user has no subscribers.
-#. TRANS: Text for user user group membership statistics if user is not a member of any group.
-#. TRANS: Default content for section/sidebar widget.
-msgid "(None)"
-msgstr "(��)"
-
-#. TRANS: Link to all group members from mini list of group members if group has more than n members.
-msgid "All members"
-msgstr "全��メン�ー"
-
-#. TRANS: Header for group statistics on a group page (h2).
-#. TRANS: H2 text for user statistics.
-msgid "Statistics"
-msgstr "統計データ"
-
-#. TRANS: Label for group creation date.
-#, fuzzy
-msgctxt "LABEL"
-msgid "Created"
-msgstr "作�日"
-
-#. TRANS: Label for member count in statistics on group page.
-#, fuzzy
-msgctxt "LABEL"
-msgid "Members"
-msgstr "メン�ー"
-
 #. TRANS: Notice on group pages for anonymous users for StatusNet sites that accept new registrations.
-#. TRANS: **%s** is the group alias, %%%%site.name%%%% is the site name,
+#. TRANS: %s is the group name, %%%%site.name%%%% is the site name,
 #. TRANS: %%%%action.register%%%% is the URL for registration, %%%%doc.help%%%% is a URL to help.
 #. TRANS: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
 #, php-format
@@ -5568,32 +5047,27 @@ msgid ""
 "their life and interests. [Join now](%%%%action.register%%%%) to become part "
 "of this group and many more! ([Read more](%%%%doc.help%%%%))"
 msgstr ""
-"**%s** � %%site.name%% 上�ユーザグループ��。フリーソフトウェアツール"
-"[StatusNet](http://status.net/)を基���[マイクロブロギング](http://en."
-"wikipedia.org/wiki/Micro-blogging) サービス。メン�ー�彼ら�暮ら��興味�関"
-"�る短�メッセージを共有���。[今���加](%%%%action.register%%%%) ���"
-"�グループ�一員��り��ょ�! ([も��読む](%%%%doc.help%%%%))"
+"**%s** � %%site.name%% 上�ユーザーグループ��。フリーソフトウェアツール "
+"[StatusNet](http://status.net/) を基��� [ミニブログ](http://ja.wikipedia."
+"org/wiki/%%E3%%83%%9F%%E3%%83%%8B%%E3%%83%%96%%E3%%83%%AD%%E3%%82%%B0) サービ"
+"ス��。メン�ー�彼ら�暮ら��興味�関�る短�メッセージを共有���。[今�"
+"��加](%%%%action.register%%%%) ����グループ�一員��り��ょ�� "
+"([も��読む](%%%%doc.help%%%%))"
 
 #. TRANS: Notice on group pages for anonymous users for StatusNet sites that accept no new registrations.
-#. TRANS: **%s** is the group alias, %%%%site.name%%%% is the site name,
+#. TRANS: %s is the group name, %%%%site.name%%%% is the site name,
 #. TRANS: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
-#, php-format
+#, fuzzy, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
 "wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
 "[StatusNet](http://status.net/) tool. Its members share short messages about "
-"their life and interests. "
+"their life and interests."
 msgstr ""
-"**%s** � %%site.name%% 上�ユーザグループ��。フリーソフトウェアツール"
-"[StatusNet](http://status.net/)を基���[マイクロブロギング](http://en."
-"wikipedia.org/wiki/Micro-blogging) サービス。メン�ー�彼ら�暮ら��興味�関"
-"�る短�メッセージを共有���。"
-
-#. TRANS: Title for list of group administrators on a group page.
-#, fuzzy
-msgctxt "TITLE"
-msgid "Admins"
-msgstr "管�者"
+"**%s** � %%site.name%% 上�ユーザーグループ��。フリーソフトウェアツール "
+"[StatusNet](http://status.net/) を基��� [ミニブログ]http://ja.wikipedia."
+"org/wiki/%%E3%%83%%9F%%E3%%83%%8B%%E3%%83%%96%%E3%%83%%AD%%E3%%82%%B0) サービ"
+"ス��。メン�ー�彼ら�暮ら��興味�関�る短�メッセージを共有���。"
 
 #. TRANS: Client error displayed requesting a single message that does not exist.
 msgid "No such message."
@@ -5616,9 +5090,8 @@ msgid "Message from %1$s on %2$s"
 msgstr "%2$s 上� %1$s �ら�メッセージ"
 
 #. TRANS: Client exception thrown when trying a view a notice the user has no access to.
-#, fuzzy
 msgid "Not available."
-msgstr "ＩＭ �利用��。"
+msgstr "利用����ん。"
 
 #. TRANS: Client error displayed trying to show a deleted notice.
 msgid "Notice deleted."
@@ -5626,53 +5099,54 @@ msgstr "��や�を削除����。"
 
 #. TRANS: Title for private list timeline.
 #. TRANS: %1$s is a list, %2$s is a page number.
-#, fuzzy, php-format
+#, php-format
 msgid "Private timeline for %1$s list by you, page %2$d"
-msgstr "ユーザ自身����タグ %1$s  - ページ %2$d"
+msgstr "%1$s リスト�プライベートタイムライン� ページ %2$d"
 
 #. TRANS: Title for public list timeline where the viewer is the tagger.
 #. TRANS: %1$s is a list, %2$s is a page number.
-#, fuzzy, php-format
+#, php-format
 msgid "Timeline for %1$s list by you, page %2$d"
-msgstr "ユーザ自身����タグ %1$s  - ページ %2$d"
+msgstr "%1$s リスト�タイムライン�ページ %2$d"
 
 #. TRANS: Title for private list timeline.
 #. TRANS: %1$s is a list, %2$s is the tagger's nickname, %3$d is a page number.
-#, fuzzy, php-format
+#, php-format
 msgid "Timeline for %1$s list by %2$s, page %3$d"
-msgstr "%1$s �タグ付��れ���や��ページ %2$d"
+msgstr "%2$s � %1$s リスト�タイムライン�ページ %3$d"
 
 #. TRANS: Title for private list timeline.
 #. TRANS: %s is a list.
 #, php-format
 msgid "Private timeline of %s list by you"
-msgstr ""
+msgstr "%s リスト�プライベートタイムライン"
 
 #. TRANS: Title for public list timeline where the viewer is the tagger.
 #. TRANS: %s is a list.
 #, php-format
 msgid "Timeline for %s list by you"
-msgstr ""
+msgstr "%s リスト�タイムライン"
 
 #. TRANS: Title for private list timeline.
 #. TRANS: %1$s is a list, %2$s is the tagger's nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "Timeline for %1$s list by %2$s"
-msgstr "%2$s 上� %1$s ��返信!"
+msgstr "%2$s � %1$s リスト�タイムライン"
 
 #. TRANS: Feed title.
 #. TRANS: %1$s is a list, %2$s is tagger's nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "Feed for %1$s list by %2$s (Atom)"
-msgstr "%s ��気�入り�フィード (Atom)"
+msgstr "%2$s � %1$s リスト�フィード (Atom)"
 
 #. TRANS: Empty list message for list timeline.
 #. TRANS: %1$s is a list, %2$s is a tagger's nickname.
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "This is the timeline for %1$s list by %2$s but no one has posted anything "
 "yet."
-msgstr "�れ�%s����人�タイムライン������誰も投稿�����ん。"
+msgstr ""
+"�れ� %2$s �リスト %1$s �タイムライン������誰も投稿�����ん。"
 
 #. TRANS: Additional empty list message for list timeline for currently logged in user tagged tags.
 msgid "Try tagging more people."
@@ -5680,75 +5154,87 @@ msgstr ""
 
 #. TRANS: Additional empty list message for list timeline.
 #. TRANS: This message contains Markdown links in the form [description](link).
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and start following "
 "this timeline!"
 msgstr ""
-"�� [アカウント登録](%%action.register%%) �������。���最��投稿を"
-"������!"
+"�� [アカウント登録](%%action.register%%) �������？ ���タイムライ"
+"ン�フォローを始�������"
 
 #. TRANS: Header on show list page.
-#, fuzzy
+#. TRANS: Link description for link to list of users tagged with a tag (so part of a list).
 msgid "Listed"
-msgstr "ライセンス"
+msgstr "リスト"
+
+#. TRANS: Content of "Listed" page if there are no listed users.
+#. TRANS: Content of "People following tag x" if there are no subscribed users.
+#. TRANS: Description for mini list of group members on a group page when the group has no members.
+#. TRANS: Empty list message for tags.
+#. TRANS: Text for user subscription statistics if the user has no subscriptions.
+#. TRANS: Text for user subscriber statistics if user has no subscribers.
+#. TRANS: Text for user user group membership statistics if user is not a member of any group.
+#. TRANS: Default content for section/sidebar widget.
+msgid "(None)"
+msgstr "(��)"
 
 #. TRANS: Link for more "People in list x by a user"
 #. TRANS: if there are more than the mini list's maximum.
 msgid "Show all"
-msgstr ""
+msgstr "���表示"
 
 #. TRANS: Header for tag subscribers.
 #. TRANS: Link description for link to list of users subscribed to a tag.
 msgid "Subscribers"
 msgstr "フォロー�れ��る"
 
-#. TRANS: Link for more "People following tag x"
-#. TRANS: if there are more than the mini list's maximum.
-msgid "All subscribers"
-msgstr "����フォロー�れ��る"
-
-#. TRANS: Page title showing tagged notices in one user's stream.
+#. TRANS: Page title showing tagged notices in one user's timeline.
 #. TRANS: %1$s is the username, %2$s is the hash tag.
-#, fuzzy, php-format
+#, php-format
 msgid "Notices by %1$s tagged %2$s"
-msgstr "%1$s�ページ %2$d"
+msgstr "%2$s �タグ付��れ� %1$s ���や�"
 
-#. TRANS: Page title showing tagged notices in one user's stream.
+#. TRANS: Page title showing tagged notices in one user's timeline.
 #. TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number.
-#, fuzzy, php-format
+#, php-format
 msgid "Notices by %1$s tagged %2$s, page %3$d"
-msgstr "%1$s �タグ付��れ���や��ページ %2$d"
+msgstr "%2$s �タグ付��れ� %1$s ���や��ページ %3$d"
 
-#. TRANS: Extended page title showing tagged notices in one user's stream.
+#. TRANS: Extended page title showing tagged notices in one user's timeline.
 #. TRANS: %1$s is the username, %2$d is the page number.
-#, fuzzy, php-format
+#, php-format
 msgid "Notices by %1$s, page %2$d"
-msgstr "%1$s �タグ付��れ���や��ページ %2$d"
+msgstr "%1$s ���や��ページ %2$d"
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %1$s is a user nickname, %2$s is a hashtag.
 #, php-format
 msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
-msgstr "%1$s�%2$s�タグ付��れ���や�フィード (RSS 1.0)"
+msgstr "%1$s � %2$s �タグ付��れ���や��フィード (RSS 1.0)"
+
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#, php-format
+msgid "Notice feed for %s (Activity Streams JSON)"
+msgstr "%s ���や��フィード (Activity Streams JSON)"
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %s is a user nickname.
 #, php-format
 msgid "Notice feed for %s (RSS 1.0)"
-msgstr "%s���や�フィード (RSS 1.0)"
+msgstr "%s ���や��フィード (RSS 1.0)"
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %s is a user nickname.
 #, php-format
 msgid "Notice feed for %s (RSS 2.0)"
-msgstr "%s���や�フィード (RSS 2.0)"
+msgstr "%s ���や��フィード (RSS 2.0)"
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %s is a user nickname.
 #, php-format
 msgid "Notice feed for %s (Atom)"
-msgstr "%s���や�フィード (Atom)"
+msgstr "%s ���や��フィード (Atom)"
 
 #. TRANS: Title for link to notice feed. FOAF stands for Friend of a Friend.
 #. TRANS: More information at http://www.foaf-project.org. %s is a user nickname.
@@ -5756,30 +5242,30 @@ msgstr "%s���や�フィード (Atom)"
 msgid "FOAF for %s"
 msgstr "%s � FOAF"
 
-#. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
-#, fuzzy, php-format
+#. TRANS: First sentence of empty list message for a timeline. $1%s is a user nickname.
+#, php-format
 msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
-msgstr "�れ� %1$s �タイムライン����%2$s �����も投稿�����ん。"
+msgstr "�れ� %1$s �タイムライン����%1$s �����も投稿�����ん。"
 
 #. TRANS: Second sentence of empty list message for a stream for the user themselves.
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
 msgstr ""
-"最近�も���も��何��ょ�? ����少����や�も投稿�����ん��"
-"���始�る良�時��ょ�:)"
+"最近�も���も��何��ょ�？ ��������や�を投稿�����ん���"
+"��始�る良�時��ょ�:)"
 
-#. TRANS: Second sentence of empty  list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
+#. TRANS: Second sentence of empty  list message for a non-self timeline. %1$s is a user nickname, %2$s is a part of a URL.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
 #, php-format
 msgid ""
 "You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
 "%?status_textarea=%2$s)."
 msgstr ""
-"最�� [��トピック投稿](%%%%action.newnotice%%%%?status_textarea=%s) を��"
-"����!"
+"%1$s ��図を�る���� [��人�何�を��や�](%%%%action.newnotice%%%%?"
+"status_textarea=%2$s) を試������。"
 
-#. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
+#. TRANS: Announcement for anonymous users showing a timeline if site registrations are open.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
 #, php-format
 msgid ""
@@ -5788,40 +5274,40 @@ msgid ""
 "[StatusNet](http://status.net/) tool. [Join now](%%%%action.register%%%%) to "
 "follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))"
 msgstr ""
-"**%s** � %%%%site.name%%%% 上�アカウント��。フリーソフトウェアツール"
-"[StatusNet](http://status.net/)を基���[マイクロブロギング](http://en."
-"wikipedia.org/wiki/Micro-blogging) サービス。[今���加](%%%%action.register"
-"%%%%)���**%s** ���や���をフォロー���ょ�! ([も��読む](%%%%doc."
-"help%%%%))"
+"**%s** � %%%%site.name%%%% 上�アカウント��。フリーソフトウェアツール "
+"[StatusNet](http://status.net/) を基��� [ミニブログ](http://ja.wikipedia."
+"org/wiki/%%E3%%83%%9F%%E3%%83%%8B%%E3%%83%%96%%E3%%83%%AD%%E3%%82%%B0) サービ"
+"ス��。[今���加](%%%%action.register%%%%) ���**%s** ���や���を"
+"フォロー���ょ�� ([も��読む](%%%%doc.help%%%%))"
 
-#. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
+#. TRANS: Announcement for anonymous users showing a timeline if site registrations are closed or invite only.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#, php-format
+#, fuzzy, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
 "wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
-"[StatusNet](http://status.net/) tool. "
+"[StatusNet](http://status.net/) tool."
 msgstr ""
-"**%s** � %%site.name%% 上�アカウント��。フリーソフトウェアツール"
-"[StatusNet](http://status.net/)を基���[マイクロブロギング](http://en."
-"wikipedia.org/wiki/Micro-blogging) サービス。"
+"**%s** � %%site.name%% 上�アカウント��。フリーソフトウェアツール "
+"[StatusNet](http://status.net/) を基��� [ミニブログ]http://ja.wikipedia."
+"org/wiki/%%E3%%83%%9F%%E3%%83%%8B%%E3%%83%%96%%E3%%83%%AD%%E3%%82%%B0) サービ"
+"ス��。"
 
 #. TRANS: Link to the author of a repeated notice. %s is a linked nickname.
 #, php-format
 msgid "Repeat of %s"
-msgstr "%s �繰り返�"
+msgstr "%s �リピート"
 
 #. TRANS: Client error displayed trying to silence a user on a site where the feature is not enabled.
 #. TRANS: Client error on page to unsilence a user when the feature is not enabled.
 msgid "You cannot silence users on this site."
-msgstr "������サイト�ユーザを黙ら�る�������ん。"
+msgstr "������サイト�ユーザーを黙ら�る�������ん。"
 
 #. TRANS: Client error displayed trying to silence an already silenced user.
 msgid "User is already silenced."
-msgstr "ユーザ�既�黙�����。"
+msgstr "ユーザー�既�黙�����。"
 
 #. TRANS: Title for site administration panel.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Site"
 msgstr "サイト"
@@ -5832,12 +5318,20 @@ msgstr "�� StatusNet サイト�デザイン設定。"
 
 #. TRANS: Client error displayed trying to save an empty site name.
 msgid "Site name must have non-zero length."
-msgstr "サイト��長�0������ん。"
+msgstr "サイト��長� 0 ������ん。"
 
 #. TRANS: Client error displayed trying to save site settings without a contact address.
 msgid "You must have a valid contact email address."
 msgstr "有効�連絡用メールアドレス���れ��り��ん。"
 
+#. TRANS: Client error displayed when a logo URL is not valid.
+msgid "Invalid logo URL."
+msgstr "無効�ロゴ URL"
+
+#. TRANS: Client error displayed when a SSL logo URL is invalid.
+msgid "Invalid SSL logo URL."
+msgstr "SSL ロゴ URL �無効。"
+
 #. TRANS: Client error displayed trying to save site settings with an invalid language code.
 #. TRANS: %s is the invalid language code.
 #, php-format
@@ -5845,64 +5339,52 @@ msgid "Unknown language \"%s\"."
 msgstr "�明�言語 \"%s\""
 
 #. TRANS: Client error displayed trying to save site settings with a text limit below 0.
-#, fuzzy
 msgid "Minimum text limit is 0 (unlimited)."
-msgstr "最��テキスト制��140字��。"
+msgstr "テキスト�最�文字数� 0 (無制�) ��。"
 
 #. TRANS: Client error displayed trying to save site settings with a text limit below 1.
-#, fuzzy
 msgid "Dupe limit must be one or more seconds."
-msgstr "デュープ制��1秒以上���れ��り��ん。"
+msgstr "�ら��人�対�る制�� 1 秒以上���れ��り��ん。"
 
 #. TRANS: Fieldset legend on site settings panel.
-#, fuzzy
 msgctxt "LEGEND"
 msgid "General"
 msgstr "一般"
 
 #. TRANS: Field label on site settings panel.
-#, fuzzy
 msgctxt "LABEL"
 msgid "Site name"
 msgstr "サイト�"
 
 #. TRANS: Field title on site settings panel.
-#, fuzzy
 msgid "The name of your site, like \"Yourcompany Microblog\"."
-msgstr "����サイト����\"Yourcompany Microblog\"�よ��。"
+msgstr "\"Yourcompany Microblog\" �よ���サイト���。"
 
 #. TRANS: Field label on site settings panel.
 msgid "Brought by"
 msgstr "����られ��"
 
 #. TRANS: Field title on site settings panel.
-#, fuzzy
 msgid "Text used for credits link in footer of each page."
-msgstr ""
-"クレジット�使用�れるテキスト���れ�れ�ページ�フッター�リンク�れ�"
-"�。"
+msgstr "�ページ�フッター�クレジットリンク�使用�るテキスト"
 
 #. TRANS: Field label on site settings panel.
 msgid "Brought by URL"
 msgstr "URL������られ��"
 
 #. TRANS: Field title on site settings panel.
-#, fuzzy
 msgid "URL used for credits link in footer of each page."
-msgstr ""
-"クレジット�使用�れるURL���れ�れ�ページ�フッター�リンク�れ��。"
+msgstr "�ページ�フッター�クレジットリンク�使用�る URL"
 
 #. TRANS: Field label on site settings panel.
 msgid "Email"
 msgstr "メール"
 
 #. TRANS: Field title on site settings panel.
-#, fuzzy
 msgid "Contact email address for your site."
-msgstr "����サイト�コンタクト�るメールアドレス"
+msgstr "����サイト�連絡先メールアドレス��。"
 
 #. TRANS: Fieldset legend on site settings panel.
-#, fuzzy
 msgctxt "LEGEND"
 msgid "Local"
 msgstr "ローカル"
@@ -5917,14 +5399,14 @@ msgstr "サイト�デフォルトタイムゾーン; 通常UTC。"
 
 #. TRANS: Dropdown label on site settings panel.
 msgid "Default language"
-msgstr "�希望�言語"
+msgstr "デフォルト�言語"
 
 #. TRANS: Dropdown title on site settings panel.
-msgid "Site language when autodetection from browser settings is not available"
-msgstr ""
+msgid ""
+"The site language when autodetection from browser settings is not available."
+msgstr "ブラウザ�設定�ら自動検出����場��サイト�言語。"
 
 #. TRANS: Fieldset legend on site settings panel.
-#, fuzzy
 msgctxt "LEGEND"
 msgid "Limits"
 msgstr "制�"
@@ -5944,46 +5426,52 @@ msgstr "デュープ制�"
 #. TRANS: Field title on site settings panel.
 msgid "How long users must wait (in seconds) to post the same thing again."
 msgstr ""
-"�れ�ら�長�間(秒)�ユーザ������も�を投稿�る�を待���れ��ら�"
-"��。"
+"�れ�ら�長�間(秒)�ユーザー������も�を投稿�る�を待���れ��ら"
+"���。"
+
+#. TRANS: Fieldset legend for form to change logo.
+msgid "Logo"
+msgstr "ロゴ"
+
+#. TRANS: Field label for StatusNet site logo.
+msgid "Site logo"
+msgstr "サイトロゴ"
+
+#. TRANS: Field label for SSL StatusNet site logo.
+msgid "SSL logo"
+msgstr "SSL ロゴ"
 
 #. TRANS: Button title for saving site settings.
-msgid "Save site settings"
+msgid "Save the site settings."
 msgstr "サイト設定��存"
 
 #. TRANS: Page title for site-wide notice tab in admin panel.
-#, fuzzy
 msgid "Site Notice"
-msgstr "サイト��や�"
+msgstr "サイト��知ら�"
 
 #. TRANS: Instructions for site-wide notice tab in admin panel.
-#, fuzzy
 msgid "Edit site-wide message"
-msgstr "新��メッセージ"
+msgstr "サイト全体���メッセージを編集"
 
 #. TRANS: Server error displayed when saving a site-wide notice was impossible.
-#, fuzzy
 msgid "Unable to save site notice."
-msgstr "����デザイン設定を�存����ん。"
+msgstr "サイト��知ら�を�存�る�������ん。"
 
 #. TRANS: Client error displayed when a site-wide notice was longer than allowed.
-#, fuzzy
 msgid "Maximum length for the site-wide notice is 255 characters."
-msgstr "プロファイル自己紹介�最大文字長。"
+msgstr "サイト全体��知ら��最大長� 255 文字��。"
 
 #. TRANS: Label for site-wide notice text field in admin panel.
-#, fuzzy
 msgid "Site notice text"
-msgstr "サイト��や�"
+msgstr "サイト��知ら�テキスト"
 
 #. TRANS: Tooltip for site-wide notice text field in admin panel.
 msgid "Site-wide notice text (255 characters maximum; HTML allowed)"
-msgstr ""
+msgstr "サイト全体��知ら�テキスト (最大 255 文字��; HTML �)。"
 
-#. TRANS: Title for button to save site notice in admin panel.
-#, fuzzy
+#. TRANS: Button title to save site notice in admin panel.
 msgid "Save site notice."
-msgstr "サイト��や�"
+msgstr "サイト��知ら�を�存。"
 
 #. TRANS: Title for SMS settings.
 msgid "SMS settings"
@@ -6001,9 +5489,8 @@ msgid "SMS is not available."
 msgstr "SMS �利用����ん。"
 
 #. TRANS: Form legend for SMS settings form.
-#, fuzzy
 msgid "SMS address"
-msgstr "IMアドレス"
+msgstr "SMS アドレス"
 
 #. TRANS: Form guide in SMS settings form.
 msgid "Current confirmed SMS-enabled phone number."
@@ -6022,19 +5509,17 @@ msgid "Enter the code you received on your phone."
 msgstr "��������電話������コードを入れ�����。"
 
 #. TRANS: Button label to confirm SMS confirmation code in SMS settings.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Confirm"
-msgstr "パスワード確�"
+msgstr "確�"
 
 #. TRANS: Field label for SMS phone number input in SMS settings form.
 msgid "SMS phone number"
 msgstr "SMS 電話番�"
 
 #. TRANS: SMS phone number input field instructions in SMS settings form.
-#, fuzzy
 msgid "Phone number, no punctuation or spaces, with area code."
-msgstr "電話番���読点���スペース����市街番�付�"
+msgstr "電話番���読点�������スペース�市街局番付�"
 
 #. TRANS: Form legend for SMS preferences form.
 msgid "SMS preferences"
@@ -6049,9 +5534,8 @@ msgstr ""
 "る�も�れ���を�解�����。"
 
 #. TRANS: Confirmation message for successful SMS preferences save.
-#, fuzzy
 msgid "SMS preferences saved."
-msgstr "設定��存�れ���。"
+msgstr "SMS 設定��存�れ���。"
 
 #. TRANS: Message given saving SMS phone number without having provided one.
 msgid "No phone number."
@@ -6063,11 +5547,11 @@ msgstr "キャリア��択�れ����ん。"
 
 #. TRANS: Message given saving SMS phone number that is already set.
 msgid "That is already your phone number."
-msgstr "�れ��������電話番���。"
+msgstr "�れ�既�����電話番���。"
 
 #. TRANS: Message given saving SMS phone number that is already set for another user.
 msgid "That phone number already belongs to another user."
-msgstr "��電話番�����他�ユーザ�使�れ����。"
+msgstr "��電話番��既�他�ユーザー�使用�����。"
 
 #. TRANS: Message given saving valid SMS phone number that is to be confirmed.
 msgid ""
@@ -6082,13 +5566,12 @@ msgid "That is the wrong confirmation number."
 msgstr "�れ�間���確�番���。"
 
 #. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
-#, fuzzy
 msgid "Could not delete SMS confirmation."
-msgstr "メール承�を削除����ん"
+msgstr "SMS �確�を削除����ん���。"
 
 #. TRANS: Message given after successfully canceling SMS phone number confirmation.
 msgid "SMS confirmation cancelled."
-msgstr "SMS確�"
+msgstr "SMS 確��キャンセル�れ���。"
 
 #. TRANS: Message given trying to remove an SMS phone number that is not
 #. TRANS: registered for the active user.
@@ -6096,9 +5579,8 @@ msgid "That is not your phone number."
 msgstr "�れ�����電話番����り��ん。"
 
 #. TRANS: Message given after successfully removing a registered SMS phone number.
-#, fuzzy
 msgid "The SMS phone number was removed."
-msgstr "SMS 電話番�"
+msgstr "SMS 電話番�を削除����。"
 
 #. TRANS: Label for mobile carrier dropdown menu in SMS settings.
 msgid "Mobile carrier"
@@ -6120,34 +5602,31 @@ msgstr ""
 "����。"
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
-#, fuzzy
 msgid "No code entered."
-msgstr "コード�入力�れ����ん"
+msgstr "コード�入力�れ����ん。"
 
 #. TRANS: Title for admin panel to configure snapshots.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Snapshots"
 msgstr "スナップショット"
 
 #. TRANS: Instructions for admin panel to configure snapshots.
 msgid "Manage snapshot configuration"
-msgstr "セッション設定"
+msgstr "スナップショット設定�管�"
 
 #. TRANS: Client error displayed on admin panel for snapshots when providing an invalid run value.
 msgid "Invalid snapshot run value."
-msgstr "�正�スナップショットラン�リュー"
+msgstr "無効�スナップショットラン�リュー"
 
 #. TRANS: Client error displayed on admin panel for snapshots when providing an invalid value for frequency.
 msgid "Snapshot frequency must be a number."
-msgstr "スナップショット頻度�数���れ��り��ん。"
+msgstr "スナップショット頻度�数字���れ��り��ん。"
 
 #. TRANS: Client error displayed on admin panel for snapshots when providing an invalid report URL.
 msgid "Invalid snapshot report URL."
-msgstr "�正�スナップショットレ�ートURL。"
+msgstr "無効�スナップショットレ�ート URL。"
 
 #. TRANS: Fieldset legend on admin panel for snapshots.
-#, fuzzy
 msgctxt "LEGEND"
 msgid "Snapshots"
 msgstr "スナップショット"
@@ -6165,36 +5644,32 @@ msgid "Data snapshots"
 msgstr "データスナップショット"
 
 #. TRANS: Dropdown title for snapshot method in admin panel for snapshots.
-#, fuzzy
 msgid "When to send statistical data to status.net servers."
-msgstr "�� status.net サー��統計データを�り���"
+msgstr "status.net サー����統計データを�り���。"
 
 #. TRANS: Input field label for snapshot frequency in admin panel for snapshots.
 msgid "Frequency"
 msgstr "頻度"
 
 #. TRANS: Input field title for snapshot frequency in admin panel for snapshots.
-#, fuzzy
 msgid "Snapshots will be sent once every N web hits."
-msgstr "レ�ート URL"
+msgstr "スナップショット� N web ヒット後��信�れ��。"
 
 #. TRANS: Input field label for snapshot report URL in admin panel for snapshots.
 msgid "Report URL"
 msgstr "レ�ート URL"
 
 #. TRANS: Input field title for snapshot report URL in admin panel for snapshots.
-#, fuzzy
 msgid "Snapshots will be sent to this URL."
-msgstr "��URL�スナップショットを�る��ょ�"
+msgstr "スナップショット���� URL ��信�れ��。"
 
-#. TRANS: Title for button to save snapshot settings.
-#, fuzzy
+#. TRANS: Button title to save snapshot settings.
 msgid "Save snapshot settings."
-msgstr "サイト設定��存"
+msgstr "スナップショット設定��存。"
 
 #. TRANS: Client error displayed trying a change a subscription for a non-subscribed profile.
 msgid "You are not subscribed to that profile."
-msgstr "������プロファイル�フォロー�れ����ん。"
+msgstr "������プロファイルをフォロー�����ん。"
 
 #. TRANS: Server error displayed when updating a subscription fails with a database error.
 #. TRANS: Exception thrown when a subscription could not be stored on the server.
@@ -6207,57 +5682,49 @@ msgstr ""
 
 #. TRANS: Title of the first page showing pending subscribers still awaiting approval.
 #. TRANS: %s is the name of the user.
-#, fuzzy, php-format
+#, php-format
 msgid "%s subscribers awaiting approval"
-msgstr "%s グループメン�ー"
+msgstr "フォロー�承�を待���る %s"
 
 #. TRANS: Title of all but the first page showing pending subscribersmembers still awaiting approval.
 #. TRANS: %1$s is the name of the user, %2$d is the page number of the members list.
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s subscribers awaiting approval, page %2$d"
-msgstr "%1$s グループメン�ー�ページ %2$d"
+msgstr "フォロー�承�を待���る %1$s�ページ %2$d"
 
 #. TRANS: Page notice for group members page.
-#, fuzzy
 msgid "A list of users awaiting approval to subscribe to you."
-msgstr "��グループ�ユーザ�リスト。"
-
-#. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
-#, fuzzy
-msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
-msgstr "������プロファイル�フォロー�れ����ん。"
+msgstr "フォロー�承�待�ユーザー�一覧。"
 
 #. TRANS: Page title when subscription succeeded.
 msgid "Subscribed"
 msgstr "フォロー���る"
 
 #. TRANS: Client error displayed when trying to perform an action while not logged in.
-#, fuzzy
 msgid "You must be logged in to unsubscribe from a list."
-msgstr "グループを作る��ログイン�����れ��り��ん。"
+msgstr "リスト�ら�登録を解除�る��ログイン�る必���り��。"
 
 #. TRANS: Client error displayed when trying to perform an action without providing an ID.
-#, fuzzy
 msgid "No ID given."
-msgstr "ID引数��り��ん。"
+msgstr "ID ��り��ん。"
 
 #. TRANS: Server error displayed subscribing to a list fails.
 #. TRANS: %1$s is a user nickname, %2$s is a list, %3$s is the error message (no period).
-#, fuzzy, php-format
+#, php-format
 msgid "Could not subscribe user %1$s to list %2$s: %3$s"
-msgstr "ユーザ %1$s �グループ %2$s ��加����ん。"
+msgstr "%1$s �リスト %2$s ��加����ん: %3$s"
 
 #. TRANS: Title of form to subscribe to a list.
 #. TRANS: %1%s is a user nickname, %2$s is a list, %3$s is a tagger nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s subscribed to list %2$s by %3$s"
-msgstr "%1$s フォロー�れ��る�ページ %2$d"
+msgstr "%3$s �よ�� リスト %2$s � %1$s を�加"
 
 #. TRANS: Header for list of subscribers for a user (first page).
 #. TRANS: %s is the user's nickname.
 #, php-format
 msgid "%s subscribers"
-msgstr "フォロー�れ��る"
+msgstr "%s フォロー�れ��る"
 
 #. TRANS: Header for list of subscribers for a user (not first page).
 #. TRANS: %1$s is the user's nickname, $2$d is the page number.
@@ -6277,19 +5744,18 @@ msgid "These are the people who listen to %s's notices."
 msgstr "%s　���や�を����る人"
 
 #. TRANS: Subscriber list text when the logged in user has no subscribers.
-#, fuzzy
 msgid ""
 "You have no subscribers. Try subscribing to people you know and they might "
 "return the favor."
 msgstr ""
-"������フォロー���る人�全����ん。 ����知���る人々をフォ"
-"ロー��������。���れ��彼ら��気�入りを返��も�れ��ん。"
+"�����フォロー���る人�全����ん。 ����知���る人々をフォロー"
+"��������。���れ��彼ら��気�入りを返��も�れ��ん。"
 
 #. TRANS: Subscriber list text when looking at the subscribers for a of a user other
 #. TRANS: than the logged in user that has no subscribers. %s is the user nickname.
 #, php-format
 msgid "%s has no subscribers. Want to be the first?"
-msgstr "%s ��フォロー���る人����ん。最��人��り���?"
+msgstr "%s ��フォロー���る人����ん。最��人��り���？"
 
 #. TRANS: Subscriber list text when looking at the subscribers for a of a user that has none
 #. TRANS: as an anonymous user. %s is the user nickname.
@@ -6302,7 +5768,7 @@ msgid ""
 "%) and be the first?"
 msgstr ""
 "%s ��フォロー���る人����ん。��[アカウント登録](%%%%action.register"
-"%%%%)��最���ら������?"
+"%%%%) ��最���ら������？"
 
 #. TRANS: Header for subscriptions overview for a user (not first page).
 #. TRANS: %1$s is a user nickname, %2$d is the page number.
@@ -6325,20 +5791,19 @@ msgstr "%s ���や�を����る人"
 #. TRANS: This message contains Markdown URLs. The link description is between
 #. TRANS: square brackets, and the link between parentheses. Do not separate "]("
 #. TRANS: and do not change the URL part.
-#, php-format
+#, fuzzy, php-format
 msgid ""
 "You're not listening to anyone's notices right now, try subscribing to "
 "people you know. Try [people search](%%action.peoplesearch%%), look for "
 "members in groups you're interested in and in our [featured users](%%action."
-"featured%%). If you're a [Twitter user](%%action.twittersettings%%), you can "
-"automatically subscribe to people you already follow there."
+"featured%%)."
 msgstr ""
 "今��れ���や�も�������ら�����知���る人々をフォロー���"
-"�����。[ピープル検索](%%action.peoplesearch%%)を試������。����"
-"����興味を����るグループ�����[フィー�ャー�れ�ユーザ](%%"
-"action.featured%%)�メン�ーを探������。も�[Twitterユーザ](%%action."
-"twittersettings%%)��れ������自動的�既�フォロー���る人々をフォ"
-"ロー����。"
+"�����。[ユーザー検索](%%action.peoplesearch%%) を試������。��"
+"������興味を����るグループ����� [フィー�ャー�れ�ユーザー](%"
+"%action.featured%%) �メン�ーを探������。も� [Twitterユーザー](%%"
+"action.twittersettings%%) ��れ������自動的�既�フォロー���る人々"
+"をフォロー����。"
 
 #. TRANS: Subscription list text when looking at the subscriptions for a of a user other
 #. TRANS: than the logged in user that has no subscriptions. %s is the user nickname.
@@ -6349,12 +5814,11 @@ msgid "%s is not listening to anyone."
 msgstr "%s ��れも言���を������ん。"
 
 #. TRANS: Atom feed title. %s is a profile nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "Subscription feed for %s (Atom)"
-msgstr "%s���や�フィード (Atom)"
+msgstr "%s ���や��フィード (Atom)"
 
 #. TRANS: Checkbox label for enabling IM messages for a profile in a subscriptions list.
-#, fuzzy
 msgctxt "LABEL"
 msgid "IM"
 msgstr "IM"
@@ -6369,88 +5833,87 @@ msgstr "SMS"
 msgid "Notices tagged with %1$s, page %2$d"
 msgstr "%1$s �タグ付��れ���や��ページ %2$d"
 
+#. TRANS: Link label for feed on "notices with tag" page.
+#. TRANS: %s is the tag the feed is for.
+#, php-format
+msgid "Notice feed for tag %s (Activity Streams JSON)"
+msgstr "タグ %s ���や��フィード (Activity Streams JSON)"
+
 #. TRANS: Link label for feed on "notices with tag" page.
 #. TRANS: %s is the tag the feed is for.
 #, php-format
 msgid "Notice feed for tag %s (RSS 1.0)"
-msgstr "%s �タグ付��れ���や�フィード (RSS 1.0)"
+msgstr "%s �タグ付��れ���や��フィード (RSS 1.0)"
 
 #. TRANS: Link label for feed on "notices with tag" page.
 #. TRANS: %s is the tag the feed is for.
 #, php-format
 msgid "Notice feed for tag %s (RSS 2.0)"
-msgstr "%s �タグ付��れ���や�フィード (RSS 2.0)"
+msgstr "%s �タグ付��れ���や��フィード (RSS 2.0)"
 
 #. TRANS: Link label for feed on "notices with tag" page.
 #. TRANS: %s is the tag the feed is for.
 #, php-format
 msgid "Notice feed for tag %s (Atom)"
-msgstr "%s �タグ付��れ���や�フィード (Atom)"
+msgstr "%s �タグ付��れ���や��フィード (Atom)"
 
 #. TRANS: Client error displayed when trying to tag a user that cannot be tagged.
 #. TRANS: Client exception thrown trying to set a tag for a user that cannot be tagged.
 #. TRANS: Error displayed when trying to tag a user that cannot be tagged.
-#, fuzzy
 msgid "You cannot tag this user."
-msgstr "��ユーザ�メッセージを�る�������ん。"
+msgstr "��ユーザー�タグを付�る�������ん。"
 
 #. TRANS: Title for list form when not on a profile page.
-#, fuzzy
 msgid "List a profile"
-msgstr "ユーザプロファイル"
+msgstr "プロファイル�リスト"
 
 #. TRANS: Title for list form when on a profile page.
 #. TRANS: %s is a profile nickname.
-#, fuzzy, php-format
+#, php-format
 msgctxt "ADDTOLIST"
 msgid "List %s"
-msgstr "制�"
+msgstr "リスト %s"
 
 #. TRANS: Title for list form when an error has occurred.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Error"
-msgstr "Ajax エラー"
+msgstr "エラー"
 
 #. TRANS: Header in list form.
 msgid "User profile"
-msgstr "ユーザプロファイル"
+msgstr "ユーザープロファイル"
 
 #. TRANS: Fieldset legend for list form.
-#, fuzzy
 msgid "List user"
-msgstr "制�"
+msgstr "ユーザーリスト"
 
 #. TRANS: Field label on list form.
-#, fuzzy
 msgctxt "LABEL"
 msgid "Lists"
-msgstr "制�"
+msgstr "リスト"
 
 #. TRANS: Field title on list form.
-#, fuzzy
 msgid ""
 "Lists for this user (letters, numbers, -, ., and _), comma- or space- "
 "separated."
 msgstr ""
-"自分自身�����タグ (アルファベット�数字�-�.�_)�カンマ���空白区切"
-"り�"
+"��ユーザー�リスト (アルファベット�数字�-�.��よ� _)�カンマ���空白"
+"�区切られ�。"
 
 #. TRANS: Title for personal tag cloud section.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Tags"
 msgstr "ã‚¿ã‚°"
 
 #. TRANS: Success message if lists are saved.
-#, fuzzy
 msgid "Lists saved."
-msgstr "パスワード��存�れ���。"
+msgstr "リスト��存�れ���。"
 
 #. TRANS: Page notice.
-#, fuzzy
 msgid "Use this form to add your subscribers or subscriptions to lists."
-msgstr "��フォームを使用���フォロー者�フォロー�タグを加������。"
+msgstr ""
+"フォロー�る人���リスト�フォロー�る人を追加�る�����フォームを使用"
+"������。"
 
 #. TRANS: Client error when requesting a tag feed for a non-existing tag.
 msgid "No such tag."
@@ -6458,15 +5921,15 @@ msgstr "��よ��タグ��り��ん。"
 
 #. TRANS: Client error displayed when trying to unblock a non-blocked user.
 msgid "You haven't blocked that user."
-msgstr "������ユーザをブロック�����ん。"
+msgstr "������ユーザーをブロック�����ん。"
 
 #. TRANS: Client error on page to unsilence a user when the to be unsandboxed user has not been sandboxed.
 msgid "User is not sandboxed."
-msgstr "ユーザ�サンドボックス���り��ん。"
+msgstr "ユーザー�サンドボックス���り��ん。"
 
 #. TRANS: Client error on page to unsilence a user when the to be unsilenced user has not been silenced.
 msgid "User is not silenced."
-msgstr "ユーザ�サイレンス���り��ん。"
+msgstr "ユーザー�サイレンス���り��ん。"
 
 #. TRANS: Page title for page to unsubscribe.
 msgid "Unsubscribed"
@@ -6474,26 +5937,13 @@ msgstr "フォロー解除済�"
 
 #. TRANS: Page title for form that allows unsubscribing from a list.
 #. TRANS: %1$s is a nickname, %2$s is a list, %3$s is a tagger nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s unsubscribed from list %2$s by %3$s"
-msgstr "%1$s フォロー�れ��る�ページ %2$d"
-
-#. TRANS: Client error displayed when trying to update profile with an incompatible license.
-#. TRANS: %1$s is the license incompatible with site license %2$s.
-#. TRANS: Exception thrown when licenses are not compatible for an authorisation request.
-#. TRANS: %1$s is the license for the listenee, %2$s is the license for "this" StatusNet site.
-#, fuzzy, php-format
-msgid ""
-"Listenee stream license \"%1$s\" is not compatible with site license \"%2$s"
-"\"."
-msgstr ""
-"リスニーストリームライセンス ‘%1$s’ ��サイトライセンス ‘%2$s’ �互�性��"
-"り��ん。"
+msgstr "%3$s �よ���リスト %2$s �ら %1$s �フォローを解除"
 
 #. TRANS: Title of URL settings tab in profile settings.
-#, fuzzy
 msgid "URL settings"
-msgstr "IM設定"
+msgstr "URL 設定"
 
 #. TRANS: Instructions for tab "Other" in user profile settings.
 msgid "Manage various other options."
@@ -6506,17 +5956,16 @@ msgid " (free service)"
 msgstr "(フリーサービス)"
 
 #. TRANS: Default value for URL shortening settings.
-#, fuzzy
 msgid "[none]"
-msgstr "��"
+msgstr "[��]"
 
 #. TRANS: Default value for URL shortening settings.
 msgid "[internal]"
-msgstr ""
+msgstr "[内部]"
 
 #. TRANS: Label for dropdown with URL shortener services.
 msgid "Shorten URLs with"
-msgstr "URLを短����"
+msgstr "URL を短����"
 
 #. TRANS: Tooltip for for dropdown with URL shortener services.
 msgid "Automatic shortening service to use."
@@ -6524,70 +5973,65 @@ msgstr "使用�る自動短縮サービス。"
 
 #. TRANS: Field label in URL settings in profile.
 msgid "URL longer than"
-msgstr ""
+msgstr "長� URL"
 
 #. TRANS: Field title in URL settings in profile.
 msgid "URLs longer than this will be shortened, 0 means always shorten."
-msgstr ""
+msgstr "�れよりも長� URL �短縮�れ�0 �常�短縮�る��を�味�る。"
 
 #. TRANS: Field label in URL settings in profile.
 msgid "Text longer than"
-msgstr ""
+msgstr "長�テキスト"
 
 #. TRANS: Field title in URL settings in profile.
 msgid ""
 "URLs in notices longer than this will be shortened, 0 means always shorten."
 msgstr ""
+"�れよりも長���や�� URL �短縮�れ�0 �常�短縮�る��を�味�る。"
 
 #. TRANS: Form validation error for form "Other settings" in user profile.
-#, fuzzy
 msgid "URL shortening service is too long (maximum 50 characters)."
-msgstr "URL 短縮サービス�長����。（最大50字）"
+msgstr "URL 短縮サービス�長���� (最大 50 文字��)。"
 
 #. TRANS: Client exception thrown when the maximum URL settings value is invalid in profile URL settings.
-#, fuzzy
 msgid "Invalid number for maximum URL length."
-msgstr "�正�トークン。"
+msgstr "URL �最大長�正���り��ん。"
 
 #. TRANS: Client exception thrown when the maximum notice length settings value is invalid in profile URL settings.
-#, fuzzy
 msgid "Invalid number for maximum notice length."
-msgstr "�正�トークン。"
+msgstr "��や��最大長�正���り��ん。"
 
 #. TRANS: Server exception thrown in profile URL settings when preferences could not be saved.
 msgid "Error saving user URL shortening preferences."
-msgstr ""
+msgstr "短縮 URL �設定を�存�る時�エラー�発生����。"
 
 #. TRANS: User admin panel title.
-#, fuzzy
 msgctxt "TITLE"
 msgid "User"
-msgstr "ユーザ"
+msgstr "ユーザー"
 
 #. TRANS: Instruction for user admin panel.
 msgid "User settings for this StatusNet site"
-msgstr ""
+msgstr "�� StatusNet サイト�ユーザー設定"
 
 #. TRANS: Form validation error in user admin panel when a non-numeric character limit was set.
 msgid "Invalid bio limit. Must be numeric."
-msgstr "�正�自己紹介制�。数字��る必���り��。"
+msgstr "無効�自己紹介制�。数字��る必���り��。"
 
 #. TRANS: Form validation error in user admin panel when welcome text is too long.
-#, fuzzy
 msgid "Invalid welcome text. Maximum length is 255 characters."
-msgstr "�正�ウェルカムテキスト。最大長�255字��。"
+msgstr "無効�ウェルカムテキスト。最大長� 255 文字��。"
 
 #. TRANS: Client error displayed when trying to set a non-existing user as default subscription for new
 #. TRANS: users in user admin panel. %1$s is the invalid nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "Invalid default subscripton: \"%1$s\" is not a user."
-msgstr "�正�デフォルトフォロー��: '%1$s'  �ユーザ���り��ん。"
+msgstr "無効�デフォルトフォロー��: \"%1$s\"  �ユーザー���り��ん。"
 
 #. TRANS: Fieldset legend in user administration panel.
-#, fuzzy
 msgctxt "LEGEND"
 msgid "Profile"
-msgstr "プロファイル"
+msgstr "プロフィール"
 
 #. TRANS: Field label in user admin panel for setting the character limit for the bio field.
 msgid "Bio Limit"
@@ -6599,16 +6043,15 @@ msgstr "プロファイル自己紹介�最大文字長。"
 
 #. TRANS: Form legend in user admin panel.
 msgid "New users"
-msgstr "新��ユーザ"
+msgstr "新��ユーザー"
 
 #. TRANS: Field label in user admin panel for setting new user welcome text.
 msgid "New user welcome"
-msgstr "新��ユーザを歓迎"
+msgstr "新��ユーザーを歓迎"
 
 #. TRANS: Tooltip in user admin panel for setting new user welcome text.
-#, fuzzy
 msgid "Welcome text for new users (maximum 255 characters)."
-msgstr "新��ユーザ��ウェルカムテキスト (最大255字)。"
+msgstr "新��ユーザー��ウェルカムテキスト (最大 255 文字)。"
 
 #. TRANS: Field label in user admin panel for setting default subscription for new users.
 msgid "Default subscription"
@@ -6616,7 +6059,7 @@ msgstr "デフォルトフォロー"
 
 #. TRANS: Tooltip in user admin panel for setting default subscription for new users.
 msgid "Automatically subscribe new users to this user."
-msgstr "自動的���ユーザ�新��ユーザをフォロー������。"
+msgstr "自動的���ユーザー�新��ユーザーをフォロー������。"
 
 #. TRANS: Form legend in user admin panel.
 msgid "Invitations"
@@ -6628,166 +6071,11 @@ msgstr "招待��能"
 
 #. TRANS: Tooltip for checkbox in user admin panel for allowing users to invite friend using site e-mail.
 msgid "Whether to allow users to invite new users."
-msgstr "ユーザ�新��ユーザを招待�る�を許容�る����。"
+msgstr "ユーザー�新��ユーザーを招待�る�を許容�る����。"
 
-#. TRANS: Title for button to save user settings in user admin panel.
-#, fuzzy
+#. TRANS: Button title to save user settings in user admin panel.
 msgid "Save user settings."
-msgstr "サイト設定��存"
-
-#. TRANS: Page title.
-msgid "Authorize subscription"
-msgstr "フォローを承�"
-
-#. TRANS: Page notice on "Authorize subscription" page.
-#, fuzzy
-msgid ""
-"Please check these details to make sure that you want to subscribe to this "
-"user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
-"click \"Reject\"."
-msgstr ""
-"ユーザ���や�をフォロー�る��詳細を確���下��。�れ����や�を"
-"フォロー�る���尋���場���\"Reject\" をクリック��下��。"
-
-#. TRANS: Button text on Authorise Subscription page.
-#. TRANS: Submit button text to accept a group membership request on approve group form.
-#. TRANS: Submit button text to accept a subscription request on approve sub form.
-#, fuzzy
-msgctxt "BUTTON"
-msgid "Accept"
-msgstr "承�"
-
-#. TRANS: Title for button on Authorise Subscription page.
-#. TRANS: Button title to subscribe to a user.
-#, fuzzy
-msgid "Subscribe to this user."
-msgstr "��ユーザーをフォロー"
-
-#. TRANS: Button text on Authorise Subscription page.
-#. TRANS: Submit button text to reject a group membership request on approve group form.
-#. TRANS: Submit button text to reject a subscription request on approve sub form.
-#, fuzzy
-msgctxt "BUTTON"
-msgid "Reject"
-msgstr "拒�"
-
-#. TRANS: Title for button on Authorise Subscription page.
-#, fuzzy
-msgid "Reject this subscription."
-msgstr "��フォローを拒�"
-
-#. TRANS: Client error displayed for an empty authorisation request.
-msgid "No authorization request!"
-msgstr "�証�リクエスト��り��ん。"
-
-#. TRANS: Accept message header from Authorise subscription page.
-msgid "Subscription authorized"
-msgstr "フォロー�承��れ���"
-
-#. TRANS: Accept message text from Authorise subscription page.
-#, 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 ""
-"フォロー�承��れ�����コール�ックＵＲＬ�通�����ん���。��"
-"フォローを承��る��関�る詳細����サイト�指示を�ェック������。"
-"����フォロートークン�:"
-
-#. TRANS: Reject message header from Authorise subscription page.
-msgid "Subscription rejected"
-msgstr "フォロー�拒�"
-
-#. TRANS: Reject message from Authorise subscription page.
-#, fuzzy
-msgid ""
-"The subscription has been rejected, but no callback URL was passed. Check "
-"with the site's instructions for details on how to fully reject the "
-"subscription."
-msgstr ""
-"フォロー�拒絶�れ�����コール�ックURL�全�通��れ��ん���。 ��"
-"フォローを完全�拒絶�る��関�る詳細����サイト�指示を�ェック����"
-"��。"
-
-#. TRANS: Exception thrown when no valid user is found for an authorisation request.
-#. TRANS: %s is a listener URI.
-#, fuzzy, php-format
-msgid "Listener URI \"%s\" not found here."
-msgstr "リスナー URI  ‘%s’ �����見��り��ん。"
-
-#. TRANS: Exception thrown when listenee URI is too long for an authorisation request.
-#. TRANS: %s is a listenee URI.
-#, fuzzy, php-format
-msgid "Listenee URI \"%s\" is too long."
-msgstr "リスニー URI  ‘%s’ �長����。"
-
-#. TRANS: Exception thrown when listenee URI is a local user for an authorisation request.
-#. TRANS: %s is a listenee URI.
-#, fuzzy, php-format
-msgid "Listenee URI \"%s\" is a local user."
-msgstr "リスニー URI  ‘%s’ �ローカルユーザー���り��ん。"
-
-#. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
-#. TRANS: %s is a profile URL.
-#, fuzzy, php-format
-msgid "Profile URL \"%s\" is for a local user."
-msgstr "プロファイル URL  ‘%s’ �ローカルユーザー���り��ん。"
-
-#. TRANS: Exception thrown when avatar URL is invalid for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#, fuzzy, php-format
-msgid "Avatar URL \"%s\" is not valid."
-msgstr "ア�ター URL  ‘%s’ �正���り��ん。"
-
-#. TRANS: Exception thrown when avatar URL could not be read for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#, fuzzy, php-format
-msgid "Cannot read avatar URL \"%s\"."
-msgstr "ア�ターURL　を読��れ��ん '%s'"
-
-#. TRANS: Exception thrown when avatar URL return an invalid image type for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#, fuzzy, php-format
-msgid "Wrong image type for avatar URL \"%s\"."
-msgstr "ア�ター URL '%s' ��正�画�形�。"
-
-#. TRANS: Title for profile design page.
-#. TRANS: Page title for profile design page.
-msgid "Profile design"
-msgstr "プロファイルデザイン"
-
-#. TRANS: Instructions for Profile design page.
-#. TRANS: Instructions for profile design page.
-msgid ""
-"Customize the way your profile looks with a background image and a colour "
-"palette of your choice."
-msgstr ""
-"����プロフィール��ックグラウンド画�������択�色�パレット�見る"
-"方法をカスタマイズ������。"
-
-#. TRANS: Succes message on Profile design page when finding an easter egg.
-#, fuzzy
-msgid "Enjoy your hotdog!"
-msgstr "����hotdogを楽�ん�����!"
-
-#. TRANS: Form legend on Profile design page.
-#, fuzzy
-msgid "Design settings"
-msgstr "サイト設定��存"
-
-#. TRANS: Checkbox label on Profile design page.
-msgid "View profile designs"
-msgstr "プロファイルデザインを表示"
-
-#. TRANS: Title for checkbox on Profile design page.
-msgid "Show or hide profile designs."
-msgstr "プロファイルデザイン�表示����表示"
-
-#. TRANS: Form legend on Profile design page for form to choose a background image.
-#, fuzzy
-msgid "Background file"
-msgstr "�ックグラウンド"
+msgstr "ユーザー設定を�存���。"
 
 #. TRANS: Page title for all but the first page of groups for a user.
 #. TRANS: %1$s is a nickname, %2$d is a page number.
@@ -6809,7 +6097,7 @@ msgstr "%s ���グループ�メン�ー�も�り��ん。"
 #. TRANS: a Markdown link in the form [link text](link) and a variable that should not be changed.
 #, php-format
 msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
-msgstr "[グループを探��](%%action.groupsearch%%)�れ�加入������。"
+msgstr "[グループを探��](%%action.groupsearch%%) �れ�加入������。"
 
 #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
 #. TRANS: Message is used as a subtitle in atom group notice feed.
@@ -6818,7 +6106,7 @@ msgstr "[グループを探��](%%action.groupsearch%%)�れ�加入��
 #. TRANS: %1$s is a user name, %2$s is a site name.
 #, php-format
 msgid "Updates from %1$s on %2$s!"
-msgstr "%1$s �ら %2$s  上�更新を����!"
+msgstr "%1$s �ら %2$s  上�更新を�����"
 
 #. TRANS: Title for version page. %s is the StatusNet version.
 #, php-format
@@ -6829,15 +6117,13 @@ msgstr "StatusNet %s"
 #. TRANS: %1$s is the engine name (StatusNet) and %2$s is the StatusNet version.
 #, php-format
 msgid ""
-"This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, "
+"This site is powered by %1$s version %2$s, Copyright 2008-2011 StatusNet, "
 "Inc. and contributors."
 msgstr ""
-"This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, "
-"Inc. and contributors."
 
 #. TRANS: Header for StatusNet contributors section on the version page.
 msgid "Contributors"
-msgstr "コントリビュータ"
+msgstr "貢献者"
 
 #. TRANS: Header for StatusNet license section on the version page.
 msgid "License"
@@ -6848,7 +6134,7 @@ msgid ""
 "StatusNet is free software: you can redistribute it and/or modify it under "
 "the terms of the GNU Affero General Public License as published by the Free "
 "Software Foundation, either version 3 of the License, or (at your option) "
-"any later version. "
+"any later version."
 msgstr ""
 
 #. TRANS: Content part of StatusNet version page.
@@ -6856,7 +6142,7 @@ msgid ""
 "This program is distributed in the hope that it will be useful, but WITHOUT "
 "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
 "FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License "
-"for more details. "
+"for more details."
 msgstr ""
 
 #. TRANS: Content part of StatusNet version page.
@@ -6872,28 +6158,24 @@ msgid "Plugins"
 msgstr "プラグイン"
 
 #. TRANS: Column header for plugins table on version page.
-#, fuzzy
 msgctxt "HEADER"
 msgid "Name"
 msgstr "��"
 
 #. TRANS: Column header for plugins table on version page.
-#, fuzzy
 msgctxt "HEADER"
 msgid "Version"
 msgstr "�ージョン"
 
 #. TRANS: Column header for plugins table on version page.
-#, fuzzy
 msgctxt "HEADER"
 msgid "Author(s)"
-msgstr "作者"
+msgstr "著者"
 
 #. TRANS: Column header for plugins table on version page.
-#, fuzzy
 msgctxt "HEADER"
 msgid "Description"
-msgstr "概�"
+msgstr "説明"
 
 #. TRANS: Activity title when marking a notice as favorite.
 msgid "Favor"
@@ -6901,66 +6183,69 @@ msgstr "�気�入り"
 
 #. TRANS: Ntofication given when a user marks a notice as favorite.
 #. TRANS: %1$s is a user nickname or full name, %2$s is a notice URI.
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s marked notice %2$s as a favorite."
-msgstr "%s (@%s) ��気�入り���������や�を加����"
+msgstr "%1$s ��気�入り���������や� %2$s をマーク����。"
 
 #. TRANS: Server exception thrown when a URL cannot be processed.
 #, php-format
 msgid "Cannot process URL '%s'"
-msgstr ""
+msgstr "URL '%s' を処��る�������ん。"
 
 #. TRANS: Server exception thrown when... Robin thinks something is impossible!
 msgid "Robin thinks something is impossible."
 msgstr ""
 
-#. TRANS: Message given if an upload is larger than the configured maximum.
-#. TRANS: %1$d is the byte limit for uploads, %2$d is the byte count for the uploaded file.
-#. TRANS: %1$s is used for plural.
-#, fuzzy, php-format
-msgid ""
-"No file may be larger than %1$d byte and the file you sent was %2$d bytes. "
-"Try to upload a smaller version."
-msgid_plural ""
-"No file may be larger than %1$d bytes and the file you sent was %2$d bytes. "
-"Try to upload a smaller version."
+#. TRANS: Message used to be inserted as %2$s in  the text "No file may
+#. TRANS: be larger than %1$d byte and the file you sent was %2$s.".
+#. TRANS: %1$d is the number of bytes of an uploaded file.
+#, php-format
+msgid "%1$d byte"
+msgid_plural "%1$d bytes"
+msgstr[0] ""
+
+#. TRANS: Message given if an upload is larger than the configured maximum.
+#. TRANS: %1$d (used for plural) is the byte limit for uploads,
+#. TRANS: %2$s is the proper form of "n bytes". This is the only ways to have
+#. TRANS: gettext support multiple plurals in the same message, unfortunately...
+#, php-format
+msgid ""
+"No file may be larger than %1$d byte and the file you sent was %2$s. Try to "
+"upload a smaller version."
+msgid_plural ""
+"No file may be larger than %1$d bytes and the file you sent was %2$s. Try to "
+"upload a smaller version."
 msgstr[0] ""
-"�ん�ファイルも %d �イトより大��������ん������������"
-"ファイル� %d �イト���。より����ージョンをアップロード�るよ����"
-"����。"
 
 #. TRANS: Message given if an upload would exceed user quota.
 #. TRANS: %d (number) is the user quota in bytes and is used for plural.
-#, fuzzy, php-format
+#, php-format
 msgid "A file this large would exceed your user quota of %d byte."
 msgid_plural "A file this large would exceed your user quota of %d bytes."
 msgstr[0] ""
-"�れ��大��ファイル�����%d�イト�ユーザ割当�を超���る��ょ�。"
 
 #. TRANS: Message given id an upload would exceed a user's monthly quota.
 #. TRANS: $d (number) is the monthly user quota in bytes and is used for plural.
-#, fuzzy, php-format
+#, php-format
 msgid "A file this large would exceed your monthly quota of %d byte."
 msgid_plural "A file this large would exceed your monthly quota of %d bytes."
 msgstr[0] ""
-"�れ��大��ファイル�����%d�イト�毎月�割当�を超���る��ょ�。"
 
 #. TRANS: Client exception thrown if a file upload does not have a valid name.
-#, fuzzy
 msgid "Invalid filename."
-msgstr "�正�サイズ。"
+msgstr "無効�ファイル���。"
 
 #. TRANS: Exception thrown providing an invalid profile ID.
 #. TRANS: %s is the invalid profile ID.
 #, php-format
 msgid "Profile ID %s is invalid."
-msgstr ""
+msgstr "プロファイル ID %s �無効��。"
 
 #. TRANS: Exception thrown providing an invalid group ID.
 #. TRANS: %s is the invalid group ID.
-#, fuzzy, php-format
+#, php-format
 msgid "Group ID %s is invalid."
-msgstr "ユーザ�存エラー; �正�ユーザ"
+msgstr "グループ ID %s �無効��。"
 
 #. TRANS: Exception thrown when joining a group fails.
 msgid "Group join failed."
@@ -6982,12 +6267,11 @@ msgstr "�加"
 #. TRANS: %1$s is the member name, %2$s is the subscribed group's name.
 #, php-format
 msgid "%1$s has joined group %2$s."
-msgstr ""
+msgstr "%1$s �グループ %2$s ��加����。"
 
 #. TRANS: Server exception thrown when updating a local group fails.
-#, fuzzy
 msgid "Could not update local group."
-msgstr "グループを更新����ん。"
+msgstr "ローカルグループを更新����ん���。"
 
 #. TRANS: Exception thrown when trying creating a login token failed.
 #. TRANS: %s is the user nickname for which token creation failed.
@@ -6995,9 +6279,14 @@ msgstr "グループを更新����ん。"
 msgid "Could not create login token for %s"
 msgstr "%s 用�ログイン・トークンを作�����ん���"
 
+#. TRANS: Exception thrown when a program code class (%s) cannot be instantiated.
+#, php-format
+msgid "Cannot instantiate class %s."
+msgstr "クラス %s をインスタンス化�る�������ん。"
+
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.
 msgid "No database name or DSN found anywhere."
-msgstr ""
+msgstr "データベース���� DSN �見��り��ん。"
 
 #. TRANS: Client exception thrown when a user tries to send a direct message while being banned from sending them.
 msgid "You are banned from sending direct messages."
@@ -7015,12 +6304,12 @@ msgstr "新��URI�メッセージをアップデート����ん��
 #. TRANS: %1$d is a profile ID (number), %2$d is a notice ID (number).
 #, php-format
 msgid "No such profile (%1$d) for notice (%2$d)."
-msgstr ""
+msgstr "��や� (%2$d) �プロファイル (%1$d) ��り��ん。"
 
 #. TRANS: Server exception. %s are the error details.
-#, fuzzy, php-format
+#, php-format
 msgid "Database error inserting hashtag: %s."
-msgstr "OAuth アプリケーションユーザ�追加時ＤＢエラー。"
+msgstr "�ッシュタグ�挿入時�データベースエラー: %s"
 
 #. TRANS: Client exception thrown if a notice contains too many characters.
 msgid "Problem saving notice. Too long."
@@ -7028,7 +6317,7 @@ msgstr "��や�を�存�る際��題�発生����。長��
 
 #. TRANS: Client exception thrown when trying to save a notice for an unknown user.
 msgid "Problem saving notice. Unknown user."
-msgstr "��や�を�存�る際��題�発生����。�明�ユーザ��。"
+msgstr "��や�を�存�る際��題�発生����。�明�ユーザー��。"
 
 #. TRANS: Client exception thrown when a user tries to post too many notices in a given time frame.
 msgid ""
@@ -7049,34 +6338,30 @@ msgid "You are banned from posting notices on this site."
 msgstr "������サイト���や�を投稿�る���止�れ����。"
 
 #. TRANS: Client exception thrown in notice when trying to repeat a missing or deleted notice.
-#, fuzzy
 msgid "Cannot repeat; original notice is missing or deleted."
-msgstr "������や�を繰り返���ん。"
+msgstr "リピート�����ん。元���や��見��ら���削除�れ����。"
 
 #. TRANS: Client error displayed when trying to repeat an own notice.
-#, fuzzy
 msgid "You cannot repeat your own notice."
-msgstr "自分���や��繰り返���ん。"
+msgstr "自分���や�をリピート�る�������ん。"
 
 #. TRANS: Client error displayed when trying to repeat a non-public notice.
-#, fuzzy
 msgid "Cannot repeat a private notice."
-msgstr "������や�を繰り返���ん。"
+msgstr "プライベート���や�をリピート�る�������ん。"
 
 #. TRANS: Client error displayed when trying to repeat a notice you cannot access.
-#, fuzzy
 msgid "Cannot repeat a notice you cannot read."
-msgstr "������や�を繰り返���ん。"
+msgstr "����読む���������や��リピート�る�������ん。"
 
 #. TRANS: Client error displayed when trying to repeat an already repeated notice.
 msgid "You already repeated that notice."
-msgstr "�������や�を繰り返�����。"
+msgstr "既�����や�をリピート�����。"
 
 #. TRANS: Client error displayed when trying to reply to a notice a the target has no access to.
 #. TRANS: %1$s is a user nickname, %2$d is a notice ID (number).
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s has no access to notice %2$d."
-msgstr "利用者�����や�����ん"
+msgstr "%1$s ���や� %2$d �アクセス�る�������ん。"
 
 #. TRANS: Server exception thrown when a notice cannot be saved.
 #. TRANS: Server exception thrown when a notice cannot be updated.
@@ -7089,17 +6374,17 @@ msgstr ""
 
 #. TRANS: Server exception thrown when an update for a group inbox fails.
 msgid "Problem saving group inbox."
-msgstr "グループ�信箱を�存�る際��題�発生����。"
+msgstr "グループ�信トレイを�存�る際��題�発生����。"
 
 #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
 #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
 #, php-format
 msgid "RT @%1$s %2$s"
-msgstr ""
+msgstr "RT @%1$s %2$s"
 
 #. TRANS: Full name of a profile or group (%1$s) followed by nickname (%2$s) in parentheses.
 #. TRANS: Full name of a profile or group followed by nickname in parens
-#, fuzzy, php-format
+#, php-format
 msgctxt "FANCYNAME"
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
@@ -7109,41 +6394,40 @@ msgstr "%1$s (%2$s)"
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr ""
+"ユーザー #%2$d �ロール %1$s を�り消��������ん; 存在���ん。"
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
+"ユーザー #%2$d �ロール %1$s を�り消��������ん; データベースエラー。"
 
 #. TRANS: Server exception.
 msgid "The tag you are trying to rename to already exists."
-msgstr ""
+msgstr "既�存在�るタグ����変更�よ�������。"
 
 #. TRANS: Server exception saving new tag without having a tagger specified.
 #, fuzzy
 msgid "No tagger specified."
-msgstr "グループ記述��り��ん。"
+msgstr "No tagger specified."
 
 #. TRANS: Server exception saving new tag without having a tag specified.
 #, fuzzy
 msgid "No tag specified."
-msgstr "グループ記述��り��ん。"
+msgstr "No tag specified."
 
 #. TRANS: Server exception saving new tag.
-#, fuzzy
 msgid "Could not create profile tag."
-msgstr "プロフィールを�存����ん���。"
+msgstr "プロファイルタグを作��る�������ん���。"
 
 #. TRANS: Server exception saving new tag.
-#, fuzzy
 msgid "Could not set profile tag URI."
-msgstr "プロフィールを�存����ん���。"
+msgstr "プロファイルタグ URI を設定�る�������ん���。"
 
 #. TRANS: Server exception saving new tag.
-#, fuzzy
 msgid "Could not set profile tag mainpage."
-msgstr "プロフィールを�存����ん���。"
+msgstr "プロファイルタグメインページを設定�る�������ん���。"
 
 #. TRANS: Client exception thrown trying to set more tags than allowed.
 #, php-format
@@ -7156,40 +6440,36 @@ msgstr ""
 #, php-format
 msgid ""
 "You already have %1$d or more people in list %2$s, which is the maximum "
-"allowed number.Try unlisting others first."
+"allowed number. Try unlisting others first."
 msgstr ""
 
 #. TRANS: Exception thrown when inserting a list subscription in the database fails.
-#, fuzzy
 msgid "Adding list subscription failed."
-msgstr "フォローを�存����ん。"
+msgstr "リスト�フォロー�追加�����ん���。"
 
 #. TRANS: Exception thrown when deleting a list subscription from the database fails.
-#, fuzzy
 msgid "Removing list subscription failed."
-msgstr "フォローを�存����ん。"
+msgstr "リスト�フォロー�解除�����ん���。"
 
 #. TRANS: Exception thrown when a right for a non-existing user profile is checked.
-#, fuzzy
 msgid "Missing profile."
-msgstr "ユーザ�プロフィールをも�����ん。"
+msgstr "�明�プロファイル。"
 
 #. TRANS: Exception thrown when a tag cannot be saved.
 msgid "Unable to save tag."
-msgstr "タグをを�存����ん。"
+msgstr "タグを�存����ん。"
 
 #. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
-#. TRANS: Error message displayed to a banned user when they try to subscribe.
 msgid "You have been banned from subscribing."
 msgstr "����フォロー��止�れ���。"
 
 #. TRANS: Exception thrown when trying to subscribe while already subscribed.
 msgid "Already subscribed!"
-msgstr "���フォロー�����!"
+msgstr "既�フォロー������"
 
 #. TRANS: Exception thrown when trying to subscribe to a user who has blocked the subscribing user.
 msgid "User has blocked you."
-msgstr "ユーザ����をブロック����。"
+msgstr "ユーザー����をブロック����。"
 
 #. TRANS: Exception thrown when trying to unsibscribe without a subscription.
 msgid "Not subscribed!"
@@ -7197,33 +6477,28 @@ msgstr "フォロー�����ん�"
 
 #. TRANS: Exception thrown when trying to unsubscribe a user from themselves.
 msgid "Could not delete self-subscription."
-msgstr "フォローを�存����ん。"
-
-#. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
-msgid "Could not delete subscription OMB token."
-msgstr "フォローを�存����ん。"
+msgstr "自身�フォローを削除����ん。"
 
 #. TRANS: Exception thrown when a subscription could not be deleted on the server.
 msgid "Could not delete subscription."
-msgstr "フォローを�存����ん。"
+msgstr "フォローを削除����ん。"
 
 #. TRANS: Activity title when subscribing to another person.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Follow"
-msgstr "許�"
+msgstr "フォロー"
 
 #. TRANS: Notification given when one person starts following another.
 #. TRANS: %1$s is the subscriber, %2$s is the subscribed.
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s is now following %2$s."
-msgstr "%1$s � %2$s �������や�を������。"
+msgstr "%1$s � %2$s �フォロー�����。"
 
 #. TRANS: Notice given on user registration.
 #. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
 #, php-format
 msgid "Welcome to %1$s, @%2$s!"
-msgstr "よ��� %1$s�@%2$s!"
+msgstr "よ��� %1$s�@%2$s�"
 
 #. TRANS: Exception thrown when trying view "repeated to me".
 msgid "Not implemented since inbox change."
@@ -7231,11 +6506,24 @@ msgstr ""
 
 #. TRANS: Server exception.
 msgid "No single user defined for single-user mode."
-msgstr "single-user　モード����シングルユーザ�定義�れ����ん。"
+msgstr "single-user　モード����シングルユーザー�定義�れ����ん。"
 
 #. TRANS: Server exception.
 msgid "Single-user mode code called when not enabled."
 msgstr ""
+"有効����������シングルユーザーモード�コード�呼�出�れ��。"
+
+#. TRANS: Information on password recovery form if no known username or e-mail address was specified.
+msgid "No user with that email address or username."
+msgstr "��メールアドレス�ユーザー�をも���るユーザー��り��ん。"
+
+#. TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.
+msgid "No registered email address for that user."
+msgstr "��ユーザー��メールアドレス�登録��り��ん。"
+
+#. TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.
+msgid "Error saving address confirmation."
+msgstr "アドレス確��存エラー"
 
 #. TRANS: Server exception thrown when creating a group failed.
 msgid "Could not create group."
@@ -7243,84 +6531,75 @@ msgstr "グループを作�����ん。"
 
 #. TRANS: Server exception thrown when updating a group URI failed.
 msgid "Could not set group URI."
-msgstr "グループを作�����ん。"
+msgstr "グループ� URI を設定����ん。"
 
 #. TRANS: Server exception thrown when setting group membership failed.
 msgid "Could not set group membership."
 msgstr "グループメン�ーシップをセット����ん。"
 
 #. TRANS: Server exception thrown when saving local group information failed.
-#, fuzzy
 msgid "Could not save local group info."
-msgstr "フォローを�存����ん。"
+msgstr "ローカルグループ情報を�存�る�������ん���。"
 
 #. TRANS: Exception thrown when an account could not be located when it should be moved.
 #. TRANS: %s is the remote site.
-#, fuzzy, php-format
+#, php-format
 msgid "Cannot locate account %s."
-msgstr "ユーザを削除����ん"
+msgstr "%s �アカウントを見��る�������ん���。"
 
 #. TRANS: Exception thrown when a service document could not be located account move.
 #. TRANS: %s is the remote site.
 #, php-format
 msgid "Cannot find XRD for %s."
-msgstr ""
+msgstr "%s � XRD を見��る�������ん���。"
 
 #. TRANS: Exception thrown when an account could not be located when it should be moved.
 #. TRANS: %s is the remote site.
 #, php-format
 msgid "No AtomPub API service for %s."
-msgstr ""
+msgstr "%s � AtomPub API サービス��り��ん。"
 
 #. TRANS: H2 for user actions in a profile.
 #. TRANS: H2 for entity actions in a profile.
 msgid "User actions"
-msgstr "利用者アクション"
+msgstr "ユーザー��作"
 
 #. TRANS: Text shown in user profile of not yet compeltely deleted users.
 msgid "User deletion in progress..."
-msgstr ""
+msgstr "ユーザー�削除中..."
 
 #. TRANS: Link title for link on user profile.
-#, fuzzy
 msgid "Edit profile settings."
-msgstr "プロファイル設定編集"
+msgstr "プロファイル�設定を編集�る。"
 
 #. TRANS: Link text for link on user profile.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Edit"
 msgstr "編集"
 
 #. TRANS: Link title for link on user profile.
-#, fuzzy
 msgid "Send a direct message to this user."
-msgstr "��利用者�ダイレクトメッセージを�る"
+msgstr "��ユーザー�ダイレクトメッセージを�る。"
 
 #. TRANS: Link text for link on user profile.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Message"
 msgstr "メッセージ"
 
 #. TRANS: Label text on user profile to select a user role.
-#, fuzzy
 msgid "Moderate"
 msgstr "管�"
 
 #. TRANS: Label text on user profile to select a user role.
-#, fuzzy
 msgid "User role"
-msgstr "ユーザプロファイル"
+msgstr "ユーザー�ロール"
 
 #. TRANS: Role that can be set for a user profile.
-#, fuzzy
 msgctxt "role"
 msgid "Administrator"
 msgstr "管�者"
 
 #. TRANS: Role that can be set for a user profile.
-#, fuzzy
 msgctxt "role"
 msgid "Moderator"
 msgstr "管�"
@@ -7328,7 +6607,7 @@ msgstr "管�"
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
 #, php-format
 msgid "%1$s - %2$s"
-msgstr ""
+msgstr "%1$s - %2$s"
 
 #. TRANS: Page title for a page without a title set.
 msgid "Untitled page"
@@ -7337,10 +6616,9 @@ msgstr "�称未設定ページ"
 #. TRANS: Localized tooltip for '...' expansion button on overlong remote messages.
 msgctxt "TOOLTIP"
 msgid "Show more"
-msgstr ""
+msgstr "�ら�表示"
 
 #. TRANS: Inline reply form submit button: submits a reply comment.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Reply"
 msgstr "返信"
@@ -7348,25 +6626,24 @@ msgstr "返信"
 #. TRANS: Placeholder text for inline reply form. Clicking in this box will turn it into a mini notice form.
 #. TRANS: Field label for reply mini form.
 msgid "Write a reply..."
-msgstr ""
+msgstr "返事を書�..."
 
 #. TRANS: Tab on the notice form.
-#, fuzzy
 msgctxt "TAB"
 msgid "Status"
-msgstr "StatusNet"
+msgstr "ステータス"
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
 "broughtby%%](%%site.broughtbyurl%%)."
 msgstr ""
 "**%%site.name%%** � [%%site.broughtby%%](%%site.broughtbyurl%%) ��供�るマ"
-"イクロブログサービス��。 "
+"イクロブログサービス��。"
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
 #, php-format
@@ -7383,9 +6660,9 @@ msgid ""
 "s, available under the [GNU Affero General Public License](http://www.fsf."
 "org/licensing/licenses/agpl-3.0.html)."
 msgstr ""
-"マイクロブロギングソフト [StatusNet](http://status.net/) , �ージョン %s �動"
-"�����。 ライセンス [GNU Affero General Public License](http://www.fsf."
-"org/licensing/licenses/agpl-3.0.html)。"
+"マイクロブログソフト [StatusNet](http://status.net/) , �ージョン %s �動��"
+"���。 ライセンス [GNU Affero General Public License](http://www.fsf.org/"
+"licensing/licenses/agpl-3.0.html)。"
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
@@ -7424,23 +6701,21 @@ msgid "Expecting a root feed element but got a whole XML document."
 msgstr ""
 
 #. TRANS: Client exception thrown when using an unknown verb for the activity importer.
-#, fuzzy, php-format
+#, php-format
 msgid "Unknown verb: \"%s\"."
-msgstr "�明�言語 \"%s\""
+msgstr "�明�動作: \"%s\"。"
 
 #. TRANS: Client exception thrown when trying to force a subscription for an untrusted user.
 msgid "Cannot force subscription for untrusted user."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to force a remote user to subscribe.
-#, fuzzy
 msgid "Cannot force remote user to subscribe."
-msgstr "フォロー�る利用者���を指定������"
+msgstr "リモートユーザー�フォローを強制�る�������ん。"
 
 #. TRANS: Client exception thrown when trying to subscribe to an unknown profile.
-#, fuzzy
 msgid "Unknown profile."
-msgstr "�明�ファイルタイプ"
+msgstr "�明�プロファイル��。"
 
 #. TRANS: Client exception thrown when trying to import an event not related to the importing user.
 msgid "This activity seems unrelated to our user."
@@ -7448,12 +6723,11 @@ msgstr ""
 
 #. TRANS: Client exception thrown when trying to join a remote group that is not a group.
 msgid "Remote profile is not a group!"
-msgstr ""
+msgstr "リモートプロファイル�グループ���り��ん�"
 
 #. TRANS: Client exception thrown when trying to join a group the importing user is already a member of.
-#, fuzzy
 msgid "User is already a member of this group."
-msgstr "�����グループ�メン�ー��。"
+msgstr "ユーザー�既���グループ�メン�ー��。"
 
 #. TRANS: Client exception thrown when trying to import a notice by another user.
 #. TRANS: %1$s is the source URI of the notice, %2$s is the URI of the author.
@@ -7467,14 +6741,14 @@ msgstr ""
 
 #. TRANS: Client exception thrown when trying to import a notice without content.
 #. TRANS: %s is the notice URI.
-#, fuzzy, php-format
+#, php-format
 msgid "No content for notice %s."
-msgstr "��や��内容を探�"
+msgstr "��や��内容��り��ん %s。"
 
 #. TRANS: Exception thrown if a non-existing user is provided. %s is a user ID.
-#, fuzzy, php-format
+#, php-format
 msgid "No such user \"%s\"."
-msgstr "��よ��ユーザ����ん。"
+msgstr "ユーザー \"%s\" ����ん。"
 
 #. TRANS: Client exception thrown when post to collection fails with a 400 status.
 #. TRANS: %1$s is a URL, %2$s is the status, %s$s is the fail reason.
@@ -7482,10 +6756,10 @@ msgstr "��よ��ユーザ����ん。"
 #. TRANS: %1$s is a URL, %2$s is the status, %s$s is the fail reason.
 #. TRANS: Exception thrown when post to collection fails with a status that is not handled.
 #. TRANS: %1$s is a URL, %2$s is the status, %s$s is the fail reason.
-#, fuzzy, php-format
+#, php-format
 msgctxt "URLSTATUSREASON"
 msgid "%1$s %2$s %3$s"
-msgstr "%1$s (%2$s)"
+msgstr "%1$s %2$s %3$s"
 
 #. TRANS: Client exception thrown when there is no source attribute.
 msgid "Can't handle remote content yet."
@@ -7515,29 +6789,12 @@ msgstr "showForm() �実装�れ����ん。"
 msgid "saveSettings() not implemented."
 msgstr "saveSettings() �実装�れ����ん。"
 
-#. TRANS: Client error message thrown if design settings could not be deleted in
-#. TRANS: the admin panel Design.
-msgid "Unable to delete design setting."
-msgstr "デザイン設定を削除����ん。"
-
 #. TRANS: Header in administrator navigation panel.
-#. TRANS: Header in settings navigation panel.
-#, fuzzy
 msgctxt "HEADER"
 msgid "Home"
-msgstr "ホームページ"
-
-#. TRANS: Menu item in administrator navigation panel.
-#. TRANS: Menu item in default local navigation panel.
-#. TRANS: Menu item in personal group navigation menu.
-#. TRANS: Menu item in settings navigation panel.
-#, fuzzy
-msgctxt "MENU"
-msgid "Home"
-msgstr "ホームページ"
+msgstr "ホーム"
 
 #. TRANS: Header in administrator navigation panel.
-#, fuzzy
 msgctxt "HEADER"
 msgid "Admin"
 msgstr "管�者"
@@ -7547,39 +6804,24 @@ msgid "Basic site configuration"
 msgstr "基本サイト設定"
 
 #. TRANS: Menu item in administrator navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Site"
 msgstr "サイト"
 
-#. TRANS: Menu item title in administrator navigation panel.
-msgid "Design configuration"
-msgstr "デザイン設定"
-
-#. TRANS: Menu item in administrator navigation panel.
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: Menu item in settings navigation panel.
-#, fuzzy
-msgctxt "MENU"
-msgid "Design"
-msgstr "デザイン"
-
 #. TRANS: Menu item title in administrator navigation panel.
 msgid "User configuration"
-msgstr "ユーザ設定"
+msgstr "ユーザー設定"
 
 #. TRANS: Menu item in administrator navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "User"
-msgstr "ユーザ"
+msgstr "ユーザー"
 
 #. TRANS: Menu item title in administrator navigation panel.
 msgid "Access configuration"
 msgstr "アクセス設定"
 
 #. TRANS: Menu item in administrator navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Access"
 msgstr "アクセス"
@@ -7589,7 +6831,6 @@ msgid "Paths configuration"
 msgstr "パス設定"
 
 #. TRANS: Menu item in administrator navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Paths"
 msgstr "パス"
@@ -7599,50 +6840,42 @@ msgid "Sessions configuration"
 msgstr "セッション設定"
 
 #. TRANS: Menu item in administrator navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Sessions"
 msgstr "セッション"
 
 #. TRANS: Menu item title in administrator navigation panel.
-#, fuzzy
 msgid "Edit site notice"
-msgstr "サイト��や�"
+msgstr "サイト��知ら�を編集"
 
 #. TRANS: Menu item in administrator navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Site notice"
-msgstr "サイト��や�"
+msgstr "サイト��知ら�"
 
 #. TRANS: Menu item title in administrator navigation panel.
-#, fuzzy
 msgid "Snapshots configuration"
-msgstr "パス設定"
+msgstr "スナップショット�設定"
 
 #. TRANS: Menu item in administrator navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Snapshots"
 msgstr "スナップショット"
 
 #. TRANS: Menu item title in administrator navigation panel.
 msgid "Set site license"
-msgstr ""
+msgstr "サイト�ライセンスを設定"
 
 #. TRANS: Menu item in administrator navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "License"
 msgstr "ライセンス"
 
 #. TRANS: Menu item title in administrator navigation panel.
-#, fuzzy
 msgid "Plugins configuration"
-msgstr "パス設定"
+msgstr "プラグイン�設定"
 
 #. TRANS: Menu item in administrator navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Plugins"
 msgstr "プラグイン"
@@ -7655,62 +6888,25 @@ msgstr ""
 
 #. TRANS: OAuth exception thrown when no application is found for a given consumer key.
 msgid "No application for that consumer key."
-msgstr ""
+msgstr "コンシューマーキー無��アプリケーション"
 
 #. TRANS: Authorization exception thrown when a user without API access tries to access the API.
 msgid "Not allowed to use API."
-msgstr ""
+msgstr "API �使用�許��れ����ん。"
 
 #. TRANS: OAuth exception given when an incorrect access token was given for a user.
 msgid "Bad access token."
-msgstr ""
+msgstr "�正�アクセストークン"
 
 #. TRANS: OAuth exception given when no user was found for a given token (no token was found).
 msgid "No user for that token."
-msgstr ""
+msgstr "��トークン�ユーザー����ん。"
 
 #. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel".
 #. TRANS: Client error thrown when authentication fails.
 msgid "Could not authenticate you."
 msgstr ""
 
-#. TRANS: Server error displayed when trying to create an anynymous OAuth consumer.
-#, fuzzy
-msgid "Could not create anonymous consumer."
-msgstr "別�を作�����ん。"
-
-#. TRANS: Server error displayed when trying to create an anynymous OAuth application.
-#, fuzzy
-msgid "Could not create anonymous OAuth application."
-msgstr "アプリケーションを作�����ん。"
-
-#. TRANS: Exception thrown when no token association could be found.
-msgid ""
-"Could not find a profile and application associated with the request token."
-msgstr ""
-
-#. TRANS: Exception thrown when no access token can be issued.
-#, fuzzy
-msgid "Could not issue access token."
-msgstr "メッセージを追加����ん。"
-
-#. TRANS: Exception thrown when a database error occurs.
-msgid "Database error inserting OAuth application user."
-msgstr "OAuth アプリケーションユーザ�追加時ＤＢエラー。"
-
-#. TRANS: Exception thrown when a database error occurs.
-#, fuzzy
-msgid "Database error updating OAuth application user."
-msgstr "OAuth アプリケーションユーザ�追加時ＤＢエラー。"
-
-#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
-msgid "Tried to revoke unknown token."
-msgstr ""
-
-#. TRANS: Exception thrown when an attempt is made to remove a revoked token.
-msgid "Failed to delete revoked token."
-msgstr ""
-
 #. TRANS: Form input field label for application icon.
 msgid "Icon"
 msgstr "アイコン"
@@ -7725,10 +6921,10 @@ msgstr "��"
 
 #. TRANS: Form input field instructions.
 #. TRANS: %d is the number of available characters for the description.
-#, fuzzy, php-format
+#, php-format
 msgid "Describe your application in %d character"
 msgid_plural "Describe your application in %d characters"
-msgstr[0] "����アプリケーションを %d 字以内記述"
+msgstr[0] ""
 
 #. TRANS: Form input field instructions.
 msgid "Describe your application"
@@ -7739,7 +6935,7 @@ msgstr "����アプリケーションを記述"
 #. TRANS: Field label for description of list.
 #. TRANS: Dropdown option for searching in profiles.
 msgid "Description"
-msgstr "概�"
+msgstr "説明"
 
 #. TRANS: Form input field instructions.
 msgid "URL of the homepage of this application"
@@ -7792,18 +6988,16 @@ msgstr ""
 "ライト"
 
 #. TRANS: Submit button title.
-msgid "Cancel"
-msgstr "中止"
+msgid "Cancel application changes."
+msgstr "アプリケーション�変更をキャンセル�る"
 
 #. TRANS: Submit button title.
-#. TRANS: Button text to save a list.
-msgid "Save"
-msgstr "�存"
+msgid "Save application changes."
+msgstr "アプリケーションを変更を�存�る。"
 
 #. TRANS: Name for an anonymous application in application list.
-#, fuzzy
 msgid "Unknown application"
-msgstr "�明�アクション"
+msgstr "�明�アプリケーション"
 
 #. TRANS: Message has a leading space and a trailing space. Used in application list.
 #. TRANS: Before this message the application name is put, behind it the organisation that manages it.
@@ -7811,50 +7005,59 @@ msgid " by "
 msgstr ""
 
 #. TRANS: Application access type
-#, fuzzy
 msgid "read-write"
 msgstr "リードライト"
 
 #. TRANS: Application access type
-#, fuzzy
 msgid "read-only"
 msgstr "リードオンリー"
 
 #. TRANS: Used in application list. %1$s is a modified date, %2$s is access type ("read-write" or "read-only")
 #, php-format
 msgid "Approved %1$s - \"%2$s\" access."
-msgstr ""
+msgstr "%1$s �承� - \"%2$s\" �アクセス。"
 
 #. TRANS: Access token in the application list.
 #. TRANS: %s are the first 7 characters of the access token.
 #, php-format
 msgid "Access token starting with: %s"
-msgstr ""
+msgstr "アクセストークン�先頭文字列: %s"
 
 #. TRANS: Button label in application list to revoke access to user data.
 msgctxt "BUTTON"
 msgid "Revoke"
-msgstr "回復"
+msgstr "�消"
+
+#. TRANS: Submit button text to accept a group membership request on approve group form.
+#. TRANS: Submit button text to accept a subscription request on approve sub form.
+msgctxt "BUTTON"
+msgid "Accept"
+msgstr "承�"
+
+#. TRANS: Submit button text to reject a group membership request on approve group form.
+#. TRANS: Submit button text to reject a subscription request on approve sub form.
+msgctxt "BUTTON"
+msgid "Reject"
+msgstr "拒�"
 
 #. TRANS: Atom feed exception thrown when an author element does not contain a name element.
 msgid "Author element must contain a name element."
 msgstr ""
 
 #. TRANS: Server exception thrown when using the method setActivitySubject() in the class Atom10Feed.
-#, fuzzy
 msgid "Do not use this method!"
-msgstr "����や�を削除����ん。"
+msgstr "��メソッド�使用���������"
 
 #. TRANS: Title in atom list notice feed. %1$s is a list name, %2$s is a tagger's nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "Timeline for people in list %1$s by %2$s"
-msgstr "%2$s 上� %1$s ��返信!"
+msgstr "%2$s �よるリスト %1$s �人々�タイムライン"
 
 #. TRANS: Message is used as a subtitle in atom list notice feed.
 #. TRANS: %1$s is a tagger's nickname, %2$s is a list name, %3$s is a site name.
-#, fuzzy, php-format
+#, php-format
 msgid "Updates from %1$s's list %2$s on %3$s!"
-msgstr "%1$s �ら %2$s  上�更新を����!"
+msgstr "%3$s � %1$s �リスト %2$s  を更新を�����"
 
 #. TRANS: Title.
 msgid "Notices where this attachment appears"
@@ -7865,14 +7068,12 @@ msgid "Tags for this attachment"
 msgstr "��添付�タグ"
 
 #. TRANS: Exception thrown when a password change fails.
-#, fuzzy
 msgid "Password changing failed."
-msgstr "パスワード変更�失敗����"
+msgstr "パスワード変更�失敗����。"
 
 #. TRANS: Exception thrown when a password change attempt fails because it is not allowed.
-#, fuzzy
 msgid "Password changing is not allowed."
-msgstr "パスワード変更�許��れ����ん"
+msgstr "パスワード変更�許��れ����ん。"
 
 #. TRANS: Title for the form to block a user.
 msgid "Block"
@@ -7880,27 +7081,25 @@ msgstr "ブロック"
 
 #. TRANS: Description of the form to block a user.
 msgid "Block this user"
-msgstr "��ユーザをブロック�る"
+msgstr "��ユーザーをブロック�る"
 
 #. TRANS: Submit button text on form to cancel group join request.
 msgctxt "BUTTON"
 msgid "Cancel join request"
-msgstr ""
+msgstr "�加リクエストをキャンセル"
 
 #. TRANS: Button text for form action to cancel a subscription request.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Cancel subscription request"
-msgstr "����フォロー"
+msgstr "フォローリクエストをキャンセル���"
 
 #. TRANS: Title for command results.
 msgid "Command results"
 msgstr "コマンド�果"
 
 #. TRANS: Title for command results.
-#, fuzzy
 msgid "AJAX error"
-msgstr "Ajax エラー"
+msgstr "AJAX エラー"
 
 #. TRANS: E-mail subject when a command has completed.
 #. TRANS: E-mail subject for reply to an e-mail command.
@@ -7912,27 +7111,25 @@ msgid "Command failed"
 msgstr "コマンド失敗"
 
 #. TRANS: Command exception text shown when a notice ID is requested that does not exist.
-#, fuzzy
 msgid "Notice with that id does not exist."
-msgstr "�� ID �よる��や��存在�����ん"
+msgstr "�� id ���や��存在�����ん。"
 
 #. TRANS: Command exception text shown when a last user notice is requested and it does not exist.
 #. TRANS: Error text shown when a last user notice is requested and it does not exist.
-#, fuzzy
 msgid "User has no last notice."
-msgstr "利用者�����や�����ん"
+msgstr "ユーザー�����や�����ん。"
 
 #. TRANS: Message given requesting a profile for a non-existing user.
 #. TRANS: %s is the nickname of the user for which the profile could not be found.
-#, fuzzy, php-format
+#, php-format
 msgid "Could not find a user with nickname %s."
-msgstr "ユーザを更新����ん"
+msgstr "ニック�ーム %s �ユーザーを見��る�������ん���。"
 
 #. TRANS: Message given getting a non-existing user.
 #. TRANS: %s is the nickname of the user that could not be found.
 #, php-format
 msgid "Could not find a local user with nickname %s."
-msgstr ""
+msgstr "ニック�ーム %s �ローカルユーザー�見��り��ん���。"
 
 #. TRANS: Error text shown when an unimplemented command is given.
 msgid "Sorry, this command is not yet implemented."
@@ -7940,11 +7137,11 @@ msgstr "����ん���コマンド���実装�れ����ん
 
 #. TRANS: Command exception text shown when a user tries to nudge themselves.
 msgid "It does not make a lot of sense to nudge yourself!"
-msgstr "�れ�自分自身���図�多���味��り��ん!"
+msgstr "�れ�自分自身���図�多���味��り��ん�"
 
 #. TRANS: Message given having nudged another user.
 #. TRANS: %s is the nickname of the user that was nudged.
-#, fuzzy, php-format
+#, php-format
 msgid "Nudge sent to %s."
 msgstr "%s ��図を�り���"
 
@@ -7963,9 +7160,8 @@ msgstr ""
 "��や�: %3$s"
 
 #. TRANS: Error message text shown when a favorite could not be set because it has already been favorited.
-#, fuzzy
 msgid "Could not create favorite: Already favorited."
-msgstr "�気�入りを作�����ん。"
+msgstr "�気�入りを作�����ん: 既��気�入り��。"
 
 #. TRANS: Text shown when a notice has been marked as favourite successfully.
 msgid "Notice marked as fave."
@@ -7975,27 +7171,27 @@ msgstr "�気�入り��れ��る��や�。"
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
 #, php-format
 msgid "%1$s joined group %2$s."
-msgstr ""
+msgstr "%1$s �グループ %2$s ��加����。"
 
 #. TRANS: Message given having removed a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
 #, php-format
 msgid "%1$s left group %2$s."
-msgstr ""
+msgstr "%1$s �グループ%2$s を退����。"
 
 #. TRANS: Error displayed if tagging a user fails.
 #. TRANS: %1$s is the tagged user, %2$s is the error message (no punctuation).
 #, php-format
 msgid "Error tagging %1$s: %2$s"
-msgstr ""
+msgstr "タグ %1$s 付与時�エラー: %2$s"
 
 #. TRANS: Succes message displayed if tagging a user succeeds.
 #. TRANS: %1$s is the tagged user's nickname, %2$s is a list of tags.
 #. TRANS: Plural is decided based on the number of tags added (not part of message).
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s was tagged %2$s"
 msgid_plural "%1$s was tagged %2$s"
-msgstr[0] "%1$s�ページ %2$d"
+msgstr[0] ""
 
 #. TRANS: Separator for list of tags.
 #. TRANS: Separator in list of user names like "Jim, Bob, Mary".
@@ -8006,13 +7202,13 @@ msgstr ""
 #. TRANS: %s is the invalid tag.
 #, php-format
 msgid "Invalid tag: \"%s\""
-msgstr "�正�タグ: \"%s\""
+msgstr "無効�タグ: \"%s\""
 
 #. TRANS: Error displayed if untagging a user fails.
 #. TRANS: %1$s is the untagged user, %2$s is the error message (no punctuation).
 #, php-format
 msgid "Error untagging %1$s: %2$s"
-msgstr ""
+msgstr "タグ %1$s 解除時�エラー: %2$s"
 
 #. TRANS: Succes message displayed if untagging a user succeeds.
 #. TRANS: %1$s is the untagged user's nickname, %2$s is a list of tags.
@@ -8024,7 +7220,7 @@ msgstr[0] ""
 
 #. TRANS: Whois output.
 #. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#, fuzzy, php-format
+#, php-format
 msgctxt "WHOIS"
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
@@ -8065,69 +7261,66 @@ msgstr ""
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
 #. TRANS: Message given when a status is too long. %1$s is the maximum number of characters,
 #. TRANS: %2$s is the number of characters sent (used for plural).
-#, fuzzy, php-format
+#, php-format
 msgid "Message too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Message too long - maximum is %1$d characters, you sent %2$d."
-msgstr[0] "メッセージ�長���� - 最大 %1$d 字���������� %2$d。"
+msgstr[0] ""
 
 #. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
 msgid "You can't send a message to this user."
-msgstr "��ユーザ�メッセージを�る�������ん。"
+msgstr "��ユーザー�メッセージを�る�������ん。"
 
 #. TRANS: Error text shown sending a direct message fails with an unknown reason.
 msgid "Error sending direct message."
-msgstr "ダイレクトメッセージ�信エラー。"
+msgstr "ダイレクトメッセージ��信エラー��。"
 
 #. TRANS: Message given having repeated a notice from another user.
 #. TRANS: %s is the name of the user for which the notice was repeated.
-#, fuzzy, php-format
+#, php-format
 msgid "Notice from %s repeated."
-msgstr "%s �ら��や��繰り返�れ����"
+msgstr "%s ���や�をリピート�����。"
 
 #. TRANS: Message given if content of a notice for a reply is too long. %1$d is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#, fuzzy, php-format
+#, php-format
 msgid "Notice too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Notice too long - maximum is %1$d characters, you sent %2$d."
-msgstr[0] "��や��長���� - 最大 %d 字���������� %d"
+msgstr[0] ""
 
 #. TRANS: Text shown having sent a reply to a notice successfully.
 #. TRANS: %s is the nickname of the user of the notice the reply was sent to.
-#, fuzzy, php-format
+#, php-format
 msgid "Reply to %s sent."
-msgstr "%s �返信を�り���"
+msgstr "%s �返信を�り���。"
 
 #. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
 msgid "Error saving notice."
-msgstr "��や��存エラー。"
+msgstr "��や���存エラー��。"
 
 #. TRANS: Error text shown when no username was provided when issuing a subscribe command.
-#, fuzzy
 msgid "Specify the name of the user to subscribe to."
-msgstr "フォロー�る利用者���を指定������"
+msgstr "フォロー�るユーザー���を指定������。"
 
 #. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
-#, fuzzy
 msgid "Can't subscribe to OMB profiles by command."
-msgstr "������プロファイル�フォロー�れ����ん。"
+msgstr "コマンド� OMB プロファイルをフォロー�る�������ん。"
 
 #. TRANS: Text shown after having subscribed to another user successfully.
 #. TRANS: %s is the name of the user the subscription was requested for.
 #, php-format
 msgid "Subscribed to %s."
-msgstr ""
+msgstr "%s をフォロー����。"
 
 #. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
 #. TRANS: Error text shown when no username was provided when issuing the command.
-#, fuzzy
 msgid "Specify the name of the user to unsubscribe from."
-msgstr "フォローをや�るユーザ���を指定������"
+msgstr "フォローをや�るユーザー���を指定������"
 
 #. TRANS: Text shown after having unsubscribed from another user successfully.
 #. TRANS: %s is the name of the user the unsubscription was requested for.
 #, php-format
 msgid "Unsubscribed from %s."
-msgstr ""
+msgstr "%s �フォローを解除����。"
 
 #. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
 #. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
@@ -8136,7 +7329,7 @@ msgstr "コマンド���実装�れ����ん。"
 
 #. TRANS: Text shown when issuing the command "off" successfully.
 msgid "Notification off."
-msgstr "通知オフ。"
+msgstr "通知をオフ。"
 
 #. TRANS: Error text shown when the command "off" fails for an unknown reason.
 msgid "Can't turn off notification."
@@ -8144,14 +7337,13 @@ msgstr "通知をオフ����ん。"
 
 #. TRANS: Text shown when issuing the command "on" successfully.
 msgid "Notification on."
-msgstr "通知オン。"
+msgstr "通知をオン。"
 
 #. TRANS: Error text shown when the command "on" fails for an unknown reason.
 msgid "Can't turn on notification."
 msgstr "通知をオン����ん。"
 
 #. TRANS: Error text shown when issuing the login command while login is disabled.
-#, fuzzy
 msgid "Login command is disabled."
 msgstr "ログインコマンド�無効�������。"
 
@@ -8165,7 +7357,7 @@ msgstr ""
 #. TRANS: %s is the name of the user the unsubscription was requested for.
 #, php-format
 msgid "Unsubscribed %s."
-msgstr ""
+msgstr "%s �フォローを解除����。"
 
 #. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
 msgid "You are not subscribed to anyone."
@@ -8176,7 +7368,7 @@ msgstr "�����れ�もフォロー�れ����ん。"
 #. TRANS: hard coded space and a comma separated list of subscribed users.
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
-msgstr[0] "������人�フォロー�れ����:"
+msgstr[0] ""
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user
 #. TRANS: (followers) without having any subscribers.
@@ -8188,7 +7380,7 @@ msgstr "誰もフォロー�����ん。"
 #. TRANS: hard coded space and a comma separated list of subscribing users.
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
-msgstr[0] "��人�����フォロー�れ��る:"
+msgstr[0] ""
 
 #. TRANS: Text shown after requesting groups a user is subscribed to without having
 #. TRANS: any group subscriptions.
@@ -8200,33 +7392,29 @@ msgstr "������グループ�メン�ー�も�り��ん。"
 #. TRANS: hard coded space and a comma separated list of subscribed groups.
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
-msgstr[0] "������グループ�メン�ー���り��ん:"
+msgstr[0] ""
 
 #. TRANS: Header line of help text for commands.
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "Commands:"
-msgstr "コマンド�果"
+msgstr "コマンド:"
 
 #. TRANS: Help message for IM/SMS command "on".
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "turn on notifications"
-msgstr "通知をオン����ん。"
+msgstr "通知をオン����。"
 
 #. TRANS: Help message for IM/SMS command "off".
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "turn off notifications"
-msgstr "通知をオフ����ん。"
+msgstr "通知をオフ����。"
 
 #. TRANS: Help message for IM/SMS command "help".
 msgctxt "COMMANDHELP"
 msgid "show this help"
-msgstr ""
+msgstr "��ヘルプを表示"
 
 #. TRANS: Help message for IM/SMS command "follow <nickname>".
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "subscribe to user"
 msgstr "��ユーザーをフォロー"
@@ -8234,132 +7422,123 @@ msgstr "��ユーザーをフォロー"
 #. TRANS: Help message for IM/SMS command "groups".
 msgctxt "COMMANDHELP"
 msgid "lists the groups you have joined"
-msgstr ""
+msgstr "�加���るグループ�一覧を表示�る"
 
 #. TRANS: Help message for IM/SMS command "tag".
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "tag a user"
-msgstr "タグユーザ"
+msgstr "ユーザー�タグを付�る"
 
 #. TRANS: Help message for IM/SMS command "untag".
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "untag a user"
-msgstr "タグユーザ"
+msgstr "ユーザー�らタグを解除�る"
 
 #. TRANS: Help message for IM/SMS command "subscriptions".
 msgctxt "COMMANDHELP"
 msgid "list the people you follow"
-msgstr ""
+msgstr "フォロー���る人�一覧を表示�る"
 
 #. TRANS: Help message for IM/SMS command "subscribers".
 msgctxt "COMMANDHELP"
 msgid "list the people that follow you"
-msgstr ""
+msgstr "���をフォロー���る人�一覧を表示�る"
 
 #. TRANS: Help message for IM/SMS command "leave <nickname>".
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "unsubscribe from user"
-msgstr "��利用者�ら�フォローを解除�る"
+msgstr "��ユーザー�フォローを解除�る"
 
 #. TRANS: Help message for IM/SMS command "d <nickname> <text>".
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "direct message to user"
-msgstr "%s ��ダイレクトメッセージ"
+msgstr "ユーザー��ダイレクトメッセージ"
 
 #. TRANS: Help message for IM/SMS command "get <nickname>".
 msgctxt "COMMANDHELP"
 msgid "get last notice from user"
-msgstr ""
+msgstr "ユーザー�最後���や�を�得�る"
 
 #. TRANS: Help message for IM/SMS command "whois <nickname>".
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "get profile info on user"
-msgstr "プロファイル情報"
+msgstr "ユーザー�プロファイル情報を�得"
 
 #. TRANS: Help message for IM/SMS command "lose <nickname>".
 msgctxt "COMMANDHELP"
 msgid "force user to stop following you"
-msgstr ""
+msgstr "���をフォロー�る��を強制的�中止�る"
 
 #. TRANS: Help message for IM/SMS command "fav <nickname>".
 msgctxt "COMMANDHELP"
 msgid "add user's last notice as a 'fave'"
-msgstr ""
+msgstr "ユーザー�最後���や�を�気�入り�追加�る"
 
 #. TRANS: Help message for IM/SMS command "fav #<notice_id>".
 msgctxt "COMMANDHELP"
 msgid "add notice with the given id as a 'fave'"
-msgstr ""
+msgstr "id �指定����や�を�気�入り�追加�る。"
 
 #. TRANS: Help message for IM/SMS command "repeat #<notice_id>".
 msgctxt "COMMANDHELP"
 msgid "repeat a notice with a given id"
-msgstr ""
+msgstr "id �指定����や�をリピート�る"
 
 #. TRANS: Help message for IM/SMS command "repeat <nickname>".
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "repeat the last notice from user"
-msgstr "����や�を繰り返�"
+msgstr "ユーザー�最後���や�をリピート�る"
 
 #. TRANS: Help message for IM/SMS command "reply #<notice_id>".
 msgctxt "COMMANDHELP"
 msgid "reply to notice with a given id"
-msgstr ""
+msgstr "id �指定����や��返信�る"
 
 #. TRANS: Help message for IM/SMS command "reply <nickname>".
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "reply to the last notice from user"
-msgstr "����や��返信"
+msgstr "ユーザー�最後���や��返信�る"
 
 #. TRANS: Help message for IM/SMS command "join <group>".
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "join group"
-msgstr "�明"
+msgstr "グループ��加"
 
 #. TRANS: Help message for IM/SMS command "login".
 msgctxt "COMMANDHELP"
 msgid "Get a link to login to the web interface"
-msgstr ""
+msgstr "ログイン�る��� Web インターフェース��リンクを�得�る"
 
 #. TRANS: Help message for IM/SMS command "drop <group>".
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "leave group"
-msgstr "ユーザ削除"
+msgstr "グループ�ら脱退"
 
 #. TRANS: Help message for IM/SMS command "stats".
 msgctxt "COMMANDHELP"
 msgid "get your stats"
-msgstr ""
+msgstr "����統計情報を�得�る"
 
 #. TRANS: Help message for IM/SMS command "stop".
 #. TRANS: Help message for IM/SMS command "quit".
 msgctxt "COMMANDHELP"
 msgid "same as 'off'"
-msgstr ""
+msgstr "'off' ���"
 
 #. TRANS: Help message for IM/SMS command "sub <nickname>".
 msgctxt "COMMANDHELP"
 msgid "same as 'follow'"
-msgstr ""
+msgstr "'follow' ���"
 
 #. TRANS: Help message for IM/SMS command "unsub <nickname>".
 msgctxt "COMMANDHELP"
 msgid "same as 'leave'"
-msgstr ""
+msgstr "'leave' ���"
 
 #. TRANS: Help message for IM/SMS command "last <nickname>".
 msgctxt "COMMANDHELP"
 msgid "same as 'get'"
-msgstr ""
+msgstr "'get' ���"
 
 #. TRANS: Help message for IM/SMS command "on <nickname>".
 #. TRANS: Help message for IM/SMS command "off <nickname>".
@@ -8370,31 +7549,28 @@ msgstr ""
 #. TRANS: Help message for IM/SMS command "untrack all".
 #. TRANS: Help message for IM/SMS command "tracks".
 #. TRANS: Help message for IM/SMS command "tracking".
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "not yet implemented."
-msgstr "コマンド���実装�れ����ん。"
+msgstr "��実装�れ����ん。"
 
 #. TRANS: Help message for IM/SMS command "nudge <nickname>".
 msgctxt "COMMANDHELP"
 msgid "remind a user to update."
-msgstr ""
+msgstr "ユーザー�更新�る事を��出��る"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#, fuzzy
 msgid "No configuration file found."
-msgstr "コンフィギュレーションファイル��り��ん。 "
+msgstr "設定ファイル�見��り��ん���。"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: Is followed by a list of directories (separated by HTML breaks).
-#, fuzzy
 msgid "I looked for configuration files in the following places:"
-msgstr "��以下�場所�コンフィギュレーションファイルを探����: "
+msgstr "以下�場所�設定ファイルを探����:"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 msgid "You may wish to run the installer to fix this."
 msgstr ""
-"������れを修��る���インストーラを動�������る�も�れ��"
+"������れを修復�る���インストーラを実行������る�も�れ��"
 "ん。"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
@@ -8402,31 +7578,26 @@ msgstr ""
 msgid "Go to the installer."
 msgstr "インストーラ�。"
 
+#. TRANS: Header on conversation page. Hidden by default (h2).
+#. TRANS: Label for user statistics.
+msgid "Notices"
+msgstr "��や�"
+
 #. TRANS: Page title for when a database error occurs.
 msgid "Database error"
-msgstr "データベースエラー"
+msgstr "データベース エラー"
 
 #. TRANS: Menu item in default local navigation panel.
 #. TRANS: Menu item in search group navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Public"
 msgstr "パブリック"
 
-#. TRANS: Menu item in default local navigation panel.
-#. TRANS: Menu item in search group navigation panel.
-#. TRANS: Menu item in local navigation menu.
-#, fuzzy
-msgctxt "MENU"
-msgid "Groups"
-msgstr "グループ"
-
 #. TRANS: Menu item in default local navigation panel.
 #. TRANS: Menu item title in local navigation menu.
-#, fuzzy
 msgctxt "MENU"
 msgid "Lists"
-msgstr "制�"
+msgstr "リスト"
 
 #. TRANS: Title of form for deleting a user.
 #. TRANS: Link text in notice list item to delete a notice.
@@ -8435,76 +7606,39 @@ msgstr "削除"
 
 #. TRANS: Description of form for deleting a user.
 msgid "Delete this user"
-msgstr "��ユーザを削除"
-
-#. TRANS: Form legend of form for changing the page design.
-#, fuzzy
-msgid "Change design"
-msgstr "デザイン��存"
-
-#. TRANS: Fieldset legend on profile design page to change profile page colours.
-msgid "Change colours"
-msgstr "色�変更"
-
-#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-msgid "Use defaults"
-msgstr "デフォルトを使用"
-
-#. TRANS: Label in form on profile design page.
-#. TRANS: Field contains file name on user's computer that could be that user's custom profile background image.
-msgid "Upload file"
-msgstr "ファイルアップロード"
-
-#. TRANS: Instructions for form on profile design page.
-msgid ""
-"You can upload your personal background image. The maximum file size is 2MB."
-msgstr ""
-"自分��ックグラウンド画�をアップロード����。最大ファイルサイズ� 2MB �"
-"�。"
-
-#. TRANS: Radio button on profile design page that will enable use of the uploaded profile image.
-#, fuzzy
-msgctxt "RADIO"
-msgid "On"
-msgstr "オン"
-
-#. TRANS: Radio button on profile design page that will disable use of the uploaded profile image.
-#, fuzzy
-msgctxt "RADIO"
-msgid "Off"
-msgstr "オフ"
-
-#. TRANS: Success message displayed if design settings were saved after clicking "Use defaults".
-msgid "Design defaults restored."
-msgstr "デフォルト�デザインを回復。"
+msgstr "��ユーザーを削除"
 
 #. TRANS: Exception. %s is an ID.
-#, fuzzy, php-format
+#, php-format
 msgid "Unable to find services for %s."
-msgstr "アプリケーション�����消�アクセス�����ん: "
+msgstr "%s �サービスを見��る�������ん。"
 
 #. TRANS: Form legend for removing the favourite status for a favourite notice.
-#. TRANS: Title for button text for removing the favourite status for a favourite notice.
 msgid "Disfavor this notice"
 msgstr "����や���気�入りをや�る"
 
 #. TRANS: Button text for removing the favourite status for a favourite notice.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Disfavor favorite"
 msgstr "�気�入りをや�る"
 
+#. TRANS: Button title for removing the favourite status for a favourite notice.
+msgid "Remove this notice from your list of favorite notices."
+msgstr "�気�入り���や��一覧�ら�����や�を削除�る。"
+
 #. TRANS: Form legend for adding the favourite status to a notice.
-#. TRANS: Title for button text for adding the favourite status to a notice.
 msgid "Favor this notice"
 msgstr "����や�を�気�入り��る"
 
 #. TRANS: Button text for adding the favourite status to a notice.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Favor"
 msgstr "�気�入り"
 
+#. TRANS: Button title for adding the favourite status to a notice.
+msgid "Add this notice to your list of favorite notices."
+msgstr "�気�入り���や��一覧������や�を追加�る。"
+
 #. TRANS: Feed type name.
 msgid "RSS 1.0"
 msgstr "RSS 1.0"
@@ -8521,71 +7655,91 @@ msgstr "Atom"
 msgid "FOAF"
 msgstr "FOAF"
 
+#. TRANS: Feed type name. See http://activitystrea.ms/
+msgid "Activity Streams"
+msgstr ""
+
 #. TRANS: Client exception thrown when an imported feed does not have an author.
 msgid "No author in the feed."
-msgstr ""
+msgstr "フィード�著者����ん。"
 
 #. TRANS: Client exception thrown when an imported feed does not have an author that
 #. TRANS: can be associated with a user.
 msgid "Cannot import without a user."
-msgstr ""
+msgstr "ユーザー����イン�ート�����ん。"
 
 #. TRANS: Header for feed links (h2).
 msgid "Feeds"
-msgstr ""
+msgstr "フィード"
 
 #. TRANS: List element on gallery action page to show all tags.
-#, fuzzy
 msgctxt "TAGS"
 msgid "All"
-msgstr "全�"
+msgstr "���"
 
 #. TRANS: Dropdown field label on gallery action page for a list containing tags.
 msgid "Tag"
 msgstr "ã‚¿ã‚°"
 
 #. TRANS: Dropdown field title on gallery action page for a list containing tags.
-#, fuzzy
 msgid "Choose a tag to narrow list."
-msgstr "タグを�ん��リストを狭�������"
+msgstr "�定リスト�タグを�択������。"
 
 #. TRANS: Description on form for granting a role.
 #, php-format
 msgid "Grant this user the \"%s\" role"
-msgstr ""
+msgstr "��ユーザー�役割 \"%s\" を付与"
+
+#. TRANS: Header for mini list of group members on a group page (h2).
+msgid "Members"
+msgstr "メン�ー"
+
+#. TRANS: Link to all group members from mini list of group members if group has more than n members.
+msgid "All members"
+msgstr "����メン�ー"
+
+#. TRANS: Header for mini list of users with a pending membership request on a group page (h2).
+msgid "Pending"
+msgstr "�留中"
+
+#. TRANS: Header for mini list of users that are blocked in a group page (h2).
+msgid "Blocked"
+msgstr "ブロック"
+
+#. TRANS: Title for list of group administrators on a group page.
+msgctxt "TITLE"
+msgid "Admins"
+msgstr "管�者"
 
 #. TRANS: Button text for the form that will block a user from a group.
 msgctxt "BUTTON"
 msgid "Block"
-msgstr ""
+msgstr "ブロック"
 
 #. TRANS: Submit button title.
 msgctxt "TOOLTIP"
-msgid "Block this user"
+msgid "Block this user so that they can no longer post messages to it."
 msgstr ""
 
 #. TRANS: Field title on group edit form.
-#, fuzzy
 msgid "URL of the homepage or blog of the group or topic."
-msgstr "グループやトピック�ホームページやブログ� URL"
+msgstr "ホームページ�グループ�ブログ�トピック� URL。"
 
 #. TRANS: Text area title for group description when there is no text limit.
-#, fuzzy
 msgid "Describe the group or topic."
-msgstr "グループやトピックを記述"
+msgstr "グループやトピック����説明�る。"
 
 #. TRANS: Text area title for group description.
 #. TRANS: %d is the number of characters available for the description.
-#, fuzzy, php-format
+#, php-format
 msgid "Describe the group or topic in %d character or less."
 msgid_plural "Describe the group or topic in %d characters or less."
-msgstr[0] "グループやトピックを %d 字以内記述"
+msgstr[0] "グループやトピック�説明を %d 文字以内�記述"
 
 #. TRANS: Field title on group edit form.
-#, fuzzy
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\"."
-msgstr "グループ�場所, 例�� \"都市, 都�府県 (��� 地域), 国\""
+msgstr "グループ�場所�例�� \"都市�都�府県 (��� 地域)�国\"。"
 
 #. TRANS: Field label on group edit form.
 msgid "Aliases"
@@ -8593,7 +7747,7 @@ msgstr "別�"
 
 #. TRANS: Input field title for group aliases.
 #. TRANS: %d is the maximum number of group aliases available.
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
 "alias allowed."
@@ -8601,122 +7755,65 @@ msgid_plural ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
 "aliases allowed."
 msgstr[0] ""
-"グループ�エクストラニック�ーム�カンマ���スペース区切り�最大 %d"
+"グループ�エクストラニック�ーム�カンマ���スペース区切り�最大 %d�エイリ"
+"アス�"
 
 #. TRANS: Checkbox field title on group edit form to mark a group private.
 msgid ""
 "New members must be approved by admin and all posts are forced to be private."
 msgstr ""
+"新��メン�ー�管�者�よ��承��れる必���り�����記事をプライベー"
+"ト��る��を強制�る。"
 
 #. TRANS: Indicator in group members list that this user is a group administrator.
-#, fuzzy
 msgctxt "GROUPADMIN"
 msgid "Admin"
 msgstr "管�者"
 
-#. TRANS: Menu item in the group navigation page.
-msgctxt "MENU"
-msgid "Group"
-msgstr ""
-
-#. TRANS: Tooltip for menu item in the group navigation page.
-#. TRANS: %s is the nickname of the group.
-#, php-format
-msgctxt "TOOLTIP"
-msgid "%s group"
-msgstr ""
-
-#. TRANS: Menu item in the group navigation page.
-msgctxt "MENU"
-msgid "Members"
-msgstr ""
-
-#. TRANS: Tooltip for menu item in the group navigation page.
-#. TRANS: %s is the nickname of the group.
-#, php-format
-msgctxt "TOOLTIP"
-msgid "%s group members"
-msgstr ""
-
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: %d is the number of pending members.
-#, php-format
-msgctxt "MENU"
-msgid "Pending members (%d)"
-msgid_plural "Pending members (%d)"
-msgstr[0] ""
-
-#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: %s is the nickname of the group.
-#, fuzzy, php-format
-msgctxt "TOOLTIP"
-msgid "%s pending members"
-msgstr "%s グループメン�ー"
-
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-msgctxt "MENU"
-msgid "Blocked"
-msgstr ""
-
-#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: %s is the nickname of the group.
-#, php-format
-msgctxt "TOOLTIP"
-msgid "%s blocked users"
-msgstr ""
-
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: Menu item in primary navigation panel.
-#, fuzzy
-msgctxt "MENU"
-msgid "Admin"
-msgstr "管�者"
+#. TRANS: Group actions header (h2). Text hidden by default.
+msgid "Group actions"
+msgstr "グループアクション"
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Edit %s group properties"
-msgstr ""
-
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-msgctxt "MENU"
-msgid "Logo"
-msgstr ""
+msgstr "%s グループ�プロパティを編集"
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Add or edit %s logo"
-msgstr ""
+msgstr "%s �ロゴを追加���編集�る"
 
-#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: %s is the nickname of the group.
-#, php-format
-msgctxt "TOOLTIP"
-msgid "Add or edit %s design"
-msgstr ""
-
-#. TRANS: Group actions header (h2). Text hidden by default.
-msgid "Group actions"
-msgstr "グループアクション"
+#. TRANS: Link text for link on user profile.
+msgctxt "MENU"
+msgid "Logo"
+msgstr "ロゴ"
 
 #. TRANS: Title for groups with the most members section.
-#, fuzzy
 msgid "Popular groups"
-msgstr "人気���や�"
+msgstr "人気�グループ"
 
 #. TRANS: Title for groups with the most posts section.
-#, fuzzy
 msgid "Active groups"
-msgstr "全��グループ"
+msgstr "活発�グループ"
 
-#. TRANS: Title for group tag cloud section.
-#. TRANS: %s is a group name.
-#, php-format
-msgid "Tags in %s group's notices"
-msgstr "%s グループ���や���るタグ"
+#. TRANS: Link description for seeing all groups.
+#. TRANS: Link description for seeing all lists.
+msgid "See all"
+msgstr "���を見る"
+
+#. TRANS: Link title for seeing all groups.
+msgid "See all groups you belong to."
+msgstr "所属�る����グループを�照�る。"
+
+#. TRANS: Menu item title in personal group navigation menu.
+#. TRANS: %s is a username.
+msgid "Back to top"
+msgstr "トップ�戻る"
 
 #. TRANS: Client exception 406
 msgid "This page is not available in a media type you accept"
@@ -8750,22 +7847,22 @@ msgid "Unknown file type"
 msgstr "�明�ファイルタイプ"
 
 #. TRANS: Number of megabytes. %d is the number.
-#, fuzzy, php-format
+#, php-format
 msgid "%dMB"
 msgid_plural "%dMB"
-msgstr[0] "MB"
+msgstr[0] "%d メガ�イト"
 
 #. TRANS: Number of kilobytes. %d is the number.
-#, fuzzy, php-format
+#, php-format
 msgid "%dkB"
 msgid_plural "%dkB"
-msgstr[0] "kB"
+msgstr[0] "%d キロ�イト"
 
 #. TRANS: Number of bytes. %d is the number.
 #, php-format
 msgid "%dB"
 msgid_plural "%dB"
-msgstr[0] ""
+msgstr[0] "%d �イト"
 
 #. TRANS: Body text for confirmation code e-mail.
 #. TRANS: %1$s is a user nickname, %2$s is the StatusNet sitename,
@@ -8783,7 +7880,7 @@ msgstr ""
 #. TRANS: %d is the unknown inbox ID (number).
 #, php-format
 msgid "Unknown inbox source %d."
-msgstr "�明��信箱�ソース %d。"
+msgstr "�明��信トレイ�ソース %d。"
 
 #. TRANS: Server exception thrown trying to initialise an IM plugin without meeting all prerequisites.
 msgid "Queueing must be enabled to use IM plugins."
@@ -8796,39 +7893,68 @@ msgstr ""
 #. TRANS: Title for inbox tag cloud section.
 msgctxt "TITLE"
 msgid "Trends"
-msgstr ""
+msgstr "トレンド"
 
-#. TRANS: Button text for inviting more users to the StatusNet instance.
-#, fuzzy
+#. TRANS: Default button text for inviting more users to the StatusNet instance.
 msgctxt "BUTTON"
 msgid "Invite more colleagues"
-msgstr "新��ユーザを招待"
+msgstr "も���僚を招待"
+
+#. TRANS: Form legend.
+msgid "Invite collegues"
+msgstr "�僚を招待"
+
+#. TRANS: Field label for a list of e-mail addresses.
+msgid "Email addresses"
+msgstr "メールアドレス"
+
+#. TRANS: Field title for a list of e-mail addresses.
+msgid "Addresses of friends to invite (one per line)."
+msgstr "招待�る�人�アドレス (一行���一�)。"
+
+#. TRANS: Field label for a personal message to send to invitees.
+msgid "Personal message"
+msgstr "パーソナルメッセージ"
+
+#. TRANS: Field title for a personal message to send to invitees.
+msgid "Optionally add a personal message to the invitation."
+msgstr "任��招待�パーソナルメッセージを加������。"
+
+#. TRANS: Send button for inviting friends
+#. TRANS: Button text for sending notice.
+msgctxt "BUTTON"
+msgid "Send"
+msgstr "�信"
+
+#. TRANS: Submit button title.
+msgid "Send invitations."
+msgstr "招待状を�信���。"
 
 #. TRANS: Button text for joining a group.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Join"
 msgstr "�加"
 
 #. TRANS: Button text on form to leave a group.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Leave"
 msgstr "離れる"
 
+#. TRANS: Link title for seeing all lists.
+msgid "See all lists you have created."
+msgstr "����作�������リストを�照�る。"
+
 #. TRANS: Menu item for logging in to the StatusNet site.
 #. TRANS: Menu item in primary navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Login"
 msgstr "ログイン"
 
 #. TRANS: Title for menu item for logging in to the StatusNet site.
 msgid "Login with a username and password"
-msgstr "ユーザ��パスワード�ログイン"
+msgstr "ユーザー��パスワード�ログイン"
 
 #. TRANS: Menu item for registering with the StatusNet site.
-#, fuzzy
 msgctxt "MENU"
 msgid "Register"
 msgstr "登録"
@@ -8844,7 +7970,7 @@ msgstr "メールアドレス確�"
 #. TRANS: Body for address confirmation email.
 #. TRANS: %1$s is the addressed user's nickname, %2$s is the StatusNet sitename,
 #. TRANS: %3$s is the URL to confirm at.
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "Hey, %1$s.\n"
 "\n"
@@ -8859,32 +7985,32 @@ msgid ""
 "Thanks for your time, \n"
 "%2$s\n"
 msgstr ""
-"�ん����%s\n"
+"%1$s �ん��ん���。\n"
 "\n"
-"�れ����メールアドレスを %s �入力����。\n"
+"�れ�� %2$s ���メールアドレスを入力����。\n"
 "\n"
 "も�登録を承�����ら�以下�URLを使用������:\n"
 "\n"
-"%s\n"
+"\t%3$s\n"
 "\n"
 "も������れ����メッセージを無視������。\n"
 "\n"
-"�り��������。\n"
-"%s\n"
+"����時間を�り��������。\n"
+"%2$s\n"
 
 #. TRANS: Subject of new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscribing user's nickname, %2$s is the StatusNet sitename.
 #. TRANS: Main body of new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscriber's long name, %2$s is the StatusNet sitename.
 #, php-format
-msgid "%1$s is now listening to your notices on %2$s."
-msgstr "%1$s � %2$s �������や�を������。"
+msgid "%1$s is now following you on %2$s."
+msgstr "%1$s � %2$s 上�������や�をフォロー�����。"
 
 #. TRANS: Subject of pending new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscribing user's nickname, %2$s is the StatusNet sitename.
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s would like to listen to your notices on %2$s."
-msgstr "%1$s � %2$s �������や�を������。"
+msgstr "%1$s � %2$s 上�������や�を������。"
 
 #. TRANS: Main body of pending new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscriber's long name, %2$s is the StatusNet sitename.
@@ -8893,11 +8019,13 @@ msgid ""
 "%1$s would like to listen to your notices on %2$s. You may approve or reject "
 "their subscription at %3$s"
 msgstr ""
+"%1$s � %2$s 上�������や�を����を希望�����。%3$s �フォロー"
+"�れる��を承����拒��る�������。"
 
 #. TRANS: Common footer block for StatusNet notification emails.
 #. TRANS: %1$s is the StatusNet sitename,
 #. TRANS: %2$s is a link to the addressed user's e-mail settings.
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "Faithfully yours,\n"
 "%1$s.\n"
@@ -8905,22 +8033,17 @@ msgid ""
 "----\n"
 "Change your email address or notification options at %2$s"
 msgstr ""
-"%1$s � %2$s �������や�を������。\n"
+"敬具,\n"
+"%1$s.\n"
 "\n"
-"%3$s\n"
-"\n"
-"%4$s%5$s%6$s\n"
-"忠実��る�����も��\n"
-"%7$s.\n"
-"\n"
-"----\n"
-"%8$s �メールアドレス�通知オプションを変������。\n"
+"---- \n"
+"%2$s �メールアドレスや通知オプションを変更����。"
 
 #. TRANS: Profile info line in notification e-mail.
 #. TRANS: %s is a URL.
-#, fuzzy, php-format
+#, php-format
 msgid "Profile: %s"
-msgstr "プロファイル"
+msgstr "プロファイル: %s"
 
 #. TRANS: Profile info line in notification e-mail.
 #. TRANS: %s is biographical information.
@@ -8935,6 +8058,8 @@ msgid ""
 "If you believe this account is being used abusively, you can block them from "
 "your subscribers list and report as spam to site administrators at %s."
 msgstr ""
+"��アカウント��正�利用�れ��る���れる場���%s �加入者リスト�ら彼"
+"をブロック��サイト管�者�スパム���レ�ート�る�������。"
 
 #. TRANS: Subject of notification mail for new posting email address.
 #. TRANS: %s is the StatusNet sitename.
@@ -8945,7 +8070,7 @@ msgstr "%s �投稿����新��メールアドレス"
 #. TRANS: Body of notification mail for new posting email address.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is the e-mail address to send
 #. TRANS: to to post by e-mail, %3$s is a URL to more instructions.
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
 "\n"
@@ -8953,14 +8078,11 @@ msgid ""
 "\n"
 "More email instructions at %3$s."
 msgstr ""
-"���� %1$s �関�る新��投稿アドレスを������。\n"
+"���� %1$s �新��投稿アドレスを������。\n"
 "\n"
 "%2$s �メールを����新��メッセージを投稿������。\n"
 "\n"
-"%3$s �より多��メール指示。\n"
-"\n"
-"忠実��る�����も��\n"
-"%4$s"
+"%3$s �より多��メール指示。"
 
 #. TRANS: Subject line for SMS-by-email notification messages.
 #. TRANS: %s is the posting user's nickname.
@@ -8970,24 +8092,24 @@ msgstr "%s �状態"
 
 #. TRANS: Subject line for SMS-by-email address confirmation message.
 msgid "SMS confirmation"
-msgstr "SMS確�"
+msgstr "SMS 確�"
 
 #. TRANS: Main body heading for SMS-by-email address confirmation message.
 #. TRANS: %s is the addressed user's nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "%s: confirm you own this phone number with this code:"
-msgstr "��電話番��確�待���。"
+msgstr "%s: ��電話番��確�待���。"
 
 #. TRANS: Subject for 'nudge' notification email.
 #. TRANS: %s is the nudging user.
-#, fuzzy, php-format
+#, php-format
 msgid "You have been nudged by %s"
 msgstr "���� %s ��図�れ����"
 
 #. TRANS: Body for 'nudge' notification email.
 #. TRANS: %1$s is the nuding user's long name, $2$s is the nudging user's nickname,
 #. TRANS: %3$s is a URL to post notices at.
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "%1$s (%2$s) is wondering what you are up to these days and is inviting you "
 "to post some news.\n"
@@ -8998,17 +8120,14 @@ msgid ""
 "\n"
 "Don't reply to this email; it won't get to them."
 msgstr ""
-"%1$s ($2$s) ��最近������何��る������������何ら��"
-"ニュースを投稿�るよ�誘�����。\n"
+"%1$s (%2$s) ��������頃何を���る������疑�������ニュー"
+"スを投稿�るよ�������を誘�����。\n"
 "\n"
-"�れ������ら�連絡を������ょ� :)\n"
+"�れ������ら連絡を������ょ� :)\n"
 "\n"
 "%3$s\n"
 "\n"
-"��メール�答��������。 �れ��れらを始�����ょ�。\n"
-"\n"
-"敬具\n"
-"%4$s\n"
+"��メール�答��������。�れを���る����り��ん。"
 
 #. TRANS: Subject for direct-message notification email.
 #. TRANS: %s is the sending user's nickname.
@@ -9019,7 +8138,7 @@ msgstr "%s �ら�新��プライベートメッセージ"
 #. TRANS: Body for direct-message notification email.
 #. TRANS: %1$s is the sending user's long name, %2$s is the sending user's nickname,
 #. TRANS: %3$s is the message content, %4$s a URL to the message,
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
 "\n"
@@ -9033,33 +8152,30 @@ msgid ""
 "\n"
 "Don't reply to this email; it won't get to them."
 msgstr ""
-"%1$s (%2$s) �����プライベートメッセージを�り���：\n"
+"%1$s (%2$s) �ん�����プライベートメッセージを�り���：\n"
 "\n"
 "------------------------------------------------------\n"
 "%3$s\n"
 "------------------------------------------------------\n"
 "\n"
-"��������れら�メッセージ�答�る�������:\n"
+"����以下��れら�メッセージ�答�る�������:\n"
 "\n"
 "%4$s\n"
 "\n"
-"��メール�答��������。 �れ��れらを始�����ょ�。\n"
-"\n"
-"敬具\n"
-"%5$s\n"
+"��メール��返信��������。�れを���る����り��ん。"
 
 #. TRANS: Subject for favorite notification e-mail.
 #. TRANS: %1$s is the adding user's long name, %2$s is the adding user's nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s (@%2$s) added your notice as a favorite"
-msgstr "%s (@%s) ��気�入り���������や�を加����"
+msgstr "%1$ss (@%2$s) �ん��気�入り�������や�を追加����。"
 
 #. TRANS: Body for favorite notification e-mail.
 #. TRANS: %1$s is the adding user's long name, $2$s is the date the notice was created,
 #. TRANS: %3$s is a URL to the faved notice, %4$s is the faved notice text,
 #. TRANS: %5$s is a URL to all faves of the adding user, %6$s is the StatusNet sitename,
 #. TRANS: %7$s is the adding user's nickname.
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
 "\n"
@@ -9075,23 +8191,20 @@ msgid ""
 "\n"
 "%5$s"
 msgstr ""
-"%1$s (@%7$s) �彼ら��気�入り���り��� %2$s �ら������や�を加�"
-"���。\n"
+"%1$s (@%7$s) �ん�自分��気�入り������� %2$s �������や�を加"
+"����。\n"
 "\n"
-"������や��ＵＲＬ:\n"
+"������や��URL:\n"
 "\n"
 "%3$s\n"
 "\n"
-"������や��テキスト:\n"
+"������や��本文:\n"
 "\n"
 "%4$s\n"
 "\n"
 "������� %1$s ��気�入り�リストを見る�������:\n"
 "\n"
-"%5$s\n"
-"\n"
-"忠実��る�����も��\n"
-"%6%s\n"
+"%5$s"
 
 #. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
 #, php-format
@@ -9100,17 +8213,20 @@ msgid ""
 "\n"
 "\t%s"
 msgstr ""
+"����会話を以下�読む�������:\n"
+"\n"
+"%s"
 
 #. TRANS: E-mail subject for notice notification.
 #. TRANS: %1$s is the sending user's long name, %2$s is the adding user's nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s (@%2$s) sent a notice to your attention"
-msgstr "%s (@%s) ����宛����や�を�り���"
+msgstr "%1$s (@%2$s) �ん����宛����や�を�り���"
 
 #. TRANS: Body of @-reply notification e-mail.
 #. TRANS: %1$s is the sending user's name, $2$s is the StatusNet sitename,
 #. TRANS: %3$s is a URL to the notice, %4$s is the notice text,
-#. TRANS: %5$s is a URL to the full conversion if it exists (otherwise empty),
+#. TRANS: %5$s is the text "The full conversation can be read here:" and a URL to the full conversion if it exists (otherwise empty),
 #. TRANS: %6$s is a URL to reply to the notice, %7$s is a URL to all @-replies for the addressed user,
 #, php-format
 msgid ""
@@ -9132,22 +8248,43 @@ msgid ""
 "\n"
 "%7$s"
 msgstr ""
+"%1$s �ん� %2$s ����宛���や� ('@-reply' 付) を�り���。\n"
+"\n"
+"��や����ら:\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"�れを読む:\n"
+"\n"
+"\t%4$s\n"
+"\n"
+"%5$s 返信�る場���ら:\n"
+"\n"
+"\t%6$s\n"
+"\n"
+"���宛����� @ 付返信�リスト���ら:\n"
+"\n"
+"%7$s"
 
 #. TRANS: Subject of group join notification e-mail.
 #. TRANS: %1$s is the joining user's nickname, %2$s is the group name, and %3$s is the StatusNet sitename.
+#, php-format
+msgid "%1$s has joined your group %2$s on %3$s"
+msgstr "%3$s 上�グループ %2$s � %1$s �ん��加����。"
+
 #. TRANS: Main body of group join notification e-mail.
 #. TRANS: %1$s is the subscriber's long name, %2$s is the group name, and %3$s is the StatusNet sitename,
 #. TRANS: %4$s is a block of profile info about the subscriber.
 #. TRANS: %5$s is a link to the addressed user's e-mail settings.
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s has joined your group %2$s on %3$s."
-msgstr "%1$s �グループ %2$s ��加����"
+msgstr "%3$s �����グループ %2$s � %1$s ��加����。"
 
 #. TRANS: Subject of pending group join request notification e-mail.
 #. TRANS: %1$s is the joining user's nickname, %2$s is the group name, and %3$s is the StatusNet sitename.
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s wants to join your group %2$s on %3$s."
-msgstr "%1$s � %2$s ��気�入りを更新���� / %2$s。"
+msgstr "%3$s �����グループ %2$s � %1$s ��加を希望�����。"
 
 #. TRANS: Main body of pending group join request notification e-mail.
 #. TRANS: %1$s is the subscriber's long name, %2$s is the group name, and %3$s is the StatusNet sitename,
@@ -9160,74 +8297,70 @@ msgstr ""
 
 #. TRANS: Client error displayed when trying to access a mailbox that is not of the logged in user.
 msgid "Only the user can read their own mailboxes."
-msgstr "ユーザ����れら自身�メールボックスを読む�������。"
+msgstr "ユーザー���彼ら自身�メールボックスを読む�������。"
 
 #. TRANS: Message displayed when there are no private messages in the inbox of a user.
 msgid ""
 "You have no private messages. You can send private message to engage other "
 "users in conversation. People can send you messages for your eyes only."
 msgstr ""
-"������プライベートメッセージ�全��り��ん。����他�ユーザを会話"
-"�引�込むプライベートメッセージを�る�������。人々��������"
+"������プライベートメッセージ�全��り��ん。����他�ユーザーを会"
+"話�引�込むプライベートメッセージを�る�������。人々��������"
 "メッセージを�る�������。"
 
 #. TRANS: Menu item in mailbox menu. Leads to incoming private messages.
-#, fuzzy
 msgctxt "MENU"
 msgid "Inbox"
-msgstr "�信箱"
+msgstr "�信トレイ"
 
 #. TRANS: Menu item title in mailbox menu. Leads to incoming private messages.
-#, fuzzy
 msgid "Your incoming messages."
-msgstr "����入���るメッセージ"
+msgstr "�����信メッセージ"
 
 #. TRANS: Menu item in mailbox menu. Leads to outgoing private messages.
-#, fuzzy
 msgctxt "MENU"
 msgid "Outbox"
-msgstr "�信箱"
+msgstr "�信トレイ"
 
 #. TRANS: Menu item title in mailbox menu. Leads to outgoing private messages.
-#, fuzzy
 msgid "Your sent messages."
-msgstr "�������メッセージ"
+msgstr "�����信��メッセージ"
 
 #. TRANS: Error message in incoming mail handler used when an incoming e-mail cannot be processed.
 msgid "Could not parse message."
-msgstr "メッセージを分�����ん���。"
+msgstr "メッセージを解�����ん���。"
 
 #. TRANS: Error message in incoming mail handler used when an incoming e-mail is not from a registered user.
 msgid "Not a registered user."
-msgstr "登録ユーザ���り��ん。"
+msgstr "登録ユーザー���り��ん。"
 
 #. TRANS: Error message in incoming mail handler used when an incoming e-mail is not from a user's incoming e-mail address.
 msgid "Sorry, that is not your incoming email address."
-msgstr "����ん��れ�����入���るメールアドレス���り��ん。"
+msgstr "����ん��れ������信メールアドレス���り��ん。"
 
 #. TRANS: Error message in incoming mail handler used when no incoming e-mail is allowed.
 msgid "Sorry, no incoming email allowed."
-msgstr "����ん�入���るメール�許��れ����ん。"
+msgstr "����ん��信メール�許��れ����ん。"
 
 #. TRANS: Error message in incoming mail handler used when an incoming e-mail is of an unsupported type.
 #. TRANS: %s is the unsupported type.
-#, fuzzy, php-format
+#, php-format
 msgid "Unsupported message type: %s."
-msgstr "サ�ート外�メッセージタイプ: %s"
+msgstr "サ�ート外�メッセージタイプ: %s。"
 
 #. TRANS: Form legend for form to make a user a group admin.
 msgid "Make user an admin of the group"
-msgstr "ユーザをグループ�管�者��る"
+msgstr "ユーザーをグループ�管�者��る"
 
 #. TRANS: Button text for the form that will make a user administrator.
 msgctxt "BUTTON"
 msgid "Make Admin"
-msgstr ""
+msgstr "管�者��る"
 
 #. TRANS: Submit button title.
 msgctxt "TOOLTIP"
-msgid "Make this user an admin"
-msgstr ""
+msgid "Make this user an admin."
+msgstr "��ユーザーを管�者��る。"
 
 #. TRANS: Client exception thrown when a database error was thrown during a file upload operation.
 msgid "There was a database error while saving your file. Please try again."
@@ -9237,7 +8370,7 @@ msgstr ""
 
 #. TRANS: Client exception thrown when a file upload operation would cause a user to exceed a set quota.
 msgid "File exceeds user's quota."
-msgstr "ファイル�ユーザ�割当�を超�����。"
+msgstr "ファイル�ユーザー�割当�を超�����。"
 
 #. TRANS: Client exception thrown when a file upload operation fails because the file could
 #. TRANS: not be moved from the temporary folder to the permanent file location.
@@ -9247,7 +8380,7 @@ msgstr "ファイルを目的ディレクトリ�動���������
 #. TRANS: Client exception thrown when a file upload operation has been stopped because the MIME
 #. TRANS: type of the uploaded file could not be determined.
 msgid "Could not determine file's MIME type."
-msgstr "ファイル�MIMEタイプを決定����ん。"
+msgstr "ファイル� MIME タイプを特定����ん。"
 
 #. TRANS: Client exception thrown trying to upload a forbidden MIME type.
 #. TRANS: %1$s is the file type that was denied, %2$s is the application part of
@@ -9257,12 +8390,15 @@ msgid ""
 "\"%1$s\" is not a supported file type on this server. Try using another %2$s "
 "format."
 msgstr ""
+"\"%1$s\" ���サー��サ�ート�れ��るファイル�種類���り��ん。別�形"
+"� %2$s を試������。"
 
 #. TRANS: Client exception thrown trying to upload a forbidden MIME type.
 #. TRANS: %s is the file type that was denied.
 #, php-format
 msgid "\"%s\" is not a supported file type on this server."
 msgstr ""
+"\"%s\" ���サー�ー�サ�ート�れ��るファイル�種類���り��ん。"
 
 #. TRANS: Form legend for direct notice.
 msgid "Send a direct notice"
@@ -9271,47 +8407,42 @@ msgstr "直接��や�を�る"
 #. TRANS: Label entry in drop-down selection box in direct-message inbox/outbox.
 #. TRANS: This is the default entry in the drop-down box, doubling as instructions
 #. TRANS: and a brake against accidental submissions with the first user in the list.
-#, fuzzy
 msgid "Select recipient:"
-msgstr "キャリア�択"
+msgstr "�信者を�択:"
 
-#. TRANS Entry in drop-down selection box in direct-message inbox/outbox when no one is available to message.
-#, fuzzy
+#. TRANS: Entry in drop-down selection box in direct-message inbox/outbox when no one is available to message.
 msgid "No mutual subscribers."
-msgstr "フォロー�����ん�"
+msgstr "互��フォロー�����ん。"
 
 #. TRANS: Dropdown label in direct notice form.
 msgid "To"
-msgstr "To"
+msgstr "宛先"
 
 #. TRANS: Button text for sending a direct notice.
-#, fuzzy
 msgctxt "Send button for sending notice"
 msgid "Send"
-msgstr "投稿"
+msgstr "�信"
 
 #. TRANS: Header in message list.
-#, fuzzy
 msgid "Messages"
 msgstr "メッセージ"
 
 #. TRANS: Followed by notice source (usually the client used to send the notice).
 #. TRANS: Followed by notice source.
 msgid "from"
-msgstr "from"
+msgstr "差出人"
 
 #. TRANS: A possible notice source (web interface).
 msgctxt "SOURCE"
 msgid "web"
-msgstr ""
+msgstr "ウェブ"
 
 #. TRANS: A possible notice source (XMPP).
 msgctxt "SOURCE"
 msgid "xmpp"
-msgstr ""
+msgstr "xmpp"
 
 #. TRANS: A possible notice source (e-mail).
-#, fuzzy
 msgctxt "SOURCE"
 msgid "mail"
 msgstr "メール"
@@ -9319,38 +8450,40 @@ msgstr "メール"
 #. TRANS: A possible notice source (OpenMicroBlogging).
 msgctxt "SOURCE"
 msgid "omb"
-msgstr ""
+msgstr "omb"
 
 #. TRANS: A possible notice source (Application Programming Interface).
 msgctxt "SOURCE"
 msgid "api"
-msgstr ""
+msgstr "api"
 
 #. TRANS: Client exception thrown when no author for an activity was found.
 msgid "Cannot get author for activity."
-msgstr ""
+msgstr "作�者�アクティビティを�得�る�������ん。"
 
 #. TRANS: Client exception thrown when ...
-#, fuzzy
 msgid "Bookmark not posted to this group."
-msgstr "��グループ�メン�ー���り��ん。"
+msgstr "ブックマーク���グループ�投稿����ん。"
 
 #. TRANS: Client exception when ...
-#, fuzzy
 msgid "Object not posted to this user."
-msgstr "����や�を削除����ん。"
+msgstr "オブジェクト���ユーザー�投稿����ん。"
 
 #. TRANS: Server exception thrown when a micro app plugin uses a target that cannot be handled.
 msgid "Do not know how to handle this kind of target."
-msgstr ""
+msgstr "ターゲット���種類を処��る方法���り��ん。"
 
 #. TRANS: Server exception thrown when a micro app plugin developer has not done his job too well.
 msgid "You must implement either adaptNoticeListItem() or showNotice()."
-msgstr ""
+msgstr "adaptNoticeListItem() ��� showNotice() を実相�る必���り��。"
+
+#. TRANS: Link description to show more items in a list.
+msgid "More â–¼"
+msgstr "も�� ▼"
 
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 msgid "Nickname cannot be empty."
-msgstr ""
+msgstr "ニック�ームを空��る�������ん。"
 
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 #, php-format
@@ -9365,16 +8498,15 @@ msgstr "��や�を�る"
 #. TRANS: Title for notice label. %s is the user's nickname.
 #, php-format
 msgid "What's up, %s?"
-msgstr "最近�� %s?"
+msgstr "%s �ん�最近��？"
 
 #. TRANS: Input label in notice form for adding an attachment.
 msgid "Attach"
 msgstr "添付"
 
 #. TRANS: Title for input field to attach a file to a notice.
-#, fuzzy
 msgid "Attach a file."
-msgstr "ファイル添付"
+msgstr "ファイルを添付�る"
 
 #. TRANS: Field label to add location to a notice.
 msgid "Share my location"
@@ -9390,36 +8522,28 @@ msgid ""
 "try again later"
 msgstr ""
 "����ん������置を検索�る��予想より長���������後�も�一"
-"度試������"
+"度試��������"
 
 #. TRANS: Separator in profile addressees list.
 msgctxt "SEPARATOR"
 msgid ", "
-msgstr ""
-
-#. TRANS: Start of profile addressees list.
-msgid " â–¸ "
-msgstr ""
+msgstr ", "
 
 #. TRANS: Used in coordinates as abbreviation of north.
-#, fuzzy
 msgid "N"
-msgstr "北"
+msgstr "N"
 
 #. TRANS: Used in coordinates as abbreviation of south.
-#, fuzzy
 msgid "S"
-msgstr "�"
+msgstr "S"
 
 #. TRANS: Used in coordinates as abbreviation of east.
-#, fuzzy
 msgid "E"
-msgstr "�"
+msgstr "E"
 
 #. TRANS: Used in coordinates as abbreviation of west.
-#, fuzzy
 msgid "W"
-msgstr "西"
+msgstr "W"
 
 #. TRANS: Coordinates message.
 #. TRANS: %1$s is lattitude degrees, %2$s is lattitude minutes,
@@ -9428,9 +8552,10 @@ msgstr "西"
 #. TRANS: %7$s is longitude seconds, %8$s is E (east) or W (west) depending on longitude,
 #, php-format
 msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
-msgstr ""
+msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 
 #. TRANS: Followed by geo location.
+#, fuzzy
 msgid "at"
 msgstr "at"
 
@@ -9443,294 +8568,241 @@ msgid "Repeated by"
 msgstr ""
 
 #. TRANS: Link title in notice list item to reply to a notice.
-msgid "Reply to this notice"
-msgstr "����や��返信"
+msgid "Reply to this notice."
+msgstr "����や��返信�る。"
 
 #. TRANS: Link text in notice list item to reply to a notice.
 msgid "Reply"
 msgstr "返信"
 
 #. TRANS: Link title in notice list item to delete a notice.
-msgid "Delete this notice"
-msgstr "����や�を削除"
+msgid "Delete this notice from the timeline."
+msgstr "タイムライン�ら�����や�を削除�る。"
 
 #. TRANS: Title for repeat form status in notice list when a notice has been repeated.
-#, fuzzy
 msgid "Notice repeated."
-msgstr "��や�を繰り返����"
+msgstr "��や�をリピート����。"
 
 #. TRANS: Field label for notice text.
 msgid "Update your status..."
-msgstr ""
+msgstr "����ステータスを更新�る..."
 
 #. TRANS: Form legend of form to nudge/ping another user.
 msgid "Nudge this user"
-msgstr "��ユーザ��図"
+msgstr "��ユーザー��図"
 
 #. TRANS: Button text to nudge/ping another user.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Nudge"
 msgstr "�図"
 
 #. TRANS: Button title to nudge/ping another user.
-#, fuzzy
 msgid "Send a nudge to this user."
-msgstr "��ユーザ��図を�る"
-
-#. TRANS: Exception thrown when creating a new profile fails in OAuth store.
-msgid "Error inserting new profile."
-msgstr ""
-
-#. TRANS: Exception thrown when creating a new avatar fails in OAuth store.
-msgid "Error inserting avatar."
-msgstr ""
-
-#. TRANS: Exception thrown when creating a remote profile fails in OAuth store.
-msgid "Error inserting remote profile."
-msgstr ""
-
-#. TRANS: Exception thrown when a notice is denied because it has been sent before.
-msgid "Duplicate notice."
-msgstr ""
-
-#. TRANS: Exception thrown when creating a new subscription fails in OAuth store.
-#, fuzzy
-msgid "Could not insert new subscription."
-msgstr "サブスクリプションを追加����ん"
+msgstr "��ユーザー��図を�る"
 
 #. TRANS: Server exception thrown in oEmbed action if no API endpoint is available.
-#, fuzzy
 msgid "No oEmbed API endpoint available."
-msgstr "ＩＭ �利用��。"
+msgstr "利用�能� oEmbed API エンド�イント��り��ん。"
 
 #. TRANS: Field label for list.
-#, fuzzy
 msgctxt "LABEL"
 msgid "List"
-msgstr "リンク"
+msgstr "リスト"
 
 #. TRANS: Field title for list.
-#, fuzzy
 msgid "Change the list (letters, numbers, -, ., and _ are allowed)."
-msgstr ""
-"��ユーザ�タグ (アルファベット�数字�-�.�_)�カンマ�スペース区切り"
+msgstr "リストを変更 (アルファベット�数字�-�.��よ� _ �利用�能)。"
 
 #. TRANS: Field title for description of list.
-#, fuzzy
 msgid "Describe the list or topic."
-msgstr "グループやトピックを記述"
+msgstr "リスト���トピック����説明�る。"
 
 #. TRANS: Field title for description of list.
 #. TRANS: %d is the maximum number of characters for the description.
-#, fuzzy, php-format
+#, php-format
 msgid "Describe the list or topic in %d character."
 msgid_plural "Describe the list or topic in %d characters."
-msgstr[0] "グループやトピックを %d 字以内記述"
+msgstr[0] ""
 
 #. TRANS: Button title to delete a list.
-#, fuzzy
 msgid "Delete this list."
-msgstr "��ユーザを削除"
+msgstr "��ユーザーを削除�る。"
 
 #. TRANS: Header in list edit form.
 msgid "Add or remove people"
-msgstr ""
+msgstr "人を追加���削除"
 
 #. TRANS: Header in list edit form.
-#, fuzzy
 msgctxt "HEADER"
 msgid "Search"
 msgstr "検索"
 
 #. TRANS: Menu item in list navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "List"
-msgstr "リンク"
+msgstr "リスト"
 
 #. TRANS: Menu item title in list navigation panel.
 #. TRANS: %1$s is a list, %2$s is a nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s list by %2$s."
-msgstr "%1$s�ページ %2$d"
+msgstr "%2$s � %1$s リスト"
 
 #. TRANS: Menu item in list navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Listed"
-msgstr "ライセンス"
+msgstr "リスト"
 
 #. TRANS: Menu item in list navigation panel.
 #. TRANS: Menu item in local navigation menu.
-#, fuzzy
 msgctxt "MENU"
 msgid "Subscribers"
 msgstr "フォロー�れ��る"
 
 #. TRANS: Menu item title in list navigation panel.
 #. TRANS: %1$s is a list, %2$s is a nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "Subscribers to %1$s list by %2$s."
-msgstr "%2$s 上� %1$s ��返信!"
+msgstr "%2$s �リスト %1$s をフォロー�る。"
 
 #. TRANS: Menu item in list navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Edit"
 msgstr "編集"
 
 #. TRANS: Menu item title in list navigation panel.
 #. TRANS: %s is a list.
-#, fuzzy, php-format
+#, php-format
 msgid "Edit %s list by you."
-msgstr "%s グループを編集"
-
-#. TRANS: Link description for link to list of users tagged with a tag.
-#, fuzzy
-msgid "Tagged"
-msgstr "ã‚¿ã‚°"
+msgstr "%s リストを編集�る。"
 
 #. TRANS: Title for link to edit list settings.
-#, fuzzy
 msgid "Edit list settings."
-msgstr "プロファイル設定編集"
+msgstr "リスト設定を編集�る。"
 
 #. TRANS: Text for link to edit list settings.
 msgid "Edit"
 msgstr "編集"
 
 #. TRANS: Privacy mode text in list list item for private list.
-#, fuzzy
 msgctxt "MODE"
 msgid "Private"
 msgstr "プライベート"
 
 #. TRANS: Menu item in the group navigation page.
-#, fuzzy
 msgctxt "MENU"
 msgid "List Subscriptions"
-msgstr "フォロー"
+msgstr "フォローリスト"
 
 #. TRANS: Tooltip for menu item in the group navigation page.
 #. TRANS: %s is a user nickname.
-#, fuzzy, php-format
+#, php-format
 msgctxt "TOOLTIP"
 msgid "Lists subscribed to by %s."
-msgstr "人々� %s をフォロー����。"
+msgstr "%s �フォローリスト。"
 
 #. TRANS: Menu item in the group navigation page.
 #. TRANS: %s is a user nickname.
-#, fuzzy, php-format
+#, php-format
 msgctxt "MENU"
 msgid "Lists with %s"
-msgstr "%s �更新"
+msgstr "%s �リスト"
 
 #. TRANS: Tooltip for menu item in the group navigation page.
 #. TRANS: %s is a user nickname.
-#, fuzzy, php-format
+#, php-format
 msgctxt "TOOLTIP"
 msgid "Lists with %s."
-msgstr "%s �更新"
+msgstr "%s �リスト"
 
 #. TRANS: Menu item in the group navigation page.
 #. TRANS: %s is a user nickname.
 #, php-format
 msgctxt "MENU"
 msgid "Lists by %s"
-msgstr ""
+msgstr "%s �リスト"
 
 #. TRANS: Tooltip for menu item in the group navigation page.
 #. TRANS: %s is a user nickname.
-#, fuzzy, php-format
+#, php-format
 msgctxt "TOOLTIP"
 msgid "Lists by %s."
-msgstr "%1$s�ページ %2$d"
+msgstr "%s �リスト"
 
 #. TRANS: Label in lists widget.
-#, fuzzy
 msgctxt "LABEL"
 msgid "Your lists"
-msgstr "人気���や�"
+msgstr "����リスト"
 
 #. TRANS: Fieldset legend in lists widget.
-#, fuzzy
 msgctxt "LEGEND"
 msgid "Edit lists"
-msgstr "有効�メールアドレス���り��ん。"
+msgstr "リストを編集"
 
 #. TRANS: Label in self tags widget.
-#, fuzzy
 msgctxt "LABEL"
 msgid "Tags"
 msgstr "ã‚¿ã‚°"
 
 #. TRANS: Title for section contaning lists with the most subscribers.
-#, fuzzy
 msgid "Popular lists"
 msgstr "人気���や�"
 
 #. TRANS: List summary. %1$d is the number of users in the list,
 #. TRANS: %2$d is the number of subscribers to the list.
-#, fuzzy, php-format
+#, php-format
 msgid "Listed: %1$d Subscribers: %2$d"
-msgstr "%1$s フォロー�れ��る�ページ %2$d"
+msgstr "リスト: %1$d フォロー: %2$d"
 
 #. TRANS: Title for page that displays which lists current user is part of.
-#, fuzzy, php-format
+#, php-format
 msgid "Lists with you"
-msgstr "API メソッド�見��り��ん。"
+msgstr "����リスト"
 
 #. TRANS: Title for page that displays which lists a user is part of.
 #. TRANS: %s is a profile name.
-#, fuzzy, php-format
+#, php-format
 msgid "Lists with %s"
-msgstr "%s �更新"
+msgstr "%s �リスト"
 
 #. TRANS: Title for page that displays lists a user has subscribed to.
-#, fuzzy
 msgid "List subscriptions"
-msgstr "%s フォロー���る"
+msgstr "フォローリスト"
 
 #. TRANS: Menu item in personal group navigation menu.
 #. TRANS: Menu item in settings navigation panel.
 #. TRANS: Menu item in local navigation menu.
-#, fuzzy
 msgctxt "MENU"
 msgid "Profile"
-msgstr "プロファイル"
+msgstr "プロフィール"
 
 #. TRANS: Menu item title in personal group navigation menu.
 msgid "Your profile"
-msgstr "グループプロファイル"
+msgstr "����プロフィール"
 
 #. TRANS: Menu item in personal group navigation menu.
-#, fuzzy
 msgctxt "MENU"
 msgid "Replies"
 msgstr "返信"
 
 #. TRANS: Menu item in personal group navigation menu.
-#, fuzzy
 msgctxt "MENU"
 msgid "Favorites"
 msgstr "�気�入り"
 
 #. TRANS: Replaces %s in '%s\'s favorite notices'. (Yes, we know we need to fix this.)
-#, fuzzy
 msgctxt "FIXME"
 msgid "User"
-msgstr "ユーザ"
+msgstr "ユーザー"
 
 #. TRANS: Menu item in personal group navigation menu.
-#, fuzzy
 msgctxt "MENU"
 msgid "Messages"
 msgstr "メッセージ"
 
 #. TRANS: Menu item title in personal group navigation menu.
 msgid "Your incoming messages"
-msgstr "����入���るメッセージ"
+msgstr "�����信メッセージ"
 
 #. TRANS: Displayed as version information for a plugin if no version information was found.
 msgid "Unknown"
@@ -9739,94 +8811,86 @@ msgstr "�明"
 #. TRANS: Plugin admin panel controls
 msgctxt "plugin"
 msgid "Disable"
-msgstr ""
+msgstr "無効"
 
 #. TRANS: Plugin admin panel controls
 msgctxt "plugin"
 msgid "Enable"
-msgstr ""
+msgstr "有効"
 
+#. TRANS: Plugin description for a disabled plugin.
 msgctxt "plugin-description"
-msgid "(Plugin descriptions unavailable when disabled.)"
+msgid ""
+"(The plugin description is unavailable when a plugin has been disabled.)"
 msgstr ""
+"(プラグイン�説明��プラグイン�無効�����る場��使用����ん。)"
 
 #. TRANS: Menu item in primary navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Settings"
-msgstr "SMS 設定"
+msgstr "設定"
 
 #. TRANS: Menu item title in primary navigation panel.
-#, fuzzy
 msgid "Change your personal settings."
-msgstr "プロファイル設定�変更"
+msgstr "個人設定�変更"
+
+#. TRANS: Menu item in primary navigation panel.
+msgctxt "MENU"
+msgid "Admin"
+msgstr "管�"
 
 #. TRANS: Menu item title in primary navigation panel.
-#, fuzzy
 msgid "Site configuration."
-msgstr "ユーザ設定"
+msgstr "サイト�設定"
 
 #. TRANS: Menu item in primary navigation panel.
 msgctxt "MENU"
 msgid "Logout"
-msgstr "ロゴ"
+msgstr "ログアウト"
 
 #. TRANS: Menu item title in primary navigation panel.
-#, fuzzy
 msgid "Logout from the site."
-msgstr "サイト�テーマ"
+msgstr "サイト�らログアウト���"
 
 #. TRANS: Menu item title in primary navigation panel.
-#, fuzzy
 msgid "Login to the site."
-msgstr "サイト�ログイン"
+msgstr "サイト�ログイン���。"
 
-#. TRANS: Menu item in primary navigation panel.
-#, fuzzy
-msgctxt "MENU"
-msgid "Search"
-msgstr "検索"
-
-#. TRANS: Menu item title in primary navigation panel.
-#, fuzzy
-msgid "Search the site."
-msgstr "サイト検索"
+msgid "This profile has been silenced by site moderators"
+msgstr ""
 
 #. TRANS: H2 text for user subscription statistics.
-#, fuzzy
 msgid "Following"
-msgstr "許�"
+msgstr "フォロー���る"
 
 #. TRANS: H2 text for user subscriber statistics.
-#, fuzzy
 msgid "Followers"
-msgstr "許�"
+msgstr "フォロワー"
+
+#. TRANS: H2 text for user statistics.
+msgid "Statistics"
+msgstr "統計データ"
 
 #. TRANS: Label for user statistics.
 msgid "User ID"
-msgstr "ユーザＩＤ"
+msgstr "ユーザーID"
 
 #. TRANS: Label for user statistics.
 msgid "Member since"
 msgstr "利用開始日"
 
-#. TRANS: Label for user statistics.
-msgid "Notices"
-msgstr "��や�"
-
 #. TRANS: Label for user statistics.
 #. TRANS: Average count of posts made per day since account registration.
 msgid "Daily average"
-msgstr ""
+msgstr "毎日�平�"
 
 #. TRANS: H2 text for user group membership statistics.
 msgid "Groups"
 msgstr "グループ"
 
 #. TRANS: H2 text for user list membership statistics.
-#, fuzzy
 msgid "Lists"
-msgstr "制�"
+msgstr "リスト"
 
 #. TRANS: Server error displayed when using an unimplemented method.
 msgid "Unimplemented method."
@@ -9834,10 +8898,9 @@ msgstr "未実装�メソッド。"
 
 #. TRANS: Menu item title in search group navigation panel.
 msgid "User groups"
-msgstr "ユーザグループ"
+msgstr "ユーザーグループ"
 
 #. TRANS: Menu item in search group navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Recent tags"
 msgstr "最近�タグ"
@@ -9847,13 +8910,11 @@ msgid "Recent tags"
 msgstr "最近�タグ"
 
 #. TRANS: Menu item in search group navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Featured"
-msgstr "フィー�ャー�れ�"
+msgstr "����"
 
 #. TRANS: Menu item in search group navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Popular"
 msgstr "人気"
@@ -9861,7 +8922,7 @@ msgstr "人気"
 #. TRANS: Title for inbox tag cloud section.
 msgctxt "TITLE"
 msgid "Trending topics"
-msgstr ""
+msgstr "�行�話題"
 
 #. TRANS: Client error displayed when return-to was defined without a target.
 msgid "No return-to arguments."
@@ -9869,32 +8930,29 @@ msgstr "return-to 引数��り��ん。"
 
 #. TRANS: For legend for notice repeat form.
 msgid "Repeat this notice?"
-msgstr "����や�を繰り返����?"
+msgstr "����や�をリピート����？"
 
 #. TRANS: Button title to repeat a notice on notice repeat form.
-#, fuzzy
 msgid "Repeat this notice."
-msgstr "����や�を繰り返�"
+msgstr "����や�をリピート�る。"
 
 #. TRANS: Description of role revoke form. %s is the role to be revoked.
-#, fuzzy, php-format
+#, php-format
 msgid "Revoke the \"%s\" role from this user"
-msgstr "��グループ�ら��ユーザをブロック"
+msgstr "��ユーザー�らロール \"%s\" を解除�る。"
 
 #. TRANS: Client error on action trying to visit a non-existing page.
-#, fuzzy
 msgid "Page not found."
-msgstr "API メソッド�見��り��ん。"
+msgstr "ページ�見��り��ん。"
 
 #. TRANS: Title of form to sandbox a user.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Sandbox"
 msgstr "サンドボックス"
 
 #. TRANS: Description of form to sandbox a user.
 msgid "Sandbox this user"
-msgstr "��ユーザをサンドボックス"
+msgstr "��ユーザーをサンドボックス"
 
 #. TRANS: Fieldset legend for the search form.
 msgid "Search site"
@@ -9906,10 +8964,11 @@ msgid "Keyword(s)"
 msgstr "キーワード"
 
 #. TRANS: Button text for searching site.
+#. TRANS: Button text for search button on search form.
 #. TRANS: Button text to search profiles.
 msgctxt "BUTTON"
 msgid "Search"
-msgstr ""
+msgstr "検索"
 
 #. TRANS: Standard search suggestions shown when a search does not give any results.
 msgid ""
@@ -9918,6 +8977,10 @@ msgid ""
 "* Try more general keywords.\n"
 "* Try fewer keywords."
 msgstr ""
+"* �����語�スペルを確�������。\n"
+"* 別�キーワードを試��������。\n"
+"* も��一般的�キーワードを試��������。\n"
+"* キーワード�数を減ら��������。"
 
 #. TRANS: Standard search suggestions shown when a search does not give any results.
 #, php-format
@@ -9931,9 +8994,16 @@ msgid ""
 "* [Yahoo](http://search.yahoo.com/search?p=site%%3A%%%%site.server%%%%+%s)\n"
 "* [Collecta](http://collecta.com/#q=%s)"
 msgstr ""
+"他�検索エンジン�検索���る��も����:\n"
+"\n"
+"* [Twingly](http://www.twingly.com/search?q=%s&content=microblog&site=%%%%"
+"site.server%%%%)\n"
+"* [Tweet scan](http://www.tweetscan.com/indexi.php?s=%s)\n"
+"* [Google](http://www.google.com/search?q=site%%3A%%%%site.server%%%%+%s)\n"
+"* [Yahoo](http://search.yahoo.com/search?p=site%%3A%%%%site.server%%%%+%s)\n"
+"* [Collecta](http://collecta.com/#q=%s)"
 
 #. TRANS: Menu item in search group navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "People"
 msgstr "人々"
@@ -9943,7 +9013,6 @@ msgid "Find people on this site"
 msgstr "��サイト�人々を探�"
 
 #. TRANS: Menu item in search group navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Notices"
 msgstr "��や�"
@@ -9956,60 +9025,26 @@ msgstr "��や��内容を探�"
 msgid "Find groups on this site"
 msgstr "��サイト上�グループを検索�る"
 
-#. TRANS: Secondary navigation menu item leading to help on StatusNet.
-#, fuzzy
-msgctxt "MENU"
-msgid "Help"
-msgstr "ヘルプ"
-
-#. TRANS: Secondary navigation menu item leading to text about StatusNet site.
-#, fuzzy
-msgctxt "MENU"
-msgid "About"
-msgstr "About"
-
-#. TRANS: Secondary navigation menu item leading to Frequently Asked Questions.
-#, fuzzy
-msgctxt "MENU"
-msgid "FAQ"
-msgstr "よ��る質�"
-
 #. TRANS: Secondary navigation menu item leading to Terms of Service.
 msgctxt "MENU"
 msgid "TOS"
-msgstr ""
+msgstr "サービス利用�約"
 
 #. TRANS: Secondary navigation menu item leading to privacy policy.
-#, fuzzy
 msgctxt "MENU"
 msgid "Privacy"
 msgstr "プライ�シー"
 
 #. TRANS: Secondary navigation menu item. Leads to information about StatusNet and its license.
-#, fuzzy
 msgctxt "MENU"
 msgid "Source"
 msgstr "ソース"
 
 #. TRANS: Secondary navigation menu item leading to version information on the StatusNet site.
-#, fuzzy
 msgctxt "MENU"
 msgid "Version"
 msgstr "�ージョン"
 
-#. TRANS: Secondary navigation menu item leading to e-mail contact information on the
-#. TRANS: StatusNet site, where to report bugs, ...
-#, fuzzy
-msgctxt "MENU"
-msgid "Contact"
-msgstr "連絡先"
-
-#. TRANS: Secondary navigation menu item. Leads to information about embedding a timeline widget.
-#, fuzzy
-msgctxt "MENU"
-msgid "Badge"
-msgstr "�ッジ"
-
 #. TRANS: Default title for section/sidebar widget.
 msgid "Untitled section"
 msgstr "�称未設定�セクション"
@@ -10019,17 +9054,15 @@ msgid "More..."
 msgstr "�ら�..."
 
 #. TRANS: Header in settings navigation panel.
-#, fuzzy
 msgctxt "HEADER"
 msgid "Settings"
-msgstr "SMS 設定"
+msgstr "設定"
 
 #. TRANS: Menu item title in settings navigation panel.
 msgid "Change your profile settings"
 msgstr "プロファイル設定�変更"
 
 #. TRANS: Menu item in settings navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Avatar"
 msgstr "ア�ター"
@@ -10039,7 +9072,6 @@ msgid "Upload an avatar"
 msgstr "ア�ター�アップロード"
 
 #. TRANS: Menu item in settings navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Password"
 msgstr "パスワード"
@@ -10049,7 +9081,6 @@ msgid "Change your password"
 msgstr "パスワード�変更"
 
 #. TRANS: Menu item in settings navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Email"
 msgstr "メール"
@@ -10058,22 +9089,16 @@ msgstr "メール"
 msgid "Change email handling"
 msgstr "メール�扱�を変更"
 
-#. TRANS: Menu item title in settings navigation panel.
-msgid "Design your profile"
-msgstr "����プロファイルをデザイン"
-
 #. TRANS: Menu item in settings navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "URL"
 msgstr "URL"
 
 #. TRANS: Menu item title in settings navigation panel.
 msgid "URL shorteners"
-msgstr ""
+msgstr "URL 短縮サービス"
 
 #. TRANS: Menu item in settings navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "IM"
 msgstr "IM"
@@ -10083,17 +9108,15 @@ msgid "Updates by instant messenger (IM)"
 msgstr "インスタントメッセンジャー(IM)��更新"
 
 #. TRANS: Menu item in settings navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "SMS"
 msgstr "SMS"
 
 #. TRANS: Menu item title in settings navigation panel.
 msgid "Updates by SMS"
-msgstr "SMS��更新"
+msgstr "SMS ��更新"
 
 #. TRANS: Menu item in settings navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Connections"
 msgstr "接続"
@@ -10102,31 +9125,72 @@ msgstr "接続"
 msgid "Authorized connected applications"
 msgstr "承��れ�接続アプリケーション"
 
+#. TRANS: Menu item in settings navigation panel.
+msgctxt "MENU"
+msgid "Old school"
+msgstr "��学校"
+
+#. TRANS: Menu item title in settings navigation panel.
+msgid "UI tweaks for old-school users"
+msgstr ""
+
 #. TRANS: Title of form to silence a user.
 #, fuzzy
 msgctxt "TITLE"
 msgid "Silence"
-msgstr "サイレンス"
+msgstr "Silence"
 
 #. TRANS: Description of form to silence a user.
 msgid "Silence this user"
-msgstr "��ユーザをサイレンス�"
+msgstr "��ユーザーをサイレンス�"
+
+#. TRANS: Server error displayed when trying to create an anynymous OAuth consumer.
+msgid "Could not create anonymous consumer."
+msgstr "匿�ユーザーを作��る�������ん。"
+
+#. TRANS: Server error displayed when trying to create an anynymous OAuth application.
+msgid "Could not create anonymous OAuth application."
+msgstr "匿� OAuth アプリケーションを作��る�������ん。"
+
+#. TRANS: Exception thrown when no token association could be found.
+msgid ""
+"Could not find a profile and application associated with the request token."
+msgstr ""
+
+#. TRANS: Exception thrown when no access token can be issued.
+msgid "Could not issue access token."
+msgstr "アクセストークンを発行����ん���。"
+
+#. TRANS: Exception thrown when a database error occurs.
+msgid "Database error inserting OAuth application user."
+msgstr "OAuth アプリケーションユーザー�追加時�データベースエラー。"
+
+#. TRANS: Exception thrown when a database error occurs.
+msgid "Database error updating OAuth application user."
+msgstr "OAuth アプリケーションユーザー�更新時�データベースエラー。"
+
+#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
+msgid "Tried to revoke unknown token."
+msgstr ""
+
+#. TRANS: Exception thrown when an attempt is made to remove a revoked token.
+msgid "Failed to delete revoked token."
+msgstr ""
 
 #. TRANS: Menu item in local navigation menu.
-#, fuzzy
 msgctxt "MENU"
 msgid "Subscriptions"
 msgstr "フォロー"
 
 #. TRANS: Menu item title in local navigation menu.
 #. TRANS: %s is a user nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "People %s subscribes to."
-msgstr "人々 %s �フォロー"
+msgstr "人々� %s をフォロー。"
 
 #. TRANS: Menu item title in local navigation menu.
 #. TRANS: %s is a user nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "People subscribed to %s."
 msgstr "人々� %s をフォロー����。"
 
@@ -10135,7 +9199,7 @@ msgstr "人々� %s をフォロー����。"
 #, php-format
 msgctxt "MENU"
 msgid "Pending (%d)"
-msgstr ""
+msgstr "�留中 (%d)"
 
 #. TRANS: Menu item title in local navigation menu.
 #, php-format
@@ -10144,32 +9208,41 @@ msgstr ""
 
 #. TRANS: Menu item title in local navigation menu.
 #. TRANS: %s is a user nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "Groups %s is a member of."
-msgstr "グループ %s �メン�ー"
+msgstr "グループ %s �メン�ー。"
 
 #. TRANS: Menu item title in local navigation menu.
 #. TRANS: %s is a user nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "List subscriptions by %s."
-msgstr "人々� %s をフォロー����。"
+msgstr "%s �リストをフォロー�る。"
 
 #. TRANS: Menu item in local navigation menu.
-#, fuzzy
 msgctxt "MENU"
 msgid "Invite"
 msgstr "招待"
 
 #. TRANS: Menu item title in local navigation menu.
 #. TRANS: %s is the StatusNet sitename.
-#, fuzzy, php-format
+#, php-format
 msgid "Invite friends and colleagues to join you on %s."
-msgstr "�人や�僚� %s �加�るよ�誘������。"
+msgstr "�人や�僚� %s �加�るよ�誘������。"
 
 #. TRANS: Form of form to subscribe to a user.
 msgid "Subscribe to this user"
 msgstr "��ユーザーをフォロー"
 
+#. TRANS: Button text to subscribe to a user.
+#. TRANS: Button text for subscribing to a list.
+msgctxt "BUTTON"
+msgid "Subscribe"
+msgstr "フォロー"
+
+#. TRANS: Button title to subscribe to a user.
+msgid "Subscribe to this user."
+msgstr "��ユーザーをフォロー�る。"
+
 #. TRANS: Title of personal tag cloud section.
 msgid "People Tagcloud as self-tagged"
 msgstr "自己タグ������人々タグクラウド"
@@ -10179,33 +9252,32 @@ msgid "People Tagcloud as tagged"
 msgstr "タグ付�����人々タグクラウド"
 
 #. TRANS: Content displayed in a tag cloud section if there are no tags.
-#, fuzzy
 msgctxt "NOTAGS"
 msgid "None"
 msgstr "��"
 
 #. TRANS: Server exception displayed if a theme name was invalid.
-#, fuzzy
 msgid "Invalid theme name."
-msgstr "�正�サイズ。"
+msgstr "無効�テーマ�。"
 
 #. TRANS: Exception thrown when a compressed theme is uploaded while no support present in PHP configuration.
 msgid "This server cannot handle theme uploads without ZIP support."
 msgstr ""
+"��サー��� ZIP をサ�ート��������テーマ�アップロードを処����"
+"�ん。"
 
 #. TRANS: Server exception thrown when uploading a theme fails.
 msgid "The theme file is missing or the upload failed."
-msgstr ""
+msgstr "テーマファイル�存在����������アップロード�失敗�����。"
 
 #. TRANS: Server exception thrown when saving an uploaded theme after decompressing it fails.
 #. TRANS: Server exception thrown when an uploaded theme cannot be saved during extraction.
-#, fuzzy
 msgid "Failed saving theme."
-msgstr "ア�ター�更新�失敗����。"
+msgstr "テーマ��存�����ん。"
 
 #. TRANS: Server exception thrown when an uploaded theme has an incorrect structure.
 msgid "Invalid theme: Bad directory structure."
-msgstr ""
+msgstr "無効�テーマ: ディレクトリー構造�正���り��ん。"
 
 #. TRANS: Client exception thrown when an uploaded theme is larger than the limit.
 #. TRANS: %d is the number of bytes of the uncompressed theme.
@@ -10217,30 +9289,34 @@ msgstr[0] ""
 
 #. TRANS: Server exception thrown when an uploaded theme is incomplete.
 msgid "Invalid theme archive: Missing file css/display.css"
-msgstr ""
+msgstr "無効�テーマ�アーカイブ: css/display.css ファイル�見��ら��"
 
 #. TRANS: Server exception thrown when an uploaded theme has an incorrect file or folder name.
 msgid ""
 "Theme contains invalid file or folder name. Stick with ASCII letters, "
 "digits, underscore, and minus sign."
 msgstr ""
+"テーマ���正�ファイル����フォルダー����れ����。ASCII文字�数"
+"字�アンダースコア�マイナス記���使用�能��。"
 
 #. TRANS: Server exception thrown when an uploaded theme contains files with unsafe file extensions.
 msgid "Theme contains unsafe file extension names; may be unsafe."
 msgstr ""
+"テーマ��安全���ファイル拡張�������れ����; 安全����能性�"
+"�り��。"
 
 #. TRANS: Server exception thrown when an uploaded theme contains a file type that is not allowed.
 #. TRANS: %s is the file type that is not allowed.
 #, php-format
 msgid "Theme contains file of type \".%s\", which is not allowed."
 msgstr ""
+"テーマ��ファイル�種類 \".%s\" ���れ����。�れ�許��れ����ん。"
 
 #. TRANS: Server exception thrown when an uploaded compressed theme cannot be opened.
 msgid "Error opening theme archive."
-msgstr "ブロック�削除エラー"
+msgstr "テーマアーカイブを開����エラー"
 
 #. TRANS: Header for Notices section.
-#, fuzzy
 msgctxt "HEADER"
 msgid "Notices"
 msgstr "��や�"
@@ -10250,25 +9326,24 @@ msgstr "��や�"
 #, php-format
 msgid "Show reply"
 msgid_plural "Show all %d replies"
-msgstr[0] ""
+msgstr[0] "返信を表示"
 
 #. TRANS: Reference to the logged in user in favourite list.
 msgctxt "FAVELIST"
 msgid "You"
-msgstr ""
+msgstr "���"
 
 #. TRANS: For building a list such as "Jim, Bob, Mary and 5 others like this".
 #. TRANS: %1$s is a list of users, separated by a separator (default: ", "), %2$s is the last user in the list.
-#, fuzzy, php-format
+#, php-format
 msgctxt "FAVELIST"
 msgid "%1$s and %2$s"
-msgstr "%1$s�ページ %2$d"
+msgstr "%1$s � %2$s"
 
 #. TRANS: List message for notice favoured by logged in user.
-#, fuzzy
 msgctxt "FAVELIST"
 msgid "You like this."
-msgstr "人気���や�"
+msgstr "�����れ�好���。"
 
 #. TRANS: List message for when more than 4 people like something.
 #. TRANS: %%s is a list of users liking a notice, %d is the number over 4 that like the notice.
@@ -10287,58 +9362,63 @@ msgid_plural "%%s like this."
 msgstr[0] ""
 
 #. TRANS: List message for notice repeated by logged in user.
-#, fuzzy
 msgctxt "REPEATLIST"
-msgid "You have repeated this notice."
-msgstr "�������や�を繰り返�����。"
+msgid "You repeated this."
+msgstr "����や�をリピート����"
 
-#. TRANS: List message for repeated notices.
-#. TRANS: %d is the number of users that have repeated a notice.
-#, fuzzy, php-format
-msgid "One person has repeated this notice."
-msgid_plural "%d people have repeated this notice."
-msgstr[0] "�����や�を繰り返�����。"
+#. TRANS: List message for when more than 4 people repeat something.
+#. TRANS: %%s is a list of users liking a notice, %d is the number over 4 that like the notice.
+#. TRANS: Plural is decided on the total number of users liking the notice (count of %%s + %d).
+#, php-format
+msgid "%%s and %d other repeated this."
+msgid_plural "%%s and %d others repeated this."
+msgstr[0] "%%s �他� %d 人��れをリピート����。"
+
+#. TRANS: List message for favoured notices.
+#. TRANS: %%s is a list of users liking a notice.
+#. TRANS: Plural is based on the number of of users that have favoured a notice.
+#, php-format
+msgid "%%s repeated this."
+msgid_plural "%%s repeated this."
+msgstr[0] "%%s をリピート。"
 
 #. TRANS: Form legend.
-#, fuzzy, php-format
+#, php-format
 msgid "Search and list people"
-msgstr "サイト検索"
+msgstr "検索�リスト�人々"
 
 #. TRANS: Dropdown option for searching in profiles.
 msgid "Everything"
-msgstr ""
+msgstr "���"
 
 #. TRANS: Dropdown option for searching in profiles.
-#, fuzzy
 msgid "Fullname"
 msgstr "フル�ーム"
 
 #. TRANS: Dropdown option for searching in profiles.
 msgid "URI (Remote users)"
-msgstr ""
+msgstr "URI (リモートユーザー)"
 
 #. TRANS: Dropdown field label.
-#, fuzzy
 msgctxt "LABEL"
 msgid "Search in"
 msgstr "サイト検索"
 
 #. TRANS: Dropdown field title.
-#, fuzzy
 msgid "Choose a field to search."
-msgstr "タグを�ん��リストを狭�������"
+msgstr "検索�るフィールドを�択������。"
 
 #. TRANS: Form legend.
 #. TRANS: %1$s is a nickname, $2$s is a list.
-#, fuzzy, php-format
+#, php-format
 msgid "Remove %1$s from list %2$s"
-msgstr "%1$s�ページ %2$d"
+msgstr "リスト %2$s �ら %1$s を削除����。"
 
 #. TRANS: Legend on form to add a profile to a list.
 #. TRANS: %1$s is a nickname, %2$s is a list.
-#, fuzzy, php-format
+#, php-format
 msgid "Add %1$s to list %2$s"
-msgstr "%1$s�ページ %2$d"
+msgstr "リスト %2$s � %1$s を追加����。"
 
 #. TRANS: Title for top posters section.
 msgid "Top posters"
@@ -10347,45 +9427,41 @@ msgstr "上�投稿者"
 #. TRANS: Option in drop-down of potential addressees.
 msgctxt "SENDTO"
 msgid "Everyone"
-msgstr ""
+msgstr "����人"
 
 #. TRANS: Option in drop-down of potential addressees.
 #. TRANS: %s is a StatusNet sitename.
 #, php-format
 msgid "My colleagues at %s"
-msgstr ""
+msgstr "%s ����僚"
 
 #. TRANS: Label for drop-down of potential addressees.
-#, fuzzy
 msgctxt "LABEL"
 msgid "To:"
-msgstr "To"
+msgstr "To:"
 
 #. TRANS: Checkbox label in widget for selecting potential addressees to mark the notice private.
-#, fuzzy
 msgid "Private?"
-msgstr "プライベート"
+msgstr "プライベート？"
 
 #. TRANS: Client exception thrown in widget for selecting potential addressees when an invalid fill option was received.
-#, fuzzy, php-format
+#, php-format
 msgid "Unknown to value: \"%s\"."
-msgstr "�明�言語 \"%s\""
+msgstr "�明�値: \"%s\"。"
 
 #. TRANS: Title for the form to unblock a user.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Unblock"
-msgstr "アンブロック"
+msgstr "ブロックを解除"
 
 #. TRANS: Title for unsandbox form.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Unsandbox"
 msgstr "アンサンドボックス"
 
 #. TRANS: Description for unsandbox form.
 msgid "Unsandbox this user"
-msgstr "��利用者をアンサンドボックス"
+msgstr "��ユーザーをアンサンドボックス"
 
 #. TRANS: Title for unsilence form.
 msgid "Unsilence"
@@ -10393,30 +9469,31 @@ msgstr "アンサイレンス"
 
 #. TRANS: Form description for unsilence form.
 msgid "Unsilence this user"
-msgstr "��利用者をアンサイレンス"
+msgstr "��ユーザーをアンサイレンス"
 
 #. TRANS: Form legend on unsubscribe form.
-#. TRANS: Button title on unsubscribe form.
 msgid "Unsubscribe from this user"
-msgstr "��利用者�ら�フォローを解除�る"
+msgstr "ユーザー�ら�フォローを解除�る"
 
 #. TRANS: Button text on unsubscribe form.
 #. TRANS: Button text for unsubscribing from a list.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Unsubscribe"
 msgstr "フォロー解除"
 
+#. TRANS: Button title on unsubscribe form.
+msgid "Unsubscribe from this user."
+msgstr "��ユーザー�フォローを解除�る。"
+
 #. TRANS: Exception text shown when no profile can be found for a user.
 #. TRANS: %1$s is a user nickname, $2$d is a user ID (number).
-#, fuzzy, php-format
+#, php-format
 msgid "User %1$s (%2$d) has no profile record."
-msgstr "ユーザ�プロフィールをも�����ん。"
+msgstr "ユーザー %1$s (%2$d) プロファイルをも�����ん。"
 
 #. TRANS: Authorisation exception thrown when a user a not allowed to login.
-#, fuzzy
 msgid "Not allowed to log in."
-msgstr "ログイン�����ん。"
+msgstr "ログイン�許��れ����ん。"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 msgid "a few seconds ago"
@@ -10454,7 +9531,7 @@ msgstr[0] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 msgid "about a month ago"
-msgstr "約 1 ヵ月�"
+msgstr "約 1 ヶ月�"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 #, php-format
@@ -10468,26 +9545,19 @@ msgstr "約 1 年�"
 
 #. TRANS: Web color exception thrown when a hexadecimal color code does not validate.
 #. TRANS: %s is the provided (invalid) color code.
-#, fuzzy, php-format
+#, php-format
 msgid "%s is not a valid color! Use 3 or 6 hex characters."
-msgstr "%s �有効�色���り��ん! 3�6�16進数を使������。"
+msgstr "%s �有効�色���り��ん� 3 �� 6 �� 16 進数を使������。"
 
 #. TRANS: Exception.
-#, fuzzy
 msgid "Invalid XML."
-msgstr "�正�サイズ。"
+msgstr "無効� XML。"
 
 #. TRANS: Exception.
 msgid "Invalid XML, missing XRD root."
-msgstr ""
+msgstr "無効�XML��。XRD root ��り��ん。"
 
 #. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
 #, php-format
 msgid "Getting backup from file '%s'."
-msgstr ""
-
-#~ msgid "%1$s and friends, page %2$d"
-#~ msgstr "%1$s����人�%2$dページ目"
-
-#~ msgid "You and friends"
-#~ msgstr "�����人"
+msgstr "ファイル '%s' �ら�ックアップを�得�る。"
diff --git a/locale/ka/LC_MESSAGES/statusnet.po b/locale/ka/LC_MESSAGES/statusnet.po
index c494ecb1d2..38eeeca2ed 100644
--- a/locale/ka/LC_MESSAGES/statusnet.po
+++ b/locale/ka/LC_MESSAGES/statusnet.po
@@ -9,17 +9,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:23+0000\n"
-"Language-Team: Georgian <http://translatewiki.net/wiki/Portal:ka>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:17+0000\n"
+"Language-Team: Georgian <https://translatewiki.net/wiki/Portal:ka>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ka\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-POT-Import-Date: 2011-05-05 10:52:40+0000\n"
+"X-POT-Import-Date: 2012-04-22 22:02:21+0000\n"
 
 #. TRANS: Database error message.
 #, php-format
@@ -30,12 +30,6 @@ msgid ""
 "again."
 msgstr ""
 
-#. TRANS: Error message.
-msgid ""
-"An important error occured, probably related to email setup. Check logfiles "
-"for more info."
-msgstr ""
-
 #. TRANS: Error message.
 msgid "An error occurred."
 msgstr ""
@@ -95,12 +89,12 @@ msgstr "�ხ�ლი რეგისტრ�ციების გ�უქ
 msgid "Closed"
 msgstr "დ�ხურული"
 
-#. TRANS: Title for button to save access settings in site admin panel.
-msgid "Save access settings"
+#. TRANS: Button title to save access settings in site admin panel.
+#, fuzzy
+msgid "Save access settings."
 msgstr "შეინ�ხე შესვლის პ�რ�მეტრები"
 
-#. TRANS: Tooltip for button to save access settings in site admin panel.
-#. TRANS: Button text for saving theme settings.
+#. TRANS: Button text to save access settings in site admin panel.
 #. TRANS: Button label to save e-mail preferences.
 #. TRANS: Button label to save IM preferences.
 #. TRANS: Button text in the license admin panel.
@@ -116,7 +110,6 @@ msgstr "შეინ�ხე შესვლის პ�რ�მეტრე
 #. TRANS: Button text for saving "Other settings" in profile.
 #. TRANS: Button text to save user settings in user admin panel.
 #. TRANS: Button label in the "Edit application" form.
-#. TRANS: Button text on profile design page to save settings.
 #. TRANS: Text for save button on group edit form.
 #. TRANS: Button text to save tags for a profile.
 msgctxt "BUTTON"
@@ -156,12 +149,6 @@ msgstr "�სეთი პრ�ფილი �რ �რსებ�ბს."
 msgid "No such list."
 msgstr "�სეთი ს�ნიშნე �რ �რსებ�ბს."
 
-#. TRANS: Client error displayed when trying to add an OMB 0.1 remote profile to a list.
-#, fuzzy
-msgid "You cannot list an OMB 0.1 remote profile with this action."
-msgstr ""
-"თქვენ �რ შეგიძლი�თ გ�მ�იწერ�თ 0მბ-ი�ნი 0.1 დ�შ�რებული პრ�ფილი �მ მ�ქმედებით."
-
 #. TRANS: Client error displayed when an unknown error occurs when adding a user to a list.
 #. TRANS: %s is a username.
 #, php-format
@@ -192,7 +179,6 @@ msgstr "�სეთი გვერდი �რ �რსებ�ბს."
 #. TRANS: Client error when user not found for an rss related action.
 #. TRANS: Client error displayed when no existing user is provided for a user's delivery device setting.
 #. TRANS: Client error displayed if a user could not be found.
-#. TRANS: Client error when user not found updating a profile background image.
 #. TRANS: Client error displayed updating profile image without having a user object.
 #. TRANS: Client error displayed when making an Atom API request for an unknown user.
 #. TRANS: Client error displayed when trying to block a non-existing user or a user from another site.
@@ -218,14 +204,11 @@ msgstr "�სეთი გვერდი �რ �რსებ�ბს."
 #. TRANS: Client error displayed when trying to get the RSS feed with favorites of a user that does not exist.
 #. TRANS: Client error displayed when requesting Friends of a Friend feed without providing a user nickname.
 #. TRANS: Client error displayed when requesting Friends of a Friend feed for an object that is not a user.
-#. TRANS: Client error displayed when trying to get a user hCard for a non-existing user.
 #. TRANS: Client error displayed trying to make a micro summary without providing a valid user.
 #. TRANS: Client error displayed trying to send a direct message to a non-existing user.
 #. TRANS: Client error displayed trying to use "one time password login" without using an existing user.
 #. TRANS: Client error displayed when referring to non-existing user.
 #. TRANS: Client error displayed trying to perform an action related to a non-existing user.
-#. TRANS: Form validation error on page for remote subscribe when no user was provided.
-#. TRANS: Form validation error on page for remote subscribe when no user profile was found.
 #. TRANS: Client error displayed when trying to reply to a non-exsting user.
 #. TRANS: Client error displayed when providing a non-existing nickname in a RSS 1.0 action.
 #. TRANS: Client error.
@@ -234,7 +217,6 @@ msgstr "�სეთი გვერდი �რ �რსებ�ბს."
 #. TRANS: Client error displayed trying to find a user by ID for a non-existing ID.
 #. TRANS: Client error displayed requesting groups for a non-existing user.
 #. TRANS: Client error displayed when user not found for an action.
-#. TRANS: Client error displayed providing a non-existing nickname.
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #. TRANS: Client error displayed when trying to perform a gallery action with an unknown user.
 #. TRANS: Client error displayed when trying to access a mailbox without providing a user.
@@ -253,6 +235,13 @@ msgstr "%s-ის ნ�კ�დი"
 msgid "%s's home timeline"
 msgstr "%s-ის ნ�კ�დი"
 
+#. TRANS: %s is user nickname.
+#. TRANS: Feed title.
+#. TRANS: %s is tagger's nickname.
+#, php-format
+msgid "Feed for friends of %s (Activity Streams JSON)"
+msgstr ""
+
 #. TRANS: %s is user nickname.
 #, php-format
 msgid "Feed for friends of %s (RSS 1.0)"
@@ -296,7 +285,7 @@ msgid ""
 "to them](%%%%action.newnotice%%%%?status_textarea=%3$s)."
 msgstr ""
 
-#. TRANS: Encoutagement displayed on empty timeline user pages for anonymous users.
+#. TRANS: Encouragement displayed on empty timeline user pages for anonymous users.
 #. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
 #. TRANS: Empty list message for page with replies for a user for not logged in users.
 #. TRANS: %1$s is a user nickname. This message contains a Markdown link in the form [link text](link).
@@ -310,6 +299,13 @@ msgstr ""
 "[გ�ხსენი �ნგ�რიში](%%%%action.register%%%%) დ� გ�მ�ეხმ�ურე %s-ს �ნ დ�უტ�ვე "
 "შეტყ�ბინებ�."
 
+#. TRANS: Button text for inviting more users to the StatusNet instance.
+#. TRANS: Less business/enterprise-oriented language for public sites.
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Send invite"
+msgstr "მ�ს�წვევეი"
+
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Title of API timeline for a user and friends.
 #. TRANS: %s is a username.
@@ -318,8 +314,6 @@ msgstr ""
 #. TRANS: %s is a username.
 #. TRANS: Menu item title in personal group navigation menu.
 #. TRANS: %s is a username.
-#. TRANS: Menu item title in settings navigation panel.
-#. TRANS: %s is a username.
 #, php-format
 msgid "%s and friends"
 msgstr " %s დ� მეგ�ბრები"
@@ -359,7 +353,6 @@ msgstr ""
 #. TRANS: Server error thrown on database error updating SMS preferences.
 #. TRANS: Server error thrown on database error removing a registered SMS phone number.
 #. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
-#. TRANS: Server exception thrown on Profile design page when updating design settings fails.
 msgid "Could not update user."
 msgstr "მ�მხმ�რებლის გ�ნ�ხლებ� ვერ მ�ხერხდ�."
 
@@ -374,7 +367,6 @@ msgstr "პრ�ფილის შენ�ხვ� ვერ მ�ხერ
 
 #. TRANS: Client error displayed when the number of bytes in a POST request exceeds a limit.
 #. TRANS: %s is the number of bytes of the CONTENT_LENGTH.
-#. TRANS: Form validation error in design settings form. POST should remain untranslated.
 #, fuzzy, php-format
 msgid ""
 "The server was unable to handle that much POST data (%s byte) due to its "
@@ -386,24 +378,6 @@ msgstr[0] ""
 "ს�მწუხ�რ�დ სერვერმ� ვერ გ�უძლ� �მდენ POST მ�ნ�ცემებს (%s ბ�იტი) მიმდინ�რე "
 "კ�ნფიგურ�ციის გ�მ�."
 
-#. TRANS: Client error displayed when saving design settings fails because of an empty id.
-#. TRANS: Client error displayed when saving design settings fails because of an empty result.
-#. TRANS: Client error displayed when a database error occurs inserting profile colours.
-#. TRANS: Client error displayed when a database error occurs updating profile colours.
-#. TRANS: Form validation error displayed when group design settings could not be saved because of an application issue.
-#. TRANS: Form validation error on Profile design page when saving design settings has failed.
-#. TRANS: Form validation error on Profile design page when updating design settings has failed.
-msgid "Unable to save your design settings."
-msgstr "ს�მწუხ�რ�დ თქვენი დიზ�ინის პ�რ�მეტრების შენ�ხვ� ვერ მ�ხერხდ�."
-
-#. TRANS: Error displayed when updating design settings fails.
-#. TRANS: Client error displayed when a database error occurs updating profile colours.
-#. TRANS: Form validation error on Profile design page when updating design settings has failed.
-#. TRANS: Error message displayed if design settings could not be saved.
-#. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
-msgid "Could not update your design."
-msgstr "დიზ�ინის გ�ნ�ხლებ� ვერ მ�ხერხდ�."
-
 #. TRANS: Title for Atom feed.
 msgctxt "ATOM"
 msgid "Main"
@@ -450,6 +424,22 @@ msgstr "მ�მხმ�რებლის დ�ბლ�კვ� ვერ
 msgid "Unblock user failed."
 msgstr "ვერ მ�ხერხდ� მ�მხმ�რებელზე ბლ�კის მ�ხსნ�."
 
+#. TRANS: Client exception thrown when no conversation ID is given.
+#, fuzzy
+msgid "No conversation ID."
+msgstr "ს�უბ�რი"
+
+#. TRANS: Client exception thrown when referring to a non-existing conversation ID (%d).
+#, fuzzy, php-format
+msgid "No conversation with ID %d."
+msgstr "ს�უბ�რი"
+
+#. TRANS: Title for conversion timeline.
+#, fuzzy
+msgctxt "TITLE"
+msgid "Conversation"
+msgstr "ს�უბ�რი"
+
 #. TRANS: Title. %s is a user nickname.
 #, php-format
 msgid "Direct messages from %s"
@@ -493,6 +483,8 @@ msgid "Cannot send direct messages to users who aren't your friend."
 msgstr "ვერ გ�უგზ�ვნი პირდ�პირ შეტყ�ბინებ�ს იმ�ს, ვისთ�ნ�ც �რ მეგ�ბრ�ბ."
 
 #. TRANS: Client error displayed trying to direct message self (403).
+#. TRANS: Client error displayed trying to send a direct message to self.
+#. TRANS: Error text shown when trying to send a direct message to self.
 #, fuzzy
 msgid ""
 "Do not send a message to yourself; just say it to yourself quietly instead."
@@ -723,7 +715,6 @@ msgstr "ჯგუფები %s-ზე"
 
 #. TRANS: Client error displayed when trying to edit a group without being an admin.
 #. TRANS: Client error displayed trying to edit a group while not being a group admin.
-#. TRANS: Client error displayed trying to change group design settings without being a (group) admin.
 #. TRANS: Client error displayed when trying to change group logo settings while not being a group admin.
 msgid "You must be an admin to edit the group."
 msgstr "ჯგუფის რედ�ქტირების�თვის ს�ჭირ�� �დმინის უფლებები."
@@ -841,7 +832,6 @@ msgstr "ბ�ზ�მ დ�უშვ� შეცდ�მ� OAuth �პლ
 
 #. TRANS: Client error given on when invalid data was passed through a form in the OAuth API.
 #. TRANS: Unexpected validation error on avatar upload form.
-#. TRANS: Client error displayed when the submitted form contains unexpected data.
 #. TRANS: Client error displayed submitting invalid form data for edit application.
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
 #. TRANS: Form validation error message when an unsupported argument is used.
@@ -850,7 +840,6 @@ msgstr "ბ�ზ�მ დ�უშვ� შეცდ�მ� OAuth �პლ
 #. TRANS: Client error when submitting a form with unexpected information.
 #. TRANS: Client error displayed when unexpected data is posted in the password recovery form.
 #. TRANS: Message given submitting a form with an unknown action in SMS settings.
-#. TRANS: Unknown form validation error in design settings form.
 msgid "Unexpected form submission."
 msgstr ""
 
@@ -890,7 +879,6 @@ msgstr "�ნგ�რიში"
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Field label on account registration page.
-#. TRANS: Label for nickname on user authorisation page.
 #. TRANS: Field label on group edit form.
 #. TRANS: Dropdown option for searching in profiles.
 msgid "Nickname"
@@ -1206,12 +1194,9 @@ msgstr "გჯუფის დ�ტ�ვების�თვის ს�ჭ
 #. TRANS: Client error displayed when requesting Friends of a Friend feed for a nickname that is not a group.
 #. TRANS: Client error displayed trying to block a user from a group while specifying a non-existing group.
 #. TRANS: Client error displayed referring to a group's permalink for a non-existing group ID.
-#. TRANS: Client error displayed trying to change group design settings while providing a nickname for a non-existing group.
 #. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
 #. TRANS: Client error displayed when trying to view group members for a non-existing group.
 #. TRANS: Client error displayed when trying to view group members for an object that is not a group.
-#. TRANS: Client error displayed when trying to view group members for a non-existing group.
-#. TRANS: Client error displayed when trying to view group members for an object that is not a group.
 #. TRANS: Client error displayed when requesting a group RSS feed for group that does not exist.
 #. TRANS: Client error displayed when requesting a group RSS feed for an object that is not a group.
 #. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
@@ -1220,10 +1205,10 @@ msgstr "გჯუფის დ�ტ�ვების�თვის ს�ჭ
 #. TRANS: Client error displayed when trying to leave a non-local group.
 #. TRANS: Client error displayed when trying to leave a non-existing group.
 #. TRANS: Client error displayed when providing an invalid group ID on the Make Admin page.
-#. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
-#. TRANS: Client error displayed if no local group with a given name was found requesting group page.
 #. TRANS: Command exception text shown when a group is requested that does not exist.
 #. TRANS: Error text shown when trying to leave a group that does not exist.
+#. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
+#. TRANS: Client error displayed if no local group with a given name was found requesting group page.
 msgid "No such group."
 msgstr "�სეთი ჯგუფი ვერ მ�იძებნ�."
 
@@ -1292,6 +1277,7 @@ msgid "Join request canceled."
 msgstr ""
 
 #. TRANS: Client error displayed trying to approve subscription for a non-existing request.
+#. TRANS: %s is a user nickname.
 #, fuzzy, php-format
 msgid "%s is not in the moderation queue for your subscriptions."
 msgstr "�მ ჯგუფის წევრების სი�."
@@ -1456,7 +1442,6 @@ msgstr "�სეთი მიმ�გრებული დ�კუმენ
 #. TRANS: Client error displayed trying to get an avatar without providing a nickname.
 #. TRANS: Client error displayed when requesting a list of blocked users for a group without providing a group nickname.
 #. TRANS: Client error displayed trying to edit a group while not proving a nickname for the group to edit.
-#. TRANS: Client error displayed trying to change group design settings without providing a group nickname.
 #. TRANS: Client error displayed when trying to change group logo settings without providing a nickname.
 #. TRANS: Client error displayed when trying to view group members without providing a group nickname.
 #. TRANS: Client error displayed when requesting a group RSS feed without providing a group nickname.
@@ -1757,6 +1742,18 @@ msgstr "მის�მ�რთი \"%s\" დ�დ�სტურდ� თქ
 msgid "Conversation"
 msgstr "ს�უბ�რი"
 
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#, fuzzy
+msgid "Conversation feed (Activity Streams JSON)"
+msgstr "შეტყ�ბინებების RSS მ�ნიშნული %s-თ (Atom)"
+
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#, fuzzy
+msgid "Conversation feed (RSS 2.0)"
+msgstr "ს�უბ�რი"
+
 #. TRANS: Title for conversation page.
 #. TRANS: Title for page that shows a notice.
 #, fuzzy
@@ -1822,7 +1819,7 @@ msgstr "თქვენ ვერ შეძლებთ მ�მხმ�რე
 
 #. TRANS: Button title for user account deletion.
 #, fuzzy
-msgid "Permanently delete your account"
+msgid "Permanently delete your account."
 msgstr "თქვენ ვერ შეძლებთ მ�მხმ�რებლების წ�შლ�ს."
 
 #. TRANS: Client error displayed trying to delete an application while not logged in.
@@ -1977,158 +1974,6 @@ msgstr "�რ წ�შ�ლ� ეს შეტყ�ბინებ�"
 msgid "Delete this user."
 msgstr "�მ მ�მხმ�რებლის წ�შლ�"
 
-#. TRANS: Message used as title for design settings for the site.
-msgid "Design"
-msgstr "�მ მ�მხმ�რებლის წ�შლ�"
-
-#. TRANS: Instructions for design adminsitration panel.
-msgid "Design settings for this StatusNet site"
-msgstr ""
-
-#. TRANS: Client error displayed when a logo URL does is not valid.
-msgid "Invalid logo URL."
-msgstr "ლ�გ�ს �რ�სწ�რი URL-ი"
-
-#. TRANS: Client error displayed when an SSL logo URL is invalid.
-#, fuzzy
-msgid "Invalid SSL logo URL."
-msgstr "ლ�გ�ს �რ�სწ�რი URL-ი"
-
-#. TRANS: Client error displayed when a theme is submitted through the form that is not in the theme list.
-#. TRANS: %s is the chosen unavailable theme.
-#, php-format
-msgid "Theme not available: %s."
-msgstr "იერს�ხე �რ �რის ხელმის�წვდ�მი %s."
-
-#. TRANS: Fieldset legend for form to change logo.
-msgid "Change logo"
-msgstr "შეცვ�ლე ლ�გ�"
-
-#. TRANS: Field label for StatusNet site logo.
-msgid "Site logo"
-msgstr "ს�იტის ლ�გ�"
-
-#. TRANS: Field label for SSL StatusNet site logo.
-#, fuzzy
-msgid "SSL logo"
-msgstr "ს�იტის ლ�გ�"
-
-#. TRANS: Fieldset legend for form change StatusNet site's theme.
-msgid "Change theme"
-msgstr "შეცვ�ლე იერს�ხე"
-
-#. TRANS: Field label for dropdown to choose site theme.
-msgid "Site theme"
-msgstr "ს�იტის იერს�ხე"
-
-#. TRANS: Title for field label for dropdown to choose site theme.
-msgid "Theme for the site."
-msgstr "იერს�ხე �მ ს�იტისთვის"
-
-#. TRANS: Field label for uploading a cutom theme.
-msgid "Custom theme"
-msgstr "ს�კუთ�რი იერს�ხე"
-
-#. TRANS: Form instructions for uploading a cutom StatusNet theme.
-msgid "You can upload a custom StatusNet theme as a .ZIP archive."
-msgstr ""
-"თქვენ შეგიძლი�თ �ტვირთ�თ ს�კუთ�რი StatusNet–იერს�ხე .ZIP �რქივის ს�ხით."
-
-#. TRANS: Fieldset legend for theme background image.
-msgid "Change background image"
-msgstr "შეცვ�ლე ფ�ნური სურ�თი"
-
-#. TRANS: Field label for background image on theme designer page.
-#. TRANS: Field label for background color selector.
-#. TRANS: Label on profile design page for setting a profile page background colour.
-msgid "Background"
-msgstr "ფ�ნი"
-
-#. TRANS: Form guide for background image upload form on theme designer page.
-#, php-format
-msgid ""
-"You can upload a background image for the site. The maximum file size is %1"
-"$s."
-msgstr ""
-"თქვენ შეგიძლი�თ �ტვუირთ�თ ფ�ნური სურ�თი �მ ს�იტისთვის. ფ�ილის დ�ს�შვები "
-"ზ�მ�� %1$s."
-
-#. TRANS: Used as radio button label to add a background image.
-msgid "On"
-msgstr "ჩ�რთვ�"
-
-#. TRANS: Used as radio button label to not add a background image.
-msgid "Off"
-msgstr "გ�მ�რთვ�"
-
-#. TRANS: Form guide for turning background image on or off on theme designer page.
-#. TRANS: Form guide for a set of radio buttons on the profile design page that will enable or disable
-#. TRANS: use of the uploaded profile image.
-msgid "Turn background image on or off."
-msgstr "ჩ�რთე �ნ გ�მ�რთე ფ�ნური სურ�თის ფუნქცი�."
-
-#. TRANS: Checkbox label to title background image on theme designer page.
-#. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
-msgid "Tile background image"
-msgstr "გ��მრ�ვლე ფ�ნური სურ�თი"
-
-#. TRANS: Fieldset legend for theme colors.
-#, fuzzy
-msgid "Change colors"
-msgstr "შეცვ�ლე ფერები"
-
-#. TRANS: Field label for content color selector.
-#. TRANS: Label on profile design page for setting a profile page content colour.
-msgid "Content"
-msgstr "შიგთ�ვსი"
-
-#. TRANS: Field label for sidebar color selector.
-#. TRANS: Label on profile design page for setting a profile page sidebar colour.
-msgid "Sidebar"
-msgstr "გვერდითი პ�ნელი"
-
-#. TRANS: Field label for text color selector.
-#. TRANS: Label on profile design page for setting a profile page text colour.
-msgid "Text"
-msgstr "ტექსტი"
-
-#. TRANS: Field label for link color selector.
-#. TRANS: Label on profile design page for setting a profile page links colour.
-msgid "Links"
-msgstr "ბმულები"
-
-#. TRANS: Fieldset legend for advanced theme design settings.
-msgid "Advanced"
-msgstr "მეტი პ�რ�მეტრები"
-
-#. TRANS: Field label for custom CSS.
-msgid "Custom CSS"
-msgstr "ს�კუთ�რი CSS"
-
-#. TRANS: Button text for resetting theme settings.
-#, fuzzy
-msgctxt "BUTTON"
-msgid "Use defaults"
-msgstr "გ�მ�იყენე პირვ�ნდელი მდგ�მ�რე�ბ�"
-
-#. TRANS: Title for button for resetting theme settings.
-#. TRANS: Title for button on profile design page to reset all colour settings to default.
-#, fuzzy
-msgid "Restore default designs."
-msgstr "დ��ბრუნე პირვ�ნდელი დიზ�ინი"
-
-#. TRANS: Title for button for resetting theme settings.
-#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#, fuzzy
-msgid "Reset back to default."
-msgstr "პირვ�ნდელის პ�რ�მეტრების დ�ბრუნებ�"
-
-#. TRANS: Title for button for saving theme settings.
-#. TRANS: Title for button on profile design page to save settings.
-#, fuzzy
-msgid "Save design."
-msgstr "შეინ�ხე დიზ�ინი"
-
 #. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
 msgid "This notice is not a favorite!"
 msgstr "ეს შეტყ�ბინებ� �რ �რის რჩეული!"
@@ -2143,6 +1988,84 @@ msgstr "რჩეულებში დ�მ�ტებ�"
 msgid "No such document \"%s\"."
 msgstr "�სეთი დ�კუმენტი �რ �რის \"%s\""
 
+#. TRANS: Menu item in administrator navigation panel.
+#. TRANS: Menu item in default local navigation panel.
+#. TRANS: Menu item in personal group navigation menu.
+#, fuzzy
+msgctxt "MENU"
+msgid "Home"
+msgstr "ვებ. გვერსი"
+
+msgctxt "MENU"
+msgid "Docs"
+msgstr ""
+
+#. TRANS: Secondary navigation menu item leading to help on StatusNet.
+msgctxt "MENU"
+msgid "Help"
+msgstr "დ�ხმ�რებ�"
+
+#, fuzzy
+msgid "Getting started"
+msgstr "პ�რ�მეტრები შენ�ხული�."
+
+#. TRANS: Secondary navigation menu item leading to text about StatusNet site.
+#, fuzzy
+msgctxt "MENU"
+msgid "About"
+msgstr "ს�იტის შეს�ხებ"
+
+#, fuzzy
+msgid "About this site"
+msgstr "მ�მხმ�რებლის ბლ�კირების მ�ხსნ�"
+
+#. TRANS: Secondary navigation menu item leading to Frequently Asked Questions.
+#, fuzzy
+msgctxt "MENU"
+msgid "FAQ"
+msgstr "ხდკ"
+
+msgid "Frequently asked questions"
+msgstr ""
+
+#. TRANS: Secondary navigation menu item leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+#, fuzzy
+msgctxt "MENU"
+msgid "Contact"
+msgstr "კ�ნტ�ქტი"
+
+#, fuzzy
+msgid "Contact info"
+msgstr "კ�ნტ�ქტი"
+
+#, fuzzy
+msgctxt "MENU"
+msgid "Tags"
+msgstr "ს�ნიშნეები"
+
+msgid "Using tags"
+msgstr ""
+
+#. TRANS: Menu item in default local navigation panel.
+#. TRANS: Menu item in search group navigation panel.
+#. TRANS: Menu item in local navigation menu.
+#, fuzzy
+msgctxt "MENU"
+msgid "Groups"
+msgstr "ჯგუფები"
+
+#, fuzzy
+msgid "Using groups"
+msgstr "%s ჯგუფები"
+
+msgctxt "MENU"
+msgid "API"
+msgstr ""
+
+msgid "RESTful API"
+msgstr ""
+
 #. TRANS: Title for "Edit application" form.
 #. TRANS: Form legend.
 msgid "Edit application"
@@ -2309,7 +2232,7 @@ msgid ""
 "subscriptions to it. Do you still want to continue?"
 msgstr ""
 
-#. TRANS: TRANS: Server error displayed when updating a list fails.
+#. TRANS: Server error displayed when updating a list fails.
 #, fuzzy
 msgid "Could not update list."
 msgstr "მ�მხმ�რებლის გ�ნ�ხლებ� ვერ მ�ხერხდ�."
@@ -2618,40 +2541,6 @@ msgstr "მიმ�გრებული დ�კუმენტი �რ �
 msgid "No uploaded attachments."
 msgstr "�ტვირთული მიმ�გრებული დ�კუმენტი �რ �რის."
 
-#. TRANS: Client error displayed when subscribing to a remote profile and an unexpected response is received.
-msgid "Not expecting this response!"
-msgstr "ეს უკუქმედებ� �რ �რის მ�ს�ლ�დნელი."
-
-#. TRANS: Client error displayed when subscribing to a remote profile that does not exist.
-msgid "User being listened to does not exist."
-msgstr "მის�დევნებელი მ�მხმ�რებელი �რ �რსებ�ბს."
-
-#. TRANS: Client error displayed when subscribing to a remote profile that is a local profile.
-#. TRANS: Client error displayed when using remote subscribe for a local entity.
-msgid "You can use the local subscription!"
-msgstr "შეგიძლი�თ გ�მ�იყენ�თ �დგილ�ბრივი გ�მ�წერ�!"
-
-#. TRANS: Client error displayed when subscribing to a remote profile that is blocked form subscribing to.
-msgid "That user has blocked you from subscribing."
-msgstr "�მ მ�მხმ�რებელმ� �გიკრძ�ლ�თ მიდევნებ�."
-
-#. TRANS: Client error displayed when subscribing to a remote profile without providing an authorised token.
-msgid "You are not authorized."
-msgstr "თქვენ �რ ხ�რთ �ვტ�რიზირებული."
-
-#. TRANS: Client error displayed when subscribing to a remote profile and conversion of the request token to access token fails.
-msgid "Could not convert request token to access token."
-msgstr ""
-
-#. TRANS: Client error displayed when subscribing to a remote profile fails because of an unsupported version of the OMB protocol.
-msgid "Remote service uses unknown version of OMB protocol."
-msgstr "დ�შ�რებული სერვისი OMB პრ�ტ�კ�ლის უცნ�ბ ვერსი�ს იყენებს."
-
-#. TRANS: Server error displayed when subscribing to a remote profile fails because the remote profile could not be updated.
-#. TRANS: Exception thrown when updating a remote profile fails in OAuth store.
-msgid "Error updating remote profile."
-msgstr "შეცდ�მ� დ�შ�რებული პრ�ფილის გ�ნ�ხლების�ს."
-
 #. TRANS: Client error displayed when requesting a non-existent file.
 msgid "No such file."
 msgstr "�სეთი ფ�ილი �რ �რსებ�ბს."
@@ -2741,32 +2630,6 @@ msgstr "მ�მხმ�რებლის ჯგუფიდ�ნ გ�რ
 msgid "No ID."
 msgstr "ID უცნ�ბი�."
 
-#. TRANS: Client error displayed trying to change group design settings while not logged in.
-msgid "You must be logged in to edit a group."
-msgstr "ჯგუფის რედ�ქტირების�თვის ს�ჭირ�� �ვტ�რიზ�ცი�."
-
-#. TRANS: Title group design settings page.
-msgid "Group design"
-msgstr "ჯგუფის დიზ�ინი"
-
-#. TRANS: Instructions for group design settings page.
-msgid ""
-"Customize the way your group looks with a background image and a colour "
-"palette of your choice."
-msgstr ""
-"�ირჩიეთ, რ�გ�რ გნებ�ვთ გ�მ�იყურებ�დეს თქვენი ჯგუფი ფ�ნური სურ�თის� დ� ფერთ� "
-"პ�ლიტრის შეცვლით."
-
-#. TRANS: Form validation error displayed when group design settings could not be updated because of an application issue.
-#, fuzzy
-msgid "Unable to update your design settings."
-msgstr "ს�მწუხ�რ�დ თქვენი დიზ�ინის პ�რ�მეტრების შენ�ხვ� ვერ მ�ხერხდ�."
-
-#. TRANS: Form text to confirm saved group design settings.
-#. TRANS: Confirmation message on Profile design page when saving design settings has succeeded.
-msgid "Design preferences saved."
-msgstr "დიზ�ინის პ�რ�მეტრები შენ�ხული�."
-
 #. TRANS: Title for group logo settings page.
 #. TRANS: Group logo form legend.
 msgid "Group logo"
@@ -2941,8 +2804,8 @@ msgstr "IM პ�რ�მეტრები"
 #. TRANS: the order and formatting of link text and link should remain unchanged.
 #, fuzzy, php-format
 msgid ""
-"You can send and receive notices through instant messaging [instant messages]"
-"(%%doc.im%%). Configure your addresses and settings below."
+"You can send and receive notices through [instant messaging](%%doc.im%%). "
+"Configure your addresses and settings below."
 msgstr ""
 "თქვენ შეგიძლი�თ მიიღ�თ დ� გ��გზ�ვნ�თ შეტყ�ბინებები Jabber/GTalk [ჩეთით](%%"
 "doc.im%%). მ�მ�რთეთ თქვენი მის�მ�რთი დ� პ�რ�მეტრები ქვევით."
@@ -3160,29 +3023,6 @@ msgstr ""
 "გ�მ�იყენეთ ეს ფ�რმ� რ�მ დ�პ�ტიჟ�თ მეგ�ბრები დ� კ�ლეგები �მ სერვისის "
 "გ�მ�ს�ყენებლ�დ."
 
-#. TRANS: Field label for a list of e-mail addresses.
-msgid "Email addresses"
-msgstr "ელ. ფ�სტის მის�მ�რთები"
-
-#. TRANS: Tooltip for field label for a list of e-mail addresses.
-#, fuzzy
-msgid "Addresses of friends to invite (one per line)."
-msgstr "დ�ს�პ�ტიჟებელი მ�გ�ბრების მის�მ�რთები (თით� ხ�ზზე თით�)"
-
-#. TRANS: Field label for a personal message to send to invitees.
-msgid "Personal message"
-msgstr "პირ�დი შეტყ�ბინებ�"
-
-#. TRANS: Tooltip for field label for a personal message to send to invitees.
-msgid "Optionally add a personal message to the invitation."
-msgstr "დ�უმ�ტეთ პირ�დი შეტყ�ბინებ� მ�წვევ�ს (�რ�ს�ვ�ლდებულ�)."
-
-#. TRANS: Send button for inviting friends
-#. TRANS: Button text for sending notice.
-msgctxt "BUTTON"
-msgid "Send"
-msgstr "გ�გზ�ვნ�"
-
 #. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral
 #. TRANS: singular 3rd-person pronoun in English. %1$s is the inviting user, $2$s is
 #. TRANS: the StatusNet sitename.
@@ -3317,12 +3157,6 @@ msgstr ""
 msgid "Save license settings."
 msgstr "ს�იტის პ�რ�მეტრების შენ�ხვ�"
 
-#. TRANS: Client error displayed when trying to log in while already logged in.
-#. TRANS: Client error displayed trying to use "one time password login" when already logged in.
-#. TRANS: Client error displayed when trying to register while already logged in.
-msgid "Already logged in."
-msgstr "უკვე �ვტ�რიზირებული ხ�რთ."
-
 #. TRANS: Form validation error displayed when trying to log in with incorrect credentials.
 msgid "Incorrect username or password."
 msgstr "�რ�სწ�რი მ�მხმ�რებლის ს�ხელი �ნ პ�რ�ლი."
@@ -3435,6 +3269,7 @@ msgstr "წყ�რ�ს URL ს�ვ�ლდებულ��."
 msgid "Could not create application."
 msgstr "�პლიკ�ციის შექმნ� ვერ მ�ხერხდ�."
 
+#. TRANS: Form validation error messages displayed when uploading an invalid application logo.
 #, fuzzy
 msgid "Invalid image."
 msgstr "ზ�მ� �რ�სწ�რი�."
@@ -3474,12 +3309,6 @@ msgstr "შიგთ�ვსი �რ �რის!"
 msgid "No recipient specified."
 msgstr "მიმღები მითითებული �რ �რის."
 
-#. TRANS: Client error displayed trying to send a direct message to self.
-#. TRANS: Error text shown when trying to send a direct message to self.
-msgid ""
-"Don't send a message to yourself; just say it to yourself quietly instead."
-msgstr "ნუ გ�უგზ�ვნი შეტყ�ბინებ�ს ს�კუთ�რ თ�ვს; უბრ�ლ�დ ჩუმ�დ ჩ�უჩურჩულე."
-
 #. TRANS: Page title after sending a direct message.
 msgid "Message sent"
 msgstr "შეტყ�ბინებ� გ�გზ�ვნილი�"
@@ -3680,6 +3509,33 @@ msgstr "გთხ�ვთ გ�მ�იყენ�თ მხ�ლ�დ %s
 msgid "Not a supported data format."
 msgstr "მ�ნ�ცემთ� ფ�რმ�ტი მხ�რდ�ჭერილი �რ �რის."
 
+#. TRANS: Page title for profile settings.
+#, fuzzy
+msgid "Old school UI settings"
+msgstr "IM პ�რ�მეტრები"
+
+#. TRANS: Usage instructions for profile settings.
+msgid "If you like it \"the old way\", you can set that here."
+msgstr ""
+
+#. TRANS: Confirmation shown when user profile settings are saved.
+#. TRANS: Message after successful saving of administrative settings.
+msgid "Settings saved."
+msgstr "პ�რ�მეტრები შენ�ხული�."
+
+msgid "Only stream mode (no conversations) in timelines"
+msgstr ""
+
+msgid "Show conversation page as hierarchical trees"
+msgstr ""
+
+msgid "Show nicknames (not full names) in timelines"
+msgstr ""
+
+#. TRANS: Button text to save a list.
+msgid "Save"
+msgstr "შენ�ხვ�"
+
 #. TRANS: ShortName in the OpenSearch interface when trying to find users.
 msgid "People Search"
 msgstr "პირ�ვნებების ძიებ�"
@@ -3688,6 +3544,11 @@ msgstr "პირ�ვნებების ძიებ�"
 msgid "Notice Search"
 msgstr "შეტყ�ბინებების ძიებ�"
 
+#. TRANS: Client error displayed trying to use "one time password login" when already logged in.
+#. TRANS: Client error displayed when trying to register while already logged in.
+msgid "Already logged in."
+msgstr "უკვე �ვტ�რიზირებული ხ�რთ."
+
 #. TRANS: Client error displayed trying to use "one time password login" without specifying a user.
 msgid "No user ID specified."
 msgstr "მ�მხმ�რებლის ID მითითებული �რ �რის."
@@ -3762,7 +3623,7 @@ msgid "Confirm"
 msgstr "ვ�დ�სტურებ"
 
 #. TRANS: Field title on page where to change password.
-#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
+#. TRANS: Title for field label for password reset form where the password has to be typed again.
 #. TRANS: Field title on account registration page.
 #, fuzzy
 msgid "Same as password above."
@@ -3825,12 +3686,6 @@ msgstr "იერს�ხის დირექტ�რი� �რ �რი
 msgid "Avatar directory not writable: %s."
 msgstr "�ვ�ტ�რის დირექტ�რი� �რ �რის ჩ�წერ�დი: %s."
 
-#. TRANS: Client error in Paths admin panel.
-#. TRANS: %s is the background directory that could not be written to.
-#, php-format
-msgid "Background directory not writable: %s."
-msgstr "ფ�ნის დირექტ�რი� �რ �რის ჩ�წერ�დი: %s."
-
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the locales directory that could not be read from.
 #, php-format
@@ -3952,31 +3807,6 @@ msgstr "�ვ�ტ�რების დირექტ�რი�"
 msgid "Directory where avatars are located."
 msgstr ""
 
-#. TRANS: Fieldset legend in Paths admin panel.
-msgid "Backgrounds"
-msgstr "ფ�ნები"
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-#, fuzzy
-msgid "Server for backgrounds."
-msgstr "იერს�ხე �მ ს�იტისთვის"
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-msgid "Web path to backgrounds."
-msgstr ""
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-msgid "Server for backgrounds on SSL pages."
-msgstr ""
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-msgid "Web path to backgrounds on SSL pages."
-msgstr ""
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-msgid "Directory where backgrounds are located."
-msgstr ""
-
 #. TRANS: Fieldset legens in Paths admin panel.
 msgid "Attachments"
 msgstr "მიმ�გრებები"
@@ -4038,8 +3868,9 @@ msgid "Server to direct SSL requests to."
 msgstr "სერვერი რ�მელზეც მიემ�რთ�ს SSL მ�თხ�ვნები"
 
 #. TRANS: Button title text to store form data in the Paths admin panel.
-msgid "Save paths"
-msgstr "გზების დ�მ�ხს�ვრებ�"
+#, fuzzy
+msgid "Save path settings."
+msgstr "ს�იტის პ�რ�მეტრების შენ�ხვ�"
 
 #. TRANS: Instructions for the "People search" page.
 #. TRANS: %%site.name%% is the name of the StatusNet site.
@@ -4180,7 +4011,7 @@ msgid ""
 "%%%site.name%%%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
 "blogging) service based on the Free Software [StatusNet](http://status.net/) "
 "tool. You can easily keep track of what they are doing by subscribing to the "
-"tag's timeline."
+"list's timeline."
 msgstr ""
 "რს �რის %%site.name%%, [მიკრ�–ბლ�გინგის](http://en.wikipedia.org/wiki/Micro-"
 "blogging) სერვისი, დ�ფუძნებული უფ�ს� [StatusNet](http://status.net/) კ�დზე."
@@ -4211,7 +4042,7 @@ msgid ""
 "site.name%%%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
 "blogging) service based on the Free Software [StatusNet](http://status.net/) "
 "tool. You can easily keep track of what they are doing by subscribing to the "
-"tag's timeline."
+"list's timeline."
 msgstr ""
 "რს �რის %%site.name%%, [მიკრ�–ბლ�გინგის](http://en.wikipedia.org/wiki/Micro-"
 "blogging) სერვისი, დ�ფუძნებული უფ�ს� [StatusNet](http://status.net/) კ�დზე."
@@ -4312,16 +4143,6 @@ msgid ""
 "All default plugins have been disabled from the site's configuration file."
 msgstr ""
 
-#. TRANS: Client error displayed if the notice posted has too many characters.
-msgid "Invalid notice content."
-msgstr "შეტყ�ბინების �რ�სწ�რი შიგთ�ვსი."
-
-#. TRANS: Exception thrown if a notice's license is not compatible with the StatusNet site license.
-#. TRANS: %1$s is the notice license, %2$s is the StatusNet site's license.
-#, fuzzy, php-format
-msgid "Notice license \"%1$s\" is not compatible with site license \"%2$s\"."
-msgstr "შეტყ�ბინების ლიცენზი� ‘%1$s’ შეუთ�ვსებელი� ს�იტის ლიცენზი�სთ�ნ ‘%2$s’."
-
 #. TRANS: Client error displayed when trying to add an unindentified field to profile.
 #. TRANS: %s is a field name.
 #, php-format
@@ -4420,6 +4241,8 @@ msgid "Share my current location when posting notices"
 msgstr "გ��ზი�რე ჩემი მდებ�რე�ბ� შეტყ�ბინებების დ�პ�სტვის�ს"
 
 #. TRANS: Field label in form for profile settings.
+#. TRANS: Title for group tag cloud section.
+#. TRANS: %s is a group name.
 msgid "Tags"
 msgstr "ს�ნიშნეები"
 
@@ -4450,9 +4273,8 @@ msgid "What timezone are you normally in?"
 msgstr "რ�მელ დრ�ის ს�რტყელში ხ�რთ ხ�მლე ჩვეულებრივ?"
 
 #. TRANS: Checkbox label in form for profile settings.
-#, fuzzy
 msgid ""
-"Automatically subscribe to whoever subscribes to me (best for non-humans)."
+"Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr ""
 "�ვტ�მ�ტურ�დ გ�მ�იწერე ის ვინც მე გ�მ�მიწერს (ს�უკეთეს�� �რ� �დ�მი�ნებისთვის)"
 
@@ -4522,11 +4344,6 @@ msgstr "მდებ�რე�ბის პ�რ�მეტრების 
 msgid "Could not save tags."
 msgstr "ს�ნიშნეების შენ�ხვ� ვერ მ�ხერხდ�."
 
-#. TRANS: Confirmation shown when user profile settings are saved.
-#. TRANS: Message after successful saving of administrative settings.
-msgid "Settings saved."
-msgstr "პ�რ�მეტრები შენ�ხული�."
-
 #. TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
 #. TRANS: Page title for page where a user account can be restored from backup.
 #, fuzzy
@@ -4540,7 +4357,8 @@ msgid "Beyond the page limit (%s)."
 msgstr "გვერსიდ ს�ზღვრის მიღმ� (%s)."
 
 #. TRANS: Server error displayed when a public timeline cannot be retrieved.
-msgid "Could not retrieve public stream."
+#, fuzzy
+msgid "Could not retrieve public timeline."
 msgstr "ს�ჯ�რ� ნ�კ�დის გ�მ�თხ�ვნ� ვერ ხერხდებ�."
 
 #. TRANS: Title for all public timeline pages but the first.
@@ -4555,16 +4373,24 @@ msgid "Public timeline"
 msgstr "ს�ჯ�რ� გ�ნ�ხლებების ნ�კ�დი"
 
 #. TRANS: Link description for public timeline feed.
-msgid "Public Stream Feed (RSS 1.0)"
-msgstr ""
+#, fuzzy
+msgid "Public Timeline Feed (Activity Streams JSON)"
+msgstr "შეტყ�ბინებების RSS მ�ნიშნული %s-თ (Atom)"
 
 #. TRANS: Link description for public timeline feed.
-msgid "Public Stream Feed (RSS 2.0)"
-msgstr ""
+#, fuzzy
+msgid "Public Timeline Feed (RSS 1.0)"
+msgstr "ს�ჯ�რ� გ�ნ�ხლებების ნ�კ�დი, გვერდი %d"
 
 #. TRANS: Link description for public timeline feed.
-msgid "Public Stream Feed (Atom)"
-msgstr ""
+#, fuzzy
+msgid "Public Timeline Feed (RSS 2.0)"
+msgstr "ს�ჯ�რ� გ�ნ�ხლებების ნ�კ�დი, გვერდი %d"
+
+#. TRANS: Link description for public timeline feed.
+#, fuzzy
+msgid "Public Timeline Feed (Atom)"
+msgstr "ს�ჯ�რ� გ�ნ�ხლებების ნ�კ�დი, გვერდი %d"
 
 #. TRANS: Text displayed for public feed when there are no public notices.
 #, php-format
@@ -4609,47 +4435,6 @@ msgstr ""
 "რს �რის %%site.name%%, [მიკრ�–ბლ�გინგის](http://en.wikipedia.org/wiki/Micro-"
 "blogging) სერვისი, დ�ფუძნებული უფ�ს� [StatusNet](http://status.net/) კ�დზე."
 
-#. TRANS: Title for page with public list cloud.
-#, fuzzy
-msgid "Public list cloud"
-msgstr "ს�ჯ�რ� ს�ნიშნეების ღრუბელი."
-
-#. TRANS: Page notice for page with public list cloud.
-#. TRANS: %s is a StatusNet sitename.
-#, fuzzy, php-format
-msgid "These are largest lists on %s"
-msgstr "ეს �რის ყველ�ზე პ�პულ�რული ს�ნიშნეები %s–ზე "
-
-#. TRANS: Empty list message on page with public list cloud.
-#. TRANS: This message contains Markdown links in the form [description](link).
-#, fuzzy, php-format
-msgid "No one has [listed](%%doc.tags%%) anyone yet."
-msgstr "ჯერჯერ�ბით �რ�ვის დ�უპ�სტ�ვს შეტყ�ბინებ� [hashtag](%%doc.tags%%)–ით."
-
-#. TRANS: Additional empty list message on page with public list cloud for logged in users.
-#, fuzzy
-msgid "Be the first to list someone!"
-msgstr "დ�პ�სტე პირველმ�!"
-
-#. TRANS: Additional empty list message on page with public list cloud for anonymous users.
-#. TRANS: This message contains Markdown links in the form [description](link).
-#, fuzzy, php-format
-msgid ""
-"Why not [register an account](%%action.register%%) and be the first to list "
-"someone!"
-msgstr "[დ�რეგისტრირდი](%%action.register%%) დ� დ�პ�სტე პირველმ�!"
-
-#. TRANS: DT element on on page with public list cloud.
-#, fuzzy
-msgid "List cloud"
-msgstr "API მეთ�დი ვერ მ�იძებნ�."
-
-#. TRANS: Link title for number of listed people. %d is the number of listed people.
-#, php-format
-msgid "1 person listed"
-msgid_plural "%d people listed"
-msgstr[0] ""
-
 #. TRANS: Public RSS feed description. %s is the StatusNet site name.
 #, fuzzy, php-format
 msgid "%s updates from everyone."
@@ -4775,7 +4560,6 @@ msgid "6 or more characters, and do not forget it!"
 msgstr "6 �ნ მეტი სიმბ�ლ�, დ� �რ დ�გ�ვიწყდეთ!"
 
 #. TRANS: Button text for password reset form.
-#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Reset"
@@ -4785,18 +4569,6 @@ msgstr "გ�დ�ყენებ�"
 msgid "Enter a nickname or email address."
 msgstr "შეიყვ�ნეთ მეტს�ხელი �ნ ელ. ფ�სტის მის�მ�რთი."
 
-#. TRANS: Information on password recovery form if no known username or e-mail address was specified.
-msgid "No user with that email address or username."
-msgstr "�სეთი ელ. ფ�სტის მის�მ�რთით �ნ ს�ხელით �რ �რსებ�ბს."
-
-#. TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.
-msgid "No registered email address for that user."
-msgstr "�მ მ�მხმ�რებლისთვის ვერ მ�იძებნ� რეგისტრირებული ელ. ფ�სტის მის�მ�რთი."
-
-#. TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.
-msgid "Error saving address confirmation."
-msgstr "მის�მ�რთის დ�დ�სტურების სენ�ხვის�ს მ�ხდ� შეცდ�მ�."
-
 #. TRANS: User notification after an e-mail with instructions was sent from the password recovery form.
 msgid ""
 "Instructions for recovering your password have been sent to the email "
@@ -4987,82 +4759,6 @@ msgstr ""
 "(თქვენ უნდ� მიიღ�ს ელ. წერილი მ�მენტ�ლურ�დ. ინსტრუქციებით, თუ რ�გ�რ "
 "დ��დ�სტურ�თ თქვენი ელ. ფ�სტის მის�მ�რთი.)"
 
-#. TRANS: Page notice for remote subscribe. This message contains Markdown links.
-#. TRANS: Ensure to keep the correct markup of [link description](link).
-#, php-format
-msgid ""
-"To subscribe, you can [login](%%action.login%%), or [register](%%action."
-"register%%) a new  account. If you already have an account  on a [compatible "
-"microblogging site](%%doc.openmublog%%),  enter your profile URL below."
-msgstr ""
-"გ�მ�ს�წერ�დ, თქვენ შეგიძლი�თ [შეხვიდეთ](%%action.login%%), �ნ "
-"[დ��რეგისტრირ�თ](%%action.register%%) �ხ�ლი �ნგ�რიში. თუ თქვენ უკვე გ�ქვთ "
-"�ნგ�რიში [თ�ვსებ�დ მიკრ�ბლ�გინგის ს�იტზე](%%doc.openmublog%%), მ�შინ "
-"შეიყვ�ნეთ თქვენი პრ�ფილის URL ქვევით."
-
-#. TRANS: Page title for Remote subscribe.
-msgid "Remote subscribe"
-msgstr "დ�შ�რებული გ�მ�წერ�"
-
-#. TRANS: Field legend on page for remote subscribe.
-msgid "Subscribe to a remote user"
-msgstr "გ�მ�იწერე დ�შ�რებული მ�მხმ�რებელი"
-
-#. TRANS: Field label on page for remote subscribe.
-msgid "User nickname"
-msgstr "მ�მხმ�რებლის მეტს�ხელი"
-
-#. TRANS: Field title on page for remote subscribe.
-#, fuzzy
-msgid "Nickname of the user you want to follow."
-msgstr "მ�მხმ�რებლის მეტს�ხელი რ�მელს�ც გინდ�თ რ�მ მიჰყვეთ"
-
-#. TRANS: Field label on page for remote subscribe.
-msgid "Profile URL"
-msgstr "პრ�ფილის URL"
-
-#. TRANS: Field title on page for remote subscribe.
-#, fuzzy
-msgid "URL of your profile on another compatible microblogging service."
-msgstr "თქვენი პრ�ფილის URL სხვ� თ�ვსებ�დ მიკრ�ბლ�გინგის სერვისზე"
-
-#. TRANS: Button text on page for remote subscribe.
-#. TRANS: Link text for link that will subscribe to a remote profile.
-#. TRANS: Button text to subscribe to a user.
-#. TRANS: Button text for subscribing to a list.
-#, fuzzy
-msgctxt "BUTTON"
-msgid "Subscribe"
-msgstr "გ�მ�წერ�"
-
-#. TRANS: Form validation error on page for remote subscribe when an invalid profile URL was provided.
-#, fuzzy
-msgid "Invalid profile URL (bad format)."
-msgstr "პრ�ფილის �რ�სწ�რი URL (ცუდი ფ�რმ�ტი)"
-
-#. TRANS: Form validation error on page for remote subscribe when no the provided profile URL
-#. TRANS: does not contain expected data.
-msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
-msgstr ""
-"ეს �რ �რის პრ�ფილის სწ�რი URL (YADIS დ�კუმენტი �რ �რის, �ნ �რ�სწ�რი XRDS–� "
-"გ�ნს�ზღვრული)."
-
-#. TRANS: Form validation error on page for remote subscribe.
-#, fuzzy
-msgid "That is a local profile! Login to subscribe."
-msgstr "ეს �დგილ�ბრივი პრ�ფილი�! შედით რ�მ გ�მ�იწერ�თ."
-
-#. TRANS: Form validation error on page for remote subscribe when the remote service is not providing a request token.
-#, fuzzy
-msgid "Could not get a request token."
-msgstr "შეტყ�ბინების ჩ�სმ� ვერ მ�ხერხდ�."
-
-#. TRANS: Client error displayed when trying to (un)list an OMB 0.1 remote profile.
-#, fuzzy
-msgid "You cannot (un)list an OMB 0.1 remote profile with this action."
-msgstr ""
-"თქვენ �რ შეგიძლი�თ გ�მ�იწერ�თ 0მბ-ი�ნი 0.1 დ�შ�რებული პრ�ფილი �მ მ�ქმედებით."
-
 #. TRANS: Client error displayed when an unknown error occurs while delisting a user.
 #. TRANS: %s is a username.
 #, php-format
@@ -5115,6 +4811,12 @@ msgstr "პ�სუხები %s–ს"
 msgid "Replies to %1$s, page %2$d"
 msgstr "პ�სუხები %1$s–ს, გვერდი %2$d"
 
+#. TRANS: Link for feed with replies for a user.
+#. TRANS: %s is a user nickname.
+#, php-format
+msgid "Replies feed for %s (Activity Streams JSON)"
+msgstr ""
+
 #. TRANS: Link for feed with replies for a user.
 #. TRANS: %s is a user nickname.
 #, php-format
@@ -5236,7 +4938,7 @@ msgstr ""
 
 #. TRANS: Form instructions for feed restore.
 msgid ""
-"You can upload a backed-up stream in <a href=\"http://activitystrea.ms/"
+"You can upload a backed-up timeline in <a href=\"http://activitystrea.ms/"
 "\">Activity Streams</a> format."
 msgstr ""
 
@@ -5357,6 +5059,27 @@ msgstr "გ�ს�ღების დ� ს�იდუმლ�ს გ�დ
 msgid "Application info"
 msgstr "ინფ� �პლიკ�ცი�ზე"
 
+#. TRANS: Field label on application page.
+msgid "Consumer key"
+msgstr "მ�მხმ�რებლის გ�ს�ღები"
+
+#. TRANS: Field label on application page.
+msgid "Consumer secret"
+msgstr "მ�მხმ�რებლის ს�იდუმლ�"
+
+#. TRANS: Field label on application page.
+#, fuzzy
+msgid "Request token URL"
+msgstr "�რ�სწ�რი რ�ლი."
+
+#. TRANS: Field label on application page.
+msgid "Access token URL"
+msgstr ""
+
+#. TRANS: Field label on application page.
+msgid "Authorize URL"
+msgstr "URL-ის �ვტ�რიზ�ცი�"
+
 #. TRANS: Note on the OAuth application page about signature support.
 #, fuzzy
 msgid ""
@@ -5382,6 +5105,11 @@ msgstr "%1$s-ის რჩეული შეტყ�ბინებები,
 msgid "Could not retrieve favorite notices."
 msgstr "რჩეული შეტყ�ბინებების გ�მ�თხ�ვნ� ვერ მ�ხერხდ�."
 
+#. TRANS: Feed link text. %s is a username.
+#, php-format
+msgid "Feed for favorites of %s (Activity Streams JSON)"
+msgstr ""
+
 #. TRANS: Feed link text. %s is a username.
 #, php-format
 msgid "Feed for favorites of %s (RSS 1.0)"
@@ -5438,6 +5166,11 @@ msgstr ""
 msgid "%1$s group, page %2$d"
 msgstr ""
 
+#. TRANS: Tooltip for feed link. %s is a group nickname.
+#, fuzzy, php-format
+msgid "Notice feed for %s group (Activity Streams JSON)"
+msgstr "შეტყ�ბინებების RSS მ�ნიშნული %s-თ (Atom)"
+
 #. TRANS: Tooltip for feed link. %s is a group nickname.
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
@@ -5458,44 +5191,8 @@ msgstr ""
 msgid "FOAF for %s group"
 msgstr ""
 
-#. TRANS: Header for mini list of group members on a group page (h2).
-msgid "Members"
-msgstr "წევრები"
-
-#. TRANS: Description for mini list of group members on a group page when the group has no members.
-#. TRANS: Content of "Listed" page if there are no listed users.
-#. TRANS: Content of "People following tag x" if there are no subscribed users.
-#. TRANS: Empty list message for tags.
-#. TRANS: Text for user subscription statistics if the user has no subscriptions.
-#. TRANS: Text for user subscriber statistics if user has no subscribers.
-#. TRANS: Text for user user group membership statistics if user is not a member of any group.
-#. TRANS: Default content for section/sidebar widget.
-msgid "(None)"
-msgstr "(�რცერთი)"
-
-#. TRANS: Link to all group members from mini list of group members if group has more than n members.
-msgid "All members"
-msgstr ""
-
-#. TRANS: Header for group statistics on a group page (h2).
-#. TRANS: H2 text for user statistics.
-msgid "Statistics"
-msgstr "სტ�ტისტიკ�"
-
-#. TRANS: Label for group creation date.
-#, fuzzy
-msgctxt "LABEL"
-msgid "Created"
-msgstr "შექმნილი�"
-
-#. TRANS: Label for member count in statistics on group page.
-#, fuzzy
-msgctxt "LABEL"
-msgid "Members"
-msgstr "წევრები"
-
 #. TRANS: Notice on group pages for anonymous users for StatusNet sites that accept new registrations.
-#. TRANS: **%s** is the group alias, %%%%site.name%%%% is the site name,
+#. TRANS: %s is the group name, %%%%site.name%%%% is the site name,
 #. TRANS: %%%%action.register%%%% is the URL for registration, %%%%doc.help%%%% is a URL to help.
 #. TRANS: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
 #, php-format
@@ -5508,21 +5205,17 @@ msgid ""
 msgstr ""
 
 #. TRANS: Notice on group pages for anonymous users for StatusNet sites that accept no new registrations.
-#. TRANS: **%s** is the group alias, %%%%site.name%%%% is the site name,
+#. TRANS: %s is the group name, %%%%site.name%%%% is the site name,
 #. TRANS: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
-#, php-format
+#, fuzzy, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
 "wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
 "[StatusNet](http://status.net/) tool. Its members share short messages about "
-"their life and interests. "
+"their life and interests."
 msgstr ""
-
-#. TRANS: Title for list of group administrators on a group page.
-#, fuzzy
-msgctxt "TITLE"
-msgid "Admins"
-msgstr "�დმინი"
+"რს �რის %%site.name%%, [მიკრ�–ბლ�გინგის](http://en.wikipedia.org/wiki/Micro-"
+"blogging) სერვისი, დ�ფუძნებული უფ�ს� [StatusNet](http://status.net/) კ�დზე."
 
 #. TRANS: Client error displayed requesting a single message that does not exist.
 msgid "No such message."
@@ -5620,10 +5313,22 @@ msgid ""
 msgstr "[დ�რეგისტრირდი](%%action.register%%) დ� დ�პ�სტე პირველმ�!"
 
 #. TRANS: Header on show list page.
+#. TRANS: Link description for link to list of users tagged with a tag (so part of a list).
 #, fuzzy
 msgid "Listed"
 msgstr "ლიცენზი�"
 
+#. TRANS: Content of "Listed" page if there are no listed users.
+#. TRANS: Content of "People following tag x" if there are no subscribed users.
+#. TRANS: Description for mini list of group members on a group page when the group has no members.
+#. TRANS: Empty list message for tags.
+#. TRANS: Text for user subscription statistics if the user has no subscriptions.
+#. TRANS: Text for user subscriber statistics if user has no subscribers.
+#. TRANS: Text for user user group membership statistics if user is not a member of any group.
+#. TRANS: Default content for section/sidebar widget.
+msgid "(None)"
+msgstr "(�რცერთი)"
+
 #. TRANS: Link for more "People in list x by a user"
 #. TRANS: if there are more than the mini list's maximum.
 msgid "Show all"
@@ -5634,24 +5339,19 @@ msgstr ""
 msgid "Subscribers"
 msgstr "გ�მ�მწერები"
 
-#. TRANS: Link for more "People following tag x"
-#. TRANS: if there are more than the mini list's maximum.
-msgid "All subscribers"
-msgstr "ყველ� გ�მ�მწერი"
-
-#. TRANS: Page title showing tagged notices in one user's stream.
+#. TRANS: Page title showing tagged notices in one user's timeline.
 #. TRANS: %1$s is the username, %2$s is the hash tag.
 #, fuzzy, php-format
 msgid "Notices by %1$s tagged %2$s"
 msgstr "%1$s - %2$s"
 
-#. TRANS: Page title showing tagged notices in one user's stream.
+#. TRANS: Page title showing tagged notices in one user's timeline.
 #. TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number.
 #, fuzzy, php-format
 msgid "Notices by %1$s tagged %2$s, page %3$d"
 msgstr "შეტყ�ბინებები მ�ნიშნული %1$s-ით, გვერდი %2$d"
 
-#. TRANS: Extended page title showing tagged notices in one user's stream.
+#. TRANS: Extended page title showing tagged notices in one user's timeline.
 #. TRANS: %1$s is the username, %2$d is the page number.
 #, fuzzy, php-format
 msgid "Notices by %1$s, page %2$d"
@@ -5663,6 +5363,12 @@ msgstr "შეტყ�ბინებები მ�ნიშნული %1$s
 msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
 msgstr ""
 
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#, fuzzy, php-format
+msgid "Notice feed for %s (Activity Streams JSON)"
+msgstr "შეტყ�ბინებების RSS მ�ნიშნული %s-თ (Atom)"
+
 #. TRANS: Title for link to notice feed.
 #. TRANS: %s is a user nickname.
 #, php-format
@@ -5687,7 +5393,7 @@ msgstr ""
 msgid "FOAF for %s"
 msgstr ""
 
-#. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
+#. TRANS: First sentence of empty list message for a timeline. $1%s is a user nickname.
 #, fuzzy, php-format
 msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
 msgstr ""
@@ -5700,7 +5406,7 @@ msgid ""
 "would be a good time to start :)"
 msgstr ""
 
-#. TRANS: Second sentence of empty  list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
+#. TRANS: Second sentence of empty  list message for a non-self timeline. %1$s is a user nickname, %2$s is a part of a URL.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
 #, php-format
 msgid ""
@@ -5708,7 +5414,7 @@ msgid ""
 "%?status_textarea=%2$s)."
 msgstr ""
 
-#. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
+#. TRANS: Announcement for anonymous users showing a timeline if site registrations are open.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
 #, php-format
 msgid ""
@@ -5718,14 +5424,16 @@ msgid ""
 "follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))"
 msgstr ""
 
-#. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
+#. TRANS: Announcement for anonymous users showing a timeline if site registrations are closed or invite only.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#, php-format
+#, fuzzy, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
 "wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
-"[StatusNet](http://status.net/) tool. "
+"[StatusNet](http://status.net/) tool."
 msgstr ""
+"რს �რის %%site.name%%, [მიკრ�–ბლ�გინგის](http://en.wikipedia.org/wiki/Micro-"
+"blogging) სერვისი, დ�ფუძნებული უფ�ს� [StatusNet](http://status.net/) კ�დზე."
 
 #. TRANS: Link to the author of a repeated notice. %s is a linked nickname.
 #, php-format
@@ -5759,6 +5467,15 @@ msgstr "ს�იტის ს�ხელი �რ უნდ� იყ�ს 
 msgid "You must have a valid contact email address."
 msgstr "თქვენ უნდ� გქ�ნდეთ ნ�მდვილი ს�კ�ნტ�ქტ� ელ. ფ�სტის მის�მ�რთი."
 
+#. TRANS: Client error displayed when a logo URL is not valid.
+msgid "Invalid logo URL."
+msgstr "ლ�გ�ს �რ�სწ�რი URL-ი"
+
+#. TRANS: Client error displayed when a SSL logo URL is invalid.
+#, fuzzy
+msgid "Invalid SSL logo URL."
+msgstr "ლ�გ�ს �რ�სწ�რი URL-ი"
+
 #. TRANS: Client error displayed trying to save site settings with an invalid language code.
 #. TRANS: %s is the invalid language code.
 #, php-format
@@ -5836,7 +5553,9 @@ msgid "Default language"
 msgstr "პირვ�ნდელი ენ�"
 
 #. TRANS: Dropdown title on site settings panel.
-msgid "Site language when autodetection from browser settings is not available"
+#, fuzzy
+msgid ""
+"The site language when autodetection from browser settings is not available."
 msgstr "ს�იტის ენ�, რ�დეს�ც ბრ�უზერის �ვტ�დ�მდგენი �რ �რის ხელმის�წვდ�მი"
 
 #. TRANS: Fieldset legend on site settings panel.
@@ -5862,8 +5581,22 @@ msgid "How long users must wait (in seconds) to post the same thing again."
 msgstr ""
 "რ�მდენი ხ�ნი (წ�მებში) უნდ� ელ�დ�ს მ�მხმ�რებელი რ�მ დ�პ�სტ�ს ერთი დ� იგივე."
 
+#. TRANS: Fieldset legend for form to change logo.
+msgid "Logo"
+msgstr "ლ�გ�"
+
+#. TRANS: Field label for StatusNet site logo.
+msgid "Site logo"
+msgstr "ს�იტის ლ�გ�"
+
+#. TRANS: Field label for SSL StatusNet site logo.
+#, fuzzy
+msgid "SSL logo"
+msgstr "ს�იტის ლ�გ�"
+
 #. TRANS: Button title for saving site settings.
-msgid "Save site settings"
+#, fuzzy
+msgid "Save the site settings."
 msgstr "ს�იტის პ�რ�მეტრების შენ�ხვ�"
 
 #. TRANS: Page title for site-wide notice tab in admin panel.
@@ -5892,7 +5625,7 @@ msgstr "ს�იტის შეტყ�ბინების ტექსტ
 msgid "Site-wide notice text (255 characters maximum; HTML allowed)"
 msgstr "ს�ერთ� ს�ს�იტ� შეტყ�ბინების ტექსტი (მ�ქს. 255 სიმბ�ლ�; HTML შეიძლებ�)"
 
-#. TRANS: Title for button to save site notice in admin panel.
+#. TRANS: Button title to save site notice in admin panel.
 #, fuzzy
 msgid "Save site notice."
 msgstr "შეინ�ხე ს�ერთ�ს�ს�იტ� შეტყ�ბინებ�"
@@ -6097,7 +5830,7 @@ msgstr ""
 msgid "Snapshots will be sent to this URL."
 msgstr "მდგ�მ�რე�ბ� გ�იგზ�ვნებ� �მ URL-ზე"
 
-#. TRANS: Title for button to save snapshot settings.
+#. TRANS: Button title to save snapshot settings.
 #, fuzzy
 msgid "Save snapshot settings."
 msgstr "დ�იმ�ხს�ვრე მდგ�მ�რე�ბის პ�რ�მეტრები"
@@ -6132,11 +5865,6 @@ msgstr "%1$s ჯგუფის წევრი, გვერდი %2$d"
 msgid "A list of users awaiting approval to subscribe to you."
 msgstr "�მ ჯგუფის წევრების სი�."
 
-#. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
-msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
-msgstr ""
-"თქვენ �რ შეგიძლი�თ გ�მ�იწერ�თ 0მბ-ი�ნი 0.1 დ�შ�რებული პრ�ფილი �მ მ�ქმედებით."
-
 #. TRANS: Page title when subscription succeeded.
 msgid "Subscribed"
 msgstr "გ�მ�წერილი�"
@@ -6235,13 +5963,12 @@ msgstr "ეს �რის ხ�ლხი ვის შეტყ�ბინ
 #. TRANS: This message contains Markdown URLs. The link description is between
 #. TRANS: square brackets, and the link between parentheses. Do not separate "]("
 #. TRANS: and do not change the URL part.
-#, php-format
+#, fuzzy, php-format
 msgid ""
 "You're not listening to anyone's notices right now, try subscribing to "
 "people you know. Try [people search](%%action.peoplesearch%%), look for "
 "members in groups you're interested in and in our [featured users](%%action."
-"featured%%). If you're a [Twitter user](%%action.twittersettings%%), you can "
-"automatically subscribe to people you already follow there."
+"featured%%)."
 msgstr ""
 "თუ ჯერ �რ უსმენთ �რ�ვის შეტყ�ბიენბებს, სც�დეთ გ�მ�იწერ�თ თქვენთვის "
 "ს�ინტერეს� �დ�მი�ნები. სც�დეთ [ხ�ლხის ძიებ�](%%action.peoplesearch%%), "
@@ -6279,6 +6006,12 @@ msgstr "SMS"
 msgid "Notices tagged with %1$s, page %2$d"
 msgstr "შეტყ�ბინებები მ�ნიშნული %1$s-ით, გვერდი %2$d"
 
+#. TRANS: Link label for feed on "notices with tag" page.
+#. TRANS: %s is the tag the feed is for.
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (Activity Streams JSON)"
+msgstr "შეტყ�ბინებების RSS მ�ნიშნული %s-თ (Atom)"
+
 #. TRANS: Link label for feed on "notices with tag" page.
 #. TRANS: %s is the tag the feed is for.
 #, php-format
@@ -6390,18 +6123,6 @@ msgstr "გ�მ�წერ� გ�უქმებული�"
 msgid "%1$s unsubscribed from list %2$s by %3$s"
 msgstr "%1$s გ�მ�მწერი, გვერდი %2$d"
 
-#. TRANS: Client error displayed when trying to update profile with an incompatible license.
-#. TRANS: %1$s is the license incompatible with site license %2$s.
-#. TRANS: Exception thrown when licenses are not compatible for an authorisation request.
-#. TRANS: %1$s is the license for the listenee, %2$s is the license for "this" StatusNet site.
-#, fuzzy, php-format
-msgid ""
-"Listenee stream license \"%1$s\" is not compatible with site license \"%2$s"
-"\"."
-msgstr ""
-"გ�მ�ს�წერი მ�მხმ�რებლის ნ�კ�დის ლიცენზი� ‘%1$s’ შეუთ�ვსებელი� ს�იტის "
-"ლიცენზი�სთ�ნ ‘%2$s’."
-
 #. TRANS: Title of URL settings tab in profile settings.
 #, fuzzy
 msgid "URL settings"
@@ -6541,165 +6262,11 @@ msgstr "მ�ს�წვევები გ��ქტიურებულ
 msgid "Whether to allow users to invite new users."
 msgstr "მიეცეთ თუ �რ� მ�მხმ�რებლებს სხვების მ�წვევის უფლებ�."
 
-#. TRANS: Title for button to save user settings in user admin panel.
+#. TRANS: Button title to save user settings in user admin panel.
 #, fuzzy
 msgid "Save user settings."
 msgstr "ს�იტის პ�რ�მეტრების შენ�ხვ�"
 
-#. TRANS: Page title.
-msgid "Authorize subscription"
-msgstr "გ�მ�წერის �ვტ�რიზ�ცი�"
-
-#. TRANS: Page notice on "Authorize subscription" page.
-#, fuzzy
-msgid ""
-"Please check these details to make sure that you want to subscribe to this "
-"user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
-"click \"Reject\"."
-msgstr ""
-"გთხ�ვთ გ�დ�ხედ�თ �მ დეტ�ლებს, რ�მ დ�რწმუნდეთ რ�მ გინდ�თ �მ მ�მხმ�რებლის "
-"გ�ნ�ხლებების გ�მ�წერ�. თუ თქვენ �რ გინდ�დ�თ გ�მ�წერ�, მ�შინ გ��ჭირეთ ღილ�კს "
-"\"უ�რყ�ფ�\"."
-
-#. TRANS: Button text on Authorise Subscription page.
-#. TRANS: Submit button text to accept a group membership request on approve group form.
-#. TRANS: Submit button text to accept a subscription request on approve sub form.
-#, fuzzy
-msgctxt "BUTTON"
-msgid "Accept"
-msgstr "მიღებ�"
-
-#. TRANS: Title for button on Authorise Subscription page.
-#. TRANS: Button title to subscribe to a user.
-#, fuzzy
-msgid "Subscribe to this user."
-msgstr "გ�მ�იწერე ეს მ�მხმ�რებელი"
-
-#. TRANS: Button text on Authorise Subscription page.
-#. TRANS: Submit button text to reject a group membership request on approve group form.
-#. TRANS: Submit button text to reject a subscription request on approve sub form.
-#, fuzzy
-msgctxt "BUTTON"
-msgid "Reject"
-msgstr "უ�რყ�ფ�"
-
-#. TRANS: Title for button on Authorise Subscription page.
-#, fuzzy
-msgid "Reject this subscription."
-msgstr "�მ გ�მ�წერის უ�რყ�ფ�"
-
-#. TRANS: Client error displayed for an empty authorisation request.
-msgid "No authorization request!"
-msgstr "�ვტ�რიზ�ციის მ�თხ�ვნ� �რ �რის!"
-
-#. TRANS: Accept message header from Authorise subscription page.
-msgid "Subscription authorized"
-msgstr "გ�მ�წერ� �ვტ�რიზირებული�"
-
-#. TRANS: Accept message text from Authorise subscription page.
-#, fuzzy
-msgid ""
-"The subscription has been authorized, but no callback URL was passed. Check "
-"with the site's instructions for details on how to authorize the "
-"subscription. Your subscription token is:"
-msgstr ""
-"გ�მ�წერ� �ვტ�რიზირებული�, მ�გრ�მ უკ�ნ დ�ს�ბრუნებელი URL �რ მ�წ�დებულ�. "
-"გ�დ��მ�წმეთ ს�იტის ინსტრუქციებში გ�მ�წერის �ვტ�რიზირების დეტ�ლები. თქვენი "
-"გ�მ�წერის ტ�კენი�:"
-
-#. TRANS: Reject message header from Authorise subscription page.
-msgid "Subscription rejected"
-msgstr "გ�მ�წერ� უ�რყ�ფილი�"
-
-#. TRANS: Reject message from Authorise subscription page.
-#, fuzzy
-msgid ""
-"The subscription has been rejected, but no callback URL was passed. Check "
-"with the site's instructions for details on how to fully reject the "
-"subscription."
-msgstr ""
-"გ�მ�წერ� უ�რყ�ფილი�, მ�გრ�მ უკ�ნ დ�ს�ბრუნებელი URL �რ მ�წ�დებულ�. "
-"გ�დ��მ�წმეთ ს�იტის ინსტრუქციებში გ�მ�წერის მთლი�ნ�დ უ�რყ�ფის შეს�ხებ "
-"დეტ�ლები."
-
-#. TRANS: Exception thrown when no valid user is found for an authorisation request.
-#. TRANS: %s is a listener URI.
-#, fuzzy, php-format
-msgid "Listener URI \"%s\" not found here."
-msgstr "მსმენელის  URI ‘%s’ �ქ ვერ მ�იძებნ�."
-
-#. TRANS: Exception thrown when listenee URI is too long for an authorisation request.
-#. TRANS: %s is a listenee URI.
-#, fuzzy, php-format
-msgid "Listenee URI \"%s\" is too long."
-msgstr "წყ�რ�ს URL ძ�ლი�ნ გრძელი�."
-
-#. TRANS: Exception thrown when listenee URI is a local user for an authorisation request.
-#. TRANS: %s is a listenee URI.
-#, fuzzy, php-format
-msgid "Listenee URI \"%s\" is a local user."
-msgstr "პრ�ფილის URL ‘%s’ ლ�კ�ლური მ�მხმ�რებლისთვის�� გ�ნკუთვნილი."
-
-#. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
-#. TRANS: %s is a profile URL.
-#, fuzzy, php-format
-msgid "Profile URL \"%s\" is for a local user."
-msgstr "პრ�ფილის URL ‘%s’ ლ�კ�ლური მ�მხმ�რებლისთვის�� გ�ნკუთვნილი."
-
-#. TRANS: Exception thrown when avatar URL is invalid for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#, fuzzy, php-format
-msgid "Avatar URL \"%s\" is not valid."
-msgstr "�ვ�ტ�რის URL ‘%s’ �რ �რის სწ�რი."
-
-#. TRANS: Exception thrown when avatar URL could not be read for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#, fuzzy, php-format
-msgid "Cannot read avatar URL \"%s\"."
-msgstr "ვერ ვკითხულ�ბ �ვ�ტ�რის URL ‘%s’."
-
-#. TRANS: Exception thrown when avatar URL return an invalid image type for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#, fuzzy, php-format
-msgid "Wrong image type for avatar URL \"%s\"."
-msgstr "�ვ�ტ�რის სურ�თის ფ�რმ�ტი �რ�სწ�რი� URL ‘%s’."
-
-#. TRANS: Title for profile design page.
-#. TRANS: Page title for profile design page.
-msgid "Profile design"
-msgstr "პრ�ფილის დიზ�ინი"
-
-#. TRANS: Instructions for Profile design page.
-#. TRANS: Instructions for profile design page.
-msgid ""
-"Customize the way your profile looks with a background image and a colour "
-"palette of your choice."
-msgstr ""
-"�ირჩიეთ, რ�გ�რ გნებ�ვთ გ�მ�იყურებ�დეს თქვენი პრ�ფილი ფ�ნური სურ�თის� დ� "
-"ფერთ� პ�ლიტრის შეცვლით."
-
-#. TRANS: Succes message on Profile design page when finding an easter egg.
-msgid "Enjoy your hotdog!"
-msgstr "ისი�მ�ვნეთ ჰ�თ დ�გით!"
-
-#. TRANS: Form legend on Profile design page.
-#, fuzzy
-msgid "Design settings"
-msgstr "ს�იტის პ�რ�მეტრების შენ�ხვ�"
-
-#. TRANS: Checkbox label on Profile design page.
-msgid "View profile designs"
-msgstr "პრ�ფილის დიზ�ინების ნ�ხვ�"
-
-#. TRANS: Title for checkbox on Profile design page.
-msgid "Show or hide profile designs."
-msgstr "�ჩვენე �ნ დ�მ�ლე პრ�ფილის დიზ�ინები."
-
-#. TRANS: Form legend on Profile design page for form to choose a background image.
-#, fuzzy
-msgid "Background file"
-msgstr "ფ�ნი"
-
 #. TRANS: Page title for all but the first page of groups for a user.
 #. TRANS: %1$s is a nickname, %2$d is a page number.
 #, php-format
@@ -6738,9 +6305,9 @@ msgstr "StatusNet %s"
 
 #. TRANS: Content part of StatusNet version page.
 #. TRANS: %1$s is the engine name (StatusNet) and %2$s is the StatusNet version.
-#, php-format
+#, fuzzy, php-format
 msgid ""
-"This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, "
+"This site is powered by %1$s version %2$s, Copyright 2008-2011 StatusNet, "
 "Inc. and contributors."
 msgstr ""
 "ეს ს�იტი მუშ��ბს %1$s-ის %2$s ვერსი�ზე, ყველ� უფლებ� დ�ცული� 2008-2010 "
@@ -6755,11 +6322,12 @@ msgid "License"
 msgstr "ლიცენზი�"
 
 #. TRANS: Content part of StatusNet version page.
+#, fuzzy
 msgid ""
 "StatusNet is free software: you can redistribute it and/or modify it under "
 "the terms of the GNU Affero General Public License as published by the Free "
 "Software Foundation, either version 3 of the License, or (at your option) "
-"any later version. "
+"any later version."
 msgstr ""
 "StatusNet �რის უფ�ს� კ�დი: თქვენ შეგიძლი�თ მისი გ�ვრცელებ� �ნ/დ� გ�დ�კეთებ� "
 "GNU Affero ძირით�დი ს�ჯ�რ� ლიცენზიის პირ�ბების თ�ნ�ხმ�დ, რ�გ�რც "
@@ -6767,11 +6335,12 @@ msgstr ""
 "ნებისმიერი უფრ� �ხ�ლი ვერსიით. "
 
 #. TRANS: Content part of StatusNet version page.
+#, fuzzy
 msgid ""
 "This program is distributed in the hope that it will be useful, but WITHOUT "
 "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
 "FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License "
-"for more details. "
+"for more details."
 msgstr ""
 "ეს პრ�გრ�მ� ვრცელდებ� იმ იმედით, რ�მ გ�მ�ს�დეგი იქნებ�, მ�გრ�მ �რ იძლევ� "
 "�რ�ნ�ირ გ�რ�ნტიებს; �რც თუნდ�ც პ�ტ�რ� გ�რ�ნტი�ს მის გ�ყიდვ�დ�ბ�ზე �ნ "
@@ -6835,16 +6404,25 @@ msgstr "ვერ ვ�მ�უშ�ვებ URL '%s'"
 msgid "Robin thinks something is impossible."
 msgstr "რ�ბინი ფიქრ�ბს რ�ღ�ც შეუძლებელი�."
 
+#. TRANS: Message used to be inserted as %2$s in  the text "No file may
+#. TRANS: be larger than %1$d byte and the file you sent was %2$s.".
+#. TRANS: %1$d is the number of bytes of an uploaded file.
+#, php-format
+msgid "%1$d byte"
+msgid_plural "%1$d bytes"
+msgstr[0] ""
+
 #. TRANS: Message given if an upload is larger than the configured maximum.
-#. TRANS: %1$d is the byte limit for uploads, %2$d is the byte count for the uploaded file.
-#. TRANS: %1$s is used for plural.
+#. TRANS: %1$d (used for plural) is the byte limit for uploads,
+#. TRANS: %2$s is the proper form of "n bytes". This is the only ways to have
+#. TRANS: gettext support multiple plurals in the same message, unfortunately...
 #, fuzzy, php-format
 msgid ""
-"No file may be larger than %1$d byte and the file you sent was %2$d bytes. "
-"Try to upload a smaller version."
+"No file may be larger than %1$d byte and the file you sent was %2$s. Try to "
+"upload a smaller version."
 msgid_plural ""
-"No file may be larger than %1$d bytes and the file you sent was %2$d bytes. "
-"Try to upload a smaller version."
+"No file may be larger than %1$d bytes and the file you sent was %2$s. Try to "
+"upload a smaller version."
 msgstr[0] ""
 "ფ�ილი �რ შეიძლებ� იყ�ს %1$d ბ�იტზე მეტი, თქვენ მიერ გ�გზ�ვნილი კი %2$d ბ�იტი "
 "იყ�. სც�დეთ უფრ� პ�ტ�რ� ვერსიის �ტვირთვ�."
@@ -6914,6 +6492,11 @@ msgstr "ლ�კ�ლური ჯგუფის გ�ნ�ხლებ�
 msgid "Could not create login token for %s"
 msgstr "შეს�სვლელი ტ�კენის შექმნ� %s-სთვის ვერ მ�ხერხდ�."
 
+#. TRANS: Exception thrown when a program code class (%s) cannot be instantiated.
+#, fuzzy, php-format
+msgid "Cannot instantiate class %s."
+msgstr "ვერ ვინ�ხ�ვ �ხ�ლ პ�რ�ლს."
+
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.
 msgid "No database name or DSN found anywhere."
 msgstr "ბ�ზის ს�ხელი �ნ DSN ვერს�დ ვერ მ�იძებნ�."
@@ -7080,7 +6663,7 @@ msgstr ""
 #, php-format
 msgid ""
 "You already have %1$d or more people in list %2$s, which is the maximum "
-"allowed number.Try unlisting others first."
+"allowed number. Try unlisting others first."
 msgstr ""
 
 #. TRANS: Exception thrown when inserting a list subscription in the database fails.
@@ -7102,7 +6685,6 @@ msgid "Unable to save tag."
 msgstr "ს�ნიშნეს დ�მ�ხს�ვრებ� ვერ ხერხდებ�."
 
 #. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
-#. TRANS: Error message displayed to a banned user when they try to subscribe.
 msgid "You have been banned from subscribing."
 msgstr "თქვენ �გეკრძ�ლ�თ გ�მ�წერ�."
 
@@ -7122,10 +6704,6 @@ msgstr "�რ გ�ქვთ გ�მ�წერილი!"
 msgid "Could not delete self-subscription."
 msgstr "ს�კუთ�რი გ�მ�წერის წ�შლ� ვერ ხერხდებ�."
 
-#. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
-msgid "Could not delete subscription OMB token."
-msgstr "გ�მ�წერის წ�შლ� ვერ მ�ხერხდ�. 0მბ-ი�ნი ტ�კენი"
-
 #. TRANS: Exception thrown when a subscription could not be deleted on the server.
 msgid "Could not delete subscription."
 msgstr "გ�მ�წერის წ�შლ� ვერ მ�ხერხდ�."
@@ -7160,6 +6738,18 @@ msgstr "ერთი მ�მხმ�რებელი �რ გ�ნს�
 msgid "Single-user mode code called when not enabled."
 msgstr ""
 
+#. TRANS: Information on password recovery form if no known username or e-mail address was specified.
+msgid "No user with that email address or username."
+msgstr "�სეთი ელ. ფ�სტის მის�მ�რთით �ნ ს�ხელით �რ �რსებ�ბს."
+
+#. TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.
+msgid "No registered email address for that user."
+msgstr "�მ მ�მხმ�რებლისთვის ვერ მ�იძებნ� რეგისტრირებული ელ. ფ�სტის მის�მ�რთი."
+
+#. TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.
+msgid "Error saving address confirmation."
+msgstr "მის�მ�რთის დ�დ�სტურების სენ�ხვის�ს მ�ხდ� შეცდ�მ�."
+
 #. TRANS: Server exception thrown when creating a group failed.
 msgid "Could not create group."
 msgstr "ჯგუფის შექმნ� ვერ მ�ხერხდ�."
@@ -7434,27 +7024,12 @@ msgstr "showForm() �რ �რის გ�ნხ�რციელებუ
 msgid "saveSettings() not implemented."
 msgstr "saveSettings() �რ �რის გ�ნხ�რციელებული."
 
-#. TRANS: Client error message thrown if design settings could not be deleted in
-#. TRANS: the admin panel Design.
-msgid "Unable to delete design setting."
-msgstr "დიზ�ინის პ�რ�მეტრების წ�შლ� ვერ ხერხდებ�."
-
 #. TRANS: Header in administrator navigation panel.
-#. TRANS: Header in settings navigation panel.
 #, fuzzy
 msgctxt "HEADER"
 msgid "Home"
 msgstr "ვებ. გვერსი"
 
-#. TRANS: Menu item in administrator navigation panel.
-#. TRANS: Menu item in default local navigation panel.
-#. TRANS: Menu item in personal group navigation menu.
-#. TRANS: Menu item in settings navigation panel.
-#, fuzzy
-msgctxt "MENU"
-msgid "Home"
-msgstr "ვებ. გვერსი"
-
 #. TRANS: Header in administrator navigation panel.
 #, fuzzy
 msgctxt "HEADER"
@@ -7470,17 +7045,6 @@ msgctxt "MENU"
 msgid "Site"
 msgstr "ს�იტი"
 
-#. TRANS: Menu item title in administrator navigation panel.
-msgid "Design configuration"
-msgstr "დიზ�ინის კ�ნფიგურ�ცი�"
-
-#. TRANS: Menu item in administrator navigation panel.
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: Menu item in settings navigation panel.
-msgctxt "MENU"
-msgid "Design"
-msgstr "დიზ�ინი"
-
 #. TRANS: Menu item title in administrator navigation panel.
 msgid "User configuration"
 msgstr "მ�მხმ�რებლის კ�ნფიგურ�ცი�"
@@ -7589,43 +7153,6 @@ msgstr ""
 msgid "Could not authenticate you."
 msgstr ""
 
-#. TRANS: Server error displayed when trying to create an anynymous OAuth consumer.
-#, fuzzy
-msgid "Could not create anonymous consumer."
-msgstr "ჯგუფის შექმნ� ვერ მ�ხერხდ�."
-
-#. TRANS: Server error displayed when trying to create an anynymous OAuth application.
-#, fuzzy
-msgid "Could not create anonymous OAuth application."
-msgstr "�პლიკ�ციის შექმნ� ვერ მ�ხერხდ�."
-
-#. TRANS: Exception thrown when no token association could be found.
-msgid ""
-"Could not find a profile and application associated with the request token."
-msgstr ""
-
-#. TRANS: Exception thrown when no access token can be issued.
-#, fuzzy
-msgid "Could not issue access token."
-msgstr "შეტყ�ბინების ჩ�სმ� ვერ მ�ხერხდ�."
-
-#. TRANS: Exception thrown when a database error occurs.
-msgid "Database error inserting OAuth application user."
-msgstr "ბ�ზ�მ დ�უშვ� შეცდ�მ� OAuth �პლიკ�ციის მ�მხმ�რებლის ჩ�სმის�ს."
-
-#. TRANS: Exception thrown when a database error occurs.
-#, fuzzy
-msgid "Database error updating OAuth application user."
-msgstr "ბ�ზ�მ დ�უშვ� შეცდ�მ� OAuth �პლიკ�ციის მ�მხმ�რებლის ჩ�სმის�ს."
-
-#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
-msgid "Tried to revoke unknown token."
-msgstr ""
-
-#. TRANS: Exception thrown when an attempt is made to remove a revoked token.
-msgid "Failed to delete revoked token."
-msgstr ""
-
 #. TRANS: Form input field label for application icon.
 msgid "Icon"
 msgstr ""
@@ -7707,13 +7234,14 @@ msgstr ""
 "კითხვ�-წერ�დი"
 
 #. TRANS: Submit button title.
-msgid "Cancel"
-msgstr "გ�უქმებ�"
+#, fuzzy
+msgid "Cancel application changes."
+msgstr "მიერთებული �პლიკ�ციები"
 
 #. TRANS: Submit button title.
-#. TRANS: Button text to save a list.
-msgid "Save"
-msgstr "შენ�ხვ�"
+#, fuzzy
+msgid "Save application changes."
+msgstr "�ხ�ლი �პლიკ�ცი�"
 
 #. TRANS: Name for an anonymous application in application list.
 #, fuzzy
@@ -7749,6 +7277,20 @@ msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "უკუგებ�"
 
+#. TRANS: Submit button text to accept a group membership request on approve group form.
+#. TRANS: Submit button text to accept a subscription request on approve sub form.
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Accept"
+msgstr "მიღებ�"
+
+#. TRANS: Submit button text to reject a group membership request on approve group form.
+#. TRANS: Submit button text to reject a subscription request on approve sub form.
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Reject"
+msgstr "უ�რყ�ფ�"
+
 #. TRANS: Atom feed exception thrown when an author element does not contain a name element.
 msgid "Author element must contain a name element."
 msgstr ""
@@ -8311,6 +7853,11 @@ msgstr "თუ გინდ�თ ინსტ�ლ�ტ�რი გ�უშ
 msgid "Go to the installer."
 msgstr "გ�დ�დი �მ ინსტ�ლ�ტ�რზე."
 
+#. TRANS: Header on conversation page. Hidden by default (h2).
+#. TRANS: Label for user statistics.
+msgid "Notices"
+msgstr "შეტყ�ბინებები"
+
 #. TRANS: Page title for when a database error occurs.
 msgid "Database error"
 msgstr "მ�ნ�ცემთ� ბ�ზის შეცდ�მ�"
@@ -8322,14 +7869,6 @@ msgctxt "MENU"
 msgid "Public"
 msgstr "ს�ჯ�რ�"
 
-#. TRANS: Menu item in default local navigation panel.
-#. TRANS: Menu item in search group navigation panel.
-#. TRANS: Menu item in local navigation menu.
-#, fuzzy
-msgctxt "MENU"
-msgid "Groups"
-msgstr "ჯგუფები"
-
 #. TRANS: Menu item in default local navigation panel.
 #. TRANS: Menu item title in local navigation menu.
 #, fuzzy
@@ -8346,54 +7885,12 @@ msgstr "წ�შლ�"
 msgid "Delete this user"
 msgstr "�მ მ�მხმ�რებლის წ�შლ�"
 
-#. TRANS: Form legend of form for changing the page design.
-#, fuzzy
-msgid "Change design"
-msgstr "შეინ�ხე დიზ�ინი"
-
-#. TRANS: Fieldset legend on profile design page to change profile page colours.
-msgid "Change colours"
-msgstr "შეცვ�ლე ფერები"
-
-#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-msgid "Use defaults"
-msgstr "გ�მ�იყენე პირვ�ნდელი მდგ�მ�რე�ბ�"
-
-#. TRANS: Label in form on profile design page.
-#. TRANS: Field contains file name on user's computer that could be that user's custom profile background image.
-msgid "Upload file"
-msgstr "ფ�ილის �ტვირთვ�"
-
-#. TRANS: Instructions for form on profile design page.
-msgid ""
-"You can upload your personal background image. The maximum file size is 2MB."
-msgstr ""
-"თქვენ შეგიძლი�თ �ტვირთ�თ პერს�ნ�ლური ფ�ნური სურ�თი. ფ�ილის დ�ს�შვები ზ�მ�� "
-"2მბ."
-
-#. TRANS: Radio button on profile design page that will enable use of the uploaded profile image.
-#, fuzzy
-msgctxt "RADIO"
-msgid "On"
-msgstr "ჩ�რთვ�"
-
-#. TRANS: Radio button on profile design page that will disable use of the uploaded profile image.
-#, fuzzy
-msgctxt "RADIO"
-msgid "Off"
-msgstr "გ�მ�რთვ�"
-
-#. TRANS: Success message displayed if design settings were saved after clicking "Use defaults".
-msgid "Design defaults restored."
-msgstr "დიზ�ინის პირველ�დი პ�რ�მეტრები დ�ბრუნებული�."
-
 #. TRANS: Exception. %s is an ID.
 #, fuzzy, php-format
 msgid "Unable to find services for %s."
 msgstr "%s �პლიკ�ციის მიერ ზვდ�მის გ�უქმებ� ვერ ხერხდებ�."
 
 #. TRANS: Form legend for removing the favourite status for a favourite notice.
-#. TRANS: Title for button text for removing the favourite status for a favourite notice.
 msgid "Disfavor this notice"
 msgstr "�მ�შ�ლე რჩეულებიდ�ნ ეს შეტყ�ბინებ�"
 
@@ -8403,8 +7900,12 @@ msgctxt "BUTTON"
 msgid "Disfavor favorite"
 msgstr "რჩეულის გ�უქმებ�"
 
+#. TRANS: Button title for removing the favourite status for a favourite notice.
+#, fuzzy
+msgid "Remove this notice from your list of favorite notices."
+msgstr "რჩეული შეტყ�ბინებების გ�მ�თხ�ვნ� ვერ მ�ხერხდ�."
+
 #. TRANS: Form legend for adding the favourite status to a notice.
-#. TRANS: Title for button text for adding the favourite status to a notice.
 msgid "Favor this notice"
 msgstr "ჩ��მ�ტე რჩეულებში ეს შეტყ�ბინებ�"
 
@@ -8414,6 +7915,11 @@ msgctxt "BUTTON"
 msgid "Favor"
 msgstr "რჩეული"
 
+#. TRANS: Button title for adding the favourite status to a notice.
+#, fuzzy
+msgid "Add this notice to your list of favorite notices."
+msgstr "რჩეული შეტყ�ბინებების გ�მ�თხ�ვნ� ვერ მ�ხერხდ�."
+
 #. TRANS: Feed type name.
 msgid "RSS 1.0"
 msgstr "RSS 1.0"
@@ -8430,6 +7936,10 @@ msgstr "Atom"
 msgid "FOAF"
 msgstr "FOAF"
 
+#. TRANS: Feed type name. See http://activitystrea.ms/
+msgid "Activity Streams"
+msgstr ""
+
 #. TRANS: Client exception thrown when an imported feed does not have an author.
 msgid "No author in the feed."
 msgstr ""
@@ -8463,6 +7973,28 @@ msgstr "სიის გ�ს�ფილტრ�დ �ირჩიე ს�
 msgid "Grant this user the \"%s\" role"
 msgstr "მი�ნიჭე �მ მ�მხმ�რებელს \"%s\" რ�ლი"
 
+#. TRANS: Header for mini list of group members on a group page (h2).
+msgid "Members"
+msgstr "წევრები"
+
+#. TRANS: Link to all group members from mini list of group members if group has more than n members.
+msgid "All members"
+msgstr ""
+
+#. TRANS: Header for mini list of users with a pending membership request on a group page (h2).
+msgid "Pending"
+msgstr ""
+
+#. TRANS: Header for mini list of users that are blocked in a group page (h2).
+msgid "Blocked"
+msgstr "დ�ბლ�კილი�"
+
+#. TRANS: Title for list of group administrators on a group page.
+#, fuzzy
+msgctxt "TITLE"
+msgid "Admins"
+msgstr "�დმინი"
+
 #. TRANS: Button text for the form that will block a user from a group.
 msgctxt "BUTTON"
 msgid "Block"
@@ -8470,7 +8002,7 @@ msgstr ""
 
 #. TRANS: Submit button title.
 msgctxt "TOOLTIP"
-msgid "Block this user"
+msgid "Block this user so that they can no longer post messages to it."
 msgstr ""
 
 #. TRANS: Field title on group edit form.
@@ -8526,63 +8058,10 @@ msgctxt "GROUPADMIN"
 msgid "Admin"
 msgstr "�დმინი"
 
-#. TRANS: Menu item in the group navigation page.
-msgctxt "MENU"
-msgid "Group"
+#. TRANS: Group actions header (h2). Text hidden by default.
+msgid "Group actions"
 msgstr ""
 
-#. TRANS: Tooltip for menu item in the group navigation page.
-#. TRANS: %s is the nickname of the group.
-#, php-format
-msgctxt "TOOLTIP"
-msgid "%s group"
-msgstr ""
-
-#. TRANS: Menu item in the group navigation page.
-msgctxt "MENU"
-msgid "Members"
-msgstr ""
-
-#. TRANS: Tooltip for menu item in the group navigation page.
-#. TRANS: %s is the nickname of the group.
-#, php-format
-msgctxt "TOOLTIP"
-msgid "%s group members"
-msgstr ""
-
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: %d is the number of pending members.
-#, php-format
-msgctxt "MENU"
-msgid "Pending members (%d)"
-msgid_plural "Pending members (%d)"
-msgstr[0] ""
-
-#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: %s is the nickname of the group.
-#, fuzzy, php-format
-msgctxt "TOOLTIP"
-msgid "%s pending members"
-msgstr "%s ჯგუფის წევრი"
-
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-msgctxt "MENU"
-msgid "Blocked"
-msgstr ""
-
-#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: %s is the nickname of the group.
-#, php-format
-msgctxt "TOOLTIP"
-msgid "%s blocked users"
-msgstr ""
-
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: Menu item in primary navigation panel.
-msgctxt "MENU"
-msgid "Admin"
-msgstr "�დმინი"
-
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
 #, php-format
@@ -8590,11 +8069,6 @@ msgctxt "TOOLTIP"
 msgid "Edit %s group properties"
 msgstr ""
 
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-msgctxt "MENU"
-msgid "Logo"
-msgstr ""
-
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
 #, php-format
@@ -8602,15 +8076,9 @@ msgctxt "TOOLTIP"
 msgid "Add or edit %s logo"
 msgstr ""
 
-#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: %s is the nickname of the group.
-#, php-format
-msgctxt "TOOLTIP"
-msgid "Add or edit %s design"
-msgstr ""
-
-#. TRANS: Group actions header (h2). Text hidden by default.
-msgid "Group actions"
+#. TRANS: Link text for link on user profile.
+msgctxt "MENU"
+msgid "Logo"
 msgstr ""
 
 #. TRANS: Title for groups with the most members section.
@@ -8623,11 +8091,19 @@ msgstr "პ�პულ�რული შეტყ�ბინებები"
 msgid "Active groups"
 msgstr "ყველ� ჯგუფი"
 
-#. TRANS: Title for group tag cloud section.
-#. TRANS: %s is a group name.
-#, php-format
-msgid "Tags in %s group's notices"
-msgstr "%s ჯგუფის შეტყ�ბინებებში გ�მ�ყენებული ს�ნიშნეები"
+#. TRANS: Link description for seeing all groups.
+#. TRANS: Link description for seeing all lists.
+msgid "See all"
+msgstr ""
+
+#. TRANS: Link title for seeing all groups.
+msgid "See all groups you belong to."
+msgstr ""
+
+#. TRANS: Menu item title in personal group navigation menu.
+#. TRANS: %s is a username.
+msgid "Back to top"
+msgstr ""
 
 #. TRANS: Client exception 406
 msgid "This page is not available in a media type you accept"
@@ -8709,12 +8185,45 @@ msgctxt "TITLE"
 msgid "Trends"
 msgstr ""
 
-#. TRANS: Button text for inviting more users to the StatusNet instance.
+#. TRANS: Default button text for inviting more users to the StatusNet instance.
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Invite more colleagues"
 msgstr "დ�პ�ტიჯე �ხ�ლი მ�მხმ�რებლები"
 
+#. TRANS: Form legend.
+#, fuzzy
+msgid "Invite collegues"
+msgstr "დ�პ�ტიჯე �ხ�ლი მ�მხმ�რებლები"
+
+#. TRANS: Field label for a list of e-mail addresses.
+msgid "Email addresses"
+msgstr "ელ. ფ�სტის მის�მ�რთები"
+
+#. TRANS: Field title for a list of e-mail addresses.
+#, fuzzy
+msgid "Addresses of friends to invite (one per line)."
+msgstr "დ�ს�პ�ტიჟებელი მ�გ�ბრების მის�მ�რთები (თით� ხ�ზზე თით�)"
+
+#. TRANS: Field label for a personal message to send to invitees.
+msgid "Personal message"
+msgstr "პირ�დი შეტყ�ბინებ�"
+
+#. TRANS: Field title for a personal message to send to invitees.
+msgid "Optionally add a personal message to the invitation."
+msgstr "დ�უმ�ტეთ პირ�დი შეტყ�ბინებ� მ�წვევ�ს (�რ�ს�ვ�ლდებულ�)."
+
+#. TRANS: Send button for inviting friends
+#. TRANS: Button text for sending notice.
+msgctxt "BUTTON"
+msgid "Send"
+msgstr "გ�გზ�ვნ�"
+
+#. TRANS: Submit button title.
+#, fuzzy
+msgid "Send invitations."
+msgstr "მ�ს�წვევეი"
+
 #. TRANS: Button text for joining a group.
 #, fuzzy
 msgctxt "BUTTON"
@@ -8727,6 +8236,11 @@ msgctxt "BUTTON"
 msgid "Leave"
 msgstr "დ�ტ�ვებ�"
 
+#. TRANS: Link title for seeing all lists.
+#, fuzzy
+msgid "See all lists you have created."
+msgstr "თქვენს მიერ დ�რეგისტრირებული �პლიკ�ციები"
+
 #. TRANS: Menu item for logging in to the StatusNet site.
 #. TRANS: Menu item in primary navigation panel.
 msgctxt "MENU"
@@ -8785,8 +8299,8 @@ msgstr ""
 #. TRANS: %1$s is the subscribing user's nickname, %2$s is the StatusNet sitename.
 #. TRANS: Main body of new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscriber's long name, %2$s is the StatusNet sitename.
-#, php-format
-msgid "%1$s is now listening to your notices on %2$s."
+#, fuzzy, php-format
+msgid "%1$s is now following you on %2$s."
 msgstr "%1$s �მიერიდ�ნ ყურს უგდებს თქვენს შეტყ�ბინებებს %2$s-ზე."
 
 #. TRANS: Subject of pending new-subscriber notification e-mail.
@@ -8959,7 +8473,7 @@ msgstr ""
 "�რ უპ�სუხ�თ �მ წერილს; �დრეს�ტს �რ მიუვ�.\n"
 "\n"
 "პ�ტივისცემით,\n"
-"%5$s\n"
+"%5$s"
 
 #. TRANS: Subject for favorite notification e-mail.
 #. TRANS: %1$s is the adding user's long name, %2$s is the adding user's nickname.
@@ -9026,7 +8540,7 @@ msgstr "%s-მ� (@%s) გ�მ��გზ�ვნ� შეტყ�ბი
 #. TRANS: Body of @-reply notification e-mail.
 #. TRANS: %1$s is the sending user's name, $2$s is the StatusNet sitename,
 #. TRANS: %3$s is a URL to the notice, %4$s is the notice text,
-#. TRANS: %5$s is a URL to the full conversion if it exists (otherwise empty),
+#. TRANS: %5$s is the text "The full conversation can be read here:" and a URL to the full conversion if it exists (otherwise empty),
 #. TRANS: %6$s is a URL to reply to the notice, %7$s is a URL to all @-replies for the addressed user,
 #, php-format
 msgid ""
@@ -9051,6 +8565,10 @@ msgstr ""
 
 #. TRANS: Subject of group join notification e-mail.
 #. TRANS: %1$s is the joining user's nickname, %2$s is the group name, and %3$s is the StatusNet sitename.
+#, fuzzy, php-format
+msgid "%1$s has joined your group %2$s on %3$s"
+msgstr "%1$s გ�წევრი�ნდ� ჯგუფში %2$s."
+
 #. TRANS: Main body of group join notification e-mail.
 #. TRANS: %1$s is the subscriber's long name, %2$s is the group name, and %3$s is the StatusNet sitename,
 #. TRANS: %4$s is a block of profile info about the subscriber.
@@ -9143,9 +8661,10 @@ msgid "Make Admin"
 msgstr ""
 
 #. TRANS: Submit button title.
+#, fuzzy
 msgctxt "TOOLTIP"
-msgid "Make this user an admin"
-msgstr ""
+msgid "Make this user an admin."
+msgstr "მი�ნიჭე მ�მხმ�რებელს ჯგუფის �დმინ�ბ�"
 
 #. TRANS: Client exception thrown when a database error was thrown during a file upload operation.
 msgid "There was a database error while saving your file. Please try again."
@@ -9191,7 +8710,7 @@ msgstr "გ��გზ�ვნე პირდ�პირი შეტყ�
 msgid "Select recipient:"
 msgstr "�ირჩიეთ �პერ�ტ�რი"
 
-#. TRANS Entry in drop-down selection box in direct-message inbox/outbox when no one is available to message.
+#. TRANS: Entry in drop-down selection box in direct-message inbox/outbox when no one is available to message.
 #, fuzzy
 msgid "No mutual subscribers."
 msgstr "�რ გ�ქვთ გ�მ�წერილი!"
@@ -9263,6 +8782,10 @@ msgstr ""
 msgid "You must implement either adaptNoticeListItem() or showNotice()."
 msgstr ""
 
+#. TRANS: Link description to show more items in a list.
+msgid "More â–¼"
+msgstr ""
+
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 msgid "Nickname cannot be empty."
 msgstr ""
@@ -9312,10 +8835,6 @@ msgctxt "SEPARATOR"
 msgid ", "
 msgstr ""
 
-#. TRANS: Start of profile addressees list.
-msgid " â–¸ "
-msgstr ""
-
 #. TRANS: Used in coordinates as abbreviation of north.
 msgid "N"
 msgstr "ჩ"
@@ -9354,7 +8873,8 @@ msgid "Repeated by"
 msgstr ""
 
 #. TRANS: Link title in notice list item to reply to a notice.
-msgid "Reply to this notice"
+#, fuzzy
+msgid "Reply to this notice."
 msgstr "უპ�სუხე �მ შეტყ�ბინებ�ს"
 
 #. TRANS: Link text in notice list item to reply to a notice.
@@ -9362,7 +8882,8 @@ msgid "Reply"
 msgstr "პ�სუხი"
 
 #. TRANS: Link title in notice list item to delete a notice.
-msgid "Delete this notice"
+#, fuzzy
+msgid "Delete this notice from the timeline."
 msgstr "შეტყ�ბინების წ�შლ�"
 
 #. TRANS: Title for repeat form status in notice list when a notice has been repeated.
@@ -9388,27 +8909,6 @@ msgstr ""
 msgid "Send a nudge to this user."
 msgstr "გ�უგზ�ვნე პირდ�პირი შეტყ�ბინებ� �მ მ�მხმ�რებელს"
 
-#. TRANS: Exception thrown when creating a new profile fails in OAuth store.
-msgid "Error inserting new profile."
-msgstr ""
-
-#. TRANS: Exception thrown when creating a new avatar fails in OAuth store.
-msgid "Error inserting avatar."
-msgstr ""
-
-#. TRANS: Exception thrown when creating a remote profile fails in OAuth store.
-msgid "Error inserting remote profile."
-msgstr ""
-
-#. TRANS: Exception thrown when a notice is denied because it has been sent before.
-msgid "Duplicate notice."
-msgstr ""
-
-#. TRANS: Exception thrown when creating a new subscription fails in OAuth store.
-#, fuzzy
-msgid "Could not insert new subscription."
-msgstr "�ხ�ლი გ�მ�წერის ჩ�სმ� ვერ მ�ხერხდ�."
-
 #. TRANS: Server exception thrown in oEmbed action if no API endpoint is available.
 #, fuzzy
 msgid "No oEmbed API endpoint available."
@@ -9497,11 +8997,6 @@ msgstr "რედ�ქტირებ�"
 msgid "Edit %s list by you."
 msgstr "%s ჯგუფის რედ�ქტირებ�"
 
-#. TRANS: Link description for link to list of users tagged with a tag.
-#, fuzzy
-msgid "Tagged"
-msgstr "ს�ნიშნე"
-
 #. TRANS: Title for link to edit list settings.
 #, fuzzy
 msgid "Edit list settings."
@@ -9658,8 +9153,10 @@ msgctxt "plugin"
 msgid "Enable"
 msgstr ""
 
+#. TRANS: Plugin description for a disabled plugin.
 msgctxt "plugin-description"
-msgid "(Plugin descriptions unavailable when disabled.)"
+msgid ""
+"(The plugin description is unavailable when a plugin has been disabled.)"
 msgstr ""
 
 #. TRANS: Menu item in primary navigation panel.
@@ -9673,6 +9170,11 @@ msgstr "SMS პ�რ�მეტრები"
 msgid "Change your personal settings."
 msgstr "შეცვ�ლე პრ�ფილის პ�რ�მეტრები"
 
+#. TRANS: Menu item in primary navigation panel.
+msgctxt "MENU"
+msgid "Admin"
+msgstr "�დმინი"
+
 #. TRANS: Menu item title in primary navigation panel.
 #, fuzzy
 msgid "Site configuration."
@@ -9693,15 +9195,8 @@ msgstr "გ�სვლ� ს�იტიდ�ნ"
 msgid "Login to the site."
 msgstr "ს�იტზე შესვლ�"
 
-#. TRANS: Menu item in primary navigation panel.
-msgctxt "MENU"
-msgid "Search"
-msgstr "ძიებ�"
-
-#. TRANS: Menu item title in primary navigation panel.
-#, fuzzy
-msgid "Search the site."
-msgstr "ძიებ� ს�იტზე"
+msgid "This profile has been silenced by site moderators"
+msgstr ""
 
 #. TRANS: H2 text for user subscription statistics.
 #, fuzzy
@@ -9713,6 +9208,10 @@ msgstr "დ�შვებ�"
 msgid "Followers"
 msgstr "დ�შვებ�"
 
+#. TRANS: H2 text for user statistics.
+msgid "Statistics"
+msgstr "სტ�ტისტიკ�"
+
 #. TRANS: Label for user statistics.
 msgid "User ID"
 msgstr "მ�მხმ�რებლის იდ"
@@ -9721,10 +9220,6 @@ msgstr "მ�მხმ�რებლის იდ"
 msgid "Member since"
 msgstr ""
 
-#. TRANS: Label for user statistics.
-msgid "Notices"
-msgstr "შეტყ�ბინებები"
-
 #. TRANS: Label for user statistics.
 #. TRANS: Average count of posts made per day since account registration.
 msgid "Daily average"
@@ -9817,6 +9312,7 @@ msgid "Keyword(s)"
 msgstr "ს�კვ�ნძ� სიტყვები"
 
 #. TRANS: Button text for searching site.
+#. TRANS: Button text for search button on search form.
 #. TRANS: Button text to search profiles.
 msgctxt "BUTTON"
 msgid "Search"
@@ -9867,23 +9363,6 @@ msgstr "მ�ძებნე შეტყ�ბინებებში"
 msgid "Find groups on this site"
 msgstr "მ�ძებნე ჯგუფები �მ ს�იტზე"
 
-#. TRANS: Secondary navigation menu item leading to help on StatusNet.
-msgctxt "MENU"
-msgid "Help"
-msgstr "დ�ხმ�რებ�"
-
-#. TRANS: Secondary navigation menu item leading to text about StatusNet site.
-#, fuzzy
-msgctxt "MENU"
-msgid "About"
-msgstr "ს�იტის შეს�ხებ"
-
-#. TRANS: Secondary navigation menu item leading to Frequently Asked Questions.
-#, fuzzy
-msgctxt "MENU"
-msgid "FAQ"
-msgstr "ხდკ"
-
 #. TRANS: Secondary navigation menu item leading to Terms of Service.
 #, fuzzy
 msgctxt "MENU"
@@ -9908,19 +9387,6 @@ msgctxt "MENU"
 msgid "Version"
 msgstr "ვერსი�"
 
-#. TRANS: Secondary navigation menu item leading to e-mail contact information on the
-#. TRANS: StatusNet site, where to report bugs, ...
-#, fuzzy
-msgctxt "MENU"
-msgid "Contact"
-msgstr "კ�ნტ�ქტი"
-
-#. TRANS: Secondary navigation menu item. Leads to information about embedding a timeline widget.
-#, fuzzy
-msgctxt "MENU"
-msgid "Badge"
-msgstr "ი�რლიყი"
-
 #. TRANS: Default title for section/sidebar widget.
 msgid "Untitled section"
 msgstr "უს�თ�ურ� სექცი�"
@@ -9969,10 +9435,6 @@ msgstr "ელ. ფ�სტ�"
 msgid "Change email handling"
 msgstr "ელ. ფ�სტის მ�რთვ�"
 
-#. TRANS: Menu item title in settings navigation panel.
-msgid "Design your profile"
-msgstr "პრ�ფილის პ�რ�მეტრები"
-
 #. TRANS: Menu item in settings navigation panel.
 msgctxt "MENU"
 msgid "URL"
@@ -10012,6 +9474,15 @@ msgstr "შეერთებები"
 msgid "Authorized connected applications"
 msgstr "�ვტ�რიზირებული შეერთებული �პლიკ�ციები"
 
+#. TRANS: Menu item in settings navigation panel.
+msgctxt "MENU"
+msgid "Old school"
+msgstr ""
+
+#. TRANS: Menu item title in settings navigation panel.
+msgid "UI tweaks for old-school users"
+msgstr ""
+
 #. TRANS: Title of form to silence a user.
 #, fuzzy
 msgctxt "TITLE"
@@ -10022,6 +9493,43 @@ msgstr "დ�დუმებ�"
 msgid "Silence this user"
 msgstr "�მ მ�მხმ�რებლის დ�დუმებ�"
 
+#. TRANS: Server error displayed when trying to create an anynymous OAuth consumer.
+#, fuzzy
+msgid "Could not create anonymous consumer."
+msgstr "ჯგუფის შექმნ� ვერ მ�ხერხდ�."
+
+#. TRANS: Server error displayed when trying to create an anynymous OAuth application.
+#, fuzzy
+msgid "Could not create anonymous OAuth application."
+msgstr "�პლიკ�ციის შექმნ� ვერ მ�ხერხდ�."
+
+#. TRANS: Exception thrown when no token association could be found.
+msgid ""
+"Could not find a profile and application associated with the request token."
+msgstr ""
+
+#. TRANS: Exception thrown when no access token can be issued.
+#, fuzzy
+msgid "Could not issue access token."
+msgstr "შეტყ�ბინების ჩ�სმ� ვერ მ�ხერხდ�."
+
+#. TRANS: Exception thrown when a database error occurs.
+msgid "Database error inserting OAuth application user."
+msgstr "ბ�ზ�მ დ�უშვ� შეცდ�მ� OAuth �პლიკ�ციის მ�მხმ�რებლის ჩ�სმის�ს."
+
+#. TRANS: Exception thrown when a database error occurs.
+#, fuzzy
+msgid "Database error updating OAuth application user."
+msgstr "ბ�ზ�მ დ�უშვ� შეცდ�მ� OAuth �პლიკ�ციის მ�მხმ�რებლის ჩ�სმის�ს."
+
+#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
+msgid "Tried to revoke unknown token."
+msgstr ""
+
+#. TRANS: Exception thrown when an attempt is made to remove a revoked token.
+msgid "Failed to delete revoked token."
+msgstr ""
+
 #. TRANS: Menu item in local navigation menu.
 #, fuzzy
 msgctxt "MENU"
@@ -10079,6 +9587,18 @@ msgstr "მ�იწვიე მეგ�ბრები დ� კ�ლეგ
 msgid "Subscribe to this user"
 msgstr "გ�მ�იწერე ეს მ�მხმ�რებელი"
 
+#. TRANS: Button text to subscribe to a user.
+#. TRANS: Button text for subscribing to a list.
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Subscribe"
+msgstr "გ�მ�წერ�"
+
+#. TRANS: Button title to subscribe to a user.
+#, fuzzy
+msgid "Subscribe to this user."
+msgstr "გ�მ�იწერე ეს მ�მხმ�რებელი"
+
 #. TRANS: Title of personal tag cloud section.
 msgid "People Tagcloud as self-tagged"
 msgstr "მ�მხმ�რებლების ს�ნიშნეების ღრუბელი (თვითმ�ნიშნული)"
@@ -10203,15 +9723,24 @@ msgstr[0] ""
 #. TRANS: List message for notice repeated by logged in user.
 #, fuzzy
 msgctxt "REPEATLIST"
-msgid "You have repeated this notice."
+msgid "You repeated this."
 msgstr "თქვენ უკვე გ�იმე�რეთ ეს შეტყ�ბინებ�."
 
-#. TRANS: List message for repeated notices.
-#. TRANS: %d is the number of users that have repeated a notice.
+#. TRANS: List message for when more than 4 people repeat something.
+#. TRANS: %%s is a list of users liking a notice, %d is the number over 4 that like the notice.
+#. TRANS: Plural is decided on the total number of users liking the notice (count of %%s + %d).
+#, php-format
+msgid "%%s and %d other repeated this."
+msgid_plural "%%s and %d others repeated this."
+msgstr[0] ""
+
+#. TRANS: List message for favoured notices.
+#. TRANS: %%s is a list of users liking a notice.
+#. TRANS: Plural is based on the number of of users that have favoured a notice.
 #, fuzzy, php-format
-msgid "One person has repeated this notice."
-msgid_plural "%d people have repeated this notice."
-msgstr[0] "ეს შეტყ�ბინებ� უკვე გ�მე�რებული�."
+msgid "%%s repeated this."
+msgid_plural "%%s repeated this."
+msgstr[0] "თქვენ უკვე გ�იმე�რეთ ეს შეტყ�ბინებ�."
 
 #. TRANS: Form legend.
 #, fuzzy, php-format
@@ -10310,7 +9839,6 @@ msgid "Unsilence this user"
 msgstr "�მ მ�მხმ�რებლის დ�დუმების მ�ხსნ�"
 
 #. TRANS: Form legend on unsubscribe form.
-#. TRANS: Button title on unsubscribe form.
 msgid "Unsubscribe from this user"
 msgstr "�მ მ�მხმ�რებლის გ�მ�წერის გ�უქმებ�"
 
@@ -10321,6 +9849,11 @@ msgctxt "BUTTON"
 msgid "Unsubscribe"
 msgstr "გ�მ�წერის გ�უქმებ�"
 
+#. TRANS: Button title on unsubscribe form.
+#, fuzzy
+msgid "Unsubscribe from this user."
+msgstr "�მ მ�მხმ�რებლის გ�მ�წერის გ�უქმებ�"
+
 #. TRANS: Exception text shown when no profile can be found for a user.
 #. TRANS: %1$s is a user nickname, $2$d is a user ID (number).
 #, fuzzy, php-format
@@ -10400,9 +9933,3 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
-
-#~ msgid "%1$s and friends, page %2$d"
-#~ msgstr "%1$s დ� მეგ�ბრები, გვერდი %2$d"
-
-#~ msgid "You and friends"
-#~ msgstr "შენ დ� მეგ�ბრები"
diff --git a/locale/ko/LC_MESSAGES/statusnet.po b/locale/ko/LC_MESSAGES/statusnet.po
index 634cfebb00..c57bce3ffb 100644
--- a/locale/ko/LC_MESSAGES/statusnet.po
+++ b/locale/ko/LC_MESSAGES/statusnet.po
@@ -4,6 +4,7 @@
 # Author: Brion
 # Author: Changwoo
 # Author: Twkang
+# Author: 아�
 # --
 # This file is distributed under the same license as the StatusNet package.
 #
@@ -11,17 +12,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:25+0000\n"
-"Language-Team: Korean <http://translatewiki.net/wiki/Portal:ko>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:19+0000\n"
+"Language-Team: Korean <https://translatewiki.net/wiki/Portal:ko>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ko\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-POT-Import-Date: 2011-05-05 10:52:40+0000\n"
+"X-POT-Import-Date: 2012-04-22 22:02:21+0000\n"
 
 #. TRANS: Database error message.
 #, php-format
@@ -36,14 +37,6 @@ msgstr ""
 "제를 전달하려면 %2$s 통해 관리��게 연�할 수 있습니다. 아니면 몇 분 정� 기"
 "다렸다가 다시 시�하십시오."
 
-#. TRANS: Error message.
-msgid ""
-"An important error occured, probably related to email setup. Check logfiles "
-"for more info."
-msgstr ""
-"전�메� 설치와 관련� 중요한 오류가 발�했습니다. 로그 파��서 �세한 내용"
-"� 확�하십시오."
-
 #. TRANS: Error message.
 msgid "An error occurred."
 msgstr "오류가 발�했습니다."
@@ -102,12 +95,12 @@ msgstr "신규 등� 차단"
 msgid "Closed"
 msgstr "차단"
 
-#. TRANS: Title for button to save access settings in site admin panel.
-msgid "Save access settings"
+#. TRANS: Button title to save access settings in site admin panel.
+#, fuzzy
+msgid "Save access settings."
 msgstr "접근 권한 설정 저장"
 
-#. TRANS: Tooltip for button to save access settings in site admin panel.
-#. TRANS: Button text for saving theme settings.
+#. TRANS: Button text to save access settings in site admin panel.
 #. TRANS: Button label to save e-mail preferences.
 #. TRANS: Button label to save IM preferences.
 #. TRANS: Button text in the license admin panel.
@@ -123,7 +116,6 @@ msgstr "접근 권한 설정 저장"
 #. TRANS: Button text for saving "Other settings" in profile.
 #. TRANS: Button text to save user settings in user admin panel.
 #. TRANS: Button label in the "Edit application" form.
-#. TRANS: Button text on profile design page to save settings.
 #. TRANS: Text for save button on group edit form.
 #. TRANS: Button text to save tags for a profile.
 msgctxt "BUTTON"
@@ -162,10 +154,6 @@ msgstr "그런 프로필� 없습니다."
 msgid "No such list."
 msgstr "그런 리스트가 없습니다."
 
-#. TRANS: Client error displayed when trying to add an OMB 0.1 remote profile to a list.
-msgid "You cannot list an OMB 0.1 remote profile with this action."
-msgstr "� �작으로 OMB 0.1 �격 프로필� 리스트� 넣� 수 없습니다."
-
 #. TRANS: Client error displayed when an unknown error occurs when adding a user to a list.
 #. TRANS: %s is a username.
 #, php-format
@@ -197,7 +185,6 @@ msgstr "해당 페�지가 없습니다."
 #. TRANS: Client error when user not found for an rss related action.
 #. TRANS: Client error displayed when no existing user is provided for a user's delivery device setting.
 #. TRANS: Client error displayed if a user could not be found.
-#. TRANS: Client error when user not found updating a profile background image.
 #. TRANS: Client error displayed updating profile image without having a user object.
 #. TRANS: Client error displayed when making an Atom API request for an unknown user.
 #. TRANS: Client error displayed when trying to block a non-existing user or a user from another site.
@@ -223,14 +210,11 @@ msgstr "해당 페�지가 없습니다."
 #. TRANS: Client error displayed when trying to get the RSS feed with favorites of a user that does not exist.
 #. TRANS: Client error displayed when requesting Friends of a Friend feed without providing a user nickname.
 #. TRANS: Client error displayed when requesting Friends of a Friend feed for an object that is not a user.
-#. TRANS: Client error displayed when trying to get a user hCard for a non-existing user.
 #. TRANS: Client error displayed trying to make a micro summary without providing a valid user.
 #. TRANS: Client error displayed trying to send a direct message to a non-existing user.
 #. TRANS: Client error displayed trying to use "one time password login" without using an existing user.
 #. TRANS: Client error displayed when referring to non-existing user.
 #. TRANS: Client error displayed trying to perform an action related to a non-existing user.
-#. TRANS: Form validation error on page for remote subscribe when no user was provided.
-#. TRANS: Form validation error on page for remote subscribe when no user profile was found.
 #. TRANS: Client error displayed when trying to reply to a non-exsting user.
 #. TRANS: Client error displayed when providing a non-existing nickname in a RSS 1.0 action.
 #. TRANS: Client error.
@@ -239,7 +223,6 @@ msgstr "해당 페�지가 없습니다."
 #. TRANS: Client error displayed trying to find a user by ID for a non-existing ID.
 #. TRANS: Client error displayed requesting groups for a non-existing user.
 #. TRANS: Client error displayed when user not found for an action.
-#. TRANS: Client error displayed providing a non-existing nickname.
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #. TRANS: Client error displayed when trying to perform a gallery action with an unknown user.
 #. TRANS: Client error displayed when trying to access a mailbox without providing a user.
@@ -258,6 +241,13 @@ msgstr "%s 타임��"
 msgid "%s's home timeline"
 msgstr "%s 타임��"
 
+#. TRANS: %s is user nickname.
+#. TRANS: Feed title.
+#. TRANS: %s is tagger's nickname.
+#, fuzzy, php-format
+msgid "Feed for friends of %s (Activity Streams JSON)"
+msgstr "%s� 친구들� 대한 피드 (Atom)"
+
 #. TRANS: %s is user nickname.
 #, php-format
 msgid "Feed for friends of %s (RSS 1.0)"
@@ -301,7 +291,7 @@ msgstr ""
 "프로파��서 [%1$s 님� 찔러 보거나](../%2$s) �는 [그 분�게 뭔가 글� �보"
 "세요](%%%%action.newnotice%%%%?status_textarea=%3$s)."
 
-#. TRANS: Encoutagement displayed on empty timeline user pages for anonymous users.
+#. TRANS: Encouragement displayed on empty timeline user pages for anonymous users.
 #. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
 #. TRANS: Empty list message for page with replies for a user for not logged in users.
 #. TRANS: %1$s is a user nickname. This message contains a Markdown link in the form [link text](link).
@@ -315,6 +305,13 @@ msgstr ""
 "[계정� 등�하고](%%%%action.register%%%%) %s 님� 찔러 보거나 글� � 보세"
 "ìš”."
 
+#. TRANS: Button text for inviting more users to the StatusNet instance.
+#. TRANS: Less business/enterprise-oriented language for public sites.
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Send invite"
+msgstr "초대"
+
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Title of API timeline for a user and friends.
 #. TRANS: %s is a username.
@@ -323,8 +320,6 @@ msgstr ""
 #. TRANS: %s is a username.
 #. TRANS: Menu item title in personal group navigation menu.
 #. TRANS: %s is a username.
-#. TRANS: Menu item title in settings navigation panel.
-#. TRANS: %s is a username.
 #, php-format
 msgid "%s and friends"
 msgstr "%s � 친구들"
@@ -362,7 +357,6 @@ msgstr "'device' 파�미터� 값� 다� 중 하나로 지정해야 합니
 #. TRANS: Server error thrown on database error updating SMS preferences.
 #. TRANS: Server error thrown on database error removing a registered SMS phone number.
 #. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
-#. TRANS: Server exception thrown on Profile design page when updating design settings fails.
 msgid "Could not update user."
 msgstr "사용�를 업��트할 수 없습니다."
 
@@ -377,7 +371,6 @@ msgstr "프로필� 저장 할 수 없습니다."
 
 #. TRANS: Client error displayed when the number of bytes in a POST request exceeds a limit.
 #. TRANS: %s is the number of bytes of the CONTENT_LENGTH.
-#. TRANS: Form validation error in design settings form. POST should remain untranslated.
 #, php-format
 msgid ""
 "The server was unable to handle that much POST data (%s byte) due to its "
@@ -387,24 +380,6 @@ msgid_plural ""
 "current configuration."
 msgstr[0] ""
 
-#. TRANS: Client error displayed when saving design settings fails because of an empty id.
-#. TRANS: Client error displayed when saving design settings fails because of an empty result.
-#. TRANS: Client error displayed when a database error occurs inserting profile colours.
-#. TRANS: Client error displayed when a database error occurs updating profile colours.
-#. TRANS: Form validation error displayed when group design settings could not be saved because of an application issue.
-#. TRANS: Form validation error on Profile design page when saving design settings has failed.
-#. TRANS: Form validation error on Profile design page when updating design settings has failed.
-msgid "Unable to save your design settings."
-msgstr "디�� 설정� 저장할 수 없습니다."
-
-#. TRANS: Error displayed when updating design settings fails.
-#. TRANS: Client error displayed when a database error occurs updating profile colours.
-#. TRANS: Form validation error on Profile design page when updating design settings has failed.
-#. TRANS: Error message displayed if design settings could not be saved.
-#. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
-msgid "Could not update your design."
-msgstr "디��� 업��트할 수 없습니다."
-
 #. TRANS: Title for Atom feed.
 msgctxt "ATOM"
 msgid "Main"
@@ -451,6 +426,22 @@ msgstr "사용� 차단� 실패했습니다."
 msgid "Unblock user failed."
 msgstr "사용� 차단 해제� 실패했습니다."
 
+#. TRANS: Client exception thrown when no conversation ID is given.
+#, fuzzy
+msgid "No conversation ID."
+msgstr "대화"
+
+#. TRANS: Client exception thrown when referring to a non-existing conversation ID (%d).
+#, fuzzy, php-format
+msgid "No conversation with ID %d."
+msgstr "대화"
+
+#. TRANS: Title for conversion timeline.
+#, fuzzy
+msgctxt "TITLE"
+msgid "Conversation"
+msgstr "대화"
+
 #. TRANS: Title. %s is a user nickname.
 #, php-format
 msgid "Direct messages from %s"
@@ -493,6 +484,8 @@ msgid "Cannot send direct messages to users who aren't your friend."
 msgstr "친구가 아닌 사용��게는 �접 �접 메시지를 보낼 수 없습니다."
 
 #. TRANS: Client error displayed trying to direct message self (403).
+#. TRANS: Client error displayed trying to send a direct message to self.
+#. TRANS: Error text shown when trying to send a direct message to self.
 msgid ""
 "Do not send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
@@ -721,7 +714,6 @@ msgstr "%s 사�트� 그룹"
 
 #. TRANS: Client error displayed when trying to edit a group without being an admin.
 #. TRANS: Client error displayed trying to edit a group while not being a group admin.
-#. TRANS: Client error displayed trying to change group design settings without being a (group) admin.
 #. TRANS: Client error displayed when trying to change group logo settings while not being a group admin.
 msgid "You must be an admin to edit the group."
 msgstr "관리�만 그룹� 편집할 수 있습니다."
@@ -831,7 +823,6 @@ msgstr "oauth_token_association� 넣는� ��터베�스 오류."
 
 #. TRANS: Client error given on when invalid data was passed through a form in the OAuth API.
 #. TRANS: Unexpected validation error on avatar upload form.
-#. TRANS: Client error displayed when the submitted form contains unexpected data.
 #. TRANS: Client error displayed submitting invalid form data for edit application.
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
 #. TRANS: Form validation error message when an unsupported argument is used.
@@ -840,7 +831,6 @@ msgstr "oauth_token_association� 넣는� ��터베�스 오류."
 #. TRANS: Client error when submitting a form with unexpected information.
 #. TRANS: Client error displayed when unexpected data is posted in the password recovery form.
 #. TRANS: Message given submitting a form with an unknown action in SMS settings.
-#. TRANS: Unknown form validation error in design settings form.
 msgid "Unexpected form submission."
 msgstr "예�치 못한 � 제출."
 
@@ -884,7 +874,6 @@ msgstr "계정"
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Field label on account registration page.
-#. TRANS: Label for nickname on user authorisation page.
 #. TRANS: Field label on group edit form.
 #. TRANS: Dropdown option for searching in profiles.
 msgid "Nickname"
@@ -1192,12 +1181,9 @@ msgstr "그룹� 떠나려면 로그�해야 합니다."
 #. TRANS: Client error displayed when requesting Friends of a Friend feed for a nickname that is not a group.
 #. TRANS: Client error displayed trying to block a user from a group while specifying a non-existing group.
 #. TRANS: Client error displayed referring to a group's permalink for a non-existing group ID.
-#. TRANS: Client error displayed trying to change group design settings while providing a nickname for a non-existing group.
 #. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
 #. TRANS: Client error displayed when trying to view group members for a non-existing group.
 #. TRANS: Client error displayed when trying to view group members for an object that is not a group.
-#. TRANS: Client error displayed when trying to view group members for a non-existing group.
-#. TRANS: Client error displayed when trying to view group members for an object that is not a group.
 #. TRANS: Client error displayed when requesting a group RSS feed for group that does not exist.
 #. TRANS: Client error displayed when requesting a group RSS feed for an object that is not a group.
 #. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
@@ -1206,10 +1192,10 @@ msgstr "그룹� 떠나려면 로그�해야 합니다."
 #. TRANS: Client error displayed when trying to leave a non-local group.
 #. TRANS: Client error displayed when trying to leave a non-existing group.
 #. TRANS: Client error displayed when providing an invalid group ID on the Make Admin page.
-#. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
-#. TRANS: Client error displayed if no local group with a given name was found requesting group page.
 #. TRANS: Command exception text shown when a group is requested that does not exist.
 #. TRANS: Error text shown when trying to leave a group that does not exist.
+#. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
+#. TRANS: Client error displayed if no local group with a given name was found requesting group page.
 msgid "No such group."
 msgstr "그런 그룹� 없습니다."
 
@@ -1276,6 +1262,7 @@ msgid "Join request canceled."
 msgstr "가입 요청� 취소�었습니다."
 
 #. TRANS: Client error displayed trying to approve subscription for a non-existing request.
+#. TRANS: %s is a user nickname.
 #, php-format
 msgid "%s is not in the moderation queue for your subscriptions."
 msgstr "%s 사용�는 구� 확� �� 들어 있지 않습니다."
@@ -1425,7 +1412,6 @@ msgstr "첨부 파�� 없습니다."
 #. TRANS: Client error displayed trying to get an avatar without providing a nickname.
 #. TRANS: Client error displayed when requesting a list of blocked users for a group without providing a group nickname.
 #. TRANS: Client error displayed trying to edit a group while not proving a nickname for the group to edit.
-#. TRANS: Client error displayed trying to change group design settings without providing a group nickname.
 #. TRANS: Client error displayed when trying to change group logo settings without providing a nickname.
 #. TRANS: Client error displayed when trying to view group members without providing a group nickname.
 #. TRANS: Client error displayed when requesting a group RSS feed without providing a group nickname.
@@ -1578,7 +1564,7 @@ msgstr ""
 #. TRANS: Button label on the form to block a user from a group.
 msgctxt "BUTTON"
 msgid "No"
-msgstr "아니요"
+msgstr "아니오"
 
 #. TRANS: Submit button title for 'No' when blocking a user.
 msgid "Do not block this user."
@@ -1718,6 +1704,18 @@ msgstr "\"%s\" 주소가 귀하� 계정� 확��었습니다."
 msgid "Conversation"
 msgstr "대화"
 
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#, fuzzy
+msgid "Conversation feed (Activity Streams JSON)"
+msgstr "%s� 글 피드 (Atom)"
+
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#, fuzzy
+msgid "Conversation feed (RSS 2.0)"
+msgstr "%s� 글 피드 (RSS 2.0)"
+
 #. TRANS: Title for conversation page.
 #. TRANS: Title for page that shows a notice.
 msgctxt "TITLE"
@@ -1777,7 +1775,8 @@ msgid "Enter \"%s\" to confirm that you want to delete your account."
 msgstr "계정 삭제를 확�하려면 \"%s\"�고 입력하십시오."
 
 #. TRANS: Button title for user account deletion.
-msgid "Permanently delete your account"
+#, fuzzy
+msgid "Permanently delete your account."
 msgstr "계정 �구히 삭제"
 
 #. TRANS: Client error displayed trying to delete an application while not logged in.
@@ -1920,149 +1919,6 @@ msgstr "� 사용� 삭제하지 않기."
 msgid "Delete this user."
 msgstr "� 사용� 삭제."
 
-#. TRANS: Message used as title for design settings for the site.
-msgid "Design"
-msgstr "디��"
-
-#. TRANS: Instructions for design adminsitration panel.
-msgid "Design settings for this StatusNet site"
-msgstr "� StatusNet 사�트� 디�� 설정"
-
-#. TRANS: Client error displayed when a logo URL does is not valid.
-msgid "Invalid logo URL."
-msgstr "로고 URL� 잘못�었습니다."
-
-#. TRANS: Client error displayed when an SSL logo URL is invalid.
-msgid "Invalid SSL logo URL."
-msgstr "SSL 로고 URL� 잘못�었습니다."
-
-#. TRANS: Client error displayed when a theme is submitted through the form that is not in the theme list.
-#. TRANS: %s is the chosen unavailable theme.
-#, php-format
-msgid "Theme not available: %s."
-msgstr "테마가 없습니다: %s."
-
-#. TRANS: Fieldset legend for form to change logo.
-msgid "Change logo"
-msgstr "로고 바꾸기"
-
-#. TRANS: Field label for StatusNet site logo.
-msgid "Site logo"
-msgstr "사�트 로고"
-
-#. TRANS: Field label for SSL StatusNet site logo.
-msgid "SSL logo"
-msgstr "SSL 로고"
-
-#. TRANS: Fieldset legend for form change StatusNet site's theme.
-msgid "Change theme"
-msgstr "테마 바꾸기"
-
-#. TRANS: Field label for dropdown to choose site theme.
-msgid "Site theme"
-msgstr "사�트 테마"
-
-#. TRANS: Title for field label for dropdown to choose site theme.
-msgid "Theme for the site."
-msgstr "사�트� 대한 테마"
-
-#. TRANS: Field label for uploading a cutom theme.
-msgid "Custom theme"
-msgstr "사용� 지정 테마"
-
-#. TRANS: Form instructions for uploading a cutom StatusNet theme.
-msgid "You can upload a custom StatusNet theme as a .ZIP archive."
-msgstr "StatusNet� 사용� 지정 테마를 .ZIP 압축 파�로 업로드할 수 있습니다."
-
-#. TRANS: Fieldset legend for theme background image.
-msgid "Change background image"
-msgstr "배경 �미지 바꾸기"
-
-#. TRANS: Field label for background image on theme designer page.
-#. TRANS: Field label for background color selector.
-#. TRANS: Label on profile design page for setting a profile page background colour.
-msgid "Background"
-msgstr "ë°°ê²½"
-
-#. TRANS: Form guide for background image upload form on theme designer page.
-#, php-format
-msgid ""
-"You can upload a background image for the site. The maximum file size is %1"
-"$s."
-msgstr ""
-"사�트� 배경 �미지를 업로드할 수 있습니다. 최대 파� �기는 %1$s 입니다."
-
-#. TRANS: Used as radio button label to add a background image.
-msgid "On"
-msgstr "켜기"
-
-#. TRANS: Used as radio button label to not add a background image.
-msgid "Off"
-msgstr "�기"
-
-#. TRANS: Form guide for turning background image on or off on theme designer page.
-#. TRANS: Form guide for a set of radio buttons on the profile design page that will enable or disable
-#. TRANS: use of the uploaded profile image.
-msgid "Turn background image on or off."
-msgstr "배경 �미지를 켜거나 �니다."
-
-#. TRANS: Checkbox label to title background image on theme designer page.
-#. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
-msgid "Tile background image"
-msgstr "배경 �미지를 반복 나열"
-
-#. TRANS: Fieldset legend for theme colors.
-msgid "Change colors"
-msgstr "색 바꾸기"
-
-#. TRANS: Field label for content color selector.
-#. TRANS: Label on profile design page for setting a profile page content colour.
-msgid "Content"
-msgstr "ë‚´ìš©"
-
-#. TRANS: Field label for sidebar color selector.
-#. TRANS: Label on profile design page for setting a profile page sidebar colour.
-msgid "Sidebar"
-msgstr "가장�리 창"
-
-#. TRANS: Field label for text color selector.
-#. TRANS: Label on profile design page for setting a profile page text colour.
-msgid "Text"
-msgstr "문�"
-
-#. TRANS: Field label for link color selector.
-#. TRANS: Label on profile design page for setting a profile page links colour.
-msgid "Links"
-msgstr "��"
-
-#. TRANS: Fieldset legend for advanced theme design settings.
-msgid "Advanced"
-msgstr "고급"
-
-#. TRANS: Field label for custom CSS.
-msgid "Custom CSS"
-msgstr "사용� 정� CSS"
-
-#. TRANS: Button text for resetting theme settings.
-msgctxt "BUTTON"
-msgid "Use defaults"
-msgstr "기본값 사용"
-
-#. TRANS: Title for button for resetting theme settings.
-#. TRANS: Title for button on profile design page to reset all colour settings to default.
-msgid "Restore default designs."
-msgstr "기본값 디��으로 ��리기."
-
-#. TRANS: Title for button for resetting theme settings.
-#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-msgid "Reset back to default."
-msgstr "기본값으로 초기화."
-
-#. TRANS: Title for button for saving theme settings.
-#. TRANS: Title for button on profile design page to save settings.
-msgid "Save design."
-msgstr "디�� 저장."
-
 #. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
 msgid "This notice is not a favorite!"
 msgstr "좋아하는 글� 아닙니다!"
@@ -2077,6 +1933,79 @@ msgstr "좋아하는 글로 추가"
 msgid "No such document \"%s\"."
 msgstr "그런 문서가 없습니다:  \"%s\""
 
+#. TRANS: Menu item in administrator navigation panel.
+#. TRANS: Menu item in default local navigation panel.
+#. TRANS: Menu item in personal group navigation menu.
+msgctxt "MENU"
+msgid "Home"
+msgstr "대문"
+
+msgctxt "MENU"
+msgid "Docs"
+msgstr ""
+
+#. TRANS: Secondary navigation menu item leading to help on StatusNet.
+msgctxt "MENU"
+msgid "Help"
+msgstr "�움�"
+
+#, fuzzy
+msgid "Getting started"
+msgstr "설정� 저장했습니다."
+
+#. TRANS: Secondary navigation menu item leading to text about StatusNet site.
+msgctxt "MENU"
+msgid "About"
+msgstr "ì •ë³´"
+
+#, fuzzy
+msgid "About this site"
+msgstr "� 사용� 차단 해제"
+
+#. TRANS: Secondary navigation menu item leading to Frequently Asked Questions.
+msgctxt "MENU"
+msgid "FAQ"
+msgstr "�주 묻는 질문"
+
+msgid "Frequently asked questions"
+msgstr ""
+
+#. TRANS: Secondary navigation menu item leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+msgctxt "MENU"
+msgid "Contact"
+msgstr "연�하기"
+
+#, fuzzy
+msgid "Contact info"
+msgstr "연�하기"
+
+#, fuzzy
+msgctxt "MENU"
+msgid "Tags"
+msgstr "태그"
+
+msgid "Using tags"
+msgstr ""
+
+#. TRANS: Menu item in default local navigation panel.
+#. TRANS: Menu item in search group navigation panel.
+#. TRANS: Menu item in local navigation menu.
+msgctxt "MENU"
+msgid "Groups"
+msgstr "그룹"
+
+#, fuzzy
+msgid "Using groups"
+msgstr "사용� 그룹"
+
+msgctxt "MENU"
+msgid "API"
+msgstr ""
+
+msgid "RESTful API"
+msgstr ""
+
 #. TRANS: Title for "Edit application" form.
 #. TRANS: Form legend.
 msgid "Edit application"
@@ -2239,7 +2168,7 @@ msgstr ""
 "공개 태그를 비공개로 설정하면 기존� 구�� 모� 지워집니다. 그래� 계� 하시"
 "겠습니까?"
 
-#. TRANS: TRANS: Server error displayed when updating a list fails.
+#. TRANS: Server error displayed when updating a list fails.
 msgid "Could not update list."
 msgstr "리스트를 업��트할 수 없습니다."
 
@@ -2540,40 +2469,6 @@ msgstr "첨부가 없습니다."
 msgid "No uploaded attachments."
 msgstr "업로드한 첨부가 없습니다."
 
-#. TRANS: Client error displayed when subscribing to a remote profile and an unexpected response is received.
-msgid "Not expecting this response!"
-msgstr "예�치 못한 �답입니다!"
-
-#. TRANS: Client error displayed when subscribing to a remote profile that does not exist.
-msgid "User being listened to does not exist."
-msgstr "살펴 보고 있는 사용�가 없습니다."
-
-#. TRANS: Client error displayed when subscribing to a remote profile that is a local profile.
-#. TRANS: Client error displayed when using remote subscribe for a local entity.
-msgid "You can use the local subscription!"
-msgstr "로컬 구�� 사용할 수 있습니다."
-
-#. TRANS: Client error displayed when subscribing to a remote profile that is blocked form subscribing to.
-msgid "That user has blocked you from subscribing."
-msgstr "� 사용�는 내 구�� 차단했습니다."
-
-#. TRANS: Client error displayed when subscribing to a remote profile without providing an authorised token.
-msgid "You are not authorized."
-msgstr "��하지 않았습니다."
-
-#. TRANS: Client error displayed when subscribing to a remote profile and conversion of the request token to access token fails.
-msgid "Could not convert request token to access token."
-msgstr "요청 토�� 접근 권한 토�으로 변환할 수 없습니다."
-
-#. TRANS: Client error displayed when subscribing to a remote profile fails because of an unsupported version of the OMB protocol.
-msgid "Remote service uses unknown version of OMB protocol."
-msgstr "�격 서비스가 OMB 프로토콜� 알려지지 않� 버전� 사용합니다."
-
-#. TRANS: Server error displayed when subscribing to a remote profile fails because the remote profile could not be updated.
-#. TRANS: Exception thrown when updating a remote profile fails in OAuth store.
-msgid "Error updating remote profile."
-msgstr "�격 프로필 프로필 업��트 오류."
-
 #. TRANS: Client error displayed when requesting a non-existent file.
 msgid "No such file."
 msgstr "그런 파�� 없습니다."
@@ -2660,29 +2555,6 @@ msgstr "사용�를 그룹�서 차단하는� ��터베�스 오류."
 msgid "No ID."
 msgstr "아�디가 없습니다."
 
-#. TRANS: Client error displayed trying to change group design settings while not logged in.
-msgid "You must be logged in to edit a group."
-msgstr "그룹� 편집하려면 로그�해야 합니다."
-
-#. TRANS: Title group design settings page.
-msgid "Group design"
-msgstr "그룹 디��"
-
-#. TRANS: Instructions for group design settings page.
-msgid ""
-"Customize the way your group looks with a background image and a colour "
-"palette of your choice."
-msgstr "배경 �미지와 색 팔레트를 선�해서 그룹� 모양� 설정합니다."
-
-#. TRANS: Form validation error displayed when group design settings could not be updated because of an application issue.
-msgid "Unable to update your design settings."
-msgstr "디�� 설정� 업��트할 수 없습니다."
-
-#. TRANS: Form text to confirm saved group design settings.
-#. TRANS: Confirmation message on Profile design page when saving design settings has succeeded.
-msgid "Design preferences saved."
-msgstr "디�� 설정� 저장했습니다."
-
 #. TRANS: Title for group logo settings page.
 #. TRANS: Group logo form legend.
 msgid "Group logo"
@@ -2850,10 +2722,10 @@ msgstr "메신저 설정"
 #. TRANS: Instant messaging settings page instructions.
 #. TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link.
 #. TRANS: the order and formatting of link text and link should remain unchanged.
-#, php-format
+#, fuzzy, php-format
 msgid ""
-"You can send and receive notices through instant messaging [instant messages]"
-"(%%doc.im%%). Configure your addresses and settings below."
+"You can send and receive notices through [instant messaging](%%doc.im%%). "
+"Configure your addresses and settings below."
 msgstr ""
 "[메신저를 통해](%%doc.im%%) 글� 보내거나 받� 수 있습니다. 주소 � 메신저 설"
 "정� 아래�서 설정하십시오."
@@ -3044,28 +2916,6 @@ msgid ""
 "Use this form to invite your friends and colleagues to use this service."
 msgstr "다� 양�� �용해 친구 � �료를 � 서비스� 초대하십시오."
 
-#. TRANS: Field label for a list of e-mail addresses.
-msgid "Email addresses"
-msgstr "메� 주소"
-
-#. TRANS: Tooltip for field label for a list of e-mail addresses.
-msgid "Addresses of friends to invite (one per line)."
-msgstr "초대할 친구 주소 (한 줄� 하나씩)"
-
-#. TRANS: Field label for a personal message to send to invitees.
-msgid "Personal message"
-msgstr "개� 메시지"
-
-#. TRANS: Tooltip for field label for a personal message to send to invitees.
-msgid "Optionally add a personal message to the invitation."
-msgstr "초대장� 내 메시지를 첨부합니다."
-
-#. TRANS: Send button for inviting friends
-#. TRANS: Button text for sending notice.
-msgctxt "BUTTON"
-msgid "Send"
-msgstr "보내기"
-
 #. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral
 #. TRANS: singular 3rd-person pronoun in English. %1$s is the inviting user, $2$s is
 #. TRANS: the StatusNet sitename.
@@ -3197,12 +3047,6 @@ msgstr "��선스와 같� 표시할 �미지� URL."
 msgid "Save license settings."
 msgstr "��선스 설정 저장."
 
-#. TRANS: Client error displayed when trying to log in while already logged in.
-#. TRANS: Client error displayed trying to use "one time password login" when already logged in.
-#. TRANS: Client error displayed when trying to register while already logged in.
-msgid "Already logged in."
-msgstr "�미 로그�했습니다."
-
 #. TRANS: Form validation error displayed when trying to log in with incorrect credentials.
 msgid "Incorrect username or password."
 msgstr "사용� �름 �는 비밀 번호가 올바르지 않습니다."
@@ -3312,6 +3156,7 @@ msgstr "소스 URL� 필요합니다."
 msgid "Could not create application."
 msgstr "�용 프로그램� 새로 만들 수 없습니다."
 
+#. TRANS: Form validation error messages displayed when uploading an invalid application logo.
 msgid "Invalid image."
 msgstr "잘못� �미지입니다."
 
@@ -3348,14 +3193,6 @@ msgstr "내용� 없습니다!"
 msgid "No recipient specified."
 msgstr "수신�를 지정하지 않았습니다."
 
-#. TRANS: Client error displayed trying to send a direct message to self.
-#. TRANS: Error text shown when trying to send a direct message to self.
-msgid ""
-"Don't send a message to yourself; just say it to yourself quietly instead."
-msgstr ""
-"�기 �신�게 메시지를 보내지 마세요. (혼�서 조용히 �신�게 �하는 건 어떤"
-"가요?)"
-
 #. TRANS: Page title after sending a direct message.
 msgid "Message sent"
 msgstr "메세지를 보냈습니다."
@@ -3561,6 +3398,33 @@ msgstr "%s URL� �반 HTTP�만 사용하십시오."
 msgid "Not a supported data format."
 msgstr "지�하는 형�� ��터가 아닙니다."
 
+#. TRANS: Page title for profile settings.
+#, fuzzy
+msgid "Old school UI settings"
+msgstr "메신저 설정"
+
+#. TRANS: Usage instructions for profile settings.
+msgid "If you like it \"the old way\", you can set that here."
+msgstr ""
+
+#. TRANS: Confirmation shown when user profile settings are saved.
+#. TRANS: Message after successful saving of administrative settings.
+msgid "Settings saved."
+msgstr "설정� 저장했습니다."
+
+msgid "Only stream mode (no conversations) in timelines"
+msgstr ""
+
+msgid "Show conversation page as hierarchical trees"
+msgstr ""
+
+msgid "Show nicknames (not full names) in timelines"
+msgstr ""
+
+#. TRANS: Button text to save a list.
+msgid "Save"
+msgstr "저장"
+
 #. TRANS: ShortName in the OpenSearch interface when trying to find users.
 msgid "People Search"
 msgstr "사람 검색"
@@ -3569,6 +3433,11 @@ msgstr "사람 검색"
 msgid "Notice Search"
 msgstr "글 검색"
 
+#. TRANS: Client error displayed trying to use "one time password login" when already logged in.
+#. TRANS: Client error displayed when trying to register while already logged in.
+msgid "Already logged in."
+msgstr "�미 로그�했습니다."
+
 #. TRANS: Client error displayed trying to use "one time password login" without specifying a user.
 msgid "No user ID specified."
 msgstr "사용� 아�디를 지정하지 않았습니다."
@@ -3638,7 +3507,7 @@ msgid "Confirm"
 msgstr "확�"
 
 #. TRANS: Field title on page where to change password.
-#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
+#. TRANS: Title for field label for password reset form where the password has to be typed again.
 #. TRANS: Field title on account registration page.
 msgid "Same as password above."
 msgstr "위와 같� 비밀 번호."
@@ -3696,12 +3565,6 @@ msgstr "테마 디렉터리를 �� 수 없습니다: %s."
 msgid "Avatar directory not writable: %s."
 msgstr "아바타 디렉터리� 쓸 수 없습니다: %s."
 
-#. TRANS: Client error in Paths admin panel.
-#. TRANS: %s is the background directory that could not be written to.
-#, php-format
-msgid "Background directory not writable: %s."
-msgstr "배경 디렉터리� 쓸 수 없습니다: %s"
-
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the locales directory that could not be read from.
 #, php-format
@@ -3814,30 +3677,6 @@ msgstr "아바타 디렉터리"
 msgid "Directory where avatars are located."
 msgstr "아바타가 들어 있는 디렉터리."
 
-#. TRANS: Fieldset legend in Paths admin panel.
-msgid "Backgrounds"
-msgstr "ë°°ê²½"
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-msgid "Server for backgrounds."
-msgstr "배경 서버."
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-msgid "Web path to backgrounds."
-msgstr "배경� 웹 경로."
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-msgid "Server for backgrounds on SSL pages."
-msgstr "SSL 페�지� 배경 서버."
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-msgid "Web path to backgrounds on SSL pages."
-msgstr "SSL 페�지� 배경 웹 경로."
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-msgid "Directory where backgrounds are located."
-msgstr "배경� 들어 있는 디렉터리."
-
 #. TRANS: Fieldset legens in Paths admin panel.
 msgid "Attachments"
 msgstr "첨부"
@@ -3893,8 +3732,9 @@ msgid "Server to direct SSL requests to."
 msgstr "SSL 요청� 리다�렉트할 서버."
 
 #. TRANS: Button title text to store form data in the Paths admin panel.
-msgid "Save paths"
-msgstr "경로 저장"
+#, fuzzy
+msgid "Save path settings."
+msgstr "사�트 설정 저장"
 
 #. TRANS: Instructions for the "People search" page.
 #. TRANS: %%site.name%% is the name of the StatusNet site.
@@ -4022,13 +3862,13 @@ msgstr "��"
 #. TRANS: Message displayed for anonymous users on page that displays lists by a user.
 #. TRANS: This message contains Markdown links in the form [description](links).
 #. TRANS: %s is a tagger nickname.
-#, php-format
+#, fuzzy, php-format
 msgid ""
 "These are lists created by **%s**. Lists are how you sort similar people on %"
 "%%%site.name%%%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
 "blogging) service based on the Free Software [StatusNet](http://status.net/) "
 "tool. You can easily keep track of what they are doing by subscribing to the "
-"tag's timeline."
+"list's timeline."
 msgstr ""
 "다�� **%s** 사용�가 만든 리스트입니다. 리스트는 %%%%site.name%%%% 사�트�"
 "서 사람들� 분류하는 수단입니다. %%%%site.name%%%%  사�트는 �유소프트웨어 "
@@ -4057,13 +3897,13 @@ msgstr "%1$s 사용�가 들어 있는 리스트, %2$d 페�지"
 #. TRANS: Message displayed for anonymous users on page that displays lists for a user.
 #. TRANS: This message contains Markdown links in the form [description](links).
 #. TRANS: %s is a tagger nickname.
-#, php-format
+#, fuzzy, php-format
 msgid ""
 "These are lists for **%s**. lists are how you sort similar people on %%%%"
 "site.name%%%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
 "blogging) service based on the Free Software [StatusNet](http://status.net/) "
 "tool. You can easily keep track of what they are doing by subscribing to the "
-"tag's timeline."
+"list's timeline."
 msgstr ""
 "다�� **%s**님� 들어 있는 리스트입니다. 리스트는 %%%%site.name%%%% 사�트�"
 "서 사람들� 분류하는 수단입니다. %%%%site.name%%%%  사�트는 �유소프트웨어 "
@@ -4171,17 +4011,6 @@ msgid ""
 msgstr ""
 "사�트� 설정 파��서 모든 기본 플러그�� 사용하지 않게 만들었습니다."
 
-#. TRANS: Client error displayed if the notice posted has too many characters.
-msgid "Invalid notice content."
-msgstr "글 내용� 잘못�었습니다."
-
-#. TRANS: Exception thrown if a notice's license is not compatible with the StatusNet site license.
-#. TRANS: %1$s is the notice license, %2$s is the StatusNet site's license.
-#, php-format
-msgid "Notice license \"%1$s\" is not compatible with site license \"%2$s\"."
-msgstr ""
-"글� \"%1$s\" ��선스가 사�트� \"%2$s\" ��선스와 호환�지 않습니다."
-
 #. TRANS: Client error displayed when trying to add an unindentified field to profile.
 #. TRANS: %s is a field name.
 #, php-format
@@ -4275,6 +4104,8 @@ msgid "Share my current location when posting notices"
 msgstr "글� 쓸 때 현재 위치를 공유."
 
 #. TRANS: Field label in form for profile settings.
+#. TRANS: Title for group tag cloud section.
+#. TRANS: %s is a group name.
 msgid "Tags"
 msgstr "태그"
 
@@ -4303,7 +4134,7 @@ msgstr "주로 �활하는 곳� 어� 표준 시간대입니까?"
 
 #. TRANS: Checkbox label in form for profile settings.
 msgid ""
-"Automatically subscribe to whoever subscribes to me (best for non-humans)."
+"Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr ""
 "나�게 구�하는 사람� 모� �� 구� 신청. (사람� 아닌 계정�게 좋� 설정)"
 
@@ -4370,11 +4201,6 @@ msgstr "위치 설정� 저장할 수 없습니다."
 msgid "Could not save tags."
 msgstr "태그를 저장할 수 없습니다."
 
-#. TRANS: Confirmation shown when user profile settings are saved.
-#. TRANS: Message after successful saving of administrative settings.
-msgid "Settings saved."
-msgstr "설정� 저장했습니다."
-
 #. TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
 #. TRANS: Page title for page where a user account can be restored from backup.
 msgid "Restore account"
@@ -4387,7 +4213,8 @@ msgid "Beyond the page limit (%s)."
 msgstr "페�지 제한� (%s) 넘어갔습니다."
 
 #. TRANS: Server error displayed when a public timeline cannot be retrieved.
-msgid "Could not retrieve public stream."
+#, fuzzy
+msgid "Could not retrieve public timeline."
 msgstr "공개 스트림� 가져올 수 없습니다."
 
 #. TRANS: Title for all public timeline pages but the first.
@@ -4402,15 +4229,23 @@ msgid "Public timeline"
 msgstr "공개 타임��"
 
 #. TRANS: Link description for public timeline feed.
-msgid "Public Stream Feed (RSS 1.0)"
+#, fuzzy
+msgid "Public Timeline Feed (Activity Streams JSON)"
+msgstr "공개 스트림 피드 (Atom)"
+
+#. TRANS: Link description for public timeline feed.
+#, fuzzy
+msgid "Public Timeline Feed (RSS 1.0)"
 msgstr "공개 스트림 피드 (RSS 1.0)"
 
 #. TRANS: Link description for public timeline feed.
-msgid "Public Stream Feed (RSS 2.0)"
+#, fuzzy
+msgid "Public Timeline Feed (RSS 2.0)"
 msgstr "공개 스트림 피드 (RSS 2.0)"
 
 #. TRANS: Link description for public timeline feed.
-msgid "Public Stream Feed (Atom)"
+#, fuzzy
+msgid "Public Timeline Feed (Atom)"
 msgstr "공개 스트림 피드 (Atom)"
 
 #. TRANS: Text displayed for public feed when there are no public notices.
@@ -4457,45 +4292,6 @@ msgstr ""
 "net/) 소프트웨어를 사용하는 [마��로 블로깅](http://en.wikipedia.org/wiki/"
 "Micro-blogging) 서비스입니다."
 
-#. TRANS: Title for page with public list cloud.
-msgid "Public list cloud"
-msgstr "공개 리스트 ��우드"
-
-#. TRANS: Page notice for page with public list cloud.
-#. TRANS: %s is a StatusNet sitename.
-#, php-format
-msgid "These are largest lists on %s"
-msgstr "다�� %s�서 가장 �기 있는 리스트입니다."
-
-#. TRANS: Empty list message on page with public list cloud.
-#. TRANS: This message contains Markdown links in the form [description](link).
-#, php-format
-msgid "No one has [listed](%%doc.tags%%) anyone yet."
-msgstr "아� 아무� [리스트](%%doc.tags%%)가 없습니다."
-
-#. TRANS: Additional empty list message on page with public list cloud for logged in users.
-msgid "Be the first to list someone!"
-msgstr "리스트� 넣는 첫번째 사람� �세요!"
-
-#. TRANS: Additional empty list message on page with public list cloud for anonymous users.
-#. TRANS: This message contains Markdown links in the form [description](link).
-#, php-format
-msgid ""
-"Why not [register an account](%%action.register%%) and be the first to list "
-"someone!"
-msgstr ""
-"[계정� 등�해](%%action.register%%) 리스트� 넣는 첫번째 사람� �세요!"
-
-#. TRANS: DT element on on page with public list cloud.
-msgid "List cloud"
-msgstr "리스트 ��우드"
-
-#. TRANS: Link title for number of listed people. %d is the number of listed people.
-#, php-format
-msgid "1 person listed"
-msgid_plural "%d people listed"
-msgstr[0] ""
-
 #. TRANS: Public RSS feed description. %s is the StatusNet site name.
 #, php-format
 msgid "%s updates from everyone."
@@ -4617,7 +4413,6 @@ msgid "6 or more characters, and do not forget it!"
 msgstr "6글� ��, 잊어버리지 마십시오!"
 
 #. TRANS: Button text for password reset form.
-#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
 msgctxt "BUTTON"
 msgid "Reset"
 msgstr "초기화"
@@ -4626,18 +4421,6 @@ msgstr "초기화"
 msgid "Enter a nickname or email address."
 msgstr "사용� �름�나 메� 계정� 입력하십시오."
 
-#. TRANS: Information on password recovery form if no known username or e-mail address was specified.
-msgid "No user with that email address or username."
-msgstr "그러한 메� 주소나 �름� 사용�가 없습니다."
-
-#. TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.
-msgid "No registered email address for that user."
-msgstr "그 사용�는 등�한 메� 주소가 없습니다."
-
-#. TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.
-msgid "Error saving address confirmation."
-msgstr "주소 확� 저장 오류."
-
 #. TRANS: User notification after an e-mail with instructions was sent from the password recovery form.
 msgid ""
 "Instructions for recovering your password have been sent to the email "
@@ -4810,74 +4593,6 @@ msgid ""
 "to confirm your email address.)"
 msgstr "(곧 메� 주소를 확�하는 방법� 대한 안내를 메�로 받으실 것입니다.)"
 
-#. TRANS: Page notice for remote subscribe. This message contains Markdown links.
-#. TRANS: Ensure to keep the correct markup of [link description](link).
-#, php-format
-msgid ""
-"To subscribe, you can [login](%%action.login%%), or [register](%%action."
-"register%%) a new  account. If you already have an account  on a [compatible "
-"microblogging site](%%doc.openmublog%%),  enter your profile URL below."
-msgstr ""
-"구�하려면, [로그�](%%action.login%%)하거나, 새로 [가입](%%action.register%"
-"%)하십시오. �미 계정� [호환�는 마��로블로깅 사�트]((%%doc.openmublog%%)"
-"� 계정� 있으면, 아래� 프로파� URL� 입력하십시오."
-
-#. TRANS: Page title for Remote subscribe.
-msgid "Remote subscribe"
-msgstr "�격 구�"
-
-#. TRANS: Field legend on page for remote subscribe.
-msgid "Subscribe to a remote user"
-msgstr "�격 사용�� 구�"
-
-#. TRANS: Field label on page for remote subscribe.
-msgid "User nickname"
-msgstr "사용� �름"
-
-#. TRANS: Field title on page for remote subscribe.
-msgid "Nickname of the user you want to follow."
-msgstr "팔로우할 사용�� �름"
-
-#. TRANS: Field label on page for remote subscribe.
-msgid "Profile URL"
-msgstr "프로필 URL"
-
-#. TRANS: Field title on page for remote subscribe.
-msgid "URL of your profile on another compatible microblogging service."
-msgstr "다른 호환 마��로블로깅 서비스� �기 프로필 URL."
-
-#. TRANS: Button text on page for remote subscribe.
-#. TRANS: Link text for link that will subscribe to a remote profile.
-#. TRANS: Button text to subscribe to a user.
-#. TRANS: Button text for subscribing to a list.
-msgctxt "BUTTON"
-msgid "Subscribe"
-msgstr "구�"
-
-#. TRANS: Form validation error on page for remote subscribe when an invalid profile URL was provided.
-msgid "Invalid profile URL (bad format)."
-msgstr "잘못� 프로필 URL (형�� 잘못�)."
-
-#. TRANS: Form validation error on page for remote subscribe when no the provided profile URL
-#. TRANS: does not contain expected data.
-msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
-msgstr ""
-"올바른 프로필 URL� 아닙니다. (YADIS 문서가 없거나 잘못� XRDS가 정��었습니"
-"다.)"
-
-#. TRANS: Form validation error on page for remote subscribe.
-msgid "That is a local profile! Login to subscribe."
-msgstr "로컬 프로파�입니다! 구�하려면 로그�하십시오."
-
-#. TRANS: Form validation error on page for remote subscribe when the remote service is not providing a request token.
-msgid "Could not get a request token."
-msgstr "요청 토�� 얻� 수 없습니다."
-
-#. TRANS: Client error displayed when trying to (un)list an OMB 0.1 remote profile.
-msgid "You cannot (un)list an OMB 0.1 remote profile with this action."
-msgstr ""
-"� �작으로 OMB 0.1 �격 프로필� 리스트� 넣� 수 (�는 뺼 수) 없습니다."
-
 #. TRANS: Client error displayed when an unknown error occurs while delisting a user.
 #. TRANS: %s is a username.
 #, fuzzy, php-format
@@ -4931,6 +4646,12 @@ msgstr "%s� 답신"
 msgid "Replies to %1$s, page %2$d"
 msgstr "%1$s� 답신, %2$d 페�지"
 
+#. TRANS: Link for feed with replies for a user.
+#. TRANS: %s is a user nickname.
+#, fuzzy, php-format
+msgid "Replies feed for %s (Activity Streams JSON)"
+msgstr "%s� 답신 피드 (Atom)"
+
 #. TRANS: Link for feed with replies for a user.
 #. TRANS: %s is a user nickname.
 #, php-format
@@ -5047,8 +4768,9 @@ msgid "Feed will be restored. Please wait a few minutes for results."
 msgstr "피드를 복구했습니다. 결과가 나올 때까지 몇 분 기다리십시오."
 
 #. TRANS: Form instructions for feed restore.
+#, fuzzy
 msgid ""
-"You can upload a backed-up stream in <a href=\"http://activitystrea.ms/"
+"You can upload a backed-up timeline in <a href=\"http://activitystrea.ms/"
 "\">Activity Streams</a> format."
 msgstr ""
 "백업한 스트림� <a href=\"http://activitystrea.ms/\">Activity Streams</a> 형"
@@ -5163,6 +4885,28 @@ msgstr "키 & 비밀값 초기화"
 msgid "Application info"
 msgstr "�용 프로그램 정보"
 
+#. TRANS: Field label on application page.
+msgid "Consumer key"
+msgstr ""
+
+#. TRANS: Field label on application page.
+msgid "Consumer secret"
+msgstr ""
+
+#. TRANS: Field label on application page.
+#, fuzzy
+msgid "Request token URL"
+msgstr "요청 토�� 잘못�었습니다."
+
+#. TRANS: Field label on application page.
+#, fuzzy
+msgid "Access token URL"
+msgstr "접근 토�� 잘못�었습니다."
+
+#. TRANS: Field label on application page.
+msgid "Authorize URL"
+msgstr "소스 URL"
+
 #. TRANS: Note on the OAuth application page about signature support.
 msgid ""
 "Note: HMAC-SHA1 signatures are supported. The plaintext signature method is "
@@ -5185,6 +4929,11 @@ msgstr "%1$s 님� 좋아하는 글, %2$d 페�지"
 msgid "Could not retrieve favorite notices."
 msgstr "좋아하는 글� 가져올 수 없습니다."
 
+#. TRANS: Feed link text. %s is a username.
+#, fuzzy, php-format
+msgid "Feed for favorites of %s (Activity Streams JSON)"
+msgstr "%s� 좋아하는 글 피드 (Atom)"
+
 #. TRANS: Feed link text. %s is a username.
 #, php-format
 msgid "Feed for favorites of %s (RSS 1.0)"
@@ -5244,6 +4993,11 @@ msgstr "%s 그룹"
 msgid "%1$s group, page %2$d"
 msgstr "%1$s 그룹, %2$d 페�지"
 
+#. TRANS: Tooltip for feed link. %s is a group nickname.
+#, fuzzy, php-format
+msgid "Notice feed for %s group (Activity Streams JSON)"
+msgstr "%s 그룹� 글 피드 (Atom)"
+
 #. TRANS: Tooltip for feed link. %s is a group nickname.
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
@@ -5264,42 +5018,8 @@ msgstr "%s 그룹� 글 피드 (Atom)"
 msgid "FOAF for %s group"
 msgstr "%s 그룹� FOAF"
 
-#. TRANS: Header for mini list of group members on a group page (h2).
-msgid "Members"
-msgstr "회�"
-
-#. TRANS: Description for mini list of group members on a group page when the group has no members.
-#. TRANS: Content of "Listed" page if there are no listed users.
-#. TRANS: Content of "People following tag x" if there are no subscribed users.
-#. TRANS: Empty list message for tags.
-#. TRANS: Text for user subscription statistics if the user has no subscriptions.
-#. TRANS: Text for user subscriber statistics if user has no subscribers.
-#. TRANS: Text for user user group membership statistics if user is not a member of any group.
-#. TRANS: Default content for section/sidebar widget.
-msgid "(None)"
-msgstr "(없�)"
-
-#. TRANS: Link to all group members from mini list of group members if group has more than n members.
-msgid "All members"
-msgstr "모든 회�"
-
-#. TRANS: Header for group statistics on a group page (h2).
-#. TRANS: H2 text for user statistics.
-msgid "Statistics"
-msgstr "통계"
-
-#. TRANS: Label for group creation date.
-msgctxt "LABEL"
-msgid "Created"
-msgstr "만듦"
-
-#. TRANS: Label for member count in statistics on group page.
-msgctxt "LABEL"
-msgid "Members"
-msgstr "회�"
-
 #. TRANS: Notice on group pages for anonymous users for StatusNet sites that accept new registrations.
-#. TRANS: **%s** is the group alias, %%%%site.name%%%% is the site name,
+#. TRANS: %s is the group name, %%%%site.name%%%% is the site name,
 #. TRANS: %%%%action.register%%%% is the URL for registration, %%%%doc.help%%%% is a URL to help.
 #. TRANS: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
 #, php-format
@@ -5317,25 +5037,20 @@ msgstr ""
 "help%%%%))"
 
 #. TRANS: Notice on group pages for anonymous users for StatusNet sites that accept no new registrations.
-#. TRANS: **%s** is the group alias, %%%%site.name%%%% is the site name,
+#. TRANS: %s is the group name, %%%%site.name%%%% is the site name,
 #. TRANS: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
-#, php-format
+#, fuzzy, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
 "wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
 "[StatusNet](http://status.net/) tool. Its members share short messages about "
-"their life and interests. "
+"their life and interests."
 msgstr ""
 "**%s** 그룹� %%%%site.name%%%% 사�트� 사용� 그룹입니다. � 사�트는 �유"
 "소프트웨어 [StatusNet](http://status.net/) 소프트웨어를 사용하는 [마��로블"
 "로깅)(http://en.wikipedia.org/wiki/Micro-blogging) 서비스입니다. 그룹 회�들"
 "� ��과 관심사� 대해 글� 공유합니다."
 
-#. TRANS: Title for list of group administrators on a group page.
-msgctxt "TITLE"
-msgid "Admins"
-msgstr "관리�"
-
 #. TRANS: Client error displayed requesting a single message that does not exist.
 msgid "No such message."
 msgstr "그런 메시지가 없습니다."
@@ -5429,9 +5144,21 @@ msgstr ""
 "[계정� 등�해](%%action.register%%) � 타임�� 팔로우를 시작해 보세요!"
 
 #. TRANS: Header on show list page.
+#. TRANS: Link description for link to list of users tagged with a tag (so part of a list).
 msgid "Listed"
 msgstr "리스트 �함"
 
+#. TRANS: Content of "Listed" page if there are no listed users.
+#. TRANS: Content of "People following tag x" if there are no subscribed users.
+#. TRANS: Description for mini list of group members on a group page when the group has no members.
+#. TRANS: Empty list message for tags.
+#. TRANS: Text for user subscription statistics if the user has no subscriptions.
+#. TRANS: Text for user subscriber statistics if user has no subscribers.
+#. TRANS: Text for user user group membership statistics if user is not a member of any group.
+#. TRANS: Default content for section/sidebar widget.
+msgid "(None)"
+msgstr "(없�)"
+
 #. TRANS: Link for more "People in list x by a user"
 #. TRANS: if there are more than the mini list's maximum.
 msgid "Show all"
@@ -5442,24 +5169,19 @@ msgstr "모� 보기"
 msgid "Subscribers"
 msgstr "구��"
 
-#. TRANS: Link for more "People following tag x"
-#. TRANS: if there are more than the mini list's maximum.
-msgid "All subscribers"
-msgstr "모든 구��"
-
-#. TRANS: Page title showing tagged notices in one user's stream.
+#. TRANS: Page title showing tagged notices in one user's timeline.
 #. TRANS: %1$s is the username, %2$s is the hash tag.
 #, php-format
 msgid "Notices by %1$s tagged %2$s"
 msgstr "%2$s 태그가 붙� %1$s� 글"
 
-#. TRANS: Page title showing tagged notices in one user's stream.
+#. TRANS: Page title showing tagged notices in one user's timeline.
 #. TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number.
 #, php-format
 msgid "Notices by %1$s tagged %2$s, page %3$d"
 msgstr "%2$s 태그가 붙� %1$s� 글, %3$d 페�지"
 
-#. TRANS: Extended page title showing tagged notices in one user's stream.
+#. TRANS: Extended page title showing tagged notices in one user's timeline.
 #. TRANS: %1$s is the username, %2$d is the page number.
 #, php-format
 msgid "Notices by %1$s, page %2$d"
@@ -5471,6 +5193,12 @@ msgstr "%1$s� 글, %2$d 페�지"
 msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
 msgstr "%2$s 태그가 붙� %1$s� 글 피드 (RSS 1.0)"
 
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#, fuzzy, php-format
+msgid "Notice feed for %s (Activity Streams JSON)"
+msgstr "%s� 글 피드 (Atom)"
+
 #. TRANS: Title for link to notice feed.
 #. TRANS: %s is a user nickname.
 #, php-format
@@ -5495,7 +5223,7 @@ msgstr "%s� 글 피드 (Atom)"
 msgid "FOAF for %s"
 msgstr "%s� FOAF"
 
-#. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
+#. TRANS: First sentence of empty list message for a timeline. $1%s is a user nickname.
 #, php-format
 msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
 msgstr "%1$s� 타임���지만, 아� %1$s님� 글� 작성하지 않았습니다."
@@ -5507,7 +5235,7 @@ msgid ""
 msgstr ""
 "최근� 재미있는 �� 있었나요? 아� 올린 글� 없는�, 지금 시작해 보세요. :)"
 
-#. TRANS: Second sentence of empty  list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
+#. TRANS: Second sentence of empty  list message for a non-self timeline. %1$s is a user nickname, %2$s is a part of a URL.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
 #, php-format
 msgid ""
@@ -5517,7 +5245,7 @@ msgstr ""
 "%1$s님� 찔러 보거나 [글� � 볼 수 있습니다](%%%%action.newnotice%%%%?"
 "status_textarea=%2$s)."
 
-#. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
+#. TRANS: Announcement for anonymous users showing a timeline if site registrations are open.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
 #, php-format
 msgid ""
@@ -5534,13 +5262,13 @@ msgstr ""
 "[지금 가입해](%%%%action.register%%%%) to **%s**님 � 다른 많� 사람들� 글"
 "� 팔로우하세요! ([�세히 보기](%%%%doc.help%%%%))"
 
-#. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
+#. TRANS: Announcement for anonymous users showing a timeline if site registrations are closed or invite only.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#, php-format
+#, fuzzy, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
 "wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
-"[StatusNet](http://status.net/) tool. "
+"[StatusNet](http://status.net/) tool."
 msgstr ""
 "**%s**님� %%site.name%% 사�트� 계정� 있습니다. � 사�트는 �유소프트웨"
 "어 [StatusNet](http://status.net/) 소프트웨어를 사용하는 [마��로 블로깅]"
@@ -5577,6 +5305,14 @@ msgstr "사�트 �름� 길�가 0보다 커야 합니다."
 msgid "You must have a valid contact email address."
 msgstr "올바른 연�처 메� 주소가 필요합니다."
 
+#. TRANS: Client error displayed when a logo URL is not valid.
+msgid "Invalid logo URL."
+msgstr "로고 URL� 잘못�었습니다."
+
+#. TRANS: Client error displayed when a SSL logo URL is invalid.
+msgid "Invalid SSL logo URL."
+msgstr "SSL 로고 URL� 잘못�었습니다."
+
 #. TRANS: Client error displayed trying to save site settings with an invalid language code.
 #. TRANS: %s is the invalid language code.
 #, php-format
@@ -5647,7 +5383,9 @@ msgid "Default language"
 msgstr "기본 언어"
 
 #. TRANS: Dropdown title on site settings panel.
-msgid "Site language when autodetection from browser settings is not available"
+#, fuzzy
+msgid ""
+"The site language when autodetection from browser settings is not available."
 msgstr "사�트� 언어, 브�우저� �� 언어 설정� 없� 때."
 
 #. TRANS: Fieldset legend on site settings panel.
@@ -5672,8 +5410,21 @@ msgid "How long users must wait (in seconds) to post the same thing again."
 msgstr ""
 "같� 내용� 글� 다시 올릴 수 있� 때까지 기다려야 하는 시간. (초 단위)"
 
+#. TRANS: Fieldset legend for form to change logo.
+msgid "Logo"
+msgstr "로고"
+
+#. TRANS: Field label for StatusNet site logo.
+msgid "Site logo"
+msgstr "사�트 로고"
+
+#. TRANS: Field label for SSL StatusNet site logo.
+msgid "SSL logo"
+msgstr "SSL 로고"
+
 #. TRANS: Button title for saving site settings.
-msgid "Save site settings"
+#, fuzzy
+msgid "Save the site settings."
 msgstr "사�트 설정 저장"
 
 #. TRANS: Page title for site-wide notice tab in admin panel.
@@ -5700,7 +5451,7 @@ msgstr "사�트 공지 사항 글"
 msgid "Site-wide notice text (255 characters maximum; HTML allowed)"
 msgstr "사�트 전체 공지 사항 글 (최대 255글�, HTML 허용)"
 
-#. TRANS: Title for button to save site notice in admin panel.
+#. TRANS: Button title to save site notice in admin panel.
 msgid "Save site notice."
 msgstr "사�트 공지 사항 저장."
 
@@ -5892,7 +5643,7 @@ msgstr "ë³´ê³  URL"
 msgid "Snapshots will be sent to this URL."
 msgstr "스냅샷� � URL로 보냅니다."
 
-#. TRANS: Title for button to save snapshot settings.
+#. TRANS: Button title to save snapshot settings.
 msgid "Save snapshot settings."
 msgstr "스냅샷 설정 저장."
 
@@ -5925,10 +5676,6 @@ msgstr "허�� 기다리는 구�� %1$s명, %2$d 페�지"
 msgid "A list of users awaiting approval to subscribe to you."
 msgstr "구� 허�� 기다리는 사용� 목�."
 
-#. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
-msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
-msgstr "� �작으로 OMB 0.1 �격 프로필� 구�할 수 없습니다."
-
 #. TRANS: Page title when subscription succeeded.
 msgid "Subscribed"
 msgstr "구�했습니다"
@@ -6024,13 +5771,12 @@ msgstr "다�� %s님� 받고 있는 글� 쓰는 사람입니다."
 #. TRANS: This message contains Markdown URLs. The link description is between
 #. TRANS: square brackets, and the link between parentheses. Do not separate "]("
 #. TRANS: and do not change the URL part.
-#, php-format
+#, fuzzy, php-format
 msgid ""
 "You're not listening to anyone's notices right now, try subscribing to "
 "people you know. Try [people search](%%action.peoplesearch%%), look for "
 "members in groups you're interested in and in our [featured users](%%action."
-"featured%%). If you're a [Twitter user](%%action.twittersettings%%), you can "
-"automatically subscribe to people you already follow there."
+"featured%%)."
 msgstr ""
 "어� 누구� 글� 받지 않고 있고, 다른 사람� 구�하지� 않았습니다. [사람 검"
 "색](%%action.peoplesearch%%)� 사용해 관심 있는 그룹� 회�� 찾아 보시고, "
@@ -6066,6 +5812,12 @@ msgstr "SMS"
 msgid "Notices tagged with %1$s, page %2$d"
 msgstr "%1$s 태그가 붙� 글, %2$d 페�지"
 
+#. TRANS: Link label for feed on "notices with tag" page.
+#. TRANS: %s is the tag the feed is for.
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (Activity Streams JSON)"
+msgstr "%s 태그가 있는 글 피드 (Atom)"
+
 #. TRANS: Link label for feed on "notices with tag" page.
 #. TRANS: %s is the tag the feed is for.
 #, php-format
@@ -6167,18 +5919,6 @@ msgstr "구� 취소�었습니다."
 msgid "%1$s unsubscribed from list %2$s by %3$s"
 msgstr "%1$s님� %3$s님� 만든 %2$s 리스트�서 구� 해제했습니다."
 
-#. TRANS: Client error displayed when trying to update profile with an incompatible license.
-#. TRANS: %1$s is the license incompatible with site license %2$s.
-#. TRANS: Exception thrown when licenses are not compatible for an authorisation request.
-#. TRANS: %1$s is the license for the listenee, %2$s is the license for "this" StatusNet site.
-#, php-format
-msgid ""
-"Listenee stream license \"%1$s\" is not compatible with site license \"%2$s"
-"\"."
-msgstr ""
-"받는 스트림 ��선스 \"%1$s\"�(는) 사�트 ��선스� \"%2$s\"과(와) 호환�"
-"지 않습니다."
-
 #. TRANS: Title of URL settings tab in profile settings.
 msgid "URL settings"
 msgstr "URL 설정"
@@ -6310,150 +6050,10 @@ msgstr "초대를 사용합니다"
 msgid "Whether to allow users to invite new users."
 msgstr "사용�가 새 사용�를 초대하�� 허용할지 여부."
 
-#. TRANS: Title for button to save user settings in user admin panel.
+#. TRANS: Button title to save user settings in user admin panel.
 msgid "Save user settings."
 msgstr "사용� 설정 저장."
 
-#. TRANS: Page title.
-msgid "Authorize subscription"
-msgstr "구� 허가"
-
-#. TRANS: Page notice on "Authorize subscription" page.
-msgid ""
-"Please check these details to make sure that you want to subscribe to this "
-"user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
-"click \"Reject\"."
-msgstr ""
-"�세한 정보를 보고 � 사용�� 글� 구�할지 확�하십시오. 글� 구�하지 않으"
-"려면 \"거절\"� 누르십시오."
-
-#. TRANS: Button text on Authorise Subscription page.
-#. TRANS: Submit button text to accept a group membership request on approve group form.
-#. TRANS: Submit button text to accept a subscription request on approve sub form.
-msgctxt "BUTTON"
-msgid "Accept"
-msgstr "수�"
-
-#. TRANS: Title for button on Authorise Subscription page.
-#. TRANS: Button title to subscribe to a user.
-msgid "Subscribe to this user."
-msgstr "� 사용� 구�."
-
-#. TRANS: Button text on Authorise Subscription page.
-#. TRANS: Submit button text to reject a group membership request on approve group form.
-#. TRANS: Submit button text to reject a subscription request on approve sub form.
-msgctxt "BUTTON"
-msgid "Reject"
-msgstr "ê±°ì ˆ"
-
-#. TRANS: Title for button on Authorise Subscription page.
-msgid "Reject this subscription."
-msgstr "� 구�� 거절."
-
-#. TRANS: Client error displayed for an empty authorisation request.
-msgid "No authorization request!"
-msgstr "�� 요청� 없습니다!"
-
-#. TRANS: Accept message header from Authorise subscription page.
-msgid "Subscription authorized"
-msgstr "구� 허��었습니다"
-
-#. TRANS: Accept message text from Authorise subscription page.
-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� 통과�지 않았습니다. 사�트 안내를 따� � 구"
-"�� 승�하는 방법� 보십시오. 구� 토�� 다�과 같습니다 :"
-
-#. TRANS: Reject message header from Authorise subscription page.
-msgid "Subscription rejected"
-msgstr "구� 거절�었습니다"
-
-#. TRANS: Reject message from Authorise subscription page.
-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� 통과 �지 않았습니다. 사�트� 안내� 따� 구"
-"�� 완전히 거절하는 방법� 보십시오."
-
-#. TRANS: Exception thrown when no valid user is found for an authorisation request.
-#. TRANS: %s is a listener URI.
-#, php-format
-msgid "Listener URI \"%s\" not found here."
-msgstr "리스너 URI \"%s\"�(가) 여기 없습니다."
-
-#. TRANS: Exception thrown when listenee URI is too long for an authorisation request.
-#. TRANS: %s is a listenee URI.
-#, php-format
-msgid "Listenee URI \"%s\" is too long."
-msgstr "리스너 URI \"%s\"�(가) 너무 �니다."
-
-#. TRANS: Exception thrown when listenee URI is a local user for an authorisation request.
-#. TRANS: %s is a listenee URI.
-#, php-format
-msgid "Listenee URI \"%s\" is a local user."
-msgstr "리스너 URI \"%s\"�(가) 로컬 사용�입니다."
-
-#. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
-#. TRANS: %s is a profile URL.
-#, php-format
-msgid "Profile URL \"%s\" is for a local user."
-msgstr "프로필 URI \"%s\"�(가) 로컬 사용�용입니다."
-
-#. TRANS: Exception thrown when avatar URL is invalid for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#, php-format
-msgid "Avatar URL \"%s\" is not valid."
-msgstr "아바타 URL \"%s\"�(가) 올바르지 않습니다."
-
-#. TRANS: Exception thrown when avatar URL could not be read for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#, php-format
-msgid "Cannot read avatar URL \"%s\"."
-msgstr "아바타 URL \"%s\"�(를) �� 수 없습니다."
-
-#. TRANS: Exception thrown when avatar URL return an invalid image type for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#, php-format
-msgid "Wrong image type for avatar URL \"%s\"."
-msgstr "아바타 URL \"%s\"� �미지 종류가 잘못�었습니다."
-
-#. TRANS: Title for profile design page.
-#. TRANS: Page title for profile design page.
-msgid "Profile design"
-msgstr "프로필 디��"
-
-#. TRANS: Instructions for Profile design page.
-#. TRANS: Instructions for profile design page.
-msgid ""
-"Customize the way your profile looks with a background image and a colour "
-"palette of your choice."
-msgstr "배경 �미지와 색 팔레트를 선�해서 프로필� 모양� 설정합니다."
-
-#. TRANS: Succes message on Profile design page when finding an easter egg.
-msgid "Enjoy your hotdog!"
-msgstr "핫�그 맛있게 드세요!"
-
-#. TRANS: Form legend on Profile design page.
-msgid "Design settings"
-msgstr "디�� 설정"
-
-#. TRANS: Checkbox label on Profile design page.
-msgid "View profile designs"
-msgstr "프로필 디�� 보기"
-
-#. TRANS: Title for checkbox on Profile design page.
-msgid "Show or hide profile designs."
-msgstr "프로필 디�� 보�거나 �춥니다."
-
-#. TRANS: Form legend on Profile design page for form to choose a background image.
-msgid "Background file"
-msgstr "배경 파�"
-
 #. TRANS: Page title for all but the first page of groups for a user.
 #. TRANS: %1$s is a nickname, %2$d is a page number.
 #, php-format
@@ -6492,9 +6092,9 @@ msgstr "StatusNet %s"
 
 #. TRANS: Content part of StatusNet version page.
 #. TRANS: %1$s is the engine name (StatusNet) and %2$s is the StatusNet version.
-#, php-format
+#, fuzzy, php-format
 msgid ""
-"This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, "
+"This site is powered by %1$s version %2$s, Copyright 2008-2011 StatusNet, "
 "Inc. and contributors."
 msgstr ""
 "� 사�트는 %1$s %2$s 버전으로 운��니다. Copyright 2008-2010 StatusNet, "
@@ -6509,22 +6109,24 @@ msgid "License"
 msgstr "��선스"
 
 #. TRANS: Content part of StatusNet version page.
+#, fuzzy
 msgid ""
 "StatusNet is free software: you can redistribute it and/or modify it under "
 "the terms of the GNU Affero General Public License as published by the Free "
 "Software Foundation, either version 3 of the License, or (at your option) "
-"any later version. "
+"any later version."
 msgstr ""
 "� 프로그램� �유 소프트웨어입니다. 소프트웨어� 피양��는 �유 소프트웨어 "
 "재단� 공표한 GNU Affero �반 공중 사용 허가서 3� �는 그 �후 �� 임�로 "
 "선�해서, 그 규정� 따� 프로그램� 개작하거나 재배�할 수 있습니다."
 
 #. TRANS: Content part of StatusNet version page.
+#, fuzzy
 msgid ""
 "This program is distributed in the hope that it will be useful, but WITHOUT "
 "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
 "FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License "
-"for more details. "
+"for more details."
 msgstr ""
 "� 프로그램� 유용하게 사용� 수 있으리�는 ���서 배��고 있지만, 특정한 "
 "목�� 맞는 �합성 여부나 �매용으로 사용할 수 있으리�는 묵시�� 보�� �"
@@ -6584,16 +6186,25 @@ msgstr "'%s' URL� 처리할 수 없습니다"
 msgid "Robin thinks something is impossible."
 msgstr "로빈� 뭔가 불가능하다 ��합니다."
 
+#. TRANS: Message used to be inserted as %2$s in  the text "No file may
+#. TRANS: be larger than %1$d byte and the file you sent was %2$s.".
+#. TRANS: %1$d is the number of bytes of an uploaded file.
+#, php-format
+msgid "%1$d byte"
+msgid_plural "%1$d bytes"
+msgstr[0] ""
+
 #. TRANS: Message given if an upload is larger than the configured maximum.
-#. TRANS: %1$d is the byte limit for uploads, %2$d is the byte count for the uploaded file.
-#. TRANS: %1$s is used for plural.
+#. TRANS: %1$d (used for plural) is the byte limit for uploads,
+#. TRANS: %2$s is the proper form of "n bytes". This is the only ways to have
+#. TRANS: gettext support multiple plurals in the same message, unfortunately...
 #, php-format
 msgid ""
-"No file may be larger than %1$d byte and the file you sent was %2$d bytes. "
-"Try to upload a smaller version."
+"No file may be larger than %1$d byte and the file you sent was %2$s. Try to "
+"upload a smaller version."
 msgid_plural ""
-"No file may be larger than %1$d bytes and the file you sent was %2$d bytes. "
-"Try to upload a smaller version."
+"No file may be larger than %1$d bytes and the file you sent was %2$s. Try to "
+"upload a smaller version."
 msgstr[0] ""
 
 #. TRANS: Message given if an upload would exceed user quota.
@@ -6658,6 +6269,11 @@ msgstr "로컬 그룹� 업��트 할 수 없습니다."
 msgid "Could not create login token for %s"
 msgstr "%s � 대한 로그� 토�� 만들 수 없습니다."
 
+#. TRANS: Exception thrown when a program code class (%s) cannot be instantiated.
+#, fuzzy, php-format
+msgid "Cannot instantiate class %s."
+msgstr "새 비밀번호를 저장할 수 없습니다."
+
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.
 msgid "No database name or DSN found anywhere."
 msgstr "��터베�스 �름�나 DSN� 어디�� 없습니다."
@@ -6812,10 +6428,10 @@ msgstr ""
 "하거나 태그를 지우고 새로 만들어 보십시오."
 
 #. TRANS: Client exception thrown when trying to add more people than allowed to a list.
-#, php-format
+#, fuzzy, php-format
 msgid ""
 "You already have %1$d or more people in list %2$s, which is the maximum "
-"allowed number.Try unlisting others first."
+"allowed number. Try unlisting others first."
 msgstr ""
 "�미 %2$s 리스트� 들어 있는 사람� %1$d명 �� 있습니다. 최대값입니다.  먼"
 "저 다른 사람들� 리스트�서 제거해 보십시오."
@@ -6837,7 +6453,6 @@ msgid "Unable to save tag."
 msgstr "태그를 저장할 수 없습니다."
 
 #. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
-#. TRANS: Error message displayed to a banned user when they try to subscribe.
 msgid "You have been banned from subscribing."
 msgstr "구�� 금지�었습니다."
 
@@ -6857,10 +6472,6 @@ msgstr "구�하고 있지 않습니다!"
 msgid "Could not delete self-subscription."
 msgstr "�기 �신� 대한 구�� 삭제할 수 없습니다."
 
-#. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
-msgid "Could not delete subscription OMB token."
-msgstr "구� OMB 토�� 삭제할 수 없습니다."
-
 #. TRANS: Exception thrown when a subscription could not be deleted on the server.
 msgid "Could not delete subscription."
 msgstr "구�� 삭제할 수 없습니다."
@@ -6894,6 +6505,18 @@ msgstr "단� 사용� 모드�서 사용�를 정�하지 않았습니다.
 msgid "Single-user mode code called when not enabled."
 msgstr "단� 사용� 모드를 사용하지 않지만 코드를 호출했습니다."
 
+#. TRANS: Information on password recovery form if no known username or e-mail address was specified.
+msgid "No user with that email address or username."
+msgstr "그러한 메� 주소나 �름� 사용�가 없습니다."
+
+#. TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.
+msgid "No registered email address for that user."
+msgstr "그 사용�는 등�한 메� 주소가 없습니다."
+
+#. TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.
+msgid "Error saving address confirmation."
+msgstr "주소 확� 저장 오류."
+
 #. TRANS: Server exception thrown when creating a group failed.
 msgid "Could not create group."
 msgstr "그룹� 만들 수 없습니다."
@@ -7159,25 +6782,11 @@ msgstr "showForm()� 구현�지 않았습니다."
 msgid "saveSettings() not implemented."
 msgstr "saveSettings()� 구현�지 않았습니다."
 
-#. TRANS: Client error message thrown if design settings could not be deleted in
-#. TRANS: the admin panel Design.
-msgid "Unable to delete design setting."
-msgstr "디�� 설정� 삭제할 수 없습니다."
-
 #. TRANS: Header in administrator navigation panel.
-#. TRANS: Header in settings navigation panel.
 msgctxt "HEADER"
 msgid "Home"
 msgstr "대문"
 
-#. TRANS: Menu item in administrator navigation panel.
-#. TRANS: Menu item in default local navigation panel.
-#. TRANS: Menu item in personal group navigation menu.
-#. TRANS: Menu item in settings navigation panel.
-msgctxt "MENU"
-msgid "Home"
-msgstr "대문"
-
 #. TRANS: Header in administrator navigation panel.
 msgctxt "HEADER"
 msgid "Admin"
@@ -7192,17 +6801,6 @@ msgctxt "MENU"
 msgid "Site"
 msgstr "사�트"
 
-#. TRANS: Menu item title in administrator navigation panel.
-msgid "Design configuration"
-msgstr "디�� 설정"
-
-#. TRANS: Menu item in administrator navigation panel.
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: Menu item in settings navigation panel.
-msgctxt "MENU"
-msgid "Design"
-msgstr "디��"
-
 #. TRANS: Menu item title in administrator navigation panel.
 msgid "User configuration"
 msgstr "사용� 설정"
@@ -7300,39 +6898,6 @@ msgstr "그 토�� 대한 사용�가 없습니다."
 msgid "Could not authenticate you."
 msgstr "��할 수 없습니다."
 
-#. TRANS: Server error displayed when trying to create an anynymous OAuth consumer.
-msgid "Could not create anonymous consumer."
-msgstr "�명 컨수머를 만들 수 없습니다."
-
-#. TRANS: Server error displayed when trying to create an anynymous OAuth application.
-msgid "Could not create anonymous OAuth application."
-msgstr "�명 OAuth �용 프로그램� 만들 수 없습니다."
-
-#. TRANS: Exception thrown when no token association could be found.
-msgid ""
-"Could not find a profile and application associated with the request token."
-msgstr "요청 토�과 관련� 프로필과 �용 프로그램� 찾� 수 없습니다."
-
-#. TRANS: Exception thrown when no access token can be issued.
-msgid "Could not issue access token."
-msgstr "접근 토�� 발급할 수 없습니다."
-
-#. TRANS: Exception thrown when a database error occurs.
-msgid "Database error inserting OAuth application user."
-msgstr "OAuth 프로그램 사용�를 넣는� ��터베�스 오류."
-
-#. TRANS: Exception thrown when a database error occurs.
-msgid "Database error updating OAuth application user."
-msgstr "OAuth 프로그램 사용�를 업��트하는� ��터베�스 오류."
-
-#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
-msgid "Tried to revoke unknown token."
-msgstr "알 수 없는 토�� 철회 시�했습니다."
-
-#. TRANS: Exception thrown when an attempt is made to remove a revoked token.
-msgid "Failed to delete revoked token."
-msgstr "철회� 토�� 삭제� 실패했습니다."
-
 #. TRANS: Form input field label for application icon.
 msgid "Icon"
 msgstr "아�콘"
@@ -7412,13 +6977,14 @@ msgid "Default access for this application: read-only, or read-write"
 msgstr "� 프로그램� 기본 접근 권한: �기 전용, �는 �기/쓰기"
 
 #. TRANS: Submit button title.
-msgid "Cancel"
-msgstr "취소"
+#, fuzzy
+msgid "Cancel application changes."
+msgstr "연결한 �용 프로그램"
 
 #. TRANS: Submit button title.
-#. TRANS: Button text to save a list.
-msgid "Save"
-msgstr "저장"
+#, fuzzy
+msgid "Save application changes."
+msgstr "새 �용 프로그램"
 
 #. TRANS: Name for an anonymous application in application list.
 msgid "Unknown application"
@@ -7453,6 +7019,18 @@ msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "철회"
 
+#. TRANS: Submit button text to accept a group membership request on approve group form.
+#. TRANS: Submit button text to accept a subscription request on approve sub form.
+msgctxt "BUTTON"
+msgid "Accept"
+msgstr "수�"
+
+#. TRANS: Submit button text to reject a group membership request on approve group form.
+#. TRANS: Submit button text to reject a subscription request on approve sub form.
+msgctxt "BUTTON"
+msgid "Reject"
+msgstr "ê±°ì ˆ"
+
 #. TRANS: Atom feed exception thrown when an author element does not contain a name element.
 msgid "Author element must contain a name element."
 msgstr "author 엘리먼트�는 name 엘리먼트가 들어 있어야 합니다."
@@ -7991,6 +7569,11 @@ msgstr "� 문제를 해결하려면 설치 프로그램� 실행해야 할 
 msgid "Go to the installer."
 msgstr "설치 프로그램으로 ��합니다."
 
+#. TRANS: Header on conversation page. Hidden by default (h2).
+#. TRANS: Label for user statistics.
+msgid "Notices"
+msgstr "글"
+
 #. TRANS: Page title for when a database error occurs.
 msgid "Database error"
 msgstr "��터베�스 오류"
@@ -8001,13 +7584,6 @@ msgctxt "MENU"
 msgid "Public"
 msgstr "공개"
 
-#. TRANS: Menu item in default local navigation panel.
-#. TRANS: Menu item in search group navigation panel.
-#. TRANS: Menu item in local navigation menu.
-msgctxt "MENU"
-msgid "Groups"
-msgstr "그룹"
-
 #. TRANS: Menu item in default local navigation panel.
 #. TRANS: Menu item title in local navigation menu.
 msgctxt "MENU"
@@ -8023,49 +7599,12 @@ msgstr "삭제"
 msgid "Delete this user"
 msgstr "� 사용� 삭제"
 
-#. TRANS: Form legend of form for changing the page design.
-msgid "Change design"
-msgstr "디�� 변경"
-
-#. TRANS: Fieldset legend on profile design page to change profile page colours.
-msgid "Change colours"
-msgstr "색 변경"
-
-#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-msgid "Use defaults"
-msgstr "기본값 사용"
-
-#. TRANS: Label in form on profile design page.
-#. TRANS: Field contains file name on user's computer that could be that user's custom profile background image.
-msgid "Upload file"
-msgstr "파� 업로드"
-
-#. TRANS: Instructions for form on profile design page.
-msgid ""
-"You can upload your personal background image. The maximum file size is 2MB."
-msgstr "개� 배경 �미지를 업로드할 수 있습니다. 최대 파� �기는 2MB입니다."
-
-#. TRANS: Radio button on profile design page that will enable use of the uploaded profile image.
-msgctxt "RADIO"
-msgid "On"
-msgstr "켜기"
-
-#. TRANS: Radio button on profile design page that will disable use of the uploaded profile image.
-msgctxt "RADIO"
-msgid "Off"
-msgstr "�기"
-
-#. TRANS: Success message displayed if design settings were saved after clicking "Use defaults".
-msgid "Design defaults restored."
-msgstr "디�� 기본값� 복구했습니다."
-
 #. TRANS: Exception. %s is an ID.
 #, php-format
 msgid "Unable to find services for %s."
 msgstr "%s� 대한 서비스를 찾� 수 없습니다."
 
 #. TRANS: Form legend for removing the favourite status for a favourite notice.
-#. TRANS: Title for button text for removing the favourite status for a favourite notice.
 msgid "Disfavor this notice"
 msgstr "� 글� 좋아하지 않는 것으로 표시합니다"
 
@@ -8074,8 +7613,12 @@ msgctxt "BUTTON"
 msgid "Disfavor favorite"
 msgstr "좋아하는 글 취소"
 
+#. TRANS: Button title for removing the favourite status for a favourite notice.
+#, fuzzy
+msgid "Remove this notice from your list of favorite notices."
+msgstr "좋아하는 글� 가져올 수 없습니다."
+
 #. TRANS: Form legend for adding the favourite status to a notice.
-#. TRANS: Title for button text for adding the favourite status to a notice.
 msgid "Favor this notice"
 msgstr "� 글� 좋아합니다."
 
@@ -8084,6 +7627,11 @@ msgctxt "BUTTON"
 msgid "Favor"
 msgstr "좋아함"
 
+#. TRANS: Button title for adding the favourite status to a notice.
+#, fuzzy
+msgid "Add this notice to your list of favorite notices."
+msgstr "좋아하는 글� 가져올 수 없습니다."
+
 #. TRANS: Feed type name.
 msgid "RSS 1.0"
 msgstr "RSS 1.0"
@@ -8100,6 +7648,10 @@ msgstr "Atom"
 msgid "FOAF"
 msgstr "FOAF"
 
+#. TRANS: Feed type name. See http://activitystrea.ms/
+msgid "Activity Streams"
+msgstr ""
+
 #. TRANS: Client exception thrown when an imported feed does not have an author.
 msgid "No author in the feed."
 msgstr "피드� 글쓴�가 없습니다."
@@ -8131,6 +7683,28 @@ msgstr "작� 리스트�서 태그 고르기"
 msgid "Grant this user the \"%s\" role"
 msgstr "� 사용�� \"%s\" 역할 부여"
 
+#. TRANS: Header for mini list of group members on a group page (h2).
+msgid "Members"
+msgstr "회�"
+
+#. TRANS: Link to all group members from mini list of group members if group has more than n members.
+msgid "All members"
+msgstr "모든 회�"
+
+#. TRANS: Header for mini list of users with a pending membership request on a group page (h2).
+#, fuzzy
+msgid "Pending"
+msgstr "대기 중 (%d)"
+
+#. TRANS: Header for mini list of users that are blocked in a group page (h2).
+msgid "Blocked"
+msgstr "차단"
+
+#. TRANS: Title for list of group administrators on a group page.
+msgctxt "TITLE"
+msgid "Admins"
+msgstr "관리�"
+
 #. TRANS: Button text for the form that will block a user from a group.
 msgctxt "BUTTON"
 msgid "Block"
@@ -8138,8 +7712,8 @@ msgstr "차단"
 
 #. TRANS: Submit button title.
 msgctxt "TOOLTIP"
-msgid "Block this user"
-msgstr "� 사용� 차단"
+msgid "Block this user so that they can no longer post messages to it."
+msgstr ""
 
 #. TRANS: Field title on group edit form.
 msgid "URL of the homepage or blog of the group or topic."
@@ -8186,62 +7760,9 @@ msgctxt "GROUPADMIN"
 msgid "Admin"
 msgstr "관리�"
 
-#. TRANS: Menu item in the group navigation page.
-msgctxt "MENU"
-msgid "Group"
-msgstr "그룹"
-
-#. TRANS: Tooltip for menu item in the group navigation page.
-#. TRANS: %s is the nickname of the group.
-#, php-format
-msgctxt "TOOLTIP"
-msgid "%s group"
-msgstr "%s 그룹"
-
-#. TRANS: Menu item in the group navigation page.
-msgctxt "MENU"
-msgid "Members"
-msgstr "회�"
-
-#. TRANS: Tooltip for menu item in the group navigation page.
-#. TRANS: %s is the nickname of the group.
-#, php-format
-msgctxt "TOOLTIP"
-msgid "%s group members"
-msgstr "%s 그룹 회�"
-
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: %d is the number of pending members.
-#, php-format
-msgctxt "MENU"
-msgid "Pending members (%d)"
-msgid_plural "Pending members (%d)"
-msgstr[0] ""
-
-#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: %s is the nickname of the group.
-#, php-format
-msgctxt "TOOLTIP"
-msgid "%s pending members"
-msgstr "%s 밀린 회�"
-
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-msgctxt "MENU"
-msgid "Blocked"
-msgstr "차단"
-
-#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: %s is the nickname of the group.
-#, php-format
-msgctxt "TOOLTIP"
-msgid "%s blocked users"
-msgstr "%s 차단 사용�"
-
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: Menu item in primary navigation panel.
-msgctxt "MENU"
-msgid "Admin"
-msgstr "관리"
+#. TRANS: Group actions header (h2). Text hidden by default.
+msgid "Group actions"
+msgstr "그룹 �작"
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
@@ -8250,11 +7771,6 @@ msgctxt "TOOLTIP"
 msgid "Edit %s group properties"
 msgstr "%s 그룹 �성 편집"
 
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-msgctxt "MENU"
-msgid "Logo"
-msgstr "로고"
-
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
 #, php-format
@@ -8262,16 +7778,10 @@ msgctxt "TOOLTIP"
 msgid "Add or edit %s logo"
 msgstr "%s 로고 추가 �는 편집"
 
-#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: %s is the nickname of the group.
-#, php-format
-msgctxt "TOOLTIP"
-msgid "Add or edit %s design"
-msgstr "%s 디�� 추가 �는 편집"
-
-#. TRANS: Group actions header (h2). Text hidden by default.
-msgid "Group actions"
-msgstr "그룹 �작"
+#. TRANS: Link text for link on user profile.
+msgctxt "MENU"
+msgid "Logo"
+msgstr "로고"
 
 #. TRANS: Title for groups with the most members section.
 msgid "Popular groups"
@@ -8281,11 +7791,20 @@ msgstr "�기 그룹"
 msgid "Active groups"
 msgstr "활��� 그룹"
 
-#. TRANS: Title for group tag cloud section.
-#. TRANS: %s is a group name.
-#, php-format
-msgid "Tags in %s group's notices"
-msgstr "%s 그룹� 글� 있는 태그"
+#. TRANS: Link description for seeing all groups.
+#. TRANS: Link description for seeing all lists.
+#, fuzzy
+msgid "See all"
+msgstr "모� 보기"
+
+#. TRANS: Link title for seeing all groups.
+msgid "See all groups you belong to."
+msgstr ""
+
+#. TRANS: Menu item title in personal group navigation menu.
+#. TRANS: %s is a username.
+msgid "Back to top"
+msgstr ""
 
 #. TRANS: Client exception 406
 msgid "This page is not available in a media type you accept"
@@ -8371,11 +7890,43 @@ msgctxt "TITLE"
 msgid "Trends"
 msgstr "트렌드"
 
-#. TRANS: Button text for inviting more users to the StatusNet instance.
+#. TRANS: Default button text for inviting more users to the StatusNet instance.
 msgctxt "BUTTON"
 msgid "Invite more colleagues"
 msgstr "친구 초대"
 
+#. TRANS: Form legend.
+#, fuzzy
+msgid "Invite collegues"
+msgstr "친구 초대"
+
+#. TRANS: Field label for a list of e-mail addresses.
+msgid "Email addresses"
+msgstr "메� 주소"
+
+#. TRANS: Field title for a list of e-mail addresses.
+msgid "Addresses of friends to invite (one per line)."
+msgstr "초대할 친구 주소 (한 줄� 하나씩)"
+
+#. TRANS: Field label for a personal message to send to invitees.
+msgid "Personal message"
+msgstr "개� 메시지"
+
+#. TRANS: Field title for a personal message to send to invitees.
+msgid "Optionally add a personal message to the invitation."
+msgstr "초대장� 내 메시지를 첨부합니다."
+
+#. TRANS: Send button for inviting friends
+#. TRANS: Button text for sending notice.
+msgctxt "BUTTON"
+msgid "Send"
+msgstr "보내기"
+
+#. TRANS: Submit button title.
+#, fuzzy
+msgid "Send invitations."
+msgstr "초대"
+
 #. TRANS: Button text for joining a group.
 msgctxt "BUTTON"
 msgid "Join"
@@ -8386,6 +7937,11 @@ msgctxt "BUTTON"
 msgid "Leave"
 msgstr "떠나기"
 
+#. TRANS: Link title for seeing all lists.
+#, fuzzy
+msgid "See all lists you have created."
+msgstr "등�한 �용 프로그램"
+
 #. TRANS: Menu item for logging in to the StatusNet site.
 #. TRANS: Menu item in primary navigation panel.
 msgctxt "MENU"
@@ -8444,9 +8000,9 @@ msgstr ""
 #. TRANS: %1$s is the subscribing user's nickname, %2$s is the StatusNet sitename.
 #. TRANS: Main body of new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscriber's long name, %2$s is the StatusNet sitename.
-#, php-format
-msgid "%1$s is now listening to your notices on %2$s."
-msgstr "%1$s님� %2$s 사�트�서 내 글� 받고 있습니다."
+#, fuzzy, php-format
+msgid "%1$s is now following you on %2$s."
+msgstr "%1$s님� %2$s님� 팔로우합니다."
 
 #. TRANS: Subject of pending new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscribing user's nickname, %2$s is the StatusNet sitename.
@@ -8667,7 +8223,7 @@ msgstr "%1$s (@%2$s) 님� 관심� 가질 만한 글� 보냈습니다."
 #. TRANS: Body of @-reply notification e-mail.
 #. TRANS: %1$s is the sending user's name, $2$s is the StatusNet sitename,
 #. TRANS: %3$s is a URL to the notice, %4$s is the notice text,
-#. TRANS: %5$s is a URL to the full conversion if it exists (otherwise empty),
+#. TRANS: %5$s is the text "The full conversation can be read here:" and a URL to the full conversion if it exists (otherwise empty),
 #. TRANS: %6$s is a URL to reply to the notice, %7$s is a URL to all @-replies for the addressed user,
 #, php-format
 msgid ""
@@ -8709,6 +8265,10 @@ msgstr ""
 
 #. TRANS: Subject of group join notification e-mail.
 #. TRANS: %1$s is the joining user's nickname, %2$s is the group name, and %3$s is the StatusNet sitename.
+#, fuzzy, php-format
+msgid "%1$s has joined your group %2$s on %3$s"
+msgstr "%1$s님� %3$s 사�트� 내 그룹� %2$s 그룹� 가입했습니다."
+
 #. TRANS: Main body of group join notification e-mail.
 #. TRANS: %1$s is the subscriber's long name, %2$s is the group name, and %3$s is the StatusNet sitename,
 #. TRANS: %4$s is a block of profile info about the subscriber.
@@ -8797,8 +8357,9 @@ msgid "Make Admin"
 msgstr "관리� 만들기"
 
 #. TRANS: Submit button title.
+#, fuzzy
 msgctxt "TOOLTIP"
-msgid "Make this user an admin"
+msgid "Make this user an admin."
 msgstr "� 사용�를 관리�로 만들기"
 
 #. TRANS: Client exception thrown when a database error was thrown during a file upload operation.
@@ -8847,7 +8408,7 @@ msgstr "�접 메시지 보내기"
 msgid "Select recipient:"
 msgstr "수신� 선�:"
 
-#. TRANS Entry in drop-down selection box in direct-message inbox/outbox when no one is available to message.
+#. TRANS: Entry in drop-down selection box in direct-message inbox/outbox when no one is available to message.
 msgid "No mutual subscribers."
 msgstr "서로 구�한 사람� 없습니다."
 
@@ -8914,6 +8475,10 @@ msgstr "� 종류� 대�� 처리하는 방법� 알지 못합니다."
 msgid "You must implement either adaptNoticeListItem() or showNotice()."
 msgstr "adaptNoticeListItem() �는 showNotice() 구현� 필요합니다."
 
+#. TRANS: Link description to show more items in a list.
+msgid "More â–¼"
+msgstr ""
+
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 msgid "Nickname cannot be empty."
 msgstr "�름� 비어 있으면 안 �니다."
@@ -8962,10 +8527,6 @@ msgctxt "SEPARATOR"
 msgid ", "
 msgstr ", "
 
-#. TRANS: Start of profile addressees list.
-msgid " â–¸ "
-msgstr " â–¸ "
-
 #. TRANS: Used in coordinates as abbreviation of north.
 msgid "N"
 msgstr "�"
@@ -9004,7 +8565,8 @@ msgid "Repeated by"
 msgstr "반복한 사람"
 
 #. TRANS: Link title in notice list item to reply to a notice.
-msgid "Reply to this notice"
+#, fuzzy
+msgid "Reply to this notice."
 msgstr "� 글� 답장"
 
 #. TRANS: Link text in notice list item to reply to a notice.
@@ -9012,7 +8574,8 @@ msgid "Reply"
 msgstr "답장"
 
 #. TRANS: Link title in notice list item to delete a notice.
-msgid "Delete this notice"
+#, fuzzy
+msgid "Delete this notice from the timeline."
 msgstr "� 글 삭제"
 
 #. TRANS: Title for repeat form status in notice list when a notice has been repeated.
@@ -9036,26 +8599,6 @@ msgstr "찔러 보기"
 msgid "Send a nudge to this user."
 msgstr "� 사용��게 찔러 보기 보내기"
 
-#. TRANS: Exception thrown when creating a new profile fails in OAuth store.
-msgid "Error inserting new profile."
-msgstr "새 프로필� 만드는� 오류."
-
-#. TRANS: Exception thrown when creating a new avatar fails in OAuth store.
-msgid "Error inserting avatar."
-msgstr "아바타를 새로 만드는� 오류."
-
-#. TRANS: Exception thrown when creating a remote profile fails in OAuth store.
-msgid "Error inserting remote profile."
-msgstr "�격 프로필� 새로 만드는� 오류."
-
-#. TRANS: Exception thrown when a notice is denied because it has been sent before.
-msgid "Duplicate notice."
-msgstr "��한 글."
-
-#. TRANS: Exception thrown when creating a new subscription fails in OAuth store.
-msgid "Could not insert new subscription."
-msgstr "새 구�� 새로 만들 수 없습니다."
-
 #. TRANS: Server exception thrown in oEmbed action if no API endpoint is available.
 msgid "No oEmbed API endpoint available."
 msgstr "oEmbed API 엔드��트가 없습니다."
@@ -9132,10 +8675,6 @@ msgstr "편집"
 msgid "Edit %s list by you."
 msgstr "나� %s 리스트 편집."
 
-#. TRANS: Link description for link to list of users tagged with a tag.
-msgid "Tagged"
-msgstr "태그 붙�"
-
 #. TRANS: Title for link to edit list settings.
 msgid "Edit list settings."
 msgstr "리스트 설정 편집."
@@ -9278,8 +8817,11 @@ msgctxt "plugin"
 msgid "Enable"
 msgstr "사용"
 
+#. TRANS: Plugin description for a disabled plugin.
+#, fuzzy
 msgctxt "plugin-description"
-msgid "(Plugin descriptions unavailable when disabled.)"
+msgid ""
+"(The plugin description is unavailable when a plugin has been disabled.)"
 msgstr "(플러그�� 사용하지 않으면 설명� 볼 수 없습니다.)"
 
 #. TRANS: Menu item in primary navigation panel.
@@ -9291,6 +8833,11 @@ msgstr "설정"
 msgid "Change your personal settings."
 msgstr "개� 설정 바꾸기"
 
+#. TRANS: Menu item in primary navigation panel.
+msgctxt "MENU"
+msgid "Admin"
+msgstr "관리"
+
 #. TRANS: Menu item title in primary navigation panel.
 msgid "Site configuration."
 msgstr "사�트 설정."
@@ -9308,14 +8855,8 @@ msgstr "� 사�트�서 로그아웃."
 msgid "Login to the site."
 msgstr "� 사�트� 로그�."
 
-#. TRANS: Menu item in primary navigation panel.
-msgctxt "MENU"
-msgid "Search"
-msgstr "검색"
-
-#. TRANS: Menu item title in primary navigation panel.
-msgid "Search the site."
-msgstr "사�트 검색."
+msgid "This profile has been silenced by site moderators"
+msgstr ""
 
 #. TRANS: H2 text for user subscription statistics.
 msgid "Following"
@@ -9325,6 +8866,10 @@ msgstr "팔로잉"
 msgid "Followers"
 msgstr "팔로워"
 
+#. TRANS: H2 text for user statistics.
+msgid "Statistics"
+msgstr "통계"
+
 #. TRANS: Label for user statistics.
 msgid "User ID"
 msgstr "사용� 아�디"
@@ -9333,10 +8878,6 @@ msgstr "사용� 아�디"
 msgid "Member since"
 msgstr "가입한 때"
 
-#. TRANS: Label for user statistics.
-msgid "Notices"
-msgstr "글"
-
 #. TRANS: Label for user statistics.
 #. TRANS: Average count of posts made per day since account registration.
 msgid "Daily average"
@@ -9422,13 +8963,13 @@ msgid "Keyword(s)"
 msgstr "검색어"
 
 #. TRANS: Button text for searching site.
+#. TRANS: Button text for search button on search form.
 #. TRANS: Button text to search profiles.
 msgctxt "BUTTON"
 msgid "Search"
 msgstr "검색"
 
 #. TRANS: Standard search suggestions shown when a search does not give any results.
-#, fuzzy
 msgid ""
 "* Make sure all words are spelled correctly.\n"
 "* Try different keywords.\n"
@@ -9438,10 +8979,10 @@ msgstr ""
 "* 단어를 제대로 입력했는지 확�하십시오.\n"
 "* 다른 검색어로 검색해 보십시오.\n"
 "* � �반�� 검색어로 검색해 보십시오.\n"
-"* �� 수� 검색어로 검색해 보십시오.\n"
+"* �� 수� 검색어로 검색해 보십시오."
 
 #. TRANS: Standard search suggestions shown when a search does not give any results.
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "You can also try your search on other engines:\n"
 "\n"
@@ -9459,7 +9000,7 @@ msgstr ""
 "* [Tweet scan](http://www.tweetscan.com/indexi.php?s=%s)\n"
 "* [구글](http://www.google.com/search?q=site%%3A%%%%site.server%%%%+%s)\n"
 "* [야후](http://search.yahoo.com/search?p=site%%3A%%%%site.server%%%%+%s)\n"
-"* [Collecta](http://collecta.com/#q=%s)\n"
+"* [Collecta](http://collecta.com/#q=%s)"
 
 #. TRANS: Menu item in search group navigation panel.
 msgctxt "MENU"
@@ -9483,21 +9024,6 @@ msgstr "글� 내용 찾기"
 msgid "Find groups on this site"
 msgstr "� 사�트�서 그룹 찾기"
 
-#. TRANS: Secondary navigation menu item leading to help on StatusNet.
-msgctxt "MENU"
-msgid "Help"
-msgstr "�움�"
-
-#. TRANS: Secondary navigation menu item leading to text about StatusNet site.
-msgctxt "MENU"
-msgid "About"
-msgstr "ì •ë³´"
-
-#. TRANS: Secondary navigation menu item leading to Frequently Asked Questions.
-msgctxt "MENU"
-msgid "FAQ"
-msgstr "�주 묻는 질문"
-
 #. TRANS: Secondary navigation menu item leading to Terms of Service.
 msgctxt "MENU"
 msgid "TOS"
@@ -9518,17 +9044,6 @@ msgctxt "MENU"
 msgid "Version"
 msgstr "버전"
 
-#. TRANS: Secondary navigation menu item leading to e-mail contact information on the
-#. TRANS: StatusNet site, where to report bugs, ...
-msgctxt "MENU"
-msgid "Contact"
-msgstr "연�하기"
-
-#. TRANS: Secondary navigation menu item. Leads to information about embedding a timeline widget.
-msgctxt "MENU"
-msgid "Badge"
-msgstr "배지"
-
 #. TRANS: Default title for section/sidebar widget.
 msgid "Untitled section"
 msgstr "제목없는 섹션"
@@ -9573,10 +9088,6 @@ msgstr "메�"
 msgid "Change email handling"
 msgstr "메� 처리 바꾸기"
 
-#. TRANS: Menu item title in settings navigation panel.
-msgid "Design your profile"
-msgstr "프로필 디��"
-
 #. TRANS: Menu item in settings navigation panel.
 msgctxt "MENU"
 msgid "URL"
@@ -9613,6 +9124,15 @@ msgstr "ì—°ê²°"
 msgid "Authorized connected applications"
 msgstr "��하고 연결� �용 프로그램"
 
+#. TRANS: Menu item in settings navigation panel.
+msgctxt "MENU"
+msgid "Old school"
+msgstr ""
+
+#. TRANS: Menu item title in settings navigation panel.
+msgid "UI tweaks for old-school users"
+msgstr ""
+
 #. TRANS: Title of form to silence a user.
 msgctxt "TITLE"
 msgid "Silence"
@@ -9622,6 +9142,39 @@ msgstr "벙어리"
 msgid "Silence this user"
 msgstr "� 사용� 벙어리 처리"
 
+#. TRANS: Server error displayed when trying to create an anynymous OAuth consumer.
+msgid "Could not create anonymous consumer."
+msgstr "�명 컨수머를 만들 수 없습니다."
+
+#. TRANS: Server error displayed when trying to create an anynymous OAuth application.
+msgid "Could not create anonymous OAuth application."
+msgstr "�명 OAuth �용 프로그램� 만들 수 없습니다."
+
+#. TRANS: Exception thrown when no token association could be found.
+msgid ""
+"Could not find a profile and application associated with the request token."
+msgstr "요청 토�과 관련� 프로필과 �용 프로그램� 찾� 수 없습니다."
+
+#. TRANS: Exception thrown when no access token can be issued.
+msgid "Could not issue access token."
+msgstr "접근 토�� 발급할 수 없습니다."
+
+#. TRANS: Exception thrown when a database error occurs.
+msgid "Database error inserting OAuth application user."
+msgstr "OAuth 프로그램 사용�를 넣는� ��터베�스 오류."
+
+#. TRANS: Exception thrown when a database error occurs.
+msgid "Database error updating OAuth application user."
+msgstr "OAuth 프로그램 사용�를 업��트하는� ��터베�스 오류."
+
+#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
+msgid "Tried to revoke unknown token."
+msgstr "알 수 없는 토�� 철회 시�했습니다."
+
+#. TRANS: Exception thrown when an attempt is made to remove a revoked token.
+msgid "Failed to delete revoked token."
+msgstr "철회� 토�� 삭제� 실패했습니다."
+
 #. TRANS: Menu item in local navigation menu.
 msgctxt "MENU"
 msgid "Subscriptions"
@@ -9678,6 +9231,16 @@ msgstr "%s� 친구와 �료들� 초대합니다."
 msgid "Subscribe to this user"
 msgstr "� 사용�를 구�"
 
+#. TRANS: Button text to subscribe to a user.
+#. TRANS: Button text for subscribing to a list.
+msgctxt "BUTTON"
+msgid "Subscribe"
+msgstr "구�"
+
+#. TRANS: Button title to subscribe to a user.
+msgid "Subscribe to this user."
+msgstr "� 사용� 구�."
+
 #. TRANS: Title of personal tag cloud section.
 msgid "People Tagcloud as self-tagged"
 msgstr "사람들 태그��우드, �기 태그 기준"
@@ -9794,17 +9357,27 @@ msgid_plural "%%s like this."
 msgstr[0] ""
 
 #. TRANS: List message for notice repeated by logged in user.
+#, fuzzy
 msgctxt "REPEATLIST"
-msgid "You have repeated this notice."
+msgid "You repeated this."
 msgstr "� 글� 반복했습니다."
 
-#. TRANS: List message for repeated notices.
-#. TRANS: %d is the number of users that have repeated a notice.
+#. TRANS: List message for when more than 4 people repeat something.
+#. TRANS: %%s is a list of users liking a notice, %d is the number over 4 that like the notice.
+#. TRANS: Plural is decided on the total number of users liking the notice (count of %%s + %d).
 #, php-format
-msgid "One person has repeated this notice."
-msgid_plural "%d people have repeated this notice."
+msgid "%%s and %d other repeated this."
+msgid_plural "%%s and %d others repeated this."
 msgstr[0] ""
 
+#. TRANS: List message for favoured notices.
+#. TRANS: %%s is a list of users liking a notice.
+#. TRANS: Plural is based on the number of of users that have favoured a notice.
+#, fuzzy, php-format
+msgid "%%s repeated this."
+msgid_plural "%%s repeated this."
+msgstr[0] "%s 사용��게 반복"
+
 #. TRANS: Form legend.
 #, php-format
 msgid "Search and list people"
@@ -9895,7 +9468,6 @@ msgid "Unsilence this user"
 msgstr "� 사용�� 벙어리 해제"
 
 #. TRANS: Form legend on unsubscribe form.
-#. TRANS: Button title on unsubscribe form.
 msgid "Unsubscribe from this user"
 msgstr "� 사용��서 구� 해제"
 
@@ -9905,6 +9477,11 @@ msgctxt "BUTTON"
 msgid "Unsubscribe"
 msgstr "구� 해제"
 
+#. TRANS: Button title on unsubscribe form.
+#, fuzzy
+msgid "Unsubscribe from this user."
+msgstr "� 사용��서 구� 해제"
+
 #. TRANS: Exception text shown when no profile can be found for a user.
 #. TRANS: %1$s is a user nickname, $2$d is a user ID (number).
 #, php-format
@@ -9982,8 +9559,6 @@ msgstr "XML� 잘못�었습니다. XRD 루트가 없습니다."
 msgid "Getting backup from file '%s'."
 msgstr "'%s' 파��서 백업� 가져옵니다."
 
-#~ msgid "%1$s and friends, page %2$d"
-#~ msgstr "%1$s � 친구들, %2$d 페�지"
-
-#~ msgid "You and friends"
-#~ msgstr "당신 � 친구들"
+#, fuzzy
+#~ msgid " "
+#~ msgstr ", "
diff --git a/locale/mk/LC_MESSAGES/statusnet.po b/locale/mk/LC_MESSAGES/statusnet.po
index 6b57d7c1a7..65da520a99 100644
--- a/locale/mk/LC_MESSAGES/statusnet.po
+++ b/locale/mk/LC_MESSAGES/statusnet.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Core to Macedonian (Македон�ки)
+# Translation of StatusNet - Core to Macedonian (македон�ки)
 # Exported from translatewiki.net
 #
 # Author: Bjankuloski06
@@ -10,17 +10,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:27+0000\n"
-"Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:21+0000\n"
+"Language-Team: Macedonian <https://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
-"X-POT-Import-Date: 2011-05-05 10:52:40+0000\n"
+"X-POT-Import-Date: 2012-04-22 22:02:21+0000\n"
 
 #. TRANS: Database error message.
 #, php-format
@@ -35,14 +35,6 @@ msgstr ""
 "запознаени �о проблемот, но ако �акате �епак да проверите, обратете им �е на "
 "%2$s. Во друг �лучај, почекајте неколку минути, па обидете �е повторно."
 
-#. TRANS: Error message.
-msgid ""
-"An important error occured, probably related to email setup. Check logfiles "
-"for more info."
-msgstr ""
-"Се појави важна грешка, веројатно поврзана �о во�тановката на е-поштата. "
-"Проверете ги дневничките податотеки за повеќе информации."
-
 #. TRANS: Error message.
 msgid "An error occurred."
 msgstr "Се појави грешка."
@@ -105,12 +97,11 @@ msgstr "Оневозможи нови реги�трации."
 msgid "Closed"
 msgstr "Затворен"
 
-#. TRANS: Title for button to save access settings in site admin panel.
-msgid "Save access settings"
-msgstr "Зачувај нагодувања на при�тап"
+#. TRANS: Button title to save access settings in site admin panel.
+msgid "Save access settings."
+msgstr "Зачувај нагодувања на при�тап."
 
-#. TRANS: Tooltip for button to save access settings in site admin panel.
-#. TRANS: Button text for saving theme settings.
+#. TRANS: Button text to save access settings in site admin panel.
 #. TRANS: Button label to save e-mail preferences.
 #. TRANS: Button label to save IM preferences.
 #. TRANS: Button text in the license admin panel.
@@ -126,7 +117,6 @@ msgstr "Зачувај нагодувања на при�тап"
 #. TRANS: Button text for saving "Other settings" in profile.
 #. TRANS: Button text to save user settings in user admin panel.
 #. TRANS: Button label in the "Edit application" form.
-#. TRANS: Button text on profile design page to save settings.
 #. TRANS: Text for save button on group edit form.
 #. TRANS: Button text to save tags for a profile.
 msgctxt "BUTTON"
@@ -165,10 +155,6 @@ msgstr "�ема таков профил."
 msgid "No such list."
 msgstr "�ема таков �пи�ок."
 
-#. TRANS: Client error displayed when trying to add an OMB 0.1 remote profile to a list.
-msgid "You cannot list an OMB 0.1 remote profile with this action."
-msgstr "�е можете да наведете далечин�ки профил OMB 0.1 �о ова деј�тво."
-
 #. TRANS: Client error displayed when an unknown error occurs when adding a user to a list.
 #. TRANS: %s is a username.
 #, php-format
@@ -200,7 +186,6 @@ msgstr "�ема таква �траница."
 #. TRANS: Client error when user not found for an rss related action.
 #. TRANS: Client error displayed when no existing user is provided for a user's delivery device setting.
 #. TRANS: Client error displayed if a user could not be found.
-#. TRANS: Client error when user not found updating a profile background image.
 #. TRANS: Client error displayed updating profile image without having a user object.
 #. TRANS: Client error displayed when making an Atom API request for an unknown user.
 #. TRANS: Client error displayed when trying to block a non-existing user or a user from another site.
@@ -226,14 +211,11 @@ msgstr "�ема таква �траница."
 #. TRANS: Client error displayed when trying to get the RSS feed with favorites of a user that does not exist.
 #. TRANS: Client error displayed when requesting Friends of a Friend feed without providing a user nickname.
 #. TRANS: Client error displayed when requesting Friends of a Friend feed for an object that is not a user.
-#. TRANS: Client error displayed when trying to get a user hCard for a non-existing user.
 #. TRANS: Client error displayed trying to make a micro summary without providing a valid user.
 #. TRANS: Client error displayed trying to send a direct message to a non-existing user.
 #. TRANS: Client error displayed trying to use "one time password login" without using an existing user.
 #. TRANS: Client error displayed when referring to non-existing user.
 #. TRANS: Client error displayed trying to perform an action related to a non-existing user.
-#. TRANS: Form validation error on page for remote subscribe when no user was provided.
-#. TRANS: Form validation error on page for remote subscribe when no user profile was found.
 #. TRANS: Client error displayed when trying to reply to a non-exsting user.
 #. TRANS: Client error displayed when providing a non-existing nickname in a RSS 1.0 action.
 #. TRANS: Client error.
@@ -242,7 +224,6 @@ msgstr "�ема таква �траница."
 #. TRANS: Client error displayed trying to find a user by ID for a non-existing ID.
 #. TRANS: Client error displayed requesting groups for a non-existing user.
 #. TRANS: Client error displayed when user not found for an action.
-#. TRANS: Client error displayed providing a non-existing nickname.
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #. TRANS: Client error displayed when trying to perform a gallery action with an unknown user.
 #. TRANS: Client error displayed when trying to access a mailbox without providing a user.
@@ -251,15 +232,21 @@ msgid "No such user."
 msgstr "�ема таков кори�ник."
 
 #. TRANS: Title of a user's own start page.
-#, fuzzy
 msgid "Home timeline"
-msgstr "И�торија на %s"
+msgstr "Хронологија на домашната �траница"
 
 #. TRANS: Title of another user's start page.
 #. TRANS: %s is the other user's name.
-#, fuzzy, php-format
+#, php-format
 msgid "%s's home timeline"
-msgstr "И�торија на %s"
+msgstr "Хронологија на домашната �траница на %s"
+
+#. TRANS: %s is user nickname.
+#. TRANS: Feed title.
+#. TRANS: %s is tagger's nickname.
+#, php-format
+msgid "Feed for friends of %s (Activity Streams JSON)"
+msgstr "Канал за пријатели на %s (Activity Streams JSON)"
 
 #. TRANS: %s is user nickname.
 #, php-format
@@ -305,7 +292,7 @@ msgstr ""
 "Можете да го [подбуцнете кори�никот %1$s](../%2$s) од неговиот профил или да "
 "[му и�пратите нешто](%%%%action.newnotice%%%%?status_textarea=%3$s)."
 
-#. TRANS: Encoutagement displayed on empty timeline user pages for anonymous users.
+#. TRANS: Encouragement displayed on empty timeline user pages for anonymous users.
 #. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
 #. TRANS: Empty list message for page with replies for a user for not logged in users.
 #. TRANS: %1$s is a user nickname. This message contains a Markdown link in the form [link text](link).
@@ -319,6 +306,12 @@ msgstr ""
 "� зошто не �е [реги�трирате](%%%%action.register%%%%), и потоа да го "
 "подбуцнете кори�никот %s или да му и�пратите забелешка."
 
+#. TRANS: Button text for inviting more users to the StatusNet instance.
+#. TRANS: Less business/enterprise-oriented language for public sites.
+msgctxt "BUTTON"
+msgid "Send invite"
+msgstr "И�прати покани"
+
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Title of API timeline for a user and friends.
 #. TRANS: %s is a username.
@@ -327,8 +320,6 @@ msgstr ""
 #. TRANS: %s is a username.
 #. TRANS: Menu item title in personal group navigation menu.
 #. TRANS: %s is a username.
-#. TRANS: Menu item title in settings navigation panel.
-#. TRANS: %s is a username.
 #, php-format
 msgid "%s and friends"
 msgstr "%s и пријатели"
@@ -368,7 +359,6 @@ msgstr ""
 #. TRANS: Server error thrown on database error updating SMS preferences.
 #. TRANS: Server error thrown on database error removing a registered SMS phone number.
 #. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
-#. TRANS: Server exception thrown on Profile design page when updating design settings fails.
 msgid "Could not update user."
 msgstr "�е можев да го подновам кори�никот."
 
@@ -383,7 +373,6 @@ msgstr "�е може да �е зачува профил."
 
 #. TRANS: Client error displayed when the number of bytes in a POST request exceeds a limit.
 #. TRANS: %s is the number of bytes of the CONTENT_LENGTH.
-#. TRANS: Form validation error in design settings form. POST should remain untranslated.
 #, php-format
 msgid ""
 "The server was unable to handle that much POST data (%s byte) due to its "
@@ -398,24 +387,6 @@ msgstr[1] ""
 "Оп�лужувачот не можеше да обработи толку многу POST-податоци (%s бајти) "
 "поради неговата тековна по�тавено�т."
 
-#. TRANS: Client error displayed when saving design settings fails because of an empty id.
-#. TRANS: Client error displayed when saving design settings fails because of an empty result.
-#. TRANS: Client error displayed when a database error occurs inserting profile colours.
-#. TRANS: Client error displayed when a database error occurs updating profile colours.
-#. TRANS: Form validation error displayed when group design settings could not be saved because of an application issue.
-#. TRANS: Form validation error on Profile design page when saving design settings has failed.
-#. TRANS: Form validation error on Profile design page when updating design settings has failed.
-msgid "Unable to save your design settings."
-msgstr "�е можам да ги зачувам Вашите нагодувања за изглед."
-
-#. TRANS: Error displayed when updating design settings fails.
-#. TRANS: Client error displayed when a database error occurs updating profile colours.
-#. TRANS: Form validation error on Profile design page when updating design settings has failed.
-#. TRANS: Error message displayed if design settings could not be saved.
-#. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
-msgid "Could not update your design."
-msgstr "�е може да �е поднови Вашиот изглед."
-
 #. TRANS: Title for Atom feed.
 msgctxt "ATOM"
 msgid "Main"
@@ -462,6 +433,20 @@ msgstr "Блокирањето на кори�никот не у�пеа."
 msgid "Unblock user failed."
 msgstr "�е у�пеа одблокирањето на кори�никот."
 
+#. TRANS: Client exception thrown when no conversation ID is given.
+msgid "No conversation ID."
+msgstr "�ема назнака за разговорот."
+
+#. TRANS: Client exception thrown when referring to a non-existing conversation ID (%d).
+#, php-format
+msgid "No conversation with ID %d."
+msgstr "�ема разговор �о назнака %d."
+
+#. TRANS: Title for conversion timeline.
+msgctxt "TITLE"
+msgid "Conversation"
+msgstr "Разговор"
+
 #. TRANS: Title. %s is a user nickname.
 #, php-format
 msgid "Direct messages from %s"
@@ -506,6 +491,8 @@ msgstr ""
 "�е можете да и�праќате непо�редни пораки на кори�ници што не Ви �е пријатели."
 
 #. TRANS: Client error displayed trying to direct message self (403).
+#. TRANS: Client error displayed trying to send a direct message to self.
+#. TRANS: Error text shown when trying to send a direct message to self.
 msgid ""
 "Do not send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
@@ -737,7 +724,6 @@ msgstr "групи на %s"
 
 #. TRANS: Client error displayed when trying to edit a group without being an admin.
 #. TRANS: Client error displayed trying to edit a group while not being a group admin.
-#. TRANS: Client error displayed trying to change group design settings without being a (group) admin.
 #. TRANS: Client error displayed when trying to change group logo settings while not being a group admin.
 msgid "You must be an admin to edit the group."
 msgstr "Мора да �те админи�тратор за да можете да ја уредите групата."
@@ -846,7 +832,6 @@ msgstr "Грешка во базата при вметнувањето на auth
 
 #. TRANS: Client error given on when invalid data was passed through a form in the OAuth API.
 #. TRANS: Unexpected validation error on avatar upload form.
-#. TRANS: Client error displayed when the submitted form contains unexpected data.
 #. TRANS: Client error displayed submitting invalid form data for edit application.
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
 #. TRANS: Form validation error message when an unsupported argument is used.
@@ -855,7 +840,6 @@ msgstr "Грешка во базата при вметнувањето на auth
 #. TRANS: Client error when submitting a form with unexpected information.
 #. TRANS: Client error displayed when unexpected data is posted in the password recovery form.
 #. TRANS: Message given submitting a form with an unknown action in SMS settings.
-#. TRANS: Unknown form validation error in design settings form.
 msgid "Unexpected form submission."
 msgstr "�еочекувано подне�ување на образец."
 
@@ -900,7 +884,6 @@ msgstr "Сметка"
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Field label on account registration page.
-#. TRANS: Label for nickname on user authorisation page.
 #. TRANS: Field label on group edit form.
 #. TRANS: Dropdown option for searching in profiles.
 msgid "Nickname"
@@ -1216,12 +1199,9 @@ msgstr "Мора да �те најавени за да можете да ја 
 #. TRANS: Client error displayed when requesting Friends of a Friend feed for a nickname that is not a group.
 #. TRANS: Client error displayed trying to block a user from a group while specifying a non-existing group.
 #. TRANS: Client error displayed referring to a group's permalink for a non-existing group ID.
-#. TRANS: Client error displayed trying to change group design settings while providing a nickname for a non-existing group.
 #. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
 #. TRANS: Client error displayed when trying to view group members for a non-existing group.
 #. TRANS: Client error displayed when trying to view group members for an object that is not a group.
-#. TRANS: Client error displayed when trying to view group members for a non-existing group.
-#. TRANS: Client error displayed when trying to view group members for an object that is not a group.
 #. TRANS: Client error displayed when requesting a group RSS feed for group that does not exist.
 #. TRANS: Client error displayed when requesting a group RSS feed for an object that is not a group.
 #. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
@@ -1230,10 +1210,10 @@ msgstr "Мора да �те најавени за да можете да ја 
 #. TRANS: Client error displayed when trying to leave a non-local group.
 #. TRANS: Client error displayed when trying to leave a non-existing group.
 #. TRANS: Client error displayed when providing an invalid group ID on the Make Admin page.
-#. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
-#. TRANS: Client error displayed if no local group with a given name was found requesting group page.
 #. TRANS: Command exception text shown when a group is requested that does not exist.
 #. TRANS: Error text shown when trying to leave a group that does not exist.
+#. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
+#. TRANS: Client error displayed if no local group with a given name was found requesting group page.
 msgid "No such group."
 msgstr "�ема таква група."
 
@@ -1303,6 +1283,7 @@ msgid "Join request canceled."
 msgstr "Барањето за зачленување е откажано."
 
 #. TRANS: Client error displayed trying to approve subscription for a non-existing request.
+#. TRANS: %s is a user nickname.
 #, php-format
 msgid "%s is not in the moderation queue for your subscriptions."
 msgstr "%s не е во редицата за модерација на Вашите претплати."
@@ -1454,7 +1435,6 @@ msgstr "�ема таков прилог."
 #. TRANS: Client error displayed trying to get an avatar without providing a nickname.
 #. TRANS: Client error displayed when requesting a list of blocked users for a group without providing a group nickname.
 #. TRANS: Client error displayed trying to edit a group while not proving a nickname for the group to edit.
-#. TRANS: Client error displayed trying to change group design settings without providing a group nickname.
 #. TRANS: Client error displayed when trying to change group logo settings without providing a nickname.
 #. TRANS: Client error displayed when trying to view group members without providing a group nickname.
 #. TRANS: Client error displayed when requesting a group RSS feed without providing a group nickname.
@@ -1752,6 +1732,16 @@ msgstr "�дре�ата  \"%s\" е потврдена за Вашата �ме
 msgid "Conversation"
 msgstr "Разговор"
 
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+msgid "Conversation feed (Activity Streams JSON)"
+msgstr "Канал �о разговор (Activity Streams JSON)"
+
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+msgid "Conversation feed (RSS 2.0)"
+msgstr "Канал �о разговор (RSS 2.0)"
+
 #. TRANS: Title for conversation page.
 #. TRANS: Title for page that shows a notice.
 msgctxt "TITLE"
@@ -1814,8 +1804,8 @@ msgid "Enter \"%s\" to confirm that you want to delete your account."
 msgstr "Вне�ете го „%s“ за да потврдите дека �акате да ја избришете �метката."
 
 #. TRANS: Button title for user account deletion.
-msgid "Permanently delete your account"
-msgstr "Трајно бришење на �метката"
+msgid "Permanently delete your account."
+msgstr "Трајно бришење на �метката."
 
 #. TRANS: Client error displayed trying to delete an application while not logged in.
 msgid "You must be logged in to delete an application."
@@ -1906,14 +1896,12 @@ msgstr "Избриши ја групава."
 msgid ""
 "You are about to permanently delete a notice. Once this is done, it cannot "
 "be undone."
-msgstr ""
-"�а пат �те да избришете забелешка за�екогаш. Откако ќе го направите тоа, "
-"по�тапката нема да може да �е врати."
+msgstr "�а пат �те да избришете забелешка за�екогаш. Ова е неповратно."
 
 #. TRANS: Page title when deleting a notice.
 #. TRANS: Fieldset legend for the delete notice form.
 msgid "Delete notice"
-msgstr "Избриши забелешка"
+msgstr "Бришење на забелешката"
 
 #. TRANS: Message for the delete notice form.
 msgid "Are you sure you want to delete this notice?"
@@ -1921,7 +1909,7 @@ msgstr "Дали �те �игурни дека �акате да ја избр
 
 #. TRANS: Submit button title for 'No' when deleting a notice.
 msgid "Do not delete this notice."
-msgstr "�е ја бриши оваа забелешка."
+msgstr "�е ја бриши забелешкава."
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
 msgid "Delete this notice."
@@ -1960,150 +1948,6 @@ msgstr "�е го бриши кори�ников."
 msgid "Delete this user."
 msgstr "Избриши го кори�ников."
 
-#. TRANS: Message used as title for design settings for the site.
-msgid "Design"
-msgstr "Изглед"
-
-#. TRANS: Instructions for design adminsitration panel.
-msgid "Design settings for this StatusNet site"
-msgstr "�агодувања на изгледот на ова StatusNet-мрежно ме�то."
-
-#. TRANS: Client error displayed when a logo URL does is not valid.
-msgid "Invalid logo URL."
-msgstr "Погрешен URL на лого."
-
-#. TRANS: Client error displayed when an SSL logo URL is invalid.
-msgid "Invalid SSL logo URL."
-msgstr "�еважечка URL-адре�а на SSL-логото."
-
-#. TRANS: Client error displayed when a theme is submitted through the form that is not in the theme list.
-#. TRANS: %s is the chosen unavailable theme.
-#, php-format
-msgid "Theme not available: %s."
-msgstr "Темата е недо�тапна: %s."
-
-#. TRANS: Fieldset legend for form to change logo.
-msgid "Change logo"
-msgstr "Промени лого"
-
-#. TRANS: Field label for StatusNet site logo.
-msgid "Site logo"
-msgstr "Лого на мрежното ме�то"
-
-#. TRANS: Field label for SSL StatusNet site logo.
-msgid "SSL logo"
-msgstr "SSL-лого"
-
-#. TRANS: Fieldset legend for form change StatusNet site's theme.
-msgid "Change theme"
-msgstr "Промени изглед"
-
-#. TRANS: Field label for dropdown to choose site theme.
-msgid "Site theme"
-msgstr "Изглед на мрежното ме�то"
-
-#. TRANS: Title for field label for dropdown to choose site theme.
-msgid "Theme for the site."
-msgstr "Изглед за мрежното ме�то."
-
-#. TRANS: Field label for uploading a cutom theme.
-msgid "Custom theme"
-msgstr "Прилагоден мотив"
-
-#. TRANS: Form instructions for uploading a cutom StatusNet theme.
-msgid "You can upload a custom StatusNet theme as a .ZIP archive."
-msgstr "Можете да подигнете �вој изглед за StatusNet како .ZIP архив."
-
-#. TRANS: Fieldset legend for theme background image.
-msgid "Change background image"
-msgstr "Промена на �лика за позадина"
-
-#. TRANS: Field label for background image on theme designer page.
-#. TRANS: Field label for background color selector.
-#. TRANS: Label on profile design page for setting a profile page background colour.
-msgid "Background"
-msgstr "Позадина"
-
-#. TRANS: Form guide for background image upload form on theme designer page.
-#, php-format
-msgid ""
-"You can upload a background image for the site. The maximum file size is %1"
-"$s."
-msgstr ""
-"Може да подигнете позадин�ка �лика за ова мрежно ме�то. Мак�ималната "
-"големина на податотеката е %1$s."
-
-#. TRANS: Used as radio button label to add a background image.
-msgid "On"
-msgstr "Вкл."
-
-#. TRANS: Used as radio button label to not add a background image.
-msgid "Off"
-msgstr "И�кл."
-
-#. TRANS: Form guide for turning background image on or off on theme designer page.
-#. TRANS: Form guide for a set of radio buttons on the profile design page that will enable or disable
-#. TRANS: use of the uploaded profile image.
-msgid "Turn background image on or off."
-msgstr "Вклучи или и�клучи позадин�ка �лика."
-
-#. TRANS: Checkbox label to title background image on theme designer page.
-#. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
-msgid "Tile background image"
-msgstr "Позадината во квадрати"
-
-#. TRANS: Fieldset legend for theme colors.
-msgid "Change colors"
-msgstr "Смени бои"
-
-#. TRANS: Field label for content color selector.
-#. TRANS: Label on profile design page for setting a profile page content colour.
-msgid "Content"
-msgstr "Содржина"
-
-#. TRANS: Field label for sidebar color selector.
-#. TRANS: Label on profile design page for setting a profile page sidebar colour.
-msgid "Sidebar"
-msgstr "Странична лента"
-
-#. TRANS: Field label for text color selector.
-#. TRANS: Label on profile design page for setting a profile page text colour.
-msgid "Text"
-msgstr "Тек�т"
-
-#. TRANS: Field label for link color selector.
-#. TRANS: Label on profile design page for setting a profile page links colour.
-msgid "Links"
-msgstr "Вр�ки"
-
-#. TRANS: Fieldset legend for advanced theme design settings.
-msgid "Advanced"
-msgstr "�апредно"
-
-#. TRANS: Field label for custom CSS.
-msgid "Custom CSS"
-msgstr "Прилагодено CSS"
-
-#. TRANS: Button text for resetting theme settings.
-msgctxt "BUTTON"
-msgid "Use defaults"
-msgstr "Кори�ти по о�новно"
-
-#. TRANS: Title for button for resetting theme settings.
-#. TRANS: Title for button on profile design page to reset all colour settings to default.
-msgid "Restore default designs."
-msgstr "Врати ги изгледите по о�новно."
-
-#. TRANS: Title for button for resetting theme settings.
-#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-msgid "Reset back to default."
-msgstr "Врати по о�новно."
-
-#. TRANS: Title for button for saving theme settings.
-#. TRANS: Title for button on profile design page to save settings.
-msgid "Save design."
-msgstr "Зачувај изглед."
-
 #. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
 msgid "This notice is not a favorite!"
 msgstr "Оваа забелешка не Ви е бенди�ана!"
@@ -2118,6 +1962,74 @@ msgstr "Додај во бенди�ани"
 msgid "No such document \"%s\"."
 msgstr "�ема документ �о на�лов „%s“."
 
+#. TRANS: Menu item in administrator navigation panel.
+#. TRANS: Menu item in default local navigation panel.
+#. TRANS: Menu item in personal group navigation menu.
+msgctxt "MENU"
+msgid "Home"
+msgstr "Почетна"
+
+msgctxt "MENU"
+msgid "Docs"
+msgstr "Документи"
+
+#. TRANS: Secondary navigation menu item leading to help on StatusNet.
+msgctxt "MENU"
+msgid "Help"
+msgstr "Помош"
+
+msgid "Getting started"
+msgstr "Како да почнете"
+
+#. TRANS: Secondary navigation menu item leading to text about StatusNet site.
+msgctxt "MENU"
+msgid "About"
+msgstr "За на�"
+
+msgid "About this site"
+msgstr "За ова мреж. ме�то"
+
+#. TRANS: Secondary navigation menu item leading to Frequently Asked Questions.
+msgctxt "MENU"
+msgid "FAQ"
+msgstr "ЧПП"
+
+msgid "Frequently asked questions"
+msgstr "Че�то по�тавувани прашања"
+
+#. TRANS: Secondary navigation menu item leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+msgctxt "MENU"
+msgid "Contact"
+msgstr "Контакт"
+
+msgid "Contact info"
+msgstr "Контактни информации"
+
+msgctxt "MENU"
+msgid "Tags"
+msgstr "Ознаки"
+
+msgid "Using tags"
+msgstr "Употреба на ознаки"
+
+#. TRANS: Menu item in default local navigation panel.
+#. TRANS: Menu item in search group navigation panel.
+#. TRANS: Menu item in local navigation menu.
+msgctxt "MENU"
+msgid "Groups"
+msgstr "Групи"
+
+msgid "Using groups"
+msgstr "Употреба на групи"
+
+msgctxt "MENU"
+msgid "API"
+msgstr "API"
+
+msgid "RESTful API"
+msgstr "RESTful API"
+
 #. TRANS: Title for "Edit application" form.
 #. TRANS: Form legend.
 msgid "Edit application"
@@ -2280,7 +2192,7 @@ msgstr ""
 "�ко наме�тите јавна ознака како приватна, �о тоа трајно ќе ги избришете и "
 "�ите нејзини по�тоечки претплати. Дали �акате да продолжите?"
 
-#. TRANS: TRANS: Server error displayed when updating a list fails.
+#. TRANS: Server error displayed when updating a list fails.
 msgid "Could not update list."
 msgstr "�е можев да го подновам �пи�окот."
 
@@ -2297,7 +2209,7 @@ msgstr "Раководење �о начинот на кој добивате е
 #. TRANS: Form legend for e-mail settings form.
 #. TRANS: Field label for e-mail address input in e-mail settings form.
 msgid "Email address"
-msgstr "Е-поштен�ка адре�а"
+msgstr "Е-пошта"
 
 #. TRANS: Form note in e-mail settings form.
 msgid "Current confirmed email address."
@@ -2557,13 +2469,13 @@ msgstr "Подновувања, бенди�ани од %1$s на %2$s!"
 #. TRANS: Title for featured users section.
 #. TRANS: Menu item title in search group navigation panel.
 msgid "Featured users"
-msgstr "Избрани кори�ници"
+msgstr "И�такнати кори�ници"
 
 #. TRANS: Page title for all but first page of featured users.
 #. TRANS: %d is the page number being displayed.
 #, php-format
 msgid "Featured users, page %d"
-msgstr "Избрани кори�ници, �тр. %d"
+msgstr "И�такнати кори�ници, �тр. %d"
 
 #. TRANS: Description on page displaying featured users.
 #, php-format
@@ -2587,40 +2499,6 @@ msgstr "�ема прилози."
 msgid "No uploaded attachments."
 msgstr "�ема подигнато прилози."
 
-#. TRANS: Client error displayed when subscribing to a remote profile and an unexpected response is received.
-msgid "Not expecting this response!"
-msgstr "Овој одговор не беше очекуван!"
-
-#. TRANS: Client error displayed when subscribing to a remote profile that does not exist.
-msgid "User being listened to does not exist."
-msgstr "Следениот кори�ник не по�тои."
-
-#. TRANS: Client error displayed when subscribing to a remote profile that is a local profile.
-#. TRANS: Client error displayed when using remote subscribe for a local entity.
-msgid "You can use the local subscription!"
-msgstr "Може да ја кори�тите локалната претплата."
-
-#. TRANS: Client error displayed when subscribing to a remote profile that is blocked form subscribing to.
-msgid "That user has blocked you from subscribing."
-msgstr "Тој кори�ник Ве има блокирано од претплаќање."
-
-#. TRANS: Client error displayed when subscribing to a remote profile without providing an authorised token.
-msgid "You are not authorized."
-msgstr "�е �те овла�тени."
-
-#. TRANS: Client error displayed when subscribing to a remote profile and conversion of the request token to access token fails.
-msgid "Could not convert request token to access token."
-msgstr "�е можев да ги претворам жетоните за барање во жетони за при�тап."
-
-#. TRANS: Client error displayed when subscribing to a remote profile fails because of an unsupported version of the OMB protocol.
-msgid "Remote service uses unknown version of OMB protocol."
-msgstr "Далечин�ката �лужба кори�ти непозната верзија на OMB протокол."
-
-#. TRANS: Server error displayed when subscribing to a remote profile fails because the remote profile could not be updated.
-#. TRANS: Exception thrown when updating a remote profile fails in OAuth store.
-msgid "Error updating remote profile."
-msgstr "Грешка во подновувањето на далечин�киот профил."
-
 #. TRANS: Client error displayed when requesting a non-existent file.
 msgid "No such file."
 msgstr "�ема таква податотека."
@@ -2710,31 +2588,6 @@ msgstr ""
 msgid "No ID."
 msgstr "�ема ID."
 
-#. TRANS: Client error displayed trying to change group design settings while not logged in.
-msgid "You must be logged in to edit a group."
-msgstr "Мора да �те најавени за да можете да уредувате група."
-
-#. TRANS: Title group design settings page.
-msgid "Group design"
-msgstr "Изглед на групата"
-
-#. TRANS: Instructions for group design settings page.
-msgid ""
-"Customize the way your group looks with a background image and a colour "
-"palette of your choice."
-msgstr ""
-"Прилагодете го изгледот на Вашата група �о позадин�ка �лика и палета од бои "
-"по Ваш избор."
-
-#. TRANS: Form validation error displayed when group design settings could not be updated because of an application issue.
-msgid "Unable to update your design settings."
-msgstr "�е можам да ги подновам Вашите нагодувања за изглед."
-
-#. TRANS: Form text to confirm saved group design settings.
-#. TRANS: Confirmation message on Profile design page when saving design settings has succeeded.
-msgid "Design preferences saved."
-msgstr "�агодувањата �е зачувани."
-
 #. TRANS: Title for group logo settings page.
 #. TRANS: Group logo form legend.
 msgid "Group logo"
@@ -2909,8 +2762,8 @@ msgstr "�агодувања за �П"
 #. TRANS: the order and formatting of link text and link should remain unchanged.
 #, php-format
 msgid ""
-"You can send and receive notices through instant messaging [instant messages]"
-"(%%doc.im%%). Configure your addresses and settings below."
+"You can send and receive notices through [instant messaging](%%doc.im%%). "
+"Configure your addresses and settings below."
 msgstr ""
 "Можете да праќате и примате забелешки преку [непо�редни пораки](%%doc.im%%). "
 "Подолу по�тавете адре�и и направете нагодувања."
@@ -3111,28 +2964,6 @@ msgstr ""
 "Со овој обраец можете да поканите пријатели и колеги да го кори�тат мрежното "
 "ме�то."
 
-#. TRANS: Field label for a list of e-mail addresses.
-msgid "Email addresses"
-msgstr "Е-поштен�ки адре�и"
-
-#. TRANS: Tooltip for field label for a list of e-mail addresses.
-msgid "Addresses of friends to invite (one per line)."
-msgstr "�дре�и на пријателите што ги каните (по една во �екој ред)."
-
-#. TRANS: Field label for a personal message to send to invitees.
-msgid "Personal message"
-msgstr "Лична порака"
-
-#. TRANS: Tooltip for field label for a personal message to send to invitees.
-msgid "Optionally add a personal message to the invitation."
-msgstr "Можете да додадете и лична порака во поканата."
-
-#. TRANS: Send button for inviting friends
-#. TRANS: Button text for sending notice.
-msgctxt "BUTTON"
-msgid "Send"
-msgstr "И�прати"
-
 #. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral
 #. TRANS: singular 3rd-person pronoun in English. %1$s is the inviting user, $2$s is
 #. TRANS: the StatusNet sitename.
@@ -3269,12 +3100,6 @@ msgstr "URL-адре�а за �лика што ќе �е прикажува �
 msgid "Save license settings."
 msgstr "Зачувај нагодувања на лиценцата."
 
-#. TRANS: Client error displayed when trying to log in while already logged in.
-#. TRANS: Client error displayed trying to use "one time password login" when already logged in.
-#. TRANS: Client error displayed when trying to register while already logged in.
-msgid "Already logged in."
-msgstr "Веќе �те најавени."
-
 #. TRANS: Form validation error displayed when trying to log in with incorrect credentials.
 msgid "Incorrect username or password."
 msgstr "�еточно кори�ничко име или лозинка"
@@ -3293,9 +3118,8 @@ msgid "Login to site"
 msgstr "�ајавете �е"
 
 #. TRANS: Field label on login page.
-#, fuzzy
 msgid "Username or email address"
-msgstr "Прекар или е-поштен�ка адре�а"
+msgstr "Кори�ничко име или е-пошта"
 
 #. TRANS: Checkbox label label on login page.
 #. TRANS: Checkbox label on account registration page.
@@ -3306,7 +3130,7 @@ msgstr "Запамети ме"
 #. TRANS: Checkbox title on account registration page.
 msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
-"От�ега врши автомат�ка најава. �е треба да �е кори�ти за јавни �метачи!"
+"От�ега врши автомат�ка најава (не треба да �е кори�ти на јавни �метачи!)"
 
 #. TRANS: Button text for log in on login page.
 msgctxt "BUTTON"
@@ -3385,6 +3209,7 @@ msgstr "Треба изворна URL-адре�а."
 msgid "Could not create application."
 msgstr "�е можеше да �е �оздаде програмот."
 
+#. TRANS: Form validation error messages displayed when uploading an invalid application logo.
 msgid "Invalid image."
 msgstr "�еважечка �лика."
 
@@ -3421,14 +3246,6 @@ msgstr "�ема �одржина!"
 msgid "No recipient specified."
 msgstr "�ема назначено примач."
 
-#. TRANS: Client error displayed trying to send a direct message to self.
-#. TRANS: Error text shown when trying to send a direct message to self.
-msgid ""
-"Don't send a message to yourself; just say it to yourself quietly instead."
-msgstr ""
-"�е и�праќајте �и порака �амите на �ебе; подобро тивко кажете �и го тоа на "
-"�ебе�и."
-
 #. TRANS: Page title after sending a direct message.
 msgid "Message sent"
 msgstr "Пораката е и�пратена"
@@ -3439,7 +3256,7 @@ msgstr "Пораката е и�пратена"
 #. TRANS: %s is the name of the other user.
 #, php-format
 msgid "Direct message to %s sent."
-msgstr "Директната порака до %s е и�пратена."
+msgstr "�епо�редната порака до %s е и�пратена."
 
 #. TRANS: Page title after an AJAX error occurred on the "send direct message" page.
 #. TRANS: Page title after an AJAX error occurs on the send notice page.
@@ -3474,7 +3291,7 @@ msgstr "Тек�туално пребарување"
 #. TRANS: %1$s is the query, %2$s is the StatusNet site name.
 #, php-format
 msgid "Search results for \"%1$s\" on %2$s"
-msgstr "Резултати од пребарувањето за „%1$s“ на %2$s"
+msgstr "Резултати од пребарувањето на „%1$s“ на %2$s"
 
 #. TRANS: Text for logged in users making a query for notices without results.
 #. TRANS: This message contains a Markdown link.
@@ -3634,6 +3451,33 @@ msgstr "Ве молиме кори�тете �амо %s URL-адре�и врз
 msgid "Not a supported data format."
 msgstr "Ова не е поддржан формат на податотека."
 
+#. TRANS: Page title for profile settings.
+msgid "Old school UI settings"
+msgstr "Кла�ични по�тавки за �П"
+
+#. TRANS: Usage instructions for profile settings.
+msgid "If you like it \"the old way\", you can set that here."
+msgstr ""
+"�ко �акате да биде кла�ично (како порано), можете да го наме�тите тука."
+
+#. TRANS: Confirmation shown when user profile settings are saved.
+#. TRANS: Message after successful saving of administrative settings.
+msgid "Settings saved."
+msgstr "�агодувањата �е зачувани"
+
+msgid "Only stream mode (no conversations) in timelines"
+msgstr "Само канал�ко емитување (без разговори) во хронологиите"
+
+msgid "Show conversation page as hierarchical trees"
+msgstr "Прикаж. �траницата за разговори како хиерархи�ки дрва"
+
+msgid "Show nicknames (not full names) in timelines"
+msgstr "Прикаж. прекари (не полни имиња) во хронологиите"
+
+#. TRANS: Button text to save a list.
+msgid "Save"
+msgstr "Зачувај"
+
 #. TRANS: ShortName in the OpenSearch interface when trying to find users.
 msgid "People Search"
 msgstr "Пребарување на луѓе"
@@ -3642,9 +3486,14 @@ msgstr "Пребарување на луѓе"
 msgid "Notice Search"
 msgstr "Пребарување на забелешки"
 
+#. TRANS: Client error displayed trying to use "one time password login" when already logged in.
+#. TRANS: Client error displayed when trying to register while already logged in.
+msgid "Already logged in."
+msgstr "Веќе �те најавени."
+
 #. TRANS: Client error displayed trying to use "one time password login" without specifying a user.
 msgid "No user ID specified."
-msgstr "�ема назначено кори�нички ID."
+msgstr "�ема назначено кори�ничка назнака."
 
 #. TRANS: Client error displayed trying to use "one time password login" without specifying a login token.
 msgid "No login token specified."
@@ -3713,7 +3562,7 @@ msgid "Confirm"
 msgstr "Потврди"
 
 #. TRANS: Field title on page where to change password.
-#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
+#. TRANS: Title for field label for password reset form where the password has to be typed again.
 #. TRANS: Field title on account registration page.
 msgid "Same as password above."
 msgstr "И�то како лозинката погоре."
@@ -3771,12 +3620,6 @@ msgstr "Директориумот на темата е нечитлив: %s."
 msgid "Avatar directory not writable: %s."
 msgstr "Директориумот на аватарот е недо�тапен за запишување: %s."
 
-#. TRANS: Client error in Paths admin panel.
-#. TRANS: %s is the background directory that could not be written to.
-#, php-format
-msgid "Background directory not writable: %s."
-msgstr "Директориумот на позадината е нечитлив: %s."
-
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the locales directory that could not be read from.
 #, php-format
@@ -3810,7 +3653,7 @@ msgstr "Патека на мреж. ме�то."
 
 #. TRANS: Field label in Paths admin panel.
 msgid "Locale directory"
-msgstr "Директориум на ме�та"
+msgstr "Директориум на локализацијата"
 
 #. TRANS: Field title in Paths admin panel.
 msgid "Directory path to locales."
@@ -3889,30 +3732,6 @@ msgstr "Директориум на аватарот"
 msgid "Directory where avatars are located."
 msgstr "Директориумот кадешто �е �ме�тени аватарите."
 
-#. TRANS: Fieldset legend in Paths admin panel.
-msgid "Backgrounds"
-msgstr "Позадини"
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-msgid "Server for backgrounds."
-msgstr "Оп�лужувач за позадини."
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-msgid "Web path to backgrounds."
-msgstr "Мрежна патека за позадините."
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-msgid "Server for backgrounds on SSL pages."
-msgstr "Оп�лужувач за позадини на SSL-�траници."
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-msgid "Web path to backgrounds on SSL pages."
-msgstr "Мрежна патека за позадините на SSL-�траници."
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-msgid "Directory where backgrounds are located."
-msgstr "Директориумот кадешто �е �ме�тени позадините."
-
 #. TRANS: Fieldset legens in Paths admin panel.
 msgid "Attachments"
 msgstr "Прилози"
@@ -3968,8 +3787,8 @@ msgid "Server to direct SSL requests to."
 msgstr "Oп�лужувач, кому ќе му �е и�праќаат SSL-барања."
 
 #. TRANS: Button title text to store form data in the Paths admin panel.
-msgid "Save paths"
-msgstr "Зачувај патеки"
+msgid "Save path settings."
+msgstr "Зачувај нагодувања за патека."
 
 #. TRANS: Instructions for the "People search" page.
 #. TRANS: %%site.name%% is the name of the StatusNet site.
@@ -4103,7 +3922,7 @@ msgid ""
 "%%%site.name%%%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
 "blogging) service based on the Free Software [StatusNet](http://status.net/) "
 "tool. You can easily keep track of what they are doing by subscribing to the "
-"tag's timeline."
+"list's timeline."
 msgstr ""
 "Ова �е �пи�оците направени од **%s**. Спи�оците �лужат за подредување на "
 "�лични лица на %%%%site.name%%%%, �лужба за [микроблогирање](http://mk."
@@ -4137,7 +3956,7 @@ msgid ""
 "site.name%%%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
 "blogging) service based on the Free Software [StatusNet](http://status.net/) "
 "tool. You can easily keep track of what they are doing by subscribing to the "
-"tag's timeline."
+"list's timeline."
 msgstr ""
 "Ова �е �пи�оците за **%s**. Спи�оците �лужат за подредување на �лични лица "
 "на %%%%site.name%%%%, �лужба за [микроблогирање](http://mk.wikipedia.org/"
@@ -4244,18 +4063,6 @@ msgid ""
 msgstr ""
 "Сите о�новни приклучоци �е оневозможени во по�тавките на мрежното ме�то."
 
-#. TRANS: Client error displayed if the notice posted has too many characters.
-msgid "Invalid notice content."
-msgstr "�еважечка �одржина на забелешката."
-
-#. TRANS: Exception thrown if a notice's license is not compatible with the StatusNet site license.
-#. TRANS: %1$s is the notice license, %2$s is the StatusNet site's license.
-#, php-format
-msgid "Notice license \"%1$s\" is not compatible with site license \"%2$s\"."
-msgstr ""
-"Лиценцата на забелешката „%1$s“ не е �оодветна на лиценцата на мрежното "
-"ме�то „%2$s“."
-
 #. TRANS: Client error displayed when trying to add an unindentified field to profile.
 #. TRANS: %s is a field name.
 #, php-format
@@ -4352,6 +4159,8 @@ msgstr ""
 "Прикажувај ја мојата тековна ме�тоположба при објавување на забелешките"
 
 #. TRANS: Field label in form for profile settings.
+#. TRANS: Title for group tag cloud section.
+#. TRANS: %s is a group name.
 msgid "Tags"
 msgstr "Ознаки"
 
@@ -4373,18 +4182,18 @@ msgstr "Претпочитан јазик"
 
 #. TRANS: Dropdownlist label in form for profile settings.
 msgid "Timezone"
-msgstr "Ча�овна зона"
+msgstr "Ча�овен поја�"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
 msgid "What timezone are you normally in?"
-msgstr "Во која ча�овна зона обично �е наоѓате?"
+msgstr "Во кој ча�овен поја� обично �е наоѓате?"
 
 #. TRANS: Checkbox label in form for profile settings.
 msgid ""
-"Automatically subscribe to whoever subscribes to me (best for non-humans)."
+"Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr ""
 "�втомат�ки претплаќај ме на �екој што �е претплаќа на мене (најдобро за "
-"ботови и �л.)."
+"ботови и �л.)"
 
 #. TRANS: Dropdown field label on profile settings, for what policies to apply when someone else tries to subscribe to your updates.
 msgid "Subscription policy"
@@ -4421,7 +4230,7 @@ msgstr[1] "Биографијата е предолга (највеќе до %d
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Client error displayed trying to save site settings without a timezone.
 msgid "Timezone not selected."
-msgstr "�е е избрана ча�овна зона."
+msgstr "�е е избран ча�овен поја�."
 
 #. TRANS: Validation error in form for profile settings.
 msgid "Language is too long (maximum 50 characters)."
@@ -4452,11 +4261,6 @@ msgstr "�е можев да ги зачувам нагодувањата за 
 msgid "Could not save tags."
 msgstr "�е можев да ги зачувам ознаките."
 
-#. TRANS: Confirmation shown when user profile settings are saved.
-#. TRANS: Message after successful saving of administrative settings.
-msgid "Settings saved."
-msgstr "�агодувањата �е зачувани"
-
 #. TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
 #. TRANS: Page title for page where a user account can be restored from backup.
 msgid "Restore account"
@@ -4466,11 +4270,11 @@ msgstr "Врати �метка"
 #. TRANS: %s is the page limit.
 #, php-format
 msgid "Beyond the page limit (%s)."
-msgstr "�админато е ограничувањето на �траницата (%s)."
+msgstr "Пречекорено е ограничувањето на �траницата (%s)."
 
 #. TRANS: Server error displayed when a public timeline cannot be retrieved.
-msgid "Could not retrieve public stream."
-msgstr "�е можам да го вратам јавниот поток."
+msgid "Could not retrieve public timeline."
+msgstr "�е можам да ја вратам јавната хронологија."
 
 #. TRANS: Title for all public timeline pages but the first.
 #. TRANS: %d is the page number.
@@ -4484,16 +4288,20 @@ msgid "Public timeline"
 msgstr "Јавна и�торија"
 
 #. TRANS: Link description for public timeline feed.
-msgid "Public Stream Feed (RSS 1.0)"
-msgstr "Канал на јавниот поток (RSS 1.0)"
+msgid "Public Timeline Feed (Activity Streams JSON)"
+msgstr "Канал на јавната хронологија (Activity Streams JSON)"
 
 #. TRANS: Link description for public timeline feed.
-msgid "Public Stream Feed (RSS 2.0)"
-msgstr "Канал на јавниот поток (RSS 2.0)"
+msgid "Public Timeline Feed (RSS 1.0)"
+msgstr "Канал на јавната хронологија (RSS 1.0)"
 
 #. TRANS: Link description for public timeline feed.
-msgid "Public Stream Feed (Atom)"
-msgstr "Канал на јавниот поток (Atom)"
+msgid "Public Timeline Feed (RSS 2.0)"
+msgstr "Канал на јавната хронологија (RSS 2.0)"
+
+#. TRANS: Link description for public timeline feed.
+msgid "Public Timeline Feed (Atom)"
+msgstr "Канал на јавната хронологија (Atom)"
 
 #. TRANS: Text displayed for public feed when there are no public notices.
 #, php-format
@@ -4542,47 +4350,6 @@ msgstr ""
 "org/wiki/Микроблогирање) за�нована на �лободната програм�ка алатка "
 "[StatusNet](http://status.net/)."
 
-#. TRANS: Title for page with public list cloud.
-msgid "Public list cloud"
-msgstr "Облак од јавни �пи�оци"
-
-#. TRANS: Page notice for page with public list cloud.
-#. TRANS: %s is a StatusNet sitename.
-#, php-format
-msgid "These are largest lists on %s"
-msgstr "Ова �е најпопуларните �корешни ознаки на %s"
-
-#. TRANS: Empty list message on page with public list cloud.
-#. TRANS: This message contains Markdown links in the form [description](link).
-#, php-format
-msgid "No one has [listed](%%doc.tags%%) anyone yet."
-msgstr "Сè уште никој нема [наведено](%%doc.tags%%) никого на �пи�окот."
-
-#. TRANS: Additional empty list message on page with public list cloud for logged in users.
-msgid "Be the first to list someone!"
-msgstr "Бидете првиот што ќе наведе некого!"
-
-#. TRANS: Additional empty list message on page with public list cloud for anonymous users.
-#. TRANS: This message contains Markdown links in the form [description](link).
-#, php-format
-msgid ""
-"Why not [register an account](%%action.register%%) and be the first to list "
-"someone!"
-msgstr ""
-"Зошто не [реги�трирате �метка](%%action.register%%) и �танете првиот што ќе "
-"наведе некого!"
-
-#. TRANS: DT element on on page with public list cloud.
-msgid "List cloud"
-msgstr "Облак �о �пи�оци"
-
-#. TRANS: Link title for number of listed people. %d is the number of listed people.
-#, php-format
-msgid "1 person listed"
-msgid_plural "%d people listed"
-msgstr[0] "�аведено е 1 лице"
-msgstr[1] "�аведени �е %d лица"
-
 #. TRANS: Public RSS feed description. %s is the StatusNet site name.
 #, php-format
 msgid "%s updates from everyone."
@@ -4709,7 +4476,6 @@ msgid "6 or more characters, and do not forget it!"
 msgstr "6 или повеќе знаци - не заборавајте!"
 
 #. TRANS: Button text for password reset form.
-#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
 msgctxt "BUTTON"
 msgid "Reset"
 msgstr "Врати одново"
@@ -4718,18 +4484,6 @@ msgstr "Врати одново"
 msgid "Enter a nickname or email address."
 msgstr "Вне�ете прекар или е-пошта"
 
-#. TRANS: Information on password recovery form if no known username or e-mail address was specified.
-msgid "No user with that email address or username."
-msgstr "�ема кори�ник �о таа е-поштен�ка адре�а или кори�ничко име."
-
-#. TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.
-msgid "No registered email address for that user."
-msgstr "�ема реги�трирана адре�а за е-пошта за тој кори�ник."
-
-#. TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.
-msgid "Error saving address confirmation."
-msgstr "Грешка при зачувувањето на потврдата за адре�а."
-
 #. TRANS: User notification after an e-mail with instructions was sent from the password recovery form.
 msgid ""
 "Instructions for recovering your password have been sent to the email "
@@ -4891,7 +4645,7 @@ msgstr ""
 "\n"
 "* Отидете на [Вашиот профил](%2$s) и објавете ја Вашата прва порака.\n"
 "* Додајте [Jabber/GTalk адре�а](%%%%action.imsettings%%%%) за да можете да "
-"и�праќате забелешки преку ин�тант-пораки.\n"
+"и�праќате забелешки преку непо�редни пораки.\n"
 "* [Пребарајте луѓе](%%%%action.peoplesearch%%%%) кои можеби ги знаете или "
 "кои имаат и�ти интере�и како Ва�.  \n"
 "* Подновете �и ги [нагодувањата на профилот](%%%%action.profilesettings%%%%) "
@@ -4910,76 +4664,6 @@ msgstr ""
 "(Би требало веднаш да добиете порака по е-пошта, во која �тојат напат�твија "
 "за потврдување на е-поштен�ката адре�а.)"
 
-#. TRANS: Page notice for remote subscribe. This message contains Markdown links.
-#. TRANS: Ensure to keep the correct markup of [link description](link).
-#, php-format
-msgid ""
-"To subscribe, you can [login](%%action.login%%), or [register](%%action."
-"register%%) a new  account. If you already have an account  on a [compatible "
-"microblogging site](%%doc.openmublog%%),  enter your profile URL below."
-msgstr ""
-"За да �е претплатите, можете да �е [најавите](%%action.login%%) или да "
-"[реги�трирате](%%action.register%%) нова �метка. �ко веќе имате �метка на "
-"[у�огла�иво мреж. ме�то за микроблогирање](%%doc.openmublog%%), вне�ете го "
-"URL-то на Вашиот профил подолу."
-
-#. TRANS: Page title for Remote subscribe.
-msgid "Remote subscribe"
-msgstr "Оддалечена претплата"
-
-#. TRANS: Field legend on page for remote subscribe.
-msgid "Subscribe to a remote user"
-msgstr "Претплати �е на далечин�ки кори�ник"
-
-#. TRANS: Field label on page for remote subscribe.
-msgid "User nickname"
-msgstr "Прекар на кори�никот"
-
-#. TRANS: Field title on page for remote subscribe.
-msgid "Nickname of the user you want to follow."
-msgstr "Прекар на кори�никот што �акате да го �ледите."
-
-#. TRANS: Field label on page for remote subscribe.
-msgid "Profile URL"
-msgstr "URL на профилот"
-
-#. TRANS: Field title on page for remote subscribe.
-msgid "URL of your profile on another compatible microblogging service."
-msgstr "!URL на Вашиот профил на друга �кладна �лужба за микроблогирање."
-
-#. TRANS: Button text on page for remote subscribe.
-#. TRANS: Link text for link that will subscribe to a remote profile.
-#. TRANS: Button text to subscribe to a user.
-#. TRANS: Button text for subscribing to a list.
-msgctxt "BUTTON"
-msgid "Subscribe"
-msgstr "Претплати �е"
-
-#. TRANS: Form validation error on page for remote subscribe when an invalid profile URL was provided.
-msgid "Invalid profile URL (bad format)."
-msgstr "�еправилна URL на профилот (лош формат)."
-
-#. TRANS: Form validation error on page for remote subscribe when no the provided profile URL
-#. TRANS: does not contain expected data.
-msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
-msgstr ""
-"�еважечка URL-адре�а на профил (нема YADIS документ или определен е "
-"неважечки XRDS)."
-
-#. TRANS: Form validation error on page for remote subscribe.
-msgid "That is a local profile! Login to subscribe."
-msgstr "Тоа е локален профил! �ајавете �е за да �е претплатите."
-
-#. TRANS: Form validation error on page for remote subscribe when the remote service is not providing a request token.
-msgid "Could not get a request token."
-msgstr "�е можев да добијам жетон за барање."
-
-#. TRANS: Client error displayed when trying to (un)list an OMB 0.1 remote profile.
-msgid "You cannot (un)list an OMB 0.1 remote profile with this action."
-msgstr ""
-"!�е можете да наведете/от�траните од �пи�ок далечин�ки профил OMB 0.1 �о ова "
-"деј�тво."
-
 #. TRANS: Client error displayed when an unknown error occurs while delisting a user.
 #. TRANS: %s is a username.
 #, php-format
@@ -5033,6 +4717,12 @@ msgstr "Одговори и�пратени до %s"
 msgid "Replies to %1$s, page %2$d"
 msgstr "Одговори на %1$s, �тр. %2$d"
 
+#. TRANS: Link for feed with replies for a user.
+#. TRANS: %s is a user nickname.
+#, php-format
+msgid "Replies feed for %s (Activity Streams JSON)"
+msgstr "Канал �о одговори за %s (Activity Streams JSON)"
+
 #. TRANS: Link for feed with replies for a user.
 #. TRANS: %s is a user nickname.
 #, php-format
@@ -5156,11 +4846,11 @@ msgstr ""
 
 #. TRANS: Form instructions for feed restore.
 msgid ""
-"You can upload a backed-up stream in <a href=\"http://activitystrea.ms/"
+"You can upload a backed-up timeline in <a href=\"http://activitystrea.ms/"
 "\">Activity Streams</a> format."
 msgstr ""
-"Можете да опдигнете зачувано резервно емитување во форматот <a href=\"http://"
-"activitystrea.ms/\">Activity Streams</a>."
+"Можете да подигнете зачувана резервна хронологија во форматот <a href="
+"\"http://activitystrea.ms/\">Activity Streams</a>."
 
 #. TRANS: Title for submit button to confirm upload of a user backup file for account restore.
 msgid "Upload the file"
@@ -5272,6 +4962,26 @@ msgstr "Клуч за промена и тајна"
 msgid "Application info"
 msgstr "Инфо за програмот"
 
+#. TRANS: Field label on application page.
+msgid "Consumer key"
+msgstr "Потрошувачки клуч"
+
+#. TRANS: Field label on application page.
+msgid "Consumer secret"
+msgstr "Потрошувачка тајна"
+
+#. TRANS: Field label on application page.
+msgid "Request token URL"
+msgstr "URL на жетонот на барањето"
+
+#. TRANS: Field label on application page.
+msgid "Access token URL"
+msgstr "URL на при�тапниот жетон"
+
+#. TRANS: Field label on application page.
+msgid "Authorize URL"
+msgstr "Одобри URL"
+
 #. TRANS: Note on the OAuth application page about signature support.
 msgid ""
 "Note: HMAC-SHA1 signatures are supported. The plaintext signature method is "
@@ -5295,6 +5005,11 @@ msgstr "Бенди�ан забелешки на %1$s, �траница %2$d"
 msgid "Could not retrieve favorite notices."
 msgstr "�е можев да ги повратам бенди�аните забелешки."
 
+#. TRANS: Feed link text. %s is a username.
+#, php-format
+msgid "Feed for favorites of %s (Activity Streams JSON)"
+msgstr "Канал за бенди�ани забелешки на %s (Activity Streams JSON)"
+
 #. TRANS: Feed link text. %s is a username.
 #, php-format
 msgid "Feed for favorites of %s (RSS 1.0)"
@@ -5357,6 +5072,11 @@ msgstr "Група %s"
 msgid "%1$s group, page %2$d"
 msgstr "Група %1$s, �тр. %2$d"
 
+#. TRANS: Tooltip for feed link. %s is a group nickname.
+#, php-format
+msgid "Notice feed for %s group (Activity Streams JSON)"
+msgstr "Канал �о забелешки за групата %s (Activity Streams JSON)"
+
 #. TRANS: Tooltip for feed link. %s is a group nickname.
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
@@ -5377,42 +5097,8 @@ msgstr "Канал �о забелешки за групата%s (Atom)"
 msgid "FOAF for %s group"
 msgstr "FOAF за групата %s"
 
-#. TRANS: Header for mini list of group members on a group page (h2).
-msgid "Members"
-msgstr "Членови"
-
-#. TRANS: Description for mini list of group members on a group page when the group has no members.
-#. TRANS: Content of "Listed" page if there are no listed users.
-#. TRANS: Content of "People following tag x" if there are no subscribed users.
-#. TRANS: Empty list message for tags.
-#. TRANS: Text for user subscription statistics if the user has no subscriptions.
-#. TRANS: Text for user subscriber statistics if user has no subscribers.
-#. TRANS: Text for user user group membership statistics if user is not a member of any group.
-#. TRANS: Default content for section/sidebar widget.
-msgid "(None)"
-msgstr "(�ема)"
-
-#. TRANS: Link to all group members from mini list of group members if group has more than n members.
-msgid "All members"
-msgstr "Сите членови"
-
-#. TRANS: Header for group statistics on a group page (h2).
-#. TRANS: H2 text for user statistics.
-msgid "Statistics"
-msgstr "Стати�тики"
-
-#. TRANS: Label for group creation date.
-msgctxt "LABEL"
-msgid "Created"
-msgstr "Создадено"
-
-#. TRANS: Label for member count in statistics on group page.
-msgctxt "LABEL"
-msgid "Members"
-msgstr "Членови"
-
 #. TRANS: Notice on group pages for anonymous users for StatusNet sites that accept new registrations.
-#. TRANS: **%s** is the group alias, %%%%site.name%%%% is the site name,
+#. TRANS: %s is the group name, %%%%site.name%%%% is the site name,
 #. TRANS: %%%%action.register%%%% is the URL for registration, %%%%doc.help%%%% is a URL to help.
 #. TRANS: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
 #, php-format
@@ -5431,24 +5117,19 @@ msgstr ""
 "([Прочитајте повеќе](%%%%doc.help%%%%))"
 
 #. TRANS: Notice on group pages for anonymous users for StatusNet sites that accept no new registrations.
-#. TRANS: **%s** is the group alias, %%%%site.name%%%% is the site name,
+#. TRANS: %s is the group name, %%%%site.name%%%% is the site name,
 #. TRANS: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
 "wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
 "[StatusNet](http://status.net/) tool. Its members share short messages about "
-"their life and interests. "
+"their life and interests."
 msgstr ""
 "**%s** е кори�ничка група на %%%%site.name%%%%, мрежно ме�то за "
 "[микроблогирање](http://mk.wikipedia.org/wiki/Микроблогирање) за�нована на "
 "�лободната програм�ка алатка [StatusNet](http://status.net/). �ејзините "
-"членови �и разменуваат кратки пораки за нивниот живот и интере�и. "
-
-#. TRANS: Title for list of group administrators on a group page.
-msgctxt "TITLE"
-msgid "Admins"
-msgstr "�дмини�тратори"
+"членови �и разменуваат кратки пораки за нивниот живот и интере�и."
 
 #. TRANS: Client error displayed requesting a single message that does not exist.
 msgid "No such message."
@@ -5545,9 +5226,21 @@ msgstr ""
 "оваа хронологија!"
 
 #. TRANS: Header on show list page.
+#. TRANS: Link description for link to list of users tagged with a tag (so part of a list).
 msgid "Listed"
 msgstr "�аведени"
 
+#. TRANS: Content of "Listed" page if there are no listed users.
+#. TRANS: Content of "People following tag x" if there are no subscribed users.
+#. TRANS: Description for mini list of group members on a group page when the group has no members.
+#. TRANS: Empty list message for tags.
+#. TRANS: Text for user subscription statistics if the user has no subscriptions.
+#. TRANS: Text for user subscriber statistics if user has no subscribers.
+#. TRANS: Text for user user group membership statistics if user is not a member of any group.
+#. TRANS: Default content for section/sidebar widget.
+msgid "(None)"
+msgstr "(�ема)"
+
 #. TRANS: Link for more "People in list x by a user"
 #. TRANS: if there are more than the mini list's maximum.
 msgid "Show all"
@@ -5558,24 +5251,19 @@ msgstr "Прикажи ги �ите"
 msgid "Subscribers"
 msgstr "Претплатници"
 
-#. TRANS: Link for more "People following tag x"
-#. TRANS: if there are more than the mini list's maximum.
-msgid "All subscribers"
-msgstr "Сите претплатници"
-
-#. TRANS: Page title showing tagged notices in one user's stream.
+#. TRANS: Page title showing tagged notices in one user's timeline.
 #. TRANS: %1$s is the username, %2$s is the hash tag.
 #, php-format
 msgid "Notices by %1$s tagged %2$s"
 msgstr "Забелешки од %1$s означени �о %2$s"
 
-#. TRANS: Page title showing tagged notices in one user's stream.
+#. TRANS: Page title showing tagged notices in one user's timeline.
 #. TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number.
 #, php-format
 msgid "Notices by %1$s tagged %2$s, page %3$d"
 msgstr "Забелешки на %1$s означени �о %2$s, �траница %3$d"
 
-#. TRANS: Extended page title showing tagged notices in one user's stream.
+#. TRANS: Extended page title showing tagged notices in one user's timeline.
 #. TRANS: %1$s is the username, %2$d is the page number.
 #, php-format
 msgid "Notices by %1$s, page %2$d"
@@ -5587,6 +5275,12 @@ msgstr "Забелешки на %1$s, �траница %2$d"
 msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
 msgstr "Канал �о забелешки за %1$s означен �о %2$s (RSS 1.0)"
 
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#, php-format
+msgid "Notice feed for %s (Activity Streams JSON)"
+msgstr "Канал �о забелешки за %s (Activity Streams JSON)"
+
 #. TRANS: Title for link to notice feed.
 #. TRANS: %s is a user nickname.
 #, php-format
@@ -5611,7 +5305,7 @@ msgstr "Канал �о забелешки за %s (Atom)"
 msgid "FOAF for %s"
 msgstr "FOAF за %s"
 
-#. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
+#. TRANS: First sentence of empty list message for a timeline. $1%s is a user nickname.
 #, php-format
 msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
 msgstr "Ова е хронологијата за %1$s, но %1$s �è уште нема објавено ништо."
@@ -5624,7 +5318,7 @@ msgstr ""
 "Имате видено нешто интере�но во по�ледно време? Сè уште немате објавено "
 "ниедна забелешка, но �ега е добро време за да почнете :)"
 
-#. TRANS: Second sentence of empty  list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
+#. TRANS: Second sentence of empty  list message for a non-self timeline. %1$s is a user nickname, %2$s is a part of a URL.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
 #, php-format
 msgid ""
@@ -5634,7 +5328,7 @@ msgstr ""
 "Можете да го подбуцнете кори�никот %1$s или [му и�пратите нешто](%%%%action."
 "newnotice%%%%?status_textarea=%2$s)."
 
-#. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
+#. TRANS: Announcement for anonymous users showing a timeline if site registrations are open.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
 #, php-format
 msgid ""
@@ -5649,17 +5343,17 @@ msgstr ""
 "register%%%%) за да можете да ги �ледите забелешките на **%s** и многу "
 "повеќе! ([Прочитајте повеќе](%%%%doc.help%%%%))"
 
-#. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
+#. TRANS: Announcement for anonymous users showing a timeline if site registrations are closed or invite only.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
 "wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
-"[StatusNet](http://status.net/) tool. "
+"[StatusNet](http://status.net/) tool."
 msgstr ""
 "**%s** има �метка на %%%%site.name%%%%, мрежно ме�то за [микроблогирање]"
-"(http://mk.wikipedia.org/wiki/Микроблогирање) за�нована на �лободната "
-"програм�ка алатка [StatusNet](http://status.net/). "
+"(http://mk.wikipedia.org/wiki/Микроблогирање) за�новано на �лободната "
+"програм�ка алатка [StatusNet](http://status.net/)."
 
 #. TRANS: Link to the author of a repeated notice. %s is a linked nickname.
 #, php-format
@@ -5692,6 +5386,14 @@ msgstr "Должината на името на мрежното ме�то не
 msgid "You must have a valid contact email address."
 msgstr "Мора да имате важечка контактна е-поштен�ка адре�а."
 
+#. TRANS: Client error displayed when a logo URL is not valid.
+msgid "Invalid logo URL."
+msgstr "Погрешен URL на лого."
+
+#. TRANS: Client error displayed when a SSL logo URL is invalid.
+msgid "Invalid SSL logo URL."
+msgstr "�еважечка URL-адре�а на SSL-логото."
+
 #. TRANS: Client error displayed trying to save site settings with an invalid language code.
 #. TRANS: %s is the invalid language code.
 #, php-format
@@ -5754,19 +5456,20 @@ msgstr "Локални"
 
 #. TRANS: Dropdown label on site settings panel.
 msgid "Default timezone"
-msgstr "О�новна ча�овна зона"
+msgstr "О�новен ча�овен поја�"
 
 #. TRANS: Dropdown title on site settings panel.
 msgid "Default timezone for the site; usually UTC."
-msgstr "Матична ча�овна зона за мрежното ме�то; обично UTC."
+msgstr "Матичен ча�овен поја� за мрежното ме�то; обично UTC."
 
 #. TRANS: Dropdown label on site settings panel.
 msgid "Default language"
 msgstr "О�новен јазик"
 
 #. TRANS: Dropdown title on site settings panel.
-msgid "Site language when autodetection from browser settings is not available"
-msgstr "Јазик на мрежното ме�то ако прели�тувачот не може да го препознае �ам"
+msgid ""
+"The site language when autodetection from browser settings is not available."
+msgstr "Јазик на мрежното ме�то ако прели�тувачот не може да го препознае �ам."
 
 #. TRANS: Fieldset legend on site settings panel.
 msgctxt "LEGEND"
@@ -5791,9 +5494,21 @@ msgstr ""
 "Колку долго треба да почекаат кори�ниците (во �екунди) за да можат повторно "
 "да го објават и�тото."
 
+#. TRANS: Fieldset legend for form to change logo.
+msgid "Logo"
+msgstr "Лого"
+
+#. TRANS: Field label for StatusNet site logo.
+msgid "Site logo"
+msgstr "Лого на мрежното ме�то"
+
+#. TRANS: Field label for SSL StatusNet site logo.
+msgid "SSL logo"
+msgstr "SSL-лого"
+
 #. TRANS: Button title for saving site settings.
-msgid "Save site settings"
-msgstr "Зачувај нагодувања на мреж. ме�то"
+msgid "Save the site settings."
+msgstr "Зачувај нагодувања на мреж. ме�то."
 
 #. TRANS: Page title for site-wide notice tab in admin panel.
 msgid "Site Notice"
@@ -5821,7 +5536,7 @@ msgstr ""
 "Тек�т на главната објава по цело мрежно ме�то (највеќе до 255 знаци; "
 "дозволено и HTML)"
 
-#. TRANS: Title for button to save site notice in admin panel.
+#. TRANS: Button title to save site notice in admin panel.
 msgid "Save site notice."
 msgstr "Зачувај ја објавата на мреж. ме�то."
 
@@ -6016,7 +5731,7 @@ msgstr "URL на извештајот"
 msgid "Snapshots will be sent to this URL."
 msgstr "Снимките ќе �е и�праќаат на оваа URL-адре�а."
 
-#. TRANS: Title for button to save snapshot settings.
+#. TRANS: Button title to save snapshot settings.
 msgid "Save snapshot settings."
 msgstr "Зачувај по�тавки за �нимки."
 
@@ -6049,11 +5764,6 @@ msgstr "%1$s претплатници чекаат на одобрение, �т
 msgid "A list of users awaiting approval to subscribe to you."
 msgstr "Спи�ок на кори�ниците што чекаат одобрение за да �е претплатат на Ва�."
 
-#. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
-msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
-msgstr ""
-"�е можете да �е претплатите на OMB 0.1 далечин�ки профил �о ова деј�тво."
-
 #. TRANS: Page title when subscription succeeded.
 msgid "Subscribed"
 msgstr "Претплатено"
@@ -6154,14 +5864,12 @@ msgid ""
 "You're not listening to anyone's notices right now, try subscribing to "
 "people you know. Try [people search](%%action.peoplesearch%%), look for "
 "members in groups you're interested in and in our [featured users](%%action."
-"featured%%). If you're a [Twitter user](%%action.twittersettings%%), you can "
-"automatically subscribe to people you already follow there."
+"featured%%)."
 msgstr ""
 "Моментално не �ледите ничии забелешки. Претплатете �е на луѓе кои ги "
 "познавате. Пробајте �о [пребарување на луѓе](%%action.peoplesearch%%), "
 "побарајте луѓе во група која Ве интере�ира и меѓу нашите [избрани кори�ници]"
-"(%%action.featured%%). �ко �те [кори�ник на Twitter](%%action.twittersettings"
-"%%), тука можете автомат�ки да �е претплатите на луѓе кои таму ги �ледите."
+"(%%action.featured%%)."
 
 #. TRANS: Subscription list text when looking at the subscriptions for a of a user other
 #. TRANS: than the logged in user that has no subscriptions. %s is the user nickname.
@@ -6191,6 +5899,12 @@ msgstr "СМС"
 msgid "Notices tagged with %1$s, page %2$d"
 msgstr "Забелешки означени �о %1$s, �тр. %2$d"
 
+#. TRANS: Link label for feed on "notices with tag" page.
+#. TRANS: %s is the tag the feed is for.
+#, php-format
+msgid "Notice feed for tag %s (Activity Streams JSON)"
+msgstr "Канал �о забелешки за ознаката %s (Activity Streams JSON)"
+
 #. TRANS: Link label for feed on "notices with tag" page.
 #. TRANS: %s is the tag the feed is for.
 #, php-format
@@ -6292,18 +6006,6 @@ msgstr "Претплатата е откажана"
 msgid "%1$s unsubscribed from list %2$s by %3$s"
 msgstr "%1$s ја откажа претплатата на �пи�окот %2$s од %3$s"
 
-#. TRANS: Client error displayed when trying to update profile with an incompatible license.
-#. TRANS: %1$s is the license incompatible with site license %2$s.
-#. TRANS: Exception thrown when licenses are not compatible for an authorisation request.
-#. TRANS: %1$s is the license for the listenee, %2$s is the license for "this" StatusNet site.
-#, php-format
-msgid ""
-"Listenee stream license \"%1$s\" is not compatible with site license \"%2$s"
-"\"."
-msgstr ""
-"Лиценцата на каналот на �ледениот „%1$s“ не е �кладна на лиценцата на "
-"мрежното ме�то „%2$s“."
-
 #. TRANS: Title of URL settings tab in profile settings.
 msgid "URL settings"
 msgstr "�агодувања за URL"
@@ -6441,155 +6143,10 @@ msgstr "Поканите �е овозможени"
 msgid "Whether to allow users to invite new users."
 msgstr "Дали да им е дозволено на кори�ниците да канат други кори�ници."
 
-#. TRANS: Title for button to save user settings in user admin panel.
+#. TRANS: Button title to save user settings in user admin panel.
 msgid "Save user settings."
 msgstr "Зачувај кори�нички нагодувања."
 
-#. TRANS: Page title.
-msgid "Authorize subscription"
-msgstr "Одобрете ја претплатата"
-
-#. TRANS: Page notice on "Authorize subscription" page.
-msgid ""
-"Please check these details to make sure that you want to subscribe to this "
-"user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
-"click \"Reject\"."
-msgstr ""
-"Проверете ги овие податоци и видете дали �акате да �е претплатите на "
-"забелешките на овој кори�ник. �ко не �акате да �е претплатите, едно�тавно "
-"�ти�нете на „Одбиј“."
-
-#. TRANS: Button text on Authorise Subscription page.
-#. TRANS: Submit button text to accept a group membership request on approve group form.
-#. TRANS: Submit button text to accept a subscription request on approve sub form.
-msgctxt "BUTTON"
-msgid "Accept"
-msgstr "Прифати"
-
-#. TRANS: Title for button on Authorise Subscription page.
-#. TRANS: Button title to subscribe to a user.
-msgid "Subscribe to this user."
-msgstr "Претплати �е на кори�ников."
-
-#. TRANS: Button text on Authorise Subscription page.
-#. TRANS: Submit button text to reject a group membership request on approve group form.
-#. TRANS: Submit button text to reject a subscription request on approve sub form.
-msgctxt "BUTTON"
-msgid "Reject"
-msgstr "Одбиј"
-
-#. TRANS: Title for button on Authorise Subscription page.
-msgid "Reject this subscription."
-msgstr "Одбиј ја оваа претплата."
-
-#. TRANS: Client error displayed for an empty authorisation request.
-msgid "No authorization request!"
-msgstr "�ема барање за проверка!"
-
-#. TRANS: Accept message header from Authorise subscription page.
-msgid "Subscription authorized"
-msgstr "Претплатата е одобрена"
-
-#. TRANS: Accept message text from Authorise subscription page.
-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-адре�а. Проверете ги "
-"ин�трукциите на мрежното ме�то за да дознаете како �е одобрува претплата. "
-"Жетонот на Вашата претплата е:"
-
-#. TRANS: Reject message header from Authorise subscription page.
-msgid "Subscription rejected"
-msgstr "Претплатата е одбиена"
-
-#. TRANS: Reject message from Authorise subscription page.
-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-адре�а. Проверете ги "
-"ин�трукциите на мрежното ме�то за да дознаете како �е одбива претплата во "
-"потполно�т."
-
-#. TRANS: Exception thrown when no valid user is found for an authorisation request.
-#. TRANS: %s is a listener URI.
-#, php-format
-msgid "Listener URI \"%s\" not found here."
-msgstr "URI-то на �ледачот „%s“ не е пронајдено тука."
-
-#. TRANS: Exception thrown when listenee URI is too long for an authorisation request.
-#. TRANS: %s is a listenee URI.
-#, php-format
-msgid "Listenee URI \"%s\" is too long."
-msgstr "Следеното URI „%s“ е предолго."
-
-#. TRANS: Exception thrown when listenee URI is a local user for an authorisation request.
-#. TRANS: %s is a listenee URI.
-#, php-format
-msgid "Listenee URI \"%s\" is a local user."
-msgstr "Следеното URI „%s“ е локален кори�ник."
-
-#. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
-#. TRANS: %s is a profile URL.
-#, php-format
-msgid "Profile URL \"%s\" is for a local user."
-msgstr "Профилната URL-адре�а „%s“ е за локален кори�ник."
-
-#. TRANS: Exception thrown when avatar URL is invalid for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#, php-format
-msgid "Avatar URL \"%s\" is not valid."
-msgstr "URL-адре�ата „%s“ за аватар е неважечка."
-
-#. TRANS: Exception thrown when avatar URL could not be read for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#, php-format
-msgid "Cannot read avatar URL \"%s\"."
-msgstr "�е можам да ја прочитам URL-адре�ата на аватарот „%s“."
-
-#. TRANS: Exception thrown when avatar URL return an invalid image type for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#, php-format
-msgid "Wrong image type for avatar URL \"%s\"."
-msgstr "Погрешен тип на �лика за аватарот �о URL „%s“."
-
-#. TRANS: Title for profile design page.
-#. TRANS: Page title for profile design page.
-msgid "Profile design"
-msgstr "Изглед на профилот"
-
-#. TRANS: Instructions for Profile design page.
-#. TRANS: Instructions for profile design page.
-msgid ""
-"Customize the way your profile looks with a background image and a colour "
-"palette of your choice."
-msgstr ""
-"Прилагодете го изгледот на Вашиот профил, �о позадин�ка �лика и палета од "
-"бои по Ваш избор."
-
-#. TRANS: Succes message on Profile design page when finding an easter egg.
-msgid "Enjoy your hotdog!"
-msgstr "Добар апетит!"
-
-#. TRANS: Form legend on Profile design page.
-msgid "Design settings"
-msgstr "�агодувања на изгледот"
-
-#. TRANS: Checkbox label on Profile design page.
-msgid "View profile designs"
-msgstr "Види изгледи на профилот"
-
-#. TRANS: Title for checkbox on Profile design page.
-msgid "Show or hide profile designs."
-msgstr "Прикажи или �криј изгледи на профилот."
-
-#. TRANS: Form legend on Profile design page for form to choose a background image.
-msgid "Background file"
-msgstr "Податотека за позадината"
-
 #. TRANS: Page title for all but the first page of groups for a user.
 #. TRANS: %1$s is a nickname, %2$d is a page number.
 #, php-format
@@ -6631,11 +6188,11 @@ msgstr "StatusNet %s"
 #. TRANS: %1$s is the engine name (StatusNet) and %2$s is the StatusNet version.
 #, php-format
 msgid ""
-"This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, "
+"This site is powered by %1$s version %2$s, Copyright 2008-2011 StatusNet, "
 "Inc. and contributors."
 msgstr ""
-"Ова мрежно ме�то работи на %1$s верзија %2$s, �втор�ки права 2008-2010 "
-"StatusNet, Inc. и уче�ници."
+"Ова мрежно ме�то работи на %1$s верзија %2$s, �втор�ки права 2008-2011 "
+"StatusNet, Inc. и уче�ниците."
 
 #. TRANS: Header for StatusNet contributors section on the version page.
 msgid "Contributors"
@@ -6650,24 +6207,24 @@ msgid ""
 "StatusNet is free software: you can redistribute it and/or modify it under "
 "the terms of the GNU Affero General Public License as published by the Free "
 "Software Foundation, either version 3 of the License, or (at your option) "
-"any later version. "
+"any later version."
 msgstr ""
-"StatusNet е �лободен програм: можете да го реди�трибуирате и/или менувате "
+"StatusNet е �лободен програм: можете да го ра�про�транувате и/или менувате "
 "под у�ловите на Општата јавна лиценца Г�У �феро �поред одредбите на "
-"Фондацијата за �лободна програм�ка опрема, верзија 3 на лиценцата, или (по "
-"Ваш избор) било која подоцнежна верзија. "
+"Фондацијата за �лободна програм�ка опрема, верзија 3 на Лиценцата, или (по "
+"Ваш избор) било која понова верзија."
 
 #. TRANS: Content part of StatusNet version page.
 msgid ""
 "This program is distributed in the hope that it will be useful, but WITHOUT "
 "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
 "FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License "
-"for more details. "
+"for more details."
 msgstr ""
-"Овој програм е ди�трибуиран �о надеж дека ќе биде од кори�т, но БЕЗ БИЛО "
+"Овој програм �е ра�про�транува �о надеж дека ќе биде од кори�т, но БЕЗ БИЛО "
 "К�КВ� Г�Р��ЦИЈ�; дури и без подразбирливата гаранција за П�З�Р�� ПРОД�Ж�ОСТ "
-"или ПОГОД�ОСТ З� ОПРЕДЕЛЕ�� ЦЕЛ.  Погледајте ја Општата јавна лиценца Г�У "
-"�феро за повеќе подробно�ти. "
+"или ПОГОД�ОСТ З� ОПРЕДЕЛЕ�� ЦЕЛ. Погледајте ја Општата јавна лиценца Г�У "
+"�феро за повеќе подробно�ти."
 
 #. TRANS: Content part of StatusNet version page.
 #. TRANS: %s is a link to the AGPL license with link description "http://www.gnu.org/licenses/agpl.html".
@@ -6722,22 +6279,32 @@ msgstr "�е можам да ја обработам URL-адре�ата „%s
 msgid "Robin thinks something is impossible."
 msgstr "Робин ми�ли дека нешто е невозможно."
 
+#. TRANS: Message used to be inserted as %2$s in  the text "No file may
+#. TRANS: be larger than %1$d byte and the file you sent was %2$s.".
+#. TRANS: %1$d is the number of bytes of an uploaded file.
+#, php-format
+msgid "%1$d byte"
+msgid_plural "%1$d bytes"
+msgstr[0] "%1$d бајт"
+msgstr[1] "%1$d бајти"
+
 #. TRANS: Message given if an upload is larger than the configured maximum.
-#. TRANS: %1$d is the byte limit for uploads, %2$d is the byte count for the uploaded file.
-#. TRANS: %1$s is used for plural.
+#. TRANS: %1$d (used for plural) is the byte limit for uploads,
+#. TRANS: %2$s is the proper form of "n bytes". This is the only ways to have
+#. TRANS: gettext support multiple plurals in the same message, unfortunately...
 #, php-format
 msgid ""
-"No file may be larger than %1$d byte and the file you sent was %2$d bytes. "
-"Try to upload a smaller version."
+"No file may be larger than %1$d byte and the file you sent was %2$s. Try to "
+"upload a smaller version."
 msgid_plural ""
-"No file may be larger than %1$d bytes and the file you sent was %2$d bytes. "
-"Try to upload a smaller version."
+"No file may be larger than %1$d bytes and the file you sent was %2$s. Try to "
+"upload a smaller version."
 msgstr[0] ""
 "Податотеките не �меат да бидат поголеми од %1$d бајт, а вие и�пративте "
-"податотека од %2$d бајти. Подигнете помала верзија."
+"податотека од %2$s бајти. Подигнете помала верзија."
 msgstr[1] ""
 "Податотеките не �меат да бидат поголеми од %1$d бајти, а вие и�пративте "
-"податотека од %2$d бајти. Подигнете помала верзија."
+"податотека од %2$s бајти. Подигнете помала верзија."
 
 #. TRANS: Message given if an upload would exceed user quota.
 #. TRANS: %d (number) is the user quota in bytes and is used for plural.
@@ -6808,6 +6375,11 @@ msgstr "�е можев да ја подновам локалната група
 msgid "Could not create login token for %s"
 msgstr "�е можам да �оздадам најавен жетон за"
 
+#. TRANS: Exception thrown when a program code class (%s) cannot be instantiated.
+#, php-format
+msgid "Cannot instantiate class %s."
+msgstr "�е можам да ја опримерочам кла�ата %s."
+
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.
 msgid "No database name or DSN found anywhere."
 msgstr "�икаде не е пронајдено име на базата или DSN."
@@ -6968,7 +6540,7 @@ msgstr ""
 #, php-format
 msgid ""
 "You already have %1$d or more people in list %2$s, which is the maximum "
-"allowed number.Try unlisting others first."
+"allowed number. Try unlisting others first."
 msgstr ""
 "Веќе имате %1$d или повеќе луѓе во �пи�окот %2$s, што прет�тавува "
 "мак�ималниот дозволен број. �ајпрвин от�транете некои други од �пи�окот."
@@ -6990,7 +6562,6 @@ msgid "Unable to save tag."
 msgstr "�е можам да ја зачувам ознаката."
 
 #. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
-#. TRANS: Error message displayed to a banned user when they try to subscribe.
 msgid "You have been banned from subscribing."
 msgstr "Блокирани �те од претплаќање."
 
@@ -7010,10 +6581,6 @@ msgstr "�е �те ни претплатени!"
 msgid "Could not delete self-subscription."
 msgstr "�е можам да ја избришам �амопретплатата."
 
-#. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
-msgid "Could not delete subscription OMB token."
-msgstr "�е можам да го избришам OMB-жетонот за претплата."
-
 #. TRANS: Exception thrown when a subscription could not be deleted on the server.
 msgid "Could not delete subscription."
 msgstr "�е можам да ја избришам претплатата."
@@ -7047,6 +6614,18 @@ msgstr "�е е зададен кори�ник за еднокори�ничк
 msgid "Single-user mode code called when not enabled."
 msgstr "Повикан е еднокори�нички режим, но не е овозможен."
 
+#. TRANS: Information on password recovery form if no known username or e-mail address was specified.
+msgid "No user with that email address or username."
+msgstr "�ема кори�ник �о таа е-поштен�ка адре�а или кори�ничко име."
+
+#. TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.
+msgid "No registered email address for that user."
+msgstr "�ема реги�трирана адре�а за е-пошта за тој кори�ник."
+
+#. TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.
+msgid "Error saving address confirmation."
+msgstr "Грешка при зачувувањето на потврдата за адре�а."
+
 #. TRANS: Server exception thrown when creating a group failed.
 msgid "Could not create group."
 msgstr "�е можев да ја �оздадам групата."
@@ -7164,7 +6743,7 @@ msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
 "broughtby%%](%%site.broughtbyurl%%)."
 msgstr ""
-"**%%site.name%%** е у�луга за микроблогирање обозможена од [%%site.broughtby%"
+"**%%site.name%%** е у�луга за микроблогирање овозможена од [%%site.broughtby%"
 "%](%%site.broughtbyurl%%)."
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
@@ -7315,25 +6894,11 @@ msgstr "showForm() не е имплементирано."
 msgid "saveSettings() not implemented."
 msgstr "saveSettings() не е имплементирано."
 
-#. TRANS: Client error message thrown if design settings could not be deleted in
-#. TRANS: the admin panel Design.
-msgid "Unable to delete design setting."
-msgstr "�е можам да ги избришам нагодувањата за изглед."
-
 #. TRANS: Header in administrator navigation panel.
-#. TRANS: Header in settings navigation panel.
 msgctxt "HEADER"
 msgid "Home"
 msgstr "Почетна"
 
-#. TRANS: Menu item in administrator navigation panel.
-#. TRANS: Menu item in default local navigation panel.
-#. TRANS: Menu item in personal group navigation menu.
-#. TRANS: Menu item in settings navigation panel.
-msgctxt "MENU"
-msgid "Home"
-msgstr "Почетна"
-
 #. TRANS: Header in administrator navigation panel.
 msgctxt "HEADER"
 msgid "Admin"
@@ -7348,17 +6913,6 @@ msgctxt "MENU"
 msgid "Site"
 msgstr "Мреж. ме�то"
 
-#. TRANS: Menu item title in administrator navigation panel.
-msgid "Design configuration"
-msgstr "По�тавки на изгледот"
-
-#. TRANS: Menu item in administrator navigation panel.
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: Menu item in settings navigation panel.
-msgctxt "MENU"
-msgid "Design"
-msgstr "Изглед"
-
 #. TRANS: Menu item title in administrator navigation panel.
 msgid "User configuration"
 msgstr "Кори�нички по�тавки"
@@ -7458,42 +7012,6 @@ msgstr "�ема кори�ник за тој жетон."
 msgid "Could not authenticate you."
 msgstr "�е можевме да Ве потврдиме."
 
-#. TRANS: Server error displayed when trying to create an anynymous OAuth consumer.
-msgid "Could not create anonymous consumer."
-msgstr "�е можев да �оздадам анонимен потрошувач."
-
-#. TRANS: Server error displayed when trying to create an anynymous OAuth application.
-msgid "Could not create anonymous OAuth application."
-msgstr "�е можев да �оздадам анонимен OAuth-програм."
-
-#. TRANS: Exception thrown when no token association could be found.
-msgid ""
-"Could not find a profile and application associated with the request token."
-msgstr "�е можев да пронајдам профил и програм поврзан �о жетонот за барање."
-
-#. TRANS: Exception thrown when no access token can be issued.
-msgid "Could not issue access token."
-msgstr "�е можев да го издадам жетонот за при�тап."
-
-#. TRANS: Exception thrown when a database error occurs.
-msgid "Database error inserting OAuth application user."
-msgstr ""
-"Грешка во базата на податоци при вметнувањето на кори�никот на OAuth-"
-"програмот."
-
-#. TRANS: Exception thrown when a database error occurs.
-msgid "Database error updating OAuth application user."
-msgstr ""
-"Грешка во базата на податоци при подновата на кори�никот на OAuth-програмот."
-
-#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
-msgid "Tried to revoke unknown token."
-msgstr "Се обидовте да отповикате непознат жетон."
-
-#. TRANS: Exception thrown when an attempt is made to remove a revoked token.
-msgid "Failed to delete revoked token."
-msgstr "�е у�пеав да го избришам отповиканиот жетон."
-
 #. TRANS: Form input field label for application icon.
 msgid "Icon"
 msgstr "Икона"
@@ -7575,13 +7093,12 @@ msgstr ""
 "О�новно-зададен при�тап за овој програм: �амо читање, или читање-пишување"
 
 #. TRANS: Submit button title.
-msgid "Cancel"
-msgstr "Откажи"
+msgid "Cancel application changes."
+msgstr "Откажи измени во прилогот."
 
 #. TRANS: Submit button title.
-#. TRANS: Button text to save a list.
-msgid "Save"
-msgstr "Зачувај"
+msgid "Save application changes."
+msgstr "Зачувај измени во прилогот."
 
 #. TRANS: Name for an anonymous application in application list.
 msgid "Unknown application"
@@ -7616,6 +7133,18 @@ msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "Одземи"
 
+#. TRANS: Submit button text to accept a group membership request on approve group form.
+#. TRANS: Submit button text to accept a subscription request on approve sub form.
+msgctxt "BUTTON"
+msgid "Accept"
+msgstr "Прифати"
+
+#. TRANS: Submit button text to reject a group membership request on approve group form.
+#. TRANS: Submit button text to reject a subscription request on approve sub form.
+msgctxt "BUTTON"
+msgid "Reject"
+msgstr "Одбиј"
+
 #. TRANS: Atom feed exception thrown when an author element does not contain a name element.
 msgid "Author element must contain a name element."
 msgstr "�втор�киот елемент мора да �одржи елемент за име."
@@ -7767,8 +7296,8 @@ msgstr "Грешка при означувањето на %1$s: %2$s"
 #, php-format
 msgid "%1$s was tagged %2$s"
 msgid_plural "%1$s was tagged %2$s"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%1$s беше означен(а) �о %2$s"
+msgstr[1] "%1$s беше означен(а) �о %2$s"
 
 #. TRANS: Separator for list of tags.
 #. TRANS: Separator in list of user names like "Jim, Bob, Mary".
@@ -7855,7 +7384,7 @@ msgstr "�е можете да и�пратите порака до овојо 
 
 #. TRANS: Error text shown sending a direct message fails with an unknown reason.
 msgid "Error sending direct message."
-msgstr "Грашка при и�паќањето на директната порака."
+msgstr "Грашка при и�паќањето на непо�редната порака."
 
 #. TRANS: Message given having repeated a notice from another user.
 #. TRANS: %s is the name of the user for which the notice was repeated.
@@ -8167,6 +7696,11 @@ msgstr "Препорачуваме да го пуштите ин�талатер
 msgid "Go to the installer."
 msgstr "Оди на ин�талаторот."
 
+#. TRANS: Header on conversation page. Hidden by default (h2).
+#. TRANS: Label for user statistics.
+msgid "Notices"
+msgstr "Забелешки"
+
 #. TRANS: Page title for when a database error occurs.
 msgid "Database error"
 msgstr "Грешка во базата на податоци"
@@ -8177,13 +7711,6 @@ msgctxt "MENU"
 msgid "Public"
 msgstr "Јавна"
 
-#. TRANS: Menu item in default local navigation panel.
-#. TRANS: Menu item in search group navigation panel.
-#. TRANS: Menu item in local navigation menu.
-msgctxt "MENU"
-msgid "Groups"
-msgstr "Групи"
-
 #. TRANS: Menu item in default local navigation panel.
 #. TRANS: Menu item title in local navigation menu.
 msgctxt "MENU"
@@ -8199,51 +7726,12 @@ msgstr "Избриши"
 msgid "Delete this user"
 msgstr "Избриши овој кори�ник"
 
-#. TRANS: Form legend of form for changing the page design.
-msgid "Change design"
-msgstr "Измени изглед"
-
-#. TRANS: Fieldset legend on profile design page to change profile page colours.
-msgid "Change colours"
-msgstr "Промена на бои"
-
-#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-msgid "Use defaults"
-msgstr "Кори�ти по о�новно"
-
-#. TRANS: Label in form on profile design page.
-#. TRANS: Field contains file name on user's computer that could be that user's custom profile background image.
-msgid "Upload file"
-msgstr "Подигање"
-
-#. TRANS: Instructions for form on profile design page.
-msgid ""
-"You can upload your personal background image. The maximum file size is 2MB."
-msgstr ""
-"Можете да подигнете лична позадин�ка �лика. Мак�ималната дозволена големина "
-"изне�ува 2МБ."
-
-#. TRANS: Radio button on profile design page that will enable use of the uploaded profile image.
-msgctxt "RADIO"
-msgid "On"
-msgstr "Вкл."
-
-#. TRANS: Radio button on profile design page that will disable use of the uploaded profile image.
-msgctxt "RADIO"
-msgid "Off"
-msgstr "И�кл."
-
-#. TRANS: Success message displayed if design settings were saved after clicking "Use defaults".
-msgid "Design defaults restored."
-msgstr "О�новно-зададениот изглед е вратен."
-
 #. TRANS: Exception. %s is an ID.
 #, php-format
 msgid "Unable to find services for %s."
 msgstr "�е можам да пронајдам �лужби за: %s."
 
 #. TRANS: Form legend for removing the favourite status for a favourite notice.
-#. TRANS: Title for button text for removing the favourite status for a favourite notice.
 msgid "Disfavor this notice"
 msgstr "Одбенди�ај ја забелешкава"
 
@@ -8252,8 +7740,11 @@ msgctxt "BUTTON"
 msgid "Disfavor favorite"
 msgstr "Тргни од бенди�ани"
 
+#. TRANS: Button title for removing the favourite status for a favourite notice.
+msgid "Remove this notice from your list of favorite notices."
+msgstr "От�трани ја забелешкава од бенди�ани."
+
 #. TRANS: Form legend for adding the favourite status to a notice.
-#. TRANS: Title for button text for adding the favourite status to a notice.
 msgid "Favor this notice"
 msgstr "Бенди�ај ја забелешкава"
 
@@ -8262,6 +7753,10 @@ msgctxt "BUTTON"
 msgid "Favor"
 msgstr "Бенди�ај"
 
+#. TRANS: Button title for adding the favourite status to a notice.
+msgid "Add this notice to your list of favorite notices."
+msgstr "Додај ја забелешкава во бенди�аните."
+
 #. TRANS: Feed type name.
 msgid "RSS 1.0"
 msgstr "RSS 1.0"
@@ -8278,6 +7773,10 @@ msgstr "Atom"
 msgid "FOAF"
 msgstr "FOAF"
 
+#. TRANS: Feed type name. See http://activitystrea.ms/
+msgid "Activity Streams"
+msgstr "Activity Streams"
+
 #. TRANS: Client exception thrown when an imported feed does not have an author.
 msgid "No author in the feed."
 msgstr "�ема автор во емитувањето."
@@ -8309,6 +7808,27 @@ msgstr "Одберете ознака за да го ограничите �пи
 msgid "Grant this user the \"%s\" role"
 msgstr "Додели улога „%s“ на кори�ников"
 
+#. TRANS: Header for mini list of group members on a group page (h2).
+msgid "Members"
+msgstr "Членови"
+
+#. TRANS: Link to all group members from mini list of group members if group has more than n members.
+msgid "All members"
+msgstr "Сите членови"
+
+#. TRANS: Header for mini list of users with a pending membership request on a group page (h2).
+msgid "Pending"
+msgstr "Во и�чекување"
+
+#. TRANS: Header for mini list of users that are blocked in a group page (h2).
+msgid "Blocked"
+msgstr "Блокирани"
+
+#. TRANS: Title for list of group administrators on a group page.
+msgctxt "TITLE"
+msgid "Admins"
+msgstr "�дмини�тратори"
+
 #. TRANS: Button text for the form that will block a user from a group.
 msgctxt "BUTTON"
 msgid "Block"
@@ -8316,8 +7836,8 @@ msgstr "Блокирај"
 
 #. TRANS: Submit button title.
 msgctxt "TOOLTIP"
-msgid "Block this user"
-msgstr "Блокирај го кори�ников"
+msgid "Block this user so that they can no longer post messages to it."
+msgstr "Блокирај го кори�ников за повеќе да не може да и�праќа пораки."
 
 #. TRANS: Field title on group edit form.
 msgid "URL of the homepage or blog of the group or topic."
@@ -8373,63 +7893,9 @@ msgctxt "GROUPADMIN"
 msgid "Admin"
 msgstr "�дмини�тратор"
 
-#. TRANS: Menu item in the group navigation page.
-msgctxt "MENU"
-msgid "Group"
-msgstr "Група"
-
-#. TRANS: Tooltip for menu item in the group navigation page.
-#. TRANS: %s is the nickname of the group.
-#, php-format
-msgctxt "TOOLTIP"
-msgid "%s group"
-msgstr "Група „%s“"
-
-#. TRANS: Menu item in the group navigation page.
-msgctxt "MENU"
-msgid "Members"
-msgstr "Членови"
-
-#. TRANS: Tooltip for menu item in the group navigation page.
-#. TRANS: %s is the nickname of the group.
-#, php-format
-msgctxt "TOOLTIP"
-msgid "%s group members"
-msgstr "Членови на групата „%s“"
-
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: %d is the number of pending members.
-#, php-format
-msgctxt "MENU"
-msgid "Pending members (%d)"
-msgid_plural "Pending members (%d)"
-msgstr[0] "Член во и�чекување (%d)"
-msgstr[1] "Членови во и�чекување (%d)"
-
-#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: %s is the nickname of the group.
-#, php-format
-msgctxt "TOOLTIP"
-msgid "%s pending members"
-msgstr "Кори�ници во и�чекување на одобрение за члн�тво во групата %s"
-
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-msgctxt "MENU"
-msgid "Blocked"
-msgstr "Блокирани"
-
-#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: %s is the nickname of the group.
-#, php-format
-msgctxt "TOOLTIP"
-msgid "%s blocked users"
-msgstr "Блокирани кори�ници од групата „%s“"
-
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: Menu item in primary navigation panel.
-msgctxt "MENU"
-msgid "Admin"
-msgstr "�дмин"
+#. TRANS: Group actions header (h2). Text hidden by default.
+msgid "Group actions"
+msgstr "Групни деј�тва"
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
@@ -8438,11 +7904,6 @@ msgctxt "TOOLTIP"
 msgid "Edit %s group properties"
 msgstr "Уредување на �вој�тва на групата „%s“"
 
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-msgctxt "MENU"
-msgid "Logo"
-msgstr "Лого"
-
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
 #, php-format
@@ -8450,16 +7911,10 @@ msgctxt "TOOLTIP"
 msgid "Add or edit %s logo"
 msgstr "Додавање или уредување на лого на групата „%s “"
 
-#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: %s is the nickname of the group.
-#, php-format
-msgctxt "TOOLTIP"
-msgid "Add or edit %s design"
-msgstr "Додавање или уредување на изгледот на групата „%s“"
-
-#. TRANS: Group actions header (h2). Text hidden by default.
-msgid "Group actions"
-msgstr "Групни деј�тва"
+#. TRANS: Link text for link on user profile.
+msgctxt "MENU"
+msgid "Logo"
+msgstr "Лого"
 
 #. TRANS: Title for groups with the most members section.
 msgid "Popular groups"
@@ -8469,11 +7924,19 @@ msgstr "Популарни групи"
 msgid "Active groups"
 msgstr "�ктивни групи"
 
-#. TRANS: Title for group tag cloud section.
-#. TRANS: %s is a group name.
-#, php-format
-msgid "Tags in %s group's notices"
-msgstr "Ознаки во забелешките на групата %s"
+#. TRANS: Link description for seeing all groups.
+#. TRANS: Link description for seeing all lists.
+msgid "See all"
+msgstr "Сите"
+
+#. TRANS: Link title for seeing all groups.
+msgid "See all groups you belong to."
+msgstr "Сите групи кајшто членувате."
+
+#. TRANS: Menu item title in personal group navigation menu.
+#. TRANS: %s is a username.
+msgid "Back to top"
+msgstr "�ајгоре"
 
 #. TRANS: Client exception 406
 msgid "This page is not available in a media type you accept"
@@ -8564,11 +8027,41 @@ msgctxt "TITLE"
 msgid "Trends"
 msgstr "Трендови"
 
-#. TRANS: Button text for inviting more users to the StatusNet instance.
+#. TRANS: Default button text for inviting more users to the StatusNet instance.
 msgctxt "BUTTON"
 msgid "Invite more colleagues"
 msgstr "Покани уште колеги"
 
+#. TRANS: Form legend.
+msgid "Invite collegues"
+msgstr "Покани колеги"
+
+#. TRANS: Field label for a list of e-mail addresses.
+msgid "Email addresses"
+msgstr "Е-поштен�ки адре�и"
+
+#. TRANS: Field title for a list of e-mail addresses.
+msgid "Addresses of friends to invite (one per line)."
+msgstr "�дре�и на пријателите што ги каните (по една во �екој ред)."
+
+#. TRANS: Field label for a personal message to send to invitees.
+msgid "Personal message"
+msgstr "Лична порака"
+
+#. TRANS: Field title for a personal message to send to invitees.
+msgid "Optionally add a personal message to the invitation."
+msgstr "Можете да додадете и лична порака во поканата."
+
+#. TRANS: Send button for inviting friends
+#. TRANS: Button text for sending notice.
+msgctxt "BUTTON"
+msgid "Send"
+msgstr "Објави"
+
+#. TRANS: Submit button title.
+msgid "Send invitations."
+msgstr "И�прати покани."
+
 #. TRANS: Button text for joining a group.
 msgctxt "BUTTON"
 msgid "Join"
@@ -8579,6 +8072,10 @@ msgctxt "BUTTON"
 msgid "Leave"
 msgstr "�апушти"
 
+#. TRANS: Link title for seeing all lists.
+msgid "See all lists you have created."
+msgstr "Сите �пи�оци што ги имате �оздадено."
+
 #. TRANS: Menu item for logging in to the StatusNet site.
 #. TRANS: Menu item in primary navigation panel.
 msgctxt "MENU"
@@ -8639,8 +8136,8 @@ msgstr ""
 #. TRANS: Main body of new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscriber's long name, %2$s is the StatusNet sitename.
 #, php-format
-msgid "%1$s is now listening to your notices on %2$s."
-msgstr "%1$s �ега ги �леди Вашите забелешки на %2$s."
+msgid "%1$s is now following you on %2$s."
+msgstr "%1$s �ега Ве �леди на %2$s."
 
 #. TRANS: Subject of pending new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscribing user's nickname, %2$s is the StatusNet sitename.
@@ -8863,7 +8360,7 @@ msgstr "%1$s (@%2$s) Ви и�прати забелешка што �ака да
 #. TRANS: Body of @-reply notification e-mail.
 #. TRANS: %1$s is the sending user's name, $2$s is the StatusNet sitename,
 #. TRANS: %3$s is a URL to the notice, %4$s is the notice text,
-#. TRANS: %5$s is a URL to the full conversion if it exists (otherwise empty),
+#. TRANS: %5$s is the text "The full conversation can be read here:" and a URL to the full conversion if it exists (otherwise empty),
 #. TRANS: %6$s is a URL to reply to the notice, %7$s is a URL to all @-replies for the addressed user,
 #, php-format
 msgid ""
@@ -8905,6 +8402,10 @@ msgstr ""
 
 #. TRANS: Subject of group join notification e-mail.
 #. TRANS: %1$s is the joining user's nickname, %2$s is the group name, and %3$s is the StatusNet sitename.
+#, php-format
+msgid "%1$s has joined your group %2$s on %3$s"
+msgstr "%1$s �е зачлени во Вашата група %2$s на %3$s."
+
 #. TRANS: Main body of group join notification e-mail.
 #. TRANS: %1$s is the subscriber's long name, %2$s is the group name, and %3$s is the StatusNet sitename,
 #. TRANS: %4$s is a block of profile info about the subscriber.
@@ -8994,8 +8495,8 @@ msgstr "�азначи за админи�тратор"
 
 #. TRANS: Submit button title.
 msgctxt "TOOLTIP"
-msgid "Make this user an admin"
-msgstr "�азначи го кори�ников за админи�тратор"
+msgid "Make this user an admin."
+msgstr "�азначи го кори�ников за админи�тратор."
 
 #. TRANS: Client exception thrown when a database error was thrown during a file upload operation.
 msgid "There was a database error while saving your file. Please try again."
@@ -9036,7 +8537,7 @@ msgstr "„%s„ не е поддржан податотечен тип на о
 
 #. TRANS: Form legend for direct notice.
 msgid "Send a direct notice"
-msgstr "И�прати директна забелешка"
+msgstr "И�прати непо�редна забелешка"
 
 #. TRANS: Label entry in drop-down selection box in direct-message inbox/outbox.
 #. TRANS: This is the default entry in the drop-down box, doubling as instructions
@@ -9044,7 +8545,7 @@ msgstr "И�прати директна забелешка"
 msgid "Select recipient:"
 msgstr "Оберете примач:"
 
-#. TRANS Entry in drop-down selection box in direct-message inbox/outbox when no one is available to message.
+#. TRANS: Entry in drop-down selection box in direct-message inbox/outbox when no one is available to message.
 msgid "No mutual subscribers."
 msgstr "�ема заемни претплатници."
 
@@ -9055,7 +8556,7 @@ msgstr "За"
 #. TRANS: Button text for sending a direct notice.
 msgctxt "Send button for sending notice"
 msgid "Send"
-msgstr "И�прати"
+msgstr "Објави"
 
 #. TRANS: Header in message list.
 msgid "Messages"
@@ -9111,6 +8612,10 @@ msgstr "�е знам како да работам �о ваква одредн
 msgid "You must implement either adaptNoticeListItem() or showNotice()."
 msgstr "Мора да го �проведете или adaptNoticeListItem() или showNotice()."
 
+#. TRANS: Link description to show more items in a list.
+msgid "More â–¼"
+msgstr "Повеќе ▼"
+
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 msgid "Nickname cannot be empty."
 msgstr "Прекарот не може да �тои празен."
@@ -9160,10 +8665,6 @@ msgctxt "SEPARATOR"
 msgid ", "
 msgstr ", "
 
-#. TRANS: Start of profile addressees list.
-msgid " â–¸ "
-msgstr " â–¸ "
-
 #. TRANS: Used in coordinates as abbreviation of north.
 msgid "N"
 msgstr "С"
@@ -9202,16 +8703,16 @@ msgid "Repeated by"
 msgstr "Повторено од"
 
 #. TRANS: Link title in notice list item to reply to a notice.
-msgid "Reply to this notice"
-msgstr "Одговори на забелешкава"
+msgid "Reply to this notice."
+msgstr "Одговори на забелешкава."
 
 #. TRANS: Link text in notice list item to reply to a notice.
 msgid "Reply"
 msgstr "Одговор"
 
 #. TRANS: Link title in notice list item to delete a notice.
-msgid "Delete this notice"
-msgstr "Избриши ја оваа забелешка"
+msgid "Delete this notice from the timeline."
+msgstr "Избриши ја забелешкава од хронологијата."
 
 #. TRANS: Title for repeat form status in notice list when a notice has been repeated.
 msgid "Notice repeated."
@@ -9234,26 +8735,6 @@ msgstr "Подбоцни"
 msgid "Send a nudge to this user."
 msgstr "Подбоцни го кори�ников."
 
-#. TRANS: Exception thrown when creating a new profile fails in OAuth store.
-msgid "Error inserting new profile."
-msgstr "Грешка при вметнувањето на новиот профил."
-
-#. TRANS: Exception thrown when creating a new avatar fails in OAuth store.
-msgid "Error inserting avatar."
-msgstr "Грешка при вметнувањето на аватарот."
-
-#. TRANS: Exception thrown when creating a remote profile fails in OAuth store.
-msgid "Error inserting remote profile."
-msgstr "Грешка при вметнувањето на далечин�киот профил."
-
-#. TRANS: Exception thrown when a notice is denied because it has been sent before.
-msgid "Duplicate notice."
-msgstr "Дуплирана забелешка."
-
-#. TRANS: Exception thrown when creating a new subscription fails in OAuth store.
-msgid "Could not insert new subscription."
-msgstr "�е можев да вне�ам нова претплата."
-
 #. TRANS: Server exception thrown in oEmbed action if no API endpoint is available.
 msgid "No oEmbed API endpoint available."
 msgstr "�ема до�тапна крајна точка за oEmbed API."
@@ -9331,10 +8812,6 @@ msgstr "Уреди"
 msgid "Edit %s list by you."
 msgstr "Уредете го Вашиот �пи�ок %s."
 
-#. TRANS: Link description for link to list of users tagged with a tag.
-msgid "Tagged"
-msgstr "Означени"
-
 #. TRANS: Title for link to edit list settings.
 msgid "Edit list settings."
 msgstr "Уреди нагодувања за �пи�оци."
@@ -9477,9 +8954,12 @@ msgctxt "plugin"
 msgid "Enable"
 msgstr "Овозможи"
 
+#. TRANS: Plugin description for a disabled plugin.
 msgctxt "plugin-description"
-msgid "(Plugin descriptions unavailable when disabled.)"
-msgstr "(Опи�ите на приклучоците не �е до�тапни ако е оневозможено.)"
+msgid ""
+"(The plugin description is unavailable when a plugin has been disabled.)"
+msgstr ""
+"(Опи�от на еден приклучок е недо�тапен кога приклучокот е оневозможен.)"
 
 #. TRANS: Menu item in primary navigation panel.
 msgctxt "MENU"
@@ -9490,6 +8970,11 @@ msgstr "�агодувања"
 msgid "Change your personal settings."
 msgstr "Измена на лични по�тавки."
 
+#. TRANS: Menu item in primary navigation panel.
+msgctxt "MENU"
+msgid "Admin"
+msgstr "�дмин"
+
 #. TRANS: Menu item title in primary navigation panel.
 msgid "Site configuration."
 msgstr "По�тавки на мрежното ме�то."
@@ -9507,14 +8992,8 @@ msgstr "Одјава од мрежното ме�то."
 msgid "Login to the site."
 msgstr "�ајава на мрежното ме�то."
 
-#. TRANS: Menu item in primary navigation panel.
-msgctxt "MENU"
-msgid "Search"
-msgstr "Барај"
-
-#. TRANS: Menu item title in primary navigation panel.
-msgid "Search the site."
-msgstr "Пребарај по мрежното ме�то."
+msgid "This profile has been silenced by site moderators"
+msgstr "Овој кори�ник е замолчен од модераторите"
 
 #. TRANS: H2 text for user subscription statistics.
 msgid "Following"
@@ -9524,18 +9003,18 @@ msgstr "Следи"
 msgid "Followers"
 msgstr "Следбеници"
 
+#. TRANS: H2 text for user statistics.
+msgid "Statistics"
+msgstr "Стати�тики"
+
 #. TRANS: Label for user statistics.
 msgid "User ID"
-msgstr "Кори�нички ID"
+msgstr "Кори�ничка назнака"
 
 #. TRANS: Label for user statistics.
 msgid "Member since"
 msgstr "Член од"
 
-#. TRANS: Label for user statistics.
-msgid "Notices"
-msgstr "Забелешки"
-
 #. TRANS: Label for user statistics.
 #. TRANS: Average count of posts made per day since account registration.
 msgid "Daily average"
@@ -9569,7 +9048,7 @@ msgstr "Скорешни ознаки"
 #. TRANS: Menu item in search group navigation panel.
 msgctxt "MENU"
 msgid "Featured"
-msgstr "Избрани"
+msgstr "И�такнати"
 
 #. TRANS: Menu item in search group navigation panel.
 msgctxt "MENU"
@@ -9621,13 +9100,13 @@ msgid "Keyword(s)"
 msgstr "Клучен збор"
 
 #. TRANS: Button text for searching site.
+#. TRANS: Button text for search button on search form.
 #. TRANS: Button text to search profiles.
 msgctxt "BUTTON"
 msgid "Search"
 msgstr "Пребарај"
 
 #. TRANS: Standard search suggestions shown when a search does not give any results.
-#, fuzzy
 msgid ""
 "* Make sure all words are spelled correctly.\n"
 "* Try different keywords.\n"
@@ -9637,10 +9116,10 @@ msgstr ""
 "* Проверете дали �ите зборови �е напишани како што треба.\n"
 "* Обидете �е �о други клучни зборови.\n"
 "* Обидете �е �о поопшти клучни зборови.\n"
-"* Обидете �е помалку клучни зборови.\n"
+"* Обидете �е помалку клучни зборови."
 
 #. TRANS: Standard search suggestions shown when a search does not give any results.
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "You can also try your search on other engines:\n"
 "\n"
@@ -9658,7 +9137,7 @@ msgstr ""
 "* [Tweet scan](http://www.tweetscan.com/indexi.php?s=%s)\n"
 "* [Google](http://www.google.com/search?q=site%%3A%%%%site.server%%%%+%s)\n"
 "* [Yahoo](http://search.yahoo.com/search?p=site%%3A%%%%site.server%%%%+%s)\n"
-"* [Collecta](http://collecta.com/#q=%s)\n"
+"* [Collecta](http://collecta.com/#q=%s)"
 
 #. TRANS: Menu item in search group navigation panel.
 msgctxt "MENU"
@@ -9682,21 +9161,6 @@ msgstr "Пронајдете �одржини на забелешките"
 msgid "Find groups on this site"
 msgstr "Пронајдете групи на ова мрежно ме�то"
 
-#. TRANS: Secondary navigation menu item leading to help on StatusNet.
-msgctxt "MENU"
-msgid "Help"
-msgstr "Помош"
-
-#. TRANS: Secondary navigation menu item leading to text about StatusNet site.
-msgctxt "MENU"
-msgid "About"
-msgstr "За на�"
-
-#. TRANS: Secondary navigation menu item leading to Frequently Asked Questions.
-msgctxt "MENU"
-msgid "FAQ"
-msgstr "ЧПП"
-
 #. TRANS: Secondary navigation menu item leading to Terms of Service.
 msgctxt "MENU"
 msgid "TOS"
@@ -9717,17 +9181,6 @@ msgctxt "MENU"
 msgid "Version"
 msgstr "Верзија"
 
-#. TRANS: Secondary navigation menu item leading to e-mail contact information on the
-#. TRANS: StatusNet site, where to report bugs, ...
-msgctxt "MENU"
-msgid "Contact"
-msgstr "Контакт"
-
-#. TRANS: Secondary navigation menu item. Leads to information about embedding a timeline widget.
-msgctxt "MENU"
-msgid "Badge"
-msgstr "Значка"
-
 #. TRANS: Default title for section/sidebar widget.
 msgid "Untitled section"
 msgstr "Заглавие без на�лов"
@@ -9772,10 +9225,6 @@ msgstr "Е-пошта"
 msgid "Change email handling"
 msgstr "Смени ракување �о е-пошта"
 
-#. TRANS: Menu item title in settings navigation panel.
-msgid "Design your profile"
-msgstr "�аме�тете изглед на Вашиот профил"
-
 #. TRANS: Menu item in settings navigation panel.
 msgctxt "MENU"
 msgid "URL"
@@ -9788,7 +9237,7 @@ msgstr "Скратувачи на URL"
 #. TRANS: Menu item in settings navigation panel.
 msgctxt "MENU"
 msgid "IM"
-msgstr "IM"
+msgstr "�П"
 
 #. TRANS: Menu item title in settings navigation panel.
 msgid "Updates by instant messenger (IM)"
@@ -9812,6 +9261,15 @@ msgstr "Поврзувања"
 msgid "Authorized connected applications"
 msgstr "Овла�тени поврзани програми"
 
+#. TRANS: Menu item in settings navigation panel.
+msgctxt "MENU"
+msgid "Old school"
+msgstr "Кла�ично"
+
+#. TRANS: Menu item title in settings navigation panel.
+msgid "UI tweaks for old-school users"
+msgstr "Прилагодувања на �П за кла�ични кори�ници"
+
 #. TRANS: Title of form to silence a user.
 msgctxt "TITLE"
 msgid "Silence"
@@ -9821,6 +9279,42 @@ msgstr "Замолчи"
 msgid "Silence this user"
 msgstr "Замолчи го овој кори�ник"
 
+#. TRANS: Server error displayed when trying to create an anynymous OAuth consumer.
+msgid "Could not create anonymous consumer."
+msgstr "�е можев да �оздадам анонимен потрошувач."
+
+#. TRANS: Server error displayed when trying to create an anynymous OAuth application.
+msgid "Could not create anonymous OAuth application."
+msgstr "�е можев да �оздадам анонимен OAuth-програм."
+
+#. TRANS: Exception thrown when no token association could be found.
+msgid ""
+"Could not find a profile and application associated with the request token."
+msgstr "�е можев да пронајдам профил и програм поврзан �о жетонот за барање."
+
+#. TRANS: Exception thrown when no access token can be issued.
+msgid "Could not issue access token."
+msgstr "�е можев да го издадам жетонот за при�тап."
+
+#. TRANS: Exception thrown when a database error occurs.
+msgid "Database error inserting OAuth application user."
+msgstr ""
+"Грешка во базата на податоци при вметнувањето на кори�никот на OAuth-"
+"програмот."
+
+#. TRANS: Exception thrown when a database error occurs.
+msgid "Database error updating OAuth application user."
+msgstr ""
+"Грешка во базата на податоци при подновата на кори�никот на OAuth-програмот."
+
+#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
+msgid "Tried to revoke unknown token."
+msgstr "Се обидовте да отповикате непознат жетон."
+
+#. TRANS: Exception thrown when an attempt is made to remove a revoked token.
+msgid "Failed to delete revoked token."
+msgstr "�е у�пеав да го избришам отповиканиот жетон."
+
 #. TRANS: Menu item in local navigation menu.
 msgctxt "MENU"
 msgid "Subscriptions"
@@ -9877,6 +9371,16 @@ msgstr "Поканете пријатели и колеги да Ви �е пр
 msgid "Subscribe to this user"
 msgstr "Претплати �е на кори�ников"
 
+#. TRANS: Button text to subscribe to a user.
+#. TRANS: Button text for subscribing to a list.
+msgctxt "BUTTON"
+msgid "Subscribe"
+msgstr "Претплати �е"
+
+#. TRANS: Button title to subscribe to a user.
+msgid "Subscribe to this user."
+msgstr "Претплати �е на кори�ников."
+
 #. TRANS: Title of personal tag cloud section.
 msgid "People Tagcloud as self-tagged"
 msgstr "Облак од �амоозначени ознаки за луѓе"
@@ -9999,16 +9503,26 @@ msgstr[1] "%%s го бенди�уваат ова."
 
 #. TRANS: List message for notice repeated by logged in user.
 msgctxt "REPEATLIST"
-msgid "You have repeated this notice."
+msgid "You repeated this."
 msgstr "Ја повторивте забелешкава."
 
-#. TRANS: List message for repeated notices.
-#. TRANS: %d is the number of users that have repeated a notice.
+#. TRANS: List message for when more than 4 people repeat something.
+#. TRANS: %%s is a list of users liking a notice, %d is the number over 4 that like the notice.
+#. TRANS: Plural is decided on the total number of users liking the notice (count of %%s + %d).
 #, php-format
-msgid "One person has repeated this notice."
-msgid_plural "%d people have repeated this notice."
-msgstr[0] "Забелешкава ја има повторено едно лице."
-msgstr[1] "Забелешкава ја имаат повторено %d лица."
+msgid "%%s and %d other repeated this."
+msgid_plural "%%s and %d others repeated this."
+msgstr[0] "%%s и %d друг кори�ник го повториле ова."
+msgstr[1] "%%s и %d други кори�ници го повториле ова."
+
+#. TRANS: List message for favoured notices.
+#. TRANS: %%s is a list of users liking a notice.
+#. TRANS: Plural is based on the number of of users that have favoured a notice.
+#, php-format
+msgid "%%s repeated this."
+msgid_plural "%%s repeated this."
+msgstr[0] "%%s го повори ова."
+msgstr[1] "%%s го повторија ова."
 
 #. TRANS: Form legend.
 #, php-format
@@ -10100,7 +9614,6 @@ msgid "Unsilence this user"
 msgstr "Тргни замолчување за овој кори�ник"
 
 #. TRANS: Form legend on unsubscribe form.
-#. TRANS: Button title on unsubscribe form.
 msgid "Unsubscribe from this user"
 msgstr "Откажи претплата од овој кор�иник"
 
@@ -10110,6 +9623,10 @@ msgctxt "BUTTON"
 msgid "Unsubscribe"
 msgstr "Отпиши �е"
 
+#. TRANS: Button title on unsubscribe form.
+msgid "Unsubscribe from this user."
+msgstr "Откажи ја претплатата на овој кор�иник."
+
 #. TRANS: Exception text shown when no profile can be found for a user.
 #. TRANS: %1$s is a user nickname, $2$d is a user ID (number).
 #, php-format
@@ -10192,8 +9709,6 @@ msgstr "�еважечки XML. �ема XRD-корен."
 msgid "Getting backup from file '%s'."
 msgstr "Земам резерва на податотеката „%s“."
 
-#~ msgid "%1$s and friends, page %2$d"
-#~ msgstr "%1$s и пријателите, �тр. %2$d"
-
-#~ msgid "You and friends"
-#~ msgstr "Вие и пријателите"
+#
+#~ msgid " "
+#~ msgstr " "
diff --git a/locale/ml/LC_MESSAGES/statusnet.po b/locale/ml/LC_MESSAGES/statusnet.po
index 6334feab63..59f723b25d 100644
--- a/locale/ml/LC_MESSAGES/statusnet.po
+++ b/locale/ml/LC_MESSAGES/statusnet.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:29+0000\n"
-"Language-Team: Malayalam <http://translatewiki.net/wiki/Portal:ml>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:23+0000\n"
+"Language-Team: Malayalam <https://translatewiki.net/wiki/Portal:ml>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-05-05 10:52:40+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2012-04-22 22:02:21+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ml\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -30,12 +30,6 @@ msgid ""
 "again."
 msgstr ""
 
-#. TRANS: Error message.
-msgid ""
-"An important error occured, probably related to email setup. Check logfiles "
-"for more info."
-msgstr ""
-
 #. TRANS: Error message.
 msgid "An error occurred."
 msgstr "ഒര� പിഴവ� ഉണ�ടായിരിക�ക�ന�ന�."
@@ -94,12 +88,12 @@ msgstr "പ�തിയ രജിസ�ട�രേഷന�കൾ വേണ�
 msgid "Closed"
 msgstr "അടച�ച�"
 
-#. TRANS: Title for button to save access settings in site admin panel.
-msgid "Save access settings"
+#. TRANS: Button title to save access settings in site admin panel.
+#, fuzzy
+msgid "Save access settings."
 msgstr "അഭിഗമ�യതാ സജ�ജീകരണങ�ങൾ സേവ� ചെയ�യ�ക"
 
-#. TRANS: Tooltip for button to save access settings in site admin panel.
-#. TRANS: Button text for saving theme settings.
+#. TRANS: Button text to save access settings in site admin panel.
 #. TRANS: Button label to save e-mail preferences.
 #. TRANS: Button label to save IM preferences.
 #. TRANS: Button text in the license admin panel.
@@ -115,7 +109,6 @@ msgstr "അഭിഗമ�യതാ സജ�ജീകരണങ�ങൾ സേ
 #. TRANS: Button text for saving "Other settings" in profile.
 #. TRANS: Button text to save user settings in user admin panel.
 #. TRANS: Button label in the "Edit application" form.
-#. TRANS: Button text on profile design page to save settings.
 #. TRANS: Text for save button on group edit form.
 #. TRANS: Button text to save tags for a profile.
 msgctxt "BUTTON"
@@ -154,10 +147,6 @@ msgstr ""
 msgid "No such list."
 msgstr "അത�തരത�തിലൊര� പട�ടികയില�ല."
 
-#. TRANS: Client error displayed when trying to add an OMB 0.1 remote profile to a list.
-msgid "You cannot list an OMB 0.1 remote profile with this action."
-msgstr ""
-
 #. TRANS: Client error displayed when an unknown error occurs when adding a user to a list.
 #. TRANS: %s is a username.
 #, php-format
@@ -187,7 +176,6 @@ msgstr "അത�തരത�തിൽ ഒര� താളില�ല."
 #. TRANS: Client error when user not found for an rss related action.
 #. TRANS: Client error displayed when no existing user is provided for a user's delivery device setting.
 #. TRANS: Client error displayed if a user could not be found.
-#. TRANS: Client error when user not found updating a profile background image.
 #. TRANS: Client error displayed updating profile image without having a user object.
 #. TRANS: Client error displayed when making an Atom API request for an unknown user.
 #. TRANS: Client error displayed when trying to block a non-existing user or a user from another site.
@@ -213,14 +201,11 @@ msgstr "അത�തരത�തിൽ ഒര� താളില�ല."
 #. TRANS: Client error displayed when trying to get the RSS feed with favorites of a user that does not exist.
 #. TRANS: Client error displayed when requesting Friends of a Friend feed without providing a user nickname.
 #. TRANS: Client error displayed when requesting Friends of a Friend feed for an object that is not a user.
-#. TRANS: Client error displayed when trying to get a user hCard for a non-existing user.
 #. TRANS: Client error displayed trying to make a micro summary without providing a valid user.
 #. TRANS: Client error displayed trying to send a direct message to a non-existing user.
 #. TRANS: Client error displayed trying to use "one time password login" without using an existing user.
 #. TRANS: Client error displayed when referring to non-existing user.
 #. TRANS: Client error displayed trying to perform an action related to a non-existing user.
-#. TRANS: Form validation error on page for remote subscribe when no user was provided.
-#. TRANS: Form validation error on page for remote subscribe when no user profile was found.
 #. TRANS: Client error displayed when trying to reply to a non-exsting user.
 #. TRANS: Client error displayed when providing a non-existing nickname in a RSS 1.0 action.
 #. TRANS: Client error.
@@ -229,7 +214,6 @@ msgstr "അത�തരത�തിൽ ഒര� താളില�ല."
 #. TRANS: Client error displayed trying to find a user by ID for a non-existing ID.
 #. TRANS: Client error displayed requesting groups for a non-existing user.
 #. TRANS: Client error displayed when user not found for an action.
-#. TRANS: Client error displayed providing a non-existing nickname.
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #. TRANS: Client error displayed when trying to perform a gallery action with an unknown user.
 #. TRANS: Client error displayed when trying to access a mailbox without providing a user.
@@ -248,6 +232,13 @@ msgstr "%s എന�ന ഉപയോക�താവിന�റെ സമയര
 msgid "%s's home timeline"
 msgstr "%s എന�ന ഉപയോക�താവിന�റെ സമയരേഖ"
 
+#. TRANS: %s is user nickname.
+#. TRANS: Feed title.
+#. TRANS: %s is tagger's nickname.
+#, php-format
+msgid "Feed for friends of %s (Activity Streams JSON)"
+msgstr ""
+
 #. TRANS: %s is user nickname.
 #, php-format
 msgid "Feed for friends of %s (RSS 1.0)"
@@ -287,7 +278,7 @@ msgid ""
 "to them](%%%%action.newnotice%%%%?status_textarea=%3$s)."
 msgstr ""
 
-#. TRANS: Encoutagement displayed on empty timeline user pages for anonymous users.
+#. TRANS: Encouragement displayed on empty timeline user pages for anonymous users.
 #. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
 #. TRANS: Empty list message for page with replies for a user for not logged in users.
 #. TRANS: %1$s is a user nickname. This message contains a Markdown link in the form [link text](link).
@@ -299,6 +290,13 @@ msgid ""
 "post a notice to them."
 msgstr ""
 
+#. TRANS: Button text for inviting more users to the StatusNet instance.
+#. TRANS: Less business/enterprise-oriented language for public sites.
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Send invite"
+msgstr "ക�ഷണങ�ങൾ"
+
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Title of API timeline for a user and friends.
 #. TRANS: %s is a username.
@@ -307,8 +305,6 @@ msgstr ""
 #. TRANS: %s is a username.
 #. TRANS: Menu item title in personal group navigation menu.
 #. TRANS: %s is a username.
-#. TRANS: Menu item title in settings navigation panel.
-#. TRANS: %s is a username.
 #, php-format
 msgid "%s and friends"
 msgstr "%s ഒപ�പം സ�ഹൃത�ത�ക�കള�ം"
@@ -346,7 +342,6 @@ msgstr ""
 #. TRANS: Server error thrown on database error updating SMS preferences.
 #. TRANS: Server error thrown on database error removing a registered SMS phone number.
 #. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
-#. TRANS: Server exception thrown on Profile design page when updating design settings fails.
 msgid "Could not update user."
 msgstr "ഉപയോക�തൃ വിവരങ�ങൾ പ�ത�ക�കാൻ കഴിഞ�ഞില�ല."
 
@@ -361,7 +356,6 @@ msgstr ""
 
 #. TRANS: Client error displayed when the number of bytes in a POST request exceeds a limit.
 #. TRANS: %s is the number of bytes of the CONTENT_LENGTH.
-#. TRANS: Form validation error in design settings form. POST should remain untranslated.
 #, php-format
 msgid ""
 "The server was unable to handle that much POST data (%s byte) due to its "
@@ -372,24 +366,6 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#. TRANS: Client error displayed when saving design settings fails because of an empty id.
-#. TRANS: Client error displayed when saving design settings fails because of an empty result.
-#. TRANS: Client error displayed when a database error occurs inserting profile colours.
-#. TRANS: Client error displayed when a database error occurs updating profile colours.
-#. TRANS: Form validation error displayed when group design settings could not be saved because of an application issue.
-#. TRANS: Form validation error on Profile design page when saving design settings has failed.
-#. TRANS: Form validation error on Profile design page when updating design settings has failed.
-msgid "Unable to save your design settings."
-msgstr "താങ�കള�ടെ രൂപകല�പനാ സജ�ജീകരണങ�ങൾ കാത�ത�സൂക�ഷിക�കാനായില�ല."
-
-#. TRANS: Error displayed when updating design settings fails.
-#. TRANS: Client error displayed when a database error occurs updating profile colours.
-#. TRANS: Form validation error on Profile design page when updating design settings has failed.
-#. TRANS: Error message displayed if design settings could not be saved.
-#. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
-msgid "Could not update your design."
-msgstr "താങ�കള�ടെ രൂപകല�പന പ�ത�ക�കാനായില�ല."
-
 #. TRANS: Title for Atom feed.
 msgctxt "ATOM"
 msgid "Main"
@@ -436,6 +412,22 @@ msgstr "ഉപയോക�താവിനെ തടയൽ പരാജയപ�
 msgid "Unblock user failed."
 msgstr "ഉപയോക�താവിന�റെ തടയൽ നീക�കൽ പരാജയപ�പെട�ട�."
 
+#. TRANS: Client exception thrown when no conversation ID is given.
+#, fuzzy
+msgid "No conversation ID."
+msgstr "സംഭാഷണം"
+
+#. TRANS: Client exception thrown when referring to a non-existing conversation ID (%d).
+#, fuzzy, php-format
+msgid "No conversation with ID %d."
+msgstr "സംഭാഷണം"
+
+#. TRANS: Title for conversion timeline.
+#, fuzzy
+msgctxt "TITLE"
+msgid "Conversation"
+msgstr "സംഭാഷണം"
+
 #. TRANS: Title. %s is a user nickname.
 #, php-format
 msgid "Direct messages from %s"
@@ -479,6 +471,8 @@ msgid "Cannot send direct messages to users who aren't your friend."
 msgstr "താങ�കള�ടെ സ�ഹൃത�ത�ക�കളല�ലാത�ത ഉപയോക�താക�കൾക�ക� നേരിട�ട�ള�ള സന�ദേശങ�ങൾ അയയ�ക�കാൻ കഴിയില�ല."
 
 #. TRANS: Client error displayed trying to direct message self (403).
+#. TRANS: Client error displayed trying to send a direct message to self.
+#. TRANS: Error text shown when trying to send a direct message to self.
 msgid ""
 "Do not send a message to yourself; just say it to yourself quietly instead."
 msgstr "താങ�കൾക�ക� തന�നെ സന�ദേശം അയയ�ക�കര�ത�; പകരം അത� പത�ക�കെ സ�വയം പറയ�ക."
@@ -707,7 +701,6 @@ msgstr "%s സൈറ�റിലെ സംഘങ�ങൾ"
 
 #. TRANS: Client error displayed when trying to edit a group without being an admin.
 #. TRANS: Client error displayed trying to edit a group while not being a group admin.
-#. TRANS: Client error displayed trying to change group design settings without being a (group) admin.
 #. TRANS: Client error displayed when trying to change group logo settings while not being a group admin.
 msgid "You must be an admin to edit the group."
 msgstr "സംഘത�തിൽ മാറ�റം വര�ത�താൻ താങ�കൾ ഒര� കാര�യനിർവ�വാഹകനായിരിക�കണം."
@@ -816,7 +809,6 @@ msgstr ""
 
 #. TRANS: Client error given on when invalid data was passed through a form in the OAuth API.
 #. TRANS: Unexpected validation error on avatar upload form.
-#. TRANS: Client error displayed when the submitted form contains unexpected data.
 #. TRANS: Client error displayed submitting invalid form data for edit application.
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
 #. TRANS: Form validation error message when an unsupported argument is used.
@@ -825,7 +817,6 @@ msgstr ""
 #. TRANS: Client error when submitting a form with unexpected information.
 #. TRANS: Client error displayed when unexpected data is posted in the password recovery form.
 #. TRANS: Message given submitting a form with an unknown action in SMS settings.
-#. TRANS: Unknown form validation error in design settings form.
 msgid "Unexpected form submission."
 msgstr "അപ�രതീക�ഷിത ഫോം സമർപ�പിക�കൽ."
 
@@ -864,7 +855,6 @@ msgstr "അംഗത�വം"
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Field label on account registration page.
-#. TRANS: Label for nickname on user authorisation page.
 #. TRANS: Field label on group edit form.
 #. TRANS: Dropdown option for searching in profiles.
 msgid "Nickname"
@@ -1174,12 +1164,9 @@ msgstr "ഒര� സംഘത�തിൽ നിന�ന�ം പ�റത�
 #. TRANS: Client error displayed when requesting Friends of a Friend feed for a nickname that is not a group.
 #. TRANS: Client error displayed trying to block a user from a group while specifying a non-existing group.
 #. TRANS: Client error displayed referring to a group's permalink for a non-existing group ID.
-#. TRANS: Client error displayed trying to change group design settings while providing a nickname for a non-existing group.
 #. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
 #. TRANS: Client error displayed when trying to view group members for a non-existing group.
 #. TRANS: Client error displayed when trying to view group members for an object that is not a group.
-#. TRANS: Client error displayed when trying to view group members for a non-existing group.
-#. TRANS: Client error displayed when trying to view group members for an object that is not a group.
 #. TRANS: Client error displayed when requesting a group RSS feed for group that does not exist.
 #. TRANS: Client error displayed when requesting a group RSS feed for an object that is not a group.
 #. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
@@ -1188,10 +1175,10 @@ msgstr "ഒര� സംഘത�തിൽ നിന�ന�ം പ�റത�
 #. TRANS: Client error displayed when trying to leave a non-local group.
 #. TRANS: Client error displayed when trying to leave a non-existing group.
 #. TRANS: Client error displayed when providing an invalid group ID on the Make Admin page.
-#. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
-#. TRANS: Client error displayed if no local group with a given name was found requesting group page.
 #. TRANS: Command exception text shown when a group is requested that does not exist.
 #. TRANS: Error text shown when trying to leave a group that does not exist.
+#. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
+#. TRANS: Client error displayed if no local group with a given name was found requesting group page.
 msgid "No such group."
 msgstr "അങ�ങനെ ഒര� സംഘം ഇല�ല."
 
@@ -1259,6 +1246,7 @@ msgid "Join request canceled."
 msgstr "ഭാഗഭാക�കാകൽ അഭ�യർത�ഥന നിരസിച�ച�."
 
 #. TRANS: Client error displayed trying to approve subscription for a non-existing request.
+#. TRANS: %s is a user nickname.
 #, fuzzy, php-format
 msgid "%s is not in the moderation queue for your subscriptions."
 msgstr "ഈ സംഘത�തിലെ ഉപയോക�താക�കള�ടെ പട�ടിക."
@@ -1412,7 +1400,6 @@ msgstr ""
 #. TRANS: Client error displayed trying to get an avatar without providing a nickname.
 #. TRANS: Client error displayed when requesting a list of blocked users for a group without providing a group nickname.
 #. TRANS: Client error displayed trying to edit a group while not proving a nickname for the group to edit.
-#. TRANS: Client error displayed trying to change group design settings without providing a group nickname.
 #. TRANS: Client error displayed when trying to change group logo settings without providing a nickname.
 #. TRANS: Client error displayed when trying to view group members without providing a group nickname.
 #. TRANS: Client error displayed when requesting a group RSS feed without providing a group nickname.
@@ -1703,6 +1690,17 @@ msgstr "താങ�കള�ടെ അംഗത�വത�തിന� \"%s\"
 msgid "Conversation"
 msgstr "സംഭാഷണം"
 
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+msgid "Conversation feed (Activity Streams JSON)"
+msgstr ""
+
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#, fuzzy
+msgid "Conversation feed (RSS 2.0)"
+msgstr "സംഭാഷണം"
+
 #. TRANS: Title for conversation page.
 #. TRANS: Title for page that shows a notice.
 msgctxt "TITLE"
@@ -1763,7 +1761,8 @@ msgid "Enter \"%s\" to confirm that you want to delete your account."
 msgstr "താങ�കള�ടെ അംഗത�വം മായ�ക�കണമെന�ന� സ�ഥിരികരിക�കാൻ  \"%s\" നൽക�ക."
 
 #. TRANS: Button title for user account deletion.
-msgid "Permanently delete your account"
+#, fuzzy
+msgid "Permanently delete your account."
 msgstr "താങ�കള�ടെ അംഗത�വം എന�നെന�നേക�ക�മായി മായ�ച�ച�കളയ�ക"
 
 #. TRANS: Client error displayed trying to delete an application while not logged in.
@@ -1905,152 +1904,6 @@ msgstr "ഈ ഉപയോക�താവിനെ നീക�കം ചെയ�
 msgid "Delete this user."
 msgstr "ഈ ഉപയോക�താവിനെ നീക�കം ചെയ�യ�ക."
 
-#. TRANS: Message used as title for design settings for the site.
-msgid "Design"
-msgstr "രൂപകല�പന"
-
-#. TRANS: Instructions for design adminsitration panel.
-msgid "Design settings for this StatusNet site"
-msgstr "ഈ സ�റ�റാറ�റസ�‌നെറ�റ� സൈറ�റിന�റെ രൂപകല�പനാ സജ�ജീകരണങ�ങൾ"
-
-#. TRANS: Client error displayed when a logo URL does is not valid.
-msgid "Invalid logo URL."
-msgstr "ലോഗോ യൂ.ആർ.എൽ. അസാധ�വാണ�."
-
-#. TRANS: Client error displayed when an SSL logo URL is invalid.
-msgid "Invalid SSL logo URL."
-msgstr "അസാധ�വായ എസ�.എസ�.എൽ. ലോഗോ യൂ.ആർ.എൽ."
-
-#. TRANS: Client error displayed when a theme is submitted through the form that is not in the theme list.
-#. TRANS: %s is the chosen unavailable theme.
-#, php-format
-msgid "Theme not available: %s."
-msgstr "ദൃശ�യരൂപം ലഭ�യമല�ല: %s."
-
-#. TRANS: Fieldset legend for form to change logo.
-msgid "Change logo"
-msgstr "ലോഗോ മാറ�റ�ക"
-
-#. TRANS: Field label for StatusNet site logo.
-msgid "Site logo"
-msgstr "സൈറ�റിന�റെ ലോഗോ"
-
-#. TRANS: Field label for SSL StatusNet site logo.
-msgid "SSL logo"
-msgstr "എസ�.എസ�.എൽ. ലോഗോ"
-
-#. TRANS: Fieldset legend for form change StatusNet site's theme.
-msgid "Change theme"
-msgstr "ദൃശ�യരൂപം മാറ�റ�ക"
-
-#. TRANS: Field label for dropdown to choose site theme.
-msgid "Site theme"
-msgstr "സൈറ�റിന�റെ ദൃശ�യരൂപം"
-
-#. TRANS: Title for field label for dropdown to choose site theme.
-msgid "Theme for the site."
-msgstr "ഈ സൈറ�റിന�റെ ദൃശ�യരൂപം."
-
-#. TRANS: Field label for uploading a cutom theme.
-msgid "Custom theme"
-msgstr "�ച�ഛിക ദൃശ�യരൂപം"
-
-#. TRANS: Form instructions for uploading a cutom StatusNet theme.
-msgid "You can upload a custom StatusNet theme as a .ZIP archive."
-msgstr ""
-"താങ�കള�ടെ ഇച�ഛാന�സരണം നിർമ�മിച�ച സ�റ�റാറ�റസ�‌നെറ�റ� ദൃശ�യരൂപം .സിപ� ആർക�കൈവ� ആയി താങ�കൾക�ക� അപ�‌ലോഡ� "
-"ചെയ�യാവ�ന�നതാണ�."
-
-#. TRANS: Fieldset legend for theme background image.
-msgid "Change background image"
-msgstr "പശ�ചാത�തലചിത�രം മാറ�റ�ക"
-
-#. TRANS: Field label for background image on theme designer page.
-#. TRANS: Field label for background color selector.
-#. TRANS: Label on profile design page for setting a profile page background colour.
-msgid "Background"
-msgstr "പശ�ചാത�തലം"
-
-#. TRANS: Form guide for background image upload form on theme designer page.
-#, php-format
-msgid ""
-"You can upload a background image for the site. The maximum file size is %1"
-"$s."
-msgstr ""
-"താങ�കൾക�ക� ഈ സൈറ�റിന�ള�ള പശ�ചാത�തല ചിത�രം അപ�‌ലോഡ� ചെയ�യാവ�ന�നതാണ�. പ�രമാണത�തിന�റെ പരമാവധി "
-"വലിപ�പം %1$s ആയിരിക�കണം."
-
-#. TRANS: Used as radio button label to add a background image.
-msgid "On"
-msgstr "സജ�ജം"
-
-#. TRANS: Used as radio button label to not add a background image.
-msgid "Off"
-msgstr "രഹിതം"
-
-#. TRANS: Form guide for turning background image on or off on theme designer page.
-#. TRANS: Form guide for a set of radio buttons on the profile design page that will enable or disable
-#. TRANS: use of the uploaded profile image.
-msgid "Turn background image on or off."
-msgstr "പശ�ചാത�തലചിത�രം പ�രവർത�തന സജ�ജമാക�ക�ക അല�ലെങ�കിൽ രഹിതമാക�ക�ക."
-
-#. TRANS: Checkbox label to title background image on theme designer page.
-#. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
-msgid "Tile background image"
-msgstr "പശ�ചാത�തലചിത�രം ആവർത�തിച�ച� ചേർക�ക�ക"
-
-#. TRANS: Fieldset legend for theme colors.
-msgid "Change colors"
-msgstr "നിറങ�ങൾ മാറ�റ�ക"
-
-#. TRANS: Field label for content color selector.
-#. TRANS: Label on profile design page for setting a profile page content colour.
-msgid "Content"
-msgstr "ഉള�ളടക�കം"
-
-#. TRANS: Field label for sidebar color selector.
-#. TRANS: Label on profile design page for setting a profile page sidebar colour.
-msgid "Sidebar"
-msgstr "പാർശ�വഭിത�തി"
-
-#. TRANS: Field label for text color selector.
-#. TRANS: Label on profile design page for setting a profile page text colour.
-msgid "Text"
-msgstr "എഴ�ത�ത�"
-
-#. TRANS: Field label for link color selector.
-#. TRANS: Label on profile design page for setting a profile page links colour.
-msgid "Links"
-msgstr "കണ�ണികൾ"
-
-#. TRANS: Fieldset legend for advanced theme design settings.
-msgid "Advanced"
-msgstr "വിപ�ലം"
-
-#. TRANS: Field label for custom CSS.
-msgid "Custom CSS"
-msgstr "സ�വന�തം സി.എസ�.എസ�."
-
-#. TRANS: Button text for resetting theme settings.
-msgctxt "BUTTON"
-msgid "Use defaults"
-msgstr "സ�വതേയ�ള�ളവ ഉപയോഗിക�ക�ക"
-
-#. TRANS: Title for button for resetting theme settings.
-#. TRANS: Title for button on profile design page to reset all colour settings to default.
-msgid "Restore default designs."
-msgstr "സ�വതേയ�ള�ള രൂപകല�പനകൾ പ�നഃസ�ഥാപിക�ക�ക."
-
-#. TRANS: Title for button for resetting theme settings.
-#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-msgid "Reset back to default."
-msgstr "മ�മ�പ� സ�വതേയ�ണ�ടായിര�ന�നതിലേയ�ക�ക� പ�നഃസ�ഥാപിക�ക�ക."
-
-#. TRANS: Title for button for saving theme settings.
-#. TRANS: Title for button on profile design page to save settings.
-msgid "Save design."
-msgstr "രൂപകല�പന സേവ�‌ ചെയ�യ�ക."
-
 #. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
 msgid "This notice is not a favorite!"
 msgstr "ഈ അറിയിപ�പ� പ�രിയങ�കരമാണെന�ന� അടയാളപ�പെട�ത�തിയിട�ടില�ല!"
@@ -2065,6 +1918,84 @@ msgstr "പ�രിയങ�കരങ�ങളിലേയ�ക�ക� ച
 msgid "No such document \"%s\"."
 msgstr "\"%s\" എന�നൊര� രേഖ ഇല�ല."
 
+#. TRANS: Menu item in administrator navigation panel.
+#. TRANS: Menu item in default local navigation panel.
+#. TRANS: Menu item in personal group navigation menu.
+#, fuzzy
+msgctxt "MENU"
+msgid "Home"
+msgstr "ഹോംപേജ�"
+
+msgctxt "MENU"
+msgid "Docs"
+msgstr ""
+
+#. TRANS: Secondary navigation menu item leading to help on StatusNet.
+msgctxt "MENU"
+msgid "Help"
+msgstr "സഹായം"
+
+#, fuzzy
+msgid "Getting started"
+msgstr "സജ�ജീകരണങ�ങൾ സേവ� ചെയ�തിരിക�ക�ന�ന�."
+
+#. TRANS: Secondary navigation menu item leading to text about StatusNet site.
+#, fuzzy
+msgctxt "MENU"
+msgid "About"
+msgstr "വിവരണം"
+
+#, fuzzy
+msgid "About this site"
+msgstr "ഈ ഉപയോക�താവിന�റെ തടയൽ നീക�ക�ക"
+
+#. TRANS: Secondary navigation menu item leading to Frequently Asked Questions.
+#, fuzzy
+msgctxt "MENU"
+msgid "FAQ"
+msgstr "പതിവ�ചോദ�യങ�ങൾ"
+
+msgid "Frequently asked questions"
+msgstr ""
+
+#. TRANS: Secondary navigation menu item leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+#, fuzzy
+msgctxt "MENU"
+msgid "Contact"
+msgstr "സമ�പർക�കം"
+
+#, fuzzy
+msgid "Contact info"
+msgstr "സമ�പർക�കം"
+
+#, fuzzy
+msgctxt "MENU"
+msgid "Tags"
+msgstr "റ�റാഗ�കൾ"
+
+msgid "Using tags"
+msgstr ""
+
+#. TRANS: Menu item in default local navigation panel.
+#. TRANS: Menu item in search group navigation panel.
+#. TRANS: Menu item in local navigation menu.
+#, fuzzy
+msgctxt "MENU"
+msgid "Groups"
+msgstr "സംഘങ�ങൾ"
+
+#, fuzzy
+msgid "Using groups"
+msgstr "ഉപയോക�തൃ സംഘങ�ങൾ"
+
+msgctxt "MENU"
+msgid "API"
+msgstr ""
+
+msgid "RESTful API"
+msgstr ""
+
 #. TRANS: Title for "Edit application" form.
 #. TRANS: Form legend.
 msgid "Edit application"
@@ -2208,9 +2139,8 @@ msgid ""
 msgstr ""
 
 #. TRANS: Form validation error displayed if a given tag is invalid.
-#, fuzzy
 msgid "Invalid tag."
-msgstr "അസാധ�വായ വലിപ�പം."
+msgstr "അസാധ�വായ റ�റാഗ�."
 
 #. TRANS: Form validation error displayed if a given tag is already present.
 #. TRANS: %s is the already present tag.
@@ -2224,7 +2154,7 @@ msgid ""
 "subscriptions to it. Do you still want to continue?"
 msgstr ""
 
-#. TRANS: TRANS: Server error displayed when updating a list fails.
+#. TRANS: Server error displayed when updating a list fails.
 #, fuzzy
 msgid "Could not update list."
 msgstr "ഉപയോക�തൃ വിവരങ�ങൾ പ�ത�ക�കാൻ കഴിഞ�ഞില�ല."
@@ -2526,43 +2456,9 @@ msgstr ""
 msgid "No uploaded attachments."
 msgstr ""
 
-#. TRANS: Client error displayed when subscribing to a remote profile and an unexpected response is received.
-msgid "Not expecting this response!"
-msgstr "ഈ പ�രതികരണമല�ല പ�രതീക�ഷിച�ചത�!"
-
-#. TRANS: Client error displayed when subscribing to a remote profile that does not exist.
-msgid "User being listened to does not exist."
-msgstr ""
-
-#. TRANS: Client error displayed when subscribing to a remote profile that is a local profile.
-#. TRANS: Client error displayed when using remote subscribe for a local entity.
-msgid "You can use the local subscription!"
-msgstr ""
-
-#. TRANS: Client error displayed when subscribing to a remote profile that is blocked form subscribing to.
-msgid "That user has blocked you from subscribing."
-msgstr "വരിക�കാരനാക�ന�നതിൽ നിന�ന�ം ആ ഉപയോക�താവ� താങ�കളെ തടഞ�ഞിരിക�ക�ന�ന�."
-
-#. TRANS: Client error displayed when subscribing to a remote profile without providing an authorised token.
-msgid "You are not authorized."
-msgstr "താങ�കൾക�ക� അംഗീകാരം ലഭിച�ചിട�ടില�ല."
-
-#. TRANS: Client error displayed when subscribing to a remote profile and conversion of the request token to access token fails.
-msgid "Could not convert request token to access token."
-msgstr "അഭ�യർത�ഥനാ ചീട�ടിനെ അഭിഗമ�യതാ ചീട�ടാക�കാൻ കഴിയില�ല."
-
-#. TRANS: Client error displayed when subscribing to a remote profile fails because of an unsupported version of the OMB protocol.
-msgid "Remote service uses unknown version of OMB protocol."
-msgstr "വിദൂര സേവനം അപരിചിതമായ ഒ.എം.ബി. പ�രോട�ടോകോൾ ഉപയോഗിക�ക�ന�ന�."
-
-#. TRANS: Server error displayed when subscribing to a remote profile fails because the remote profile could not be updated.
-#. TRANS: Exception thrown when updating a remote profile fails in OAuth store.
-msgid "Error updating remote profile."
-msgstr ""
-
 #. TRANS: Client error displayed when requesting a non-existent file.
 msgid "No such file."
-msgstr ""
+msgstr "അത�തരത�തിൽ ഒര� പ�രമാണമില�ല."
 
 #. TRANS: Client error displayed when requesting a file without having read access to it.
 msgid "Cannot read file."
@@ -2647,29 +2543,6 @@ msgstr "സംഘത�തിൽ നിന�ന�ം ഉപയോക�താ
 msgid "No ID."
 msgstr "�.ഡി. ഇല�ല."
 
-#. TRANS: Client error displayed trying to change group design settings while not logged in.
-msgid "You must be logged in to edit a group."
-msgstr "സംഘത�തിൽ മാറ�റങ�ങൾ വര�ത�താൻ താങ�കൾ ലോഗിൻ ചെയ�തിരിക�കേണ�ടതാണ�."
-
-#. TRANS: Title group design settings page.
-msgid "Group design"
-msgstr "സംഘത�തിന�റെ രൂപകല�പന"
-
-#. TRANS: Instructions for group design settings page.
-msgid ""
-"Customize the way your group looks with a background image and a colour "
-"palette of your choice."
-msgstr "പശ�ചാത�തല�ല ചിത�രവ�ം വർണ�ണങ�ങള�ം ചേർത�ത� സംഘത�തിന�റെ ദൃശ�യരൂപം ഇച�ഛാന�സരണമാക�ക�ക."
-
-#. TRANS: Form validation error displayed when group design settings could not be updated because of an application issue.
-msgid "Unable to update your design settings."
-msgstr "താങ�കള�ടെ രൂപകല�പനാ സജ�ജീകരണങ�ങൾ പ�ത�ക�കാനായില�ല."
-
-#. TRANS: Form text to confirm saved group design settings.
-#. TRANS: Confirmation message on Profile design page when saving design settings has succeeded.
-msgid "Design preferences saved."
-msgstr "രൂപകല�പനാ ക�രമീകരണങ�ങൾ സേവ� ചെയ�തിരിക�ക�ന�ന�."
-
 #. TRANS: Title for group logo settings page.
 #. TRANS: Group logo form legend.
 msgid "Group logo"
@@ -2843,8 +2716,8 @@ msgstr "�.എം. സജ�ജീകരണങ�ങൾ"
 #. TRANS: the order and formatting of link text and link should remain unchanged.
 #, fuzzy, php-format
 msgid ""
-"You can send and receive notices through instant messaging [instant messages]"
-"(%%doc.im%%). Configure your addresses and settings below."
+"You can send and receive notices through [instant messaging](%%doc.im%%). "
+"Configure your addresses and settings below."
 msgstr ""
 "ജാബ�ബർ/ജിറ�റോക�  [തത�സമയ സന�ദേശങ�ങൾ - instant messages] ഉപയോഗിച�ച� താങ�കൾക�ക� അറിയിപ�പ�കൾ "
 "അയയ�ക�കാന�ം സ�വീകരിക�കാന�ം കഴിയ�ന�നതാണ� (%%doc.im%%). താങ�കള�ടെ വിലാസവ�ം സജ�ജീകരണങ�ങള�ം "
@@ -3052,28 +2925,6 @@ msgid ""
 msgstr ""
 "ഈ സേവനം ഉപയോഗിക�കാൻ താങ�കള�ടെ സ�ഹൃത�ത�ക�കളേയ�ം സഹപ�രവർത�തകരേയ�ം ക�ഷണിക�കാൻ ഈ ഫോം ഉപയോഗിക�ക�ക."
 
-#. TRANS: Field label for a list of e-mail addresses.
-msgid "Email addresses"
-msgstr "ഇമെയിൽ വിലാസം"
-
-#. TRANS: Tooltip for field label for a list of e-mail addresses.
-msgid "Addresses of friends to invite (one per line)."
-msgstr "ക�ഷണിക�കേണ�ട സ�ഹൃത�ത�ക�കള�ടെ വിലാസം (ഒര� വരിയിൽ ഒന�ന� വീതം)."
-
-#. TRANS: Field label for a personal message to send to invitees.
-msgid "Personal message"
-msgstr "സ�വകാര�യ സന�ദേശം"
-
-#. TRANS: Tooltip for field label for a personal message to send to invitees.
-msgid "Optionally add a personal message to the invitation."
-msgstr "ക�ഷണത�തിൽ താങ�കള�ടെ സ�വന�തം സന�ദേശം കൂടി വേണമെങ�കിൽ കൂട�ടിച�ചേർക�ക�ക."
-
-#. TRANS: Send button for inviting friends
-#. TRANS: Button text for sending notice.
-msgctxt "BUTTON"
-msgid "Send"
-msgstr "അയക�ക�ക"
-
 #. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral
 #. TRANS: singular 3rd-person pronoun in English. %1$s is the inviting user, $2$s is
 #. TRANS: the StatusNet sitename.
@@ -3208,12 +3059,6 @@ msgstr "അന�മതിയോടൊപ�പം പ�രദർശിപ�
 msgid "Save license settings."
 msgstr "അന�മതി സജ�ജീകരണങ�ങൾ സേവ� ചെയ�യ�ക"
 
-#. TRANS: Client error displayed when trying to log in while already logged in.
-#. TRANS: Client error displayed trying to use "one time password login" when already logged in.
-#. TRANS: Client error displayed when trying to register while already logged in.
-msgid "Already logged in."
-msgstr "മ�മ�പേ തന�നെ ലോഗിൻ ചെയ�തിട�ട�ണ�ട�."
-
 #. TRANS: Form validation error displayed when trying to log in with incorrect credentials.
 msgid "Incorrect username or password."
 msgstr "ഉപയോക�തൃനാമമോ രഹസ�യവാക�കോ തെറ�റാണ�."
@@ -3323,6 +3168,7 @@ msgstr "സ�രോതസ�സ� യ�.ആർ.എൽ. ആവശ�യമാ
 msgid "Could not create application."
 msgstr ""
 
+#. TRANS: Form validation error messages displayed when uploading an invalid application logo.
 msgid "Invalid image."
 msgstr "അസാധ�വായ ചിത�രം."
 
@@ -3359,12 +3205,6 @@ msgstr "ഉള�ളടക�കമില�ല!"
 msgid "No recipient specified."
 msgstr "സ�വീകർത�താവിനെ വ�യക�തമാക�കിയിട�ടില�ല."
 
-#. TRANS: Client error displayed trying to send a direct message to self.
-#. TRANS: Error text shown when trying to send a direct message to self.
-msgid ""
-"Don't send a message to yourself; just say it to yourself quietly instead."
-msgstr "താങ�കൾക�ക� തന�നെ സന�ദേശം അയയ�ക�കര�ത�; പകരം അത� പത�ക�കെ സ�വയം പറയ�ക."
-
 #. TRANS: Page title after sending a direct message.
 msgid "Message sent"
 msgstr "സന�ദേശം അയച�ച�"
@@ -3561,6 +3401,33 @@ msgstr ""
 msgid "Not a supported data format."
 msgstr "പിന�ത�ണയില�ലാത�ത തരം ഡേറ�റ."
 
+#. TRANS: Page title for profile settings.
+#, fuzzy
+msgid "Old school UI settings"
+msgstr "�.എം. സജ�ജീകരണങ�ങൾ"
+
+#. TRANS: Usage instructions for profile settings.
+msgid "If you like it \"the old way\", you can set that here."
+msgstr ""
+
+#. TRANS: Confirmation shown when user profile settings are saved.
+#. TRANS: Message after successful saving of administrative settings.
+msgid "Settings saved."
+msgstr "സജ�ജീകരണങ�ങൾ സേവ� ചെയ�തിരിക�ക�ന�ന�."
+
+msgid "Only stream mode (no conversations) in timelines"
+msgstr ""
+
+msgid "Show conversation page as hierarchical trees"
+msgstr ""
+
+msgid "Show nicknames (not full names) in timelines"
+msgstr ""
+
+#. TRANS: Button text to save a list.
+msgid "Save"
+msgstr "സേവ� ചെയ�യ�ക"
+
 #. TRANS: ShortName in the OpenSearch interface when trying to find users.
 msgid "People Search"
 msgstr "ഉപയോക�താക�കളെ തിരയ�ക"
@@ -3569,6 +3436,11 @@ msgstr "ഉപയോക�താക�കളെ തിരയ�ക"
 msgid "Notice Search"
 msgstr "അറിയിപ�പ�കൾ തിരയ�ക"
 
+#. TRANS: Client error displayed trying to use "one time password login" when already logged in.
+#. TRANS: Client error displayed when trying to register while already logged in.
+msgid "Already logged in."
+msgstr "മ�മ�പേ തന�നെ ലോഗിൻ ചെയ�തിട�ട�ണ�ട�."
+
 #. TRANS: Client error displayed trying to use "one time password login" without specifying a user.
 msgid "No user ID specified."
 msgstr "ഉപയോക�തൃ �.ഡി. വ�യക�തമാക�കിയിട�ടില�ല."
@@ -3638,7 +3510,7 @@ msgid "Confirm"
 msgstr "സ�ഥിരീകരിക�ക�ക"
 
 #. TRANS: Field title on page where to change password.
-#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
+#. TRANS: Title for field label for password reset form where the password has to be typed again.
 #. TRANS: Field title on account registration page.
 msgid "Same as password above."
 msgstr "മ�കളിൽ നൽകിയ അതേ രഹസ�യവാക�ക�."
@@ -3696,12 +3568,6 @@ msgstr ""
 msgid "Avatar directory not writable: %s."
 msgstr ""
 
-#. TRANS: Client error in Paths admin panel.
-#. TRANS: %s is the background directory that could not be written to.
-#, php-format
-msgid "Background directory not writable: %s."
-msgstr ""
-
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the locales directory that could not be read from.
 #, php-format
@@ -3723,7 +3589,7 @@ msgstr "സെർവർ"
 
 #. TRANS: Field title in Paths admin panel.
 msgid "Site's server hostname."
-msgstr ""
+msgstr "സൈറ�റിന�റെ സെർവർ ഹോസ�റ�റ� പേര�"
 
 #. TRANS: Field label in Paths admin panel.
 msgid "Path"
@@ -3815,30 +3681,6 @@ msgstr ""
 msgid "Directory where avatars are located."
 msgstr ""
 
-#. TRANS: Fieldset legend in Paths admin panel.
-msgid "Backgrounds"
-msgstr "പശ�ചാത�തലം"
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-msgid "Server for backgrounds."
-msgstr ""
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-msgid "Web path to backgrounds."
-msgstr ""
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-msgid "Server for backgrounds on SSL pages."
-msgstr ""
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-msgid "Web path to backgrounds on SSL pages."
-msgstr ""
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-msgid "Directory where backgrounds are located."
-msgstr ""
-
 #. TRANS: Fieldset legens in Paths admin panel.
 msgid "Attachments"
 msgstr ""
@@ -3894,8 +3736,9 @@ msgid "Server to direct SSL requests to."
 msgstr ""
 
 #. TRANS: Button title text to store form data in the Paths admin panel.
-msgid "Save paths"
-msgstr ""
+#, fuzzy
+msgid "Save path settings."
+msgstr "സൈറ�റ� സജ�ജീകരണങ�ങൾ സേവ� ചെയ�യ�ക"
 
 #. TRANS: Instructions for the "People search" page.
 #. TRANS: %%site.name%% is the name of the StatusNet site.
@@ -4031,7 +3874,7 @@ msgid ""
 "%%%site.name%%%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
 "blogging) service based on the Free Software [StatusNet](http://status.net/) "
 "tool. You can easily keep track of what they are doing by subscribing to the "
-"tag's timeline."
+"list's timeline."
 msgstr ""
 "സ�വതന�ത�ര സോഫ�റ�റ�‌വേറായ [സ�റ�റാറ�റസ�‌നെറ�റ�](http://status.net/) ഉപകരണം ഉപയോഗിച�ച�  [മൈക�രോ-"
 "ബ�ലോഗിങ�](http://en.wikipedia.org/wiki/Micro-blogging) സേവനം നൽക�ന�ന %%site.name%"
@@ -4063,7 +3906,7 @@ msgid ""
 "site.name%%%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
 "blogging) service based on the Free Software [StatusNet](http://status.net/) "
 "tool. You can easily keep track of what they are doing by subscribing to the "
-"tag's timeline."
+"list's timeline."
 msgstr ""
 "സ�വതന�ത�ര സോഫ�റ�റ�‌വേറായ [സ�റ�റാറ�റസ�‌നെറ�റ�](http://status.net/) ഉപകരണം ഉപയോഗിച�ച�  [മൈക�രോ-"
 "ബ�ലോഗിങ�](http://en.wikipedia.org/wiki/Micro-blogging) സേവനം നൽക�ന�ന %%site.name%"
@@ -4165,18 +4008,6 @@ msgid ""
 "All default plugins have been disabled from the site's configuration file."
 msgstr ""
 
-#. TRANS: Client error displayed if the notice posted has too many characters.
-msgid "Invalid notice content."
-msgstr "അറിയിപ�പിന�റെ ഉള�ളടക�കം അസാധ�വാണ�."
-
-#. TRANS: Exception thrown if a notice's license is not compatible with the StatusNet site license.
-#. TRANS: %1$s is the notice license, %2$s is the StatusNet site's license.
-#, fuzzy, php-format
-msgid "Notice license \"%1$s\" is not compatible with site license \"%2$s\"."
-msgstr ""
-"അറിയിപ�പിന�റെ ഉപയോഗാന�മതിയായ� ‘%1$s’ സൈറ�റിന�റെ ഉപയോഗാന�മതിയായ ‘%2$s’ എന�നത�മായി "
-"ചേർന�ന� പോക�ന�നില�ല."
-
 #. TRANS: Client error displayed when trying to add an unindentified field to profile.
 #. TRANS: %s is a field name.
 #, php-format
@@ -4273,6 +4104,8 @@ msgid "Share my current location when posting notices"
 msgstr "അറിയിപ�പ�കൾ പ�രസിദ�ധീകരിക�ക�ന�നതിനോടൊപ�പം എന�റെ ഇപ�പോഴത�തെ സ�ഥലവ�ം പങ�ക�വെയ�ക�ക�ക"
 
 #. TRANS: Field label in form for profile settings.
+#. TRANS: Title for group tag cloud section.
+#. TRANS: %s is a group name.
 msgid "Tags"
 msgstr "റ�റാഗ�കൾ"
 
@@ -4300,7 +4133,7 @@ msgstr "താങ�കൾ സാധാരണയ�ണ�ടാകാറ�ള
 
 #. TRANS: Checkbox label in form for profile settings.
 msgid ""
-"Automatically subscribe to whoever subscribes to me (best for non-humans)."
+"Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr ""
 
 #. TRANS: Dropdown field label on profile settings, for what policies to apply when someone else tries to subscribe to your updates.
@@ -4369,11 +4202,6 @@ msgstr "സ�ഥാനം സംബന�ധിച�ച ക�രമീകര
 msgid "Could not save tags."
 msgstr "റ�റാഗ�കൾ സേവ� ചെയ�യാൻ കഴിഞ�ഞില�ല."
 
-#. TRANS: Confirmation shown when user profile settings are saved.
-#. TRANS: Message after successful saving of administrative settings.
-msgid "Settings saved."
-msgstr "സജ�ജീകരണങ�ങൾ സേവ� ചെയ�തിരിക�ക�ന�ന�."
-
 #. TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
 #. TRANS: Page title for page where a user account can be restored from backup.
 msgid "Restore account"
@@ -4386,8 +4214,9 @@ msgid "Beyond the page limit (%s)."
 msgstr "താളിന�റെ പരിധിയ�ക�ക� (%s) പ�റത�താണ�."
 
 #. TRANS: Server error displayed when a public timeline cannot be retrieved.
-msgid "Could not retrieve public stream."
-msgstr ""
+#, fuzzy
+msgid "Could not retrieve public timeline."
+msgstr "പ�രിയങ�കരങ�ങളായ അറിയിപ�പ�കൾ ശേഖരിക�കാൻ കഴിഞ�ഞില�ല."
 
 #. TRANS: Title for all public timeline pages but the first.
 #. TRANS: %d is the page number.
@@ -4401,16 +4230,23 @@ msgid "Public timeline"
 msgstr "സാർവ�വജനിക സമയരേഖ"
 
 #. TRANS: Link description for public timeline feed.
-msgid "Public Stream Feed (RSS 1.0)"
+msgid "Public Timeline Feed (Activity Streams JSON)"
 msgstr ""
 
 #. TRANS: Link description for public timeline feed.
-msgid "Public Stream Feed (RSS 2.0)"
-msgstr ""
+#, fuzzy
+msgid "Public Timeline Feed (RSS 1.0)"
+msgstr "സാർവ�വജനിക സമയരേഖ, താൾ %d"
 
 #. TRANS: Link description for public timeline feed.
-msgid "Public Stream Feed (Atom)"
-msgstr ""
+#, fuzzy
+msgid "Public Timeline Feed (RSS 2.0)"
+msgstr "സാർവ�വജനിക സമയരേഖ, താൾ %d"
+
+#. TRANS: Link description for public timeline feed.
+#, fuzzy
+msgid "Public Timeline Feed (Atom)"
+msgstr "സാർവ�വജനിക സമയരേഖ, താൾ %d"
 
 #. TRANS: Text displayed for public feed when there are no public notices.
 #, php-format
@@ -4455,50 +4291,6 @@ msgid ""
 "tool."
 msgstr ""
 
-#. TRANS: Title for page with public list cloud.
-#, fuzzy
-msgid "Public list cloud"
-msgstr "സാർവ�വജനിക സമയരേഖ, താൾ %d"
-
-#. TRANS: Page notice for page with public list cloud.
-#. TRANS: %s is a StatusNet sitename.
-#, fuzzy, php-format
-msgid "These are largest lists on %s"
-msgstr "സമീപകാലത�ത� %s സൈറ�റിൽ �റ�റവ�ം ജനപ�രിയമായ റ�റാഗ�കൾ"
-
-#. TRANS: Empty list message on page with public list cloud.
-#. TRANS: This message contains Markdown links in the form [description](link).
-#, php-format
-msgid "No one has [listed](%%doc.tags%%) anyone yet."
-msgstr ""
-
-#. TRANS: Additional empty list message on page with public list cloud for logged in users.
-#, fuzzy
-msgid "Be the first to list someone!"
-msgstr "പ�രസിദ�ധീകരിക�ക�ന�ന ആദ�യ വ�യക�തിയാക�ക!"
-
-#. TRANS: Additional empty list message on page with public list cloud for anonymous users.
-#. TRANS: This message contains Markdown links in the form [description](link).
-#, fuzzy, php-format
-msgid ""
-"Why not [register an account](%%action.register%%) and be the first to list "
-"someone!"
-msgstr ""
-"എന�ത�കൊണ�ട� [അംഗത�വമെട�ക�ക�കയ�ം](%%action.register%%) പ�രസിദ�ധീകരിക�ക�ന�ന ആദ�യ വ�യക�തിയാക�കയ�ം "
-"ചെയ�ത�കൂട!"
-
-#. TRANS: DT element on on page with public list cloud.
-#, fuzzy
-msgid "List cloud"
-msgstr "ഉപയോക�താവിനെ കണ�ടത�താനായില�ല."
-
-#. TRANS: Link title for number of listed people. %d is the number of listed people.
-#, php-format
-msgid "1 person listed"
-msgid_plural "%d people listed"
-msgstr[0] ""
-msgstr[1] ""
-
 #. TRANS: Public RSS feed description. %s is the StatusNet site name.
 #, fuzzy, php-format
 msgid "%s updates from everyone."
@@ -4623,7 +4415,6 @@ msgid "6 or more characters, and do not forget it!"
 msgstr "ആറോ അതിലധികമോ അക�ഷരങ�ങൾ, അത� മറക�കര�ത�!"
 
 #. TRANS: Button text for password reset form.
-#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
 msgctxt "BUTTON"
 msgid "Reset"
 msgstr "പ�നഃക�രമീകരിക�ക�ക"
@@ -4632,18 +4423,6 @@ msgstr "പ�നഃക�രമീകരിക�ക�ക"
 msgid "Enter a nickname or email address."
 msgstr "ഒര� വിളിപ�പേരോ ഇമെയിൽ വിലാസമോ നൽക�ക."
 
-#. TRANS: Information on password recovery form if no known username or e-mail address was specified.
-msgid "No user with that email address or username."
-msgstr "ആ ഇമെയിൽ വിലാസമോ ഉപയോക�തൃനാമമോ ഉപയോഗിക�ക�ന�ന ഒര� ഉപയോക�താവ�ം ഇല�ല."
-
-#. TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.
-msgid "No registered email address for that user."
-msgstr "ആ ഉപയോക�താവ� ഇമെയിൽ വിലാസമൊന�ന�ം നൽകിയിട�ടില�ല."
-
-#. TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.
-msgid "Error saving address confirmation."
-msgstr "വിലാസത�തിന�റെ സ�ഥിരീകരണം സേവ� ചെയ�യ�മ�പോൾ പിഴവ�ണ�ടായി."
-
 #. TRANS: User notification after an e-mail with instructions was sent from the password recovery form.
 msgid ""
 "Instructions for recovering your password have been sent to the email "
@@ -4808,70 +4587,6 @@ msgstr ""
 "(അല�പസമയത�തിനകം, താങ�കള�ടെ ഇമെയിൽ വിലാസം എങ�ങനെ സ�ഥിരീകരിക�കാം എന�ന നിർദ�ദേശങ�ങളടങ�ങിയ "
 "സന�ദേശം താങ�കള�ടെ ഇമെയിലിൽ ലഭിക�ക�ം.)"
 
-#. TRANS: Page notice for remote subscribe. This message contains Markdown links.
-#. TRANS: Ensure to keep the correct markup of [link description](link).
-#, 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 ""
-
-#. TRANS: Page title for Remote subscribe.
-msgid "Remote subscribe"
-msgstr ""
-
-#. TRANS: Field legend on page for remote subscribe.
-msgid "Subscribe to a remote user"
-msgstr ""
-
-#. TRANS: Field label on page for remote subscribe.
-msgid "User nickname"
-msgstr "ഉപയോക�തൃ വിളിപ�പേര�"
-
-#. TRANS: Field title on page for remote subscribe.
-msgid "Nickname of the user you want to follow."
-msgstr "താങ�കൾക�ക� പിന�ത�ടരേണ�ട ഉപയോക�താവിന�റെ വിളിപ�പേര�."
-
-#. TRANS: Field label on page for remote subscribe.
-msgid "Profile URL"
-msgstr ""
-
-#. TRANS: Field title on page for remote subscribe.
-msgid "URL of your profile on another compatible microblogging service."
-msgstr ""
-
-#. TRANS: Button text on page for remote subscribe.
-#. TRANS: Link text for link that will subscribe to a remote profile.
-#. TRANS: Button text to subscribe to a user.
-#. TRANS: Button text for subscribing to a list.
-msgctxt "BUTTON"
-msgid "Subscribe"
-msgstr "വരിക�കാരാക�ക"
-
-#. TRANS: Form validation error on page for remote subscribe when an invalid profile URL was provided.
-#, fuzzy
-msgid "Invalid profile URL (bad format)."
-msgstr "പ�രമാണത�തിന�റെ പേര� അസാധ�വാണ�."
-
-#. TRANS: Form validation error on page for remote subscribe when no the provided profile URL
-#. TRANS: does not contain expected data.
-msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
-msgstr ""
-
-#. TRANS: Form validation error on page for remote subscribe.
-#, fuzzy
-msgid "That is a local profile! Login to subscribe."
-msgstr "വരിക�കാരനാക�ന�നതിൽ നിന�ന�ം ആ ഉപയോക�താവ� താങ�കളെ തടഞ�ഞിരിക�ക�ന�ന�."
-
-#. TRANS: Form validation error on page for remote subscribe when the remote service is not providing a request token.
-msgid "Could not get a request token."
-msgstr "അഭ�യർത�ഥനാ ചീട�ട� ലഭ�യമാക�കാനായില�ല."
-
-#. TRANS: Client error displayed when trying to (un)list an OMB 0.1 remote profile.
-msgid "You cannot (un)list an OMB 0.1 remote profile with this action."
-msgstr ""
-
 #. TRANS: Client error displayed when an unknown error occurs while delisting a user.
 #. TRANS: %s is a username.
 #, php-format
@@ -4924,6 +4639,12 @@ msgstr "%s എന�ന ഉപയോക�താവിന�ള�ള മറ�
 msgid "Replies to %1$s, page %2$d"
 msgstr "%1$s എന�ന ഉപയോക�താവിന�ള�ള മറ�പടികൾ, താൾ %2$d"
 
+#. TRANS: Link for feed with replies for a user.
+#. TRANS: %s is a user nickname.
+#, php-format
+msgid "Replies feed for %s (Activity Streams JSON)"
+msgstr ""
+
 #. TRANS: Link for feed with replies for a user.
 #. TRANS: %s is a user nickname.
 #, php-format
@@ -5034,7 +4755,7 @@ msgstr ""
 
 #. TRANS: Form instructions for feed restore.
 msgid ""
-"You can upload a backed-up stream in <a href=\"http://activitystrea.ms/"
+"You can upload a backed-up timeline in <a href=\"http://activitystrea.ms/"
 "\">Activity Streams</a> format."
 msgstr ""
 
@@ -5153,6 +4874,26 @@ msgstr "പ�നഃക�രമീകരണ ചാവിയ�ം രഹസ�
 msgid "Application info"
 msgstr ""
 
+#. TRANS: Field label on application page.
+msgid "Consumer key"
+msgstr ""
+
+#. TRANS: Field label on application page.
+msgid "Consumer secret"
+msgstr "ഉപയോക�തൃ രഹസ�യം"
+
+#. TRANS: Field label on application page.
+msgid "Request token URL"
+msgstr "അഭ�യർത�ഥനാ ചീട�ടിന�റെ യൂ.ആർ.എൽ."
+
+#. TRANS: Field label on application page.
+msgid "Access token URL"
+msgstr "അഭിഗമ�യതാ ചീട�ടിന�റെ യൂ.ആർ.എൽ."
+
+#. TRANS: Field label on application page.
+msgid "Authorize URL"
+msgstr "അംഗീകരണത�തിന�ള�ള യൂ.ആർ.എൽ."
+
 #. TRANS: Note on the OAuth application page about signature support.
 #, fuzzy
 msgid ""
@@ -5176,6 +4917,11 @@ msgstr "%1$s എന�ന ഉപയോക�താവിന� പ�രിയ
 msgid "Could not retrieve favorite notices."
 msgstr "പ�രിയങ�കരങ�ങളായ അറിയിപ�പ�കൾ ശേഖരിക�കാൻ കഴിഞ�ഞില�ല."
 
+#. TRANS: Feed link text. %s is a username.
+#, php-format
+msgid "Feed for favorites of %s (Activity Streams JSON)"
+msgstr ""
+
 #. TRANS: Feed link text. %s is a username.
 #, php-format
 msgid "Feed for favorites of %s (RSS 1.0)"
@@ -5233,6 +4979,11 @@ msgstr "%s സംഘം"
 msgid "%1$s group, page %2$d"
 msgstr "%1$s സംഘം, താൾ %2$d"
 
+#. TRANS: Tooltip for feed link. %s is a group nickname.
+#, php-format
+msgid "Notice feed for %s group (Activity Streams JSON)"
+msgstr ""
+
 #. TRANS: Tooltip for feed link. %s is a group nickname.
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
@@ -5253,42 +5004,8 @@ msgstr ""
 msgid "FOAF for %s group"
 msgstr ""
 
-#. TRANS: Header for mini list of group members on a group page (h2).
-msgid "Members"
-msgstr "അംഗങ�ങൾ"
-
-#. TRANS: Description for mini list of group members on a group page when the group has no members.
-#. TRANS: Content of "Listed" page if there are no listed users.
-#. TRANS: Content of "People following tag x" if there are no subscribed users.
-#. TRANS: Empty list message for tags.
-#. TRANS: Text for user subscription statistics if the user has no subscriptions.
-#. TRANS: Text for user subscriber statistics if user has no subscribers.
-#. TRANS: Text for user user group membership statistics if user is not a member of any group.
-#. TRANS: Default content for section/sidebar widget.
-msgid "(None)"
-msgstr "(ഒന�ന�മില�ല)"
-
-#. TRANS: Link to all group members from mini list of group members if group has more than n members.
-msgid "All members"
-msgstr "എല�ലാ അംഗങ�ങള�ം"
-
-#. TRANS: Header for group statistics on a group page (h2).
-#. TRANS: H2 text for user statistics.
-msgid "Statistics"
-msgstr "സ�ഥിതിവിവരക�കണക�ക�കൾ"
-
-#. TRANS: Label for group creation date.
-msgctxt "LABEL"
-msgid "Created"
-msgstr "സൃഷ�ടിച�ചിരിക�ക�ന�ന�"
-
-#. TRANS: Label for member count in statistics on group page.
-msgctxt "LABEL"
-msgid "Members"
-msgstr "അംഗങ�ങൾ"
-
 #. TRANS: Notice on group pages for anonymous users for StatusNet sites that accept new registrations.
-#. TRANS: **%s** is the group alias, %%%%site.name%%%% is the site name,
+#. TRANS: %s is the group name, %%%%site.name%%%% is the site name,
 #. TRANS: %%%%action.register%%%% is the URL for registration, %%%%doc.help%%%% is a URL to help.
 #. TRANS: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
 #, php-format
@@ -5301,21 +5018,18 @@ msgid ""
 msgstr ""
 
 #. TRANS: Notice on group pages for anonymous users for StatusNet sites that accept no new registrations.
-#. TRANS: **%s** is the group alias, %%%%site.name%%%% is the site name,
+#. TRANS: %s is the group name, %%%%site.name%%%% is the site name,
 #. TRANS: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
-#, php-format
+#, fuzzy, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
 "wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
 "[StatusNet](http://status.net/) tool. Its members share short messages about "
-"their life and interests. "
+"their life and interests."
 msgstr ""
-
-#. TRANS: Title for list of group administrators on a group page.
-#, fuzzy
-msgctxt "TITLE"
-msgid "Admins"
-msgstr "കാര�യനിർവാഹകർ"
+"സ�വതന�ത�ര സോഫ�റ�റ�‌വേറായ [സ�റ�റാറ�റസ�‌നെറ�റ�](http://status.net/) ഉപകരണം ഉപയോഗിച�ച�  [മൈക�രോ-"
+"ബ�ലോഗിങ�](http://en.wikipedia.org/wiki/Micro-blogging) സേവനം നൽക�ന�ന %%site.name%"
+"% എന�ന സൈറ�റിൽ **%s** എന�നയാൾക�ക� അംഗത�വമ�ണ�ട�. "
 
 #. TRANS: Client error displayed requesting a single message that does not exist.
 msgid "No such message."
@@ -5411,10 +5125,22 @@ msgstr ""
 "ചെയ�ത�കൂട!"
 
 #. TRANS: Header on show list page.
+#. TRANS: Link description for link to list of users tagged with a tag (so part of a list).
 #, fuzzy
 msgid "Listed"
 msgstr "അന�മതി"
 
+#. TRANS: Content of "Listed" page if there are no listed users.
+#. TRANS: Content of "People following tag x" if there are no subscribed users.
+#. TRANS: Description for mini list of group members on a group page when the group has no members.
+#. TRANS: Empty list message for tags.
+#. TRANS: Text for user subscription statistics if the user has no subscriptions.
+#. TRANS: Text for user subscriber statistics if user has no subscribers.
+#. TRANS: Text for user user group membership statistics if user is not a member of any group.
+#. TRANS: Default content for section/sidebar widget.
+msgid "(None)"
+msgstr "(ഒന�ന�മില�ല)"
+
 #. TRANS: Link for more "People in list x by a user"
 #. TRANS: if there are more than the mini list's maximum.
 #, fuzzy
@@ -5426,24 +5152,19 @@ msgstr "കൂട�തൽ പ�രദർശിപ�പിക�ക�ക"
 msgid "Subscribers"
 msgstr "വരിക�കാർ"
 
-#. TRANS: Link for more "People following tag x"
-#. TRANS: if there are more than the mini list's maximum.
-msgid "All subscribers"
-msgstr "എല�ലാ വരിക�കാര�ം"
-
-#. TRANS: Page title showing tagged notices in one user's stream.
+#. TRANS: Page title showing tagged notices in one user's timeline.
 #. TRANS: %1$s is the username, %2$s is the hash tag.
 #, fuzzy, php-format
 msgid "Notices by %1$s tagged %2$s"
 msgstr "%s എന�ന� റ�റാഗ� ചെയ�തിട�ട�ള�ള അറിയിപ�പ�കൾ"
 
-#. TRANS: Page title showing tagged notices in one user's stream.
+#. TRANS: Page title showing tagged notices in one user's timeline.
 #. TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number.
 #, php-format
 msgid "Notices by %1$s tagged %2$s, page %3$d"
 msgstr ""
 
-#. TRANS: Extended page title showing tagged notices in one user's stream.
+#. TRANS: Extended page title showing tagged notices in one user's timeline.
 #. TRANS: %1$s is the username, %2$d is the page number.
 #, fuzzy, php-format
 msgid "Notices by %1$s, page %2$d"
@@ -5455,6 +5176,12 @@ msgstr "%1$s എന�ന ഉപയോക�താവിന�ള�ള മറ
 msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
 msgstr ""
 
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#, php-format
+msgid "Notice feed for %s (Activity Streams JSON)"
+msgstr ""
+
 #. TRANS: Title for link to notice feed.
 #. TRANS: %s is a user nickname.
 #, php-format
@@ -5479,7 +5206,7 @@ msgstr ""
 msgid "FOAF for %s"
 msgstr ""
 
-#. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
+#. TRANS: First sentence of empty list message for a timeline. $1%s is a user nickname.
 #, php-format
 msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
 msgstr ""
@@ -5492,7 +5219,7 @@ msgstr ""
 "താത�പര�യമ�ള�ളതെന�തോ ഈയിടെ കണ�ടെന�ന� തോന�ന�ന�ന�? താങ�കളിത�വരെയൊന�ന�ം പ�രസിദ�ധീകരിച�ചില�ലല�ലോ, "
 "ഇപ�പോഴാണെന�ന� തോന�ന�ന�ന� നല�ല സമയം :)"
 
-#. TRANS: Second sentence of empty  list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
+#. TRANS: Second sentence of empty  list message for a non-self timeline. %1$s is a user nickname, %2$s is a part of a URL.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
 #, php-format
 msgid ""
@@ -5500,7 +5227,7 @@ msgid ""
 "%?status_textarea=%2$s)."
 msgstr ""
 
-#. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
+#. TRANS: Announcement for anonymous users showing a timeline if site registrations are open.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
 #, php-format
 msgid ""
@@ -5515,13 +5242,13 @@ msgstr ""
 "പേര�ടേയ�ം അറിയിപ�പ�കൾ പിന�ത�ടരാൻ [ഇപ�പോൾ തന�നെ ചേര�ക](%%action.register%%)! (കൂട�തൽ "
 "അറിയ�ക](%%doc.help%%))"
 
-#. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
+#. TRANS: Announcement for anonymous users showing a timeline if site registrations are closed or invite only.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#, php-format
+#, fuzzy, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
 "wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
-"[StatusNet](http://status.net/) tool. "
+"[StatusNet](http://status.net/) tool."
 msgstr ""
 "സ�വതന�ത�ര സോഫ�റ�റ�‌വേറായ [സ�റ�റാറ�റസ�‌നെറ�റ�](http://status.net/) ഉപകരണം ഉപയോഗിച�ച�  [മൈക�രോ-"
 "ബ�ലോഗിങ�](http://en.wikipedia.org/wiki/Micro-blogging) സേവനം നൽക�ന�ന %%site.name%"
@@ -5542,7 +5269,6 @@ msgid "User is already silenced."
 msgstr "ഉപയോക�താവ� മ�മ�പ� തന�നെ നിശബ�ദനാക�കപ�പെട�ടിരിക�ക�ന�ന�."
 
 #. TRANS: Title for site administration panel.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Site"
 msgstr "സൈറ�റ�"
@@ -5559,6 +5285,14 @@ msgstr "സൈറ�റിന�റെ പേര� ശൂന�യമായി
 msgid "You must have a valid contact email address."
 msgstr "താങ�കളെ ബന�ധപ�പെടാനായി സാധ�വായ ഇമെയിൽ വിലാസമ�ണ�ടായിരിക�കണം."
 
+#. TRANS: Client error displayed when a logo URL is not valid.
+msgid "Invalid logo URL."
+msgstr "ലോഗോ യൂ.ആർ.എൽ. അസാധ�വാണ�."
+
+#. TRANS: Client error displayed when a SSL logo URL is invalid.
+msgid "Invalid SSL logo URL."
+msgstr "അസാധ�വായ എസ�.എസ�.എൽ. ലോഗോ യൂ.ആർ.എൽ."
+
 #. TRANS: Client error displayed trying to save site settings with an invalid language code.
 #. TRANS: %s is the invalid language code.
 #, php-format
@@ -5574,13 +5308,11 @@ msgid "Dupe limit must be one or more seconds."
 msgstr ""
 
 #. TRANS: Fieldset legend on site settings panel.
-#, fuzzy
 msgctxt "LEGEND"
 msgid "General"
 msgstr "സാർവത�രികം"
 
 #. TRANS: Field label on site settings panel.
-#, fuzzy
 msgctxt "LABEL"
 msgid "Site name"
 msgstr "സൈറ�റിന�റെ പേര�‌"
@@ -5591,7 +5323,7 @@ msgstr ""
 
 #. TRANS: Field label on site settings panel.
 msgid "Brought by"
-msgstr ""
+msgstr "പ�രായോജകർ"
 
 #. TRANS: Field title on site settings panel.
 msgid "Text used for credits link in footer of each page."
@@ -5599,7 +5331,7 @@ msgstr ""
 
 #. TRANS: Field label on site settings panel.
 msgid "Brought by URL"
-msgstr ""
+msgstr "പ�രായോജകര�ടെ യൂ.ആർ.എൽ."
 
 #. TRANS: Field title on site settings panel.
 msgid "URL used for credits link in footer of each page."
@@ -5633,11 +5365,11 @@ msgid "Default language"
 msgstr "സ�വതേ വേണ�ട ഭാഷ"
 
 #. TRANS: Dropdown title on site settings panel.
-msgid "Site language when autodetection from browser settings is not available"
+msgid ""
+"The site language when autodetection from browser settings is not available."
 msgstr ""
 
 #. TRANS: Fieldset legend on site settings panel.
-#, fuzzy
 msgctxt "LEGEND"
 msgid "Limits"
 msgstr "പരിധികൾ"
@@ -5660,9 +5392,23 @@ msgstr ""
 "ഒരേ കാര�യം വീണ�ട�ം പ�രസിദ�ധീകരിക�കാൻ ഉപയോക�താക�കൾ എത�ര നേരമാണ� (സെക�കന�റ�കളിൽ) "
 "കാത�തിരിക�കേണ�ടത�."
 
+#. TRANS: Fieldset legend for form to change logo.
+#, fuzzy
+msgid "Logo"
+msgstr "ലോഗോ"
+
+#. TRANS: Field label for StatusNet site logo.
+msgid "Site logo"
+msgstr "സൈറ�റിന�റെ ലോഗോ"
+
+#. TRANS: Field label for SSL StatusNet site logo.
+msgid "SSL logo"
+msgstr "എസ�.എസ�.എൽ. ലോഗോ"
+
 #. TRANS: Button title for saving site settings.
-msgid "Save site settings"
-msgstr "സൈറ�റ� സജ�ജീകരണങ�ങൾ ചേവ� ചെയ�യ�ക"
+#, fuzzy
+msgid "Save the site settings."
+msgstr "സൈറ�റ� സജ�ജീകരണങ�ങൾ സേവ� ചെയ�യ�ക"
 
 #. TRANS: Page title for site-wide notice tab in admin panel.
 msgid "Site Notice"
@@ -5688,7 +5434,7 @@ msgstr "സൈറ�റ� അറിയിപ�പ� എഴ�ത�ത�"
 msgid "Site-wide notice text (255 characters maximum; HTML allowed)"
 msgstr ""
 
-#. TRANS: Title for button to save site notice in admin panel.
+#. TRANS: Button title to save site notice in admin panel.
 msgid "Save site notice."
 msgstr "സൈറ�റ� അറിയിപ�പ� സേവ� ചെയ�യ�ക."
 
@@ -5784,9 +5530,8 @@ msgid "That is the wrong confirmation number."
 msgstr "അത� തെറ�റായ സ�ഥിരീകരണ സംഖ�യയാണ�."
 
 #. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
-#, fuzzy
 msgid "Could not delete SMS confirmation."
-msgstr "�.എം. സ�ഥിരീകരണം നീക�കം ചെയ�യാൻ കഴിഞ�ഞില�ല."
+msgstr "എസ�.എം.എസ�. സ�ഥിരീകരണം നീക�കം ചെയ�യാൻ കഴിഞ�ഞില�ല."
 
 #. TRANS: Message given after successfully canceling SMS phone number confirmation.
 msgid "SMS confirmation cancelled."
@@ -5879,7 +5624,7 @@ msgstr "യൂ.ആർ.എൽ. അറിയിക�ക�ക"
 msgid "Snapshots will be sent to this URL."
 msgstr ""
 
-#. TRANS: Title for button to save snapshot settings.
+#. TRANS: Button title to save snapshot settings.
 #, fuzzy
 msgid "Save snapshot settings."
 msgstr "സൈറ�റ� സജ�ജീകരണങ�ങൾ ചേവ� ചെയ�യ�ക"
@@ -5914,10 +5659,6 @@ msgstr "%1$s സംഘത�തിലെ അംഗങ�ങൾ, താൾ %2$d"
 msgid "A list of users awaiting approval to subscribe to you."
 msgstr "ഈ സംഘത�തിലെ ഉപയോക�താക�കള�ടെ പട�ടിക."
 
-#. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
-msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
-msgstr ""
-
 #. TRANS: Page title when subscription succeeded.
 msgid "Subscribed"
 msgstr ""
@@ -6020,8 +5761,7 @@ msgid ""
 "You're not listening to anyone's notices right now, try subscribing to "
 "people you know. Try [people search](%%action.peoplesearch%%), look for "
 "members in groups you're interested in and in our [featured users](%%action."
-"featured%%). If you're a [Twitter user](%%action.twittersettings%%), you can "
-"automatically subscribe to people you already follow there."
+"featured%%)."
 msgstr ""
 
 #. TRANS: Subscription list text when looking at the subscriptions for a of a user other
@@ -6052,6 +5792,12 @@ msgstr "എസ�.എം.എസ�."
 msgid "Notices tagged with %1$s, page %2$d"
 msgstr ""
 
+#. TRANS: Link label for feed on "notices with tag" page.
+#. TRANS: %s is the tag the feed is for.
+#, php-format
+msgid "Notice feed for tag %s (Activity Streams JSON)"
+msgstr ""
+
 #. TRANS: Link label for feed on "notices with tag" page.
 #. TRANS: %s is the tag the feed is for.
 #, php-format
@@ -6090,10 +5836,9 @@ msgid "List %s"
 msgstr "പരിധികൾ"
 
 #. TRANS: Title for list form when an error has occurred.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Error"
-msgstr "അജാക�സ� പിഴവ�"
+msgstr "പിഴവ�"
 
 #. TRANS: Header in list form.
 msgid "User profile"
@@ -6105,10 +5850,9 @@ msgid "List user"
 msgstr "പരിധികൾ"
 
 #. TRANS: Field label on list form.
-#, fuzzy
 msgctxt "LABEL"
 msgid "Lists"
-msgstr "പരിധികൾ"
+msgstr "പട�ടികകൾ"
 
 #. TRANS: Field title on list form.
 msgid ""
@@ -6156,18 +5900,6 @@ msgstr ""
 msgid "%1$s unsubscribed from list %2$s by %3$s"
 msgstr "%1$s എന�ന ഉപയോക�താവിന�റെ വരിക�കാർ, താൾ %2$d"
 
-#. TRANS: Client error displayed when trying to update profile with an incompatible license.
-#. TRANS: %1$s is the license incompatible with site license %2$s.
-#. TRANS: Exception thrown when licenses are not compatible for an authorisation request.
-#. TRANS: %1$s is the license for the listenee, %2$s is the license for "this" StatusNet site.
-#, fuzzy, php-format
-msgid ""
-"Listenee stream license \"%1$s\" is not compatible with site license \"%2$s"
-"\"."
-msgstr ""
-"അറിയിപ�പിന�റെ ഉപയോഗാന�മതിയായ� ‘%1$s’ സൈറ�റിന�റെ ഉപയോഗാന�മതിയായ ‘%2$s’ എന�നത�മായി "
-"ചേർന�ന� പോക�ന�നില�ല."
-
 #. TRANS: Title of URL settings tab in profile settings.
 #, fuzzy
 msgid "URL settings"
@@ -6190,7 +5922,7 @@ msgstr "ഒന�ന�മില�ല"
 
 #. TRANS: Default value for URL shortening settings.
 msgid "[internal]"
-msgstr ""
+msgstr "[ആഭ�യന�തരം]"
 
 #. TRANS: Label for dropdown with URL shortener services.
 msgid "Shorten URLs with"
@@ -6304,145 +6036,10 @@ msgstr "ക�ഷണിക�കൽ സജ�ജമാക�കിയിരി
 msgid "Whether to allow users to invite new users."
 msgstr "പ�തിയ ഉപയോക�താക�കളെ ക�ഷണിക�കാൻ ഉപയോക�താക�കളെ അന�വദിക�കേണ�ടത�ണ�ടോ."
 
-#. TRANS: Title for button to save user settings in user admin panel.
+#. TRANS: Button title to save user settings in user admin panel.
 msgid "Save user settings."
 msgstr "ഉപയോക�തൃ സജ�ജീകരണങ�ങൾ സേവ� ചെയ�യ�ക."
 
-#. TRANS: Page title.
-msgid "Authorize subscription"
-msgstr "വരിക�കാരനാകൽ അംഗീകരിക�ക�ക"
-
-#. TRANS: Page notice on "Authorize subscription" page.
-msgid ""
-"Please check these details to make sure that you want to subscribe to this "
-"user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
-"click \"Reject\"."
-msgstr ""
-
-#. TRANS: Button text on Authorise Subscription page.
-#. TRANS: Submit button text to accept a group membership request on approve group form.
-#. TRANS: Submit button text to accept a subscription request on approve sub form.
-msgctxt "BUTTON"
-msgid "Accept"
-msgstr "സ�വീകരിക�ക�ക"
-
-#. TRANS: Title for button on Authorise Subscription page.
-#. TRANS: Button title to subscribe to a user.
-msgid "Subscribe to this user."
-msgstr "ഈ ഉപയോക�താവിന�റെ വരിക�കാരൻ/വരിക�കാരി ആക�ക."
-
-#. TRANS: Button text on Authorise Subscription page.
-#. TRANS: Submit button text to reject a group membership request on approve group form.
-#. TRANS: Submit button text to reject a subscription request on approve sub form.
-msgctxt "BUTTON"
-msgid "Reject"
-msgstr "നിരസിക�ക�ക"
-
-#. TRANS: Title for button on Authorise Subscription page.
-msgid "Reject this subscription."
-msgstr "ഈ വരിക�കാരനാകൽ നിരസിക�ക�ക."
-
-#. TRANS: Client error displayed for an empty authorisation request.
-msgid "No authorization request!"
-msgstr ""
-
-#. TRANS: Accept message header from Authorise subscription page.
-msgid "Subscription authorized"
-msgstr "വരിക�കാരനാകൽ അംഗീകരിക�കപ�പെട�ട�"
-
-#. TRANS: Accept message text from Authorise subscription page.
-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 ""
-
-#. TRANS: Reject message header from Authorise subscription page.
-msgid "Subscription rejected"
-msgstr "വരിക�കാരനാകൽ നിരസിക�കപ�പെട�ട�"
-
-#. TRANS: Reject message from Authorise subscription page.
-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 ""
-
-#. TRANS: Exception thrown when no valid user is found for an authorisation request.
-#. TRANS: %s is a listener URI.
-#, php-format
-msgid "Listener URI \"%s\" not found here."
-msgstr ""
-
-#. TRANS: Exception thrown when listenee URI is too long for an authorisation request.
-#. TRANS: %s is a listenee URI.
-#, fuzzy, php-format
-msgid "Listenee URI \"%s\" is too long."
-msgstr "സ�രോതസ�സ� യൂ.ആർ.എൽ. വളരെ വല�താണ�."
-
-#. TRANS: Exception thrown when listenee URI is a local user for an authorisation request.
-#. TRANS: %s is a listenee URI.
-#, php-format
-msgid "Listenee URI \"%s\" is a local user."
-msgstr ""
-
-#. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
-#. TRANS: %s is a profile URL.
-#, php-format
-msgid "Profile URL \"%s\" is for a local user."
-msgstr ""
-
-#. TRANS: Exception thrown when avatar URL is invalid for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#, fuzzy, php-format
-msgid "Avatar URL \"%s\" is not valid."
-msgstr "സ�രോതസ�സ� യൂ.ആർ.എൽ. അസാധ�വാണ�."
-
-#. TRANS: Exception thrown when avatar URL could not be read for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#, php-format
-msgid "Cannot read avatar URL \"%s\"."
-msgstr ""
-
-#. TRANS: Exception thrown when avatar URL return an invalid image type for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#, php-format
-msgid "Wrong image type for avatar URL \"%s\"."
-msgstr ""
-
-#. TRANS: Title for profile design page.
-#. TRANS: Page title for profile design page.
-msgid "Profile design"
-msgstr ""
-
-#. TRANS: Instructions for Profile design page.
-#. TRANS: Instructions for profile design page.
-msgid ""
-"Customize the way your profile looks with a background image and a colour "
-"palette of your choice."
-msgstr ""
-
-#. TRANS: Succes message on Profile design page when finding an easter egg.
-msgid "Enjoy your hotdog!"
-msgstr "താങ�കള�ടെ ഹോട�ട�ഡോഗ� ആസ�വദിക�കൂ!"
-
-#. TRANS: Form legend on Profile design page.
-#, fuzzy
-msgid "Design settings"
-msgstr "സൈറ�റ� സജ�ജീകരണങ�ങൾ ചേവ� ചെയ�യ�ക"
-
-#. TRANS: Checkbox label on Profile design page.
-msgid "View profile designs"
-msgstr ""
-
-#. TRANS: Title for checkbox on Profile design page.
-msgid "Show or hide profile designs."
-msgstr ""
-
-#. TRANS: Form legend on Profile design page for form to choose a background image.
-msgid "Background file"
-msgstr "പശ�ചാത�തല പ�രമാണം"
-
 #. TRANS: Page title for all but the first page of groups for a user.
 #. TRANS: %1$s is a nickname, %2$d is a page number.
 #, php-format
@@ -6483,7 +6080,7 @@ msgstr "സ�റ�റാറ�റസ�‌നെറ�റ� %s"
 #. TRANS: %1$s is the engine name (StatusNet) and %2$s is the StatusNet version.
 #, php-format
 msgid ""
-"This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, "
+"This site is powered by %1$s version %2$s, Copyright 2008-2011 StatusNet, "
 "Inc. and contributors."
 msgstr ""
 
@@ -6500,7 +6097,7 @@ msgid ""
 "StatusNet is free software: you can redistribute it and/or modify it under "
 "the terms of the GNU Affero General Public License as published by the Free "
 "Software Foundation, either version 3 of the License, or (at your option) "
-"any later version. "
+"any later version."
 msgstr ""
 
 #. TRANS: Content part of StatusNet version page.
@@ -6508,7 +6105,7 @@ msgid ""
 "This program is distributed in the hope that it will be useful, but WITHOUT "
 "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
 "FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License "
-"for more details. "
+"for more details."
 msgstr ""
 
 #. TRANS: Content part of StatusNet version page.
@@ -6562,16 +6159,26 @@ msgstr ""
 msgid "Robin thinks something is impossible."
 msgstr "ചിലത� അസാധ�യമാണെന�നാണ� റോബിന�ം സന�ദേശം പരിഭാഷ ചെയ�ത പ�രവീണ�ം കര�ത�ന�നത�."
 
+#. TRANS: Message used to be inserted as %2$s in  the text "No file may
+#. TRANS: be larger than %1$d byte and the file you sent was %2$s.".
+#. TRANS: %1$d is the number of bytes of an uploaded file.
+#, php-format
+msgid "%1$d byte"
+msgid_plural "%1$d bytes"
+msgstr[0] ""
+msgstr[1] ""
+
 #. TRANS: Message given if an upload is larger than the configured maximum.
-#. TRANS: %1$d is the byte limit for uploads, %2$d is the byte count for the uploaded file.
-#. TRANS: %1$s is used for plural.
+#. TRANS: %1$d (used for plural) is the byte limit for uploads,
+#. TRANS: %2$s is the proper form of "n bytes". This is the only ways to have
+#. TRANS: gettext support multiple plurals in the same message, unfortunately...
 #, php-format
 msgid ""
-"No file may be larger than %1$d byte and the file you sent was %2$d bytes. "
-"Try to upload a smaller version."
+"No file may be larger than %1$d byte and the file you sent was %2$s. Try to "
+"upload a smaller version."
 msgid_plural ""
-"No file may be larger than %1$d bytes and the file you sent was %2$d bytes. "
-"Try to upload a smaller version."
+"No file may be larger than %1$d bytes and the file you sent was %2$s. Try to "
+"upload a smaller version."
 msgstr[0] ""
 msgstr[1] ""
 
@@ -6639,6 +6246,11 @@ msgstr ""
 msgid "Could not create login token for %s"
 msgstr ""
 
+#. TRANS: Exception thrown when a program code class (%s) cannot be instantiated.
+#, fuzzy, php-format
+msgid "Cannot instantiate class %s."
+msgstr "പ�തിയ രഹസ�യവാക�ക� സേവ� ചെയ�യാനാവില�ല."
+
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.
 msgid "No database name or DSN found anywhere."
 msgstr ""
@@ -6800,7 +6412,7 @@ msgstr ""
 #, php-format
 msgid ""
 "You already have %1$d or more people in list %2$s, which is the maximum "
-"allowed number.Try unlisting others first."
+"allowed number. Try unlisting others first."
 msgstr ""
 
 #. TRANS: Exception thrown when inserting a list subscription in the database fails.
@@ -6822,7 +6434,6 @@ msgid "Unable to save tag."
 msgstr ""
 
 #. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
-#. TRANS: Error message displayed to a banned user when they try to subscribe.
 msgid "You have been banned from subscribing."
 msgstr ""
 
@@ -6842,10 +6453,6 @@ msgstr ""
 msgid "Could not delete self-subscription."
 msgstr ""
 
-#. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
-msgid "Could not delete subscription OMB token."
-msgstr ""
-
 #. TRANS: Exception thrown when a subscription could not be deleted on the server.
 msgid "Could not delete subscription."
 msgstr ""
@@ -6880,6 +6487,18 @@ msgstr ""
 msgid "Single-user mode code called when not enabled."
 msgstr ""
 
+#. TRANS: Information on password recovery form if no known username or e-mail address was specified.
+msgid "No user with that email address or username."
+msgstr "ആ ഇമെയിൽ വിലാസമോ ഉപയോക�തൃനാമമോ ഉപയോഗിക�ക�ന�ന ഒര� ഉപയോക�താവ�ം ഇല�ല."
+
+#. TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.
+msgid "No registered email address for that user."
+msgstr "ആ ഉപയോക�താവ� ഇമെയിൽ വിലാസമൊന�ന�ം നൽകിയിട�ടില�ല."
+
+#. TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.
+msgid "Error saving address confirmation."
+msgstr "വിലാസത�തിന�റെ സ�ഥിരീകരണം സേവ� ചെയ�യ�മ�പോൾ പിഴവ�ണ�ടായി."
+
 #. TRANS: Server exception thrown when creating a group failed.
 msgid "Could not create group."
 msgstr "സംഘം സൃഷ�ടിക�കാൻ കഴിഞ�ഞില�ല."
@@ -7146,27 +6765,12 @@ msgstr ""
 msgid "saveSettings() not implemented."
 msgstr ""
 
-#. TRANS: Client error message thrown if design settings could not be deleted in
-#. TRANS: the admin panel Design.
-msgid "Unable to delete design setting."
-msgstr "രൂപകല�പനാ സജ�ജീകരണങ�ങൾ മായ�ക�കാൻ കഴിഞ�ഞില�ല."
-
 #. TRANS: Header in administrator navigation panel.
-#. TRANS: Header in settings navigation panel.
 #, fuzzy
 msgctxt "HEADER"
 msgid "Home"
 msgstr "ഹോംപേജ�"
 
-#. TRANS: Menu item in administrator navigation panel.
-#. TRANS: Menu item in default local navigation panel.
-#. TRANS: Menu item in personal group navigation menu.
-#. TRANS: Menu item in settings navigation panel.
-#, fuzzy
-msgctxt "MENU"
-msgid "Home"
-msgstr "ഹോംപേജ�"
-
 #. TRANS: Header in administrator navigation panel.
 #, fuzzy
 msgctxt "HEADER"
@@ -7182,17 +6786,6 @@ msgctxt "MENU"
 msgid "Site"
 msgstr "സൈറ�റ�"
 
-#. TRANS: Menu item title in administrator navigation panel.
-msgid "Design configuration"
-msgstr "രൂപകല�പനാ ക�രമീകരണം"
-
-#. TRANS: Menu item in administrator navigation panel.
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: Menu item in settings navigation panel.
-msgctxt "MENU"
-msgid "Design"
-msgstr "രൂപകല�പന"
-
 #. TRANS: Menu item title in administrator navigation panel.
 msgid "User configuration"
 msgstr "ഉപയോക�തൃ ക�രമീകരണം"
@@ -7297,39 +6890,6 @@ msgstr ""
 msgid "Could not authenticate you."
 msgstr ""
 
-#. TRANS: Server error displayed when trying to create an anynymous OAuth consumer.
-msgid "Could not create anonymous consumer."
-msgstr ""
-
-#. TRANS: Server error displayed when trying to create an anynymous OAuth application.
-msgid "Could not create anonymous OAuth application."
-msgstr ""
-
-#. TRANS: Exception thrown when no token association could be found.
-msgid ""
-"Could not find a profile and application associated with the request token."
-msgstr ""
-
-#. TRANS: Exception thrown when no access token can be issued.
-msgid "Could not issue access token."
-msgstr ""
-
-#. TRANS: Exception thrown when a database error occurs.
-msgid "Database error inserting OAuth application user."
-msgstr ""
-
-#. TRANS: Exception thrown when a database error occurs.
-msgid "Database error updating OAuth application user."
-msgstr ""
-
-#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
-msgid "Tried to revoke unknown token."
-msgstr ""
-
-#. TRANS: Exception thrown when an attempt is made to remove a revoked token.
-msgid "Failed to delete revoked token."
-msgstr ""
-
 #. TRANS: Form input field label for application icon.
 msgid "Icon"
 msgstr "�കോൺ"
@@ -7410,13 +6970,12 @@ msgid "Default access for this application: read-only, or read-write"
 msgstr ""
 
 #. TRANS: Submit button title.
-msgid "Cancel"
-msgstr "റദ�ദാക�ക�ക"
+msgid "Cancel application changes."
+msgstr ""
 
 #. TRANS: Submit button title.
-#. TRANS: Button text to save a list.
-msgid "Save"
-msgstr "സേവ� ചെയ�യ�ക"
+msgid "Save application changes."
+msgstr ""
 
 #. TRANS: Name for an anonymous application in application list.
 #, fuzzy
@@ -7452,6 +7011,18 @@ msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "തിരിച�ചെട�ക�ക�ക"
 
+#. TRANS: Submit button text to accept a group membership request on approve group form.
+#. TRANS: Submit button text to accept a subscription request on approve sub form.
+msgctxt "BUTTON"
+msgid "Accept"
+msgstr "സ�വീകരിക�ക�ക"
+
+#. TRANS: Submit button text to reject a group membership request on approve group form.
+#. TRANS: Submit button text to reject a subscription request on approve sub form.
+msgctxt "BUTTON"
+msgid "Reject"
+msgstr "നിരസിക�ക�ക"
+
 #. TRANS: Atom feed exception thrown when an author element does not contain a name element.
 msgid "Author element must contain a name element."
 msgstr ""
@@ -8009,6 +7580,11 @@ msgstr ""
 msgid "Go to the installer."
 msgstr ""
 
+#. TRANS: Header on conversation page. Hidden by default (h2).
+#. TRANS: Label for user statistics.
+msgid "Notices"
+msgstr "അറിയിപ�പ�കൾ"
+
 #. TRANS: Page title for when a database error occurs.
 msgid "Database error"
 msgstr "ഡാറ�റാബേസ� പിഴവ�"
@@ -8020,14 +7596,6 @@ msgctxt "MENU"
 msgid "Public"
 msgstr "സാർവ�വജനികം"
 
-#. TRANS: Menu item in default local navigation panel.
-#. TRANS: Menu item in search group navigation panel.
-#. TRANS: Menu item in local navigation menu.
-#, fuzzy
-msgctxt "MENU"
-msgid "Groups"
-msgstr "സംഘങ�ങൾ"
-
 #. TRANS: Menu item in default local navigation panel.
 #. TRANS: Menu item title in local navigation menu.
 #, fuzzy
@@ -8044,53 +7612,12 @@ msgstr "മായ�ക�ക�ക"
 msgid "Delete this user"
 msgstr "ഈ ഉപയോക�താവിനെ നീക�കം ചെയ�യ�ക"
 
-#. TRANS: Form legend of form for changing the page design.
-#, fuzzy
-msgid "Change design"
-msgstr "രൂപകല�പന സേവ�‌ ചെയ�യ�ക"
-
-#. TRANS: Fieldset legend on profile design page to change profile page colours.
-msgid "Change colours"
-msgstr "നിറങ�ങൾ മാറ�റ�ക"
-
-#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-msgid "Use defaults"
-msgstr "സ�വതേയ�ള�ളവ ഉപയോഗിക�ക�ക"
-
-#. TRANS: Label in form on profile design page.
-#. TRANS: Field contains file name on user's computer that could be that user's custom profile background image.
-msgid "Upload file"
-msgstr "പ�രമാണം അപ�‌ലോഡ� ചെയ�യ�ക"
-
-#. TRANS: Instructions for form on profile design page.
-#, fuzzy
-msgid ""
-"You can upload your personal background image. The maximum file size is 2MB."
-msgstr ""
-"താങ�കൾക�ക� ഈ സൈറ�റിന�ള�ള പശ�ചാത�തല ചിത�രം അപ�‌ലോഡ� ചെയ�യാവ�ന�നതാണ�. പ�രമാണത�തിന�റെ പരമാവധി "
-"വലിപ�പം %1$s ആയിരിക�കണം."
-
-#. TRANS: Radio button on profile design page that will enable use of the uploaded profile image.
-msgctxt "RADIO"
-msgid "On"
-msgstr "സജ�ജം"
-
-#. TRANS: Radio button on profile design page that will disable use of the uploaded profile image.
-msgctxt "RADIO"
-msgid "Off"
-msgstr "രഹിതം"
-
-#. TRANS: Success message displayed if design settings were saved after clicking "Use defaults".
-msgid "Design defaults restored."
-msgstr "സ�വതേയ�ള�ള രൂപകല�പന പ�നഃസ�ഥാപിച�ചിരിക�ക�ന�ന�."
-
 #. TRANS: Exception. %s is an ID.
 #, php-format
 msgid "Unable to find services for %s."
 msgstr ""
 
 #. TRANS: Form legend for removing the favourite status for a favourite notice.
-#. TRANS: Title for button text for removing the favourite status for a favourite notice.
 msgid "Disfavor this notice"
 msgstr ""
 
@@ -8099,8 +7626,12 @@ msgctxt "BUTTON"
 msgid "Disfavor favorite"
 msgstr ""
 
+#. TRANS: Button title for removing the favourite status for a favourite notice.
+#, fuzzy
+msgid "Remove this notice from your list of favorite notices."
+msgstr "പ�രിയങ�കരങ�ങളായ അറിയിപ�പ�കൾ ശേഖരിക�കാൻ കഴിഞ�ഞില�ല."
+
 #. TRANS: Form legend for adding the favourite status to a notice.
-#. TRANS: Title for button text for adding the favourite status to a notice.
 msgid "Favor this notice"
 msgstr ""
 
@@ -8109,6 +7640,11 @@ msgctxt "BUTTON"
 msgid "Favor"
 msgstr ""
 
+#. TRANS: Button title for adding the favourite status to a notice.
+#, fuzzy
+msgid "Add this notice to your list of favorite notices."
+msgstr "പ�രിയങ�കരങ�ങളായ അറിയിപ�പ�കൾ ശേഖരിക�കാൻ കഴിഞ�ഞില�ല."
+
 #. TRANS: Feed type name.
 msgid "RSS 1.0"
 msgstr "ആർ.എസ�.എസ�. 1.0"
@@ -8125,6 +7661,10 @@ msgstr "ആറ�റം"
 msgid "FOAF"
 msgstr ""
 
+#. TRANS: Feed type name. See http://activitystrea.ms/
+msgid "Activity Streams"
+msgstr ""
+
 #. TRANS: Client exception thrown when an imported feed does not have an author.
 msgid "No author in the feed."
 msgstr ""
@@ -8157,6 +7697,29 @@ msgstr ""
 msgid "Grant this user the \"%s\" role"
 msgstr ""
 
+#. TRANS: Header for mini list of group members on a group page (h2).
+msgid "Members"
+msgstr "അംഗങ�ങൾ"
+
+#. TRANS: Link to all group members from mini list of group members if group has more than n members.
+msgid "All members"
+msgstr "എല�ലാ അംഗങ�ങള�ം"
+
+#. TRANS: Header for mini list of users with a pending membership request on a group page (h2).
+msgid "Pending"
+msgstr ""
+
+#. TRANS: Header for mini list of users that are blocked in a group page (h2).
+#, fuzzy
+msgid "Blocked"
+msgstr "തടയപ�പെട�ടിരിക�ക�ന�ന�"
+
+#. TRANS: Title for list of group administrators on a group page.
+#, fuzzy
+msgctxt "TITLE"
+msgid "Admins"
+msgstr "കാര�യനിർവാഹകർ"
+
 #. TRANS: Button text for the form that will block a user from a group.
 msgctxt "BUTTON"
 msgid "Block"
@@ -8164,8 +7727,8 @@ msgstr "തടയ�ക"
 
 #. TRANS: Submit button title.
 msgctxt "TOOLTIP"
-msgid "Block this user"
-msgstr "ഈ ഉപയോക�താവിനെ തടയ�ക"
+msgid "Block this user so that they can no longer post messages to it."
+msgstr ""
 
 #. TRANS: Field title on group edit form.
 msgid "URL of the homepage or blog of the group or topic."
@@ -8218,63 +7781,9 @@ msgctxt "GROUPADMIN"
 msgid "Admin"
 msgstr "കാര�യനിർവാഹകൻ"
 
-#. TRANS: Menu item in the group navigation page.
-msgctxt "MENU"
-msgid "Group"
-msgstr "സംഘം"
-
-#. TRANS: Tooltip for menu item in the group navigation page.
-#. TRANS: %s is the nickname of the group.
-#, php-format
-msgctxt "TOOLTIP"
-msgid "%s group"
-msgstr "%s സംഘം"
-
-#. TRANS: Menu item in the group navigation page.
-msgctxt "MENU"
-msgid "Members"
-msgstr "അംഗങ�ങൾ"
-
-#. TRANS: Tooltip for menu item in the group navigation page.
-#. TRANS: %s is the nickname of the group.
-#, php-format
-msgctxt "TOOLTIP"
-msgid "%s group members"
-msgstr "%s സംഘ അംഗങ�ങൾ"
-
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: %d is the number of pending members.
-#, php-format
-msgctxt "MENU"
-msgid "Pending members (%d)"
-msgid_plural "Pending members (%d)"
-msgstr[0] ""
-msgstr[1] ""
-
-#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: %s is the nickname of the group.
-#, fuzzy, php-format
-msgctxt "TOOLTIP"
-msgid "%s pending members"
-msgstr "%s സംഘ അംഗങ�ങൾ"
-
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-msgctxt "MENU"
-msgid "Blocked"
-msgstr "തടയപ�പെട�ടിരിക�ക�ന�ന�"
-
-#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: %s is the nickname of the group.
-#, php-format
-msgctxt "TOOLTIP"
-msgid "%s blocked users"
-msgstr "%s തടയപ�പെട�ട ഉപയോക�താക�കൾ"
-
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: Menu item in primary navigation panel.
-msgctxt "MENU"
-msgid "Admin"
-msgstr "കാര�യനിർവാഹക(ൻ)"
+#. TRANS: Group actions header (h2). Text hidden by default.
+msgid "Group actions"
+msgstr "സംഘത�തിന�റെ പ�രവൃത�തികൾ"
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
@@ -8283,11 +7792,6 @@ msgctxt "TOOLTIP"
 msgid "Edit %s group properties"
 msgstr ""
 
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-msgctxt "MENU"
-msgid "Logo"
-msgstr "ലോഗോ"
-
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
 #, php-format
@@ -8295,16 +7799,10 @@ msgctxt "TOOLTIP"
 msgid "Add or edit %s logo"
 msgstr ""
 
-#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: %s is the nickname of the group.
-#, php-format
-msgctxt "TOOLTIP"
-msgid "Add or edit %s design"
-msgstr "%s എന�ന സംഘത�തിന� രൂപകല�പന കൂട�ടിച�ചേർക�ക�ക അല�ലെങ�കിൽ മാറ�റം വര�ത�ത�ക"
-
-#. TRANS: Group actions header (h2). Text hidden by default.
-msgid "Group actions"
-msgstr "സംഘത�തിന�റെ പ�രവൃത�തികൾ"
+#. TRANS: Link text for link on user profile.
+msgctxt "MENU"
+msgid "Logo"
+msgstr "ലോഗോ"
 
 #. TRANS: Title for groups with the most members section.
 #, fuzzy
@@ -8316,10 +7814,19 @@ msgstr "ജനപ�രിയ അറിയിപ�പ�കൾ"
 msgid "Active groups"
 msgstr "എല�ലാ സംഘങ�ങള�ം"
 
-#. TRANS: Title for group tag cloud section.
-#. TRANS: %s is a group name.
-#, php-format
-msgid "Tags in %s group's notices"
+#. TRANS: Link description for seeing all groups.
+#. TRANS: Link description for seeing all lists.
+#, fuzzy
+msgid "See all"
+msgstr "കൂട�തൽ പ�രദർശിപ�പിക�ക�ക"
+
+#. TRANS: Link title for seeing all groups.
+msgid "See all groups you belong to."
+msgstr ""
+
+#. TRANS: Menu item title in personal group navigation menu.
+#. TRANS: %s is a username.
+msgid "Back to top"
 msgstr ""
 
 #. TRANS: Client exception 406
@@ -8405,12 +7912,44 @@ msgctxt "TITLE"
 msgid "Trends"
 msgstr ""
 
-#. TRANS: Button text for inviting more users to the StatusNet instance.
+#. TRANS: Default button text for inviting more users to the StatusNet instance.
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Invite more colleagues"
 msgstr "പ�തിയ ഉപയോക�താക�കളെ ക�ഷണിക�ക�ക"
 
+#. TRANS: Form legend.
+#, fuzzy
+msgid "Invite collegues"
+msgstr "പ�തിയ ഉപയോക�താക�കളെ ക�ഷണിക�ക�ക"
+
+#. TRANS: Field label for a list of e-mail addresses.
+msgid "Email addresses"
+msgstr "ഇമെയിൽ വിലാസം"
+
+#. TRANS: Field title for a list of e-mail addresses.
+msgid "Addresses of friends to invite (one per line)."
+msgstr "ക�ഷണിക�കേണ�ട സ�ഹൃത�ത�ക�കള�ടെ വിലാസം (ഒര� വരിയിൽ ഒന�ന� വീതം)."
+
+#. TRANS: Field label for a personal message to send to invitees.
+msgid "Personal message"
+msgstr "സ�വകാര�യ സന�ദേശം"
+
+#. TRANS: Field title for a personal message to send to invitees.
+msgid "Optionally add a personal message to the invitation."
+msgstr "ക�ഷണത�തിൽ താങ�കള�ടെ സ�വന�തം സന�ദേശം കൂടി വേണമെങ�കിൽ കൂട�ടിച�ചേർക�ക�ക."
+
+#. TRANS: Send button for inviting friends
+#. TRANS: Button text for sending notice.
+msgctxt "BUTTON"
+msgid "Send"
+msgstr "അയക�ക�ക"
+
+#. TRANS: Submit button title.
+#, fuzzy
+msgid "Send invitations."
+msgstr "ക�ഷണങ�ങൾ"
+
 #. TRANS: Button text for joining a group.
 #, fuzzy
 msgctxt "BUTTON"
@@ -8423,6 +7962,10 @@ msgctxt "BUTTON"
 msgid "Leave"
 msgstr "ഒഴിവായി പോവ�ക"
 
+#. TRANS: Link title for seeing all lists.
+msgid "See all lists you have created."
+msgstr ""
+
 #. TRANS: Menu item for logging in to the StatusNet site.
 #. TRANS: Menu item in primary navigation panel.
 msgctxt "MENU"
@@ -8469,9 +8012,9 @@ msgstr ""
 #. TRANS: %1$s is the subscribing user's nickname, %2$s is the StatusNet sitename.
 #. TRANS: Main body of new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscriber's long name, %2$s is the StatusNet sitename.
-#, php-format
-msgid "%1$s is now listening to your notices on %2$s."
-msgstr ""
+#, fuzzy, php-format
+msgid "%1$s is now following you on %2$s."
+msgstr "%1$s ഇപ�പോൾ %2$s എന�ന ഉപയോക�താവിനെ പിന�ത�ടര�ന�ന�."
 
 #. TRANS: Subject of pending new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscribing user's nickname, %2$s is the StatusNet sitename.
@@ -8646,7 +8189,7 @@ msgstr "%1$s (@%2$s) താങ�കള�ടെ ശ�രദ�ധയ�ക�
 #. TRANS: Body of @-reply notification e-mail.
 #. TRANS: %1$s is the sending user's name, $2$s is the StatusNet sitename,
 #. TRANS: %3$s is a URL to the notice, %4$s is the notice text,
-#. TRANS: %5$s is a URL to the full conversion if it exists (otherwise empty),
+#. TRANS: %5$s is the text "The full conversation can be read here:" and a URL to the full conversion if it exists (otherwise empty),
 #. TRANS: %6$s is a URL to reply to the notice, %7$s is a URL to all @-replies for the addressed user,
 #, php-format
 msgid ""
@@ -8671,6 +8214,10 @@ msgstr ""
 
 #. TRANS: Subject of group join notification e-mail.
 #. TRANS: %1$s is the joining user's nickname, %2$s is the group name, and %3$s is the StatusNet sitename.
+#, fuzzy, php-format
+msgid "%1$s has joined your group %2$s on %3$s"
+msgstr "%2$s എന�ന സംഘത�തിൽ %1$s എന�ന ഉപയോക�താവ� ചേർന�ന�."
+
 #. TRANS: Main body of group join notification e-mail.
 #. TRANS: %1$s is the subscriber's long name, %2$s is the group name, and %3$s is the StatusNet sitename,
 #. TRANS: %4$s is a block of profile info about the subscriber.
@@ -8759,8 +8306,9 @@ msgid "Make Admin"
 msgstr "കാര�യനിർവ�വാഹകനാക�ക�ക"
 
 #. TRANS: Submit button title.
+#, fuzzy
 msgctxt "TOOLTIP"
-msgid "Make this user an admin"
+msgid "Make this user an admin."
 msgstr "ഈ ഉപയോക�താവിനെ കാര�യനിർവ�വാഹകനാക�ക�ക"
 
 #. TRANS: Client exception thrown when a database error was thrown during a file upload operation.
@@ -8807,7 +8355,7 @@ msgstr "അറിയിപ�പ� നേരിട�ട� അയയ�ക�
 msgid "Select recipient:"
 msgstr "സ�വീകർത�താവിനെ തിരഞ�ഞെട�ക�ക�ക:"
 
-#. TRANS Entry in drop-down selection box in direct-message inbox/outbox when no one is available to message.
+#. TRANS: Entry in drop-down selection box in direct-message inbox/outbox when no one is available to message.
 msgid "No mutual subscribers."
 msgstr ""
 
@@ -8878,6 +8426,10 @@ msgstr ""
 msgid "You must implement either adaptNoticeListItem() or showNotice()."
 msgstr ""
 
+#. TRANS: Link description to show more items in a list.
+msgid "More â–¼"
+msgstr ""
+
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 msgid "Nickname cannot be empty."
 msgstr "വിളിപ�പേര� ശൂന�യമായിരിക�കാൻ പാടില�ല."
@@ -8928,10 +8480,6 @@ msgctxt "SEPARATOR"
 msgid ", "
 msgstr ""
 
-#. TRANS: Start of profile addressees list.
-msgid " â–¸ "
-msgstr ""
-
 #. TRANS: Used in coordinates as abbreviation of north.
 msgid "N"
 msgstr "à´µ"
@@ -8970,7 +8518,8 @@ msgid "Repeated by"
 msgstr "ആവർത�തിച�ചത�"
 
 #. TRANS: Link title in notice list item to reply to a notice.
-msgid "Reply to this notice"
+#, fuzzy
+msgid "Reply to this notice."
 msgstr "ഈ അറിയിപ�പിന� മറ�പടിയിട�ക"
 
 #. TRANS: Link text in notice list item to reply to a notice.
@@ -8978,8 +8527,9 @@ msgid "Reply"
 msgstr "മറ�പടി"
 
 #. TRANS: Link title in notice list item to delete a notice.
-msgid "Delete this notice"
-msgstr "ഈ അറിയിപ�പ� മായ�ക�ക�ക"
+#, fuzzy
+msgid "Delete this notice from the timeline."
+msgstr "ഈ അറിയിപ�പ� മായ�ക�ക�ക."
 
 #. TRANS: Title for repeat form status in notice list when a notice has been repeated.
 #, fuzzy
@@ -9004,27 +8554,6 @@ msgstr ""
 msgid "Send a nudge to this user."
 msgstr "ഈ ഉപയോക�താവിന� നേരിട�ട� സന�ദേശമയയ�ക�ക�ക"
 
-#. TRANS: Exception thrown when creating a new profile fails in OAuth store.
-msgid "Error inserting new profile."
-msgstr ""
-
-#. TRANS: Exception thrown when creating a new avatar fails in OAuth store.
-msgid "Error inserting avatar."
-msgstr ""
-
-#. TRANS: Exception thrown when creating a remote profile fails in OAuth store.
-msgid "Error inserting remote profile."
-msgstr ""
-
-#. TRANS: Exception thrown when a notice is denied because it has been sent before.
-msgid "Duplicate notice."
-msgstr "അറിയിപ�പിന�റെ പകർപ�പ�."
-
-#. TRANS: Exception thrown when creating a new subscription fails in OAuth store.
-#, fuzzy
-msgid "Could not insert new subscription."
-msgstr "സന�ദേശം ഉൾപ�പെട�ത�താൻ കഴിഞ�ഞില�ല."
-
 #. TRANS: Server exception thrown in oEmbed action if no API endpoint is available.
 #, fuzzy
 msgid "No oEmbed API endpoint available."
@@ -9111,11 +8640,6 @@ msgstr "തിര�ത�ത�ക"
 msgid "Edit %s list by you."
 msgstr "%s എന�ന സംഘത�തിൽ മാറ�റം വര�ത�ത�ക"
 
-#. TRANS: Link description for link to list of users tagged with a tag.
-#, fuzzy
-msgid "Tagged"
-msgstr "റ�റാഗ�"
-
 #. TRANS: Title for link to edit list settings.
 #, fuzzy
 msgid "Edit list settings."
@@ -9270,8 +8794,10 @@ msgctxt "plugin"
 msgid "Enable"
 msgstr ""
 
+#. TRANS: Plugin description for a disabled plugin.
 msgctxt "plugin-description"
-msgid "(Plugin descriptions unavailable when disabled.)"
+msgid ""
+"(The plugin description is unavailable when a plugin has been disabled.)"
 msgstr ""
 
 #. TRANS: Menu item in primary navigation panel.
@@ -9285,6 +8811,11 @@ msgstr "എസ�.എം.എസ�. സജ�ജീകരണങ�ങൾ"
 msgid "Change your personal settings."
 msgstr "താങ�കള�ടെ രഹസ�യവാക�ക� മാറ�റ�ക"
 
+#. TRANS: Menu item in primary navigation panel.
+msgctxt "MENU"
+msgid "Admin"
+msgstr "കാര�യനിർവാഹക(ൻ)"
+
 #. TRANS: Menu item title in primary navigation panel.
 #, fuzzy
 msgid "Site configuration."
@@ -9305,15 +8836,8 @@ msgstr "സൈറ�റിൽ നിന�ന�ം പ�റത�ത�കട
 msgid "Login to the site."
 msgstr "സൈറ�റിലേക�ക� പ�രവേശിക�ക�ക"
 
-#. TRANS: Menu item in primary navigation panel.
-msgctxt "MENU"
-msgid "Search"
-msgstr "തിരയ�ക"
-
-#. TRANS: Menu item title in primary navigation panel.
-#, fuzzy
-msgid "Search the site."
-msgstr "സൈറ�റിൽ തിരയ�ക"
+msgid "This profile has been silenced by site moderators"
+msgstr ""
 
 #. TRANS: H2 text for user subscription statistics.
 #, fuzzy
@@ -9325,6 +8849,10 @@ msgstr "പിന�ത�ടര�ക"
 msgid "Followers"
 msgstr "പിന�ത�ടര�ക"
 
+#. TRANS: H2 text for user statistics.
+msgid "Statistics"
+msgstr "സ�ഥിതിവിവരക�കണക�ക�കൾ"
+
 #. TRANS: Label for user statistics.
 msgid "User ID"
 msgstr "ഉപയോക�തൃ �.ഡി"
@@ -9333,10 +8861,6 @@ msgstr "ഉപയോക�തൃ �.ഡി"
 msgid "Member since"
 msgstr "അംഗമായത�"
 
-#. TRANS: Label for user statistics.
-msgid "Notices"
-msgstr "അറിയിപ�പ�കൾ"
-
 #. TRANS: Label for user statistics.
 #. TRANS: Average count of posts made per day since account registration.
 msgid "Daily average"
@@ -9428,6 +8952,7 @@ msgid "Keyword(s)"
 msgstr "അടയാളവാക�ക�(വാക�ക�കൾ)"
 
 #. TRANS: Button text for searching site.
+#. TRANS: Button text for search button on search form.
 #. TRANS: Button text to search profiles.
 msgctxt "BUTTON"
 msgid "Search"
@@ -9478,23 +9003,6 @@ msgstr "അറിയിപ�പ�കള�ടെ ഉള�ളടക�കം 
 msgid "Find groups on this site"
 msgstr "ഈ സൈറ�റിലെ സംഘങ�ങൾ കണ�ടെത�ത�ക"
 
-#. TRANS: Secondary navigation menu item leading to help on StatusNet.
-msgctxt "MENU"
-msgid "Help"
-msgstr "സഹായം"
-
-#. TRANS: Secondary navigation menu item leading to text about StatusNet site.
-#, fuzzy
-msgctxt "MENU"
-msgid "About"
-msgstr "വിവരണം"
-
-#. TRANS: Secondary navigation menu item leading to Frequently Asked Questions.
-#, fuzzy
-msgctxt "MENU"
-msgid "FAQ"
-msgstr "പതിവ�ചോദ�യങ�ങൾ"
-
 #. TRANS: Secondary navigation menu item leading to Terms of Service.
 msgctxt "MENU"
 msgid "TOS"
@@ -9518,18 +9026,6 @@ msgctxt "MENU"
 msgid "Version"
 msgstr "പതിപ�പ�"
 
-#. TRANS: Secondary navigation menu item leading to e-mail contact information on the
-#. TRANS: StatusNet site, where to report bugs, ...
-#, fuzzy
-msgctxt "MENU"
-msgid "Contact"
-msgstr "സമ�പർക�കം"
-
-#. TRANS: Secondary navigation menu item. Leads to information about embedding a timeline widget.
-msgctxt "MENU"
-msgid "Badge"
-msgstr ""
-
 #. TRANS: Default title for section/sidebar widget.
 msgid "Untitled section"
 msgstr "തലക�കെട�ടില�ലാത�ത ഭാഗം"
@@ -9578,10 +9074,6 @@ msgstr "ഇമെയിൽ"
 msgid "Change email handling"
 msgstr "ഇമെയിൽ കൈകാര�യരീതിയിൽ മാറ�റം വര�ത�ത�ക"
 
-#. TRANS: Menu item title in settings navigation panel.
-msgid "Design your profile"
-msgstr ""
-
 #. TRANS: Menu item in settings navigation panel.
 #, fuzzy
 msgctxt "MENU"
@@ -9619,6 +9111,15 @@ msgstr "ബന�ധങ�ങൾ"
 msgid "Authorized connected applications"
 msgstr ""
 
+#. TRANS: Menu item in settings navigation panel.
+msgctxt "MENU"
+msgid "Old school"
+msgstr ""
+
+#. TRANS: Menu item title in settings navigation panel.
+msgid "UI tweaks for old-school users"
+msgstr ""
+
 #. TRANS: Title of form to silence a user.
 #, fuzzy
 msgctxt "TITLE"
@@ -9629,6 +9130,39 @@ msgstr "നിശബ�ദമാക�ക�ക"
 msgid "Silence this user"
 msgstr "ഈ ഉപയോക�താവിനെ നിശബ�ദനാക�ക�ക"
 
+#. TRANS: Server error displayed when trying to create an anynymous OAuth consumer.
+msgid "Could not create anonymous consumer."
+msgstr ""
+
+#. TRANS: Server error displayed when trying to create an anynymous OAuth application.
+msgid "Could not create anonymous OAuth application."
+msgstr ""
+
+#. TRANS: Exception thrown when no token association could be found.
+msgid ""
+"Could not find a profile and application associated with the request token."
+msgstr ""
+
+#. TRANS: Exception thrown when no access token can be issued.
+msgid "Could not issue access token."
+msgstr ""
+
+#. TRANS: Exception thrown when a database error occurs.
+msgid "Database error inserting OAuth application user."
+msgstr ""
+
+#. TRANS: Exception thrown when a database error occurs.
+msgid "Database error updating OAuth application user."
+msgstr ""
+
+#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
+msgid "Tried to revoke unknown token."
+msgstr ""
+
+#. TRANS: Exception thrown when an attempt is made to remove a revoked token.
+msgid "Failed to delete revoked token."
+msgstr ""
+
 #. TRANS: Menu item in local navigation menu.
 #, fuzzy
 msgctxt "MENU"
@@ -9686,6 +9220,16 @@ msgstr "%s-ൽ നമ�മോടൊപ�പം ചേരാൻ സ�ഹൃത
 msgid "Subscribe to this user"
 msgstr "ഈ ഉപയോക�താവിന�റെ വരിക�കാരൻ/വരിക�കാരി ആക�ക"
 
+#. TRANS: Button text to subscribe to a user.
+#. TRANS: Button text for subscribing to a list.
+msgctxt "BUTTON"
+msgid "Subscribe"
+msgstr "വരിക�കാരാക�ക"
+
+#. TRANS: Button title to subscribe to a user.
+msgid "Subscribe to this user."
+msgstr "ഈ ഉപയോക�താവിന�റെ വരിക�കാരൻ/വരിക�കാരി ആക�ക."
+
 #. TRANS: Title of personal tag cloud section.
 msgid "People Tagcloud as self-tagged"
 msgstr ""
@@ -9807,16 +9351,26 @@ msgstr[1] ""
 #. TRANS: List message for notice repeated by logged in user.
 #, fuzzy
 msgctxt "REPEATLIST"
-msgid "You have repeated this notice."
+msgid "You repeated this."
 msgstr "താങ�കൾ ആ അറിയിപ�പ� മ�മ�പേ തന�നെ ആവർത�തിച�ചിരിക�ക�ന�ന�."
 
-#. TRANS: List message for repeated notices.
-#. TRANS: %d is the number of users that have repeated a notice.
+#. TRANS: List message for when more than 4 people repeat something.
+#. TRANS: %%s is a list of users liking a notice, %d is the number over 4 that like the notice.
+#. TRANS: Plural is decided on the total number of users liking the notice (count of %%s + %d).
+#, php-format
+msgid "%%s and %d other repeated this."
+msgid_plural "%%s and %d others repeated this."
+msgstr[0] ""
+msgstr[1] ""
+
+#. TRANS: List message for favoured notices.
+#. TRANS: %%s is a list of users liking a notice.
+#. TRANS: Plural is based on the number of of users that have favoured a notice.
 #, fuzzy, php-format
-msgid "One person has repeated this notice."
-msgid_plural "%d people have repeated this notice."
-msgstr[0] "ആ അറിയിപ�പ� മ�മ�പേ തന�നെ ആവർത�തിച�ചിരിക�ക�ന�ന�."
-msgstr[1] "ആ അറിയിപ�പ� മ�മ�പേ തന�നെ ആവർത�തിച�ചിരിക�ക�ന�ന�."
+msgid "%%s repeated this."
+msgid_plural "%%s repeated this."
+msgstr[0] "%s എന�ന ഉപയോക�താവിനായി ആവർത�തിച�ചത�"
+msgstr[1] "%s എന�ന ഉപയോക�താവിനായി ആവർത�തിച�ചത�"
 
 #. TRANS: Form legend.
 #, fuzzy, php-format
@@ -9825,7 +9379,7 @@ msgstr "സൈറ�റിൽ തിരയ�ക"
 
 #. TRANS: Dropdown option for searching in profiles.
 msgid "Everything"
-msgstr ""
+msgstr "എല�ലാം"
 
 #. TRANS: Dropdown option for searching in profiles.
 #, fuzzy
@@ -9865,7 +9419,7 @@ msgstr ""
 #. TRANS: Option in drop-down of potential addressees.
 msgctxt "SENDTO"
 msgid "Everyone"
-msgstr ""
+msgstr "എല�ലാവര�ം"
 
 #. TRANS: Option in drop-down of potential addressees.
 #. TRANS: %s is a StatusNet sitename.
@@ -9913,16 +9467,19 @@ msgid "Unsilence this user"
 msgstr ""
 
 #. TRANS: Form legend on unsubscribe form.
-#. TRANS: Button title on unsubscribe form.
 msgid "Unsubscribe from this user"
 msgstr ""
 
 #. TRANS: Button text on unsubscribe form.
 #. TRANS: Button text for unsubscribing from a list.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Unsubscribe"
-msgstr "വരിക�കാരാക�ക"
+msgstr "അൺ‌സബ�‌സ�ക�രൈബ�"
+
+#. TRANS: Button title on unsubscribe form.
+#, fuzzy
+msgid "Unsubscribe from this user."
+msgstr "ഈ ഉപയോക�താവിന�റെ വരിക�കാരൻ/വരിക�കാരി ആക�ക."
 
 #. TRANS: Exception text shown when no profile can be found for a user.
 #. TRANS: %1$s is a user nickname, $2$d is a user ID (number).
@@ -9931,9 +9488,8 @@ msgid "User %1$s (%2$d) has no profile record."
 msgstr ""
 
 #. TRANS: Authorisation exception thrown when a user a not allowed to login.
-#, fuzzy
 msgid "Not allowed to log in."
-msgstr "ലോഗിൻ ചെയ�തിട�ടില�ല"
+msgstr "ലോഗിൻ ചെയ�യാൻ അന�വാദമില�ല."
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 msgid "a few seconds ago"
@@ -10005,9 +9561,3 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
-
-#~ msgid "%1$s and friends, page %2$d"
-#~ msgstr "%1$s ഒപ�പം സ�ഹൃത�ത�ക�കള�ം, താൾ %2$d"
-
-#~ msgid "You and friends"
-#~ msgstr "താങ�കള�ം സ�ഹൃത�ത�ക�കള�ം"
diff --git a/locale/nb/LC_MESSAGES/statusnet.po b/locale/nb/LC_MESSAGES/statusnet.po
index 02821f57f8..7181d055ac 100644
--- a/locale/nb/LC_MESSAGES/statusnet.po
+++ b/locale/nb/LC_MESSAGES/statusnet.po
@@ -1,11 +1,12 @@
-# Translation of StatusNet - Core to Norwegian (bokmål)‬ (‪Norsk (bokmål)‬)
+# Translation of StatusNet - Core to Norwegian Bokmål (‪norsk (bokmål)‬)
 # Exported from translatewiki.net
 #
-# Author: Jon Harald Søby
+# Author: EivindJ
 # Author: Laaknor
 # Author: McDutchie
 # Author: Nghtwlkr
 # Author: Sjurhamre
+# Author: Unhammer
 # --
 # This file is distributed under the same license as the StatusNet package.
 #
@@ -13,17 +14,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:33+0000\n"
-"Language-Team: Norwegian (bokmål)‬ <http://translatewiki.net/wiki/Portal:no>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:25+0000\n"
+"Language-Team: Norwegian Bokmål <https://translatewiki.net/wiki/Portal:nb>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
-"X-Language-Code: no\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: nb\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-05-05 10:52:40+0000\n"
+"X-POT-Import-Date: 2012-04-22 22:02:21+0000\n"
 
 #. TRANS: Database error message.
 #, php-format
@@ -34,14 +35,6 @@ msgid ""
 "again."
 msgstr ""
 
-#. TRANS: Error message.
-msgid ""
-"An important error occured, probably related to email setup. Check logfiles "
-"for more info."
-msgstr ""
-"En viktig feil oppstod, sannsynligvis relatert til e-postoppsettet. Sjekk "
-"loggfilene for mer informasjon."
-
 #. TRANS: Error message.
 msgid "An error occurred."
 msgstr "En feil oppstod."
@@ -77,7 +70,7 @@ msgstr "Registrering"
 
 #. TRANS: Checkbox instructions for admin setting "Private".
 msgid "Prohibit anonymous users (not logged in) from viewing site?"
-msgstr "Forhindre anonyme brukere (ikke innlogget) å se nettsted?"
+msgstr "Forhindra anonyme brukarar (ikkje innlogga) i å sjå nettstaden?"
 
 #. TRANS: Checkbox label for prohibiting anonymous users from viewing site.
 #. TRANS: Checkbox label to show private tags.
@@ -102,12 +95,12 @@ msgstr "Deaktiver nye registreringer."
 msgid "Closed"
 msgstr "Lukket"
 
-#. TRANS: Title for button to save access settings in site admin panel.
-msgid "Save access settings"
+#. TRANS: Button title to save access settings in site admin panel.
+#, fuzzy
+msgid "Save access settings."
 msgstr "Lagre tilgangsinnstillinger"
 
-#. TRANS: Tooltip for button to save access settings in site admin panel.
-#. TRANS: Button text for saving theme settings.
+#. TRANS: Button text to save access settings in site admin panel.
 #. TRANS: Button label to save e-mail preferences.
 #. TRANS: Button label to save IM preferences.
 #. TRANS: Button text in the license admin panel.
@@ -123,7 +116,6 @@ msgstr "Lagre tilgangsinnstillinger"
 #. TRANS: Button text for saving "Other settings" in profile.
 #. TRANS: Button text to save user settings in user admin panel.
 #. TRANS: Button label in the "Edit application" form.
-#. TRANS: Button text on profile design page to save settings.
 #. TRANS: Text for save button on group edit form.
 #. TRANS: Button text to save tags for a profile.
 msgctxt "BUTTON"
@@ -162,10 +154,6 @@ msgstr "Ingen slik profil."
 msgid "No such list."
 msgstr "Ingen slik liste."
 
-#. TRANS: Client error displayed when trying to add an OMB 0.1 remote profile to a list.
-msgid "You cannot list an OMB 0.1 remote profile with this action."
-msgstr "Du kan ikke liste en OMB 0.1-fjernprofil med denne handlingen."
-
 #. TRANS: Client error displayed when an unknown error occurs when adding a user to a list.
 #. TRANS: %s is a username.
 #, php-format
@@ -197,7 +185,6 @@ msgstr "Ingen slik side."
 #. TRANS: Client error when user not found for an rss related action.
 #. TRANS: Client error displayed when no existing user is provided for a user's delivery device setting.
 #. TRANS: Client error displayed if a user could not be found.
-#. TRANS: Client error when user not found updating a profile background image.
 #. TRANS: Client error displayed updating profile image without having a user object.
 #. TRANS: Client error displayed when making an Atom API request for an unknown user.
 #. TRANS: Client error displayed when trying to block a non-existing user or a user from another site.
@@ -223,14 +210,11 @@ msgstr "Ingen slik side."
 #. TRANS: Client error displayed when trying to get the RSS feed with favorites of a user that does not exist.
 #. TRANS: Client error displayed when requesting Friends of a Friend feed without providing a user nickname.
 #. TRANS: Client error displayed when requesting Friends of a Friend feed for an object that is not a user.
-#. TRANS: Client error displayed when trying to get a user hCard for a non-existing user.
 #. TRANS: Client error displayed trying to make a micro summary without providing a valid user.
 #. TRANS: Client error displayed trying to send a direct message to a non-existing user.
 #. TRANS: Client error displayed trying to use "one time password login" without using an existing user.
 #. TRANS: Client error displayed when referring to non-existing user.
 #. TRANS: Client error displayed trying to perform an action related to a non-existing user.
-#. TRANS: Form validation error on page for remote subscribe when no user was provided.
-#. TRANS: Form validation error on page for remote subscribe when no user profile was found.
 #. TRANS: Client error displayed when trying to reply to a non-exsting user.
 #. TRANS: Client error displayed when providing a non-existing nickname in a RSS 1.0 action.
 #. TRANS: Client error.
@@ -239,7 +223,6 @@ msgstr "Ingen slik side."
 #. TRANS: Client error displayed trying to find a user by ID for a non-existing ID.
 #. TRANS: Client error displayed requesting groups for a non-existing user.
 #. TRANS: Client error displayed when user not found for an action.
-#. TRANS: Client error displayed providing a non-existing nickname.
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #. TRANS: Client error displayed when trying to perform a gallery action with an unknown user.
 #. TRANS: Client error displayed when trying to access a mailbox without providing a user.
@@ -258,6 +241,13 @@ msgstr "%s tidslinje"
 msgid "%s's home timeline"
 msgstr "%s tidslinje"
 
+#. TRANS: %s is user nickname.
+#. TRANS: Feed title.
+#. TRANS: %s is tagger's nickname.
+#, fuzzy, php-format
+msgid "Feed for friends of %s (Activity Streams JSON)"
+msgstr "Mating for venner av %s (Atom)"
+
 #. TRANS: %s is user nickname.
 #, php-format
 msgid "Feed for friends of %s (RSS 1.0)"
@@ -301,7 +291,7 @@ msgstr ""
 "Vær den første til å [poste om dette emnet](%%%%action.newnotice%%%%?"
 "status_textarea=%s)!"
 
-#. TRANS: Encoutagement displayed on empty timeline user pages for anonymous users.
+#. TRANS: Encouragement displayed on empty timeline user pages for anonymous users.
 #. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
 #. TRANS: Empty list message for page with replies for a user for not logged in users.
 #. TRANS: %1$s is a user nickname. This message contains a Markdown link in the form [link text](link).
@@ -315,6 +305,13 @@ msgstr ""
 "Hvorfor ikke [registrere en konto](%%action.register%%) og vær den første "
 "til å poste en!"
 
+#. TRANS: Button text for inviting more users to the StatusNet instance.
+#. TRANS: Less business/enterprise-oriented language for public sites.
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Send invite"
+msgstr "Invitasjoner"
+
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Title of API timeline for a user and friends.
 #. TRANS: %s is a username.
@@ -323,8 +320,6 @@ msgstr ""
 #. TRANS: %s is a username.
 #. TRANS: Menu item title in personal group navigation menu.
 #. TRANS: %s is a username.
-#. TRANS: Menu item title in settings navigation panel.
-#. TRANS: %s is a username.
 #, php-format
 msgid "%s and friends"
 msgstr "%s og venner"
@@ -362,7 +357,6 @@ msgstr "Du må angi en verdi for parameteren 'device' med en av: sms, im, none."
 #. TRANS: Server error thrown on database error updating SMS preferences.
 #. TRANS: Server error thrown on database error removing a registered SMS phone number.
 #. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
-#. TRANS: Server exception thrown on Profile design page when updating design settings fails.
 msgid "Could not update user."
 msgstr "Kunne ikke oppdatere bruker."
 
@@ -377,7 +371,6 @@ msgstr "Kunne ikke lagre profil."
 
 #. TRANS: Client error displayed when the number of bytes in a POST request exceeds a limit.
 #. TRANS: %s is the number of bytes of the CONTENT_LENGTH.
-#. TRANS: Form validation error in design settings form. POST should remain untranslated.
 #, php-format
 msgid ""
 "The server was unable to handle that much POST data (%s byte) due to its "
@@ -392,24 +385,6 @@ msgstr[1] ""
 "Tjeneren kunne ikke håndtere så mye POST-data (%s bytes) på grunn av sin "
 "gjeldende konfigurasjon."
 
-#. TRANS: Client error displayed when saving design settings fails because of an empty id.
-#. TRANS: Client error displayed when saving design settings fails because of an empty result.
-#. TRANS: Client error displayed when a database error occurs inserting profile colours.
-#. TRANS: Client error displayed when a database error occurs updating profile colours.
-#. TRANS: Form validation error displayed when group design settings could not be saved because of an application issue.
-#. TRANS: Form validation error on Profile design page when saving design settings has failed.
-#. TRANS: Form validation error on Profile design page when updating design settings has failed.
-msgid "Unable to save your design settings."
-msgstr "Kunne ikke lagre dine innstillinger for utseende."
-
-#. TRANS: Error displayed when updating design settings fails.
-#. TRANS: Client error displayed when a database error occurs updating profile colours.
-#. TRANS: Form validation error on Profile design page when updating design settings has failed.
-#. TRANS: Error message displayed if design settings could not be saved.
-#. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
-msgid "Could not update your design."
-msgstr "Kunne ikke oppdatere din profils utseende."
-
 #. TRANS: Title for Atom feed.
 msgctxt "ATOM"
 msgid "Main"
@@ -456,6 +431,22 @@ msgstr "Blokkering av bruker mislyktes."
 msgid "Unblock user failed."
 msgstr "Oppheving av blokkering av bruker mislyktes."
 
+#. TRANS: Client exception thrown when no conversation ID is given.
+#, fuzzy
+msgid "No conversation ID."
+msgstr "Samtale"
+
+#. TRANS: Client exception thrown when referring to a non-existing conversation ID (%d).
+#, fuzzy, php-format
+msgid "No conversation with ID %d."
+msgstr "Samtale"
+
+#. TRANS: Title for conversion timeline.
+#, fuzzy
+msgctxt "TITLE"
+msgid "Conversation"
+msgstr "Samtale"
+
 #. TRANS: Title. %s is a user nickname.
 #, php-format
 msgid "Direct messages from %s"
@@ -499,6 +490,8 @@ msgid "Cannot send direct messages to users who aren't your friend."
 msgstr "Du kan ikke sende direktemeldinger til brukere som ikke er din venn."
 
 #. TRANS: Client error displayed trying to direct message self (403).
+#. TRANS: Client error displayed trying to send a direct message to self.
+#. TRANS: Error text shown when trying to send a direct message to self.
 msgid ""
 "Do not send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
@@ -728,7 +721,6 @@ msgstr "grupper på %s"
 
 #. TRANS: Client error displayed when trying to edit a group without being an admin.
 #. TRANS: Client error displayed trying to edit a group while not being a group admin.
-#. TRANS: Client error displayed trying to change group design settings without being a (group) admin.
 #. TRANS: Client error displayed when trying to change group logo settings while not being a group admin.
 msgid "You must be an admin to edit the group."
 msgstr "Du må være en administrator for å redigere gruppen."
@@ -840,7 +832,6 @@ msgstr "Databasefeil ved innsetting av oauth_token_association."
 
 #. TRANS: Client error given on when invalid data was passed through a form in the OAuth API.
 #. TRANS: Unexpected validation error on avatar upload form.
-#. TRANS: Client error displayed when the submitted form contains unexpected data.
 #. TRANS: Client error displayed submitting invalid form data for edit application.
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
 #. TRANS: Form validation error message when an unsupported argument is used.
@@ -849,7 +840,6 @@ msgstr "Databasefeil ved innsetting av oauth_token_association."
 #. TRANS: Client error when submitting a form with unexpected information.
 #. TRANS: Client error displayed when unexpected data is posted in the password recovery form.
 #. TRANS: Message given submitting a form with an unknown action in SMS settings.
-#. TRANS: Unknown form validation error in design settings form.
 msgid "Unexpected form submission."
 msgstr "Uventet skjemainnsending."
 
@@ -894,7 +884,6 @@ msgstr "Konto"
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Field label on account registration page.
-#. TRANS: Label for nickname on user authorisation page.
 #. TRANS: Field label on group edit form.
 #. TRANS: Dropdown option for searching in profiles.
 msgid "Nickname"
@@ -1207,12 +1196,9 @@ msgstr "Du må være innlogget for å forlate en gruppe."
 #. TRANS: Client error displayed when requesting Friends of a Friend feed for a nickname that is not a group.
 #. TRANS: Client error displayed trying to block a user from a group while specifying a non-existing group.
 #. TRANS: Client error displayed referring to a group's permalink for a non-existing group ID.
-#. TRANS: Client error displayed trying to change group design settings while providing a nickname for a non-existing group.
 #. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
 #. TRANS: Client error displayed when trying to view group members for a non-existing group.
 #. TRANS: Client error displayed when trying to view group members for an object that is not a group.
-#. TRANS: Client error displayed when trying to view group members for a non-existing group.
-#. TRANS: Client error displayed when trying to view group members for an object that is not a group.
 #. TRANS: Client error displayed when requesting a group RSS feed for group that does not exist.
 #. TRANS: Client error displayed when requesting a group RSS feed for an object that is not a group.
 #. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
@@ -1221,10 +1207,10 @@ msgstr "Du må være innlogget for å forlate en gruppe."
 #. TRANS: Client error displayed when trying to leave a non-local group.
 #. TRANS: Client error displayed when trying to leave a non-existing group.
 #. TRANS: Client error displayed when providing an invalid group ID on the Make Admin page.
-#. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
-#. TRANS: Client error displayed if no local group with a given name was found requesting group page.
 #. TRANS: Command exception text shown when a group is requested that does not exist.
 #. TRANS: Error text shown when trying to leave a group that does not exist.
+#. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
+#. TRANS: Client error displayed if no local group with a given name was found requesting group page.
 msgid "No such group."
 msgstr "Ingen slik gruppe."
 
@@ -1293,6 +1279,7 @@ msgid "Join request canceled."
 msgstr ""
 
 #. TRANS: Client error displayed trying to approve subscription for a non-existing request.
+#. TRANS: %s is a user nickname.
 #, fuzzy, php-format
 msgid "%s is not in the moderation queue for your subscriptions."
 msgstr "En liste over brukerne i denne gruppen."
@@ -1451,7 +1438,6 @@ msgstr "Ingen slike vedlegg."
 #. TRANS: Client error displayed trying to get an avatar without providing a nickname.
 #. TRANS: Client error displayed when requesting a list of blocked users for a group without providing a group nickname.
 #. TRANS: Client error displayed trying to edit a group while not proving a nickname for the group to edit.
-#. TRANS: Client error displayed trying to change group design settings without providing a group nickname.
 #. TRANS: Client error displayed when trying to change group logo settings without providing a nickname.
 #. TRANS: Client error displayed when trying to view group members without providing a group nickname.
 #. TRANS: Client error displayed when requesting a group RSS feed without providing a group nickname.
@@ -1744,6 +1730,18 @@ msgstr "Adressen «%s» har blitt bekreftet for din konto."
 msgid "Conversation"
 msgstr "Samtale"
 
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#, fuzzy
+msgid "Conversation feed (Activity Streams JSON)"
+msgstr "Notismating for %s (Atom)"
+
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#, fuzzy
+msgid "Conversation feed (RSS 2.0)"
+msgstr "Notismating for %s (RSS 2.0)"
+
 #. TRANS: Title for conversation page.
 #. TRANS: Title for page that shows a notice.
 msgctxt "TITLE"
@@ -1807,7 +1805,8 @@ msgid "Enter \"%s\" to confirm that you want to delete your account."
 msgstr "Skriv inn «%s» for å bekrefte at du vil slette kontoen din."
 
 #. TRANS: Button title for user account deletion.
-msgid "Permanently delete your account"
+#, fuzzy
+msgid "Permanently delete your account."
 msgstr "Slett kontoen din permanent"
 
 #. TRANS: Client error displayed trying to delete an application while not logged in.
@@ -1955,149 +1954,6 @@ msgstr "Ikke slett denne brukeren."
 msgid "Delete this user."
 msgstr "Slett denne brukeren."
 
-#. TRANS: Message used as title for design settings for the site.
-msgid "Design"
-msgstr "Utseende"
-
-#. TRANS: Instructions for design adminsitration panel.
-msgid "Design settings for this StatusNet site"
-msgstr "Utseendeinnstillinger for dette StatusNet-nettstedet"
-
-#. TRANS: Client error displayed when a logo URL does is not valid.
-msgid "Invalid logo URL."
-msgstr "Ugyldig logo-URL."
-
-#. TRANS: Client error displayed when an SSL logo URL is invalid.
-msgid "Invalid SSL logo URL."
-msgstr "Ugyldig SSL-logo-URL."
-
-#. TRANS: Client error displayed when a theme is submitted through the form that is not in the theme list.
-#. TRANS: %s is the chosen unavailable theme.
-#, php-format
-msgid "Theme not available: %s."
-msgstr "Tema ikke tilgjengelig: %s."
-
-#. TRANS: Fieldset legend for form to change logo.
-msgid "Change logo"
-msgstr "Endre logo"
-
-#. TRANS: Field label for StatusNet site logo.
-msgid "Site logo"
-msgstr "Nettstedslogo"
-
-#. TRANS: Field label for SSL StatusNet site logo.
-msgid "SSL logo"
-msgstr "SSL-logo"
-
-#. TRANS: Fieldset legend for form change StatusNet site's theme.
-msgid "Change theme"
-msgstr "Endre tema"
-
-#. TRANS: Field label for dropdown to choose site theme.
-msgid "Site theme"
-msgstr "Nettstedstema"
-
-#. TRANS: Title for field label for dropdown to choose site theme.
-msgid "Theme for the site."
-msgstr "Tema for nettstedet."
-
-#. TRANS: Field label for uploading a cutom theme.
-msgid "Custom theme"
-msgstr "Egendefinert tema"
-
-#. TRANS: Form instructions for uploading a cutom StatusNet theme.
-msgid "You can upload a custom StatusNet theme as a .ZIP archive."
-msgstr "Du kan laste opp et egendefinert StatusNet-tema som et .ZIP-arkiv."
-
-#. TRANS: Fieldset legend for theme background image.
-msgid "Change background image"
-msgstr "Endre bakgrunnsbilde"
-
-#. TRANS: Field label for background image on theme designer page.
-#. TRANS: Field label for background color selector.
-#. TRANS: Label on profile design page for setting a profile page background colour.
-msgid "Background"
-msgstr "Bakgrunn"
-
-#. TRANS: Form guide for background image upload form on theme designer page.
-#, php-format
-msgid ""
-"You can upload a background image for the site. The maximum file size is %1"
-"$s."
-msgstr ""
-"Du kan laste opp et bakgrunnsbilde for nettstedet. Maks filstørrelse er %1$s."
-
-#. TRANS: Used as radio button label to add a background image.
-msgid "On"
-msgstr "PÃ¥"
-
-#. TRANS: Used as radio button label to not add a background image.
-msgid "Off"
-msgstr "Av"
-
-#. TRANS: Form guide for turning background image on or off on theme designer page.
-#. TRANS: Form guide for a set of radio buttons on the profile design page that will enable or disable
-#. TRANS: use of the uploaded profile image.
-msgid "Turn background image on or off."
-msgstr "Slå på eller av bakgrunnsbilde."
-
-#. TRANS: Checkbox label to title background image on theme designer page.
-#. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
-msgid "Tile background image"
-msgstr "Gjenta bakgrunnsbildet"
-
-#. TRANS: Fieldset legend for theme colors.
-msgid "Change colors"
-msgstr "Endre farger"
-
-#. TRANS: Field label for content color selector.
-#. TRANS: Label on profile design page for setting a profile page content colour.
-msgid "Content"
-msgstr "Innhold"
-
-#. TRANS: Field label for sidebar color selector.
-#. TRANS: Label on profile design page for setting a profile page sidebar colour.
-msgid "Sidebar"
-msgstr "Sidelinje"
-
-#. TRANS: Field label for text color selector.
-#. TRANS: Label on profile design page for setting a profile page text colour.
-msgid "Text"
-msgstr "Tekst"
-
-#. TRANS: Field label for link color selector.
-#. TRANS: Label on profile design page for setting a profile page links colour.
-msgid "Links"
-msgstr "Lenker"
-
-#. TRANS: Fieldset legend for advanced theme design settings.
-msgid "Advanced"
-msgstr "Avansert"
-
-#. TRANS: Field label for custom CSS.
-msgid "Custom CSS"
-msgstr "Egendefinert CSS"
-
-#. TRANS: Button text for resetting theme settings.
-msgctxt "BUTTON"
-msgid "Use defaults"
-msgstr "Bruk standardinnstillinger"
-
-#. TRANS: Title for button for resetting theme settings.
-#. TRANS: Title for button on profile design page to reset all colour settings to default.
-msgid "Restore default designs."
-msgstr "Gjenopprett standardutseende."
-
-#. TRANS: Title for button for resetting theme settings.
-#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-msgid "Reset back to default."
-msgstr "Tilbakestill til standardinnstillinger."
-
-#. TRANS: Title for button for saving theme settings.
-#. TRANS: Title for button on profile design page to save settings.
-msgid "Save design."
-msgstr "Lagre utseende."
-
 #. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
 msgid "This notice is not a favorite!"
 msgstr "Denne notisen er ikke en favoritt!"
@@ -2112,6 +1968,82 @@ msgstr "Legg til i favoritter"
 msgid "No such document \"%s\"."
 msgstr "Inget slikt dokument «%s»."
 
+#. TRANS: Menu item in administrator navigation panel.
+#. TRANS: Menu item in default local navigation panel.
+#. TRANS: Menu item in personal group navigation menu.
+#, fuzzy
+msgctxt "MENU"
+msgid "Home"
+msgstr "Hjemmesiden"
+
+msgctxt "MENU"
+msgid "Docs"
+msgstr ""
+
+#. TRANS: Secondary navigation menu item leading to help on StatusNet.
+msgctxt "MENU"
+msgid "Help"
+msgstr "Hjelp"
+
+#, fuzzy
+msgid "Getting started"
+msgstr "Innstillinger lagret."
+
+#. TRANS: Secondary navigation menu item leading to text about StatusNet site.
+#, fuzzy
+msgctxt "MENU"
+msgid "About"
+msgstr "Om"
+
+#, fuzzy
+msgid "About this site"
+msgstr "Opphev blokkering av denne brukeren"
+
+#. TRANS: Secondary navigation menu item leading to Frequently Asked Questions.
+#, fuzzy
+msgctxt "MENU"
+msgid "FAQ"
+msgstr "OSS/FAQ"
+
+msgid "Frequently asked questions"
+msgstr "Ofte stilte spørsmål"
+
+#. TRANS: Secondary navigation menu item leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+msgctxt "MENU"
+msgid "Contact"
+msgstr "Kontakt"
+
+msgid "Contact info"
+msgstr "Kontaktinfo"
+
+#, fuzzy
+msgctxt "MENU"
+msgid "Tags"
+msgstr "Tagger"
+
+msgid "Using tags"
+msgstr ""
+
+#. TRANS: Menu item in default local navigation panel.
+#. TRANS: Menu item in search group navigation panel.
+#. TRANS: Menu item in local navigation menu.
+#, fuzzy
+msgctxt "MENU"
+msgid "Groups"
+msgstr "Grupper"
+
+#, fuzzy
+msgid "Using groups"
+msgstr "Brukergrupper"
+
+msgctxt "MENU"
+msgid "API"
+msgstr ""
+
+msgid "RESTful API"
+msgstr ""
+
 #. TRANS: Title for "Edit application" form.
 #. TRANS: Form legend.
 msgid "Edit application"
@@ -2274,7 +2206,7 @@ msgid ""
 "subscriptions to it. Do you still want to continue?"
 msgstr ""
 
-#. TRANS: TRANS: Server error displayed when updating a list fails.
+#. TRANS: Server error displayed when updating a list fails.
 #, fuzzy
 msgid "Could not update list."
 msgstr "Kunne ikke oppdatere bruker."
@@ -2581,40 +2513,6 @@ msgstr "Ingen vedlegg."
 msgid "No uploaded attachments."
 msgstr "Ingen opplastede vedlegg."
 
-#. TRANS: Client error displayed when subscribing to a remote profile and an unexpected response is received.
-msgid "Not expecting this response!"
-msgstr "Forventet ikke denne responsen!"
-
-#. TRANS: Client error displayed when subscribing to a remote profile that does not exist.
-msgid "User being listened to does not exist."
-msgstr "Brukeren som lyttes til finnes ikke."
-
-#. TRANS: Client error displayed when subscribing to a remote profile that is a local profile.
-#. TRANS: Client error displayed when using remote subscribe for a local entity.
-msgid "You can use the local subscription!"
-msgstr "Du kan bruke det lokale abonnementet!"
-
-#. TRANS: Client error displayed when subscribing to a remote profile that is blocked form subscribing to.
-msgid "That user has blocked you from subscribing."
-msgstr "Brukeren har blokkert deg fra å abonnere."
-
-#. TRANS: Client error displayed when subscribing to a remote profile without providing an authorised token.
-msgid "You are not authorized."
-msgstr "Du er ikke autorisert."
-
-#. TRANS: Client error displayed when subscribing to a remote profile and conversion of the request token to access token fails.
-msgid "Could not convert request token to access token."
-msgstr ""
-
-#. TRANS: Client error displayed when subscribing to a remote profile fails because of an unsupported version of the OMB protocol.
-msgid "Remote service uses unknown version of OMB protocol."
-msgstr "Fjerntjeneste bruker ukjent versjon av OMB-protokollen."
-
-#. TRANS: Server error displayed when subscribing to a remote profile fails because the remote profile could not be updated.
-#. TRANS: Exception thrown when updating a remote profile fails in OAuth store.
-msgid "Error updating remote profile."
-msgstr "Feil ved oppdatering av fjernprofil."
-
 #. TRANS: Client error displayed when requesting a non-existent file.
 msgid "No such file."
 msgstr "Ingen slik fil."
@@ -2704,32 +2602,6 @@ msgstr "Databasefeil ved blokkering av bruker fra gruppe."
 msgid "No ID."
 msgstr "Ingen ID."
 
-#. TRANS: Client error displayed trying to change group design settings while not logged in.
-msgid "You must be logged in to edit a group."
-msgstr "Du må være logget inn for å redigere en gruppe."
-
-#. TRANS: Title group design settings page.
-msgid "Group design"
-msgstr "Gruppeutseende"
-
-#. TRANS: Instructions for group design settings page.
-msgid ""
-"Customize the way your group looks with a background image and a colour "
-"palette of your choice."
-msgstr ""
-"Tilpass hvordan gruppen din ser ut med et bakgrunnsbilde og en fargepalett "
-"av ditt valg."
-
-#. TRANS: Form validation error displayed when group design settings could not be updated because of an application issue.
-#, fuzzy
-msgid "Unable to update your design settings."
-msgstr "Kunne ikke lagre dine innstillinger for utseende."
-
-#. TRANS: Form text to confirm saved group design settings.
-#. TRANS: Confirmation message on Profile design page when saving design settings has succeeded.
-msgid "Design preferences saved."
-msgstr "Utseende lagret."
-
 #. TRANS: Title for group logo settings page.
 #. TRANS: Group logo form legend.
 msgid "Group logo"
@@ -2780,7 +2652,7 @@ msgstr "En liste over brukerne i denne gruppen."
 
 #. TRANS: Client error displayed when trying to approve group applicants without being a group administrator.
 msgid "Only the group admin may approve users."
-msgstr ""
+msgstr "Kun gruppeadministratoren kan godkjenne brukere."
 
 #. TRANS: Title of the first page showing pending group members still awaiting approval to join the group.
 #. TRANS: %s is the name of the group.
@@ -2902,8 +2774,8 @@ msgstr "Innstillinger for direktemeldinger"
 #. TRANS: the order and formatting of link text and link should remain unchanged.
 #, fuzzy, php-format
 msgid ""
-"You can send and receive notices through instant messaging [instant messages]"
-"(%%doc.im%%). Configure your addresses and settings below."
+"You can send and receive notices through [instant messaging](%%doc.im%%). "
+"Configure your addresses and settings below."
 msgstr ""
 "Du kan sende og motta notiser gjennom Jabber/GTalk [direktemeldinger](%%doc."
 "im%%). Konfigurer adresse og innstillinger under."
@@ -2937,7 +2809,6 @@ msgid "%s screenname."
 msgstr "%s skjermnavn."
 
 #. TRANS: Header for IM preferences form.
-#, fuzzy
 msgid "IM Preferences"
 msgstr "Direktemeldingsinnstillinger"
 
@@ -3118,29 +2989,6 @@ msgstr ""
 "Bruk dette skjemaet for å invitere dine venner og kollegaer til å bruke "
 "denne tjenesten."
 
-#. TRANS: Field label for a list of e-mail addresses.
-msgid "Email addresses"
-msgstr "E-postadresser"
-
-#. TRANS: Tooltip for field label for a list of e-mail addresses.
-#, fuzzy
-msgid "Addresses of friends to invite (one per line)."
-msgstr "Adresser til venner som skal inviteres (én per linje)"
-
-#. TRANS: Field label for a personal message to send to invitees.
-msgid "Personal message"
-msgstr "Personlig melding"
-
-#. TRANS: Tooltip for field label for a personal message to send to invitees.
-msgid "Optionally add a personal message to the invitation."
-msgstr "Om du vil kan du legge til en personlig melding i invitasjonen."
-
-#. TRANS: Send button for inviting friends
-#. TRANS: Button text for sending notice.
-msgctxt "BUTTON"
-msgid "Send"
-msgstr "Send"
-
 #. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral
 #. TRANS: singular 3rd-person pronoun in English. %1$s is the inviting user, $2$s is
 #. TRANS: the StatusNet sitename.
@@ -3274,12 +3122,6 @@ msgstr "Adresse til et bilde som vises med lisensen."
 msgid "Save license settings."
 msgstr "Lagre lisensinnstillinger"
 
-#. TRANS: Client error displayed when trying to log in while already logged in.
-#. TRANS: Client error displayed trying to use "one time password login" when already logged in.
-#. TRANS: Client error displayed when trying to register while already logged in.
-msgid "Already logged in."
-msgstr "Allerede innlogget."
-
 #. TRANS: Form validation error displayed when trying to log in with incorrect credentials.
 msgid "Incorrect username or password."
 msgstr "Feil brukernavn eller passord."
@@ -3391,6 +3233,7 @@ msgstr "Nettadresse til kilde kreves."
 msgid "Could not create application."
 msgstr "Kunne ikke opprette program."
 
+#. TRANS: Form validation error messages displayed when uploading an invalid application logo.
 #, fuzzy
 msgid "Invalid image."
 msgstr "Ugyldig størrelse"
@@ -3430,13 +3273,6 @@ msgstr "Inget innhold."
 msgid "No recipient specified."
 msgstr "Ingen mottaker oppgitt."
 
-#. TRANS: Client error displayed trying to send a direct message to self.
-#. TRANS: Error text shown when trying to send a direct message to self.
-msgid ""
-"Don't send a message to yourself; just say it to yourself quietly instead."
-msgstr ""
-"Ikke send en melding til degselv; bare hvisk det stille til degselv istedet."
-
 #. TRANS: Page title after sending a direct message.
 msgid "Message sent"
 msgstr "Melding sendt"
@@ -3641,6 +3477,33 @@ msgstr "Bare %s-nettadresser over vanlig HTTP."
 msgid "Not a supported data format."
 msgstr "Ikke et støttet dataformat."
 
+#. TRANS: Page title for profile settings.
+#, fuzzy
+msgid "Old school UI settings"
+msgstr "Innstillinger for direktemeldinger"
+
+#. TRANS: Usage instructions for profile settings.
+msgid "If you like it \"the old way\", you can set that here."
+msgstr ""
+
+#. TRANS: Confirmation shown when user profile settings are saved.
+#. TRANS: Message after successful saving of administrative settings.
+msgid "Settings saved."
+msgstr "Innstillinger lagret."
+
+msgid "Only stream mode (no conversations) in timelines"
+msgstr ""
+
+msgid "Show conversation page as hierarchical trees"
+msgstr ""
+
+msgid "Show nicknames (not full names) in timelines"
+msgstr ""
+
+#. TRANS: Button text to save a list.
+msgid "Save"
+msgstr "Lagre"
+
 #. TRANS: ShortName in the OpenSearch interface when trying to find users.
 msgid "People Search"
 msgstr "Personsøk"
@@ -3649,6 +3512,11 @@ msgstr "Personsøk"
 msgid "Notice Search"
 msgstr "Notissøk"
 
+#. TRANS: Client error displayed trying to use "one time password login" when already logged in.
+#. TRANS: Client error displayed when trying to register while already logged in.
+msgid "Already logged in."
+msgstr "Allerede innlogget."
+
 #. TRANS: Client error displayed trying to use "one time password login" without specifying a user.
 msgid "No user ID specified."
 msgstr "Ingen bruker-ID spesifisert."
@@ -3719,7 +3587,7 @@ msgid "Confirm"
 msgstr "Bekreft"
 
 #. TRANS: Field title on page where to change password.
-#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
+#. TRANS: Title for field label for password reset form where the password has to be typed again.
 #. TRANS: Field title on account registration page.
 #, fuzzy
 msgid "Same as password above."
@@ -3782,12 +3650,6 @@ msgstr "Temamappe ikke lesbar: %s."
 msgid "Avatar directory not writable: %s."
 msgstr "Avatarmappe ikke skrivbar: %s."
 
-#. TRANS: Client error in Paths admin panel.
-#. TRANS: %s is the background directory that could not be written to.
-#, php-format
-msgid "Background directory not writable: %s."
-msgstr "Bakgrunnsmappe ikke skrivbar: %s."
-
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the locales directory that could not be read from.
 #, php-format
@@ -3820,9 +3682,8 @@ msgid "Site path."
 msgstr "Nettstedssti."
 
 #. TRANS: Field label in Paths admin panel.
-#, fuzzy
 msgid "Locale directory"
-msgstr "Temamappe"
+msgstr "Mappe med lokaliseringsfiler"
 
 #. TRANS: Field title in Paths admin panel.
 #, fuzzy
@@ -3904,30 +3765,6 @@ msgstr "Avatarmappe"
 msgid "Directory where avatars are located."
 msgstr "Mappen avatarer er plassert i."
 
-#. TRANS: Fieldset legend in Paths admin panel.
-msgid "Backgrounds"
-msgstr "Bakgrunner"
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-msgid "Server for backgrounds."
-msgstr "Tjener for bakgrunner."
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-msgid "Web path to backgrounds."
-msgstr "Sti til bakgrunner."
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-msgid "Server for backgrounds on SSL pages."
-msgstr "Tjener for bakgrunner på SSL-sider."
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-msgid "Web path to backgrounds on SSL pages."
-msgstr "Sti til bakgrunner på SSL-sider."
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-msgid "Directory where backgrounds are located."
-msgstr "Mappen bakgrunner er plassert i."
-
 #. TRANS: Fieldset legens in Paths admin panel.
 msgid "Attachments"
 msgstr "Vedlegg"
@@ -3984,8 +3821,9 @@ msgid "Server to direct SSL requests to."
 msgstr "Tjener SSL-forespørsler skal rettes til."
 
 #. TRANS: Button title text to store form data in the Paths admin panel.
-msgid "Save paths"
-msgstr "Lagre stier"
+#, fuzzy
+msgid "Save path settings."
+msgstr "Lagre nettstedsinnstillinger"
 
 #. TRANS: Instructions for the "People search" page.
 #. TRANS: %%site.name%% is the name of the StatusNet site.
@@ -4127,7 +3965,7 @@ msgid ""
 "%%%site.name%%%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
 "blogging) service based on the Free Software [StatusNet](http://status.net/) "
 "tool. You can easily keep track of what they are doing by subscribing to the "
-"tag's timeline."
+"list's timeline."
 msgstr ""
 "**%s** er en brukergruppe på %%%%site.name%%%%, en [mikrobloggingstjeneste]"
 "(http://no.wikipedia.org/wiki/Mikroblogg) basert på det frie "
@@ -4160,7 +3998,7 @@ msgid ""
 "site.name%%%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
 "blogging) service based on the Free Software [StatusNet](http://status.net/) "
 "tool. You can easily keep track of what they are doing by subscribing to the "
-"tag's timeline."
+"list's timeline."
 msgstr ""
 "**%s** er en brukergruppe på %%%%site.name%%%%, en [mikrobloggingstjeneste]"
 "(http://no.wikipedia.org/wiki/Mikroblogg) basert på det frie "
@@ -4265,16 +4103,6 @@ msgid ""
 "All default plugins have been disabled from the site's configuration file."
 msgstr ""
 
-#. TRANS: Client error displayed if the notice posted has too many characters.
-msgid "Invalid notice content."
-msgstr "Ugyldig notisinnhold."
-
-#. TRANS: Exception thrown if a notice's license is not compatible with the StatusNet site license.
-#. TRANS: %1$s is the notice license, %2$s is the StatusNet site's license.
-#, fuzzy, php-format
-msgid "Notice license \"%1$s\" is not compatible with site license \"%2$s\"."
-msgstr "Notislisensen ‘%1$s’ er ikke kompatibel med nettstedslisensen ‘%2$s’."
-
 #. TRANS: Client error displayed when trying to add an unindentified field to profile.
 #. TRANS: %s is a field name.
 #, php-format
@@ -4372,6 +4200,8 @@ msgid "Share my current location when posting notices"
 msgstr "Del min nåværende plassering når jeg poster notiser"
 
 #. TRANS: Field label in form for profile settings.
+#. TRANS: Title for group tag cloud section.
+#. TRANS: %s is a group name.
 msgid "Tags"
 msgstr "Tagger"
 
@@ -4402,9 +4232,8 @@ msgid "What timezone are you normally in?"
 msgstr "Hvilken tidssone er du vanligvis i?"
 
 #. TRANS: Checkbox label in form for profile settings.
-#, fuzzy
 msgid ""
-"Automatically subscribe to whoever subscribes to me (best for non-humans)."
+"Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr ""
 "Abonner automatisk på de som abonnerer på meg (best for ikke-mennesker)"
 
@@ -4474,11 +4303,6 @@ msgstr "Kunne ikke lagre plasseringsinnstillinger."
 msgid "Could not save tags."
 msgstr "Kunne ikke lagre merkelapper."
 
-#. TRANS: Confirmation shown when user profile settings are saved.
-#. TRANS: Message after successful saving of administrative settings.
-msgid "Settings saved."
-msgstr "Innstillinger lagret."
-
 #. TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
 #. TRANS: Page title for page where a user account can be restored from backup.
 #, fuzzy
@@ -4492,7 +4316,8 @@ msgid "Beyond the page limit (%s)."
 msgstr "Over sidegrensen (%s)."
 
 #. TRANS: Server error displayed when a public timeline cannot be retrieved.
-msgid "Could not retrieve public stream."
+#, fuzzy
+msgid "Could not retrieve public timeline."
 msgstr "Kunne ikke hente offentlig strøm."
 
 #. TRANS: Title for all public timeline pages but the first.
@@ -4507,15 +4332,23 @@ msgid "Public timeline"
 msgstr "Offentlig tidslinje"
 
 #. TRANS: Link description for public timeline feed.
-msgid "Public Stream Feed (RSS 1.0)"
+#, fuzzy
+msgid "Public Timeline Feed (Activity Streams JSON)"
+msgstr "Offentlig strømmating (Atom)"
+
+#. TRANS: Link description for public timeline feed.
+#, fuzzy
+msgid "Public Timeline Feed (RSS 1.0)"
 msgstr "Offentlig strømmating (RSS 1.0)"
 
 #. TRANS: Link description for public timeline feed.
-msgid "Public Stream Feed (RSS 2.0)"
+#, fuzzy
+msgid "Public Timeline Feed (RSS 2.0)"
 msgstr "Offentlig strømmating (RSS 2.0)"
 
 #. TRANS: Link description for public timeline feed.
-msgid "Public Stream Feed (Atom)"
+#, fuzzy
+msgid "Public Timeline Feed (Atom)"
 msgstr "Offentlig strømmating (Atom)"
 
 #. TRANS: Text displayed for public feed when there are no public notices.
@@ -4565,50 +4398,6 @@ msgstr ""
 "Mikroblogg)tjeneste basert på det frie programvareverktøyet [StatusNet]"
 "(http://status.net)."
 
-#. TRANS: Title for page with public list cloud.
-#, fuzzy
-msgid "Public list cloud"
-msgstr "Offentlig merkelappsky"
-
-#. TRANS: Page notice for page with public list cloud.
-#. TRANS: %s is a StatusNet sitename.
-#, fuzzy, php-format
-msgid "These are largest lists on %s"
-msgstr "Dette er de siste mest populære merkelappene på %s "
-
-#. TRANS: Empty list message on page with public list cloud.
-#. TRANS: This message contains Markdown links in the form [description](link).
-#, php-format
-msgid "No one has [listed](%%doc.tags%%) anyone yet."
-msgstr ""
-
-#. TRANS: Additional empty list message on page with public list cloud for logged in users.
-#, fuzzy
-msgid "Be the first to list someone!"
-msgstr "Vær den første til å poste en!"
-
-#. TRANS: Additional empty list message on page with public list cloud for anonymous users.
-#. TRANS: This message contains Markdown links in the form [description](link).
-#, fuzzy, php-format
-msgid ""
-"Why not [register an account](%%action.register%%) and be the first to list "
-"someone!"
-msgstr ""
-"Hvorfor ikke [registrere en konto](%%action.register%%) og vær den første "
-"til å poste en!"
-
-#. TRANS: DT element on on page with public list cloud.
-#, fuzzy
-msgid "List cloud"
-msgstr "Bruker ikke funnet."
-
-#. TRANS: Link title for number of listed people. %d is the number of listed people.
-#, php-format
-msgid "1 person listed"
-msgid_plural "%d people listed"
-msgstr[0] "1 person listet opp"
-msgstr[1] "%d personer listet opp"
-
 #. TRANS: Public RSS feed description. %s is the StatusNet site name.
 #, fuzzy, php-format
 msgid "%s updates from everyone."
@@ -4735,7 +4524,6 @@ msgid "6 or more characters, and do not forget it!"
 msgstr "6 eller flere tegn. Og ikke glem det!"
 
 #. TRANS: Button text for password reset form.
-#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Reset"
@@ -4745,18 +4533,6 @@ msgstr "Nullstill"
 msgid "Enter a nickname or email address."
 msgstr "Skriv inn et kallenavn eller en e-postadresse."
 
-#. TRANS: Information on password recovery form if no known username or e-mail address was specified.
-msgid "No user with that email address or username."
-msgstr "Ingen bruker med den e-postadressen eller det kallenavnet."
-
-#. TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.
-msgid "No registered email address for that user."
-msgstr "Ingen registrert e-postadresse for den brukeren."
-
-#. TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.
-msgid "Error saving address confirmation."
-msgstr "Feil ved lagring av adressebekreftelse."
-
 #. TRANS: User notification after an e-mail with instructions was sent from the password recovery form.
 msgid ""
 "Instructions for recovering your password have been sent to the email "
@@ -4943,82 +4719,6 @@ msgstr ""
 "(Du vil straks motta en epost med instruksjoner om hvordan du kan bekrefte "
 "din epostadresse)"
 
-#. TRANS: Page notice for remote subscribe. This message contains Markdown links.
-#. TRANS: Ensure to keep the correct markup of [link description](link).
-#, 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 ""
-"For å abonnere kan du [logge inn](%%action.login%%) eller [registrere](%%"
-"action.register%%) en ny konto. Om du allerede har en konto på et "
-"[kompatibelt mikrobloggingsnettsted](%%doc.openmublog%%), skriv inn "
-"profilnettadressen din nedenfor."
-
-#. TRANS: Page title for Remote subscribe.
-msgid "Remote subscribe"
-msgstr "Fjernabonner"
-
-#. TRANS: Field legend on page for remote subscribe.
-msgid "Subscribe to a remote user"
-msgstr "Abonner på en fjernbruker"
-
-#. TRANS: Field label on page for remote subscribe.
-msgid "User nickname"
-msgstr "Brukerens kallenavn"
-
-#. TRANS: Field title on page for remote subscribe.
-#, fuzzy
-msgid "Nickname of the user you want to follow."
-msgstr "Kallenavn på brukeren du vil følge"
-
-#. TRANS: Field label on page for remote subscribe.
-msgid "Profile URL"
-msgstr "Profilnettadresse"
-
-#. TRANS: Field title on page for remote subscribe.
-#, fuzzy
-msgid "URL of your profile on another compatible microblogging service."
-msgstr ""
-"Nettadresse til profilen din på en annen kompatibel mikrobloggingstjeneste"
-
-#. TRANS: Button text on page for remote subscribe.
-#. TRANS: Link text for link that will subscribe to a remote profile.
-#. TRANS: Button text to subscribe to a user.
-#. TRANS: Button text for subscribing to a list.
-#, fuzzy
-msgctxt "BUTTON"
-msgid "Subscribe"
-msgstr "Abonner"
-
-#. TRANS: Form validation error on page for remote subscribe when an invalid profile URL was provided.
-#, fuzzy
-msgid "Invalid profile URL (bad format)."
-msgstr "Ugyldig profilnettadresse (dårlig format)"
-
-#. TRANS: Form validation error on page for remote subscribe when no the provided profile URL
-#. TRANS: does not contain expected data.
-msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
-msgstr ""
-"Ikke en gyldig profilnettadresse (inget YADIS-dokument eller ugyldig XRDS "
-"definert)."
-
-#. TRANS: Form validation error on page for remote subscribe.
-#, fuzzy
-msgid "That is a local profile! Login to subscribe."
-msgstr "Det er en lokal profil! Logg inn for å abonnere."
-
-#. TRANS: Form validation error on page for remote subscribe when the remote service is not providing a request token.
-#, fuzzy
-msgid "Could not get a request token."
-msgstr "Kunne ikke sette inn melding."
-
-#. TRANS: Client error displayed when trying to (un)list an OMB 0.1 remote profile.
-#, fuzzy
-msgid "You cannot (un)list an OMB 0.1 remote profile with this action."
-msgstr "Du kan ikke tildele brukerroller på dette nettstedet."
-
 #. TRANS: Client error displayed when an unknown error occurs while delisting a user.
 #. TRANS: %s is a username.
 #, php-format
@@ -5071,6 +4771,12 @@ msgstr "Svar til %s"
 msgid "Replies to %1$s, page %2$d"
 msgstr "Svar til %1$s, side %2$d"
 
+#. TRANS: Link for feed with replies for a user.
+#. TRANS: %s is a user nickname.
+#, fuzzy, php-format
+msgid "Replies feed for %s (Activity Streams JSON)"
+msgstr "Svarstrøm for %s (Atom)"
+
 #. TRANS: Link for feed with replies for a user.
 #. TRANS: %s is a user nickname.
 #, php-format
@@ -5189,7 +4895,7 @@ msgstr ""
 
 #. TRANS: Form instructions for feed restore.
 msgid ""
-"You can upload a backed-up stream in <a href=\"http://activitystrea.ms/"
+"You can upload a backed-up timeline in <a href=\"http://activitystrea.ms/"
 "\">Activity Streams</a> format."
 msgstr ""
 
@@ -5311,6 +5017,27 @@ msgstr "Tilbakestill nøkkel & hemmelighet"
 msgid "Application info"
 msgstr "Programinformasjon"
 
+#. TRANS: Field label on application page.
+msgid "Consumer key"
+msgstr "Forbrukernøkkel"
+
+#. TRANS: Field label on application page.
+msgid "Consumer secret"
+msgstr "Forbrukerhemmelighet"
+
+#. TRANS: Field label on application page.
+#, fuzzy
+msgid "Request token URL"
+msgstr "Ugyldig bekreftelsesnøkkel."
+
+#. TRANS: Field label on application page.
+msgid "Access token URL"
+msgstr ""
+
+#. TRANS: Field label on application page.
+msgid "Authorize URL"
+msgstr "Nettadresse til kilde"
+
 #. TRANS: Note on the OAuth application page about signature support.
 #, fuzzy
 msgid ""
@@ -5335,6 +5062,11 @@ msgstr "%1$s sine favorittnotiser, side %2$d"
 msgid "Could not retrieve favorite notices."
 msgstr "Kunne ikke hente favorittnotiser."
 
+#. TRANS: Feed link text. %s is a username.
+#, fuzzy, php-format
+msgid "Feed for favorites of %s (Activity Streams JSON)"
+msgstr "Mating for favoritter av %s (Atom)"
+
 #. TRANS: Feed link text. %s is a username.
 #, php-format
 msgid "Feed for favorites of %s (RSS 1.0)"
@@ -5396,6 +5128,11 @@ msgstr "%s gruppe"
 msgid "%1$s group, page %2$d"
 msgstr "%1$s gruppe, side %2$d"
 
+#. TRANS: Tooltip for feed link. %s is a group nickname.
+#, fuzzy, php-format
+msgid "Notice feed for %s group (Activity Streams JSON)"
+msgstr "Notismating for %s gruppe (Atom)"
+
 #. TRANS: Tooltip for feed link. %s is a group nickname.
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
@@ -5416,42 +5153,8 @@ msgstr "Notismating for %s gruppe (Atom)"
 msgid "FOAF for %s group"
 msgstr "FOAF for gruppen %s"
 
-#. TRANS: Header for mini list of group members on a group page (h2).
-msgid "Members"
-msgstr "Medlemmer"
-
-#. TRANS: Description for mini list of group members on a group page when the group has no members.
-#. TRANS: Content of "Listed" page if there are no listed users.
-#. TRANS: Content of "People following tag x" if there are no subscribed users.
-#. TRANS: Empty list message for tags.
-#. TRANS: Text for user subscription statistics if the user has no subscriptions.
-#. TRANS: Text for user subscriber statistics if user has no subscribers.
-#. TRANS: Text for user user group membership statistics if user is not a member of any group.
-#. TRANS: Default content for section/sidebar widget.
-msgid "(None)"
-msgstr "(Ingen)"
-
-#. TRANS: Link to all group members from mini list of group members if group has more than n members.
-msgid "All members"
-msgstr "Alle medlemmer"
-
-#. TRANS: Header for group statistics on a group page (h2).
-#. TRANS: H2 text for user statistics.
-msgid "Statistics"
-msgstr "Statistikk"
-
-#. TRANS: Label for group creation date.
-msgctxt "LABEL"
-msgid "Created"
-msgstr "Opprettet"
-
-#. TRANS: Label for member count in statistics on group page.
-msgctxt "LABEL"
-msgid "Members"
-msgstr "Medlemmer"
-
 #. TRANS: Notice on group pages for anonymous users for StatusNet sites that accept new registrations.
-#. TRANS: **%s** is the group alias, %%%%site.name%%%% is the site name,
+#. TRANS: %s is the group name, %%%%site.name%%%% is the site name,
 #. TRANS: %%%%action.register%%%% is the URL for registration, %%%%doc.help%%%% is a URL to help.
 #. TRANS: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
 #, php-format
@@ -5470,26 +5173,20 @@ msgstr ""
 "%%%%))"
 
 #. TRANS: Notice on group pages for anonymous users for StatusNet sites that accept no new registrations.
-#. TRANS: **%s** is the group alias, %%%%site.name%%%% is the site name,
+#. TRANS: %s is the group name, %%%%site.name%%%% is the site name,
 #. TRANS: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
-#, php-format
+#, fuzzy, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
 "wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
 "[StatusNet](http://status.net/) tool. Its members share short messages about "
-"their life and interests. "
+"their life and interests."
 msgstr ""
 "**%s** er en brukergruppe på %%%%site.name%%%%, en [mikrobloggingstjeneste]"
 "(http://no.wikipedia.org/wiki/Mikroblogg) basert på det frie "
 "programvareverktøyet [StatusNet](http://status.net/). Dets medlemmer deler "
 "korte meldinger om deres liv og interesser. "
 
-#. TRANS: Title for list of group administrators on a group page.
-#, fuzzy
-msgctxt "TITLE"
-msgid "Admins"
-msgstr "Administratorer"
-
 #. TRANS: Client error displayed requesting a single message that does not exist.
 msgid "No such message."
 msgstr "Ingen slik melding."
@@ -5584,10 +5281,22 @@ msgstr ""
 "til å poste en!"
 
 #. TRANS: Header on show list page.
+#. TRANS: Link description for link to list of users tagged with a tag (so part of a list).
 #, fuzzy
 msgid "Listed"
 msgstr "Lisens"
 
+#. TRANS: Content of "Listed" page if there are no listed users.
+#. TRANS: Content of "People following tag x" if there are no subscribed users.
+#. TRANS: Description for mini list of group members on a group page when the group has no members.
+#. TRANS: Empty list message for tags.
+#. TRANS: Text for user subscription statistics if the user has no subscriptions.
+#. TRANS: Text for user subscriber statistics if user has no subscribers.
+#. TRANS: Text for user user group membership statistics if user is not a member of any group.
+#. TRANS: Default content for section/sidebar widget.
+msgid "(None)"
+msgstr "(Ingen)"
+
 #. TRANS: Link for more "People in list x by a user"
 #. TRANS: if there are more than the mini list's maximum.
 msgid "Show all"
@@ -5598,24 +5307,19 @@ msgstr "Vis alle"
 msgid "Subscribers"
 msgstr "Abonnenter"
 
-#. TRANS: Link for more "People following tag x"
-#. TRANS: if there are more than the mini list's maximum.
-msgid "All subscribers"
-msgstr "Alle abonnenter"
-
-#. TRANS: Page title showing tagged notices in one user's stream.
+#. TRANS: Page title showing tagged notices in one user's timeline.
 #. TRANS: %1$s is the username, %2$s is the hash tag.
 #, fuzzy, php-format
 msgid "Notices by %1$s tagged %2$s"
 msgstr "%1$s, side %2$d"
 
-#. TRANS: Page title showing tagged notices in one user's stream.
+#. TRANS: Page title showing tagged notices in one user's timeline.
 #. TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number.
 #, fuzzy, php-format
 msgid "Notices by %1$s tagged %2$s, page %3$d"
 msgstr "Brukere som har merket seg selv med %1$s - side %2$d"
 
-#. TRANS: Extended page title showing tagged notices in one user's stream.
+#. TRANS: Extended page title showing tagged notices in one user's timeline.
 #. TRANS: %1$s is the username, %2$d is the page number.
 #, fuzzy, php-format
 msgid "Notices by %1$s, page %2$d"
@@ -5627,6 +5331,12 @@ msgstr "Brukere som har merket seg selv med %1$s - side %2$d"
 msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
 msgstr "Notismating for %1$s merket %2$s (RSS 1.0)"
 
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#, fuzzy, php-format
+msgid "Notice feed for %s (Activity Streams JSON)"
+msgstr "Notismating for %s (Atom)"
+
 #. TRANS: Title for link to notice feed.
 #. TRANS: %s is a user nickname.
 #, php-format
@@ -5651,7 +5361,7 @@ msgstr "Notismating for %s (Atom)"
 msgid "FOAF for %s"
 msgstr "FOAF for %s"
 
-#. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
+#. TRANS: First sentence of empty list message for a timeline. $1%s is a user nickname.
 #, fuzzy, php-format
 msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
 msgstr "Dette er tidslinjen for %1$s men %2$s har ikke postet noe ennå."
@@ -5664,7 +5374,7 @@ msgstr ""
 "Sett noe interessant nylig? Du har ikke postet noen notiser ennå, så hvorfor "
 "ikke begynne nå? :)"
 
-#. TRANS: Second sentence of empty  list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
+#. TRANS: Second sentence of empty  list message for a non-self timeline. %1$s is a user nickname, %2$s is a part of a URL.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
 #, php-format
 msgid ""
@@ -5674,7 +5384,7 @@ msgstr ""
 "Vær den første til å [poste om dette emnet](%%%%action.newnotice%%%%?"
 "status_textarea=%s)!"
 
-#. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
+#. TRANS: Announcement for anonymous users showing a timeline if site registrations are open.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
 #, php-format
 msgid ""
@@ -5688,13 +5398,13 @@ msgstr ""
 "[StatusNet](http://status.net/). [Bli med nå](%%%%action.register%%%%) for å "
 "følge **%s** og mange flere sine notiser. ([Les mer](%%%%doc.help%%%%))"
 
-#. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
+#. TRANS: Announcement for anonymous users showing a timeline if site registrations are closed or invite only.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#, php-format
+#, fuzzy, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
 "wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
-"[StatusNet](http://status.net/) tool. "
+"[StatusNet](http://status.net/) tool."
 msgstr ""
 "**%s** har en konto på %%%%site.name%%%%, en [mikrobloggingstjeneste](http://"
 "no.wikipedia.org/wiki/Mikroblogg) basert på det frie programvareverktøyet "
@@ -5732,6 +5442,14 @@ msgstr "Nettstedsnavnet må være minst ett tegn langt."
 msgid "You must have a valid contact email address."
 msgstr "Du må ha en gyldig e-postadresse."
 
+#. TRANS: Client error displayed when a logo URL is not valid.
+msgid "Invalid logo URL."
+msgstr "Ugyldig logo-URL."
+
+#. TRANS: Client error displayed when a SSL logo URL is invalid.
+msgid "Invalid SSL logo URL."
+msgstr "Ugyldig SSL-logo-URL."
+
 #. TRANS: Client error displayed trying to save site settings with an invalid language code.
 #. TRANS: %s is the invalid language code.
 #, php-format
@@ -5807,7 +5525,9 @@ msgid "Default language"
 msgstr "Standardspråk"
 
 #. TRANS: Dropdown title on site settings panel.
-msgid "Site language when autodetection from browser settings is not available"
+#, fuzzy
+msgid ""
+"The site language when autodetection from browser settings is not available."
 msgstr ""
 "Nettstedsspråk når automatisk identifisering av innstillinger i nettleseren "
 "ikke er tilgjengelig"
@@ -5835,8 +5555,21 @@ msgid "How long users must wait (in seconds) to post the same thing again."
 msgstr ""
 "Hvor lenge en bruker må vente (i sekund) for å poste den samme tingen igjen."
 
+#. TRANS: Fieldset legend for form to change logo.
+msgid "Logo"
+msgstr "Logo"
+
+#. TRANS: Field label for StatusNet site logo.
+msgid "Site logo"
+msgstr "Nettstedslogo"
+
+#. TRANS: Field label for SSL StatusNet site logo.
+msgid "SSL logo"
+msgstr "SSL-logo"
+
 #. TRANS: Button title for saving site settings.
-msgid "Save site settings"
+#, fuzzy
+msgid "Save the site settings."
 msgstr "Lagre nettstedsinnstillinger"
 
 #. TRANS: Page title for site-wide notice tab in admin panel.
@@ -5865,7 +5598,7 @@ msgstr "Tekst for nettstedsnotis"
 msgid "Site-wide notice text (255 characters maximum; HTML allowed)"
 msgstr "Notistekst for hele nettstedet (maks 255 tegn; HTML tillatt)"
 
-#. TRANS: Title for button to save site notice in admin panel.
+#. TRANS: Button title to save site notice in admin panel.
 #, fuzzy
 msgid "Save site notice."
 msgstr "Lagre nettstedsnotis"
@@ -6066,7 +5799,7 @@ msgstr "Nettadresse til kilde"
 msgid "Snapshots will be sent to this URL."
 msgstr ""
 
-#. TRANS: Title for button to save snapshot settings.
+#. TRANS: Button title to save snapshot settings.
 #, fuzzy
 msgid "Save snapshot settings."
 msgstr "Lagre nettstedsinnstillinger"
@@ -6102,10 +5835,6 @@ msgstr "%1$s gruppemedlemmer, side %2$d"
 msgid "A list of users awaiting approval to subscribe to you."
 msgstr "En liste over brukerne i denne gruppen."
 
-#. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
-msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
-msgstr ""
-
 #. TRANS: Page title when subscription succeeded.
 #, fuzzy
 msgid "Subscribed"
@@ -6207,8 +5936,7 @@ msgid ""
 "You're not listening to anyone's notices right now, try subscribing to "
 "people you know. Try [people search](%%action.peoplesearch%%), look for "
 "members in groups you're interested in and in our [featured users](%%action."
-"featured%%). If you're a [Twitter user](%%action.twittersettings%%), you can "
-"automatically subscribe to people you already follow there."
+"featured%%)."
 msgstr ""
 
 #. TRANS: Subscription list text when looking at the subscriptions for a of a user other
@@ -6239,6 +5967,12 @@ msgstr "SMS"
 msgid "Notices tagged with %1$s, page %2$d"
 msgstr "Brukere som har merket seg selv med %1$s - side %2$d"
 
+#. TRANS: Link label for feed on "notices with tag" page.
+#. TRANS: %s is the tag the feed is for.
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (Activity Streams JSON)"
+msgstr "Notismating for merkelapp %s (Atom)"
+
 #. TRANS: Link label for feed on "notices with tag" page.
 #. TRANS: %s is the tag the feed is for.
 #, php-format
@@ -6352,16 +6086,6 @@ msgstr "Abonner"
 msgid "%1$s unsubscribed from list %2$s by %3$s"
 msgstr "%1$s gruppemedlemmer, side %2$d"
 
-#. TRANS: Client error displayed when trying to update profile with an incompatible license.
-#. TRANS: %1$s is the license incompatible with site license %2$s.
-#. TRANS: Exception thrown when licenses are not compatible for an authorisation request.
-#. TRANS: %1$s is the license for the listenee, %2$s is the license for "this" StatusNet site.
-#, fuzzy, php-format
-msgid ""
-"Listenee stream license \"%1$s\" is not compatible with site license \"%2$s"
-"\"."
-msgstr "Notislisensen ‘%1$s’ er ikke kompatibel med nettstedslisensen ‘%2$s’."
-
 #. TRANS: Title of URL settings tab in profile settings.
 #, fuzzy
 msgid "URL settings"
@@ -6501,156 +6225,11 @@ msgstr "Invitasjoner aktivert"
 msgid "Whether to allow users to invite new users."
 msgstr "Hvorvidt brukere tillates å invitere nye brukere."
 
-#. TRANS: Title for button to save user settings in user admin panel.
+#. TRANS: Button title to save user settings in user admin panel.
 #, fuzzy
 msgid "Save user settings."
 msgstr "Lagre nettstedsinnstillinger"
 
-#. TRANS: Page title.
-msgid "Authorize subscription"
-msgstr "Autoriser abonnementet"
-
-#. TRANS: Page notice on "Authorize subscription" page.
-msgid ""
-"Please check these details to make sure that you want to subscribe to this "
-"user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
-"click \"Reject\"."
-msgstr ""
-
-#. TRANS: Button text on Authorise Subscription page.
-#. TRANS: Submit button text to accept a group membership request on approve group form.
-#. TRANS: Submit button text to accept a subscription request on approve sub form.
-#, fuzzy
-msgctxt "BUTTON"
-msgid "Accept"
-msgstr "Godta"
-
-#. TRANS: Title for button on Authorise Subscription page.
-#. TRANS: Button title to subscribe to a user.
-#, fuzzy
-msgid "Subscribe to this user."
-msgstr "Abonner på denne brukeren"
-
-#. TRANS: Button text on Authorise Subscription page.
-#. TRANS: Submit button text to reject a group membership request on approve group form.
-#. TRANS: Submit button text to reject a subscription request on approve sub form.
-#, fuzzy
-msgctxt "BUTTON"
-msgid "Reject"
-msgstr "Avvis"
-
-#. TRANS: Title for button on Authorise Subscription page.
-#, fuzzy
-msgid "Reject this subscription."
-msgstr "Avvis dette abonnementet"
-
-#. TRANS: Client error displayed for an empty authorisation request.
-msgid "No authorization request!"
-msgstr ""
-
-#. TRANS: Accept message header from Authorise subscription page.
-#, fuzzy
-msgid "Subscription authorized"
-msgstr "Abonnement"
-
-#. TRANS: Accept message text from Authorise subscription page.
-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 ""
-
-#. TRANS: Reject message header from Authorise subscription page.
-#, fuzzy
-msgid "Subscription rejected"
-msgstr "Abonnement"
-
-#. TRANS: Reject message from Authorise subscription page.
-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 ""
-
-#. TRANS: Exception thrown when no valid user is found for an authorisation request.
-#. TRANS: %s is a listener URI.
-#, php-format
-msgid "Listener URI \"%s\" not found here."
-msgstr ""
-
-#. TRANS: Exception thrown when listenee URI is too long for an authorisation request.
-#. TRANS: %s is a listenee URI.
-#, fuzzy, php-format
-msgid "Listenee URI \"%s\" is too long."
-msgstr "Kilde-URL er for lang."
-
-#. TRANS: Exception thrown when listenee URI is a local user for an authorisation request.
-#. TRANS: %s is a listenee URI.
-#, fuzzy, php-format
-msgid "Listenee URI \"%s\" is a local user."
-msgstr "Profil-URL ‘%s’ er for en lokal bruker."
-
-#. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
-#. TRANS: %s is a profile URL.
-#, fuzzy, php-format
-msgid "Profile URL \"%s\" is for a local user."
-msgstr "Profil-URL ‘%s’ er for en lokal bruker."
-
-#. TRANS: Exception thrown when avatar URL is invalid for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#, fuzzy, php-format
-msgid "Avatar URL \"%s\" is not valid."
-msgstr "Avatar-URL ‘%s’ er ikke gyldig."
-
-#. TRANS: Exception thrown when avatar URL could not be read for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#, fuzzy, php-format
-msgid "Cannot read avatar URL \"%s\"."
-msgstr "Kan ikke lese avatar-URL ‘%s’"
-
-#. TRANS: Exception thrown when avatar URL return an invalid image type for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#, fuzzy, php-format
-msgid "Wrong image type for avatar URL \"%s\"."
-msgstr "Feil bildetype for avatar-URL ‘%s’."
-
-#. TRANS: Title for profile design page.
-#. TRANS: Page title for profile design page.
-msgid "Profile design"
-msgstr "Vis profilutseender"
-
-#. TRANS: Instructions for Profile design page.
-#. TRANS: Instructions for profile design page.
-#, fuzzy
-msgid ""
-"Customize the way your profile looks with a background image and a colour "
-"palette of your choice."
-msgstr ""
-"Tilpass hvordan gruppen din ser ut med et bakgrunnsbilde og en fargepalett "
-"av ditt valg."
-
-#. TRANS: Succes message on Profile design page when finding an easter egg.
-msgid "Enjoy your hotdog!"
-msgstr "Bon appétit."
-
-#. TRANS: Form legend on Profile design page.
-#, fuzzy
-msgid "Design settings"
-msgstr "Lagre nettstedsinnstillinger"
-
-#. TRANS: Checkbox label on Profile design page.
-msgid "View profile designs"
-msgstr "Vis profilutseender"
-
-#. TRANS: Title for checkbox on Profile design page.
-msgid "Show or hide profile designs."
-msgstr "Vis eller skjul profilutseender."
-
-#. TRANS: Form legend on Profile design page for form to choose a background image.
-#, fuzzy
-msgid "Background file"
-msgstr "Bakgrunn"
-
 #. TRANS: Page title for all but the first page of groups for a user.
 #. TRANS: %1$s is a nickname, %2$d is a page number.
 #, php-format
@@ -6689,9 +6268,9 @@ msgstr "StatusNet %s"
 
 #. TRANS: Content part of StatusNet version page.
 #. TRANS: %1$s is the engine name (StatusNet) and %2$s is the StatusNet version.
-#, php-format
+#, fuzzy, php-format
 msgid ""
-"This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, "
+"This site is powered by %1$s version %2$s, Copyright 2008-2011 StatusNet, "
 "Inc. and contributors."
 msgstr ""
 "Dette nettstedet drives av %1$s versjon %2$s, Copyright 2008-2010 StatusNet, "
@@ -6710,7 +6289,7 @@ msgid ""
 "StatusNet is free software: you can redistribute it and/or modify it under "
 "the terms of the GNU Affero General Public License as published by the Free "
 "Software Foundation, either version 3 of the License, or (at your option) "
-"any later version. "
+"any later version."
 msgstr ""
 
 #. TRANS: Content part of StatusNet version page.
@@ -6718,7 +6297,7 @@ msgid ""
 "This program is distributed in the hope that it will be useful, but WITHOUT "
 "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
 "FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License "
-"for more details. "
+"for more details."
 msgstr ""
 
 #. TRANS: Content part of StatusNet version page.
@@ -6777,16 +6356,26 @@ msgstr "Kan ikke behandle URL '%s'"
 msgid "Robin thinks something is impossible."
 msgstr "Robin mener at noe er umulig."
 
+#. TRANS: Message used to be inserted as %2$s in  the text "No file may
+#. TRANS: be larger than %1$d byte and the file you sent was %2$s.".
+#. TRANS: %1$d is the number of bytes of an uploaded file.
+#, php-format
+msgid "%1$d byte"
+msgid_plural "%1$d bytes"
+msgstr[0] ""
+msgstr[1] ""
+
 #. TRANS: Message given if an upload is larger than the configured maximum.
-#. TRANS: %1$d is the byte limit for uploads, %2$d is the byte count for the uploaded file.
-#. TRANS: %1$s is used for plural.
+#. TRANS: %1$d (used for plural) is the byte limit for uploads,
+#. TRANS: %2$s is the proper form of "n bytes". This is the only ways to have
+#. TRANS: gettext support multiple plurals in the same message, unfortunately...
 #, php-format
 msgid ""
-"No file may be larger than %1$d byte and the file you sent was %2$d bytes. "
-"Try to upload a smaller version."
+"No file may be larger than %1$d byte and the file you sent was %2$s. Try to "
+"upload a smaller version."
 msgid_plural ""
-"No file may be larger than %1$d bytes and the file you sent was %2$d bytes. "
-"Try to upload a smaller version."
+"No file may be larger than %1$d bytes and the file you sent was %2$s. Try to "
+"upload a smaller version."
 msgstr[0] ""
 msgstr[1] ""
 
@@ -6854,6 +6443,11 @@ msgstr "Kunne ikke oppdatere lokal gruppe."
 msgid "Could not create login token for %s"
 msgstr "Kunne ikke opprette alias."
 
+#. TRANS: Exception thrown when a program code class (%s) cannot be instantiated.
+#, fuzzy, php-format
+msgid "Cannot instantiate class %s."
+msgstr "Klarer ikke å lagre nytt passord."
+
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.
 msgid "No database name or DSN found anywhere."
 msgstr "Inget databasenavn eller DSN funnet noe sted."
@@ -7014,7 +6608,7 @@ msgstr ""
 #, php-format
 msgid ""
 "You already have %1$d or more people in list %2$s, which is the maximum "
-"allowed number.Try unlisting others first."
+"allowed number. Try unlisting others first."
 msgstr ""
 
 #. TRANS: Exception thrown when inserting a list subscription in the database fails.
@@ -7037,7 +6631,6 @@ msgid "Unable to save tag."
 msgstr "Kunne ikke lagre nettstedsnotis."
 
 #. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
-#. TRANS: Error message displayed to a banned user when they try to subscribe.
 #, fuzzy
 msgid "You have been banned from subscribing."
 msgstr "Brukeren har blokkert deg fra å abonnere."
@@ -7060,10 +6653,6 @@ msgstr "Alle abonnementer"
 msgid "Could not delete self-subscription."
 msgstr "Kunne ikke slette favoritt."
 
-#. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
-msgid "Could not delete subscription OMB token."
-msgstr "Kunne ikke slette favoritt."
-
 #. TRANS: Exception thrown when a subscription could not be deleted on the server.
 msgid "Could not delete subscription."
 msgstr "Kunne ikke slette favoritt."
@@ -7098,6 +6687,18 @@ msgstr ""
 msgid "Single-user mode code called when not enabled."
 msgstr ""
 
+#. TRANS: Information on password recovery form if no known username or e-mail address was specified.
+msgid "No user with that email address or username."
+msgstr "Ingen bruker med den e-postadressen eller det kallenavnet."
+
+#. TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.
+msgid "No registered email address for that user."
+msgstr "Ingen registrert e-postadresse for den brukeren."
+
+#. TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.
+msgid "Error saving address confirmation."
+msgstr "Feil ved lagring av adressebekreftelse."
+
 #. TRANS: Server exception thrown when creating a group failed.
 msgid "Could not create group."
 msgstr "Kunne ikke opprette gruppe."
@@ -7370,28 +6971,12 @@ msgstr "showForm() ikke implementert."
 msgid "saveSettings() not implemented."
 msgstr "saveSettings() ikke implementert."
 
-#. TRANS: Client error message thrown if design settings could not be deleted in
-#. TRANS: the admin panel Design.
-#, fuzzy
-msgid "Unable to delete design setting."
-msgstr "Kunne ikke lagre dine innstillinger for utseende."
-
 #. TRANS: Header in administrator navigation panel.
-#. TRANS: Header in settings navigation panel.
 #, fuzzy
 msgctxt "HEADER"
 msgid "Home"
 msgstr "Hjemmesiden"
 
-#. TRANS: Menu item in administrator navigation panel.
-#. TRANS: Menu item in default local navigation panel.
-#. TRANS: Menu item in personal group navigation menu.
-#. TRANS: Menu item in settings navigation panel.
-#, fuzzy
-msgctxt "MENU"
-msgid "Home"
-msgstr "Hjemmesiden"
-
 #. TRANS: Header in administrator navigation panel.
 #, fuzzy
 msgctxt "HEADER"
@@ -7408,18 +6993,6 @@ msgctxt "MENU"
 msgid "Site"
 msgstr "Nettsted"
 
-#. TRANS: Menu item title in administrator navigation panel.
-#, fuzzy
-msgid "Design configuration"
-msgstr "Tilgangskonfigurasjon"
-
-#. TRANS: Menu item in administrator navigation panel.
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: Menu item in settings navigation panel.
-msgctxt "MENU"
-msgid "Design"
-msgstr "Utseende"
-
 #. TRANS: Menu item title in administrator navigation panel.
 msgid "User configuration"
 msgstr "Brukerkonfigurasjon"
@@ -7526,43 +7099,6 @@ msgstr ""
 msgid "Could not authenticate you."
 msgstr ""
 
-#. TRANS: Server error displayed when trying to create an anynymous OAuth consumer.
-#, fuzzy
-msgid "Could not create anonymous consumer."
-msgstr "Kunne ikke opprette alias."
-
-#. TRANS: Server error displayed when trying to create an anynymous OAuth application.
-#, fuzzy
-msgid "Could not create anonymous OAuth application."
-msgstr "Kunne ikke opprette program."
-
-#. TRANS: Exception thrown when no token association could be found.
-msgid ""
-"Could not find a profile and application associated with the request token."
-msgstr ""
-
-#. TRANS: Exception thrown when no access token can be issued.
-#, fuzzy
-msgid "Could not issue access token."
-msgstr "Kunne ikke sette inn melding."
-
-#. TRANS: Exception thrown when a database error occurs.
-msgid "Database error inserting OAuth application user."
-msgstr "Databasefeil ved innsetting av bruker i programmet OAuth."
-
-#. TRANS: Exception thrown when a database error occurs.
-#, fuzzy
-msgid "Database error updating OAuth application user."
-msgstr "Databasefeil ved innsetting av bruker i programmet OAuth."
-
-#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
-msgid "Tried to revoke unknown token."
-msgstr ""
-
-#. TRANS: Exception thrown when an attempt is made to remove a revoked token.
-msgid "Failed to delete revoked token."
-msgstr ""
-
 #. TRANS: Form input field label for application icon.
 msgid "Icon"
 msgstr "Ikon"
@@ -7646,13 +7182,14 @@ msgstr ""
 "skrivetilgang"
 
 #. TRANS: Submit button title.
-msgid "Cancel"
-msgstr "Avbryt"
+#, fuzzy
+msgid "Cancel application changes."
+msgstr "Tilkoblede program"
 
 #. TRANS: Submit button title.
-#. TRANS: Button text to save a list.
-msgid "Save"
-msgstr "Lagre"
+#, fuzzy
+msgid "Save application changes."
+msgstr "Ny applikasjon"
 
 #. TRANS: Name for an anonymous application in application list.
 #, fuzzy
@@ -7688,6 +7225,20 @@ msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "Tilbakekall"
 
+#. TRANS: Submit button text to accept a group membership request on approve group form.
+#. TRANS: Submit button text to accept a subscription request on approve sub form.
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Accept"
+msgstr "Godta"
+
+#. TRANS: Submit button text to reject a group membership request on approve group form.
+#. TRANS: Submit button text to reject a subscription request on approve sub form.
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Reject"
+msgstr "Avvis"
+
 #. TRANS: Atom feed exception thrown when an author element does not contain a name element.
 msgid "Author element must contain a name element."
 msgstr ""
@@ -7729,7 +7280,7 @@ msgstr "Endring av passord er ikke tillatt"
 
 #. TRANS: Title for the form to block a user.
 msgid "Block"
-msgstr "Blokkér"
+msgstr "Blokker"
 
 #. TRANS: Description of the form to block a user.
 msgid "Block this user"
@@ -8262,6 +7813,11 @@ msgstr ""
 msgid "Go to the installer."
 msgstr "Log inn på nettstedet"
 
+#. TRANS: Header on conversation page. Hidden by default (h2).
+#. TRANS: Label for user statistics.
+msgid "Notices"
+msgstr "Notiser"
+
 #. TRANS: Page title for when a database error occurs.
 msgid "Database error"
 msgstr "Databasefeil"
@@ -8273,14 +7829,6 @@ msgctxt "MENU"
 msgid "Public"
 msgstr "Offentlig"
 
-#. TRANS: Menu item in default local navigation panel.
-#. TRANS: Menu item in search group navigation panel.
-#. TRANS: Menu item in local navigation menu.
-#, fuzzy
-msgctxt "MENU"
-msgid "Groups"
-msgstr "Grupper"
-
 #. TRANS: Menu item in default local navigation panel.
 #. TRANS: Menu item title in local navigation menu.
 #, fuzzy
@@ -8297,54 +7845,12 @@ msgstr "Slett"
 msgid "Delete this user"
 msgstr "Slett denne brukeren"
 
-#. TRANS: Form legend of form for changing the page design.
-#, fuzzy
-msgid "Change design"
-msgstr "Lagre utseende"
-
-#. TRANS: Fieldset legend on profile design page to change profile page colours.
-msgid "Change colours"
-msgstr "Endre farger"
-
-#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-msgid "Use defaults"
-msgstr "Bruk standard"
-
-#. TRANS: Label in form on profile design page.
-#. TRANS: Field contains file name on user's computer that could be that user's custom profile background image.
-msgid "Upload file"
-msgstr "Last opp fil"
-
-#. TRANS: Instructions for form on profile design page.
-#, fuzzy
-msgid ""
-"You can upload your personal background image. The maximum file size is 2MB."
-msgstr "Du kan laste opp en personlig avatar. Maks filstørrelse er %s."
-
-#. TRANS: Radio button on profile design page that will enable use of the uploaded profile image.
-#, fuzzy
-msgctxt "RADIO"
-msgid "On"
-msgstr "PÃ¥"
-
-#. TRANS: Radio button on profile design page that will disable use of the uploaded profile image.
-#, fuzzy
-msgctxt "RADIO"
-msgid "Off"
-msgstr "Av"
-
-#. TRANS: Success message displayed if design settings were saved after clicking "Use defaults".
-#, fuzzy
-msgid "Design defaults restored."
-msgstr "Utseende lagret."
-
 #. TRANS: Exception. %s is an ID.
 #, fuzzy, php-format
 msgid "Unable to find services for %s."
 msgstr "Kunne ikke fjerne tilgang for applikasjonen: %s."
 
 #. TRANS: Form legend for removing the favourite status for a favourite notice.
-#. TRANS: Title for button text for removing the favourite status for a favourite notice.
 #, fuzzy
 msgid "Disfavor this notice"
 msgstr "Slett denne notisen"
@@ -8355,8 +7861,12 @@ msgctxt "BUTTON"
 msgid "Disfavor favorite"
 msgstr "Fjern favoritt"
 
+#. TRANS: Button title for removing the favourite status for a favourite notice.
+#, fuzzy
+msgid "Remove this notice from your list of favorite notices."
+msgstr "Kunne ikke hente favorittnotiser."
+
 #. TRANS: Form legend for adding the favourite status to a notice.
-#. TRANS: Title for button text for adding the favourite status to a notice.
 #, fuzzy
 msgid "Favor this notice"
 msgstr "Repeter denne notisen"
@@ -8367,6 +7877,11 @@ msgctxt "BUTTON"
 msgid "Favor"
 msgstr "Favoritter"
 
+#. TRANS: Button title for adding the favourite status to a notice.
+#, fuzzy
+msgid "Add this notice to your list of favorite notices."
+msgstr "Kunne ikke hente favorittnotiser."
+
 #. TRANS: Feed type name.
 msgid "RSS 1.0"
 msgstr "RSS 1.0"
@@ -8383,6 +7898,10 @@ msgstr "Atom"
 msgid "FOAF"
 msgstr "Venn av en venn"
 
+#. TRANS: Feed type name. See http://activitystrea.ms/
+msgid "Activity Streams"
+msgstr ""
+
 #. TRANS: Client exception thrown when an imported feed does not have an author.
 msgid "No author in the feed."
 msgstr ""
@@ -8416,6 +7935,28 @@ msgstr ""
 msgid "Grant this user the \"%s\" role"
 msgstr "Innvilg denne brukeren rollen «%s»"
 
+#. TRANS: Header for mini list of group members on a group page (h2).
+msgid "Members"
+msgstr "Medlemmer"
+
+#. TRANS: Link to all group members from mini list of group members if group has more than n members.
+msgid "All members"
+msgstr "Alle medlemmer"
+
+#. TRANS: Header for mini list of users with a pending membership request on a group page (h2).
+msgid "Pending"
+msgstr ""
+
+#. TRANS: Header for mini list of users that are blocked in a group page (h2).
+msgid "Blocked"
+msgstr "Blokkert"
+
+#. TRANS: Title for list of group administrators on a group page.
+#, fuzzy
+msgctxt "TITLE"
+msgid "Admins"
+msgstr "Administratorer"
+
 #. TRANS: Button text for the form that will block a user from a group.
 msgctxt "BUTTON"
 msgid "Block"
@@ -8423,8 +7964,8 @@ msgstr "Blokker"
 
 #. TRANS: Submit button title.
 msgctxt "TOOLTIP"
-msgid "Block this user"
-msgstr "Blokker denne brukeren"
+msgid "Block this user so that they can no longer post messages to it."
+msgstr ""
 
 #. TRANS: Field title on group edit form.
 #, fuzzy
@@ -8477,63 +8018,9 @@ msgctxt "GROUPADMIN"
 msgid "Admin"
 msgstr "Administrator"
 
-#. TRANS: Menu item in the group navigation page.
-msgctxt "MENU"
-msgid "Group"
-msgstr "Gruppe"
-
-#. TRANS: Tooltip for menu item in the group navigation page.
-#. TRANS: %s is the nickname of the group.
-#, php-format
-msgctxt "TOOLTIP"
-msgid "%s group"
-msgstr "%s gruppe"
-
-#. TRANS: Menu item in the group navigation page.
-msgctxt "MENU"
-msgid "Members"
-msgstr "Medlemmer"
-
-#. TRANS: Tooltip for menu item in the group navigation page.
-#. TRANS: %s is the nickname of the group.
-#, php-format
-msgctxt "TOOLTIP"
-msgid "%s group members"
-msgstr "%s gruppemedlemmer"
-
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: %d is the number of pending members.
-#, php-format
-msgctxt "MENU"
-msgid "Pending members (%d)"
-msgid_plural "Pending members (%d)"
-msgstr[0] ""
-msgstr[1] ""
-
-#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: %s is the nickname of the group.
-#, fuzzy, php-format
-msgctxt "TOOLTIP"
-msgid "%s pending members"
-msgstr "%s gruppemedlemmer"
-
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-msgctxt "MENU"
-msgid "Blocked"
-msgstr "Blokkert"
-
-#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: %s is the nickname of the group.
-#, php-format
-msgctxt "TOOLTIP"
-msgid "%s blocked users"
-msgstr "%s blokkerte brukere"
-
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: Menu item in primary navigation panel.
-msgctxt "MENU"
-msgid "Admin"
-msgstr "Administrator"
+#. TRANS: Group actions header (h2). Text hidden by default.
+msgid "Group actions"
+msgstr "Gruppehandlinger"
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
@@ -8542,11 +8029,6 @@ msgctxt "TOOLTIP"
 msgid "Edit %s group properties"
 msgstr ""
 
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-msgctxt "MENU"
-msgid "Logo"
-msgstr "Logo"
-
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
 #, php-format
@@ -8554,16 +8036,10 @@ msgctxt "TOOLTIP"
 msgid "Add or edit %s logo"
 msgstr "Legg til eller rediger %s logo"
 
-#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: %s is the nickname of the group.
-#, php-format
-msgctxt "TOOLTIP"
-msgid "Add or edit %s design"
-msgstr "Legg til eller rediger %s utseende"
-
-#. TRANS: Group actions header (h2). Text hidden by default.
-msgid "Group actions"
-msgstr "Gruppehandlinger"
+#. TRANS: Link text for link on user profile.
+msgctxt "MENU"
+msgid "Logo"
+msgstr "Logo"
 
 #. TRANS: Title for groups with the most members section.
 #, fuzzy
@@ -8575,11 +8051,20 @@ msgstr "Populære notiser"
 msgid "Active groups"
 msgstr "Alle grupper"
 
-#. TRANS: Title for group tag cloud section.
-#. TRANS: %s is a group name.
-#, fuzzy, php-format
-msgid "Tags in %s group's notices"
-msgstr "Rediger %s gruppeegenskaper"
+#. TRANS: Link description for seeing all groups.
+#. TRANS: Link description for seeing all lists.
+#, fuzzy
+msgid "See all"
+msgstr "Vis alle"
+
+#. TRANS: Link title for seeing all groups.
+msgid "See all groups you belong to."
+msgstr ""
+
+#. TRANS: Menu item title in personal group navigation menu.
+#. TRANS: %s is a username.
+msgid "Back to top"
+msgstr ""
 
 #. TRANS: Client exception 406
 msgid "This page is not available in a media type you accept"
@@ -8664,12 +8149,45 @@ msgctxt "TITLE"
 msgid "Trends"
 msgstr "Trender"
 
-#. TRANS: Button text for inviting more users to the StatusNet instance.
+#. TRANS: Default button text for inviting more users to the StatusNet instance.
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Invite more colleagues"
 msgstr "Inviter nye brukere"
 
+#. TRANS: Form legend.
+#, fuzzy
+msgid "Invite collegues"
+msgstr "Inviter nye brukere"
+
+#. TRANS: Field label for a list of e-mail addresses.
+msgid "Email addresses"
+msgstr "E-postadresser"
+
+#. TRANS: Field title for a list of e-mail addresses.
+#, fuzzy
+msgid "Addresses of friends to invite (one per line)."
+msgstr "Adresser til venner som skal inviteres (én per linje)"
+
+#. TRANS: Field label for a personal message to send to invitees.
+msgid "Personal message"
+msgstr "Personlig melding"
+
+#. TRANS: Field title for a personal message to send to invitees.
+msgid "Optionally add a personal message to the invitation."
+msgstr "Om du vil kan du legge til en personlig melding i invitasjonen."
+
+#. TRANS: Send button for inviting friends
+#. TRANS: Button text for sending notice.
+msgctxt "BUTTON"
+msgid "Send"
+msgstr "Send"
+
+#. TRANS: Submit button title.
+#, fuzzy
+msgid "Send invitations."
+msgstr "Invitasjoner"
+
 #. TRANS: Button text for joining a group.
 #, fuzzy
 msgctxt "BUTTON"
@@ -8682,6 +8200,11 @@ msgctxt "BUTTON"
 msgid "Leave"
 msgstr "Forlat"
 
+#. TRANS: Link title for seeing all lists.
+#, fuzzy
+msgid "See all lists you have created."
+msgstr "Program du har registrert"
+
 #. TRANS: Menu item for logging in to the StatusNet site.
 #. TRANS: Menu item in primary navigation panel.
 msgctxt "MENU"
@@ -8740,8 +8263,8 @@ msgstr ""
 #. TRANS: %1$s is the subscribing user's nickname, %2$s is the StatusNet sitename.
 #. TRANS: Main body of new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscriber's long name, %2$s is the StatusNet sitename.
-#, php-format
-msgid "%1$s is now listening to your notices on %2$s."
+#, fuzzy, php-format
+msgid "%1$s is now following you on %2$s."
 msgstr "%1$s lytter nå til dine notiser på %2$s."
 
 #. TRANS: Subject of pending new-subscriber notification e-mail.
@@ -8910,7 +8433,7 @@ msgstr ""
 "Ikke svar på denne e-posten; det vil ikke nå frem til dem.\n"
 "\n"
 "Med vennlig hilsen,\n"
-"%5$s\n"
+"%5$s"
 
 #. TRANS: Subject for favorite notification e-mail.
 #. TRANS: %1$s is the adding user's long name, %2$s is the adding user's nickname.
@@ -8976,7 +8499,7 @@ msgstr "%s (@%s) sendte en notis for din oppmerksomhet"
 #. TRANS: Body of @-reply notification e-mail.
 #. TRANS: %1$s is the sending user's name, $2$s is the StatusNet sitename,
 #. TRANS: %3$s is a URL to the notice, %4$s is the notice text,
-#. TRANS: %5$s is a URL to the full conversion if it exists (otherwise empty),
+#. TRANS: %5$s is the text "The full conversation can be read here:" and a URL to the full conversion if it exists (otherwise empty),
 #. TRANS: %6$s is a URL to reply to the notice, %7$s is a URL to all @-replies for the addressed user,
 #, fuzzy, php-format
 msgid ""
@@ -9024,6 +8547,10 @@ msgstr ""
 
 #. TRANS: Subject of group join notification e-mail.
 #. TRANS: %1$s is the joining user's nickname, %2$s is the group name, and %3$s is the StatusNet sitename.
+#, fuzzy, php-format
+msgid "%1$s has joined your group %2$s on %3$s"
+msgstr "%1$s ble med i gruppen %2$s"
+
 #. TRANS: Main body of group join notification e-mail.
 #. TRANS: %1$s is the subscriber's long name, %2$s is the group name, and %3$s is the StatusNet sitename,
 #. TRANS: %4$s is a block of profile info about the subscriber.
@@ -9116,8 +8643,9 @@ msgid "Make Admin"
 msgstr "Gjør til administrator"
 
 #. TRANS: Submit button title.
+#, fuzzy
 msgctxt "TOOLTIP"
-msgid "Make this user an admin"
+msgid "Make this user an admin."
 msgstr "Gjør denne burkeren til administrator"
 
 #. TRANS: Client exception thrown when a database error was thrown during a file upload operation.
@@ -9164,7 +8692,7 @@ msgstr "Send en direktenotis"
 msgid "Select recipient:"
 msgstr "Velg lisens"
 
-#. TRANS Entry in drop-down selection box in direct-message inbox/outbox when no one is available to message.
+#. TRANS: Entry in drop-down selection box in direct-message inbox/outbox when no one is available to message.
 #, fuzzy
 msgid "No mutual subscribers."
 msgstr "Alle abonnementer"
@@ -9236,6 +8764,10 @@ msgstr ""
 msgid "You must implement either adaptNoticeListItem() or showNotice()."
 msgstr ""
 
+#. TRANS: Link description to show more items in a list.
+msgid "More â–¼"
+msgstr ""
+
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 msgid "Nickname cannot be empty."
 msgstr ""
@@ -9286,10 +8818,6 @@ msgctxt "SEPARATOR"
 msgid ", "
 msgstr ", "
 
-#. TRANS: Start of profile addressees list.
-msgid " â–¸ "
-msgstr " â–¸ "
-
 #. TRANS: Used in coordinates as abbreviation of north.
 msgid "N"
 msgstr "N"
@@ -9329,7 +8857,8 @@ msgid "Repeated by"
 msgstr "Repetert av"
 
 #. TRANS: Link title in notice list item to reply to a notice.
-msgid "Reply to this notice"
+#, fuzzy
+msgid "Reply to this notice."
 msgstr "Svar på denne notisen"
 
 #. TRANS: Link text in notice list item to reply to a notice.
@@ -9337,8 +8866,9 @@ msgid "Reply"
 msgstr "Svar"
 
 #. TRANS: Link title in notice list item to delete a notice.
-msgid "Delete this notice"
-msgstr "Slett denne notisen"
+#, fuzzy
+msgid "Delete this notice from the timeline."
+msgstr "Slett denne notisen."
 
 #. TRANS: Title for repeat form status in notice list when a notice has been repeated.
 #, fuzzy
@@ -9364,27 +8894,6 @@ msgstr "Knuff"
 msgid "Send a nudge to this user."
 msgstr "Send et knuff til denne brukeren"
 
-#. TRANS: Exception thrown when creating a new profile fails in OAuth store.
-msgid "Error inserting new profile."
-msgstr ""
-
-#. TRANS: Exception thrown when creating a new avatar fails in OAuth store.
-msgid "Error inserting avatar."
-msgstr ""
-
-#. TRANS: Exception thrown when creating a remote profile fails in OAuth store.
-msgid "Error inserting remote profile."
-msgstr ""
-
-#. TRANS: Exception thrown when a notice is denied because it has been sent before.
-msgid "Duplicate notice."
-msgstr ""
-
-#. TRANS: Exception thrown when creating a new subscription fails in OAuth store.
-#, fuzzy
-msgid "Could not insert new subscription."
-msgstr "Kunne ikke sette inn bekreftelseskode."
-
 #. TRANS: Server exception thrown in oEmbed action if no API endpoint is available.
 #, fuzzy
 msgid "No oEmbed API endpoint available."
@@ -9474,11 +8983,6 @@ msgstr "Rediger"
 msgid "Edit %s list by you."
 msgstr "Rediger %s gruppe"
 
-#. TRANS: Link description for link to list of users tagged with a tag.
-#, fuzzy
-msgid "Tagged"
-msgstr "Tagger"
-
 #. TRANS: Title for link to edit list settings.
 #, fuzzy
 msgid "Edit list settings."
@@ -9634,8 +9138,10 @@ msgctxt "plugin"
 msgid "Enable"
 msgstr "Aktiver"
 
+#. TRANS: Plugin description for a disabled plugin.
 msgctxt "plugin-description"
-msgid "(Plugin descriptions unavailable when disabled.)"
+msgid ""
+"(The plugin description is unavailable when a plugin has been disabled.)"
 msgstr ""
 
 #. TRANS: Menu item in primary navigation panel.
@@ -9649,6 +9155,11 @@ msgstr "SMS-innstillinger"
 msgid "Change your personal settings."
 msgstr "Endre profilinnstillingene dine"
 
+#. TRANS: Menu item in primary navigation panel.
+msgctxt "MENU"
+msgid "Admin"
+msgstr "Administrator"
+
 #. TRANS: Menu item title in primary navigation panel.
 #, fuzzy
 msgid "Site configuration."
@@ -9669,15 +9180,8 @@ msgstr "Logg ut fra nettstedet"
 msgid "Login to the site."
 msgstr "Log inn på nettstedet"
 
-#. TRANS: Menu item in primary navigation panel.
-msgctxt "MENU"
-msgid "Search"
-msgstr "Søk"
-
-#. TRANS: Menu item title in primary navigation panel.
-#, fuzzy
-msgid "Search the site."
-msgstr "Søk nettsted"
+msgid "This profile has been silenced by site moderators"
+msgstr ""
 
 #. TRANS: H2 text for user subscription statistics.
 #, fuzzy
@@ -9689,6 +9193,10 @@ msgstr "Tillat"
 msgid "Followers"
 msgstr "Tillat"
 
+#. TRANS: H2 text for user statistics.
+msgid "Statistics"
+msgstr "Statistikk"
+
 #. TRANS: Label for user statistics.
 msgid "User ID"
 msgstr "Bruker-ID"
@@ -9697,10 +9205,6 @@ msgstr "Bruker-ID"
 msgid "Member since"
 msgstr "Medlem siden"
 
-#. TRANS: Label for user statistics.
-msgid "Notices"
-msgstr "Notiser"
-
 #. TRANS: Label for user statistics.
 #. TRANS: Average count of posts made per day since account registration.
 msgid "Daily average"
@@ -9794,13 +9298,13 @@ msgid "Keyword(s)"
 msgstr "Nøkkelord"
 
 #. TRANS: Button text for searching site.
+#. TRANS: Button text for search button on search form.
 #. TRANS: Button text to search profiles.
 msgctxt "BUTTON"
 msgid "Search"
 msgstr "Søk"
 
 #. TRANS: Standard search suggestions shown when a search does not give any results.
-#, fuzzy
 msgid ""
 "* Make sure all words are spelled correctly.\n"
 "* Try different keywords.\n"
@@ -9810,10 +9314,10 @@ msgstr ""
 "* Kontroller at alle ordene er riktig stavet.\n"
 "* Prøv ulike nøkkelord.\n"
 "* Prøv mer generelle nøkkelord.\n"
-"* Prøv færre nøkkelord.\n"
+"* Prøv færre nøkkelord."
 
 #. TRANS: Standard search suggestions shown when a search does not give any results.
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "You can also try your search on other engines:\n"
 "\n"
@@ -9831,7 +9335,7 @@ msgstr ""
 "* [Tweet scan](http://www.tweetscan.com/indexi.php?s=%s)\n"
 "* [Google](http://www.google.com/search?q=site%%3A%%%%site.server%%%%+%s)\n"
 "* [Yahoo](http://search.yahoo.com/search?p=site%%3A%%%%site.server%%%%+%s)\n"
-"* [Collecta](http://collecta.com/#q=%s)\n"
+"* [Collecta](http://collecta.com/#q=%s)"
 
 #. TRANS: Menu item in search group navigation panel.
 #, fuzzy
@@ -9857,23 +9361,6 @@ msgstr "Finn innhold i notiser"
 msgid "Find groups on this site"
 msgstr "Finn grupper på dette nettstedet"
 
-#. TRANS: Secondary navigation menu item leading to help on StatusNet.
-msgctxt "MENU"
-msgid "Help"
-msgstr "Hjelp"
-
-#. TRANS: Secondary navigation menu item leading to text about StatusNet site.
-#, fuzzy
-msgctxt "MENU"
-msgid "About"
-msgstr "Om"
-
-#. TRANS: Secondary navigation menu item leading to Frequently Asked Questions.
-#, fuzzy
-msgctxt "MENU"
-msgid "FAQ"
-msgstr "OSS/FAQ"
-
 #. TRANS: Secondary navigation menu item leading to Terms of Service.
 msgctxt "MENU"
 msgid "TOS"
@@ -9897,19 +9384,6 @@ msgctxt "MENU"
 msgid "Version"
 msgstr "Versjon"
 
-#. TRANS: Secondary navigation menu item leading to e-mail contact information on the
-#. TRANS: StatusNet site, where to report bugs, ...
-#, fuzzy
-msgctxt "MENU"
-msgid "Contact"
-msgstr "Kontakt"
-
-#. TRANS: Secondary navigation menu item. Leads to information about embedding a timeline widget.
-#, fuzzy
-msgctxt "MENU"
-msgid "Badge"
-msgstr "Knuff"
-
 #. TRANS: Default title for section/sidebar widget.
 #, fuzzy
 msgid "Untitled section"
@@ -9959,10 +9433,6 @@ msgstr "E-post"
 msgid "Change email handling"
 msgstr "Endre eposthåndtering"
 
-#. TRANS: Menu item title in settings navigation panel.
-msgid "Design your profile"
-msgstr "Brukerprofil"
-
 #. TRANS: Menu item in settings navigation panel.
 #, fuzzy
 msgctxt "MENU"
@@ -10003,6 +9473,15 @@ msgstr "Tilkoblinger"
 msgid "Authorized connected applications"
 msgstr "Tilkoblede program"
 
+#. TRANS: Menu item in settings navigation panel.
+msgctxt "MENU"
+msgid "Old school"
+msgstr ""
+
+#. TRANS: Menu item title in settings navigation panel.
+msgid "UI tweaks for old-school users"
+msgstr ""
+
 #. TRANS: Title of form to silence a user.
 #, fuzzy
 msgctxt "TITLE"
@@ -10013,6 +9492,43 @@ msgstr "Nettstedsnotis"
 msgid "Silence this user"
 msgstr "Slett denne brukeren"
 
+#. TRANS: Server error displayed when trying to create an anynymous OAuth consumer.
+#, fuzzy
+msgid "Could not create anonymous consumer."
+msgstr "Kunne ikke opprette alias."
+
+#. TRANS: Server error displayed when trying to create an anynymous OAuth application.
+#, fuzzy
+msgid "Could not create anonymous OAuth application."
+msgstr "Kunne ikke opprette program."
+
+#. TRANS: Exception thrown when no token association could be found.
+msgid ""
+"Could not find a profile and application associated with the request token."
+msgstr ""
+
+#. TRANS: Exception thrown when no access token can be issued.
+#, fuzzy
+msgid "Could not issue access token."
+msgstr "Kunne ikke sette inn melding."
+
+#. TRANS: Exception thrown when a database error occurs.
+msgid "Database error inserting OAuth application user."
+msgstr "Databasefeil ved innsetting av bruker i programmet OAuth."
+
+#. TRANS: Exception thrown when a database error occurs.
+#, fuzzy
+msgid "Database error updating OAuth application user."
+msgstr "Databasefeil ved innsetting av bruker i programmet OAuth."
+
+#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
+msgid "Tried to revoke unknown token."
+msgstr ""
+
+#. TRANS: Exception thrown when an attempt is made to remove a revoked token.
+msgid "Failed to delete revoked token."
+msgstr ""
+
 #. TRANS: Menu item in local navigation menu.
 #, fuzzy
 msgctxt "MENU"
@@ -10070,6 +9586,18 @@ msgstr "Inviter venner og kollegaer til å bli med deg på %s"
 msgid "Subscribe to this user"
 msgstr "Abonner på denne brukeren"
 
+#. TRANS: Button text to subscribe to a user.
+#. TRANS: Button text for subscribing to a list.
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Subscribe"
+msgstr "Abonner"
+
+#. TRANS: Button title to subscribe to a user.
+#, fuzzy
+msgid "Subscribe to this user."
+msgstr "Abonner på denne brukeren"
+
 #. TRANS: Title of personal tag cloud section.
 msgid "People Tagcloud as self-tagged"
 msgstr ""
@@ -10194,16 +9722,26 @@ msgstr[1] ""
 #. TRANS: List message for notice repeated by logged in user.
 #, fuzzy
 msgctxt "REPEATLIST"
-msgid "You have repeated this notice."
+msgid "You repeated this."
 msgstr "Du har allerede gjentatt den notisen."
 
-#. TRANS: List message for repeated notices.
-#. TRANS: %d is the number of users that have repeated a notice.
+#. TRANS: List message for when more than 4 people repeat something.
+#. TRANS: %%s is a list of users liking a notice, %d is the number over 4 that like the notice.
+#. TRANS: Plural is decided on the total number of users liking the notice (count of %%s + %d).
+#, php-format
+msgid "%%s and %d other repeated this."
+msgid_plural "%%s and %d others repeated this."
+msgstr[0] ""
+msgstr[1] ""
+
+#. TRANS: List message for favoured notices.
+#. TRANS: %%s is a list of users liking a notice.
+#. TRANS: Plural is based on the number of of users that have favoured a notice.
 #, fuzzy, php-format
-msgid "One person has repeated this notice."
-msgid_plural "%d people have repeated this notice."
-msgstr[0] "Allerede gjentatt den notisen."
-msgstr[1] "Allerede gjentatt den notisen."
+msgid "%%s repeated this."
+msgid_plural "%%s repeated this."
+msgstr[0] "Gjentatt til %s"
+msgstr[1] "Gjentatt til %s"
 
 #. TRANS: Form legend.
 #, fuzzy, php-format
@@ -10301,7 +9839,6 @@ msgid "Unsilence this user"
 msgstr "Opphev blokkering av denne brukeren"
 
 #. TRANS: Form legend on unsubscribe form.
-#. TRANS: Button title on unsubscribe form.
 #, fuzzy
 msgid "Unsubscribe from this user"
 msgstr "Abonner på denne brukeren"
@@ -10313,6 +9850,11 @@ msgctxt "BUTTON"
 msgid "Unsubscribe"
 msgstr "Abonner"
 
+#. TRANS: Button title on unsubscribe form.
+#, fuzzy
+msgid "Unsubscribe from this user."
+msgstr "Abonner på denne brukeren"
+
 #. TRANS: Exception text shown when no profile can be found for a user.
 #. TRANS: %1$s is a user nickname, $2$d is a user ID (number).
 #, fuzzy, php-format
@@ -10396,8 +9938,6 @@ msgstr "Ugyldig XML, mangler XRD-rot."
 msgid "Getting backup from file '%s'."
 msgstr ""
 
-#~ msgid "%1$s and friends, page %2$d"
-#~ msgstr "%1$s og venner, side %2$d"
-
-#~ msgid "You and friends"
-#~ msgstr "Du og venner"
+#, fuzzy
+#~ msgid " "
+#~ msgstr ", "
diff --git a/locale/nl/LC_MESSAGES/statusnet.po b/locale/nl/LC_MESSAGES/statusnet.po
index 620c1bc652..13d772092b 100644
--- a/locale/nl/LC_MESSAGES/statusnet.po
+++ b/locale/nl/LC_MESSAGES/statusnet.po
@@ -4,6 +4,7 @@
 # Author: Brion
 # Author: Itavero
 # Author: McDutchie
+# Author: SPQRobin
 # Author: Siebrand
 # --
 # This file is distributed under the same license as the StatusNet package.
@@ -12,17 +13,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:31+0000\n"
-"Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:27+0000\n"
+"Language-Team: Dutch <https://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-05-05 10:52:40+0000\n"
+"X-POT-Import-Date: 2012-04-22 22:02:21+0000\n"
 
 #. TRANS: Database error message.
 #, php-format
@@ -37,14 +38,6 @@ msgstr ""
 "probleem, maar u kunt contact met ze opnemen via %2$s. U kunt ook een paar "
 "minuten wachten en het dan nog een keer proberen."
 
-#. TRANS: Error message.
-msgid ""
-"An important error occured, probably related to email setup. Check logfiles "
-"for more info."
-msgstr ""
-"Er is een grote fout opgetreden. Waarschijnlijk is deze gerelateerd aan de "
-"instellingen voor e-mail. Controleer de logboeken voor meer gegevens."
-
 #. TRANS: Error message.
 msgid "An error occurred."
 msgstr "Er is een fout opgetreden."
@@ -105,12 +98,11 @@ msgstr "Nieuwe registraties uitschakelen."
 msgid "Closed"
 msgstr "Gesloten"
 
-#. TRANS: Title for button to save access settings in site admin panel.
-msgid "Save access settings"
-msgstr "Toegangsinstellingen opslaan"
+#. TRANS: Button title to save access settings in site admin panel.
+msgid "Save access settings."
+msgstr "Toegangsinstellingen opslaan."
 
-#. TRANS: Tooltip for button to save access settings in site admin panel.
-#. TRANS: Button text for saving theme settings.
+#. TRANS: Button text to save access settings in site admin panel.
 #. TRANS: Button label to save e-mail preferences.
 #. TRANS: Button label to save IM preferences.
 #. TRANS: Button text in the license admin panel.
@@ -126,7 +118,6 @@ msgstr "Toegangsinstellingen opslaan"
 #. TRANS: Button text for saving "Other settings" in profile.
 #. TRANS: Button text to save user settings in user admin panel.
 #. TRANS: Button label in the "Edit application" form.
-#. TRANS: Button text on profile design page to save settings.
 #. TRANS: Text for save button on group edit form.
 #. TRANS: Button text to save tags for a profile.
 msgctxt "BUTTON"
@@ -167,12 +158,6 @@ msgstr "Het profiel bestaat niet."
 msgid "No such list."
 msgstr "De lijst bestaat niet."
 
-#. TRANS: Client error displayed when trying to add an OMB 0.1 remote profile to a list.
-msgid "You cannot list an OMB 0.1 remote profile with this action."
-msgstr ""
-"U kunt een extern OMB 1.0-profiel niet opnemen in een lijst via deze "
-"handeling."
-
 #. TRANS: Client error displayed when an unknown error occurs when adding a user to a list.
 #. TRANS: %s is a username.
 #, php-format
@@ -206,7 +191,6 @@ msgstr "Deze pagina bestaat niet."
 #. TRANS: Client error when user not found for an rss related action.
 #. TRANS: Client error displayed when no existing user is provided for a user's delivery device setting.
 #. TRANS: Client error displayed if a user could not be found.
-#. TRANS: Client error when user not found updating a profile background image.
 #. TRANS: Client error displayed updating profile image without having a user object.
 #. TRANS: Client error displayed when making an Atom API request for an unknown user.
 #. TRANS: Client error displayed when trying to block a non-existing user or a user from another site.
@@ -232,14 +216,11 @@ msgstr "Deze pagina bestaat niet."
 #. TRANS: Client error displayed when trying to get the RSS feed with favorites of a user that does not exist.
 #. TRANS: Client error displayed when requesting Friends of a Friend feed without providing a user nickname.
 #. TRANS: Client error displayed when requesting Friends of a Friend feed for an object that is not a user.
-#. TRANS: Client error displayed when trying to get a user hCard for a non-existing user.
 #. TRANS: Client error displayed trying to make a micro summary without providing a valid user.
 #. TRANS: Client error displayed trying to send a direct message to a non-existing user.
 #. TRANS: Client error displayed trying to use "one time password login" without using an existing user.
 #. TRANS: Client error displayed when referring to non-existing user.
 #. TRANS: Client error displayed trying to perform an action related to a non-existing user.
-#. TRANS: Form validation error on page for remote subscribe when no user was provided.
-#. TRANS: Form validation error on page for remote subscribe when no user profile was found.
 #. TRANS: Client error displayed when trying to reply to a non-exsting user.
 #. TRANS: Client error displayed when providing a non-existing nickname in a RSS 1.0 action.
 #. TRANS: Client error.
@@ -248,7 +229,6 @@ msgstr "Deze pagina bestaat niet."
 #. TRANS: Client error displayed trying to find a user by ID for a non-existing ID.
 #. TRANS: Client error displayed requesting groups for a non-existing user.
 #. TRANS: Client error displayed when user not found for an action.
-#. TRANS: Client error displayed providing a non-existing nickname.
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #. TRANS: Client error displayed when trying to perform a gallery action with an unknown user.
 #. TRANS: Client error displayed when trying to access a mailbox without providing a user.
@@ -257,15 +237,21 @@ msgid "No such user."
 msgstr "Deze gebruiker bestaat niet."
 
 #. TRANS: Title of a user's own start page.
-#, fuzzy
 msgid "Home timeline"
-msgstr "%s tijdlijn"
+msgstr "Startpaginatijdlijn"
 
 #. TRANS: Title of another user's start page.
 #. TRANS: %s is the other user's name.
-#, fuzzy, php-format
+#, php-format
 msgid "%s's home timeline"
-msgstr "%s tijdlijn"
+msgstr "Startpaginatijdlijn van %s"
+
+#. TRANS: %s is user nickname.
+#. TRANS: Feed title.
+#. TRANS: %s is tagger's nickname.
+#, php-format
+msgid "Feed for friends of %s (Activity Streams JSON)"
+msgstr "Feed voor vrienden van %s (JSON-activiteitenstreams)"
 
 #. TRANS: %s is user nickname.
 #, php-format
@@ -300,7 +286,7 @@ msgid ""
 "something yourself."
 msgstr ""
 "Probeer te abonneren op meer gebruikers, [word lid van een groep](%%action."
-"groups%%)  of plaats zelf berichten."
+"groups%%) of plaats zelf berichten."
 
 #. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@".
 #. TRANS: This message contains Markdown links. Keep "](" together.
@@ -313,7 +299,7 @@ msgstr ""
 "bericht voor die gebruiker plaatsen](%%%%action.newnotice%%%%?"
 "status_textarea=%3$s)."
 
-#. TRANS: Encoutagement displayed on empty timeline user pages for anonymous users.
+#. TRANS: Encouragement displayed on empty timeline user pages for anonymous users.
 #. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
 #. TRANS: Empty list message for page with replies for a user for not logged in users.
 #. TRANS: %1$s is a user nickname. This message contains a Markdown link in the form [link text](link).
@@ -327,6 +313,12 @@ msgstr ""
 "U kunt een [gebruiker aanmaken](%%%%action.register%%%%) en %s dan porren of "
 "een bericht sturen."
 
+#. TRANS: Button text for inviting more users to the StatusNet instance.
+#. TRANS: Less business/enterprise-oriented language for public sites.
+msgctxt "BUTTON"
+msgid "Send invite"
+msgstr "Uitnodiging verzenden"
+
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Title of API timeline for a user and friends.
 #. TRANS: %s is a username.
@@ -335,8 +327,6 @@ msgstr ""
 #. TRANS: %s is a username.
 #. TRANS: Menu item title in personal group navigation menu.
 #. TRANS: %s is a username.
-#. TRANS: Menu item title in settings navigation panel.
-#. TRANS: %s is a username.
 #, php-format
 msgid "%s and friends"
 msgstr "%s en vrienden"
@@ -376,7 +366,6 @@ msgstr ""
 #. TRANS: Server error thrown on database error updating SMS preferences.
 #. TRANS: Server error thrown on database error removing a registered SMS phone number.
 #. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
-#. TRANS: Server exception thrown on Profile design page when updating design settings fails.
 msgid "Could not update user."
 msgstr "Het was niet mogelijk de gebruiker bij te werken."
 
@@ -391,7 +380,6 @@ msgstr "Het was niet mogelijk het profiel op te slaan."
 
 #. TRANS: Client error displayed when the number of bytes in a POST request exceeds a limit.
 #. TRANS: %s is the number of bytes of the CONTENT_LENGTH.
-#. TRANS: Form validation error in design settings form. POST should remain untranslated.
 #, php-format
 msgid ""
 "The server was unable to handle that much POST data (%s byte) due to its "
@@ -406,24 +394,6 @@ msgstr[1] ""
 "De server was niet in staat zoveel POST-gegevens te verwerken (%s bytes) "
 "vanwege de huidige instellingen."
 
-#. TRANS: Client error displayed when saving design settings fails because of an empty id.
-#. TRANS: Client error displayed when saving design settings fails because of an empty result.
-#. TRANS: Client error displayed when a database error occurs inserting profile colours.
-#. TRANS: Client error displayed when a database error occurs updating profile colours.
-#. TRANS: Form validation error displayed when group design settings could not be saved because of an application issue.
-#. TRANS: Form validation error on Profile design page when saving design settings has failed.
-#. TRANS: Form validation error on Profile design page when updating design settings has failed.
-msgid "Unable to save your design settings."
-msgstr "Het was niet mogelijk om uw ontwerpinstellingen op te slaan."
-
-#. TRANS: Error displayed when updating design settings fails.
-#. TRANS: Client error displayed when a database error occurs updating profile colours.
-#. TRANS: Form validation error on Profile design page when updating design settings has failed.
-#. TRANS: Error message displayed if design settings could not be saved.
-#. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
-msgid "Could not update your design."
-msgstr "Het was niet mogelijk uw ontwerp bij te werken."
-
 #. TRANS: Title for Atom feed.
 msgctxt "ATOM"
 msgid "Main"
@@ -460,7 +430,7 @@ msgstr "Lidmaatschappen van %s"
 
 #. TRANS: Client error displayed when users try to block themselves.
 msgid "You cannot block yourself!"
-msgstr "U kunt zichzelf niet blokkeren!"
+msgstr "U kunt uzelf niet blokkeren!"
 
 #. TRANS: Server error displayed when blocking a user has failed.
 msgid "Block user failed."
@@ -470,6 +440,20 @@ msgstr "Het blokkeren van de gebruiker is mislukt."
 msgid "Unblock user failed."
 msgstr "Het deblokkeren van de gebruiker is mislukt."
 
+#. TRANS: Client exception thrown when no conversation ID is given.
+msgid "No conversation ID."
+msgstr "Geen gespreksnummer."
+
+#. TRANS: Client exception thrown when referring to a non-existing conversation ID (%d).
+#, php-format
+msgid "No conversation with ID %d."
+msgstr "Geen gesprek met nummer %d."
+
+#. TRANS: Title for conversion timeline.
+msgctxt "TITLE"
+msgid "Conversation"
+msgstr "Dialoog"
+
 #. TRANS: Title. %s is a user nickname.
 #, php-format
 msgid "Direct messages from %s"
@@ -515,6 +499,8 @@ msgstr ""
 "vriendenlijst staan."
 
 #. TRANS: Client error displayed trying to direct message self (403).
+#. TRANS: Client error displayed trying to send a direct message to self.
+#. TRANS: Error text shown when trying to send a direct message to self.
 msgid ""
 "Do not send a message to yourself; just say it to yourself quietly instead."
 msgstr "Stuur geen berichten naar uzelf. Zeg het gewoon in uw hoofd."
@@ -594,7 +580,7 @@ msgstr ""
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Form validation error displayed when trying to register with an invalid nickname.
 msgid "Not a valid nickname."
-msgstr "Ongeldige gebruikersnaam!"
+msgstr "Ongeldige gebruikersnaam."
 
 #. TRANS: Client error in form for group creation.
 #. TRANS: API validation exception thrown when homepage URL does not validate.
@@ -747,7 +733,6 @@ msgstr "groepen op %s"
 
 #. TRANS: Client error displayed when trying to edit a group without being an admin.
 #. TRANS: Client error displayed trying to edit a group while not being a group admin.
-#. TRANS: Client error displayed trying to change group design settings without being a (group) admin.
 #. TRANS: Client error displayed when trying to change group logo settings while not being a group admin.
 msgid "You must be an admin to edit the group."
 msgstr "U moet beheerder zijn om de groep te kunnen bewerken."
@@ -860,7 +845,6 @@ msgstr ""
 
 #. TRANS: Client error given on when invalid data was passed through a form in the OAuth API.
 #. TRANS: Unexpected validation error on avatar upload form.
-#. TRANS: Client error displayed when the submitted form contains unexpected data.
 #. TRANS: Client error displayed submitting invalid form data for edit application.
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
 #. TRANS: Form validation error message when an unsupported argument is used.
@@ -869,7 +853,6 @@ msgstr ""
 #. TRANS: Client error when submitting a form with unexpected information.
 #. TRANS: Client error displayed when unexpected data is posted in the password recovery form.
 #. TRANS: Message given submitting a form with an unknown action in SMS settings.
-#. TRANS: Unknown form validation error in design settings form.
 msgid "Unexpected form submission."
 msgstr "Het formulier is onverwacht ingezonden."
 
@@ -914,7 +897,6 @@ msgstr "Gebruikersgegevens"
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Field label on account registration page.
-#. TRANS: Label for nickname on user authorisation page.
 #. TRANS: Field label on group edit form.
 #. TRANS: Dropdown option for searching in profiles.
 msgid "Nickname"
@@ -1099,14 +1081,14 @@ msgstr "Het was niet mogelijk een feed voor de lijst aan te maken - %s"
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user nickname.
 #, php-format
 msgid "%1$s / Updates mentioning %2$s"
-msgstr "%1$s / Updates over %2$s"
+msgstr "%1$s / Berichten over %2$s"
 
 #. TRANS: Subtitle for timeline of most recent mentions of a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user nickname,
 #. TRANS: %3$s is a user's full name.
 #, php-format
 msgid "%1$s updates that reply to updates from %2$s / %3$s."
-msgstr "%1$s updates die een reactie zijn op updates van %2$s / %3$s."
+msgstr "Berichten van %1$s die een reactie zijn op berichten van %2$s / %3$s."
 
 #. TRANS: Title for site timeline. %s is the StatusNet sitename.
 #. TRANS: Public RSS feed title. %s is the StatusNet site name.
@@ -1117,7 +1099,7 @@ msgstr "%s publieke tijdlijn"
 #. TRANS: Subtitle for site timeline. %s is the StatusNet sitename.
 #, php-format
 msgid "%s updates from everyone!"
-msgstr "%s updates van iedereen"
+msgstr "Alle berichten van %s"
 
 #. TRANS: Server error displayed calling unimplemented API method for 'retweeted by me'.
 msgid "Unimplemented."
@@ -1160,7 +1142,7 @@ msgstr "Mededelingen met het label %s"
 #. TRANS: %1$s is the tag name, %2$s is the StatusNet sitename.
 #, php-format
 msgid "Updates tagged with %1$s on %2$s!"
-msgstr "Updates met het label %1$s op %2$s!"
+msgstr "Berichten met het label %1$s op %2$s!"
 
 #. TRANS: Client error displayed trying to add a notice to another user's timeline.
 msgid "Only the user can add to their own timeline."
@@ -1231,12 +1213,9 @@ msgstr "U moet aangemeld zijn om een groep te kunnen verlaten."
 #. TRANS: Client error displayed when requesting Friends of a Friend feed for a nickname that is not a group.
 #. TRANS: Client error displayed trying to block a user from a group while specifying a non-existing group.
 #. TRANS: Client error displayed referring to a group's permalink for a non-existing group ID.
-#. TRANS: Client error displayed trying to change group design settings while providing a nickname for a non-existing group.
 #. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
 #. TRANS: Client error displayed when trying to view group members for a non-existing group.
 #. TRANS: Client error displayed when trying to view group members for an object that is not a group.
-#. TRANS: Client error displayed when trying to view group members for a non-existing group.
-#. TRANS: Client error displayed when trying to view group members for an object that is not a group.
 #. TRANS: Client error displayed when requesting a group RSS feed for group that does not exist.
 #. TRANS: Client error displayed when requesting a group RSS feed for an object that is not a group.
 #. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
@@ -1245,10 +1224,10 @@ msgstr "U moet aangemeld zijn om een groep te kunnen verlaten."
 #. TRANS: Client error displayed when trying to leave a non-local group.
 #. TRANS: Client error displayed when trying to leave a non-existing group.
 #. TRANS: Client error displayed when providing an invalid group ID on the Make Admin page.
-#. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
-#. TRANS: Client error displayed if no local group with a given name was found requesting group page.
 #. TRANS: Command exception text shown when a group is requested that does not exist.
 #. TRANS: Error text shown when trying to leave a group that does not exist.
+#. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
+#. TRANS: Client error displayed if no local group with a given name was found requesting group page.
 msgid "No such group."
 msgstr "De opgegeven groep bestaat niet."
 
@@ -1319,6 +1298,7 @@ msgid "Join request canceled."
 msgstr "Het verzoek voor lidmaatschap is geweigerd."
 
 #. TRANS: Client error displayed trying to approve subscription for a non-existing request.
+#. TRANS: %s is a user nickname.
 #, php-format
 msgid "%s is not in the moderation queue for your subscriptions."
 msgstr "%s staat niet in de wachtrij voor uw abonnementen."
@@ -1477,7 +1457,6 @@ msgstr "Deze bijlage bestaat niet."
 #. TRANS: Client error displayed trying to get an avatar without providing a nickname.
 #. TRANS: Client error displayed when requesting a list of blocked users for a group without providing a group nickname.
 #. TRANS: Client error displayed trying to edit a group while not proving a nickname for the group to edit.
-#. TRANS: Client error displayed trying to change group design settings without providing a group nickname.
 #. TRANS: Client error displayed when trying to change group logo settings without providing a nickname.
 #. TRANS: Client error displayed when trying to view group members without providing a group nickname.
 #. TRANS: Client error displayed when requesting a group RSS feed without providing a group nickname.
@@ -1775,6 +1754,16 @@ msgstr "Het adres \"%s\" is voor uw gebruiker bevestigd."
 msgid "Conversation"
 msgstr "Dialoog"
 
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+msgid "Conversation feed (Activity Streams JSON)"
+msgstr "Gespreksfeed (JSON-activiteitenstreams)"
+
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+msgid "Conversation feed (RSS 2.0)"
+msgstr "Gespreksfeed (RSS 2.0)"
+
 #. TRANS: Title for conversation page.
 #. TRANS: Title for page that shows a notice.
 msgctxt "TITLE"
@@ -1840,8 +1829,8 @@ msgstr ""
 "verwijderen: \"%s\"."
 
 #. TRANS: Button title for user account deletion.
-msgid "Permanently delete your account"
-msgstr "Uw gebruiker permanent verwijderen"
+msgid "Permanently delete your account."
+msgstr "Uw gebruiker permanent verwijderen."
 
 #. TRANS: Client error displayed trying to delete an application while not logged in.
 msgid "You must be logged in to delete an application."
@@ -1988,150 +1977,6 @@ msgstr "Deze gebruiker niet verwijderen."
 msgid "Delete this user."
 msgstr "Deze gebruiker verwijderen."
 
-#. TRANS: Message used as title for design settings for the site.
-msgid "Design"
-msgstr "Uiterlijk"
-
-#. TRANS: Instructions for design adminsitration panel.
-msgid "Design settings for this StatusNet site"
-msgstr "Instellingen voor de vormgeving van deze StatusNet-website"
-
-#. TRANS: Client error displayed when a logo URL does is not valid.
-msgid "Invalid logo URL."
-msgstr "De logo-URL is ongeldig."
-
-#. TRANS: Client error displayed when an SSL logo URL is invalid.
-msgid "Invalid SSL logo URL."
-msgstr "De SSL logo-URL is ongeldig."
-
-#. TRANS: Client error displayed when a theme is submitted through the form that is not in the theme list.
-#. TRANS: %s is the chosen unavailable theme.
-#, php-format
-msgid "Theme not available: %s."
-msgstr "De vormgeving is niet beschikbaar: %s."
-
-#. TRANS: Fieldset legend for form to change logo.
-msgid "Change logo"
-msgstr "Logo wijzigen"
-
-#. TRANS: Field label for StatusNet site logo.
-msgid "Site logo"
-msgstr "Websitelogo"
-
-#. TRANS: Field label for SSL StatusNet site logo.
-msgid "SSL logo"
-msgstr "SSL-logo"
-
-#. TRANS: Fieldset legend for form change StatusNet site's theme.
-msgid "Change theme"
-msgstr "Vormgeving wijzigen"
-
-#. TRANS: Field label for dropdown to choose site theme.
-msgid "Site theme"
-msgstr "Vormgeving website"
-
-#. TRANS: Title for field label for dropdown to choose site theme.
-msgid "Theme for the site."
-msgstr "Mogelijke vormgevingen voor deze website."
-
-#. TRANS: Field label for uploading a cutom theme.
-msgid "Custom theme"
-msgstr "Aangepaste vormgeving"
-
-#. TRANS: Form instructions for uploading a cutom StatusNet theme.
-msgid "You can upload a custom StatusNet theme as a .ZIP archive."
-msgstr "U kunt een vormgeving voor StatusNet uploaden als ZIP-archief."
-
-#. TRANS: Fieldset legend for theme background image.
-msgid "Change background image"
-msgstr "Achtergrondafbeelding wijzigen"
-
-#. TRANS: Field label for background image on theme designer page.
-#. TRANS: Field label for background color selector.
-#. TRANS: Label on profile design page for setting a profile page background colour.
-msgid "Background"
-msgstr "Achtergrond"
-
-#. TRANS: Form guide for background image upload form on theme designer page.
-#, php-format
-msgid ""
-"You can upload a background image for the site. The maximum file size is %1"
-"$s."
-msgstr ""
-"Hier kunt u een achtergrondafbeelding voor de website uploaden. De maximale "
-"bestandsgrootte is %1$s."
-
-#. TRANS: Used as radio button label to add a background image.
-msgid "On"
-msgstr "Aan"
-
-#. TRANS: Used as radio button label to not add a background image.
-msgid "Off"
-msgstr "Uit"
-
-#. TRANS: Form guide for turning background image on or off on theme designer page.
-#. TRANS: Form guide for a set of radio buttons on the profile design page that will enable or disable
-#. TRANS: use of the uploaded profile image.
-msgid "Turn background image on or off."
-msgstr "Achtergrondafbeelding inschakelen of uitschakelen."
-
-#. TRANS: Checkbox label to title background image on theme designer page.
-#. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
-msgid "Tile background image"
-msgstr "Achtergrondafbeelding naast elkaar"
-
-#. TRANS: Fieldset legend for theme colors.
-msgid "Change colors"
-msgstr "Kleuren wijzigen"
-
-#. TRANS: Field label for content color selector.
-#. TRANS: Label on profile design page for setting a profile page content colour.
-msgid "Content"
-msgstr "Inhoud"
-
-#. TRANS: Field label for sidebar color selector.
-#. TRANS: Label on profile design page for setting a profile page sidebar colour.
-msgid "Sidebar"
-msgstr "Menubalk"
-
-#. TRANS: Field label for text color selector.
-#. TRANS: Label on profile design page for setting a profile page text colour.
-msgid "Text"
-msgstr "Tekst"
-
-#. TRANS: Field label for link color selector.
-#. TRANS: Label on profile design page for setting a profile page links colour.
-msgid "Links"
-msgstr "Verwijzingen"
-
-#. TRANS: Fieldset legend for advanced theme design settings.
-msgid "Advanced"
-msgstr "Uitgebreid"
-
-#. TRANS: Field label for custom CSS.
-msgid "Custom CSS"
-msgstr "Aangepaste CSS"
-
-#. TRANS: Button text for resetting theme settings.
-msgctxt "BUTTON"
-msgid "Use defaults"
-msgstr "Standaardinstellingen gebruiken"
-
-#. TRANS: Title for button for resetting theme settings.
-#. TRANS: Title for button on profile design page to reset all colour settings to default.
-msgid "Restore default designs."
-msgstr "Het standaardontwerp toepassen."
-
-#. TRANS: Title for button for resetting theme settings.
-#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-msgid "Reset back to default."
-msgstr "De standaardinstellingen toepassen."
-
-#. TRANS: Title for button for saving theme settings.
-#. TRANS: Title for button on profile design page to save settings.
-msgid "Save design."
-msgstr "Ontwerp opslaan."
-
 #. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
 msgid "This notice is not a favorite!"
 msgstr "Deze mededeling staat niet op uw favorietenlijst."
@@ -2146,6 +1991,74 @@ msgstr "Aan favorieten toevoegen"
 msgid "No such document \"%s\"."
 msgstr "Onbekend document \"%s\"."
 
+#. TRANS: Menu item in administrator navigation panel.
+#. TRANS: Menu item in default local navigation panel.
+#. TRANS: Menu item in personal group navigation menu.
+msgctxt "MENU"
+msgid "Home"
+msgstr "Startpagina"
+
+msgctxt "MENU"
+msgid "Docs"
+msgstr "Documentatie"
+
+#. TRANS: Secondary navigation menu item leading to help on StatusNet.
+msgctxt "MENU"
+msgid "Help"
+msgstr "Hulp"
+
+msgid "Getting started"
+msgstr "Aan de slag"
+
+#. TRANS: Secondary navigation menu item leading to text about StatusNet site.
+msgctxt "MENU"
+msgid "About"
+msgstr "Over"
+
+msgid "About this site"
+msgstr "Over deze site"
+
+#. TRANS: Secondary navigation menu item leading to Frequently Asked Questions.
+msgctxt "MENU"
+msgid "FAQ"
+msgstr "Veel gestelde vragen"
+
+msgid "Frequently asked questions"
+msgstr "Veelgestelde vragen"
+
+#. TRANS: Secondary navigation menu item leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+msgctxt "MENU"
+msgid "Contact"
+msgstr "Contact"
+
+msgid "Contact info"
+msgstr "Contactgegevens"
+
+msgctxt "MENU"
+msgid "Tags"
+msgstr "Labels"
+
+msgid "Using tags"
+msgstr "Labels gebruiken"
+
+#. TRANS: Menu item in default local navigation panel.
+#. TRANS: Menu item in search group navigation panel.
+#. TRANS: Menu item in local navigation menu.
+msgctxt "MENU"
+msgid "Groups"
+msgstr "Groepen"
+
+msgid "Using groups"
+msgstr "Groepen gebruiken"
+
+msgctxt "MENU"
+msgid "API"
+msgstr "API"
+
+msgid "RESTful API"
+msgstr "RESTful API"
+
 #. TRANS: Title for "Edit application" form.
 #. TRANS: Form legend.
 msgid "Edit application"
@@ -2308,13 +2221,13 @@ msgstr ""
 "Door een openbaar label als privé in te stellen worden alle bestaande "
 "abonnementen verwijderd. Wilt u doorgaan?"
 
-#. TRANS: TRANS: Server error displayed when updating a list fails.
+#. TRANS: Server error displayed when updating a list fails.
 msgid "Could not update list."
 msgstr "Het was niet mogelijk de lijst bij te werken."
 
 #. TRANS: Title for e-mail settings.
 msgid "Email settings"
-msgstr "E-mailvoorkeuren"
+msgstr "E-mailinstellingen"
 
 #. TRANS: E-mail settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
@@ -2346,8 +2259,8 @@ msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
 msgstr ""
-"Er wordt gewacht op bevestiging van dit adres. Controleer uw inbox (en uw "
-"ongewenste berichten/spam) voor een bericht met nadere instructies."
+"Dit adres moet bevestigd worden. Controleer uw Postvak IN (en uw ongewenste "
+"berichten/spam) voor een bericht met nadere instructies."
 
 #. TRANS: Instructions for e-mail address input form. Do not translate
 #. TRANS: "example.org". It is one of the domain names reserved for
@@ -2377,7 +2290,7 @@ msgstr "Ik wil mededelingen per e-mail plaatsen."
 #. TRANS: Form instructions for incoming e-mail form in e-mail settings.
 #. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
 msgid "Send email to this address to post new notices."
-msgstr "Stuur een email naar dit adres om een nieuw bericht te posten"
+msgstr "Stuur een e-mail naar dit adres om een nieuw bericht te plaatsen."
 
 #. TRANS: Instructions for incoming e-mail address input form, when an address has already been assigned.
 #. TRANS: Instructions for incoming SMS e-mail address input form.
@@ -2465,9 +2378,9 @@ msgid ""
 "A confirmation code was sent to the email address you added. Check your "
 "inbox (and spam box!) for the code and instructions on how to use it."
 msgstr ""
-"Een bevestigingscode is verzonden naar het e-mailadres dat u hebt "
-"toegevoegd. Controleer uw inbox (en spam box!) Voor de code en instructies "
-"hoe het te gebruiken."
+"Er is een bevestigingscode verzonden naar het e-mailadres dat u hebt "
+"toegevoegd. Controleer uw Postvak IN (en uw ongewenste berichten/spam) voor "
+"de code en instructies hoe deze te gebruiken."
 
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling Instant Messaging address confirmation that is not pending.
@@ -2563,7 +2476,7 @@ msgid ""
 "notice to your favorites!"
 msgstr ""
 "U kunt een [gebruiker aanmaken](%%action.register%%) en de eerste mededeling "
-"voor de favorietenlijst plaatsen!"
+"op uw favorietenlijst plaatsen!"
 
 #. TRANS: Title of RSS feed with favourite notices of a user.
 #. TRANS: %s is a user's nickname.
@@ -2585,13 +2498,13 @@ msgstr "Updates op de favorietenlijst van %1$s op %2$s."
 #. TRANS: Title for featured users section.
 #. TRANS: Menu item title in search group navigation panel.
 msgid "Featured users"
-msgstr "Nieuwe gebruikers"
+msgstr "Uitgelichte gebruikers"
 
 #. TRANS: Page title for all but first page of featured users.
 #. TRANS: %d is the page number being displayed.
 #, php-format
 msgid "Featured users, page %d"
-msgstr "Nieuwe gebruikers, pagina %d"
+msgstr "Uitgelichte gebruikers, pagina %d"
 
 #. TRANS: Description on page displaying featured users.
 #, php-format
@@ -2615,44 +2528,6 @@ msgstr "Geen bijlagen."
 msgid "No uploaded attachments."
 msgstr "Geen toegevoegde bijlagen."
 
-#. TRANS: Client error displayed when subscribing to a remote profile and an unexpected response is received.
-msgid "Not expecting this response!"
-msgstr "Onverwacht antwoord!"
-
-#. TRANS: Client error displayed when subscribing to a remote profile that does not exist.
-msgid "User being listened to does not exist."
-msgstr "De gebruiker waarnaar wordt geluisterd bestaat niet."
-
-#. TRANS: Client error displayed when subscribing to a remote profile that is a local profile.
-#. TRANS: Client error displayed when using remote subscribe for a local entity.
-msgid "You can use the local subscription!"
-msgstr "U kunt het lokale abonnement gebruiken!"
-
-#. TRANS: Client error displayed when subscribing to a remote profile that is blocked form subscribing to.
-msgid "That user has blocked you from subscribing."
-msgstr ""
-"Die gebruiker heeft de mogelijkheid om te abonneren voor u geblokkeerd."
-
-#. TRANS: Client error displayed when subscribing to a remote profile without providing an authorised token.
-msgid "You are not authorized."
-msgstr "U hebt niet de juiste toegangsrechten."
-
-#. TRANS: Client error displayed when subscribing to a remote profile and conversion of the request token to access token fails.
-msgid "Could not convert request token to access token."
-msgstr ""
-"Het was niet mogelijk het verzoektoken te converteren naar een toegangstoken."
-
-#. TRANS: Client error displayed when subscribing to a remote profile fails because of an unsupported version of the OMB protocol.
-msgid "Remote service uses unknown version of OMB protocol."
-msgstr ""
-"De diensten op afstand gebruiken een onbekende versie van het OMB-protocol."
-
-#. TRANS: Server error displayed when subscribing to a remote profile fails because the remote profile could not be updated.
-#. TRANS: Exception thrown when updating a remote profile fails in OAuth store.
-msgid "Error updating remote profile."
-msgstr ""
-"Er is een fout opgetreden tijdens het bijwerken van het profiel op afstand."
-
 #. TRANS: Client error displayed when requesting a non-existent file.
 msgid "No such file."
 msgstr "Het bestand bestaat niet."
@@ -2742,31 +2617,6 @@ msgstr ""
 msgid "No ID."
 msgstr "Geen ID."
 
-#. TRANS: Client error displayed trying to change group design settings while not logged in.
-msgid "You must be logged in to edit a group."
-msgstr "U moet aangemeld zijn om een groep te kunnen bewerken."
-
-#. TRANS: Title group design settings page.
-msgid "Group design"
-msgstr "Groepsontwerp"
-
-#. TRANS: Instructions for group design settings page.
-msgid ""
-"Customize the way your group looks with a background image and a colour "
-"palette of your choice."
-msgstr ""
-"De vormgeving van uw groep aanpassen met een achtergrondafbeelding en een "
-"kleurenpalet van uw keuze."
-
-#. TRANS: Form validation error displayed when group design settings could not be updated because of an application issue.
-msgid "Unable to update your design settings."
-msgstr "Het was niet mogelijk om uw ontwerpinstellingen bij te werken."
-
-#. TRANS: Form text to confirm saved group design settings.
-#. TRANS: Confirmation message on Profile design page when saving design settings has succeeded.
-msgid "Design preferences saved."
-msgstr "De ontwerpvoorkeuren zijn opgeslagen."
-
 #. TRANS: Title for group logo settings page.
 #. TRANS: Group logo form legend.
 msgid "Group logo"
@@ -2795,7 +2645,7 @@ msgstr "Selecteer een vierkant uit de afbeelding die het logo wordt."
 
 #. TRANS: Form success message after updating a group logo.
 msgid "Logo updated."
-msgstr "Logo geactualiseerd."
+msgstr "Het logo is bijgewerkt."
 
 #. TRANS: Form failure message after failing to update a group logo.
 msgid "Failed updating logo."
@@ -2945,11 +2795,11 @@ msgstr "IM-instellingen"
 #. TRANS: the order and formatting of link text and link should remain unchanged.
 #, php-format
 msgid ""
-"You can send and receive notices through instant messaging [instant messages]"
-"(%%doc.im%%). Configure your addresses and settings below."
+"You can send and receive notices through [instant messaging](%%doc.im%%). "
+"Configure your addresses and settings below."
 msgstr ""
-"U kunt berichten verzenden en ontvangen via [\"onmiddellijke berichten\"](%%"
-"doc.im%%). Voer hieronder uw adres in en maak uw instellingen."
+"U kunt berichten verzenden en ontvangen via [\"instant messaging\"](%%doc.im%"
+"%). Voer hieronder uw adres in en maak uw instellingen."
 
 #. TRANS: Message given in the IM settings if IM is not enabled on the site.
 msgid "IM is not available."
@@ -3147,28 +2997,6 @@ msgstr ""
 "Gebruik deze pagina om uw vrienden en collega´s uit te nodigen deze dienst "
 "te gebruiken."
 
-#. TRANS: Field label for a list of e-mail addresses.
-msgid "Email addresses"
-msgstr "E-mailadressen"
-
-#. TRANS: Tooltip for field label for a list of e-mail addresses.
-msgid "Addresses of friends to invite (one per line)."
-msgstr "Adressen van uit te nodigen vrienden (één per regel)."
-
-#. TRANS: Field label for a personal message to send to invitees.
-msgid "Personal message"
-msgstr "Persoonlijk bericht"
-
-#. TRANS: Tooltip for field label for a personal message to send to invitees.
-msgid "Optionally add a personal message to the invitation."
-msgstr "Persoonlijk bericht bij de uitnodiging (optioneel)."
-
-#. TRANS: Send button for inviting friends
-#. TRANS: Button text for sending notice.
-msgctxt "BUTTON"
-msgid "Send"
-msgstr "Verzenden"
-
 #. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral
 #. TRANS: singular 3rd-person pronoun in English. %1$s is the inviting user, $2$s is
 #. TRANS: the StatusNet sitename.
@@ -3301,12 +3129,6 @@ msgstr "Een URL voor een afbeelding om weer te geven met de licentie."
 msgid "Save license settings."
 msgstr "Licentieinstellingen opslaan."
 
-#. TRANS: Client error displayed when trying to log in while already logged in.
-#. TRANS: Client error displayed trying to use "one time password login" when already logged in.
-#. TRANS: Client error displayed when trying to register while already logged in.
-msgid "Already logged in."
-msgstr "U bent al aangemeld."
-
 #. TRANS: Form validation error displayed when trying to log in with incorrect credentials.
 msgid "Incorrect username or password."
 msgstr "De gebruikersnaam of wachtwoord is onjuist."
@@ -3327,7 +3149,6 @@ msgid "Login to site"
 msgstr "Aanmelden"
 
 #. TRANS: Field label on login page.
-#, fuzzy
 msgid "Username or email address"
 msgstr "Gebruikersnaam of e-mailadres"
 
@@ -3419,6 +3240,7 @@ msgstr "Een bron-URL is verplicht."
 msgid "Could not create application."
 msgstr "Het was niet mogelijk de applicatie aan te maken."
 
+#. TRANS: Form validation error messages displayed when uploading an invalid application logo.
 msgid "Invalid image."
 msgstr "Ongeldige afbeelding."
 
@@ -3455,12 +3277,6 @@ msgstr "Geen inhoud!"
 msgid "No recipient specified."
 msgstr "Er is geen ontvanger aangegeven."
 
-#. TRANS: Client error displayed trying to send a direct message to self.
-#. TRANS: Error text shown when trying to send a direct message to self.
-msgid ""
-"Don't send a message to yourself; just say it to yourself quietly instead."
-msgstr "Stuur geen berichten naar uzelf. Zeg het gewoon in uw hoofd."
-
 #. TRANS: Page title after sending a direct message.
 msgid "Message sent"
 msgstr "Bericht verzonden"
@@ -3672,6 +3488,33 @@ msgstr "Alleen URL's voor %s via normale HTTP alstublieft."
 msgid "Not a supported data format."
 msgstr "Geen ondersteund gegevensformaat."
 
+#. TRANS: Page title for profile settings.
+msgid "Old school UI settings"
+msgstr "Oude gebruikersinterfaceinstellingen"
+
+#. TRANS: Usage instructions for profile settings.
+msgid "If you like it \"the old way\", you can set that here."
+msgstr ""
+"Als u de voorkeur geeft aan de \"oude manier\", dan kunt u dat hier aangeven."
+
+#. TRANS: Confirmation shown when user profile settings are saved.
+#. TRANS: Message after successful saving of administrative settings.
+msgid "Settings saved."
+msgstr "De instellingen zijn opgeslagen."
+
+msgid "Only stream mode (no conversations) in timelines"
+msgstr "Alleen streammodus (geen gesprekken) in tijdlijnen"
+
+msgid "Show conversation page as hierarchical trees"
+msgstr "Gesprekkenpagina als hiërarchische boomstructuur weergeven"
+
+msgid "Show nicknames (not full names) in timelines"
+msgstr "Gebruikersnamen (geen volledige namen) weergeven in tijdlijnen"
+
+#. TRANS: Button text to save a list.
+msgid "Save"
+msgstr "Opslaan"
+
 #. TRANS: ShortName in the OpenSearch interface when trying to find users.
 msgid "People Search"
 msgstr "Mensen zoeken"
@@ -3680,6 +3523,11 @@ msgstr "Mensen zoeken"
 msgid "Notice Search"
 msgstr "Mededeling zoeken"
 
+#. TRANS: Client error displayed trying to use "one time password login" when already logged in.
+#. TRANS: Client error displayed when trying to register while already logged in.
+msgid "Already logged in."
+msgstr "U bent al aangemeld."
+
 #. TRANS: Client error displayed trying to use "one time password login" without specifying a user.
 msgid "No user ID specified."
 msgstr "Er is geen ID opgegeven."
@@ -3749,7 +3597,7 @@ msgid "Confirm"
 msgstr "Bevestigen"
 
 #. TRANS: Field title on page where to change password.
-#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
+#. TRANS: Title for field label for password reset form where the password has to be typed again.
 #. TRANS: Field title on account registration page.
 msgid "Same as password above."
 msgstr "Gelijk aan het wachtwoord hierboven."
@@ -3807,12 +3655,6 @@ msgstr "Er kan niet uit de vormgevingmap gelezen worden: %s."
 msgid "Avatar directory not writable: %s."
 msgstr "Er kan niet in de avatarmap geschreven worden: %s."
 
-#. TRANS: Client error in Paths admin panel.
-#. TRANS: %s is the background directory that could not be written to.
-#, php-format
-msgid "Background directory not writable: %s."
-msgstr "Er kan niet in de achtergrondmap geschreven worden: %s."
-
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the locales directory that could not be read from.
 #, php-format
@@ -3925,30 +3767,6 @@ msgstr "Avatarmap"
 msgid "Directory where avatars are located."
 msgstr "Map waar alle avatars worden opgeslagen."
 
-#. TRANS: Fieldset legend in Paths admin panel.
-msgid "Backgrounds"
-msgstr "Achtergronden"
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-msgid "Server for backgrounds."
-msgstr "Server voor achtergronden."
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-msgid "Web path to backgrounds."
-msgstr "Webpad naar achtergronden."
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-msgid "Server for backgrounds on SSL pages."
-msgstr "Server voor achtergronden op SSL-pagina's."
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-msgid "Web path to backgrounds on SSL pages."
-msgstr "Webpad naar achtergronden op SSL-pagina's."
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-msgid "Directory where backgrounds are located."
-msgstr "Map waar achtergronden worden opgeslagen."
-
 #. TRANS: Fieldset legens in Paths admin panel.
 msgid "Attachments"
 msgstr "Bijlagen"
@@ -4004,8 +3822,8 @@ msgid "Server to direct SSL requests to."
 msgstr "De server waar SSL-verzoeken heen gestuurd moeten worden."
 
 #. TRANS: Button title text to store form data in the Paths admin panel.
-msgid "Save paths"
-msgstr "Opslagpaden"
+msgid "Save path settings."
+msgstr "De padinstellingen opslaan."
 
 #. TRANS: Instructions for the "People search" page.
 #. TRANS: %%site.name%% is the name of the StatusNet site.
@@ -4139,7 +3957,7 @@ msgid ""
 "%%%site.name%%%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
 "blogging) service based on the Free Software [StatusNet](http://status.net/) "
 "tool. You can easily keep track of what they are doing by subscribing to the "
-"tag's timeline."
+"list's timeline."
 msgstr ""
 "Dit zijn de lijsten die zijn gemaakt door **%s**. Via lijsten kunt u "
 "gelijksoortige mensen ordenen op %%%%site.name%%%%, a [microblogdienst]"
@@ -4173,7 +3991,7 @@ msgid ""
 "site.name%%%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
 "blogging) service based on the Free Software [StatusNet](http://status.net/) "
 "tool. You can easily keep track of what they are doing by subscribing to the "
-"tag's timeline."
+"list's timeline."
 msgstr ""
 "Dit zijn lijsten van **%s**. U kunt lijsten gebruiken om soortgelijke mensen "
 "te ordenen op %%%%site.name%%%%, een [microblogdienst](http://en.wikipedia."
@@ -4281,18 +4099,6 @@ msgstr ""
 "Alle standaard plug-ins zijn uitgeschakeld in het bestand met "
 "siteinstellingen."
 
-#. TRANS: Client error displayed if the notice posted has too many characters.
-msgid "Invalid notice content."
-msgstr "Ongeldige mededelinginhoud."
-
-#. TRANS: Exception thrown if a notice's license is not compatible with the StatusNet site license.
-#. TRANS: %1$s is the notice license, %2$s is the StatusNet site's license.
-#, php-format
-msgid "Notice license \"%1$s\" is not compatible with site license \"%2$s\"."
-msgstr ""
-"De mededelingenlicentie \"%1$s\" is niet compatibel met de licentie \"%2$s\" "
-"van deze site."
-
 #. TRANS: Client error displayed when trying to add an unindentified field to profile.
 #. TRANS: %s is a field name.
 #, php-format
@@ -4387,6 +4193,8 @@ msgid "Share my current location when posting notices"
 msgstr "Mijn huidige locatie weergeven bij het plaatsen van mededelingen"
 
 #. TRANS: Field label in form for profile settings.
+#. TRANS: Title for group tag cloud section.
+#. TRANS: %s is a group name.
 msgid "Tags"
 msgstr "Labels"
 
@@ -4416,10 +4224,10 @@ msgstr "In welke tijdzone verblijft u meestal?"
 
 #. TRANS: Checkbox label in form for profile settings.
 msgid ""
-"Automatically subscribe to whoever subscribes to me (best for non-humans)."
+"Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr ""
 "Automatisch abonneren bij abonnement op mij (beste voor automatische "
-"processen)."
+"processen)"
 
 #. TRANS: Dropdown field label on profile settings, for what policies to apply when someone else tries to subscribe to your updates.
 msgid "Subscription policy"
@@ -4486,11 +4294,6 @@ msgstr "Het was niet mogelijk de locatievoorkeuren op te slaan."
 msgid "Could not save tags."
 msgstr "Het was niet mogelijk de labels op te slaan."
 
-#. TRANS: Confirmation shown when user profile settings are saved.
-#. TRANS: Message after successful saving of administrative settings.
-msgid "Settings saved."
-msgstr "De instellingen zijn opgeslagen."
-
 #. TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
 #. TRANS: Page title for page where a user account can be restored from backup.
 msgid "Restore account"
@@ -4503,8 +4306,8 @@ msgid "Beyond the page limit (%s)."
 msgstr "Meer dan de paginalimiet (%s)."
 
 #. TRANS: Server error displayed when a public timeline cannot be retrieved.
-msgid "Could not retrieve public stream."
-msgstr "Het was niet mogelijk de publieke stream op te halen."
+msgid "Could not retrieve public timeline."
+msgstr "Het was niet mogelijk de publieke tijdlijn op te halen."
 
 #. TRANS: Title for all public timeline pages but the first.
 #. TRANS: %d is the page number.
@@ -4518,16 +4321,20 @@ msgid "Public timeline"
 msgstr "Openbare tijdlijn"
 
 #. TRANS: Link description for public timeline feed.
-msgid "Public Stream Feed (RSS 1.0)"
-msgstr "Publieke streamfeed (RSS 1.0)"
+msgid "Public Timeline Feed (Activity Streams JSON)"
+msgstr "Publieke tijdlijnfeed (JSON-activiteitenstreams)"
 
 #. TRANS: Link description for public timeline feed.
-msgid "Public Stream Feed (RSS 2.0)"
-msgstr "Publieke streamfeed (RSS 1.0)"
+msgid "Public Timeline Feed (RSS 1.0)"
+msgstr "Publieke tijdlijnfeed (RSS 1.0)"
 
 #. TRANS: Link description for public timeline feed.
-msgid "Public Stream Feed (Atom)"
-msgstr "Publieke streamfeed (Atom)"
+msgid "Public Timeline Feed (RSS 2.0)"
+msgstr "Publieke tijdlijnfeed (RSS 1.0)"
+
+#. TRANS: Link description for public timeline feed.
+msgid "Public Timeline Feed (Atom)"
+msgstr "Publieke tijdlijnfeed (Atom)"
 
 #. TRANS: Text displayed for public feed when there are no public notices.
 #, php-format
@@ -4576,47 +4383,6 @@ msgstr ""
 "Micro-blogging) gebaseerd op de Vrije Software [StatusNet](http://status."
 "net/)"
 
-#. TRANS: Title for page with public list cloud.
-msgid "Public list cloud"
-msgstr "Publieke lijstwoordwolk"
-
-#. TRANS: Page notice for page with public list cloud.
-#. TRANS: %s is a StatusNet sitename.
-#, php-format
-msgid "These are largest lists on %s"
-msgstr "Dit zijn de grootste lijsten op %s"
-
-#. TRANS: Empty list message on page with public list cloud.
-#. TRANS: This message contains Markdown links in the form [description](link).
-#, php-format
-msgid "No one has [listed](%%doc.tags%%) anyone yet."
-msgstr "Niemand heeft nog iemand in een [lijst](%%doc.tags%%) opgenomen."
-
-#. TRANS: Additional empty list message on page with public list cloud for logged in users.
-msgid "Be the first to list someone!"
-msgstr "U kunt de eerste zijn die iemand in een lijst opneemt!"
-
-#. TRANS: Additional empty list message on page with public list cloud for anonymous users.
-#. TRANS: This message contains Markdown links in the form [description](link).
-#, php-format
-msgid ""
-"Why not [register an account](%%action.register%%) and be the first to list "
-"someone!"
-msgstr ""
-"U kunt een [gebruiker registeren](%%action.register%%) en dan de eerste zijn "
-"die iemand in een lijst opneemt!"
-
-#. TRANS: DT element on on page with public list cloud.
-msgid "List cloud"
-msgstr "Lijstwoordwolk"
-
-#. TRANS: Link title for number of listed people. %d is the number of listed people.
-#, php-format
-msgid "1 person listed"
-msgid_plural "%d people listed"
-msgstr[0] "Eén persoon in lijst"
-msgstr[1] "%d personen in de lijst"
-
 #. TRANS: Public RSS feed description. %s is the StatusNet site name.
 #, php-format
 msgid "%s updates from everyone."
@@ -4724,7 +4490,7 @@ msgstr "Herstellen"
 
 #. TRANS: Title for password recovery page in password reset mode.
 msgid "Reset password"
-msgstr "Wachtwoord herstellen"
+msgstr "Wachtwoord opnieuw instellen"
 
 #. TRANS: Title for password recovery page in password recover mode.
 msgid "Recover password"
@@ -4744,7 +4510,6 @@ msgid "6 or more characters, and do not forget it!"
 msgstr "Zes of meer tekens, en vergeet uw wachtwoord niet!"
 
 #. TRANS: Button text for password reset form.
-#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
 msgctxt "BUTTON"
 msgid "Reset"
 msgstr "Opnieuw instellen"
@@ -4753,20 +4518,6 @@ msgstr "Opnieuw instellen"
 msgid "Enter a nickname or email address."
 msgstr "Voer een gebruikersnaam of e-mailadres in."
 
-#. TRANS: Information on password recovery form if no known username or e-mail address was specified.
-msgid "No user with that email address or username."
-msgstr ""
-"Er bestaat geen gebruiker met het opgegeven e-mailadres of de opgegeven "
-"gebruikersnaam."
-
-#. TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.
-msgid "No registered email address for that user."
-msgstr "Die gebruiker heeft geen e-mailadres geregistreerd."
-
-#. TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.
-msgid "Error saving address confirmation."
-msgstr "Er is een fout opgetreden bij het opslaan van de adresbevestiging."
-
 #. TRANS: User notification after an e-mail with instructions was sent from the password recovery form.
 msgid ""
 "Instructions for recovering your password have been sent to the email "
@@ -4946,76 +4697,6 @@ msgstr ""
 "U ontvangt snel een e-mailbericht  met daarin instructies over hoe u uw e-"
 "mail kunt bevestigen."
 
-#. TRANS: Page notice for remote subscribe. This message contains Markdown links.
-#. TRANS: Ensure to keep the correct markup of [link description](link).
-#, php-format
-msgid ""
-"To subscribe, you can [login](%%action.login%%), or [register](%%action."
-"register%%) a new  account. If you already have an account  on a [compatible "
-"microblogging site](%%doc.openmublog%%),  enter your profile URL below."
-msgstr ""
-"Om u te abonneren kunt u [aanmelden](%%action.login%%), of een nieuw "
-"gebruiker [registreren](%%action.register%%). Als u al een gebruiker bij een "
-"[compatibele microblogsite](%%doc.openmublog%%) hebt, voer dan hieronder uw "
-"profiel-URL in."
-
-#. TRANS: Page title for Remote subscribe.
-msgid "Remote subscribe"
-msgstr "Abonneren op afstand"
-
-#. TRANS: Field legend on page for remote subscribe.
-msgid "Subscribe to a remote user"
-msgstr "Op een externe gebruiker abonneren"
-
-#. TRANS: Field label on page for remote subscribe.
-msgid "User nickname"
-msgstr "Gebruikersnaam"
-
-#. TRANS: Field title on page for remote subscribe.
-msgid "Nickname of the user you want to follow."
-msgstr "Gebruikersnaam van de gebruiker waarop u wilt abonneren."
-
-#. TRANS: Field label on page for remote subscribe.
-msgid "Profile URL"
-msgstr "Profiel-URL"
-
-#. TRANS: Field title on page for remote subscribe.
-msgid "URL of your profile on another compatible microblogging service."
-msgstr "De URL van uw profiel bij een andere, compatibele microblogdienst."
-
-#. TRANS: Button text on page for remote subscribe.
-#. TRANS: Link text for link that will subscribe to a remote profile.
-#. TRANS: Button text to subscribe to a user.
-#. TRANS: Button text for subscribing to a list.
-msgctxt "BUTTON"
-msgid "Subscribe"
-msgstr "Abonneren"
-
-#. TRANS: Form validation error on page for remote subscribe when an invalid profile URL was provided.
-msgid "Invalid profile URL (bad format)."
-msgstr "Ongeldige profiel-URL (foutieve opmaak)."
-
-#. TRANS: Form validation error on page for remote subscribe when no the provided profile URL
-#. TRANS: does not contain expected data.
-msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
-msgstr ""
-"De URL is niet geldig (het is geen YADIS-document of er een ongeldige XRDS "
-"gedefinieerd)."
-
-#. TRANS: Form validation error on page for remote subscribe.
-msgid "That is a local profile! Login to subscribe."
-msgstr "Dat is een lokaal profiel. Meld u aan om te abonneren."
-
-#. TRANS: Form validation error on page for remote subscribe when the remote service is not providing a request token.
-msgid "Could not get a request token."
-msgstr "Het was niet mogelijk een verzoektoken te krijgen."
-
-#. TRANS: Client error displayed when trying to (un)list an OMB 0.1 remote profile.
-msgid "You cannot (un)list an OMB 0.1 remote profile with this action."
-msgstr ""
-"U kunt een extern OMB 1.0-profiel niet opnemen in of verwijderen uit een "
-"lijst via deze handeling."
-
 #. TRANS: Client error displayed when an unknown error occurs while delisting a user.
 #. TRANS: %s is a username.
 #, php-format
@@ -5072,6 +4753,12 @@ msgstr "Antwoorden aan %s"
 msgid "Replies to %1$s, page %2$d"
 msgstr "Antwoorden aan %1$s, pagina %2$d"
 
+#. TRANS: Link for feed with replies for a user.
+#. TRANS: %s is a user nickname.
+#, php-format
+msgid "Replies feed for %s (Activity Streams JSON)"
+msgstr "Antwoordenfeed voor %s (JSON-activiteitenstreams)"
+
 #. TRANS: Link for feed with replies for a user.
 #. TRANS: %s is a user nickname.
 #, php-format
@@ -5195,7 +4882,7 @@ msgstr "De feed wordt teruggeplaatst. Een paar minuten geduld, alstublieft."
 
 #. TRANS: Form instructions for feed restore.
 msgid ""
-"You can upload a backed-up stream in <a href=\"http://activitystrea.ms/"
+"You can upload a backed-up timeline in <a href=\"http://activitystrea.ms/"
 "\">Activity Streams</a> format."
 msgstr ""
 "U kunt een back-up van een tijdlijn uploaden in het formaat <a href=\"http://"
@@ -5311,6 +4998,26 @@ msgstr "Sleutel en wachtwoord op nieuw instellen"
 msgid "Application info"
 msgstr "Applicatieinformatie"
 
+#. TRANS: Field label on application page.
+msgid "Consumer key"
+msgstr "Gebruikerssleutel"
+
+#. TRANS: Field label on application page.
+msgid "Consumer secret"
+msgstr "Gebruikersgeheim"
+
+#. TRANS: Field label on application page.
+msgid "Request token URL"
+msgstr "URL voor verzoektoken"
+
+#. TRANS: Field label on application page.
+msgid "Access token URL"
+msgstr "URL voor toegangstoken"
+
+#. TRANS: Field label on application page.
+msgid "Authorize URL"
+msgstr "Autorisatie-URL"
+
 #. TRANS: Note on the OAuth application page about signature support.
 msgid ""
 "Note: HMAC-SHA1 signatures are supported. The plaintext signature method is "
@@ -5334,6 +5041,11 @@ msgstr "Favoriete mededelingen van %1$s, pagina %2$d"
 msgid "Could not retrieve favorite notices."
 msgstr "Het was niet mogelijk de favoriete mededelingen op te halen."
 
+#. TRANS: Feed link text. %s is a username.
+#, php-format
+msgid "Feed for favorites of %s (Activity Streams JSON)"
+msgstr "Favorietenfeed van %s (JSON-activiteitenstreams)"
+
 #. TRANS: Feed link text. %s is a username.
 #, php-format
 msgid "Feed for favorites of %s (RSS 1.0)"
@@ -5389,7 +5101,7 @@ msgstr "Dit is de manier om dat te delen wat u wilt."
 #. TRANS: Page title for first group page. %s is a group name.
 #, php-format
 msgid "%s group"
-msgstr "%s groep"
+msgstr "Groep %s"
 
 #. TRANS: Page title for any but first group page.
 #. TRANS: %1$s is a group name, $2$s is a page number.
@@ -5397,6 +5109,11 @@ msgstr "%s groep"
 msgid "%1$s group, page %2$d"
 msgstr "Groep %1$s, pagina %2$d"
 
+#. TRANS: Tooltip for feed link. %s is a group nickname.
+#, php-format
+msgid "Notice feed for %s group (Activity Streams JSON)"
+msgstr "Mededelingenfeed voor de groep %s (JSON-activiteitenstreams)"
+
 #. TRANS: Tooltip for feed link. %s is a group nickname.
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
@@ -5417,42 +5134,8 @@ msgstr "Mededelingenfeed voor groep %s (Atom)"
 msgid "FOAF for %s group"
 msgstr "Vriend van een vriend voor de groep %s"
 
-#. TRANS: Header for mini list of group members on a group page (h2).
-msgid "Members"
-msgstr "Leden"
-
-#. TRANS: Description for mini list of group members on a group page when the group has no members.
-#. TRANS: Content of "Listed" page if there are no listed users.
-#. TRANS: Content of "People following tag x" if there are no subscribed users.
-#. TRANS: Empty list message for tags.
-#. TRANS: Text for user subscription statistics if the user has no subscriptions.
-#. TRANS: Text for user subscriber statistics if user has no subscribers.
-#. TRANS: Text for user user group membership statistics if user is not a member of any group.
-#. TRANS: Default content for section/sidebar widget.
-msgid "(None)"
-msgstr "(geen)"
-
-#. TRANS: Link to all group members from mini list of group members if group has more than n members.
-msgid "All members"
-msgstr "Alle leden"
-
-#. TRANS: Header for group statistics on a group page (h2).
-#. TRANS: H2 text for user statistics.
-msgid "Statistics"
-msgstr "Statistieken"
-
-#. TRANS: Label for group creation date.
-msgctxt "LABEL"
-msgid "Created"
-msgstr "Aangemaakt"
-
-#. TRANS: Label for member count in statistics on group page.
-msgctxt "LABEL"
-msgid "Members"
-msgstr "Leden"
-
 #. TRANS: Notice on group pages for anonymous users for StatusNet sites that accept new registrations.
-#. TRANS: **%s** is the group alias, %%%%site.name%%%% is the site name,
+#. TRANS: %s is the group name, %%%%site.name%%%% is the site name,
 #. TRANS: %%%%action.register%%%% is the URL for registration, %%%%doc.help%%%% is a URL to help.
 #. TRANS: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
 #, php-format
@@ -5471,24 +5154,19 @@ msgstr ""
 "%%)"
 
 #. TRANS: Notice on group pages for anonymous users for StatusNet sites that accept no new registrations.
-#. TRANS: **%s** is the group alias, %%%%site.name%%%% is the site name,
+#. TRANS: %s is the group name, %%%%site.name%%%% is the site name,
 #. TRANS: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
 "wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
 "[StatusNet](http://status.net/) tool. Its members share short messages about "
-"their life and interests. "
+"their life and interests."
 msgstr ""
 "**%s** is een gebruikersgroep op %%%%site.name%%%%, een [microblogdienst]"
 "(http://en.wikipedia.org/wiki/Micro-blogging) gebaseerd op de Vrije Software "
 "[StatusNet](http://status.net/). De leden wisselen korte mededelingen uit "
-"over hun ervaringen en interesses. "
-
-#. TRANS: Title for list of group administrators on a group page.
-msgctxt "TITLE"
-msgid "Admins"
-msgstr "Beheerders"
+"over hun ervaringen en interesses."
 
 #. TRANS: Client error displayed requesting a single message that does not exist.
 msgid "No such message."
@@ -5585,9 +5263,21 @@ msgstr ""
 "volgen!"
 
 #. TRANS: Header on show list page.
+#. TRANS: Link description for link to list of users tagged with a tag (so part of a list).
 msgid "Listed"
 msgstr "In lijsten"
 
+#. TRANS: Content of "Listed" page if there are no listed users.
+#. TRANS: Content of "People following tag x" if there are no subscribed users.
+#. TRANS: Description for mini list of group members on a group page when the group has no members.
+#. TRANS: Empty list message for tags.
+#. TRANS: Text for user subscription statistics if the user has no subscriptions.
+#. TRANS: Text for user subscriber statistics if user has no subscribers.
+#. TRANS: Text for user user group membership statistics if user is not a member of any group.
+#. TRANS: Default content for section/sidebar widget.
+msgid "(None)"
+msgstr "(geen)"
+
 #. TRANS: Link for more "People in list x by a user"
 #. TRANS: if there are more than the mini list's maximum.
 msgid "Show all"
@@ -5598,24 +5288,19 @@ msgstr "Allemaal weergeven"
 msgid "Subscribers"
 msgstr "Abonnees"
 
-#. TRANS: Link for more "People following tag x"
-#. TRANS: if there are more than the mini list's maximum.
-msgid "All subscribers"
-msgstr "Alle abonnees"
-
-#. TRANS: Page title showing tagged notices in one user's stream.
+#. TRANS: Page title showing tagged notices in one user's timeline.
 #. TRANS: %1$s is the username, %2$s is the hash tag.
 #, php-format
 msgid "Notices by %1$s tagged %2$s"
 msgstr "Mededelingen van %1$s met het label %2$s"
 
-#. TRANS: Page title showing tagged notices in one user's stream.
+#. TRANS: Page title showing tagged notices in one user's timeline.
 #. TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number.
 #, php-format
 msgid "Notices by %1$s tagged %2$s, page %3$d"
 msgstr "Mededelingen van %1$s met het label %2$s, pagina %3$d"
 
-#. TRANS: Extended page title showing tagged notices in one user's stream.
+#. TRANS: Extended page title showing tagged notices in one user's timeline.
 #. TRANS: %1$s is the username, %2$d is the page number.
 #, php-format
 msgid "Notices by %1$s, page %2$d"
@@ -5627,6 +5312,12 @@ msgstr "Mededelingen van %1$s, pagina %2$d"
 msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
 msgstr "Mededelingenfeed voor %1$s met het label %2$s (RSS 1.0)"
 
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#, php-format
+msgid "Notice feed for %s (Activity Streams JSON)"
+msgstr "Mededelingenfeed voor %s (JSON-activiteitenstreams)"
+
 #. TRANS: Title for link to notice feed.
 #. TRANS: %s is a user nickname.
 #, php-format
@@ -5651,7 +5342,7 @@ msgstr "Mededelingenfeed voor %s (Atom)"
 msgid "FOAF for %s"
 msgstr "Vriend van een vriend (FOAF) voor %s"
 
-#. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
+#. TRANS: First sentence of empty list message for a timeline. $1%s is a user nickname.
 #, php-format
 msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
 msgstr ""
@@ -5665,7 +5356,7 @@ msgstr ""
 "Hebt u recentelijk iets interessants gezien? U hebt nog geen mededelingen "
 "verstuurd, dus dit is een ideaal moment om daarmee te beginnen!"
 
-#. TRANS: Second sentence of empty  list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
+#. TRANS: Second sentence of empty  list message for a non-self timeline. %1$s is a user nickname, %2$s is a part of a URL.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
 #, php-format
 msgid ""
@@ -5675,7 +5366,7 @@ msgstr ""
 "U kunt proberen %1$s te porren of [een bericht aan die gebruiker sturen](%%%%"
 "action.newnotice%%%%?status_textarea=%2$s)."
 
-#. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
+#. TRANS: Announcement for anonymous users showing a timeline if site registrations are open.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
 #, php-format
 msgid ""
@@ -5690,17 +5381,17 @@ msgstr ""
 "abonneren op de mededelingen van **%s** en nog veel meer! [Meer lezen...](%%%"
 "%doc.help%%%%)"
 
-#. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
+#. TRANS: Announcement for anonymous users showing a timeline if site registrations are closed or invite only.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
 "wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
-"[StatusNet](http://status.net/) tool. "
+"[StatusNet](http://status.net/) tool."
 msgstr ""
 "**%s** heeft een gebruiker op %%%%site.name%%%%, een [microblogdienst]"
 "(http://en.wikipedia.org/wiki/Micro-blogging) gebaseerd op de Vrije Software "
-"[StatusNet](http://status.net/). "
+"[StatusNet](http://status.net/)."
 
 #. TRANS: Link to the author of a repeated notice. %s is a linked nickname.
 #, php-format
@@ -5734,6 +5425,14 @@ msgid "You must have a valid contact email address."
 msgstr ""
 "U moet een geldig e-mailadres opgeven waarop contact opgenomen kan worden."
 
+#. TRANS: Client error displayed when a logo URL is not valid.
+msgid "Invalid logo URL."
+msgstr "De logo-URL is ongeldig."
+
+#. TRANS: Client error displayed when a SSL logo URL is invalid.
+msgid "Invalid SSL logo URL."
+msgstr "De SSL logo-URL is ongeldig."
+
 #. TRANS: Client error displayed trying to save site settings with an invalid language code.
 #. TRANS: %s is the invalid language code.
 #, php-format
@@ -5784,7 +5483,7 @@ msgstr ""
 
 #. TRANS: Field label on site settings panel.
 msgid "Email"
-msgstr "E-mail"
+msgstr "E-mailadres"
 
 #. TRANS: Field title on site settings panel.
 msgid "Contact email address for your site."
@@ -5805,13 +5504,14 @@ msgstr "Standaardtijdzone voor de website. Meestal UTC."
 
 #. TRANS: Dropdown label on site settings panel.
 msgid "Default language"
-msgstr "Standaardtaal"
+msgstr "Standaard taal"
 
 #. TRANS: Dropdown title on site settings panel.
-msgid "Site language when autodetection from browser settings is not available"
+msgid ""
+"The site language when autodetection from browser settings is not available."
 msgstr ""
 "De taal voor de website als deze niet uit de browserinstellingen opgemaakt "
-"kan worden"
+"kan worden."
 
 #. TRANS: Fieldset legend on site settings panel.
 msgctxt "LEGEND"
@@ -5836,9 +5536,21 @@ msgstr ""
 "Hoe lang gebruikers moeten wachten (in seconden) voor ze hetzelfde kunnen "
 "zenden."
 
+#. TRANS: Fieldset legend for form to change logo.
+msgid "Logo"
+msgstr "Logo"
+
+#. TRANS: Field label for StatusNet site logo.
+msgid "Site logo"
+msgstr "Websitelogo"
+
+#. TRANS: Field label for SSL StatusNet site logo.
+msgid "SSL logo"
+msgstr "SSL-logo"
+
 #. TRANS: Button title for saving site settings.
-msgid "Save site settings"
-msgstr "Websiteinstellingen opslaan"
+msgid "Save the site settings."
+msgstr "De websiteinstellingen opslaan."
 
 #. TRANS: Page title for site-wide notice tab in admin panel.
 msgid "Site Notice"
@@ -5866,7 +5578,7 @@ msgstr ""
 "Tekst voor websitebrede aankondiging (maximaal 255 tekens en HTML is "
 "toegestaan)"
 
-#. TRANS: Title for button to save site notice in admin panel.
+#. TRANS: Button title to save site notice in admin panel.
 msgid "Save site notice."
 msgstr "Websitebrede mededeling opslaan."
 
@@ -6060,7 +5772,7 @@ msgstr "Rapportage-URL"
 msgid "Snapshots will be sent to this URL."
 msgstr "Snapshots worden naar deze URL verzonden."
 
-#. TRANS: Title for button to save snapshot settings.
+#. TRANS: Button title to save snapshot settings.
 msgid "Save snapshot settings."
 msgstr "Snapshotinstellingen opslaan."
 
@@ -6093,11 +5805,6 @@ msgstr "Te behandelen volgersaanvragen voor %1$s, pagina %2$d"
 msgid "A list of users awaiting approval to subscribe to you."
 msgstr "Een lijst met gebruikers die wachten op goedkeuring om u te volgen."
 
-#. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
-msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
-msgstr ""
-"U kunt via deze handeling niet abonneren op een extern OMB 1.0-profiel."
-
 #. TRANS: Page title when subscription succeeded.
 msgid "Subscribed"
 msgstr "Geabonneerd"
@@ -6199,8 +5906,7 @@ msgid ""
 "You're not listening to anyone's notices right now, try subscribing to "
 "people you know. Try [people search](%%action.peoplesearch%%), look for "
 "members in groups you're interested in and in our [featured users](%%action."
-"featured%%). If you're a [Twitter user](%%action.twittersettings%%), you can "
-"automatically subscribe to people you already follow there."
+"featured%%)."
 msgstr ""
 "U bent op dit moment op geen enkele gebruiker geabonneerd. Abonneer u op "
 "gebruikers die u kent. [Zoek gebruikers](%%action.peoplesearch%%), bekijk de "
@@ -6237,6 +5943,12 @@ msgstr "SMS"
 msgid "Notices tagged with %1$s, page %2$d"
 msgstr "Mededelingen met het label %1$s, pagina %2$d"
 
+#. TRANS: Link label for feed on "notices with tag" page.
+#. TRANS: %s is the tag the feed is for.
+#, php-format
+msgid "Notice feed for tag %s (Activity Streams JSON)"
+msgstr "Mededelingenfeed voor label %s (JSON-activiteitenstreams)"
+
 #. TRANS: Link label for feed on "notices with tag" page.
 #. TRANS: %s is the tag the feed is for.
 #, php-format
@@ -6338,18 +6050,6 @@ msgstr "Uitgeschreven"
 msgid "%1$s unsubscribed from list %2$s by %3$s"
 msgstr "%1$s is niet langer geabonneerd op de lijst %2$s van %3$s"
 
-#. TRANS: Client error displayed when trying to update profile with an incompatible license.
-#. TRANS: %1$s is the license incompatible with site license %2$s.
-#. TRANS: Exception thrown when licenses are not compatible for an authorisation request.
-#. TRANS: %1$s is the license for the listenee, %2$s is the license for "this" StatusNet site.
-#, php-format
-msgid ""
-"Listenee stream license \"%1$s\" is not compatible with site license \"%2$s"
-"\"."
-msgstr ""
-"De licentie \"%1$s\" voor de stream die u wilt volgen is niet compatibel met "
-"de sitelicentie \"%2$s\"."
-
 #. TRANS: Title of URL settings tab in profile settings.
 msgid "URL settings"
 msgstr "URL-instellingen"
@@ -6483,156 +6183,10 @@ msgstr "Uitnodigingen ingeschakeld"
 msgid "Whether to allow users to invite new users."
 msgstr "Of gebruikers nieuwe gebruikers kunnen uitnodigen."
 
-#. TRANS: Title for button to save user settings in user admin panel.
+#. TRANS: Button title to save user settings in user admin panel.
 msgid "Save user settings."
 msgstr "Gebruikersinstellingen opslaan."
 
-#. TRANS: Page title.
-msgid "Authorize subscription"
-msgstr "Abonneren"
-
-#. TRANS: Page notice on "Authorize subscription" page.
-msgid ""
-"Please check these details to make sure that you want to subscribe to this "
-"user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
-"click \"Reject\"."
-msgstr ""
-"Controleer alstublieft deze details om er zeker van te zijn dat u zich wilt "
-"abonneren op de mededelingen van deze gebruiker. Als u zojuist niet hebt "
-"aangegeven dat u zich op de mededelingen van een gebruiker wilt abonneren, "
-"klik dan op \"Afwijzen\"."
-
-#. TRANS: Button text on Authorise Subscription page.
-#. TRANS: Submit button text to accept a group membership request on approve group form.
-#. TRANS: Submit button text to accept a subscription request on approve sub form.
-msgctxt "BUTTON"
-msgid "Accept"
-msgstr "Aanvaarden"
-
-#. TRANS: Title for button on Authorise Subscription page.
-#. TRANS: Button title to subscribe to a user.
-msgid "Subscribe to this user."
-msgstr "Op deze gebruiker abonneren."
-
-#. TRANS: Button text on Authorise Subscription page.
-#. TRANS: Submit button text to reject a group membership request on approve group form.
-#. TRANS: Submit button text to reject a subscription request on approve sub form.
-msgctxt "BUTTON"
-msgid "Reject"
-msgstr "Afwijzen"
-
-#. TRANS: Title for button on Authorise Subscription page.
-msgid "Reject this subscription."
-msgstr "Dit abonnement weigeren."
-
-#. TRANS: Client error displayed for an empty authorisation request.
-msgid "No authorization request!"
-msgstr "Geen autorisatieverzoek!"
-
-#. TRANS: Accept message header from Authorise subscription page.
-msgid "Subscription authorized"
-msgstr "Het abonnement is geautoriseerd"
-
-#. TRANS: Accept message text from Authorise subscription page.
-msgid ""
-"The subscription has been authorized, but no callback URL was passed. Check "
-"with the site's instructions for details on how to authorize the "
-"subscription. Your subscription token is:"
-msgstr ""
-"Het abonnement is geautoriseerd maar er is geen callback-URL doorgegeven. "
-"Controleer de instructies van de website voor details over hoe het "
-"abonnement te autoriseren."
-
-#. TRANS: Reject message header from Authorise subscription page.
-msgid "Subscription rejected"
-msgstr "Het abonnement is afgewezen"
-
-#. TRANS: Reject message from Authorise subscription page.
-msgid ""
-"The subscription has been rejected, but no callback URL was passed. Check "
-"with the site's instructions for details on how to fully reject the "
-"subscription."
-msgstr ""
-"Het abonnement is afgewezen maar er is geen callback-URL doorgegeven. "
-"Controleer de instructies van de website voor details over hoe het "
-"abonnement volledig af te wijzen."
-
-#. TRANS: Exception thrown when no valid user is found for an authorisation request.
-#. TRANS: %s is a listener URI.
-#, php-format
-msgid "Listener URI \"%s\" not found here."
-msgstr "De abonnee-URI \"%s\" is hier niet te vinden."
-
-#. TRANS: Exception thrown when listenee URI is too long for an authorisation request.
-#. TRANS: %s is a listenee URI.
-#, php-format
-msgid "Listenee URI \"%s\" is too long."
-msgstr "De URI \"%s\" van de gevolgde gebruiker is te lang."
-
-#. TRANS: Exception thrown when listenee URI is a local user for an authorisation request.
-#. TRANS: %s is a listenee URI.
-#, php-format
-msgid "Listenee URI \"%s\" is a local user."
-msgstr "De abonnements-URI \"%s\" is een lokale gebruiker."
-
-#. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
-#. TRANS: %s is a profile URL.
-#, php-format
-msgid "Profile URL \"%s\" is for a local user."
-msgstr "De profiel-URL \"%s\" is van een lokale gebruiker."
-
-#. TRANS: Exception thrown when avatar URL is invalid for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#, php-format
-msgid "Avatar URL \"%s\" is not valid."
-msgstr "De avatar-URL \"%s\" is niet geldig."
-
-#. TRANS: Exception thrown when avatar URL could not be read for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#, php-format
-msgid "Cannot read avatar URL \"%s\"."
-msgstr "Het was niet mogelijk de avatar-URL \"%s\" te lezen."
-
-#. TRANS: Exception thrown when avatar URL return an invalid image type for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#, php-format
-msgid "Wrong image type for avatar URL \"%s\"."
-msgstr "Er staat een verkeerd afbeeldingsttype op de avatar-URL \"%s\"."
-
-#. TRANS: Title for profile design page.
-#. TRANS: Page title for profile design page.
-msgid "Profile design"
-msgstr "Profielontwerp"
-
-#. TRANS: Instructions for Profile design page.
-#. TRANS: Instructions for profile design page.
-msgid ""
-"Customize the way your profile looks with a background image and a colour "
-"palette of your choice."
-msgstr ""
-"U kunt de vormgeving van uw profiel aanpassen door een achtergrondafbeelding "
-"toe te voegen of het kleurenpalet aan te passen."
-
-#. TRANS: Succes message on Profile design page when finding an easter egg.
-msgid "Enjoy your hotdog!"
-msgstr "Geniet van uw hotdog!"
-
-#. TRANS: Form legend on Profile design page.
-msgid "Design settings"
-msgstr "Vormgevingsinstellingen"
-
-#. TRANS: Checkbox label on Profile design page.
-msgid "View profile designs"
-msgstr "Profielontwerpen gebruiken"
-
-#. TRANS: Title for checkbox on Profile design page.
-msgid "Show or hide profile designs."
-msgstr "Profielontwerpen weergeven of verbergen"
-
-#. TRANS: Form legend on Profile design page for form to choose a background image.
-msgid "Background file"
-msgstr "Achtergrondbestand"
-
 #. TRANS: Page title for all but the first page of groups for a user.
 #. TRANS: %1$s is a nickname, %2$d is a page number.
 #, php-format
@@ -6674,11 +6228,11 @@ msgstr "StatusNet %s"
 #. TRANS: %1$s is the engine name (StatusNet) and %2$s is the StatusNet version.
 #, php-format
 msgid ""
-"This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, "
+"This site is powered by %1$s version %2$s, Copyright 2008-2011 StatusNet, "
 "Inc. and contributors."
 msgstr ""
 "Deze website wordt aangedreven door %1$s versie %2$s. Auteursrechten "
-"voorbehouden 2008-2010 Statusnet, Inc. en medewerkers."
+"voorbehouden 2008-2011 Statusnet, Inc. en medewerkers."
 
 #. TRANS: Header for StatusNet contributors section on the version page.
 msgid "Contributors"
@@ -6693,24 +6247,24 @@ msgid ""
 "StatusNet is free software: you can redistribute it and/or modify it under "
 "the terms of the GNU Affero General Public License as published by the Free "
 "Software Foundation, either version 3 of the License, or (at your option) "
-"any later version. "
+"any later version."
 msgstr ""
 "StatusNet is vrije software. U kunt het herdistribueren en/of wijzigen in "
 "overeenstemming met de voorwaarden van de GNU Affero General Public License "
 "zoals gepubliceerd door de Free Software Foundation, versie 3 van de "
-"Licentie, of (naar uw keuze) elke latere versie. "
+"Licentie, of (naar uw keuze) elke latere versie."
 
 #. TRANS: Content part of StatusNet version page.
 msgid ""
 "This program is distributed in the hope that it will be useful, but WITHOUT "
 "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
 "FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License "
-"for more details. "
+"for more details."
 msgstr ""
 "Dit programma wordt verspreid in de hoop dat het bruikbaar is, maar ZONDER "
 "ENIGE GARANTIE; zelfs zonder de impliciete garantie van VERKOOPBAARHEID of "
 "GESCHIKTHEID VOOR EEN BEPAALD DOEL. Zie de GNU Affero General Public License "
-"voor meer details. "
+"voor meer details."
 
 #. TRANS: Content part of StatusNet version page.
 #. TRANS: %s is a link to the AGPL license with link description "http://www.gnu.org/licenses/agpl.html".
@@ -6765,22 +6319,32 @@ msgstr "Het was niet mogelijk de URL \"%s\" te verwerken."
 msgid "Robin thinks something is impossible."
 msgstr "Robin denkt dat iets onmogelijk is."
 
+#. TRANS: Message used to be inserted as %2$s in  the text "No file may
+#. TRANS: be larger than %1$d byte and the file you sent was %2$s.".
+#. TRANS: %1$d is the number of bytes of an uploaded file.
+#, php-format
+msgid "%1$d byte"
+msgid_plural "%1$d bytes"
+msgstr[0] "%1$d byte"
+msgstr[1] "%1$d bytes"
+
 #. TRANS: Message given if an upload is larger than the configured maximum.
-#. TRANS: %1$d is the byte limit for uploads, %2$d is the byte count for the uploaded file.
-#. TRANS: %1$s is used for plural.
+#. TRANS: %1$d (used for plural) is the byte limit for uploads,
+#. TRANS: %2$s is the proper form of "n bytes". This is the only ways to have
+#. TRANS: gettext support multiple plurals in the same message, unfortunately...
 #, php-format
 msgid ""
-"No file may be larger than %1$d byte and the file you sent was %2$d bytes. "
-"Try to upload a smaller version."
+"No file may be larger than %1$d byte and the file you sent was %2$s. Try to "
+"upload a smaller version."
 msgid_plural ""
-"No file may be larger than %1$d bytes and the file you sent was %2$d bytes. "
-"Try to upload a smaller version."
+"No file may be larger than %1$d bytes and the file you sent was %2$s. Try to "
+"upload a smaller version."
 msgstr[0] ""
-"Bestanden mogen niet groter zijn dan %1$d byte, en uw bestand was %2$d "
-"bytes. Probeer een kleinere versie te uploaden."
+"Bestanden mogen niet groter zijn dan %1$d byte, en uw bestand was %2$s. "
+"Probeer een kleinere versie te uploaden."
 msgstr[1] ""
-"Bestanden mogen niet groter zijn dan %1$d bytes, en uw bestand was %2$d "
-"bytes. Probeer een kleinere versie te uploaden."
+"Bestanden mogen niet groter zijn dan %1$d bytes, en uw bestand was %2$s. "
+"Probeer een kleinere versie te uploaden."
 
 #. TRANS: Message given if an upload would exceed user quota.
 #. TRANS: %d (number) is the user quota in bytes and is used for plural.
@@ -6788,7 +6352,9 @@ msgstr[1] ""
 msgid "A file this large would exceed your user quota of %d byte."
 msgid_plural "A file this large would exceed your user quota of %d bytes."
 msgstr[0] ""
+"Een bestand van deze grootte overschrijdt uw gebruikersquotum van %d byte."
 msgstr[1] ""
+"Een bestand van deze grootte overschrijdt uw gebruikersquotum van %d bytes."
 
 #. TRANS: Message given id an upload would exceed a user's monthly quota.
 #. TRANS: $d (number) is the monthly user quota in bytes and is used for plural.
@@ -6849,6 +6415,11 @@ msgstr "Het was niet mogelijk de lokale groep bij te werken."
 msgid "Could not create login token for %s"
 msgstr "Het was niet mogelijk een aanmeldtoken aan te maken voor %s"
 
+#. TRANS: Exception thrown when a program code class (%s) cannot be instantiated.
+#, php-format
+msgid "Cannot instantiate class %s."
+msgstr "Kan klasse %s niet instantiëren."
+
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.
 msgid "No database name or DSN found anywhere."
 msgstr "Geen databasenaam of DSN gevonden."
@@ -7018,7 +6589,7 @@ msgstr ""
 #, php-format
 msgid ""
 "You already have %1$d or more people in list %2$s, which is the maximum "
-"allowed number.Try unlisting others first."
+"allowed number. Try unlisting others first."
 msgstr ""
 "U hebt al %1$d of meer mensen in de lijst %2$s opgenomen. Meer mensen "
 "opnemen is niet mogelijk. Verwijder eerst mensen uit de lijst voordat u "
@@ -7041,7 +6612,6 @@ msgid "Unable to save tag."
 msgstr "Het was niet mogelijk om het label op te slaan."
 
 #. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
-#. TRANS: Error message displayed to a banned user when they try to subscribe.
 msgid "You have been banned from subscribing."
 msgstr "U mag zich niet abonneren."
 
@@ -7061,11 +6631,6 @@ msgstr "Niet geabonneerd!"
 msgid "Could not delete self-subscription."
 msgstr "Kon abonnement op eigen gebruiker niet verwijderen."
 
-#. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
-msgid "Could not delete subscription OMB token."
-msgstr ""
-"Het was niet mogelijk om het OMB-token voor het abonnement te verwijderen."
-
 #. TRANS: Exception thrown when a subscription could not be deleted on the server.
 msgid "Could not delete subscription."
 msgstr "Kon abonnement niet verwijderen."
@@ -7101,6 +6666,20 @@ msgid "Single-user mode code called when not enabled."
 msgstr ""
 "De \"single-user\"-modus is aangeroepen terwijl deze niet is ingeschakeld."
 
+#. TRANS: Information on password recovery form if no known username or e-mail address was specified.
+msgid "No user with that email address or username."
+msgstr ""
+"Er bestaat geen gebruiker met het opgegeven e-mailadres of de opgegeven "
+"gebruikersnaam."
+
+#. TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.
+msgid "No registered email address for that user."
+msgstr "Die gebruiker heeft geen e-mailadres geregistreerd."
+
+#. TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.
+msgid "Error saving address confirmation."
+msgstr "Er is een fout opgetreden bij het opslaan van de adresbevestiging."
+
 #. TRANS: Server exception thrown when creating a group failed.
 msgid "Could not create group."
 msgstr "Het was niet mogelijk de groep aan te maken."
@@ -7374,24 +6953,10 @@ msgstr "showForm() is niet geïmplementeerd."
 msgid "saveSettings() not implemented."
 msgstr "saveSettings() is nog niet geïmplementeerd."
 
-#. TRANS: Client error message thrown if design settings could not be deleted in
-#. TRANS: the admin panel Design.
-msgid "Unable to delete design setting."
-msgstr "Het was niet mogelijk om de ontwerpinstellingen te verwijderen."
-
 #. TRANS: Header in administrator navigation panel.
-#. TRANS: Header in settings navigation panel.
 msgctxt "HEADER"
 msgid "Home"
-msgstr "Hoofdmenu"
-
-#. TRANS: Menu item in administrator navigation panel.
-#. TRANS: Menu item in default local navigation panel.
-#. TRANS: Menu item in personal group navigation menu.
-#. TRANS: Menu item in settings navigation panel.
-msgctxt "MENU"
-msgid "Home"
-msgstr "Hoofdmenu"
+msgstr "Startpagina"
 
 #. TRANS: Header in administrator navigation panel.
 msgctxt "HEADER"
@@ -7407,17 +6972,6 @@ msgctxt "MENU"
 msgid "Site"
 msgstr "Website"
 
-#. TRANS: Menu item title in administrator navigation panel.
-msgid "Design configuration"
-msgstr "Instellingen vormgeving"
-
-#. TRANS: Menu item in administrator navigation panel.
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: Menu item in settings navigation panel.
-msgctxt "MENU"
-msgid "Design"
-msgstr "Uiterlijk"
-
 #. TRANS: Menu item title in administrator navigation panel.
 msgid "User configuration"
 msgstr "Gebruikersinstellingen"
@@ -7517,45 +7071,6 @@ msgstr "Er is geen gebruiker voor dat token."
 msgid "Could not authenticate you."
 msgstr "U kon niet geauthenticeerd worden."
 
-#. TRANS: Server error displayed when trying to create an anynymous OAuth consumer.
-msgid "Could not create anonymous consumer."
-msgstr "Het was niet mogelijk een anonieme consumer aan te maken."
-
-#. TRANS: Server error displayed when trying to create an anynymous OAuth application.
-msgid "Could not create anonymous OAuth application."
-msgstr "Het was niet mogelijk een anonieme OAuthapplicatie aan te maken."
-
-#. TRANS: Exception thrown when no token association could be found.
-msgid ""
-"Could not find a profile and application associated with the request token."
-msgstr ""
-"Het profiel en de applicatie die zijn geassocieerd met het verzoektoken zijn "
-"niet aangetroffen."
-
-#. TRANS: Exception thrown when no access token can be issued.
-msgid "Could not issue access token."
-msgstr "Het was niet mogelijk het toegangstoken uit te geven."
-
-#. TRANS: Exception thrown when a database error occurs.
-msgid "Database error inserting OAuth application user."
-msgstr ""
-"Er is een databasefout opgetreden tijdens het toevoegen van de OAuth "
-"applicatiegebruiker."
-
-#. TRANS: Exception thrown when a database error occurs.
-msgid "Database error updating OAuth application user."
-msgstr ""
-"Er is een databasefout opgetreden tijdens het toevoegen van de OAuth "
-"applicatiegebruiker."
-
-#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
-msgid "Tried to revoke unknown token."
-msgstr "Er is geprobeerd een onbekend token in te trekken."
-
-#. TRANS: Exception thrown when an attempt is made to remove a revoked token.
-msgid "Failed to delete revoked token."
-msgstr "Het was niet mogelijk een ingetrokken token te verwijderen."
-
 #. TRANS: Form input field label for application icon.
 msgid "Icon"
 msgstr "Icoon"
@@ -7637,13 +7152,12 @@ msgstr ""
 "Standaardtoegang voor deze applicatie: alleen-lezen of lezen en schrijven"
 
 #. TRANS: Submit button title.
-msgid "Cancel"
-msgstr "Annuleren"
+msgid "Cancel application changes."
+msgstr "Applicatiewijzigingen annuleren."
 
 #. TRANS: Submit button title.
-#. TRANS: Button text to save a list.
-msgid "Save"
-msgstr "Opslaan"
+msgid "Save application changes."
+msgstr "Applicatiewijzigingen opslaan."
 
 #. TRANS: Name for an anonymous application in application list.
 msgid "Unknown application"
@@ -7678,6 +7192,18 @@ msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "Intrekken"
 
+#. TRANS: Submit button text to accept a group membership request on approve group form.
+#. TRANS: Submit button text to accept a subscription request on approve sub form.
+msgctxt "BUTTON"
+msgid "Accept"
+msgstr "Aanvaarden"
+
+#. TRANS: Submit button text to reject a group membership request on approve group form.
+#. TRANS: Submit button text to reject a subscription request on approve sub form.
+msgctxt "BUTTON"
+msgid "Reject"
+msgstr "Afwijzen"
+
 #. TRANS: Atom feed exception thrown when an author element does not contain a name element.
 msgid "Author element must contain a name element."
 msgstr "Het element author moet een element name bevatten."
@@ -8237,6 +7763,11 @@ msgstr ""
 msgid "Go to the installer."
 msgstr "Naar het installatieprogramma gaan."
 
+#. TRANS: Header on conversation page. Hidden by default (h2).
+#. TRANS: Label for user statistics.
+msgid "Notices"
+msgstr "Mededelingen"
+
 #. TRANS: Page title for when a database error occurs.
 msgid "Database error"
 msgstr "Databasefout"
@@ -8247,13 +7778,6 @@ msgctxt "MENU"
 msgid "Public"
 msgstr "Openbaar"
 
-#. TRANS: Menu item in default local navigation panel.
-#. TRANS: Menu item in search group navigation panel.
-#. TRANS: Menu item in local navigation menu.
-msgctxt "MENU"
-msgid "Groups"
-msgstr "Groepen"
-
 #. TRANS: Menu item in default local navigation panel.
 #. TRANS: Menu item title in local navigation menu.
 msgctxt "MENU"
@@ -8269,51 +7793,12 @@ msgstr "Verwijderen"
 msgid "Delete this user"
 msgstr "Gebruiker verwijderen"
 
-#. TRANS: Form legend of form for changing the page design.
-msgid "Change design"
-msgstr "Ontwerp wijzigen"
-
-#. TRANS: Fieldset legend on profile design page to change profile page colours.
-msgid "Change colours"
-msgstr "Kleuren wijzigen"
-
-#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-msgid "Use defaults"
-msgstr "Standaardinstellingen gebruiken"
-
-#. TRANS: Label in form on profile design page.
-#. TRANS: Field contains file name on user's computer that could be that user's custom profile background image.
-msgid "Upload file"
-msgstr "Bestand uploaden"
-
-#. TRANS: Instructions for form on profile design page.
-msgid ""
-"You can upload your personal background image. The maximum file size is 2MB."
-msgstr ""
-"U kunt een persoonlijke achtergrondafbeelding uploaden. De maximale "
-"bestandsgrootte is 2 megabyte."
-
-#. TRANS: Radio button on profile design page that will enable use of the uploaded profile image.
-msgctxt "RADIO"
-msgid "On"
-msgstr "Aan"
-
-#. TRANS: Radio button on profile design page that will disable use of the uploaded profile image.
-msgctxt "RADIO"
-msgid "Off"
-msgstr "Uit"
-
-#. TRANS: Success message displayed if design settings were saved after clicking "Use defaults".
-msgid "Design defaults restored."
-msgstr "Het standaardontwerp is weer ingesteld."
-
 #. TRANS: Exception. %s is an ID.
 #, php-format
 msgid "Unable to find services for %s."
 msgstr "Er zijn geen diensten aantroffen voor %s."
 
 #. TRANS: Form legend for removing the favourite status for a favourite notice.
-#. TRANS: Title for button text for removing the favourite status for a favourite notice.
 msgid "Disfavor this notice"
 msgstr "Uit de favorietenlijst verwijderen"
 
@@ -8322,8 +7807,11 @@ msgctxt "BUTTON"
 msgid "Disfavor favorite"
 msgstr "Van favorietenlijst verwijderen"
 
+#. TRANS: Button title for removing the favourite status for a favourite notice.
+msgid "Remove this notice from your list of favorite notices."
+msgstr "Dit bericht verwijderen uit uw lijst met favoriete berichten."
+
 #. TRANS: Form legend for adding the favourite status to a notice.
-#. TRANS: Title for button text for adding the favourite status to a notice.
 msgid "Favor this notice"
 msgstr "Op de favorietenlijst plaatsen"
 
@@ -8332,6 +7820,10 @@ msgctxt "BUTTON"
 msgid "Favor"
 msgstr "Aan favorietenlijst toevoegen"
 
+#. TRANS: Button title for adding the favourite status to a notice.
+msgid "Add this notice to your list of favorite notices."
+msgstr "Dit bericht toevoegen aan uw lijst met favoriete berichten."
+
 #. TRANS: Feed type name.
 msgid "RSS 1.0"
 msgstr "RSS 1.0"
@@ -8348,6 +7840,10 @@ msgstr "Atom"
 msgid "FOAF"
 msgstr "Vrienden van vrienden (FOAF)"
 
+#. TRANS: Feed type name. See http://activitystrea.ms/
+msgid "Activity Streams"
+msgstr "Activiteitenstreams"
+
 #. TRANS: Client exception thrown when an imported feed does not have an author.
 msgid "No author in the feed."
 msgstr "Er staat geen auteur in de feed."
@@ -8379,6 +7875,27 @@ msgstr "Kies een label om de lijst kleiner te maken."
 msgid "Grant this user the \"%s\" role"
 msgstr "Deze gebruiker de rol \"%s\" geven"
 
+#. TRANS: Header for mini list of group members on a group page (h2).
+msgid "Members"
+msgstr "Leden"
+
+#. TRANS: Link to all group members from mini list of group members if group has more than n members.
+msgid "All members"
+msgstr "Alle leden"
+
+#. TRANS: Header for mini list of users with a pending membership request on a group page (h2).
+msgid "Pending"
+msgstr "In behandeling"
+
+#. TRANS: Header for mini list of users that are blocked in a group page (h2).
+msgid "Blocked"
+msgstr "Geblokkeerd"
+
+#. TRANS: Title for list of group administrators on a group page.
+msgctxt "TITLE"
+msgid "Admins"
+msgstr "Beheerders"
+
 #. TRANS: Button text for the form that will block a user from a group.
 msgctxt "BUTTON"
 msgid "Block"
@@ -8386,8 +7903,10 @@ msgstr "Blokkeren"
 
 #. TRANS: Submit button title.
 msgctxt "TOOLTIP"
-msgid "Block this user"
-msgstr "Deze gebruiker blokkeren"
+msgid "Block this user so that they can no longer post messages to it."
+msgstr ""
+"Deze gebruiker blokkeren zodat die niet langer berichten in deze groep kan "
+"plaatsen."
 
 #. TRANS: Field title on group edit form.
 msgid "URL of the homepage or blog of the group or topic."
@@ -8441,63 +7960,9 @@ msgctxt "GROUPADMIN"
 msgid "Admin"
 msgstr "Beheerder"
 
-#. TRANS: Menu item in the group navigation page.
-msgctxt "MENU"
-msgid "Group"
-msgstr "Groep"
-
-#. TRANS: Tooltip for menu item in the group navigation page.
-#. TRANS: %s is the nickname of the group.
-#, php-format
-msgctxt "TOOLTIP"
-msgid "%s group"
-msgstr "Groep %s"
-
-#. TRANS: Menu item in the group navigation page.
-msgctxt "MENU"
-msgid "Members"
-msgstr "Leden"
-
-#. TRANS: Tooltip for menu item in the group navigation page.
-#. TRANS: %s is the nickname of the group.
-#, php-format
-msgctxt "TOOLTIP"
-msgid "%s group members"
-msgstr "Leden van de groep %s"
-
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: %d is the number of pending members.
-#, php-format
-msgctxt "MENU"
-msgid "Pending members (%d)"
-msgid_plural "Pending members (%d)"
-msgstr[0] "Opstaande aanvraag voor groepslidmaatschap"
-msgstr[1] "Openstaande aanvragen voor groepslidmaatschap (%d)"
-
-#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: %s is the nickname of the group.
-#, php-format
-msgctxt "TOOLTIP"
-msgid "%s pending members"
-msgstr "Groepslidmaatschapsaanvragen voor de groep %s"
-
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-msgctxt "MENU"
-msgid "Blocked"
-msgstr "Geblokkeerd"
-
-#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: %s is the nickname of the group.
-#, php-format
-msgctxt "TOOLTIP"
-msgid "%s blocked users"
-msgstr "Geblokkeerde gebruikers in %s"
-
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: Menu item in primary navigation panel.
-msgctxt "MENU"
-msgid "Admin"
-msgstr "Beheer"
+#. TRANS: Group actions header (h2). Text hidden by default.
+msgid "Group actions"
+msgstr "Groepshandelingen"
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
@@ -8506,11 +7971,6 @@ msgctxt "TOOLTIP"
 msgid "Edit %s group properties"
 msgstr "Eigenschappen van de groep %s bewerken"
 
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-msgctxt "MENU"
-msgid "Logo"
-msgstr "Logo"
-
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
 #, php-format
@@ -8518,16 +7978,10 @@ msgctxt "TOOLTIP"
 msgid "Add or edit %s logo"
 msgstr "Logo voor de groep %s toevoegen of bewerken"
 
-#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: %s is the nickname of the group.
-#, php-format
-msgctxt "TOOLTIP"
-msgid "Add or edit %s design"
-msgstr "Vormgeving van de groep %s toevoegen of aanpassen"
-
-#. TRANS: Group actions header (h2). Text hidden by default.
-msgid "Group actions"
-msgstr "Groepshandelingen"
+#. TRANS: Link text for link on user profile.
+msgctxt "MENU"
+msgid "Logo"
+msgstr "Logo"
 
 #. TRANS: Title for groups with the most members section.
 msgid "Popular groups"
@@ -8537,11 +7991,19 @@ msgstr "Populaire groepen"
 msgid "Active groups"
 msgstr "Actieve groepen"
 
-#. TRANS: Title for group tag cloud section.
-#. TRANS: %s is a group name.
-#, php-format
-msgid "Tags in %s group's notices"
-msgstr "Labels in de groepsmededelingen van %s"
+#. TRANS: Link description for seeing all groups.
+#. TRANS: Link description for seeing all lists.
+msgid "See all"
+msgstr "Allemaal bekijken"
+
+#. TRANS: Link title for seeing all groups.
+msgid "See all groups you belong to."
+msgstr "Alle groepen bekijken waartoe u behoort."
+
+#. TRANS: Menu item title in personal group navigation menu.
+#. TRANS: %s is a username.
+msgid "Back to top"
+msgstr "Terug naar boven"
 
 #. TRANS: Client exception 406
 msgid "This page is not available in a media type you accept"
@@ -8632,11 +8094,41 @@ msgctxt "TITLE"
 msgid "Trends"
 msgstr "Trends"
 
-#. TRANS: Button text for inviting more users to the StatusNet instance.
+#. TRANS: Default button text for inviting more users to the StatusNet instance.
 msgctxt "BUTTON"
 msgid "Invite more colleagues"
 msgstr "Nieuwe gebruikers uitnodigen"
 
+#. TRANS: Form legend.
+msgid "Invite collegues"
+msgstr "Collega's uitnodigen"
+
+#. TRANS: Field label for a list of e-mail addresses.
+msgid "Email addresses"
+msgstr "E-mailadressen"
+
+#. TRANS: Field title for a list of e-mail addresses.
+msgid "Addresses of friends to invite (one per line)."
+msgstr "Adressen van uit te nodigen vrienden (één per regel)."
+
+#. TRANS: Field label for a personal message to send to invitees.
+msgid "Personal message"
+msgstr "Persoonlijk bericht"
+
+#. TRANS: Field title for a personal message to send to invitees.
+msgid "Optionally add a personal message to the invitation."
+msgstr "Persoonlijk bericht bij de uitnodiging (optioneel)."
+
+#. TRANS: Send button for inviting friends
+#. TRANS: Button text for sending notice.
+msgctxt "BUTTON"
+msgid "Send"
+msgstr "Verzenden"
+
+#. TRANS: Submit button title.
+msgid "Send invitations."
+msgstr "Uitnodigingen verzenden."
+
 #. TRANS: Button text for joining a group.
 msgctxt "BUTTON"
 msgid "Join"
@@ -8647,6 +8139,10 @@ msgctxt "BUTTON"
 msgid "Leave"
 msgstr "Verlaten"
 
+#. TRANS: Link title for seeing all lists.
+msgid "See all lists you have created."
+msgstr "Alle lijsten bekijken die u hebt aangemaakt."
+
 #. TRANS: Menu item for logging in to the StatusNet site.
 #. TRANS: Menu item in primary navigation panel.
 msgctxt "MENU"
@@ -8707,8 +8203,8 @@ msgstr ""
 #. TRANS: Main body of new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscriber's long name, %2$s is the StatusNet sitename.
 #, php-format
-msgid "%1$s is now listening to your notices on %2$s."
-msgstr "%1$s volgt nu uw berichten %2$s."
+msgid "%1$s is now following you on %2$s."
+msgstr "%1$s volgt u nu op %2$s."
 
 #. TRANS: Subject of pending new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscribing user's nickname, %2$s is the StatusNet sitename.
@@ -8933,7 +8429,7 @@ msgstr "%1$s (@%2$s) heeft u een mededeling gestuurd"
 #. TRANS: Body of @-reply notification e-mail.
 #. TRANS: %1$s is the sending user's name, $2$s is the StatusNet sitename,
 #. TRANS: %3$s is a URL to the notice, %4$s is the notice text,
-#. TRANS: %5$s is a URL to the full conversion if it exists (otherwise empty),
+#. TRANS: %5$s is the text "The full conversation can be read here:" and a URL to the full conversion if it exists (otherwise empty),
 #. TRANS: %6$s is a URL to reply to the notice, %7$s is a URL to all @-replies for the addressed user,
 #, php-format
 msgid ""
@@ -8975,6 +8471,10 @@ msgstr ""
 
 #. TRANS: Subject of group join notification e-mail.
 #. TRANS: %1$s is the joining user's nickname, %2$s is the group name, and %3$s is the StatusNet sitename.
+#, php-format
+msgid "%1$s has joined your group %2$s on %3$s"
+msgstr "%1$s is lid geworden van uw groep %2$s op %3$s."
+
 #. TRANS: Main body of group join notification e-mail.
 #. TRANS: %1$s is the subscriber's long name, %2$s is the group name, and %3$s is the StatusNet sitename,
 #. TRANS: %4$s is a block of profile info about the subscriber.
@@ -9063,8 +8563,8 @@ msgstr "Beheerder maken"
 
 #. TRANS: Submit button title.
 msgctxt "TOOLTIP"
-msgid "Make this user an admin"
-msgstr "Deze gebruiker beheerder maken"
+msgid "Make this user an admin."
+msgstr "Deze gebruiker beheerder maken."
 
 #. TRANS: Client exception thrown when a database error was thrown during a file upload operation.
 msgid "There was a database error while saving your file. Please try again."
@@ -9113,7 +8613,7 @@ msgstr "Directe mededeling verzenden"
 msgid "Select recipient:"
 msgstr "Selecteer ontvanger:"
 
-#. TRANS Entry in drop-down selection box in direct-message inbox/outbox when no one is available to message.
+#. TRANS: Entry in drop-down selection box in direct-message inbox/outbox when no one is available to message.
 msgid "No mutual subscribers."
 msgstr "Geen wederzijdse abonnees."
 
@@ -9180,6 +8680,10 @@ msgstr "Het is niet bekend hoe dit doel afgehandeld moet worden."
 msgid "You must implement either adaptNoticeListItem() or showNotice()."
 msgstr "U moet adaptNoticeListItem() of showNotice() implementeren."
 
+#. TRANS: Link description to show more items in a list.
+msgid "More â–¼"
+msgstr "Meer â–¼"
+
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 msgid "Nickname cannot be empty."
 msgstr "Gebruikersnaam kan niet leeg zijn."
@@ -9229,10 +8733,6 @@ msgctxt "SEPARATOR"
 msgid ", "
 msgstr ", "
 
-#. TRANS: Start of profile addressees list.
-msgid " â–¸ "
-msgstr " â–¸ "
-
 #. TRANS: Used in coordinates as abbreviation of north.
 msgid "N"
 msgstr "N"
@@ -9271,16 +8771,16 @@ msgid "Repeated by"
 msgstr "Herhaald door"
 
 #. TRANS: Link title in notice list item to reply to a notice.
-msgid "Reply to this notice"
-msgstr "Op deze mededeling antwoorden"
+msgid "Reply to this notice."
+msgstr "Op deze mededeling antwoorden."
 
 #. TRANS: Link text in notice list item to reply to a notice.
 msgid "Reply"
 msgstr "Antwoorden"
 
 #. TRANS: Link title in notice list item to delete a notice.
-msgid "Delete this notice"
-msgstr "Deze mededeling verwijderen"
+msgid "Delete this notice from the timeline."
+msgstr "Deze mededeling verwijderen uit de tijdlijn."
 
 #. TRANS: Title for repeat form status in notice list when a notice has been repeated.
 msgid "Notice repeated."
@@ -9303,26 +8803,6 @@ msgstr "Porren"
 msgid "Send a nudge to this user."
 msgstr "Deze gebruiker porren"
 
-#. TRANS: Exception thrown when creating a new profile fails in OAuth store.
-msgid "Error inserting new profile."
-msgstr "Fout tijdens het invoegen van een nieuw profiel."
-
-#. TRANS: Exception thrown when creating a new avatar fails in OAuth store.
-msgid "Error inserting avatar."
-msgstr "Fout bij het invoegen van de avatar."
-
-#. TRANS: Exception thrown when creating a remote profile fails in OAuth store.
-msgid "Error inserting remote profile."
-msgstr "Fout bij het toevoegen van het externe profiel."
-
-#. TRANS: Exception thrown when a notice is denied because it has been sent before.
-msgid "Duplicate notice."
-msgstr "Dubbele mededeling."
-
-#. TRANS: Exception thrown when creating a new subscription fails in OAuth store.
-msgid "Could not insert new subscription."
-msgstr "Kon nieuw abonnement niet toevoegen."
-
 #. TRANS: Server exception thrown in oEmbed action if no API endpoint is available.
 msgid "No oEmbed API endpoint available."
 msgstr "Er is geen API-eindpunt beschikbaar."
@@ -9400,10 +8880,6 @@ msgstr "Bewerken"
 msgid "Edit %s list by you."
 msgstr "Uw lijst %s bewerken."
 
-#. TRANS: Link description for link to list of users tagged with a tag.
-msgid "Tagged"
-msgstr "Gelabeld"
-
 #. TRANS: Title for link to edit list settings.
 msgid "Edit list settings."
 msgstr "Lijstinstellingen bewerken."
@@ -9546,9 +9022,12 @@ msgctxt "plugin"
 msgid "Enable"
 msgstr "Inschakelen"
 
+#. TRANS: Plugin description for a disabled plugin.
 msgctxt "plugin-description"
-msgid "(Plugin descriptions unavailable when disabled.)"
-msgstr "Plug-inbeschrijvingen zijn niet beschikbaar als uitgeschakeld."
+msgid ""
+"(The plugin description is unavailable when a plugin has been disabled.)"
+msgstr ""
+"De plug-inbeschrijving is niet beschikbaar als een plug-in is uitgeschakeld."
 
 #. TRANS: Menu item in primary navigation panel.
 msgctxt "MENU"
@@ -9559,6 +9038,11 @@ msgstr "Instellingen"
 msgid "Change your personal settings."
 msgstr "Uw persoonlijke instellingen wijzigen."
 
+#. TRANS: Menu item in primary navigation panel.
+msgctxt "MENU"
+msgid "Admin"
+msgstr "Beheer"
+
 #. TRANS: Menu item title in primary navigation panel.
 msgid "Site configuration."
 msgstr "Siteinstellingen."
@@ -9576,14 +9060,8 @@ msgstr "Van de site afmelden."
 msgid "Login to the site."
 msgstr "Bij de site aanmelden."
 
-#. TRANS: Menu item in primary navigation panel.
-msgctxt "MENU"
-msgid "Search"
-msgstr "Zoeken"
-
-#. TRANS: Menu item title in primary navigation panel.
-msgid "Search the site."
-msgstr "De site doorzoeken."
+msgid "This profile has been silenced by site moderators"
+msgstr "Dit profiel is het zwijgen opgelegd door een sitemoderator"
 
 #. TRANS: H2 text for user subscription statistics.
 msgid "Following"
@@ -9593,6 +9071,10 @@ msgstr "Abonnementen"
 msgid "Followers"
 msgstr "Abonnees"
 
+#. TRANS: H2 text for user statistics.
+msgid "Statistics"
+msgstr "Statistieken"
+
 #. TRANS: Label for user statistics.
 msgid "User ID"
 msgstr "Gebruikers-ID"
@@ -9601,10 +9083,6 @@ msgstr "Gebruikers-ID"
 msgid "Member since"
 msgstr "Lid sinds"
 
-#. TRANS: Label for user statistics.
-msgid "Notices"
-msgstr "Mededelingen"
-
 #. TRANS: Label for user statistics.
 #. TRANS: Average count of posts made per day since account registration.
 msgid "Daily average"
@@ -9690,13 +9168,13 @@ msgid "Keyword(s)"
 msgstr "Trefwoord(en)"
 
 #. TRANS: Button text for searching site.
+#. TRANS: Button text for search button on search form.
 #. TRANS: Button text to search profiles.
 msgctxt "BUTTON"
 msgid "Search"
 msgstr "Zoeken"
 
 #. TRANS: Standard search suggestions shown when a search does not give any results.
-#, fuzzy
 msgid ""
 "* Make sure all words are spelled correctly.\n"
 "* Try different keywords.\n"
@@ -9706,10 +9184,10 @@ msgstr ""
 "* Zorg ervoor dat alle woorden correct zijn gespeld.\n"
 "* Probeer verschillende trefwoorden.\n"
 "* Probeer meer algemene trefwoorden.\n"
-"* Probeer minder trefwoorden.\n"
+"* Probeer minder trefwoorden."
 
 #. TRANS: Standard search suggestions shown when a search does not give any results.
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "You can also try your search on other engines:\n"
 "\n"
@@ -9727,7 +9205,7 @@ msgstr ""
 "* [Tweet scan](http://www.tweetscan.com/indexi.php?s=%s)\n"
 "* [Google](http://www.google.com/search?q=site%%3A%%%%site.server%%%%+%s)\n"
 "* [Yahoo](http://search.yahoo.com/search?p=site%%3A%%%%site.server%%%%+%s)\n"
-"* [Collecta](http://collecta.com/#q=%s)\n"
+"* [Collecta](http://collecta.com/#q=%s)"
 
 #. TRANS: Menu item in search group navigation panel.
 msgctxt "MENU"
@@ -9751,21 +9229,6 @@ msgstr "Inhoud van mededelingen vinden"
 msgid "Find groups on this site"
 msgstr "Groepen op deze site vinden"
 
-#. TRANS: Secondary navigation menu item leading to help on StatusNet.
-msgctxt "MENU"
-msgid "Help"
-msgstr "Help"
-
-#. TRANS: Secondary navigation menu item leading to text about StatusNet site.
-msgctxt "MENU"
-msgid "About"
-msgstr "Over"
-
-#. TRANS: Secondary navigation menu item leading to Frequently Asked Questions.
-msgctxt "MENU"
-msgid "FAQ"
-msgstr "Veel gestelde vragen"
-
 #. TRANS: Secondary navigation menu item leading to Terms of Service.
 msgctxt "MENU"
 msgid "TOS"
@@ -9786,17 +9249,6 @@ msgctxt "MENU"
 msgid "Version"
 msgstr "Versie"
 
-#. TRANS: Secondary navigation menu item leading to e-mail contact information on the
-#. TRANS: StatusNet site, where to report bugs, ...
-msgctxt "MENU"
-msgid "Contact"
-msgstr "Contact"
-
-#. TRANS: Secondary navigation menu item. Leads to information about embedding a timeline widget.
-msgctxt "MENU"
-msgid "Badge"
-msgstr "Widget"
-
 #. TRANS: Default title for section/sidebar widget.
 msgid "Untitled section"
 msgstr "Naamloze sectie"
@@ -9841,10 +9293,6 @@ msgstr "E-mail"
 msgid "Change email handling"
 msgstr "E-mailafhandeling wijzigen"
 
-#. TRANS: Menu item title in settings navigation panel.
-msgid "Design your profile"
-msgstr "Uw profiel ontwerpen"
-
 #. TRANS: Menu item in settings navigation panel.
 msgctxt "MENU"
 msgid "URL"
@@ -9881,6 +9329,15 @@ msgstr "Koppelingen"
 msgid "Authorized connected applications"
 msgstr "Geautoriseerde verbonden applicaties"
 
+#. TRANS: Menu item in settings navigation panel.
+msgctxt "MENU"
+msgid "Old school"
+msgstr "Oude manier"
+
+#. TRANS: Menu item title in settings navigation panel.
+msgid "UI tweaks for old-school users"
+msgstr "Gebruikersinterface-instellingen voor \"oude\" gebruikers"
+
 #. TRANS: Title of form to silence a user.
 msgctxt "TITLE"
 msgid "Silence"
@@ -9890,6 +9347,45 @@ msgstr "Muilkorven"
 msgid "Silence this user"
 msgstr "Deze gebruiker muilkorven"
 
+#. TRANS: Server error displayed when trying to create an anynymous OAuth consumer.
+msgid "Could not create anonymous consumer."
+msgstr "Het was niet mogelijk een anonieme consumer aan te maken."
+
+#. TRANS: Server error displayed when trying to create an anynymous OAuth application.
+msgid "Could not create anonymous OAuth application."
+msgstr "Het was niet mogelijk een anonieme OAuthapplicatie aan te maken."
+
+#. TRANS: Exception thrown when no token association could be found.
+msgid ""
+"Could not find a profile and application associated with the request token."
+msgstr ""
+"Het profiel en de applicatie die zijn geassocieerd met het verzoektoken zijn "
+"niet aangetroffen."
+
+#. TRANS: Exception thrown when no access token can be issued.
+msgid "Could not issue access token."
+msgstr "Het was niet mogelijk het toegangstoken uit te geven."
+
+#. TRANS: Exception thrown when a database error occurs.
+msgid "Database error inserting OAuth application user."
+msgstr ""
+"Er is een databasefout opgetreden tijdens het toevoegen van de OAuth "
+"applicatiegebruiker."
+
+#. TRANS: Exception thrown when a database error occurs.
+msgid "Database error updating OAuth application user."
+msgstr ""
+"Er is een databasefout opgetreden tijdens het toevoegen van de OAuth "
+"applicatiegebruiker."
+
+#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
+msgid "Tried to revoke unknown token."
+msgstr "Er is geprobeerd een onbekend token in te trekken."
+
+#. TRANS: Exception thrown when an attempt is made to remove a revoked token.
+msgid "Failed to delete revoked token."
+msgstr "Het was niet mogelijk een ingetrokken token te verwijderen."
+
 #. TRANS: Menu item in local navigation menu.
 msgctxt "MENU"
 msgid "Subscriptions"
@@ -9946,6 +9442,16 @@ msgstr "Vrienden en collega's uitnodigen om u te vergezellen op %s."
 msgid "Subscribe to this user"
 msgstr "Op deze gebruiker abonneren"
 
+#. TRANS: Button text to subscribe to a user.
+#. TRANS: Button text for subscribing to a list.
+msgctxt "BUTTON"
+msgid "Subscribe"
+msgstr "Abonneren"
+
+#. TRANS: Button title to subscribe to a user.
+msgid "Subscribe to this user."
+msgstr "Op deze gebruiker abonneren."
+
 #. TRANS: Title of personal tag cloud section.
 msgid "People Tagcloud as self-tagged"
 msgstr "Gebruikerslabelwolk als zelf gelabeld"
@@ -10076,16 +9582,26 @@ msgstr[1] "%%s vinden dit leuk."
 
 #. TRANS: List message for notice repeated by logged in user.
 msgctxt "REPEATLIST"
-msgid "You have repeated this notice."
+msgid "You repeated this."
 msgstr "U hebt deze mededeling herhaald."
 
-#. TRANS: List message for repeated notices.
-#. TRANS: %d is the number of users that have repeated a notice.
+#. TRANS: List message for when more than 4 people repeat something.
+#. TRANS: %%s is a list of users liking a notice, %d is the number over 4 that like the notice.
+#. TRANS: Plural is decided on the total number of users liking the notice (count of %%s + %d).
 #, php-format
-msgid "One person has repeated this notice."
-msgid_plural "%d people have repeated this notice."
-msgstr[0] "Een persoon heeft deze mededeling herhaald."
-msgstr[1] "%d personen hebben deze mededeling herhaald."
+msgid "%%s and %d other repeated this."
+msgid_plural "%%s and %d others repeated this."
+msgstr[0] "%%s en een andere gebruiker hebben dit herhaald."
+msgstr[1] "%%s en %d andere gebruikers hebben dit herhaald."
+
+#. TRANS: List message for favoured notices.
+#. TRANS: %%s is a list of users liking a notice.
+#. TRANS: Plural is based on the number of of users that have favoured a notice.
+#, php-format
+msgid "%%s repeated this."
+msgid_plural "%%s repeated this."
+msgstr[0] "%%s heeft dit herhaald."
+msgstr[1] "%%s hebben dit herhaald."
 
 #. TRANS: Form legend.
 #, php-format
@@ -10177,7 +9693,6 @@ msgid "Unsilence this user"
 msgstr "Deze gebruiker de muilkorf afnemen"
 
 #. TRANS: Form legend on unsubscribe form.
-#. TRANS: Button title on unsubscribe form.
 msgid "Unsubscribe from this user"
 msgstr "Uitschrijven van deze gebruiker"
 
@@ -10185,7 +9700,11 @@ msgstr "Uitschrijven van deze gebruiker"
 #. TRANS: Button text for unsubscribing from a list.
 msgctxt "BUTTON"
 msgid "Unsubscribe"
-msgstr "Abonnement opheffen"
+msgstr "Uitschrijven"
+
+#. TRANS: Button title on unsubscribe form.
+msgid "Unsubscribe from this user."
+msgstr "Uitschrijven van deze gebruiker."
 
 #. TRANS: Exception text shown when no profile can be found for a user.
 #. TRANS: %1$s is a user nickname, $2$d is a user ID (number).
@@ -10268,8 +9787,6 @@ msgstr "Ongeldige XML. De XRD-root mist."
 msgid "Getting backup from file '%s'."
 msgstr "De back-up wordt uit het bestand \"%s\" geladen."
 
-#~ msgid "%1$s and friends, page %2$d"
-#~ msgstr "%1$s en vrienden, pagina %2$d"
-
-#~ msgid "You and friends"
-#~ msgstr "U en vrienden"
+#
+#~ msgid " "
+#~ msgstr " "
diff --git a/locale/pl/LC_MESSAGES/statusnet.po b/locale/pl/LC_MESSAGES/statusnet.po
index 7611d1f374..df35d0b46a 100644
--- a/locale/pl/LC_MESSAGES/statusnet.po
+++ b/locale/pl/LC_MESSAGES/statusnet.po
@@ -1,9 +1,12 @@
-# Translation of StatusNet - Core to Polish (Polski)
+# Translation of StatusNet - Core to Polish (polski)
 # Exported from translatewiki.net
 #
+# Author: Bartek50003
+# Author: BeginaFelicysym
 # Author: McDutchie
 # Author: Raven
 # Author: Sp5uhe
+# Author: Woytecr
 # --
 # This file is distributed under the same license as the StatusNet package.
 #
@@ -11,20 +14,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:35+0000\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:28+0000\n"
 "Last-Translator: Piotr DrÄ…g <piotrdrag@gmail.com>\n"
-"Language-Team: Polish <http://translatewiki.net/wiki/Portal:pl>\n"
+"Language-Team: Polish <https://translatewiki.net/wiki/Portal:pl>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n == 1) ? 0 : ( (n%10 >= 2 && n%10 <= 4 && "
 "(n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: pl\n"
 "X-Message-Group: #out-statusnet-core\n"
-"X-POT-Import-Date: 2011-05-05 10:52:40+0000\n"
+"X-POT-Import-Date: 2012-04-22 22:02:21+0000\n"
 
 #. TRANS: Database error message.
 #, php-format
@@ -34,27 +37,26 @@ msgid ""
 "contact them at %2$s to make sure. Otherwise, wait a few minutes and try "
 "again."
 msgstr ""
-
-#. TRANS: Error message.
-msgid ""
-"An important error occured, probably related to email setup. Check logfiles "
-"for more info."
-msgstr ""
+"Baza danych dla %1$s nie odpowiada, więc witryna może nie działać poprawnie. "
+"Administratorzy prawdopodobnie już wiedzą o tym problemie, ale możesz się z "
+"nimi skontaktowac przez %2$s aby się upewnić. W przeciwnym wypadku poczekaj "
+"kilka minut i spróbuj ponownie."
 
 #. TRANS: Error message.
 msgid "An error occurred."
-msgstr ""
+msgstr "Wystąpił błąd."
 
 #. TRANS: Error message displayed when there is no StatusNet configuration file.
 #, php-format
 msgid ""
 "No configuration file found. Try running the installation program first."
 msgstr ""
+"Nie znaleziono pliku konfiguracyjnego. Spróbuj najpierw uruchomić program "
+"instalacyjny."
 
 #. TRANS: Error message displayed when trying to access a non-existing page.
-#, fuzzy
 msgid "Unknown page"
-msgstr "Nieznane"
+msgstr "Nieznana strona"
 
 #. TRANS: Error message displayed when trying to perform an undefined action.
 #. TRANS: Title for password recovery page when an unknown action has been specified.
@@ -100,12 +102,11 @@ msgstr "Wyłączenie nowych rejestracji."
 msgid "Closed"
 msgstr "Zamknięte"
 
-#. TRANS: Title for button to save access settings in site admin panel.
-msgid "Save access settings"
+#. TRANS: Button title to save access settings in site admin panel.
+msgid "Save access settings."
 msgstr "Zapisz ustawienia dostępu"
 
-#. TRANS: Tooltip for button to save access settings in site admin panel.
-#. TRANS: Button text for saving theme settings.
+#. TRANS: Button text to save access settings in site admin panel.
 #. TRANS: Button label to save e-mail preferences.
 #. TRANS: Button label to save IM preferences.
 #. TRANS: Button text in the license admin panel.
@@ -121,7 +122,6 @@ msgstr "Zapisz ustawienia dostępu"
 #. TRANS: Button text for saving "Other settings" in profile.
 #. TRANS: Button text to save user settings in user admin panel.
 #. TRANS: Button label in the "Edit application" form.
-#. TRANS: Button text on profile design page to save settings.
 #. TRANS: Text for save button on group edit form.
 #. TRANS: Button text to save tags for a profile.
 msgctxt "BUTTON"
@@ -157,22 +157,14 @@ msgstr "Nie ma takiego profilu."
 #. TRANS: Client error displayed trying to reference a non-existing list.
 #. TRANS: Client error displayed when referring to a non-existing list.
 #. TRANS: Client error displayed trying to reference a non-existing list.
-#, fuzzy
 msgid "No such list."
-msgstr "Nie ma takiego znacznika."
-
-#. TRANS: Client error displayed when trying to add an OMB 0.1 remote profile to a list.
-#, fuzzy
-msgid "You cannot list an OMB 0.1 remote profile with this action."
-msgstr ""
-"Nie można subskrybować zdalnego profilu profilu OMB 0.1 za pomocą tej "
-"czynności."
+msgstr "Brak takiej listy."
 
 #. TRANS: Client error displayed when an unknown error occurs when adding a user to a list.
 #. TRANS: %s is a username.
 #, php-format
 msgid "There was an unexpected error while listing %s."
-msgstr ""
+msgstr "Wystąpił nieoczekiwany błąd podczas wyświetlania %s."
 
 #. TRANS: Client error displayed when an unknown error occurs when adding a user to a list.
 #. TRANS: %s is a profile URL.
@@ -181,12 +173,13 @@ msgid ""
 "There was a problem listing %s. The remote server is probably not responding "
 "correctly. Please try retrying later."
 msgstr ""
+"Istnieje problem z wyświetleniem  %s. Serwer zdalny prawdopodobnie nie "
+"odpowiada poprawnie. Spróbuj ponownie później."
 
 #. TRANS: Title after adding a user to a list.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Listed"
-msgstr "Licencja"
+msgstr "Wymienione"
 
 #. TRANS: Server error when page not found (404).
 #. TRANS: Server error when page not found (404)
@@ -198,7 +191,6 @@ msgstr "Nie ma takiej strony."
 #. TRANS: Client error when user not found for an rss related action.
 #. TRANS: Client error displayed when no existing user is provided for a user's delivery device setting.
 #. TRANS: Client error displayed if a user could not be found.
-#. TRANS: Client error when user not found updating a profile background image.
 #. TRANS: Client error displayed updating profile image without having a user object.
 #. TRANS: Client error displayed when making an Atom API request for an unknown user.
 #. TRANS: Client error displayed when trying to block a non-existing user or a user from another site.
@@ -224,14 +216,11 @@ msgstr "Nie ma takiej strony."
 #. TRANS: Client error displayed when trying to get the RSS feed with favorites of a user that does not exist.
 #. TRANS: Client error displayed when requesting Friends of a Friend feed without providing a user nickname.
 #. TRANS: Client error displayed when requesting Friends of a Friend feed for an object that is not a user.
-#. TRANS: Client error displayed when trying to get a user hCard for a non-existing user.
 #. TRANS: Client error displayed trying to make a micro summary without providing a valid user.
 #. TRANS: Client error displayed trying to send a direct message to a non-existing user.
 #. TRANS: Client error displayed trying to use "one time password login" without using an existing user.
 #. TRANS: Client error displayed when referring to non-existing user.
 #. TRANS: Client error displayed trying to perform an action related to a non-existing user.
-#. TRANS: Form validation error on page for remote subscribe when no user was provided.
-#. TRANS: Form validation error on page for remote subscribe when no user profile was found.
 #. TRANS: Client error displayed when trying to reply to a non-exsting user.
 #. TRANS: Client error displayed when providing a non-existing nickname in a RSS 1.0 action.
 #. TRANS: Client error.
@@ -240,7 +229,6 @@ msgstr "Nie ma takiej strony."
 #. TRANS: Client error displayed trying to find a user by ID for a non-existing ID.
 #. TRANS: Client error displayed requesting groups for a non-existing user.
 #. TRANS: Client error displayed when user not found for an action.
-#. TRANS: Client error displayed providing a non-existing nickname.
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #. TRANS: Client error displayed when trying to perform a gallery action with an unknown user.
 #. TRANS: Client error displayed when trying to access a mailbox without providing a user.
@@ -249,15 +237,21 @@ msgid "No such user."
 msgstr "Brak takiego użytkownika."
 
 #. TRANS: Title of a user's own start page.
-#, fuzzy
 msgid "Home timeline"
-msgstr "Oś czasu użytkownika %s"
+msgstr "Domowa oÅ› czasu"
 
 #. TRANS: Title of another user's start page.
 #. TRANS: %s is the other user's name.
-#, fuzzy, php-format
+#, php-format
 msgid "%s's home timeline"
-msgstr "Oś czasu użytkownika %s"
+msgstr "Domowa oś czasu użytkownika %s"
+
+#. TRANS: %s is user nickname.
+#. TRANS: Feed title.
+#. TRANS: %s is tagger's nickname.
+#, php-format
+msgid "Feed for friends of %s (Activity Streams JSON)"
+msgstr "Kanał dla znajomych użytkownika %s (aktywność strumieni JSON)"
 
 #. TRANS: %s is user nickname.
 #, php-format
@@ -304,7 +298,7 @@ msgstr ""
 "Można spróbować [szturchnąć użytkownika %1$s](../%2$s) z jego profilu lub "
 "[wysłać mu coś](%%%%action.newnotice%%%%?status_textarea=%3$s)."
 
-#. TRANS: Encoutagement displayed on empty timeline user pages for anonymous users.
+#. TRANS: Encouragement displayed on empty timeline user pages for anonymous users.
 #. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
 #. TRANS: Empty list message for page with replies for a user for not logged in users.
 #. TRANS: %1$s is a user nickname. This message contains a Markdown link in the form [link text](link).
@@ -318,6 +312,12 @@ msgstr ""
 "Dlaczego nie [zarejestrujesz konta](%%%%action.register%%%%) i wtedy "
 "szturchniesz użytkownika %s lub wyślesz mu wpis."
 
+#. TRANS: Button text for inviting more users to the StatusNet instance.
+#. TRANS: Less business/enterprise-oriented language for public sites.
+msgctxt "BUTTON"
+msgid "Send invite"
+msgstr "Wyślij zaproszenie"
+
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Title of API timeline for a user and friends.
 #. TRANS: %s is a username.
@@ -326,8 +326,6 @@ msgstr ""
 #. TRANS: %s is a username.
 #. TRANS: Menu item title in personal group navigation menu.
 #. TRANS: %s is a username.
-#. TRANS: Menu item title in settings navigation panel.
-#. TRANS: %s is a username.
 #, php-format
 msgid "%s and friends"
 msgstr "Użytkownik %s i przyjaciele"
@@ -366,7 +364,6 @@ msgstr ""
 #. TRANS: Server error thrown on database error updating SMS preferences.
 #. TRANS: Server error thrown on database error removing a registered SMS phone number.
 #. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
-#. TRANS: Server exception thrown on Profile design page when updating design settings fails.
 msgid "Could not update user."
 msgstr "Nie można zaktualizować użytkownika."
 
@@ -381,7 +378,6 @@ msgstr "Nie można zapisać profilu."
 
 #. TRANS: Client error displayed when the number of bytes in a POST request exceeds a limit.
 #. TRANS: %s is the number of bytes of the CONTENT_LENGTH.
-#. TRANS: Form validation error in design settings form. POST should remain untranslated.
 #, php-format
 msgid ""
 "The server was unable to handle that much POST data (%s byte) due to its "
@@ -399,24 +395,6 @@ msgstr[2] ""
 "Serwer nie może obsłużyć aż tylu danych POST (%s bajtów) z powodu bieżącej "
 "konfiguracji."
 
-#. TRANS: Client error displayed when saving design settings fails because of an empty id.
-#. TRANS: Client error displayed when saving design settings fails because of an empty result.
-#. TRANS: Client error displayed when a database error occurs inserting profile colours.
-#. TRANS: Client error displayed when a database error occurs updating profile colours.
-#. TRANS: Form validation error displayed when group design settings could not be saved because of an application issue.
-#. TRANS: Form validation error on Profile design page when saving design settings has failed.
-#. TRANS: Form validation error on Profile design page when updating design settings has failed.
-msgid "Unable to save your design settings."
-msgstr "Nie można zapisać ustawień wyglądu."
-
-#. TRANS: Error displayed when updating design settings fails.
-#. TRANS: Client error displayed when a database error occurs updating profile colours.
-#. TRANS: Form validation error on Profile design page when updating design settings has failed.
-#. TRANS: Error message displayed if design settings could not be saved.
-#. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
-msgid "Could not update your design."
-msgstr "Nie można zaktualizować wyglądu."
-
 #. TRANS: Title for Atom feed.
 msgctxt "ATOM"
 msgid "Main"
@@ -463,6 +441,20 @@ msgstr "Zablokowanie użytkownika nie powiodło się."
 msgid "Unblock user failed."
 msgstr "Odblokowanie użytkownika nie powiodło się."
 
+#. TRANS: Client exception thrown when no conversation ID is given.
+msgid "No conversation ID."
+msgstr "Brak identyfikatora konwersacji."
+
+#. TRANS: Client exception thrown when referring to a non-existing conversation ID (%d).
+#, php-format
+msgid "No conversation with ID %d."
+msgstr "Brak rozmowy o ID %d."
+
+#. TRANS: Title for conversion timeline.
+msgctxt "TITLE"
+msgid "Conversation"
+msgstr "Rozmowa"
+
 #. TRANS: Title. %s is a user nickname.
 #, php-format
 msgid "Direct messages from %s"
@@ -503,13 +495,14 @@ msgid "Recipient user not found."
 msgstr "Nie odnaleziono odbiorcy."
 
 #. TRANS: Client error displayed trying to direct message another user who's not a friend (403).
-#, fuzzy
 msgid "Cannot send direct messages to users who aren't your friend."
 msgstr ""
-"Nie można wysłać bezpośredniej wiadomości do użytkowników, którzy nie są "
-"twoimi przyjaciółmi."
+"Nie można wysłać bezpośrednich wiadomości do użytkowników, którzy nie są "
+"znajomymi."
 
 #. TRANS: Client error displayed trying to direct message self (403).
+#. TRANS: Client error displayed trying to send a direct message to self.
+#. TRANS: Error text shown when trying to send a direct message to self.
 msgid ""
 "Do not send a message to yourself; just say it to yourself quietly instead."
 msgstr "Nie wysyłaj wiadomości do siebie, po prostu powiedz to sobie po cichu."
@@ -741,7 +734,6 @@ msgstr "grupy na %s"
 
 #. TRANS: Client error displayed when trying to edit a group without being an admin.
 #. TRANS: Client error displayed trying to edit a group while not being a group admin.
-#. TRANS: Client error displayed trying to change group design settings without being a (group) admin.
 #. TRANS: Client error displayed when trying to change group logo settings while not being a group admin.
 msgid "You must be an admin to edit the group."
 msgstr "Musisz być administratorem, aby zmodyfikować grupę."
@@ -770,62 +762,55 @@ msgstr "Alias nie może być taki sam jak pseudonim."
 #. TRANS: Client error displayed when referring to a non-existing list.
 #. TRANS: Client error displayed trying to perform an action related to a non-existing list.
 #. TRANS: Client error displayed when referring to a non-existing list.
-#, fuzzy
 msgid "List not found."
-msgstr "Nie odnaleziono strony."
+msgstr "Nie odnaleziono listy."
 
 #. TRANS: Client error displayed when trying to update another user's list.
 msgid "You cannot update lists that do not belong to you."
-msgstr ""
+msgstr "Nie możesz zaktualizować list, które nie należą do Ciebie."
 
 #. TRANS: Client error displayed when an unknown error occurs updating a list.
 #. TRANS: Client error displayed when an unknown error occurs viewing list members.
 #. TRANS: Client error displayed when an unknown error occurs in the list subscribers action.
 #. TRANS: Client error displayed when an unknown error occurs unsubscribing from a list.
 msgid "An error occured."
-msgstr ""
+msgstr "Wystąpił błąd."
 
 #. TRANS: Client error displayed when trying to delete another user's list.
 msgid "You cannot delete lists that do not belong to you."
-msgstr ""
+msgstr "Nie możesz usunąć list, które nie należą do Ciebie."
 
 #. TRANS: Client error displayed when referring to a non-list member.
-#, fuzzy
 msgid "The specified user is not a member of this list."
-msgstr "Użytkownik nie jest członkiem grupy."
+msgstr "Użytkownik nie jest członkiem listy."
 
 #. TRANS: Client error displayed when trying to add members to a list without having the right to do so.
-#, fuzzy
 msgid "You are not allowed to add members to this list."
-msgstr "Brak uprawnienia do tworzenia grup w tej witrynie."
+msgstr "Nie masz uprawnień do dodawania nowych członków do listy."
 
 #. TRANS: Client error displayed when trying to modify list members without specifying them.
-#, fuzzy
 msgid "You must specify a member."
-msgstr "Brak profilu."
+msgstr "Musisz określić członka."
 
 #. TRANS: Client error displayed when trying to remove members from a list without having the right to do so.
-#, fuzzy
 msgid "You are not allowed to remove members from this list."
-msgstr "Brak uprawnienia do tworzenia grup w tej witrynie."
+msgstr "Nie masz uprawnień do usuwania członków z listy."
 
 #. TRANS: Client error displayed when trying to remove a list member that is not part of a list.
 msgid "The user you are trying to remove from the list is not a member."
-msgstr ""
+msgstr "Użytkownika, którego próbujesz usunąć z listy nie jest jej członkiem."
 
 #. TRANS: Client error displayed when trying to create a list without a name.
-#, fuzzy
 msgid "A list must have a name."
-msgstr "Wpis Atom musi być wpisem Atom."
+msgstr "Lista musi mieć nazwę."
 
 #. TRANS: Client error displayed when a membership check for a user is nagative.
 msgid "The specified user is not a subscriber of this list."
-msgstr ""
+msgstr "Wskazany użytkownik nie jest członkiem listy."
 
 #. TRANS: Client error displayed when trying to unsubscribe from a non-subscribed list.
-#, fuzzy
 msgid "You are not subscribed to this list."
-msgstr "Nie jesteÅ› subskrybowany do tego profilu."
+msgstr "Nie subskrybujesz tej listy."
 
 #. TRANS: Client error displayed when uploading a media file has failed.
 msgid "Upload failed."
@@ -857,7 +842,6 @@ msgstr "BÅ‚Ä…d bazy danych podczas wprowadzania oauth_token_association."
 
 #. TRANS: Client error given on when invalid data was passed through a form in the OAuth API.
 #. TRANS: Unexpected validation error on avatar upload form.
-#. TRANS: Client error displayed when the submitted form contains unexpected data.
 #. TRANS: Client error displayed submitting invalid form data for edit application.
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
 #. TRANS: Form validation error message when an unsupported argument is used.
@@ -866,7 +850,6 @@ msgstr "BÅ‚Ä…d bazy danych podczas wprowadzania oauth_token_association."
 #. TRANS: Client error when submitting a form with unexpected information.
 #. TRANS: Client error displayed when unexpected data is posted in the password recovery form.
 #. TRANS: Message given submitting a form with an unknown action in SMS settings.
-#. TRANS: Unknown form validation error in design settings form.
 msgid "Unexpected form submission."
 msgstr "Nieoczekiwane wysłanie formularza."
 
@@ -911,7 +894,6 @@ msgstr "Konto"
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Field label on account registration page.
-#. TRANS: Label for nickname on user authorisation page.
 #. TRANS: Field label on group edit form.
 #. TRANS: Dropdown option for searching in profiles.
 msgid "Nickname"
@@ -1008,7 +990,7 @@ msgstr "Metoda HTTP nie jest obsługiwana."
 
 #. TRANS: Exception thrown requesting an unsupported notice output format.
 #. TRANS: %s is the requested output format.
-#, fuzzy, php-format
+#, php-format
 msgid "Unsupported format: %s."
 msgstr "Nieobsługiwany format: %s"
 
@@ -1088,9 +1070,9 @@ msgstr "Użytkownik %1$s aktualizuje ulubione według %2$s/%3$s."
 
 #. TRANS: Server error displayed whe trying to get a timeline fails.
 #. TRANS: %s is the error message.
-#, fuzzy, php-format
+#, php-format
 msgid "Could not generate feed for list - %s"
-msgstr "Nie można utworzyć tokenów loginów dla %s"
+msgstr "Nie można utworzyć kanału dla listy - %s"
 
 #. TRANS: Title for timeline of most recent mentions of a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user nickname.
@@ -1127,9 +1109,9 @@ msgstr "Powtórzone dla %s"
 
 #. TRANS: Subtitle for API action that shows most recent notices that are repeats in user's inbox.
 #. TRANS: %1$s is the sitename, %2$s is a user nickname, %3$s is a user profile name.
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s notices that were to repeated to %2$s / %3$s."
-msgstr "%1$s aktualizuje tę odpowiedź na aktualizacje od %2$s/%3$s."
+msgstr "Ogłoszenia %1$s powtórzone dla %2$s / %3$s."
 
 #. TRANS: Title of list of repeated notices of the logged in user.
 #. TRANS: %s is the nickname of the logged in user.
@@ -1139,9 +1121,9 @@ msgstr "Powtórzenia %s"
 
 #. TRANS: Subtitle of API time with retweets of me.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is the user nickname, %3$s is the user profile name.
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s notices that %2$s / %3$s has repeated."
-msgstr "Użytkownik %1$s oznaczył wpis %2$s jako ulubiony."
+msgstr "Ogłoszenia %1$s, które powtórzył %2$s / %3$s."
 
 #. TRANS: Title for timeline with lastest notices with a given tag.
 #. TRANS: %s is the tag.
@@ -1228,12 +1210,9 @@ msgstr "Musisz być zalogowany, aby opuścić grupę."
 #. TRANS: Client error displayed when requesting Friends of a Friend feed for a nickname that is not a group.
 #. TRANS: Client error displayed trying to block a user from a group while specifying a non-existing group.
 #. TRANS: Client error displayed referring to a group's permalink for a non-existing group ID.
-#. TRANS: Client error displayed trying to change group design settings while providing a nickname for a non-existing group.
 #. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
 #. TRANS: Client error displayed when trying to view group members for a non-existing group.
 #. TRANS: Client error displayed when trying to view group members for an object that is not a group.
-#. TRANS: Client error displayed when trying to view group members for a non-existing group.
-#. TRANS: Client error displayed when trying to view group members for an object that is not a group.
 #. TRANS: Client error displayed when requesting a group RSS feed for group that does not exist.
 #. TRANS: Client error displayed when requesting a group RSS feed for an object that is not a group.
 #. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
@@ -1242,10 +1221,10 @@ msgstr "Musisz być zalogowany, aby opuścić grupę."
 #. TRANS: Client error displayed when trying to leave a non-local group.
 #. TRANS: Client error displayed when trying to leave a non-existing group.
 #. TRANS: Client error displayed when providing an invalid group ID on the Make Admin page.
-#. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
-#. TRANS: Client error displayed if no local group with a given name was found requesting group page.
 #. TRANS: Command exception text shown when a group is requested that does not exist.
 #. TRANS: Error text shown when trying to leave a group that does not exist.
+#. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
+#. TRANS: Client error displayed if no local group with a given name was found requesting group page.
 msgid "No such group."
 msgstr "Nie ma takiej grupy."
 
@@ -1258,94 +1237,95 @@ msgstr "Brak pseudonimu lub identyfikatora."
 
 #. TRANS: Client error displayed trying to approve group membership while not logged in.
 #. TRANS: Client error displayed when trying to leave a group while not logged in.
-#, fuzzy
 msgid "Must be logged in."
-msgstr "Niezalogowany."
+msgstr "Musisz być zalogowany."
 
 #. TRANS: Client error displayed trying to approve group membership while not a group administrator.
 #. TRANS: Client error displayed when trying to approve or cancel a group join request without
 #. TRANS: being a group administrator.
 msgid "Only group admin can approve or cancel join requests."
 msgstr ""
+"Tylko administrator grupy może zatwierdzić lub anulować żądania dołączenia."
 
 #. TRANS: Client error displayed trying to approve group membership without specifying a profile to approve.
 #. TRANS: Client error displayed trying to approve subscriptionswithout specifying a profile to approve.
-#, fuzzy
 msgid "Must specify a profile."
-msgstr "Brak profilu."
+msgstr "Należy określić profil."
 
 #. TRANS: Client error displayed trying to approve group membership for a non-existing request.
 #. TRANS: %s is a nickname.
 #. TRANS: Client error displayed when trying to approve a non-existing group join request.
 #. TRANS: %s is a user nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "%s is not in the moderation queue for this group."
-msgstr "Lista użytkowników znajdujących się w tej grupie."
+msgstr "%s nie znajduje siÄ™ w kolejce moderacji dla tej grupy."
 
 #. TRANS: Client error displayed trying to approve/deny group membership.
 #. TRANS: Client error displayed trying to approve/deny subscription.
 msgid "Internal error: received neither cancel nor abort."
-msgstr ""
+msgstr "Błąd wewnętrzny: nie otrzymano ani wycofania ani przerwania."
 
 #. TRANS: Client error displayed trying to approve/deny group membership.
 #. TRANS: Client error displayed trying to approve/deny  subscription
 msgid "Internal error: received both cancel and abort."
-msgstr ""
+msgstr "Błąd wewnętrzny: otrzymano jednocześnie wycofanie i przerwanie."
 
 #. TRANS: Server error displayed when cancelling a queued group join request fails.
 #. TRANS: %1$s is the leaving user's nickname, $2$s is the group nickname for which the leave failed.
-#, fuzzy, php-format
+#, php-format
 msgid "Could not cancel request for user %1$s to join group %2$s."
-msgstr "Nie można dołączyć użytkownika %1$s do grupy %2$s."
+msgstr ""
+"Nie można anulować żądania użytkownika %1$s by przyłączyć się do grupy %2$s ."
 
 #. TRANS: Title for leave group page after group join request is approved/disapproved.
 #. TRANS: %1$s is the user nickname, %2$s is the group nickname.
-#, fuzzy, php-format
+#, php-format
 msgctxt "TITLE"
 msgid "%1$s's request for %2$s"
-msgstr "Stan użytkownika %1$s na %2$s"
+msgstr "Żądanie użytkownika %1$s by %2$s"
 
 #. TRANS: Message on page for group admin after approving a join request.
 msgid "Join request approved."
-msgstr ""
+msgstr "Żądanie dołączenia zatwierdzone."
 
 #. TRANS: Message on page for group admin after rejecting a join request.
 msgid "Join request canceled."
-msgstr ""
+msgstr "Żądanie dołączenia anulowane."
 
 #. TRANS: Client error displayed trying to approve subscription for a non-existing request.
-#, fuzzy, php-format
+#. TRANS: %s is a user nickname.
+#, php-format
 msgid "%s is not in the moderation queue for your subscriptions."
-msgstr "Lista użytkowników znajdujących się w tej grupie."
+msgstr "%s nie jest w kolejce moderacji twojej subskrypcji."
 
 #. TRANS: Server error displayed when cancelling a queued subscription request fails.
 #. TRANS: %1$s is the leaving user's nickname, $2$s is the nickname for which the leave failed.
-#, fuzzy, php-format
+#, php-format
 msgid "Could not cancel or approve request for user %1$s to join group %2$s."
-msgstr "Nie można dołączyć użytkownika %1$s do grupy %2$s."
+msgstr ""
+"Nie można anulować ani zatwierdzić żądania dołączenia użytkownika %1$s do "
+"grupy %2$s."
 
 #. TRANS: Title for subscription approval ajax return
 #. TRANS: %1$s is the approved user's nickname
-#, fuzzy, php-format
+#, php-format
 msgctxt "TITLE"
 msgid "%1$s's request"
-msgstr "Stan użytkownika %1$s na %2$s"
+msgstr "żądanie użytkownika %1$s"
 
 #. TRANS: Message on page for user after approving a subscription request.
-#, fuzzy
 msgid "Subscription approved."
-msgstr "Upoważniono subskrypcję"
+msgstr "Zatwierdzono subskrypcjÄ™."
 
 #. TRANS: Message on page for user after rejecting a subscription request.
-#, fuzzy
 msgid "Subscription canceled."
-msgstr "Anulowano upoważnienie."
+msgstr "Subskrypcja anulowana."
 
 #. TRANS: Subtitle for Atom favorites feed.
 #. TRANS: %1$s is a user nickname, %2$s is the StatusNet sitename.
-#, fuzzy, php-format
+#, php-format
 msgid "Notices %1$s has favorited on %2$s"
-msgstr "Aktualizacje z %1$s i przyjaciół na %2$s."
+msgstr "Ogłoszenia z %1$s i zaliczono do ulubionych na %2$s"
 
 #. TRANS: Client exception thrown when trying to set a favorite for another user.
 #. TRANS: Client exception thrown when trying to subscribe another user.
@@ -1361,9 +1341,8 @@ msgid "Can only fave notices."
 msgstr "Można tylko dodawać wpisy do ulubionych."
 
 #. TRANS: Client exception thrown when trying favorite a notice without content.
-#, fuzzy
 msgid "Unknown notice."
-msgstr "Nieznany wpis."
+msgstr "Nieznane ogłoszenie."
 
 #. TRANS: Client exception thrown when trying favorite an already favorited notice.
 msgid "Already a favorite."
@@ -1371,15 +1350,15 @@ msgstr "Jest już ulubiony."
 
 #. TRANS: Title for group membership feed.
 #. TRANS: %s is a username.
-#, fuzzy, php-format
+#, php-format
 msgid "Group memberships of %s"
-msgstr "%s członków grupy"
+msgstr "Przynależność użytkownika %s do grupy"
 
 #. TRANS: Subtitle for group membership feed.
 #. TRANS: %1$s is a username, %2$s is the StatusNet sitename.
-#, fuzzy, php-format
+#, php-format
 msgid "Groups %1$s is a member of on %2$s"
-msgstr "Grupy %s są członkiem"
+msgstr "Grupy, do których przynależy %1$s na %2$s"
 
 #. TRANS: Client exception thrown when trying subscribe someone else to a group.
 msgid "Cannot add someone else's membership."
@@ -1435,9 +1414,9 @@ msgstr "Nie można usunąć subskrypcji innej osoby."
 
 #. TRANS: Subtitle for Atom subscription feed.
 #. TRANS: %1$s is a user nickname, %s$s is the StatusNet sitename.
-#, fuzzy, php-format
+#, php-format
 msgid "People %1$s has subscribed to on %2$s"
-msgstr "Osoby subskrybowane do %s"
+msgstr "Osoba %1$s subskrybowana do %2$s"
 
 #. TRANS: Client error displayed when not using the follow verb.
 msgid "Can only handle Follow activities."
@@ -1466,7 +1445,6 @@ msgstr "Nie ma takiego załącznika."
 #. TRANS: Client error displayed trying to get an avatar without providing a nickname.
 #. TRANS: Client error displayed when requesting a list of blocked users for a group without providing a group nickname.
 #. TRANS: Client error displayed trying to edit a group while not proving a nickname for the group to edit.
-#. TRANS: Client error displayed trying to change group design settings without providing a group nickname.
 #. TRANS: Client error displayed when trying to change group logo settings without providing a nickname.
 #. TRANS: Client error displayed when trying to view group members without providing a group nickname.
 #. TRANS: Client error displayed when requesting a group RSS feed without providing a group nickname.
@@ -1537,9 +1515,8 @@ msgid "No file uploaded."
 msgstr "Nie wysłano pliku."
 
 #. TRANS: Avatar upload form instruction after uploading a file.
-#, fuzzy
 msgid "Pick a square area of the image to be your avatar."
-msgstr "Wybierz kwadratowy obszar obrazu do awatara"
+msgstr "Wybierz kwadratowy obszar obrazu, który stanie się awatarem."
 
 #. TRANS: Server error displayed if an avatar upload went wrong somehow server side.
 #. TRANS: Server error displayed trying to crop an uploaded group logo that is no longer present.
@@ -1593,9 +1570,8 @@ msgid "Backup"
 msgstr "Kopia zapasowa"
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
-#, fuzzy
 msgid "Backup your account."
-msgstr "Wykonuje kopiÄ™ zapasowÄ… konta"
+msgstr "Kopia zapasowa Twojego konta."
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
 msgid "You already blocked that user."
@@ -1628,9 +1604,8 @@ msgid "No"
 msgstr "Nie"
 
 #. TRANS: Submit button title for 'No' when blocking a user.
-#, fuzzy
 msgid "Do not block this user."
-msgstr "Nie blokuj tego użytkownika"
+msgstr "Nie blokuj tego użytkownika."
 
 #. TRANS: Button label on the user block form.
 #. TRANS: Button label on the delete application form.
@@ -1644,9 +1619,8 @@ msgid "Yes"
 msgstr "Tak"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
-#, fuzzy
 msgid "Block this user."
-msgstr "Zablokuj tego użytkownika"
+msgstr "Zablokuj tego użytkownika."
 
 #. TRANS: Server error displayed when blocking a user fails.
 msgid "Failed to save block information."
@@ -1713,10 +1687,9 @@ msgid "No profile with that ID."
 msgstr "Brak profilu o tym identyfikatorze."
 
 #. TRANS: Title after unsubscribing from a group.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Unsubscribed"
-msgstr "Zrezygnowano z subskrypcji"
+msgstr "Zrezygnowano z subskrypcji."
 
 #. TRANS: Client error displayed when not providing a confirmation code in the contact address confirmation action.
 msgid "No confirmation code."
@@ -1742,14 +1715,12 @@ msgstr "Ten adres został już potwierdzony."
 
 #. TRANS: Server error displayed when updating IM preferences fails.
 #. TRANS: Server error thrown on database error removing a registered IM address.
-#, fuzzy
 msgid "Could not update user IM preferences."
-msgstr "Nie można zaktualizować wpisu użytkownika."
+msgstr "Nie można zaktualizować preferencji IM użytkownika."
 
 #. TRANS: Server error displayed when adding IM preferences fails.
-#, fuzzy
 msgid "Could not insert user IM preferences."
-msgstr "Nie można wprowadzić nowej subskrypcji."
+msgstr "Nie można wstawić preferencji IM użytkownika."
 
 #. TRANS: Server error displayed when an address confirmation code deletion from the
 #. TRANS: database fails in the contact address confirmation action.
@@ -1770,12 +1741,21 @@ msgstr "Adres \"%s\" został potwierdzony dla twojego konta."
 msgid "Conversation"
 msgstr "Rozmowa"
 
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+msgid "Conversation feed (Activity Streams JSON)"
+msgstr "Kanał konwersacji (Activity Streams JSON)"
+
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+msgid "Conversation feed (RSS 2.0)"
+msgstr "Kanał konwersacji (RSS 2.0)"
+
 #. TRANS: Title for conversation page.
 #. TRANS: Title for page that shows a notice.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Notice"
-msgstr "Wpisy"
+msgstr "Ogłoszenie"
 
 #. TRANS: Client exception displayed trying to delete a user account while not logged in.
 msgid "Only logged-in users can delete their account."
@@ -1833,8 +1813,8 @@ msgid "Enter \"%s\" to confirm that you want to delete your account."
 msgstr "Proszę wpisać \"%s\", aby potwierdzić chęć usunięcia konta."
 
 #. TRANS: Button title for user account deletion.
-msgid "Permanently delete your account"
-msgstr "Trwale usuwa konto"
+msgid "Permanently delete your account."
+msgstr "Trwale usuwa twoje konto."
 
 #. TRANS: Client error displayed trying to delete an application while not logged in.
 msgid "You must be logged in to delete an application."
@@ -1870,14 +1850,12 @@ msgstr ""
 "danych, w tym wszystkie istniejące połączenia użytkowników."
 
 #. TRANS: Submit button title for 'No' when deleting an application.
-#, fuzzy
 msgid "Do not delete this application."
 msgstr "Nie usuwaj tej aplikacji"
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
-#, fuzzy
 msgid "Delete this application."
-msgstr "Usuń tę aplikację"
+msgstr "Usuń tę aplikację."
 
 #. TRANS: Client error when trying to delete group while not logged in.
 msgid "You must be logged in to delete a group."
@@ -1915,14 +1893,12 @@ msgstr ""
 "widoczne na konkretnych osiach czasu."
 
 #. TRANS: Submit button title for 'No' when deleting a group.
-#, fuzzy
 msgid "Do not delete this group."
-msgstr "Nie usuwaj tej grupy"
+msgstr "Nie usuwaj tej grupy."
 
 #. TRANS: Submit button title for 'Yes' when deleting a group.
-#, fuzzy
 msgid "Delete this group."
-msgstr "Usuń tę grupę"
+msgstr "Usuń tę grupę."
 
 #. TRANS: Instructions for deleting a notice.
 msgid ""
@@ -1942,12 +1918,10 @@ msgid "Are you sure you want to delete this notice?"
 msgstr "Jesteś pewien, że chcesz usunąć ten wpis?"
 
 #. TRANS: Submit button title for 'No' when deleting a notice.
-#, fuzzy
 msgid "Do not delete this notice."
-msgstr "Nie usuwaj tego wpisu"
+msgstr "Nie usuwaj tego ogłoszenia."
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#, fuzzy
 msgid "Delete this notice."
 msgstr "Usuń ten wpis"
 
@@ -1977,159 +1951,12 @@ msgstr ""
 "bazy danych, bez utworzenia kopii zapasowej."
 
 #. TRANS: Submit button title for 'No' when deleting a user.
-#, fuzzy
 msgid "Do not delete this user."
-msgstr "Nie usuwaj tego użytkownika"
+msgstr "Nie usuwaj tego użytkownika."
 
 #. TRANS: Submit button title for 'Yes' when deleting a user.
-#, fuzzy
 msgid "Delete this user."
-msgstr "Usuń tego użytkownika"
-
-#. TRANS: Message used as title for design settings for the site.
-msgid "Design"
-msgstr "WyglÄ…d"
-
-#. TRANS: Instructions for design adminsitration panel.
-msgid "Design settings for this StatusNet site"
-msgstr "Ustawienia wyglÄ…du tej witryny StatusNet"
-
-#. TRANS: Client error displayed when a logo URL does is not valid.
-msgid "Invalid logo URL."
-msgstr "Nieprawidłowy adres URL logo."
-
-#. TRANS: Client error displayed when an SSL logo URL is invalid.
-msgid "Invalid SSL logo URL."
-msgstr "Nieprawidłowy adres URL logo SSL."
-
-#. TRANS: Client error displayed when a theme is submitted through the form that is not in the theme list.
-#. TRANS: %s is the chosen unavailable theme.
-#, php-format
-msgid "Theme not available: %s."
-msgstr "Motyw nie jest dostępny: %s."
-
-#. TRANS: Fieldset legend for form to change logo.
-msgid "Change logo"
-msgstr "Zmień logo"
-
-#. TRANS: Field label for StatusNet site logo.
-msgid "Site logo"
-msgstr "Logo witryny"
-
-#. TRANS: Field label for SSL StatusNet site logo.
-msgid "SSL logo"
-msgstr "Logo SSL"
-
-#. TRANS: Fieldset legend for form change StatusNet site's theme.
-msgid "Change theme"
-msgstr "Zmień motyw"
-
-#. TRANS: Field label for dropdown to choose site theme.
-msgid "Site theme"
-msgstr "Motyw witryny"
-
-#. TRANS: Title for field label for dropdown to choose site theme.
-msgid "Theme for the site."
-msgstr "Motyw witryny."
-
-#. TRANS: Field label for uploading a cutom theme.
-msgid "Custom theme"
-msgstr "WÅ‚asny motyw"
-
-#. TRANS: Form instructions for uploading a cutom StatusNet theme.
-msgid "You can upload a custom StatusNet theme as a .ZIP archive."
-msgstr "Można wysłać własny motyw witryny StatusNet jako archiwum zip."
-
-#. TRANS: Fieldset legend for theme background image.
-msgid "Change background image"
-msgstr "Zmień obraz tła"
-
-#. TRANS: Field label for background image on theme designer page.
-#. TRANS: Field label for background color selector.
-#. TRANS: Label on profile design page for setting a profile page background colour.
-msgid "Background"
-msgstr "TÅ‚o"
-
-#. TRANS: Form guide for background image upload form on theme designer page.
-#, php-format
-msgid ""
-"You can upload a background image for the site. The maximum file size is %1"
-"$s."
-msgstr "Można wysłać obraz tła dla witryny. Maksymalny rozmiar pliku to %1$s."
-
-#. TRANS: Used as radio button label to add a background image.
-msgid "On"
-msgstr "WÅ‚Ä…czone"
-
-#. TRANS: Used as radio button label to not add a background image.
-msgid "Off"
-msgstr "Wyłączone"
-
-#. TRANS: Form guide for turning background image on or off on theme designer page.
-#. TRANS: Form guide for a set of radio buttons on the profile design page that will enable or disable
-#. TRANS: use of the uploaded profile image.
-msgid "Turn background image on or off."
-msgstr "Włącz lub wyłącz obraz tła."
-
-#. TRANS: Checkbox label to title background image on theme designer page.
-#. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
-msgid "Tile background image"
-msgstr "Kafelkowy obraz tła"
-
-#. TRANS: Fieldset legend for theme colors.
-msgid "Change colors"
-msgstr "Zmień kolory"
-
-#. TRANS: Field label for content color selector.
-#. TRANS: Label on profile design page for setting a profile page content colour.
-msgid "Content"
-msgstr "Treść"
-
-#. TRANS: Field label for sidebar color selector.
-#. TRANS: Label on profile design page for setting a profile page sidebar colour.
-msgid "Sidebar"
-msgstr "Panel boczny"
-
-#. TRANS: Field label for text color selector.
-#. TRANS: Label on profile design page for setting a profile page text colour.
-msgid "Text"
-msgstr "Tekst"
-
-#. TRANS: Field label for link color selector.
-#. TRANS: Label on profile design page for setting a profile page links colour.
-msgid "Links"
-msgstr "Odnośniki"
-
-#. TRANS: Fieldset legend for advanced theme design settings.
-msgid "Advanced"
-msgstr "Zaawansowane"
-
-#. TRANS: Field label for custom CSS.
-msgid "Custom CSS"
-msgstr "WÅ‚asny plik CSS"
-
-#. TRANS: Button text for resetting theme settings.
-msgctxt "BUTTON"
-msgid "Use defaults"
-msgstr "Użyj domyślne"
-
-#. TRANS: Title for button for resetting theme settings.
-#. TRANS: Title for button on profile design page to reset all colour settings to default.
-#, fuzzy
-msgid "Restore default designs."
-msgstr "Przywróć domyślny wygląd"
-
-#. TRANS: Title for button for resetting theme settings.
-#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#, fuzzy
-msgid "Reset back to default."
-msgstr "Przywróć domyślne ustawienia"
-
-#. TRANS: Title for button for saving theme settings.
-#. TRANS: Title for button on profile design page to save settings.
-#, fuzzy
-msgid "Save design."
-msgstr "Zapisz wyglÄ…d"
+msgstr "Usuń tego użytkownika."
 
 #. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
 msgid "This notice is not a favorite!"
@@ -2145,6 +1972,74 @@ msgstr "Dodaj do ulubionych"
 msgid "No such document \"%s\"."
 msgstr "Nie ma takiego dokumentu \\\"%s\\\"."
 
+#. TRANS: Menu item in administrator navigation panel.
+#. TRANS: Menu item in default local navigation panel.
+#. TRANS: Menu item in personal group navigation menu.
+msgctxt "MENU"
+msgid "Home"
+msgstr "Strona główna"
+
+msgctxt "MENU"
+msgid "Docs"
+msgstr "Dokumentacja"
+
+#. TRANS: Secondary navigation menu item leading to help on StatusNet.
+msgctxt "MENU"
+msgid "Help"
+msgstr "Pomoc"
+
+msgid "Getting started"
+msgstr "Pierwsze kroki"
+
+#. TRANS: Secondary navigation menu item leading to text about StatusNet site.
+msgctxt "MENU"
+msgid "About"
+msgstr "O usłudze"
+
+msgid "About this site"
+msgstr "O stronie"
+
+#. TRANS: Secondary navigation menu item leading to Frequently Asked Questions.
+msgctxt "MENU"
+msgid "FAQ"
+msgstr "FAQ"
+
+msgid "Frequently asked questions"
+msgstr "Często zadawane pytania"
+
+#. TRANS: Secondary navigation menu item leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+msgctxt "MENU"
+msgid "Contact"
+msgstr "Kontakt"
+
+msgid "Contact info"
+msgstr "Informacje o kontakcie"
+
+msgctxt "MENU"
+msgid "Tags"
+msgstr "Znaczniki"
+
+msgid "Using tags"
+msgstr "Używanie zniaczników"
+
+#. TRANS: Menu item in default local navigation panel.
+#. TRANS: Menu item in search group navigation panel.
+#. TRANS: Menu item in local navigation menu.
+msgctxt "MENU"
+msgid "Groups"
+msgstr "Grupy"
+
+msgid "Using groups"
+msgstr "Korzystanie z grup"
+
+msgctxt "MENU"
+msgid "API"
+msgstr "API"
+
+msgid "RESTful API"
+msgstr "API RESTful"
+
 #. TRANS: Title for "Edit application" form.
 #. TRANS: Form legend.
 msgid "Edit application"
@@ -2249,20 +2144,19 @@ msgstr "Zapisano opcje."
 
 #. TRANS: Title for edit list page after deleting a tag.
 #. TRANS: %s is a list.
-#, fuzzy, php-format
+#, php-format
 msgid "Delete %s list"
-msgstr "Usuń tego użytkownika"
+msgstr "Usuń  listę %s"
 
 #. TRANS: Title for edit list page.
 #. TRANS: %s is a list.
 #. TRANS: Form legend for list edit form.
 #. TRANS: %s is a list.
-#, fuzzy, php-format
+#, php-format
 msgid "Edit list %s"
-msgstr "Nieprawidłowy znacznik osób: %s."
+msgstr "Edytuj listÄ™ %s"
 
 #. TRANS: Error message displayed when trying to perform an action that requires a tagging user or ID.
-#, fuzzy
 msgid "No tagger or ID."
 msgstr "Brak pseudonimu lub identyfikatora."
 
@@ -2271,47 +2165,46 @@ msgid "Not a local user."
 msgstr "Brak takiego użytkownika."
 
 #. TRANS: Client error displayed when reting to edit a tag that was not self-created.
-#, fuzzy
 msgid "You must be the creator of the tag to edit it."
-msgstr "Musisz być administratorem, aby zmodyfikować grupę."
+msgstr "Musi być twórcą znacznika by go edytować."
 
 #. TRANS: Form instruction for edit list form.
-#, fuzzy
 msgid "Use this form to edit the list."
-msgstr "Użyj tego formularza, aby zmodyfikować grupę."
+msgstr "Użyj tego formularza, aby zmodyfikować listę."
 
 #. TRANS: Form validation error displayed if the form data for deleting a tag was incorrect.
-#, fuzzy
 msgid "Delete aborted."
-msgstr "Usuń wpis"
+msgstr "Usuwanie przerwane."
 
 #. TRANS: Text in confirmation dialog for deleting a tag.
 msgid ""
 "Deleting this tag will permanantly remove all its subscription and "
 "membership records. Do you still want to continue?"
 msgstr ""
+"Usunięcie tego tagu spowoduje trwałe usunięcie wszystkich jego subskrypcji i "
+"zapisów przynależności. Czy nadal chcesz kontynuować?"
 
 #. TRANS: Form validation error displayed if a given tag is invalid.
-#, fuzzy
 msgid "Invalid tag."
-msgstr "Nieprawidłowy rozmiar."
+msgstr "Nieprawidłowy znacznik."
 
 #. TRANS: Form validation error displayed if a given tag is already present.
 #. TRANS: %s is the already present tag.
-#, fuzzy, php-format
+#, php-format
 msgid "You already have a tag named %s."
-msgstr "Już powtórzono ten wpis."
+msgstr "Masz już znacznik o nazwie  %s."
 
 #. TRANS: Text in confirmation dialog for setting a tag from public to private.
 msgid ""
 "Setting a public tag as private will permanently remove all the existing "
 "subscriptions to it. Do you still want to continue?"
 msgstr ""
+"Ustawienie znacznika publicznego jako prywatnego spowoduje trwałe usunięcie "
+"wszystkich istniejących jego subskrypcji. Czy nadal chcesz kontynuować?"
 
-#. TRANS: TRANS: Server error displayed when updating a list fails.
-#, fuzzy
+#. TRANS: Server error displayed when updating a list fails.
 msgid "Could not update list."
-msgstr "Nie można zaktualizować użytkownika."
+msgstr "Nie można zaktualizować listy."
 
 #. TRANS: Title for e-mail settings.
 msgid "Email settings"
@@ -2437,9 +2330,8 @@ msgid "No email address."
 msgstr "Brak adresu e-mail."
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
-#, fuzzy
 msgid "Cannot normalize that email address."
-msgstr "Nie można znormalizować tego adresu e-mail"
+msgstr "Nie można znormalizować tego adresu e-mail."
 
 #. TRANS: Message given saving e-mail address that not valid.
 #. TRANS: Form validation error displayed when trying to register without a valid e-mail address.
@@ -2522,7 +2414,6 @@ msgid "This notice is already a favorite!"
 msgstr "Ten wpis jest już ulubiony."
 
 #. TRANS: Page title for page on which favorite notices can be unfavourited.
-#, fuzzy
 msgid "Disfavor favorite."
 msgstr "Usuń wpis z ulubionych"
 
@@ -2595,7 +2486,7 @@ msgid "Featured users, page %d"
 msgstr "Znani użytkownicy, strona %d"
 
 #. TRANS: Description on page displaying featured users.
-#, fuzzy, php-format
+#, php-format
 msgid "A selection of some great users on %s."
 msgstr "Wybór znanych użytkowników w serwisie %s"
 
@@ -2616,40 +2507,6 @@ msgstr "Brak załączników."
 msgid "No uploaded attachments."
 msgstr "Nie wysłano załączników."
 
-#. TRANS: Client error displayed when subscribing to a remote profile and an unexpected response is received.
-msgid "Not expecting this response!"
-msgstr "Nieoczekiwana odpowiedź."
-
-#. TRANS: Client error displayed when subscribing to a remote profile that does not exist.
-msgid "User being listened to does not exist."
-msgstr "Nasłuchiwany użytkownik nie istnieje."
-
-#. TRANS: Client error displayed when subscribing to a remote profile that is a local profile.
-#. TRANS: Client error displayed when using remote subscribe for a local entity.
-msgid "You can use the local subscription!"
-msgstr "Można używać lokalnej subskrypcji."
-
-#. TRANS: Client error displayed when subscribing to a remote profile that is blocked form subscribing to.
-msgid "That user has blocked you from subscribing."
-msgstr "Ten użytkownik zablokował cię z subskrypcji."
-
-#. TRANS: Client error displayed when subscribing to a remote profile without providing an authorised token.
-msgid "You are not authorized."
-msgstr "Brak upoważnienia."
-
-#. TRANS: Client error displayed when subscribing to a remote profile and conversion of the request token to access token fails.
-msgid "Could not convert request token to access token."
-msgstr "Nie można przekonwertować tokenów żądań na tokeny dostępu."
-
-#. TRANS: Client error displayed when subscribing to a remote profile fails because of an unsupported version of the OMB protocol.
-msgid "Remote service uses unknown version of OMB protocol."
-msgstr "Zdalna usługa używa nieznanej wersji protokołu OMB."
-
-#. TRANS: Server error displayed when subscribing to a remote profile fails because the remote profile could not be updated.
-#. TRANS: Exception thrown when updating a remote profile fails in OAuth store.
-msgid "Error updating remote profile."
-msgstr "BÅ‚Ä…d podczas aktualizowania zdalnego profilu."
-
 #. TRANS: Client error displayed when requesting a non-existent file.
 msgid "No such file."
 msgstr "Nie ma takiego pliku."
@@ -2720,12 +2577,10 @@ msgstr ""
 "grupy w przyszłości."
 
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
-#, fuzzy
 msgid "Do not block this user from this group."
-msgstr "Nie blokuj tego użytkownika w tej grupie"
+msgstr "Nie blokuj tego użytkownika z tej grupy."
 
 #. TRANS: Submit button title for 'Yes' when blocking a user from a group.
-#, fuzzy
 msgid "Block this user from this group."
 msgstr "Zablokuj tego użytkownika w tej grupie"
 
@@ -2739,30 +2594,6 @@ msgstr "Błąd bazy danych podczas blokowania użytkownika w grupie."
 msgid "No ID."
 msgstr "Brak identyfikatora."
 
-#. TRANS: Client error displayed trying to change group design settings while not logged in.
-msgid "You must be logged in to edit a group."
-msgstr "Musisz być zalogowany, aby zmodyfikować grupę."
-
-#. TRANS: Title group design settings page.
-msgid "Group design"
-msgstr "WyglÄ…d grupy"
-
-#. TRANS: Instructions for group design settings page.
-msgid ""
-"Customize the way your group looks with a background image and a colour "
-"palette of your choice."
-msgstr "Dostosuj wygląd grupy za pomocą wybranego obrazu tła i palety kolorów."
-
-#. TRANS: Form validation error displayed when group design settings could not be updated because of an application issue.
-#, fuzzy
-msgid "Unable to update your design settings."
-msgstr "Nie można zapisać ustawień wyglądu."
-
-#. TRANS: Form text to confirm saved group design settings.
-#. TRANS: Confirmation message on Profile design page when saving design settings has succeeded.
-msgid "Design preferences saved."
-msgstr "Zapisano preferencje wyglÄ…du."
-
 #. TRANS: Title for group logo settings page.
 #. TRANS: Group logo form legend.
 msgid "Group logo"
@@ -2813,24 +2644,24 @@ msgstr "Lista użytkowników znajdujących się w tej grupie."
 
 #. TRANS: Client error displayed when trying to approve group applicants without being a group administrator.
 msgid "Only the group admin may approve users."
-msgstr ""
+msgstr "Tylko administrator grupy może zatwierdzać użytkowników."
 
 #. TRANS: Title of the first page showing pending group members still awaiting approval to join the group.
 #. TRANS: %s is the name of the group.
-#, fuzzy, php-format
+#, php-format
 msgid "%s group members awaiting approval"
-msgstr "%s członków grupy"
+msgstr "członkowie grupy %s oczekują na zatwierdzenie"
 
 #. TRANS: Title of all but the first page showing pending group members still awaiting approval to join the group.
 #. TRANS: %1$s is the name of the group, %2$d is the page number of the members list.
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s group members awaiting approval, page %2$d"
-msgstr "Członkowie grupy %1$s, strona %2$d"
+msgstr "Członkowie grupy %1$s oczekujący na zatwierdzenie, strona %2$d"
 
 #. TRANS: Page notice for group members page.
-#, fuzzy
 msgid "A list of users awaiting approval to join this group."
-msgstr "Lista użytkowników znajdujących się w tej grupie."
+msgstr ""
+"Lista użytkowników czekających na zatwierdzenie członkostwa w tej grupie."
 
 #. TRANS: Message is used as link description. %1$s is a group name, %2$s is a site name.
 #, php-format
@@ -2838,14 +2669,13 @@ msgid "Updates from members of %1$s on %2$s!"
 msgstr "Aktualizacje od członków %1$s na %2$s."
 
 #. TRANS: Title for first page of the groups list.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Groups"
 msgstr "Grupy"
 
 #. TRANS: Title for all but the first page of the groups list.
 #. TRANS: %d is the page number.
-#, fuzzy, php-format
+#, php-format
 msgctxt "TITLE"
 msgid "Groups, page %d"
 msgstr "Grupy, strona %d"
@@ -2853,7 +2683,7 @@ msgstr "Grupy, strona %d"
 #. TRANS: Page notice of group list. %%%%site.name%%%% is the StatusNet site name,
 #. TRANS: %%%%action.groupsearch%%%% and %%%%action.newgroup%%%% are URLs. Do not change them.
 #. TRANS: This message contains Markdown links in the form [link text](link).
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "%%%%site.name%%%% groups let you find and talk with people of similar "
 "interests. After you join a group you can send messages to all other members "
@@ -2895,13 +2725,13 @@ msgstr "Brak wyników."
 
 #. TRANS: Additional text on page where groups can be searched if no results were found for a query for a logged in user.
 #. TRANS: This message contains Markdown links in the form [link text](link).
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "If you cannot find the group you're looking for, you can [create it](%%"
 "action.newgroup%%) yourself."
 msgstr ""
-"Jeśli nie można odnaleźć grupy, której szukasz, można samemu [ją utworzyć](%%"
-"action.newgroup%%)."
+"Jeśli nie można odnaleźć grupy, której szukasz, możesz samodzielnie [ją "
+"utworzyć](%%action.newgroup%%)."
 
 #. TRANS: Additional text on page where groups can be searched if no results were found for a query for a not logged in user.
 #. TRANS: This message contains Markdown links in the form [link text](link).
@@ -2933,32 +2763,32 @@ msgstr "Ustawienia komunikatora"
 #. TRANS: Instant messaging settings page instructions.
 #. TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link.
 #. TRANS: the order and formatting of link text and link should remain unchanged.
-#, fuzzy, php-format
+#, php-format
 msgid ""
-"You can send and receive notices through instant messaging [instant messages]"
-"(%%doc.im%%). Configure your addresses and settings below."
+"You can send and receive notices through [instant messaging](%%doc.im%%). "
+"Configure your addresses and settings below."
 msgstr ""
-"Można wysyłać i odbierać wpisy przez [komunikator](%%doc.im%%) Jabber/GTalk. "
-"Skonfiguruj adres i ustawienia poniżej."
+"Możesz wysyłać i odbierać wpisy przez [komunikator](%%doc.im%%) Jabber/"
+"GTalk. Skonfiguruj adres i ustawienia poniżej."
 
 #. TRANS: Message given in the IM settings if IM is not enabled on the site.
 msgid "IM is not available."
 msgstr "Komunikator nie jest dostępny."
 
 #. TRANS: Form note in IM settings form. %s is the type of IM address that was confirmed.
-#, fuzzy, php-format
+#, php-format
 msgid "Current confirmed %s address."
-msgstr "Obecnie potwierdzone adresy e-mail."
+msgstr "Obecnie potwierdzony adres %s."
 
 #. TRANS: Form note in IM settings form.
 #. TRANS: %s is the IM service name, %2$s is the IM address set.
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your %1$s account for a message "
 "with further instructions. (Did you add %2$s to your buddy list?)"
 msgstr ""
-"Oczekiwanie na potwierdzenie tego adresu. Sprawdź swoje konto Jabber/GTalk, "
-"czy otrzymałeś wiadomość z dalszymi instrukcjami (dodałeś %s do listy "
+"Oczekiwanie na potwierdzenie tego adresu. Sprawdź swoje konto %1$s, czy jest "
+"nowa wiadomość wiadomość z dalszymi instrukcjami (dodałeś %2$s do listy "
 "znajomych?)."
 
 #. TRANS: Field label for IM address.
@@ -2968,38 +2798,31 @@ msgstr "Adres komunikatora"
 #. TRANS: Field title for IM address. %s is the IM service name.
 #, php-format
 msgid "%s screenname."
-msgstr ""
+msgstr "Pseudonim %s"
 
 #. TRANS: Header for IM preferences form.
-#, fuzzy
 msgid "IM Preferences"
 msgstr "Preferencje komunikatora"
 
 #. TRANS: Checkbox label in IM preferences form.
-#, fuzzy
 msgid "Send me notices"
-msgstr "Wyślij wpis"
+msgstr "Wysyłaj do mnie wpisy"
 
 #. TRANS: Checkbox label in IM preferences form.
-#, fuzzy
 msgid "Post a notice when my status changes."
-msgstr "Wyślij wpis, kiedy zmieni się mój stan na Jabber/GTalk."
+msgstr "Wyślij powiadomienie gdy zmieni się mój status."
 
 #. TRANS: Checkbox label in IM preferences form.
-#, fuzzy
 msgid "Send me replies from people I'm not subscribed to."
-msgstr ""
-"Wyślij mi odpowiedzi przez Jabber/GTalk od osób, których nie subskrybuję."
+msgstr "Wyślij mi odpowiedzi od osób, których nie subskrybcjuję."
 
 #. TRANS: Checkbox label in IM preferences form.
-#, fuzzy
 msgid "Publish a MicroID"
 msgstr "Opublikuj MicroID adresu e-mail."
 
 #. TRANS: Server error thrown on database error updating IM preferences.
-#, fuzzy
 msgid "Could not update IM preferences."
-msgstr "Nie można zaktualizować użytkownika."
+msgstr "Nie można zaktualizować preferencji komunikatorów."
 
 #. TRANS: Confirmation message for successful IM preferences save.
 #. TRANS: Confirmation message after saving preferences.
@@ -3007,45 +2830,36 @@ msgid "Preferences saved."
 msgstr "Zapisano preferencje."
 
 #. TRANS: Message given saving IM address without having provided one.
-#, fuzzy
 msgid "No screenname."
 msgstr "Brak pseudonimu."
 
 #. TRANS: Form validation error when no transport is available setting an IM address.
-#, fuzzy
 msgid "No transport."
-msgstr "Brak wpisu."
+msgstr "Brak transportu."
 
 #. TRANS: Message given saving IM address that cannot be normalised.
-#, fuzzy
 msgid "Cannot normalize that screenname."
 msgstr "Nie można znormalizować tego identyfikatora Jabbera"
 
 #. TRANS: Message given saving IM address that not valid.
-#, fuzzy
 msgid "Not a valid screenname."
 msgstr "To nie jest prawidłowy pseudonim."
 
 #. TRANS: Message given saving IM address that is already set for another user.
-#, fuzzy
 msgid "Screenname already belongs to another user."
-msgstr "Identyfikator Jabbera należy już do innego użytkownika."
+msgstr "Pseudonim należy już do innego użytkownika."
 
 #. TRANS: Message given saving valid IM address that is to be confirmed.
-#, fuzzy
 msgid "A confirmation code was sent to the IM address you added."
-msgstr ""
-"Kod potwierdzający został wysłany na dodany adres komunikatora. Należy "
-"zaakceptować otrzymywanie wiadomości od %s."
+msgstr "Kod potwierdzający został wysłany na dodany adres komunikatora."
 
 #. TRANS: Message given canceling IM address confirmation for the wrong IM address.
 msgid "That is the wrong IM address."
 msgstr "To jest błędny adres komunikatora."
 
 #. TRANS: Server error thrown on database error canceling IM address confirmation.
-#, fuzzy
 msgid "Could not delete confirmation."
-msgstr "Nie można usunąć potwierdzenia komunikatora."
+msgstr "Nie można usunąć potwierdzenia."
 
 #. TRANS: Message given after successfully canceling IM address confirmation.
 msgid "IM confirmation cancelled."
@@ -3053,9 +2867,8 @@ msgstr "Anulowano potwierdzenie komunikatora."
 
 #. TRANS: Message given trying to remove an IM address that is not
 #. TRANS: registered for the active user.
-#, fuzzy
 msgid "That is not your screenname."
-msgstr "To nie jest twój numer telefonu."
+msgstr "To nie jest twój pseudonim."
 
 #. TRANS: Message given after successfully removing a registered Instant Messaging address.
 msgid "The IM address was removed."
@@ -3159,29 +2972,6 @@ msgstr ""
 "Użyj tego formularza, aby zaprosić przyjaciół i kolegów do używania tej "
 "usługi."
 
-#. TRANS: Field label for a list of e-mail addresses.
-msgid "Email addresses"
-msgstr "Adresy e-mail"
-
-#. TRANS: Tooltip for field label for a list of e-mail addresses.
-#, fuzzy
-msgid "Addresses of friends to invite (one per line)."
-msgstr "Adresy przyjaciół, których zapraszasz (jeden na wiersz)"
-
-#. TRANS: Field label for a personal message to send to invitees.
-msgid "Personal message"
-msgstr "Osobista wiadomość"
-
-#. TRANS: Tooltip for field label for a personal message to send to invitees.
-msgid "Optionally add a personal message to the invitation."
-msgstr "Opcjonalnie dodaj osobistą wiadomość do zaproszenia."
-
-#. TRANS: Send button for inviting friends
-#. TRANS: Button text for sending notice.
-msgctxt "BUTTON"
-msgid "Send"
-msgstr "Wyślij"
-
 #. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral
 #. TRANS: singular 3rd-person pronoun in English. %1$s is the inviting user, $2$s is
 #. TRANS: the StatusNet sitename.
@@ -3200,9 +2990,8 @@ msgid "%1$s joined group %2$s"
 msgstr "Użytkownik %1$s dołączył do grupy %2$s"
 
 #. TRANS: Exception thrown when there is an unknown error joining a group.
-#, fuzzy
 msgid "Unknown error joining group."
-msgstr "Nieznana grupa."
+msgstr "Nieznany błąd dołączenia do grupy."
 
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
@@ -3272,9 +3061,8 @@ msgid "Type"
 msgstr "Typ"
 
 #. TRANS: Dropdown field instructions in the license admin panel.
-#, fuzzy
 msgid "Select a license."
-msgstr "Wybierz licencjÄ™"
+msgstr "Wybierz licencjÄ™."
 
 #. TRANS: Form legend in the license admin panel.
 msgid "License details"
@@ -3313,16 +3101,9 @@ msgid "URL for an image to display with the license."
 msgstr "Adres URL obrazu do wyświetlenia z licencją."
 
 #. TRANS: Button title in the license admin panel.
-#, fuzzy
 msgid "Save license settings."
 msgstr "Zapisz ustawienia licencji"
 
-#. TRANS: Client error displayed when trying to log in while already logged in.
-#. TRANS: Client error displayed trying to use "one time password login" when already logged in.
-#. TRANS: Client error displayed when trying to register while already logged in.
-msgid "Already logged in."
-msgstr "Jesteś już zalogowany."
-
 #. TRANS: Form validation error displayed when trying to log in with incorrect credentials.
 msgid "Incorrect username or password."
 msgstr "Niepoprawna nazwa użytkownika lub hasło."
@@ -3341,7 +3122,6 @@ msgid "Login to site"
 msgstr "Zaloguj siÄ™ na witrynie"
 
 #. TRANS: Field label on login page.
-#, fuzzy
 msgid "Username or email address"
 msgstr "Pseudonim lub adres e-mail"
 
@@ -3358,10 +3138,9 @@ msgstr ""
 "wiele osób."
 
 #. TRANS: Button text for log in on login page.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Login"
-msgstr "Zaloguj siÄ™"
+msgstr "Zaloguj"
 
 #. TRANS: Link text for link to "reset password" on login page.
 msgid "Lost or forgotten password?"
@@ -3436,9 +3215,9 @@ msgstr "Źródłowy adres URL jest wymagany."
 msgid "Could not create application."
 msgstr "Nie można utworzyć aplikacji."
 
-#, fuzzy
+#. TRANS: Form validation error messages displayed when uploading an invalid application logo.
 msgid "Invalid image."
-msgstr "Nieprawidłowy rozmiar."
+msgstr "Nieprawidłowa grafika."
 
 #. TRANS: Title for form to create a group.
 msgid "New group"
@@ -3459,9 +3238,8 @@ msgstr "Nowa wiadomość"
 
 #. TRANS: Client error displayed trying to send a direct message to a user while sender and
 #. TRANS: receiver are not subscribed to each other.
-#, fuzzy
 msgid "You cannot send a message to this user."
-msgstr "Nie można wysłać wiadomości do tego użytkownika."
+msgstr "Nie możesz wysłać wiadomości do tego użytkownika."
 
 #. TRANS: Form validator error displayed trying to send a direct message without content.
 #. TRANS: Client error displayed trying to send a notice without content.
@@ -3474,12 +3252,6 @@ msgstr "Brak treści."
 msgid "No recipient specified."
 msgstr "Nie podano odbiorcy."
 
-#. TRANS: Client error displayed trying to send a direct message to self.
-#. TRANS: Error text shown when trying to send a direct message to self.
-msgid ""
-"Don't send a message to yourself; just say it to yourself quietly instead."
-msgstr "Nie wysyłaj wiadomości do siebie, po prostu powiedz to sobie po cichu."
-
 #. TRANS: Page title after sending a direct message.
 msgid "Message sent"
 msgstr "Wysłano wiadomość"
@@ -3499,7 +3271,6 @@ msgstr "BÅ‚Ä…d AJAX"
 
 #. TRANS: Page title for sending a new notice.
 #. TRANS: Title for form to send a new notice.
-#, fuzzy
 msgctxt "TITLE"
 msgid "New notice"
 msgstr "Nowy wpis"
@@ -3556,9 +3327,9 @@ msgstr "Aktualizacje z \"%s\""
 
 #. TRANS: RSS notice search feed description.
 #. TRANS: %1$s is the query, %2$s is the StatusNet site name.
-#, fuzzy, php-format
+#, php-format
 msgid "Updates matching search term \"%1$s\" on %2$s."
-msgstr "Aktualizacje pasujÄ…ce do wyszukiwanego terminu \"%1$s\" na %2$s."
+msgstr "Aktualizacje pasujące do wyszukiwanego wyrażenia \"%1$s\" na %2$s."
 
 #. TRANS: Client error displayed trying to nudge a user that cannot be nudged.
 msgid ""
@@ -3638,15 +3409,15 @@ msgstr ""
 
 #. TRANS: Server error displayed in oEmbed action when path not found.
 #. TRANS: %s is a path.
-#, fuzzy, php-format
+#, php-format
 msgid "\"%s\" not found."
-msgstr "Nie odnaleziono strony."
+msgstr "Nie znaleziono \"%s\"."
 
 #. TRANS: Server error displayed in oEmbed action when notice not found.
 #. TRANS: %s is a notice.
-#, fuzzy, php-format
+#, php-format
 msgid "Notice %s not found."
-msgstr "Nie odnaleziono wpisu nadrzędnego."
+msgstr "Nie odnaleziono wpisu %s."
 
 #. TRANS: Server error displayed in oEmbed action when notice has not profile.
 #. TRANS: Server error displayed trying to show a notice without a connected profile.
@@ -3662,15 +3433,15 @@ msgstr "Stan użytkownika %1$s na %2$s"
 
 #. TRANS: Server error displayed in oEmbed action when attachment not found.
 #. TRANS: %d is an attachment ID.
-#, fuzzy, php-format
+#, php-format
 msgid "Attachment %s not found."
-msgstr "Nie odnaleziono odbiorcy."
+msgstr "Nie znaleziono załącznika %s."
 
 #. TRANS: Server error displayed in oEmbed request when a path is not supported.
 #. TRANS: %s is a path.
 #, php-format
 msgid "\"%s\" not supported for oembed requests."
-msgstr ""
+msgstr "\"%s\" nie jest obsługiwana dla żądań oembed."
 
 #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
 #, php-format
@@ -3687,6 +3458,32 @@ msgstr "Dozwolone są tylko adresy URL %s przez zwykły protokół HTTP."
 msgid "Not a supported data format."
 msgstr "To nie jest obsługiwany format danych."
 
+#. TRANS: Page title for profile settings.
+msgid "Old school UI settings"
+msgstr "Ustawienia interfejsu w  starym stylu"
+
+#. TRANS: Usage instructions for profile settings.
+msgid "If you like it \"the old way\", you can set that here."
+msgstr "Jeśli podobał ci się \"stary sposób\", możesz ustawić to tutaj."
+
+#. TRANS: Confirmation shown when user profile settings are saved.
+#. TRANS: Message after successful saving of administrative settings.
+msgid "Settings saved."
+msgstr "Zapisano ustawienia."
+
+msgid "Only stream mode (no conversations) in timelines"
+msgstr "Tylko tryb strumienia (bez konwersacji) na osiach czasu"
+
+msgid "Show conversation page as hierarchical trees"
+msgstr "Pokaż stronę konwersacji jako drzewa hierarchiczne"
+
+msgid "Show nicknames (not full names) in timelines"
+msgstr "Pokaż pseudonimy (nie pełne nazwy) na osiach czasu"
+
+#. TRANS: Button text to save a list.
+msgid "Save"
+msgstr "Zapisz"
+
 #. TRANS: ShortName in the OpenSearch interface when trying to find users.
 msgid "People Search"
 msgstr "Wyszukiwanie osób"
@@ -3695,6 +3492,11 @@ msgstr "Wyszukiwanie osób"
 msgid "Notice Search"
 msgstr "Wyszukiwanie wpisów"
 
+#. TRANS: Client error displayed trying to use "one time password login" when already logged in.
+#. TRANS: Client error displayed when trying to register while already logged in.
+msgid "Already logged in."
+msgstr "Jesteś już zalogowany."
+
 #. TRANS: Client error displayed trying to use "one time password login" without specifying a user.
 msgid "No user ID specified."
 msgstr "Nie podano identyfikatora użytkownika."
@@ -3731,7 +3533,6 @@ msgid "This is your outbox, which lists private messages you have sent."
 msgstr "To są wiadomości wysłane, czyli prywatne wiadomości, które wysłałeś."
 
 #. TRANS: Title for page where to change password.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Change password"
 msgstr "Zmień hasło"
@@ -3760,19 +3561,17 @@ msgid "6 or more characters."
 msgstr "6 lub więcej znaków."
 
 #. TRANS: Field label on page where to change password. In this field the new password should be typed a second time.
-#, fuzzy
 msgctxt "LABEL"
 msgid "Confirm"
 msgstr "Potwierdź"
 
 #. TRANS: Field title on page where to change password.
-#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
+#. TRANS: Title for field label for password reset form where the password has to be typed again.
 #. TRANS: Field title on account registration page.
 msgid "Same as password above."
 msgstr "Takie samo jak powyższe hasło."
 
 #. TRANS: Button text on page where to change password.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Change"
 msgstr "Zmień"
@@ -3784,12 +3583,10 @@ msgstr "Hasło musi mieć sześć lub więcej znaków."
 
 #. TRANS: Form validation error on password change when password confirmation does not match.
 #. TRANS: Form validation error displayed when trying to register with non-matching passwords.
-#, fuzzy
 msgid "Passwords do not match."
-msgstr "Hasła nie pasują do siebie."
+msgstr "Hasła nie są identyczne"
 
 #. TRANS: Form validation error on page where to change password.
-#, fuzzy
 msgid "Incorrect old password."
 msgstr "Niepoprawne poprzednie hasło"
 
@@ -3827,12 +3624,6 @@ msgstr "Nie można odczytać katalogu motywu: %s."
 msgid "Avatar directory not writable: %s."
 msgstr "Nie można zapisywać w katalogu awatarów: %s."
 
-#. TRANS: Client error in Paths admin panel.
-#. TRANS: %s is the background directory that could not be written to.
-#, php-format
-msgid "Background directory not writable: %s."
-msgstr "Nie można zapisywać w katalogu teł: %s."
-
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the locales directory that could not be read from.
 #, php-format
@@ -3877,14 +3668,12 @@ msgid "Fancy URLs"
 msgstr "Eleganckie adresu URL"
 
 #. TRANS: Field title in Paths admin panel.
-#, fuzzy
 msgid "Use fancy URLs (more readable and memorable)?"
 msgstr ""
 "Używać eleganckich (bardziej czytelnych i łatwiejszych do zapamiętania) "
 "adresów URL?"
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#, fuzzy
 msgctxt "LEGEND"
 msgid "Theme"
 msgstr "Motyw"
@@ -3949,30 +3738,6 @@ msgstr "Katalog awatara"
 msgid "Directory where avatars are located."
 msgstr "Katalog, w którym położone są awatary."
 
-#. TRANS: Fieldset legend in Paths admin panel.
-msgid "Backgrounds"
-msgstr "TÅ‚a"
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-msgid "Server for backgrounds."
-msgstr "Serwer teł."
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-msgid "Web path to backgrounds."
-msgstr "Ścieżka WWW do teł."
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-msgid "Server for backgrounds on SSL pages."
-msgstr "Serwer teł na stronach SSL."
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-msgid "Web path to backgrounds on SSL pages."
-msgstr "Ścieżka WWW do teł na stronach SSL."
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-msgid "Directory where backgrounds are located."
-msgstr "Katalog, w którym położone są tła."
-
 #. TRANS: Fieldset legens in Paths admin panel.
 msgid "Attachments"
 msgstr "Załączniki"
@@ -3998,7 +3763,6 @@ msgid "Directory where attachments are located."
 msgstr "Katalog, w którym położone są załączniki."
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#, fuzzy
 msgctxt "LEGEND"
 msgid "SSL"
 msgstr "SSL"
@@ -4029,8 +3793,8 @@ msgid "Server to direct SSL requests to."
 msgstr "Serwer do przekierowywania żądań SSL."
 
 #. TRANS: Button title text to store form data in the Paths admin panel.
-msgid "Save paths"
-msgstr "Ścieżki zapisu"
+msgid "Save path settings."
+msgstr "Zapisz ustawienia ścieżki."
 
 #. TRANS: Instructions for the "People search" page.
 #. TRANS: %%site.name%% is the name of the StatusNet site.
@@ -4049,93 +3813,87 @@ msgstr "Wyszukiwanie osób"
 
 #. TRANS: Title for list page.
 #. TRANS: %s is a list.
-#, fuzzy, php-format
+#, php-format
 msgid "Public list %s"
-msgstr "Publiczna chmura znaczników"
+msgstr "Publiczna lista %s"
 
 #. TRANS: Title for list page.
 #. TRANS: %1$s is a list, %2$d is a page number.
-#, fuzzy, php-format
+#, php-format
 msgid "Public list %1$s, page %2$d"
-msgstr "odpowiedzi dla użytkownika %1$s, strona %2$s"
+msgstr "Publiczna lista  %1$s , strona %2$d"
 
 #. TRANS: Message for anonymous users on list page.
 #. TRANS: This message contains Markdown links in the form [description](link).
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "Lists are how you sort similar people on %%site.name%%, a [micro-blogging]"
 "(http://en.wikipedia.org/wiki/Micro-blogging) service based on the Free "
 "Software [StatusNet](http://status.net/) tool. You can then easily keep "
 "track of what they are doing by subscribing to the list's timeline."
 msgstr ""
-"**%s** jest grupą użytkowników na %%%%site.name%%%%, usłudze "
-"[mikroblogowania](http://pl.wikipedia.org/wiki/Mikroblog) opartej na wolnym "
-"narzędziu [StatusNet](http://status.net/). Jej członkowie dzielą się "
-"krótkimi wiadomościami o swoim życiu i zainteresowaniach. "
+"Listy są sposobem grupowania podobnych użytkowników na %%site.name%%, "
+"usłudze [mikroblogowania](http://en.wikipedia.org/wiki/Micro-blogging) "
+"opartej na wolnym narzędziu [StatusNet](http://status.net/). Możesz w prosty "
+"sposób śledzić co robią subskrybując oś czasową listy."
 
 #. TRANS: Client error displayed when a tagger is expected but not provided.
-#, fuzzy
 msgid "No tagger."
 msgstr "Nie ma takiego znacznika."
 
 #. TRANS: Title for list of people listed by the user.
 #. TRANS: %1$s is a list, %2$s is a username.
-#, fuzzy, php-format
+#, php-format
 msgid "People listed in %1$s by %2$s"
-msgstr "odpowiedzi dla użytkownika %1$s na %2$s."
+msgstr "Osoby wymienione w %1$s na %2$s."
 
 #. TRANS: Title for list of people listed by the user.
 #. TRANS: %1$s is a list, %2$s is a username, %2$s is a page number.
-#, fuzzy, php-format
+#, php-format
 msgid "People listed in %1$s by %2$s, page %3$d"
-msgstr "odpowiedzi dla użytkownika %1$s, strona %2$s"
+msgstr "Osoby wymienione w %1$s przez %2$s, strona %3$d"
 
 #. TRANS: Addition in tag membership list for creator of a tag.
 #. TRANS: Addition in tag subscribers list for creator of a tag.
-#, fuzzy
 msgid "Creator"
-msgstr "Utworzono"
+msgstr "Twórca"
 
 #. TRANS: Title for lists by a user page for a private tag.
-#, fuzzy
 msgid "Private lists by you"
-msgstr "Zmodyfikuj grupÄ™ %s"
+msgstr "Twoje prywatne listy"
 
 #. TRANS: Title for lists by a user page for a public tag.
-#, fuzzy
 msgid "Public lists by you"
 msgstr "Publiczna chmura znaczników"
 
 #. TRANS: Title for lists by a user page.
-#, fuzzy
 msgid "Lists by you"
-msgstr "Zmodyfikuj grupÄ™ %s"
+msgstr "Twoje listy"
 
 #. TRANS: Title for lists by a user page.
 #. TRANS: %s is a user nickname.
 #, php-format
 msgid "Lists by %s"
-msgstr ""
+msgstr "Listy użytkownika %s"
 
 #. TRANS: Title for lists by a user page.
 #. TRANS: %1$s is a user nickname, %2$d is a page number.
-#, fuzzy, php-format
+#, php-format
 msgid "Lists by %1$s, page %2$d"
-msgstr "Wpisy ze znacznikiem %1$s, strona %2$d"
+msgstr "Listy użytkownika %1$s, strona %2$d"
 
 #. TRANS: Client error displayed when trying view another user's private lists.
 msgid "You cannot view others' private lists"
-msgstr ""
+msgstr "Nie można wyświetlić prywatnych list innych użytkowników"
 
 #. TRANS: Mode selector label.
-#, fuzzy
 msgid "Mode"
-msgstr "Moderuj"
+msgstr "Tryb"
 
 #. TRANS: Link text to show lists for user %s.
-#, fuzzy, php-format
+#, php-format
 msgid "Lists for %s"
-msgstr "Wysłane wiadomości użytkownika %s"
+msgstr "Listy dla użytkownika %s"
 
 #. TRANS: Fieldset legend.
 #. TRANS: Fieldset legend on gallery action page.
@@ -4144,22 +3902,19 @@ msgstr "Wybierz znacznik do filtrowania"
 
 #. TRANS: Checkbox title.
 msgid "Show private tags."
-msgstr ""
+msgstr "Pokaż prywatne znaczniki."
 
 #. TRANS: Checkbox label to show public tags.
-#, fuzzy
 msgctxt "LABEL"
 msgid "Public"
 msgstr "Publiczny"
 
 #. TRANS: Checkbox title.
-#, fuzzy
 msgid "Show public tags."
-msgstr "Nie ma takiego znacznika."
+msgstr "Pokaż publiczne znaczniki."
 
 #. TRANS: Submit button text for tag filter form.
 #. TRANS: Submit button text on gallery action page.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Go"
 msgstr "Przejdź"
@@ -4167,89 +3922,91 @@ msgstr "Przejdź"
 #. TRANS: Message displayed for anonymous users on page that displays lists by a user.
 #. TRANS: This message contains Markdown links in the form [description](links).
 #. TRANS: %s is a tagger nickname.
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "These are lists created by **%s**. Lists are how you sort similar people on %"
 "%%%site.name%%%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
 "blogging) service based on the Free Software [StatusNet](http://status.net/) "
 "tool. You can easily keep track of what they are doing by subscribing to the "
-"tag's timeline."
+"list's timeline."
 msgstr ""
-"**%s** jest grupą użytkowników na %%%%site.name%%%%, usłudze "
-"[mikroblogowania](http://pl.wikipedia.org/wiki/Mikroblog) opartej na wolnym "
-"narzędziu [StatusNet](http://status.net/). Jej członkowie dzielą się "
-"krótkimi wiadomościami o swoim życiu i zainteresowaniach. "
+"Oto listy utworzone przez użytkownika **%s**. Listy są sposobem grupowania "
+"podobnych użytkowników na %%%%site.name%%%%, usłudze [mikroblogowania]"
+"(http://pl.wikipedia.org/wiki/Mikroblog) opartej na wolnym narzędziu "
+"[StatusNet](http://status.net/). Możesz w prosty sposób śledzić co robią "
+"subskrybujÄ…c oÅ› czasowÄ… listy."
 
 #. TRANS: Message displayed on page that displays lists by a user when there are none.
 #. TRANS: This message contains Markdown links in the form [description](links).
 #. TRANS: %s is a tagger nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "%s has not created any [lists](%%%%doc.lists%%%%) yet."
 msgstr ""
-"Nikt jeszcze nie wysłał wpisu za pomocą [znacznika mieszania](%%doc.tags%%)."
+"%s {{GENDER:%s|nie utworzył|nie utworzyła}} jeszcze żadnych [list](%%doc.tags"
+"%%)."
 
 #. TRANS: Page title. %s is a tagged user's nickname.
 #, php-format
 msgid "Lists with %s in them"
-msgstr ""
+msgstr "Listy zawierajÄ…ce %s"
 
 #. TRANS: Page title. %1$s is a tagged user's nickname, %2$s is a page number.
-#, fuzzy, php-format
+#, php-format
 msgid "Lists with %1$s, page %2$d"
-msgstr "Wpisy ze znacznikiem %1$s, strona %2$d"
+msgstr "Listy zawierające użytkownika %1$s, strona %2$d"
 
 #. TRANS: Message displayed for anonymous users on page that displays lists for a user.
 #. TRANS: This message contains Markdown links in the form [description](links).
 #. TRANS: %s is a tagger nickname.
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "These are lists for **%s**. lists are how you sort similar people on %%%%"
 "site.name%%%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
 "blogging) service based on the Free Software [StatusNet](http://status.net/) "
 "tool. You can easily keep track of what they are doing by subscribing to the "
-"tag's timeline."
+"list's timeline."
 msgstr ""
-"**%s** jest grupą użytkowników na %%%%site.name%%%%, usłudze "
-"[mikroblogowania](http://pl.wikipedia.org/wiki/Mikroblog) opartej na wolnym "
-"narzędziu [StatusNet](http://status.net/). Jej członkowie dzielą się "
-"krótkimi wiadomościami o swoim życiu i zainteresowaniach. "
+"Oto listy dla użytkownika **%s**. Listy są sposobem grupowania podobnych "
+"użytkowników na %%%%site.name%%%%, usłudze [mikroblogowania](http://en."
+"wikipedia.org/wiki/Micro-blogging) opartej na wolnym narzędziu [StatusNet]"
+"(http://status.net/). Możesz w prosty sposób śledzić co robią subskrybując "
+"oÅ› czasowÄ… listy."
 
 #. TRANS: Message displayed on page that displays lists a user was added to when there are none.
 #. TRANS: This message contains Markdown links in the form [description](links).
 #. TRANS: %s is a user nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "%s has not been [listed](%%%%doc.lists%%%%) by anyone yet."
-msgstr ""
-"Nikt jeszcze nie wysłał wpisu za pomocą [znacznika mieszania](%%doc.tags%%)."
+msgstr "%s nie znajduje siÄ™ jeszcze na niczyich [listach](%%doc.tags%%)."
 
 #. TRANS: Page title for list of list subscribers.
 #. TRANS: %1$s is a list, %2$s is a user nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "Subscribers to list %1$s by %2$s"
-msgstr "Subskrybowano użytkownika %s."
+msgstr "Subskrybenci listy %1$s użytkownika %2$s."
 
 #. TRANS: Page title for list of list subscribers.
 #. TRANS: %1$s is a list, %2$s is a user nickname, %3$d is a page number.
-#, fuzzy, php-format
+#, php-format
 msgid "Subscribers to list %1$s by %2$s, page %3$d"
-msgstr "%1$s nadał etykietę %2$s, strona %3$d"
+msgstr "Subskrybenci listy %1$s użytkownika %2$s, strona %3$d"
 
 #. TRANS: Title for page that displays lists subscribed to by a user.
 #. TRANS: %s is a profile nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "Lists subscribed to by %s"
-msgstr "Subskrybowano użytkownika %s."
+msgstr "Listy subskrybowane przez użytkownika %s"
 
 #. TRANS: Title for page that displays lists subscribed to by a user.
 #. TRANS: %1$s is a profile nickname, %2$d is a page number.
-#, fuzzy, php-format
+#, php-format
 msgid "Lists subscribed to by %1$s, page %2$d"
-msgstr "Subskrypcje użytkownika %1$s, strona %2$d"
+msgstr "Listy subskrybowane przez użytkownika %1$s, strona %2$d"
 
 #. TRANS: Message displayed for anonymous users on page that displays lists subscribed to by a user.
 #. TRANS: This message contains Markdown links in the form [description](links).
 #. TRANS: %s is a profile nickname.
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "These are lists subscribed to by **%s**. Lists are how you sort similar "
 "people on %%%%site.name%%%%, a [micro-blogging](http://en.wikipedia.org/wiki/"
@@ -4257,15 +4014,16 @@ msgid ""
 "net/) tool. You can easily keep track of what they are doing by subscribing "
 "to the list's timeline."
 msgstr ""
-"**%s** jest grupą użytkowników na %%%%site.name%%%%, usłudze "
+"Oto listy subskrybowane przez użytkownika **%s**. Listy są sposobem "
+"grupowania podobnych użytkowników na %%%%site.name%%%%, usłudze "
 "[mikroblogowania](http://pl.wikipedia.org/wiki/Mikroblog) opartej na wolnym "
-"narzędziu [StatusNet](http://status.net/). Jej członkowie dzielą się "
-"krótkimi wiadomościami o swoim życiu i zainteresowaniach. "
+"narzędziu [StatusNet](http://status.net/). Możesz w prosty sposób śledzić co "
+"robiÄ… subskrybujÄ…c oÅ› czasowÄ… listy."
 
 #. TRANS: Page title for AJAX form return when a disabling a plugin.
 msgctxt "plugin"
 msgid "Disabled"
-msgstr ""
+msgstr "Wyłączone"
 
 #. TRANS: Client error displayed when trying to use another method than POST.
 #. TRANS: Do not translate POST.
@@ -4276,22 +4034,19 @@ msgid "This action only accepts POST requests."
 msgstr "Ta czynność przyjmuje tylko żądania POST."
 
 #. TRANS: Client error displayed when trying to enable or disable a plugin without access rights.
-#, fuzzy
 msgid "You cannot administer plugins."
-msgstr "Nie można usuwać użytkowników."
+msgstr "Nie możesz administrować wtyczkami."
 
 #. TRANS: Client error displayed when trying to enable or disable a non-existing plugin.
-#, fuzzy
 msgid "No such plugin."
-msgstr "Nie ma takiej strony."
+msgstr "Nie ma takiej wtyczki."
 
 #. TRANS: Page title for AJAX form return when enabling a plugin.
 msgctxt "plugin"
 msgid "Enabled"
-msgstr ""
+msgstr "WÅ‚Ä…czone"
 
 #. TRANS: Tab and title for plugins admin panel.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Plugins"
 msgstr "Wtyczki"
@@ -4304,40 +4059,29 @@ msgid ""
 msgstr ""
 
 #. TRANS: Admin form section header
-#, fuzzy
 msgid "Default plugins"
-msgstr "Domyślny język"
+msgstr "Domyślne wtyczki"
 
 #. TRANS: Text displayed on plugin admin page when no plugin are enabled.
 msgid ""
 "All default plugins have been disabled from the site's configuration file."
 msgstr ""
-
-#. TRANS: Client error displayed if the notice posted has too many characters.
-msgid "Invalid notice content."
-msgstr "Nieprawidłowa treść wpisu."
-
-#. TRANS: Exception thrown if a notice's license is not compatible with the StatusNet site license.
-#. TRANS: %1$s is the notice license, %2$s is the StatusNet site's license.
-#, fuzzy, php-format
-msgid "Notice license \"%1$s\" is not compatible with site license \"%2$s\"."
-msgstr "Licencja wpisu \"%1$s\" nie jest zgodna z licencjÄ… witryny \"%2$s\"."
+"Wszystkie domyślne wtyczki zostały wyłączone w pliku konfiguracji witryny."
 
 #. TRANS: Client error displayed when trying to add an unindentified field to profile.
 #. TRANS: %s is a field name.
 #, php-format
 msgid "Unidentified field %s."
-msgstr ""
+msgstr "Niezidentyfikowane pole  %s."
 
 #. TRANS: Page title.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Search results"
-msgstr "Przeszukaj witrynÄ™"
+msgstr "Wyniki wyszukiwania"
 
 #. TRANS: Error message in case a search is shorter than three characters.
 msgid "The search string must be at least 3 characters long."
-msgstr ""
+msgstr "Wyszukiwany ciąg znaków musi mieć co najmniej 3 znaki."
 
 #. TRANS: Page title for profile settings.
 msgid "Profile settings"
@@ -4384,18 +4128,17 @@ msgstr "Adres URL strony domowej, bloga lub profilu na innej witrynie."
 #. TRANS: Text area title in form for account registration. Plural
 #. TRANS: is decided by the number of characters available for the
 #. TRANS: biography (%d).
-#, fuzzy, php-format
+#, php-format
 msgid "Describe yourself and your interests in %d character."
 msgid_plural "Describe yourself and your interests in %d characters."
-msgstr[0] "Opisz siebie i swoje zainteresowania w %d znaku"
-msgstr[1] "Opisz siebie i swoje zainteresowania w %d znakach"
-msgstr[2] "Opisz siebie i swoje zainteresowania w %d znakach"
+msgstr[0] "Opisz siebie i swoje zainteresowania w %d znaku."
+msgstr[1] "Opisz siebie i swoje zainteresowania w %d znakach."
+msgstr[2] "Opisz siebie i swoje zainteresowania w %d znakach."
 
 #. TRANS: Tooltip for field label in form for profile settings.
 #. TRANS: Text area title on account registration page.
-#, fuzzy
 msgid "Describe yourself and your interests."
-msgstr "Opisz siÄ™ i swoje zainteresowania"
+msgstr "Opisz siebie i swoje zainteresowania."
 
 #. TRANS: Text area label in form for profile settings where users can provide
 #. TRANS: their biography.
@@ -4412,35 +4155,34 @@ msgstr "Położenie"
 
 #. TRANS: Tooltip for field label in form for profile settings.
 #. TRANS: Field title on account registration page.
-#, fuzzy
 msgid "Where you are, like \"City, State (or Region), Country\"."
-msgstr "Gdzie jesteś, np. \"miasto, województwo (lub region), kraj\""
+msgstr "Gdzie jesteś, np. \"miasto, województwo (lub region), kraj\"."
 
 #. TRANS: Checkbox label in form for profile settings.
 msgid "Share my current location when posting notices"
 msgstr "Podziel się swoim obecnym położeniem podczas wysyłania wpisów"
 
 #. TRANS: Field label in form for profile settings.
+#. TRANS: Title for group tag cloud section.
+#. TRANS: %s is a group name.
 msgid "Tags"
 msgstr "Znaczniki"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#, fuzzy
 msgid ""
 "Tags for yourself (letters, numbers, -, ., and _), comma- or space- "
 "separated."
 msgstr ""
 "Znaczniki dla siebie (litery, liczby, -, . i _), oddzielone przecinkami lub "
-"spacjami"
+"spacjami."
 
 #. TRANS: Dropdownlist label in form for profile settings.
 msgid "Language"
 msgstr "Język"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#, fuzzy
 msgid "Preferred language."
-msgstr "Preferowany język"
+msgstr "Preferowany język."
 
 #. TRANS: Dropdownlist label in form for profile settings.
 msgid "Timezone"
@@ -4451,33 +4193,32 @@ msgid "What timezone are you normally in?"
 msgstr "W jakiej strefie czasowej zwykle siÄ™ znajdujesz?"
 
 #. TRANS: Checkbox label in form for profile settings.
-#, fuzzy
 msgid ""
-"Automatically subscribe to whoever subscribes to me (best for non-humans)."
+"Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr ""
-"Automatycznie subskrybuj każdego, kto mnie subskrybuje (najlepsze dla botów)"
+"Automatycznie subskrybuj każdego, kto mnie subskrybuje (najlepsze dla botów)."
 
 #. TRANS: Dropdown field label on profile settings, for what policies to apply when someone else tries to subscribe to your updates.
-#, fuzzy
 msgid "Subscription policy"
-msgstr "Subskrypcje"
+msgstr "Polityka subskrypcji"
 
 #. TRANS: Dropdown field option for following policy.
-#, fuzzy
 msgid "Let anyone follow me"
-msgstr "Można obserwować tylko osoby."
+msgstr "Pozwól wszystkim mnie obserwować"
 
 #. TRANS: Dropdown field option for following policy.
 msgid "Ask me first"
-msgstr ""
+msgstr "Najpierw mnie zapytaj"
 
 #. TRANS: Dropdown field title on group edit form.
 msgid "Whether other users need your permission to follow your updates."
 msgstr ""
+"Czy inni użytkownicy potrzebują Twojej zgody na śledzenie twoich "
+"aktualizacji."
 
 #. TRANS: Checkbox label in profile settings.
 msgid "Make updates visible only to my followers"
-msgstr ""
+msgstr "Uwidacznianie aktualizacji tylko dla śledzących mnie"
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Plural form is used based on the maximum number of allowed
@@ -4506,13 +4247,12 @@ msgstr "Język jest za długi (maksymalnie 50 znaków)."
 #. TRANS: %s is the invalid tag.
 #. TRANS: Error displayed if a given tag is invalid.
 #. TRANS: %s is the invalid tag.
-#, fuzzy, php-format
+#, php-format
 msgid "Invalid tag: \"%s\"."
-msgstr "Nieprawidłowy znacznik: \"%s\""
+msgstr "Nieprawidłowy znacznik: \"%s\"."
 
 #. TRANS: Server error thrown when user profile settings could not be updated to
 #. TRANS: automatically subscribe to any subscriber.
-#, fuzzy
 msgid "Could not update user for autosubscribe or subscribe_policy."
 msgstr "Nie można zaktualizować użytkownika do automatycznej subskrypcji."
 
@@ -4524,11 +4264,6 @@ msgstr "Nie można zapisać preferencji położenia."
 msgid "Could not save tags."
 msgstr "Nie można zapisać znaczników."
 
-#. TRANS: Confirmation shown when user profile settings are saved.
-#. TRANS: Message after successful saving of administrative settings.
-msgid "Settings saved."
-msgstr "Zapisano ustawienia."
-
 #. TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
 #. TRANS: Page title for page where a user account can be restored from backup.
 msgid "Restore account"
@@ -4541,7 +4276,7 @@ msgid "Beyond the page limit (%s)."
 msgstr "Poza ograniczeniem strony (%s)."
 
 #. TRANS: Server error displayed when a public timeline cannot be retrieved.
-msgid "Could not retrieve public stream."
+msgid "Could not retrieve public timeline."
 msgstr "Nie można pobrać publicznego strumienia."
 
 #. TRANS: Title for all public timeline pages but the first.
@@ -4556,15 +4291,19 @@ msgid "Public timeline"
 msgstr "Publiczna oÅ› czasu"
 
 #. TRANS: Link description for public timeline feed.
-msgid "Public Stream Feed (RSS 1.0)"
+msgid "Public Timeline Feed (Activity Streams JSON)"
+msgstr "Kanał publicznego strumienia (Activity Streams JSON)"
+
+#. TRANS: Link description for public timeline feed.
+msgid "Public Timeline Feed (RSS 1.0)"
 msgstr "Kanał publicznego strumienia (RSS 1.0)"
 
 #. TRANS: Link description for public timeline feed.
-msgid "Public Stream Feed (RSS 2.0)"
+msgid "Public Timeline Feed (RSS 2.0)"
 msgstr "Kanał publicznego strumienia (RSS 2.0)"
 
 #. TRANS: Link description for public timeline feed.
-msgid "Public Stream Feed (Atom)"
+msgid "Public Timeline Feed (Atom)"
 msgstr "Kanał publicznego strumienia (Atom)"
 
 #. TRANS: Text displayed for public feed when there are no public notices.
@@ -4613,56 +4352,10 @@ msgstr ""
 "To jest %%site.name%%, usługa [mikroblogowania](http://pl.wikipedia.org/wiki/"
 "Mikroblog) oparta na wolnym narzędziu [StatusNet](http://status.net/)."
 
-#. TRANS: Title for page with public list cloud.
-#, fuzzy
-msgid "Public list cloud"
-msgstr "Publiczna chmura znaczników"
-
-#. TRANS: Page notice for page with public list cloud.
-#. TRANS: %s is a StatusNet sitename.
-#, fuzzy, php-format
-msgid "These are largest lists on %s"
-msgstr "To sÄ… najpopularniejsze ostatnie znaczniki w witrynie %s"
-
-#. TRANS: Empty list message on page with public list cloud.
-#. TRANS: This message contains Markdown links in the form [description](link).
-#, fuzzy, php-format
-msgid "No one has [listed](%%doc.tags%%) anyone yet."
-msgstr ""
-"Nikt jeszcze nie wysłał wpisu za pomocą [znacznika mieszania](%%doc.tags%%)."
-
-#. TRANS: Additional empty list message on page with public list cloud for logged in users.
-#, fuzzy
-msgid "Be the first to list someone!"
-msgstr "Zostań pierwszym, który go wyśle."
-
-#. TRANS: Additional empty list message on page with public list cloud for anonymous users.
-#. TRANS: This message contains Markdown links in the form [description](link).
-#, fuzzy, php-format
-msgid ""
-"Why not [register an account](%%action.register%%) and be the first to list "
-"someone!"
-msgstr ""
-"Dlaczego nie [zarejestrujesz konta](%%action.register%%) i zostaniesz "
-"pierwszym, który go wyśle."
-
-#. TRANS: DT element on on page with public list cloud.
-#, fuzzy
-msgid "List cloud"
-msgstr "Nie odnaleziono strony."
-
-#. TRANS: Link title for number of listed people. %d is the number of listed people.
-#, php-format
-msgid "1 person listed"
-msgid_plural "%d people listed"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
 #. TRANS: Public RSS feed description. %s is the StatusNet site name.
-#, fuzzy, php-format
+#, php-format
 msgid "%s updates from everyone."
-msgstr "Użytkownik %s aktualizuje od każdego."
+msgstr "Aktualizacje %s od wszystkich."
 
 #. TRANS: Title for public tag cloud.
 msgid "Public tag cloud"
@@ -4775,7 +4468,6 @@ msgid "Password recovery requested"
 msgstr "Zażądano przywracania hasła"
 
 #. TRANS: Title for password recovery page in password saved mode.
-#, fuzzy
 msgid "Password saved"
 msgstr "Zapisano hasło."
 
@@ -4784,7 +4476,6 @@ msgid "6 or more characters, and do not forget it!"
 msgstr "6 lub więcej znaków, i nie zapomnij go."
 
 #. TRANS: Button text for password reset form.
-#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
 msgctxt "BUTTON"
 msgid "Reset"
 msgstr "Przywróć"
@@ -4793,18 +4484,6 @@ msgstr "Przywróć"
 msgid "Enter a nickname or email address."
 msgstr "Podaj pseudonim lub adres e-mail."
 
-#. TRANS: Information on password recovery form if no known username or e-mail address was specified.
-msgid "No user with that email address or username."
-msgstr "Brak użytkownika z tym adresem e-mail lub nazwą użytkownika."
-
-#. TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.
-msgid "No registered email address for that user."
-msgstr "Brak zarejestrowanych adresów e-mail dla tego użytkownika."
-
-#. TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.
-msgid "Error saving address confirmation."
-msgstr "BÅ‚Ä…d podczas zapisywania potwierdzenia adresu."
-
 #. TRANS: User notification after an e-mail with instructions was sent from the password recovery form.
 msgid ""
 "Instructions for recovering your password have been sent to the email "
@@ -4835,15 +4514,14 @@ msgid "New password successfully saved. You are now logged in."
 msgstr "Pomyślnie zapisano nowe hasło. Jesteś teraz zalogowany."
 
 #. TRANS: Client exception thrown when no ID parameter was provided.
-#, fuzzy
 msgid "No id parameter."
 msgstr "Brak parametru identyfikatora."
 
 #. TRANS: Client exception thrown when an invalid ID parameter was provided for a file.
 #. TRANS: %d is the provided ID for which the file is not present (number).
-#, fuzzy, php-format
+#, php-format
 msgid "No such file \"%d\"."
-msgstr "Nie ma takiego pliku."
+msgstr "Nie ma takiego pliku: \"%d\"."
 
 #. TRANS: Client error displayed when trying to register to an invite-only site without an invitation.
 msgid "Sorry, only invited people can register."
@@ -4858,20 +4536,18 @@ msgid "Registration successful"
 msgstr "Rejestracja powiodła się"
 
 #. TRANS: Title for registration page.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Register"
-msgstr "Zarejestruj siÄ™"
+msgstr "Rejestracja"
 
 #. TRANS: Client error displayed when trying to register to a closed site.
 msgid "Registration not allowed."
 msgstr "Rejestracja nie jest dozwolona."
 
 #. TRANS: Form validation error displayed when trying to register without agreeing to the site license.
-#, fuzzy
 msgid "You cannot register if you do not agree to the license."
 msgstr ""
-"Nie można się zarejestrować, jeśli nie zgadzasz się z warunkami licencji."
+"Nie możesz się zarejestrować, jeśli nie zgadzasz się z warunkami licencji."
 
 #. TRANS: Form validation error displayed when trying to register with an already registered e-mail address.
 msgid "Email address already exists."
@@ -4882,38 +4558,32 @@ msgid "Invalid username or password."
 msgstr "Nieprawidłowa nazwa użytkownika lub hasło."
 
 #. TRANS: Page notice on registration page.
-#, fuzzy
 msgid ""
 "With this form you can create a new account. You can then post notices and "
 "link up to friends and colleagues."
 msgstr ""
 "Za pomocą tego formularza można utworzyć nowe konto. Można wtedy wysyłać "
-"wpisy i połączyć się z przyjaciółmi i kolegami. "
+"wpisy i połączyć się z przyjaciółmi i kolegami."
 
 #. TRANS: Field label on account registration page. In this field the password has to be entered a second time.
-#, fuzzy
 msgctxt "PASSWORD"
 msgid "Confirm"
 msgstr "Potwierdź"
 
 #. TRANS: Field label on account registration page.
-#, fuzzy
 msgctxt "LABEL"
 msgid "Email"
 msgstr "E-mail"
 
 #. TRANS: Field title on account registration page.
-#, fuzzy
 msgid "Used only for updates, announcements, and password recovery."
 msgstr "Używane tylko do aktualizacji, ogłoszeń i przywracania hasła"
 
 #. TRANS: Field title on account registration page.
-#, fuzzy
 msgid "Longer name, preferably your \"real\" name."
 msgstr "Dłuższa nazwa, najlepiej twoje \"prawdziwe\" imię i nazwisko"
 
 #. TRANS: Button text to register a user on account registration page.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Register"
 msgstr "Zarejestruj siÄ™"
@@ -4992,86 +4662,11 @@ msgstr ""
 "(Powinieneś właśnie otrzymać wiadomość e-mail, zawierającą instrukcje "
 "potwierdzenia adresu e-mail)"
 
-#. TRANS: Page notice for remote subscribe. This message contains Markdown links.
-#. TRANS: Ensure to keep the correct markup of [link description](link).
-#, php-format
-msgid ""
-"To subscribe, you can [login](%%action.login%%), or [register](%%action."
-"register%%) a new  account. If you already have an account  on a [compatible "
-"microblogging site](%%doc.openmublog%%),  enter your profile URL below."
-msgstr ""
-"Aby subskrybować, można [zalogować się](%%action.login%%) lub [zarejestrować]"
-"(%%action.register%%) nowe konto. Jeśli już posiadasz konto na [zgodnej "
-"witrynie mikroblogowania](%%doc.openmublog%%), podaj poniżej adres URL "
-"profilu."
-
-#. TRANS: Page title for Remote subscribe.
-msgid "Remote subscribe"
-msgstr "Subskrybuj zdalnie"
-
-#. TRANS: Field legend on page for remote subscribe.
-msgid "Subscribe to a remote user"
-msgstr "Subskrybuj zdalnego użytkownika"
-
-#. TRANS: Field label on page for remote subscribe.
-msgid "User nickname"
-msgstr "Pseudonim użytkownika"
-
-#. TRANS: Field title on page for remote subscribe.
-#, fuzzy
-msgid "Nickname of the user you want to follow."
-msgstr "Pseudonim użytkownika którego chcesz obserwować"
-
-#. TRANS: Field label on page for remote subscribe.
-msgid "Profile URL"
-msgstr "Adres URL profilu"
-
-#. TRANS: Field title on page for remote subscribe.
-#, fuzzy
-msgid "URL of your profile on another compatible microblogging service."
-msgstr "Adres URL profilu na innej, zgodnej usłudze mikroblogowania"
-
-#. TRANS: Button text on page for remote subscribe.
-#. TRANS: Link text for link that will subscribe to a remote profile.
-#. TRANS: Button text to subscribe to a user.
-#. TRANS: Button text for subscribing to a list.
-#, fuzzy
-msgctxt "BUTTON"
-msgid "Subscribe"
-msgstr "Subskrybuj"
-
-#. TRANS: Form validation error on page for remote subscribe when an invalid profile URL was provided.
-#, fuzzy
-msgid "Invalid profile URL (bad format)."
-msgstr "Nieprawidłowy adres URL profilu (błędny format)"
-
-#. TRANS: Form validation error on page for remote subscribe when no the provided profile URL
-#. TRANS: does not contain expected data.
-msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
-msgstr ""
-"Nieprawidłowy adres URL profilu (brak dokumentu YADIS lub określono "
-"nieprawidłowe XRDS)."
-
-#. TRANS: Form validation error on page for remote subscribe.
-msgid "That is a local profile! Login to subscribe."
-msgstr "To jest profil lokalny. Zaloguj się, aby subskrybować."
-
-#. TRANS: Form validation error on page for remote subscribe when the remote service is not providing a request token.
-msgid "Could not get a request token."
-msgstr "Nie można uzyskać tokenu żądana."
-
-#. TRANS: Client error displayed when trying to (un)list an OMB 0.1 remote profile.
-#, fuzzy
-msgid "You cannot (un)list an OMB 0.1 remote profile with this action."
-msgstr ""
-"Nie można subskrybować zdalnego profilu profilu OMB 0.1 za pomocą tej "
-"czynności."
-
 #. TRANS: Client error displayed when an unknown error occurs while delisting a user.
 #. TRANS: %s is a username.
 #, php-format
 msgid "There was an unexpected error while delisting %s."
-msgstr ""
+msgstr "Wystąpił nieoczekiwany błąd podczas skreślenia  %s ."
 
 #. TRANS: Client error displayed when an unknown error occurs while listing a user.
 #. TRANS: %s is a profile URL.
@@ -5080,11 +4675,12 @@ msgid ""
 "There was a problem listing %s. The remote server is probably not responding "
 "correctly, please try retrying later."
 msgstr ""
+"Istnieje problem z wyświetleniem  %s. Serwer zdalny prawdopodobnie nie "
+"odpowiada poprawnie, spróbuj ponownie później."
 
 #. TRANS: Title after removing a user from a list.
-#, fuzzy
 msgid "Unlisted"
-msgstr "Licencja"
+msgstr "Nienotowane"
 
 #. TRANS: Client error displayed when trying to repeat a notice while not logged in.
 msgid "Only logged-in users can repeat notices."
@@ -5119,6 +4715,12 @@ msgstr "Odpowiedzi na %s"
 msgid "Replies to %1$s, page %2$d"
 msgstr "odpowiedzi dla użytkownika %1$s, strona %2$s"
 
+#. TRANS: Link for feed with replies for a user.
+#. TRANS: %s is a user nickname.
+#, php-format
+msgid "Replies feed for %s (Activity Streams JSON)"
+msgstr "Kanał odpowiedzi dla użytkownika %s (Strumienie aktywności JSON)"
+
 #. TRANS: Link for feed with replies for a user.
 #. TRANS: %s is a user nickname.
 #, php-format
@@ -5169,9 +4771,9 @@ msgstr ""
 
 #. TRANS: RSS reply feed description.
 #. TRANS: %1$s is a user nickname, %2$s is the StatusNet site name.
-#, fuzzy, php-format
+#, php-format
 msgid "Replies to %1$s on %2$s."
-msgstr "odpowiedzi dla użytkownika %1$s na %2$s."
+msgstr "Odpowiedzi dla użytkownika %1$s na %2$s."
 
 #. TRANS: Client exception displayed when trying to restore an account while not logged in.
 msgid "Only logged-in users can restore their account."
@@ -5238,7 +4840,7 @@ msgstr "Kanał zostanie przywrócony. Proszę poczekać kilka minut na wyniki."
 
 #. TRANS: Form instructions for feed restore.
 msgid ""
-"You can upload a backed-up stream in <a href=\"http://activitystrea.ms/"
+"You can upload a backed-up timeline in <a href=\"http://activitystrea.ms/"
 "\">Activity Streams</a> format."
 msgstr ""
 "Można wysłać kopię zapasową strumienia w formacie <a href=\"http://"
@@ -5253,7 +4855,6 @@ msgid "You cannot revoke user roles on this site."
 msgstr "Nie można unieważnić rol użytkowników na tej witrynie."
 
 #. TRANS: Client error displayed when trying to revoke a role that is not set.
-#, fuzzy
 msgid "User does not have this role."
 msgstr "Użytkownik nie ma tej roli."
 
@@ -5273,18 +4874,17 @@ msgstr "Użytkownik jest już ograniczony."
 
 #. TRANS: Client error displayed when trying to list a profile with an invalid list.
 #. TRANS: %s is the invalid list name.
-#, fuzzy, php-format
+#, php-format
 msgid "Not a valid list: %s."
-msgstr "Nieprawidłowy znacznik osób: %s."
+msgstr "Nieprawidłowa lista: %s."
 
 #. TRANS: Page title for page showing self tags.
 #. TRANS: %1$s is a tag, %2$d is a page number.
-#, fuzzy, php-format
+#, php-format
 msgid "Users self-tagged with %1$s, page %2$d"
-msgstr "Użytkownicy używający znacznika %1$s - strona %2$d"
+msgstr "Użytkownicy samootagowani znacznikiem %1$s, strona %2$d"
 
 #. TRANS: Title for the sessions administration panel.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Sessions"
 msgstr "Sesje"
@@ -5294,7 +4894,6 @@ msgid "Session settings for this StatusNet site"
 msgstr "Ustawienia sesji tej witryny StatusNet"
 
 #. TRANS: Fieldset legend on the sessions administration panel.
-#, fuzzy
 msgctxt "LEGEND"
 msgid "Sessions"
 msgstr "Sesje"
@@ -5306,9 +4905,8 @@ msgstr "Obsługa sesji"
 
 #. TRANS: Checkbox title on the sessions administration panel.
 #. TRANS: Indicates if StatusNet should handle session administration.
-#, fuzzy
 msgid "Handle sessions ourselves."
-msgstr "Czy samodzielnie obsługiwać sesje."
+msgstr "Samodzielna obsługa sesji."
 
 #. TRANS: Checkbox label on the sessions administration panel.
 #. TRANS: Indicates if StatusNet should write session debugging output.
@@ -5316,14 +4914,12 @@ msgid "Session debugging"
 msgstr "Debugowanie sesji"
 
 #. TRANS: Checkbox title on the sessions administration panel.
-#, fuzzy
 msgid "Enable debugging output for sessions."
 msgstr "Włącza wyjście debugowania dla sesji."
 
 #. TRANS: Title for submit button on the sessions administration panel.
-#, fuzzy
 msgid "Save session settings"
-msgstr "Zapisz ustawienia dostępu"
+msgstr "Zapisz ustawienia sesji"
 
 #. TRANS: Client error displayed trying to display an OAuth application while not logged in.
 msgid "You must be logged in to view an application."
@@ -5336,11 +4932,11 @@ msgstr "Profil aplikacji"
 #. TRANS: Information output on an OAuth application page.
 #. TRANS: %1$s is the application creator, %2$s is "read-only" or "read-write",
 #. TRANS: %3$d is the number of users using the OAuth application.
-#, fuzzy, php-format
+#, php-format
 msgid "Created by %1$s - %2$s access by default - %3$d user"
 msgid_plural "Created by %1$s - %2$s access by default - %3$d users"
-msgstr[0] "Utworzona przez %1$s - domyślny dostęp: %2$s - %3$d użytkowników"
-msgstr[1] "Utworzona przez %1$s - domyślny dostęp: %2$s - %3$d użytkowników"
+msgstr[0] "Utworzona przez %1$s - domyślny dostęp: %2$s - %3$d użytkownik"
+msgstr[1] "Utworzona przez %1$s - domyślny dostęp: %2$s - %3$d użytkownicy"
 msgstr[2] "Utworzona przez %1$s - domyślny dostęp: %2$s - %3$d użytkowników"
 
 #. TRANS: Header on the OAuth application page.
@@ -5348,7 +4944,6 @@ msgid "Application actions"
 msgstr "Czynności aplikacji"
 
 #. TRANS: Link text to edit application on the OAuth application page.
-#, fuzzy
 msgctxt "EDITAPP"
 msgid "Edit"
 msgstr "Edycja"
@@ -5362,14 +4957,33 @@ msgstr "Przywrócenie klucza i sekretu"
 msgid "Application info"
 msgstr "Informacje o aplikacji"
 
+#. TRANS: Field label on application page.
+msgid "Consumer key"
+msgstr "Klucz klienta"
+
+#. TRANS: Field label on application page.
+msgid "Consumer secret"
+msgstr "Sekret klienta"
+
+#. TRANS: Field label on application page.
+msgid "Request token URL"
+msgstr "Adres URL tokenu żądania"
+
+#. TRANS: Field label on application page.
+msgid "Access token URL"
+msgstr "Adres URL tokenu żądania"
+
+#. TRANS: Field label on application page.
+msgid "Authorize URL"
+msgstr "Adres URL upoważnienia"
+
 #. TRANS: Note on the OAuth application page about signature support.
-#, fuzzy
 msgid ""
 "Note: HMAC-SHA1 signatures are supported. The plaintext signature method is "
 "not supported."
 msgstr ""
-"Uwaga: obsługiwane są podpisy HMAC-SHA1. Metoda podpisu w zwykłym tekście "
-"nie jest obsługiwana."
+"Uwaga: obsługiwane są podpisy HMAC-SHA1. Metoda podpisu zwykłym tektem nie "
+"jest obsługiwana."
 
 #. TRANS: Text in confirmation dialog to reset consumer key and secret for an OAuth application.
 msgid "Are you sure you want to reset your consumer key and secret?"
@@ -5385,6 +4999,11 @@ msgstr "Ulubione wpisy użytkownika %1$s, strona %2$d"
 msgid "Could not retrieve favorite notices."
 msgstr "Nie można odebrać ulubionych wpisów."
 
+#. TRANS: Feed link text. %s is a username.
+#, php-format
+msgid "Feed for favorites of %s (Activity Streams JSON)"
+msgstr "Kanał dla ulubionych wpisów użytkownika %s (Activity Streams JSON)"
+
 #. TRANS: Feed link text. %s is a username.
 #, php-format
 msgid "Feed for favorites of %s (RSS 1.0)"
@@ -5447,6 +5066,11 @@ msgstr "Grupa %s"
 msgid "%1$s group, page %2$d"
 msgstr "Grupa %1$s, strona %2$d"
 
+#. TRANS: Tooltip for feed link. %s is a group nickname.
+#, php-format
+msgid "Notice feed for %s group (Activity Streams JSON)"
+msgstr "Kanał wpisów dla grupy %s (Activity Streams JSON)"
+
 #. TRANS: Tooltip for feed link. %s is a group nickname.
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
@@ -5467,42 +5091,8 @@ msgstr "Kanał wpisów dla grupy %s (Atom)"
 msgid "FOAF for %s group"
 msgstr "FOAF dla grupy %s"
 
-#. TRANS: Header for mini list of group members on a group page (h2).
-msgid "Members"
-msgstr "Członkowie"
-
-#. TRANS: Description for mini list of group members on a group page when the group has no members.
-#. TRANS: Content of "Listed" page if there are no listed users.
-#. TRANS: Content of "People following tag x" if there are no subscribed users.
-#. TRANS: Empty list message for tags.
-#. TRANS: Text for user subscription statistics if the user has no subscriptions.
-#. TRANS: Text for user subscriber statistics if user has no subscribers.
-#. TRANS: Text for user user group membership statistics if user is not a member of any group.
-#. TRANS: Default content for section/sidebar widget.
-msgid "(None)"
-msgstr "(Brak)"
-
-#. TRANS: Link to all group members from mini list of group members if group has more than n members.
-msgid "All members"
-msgstr "Wszyscy członkowie"
-
-#. TRANS: Header for group statistics on a group page (h2).
-#. TRANS: H2 text for user statistics.
-msgid "Statistics"
-msgstr "Statystyki"
-
-#. TRANS: Label for group creation date.
-msgctxt "LABEL"
-msgid "Created"
-msgstr "Utworzono"
-
-#. TRANS: Label for member count in statistics on group page.
-msgctxt "LABEL"
-msgid "Members"
-msgstr "Członkowie"
-
 #. TRANS: Notice on group pages for anonymous users for StatusNet sites that accept new registrations.
-#. TRANS: **%s** is the group alias, %%%%site.name%%%% is the site name,
+#. TRANS: %s is the group name, %%%%site.name%%%% is the site name,
 #. TRANS: %%%%action.register%%%% is the URL for registration, %%%%doc.help%%%% is a URL to help.
 #. TRANS: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
 #, php-format
@@ -5518,28 +5108,22 @@ msgstr ""
 "narzędziu [StatusNet](http://status.net/). Jej członkowie dzielą się "
 "krótkimi wiadomościami o swoim życiu i zainteresowaniach. [Dołącz teraz](%%%%"
 "action.register%%%%), aby stać się częścią tej grupy i wiele więcej. "
-"([Przeczytaj więcej](%%%%doc.help%%%%))"
+"([Dowiedz się więcej](%%%%doc.help%%%%))"
 
 #. TRANS: Notice on group pages for anonymous users for StatusNet sites that accept no new registrations.
-#. TRANS: **%s** is the group alias, %%%%site.name%%%% is the site name,
+#. TRANS: %s is the group name, %%%%site.name%%%% is the site name,
 #. TRANS: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
 "wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
 "[StatusNet](http://status.net/) tool. Its members share short messages about "
-"their life and interests. "
+"their life and interests."
 msgstr ""
 "**%s** jest grupą użytkowników na %%%%site.name%%%%, usłudze "
 "[mikroblogowania](http://pl.wikipedia.org/wiki/Mikroblog) opartej na wolnym "
 "narzędziu [StatusNet](http://status.net/). Jej członkowie dzielą się "
-"krótkimi wiadomościami o swoim życiu i zainteresowaniach. "
-
-#. TRANS: Title for list of group administrators on a group page.
-#, fuzzy
-msgctxt "TITLE"
-msgid "Admins"
-msgstr "Administratorzy"
+"krótkimi wiadomościami o swoim życiu i zainteresowaniach."
 
 #. TRANS: Client error displayed requesting a single message that does not exist.
 msgid "No such message."
@@ -5562,9 +5146,8 @@ msgid "Message from %1$s on %2$s"
 msgstr "Wiadomość od użytkownika %1$s na %2$s"
 
 #. TRANS: Client exception thrown when trying a view a notice the user has no access to.
-#, fuzzy
 msgid "Not available."
-msgstr "Komunikator nie jest dostępny."
+msgstr "Niedostępne."
 
 #. TRANS: Client error displayed trying to show a deleted notice.
 msgid "Notice deleted."
@@ -5572,108 +5155,113 @@ msgstr "Usunięto wpis."
 
 #. TRANS: Title for private list timeline.
 #. TRANS: %1$s is a list, %2$s is a page number.
-#, fuzzy, php-format
+#, php-format
 msgid "Private timeline for %1$s list by you, page %2$d"
-msgstr "Użytkownicy używający znacznika %1$s - strona %2$d"
+msgstr "Prywatny strumień twojej listy %1$s, strona %2$d"
 
 #. TRANS: Title for public list timeline where the viewer is the tagger.
 #. TRANS: %1$s is a list, %2$s is a page number.
-#, fuzzy, php-format
+#, php-format
 msgid "Timeline for %1$s list by you, page %2$d"
-msgstr "Użytkownicy używający znacznika %1$s - strona %2$d"
+msgstr "Strumień twojej listy %1$s, strona %2$d"
 
 #. TRANS: Title for private list timeline.
 #. TRANS: %1$s is a list, %2$s is the tagger's nickname, %3$d is a page number.
-#, fuzzy, php-format
+#, php-format
 msgid "Timeline for %1$s list by %2$s, page %3$d"
-msgstr "%1$s nadał etykietę %2$s, strona %3$d"
+msgstr "Strumień listy %1$s użytkownika %2$s, strona %3$d"
 
 #. TRANS: Title for private list timeline.
 #. TRANS: %s is a list.
 #, php-format
 msgid "Private timeline of %s list by you"
-msgstr ""
+msgstr "Prywnatny strumień twojej listy %s"
 
 #. TRANS: Title for public list timeline where the viewer is the tagger.
 #. TRANS: %s is a list.
 #, php-format
 msgid "Timeline for %s list by you"
-msgstr ""
+msgstr "Strumień twojej listy %s"
 
 #. TRANS: Title for private list timeline.
 #. TRANS: %1$s is a list, %2$s is the tagger's nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "Timeline for %1$s list by %2$s"
-msgstr "odpowiedzi dla użytkownika %1$s na %2$s."
+msgstr "Strumień listy %1$s użytkownika %2$s."
 
 #. TRANS: Feed title.
 #. TRANS: %1$s is a list, %2$s is tagger's nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "Feed for %1$s list by %2$s (Atom)"
-msgstr "Kanał dla ulubionych wpisów użytkownika %s (Atom)"
+msgstr "Kanał dla listy %1$s  użytkownika %2$s  (Atom)"
 
 #. TRANS: Empty list message for list timeline.
 #. TRANS: %1$s is a list, %2$s is a tagger's nickname.
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "This is the timeline for %1$s list by %2$s but no one has posted anything "
 "yet."
 msgstr ""
-"To jest oś czasu użytkownika %s i przyjaciół, ale nikt jeszcze nic nie "
-"wysłał."
+"To jest strumień listy %1$s użytkownika %2$s, ale nikt jeszcze nic nie "
+"opublikował."
 
 #. TRANS: Additional empty list message for list timeline for currently logged in user tagged tags.
 msgid "Try tagging more people."
-msgstr ""
+msgstr "Spróbuj przypisać znaczniki większej liczbie ludzi."
 
 #. TRANS: Additional empty list message for list timeline.
 #. TRANS: This message contains Markdown links in the form [description](link).
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and start following "
 "this timeline!"
 msgstr ""
-"Dlaczego nie [zarejestrujesz konta](%%action.register%%) i zostaniesz "
-"pierwszym, który go wyśle."
+"Dlaczego nie [zarejestrujesz konta](%%action.register%%) i zaczniesz "
+"obserwować tego strumienia!"
 
 #. TRANS: Header on show list page.
-#, fuzzy
+#. TRANS: Link description for link to list of users tagged with a tag (so part of a list).
 msgid "Listed"
-msgstr "Licencja"
+msgstr "Wymienione"
+
+#. TRANS: Content of "Listed" page if there are no listed users.
+#. TRANS: Content of "People following tag x" if there are no subscribed users.
+#. TRANS: Description for mini list of group members on a group page when the group has no members.
+#. TRANS: Empty list message for tags.
+#. TRANS: Text for user subscription statistics if the user has no subscriptions.
+#. TRANS: Text for user subscriber statistics if user has no subscribers.
+#. TRANS: Text for user user group membership statistics if user is not a member of any group.
+#. TRANS: Default content for section/sidebar widget.
+msgid "(None)"
+msgstr "(Brak)"
 
 #. TRANS: Link for more "People in list x by a user"
 #. TRANS: if there are more than the mini list's maximum.
-#, fuzzy
 msgid "Show all"
-msgstr "Wyświetl więcej"
+msgstr "Pokaż wszystko"
 
 #. TRANS: Header for tag subscribers.
 #. TRANS: Link description for link to list of users subscribed to a tag.
 msgid "Subscribers"
 msgstr "Subskrybenci"
 
-#. TRANS: Link for more "People following tag x"
-#. TRANS: if there are more than the mini list's maximum.
-msgid "All subscribers"
-msgstr "Wszyscy subskrybenci"
-
-#. TRANS: Page title showing tagged notices in one user's stream.
+#. TRANS: Page title showing tagged notices in one user's timeline.
 #. TRANS: %1$s is the username, %2$s is the hash tag.
-#, fuzzy, php-format
+#, php-format
 msgid "Notices by %1$s tagged %2$s"
-msgstr "%1$s nadał etykietę %2$s"
+msgstr "Wpisy użytkownika %1$s oznaczone %2$s"
 
-#. TRANS: Page title showing tagged notices in one user's stream.
+#. TRANS: Page title showing tagged notices in one user's timeline.
 #. TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number.
-#, fuzzy, php-format
+#, php-format
 msgid "Notices by %1$s tagged %2$s, page %3$d"
-msgstr "%1$s nadał etykietę %2$s, strona %3$d"
+msgstr "Wpisy użytkownika %1$s oznaczone %2$s, strona %3$d"
 
-#. TRANS: Extended page title showing tagged notices in one user's stream.
+#. TRANS: Extended page title showing tagged notices in one user's timeline.
 #. TRANS: %1$s is the username, %2$d is the page number.
-#, fuzzy, php-format
+#, php-format
 msgid "Notices by %1$s, page %2$d"
-msgstr "Wpisy ze znacznikiem %1$s, strona %2$d"
+msgstr "Wpisy użytkownika %1$s, strona %2$d"
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %1$s is a user nickname, %2$s is a hashtag.
@@ -5681,6 +5269,12 @@ msgstr "Wpisy ze znacznikiem %1$s, strona %2$d"
 msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
 msgstr "Kanał wpisów dla %1$s ze znacznikiem %2$s (RSS 1.0)"
 
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#, php-format
+msgid "Notice feed for %s (Activity Streams JSON)"
+msgstr "Kanał wpisów dla %s (Activity Streams JSON)"
+
 #. TRANS: Title for link to notice feed.
 #. TRANS: %s is a user nickname.
 #, php-format
@@ -5705,7 +5299,7 @@ msgstr "Kanał wpisów dla %s (Atom)"
 msgid "FOAF for %s"
 msgstr "FOAF dla %s"
 
-#. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
+#. TRANS: First sentence of empty list message for a timeline. $1%s is a user nickname.
 #, php-format
 msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
 msgstr ""
@@ -5719,7 +5313,7 @@ msgstr ""
 "Widziałeś ostatnio coś interesującego? Nie wysłałeś jeszcze żadnych wpisów, "
 "teraz jest dobry czas, aby zacząć. :)"
 
-#. TRANS: Second sentence of empty  list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
+#. TRANS: Second sentence of empty  list message for a non-self timeline. %1$s is a user nickname, %2$s is a part of a URL.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
 #, php-format
 msgid ""
@@ -5729,7 +5323,7 @@ msgstr ""
 "Można spróbować szturchnąć użytkownika %1$s lub [wysłać mu coś](%%%%action."
 "newnotice%%%%?status_textarea=%2$s)."
 
-#. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
+#. TRANS: Announcement for anonymous users showing a timeline if site registrations are open.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
 #, php-format
 msgid ""
@@ -5741,20 +5335,20 @@ msgstr ""
 "**%s** posiada konto na %%%%site.name%%%%, usłudze [mikroblogowania](http://"
 "pl.wikipedia.org/wiki/Mikroblog) opartej na wolnym narzędziu [StatusNet]"
 "(http://status.net/). [Dołącz teraz](%%%%action.register%%%%), aby "
-"obserwować wpisy użytkownika **%s** i wiele więcej. ([Przeczytaj więcej](%%%%"
-"doc.help%%%%))"
+"obserwować wpisy użytkownika **%s** i wiele więcej. ([Dowiedz się więcej](%%%"
+"%doc.help%%%%))"
 
-#. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
+#. TRANS: Announcement for anonymous users showing a timeline if site registrations are closed or invite only.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
 "wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
-"[StatusNet](http://status.net/) tool. "
+"[StatusNet](http://status.net/) tool."
 msgstr ""
 "**%s** posiada konto na %%%%site.name%%%%, usłudze [mikroblogowania](http://"
 "pl.wikipedia.org/wiki/Mikroblog) opartej na wolnym narzędziu [StatusNet]"
-"(http://status.net/). "
+"(http://status.net/)."
 
 #. TRANS: Link to the author of a repeated notice. %s is a linked nickname.
 #, php-format
@@ -5771,10 +5365,9 @@ msgid "User is already silenced."
 msgstr "Użytkownik jest już wyciszony."
 
 #. TRANS: Title for site administration panel.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Site"
-msgstr "Witryny"
+msgstr "Witryna"
 
 #. TRANS: Instructions for site administration panel.
 msgid "Basic settings for this StatusNet site"
@@ -5788,6 +5381,14 @@ msgstr "Nazwa witryny nie może mieć zerową długość."
 msgid "You must have a valid contact email address."
 msgstr "Należy posiadać prawidłowy kontaktowy adres e-mail."
 
+#. TRANS: Client error displayed when a logo URL is not valid.
+msgid "Invalid logo URL."
+msgstr "Nieprawidłowy adres URL logo."
+
+#. TRANS: Client error displayed when a SSL logo URL is invalid.
+msgid "Invalid SSL logo URL."
+msgstr "Nieprawidłowy adres URL logo SSL."
+
 #. TRANS: Client error displayed trying to save site settings with an invalid language code.
 #. TRANS: %s is the invalid language code.
 #, php-format
@@ -5803,54 +5404,47 @@ msgid "Dupe limit must be one or more seconds."
 msgstr "Ograniczenie duplikatów musi wynosić jedną lub więcej sekund."
 
 #. TRANS: Fieldset legend on site settings panel.
-#, fuzzy
 msgctxt "LEGEND"
 msgid "General"
 msgstr "Ogólne"
 
 #. TRANS: Field label on site settings panel.
-#, fuzzy
 msgctxt "LABEL"
 msgid "Site name"
 msgstr "Nazwa witryny"
 
 #. TRANS: Field title on site settings panel.
-#, fuzzy
 msgid "The name of your site, like \"Yourcompany Microblog\"."
-msgstr "Nazwa strony, taka jak \"Mikroblog firmy X\""
+msgstr "Nazwa strony, w stylu \"Mikroblog firmy X\"."
 
 #. TRANS: Field label on site settings panel.
 msgid "Brought by"
 msgstr "Dostarczane przez"
 
 #. TRANS: Field title on site settings panel.
-#, fuzzy
 msgid "Text used for credits link in footer of each page."
-msgstr "Tekst używany do odnośnika do zasług w stopce każdej strony"
+msgstr "Tekst używany w łączu do podziękowań na stopce każdej strony."
 
 #. TRANS: Field label on site settings panel.
 msgid "Brought by URL"
 msgstr "Adres URL \"Dostarczane przez\""
 
 #. TRANS: Field title on site settings panel.
-#, fuzzy
 msgid "URL used for credits link in footer of each page."
-msgstr "Adres URL używany do odnośnika do zasług w stopce każdej strony"
+msgstr "Adres URL używany do odnośnika do podziękowań na stopce każdej strony."
 
 #. TRANS: Field label on site settings panel.
 msgid "Email"
 msgstr "E-mail"
 
 #. TRANS: Field title on site settings panel.
-#, fuzzy
 msgid "Contact email address for your site."
-msgstr "Kontaktowy adres e-mail witryny"
+msgstr "Kontaktowy adres e-mail witryny."
 
 #. TRANS: Fieldset legend on site settings panel.
-#, fuzzy
 msgctxt "LEGEND"
 msgid "Local"
-msgstr "Lokalne"
+msgstr "Lokalizacja"
 
 #. TRANS: Dropdown label on site settings panel.
 msgid "Default timezone"
@@ -5865,13 +5459,13 @@ msgid "Default language"
 msgstr "Domyślny język"
 
 #. TRANS: Dropdown title on site settings panel.
-msgid "Site language when autodetection from browser settings is not available"
+msgid ""
+"The site language when autodetection from browser settings is not available."
 msgstr ""
-"Język witryny, kiedy automatyczne wykrywanie z ustawień przeglądarki nie "
-"jest dostępne"
+"Język witryny, kiedy nie jest dostępne automatyczne wykrywanie z ustawień "
+"przeglÄ…darki."
 
 #. TRANS: Fieldset legend on site settings panel.
-#, fuzzy
 msgctxt "LEGEND"
 msgid "Limits"
 msgstr "Ograniczenia"
@@ -5894,9 +5488,21 @@ msgstr ""
 "Ile czasu użytkownicy muszą czekać (w sekundach), aby ponownie wysłać to "
 "samo."
 
+#. TRANS: Fieldset legend for form to change logo.
+msgid "Logo"
+msgstr "Logo"
+
+#. TRANS: Field label for StatusNet site logo.
+msgid "Site logo"
+msgstr "Logo witryny"
+
+#. TRANS: Field label for SSL StatusNet site logo.
+msgid "SSL logo"
+msgstr "Logo SSL"
+
 #. TRANS: Button title for saving site settings.
-msgid "Save site settings"
-msgstr "Zapisz ustawienia witryny"
+msgid "Save the site settings."
+msgstr "Zapisz ustawienia witryny."
 
 #. TRANS: Page title for site-wide notice tab in admin panel.
 msgid "Site Notice"
@@ -5923,10 +5529,9 @@ msgid "Site-wide notice text (255 characters maximum; HTML allowed)"
 msgstr ""
 "Tekst wpisu witryny (maksymalnie 255 znaków, można używać znaczników HTML)"
 
-#. TRANS: Title for button to save site notice in admin panel.
-#, fuzzy
+#. TRANS: Button title to save site notice in admin panel.
 msgid "Save site notice."
-msgstr "Zapisz wpis witryny"
+msgstr "Zapisz wpis witryny."
 
 #. TRANS: Title for SMS settings.
 msgid "SMS settings"
@@ -5972,9 +5577,8 @@ msgid "SMS phone number"
 msgstr "Numer telefonu SMS"
 
 #. TRANS: SMS phone number input field instructions in SMS settings form.
-#, fuzzy
 msgid "Phone number, no punctuation or spaces, with area code."
-msgstr "Numer telefonu, bez znaków przestankowych i spacji, z kodem państwa"
+msgstr "Numer telefonu, bez znaków przestankowych i spacji, z kodem państwa."
 
 #. TRANS: Form legend for SMS preferences form.
 msgid "SMS preferences"
@@ -6021,9 +5625,8 @@ msgid "That is the wrong confirmation number."
 msgstr "To jest błędny numer potwierdzenia."
 
 #. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
-#, fuzzy
 msgid "Could not delete SMS confirmation."
-msgstr "Nie można usunąć potwierdzenia komunikatora."
+msgstr "Nie można usunąć potwierdzenia SMS."
 
 #. TRANS: Message given after successfully canceling SMS phone number confirmation.
 msgid "SMS confirmation cancelled."
@@ -6058,12 +5661,10 @@ msgstr ""
 "e-mail na %s (w języku angielskim), aby nam o tym powiedzieć."
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
-#, fuzzy
 msgid "No code entered."
-msgstr "Nie podano kodu"
+msgstr "Nie podano kodu."
 
 #. TRANS: Title for admin panel to configure snapshots.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Snapshots"
 msgstr "Migawki"
@@ -6085,7 +5686,6 @@ msgid "Invalid snapshot report URL."
 msgstr "Nieprawidłowy adres URL zgłaszania migawek."
 
 #. TRANS: Fieldset legend on admin panel for snapshots.
-#, fuzzy
 msgctxt "LEGEND"
 msgid "Snapshots"
 msgstr "Migawki"
@@ -6103,32 +5703,28 @@ msgid "Data snapshots"
 msgstr "Migawki danych"
 
 #. TRANS: Dropdown title for snapshot method in admin panel for snapshots.
-#, fuzzy
 msgid "When to send statistical data to status.net servers."
-msgstr "Kiedy wysyłać dane statystyczne na serwery status.net"
+msgstr "Kiedy wysyłać dane statystyczne na serwery status.net."
 
 #. TRANS: Input field label for snapshot frequency in admin panel for snapshots.
 msgid "Frequency"
 msgstr "Częstotliwość"
 
 #. TRANS: Input field title for snapshot frequency in admin panel for snapshots.
-#, fuzzy
 msgid "Snapshots will be sent once every N web hits."
-msgstr "Migawki będą wysyłane co N trafień WWW"
+msgstr "Migawki będą wysyłane co N trafień sieci."
 
 #. TRANS: Input field label for snapshot report URL in admin panel for snapshots.
 msgid "Report URL"
 msgstr "Adres URL zgłaszania"
 
 #. TRANS: Input field title for snapshot report URL in admin panel for snapshots.
-#, fuzzy
 msgid "Snapshots will be sent to this URL."
-msgstr "Migawki będą wysyłane na ten adres URL"
+msgstr "Migawki będą wysyłane na ten adres URL."
 
-#. TRANS: Title for button to save snapshot settings.
-#, fuzzy
+#. TRANS: Button title to save snapshot settings.
 msgid "Save snapshot settings."
-msgstr "Zapisz ustawienia migawki"
+msgstr "Zapisz ustawienia migawki."
 
 #. TRANS: Client error displayed trying a change a subscription for a non-subscribed profile.
 msgid "You are not subscribed to that profile."
@@ -6141,56 +5737,48 @@ msgstr "Nie można zapisać subskrypcji."
 
 #. TRANS: Client error displayed when trying to approve group applicants without being a group administrator.
 msgid "You may only approve your own pending subscriptions."
-msgstr ""
+msgstr "Możesz zatwierdzić tylko zatwierdzić własne oczekujące subskrypcje."
 
 #. TRANS: Title of the first page showing pending subscribers still awaiting approval.
 #. TRANS: %s is the name of the user.
-#, fuzzy, php-format
+#, php-format
 msgid "%s subscribers awaiting approval"
-msgstr "%s członków grupy"
+msgstr "Subskrypcja %s oczekuje na zatwierdzenie"
 
 #. TRANS: Title of all but the first page showing pending subscribersmembers still awaiting approval.
 #. TRANS: %1$s is the name of the user, %2$d is the page number of the members list.
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s subscribers awaiting approval, page %2$d"
-msgstr "Członkowie grupy %1$s, strona %2$d"
+msgstr "Subskrybenci użytkownika %1$s oczekujący na zatwierdzenie, strona %2$d"
 
 #. TRANS: Page notice for group members page.
-#, fuzzy
 msgid "A list of users awaiting approval to subscribe to you."
-msgstr "Lista użytkowników znajdujących się w tej grupie."
-
-#. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
-msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
 msgstr ""
-"Nie można subskrybować zdalnego profilu profilu OMB 0.1 za pomocą tej "
-"czynności."
+"Lista użytkowników oczekujących na zatwierdzenie subskrypcji twoich wpisów."
 
 #. TRANS: Page title when subscription succeeded.
 msgid "Subscribed"
 msgstr "Subskrybowano"
 
 #. TRANS: Client error displayed when trying to perform an action while not logged in.
-#, fuzzy
 msgid "You must be logged in to unsubscribe from a list."
-msgstr "Musisz być zalogowany, aby utworzyć grupę."
+msgstr "Musisz być zalogowany, wypisać się z subskrypcji listy."
 
 #. TRANS: Client error displayed when trying to perform an action without providing an ID.
-#, fuzzy
 msgid "No ID given."
-msgstr "Brak parametru identyfikatora."
+msgstr "Brak identyfikatora."
 
 #. TRANS: Server error displayed subscribing to a list fails.
 #. TRANS: %1$s is a user nickname, %2$s is a list, %3$s is the error message (no period).
-#, fuzzy, php-format
+#, php-format
 msgid "Could not subscribe user %1$s to list %2$s: %3$s"
-msgstr "Nie można dołączyć użytkownika %1$s do grupy %2$s."
+msgstr "Nie udało się subskrybować użytkownika %1$s do listy %2$s: %3$s"
 
 #. TRANS: Title of form to subscribe to a list.
 #. TRANS: %1%s is a user nickname, %2$s is a list, %3$s is a tagger nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s subscribed to list %2$s by %3$s"
-msgstr "Subskrybenci użytkownika %1$s, strona %2$d"
+msgstr "Użytkownik %1$s subskrybowany do listy %2$s użytkownika %3$s"
 
 #. TRANS: Header for list of subscribers for a user (first page).
 #. TRANS: %s is the user's nickname.
@@ -6268,15 +5856,12 @@ msgid ""
 "You're not listening to anyone's notices right now, try subscribing to "
 "people you know. Try [people search](%%action.peoplesearch%%), look for "
 "members in groups you're interested in and in our [featured users](%%action."
-"featured%%). If you're a [Twitter user](%%action.twittersettings%%), you can "
-"automatically subscribe to people you already follow there."
+"featured%%)."
 msgstr ""
-"Nie obserwujesz teraz wpisów innych użytkowników. Spróbuj subskrybować "
+"Nie obserwujesz teraz wpisów innych użytkowników, spróbuj subskrybować "
 "osoby, które znasz. Spróbuj [wyszukać kogoś](%%action.peoplesearch%%), "
-"poszukać członków grup, które cię interesują, a także [znanych użytkowników]"
-"(%%action.featured%%). Jeśli jesteś [użytkownikiem serwisu Twitter](%%action."
-"twittersettings%%), można automatycznie subskrybować osoby, które tam już "
-"obserwujesz."
+"poszukać osób należących do grup, które cię interesują, a także [znanych "
+"użytkowników](%%action.featured%%)."
 
 #. TRANS: Subscription list text when looking at the subscriptions for a of a user other
 #. TRANS: than the logged in user that has no subscriptions. %s is the user nickname.
@@ -6292,7 +5877,6 @@ msgid "Subscription feed for %s (Atom)"
 msgstr "Kanał subskrypcji dla %s (Atom)"
 
 #. TRANS: Checkbox label for enabling IM messages for a profile in a subscriptions list.
-#, fuzzy
 msgctxt "LABEL"
 msgid "IM"
 msgstr "Komunikator"
@@ -6307,6 +5891,12 @@ msgstr "SMS"
 msgid "Notices tagged with %1$s, page %2$d"
 msgstr "Wpisy ze znacznikiem %1$s, strona %2$d"
 
+#. TRANS: Link label for feed on "notices with tag" page.
+#. TRANS: %s is the tag the feed is for.
+#, php-format
+msgid "Notice feed for tag %s (Activity Streams JSON)"
+msgstr "Kanał wpisów dla znacznika %s (Activity Streams JSON)"
+
 #. TRANS: Link label for feed on "notices with tag" page.
 #. TRANS: %s is the tag the feed is for.
 #, php-format
@@ -6328,68 +5918,58 @@ msgstr "Kanał wpisów dla znacznika %s (Atom)"
 #. TRANS: Client error displayed when trying to tag a user that cannot be tagged.
 #. TRANS: Client exception thrown trying to set a tag for a user that cannot be tagged.
 #. TRANS: Error displayed when trying to tag a user that cannot be tagged.
-#, fuzzy
 msgid "You cannot tag this user."
-msgstr "Nie można wysłać wiadomości do tego użytkownika."
+msgstr "Nie można oznaczyć tego użytkownika."
 
 #. TRANS: Title for list form when not on a profile page.
-#, fuzzy
 msgid "List a profile"
-msgstr "Profil użytkownika"
+msgstr "Profil listowy"
 
 #. TRANS: Title for list form when on a profile page.
 #. TRANS: %s is a profile nickname.
-#, fuzzy, php-format
+#, php-format
 msgctxt "ADDTOLIST"
 msgid "List %s"
-msgstr "Ograniczenia"
+msgstr "Lista %s"
 
 #. TRANS: Title for list form when an error has occurred.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Error"
-msgstr "BÅ‚Ä…d AJAX"
+msgstr "BÅ‚Ä…d"
 
 #. TRANS: Header in list form.
 msgid "User profile"
 msgstr "Profil użytkownika"
 
 #. TRANS: Fieldset legend for list form.
-#, fuzzy
 msgid "List user"
-msgstr "Ograniczenia"
+msgstr "Użytkownik listowy"
 
 #. TRANS: Field label on list form.
-#, fuzzy
 msgctxt "LABEL"
 msgid "Lists"
-msgstr "Ograniczenia"
+msgstr "Listy"
 
 #. TRANS: Field title on list form.
-#, fuzzy
 msgid ""
 "Lists for this user (letters, numbers, -, ., and _), comma- or space- "
 "separated."
 msgstr ""
-"Znaczniki dla siebie (litery, liczby, -, . i _), oddzielone przecinkami lub "
-"spacjami"
+"Listy dla tego użytkownika (litery, liczby, -, . i _), oddzielone "
+"przecinkami lub spacjami."
 
 #. TRANS: Title for personal tag cloud section.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Tags"
 msgstr "Znaczniki"
 
 #. TRANS: Success message if lists are saved.
-#, fuzzy
 msgid "Lists saved."
-msgstr "Zapisano hasło."
+msgstr "Zapisano listy."
 
 #. TRANS: Page notice.
-#, fuzzy
 msgid "Use this form to add your subscribers or subscriptions to lists."
-msgstr ""
-"Użyj tego formularza, aby dodać znaczniki subskrybentom lub subskrypcjom."
+msgstr "Użyj tego formularza, aby dodać subskrybentów lub subskrypcje do list."
 
 #. TRANS: Client error when requesting a tag feed for a non-existing tag.
 msgid "No such tag."
@@ -6413,26 +5993,13 @@ msgstr "Zrezygnowano z subskrypcji"
 
 #. TRANS: Page title for form that allows unsubscribing from a list.
 #. TRANS: %1$s is a nickname, %2$s is a list, %3$s is a tagger nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s unsubscribed from list %2$s by %3$s"
-msgstr "Subskrybenci użytkownika %1$s, strona %2$d"
-
-#. TRANS: Client error displayed when trying to update profile with an incompatible license.
-#. TRANS: %1$s is the license incompatible with site license %2$s.
-#. TRANS: Exception thrown when licenses are not compatible for an authorisation request.
-#. TRANS: %1$s is the license for the listenee, %2$s is the license for "this" StatusNet site.
-#, fuzzy, php-format
-msgid ""
-"Listenee stream license \"%1$s\" is not compatible with site license \"%2$s"
-"\"."
-msgstr ""
-"Licencja nasłuchiwanego strumienia \"%1$s\" nie jest zgodna z licencją "
-"witryny \"%2$s\"."
+msgstr "%1$s wypisany z subskrypcji listy %2$s użytkownika %3$s"
 
 #. TRANS: Title of URL settings tab in profile settings.
-#, fuzzy
 msgid "URL settings"
-msgstr "Ustawienia komunikatora"
+msgstr "Ustawienia URL"
 
 #. TRANS: Instructions for tab "Other" in user profile settings.
 msgid "Manage various other options."
@@ -6445,13 +6012,12 @@ msgid " (free service)"
 msgstr " (wolna usługa)"
 
 #. TRANS: Default value for URL shortening settings.
-#, fuzzy
 msgid "[none]"
-msgstr "Brak"
+msgstr "[brak]"
 
 #. TRANS: Default value for URL shortening settings.
 msgid "[internal]"
-msgstr ""
+msgstr "[wewnętrzne]"
 
 #. TRANS: Label for dropdown with URL shortener services.
 msgid "Shorten URLs with"
@@ -6463,38 +6029,42 @@ msgstr "Używana automatyczna usługa skracania."
 
 #. TRANS: Field label in URL settings in profile.
 msgid "URL longer than"
-msgstr ""
+msgstr "Adres URL dłuższy niż"
 
 #. TRANS: Field title in URL settings in profile.
 msgid "URLs longer than this will be shortened, 0 means always shorten."
 msgstr ""
+"Adresy URL dłuższe niż ta wartość zostaną skrócone, 0 oznacza pełne "
+"usunięcie."
 
 #. TRANS: Field label in URL settings in profile.
 msgid "Text longer than"
-msgstr ""
+msgstr "Tekst dłuższy niż"
 
 #. TRANS: Field title in URL settings in profile.
 msgid ""
 "URLs in notices longer than this will be shortened, 0 means always shorten."
 msgstr ""
+"Adresy URL we wpisach dłuższe niż ta wartość zostaną skrócone, 0 oznacza "
+"pełne usnięcie."
 
 #. TRANS: Form validation error for form "Other settings" in user profile.
 msgid "URL shortening service is too long (maximum 50 characters)."
 msgstr "Adres URL usługi skracania jest za długi (maksymalnie 50 znaków)."
 
 #. TRANS: Client exception thrown when the maximum URL settings value is invalid in profile URL settings.
-#, fuzzy
 msgid "Invalid number for maximum URL length."
-msgstr "Nieprawidłowa treść wpisu."
+msgstr "Nieprawidłowa liczba dla maksymalnej długości adresu URL."
 
 #. TRANS: Client exception thrown when the maximum notice length settings value is invalid in profile URL settings.
-#, fuzzy
 msgid "Invalid number for maximum notice length."
-msgstr "Nieprawidłowa treść wpisu."
+msgstr "Nieprawidłowa liczba dla maksymalnej długości wpisu."
 
 #. TRANS: Server exception thrown in profile URL settings when preferences could not be saved.
 msgid "Error saving user URL shortening preferences."
 msgstr ""
+"Wystąpił błąd podczas zapisywania preferencji użytkownika skracania adresu "
+"URL."
 
 #. TRANS: User admin panel title.
 msgctxt "TITLE"
@@ -6515,12 +6085,11 @@ msgstr "Nieprawidłowy tekst powitania. Maksymalna długość to 255 znaków."
 
 #. TRANS: Client error displayed when trying to set a non-existing user as default subscription for new
 #. TRANS: users in user admin panel. %1$s is the invalid nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "Invalid default subscripton: \"%1$s\" is not a user."
 msgstr "Nieprawidłowa domyślna subskrypcja: \"%1$s\" nie jest użytkownikiem."
 
 #. TRANS: Fieldset legend in user administration panel.
-#, fuzzy
 msgctxt "LEGEND"
 msgid "Profile"
 msgstr "Profil"
@@ -6565,159 +6134,9 @@ msgstr "Zaproszenia są włączone"
 msgid "Whether to allow users to invite new users."
 msgstr "Czy zezwolić użytkownikom zapraszanie nowych użytkowników."
 
-#. TRANS: Title for button to save user settings in user admin panel.
-#, fuzzy
+#. TRANS: Button title to save user settings in user admin panel.
 msgid "Save user settings."
-msgstr "Zapisz ustawienia użytkownika"
-
-#. TRANS: Page title.
-msgid "Authorize subscription"
-msgstr "Upoważnij subskrypcję"
-
-#. TRANS: Page notice on "Authorize subscription" page.
-#, fuzzy
-msgid ""
-"Please check these details to make sure that you want to subscribe to this "
-"user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
-"click \"Reject\"."
-msgstr ""
-"Sprawdź te szczegóły, aby upewnić się, czy na pewno chcesz subskrybować "
-"wpisy tego użytkownika. Jeżeli nie prosiłeś o subskrypcję czyichś wpisów, "
-"naciśnij \"Odrzuć\"."
-
-#. TRANS: Button text on Authorise Subscription page.
-#. TRANS: Submit button text to accept a group membership request on approve group form.
-#. TRANS: Submit button text to accept a subscription request on approve sub form.
-#, fuzzy
-msgctxt "BUTTON"
-msgid "Accept"
-msgstr "Zaakceptuj"
-
-#. TRANS: Title for button on Authorise Subscription page.
-#. TRANS: Button title to subscribe to a user.
-#, fuzzy
-msgid "Subscribe to this user."
-msgstr "Subskrybuj tego użytkownika"
-
-#. TRANS: Button text on Authorise Subscription page.
-#. TRANS: Submit button text to reject a group membership request on approve group form.
-#. TRANS: Submit button text to reject a subscription request on approve sub form.
-#, fuzzy
-msgctxt "BUTTON"
-msgid "Reject"
-msgstr "Odrzuć"
-
-#. TRANS: Title for button on Authorise Subscription page.
-#, fuzzy
-msgid "Reject this subscription."
-msgstr "Odrzuć tę subskrypcję"
-
-#. TRANS: Client error displayed for an empty authorisation request.
-msgid "No authorization request!"
-msgstr "Brak żądania upoważnienia."
-
-#. TRANS: Accept message header from Authorise subscription page.
-msgid "Subscription authorized"
-msgstr "Upoważniono subskrypcję"
-
-#. TRANS: Accept message text from Authorise subscription page.
-msgid ""
-"The subscription has been authorized, but no callback URL was passed. Check "
-"with the site's instructions for details on how to authorize the "
-"subscription. Your subscription token is:"
-msgstr ""
-"Subskrypcja została upoważniona, ale nie przekazano zwrotnego adresu URL. "
-"Sprawdź w instrukcjach witryny, jak upoważnić subskrypcję. Token subskrypcji:"
-
-#. TRANS: Reject message header from Authorise subscription page.
-msgid "Subscription rejected"
-msgstr "Odrzucono subskrypcjÄ™"
-
-#. TRANS: Reject message from Authorise subscription page.
-msgid ""
-"The subscription has been rejected, but no callback URL was passed. Check "
-"with the site's instructions for details on how to fully reject the "
-"subscription."
-msgstr ""
-"Subskrypcja została odrzucona, ale nie przekazano zwrotnego adresu URL. "
-"Sprawdź w instrukcjach witryny, jak w pełni odrzucić subskrypcję."
-
-#. TRANS: Exception thrown when no valid user is found for an authorisation request.
-#. TRANS: %s is a listener URI.
-#, fuzzy, php-format
-msgid "Listener URI \"%s\" not found here."
-msgstr "Adres URI nasłuchującego \"%s\" nie został tutaj odnaleziony."
-
-#. TRANS: Exception thrown when listenee URI is too long for an authorisation request.
-#. TRANS: %s is a listenee URI.
-#, fuzzy, php-format
-msgid "Listenee URI \"%s\" is too long."
-msgstr "Adres URI nasłuchującego \"%s\" jest za długi."
-
-#. TRANS: Exception thrown when listenee URI is a local user for an authorisation request.
-#. TRANS: %s is a listenee URI.
-#, fuzzy, php-format
-msgid "Listenee URI \"%s\" is a local user."
-msgstr "Adres URI nasłuchującego \"%s\" jest lokalnym użytkownikiem."
-
-#. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
-#. TRANS: %s is a profile URL.
-#, fuzzy, php-format
-msgid "Profile URL \"%s\" is for a local user."
-msgstr "Adres URL profilu \"%s\" jest dla lokalnego użytkownika."
-
-#. TRANS: Exception thrown when avatar URL is invalid for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#, fuzzy, php-format
-msgid "Avatar URL \"%s\" is not valid."
-msgstr "Adres URL \"%s\" jest nieprawidłowy."
-
-#. TRANS: Exception thrown when avatar URL could not be read for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#, fuzzy, php-format
-msgid "Cannot read avatar URL \"%s\"."
-msgstr "Nie można odczytać adresu URL awatara \"%s\"."
-
-#. TRANS: Exception thrown when avatar URL return an invalid image type for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#, fuzzy, php-format
-msgid "Wrong image type for avatar URL \"%s\"."
-msgstr "Błędny typ obrazu dla adresu URL awatara \"%s\"."
-
-#. TRANS: Title for profile design page.
-#. TRANS: Page title for profile design page.
-msgid "Profile design"
-msgstr "WyglÄ…d profilu"
-
-#. TRANS: Instructions for Profile design page.
-#. TRANS: Instructions for profile design page.
-msgid ""
-"Customize the way your profile looks with a background image and a colour "
-"palette of your choice."
-msgstr ""
-"Dostosuj wygląd profilu za pomocą wybranego obrazu tła i palety kolorów."
-
-#. TRANS: Succes message on Profile design page when finding an easter egg.
-msgid "Enjoy your hotdog!"
-msgstr "Smacznego hot-doga."
-
-#. TRANS: Form legend on Profile design page.
-#, fuzzy
-msgid "Design settings"
-msgstr "Zapisz ustawienia witryny"
-
-#. TRANS: Checkbox label on Profile design page.
-msgid "View profile designs"
-msgstr "Wyświetl ustawienia wyglądu profilu"
-
-#. TRANS: Title for checkbox on Profile design page.
-msgid "Show or hide profile designs."
-msgstr "Wyświetl lub ukryj ustawienia wyglądu profilu."
-
-#. TRANS: Form legend on Profile design page for form to choose a background image.
-#, fuzzy
-msgid "Background file"
-msgstr "TÅ‚o"
+msgstr "Zapisz ustawienia użytkownika."
 
 #. TRANS: Page title for all but the first page of groups for a user.
 #. TRANS: %1$s is a nickname, %2$d is a page number.
@@ -6759,10 +6178,10 @@ msgstr "StatusNet %s"
 #. TRANS: %1$s is the engine name (StatusNet) and %2$s is the StatusNet version.
 #, php-format
 msgid ""
-"This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, "
+"This site is powered by %1$s version %2$s, Copyright 2008-2011 StatusNet, "
 "Inc. and contributors."
 msgstr ""
-"Ta witryna korzysta z oprogramowania %1$s w wersji %2$s, Copyright 2008-2010 "
+"Ta witryna korzysta z oprogramowania %1$s w wersji %2$s, Copyright 2008-2011 "
 "StatusNet, Inc. i współtwórcy."
 
 #. TRANS: Header for StatusNet contributors section on the version page.
@@ -6778,25 +6197,26 @@ msgid ""
 "StatusNet is free software: you can redistribute it and/or modify it under "
 "the terms of the GNU Affero General Public License as published by the Free "
 "Software Foundation, either version 3 of the License, or (at your option) "
-"any later version. "
+"any later version."
 msgstr ""
-"Program StatusNet jest wolnym oprogramowaniem; można go rozprowadzać dalej i/"
+"Program StatusNet jest wolnym oprogramowaniem: można go rozprowadzać dalej i/"
 "lub modyfikować na warunkach Powszechnej Licencji Publicznej Affero GNU, "
 "wydanej przez FundacjÄ™ Wolnego Oprogramowania (Free Software Foundation) - "
-"według wersji trzeciej tej Licencji lub którejś z późniejszych wersji. "
+"według wersji trzeciej tej Licencji lub (jeśli tak zdecydujesz) którejś z "
+"późniejszych wersji."
 
 #. TRANS: Content part of StatusNet version page.
 msgid ""
 "This program is distributed in the hope that it will be useful, but WITHOUT "
 "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
 "FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License "
-"for more details. "
+"for more details."
 msgstr ""
 "Niniejszy program rozpowszechniany jest z nadzieją, iż będzie on użyteczny - "
 "jednak BEZ JAKIEJKOLWIEK GWARANCJI, nawet domyślnej gwarancji PRZYDATNOŚCI "
 "HANDLOWEJ albo PRZYDATNOŚCI DO OKREŚLONYCH ZASTOSOWAŃ. W celu uzyskania "
 "bliższych informacji należy zapoznać się z Powszechną Licencją Publiczną "
-"Affero GNU. "
+"Affero GNU."
 
 #. TRANS: Content part of StatusNet version page.
 #. TRANS: %s is a link to the AGPL license with link description "http://www.gnu.org/licenses/agpl.html".
@@ -6814,25 +6234,21 @@ msgid "Plugins"
 msgstr "Wtyczki"
 
 #. TRANS: Column header for plugins table on version page.
-#, fuzzy
 msgctxt "HEADER"
 msgid "Name"
 msgstr "Nazwa"
 
 #. TRANS: Column header for plugins table on version page.
-#, fuzzy
 msgctxt "HEADER"
 msgid "Version"
 msgstr "Wersja"
 
 #. TRANS: Column header for plugins table on version page.
-#, fuzzy
 msgctxt "HEADER"
 msgid "Author(s)"
-msgstr "Autorzy"
+msgstr "Autor(�rzy)"
 
 #. TRANS: Column header for plugins table on version page.
-#, fuzzy
 msgctxt "HEADER"
 msgid "Description"
 msgstr "Opis"
@@ -6856,25 +6272,36 @@ msgstr "Nie można przetworzyć adresu URL \"%s\""
 msgid "Robin thinks something is impossible."
 msgstr "Robin sądzi, że coś jest niemożliwe."
 
+#. TRANS: Message used to be inserted as %2$s in  the text "No file may
+#. TRANS: be larger than %1$d byte and the file you sent was %2$s.".
+#. TRANS: %1$d is the number of bytes of an uploaded file.
+#, php-format
+msgid "%1$d byte"
+msgid_plural "%1$d bytes"
+msgstr[0] "%1$d bajt"
+msgstr[1] "%1$d bajty"
+msgstr[2] "%1$d bajtów"
+
 #. TRANS: Message given if an upload is larger than the configured maximum.
-#. TRANS: %1$d is the byte limit for uploads, %2$d is the byte count for the uploaded file.
-#. TRANS: %1$s is used for plural.
+#. TRANS: %1$d (used for plural) is the byte limit for uploads,
+#. TRANS: %2$s is the proper form of "n bytes". This is the only ways to have
+#. TRANS: gettext support multiple plurals in the same message, unfortunately...
 #, php-format
 msgid ""
-"No file may be larger than %1$d byte and the file you sent was %2$d bytes. "
-"Try to upload a smaller version."
+"No file may be larger than %1$d byte and the file you sent was %2$s. Try to "
+"upload a smaller version."
 msgid_plural ""
-"No file may be larger than %1$d bytes and the file you sent was %2$d bytes. "
-"Try to upload a smaller version."
+"No file may be larger than %1$d bytes and the file you sent was %2$s. Try to "
+"upload a smaller version."
 msgstr[0] ""
-"Żaden plik nie może być większy niż %1$d bajt, a wysłany plik miał %2$d "
-"bajty. Proszę spróbować wysłać mniejszą wersję."
+"Żaden plik nie może być większy niż %1$d bajt, a wysłany plik miał %2$s. "
+"Proszę spróbować wysłać krótszą wersję."
 msgstr[1] ""
-"Żaden plik nie może być większy niż %1$d bajty, a wysłany plik miał %2$d "
-"bajty. Proszę spróbować wysłać mniejszą wersję."
+"Żaden plik nie może być większy niż %1$d bajty, a wysłany plik miał %2$s. "
+"Proszę spróbować wysłać krótszą wersję."
 msgstr[2] ""
-"Żaden plik nie może być większy niż %1$d bajtów, a wysłany plik miał %2$d "
-"bajtów. Proszę spróbować wysłać mniejszą wersję."
+"Żaden plik nie może być większy niż %1$d bajtów, a wysłany plik miał %2$s. "
+"Proszę spróbować wysłać krótszą wersję."
 
 #. TRANS: Message given if an upload would exceed user quota.
 #. TRANS: %d (number) is the user quota in bytes and is used for plural.
@@ -6951,6 +6378,11 @@ msgstr "Nie można zaktualizować lokalnej grupy."
 msgid "Could not create login token for %s"
 msgstr "Nie można utworzyć tokenów loginów dla %s"
 
+#. TRANS: Exception thrown when a program code class (%s) cannot be instantiated.
+#, php-format
+msgid "Cannot instantiate class %s."
+msgstr "Nie można utworzyć obiektu klasy %s."
+
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.
 msgid "No database name or DSN found anywhere."
 msgstr "Nigdzie nie odnaleziono nazwy lub DSN bazy danych."
@@ -6974,9 +6406,9 @@ msgid "No such profile (%1$d) for notice (%2$d)."
 msgstr "Brak profilu (%1$d) dla wpisu (%2$d)."
 
 #. TRANS: Server exception. %s are the error details.
-#, fuzzy, php-format
+#, php-format
 msgid "Database error inserting hashtag: %s."
-msgstr "BÅ‚Ä…d bazy danych podczas wprowadzania znacznika mieszania: %s"
+msgstr "BÅ‚Ä…d bazy danych podczas wprowadzania znacznika mieszania: %s."
 
 #. TRANS: Client exception thrown if a notice contains too many characters.
 msgid "Problem saving notice. Too long."
@@ -7006,23 +6438,20 @@ msgid "You are banned from posting notices on this site."
 msgstr "Zabroniono ci wysyłania wpisów na tej witrynie."
 
 #. TRANS: Client exception thrown in notice when trying to repeat a missing or deleted notice.
-#, fuzzy
 msgid "Cannot repeat; original notice is missing or deleted."
-msgstr "Nie można powtórzyć własnego wpisu."
+msgstr "Nie można powtórzyć, oryginalny wpis nie istnieje lub został usunięty."
 
 #. TRANS: Client error displayed when trying to repeat an own notice.
 msgid "You cannot repeat your own notice."
 msgstr "Nie można powtórzyć własnego wpisu."
 
 #. TRANS: Client error displayed when trying to repeat a non-public notice.
-#, fuzzy
 msgid "Cannot repeat a private notice."
-msgstr "Nie można powtórzyć własnego wpisu."
+msgstr "Nie można powtórzyć prywatnego wpisu."
 
 #. TRANS: Client error displayed when trying to repeat a notice you cannot access.
-#, fuzzy
 msgid "Cannot repeat a notice you cannot read."
-msgstr "Nie można powtórzyć własnego wpisu."
+msgstr "Nie można powtórzyć wpisu, którego nie możesz odczytać."
 
 #. TRANS: Client error displayed when trying to repeat an already repeated notice.
 msgid "You already repeated that notice."
@@ -7030,9 +6459,9 @@ msgstr "Już powtórzono ten wpis."
 
 #. TRANS: Client error displayed when trying to reply to a notice a the target has no access to.
 #. TRANS: %1$s is a user nickname, %2$d is a notice ID (number).
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s has no access to notice %2$d."
-msgstr "Użytkownik nie posiada ostatniego wpisu."
+msgstr "Użytkownik %1$s nie ma dostępu do wpisu %2$d."
 
 #. TRANS: Server exception thrown when a notice cannot be saved.
 #. TRANS: Server exception thrown when a notice cannot be updated.
@@ -7075,32 +6504,27 @@ msgstr ""
 
 #. TRANS: Server exception.
 msgid "The tag you are trying to rename to already exists."
-msgstr ""
+msgstr "Znacznik, któremu użytkownik próbuje zmienić nazwę już istnieje."
 
 #. TRANS: Server exception saving new tag without having a tagger specified.
-#, fuzzy
 msgid "No tagger specified."
-msgstr "Nie podano grupy."
+msgstr "Nie podano twórcy znacznika."
 
 #. TRANS: Server exception saving new tag without having a tag specified.
-#, fuzzy
 msgid "No tag specified."
-msgstr "Nie podano grupy."
+msgstr "Nie podano znacznika."
 
 #. TRANS: Server exception saving new tag.
-#, fuzzy
 msgid "Could not create profile tag."
-msgstr "Nie można zapisać profilu."
+msgstr "Nie można utworzyć znacznika profilu."
 
 #. TRANS: Server exception saving new tag.
-#, fuzzy
 msgid "Could not set profile tag URI."
-msgstr "Nie można zapisać profilu."
+msgstr "Nie można ustawić tagu URI profilu."
 
 #. TRANS: Server exception saving new tag.
-#, fuzzy
 msgid "Could not set profile tag mainpage."
-msgstr "Nie można zapisać profilu."
+msgstr "Nie można ustawić tagu strony głównej profilu."
 
 #. TRANS: Client exception thrown trying to set more tags than allowed.
 #, php-format
@@ -7108,23 +6532,26 @@ msgid ""
 "You already have created %d or more tags which is the maximum allowed number "
 "of tags. Try using or deleting some existing tags."
 msgstr ""
+"Zostało już przez ciebie utworzone  %d  lub więcej znaczników, co jest "
+"maksymalną dozwoloną liczba znaczników. Spróbuj użyć lub usunąć niektóre "
+"istniejÄ…ce znaczniki."
 
 #. TRANS: Client exception thrown when trying to add more people than allowed to a list.
 #, php-format
 msgid ""
 "You already have %1$d or more people in list %2$s, which is the maximum "
-"allowed number.Try unlisting others first."
+"allowed number. Try unlisting others first."
 msgstr ""
+"Masz już  %1$d  lub więcej osób na liście %2$s, co jest maksymalną dozwoloną "
+"liczbą. Spróbuj najpierw usunąć kogoś z listy."
 
 #. TRANS: Exception thrown when inserting a list subscription in the database fails.
-#, fuzzy
 msgid "Adding list subscription failed."
-msgstr "Nie można usunąć subskrypcji."
+msgstr "Nie udało się dodać subskrypcji listy."
 
 #. TRANS: Exception thrown when deleting a list subscription from the database fails.
-#, fuzzy
 msgid "Removing list subscription failed."
-msgstr "Nie można usunąć subskrypcji."
+msgstr "Nie udało się usunąć subskrypcji listy."
 
 #. TRANS: Exception thrown when a right for a non-existing user profile is checked.
 msgid "Missing profile."
@@ -7135,7 +6562,6 @@ msgid "Unable to save tag."
 msgstr "Nie można zapisać etykiety."
 
 #. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
-#. TRANS: Error message displayed to a banned user when they try to subscribe.
 msgid "You have been banned from subscribing."
 msgstr "Zablokowano subskrybowanie."
 
@@ -7155,16 +6581,11 @@ msgstr "Niesubskrybowane."
 msgid "Could not delete self-subscription."
 msgstr "Nie można usunąć autosubskrypcji."
 
-#. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
-msgid "Could not delete subscription OMB token."
-msgstr "Nie można usunąć tokenu subskrypcji OMB."
-
 #. TRANS: Exception thrown when a subscription could not be deleted on the server.
 msgid "Could not delete subscription."
 msgstr "Nie można usunąć subskrypcji."
 
 #. TRANS: Activity title when subscribing to another person.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Follow"
 msgstr "Obserwuj"
@@ -7183,7 +6604,7 @@ msgstr "Witaj w %1$s, @%2$s."
 
 #. TRANS: Exception thrown when trying view "repeated to me".
 msgid "Not implemented since inbox change."
-msgstr ""
+msgstr "Nie realizowane od zmiany skrzynki odbiorczej."
 
 #. TRANS: Server exception.
 msgid "No single user defined for single-user mode."
@@ -7194,6 +6615,18 @@ msgstr ""
 msgid "Single-user mode code called when not enabled."
 msgstr "Wywołano kod pojedynczego użytkownika, kiedy nie był włączony."
 
+#. TRANS: Information on password recovery form if no known username or e-mail address was specified.
+msgid "No user with that email address or username."
+msgstr "Brak użytkownika z tym adresem e-mail lub nazwą użytkownika."
+
+#. TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.
+msgid "No registered email address for that user."
+msgstr "Brak zarejestrowanych adresów e-mail dla tego użytkownika."
+
+#. TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.
+msgid "Error saving address confirmation."
+msgstr "BÅ‚Ä…d podczas zapisywania potwierdzenia adresu."
+
 #. TRANS: Server exception thrown when creating a group failed.
 msgid "Could not create group."
 msgstr "Nie można utworzyć grupy."
@@ -7238,23 +6671,19 @@ msgid "User deletion in progress..."
 msgstr "Trwa usuwanie użytkownika..."
 
 #. TRANS: Link title for link on user profile.
-#, fuzzy
 msgid "Edit profile settings."
-msgstr "Zmodyfikuj ustawienia profilu"
+msgstr "Edytuj ustawienia profilu."
 
 #. TRANS: Link text for link on user profile.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Edit"
 msgstr "Edycja"
 
 #. TRANS: Link title for link on user profile.
-#, fuzzy
 msgid "Send a direct message to this user."
-msgstr "Wyślij bezpośrednią wiadomość do tego użytkownika"
+msgstr "Wyślij bezpośrednią wiadomość do tego użytkownika."
 
 #. TRANS: Link text for link on user profile.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Message"
 msgstr "Wiadomość"
@@ -7292,7 +6721,6 @@ msgid "Show more"
 msgstr "Wyświetl więcej"
 
 #. TRANS: Inline reply form submit button: submits a reply comment.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Reply"
 msgstr "Odpowiedz"
@@ -7300,13 +6728,12 @@ msgstr "Odpowiedz"
 #. TRANS: Placeholder text for inline reply form. Clicking in this box will turn it into a mini notice form.
 #. TRANS: Field label for reply mini form.
 msgid "Write a reply..."
-msgstr ""
+msgstr "Napisz odpowiedź..."
 
 #. TRANS: Tab on the notice form.
-#, fuzzy
 msgctxt "TAB"
 msgid "Status"
-msgstr "StatusNet"
+msgstr "Status"
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
 #. TRANS: Text between [] is a link description, text between () is the link itself.
@@ -7414,7 +6841,7 @@ msgstr "Użytkownik jest już członkiem tej grupy."
 #. TRANS: %1$s is the source URI of the notice, %2$s is the URI of the author.
 #, php-format
 msgid "Already know about notice %1$s and  it has a different author %2$s."
-msgstr ""
+msgstr "Już wiem o wpisie %1$s i ma on innego autora  %2$s ."
 
 #. TRANS: Client exception thrown when trying to overwrite the author information for a non-trusted user during import.
 msgid "Not overwriting author info for non-trusted user."
@@ -7428,9 +6855,9 @@ msgid "No content for notice %s."
 msgstr "Brak zawartości dla wpisu %s."
 
 #. TRANS: Exception thrown if a non-existing user is provided. %s is a user ID.
-#, fuzzy, php-format
+#, php-format
 msgid "No such user \"%s\"."
-msgstr "Brak użytkownika %s."
+msgstr "Brak użytkownika \"%s\"."
 
 #. TRANS: Client exception thrown when post to collection fails with a 400 status.
 #. TRANS: %1$s is a URL, %2$s is the status, %s$s is the fail reason.
@@ -7471,29 +6898,12 @@ msgstr "showForm() nie jest zaimplementowane."
 msgid "saveSettings() not implemented."
 msgstr "saveSettings() nie jest zaimplementowane."
 
-#. TRANS: Client error message thrown if design settings could not be deleted in
-#. TRANS: the admin panel Design.
-msgid "Unable to delete design setting."
-msgstr "Nie można usunąć ustawienia wyglądu."
-
 #. TRANS: Header in administrator navigation panel.
-#. TRANS: Header in settings navigation panel.
-#, fuzzy
 msgctxt "HEADER"
 msgid "Home"
-msgstr "Strona domowa"
-
-#. TRANS: Menu item in administrator navigation panel.
-#. TRANS: Menu item in default local navigation panel.
-#. TRANS: Menu item in personal group navigation menu.
-#. TRANS: Menu item in settings navigation panel.
-#, fuzzy
-msgctxt "MENU"
-msgid "Home"
-msgstr "Strona domowa"
+msgstr "Strona główna"
 
 #. TRANS: Header in administrator navigation panel.
-#, fuzzy
 msgctxt "HEADER"
 msgid "Admin"
 msgstr "Administrator"
@@ -7507,23 +6917,11 @@ msgctxt "MENU"
 msgid "Site"
 msgstr "Witryna"
 
-#. TRANS: Menu item title in administrator navigation panel.
-msgid "Design configuration"
-msgstr "Konfiguracja wyglÄ…du"
-
-#. TRANS: Menu item in administrator navigation panel.
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: Menu item in settings navigation panel.
-msgctxt "MENU"
-msgid "Design"
-msgstr "WyglÄ…d"
-
 #. TRANS: Menu item title in administrator navigation panel.
 msgid "User configuration"
 msgstr "Konfiguracja użytkownika"
 
 #. TRANS: Menu item in administrator navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "User"
 msgstr "Użytkownik"
@@ -7533,7 +6931,6 @@ msgid "Access configuration"
 msgstr "Konfiguracja dostępu"
 
 #. TRANS: Menu item in administrator navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Access"
 msgstr "Dostęp"
@@ -7543,7 +6940,6 @@ msgid "Paths configuration"
 msgstr "Konfiguracja ścieżek"
 
 #. TRANS: Menu item in administrator navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Paths"
 msgstr "Ścieżki"
@@ -7553,7 +6949,6 @@ msgid "Sessions configuration"
 msgstr "Konfiguracja sesji"
 
 #. TRANS: Menu item in administrator navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Sessions"
 msgstr "Sesje"
@@ -7563,7 +6958,6 @@ msgid "Edit site notice"
 msgstr "Zmodyfikuj wpis witryny"
 
 #. TRANS: Menu item in administrator navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Site notice"
 msgstr "Wpis witryny"
@@ -7573,7 +6967,6 @@ msgid "Snapshots configuration"
 msgstr "Konfiguracja migawek"
 
 #. TRANS: Menu item in administrator navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Snapshots"
 msgstr "Migawki"
@@ -7583,18 +6976,15 @@ msgid "Set site license"
 msgstr "Ustaw licencjÄ™ witryny"
 
 #. TRANS: Menu item in administrator navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "License"
 msgstr "Licencja"
 
 #. TRANS: Menu item title in administrator navigation panel.
-#, fuzzy
 msgid "Plugins configuration"
-msgstr "Konfiguracja ścieżek"
+msgstr "Konfiguracja wtyczek"
 
 #. TRANS: Menu item in administrator navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Plugins"
 msgstr "Wtyczki"
@@ -7611,7 +7001,7 @@ msgstr "Brak aplikacji dla tego klucza klienta."
 
 #. TRANS: Authorization exception thrown when a user without API access tries to access the API.
 msgid "Not allowed to use API."
-msgstr ""
+msgstr "Niedozwolone użycie interfejsu API."
 
 #. TRANS: OAuth exception given when an incorrect access token was given for a user.
 msgid "Bad access token."
@@ -7626,39 +7016,6 @@ msgstr "Brak użytkownika dla tego tokenu."
 msgid "Could not authenticate you."
 msgstr "Nie można uwierzytelnić."
 
-#. TRANS: Server error displayed when trying to create an anynymous OAuth consumer.
-msgid "Could not create anonymous consumer."
-msgstr "Nie można utworzyć anonimowego klienta."
-
-#. TRANS: Server error displayed when trying to create an anynymous OAuth application.
-msgid "Could not create anonymous OAuth application."
-msgstr "Nie można utworzyć anonimowej aplikacji OAuth."
-
-#. TRANS: Exception thrown when no token association could be found.
-msgid ""
-"Could not find a profile and application associated with the request token."
-msgstr "Nie można odnaleźć profilu i aplikacji powiązanych z tokenem żądania."
-
-#. TRANS: Exception thrown when no access token can be issued.
-msgid "Could not issue access token."
-msgstr "Nie można wywołać tokenu żądania."
-
-#. TRANS: Exception thrown when a database error occurs.
-msgid "Database error inserting OAuth application user."
-msgstr "Błąd bazy danych podczas wprowadzania użytkownika aplikacji OAuth."
-
-#. TRANS: Exception thrown when a database error occurs.
-msgid "Database error updating OAuth application user."
-msgstr "Błąd bazy danych podczas aktualizowania użytkownika aplikacji OAuth."
-
-#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
-msgid "Tried to revoke unknown token."
-msgstr "Spróbowano unieważnić nieznany token."
-
-#. TRANS: Exception thrown when an attempt is made to remove a revoked token.
-msgid "Failed to delete revoked token."
-msgstr "Usunięcie unieważnionego tokenu nie powiodło się."
-
 #. TRANS: Form input field label for application icon.
 msgid "Icon"
 msgstr "Ikona"
@@ -7741,18 +7098,16 @@ msgstr ""
 "Domyślny dostęp do tej aplikacji: tylko do odczytu lub do odczytu i zapisu"
 
 #. TRANS: Submit button title.
-msgid "Cancel"
-msgstr "Anuluj"
+msgid "Cancel application changes."
+msgstr "Anulowanie zmian aplikacji."
 
 #. TRANS: Submit button title.
-#. TRANS: Button text to save a list.
-msgid "Save"
-msgstr "Zapisz"
+msgid "Save application changes."
+msgstr "Zapis zmian aplikacji."
 
 #. TRANS: Name for an anonymous application in application list.
-#, fuzzy
 msgid "Unknown application"
-msgstr "Nieznane działanie"
+msgstr "Nieznana aplikacja"
 
 #. TRANS: Message has a leading space and a trailing space. Used in application list.
 #. TRANS: Before this message the application name is put, behind it the organisation that manages it.
@@ -7783,6 +7138,18 @@ msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "Unieważnij"
 
+#. TRANS: Submit button text to accept a group membership request on approve group form.
+#. TRANS: Submit button text to accept a subscription request on approve sub form.
+msgctxt "BUTTON"
+msgid "Accept"
+msgstr "Akceptuj"
+
+#. TRANS: Submit button text to reject a group membership request on approve group form.
+#. TRANS: Submit button text to reject a subscription request on approve sub form.
+msgctxt "BUTTON"
+msgid "Reject"
+msgstr "Odrzuć"
+
 #. TRANS: Atom feed exception thrown when an author element does not contain a name element.
 msgid "Author element must contain a name element."
 msgstr "Element \"author\" musi zawierać element \"name\"."
@@ -7792,15 +7159,15 @@ msgid "Do not use this method!"
 msgstr "Nie należy używać tej metody."
 
 #. TRANS: Title in atom list notice feed. %1$s is a list name, %2$s is a tagger's nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "Timeline for people in list %1$s by %2$s"
-msgstr "odpowiedzi dla użytkownika %1$s na %2$s."
+msgstr "Strumień dla ludzi z listy %1$s użytkownika %2$s."
 
 #. TRANS: Message is used as a subtitle in atom list notice feed.
 #. TRANS: %1$s is a tagger's nickname, %2$s is a list name, %3$s is a site name.
-#, fuzzy, php-format
+#, php-format
 msgid "Updates from %1$s's list %2$s on %3$s!"
-msgstr "Aktualizacje z %1$s na %2$s."
+msgstr "Aktualizacje listy %2$s użytkownika %1$s na %3$s."
 
 #. TRANS: Title.
 msgid "Notices where this attachment appears"
@@ -7829,13 +7196,12 @@ msgstr "Zablokuj tego użytkownika"
 #. TRANS: Submit button text on form to cancel group join request.
 msgctxt "BUTTON"
 msgid "Cancel join request"
-msgstr ""
+msgstr "Anuluj żądanie przyłączenia się"
 
 #. TRANS: Button text for form action to cancel a subscription request.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Cancel subscription request"
-msgstr "Wszystkie subskrypcje"
+msgstr "Anuluj żądanie subskrypcji"
 
 #. TRANS: Title for command results.
 msgid "Command results"
@@ -7904,9 +7270,8 @@ msgstr ""
 "Wpisy: %3$s"
 
 #. TRANS: Error message text shown when a favorite could not be set because it has already been favorited.
-#, fuzzy
 msgid "Could not create favorite: Already favorited."
-msgstr "Nie można utworzyć ulubionego wpisu."
+msgstr "Nie można utworzyć ulubionego wpisu: już w ulubionych."
 
 #. TRANS: Text shown when a notice has been marked as favourite successfully.
 msgid "Notice marked as fave."
@@ -7928,22 +7293,22 @@ msgstr "Użytkownik %1$s opuścił grupę %2$s."
 #. TRANS: %1$s is the tagged user, %2$s is the error message (no punctuation).
 #, php-format
 msgid "Error tagging %1$s: %2$s"
-msgstr ""
+msgstr "BÅ‚Ä…d oznaczania %1$s: %2$s"
 
 #. TRANS: Succes message displayed if tagging a user succeeds.
 #. TRANS: %1$s is the tagged user's nickname, %2$s is a list of tags.
 #. TRANS: Plural is decided based on the number of tags added (not part of message).
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s was tagged %2$s"
 msgid_plural "%1$s was tagged %2$s"
-msgstr[0] "%1$s - %2$s"
-msgstr[1] "%1$s - %2$s"
-msgstr[2] "%1$s - %2$s"
+msgstr[0] "%1$s otrzymał znacznik %2$s"
+msgstr[1] "%1$s otrzymał znaczniki %2$s"
+msgstr[2] "%1$s otrzymał znaczniki %2$s"
 
 #. TRANS: Separator for list of tags.
 #. TRANS: Separator in list of user names like "Jim, Bob, Mary".
 msgid ", "
-msgstr ""
+msgstr ", "
 
 #. TRANS: Error displayed if a given tag is invalid.
 #. TRANS: %s is the invalid tag.
@@ -7955,7 +7320,7 @@ msgstr "Nieprawidłowy znacznik: \"%s\""
 #. TRANS: %1$s is the untagged user, %2$s is the error message (no punctuation).
 #, php-format
 msgid "Error untagging %1$s: %2$s"
-msgstr ""
+msgstr "Błąd usunięcia znaczników %1$s: %2$s"
 
 #. TRANS: Succes message displayed if untagging a user succeeds.
 #. TRANS: %1$s is the untagged user's nickname, %2$s is a list of tags.
@@ -7963,9 +7328,9 @@ msgstr ""
 #, php-format
 msgid "The following tag was removed from user %1$s: %2$s."
 msgid_plural "The following tags were removed from user %1$s: %2$s."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "Następujący znacznik został usunięty z użytkownika %1$s: %2$s ."
+msgstr[1] "Następujące znaczniki zostały usunięte z użytkownika %1$s: %2$s."
+msgstr[2] "Następujące znaczniki zostały usunięte z użytkownika %1$s: %2$s."
 
 #. TRANS: Whois output.
 #. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
@@ -8157,163 +7522,150 @@ msgstr[1] "Jesteś członkiem tych grup:"
 msgstr[2] "Jesteś członkiem tych grup:"
 
 #. TRANS: Header line of help text for commands.
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "Commands:"
-msgstr "Wyniki polecenia"
+msgstr "Polecenia:"
 
 #. TRANS: Help message for IM/SMS command "on".
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "turn on notifications"
-msgstr "Nie można włączyć powiadomień."
+msgstr "włącz powiadomienia"
 
 #. TRANS: Help message for IM/SMS command "off".
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "turn off notifications"
-msgstr "Nie można wyłączyć powiadomień."
+msgstr "wyłącz powiadomienia"
 
 #. TRANS: Help message for IM/SMS command "help".
 msgctxt "COMMANDHELP"
 msgid "show this help"
-msgstr ""
+msgstr "pokaż tę pomoc"
 
 #. TRANS: Help message for IM/SMS command "follow <nickname>".
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "subscribe to user"
-msgstr "Subskrybuj tego użytkownika"
+msgstr "subskrybuj tego użytkownika"
 
 #. TRANS: Help message for IM/SMS command "groups".
 msgctxt "COMMANDHELP"
 msgid "lists the groups you have joined"
-msgstr ""
+msgstr "wyświetla listę grup, do których przynależysz"
 
 #. TRANS: Help message for IM/SMS command "tag".
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "tag a user"
-msgstr "Znacznik użytkownika"
+msgstr "oznacz użytkownika"
 
 #. TRANS: Help message for IM/SMS command "untag".
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "untag a user"
-msgstr "Znacznik użytkownika"
+msgstr "odłącz znacznik użytkownika"
 
 #. TRANS: Help message for IM/SMS command "subscriptions".
 msgctxt "COMMANDHELP"
 msgid "list the people you follow"
-msgstr ""
+msgstr "wyświetl ludzi, których śledzisz"
 
 #. TRANS: Help message for IM/SMS command "subscribers".
 msgctxt "COMMANDHELP"
 msgid "list the people that follow you"
-msgstr ""
+msgstr "wyświetl osoby, które cię śledzą"
 
 #. TRANS: Help message for IM/SMS command "leave <nickname>".
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "unsubscribe from user"
-msgstr "Zrezygnuj z subskrypcji tego użytkownika"
+msgstr "zrezygnuj z subskrypcji tego użytkownika"
 
 #. TRANS: Help message for IM/SMS command "d <nickname> <text>".
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "direct message to user"
-msgstr "Bezpośrednia wiadomość do użytkownika %s"
+msgstr "bezpośrednia wiadomość do użytkownika"
 
 #. TRANS: Help message for IM/SMS command "get <nickname>".
 msgctxt "COMMANDHELP"
 msgid "get last notice from user"
-msgstr ""
+msgstr "pokaż ostatni wpis użytkownika"
 
 #. TRANS: Help message for IM/SMS command "whois <nickname>".
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "get profile info on user"
-msgstr "Zdalny profil nie jest grupÄ…."
+msgstr "pokaż informacje z profilu użytkownika"
 
 #. TRANS: Help message for IM/SMS command "lose <nickname>".
 msgctxt "COMMANDHELP"
 msgid "force user to stop following you"
-msgstr ""
+msgstr "wymuś wstrzymanie śledzenia mnie przez użytkownika"
 
 #. TRANS: Help message for IM/SMS command "fav <nickname>".
 msgctxt "COMMANDHELP"
 msgid "add user's last notice as a 'fave'"
-msgstr ""
+msgstr "dodaj ostatni wpis użytkownika do 'ulubionych'"
 
 #. TRANS: Help message for IM/SMS command "fav #<notice_id>".
 msgctxt "COMMANDHELP"
 msgid "add notice with the given id as a 'fave'"
-msgstr ""
+msgstr "dodaj wpis o wskazanym identyfikatorze do 'ulubionych'"
 
 #. TRANS: Help message for IM/SMS command "repeat #<notice_id>".
 msgctxt "COMMANDHELP"
 msgid "repeat a notice with a given id"
-msgstr ""
+msgstr "powtórz wpis o podanym identyfikatorze"
 
 #. TRANS: Help message for IM/SMS command "repeat <nickname>".
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "repeat the last notice from user"
-msgstr "Powtórz ten wpis"
+msgstr "powtórz ostatni wpis użytkownika"
 
 #. TRANS: Help message for IM/SMS command "reply #<notice_id>".
 msgctxt "COMMANDHELP"
 msgid "reply to notice with a given id"
-msgstr ""
+msgstr "odpowiedz na wpis o podanym identyfikatorze"
 
 #. TRANS: Help message for IM/SMS command "reply <nickname>".
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "reply to the last notice from user"
-msgstr "Odpowiedz na ten wpis"
+msgstr "odpowiedz na ostatni wpis użytkownika"
 
 #. TRANS: Help message for IM/SMS command "join <group>".
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "join group"
-msgstr "Nieznana grupa."
+msgstr "dołącz do grupy"
 
 #. TRANS: Help message for IM/SMS command "login".
 msgctxt "COMMANDHELP"
 msgid "Get a link to login to the web interface"
-msgstr ""
+msgstr "Pobierz Å‚Ä…cze do logowania do interfejsu sieciowego"
 
 #. TRANS: Help message for IM/SMS command "drop <group>".
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "leave group"
-msgstr "Usuń grupę"
+msgstr "opuść grupę"
 
 #. TRANS: Help message for IM/SMS command "stats".
 msgctxt "COMMANDHELP"
 msgid "get your stats"
-msgstr ""
+msgstr "wyświetl własne statystyki"
 
 #. TRANS: Help message for IM/SMS command "stop".
 #. TRANS: Help message for IM/SMS command "quit".
 msgctxt "COMMANDHELP"
 msgid "same as 'off'"
-msgstr ""
+msgstr "to samo co 'wyłączone'"
 
 #. TRANS: Help message for IM/SMS command "sub <nickname>".
 msgctxt "COMMANDHELP"
 msgid "same as 'follow'"
-msgstr ""
+msgstr "to samo co 'śledź'"
 
 #. TRANS: Help message for IM/SMS command "unsub <nickname>".
 msgctxt "COMMANDHELP"
 msgid "same as 'leave'"
-msgstr ""
+msgstr "to samo co 'opuść'"
 
 #. TRANS: Help message for IM/SMS command "last <nickname>".
 msgctxt "COMMANDHELP"
 msgid "same as 'get'"
-msgstr ""
+msgstr "to samo co 'pobierz'"
 
 #. TRANS: Help message for IM/SMS command "on <nickname>".
 #. TRANS: Help message for IM/SMS command "off <nickname>".
@@ -8324,15 +7676,14 @@ msgstr ""
 #. TRANS: Help message for IM/SMS command "untrack all".
 #. TRANS: Help message for IM/SMS command "tracks".
 #. TRANS: Help message for IM/SMS command "tracking".
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "not yet implemented."
-msgstr "Nie zaimplementowano polecenia."
+msgstr "jeszcze nie zaimplementowano."
 
 #. TRANS: Help message for IM/SMS command "nudge <nickname>".
 msgctxt "COMMANDHELP"
 msgid "remind a user to update."
-msgstr ""
+msgstr "przypomnij użytkownikowi o aktualizacji."
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 msgid "No configuration file found."
@@ -8352,31 +7703,26 @@ msgstr "Należy uruchomić instalator, aby to naprawić."
 msgid "Go to the installer."
 msgstr "Przejdź do instalatora."
 
+#. TRANS: Header on conversation page. Hidden by default (h2).
+#. TRANS: Label for user statistics.
+msgid "Notices"
+msgstr "Wpisy"
+
 #. TRANS: Page title for when a database error occurs.
 msgid "Database error"
 msgstr "BÅ‚Ä…d bazy danych"
 
 #. TRANS: Menu item in default local navigation panel.
 #. TRANS: Menu item in search group navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Public"
 msgstr "Publiczny"
 
-#. TRANS: Menu item in default local navigation panel.
-#. TRANS: Menu item in search group navigation panel.
-#. TRANS: Menu item in local navigation menu.
-#, fuzzy
-msgctxt "MENU"
-msgid "Groups"
-msgstr "Grupy"
-
 #. TRANS: Menu item in default local navigation panel.
 #. TRANS: Menu item title in local navigation menu.
-#, fuzzy
 msgctxt "MENU"
 msgid "Lists"
-msgstr "Ograniczenia"
+msgstr "Listy"
 
 #. TRANS: Title of form for deleting a user.
 #. TRANS: Link text in notice list item to delete a notice.
@@ -8387,70 +7733,37 @@ msgstr "Usuń"
 msgid "Delete this user"
 msgstr "Usuń tego użytkownika"
 
-#. TRANS: Form legend of form for changing the page design.
-#, fuzzy
-msgid "Change design"
-msgstr "Zapisz wyglÄ…d"
-
-#. TRANS: Fieldset legend on profile design page to change profile page colours.
-msgid "Change colours"
-msgstr "Zmień kolory"
-
-#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-msgid "Use defaults"
-msgstr "Użycie domyślnych"
-
-#. TRANS: Label in form on profile design page.
-#. TRANS: Field contains file name on user's computer that could be that user's custom profile background image.
-msgid "Upload file"
-msgstr "Wyślij plik"
-
-#. TRANS: Instructions for form on profile design page.
-msgid ""
-"You can upload your personal background image. The maximum file size is 2MB."
-msgstr "Można wysłać osobisty obraz tła. Maksymalny rozmiar pliku to 2 MB."
-
-#. TRANS: Radio button on profile design page that will enable use of the uploaded profile image.
-msgctxt "RADIO"
-msgid "On"
-msgstr "WÅ‚Ä…czone"
-
-#. TRANS: Radio button on profile design page that will disable use of the uploaded profile image.
-msgctxt "RADIO"
-msgid "Off"
-msgstr "Wyłączone"
-
-#. TRANS: Success message displayed if design settings were saved after clicking "Use defaults".
-msgid "Design defaults restored."
-msgstr "Przywrócono domyślny wygląd."
-
 #. TRANS: Exception. %s is an ID.
 #, php-format
 msgid "Unable to find services for %s."
 msgstr "Nie można odnaleźć usług dla %s."
 
 #. TRANS: Form legend for removing the favourite status for a favourite notice.
-#. TRANS: Title for button text for removing the favourite status for a favourite notice.
 msgid "Disfavor this notice"
 msgstr "Usuń ten wpis z ulubionych"
 
 #. TRANS: Button text for removing the favourite status for a favourite notice.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Disfavor favorite"
 msgstr "Usuń wpis z ulubionych"
 
+#. TRANS: Button title for removing the favourite status for a favourite notice.
+msgid "Remove this notice from your list of favorite notices."
+msgstr "Usuń ten wpis z listy ulubionych wpisów."
+
 #. TRANS: Form legend for adding the favourite status to a notice.
-#. TRANS: Title for button text for adding the favourite status to a notice.
 msgid "Favor this notice"
 msgstr "Dodaj ten wpis do ulubionych"
 
 #. TRANS: Button text for adding the favourite status to a notice.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Favor"
 msgstr "Dodaj do ulubionych"
 
+#. TRANS: Button title for adding the favourite status to a notice.
+msgid "Add this notice to your list of favorite notices."
+msgstr "Dodaj ten wpis do listy ulubionych wpisów."
+
 #. TRANS: Feed type name.
 msgid "RSS 1.0"
 msgstr "RSS 1.0"
@@ -8467,13 +7780,16 @@ msgstr "Atom"
 msgid "FOAF"
 msgstr "FOAF"
 
+#. TRANS: Feed type name. See http://activitystrea.ms/
+msgid "Activity Streams"
+msgstr "Strumienie aktywności"
+
 #. TRANS: Client exception thrown when an imported feed does not have an author.
 msgid "No author in the feed."
 msgstr "Brak autora w kanale."
 
 #. TRANS: Client exception thrown when an imported feed does not have an author that
 #. TRANS: can be associated with a user.
-#, fuzzy
 msgid "Cannot import without a user."
 msgstr "Nie można zaimportować bez użytkownika."
 
@@ -8482,25 +7798,44 @@ msgid "Feeds"
 msgstr "Kanały"
 
 #. TRANS: List element on gallery action page to show all tags.
-#, fuzzy
 msgctxt "TAGS"
 msgid "All"
-msgstr "Wszystko"
+msgstr "Wszystkie"
 
 #. TRANS: Dropdown field label on gallery action page for a list containing tags.
 msgid "Tag"
 msgstr "Znacznik"
 
 #. TRANS: Dropdown field title on gallery action page for a list containing tags.
-#, fuzzy
 msgid "Choose a tag to narrow list."
-msgstr "Wybierz znacznik do ograniczonej listy"
+msgstr "Wybierz znacznik do zawężenia listy."
 
 #. TRANS: Description on form for granting a role.
 #, php-format
 msgid "Grant this user the \"%s\" role"
 msgstr "Nadaj użytkownikowi rolę \"%s\""
 
+#. TRANS: Header for mini list of group members on a group page (h2).
+msgid "Members"
+msgstr "Członkowie"
+
+#. TRANS: Link to all group members from mini list of group members if group has more than n members.
+msgid "All members"
+msgstr "Wszyscy członkowie"
+
+#. TRANS: Header for mini list of users with a pending membership request on a group page (h2).
+msgid "Pending"
+msgstr "OczekujÄ…cy"
+
+#. TRANS: Header for mini list of users that are blocked in a group page (h2).
+msgid "Blocked"
+msgstr "Zablokowany"
+
+#. TRANS: Title for list of group administrators on a group page.
+msgctxt "TITLE"
+msgid "Admins"
+msgstr "Administratorzy"
+
 #. TRANS: Button text for the form that will block a user from a group.
 msgctxt "BUTTON"
 msgid "Block"
@@ -8508,15 +7843,14 @@ msgstr "Zablokuj"
 
 #. TRANS: Submit button title.
 msgctxt "TOOLTIP"
-msgid "Block this user"
-msgstr "Zablokuj tego użytkownika"
+msgid "Block this user so that they can no longer post messages to it."
+msgstr "Zablokuj tego użytkownika aby nie mógł wysyłać tam wiadomości."
 
 #. TRANS: Field title on group edit form.
 msgid "URL of the homepage or blog of the group or topic."
 msgstr "Adres URL strony domowej lub bloga grupy, albo temat."
 
 #. TRANS: Text area title for group description when there is no text limit.
-#, fuzzy
 msgid "Describe the group or topic."
 msgstr "Opisz grupÄ™ lub temat"
 
@@ -8563,71 +7897,17 @@ msgstr[2] ""
 msgid ""
 "New members must be approved by admin and all posts are forced to be private."
 msgstr ""
+"Nowi członkowie muszą być zatwierdzeni przez administratora a wszystkie "
+"wpisy mają wymuszoną prywatność."
 
 #. TRANS: Indicator in group members list that this user is a group administrator.
-#, fuzzy
 msgctxt "GROUPADMIN"
 msgid "Admin"
 msgstr "Administrator"
 
-#. TRANS: Menu item in the group navigation page.
-msgctxt "MENU"
-msgid "Group"
-msgstr "Grupa"
-
-#. TRANS: Tooltip for menu item in the group navigation page.
-#. TRANS: %s is the nickname of the group.
-#, php-format
-msgctxt "TOOLTIP"
-msgid "%s group"
-msgstr "Grupa %s"
-
-#. TRANS: Menu item in the group navigation page.
-msgctxt "MENU"
-msgid "Members"
-msgstr "Członkowie"
-
-#. TRANS: Tooltip for menu item in the group navigation page.
-#. TRANS: %s is the nickname of the group.
-#, php-format
-msgctxt "TOOLTIP"
-msgid "%s group members"
-msgstr "Członkowie grupy %s"
-
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: %d is the number of pending members.
-#, php-format
-msgctxt "MENU"
-msgid "Pending members (%d)"
-msgid_plural "Pending members (%d)"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: %s is the nickname of the group.
-#, fuzzy, php-format
-msgctxt "TOOLTIP"
-msgid "%s pending members"
-msgstr "Członkowie grupy %s"
-
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-msgctxt "MENU"
-msgid "Blocked"
-msgstr "Zablokowany"
-
-#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: %s is the nickname of the group.
-#, php-format
-msgctxt "TOOLTIP"
-msgid "%s blocked users"
-msgstr "%s zablokowanych użytkowników"
-
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: Menu item in primary navigation panel.
-msgctxt "MENU"
-msgid "Admin"
-msgstr "Administrator"
+#. TRANS: Group actions header (h2). Text hidden by default.
+msgid "Group actions"
+msgstr "Działania grupy"
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
@@ -8636,11 +7916,6 @@ msgctxt "TOOLTIP"
 msgid "Edit %s group properties"
 msgstr "Modyfikacja właściwości grupy %s"
 
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-msgctxt "MENU"
-msgid "Logo"
-msgstr "Logo"
-
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
 #, php-format
@@ -8648,32 +7923,32 @@ msgctxt "TOOLTIP"
 msgid "Add or edit %s logo"
 msgstr "Dodanie lub modyfikacja loga grupy %s"
 
-#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: %s is the nickname of the group.
-#, php-format
-msgctxt "TOOLTIP"
-msgid "Add or edit %s design"
-msgstr "Dodanie lub modyfikacja wyglÄ…du grupy %s"
-
-#. TRANS: Group actions header (h2). Text hidden by default.
-msgid "Group actions"
-msgstr "Działania grupy"
+#. TRANS: Link text for link on user profile.
+msgctxt "MENU"
+msgid "Logo"
+msgstr "Logo"
 
 #. TRANS: Title for groups with the most members section.
-#, fuzzy
 msgid "Popular groups"
-msgstr "Popularne wpisy"
+msgstr "Popularne grupy"
 
 #. TRANS: Title for groups with the most posts section.
-#, fuzzy
 msgid "Active groups"
-msgstr "Wszystkie grupy"
+msgstr "Aktywne grupy"
 
-#. TRANS: Title for group tag cloud section.
-#. TRANS: %s is a group name.
-#, php-format
-msgid "Tags in %s group's notices"
-msgstr "Znaczniki we wpisach grupy %s"
+#. TRANS: Link description for seeing all groups.
+#. TRANS: Link description for seeing all lists.
+msgid "See all"
+msgstr "Zobacz wszystko"
+
+#. TRANS: Link title for seeing all groups.
+msgid "See all groups you belong to."
+msgstr "Zobacz wszystkie grupy, do której należysz."
+
+#. TRANS: Menu item title in personal group navigation menu.
+#. TRANS: %s is a username.
+msgid "Back to top"
+msgstr "Powrót na górę"
 
 #. TRANS: Client exception 406
 msgid "This page is not available in a media type you accept"
@@ -8750,7 +8025,7 @@ msgstr "Nieznane źródło skrzynki odbiorczej %d."
 
 #. TRANS: Server exception thrown trying to initialise an IM plugin without meeting all prerequisites.
 msgid "Queueing must be enabled to use IM plugins."
-msgstr ""
+msgstr "Kolejkowanie musi być włączone by używać wtyczek komunikatorów."
 
 #. TRANS: Server exception thrown trying to initialise an IM plugin without a transport method.
 msgid "Transport cannot be null."
@@ -8759,26 +8034,57 @@ msgstr ""
 #. TRANS: Title for inbox tag cloud section.
 msgctxt "TITLE"
 msgid "Trends"
-msgstr ""
+msgstr "Trendy"
 
-#. TRANS: Button text for inviting more users to the StatusNet instance.
-#, fuzzy
+#. TRANS: Default button text for inviting more users to the StatusNet instance.
 msgctxt "BUTTON"
 msgid "Invite more colleagues"
-msgstr "Zaproś nowych użytkowników"
+msgstr "ZaproÅ› kolejnych znajomych"
+
+#. TRANS: Form legend.
+msgid "Invite collegues"
+msgstr "Zaproś współpracowników"
+
+#. TRANS: Field label for a list of e-mail addresses.
+msgid "Email addresses"
+msgstr "Adresy e-mail"
+
+#. TRANS: Field title for a list of e-mail addresses.
+msgid "Addresses of friends to invite (one per line)."
+msgstr "Adresy przyjaciół, których zapraszasz (każdy w osobnej linii)"
+
+#. TRANS: Field label for a personal message to send to invitees.
+msgid "Personal message"
+msgstr "Osobista wiadomość"
+
+#. TRANS: Field title for a personal message to send to invitees.
+msgid "Optionally add a personal message to the invitation."
+msgstr "Opcjonalnie dodaj osobistą wiadomość do zaproszenia."
+
+#. TRANS: Send button for inviting friends
+#. TRANS: Button text for sending notice.
+msgctxt "BUTTON"
+msgid "Send"
+msgstr "Wyślij"
+
+#. TRANS: Submit button title.
+msgid "Send invitations."
+msgstr "Wyślij zaproszenia."
 
 #. TRANS: Button text for joining a group.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Join"
 msgstr "Dołącz"
 
 #. TRANS: Button text on form to leave a group.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Leave"
 msgstr "Opuść"
 
+#. TRANS: Link title for seeing all lists.
+msgid "See all lists you have created."
+msgstr "Zobacz wszystkie utworzone przez ciebie listy."
+
 #. TRANS: Menu item for logging in to the StatusNet site.
 #. TRANS: Menu item in primary navigation panel.
 msgctxt "MENU"
@@ -8839,14 +8145,14 @@ msgstr ""
 #. TRANS: Main body of new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscriber's long name, %2$s is the StatusNet sitename.
 #, php-format
-msgid "%1$s is now listening to your notices on %2$s."
-msgstr "Użytkownik %1$s obserwuje teraz twoje wpisy na %2$s."
+msgid "%1$s is now following you on %2$s."
+msgstr "Użytkownik %1$s obserwuje cię teraz na %2$s."
 
 #. TRANS: Subject of pending new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscribing user's nickname, %2$s is the StatusNet sitename.
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s would like to listen to your notices on %2$s."
-msgstr "Użytkownik %1$s obserwuje teraz twoje wpisy na %2$s."
+msgstr "Użytkownik %1$s chciałby oglądać twoje wpisy na %2$s."
 
 #. TRANS: Main body of pending new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscriber's long name, %2$s is the StatusNet sitename.
@@ -9011,7 +8317,7 @@ msgstr ""
 "Nie odpowiadaj na tę wiadomość e-mail, nie dotrze ona do nich.\n"
 "\n"
 "Z poważaniem,\n"
-"%5$s\n"
+"%5$s"
 
 #. TRANS: Subject for favorite notification e-mail.
 #. TRANS: %1$s is the adding user's long name, %2$s is the adding user's nickname.
@@ -9078,7 +8384,7 @@ msgstr "Użytkownik %1$s (@%2$s) wysłał wpis wymagający twojej uwagi"
 #. TRANS: Body of @-reply notification e-mail.
 #. TRANS: %1$s is the sending user's name, $2$s is the StatusNet sitename,
 #. TRANS: %3$s is a URL to the notice, %4$s is the notice text,
-#. TRANS: %5$s is a URL to the full conversion if it exists (otherwise empty),
+#. TRANS: %5$s is the text "The full conversation can be read here:" and a URL to the full conversion if it exists (otherwise empty),
 #. TRANS: %6$s is a URL to reply to the notice, %7$s is a URL to all @-replies for the addressed user,
 #, fuzzy, php-format
 msgid ""
@@ -9126,19 +8432,23 @@ msgstr ""
 
 #. TRANS: Subject of group join notification e-mail.
 #. TRANS: %1$s is the joining user's nickname, %2$s is the group name, and %3$s is the StatusNet sitename.
+#, php-format
+msgid "%1$s has joined your group %2$s on %3$s"
+msgstr "Użytkownik %1$s dołączył do grupy %2$s na %3$s"
+
 #. TRANS: Main body of group join notification e-mail.
 #. TRANS: %1$s is the subscriber's long name, %2$s is the group name, and %3$s is the StatusNet sitename,
 #. TRANS: %4$s is a block of profile info about the subscriber.
 #. TRANS: %5$s is a link to the addressed user's e-mail settings.
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s has joined your group %2$s on %3$s."
-msgstr "Użytkownik %1$s dołączył do grupy %2$s."
+msgstr "Użytkownik %1$s dołączył do grupy %2$s na %3$s."
 
 #. TRANS: Subject of pending group join request notification e-mail.
 #. TRANS: %1$s is the joining user's nickname, %2$s is the group name, and %3$s is the StatusNet sitename.
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s wants to join your group %2$s on %3$s."
-msgstr "Użytkownik %1$s dołączył do grupy %2$s."
+msgstr "Użytkownik %1$s chce dołączyć do grupy %2$s na %3$s."
 
 #. TRANS: Main body of pending group join request notification e-mail.
 #. TRANS: %1$s is the subscriber's long name, %2$s is the group name, and %3$s is the StatusNet sitename,
@@ -9148,6 +8458,8 @@ msgid ""
 "%1$s would like to join your group %2$s on %3$s. You may approve or reject "
 "their group membership at %4$s"
 msgstr ""
+"Użytkownik %1$s życzy sobie dołączyć do twojej grupy %2$s na %3$s. Możesz "
+"zgodzić się lub odrzucić jego członkostwo przechodząc na %4$s"
 
 #. TRANS: Client error displayed when trying to access a mailbox that is not of the logged in user.
 msgid "Only the user can read their own mailboxes."
@@ -9163,26 +8475,22 @@ msgstr ""
 "twoich oczu."
 
 #. TRANS: Menu item in mailbox menu. Leads to incoming private messages.
-#, fuzzy
 msgctxt "MENU"
 msgid "Inbox"
-msgstr "Odebrane"
+msgstr "Skrzynka odbiorcza"
 
 #. TRANS: Menu item title in mailbox menu. Leads to incoming private messages.
-#, fuzzy
 msgid "Your incoming messages."
-msgstr "Wiadomości przychodzące"
+msgstr "Wiadomości przychodzące."
 
 #. TRANS: Menu item in mailbox menu. Leads to outgoing private messages.
-#, fuzzy
 msgctxt "MENU"
 msgid "Outbox"
-msgstr "Wysłane"
+msgstr "Wiadomości wysłane"
 
 #. TRANS: Menu item title in mailbox menu. Leads to outgoing private messages.
-#, fuzzy
 msgid "Your sent messages."
-msgstr "Wysłane wiadomości"
+msgstr "Wysłane przez ciebie wiadomości."
 
 #. TRANS: Error message in incoming mail handler used when an incoming e-mail cannot be processed.
 msgid "Could not parse message."
@@ -9202,9 +8510,9 @@ msgstr "PrzychodzÄ…cy e-mail nie jest dozwolony."
 
 #. TRANS: Error message in incoming mail handler used when an incoming e-mail is of an unsupported type.
 #. TRANS: %s is the unsupported type.
-#, fuzzy, php-format
+#, php-format
 msgid "Unsupported message type: %s."
-msgstr "Nieobsługiwany typ wiadomości: %s"
+msgstr "Nieobsługiwany typ wiadomości: %s."
 
 #. TRANS: Form legend for form to make a user a group admin.
 msgid "Make user an admin of the group"
@@ -9217,8 +8525,8 @@ msgstr "Uczyń administratorem"
 
 #. TRANS: Submit button title.
 msgctxt "TOOLTIP"
-msgid "Make this user an admin"
-msgstr "Nadaje temu użytkownikowi uprawnienia administratora"
+msgid "Make this user an admin."
+msgstr "Nadaj temu użytkownikowi uprawnienia administratora."
 
 #. TRANS: Client exception thrown when a database error was thrown during a file upload operation.
 msgid "There was a database error while saving your file. Please try again."
@@ -9265,7 +8573,7 @@ msgstr "Wyślij bezpośredni wpis"
 msgid "Select recipient:"
 msgstr "Wybierz odbiorcÄ™:"
 
-#. TRANS Entry in drop-down selection box in direct-message inbox/outbox when no one is available to message.
+#. TRANS: Entry in drop-down selection box in direct-message inbox/outbox when no one is available to message.
 msgid "No mutual subscribers."
 msgstr "Brak wzajemnych subskrybentów."
 
@@ -9279,9 +8587,8 @@ msgid "Send"
 msgstr "Wyślij"
 
 #. TRANS: Header in message list.
-#, fuzzy
 msgid "Messages"
-msgstr "Wiadomość"
+msgstr "Wiadomości"
 
 #. TRANS: Followed by notice source (usually the client used to send the notice).
 #. TRANS: Followed by notice source.
@@ -9289,31 +8596,29 @@ msgid "from"
 msgstr "z"
 
 #. TRANS: A possible notice source (web interface).
-#, fuzzy
 msgctxt "SOURCE"
 msgid "web"
-msgstr "WWW"
+msgstr "sieć"
 
 #. TRANS: A possible notice source (XMPP).
 msgctxt "SOURCE"
 msgid "xmpp"
-msgstr ""
+msgstr "xmpp"
 
 #. TRANS: A possible notice source (e-mail).
-#, fuzzy
 msgctxt "SOURCE"
 msgid "mail"
-msgstr "E-mail"
+msgstr "e�mail"
 
 #. TRANS: A possible notice source (OpenMicroBlogging).
 msgctxt "SOURCE"
 msgid "omb"
-msgstr ""
+msgstr "OMB"
 
 #. TRANS: A possible notice source (Application Programming Interface).
 msgctxt "SOURCE"
 msgid "api"
-msgstr ""
+msgstr "api"
 
 #. TRANS: Client exception thrown when no author for an activity was found.
 msgid "Cannot get author for activity."
@@ -9337,6 +8642,10 @@ msgstr ""
 msgid "You must implement either adaptNoticeListItem() or showNotice()."
 msgstr ""
 
+#. TRANS: Link description to show more items in a list.
+msgid "More â–¼"
+msgstr ""
+
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 msgid "Nickname cannot be empty."
 msgstr "Pseudonim nie może być pusty."
@@ -9363,7 +8672,6 @@ msgid "Attach"
 msgstr "Załącz"
 
 #. TRANS: Title for input field to attach a file to a notice.
-#, fuzzy
 msgid "Attach a file."
 msgstr "Załącz plik"
 
@@ -9386,11 +8694,7 @@ msgstr ""
 #. TRANS: Separator in profile addressees list.
 msgctxt "SEPARATOR"
 msgid ", "
-msgstr ""
-
-#. TRANS: Start of profile addressees list.
-msgid " â–¸ "
-msgstr ""
+msgstr ", "
 
 #. TRANS: Used in coordinates as abbreviation of north.
 msgid "N"
@@ -9430,84 +8734,54 @@ msgid "Repeated by"
 msgstr "Powtórzone przez"
 
 #. TRANS: Link title in notice list item to reply to a notice.
-msgid "Reply to this notice"
-msgstr "Odpowiedz na ten wpis"
+msgid "Reply to this notice."
+msgstr "Odpowiedz na ten wpis."
 
 #. TRANS: Link text in notice list item to reply to a notice.
 msgid "Reply"
 msgstr "Odpowiedz"
 
 #. TRANS: Link title in notice list item to delete a notice.
-msgid "Delete this notice"
-msgstr "Usuń ten wpis"
+msgid "Delete this notice from the timeline."
+msgstr "Usuń ten wpis ze strumienia."
 
 #. TRANS: Title for repeat form status in notice list when a notice has been repeated.
-#, fuzzy
 msgid "Notice repeated."
-msgstr "Powtórzono wpis"
+msgstr "Powtórzony wpis."
 
 #. TRANS: Field label for notice text.
 msgid "Update your status..."
-msgstr ""
+msgstr "Aktualizuj stan..."
 
 #. TRANS: Form legend of form to nudge/ping another user.
 msgid "Nudge this user"
 msgstr "Szturchnij tego użytkownika"
 
 #. TRANS: Button text to nudge/ping another user.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Nudge"
 msgstr "Szturchnij"
 
 #. TRANS: Button title to nudge/ping another user.
-#, fuzzy
 msgid "Send a nudge to this user."
-msgstr "Wyślij szturchnięcie do tego użytkownika"
-
-#. TRANS: Exception thrown when creating a new profile fails in OAuth store.
-msgid "Error inserting new profile."
-msgstr "BÅ‚Ä…d podczas wprowadzania nowego profilu."
-
-#. TRANS: Exception thrown when creating a new avatar fails in OAuth store.
-msgid "Error inserting avatar."
-msgstr "BÅ‚Ä…d podczas wprowadzania awatara."
-
-#. TRANS: Exception thrown when creating a remote profile fails in OAuth store.
-msgid "Error inserting remote profile."
-msgstr "BÅ‚Ä…d podczas wprowadzania zdalnego profilu."
-
-#. TRANS: Exception thrown when a notice is denied because it has been sent before.
-msgid "Duplicate notice."
-msgstr "Podwójny wpis."
-
-#. TRANS: Exception thrown when creating a new subscription fails in OAuth store.
-#, fuzzy
-msgid "Could not insert new subscription."
-msgstr "Nie można wprowadzić nowej subskrypcji."
+msgstr "Wyślij szturchnięcie do tego użytkownika."
 
 #. TRANS: Server exception thrown in oEmbed action if no API endpoint is available.
-#, fuzzy
 msgid "No oEmbed API endpoint available."
-msgstr "Komunikator nie jest dostępny."
+msgstr "Nie jest dostępny punkt końcowy API oEmbed."
 
 #. TRANS: Field label for list.
-#, fuzzy
 msgctxt "LABEL"
 msgid "List"
-msgstr "Odnośniki"
+msgstr "Lista"
 
 #. TRANS: Field title for list.
-#, fuzzy
 msgid "Change the list (letters, numbers, -, ., and _ are allowed)."
-msgstr ""
-"Znaczniki dla tego użytkownika (litery, liczby, -, . i _), oddzielone "
-"przecinkami lub spacjami"
+msgstr "Zmiana listy (dostępne litery, liczby, -, . i _)."
 
 #. TRANS: Field title for description of list.
-#, fuzzy
 msgid "Describe the list or topic."
-msgstr "Opisz grupÄ™ lub temat"
+msgstr "Opisz grupÄ™ lub temat."
 
 #. TRANS: Field title for description of list.
 #. TRANS: %d is the maximum number of characters for the description.
@@ -9519,16 +8793,14 @@ msgstr[1] "Opisz grupÄ™ lub temat w %d znakach lub mniej."
 msgstr[2] "Opisz grupÄ™ lub temat w %d znakach lub mniej."
 
 #. TRANS: Button title to delete a list.
-#, fuzzy
 msgid "Delete this list."
-msgstr "Usuń tego użytkownika"
+msgstr "Usuń tą listę."
 
 #. TRANS: Header in list edit form.
 msgid "Add or remove people"
 msgstr ""
 
 #. TRANS: Header in list edit form.
-#, fuzzy
 msgctxt "HEADER"
 msgid "Search"
 msgstr "Wyszukaj"
@@ -9541,9 +8813,9 @@ msgstr "Odnośniki"
 
 #. TRANS: Menu item title in list navigation panel.
 #. TRANS: %1$s is a list, %2$s is a nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s list by %2$s."
-msgstr "%1$s - %2$s"
+msgstr "Lista %1$s użytkownika %2$s."
 
 #. TRANS: Menu item in list navigation panel.
 #, fuzzy
@@ -9553,33 +8825,26 @@ msgstr "Licencja"
 
 #. TRANS: Menu item in list navigation panel.
 #. TRANS: Menu item in local navigation menu.
-#, fuzzy
 msgctxt "MENU"
 msgid "Subscribers"
 msgstr "Subskrybenci"
 
 #. TRANS: Menu item title in list navigation panel.
 #. TRANS: %1$s is a list, %2$s is a nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "Subscribers to %1$s list by %2$s."
-msgstr "Subskrybowano użytkownika %s."
+msgstr "Subskrybenci listy %1$s użytkownika %2$s."
 
 #. TRANS: Menu item in list navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Edit"
 msgstr "Edycja"
 
 #. TRANS: Menu item title in list navigation panel.
 #. TRANS: %s is a list.
-#, fuzzy, php-format
+#, php-format
 msgid "Edit %s list by you."
-msgstr "Zmodyfikuj grupÄ™ %s"
-
-#. TRANS: Link description for link to list of users tagged with a tag.
-#, fuzzy
-msgid "Tagged"
-msgstr "Znacznik"
+msgstr "Zmodyfikuj własną listę %s."
 
 #. TRANS: Title for link to edit list settings.
 #, fuzzy
@@ -9611,37 +8876,36 @@ msgstr "Subskrybowano użytkownika %s."
 
 #. TRANS: Menu item in the group navigation page.
 #. TRANS: %s is a user nickname.
-#, fuzzy, php-format
+#, php-format
 msgctxt "MENU"
 msgid "Lists with %s"
-msgstr "Aktualizacje z \"%s\""
+msgstr "Listy z \"%s\""
 
 #. TRANS: Tooltip for menu item in the group navigation page.
 #. TRANS: %s is a user nickname.
-#, fuzzy, php-format
+#, php-format
 msgctxt "TOOLTIP"
 msgid "Lists with %s."
-msgstr "Aktualizacje z \"%s\""
+msgstr "Listy z %s."
 
 #. TRANS: Menu item in the group navigation page.
 #. TRANS: %s is a user nickname.
 #, php-format
 msgctxt "MENU"
 msgid "Lists by %s"
-msgstr ""
+msgstr "Listy użytkownika %s"
 
 #. TRANS: Tooltip for menu item in the group navigation page.
 #. TRANS: %s is a user nickname.
-#, fuzzy, php-format
+#, php-format
 msgctxt "TOOLTIP"
 msgid "Lists by %s."
-msgstr "%1$s - %2$s"
+msgstr "Listy użytkownika %s."
 
 #. TRANS: Label in lists widget.
-#, fuzzy
 msgctxt "LABEL"
 msgid "Your lists"
-msgstr "Popularne wpisy"
+msgstr "Twoje listy"
 
 #. TRANS: Fieldset legend in lists widget.
 #, fuzzy
@@ -9667,25 +8931,23 @@ msgid "Listed: %1$d Subscribers: %2$d"
 msgstr "Subskrybenci użytkownika %1$s, strona %2$d"
 
 #. TRANS: Title for page that displays which lists current user is part of.
-#, fuzzy, php-format
+#, php-format
 msgid "Lists with you"
-msgstr "Nie odnaleziono strony."
+msgstr "Listy z tobÄ…"
 
 #. TRANS: Title for page that displays which lists a user is part of.
 #. TRANS: %s is a profile name.
-#, fuzzy, php-format
+#, php-format
 msgid "Lists with %s"
-msgstr "Aktualizacje z \"%s\""
+msgstr "Listy z %s"
 
 #. TRANS: Title for page that displays lists a user has subscribed to.
-#, fuzzy
 msgid "List subscriptions"
-msgstr "Subskrypcje użytkownika %s"
+msgstr "Subskrypcje listy"
 
 #. TRANS: Menu item in personal group navigation menu.
 #. TRANS: Menu item in settings navigation panel.
 #. TRANS: Menu item in local navigation menu.
-#, fuzzy
 msgctxt "MENU"
 msgid "Profile"
 msgstr "Profil"
@@ -9695,28 +8957,24 @@ msgid "Your profile"
 msgstr "Profil grupy"
 
 #. TRANS: Menu item in personal group navigation menu.
-#, fuzzy
 msgctxt "MENU"
 msgid "Replies"
 msgstr "Odpowiedzi"
 
 #. TRANS: Menu item in personal group navigation menu.
-#, fuzzy
 msgctxt "MENU"
 msgid "Favorites"
 msgstr "Ulubione"
 
 #. TRANS: Replaces %s in '%s\'s favorite notices'. (Yes, we know we need to fix this.)
-#, fuzzy
 msgctxt "FIXME"
 msgid "User"
 msgstr "Użytkownik"
 
 #. TRANS: Menu item in personal group navigation menu.
-#, fuzzy
 msgctxt "MENU"
 msgid "Messages"
-msgstr "Wiadomość"
+msgstr "Wiadomości"
 
 #. TRANS: Menu item title in personal group navigation menu.
 msgid "Your incoming messages"
@@ -9729,28 +8987,34 @@ msgstr "Nieznane"
 #. TRANS: Plugin admin panel controls
 msgctxt "plugin"
 msgid "Disable"
-msgstr ""
+msgstr "Wyłącz"
 
 #. TRANS: Plugin admin panel controls
 msgctxt "plugin"
 msgid "Enable"
-msgstr ""
+msgstr "WÅ‚Ä…cz"
 
+#. TRANS: Plugin description for a disabled plugin.
 msgctxt "plugin-description"
-msgid "(Plugin descriptions unavailable when disabled.)"
-msgstr ""
+msgid ""
+"(The plugin description is unavailable when a plugin has been disabled.)"
+msgstr "(Opis wtyczki jest niedostępny kiedy wtyczka jest wyłączona.)"
 
 #. TRANS: Menu item in primary navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Settings"
-msgstr "Ustawienia SMS"
+msgstr "Ustawienia"
 
 #. TRANS: Menu item title in primary navigation panel.
 #, fuzzy
 msgid "Change your personal settings."
 msgstr "Zmień ustawienia profilu"
 
+#. TRANS: Menu item in primary navigation panel.
+msgctxt "MENU"
+msgid "Admin"
+msgstr "Administrator"
+
 #. TRANS: Menu item title in primary navigation panel.
 #, fuzzy
 msgid "Site configuration."
@@ -9771,15 +9035,8 @@ msgstr "Wyloguj siÄ™ z witryny"
 msgid "Login to the site."
 msgstr "Zaloguj siÄ™ na witrynie"
 
-#. TRANS: Menu item in primary navigation panel.
-msgctxt "MENU"
-msgid "Search"
-msgstr "Wyszukaj"
-
-#. TRANS: Menu item title in primary navigation panel.
-#, fuzzy
-msgid "Search the site."
-msgstr "Przeszukaj witrynÄ™"
+msgid "This profile has been silenced by site moderators"
+msgstr ""
 
 #. TRANS: H2 text for user subscription statistics.
 #, fuzzy
@@ -9791,6 +9048,10 @@ msgstr "Obserwuj"
 msgid "Followers"
 msgstr "Obserwuj"
 
+#. TRANS: H2 text for user statistics.
+msgid "Statistics"
+msgstr "Statystyki"
+
 #. TRANS: Label for user statistics.
 msgid "User ID"
 msgstr "Identyfikator użytkownika"
@@ -9799,10 +9060,6 @@ msgstr "Identyfikator użytkownika"
 msgid "Member since"
 msgstr "Członek od"
 
-#. TRANS: Label for user statistics.
-msgid "Notices"
-msgstr "Wpisy"
-
 #. TRANS: Label for user statistics.
 #. TRANS: Average count of posts made per day since account registration.
 msgid "Daily average"
@@ -9894,6 +9151,7 @@ msgid "Keyword(s)"
 msgstr "SÅ‚owa kluczowe"
 
 #. TRANS: Button text for searching site.
+#. TRANS: Button text for search button on search form.
 #. TRANS: Button text to search profiles.
 msgctxt "BUTTON"
 msgid "Search"
@@ -9944,23 +9202,6 @@ msgstr "Przeszukaj zawartość wpisów"
 msgid "Find groups on this site"
 msgstr "Znajdź grupy na tej witrynie"
 
-#. TRANS: Secondary navigation menu item leading to help on StatusNet.
-msgctxt "MENU"
-msgid "Help"
-msgstr "Pomoc"
-
-#. TRANS: Secondary navigation menu item leading to text about StatusNet site.
-#, fuzzy
-msgctxt "MENU"
-msgid "About"
-msgstr "O usłudze"
-
-#. TRANS: Secondary navigation menu item leading to Frequently Asked Questions.
-#, fuzzy
-msgctxt "MENU"
-msgid "FAQ"
-msgstr "FAQ"
-
 #. TRANS: Secondary navigation menu item leading to Terms of Service.
 #, fuzzy
 msgctxt "MENU"
@@ -9985,19 +9226,6 @@ msgctxt "MENU"
 msgid "Version"
 msgstr "Wersja"
 
-#. TRANS: Secondary navigation menu item leading to e-mail contact information on the
-#. TRANS: StatusNet site, where to report bugs, ...
-#, fuzzy
-msgctxt "MENU"
-msgid "Contact"
-msgstr "Kontakt"
-
-#. TRANS: Secondary navigation menu item. Leads to information about embedding a timeline widget.
-#, fuzzy
-msgctxt "MENU"
-msgid "Badge"
-msgstr "Odznaka"
-
 #. TRANS: Default title for section/sidebar widget.
 msgid "Untitled section"
 msgstr "Sekcja bez nazwy"
@@ -10046,10 +9274,6 @@ msgstr "E-mail"
 msgid "Change email handling"
 msgstr "Zmień obsługę adresu e-mail"
 
-#. TRANS: Menu item title in settings navigation panel.
-msgid "Design your profile"
-msgstr "WyglÄ…d profilu"
-
 #. TRANS: Menu item in settings navigation panel.
 #, fuzzy
 msgctxt "MENU"
@@ -10087,6 +9311,15 @@ msgstr "Połączenia"
 msgid "Authorized connected applications"
 msgstr "Upoważnione połączone aplikacje"
 
+#. TRANS: Menu item in settings navigation panel.
+msgctxt "MENU"
+msgid "Old school"
+msgstr ""
+
+#. TRANS: Menu item title in settings navigation panel.
+msgid "UI tweaks for old-school users"
+msgstr ""
+
 #. TRANS: Title of form to silence a user.
 #, fuzzy
 msgctxt "TITLE"
@@ -10097,6 +9330,39 @@ msgstr "Wycisz"
 msgid "Silence this user"
 msgstr "Wycisz tego użytkownika"
 
+#. TRANS: Server error displayed when trying to create an anynymous OAuth consumer.
+msgid "Could not create anonymous consumer."
+msgstr "Nie można utworzyć anonimowego klienta."
+
+#. TRANS: Server error displayed when trying to create an anynymous OAuth application.
+msgid "Could not create anonymous OAuth application."
+msgstr "Nie można utworzyć anonimowej aplikacji OAuth."
+
+#. TRANS: Exception thrown when no token association could be found.
+msgid ""
+"Could not find a profile and application associated with the request token."
+msgstr "Nie można odnaleźć profilu i aplikacji powiązanych z tokenem żądania."
+
+#. TRANS: Exception thrown when no access token can be issued.
+msgid "Could not issue access token."
+msgstr "Nie można wywołać tokenu żądania."
+
+#. TRANS: Exception thrown when a database error occurs.
+msgid "Database error inserting OAuth application user."
+msgstr "Błąd bazy danych podczas wprowadzania użytkownika aplikacji OAuth."
+
+#. TRANS: Exception thrown when a database error occurs.
+msgid "Database error updating OAuth application user."
+msgstr "Błąd bazy danych podczas aktualizowania użytkownika aplikacji OAuth."
+
+#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
+msgid "Tried to revoke unknown token."
+msgstr "Spróbowano unieważnić nieznany token."
+
+#. TRANS: Exception thrown when an attempt is made to remove a revoked token.
+msgid "Failed to delete revoked token."
+msgstr "Usunięcie unieważnionego tokenu nie powiodło się."
+
 #. TRANS: Menu item in local navigation menu.
 #, fuzzy
 msgctxt "MENU"
@@ -10129,9 +9395,9 @@ msgstr ""
 
 #. TRANS: Menu item title in local navigation menu.
 #. TRANS: %s is a user nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "Groups %s is a member of."
-msgstr "Grupy %s są członkiem"
+msgstr "Grupy, do których %s przynależy"
 
 #. TRANS: Menu item title in local navigation menu.
 #. TRANS: %s is a user nickname.
@@ -10154,6 +9420,17 @@ msgstr "Zaproś przyjaciół i kolegów do dołączenia do ciebie na %s"
 msgid "Subscribe to this user"
 msgstr "Subskrybuj tego użytkownika"
 
+#. TRANS: Button text to subscribe to a user.
+#. TRANS: Button text for subscribing to a list.
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Subscribe"
+msgstr "Subskrybuj"
+
+#. TRANS: Button title to subscribe to a user.
+msgid "Subscribe to this user."
+msgstr "Subskrybuj tego użytkownika."
+
 #. TRANS: Title of personal tag cloud section.
 msgid "People Tagcloud as self-tagged"
 msgstr "Chmura znaczników osób, które same sobie nadały znaczniki"
@@ -10292,17 +9569,28 @@ msgstr[2] ""
 #. TRANS: List message for notice repeated by logged in user.
 #, fuzzy
 msgctxt "REPEATLIST"
-msgid "You have repeated this notice."
+msgid "You repeated this."
 msgstr "Już powtórzono ten wpis."
 
-#. TRANS: List message for repeated notices.
-#. TRANS: %d is the number of users that have repeated a notice.
+#. TRANS: List message for when more than 4 people repeat something.
+#. TRANS: %%s is a list of users liking a notice, %d is the number over 4 that like the notice.
+#. TRANS: Plural is decided on the total number of users liking the notice (count of %%s + %d).
+#, php-format
+msgid "%%s and %d other repeated this."
+msgid_plural "%%s and %d others repeated this."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#. TRANS: List message for favoured notices.
+#. TRANS: %%s is a list of users liking a notice.
+#. TRANS: Plural is based on the number of of users that have favoured a notice.
 #, fuzzy, php-format
-msgid "One person has repeated this notice."
-msgid_plural "%d people have repeated this notice."
-msgstr[0] "Już powtórzono ten wpis."
-msgstr[1] "Już powtórzono ten wpis."
-msgstr[2] "Już powtórzono ten wpis."
+msgid "%%s repeated this."
+msgid_plural "%%s repeated this."
+msgstr[0] "Powtórzone dla %s"
+msgstr[1] "Powtórzone dla %s"
+msgstr[2] "Powtórzone dla %s"
 
 #. TRANS: Form legend.
 #, fuzzy, php-format
@@ -10400,7 +9688,6 @@ msgid "Unsilence this user"
 msgstr "Usuń wyciszenie tego użytkownika"
 
 #. TRANS: Form legend on unsubscribe form.
-#. TRANS: Button title on unsubscribe form.
 msgid "Unsubscribe from this user"
 msgstr "Zrezygnuj z subskrypcji tego użytkownika"
 
@@ -10411,6 +9698,11 @@ msgctxt "BUTTON"
 msgid "Unsubscribe"
 msgstr "Zrezygnuj z subskrypcji"
 
+#. TRANS: Button title on unsubscribe form.
+#, fuzzy
+msgid "Unsubscribe from this user."
+msgstr "Zrezygnuj z subskrypcji tego użytkownika"
+
 #. TRANS: Exception text shown when no profile can be found for a user.
 #. TRANS: %1$s is a user nickname, $2$d is a user ID (number).
 #, php-format
@@ -10499,8 +9791,6 @@ msgstr "Nieprawidłowy kod XML, brak głównego XRD."
 msgid "Getting backup from file '%s'."
 msgstr "Pobieranie kopii zapasowej z pliku \"%s\"."
 
-#~ msgid "%1$s and friends, page %2$d"
-#~ msgstr "%1$s i przyjaciele, strona %2$d"
-
-#~ msgid "You and friends"
-#~ msgstr "Ty i przyjaciele"
+#
+#~ msgid " "
+#~ msgstr " "
diff --git a/locale/pt/LC_MESSAGES/statusnet.po b/locale/pt/LC_MESSAGES/statusnet.po
index 63180479f9..4d6bf39433 100644
--- a/locale/pt/LC_MESSAGES/statusnet.po
+++ b/locale/pt/LC_MESSAGES/statusnet.po
@@ -1,12 +1,14 @@
-# Translation of StatusNet - Core to Portuguese (Português)
+# Translation of StatusNet - Core to Portuguese (português)
 # Exported from translatewiki.net
 #
+# Author: Analuisa
 # Author: Aracnus
 # Author: Brion
 # Author: Gallaecio
 # Author: Giro720
 # Author: Hamilton Abreu
 # Author: Ipublicis
+# Author: Malafaya
 # Author: McDutchie
 # Author: Od1n
 # Author: SandroHc
@@ -18,17 +20,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:37+0000\n"
-"Language-Team: Portuguese <http://translatewiki.net/wiki/Portal:pt>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:31+0000\n"
+"Language-Team: Portuguese <https://translatewiki.net/wiki/Portal:pt>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: pt\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-05-05 10:52:40+0000\n"
+"X-POT-Import-Date: 2012-04-22 22:02:21+0000\n"
 
 #. TRANS: Database error message.
 #, php-format
@@ -38,27 +40,26 @@ msgid ""
 "contact them at %2$s to make sure. Otherwise, wait a few minutes and try "
 "again."
 msgstr ""
-
-#. TRANS: Error message.
-msgid ""
-"An important error occured, probably related to email setup. Check logfiles "
-"for more info."
-msgstr ""
+"A base de dados de %1$s não está a responder corretamente, por isso, este "
+"sítio não funcionará devidamente. Os administradores do sítio provavelmente "
+"já têm conhecimento do problema, mas poderá contactá-los em %2$s para se "
+"assegurar. Ou então, aguarde uns minutos e tente novamente."
 
 #. TRANS: Error message.
 msgid "An error occurred."
-msgstr ""
+msgstr "Ocorreu um erro."
 
 #. TRANS: Error message displayed when there is no StatusNet configuration file.
 #, php-format
 msgid ""
 "No configuration file found. Try running the installation program first."
 msgstr ""
+"Não foi encontrado qualquer ficheiro de configuração. Tente executar o "
+"programa de instalação primeiro."
 
 #. TRANS: Error message displayed when trying to access a non-existing page.
-#, fuzzy
 msgid "Unknown page"
-msgstr "Desconhecida"
+msgstr "Página desconhecida"
 
 #. TRANS: Error message displayed when trying to perform an undefined action.
 #. TRANS: Title for password recovery page when an unknown action has been specified.
@@ -104,12 +105,11 @@ msgstr "Impossibilitar registos novos."
 msgid "Closed"
 msgstr "Fechado"
 
-#. TRANS: Title for button to save access settings in site admin panel.
-msgid "Save access settings"
-msgstr "Gravar configurações de acesso"
+#. TRANS: Button title to save access settings in site admin panel.
+msgid "Save access settings."
+msgstr "Gravar configurações de acesso."
 
-#. TRANS: Tooltip for button to save access settings in site admin panel.
-#. TRANS: Button text for saving theme settings.
+#. TRANS: Button text to save access settings in site admin panel.
 #. TRANS: Button label to save e-mail preferences.
 #. TRANS: Button label to save IM preferences.
 #. TRANS: Button text in the license admin panel.
@@ -125,7 +125,6 @@ msgstr "Gravar configurações de acesso"
 #. TRANS: Button text for saving "Other settings" in profile.
 #. TRANS: Button text to save user settings in user admin panel.
 #. TRANS: Button label in the "Edit application" form.
-#. TRANS: Button text on profile design page to save settings.
 #. TRANS: Text for save button on group edit form.
 #. TRANS: Button text to save tags for a profile.
 msgctxt "BUTTON"
@@ -161,20 +160,14 @@ msgstr "Perfil não foi encontrado."
 #. TRANS: Client error displayed trying to reference a non-existing list.
 #. TRANS: Client error displayed when referring to a non-existing list.
 #. TRANS: Client error displayed trying to reference a non-existing list.
-#, fuzzy
 msgid "No such list."
-msgstr "Categoria não foi encontrada."
-
-#. TRANS: Client error displayed when trying to add an OMB 0.1 remote profile to a list.
-#, fuzzy
-msgid "You cannot list an OMB 0.1 remote profile with this action."
-msgstr "Não pode subscrever um perfil remoto OMB 0.1 com esta operação."
+msgstr "Lista não existe."
 
 #. TRANS: Client error displayed when an unknown error occurs when adding a user to a list.
 #. TRANS: %s is a username.
 #, php-format
 msgid "There was an unexpected error while listing %s."
-msgstr ""
+msgstr "Houve um erro inesperado ao listar %s"
 
 #. TRANS: Client error displayed when an unknown error occurs when adding a user to a list.
 #. TRANS: %s is a profile URL.
@@ -183,12 +176,13 @@ msgid ""
 "There was a problem listing %s. The remote server is probably not responding "
 "correctly. Please try retrying later."
 msgstr ""
+"Houve um problema ao listar %s. O servidor remoto provavelmente não está a "
+"responder correctamente. Por favor tente mais tarde."
 
 #. TRANS: Title after adding a user to a list.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Listed"
-msgstr "Licença"
+msgstr "Listado"
 
 #. TRANS: Server error when page not found (404).
 #. TRANS: Server error when page not found (404)
@@ -200,7 +194,6 @@ msgstr "Página não foi encontrada."
 #. TRANS: Client error when user not found for an rss related action.
 #. TRANS: Client error displayed when no existing user is provided for a user's delivery device setting.
 #. TRANS: Client error displayed if a user could not be found.
-#. TRANS: Client error when user not found updating a profile background image.
 #. TRANS: Client error displayed updating profile image without having a user object.
 #. TRANS: Client error displayed when making an Atom API request for an unknown user.
 #. TRANS: Client error displayed when trying to block a non-existing user or a user from another site.
@@ -226,14 +219,11 @@ msgstr "Página não foi encontrada."
 #. TRANS: Client error displayed when trying to get the RSS feed with favorites of a user that does not exist.
 #. TRANS: Client error displayed when requesting Friends of a Friend feed without providing a user nickname.
 #. TRANS: Client error displayed when requesting Friends of a Friend feed for an object that is not a user.
-#. TRANS: Client error displayed when trying to get a user hCard for a non-existing user.
 #. TRANS: Client error displayed trying to make a micro summary without providing a valid user.
 #. TRANS: Client error displayed trying to send a direct message to a non-existing user.
 #. TRANS: Client error displayed trying to use "one time password login" without using an existing user.
 #. TRANS: Client error displayed when referring to non-existing user.
 #. TRANS: Client error displayed trying to perform an action related to a non-existing user.
-#. TRANS: Form validation error on page for remote subscribe when no user was provided.
-#. TRANS: Form validation error on page for remote subscribe when no user profile was found.
 #. TRANS: Client error displayed when trying to reply to a non-exsting user.
 #. TRANS: Client error displayed when providing a non-existing nickname in a RSS 1.0 action.
 #. TRANS: Client error.
@@ -242,7 +232,6 @@ msgstr "Página não foi encontrada."
 #. TRANS: Client error displayed trying to find a user by ID for a non-existing ID.
 #. TRANS: Client error displayed requesting groups for a non-existing user.
 #. TRANS: Client error displayed when user not found for an action.
-#. TRANS: Client error displayed providing a non-existing nickname.
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #. TRANS: Client error displayed when trying to perform a gallery action with an unknown user.
 #. TRANS: Client error displayed when trying to access a mailbox without providing a user.
@@ -251,15 +240,21 @@ msgid "No such user."
 msgstr "Utilizador não foi encontrado."
 
 #. TRANS: Title of a user's own start page.
-#, fuzzy
 msgid "Home timeline"
-msgstr "Notas de %s"
+msgstr "Linha temporal da página principal"
 
 #. TRANS: Title of another user's start page.
 #. TRANS: %s is the other user's name.
-#, fuzzy, php-format
+#, php-format
 msgid "%s's home timeline"
-msgstr "Notas de %s"
+msgstr "Linha temporal da página principal de %s"
+
+#. TRANS: %s is user nickname.
+#. TRANS: Feed title.
+#. TRANS: %s is tagger's nickname.
+#, fuzzy, php-format
+msgid "Feed for friends of %s (Activity Streams JSON)"
+msgstr "Fonte para os amigos de %s (Atom)"
 
 #. TRANS: %s is user nickname.
 #, php-format
@@ -305,7 +300,7 @@ msgstr ""
 "Pode tentar [dar um toque em %1$s](../%2$s) a partir do perfil ou [endereçar-"
 "lhe uma nota](%%%%action.newnotice%%%%?status_textarea=%3$s)."
 
-#. TRANS: Encoutagement displayed on empty timeline user pages for anonymous users.
+#. TRANS: Encouragement displayed on empty timeline user pages for anonymous users.
 #. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
 #. TRANS: Empty list message for page with replies for a user for not logged in users.
 #. TRANS: %1$s is a user nickname. This message contains a Markdown link in the form [link text](link).
@@ -319,6 +314,12 @@ msgstr ""
 "Podia [registar uma conta](%%%%action.register%%%%) e depois dar um toque em "
 "%s ou endereçar-lhe uma nota."
 
+#. TRANS: Button text for inviting more users to the StatusNet instance.
+#. TRANS: Less business/enterprise-oriented language for public sites.
+msgctxt "BUTTON"
+msgid "Send invite"
+msgstr "Enviar convite"
+
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Title of API timeline for a user and friends.
 #. TRANS: %s is a username.
@@ -327,8 +328,6 @@ msgstr ""
 #. TRANS: %s is a username.
 #. TRANS: Menu item title in personal group navigation menu.
 #. TRANS: %s is a username.
-#. TRANS: Menu item title in settings navigation panel.
-#. TRANS: %s is a username.
 #, php-format
 msgid "%s and friends"
 msgstr "%s e amigos"
@@ -367,7 +366,6 @@ msgstr ""
 #. TRANS: Server error thrown on database error updating SMS preferences.
 #. TRANS: Server error thrown on database error removing a registered SMS phone number.
 #. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
-#. TRANS: Server exception thrown on Profile design page when updating design settings fails.
 msgid "Could not update user."
 msgstr "Não foi possível actualizar o utilizador."
 
@@ -382,7 +380,6 @@ msgstr "Não foi possível gravar o perfil."
 
 #. TRANS: Client error displayed when the number of bytes in a POST request exceeds a limit.
 #. TRANS: %s is the number of bytes of the CONTENT_LENGTH.
-#. TRANS: Form validation error in design settings form. POST should remain untranslated.
 #, php-format
 msgid ""
 "The server was unable to handle that much POST data (%s byte) due to its "
@@ -397,24 +394,6 @@ msgstr[1] ""
 "O servidor não conseguiu processar tantos dados POST (%s bytes) devido à sua "
 "configuração actual."
 
-#. TRANS: Client error displayed when saving design settings fails because of an empty id.
-#. TRANS: Client error displayed when saving design settings fails because of an empty result.
-#. TRANS: Client error displayed when a database error occurs inserting profile colours.
-#. TRANS: Client error displayed when a database error occurs updating profile colours.
-#. TRANS: Form validation error displayed when group design settings could not be saved because of an application issue.
-#. TRANS: Form validation error on Profile design page when saving design settings has failed.
-#. TRANS: Form validation error on Profile design page when updating design settings has failed.
-msgid "Unable to save your design settings."
-msgstr "Não foi possível gravar as configurações do estilo."
-
-#. TRANS: Error displayed when updating design settings fails.
-#. TRANS: Client error displayed when a database error occurs updating profile colours.
-#. TRANS: Form validation error on Profile design page when updating design settings has failed.
-#. TRANS: Error message displayed if design settings could not be saved.
-#. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
-msgid "Could not update your design."
-msgstr "Não foi possível actualizar o seu estilo."
-
 #. TRANS: Title for Atom feed.
 msgctxt "ATOM"
 msgid "Main"
@@ -461,6 +440,21 @@ msgstr "Bloqueio do utilizador falhou."
 msgid "Unblock user failed."
 msgstr "Desbloqueio do utilizador falhou."
 
+#. TRANS: Client exception thrown when no conversation ID is given.
+msgid "No conversation ID."
+msgstr "Nenhum ID de conversação."
+
+#. TRANS: Client exception thrown when referring to a non-existing conversation ID (%d).
+#, fuzzy, php-format
+msgid "No conversation with ID %d."
+msgstr "Conversação"
+
+#. TRANS: Title for conversion timeline.
+#, fuzzy
+msgctxt "TITLE"
+msgid "Conversation"
+msgstr "Conversação"
+
 #. TRANS: Title. %s is a user nickname.
 #, php-format
 msgid "Direct messages from %s"
@@ -505,6 +499,8 @@ msgstr ""
 "Não pode enviar mensagens directas a utilizadores que não sejam amigos."
 
 #. TRANS: Client error displayed trying to direct message self (403).
+#. TRANS: Client error displayed trying to send a direct message to self.
+#. TRANS: Error text shown when trying to send a direct message to self.
 msgid ""
 "Do not send a message to yourself; just say it to yourself quietly instead."
 msgstr "Não auto-envie uma mensagem; basta lê-la baixinho a si próprio."
@@ -734,7 +730,6 @@ msgstr "Grupos em %s"
 
 #. TRANS: Client error displayed when trying to edit a group without being an admin.
 #. TRANS: Client error displayed trying to edit a group while not being a group admin.
-#. TRANS: Client error displayed trying to change group design settings without being a (group) admin.
 #. TRANS: Client error displayed when trying to change group logo settings while not being a group admin.
 msgid "You must be an admin to edit the group."
 msgstr "Tem de ser administrador para editar o grupo."
@@ -850,7 +845,6 @@ msgstr "Erro na base de dados ao inserir o utilizador da aplicação OAuth."
 
 #. TRANS: Client error given on when invalid data was passed through a form in the OAuth API.
 #. TRANS: Unexpected validation error on avatar upload form.
-#. TRANS: Client error displayed when the submitted form contains unexpected data.
 #. TRANS: Client error displayed submitting invalid form data for edit application.
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
 #. TRANS: Form validation error message when an unsupported argument is used.
@@ -859,7 +853,6 @@ msgstr "Erro na base de dados ao inserir o utilizador da aplicação OAuth."
 #. TRANS: Client error when submitting a form with unexpected information.
 #. TRANS: Client error displayed when unexpected data is posted in the password recovery form.
 #. TRANS: Message given submitting a form with an unknown action in SMS settings.
-#. TRANS: Unknown form validation error in design settings form.
 msgid "Unexpected form submission."
 msgstr "Envio inesperado de formulário."
 
@@ -904,7 +897,6 @@ msgstr "Conta"
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Field label on account registration page.
-#. TRANS: Label for nickname on user authorisation page.
 #. TRANS: Field label on group edit form.
 #. TRANS: Dropdown option for searching in profiles.
 msgid "Nickname"
@@ -1212,12 +1204,9 @@ msgstr "Tem de iniciar uma sessão para deixar um grupo."
 #. TRANS: Client error displayed when requesting Friends of a Friend feed for a nickname that is not a group.
 #. TRANS: Client error displayed trying to block a user from a group while specifying a non-existing group.
 #. TRANS: Client error displayed referring to a group's permalink for a non-existing group ID.
-#. TRANS: Client error displayed trying to change group design settings while providing a nickname for a non-existing group.
 #. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
 #. TRANS: Client error displayed when trying to view group members for a non-existing group.
 #. TRANS: Client error displayed when trying to view group members for an object that is not a group.
-#. TRANS: Client error displayed when trying to view group members for a non-existing group.
-#. TRANS: Client error displayed when trying to view group members for an object that is not a group.
 #. TRANS: Client error displayed when requesting a group RSS feed for group that does not exist.
 #. TRANS: Client error displayed when requesting a group RSS feed for an object that is not a group.
 #. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
@@ -1226,10 +1215,10 @@ msgstr "Tem de iniciar uma sessão para deixar um grupo."
 #. TRANS: Client error displayed when trying to leave a non-local group.
 #. TRANS: Client error displayed when trying to leave a non-existing group.
 #. TRANS: Client error displayed when providing an invalid group ID on the Make Admin page.
-#. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
-#. TRANS: Client error displayed if no local group with a given name was found requesting group page.
 #. TRANS: Command exception text shown when a group is requested that does not exist.
 #. TRANS: Error text shown when trying to leave a group that does not exist.
+#. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
+#. TRANS: Client error displayed if no local group with a given name was found requesting group page.
 msgid "No such group."
 msgstr "Grupo não foi encontrado."
 
@@ -1254,9 +1243,8 @@ msgstr ""
 
 #. TRANS: Client error displayed trying to approve group membership without specifying a profile to approve.
 #. TRANS: Client error displayed trying to approve subscriptionswithout specifying a profile to approve.
-#, fuzzy
 msgid "Must specify a profile."
-msgstr "Perfil não existe."
+msgstr "É necessário especificar um perfil."
 
 #. TRANS: Client error displayed trying to approve group membership for a non-existing request.
 #. TRANS: %s is a nickname.
@@ -1298,6 +1286,7 @@ msgid "Join request canceled."
 msgstr ""
 
 #. TRANS: Client error displayed trying to approve subscription for a non-existing request.
+#. TRANS: %s is a user nickname.
 #, fuzzy, php-format
 msgid "%s is not in the moderation queue for your subscriptions."
 msgstr "Uma lista dos utilizadores neste grupo."
@@ -1451,7 +1440,6 @@ msgstr "Anexo não foi encontrado."
 #. TRANS: Client error displayed trying to get an avatar without providing a nickname.
 #. TRANS: Client error displayed when requesting a list of blocked users for a group without providing a group nickname.
 #. TRANS: Client error displayed trying to edit a group while not proving a nickname for the group to edit.
-#. TRANS: Client error displayed trying to change group design settings without providing a group nickname.
 #. TRANS: Client error displayed when trying to change group logo settings without providing a nickname.
 #. TRANS: Client error displayed when trying to view group members without providing a group nickname.
 #. TRANS: Client error displayed when requesting a group RSS feed without providing a group nickname.
@@ -1744,6 +1732,18 @@ msgstr "O endereço \"%s\" foi confirmado para a sua conta."
 msgid "Conversation"
 msgstr "Conversação"
 
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#, fuzzy
+msgid "Conversation feed (Activity Streams JSON)"
+msgstr "Fonte de notas para %s (Atom)"
+
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#, fuzzy
+msgid "Conversation feed (RSS 2.0)"
+msgstr "Fonte de notas para %s (RSS 2.0)"
+
 #. TRANS: Title for conversation page.
 #. TRANS: Title for page that shows a notice.
 #, fuzzy
@@ -1807,7 +1807,8 @@ msgid "Enter \"%s\" to confirm that you want to delete your account."
 msgstr "Coloca \"%s\" para confirmar que desejas apagar a tua conta."
 
 #. TRANS: Button title for user account deletion.
-msgid "Permanently delete your account"
+#, fuzzy
+msgid "Permanently delete your account."
 msgstr "Apagar permanentemente a tua conta"
 
 #. TRANS: Client error displayed trying to delete an application while not logged in.
@@ -1953,152 +1954,6 @@ msgstr "Não apagues este utilizador."
 msgid "Delete this user."
 msgstr "Apagar este utilizador."
 
-#. TRANS: Message used as title for design settings for the site.
-msgid "Design"
-msgstr "Estilo"
-
-#. TRANS: Instructions for design adminsitration panel.
-msgid "Design settings for this StatusNet site"
-msgstr ""
-
-#. TRANS: Client error displayed when a logo URL does is not valid.
-msgid "Invalid logo URL."
-msgstr "URL do logotipo inválida."
-
-#. TRANS: Client error displayed when an SSL logo URL is invalid.
-msgid "Invalid SSL logo URL."
-msgstr "URL SSL do logotipo inválido."
-
-#. TRANS: Client error displayed when a theme is submitted through the form that is not in the theme list.
-#. TRANS: %s is the chosen unavailable theme.
-#, php-format
-msgid "Theme not available: %s."
-msgstr "Tema não está disponível: %s."
-
-#. TRANS: Fieldset legend for form to change logo.
-msgid "Change logo"
-msgstr "Alterar logotipo"
-
-#. TRANS: Field label for StatusNet site logo.
-msgid "Site logo"
-msgstr "Logotipo do site"
-
-#. TRANS: Field label for SSL StatusNet site logo.
-msgid "SSL logo"
-msgstr "Logótipo SSL"
-
-#. TRANS: Fieldset legend for form change StatusNet site's theme.
-msgid "Change theme"
-msgstr "Alterar tema"
-
-#. TRANS: Field label for dropdown to choose site theme.
-msgid "Site theme"
-msgstr "Tema do site"
-
-#. TRANS: Title for field label for dropdown to choose site theme.
-msgid "Theme for the site."
-msgstr "O tema para o site."
-
-#. TRANS: Field label for uploading a cutom theme.
-msgid "Custom theme"
-msgstr "Tema personalizado"
-
-#. TRANS: Form instructions for uploading a cutom StatusNet theme.
-msgid "You can upload a custom StatusNet theme as a .ZIP archive."
-msgstr ""
-"Pode fazer o upload de um tema personalizado para o StatusNet, na forma de "
-"um arquivo .ZIP."
-
-#. TRANS: Fieldset legend for theme background image.
-msgid "Change background image"
-msgstr "Alterar imagem de fundo"
-
-#. TRANS: Field label for background image on theme designer page.
-#. TRANS: Field label for background color selector.
-#. TRANS: Label on profile design page for setting a profile page background colour.
-msgid "Background"
-msgstr "Fundo"
-
-#. TRANS: Form guide for background image upload form on theme designer page.
-#, php-format
-msgid ""
-"You can upload a background image for the site. The maximum file size is %1"
-"$s."
-msgstr ""
-"Pode carregar uma imagem de fundo para o site. O tamanho máximo do ficheiro "
-"é %1$s."
-
-#. TRANS: Used as radio button label to add a background image.
-msgid "On"
-msgstr "Ligar"
-
-#. TRANS: Used as radio button label to not add a background image.
-msgid "Off"
-msgstr "Desligar"
-
-#. TRANS: Form guide for turning background image on or off on theme designer page.
-#. TRANS: Form guide for a set of radio buttons on the profile design page that will enable or disable
-#. TRANS: use of the uploaded profile image.
-msgid "Turn background image on or off."
-msgstr "Ligar ou desligar a imagem de fundo."
-
-#. TRANS: Checkbox label to title background image on theme designer page.
-#. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
-msgid "Tile background image"
-msgstr "Repetir imagem de fundo em mosaico"
-
-#. TRANS: Fieldset legend for theme colors.
-msgid "Change colors"
-msgstr "Alterar cores"
-
-#. TRANS: Field label for content color selector.
-#. TRANS: Label on profile design page for setting a profile page content colour.
-msgid "Content"
-msgstr "Conteúdo"
-
-#. TRANS: Field label for sidebar color selector.
-#. TRANS: Label on profile design page for setting a profile page sidebar colour.
-msgid "Sidebar"
-msgstr "Barra"
-
-#. TRANS: Field label for text color selector.
-#. TRANS: Label on profile design page for setting a profile page text colour.
-msgid "Text"
-msgstr "Texto"
-
-#. TRANS: Field label for link color selector.
-#. TRANS: Label on profile design page for setting a profile page links colour.
-msgid "Links"
-msgstr "Links"
-
-#. TRANS: Fieldset legend for advanced theme design settings.
-msgid "Advanced"
-msgstr "Avançado"
-
-#. TRANS: Field label for custom CSS.
-msgid "Custom CSS"
-msgstr "CSS personalizado"
-
-#. TRANS: Button text for resetting theme settings.
-msgctxt "BUTTON"
-msgid "Use defaults"
-msgstr "Usar padrão"
-
-#. TRANS: Title for button for resetting theme settings.
-#. TRANS: Title for button on profile design page to reset all colour settings to default.
-msgid "Restore default designs."
-msgstr "Restaurar designs padrão."
-
-#. TRANS: Title for button for resetting theme settings.
-#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-msgid "Reset back to default."
-msgstr "Repor para o padrão."
-
-#. TRANS: Title for button for saving theme settings.
-#. TRANS: Title for button on profile design page to save settings.
-msgid "Save design."
-msgstr "Salvar o design."
-
 #. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
 msgid "This notice is not a favorite!"
 msgstr "Esta nota não é uma favorita!"
@@ -2113,6 +1968,79 @@ msgstr "Adicionar às favoritas"
 msgid "No such document \"%s\"."
 msgstr "Documento \"%s\" não foi encontrado."
 
+#. TRANS: Menu item in administrator navigation panel.
+#. TRANS: Menu item in default local navigation panel.
+#. TRANS: Menu item in personal group navigation menu.
+msgctxt "MENU"
+msgid "Home"
+msgstr "Início"
+
+msgctxt "MENU"
+msgid "Docs"
+msgstr ""
+
+#. TRANS: Secondary navigation menu item leading to help on StatusNet.
+msgctxt "MENU"
+msgid "Help"
+msgstr "Ajuda"
+
+#, fuzzy
+msgid "Getting started"
+msgstr "Configurações gravadas."
+
+#. TRANS: Secondary navigation menu item leading to text about StatusNet site.
+#, fuzzy
+msgctxt "MENU"
+msgid "About"
+msgstr "Sobre"
+
+#, fuzzy
+msgid "About this site"
+msgstr "Desbloquear este utilizador"
+
+#. TRANS: Secondary navigation menu item leading to Frequently Asked Questions.
+#, fuzzy
+msgctxt "MENU"
+msgid "FAQ"
+msgstr "FAQ"
+
+msgid "Frequently asked questions"
+msgstr ""
+
+#. TRANS: Secondary navigation menu item leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+msgctxt "MENU"
+msgid "Contact"
+msgstr "Contacto"
+
+msgid "Contact info"
+msgstr "Informação de contacto"
+
+#, fuzzy
+msgctxt "MENU"
+msgid "Tags"
+msgstr "Categorias"
+
+msgid "Using tags"
+msgstr ""
+
+#. TRANS: Menu item in default local navigation panel.
+#. TRANS: Menu item in search group navigation panel.
+#. TRANS: Menu item in local navigation menu.
+msgctxt "MENU"
+msgid "Groups"
+msgstr "Grupos"
+
+msgid "Using groups"
+msgstr "Usando grupos"
+
+msgctxt "MENU"
+msgid "API"
+msgstr ""
+
+msgid "RESTful API"
+msgstr ""
+
 #. TRANS: Title for "Edit application" form.
 #. TRANS: Form legend.
 msgid "Edit application"
@@ -2218,9 +2146,9 @@ msgstr "Opções gravadas."
 
 #. TRANS: Title for edit list page after deleting a tag.
 #. TRANS: %s is a list.
-#, fuzzy, php-format
+#, php-format
 msgid "Delete %s list"
-msgstr "Apagar este utilizador"
+msgstr "Apagar lista %s"
 
 #. TRANS: Title for edit list page.
 #. TRANS: %s is a list.
@@ -2277,7 +2205,7 @@ msgid ""
 "subscriptions to it. Do you still want to continue?"
 msgstr ""
 
-#. TRANS: TRANS: Server error displayed when updating a list fails.
+#. TRANS: Server error displayed when updating a list fails.
 #, fuzzy
 msgid "Could not update list."
 msgstr "Não foi possível actualizar o utilizador."
@@ -2587,40 +2515,6 @@ msgstr "Sem anexos."
 msgid "No uploaded attachments."
 msgstr "Sem anexos carregados."
 
-#. TRANS: Client error displayed when subscribing to a remote profile and an unexpected response is received.
-msgid "Not expecting this response!"
-msgstr "Não esperava esta resposta!"
-
-#. TRANS: Client error displayed when subscribing to a remote profile that does not exist.
-msgid "User being listened to does not exist."
-msgstr "O utilizador que está a escutar não existe."
-
-#. TRANS: Client error displayed when subscribing to a remote profile that is a local profile.
-#. TRANS: Client error displayed when using remote subscribe for a local entity.
-msgid "You can use the local subscription!"
-msgstr "Pode usar a subscrição local!"
-
-#. TRANS: Client error displayed when subscribing to a remote profile that is blocked form subscribing to.
-msgid "That user has blocked you from subscribing."
-msgstr "Esse utilizador bloqueou-o, impedindo que o subscreva."
-
-#. TRANS: Client error displayed when subscribing to a remote profile without providing an authorised token.
-msgid "You are not authorized."
-msgstr "Não tem autorização."
-
-#. TRANS: Client error displayed when subscribing to a remote profile and conversion of the request token to access token fails.
-msgid "Could not convert request token to access token."
-msgstr "Não foi possível converter a chave de pedido numa chave de acesso."
-
-#. TRANS: Client error displayed when subscribing to a remote profile fails because of an unsupported version of the OMB protocol.
-msgid "Remote service uses unknown version of OMB protocol."
-msgstr "Serviço remoto usa uma versão desconhecida do protocolo OMB."
-
-#. TRANS: Server error displayed when subscribing to a remote profile fails because the remote profile could not be updated.
-#. TRANS: Exception thrown when updating a remote profile fails in OAuth store.
-msgid "Error updating remote profile."
-msgstr "Erro ao actualizar o perfil remoto."
-
 #. TRANS: Client error displayed when requesting a non-existent file.
 msgid "No such file."
 msgstr "Ficheiro não foi encontrado."
@@ -2710,32 +2604,6 @@ msgstr "Erro na base de dados ao bloquear acesso do utilizador ao grupo."
 msgid "No ID."
 msgstr "Sem ID."
 
-#. TRANS: Client error displayed trying to change group design settings while not logged in.
-msgid "You must be logged in to edit a group."
-msgstr "Tem de iniciar uma sessão para editar um grupo."
-
-#. TRANS: Title group design settings page.
-msgid "Group design"
-msgstr "Estilo do grupo"
-
-#. TRANS: Instructions for group design settings page.
-msgid ""
-"Customize the way your group looks with a background image and a colour "
-"palette of your choice."
-msgstr ""
-"Personalize o aspecto do seu grupo com uma imagem de fundo e uma paleta de "
-"cores à sua escolha."
-
-#. TRANS: Form validation error displayed when group design settings could not be updated because of an application issue.
-#, fuzzy
-msgid "Unable to update your design settings."
-msgstr "Não foi possível gravar as configurações do estilo."
-
-#. TRANS: Form text to confirm saved group design settings.
-#. TRANS: Confirmation message on Profile design page when saving design settings has succeeded.
-msgid "Design preferences saved."
-msgstr "Preferências de estilo foram gravadas."
-
 #. TRANS: Title for group logo settings page.
 #. TRANS: Group logo form legend.
 msgid "Group logo"
@@ -2792,9 +2660,9 @@ msgstr ""
 
 #. TRANS: Title of the first page showing pending group members still awaiting approval to join the group.
 #. TRANS: %s is the name of the group.
-#, fuzzy, php-format
+#, php-format
 msgid "%s group members awaiting approval"
-msgstr "%s membros do grupo"
+msgstr "Membros do grupo %s aguardam aprovação"
 
 #. TRANS: Title of all but the first page showing pending group members still awaiting approval to join the group.
 #. TRANS: %1$s is the name of the group, %2$d is the page number of the members list.
@@ -2909,8 +2777,8 @@ msgstr "Configurações do IM"
 #. TRANS: the order and formatting of link text and link should remain unchanged.
 #, fuzzy, php-format
 msgid ""
-"You can send and receive notices through instant messaging [instant messages]"
-"(%%doc.im%%). Configure your addresses and settings below."
+"You can send and receive notices through [instant messaging](%%doc.im%%). "
+"Configure your addresses and settings below."
 msgstr ""
 "Pode enviar e receber notas através de [mensagens instantâneas](%%doc.im%%) "
 "Jabber/GTalk. Configure o seu endereço e outras definições abaixo."
@@ -3127,29 +2995,6 @@ msgid ""
 msgstr ""
 "Use este formulário para convidar amigos e colegas a usar este serviço."
 
-#. TRANS: Field label for a list of e-mail addresses.
-msgid "Email addresses"
-msgstr "Endereços de correio electrónico"
-
-#. TRANS: Tooltip for field label for a list of e-mail addresses.
-#, fuzzy
-msgid "Addresses of friends to invite (one per line)."
-msgstr "Endereços dos amigos a convidar (um por linha)"
-
-#. TRANS: Field label for a personal message to send to invitees.
-msgid "Personal message"
-msgstr "Mensagem pessoal"
-
-#. TRANS: Tooltip for field label for a personal message to send to invitees.
-msgid "Optionally add a personal message to the invitation."
-msgstr "Pode optar por acrescentar uma mensagem pessoal ao convite"
-
-#. TRANS: Send button for inviting friends
-#. TRANS: Button text for sending notice.
-msgctxt "BUTTON"
-msgid "Send"
-msgstr "Enviar"
-
 #. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral
 #. TRANS: singular 3rd-person pronoun in English. %1$s is the inviting user, $2$s is
 #. TRANS: the StatusNet sitename.
@@ -3283,12 +3128,6 @@ msgstr ""
 msgid "Save license settings."
 msgstr "Gravar configurações do site"
 
-#. TRANS: Client error displayed when trying to log in while already logged in.
-#. TRANS: Client error displayed trying to use "one time password login" when already logged in.
-#. TRANS: Client error displayed when trying to register while already logged in.
-msgid "Already logged in."
-msgstr "Sessão já foi iniciada."
-
 #. TRANS: Form validation error displayed when trying to log in with incorrect credentials.
 msgid "Incorrect username or password."
 msgstr "Nome de utilizador ou senha incorrectos."
@@ -3400,6 +3239,7 @@ msgstr "É necessária a URL de origem."
 msgid "Could not create application."
 msgstr "Não foi possível criar a aplicação."
 
+#. TRANS: Form validation error messages displayed when uploading an invalid application logo.
 #, fuzzy
 msgid "Invalid image."
 msgstr "Tamanho inválido."
@@ -3439,12 +3279,6 @@ msgstr "Sem conteúdo!"
 msgid "No recipient specified."
 msgstr "Não especificou um destinatário."
 
-#. TRANS: Client error displayed trying to send a direct message to self.
-#. TRANS: Error text shown when trying to send a direct message to self.
-msgid ""
-"Don't send a message to yourself; just say it to yourself quietly instead."
-msgstr "Não auto-envie uma mensagem; basta lê-la baixinho a si próprio."
-
 #. TRANS: Page title after sending a direct message.
 msgid "Message sent"
 msgstr "Mensagem enviada"
@@ -3648,6 +3482,33 @@ msgstr "Só URLs %s sobre HTTP simples, por favor."
 msgid "Not a supported data format."
 msgstr "Formato de dados não suportado."
 
+#. TRANS: Page title for profile settings.
+#, fuzzy
+msgid "Old school UI settings"
+msgstr "Configurações do IM"
+
+#. TRANS: Usage instructions for profile settings.
+msgid "If you like it \"the old way\", you can set that here."
+msgstr ""
+
+#. TRANS: Confirmation shown when user profile settings are saved.
+#. TRANS: Message after successful saving of administrative settings.
+msgid "Settings saved."
+msgstr "Configurações gravadas."
+
+msgid "Only stream mode (no conversations) in timelines"
+msgstr ""
+
+msgid "Show conversation page as hierarchical trees"
+msgstr ""
+
+msgid "Show nicknames (not full names) in timelines"
+msgstr ""
+
+#. TRANS: Button text to save a list.
+msgid "Save"
+msgstr "Gravar"
+
 #. TRANS: ShortName in the OpenSearch interface when trying to find users.
 msgid "People Search"
 msgstr "Pesquisa de Pessoas"
@@ -3656,6 +3517,11 @@ msgstr "Pesquisa de Pessoas"
 msgid "Notice Search"
 msgstr "Pesquisa de Notas"
 
+#. TRANS: Client error displayed trying to use "one time password login" when already logged in.
+#. TRANS: Client error displayed when trying to register while already logged in.
+msgid "Already logged in."
+msgstr "Sessão já foi iniciada."
+
 #. TRANS: Client error displayed trying to use "one time password login" without specifying a user.
 msgid "No user ID specified."
 msgstr "Não foi especificado um ID de utilizador."
@@ -3728,7 +3594,7 @@ msgid "Confirm"
 msgstr "Confirmação"
 
 #. TRANS: Field title on page where to change password.
-#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
+#. TRANS: Title for field label for password reset form where the password has to be typed again.
 #. TRANS: Field title on account registration page.
 msgid "Same as password above."
 msgstr "Repita a nova senha."
@@ -3789,12 +3655,6 @@ msgstr "Sem acesso de leitura do directório do tema: %s."
 msgid "Avatar directory not writable: %s."
 msgstr "Sem acesso de escrita no directório do avatar: %s."
 
-#. TRANS: Client error in Paths admin panel.
-#. TRANS: %s is the background directory that could not be written to.
-#, php-format
-msgid "Background directory not writable: %s."
-msgstr "Sem acesso de escrita no directório do fundo: %s."
-
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the locales directory that could not be read from.
 #, php-format
@@ -3914,31 +3774,6 @@ msgstr "Directório do avatar"
 msgid "Directory where avatars are located."
 msgstr "Localização do directório das línguas"
 
-#. TRANS: Fieldset legend in Paths admin panel.
-msgid "Backgrounds"
-msgstr "Fundos"
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-msgid "Server for backgrounds."
-msgstr "Servidor para os fundos."
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-msgid "Web path to backgrounds."
-msgstr ""
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-msgid "Server for backgrounds on SSL pages."
-msgstr ""
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-msgid "Web path to backgrounds on SSL pages."
-msgstr ""
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-#, fuzzy
-msgid "Directory where backgrounds are located."
-msgstr "Localização do directório das línguas"
-
 #. TRANS: Fieldset legens in Paths admin panel.
 msgid "Attachments"
 msgstr "Anexos"
@@ -4000,8 +3835,9 @@ msgid "Server to direct SSL requests to."
 msgstr "Servidor para onde encaminhar pedidos SSL"
 
 #. TRANS: Button title text to store form data in the Paths admin panel.
-msgid "Save paths"
-msgstr "Gravar localizações"
+#, fuzzy
+msgid "Save path settings."
+msgstr "Gravar configurações do site"
 
 #. TRANS: Instructions for the "People search" page.
 #. TRANS: %%site.name%% is the name of the StatusNet site.
@@ -4144,7 +3980,7 @@ msgid ""
 "%%%site.name%%%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
 "blogging) service based on the Free Software [StatusNet](http://status.net/) "
 "tool. You can easily keep track of what they are doing by subscribing to the "
-"tag's timeline."
+"list's timeline."
 msgstr ""
 "**%s** é um grupo de utilizadores no site %%%%site.name%%%%, um serviço de "
 "[microblogues](http://en.wikipedia.org/wiki/Micro-blogging) baseado no "
@@ -4177,7 +4013,7 @@ msgid ""
 "site.name%%%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
 "blogging) service based on the Free Software [StatusNet](http://status.net/) "
 "tool. You can easily keep track of what they are doing by subscribing to the "
-"tag's timeline."
+"list's timeline."
 msgstr ""
 "**%s** é um grupo de utilizadores no site %%%%site.name%%%%, um serviço de "
 "[microblogues](http://en.wikipedia.org/wiki/Micro-blogging) baseado no "
@@ -4281,17 +4117,6 @@ msgid ""
 "All default plugins have been disabled from the site's configuration file."
 msgstr ""
 
-#. TRANS: Client error displayed if the notice posted has too many characters.
-msgid "Invalid notice content."
-msgstr "Conteúdo da nota é inválido."
-
-#. TRANS: Exception thrown if a notice's license is not compatible with the StatusNet site license.
-#. TRANS: %1$s is the notice license, %2$s is the StatusNet site's license.
-#, fuzzy, php-format
-msgid "Notice license \"%1$s\" is not compatible with site license \"%2$s\"."
-msgstr ""
-"A licença ‘%1$s’ da nota não é compatível com a licença ‘%2$s’ do site."
-
 #. TRANS: Client error displayed when trying to add an unindentified field to profile.
 #. TRANS: %s is a field name.
 #, php-format
@@ -4391,6 +4216,8 @@ msgid "Share my current location when posting notices"
 msgstr "Compartilhar a minha localização presente ao publicar notas"
 
 #. TRANS: Field label in form for profile settings.
+#. TRANS: Title for group tag cloud section.
+#. TRANS: %s is a group name.
 msgid "Tags"
 msgstr "Categorias"
 
@@ -4420,9 +4247,8 @@ msgid "What timezone are you normally in?"
 msgstr "Em que fuso horário se encontra normalmente?"
 
 #. TRANS: Checkbox label in form for profile settings.
-#, fuzzy
 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 quem me subscreva (óptimo para não-humanos)"
 
 #. TRANS: Dropdown field label on profile settings, for what policies to apply when someone else tries to subscribe to your updates.
@@ -4493,11 +4319,6 @@ msgstr "Não foi possível gravar as preferências de localização."
 msgid "Could not save tags."
 msgstr "Não foi possível gravar as categorias."
 
-#. TRANS: Confirmation shown when user profile settings are saved.
-#. TRANS: Message after successful saving of administrative settings.
-msgid "Settings saved."
-msgstr "Configurações gravadas."
-
 #. TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
 #. TRANS: Page title for page where a user account can be restored from backup.
 #, fuzzy
@@ -4511,7 +4332,8 @@ msgid "Beyond the page limit (%s)."
 msgstr "Além do limite de página (%s)."
 
 #. TRANS: Server error displayed when a public timeline cannot be retrieved.
-msgid "Could not retrieve public stream."
+#, fuzzy
+msgid "Could not retrieve public timeline."
 msgstr "Não foi possível importar as notas públicas."
 
 #. TRANS: Title for all public timeline pages but the first.
@@ -4526,15 +4348,23 @@ msgid "Public timeline"
 msgstr "Notas públicas"
 
 #. TRANS: Link description for public timeline feed.
-msgid "Public Stream Feed (RSS 1.0)"
+#, fuzzy
+msgid "Public Timeline Feed (Activity Streams JSON)"
+msgstr "Fonte de Notas Públicas (Atom)"
+
+#. TRANS: Link description for public timeline feed.
+#, fuzzy
+msgid "Public Timeline Feed (RSS 1.0)"
 msgstr "Fonte de Notas Públicas (RSS 1.0)"
 
 #. TRANS: Link description for public timeline feed.
-msgid "Public Stream Feed (RSS 2.0)"
+#, fuzzy
+msgid "Public Timeline Feed (RSS 2.0)"
 msgstr "Fonte de Notas Públicas (RSS 2.0)"
 
 #. TRANS: Link description for public timeline feed.
-msgid "Public Stream Feed (Atom)"
+#, fuzzy
+msgid "Public Timeline Feed (Atom)"
 msgstr "Fonte de Notas Públicas (Atom)"
 
 #. TRANS: Text displayed for public feed when there are no public notices.
@@ -4584,50 +4414,6 @@ msgstr ""
 "wikipedia.org/wiki/Micro-blogging) baseado no programa de Software Livre "
 "[StatusNet](http://status.net/)."
 
-#. TRANS: Title for page with public list cloud.
-#, fuzzy
-msgid "Public list cloud"
-msgstr "Nuvem de categorias pública"
-
-#. TRANS: Page notice for page with public list cloud.
-#. TRANS: %s is a StatusNet sitename.
-#, fuzzy, php-format
-msgid "These are largest lists on %s"
-msgstr "Estas são as categorias recentes mais populares em %s "
-
-#. TRANS: Empty list message on page with public list cloud.
-#. TRANS: This message contains Markdown links in the form [description](link).
-#, fuzzy, php-format
-msgid "No one has [listed](%%doc.tags%%) anyone yet."
-msgstr "Ainda ninguém publicou uma nota com uma [categoria](%%doc.tags%%)."
-
-#. TRANS: Additional empty list message on page with public list cloud for logged in users.
-#, fuzzy
-msgid "Be the first to list someone!"
-msgstr "Seja a primeira pessoa a publicar uma!"
-
-#. TRANS: Additional empty list message on page with public list cloud for anonymous users.
-#. TRANS: This message contains Markdown links in the form [description](link).
-#, fuzzy, php-format
-msgid ""
-"Why not [register an account](%%action.register%%) and be the first to list "
-"someone!"
-msgstr ""
-"Podia [registar uma conta](%%action.register%%) e ser a primeira pessoa a "
-"publicar uma!"
-
-#. TRANS: DT element on on page with public list cloud.
-#, fuzzy
-msgid "List cloud"
-msgstr "Utilizador não encontrado."
-
-#. TRANS: Link title for number of listed people. %d is the number of listed people.
-#, php-format
-msgid "1 person listed"
-msgid_plural "%d people listed"
-msgstr[0] ""
-msgstr[1] ""
-
 #. TRANS: Public RSS feed description. %s is the StatusNet site name.
 #, fuzzy, php-format
 msgid "%s updates from everyone."
@@ -4755,7 +4541,6 @@ msgid "6 or more characters, and do not forget it!"
 msgstr "6 ou mais caracteres, e não a esqueça!"
 
 #. TRANS: Button text for password reset form.
-#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Reset"
@@ -4765,19 +4550,6 @@ msgstr "Reiniciar"
 msgid "Enter a nickname or email address."
 msgstr "Introduza um utilizador ou um endereço de correio electrónico."
 
-#. TRANS: Information on password recovery form if no known username or e-mail address was specified.
-msgid "No user with that email address or username."
-msgstr ""
-"Não existe nenhum utilizador com esse correio electrónico nem com esse nome."
-
-#. TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.
-msgid "No registered email address for that user."
-msgstr "Nenhum endereço de email registado para esse utilizador."
-
-#. TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.
-msgid "Error saving address confirmation."
-msgstr "Erro ao guardar confirmação do endereço."
-
 #. TRANS: User notification after an e-mail with instructions was sent from the password recovery form.
 msgid ""
 "Instructions for recovering your password have been sent to the email "
@@ -4970,81 +4742,6 @@ msgstr ""
 "(Deverá receber uma mensagem electrónica dentro de momentos, com instruções "
 "para confirmar o seu endereço de correio electrónico.)"
 
-#. TRANS: Page notice for remote subscribe. This message contains Markdown links.
-#. TRANS: Ensure to keep the correct markup of [link description](link).
-#, php-format
-msgid ""
-"To subscribe, you can [login](%%action.login%%), or [register](%%action."
-"register%%) a new  account. If you already have an account  on a [compatible "
-"microblogging site](%%doc.openmublog%%),  enter your profile URL below."
-msgstr ""
-"Para subscrever, pode [iniciar sessão](%%action.login%%), ou [registar](%%"
-"action.register%%) uma conta nova. Se já tem conta num [serviço de "
-"microblogues compatível](%%doc.openmublog%%), introduza abaixo a URL do seu "
-"perfil lá."
-
-#. TRANS: Page title for Remote subscribe.
-msgid "Remote subscribe"
-msgstr "Subscrição remota"
-
-#. TRANS: Field legend on page for remote subscribe.
-msgid "Subscribe to a remote user"
-msgstr "Subscrever um utilizador remoto"
-
-#. TRANS: Field label on page for remote subscribe.
-msgid "User nickname"
-msgstr "Nome do utilizador"
-
-#. TRANS: Field title on page for remote subscribe.
-#, fuzzy
-msgid "Nickname of the user you want to follow."
-msgstr "Nome do utilizador que pretende seguir"
-
-#. TRANS: Field label on page for remote subscribe.
-msgid "Profile URL"
-msgstr "URL do perfil"
-
-#. TRANS: Field title on page for remote subscribe.
-#, fuzzy
-msgid "URL of your profile on another compatible microblogging service."
-msgstr "URL do seu perfil noutro serviço de microblogues compatível"
-
-#. TRANS: Button text on page for remote subscribe.
-#. TRANS: Link text for link that will subscribe to a remote profile.
-#. TRANS: Button text to subscribe to a user.
-#. TRANS: Button text for subscribing to a list.
-#, fuzzy
-msgctxt "BUTTON"
-msgid "Subscribe"
-msgstr "Subscrever"
-
-#. TRANS: Form validation error on page for remote subscribe when an invalid profile URL was provided.
-#, fuzzy
-msgid "Invalid profile URL (bad format)."
-msgstr "URL de perfil inválido (formato incorrecto)"
-
-#. TRANS: Form validation error on page for remote subscribe when no the provided profile URL
-#. TRANS: does not contain expected data.
-msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
-msgstr ""
-"URL do perfil não é válida (não há um documento Yadis, ou foi definido um "
-"XRDS inválido)."
-
-#. TRANS: Form validation error on page for remote subscribe.
-#, fuzzy
-msgid "That is a local profile! Login to subscribe."
-msgstr "Esse perfil é local! Inicie uma sessão para o subscrever."
-
-#. TRANS: Form validation error on page for remote subscribe when the remote service is not providing a request token.
-#, fuzzy
-msgid "Could not get a request token."
-msgstr "Não foi possível obter uma chave de pedido."
-
-#. TRANS: Client error displayed when trying to (un)list an OMB 0.1 remote profile.
-#, fuzzy
-msgid "You cannot (un)list an OMB 0.1 remote profile with this action."
-msgstr "Não pode subscrever um perfil remoto OMB 0.1 com esta operação."
-
 #. TRANS: Client error displayed when an unknown error occurs while delisting a user.
 #. TRANS: %s is a username.
 #, php-format
@@ -5097,6 +4794,12 @@ msgstr "Respostas a %s"
 msgid "Replies to %1$s, page %2$d"
 msgstr "Respostas a %1$s, página %2$d"
 
+#. TRANS: Link for feed with replies for a user.
+#. TRANS: %s is a user nickname.
+#, fuzzy, php-format
+msgid "Replies feed for %s (Activity Streams JSON)"
+msgstr "Fonte de respostas a %s (Atom)"
+
 #. TRANS: Link for feed with replies for a user.
 #. TRANS: %s is a user nickname.
 #, php-format
@@ -5217,7 +4920,7 @@ msgstr ""
 
 #. TRANS: Form instructions for feed restore.
 msgid ""
-"You can upload a backed-up stream in <a href=\"http://activitystrea.ms/"
+"You can upload a backed-up timeline in <a href=\"http://activitystrea.ms/"
 "\">Activity Streams</a> format."
 msgstr ""
 
@@ -5339,6 +5042,26 @@ msgstr "Reiniciar chave e segredo"
 msgid "Application info"
 msgstr "Informação da aplicação"
 
+#. TRANS: Field label on application page.
+msgid "Consumer key"
+msgstr "Chave do consumidor"
+
+#. TRANS: Field label on application page.
+msgid "Consumer secret"
+msgstr "Segredo do consumidor"
+
+#. TRANS: Field label on application page.
+msgid "Request token URL"
+msgstr "URL da chave de pedido"
+
+#. TRANS: Field label on application page.
+msgid "Access token URL"
+msgstr "URL da chave de acesso"
+
+#. TRANS: Field label on application page.
+msgid "Authorize URL"
+msgstr "Autorizar URL"
+
 #. TRANS: Note on the OAuth application page about signature support.
 #, fuzzy
 msgid ""
@@ -5363,6 +5086,11 @@ msgstr "Notas favoritas de %1$s, página %2$d"
 msgid "Could not retrieve favorite notices."
 msgstr "Não foi possível importar notas favoritas."
 
+#. TRANS: Feed link text. %s is a username.
+#, fuzzy, php-format
+msgid "Feed for favorites of %s (Activity Streams JSON)"
+msgstr "Fonte dos favoritos de %s (Atom)"
+
 #. TRANS: Feed link text. %s is a username.
 #, php-format
 msgid "Feed for favorites of %s (RSS 1.0)"
@@ -5425,6 +5153,11 @@ msgstr "Grupo %s"
 msgid "%1$s group, page %2$d"
 msgstr "Grupo %1$s, página %2$d"
 
+#. TRANS: Tooltip for feed link. %s is a group nickname.
+#, fuzzy, php-format
+msgid "Notice feed for %s group (Activity Streams JSON)"
+msgstr "Fonte de notas do grupo %s (Atom)"
+
 #. TRANS: Tooltip for feed link. %s is a group nickname.
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
@@ -5445,42 +5178,8 @@ msgstr "Fonte de notas do grupo %s (Atom)"
 msgid "FOAF for %s group"
 msgstr "FOAF do grupo %s"
 
-#. TRANS: Header for mini list of group members on a group page (h2).
-msgid "Members"
-msgstr "Membros"
-
-#. TRANS: Description for mini list of group members on a group page when the group has no members.
-#. TRANS: Content of "Listed" page if there are no listed users.
-#. TRANS: Content of "People following tag x" if there are no subscribed users.
-#. TRANS: Empty list message for tags.
-#. TRANS: Text for user subscription statistics if the user has no subscriptions.
-#. TRANS: Text for user subscriber statistics if user has no subscribers.
-#. TRANS: Text for user user group membership statistics if user is not a member of any group.
-#. TRANS: Default content for section/sidebar widget.
-msgid "(None)"
-msgstr "(Nenhum)"
-
-#. TRANS: Link to all group members from mini list of group members if group has more than n members.
-msgid "All members"
-msgstr "Todos os membros"
-
-#. TRANS: Header for group statistics on a group page (h2).
-#. TRANS: H2 text for user statistics.
-msgid "Statistics"
-msgstr "Estatísticas"
-
-#. TRANS: Label for group creation date.
-msgctxt "LABEL"
-msgid "Created"
-msgstr "Criação"
-
-#. TRANS: Label for member count in statistics on group page.
-msgctxt "LABEL"
-msgid "Members"
-msgstr "Membros"
-
 #. TRANS: Notice on group pages for anonymous users for StatusNet sites that accept new registrations.
-#. TRANS: **%s** is the group alias, %%%%site.name%%%% is the site name,
+#. TRANS: %s is the group name, %%%%site.name%%%% is the site name,
 #. TRANS: %%%%action.register%%%% is the URL for registration, %%%%doc.help%%%% is a URL to help.
 #. TRANS: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
 #, php-format
@@ -5499,26 +5198,20 @@ msgstr ""
 "muitos mais! ([Saber mais](%%%%doc.help%%%%))"
 
 #. TRANS: Notice on group pages for anonymous users for StatusNet sites that accept no new registrations.
-#. TRANS: **%s** is the group alias, %%%%site.name%%%% is the site name,
+#. TRANS: %s is the group name, %%%%site.name%%%% is the site name,
 #. TRANS: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
-#, php-format
+#, fuzzy, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
 "wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
 "[StatusNet](http://status.net/) tool. Its members share short messages about "
-"their life and interests. "
+"their life and interests."
 msgstr ""
 "**%s** é um grupo de utilizadores no site %%%%site.name%%%%, um serviço de "
 "[microblogues](http://en.wikipedia.org/wiki/Micro-blogging) baseado no "
 "programa de Software Livre [StatusNet](http://status.net/). Os membros deste "
 "grupo partilham mensagens curtas acerca das suas vidas e interesses. "
 
-#. TRANS: Title for list of group administrators on a group page.
-#, fuzzy
-msgctxt "TITLE"
-msgid "Admins"
-msgstr "Gestores"
-
 #. TRANS: Client error displayed requesting a single message that does not exist.
 msgid "No such message."
 msgstr "Mensagem não foi encontrada."
@@ -5614,10 +5307,22 @@ msgstr ""
 "publicar uma!"
 
 #. TRANS: Header on show list page.
+#. TRANS: Link description for link to list of users tagged with a tag (so part of a list).
 #, fuzzy
 msgid "Listed"
 msgstr "Licença"
 
+#. TRANS: Content of "Listed" page if there are no listed users.
+#. TRANS: Content of "People following tag x" if there are no subscribed users.
+#. TRANS: Description for mini list of group members on a group page when the group has no members.
+#. TRANS: Empty list message for tags.
+#. TRANS: Text for user subscription statistics if the user has no subscriptions.
+#. TRANS: Text for user subscriber statistics if user has no subscribers.
+#. TRANS: Text for user user group membership statistics if user is not a member of any group.
+#. TRANS: Default content for section/sidebar widget.
+msgid "(None)"
+msgstr "(Nenhum)"
+
 #. TRANS: Link for more "People in list x by a user"
 #. TRANS: if there are more than the mini list's maximum.
 #, fuzzy
@@ -5629,24 +5334,19 @@ msgstr "Mostrar mais"
 msgid "Subscribers"
 msgstr "Subscritores"
 
-#. TRANS: Link for more "People following tag x"
-#. TRANS: if there are more than the mini list's maximum.
-msgid "All subscribers"
-msgstr "Todos os subscritores"
-
-#. TRANS: Page title showing tagged notices in one user's stream.
+#. TRANS: Page title showing tagged notices in one user's timeline.
 #. TRANS: %1$s is the username, %2$s is the hash tag.
 #, fuzzy, php-format
 msgid "Notices by %1$s tagged %2$s"
 msgstr "%1$s etiquetado como %2$s"
 
-#. TRANS: Page title showing tagged notices in one user's stream.
+#. TRANS: Page title showing tagged notices in one user's timeline.
 #. TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number.
 #, fuzzy, php-format
 msgid "Notices by %1$s tagged %2$s, page %3$d"
 msgstr "Notas categorizadas com %1$s, página %2$d"
 
-#. TRANS: Extended page title showing tagged notices in one user's stream.
+#. TRANS: Extended page title showing tagged notices in one user's timeline.
 #. TRANS: %1$s is the username, %2$d is the page number.
 #, fuzzy, php-format
 msgid "Notices by %1$s, page %2$d"
@@ -5658,6 +5358,12 @@ msgstr "Notas categorizadas com %1$s, página %2$d"
 msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
 msgstr "Fonte de notas de %1$s com a categoria %2$s (RSS 1.0)"
 
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#, fuzzy, php-format
+msgid "Notice feed for %s (Activity Streams JSON)"
+msgstr "Fonte de notas para %s (Atom)"
+
 #. TRANS: Title for link to notice feed.
 #. TRANS: %s is a user nickname.
 #, php-format
@@ -5682,7 +5388,7 @@ msgstr "Fonte de notas para %s (Atom)"
 msgid "FOAF for %s"
 msgstr "FOAF para %s"
 
-#. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
+#. TRANS: First sentence of empty list message for a timeline. $1%s is a user nickname.
 #, fuzzy, php-format
 msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
 msgstr "Estas são as notas de %1$s, mas %2$s ainda não publicou nenhuma."
@@ -5695,7 +5401,7 @@ msgstr ""
 "Viu algo de interessante ultimamente? Como ainda não publicou nenhuma nota, "
 "esta seria uma óptima altura para começar :)"
 
-#. TRANS: Second sentence of empty  list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
+#. TRANS: Second sentence of empty  list message for a non-self timeline. %1$s is a user nickname, %2$s is a part of a URL.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
 #, php-format
 msgid ""
@@ -5705,7 +5411,7 @@ msgstr ""
 "Pode tentar dar um toque em %1$s ou [endereçar-lhe uma nota](%%%%action."
 "newnotice%%%%?status_textarea=%2$s)."
 
-#. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
+#. TRANS: Announcement for anonymous users showing a timeline if site registrations are open.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
 #, php-format
 msgid ""
@@ -5720,13 +5426,13 @@ msgstr ""
 "action.register%%%%) para seguir as notas de **%s** e de muitos mais! "
 "([Saber mais](%%%%doc.help%%%%))"
 
-#. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
+#. TRANS: Announcement for anonymous users showing a timeline if site registrations are closed or invite only.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#, php-format
+#, fuzzy, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
 "wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
-"[StatusNet](http://status.net/) tool. "
+"[StatusNet](http://status.net/) tool."
 msgstr ""
 "**%s** tem uma conta no site %%%%site.name%%%%, um serviço de [microblogues]"
 "(http://en.wikipedia.org/wiki/Micro-blogging) baseado no programa de "
@@ -5764,6 +5470,14 @@ msgstr "Nome do site não pode ter comprimento zero."
 msgid "You must have a valid contact email address."
 msgstr "Tem de ter um endereço válido para o correio electrónico de contacto."
 
+#. TRANS: Client error displayed when a logo URL is not valid.
+msgid "Invalid logo URL."
+msgstr "URL do logotipo inválida."
+
+#. TRANS: Client error displayed when a SSL logo URL is invalid.
+msgid "Invalid SSL logo URL."
+msgstr "URL SSL do logotipo inválido."
+
 #. TRANS: Client error displayed trying to save site settings with an invalid language code.
 #. TRANS: %s is the invalid language code.
 #, php-format
@@ -5841,7 +5555,9 @@ msgid "Default language"
 msgstr "Língua, por omissão"
 
 #. TRANS: Dropdown title on site settings panel.
-msgid "Site language when autodetection from browser settings is not available"
+#, fuzzy
+msgid ""
+"The site language when autodetection from browser settings is not available."
 msgstr ""
 "Língua do site quando a sua detecção na configuração do browser não é "
 "possível"
@@ -5870,8 +5586,21 @@ msgstr ""
 "Quanto tempo os utilizadores terão de esperar (em segundos) para publicar a "
 "mesma coisa outra vez."
 
+#. TRANS: Fieldset legend for form to change logo.
+msgid "Logo"
+msgstr "Logótipo"
+
+#. TRANS: Field label for StatusNet site logo.
+msgid "Site logo"
+msgstr "Logotipo do site"
+
+#. TRANS: Field label for SSL StatusNet site logo.
+msgid "SSL logo"
+msgstr "Logótipo SSL"
+
 #. TRANS: Button title for saving site settings.
-msgid "Save site settings"
+#, fuzzy
+msgid "Save the site settings."
 msgstr "Gravar configurações do site"
 
 #. TRANS: Page title for site-wide notice tab in admin panel.
@@ -5900,7 +5629,7 @@ msgstr "Texto do aviso do site"
 msgid "Site-wide notice text (255 characters maximum; HTML allowed)"
 msgstr "Texto do aviso do site (máx. 255 caracteres; pode usar HTML)"
 
-#. TRANS: Title for button to save site notice in admin panel.
+#. TRANS: Button title to save site notice in admin panel.
 #, fuzzy
 msgid "Save site notice."
 msgstr "Gravar aviso do site"
@@ -6102,7 +5831,7 @@ msgstr "URL para relatórios"
 msgid "Snapshots will be sent to this URL."
 msgstr "Instantâneos serão enviados para esta URL"
 
-#. TRANS: Title for button to save snapshot settings.
+#. TRANS: Button title to save snapshot settings.
 #, fuzzy
 msgid "Save snapshot settings."
 msgstr "Gravar configurações do instantâneo"
@@ -6137,10 +5866,6 @@ msgstr "Membros do grupo %1$s, página %2$d"
 msgid "A list of users awaiting approval to subscribe to you."
 msgstr "Uma lista dos utilizadores neste grupo."
 
-#. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
-msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
-msgstr "Não pode subscrever um perfil remoto OMB 0.1 com esta operação."
-
 #. TRANS: Page title when subscription succeeded.
 msgid "Subscribed"
 msgstr "Subscrito"
@@ -6239,13 +5964,12 @@ msgstr "Estas são as pessoas cujas notas %s está a escutar."
 #. TRANS: This message contains Markdown URLs. The link description is between
 #. TRANS: square brackets, and the link between parentheses. Do not separate "]("
 #. TRANS: and do not change the URL part.
-#, php-format
+#, fuzzy, php-format
 msgid ""
 "You're not listening to anyone's notices right now, try subscribing to "
 "people you know. Try [people search](%%action.peoplesearch%%), look for "
 "members in groups you're interested in and in our [featured users](%%action."
-"featured%%). If you're a [Twitter user](%%action.twittersettings%%), you can "
-"automatically subscribe to people you already follow there."
+"featured%%)."
 msgstr ""
 "Neste momento, não está a escutar as notas de ninguém. Tente subscrever "
 "pessoas que conhece. Tente a [pesquisa de pessoas](%%action.peoplesearch%%), "
@@ -6283,6 +6007,12 @@ msgstr "SMS"
 msgid "Notices tagged with %1$s, page %2$d"
 msgstr "Notas categorizadas com %1$s, página %2$d"
 
+#. TRANS: Link label for feed on "notices with tag" page.
+#. TRANS: %s is the tag the feed is for.
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (Activity Streams JSON)"
+msgstr "Fonte de notas para a categoria %s (Atom)"
+
 #. TRANS: Link label for feed on "notices with tag" page.
 #. TRANS: %s is the tag the feed is for.
 #, php-format
@@ -6394,18 +6124,6 @@ msgstr "Subscrição cancelada"
 msgid "%1$s unsubscribed from list %2$s by %3$s"
 msgstr "Subscritores de %1$s, página %2$d"
 
-#. TRANS: Client error displayed when trying to update profile with an incompatible license.
-#. TRANS: %1$s is the license incompatible with site license %2$s.
-#. TRANS: Exception thrown when licenses are not compatible for an authorisation request.
-#. TRANS: %1$s is the license for the listenee, %2$s is the license for "this" StatusNet site.
-#, fuzzy, php-format
-msgid ""
-"Listenee stream license \"%1$s\" is not compatible with site license \"%2$s"
-"\"."
-msgstr ""
-"Licença ‘%1$s’ da listenee stream não é compatível com a licença ‘%2$s’ do "
-"site."
-
 #. TRANS: Title of URL settings tab in profile settings.
 #, fuzzy
 msgid "URL settings"
@@ -6544,162 +6262,11 @@ msgstr "Convites habilitados"
 msgid "Whether to allow users to invite new users."
 msgstr "Permitir, ou não, que utilizadores convidem utilizadores novos."
 
-#. TRANS: Title for button to save user settings in user admin panel.
+#. TRANS: Button title to save user settings in user admin panel.
 #, fuzzy
 msgid "Save user settings."
 msgstr "Gravar configurações do site"
 
-#. TRANS: Page title.
-msgid "Authorize subscription"
-msgstr "Autorizar subscrição"
-
-#. TRANS: Page notice on "Authorize subscription" page.
-#, fuzzy
-msgid ""
-"Please check these details to make sure that you want to subscribe to this "
-"user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
-"click \"Reject\"."
-msgstr ""
-"Por favor, verifique estes detalhes para se certificar de que deseja "
-"subscrever as notas deste utilizador. Se não fez um pedido para subscrever "
-"as notas de alguém, simplesmente clique \"Rejeitar\"."
-
-#. TRANS: Button text on Authorise Subscription page.
-#. TRANS: Submit button text to accept a group membership request on approve group form.
-#. TRANS: Submit button text to accept a subscription request on approve sub form.
-msgctxt "BUTTON"
-msgid "Accept"
-msgstr "Aceitar"
-
-#. TRANS: Title for button on Authorise Subscription page.
-#. TRANS: Button title to subscribe to a user.
-#, fuzzy
-msgid "Subscribe to this user."
-msgstr "Subscrever este utilizador"
-
-#. TRANS: Button text on Authorise Subscription page.
-#. TRANS: Submit button text to reject a group membership request on approve group form.
-#. TRANS: Submit button text to reject a subscription request on approve sub form.
-msgctxt "BUTTON"
-msgid "Reject"
-msgstr "Rejeitar"
-
-#. TRANS: Title for button on Authorise Subscription page.
-#, fuzzy
-msgid "Reject this subscription."
-msgstr "Rejeitar esta subscrição"
-
-#. TRANS: Client error displayed for an empty authorisation request.
-msgid "No authorization request!"
-msgstr "Não há pedido de autorização!"
-
-#. TRANS: Accept message header from Authorise subscription page.
-msgid "Subscription authorized"
-msgstr "Subscrição autorizada"
-
-#. TRANS: Accept message text from Authorise subscription page.
-#, fuzzy
-msgid ""
-"The subscription has been authorized, but no callback URL was passed. Check "
-"with the site's instructions for details on how to authorize the "
-"subscription. Your subscription token is:"
-msgstr ""
-"A subscrição foi autorizada, mas não foi enviada nenhuma URL de retorno. "
-"Verifique as instruções do site para saber como autorizar a subscrição. A "
-"sua chave de subscrição é:"
-
-#. TRANS: Reject message header from Authorise subscription page.
-msgid "Subscription rejected"
-msgstr "Subscrição rejeitada"
-
-#. TRANS: Reject message from Authorise subscription page.
-#, fuzzy
-msgid ""
-"The subscription has been rejected, but no callback URL was passed. Check "
-"with the site's instructions for details on how to fully reject the "
-"subscription."
-msgstr ""
-"A subscrição foi rejeitada, mas não foi enviada nenhuma URL de retorno. "
-"Verifique as instruções do site para saber como rejeitar completamente a "
-"subscrição."
-
-#. TRANS: Exception thrown when no valid user is found for an authorisation request.
-#. TRANS: %s is a listener URI.
-#, fuzzy, php-format
-msgid "Listener URI \"%s\" not found here."
-msgstr "A listener URI ‘%s’ não foi encontrada aqui."
-
-#. TRANS: Exception thrown when listenee URI is too long for an authorisation request.
-#. TRANS: %s is a listenee URI.
-#, fuzzy, php-format
-msgid "Listenee URI \"%s\" is too long."
-msgstr "URI do escutado ‘%s’ é demasiado longo."
-
-#. TRANS: Exception thrown when listenee URI is a local user for an authorisation request.
-#. TRANS: %s is a listenee URI.
-#, fuzzy, php-format
-msgid "Listenee URI \"%s\" is a local user."
-msgstr "URI do ouvido ‘%s’ é um utilizador local."
-
-#. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
-#. TRANS: %s is a profile URL.
-#, fuzzy, php-format
-msgid "Profile URL \"%s\" is for a local user."
-msgstr "A URL ‘%s’ do perfil é de um utilizador local."
-
-#. TRANS: Exception thrown when avatar URL is invalid for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#, fuzzy, php-format
-msgid "Avatar URL \"%s\" is not valid."
-msgstr "A URL ‘%s’ do avatar é inválida."
-
-#. TRANS: Exception thrown when avatar URL could not be read for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#, fuzzy, php-format
-msgid "Cannot read avatar URL \"%s\"."
-msgstr "Não é possível ler a URL do avatar ‘%s’."
-
-#. TRANS: Exception thrown when avatar URL return an invalid image type for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#, fuzzy, php-format
-msgid "Wrong image type for avatar URL \"%s\"."
-msgstr "Tipo de imagem incorrecto para o avatar da URL ‘%s’."
-
-#. TRANS: Title for profile design page.
-#. TRANS: Page title for profile design page.
-msgid "Profile design"
-msgstr "Estilo do perfil"
-
-#. TRANS: Instructions for Profile design page.
-#. TRANS: Instructions for profile design page.
-msgid ""
-"Customize the way your profile looks with a background image and a colour "
-"palette of your choice."
-msgstr ""
-"Personalize o estilo do seu perfil com uma imagem de fundo e uma paleta de "
-"cores à sua escolha."
-
-#. TRANS: Succes message on Profile design page when finding an easter egg.
-msgid "Enjoy your hotdog!"
-msgstr "Disfrute do seu cachorro-quente!"
-
-#. TRANS: Form legend on Profile design page.
-#, fuzzy
-msgid "Design settings"
-msgstr "Gravar configurações do site"
-
-#. TRANS: Checkbox label on Profile design page.
-msgid "View profile designs"
-msgstr "Ver estilos para o perfil"
-
-#. TRANS: Title for checkbox on Profile design page.
-msgid "Show or hide profile designs."
-msgstr "Mostrar ou esconder estilos para o perfil."
-
-#. TRANS: Form legend on Profile design page for form to choose a background image.
-msgid "Background file"
-msgstr "Ficheiro de fundo"
-
 #. TRANS: Page title for all but the first page of groups for a user.
 #. TRANS: %1$s is a nickname, %2$d is a page number.
 #, php-format
@@ -6738,9 +6305,9 @@ msgstr "StatusNet %s"
 
 #. TRANS: Content part of StatusNet version page.
 #. TRANS: %1$s is the engine name (StatusNet) and %2$s is the StatusNet version.
-#, php-format
+#, fuzzy, php-format
 msgid ""
-"This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, "
+"This site is powered by %1$s version %2$s, Copyright 2008-2011 StatusNet, "
 "Inc. and contributors."
 msgstr ""
 "Este site utiliza o %1$s versão %2$s, (c) 2008-2010 StatusNet, Inc. e "
@@ -6755,11 +6322,12 @@ msgid "License"
 msgstr "Licença"
 
 #. TRANS: Content part of StatusNet version page.
+#, fuzzy
 msgid ""
 "StatusNet is free software: you can redistribute it and/or modify it under "
 "the terms of the GNU Affero General Public License as published by the Free "
 "Software Foundation, either version 3 of the License, or (at your option) "
-"any later version. "
+"any later version."
 msgstr ""
 "O StatusNet é software livre: pode ser distribuído e/ou modificado nos "
 "termos da licença GNU Affero General Public License publicada pela Free "
@@ -6767,11 +6335,12 @@ msgstr ""
 "qualquer versão posterior. "
 
 #. TRANS: Content part of StatusNet version page.
+#, fuzzy
 msgid ""
 "This program is distributed in the hope that it will be useful, but WITHOUT "
 "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
 "FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License "
-"for more details. "
+"for more details."
 msgstr ""
 "Este programa é distribuído na esperança de que venha a ser útil, mas SEM "
 "QUALQUER GARANTIA. Consulte a GNU Affero General Public License para mais "
@@ -6834,16 +6403,26 @@ msgstr "Não é possível processar a URL '$s'"
 msgid "Robin thinks something is impossible."
 msgstr "o Robin acha que algo é impossível."
 
+#. TRANS: Message used to be inserted as %2$s in  the text "No file may
+#. TRANS: be larger than %1$d byte and the file you sent was %2$s.".
+#. TRANS: %1$d is the number of bytes of an uploaded file.
+#, php-format
+msgid "%1$d byte"
+msgid_plural "%1$d bytes"
+msgstr[0] "%1$d byte"
+msgstr[1] "%1$d bytes"
+
 #. TRANS: Message given if an upload is larger than the configured maximum.
-#. TRANS: %1$d is the byte limit for uploads, %2$d is the byte count for the uploaded file.
-#. TRANS: %1$s is used for plural.
+#. TRANS: %1$d (used for plural) is the byte limit for uploads,
+#. TRANS: %2$s is the proper form of "n bytes". This is the only ways to have
+#. TRANS: gettext support multiple plurals in the same message, unfortunately...
 #, fuzzy, php-format
 msgid ""
-"No file may be larger than %1$d byte and the file you sent was %2$d bytes. "
-"Try to upload a smaller version."
+"No file may be larger than %1$d byte and the file you sent was %2$s. Try to "
+"upload a smaller version."
 msgid_plural ""
-"No file may be larger than %1$d bytes and the file you sent was %2$d bytes. "
-"Try to upload a smaller version."
+"No file may be larger than %1$d bytes and the file you sent was %2$s. Try to "
+"upload a smaller version."
 msgstr[0] ""
 "Nenhum ficheiro pode ter mais de %1$d bytes e o que enviou tinha %2$d bytes. "
 "Tente enviar uma versão mais pequena."
@@ -6919,6 +6498,11 @@ msgstr "Não foi possível actualizar o grupo local."
 msgid "Could not create login token for %s"
 msgstr "Não foi possível criar a chave de entrada para %s"
 
+#. TRANS: Exception thrown when a program code class (%s) cannot be instantiated.
+#, fuzzy, php-format
+msgid "Cannot instantiate class %s."
+msgstr "Não é possível salvar a nova senha."
+
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.
 msgid "No database name or DSN found anywhere."
 msgstr "Não foi encontrado nenhum nome de base de dados ou DSN."
@@ -7085,7 +6669,7 @@ msgstr ""
 #, php-format
 msgid ""
 "You already have %1$d or more people in list %2$s, which is the maximum "
-"allowed number.Try unlisting others first."
+"allowed number. Try unlisting others first."
 msgstr ""
 
 #. TRANS: Exception thrown when inserting a list subscription in the database fails.
@@ -7107,7 +6691,6 @@ msgid "Unable to save tag."
 msgstr "Não foi possível gravar a categoria."
 
 #. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
-#. TRANS: Error message displayed to a banned user when they try to subscribe.
 msgid "You have been banned from subscribing."
 msgstr "Foi bloqueado de fazer subscrições"
 
@@ -7127,10 +6710,6 @@ msgstr "Não subscrito!"
 msgid "Could not delete self-subscription."
 msgstr "Não foi possível apagar a auto-subscrição."
 
-#. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
-msgid "Could not delete subscription OMB token."
-msgstr "Não foi possível apagar a chave OMB da subscrição."
-
 #. TRANS: Exception thrown when a subscription could not be deleted on the server.
 msgid "Could not delete subscription."
 msgstr "Não foi possível apagar a subscrição."
@@ -7165,6 +6744,19 @@ msgstr "Nenhum utilizador único definido para o modo de utilizador único."
 msgid "Single-user mode code called when not enabled."
 msgstr ""
 
+#. TRANS: Information on password recovery form if no known username or e-mail address was specified.
+msgid "No user with that email address or username."
+msgstr ""
+"Não existe nenhum utilizador com esse correio electrónico nem com esse nome."
+
+#. TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.
+msgid "No registered email address for that user."
+msgstr "Nenhum endereço de email registado para esse utilizador."
+
+#. TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.
+msgid "Error saving address confirmation."
+msgstr "Erro ao guardar confirmação do endereço."
+
 #. TRANS: Server exception thrown when creating a group failed.
 msgid "Could not create group."
 msgstr "Não foi possível criar o grupo."
@@ -7445,27 +7037,12 @@ msgstr "showForm() não implementado."
 msgid "saveSettings() not implemented."
 msgstr "saveSettings() não implementado."
 
-#. TRANS: Client error message thrown if design settings could not be deleted in
-#. TRANS: the admin panel Design.
-msgid "Unable to delete design setting."
-msgstr "Não foi possível apagar a configuração do estilo."
-
 #. TRANS: Header in administrator navigation panel.
-#. TRANS: Header in settings navigation panel.
 #, fuzzy
 msgctxt "HEADER"
 msgid "Home"
 msgstr "Página pessoal"
 
-#. TRANS: Menu item in administrator navigation panel.
-#. TRANS: Menu item in default local navigation panel.
-#. TRANS: Menu item in personal group navigation menu.
-#. TRANS: Menu item in settings navigation panel.
-#, fuzzy
-msgctxt "MENU"
-msgid "Home"
-msgstr "Página pessoal"
-
 #. TRANS: Header in administrator navigation panel.
 #, fuzzy
 msgctxt "HEADER"
@@ -7481,17 +7058,6 @@ msgctxt "MENU"
 msgid "Site"
 msgstr "Site"
 
-#. TRANS: Menu item title in administrator navigation panel.
-msgid "Design configuration"
-msgstr "Configuração do estilo"
-
-#. TRANS: Menu item in administrator navigation panel.
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: Menu item in settings navigation panel.
-msgctxt "MENU"
-msgid "Design"
-msgstr "Estilo"
-
 #. TRANS: Menu item title in administrator navigation panel.
 msgid "User configuration"
 msgstr "Configuração do utilizador"
@@ -7597,43 +7163,6 @@ msgstr "Nenhum utilizador para esse código."
 msgid "Could not authenticate you."
 msgstr "Não foi possível autenticá-lo."
 
-#. TRANS: Server error displayed when trying to create an anynymous OAuth consumer.
-#, fuzzy
-msgid "Could not create anonymous consumer."
-msgstr "Não foi possível criar os nomes alternativos."
-
-#. TRANS: Server error displayed when trying to create an anynymous OAuth application.
-#, fuzzy
-msgid "Could not create anonymous OAuth application."
-msgstr "Não foi possível criar a aplicação."
-
-#. TRANS: Exception thrown when no token association could be found.
-msgid ""
-"Could not find a profile and application associated with the request token."
-msgstr ""
-
-#. TRANS: Exception thrown when no access token can be issued.
-msgid "Could not issue access token."
-msgstr "Não foi possível emitir a ficha de acesso."
-
-#. TRANS: Exception thrown when a database error occurs.
-msgid "Database error inserting OAuth application user."
-msgstr "Erro na base de dados ao inserir o utilizador da aplicação OAuth."
-
-#. TRANS: Exception thrown when a database error occurs.
-msgid "Database error updating OAuth application user."
-msgstr ""
-"Erro na actualização da base de dados ao inserir o utilizador da aplicação "
-"OAuth."
-
-#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
-msgid "Tried to revoke unknown token."
-msgstr "Tentou revogar um código desconhecido."
-
-#. TRANS: Exception thrown when an attempt is made to remove a revoked token.
-msgid "Failed to delete revoked token."
-msgstr "Falha ao eliminar código revogado."
-
 #. TRANS: Form input field label for application icon.
 msgid "Icon"
 msgstr "�cone"
@@ -7714,13 +7243,14 @@ msgid "Default access for this application: read-only, or read-write"
 msgstr "Acesso por omissão para esta aplicação: leitura ou leitura e escrita"
 
 #. TRANS: Submit button title.
-msgid "Cancel"
-msgstr "Cancelar"
+#, fuzzy
+msgid "Cancel application changes."
+msgstr "Aplicações ligadas"
 
 #. TRANS: Submit button title.
-#. TRANS: Button text to save a list.
-msgid "Save"
-msgstr "Gravar"
+#, fuzzy
+msgid "Save application changes."
+msgstr "Nova aplicação"
 
 #. TRANS: Name for an anonymous application in application list.
 #, fuzzy
@@ -7756,6 +7286,18 @@ msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "Retirar"
 
+#. TRANS: Submit button text to accept a group membership request on approve group form.
+#. TRANS: Submit button text to accept a subscription request on approve sub form.
+msgctxt "BUTTON"
+msgid "Accept"
+msgstr "Aceitar"
+
+#. TRANS: Submit button text to reject a group membership request on approve group form.
+#. TRANS: Submit button text to reject a subscription request on approve sub form.
+msgctxt "BUTTON"
+msgid "Reject"
+msgstr "Rejeitar"
+
 #. TRANS: Atom feed exception thrown when an author element does not contain a name element.
 msgid "Author element must contain a name element."
 msgstr ""
@@ -8323,6 +7865,11 @@ msgstr "Talvez queira correr o instalador para resolver esta questão."
 msgid "Go to the installer."
 msgstr "Ir para o instalador."
 
+#. TRANS: Header on conversation page. Hidden by default (h2).
+#. TRANS: Label for user statistics.
+msgid "Notices"
+msgstr "Notas"
+
 #. TRANS: Page title for when a database error occurs.
 msgid "Database error"
 msgstr "Erro de base de dados"
@@ -8334,14 +7881,6 @@ msgctxt "MENU"
 msgid "Public"
 msgstr "Público"
 
-#. TRANS: Menu item in default local navigation panel.
-#. TRANS: Menu item in search group navigation panel.
-#. TRANS: Menu item in local navigation menu.
-#, fuzzy
-msgctxt "MENU"
-msgid "Groups"
-msgstr "Grupos"
-
 #. TRANS: Menu item in default local navigation panel.
 #. TRANS: Menu item title in local navigation menu.
 #, fuzzy
@@ -8358,54 +7897,12 @@ msgstr "Apagar"
 msgid "Delete this user"
 msgstr "Apagar este utilizador"
 
-#. TRANS: Form legend of form for changing the page design.
-#, fuzzy
-msgid "Change design"
-msgstr "Gravar o estilo"
-
-#. TRANS: Fieldset legend on profile design page to change profile page colours.
-msgid "Change colours"
-msgstr "Alterar cores"
-
-#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-msgid "Use defaults"
-msgstr "Usar predefinições"
-
-#. TRANS: Label in form on profile design page.
-#. TRANS: Field contains file name on user's computer that could be that user's custom profile background image.
-msgid "Upload file"
-msgstr "Carregar ficheiro"
-
-#. TRANS: Instructions for form on profile design page.
-msgid ""
-"You can upload your personal background image. The maximum file size is 2MB."
-msgstr ""
-"Pode carregar uma imagem de fundo pessoal. O tamanho máximo do ficheiro é "
-"2MB."
-
-#. TRANS: Radio button on profile design page that will enable use of the uploaded profile image.
-#, fuzzy
-msgctxt "RADIO"
-msgid "On"
-msgstr "Ligar"
-
-#. TRANS: Radio button on profile design page that will disable use of the uploaded profile image.
-#, fuzzy
-msgctxt "RADIO"
-msgid "Off"
-msgstr "Desligar"
-
-#. TRANS: Success message displayed if design settings were saved after clicking "Use defaults".
-msgid "Design defaults restored."
-msgstr "Predefinições do estilo repostas"
-
 #. TRANS: Exception. %s is an ID.
 #, fuzzy, php-format
 msgid "Unable to find services for %s."
 msgstr "Não foi possível retirar acesso da aplicação: %s"
 
 #. TRANS: Form legend for removing the favourite status for a favourite notice.
-#. TRANS: Title for button text for removing the favourite status for a favourite notice.
 msgid "Disfavor this notice"
 msgstr "Retirar esta nota das favoritas"
 
@@ -8415,8 +7912,12 @@ msgctxt "BUTTON"
 msgid "Disfavor favorite"
 msgstr "Retirar das favoritas"
 
+#. TRANS: Button title for removing the favourite status for a favourite notice.
+#, fuzzy
+msgid "Remove this notice from your list of favorite notices."
+msgstr "Não foi possível importar notas favoritas."
+
 #. TRANS: Form legend for adding the favourite status to a notice.
-#. TRANS: Title for button text for adding the favourite status to a notice.
 msgid "Favor this notice"
 msgstr "Eleger esta nota como favorita"
 
@@ -8426,6 +7927,11 @@ msgctxt "BUTTON"
 msgid "Favor"
 msgstr "Eleger como favorita"
 
+#. TRANS: Button title for adding the favourite status to a notice.
+#, fuzzy
+msgid "Add this notice to your list of favorite notices."
+msgstr "Não foi possível importar notas favoritas."
+
 #. TRANS: Feed type name.
 msgid "RSS 1.0"
 msgstr "RSS 1.0"
@@ -8442,6 +7948,10 @@ msgstr "Atom"
 msgid "FOAF"
 msgstr "FOAF"
 
+#. TRANS: Feed type name. See http://activitystrea.ms/
+msgid "Activity Streams"
+msgstr ""
+
 #. TRANS: Client exception thrown when an imported feed does not have an author.
 msgid "No author in the feed."
 msgstr ""
@@ -8475,6 +7985,28 @@ msgstr "Escolha uma categoria para reduzir a lista"
 msgid "Grant this user the \"%s\" role"
 msgstr "Atribuir a este utilizador a função \"%s\""
 
+#. TRANS: Header for mini list of group members on a group page (h2).
+msgid "Members"
+msgstr "Membros"
+
+#. TRANS: Link to all group members from mini list of group members if group has more than n members.
+msgid "All members"
+msgstr "Todos os membros"
+
+#. TRANS: Header for mini list of users with a pending membership request on a group page (h2).
+msgid "Pending"
+msgstr ""
+
+#. TRANS: Header for mini list of users that are blocked in a group page (h2).
+msgid "Blocked"
+msgstr "Bloqueado"
+
+#. TRANS: Title for list of group administrators on a group page.
+#, fuzzy
+msgctxt "TITLE"
+msgid "Admins"
+msgstr "Gestores"
+
 #. TRANS: Button text for the form that will block a user from a group.
 msgctxt "BUTTON"
 msgid "Block"
@@ -8482,8 +8014,8 @@ msgstr "Bloquear"
 
 #. TRANS: Submit button title.
 msgctxt "TOOLTIP"
-msgid "Block this user"
-msgstr "Bloquear este utilizador"
+msgid "Block this user so that they can no longer post messages to it."
+msgstr ""
 
 #. TRANS: Field title on group edit form.
 #, fuzzy
@@ -8538,63 +8070,9 @@ msgctxt "GROUPADMIN"
 msgid "Admin"
 msgstr "Gestor"
 
-#. TRANS: Menu item in the group navigation page.
-msgctxt "MENU"
-msgid "Group"
-msgstr "Grupo"
-
-#. TRANS: Tooltip for menu item in the group navigation page.
-#. TRANS: %s is the nickname of the group.
-#, php-format
-msgctxt "TOOLTIP"
-msgid "%s group"
-msgstr "Grupo %s"
-
-#. TRANS: Menu item in the group navigation page.
-msgctxt "MENU"
-msgid "Members"
-msgstr "Membros"
-
-#. TRANS: Tooltip for menu item in the group navigation page.
-#. TRANS: %s is the nickname of the group.
-#, php-format
-msgctxt "TOOLTIP"
-msgid "%s group members"
-msgstr "Membros do grupo %s"
-
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: %d is the number of pending members.
-#, php-format
-msgctxt "MENU"
-msgid "Pending members (%d)"
-msgid_plural "Pending members (%d)"
-msgstr[0] ""
-msgstr[1] ""
-
-#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: %s is the nickname of the group.
-#, fuzzy, php-format
-msgctxt "TOOLTIP"
-msgid "%s pending members"
-msgstr "Membros do grupo %s"
-
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-msgctxt "MENU"
-msgid "Blocked"
-msgstr "Bloqueado"
-
-#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: %s is the nickname of the group.
-#, php-format
-msgctxt "TOOLTIP"
-msgid "%s blocked users"
-msgstr "Utilizadores bloqueados de %s"
-
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: Menu item in primary navigation panel.
-msgctxt "MENU"
-msgid "Admin"
-msgstr "Gestor"
+#. TRANS: Group actions header (h2). Text hidden by default.
+msgid "Group actions"
+msgstr "Acções do grupo"
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
@@ -8603,11 +8081,6 @@ msgctxt "TOOLTIP"
 msgid "Edit %s group properties"
 msgstr "Editar propriedades do grupo %s"
 
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-msgctxt "MENU"
-msgid "Logo"
-msgstr "Logótipo"
-
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
 #, php-format
@@ -8615,16 +8088,10 @@ msgctxt "TOOLTIP"
 msgid "Add or edit %s logo"
 msgstr "Adicionar ou editar o logótipo de %s"
 
-#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: %s is the nickname of the group.
-#, php-format
-msgctxt "TOOLTIP"
-msgid "Add or edit %s design"
-msgstr "Adicionar ou editar o design de %s"
-
-#. TRANS: Group actions header (h2). Text hidden by default.
-msgid "Group actions"
-msgstr "Acções do grupo"
+#. TRANS: Link text for link on user profile.
+msgctxt "MENU"
+msgid "Logo"
+msgstr "Logótipo"
 
 #. TRANS: Title for groups with the most members section.
 #, fuzzy
@@ -8636,11 +8103,20 @@ msgstr "Notas populares"
 msgid "Active groups"
 msgstr "Todos os grupos"
 
-#. TRANS: Title for group tag cloud section.
-#. TRANS: %s is a group name.
-#, php-format
-msgid "Tags in %s group's notices"
-msgstr "Categorias nas notas do grupo %s"
+#. TRANS: Link description for seeing all groups.
+#. TRANS: Link description for seeing all lists.
+#, fuzzy
+msgid "See all"
+msgstr "Mostrar mais"
+
+#. TRANS: Link title for seeing all groups.
+msgid "See all groups you belong to."
+msgstr ""
+
+#. TRANS: Menu item title in personal group navigation menu.
+#. TRANS: %s is a username.
+msgid "Back to top"
+msgstr ""
 
 #. TRANS: Client exception 406
 msgid "This page is not available in a media type you accept"
@@ -8725,12 +8201,45 @@ msgctxt "TITLE"
 msgid "Trends"
 msgstr ""
 
-#. TRANS: Button text for inviting more users to the StatusNet instance.
+#. TRANS: Default button text for inviting more users to the StatusNet instance.
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Invite more colleagues"
 msgstr "Convidar novos utilizadores"
 
+#. TRANS: Form legend.
+#, fuzzy
+msgid "Invite collegues"
+msgstr "Convidar novos utilizadores"
+
+#. TRANS: Field label for a list of e-mail addresses.
+msgid "Email addresses"
+msgstr "Endereços de correio electrónico"
+
+#. TRANS: Field title for a list of e-mail addresses.
+#, fuzzy
+msgid "Addresses of friends to invite (one per line)."
+msgstr "Endereços dos amigos a convidar (um por linha)"
+
+#. TRANS: Field label for a personal message to send to invitees.
+msgid "Personal message"
+msgstr "Mensagem pessoal"
+
+#. TRANS: Field title for a personal message to send to invitees.
+msgid "Optionally add a personal message to the invitation."
+msgstr "Pode optar por acrescentar uma mensagem pessoal ao convite"
+
+#. TRANS: Send button for inviting friends
+#. TRANS: Button text for sending notice.
+msgctxt "BUTTON"
+msgid "Send"
+msgstr "Enviar"
+
+#. TRANS: Submit button title.
+#, fuzzy
+msgid "Send invitations."
+msgstr "Convites"
+
 #. TRANS: Button text for joining a group.
 #, fuzzy
 msgctxt "BUTTON"
@@ -8743,6 +8252,11 @@ msgctxt "BUTTON"
 msgid "Leave"
 msgstr "Afastar-me"
 
+#. TRANS: Link title for seeing all lists.
+#, fuzzy
+msgid "See all lists you have created."
+msgstr "Aplicações que registou"
+
 #. TRANS: Menu item for logging in to the StatusNet site.
 #. TRANS: Menu item in primary navigation panel.
 msgctxt "MENU"
@@ -8801,8 +8315,8 @@ msgstr ""
 #. TRANS: %1$s is the subscribing user's nickname, %2$s is the StatusNet sitename.
 #. TRANS: Main body of new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscriber's long name, %2$s is the StatusNet sitename.
-#, php-format
-msgid "%1$s is now listening to your notices on %2$s."
+#, fuzzy, php-format
+msgid "%1$s is now following you on %2$s."
 msgstr "%1$s está agora a ouvir as suas notas em %2$s."
 
 #. TRANS: Subject of pending new-subscriber notification e-mail.
@@ -8975,7 +8489,7 @@ msgstr ""
 "Não responda a esta mensagem; o remetente não a receberá.\n"
 "\n"
 "Profusos cumprimentos,\n"
-"%5$s\n"
+"%5$s"
 
 #. TRANS: Subject for favorite notification e-mail.
 #. TRANS: %1$s is the adding user's long name, %2$s is the adding user's nickname.
@@ -9041,7 +8555,7 @@ msgstr "%s (@%s) enviou uma nota à sua atenção"
 #. TRANS: Body of @-reply notification e-mail.
 #. TRANS: %1$s is the sending user's name, $2$s is the StatusNet sitename,
 #. TRANS: %3$s is a URL to the notice, %4$s is the notice text,
-#. TRANS: %5$s is a URL to the full conversion if it exists (otherwise empty),
+#. TRANS: %5$s is the text "The full conversation can be read here:" and a URL to the full conversion if it exists (otherwise empty),
 #. TRANS: %6$s is a URL to reply to the notice, %7$s is a URL to all @-replies for the addressed user,
 #, fuzzy, php-format
 msgid ""
@@ -9089,6 +8603,10 @@ msgstr ""
 
 #. TRANS: Subject of group join notification e-mail.
 #. TRANS: %1$s is the joining user's nickname, %2$s is the group name, and %3$s is the StatusNet sitename.
+#, fuzzy, php-format
+msgid "%1$s has joined your group %2$s on %3$s"
+msgstr "%1$s juntou-se ao grupo %2$s."
+
 #. TRANS: Main body of group join notification e-mail.
 #. TRANS: %1$s is the subscriber's long name, %2$s is the group name, and %3$s is the StatusNet sitename,
 #. TRANS: %4$s is a block of profile info about the subscriber.
@@ -9179,8 +8697,9 @@ msgid "Make Admin"
 msgstr "Tornar Gestor"
 
 #. TRANS: Submit button title.
+#, fuzzy
 msgctxt "TOOLTIP"
-msgid "Make this user an admin"
+msgid "Make this user an admin."
 msgstr "Tornar este utilizador um gestor"
 
 #. TRANS: Client exception thrown when a database error was thrown during a file upload operation.
@@ -9231,7 +8750,7 @@ msgstr "Enviar uma nota directa"
 msgid "Select recipient:"
 msgstr "Seleccione um operador"
 
-#. TRANS Entry in drop-down selection box in direct-message inbox/outbox when no one is available to message.
+#. TRANS: Entry in drop-down selection box in direct-message inbox/outbox when no one is available to message.
 #, fuzzy
 msgid "No mutual subscribers."
 msgstr "Não subscrito!"
@@ -9304,6 +8823,10 @@ msgstr ""
 msgid "You must implement either adaptNoticeListItem() or showNotice()."
 msgstr ""
 
+#. TRANS: Link description to show more items in a list.
+msgid "More â–¼"
+msgstr ""
+
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 msgid "Nickname cannot be empty."
 msgstr ""
@@ -9354,10 +8877,6 @@ msgctxt "SEPARATOR"
 msgid ", "
 msgstr ""
 
-#. TRANS: Start of profile addressees list.
-msgid " â–¸ "
-msgstr ""
-
 #. TRANS: Used in coordinates as abbreviation of north.
 msgid "N"
 msgstr "N"
@@ -9396,7 +8915,8 @@ msgid "Repeated by"
 msgstr "Repetida por"
 
 #. TRANS: Link title in notice list item to reply to a notice.
-msgid "Reply to this notice"
+#, fuzzy
+msgid "Reply to this notice."
 msgstr "Responder a esta nota"
 
 #. TRANS: Link text in notice list item to reply to a notice.
@@ -9404,8 +8924,9 @@ msgid "Reply"
 msgstr "Responder"
 
 #. TRANS: Link title in notice list item to delete a notice.
-msgid "Delete this notice"
-msgstr "Apagar esta nota"
+#, fuzzy
+msgid "Delete this notice from the timeline."
+msgstr "Apagar esta nota."
 
 #. TRANS: Title for repeat form status in notice list when a notice has been repeated.
 #, fuzzy
@@ -9431,27 +8952,6 @@ msgstr "Tocar"
 msgid "Send a nudge to this user."
 msgstr "Enviar toque a este utilizador"
 
-#. TRANS: Exception thrown when creating a new profile fails in OAuth store.
-msgid "Error inserting new profile."
-msgstr "Erro ao inserir perfil novo."
-
-#. TRANS: Exception thrown when creating a new avatar fails in OAuth store.
-msgid "Error inserting avatar."
-msgstr "Erro ao inserir avatar."
-
-#. TRANS: Exception thrown when creating a remote profile fails in OAuth store.
-msgid "Error inserting remote profile."
-msgstr "Erro ao inserir perfil remoto."
-
-#. TRANS: Exception thrown when a notice is denied because it has been sent before.
-msgid "Duplicate notice."
-msgstr "Nota duplicada."
-
-#. TRANS: Exception thrown when creating a new subscription fails in OAuth store.
-#, fuzzy
-msgid "Could not insert new subscription."
-msgstr "Não foi possível inserir nova subscrição."
-
 #. TRANS: Server exception thrown in oEmbed action if no API endpoint is available.
 #, fuzzy
 msgid "No oEmbed API endpoint available."
@@ -9541,11 +9041,6 @@ msgstr "Editar"
 msgid "Edit %s list by you."
 msgstr "Editar grupo %s"
 
-#. TRANS: Link description for link to list of users tagged with a tag.
-#, fuzzy
-msgid "Tagged"
-msgstr "Categoria"
-
 #. TRANS: Title for link to edit list settings.
 #, fuzzy
 msgid "Edit list settings."
@@ -9702,8 +9197,10 @@ msgctxt "plugin"
 msgid "Enable"
 msgstr ""
 
+#. TRANS: Plugin description for a disabled plugin.
 msgctxt "plugin-description"
-msgid "(Plugin descriptions unavailable when disabled.)"
+msgid ""
+"(The plugin description is unavailable when a plugin has been disabled.)"
 msgstr ""
 
 #. TRANS: Menu item in primary navigation panel.
@@ -9717,6 +9214,11 @@ msgstr "Configurações"
 msgid "Change your personal settings."
 msgstr "Modificar as suas definições de perfil"
 
+#. TRANS: Menu item in primary navigation panel.
+msgctxt "MENU"
+msgid "Admin"
+msgstr "Gestor"
+
 #. TRANS: Menu item title in primary navigation panel.
 #, fuzzy
 msgid "Site configuration."
@@ -9737,15 +9239,8 @@ msgstr "Terminar esta sessão"
 msgid "Login to the site."
 msgstr "Iniciar uma sessão"
 
-#. TRANS: Menu item in primary navigation panel.
-msgctxt "MENU"
-msgid "Search"
-msgstr "Pesquisa"
-
-#. TRANS: Menu item title in primary navigation panel.
-#, fuzzy
-msgid "Search the site."
-msgstr "Pesquisar no site"
+msgid "This profile has been silenced by site moderators"
+msgstr ""
 
 #. TRANS: H2 text for user subscription statistics.
 #, fuzzy
@@ -9757,6 +9252,10 @@ msgstr "Permitir"
 msgid "Followers"
 msgstr "Permitir"
 
+#. TRANS: H2 text for user statistics.
+msgid "Statistics"
+msgstr "Estatísticas"
+
 #. TRANS: Label for user statistics.
 msgid "User ID"
 msgstr "Número de identificação"
@@ -9765,10 +9264,6 @@ msgstr "Número de identificação"
 msgid "Member since"
 msgstr "Membro desde"
 
-#. TRANS: Label for user statistics.
-msgid "Notices"
-msgstr "Notas"
-
 #. TRANS: Label for user statistics.
 #. TRANS: Average count of posts made per day since account registration.
 msgid "Daily average"
@@ -9861,6 +9356,7 @@ msgid "Keyword(s)"
 msgstr "Categorias"
 
 #. TRANS: Button text for searching site.
+#. TRANS: Button text for search button on search form.
 #. TRANS: Button text to search profiles.
 msgctxt "BUTTON"
 msgid "Search"
@@ -9911,23 +9407,6 @@ msgstr "Procurar no conteúdo das notas"
 msgid "Find groups on this site"
 msgstr "Procurar grupos neste site"
 
-#. TRANS: Secondary navigation menu item leading to help on StatusNet.
-msgctxt "MENU"
-msgid "Help"
-msgstr "Ajuda"
-
-#. TRANS: Secondary navigation menu item leading to text about StatusNet site.
-#, fuzzy
-msgctxt "MENU"
-msgid "About"
-msgstr "Sobre"
-
-#. TRANS: Secondary navigation menu item leading to Frequently Asked Questions.
-#, fuzzy
-msgctxt "MENU"
-msgid "FAQ"
-msgstr "FAQ"
-
 #. TRANS: Secondary navigation menu item leading to Terms of Service.
 #, fuzzy
 msgctxt "MENU"
@@ -9952,19 +9431,6 @@ msgctxt "MENU"
 msgid "Version"
 msgstr "Versão"
 
-#. TRANS: Secondary navigation menu item leading to e-mail contact information on the
-#. TRANS: StatusNet site, where to report bugs, ...
-#, fuzzy
-msgctxt "MENU"
-msgid "Contact"
-msgstr "Contacto"
-
-#. TRANS: Secondary navigation menu item. Leads to information about embedding a timeline widget.
-#, fuzzy
-msgctxt "MENU"
-msgid "Badge"
-msgstr "Emblema"
-
 #. TRANS: Default title for section/sidebar widget.
 msgid "Untitled section"
 msgstr "Secção sem título"
@@ -10013,10 +9479,6 @@ msgstr "Correio"
 msgid "Change email handling"
 msgstr "Alterar manuseamento de email"
 
-#. TRANS: Menu item title in settings navigation panel.
-msgid "Design your profile"
-msgstr "Altere o estilo do seu perfil"
-
 #. TRANS: Menu item in settings navigation panel.
 #, fuzzy
 msgctxt "MENU"
@@ -10057,6 +9519,15 @@ msgstr "Ligações"
 msgid "Authorized connected applications"
 msgstr "Aplicações ligadas autorizadas"
 
+#. TRANS: Menu item in settings navigation panel.
+msgctxt "MENU"
+msgid "Old school"
+msgstr ""
+
+#. TRANS: Menu item title in settings navigation panel.
+msgid "UI tweaks for old-school users"
+msgstr ""
+
 #. TRANS: Title of form to silence a user.
 #, fuzzy
 msgctxt "TITLE"
@@ -10067,6 +9538,43 @@ msgstr "Silenciar"
 msgid "Silence this user"
 msgstr "Silenciar este utilizador"
 
+#. TRANS: Server error displayed when trying to create an anynymous OAuth consumer.
+#, fuzzy
+msgid "Could not create anonymous consumer."
+msgstr "Não foi possível criar os nomes alternativos."
+
+#. TRANS: Server error displayed when trying to create an anynymous OAuth application.
+#, fuzzy
+msgid "Could not create anonymous OAuth application."
+msgstr "Não foi possível criar a aplicação."
+
+#. TRANS: Exception thrown when no token association could be found.
+msgid ""
+"Could not find a profile and application associated with the request token."
+msgstr ""
+
+#. TRANS: Exception thrown when no access token can be issued.
+msgid "Could not issue access token."
+msgstr "Não foi possível emitir a ficha de acesso."
+
+#. TRANS: Exception thrown when a database error occurs.
+msgid "Database error inserting OAuth application user."
+msgstr "Erro na base de dados ao inserir o utilizador da aplicação OAuth."
+
+#. TRANS: Exception thrown when a database error occurs.
+msgid "Database error updating OAuth application user."
+msgstr ""
+"Erro na actualização da base de dados ao inserir o utilizador da aplicação "
+"OAuth."
+
+#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
+msgid "Tried to revoke unknown token."
+msgstr "Tentou revogar um código desconhecido."
+
+#. TRANS: Exception thrown when an attempt is made to remove a revoked token.
+msgid "Failed to delete revoked token."
+msgstr "Falha ao eliminar código revogado."
+
 #. TRANS: Menu item in local navigation menu.
 #, fuzzy
 msgctxt "MENU"
@@ -10124,6 +9632,18 @@ msgstr "Convidar amigos e colegas para se juntarem a si em %s"
 msgid "Subscribe to this user"
 msgstr "Subscrever este utilizador"
 
+#. TRANS: Button text to subscribe to a user.
+#. TRANS: Button text for subscribing to a list.
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Subscribe"
+msgstr "Subscrever"
+
+#. TRANS: Button title to subscribe to a user.
+#, fuzzy
+msgid "Subscribe to this user."
+msgstr "Subscrever este utilizador"
+
 #. TRANS: Title of personal tag cloud section.
 msgid "People Tagcloud as self-tagged"
 msgstr "Nuvem da auto-categorização das pessoas"
@@ -10255,16 +9775,26 @@ msgstr[1] ""
 #. TRANS: List message for notice repeated by logged in user.
 #, fuzzy
 msgctxt "REPEATLIST"
-msgid "You have repeated this notice."
+msgid "You repeated this."
 msgstr "Já repetiu essa nota."
 
-#. TRANS: List message for repeated notices.
-#. TRANS: %d is the number of users that have repeated a notice.
+#. TRANS: List message for when more than 4 people repeat something.
+#. TRANS: %%s is a list of users liking a notice, %d is the number over 4 that like the notice.
+#. TRANS: Plural is decided on the total number of users liking the notice (count of %%s + %d).
+#, php-format
+msgid "%%s and %d other repeated this."
+msgid_plural "%%s and %d others repeated this."
+msgstr[0] ""
+msgstr[1] ""
+
+#. TRANS: List message for favoured notices.
+#. TRANS: %%s is a list of users liking a notice.
+#. TRANS: Plural is based on the number of of users that have favoured a notice.
 #, fuzzy, php-format
-msgid "One person has repeated this notice."
-msgid_plural "%d people have repeated this notice."
-msgstr[0] "Já repetiu essa nota."
-msgstr[1] "Já repetiu essa nota."
+msgid "%%s repeated this."
+msgid_plural "%%s repeated this."
+msgstr[0] "Repetida para %s"
+msgstr[1] "Repetida para %s"
 
 #. TRANS: Form legend.
 #, fuzzy, php-format
@@ -10363,7 +9893,6 @@ msgid "Unsilence this user"
 msgstr "Permitir que este utilizador publique notas"
 
 #. TRANS: Form legend on unsubscribe form.
-#. TRANS: Button title on unsubscribe form.
 msgid "Unsubscribe from this user"
 msgstr "Deixar de subscrever este utilizador"
 
@@ -10374,6 +9903,11 @@ msgctxt "BUTTON"
 msgid "Unsubscribe"
 msgstr "Abandonar"
 
+#. TRANS: Button title on unsubscribe form.
+#, fuzzy
+msgid "Unsubscribe from this user."
+msgstr "Deixar de subscrever este utilizador"
+
 #. TRANS: Exception text shown when no profile can be found for a user.
 #. TRANS: %1$s is a user nickname, $2$d is a user ID (number).
 #, fuzzy, php-format
@@ -10456,9 +9990,3 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
-
-#~ msgid "%1$s and friends, page %2$d"
-#~ msgstr "%1$s e amigos, página %2$d"
-
-#~ msgid "You and friends"
-#~ msgstr "Você e seus amigos"
diff --git a/locale/pt_BR/LC_MESSAGES/statusnet.po b/locale/pt_BR/LC_MESSAGES/statusnet.po
index 0904489de7..b2de05c0f6 100644
--- a/locale/pt_BR/LC_MESSAGES/statusnet.po
+++ b/locale/pt_BR/LC_MESSAGES/statusnet.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Core to Brazilian Portuguese (Português do Brasil)
+# Translation of StatusNet - Core to Brazilian Portuguese (português do Brasil)
 # Exported from translatewiki.net
 #
 # Author: Aracnus
@@ -16,18 +16,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:39+0000\n"
-"Language-Team: Brazilian Portuguese <http://translatewiki.net/wiki/Portal:pt-"
-"br>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:33+0000\n"
+"Language-Team: Brazilian Portuguese <https://translatewiki.net/wiki/Portal:"
+"pt-br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: pt-br\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-POT-Import-Date: 2011-05-05 10:52:40+0000\n"
+"X-POT-Import-Date: 2012-04-22 22:02:21+0000\n"
 
 #. TRANS: Database error message.
 #, php-format
@@ -42,14 +42,6 @@ msgstr ""
 "situação, mas caso queira se certificar disso, você pode contactá-los em %2"
 "$s. Ou então você pode aguardar alguns minutos e tentar novamente."
 
-#. TRANS: Error message.
-msgid ""
-"An important error occured, probably related to email setup. Check logfiles "
-"for more info."
-msgstr ""
-"Ocorreu um erro, provavelmente relacionado com a configuração do e-mail. "
-"Verifique os arquivos de log para mais informações."
-
 #. TRANS: Error message.
 msgid "An error occurred."
 msgstr "Ocorreu um erro."
@@ -59,8 +51,8 @@ msgstr "Ocorreu um erro."
 msgid ""
 "No configuration file found. Try running the installation program first."
 msgstr ""
-"Nenhum arquivo de configuração encontrado. Tente rodar o programa de "
-"instalação primeiro."
+"Não foi encontrado nenhum arquivo de configuração. Experimente executar o "
+"programa de instalação primeiro."
 
 #. TRANS: Error message displayed when trying to access a non-existing page.
 msgid "Unknown page"
@@ -110,12 +102,11 @@ msgstr "Desabilita novos registros."
 msgid "Closed"
 msgstr "Fechado"
 
-#. TRANS: Title for button to save access settings in site admin panel.
-msgid "Save access settings"
-msgstr "Salvar as configurações de acesso"
+#. TRANS: Button title to save access settings in site admin panel.
+msgid "Save access settings."
+msgstr "Salvar as configurações de acesso."
 
-#. TRANS: Tooltip for button to save access settings in site admin panel.
-#. TRANS: Button text for saving theme settings.
+#. TRANS: Button text to save access settings in site admin panel.
 #. TRANS: Button label to save e-mail preferences.
 #. TRANS: Button label to save IM preferences.
 #. TRANS: Button text in the license admin panel.
@@ -131,7 +122,6 @@ msgstr "Salvar as configurações de acesso"
 #. TRANS: Button text for saving "Other settings" in profile.
 #. TRANS: Button text to save user settings in user admin panel.
 #. TRANS: Button label in the "Edit application" form.
-#. TRANS: Button text on profile design page to save settings.
 #. TRANS: Text for save button on group edit form.
 #. TRANS: Button text to save tags for a profile.
 msgctxt "BUTTON"
@@ -168,14 +158,8 @@ msgstr "Este perfil não existe."
 #. TRANS: Client error displayed trying to reference a non-existing list.
 #. TRANS: Client error displayed when referring to a non-existing list.
 #. TRANS: Client error displayed trying to reference a non-existing list.
-#, fuzzy
 msgid "No such list."
-msgstr "Esta etiqueta não existe."
-
-#. TRANS: Client error displayed when trying to add an OMB 0.1 remote profile to a list.
-#, fuzzy
-msgid "You cannot list an OMB 0.1 remote profile with this action."
-msgstr "Não é possível assinar um perfil OMB 0.1 remoto com essa ação."
+msgstr "Esta lista não existe."
 
 #. TRANS: Client error displayed when an unknown error occurs when adding a user to a list.
 #. TRANS: %s is a username.
@@ -190,12 +174,13 @@ msgid ""
 "There was a problem listing %s. The remote server is probably not responding "
 "correctly. Please try retrying later."
 msgstr ""
+"Ocorreu um problema na listagem de %s. O servidor remoto provavelmente não "
+"está respondendo corretamente. Por favor, tente novamente mais tarde."
 
 #. TRANS: Title after adding a user to a list.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Listed"
-msgstr "Licença"
+msgstr "Listado"
 
 #. TRANS: Server error when page not found (404).
 #. TRANS: Server error when page not found (404)
@@ -207,7 +192,6 @@ msgstr "Esta página não existe."
 #. TRANS: Client error when user not found for an rss related action.
 #. TRANS: Client error displayed when no existing user is provided for a user's delivery device setting.
 #. TRANS: Client error displayed if a user could not be found.
-#. TRANS: Client error when user not found updating a profile background image.
 #. TRANS: Client error displayed updating profile image without having a user object.
 #. TRANS: Client error displayed when making an Atom API request for an unknown user.
 #. TRANS: Client error displayed when trying to block a non-existing user or a user from another site.
@@ -233,14 +217,11 @@ msgstr "Esta página não existe."
 #. TRANS: Client error displayed when trying to get the RSS feed with favorites of a user that does not exist.
 #. TRANS: Client error displayed when requesting Friends of a Friend feed without providing a user nickname.
 #. TRANS: Client error displayed when requesting Friends of a Friend feed for an object that is not a user.
-#. TRANS: Client error displayed when trying to get a user hCard for a non-existing user.
 #. TRANS: Client error displayed trying to make a micro summary without providing a valid user.
 #. TRANS: Client error displayed trying to send a direct message to a non-existing user.
 #. TRANS: Client error displayed trying to use "one time password login" without using an existing user.
 #. TRANS: Client error displayed when referring to non-existing user.
 #. TRANS: Client error displayed trying to perform an action related to a non-existing user.
-#. TRANS: Form validation error on page for remote subscribe when no user was provided.
-#. TRANS: Form validation error on page for remote subscribe when no user profile was found.
 #. TRANS: Client error displayed when trying to reply to a non-exsting user.
 #. TRANS: Client error displayed when providing a non-existing nickname in a RSS 1.0 action.
 #. TRANS: Client error.
@@ -249,7 +230,6 @@ msgstr "Esta página não existe."
 #. TRANS: Client error displayed trying to find a user by ID for a non-existing ID.
 #. TRANS: Client error displayed requesting groups for a non-existing user.
 #. TRANS: Client error displayed when user not found for an action.
-#. TRANS: Client error displayed providing a non-existing nickname.
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #. TRANS: Client error displayed when trying to perform a gallery action with an unknown user.
 #. TRANS: Client error displayed when trying to access a mailbox without providing a user.
@@ -268,6 +248,13 @@ msgstr "Mensagens de %s"
 msgid "%s's home timeline"
 msgstr "Mensagens de %s"
 
+#. TRANS: %s is user nickname.
+#. TRANS: Feed title.
+#. TRANS: %s is tagger's nickname.
+#, php-format
+msgid "Feed for friends of %s (Activity Streams JSON)"
+msgstr "Fonte de mensagens dos amigos de %s (Activity Streams JSON)"
+
 #. TRANS: %s is user nickname.
 #, php-format
 msgid "Feed for friends of %s (RSS 1.0)"
@@ -300,7 +287,7 @@ msgid ""
 "Try subscribing to more people, [join a group](%%action.groups%%) or post "
 "something yourself."
 msgstr ""
-"Tente assinar mais pessoas, [unir-ser a um grupo](%%action.groups%%) ou "
+"Tente assinar mais pessoas, [entrar em um grupo](%%action.groups%%) ou "
 "publicar algo."
 
 #. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@".
@@ -310,10 +297,11 @@ msgid ""
 "You can try to [nudge %1$s](../%2$s) from their profile or [post something "
 "to them](%%%%action.newnotice%%%%?status_textarea=%3$s)."
 msgstr ""
-"Seja o primeiro a [publicar sobre este tópico](%%%%action.newnotice%%%%?"
-"status_textarea=%s)!"
+"Você pode tentar [cutucar %1$s](../%2$s) a partir do perfil dele ou "
+"[publicar alguma mensagem para ele](%%%%action.newnotice%%%%?status_textarea="
+"%3$s)."
 
-#. TRANS: Encoutagement displayed on empty timeline user pages for anonymous users.
+#. TRANS: Encouragement displayed on empty timeline user pages for anonymous users.
 #. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
 #. TRANS: Empty list message for page with replies for a user for not logged in users.
 #. TRANS: %1$s is a user nickname. This message contains a Markdown link in the form [link text](link).
@@ -324,8 +312,14 @@ msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
 "post a notice to them."
 msgstr ""
-"Por que você não [registra uma conta](%%action.register%%) pra ser o "
-"primeiro a publicar?"
+"Por que você não [registra uma conta](%%%%action.register%%%%) e então "
+"cutuca %s ou publica alguma mensagem para ele?"
+
+#. TRANS: Button text for inviting more users to the StatusNet instance.
+#. TRANS: Less business/enterprise-oriented language for public sites.
+msgctxt "BUTTON"
+msgid "Send invite"
+msgstr "Enviar convite"
 
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Title of API timeline for a user and friends.
@@ -335,8 +329,6 @@ msgstr ""
 #. TRANS: %s is a username.
 #. TRANS: Menu item title in personal group navigation menu.
 #. TRANS: %s is a username.
-#. TRANS: Menu item title in settings navigation panel.
-#. TRANS: %s is a username.
 #, php-format
 msgid "%s and friends"
 msgstr "%s e amigos"
@@ -376,7 +368,6 @@ msgstr ""
 #. TRANS: Server error thrown on database error updating SMS preferences.
 #. TRANS: Server error thrown on database error removing a registered SMS phone number.
 #. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
-#. TRANS: Server exception thrown on Profile design page when updating design settings fails.
 msgid "Could not update user."
 msgstr "Não foi possível atualizar o usuário."
 
@@ -391,7 +382,6 @@ msgstr "Não foi possível salvar o perfil."
 
 #. TRANS: Client error displayed when the number of bytes in a POST request exceeds a limit.
 #. TRANS: %s is the number of bytes of the CONTENT_LENGTH.
-#. TRANS: Form validation error in design settings form. POST should remain untranslated.
 #, php-format
 msgid ""
 "The server was unable to handle that much POST data (%s byte) due to its "
@@ -406,24 +396,6 @@ msgstr[1] ""
 "O servidor não conseguiu manipular a quantidade de dados do POST (%s bytes) "
 "devido à sua configuração atual."
 
-#. TRANS: Client error displayed when saving design settings fails because of an empty id.
-#. TRANS: Client error displayed when saving design settings fails because of an empty result.
-#. TRANS: Client error displayed when a database error occurs inserting profile colours.
-#. TRANS: Client error displayed when a database error occurs updating profile colours.
-#. TRANS: Form validation error displayed when group design settings could not be saved because of an application issue.
-#. TRANS: Form validation error on Profile design page when saving design settings has failed.
-#. TRANS: Form validation error on Profile design page when updating design settings has failed.
-msgid "Unable to save your design settings."
-msgstr "Não foi possível salvar suas configurações de aparência."
-
-#. TRANS: Error displayed when updating design settings fails.
-#. TRANS: Client error displayed when a database error occurs updating profile colours.
-#. TRANS: Form validation error on Profile design page when updating design settings has failed.
-#. TRANS: Error message displayed if design settings could not be saved.
-#. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
-msgid "Could not update your design."
-msgstr "Não foi possível atualizar a sua aparência."
-
 #. TRANS: Title for Atom feed.
 msgctxt "ATOM"
 msgid "Main"
@@ -470,6 +442,20 @@ msgstr "Não foi possível bloquear o usuário."
 msgid "Unblock user failed."
 msgstr "Não foi possível desbloquear o usuário."
 
+#. TRANS: Client exception thrown when no conversation ID is given.
+msgid "No conversation ID."
+msgstr "Nenhuma ID de conversação."
+
+#. TRANS: Client exception thrown when referring to a non-existing conversation ID (%d).
+#, php-format
+msgid "No conversation with ID %d."
+msgstr "Nenhuma conversa com a ID  %d ."
+
+#. TRANS: Title for conversion timeline.
+msgctxt "TITLE"
+msgid "Conversation"
+msgstr "Conversa"
+
 #. TRANS: Title. %s is a user nickname.
 #, php-format
 msgid "Direct messages from %s"
@@ -517,6 +503,8 @@ msgstr ""
 "amigos."
 
 #. TRANS: Client error displayed trying to direct message self (403).
+#. TRANS: Client error displayed trying to send a direct message to self.
+#. TRANS: Error text shown when trying to send a direct message to self.
 msgid ""
 "Do not send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
@@ -527,7 +515,7 @@ msgstr ""
 #. TRANS: Client error displayed when trying to remove a favourite with an invalid ID.
 #. TRANS: Client error displayed trying to delete a status with an invalid ID.
 msgid "No status found with that ID."
-msgstr "Não foi encontrado nenhum status com esse ID."
+msgstr "Não foi encontrado nenhuma mensagem com esse ID."
 
 #. TRANS: Client error displayed when trying to mark a notice favourite that already is a favourite.
 msgid "This status is already a favorite."
@@ -747,7 +735,6 @@ msgstr "grupos no %s"
 
 #. TRANS: Client error displayed when trying to edit a group without being an admin.
 #. TRANS: Client error displayed trying to edit a group while not being a group admin.
-#. TRANS: Client error displayed trying to change group design settings without being a (group) admin.
 #. TRANS: Client error displayed when trying to change group logo settings while not being a group admin.
 msgid "You must be an admin to edit the group."
 msgstr "Você deve ser um administrador para editar o grupo."
@@ -778,62 +765,55 @@ msgstr "O apelido não pode ser igual à identificação."
 #. TRANS: Client error displayed when referring to a non-existing list.
 #. TRANS: Client error displayed trying to perform an action related to a non-existing list.
 #. TRANS: Client error displayed when referring to a non-existing list.
-#, fuzzy
 msgid "List not found."
-msgstr "O método da API não foi encontrado!"
+msgstr "A lista não foi encontrada."
 
 #. TRANS: Client error displayed when trying to update another user's list.
 msgid "You cannot update lists that do not belong to you."
-msgstr ""
+msgstr "Você não pode atualizar listas que não pertençam a você."
 
 #. TRANS: Client error displayed when an unknown error occurs updating a list.
 #. TRANS: Client error displayed when an unknown error occurs viewing list members.
 #. TRANS: Client error displayed when an unknown error occurs in the list subscribers action.
 #. TRANS: Client error displayed when an unknown error occurs unsubscribing from a list.
 msgid "An error occured."
-msgstr ""
+msgstr "Ocorreu um erro."
 
 #. TRANS: Client error displayed when trying to delete another user's list.
 msgid "You cannot delete lists that do not belong to you."
-msgstr ""
+msgstr "Você não pode excluir listas que não pertençam a você."
 
 #. TRANS: Client error displayed when referring to a non-list member.
-#, fuzzy
 msgid "The specified user is not a member of this list."
-msgstr "O usuário não é um membro do grupo"
+msgstr "O usuário especificado não é um membro dessa lista."
 
 #. TRANS: Client error displayed when trying to add members to a list without having the right to do so.
-#, fuzzy
 msgid "You are not allowed to add members to this list."
-msgstr "Você não tem permissão para criar grupos neste site."
+msgstr "Você não tem permissão para adicionar membros a esta lista."
 
 #. TRANS: Client error displayed when trying to modify list members without specifying them.
-#, fuzzy
 msgid "You must specify a member."
-msgstr "É necessário especificar um perfil."
+msgstr "Você deve especificar um membro."
 
 #. TRANS: Client error displayed when trying to remove members from a list without having the right to do so.
-#, fuzzy
 msgid "You are not allowed to remove members from this list."
-msgstr "Você não tem permissão para criar grupos neste site."
+msgstr "Você não tem permissão para remover membros desta lista."
 
 #. TRANS: Client error displayed when trying to remove a list member that is not part of a list.
 msgid "The user you are trying to remove from the list is not a member."
-msgstr ""
+msgstr "O usuário que você está tentando remover da lista não é um membro."
 
 #. TRANS: Client error displayed when trying to create a list without a name.
-#, fuzzy
 msgid "A list must have a name."
-msgstr "A publicação Atom deve ser uma entrada Atom."
+msgstr "Uma lista deve ter um nome."
 
 #. TRANS: Client error displayed when a membership check for a user is nagative.
 msgid "The specified user is not a subscriber of this list."
-msgstr ""
+msgstr "O usuário especificado não é um assinante desta lista."
 
 #. TRANS: Client error displayed when trying to unsubscribe from a non-subscribed list.
-#, fuzzy
 msgid "You are not subscribed to this list."
-msgstr "Você não está assinando esse perfil."
+msgstr "Você não está assinando esta lista."
 
 #. TRANS: Client error displayed when uploading a media file has failed.
 msgid "Upload failed."
@@ -865,7 +845,6 @@ msgstr "Erro no banco de dados durante a inserção de oauth_token_association."
 
 #. TRANS: Client error given on when invalid data was passed through a form in the OAuth API.
 #. TRANS: Unexpected validation error on avatar upload form.
-#. TRANS: Client error displayed when the submitted form contains unexpected data.
 #. TRANS: Client error displayed submitting invalid form data for edit application.
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
 #. TRANS: Form validation error message when an unsupported argument is used.
@@ -874,7 +853,6 @@ msgstr "Erro no banco de dados durante a inserção de oauth_token_association."
 #. TRANS: Client error when submitting a form with unexpected information.
 #. TRANS: Client error displayed when unexpected data is posted in the password recovery form.
 #. TRANS: Message given submitting a form with an unknown action in SMS settings.
-#. TRANS: Unknown form validation error in design settings form.
 msgid "Unexpected form submission."
 msgstr "Submissão inesperada de formulário."
 
@@ -920,7 +898,6 @@ msgstr "Conta"
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Field label on account registration page.
-#. TRANS: Label for nickname on user authorisation page.
 #. TRANS: Field label on group edit form.
 #. TRANS: Dropdown option for searching in profiles.
 msgid "Nickname"
@@ -1092,9 +1069,9 @@ msgstr "Mensagens de %1$s marcadas como favoritas por %2$s / %3$s."
 
 #. TRANS: Server error displayed whe trying to get a timeline fails.
 #. TRANS: %s is the error message.
-#, fuzzy, php-format
+#, php-format
 msgid "Could not generate feed for list - %s"
-msgstr "Não foi possível criar o token de autenticação para %s"
+msgstr "Não foi possível gerar a fonte de notícias para esta lista %s"
 
 #. TRANS: Title for timeline of most recent mentions of a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user nickname.
@@ -1232,12 +1209,9 @@ msgstr "Você deve estar autenticado para sair de um grupo."
 #. TRANS: Client error displayed when requesting Friends of a Friend feed for a nickname that is not a group.
 #. TRANS: Client error displayed trying to block a user from a group while specifying a non-existing group.
 #. TRANS: Client error displayed referring to a group's permalink for a non-existing group ID.
-#. TRANS: Client error displayed trying to change group design settings while providing a nickname for a non-existing group.
 #. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
 #. TRANS: Client error displayed when trying to view group members for a non-existing group.
 #. TRANS: Client error displayed when trying to view group members for an object that is not a group.
-#. TRANS: Client error displayed when trying to view group members for a non-existing group.
-#. TRANS: Client error displayed when trying to view group members for an object that is not a group.
 #. TRANS: Client error displayed when requesting a group RSS feed for group that does not exist.
 #. TRANS: Client error displayed when requesting a group RSS feed for an object that is not a group.
 #. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
@@ -1246,10 +1220,10 @@ msgstr "Você deve estar autenticado para sair de um grupo."
 #. TRANS: Client error displayed when trying to leave a non-local group.
 #. TRANS: Client error displayed when trying to leave a non-existing group.
 #. TRANS: Client error displayed when providing an invalid group ID on the Make Admin page.
-#. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
-#. TRANS: Client error displayed if no local group with a given name was found requesting group page.
 #. TRANS: Command exception text shown when a group is requested that does not exist.
 #. TRANS: Error text shown when trying to leave a group that does not exist.
+#. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
+#. TRANS: Client error displayed if no local group with a given name was found requesting group page.
 msgid "No such group."
 msgstr "Esse grupo não existe."
 
@@ -1271,7 +1245,7 @@ msgstr "É necessário estar autenticado."
 msgid "Only group admin can approve or cancel join requests."
 msgstr ""
 "Somente administradores do grupo podem aprovar ou cancelar requisições de "
-"associação."
+"entrada."
 
 #. TRANS: Client error displayed trying to approve group membership without specifying a profile to approve.
 #. TRANS: Client error displayed trying to approve subscriptionswithout specifying a profile to approve.
@@ -1301,25 +1275,26 @@ msgstr "Erro interno: foram recebidos simultaneamente cancelar e abortar."
 #, php-format
 msgid "Could not cancel request for user %1$s to join group %2$s."
 msgstr ""
-"Não foi possível cancelar a requisição de associação do usuário %1$s para o "
-"grupo %2$s."
+"Não foi possível cancelar a solicitação de entrada do usuário %1$s no grupo %"
+"2$s."
 
 #. TRANS: Title for leave group page after group join request is approved/disapproved.
 #. TRANS: %1$s is the user nickname, %2$s is the group nickname.
 #, php-format
 msgctxt "TITLE"
 msgid "%1$s's request for %2$s"
-msgstr "Requisição de associação de %1$s em %2$s"
+msgstr "Solicitação de entrada de %1$s em %2$s"
 
 #. TRANS: Message on page for group admin after approving a join request.
 msgid "Join request approved."
-msgstr "A requisição de associação foi aprovada."
+msgstr "A solicitação de entrada foi aprovada."
 
 #. TRANS: Message on page for group admin after rejecting a join request.
 msgid "Join request canceled."
-msgstr "A requisição de associação foi cancelada."
+msgstr "A solicitação de entrada foi cancelada."
 
 #. TRANS: Client error displayed trying to approve subscription for a non-existing request.
+#. TRANS: %s is a user nickname.
 #, php-format
 msgid "%s is not in the moderation queue for your subscriptions."
 msgstr "%s não está na fila de moderação das suas assinaturas."
@@ -1329,8 +1304,8 @@ msgstr "%s não está na fila de moderação das suas assinaturas."
 #, php-format
 msgid "Could not cancel or approve request for user %1$s to join group %2$s."
 msgstr ""
-"Não foi possível cancelar ou aprovar a solicitação de associação do usuário %"
-"1$s ao grupo %2$s."
+"Não foi possível cancelar ou aprovar a solicitação de entrada do usuário %1"
+"$s no grupo %2$s."
 
 #. TRANS: Title for subscription approval ajax return
 #. TRANS: %1$s is the approved user's nickname
@@ -1392,7 +1367,7 @@ msgstr "Não é possível efetuar a associação de outra pessoa."
 
 #. TRANS: Client error displayed when not using the join verb.
 msgid "Can only handle join activities."
-msgstr "Só é possível manipular as atividades de associação."
+msgstr "Só é possível manipular as atividades de entrada."
 
 #. TRANS: Client exception thrown when trying to subscribe to a non-existing group.
 msgid "Unknown group."
@@ -1471,7 +1446,6 @@ msgstr "Este anexo não existe."
 #. TRANS: Client error displayed trying to get an avatar without providing a nickname.
 #. TRANS: Client error displayed when requesting a list of blocked users for a group without providing a group nickname.
 #. TRANS: Client error displayed trying to edit a group while not proving a nickname for the group to edit.
-#. TRANS: Client error displayed trying to change group design settings without providing a group nickname.
 #. TRANS: Client error displayed when trying to change group logo settings without providing a nickname.
 #. TRANS: Client error displayed when trying to view group members without providing a group nickname.
 #. TRANS: Client error displayed when requesting a group RSS feed without providing a group nickname.
@@ -1667,7 +1641,7 @@ msgstr "Perfis bloqueados no %1$s, pág. %2$d"
 
 #. TRANS: Instructions for list of users blocked from a group.
 msgid "A list of the users blocked from joining this group."
-msgstr "Uma lista dos usuários proibidos de se associarem a este grupo."
+msgstr "Uma lista dos usuários proibidos de entrarem neste grupo."
 
 #. TRANS: Form legend for unblocking a user from a group.
 msgid "Unblock user from group"
@@ -1700,7 +1674,7 @@ msgstr "%1$s deixou o grupo %2$s"
 #. TRANS: Client error displayed when trying to leave a group without specifying an ID.
 #. TRANS: Client error displayed when trying to unsubscribe without providing a profile ID.
 msgid "No profile ID in request."
-msgstr "A requisição não possui nenhuma ID de perfil."
+msgstr "A solicitação não possui nenhuma ID de perfil."
 
 #. TRANS: Client error displayed when trying to leave a non-existing group.
 #. TRANS: Client error displayed trying to block a user from a group while specifying a non-existing profile.
@@ -1772,6 +1746,18 @@ msgstr "O endereço \"%s\" foi confirmado para sua conta."
 msgid "Conversation"
 msgstr "Conversa"
 
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#, fuzzy
+msgid "Conversation feed (Activity Streams JSON)"
+msgstr "Fonte de mensagens de %s (Atom)"
+
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#, fuzzy
+msgid "Conversation feed (RSS 2.0)"
+msgstr "Fonte de mensagens de %s (RSS 2.0)"
+
 #. TRANS: Title for conversation page.
 #. TRANS: Title for page that shows a notice.
 msgctxt "TITLE"
@@ -1836,7 +1822,8 @@ msgstr ""
 "Digite \"%s\" para confirmar que você deseja realmente excluir sua conta."
 
 #. TRANS: Button title for user account deletion.
-msgid "Permanently delete your account"
+#, fuzzy
+msgid "Permanently delete your account."
 msgstr "Excluir sua conta permanentemente"
 
 #. TRANS: Client error displayed trying to delete an application while not logged in.
@@ -1982,152 +1969,6 @@ msgstr "Não excluir este este usuário."
 msgid "Delete this user."
 msgstr "Excluir este usuário."
 
-#. TRANS: Message used as title for design settings for the site.
-msgid "Design"
-msgstr "Aparência"
-
-#. TRANS: Instructions for design adminsitration panel.
-msgid "Design settings for this StatusNet site"
-msgstr "Configurações da aparência deste site StatusNet."
-
-#. TRANS: Client error displayed when a logo URL does is not valid.
-msgid "Invalid logo URL."
-msgstr "A URL da logo é inválida."
-
-#. TRANS: Client error displayed when an SSL logo URL is invalid.
-msgid "Invalid SSL logo URL."
-msgstr "A URL da logo SSL é inválida."
-
-#. TRANS: Client error displayed when a theme is submitted through the form that is not in the theme list.
-#. TRANS: %s is the chosen unavailable theme.
-#, php-format
-msgid "Theme not available: %s."
-msgstr "Tema não disponível: %s."
-
-#. TRANS: Fieldset legend for form to change logo.
-msgid "Change logo"
-msgstr "Alterar a logo"
-
-#. TRANS: Field label for StatusNet site logo.
-msgid "Site logo"
-msgstr "Logo do site"
-
-#. TRANS: Field label for SSL StatusNet site logo.
-msgid "SSL logo"
-msgstr "Logo do SSL"
-
-#. TRANS: Fieldset legend for form change StatusNet site's theme.
-msgid "Change theme"
-msgstr "Alterar o tema"
-
-#. TRANS: Field label for dropdown to choose site theme.
-msgid "Site theme"
-msgstr "Tema do site"
-
-#. TRANS: Title for field label for dropdown to choose site theme.
-msgid "Theme for the site."
-msgstr "Tema para o site."
-
-#. TRANS: Field label for uploading a cutom theme.
-msgid "Custom theme"
-msgstr "Tema personalizado"
-
-#. TRANS: Form instructions for uploading a cutom StatusNet theme.
-msgid "You can upload a custom StatusNet theme as a .ZIP archive."
-msgstr ""
-"Você pode enviar um tema personalizado para o StatusNet, na forma de um "
-"arquivo .zip."
-
-#. TRANS: Fieldset legend for theme background image.
-msgid "Change background image"
-msgstr "Alterar imagem do fundo"
-
-#. TRANS: Field label for background image on theme designer page.
-#. TRANS: Field label for background color selector.
-#. TRANS: Label on profile design page for setting a profile page background colour.
-msgid "Background"
-msgstr "Fundo"
-
-#. TRANS: Form guide for background image upload form on theme designer page.
-#, php-format
-msgid ""
-"You can upload a background image for the site. The maximum file size is %1"
-"$s."
-msgstr ""
-"Você pode enviar uma imagem de fundo para o site. O tamanho máximo do "
-"arquivo é de %1 $s."
-
-#. TRANS: Used as radio button label to add a background image.
-msgid "On"
-msgstr "Ativado"
-
-#. TRANS: Used as radio button label to not add a background image.
-msgid "Off"
-msgstr "Desativado"
-
-#. TRANS: Form guide for turning background image on or off on theme designer page.
-#. TRANS: Form guide for a set of radio buttons on the profile design page that will enable or disable
-#. TRANS: use of the uploaded profile image.
-msgid "Turn background image on or off."
-msgstr "Ativar/desativar a imagem de fundo."
-
-#. TRANS: Checkbox label to title background image on theme designer page.
-#. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
-msgid "Tile background image"
-msgstr "Ladrilhar a imagem de fundo"
-
-#. TRANS: Fieldset legend for theme colors.
-msgid "Change colors"
-msgstr "Alterar as cores"
-
-#. TRANS: Field label for content color selector.
-#. TRANS: Label on profile design page for setting a profile page content colour.
-msgid "Content"
-msgstr "Conteúdo"
-
-#. TRANS: Field label for sidebar color selector.
-#. TRANS: Label on profile design page for setting a profile page sidebar colour.
-msgid "Sidebar"
-msgstr "Barra lateral"
-
-#. TRANS: Field label for text color selector.
-#. TRANS: Label on profile design page for setting a profile page text colour.
-msgid "Text"
-msgstr "Texto"
-
-#. TRANS: Field label for link color selector.
-#. TRANS: Label on profile design page for setting a profile page links colour.
-msgid "Links"
-msgstr "Links"
-
-#. TRANS: Fieldset legend for advanced theme design settings.
-msgid "Advanced"
-msgstr "Avançado"
-
-#. TRANS: Field label for custom CSS.
-msgid "Custom CSS"
-msgstr "CSS personalizado"
-
-#. TRANS: Button text for resetting theme settings.
-msgctxt "BUTTON"
-msgid "Use defaults"
-msgstr "Usar o padrão"
-
-#. TRANS: Title for button for resetting theme settings.
-#. TRANS: Title for button on profile design page to reset all colour settings to default.
-msgid "Restore default designs."
-msgstr "Restaurar a aparência padrão."
-
-#. TRANS: Title for button for resetting theme settings.
-#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-msgid "Reset back to default."
-msgstr "Restaurar de volta ao padrão."
-
-#. TRANS: Title for button for saving theme settings.
-#. TRANS: Title for button on profile design page to save settings.
-msgid "Save design."
-msgstr "Salvar a aparência."
-
 #. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
 msgid "This notice is not a favorite!"
 msgstr "Esta mensagem não é uma favorita!"
@@ -2142,6 +1983,83 @@ msgstr "Adicionar às favoritas"
 msgid "No such document \"%s\"."
 msgstr "O documento \"%s\" não existe."
 
+#. TRANS: Menu item in administrator navigation panel.
+#. TRANS: Menu item in default local navigation panel.
+#. TRANS: Menu item in personal group navigation menu.
+#, fuzzy
+msgctxt "MENU"
+msgid "Home"
+msgstr "Site"
+
+msgctxt "MENU"
+msgid "Docs"
+msgstr ""
+
+#. TRANS: Secondary navigation menu item leading to help on StatusNet.
+msgctxt "MENU"
+msgid "Help"
+msgstr "Ajuda"
+
+#, fuzzy
+msgid "Getting started"
+msgstr "As configurações foram salvas."
+
+#. TRANS: Secondary navigation menu item leading to text about StatusNet site.
+#, fuzzy
+msgctxt "MENU"
+msgid "About"
+msgstr "Sobre"
+
+#, fuzzy
+msgid "About this site"
+msgstr "Desbloquear este usuário"
+
+#. TRANS: Secondary navigation menu item leading to Frequently Asked Questions.
+#, fuzzy
+msgctxt "MENU"
+msgid "FAQ"
+msgstr "FAQ"
+
+msgid "Frequently asked questions"
+msgstr ""
+
+#. TRANS: Secondary navigation menu item leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+#, fuzzy
+msgctxt "MENU"
+msgid "Contact"
+msgstr "Contato"
+
+#, fuzzy
+msgid "Contact info"
+msgstr "Contato"
+
+#, fuzzy
+msgctxt "MENU"
+msgid "Tags"
+msgstr "Etiquetas"
+
+msgid "Using tags"
+msgstr ""
+
+#. TRANS: Menu item in default local navigation panel.
+#. TRANS: Menu item in search group navigation panel.
+#. TRANS: Menu item in local navigation menu.
+msgctxt "MENU"
+msgid "Groups"
+msgstr "Grupos"
+
+#, fuzzy
+msgid "Using groups"
+msgstr "Grupos de usuário"
+
+msgctxt "MENU"
+msgid "API"
+msgstr ""
+
+msgid "RESTful API"
+msgstr ""
+
 #. TRANS: Title for "Edit application" form.
 #. TRANS: Form legend.
 msgid "Edit application"
@@ -2246,69 +2164,67 @@ msgstr "As configurações foram salvas."
 
 #. TRANS: Title for edit list page after deleting a tag.
 #. TRANS: %s is a list.
-#, fuzzy, php-format
+#, php-format
 msgid "Delete %s list"
-msgstr "Excluir este usuário"
+msgstr "Excluir a lista %s"
 
 #. TRANS: Title for edit list page.
 #. TRANS: %s is a list.
 #. TRANS: Form legend for list edit form.
 #. TRANS: %s is a list.
-#, fuzzy, php-format
+#, php-format
 msgid "Edit list %s"
-msgstr "Não é uma etiqueta de pessoa válida: %s."
+msgstr "Editar a lista %s"
 
 #. TRANS: Error message displayed when trying to perform an action that requires a tagging user or ID.
-#, fuzzy
 msgid "No tagger or ID."
-msgstr "Nenhum apelido ou identificação."
+msgstr "Nenhum etiquetador ou ID."
 
 #. TRANS: Client error displayed when referring to non-local user.
 msgid "Not a local user."
 msgstr "Este usuário não existe."
 
 #. TRANS: Client error displayed when reting to edit a tag that was not self-created.
-#, fuzzy
 msgid "You must be the creator of the tag to edit it."
-msgstr "Você deve ser um administrador para editar o grupo."
+msgstr "Você deve ser o criador desta etiqueta para editá-la."
 
 #. TRANS: Form instruction for edit list form.
-#, fuzzy
 msgid "Use this form to edit the list."
-msgstr "Use esse formulário para editar o grupo."
+msgstr "Use esse formulário para editar a lista."
 
 #. TRANS: Form validation error displayed if the form data for deleting a tag was incorrect.
-#, fuzzy
 msgid "Delete aborted."
-msgstr "Excluir a mensagem"
+msgstr "A exclusão foi interrompida."
 
 #. TRANS: Text in confirmation dialog for deleting a tag.
 msgid ""
 "Deleting this tag will permanantly remove all its subscription and "
 "membership records. Do you still want to continue?"
 msgstr ""
+"Excluir esta etiqueta removerá permanentemente todos os seus registros de "
+"assinatura e associações. Deseja realmente continuar?"
 
 #. TRANS: Form validation error displayed if a given tag is invalid.
-#, fuzzy
 msgid "Invalid tag."
-msgstr "Imagem inválida."
+msgstr "Etiqueta inválida."
 
 #. TRANS: Form validation error displayed if a given tag is already present.
 #. TRANS: %s is the already present tag.
-#, fuzzy, php-format
+#, php-format
 msgid "You already have a tag named %s."
-msgstr "Você já repetiu essa mensagem."
+msgstr "Você já possui uma etiqueta %s."
 
 #. TRANS: Text in confirmation dialog for setting a tag from public to private.
 msgid ""
 "Setting a public tag as private will permanently remove all the existing "
 "subscriptions to it. Do you still want to continue?"
 msgstr ""
+"Tornar privada uma etiqueta pública removerá permanentemente todas as "
+"assinaturas a ela. Deseja realmente continuar?"
 
-#. TRANS: TRANS: Server error displayed when updating a list fails.
-#, fuzzy
+#. TRANS: Server error displayed when updating a list fails.
 msgid "Could not update list."
-msgstr "Não foi possível atualizar o usuário."
+msgstr "Não foi possível atualizar a lista."
 
 #. TRANS: Title for e-mail settings.
 msgid "Email settings"
@@ -2422,7 +2338,7 @@ msgstr ""
 
 #. TRANS: Checkbox label in e-mail preferences form.
 msgid "Allow friends to nudge me and send me an email."
-msgstr "Permita que meus amigos chamem minha atenção e enviem-me e-mails."
+msgstr "Permita que meus amigos me cutuquem e enviem e-mails."
 
 #. TRANS: Checkbox label in e-mail preferences form.
 msgid "Publish a MicroID for my email address."
@@ -2562,7 +2478,7 @@ msgid ""
 "Why not [register an account](%%action.register%%) and be the first to add a "
 "notice to your favorites!"
 msgstr ""
-"Por que você não [registra uma conta](%%action.register%%) pra ser o "
+"Por que você não [registra uma conta](%%action.register%%) e se torna o "
 "primeiro a adicionar uma mensagem aos favoritos?"
 
 #. TRANS: Title of RSS feed with favourite notices of a user.
@@ -2615,40 +2531,6 @@ msgstr "Nenhum anexo."
 msgid "No uploaded attachments."
 msgstr "Nenhum anexo enviado."
 
-#. TRANS: Client error displayed when subscribing to a remote profile and an unexpected response is received.
-msgid "Not expecting this response!"
-msgstr "Não esperava por esta resposta!"
-
-#. TRANS: Client error displayed when subscribing to a remote profile that does not exist.
-msgid "User being listened to does not exist."
-msgstr "O usuário que está está sendo acompanhado não existe."
-
-#. TRANS: Client error displayed when subscribing to a remote profile that is a local profile.
-#. TRANS: Client error displayed when using remote subscribe for a local entity.
-msgid "You can use the local subscription!"
-msgstr "Você pode usar a assinatura local!"
-
-#. TRANS: Client error displayed when subscribing to a remote profile that is blocked form subscribing to.
-msgid "That user has blocked you from subscribing."
-msgstr "Esse usuário bloqueou o seu pedido de assinatura."
-
-#. TRANS: Client error displayed when subscribing to a remote profile without providing an authorised token.
-msgid "You are not authorized."
-msgstr "Você não está autorizado."
-
-#. TRANS: Client error displayed when subscribing to a remote profile and conversion of the request token to access token fails.
-msgid "Could not convert request token to access token."
-msgstr "Não foi possível converter o token de requisição para token de acesso."
-
-#. TRANS: Client error displayed when subscribing to a remote profile fails because of an unsupported version of the OMB protocol.
-msgid "Remote service uses unknown version of OMB protocol."
-msgstr "O serviço remoto usa uma versão desconhecida do protocolo OMB."
-
-#. TRANS: Server error displayed when subscribing to a remote profile fails because the remote profile could not be updated.
-#. TRANS: Exception thrown when updating a remote profile fails in OAuth store.
-msgid "Error updating remote profile."
-msgstr "Ocorreu um erro durante a atualização do perfil remoto."
-
 #. TRANS: Client error displayed when requesting a non-existent file.
 msgid "No such file."
 msgstr "Esse arquivo não existe."
@@ -2737,31 +2619,6 @@ msgstr ""
 msgid "No ID."
 msgstr "Nenhuma ID."
 
-#. TRANS: Client error displayed trying to change group design settings while not logged in.
-msgid "You must be logged in to edit a group."
-msgstr "Você precisa estar autenticado para editar um grupo."
-
-#. TRANS: Title group design settings page.
-msgid "Group design"
-msgstr "Aparência do grupo"
-
-#. TRANS: Instructions for group design settings page.
-msgid ""
-"Customize the way your group looks with a background image and a colour "
-"palette of your choice."
-msgstr ""
-"Personalize a aparência do grupo com uma imagem de fundo e uma paleta de "
-"cores à sua escolha."
-
-#. TRANS: Form validation error displayed when group design settings could not be updated because of an application issue.
-msgid "Unable to update your design settings."
-msgstr "Não foi possível atualizar suas configurações de aparência."
-
-#. TRANS: Form text to confirm saved group design settings.
-#. TRANS: Confirmation message on Profile design page when saving design settings has succeeded.
-msgid "Design preferences saved."
-msgstr "As configurações da aparência foram salvas."
-
 #. TRANS: Title for group logo settings page.
 #. TRANS: Group logo form legend.
 msgid "Group logo"
@@ -2830,8 +2687,7 @@ msgstr "Membros do grupo %1$s aguardando aprovação, pág. %2$d"
 
 #. TRANS: Page notice for group members page.
 msgid "A list of users awaiting approval to join this group."
-msgstr ""
-"Uma lista de usuários aguardando aprovação para se associar a este grupo."
+msgstr "Uma lista de usuários aguardando aprovação para entrarem neste grupo."
 
 #. TRANS: Message is used as link description. %1$s is a group name, %2$s is a site name.
 #, php-format
@@ -2862,11 +2718,10 @@ msgid ""
 "%%%)!"
 msgstr ""
 "Os grupos de %%%%site.name%%%% lhe permitem encontrar e conversar com "
-"pessoas que tenham interesses similares. Após associar-se a um grupo, você "
-"pode enviar mensagens para todos os seus membros usando a sintaxe \"!"
-"nomedogrupo\". Não encontrou um grupo que lhe agrade? Experimente [procurar "
-"por um](%%%%action.groupsearch%%%%) ou [criar o seu próprio](%%%%action."
-"newgroup%%%%)!"
+"pessoas que tenham interesses similares. Após entrar em um grupo, você pode "
+"enviar mensagens para todos os seus membros usando a sintaxe \"!nomedogrupo"
+"\". Não encontrou um grupo que lhe agrade? Experimente [pesquisar por um](%%%"
+"%action.groupsearch%%%%) ou [criar o seu próprio](%%%%action.newgroup%%%%)!"
 
 #. TRANS: Link to create a new group on the group list page.
 #. TRANS: Link text on group page to create a new group.
@@ -2934,10 +2789,10 @@ msgstr "Configurações do MI"
 #. TRANS: Instant messaging settings page instructions.
 #. TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link.
 #. TRANS: the order and formatting of link text and link should remain unchanged.
-#, php-format
+#, fuzzy, php-format
 msgid ""
-"You can send and receive notices through instant messaging [instant messages]"
-"(%%doc.im%%). Configure your addresses and settings below."
+"You can send and receive notices through [instant messaging](%%doc.im%%). "
+"Configure your addresses and settings below."
 msgstr ""
 "Você pode enviar e receber mensagens através de [mensageiros instantâneos](%%"
 "doc.im%%). Configure seu endereço e suas opções abaixo."
@@ -3138,48 +2993,26 @@ msgstr ""
 "Use esse formulário para convidar seus amigos e colegas para usar este "
 "serviço."
 
-#. TRANS: Field label for a list of e-mail addresses.
-msgid "Email addresses"
-msgstr "Endereços de e-mail"
-
-#. TRANS: Tooltip for field label for a list of e-mail addresses.
-msgid "Addresses of friends to invite (one per line)."
-msgstr "Endereços dos seus amigos que serão convidados (um por linha)."
-
-#. TRANS: Field label for a personal message to send to invitees.
-msgid "Personal message"
-msgstr "Mensagem pessoal"
-
-#. TRANS: Tooltip for field label for a personal message to send to invitees.
-msgid "Optionally add a personal message to the invitation."
-msgstr "Você pode, opcionalmente, adicionar uma mensagem pessoal ao convite."
-
-#. TRANS: Send button for inviting friends
-#. TRANS: Button text for sending notice.
-msgctxt "BUTTON"
-msgid "Send"
-msgstr "Enviar"
-
 #. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral
 #. TRANS: singular 3rd-person pronoun in English. %1$s is the inviting user, $2$s is
 #. TRANS: the StatusNet sitename.
 #, php-format
 msgid "%1$s has invited you to join them on %2$s"
-msgstr "%1$s convidou você para se juntar a %2$s"
+msgstr "%1$s convidou você para se se juntar ao %2$s"
 
 #. TRANS: Client error displayed when trying to join a group while not logged in.
 msgid "You must be logged in to join a group."
-msgstr "Você deve estar autenticado para se associar a um grupo."
+msgstr "Você deve estar autenticado para entrar em um grupo."
 
 #. TRANS: Title for join group page after joining.
 #, php-format
 msgctxt "TITLE"
 msgid "%1$s joined group %2$s"
-msgstr "%1$s associou-se ao grupo %2$s"
+msgstr "%1$s entrou no grupo %2$s"
 
 #. TRANS: Exception thrown when there is an unknown error joining a group.
 msgid "Unknown error joining group."
-msgstr "Erro desconhecido ao associar-se ao grupo."
+msgstr "Erro desconhecido ao tentar entrar no grupo."
 
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
@@ -3297,12 +3130,6 @@ msgstr "URL de uma imagem a ser exibida com a licença."
 msgid "Save license settings."
 msgstr "Salvar as configurações da licença."
 
-#. TRANS: Client error displayed when trying to log in while already logged in.
-#. TRANS: Client error displayed trying to use "one time password login" when already logged in.
-#. TRANS: Client error displayed when trying to register while already logged in.
-msgid "Already logged in."
-msgstr "Já está autenticado."
-
 #. TRANS: Form validation error displayed when trying to log in with incorrect credentials.
 msgid "Incorrect username or password."
 msgstr "Nome de usuário e/ou senha incorreto(s)."
@@ -3322,7 +3149,6 @@ msgid "Login to site"
 msgstr "Autenticar-se no site"
 
 #. TRANS: Field label on login page.
-#, fuzzy
 msgid "Username or email address"
 msgstr "Identificação ou endereço de e-mail"
 
@@ -3417,6 +3243,7 @@ msgstr "A URL da fonte é obrigatória."
 msgid "Could not create application."
 msgstr "Não foi possível criar a aplicação."
 
+#. TRANS: Form validation error messages displayed when uploading an invalid application logo.
 msgid "Invalid image."
 msgstr "Imagem inválida."
 
@@ -3453,14 +3280,6 @@ msgstr "Nenhum conteúdo!"
 msgid "No recipient specified."
 msgstr "Não foi especificado nenhum destinatário."
 
-#. TRANS: Client error displayed trying to send a direct message to self.
-#. TRANS: Error text shown when trying to send a direct message to self.
-msgid ""
-"Don't send a message to yourself; just say it to yourself quietly instead."
-msgstr ""
-"Não envie mensagens para você mesmo(a); ao invés disso, apenas diga-a para "
-"si, discretamente."
-
 #. TRANS: Page title after sending a direct message.
 msgid "Message sent"
 msgstr "A mensagem foi enviada"
@@ -3480,7 +3299,6 @@ msgstr "Erro no Ajax"
 
 #. TRANS: Page title for sending a new notice.
 #. TRANS: Title for form to send a new notice.
-#, fuzzy
 msgctxt "TITLE"
 msgid "New notice"
 msgstr "Nova mensagem"
@@ -3526,7 +3344,7 @@ msgid ""
 "Why not [register an account](%%%%action.register%%%%) and be the first to "
 "[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
 msgstr ""
-"Por que você não [registra uma conta](%%%%action.register%%%%) pra ser o "
+"Por que você não [registra uma conta](%%%%action.register%%%%) e se torna o "
 "primeiro a [publicar sobre este tópico](%%%%action.newnotice%%%%?"
 "status_textarea=%s)?"
 
@@ -3546,16 +3364,16 @@ msgid ""
 "This user doesn't allow nudges or hasn't confirmed or set their email "
 "address yet."
 msgstr ""
-"Esse usuário não permite receber chamados de atenção ou ainda não confirmou "
-"ou configurou seu e-mail."
+"Esse usuário não permite receber cutucadas ou ainda não confirmou ou "
+"configurou seu e-mail."
 
 #. TRANS: Page title after sending a nudge.
 msgid "Nudge sent"
-msgstr "A chamada de atenção foi enviada"
+msgstr "A cutucada foi enviada"
 
 #. TRANS: Confirmation text after sending a nudge.
 msgid "Nudge sent!"
-msgstr "A chamada de atenção foi enviada!"
+msgstr "A cutucada foi enviada!"
 
 #. TRANS: Message displayed to an anonymous user trying to view OAuth application list.
 msgid "You must be logged in to list your applications."
@@ -3667,6 +3485,33 @@ msgstr "Por favor, somente URLs %s sobre HTTP puro."
 msgid "Not a supported data format."
 msgstr "Não é um formato de dados suportado."
 
+#. TRANS: Page title for profile settings.
+#, fuzzy
+msgid "Old school UI settings"
+msgstr "Configurações do MI"
+
+#. TRANS: Usage instructions for profile settings.
+msgid "If you like it \"the old way\", you can set that here."
+msgstr ""
+
+#. TRANS: Confirmation shown when user profile settings are saved.
+#. TRANS: Message after successful saving of administrative settings.
+msgid "Settings saved."
+msgstr "As configurações foram salvas."
+
+msgid "Only stream mode (no conversations) in timelines"
+msgstr ""
+
+msgid "Show conversation page as hierarchical trees"
+msgstr ""
+
+msgid "Show nicknames (not full names) in timelines"
+msgstr ""
+
+#. TRANS: Button text to save a list.
+msgid "Save"
+msgstr "Salvar"
+
 #. TRANS: ShortName in the OpenSearch interface when trying to find users.
 msgid "People Search"
 msgstr "Procurar pessoas"
@@ -3675,6 +3520,11 @@ msgstr "Procurar pessoas"
 msgid "Notice Search"
 msgstr "Procurar mensagens"
 
+#. TRANS: Client error displayed trying to use "one time password login" when already logged in.
+#. TRANS: Client error displayed when trying to register while already logged in.
+msgid "Already logged in."
+msgstr "Já está autenticado."
+
 #. TRANS: Client error displayed trying to use "one time password login" without specifying a user.
 msgid "No user ID specified."
 msgstr "Não foi especificado nenhum ID de usuário."
@@ -3746,7 +3596,7 @@ msgid "Confirm"
 msgstr "Confirmar"
 
 #. TRANS: Field title on page where to change password.
-#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
+#. TRANS: Title for field label for password reset form where the password has to be typed again.
 #. TRANS: Field title on account registration page.
 msgid "Same as password above."
 msgstr "Igual à senha acima."
@@ -3804,12 +3654,6 @@ msgstr "Sem permissão de leitura no diretório de temas: %s."
 msgid "Avatar directory not writable: %s."
 msgstr "Sem permissão de escrita no diretório de avatares: %s."
 
-#. TRANS: Client error in Paths admin panel.
-#. TRANS: %s is the background directory that could not be written to.
-#, php-format
-msgid "Background directory not writable: %s."
-msgstr "Sem permissão de escrita no diretório de imagens de fundo: %s."
-
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the locales directory that could not be read from.
 #, php-format
@@ -3923,30 +3767,6 @@ msgstr "Diretório dos avatares"
 msgid "Directory where avatars are located."
 msgstr "Diretório onde os avatares estão localizados."
 
-#. TRANS: Fieldset legend in Paths admin panel.
-msgid "Backgrounds"
-msgstr "Imagens de fundo"
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-msgid "Server for backgrounds."
-msgstr "Servidor para as imagens de fundo."
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-msgid "Web path to backgrounds."
-msgstr "Caminho web para os planos de fundo."
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-msgid "Server for backgrounds on SSL pages."
-msgstr "Servidor para planos de fundo nas páginas SSL."
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-msgid "Web path to backgrounds on SSL pages."
-msgstr "Caminho web para planos de fundo nas páginas SSL."
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-msgid "Directory where backgrounds are located."
-msgstr "Diretório onde os planos de fundo estão localizados."
-
 #. TRANS: Fieldset legens in Paths admin panel.
 msgid "Attachments"
 msgstr "Anexos"
@@ -4002,8 +3822,9 @@ msgid "Server to direct SSL requests to."
 msgstr "Servidor para onde devem ser direcionadas as requisições SSL."
 
 #. TRANS: Button title text to store form data in the Paths admin panel.
-msgid "Save paths"
-msgstr "Salvar caminhos"
+#, fuzzy
+msgid "Save path settings."
+msgstr "Salvar as configurações do site"
 
 #. TRANS: Instructions for the "People search" page.
 #. TRANS: %%site.name%% is the name of the StatusNet site.
@@ -4021,93 +3842,87 @@ msgstr "Procurar pessoas"
 
 #. TRANS: Title for list page.
 #. TRANS: %s is a list.
-#, fuzzy, php-format
+#, php-format
 msgid "Public list %s"
-msgstr "Nuvem de etiquetas públicas"
+msgstr "Lista pública %s"
 
 #. TRANS: Title for list page.
 #. TRANS: %1$s is a list, %2$d is a page number.
-#, fuzzy, php-format
+#, php-format
 msgid "Public list %1$s, page %2$d"
-msgstr "Respostas para %1$s, pág. %2$d"
+msgstr "Lista pública %1$s, pág. %2$d"
 
 #. TRANS: Message for anonymous users on list page.
 #. TRANS: This message contains Markdown links in the form [description](link).
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "Lists are how you sort similar people on %%site.name%%, a [micro-blogging]"
 "(http://en.wikipedia.org/wiki/Micro-blogging) service based on the Free "
 "Software [StatusNet](http://status.net/) tool. You can then easily keep "
 "track of what they are doing by subscribing to the list's timeline."
 msgstr ""
-"**%s** é usuário de um grupo no %%%%site.name%%%%, um serviço de [microblog]"
-"(http://pt.wikipedia.org/wiki/Micro-blogging) baseado no software livre "
-"[StatusNet](http://status.net/). Seus membros compartilham mensagens curtas "
-"sobre suas vidas e interesses. "
+"Listas são uma forma de agrupar pessoas similares no %%%%site.name%%%%, um "
+"serviço de [microblog](http://pt.wikipedia.org/wiki/Micro-blogging) baseado "
+"no software livre [StatusNet](http://status.net/). Para acompanhar o que "
+"estas pessoas estão fazendo, basta assinar a lista."
 
 #. TRANS: Client error displayed when a tagger is expected but not provided.
-#, fuzzy
 msgid "No tagger."
-msgstr "Esta etiqueta não existe."
+msgstr "Nenhum etiquetador."
 
 #. TRANS: Title for list of people listed by the user.
 #. TRANS: %1$s is a list, %2$s is a username.
-#, fuzzy, php-format
+#, php-format
 msgid "People listed in %1$s by %2$s"
-msgstr "Respostas para %1$s no %2$s."
+msgstr "Pessoas listadas em %1$s por %2$s."
 
 #. TRANS: Title for list of people listed by the user.
 #. TRANS: %1$s is a list, %2$s is a username, %2$s is a page number.
-#, fuzzy, php-format
+#, php-format
 msgid "People listed in %1$s by %2$s, page %3$d"
-msgstr "Respostas para %1$s, pág. %2$d"
+msgstr "Pessoas listadas em %1$s, por %2$s, pág. %3$d"
 
 #. TRANS: Addition in tag membership list for creator of a tag.
 #. TRANS: Addition in tag subscribers list for creator of a tag.
-#, fuzzy
 msgid "Creator"
-msgstr "Criado"
+msgstr "Criador"
 
 #. TRANS: Title for lists by a user page for a private tag.
-#, fuzzy
 msgid "Private lists by you"
-msgstr "Editar o grupo %s"
+msgstr "Suas listas privadas"
 
 #. TRANS: Title for lists by a user page for a public tag.
-#, fuzzy
 msgid "Public lists by you"
-msgstr "Nuvem de etiquetas públicas"
+msgstr "Suas listas públicas"
 
 #. TRANS: Title for lists by a user page.
-#, fuzzy
 msgid "Lists by you"
-msgstr "Editar o grupo %s"
+msgstr "Suas listas"
 
 #. TRANS: Title for lists by a user page.
 #. TRANS: %s is a user nickname.
 #, php-format
 msgid "Lists by %s"
-msgstr ""
+msgstr "Listas de %s"
 
 #. TRANS: Title for lists by a user page.
 #. TRANS: %1$s is a user nickname, %2$d is a page number.
-#, fuzzy, php-format
+#, php-format
 msgid "Lists by %1$s, page %2$d"
-msgstr "Mensagens de %1$s, pág. %2$d"
+msgstr "Listas de %1$s, pág. %2$d"
 
 #. TRANS: Client error displayed when trying view another user's private lists.
 msgid "You cannot view others' private lists"
-msgstr ""
+msgstr "Você não pode ver as listas privadas de outras pessoas"
 
 #. TRANS: Mode selector label.
-#, fuzzy
 msgid "Mode"
-msgstr "Moderar"
+msgstr "Modo"
 
 #. TRANS: Link text to show lists for user %s.
-#, fuzzy, php-format
+#, php-format
 msgid "Lists for %s"
-msgstr "Enviadas de %s"
+msgstr "Listas para %s"
 
 #. TRANS: Fieldset legend.
 #. TRANS: Fieldset legend on gallery action page.
@@ -4116,22 +3931,19 @@ msgstr "Selecione a etiqueta para filtrar"
 
 #. TRANS: Checkbox title.
 msgid "Show private tags."
-msgstr ""
+msgstr "Exibir etiquetas privadas."
 
 #. TRANS: Checkbox label to show public tags.
-#, fuzzy
 msgctxt "LABEL"
 msgid "Public"
-msgstr "Público"
+msgstr "Públicas"
 
 #. TRANS: Checkbox title.
-#, fuzzy
 msgid "Show public tags."
-msgstr "Esta etiqueta não existe."
+msgstr "Exibir etiquetas públicas."
 
 #. TRANS: Submit button text for tag filter form.
 #. TRANS: Submit button text on gallery action page.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Go"
 msgstr "Ir"
@@ -4145,30 +3957,30 @@ msgid ""
 "%%%site.name%%%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
 "blogging) service based on the Free Software [StatusNet](http://status.net/) "
 "tool. You can easily keep track of what they are doing by subscribing to the "
-"tag's timeline."
+"list's timeline."
 msgstr ""
-"**%s** é usuário de um grupo no %%%%site.name%%%%, um serviço de [microblog]"
-"(http://pt.wikipedia.org/wiki/Micro-blogging) baseado no software livre "
-"[StatusNet](http://status.net/). Seus membros compartilham mensagens curtas "
-"sobre suas vidas e interesses. "
+"Estas são as listas criadas por **%s**. Listas são uma forma de agrupar "
+"pessoas similares no %%%%site.name%%%%, um serviço de [microblog](http://pt."
+"wikipedia.org/wiki/Micro-blogging) baseado no software livre [StatusNet]"
+"(http://status.net/). Para acompanhar o que estas pessoas estão fazendo, "
+"basta assinar a lista."
 
 #. TRANS: Message displayed on page that displays lists by a user when there are none.
 #. TRANS: This message contains Markdown links in the form [description](links).
 #. TRANS: %s is a tagger nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "%s has not created any [lists](%%%%doc.lists%%%%) yet."
-msgstr ""
-"Ninguém publicou nenhuma mensagem com a [etiqueta](%%doc.tags%%) ainda."
+msgstr "%s ainda não criou nenhuma [lista](%%%%doc.lists%%%%)."
 
 #. TRANS: Page title. %s is a tagged user's nickname.
 #, php-format
 msgid "Lists with %s in them"
-msgstr ""
+msgstr "Listas onde %s aparece"
 
 #. TRANS: Page title. %1$s is a tagged user's nickname, %2$s is a page number.
-#, fuzzy, php-format
+#, php-format
 msgid "Lists with %1$s, page %2$d"
-msgstr "Mensagens etiquetadas com %1$s, pág. %2$d"
+msgstr "Listas onde %1$s aparece, pág. %2$d"
 
 #. TRANS: Message displayed for anonymous users on page that displays lists for a user.
 #. TRANS: This message contains Markdown links in the form [description](links).
@@ -4179,12 +3991,13 @@ msgid ""
 "site.name%%%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
 "blogging) service based on the Free Software [StatusNet](http://status.net/) "
 "tool. You can easily keep track of what they are doing by subscribing to the "
-"tag's timeline."
+"list's timeline."
 msgstr ""
-"**%s** é usuário de um grupo no %%%%site.name%%%%, um serviço de [microblog]"
-"(http://pt.wikipedia.org/wiki/Micro-blogging) baseado no software livre "
-"[StatusNet](http://status.net/). Seus membros compartilham mensagens curtas "
-"sobre suas vidas e interesses. "
+"Estas são as lista de **%s**. Listas são uma forma de agrupar pessoas "
+"similares no %%%%site.name%%%%, um serviço de [microblog](http://pt."
+"wikipedia.org/wiki/Micro-blogging) baseado no software livre [StatusNet]"
+"(http://status.net/). Para acompanhar o que estas pessoas estão fazendo, "
+"basta assinar a lista."
 
 #. TRANS: Message displayed on page that displays lists a user was added to when there are none.
 #. TRANS: This message contains Markdown links in the form [description](links).
@@ -4286,33 +4099,20 @@ msgstr ""
 "Todos os plugins padrão foram desabilitados no arquivo de configuração do "
 "site."
 
-#. TRANS: Client error displayed if the notice posted has too many characters.
-msgid "Invalid notice content."
-msgstr "O conteúdo da mensagem é inválido."
-
-#. TRANS: Exception thrown if a notice's license is not compatible with the StatusNet site license.
-#. TRANS: %1$s is the notice license, %2$s is the StatusNet site's license.
-#, php-format
-msgid "Notice license \"%1$s\" is not compatible with site license \"%2$s\"."
-msgstr ""
-"A licença \"%1$s\" da mensagem não é compatível com a licença \"%2$s\" do "
-"site."
-
 #. TRANS: Client error displayed when trying to add an unindentified field to profile.
 #. TRANS: %s is a field name.
 #, php-format
 msgid "Unidentified field %s."
-msgstr ""
+msgstr "Campo %s não identificado."
 
 #. TRANS: Page title.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Search results"
-msgstr "Procurar no site"
+msgstr "Resultados da pesquisa"
 
 #. TRANS: Error message in case a search is shorter than three characters.
 msgid "The search string must be at least 3 characters long."
-msgstr ""
+msgstr "A sequência a ser pesquisada deve ter pelo menos 3 caracteres."
 
 #. TRANS: Page title for profile settings.
 msgid "Profile settings"
@@ -4393,6 +4193,8 @@ msgid "Share my current location when posting notices"
 msgstr "Compartilhe minha localização atual ao publicar mensagens"
 
 #. TRANS: Field label in form for profile settings.
+#. TRANS: Title for group tag cloud section.
+#. TRANS: %s is a group name.
 msgid "Tags"
 msgstr "Etiquetas"
 
@@ -4422,9 +4224,9 @@ msgstr "Em que fuso horário você normalmente está?"
 
 #. TRANS: Checkbox label in form for profile settings.
 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 perfis não humanos)."
+"Assinar automaticamente à quem me assinar (melhor para perfis não humanos)"
 
 #. TRANS: Dropdown field label on profile settings, for what policies to apply when someone else tries to subscribe to your updates.
 msgid "Subscription policy"
@@ -4492,11 +4294,6 @@ msgstr "Não foi possível salvar as preferências de localização."
 msgid "Could not save tags."
 msgstr "Não foi possível salvar as etiquetas."
 
-#. TRANS: Confirmation shown when user profile settings are saved.
-#. TRANS: Message after successful saving of administrative settings.
-msgid "Settings saved."
-msgstr "As configurações foram salvas."
-
 #. TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
 #. TRANS: Page title for page where a user account can be restored from backup.
 msgid "Restore account"
@@ -4509,7 +4306,8 @@ msgid "Beyond the page limit (%s)."
 msgstr "Além do limite da página (%s)."
 
 #. TRANS: Server error displayed when a public timeline cannot be retrieved.
-msgid "Could not retrieve public stream."
+#, fuzzy
+msgid "Could not retrieve public timeline."
 msgstr "Não foi possível recuperar o fluxo público."
 
 #. TRANS: Title for all public timeline pages but the first.
@@ -4524,15 +4322,23 @@ msgid "Public timeline"
 msgstr "Mensagens públicas"
 
 #. TRANS: Link description for public timeline feed.
-msgid "Public Stream Feed (RSS 1.0)"
+#, fuzzy
+msgid "Public Timeline Feed (Activity Streams JSON)"
+msgstr "Fonte de mensagens públicas (Atom)"
+
+#. TRANS: Link description for public timeline feed.
+#, fuzzy
+msgid "Public Timeline Feed (RSS 1.0)"
 msgstr "Fonte de mensagens públicas (RSS 1.0)"
 
 #. TRANS: Link description for public timeline feed.
-msgid "Public Stream Feed (RSS 2.0)"
+#, fuzzy
+msgid "Public Timeline Feed (RSS 2.0)"
 msgstr "Fonte de mensagens públicas (RSS 2.0)"
 
 #. TRANS: Link description for public timeline feed.
-msgid "Public Stream Feed (Atom)"
+#, fuzzy
+msgid "Public Timeline Feed (Atom)"
 msgstr "Fonte de mensagens públicas (Atom)"
 
 #. TRANS: Text displayed for public feed when there are no public notices.
@@ -4553,7 +4359,7 @@ msgstr "Seja o primeiro a publicar!"
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to post!"
 msgstr ""
-"Por que você não [registra uma conta](%%action.register%%) pra ser o "
+"Por que você não [registra uma conta](%%action.register%%) e se torna o "
 "primeiro a publicar?"
 
 #. TRANS: Message for not logged in users at an invite-only site trying to view the public feed of notices.
@@ -4581,51 +4387,6 @@ msgstr ""
 "Este é %%site.name%%, um serviço de [microblog](http://pt.wikipedia.org/wiki/"
 "Microblogging) baseado no software livre [StatusNet](http://status.net/)."
 
-#. TRANS: Title for page with public list cloud.
-#, fuzzy
-msgid "Public list cloud"
-msgstr "Nuvem de etiquetas públicas"
-
-#. TRANS: Page notice for page with public list cloud.
-#. TRANS: %s is a StatusNet sitename.
-#, fuzzy, php-format
-msgid "These are largest lists on %s"
-msgstr "Estas são as etiquetas recentes mais populares no %s"
-
-#. TRANS: Empty list message on page with public list cloud.
-#. TRANS: This message contains Markdown links in the form [description](link).
-#, fuzzy, php-format
-msgid "No one has [listed](%%doc.tags%%) anyone yet."
-msgstr ""
-"Ninguém publicou nenhuma mensagem com a [etiqueta](%%doc.tags%%) ainda."
-
-#. TRANS: Additional empty list message on page with public list cloud for logged in users.
-#, fuzzy
-msgid "Be the first to list someone!"
-msgstr "Seja o primeiro a publicar uma!"
-
-#. TRANS: Additional empty list message on page with public list cloud for anonymous users.
-#. TRANS: This message contains Markdown links in the form [description](link).
-#, fuzzy, php-format
-msgid ""
-"Why not [register an account](%%action.register%%) and be the first to list "
-"someone!"
-msgstr ""
-"Por que você não [registra uma conta](%%action.register%%) pra ser o "
-"primeiro a publicar?"
-
-#. TRANS: DT element on on page with public list cloud.
-#, fuzzy
-msgid "List cloud"
-msgstr "O método da API não foi encontrado!"
-
-#. TRANS: Link title for number of listed people. %d is the number of listed people.
-#, php-format
-msgid "1 person listed"
-msgid_plural "%d people listed"
-msgstr[0] ""
-msgstr[1] ""
-
 #. TRANS: Public RSS feed description. %s is the StatusNet site name.
 #, php-format
 msgid "%s updates from everyone."
@@ -4664,7 +4425,7 @@ msgid ""
 "Why not [register an account](%%action.register%%) and be the first to post "
 "one!"
 msgstr ""
-"Por que você não [registra uma conta](%%action.register%%) pra ser o "
+"Por que você não [registra uma conta](%%action.register%%) e se torna o "
 "primeiro a publicar?"
 
 #. TRANS: Client error displayed trying to recover password while already logged in.
@@ -4751,7 +4512,6 @@ msgid "6 or more characters, and do not forget it!"
 msgstr "No mínimo 6 caracteres. E não se esqueça dela!"
 
 #. TRANS: Button text for password reset form.
-#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
 msgctxt "BUTTON"
 msgid "Reset"
 msgstr "Restaurar"
@@ -4760,20 +4520,6 @@ msgstr "Restaurar"
 msgid "Enter a nickname or email address."
 msgstr "Digite a identificação ou endereço de e-mail."
 
-#. TRANS: Information on password recovery form if no known username or e-mail address was specified.
-msgid "No user with that email address or username."
-msgstr ""
-"Não foi encontrado nenhum usuário com essa identificação ou endereço de "
-"email."
-
-#. TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.
-msgid "No registered email address for that user."
-msgstr "Nenhum endereço de e-mail registrado para esse usuário."
-
-#. TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.
-msgid "Error saving address confirmation."
-msgstr "Erro ao salvar o endereço de confirmação."
-
 #. TRANS: User notification after an e-mail with instructions was sent from the password recovery form.
 msgid ""
 "Instructions for recovering your password have been sent to the email "
@@ -4956,74 +4702,6 @@ msgstr ""
 "(Você receberá uma mensagem por e-mail a qualquer momento, com instruções "
 "sobre como confirmar seu endereço.)"
 
-#. TRANS: Page notice for remote subscribe. This message contains Markdown links.
-#. TRANS: Ensure to keep the correct markup of [link description](link).
-#, php-format
-msgid ""
-"To subscribe, you can [login](%%action.login%%), or [register](%%action."
-"register%%) a new  account. If you already have an account  on a [compatible "
-"microblogging site](%%doc.openmublog%%),  enter your profile URL below."
-msgstr ""
-"Para 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."
-
-#. TRANS: Page title for Remote subscribe.
-msgid "Remote subscribe"
-msgstr "Assinatura remota"
-
-#. TRANS: Field legend on page for remote subscribe.
-msgid "Subscribe to a remote user"
-msgstr "Assinar um usuário remoto"
-
-#. TRANS: Field label on page for remote subscribe.
-msgid "User nickname"
-msgstr "Identificação do usuário"
-
-#. TRANS: Field title on page for remote subscribe.
-msgid "Nickname of the user you want to follow."
-msgstr "Identificação do usuário que você quer acompanhar."
-
-#. TRANS: Field label on page for remote subscribe.
-msgid "Profile URL"
-msgstr "URL do perfil"
-
-#. TRANS: Field title on page for remote subscribe.
-msgid "URL of your profile on another compatible microblogging service."
-msgstr "URL do seu perfil em outro serviço de microblog compatível."
-
-#. TRANS: Button text on page for remote subscribe.
-#. TRANS: Link text for link that will subscribe to a remote profile.
-#. TRANS: Button text to subscribe to a user.
-#. TRANS: Button text for subscribing to a list.
-msgctxt "BUTTON"
-msgid "Subscribe"
-msgstr "Assinar"
-
-#. TRANS: Form validation error on page for remote subscribe when an invalid profile URL was provided.
-msgid "Invalid profile URL (bad format)."
-msgstr "A URL do perfil é inválida (formato inválido)."
-
-#. TRANS: Form validation error on page for remote subscribe when no the provided profile URL
-#. TRANS: does not contain expected data.
-msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
-msgstr ""
-"Não é uma URL de perfil válida (nenhum documento YADIS ou XRDS inválido)."
-
-#. TRANS: Form validation error on page for remote subscribe.
-msgid "That is a local profile! Login to subscribe."
-msgstr "Esse é um perfil local! Entre para assinar."
-
-#. TRANS: Form validation error on page for remote subscribe when the remote service is not providing a request token.
-msgid "Could not get a request token."
-msgstr "Não foi possível obter um token de requisição."
-
-#. TRANS: Client error displayed when trying to (un)list an OMB 0.1 remote profile.
-#, fuzzy
-msgid "You cannot (un)list an OMB 0.1 remote profile with this action."
-msgstr "Não é possível assinar um perfil OMB 0.1 remoto com essa ação."
-
 #. TRANS: Client error displayed when an unknown error occurs while delisting a user.
 #. TRANS: %s is a username.
 #, php-format
@@ -5076,6 +4754,12 @@ msgstr "Respostas para %s"
 msgid "Replies to %1$s, page %2$d"
 msgstr "Respostas para %1$s, pág. %2$d"
 
+#. TRANS: Link for feed with replies for a user.
+#. TRANS: %s is a user nickname.
+#, fuzzy, php-format
+msgid "Replies feed for %s (Activity Streams JSON)"
+msgstr "Fonte de respostas para %s (Atom)"
+
 #. TRANS: Link for feed with replies for a user.
 #. TRANS: %s is a user nickname.
 #, php-format
@@ -5112,7 +4796,7 @@ msgid ""
 "[join groups](%%action.groups%%)."
 msgstr ""
 "Você pode envolver outros usuários na conversa. Pra isso, assine mais "
-"pessoas ou [associe-se a grupos](%%action.groups%%)."
+"pessoas ou [entre em grupos](%%action.groups%%)."
 
 #. TRANS: Empty list message for page with replies for a user for all logged in users but the user themselves.
 #. TRANS: %1$s, %2$s and %3$s are a user nickname. This message contains a Markdown link in the form [link text](link).
@@ -5121,8 +4805,8 @@ msgid ""
 "You can try to [nudge %1$s](../%2$s) or [post something to them](%%%%action."
 "newnotice%%%%?status_textarea=%3$s)."
 msgstr ""
-"Seja o primeiro a [publicar sobre este tópico](%%%%action.newnotice%%%%?"
-"status_textarea=%s)!"
+"Você pode tentar [cutucar %1$s](../%2$s) ou [publicar alguma coisa para ele]"
+"(%%%%action.newnotice%%%%?status_textarea=%3$s)."
 
 #. TRANS: RSS reply feed description.
 #. TRANS: %1$s is a user nickname, %2$s is the StatusNet site name.
@@ -5199,8 +4883,9 @@ msgstr ""
 "resultados."
 
 #. TRANS: Form instructions for feed restore.
+#, fuzzy
 msgid ""
-"You can upload a backed-up stream in <a href=\"http://activitystrea.ms/"
+"You can upload a backed-up timeline in <a href=\"http://activitystrea.ms/"
 "\">Activity Streams</a> format."
 msgstr ""
 "Você pode enviar um backup de fluxo no formato <a href=\"http://"
@@ -5240,9 +4925,9 @@ msgstr "Não é uma etiqueta de pessoa válida: %s."
 
 #. TRANS: Page title for page showing self tags.
 #. TRANS: %1$s is a tag, %2$d is a page number.
-#, fuzzy, php-format
+#, php-format
 msgid "Users self-tagged with %1$s, page %2$d"
-msgstr "Usuários auto-etiquetados com %1$s - pág. %2$d"
+msgstr "Usuários auto-etiquetados como %1$s, pág. %2$d"
 
 #. TRANS: Title for the sessions administration panel.
 msgctxt "TITLE"
@@ -5316,6 +5001,26 @@ msgstr "Restaurar a chave e o segredo"
 msgid "Application info"
 msgstr "Informação da aplicação"
 
+#. TRANS: Field label on application page.
+msgid "Consumer key"
+msgstr "Chave do consumidor"
+
+#. TRANS: Field label on application page.
+msgid "Consumer secret"
+msgstr "Segredo do consumidor"
+
+#. TRANS: Field label on application page.
+msgid "Request token URL"
+msgstr "URL do token de requisição"
+
+#. TRANS: Field label on application page.
+msgid "Access token URL"
+msgstr "URL do token de acesso"
+
+#. TRANS: Field label on application page.
+msgid "Authorize URL"
+msgstr "Autorizar a URL"
+
 #. TRANS: Note on the OAuth application page about signature support.
 msgid ""
 "Note: HMAC-SHA1 signatures are supported. The plaintext signature method is "
@@ -5338,6 +5043,11 @@ msgstr "Mensagens favoritas de %1$s, pág. %2$d"
 msgid "Could not retrieve favorite notices."
 msgstr "Não foi possível recuperar as mensagens favoritas."
 
+#. TRANS: Feed link text. %s is a username.
+#, fuzzy, php-format
+msgid "Feed for favorites of %s (Activity Streams JSON)"
+msgstr "Fonte para favoritas de %s (Atom)"
+
 #. TRANS: Feed link text. %s is a username.
 #, php-format
 msgid "Feed for favorites of %s (RSS 1.0)"
@@ -5381,8 +5091,9 @@ msgid ""
 "action.register%%%%) and then post something interesting they would add to "
 "their favorites :)"
 msgstr ""
-"Por que você não [registra uma conta](%%action.register%%) pra ser o "
-"primeiro a adicionar uma mensagem aos favoritos?"
+"%s ainda não marcou nenhuma mensagem como favorita. Por que você não "
+"[registra uma conta](%%%%action.register%%%%) e publica alguma mensagem "
+"interessante para que as pessoas possam marcar como favorita? :-)"
 
 #. TRANS: Page notice for show favourites page.
 msgid "This is a way to share what you like."
@@ -5399,6 +5110,11 @@ msgstr "Grupo %s"
 msgid "%1$s group, page %2$d"
 msgstr "Grupo %1$s, pág. %2$d"
 
+#. TRANS: Tooltip for feed link. %s is a group nickname.
+#, fuzzy, php-format
+msgid "Notice feed for %s group (Activity Streams JSON)"
+msgstr "Fonte de mensagens do grupo %s (Atom)"
+
 #. TRANS: Tooltip for feed link. %s is a group nickname.
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
@@ -5419,42 +5135,8 @@ msgstr "Fonte de mensagens do grupo %s (Atom)"
 msgid "FOAF for %s group"
 msgstr "FOAF para o grupo %s"
 
-#. TRANS: Header for mini list of group members on a group page (h2).
-msgid "Members"
-msgstr "Membros"
-
-#. TRANS: Description for mini list of group members on a group page when the group has no members.
-#. TRANS: Content of "Listed" page if there are no listed users.
-#. TRANS: Content of "People following tag x" if there are no subscribed users.
-#. TRANS: Empty list message for tags.
-#. TRANS: Text for user subscription statistics if the user has no subscriptions.
-#. TRANS: Text for user subscriber statistics if user has no subscribers.
-#. TRANS: Text for user user group membership statistics if user is not a member of any group.
-#. TRANS: Default content for section/sidebar widget.
-msgid "(None)"
-msgstr "(Nenhum)"
-
-#. TRANS: Link to all group members from mini list of group members if group has more than n members.
-msgid "All members"
-msgstr "Todos os membros"
-
-#. TRANS: Header for group statistics on a group page (h2).
-#. TRANS: H2 text for user statistics.
-msgid "Statistics"
-msgstr "Estatísticas"
-
-#. TRANS: Label for group creation date.
-msgctxt "LABEL"
-msgid "Created"
-msgstr "Criado"
-
-#. TRANS: Label for member count in statistics on group page.
-msgctxt "LABEL"
-msgid "Members"
-msgstr "Membros"
-
 #. TRANS: Notice on group pages for anonymous users for StatusNet sites that accept new registrations.
-#. TRANS: **%s** is the group alias, %%%%site.name%%%% is the site name,
+#. TRANS: %s is the group name, %%%%site.name%%%% is the site name,
 #. TRANS: %%%%action.register%%%% is the URL for registration, %%%%doc.help%%%% is a URL to help.
 #. TRANS: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
 #, php-format
@@ -5468,30 +5150,25 @@ msgstr ""
 "**%s** é usuário de um grupo no %%%%site.name%%%%, um serviço de [microblog]"
 "(http://pt.wikipedia.org/wiki/Micro-blogging) baseado no software livre "
 "[StatusNet](http://status.net/). Seus membros compartilham mensagens curtas "
-"sobre suas vidas e interesses. [Associe-se agora](%%%%action.register%%%%) "
-"para se tornar parte deste grupo e muito mais! ([Saiba mais](%%%%doc.help%%%"
-"%))"
+"sobre suas vidas e interesses. [Cadastre-se agora](%%%%action.register%%%%) "
+"para se tornar parte deste grupo e de muitos outros! ([Saiba mais](%%%%doc."
+"help%%%%))"
 
 #. TRANS: Notice on group pages for anonymous users for StatusNet sites that accept no new registrations.
-#. TRANS: **%s** is the group alias, %%%%site.name%%%% is the site name,
+#. TRANS: %s is the group name, %%%%site.name%%%% is the site name,
 #. TRANS: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
-#, php-format
+#, fuzzy, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
 "wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
 "[StatusNet](http://status.net/) tool. Its members share short messages about "
-"their life and interests. "
+"their life and interests."
 msgstr ""
 "**%s** é usuário de um grupo no %%%%site.name%%%%, um serviço de [microblog]"
 "(http://pt.wikipedia.org/wiki/Micro-blogging) baseado no software livre "
 "[StatusNet](http://status.net/). Seus membros compartilham mensagens curtas "
 "sobre suas vidas e interesses. "
 
-#. TRANS: Title for list of group administrators on a group page.
-msgctxt "TITLE"
-msgid "Admins"
-msgstr "Administradores"
-
 #. TRANS: Client error displayed requesting a single message that does not exist.
 msgid "No such message."
 msgstr "Essa mensagem não existe."
@@ -5574,51 +5251,58 @@ msgstr ""
 
 #. TRANS: Additional empty list message for list timeline for currently logged in user tagged tags.
 msgid "Try tagging more people."
-msgstr ""
+msgstr "Experimente etiquetar mais pessoas."
 
 #. TRANS: Additional empty list message for list timeline.
 #. TRANS: This message contains Markdown links in the form [description](link).
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and start following "
 "this timeline!"
 msgstr ""
-"Por que você não [registra uma conta](%%action.register%%) pra ser o "
-"primeiro a publicar?"
+"Por que você não [registra uma conta](%%action.register%%) e começa a "
+"acompanhar este fluxo de mensagens?"
 
 #. TRANS: Header on show list page.
+#. TRANS: Link description for link to list of users tagged with a tag (so part of a list).
 #, fuzzy
 msgid "Listed"
 msgstr "Licença"
 
+#. TRANS: Content of "Listed" page if there are no listed users.
+#. TRANS: Content of "People following tag x" if there are no subscribed users.
+#. TRANS: Description for mini list of group members on a group page when the group has no members.
+#. TRANS: Empty list message for tags.
+#. TRANS: Text for user subscription statistics if the user has no subscriptions.
+#. TRANS: Text for user subscriber statistics if user has no subscribers.
+#. TRANS: Text for user user group membership statistics if user is not a member of any group.
+#. TRANS: Default content for section/sidebar widget.
+msgid "(None)"
+msgstr "(Nenhum)"
+
 #. TRANS: Link for more "People in list x by a user"
 #. TRANS: if there are more than the mini list's maximum.
 msgid "Show all"
-msgstr ""
+msgstr "Exibir todas"
 
 #. TRANS: Header for tag subscribers.
 #. TRANS: Link description for link to list of users subscribed to a tag.
 msgid "Subscribers"
 msgstr "Assinantes"
 
-#. TRANS: Link for more "People following tag x"
-#. TRANS: if there are more than the mini list's maximum.
-msgid "All subscribers"
-msgstr "Todos os assinantes"
-
-#. TRANS: Page title showing tagged notices in one user's stream.
+#. TRANS: Page title showing tagged notices in one user's timeline.
 #. TRANS: %1$s is the username, %2$s is the hash tag.
 #, php-format
 msgid "Notices by %1$s tagged %2$s"
 msgstr "Mensagens de %1$s etiquetadas como %2$s"
 
-#. TRANS: Page title showing tagged notices in one user's stream.
+#. TRANS: Page title showing tagged notices in one user's timeline.
 #. TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number.
 #, php-format
 msgid "Notices by %1$s tagged %2$s, page %3$d"
 msgstr "Mensagens de %1$s etiquetadas como %2$s, pág. %3$d"
 
-#. TRANS: Extended page title showing tagged notices in one user's stream.
+#. TRANS: Extended page title showing tagged notices in one user's timeline.
 #. TRANS: %1$s is the username, %2$d is the page number.
 #, php-format
 msgid "Notices by %1$s, page %2$d"
@@ -5630,6 +5314,12 @@ msgstr "Mensagens de %1$s, pág. %2$d"
 msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
 msgstr "Fonte de mensagens de %1$s etiquetada como %2$s (RSS 1.0)"
 
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#, fuzzy, php-format
+msgid "Notice feed for %s (Activity Streams JSON)"
+msgstr "Fonte de mensagens de %s (Atom)"
+
 #. TRANS: Title for link to notice feed.
 #. TRANS: %s is a user nickname.
 #, php-format
@@ -5654,7 +5344,7 @@ msgstr "Fonte de mensagens de %s (Atom)"
 msgid "FOAF for %s"
 msgstr "FOAF de %s"
 
-#. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
+#. TRANS: First sentence of empty list message for a timeline. $1%s is a user nickname.
 #, php-format
 msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
 msgstr ""
@@ -5669,17 +5359,17 @@ msgstr ""
 "Viu alguma coisa interessante recentemente? Você ainda não publicou nenhuma "
 "mensagem. Que tal começar agora? :)"
 
-#. TRANS: Second sentence of empty  list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
+#. TRANS: Second sentence of empty  list message for a non-self timeline. %1$s is a user nickname, %2$s is a part of a URL.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
 #, php-format
 msgid ""
 "You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
 "%?status_textarea=%2$s)."
 msgstr ""
-"Seja o primeiro a [publicar sobre este tópico](%%%%action.newnotice%%%%?"
-"status_textarea=%s)!"
+"Você pode tentar cutucar %1$s ou [publicar alguma coisa para ele](%%%%action."
+"newnotice%%%%?status_textarea=%2$s)."
 
-#. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
+#. TRANS: Announcement for anonymous users showing a timeline if site registrations are open.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
 #, php-format
 msgid ""
@@ -5691,16 +5381,16 @@ msgstr ""
 "**%s** tem uma conta no %%%%site.name%%%%, um serviço de [microblog](http://"
 "pt.wikipedia.org/wiki/Micro-blogging) baseado no software livre [StatusNet]"
 "(http://status.net/). [Cadastre-se agora](%%%%action.register%%%%) para "
-"acompanhar as mensagens de **%s** e muito mais! ([Saiba mais](%%%%doc.help%%%"
-"%))"
+"acompanhar as mensagens de **%s** e de várias outras pessoas! ([Saiba mais](%"
+"%%%doc.help%%%%))"
 
-#. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
+#. TRANS: Announcement for anonymous users showing a timeline if site registrations are closed or invite only.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#, php-format
+#, fuzzy, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
 "wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
-"[StatusNet](http://status.net/) tool. "
+"[StatusNet](http://status.net/) tool."
 msgstr ""
 "**%s** tem uma conta no %%%%site.name%%%%, um serviço de [microblog](http://"
 "pt.wikipedia.org/wiki/Micro-blogging) baseado no software livre [StatusNet]"
@@ -5737,6 +5427,14 @@ msgstr "Você deve digitar alguma coisa para o nome do site."
 msgid "You must have a valid contact email address."
 msgstr "Você deve ter um endereço de e-mail para contato válido."
 
+#. TRANS: Client error displayed when a logo URL is not valid.
+msgid "Invalid logo URL."
+msgstr "A URL da logo é inválida."
+
+#. TRANS: Client error displayed when a SSL logo URL is invalid.
+msgid "Invalid SSL logo URL."
+msgstr "A URL da logo SSL é inválida."
+
 #. TRANS: Client error displayed trying to save site settings with an invalid language code.
 #. TRANS: %s is the invalid language code.
 #, php-format
@@ -5807,7 +5505,9 @@ msgid "Default language"
 msgstr "Idioma padrão"
 
 #. TRANS: Dropdown title on site settings panel.
-msgid "Site language when autodetection from browser settings is not available"
+#, fuzzy
+msgid ""
+"The site language when autodetection from browser settings is not available."
 msgstr ""
 "Idioma do site quando as configurações de autodetecção a partir do navegador "
 "não estiverem disponíveis"
@@ -5835,8 +5535,21 @@ msgstr ""
 "Quanto tempo (em segundos) os usuários devem esperar para publicar a mesma "
 "coisa novamente."
 
+#. TRANS: Fieldset legend for form to change logo.
+msgid "Logo"
+msgstr "Logotipo"
+
+#. TRANS: Field label for StatusNet site logo.
+msgid "Site logo"
+msgstr "Logo do site"
+
+#. TRANS: Field label for SSL StatusNet site logo.
+msgid "SSL logo"
+msgstr "Logo do SSL"
+
 #. TRANS: Button title for saving site settings.
-msgid "Save site settings"
+#, fuzzy
+msgid "Save the site settings."
 msgstr "Salvar as configurações do site"
 
 #. TRANS: Page title for site-wide notice tab in admin panel.
@@ -5864,7 +5577,7 @@ msgid "Site-wide notice text (255 characters maximum; HTML allowed)"
 msgstr ""
 "Texto dos aviso do site (no máximo 255 caracteres; é permitido o uso de HTML)"
 
-#. TRANS: Title for button to save site notice in admin panel.
+#. TRANS: Button title to save site notice in admin panel.
 msgid "Save site notice."
 msgstr "Salvar as mensagens do site."
 
@@ -6045,23 +5758,20 @@ msgid "Frequency"
 msgstr "Frequentemente"
 
 #. TRANS: Input field title for snapshot frequency in admin panel for snapshots.
-#, fuzzy
 msgid "Snapshots will be sent once every N web hits."
-msgstr "As estatísticas serão enviadas uma vez a cada N usos da web"
+msgstr "As estatísticas serão enviadas a cada N acessos à página."
 
 #. TRANS: Input field label for snapshot report URL in admin panel for snapshots.
 msgid "Report URL"
 msgstr "URL para envio"
 
 #. TRANS: Input field title for snapshot report URL in admin panel for snapshots.
-#, fuzzy
 msgid "Snapshots will be sent to this URL."
-msgstr "As estatísticas serão enviadas para esta URL"
+msgstr "As estatísticas serão enviadas para esta URL."
 
-#. TRANS: Title for button to save snapshot settings.
-#, fuzzy
+#. TRANS: Button title to save snapshot settings.
 msgid "Save snapshot settings."
-msgstr "Salvar as configurações de estatísticas"
+msgstr "Salvar configurações de estatísticas"
 
 #. TRANS: Client error displayed trying a change a subscription for a non-subscribed profile.
 msgid "You are not subscribed to that profile."
@@ -6074,28 +5784,23 @@ msgstr "Não foi possível salvar a assinatura."
 
 #. TRANS: Client error displayed when trying to approve group applicants without being a group administrator.
 msgid "You may only approve your own pending subscriptions."
-msgstr ""
+msgstr "Você só pode aprovar suas próprias assinaturas pendentes."
 
 #. TRANS: Title of the first page showing pending subscribers still awaiting approval.
 #. TRANS: %s is the name of the user.
-#, fuzzy, php-format
+#, php-format
 msgid "%s subscribers awaiting approval"
-msgstr "Membros do grupo %s"
+msgstr "Assinantes de %s aguardando aprovação"
 
 #. TRANS: Title of all but the first page showing pending subscribersmembers still awaiting approval.
 #. TRANS: %1$s is the name of the user, %2$d is the page number of the members list.
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s subscribers awaiting approval, page %2$d"
-msgstr "Membros do grupo %1$s, pág. %2$d"
+msgstr "Assinantes de %1$s aguardando aprovação, pág. %2$d"
 
 #. TRANS: Page notice for group members page.
-#, fuzzy
 msgid "A list of users awaiting approval to subscribe to you."
-msgstr "Uma lista dos usuários deste grupo."
-
-#. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
-msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
-msgstr "Não é possível assinar um perfil OMB 0.1 remoto com essa ação."
+msgstr "Lista de usuários aguardando aprovação para assinarem você."
 
 #. TRANS: Page title when subscription succeeded.
 msgid "Subscribed"
@@ -6107,9 +5812,8 @@ msgid "You must be logged in to unsubscribe from a list."
 msgstr "Você deve estar autenticado para criar um grupo."
 
 #. TRANS: Client error displayed when trying to perform an action without providing an ID.
-#, fuzzy
 msgid "No ID given."
-msgstr "Nenhum argumento de ID."
+msgstr "Não foi fornecida nenhuma ID."
 
 #. TRANS: Server error displayed subscribing to a list fails.
 #. TRANS: %1$s is a user nickname, %2$s is a list, %3$s is the error message (no period).
@@ -6194,13 +5898,12 @@ msgstr "Estas são as pessoas cujas mensagens %s acompanha."
 #. TRANS: This message contains Markdown URLs. The link description is between
 #. TRANS: square brackets, and the link between parentheses. Do not separate "]("
 #. TRANS: and do not change the URL part.
-#, php-format
+#, fuzzy, php-format
 msgid ""
 "You're not listening to anyone's notices right now, try subscribing to "
 "people you know. Try [people search](%%action.peoplesearch%%), look for "
 "members in groups you're interested in and in our [featured users](%%action."
-"featured%%). If you're a [Twitter user](%%action.twittersettings%%), you can "
-"automatically subscribe to people you already follow there."
+"featured%%)."
 msgstr ""
 "Você não está acompanhando as mensagens de ninguém. Experimente assinar "
 "algumas pessoas que você conhece. Você pode [procurar por pessoas](%%action."
@@ -6218,9 +5921,9 @@ msgid "%s is not listening to anyone."
 msgstr "%s não está acompanhando ninguém."
 
 #. TRANS: Atom feed title. %s is a profile nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "Subscription feed for %s (Atom)"
-msgstr "Fonte de mensagens de %s (Atom)"
+msgstr "Fonte de notícias de %s (Atom)"
 
 #. TRANS: Checkbox label for enabling IM messages for a profile in a subscriptions list.
 #, fuzzy
@@ -6238,6 +5941,12 @@ msgstr "SMS"
 msgid "Notices tagged with %1$s, page %2$d"
 msgstr "Mensagens etiquetadas com %1$s, pág. %2$d"
 
+#. TRANS: Link label for feed on "notices with tag" page.
+#. TRANS: %s is the tag the feed is for.
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (Activity Streams JSON)"
+msgstr "Fonte de mensagens de %s (Atom)"
+
 #. TRANS: Link label for feed on "notices with tag" page.
 #. TRANS: %s is the tag the feed is for.
 #, php-format
@@ -6259,9 +5968,8 @@ msgstr "Fonte de mensagens de %s (Atom)"
 #. TRANS: Client error displayed when trying to tag a user that cannot be tagged.
 #. TRANS: Client exception thrown trying to set a tag for a user that cannot be tagged.
 #. TRANS: Error displayed when trying to tag a user that cannot be tagged.
-#, fuzzy
 msgid "You cannot tag this user."
-msgstr "Você não pode enviar mensagens para este usuário."
+msgstr "Você não pode etiquetar este usuário."
 
 #. TRANS: Title for list form when not on a profile page.
 #, fuzzy
@@ -6276,10 +5984,9 @@ msgid "List %s"
 msgstr "Limites"
 
 #. TRANS: Title for list form when an error has occurred.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Error"
-msgstr "Erro no Ajax"
+msgstr "Erro"
 
 #. TRANS: Header in list form.
 msgid "User profile"
@@ -6306,7 +6013,6 @@ msgstr ""
 "espaços."
 
 #. TRANS: Title for personal tag cloud section.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Tags"
 msgstr "Etiquetas"
@@ -6349,22 +6055,9 @@ msgstr "Cancelado"
 msgid "%1$s unsubscribed from list %2$s by %3$s"
 msgstr "Assinantes de %1$s, pág. %2$d"
 
-#. TRANS: Client error displayed when trying to update profile with an incompatible license.
-#. TRANS: %1$s is the license incompatible with site license %2$s.
-#. TRANS: Exception thrown when licenses are not compatible for an authorisation request.
-#. TRANS: %1$s is the license for the listenee, %2$s is the license for "this" StatusNet site.
-#, fuzzy, php-format
-msgid ""
-"Listenee stream license \"%1$s\" is not compatible with site license \"%2$s"
-"\"."
-msgstr ""
-"A licença '%1$s' do fluxo do usuário não é compatível com a licença '%2$s' "
-"do site."
-
 #. TRANS: Title of URL settings tab in profile settings.
-#, fuzzy
 msgid "URL settings"
-msgstr "Configurações do MI"
+msgstr "Configurações da URL"
 
 #. TRANS: Instructions for tab "Other" in user profile settings.
 msgid "Manage various other options."
@@ -6377,13 +6070,12 @@ msgid " (free service)"
 msgstr " (serviço livre)"
 
 #. TRANS: Default value for URL shortening settings.
-#, fuzzy
 msgid "[none]"
-msgstr "Nenhuma"
+msgstr "[nenhum]"
 
 #. TRANS: Default value for URL shortening settings.
 msgid "[internal]"
-msgstr ""
+msgstr "[internal]"
 
 #. TRANS: Label for dropdown with URL shortener services.
 msgid "Shorten URLs with"
@@ -6395,38 +6087,41 @@ msgstr "Serviço de encolhimento automático a ser utilizado."
 
 #. TRANS: Field label in URL settings in profile.
 msgid "URL longer than"
-msgstr ""
+msgstr "URLs maiores que"
 
 #. TRANS: Field title in URL settings in profile.
 msgid "URLs longer than this will be shortened, 0 means always shorten."
 msgstr ""
+"URLs maiores esse valor serão encolhidas. 0 significa que sermpre serão "
+"encolhidas."
 
 #. TRANS: Field label in URL settings in profile.
 msgid "Text longer than"
-msgstr ""
+msgstr "Texto maior que"
 
 #. TRANS: Field title in URL settings in profile.
 msgid ""
 "URLs in notices longer than this will be shortened, 0 means always shorten."
 msgstr ""
+"URLs em mensagens maiores que esse valor serão encolhidas. 0 significa que "
+"sermpre serão encolhidas."
 
 #. TRANS: Form validation error for form "Other settings" in user profile.
 msgid "URL shortening service is too long (maximum 50 characters)."
 msgstr "O serviço de encolhimento de URL é muito extenso (máx. 50 caracteres)."
 
 #. TRANS: Client exception thrown when the maximum URL settings value is invalid in profile URL settings.
-#, fuzzy
 msgid "Invalid number for maximum URL length."
-msgstr "O conteúdo da mensagem é inválido."
+msgstr "O tamanho máximo definido para a URL é um número inválido."
 
 #. TRANS: Client exception thrown when the maximum notice length settings value is invalid in profile URL settings.
-#, fuzzy
 msgid "Invalid number for maximum notice length."
-msgstr "O conteúdo da mensagem é inválido."
+msgstr "O tamanho máximo definido para a mensagem é um número inválido."
 
 #. TRANS: Server exception thrown in profile URL settings when preferences could not be saved.
 msgid "Error saving user URL shortening preferences."
 msgstr ""
+"Ocorreu um erro durante o salvamento das preferências de encolhimento de URL."
 
 #. TRANS: User admin panel title.
 msgctxt "TITLE"
@@ -6448,12 +6143,11 @@ msgstr ""
 
 #. TRANS: Client error displayed when trying to set a non-existing user as default subscription for new
 #. TRANS: users in user admin panel. %1$s is the invalid nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "Invalid default subscripton: \"%1$s\" is not a user."
-msgstr "Assinatura padrão inválida: '%1$s' não é um usuário."
+msgstr "Assinatura padrão inválida: \"%1$s\" não é um usuário."
 
 #. TRANS: Fieldset legend in user administration panel.
-#, fuzzy
 msgctxt "LEGEND"
 msgid "Profile"
 msgstr "Perfil"
@@ -6498,162 +6192,9 @@ msgstr "Convites habilitados"
 msgid "Whether to allow users to invite new users."
 msgstr "Define se os usuários podem ou não convidar novos usuários."
 
-#. TRANS: Title for button to save user settings in user admin panel.
-#, fuzzy
+#. TRANS: Button title to save user settings in user admin panel.
 msgid "Save user settings."
-msgstr "Salvar as configurações de usuário"
-
-#. TRANS: Page title.
-msgid "Authorize subscription"
-msgstr "Autorizar a assinatura"
-
-#. TRANS: Page notice on "Authorize subscription" page.
-#, fuzzy
-msgid ""
-"Please check these details to make sure that you want to subscribe to this "
-"user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
-"click \"Reject\"."
-msgstr ""
-"Por favor, verifique estes detalhes para ter certeza que você quer assinar "
-"as mensagens deste usuário. Se você não solicitou assinar as mensagens de "
-"alguém, clique em \"Recusar\"."
-
-#. TRANS: Button text on Authorise Subscription page.
-#. TRANS: Submit button text to accept a group membership request on approve group form.
-#. TRANS: Submit button text to accept a subscription request on approve sub form.
-#, fuzzy
-msgctxt "BUTTON"
-msgid "Accept"
-msgstr "Aceitar"
-
-#. TRANS: Title for button on Authorise Subscription page.
-#. TRANS: Button title to subscribe to a user.
-#, fuzzy
-msgid "Subscribe to this user."
-msgstr "Assinar este usuário"
-
-#. TRANS: Button text on Authorise Subscription page.
-#. TRANS: Submit button text to reject a group membership request on approve group form.
-#. TRANS: Submit button text to reject a subscription request on approve sub form.
-#, fuzzy
-msgctxt "BUTTON"
-msgid "Reject"
-msgstr "Recusar"
-
-#. TRANS: Title for button on Authorise Subscription page.
-#, fuzzy
-msgid "Reject this subscription."
-msgstr "Recusar esta assinatura"
-
-#. TRANS: Client error displayed for an empty authorisation request.
-msgid "No authorization request!"
-msgstr "Nenhum pedido de autorização!"
-
-#. TRANS: Accept message header from Authorise subscription page.
-msgid "Subscription authorized"
-msgstr "A assinatura foi autorizada"
-
-#. TRANS: Accept message text from Authorise subscription page.
-msgid ""
-"The subscription has been authorized, but no callback URL was passed. Check "
-"with the site's instructions for details on how to authorize the "
-"subscription. Your subscription token is:"
-msgstr ""
-"A 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 é:"
-
-#. TRANS: Reject message header from Authorise subscription page.
-msgid "Subscription rejected"
-msgstr "A assinatura foi recusada"
-
-#. TRANS: Reject message from Authorise subscription page.
-msgid ""
-"The subscription has been rejected, but no callback URL was passed. Check "
-"with the site's instructions for details on how to fully reject the "
-"subscription."
-msgstr ""
-"A assinatura foi rejeitada, mas não foi informada nenhuma URL de retorno. "
-"Verifique as instruções do site para detalhes sobre como rejeitar "
-"completamente a assinatura."
-
-#. TRANS: Exception thrown when no valid user is found for an authorisation request.
-#. TRANS: %s is a listener URI.
-#, fuzzy, php-format
-msgid "Listener URI \"%s\" not found here."
-msgstr "A URI ‘%s’ do usuário não foi encontrada aqui."
-
-#. TRANS: Exception thrown when listenee URI is too long for an authorisation request.
-#. TRANS: %s is a listenee URI.
-#, fuzzy, php-format
-msgid "Listenee URI \"%s\" is too long."
-msgstr "A URI ‘%s’ do usuário é muito extensa."
-
-#. TRANS: Exception thrown when listenee URI is a local user for an authorisation request.
-#. TRANS: %s is a listenee URI.
-#, fuzzy, php-format
-msgid "Listenee URI \"%s\" is a local user."
-msgstr "A URI ‘%s’ é de um usuário local."
-
-#. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
-#. TRANS: %s is a profile URL.
-#, fuzzy, php-format
-msgid "Profile URL \"%s\" is for a local user."
-msgstr "A URL ‘%s’ do perfil é de um usuário local."
-
-#. TRANS: Exception thrown when avatar URL is invalid for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#, fuzzy, php-format
-msgid "Avatar URL \"%s\" is not valid."
-msgstr "A URL ‘%s’ do avatar não é válida."
-
-#. TRANS: Exception thrown when avatar URL could not be read for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#, fuzzy, php-format
-msgid "Cannot read avatar URL \"%s\"."
-msgstr "Não é possível ler a URL '%s' do avatar."
-
-#. TRANS: Exception thrown when avatar URL return an invalid image type for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#, fuzzy, php-format
-msgid "Wrong image type for avatar URL \"%s\"."
-msgstr "Tipo de imagem errado para a URL '%s' do avatar."
-
-#. TRANS: Title for profile design page.
-#. TRANS: Page title for profile design page.
-msgid "Profile design"
-msgstr "Aparência do perfil"
-
-#. TRANS: Instructions for Profile design page.
-#. TRANS: Instructions for profile design page.
-msgid ""
-"Customize the way your profile looks with a background image and a colour "
-"palette of your choice."
-msgstr ""
-"Personalize a aparência do seu perfil, com uma imagem de fundo e uma paleta "
-"de cores da sua preferência."
-
-#. TRANS: Succes message on Profile design page when finding an easter egg.
-msgid "Enjoy your hotdog!"
-msgstr "Aproveite o seu cachorro-quente!"
-
-#. TRANS: Form legend on Profile design page.
-#, fuzzy
-msgid "Design settings"
-msgstr "Salvar as configurações do site"
-
-#. TRANS: Checkbox label on Profile design page.
-msgid "View profile designs"
-msgstr "Visualizar aparências do perfil"
-
-#. TRANS: Title for checkbox on Profile design page.
-msgid "Show or hide profile designs."
-msgstr "Exibir ou esconder as aparências do perfil."
-
-#. TRANS: Form legend on Profile design page for form to choose a background image.
-#, fuzzy
-msgid "Background file"
-msgstr "Fundo"
+msgstr "Salvar as configurações de usuário."
 
 #. TRANS: Page title for all but the first page of groups for a user.
 #. TRANS: %1$s is a nickname, %2$d is a page number.
@@ -6676,8 +6217,7 @@ msgstr "%s não é membro de nenhum grupo."
 #, php-format
 msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
 msgstr ""
-"Experimente [procurar por grupos](%%action.groupsearch%%) e associar-se à "
-"eles."
+"Experimente [procurar por grupos](%%action.groupsearch%%) e entrar neles."
 
 #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
 #. TRANS: Message is used as a subtitle in atom group notice feed.
@@ -6695,9 +6235,9 @@ msgstr "StatusNet %s"
 
 #. TRANS: Content part of StatusNet version page.
 #. TRANS: %1$s is the engine name (StatusNet) and %2$s is the StatusNet version.
-#, php-format
+#, fuzzy, php-format
 msgid ""
-"This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, "
+"This site is powered by %1$s version %2$s, Copyright 2008-2011 StatusNet, "
 "Inc. and contributors."
 msgstr ""
 "Este site funciona sobre %1$s versão %2$s, Copyright 2008-2010 StatusNet, "
@@ -6712,11 +6252,12 @@ msgid "License"
 msgstr "Licença"
 
 #. TRANS: Content part of StatusNet version page.
+#, fuzzy
 msgid ""
 "StatusNet is free software: you can redistribute it and/or modify it under "
 "the terms of the GNU Affero General Public License as published by the Free "
 "Software Foundation, either version 3 of the License, or (at your option) "
-"any later version. "
+"any later version."
 msgstr ""
 "StatusNet é um software livre: você pode redistribui-lo e/ou modificá-lo sob "
 "os termos da GNU Affero General Public License, conforme publicado pela Free "
@@ -6724,11 +6265,12 @@ msgstr ""
 "versão posterior. "
 
 #. TRANS: Content part of StatusNet version page.
+#, fuzzy
 msgid ""
 "This program is distributed in the hope that it will be useful, but WITHOUT "
 "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
 "FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License "
-"for more details. "
+"for more details."
 msgstr ""
 "Este programa é distribuído na esperança de ser útil, mas NÃO POSSUI "
 "QUALQUER GARANTIA, nem mesmo a garantia implícita de COMERCIALIZAÇÃO ou "
@@ -6750,25 +6292,21 @@ msgid "Plugins"
 msgstr "Plugins"
 
 #. TRANS: Column header for plugins table on version page.
-#, fuzzy
 msgctxt "HEADER"
 msgid "Name"
 msgstr "Nome"
 
 #. TRANS: Column header for plugins table on version page.
-#, fuzzy
 msgctxt "HEADER"
 msgid "Version"
 msgstr "Versão"
 
 #. TRANS: Column header for plugins table on version page.
-#, fuzzy
 msgctxt "HEADER"
 msgid "Author(s)"
 msgstr "Autor(es)"
 
 #. TRANS: Column header for plugins table on version page.
-#, fuzzy
 msgctxt "HEADER"
 msgid "Description"
 msgstr "Descrição"
@@ -6792,16 +6330,26 @@ msgstr "Não é possível processar a URL '$s'"
 msgid "Robin thinks something is impossible."
 msgstr "o Robin acha que algo é impossível."
 
-#. TRANS: Message given if an upload is larger than the configured maximum.
-#. TRANS: %1$d is the byte limit for uploads, %2$d is the byte count for the uploaded file.
-#. TRANS: %1$s is used for plural.
+#. TRANS: Message used to be inserted as %2$s in  the text "No file may
+#. TRANS: be larger than %1$d byte and the file you sent was %2$s.".
+#. TRANS: %1$d is the number of bytes of an uploaded file.
 #, php-format
+msgid "%1$d byte"
+msgid_plural "%1$d bytes"
+msgstr[0] ""
+msgstr[1] ""
+
+#. TRANS: Message given if an upload is larger than the configured maximum.
+#. TRANS: %1$d (used for plural) is the byte limit for uploads,
+#. TRANS: %2$s is the proper form of "n bytes". This is the only ways to have
+#. TRANS: gettext support multiple plurals in the same message, unfortunately...
+#, fuzzy, php-format
 msgid ""
-"No file may be larger than %1$d byte and the file you sent was %2$d bytes. "
-"Try to upload a smaller version."
+"No file may be larger than %1$d byte and the file you sent was %2$s. Try to "
+"upload a smaller version."
 msgid_plural ""
-"No file may be larger than %1$d bytes and the file you sent was %2$d bytes. "
-"Try to upload a smaller version."
+"No file may be larger than %1$d bytes and the file you sent was %2$s. Try to "
+"upload a smaller version."
 msgstr[0] ""
 "Nenhum arquivo pode ter mais de %1$d byte e o que você enviou tinha %2$d "
 "bytes. Tente enviar uma versão menor."
@@ -6819,11 +6367,11 @@ msgstr[1] "Um arquivo deste tamanho excederá a sua conta de %d bytes."
 
 #. TRANS: Message given id an upload would exceed a user's monthly quota.
 #. TRANS: $d (number) is the monthly user quota in bytes and is used for plural.
-#, fuzzy, php-format
+#, php-format
 msgid "A file this large would exceed your monthly quota of %d byte."
 msgid_plural "A file this large would exceed your monthly quota of %d bytes."
-msgstr[0] "Um arquivo deste tamanho excederá a sua conta mensal de %d bytes."
-msgstr[1] "Um arquivo deste tamanho excederá a sua conta mensal de %d bytes."
+msgstr[0] "Um arquivo deste tamanho excederia a sua conta mensal de %d byte."
+msgstr[1] "Um arquivo deste tamanho excederia a sua conta mensal de %d bytes."
 
 #. TRANS: Client exception thrown if a file upload does not have a valid name.
 msgid "Invalid filename."
@@ -6833,17 +6381,17 @@ msgstr "Nome de arquivo inválido."
 #. TRANS: %s is the invalid profile ID.
 #, php-format
 msgid "Profile ID %s is invalid."
-msgstr ""
+msgstr "O ID de perfil %s é inválido."
 
 #. TRANS: Exception thrown providing an invalid group ID.
 #. TRANS: %s is the invalid group ID.
-#, fuzzy, php-format
+#, php-format
 msgid "Group ID %s is invalid."
-msgstr "Erro ao salvar usuário; inválido."
+msgstr "O ID de grupo %s é inválido."
 
 #. TRANS: Exception thrown when joining a group fails.
 msgid "Group join failed."
-msgstr "Não foi possível se unir ao grupo."
+msgstr "Não foi possível entrar no grupo."
 
 #. TRANS: Exception thrown when trying to leave a group the user is not a member of.
 msgid "Not part of group."
@@ -6861,7 +6409,7 @@ msgstr "Entrar"
 #. TRANS: %1$s is the member name, %2$s is the subscribed group's name.
 #, php-format
 msgid "%1$s has joined group %2$s."
-msgstr ""
+msgstr "%1$s entrou no grupo %2$s."
 
 #. TRANS: Server exception thrown when updating a local group fails.
 msgid "Could not update local group."
@@ -6873,6 +6421,11 @@ msgstr "Não foi possível atualizar o grupo local."
 msgid "Could not create login token for %s"
 msgstr "Não foi possível criar o token de autenticação para %s"
 
+#. TRANS: Exception thrown when a program code class (%s) cannot be instantiated.
+#, fuzzy, php-format
+msgid "Cannot instantiate class %s."
+msgstr "Não é possível salvar a nova senha."
+
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.
 msgid "No database name or DSN found anywhere."
 msgstr "Não foi encontrado nenhum nome de base de dados ou DSN."
@@ -6896,9 +6449,9 @@ msgid "No such profile (%1$d) for notice (%2$d)."
 msgstr "Não existe o perfil (%1$d) para a nota (%2$d)."
 
 #. TRANS: Server exception. %s are the error details.
-#, fuzzy, php-format
+#, php-format
 msgid "Database error inserting hashtag: %s."
-msgstr "Erro no banco de dados durante a inserção da hashtag: %s"
+msgstr "Erro no banco de dados durante a inserção da etiqueta: %s."
 
 #. TRANS: Client exception thrown if a notice contains too many characters.
 msgid "Problem saving notice. Too long."
@@ -6928,24 +6481,21 @@ msgid "You are banned from posting notices on this site."
 msgstr "Você está proibido de publicar mensagens neste site."
 
 #. TRANS: Client exception thrown in notice when trying to repeat a missing or deleted notice.
-#, fuzzy
 msgid "Cannot repeat; original notice is missing or deleted."
-msgstr "Você não pode repetir a sua própria mensagem."
+msgstr ""
+"Não é possível repetir; a mensagem original está perdida ou foi apagada."
 
 #. TRANS: Client error displayed when trying to repeat an own notice.
-#, fuzzy
 msgid "You cannot repeat your own notice."
 msgstr "Você não pode repetir sua própria mensagem."
 
 #. TRANS: Client error displayed when trying to repeat a non-public notice.
-#, fuzzy
 msgid "Cannot repeat a private notice."
-msgstr "Você não pode repetir a sua própria mensagem."
+msgstr "Você não pode repetir uma mensagem privada."
 
 #. TRANS: Client error displayed when trying to repeat a notice you cannot access.
-#, fuzzy
 msgid "Cannot repeat a notice you cannot read."
-msgstr "Você não pode repetir a sua própria mensagem."
+msgstr "Você não pode repetir uma mensagem que você não pode ler.."
 
 #. TRANS: Client error displayed when trying to repeat an already repeated notice.
 msgid "You already repeated that notice."
@@ -6953,19 +6503,18 @@ msgstr "Você já repetiu essa mensagem."
 
 #. TRANS: Client error displayed when trying to reply to a notice a the target has no access to.
 #. TRANS: %1$s is a user nickname, %2$d is a notice ID (number).
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s has no access to notice %2$d."
-msgstr "O usuário não tem nenhuma \"última mensagem\"."
+msgstr "%1$s não tem acesso à mensagem %2$d."
 
 #. TRANS: Server exception thrown when a notice cannot be saved.
 #. TRANS: Server exception thrown when a notice cannot be updated.
 msgid "Problem saving notice."
-msgstr "Problema no salvamento da mensagem."
+msgstr "Ocorreu um problema no salvamento da mensagem."
 
 #. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#, fuzzy
 msgid "Bad type provided to saveKnownGroups."
-msgstr "O tipo fornecido ao método saveKnownGroups é incorreto"
+msgstr "O tipo fornecido a saveKnownGroups é incorreto."
 
 #. TRANS: Server exception thrown when an update for a group inbox fails.
 msgid "Problem saving group inbox."
@@ -6979,7 +6528,7 @@ msgstr "RT @%1$s %2$s"
 
 #. TRANS: Full name of a profile or group (%1$s) followed by nickname (%2$s) in parentheses.
 #. TRANS: Full name of a profile or group followed by nickname in parens
-#, fuzzy, php-format
+#, php-format
 msgctxt "FANCYNAME"
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
@@ -7000,32 +6549,27 @@ msgstr ""
 
 #. TRANS: Server exception.
 msgid "The tag you are trying to rename to already exists."
-msgstr ""
+msgstr "Você está tentando renomear a etiqueta para um nome que já existe."
 
 #. TRANS: Server exception saving new tag without having a tagger specified.
-#, fuzzy
 msgid "No tagger specified."
-msgstr "Não foi especificado nenhum grupo."
+msgstr "Não foi especificado nenhum etiquetador."
 
 #. TRANS: Server exception saving new tag without having a tag specified.
-#, fuzzy
 msgid "No tag specified."
-msgstr "Não foi especificado nenhum grupo."
+msgstr "Não foi especificado nenhuma etiqueta."
 
 #. TRANS: Server exception saving new tag.
-#, fuzzy
 msgid "Could not create profile tag."
-msgstr "Não foi possível salvar o perfil."
+msgstr "Não foi possível criar a etiqueta de perfil."
 
 #. TRANS: Server exception saving new tag.
-#, fuzzy
 msgid "Could not set profile tag URI."
-msgstr "Não foi possível salvar o perfil."
+msgstr "Não foi possível definir a URI da etiqueta de perfil."
 
 #. TRANS: Server exception saving new tag.
-#, fuzzy
 msgid "Could not set profile tag mainpage."
-msgstr "Não foi possível salvar o perfil."
+msgstr "Não foi possível definir a página principal da etiqueta de perfil."
 
 #. TRANS: Client exception thrown trying to set more tags than allowed.
 #, php-format
@@ -7033,13 +6577,17 @@ msgid ""
 "You already have created %d or more tags which is the maximum allowed number "
 "of tags. Try using or deleting some existing tags."
 msgstr ""
+"Você já criou %d ou mais etiquetas, atingindo o número máximo de etiquetas "
+"permitidas. Experimente usar ou excluir algumas já existentes."
 
 #. TRANS: Client exception thrown when trying to add more people than allowed to a list.
-#, php-format
+#, fuzzy, php-format
 msgid ""
 "You already have %1$d or more people in list %2$s, which is the maximum "
-"allowed number.Try unlisting others first."
+"allowed number. Try unlisting others first."
 msgstr ""
+"Você já criou %d ou mais etiquetas, atingindo o número máximo de etiquetas "
+"permitidas. Experimente usar ou excluir algumas já existentes."
 
 #. TRANS: Exception thrown when inserting a list subscription in the database fails.
 #, fuzzy
@@ -7060,7 +6608,6 @@ msgid "Unable to save tag."
 msgstr "Não foi salvar gravar a categoria."
 
 #. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
-#. TRANS: Error message displayed to a banned user when they try to subscribe.
 msgid "You have been banned from subscribing."
 msgstr "Você está proibido de assinar."
 
@@ -7080,25 +6627,20 @@ msgstr "Não assinado!"
 msgid "Could not delete self-subscription."
 msgstr "Não foi possível salvar a assinatura."
 
-#. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
-msgid "Could not delete subscription OMB token."
-msgstr "Não foi possível salvar a assinatura."
-
 #. TRANS: Exception thrown when a subscription could not be deleted on the server.
 msgid "Could not delete subscription."
 msgstr "Não foi possível salvar a assinatura."
 
 #. TRANS: Activity title when subscribing to another person.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Follow"
-msgstr "Permitir"
+msgstr "Acompanhar"
 
 #. TRANS: Notification given when one person starts following another.
 #. TRANS: %1$s is the subscriber, %2$s is the subscribed.
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s is now following %2$s."
-msgstr "%1$s agora está acompanhando suas mensagens no %2$s."
+msgstr "%1$s agora está acompanhando %2$s."
 
 #. TRANS: Notice given on user registration.
 #. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
@@ -7108,7 +6650,7 @@ msgstr "Bem vindo(a) a %1$s, @%2$s!"
 
 #. TRANS: Exception thrown when trying view "repeated to me".
 msgid "Not implemented since inbox change."
-msgstr ""
+msgstr "Não implementado desde a mudança da caixa de entrada."
 
 #. TRANS: Server exception.
 msgid "No single user defined for single-user mode."
@@ -7116,7 +6658,21 @@ msgstr "Nenhum usuário definido para o modo de usuário único."
 
 #. TRANS: Server exception.
 msgid "Single-user mode code called when not enabled."
+msgstr "Código de modo mono-usuário requisitado, mas sem estar habilitado."
+
+#. TRANS: Information on password recovery form if no known username or e-mail address was specified.
+msgid "No user with that email address or username."
 msgstr ""
+"Não foi encontrado nenhum usuário com essa identificação ou endereço de "
+"email."
+
+#. TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.
+msgid "No registered email address for that user."
+msgstr "Nenhum endereço de e-mail registrado para esse usuário."
+
+#. TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.
+msgid "Error saving address confirmation."
+msgstr "Erro ao salvar o endereço de confirmação."
 
 #. TRANS: Server exception thrown when creating a group failed.
 msgid "Could not create group."
@@ -7136,21 +6692,21 @@ msgstr "Não foi possível salvar a informação do grupo local."
 
 #. TRANS: Exception thrown when an account could not be located when it should be moved.
 #. TRANS: %s is the remote site.
-#, fuzzy, php-format
+#, php-format
 msgid "Cannot locate account %s."
-msgstr "Você não pode excluir usuários."
+msgstr "Não foi possível localizar a conta %s."
 
 #. TRANS: Exception thrown when a service document could not be located account move.
 #. TRANS: %s is the remote site.
 #, php-format
 msgid "Cannot find XRD for %s."
-msgstr ""
+msgstr "Não foi possível encontrar XRD para %s."
 
 #. TRANS: Exception thrown when an account could not be located when it should be moved.
 #. TRANS: %s is the remote site.
 #, php-format
 msgid "No AtomPub API service for %s."
-msgstr ""
+msgstr "Não foi encontrado nenhum serviço de API para AtomPub em %s."
 
 #. TRANS: H2 for user actions in a profile.
 #. TRANS: H2 for entity actions in a profile.
@@ -7162,23 +6718,19 @@ msgid "User deletion in progress..."
 msgstr "Exclusão do usuário em andamento..."
 
 #. TRANS: Link title for link on user profile.
-#, fuzzy
 msgid "Edit profile settings."
-msgstr "Editar as configurações do perfil"
+msgstr "Editar as configurações do perfil."
 
 #. TRANS: Link text for link on user profile.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Edit"
 msgstr "Editar"
 
 #. TRANS: Link title for link on user profile.
-#, fuzzy
 msgid "Send a direct message to this user."
-msgstr "Enviar uma mensagem para este usuário."
+msgstr "Enviar uma mensagem direta para este usuário."
 
 #. TRANS: Link text for link on user profile.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Message"
 msgstr "Mensagem"
@@ -7213,10 +6765,9 @@ msgstr "Página sem título"
 #. TRANS: Localized tooltip for '...' expansion button on overlong remote messages.
 msgctxt "TOOLTIP"
 msgid "Show more"
-msgstr "Mostrar mais"
+msgstr "Exibir mais"
 
 #. TRANS: Inline reply form submit button: submits a reply comment.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Reply"
 msgstr "Responder"
@@ -7224,13 +6775,12 @@ msgstr "Responder"
 #. TRANS: Placeholder text for inline reply form. Clicking in this box will turn it into a mini notice form.
 #. TRANS: Field label for reply mini form.
 msgid "Write a reply..."
-msgstr "Escrever uma resposta..."
+msgstr "Escreva uma resposta..."
 
 #. TRANS: Tab on the notice form.
-#, fuzzy
 msgctxt "TAB"
 msgid "Status"
-msgstr "StatusNet"
+msgstr "Mensagem"
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
 #. TRANS: Text between [] is a link description, text between () is the link itself.
@@ -7304,57 +6854,54 @@ msgstr ""
 "inteiro."
 
 #. TRANS: Client exception thrown when using an unknown verb for the activity importer.
-#, fuzzy, php-format
+#, php-format
 msgid "Unknown verb: \"%s\"."
-msgstr "Idioma \"%s\" desconhecido."
+msgstr "O verbo \"%s\" é desconhecido."
 
 #. TRANS: Client exception thrown when trying to force a subscription for an untrusted user.
 msgid "Cannot force subscription for untrusted user."
-msgstr ""
+msgstr "Não é possível forçar a assinatura para usuários não confiáveis."
 
 #. TRANS: Client exception thrown when trying to force a remote user to subscribe.
-#, fuzzy
 msgid "Cannot force remote user to subscribe."
-msgstr "Especifique o nome do usuário que será assinado."
+msgstr "Não é possível forçar um usuário remoto a assinar."
 
 #. TRANS: Client exception thrown when trying to subscribe to an unknown profile.
-#, fuzzy
 msgid "Unknown profile."
-msgstr "Tipo de arquivo desconhecido"
+msgstr "Perfil desconhecido."
 
 #. TRANS: Client exception thrown when trying to import an event not related to the importing user.
 msgid "This activity seems unrelated to our user."
-msgstr ""
+msgstr "Esta atividade aparentemente não está relacionada ao nosso usuário."
 
 #. TRANS: Client exception thrown when trying to join a remote group that is not a group.
 msgid "Remote profile is not a group!"
-msgstr ""
+msgstr "O perfil remoto não é um grupo!"
 
 #. TRANS: Client exception thrown when trying to join a group the importing user is already a member of.
-#, fuzzy
 msgid "User is already a member of this group."
-msgstr "Você já é membro desse grupo."
+msgstr "O usuário já é membro deste grupo."
 
 #. TRANS: Client exception thrown when trying to import a notice by another user.
 #. TRANS: %1$s is the source URI of the notice, %2$s is the URI of the author.
 #, php-format
 msgid "Already know about notice %1$s and  it has a different author %2$s."
-msgstr ""
+msgstr "A mensagem %1$s já é conhecida e possui um autor diferente %2$s."
 
 #. TRANS: Client exception thrown when trying to overwrite the author information for a non-trusted user during import.
 msgid "Not overwriting author info for non-trusted user."
-msgstr ""
+msgstr "A informação de autor não é sobrescrita para usuários não confiáveis."
 
 #. TRANS: Client exception thrown when trying to import a notice without content.
 #. TRANS: %s is the notice URI.
-#, fuzzy, php-format
+#, php-format
 msgid "No content for notice %s."
-msgstr "Encontre conteúdo de mensagens"
+msgstr "A mensagem %s não possui conteúdo."
 
 #. TRANS: Exception thrown if a non-existing user is provided. %s is a user ID.
-#, fuzzy, php-format
+#, php-format
 msgid "No such user \"%s\"."
-msgstr "Este usuário não existe."
+msgstr "O usuário \"%s\" não existe."
 
 #. TRANS: Client exception thrown when post to collection fails with a 400 status.
 #. TRANS: %1$s is a URL, %2$s is the status, %s$s is the fail reason.
@@ -7362,10 +6909,10 @@ msgstr "Este usuário não existe."
 #. TRANS: %1$s is a URL, %2$s is the status, %s$s is the fail reason.
 #. TRANS: Exception thrown when post to collection fails with a status that is not handled.
 #. TRANS: %1$s is a URL, %2$s is the status, %s$s is the fail reason.
-#, fuzzy, php-format
+#, php-format
 msgctxt "URLSTATUSREASON"
 msgid "%1$s %2$s %3$s"
-msgstr "%1$s - %2$s"
+msgstr "%1$s %2$s %3$s"
 
 #. TRANS: Client exception thrown when there is no source attribute.
 msgid "Can't handle remote content yet."
@@ -7395,29 +6942,13 @@ msgstr "showForm() não implementado."
 msgid "saveSettings() not implemented."
 msgstr "saveSettings() não implementado."
 
-#. TRANS: Client error message thrown if design settings could not be deleted in
-#. TRANS: the admin panel Design.
-msgid "Unable to delete design setting."
-msgstr "Não foi possível excluir as configurações da aparência."
-
 #. TRANS: Header in administrator navigation panel.
-#. TRANS: Header in settings navigation panel.
 #, fuzzy
 msgctxt "HEADER"
 msgid "Home"
 msgstr "Site"
 
-#. TRANS: Menu item in administrator navigation panel.
-#. TRANS: Menu item in default local navigation panel.
-#. TRANS: Menu item in personal group navigation menu.
-#. TRANS: Menu item in settings navigation panel.
-#, fuzzy
-msgctxt "MENU"
-msgid "Home"
-msgstr "Site"
-
 #. TRANS: Header in administrator navigation panel.
-#, fuzzy
 msgctxt "HEADER"
 msgid "Admin"
 msgstr "Admin"
@@ -7431,23 +6962,11 @@ msgctxt "MENU"
 msgid "Site"
 msgstr "Site"
 
-#. TRANS: Menu item title in administrator navigation panel.
-msgid "Design configuration"
-msgstr "Configuração da aparência"
-
-#. TRANS: Menu item in administrator navigation panel.
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: Menu item in settings navigation panel.
-msgctxt "MENU"
-msgid "Design"
-msgstr "Aparência"
-
 #. TRANS: Menu item title in administrator navigation panel.
 msgid "User configuration"
 msgstr "Configuração do usuário"
 
 #. TRANS: Menu item in administrator navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "User"
 msgstr "Usuário"
@@ -7457,7 +6976,6 @@ msgid "Access configuration"
 msgstr "Configuração do acesso"
 
 #. TRANS: Menu item in administrator navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Access"
 msgstr "Acesso"
@@ -7467,7 +6985,6 @@ msgid "Paths configuration"
 msgstr "Configuração dos caminhos"
 
 #. TRANS: Menu item in administrator navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Paths"
 msgstr "Caminhos"
@@ -7477,7 +6994,6 @@ msgid "Sessions configuration"
 msgstr "Configuração das sessões"
 
 #. TRANS: Menu item in administrator navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Sessions"
 msgstr "Sessões"
@@ -7487,7 +7003,6 @@ msgid "Edit site notice"
 msgstr "Editar os avisos do site"
 
 #. TRANS: Menu item in administrator navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Site notice"
 msgstr "Avisos do site"
@@ -7497,28 +7012,24 @@ msgid "Snapshots configuration"
 msgstr "Configurações das estatísticas"
 
 #. TRANS: Menu item in administrator navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Snapshots"
 msgstr "Estatísticas"
 
 #. TRANS: Menu item title in administrator navigation panel.
 msgid "Set site license"
-msgstr ""
+msgstr "Definir a licença do site"
 
 #. TRANS: Menu item in administrator navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "License"
 msgstr "Licença"
 
 #. TRANS: Menu item title in administrator navigation panel.
-#, fuzzy
 msgid "Plugins configuration"
-msgstr "Configuração dos caminhos"
+msgstr "Configuração dos plugins"
 
 #. TRANS: Menu item in administrator navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Plugins"
 msgstr "Plugins"
@@ -7535,7 +7046,7 @@ msgstr "Não foi encontrado nenhuma aplicação para essa chave de consumidor."
 
 #. TRANS: Authorization exception thrown when a user without API access tries to access the API.
 msgid "Not allowed to use API."
-msgstr ""
+msgstr "Não tem permissão para usar a API."
 
 #. TRANS: OAuth exception given when an incorrect access token was given for a user.
 msgid "Bad access token."
@@ -7550,45 +7061,6 @@ msgstr "Nenhum usuário para esse código."
 msgid "Could not authenticate you."
 msgstr "Não foi possível autenticá-lo."
 
-#. TRANS: Server error displayed when trying to create an anynymous OAuth consumer.
-#, fuzzy
-msgid "Could not create anonymous consumer."
-msgstr "Não foi possível criar os apelidos."
-
-#. TRANS: Server error displayed when trying to create an anynymous OAuth application.
-#, fuzzy
-msgid "Could not create anonymous OAuth application."
-msgstr "Não foi possível criar a aplicação."
-
-#. TRANS: Exception thrown when no token association could be found.
-msgid ""
-"Could not find a profile and application associated with the request token."
-msgstr ""
-
-#. TRANS: Exception thrown when no access token can be issued.
-#, fuzzy
-msgid "Could not issue access token."
-msgstr "Não foi possível inserir a mensagem."
-
-#. TRANS: Exception thrown when a database error occurs.
-msgid "Database error inserting OAuth application user."
-msgstr ""
-"Erro no banco de dados durante a inserção do usuário da aplicativo OAuth."
-
-#. TRANS: Exception thrown when a database error occurs.
-#, fuzzy
-msgid "Database error updating OAuth application user."
-msgstr ""
-"Erro no banco de dados durante a inserção do usuário da aplicativo OAuth."
-
-#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
-msgid "Tried to revoke unknown token."
-msgstr "Tentou revogar um código desconhecido."
-
-#. TRANS: Exception thrown when an attempt is made to remove a revoked token.
-msgid "Failed to delete revoked token."
-msgstr "Falha ao eliminar código revogado."
-
 #. TRANS: Form input field label for application icon.
 msgid "Icon"
 msgstr "�cone"
@@ -7603,10 +7075,10 @@ msgstr "Nome"
 
 #. TRANS: Form input field instructions.
 #. TRANS: %d is the number of available characters for the description.
-#, fuzzy, php-format
+#, php-format
 msgid "Describe your application in %d character"
 msgid_plural "Describe your application in %d characters"
-msgstr[0] "Descreva a sua aplicação em %d caracteres"
+msgstr[0] "Descreva a sua aplicação em %d caractere"
 msgstr[1] "Descreva a sua aplicação em %d caracteres"
 
 #. TRANS: Form input field instructions.
@@ -7670,18 +7142,18 @@ msgstr ""
 "Acesso padrão para esta aplicação: somente leitura ou leitura e escrita"
 
 #. TRANS: Submit button title.
-msgid "Cancel"
-msgstr "Cancelar"
+#, fuzzy
+msgid "Cancel application changes."
+msgstr "Aplicações conectadas"
 
 #. TRANS: Submit button title.
-#. TRANS: Button text to save a list.
-msgid "Save"
-msgstr "Salvar"
+#, fuzzy
+msgid "Save application changes."
+msgstr "Nova aplicação"
 
 #. TRANS: Name for an anonymous application in application list.
-#, fuzzy
 msgid "Unknown application"
-msgstr "Ação desconhecida"
+msgstr "Aplicação desconhecida"
 
 #. TRANS: Message has a leading space and a trailing space. Used in application list.
 #. TRANS: Before this message the application name is put, behind it the organisation that manages it.
@@ -7705,21 +7177,32 @@ msgstr "Aprovado em %1$s - acesso \"%2$s\"."
 #. TRANS: %s are the first 7 characters of the access token.
 #, php-format
 msgid "Access token starting with: %s"
-msgstr ""
+msgstr "Token de acesso iniciando com: %s"
 
 #. TRANS: Button label in application list to revoke access to user data.
 msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "Revogar"
 
+#. TRANS: Submit button text to accept a group membership request on approve group form.
+#. TRANS: Submit button text to accept a subscription request on approve sub form.
+msgctxt "BUTTON"
+msgid "Accept"
+msgstr "Aceitar"
+
+#. TRANS: Submit button text to reject a group membership request on approve group form.
+#. TRANS: Submit button text to reject a subscription request on approve sub form.
+msgctxt "BUTTON"
+msgid "Reject"
+msgstr "Recusar"
+
 #. TRANS: Atom feed exception thrown when an author element does not contain a name element.
 msgid "Author element must contain a name element."
-msgstr ""
+msgstr "O elemento author deve conter um elemento name."
 
 #. TRANS: Server exception thrown when using the method setActivitySubject() in the class Atom10Feed.
-#, fuzzy
 msgid "Do not use this method!"
-msgstr "Não excluir este grupo"
+msgstr "Não use este método!"
 
 #. TRANS: Title in atom list notice feed. %1$s is a list name, %2$s is a tagger's nickname.
 #, fuzzy, php-format
@@ -7741,14 +7224,12 @@ msgid "Tags for this attachment"
 msgstr "Etiquetas para este anexo"
 
 #. TRANS: Exception thrown when a password change fails.
-#, fuzzy
 msgid "Password changing failed."
-msgstr "Não foi possível alterar a senha"
+msgstr "Não foi possível alterar a senha."
 
 #. TRANS: Exception thrown when a password change attempt fails because it is not allowed.
-#, fuzzy
 msgid "Password changing is not allowed."
-msgstr "Não é permitido alterar a senha"
+msgstr "Não é permitido alterar a senha."
 
 #. TRANS: Title for the form to block a user.
 msgid "Block"
@@ -7761,22 +7242,20 @@ msgstr "Bloquear este usuário"
 #. TRANS: Submit button text on form to cancel group join request.
 msgctxt "BUTTON"
 msgid "Cancel join request"
-msgstr ""
+msgstr "Cancelar a solicitação de entrada"
 
 #. TRANS: Button text for form action to cancel a subscription request.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Cancel subscription request"
-msgstr "Todas as assinaturas"
+msgstr "A solicitação de assinatura foi cancelada"
 
 #. TRANS: Title for command results.
 msgid "Command results"
 msgstr "Resultados do comando"
 
 #. TRANS: Title for command results.
-#, fuzzy
 msgid "AJAX error"
-msgstr "Erro no Ajax"
+msgstr "Erro no AJAX"
 
 #. TRANS: E-mail subject when a command has completed.
 #. TRANS: E-mail subject for reply to an e-mail command.
@@ -7815,13 +7294,13 @@ msgstr "Desculpe, mas esse comando ainda não foi implementado."
 
 #. TRANS: Command exception text shown when a user tries to nudge themselves.
 msgid "It does not make a lot of sense to nudge yourself!"
-msgstr "Não faz muito sentido chamar a sua própria atenção!"
+msgstr "Não faz muito sentido cutucar você mesmo!"
 
 #. TRANS: Message given having nudged another user.
 #. TRANS: %s is the nickname of the user that was nudged.
 #, php-format
 msgid "Nudge sent to %s."
-msgstr "Foi enviada a chamada de atenção para %s."
+msgstr "Você deu uma cutucada em %s."
 
 #. TRANS: User statistics text.
 #. TRANS: %1$s is the number of other user the user is subscribed to.
@@ -7838,9 +7317,8 @@ msgstr ""
 "Mensagens: %3$s"
 
 #. TRANS: Error message text shown when a favorite could not be set because it has already been favorited.
-#, fuzzy
 msgid "Could not create favorite: Already favorited."
-msgstr "Não foi possível criar a favorita."
+msgstr "Não foi possível adicionar como favorita: ela já foi adicionada."
 
 #. TRANS: Text shown when a notice has been marked as favourite successfully.
 msgid "Notice marked as fave."
@@ -7850,7 +7328,7 @@ msgstr "Mensagem marcada como favorita."
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
 #, php-format
 msgid "%1$s joined group %2$s."
-msgstr "%1$s associou-se ao grupo %2$s."
+msgstr "%1$s entrou no grupo %2$s."
 
 #. TRANS: Message given having removed a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
@@ -7862,7 +7340,7 @@ msgstr "%1$s deixou o grupo %2$s."
 #. TRANS: %1$s is the tagged user, %2$s is the error message (no punctuation).
 #, php-format
 msgid "Error tagging %1$s: %2$s"
-msgstr ""
+msgstr "Erro durante a etiquetagem de %1$s: %2$s"
 
 #. TRANS: Succes message displayed if tagging a user succeeds.
 #. TRANS: %1$s is the tagged user's nickname, %2$s is a list of tags.
@@ -7888,7 +7366,7 @@ msgstr "Etiqueta inválida: \"%s\"."
 #. TRANS: %1$s is the untagged user, %2$s is the error message (no punctuation).
 #, php-format
 msgid "Error untagging %1$s: %2$s"
-msgstr ""
+msgstr "Erro durante a remoção de etiqueta de %1$s: %2$s"
 
 #. TRANS: Succes message displayed if untagging a user succeeds.
 #. TRANS: %1$s is the untagged user's nickname, %2$s is a list of tags.
@@ -7901,7 +7379,7 @@ msgstr[1] ""
 
 #. TRANS: Whois output.
 #. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#, fuzzy, php-format
+#, php-format
 msgctxt "WHOIS"
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
@@ -7944,11 +7422,11 @@ msgstr ""
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
 #. TRANS: Message given when a status is too long. %1$s is the maximum number of characters,
 #. TRANS: %2$s is the number of characters sent (used for plural).
-#, fuzzy, php-format
+#, php-format
 msgid "Message too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Message too long - maximum is %1$d characters, you sent %2$d."
 msgstr[0] ""
-"A mensagem é muito extensa - o máximo são %1$d caracteres e você enviou %2$d."
+"A mensagem é muito extensa - o máximo é %1$d caractere e você enviou %2$d."
 msgstr[1] ""
 "A mensagem é muito extensa - o máximo são %1$d caracteres e você enviou %2$d."
 
@@ -7968,11 +7446,11 @@ msgstr "A mensagem de %s foi repetida."
 
 #. TRANS: Message given if content of a notice for a reply is too long. %1$d is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#, fuzzy, php-format
+#, php-format
 msgid "Notice too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Notice too long - maximum is %1$d characters, you sent %2$d."
 msgstr[0] ""
-"A mensagem é muito extensa - o máximo são %1$d caracteres e você enviou %2$d."
+"A mensagem é muito extensa - o máximo é %1$d caractere e você enviou %2$d."
 msgstr[1] ""
 "A mensagem é muito extensa - o máximo são %1$d caracteres e você enviou %2$d."
 
@@ -8089,163 +7567,150 @@ msgstr[0] "Você é membro deste grupo:"
 msgstr[1] "Você é membro destes grupos:"
 
 #. TRANS: Header line of help text for commands.
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "Commands:"
-msgstr "Resultados do comando"
+msgstr "Comandos:"
 
 #. TRANS: Help message for IM/SMS command "on".
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "turn on notifications"
-msgstr "Não é possível ligar a notificação."
+msgstr "habilita as notificações"
 
 #. TRANS: Help message for IM/SMS command "off".
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "turn off notifications"
-msgstr "Não é possível desligar a notificação."
+msgstr "desabilita as notificações"
 
 #. TRANS: Help message for IM/SMS command "help".
 msgctxt "COMMANDHELP"
 msgid "show this help"
-msgstr ""
+msgstr "exibe essa ajuda"
 
 #. TRANS: Help message for IM/SMS command "follow <nickname>".
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "subscribe to user"
-msgstr "Assinar este usuário"
+msgstr "assina o usuário"
 
 #. TRANS: Help message for IM/SMS command "groups".
 msgctxt "COMMANDHELP"
 msgid "lists the groups you have joined"
-msgstr ""
+msgstr "lista os grupos dos quais você faz parte"
 
 #. TRANS: Help message for IM/SMS command "tag".
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "tag a user"
-msgstr "Etiquetar o usuário"
+msgstr "etiqueta um usuário"
 
 #. TRANS: Help message for IM/SMS command "untag".
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "untag a user"
-msgstr "Etiquetar o usuário"
+msgstr "remove a etiqueta de um usuário"
 
 #. TRANS: Help message for IM/SMS command "subscriptions".
 msgctxt "COMMANDHELP"
 msgid "list the people you follow"
-msgstr ""
+msgstr "lista as pessoas que você acompanha"
 
 #. TRANS: Help message for IM/SMS command "subscribers".
 msgctxt "COMMANDHELP"
 msgid "list the people that follow you"
-msgstr ""
+msgstr "lista as pessoas que acompanham você"
 
 #. TRANS: Help message for IM/SMS command "leave <nickname>".
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "unsubscribe from user"
-msgstr "Cancelar a assinatura deste usuário"
+msgstr "cancela a assinatura do usuário"
 
 #. TRANS: Help message for IM/SMS command "d <nickname> <text>".
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "direct message to user"
-msgstr "Mensagens diretas para %s"
+msgstr "mensagem direta para o usuário"
 
 #. TRANS: Help message for IM/SMS command "get <nickname>".
 msgctxt "COMMANDHELP"
 msgid "get last notice from user"
-msgstr ""
+msgstr "obtém a última mensagem do usuário"
 
 #. TRANS: Help message for IM/SMS command "whois <nickname>".
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "get profile info on user"
-msgstr "Informações do perfil"
+msgstr "obtém informações do perfil do usuário"
 
 #. TRANS: Help message for IM/SMS command "lose <nickname>".
 msgctxt "COMMANDHELP"
 msgid "force user to stop following you"
-msgstr ""
+msgstr "força o usuário a parar de acompanhar você"
 
 #. TRANS: Help message for IM/SMS command "fav <nickname>".
 msgctxt "COMMANDHELP"
 msgid "add user's last notice as a 'fave'"
-msgstr ""
+msgstr "marca a última mensagem do usuário como uma favorita"
 
 #. TRANS: Help message for IM/SMS command "fav #<notice_id>".
 msgctxt "COMMANDHELP"
 msgid "add notice with the given id as a 'fave'"
-msgstr ""
+msgstr "marca a mensagem com a id fornecida como uma favorita"
 
 #. TRANS: Help message for IM/SMS command "repeat #<notice_id>".
 msgctxt "COMMANDHELP"
 msgid "repeat a notice with a given id"
-msgstr ""
+msgstr "repete uma mensagem de determinada id"
 
 #. TRANS: Help message for IM/SMS command "repeat <nickname>".
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "repeat the last notice from user"
-msgstr "Repetir esta mensagem"
+msgstr "repetir a última mensagem do usuário"
 
 #. TRANS: Help message for IM/SMS command "reply #<notice_id>".
 msgctxt "COMMANDHELP"
 msgid "reply to notice with a given id"
-msgstr ""
+msgstr "responde a uma mensagem de determinada id"
 
 #. TRANS: Help message for IM/SMS command "reply <nickname>".
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "reply to the last notice from user"
-msgstr "Responder a esta mensagem"
+msgstr "responder a última mensagem do usuário"
 
 #. TRANS: Help message for IM/SMS command "join <group>".
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "join group"
-msgstr "Grupo desconhecido."
+msgstr "entra no grupo"
 
 #. TRANS: Help message for IM/SMS command "login".
 msgctxt "COMMANDHELP"
 msgid "Get a link to login to the web interface"
-msgstr ""
+msgstr "obtém um link para autenticação na interface web"
 
 #. TRANS: Help message for IM/SMS command "drop <group>".
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "leave group"
-msgstr "Excluir o grupo"
+msgstr "deixa o grupo"
 
 #. TRANS: Help message for IM/SMS command "stats".
 msgctxt "COMMANDHELP"
 msgid "get your stats"
-msgstr ""
+msgstr "obtém suas estatísticas"
 
 #. TRANS: Help message for IM/SMS command "stop".
 #. TRANS: Help message for IM/SMS command "quit".
 msgctxt "COMMANDHELP"
 msgid "same as 'off'"
-msgstr ""
+msgstr "o mesmo que 'off'"
 
 #. TRANS: Help message for IM/SMS command "sub <nickname>".
 msgctxt "COMMANDHELP"
 msgid "same as 'follow'"
-msgstr ""
+msgstr "o mesmo que 'follow'"
 
 #. TRANS: Help message for IM/SMS command "unsub <nickname>".
 msgctxt "COMMANDHELP"
 msgid "same as 'leave'"
-msgstr ""
+msgstr "o mesmo que 'leave'"
 
 #. TRANS: Help message for IM/SMS command "last <nickname>".
 msgctxt "COMMANDHELP"
 msgid "same as 'get'"
-msgstr ""
+msgstr "o mesmo que 'get'"
 
 #. TRANS: Help message for IM/SMS command "on <nickname>".
 #. TRANS: Help message for IM/SMS command "off <nickname>".
@@ -8256,26 +7721,23 @@ msgstr ""
 #. TRANS: Help message for IM/SMS command "untrack all".
 #. TRANS: Help message for IM/SMS command "tracks".
 #. TRANS: Help message for IM/SMS command "tracking".
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "not yet implemented."
-msgstr "O comando não foi implementado ainda."
+msgstr "não foi implementado ainda."
 
 #. TRANS: Help message for IM/SMS command "nudge <nickname>".
 msgctxt "COMMANDHELP"
 msgid "remind a user to update."
-msgstr ""
+msgstr "lembra o usuário para publicar algo"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#, fuzzy
 msgid "No configuration file found."
-msgstr "Não foi encontrado nenhum arquivo de configuração. "
+msgstr "Não foi encontrado nenhum arquivo de configuração."
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #. TRANS: Is followed by a list of directories (separated by HTML breaks).
-#, fuzzy
 msgid "I looked for configuration files in the following places:"
-msgstr "Eu procurei pelos arquivos de configuração nos seguintes lugares: "
+msgstr "Eu procurei pelos arquivos de configuração nos seguintes locais:"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 msgid "You may wish to run the installer to fix this."
@@ -8286,25 +7748,21 @@ msgstr "Você pode querer executar o instalador para corrigir isto."
 msgid "Go to the installer."
 msgstr "Ir para o instalador."
 
+#. TRANS: Header on conversation page. Hidden by default (h2).
+#. TRANS: Label for user statistics.
+msgid "Notices"
+msgstr "Mensagens"
+
 #. TRANS: Page title for when a database error occurs.
 msgid "Database error"
 msgstr "Erro no banco de dados"
 
 #. TRANS: Menu item in default local navigation panel.
 #. TRANS: Menu item in search group navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Public"
 msgstr "Público"
 
-#. TRANS: Menu item in default local navigation panel.
-#. TRANS: Menu item in search group navigation panel.
-#. TRANS: Menu item in local navigation menu.
-#, fuzzy
-msgctxt "MENU"
-msgid "Groups"
-msgstr "Grupos"
-
 #. TRANS: Menu item in default local navigation panel.
 #. TRANS: Menu item title in local navigation menu.
 #, fuzzy
@@ -8321,73 +7779,39 @@ msgstr "Excluir"
 msgid "Delete this user"
 msgstr "Excluir este usuário"
 
-#. TRANS: Form legend of form for changing the page design.
-#, fuzzy
-msgid "Change design"
-msgstr "Salvar a aparência"
-
-#. TRANS: Fieldset legend on profile design page to change profile page colours.
-msgid "Change colours"
-msgstr "Alterar a cor"
-
-#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-msgid "Use defaults"
-msgstr "Usar o padrão|"
-
-#. TRANS: Label in form on profile design page.
-#. TRANS: Field contains file name on user's computer that could be that user's custom profile background image.
-msgid "Upload file"
-msgstr "Enviar arquivo"
-
-#. TRANS: Instructions for form on profile design page.
-msgid ""
-"You can upload your personal background image. The maximum file size is 2MB."
-msgstr ""
-"Você pode enviar sua imagem de fundo. O tamanho máximo do arquivo é de 2Mb."
-
-#. TRANS: Radio button on profile design page that will enable use of the uploaded profile image.
-#, fuzzy
-msgctxt "RADIO"
-msgid "On"
-msgstr "Ativado"
-
-#. TRANS: Radio button on profile design page that will disable use of the uploaded profile image.
-#, fuzzy
-msgctxt "RADIO"
-msgid "Off"
-msgstr "Desativado"
-
-#. TRANS: Success message displayed if design settings were saved after clicking "Use defaults".
-msgid "Design defaults restored."
-msgstr "A aparência padrão foi restaurada."
-
 #. TRANS: Exception. %s is an ID.
-#, fuzzy, php-format
+#, php-format
 msgid "Unable to find services for %s."
-msgstr "Não foi possível revogar o acesso para a aplicação: %s."
+msgstr "Não foi possível encontrar serviços para %s."
 
 #. TRANS: Form legend for removing the favourite status for a favourite notice.
-#. TRANS: Title for button text for removing the favourite status for a favourite notice.
 msgid "Disfavor this notice"
 msgstr "Excluir das favoritas"
 
 #. TRANS: Button text for removing the favourite status for a favourite notice.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Disfavor favorite"
-msgstr "Desmarcar a favorita"
+msgstr "Excluir das favoritas"
+
+#. TRANS: Button title for removing the favourite status for a favourite notice.
+#, fuzzy
+msgid "Remove this notice from your list of favorite notices."
+msgstr "Não foi possível recuperar as mensagens favoritas."
 
 #. TRANS: Form legend for adding the favourite status to a notice.
-#. TRANS: Title for button text for adding the favourite status to a notice.
 msgid "Favor this notice"
 msgstr "Acrescentar às favoritas"
 
 #. TRANS: Button text for adding the favourite status to a notice.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Favor"
 msgstr "Tornar favorita"
 
+#. TRANS: Button title for adding the favourite status to a notice.
+#, fuzzy
+msgid "Add this notice to your list of favorite notices."
+msgstr "Não foi possível recuperar as mensagens favoritas."
+
 #. TRANS: Feed type name.
 msgid "RSS 1.0"
 msgstr "RSS 1.0"
@@ -8404,21 +7828,24 @@ msgstr "Atom"
 msgid "FOAF"
 msgstr "FOAF"
 
+#. TRANS: Feed type name. See http://activitystrea.ms/
+msgid "Activity Streams"
+msgstr ""
+
 #. TRANS: Client exception thrown when an imported feed does not have an author.
 msgid "No author in the feed."
-msgstr ""
+msgstr "Nenhum autor na fonte de notícias."
 
 #. TRANS: Client exception thrown when an imported feed does not have an author that
 #. TRANS: can be associated with a user.
 msgid "Cannot import without a user."
-msgstr ""
+msgstr "Não é possível importar sem um usuário."
 
 #. TRANS: Header for feed links (h2).
 msgid "Feeds"
-msgstr ""
+msgstr "Fontes de notícias"
 
 #. TRANS: List element on gallery action page to show all tags.
-#, fuzzy
 msgctxt "TAGS"
 msgid "All"
 msgstr "Todas"
@@ -8428,15 +7855,36 @@ msgid "Tag"
 msgstr "Etiqueta"
 
 #. TRANS: Dropdown field title on gallery action page for a list containing tags.
-#, fuzzy
 msgid "Choose a tag to narrow list."
-msgstr "Selecione uma etiqueta para reduzir a lista"
+msgstr "Selecione uma etiqueta para reduzir a lista."
 
 #. TRANS: Description on form for granting a role.
 #, php-format
 msgid "Grant this user the \"%s\" role"
 msgstr "Associa o papel \"%s\" a este usuário"
 
+#. TRANS: Header for mini list of group members on a group page (h2).
+msgid "Members"
+msgstr "Membros"
+
+#. TRANS: Link to all group members from mini list of group members if group has more than n members.
+msgid "All members"
+msgstr "Todos os membros"
+
+#. TRANS: Header for mini list of users with a pending membership request on a group page (h2).
+#, fuzzy
+msgid "Pending"
+msgstr "Pendências (%d)"
+
+#. TRANS: Header for mini list of users that are blocked in a group page (h2).
+msgid "Blocked"
+msgstr "Bloqueados"
+
+#. TRANS: Title for list of group administrators on a group page.
+msgctxt "TITLE"
+msgid "Admins"
+msgstr "Administradores"
+
 #. TRANS: Button text for the form that will block a user from a group.
 msgctxt "BUTTON"
 msgid "Block"
@@ -8444,34 +7892,31 @@ msgstr "Bloquear"
 
 #. TRANS: Submit button title.
 msgctxt "TOOLTIP"
-msgid "Block this user"
-msgstr "Bloquear este usuário"
+msgid "Block this user so that they can no longer post messages to it."
+msgstr ""
 
 #. TRANS: Field title on group edit form.
-#, fuzzy
 msgid "URL of the homepage or blog of the group or topic."
-msgstr "URL para o site ou blog do grupo ou tópico"
+msgstr "URL para o site ou blog do grupo ou tópico."
 
 #. TRANS: Text area title for group description when there is no text limit.
-#, fuzzy
 msgid "Describe the group or topic."
-msgstr "Descreva o grupo ou tópico"
+msgstr "Descreva o grupo ou tópico."
 
 #. TRANS: Text area title for group description.
 #. TRANS: %d is the number of characters available for the description.
-#, fuzzy, php-format
+#, php-format
 msgid "Describe the group or topic in %d character or less."
 msgid_plural "Describe the group or topic in %d characters or less."
-msgstr[0] "Descreva o grupo ou tópico em %d caracteres."
-msgstr[1] "Descreva o grupo ou tópico em %d caracteres."
+msgstr[0] "Descreva o grupo ou tópico em %d caractere."
+msgstr[1] "Descreva o grupo ou tópico em %d caracteres ou menos."
 
 #. TRANS: Field title on group edit form.
-#, fuzzy
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\"."
 msgstr ""
 "Localização do grupo, caso tenha alguma, como \"cidade, estado (ou região), "
-"país\""
+"país\"."
 
 #. TRANS: Field label on group edit form.
 msgid "Aliases"
@@ -8479,7 +7924,7 @@ msgstr "Apelidos"
 
 #. TRANS: Input field title for group aliases.
 #. TRANS: %d is the maximum number of group aliases available.
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
 "alias allowed."
@@ -8487,78 +7932,27 @@ msgid_plural ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
 "aliases allowed."
 msgstr[0] ""
-"Apelidos extras para o grupo, separado por vírgulas ou espaços, no máximo %d"
+"Apelidos extras para o grupo, separado por vírgulas ou espaços (no máximo %d "
+"apelido)"
 msgstr[1] ""
-"Apelidos extras para o grupo, separado por vírgulas ou espaços, no máximo %d"
+"Apelidos extras para o grupo, separado por vírgulas ou espaços (no máximo %d "
+"apelidos)"
 
 #. TRANS: Checkbox field title on group edit form to mark a group private.
 msgid ""
 "New members must be approved by admin and all posts are forced to be private."
 msgstr ""
+"Novos membros devem ser aprovados pelo administrador e todas a publicações "
+"são obrigatoriamente privadas."
 
 #. TRANS: Indicator in group members list that this user is a group administrator.
-#, fuzzy
 msgctxt "GROUPADMIN"
 msgid "Admin"
 msgstr "Admin"
 
-#. TRANS: Menu item in the group navigation page.
-msgctxt "MENU"
-msgid "Group"
-msgstr "Grupo"
-
-#. TRANS: Tooltip for menu item in the group navigation page.
-#. TRANS: %s is the nickname of the group.
-#, php-format
-msgctxt "TOOLTIP"
-msgid "%s group"
-msgstr "Grupo %s"
-
-#. TRANS: Menu item in the group navigation page.
-msgctxt "MENU"
-msgid "Members"
-msgstr "Membros"
-
-#. TRANS: Tooltip for menu item in the group navigation page.
-#. TRANS: %s is the nickname of the group.
-#, php-format
-msgctxt "TOOLTIP"
-msgid "%s group members"
-msgstr "Membros do grupo %s"
-
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: %d is the number of pending members.
-#, php-format
-msgctxt "MENU"
-msgid "Pending members (%d)"
-msgid_plural "Pending members (%d)"
-msgstr[0] ""
-msgstr[1] ""
-
-#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: %s is the nickname of the group.
-#, fuzzy, php-format
-msgctxt "TOOLTIP"
-msgid "%s pending members"
-msgstr "Membros do grupo %s"
-
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-msgctxt "MENU"
-msgid "Blocked"
-msgstr "Bloqueado"
-
-#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: %s is the nickname of the group.
-#, php-format
-msgctxt "TOOLTIP"
-msgid "%s blocked users"
-msgstr "Usuários bloqueados de %s"
-
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: Menu item in primary navigation panel.
-msgctxt "MENU"
-msgid "Admin"
-msgstr "Administrar"
+#. TRANS: Group actions header (h2). Text hidden by default.
+msgid "Group actions"
+msgstr "Ações do grupo"
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
@@ -8567,11 +7961,6 @@ msgctxt "TOOLTIP"
 msgid "Edit %s group properties"
 msgstr "Editar propriedades do grupo %s"
 
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-msgctxt "MENU"
-msgid "Logo"
-msgstr "Logotipo"
-
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
 #, php-format
@@ -8579,16 +7968,10 @@ msgctxt "TOOLTIP"
 msgid "Add or edit %s logo"
 msgstr "Adicionar ou editar o logotipo de %s"
 
-#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: %s is the nickname of the group.
-#, php-format
-msgctxt "TOOLTIP"
-msgid "Add or edit %s design"
-msgstr "Adicionar ou editar a aparência de %s"
-
-#. TRANS: Group actions header (h2). Text hidden by default.
-msgid "Group actions"
-msgstr "Ações do grupo"
+#. TRANS: Link text for link on user profile.
+msgctxt "MENU"
+msgid "Logo"
+msgstr "Logotipo"
 
 #. TRANS: Title for groups with the most members section.
 #, fuzzy
@@ -8600,11 +7983,20 @@ msgstr "Mensagens populares"
 msgid "Active groups"
 msgstr "Todos os grupos"
 
-#. TRANS: Title for group tag cloud section.
-#. TRANS: %s is a group name.
-#, php-format
-msgid "Tags in %s group's notices"
-msgstr "Etiquetas nas mensagens do grupo %s"
+#. TRANS: Link description for seeing all groups.
+#. TRANS: Link description for seeing all lists.
+#, fuzzy
+msgid "See all"
+msgstr "Exibir todas"
+
+#. TRANS: Link title for seeing all groups.
+msgid "See all groups you belong to."
+msgstr ""
+
+#. TRANS: Menu item title in personal group navigation menu.
+#. TRANS: %s is a username.
+msgid "Back to top"
+msgstr ""
 
 #. TRANS: Client exception 406
 msgid "This page is not available in a media type you accept"
@@ -8638,25 +8030,25 @@ msgid "Unknown file type"
 msgstr "Tipo de arquivo desconhecido"
 
 #. TRANS: Number of megabytes. %d is the number.
-#, fuzzy, php-format
+#, php-format
 msgid "%dMB"
 msgid_plural "%dMB"
-msgstr[0] "Mb"
-msgstr[1] "Mb"
+msgstr[0] "%dMb"
+msgstr[1] "%dMb"
 
 #. TRANS: Number of kilobytes. %d is the number.
-#, fuzzy, php-format
+#, php-format
 msgid "%dkB"
 msgid_plural "%dkB"
-msgstr[0] "Kb"
-msgstr[1] "Kb"
+msgstr[0] "%dKb"
+msgstr[1] "%dKb"
 
 #. TRANS: Number of bytes. %d is the number.
 #, php-format
 msgid "%dB"
 msgid_plural "%dB"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%dB"
+msgstr[1] "%dB"
 
 #. TRANS: Body text for confirmation code e-mail.
 #. TRANS: %1$s is a user nickname, %2$s is the StatusNet sitename,
@@ -8669,44 +8061,84 @@ msgid ""
 "user is not you, or if you did not request this confirmation, just ignore "
 "this message."
 msgstr ""
+"O usuário \"%1$s\" em %2$s afirmou que a sua identificação %3$s pertence a "
+"ele. Caso isso seja verdade, você pode confirmar clicando nesta URL: %4$s . "
+"(Caso não consiga clicar nela, copie-a e cole-a na barra de endereços do seu "
+"navegador). Se este este usuário não é você, ou se você não solicitou esta "
+"confirmação, basta ignorar esta mensagem."
 
 #. TRANS: Exception thrown when trying to deliver a notice to an unknown inbox.
 #. TRANS: %d is the unknown inbox ID (number).
 #, php-format
 msgid "Unknown inbox source %d."
-msgstr "Fonte da caixa de entrada desconhecida %d."
+msgstr "Origem da caixa de entrada desconhecida %d."
 
 #. TRANS: Server exception thrown trying to initialise an IM plugin without meeting all prerequisites.
 msgid "Queueing must be enabled to use IM plugins."
-msgstr ""
+msgstr "O enfileiramento deve estar habilitado para usar os plugins de MI."
 
 #. TRANS: Server exception thrown trying to initialise an IM plugin without a transport method.
 msgid "Transport cannot be null."
-msgstr ""
+msgstr "O transporte não pode ser nulo."
 
 #. TRANS: Title for inbox tag cloud section.
 msgctxt "TITLE"
 msgid "Trends"
 msgstr ""
 
-#. TRANS: Button text for inviting more users to the StatusNet instance.
+#. TRANS: Default button text for inviting more users to the StatusNet instance.
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Invite more colleagues"
 msgstr "Convidar novos usuários"
 
-#. TRANS: Button text for joining a group.
+#. TRANS: Form legend.
 #, fuzzy
+msgid "Invite collegues"
+msgstr "Convidar novos usuários"
+
+#. TRANS: Field label for a list of e-mail addresses.
+msgid "Email addresses"
+msgstr "Endereços de e-mail"
+
+#. TRANS: Field title for a list of e-mail addresses.
+msgid "Addresses of friends to invite (one per line)."
+msgstr "Endereços dos seus amigos que serão convidados (um por linha)."
+
+#. TRANS: Field label for a personal message to send to invitees.
+msgid "Personal message"
+msgstr "Mensagem pessoal"
+
+#. TRANS: Field title for a personal message to send to invitees.
+msgid "Optionally add a personal message to the invitation."
+msgstr "Você pode, opcionalmente, adicionar uma mensagem pessoal ao convite."
+
+#. TRANS: Send button for inviting friends
+#. TRANS: Button text for sending notice.
+msgctxt "BUTTON"
+msgid "Send"
+msgstr "Enviar"
+
+#. TRANS: Submit button title.
+#, fuzzy
+msgid "Send invitations."
+msgstr "Convites"
+
+#. TRANS: Button text for joining a group.
 msgctxt "BUTTON"
 msgid "Join"
 msgstr "Entrar"
 
 #. TRANS: Button text on form to leave a group.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Leave"
 msgstr "Sair"
 
+#. TRANS: Link title for seeing all lists.
+#, fuzzy
+msgid "See all lists you have created."
+msgstr "Aplicações que você registrou"
+
 #. TRANS: Menu item for logging in to the StatusNet site.
 #. TRANS: Menu item in primary navigation panel.
 msgctxt "MENU"
@@ -8750,13 +8182,13 @@ msgid ""
 msgstr ""
 "Olá, %s.\n"
 "\n"
-"Alguém digitou este endereço de e-mail no %s.\n"
+"Alguém digitou este endereço de e-mail no %2$s.\n"
 "\n"
 "Se foi você, e caso queira confirmar a sua entrada, use a URL abaixo:\n"
 "\n"
-"\t%s\n"
+"\t%3$s\n"
 "\n"
-"Caso contrário, simplesmente ignore esta mesagem.\n"
+"Caso contrário, simplesmente ignore esta messagem.\n"
 "\n"
 "Obrigado pela sua atenção, \n"
 "%s\n"
@@ -8765,15 +8197,15 @@ msgstr ""
 #. TRANS: %1$s is the subscribing user's nickname, %2$s is the StatusNet sitename.
 #. TRANS: Main body of new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscriber's long name, %2$s is the StatusNet sitename.
-#, php-format
-msgid "%1$s is now listening to your notices on %2$s."
-msgstr "%1$s agora está acompanhando suas mensagens no %2$s."
+#, fuzzy, php-format
+msgid "%1$s is now following you on %2$s."
+msgstr "%1$s agora está acompanhando %2$s."
 
 #. TRANS: Subject of pending new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscribing user's nickname, %2$s is the StatusNet sitename.
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s would like to listen to your notices on %2$s."
-msgstr "%1$s agora está acompanhando suas mensagens no %2$s."
+msgstr "%1$s gostaria de acompanhar suas mensagens no %2$s."
 
 #. TRANS: Main body of pending new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscriber's long name, %2$s is the StatusNet sitename.
@@ -8782,11 +8214,13 @@ msgid ""
 "%1$s would like to listen to your notices on %2$s. You may approve or reject "
 "their subscription at %3$s"
 msgstr ""
+"%1$s gostaria de acompanhar suas mensagens no %2$s. Você deve aprovar ou "
+"rejeitar a sua assinatura em %3$s"
 
 #. TRANS: Common footer block for StatusNet notification emails.
 #. TRANS: %1$s is the StatusNet sitename,
 #. TRANS: %2$s is a link to the addressed user's e-mail settings.
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "Faithfully yours,\n"
 "%1$s.\n"
@@ -8794,22 +8228,17 @@ msgid ""
 "----\n"
 "Change your email address or notification options at %2$s"
 msgstr ""
-"%1$s agora está acompanhando suas mensagens no %2$s.\n"
-"\n"
-"\t%3$s\n"
-"\n"
-"%4$s%5$s%6$s\n"
 "Atenciosamente,\n"
-"%7$s.\n"
+"%1$s.\n"
 "\n"
 "----\n"
-"Altere seu endereço de e-mail e suas opções de notificação em %8$s\n"
+"Modifique seu endereço de e-mail ou opções de notificação aqui: %2$s"
 
 #. TRANS: Profile info line in notification e-mail.
 #. TRANS: %s is a URL.
-#, fuzzy, php-format
+#, php-format
 msgid "Profile: %s"
-msgstr "Perfil"
+msgstr "Perfil: %s"
 
 #. TRANS: Profile info line in notification e-mail.
 #. TRANS: %s is biographical information.
@@ -8819,14 +8248,14 @@ msgstr "Descrição: %s"
 
 #. TRANS: This is a paragraph in a new-subscriber e-mail.
 #. TRANS: %s is a URL where the subscriber can be reported as abusive.
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "If you believe this account is being used abusively, you can block them from "
 "your subscribers list and report as spam to site administrators at %s."
 msgstr ""
 "Se você acredita que esse usuário está se comportando de forma abusiva, você "
 "pode bloqueá-lo da sua lista de assinantes e reportá-lo como spammer ao "
-"administrador do site em %s"
+"administrador do site em %s."
 
 #. TRANS: Subject of notification mail for new posting email address.
 #. TRANS: %s is the StatusNet sitename.
@@ -8837,7 +8266,7 @@ msgstr "Novo endereço de e-mail para publicar no %s"
 #. TRANS: Body of notification mail for new posting email address.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is the e-mail address to send
 #. TRANS: to to post by e-mail, %3$s is a URL to more instructions.
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
 "\n"
@@ -8849,10 +8278,7 @@ msgstr ""
 "\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"
+"Mais instruções sobre e-mail em %3$s."
 
 #. TRANS: Subject line for SMS-by-email notification messages.
 #. TRANS: %s is the posting user's nickname.
@@ -8874,14 +8300,14 @@ msgstr ""
 
 #. TRANS: Subject for 'nudge' notification email.
 #. TRANS: %s is the nudging user.
-#, fuzzy, php-format
+#, php-format
 msgid "You have been nudged by %s"
-msgstr "Você teve a atenção chamada por %s"
+msgstr "Você foi cutucado por %s"
 
 #. TRANS: Body for 'nudge' notification email.
 #. TRANS: %1$s is the nuding user's long name, $2$s is the nudging user's nickname,
 #. TRANS: %3$s is a URL to post notices at.
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "%1$s (%2$s) is wondering what you are up to these days and is inviting you "
 "to post some news.\n"
@@ -8892,17 +8318,14 @@ msgid ""
 "\n"
 "Don't reply to this email; it won't get to them."
 msgstr ""
-"%1$s (%2$s) quer saber notícias suas e o está convidando para publicar "
-"alguma mensagem..\n"
+"%1$s (%2$s) quer saber notícias suas e está lhe convidando a publicar alguma "
+"mensagem.\n"
 "\n"
 "Por isso, vamos ouvir o que você tem a dizer. :)\n"
 "\n"
 "%3$s\n"
 "\n"
-"Não responda este e-mail, pois ele não chegará ao remetente.\n"
-"\n"
-"Atenciosamente,\n"
-"%4$s\n"
+"Não responda este e-mail, pois ele não chegará ao remetente."
 
 #. TRANS: Subject for direct-message notification email.
 #. TRANS: %s is the sending user's nickname.
@@ -8913,7 +8336,7 @@ msgstr "Nova mensagem particular de %s"
 #. TRANS: Body for direct-message notification email.
 #. TRANS: %1$s is the sending user's long name, %2$s is the sending user's nickname,
 #. TRANS: %3$s is the message content, %4$s a URL to the message,
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
 "\n"
@@ -8937,23 +8360,20 @@ msgstr ""
 "\n"
 "%4$s\n"
 "\n"
-"Não responda este e-mail, pois ele não chegará ao remetente.\n"
-"\n"
-"Atenciosamente,\n"
-"%5$s\n"
+"Não responda este e-mail, pois ele não chegará ao remetente."
 
 #. TRANS: Subject for favorite notification e-mail.
 #. TRANS: %1$s is the adding user's long name, %2$s is the adding user's nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s (@%2$s) added your notice as a favorite"
-msgstr "%s (@%s) marcou sua mensagem como favorita"
+msgstr "%1$s (@%2$s) marcou sua mensagem como favorita"
 
 #. TRANS: Body for favorite notification e-mail.
 #. TRANS: %1$s is the adding user's long name, $2$s is the date the notice was created,
 #. TRANS: %3$s is a URL to the faved notice, %4$s is the faved notice text,
 #. TRANS: %5$s is a URL to all faves of the adding user, %6$s is the StatusNet sitename,
 #. TRANS: %7$s is the adding user's nickname.
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
 "\n"
@@ -8969,7 +8389,7 @@ msgid ""
 "\n"
 "%5$s"
 msgstr ""
-"%1$s (@%7$s) acabou de adicionar sua mensagem do %2$s como uma favorita.\n"
+"%1$s (@%7$s) acabou de marcar uma mensagem sua do %2$s como favorita.\n"
 "\n"
 "A URL da sua mensagem é:\n"
 "\n"
@@ -8979,12 +8399,9 @@ msgstr ""
 "\n"
 "%4$s\n"
 "\n"
-"Você pode ver a lista de favoritas de %1$saqui:\n"
+"Você pode ver a lista de favoritas de %1$s aqui:\n"
 "\n"
-"%5$s\n"
-"\n"
-"Atenciosamente,\n"
-"%6$s\n"
+"%5$s"
 
 #. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
 #, php-format
@@ -8999,16 +8416,16 @@ msgstr ""
 
 #. TRANS: E-mail subject for notice notification.
 #. TRANS: %1$s is the sending user's long name, %2$s is the adding user's nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s (@%2$s) sent a notice to your attention"
-msgstr "%s (@%s) enviou uma mensagem citando você"
+msgstr "%1$s (@%2$s) enviou uma mensagem citando você"
 
 #. TRANS: Body of @-reply notification e-mail.
 #. TRANS: %1$s is the sending user's name, $2$s is the StatusNet sitename,
 #. TRANS: %3$s is a URL to the notice, %4$s is the notice text,
-#. TRANS: %5$s is a URL to the full conversion if it exists (otherwise empty),
+#. TRANS: %5$s is the text "The full conversation can be read here:" and a URL to the full conversion if it exists (otherwise empty),
 #. TRANS: %6$s is a URL to reply to the notice, %7$s is a URL to all @-replies for the addressed user,
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "%1$s just sent a notice to your attention (an '@-reply') on %2$s.\n"
 "\n"
@@ -9028,8 +8445,8 @@ msgid ""
 "\n"
 "%7$s"
 msgstr ""
-"%1$s (@%9$s) acabou de enviar uma mensagem citando você (do tipo '@usuário') "
-"em %2$s.\n"
+"%1$s acabou de enviar uma mensagem citando você (do tipo '@usuário') em %2"
+"$s.\n"
 "\n"
 "A mensagem está aqui:\n"
 "\n"
@@ -9045,28 +8462,27 @@ msgstr ""
 "\n"
 "A lista de todas as citações a você está aqui:\n"
 "\n"
-"%7$s\n"
-"\n"
-"Atenciosamente,\n"
-"%2$s\n"
-"\n"
-"P.S.: Você pode cancelar a notificações por e-mail aqui: %8$s\n"
+"%7$s"
 
 #. TRANS: Subject of group join notification e-mail.
 #. TRANS: %1$s is the joining user's nickname, %2$s is the group name, and %3$s is the StatusNet sitename.
+#, fuzzy, php-format
+msgid "%1$s has joined your group %2$s on %3$s"
+msgstr "%1$s entrou no seu grupo %2$s no %3$s."
+
 #. TRANS: Main body of group join notification e-mail.
 #. TRANS: %1$s is the subscriber's long name, %2$s is the group name, and %3$s is the StatusNet sitename,
 #. TRANS: %4$s is a block of profile info about the subscriber.
 #. TRANS: %5$s is a link to the addressed user's e-mail settings.
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s has joined your group %2$s on %3$s."
-msgstr "%1$s associou-se ao grupo %2$s."
+msgstr "%1$s entrou no seu grupo %2$s no %3$s."
 
 #. TRANS: Subject of pending group join request notification e-mail.
 #. TRANS: %1$s is the joining user's nickname, %2$s is the group name, and %3$s is the StatusNet sitename.
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s wants to join your group %2$s on %3$s."
-msgstr "%1$s associou-se ao grupo %2$s."
+msgstr "%1$s deseja entrar no seu grupo %2$s no %3$s."
 
 #. TRANS: Main body of pending group join request notification e-mail.
 #. TRANS: %1$s is the subscriber's long name, %2$s is the group name, and %3$s is the StatusNet sitename,
@@ -9076,6 +8492,8 @@ msgid ""
 "%1$s would like to join your group %2$s on %3$s. You may approve or reject "
 "their group membership at %4$s"
 msgstr ""
+"%1$s deseja entrar no seu grupo %2$s no %3$s. Você pode aprovar ou rejeitar "
+"as solicitações de associações em %4$s"
 
 #. TRANS: Client error displayed when trying to access a mailbox that is not of the logged in user.
 msgid "Only the user can read their own mailboxes."
@@ -9091,26 +8509,22 @@ msgstr ""
 "receber mensagens privadas."
 
 #. TRANS: Menu item in mailbox menu. Leads to incoming private messages.
-#, fuzzy
 msgctxt "MENU"
 msgid "Inbox"
 msgstr "Recebidas"
 
 #. TRANS: Menu item title in mailbox menu. Leads to incoming private messages.
-#, fuzzy
 msgid "Your incoming messages."
-msgstr "Suas mensagens recebidas"
+msgstr "Suas mensagens recebidas."
 
 #. TRANS: Menu item in mailbox menu. Leads to outgoing private messages.
-#, fuzzy
 msgctxt "MENU"
 msgid "Outbox"
 msgstr "Enviadas"
 
 #. TRANS: Menu item title in mailbox menu. Leads to outgoing private messages.
-#, fuzzy
 msgid "Your sent messages."
-msgstr "Suas mensagens enviadas"
+msgstr "Suas mensagens enviadas."
 
 #. TRANS: Error message in incoming mail handler used when an incoming e-mail cannot be processed.
 msgid "Could not parse message."
@@ -9130,9 +8544,9 @@ msgstr "Desculpe-me, mas não é permitido o recebimento de e-mails."
 
 #. TRANS: Error message in incoming mail handler used when an incoming e-mail is of an unsupported type.
 #. TRANS: %s is the unsupported type.
-#, fuzzy, php-format
+#, php-format
 msgid "Unsupported message type: %s."
-msgstr "Tipo de mensagem não suportado: %s"
+msgstr "Tipo de mensagem não suportado: %s."
 
 #. TRANS: Form legend for form to make a user a group admin.
 msgid "Make user an admin of the group"
@@ -9144,8 +8558,9 @@ msgid "Make Admin"
 msgstr "Tornar administrador"
 
 #. TRANS: Submit button title.
+#, fuzzy
 msgctxt "TOOLTIP"
-msgid "Make this user an admin"
+msgid "Make this user an admin."
 msgstr "Torna este usuário um administrador"
 
 #. TRANS: Client exception thrown when a database error was thrown during a file upload operation.
@@ -9192,14 +8607,12 @@ msgstr "Enviar uma mensagem direta"
 #. TRANS: Label entry in drop-down selection box in direct-message inbox/outbox.
 #. TRANS: This is the default entry in the drop-down box, doubling as instructions
 #. TRANS: and a brake against accidental submissions with the first user in the list.
-#, fuzzy
 msgid "Select recipient:"
-msgstr "Selecione uma operadora"
+msgstr "Selecione o destinatário:"
 
-#. TRANS Entry in drop-down selection box in direct-message inbox/outbox when no one is available to message.
-#, fuzzy
+#. TRANS: Entry in drop-down selection box in direct-message inbox/outbox when no one is available to message.
 msgid "No mutual subscribers."
-msgstr "Não assinado!"
+msgstr "Sem assinantes mútuos."
 
 #. TRANS: Dropdown label in direct notice form.
 msgid "To"
@@ -9211,9 +8624,8 @@ msgid "Send"
 msgstr "Enviar"
 
 #. TRANS: Header in message list.
-#, fuzzy
 msgid "Messages"
-msgstr "Mensagem"
+msgstr "Mensagens"
 
 #. TRANS: Followed by notice source (usually the client used to send the notice).
 #. TRANS: Followed by notice source.
@@ -9221,7 +8633,6 @@ msgid "from"
 msgstr "de"
 
 #. TRANS: A possible notice source (web interface).
-#, fuzzy
 msgctxt "SOURCE"
 msgid "web"
 msgstr "web"
@@ -9229,56 +8640,57 @@ msgstr "web"
 #. TRANS: A possible notice source (XMPP).
 msgctxt "SOURCE"
 msgid "xmpp"
-msgstr ""
+msgstr "xmpp"
 
 #. TRANS: A possible notice source (e-mail).
-#, fuzzy
 msgctxt "SOURCE"
 msgid "mail"
-msgstr "E-mail"
+msgstr "e-mail"
 
 #. TRANS: A possible notice source (OpenMicroBlogging).
 msgctxt "SOURCE"
 msgid "omb"
-msgstr ""
+msgstr "omb"
 
 #. TRANS: A possible notice source (Application Programming Interface).
 msgctxt "SOURCE"
 msgid "api"
-msgstr ""
+msgstr "api"
 
 #. TRANS: Client exception thrown when no author for an activity was found.
 msgid "Cannot get author for activity."
-msgstr ""
+msgstr "Nâo foi possível obter o autor da atividade."
 
 #. TRANS: Client exception thrown when ...
-#, fuzzy
 msgid "Bookmark not posted to this group."
-msgstr "Você não tem permissão para excluir este grupo."
+msgstr "O favorito não foi publicado neste grupo."
 
 #. TRANS: Client exception when ...
-#, fuzzy
 msgid "Object not posted to this user."
-msgstr "Não excluir este grupo"
+msgstr "O objeto não foi publicado para este usuário."
 
 #. TRANS: Server exception thrown when a micro app plugin uses a target that cannot be handled.
 msgid "Do not know how to handle this kind of target."
-msgstr ""
+msgstr "Não sei como manipular esse tipo de destino."
 
 #. TRANS: Server exception thrown when a micro app plugin developer has not done his job too well.
 msgid "You must implement either adaptNoticeListItem() or showNotice()."
 msgstr ""
 
+#. TRANS: Link description to show more items in a list.
+msgid "More â–¼"
+msgstr ""
+
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 msgid "Nickname cannot be empty."
-msgstr ""
+msgstr "A identificação não pode estar em branco."
 
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 #, php-format
 msgid "Nickname cannot be more than %d character long."
 msgid_plural "Nickname cannot be more than %d characters long."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "A identificação não pode ter mais do que %d caractere."
+msgstr[1] "A identificação não pode ter mais do que %d caracteres."
 
 #. TRANS: Form legend for notice form.
 msgid "Send a notice"
@@ -9294,9 +8706,8 @@ msgid "Attach"
 msgstr "Anexo"
 
 #. TRANS: Title for input field to attach a file to a notice.
-#, fuzzy
 msgid "Attach a file."
-msgstr "Anexar um arquivo"
+msgstr "Anexar um arquivo."
 
 #. TRANS: Field label to add location to a notice.
 msgid "Share my location"
@@ -9319,10 +8730,6 @@ msgctxt "SEPARATOR"
 msgid ", "
 msgstr ""
 
-#. TRANS: Start of profile addressees list.
-msgid " â–¸ "
-msgstr ""
-
 #. TRANS: Used in coordinates as abbreviation of north.
 msgid "N"
 msgstr "N"
@@ -9361,7 +8768,8 @@ msgid "Repeated by"
 msgstr "Repetida por"
 
 #. TRANS: Link title in notice list item to reply to a notice.
-msgid "Reply to this notice"
+#, fuzzy
+msgid "Reply to this notice."
 msgstr "Responder a esta mensagem"
 
 #. TRANS: Link text in notice list item to reply to a notice.
@@ -9369,53 +8777,30 @@ msgid "Reply"
 msgstr "Responder"
 
 #. TRANS: Link title in notice list item to delete a notice.
-msgid "Delete this notice"
-msgstr "Excluir esta mensagem"
+#, fuzzy
+msgid "Delete this notice from the timeline."
+msgstr "Excluir esta mensagem."
 
 #. TRANS: Title for repeat form status in notice list when a notice has been repeated.
-#, fuzzy
 msgid "Notice repeated."
-msgstr "Mensagem repetida"
+msgstr "Mensagem repetida."
 
 #. TRANS: Field label for notice text.
 msgid "Update your status..."
-msgstr ""
+msgstr "Envie sua mensagem..."
 
 #. TRANS: Form legend of form to nudge/ping another user.
 msgid "Nudge this user"
-msgstr "Chamar a atenção deste usuário"
+msgstr "Cutucar este usuário"
 
 #. TRANS: Button text to nudge/ping another user.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Nudge"
-msgstr "Chamar a atenção"
+msgstr "Cutucar"
 
 #. TRANS: Button title to nudge/ping another user.
-#, fuzzy
 msgid "Send a nudge to this user."
-msgstr "Chame a atenção deste usuário"
-
-#. TRANS: Exception thrown when creating a new profile fails in OAuth store.
-msgid "Error inserting new profile."
-msgstr "Erro ao inserir perfil novo."
-
-#. TRANS: Exception thrown when creating a new avatar fails in OAuth store.
-msgid "Error inserting avatar."
-msgstr "Erro ao inserir avatar."
-
-#. TRANS: Exception thrown when creating a remote profile fails in OAuth store.
-msgid "Error inserting remote profile."
-msgstr "Erro ao inserir perfil remoto."
-
-#. TRANS: Exception thrown when a notice is denied because it has been sent before.
-msgid "Duplicate notice."
-msgstr "Nota duplicada."
-
-#. TRANS: Exception thrown when creating a new subscription fails in OAuth store.
-#, fuzzy
-msgid "Could not insert new subscription."
-msgstr "Não foi possível inserir a nova assinatura."
+msgstr "Cutucar este usuário"
 
 #. TRANS: Server exception thrown in oEmbed action if no API endpoint is available.
 #, fuzzy
@@ -9455,7 +8840,7 @@ msgstr "Excluir este usuário."
 
 #. TRANS: Header in list edit form.
 msgid "Add or remove people"
-msgstr ""
+msgstr "Adicionar ou remover pessoas"
 
 #. TRANS: Header in list edit form.
 #, fuzzy
@@ -9506,11 +8891,6 @@ msgstr "Editar"
 msgid "Edit %s list by you."
 msgstr "Editar o grupo %s"
 
-#. TRANS: Link description for link to list of users tagged with a tag.
-#, fuzzy
-msgid "Tagged"
-msgstr "Etiqueta"
-
 #. TRANS: Title for link to edit list settings.
 #, fuzzy
 msgid "Edit list settings."
@@ -9580,7 +8960,6 @@ msgid "Edit lists"
 msgstr "Não é uma etiqueta de pessoa válida: %s."
 
 #. TRANS: Label in self tags widget.
-#, fuzzy
 msgctxt "LABEL"
 msgid "Tags"
 msgstr "Etiquetas"
@@ -9659,16 +9038,21 @@ msgstr "Desconhecido"
 #. TRANS: Plugin admin panel controls
 msgctxt "plugin"
 msgid "Disable"
-msgstr ""
+msgstr "Desabilitar"
 
 #. TRANS: Plugin admin panel controls
 msgctxt "plugin"
 msgid "Enable"
-msgstr ""
+msgstr "Habilitar"
 
+#. TRANS: Plugin description for a disabled plugin.
+#, fuzzy
 msgctxt "plugin-description"
-msgid "(Plugin descriptions unavailable when disabled.)"
+msgid ""
+"(The plugin description is unavailable when a plugin has been disabled.)"
 msgstr ""
+"(As descrições dos plugins não estão disponíveis quando eles estão "
+"desabilitados)"
 
 #. TRANS: Menu item in primary navigation panel.
 #, fuzzy
@@ -9681,6 +9065,11 @@ msgstr "Configuração do SMS"
 msgid "Change your personal settings."
 msgstr "Alterar as suas configurações de perfil"
 
+#. TRANS: Menu item in primary navigation panel.
+msgctxt "MENU"
+msgid "Admin"
+msgstr "Administrar"
+
 #. TRANS: Menu item title in primary navigation panel.
 #, fuzzy
 msgid "Site configuration."
@@ -9701,15 +9090,8 @@ msgstr "Sai do site"
 msgid "Login to the site."
 msgstr "Autentique-se no site"
 
-#. TRANS: Menu item in primary navigation panel.
-msgctxt "MENU"
-msgid "Search"
-msgstr "Pesquisar"
-
-#. TRANS: Menu item title in primary navigation panel.
-#, fuzzy
-msgid "Search the site."
-msgstr "Procurar no site"
+msgid "This profile has been silenced by site moderators"
+msgstr ""
 
 #. TRANS: H2 text for user subscription statistics.
 #, fuzzy
@@ -9721,6 +9103,10 @@ msgstr "Permitir"
 msgid "Followers"
 msgstr "Permitir"
 
+#. TRANS: H2 text for user statistics.
+msgid "Statistics"
+msgstr "Estatísticas"
+
 #. TRANS: Label for user statistics.
 msgid "User ID"
 msgstr "ID do usuário"
@@ -9729,10 +9115,6 @@ msgstr "ID do usuário"
 msgid "Member since"
 msgstr "Membro desde"
 
-#. TRANS: Label for user statistics.
-msgid "Notices"
-msgstr "Mensagens"
-
 #. TRANS: Label for user statistics.
 #. TRANS: Average count of posts made per day since account registration.
 msgid "Daily average"
@@ -9825,6 +9207,7 @@ msgid "Keyword(s)"
 msgstr "Palavra(s)-chave"
 
 #. TRANS: Button text for searching site.
+#. TRANS: Button text for search button on search form.
 #. TRANS: Button text to search profiles.
 msgctxt "BUTTON"
 msgid "Search"
@@ -9875,23 +9258,6 @@ msgstr "Encontre conteúdo de mensagens"
 msgid "Find groups on this site"
 msgstr "Encontre grupos neste site"
 
-#. TRANS: Secondary navigation menu item leading to help on StatusNet.
-msgctxt "MENU"
-msgid "Help"
-msgstr "Ajuda"
-
-#. TRANS: Secondary navigation menu item leading to text about StatusNet site.
-#, fuzzy
-msgctxt "MENU"
-msgid "About"
-msgstr "Sobre"
-
-#. TRANS: Secondary navigation menu item leading to Frequently Asked Questions.
-#, fuzzy
-msgctxt "MENU"
-msgid "FAQ"
-msgstr "FAQ"
-
 #. TRANS: Secondary navigation menu item leading to Terms of Service.
 #, fuzzy
 msgctxt "MENU"
@@ -9916,19 +9282,6 @@ msgctxt "MENU"
 msgid "Version"
 msgstr "Versão"
 
-#. TRANS: Secondary navigation menu item leading to e-mail contact information on the
-#. TRANS: StatusNet site, where to report bugs, ...
-#, fuzzy
-msgctxt "MENU"
-msgid "Contact"
-msgstr "Contato"
-
-#. TRANS: Secondary navigation menu item. Leads to information about embedding a timeline widget.
-#, fuzzy
-msgctxt "MENU"
-msgid "Badge"
-msgstr "Mini-aplicativo"
-
 #. TRANS: Default title for section/sidebar widget.
 msgid "Untitled section"
 msgstr "Seção sem título"
@@ -9977,10 +9330,6 @@ msgstr "E-mail"
 msgid "Change email handling"
 msgstr "Configurações de uso do e-mail"
 
-#. TRANS: Menu item title in settings navigation panel.
-msgid "Design your profile"
-msgstr "Mude a aparência do seu perfil"
-
 #. TRANS: Menu item in settings navigation panel.
 #, fuzzy
 msgctxt "MENU"
@@ -9989,7 +9338,7 @@ msgstr "Site"
 
 #. TRANS: Menu item title in settings navigation panel.
 msgid "URL shorteners"
-msgstr ""
+msgstr "Encurtadores de URL"
 
 #. TRANS: Menu item in settings navigation panel.
 #, fuzzy
@@ -10021,6 +9370,15 @@ msgstr "Conexões"
 msgid "Authorized connected applications"
 msgstr "Aplicações autorizadas conectadas"
 
+#. TRANS: Menu item in settings navigation panel.
+msgctxt "MENU"
+msgid "Old school"
+msgstr ""
+
+#. TRANS: Menu item title in settings navigation panel.
+msgid "UI tweaks for old-school users"
+msgstr ""
+
 #. TRANS: Title of form to silence a user.
 #, fuzzy
 msgctxt "TITLE"
@@ -10031,6 +9389,44 @@ msgstr "Silenciar"
 msgid "Silence this user"
 msgstr "Silenciar este usuário"
 
+#. TRANS: Server error displayed when trying to create an anynymous OAuth consumer.
+msgid "Could not create anonymous consumer."
+msgstr "Não é possível criar um consumidor anônimo."
+
+#. TRANS: Server error displayed when trying to create an anynymous OAuth application.
+msgid "Could not create anonymous OAuth application."
+msgstr "Não é possível criar uma aplicação OAuth anônima."
+
+#. TRANS: Exception thrown when no token association could be found.
+msgid ""
+"Could not find a profile and application associated with the request token."
+msgstr ""
+"Não foi possível encontrar um perfil e uma aplicação associados ao token "
+"requisitado."
+
+#. TRANS: Exception thrown when no access token can be issued.
+msgid "Could not issue access token."
+msgstr "Não foi possível emitir o token de acesso."
+
+#. TRANS: Exception thrown when a database error occurs.
+msgid "Database error inserting OAuth application user."
+msgstr ""
+"Erro no banco de dados durante a inserção do usuário da aplicativo OAuth."
+
+#. TRANS: Exception thrown when a database error occurs.
+msgid "Database error updating OAuth application user."
+msgstr ""
+"Ocorreu um erro no banco de dados durante a atualização do usuário da "
+"aplicação OAuth"
+
+#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
+msgid "Tried to revoke unknown token."
+msgstr "Tentou revogar um código desconhecido."
+
+#. TRANS: Exception thrown when an attempt is made to remove a revoked token.
+msgid "Failed to delete revoked token."
+msgstr "Falha ao eliminar código revogado."
+
 #. TRANS: Menu item in local navigation menu.
 #, fuzzy
 msgctxt "MENU"
@@ -10054,12 +9450,12 @@ msgstr "Assinantes de %s"
 #, php-format
 msgctxt "MENU"
 msgid "Pending (%d)"
-msgstr ""
+msgstr "Pendências (%d)"
 
 #. TRANS: Menu item title in local navigation menu.
 #, php-format
 msgid "Approve pending subscription requests."
-msgstr ""
+msgstr "Aprovar requisições de assinaturas pendentes."
 
 #. TRANS: Menu item title in local navigation menu.
 #. TRANS: %s is a user nickname.
@@ -10088,6 +9484,16 @@ msgstr "Convide seus amigos e colegas para unir-se a você no %s"
 msgid "Subscribe to this user"
 msgstr "Assinar este usuário"
 
+#. TRANS: Button text to subscribe to a user.
+#. TRANS: Button text for subscribing to a list.
+msgctxt "BUTTON"
+msgid "Subscribe"
+msgstr "Assinar"
+
+#. TRANS: Button title to subscribe to a user.
+msgid "Subscribe to this user."
+msgstr "Assinar este usuário."
+
 #. TRANS: Title of personal tag cloud section.
 msgid "People Tagcloud as self-tagged"
 msgstr "Nuvem de etiquetas pessoais definidas pelas próprios usuários"
@@ -10165,7 +9571,6 @@ msgid "Error opening theme archive."
 msgstr "Ocorreu um erro ao abrir o arquivo do tema."
 
 #. TRANS: Header for Notices section.
-#, fuzzy
 msgctxt "HEADER"
 msgid "Notices"
 msgstr "Mensagens"
@@ -10175,13 +9580,13 @@ msgstr "Mensagens"
 #, php-format
 msgid "Show reply"
 msgid_plural "Show all %d replies"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Exibir a resposta"
+msgstr[1] "Exibir todas as %d respostas"
 
 #. TRANS: Reference to the logged in user in favourite list.
 msgctxt "FAVELIST"
 msgid "You"
-msgstr ""
+msgstr "Você"
 
 #. TRANS: For building a list such as "Jim, Bob, Mary and 5 others like this".
 #. TRANS: %1$s is a list of users, separated by a separator (default: ", "), %2$s is the last user in the list.
@@ -10217,16 +9622,26 @@ msgstr[1] ""
 #. TRANS: List message for notice repeated by logged in user.
 #, fuzzy
 msgctxt "REPEATLIST"
-msgid "You have repeated this notice."
+msgid "You repeated this."
 msgstr "Você já repetiu essa mensagem."
 
-#. TRANS: List message for repeated notices.
-#. TRANS: %d is the number of users that have repeated a notice.
+#. TRANS: List message for when more than 4 people repeat something.
+#. TRANS: %%s is a list of users liking a notice, %d is the number over 4 that like the notice.
+#. TRANS: Plural is decided on the total number of users liking the notice (count of %%s + %d).
+#, php-format
+msgid "%%s and %d other repeated this."
+msgid_plural "%%s and %d others repeated this."
+msgstr[0] ""
+msgstr[1] ""
+
+#. TRANS: List message for favoured notices.
+#. TRANS: %%s is a list of users liking a notice.
+#. TRANS: Plural is based on the number of of users that have favoured a notice.
 #, fuzzy, php-format
-msgid "One person has repeated this notice."
-msgid_plural "%d people have repeated this notice."
-msgstr[0] "Você já repetiu essa mensagem."
-msgstr[1] "Você já repetiu essa mensagem."
+msgid "%%s repeated this."
+msgid_plural "%%s repeated this."
+msgstr[0] "Repetida para %s"
+msgstr[1] "Repetida para %s"
 
 #. TRANS: Form legend.
 #, fuzzy, php-format
@@ -10235,7 +9650,7 @@ msgstr "Procurar no site"
 
 #. TRANS: Dropdown option for searching in profiles.
 msgid "Everything"
-msgstr ""
+msgstr "Todos"
 
 #. TRANS: Dropdown option for searching in profiles.
 #, fuzzy
@@ -10244,7 +9659,7 @@ msgstr "Nome completo"
 
 #. TRANS: Dropdown option for searching in profiles.
 msgid "URI (Remote users)"
-msgstr ""
+msgstr "URI (Usuários remotos)"
 
 #. TRANS: Dropdown field label.
 #, fuzzy
@@ -10276,13 +9691,13 @@ msgstr "Quem mais publica"
 #. TRANS: Option in drop-down of potential addressees.
 msgctxt "SENDTO"
 msgid "Everyone"
-msgstr ""
+msgstr "Todos"
 
 #. TRANS: Option in drop-down of potential addressees.
 #. TRANS: %s is a StatusNet sitename.
 #, php-format
 msgid "My colleagues at %s"
-msgstr ""
+msgstr "Meus colegas em %s"
 
 #. TRANS: Label for drop-down of potential addressees.
 #, fuzzy
@@ -10325,7 +9740,6 @@ msgid "Unsilence this user"
 msgstr "Encerrar o silenciamento deste usuário"
 
 #. TRANS: Form legend on unsubscribe form.
-#. TRANS: Button title on unsubscribe form.
 msgid "Unsubscribe from this user"
 msgstr "Cancelar a assinatura deste usuário"
 
@@ -10336,6 +9750,11 @@ msgctxt "BUTTON"
 msgid "Unsubscribe"
 msgstr "Cancelar"
 
+#. TRANS: Button title on unsubscribe form.
+#, fuzzy
+msgid "Unsubscribe from this user."
+msgstr "Cancelar a assinatura deste usuário"
+
 #. TRANS: Exception text shown when no profile can be found for a user.
 #. TRANS: %1$s is a user nickname, $2$d is a user ID (number).
 #, fuzzy, php-format
@@ -10412,15 +9831,9 @@ msgstr "Tamanho inválido."
 
 #. TRANS: Exception.
 msgid "Invalid XML, missing XRD root."
-msgstr ""
+msgstr "XML inválido, raiz XRD perdida."
 
 #. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
 #, php-format
 msgid "Getting backup from file '%s'."
-msgstr ""
-
-#~ msgid "%1$s and friends, page %2$d"
-#~ msgstr "%1$s e amigos, pág. %2$d"
-
-#~ msgid "You and friends"
-#~ msgstr "Você e amigos"
+msgstr "Obtendo um backup do arquivo '%s'."
diff --git a/locale/ru/LC_MESSAGES/statusnet.po b/locale/ru/LC_MESSAGES/statusnet.po
index d75d0c2e88..b594943328 100644
--- a/locale/ru/LC_MESSAGES/statusnet.po
+++ b/locale/ru/LC_MESSAGES/statusnet.po
@@ -1,10 +1,11 @@
-# Translation of StatusNet - Core to Russian (Ру��кий)
+# Translation of StatusNet - Core to Russian (ру��кий)
 # Exported from translatewiki.net
 #
 # Author: AVRS
 # Author: Brion
 # Author: Eleferen
 # Author: Haffman
+# Author: Kaganer
 # Author: Kirill
 # Author: Lionbeat
 # Author: Lockal
@@ -18,18 +19,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:41+0000\n"
-"Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:35+0000\n"
+"Language-Team: Russian <https://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
-"X-POT-Import-Date: 2011-05-05 10:52:40+0000\n"
+"X-POT-Import-Date: 2012-04-22 22:02:21+0000\n"
 
 #. TRANS: Database error message.
 #, php-format
@@ -39,12 +40,10 @@ msgid ""
 "contact them at %2$s to make sure. Otherwise, wait a few minutes and try "
 "again."
 msgstr ""
-
-#. TRANS: Error message.
-msgid ""
-"An important error occured, probably related to email setup. Check logfiles "
-"for more info."
-msgstr ""
+"База данных %1$s не отвечает должным образом, по�тому �айт может работать "
+"неправильно. �дмини�траторы �айта, веро�тно, знают об �той проблеме, однако "
+"вы можете �в�зать�� � ними по адре�у %2$s, чтобы убедить�� в �том. В "
+"противном �лучае, подождите не�колько минут и попробуйте �нова."
 
 #. TRANS: Error message.
 msgid "An error occurred."
@@ -107,12 +106,11 @@ msgstr "Отключить новые реги�трации."
 msgid "Closed"
 msgstr "Закрыта"
 
-#. TRANS: Title for button to save access settings in site admin panel.
-msgid "Save access settings"
-msgstr "Сохранить на�тройки до�тупа"
+#. TRANS: Button title to save access settings in site admin panel.
+msgid "Save access settings."
+msgstr "Сохранить на�тройки до�тупа."
 
-#. TRANS: Tooltip for button to save access settings in site admin panel.
-#. TRANS: Button text for saving theme settings.
+#. TRANS: Button text to save access settings in site admin panel.
 #. TRANS: Button label to save e-mail preferences.
 #. TRANS: Button label to save IM preferences.
 #. TRANS: Button text in the license admin panel.
@@ -128,7 +126,6 @@ msgstr "Сохранить на�тройки до�тупа"
 #. TRANS: Button text for saving "Other settings" in profile.
 #. TRANS: Button text to save user settings in user admin panel.
 #. TRANS: Button label in the "Edit application" form.
-#. TRANS: Button text on profile design page to save settings.
 #. TRANS: Text for save button on group edit form.
 #. TRANS: Button text to save tags for a profile.
 msgctxt "BUTTON"
@@ -164,22 +161,14 @@ msgstr "�ет такого профил�."
 #. TRANS: Client error displayed trying to reference a non-existing list.
 #. TRANS: Client error displayed when referring to a non-existing list.
 #. TRANS: Client error displayed trying to reference a non-existing list.
-#, fuzzy
 msgid "No such list."
-msgstr "�ет такого тега."
-
-#. TRANS: Client error displayed when trying to add an OMB 0.1 remote profile to a list.
-#, fuzzy
-msgid "You cannot list an OMB 0.1 remote profile with this action."
-msgstr ""
-"Вы не можете подпи�ать�� на удалённый профиль OMB 0.1 � помощью �того "
-"дей�тви�."
+msgstr "�ет такого �пи�ка."
 
 #. TRANS: Client error displayed when an unknown error occurs when adding a user to a list.
 #. TRANS: %s is a username.
 #, php-format
 msgid "There was an unexpected error while listing %s."
-msgstr ""
+msgstr "Произошла непредвиденна� ошибка при добавлении %s в �пи�ок."
 
 #. TRANS: Client error displayed when an unknown error occurs when adding a user to a list.
 #. TRANS: %s is a profile URL.
@@ -188,12 +177,13 @@ msgid ""
 "There was a problem listing %s. The remote server is probably not responding "
 "correctly. Please try retrying later."
 msgstr ""
+"Возникла проблема � добавлением %s в �пи�ок. Удалённый �ервер, веро�тно, не "
+"отвечает правильно. Пожалуй�та, попробуйте повторить позже."
 
 #. TRANS: Title after adding a user to a list.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Listed"
-msgstr "Лицензи�"
+msgstr "Добавлены в �пи�ок"
 
 #. TRANS: Server error when page not found (404).
 #. TRANS: Server error when page not found (404)
@@ -205,7 +195,6 @@ msgstr "�ет такой �траницы."
 #. TRANS: Client error when user not found for an rss related action.
 #. TRANS: Client error displayed when no existing user is provided for a user's delivery device setting.
 #. TRANS: Client error displayed if a user could not be found.
-#. TRANS: Client error when user not found updating a profile background image.
 #. TRANS: Client error displayed updating profile image without having a user object.
 #. TRANS: Client error displayed when making an Atom API request for an unknown user.
 #. TRANS: Client error displayed when trying to block a non-existing user or a user from another site.
@@ -231,14 +220,11 @@ msgstr "�ет такой �траницы."
 #. TRANS: Client error displayed when trying to get the RSS feed with favorites of a user that does not exist.
 #. TRANS: Client error displayed when requesting Friends of a Friend feed without providing a user nickname.
 #. TRANS: Client error displayed when requesting Friends of a Friend feed for an object that is not a user.
-#. TRANS: Client error displayed when trying to get a user hCard for a non-existing user.
 #. TRANS: Client error displayed trying to make a micro summary without providing a valid user.
 #. TRANS: Client error displayed trying to send a direct message to a non-existing user.
 #. TRANS: Client error displayed trying to use "one time password login" without using an existing user.
 #. TRANS: Client error displayed when referring to non-existing user.
 #. TRANS: Client error displayed trying to perform an action related to a non-existing user.
-#. TRANS: Form validation error on page for remote subscribe when no user was provided.
-#. TRANS: Form validation error on page for remote subscribe when no user profile was found.
 #. TRANS: Client error displayed when trying to reply to a non-exsting user.
 #. TRANS: Client error displayed when providing a non-existing nickname in a RSS 1.0 action.
 #. TRANS: Client error.
@@ -247,7 +233,6 @@ msgstr "�ет такой �траницы."
 #. TRANS: Client error displayed trying to find a user by ID for a non-existing ID.
 #. TRANS: Client error displayed requesting groups for a non-existing user.
 #. TRANS: Client error displayed when user not found for an action.
-#. TRANS: Client error displayed providing a non-existing nickname.
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #. TRANS: Client error displayed when trying to perform a gallery action with an unknown user.
 #. TRANS: Client error displayed when trying to access a mailbox without providing a user.
@@ -256,15 +241,21 @@ msgid "No such user."
 msgstr "�ет такого пользовател�."
 
 #. TRANS: Title of a user's own start page.
-#, fuzzy
 msgid "Home timeline"
-msgstr "Лента %s"
+msgstr "Мо� о�новна� лента"
 
 #. TRANS: Title of another user's start page.
 #. TRANS: %s is the other user's name.
-#, fuzzy, php-format
+#, php-format
 msgid "%s's home timeline"
-msgstr "Лента %s"
+msgstr "О�новна� лента %s"
+
+#. TRANS: %s is user nickname.
+#. TRANS: Feed title.
+#. TRANS: %s is tagger's nickname.
+#, php-format
+msgid "Feed for friends of %s (Activity Streams JSON)"
+msgstr "Лента друзей %s (JSON Activity Streams)"
 
 #. TRANS: %s is user nickname.
 #, php-format
@@ -309,7 +300,7 @@ msgstr ""
 "Вы можете попробовать «[подтолкнуть %1$s](../%2$s)» из их профил� или "
 "[напи�ать им что-нибудь](%%%%action.newnotice%%%%?status_textarea=%3$s)."
 
-#. TRANS: Encoutagement displayed on empty timeline user pages for anonymous users.
+#. TRANS: Encouragement displayed on empty timeline user pages for anonymous users.
 #. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
 #. TRANS: Empty list message for page with replies for a user for not logged in users.
 #. TRANS: %1$s is a user nickname. This message contains a Markdown link in the form [link text](link).
@@ -323,6 +314,12 @@ msgstr ""
 "Почему бы не [зареги�трировать��](%%%%action.register%%%%), чтобы "
 "«подтолкнуть» %s или о�тавить запи�ь дл� них?"
 
+#. TRANS: Button text for inviting more users to the StatusNet instance.
+#. TRANS: Less business/enterprise-oriented language for public sites.
+msgctxt "BUTTON"
+msgid "Send invite"
+msgstr "Отправить приглашение"
+
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Title of API timeline for a user and friends.
 #. TRANS: %s is a username.
@@ -331,8 +328,6 @@ msgstr ""
 #. TRANS: %s is a username.
 #. TRANS: Menu item title in personal group navigation menu.
 #. TRANS: %s is a username.
-#. TRANS: Menu item title in settings navigation panel.
-#. TRANS: %s is a username.
 #, php-format
 msgid "%s and friends"
 msgstr "%s и друзь�"
@@ -372,7 +367,6 @@ msgstr ""
 #. TRANS: Server error thrown on database error updating SMS preferences.
 #. TRANS: Server error thrown on database error removing a registered SMS phone number.
 #. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
-#. TRANS: Server exception thrown on Profile design page when updating design settings fails.
 msgid "Could not update user."
 msgstr "�е удаёт�� обновить пользовател�."
 
@@ -387,7 +381,6 @@ msgstr "�е удаёт�� �охранить профиль."
 
 #. TRANS: Client error displayed when the number of bytes in a POST request exceeds a limit.
 #. TRANS: %s is the number of bytes of the CONTENT_LENGTH.
-#. TRANS: Form validation error in design settings form. POST should remain untranslated.
 #, php-format
 msgid ""
 "The server was unable to handle that much POST data (%s byte) due to its "
@@ -405,24 +398,6 @@ msgstr[2] ""
 "Сервер не �мог обработать �только POST-данных (%s байт) из-за текущей "
 "конфигурации."
 
-#. TRANS: Client error displayed when saving design settings fails because of an empty id.
-#. TRANS: Client error displayed when saving design settings fails because of an empty result.
-#. TRANS: Client error displayed when a database error occurs inserting profile colours.
-#. TRANS: Client error displayed when a database error occurs updating profile colours.
-#. TRANS: Form validation error displayed when group design settings could not be saved because of an application issue.
-#. TRANS: Form validation error on Profile design page when saving design settings has failed.
-#. TRANS: Form validation error on Profile design page when updating design settings has failed.
-msgid "Unable to save your design settings."
-msgstr "�е удаёт�� �охранить ваши на�тройки оформлени�!"
-
-#. TRANS: Error displayed when updating design settings fails.
-#. TRANS: Client error displayed when a database error occurs updating profile colours.
-#. TRANS: Form validation error on Profile design page when updating design settings has failed.
-#. TRANS: Error message displayed if design settings could not be saved.
-#. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
-msgid "Could not update your design."
-msgstr "�е удаёт�� обновить ваше оформление."
-
 #. TRANS: Title for Atom feed.
 msgctxt "ATOM"
 msgid "Main"
@@ -469,6 +444,20 @@ msgstr "�еудача при блокировке пользовател�."
 msgid "Unblock user failed."
 msgstr "�еудача при разблокировке пользовател�."
 
+#. TRANS: Client exception thrown when no conversation ID is given.
+msgid "No conversation ID."
+msgstr "�ет идентификатора об�уждени�."
+
+#. TRANS: Client exception thrown when referring to a non-existing conversation ID (%d).
+#, php-format
+msgid "No conversation with ID %d."
+msgstr "�ет об�уждени� � идентификатором %d."
+
+#. TRANS: Title for conversion timeline.
+msgctxt "TITLE"
+msgid "Conversation"
+msgstr "Перепи�ка"
+
 #. TRANS: Title. %s is a user nickname.
 #, php-format
 msgid "Direct messages from %s"
@@ -515,6 +504,8 @@ msgstr ""
 "вашим другом."
 
 #. TRANS: Client error displayed trying to direct message self (403).
+#. TRANS: Client error displayed trying to send a direct message to self.
+#. TRANS: Error text shown when trying to send a direct message to self.
 msgid ""
 "Do not send a message to yourself; just say it to yourself quietly instead."
 msgstr "�е по�ылайте �ообщени� �ами �ебе; про�то потихоньку �кажите �то �ебе."
@@ -747,7 +738,6 @@ msgstr "группы на %s"
 
 #. TRANS: Client error displayed when trying to edit a group without being an admin.
 #. TRANS: Client error displayed trying to edit a group while not being a group admin.
-#. TRANS: Client error displayed trying to change group design settings without being a (group) admin.
 #. TRANS: Client error displayed when trying to change group logo settings while not being a group admin.
 msgid "You must be an admin to edit the group."
 msgstr "Вы должны быть админи�тратором, чтобы измен�ть информацию о группе."
@@ -777,63 +767,57 @@ msgstr "�лиа� не может �овпадать � именем польз
 #. TRANS: Client error displayed when referring to a non-existing list.
 #. TRANS: Client error displayed trying to perform an action related to a non-existing list.
 #. TRANS: Client error displayed when referring to a non-existing list.
-#, fuzzy
 msgid "List not found."
-msgstr "Метод API не найден."
+msgstr "Спи�ок не найден."
 
 #. TRANS: Client error displayed when trying to update another user's list.
 msgid "You cannot update lists that do not belong to you."
-msgstr ""
+msgstr "Вы не можете обновить �пи�ки, которые вам не принадлежат."
 
 #. TRANS: Client error displayed when an unknown error occurs updating a list.
 #. TRANS: Client error displayed when an unknown error occurs viewing list members.
 #. TRANS: Client error displayed when an unknown error occurs in the list subscribers action.
 #. TRANS: Client error displayed when an unknown error occurs unsubscribing from a list.
-#, fuzzy
 msgid "An error occured."
 msgstr "Произошла ошибка."
 
 #. TRANS: Client error displayed when trying to delete another user's list.
 msgid "You cannot delete lists that do not belong to you."
-msgstr ""
+msgstr "Вы не можете удал�ть �пи�ки, которые вам не принадлежат."
 
 #. TRANS: Client error displayed when referring to a non-list member.
-#, fuzzy
 msgid "The specified user is not a member of this list."
-msgstr "Пользователь не �вл�ет�� членом �той группы."
+msgstr "Указанный пользователь не входит в �тот �пи�ок."
 
 #. TRANS: Client error displayed when trying to add members to a list without having the right to do so.
-#, fuzzy
 msgid "You are not allowed to add members to this list."
-msgstr "Вы не можете �оздавать группы на �том �айте."
+msgstr "Вы не можете добавл�ть пользователей в �тот �пи�ок."
 
 #. TRANS: Client error displayed when trying to modify list members without specifying them.
-#, fuzzy
 msgid "You must specify a member."
-msgstr "�еобходимо указать профиль."
+msgstr "�еобходимо указать уча�тника."
 
 #. TRANS: Client error displayed when trying to remove members from a list without having the right to do so.
-#, fuzzy
 msgid "You are not allowed to remove members from this list."
-msgstr "Вы не можете �оздавать группы на �том �айте."
+msgstr "Вы не можете удал�ть пользователей из �того �пи�ка."
 
 #. TRANS: Client error displayed when trying to remove a list member that is not part of a list.
 msgid "The user you are trying to remove from the list is not a member."
 msgstr ""
+"Пользователь, которого вы пытаете�ь удалить из �пи�ка, не указан в �том "
+"�пи�ке."
 
 #. TRANS: Client error displayed when trying to create a list without a name.
-#, fuzzy
 msgid "A list must have a name."
-msgstr "POST-запро� Atom должен быть объектом Atom."
+msgstr "Спи�ок должен иметь название."
 
 #. TRANS: Client error displayed when a membership check for a user is nagative.
 msgid "The specified user is not a subscriber of this list."
-msgstr ""
+msgstr "Указанный пользователь не подпи�ан на �тот �пи�ок."
 
 #. TRANS: Client error displayed when trying to unsubscribe from a non-subscribed list.
-#, fuzzy
 msgid "You are not subscribed to this list."
-msgstr "Вы не подпи�аны на �тот профиль."
+msgstr "Вы не подпи�аны на �тот �пи�ок."
 
 #. TRANS: Client error displayed when uploading a media file has failed.
 msgid "Upload failed."
@@ -865,7 +849,6 @@ msgstr "Ошибка базы данных при в�тавке oauth_token_ass
 
 #. TRANS: Client error given on when invalid data was passed through a form in the OAuth API.
 #. TRANS: Unexpected validation error on avatar upload form.
-#. TRANS: Client error displayed when the submitted form contains unexpected data.
 #. TRANS: Client error displayed submitting invalid form data for edit application.
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
 #. TRANS: Form validation error message when an unsupported argument is used.
@@ -874,7 +857,6 @@ msgstr "Ошибка базы данных при в�тавке oauth_token_ass
 #. TRANS: Client error when submitting a form with unexpected information.
 #. TRANS: Client error displayed when unexpected data is posted in the password recovery form.
 #. TRANS: Message given submitting a form with an unknown action in SMS settings.
-#. TRANS: Unknown form validation error in design settings form.
 msgid "Unexpected form submission."
 msgstr "�етиповое подтверждение формы."
 
@@ -920,7 +902,6 @@ msgstr "�ккаунт"
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Field label on account registration page.
-#. TRANS: Label for nickname on user authorisation page.
 #. TRANS: Field label on group edit form.
 #. TRANS: Dropdown option for searching in profiles.
 msgid "Nickname"
@@ -1094,9 +1075,9 @@ msgstr "Обновлени� %1$s, отмеченные как любимые %2
 
 #. TRANS: Server error displayed whe trying to get a timeline fails.
 #. TRANS: %s is the error message.
-#, fuzzy, php-format
+#, php-format
 msgid "Could not generate feed for list - %s"
-msgstr "�е удаёт�� �оздать токен входа дл� %s"
+msgstr "�е удало�ь �оздать канал дл� �пи�ка — %s"
 
 #. TRANS: Title for timeline of most recent mentions of a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user nickname.
@@ -1234,12 +1215,9 @@ msgstr "Вы должны авторизовать��, чтобы покину
 #. TRANS: Client error displayed when requesting Friends of a Friend feed for a nickname that is not a group.
 #. TRANS: Client error displayed trying to block a user from a group while specifying a non-existing group.
 #. TRANS: Client error displayed referring to a group's permalink for a non-existing group ID.
-#. TRANS: Client error displayed trying to change group design settings while providing a nickname for a non-existing group.
 #. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
 #. TRANS: Client error displayed when trying to view group members for a non-existing group.
 #. TRANS: Client error displayed when trying to view group members for an object that is not a group.
-#. TRANS: Client error displayed when trying to view group members for a non-existing group.
-#. TRANS: Client error displayed when trying to view group members for an object that is not a group.
 #. TRANS: Client error displayed when requesting a group RSS feed for group that does not exist.
 #. TRANS: Client error displayed when requesting a group RSS feed for an object that is not a group.
 #. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
@@ -1248,10 +1226,10 @@ msgstr "Вы должны авторизовать��, чтобы покину
 #. TRANS: Client error displayed when trying to leave a non-local group.
 #. TRANS: Client error displayed when trying to leave a non-existing group.
 #. TRANS: Client error displayed when providing an invalid group ID on the Make Admin page.
-#. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
-#. TRANS: Client error displayed if no local group with a given name was found requesting group page.
 #. TRANS: Command exception text shown when a group is requested that does not exist.
 #. TRANS: Error text shown when trying to leave a group that does not exist.
+#. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
+#. TRANS: Client error displayed if no local group with a given name was found requesting group page.
 msgid "No such group."
 msgstr "�ет такой группы."
 
@@ -1264,15 +1242,16 @@ msgstr "�ет имени или ID."
 
 #. TRANS: Client error displayed trying to approve group membership while not logged in.
 #. TRANS: Client error displayed when trying to leave a group while not logged in.
-#, fuzzy
 msgid "Must be logged in."
-msgstr "�е авторизован."
+msgstr "�ужно войти в �и�тему."
 
 #. TRANS: Client error displayed trying to approve group membership while not a group administrator.
 #. TRANS: Client error displayed when trying to approve or cancel a group join request without
 #. TRANS: being a group administrator.
 msgid "Only group admin can approve or cancel join requests."
 msgstr ""
+"Только админи�тратор группы может утверждать или отмен�ть запро�ы на "
+"при�оединение."
 
 #. TRANS: Client error displayed trying to approve group membership without specifying a profile to approve.
 #. TRANS: Client error displayed trying to approve subscriptionswithout specifying a profile to approve.
@@ -1283,32 +1262,33 @@ msgstr "�еобходимо указать профиль."
 #. TRANS: %s is a nickname.
 #. TRANS: Client error displayed when trying to approve a non-existing group join request.
 #. TRANS: %s is a user nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "%s is not in the moderation queue for this group."
-msgstr "Спи�ок пользователей, �вл�ющих�� членами �той группы."
+msgstr "%s от�ут�твует в очереди ожидающих подтверждени� дл� �той группы."
 
 #. TRANS: Client error displayed trying to approve/deny group membership.
 #. TRANS: Client error displayed trying to approve/deny subscription.
 msgid "Internal error: received neither cancel nor abort."
-msgstr ""
+msgstr "Внутренн�� ошибка: не получено ни отмены, ни отказа."
 
 #. TRANS: Client error displayed trying to approve/deny group membership.
 #. TRANS: Client error displayed trying to approve/deny  subscription
 msgid "Internal error: received both cancel and abort."
-msgstr ""
+msgstr "Внутренн�� ошибка: получены одновременно отмена и отказ."
 
 #. TRANS: Server error displayed when cancelling a queued group join request fails.
 #. TRANS: %1$s is the leaving user's nickname, $2$s is the group nickname for which the leave failed.
-#, fuzzy, php-format
+#, php-format
 msgid "Could not cancel request for user %1$s to join group %2$s."
-msgstr "�е удаёт�� при�оединить пользовател� %1$s к группе %2$s."
+msgstr ""
+"�е удало�ь отменить запро� пользовател� %1$s на при�оединение к группе %2$s."
 
 #. TRANS: Title for leave group page after group join request is approved/disapproved.
 #. TRANS: %1$s is the user nickname, %2$s is the group nickname.
-#, fuzzy, php-format
+#, php-format
 msgctxt "TITLE"
 msgid "%1$s's request for %2$s"
-msgstr "Стату� %1$s на %2$s"
+msgstr "Запро� %1$s дл� %2$s"
 
 #. TRANS: Message on page for group admin after approving a join request.
 msgid "Join request approved."
@@ -1319,22 +1299,25 @@ msgid "Join request canceled."
 msgstr "Запро� на при�оединение отменён."
 
 #. TRANS: Client error displayed trying to approve subscription for a non-existing request.
+#. TRANS: %s is a user nickname.
 #, php-format
 msgid "%s is not in the moderation queue for your subscriptions."
 msgstr "%s от�ут�твует в очереди ожидающих подтверждени� �реди ваших подпи�ок."
 
 #. TRANS: Server error displayed when cancelling a queued subscription request fails.
 #. TRANS: %1$s is the leaving user's nickname, $2$s is the nickname for which the leave failed.
-#, fuzzy, php-format
+#, php-format
 msgid "Could not cancel or approve request for user %1$s to join group %2$s."
-msgstr "�е удаёт�� при�оединить пользовател� %1$s к группе %2$s."
+msgstr ""
+"�е удало�ь отменить или подтвердить запро� пользовател� %1$s на "
+"при�оединение к группе %2$s."
 
 #. TRANS: Title for subscription approval ajax return
 #. TRANS: %1$s is the approved user's nickname
-#, fuzzy, php-format
+#, php-format
 msgctxt "TITLE"
 msgid "%1$s's request"
-msgstr "Стату� %1$s на %2$s"
+msgstr "Запро� пользовател� %1$s"
 
 #. TRANS: Message on page for user after approving a subscription request.
 msgid "Subscription approved."
@@ -1468,7 +1451,6 @@ msgstr "�ет такого вложени�."
 #. TRANS: Client error displayed trying to get an avatar without providing a nickname.
 #. TRANS: Client error displayed when requesting a list of blocked users for a group without providing a group nickname.
 #. TRANS: Client error displayed trying to edit a group while not proving a nickname for the group to edit.
-#. TRANS: Client error displayed trying to change group design settings without providing a group nickname.
 #. TRANS: Client error displayed when trying to change group logo settings without providing a nickname.
 #. TRANS: Client error displayed when trying to view group members without providing a group nickname.
 #. TRANS: Client error displayed when requesting a group RSS feed without providing a group nickname.
@@ -1768,6 +1750,16 @@ msgstr "�дре� «%s» подтверждён дл� вашего аккау
 msgid "Conversation"
 msgstr "Ди�ку��и�"
 
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+msgid "Conversation feed (Activity Streams JSON)"
+msgstr "Лента перепи�ки (JSON Activity Streams)"
+
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+msgid "Conversation feed (RSS 2.0)"
+msgstr "Лента перепи�ки (RSS 2.0)"
+
 #. TRANS: Title for conversation page.
 #. TRANS: Title for page that shows a notice.
 msgctxt "TITLE"
@@ -1834,8 +1826,8 @@ msgstr ""
 "Введите «%s» дл� подтверждени� �воего �огла�и� на удаление учётной запи�и."
 
 #. TRANS: Button title for user account deletion.
-msgid "Permanently delete your account"
-msgstr "�ав�егда удалить учётную запи�ь"
+msgid "Permanently delete your account."
+msgstr "�ав�егда удалить учётную запи�ь."
 
 #. TRANS: Client error displayed trying to delete an application while not logged in.
 msgid "You must be logged in to delete an application."
@@ -1980,150 +1972,6 @@ msgstr "�е удал�ть �того пользовател�."
 msgid "Delete this user."
 msgstr "Удалить �того пользовател�."
 
-#. TRANS: Message used as title for design settings for the site.
-msgid "Design"
-msgstr "Оформление"
-
-#. TRANS: Instructions for design adminsitration panel.
-msgid "Design settings for this StatusNet site"
-msgstr "�а�тройки оформлени� дл� �того �айта StatusNet"
-
-#. TRANS: Client error displayed when a logo URL does is not valid.
-msgid "Invalid logo URL."
-msgstr "�еверный URL логотипа."
-
-#. TRANS: Client error displayed when an SSL logo URL is invalid.
-msgid "Invalid SSL logo URL."
-msgstr "�еверный URL логотипа SSL."
-
-#. TRANS: Client error displayed when a theme is submitted through the form that is not in the theme list.
-#. TRANS: %s is the chosen unavailable theme.
-#, php-format
-msgid "Theme not available: %s."
-msgstr "Тема не до�тупна: %s."
-
-#. TRANS: Fieldset legend for form to change logo.
-msgid "Change logo"
-msgstr "Изменить логотип"
-
-#. TRANS: Field label for StatusNet site logo.
-msgid "Site logo"
-msgstr "Логотип �айта"
-
-#. TRANS: Field label for SSL StatusNet site logo.
-msgid "SSL logo"
-msgstr "Логотип SSL"
-
-#. TRANS: Fieldset legend for form change StatusNet site's theme.
-msgid "Change theme"
-msgstr "Изменить тему"
-
-#. TRANS: Field label for dropdown to choose site theme.
-msgid "Site theme"
-msgstr "Тема �айта"
-
-#. TRANS: Title for field label for dropdown to choose site theme.
-msgid "Theme for the site."
-msgstr "Тема дл� �айта."
-
-#. TRANS: Field label for uploading a cutom theme.
-msgid "Custom theme"
-msgstr "О�оба� тема"
-
-#. TRANS: Form instructions for uploading a cutom StatusNet theme.
-msgid "You can upload a custom StatusNet theme as a .ZIP archive."
-msgstr "Вы можете загрузить о�обую тему StatusNet в виде ZIP-архива."
-
-#. TRANS: Fieldset legend for theme background image.
-msgid "Change background image"
-msgstr "Изменение фонового изображени�"
-
-#. TRANS: Field label for background image on theme designer page.
-#. TRANS: Field label for background color selector.
-#. TRANS: Label on profile design page for setting a profile page background colour.
-msgid "Background"
-msgstr "Фон"
-
-#. TRANS: Form guide for background image upload form on theme designer page.
-#, php-format
-msgid ""
-"You can upload a background image for the site. The maximum file size is %1"
-"$s."
-msgstr ""
-"Вы можете загрузить фоновое изображение дл� �айта. Мак�имальный размер файла "
-"�о�тавл�ет %1$s."
-
-#. TRANS: Used as radio button label to add a background image.
-msgid "On"
-msgstr "Включить"
-
-#. TRANS: Used as radio button label to not add a background image.
-msgid "Off"
-msgstr "Отключить"
-
-#. TRANS: Form guide for turning background image on or off on theme designer page.
-#. TRANS: Form guide for a set of radio buttons on the profile design page that will enable or disable
-#. TRANS: use of the uploaded profile image.
-msgid "Turn background image on or off."
-msgstr "Включить или отключить показ фонового изображени�."
-
-#. TRANS: Checkbox label to title background image on theme designer page.
-#. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
-msgid "Tile background image"
-msgstr "Ра�т�нуть фоновое изображение"
-
-#. TRANS: Fieldset legend for theme colors.
-msgid "Change colors"
-msgstr "Изменение цвета"
-
-#. TRANS: Field label for content color selector.
-#. TRANS: Label on profile design page for setting a profile page content colour.
-msgid "Content"
-msgstr "Содержание"
-
-#. TRANS: Field label for sidebar color selector.
-#. TRANS: Label on profile design page for setting a profile page sidebar colour.
-msgid "Sidebar"
-msgstr "Бокова� панель"
-
-#. TRANS: Field label for text color selector.
-#. TRANS: Label on profile design page for setting a profile page text colour.
-msgid "Text"
-msgstr "Тек�т"
-
-#. TRANS: Field label for link color selector.
-#. TRANS: Label on profile design page for setting a profile page links colour.
-msgid "Links"
-msgstr "С�ылки"
-
-#. TRANS: Fieldset legend for advanced theme design settings.
-msgid "Advanced"
-msgstr "Ра�ширенный"
-
-#. TRANS: Field label for custom CSS.
-msgid "Custom CSS"
-msgstr "О�обый CSS"
-
-#. TRANS: Button text for resetting theme settings.
-msgctxt "BUTTON"
-msgid "Use defaults"
-msgstr "И�пользовать значени� по умолчанию"
-
-#. TRANS: Title for button for resetting theme settings.
-#. TRANS: Title for button on profile design page to reset all colour settings to default.
-msgid "Restore default designs."
-msgstr "Во��тановить оформление по умолчанию."
-
-#. TRANS: Title for button for resetting theme settings.
-#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-msgid "Reset back to default."
-msgstr "Во��тановить значени� по умолчанию."
-
-#. TRANS: Title for button for saving theme settings.
-#. TRANS: Title for button on profile design page to save settings.
-msgid "Save design."
-msgstr "Сохранить оформление."
-
 #. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
 msgid "This notice is not a favorite!"
 msgstr "Эта запи�ь не входит в чи�ло ваших любимых запи�ей!"
@@ -2138,6 +1986,74 @@ msgstr "Добавить в любимые"
 msgid "No such document \"%s\"."
 msgstr "�ет такого документа «%s»."
 
+#. TRANS: Menu item in administrator navigation panel.
+#. TRANS: Menu item in default local navigation panel.
+#. TRANS: Menu item in personal group navigation menu.
+msgctxt "MENU"
+msgid "Home"
+msgstr "Главна�"
+
+msgctxt "MENU"
+msgid "Docs"
+msgstr "Документаци�"
+
+#. TRANS: Secondary navigation menu item leading to help on StatusNet.
+msgctxt "MENU"
+msgid "Help"
+msgstr "Помощь"
+
+msgid "Getting started"
+msgstr "�ачало работы"
+
+#. TRANS: Secondary navigation menu item leading to text about StatusNet site.
+msgctxt "MENU"
+msgid "About"
+msgstr "О �айте"
+
+msgid "About this site"
+msgstr "Об �том �айте"
+
+#. TRANS: Secondary navigation menu item leading to Frequently Asked Questions.
+msgctxt "MENU"
+msgid "FAQ"
+msgstr "FAQ"
+
+msgid "Frequently asked questions"
+msgstr "Ча�то задаваемые вопро�ы"
+
+#. TRANS: Secondary navigation menu item leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+msgctxt "MENU"
+msgid "Contact"
+msgstr "Контактна� информаци�"
+
+msgid "Contact info"
+msgstr "Контактна� информаци�"
+
+msgctxt "MENU"
+msgid "Tags"
+msgstr "Теги"
+
+msgid "Using tags"
+msgstr "С помощью тегов"
+
+#. TRANS: Menu item in default local navigation panel.
+#. TRANS: Menu item in search group navigation panel.
+#. TRANS: Menu item in local navigation menu.
+msgctxt "MENU"
+msgid "Groups"
+msgstr "Группы"
+
+msgid "Using groups"
+msgstr "И�пользу� группы"
+
+msgctxt "MENU"
+msgid "API"
+msgstr "API"
+
+msgid "RESTful API"
+msgstr "RESTful API"
+
 #. TRANS: Title for "Edit application" form.
 #. TRANS: Form legend.
 msgid "Edit application"
@@ -2242,69 +2158,67 @@ msgstr "�а�тройки �охранены."
 
 #. TRANS: Title for edit list page after deleting a tag.
 #. TRANS: %s is a list.
-#, fuzzy, php-format
+#, php-format
 msgid "Delete %s list"
-msgstr "Удалить �того пользовател�"
+msgstr "Удалить �пи�ок %s"
 
 #. TRANS: Title for edit list page.
 #. TRANS: %s is a list.
 #. TRANS: Form legend for list edit form.
 #. TRANS: %s is a list.
-#, fuzzy, php-format
+#, php-format
 msgid "Edit list %s"
-msgstr "�еверный тег человека: %s."
+msgstr "Редактировать �пи�ок %s"
 
 #. TRANS: Error message displayed when trying to perform an action that requires a tagging user or ID.
-#, fuzzy
 msgid "No tagger or ID."
-msgstr "�ет имени или ID."
+msgstr "�е заданы значени� tagger или id."
 
 #. TRANS: Client error displayed when referring to non-local user.
 msgid "Not a local user."
 msgstr "�ет такого пользовател�."
 
 #. TRANS: Client error displayed when reting to edit a tag that was not self-created.
-#, fuzzy
 msgid "You must be the creator of the tag to edit it."
-msgstr "Вы должны быть админи�тратором, чтобы измен�ть информацию о группе."
+msgstr "Вы должны быть �оздателем тега, чтобы изменить его."
 
 #. TRANS: Form instruction for edit list form.
-#, fuzzy
 msgid "Use this form to edit the list."
-msgstr "Заполните информацию о группе в �ледующие пол�"
+msgstr "Во�пользуйте�ь �той формой, чтобы отредактировать �пи�ок."
 
 #. TRANS: Form validation error displayed if the form data for deleting a tag was incorrect.
-#, fuzzy
 msgid "Delete aborted."
-msgstr "Удалить запи�ь"
+msgstr "Удаление отменено."
 
 #. TRANS: Text in confirmation dialog for deleting a tag.
 msgid ""
 "Deleting this tag will permanantly remove all its subscription and "
 "membership records. Do you still want to continue?"
 msgstr ""
+"Удаление �того тега приведёт к уничтожению в�ей информации о подпи�чиках и "
+"принадлежно�ти к группе. Вы дей�твительно ​​хотите продолжить?"
 
 #. TRANS: Form validation error displayed if a given tag is invalid.
-#, fuzzy
 msgid "Invalid tag."
-msgstr "�едопу�тимое изображение."
+msgstr "�едопу�тимый тег."
 
 #. TRANS: Form validation error displayed if a given tag is already present.
 #. TRANS: %s is the already present tag.
-#, fuzzy, php-format
+#, php-format
 msgid "You already have a tag named %s."
-msgstr "Вы уже повторили �ту запи�ь."
+msgstr "У ва� уже е�ть тег %s."
 
 #. TRANS: Text in confirmation dialog for setting a tag from public to private.
 msgid ""
 "Setting a public tag as private will permanently remove all the existing "
 "subscriptions to it. Do you still want to continue?"
 msgstr ""
+"Указание тега как личного приведёт к необратимому удалению в�ех подпи�ок на "
+"него. Вы в�ё ещё ​​хотите продолжить?"
 
-#. TRANS: TRANS: Server error displayed when updating a list fails.
-#, fuzzy
+#. TRANS: Server error displayed when updating a list fails.
 msgid "Could not update list."
-msgstr "�е удаёт�� обновить пользовател�."
+msgstr "�е удало�ь обновить �пи�ок."
 
 #. TRANS: Title for e-mail settings.
 msgid "Email settings"
@@ -2616,40 +2530,6 @@ msgstr "�ет вложений."
 msgid "No uploaded attachments."
 msgstr "�ет загруженных вложений."
 
-#. TRANS: Client error displayed when subscribing to a remote profile and an unexpected response is received.
-msgid "Not expecting this response!"
-msgstr "�еожиданный ответ!"
-
-#. TRANS: Client error displayed when subscribing to a remote profile that does not exist.
-msgid "User being listened to does not exist."
-msgstr "Указанный пользователь не �уще�твует."
-
-#. TRANS: Client error displayed when subscribing to a remote profile that is a local profile.
-#. TRANS: Client error displayed when using remote subscribe for a local entity.
-msgid "You can use the local subscription!"
-msgstr "Вы можете и�пользовать локальную подпи�ку!"
-
-#. TRANS: Client error displayed when subscribing to a remote profile that is blocked form subscribing to.
-msgid "That user has blocked you from subscribing."
-msgstr "Этот пользователь заблокировал ва� на его подпи�ку."
-
-#. TRANS: Client error displayed when subscribing to a remote profile without providing an authorised token.
-msgid "You are not authorized."
-msgstr "Вы не авторизованы."
-
-#. TRANS: Client error displayed when subscribing to a remote profile and conversion of the request token to access token fails.
-msgid "Could not convert request token to access token."
-msgstr "�е удаёт�� преобразовать ключ запро�а в ключ до�тупа."
-
-#. TRANS: Client error displayed when subscribing to a remote profile fails because of an unsupported version of the OMB protocol.
-msgid "Remote service uses unknown version of OMB protocol."
-msgstr "Удалённый �ерви� и�пользует неизве�тную вер�ию протокола OMB."
-
-#. TRANS: Server error displayed when subscribing to a remote profile fails because the remote profile could not be updated.
-#. TRANS: Exception thrown when updating a remote profile fails in OAuth store.
-msgid "Error updating remote profile."
-msgstr "Ошибка обновлени� удалённого профил�."
-
 #. TRANS: Client error displayed when requesting a non-existent file.
 msgid "No such file."
 msgstr "�ет такого файла."
@@ -2737,31 +2617,6 @@ msgstr "Ошибка базы данных при блокировании по
 msgid "No ID."
 msgstr "�ет ID."
 
-#. TRANS: Client error displayed trying to change group design settings while not logged in.
-msgid "You must be logged in to edit a group."
-msgstr "Вы должны авторизовать��, чтобы изменить группу."
-
-#. TRANS: Title group design settings page.
-msgid "Group design"
-msgstr "Оформление группы"
-
-#. TRANS: Instructions for group design settings page.
-msgid ""
-"Customize the way your group looks with a background image and a colour "
-"palette of your choice."
-msgstr ""
-"�а�тройте внешний вид группы, у�тановив фоновое изображение и цветовую гамму "
-"на ваш выбор."
-
-#. TRANS: Form validation error displayed when group design settings could not be updated because of an application issue.
-msgid "Unable to update your design settings."
-msgstr "�е удаёт�� обновить ваши на�тройки оформлени�."
-
-#. TRANS: Form text to confirm saved group design settings.
-#. TRANS: Confirmation message on Profile design page when saving design settings has succeeded.
-msgid "Design preferences saved."
-msgstr "�а�тройки оформлени� �охранены."
-
 #. TRANS: Title for group logo settings page.
 #. TRANS: Group logo form legend.
 msgid "Group logo"
@@ -2824,14 +2679,14 @@ msgstr "%s уча�тников группы ожидают подтвержде
 
 #. TRANS: Title of all but the first page showing pending group members still awaiting approval to join the group.
 #. TRANS: %1$s is the name of the group, %2$d is the page number of the members list.
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s group members awaiting approval, page %2$d"
-msgstr "Уча�тники группы %1$s, �траница %2$d"
+msgstr ""
+"Пользователи, ожидающие решени� по их при�оединению к %1$s, �траница %2$d"
 
 #. TRANS: Page notice for group members page.
-#, fuzzy
 msgid "A list of users awaiting approval to join this group."
-msgstr "Спи�ок пользователей, �вл�ющих�� членами �той группы."
+msgstr "Пользователи, ожидающие решени� по их при�оединению к �той группе."
 
 #. TRANS: Message is used as link description. %1$s is a group name, %2$s is a site name.
 #, php-format
@@ -2935,8 +2790,8 @@ msgstr "IM-у�тановки"
 #. TRANS: the order and formatting of link text and link should remain unchanged.
 #, php-format
 msgid ""
-"You can send and receive notices through instant messaging [instant messages]"
-"(%%doc.im%%). Configure your addresses and settings below."
+"You can send and receive notices through [instant messaging](%%doc.im%%). "
+"Configure your addresses and settings below."
 msgstr ""
 "Вы можете отправл�ть и получать запи�и � помощью [�ерви�ов бы�трых �ообщений]"
 "(%%doc.im%%). �иже вы можете изменить ваши адре�а и на�тройки."
@@ -3144,28 +2999,6 @@ msgid ""
 "Use this form to invite your friends and colleagues to use this service."
 msgstr "В �той форме вы можете пригла�ить друзей и коллег на �тот �ерви�."
 
-#. TRANS: Field label for a list of e-mail addresses.
-msgid "Email addresses"
-msgstr "Почтовый адре�"
-
-#. TRANS: Tooltip for field label for a list of e-mail addresses.
-msgid "Addresses of friends to invite (one per line)."
-msgstr "�дре�а друзей, которых вы хотите пригла�ить (по одному на �троку)."
-
-#. TRANS: Field label for a personal message to send to invitees.
-msgid "Personal message"
-msgstr "Личное �ообщение"
-
-#. TRANS: Tooltip for field label for a personal message to send to invitees.
-msgid "Optionally add a personal message to the invitation."
-msgstr "Можно добавить к приглашению личное �ообщение."
-
-#. TRANS: Send button for inviting friends
-#. TRANS: Button text for sending notice.
-msgctxt "BUTTON"
-msgid "Send"
-msgstr "Отправить"
-
 #. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral
 #. TRANS: singular 3rd-person pronoun in English. %1$s is the inviting user, $2$s is
 #. TRANS: the StatusNet sitename.
@@ -3184,9 +3017,8 @@ msgid "%1$s joined group %2$s"
 msgstr "%1$s в�тупил в группу %2$s"
 
 #. TRANS: Exception thrown when there is an unknown error joining a group.
-#, fuzzy
 msgid "Unknown error joining group."
-msgstr "�еизве�тна� ошибка при попытке при�оединени� к группе."
+msgstr "�еизве�тна� ошибка при при�оединении к группе."
 
 #. TRANS: Client error displayed when trying to join a group while already a member.
 #. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
@@ -3299,12 +3131,6 @@ msgstr "URL изображени�, отображаемого вме�те � 
 msgid "Save license settings."
 msgstr "Сохранить на�тройки лицензии."
 
-#. TRANS: Client error displayed when trying to log in while already logged in.
-#. TRANS: Client error displayed trying to use "one time password login" when already logged in.
-#. TRANS: Client error displayed when trying to register while already logged in.
-msgid "Already logged in."
-msgstr "Вы уже авторизовали�ь."
-
 #. TRANS: Form validation error displayed when trying to log in with incorrect credentials.
 msgid "Incorrect username or password."
 msgstr "�екорректное им� или пароль."
@@ -3323,9 +3149,8 @@ msgid "Login to site"
 msgstr "�вторизовать��"
 
 #. TRANS: Field label on login page.
-#, fuzzy
 msgid "Username or email address"
-msgstr "Им� или email-адре�"
+msgstr "Им� пользовател� или адре� �лектронной почты"
 
 #. TRANS: Checkbox label label on login page.
 #. TRANS: Checkbox label on account registration page.
@@ -3416,6 +3241,7 @@ msgstr "URL и�точника об�зателен."
 msgid "Could not create application."
 msgstr "�е удаёт�� �оздать приложение."
 
+#. TRANS: Form validation error messages displayed when uploading an invalid application logo.
 msgid "Invalid image."
 msgstr "�едопу�тимое изображение."
 
@@ -3452,12 +3278,6 @@ msgstr "�ет контента!"
 msgid "No recipient specified."
 msgstr "�ет адре�ата."
 
-#. TRANS: Client error displayed trying to send a direct message to self.
-#. TRANS: Error text shown when trying to send a direct message to self.
-msgid ""
-"Don't send a message to yourself; just say it to yourself quietly instead."
-msgstr "�е по�ылайте �ообщени� �ами �ебе; про�то потихоньку �кажите �то �ебе."
-
 #. TRANS: Page title after sending a direct message.
 msgid "Message sent"
 msgstr "Сообщение отправлено"
@@ -3662,6 +3482,32 @@ msgstr "Только %s URL в про�том HTTP, пожалуй�та."
 msgid "Not a supported data format."
 msgstr "�еподдерживаемый формат данных."
 
+#. TRANS: Page title for profile settings.
+msgid "Old school UI settings"
+msgstr "Старые параметры на�тройки UI"
+
+#. TRANS: Usage instructions for profile settings.
+msgid "If you like it \"the old way\", you can set that here."
+msgstr ""
+
+#. TRANS: Confirmation shown when user profile settings are saved.
+#. TRANS: Message after successful saving of administrative settings.
+msgid "Settings saved."
+msgstr "�а�тройки �охранены."
+
+msgid "Only stream mode (no conversations) in timelines"
+msgstr ""
+
+msgid "Show conversation page as hierarchical trees"
+msgstr ""
+
+msgid "Show nicknames (not full names) in timelines"
+msgstr ""
+
+#. TRANS: Button text to save a list.
+msgid "Save"
+msgstr "Сохранить"
+
 #. TRANS: ShortName in the OpenSearch interface when trying to find users.
 msgid "People Search"
 msgstr "Пои�к людей"
@@ -3670,6 +3516,11 @@ msgstr "Пои�к людей"
 msgid "Notice Search"
 msgstr "Пои�к в запи��х"
 
+#. TRANS: Client error displayed trying to use "one time password login" when already logged in.
+#. TRANS: Client error displayed when trying to register while already logged in.
+msgid "Already logged in."
+msgstr "Вы уже авторизовали�ь."
+
 #. TRANS: Client error displayed trying to use "one time password login" without specifying a user.
 msgid "No user ID specified."
 msgstr "�е указан идентификатор пользовател�."
@@ -3741,7 +3592,7 @@ msgid "Confirm"
 msgstr "Подтверждение"
 
 #. TRANS: Field title on page where to change password.
-#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
+#. TRANS: Title for field label for password reset form where the password has to be typed again.
 #. TRANS: Field title on account registration page.
 msgid "Same as password above."
 msgstr "Тот же пароль, что и выше."
@@ -3799,12 +3650,6 @@ msgstr "Директори� тем не до�тупна дл� чтени�: %
 msgid "Avatar directory not writable: %s."
 msgstr "Директори� аватар не до�тупна дл� запи�и: %s."
 
-#. TRANS: Client error in Paths admin panel.
-#. TRANS: %s is the background directory that could not be written to.
-#, php-format
-msgid "Background directory not writable: %s."
-msgstr "Директори� фоновых изображений не до�тупна дл� запи�и: %s."
-
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the locales directory that could not be read from.
 #, php-format
@@ -3917,30 +3762,6 @@ msgstr "Директори� аватар"
 msgid "Directory where avatars are located."
 msgstr "Директори�, в которой ра�положены аватары."
 
-#. TRANS: Fieldset legend in Paths admin panel.
-msgid "Backgrounds"
-msgstr "Фоновые изображени�"
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-msgid "Server for backgrounds."
-msgstr "Сервер дл� фоновых изображений."
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-msgid "Web path to backgrounds."
-msgstr "Веб-путь к фоновым изображени�м."
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-msgid "Server for backgrounds on SSL pages."
-msgstr "Сервер дл� фоновых изображений на �траницах SSL."
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-msgid "Web path to backgrounds on SSL pages."
-msgstr "Веб-путь к фоновым изображени�м дл� SSL-�траниц."
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-msgid "Directory where backgrounds are located."
-msgstr "Директори�, в которой ра�положены фоновые изображени�."
-
 #. TRANS: Fieldset legens in Paths admin panel.
 msgid "Attachments"
 msgstr "Вложени�"
@@ -3996,8 +3817,8 @@ msgid "Server to direct SSL requests to."
 msgstr "Сервер, которому направл�ть SSL-запро�ы."
 
 #. TRANS: Button title text to store form data in the Paths admin panel.
-msgid "Save paths"
-msgstr "Сохранить пути"
+msgid "Save path settings."
+msgstr "Сохранить на�тройки пути."
 
 #. TRANS: Instructions for the "People search" page.
 #. TRANS: %%site.name%% is the name of the StatusNet site.
@@ -4015,93 +3836,88 @@ msgstr "Пои�к людей"
 
 #. TRANS: Title for list page.
 #. TRANS: %s is a list.
-#, fuzzy, php-format
+#, php-format
 msgid "Public list %s"
-msgstr "Общее облако тегов"
+msgstr "Открытый �пи�ок %s"
 
 #. TRANS: Title for list page.
 #. TRANS: %1$s is a list, %2$d is a page number.
-#, fuzzy, php-format
+#, php-format
 msgid "Public list %1$s, page %2$d"
-msgstr "Ответы дл� %1$s, �траница %2$d"
+msgstr "Открытый �пи�ок %1$s, �траница %2$d"
 
 #. TRANS: Message for anonymous users on list page.
 #. TRANS: This message contains Markdown links in the form [description](link).
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "Lists are how you sort similar people on %%site.name%%, a [micro-blogging]"
 "(http://en.wikipedia.org/wiki/Micro-blogging) service based on the Free "
 "Software [StatusNet](http://status.net/) tool. You can then easily keep "
 "track of what they are doing by subscribing to the list's timeline."
 msgstr ""
-"**%s** — группа на %%%%site.name%%%%, �ерви�е [микроблоггинга](http://ru."
-"wikipedia.org/wiki/Микроблоггинг), о�нованном на �вободном программном "
-"обе�печении [StatusNet](http://status.net/). Уча�тники обменивают�� "
-"короткими �ообщени�ми о �воей жизни и интере�ах. "
+"Спи�ки — �то �по�об �группировать похожих пользователей на %%site.name%%, "
+"�ерви�е [микроблогов](http://ru.wikipedia.org/wiki/Микроблоггинг), "
+"работающем на �вободном программном обе�печении [StatusNet](http://status."
+"net/). Вы можете � легко�тью от�леживать в�е �обыти�, о которых пишут �ти "
+"люди, про�то подпи�авши�ь на ленту �ообщений �того �пи�ка."
 
 #. TRANS: Client error displayed when a tagger is expected but not provided.
-#, fuzzy
 msgid "No tagger."
-msgstr "�ет такого тега."
+msgstr "�ет автора тега."
 
 #. TRANS: Title for list of people listed by the user.
 #. TRANS: %1$s is a list, %2$s is a username.
-#, fuzzy, php-format
+#, php-format
 msgid "People listed in %1$s by %2$s"
-msgstr "Ответы на запи�и %1$s на %2$s."
+msgstr "Люди, указанные в �пи�ке %1$s пользователем %2$s"
 
 #. TRANS: Title for list of people listed by the user.
 #. TRANS: %1$s is a list, %2$s is a username, %2$s is a page number.
-#, fuzzy, php-format
+#, php-format
 msgid "People listed in %1$s by %2$s, page %3$d"
-msgstr "Ответы дл� %1$s, �траница %2$d"
+msgstr "Люди, указанные в �пи�ке %1$s пользователем %2$s, �траница %3$d"
 
 #. TRANS: Addition in tag membership list for creator of a tag.
 #. TRANS: Addition in tag subscribers list for creator of a tag.
-#, fuzzy
 msgid "Creator"
-msgstr "Дата �оздани�"
+msgstr "Создатель"
 
 #. TRANS: Title for lists by a user page for a private tag.
-#, fuzzy
 msgid "Private lists by you"
-msgstr "�пи�ок людей, которые �лед�т за вами"
+msgstr "Ваши личные �пи�ки"
 
 #. TRANS: Title for lists by a user page for a public tag.
-#, fuzzy
 msgid "Public lists by you"
-msgstr "Общее облако тегов"
+msgstr "Ваши открытые �пи�ки"
 
 #. TRANS: Title for lists by a user page.
-#, fuzzy
 msgid "Lists by you"
-msgstr "Изменить информацию о группе %s"
+msgstr "Ваши �пи�ки"
 
 #. TRANS: Title for lists by a user page.
 #. TRANS: %s is a user nickname.
 #, php-format
 msgid "Lists by %s"
-msgstr ""
+msgstr "Спи�ки пользовател� %s"
 
 #. TRANS: Title for lists by a user page.
 #. TRANS: %1$s is a user nickname, %2$d is a page number.
-#, fuzzy, php-format
+#, php-format
 msgid "Lists by %1$s, page %2$d"
-msgstr "Запи�и � тегом %1$s, �траница %2$d"
+msgstr "Спи�ки пользовател� %1$s, �траница %2$d"
 
 #. TRANS: Client error displayed when trying view another user's private lists.
 msgid "You cannot view others' private lists"
-msgstr ""
+msgstr "Вы не можете про�матривать личные �пи�ки других пользователей"
 
 #. TRANS: Mode selector label.
-#, fuzzy
 msgid "Mode"
-msgstr "Модерировать"
+msgstr "Режим"
 
 #. TRANS: Link text to show lists for user %s.
-#, fuzzy, php-format
+#, php-format
 msgid "Lists for %s"
-msgstr "И�ход�щие дл� %s"
+msgstr "Спи�ки %s"
 
 #. TRANS: Fieldset legend.
 #. TRANS: Fieldset legend on gallery action page.
@@ -4110,18 +3926,16 @@ msgstr "Выберите тег дл� фильтрации"
 
 #. TRANS: Checkbox title.
 msgid "Show private tags."
-msgstr ""
+msgstr "Показывать личные теги."
 
 #. TRANS: Checkbox label to show public tags.
-#, fuzzy
 msgctxt "LABEL"
 msgid "Public"
-msgstr "Общее"
+msgstr "Открытые"
 
 #. TRANS: Checkbox title.
-#, fuzzy
 msgid "Show public tags."
-msgstr "�ет такого тега."
+msgstr "Показывать открытые теги."
 
 #. TRANS: Submit button text for tag filter form.
 #. TRANS: Submit button text on gallery action page.
@@ -4132,87 +3946,91 @@ msgstr "Перейти"
 #. TRANS: Message displayed for anonymous users on page that displays lists by a user.
 #. TRANS: This message contains Markdown links in the form [description](links).
 #. TRANS: %s is a tagger nickname.
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "These are lists created by **%s**. Lists are how you sort similar people on %"
 "%%%site.name%%%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
 "blogging) service based on the Free Software [StatusNet](http://status.net/) "
 "tool. You can easily keep track of what they are doing by subscribing to the "
-"tag's timeline."
+"list's timeline."
 msgstr ""
-"**%s** — группа на %%%%site.name%%%%, �ерви�е [микроблоггинга](http://ru."
-"wikipedia.org/wiki/Микроблоггинг), о�нованном на �вободном программном "
-"обе�печении [StatusNet](http://status.net/). Уча�тники обменивают�� "
-"короткими �ообщени�ми о �воей жизни и интере�ах. "
+"Зде�ь пред�тавлены �пи�ки, �озданные **%s**. Спи�ки — �то �по�об "
+"�группировать похожих пользователей на %%%%site.name%%%%, �ерви�е "
+"[микроблогов](http://ru.wikipedia.org/wiki/Микроблоггинг), работающем на "
+"�вободном программном обе�печении [StatusNet](http://status.net/). Вы можете "
+"� легко�тью от�леживать в�е �обыти�, о которых пишут �ти люди, про�то "
+"подпи�авши�ь на ленту �ообщений �того �пи�ка."
 
 #. TRANS: Message displayed on page that displays lists by a user when there are none.
 #. TRANS: This message contains Markdown links in the form [description](links).
 #. TRANS: %s is a tagger nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "%s has not created any [lists](%%%%doc.lists%%%%) yet."
-msgstr "Пока никто на о�тавл�л запи�ей � [тегами](%%doc.tags%%)."
+msgstr "%s пока не �оздал ни одного [�пи�ка](%%%%doc.lists%%%%)."
 
 #. TRANS: Page title. %s is a tagged user's nickname.
 #, php-format
 msgid "Lists with %s in them"
-msgstr ""
+msgstr "Спи�ки, в которые входит %s"
 
 #. TRANS: Page title. %1$s is a tagged user's nickname, %2$s is a page number.
-#, fuzzy, php-format
+#, php-format
 msgid "Lists with %1$s, page %2$d"
-msgstr "Запи�и � тегом %1$s, �траница %2$d"
+msgstr "Спи�ки, в которые входит %1$s, �траница %2$d"
 
 #. TRANS: Message displayed for anonymous users on page that displays lists for a user.
 #. TRANS: This message contains Markdown links in the form [description](links).
 #. TRANS: %s is a tagger nickname.
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "These are lists for **%s**. lists are how you sort similar people on %%%%"
 "site.name%%%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
 "blogging) service based on the Free Software [StatusNet](http://status.net/) "
 "tool. You can easily keep track of what they are doing by subscribing to the "
-"tag's timeline."
+"list's timeline."
 msgstr ""
-"**%s** — группа на %%%%site.name%%%%, �ерви�е [микроблоггинга](http://ru."
-"wikipedia.org/wiki/Микроблоггинг), о�нованном на �вободном программном "
-"обе�печении [StatusNet](http://status.net/). Уча�тники обменивают�� "
-"короткими �ообщени�ми о �воей жизни и интере�ах. "
+"Зде�ь пред�тавлены �пи�ки **%s**. Спи�ки — �то �по�об �группировать похожих "
+"пользователей на %%%%site.name%%%%, �ерви�е [микроблогов](http://ru."
+"wikipedia.org/wiki/Микроблоггинг), работающем на �вободном программном "
+"обе�печении [StatusNet](http://status.net/). Вы можете � лёгко�тью "
+"от�леживать в�е �обыти�, о которых пишут �ти люди, про�то подпи�авши�ь на "
+"ленту �ообщений �того �пи�ка."
 
 #. TRANS: Message displayed on page that displays lists a user was added to when there are none.
 #. TRANS: This message contains Markdown links in the form [description](links).
 #. TRANS: %s is a user nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "%s has not been [listed](%%%%doc.lists%%%%) by anyone yet."
-msgstr "Пока никто на о�тавл�л запи�ей � [тегами](%%doc.tags%%)."
+msgstr "%s пока не входит ни в один чужой [�пи�ок](%%%%doc.lists%%%%)."
 
 #. TRANS: Page title for list of list subscribers.
 #. TRANS: %1$s is a list, %2$s is a user nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "Subscribers to list %1$s by %2$s"
-msgstr "Подпи�ал�� на %s."
+msgstr "Подпи�анные на �пи�ок %1$s пользовател� %2$s"
 
 #. TRANS: Page title for list of list subscribers.
 #. TRANS: %1$s is a list, %2$s is a user nickname, %3$d is a page number.
-#, fuzzy, php-format
+#, php-format
 msgid "Subscribers to list %1$s by %2$s, page %3$d"
-msgstr "%1$s � тегом %2$s, �траница %3$d"
+msgstr "Подпи�анные на �пи�ок %1$s пользовател� %2$s, �траница %3$d"
 
 #. TRANS: Title for page that displays lists subscribed to by a user.
 #. TRANS: %s is a profile nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "Lists subscribed to by %s"
-msgstr "Подпи�ал�� на %s."
+msgstr "Спи�ки, на которые подпи�ан %s"
 
 #. TRANS: Title for page that displays lists subscribed to by a user.
 #. TRANS: %1$s is a profile nickname, %2$d is a page number.
-#, fuzzy, php-format
+#, php-format
 msgid "Lists subscribed to by %1$s, page %2$d"
-msgstr "Подпи�ки %1$s, �траница %2$d"
+msgstr "Спи�ки, на которые подпи�ан %1$s, �траница%2$d"
 
 #. TRANS: Message displayed for anonymous users on page that displays lists subscribed to by a user.
 #. TRANS: This message contains Markdown links in the form [description](links).
 #. TRANS: %s is a profile nickname.
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "These are lists subscribed to by **%s**. Lists are how you sort similar "
 "people on %%%%site.name%%%%, a [micro-blogging](http://en.wikipedia.org/wiki/"
@@ -4220,10 +4038,12 @@ msgid ""
 "net/) tool. You can easily keep track of what they are doing by subscribing "
 "to the list's timeline."
 msgstr ""
-"**%s** — группа на %%%%site.name%%%%, �ерви�е [микроблоггинга](http://ru."
-"wikipedia.org/wiki/Микроблоггинг), о�нованном на �вободном программном "
-"обе�печении [StatusNet](http://status.net/). Уча�тники обменивают�� "
-"короткими �ообщени�ми о �воей жизни и интере�ах. "
+"Зде�ь пред�тавлены �пи�ки, на которые подпи�ан **%s**. Спи�ки — �то �по�об "
+"�группировать похожих пользователей на %%%%site.name%%%%, �ерви�е "
+"[микроблогов](http://ru.wikipedia.org/wiki/Микроблоггинг), работающем на "
+"�вободном программном обе�печении [StatusNet](http://status.net/). Вы можете "
+"� лёгко�тью от�леживать в�е �обыти�, о которых пишут �ти люди, про�то "
+"подпи�авши�ь на ленту �ообщений �того �пи�ка."
 
 #. TRANS: Page title for AJAX form return when a disabling a plugin.
 msgctxt "plugin"
@@ -4276,31 +4096,20 @@ msgid ""
 msgstr ""
 "В�е плагины по умолчанию был отключены в файле конфигурации данного �айта."
 
-#. TRANS: Client error displayed if the notice posted has too many characters.
-msgid "Invalid notice content."
-msgstr "Ошибочное �одержание запи�и."
-
-#. TRANS: Exception thrown if a notice's license is not compatible with the StatusNet site license.
-#. TRANS: %1$s is the notice license, %2$s is the StatusNet site's license.
-#, php-format
-msgid "Notice license \"%1$s\" is not compatible with site license \"%2$s\"."
-msgstr "Лицензи� запи�и «%1$s» не �овме�тима � лицензией �айта «%2$s»."
-
 #. TRANS: Client error displayed when trying to add an unindentified field to profile.
 #. TRANS: %s is a field name.
 #, php-format
 msgid "Unidentified field %s."
-msgstr ""
+msgstr "�еизве�тное поле %s."
 
 #. TRANS: Page title.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Search results"
-msgstr "Пои�к по �айту"
+msgstr "Результаты пои�ка"
 
 #. TRANS: Error message in case a search is shorter than three characters.
 msgid "The search string must be at least 3 characters long."
-msgstr ""
+msgstr "Пои�ковый запро� должен �одержать хот� бы 3 �имвола."
 
 #. TRANS: Page title for profile settings.
 msgid "Profile settings"
@@ -4382,6 +4191,8 @@ msgid "Share my current location when posting notices"
 msgstr "Делить�� �воим текущим ме�тоположением при отправке запи�ей"
 
 #. TRANS: Field label in form for profile settings.
+#. TRANS: Title for group tag cloud section.
+#. TRANS: %s is a group name.
 msgid "Tags"
 msgstr "Теги"
 
@@ -4410,7 +4221,7 @@ msgstr "В каком ча�овом по��е Вы обычно находит
 
 #. TRANS: Checkbox label in form for profile settings.
 msgid ""
-"Automatically subscribe to whoever subscribes to me (best for non-humans)."
+"Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr ""
 "�втоматиче�ки подпи�ывать�� на в�ех, кто подпи�ал�� на мен� (идеально дл� "
 "людей-машин)."
@@ -4420,21 +4231,22 @@ msgid "Subscription policy"
 msgstr "Политика подпи�ки"
 
 #. TRANS: Dropdown field option for following policy.
-#, fuzzy
 msgid "Let anyone follow me"
-msgstr "Можно �ледить только за людьми."
+msgstr "Позвол�ть в�ем �ледовать на мной"
 
 #. TRANS: Dropdown field option for following policy.
 msgid "Ask me first"
-msgstr ""
+msgstr "Сначала �про�ить у мен�"
 
 #. TRANS: Dropdown field title on group edit form.
 msgid "Whether other users need your permission to follow your updates."
 msgstr ""
+"�ужно ли разрешение другим пользовател�м дл� �ледовани� за вашими "
+"�ообщени�ми."
 
 #. TRANS: Checkbox label in profile settings.
 msgid "Make updates visible only to my followers"
-msgstr ""
+msgstr "Сделать новые запи�и видимыми только дл� по�ледователей"
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Plural form is used based on the maximum number of allowed
@@ -4469,9 +4281,8 @@ msgstr "�еверный тег «%s»."
 
 #. TRANS: Server error thrown when user profile settings could not be updated to
 #. TRANS: automatically subscribe to any subscriber.
-#, fuzzy
 msgid "Could not update user for autosubscribe or subscribe_policy."
-msgstr "�е удаёт�� обновить пользовател� дл� автоподпи�ки."
+msgstr "�е удало�ь обновить пользовател� дл� автоматиче�кой подпи�ки."
 
 #. TRANS: Server error thrown when user profile location preference settings could not be updated.
 msgid "Could not save location prefs."
@@ -4481,11 +4292,6 @@ msgstr "�е удаёт�� �охранить на�тройки ме�топо
 msgid "Could not save tags."
 msgstr "�е удаёт�� �охранить теги."
 
-#. TRANS: Confirmation shown when user profile settings are saved.
-#. TRANS: Message after successful saving of administrative settings.
-msgid "Settings saved."
-msgstr "�а�тройки �охранены."
-
 #. TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
 #. TRANS: Page title for page where a user account can be restored from backup.
 msgid "Restore account"
@@ -4498,8 +4304,8 @@ msgid "Beyond the page limit (%s)."
 msgstr "Превышен предел �траницы (%s)."
 
 #. TRANS: Server error displayed when a public timeline cannot be retrieved.
-msgid "Could not retrieve public stream."
-msgstr "�е удаёт�� вернуть публичный поток."
+msgid "Could not retrieve public timeline."
+msgstr "�е удаёт�� получить открытую ленту."
 
 #. TRANS: Title for all public timeline pages but the first.
 #. TRANS: %d is the page number.
@@ -4513,16 +4319,20 @@ msgid "Public timeline"
 msgstr "Обща� лента"
 
 #. TRANS: Link description for public timeline feed.
-msgid "Public Stream Feed (RSS 1.0)"
-msgstr "Лента публичного потока (RSS 1.0)"
+msgid "Public Timeline Feed (Activity Streams JSON)"
+msgstr "Открыта� лента (JSON Activity Streams)"
 
 #. TRANS: Link description for public timeline feed.
-msgid "Public Stream Feed (RSS 2.0)"
-msgstr "Лента публичного потока (RSS 2.0)"
+msgid "Public Timeline Feed (RSS 1.0)"
+msgstr "Открыта� лента (RSS 1.0)"
 
 #. TRANS: Link description for public timeline feed.
-msgid "Public Stream Feed (Atom)"
-msgstr "Лента публичного потока (Atom)"
+msgid "Public Timeline Feed (RSS 2.0)"
+msgstr "Открыта� лента (RSS 2.0)"
+
+#. TRANS: Link description for public timeline feed.
+msgid "Public Timeline Feed (Atom)"
+msgstr "Открыта� лента (Atom)"
 
 #. TRANS: Text displayed for public feed when there are no public notices.
 #, php-format
@@ -4570,51 +4380,6 @@ msgstr ""
 "Микроблоггинг), �озданный � и�пользованием �вободного программного "
 "обе�печени� [StatusNet](http://status.net/)."
 
-#. TRANS: Title for page with public list cloud.
-#, fuzzy
-msgid "Public list cloud"
-msgstr "Общее облако тегов"
-
-#. TRANS: Page notice for page with public list cloud.
-#. TRANS: %s is a StatusNet sitename.
-#, fuzzy, php-format
-msgid "These are largest lists on %s"
-msgstr "Самые попул�рные недавние теги на %s"
-
-#. TRANS: Empty list message on page with public list cloud.
-#. TRANS: This message contains Markdown links in the form [description](link).
-#, fuzzy, php-format
-msgid "No one has [listed](%%doc.tags%%) anyone yet."
-msgstr "Пока никто на о�тавл�л запи�ей � [тегами](%%doc.tags%%)."
-
-#. TRANS: Additional empty list message on page with public list cloud for logged in users.
-#, fuzzy
-msgid "Be the first to list someone!"
-msgstr "Станьте первым отправителем!"
-
-#. TRANS: Additional empty list message on page with public list cloud for anonymous users.
-#. TRANS: This message contains Markdown links in the form [description](link).
-#, fuzzy, php-format
-msgid ""
-"Why not [register an account](%%action.register%%) and be the first to list "
-"someone!"
-msgstr ""
-"Почему бы не [зареги�трировать��](%%action.register%%), чтобы отправить "
-"первым?"
-
-#. TRANS: DT element on on page with public list cloud.
-#, fuzzy
-msgid "List cloud"
-msgstr "Метод API не найден."
-
-#. TRANS: Link title for number of listed people. %d is the number of listed people.
-#, php-format
-msgid "1 person listed"
-msgid_plural "%d people listed"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
 #. TRANS: Public RSS feed description. %s is the StatusNet site name.
 #, php-format
 msgid "%s updates from everyone."
@@ -4738,7 +4503,6 @@ msgid "6 or more characters, and do not forget it!"
 msgstr "6 или более �имволов, и не забывайте его!"
 
 #. TRANS: Button text for password reset form.
-#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
 msgctxt "BUTTON"
 msgid "Reset"
 msgstr "Сбро�ить"
@@ -4747,18 +4511,6 @@ msgstr "Сбро�ить"
 msgid "Enter a nickname or email address."
 msgstr "Введите им� или �лектронный адре�."
 
-#. TRANS: Information on password recovery form if no known username or e-mail address was specified.
-msgid "No user with that email address or username."
-msgstr "�ет пользовател� � таким �лектронным адре�ом или именем."
-
-#. TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.
-msgid "No registered email address for that user."
-msgstr "�ет зареги�трированных �лектронных адре�ов дл� �того пользовател�."
-
-#. TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.
-msgid "Error saving address confirmation."
-msgstr "Ошибка �охранени� подтверждённого адре�а."
-
 #. TRANS: User notification after an e-mail with instructions was sent from the password recovery form.
 msgid ""
 "Instructions for recovering your password have been sent to the email "
@@ -4941,78 +4693,11 @@ msgstr ""
 "(Вы должный получить пи�ьмо � опи�анием того, как подтвердить �вой "
 "�лектронный адре�.)"
 
-#. TRANS: Page notice for remote subscribe. This message contains Markdown links.
-#. TRANS: Ensure to keep the correct markup of [link description](link).
-#, php-format
-msgid ""
-"To subscribe, you can [login](%%action.login%%), or [register](%%action."
-"register%%) a new  account. If you already have an account  on a [compatible "
-"microblogging site](%%doc.openmublog%%),  enter your profile URL below."
-msgstr ""
-"Чтобы подпи�ать��, необходимо [авторизовать��](%%action.login%%) или "
-"[зареги�трировать](%%action.register%%) новый аккаунт."
-
-#. TRANS: Page title for Remote subscribe.
-msgid "Remote subscribe"
-msgstr "Подпи�ать�� на пользовател�"
-
-#. TRANS: Field legend on page for remote subscribe.
-msgid "Subscribe to a remote user"
-msgstr "Подпи�ать�� на удалённого пользовател�"
-
-#. TRANS: Field label on page for remote subscribe.
-msgid "User nickname"
-msgstr "Им� пользовател�."
-
-#. TRANS: Field title on page for remote subscribe.
-msgid "Nickname of the user you want to follow."
-msgstr "Им� пользовател�, за которым вы хотите �ледить."
-
-#. TRANS: Field label on page for remote subscribe.
-msgid "Profile URL"
-msgstr "URL профил�"
-
-#. TRANS: Field title on page for remote subscribe.
-msgid "URL of your profile on another compatible microblogging service."
-msgstr "URL-адре� вашего профил� на другом �овме�тимом �ерви�е микроблогинга."
-
-#. TRANS: Button text on page for remote subscribe.
-#. TRANS: Link text for link that will subscribe to a remote profile.
-#. TRANS: Button text to subscribe to a user.
-#. TRANS: Button text for subscribing to a list.
-msgctxt "BUTTON"
-msgid "Subscribe"
-msgstr "Подпи�ать��"
-
-#. TRANS: Form validation error on page for remote subscribe when an invalid profile URL was provided.
-msgid "Invalid profile URL (bad format)."
-msgstr "�еверный URL-адре� профил� (недопу�тимый формат)."
-
-#. TRANS: Form validation error on page for remote subscribe when no the provided profile URL
-#. TRANS: does not contain expected data.
-msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
-msgstr "�еправильный URL-профиль (нет YADIS-документа, либо неверный XRDS)."
-
-#. TRANS: Form validation error on page for remote subscribe.
-msgid "That is a local profile! Login to subscribe."
-msgstr "Это внутренний профиль! �вторизуйте�ь дл� подпи�ки."
-
-#. TRANS: Form validation error on page for remote subscribe when the remote service is not providing a request token.
-msgid "Could not get a request token."
-msgstr "�е удаёт�� получить получить ключ запро�а."
-
-#. TRANS: Client error displayed when trying to (un)list an OMB 0.1 remote profile.
-#, fuzzy
-msgid "You cannot (un)list an OMB 0.1 remote profile with this action."
-msgstr ""
-"Вы не можете подпи�ать�� на удалённый профиль OMB 0.1 � помощью �того "
-"дей�тви�."
-
 #. TRANS: Client error displayed when an unknown error occurs while delisting a user.
 #. TRANS: %s is a username.
 #, php-format
 msgid "There was an unexpected error while delisting %s."
-msgstr ""
+msgstr "Произошла непредвиденна� ошибка при удалении %s из �пи�ка."
 
 #. TRANS: Client error displayed when an unknown error occurs while listing a user.
 #. TRANS: %s is a profile URL.
@@ -5021,11 +4706,12 @@ msgid ""
 "There was a problem listing %s. The remote server is probably not responding "
 "correctly, please try retrying later."
 msgstr ""
+"Возникла проблема � добавлением %s в �пи�ок. Удалённый �ервер, веро�тно, не "
+"отвечает правильно. Пожалуй�та, попробуйте позже."
 
 #. TRANS: Title after removing a user from a list.
-#, fuzzy
 msgid "Unlisted"
-msgstr "Лицензи�"
+msgstr "�ет в �пи�ке"
 
 #. TRANS: Client error displayed when trying to repeat a notice while not logged in.
 msgid "Only logged-in users can repeat notices."
@@ -5060,6 +4746,12 @@ msgstr "Ответы дл� %s"
 msgid "Replies to %1$s, page %2$d"
 msgstr "Ответы дл� %1$s, �траница %2$d"
 
+#. TRANS: Link for feed with replies for a user.
+#. TRANS: %s is a user nickname.
+#, php-format
+msgid "Replies feed for %s (Activity Streams JSON)"
+msgstr "Лента ответов дл� %s (JSON Activity Streams)"
+
 #. TRANS: Link for feed with replies for a user.
 #. TRANS: %s is a user nickname.
 #, php-format
@@ -5179,10 +4871,10 @@ msgstr "Лента будет во��тановлена. Пожалуй�та,
 
 #. TRANS: Form instructions for feed restore.
 msgid ""
-"You can upload a backed-up stream in <a href=\"http://activitystrea.ms/"
+"You can upload a backed-up timeline in <a href=\"http://activitystrea.ms/"
 "\">Activity Streams</a> format."
 msgstr ""
-"Вы можете загрузить на �айт резервную копию в формате <a href=\"http://"
+"Вы можете загрузить на �айт резервную копию ленты в формате <a href=\"http://"
 "activitystrea.ms/\">Activity Streams</a>."
 
 #. TRANS: Title for submit button to confirm upload of a user backup file for account restore.
@@ -5214,15 +4906,15 @@ msgstr "Пользователь уже в режиме пе�очницы."
 
 #. TRANS: Client error displayed when trying to list a profile with an invalid list.
 #. TRANS: %s is the invalid list name.
-#, fuzzy, php-format
+#, php-format
 msgid "Not a valid list: %s."
-msgstr "�еверный тег человека: %s."
+msgstr "�едей�твительный �пи�ок: %s."
 
 #. TRANS: Page title for page showing self tags.
 #. TRANS: %1$s is a tag, %2$d is a page number.
-#, fuzzy, php-format
+#, php-format
 msgid "Users self-tagged with %1$s, page %2$d"
-msgstr "Пользователи, у�тановившие �ебе тег %1$s — �траница %2$d"
+msgstr "Пользователи, у�тановившие �ебе тег %1$s, �траница %2$d"
 
 #. TRANS: Title for the sessions administration panel.
 msgctxt "TITLE"
@@ -5297,14 +4989,33 @@ msgstr "Сбро�ить ключ и �екретную фразу"
 msgid "Application info"
 msgstr "Информаци� о приложении"
 
+#. TRANS: Field label on application page.
+msgid "Consumer key"
+msgstr "Потребитель�кий ключ"
+
+#. TRANS: Field label on application page.
+msgid "Consumer secret"
+msgstr "Секретна� фраза потребител�"
+
+#. TRANS: Field label on application page.
+msgid "Request token URL"
+msgstr "URL ключа запро�а"
+
+#. TRANS: Field label on application page.
+msgid "Access token URL"
+msgstr "URL ключа до�тупа"
+
+#. TRANS: Field label on application page.
+msgid "Authorize URL"
+msgstr "URL авторизации"
+
 #. TRANS: Note on the OAuth application page about signature support.
-#, fuzzy
 msgid ""
 "Note: HMAC-SHA1 signatures are supported. The plaintext signature method is "
 "not supported."
 msgstr ""
-"Примечание: Мы поддерживаем подпи�и HMAC-SHA1. Мы не поддерживаем метод "
-"подпи�и открытым тек�том."
+"Примечание: в�е подпи�и шифруют�� по методу HMAC-SHA1. Мы не поддерживаем "
+"метод подпи�и про�тым тек�том."
 
 #. TRANS: Text in confirmation dialog to reset consumer key and secret for an OAuth application.
 msgid "Are you sure you want to reset your consumer key and secret?"
@@ -5321,6 +5032,11 @@ msgstr "Любимые запи�и %1$s, �траница %2$d"
 msgid "Could not retrieve favorite notices."
 msgstr "�е удаёт�� во��тановить любимые запи�и."
 
+#. TRANS: Feed link text. %s is a username.
+#, php-format
+msgid "Feed for favorites of %s (Activity Streams JSON)"
+msgstr "Лента любимых запи�ей %s (JSON Activity Streams)"
+
 #. TRANS: Feed link text. %s is a username.
 #, php-format
 msgid "Feed for favorites of %s (RSS 1.0)"
@@ -5382,6 +5098,11 @@ msgstr "Группа %s"
 msgid "%1$s group, page %2$d"
 msgstr "Группа %1$s, �траница %2$d"
 
+#. TRANS: Tooltip for feed link. %s is a group nickname.
+#, php-format
+msgid "Notice feed for %s group (Activity Streams JSON)"
+msgstr "Лента запи�ей группы %s (JSON Activity Streams)"
+
 #. TRANS: Tooltip for feed link. %s is a group nickname.
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
@@ -5402,42 +5123,8 @@ msgstr "Лента запи�ей группы %s (Atom)"
 msgid "FOAF for %s group"
 msgstr "FOAF дл� группы %s"
 
-#. TRANS: Header for mini list of group members on a group page (h2).
-msgid "Members"
-msgstr "Уча�тники"
-
-#. TRANS: Description for mini list of group members on a group page when the group has no members.
-#. TRANS: Content of "Listed" page if there are no listed users.
-#. TRANS: Content of "People following tag x" if there are no subscribed users.
-#. TRANS: Empty list message for tags.
-#. TRANS: Text for user subscription statistics if the user has no subscriptions.
-#. TRANS: Text for user subscriber statistics if user has no subscribers.
-#. TRANS: Text for user user group membership statistics if user is not a member of any group.
-#. TRANS: Default content for section/sidebar widget.
-msgid "(None)"
-msgstr "(пока ничего нет)"
-
-#. TRANS: Link to all group members from mini list of group members if group has more than n members.
-msgid "All members"
-msgstr "В�е уча�тники"
-
-#. TRANS: Header for group statistics on a group page (h2).
-#. TRANS: H2 text for user statistics.
-msgid "Statistics"
-msgstr "Стати�тика"
-
-#. TRANS: Label for group creation date.
-msgctxt "LABEL"
-msgid "Created"
-msgstr "Дата �оздани�"
-
-#. TRANS: Label for member count in statistics on group page.
-msgctxt "LABEL"
-msgid "Members"
-msgstr "Уча�тники"
-
 #. TRANS: Notice on group pages for anonymous users for StatusNet sites that accept new registrations.
-#. TRANS: **%s** is the group alias, %%%%site.name%%%% is the site name,
+#. TRANS: %s is the group name, %%%%site.name%%%% is the site name,
 #. TRANS: %%%%action.register%%%% is the URL for registration, %%%%doc.help%%%% is a URL to help.
 #. TRANS: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
 #, php-format
@@ -5456,24 +5143,19 @@ msgstr ""
 "других возможно�тей! ([Читать далее](%%%%doc.help%%%%))"
 
 #. TRANS: Notice on group pages for anonymous users for StatusNet sites that accept no new registrations.
-#. TRANS: **%s** is the group alias, %%%%site.name%%%% is the site name,
+#. TRANS: %s is the group name, %%%%site.name%%%% is the site name,
 #. TRANS: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
 "wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
 "[StatusNet](http://status.net/) tool. Its members share short messages about "
-"their life and interests. "
+"their life and interests."
 msgstr ""
 "**%s** — группа на %%%%site.name%%%%, �ерви�е [микроблоггинга](http://ru."
 "wikipedia.org/wiki/Микроблоггинг), о�нованном на �вободном программном "
 "обе�печении [StatusNet](http://status.net/). Уча�тники обменивают�� "
-"короткими �ообщени�ми о �воей жизни и интере�ах. "
-
-#. TRANS: Title for list of group administrators on a group page.
-msgctxt "TITLE"
-msgid "Admins"
-msgstr "�дмини�траторы"
+"короткими �ообщени�ми о �воей жизни и интере�ах."
 
 #. TRANS: Client error displayed requesting a single message that does not exist.
 msgid "No such message."
@@ -5505,106 +5187,111 @@ msgstr "Запи�ь удалена."
 
 #. TRANS: Title for private list timeline.
 #. TRANS: %1$s is a list, %2$s is a page number.
-#, fuzzy, php-format
+#, php-format
 msgid "Private timeline for %1$s list by you, page %2$d"
-msgstr "Пользователи, у�тановившие �ебе тег %1$s — �траница %2$d"
+msgstr "Лична� лента �ообщений дл� вашего �пи�ка %1$s, �траница %2$d"
 
 #. TRANS: Title for public list timeline where the viewer is the tagger.
 #. TRANS: %1$s is a list, %2$s is a page number.
-#, fuzzy, php-format
+#, php-format
 msgid "Timeline for %1$s list by you, page %2$d"
-msgstr "Пользователи, у�тановившие �ебе тег %1$s — �траница %2$d"
+msgstr "Лента �ообщений вашего �пи�ка %1$s, �траница %2$d"
 
 #. TRANS: Title for private list timeline.
 #. TRANS: %1$s is a list, %2$s is the tagger's nickname, %3$d is a page number.
-#, fuzzy, php-format
+#, php-format
 msgid "Timeline for %1$s list by %2$s, page %3$d"
-msgstr "%1$s � тегом %2$s, �траница %3$d"
+msgstr "Лента �ообщений �пи�ка %1$s пользовател� %2$s, �траница %3$d"
 
 #. TRANS: Title for private list timeline.
 #. TRANS: %s is a list.
-#, fuzzy, php-format
+#, php-format
 msgid "Private timeline of %s list by you"
-msgstr "�пи�ок людей, которые �лед�т за вами"
+msgstr "Лична� лента �ообщений вашего �пи�ка %s"
 
 #. TRANS: Title for public list timeline where the viewer is the tagger.
 #. TRANS: %s is a list.
 #, php-format
 msgid "Timeline for %s list by you"
-msgstr ""
+msgstr "Лента �ообщений вашего �пи�ка %s"
 
 #. TRANS: Title for private list timeline.
 #. TRANS: %1$s is a list, %2$s is the tagger's nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "Timeline for %1$s list by %2$s"
-msgstr "Ответы на запи�и %1$s на %2$s."
+msgstr "Лента �ообщений �пи�ка %1$s пользовател� %2$s"
 
 #. TRANS: Feed title.
 #. TRANS: %1$s is a list, %2$s is tagger's nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "Feed for %1$s list by %2$s (Atom)"
-msgstr "Лента друзей %s (Atom)"
+msgstr "Канал �пи�ка %1$s пользовател� %2$s (Atom)"
 
 #. TRANS: Empty list message for list timeline.
 #. TRANS: %1$s is a list, %2$s is a tagger's nickname.
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "This is the timeline for %1$s list by %2$s but no one has posted anything "
 "yet."
-msgstr "Это лента %s и друзей, однако пока никто ничего не отправил."
+msgstr "Это лента �ообщений �пи�ка %1$s пользовател� %2$s, но пока она пу�та�."
 
 #. TRANS: Additional empty list message for list timeline for currently logged in user tagged tags.
 msgid "Try tagging more people."
-msgstr ""
+msgstr "�азначьте теги большему чи�лу людей."
 
 #. TRANS: Additional empty list message for list timeline.
 #. TRANS: This message contains Markdown links in the form [description](link).
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and start following "
 "this timeline!"
 msgstr ""
-"Почему бы не [зареги�трировать��](%%action.register%%), чтобы отправить "
-"первым?"
+"Почему бы не [зареги�трировать��](%%action.register%%) и не начать "
+"от�леживать �ту ленту �ообщений?"
 
 #. TRANS: Header on show list page.
-#, fuzzy
+#. TRANS: Link description for link to list of users tagged with a tag (so part of a list).
 msgid "Listed"
-msgstr "Лицензи�"
+msgstr "В �пи�ке"
+
+#. TRANS: Content of "Listed" page if there are no listed users.
+#. TRANS: Content of "People following tag x" if there are no subscribed users.
+#. TRANS: Description for mini list of group members on a group page when the group has no members.
+#. TRANS: Empty list message for tags.
+#. TRANS: Text for user subscription statistics if the user has no subscriptions.
+#. TRANS: Text for user subscriber statistics if user has no subscribers.
+#. TRANS: Text for user user group membership statistics if user is not a member of any group.
+#. TRANS: Default content for section/sidebar widget.
+msgid "(None)"
+msgstr "(пока ничего нет)"
 
 #. TRANS: Link for more "People in list x by a user"
 #. TRANS: if there are more than the mini list's maximum.
-#, fuzzy
 msgid "Show all"
-msgstr "Показать %d ответ"
+msgstr "Показать в�ех"
 
 #. TRANS: Header for tag subscribers.
 #. TRANS: Link description for link to list of users subscribed to a tag.
 msgid "Subscribers"
 msgstr "Подпи�чики"
 
-#. TRANS: Link for more "People following tag x"
-#. TRANS: if there are more than the mini list's maximum.
-msgid "All subscribers"
-msgstr "В�е подпи�чики"
-
-#. TRANS: Page title showing tagged notices in one user's stream.
+#. TRANS: Page title showing tagged notices in one user's timeline.
 #. TRANS: %1$s is the username, %2$s is the hash tag.
-#, fuzzy, php-format
+#, php-format
 msgid "Notices by %1$s tagged %2$s"
-msgstr "%1$s � тегом %2$s"
+msgstr "Запи�и %1$s � тегом %2$s"
 
-#. TRANS: Page title showing tagged notices in one user's stream.
+#. TRANS: Page title showing tagged notices in one user's timeline.
 #. TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number.
-#, fuzzy, php-format
+#, php-format
 msgid "Notices by %1$s tagged %2$s, page %3$d"
-msgstr "%1$s � тегом %2$s, �траница %3$d"
+msgstr "Запи�и %1$s � тегом %2$s, �траница %3$d"
 
-#. TRANS: Extended page title showing tagged notices in one user's stream.
+#. TRANS: Extended page title showing tagged notices in one user's timeline.
 #. TRANS: %1$s is the username, %2$d is the page number.
-#, fuzzy, php-format
+#, php-format
 msgid "Notices by %1$s, page %2$d"
-msgstr "Запи�и � тегом %1$s, �траница %2$d"
+msgstr "Запи�и %1$s, �траница %2$d"
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %1$s is a user nickname, %2$s is a hashtag.
@@ -5612,6 +5299,12 @@ msgstr "Запи�и � тегом %1$s, �траница %2$d"
 msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
 msgstr "Лента запи�ей %1$s � тегом %2$s (RSS 1.0)"
 
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#, php-format
+msgid "Notice feed for %s (Activity Streams JSON)"
+msgstr "Лента запи�ей %s (JSON Activity Streams)"
+
 #. TRANS: Title for link to notice feed.
 #. TRANS: %s is a user nickname.
 #, php-format
@@ -5636,7 +5329,7 @@ msgstr "Лента запи�ей дл� %s (Atom)"
 msgid "FOAF for %s"
 msgstr "FOAF дл� %s"
 
-#. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
+#. TRANS: First sentence of empty list message for a timeline. $1%s is a user nickname.
 #, php-format
 msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
 msgstr "Это лента %1$s, однако %1$s пока ничего не отправил."
@@ -5649,7 +5342,7 @@ msgstr ""
 "Видели недавно что-нибудь интере�ное? Вы ещё не отправили ни одной запи�и, "
 "�ейча� хорошее врем�  дл� начала :)"
 
-#. TRANS: Second sentence of empty  list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
+#. TRANS: Second sentence of empty  list message for a non-self timeline. %1$s is a user nickname, %2$s is a part of a URL.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
 #, php-format
 msgid ""
@@ -5659,7 +5352,7 @@ msgstr ""
 "Вы можете попробовать «подтолкнуть» %1$s или [напи�ать что-нибудь дл� него](%%"
 "%%action.newnotice%%%%?status_textarea=%2$s)."
 
-#. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
+#. TRANS: Announcement for anonymous users showing a timeline if site registrations are open.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
 #, php-format
 msgid ""
@@ -5675,13 +5368,13 @@ msgstr ""
 "�ообщени�  уча�тника **%s** и иметь до�туп ко множе�тву других возможно�тей! "
 "([Читать далее](%%%%doc.help%%%%))"
 
-#. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
+#. TRANS: Announcement for anonymous users showing a timeline if site registrations are closed or invite only.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#, php-format
+#, fuzzy, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
 "wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
-"[StatusNet](http://status.net/) tool. "
+"[StatusNet](http://status.net/) tool."
 msgstr ""
 "**%s** �вл�ет�� зареги�трированным уча�тником %%%%site.name%%%% — �айта дл� "
 "[микроблогинга](http://ru.wikipedia.org/wiki/Микроблоггинг), �озданного � "
@@ -5719,6 +5412,14 @@ msgstr "Им� �айта должно быть ненулевой длины."
 msgid "You must have a valid contact email address."
 msgstr "У ва� должен быть дей�твительный контактный email-адре�."
 
+#. TRANS: Client error displayed when a logo URL is not valid.
+msgid "Invalid logo URL."
+msgstr "�еверный URL логотипа."
+
+#. TRANS: Client error displayed when a SSL logo URL is invalid.
+msgid "Invalid SSL logo URL."
+msgstr "�еверный URL логотипа SSL."
+
 #. TRANS: Client error displayed trying to save site settings with an invalid language code.
 #. TRANS: %s is the invalid language code.
 #, php-format
@@ -5791,9 +5492,10 @@ msgid "Default language"
 msgstr "Язык по умолчанию"
 
 #. TRANS: Dropdown title on site settings panel.
-msgid "Site language when autodetection from browser settings is not available"
+msgid ""
+"The site language when autodetection from browser settings is not available."
 msgstr ""
-"Язык �айта в �лучае, е�ли автоопределение из на�троек браузера не �работало"
+"Язык �айта в �лучае, е�ли автоопределение из на�троек браузера недо�тупно."
 
 #. TRANS: Fieldset legend on site settings panel.
 msgctxt "LEGEND"
@@ -5817,9 +5519,21 @@ msgid "How long users must wait (in seconds) to post the same thing again."
 msgstr ""
 "Сколько нужно ждать пользовател�м (в �екундах) дл� отправки того же ещё раз."
 
+#. TRANS: Fieldset legend for form to change logo.
+msgid "Logo"
+msgstr "Логотип"
+
+#. TRANS: Field label for StatusNet site logo.
+msgid "Site logo"
+msgstr "Логотип �айта"
+
+#. TRANS: Field label for SSL StatusNet site logo.
+msgid "SSL logo"
+msgstr "Логотип SSL"
+
 #. TRANS: Button title for saving site settings.
-msgid "Save site settings"
-msgstr "Сохранить на�тройки �айта"
+msgid "Save the site settings."
+msgstr "Сохранить на�тройки �айта."
 
 #. TRANS: Page title for site-wide notice tab in admin panel.
 msgid "Site Notice"
@@ -5845,7 +5559,7 @@ msgstr "Тек�т уведомлени� �айта"
 msgid "Site-wide notice text (255 characters maximum; HTML allowed)"
 msgstr "Тек�т уведомлени� �айта (мак�имум 255 �имволов; допу�тим HTML)"
 
-#. TRANS: Title for button to save site notice in admin panel.
+#. TRANS: Button title to save site notice in admin panel.
 msgid "Save site notice."
 msgstr "Сохранить уведомление �айта."
 
@@ -6040,7 +5754,7 @@ msgstr "URL отчёта"
 msgid "Snapshots will be sent to this URL."
 msgstr "Снимки будут отправл�ть�� по �тому URL-адре�у."
 
-#. TRANS: Title for button to save snapshot settings.
+#. TRANS: Button title to save snapshot settings.
 msgid "Save snapshot settings."
 msgstr "Сохранить на�тройки �нимка."
 
@@ -6055,7 +5769,7 @@ msgstr "�е удаёт�� �охранить подпи�ку."
 
 #. TRANS: Client error displayed when trying to approve group applicants without being a group administrator.
 msgid "You may only approve your own pending subscriptions."
-msgstr ""
+msgstr "Вы можете подтверждать только �вои �об�твенные подпи�ки в очереди."
 
 #. TRANS: Title of the first page showing pending subscribers still awaiting approval.
 #. TRANS: %s is the name of the user.
@@ -6065,46 +5779,37 @@ msgstr "Подпи�чиков, ожидающих подтверждени�: %
 
 #. TRANS: Title of all but the first page showing pending subscribersmembers still awaiting approval.
 #. TRANS: %1$s is the name of the user, %2$d is the page number of the members list.
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s subscribers awaiting approval, page %2$d"
-msgstr "Уча�тники группы %1$s, �траница %2$d"
+msgstr "Подпи�чики %1$s, ожидающие подтверждени�, �траница %2$d"
 
 #. TRANS: Page notice for group members page.
-#, fuzzy
 msgid "A list of users awaiting approval to subscribe to you."
-msgstr "Спи�ок пользователей, �вл�ющих�� членами �той группы."
-
-#. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
-msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
-msgstr ""
-"Вы не можете подпи�ать�� на удалённый профиль OMB 0.1 � помощью �того "
-"дей�тви�."
+msgstr "Спи�ок пользователей, ожидающих подтверждени� подпи�ки на ва�."
 
 #. TRANS: Page title when subscription succeeded.
 msgid "Subscribed"
 msgstr "Подпи�ано"
 
 #. TRANS: Client error displayed when trying to perform an action while not logged in.
-#, fuzzy
 msgid "You must be logged in to unsubscribe from a list."
-msgstr "Вы должны авторизовать��, чтобы �оздать новую группу."
+msgstr "Вы должны авторизовать��, чтобы отказать�� от подпи�ки на �пи�ок."
 
 #. TRANS: Client error displayed when trying to perform an action without providing an ID.
-#, fuzzy
 msgid "No ID given."
-msgstr "�ет аргумента ID."
+msgstr "�е указан ID."
 
 #. TRANS: Server error displayed subscribing to a list fails.
 #. TRANS: %1$s is a user nickname, %2$s is a list, %3$s is the error message (no period).
-#, fuzzy, php-format
+#, php-format
 msgid "Could not subscribe user %1$s to list %2$s: %3$s"
-msgstr "�е удаёт�� при�оединить пользовател� %1$s к группе %2$s."
+msgstr "�е удало�ь подпи�ать пользовател� %1$s на �пи�ок %2$s: %3$s"
 
 #. TRANS: Title of form to subscribe to a list.
 #. TRANS: %1%s is a user nickname, %2$s is a list, %3$s is a tagger nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s subscribed to list %2$s by %3$s"
-msgstr "Подпи�чики %1$s, �траница %2$d"
+msgstr "%1$s подпи�ан на �пи�ок %2$s пользовател� %3$s"
 
 #. TRANS: Header for list of subscribers for a user (first page).
 #. TRANS: %s is the user's nickname.
@@ -6177,13 +5882,12 @@ msgstr "Это пользователи, запи�и которых читае
 #. TRANS: This message contains Markdown URLs. The link description is between
 #. TRANS: square brackets, and the link between parentheses. Do not separate "]("
 #. TRANS: and do not change the URL part.
-#, php-format
+#, fuzzy, php-format
 msgid ""
 "You're not listening to anyone's notices right now, try subscribing to "
 "people you know. Try [people search](%%action.peoplesearch%%), look for "
 "members in groups you're interested in and in our [featured users](%%action."
-"featured%%). If you're a [Twitter user](%%action.twittersettings%%), you can "
-"automatically subscribe to people you already follow there."
+"featured%%)."
 msgstr ""
 "Вы �ейча� не �ледите ни за чьими-либо запи��ми; попробуйте подпи�ать�� на "
 "знакомых вам людей. Попробуйте и�пользовать [пои�к людей](%%action."
@@ -6206,7 +5910,6 @@ msgid "Subscription feed for %s (Atom)"
 msgstr "Лента запи�ей %s (Atom)"
 
 #. TRANS: Checkbox label for enabling IM messages for a profile in a subscriptions list.
-#, fuzzy
 msgctxt "LABEL"
 msgid "IM"
 msgstr "IM"
@@ -6221,6 +5924,12 @@ msgstr "СМС"
 msgid "Notices tagged with %1$s, page %2$d"
 msgstr "Запи�и � тегом %1$s, �траница %2$d"
 
+#. TRANS: Link label for feed on "notices with tag" page.
+#. TRANS: %s is the tag the feed is for.
+#, php-format
+msgid "Notice feed for tag %s (Activity Streams JSON)"
+msgstr "Лента запи�ей дл� тега %s (JSON Activity Streams)"
+
 #. TRANS: Link label for feed on "notices with tag" page.
 #. TRANS: %s is the tag the feed is for.
 #, php-format
@@ -6242,50 +5951,45 @@ msgstr "Лента запи�ей дл� тега %s (Atom)"
 #. TRANS: Client error displayed when trying to tag a user that cannot be tagged.
 #. TRANS: Client exception thrown trying to set a tag for a user that cannot be tagged.
 #. TRANS: Error displayed when trying to tag a user that cannot be tagged.
-#, fuzzy
 msgid "You cannot tag this user."
-msgstr "Вы не можете по�лать �ообщение �тому пользователю."
+msgstr "Вы не можете задать тег дл� �того пользовател�."
 
 #. TRANS: Title for list form when not on a profile page.
-#, fuzzy
 msgid "List a profile"
-msgstr "Профиль пользовател�"
+msgstr "Спи�ок профил�"
 
 #. TRANS: Title for list form when on a profile page.
 #. TRANS: %s is a profile nickname.
-#, fuzzy, php-format
+#, php-format
 msgctxt "ADDTOLIST"
 msgid "List %s"
-msgstr "Ограничени�"
+msgstr "Спи�ок %s"
 
 #. TRANS: Title for list form when an error has occurred.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Error"
-msgstr "Ошибка AJAX"
+msgstr "Ошибка"
 
 #. TRANS: Header in list form.
 msgid "User profile"
 msgstr "Профиль пользовател�"
 
 #. TRANS: Fieldset legend for list form.
-#, fuzzy
 msgid "List user"
-msgstr "Ограничени�"
+msgstr "Пользователь �пи�ка"
 
 #. TRANS: Field label on list form.
-#, fuzzy
 msgctxt "LABEL"
 msgid "Lists"
-msgstr "Ограничени�"
+msgstr "Спи�ки"
 
 #. TRANS: Field title on list form.
-#, fuzzy
 msgid ""
 "Lists for this user (letters, numbers, -, ., and _), comma- or space- "
 "separated."
 msgstr ""
-"Теги дл� �еб� (буквы, цифры, -, ., и _), разделённые зап�той или пробелом."
+"Спи�ки дл� �того пользовател� (буквы, цифры, -, ., и _), разделённые зап�той "
+"или пробелом."
 
 #. TRANS: Title for personal tag cloud section.
 msgctxt "TITLE"
@@ -6293,15 +5997,14 @@ msgid "Tags"
 msgstr "Теги"
 
 #. TRANS: Success message if lists are saved.
-#, fuzzy
 msgid "Lists saved."
-msgstr "Пароль �охранён."
+msgstr "Спи�ки �охранены."
 
 #. TRANS: Page notice.
-#, fuzzy
 msgid "Use this form to add your subscribers or subscriptions to lists."
 msgstr ""
-"И�пользуйте �ту форму дл� добавлени� тегов Вашим подпи�чикам или подпи�антам."
+"Во�пользуйте�ь �той формой, чтобы добавить ваших подпи�чиков или подпи�ки в "
+"�пи�ки."
 
 #. TRANS: Client error when requesting a tag feed for a non-existing tag.
 msgid "No such tag."
@@ -6325,20 +6028,9 @@ msgstr "Отпи�ано"
 
 #. TRANS: Page title for form that allows unsubscribing from a list.
 #. TRANS: %1$s is a nickname, %2$s is a list, %3$s is a tagger nickname.
-#, fuzzy, php-format
-msgid "%1$s unsubscribed from list %2$s by %3$s"
-msgstr "Подпи�чики %1$s, �траница %2$d"
-
-#. TRANS: Client error displayed when trying to update profile with an incompatible license.
-#. TRANS: %1$s is the license incompatible with site license %2$s.
-#. TRANS: Exception thrown when licenses are not compatible for an authorisation request.
-#. TRANS: %1$s is the license for the listenee, %2$s is the license for "this" StatusNet site.
 #, php-format
-msgid ""
-"Listenee stream license \"%1$s\" is not compatible with site license \"%2$s"
-"\"."
-msgstr ""
-"Лицензи� про�матриваемого потока «%1$s» не�овме�тима � лицензией �айта «%2$s»."
+msgid "%1$s unsubscribed from list %2$s by %3$s"
+msgstr "%1$s отказал�� от подпи�ки на �пи�ок %2$s пользовател� %3$s"
 
 #. TRANS: Title of URL settings tab in profile settings.
 msgid "URL settings"
@@ -6395,12 +6087,10 @@ msgid "URL shortening service is too long (maximum 50 characters)."
 msgstr "Серви� �окращени� URL �лишком длинный (мак�имум 50 �имволов)."
 
 #. TRANS: Client exception thrown when the maximum URL settings value is invalid in profile URL settings.
-#, fuzzy
 msgid "Invalid number for maximum URL length."
 msgstr "�еверное значение параметра мак�имальной длины URL-адре�а."
 
 #. TRANS: Client exception thrown when the maximum notice length settings value is invalid in profile URL settings.
-#, fuzzy
 msgid "Invalid number for maximum notice length."
 msgstr "�еверное значение параметра мак�имальной длины �ообщени�."
 
@@ -6433,7 +6123,6 @@ msgid "Invalid default subscripton: \"%1$s\" is not a user."
 msgstr "�еверна� подпи�ка по умолчанию: «%1$s» не �вл�ет�� пользователем."
 
 #. TRANS: Fieldset legend in user administration panel.
-#, fuzzy
 msgctxt "LEGEND"
 msgid "Profile"
 msgstr "Профиль"
@@ -6478,153 +6167,10 @@ msgstr "Приглашени� включены"
 msgid "Whether to allow users to invite new users."
 msgstr "Разрешать ли пользовател�м приглашать новых пользователей."
 
-#. TRANS: Title for button to save user settings in user admin panel.
+#. TRANS: Button title to save user settings in user admin panel.
 msgid "Save user settings."
 msgstr "Сохранить пользователь�кие на�тройки."
 
-#. TRANS: Page title.
-msgid "Authorize subscription"
-msgstr "�вторизовать подпи�ку"
-
-#. TRANS: Page notice on "Authorize subscription" page.
-msgid ""
-"Please check these details to make sure that you want to subscribe to this "
-"user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
-"click \"Reject\"."
-msgstr ""
-"Пожалуй�та, проверьте �ту информацию, чтобы быть уверенным, что вы хотите "
-"подпи�ать�� на запи�и �того пользовател�. Е�ли вы �того не хотите делать, "
-"нажмите «Отказать��»."
-
-#. TRANS: Button text on Authorise Subscription page.
-#. TRANS: Submit button text to accept a group membership request on approve group form.
-#. TRANS: Submit button text to accept a subscription request on approve sub form.
-msgctxt "BUTTON"
-msgid "Accept"
-msgstr "Прин�ть"
-
-#. TRANS: Title for button on Authorise Subscription page.
-#. TRANS: Button title to subscribe to a user.
-msgid "Subscribe to this user."
-msgstr "Подпи�ать�� на �того пользовател�."
-
-#. TRANS: Button text on Authorise Subscription page.
-#. TRANS: Submit button text to reject a group membership request on approve group form.
-#. TRANS: Submit button text to reject a subscription request on approve sub form.
-msgctxt "BUTTON"
-msgid "Reject"
-msgstr "Отказать��"
-
-#. TRANS: Title for button on Authorise Subscription page.
-msgid "Reject this subscription."
-msgstr "Отказать�� от �той подпи�ки."
-
-#. TRANS: Client error displayed for an empty authorisation request.
-msgid "No authorization request!"
-msgstr "�е авторизованный запро�!"
-
-#. TRANS: Accept message header from Authorise subscription page.
-msgid "Subscription authorized"
-msgstr "Подпи�ка авторизована"
-
-#. TRANS: Accept message text from Authorise subscription page.
-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. По�мотрите ин�трукции на �айте "
-"о том, как авторизовать подпи�ку. Ваш ключ подпи�ки:"
-
-#. TRANS: Reject message header from Authorise subscription page.
-msgid "Subscription rejected"
-msgstr "Подпи�ка отменена"
-
-#. TRANS: Reject message from Authorise subscription page.
-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 обратного вызова. Проверьте "
-"ин�трукции на �айте, чтобы полно�тью отказать�� от подпи�ки."
-
-#. TRANS: Exception thrown when no valid user is found for an authorisation request.
-#. TRANS: %s is a listener URI.
-#, php-format
-msgid "Listener URI \"%s\" not found here."
-msgstr "Принимающий URI «%s» не найден."
-
-#. TRANS: Exception thrown when listenee URI is too long for an authorisation request.
-#. TRANS: %s is a listenee URI.
-#, php-format
-msgid "Listenee URI \"%s\" is too long."
-msgstr "Про�матривающий URI «%s» �лишком длинный."
-
-#. TRANS: Exception thrown when listenee URI is a local user for an authorisation request.
-#. TRANS: %s is a listenee URI.
-#, php-format
-msgid "Listenee URI \"%s\" is a local user."
-msgstr "Про�матривающий URI «%s» �вл�ет�� локальным пользователем."
-
-#. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
-#. TRANS: %s is a profile URL.
-#, php-format
-msgid "Profile URL \"%s\" is for a local user."
-msgstr "URL профил� «%s» предназначен только дл� локального пользовател�."
-
-#. TRANS: Exception thrown when avatar URL is invalid for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#, php-format
-msgid "Avatar URL \"%s\" is not valid."
-msgstr "URL аватары «%s» недей�твителен."
-
-#. TRANS: Exception thrown when avatar URL could not be read for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#, php-format
-msgid "Cannot read avatar URL \"%s\"."
-msgstr "�е удаёт�� прочитать URL аватары «%s»."
-
-#. TRANS: Exception thrown when avatar URL return an invalid image type for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#, php-format
-msgid "Wrong image type for avatar URL \"%s\"."
-msgstr "�еверный тип изображени� дл� URL аватары «%s»."
-
-#. TRANS: Title for profile design page.
-#. TRANS: Page title for profile design page.
-msgid "Profile design"
-msgstr "Оформление профил�"
-
-#. TRANS: Instructions for Profile design page.
-#. TRANS: Instructions for profile design page.
-msgid ""
-"Customize the way your profile looks with a background image and a colour "
-"palette of your choice."
-msgstr ""
-"�а�тройте внешний вид �воего профил�, у�тановив фоновое изображение и "
-"цветовую гамму на �вой выбор."
-
-#. TRANS: Succes message on Profile design page when finding an easter egg.
-msgid "Enjoy your hotdog!"
-msgstr "При�тного аппетита!"
-
-#. TRANS: Form legend on Profile design page.
-msgid "Design settings"
-msgstr "�а�тройки оформлени�"
-
-#. TRANS: Checkbox label on Profile design page.
-msgid "View profile designs"
-msgstr "Показать оформлени� профил�"
-
-#. TRANS: Title for checkbox on Profile design page.
-msgid "Show or hide profile designs."
-msgstr "Показать или �крыть оформлени� профил�."
-
-#. TRANS: Form legend on Profile design page for form to choose a background image.
-msgid "Background file"
-msgstr "Файл фона"
-
 #. TRANS: Page title for all but the first page of groups for a user.
 #. TRANS: %1$s is a nickname, %2$d is a page number.
 #, php-format
@@ -6666,10 +6212,10 @@ msgstr "StatusNet %s"
 #. TRANS: %1$s is the engine name (StatusNet) and %2$s is the StatusNet version.
 #, php-format
 msgid ""
-"This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, "
+"This site is powered by %1$s version %2$s, Copyright 2008-2011 StatusNet, "
 "Inc. and contributors."
 msgstr ""
-"Этот �айт �оздан на о�нове %1$s вер�ии %2$s, Copyright 2008-2010 StatusNet, "
+"Этот �айт �оздан на о�нове %1$s вер�ии %2$s, Copyright 2008-2011 StatusNet, "
 "Inc. и уча�тники."
 
 #. TRANS: Header for StatusNet contributors section on the version page.
@@ -6681,11 +6227,12 @@ msgid "License"
 msgstr "Лицензи�"
 
 #. TRANS: Content part of StatusNet version page.
+#, fuzzy
 msgid ""
 "StatusNet is free software: you can redistribute it and/or modify it under "
 "the terms of the GNU Affero General Public License as published by the Free "
 "Software Foundation, either version 3 of the License, or (at your option) "
-"any later version. "
+"any later version."
 msgstr ""
 "StatusNet — �вободное программное обе�печение: вы можете ра�про�тран�ть его "
 "и/или модифицировать в �оответ�твии � у�лови�ми GNU Affero General Public "
@@ -6693,11 +6240,12 @@ msgstr ""
 "(на выбор) под любой более поздней вер�ией. "
 
 #. TRANS: Content part of StatusNet version page.
+#, fuzzy
 msgid ""
 "This program is distributed in the hope that it will be useful, but WITHOUT "
 "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
 "FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License "
-"for more details. "
+"for more details."
 msgstr ""
 "Данна� программа ра�про�тран�ет�� в надежде, что она будет полезной, но БЕЗ "
 "ВСЯКОЙ Г�Р��ТИИ; в том чи�ле без вытекающей гарантии ТОВ�Р�ОЙ ПРИГОД�ОСТИ "
@@ -6757,16 +6305,27 @@ msgstr "�евозможно обработать URL «%s»"
 msgid "Robin thinks something is impossible."
 msgstr "Робин �читает, что �то невозможно."
 
-#. TRANS: Message given if an upload is larger than the configured maximum.
-#. TRANS: %1$d is the byte limit for uploads, %2$d is the byte count for the uploaded file.
-#. TRANS: %1$s is used for plural.
+#. TRANS: Message used to be inserted as %2$s in  the text "No file may
+#. TRANS: be larger than %1$d byte and the file you sent was %2$s.".
+#. TRANS: %1$d is the number of bytes of an uploaded file.
 #, php-format
+msgid "%1$d byte"
+msgid_plural "%1$d bytes"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#. TRANS: Message given if an upload is larger than the configured maximum.
+#. TRANS: %1$d (used for plural) is the byte limit for uploads,
+#. TRANS: %2$s is the proper form of "n bytes". This is the only ways to have
+#. TRANS: gettext support multiple plurals in the same message, unfortunately...
+#, fuzzy, php-format
 msgid ""
-"No file may be larger than %1$d byte and the file you sent was %2$d bytes. "
-"Try to upload a smaller version."
+"No file may be larger than %1$d byte and the file you sent was %2$s. Try to "
+"upload a smaller version."
 msgid_plural ""
-"No file may be larger than %1$d bytes and the file you sent was %2$d bytes. "
-"Try to upload a smaller version."
+"No file may be larger than %1$d bytes and the file you sent was %2$s. Try to "
+"upload a smaller version."
 msgstr[0] ""
 "Файл не может быть больше %1$d байт, тогда как отправленный вами файл "
 "�одержал %2$d байт. Попробуйте загрузить меньшую вер�ию."
@@ -6844,6 +6403,11 @@ msgstr "�е удаёт�� обновить локальную группу."
 msgid "Could not create login token for %s"
 msgstr "�е удаёт�� �оздать токен входа дл� %s"
 
+#. TRANS: Exception thrown when a program code class (%s) cannot be instantiated.
+#, php-format
+msgid "Cannot instantiate class %s."
+msgstr "�е удаёт�� ин�танциировать кла�� %s."
+
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.
 msgid "No database name or DSN found anywhere."
 msgstr "Им� базы данных или DSN не найдено."
@@ -6867,9 +6431,9 @@ msgid "No such profile (%1$d) for notice (%2$d)."
 msgstr "�ет такого профил� (%1$d) дл� запи�и (%2$d)."
 
 #. TRANS: Server exception. %s are the error details.
-#, fuzzy, php-format
+#, php-format
 msgid "Database error inserting hashtag: %s."
-msgstr "Ошибка баз данных при в�тавке хеш-тегов: %s"
+msgstr "Ошибка базы данных при добавлении хеш-тега: %s."
 
 #. TRANS: Client exception thrown if a notice contains too many characters.
 msgid "Problem saving notice. Too long."
@@ -6899,23 +6463,20 @@ msgid "You are banned from posting notices on this site."
 msgstr "Вам запрещено по�тить�� на �том �айте (бан)"
 
 #. TRANS: Client exception thrown in notice when trying to repeat a missing or deleted notice.
-#, fuzzy
 msgid "Cannot repeat; original notice is missing or deleted."
-msgstr "�евозможно повторить �об�твенную запи�ь."
+msgstr "�евозможно повторить; и�ходное �ообщение от�ут�твует или удалено."
 
 #. TRANS: Client error displayed when trying to repeat an own notice.
 msgid "You cannot repeat your own notice."
 msgstr "Вы не можете повторить �об�твенную запи�ь."
 
 #. TRANS: Client error displayed when trying to repeat a non-public notice.
-#, fuzzy
 msgid "Cannot repeat a private notice."
-msgstr "�евозможно повторить �об�твенную запи�ь."
+msgstr "�ельз� повтор�ть личные �ообщени�."
 
 #. TRANS: Client error displayed when trying to repeat a notice you cannot access.
-#, fuzzy
 msgid "Cannot repeat a notice you cannot read."
-msgstr "�евозможно повторить �об�твенную запи�ь."
+msgstr "�ельз� повтор�ть �ообщени�, которые вы не можете прочитать."
 
 #. TRANS: Client error displayed when trying to repeat an already repeated notice.
 msgid "You already repeated that notice."
@@ -6923,9 +6484,9 @@ msgstr "Вы уже повторили �ту запи�ь."
 
 #. TRANS: Client error displayed when trying to reply to a notice a the target has no access to.
 #. TRANS: %1$s is a user nickname, %2$d is a notice ID (number).
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s has no access to notice %2$d."
-msgstr "У пользовател� нет по�ледней запи�и."
+msgstr "У %1$s нет до�тупа к запи�и %2$d."
 
 #. TRANS: Server exception thrown when a notice cannot be saved.
 #. TRANS: Server exception thrown when a notice cannot be updated.
@@ -6970,32 +6531,27 @@ msgstr ""
 
 #. TRANS: Server exception.
 msgid "The tag you are trying to rename to already exists."
-msgstr ""
+msgstr "Тег, в который вы хотите переименовать, уже �уще�твует."
 
 #. TRANS: Server exception saving new tag without having a tagger specified.
-#, fuzzy
 msgid "No tagger specified."
-msgstr "Группа не определена."
+msgstr "�е задан автор тега."
 
 #. TRANS: Server exception saving new tag without having a tag specified.
-#, fuzzy
 msgid "No tag specified."
-msgstr "Группа не определена."
+msgstr "Тег не задан."
 
 #. TRANS: Server exception saving new tag.
-#, fuzzy
 msgid "Could not create profile tag."
-msgstr "�е удаёт�� �охранить профиль."
+msgstr "�е удало�ь �оздать тег профил�."
 
 #. TRANS: Server exception saving new tag.
-#, fuzzy
 msgid "Could not set profile tag URI."
-msgstr "�е удаёт�� �охранить профиль."
+msgstr "�е удало�ь у�тановить URI тега профил�."
 
 #. TRANS: Server exception saving new tag.
-#, fuzzy
 msgid "Could not set profile tag mainpage."
-msgstr "�е удаёт�� �охранить профиль."
+msgstr "�е удало�ь у�тановить главную �траницу тега профил�."
 
 #. TRANS: Client exception thrown trying to set more tags than allowed.
 #, php-format
@@ -7003,23 +6559,26 @@ msgid ""
 "You already have created %d or more tags which is the maximum allowed number "
 "of tags. Try using or deleting some existing tags."
 msgstr ""
+"Вы уже �оздали %d или более тегов, что �о�тавл�ет разрешённый лимит дл� "
+"тегов. Попробуйте во�пользовать�� уже �уще�твующим тегом или удалите "
+"некоторые �тарые теги."
 
 #. TRANS: Client exception thrown when trying to add more people than allowed to a list.
-#, php-format
+#, fuzzy, php-format
 msgid ""
 "You already have %1$d or more people in list %2$s, which is the maximum "
-"allowed number.Try unlisting others first."
+"allowed number. Try unlisting others first."
 msgstr ""
+"В вашем �пи�ке %2$s уже отмечено %1$d или более пользователей, что "
+"�о�тавл�ет разрешённый лимит. Попробуйте удалить кого-нибудь из �пи�ка."
 
 #. TRANS: Exception thrown when inserting a list subscription in the database fails.
-#, fuzzy
 msgid "Adding list subscription failed."
-msgstr "�е удаёт�� удалить подпи�ку."
+msgstr "Добавление подпи�ки на �пи�ок не удало�ь."
 
 #. TRANS: Exception thrown when deleting a list subscription from the database fails.
-#, fuzzy
 msgid "Removing list subscription failed."
-msgstr "�е удаёт�� удалить подпи�ку."
+msgstr "Удаление подпи�ки на �пи�ок не удало�ь."
 
 #. TRANS: Exception thrown when a right for a non-existing user profile is checked.
 msgid "Missing profile."
@@ -7030,7 +6589,6 @@ msgid "Unable to save tag."
 msgstr "�е удаёт�� �охранить тег."
 
 #. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
-#. TRANS: Error message displayed to a banned user when they try to subscribe.
 msgid "You have been banned from subscribing."
 msgstr "Вы заблокированы от подпи�ки."
 
@@ -7050,10 +6608,6 @@ msgstr "�е подпи�аны!"
 msgid "Could not delete self-subscription."
 msgstr "�евозможно удалить подпи�ку на �амого �еб�."
 
-#. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
-msgid "Could not delete subscription OMB token."
-msgstr "�е удаёт�� удалить подпи�очный жетон OMB."
-
 #. TRANS: Exception thrown when a subscription could not be deleted on the server.
 msgid "Could not delete subscription."
 msgstr "�е удаёт�� удалить подпи�ку."
@@ -7077,7 +6631,7 @@ msgstr "Добро пожаловать на %1$s, @%2$s!"
 
 #. TRANS: Exception thrown when trying view "repeated to me".
 msgid "Not implemented since inbox change."
-msgstr ""
+msgstr "�е реализовано � момента изменени� �и�темы вход�щих �ообщений."
 
 #. TRANS: Server exception.
 msgid "No single user defined for single-user mode."
@@ -7087,6 +6641,18 @@ msgstr "�и задан пользователь дл� однопользова
 msgid "Single-user mode code called when not enabled."
 msgstr "Вызов отключённого кода однопользователь�кого режима."
 
+#. TRANS: Information on password recovery form if no known username or e-mail address was specified.
+msgid "No user with that email address or username."
+msgstr "�ет пользовател� � таким �лектронным адре�ом или именем."
+
+#. TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.
+msgid "No registered email address for that user."
+msgstr "�ет зареги�трированных �лектронных адре�ов дл� �того пользовател�."
+
+#. TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.
+msgid "Error saving address confirmation."
+msgstr "Ошибка �охранени� подтверждённого адре�а."
+
 #. TRANS: Server exception thrown when creating a group failed.
 msgid "Could not create group."
 msgstr "�е удаёт�� �оздать группу."
@@ -7356,25 +6922,11 @@ msgstr "showForm() не реализована."
 msgid "saveSettings() not implemented."
 msgstr "saveSettings() не реализована."
 
-#. TRANS: Client error message thrown if design settings could not be deleted in
-#. TRANS: the admin panel Design.
-msgid "Unable to delete design setting."
-msgstr "�е удаёт�� удалить на�тройки оформлени�."
-
 #. TRANS: Header in administrator navigation panel.
-#. TRANS: Header in settings navigation panel.
 msgctxt "HEADER"
 msgid "Home"
 msgstr "Главна�"
 
-#. TRANS: Menu item in administrator navigation panel.
-#. TRANS: Menu item in default local navigation panel.
-#. TRANS: Menu item in personal group navigation menu.
-#. TRANS: Menu item in settings navigation panel.
-msgctxt "MENU"
-msgid "Home"
-msgstr "Главна�"
-
 #. TRANS: Header in administrator navigation panel.
 msgctxt "HEADER"
 msgid "Admin"
@@ -7389,17 +6941,6 @@ msgctxt "MENU"
 msgid "Site"
 msgstr "Сайт"
 
-#. TRANS: Menu item title in administrator navigation panel.
-msgid "Design configuration"
-msgstr "Конфигураци� оформлени�"
-
-#. TRANS: Menu item in administrator navigation panel.
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: Menu item in settings navigation panel.
-msgctxt "MENU"
-msgid "Design"
-msgstr "Оформление"
-
 #. TRANS: Menu item title in administrator navigation panel.
 msgid "User configuration"
 msgstr "Конфигураци� пользовател�"
@@ -7499,39 +7040,6 @@ msgstr "�ет пользовател� дл� �того ключа."
 msgid "Could not authenticate you."
 msgstr "�е удаёт�� произве�ти аутентификацию."
 
-#. TRANS: Server error displayed when trying to create an anynymous OAuth consumer.
-msgid "Could not create anonymous consumer."
-msgstr "�е удаёт�� �оздать анонимного пользовател� OAuth."
-
-#. TRANS: Server error displayed when trying to create an anynymous OAuth application.
-msgid "Could not create anonymous OAuth application."
-msgstr "�е удаёт�� �оздать анонимное OAuth-приложение."
-
-#. TRANS: Exception thrown when no token association could be found.
-msgid ""
-"Could not find a profile and application associated with the request token."
-msgstr "�е удаёт�� найти профиль и приложение, �в�занное � ключом запро�а."
-
-#. TRANS: Exception thrown when no access token can be issued.
-msgid "Could not issue access token."
-msgstr "Ошибка выдачи ключа до�тупа."
-
-#. TRANS: Exception thrown when a database error occurs.
-msgid "Database error inserting OAuth application user."
-msgstr "Ошибка базы данных при добавлении пользовател� приложени� OAuth."
-
-#. TRANS: Exception thrown when a database error occurs.
-msgid "Database error updating OAuth application user."
-msgstr "Ошибка базы данных при обновлении пользовател� приложени� OAuth."
-
-#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
-msgid "Tried to revoke unknown token."
-msgstr "Попытка отменить неизве�тный ключ."
-
-#. TRANS: Exception thrown when an attempt is made to remove a revoked token.
-msgid "Failed to delete revoked token."
-msgstr "�е удаёт�� удалить аннулированный ключ."
-
 #. TRANS: Form input field label for application icon.
 msgid "Icon"
 msgstr "Иконка"
@@ -7614,13 +7122,12 @@ msgstr ""
 "До�туп по умолчанию дл� �того приложени�: только чтение или чтение и запи�ь"
 
 #. TRANS: Submit button title.
-msgid "Cancel"
-msgstr "Отменить"
+msgid "Cancel application changes."
+msgstr "Отменить изменени� в приложении."
 
 #. TRANS: Submit button title.
-#. TRANS: Button text to save a list.
-msgid "Save"
-msgstr "Сохранить"
+msgid "Save application changes."
+msgstr "Сохранить изменени� в приложении."
 
 #. TRANS: Name for an anonymous application in application list.
 msgid "Unknown application"
@@ -7655,6 +7162,18 @@ msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "Отозвать"
 
+#. TRANS: Submit button text to accept a group membership request on approve group form.
+#. TRANS: Submit button text to accept a subscription request on approve sub form.
+msgctxt "BUTTON"
+msgid "Accept"
+msgstr "Прин�ть"
+
+#. TRANS: Submit button text to reject a group membership request on approve group form.
+#. TRANS: Submit button text to reject a subscription request on approve sub form.
+msgctxt "BUTTON"
+msgid "Reject"
+msgstr "Отказать��"
+
 #. TRANS: Atom feed exception thrown when an author element does not contain a name element.
 msgid "Author element must contain a name element."
 msgstr "Элемент author должен �одержать �лемент name."
@@ -7664,19 +7183,19 @@ msgid "Do not use this method!"
 msgstr "�е и�пользуйте �тот метод!"
 
 #. TRANS: Title in atom list notice feed. %1$s is a list name, %2$s is a tagger's nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "Timeline for people in list %1$s by %2$s"
-msgstr "Ответы на запи�и %1$s на %2$s."
+msgstr "Лента �ообщений пользователей из �пи�ка %1$s пользовател� %2$s"
 
 #. TRANS: Message is used as a subtitle in atom list notice feed.
 #. TRANS: %1$s is a tagger's nickname, %2$s is a list name, %3$s is a site name.
-#, fuzzy, php-format
+#, php-format
 msgid "Updates from %1$s's list %2$s on %3$s!"
-msgstr "Обновлено от %1$s на %2$s!"
+msgstr "Обновление �пи�ка %2$s пользовател� %1$s на %3$s!"
 
 #. TRANS: Title.
 msgid "Notices where this attachment appears"
-msgstr "Сообщает, где по�вл�ет�� �то вложение"
+msgstr "Запи�и � �тим вложением"
 
 #. TRANS: Title.
 msgid "Tags for this attachment"
@@ -7775,9 +7294,8 @@ msgstr ""
 "Запи�ей: %3$s"
 
 #. TRANS: Error message text shown when a favorite could not be set because it has already been favorited.
-#, fuzzy
 msgid "Could not create favorite: Already favorited."
-msgstr "Повторное добавление запи�и в чи�ло любимых невозможно."
+msgstr "�ельз� добавить в чи�ло любимых: уже входит в их чи�ло."
 
 #. TRANS: Text shown when a notice has been marked as favourite successfully.
 msgid "Notice marked as fave."
@@ -7799,17 +7317,17 @@ msgstr "%1$s покинул группу %2$s."
 #. TRANS: %1$s is the tagged user, %2$s is the error message (no punctuation).
 #, php-format
 msgid "Error tagging %1$s: %2$s"
-msgstr ""
+msgstr "Ошибка при добавлении тега пользователю %1$s. %2$s"
 
 #. TRANS: Succes message displayed if tagging a user succeeds.
 #. TRANS: %1$s is the tagged user's nickname, %2$s is a list of tags.
 #. TRANS: Plural is decided based on the number of tags added (not part of message).
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s was tagged %2$s"
 msgid_plural "%1$s was tagged %2$s"
-msgstr[0] "%1$s и %2$s"
-msgstr[1] "%1$s и %2$s"
-msgstr[2] "%1$s и %2$s"
+msgstr[0] "Теги пользовател� %1$s: %2$s"
+msgstr[1] "Теги пользовател� %1$s: %2$s"
+msgstr[2] "Теги пользовател� %1$s: %2$s"
 
 #. TRANS: Separator for list of tags.
 #. TRANS: Separator in list of user names like "Jim, Bob, Mary".
@@ -7826,7 +7344,7 @@ msgstr "�еверный тег: «%s»"
 #. TRANS: %1$s is the untagged user, %2$s is the error message (no punctuation).
 #, php-format
 msgid "Error untagging %1$s: %2$s"
-msgstr ""
+msgstr "Ошибка при �н�тии тега � пользовател� %1$s. %2$s"
 
 #. TRANS: Succes message displayed if untagging a user succeeds.
 #. TRANS: %1$s is the untagged user's nickname, %2$s is a list of tags.
@@ -7834,9 +7352,9 @@ msgstr ""
 #, php-format
 msgid "The following tag was removed from user %1$s: %2$s."
 msgid_plural "The following tags were removed from user %1$s: %2$s."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "Теги, �н�тые � пользовател� %1$s: %2$s."
+msgstr[1] "Теги, �н�тые � пользовател� %1$s: %2$s."
+msgstr[2] "Теги, �н�тые � пользовател� %1$s: %2$s."
 
 #. TRANS: Whois output.
 #. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
@@ -8064,16 +7582,14 @@ msgid "lists the groups you have joined"
 msgstr "�пи�ок групп, к которым вы при�оединили�ь"
 
 #. TRANS: Help message for IM/SMS command "tag".
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "tag a user"
-msgstr "Теги дл� пользовател�"
+msgstr "тегировать пользовател�"
 
 #. TRANS: Help message for IM/SMS command "untag".
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "untag a user"
-msgstr "Теги дл� пользовател�"
+msgstr "�н�ть тег � пользовател�"
 
 #. TRANS: Help message for IM/SMS command "subscriptions".
 msgctxt "COMMANDHELP"
@@ -8217,6 +7733,11 @@ msgstr "Возможно, вы решите запу�тить у�тановщ
 msgid "Go to the installer."
 msgstr "Перейти к у�тановщику"
 
+#. TRANS: Header on conversation page. Hidden by default (h2).
+#. TRANS: Label for user statistics.
+msgid "Notices"
+msgstr "Запи�и"
+
 #. TRANS: Page title for when a database error occurs.
 msgid "Database error"
 msgstr "Ошибка базы данных"
@@ -8227,20 +7748,11 @@ msgctxt "MENU"
 msgid "Public"
 msgstr "Общее"
 
-#. TRANS: Menu item in default local navigation panel.
-#. TRANS: Menu item in search group navigation panel.
-#. TRANS: Menu item in local navigation menu.
-#, fuzzy
-msgctxt "MENU"
-msgid "Groups"
-msgstr "Группы"
-
 #. TRANS: Menu item in default local navigation panel.
 #. TRANS: Menu item title in local navigation menu.
-#, fuzzy
 msgctxt "MENU"
 msgid "Lists"
-msgstr "Ограничени�"
+msgstr "Спи�ки"
 
 #. TRANS: Title of form for deleting a user.
 #. TRANS: Link text in notice list item to delete a notice.
@@ -8251,51 +7763,12 @@ msgstr "Удалить"
 msgid "Delete this user"
 msgstr "Удалить �того пользовател�"
 
-#. TRANS: Form legend of form for changing the page design.
-msgid "Change design"
-msgstr "Изменение оформлени�"
-
-#. TRANS: Fieldset legend on profile design page to change profile page colours.
-msgid "Change colours"
-msgstr "Изменение цветовой гаммы"
-
-#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-msgid "Use defaults"
-msgstr "И�пользовать значени� по умолчанию"
-
-#. TRANS: Label in form on profile design page.
-#. TRANS: Field contains file name on user's computer that could be that user's custom profile background image.
-msgid "Upload file"
-msgstr "Загрузить файл"
-
-#. TRANS: Instructions for form on profile design page.
-msgid ""
-"You can upload your personal background image. The maximum file size is 2MB."
-msgstr ""
-"Вы можете загрузить �об�твенное фоновое изображение. Мак�имальный размер "
-"файла �о�тавл�ет 2МБ."
-
-#. TRANS: Radio button on profile design page that will enable use of the uploaded profile image.
-msgctxt "RADIO"
-msgid "On"
-msgstr "Включено"
-
-#. TRANS: Radio button on profile design page that will disable use of the uploaded profile image.
-msgctxt "RADIO"
-msgid "Off"
-msgstr "Выключено"
-
-#. TRANS: Success message displayed if design settings were saved after clicking "Use defaults".
-msgid "Design defaults restored."
-msgstr "Оформление по умолчанию во��тановлено."
-
 #. TRANS: Exception. %s is an ID.
 #, php-format
 msgid "Unable to find services for %s."
 msgstr "�е удаёт�� найти �ерви�ы дл� %s."
 
 #. TRANS: Form legend for removing the favourite status for a favourite notice.
-#. TRANS: Title for button text for removing the favourite status for a favourite notice.
 msgid "Disfavor this notice"
 msgstr "Мне не нравит�� �та запи�ь"
 
@@ -8304,8 +7777,11 @@ msgctxt "BUTTON"
 msgid "Disfavor favorite"
 msgstr "Убрать из любимых"
 
+#. TRANS: Button title for removing the favourite status for a favourite notice.
+msgid "Remove this notice from your list of favorite notices."
+msgstr "Удалить �ту запи�ь из �пи�ка любимых запи�ей."
+
 #. TRANS: Form legend for adding the favourite status to a notice.
-#. TRANS: Title for button text for adding the favourite status to a notice.
 msgid "Favor this notice"
 msgstr "Мне нравит�� �та запи�ь"
 
@@ -8314,6 +7790,10 @@ msgctxt "BUTTON"
 msgid "Favor"
 msgstr "В любимые"
 
+#. TRANS: Button title for adding the favourite status to a notice.
+msgid "Add this notice to your list of favorite notices."
+msgstr "Добавить �ту запи�ь в �пи�ок любимых запи�ей."
+
 #. TRANS: Feed type name.
 msgid "RSS 1.0"
 msgstr "RSS 1.0"
@@ -8330,6 +7810,10 @@ msgstr "Atom"
 msgid "FOAF"
 msgstr "FOAF"
 
+#. TRANS: Feed type name. See http://activitystrea.ms/
+msgid "Activity Streams"
+msgstr "Activity Streams"
+
 #. TRANS: Client exception thrown when an imported feed does not have an author.
 msgid "No author in the feed."
 msgstr "�е указан автор в ленте."
@@ -8353,15 +7837,35 @@ msgid "Tag"
 msgstr "Теги"
 
 #. TRANS: Dropdown field title on gallery action page for a list containing tags.
-#, fuzzy
 msgid "Choose a tag to narrow list."
-msgstr "Выберите тег из выпадающего �пи�ка"
+msgstr "Выберите тег дл� �ужени� �пи�ка."
 
 #. TRANS: Description on form for granting a role.
 #, php-format
 msgid "Grant this user the \"%s\" role"
 msgstr "�азначить �тому пользователю роль «%s»"
 
+#. TRANS: Header for mini list of group members on a group page (h2).
+msgid "Members"
+msgstr "Уча�тники"
+
+#. TRANS: Link to all group members from mini list of group members if group has more than n members.
+msgid "All members"
+msgstr "В�е уча�тники"
+
+#. TRANS: Header for mini list of users with a pending membership request on a group page (h2).
+msgid "Pending"
+msgstr "В ожидании"
+
+#. TRANS: Header for mini list of users that are blocked in a group page (h2).
+msgid "Blocked"
+msgstr "Заблокированные"
+
+#. TRANS: Title for list of group administrators on a group page.
+msgctxt "TITLE"
+msgid "Admins"
+msgstr "�дмини�траторы"
+
 #. TRANS: Button text for the form that will block a user from a group.
 msgctxt "BUTTON"
 msgid "Block"
@@ -8369,8 +7873,10 @@ msgstr "Заблокировать"
 
 #. TRANS: Submit button title.
 msgctxt "TOOLTIP"
-msgid "Block this user"
-msgstr "Заблокировать �того пользовател�"
+msgid "Block this user so that they can no longer post messages to it."
+msgstr ""
+"Заблокировать �того пользовател�, чтобы запретить ему отправл�ть �ообщени� "
+"�юда."
 
 #. TRANS: Field title on group edit form.
 msgid "URL of the homepage or blog of the group or topic."
@@ -8423,70 +7929,17 @@ msgstr[2] ""
 msgid ""
 "New members must be approved by admin and all posts are forced to be private."
 msgstr ""
+"�овые уча�тники должны быть утверждены админи�тратором и в�е �ообщени� "
+"принудительно перевод�т�� в личный режим."
 
 #. TRANS: Indicator in group members list that this user is a group administrator.
 msgctxt "GROUPADMIN"
 msgid "Admin"
 msgstr "�дмини�тратор"
 
-#. TRANS: Menu item in the group navigation page.
-msgctxt "MENU"
-msgid "Group"
-msgstr "Группа"
-
-#. TRANS: Tooltip for menu item in the group navigation page.
-#. TRANS: %s is the nickname of the group.
-#, php-format
-msgctxt "TOOLTIP"
-msgid "%s group"
-msgstr "Группа %s"
-
-#. TRANS: Menu item in the group navigation page.
-msgctxt "MENU"
-msgid "Members"
-msgstr "Уча�тники"
-
-#. TRANS: Tooltip for menu item in the group navigation page.
-#. TRANS: %s is the nickname of the group.
-#, php-format
-msgctxt "TOOLTIP"
-msgid "%s group members"
-msgstr "Уча�тники группы %s"
-
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: %d is the number of pending members.
-#, php-format
-msgctxt "MENU"
-msgid "Pending members (%d)"
-msgid_plural "Pending members (%d)"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: %s is the nickname of the group.
-#, fuzzy, php-format
-msgctxt "TOOLTIP"
-msgid "%s pending members"
-msgstr "Уча�тники группы %s"
-
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-msgctxt "MENU"
-msgid "Blocked"
-msgstr "Заблокированные"
-
-#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: %s is the nickname of the group.
-#, php-format
-msgctxt "TOOLTIP"
-msgid "%s blocked users"
-msgstr "Заблокированные пользователи %s"
-
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: Menu item in primary navigation panel.
-msgctxt "MENU"
-msgid "Admin"
-msgstr "�дмини�трирование"
+#. TRANS: Group actions header (h2). Text hidden by default.
+msgid "Group actions"
+msgstr "Дей�тви� группы"
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
@@ -8495,11 +7948,6 @@ msgctxt "TOOLTIP"
 msgid "Edit %s group properties"
 msgstr "Редактировать �вой�тва группы %s"
 
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-msgctxt "MENU"
-msgid "Logo"
-msgstr "Логотип"
-
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
 #, php-format
@@ -8507,32 +7955,32 @@ msgctxt "TOOLTIP"
 msgid "Add or edit %s logo"
 msgstr "Добавить или изменить логотип группы %s"
 
-#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: %s is the nickname of the group.
-#, php-format
-msgctxt "TOOLTIP"
-msgid "Add or edit %s design"
-msgstr "Добавить или изменить оформление %s"
-
-#. TRANS: Group actions header (h2). Text hidden by default.
-msgid "Group actions"
-msgstr "Дей�тви� группы"
+#. TRANS: Link text for link on user profile.
+msgctxt "MENU"
+msgid "Logo"
+msgstr "Логотип"
 
 #. TRANS: Title for groups with the most members section.
-#, fuzzy
 msgid "Popular groups"
-msgstr "Попул�рные запи�и"
+msgstr "Попул�рные группы"
 
 #. TRANS: Title for groups with the most posts section.
-#, fuzzy
 msgid "Active groups"
-msgstr "В�е группы"
+msgstr "�ктивные группы"
 
-#. TRANS: Title for group tag cloud section.
-#. TRANS: %s is a group name.
-#, php-format
-msgid "Tags in %s group's notices"
-msgstr "Теги запи�ей группы %s"
+#. TRANS: Link description for seeing all groups.
+#. TRANS: Link description for seeing all lists.
+msgid "See all"
+msgstr "Показать в�е"
+
+#. TRANS: Link title for seeing all groups.
+msgid "See all groups you belong to."
+msgstr "Показать в�е группы, в которых вы находите�ь."
+
+#. TRANS: Menu item title in personal group navigation menu.
+#. TRANS: %s is a username.
+msgid "Back to top"
+msgstr "Вернуть�� вверх"
 
 #. TRANS: Client exception 406
 msgid "This page is not available in a media type you accept"
@@ -8592,7 +8040,7 @@ msgstr[2] "%dБ"
 #. TRANS: Body text for confirmation code e-mail.
 #. TRANS: %1$s is a user nickname, %2$s is the StatusNet sitename,
 #. TRANS: %3$s is the display name of an IM plugin.
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "User \"%1$s\" on %2$s has said that your %3$s screenname belongs to them. If "
 "that is true, you can confirm by clicking on this URL: %4$s . (If you cannot "
@@ -8600,11 +8048,11 @@ msgid ""
 "user is not you, or if you did not request this confirmation, just ignore "
 "this message."
 msgstr ""
-"Пользователь «%s» на �айте %s �ообщил, что п�евдоним %s принадлежит ему. Е�ли "
-"�то дей�твительно так, вы можете подтвердить �то, нажав на �ледующую ��ылку: "
-"%s. (Е�ли вы не можете нажать на ��ылку, �копируйте адре� в адре�ную �троку "
-"браузера.) Е�ли вы не �вл�ете�ь упом�нутым пользователем или не запрашивали "
-"�то подтверждение, про�то проигнорируйте �то �ообщение."
+"Пользователь «%1$s» на �айте %2$s �ообщил, что ваш п�евдоним %3$s принадлежит "
+"ему. Е�ли �то дей�твительно так, вы можете подтвердить �то про�то перейд� по "
+"�ледующей ��ылке: %4$s (е�ли вы не можете нажать на ��ылку, �копируйте адре� "
+"в адре�ную �троку браузера). Е�ли вы не �вл�ете�ь упом�нутым пользователем, "
+"не подтверждайте ничего, про�то проигнорируйте �то �ообщение."
 
 #. TRANS: Exception thrown when trying to deliver a notice to an unknown inbox.
 #. TRANS: %d is the unknown inbox ID (number).
@@ -8614,35 +8062,66 @@ msgstr "�еизве�тный и�точник вход�щих �ообщен
 
 #. TRANS: Server exception thrown trying to initialise an IM plugin without meeting all prerequisites.
 msgid "Queueing must be enabled to use IM plugins."
-msgstr ""
+msgstr "Си�тема очередей должна быть включена дл� и�пользовани� IM-дополнений."
 
 #. TRANS: Server exception thrown trying to initialise an IM plugin without a transport method.
 msgid "Transport cannot be null."
-msgstr ""
+msgstr "Тран�порт не может от�ут�твовать."
 
 #. TRANS: Title for inbox tag cloud section.
 msgctxt "TITLE"
 msgid "Trends"
-msgstr ""
+msgstr "Тенденции"
 
-#. TRANS: Button text for inviting more users to the StatusNet instance.
-#, fuzzy
+#. TRANS: Default button text for inviting more users to the StatusNet instance.
 msgctxt "BUTTON"
 msgid "Invite more colleagues"
-msgstr "Пригла�ить новых пользователей"
+msgstr "Пригла�ить других коллег"
+
+#. TRANS: Form legend.
+msgid "Invite collegues"
+msgstr "Пригла�ите знакомых"
+
+#. TRANS: Field label for a list of e-mail addresses.
+msgid "Email addresses"
+msgstr "Почтовый адре�"
+
+#. TRANS: Field title for a list of e-mail addresses.
+msgid "Addresses of friends to invite (one per line)."
+msgstr "�дре�а друзей, которых вы хотите пригла�ить (по одному на �троку)."
+
+#. TRANS: Field label for a personal message to send to invitees.
+msgid "Personal message"
+msgstr "Личное �ообщение"
+
+#. TRANS: Field title for a personal message to send to invitees.
+msgid "Optionally add a personal message to the invitation."
+msgstr "Можно добавить к приглашению личное �ообщение."
+
+#. TRANS: Send button for inviting friends
+#. TRANS: Button text for sending notice.
+msgctxt "BUTTON"
+msgid "Send"
+msgstr "Отправить"
+
+#. TRANS: Submit button title.
+msgid "Send invitations."
+msgstr "Отправить приглашени�."
 
 #. TRANS: Button text for joining a group.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Join"
 msgstr "При�оединить��"
 
 #. TRANS: Button text on form to leave a group.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Leave"
 msgstr "Покинуть"
 
+#. TRANS: Link title for seeing all lists.
+msgid "See all lists you have created."
+msgstr "Показать в�е �пи�ки, �озданные вами."
+
 #. TRANS: Menu item for logging in to the StatusNet site.
 #. TRANS: Menu item in primary navigation panel.
 msgctxt "MENU"
@@ -8703,14 +8182,14 @@ msgstr ""
 #. TRANS: Main body of new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscriber's long name, %2$s is the StatusNet sitename.
 #, php-format
-msgid "%1$s is now listening to your notices on %2$s."
-msgstr "%1$s теперь �ледит за вашими запи��ми на %2$s."
+msgid "%1$s is now following you on %2$s."
+msgstr "%1$s теперь �ледит за вами на %2$s."
 
 #. TRANS: Subject of pending new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscribing user's nickname, %2$s is the StatusNet sitename.
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s would like to listen to your notices on %2$s."
-msgstr "%1$s теперь �ледит за вашими запи��ми на %2$s."
+msgstr "%1$s хотел бы �ледить за вашими �ообщени�ми на %2$s."
 
 #. TRANS: Main body of pending new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscriber's long name, %2$s is the StatusNet sitename.
@@ -8719,11 +8198,13 @@ msgid ""
 "%1$s would like to listen to your notices on %2$s. You may approve or reject "
 "their subscription at %3$s"
 msgstr ""
+"%1$s хотел бы �ледить за вашими �ообщени�ми на %2$s. Вы можете прин�ть или "
+"отклонить �тот запро� по ��ылке %3$s"
 
 #. TRANS: Common footer block for StatusNet notification emails.
 #. TRANS: %1$s is the StatusNet sitename,
 #. TRANS: %2$s is a link to the addressed user's e-mail settings.
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "Faithfully yours,\n"
 "%1$s.\n"
@@ -8731,16 +8212,11 @@ msgid ""
 "----\n"
 "Change your email address or notification options at %2$s"
 msgstr ""
-"%1$s �ейча� �ледит за вашими запи��ми на %2$s.\n"
-"\n"
-"%3$s\n"
-"\n"
-"%4$s%5$s%6$s\n"
-"И�кренне ваш,\n"
-"%2$s.\n"
+"И�кренне ваши,\n"
+"%1$s.\n"
 "\n"
 "----\n"
-"Измените email-адре� и на�тройки уведомлений на %7$s\n"
+"Изменить адре� �лектронной почты или правила оповещени� можно по ��ылке %2$s"
 
 #. TRANS: Profile info line in notification e-mail.
 #. TRANS: %s is a URL.
@@ -8756,14 +8232,14 @@ msgstr "Биографи�: %s"
 
 #. TRANS: This is a paragraph in a new-subscriber e-mail.
 #. TRANS: %s is a URL where the subscriber can be reported as abusive.
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "If you believe this account is being used abusively, you can block them from "
 "your subscribers list and report as spam to site administrators at %s."
 msgstr ""
-"Е�ли вы �читаете, �та учётна� запи�ь и�пользует�� �о злоупотреблени�ми, вы "
-"можете заблокировать её включение в �вой �пи�ок подпи�чиков и �ообщить о "
-"�паме админи�траторам �айта по %s"
+"Е�ли вы �читаете, что �та учётна� запи�ь и�пользует�� неправомерно, вы "
+"можете заблокировать её в �пи�ке �воих читателей и �ообщить админи�траторам "
+"�айта о факте �пама по ��ылке %s."
 
 #. TRANS: Subject of notification mail for new posting email address.
 #. TRANS: %s is the StatusNet sitename.
@@ -8774,7 +8250,7 @@ msgstr "�овый �лектронный адре� дл� по�тинга %s"
 #. TRANS: Body of notification mail for new posting email address.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is the e-mail address to send
 #. TRANS: to to post by e-mail, %3$s is a URL to more instructions.
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
 "\n"
@@ -8782,14 +8258,12 @@ msgid ""
 "\n"
 "More email instructions at %3$s."
 msgstr ""
-"У ва� новый адре� отправки на %1$s.\n"
+"Теперь у ва� новый адре� �лектронной почты дл� отправки �ообщений на %1$s.\n"
 "\n"
-"По�ылайте �лектронные пи�ьма на %2$s дл� �оздани� новых запи�ей.\n"
+"При�ылайте пи�ьма на адре� %2$s, и ваши �ообщени� будут опубликованы.\n"
 "\n"
-"Ин�трукции по �лектронным публикаци�м запи�ей на %3$s.\n"
-"\n"
-"И�кренне Ваш,\n"
-"%1$s"
+"Подробна� информаци� об и�пользовании �лектронной почты до�тупна по адре�у %3"
+"$s."
 
 #. TRANS: Subject line for SMS-by-email notification messages.
 #. TRANS: %s is the posting user's nickname.
@@ -8816,7 +8290,7 @@ msgstr "Ва� «подтолкнул» пользователь %s"
 #. TRANS: Body for 'nudge' notification email.
 #. TRANS: %1$s is the nuding user's long name, $2$s is the nudging user's nickname,
 #. TRANS: %3$s is a URL to post notices at.
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "%1$s (%2$s) is wondering what you are up to these days and is inviting you "
 "to post some news.\n"
@@ -8827,17 +8301,14 @@ msgid ""
 "\n"
 "Don't reply to this email; it won't get to them."
 msgstr ""
-"%1$s (%2$s) интере�ует��, что произошло � вами за �ти дни и предлагает "
-"отправить немного ново�тей.\n"
+"%1$s (%2$s) и�кренне интере�ует��, что у ва� произошло нового в по�леднее "
+"врем� и ждёт ново�тей от ва�.\n"
 "\n"
-"Мы ждём от ва� �того :)\n"
+"Удовлетворите любопыт�тво друга :)\n"
 "\n"
 "%3$s\n"
 "\n"
-"�е отвечайте на �то пи�ьмо, ответ никто не получит.\n"
-"\n"
-"С уважением,\n"
-"%4$s\n"
+"�е отвечайте на �то пи�ьмо; ответа никто не получит."
 
 #. TRANS: Subject for direct-message notification email.
 #. TRANS: %s is the sending user's nickname.
@@ -8848,7 +8319,7 @@ msgstr "�овое приватное �ообщение от %s"
 #. TRANS: Body for direct-message notification email.
 #. TRANS: %1$s is the sending user's long name, %2$s is the sending user's nickname,
 #. TRANS: %3$s is the message content, %4$s a URL to the message,
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
 "\n"
@@ -8862,20 +8333,17 @@ msgid ""
 "\n"
 "Don't reply to this email; it won't get to them."
 msgstr ""
-"%1$s (%2$s) отправил вам личное �ообщение:\n"
+"%1$s (%2$s) при�лал(а) вам личное �ообщение:\n"
 "\n"
 "------------------------------------------------------\n"
 "%3$s\n"
 "------------------------------------------------------\n"
 "\n"
-"Вы можете ответить на �ообщение зде�ь:\n"
+"Можете ответить зде�ь:\n"
 "\n"
 "%4$s\n"
 "\n"
-"�е отвечайте на �то пи�ьмо; ответ не дойдёт до пользовател�.\n"
-"\n"
-"С уважением,\n"
-"%5$s\n"
+"�е отвечайте на �то пи�ьмо; ответа никто не получит."
 
 #. TRANS: Subject for favorite notification e-mail.
 #. TRANS: %1$s is the adding user's long name, %2$s is the adding user's nickname.
@@ -8888,7 +8356,7 @@ msgstr "%1$s (@%2$s) добавил вашу запи�ь в чи�ло �вои
 #. TRANS: %3$s is a URL to the faved notice, %4$s is the faved notice text,
 #. TRANS: %5$s is a URL to all faves of the adding user, %6$s is the StatusNet sitename,
 #. TRANS: %7$s is the adding user's nickname.
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
 "\n"
@@ -8904,22 +8372,20 @@ msgid ""
 "\n"
 "%5$s"
 msgstr ""
-"%1$s (@%7$s) только что добавил запи�ь из %2$s в чи�ло �воих любимых.\n"
+"%1$s (@%7$s) только добавил(а) ваш �ообщение � %2$s в �пи�ок любимых "
+"�ообщений.\n"
 "\n"
-"URL-адре� запи�и:\n"
+"URL-адре� вашего �ообщени�:\n"
 "\n"
 "%3$s\n"
 "\n"
-"Тек�т запи�и:\n"
+"Тек�т вашего �ообщени�:\n"
 "\n"
 "%4$s\n"
 "\n"
-"Вы можете про�мотреть �пи�ок любимых запи�ей %1$s зде�ь:\n"
+"Вы можете про�мотреть �пи�ок любимых �ообщений %1$s зде�ь:\n"
 "\n"
-"%5$s\n"
-"\n"
-"С уважением,\n"
-"%6$s\n"
+"%5$s"
 
 #. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
 #, php-format
@@ -8941,7 +8407,7 @@ msgstr "%1$s (@%2$s) отправил запи�ь дл� вашего вним
 #. TRANS: Body of @-reply notification e-mail.
 #. TRANS: %1$s is the sending user's name, $2$s is the StatusNet sitename,
 #. TRANS: %3$s is a URL to the notice, %4$s is the notice text,
-#. TRANS: %5$s is a URL to the full conversion if it exists (otherwise empty),
+#. TRANS: %5$s is the text "The full conversation can be read here:" and a URL to the full conversion if it exists (otherwise empty),
 #. TRANS: %6$s is a URL to reply to the notice, %7$s is a URL to all @-replies for the addressed user,
 #, php-format
 msgid ""
@@ -8983,19 +8449,23 @@ msgstr ""
 
 #. TRANS: Subject of group join notification e-mail.
 #. TRANS: %1$s is the joining user's nickname, %2$s is the group name, and %3$s is the StatusNet sitename.
+#, php-format
+msgid "%1$s has joined your group %2$s on %3$s"
+msgstr "%1$s при�оединил�� к вашей группе %2$s на %3$s"
+
 #. TRANS: Main body of group join notification e-mail.
 #. TRANS: %1$s is the subscriber's long name, %2$s is the group name, and %3$s is the StatusNet sitename,
 #. TRANS: %4$s is a block of profile info about the subscriber.
 #. TRANS: %5$s is a link to the addressed user's e-mail settings.
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s has joined your group %2$s on %3$s."
-msgstr "%1$s при�оединил�� к группе %2$s."
+msgstr "%1$s при�оединил�� к вашей группе %2$s на %3$s."
 
 #. TRANS: Subject of pending group join request notification e-mail.
 #. TRANS: %1$s is the joining user's nickname, %2$s is the group name, and %3$s is the StatusNet sitename.
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s wants to join your group %2$s on %3$s."
-msgstr "%1$s при�оединил�� к группе %2$s."
+msgstr "%1$s желает при�оединить�� к вашей группе %2$s на %3$s ."
 
 #. TRANS: Main body of pending group join request notification e-mail.
 #. TRANS: %1$s is the subscriber's long name, %2$s is the group name, and %3$s is the StatusNet sitename,
@@ -9005,6 +8475,8 @@ msgid ""
 "%1$s would like to join your group %2$s on %3$s. You may approve or reject "
 "their group membership at %4$s"
 msgstr ""
+"%1$s желает при�оединить�� к вашей группе %2$s на %3$s. Вы можете прин�ть "
+"или отклонить �тот запро� по ��ылке %4$s"
 
 #. TRANS: Client error displayed when trying to access a mailbox that is not of the logged in user.
 msgid "Only the user can read their own mailboxes."
@@ -9070,8 +8542,8 @@ msgstr "Сделать админи�тратором"
 
 #. TRANS: Submit button title.
 msgctxt "TOOLTIP"
-msgid "Make this user an admin"
-msgstr "Сделать �того пользовател� админи�тратором"
+msgid "Make this user an admin."
+msgstr "Сделать �того пользовател� админи�тратором."
 
 #. TRANS: Client exception thrown when a database error was thrown during a file upload operation.
 msgid "There was a database error while saving your file. Please try again."
@@ -9120,7 +8592,7 @@ msgstr "По�лать пр�мую запи�ь"
 msgid "Select recipient:"
 msgstr "Выберите получател�:"
 
-#. TRANS Entry in drop-down selection box in direct-message inbox/outbox when no one is available to message.
+#. TRANS: Entry in drop-down selection box in direct-message inbox/outbox when no one is available to message.
 msgid "No mutual subscribers."
 msgstr "�ет взаимных подпи�чиков."
 
@@ -9150,7 +8622,7 @@ msgstr "web"
 #. TRANS: A possible notice source (XMPP).
 msgctxt "SOURCE"
 msgid "xmpp"
-msgstr ""
+msgstr "XMPP"
 
 #. TRANS: A possible notice source (e-mail).
 msgctxt "SOURCE"
@@ -9185,7 +8657,11 @@ msgstr "Спо�об обработки цели такого типа неиз
 
 #. TRANS: Server exception thrown when a micro app plugin developer has not done his job too well.
 msgid "You must implement either adaptNoticeListItem() or showNotice()."
-msgstr ""
+msgstr "Вы должны реализовать либо adaptNoticeListItem(), либо showNotice()."
+
+#. TRANS: Link description to show more items in a list.
+msgid "More â–¼"
+msgstr "Ещё ▼"
 
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 msgid "Nickname cannot be empty."
@@ -9233,15 +8709,10 @@ msgstr ""
 "времени, чем ожидало�ь; повторите попытку позже"
 
 #. TRANS: Separator in profile addressees list.
-#, fuzzy
 msgctxt "SEPARATOR"
 msgid ", "
 msgstr ", "
 
-#. TRANS: Start of profile addressees list.
-msgid " â–¸ "
-msgstr ""
-
 #. TRANS: Used in coordinates as abbreviation of north.
 msgid "N"
 msgstr "�. ш."
@@ -9280,16 +8751,16 @@ msgid "Repeated by"
 msgstr "Повторено"
 
 #. TRANS: Link title in notice list item to reply to a notice.
-msgid "Reply to this notice"
-msgstr "Ответить на �ту запи�ь"
+msgid "Reply to this notice."
+msgstr "Ответить на �ту запи�ь."
 
 #. TRANS: Link text in notice list item to reply to a notice.
 msgid "Reply"
 msgstr "Ответить"
 
 #. TRANS: Link title in notice list item to delete a notice.
-msgid "Delete this notice"
-msgstr "Удалить �ту запи�ь"
+msgid "Delete this notice from the timeline."
+msgstr "Удалить �ту запи�ь из ленты."
 
 #. TRANS: Title for repeat form status in notice list when a notice has been repeated.
 msgid "Notice repeated."
@@ -9312,222 +8783,176 @@ msgstr "«Подтолкнуть»"
 msgid "Send a nudge to this user."
 msgstr "«Подтолкнуть» �того пользовател�."
 
-#. TRANS: Exception thrown when creating a new profile fails in OAuth store.
-msgid "Error inserting new profile."
-msgstr "Ошибка размещени� нового профил�."
-
-#. TRANS: Exception thrown when creating a new avatar fails in OAuth store.
-msgid "Error inserting avatar."
-msgstr "Ошибка размещени� аватара."
-
-#. TRANS: Exception thrown when creating a remote profile fails in OAuth store.
-msgid "Error inserting remote profile."
-msgstr "Ошибка размещени� удалённого профил�."
-
-#. TRANS: Exception thrown when a notice is denied because it has been sent before.
-msgid "Duplicate notice."
-msgstr "Дублирующа��� запи�ь."
-
-#. TRANS: Exception thrown when creating a new subscription fails in OAuth store.
-#, fuzzy
-msgid "Could not insert new subscription."
-msgstr "�е удаёт�� в�тавить новую подпи�ку."
-
 #. TRANS: Server exception thrown in oEmbed action if no API endpoint is available.
-#, fuzzy
 msgid "No oEmbed API endpoint available."
-msgstr "IM не до�тупен."
+msgstr "Конечна� точка oEmbed API недо�тупна."
 
 #. TRANS: Field label for list.
-#, fuzzy
 msgctxt "LABEL"
 msgid "List"
-msgstr "С�ылки"
+msgstr "Спи�ок"
 
 #. TRANS: Field title for list.
-#, fuzzy
 msgid "Change the list (letters, numbers, -, ., and _ are allowed)."
-msgstr ""
-"Теги дл� �того пользовател� (буквы, цифры, -, ., и _), разделённые зап�тыми "
-"или пробелами."
+msgstr "Изменить �пи�ок (разрешены буквы, цифры, -, . и _)."
 
 #. TRANS: Field title for description of list.
-#, fuzzy
 msgid "Describe the list or topic."
-msgstr "Опишите группу или тему."
+msgstr "Опишите �пи�ок или тему."
 
 #. TRANS: Field title for description of list.
 #. TRANS: %d is the maximum number of characters for the description.
-#, fuzzy, php-format
+#, php-format
 msgid "Describe the list or topic in %d character."
 msgid_plural "Describe the list or topic in %d characters."
-msgstr[0] "Опишите группу или тему, и�пользу� до %d �имвола."
-msgstr[1] "Опишите группу или тему, и�пользу� до %d �имволов."
-msgstr[2] "Опишите группу или тему, и�пользу� до %d �имволов."
+msgstr[0] "Опишите �пи�ок или тему, и�пользу� до %d �имвола."
+msgstr[1] "Опишите �пи�ок или тему, и�пользу� до %d �имволов."
+msgstr[2] "Опишите �пи�ок или тему, и�пользу� до %d �имволов."
 
 #. TRANS: Button title to delete a list.
-#, fuzzy
 msgid "Delete this list."
-msgstr "Удалить �того пользовател�."
+msgstr "Удалить �тот �пи�ок."
 
 #. TRANS: Header in list edit form.
 msgid "Add or remove people"
-msgstr ""
+msgstr "Добавить или удалить людей"
 
 #. TRANS: Header in list edit form.
-#, fuzzy
 msgctxt "HEADER"
 msgid "Search"
 msgstr "Пои�к"
 
 #. TRANS: Menu item in list navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "List"
-msgstr "С�ылки"
+msgstr "Спи�ок"
 
 #. TRANS: Menu item title in list navigation panel.
 #. TRANS: %1$s is a list, %2$s is a nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s list by %2$s."
-msgstr "%1$s и %2$s"
+msgstr "Спи�ок %1$s пользовател� %2$s."
 
 #. TRANS: Menu item in list navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Listed"
-msgstr "Лицензи�"
+msgstr "В �пи�ке"
 
 #. TRANS: Menu item in list navigation panel.
 #. TRANS: Menu item in local navigation menu.
-#, fuzzy
 msgctxt "MENU"
 msgid "Subscribers"
 msgstr "Подпи�чики"
 
 #. TRANS: Menu item title in list navigation panel.
 #. TRANS: %1$s is a list, %2$s is a nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "Subscribers to %1$s list by %2$s."
-msgstr "Подпи�ал�� на %s."
+msgstr "Подпи�чики на �пи�ок %1$s пользовател� %2$s."
 
 #. TRANS: Menu item in list navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Edit"
 msgstr "Редактировать"
 
 #. TRANS: Menu item title in list navigation panel.
 #. TRANS: %s is a list.
-#, fuzzy, php-format
+#, php-format
 msgid "Edit %s list by you."
-msgstr "Изменить информацию о группе %s"
-
-#. TRANS: Link description for link to list of users tagged with a tag.
-#, fuzzy
-msgid "Tagged"
-msgstr "Теги"
+msgstr "Изменить �вой �пи�ок %s."
 
 #. TRANS: Title for link to edit list settings.
-#, fuzzy
 msgid "Edit list settings."
-msgstr "Изменить на�тройки профил�."
+msgstr "Изменить на�тройки �пи�ка."
 
 #. TRANS: Text for link to edit list settings.
 msgid "Edit"
 msgstr "Редактировать"
 
 #. TRANS: Privacy mode text in list list item for private list.
-#, fuzzy
 msgctxt "MODE"
 msgid "Private"
 msgstr "Личное"
 
 #. TRANS: Menu item in the group navigation page.
-#, fuzzy
 msgctxt "MENU"
 msgid "List Subscriptions"
-msgstr "Подпи�ки"
+msgstr "Подпи�ки на �пи�ки"
 
 #. TRANS: Tooltip for menu item in the group navigation page.
 #. TRANS: %s is a user nickname.
-#, fuzzy, php-format
+#, php-format
 msgctxt "TOOLTIP"
 msgid "Lists subscribed to by %s."
-msgstr "Подпи�ал�� на %s."
+msgstr "Спи�ки, на которые подпи�ан %s."
 
 #. TRANS: Menu item in the group navigation page.
 #. TRANS: %s is a user nickname.
-#, fuzzy, php-format
+#, php-format
 msgctxt "MENU"
 msgid "Lists with %s"
-msgstr "Обновлени� � «$s»"
+msgstr "Спи�ки � %s"
 
 #. TRANS: Tooltip for menu item in the group navigation page.
 #. TRANS: %s is a user nickname.
-#, fuzzy, php-format
+#, php-format
 msgctxt "TOOLTIP"
 msgid "Lists with %s."
-msgstr "Обновлени� � «$s»"
+msgstr "Спи�ки � %s."
 
 #. TRANS: Menu item in the group navigation page.
 #. TRANS: %s is a user nickname.
 #, php-format
 msgctxt "MENU"
 msgid "Lists by %s"
-msgstr ""
+msgstr "Спи�ки %s"
 
 #. TRANS: Tooltip for menu item in the group navigation page.
 #. TRANS: %s is a user nickname.
-#, fuzzy, php-format
+#, php-format
 msgctxt "TOOLTIP"
 msgid "Lists by %s."
-msgstr "%1$s и %2$s"
+msgstr "Спи�ки %s."
 
 #. TRANS: Label in lists widget.
-#, fuzzy
 msgctxt "LABEL"
 msgid "Your lists"
-msgstr "Попул�рные запи�и"
+msgstr "Ваши �пи�ки"
 
 #. TRANS: Fieldset legend in lists widget.
-#, fuzzy
 msgctxt "LEGEND"
 msgid "Edit lists"
-msgstr "�еверный тег человека: %s."
+msgstr "Редактировать �пи�ки"
 
 #. TRANS: Label in self tags widget.
-#, fuzzy
 msgctxt "LABEL"
 msgid "Tags"
 msgstr "Теги"
 
 #. TRANS: Title for section contaning lists with the most subscribers.
-#, fuzzy
 msgid "Popular lists"
-msgstr "Попул�рные запи�и"
+msgstr "Попул�рные �пи�ки"
 
 #. TRANS: List summary. %1$d is the number of users in the list,
 #. TRANS: %2$d is the number of subscribers to the list.
-#, fuzzy, php-format
+#, php-format
 msgid "Listed: %1$d Subscribers: %2$d"
-msgstr "Подпи�чики %1$s, �траница %2$d"
+msgstr "В �пи�ке: %1$d Подпи�чиков: %2$d"
 
 #. TRANS: Title for page that displays which lists current user is part of.
-#, fuzzy, php-format
+#, php-format
 msgid "Lists with you"
-msgstr "Метод API не найден."
+msgstr "Спи�ки � вами"
 
 #. TRANS: Title for page that displays which lists a user is part of.
 #. TRANS: %s is a profile name.
-#, fuzzy, php-format
+#, php-format
 msgid "Lists with %s"
-msgstr "Обновлени� � «$s»"
+msgstr "Спи�ки � %s"
 
 #. TRANS: Title for page that displays lists a user has subscribed to.
-#, fuzzy
 msgid "List subscriptions"
-msgstr "Подпи�ки %s"
+msgstr "Подпи�ки на �пи�ки"
 
 #. TRANS: Menu item in personal group navigation menu.
 #. TRANS: Menu item in settings navigation panel.
@@ -9551,13 +8976,11 @@ msgid "Favorites"
 msgstr "Любимое"
 
 #. TRANS: Replaces %s in '%s\'s favorite notices'. (Yes, we know we need to fix this.)
-#, fuzzy
 msgctxt "FIXME"
 msgid "User"
 msgstr "Пользователь"
 
 #. TRANS: Menu item in personal group navigation menu.
-#, fuzzy
 msgctxt "MENU"
 msgid "Messages"
 msgstr "Сообщени�"
@@ -9580,8 +9003,10 @@ msgctxt "plugin"
 msgid "Enable"
 msgstr "Включить"
 
+#. TRANS: Plugin description for a disabled plugin.
 msgctxt "plugin-description"
-msgid "(Plugin descriptions unavailable when disabled.)"
+msgid ""
+"(The plugin description is unavailable when a plugin has been disabled.)"
 msgstr "(Опи�ание отключённых ра�ширений недо�тупно.)"
 
 #. TRANS: Menu item in primary navigation panel.
@@ -9590,9 +9015,13 @@ msgid "Settings"
 msgstr "�а�тройки"
 
 #. TRANS: Menu item title in primary navigation panel.
-#, fuzzy
 msgid "Change your personal settings."
-msgstr "Изменение пер�ональных на�троек"
+msgstr "Изменение пер�ональных на�троек."
+
+#. TRANS: Menu item in primary navigation panel.
+msgctxt "MENU"
+msgid "Admin"
+msgstr "�дмини�трирование"
 
 #. TRANS: Menu item title in primary navigation panel.
 msgid "Site configuration."
@@ -9611,24 +9040,20 @@ msgstr "Выход � �айта."
 msgid "Login to the site."
 msgstr "Вход на �айт."
 
-#. TRANS: Menu item in primary navigation panel.
-msgctxt "MENU"
-msgid "Search"
-msgstr "Пои�к"
-
-#. TRANS: Menu item title in primary navigation panel.
-msgid "Search the site."
-msgstr "Пои�к по �айту."
+msgid "This profile has been silenced by site moderators"
+msgstr ""
 
 #. TRANS: H2 text for user subscription statistics.
-#, fuzzy
 msgid "Following"
-msgstr "Следить"
+msgstr "Читает"
 
 #. TRANS: H2 text for user subscriber statistics.
-#, fuzzy
 msgid "Followers"
-msgstr "Следить"
+msgstr "По�ледователи"
+
+#. TRANS: H2 text for user statistics.
+msgid "Statistics"
+msgstr "Стати�тика"
 
 #. TRANS: Label for user statistics.
 msgid "User ID"
@@ -9638,10 +9063,6 @@ msgstr "ID пользовател�"
 msgid "Member since"
 msgstr "Реги�траци�"
 
-#. TRANS: Label for user statistics.
-msgid "Notices"
-msgstr "Запи�и"
-
 #. TRANS: Label for user statistics.
 #. TRANS: Average count of posts made per day since account registration.
 msgid "Daily average"
@@ -9652,9 +9073,8 @@ msgid "Groups"
 msgstr "Группы"
 
 #. TRANS: H2 text for user list membership statistics.
-#, fuzzy
 msgid "Lists"
-msgstr "Ограничени�"
+msgstr "Спи�ки"
 
 #. TRANS: Server error displayed when using an unimplemented method.
 msgid "Unimplemented method."
@@ -9674,13 +9094,11 @@ msgid "Recent tags"
 msgstr "Облако тегов"
 
 #. TRANS: Menu item in search group navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Featured"
-msgstr "О�обые"
+msgstr "В центре внимани�"
 
 #. TRANS: Menu item in search group navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Popular"
 msgstr "Попул�рное"
@@ -9688,7 +9106,7 @@ msgstr "Попул�рное"
 #. TRANS: Title for inbox tag cloud section.
 msgctxt "TITLE"
 msgid "Trending topics"
-msgstr ""
+msgstr "Гор�чие темы"
 
 #. TRANS: Client error displayed when return-to was defined without a target.
 msgid "No return-to arguments."
@@ -9730,6 +9148,7 @@ msgid "Keyword(s)"
 msgstr "Ключевые �лова"
 
 #. TRANS: Button text for searching site.
+#. TRANS: Button text for search button on search form.
 #. TRANS: Button text to search profiles.
 msgctxt "BUTTON"
 msgid "Search"
@@ -9742,6 +9161,10 @@ msgid ""
 "* Try more general keywords.\n"
 "* Try fewer keywords."
 msgstr ""
+"* Убедите�ь, что в�е �лова напи�аны правильно.\n"
+"* Попробуйте другие ключевые �лова.\n"
+"* Попробуйте обобщить ключевые �лова.\n"
+"* Попробуйте уменьшить количе�тво ключевых �лов."
 
 #. TRANS: Standard search suggestions shown when a search does not give any results.
 #, php-format
@@ -9755,6 +9178,14 @@ msgid ""
 "* [Yahoo](http://search.yahoo.com/search?p=site%%3A%%%%site.server%%%%+%s)\n"
 "* [Collecta](http://collecta.com/#q=%s)"
 msgstr ""
+"О�уще�твить пои�к можно другим �по�обом:\n"
+"\n"
+"* [Twingly](http://www.twingly.com/search?q=%s&content=microblog&site=%%%%"
+"site.server%%%%)\n"
+"* [TweetScan](http://www.tweetscan.com/indexi.php?s=%s)\n"
+"* [Google](http://www.google.com/search?q=site%%3A%%%%site.server%%%%+%s)\n"
+"* [Yahoo](http://search.yahoo.com/search?p=site%%3A%%%%site.server%%%%+%s)\n"
+"* [Collecta](http://collecta.com/#q=%s)"
 
 #. TRANS: Menu item in search group navigation panel.
 msgctxt "MENU"
@@ -9778,29 +9209,12 @@ msgstr "�айти запи�ь по �одержимому"
 msgid "Find groups on this site"
 msgstr "�айти группы на �том �айте"
 
-#. TRANS: Secondary navigation menu item leading to help on StatusNet.
-msgctxt "MENU"
-msgid "Help"
-msgstr "Помощь"
-
-#. TRANS: Secondary navigation menu item leading to text about StatusNet site.
-msgctxt "MENU"
-msgid "About"
-msgstr "О �айте"
-
-#. TRANS: Secondary navigation menu item leading to Frequently Asked Questions.
-msgctxt "MENU"
-msgid "FAQ"
-msgstr "FAQ"
-
 #. TRANS: Secondary navigation menu item leading to Terms of Service.
-#, fuzzy
 msgctxt "MENU"
 msgid "TOS"
 msgstr "TOS"
 
 #. TRANS: Secondary navigation menu item leading to privacy policy.
-#, fuzzy
 msgctxt "MENU"
 msgid "Privacy"
 msgstr "Пользователь�кое �оглашение"
@@ -9815,19 +9229,6 @@ msgctxt "MENU"
 msgid "Version"
 msgstr "Вер�и�"
 
-#. TRANS: Secondary navigation menu item leading to e-mail contact information on the
-#. TRANS: StatusNet site, where to report bugs, ...
-#, fuzzy
-msgctxt "MENU"
-msgid "Contact"
-msgstr "Контактна� информаци�"
-
-#. TRANS: Secondary navigation menu item. Leads to information about embedding a timeline widget.
-#, fuzzy
-msgctxt "MENU"
-msgid "Badge"
-msgstr "Бедж"
-
 #. TRANS: Default title for section/sidebar widget.
 msgid "Untitled section"
 msgstr "Секци� без названи�"
@@ -9837,17 +9238,15 @@ msgid "More..."
 msgstr "Далее…"
 
 #. TRANS: Header in settings navigation panel.
-#, fuzzy
 msgctxt "HEADER"
 msgid "Settings"
-msgstr "У�тановки СМС"
+msgstr "�а�тройки"
 
 #. TRANS: Menu item title in settings navigation panel.
 msgid "Change your profile settings"
 msgstr "Изменить ваши на�тройки профил�"
 
 #. TRANS: Menu item in settings navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Avatar"
 msgstr "�ватар"
@@ -9857,7 +9256,6 @@ msgid "Upload an avatar"
 msgstr "Загрузить аватару"
 
 #. TRANS: Menu item in settings navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Password"
 msgstr "Пароль"
@@ -9867,21 +9265,15 @@ msgid "Change your password"
 msgstr "Измените �вой пароль"
 
 #. TRANS: Menu item in settings navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Email"
-msgstr "Email"
+msgstr "Электронна� почта"
 
 #. TRANS: Menu item title in settings navigation panel.
 msgid "Change email handling"
 msgstr "Изменить �лектронный адре�"
 
-#. TRANS: Menu item title in settings navigation panel.
-msgid "Design your profile"
-msgstr "Оформить ваш профиль"
-
 #. TRANS: Menu item in settings navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "URL"
 msgstr "URL"
@@ -9917,8 +9309,16 @@ msgstr "Соединени�"
 msgid "Authorized connected applications"
 msgstr "�вторизованные �оединённые приложени�"
 
+#. TRANS: Menu item in settings navigation panel.
+msgctxt "MENU"
+msgid "Old school"
+msgstr ""
+
+#. TRANS: Menu item title in settings navigation panel.
+msgid "UI tweaks for old-school users"
+msgstr ""
+
 #. TRANS: Title of form to silence a user.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Silence"
 msgstr "Заглушить"
@@ -9927,47 +9327,79 @@ msgstr "Заглушить"
 msgid "Silence this user"
 msgstr "Заглушить �того пользовател�."
 
+#. TRANS: Server error displayed when trying to create an anynymous OAuth consumer.
+msgid "Could not create anonymous consumer."
+msgstr "�е удаёт�� �оздать анонимного пользовател� OAuth."
+
+#. TRANS: Server error displayed when trying to create an anynymous OAuth application.
+msgid "Could not create anonymous OAuth application."
+msgstr "�е удаёт�� �оздать анонимное OAuth-приложение."
+
+#. TRANS: Exception thrown when no token association could be found.
+msgid ""
+"Could not find a profile and application associated with the request token."
+msgstr "�е удаёт�� найти профиль и приложение, �в�занное � ключом запро�а."
+
+#. TRANS: Exception thrown when no access token can be issued.
+msgid "Could not issue access token."
+msgstr "Ошибка выдачи ключа до�тупа."
+
+#. TRANS: Exception thrown when a database error occurs.
+msgid "Database error inserting OAuth application user."
+msgstr "Ошибка базы данных при добавлении пользовател� приложени� OAuth."
+
+#. TRANS: Exception thrown when a database error occurs.
+msgid "Database error updating OAuth application user."
+msgstr "Ошибка базы данных при обновлении пользовател� приложени� OAuth."
+
+#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
+msgid "Tried to revoke unknown token."
+msgstr "Попытка отменить неизве�тный ключ."
+
+#. TRANS: Exception thrown when an attempt is made to remove a revoked token.
+msgid "Failed to delete revoked token."
+msgstr "�е удаёт�� удалить аннулированный ключ."
+
 #. TRANS: Menu item in local navigation menu.
-#, fuzzy
 msgctxt "MENU"
 msgid "Subscriptions"
 msgstr "Подпи�ки"
 
 #. TRANS: Menu item title in local navigation menu.
 #. TRANS: %s is a user nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "People %s subscribes to."
-msgstr "Люди на которых подпи�ан %s"
+msgstr "Люди на которых подпи�ан %s."
 
 #. TRANS: Menu item title in local navigation menu.
 #. TRANS: %s is a user nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "People subscribed to %s."
-msgstr "Люди подпи�анные на %s"
+msgstr "Люди, подпи�авшие�� на %s."
 
 #. TRANS: Menu item in local navigation menu.
 #. TRANS: %d is the number of pending subscription requests.
 #, php-format
 msgctxt "MENU"
 msgid "Pending (%d)"
-msgstr ""
+msgstr "В ожидании (%d)"
 
 #. TRANS: Menu item title in local navigation menu.
 #, php-format
 msgid "Approve pending subscription requests."
-msgstr ""
+msgstr "Прин�ть неподтверждённые запро�ы на подпи�ку."
 
 #. TRANS: Menu item title in local navigation menu.
 #. TRANS: %s is a user nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "Groups %s is a member of."
-msgstr "Группы, в которых �о�тоит %s"
+msgstr "Группы, в которых �о�тоит %s."
 
 #. TRANS: Menu item title in local navigation menu.
 #. TRANS: %s is a user nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "List subscriptions by %s."
-msgstr "Люди подпи�анные на %s"
+msgstr "Спи�ок подпи�ок %s."
 
 #. TRANS: Menu item in local navigation menu.
 msgctxt "MENU"
@@ -9976,14 +9408,24 @@ msgstr "Пригла�ить"
 
 #. TRANS: Menu item title in local navigation menu.
 #. TRANS: %s is the StatusNet sitename.
-#, fuzzy, php-format
+#, php-format
 msgid "Invite friends and colleagues to join you on %s."
-msgstr "Пригла�ите друзей и коллег �тать такими же как вы уча�тниками %s"
+msgstr "Пригла�ите друзей и коллег при�оединить�� к вам на %s."
 
 #. TRANS: Form of form to subscribe to a user.
 msgid "Subscribe to this user"
 msgstr "Подпи�ать�� на �того пользовател�"
 
+#. TRANS: Button text to subscribe to a user.
+#. TRANS: Button text for subscribing to a list.
+msgctxt "BUTTON"
+msgid "Subscribe"
+msgstr "Подпи�ать��"
+
+#. TRANS: Button title to subscribe to a user.
+msgid "Subscribe to this user."
+msgstr "Подпи�ать�� на �того пользовател�."
+
 #. TRANS: Title of personal tag cloud section.
 msgid "People Tagcloud as self-tagged"
 msgstr "Облако �об�твенных тегов людей"
@@ -9993,10 +9435,9 @@ msgid "People Tagcloud as tagged"
 msgstr "Облако тегов людей"
 
 #. TRANS: Content displayed in a tag cloud section if there are no tags.
-#, fuzzy
 msgctxt "NOTAGS"
 msgid "None"
-msgstr "�ет тегов"
+msgstr "�ет"
 
 #. TRANS: Server exception displayed if a theme name was invalid.
 msgid "Invalid theme name."
@@ -10016,9 +9457,8 @@ msgid "Failed saving theme."
 msgstr "Ошибка при �охранении темы."
 
 #. TRANS: Server exception thrown when an uploaded theme has an incorrect structure.
-#, fuzzy
 msgid "Invalid theme: Bad directory structure."
-msgstr "Ошибочна� тема. Плоха� �труктура директорий."
+msgstr "Ошибочна� тема. �едопу�тима� �труктура директорий."
 
 #. TRANS: Client exception thrown when an uploaded theme is larger than the limit.
 #. TRANS: %d is the number of bytes of the uncompressed theme.
@@ -10037,9 +9477,8 @@ msgstr[2] ""
 "занимать не более %d байт."
 
 #. TRANS: Server exception thrown when an uploaded theme is incomplete.
-#, fuzzy
 msgid "Invalid theme archive: Missing file css/display.css"
-msgstr "�едопу�тимый архив: темы. От�ут�твует файл css/display.css"
+msgstr "�едопу�тимый архив темы. От�ут�твует файл css/display.css"
 
 #. TRANS: Server exception thrown when an uploaded theme has an incorrect file or folder name.
 msgid ""
@@ -10055,7 +9494,7 @@ msgstr "Тема �одержит файлы � опа�ным ра�ширен
 
 #. TRANS: Server exception thrown when an uploaded theme contains a file type that is not allowed.
 #. TRANS: %s is the file type that is not allowed.
-#, fuzzy, php-format
+#, php-format
 msgid "Theme contains file of type \".%s\", which is not allowed."
 msgstr "Тема �одержит файл недопу�тимого типа «.%s»."
 
@@ -10090,10 +9529,9 @@ msgid "%1$s and %2$s"
 msgstr "%1$s и %2$s"
 
 #. TRANS: List message for notice favoured by logged in user.
-#, fuzzy
 msgctxt "FAVELIST"
 msgid "You like this."
-msgstr "Попул�рные запи�и"
+msgstr "Вам нравит�� �то."
 
 #. TRANS: List message for when more than 4 people like something.
 #. TRANS: %%s is a list of users liking a notice, %d is the number over 4 that like the notice.
@@ -10101,9 +9539,9 @@ msgstr "Попул�рные запи�и"
 #, php-format
 msgid "%%s and %d others like this."
 msgid_plural "%%s and %d others like this."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "Понравило�ь %%s и ещё %d пользователю."
+msgstr[1] "Понравило�ь %%s и ещё %d пользовател�м."
+msgstr[2] "Понравило�ь %%s и ещё %d пользовател�м."
 
 #. TRANS: List message for favoured notices.
 #. TRANS: %%s is a list of users liking a notice.
@@ -10111,64 +9549,72 @@ msgstr[2] ""
 #, php-format
 msgid "%%s likes this."
 msgid_plural "%%s like this."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "Это нравит�� %%s."
+msgstr[1] "Это нравит�� %%s."
+msgstr[2] "Это нравит�� %%s."
 
 #. TRANS: List message for notice repeated by logged in user.
 msgctxt "REPEATLIST"
-msgid "You have repeated this notice."
-msgstr "Вы уже повторили �ту запи�ь."
+msgid "You repeated this."
+msgstr "Вы повторили �то."
 
-#. TRANS: List message for repeated notices.
-#. TRANS: %d is the number of users that have repeated a notice.
+#. TRANS: List message for when more than 4 people repeat something.
+#. TRANS: %%s is a list of users liking a notice, %d is the number over 4 that like the notice.
+#. TRANS: Plural is decided on the total number of users liking the notice (count of %%s + %d).
 #, fuzzy, php-format
-msgid "One person has repeated this notice."
-msgid_plural "%d people have repeated this notice."
-msgstr[0] "Запи�ь повторена %d пользователем."
-msgstr[1] "Запи�ь повторена %d пользовател�ми."
-msgstr[2] "Запи�ь повторена %d пользовател�ми."
+msgid "%%s and %d other repeated this."
+msgid_plural "%%s and %d others repeated this."
+msgstr[0] "Понравило�ь %%s и ещё %d пользователю."
+msgstr[1] "Понравило�ь %%s и ещё %d пользовател�м."
+msgstr[2] "Понравило�ь %%s и ещё %d пользовател�м."
+
+#. TRANS: List message for favoured notices.
+#. TRANS: %%s is a list of users liking a notice.
+#. TRANS: Plural is based on the number of of users that have favoured a notice.
+#, fuzzy, php-format
+msgid "%%s repeated this."
+msgid_plural "%%s repeated this."
+msgstr[0] "Это нравит�� %%s."
+msgstr[1] "Это нравит�� %%s."
+msgstr[2] "Это нравит�� %%s."
 
 #. TRANS: Form legend.
-#, fuzzy, php-format
+#, php-format
 msgid "Search and list people"
-msgstr "Пои�к по �айту"
+msgstr "�айти и добавить людей в �пи�ок"
 
 #. TRANS: Dropdown option for searching in profiles.
 msgid "Everything"
-msgstr ""
+msgstr "Везде"
 
 #. TRANS: Dropdown option for searching in profiles.
-#, fuzzy
 msgid "Fullname"
 msgstr "Полное им�"
 
 #. TRANS: Dropdown option for searching in profiles.
 msgid "URI (Remote users)"
-msgstr ""
+msgstr "URI (Удалённые пользователи)"
 
 #. TRANS: Dropdown field label.
-#, fuzzy
 msgctxt "LABEL"
 msgid "Search in"
-msgstr "Пои�к по �айту"
+msgstr "И�кать в…"
 
 #. TRANS: Dropdown field title.
-#, fuzzy
 msgid "Choose a field to search."
-msgstr "Выберите тег из выпадающего �пи�ка"
+msgstr "Выберите поле дл� пои�ка."
 
 #. TRANS: Form legend.
 #. TRANS: %1$s is a nickname, $2$s is a list.
-#, fuzzy, php-format
+#, php-format
 msgid "Remove %1$s from list %2$s"
-msgstr "%1$s и %2$s"
+msgstr "Удаление %1$s из �пи�ка %2$s"
 
 #. TRANS: Legend on form to add a profile to a list.
 #. TRANS: %1$s is a nickname, %2$s is a list.
-#, fuzzy, php-format
+#, php-format
 msgid "Add %1$s to list %2$s"
-msgstr "%1$s и %2$s"
+msgstr "Добавление %1$s в �пи�ок %2$s"
 
 #. TRANS: Title for top posters section.
 msgid "Top posters"
@@ -10177,29 +9623,27 @@ msgstr "Самые активные"
 #. TRANS: Option in drop-down of potential addressees.
 msgctxt "SENDTO"
 msgid "Everyone"
-msgstr ""
+msgstr "В�ем"
 
 #. TRANS: Option in drop-down of potential addressees.
 #. TRANS: %s is a StatusNet sitename.
 #, php-format
 msgid "My colleagues at %s"
-msgstr ""
+msgstr "Мои коллеги на %s"
 
 #. TRANS: Label for drop-down of potential addressees.
-#, fuzzy
 msgctxt "LABEL"
 msgid "To:"
 msgstr "Дл�"
 
 #. TRANS: Checkbox label in widget for selecting potential addressees to mark the notice private.
-#, fuzzy
 msgid "Private?"
 msgstr "Личное"
 
 #. TRANS: Client exception thrown in widget for selecting potential addressees when an invalid fill option was received.
-#, fuzzy, php-format
+#, php-format
 msgid "Unknown to value: \"%s\"."
-msgstr "�еизве�тное дей�твие «%s»."
+msgstr "�еизве�тное значение адре�ата «%s»."
 
 #. TRANS: Title for the form to unblock a user.
 msgctxt "TITLE"
@@ -10224,7 +9668,6 @@ msgid "Unsilence this user"
 msgstr "Сн�ть заглушение � �того пользовател�."
 
 #. TRANS: Form legend on unsubscribe form.
-#. TRANS: Button title on unsubscribe form.
 msgid "Unsubscribe from this user"
 msgstr "Отпи�ать�� от �того пользовател�"
 
@@ -10234,6 +9677,10 @@ msgctxt "BUTTON"
 msgid "Unsubscribe"
 msgstr "Отпи�ать��"
 
+#. TRANS: Button title on unsubscribe form.
+msgid "Unsubscribe from this user."
+msgstr "Отпи�ать�� от �того пользовател�."
+
 #. TRANS: Exception text shown when no profile can be found for a user.
 #. TRANS: %1$s is a user nickname, $2$d is a user ID (number).
 #, php-format
@@ -10320,9 +9767,3 @@ msgstr "�еверный XML, от�ут�твует корень XRD."
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr "Получение резервной копии из файла «%s»."
-
-#~ msgid "%1$s and friends, page %2$d"
-#~ msgstr "%1$s и друзь�, �траница %2$d"
-
-#~ msgid "You and friends"
-#~ msgstr "Вы и друзь�"
diff --git a/locale/sr-ec/LC_MESSAGES/statusnet.po b/locale/sr-ec/LC_MESSAGES/statusnet.po
index 4e30a3a792..f330a95896 100644
--- a/locale/sr-ec/LC_MESSAGES/statusnet.po
+++ b/locale/sr-ec/LC_MESSAGES/statusnet.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:43+0000\n"
+"POT-Creation-Date: 2011-06-18 15:54+0000\n"
+"PO-Revision-Date: 2011-06-18 15:57:48+0000\n"
 "Language-Team: Serbian Cyrillic ekavian <http://translatewiki.net/wiki/"
 "Portal:sr-ec>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-05-05 10:52:40+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
+"X-POT-Import-Date: 2011-06-18 15:53:57+0000\n"
+"X-Generator: MediaWiki 1.19alpha (r90318); Translate extension (2011-06-02)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: sr-ec\n"
 "X-Message-Group: #out-statusnet-core\n"
@@ -100,7 +100,6 @@ msgid "Save access settings"
 msgstr "Сачувај по�тавке при�тупа"
 
 #. TRANS: Tooltip for button to save access settings in site admin panel.
-#. TRANS: Button text for saving theme settings.
 #. TRANS: Button label to save e-mail preferences.
 #. TRANS: Button label to save IM preferences.
 #. TRANS: Button text in the license admin panel.
@@ -116,7 +115,6 @@ msgstr "Сачувај по�тавке при�тупа"
 #. TRANS: Button text for saving "Other settings" in profile.
 #. TRANS: Button text to save user settings in user admin panel.
 #. TRANS: Button label in the "Edit application" form.
-#. TRANS: Button text on profile design page to save settings.
 #. TRANS: Text for save button on group edit form.
 #. TRANS: Button text to save tags for a profile.
 msgctxt "BUTTON"
@@ -188,7 +186,6 @@ msgstr "�е по�тоји таква �траница."
 #. TRANS: Client error when user not found for an rss related action.
 #. TRANS: Client error displayed when no existing user is provided for a user's delivery device setting.
 #. TRANS: Client error displayed if a user could not be found.
-#. TRANS: Client error when user not found updating a profile background image.
 #. TRANS: Client error displayed updating profile image without having a user object.
 #. TRANS: Client error displayed when making an Atom API request for an unknown user.
 #. TRANS: Client error displayed when trying to block a non-existing user or a user from another site.
@@ -349,7 +346,6 @@ msgstr ""
 #. TRANS: Server error thrown on database error updating SMS preferences.
 #. TRANS: Server error thrown on database error removing a registered SMS phone number.
 #. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
-#. TRANS: Server exception thrown on Profile design page when updating design settings fails.
 msgid "Could not update user."
 msgstr "�журирање кори�ника није у�пело."
 
@@ -364,7 +360,6 @@ msgstr "Профил није �ачуван."
 
 #. TRANS: Client error displayed when the number of bytes in a POST request exceeds a limit.
 #. TRANS: %s is the number of bytes of the CONTENT_LENGTH.
-#. TRANS: Form validation error in design settings form. POST should remain untranslated.
 #, php-format
 msgid ""
 "The server was unable to handle that much POST data (%s byte) due to its "
@@ -375,24 +370,6 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#. TRANS: Client error displayed when saving design settings fails because of an empty id.
-#. TRANS: Client error displayed when saving design settings fails because of an empty result.
-#. TRANS: Client error displayed when a database error occurs inserting profile colours.
-#. TRANS: Client error displayed when a database error occurs updating profile colours.
-#. TRANS: Form validation error displayed when group design settings could not be saved because of an application issue.
-#. TRANS: Form validation error on Profile design page when saving design settings has failed.
-#. TRANS: Form validation error on Profile design page when updating design settings has failed.
-msgid "Unable to save your design settings."
-msgstr "По�тавке изгледа ни�у �ачуване."
-
-#. TRANS: Error displayed when updating design settings fails.
-#. TRANS: Client error displayed when a database error occurs updating profile colours.
-#. TRANS: Form validation error on Profile design page when updating design settings has failed.
-#. TRANS: Error message displayed if design settings could not be saved.
-#. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
-msgid "Could not update your design."
-msgstr "�журирање изгледа није у�пело."
-
 #. TRANS: Title for Atom feed.
 msgctxt "ATOM"
 msgid "Main"
@@ -483,6 +460,8 @@ msgstr ""
 "�е можете по�лати директне поруке кори�ницима који ни�у ваши пријатељи."
 
 #. TRANS: Client error displayed trying to direct message self (403).
+#. TRANS: Client error displayed trying to send a direct message to self.
+#. TRANS: Error text shown when trying to send a direct message to self.
 msgid ""
 "Do not send a message to yourself; just say it to yourself quietly instead."
 msgstr "�е шаљите поруку �ами �еби; �амо тихо поновите."
@@ -714,7 +693,6 @@ msgstr "групе на %s"
 
 #. TRANS: Client error displayed when trying to edit a group without being an admin.
 #. TRANS: Client error displayed trying to edit a group while not being a group admin.
-#. TRANS: Client error displayed trying to change group design settings without being a (group) admin.
 #. TRANS: Client error displayed when trying to change group logo settings while not being a group admin.
 msgid "You must be an admin to edit the group."
 msgstr "Морате бити админи�тратор да би�те уређивали групу."
@@ -823,7 +801,6 @@ msgstr "Грешка у бази података при уно�у „oauth_tok
 
 #. TRANS: Client error given on when invalid data was passed through a form in the OAuth API.
 #. TRANS: Unexpected validation error on avatar upload form.
-#. TRANS: Client error displayed when the submitted form contains unexpected data.
 #. TRANS: Client error displayed submitting invalid form data for edit application.
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
 #. TRANS: Form validation error message when an unsupported argument is used.
@@ -832,7 +809,6 @@ msgstr "Грешка у бази података при уно�у „oauth_tok
 #. TRANS: Client error when submitting a form with unexpected information.
 #. TRANS: Client error displayed when unexpected data is posted in the password recovery form.
 #. TRANS: Message given submitting a form with an unknown action in SMS settings.
-#. TRANS: Unknown form validation error in design settings form.
 msgid "Unexpected form submission."
 msgstr "�еочекивани образац за �лање."
 
@@ -1181,7 +1157,6 @@ msgstr "Морате бити пријављени да би�те напу�т
 #. TRANS: Client error displayed when requesting Friends of a Friend feed for a nickname that is not a group.
 #. TRANS: Client error displayed trying to block a user from a group while specifying a non-existing group.
 #. TRANS: Client error displayed referring to a group's permalink for a non-existing group ID.
-#. TRANS: Client error displayed trying to change group design settings while providing a nickname for a non-existing group.
 #. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
 #. TRANS: Client error displayed when trying to view group members for a non-existing group.
 #. TRANS: Client error displayed when trying to view group members for an object that is not a group.
@@ -1266,6 +1241,7 @@ msgid "Join request canceled."
 msgstr "Захтев за учлањење је одбијен."
 
 #. TRANS: Client error displayed trying to approve subscription for a non-existing request.
+#. TRANS: %s is a user nickname.
 #, php-format
 msgid "%s is not in the moderation queue for your subscriptions."
 msgstr ""
@@ -1415,7 +1391,6 @@ msgstr "Такав прилог не по�тоји."
 #. TRANS: Client error displayed trying to get an avatar without providing a nickname.
 #. TRANS: Client error displayed when requesting a list of blocked users for a group without providing a group nickname.
 #. TRANS: Client error displayed trying to edit a group while not proving a nickname for the group to edit.
-#. TRANS: Client error displayed trying to change group design settings without providing a group nickname.
 #. TRANS: Client error displayed when trying to change group logo settings without providing a nickname.
 #. TRANS: Client error displayed when trying to view group members without providing a group nickname.
 #. TRANS: Client error displayed when requesting a group RSS feed without providing a group nickname.
@@ -1909,149 +1884,6 @@ msgstr "�е бриши овог кори�ника"
 msgid "Delete this user."
 msgstr "Обриши овог кори�ника"
 
-#. TRANS: Message used as title for design settings for the site.
-msgid "Design"
-msgstr "Изглед"
-
-#. TRANS: Instructions for design adminsitration panel.
-msgid "Design settings for this StatusNet site"
-msgstr "По�тавке изгледа овог �ајта"
-
-#. TRANS: Client error displayed when a logo URL does is not valid.
-msgid "Invalid logo URL."
-msgstr "�еи�правна адре�а логотипа."
-
-#. TRANS: Client error displayed when an SSL logo URL is invalid.
-msgid "Invalid SSL logo URL."
-msgstr "�еи�правна адре�а SSL логотипа."
-
-#. TRANS: Client error displayed when a theme is submitted through the form that is not in the theme list.
-#. TRANS: %s is the chosen unavailable theme.
-#, php-format
-msgid "Theme not available: %s."
-msgstr "Тема није до�тупна: %s."
-
-#. TRANS: Fieldset legend for form to change logo.
-msgid "Change logo"
-msgstr "Промени логотип"
-
-#. TRANS: Field label for StatusNet site logo.
-msgid "Site logo"
-msgstr "Логотип �ајта"
-
-#. TRANS: Field label for SSL StatusNet site logo.
-msgid "SSL logo"
-msgstr "SSL логотип"
-
-#. TRANS: Fieldset legend for form change StatusNet site's theme.
-msgid "Change theme"
-msgstr "Промени тему"
-
-#. TRANS: Field label for dropdown to choose site theme.
-msgid "Site theme"
-msgstr "Тема �ајта"
-
-#. TRANS: Title for field label for dropdown to choose site theme.
-msgid "Theme for the site."
-msgstr "Тема �ајта"
-
-#. TRANS: Field label for uploading a cutom theme.
-msgid "Custom theme"
-msgstr "Прилагођена тема"
-
-#. TRANS: Form instructions for uploading a cutom StatusNet theme.
-msgid "You can upload a custom StatusNet theme as a .ZIP archive."
-msgstr "Можете отпремити прилагођену тему преко ZIP архиве."
-
-#. TRANS: Fieldset legend for theme background image.
-msgid "Change background image"
-msgstr "Промени позадину �лике"
-
-#. TRANS: Field label for background image on theme designer page.
-#. TRANS: Field label for background color selector.
-#. TRANS: Label on profile design page for setting a profile page background colour.
-msgid "Background"
-msgstr "Позадина"
-
-#. TRANS: Form guide for background image upload form on theme designer page.
-#, php-format
-msgid ""
-"You can upload a background image for the site. The maximum file size is %1"
-"$s."
-msgstr ""
-"Можете отпремити позадину �лике �ајта. �ајвећа величина датотеке је %1$s."
-
-#. TRANS: Used as radio button label to add a background image.
-msgid "On"
-msgstr "Укључено"
-
-#. TRANS: Used as radio button label to not add a background image.
-msgid "Off"
-msgstr "И�кључено"
-
-#. TRANS: Form guide for turning background image on or off on theme designer page.
-#. TRANS: Form guide for a set of radio buttons on the profile design page that will enable or disable
-#. TRANS: use of the uploaded profile image.
-msgid "Turn background image on or off."
-msgstr "Укључите или и�кључите позадину �лике."
-
-#. TRANS: Checkbox label to title background image on theme designer page.
-#. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
-msgid "Tile background image"
-msgstr "�а�лов позадине �лике"
-
-#. TRANS: Fieldset legend for theme colors.
-msgid "Change colors"
-msgstr "Промени боје"
-
-#. TRANS: Field label for content color selector.
-#. TRANS: Label on profile design page for setting a profile page content colour.
-msgid "Content"
-msgstr "Садржај"
-
-#. TRANS: Field label for sidebar color selector.
-#. TRANS: Label on profile design page for setting a profile page sidebar colour.
-msgid "Sidebar"
-msgstr "Бочна палета"
-
-#. TRANS: Field label for text color selector.
-#. TRANS: Label on profile design page for setting a profile page text colour.
-msgid "Text"
-msgstr "Тек�т"
-
-#. TRANS: Field label for link color selector.
-#. TRANS: Label on profile design page for setting a profile page links colour.
-msgid "Links"
-msgstr "Везе"
-
-#. TRANS: Fieldset legend for advanced theme design settings.
-msgid "Advanced"
-msgstr "�апредно"
-
-#. TRANS: Field label for custom CSS.
-msgid "Custom CSS"
-msgstr "Прилагођени CSS"
-
-#. TRANS: Button text for resetting theme settings.
-msgctxt "BUTTON"
-msgid "Use defaults"
-msgstr "Кори�ти подразумевано"
-
-#. TRANS: Title for button for resetting theme settings.
-#. TRANS: Title for button on profile design page to reset all colour settings to default.
-msgid "Restore default designs."
-msgstr "Поврати подразумевани изглед"
-
-#. TRANS: Title for button for resetting theme settings.
-#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-msgid "Reset back to default."
-msgstr "Врати на подразумевано"
-
-#. TRANS: Title for button for saving theme settings.
-#. TRANS: Title for button on profile design page to save settings.
-msgid "Save design."
-msgstr "Сачувај изглед"
-
 #. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
 msgid "This notice is not a favorite!"
 msgstr "Ово обавештење није омиљено."
@@ -2644,29 +2476,6 @@ msgstr "Дошло је до грешке при блокирању кори�н
 msgid "No ID."
 msgstr "�ема ИБ."
 
-#. TRANS: Client error displayed trying to change group design settings while not logged in.
-msgid "You must be logged in to edit a group."
-msgstr "Морате бити пријављени да би�те изменили групу."
-
-#. TRANS: Title group design settings page.
-msgid "Group design"
-msgstr "Изглед групе"
-
-#. TRANS: Instructions for group design settings page.
-msgid ""
-"Customize the way your group looks with a background image and a colour "
-"palette of your choice."
-msgstr ""
-
-#. TRANS: Form validation error displayed when group design settings could not be updated because of an application issue.
-msgid "Unable to update your design settings."
-msgstr "�журирање по�тавки изгледа није у�пело."
-
-#. TRANS: Form text to confirm saved group design settings.
-#. TRANS: Confirmation message on Profile design page when saving design settings has succeeded.
-msgid "Design preferences saved."
-msgstr "По�тавке изгледа �у �ачуване."
-
 #. TRANS: Title for group logo settings page.
 #. TRANS: Group logo form legend.
 msgid "Group logo"
@@ -3015,28 +2824,6 @@ msgid ""
 "Use this form to invite your friends and colleagues to use this service."
 msgstr ""
 
-#. TRANS: Field label for a list of e-mail addresses.
-msgid "Email addresses"
-msgstr "Е-адре�е"
-
-#. TRANS: Tooltip for field label for a list of e-mail addresses.
-msgid "Addresses of friends to invite (one per line)."
-msgstr ""
-
-#. TRANS: Field label for a personal message to send to invitees.
-msgid "Personal message"
-msgstr ""
-
-#. TRANS: Tooltip for field label for a personal message to send to invitees.
-msgid "Optionally add a personal message to the invitation."
-msgstr ""
-
-#. TRANS: Send button for inviting friends
-#. TRANS: Button text for sending notice.
-msgctxt "BUTTON"
-msgid "Send"
-msgstr ""
-
 #. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral
 #. TRANS: singular 3rd-person pronoun in English. %1$s is the inviting user, $2$s is
 #. TRANS: the StatusNet sitename.
@@ -3315,12 +3102,6 @@ msgstr "�ема �адржаја."
 msgid "No recipient specified."
 msgstr "�и�те навели примаоца."
 
-#. TRANS: Client error displayed trying to send a direct message to self.
-#. TRANS: Error text shown when trying to send a direct message to self.
-msgid ""
-"Don't send a message to yourself; just say it to yourself quietly instead."
-msgstr "�е шаљите поруку �ами �еби; �амо тихо поновите."
-
 #. TRANS: Page title after sending a direct message.
 msgid "Message sent"
 msgstr "Порука је по�лата"
@@ -3593,7 +3374,7 @@ msgid "Confirm"
 msgstr "Потврда"
 
 #. TRANS: Field title on page where to change password.
-#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
+#. TRANS: Title for field label for password reset form where the password has to be typed again.
 #. TRANS: Field title on account registration page.
 msgid "Same as password above."
 msgstr "И�то као и лозинка изнад."
@@ -3769,30 +3550,6 @@ msgstr "Фа�цикла кори�ничких �личица"
 msgid "Directory where avatars are located."
 msgstr "Фа�цикла где �у �мештене кори�ничке �личице."
 
-#. TRANS: Fieldset legend in Paths admin panel.
-msgid "Backgrounds"
-msgstr "Позадине"
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-msgid "Server for backgrounds."
-msgstr "Сервер за позадине."
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-msgid "Web path to backgrounds."
-msgstr "Путања до позадина."
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-msgid "Server for backgrounds on SSL pages."
-msgstr "Сервер за позадине на SSL �траницама."
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-msgid "Web path to backgrounds on SSL pages."
-msgstr "Путања до позадина на SSL �траницама."
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-msgid "Directory where backgrounds are located."
-msgstr "Фа�цикла где �у �мештене позадине."
-
 #. TRANS: Fieldset legens in Paths admin panel.
 msgid "Attachments"
 msgstr "Прилози"
@@ -4532,7 +4289,6 @@ msgid "6 or more characters, and do not forget it!"
 msgstr "6 или више знакова."
 
 #. TRANS: Button text for password reset form.
-#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
 msgctxt "BUTTON"
 msgid "Reset"
 msgstr "Поништи"
@@ -4541,18 +4297,6 @@ msgstr "Поништи"
 msgid "Enter a nickname or email address."
 msgstr "Уне�ите надимак или е-адре�у."
 
-#. TRANS: Information on password recovery form if no known username or e-mail address was specified.
-msgid "No user with that email address or username."
-msgstr "�ема кори�ника � наведеним надимком или е-адре�ом."
-
-#. TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.
-msgid "No registered email address for that user."
-msgstr ""
-
-#. TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.
-msgid "Error saving address confirmation."
-msgstr ""
-
 #. TRANS: User notification after an e-mail with instructions was sent from the password recovery form.
 msgid ""
 "Instructions for recovering your password have been sent to the email "
@@ -5428,6 +5172,14 @@ msgstr ""
 msgid "You must have a valid contact email address."
 msgstr ""
 
+#. TRANS: Client error displayed when a logo URL is not valid.
+msgid "Invalid logo URL."
+msgstr "�еи�правна адре�а логотипа."
+
+#. TRANS: Client error displayed when a SSL logo URL is invalid.
+msgid "Invalid SSL logo URL."
+msgstr "�еи�правна адре�а SSL логотипа."
+
 #. TRANS: Client error displayed trying to save site settings with an invalid language code.
 #. TRANS: %s is the invalid language code.
 #, php-format
@@ -5498,7 +5250,8 @@ msgid "Default language"
 msgstr ""
 
 #. TRANS: Dropdown title on site settings panel.
-msgid "Site language when autodetection from browser settings is not available"
+msgid ""
+"The site language when autodetection from browser settings is not available."
 msgstr ""
 
 #. TRANS: Fieldset legend on site settings panel.
@@ -5522,9 +5275,23 @@ msgstr ""
 msgid "How long users must wait (in seconds) to post the same thing again."
 msgstr ""
 
+#. TRANS: Fieldset legend for form to change logo.
+#, fuzzy
+msgid "Logo"
+msgstr "SSL логотип"
+
+#. TRANS: Field label for StatusNet site logo.
+msgid "Site logo"
+msgstr "Логотип �ајта"
+
+#. TRANS: Field label for SSL StatusNet site logo.
+msgid "SSL logo"
+msgstr "SSL логотип"
+
 #. TRANS: Button title for saving site settings.
-msgid "Save site settings"
-msgstr ""
+#, fuzzy
+msgid "Save the site settings."
+msgstr "Сачувај по�тавке при�тупа"
 
 #. TRANS: Page title for site-wide notice tab in admin panel.
 msgid "Site Notice"
@@ -6246,38 +6013,6 @@ msgstr ""
 msgid "Wrong image type for avatar URL \"%s\"."
 msgstr ""
 
-#. TRANS: Title for profile design page.
-#. TRANS: Page title for profile design page.
-msgid "Profile design"
-msgstr ""
-
-#. TRANS: Instructions for Profile design page.
-#. TRANS: Instructions for profile design page.
-msgid ""
-"Customize the way your profile looks with a background image and a colour "
-"palette of your choice."
-msgstr ""
-
-#. TRANS: Succes message on Profile design page when finding an easter egg.
-msgid "Enjoy your hotdog!"
-msgstr ""
-
-#. TRANS: Form legend on Profile design page.
-msgid "Design settings"
-msgstr ""
-
-#. TRANS: Checkbox label on Profile design page.
-msgid "View profile designs"
-msgstr ""
-
-#. TRANS: Title for checkbox on Profile design page.
-msgid "Show or hide profile designs."
-msgstr ""
-
-#. TRANS: Form legend on Profile design page for form to choose a background image.
-msgid "Background file"
-msgstr ""
-
 #. TRANS: Page title for all but the first page of groups for a user.
 #. TRANS: %1$s is a nickname, %2$d is a page number.
 #, php-format
@@ -6702,6 +6437,18 @@ msgstr ""
 msgid "Single-user mode code called when not enabled."
 msgstr ""
 
+#. TRANS: Information on password recovery form if no known username or e-mail address was specified.
+msgid "No user with that email address or username."
+msgstr "�ема кори�ника � наведеним надимком или е-адре�ом."
+
+#. TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.
+msgid "No registered email address for that user."
+msgstr ""
+
+#. TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.
+msgid "Error saving address confirmation."
+msgstr ""
+
 #. TRANS: Server exception thrown when creating a group failed.
 msgid "Could not create group."
 msgstr ""
@@ -6961,11 +6708,6 @@ msgstr ""
 msgid "saveSettings() not implemented."
 msgstr ""
 
-#. TRANS: Client error message thrown if design settings could not be deleted in
-#. TRANS: the admin panel Design.
-msgid "Unable to delete design setting."
-msgstr ""
-
 #. TRANS: Header in administrator navigation panel.
 #. TRANS: Header in settings navigation panel.
 msgctxt "HEADER"
@@ -6994,17 +6736,6 @@ msgctxt "MENU"
 msgid "Site"
 msgstr ""
 
-#. TRANS: Menu item title in administrator navigation panel.
-msgid "Design configuration"
-msgstr ""
-
-#. TRANS: Menu item in administrator navigation panel.
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: Menu item in settings navigation panel.
-msgctxt "MENU"
-msgid "Design"
-msgstr ""
-
 #. TRANS: Menu item title in administrator navigation panel.
 msgid "User configuration"
 msgstr ""
@@ -7828,42 +7559,6 @@ msgstr ""
 msgid "Delete this user"
 msgstr ""
 
-#. TRANS: Form legend of form for changing the page design.
-msgid "Change design"
-msgstr ""
-
-#. TRANS: Fieldset legend on profile design page to change profile page colours.
-msgid "Change colours"
-msgstr ""
-
-#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-msgid "Use defaults"
-msgstr ""
-
-#. TRANS: Label in form on profile design page.
-#. TRANS: Field contains file name on user's computer that could be that user's custom profile background image.
-msgid "Upload file"
-msgstr ""
-
-#. TRANS: Instructions for form on profile design page.
-msgid ""
-"You can upload your personal background image. The maximum file size is 2MB."
-msgstr ""
-
-#. TRANS: Radio button on profile design page that will enable use of the uploaded profile image.
-msgctxt "RADIO"
-msgid "On"
-msgstr ""
-
-#. TRANS: Radio button on profile design page that will disable use of the uploaded profile image.
-msgctxt "RADIO"
-msgid "Off"
-msgstr ""
-
-#. TRANS: Success message displayed if design settings were saved after clicking "Use defaults".
-msgid "Design defaults restored."
-msgstr ""
-
 #. TRANS: Exception. %s is an ID.
 #, php-format
 msgid "Unable to find services for %s."
@@ -8070,13 +7765,6 @@ msgctxt "TOOLTIP"
 msgid "Add or edit %s logo"
 msgstr ""
 
-#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: %s is the nickname of the group.
-#, php-format
-msgctxt "TOOLTIP"
-msgid "Add or edit %s design"
-msgstr ""
-
 #. TRANS: Group actions header (h2). Text hidden by default.
 msgid "Group actions"
 msgstr ""
@@ -8183,6 +7871,38 @@ msgctxt "BUTTON"
 msgid "Invite more colleagues"
 msgstr ""
 
+#. TRANS: Form legend.
+#, fuzzy
+msgid "Invite collegues"
+msgstr "Позовите друге кори�нике"
+
+#. TRANS: Field label for a list of e-mail addresses.
+msgid "Email addresses"
+msgstr "Е-адре�е"
+
+#. TRANS: Field title for a list of e-mail addresses.
+msgid "Addresses of friends to invite (one per line)."
+msgstr ""
+
+#. TRANS: Field label for a personal message to send to invitees.
+msgid "Personal message"
+msgstr ""
+
+#. TRANS: Field title for a personal message to send to invitees.
+msgid "Optionally add a personal message to the invitation."
+msgstr ""
+
+#. TRANS: Send button for inviting friends
+#. TRANS: Button text for sending notice.
+msgctxt "BUTTON"
+msgid "Send"
+msgstr ""
+
+#. TRANS: Submit button title.
+#, fuzzy
+msgid "Send invitations."
+msgstr "Позивнице �у по�лате"
+
 #. TRANS: Button text for joining a group.
 msgctxt "BUTTON"
 msgid "Join"
@@ -8240,7 +7960,7 @@ msgstr ""
 #. TRANS: Main body of new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscriber's long name, %2$s is the StatusNet sitename.
 #, php-format
-msgid "%1$s is now listening to your notices on %2$s."
+msgid "%1$s is now following you on %2$s."
 msgstr ""
 
 #. TRANS: Subject of pending new-subscriber notification e-mail.
@@ -8682,10 +8402,6 @@ msgctxt "SEPARATOR"
 msgid ", "
 msgstr ""
 
-#. TRANS: Start of profile addressees list.
-msgid " â–¸ "
-msgstr ""
-
 #. TRANS: Used in coordinates as abbreviation of north.
 msgid "N"
 msgstr ""
@@ -9281,10 +8997,6 @@ msgstr ""
 msgid "Change email handling"
 msgstr ""
 
-#. TRANS: Menu item title in settings navigation panel.
-msgid "Design your profile"
-msgstr ""
-
 #. TRANS: Menu item in settings navigation panel.
 msgctxt "MENU"
 msgid "URL"
@@ -9695,8 +9407,161 @@ msgstr ""
 msgid "Getting backup from file '%s'."
 msgstr ""
 
-#~ msgid "%1$s and friends, page %2$d"
-#~ msgstr "%1$s и пријатељи, �траница %2$d"
+#. TRANS: Server exception. %s is a URL.
+#, fuzzy, php-format
+msgid "Invalid avatar URL %s."
+msgstr "�еи�правна ознака: „%s“."
 
-#~ msgid "You and friends"
-#~ msgstr "Ви и пријатељи"
+#. TRANS: Server exception. %s is a URI.
+#, php-format
+msgid "Tried to update avatar for unsaved remote profile %s."
+msgstr ""
+
+#. TRANS: Server exception. %s is a URL.
+#, php-format
+msgid "Unable to fetch avatar from %s."
+msgstr ""
+
+#. TRANS: Exception. %s is a profile URL.
+#, fuzzy, php-format
+msgid "Could not reach profile page %s."
+msgstr "Профил није �ачуван."
+
+#. TRANS: Exception. %s is a URL.
+#, fuzzy, php-format
+msgid "Could not find a feed URL for profile page %s."
+msgstr "Стварање довода за �пи�ак није у�пело – %s"
+
+#. TRANS: Exception.
+#, fuzzy
+msgid "Not a valid webfinger address."
+msgstr "Е-адре�а није и�правна."
+
+#, fuzzy, php-format
+msgid "Could not find a valid profile for \"%s\"."
+msgstr "Профил није �ачуван."
+
+#~ msgid "Unable to save your design settings."
+#~ msgstr "По�тавке изгледа ни�у �ачуване."
+
+#~ msgid "Could not update your design."
+#~ msgstr "�журирање изгледа није у�пело."
+
+#~ msgid "Design"
+#~ msgstr "Изглед"
+
+#~ msgid "Design settings for this StatusNet site"
+#~ msgstr "По�тавке изгледа овог �ајта"
+
+#~ msgid "Theme not available: %s."
+#~ msgstr "Тема није до�тупна: %s."
+
+#~ msgid "Change logo"
+#~ msgstr "Промени логотип"
+
+#~ msgid "Change theme"
+#~ msgstr "Промени тему"
+
+#~ msgid "Site theme"
+#~ msgstr "Тема �ајта"
+
+#~ msgid "Theme for the site."
+#~ msgstr "Тема �ајта"
+
+#~ msgid "Custom theme"
+#~ msgstr "Прилагођена тема"
+
+#~ msgid "You can upload a custom StatusNet theme as a .ZIP archive."
+#~ msgstr "Можете отпремити прилагођену тему преко ZIP архиве."
+
+#~ msgid "Change background image"
+#~ msgstr "Промени позадину �лике"
+
+#~ msgid "Background"
+#~ msgstr "Позадина"
+
+#~ msgid ""
+#~ "You can upload a background image for the site. The maximum file size is %"
+#~ "1$s."
+#~ msgstr ""
+#~ "Можете отпремити позадину �лике �ајта. �ајвећа величина датотеке је %1$s."
+
+#~ msgid "On"
+#~ msgstr "Укључено"
+
+#~ msgid "Off"
+#~ msgstr "И�кључено"
+
+#~ msgid "Turn background image on or off."
+#~ msgstr "Укључите или и�кључите позадину �лике."
+
+#~ msgid "Tile background image"
+#~ msgstr "�а�лов позадине �лике"
+
+#~ msgid "Change colors"
+#~ msgstr "Промени боје"
+
+#~ msgid "Content"
+#~ msgstr "Садржај"
+
+#~ msgid "Sidebar"
+#~ msgstr "Бочна палета"
+
+#~ msgid "Text"
+#~ msgstr "Тек�т"
+
+#~ msgid "Links"
+#~ msgstr "Везе"
+
+#~ msgid "Advanced"
+#~ msgstr "�апредно"
+
+#~ msgid "Custom CSS"
+#~ msgstr "Прилагођени CSS"
+
+#~ msgctxt "BUTTON"
+#~ msgid "Use defaults"
+#~ msgstr "Кори�ти подразумевано"
+
+#~ msgid "Restore default designs."
+#~ msgstr "Поврати подразумевани изглед"
+
+#~ msgid "Reset back to default."
+#~ msgstr "Врати на подразумевано"
+
+#~ msgid "Save design."
+#~ msgstr "Сачувај изглед"
+
+#~ msgid "You must be logged in to edit a group."
+#~ msgstr "Морате бити пријављени да би�те изменили групу."
+
+#~ msgid "Group design"
+#~ msgstr "Изглед групе"
+
+#~ msgid "Unable to update your design settings."
+#~ msgstr "�журирање по�тавки изгледа није у�пело."
+
+#~ msgid "Design preferences saved."
+#~ msgstr "По�тавке изгледа �у �ачуване."
+
+#~ msgid ""
+#~ "Don't send a message to yourself; just say it to yourself quietly instead."
+#~ msgstr "�е шаљите поруку �ами �еби; �амо тихо поновите."
+
+#~ msgid "Backgrounds"
+#~ msgstr "Позадине"
+
+#~ msgid "Server for backgrounds."
+#~ msgstr "Сервер за позадине."
+
+#~ msgid "Web path to backgrounds."
+#~ msgstr "Путања до позадина."
+
+#~ msgid "Server for backgrounds on SSL pages."
+#~ msgstr "Сервер за позадине на SSL �траницама."
+
+#~ msgid "Web path to backgrounds on SSL pages."
+#~ msgstr "Путања до позадина на SSL �траницама."
+
+#~ msgid "Directory where backgrounds are located."
+#~ msgstr "Фа�цикла где �у �мештене позадине."
diff --git a/locale/statusnet.pot b/locale/statusnet.pot
index 2aaf91496b..ee5e0da1c1 100644
--- a/locale/statusnet.pot
+++ b/locale/statusnet.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,7 +18,7 @@ msgstr ""
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
 #. TRANS: Database error message.
-#: index.php:110
+#: index.php:118
 #, php-format
 msgid ""
 "The database for %1$s is not responding correctly, so the site will not work "
@@ -28,32 +28,25 @@ msgid ""
 msgstr ""
 
 #. TRANS: Error message.
-#: index.php:121
-msgid ""
-"An important error occured, probably related to email setup. Check logfiles "
-"for more info."
-msgstr ""
-
-#. TRANS: Error message.
-#: index.php:131
+#: index.php:137
 msgid "An error occurred."
 msgstr ""
 
 #. TRANS: Error message displayed when there is no StatusNet configuration file.
-#: index.php:255
+#: index.php:270
 #, php-format
 msgid ""
 "No configuration file found. Try running the installation program first."
 msgstr ""
 
 #. TRANS: Error message displayed when trying to access a non-existing page.
-#: index.php:286
+#: index.php:301
 msgid "Unknown page"
 msgstr ""
 
 #. TRANS: Error message displayed when trying to perform an undefined action.
 #. TRANS: Title for password recovery page when an unknown action has been specified.
-#: index.php:341 actions/recoverpassword.php:232
+#: index.php:356 actions/recoverpassword.php:232
 msgid "Unknown action"
 msgstr ""
 
@@ -80,7 +73,7 @@ msgstr ""
 #. TRANS: Checkbox label for prohibiting anonymous users from viewing site.
 #. TRANS: Checkbox label to show private tags.
 #. TRANS: Checkbox field label on group edit form to mark a group private.
-#: actions/accessadminpanel.php:157 actions/peopletagsbyuser.php:185
+#: actions/accessadminpanel.php:157 actions/peopletagsbyuser.php:190
 #: lib/groupeditform.php:206
 msgctxt "LABEL"
 msgid "Private"
@@ -106,13 +99,12 @@ msgstr ""
 msgid "Closed"
 msgstr ""
 
-#. TRANS: Title for button to save access settings in site admin panel.
+#. TRANS: Button title to save access settings in site admin panel.
 #: actions/accessadminpanel.php:191
-msgid "Save access settings"
+msgid "Save access settings."
 msgstr ""
 
-#. TRANS: Tooltip for button to save access settings in site admin panel.
-#. TRANS: Button text for saving theme settings.
+#. TRANS: Button text to save access settings in site admin panel.
 #. TRANS: Button label to save e-mail preferences.
 #. TRANS: Button label to save IM preferences.
 #. TRANS: Button text in the license admin panel.
@@ -128,18 +120,16 @@ msgstr ""
 #. TRANS: Button text for saving "Other settings" in profile.
 #. TRANS: Button text to save user settings in user admin panel.
 #. TRANS: Button label in the "Edit application" form.
-#. TRANS: Button text on profile design page to save settings.
 #. TRANS: Text for save button on group edit form.
 #. TRANS: Button text to save tags for a profile.
-#: actions/accessadminpanel.php:193 actions/designadminpanel.php:732
-#: actions/emailsettings.php:251 actions/imsettings.php:201
-#: actions/licenseadminpanel.php:335 actions/pathsadminpanel.php:517
-#: actions/profilesettings.php:215 actions/sessionsadminpanel.php:202
-#: actions/siteadminpanel.php:319 actions/sitenoticeadminpanel.php:197
-#: actions/smssettings.php:204 actions/snapshotadminpanel.php:252
-#: actions/subscriptions.php:251 actions/tagprofile.php:169
-#: actions/urlsettings.php:152 actions/useradminpanel.php:300
-#: lib/applicationeditform.php:355 lib/designform.php:315
+#: actions/accessadminpanel.php:193 actions/emailsettings.php:251
+#: actions/imsettings.php:201 actions/licenseadminpanel.php:335
+#: actions/pathsadminpanel.php:454 actions/profilesettings.php:215
+#: actions/sessionsadminpanel.php:202 actions/siteadminpanel.php:373
+#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:204
+#: actions/snapshotadminpanel.php:252 actions/subscriptions.php:249
+#: actions/tagprofile.php:169 actions/urlsettings.php:152
+#: actions/useradminpanel.php:300 lib/applicationeditform.php:355
 #: lib/groupeditform.php:225 lib/peopletags.php:146
 msgctxt "BUTTON"
 msgid "Save"
@@ -161,19 +151,17 @@ msgstr ""
 #: actions/emailsettings.php:293 actions/favor.php:76 actions/geocode.php:56
 #: actions/groupblock.php:66 actions/grouplogo.php:321
 #: actions/groupunblock.php:66 actions/imsettings.php:244
-#: actions/invite.php:66 actions/makeadmin.php:68 actions/newmessage.php:141
+#: actions/invite.php:67 actions/makeadmin.php:68 actions/newmessage.php:141
 #: actions/newnotice.php:105 actions/nudge.php:82
 #: actions/oauthappssettings.php:162 actions/oauthconnectionssettings.php:136
 #: actions/passwordsettings.php:147 actions/peopletagautocomplete.php:67
 #: actions/pluginenable.php:88 actions/profilecompletion.php:81
-#: actions/profilesettings.php:235 actions/recoverpassword.php:387
-#: actions/register.php:164 actions/remotesubscribe.php:78
-#: actions/removepeopletag.php:79 actions/repeat.php:80
-#: actions/smssettings.php:250 actions/subedit.php:41 actions/subscribe.php:87
-#: actions/subscribepeopletag.php:76 actions/tagprofile.php:186
-#: actions/unsubscribe.php:70 actions/unsubscribepeopletag.php:77
-#: actions/urlsettings.php:171 actions/userauthorization.php:54
-#: lib/designsettings.php:123
+#: actions/profilesettings.php:235 actions/recoverpassword.php:304
+#: actions/register.php:164 actions/removepeopletag.php:79
+#: actions/repeat.php:80 actions/smssettings.php:250 actions/subedit.php:41
+#: actions/subscribe.php:87 actions/subscribepeopletag.php:76
+#: actions/tagprofile.php:186 actions/unsubscribe.php:70
+#: actions/unsubscribepeopletag.php:77 actions/urlsettings.php:171
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 
@@ -183,7 +171,7 @@ msgstr ""
 #: actions/editpeopletag.php:69 actions/favor.php:62 actions/groupblock.php:60
 #: actions/groupunblock.php:60 actions/logout.php:69 actions/makeadmin.php:62
 #: actions/newmessage.php:89 actions/newnotice.php:87 actions/nudge.php:64
-#: actions/peopletagautocomplete.php:57 actions/peopletagsbyuser.php:121
+#: actions/peopletagautocomplete.php:57 actions/peopletagsbyuser.php:126
 #: actions/pluginenable.php:99 actions/profilecompletion.php:92
 #: actions/removepeopletag.php:90 actions/subedit.php:33
 #: actions/subscribe.php:98 actions/unsubscribe.php:52
@@ -208,29 +196,24 @@ msgstr ""
 #. TRANS: Client error displayed trying to reference a non-existing list.
 #. TRANS: Client error displayed when referring to a non-existing list.
 #. TRANS: Client error displayed trying to reference a non-existing list.
-#: actions/addpeopletag.php:110 actions/editpeopletag.php:109
-#: actions/peopletagged.php:96 actions/peopletagsubscribers.php:96
+#: actions/addpeopletag.php:110 actions/editpeopletag.php:113
+#: actions/peopletagged.php:101 actions/peopletagsubscribers.php:101
 #: actions/profilecompletion.php:101 actions/profiletagbyid.php:67
-#: actions/removepeopletag.php:111 actions/showprofiletag.php:86
+#: actions/removepeopletag.php:111 actions/showprofiletag.php:90
 #: actions/subscribepeopletag.php:95 actions/unsubscribepeopletag.php:96
 msgid "No such list."
 msgstr ""
 
-#. TRANS: Client error displayed when trying to add an OMB 0.1 remote profile to a list.
-#: actions/addpeopletag.php:121
-msgid "You cannot list an OMB 0.1 remote profile with this action."
-msgstr ""
-
 #. TRANS: Client error displayed when an unknown error occurs when adding a user to a list.
 #. TRANS: %s is a username.
-#: actions/addpeopletag.php:150
+#: actions/addpeopletag.php:138
 #, php-format
 msgid "There was an unexpected error while listing %s."
 msgstr ""
 
 #. TRANS: Client error displayed when an unknown error occurs when adding a user to a list.
 #. TRANS: %s is a profile URL.
-#: actions/addpeopletag.php:155
+#: actions/addpeopletag.php:143
 #, php-format
 msgid ""
 "There was a problem listing %s. The remote server is probably not responding "
@@ -238,7 +221,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: Title after adding a user to a list.
-#: actions/addpeopletag.php:165
+#: actions/addpeopletag.php:153
 msgctxt "TITLE"
 msgid "Listed"
 msgstr ""
@@ -246,9 +229,9 @@ msgstr ""
 #. TRANS: Server error when page not found (404).
 #. TRANS: Server error when page not found (404)
 #. TRANS: Server error when page not found (404).
-#: actions/all.php:66 actions/public.php:104 actions/replies.php:93
-#: actions/showfavorites.php:140 actions/showprofiletag.php:100
-#: actions/tag.php:52
+#: actions/all.php:72 actions/public.php:110 actions/replies.php:96
+#: actions/showfavorites.php:140 actions/showprofiletag.php:104
+#: actions/tag.php:54
 msgid "No such page."
 msgstr ""
 
@@ -256,7 +239,6 @@ msgstr ""
 #. TRANS: Client error when user not found for an rss related action.
 #. TRANS: Client error displayed when no existing user is provided for a user's delivery device setting.
 #. TRANS: Client error displayed if a user could not be found.
-#. TRANS: Client error when user not found updating a profile background image.
 #. TRANS: Client error displayed updating profile image without having a user object.
 #. TRANS: Client error displayed when making an Atom API request for an unknown user.
 #. TRANS: Client error displayed when trying to block a non-existing user or a user from another site.
@@ -282,14 +264,11 @@ msgstr ""
 #. TRANS: Client error displayed when trying to get the RSS feed with favorites of a user that does not exist.
 #. TRANS: Client error displayed when requesting Friends of a Friend feed without providing a user nickname.
 #. TRANS: Client error displayed when requesting Friends of a Friend feed for an object that is not a user.
-#. TRANS: Client error displayed when trying to get a user hCard for a non-existing user.
 #. TRANS: Client error displayed trying to make a micro summary without providing a valid user.
 #. TRANS: Client error displayed trying to send a direct message to a non-existing user.
 #. TRANS: Client error displayed trying to use "one time password login" without using an existing user.
 #. TRANS: Client error displayed when referring to non-existing user.
 #. TRANS: Client error displayed trying to perform an action related to a non-existing user.
-#. TRANS: Form validation error on page for remote subscribe when no user was provided.
-#. TRANS: Form validation error on page for remote subscribe when no user profile was found.
 #. TRANS: Client error displayed when trying to reply to a non-exsting user.
 #. TRANS: Client error displayed when providing a non-existing nickname in a RSS 1.0 action.
 #. TRANS: Client error.
@@ -298,15 +277,13 @@ msgstr ""
 #. TRANS: Client error displayed trying to find a user by ID for a non-existing ID.
 #. TRANS: Client error displayed requesting groups for a non-existing user.
 #. TRANS: Client error displayed when user not found for an action.
-#. TRANS: Client error displayed providing a non-existing nickname.
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #. TRANS: Client error displayed when trying to perform a gallery action with an unknown user.
 #. TRANS: Client error displayed when trying to access a mailbox without providing a user.
 #. TRANS: Client error displayed when calling a profile action without specifying a user.
-#: actions/all.php:78 actions/allrss.php:69
+#: actions/all.php:84 actions/allrss.php:69
 #: actions/apiaccountupdatedeliverydevice.php:110
 #: actions/apiaccountupdateprofile.php:103
-#: actions/apiaccountupdateprofilebackgroundimage.php:118
 #: actions/apiaccountupdateprofileimage.php:104 actions/apiatomservice.php:59
 #: actions/apiblockcreate.php:96 actions/apiblockdestroy.php:94
 #: actions/apidirectmessage.php:75 actions/apidirectmessagenew.php:72
@@ -320,34 +297,41 @@ msgstr ""
 #: actions/apitimelinefriends.php:173 actions/apitimelinehome.php:78
 #: actions/apitimelinementions.php:77 actions/apitimelineuser.php:79
 #: actions/avatarbynickname.php:79 actions/favoritesrss.php:72
-#: actions/foaf.php:42 actions/foaf.php:61 actions/hcard.php:67
-#: actions/microsummary.php:63 actions/newmessage.php:119 actions/otp.php:78
-#: actions/peopletagged.php:87 actions/peopletagsbyuser.php:97
-#: actions/peopletagsforuser.php:79 actions/peopletagsubscribers.php:87
-#: actions/peopletagsubscriptions.php:81 actions/remotesubscribe.php:156
-#: actions/remotesubscribe.php:166 actions/replies.php:72
-#: actions/repliesrss.php:38 actions/rsd.php:114 actions/showfavorites.php:106
-#: actions/showprofiletag.php:73 actions/showprofiletag.php:112
-#: actions/userbyid.php:75 actions/usergroups.php:95 actions/userrss.php:41
-#: actions/userxrd.php:60 actions/xrds.php:71 lib/command.php:624
-#: lib/galleryaction.php:61 lib/mailbox.php:79 lib/profileaction.php:77
+#: actions/foaf.php:42 actions/foaf.php:61 actions/microsummary.php:63
+#: actions/newmessage.php:119 actions/otp.php:78 actions/peopletagged.php:92
+#: actions/peopletagsbyuser.php:102 actions/peopletagsforuser.php:84
+#: actions/peopletagsubscribers.php:92 actions/peopletagsubscriptions.php:86
+#: actions/replies.php:72 actions/repliesrss.php:38 actions/rsd.php:114
+#: actions/showfavorites.php:106 actions/showprofiletag.php:77
+#: actions/showprofiletag.php:116 actions/userbyid.php:75
+#: actions/usergroups.php:95 actions/userrss.php:39 actions/userxrd.php:61
+#: lib/command.php:624 lib/galleryaction.php:61 lib/mailbox.php:79
+#: lib/profileaction.php:77
 msgid "No such user."
 msgstr ""
 
 #. TRANS: Title of a user's own start page.
-#: actions/all.php:90
+#: actions/all.php:96
 msgid "Home timeline"
 msgstr ""
 
 #. TRANS: Title of another user's start page.
 #. TRANS: %s is the other user's name.
-#: actions/all.php:95
+#: actions/all.php:101
 #, php-format
 msgid "%s's home timeline"
 msgstr ""
 
 #. TRANS: %s is user nickname.
-#: actions/all.php:109
+#. TRANS: Feed title.
+#. TRANS: %s is tagger's nickname.
+#: actions/all.php:116 actions/showprofiletag.php:186
+#, php-format
+msgid "Feed for friends of %s (Activity Streams JSON)"
+msgstr ""
+
+#. TRANS: %s is user nickname.
+#: actions/all.php:124
 #, php-format
 msgid "Feed for friends of %s (RSS 1.0)"
 msgstr ""
@@ -355,19 +339,19 @@ msgstr ""
 #. TRANS: %s is user nickname.
 #. TRANS: Feed title.
 #. TRANS: %s is tagger's nickname.
-#: actions/all.php:118 actions/showprofiletag.php:182
+#: actions/all.php:133 actions/showprofiletag.php:197
 #, php-format
 msgid "Feed for friends of %s (RSS 2.0)"
 msgstr ""
 
 #. TRANS: %s is user nickname.
-#: actions/all.php:127
+#: actions/all.php:142
 #, php-format
 msgid "Feed for friends of %s (Atom)"
 msgstr ""
 
 #. TRANS: Empty list message. %s is a user nickname.
-#: actions/all.php:134
+#: actions/all.php:149
 #, php-format
 msgid ""
 "This is the timeline for %s and friends but no one has posted anything yet."
@@ -375,7 +359,7 @@ msgstr ""
 
 #. TRANS: Encouragement displayed on logged in user's empty timeline.
 #. TRANS: This message contains Markdown links. Keep "](" together.
-#: actions/all.php:141
+#: actions/all.php:156
 #, php-format
 msgid ""
 "Try subscribing to more people, [join a group](%%action.groups%%) or post "
@@ -384,26 +368,33 @@ msgstr ""
 
 #. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@".
 #. TRANS: This message contains Markdown links. Keep "](" together.
-#: actions/all.php:145
+#: actions/all.php:160
 #, php-format
 msgid ""
 "You can try to [nudge %1$s](../%2$s) from their profile or [post something "
 "to them](%%%%action.newnotice%%%%?status_textarea=%3$s)."
 msgstr ""
 
-#. TRANS: Encoutagement displayed on empty timeline user pages for anonymous users.
+#. TRANS: Encouragement displayed on empty timeline user pages for anonymous users.
 #. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
 #. TRANS: Empty list message for page with replies for a user for not logged in users.
 #. TRANS: %1$s is a user nickname. This message contains a Markdown link in the form [link text](link).
 #. TRANS: Second sentence of empty message for anonymous users. %s is a user nickname.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/all.php:150 actions/replies.php:214 actions/showstream.php:216
+#: actions/all.php:165 actions/replies.php:226 actions/showstream.php:241
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
 "post a notice to them."
 msgstr ""
 
+#. TRANS: Button text for inviting more users to the StatusNet instance.
+#. TRANS: Less business/enterprise-oriented language for public sites.
+#: actions/all.php:216 actions/public.php:255
+msgctxt "BUTTON"
+msgid "Send invite"
+msgstr ""
+
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Title of API timeline for a user and friends.
 #. TRANS: %s is a username.
@@ -412,11 +403,9 @@ msgstr ""
 #. TRANS: %s is a username.
 #. TRANS: Menu item title in personal group navigation menu.
 #. TRANS: %s is a username.
-#. TRANS: Menu item title in settings navigation panel.
-#. TRANS: %s is a username.
 #: actions/allrss.php:110 actions/apitimelinefriends.php:209
-#: actions/apitimelinehome.php:113 lib/adminpanelnav.php:73
-#: lib/personalgroupnav.php:77 lib/settingsnav.php:73
+#: actions/apitimelinehome.php:113 lib/adminpanelnav.php:74
+#: lib/personalgroupnav.php:77
 #, php-format
 msgid "%s and friends"
 msgstr ""
@@ -435,31 +424,30 @@ msgstr ""
 #: actions/apiaccountratelimitstatus.php:70
 #: actions/apiaccountupdatedeliverydevice.php:92
 #: actions/apiaccountupdateprofile.php:94
-#: actions/apiaccountupdateprofilebackgroundimage.php:92
-#: actions/apiaccountupdateprofilecolors.php:115
-#: actions/apiaccountverifycredentials.php:68 actions/apidirectmessage.php:157
-#: actions/apifavoritecreate.php:98 actions/apifavoritedestroy.php:98
-#: actions/apifriendshipscreate.php:99 actions/apifriendshipsdestroy.php:99
-#: actions/apifriendshipsshow.php:124 actions/apigroupcreate.php:138
-#: actions/apigroupismember.php:115 actions/apigroupjoin.php:148
-#: actions/apigroupleave.php:138 actions/apigrouplist.php:135
-#: actions/apigrouplistall.php:120 actions/apigroupmembership.php:105
-#: actions/apigroupprofileupdate.php:98 actions/apigroupprofileupdate.php:216
-#: actions/apigroupshow.php:114 actions/apihelptest.php:84
-#: actions/apilist.php:117 actions/apilist.php:177 actions/apilist.php:214
-#: actions/apilistmember.php:117 actions/apilistmembers.php:87
-#: actions/apilistmembers.php:160 actions/apilistmemberships.php:103
-#: actions/apilists.php:120 actions/apilists.php:172
-#: actions/apilistsubscriber.php:88 actions/apilistsubscribers.php:66
-#: actions/apilistsubscribers.php:113 actions/apilistsubscriptions.php:91
-#: actions/apistatusesdestroy.php:101 actions/apistatusesretweets.php:110
-#: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:139
-#: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
-#: actions/apitimelinefavorites.php:182 actions/apitimelinefriends.php:278
-#: actions/apitimelinegroup.php:148 actions/apitimelinehome.php:181
-#: actions/apitimelinelist.php:182 actions/apitimelinementions.php:182
-#: actions/apitimelinepublic.php:247 actions/apitimelineretweetedtome.php:150
-#: actions/apitimelineretweetsofme.php:149 actions/apitimelinetag.php:165
+#: actions/apiaccountverifycredentials.php:68 actions/apiconversation.php:156
+#: actions/apidirectmessage.php:157 actions/apifavoritecreate.php:98
+#: actions/apifavoritedestroy.php:98 actions/apifriendshipscreate.php:99
+#: actions/apifriendshipsdestroy.php:99 actions/apifriendshipsshow.php:124
+#: actions/apigroupcreate.php:138 actions/apigroupismember.php:115
+#: actions/apigroupjoin.php:148 actions/apigroupleave.php:138
+#: actions/apigrouplist.php:135 actions/apigrouplistall.php:120
+#: actions/apigroupmembership.php:105 actions/apigroupprofileupdate.php:98
+#: actions/apigroupprofileupdate.php:216 actions/apigroupshow.php:114
+#: actions/apihelptest.php:84 actions/apilist.php:117 actions/apilist.php:177
+#: actions/apilist.php:214 actions/apilistmember.php:117
+#: actions/apilistmembers.php:87 actions/apilistmembers.php:160
+#: actions/apilistmemberships.php:103 actions/apilists.php:120
+#: actions/apilists.php:172 actions/apilistsubscriber.php:88
+#: actions/apilistsubscribers.php:66 actions/apilistsubscribers.php:113
+#: actions/apilistsubscriptions.php:91 actions/apistatusesdestroy.php:101
+#: actions/apistatusesretweets.php:110 actions/apistatusesshow.php:105
+#: actions/apistatusnetconfig.php:139 actions/apistatusnetversion.php:91
+#: actions/apisubscriptions.php:109 actions/apitimelinefavorites.php:182
+#: actions/apitimelinefriends.php:277 actions/apitimelinegroup.php:146
+#: actions/apitimelinehome.php:181 actions/apitimelinelist.php:182
+#: actions/apitimelinementions.php:182 actions/apitimelinepublic.php:247
+#: actions/apitimelineretweetedtome.php:150
+#: actions/apitimelineretweetsofme.php:157 actions/apitimelinetag.php:165
 #: actions/apitimelineuser.php:217 actions/apiusershow.php:100
 #: lib/apilistusers.php:149
 msgid "API method not found."
@@ -471,8 +459,6 @@ msgstr ""
 #. TRANS: Client error. POST is a HTTP command. It should not be translated.
 #: actions/apiaccountupdatedeliverydevice.php:83
 #: actions/apiaccountupdateprofile.php:85
-#: actions/apiaccountupdateprofilebackgroundimage.php:83
-#: actions/apiaccountupdateprofilecolors.php:106
 #: actions/apiaccountupdateprofileimage.php:80 actions/apiblockcreate.php:87
 #: actions/apiblockdestroy.php:85 actions/apidirectmessagenew.php:107
 #: actions/apifavoritecreate.php:88 actions/apifavoritedestroy.php:88
@@ -499,29 +485,24 @@ msgstr ""
 #. TRANS: Server error thrown on database error updating SMS preferences.
 #. TRANS: Server error thrown on database error removing a registered SMS phone number.
 #. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
-#. TRANS: Server exception thrown on Profile design page when updating design settings fails.
 #: actions/apiaccountupdatedeliverydevice.php:136
 #: actions/confirmaddress.php:122 actions/emailsettings.php:353
 #: actions/emailsettings.php:504 actions/profilesettings.php:348
 #: actions/smssettings.php:301 actions/smssettings.php:454
-#: actions/urlsettings.php:213 actions/userdesignsettings.php:315
+#: actions/urlsettings.php:213
 msgid "Could not update user."
 msgstr ""
 
 #. TRANS: Error message displayed when referring to a user without a profile.
 #: actions/apiaccountupdateprofile.php:111
-#: actions/apiaccountupdateprofilebackgroundimage.php:199
-#: actions/apiaccountupdateprofilecolors.php:183
 #: actions/apiaccountupdateprofileimage.php:131
 #: actions/apiuserprofileimage.php:88 actions/apiusershow.php:108
 #: actions/avatarbynickname.php:85 actions/avatarsettings.php:108
 #: actions/avatarsettings.php:194 actions/foaf.php:69
-#: actions/grouplogo.php:184 actions/hcard.php:75
-#: actions/peopletagsbyuser.php:105 actions/peopletagsforuser.php:87
-#: actions/peopletagsubscriptions.php:89 actions/remotesubscribe.php:209
-#: actions/replies.php:80 actions/userauthorization.php:75
-#: actions/usergroups.php:103 actions/userrss.php:110 lib/galleryaction.php:69
-#: lib/profileaction.php:85
+#: actions/grouplogo.php:184 actions/peopletagsbyuser.php:110
+#: actions/peopletagsforuser.php:92 actions/peopletagsubscriptions.php:94
+#: actions/replies.php:80 actions/usergroups.php:103 actions/userrss.php:108
+#: lib/galleryaction.php:69 lib/profileaction.php:85
 msgid "User has no profile."
 msgstr ""
 
@@ -533,13 +514,10 @@ msgstr ""
 
 #. TRANS: Client error displayed when the number of bytes in a POST request exceeds a limit.
 #. TRANS: %s is the number of bytes of the CONTENT_LENGTH.
-#. TRANS: Form validation error in design settings form. POST should remain untranslated.
-#: actions/apiaccountupdateprofilebackgroundimage.php:108
 #: actions/apiaccountupdateprofileimage.php:95 actions/apimediaupload.php:81
 #: actions/apistatusesupdate.php:210 actions/avatarsettings.php:271
-#: actions/designadminpanel.php:120 actions/editapplication.php:121
-#: actions/newapplication.php:102 actions/newnotice.php:94
-#: lib/designsettings.php:110
+#: actions/editapplication.php:121 actions/newapplication.php:102
+#: actions/newnotice.php:94
 #, php-format
 msgid ""
 "The server was unable to handle that much POST data (%s byte) due to its "
@@ -550,35 +528,6 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#. TRANS: Client error displayed when saving design settings fails because of an empty id.
-#. TRANS: Client error displayed when saving design settings fails because of an empty result.
-#. TRANS: Client error displayed when a database error occurs inserting profile colours.
-#. TRANS: Client error displayed when a database error occurs updating profile colours.
-#. TRANS: Form validation error displayed when group design settings could not be saved because of an application issue.
-#. TRANS: Form validation error on Profile design page when saving design settings has failed.
-#. TRANS: Form validation error on Profile design page when updating design settings has failed.
-#: actions/apiaccountupdateprofilebackgroundimage.php:138
-#: actions/apiaccountupdateprofilebackgroundimage.php:149
-#: actions/apiaccountupdateprofilecolors.php:160
-#: actions/apiaccountupdateprofilecolors.php:171
-#: actions/groupdesignsettings.php:295 actions/groupdesignsettings.php:306
-#: actions/userdesignsettings.php:222 actions/userdesignsettings.php:233
-#: actions/userdesignsettings.php:276 actions/userdesignsettings.php:287
-msgid "Unable to save your design settings."
-msgstr ""
-
-#. TRANS: Error displayed when updating design settings fails.
-#. TRANS: Client error displayed when a database error occurs updating profile colours.
-#. TRANS: Form validation error on Profile design page when updating design settings has failed.
-#. TRANS: Error message displayed if design settings could not be saved.
-#. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
-#: actions/apiaccountupdateprofilebackgroundimage.php:191
-#: actions/apiaccountupdateprofilecolors.php:139
-#: actions/userdesignsettings.php:199 lib/designsettings.php:217
-#: lib/designsettings.php:239
-msgid "Could not update your design."
-msgstr ""
-
 #. TRANS: Title for Atom feed.
 #: actions/apiatomservice.php:85
 msgctxt "ATOM"
@@ -590,7 +539,7 @@ msgstr ""
 #. TRANS: Title in atom group notice feed. %s is a group name.
 #. TRANS: Title in atom user notice feed. %s is a user name.
 #: actions/apiatomservice.php:93 actions/grouprss.php:138
-#: actions/userrss.php:95 lib/atomgroupnoticefeed.php:63
+#: actions/userrss.php:93 lib/atomgroupnoticefeed.php:63
 #: lib/atomusernoticefeed.php:88
 #, php-format
 msgid "%s timeline"
@@ -636,6 +585,23 @@ msgstr ""
 msgid "Unblock user failed."
 msgstr ""
 
+#. TRANS: Client exception thrown when no conversation ID is given.
+#: actions/apiconversation.php:69
+msgid "No conversation ID."
+msgstr ""
+
+#. TRANS: Client exception thrown when referring to a non-existing conversation ID (%d).
+#: actions/apiconversation.php:76
+#, php-format
+msgid "No conversation with ID %d."
+msgstr ""
+
+#. TRANS: Title for conversion timeline.
+#: actions/apiconversation.php:105
+msgctxt "TITLE"
+msgid "Conversation"
+msgstr ""
+
 #. TRANS: Title. %s is a user nickname.
 #: actions/apidirectmessage.php:88
 #, php-format
@@ -687,7 +653,10 @@ msgid "Cannot send direct messages to users who aren't your friend."
 msgstr ""
 
 #. TRANS: Client error displayed trying to direct message self (403).
-#: actions/apidirectmessagenew.php:154
+#. TRANS: Client error displayed trying to send a direct message to self.
+#. TRANS: Error text shown when trying to send a direct message to self.
+#: actions/apidirectmessagenew.php:154 actions/newmessage.php:178
+#: lib/command.php:632
 msgid ""
 "Do not send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
@@ -767,7 +736,7 @@ msgstr ""
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Form validation error displayed when trying to register with an existing nickname.
 #: actions/apigroupcreate.php:156 actions/apigroupprofileupdate.php:257
-#: actions/editgroup.php:200 actions/newgroup.php:138
+#: actions/editgroup.php:194 actions/newgroup.php:138
 #: actions/profilesettings.php:293 actions/register.php:210
 msgid "Nickname already in use. Try another one."
 msgstr ""
@@ -779,7 +748,7 @@ msgstr ""
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Form validation error displayed when trying to register with an invalid nickname.
 #: actions/apigroupcreate.php:164 actions/apigroupprofileupdate.php:262
-#: actions/editgroup.php:204 actions/newgroup.php:142
+#: actions/editgroup.php:198 actions/newgroup.php:142
 #: actions/profilesettings.php:263 actions/register.php:213
 msgid "Not a valid nickname."
 msgstr ""
@@ -793,7 +762,7 @@ msgstr ""
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Form validation error displayed when trying to register with an invalid homepage URL.
 #: actions/apigroupcreate.php:181 actions/apigroupprofileupdate.php:281
-#: actions/editapplication.php:236 actions/editgroup.php:211
+#: actions/editapplication.php:236 actions/editgroup.php:205
 #: actions/newapplication.php:222 actions/newgroup.php:149
 #: actions/profilesettings.php:268 actions/register.php:222
 msgid "Homepage is not a valid URL."
@@ -806,7 +775,7 @@ msgstr ""
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Form validation error displayed when trying to register with a too long full name.
 #: actions/apigroupcreate.php:191 actions/apigroupprofileupdate.php:291
-#: actions/editgroup.php:215 actions/newgroup.php:153
+#: actions/editgroup.php:209 actions/newgroup.php:153
 #: actions/profilesettings.php:272 actions/register.php:226
 msgid "Full name is too long (maximum 255 characters)."
 msgstr ""
@@ -825,8 +794,8 @@ msgstr ""
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed characters.
 #: actions/apigroupcreate.php:201 actions/apigroupprofileupdate.php:301
-#: actions/editapplication.php:203 actions/editgroup.php:220
-#: actions/editpeopletag.php:265 actions/newapplication.php:183
+#: actions/editapplication.php:203 actions/editgroup.php:214
+#: actions/editpeopletag.php:269 actions/newapplication.php:183
 #: actions/newgroup.php:158
 #, php-format
 msgid "Description is too long (maximum %d character)."
@@ -841,7 +810,7 @@ msgstr[1] ""
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Form validation error displayed when trying to register with a too long location.
 #: actions/apigroupcreate.php:215 actions/apigroupprofileupdate.php:313
-#: actions/editgroup.php:227 actions/newgroup.php:165
+#: actions/editgroup.php:221 actions/newgroup.php:165
 #: actions/profilesettings.php:285 actions/register.php:238
 msgid "Location is too long (maximum 255 characters)."
 msgstr ""
@@ -855,7 +824,7 @@ msgstr ""
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed aliases.
 #: actions/apigroupcreate.php:236 actions/apigroupprofileupdate.php:332
-#: actions/editgroup.php:240 actions/newgroup.php:178
+#: actions/editgroup.php:234 actions/newgroup.php:178
 #, php-format
 msgid "Too many aliases! Maximum %d allowed."
 msgid_plural "Too many aliases! Maximum %d allowed."
@@ -878,14 +847,14 @@ msgstr ""
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error. %s is the already used alias.
 #: actions/apigroupcreate.php:264 actions/apigroupprofileupdate.php:361
-#: actions/editgroup.php:255 actions/newgroup.php:194
+#: actions/editgroup.php:249 actions/newgroup.php:194
 #, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to use an alias during group creation that is the same as the group's nickname.
 #. TRANS: Group edit form validation error.
-#: actions/apigroupcreate.php:278 actions/editgroup.php:262
+#: actions/apigroupcreate.php:278 actions/editgroup.php:256
 msgid "Alias can't be the same as nickname."
 msgstr ""
 
@@ -921,7 +890,7 @@ msgstr ""
 #. TRANS: %1$s is the joining user's nickname, $2$s is the group nickname for which the join failed.
 #. TRANS: Message given having failed to add a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupjoin.php:133 actions/joingroup.php:136 lib/command.php:359
+#: actions/apigroupjoin.php:133 actions/joingroup.php:140 lib/command.php:359
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr ""
@@ -935,7 +904,7 @@ msgstr ""
 #. TRANS: %1$s is the leaving user's nickname, $2$s is the group nickname for which the leave failed.
 #. TRANS: Message given having failed to remove a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupleave.php:124 actions/leavegroup.php:130
+#: actions/apigroupleave.php:124 actions/leavegroup.php:131
 #: lib/command.php:404
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
@@ -969,25 +938,23 @@ msgstr ""
 
 #. TRANS: Client error displayed when trying to edit a group without being an admin.
 #. TRANS: Client error displayed trying to edit a group while not being a group admin.
-#. TRANS: Client error displayed trying to change group design settings without being a (group) admin.
 #. TRANS: Client error displayed when trying to change group logo settings while not being a group admin.
 #: actions/apigroupprofileupdate.php:119 actions/editgroup.php:110
-#: actions/editgroup.php:176 actions/groupdesignsettings.php:109
-#: actions/grouplogo.php:111
+#: actions/editgroup.php:170 actions/grouplogo.php:111
 msgid "You must be an admin to edit the group."
 msgstr ""
 
 #. TRANS: Server error displayed when group update fails.
 #. TRANS: Server error displayed when editing a group fails.
-#: actions/apigroupprofileupdate.php:173 actions/editgroup.php:285
+#: actions/apigroupprofileupdate.php:173 actions/editgroup.php:279
 msgid "Could not update group."
 msgstr ""
 
 #. TRANS: Server error displayed when adding group aliases fails.
 #. TRANS: Server error displayed when group aliases could not be added.
 #. TRANS: Server exception thrown when creating group aliases failed.
-#: actions/apigroupprofileupdate.php:196 actions/editgroup.php:292
-#: classes/User_group.php:558
+#: actions/apigroupprofileupdate.php:196 actions/editgroup.php:286
+#: classes/User_group.php:624
 msgid "Could not create aliases."
 msgstr ""
 
@@ -1103,13 +1070,12 @@ msgid "Invalid nickname / password!"
 msgstr ""
 
 #. TRANS: Server error displayed when a database action fails.
-#: actions/apioauthauthorize.php:217
+#: actions/apioauthauthorize.php:211
 msgid "Database error inserting oauth_token_association."
 msgstr ""
 
 #. TRANS: Client error given on when invalid data was passed through a form in the OAuth API.
 #. TRANS: Unexpected validation error on avatar upload form.
-#. TRANS: Client error displayed when the submitted form contains unexpected data.
 #. TRANS: Client error displayed submitting invalid form data for edit application.
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
 #. TRANS: Form validation error message when an unsupported argument is used.
@@ -1118,29 +1084,27 @@ msgstr ""
 #. TRANS: Client error when submitting a form with unexpected information.
 #. TRANS: Client error displayed when unexpected data is posted in the password recovery form.
 #. TRANS: Message given submitting a form with an unknown action in SMS settings.
-#. TRANS: Unknown form validation error in design settings form.
-#: actions/apioauthauthorize.php:294 actions/avatarsettings.php:297
-#: actions/designadminpanel.php:100 actions/editapplication.php:145
-#: actions/emailsettings.php:312 actions/grouplogo.php:332
-#: actions/imsettings.php:259 actions/newapplication.php:125
-#: actions/oauthconnectionssettings.php:145 actions/recoverpassword.php:46
-#: actions/smssettings.php:271 lib/designsettings.php:134
+#: actions/apioauthauthorize.php:288 actions/avatarsettings.php:297
+#: actions/editapplication.php:145 actions/emailsettings.php:312
+#: actions/grouplogo.php:332 actions/imsettings.php:259
+#: actions/newapplication.php:125 actions/oauthconnectionssettings.php:145
+#: actions/recoverpassword.php:46 actions/smssettings.php:271
 msgid "Unexpected form submission."
 msgstr ""
 
 #. TRANS: Title for a page where a user can confirm/deny account access by an external application.
-#: actions/apioauthauthorize.php:387
+#: actions/apioauthauthorize.php:357
 msgid "An application would like to connect to your account"
 msgstr ""
 
 #. TRANS: Fieldset legend.
-#: actions/apioauthauthorize.php:404
+#: actions/apioauthauthorize.php:374
 msgid "Allow or deny access"
 msgstr ""
 
 #. TRANS: User notification of external application requesting account access.
 #. TRANS: %3$s is the access type requested (read-write or read-only), %4$s is the StatusNet sitename.
-#: actions/apioauthauthorize.php:425
+#: actions/apioauthauthorize.php:395
 #, php-format
 msgid ""
 "An application would like the ability to <strong>%3$s</strong> your %4$s "
@@ -1151,7 +1115,7 @@ msgstr ""
 #. TRANS: User notification of external application requesting account access.
 #. TRANS: %1$s is the application name requesting access, %2$s is the organisation behind the application,
 #. TRANS: %3$s is the access type requested, %4$s is the StatusNet sitename.
-#: actions/apioauthauthorize.php:433
+#: actions/apioauthauthorize.php:403
 #, php-format
 msgid ""
 "The application <strong>%1$s</strong> by <strong>%2$s</strong> would like "
@@ -1160,7 +1124,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: Fieldset legend.
-#: actions/apioauthauthorize.php:455
+#: actions/apioauthauthorize.php:425
 msgctxt "LEGEND"
 msgid "Account"
 msgstr ""
@@ -1168,19 +1132,18 @@ msgstr ""
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Field label on account registration page.
-#. TRANS: Label for nickname on user authorisation page.
 #. TRANS: Field label on group edit form.
 #. TRANS: Dropdown option for searching in profiles.
-#: actions/apioauthauthorize.php:459 actions/profilesettings.php:104
-#: actions/register.php:438 actions/userauthorization.php:146
-#: lib/groupeditform.php:147 lib/togglepeopletag.php:107
+#: actions/apioauthauthorize.php:429 actions/profilesettings.php:104
+#: actions/register.php:438 lib/groupeditform.php:147
+#: lib/togglepeopletag.php:107
 msgid "Nickname"
 msgstr ""
 
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Field label on login page.
 #. TRANS: Field label on account registration page.
-#: actions/apioauthauthorize.php:463 actions/login.php:235
+#: actions/apioauthauthorize.php:433 actions/login.php:235
 #: actions/register.php:444
 msgid "Password"
 msgstr ""
@@ -1191,7 +1154,7 @@ msgstr ""
 #. TRANS: Button label to cancel an IM address confirmation procedure.
 #. TRANS: Button label to cancel a SMS address confirmation procedure.
 #. TRANS: Button label in the "Edit application" form.
-#: actions/apioauthauthorize.php:478 actions/emailsettings.php:125
+#: actions/apioauthauthorize.php:448 actions/emailsettings.php:125
 #: actions/imsettings.php:136 actions/smssettings.php:132
 #: lib/applicationeditform.php:351
 msgctxt "BUTTON"
@@ -1199,35 +1162,35 @@ msgid "Cancel"
 msgstr ""
 
 #. TRANS: Button text that when clicked will allow access to an account by an external application.
-#: actions/apioauthauthorize.php:485
+#: actions/apioauthauthorize.php:455
 msgctxt "BUTTON"
 msgid "Allow"
 msgstr ""
 
 #. TRANS: Form instructions.
-#: actions/apioauthauthorize.php:502
+#: actions/apioauthauthorize.php:472
 msgid "Authorize access to your account information."
 msgstr ""
 
 #. TRANS: Header for user notification after revoking OAuth access to an application.
-#: actions/apioauthauthorize.php:594
+#: actions/apioauthauthorize.php:564
 msgid "Authorization canceled."
 msgstr ""
 
 #. TRANS: User notification after revoking OAuth access to an application.
 #. TRANS: %s is an OAuth token.
-#: actions/apioauthauthorize.php:598
+#: actions/apioauthauthorize.php:568
 #, php-format
 msgid "The request token %s has been revoked."
 msgstr ""
 
 #. TRANS: Title of the page notifying the user that an anonymous client application was successfully authorized to access the user's account with OAuth.
-#: actions/apioauthauthorize.php:621
+#: actions/apioauthauthorize.php:591
 msgid "You have successfully authorized the application"
 msgstr ""
 
 #. TRANS: Message notifying the user that an anonymous client application was successfully authorized to access the user's account with OAuth.
-#: actions/apioauthauthorize.php:625
+#: actions/apioauthauthorize.php:595
 msgid ""
 "Please return to the application and enter the following security code to "
 "complete the process."
@@ -1235,14 +1198,14 @@ msgstr ""
 
 #. TRANS: Title of the page notifying the user that the client application was successfully authorized to access the user's account with OAuth.
 #. TRANS: %s is the authorised application name.
-#: actions/apioauthauthorize.php:632
+#: actions/apioauthauthorize.php:602
 #, php-format
 msgid "You have successfully authorized %s"
 msgstr ""
 
 #. TRANS: Message notifying the user that the client application was successfully authorized to access the user's account with OAuth.
 #. TRANS: %s is the authorised application name.
-#: actions/apioauthauthorize.php:639
+#: actions/apioauthauthorize.php:609
 #, php-format
 msgid ""
 "Please return to %s and enter the following security code to complete the "
@@ -1445,7 +1408,7 @@ msgstr ""
 #. TRANS: %s is the tag.
 #. TRANS: Title for first page of notices with tags.
 #. TRANS: %s is the tag.
-#: actions/apitimelinetag.php:101 actions/tag.php:63
+#: actions/apitimelinetag.php:101 actions/tag.php:65
 #, php-format
 msgid "Notices tagged with %s"
 msgstr ""
@@ -1543,12 +1506,9 @@ msgstr ""
 #. TRANS: Client error displayed when requesting Friends of a Friend feed for a nickname that is not a group.
 #. TRANS: Client error displayed trying to block a user from a group while specifying a non-existing group.
 #. TRANS: Client error displayed referring to a group's permalink for a non-existing group ID.
-#. TRANS: Client error displayed trying to change group design settings while providing a nickname for a non-existing group.
 #. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
 #. TRANS: Client error displayed when trying to view group members for a non-existing group.
 #. TRANS: Client error displayed when trying to view group members for an object that is not a group.
-#. TRANS: Client error displayed when trying to view group members for a non-existing group.
-#. TRANS: Client error displayed when trying to view group members for an object that is not a group.
 #. TRANS: Client error displayed when requesting a group RSS feed for group that does not exist.
 #. TRANS: Client error displayed when requesting a group RSS feed for an object that is not a group.
 #. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
@@ -1557,10 +1517,10 @@ msgstr ""
 #. TRANS: Client error displayed when trying to leave a non-local group.
 #. TRANS: Client error displayed when trying to leave a non-existing group.
 #. TRANS: Client error displayed when providing an invalid group ID on the Make Admin page.
-#. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
-#. TRANS: Client error displayed if no local group with a given name was found requesting group page.
 #. TRANS: Command exception text shown when a group is requested that does not exist.
 #. TRANS: Error text shown when trying to leave a group that does not exist.
+#. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
+#. TRANS: Client error displayed if no local group with a given name was found requesting group page.
 #: actions/approvegroup.php:82 actions/approvegroup.php:95
 #: actions/atompubshowmembership.php:81 actions/blockedfromgroup.php:81
 #: actions/blockedfromgroup.php:89 actions/cancelgroup.php:81
@@ -1568,14 +1528,12 @@ msgstr ""
 #: actions/deletegroup.php:100 actions/editgroup.php:102
 #: actions/foafgroup.php:46 actions/foafgroup.php:65 actions/foafgroup.php:73
 #: actions/groupblock.php:90 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:101 actions/grouplogo.php:103
-#: actions/groupmembers.php:84 actions/groupmembers.php:92
-#: actions/groupqueue.php:85 actions/groupqueue.php:93 actions/grouprss.php:97
-#: actions/grouprss.php:105 actions/groupunblock.php:90
-#: actions/joingroup.php:82 actions/joingroup.php:95 actions/leavegroup.php:82
-#: actions/leavegroup.php:95 actions/makeadmin.php:92
-#: actions/showgroup.php:136 actions/showgroup.php:145 lib/command.php:168
-#: lib/command.php:389
+#: actions/grouplogo.php:103 actions/groupqueue.php:85
+#: actions/groupqueue.php:93 actions/grouprss.php:97 actions/grouprss.php:105
+#: actions/groupunblock.php:90 actions/joingroup.php:82
+#: actions/joingroup.php:95 actions/leavegroup.php:82
+#: actions/leavegroup.php:95 actions/makeadmin.php:92 lib/command.php:168
+#: lib/command.php:389 lib/groupaction.php:87 lib/groupaction.php:96
 msgid "No such group."
 msgstr ""
 
@@ -1621,13 +1579,13 @@ msgstr ""
 
 #. TRANS: Client error displayed trying to approve/deny group membership.
 #. TRANS: Client error displayed trying to approve/deny subscription.
-#: actions/approvegroup.php:132 actions/approvesub.php:83
+#: actions/approvegroup.php:132 actions/approvesub.php:84
 msgid "Internal error: received neither cancel nor abort."
 msgstr ""
 
 #. TRANS: Client error displayed trying to approve/deny group membership.
 #. TRANS: Client error displayed trying to approve/deny  subscription
-#: actions/approvegroup.php:136 actions/approvesub.php:87
+#: actions/approvegroup.php:136 actions/approvesub.php:88
 msgid "Internal error: received both cancel and abort."
 msgstr ""
 
@@ -1657,33 +1615,34 @@ msgid "Join request canceled."
 msgstr ""
 
 #. TRANS: Client error displayed trying to approve subscription for a non-existing request.
-#: actions/approvesub.php:76
+#. TRANS: %s is a user nickname.
+#: actions/approvesub.php:77
 #, php-format
 msgid "%s is not in the moderation queue for your subscriptions."
 msgstr ""
 
 #. TRANS: Server error displayed when cancelling a queued subscription request fails.
 #. TRANS: %1$s is the leaving user's nickname, $2$s is the nickname for which the leave failed.
-#: actions/approvesub.php:116
+#: actions/approvesub.php:117
 #, php-format
 msgid "Could not cancel or approve request for user %1$s to join group %2$s."
 msgstr ""
 
 #. TRANS: Title for subscription approval ajax return
 #. TRANS: %1$s is the approved user's nickname
-#: actions/approvesub.php:126
+#: actions/approvesub.php:127
 #, php-format
 msgctxt "TITLE"
 msgid "%1$s's request"
 msgstr ""
 
 #. TRANS: Message on page for user after approving a subscription request.
-#: actions/approvesub.php:132
+#: actions/approvesub.php:133
 msgid "Subscription approved."
 msgstr ""
 
 #. TRANS: Message on page for user after rejecting a subscription request.
-#: actions/approvesub.php:135
+#: actions/approvesub.php:136
 msgid "Subscription canceled."
 msgstr ""
 
@@ -1839,15 +1798,13 @@ msgstr ""
 #. TRANS: Client error displayed trying to get an avatar without providing a nickname.
 #. TRANS: Client error displayed when requesting a list of blocked users for a group without providing a group nickname.
 #. TRANS: Client error displayed trying to edit a group while not proving a nickname for the group to edit.
-#. TRANS: Client error displayed trying to change group design settings without providing a group nickname.
 #. TRANS: Client error displayed when trying to change group logo settings without providing a nickname.
 #. TRANS: Client error displayed when trying to view group members without providing a group nickname.
 #. TRANS: Client error displayed when requesting a group RSS feed without providing a group nickname.
 #. TRANS: Client error displayed if no nickname argument was given requesting a group page.
 #: actions/avatarbynickname.php:60 actions/blockedfromgroup.php:73
-#: actions/editgroup.php:85 actions/groupdesignsettings.php:84
-#: actions/grouplogo.php:86 actions/groupmembers.php:76
-#: actions/groupqueue.php:77 actions/grouprss.php:89 actions/showgroup.php:118
+#: actions/editgroup.php:85 actions/grouplogo.php:86 actions/groupqueue.php:77
+#: actions/grouprss.php:89 lib/groupaction.php:69
 msgid "No nickname."
 msgstr ""
 
@@ -2020,7 +1977,7 @@ msgstr ""
 #. TRANS: Button label on the form to block a user from a group.
 #: actions/block.php:154 actions/deleteapplication.php:158
 #: actions/deletegroup.php:220 actions/deletenotice.php:155
-#: actions/deleteuser.php:154 actions/editpeopletag.php:174
+#: actions/deleteuser.php:154 actions/editpeopletag.php:178
 #: actions/groupblock.php:188
 msgctxt "BUTTON"
 msgid "No"
@@ -2040,7 +1997,7 @@ msgstr ""
 #. TRANS: Button text to repeat a notice on notice repeat form.
 #: actions/block.php:161 actions/deleteapplication.php:165
 #: actions/deletegroup.php:227 actions/deletenotice.php:162
-#: actions/deleteuser.php:161 actions/editpeopletag.php:178
+#: actions/deleteuser.php:161 actions/editpeopletag.php:182
 #: actions/groupblock.php:195 lib/repeatform.php:126
 msgctxt "BUTTON"
 msgid "Yes"
@@ -2076,19 +2033,19 @@ msgid "A list of the users blocked from joining this group."
 msgstr ""
 
 #. TRANS: Form legend for unblocking a user from a group.
-#: actions/blockedfromgroup.php:291
+#: actions/blockedfromgroup.php:285
 msgid "Unblock user from group"
 msgstr ""
 
 #. TRANS: Button text for unblocking a user from a group.
-#: actions/blockedfromgroup.php:323
+#: actions/blockedfromgroup.php:317
 msgctxt "BUTTON"
 msgid "Unblock"
 msgstr ""
 
 #. TRANS: Tooltip for button for unblocking a user from a group.
 #. TRANS: Description of the form to unblock a user.
-#: actions/blockedfromgroup.php:327 lib/unblockform.php:78
+#: actions/blockedfromgroup.php:321 lib/unblockform.php:78
 msgid "Unblock this user"
 msgstr ""
 
@@ -2102,7 +2059,7 @@ msgstr ""
 #. TRANS: Title for leave group page after leaving.
 #. TRANS: %s$s is the leaving user's name, %2$s is the group name.
 #. TRANS: Title for leave group page after leaving.
-#: actions/cancelgroup.php:157 actions/leavegroup.php:139
+#: actions/cancelgroup.php:157 actions/leavegroup.php:140
 #, php-format
 msgctxt "TITLE"
 msgid "%1$s left group %2$s"
@@ -2196,6 +2153,18 @@ msgstr ""
 msgid "Conversation"
 msgstr ""
 
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#: actions/conversation.php:152 actions/conversation.php:168
+msgid "Conversation feed (Activity Streams JSON)"
+msgstr ""
+
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#: actions/conversation.php:160
+msgid "Conversation feed (RSS 2.0)"
+msgstr ""
+
 #. TRANS: Title for conversation page.
 #. TRANS: Title for page that shows a notice.
 #: actions/conversationreplies.php:81 actions/shownotice.php:258
@@ -2267,7 +2236,7 @@ msgstr ""
 
 #. TRANS: Button title for user account deletion.
 #: actions/deleteaccount.php:323
-msgid "Permanently delete your account"
+msgid "Permanently delete your account."
 msgstr ""
 
 #. TRANS: Client error displayed trying to delete an application while not logged in.
@@ -2292,7 +2261,7 @@ msgstr ""
 #. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:103 actions/editapplication.php:132
 #: actions/newapplication.php:113 actions/showapplication.php:117
-#: lib/action.php:1468
+#: lib/action.php:1473
 msgid "There was a problem with your session token."
 msgstr ""
 
@@ -2434,180 +2403,6 @@ msgstr ""
 msgid "Delete this user."
 msgstr ""
 
-#. TRANS: Message used as title for design settings for the site.
-#: actions/designadminpanel.php:60
-msgid "Design"
-msgstr ""
-
-#. TRANS: Instructions for design adminsitration panel.
-#: actions/designadminpanel.php:71
-msgid "Design settings for this StatusNet site"
-msgstr ""
-
-#. TRANS: Client error displayed when a logo URL does is not valid.
-#: actions/designadminpanel.php:327
-msgid "Invalid logo URL."
-msgstr ""
-
-#. TRANS: Client error displayed when an SSL logo URL is invalid.
-#: actions/designadminpanel.php:333
-msgid "Invalid SSL logo URL."
-msgstr ""
-
-#. TRANS: Client error displayed when a theme is submitted through the form that is not in the theme list.
-#. TRANS: %s is the chosen unavailable theme.
-#: actions/designadminpanel.php:339
-#, php-format
-msgid "Theme not available: %s."
-msgstr ""
-
-#. TRANS: Fieldset legend for form to change logo.
-#: actions/designadminpanel.php:437
-msgid "Change logo"
-msgstr ""
-
-#. TRANS: Field label for StatusNet site logo.
-#: actions/designadminpanel.php:444
-msgid "Site logo"
-msgstr ""
-
-#. TRANS: Field label for SSL StatusNet site logo.
-#: actions/designadminpanel.php:452
-msgid "SSL logo"
-msgstr ""
-
-#. TRANS: Fieldset legend for form change StatusNet site's theme.
-#: actions/designadminpanel.php:467
-msgid "Change theme"
-msgstr ""
-
-#. TRANS: Field label for dropdown to choose site theme.
-#: actions/designadminpanel.php:485
-msgid "Site theme"
-msgstr ""
-
-#. TRANS: Title for field label for dropdown to choose site theme.
-#: actions/designadminpanel.php:487
-msgid "Theme for the site."
-msgstr ""
-
-#. TRANS: Field label for uploading a cutom theme.
-#: actions/designadminpanel.php:494
-msgid "Custom theme"
-msgstr ""
-
-#. TRANS: Form instructions for uploading a cutom StatusNet theme.
-#: actions/designadminpanel.php:499
-msgid "You can upload a custom StatusNet theme as a .ZIP archive."
-msgstr ""
-
-#. TRANS: Fieldset legend for theme background image.
-#: actions/designadminpanel.php:515
-msgid "Change background image"
-msgstr ""
-
-#. TRANS: Field label for background image on theme designer page.
-#. TRANS: Field label for background color selector.
-#. TRANS: Label on profile design page for setting a profile page background colour.
-#: actions/designadminpanel.php:525 actions/designadminpanel.php:609
-#: lib/designform.php:233
-msgid "Background"
-msgstr ""
-
-#. TRANS: Form guide for background image upload form on theme designer page.
-#: actions/designadminpanel.php:531
-#, php-format
-msgid ""
-"You can upload a background image for the site. The maximum file size is %1"
-"$s."
-msgstr ""
-
-#. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:558
-msgid "On"
-msgstr ""
-
-#. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:575
-msgid "Off"
-msgstr ""
-
-#. TRANS: Form guide for turning background image on or off on theme designer page.
-#. TRANS: Form guide for a set of radio buttons on the profile design page that will enable or disable
-#. TRANS: use of the uploaded profile image.
-#: actions/designadminpanel.php:577 lib/designform.php:209
-msgid "Turn background image on or off."
-msgstr ""
-
-#. TRANS: Checkbox label to title background image on theme designer page.
-#. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
-#: actions/designadminpanel.php:583 lib/designform.php:215
-msgid "Tile background image"
-msgstr ""
-
-#. TRANS: Fieldset legend for theme colors.
-#: actions/designadminpanel.php:598
-msgid "Change colors"
-msgstr ""
-
-#. TRANS: Field label for content color selector.
-#. TRANS: Label on profile design page for setting a profile page content colour.
-#: actions/designadminpanel.php:623 lib/designform.php:247
-msgid "Content"
-msgstr ""
-
-#. TRANS: Field label for sidebar color selector.
-#. TRANS: Label on profile design page for setting a profile page sidebar colour.
-#: actions/designadminpanel.php:637 lib/designform.php:261
-msgid "Sidebar"
-msgstr ""
-
-#. TRANS: Field label for text color selector.
-#. TRANS: Label on profile design page for setting a profile page text colour.
-#: actions/designadminpanel.php:651 lib/designform.php:275
-msgid "Text"
-msgstr ""
-
-#. TRANS: Field label for link color selector.
-#. TRANS: Label on profile design page for setting a profile page links colour.
-#: actions/designadminpanel.php:665 lib/designform.php:289
-msgid "Links"
-msgstr ""
-
-#. TRANS: Fieldset legend for advanced theme design settings.
-#: actions/designadminpanel.php:691
-msgid "Advanced"
-msgstr ""
-
-#. TRANS: Field label for custom CSS.
-#: actions/designadminpanel.php:696
-msgid "Custom CSS"
-msgstr ""
-
-#. TRANS: Button text for resetting theme settings.
-#: actions/designadminpanel.php:718
-msgctxt "BUTTON"
-msgid "Use defaults"
-msgstr ""
-
-#. TRANS: Title for button for resetting theme settings.
-#. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: actions/designadminpanel.php:720 lib/designform.php:135
-msgid "Restore default designs."
-msgstr ""
-
-#. TRANS: Title for button for resetting theme settings.
-#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: actions/designadminpanel.php:728 lib/designform.php:143
-msgid "Reset back to default."
-msgstr ""
-
-#. TRANS: Title for button for saving theme settings.
-#. TRANS: Title for button on profile design page to save settings.
-#: actions/designadminpanel.php:736 lib/designform.php:317
-msgid "Save design."
-msgstr ""
-
 #. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
 #: actions/disfavor.php:83
 msgid "This notice is not a favorite!"
@@ -2625,6 +2420,92 @@ msgstr ""
 msgid "No such document \"%s\"."
 msgstr ""
 
+#. TRANS: Menu item in administrator navigation panel.
+#. TRANS: Menu item in default local navigation panel.
+#. TRANS: Menu item in personal group navigation menu.
+#: actions/doc.php:178 lib/adminpanelnav.php:71 lib/defaultlocalnav.php:60
+#: lib/homestubnav.php:55 lib/personalgroupnav.php:74 lib/settingsnav.php:63
+msgctxt "MENU"
+msgid "Home"
+msgstr ""
+
+#: actions/doc.php:181
+msgctxt "MENU"
+msgid "Docs"
+msgstr ""
+
+#. TRANS: Secondary navigation menu item leading to help on StatusNet.
+#: actions/doc.php:195 lib/secondarynav.php:56
+msgctxt "MENU"
+msgid "Help"
+msgstr ""
+
+#: actions/doc.php:196
+msgid "Getting started"
+msgstr ""
+
+#. TRANS: Secondary navigation menu item leading to text about StatusNet site.
+#: actions/doc.php:200 lib/secondarynav.php:59
+msgctxt "MENU"
+msgid "About"
+msgstr ""
+
+#: actions/doc.php:201
+msgid "About this site"
+msgstr ""
+
+#. TRANS: Secondary navigation menu item leading to Frequently Asked Questions.
+#: actions/doc.php:205 lib/secondarynav.php:62
+msgctxt "MENU"
+msgid "FAQ"
+msgstr ""
+
+#: actions/doc.php:206
+msgid "Frequently asked questions"
+msgstr ""
+
+#. TRANS: Secondary navigation menu item leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+#: actions/doc.php:210 lib/secondarynav.php:81
+msgctxt "MENU"
+msgid "Contact"
+msgstr ""
+
+#: actions/doc.php:211
+msgid "Contact info"
+msgstr ""
+
+#: actions/doc.php:215
+msgctxt "MENU"
+msgid "Tags"
+msgstr ""
+
+#: actions/doc.php:216
+msgid "Using tags"
+msgstr ""
+
+#. TRANS: Menu item in default local navigation panel.
+#. TRANS: Menu item in search group navigation panel.
+#. TRANS: Menu item in local navigation menu.
+#: actions/doc.php:220 lib/defaultlocalnav.php:71 lib/publicgroupnav.php:73
+#: lib/searchgroupnav.php:82 lib/subgroupnav.php:124
+msgctxt "MENU"
+msgid "Groups"
+msgstr ""
+
+#: actions/doc.php:221
+msgid "Using groups"
+msgstr ""
+
+#: actions/doc.php:225
+msgctxt "MENU"
+msgid "API"
+msgstr ""
+
+#: actions/doc.php:226
+msgid "RESTful API"
+msgstr ""
+
 #. TRANS: Title for "Edit application" form.
 #. TRANS: Form legend.
 #: actions/editapplication.php:54 lib/applicationeditform.php:129
@@ -2730,21 +2611,21 @@ msgid "You must be logged in to create a group."
 msgstr ""
 
 #. TRANS: Form instructions for group edit form.
-#: actions/editgroup.php:161
+#: actions/editgroup.php:155
 msgid "Use this form to edit the group."
 msgstr ""
 
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: %s is the invalid alias.
-#: actions/editgroup.php:250 actions/newgroup.php:189
+#: actions/editgroup.php:244 actions/newgroup.php:189
 #, php-format
 msgid "Invalid alias: \"%s\""
 msgstr ""
 
 #. TRANS: Group edit form success message.
 #. TRANS: Edit list form success message.
-#: actions/editgroup.php:312 actions/editpeopletag.php:322
+#: actions/editgroup.php:306 actions/editpeopletag.php:326
 msgid "Options saved."
 msgstr ""
 
@@ -2765,58 +2646,58 @@ msgid "Edit list %s"
 msgstr ""
 
 #. TRANS: Error message displayed when trying to perform an action that requires a tagging user or ID.
-#: actions/editpeopletag.php:99
+#: actions/editpeopletag.php:103
 msgid "No tagger or ID."
 msgstr ""
 
 #. TRANS: Client error displayed when referring to non-local user.
-#: actions/editpeopletag.php:116
+#: actions/editpeopletag.php:120
 msgid "Not a local user."
 msgstr ""
 
 #. TRANS: Client error displayed when reting to edit a tag that was not self-created.
-#: actions/editpeopletag.php:122
+#: actions/editpeopletag.php:126
 msgid "You must be the creator of the tag to edit it."
 msgstr ""
 
 #. TRANS: Form instruction for edit list form.
-#: actions/editpeopletag.php:219
+#: actions/editpeopletag.php:223
 msgid "Use this form to edit the list."
 msgstr ""
 
 #. TRANS: Form validation error displayed if the form data for deleting a tag was incorrect.
-#: actions/editpeopletag.php:240
+#: actions/editpeopletag.php:244
 msgid "Delete aborted."
 msgstr ""
 
 #. TRANS: Text in confirmation dialog for deleting a tag.
-#: actions/editpeopletag.php:248
+#: actions/editpeopletag.php:252
 msgid ""
 "Deleting this tag will permanantly remove all its subscription and "
 "membership records. Do you still want to continue?"
 msgstr ""
 
 #. TRANS: Form validation error displayed if a given tag is invalid.
-#: actions/editpeopletag.php:254
+#: actions/editpeopletag.php:258
 msgid "Invalid tag."
 msgstr ""
 
 #. TRANS: Form validation error displayed if a given tag is already present.
 #. TRANS: %s is the already present tag.
-#: actions/editpeopletag.php:259
+#: actions/editpeopletag.php:263
 #, php-format
 msgid "You already have a tag named %s."
 msgstr ""
 
 #. TRANS: Text in confirmation dialog for setting a tag from public to private.
-#: actions/editpeopletag.php:276
+#: actions/editpeopletag.php:280
 msgid ""
 "Setting a public tag as private will permanently remove all the existing "
 "subscriptions to it. Do you still want to continue?"
 msgstr ""
 
-#. TRANS: TRANS: Server error displayed when updating a list fails.
-#: actions/editpeopletag.php:297
+#. TRANS: Server error displayed when updating a list fails.
+#: actions/editpeopletag.php:301
 msgid "Could not update list."
 msgstr ""
 
@@ -2973,7 +2854,7 @@ msgstr ""
 #. TRANS: Form validation error displayed when trying to register without a valid e-mail address.
 #. TRANS: Client error displayed trying to save site settings without a valid contact address.
 #: actions/emailsettings.php:394 actions/register.php:207
-#: actions/siteadminpanel.php:144
+#: actions/siteadminpanel.php:154
 msgid "Not a valid email address."
 msgstr ""
 
@@ -3074,8 +2955,8 @@ msgstr ""
 #. TRANS: Page title for first page of favorited notices.
 #. TRANS: Title for favourited notices section.
 #. TRANS: Menu item title in search group navigation panel.
-#: actions/favorited.php:65 lib/popularnoticesection.php:62
-#: lib/publicgroupnav.php:90
+#: actions/favorited.php:65 lib/popularnoticesection.php:65
+#: lib/publicgroupnav.php:95
 msgid "Popular notices"
 msgstr ""
 
@@ -3135,7 +3016,7 @@ msgstr ""
 #. TRANS: Title for featured users section.
 #. TRANS: Menu item title in search group navigation panel.
 #: actions/featured.php:69 lib/featureduserssection.php:96
-#: lib/publicgroupnav.php:84
+#: lib/publicgroupnav.php:88
 msgid "Featured users"
 msgstr ""
 
@@ -3173,48 +3054,6 @@ msgstr ""
 msgid "No uploaded attachments."
 msgstr ""
 
-#. TRANS: Client error displayed when subscribing to a remote profile and an unexpected response is received.
-#: actions/finishremotesubscribe.php:69
-msgid "Not expecting this response!"
-msgstr ""
-
-#. TRANS: Client error displayed when subscribing to a remote profile that does not exist.
-#: actions/finishremotesubscribe.php:81
-msgid "User being listened to does not exist."
-msgstr ""
-
-#. TRANS: Client error displayed when subscribing to a remote profile that is a local profile.
-#. TRANS: Client error displayed when using remote subscribe for a local entity.
-#: actions/finishremotesubscribe.php:89 actions/remotesubscribe.php:59
-msgid "You can use the local subscription!"
-msgstr ""
-
-#. TRANS: Client error displayed when subscribing to a remote profile that is blocked form subscribing to.
-#: actions/finishremotesubscribe.php:102
-msgid "That user has blocked you from subscribing."
-msgstr ""
-
-#. TRANS: Client error displayed when subscribing to a remote profile without providing an authorised token.
-#: actions/finishremotesubscribe.php:114
-msgid "You are not authorized."
-msgstr ""
-
-#. TRANS: Client error displayed when subscribing to a remote profile and conversion of the request token to access token fails.
-#: actions/finishremotesubscribe.php:118
-msgid "Could not convert request token to access token."
-msgstr ""
-
-#. TRANS: Client error displayed when subscribing to a remote profile fails because of an unsupported version of the OMB protocol.
-#: actions/finishremotesubscribe.php:124
-msgid "Remote service uses unknown version of OMB protocol."
-msgstr ""
-
-#. TRANS: Server error displayed when subscribing to a remote profile fails because the remote profile could not be updated.
-#. TRANS: Exception thrown when updating a remote profile fails in OAuth store.
-#: actions/finishremotesubscribe.php:145 lib/oauthstore.php:316
-msgid "Error updating remote profile."
-msgstr ""
-
 #. TRANS: Client error displayed when requesting a non-existent file.
 #: actions/getfile.php:77
 msgid "No such file."
@@ -3320,34 +3159,6 @@ msgstr ""
 msgid "No ID."
 msgstr ""
 
-#. TRANS: Client error displayed trying to change group design settings while not logged in.
-#: actions/groupdesignsettings.php:67
-msgid "You must be logged in to edit a group."
-msgstr ""
-
-#. TRANS: Title group design settings page.
-#: actions/groupdesignsettings.php:146
-msgid "Group design"
-msgstr ""
-
-#. TRANS: Instructions for group design settings page.
-#: actions/groupdesignsettings.php:157
-msgid ""
-"Customize the way your group looks with a background image and a colour "
-"palette of your choice."
-msgstr ""
-
-#. TRANS: Form validation error displayed when group design settings could not be updated because of an application issue.
-#: actions/groupdesignsettings.php:272
-msgid "Unable to update your design settings."
-msgstr ""
-
-#. TRANS: Form text to confirm saved group design settings.
-#. TRANS: Confirmation message on Profile design page when saving design settings has succeeded.
-#: actions/groupdesignsettings.php:317 actions/userdesignsettings.php:245
-msgid "Design preferences saved."
-msgstr ""
-
 #. TRANS: Title for group logo settings page.
 #. TRANS: Group logo form legend.
 #: actions/grouplogo.php:144 actions/grouplogo.php:199
@@ -3389,20 +3200,20 @@ msgstr ""
 
 #. TRANS: Title of the page showing group members.
 #. TRANS: %s is the name of the group.
-#: actions/groupmembers.php:104
+#: actions/groupmembers.php:69
 #, php-format
 msgid "%s group members"
 msgstr ""
 
 #. TRANS: Title of the page showing group members.
 #. TRANS: %1$s is the name of the group, %2$d is the page number of the members list.
-#: actions/groupmembers.php:109
+#: actions/groupmembers.php:74
 #, php-format
 msgid "%1$s group members, page %2$d"
 msgstr ""
 
 #. TRANS: Page notice for group members page.
-#: actions/groupmembers.php:125
+#: actions/groupmembers.php:90
 msgid "A list of the users in this group."
 msgstr ""
 
@@ -3537,8 +3348,8 @@ msgstr ""
 #: actions/imsettings.php:69
 #, php-format
 msgid ""
-"You can send and receive notices through instant messaging [instant messages]"
-"(%%doc.im%%). Configure your addresses and settings below."
+"You can send and receive notices through [instant messaging](%%doc.im%%). "
+"Configure your addresses and settings below."
 msgstr ""
 
 #. TRANS: Message given in the IM settings if IM is not enabled on the site.
@@ -3703,12 +3514,12 @@ msgid "Invalid email address: %s."
 msgstr ""
 
 #. TRANS: Page title when invitations have been sent.
-#: actions/invite.php:143
+#: actions/invite.php:145
 msgid "Invitations sent"
 msgstr ""
 
 #. TRANS: Page title when inviting potential users.
-#: actions/invite.php:146
+#: actions/invite.php:148
 msgid "Invite new users"
 msgstr ""
 
@@ -3716,7 +3527,7 @@ msgstr ""
 #. TRANS: is already subscribed to one or more users with the given e-mail address(es).
 #. TRANS: Plural form is based on the number of reported already subscribed e-mail addresses.
 #. TRANS: Followed by a bullet list.
-#: actions/invite.php:166
+#: actions/invite.php:169
 msgid "You are already subscribed to this user:"
 msgid_plural "You are already subscribed to these users:"
 msgstr[0] ""
@@ -3724,7 +3535,7 @@ msgstr[1] ""
 
 #. TRANS: Used as list item for already subscribed users (%1$s is nickname, %2$s is e-mail address).
 #. TRANS: Used as list item for already registered people (%1$s is nickname, %2$s is e-mail address).
-#: actions/invite.php:172 actions/invite.php:186
+#: actions/invite.php:175 actions/invite.php:189
 #, php-format
 msgctxt "INVITE"
 msgid "%1$s (%2$s)"
@@ -3733,7 +3544,7 @@ msgstr ""
 #. TRANS: Message displayed inviting users to use a StatusNet site while the invited user
 #. TRANS: already uses a this StatusNet site. Plural form is based on the number of
 #. TRANS: reported already present people. Followed by a bullet list.
-#: actions/invite.php:180
+#: actions/invite.php:183
 msgid "This person is already a user and you were automatically subscribed:"
 msgid_plural ""
 "These people are already users and you were automatically subscribed to them:"
@@ -3743,7 +3554,7 @@ msgstr[1] ""
 #. TRANS: Message displayed inviting users to use a StatusNet site. Plural form is
 #. TRANS: based on the number of invitations sent. Followed by a bullet list of
 #. TRANS: e-mail addresses to which invitations were sent.
-#: actions/invite.php:194
+#: actions/invite.php:197
 msgid "Invitation sent to the following person:"
 msgid_plural "Invitations sent to the following people:"
 msgstr[0] ""
@@ -3751,49 +3562,22 @@ msgstr[1] ""
 
 #. TRANS: Generic message displayed after sending out one or more invitations to
 #. TRANS: people to join a StatusNet site.
-#: actions/invite.php:204
+#: actions/invite.php:207
 msgid ""
 "You will be notified when your invitees accept the invitation and register "
 "on the site. Thanks for growing the community!"
 msgstr ""
 
 #. TRANS: Form instructions.
-#: actions/invite.php:217
+#: actions/invite.php:222
 msgid ""
 "Use this form to invite your friends and colleagues to use this service."
 msgstr ""
 
-#. TRANS: Field label for a list of e-mail addresses.
-#: actions/invite.php:244
-msgid "Email addresses"
-msgstr ""
-
-#. TRANS: Tooltip for field label for a list of e-mail addresses.
-#: actions/invite.php:247
-msgid "Addresses of friends to invite (one per line)."
-msgstr ""
-
-#. TRANS: Field label for a personal message to send to invitees.
-#: actions/invite.php:251
-msgid "Personal message"
-msgstr ""
-
-#. TRANS: Tooltip for field label for a personal message to send to invitees.
-#: actions/invite.php:254
-msgid "Optionally add a personal message to the invitation."
-msgstr ""
-
-#. TRANS: Send button for inviting friends
-#. TRANS: Button text for sending notice.
-#: actions/invite.php:258 lib/noticeform.php:302
-msgctxt "BUTTON"
-msgid "Send"
-msgstr ""
-
 #. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral
 #. TRANS: singular 3rd-person pronoun in English. %1$s is the inviting user, $2$s is
 #. TRANS: the StatusNet sitename.
-#: actions/invite.php:294
+#: actions/invite.php:275
 #, php-format
 msgid "%1$s has invited you to join them on %2$s"
 msgstr ""
@@ -3804,14 +3588,14 @@ msgid "You must be logged in to join a group."
 msgstr ""
 
 #. TRANS: Title for join group page after joining.
-#: actions/joingroup.php:145
+#: actions/joingroup.php:149
 #, php-format
 msgctxt "TITLE"
 msgid "%1$s joined group %2$s"
 msgstr ""
 
 #. TRANS: Exception thrown when there is an unknown error joining a group.
-#: actions/joingroup.php:158
+#: actions/joingroup.php:162
 msgid "Unknown error joining group."
 msgstr ""
 
@@ -3950,13 +3734,6 @@ msgstr ""
 msgid "Save license settings."
 msgstr ""
 
-#. TRANS: Client error displayed when trying to log in while already logged in.
-#. TRANS: Client error displayed trying to use "one time password login" when already logged in.
-#. TRANS: Client error displayed when trying to register while already logged in.
-#: actions/login.php:98 actions/otp.php:62 actions/register.php:136
-msgid "Already logged in."
-msgstr ""
-
 #. TRANS: Form validation error displayed when trying to log in with incorrect credentials.
 #: actions/login.php:127
 msgid "Incorrect username or password."
@@ -4084,7 +3861,8 @@ msgstr ""
 msgid "Could not create application."
 msgstr ""
 
-#: actions/newapplication.php:298
+#. TRANS: Form validation error messages displayed when uploading an invalid application logo.
+#: actions/newapplication.php:299
 msgid "Invalid image."
 msgstr ""
 
@@ -4094,7 +3872,7 @@ msgid "New group"
 msgstr ""
 
 #. TRANS: Client exception thrown when a user tries to create a group while banned.
-#: actions/newgroup.php:73 classes/User_group.php:491
+#: actions/newgroup.php:73 classes/User_group.php:545
 msgid "You are not allowed to create groups on this site."
 msgstr ""
 
@@ -4129,13 +3907,6 @@ msgstr ""
 msgid "No recipient specified."
 msgstr ""
 
-#. TRANS: Client error displayed trying to send a direct message to self.
-#. TRANS: Error text shown when trying to send a direct message to self.
-#: actions/newmessage.php:178 lib/command.php:632
-msgid ""
-"Don't send a message to yourself; just say it to yourself quietly instead."
-msgstr ""
-
 #. TRANS: Page title after sending a direct message.
 #: actions/newmessage.php:196
 msgid "Message sent"
@@ -4360,11 +4131,45 @@ msgstr ""
 
 #. TRANS: Server error displayed in oEmbed action when request specifies an unsupported data format.
 #. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:204 actions/oembed.php:224 lib/apiaction.php:1323
-#: lib/apiaction.php:1350 lib/apiaction.php:1485
+#: actions/oembed.php:204 actions/oembed.php:224 lib/apiaction.php:1293
+#: lib/apiaction.php:1320 lib/apiaction.php:1455
 msgid "Not a supported data format."
 msgstr ""
 
+#. TRANS: Page title for profile settings.
+#: actions/oldschoolsettings.php:58
+msgid "Old school UI settings"
+msgstr ""
+
+#. TRANS: Usage instructions for profile settings.
+#: actions/oldschoolsettings.php:69
+msgid "If you like it \"the old way\", you can set that here."
+msgstr ""
+
+#. TRANS: Confirmation shown when user profile settings are saved.
+#. TRANS: Message after successful saving of administrative settings.
+#: actions/oldschoolsettings.php:124 actions/profilesettings.php:466
+#: lib/adminpanelaction.php:138
+msgid "Settings saved."
+msgstr ""
+
+#: actions/oldschoolsettings.php:161
+msgid "Only stream mode (no conversations) in timelines"
+msgstr ""
+
+#: actions/oldschoolsettings.php:165
+msgid "Show conversation page as hierarchical trees"
+msgstr ""
+
+#: actions/oldschoolsettings.php:169
+msgid "Show nicknames (not full names) in timelines"
+msgstr ""
+
+#. TRANS: Button text to save a list.
+#: actions/oldschoolsettings.php:187 lib/peopletageditform.php:168
+msgid "Save"
+msgstr ""
+
 #. TRANS: ShortName in the OpenSearch interface when trying to find users.
 #: actions/opensearch.php:64
 msgid "People Search"
@@ -4375,6 +4180,12 @@ msgstr ""
 msgid "Notice Search"
 msgstr ""
 
+#. TRANS: Client error displayed trying to use "one time password login" when already logged in.
+#. TRANS: Client error displayed when trying to register while already logged in.
+#: actions/otp.php:62 actions/register.php:136
+msgid "Already logged in."
+msgstr ""
+
 #. TRANS: Client error displayed trying to use "one time password login" without specifying a user.
 #: actions/otp.php:70
 msgid "No user ID specified."
@@ -4459,7 +4270,7 @@ msgid "Confirm"
 msgstr ""
 
 #. TRANS: Field title on page where to change password.
-#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
+#. TRANS: Title for field label for password reset form where the password has to be typed again.
 #. TRANS: Field title on account registration page.
 #: actions/passwordsettings.php:121 actions/recoverpassword.php:264
 #: actions/register.php:452
@@ -4497,7 +4308,7 @@ msgstr ""
 #. TRANS: Server error displayed on page where to change password when password change
 #. TRANS: could not be made because of a server error.
 #. TRANS: Reset password form validation error message.
-#: actions/passwordsettings.php:201 actions/recoverpassword.php:422
+#: actions/passwordsettings.php:201 actions/recoverpassword.php:339
 msgid "Cannot save new password."
 msgstr ""
 
@@ -4518,269 +4329,230 @@ msgstr ""
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the directory that could not be read from.
-#: actions/pathsadminpanel.php:155
+#: actions/pathsadminpanel.php:154
 #, php-format
 msgid "Theme directory not readable: %s."
 msgstr ""
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the avatar directory that could not be written to.
-#: actions/pathsadminpanel.php:163
+#: actions/pathsadminpanel.php:162
 #, php-format
 msgid "Avatar directory not writable: %s."
 msgstr ""
 
-#. TRANS: Client error in Paths admin panel.
-#. TRANS: %s is the background directory that could not be written to.
-#: actions/pathsadminpanel.php:171
-#, php-format
-msgid "Background directory not writable: %s."
-msgstr ""
-
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the locales directory that could not be read from.
-#: actions/pathsadminpanel.php:181
+#: actions/pathsadminpanel.php:172
 #, php-format
 msgid "Locales directory not readable: %s."
 msgstr ""
 
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the SSL server URL that is too long.
-#: actions/pathsadminpanel.php:189
+#: actions/pathsadminpanel.php:180
 msgid "Invalid SSL server. The maximum length is 255 characters."
 msgstr ""
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#: actions/pathsadminpanel.php:235
+#: actions/pathsadminpanel.php:226
 msgid "Site"
 msgstr ""
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:241 actions/pathsadminpanel.php:284
-#: actions/pathsadminpanel.php:375 actions/pathsadminpanel.php:430
+#: actions/pathsadminpanel.php:232 actions/pathsadminpanel.php:275
+#: actions/pathsadminpanel.php:367
 msgid "Server"
 msgstr ""
 
 #. TRANS: Field title in Paths admin panel.
-#: actions/pathsadminpanel.php:243
+#: actions/pathsadminpanel.php:234
 msgid "Site's server hostname."
 msgstr ""
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:249 actions/pathsadminpanel.php:293
-#: actions/pathsadminpanel.php:384 actions/pathsadminpanel.php:439
+#: actions/pathsadminpanel.php:240 actions/pathsadminpanel.php:284
+#: actions/pathsadminpanel.php:376
 msgid "Path"
 msgstr ""
 
 #. TRANS: Field title in Paths admin panel.
-#: actions/pathsadminpanel.php:251
+#: actions/pathsadminpanel.php:242
 msgid "Site path."
 msgstr ""
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:257
+#: actions/pathsadminpanel.php:248
 msgid "Locale directory"
 msgstr ""
 
 #. TRANS: Field title in Paths admin panel.
-#: actions/pathsadminpanel.php:259
+#: actions/pathsadminpanel.php:250
 msgid "Directory path to locales."
 msgstr ""
 
 #. TRANS: Checkbox label in Paths admin panel.
-#: actions/pathsadminpanel.php:266
+#: actions/pathsadminpanel.php:257
 msgid "Fancy URLs"
 msgstr ""
 
 #. TRANS: Field title in Paths admin panel.
-#: actions/pathsadminpanel.php:269
+#: actions/pathsadminpanel.php:260
 msgid "Use fancy URLs (more readable and memorable)?"
 msgstr ""
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#: actions/pathsadminpanel.php:277
+#: actions/pathsadminpanel.php:268
 msgctxt "LEGEND"
 msgid "Theme"
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:286
+#: actions/pathsadminpanel.php:277
 msgid "Server for themes."
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:295
+#: actions/pathsadminpanel.php:286
 msgid "Web path to themes."
 msgstr ""
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:302 actions/pathsadminpanel.php:393
-#: actions/pathsadminpanel.php:448 actions/pathsadminpanel.php:500
+#: actions/pathsadminpanel.php:293 actions/pathsadminpanel.php:385
+#: actions/pathsadminpanel.php:437
 msgid "SSL server"
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:304
+#: actions/pathsadminpanel.php:295
 msgid "SSL server for themes (default: SSL server)."
 msgstr ""
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:311 actions/pathsadminpanel.php:402
-#: actions/pathsadminpanel.php:457
+#: actions/pathsadminpanel.php:302 actions/pathsadminpanel.php:394
 msgid "SSL path"
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:313
+#: actions/pathsadminpanel.php:304
 msgid "SSL path to themes (default: /theme/)."
 msgstr ""
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:320 actions/pathsadminpanel.php:411
-#: actions/pathsadminpanel.php:466
+#: actions/pathsadminpanel.php:311 actions/pathsadminpanel.php:403
 msgid "Directory"
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:322
+#: actions/pathsadminpanel.php:313
 msgid "Directory where themes are located."
 msgstr ""
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#: actions/pathsadminpanel.php:331
+#: actions/pathsadminpanel.php:322
 msgid "Avatars"
 msgstr ""
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:338
+#: actions/pathsadminpanel.php:329
 msgid "Avatar server"
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:340
+#: actions/pathsadminpanel.php:331
 msgid "Server for avatars."
 msgstr ""
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:347
+#: actions/pathsadminpanel.php:338
 msgid "Avatar path"
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:349
+#: actions/pathsadminpanel.php:340
 msgid "Web path to avatars."
 msgstr ""
 
 #. TRANS: Field label in Paths admin panel.
-#: actions/pathsadminpanel.php:356
+#: actions/pathsadminpanel.php:347
 msgid "Avatar directory"
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:358
+#: actions/pathsadminpanel.php:349
 msgid "Directory where avatars are located."
 msgstr ""
 
-#. TRANS: Fieldset legend in Paths admin panel.
-#: actions/pathsadminpanel.php:369
-msgid "Backgrounds"
-msgstr ""
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:377
-msgid "Server for backgrounds."
-msgstr ""
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:386
-msgid "Web path to backgrounds."
-msgstr ""
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:395
-msgid "Server for backgrounds on SSL pages."
-msgstr ""
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:404
-msgid "Web path to backgrounds on SSL pages."
-msgstr ""
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:413
-msgid "Directory where backgrounds are located."
-msgstr ""
-
 #. TRANS: Fieldset legens in Paths admin panel.
-#: actions/pathsadminpanel.php:424
+#: actions/pathsadminpanel.php:361
 msgid "Attachments"
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:432
+#: actions/pathsadminpanel.php:369
 msgid "Server for attachments."
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:441
+#: actions/pathsadminpanel.php:378
 msgid "Web path to attachments."
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:450
+#: actions/pathsadminpanel.php:387
 msgid "Server for attachments on SSL pages."
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:459
+#: actions/pathsadminpanel.php:396
 msgid "Web path to attachments on SSL pages."
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:468
+#: actions/pathsadminpanel.php:405
 msgid "Directory where attachments are located."
 msgstr ""
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#: actions/pathsadminpanel.php:477
+#: actions/pathsadminpanel.php:414
 msgctxt "LEGEND"
 msgid "SSL"
 msgstr ""
 
 #. TRANS: Drop down option in Paths admin panel (option for "When to use SSL").
 #. TRANS: Option in dropdown for snapshot method in admin panel for snapshots.
-#: actions/pathsadminpanel.php:482 actions/snapshotadminpanel.php:203
+#: actions/pathsadminpanel.php:419 actions/snapshotadminpanel.php:203
 msgid "Never"
 msgstr ""
 
 #. TRANS: Drop down option in Paths admin panel (option for "When to use SSL").
-#: actions/pathsadminpanel.php:484
+#: actions/pathsadminpanel.php:421
 msgid "Sometimes"
 msgstr ""
 
 #. TRANS: Drop down option in Paths admin panel (option for "When to use SSL").
-#: actions/pathsadminpanel.php:486
+#: actions/pathsadminpanel.php:423
 msgid "Always"
 msgstr ""
 
 #. TRANS: Drop down label in Paths admin panel.
-#: actions/pathsadminpanel.php:490
+#: actions/pathsadminpanel.php:427
 msgid "Use SSL"
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:492
+#: actions/pathsadminpanel.php:429
 msgid "When to use SSL."
 msgstr ""
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#: actions/pathsadminpanel.php:502
+#: actions/pathsadminpanel.php:439
 msgid "Server to direct SSL requests to."
 msgstr ""
 
 #. TRANS: Button title text to store form data in the Paths admin panel.
-#: actions/pathsadminpanel.php:519
-msgid "Save paths"
+#: actions/pathsadminpanel.php:456
+msgid "Save path settings."
 msgstr ""
 
 #. TRANS: Instructions for the "People search" page.
@@ -4823,28 +4595,28 @@ msgid ""
 msgstr ""
 
 #. TRANS: Client error displayed when a tagger is expected but not provided.
-#: actions/peopletagged.php:79 actions/peopletagsubscribers.php:79
-#: actions/showprofiletag.php:65
+#: actions/peopletagged.php:84 actions/peopletagsubscribers.php:84
+#: actions/showprofiletag.php:69
 msgid "No tagger."
 msgstr ""
 
 #. TRANS: Title for list of people listed by the user.
 #. TRANS: %1$s is a list, %2$s is a username.
-#: actions/peopletagged.php:108
+#: actions/peopletagged.php:113
 #, php-format
 msgid "People listed in %1$s by %2$s"
 msgstr ""
 
 #. TRANS: Title for list of people listed by the user.
 #. TRANS: %1$s is a list, %2$s is a username, %2$s is a page number.
-#: actions/peopletagged.php:113
+#: actions/peopletagged.php:118
 #, php-format
 msgid "People listed in %1$s by %2$s, page %3$d"
 msgstr ""
 
 #. TRANS: Addition in tag membership list for creator of a tag.
 #. TRANS: Addition in tag subscribers list for creator of a tag.
-#: actions/peopletagged.php:192 actions/peopletagsubscribers.php:192
+#: actions/peopletagged.php:197 actions/peopletagsubscribers.php:197
 msgid "Creator"
 msgstr ""
 
@@ -4878,46 +4650,46 @@ msgid "Lists by %1$s, page %2$d"
 msgstr ""
 
 #. TRANS: Client error displayed when trying view another user's private lists.
-#: actions/peopletagsbyuser.php:128
+#: actions/peopletagsbyuser.php:133
 msgid "You cannot view others' private lists"
 msgstr ""
 
 #. TRANS: Mode selector label.
-#: actions/peopletagsbyuser.php:154
+#: actions/peopletagsbyuser.php:159
 msgid "Mode"
 msgstr ""
 
 #. TRANS: Link text to show lists for user %s.
-#: actions/peopletagsbyuser.php:164
+#: actions/peopletagsbyuser.php:169
 #, php-format
 msgid "Lists for %s"
 msgstr ""
 
 #. TRANS: Fieldset legend.
 #. TRANS: Fieldset legend on gallery action page.
-#: actions/peopletagsbyuser.php:176 lib/galleryaction.php:138
+#: actions/peopletagsbyuser.php:181 lib/galleryaction.php:138
 msgid "Select tag to filter"
 msgstr ""
 
 #. TRANS: Checkbox title.
-#: actions/peopletagsbyuser.php:187
+#: actions/peopletagsbyuser.php:192
 msgid "Show private tags."
 msgstr ""
 
 #. TRANS: Checkbox label to show public tags.
-#: actions/peopletagsbyuser.php:189
+#: actions/peopletagsbyuser.php:194
 msgctxt "LABEL"
 msgid "Public"
 msgstr ""
 
 #. TRANS: Checkbox title.
-#: actions/peopletagsbyuser.php:191
+#: actions/peopletagsbyuser.php:196
 msgid "Show public tags."
 msgstr ""
 
 #. TRANS: Submit button text for tag filter form.
 #. TRANS: Submit button text on gallery action page.
-#: actions/peopletagsbyuser.php:194 lib/galleryaction.php:145
+#: actions/peopletagsbyuser.php:199 lib/galleryaction.php:145
 msgctxt "BUTTON"
 msgid "Go"
 msgstr ""
@@ -4925,20 +4697,20 @@ msgstr ""
 #. TRANS: Message displayed for anonymous users on page that displays lists by a user.
 #. TRANS: This message contains Markdown links in the form [description](links).
 #. TRANS: %s is a tagger nickname.
-#: actions/peopletagsbyuser.php:210
+#: actions/peopletagsbyuser.php:215
 #, php-format
 msgid ""
 "These are lists created by **%s**. Lists are how you sort similar people on %"
 "%%%site.name%%%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
 "blogging) service based on the Free Software [StatusNet](http://status.net/) "
 "tool. You can easily keep track of what they are doing by subscribing to the "
-"tag's timeline."
+"list's timeline."
 msgstr ""
 
 #. TRANS: Message displayed on page that displays lists by a user when there are none.
 #. TRANS: This message contains Markdown links in the form [description](links).
 #. TRANS: %s is a tagger nickname.
-#: actions/peopletagsbyuser.php:273
+#: actions/peopletagsbyuser.php:278
 #, php-format
 msgid "%s has not created any [lists](%%%%doc.lists%%%%) yet."
 msgstr ""
@@ -4958,34 +4730,34 @@ msgstr ""
 #. TRANS: Message displayed for anonymous users on page that displays lists for a user.
 #. TRANS: This message contains Markdown links in the form [description](links).
 #. TRANS: %s is a tagger nickname.
-#: actions/peopletagsforuser.php:108
+#: actions/peopletagsforuser.php:113
 #, php-format
 msgid ""
 "These are lists for **%s**. lists are how you sort similar people on %%%%"
 "site.name%%%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
 "blogging) service based on the Free Software [StatusNet](http://status.net/) "
 "tool. You can easily keep track of what they are doing by subscribing to the "
-"tag's timeline."
+"list's timeline."
 msgstr ""
 
 #. TRANS: Message displayed on page that displays lists a user was added to when there are none.
 #. TRANS: This message contains Markdown links in the form [description](links).
 #. TRANS: %s is a user nickname.
-#: actions/peopletagsforuser.php:144
+#: actions/peopletagsforuser.php:149
 #, php-format
 msgid "%s has not been [listed](%%%%doc.lists%%%%) by anyone yet."
 msgstr ""
 
 #. TRANS: Page title for list of list subscribers.
 #. TRANS: %1$s is a list, %2$s is a user nickname.
-#: actions/peopletagsubscribers.php:108
+#: actions/peopletagsubscribers.php:113
 #, php-format
 msgid "Subscribers to list %1$s by %2$s"
 msgstr ""
 
 #. TRANS: Page title for list of list subscribers.
 #. TRANS: %1$s is a list, %2$s is a user nickname, %3$d is a page number.
-#: actions/peopletagsubscribers.php:113
+#: actions/peopletagsubscribers.php:118
 #, php-format
 msgid "Subscribers to list %1$s by %2$s, page %3$d"
 msgstr ""
@@ -5007,7 +4779,7 @@ msgstr ""
 #. TRANS: Message displayed for anonymous users on page that displays lists subscribed to by a user.
 #. TRANS: This message contains Markdown links in the form [description](links).
 #. TRANS: %s is a profile nickname.
-#: actions/peopletagsubscriptions.php:110
+#: actions/peopletagsubscriptions.php:115
 #, php-format
 msgid ""
 "These are lists subscribed to by **%s**. Lists are how you sort similar "
@@ -5074,18 +4846,6 @@ msgid ""
 "All default plugins have been disabled from the site's configuration file."
 msgstr ""
 
-#. TRANS: Client error displayed if the notice posted has too many characters.
-#: actions/postnotice.php:96
-msgid "Invalid notice content."
-msgstr ""
-
-#. TRANS: Exception thrown if a notice's license is not compatible with the StatusNet site license.
-#. TRANS: %1$s is the notice license, %2$s is the StatusNet site's license.
-#: actions/postnotice.php:104
-#, php-format
-msgid "Notice license \"%1$s\" is not compatible with site license \"%2$s\"."
-msgstr ""
-
 #. TRANS: Client error displayed when trying to add an unindentified field to profile.
 #. TRANS: %s is a field name.
 #: actions/profilecompletion.php:109
@@ -5198,7 +4958,10 @@ msgid "Share my current location when posting notices"
 msgstr ""
 
 #. TRANS: Field label in form for profile settings.
+#. TRANS: Title for group tag cloud section.
+#. TRANS: %s is a group name.
 #: actions/profilesettings.php:159 lib/galleryaction.php:118
+#: lib/grouptagcloudsection.php:57
 msgid "Tags"
 msgstr ""
 
@@ -5232,7 +4995,7 @@ msgstr ""
 #. TRANS: Checkbox label in form for profile settings.
 #: actions/profilesettings.php:187
 msgid ""
-"Automatically subscribe to whoever subscribes to me (best for non-humans)."
+"Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr ""
 
 #. TRANS: Dropdown field label on profile settings, for what policies to apply when someone else tries to subscribe to your updates.
@@ -5274,7 +5037,7 @@ msgstr[1] ""
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Client error displayed trying to save site settings without a timezone.
-#: actions/profilesettings.php:289 actions/siteadminpanel.php:152
+#: actions/profilesettings.php:289 actions/siteadminpanel.php:175
 msgid "Timezone not selected."
 msgstr ""
 
@@ -5311,12 +5074,6 @@ msgstr ""
 msgid "Could not save tags."
 msgstr ""
 
-#. TRANS: Confirmation shown when user profile settings are saved.
-#. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:466 lib/adminpanelaction.php:138
-msgid "Settings saved."
-msgstr ""
-
 #. TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
 #. TRANS: Page title for page where a user account can be restored from backup.
 #: actions/profilesettings.php:513 actions/restoreaccount.php:60
@@ -5331,40 +5088,45 @@ msgid "Beyond the page limit (%s)."
 msgstr ""
 
 #. TRANS: Server error displayed when a public timeline cannot be retrieved.
-#: actions/public.php:98
-msgid "Could not retrieve public stream."
+#: actions/public.php:104
+msgid "Could not retrieve public timeline."
 msgstr ""
 
 #. TRANS: Title for all public timeline pages but the first.
 #. TRANS: %d is the page number.
-#: actions/public.php:136
+#: actions/public.php:142
 #, php-format
 msgid "Public timeline, page %d"
 msgstr ""
 
 #. TRANS: Title for the first public timeline page.
 #. TRANS: Menu item title in search group navigation panel.
-#: actions/public.php:139 lib/publicgroupnav.php:68
+#: actions/public.php:145 lib/publicgroupnav.php:69
 msgid "Public timeline"
 msgstr ""
 
 #. TRANS: Link description for public timeline feed.
-#: actions/public.php:167
-msgid "Public Stream Feed (RSS 1.0)"
+#: actions/public.php:180
+msgid "Public Timeline Feed (Activity Streams JSON)"
 msgstr ""
 
 #. TRANS: Link description for public timeline feed.
-#: actions/public.php:172
-msgid "Public Stream Feed (RSS 2.0)"
+#: actions/public.php:183
+msgid "Public Timeline Feed (RSS 1.0)"
 msgstr ""
 
 #. TRANS: Link description for public timeline feed.
-#: actions/public.php:177
-msgid "Public Stream Feed (Atom)"
+#: actions/public.php:188
+msgid "Public Timeline Feed (RSS 2.0)"
+msgstr ""
+
+#. TRANS: Link description for public timeline feed.
+#: actions/public.php:193
+msgid "Public Timeline Feed (Atom)"
 msgstr ""
 
 #. TRANS: Text displayed for public feed when there are no public notices.
-#: actions/public.php:183
+#: actions/public.php:199
 #, php-format
 msgid ""
 "This is the public timeline for %%site.name%% but no one has posted anything "
@@ -5372,12 +5134,12 @@ msgid ""
 msgstr ""
 
 #. TRANS: Additional text displayed for public feed when there are no public notices for a logged in user.
-#: actions/public.php:187
+#: actions/public.php:203
 msgid "Be the first to post!"
 msgstr ""
 
 #. TRANS: Additional text displayed for public feed when there are no public notices for a not logged in user.
-#: actions/public.php:192
+#: actions/public.php:208
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to post!"
@@ -5385,7 +5147,7 @@ msgstr ""
 
 #. TRANS: Message for not logged in users at an invite-only site trying to view the public feed of notices.
 #. TRANS: This message contains Markdown links. Please mind the formatting.
-#: actions/public.php:240
+#: actions/public.php:280
 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -5396,7 +5158,7 @@ msgstr ""
 
 #. TRANS: Message for not logged in users at a closed site trying to view the public feed of notices.
 #. TRANS: This message contains Markdown links. Please mind the formatting.
-#: actions/public.php:247
+#: actions/public.php:287
 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -5404,52 +5166,6 @@ msgid ""
 "tool."
 msgstr ""
 
-#. TRANS: Title for page with public list cloud.
-#: actions/publicpeopletagcloud.php:57
-msgid "Public list cloud"
-msgstr ""
-
-#. TRANS: Page notice for page with public list cloud.
-#. TRANS: %s is a StatusNet sitename.
-#: actions/publicpeopletagcloud.php:65
-#, php-format
-msgid "These are largest lists on %s"
-msgstr ""
-
-#. TRANS: Empty list message on page with public list cloud.
-#. TRANS: This message contains Markdown links in the form [description](link).
-#: actions/publicpeopletagcloud.php:73
-#, php-format
-msgid "No one has [listed](%%doc.tags%%) anyone yet."
-msgstr ""
-
-#. TRANS: Additional empty list message on page with public list cloud for logged in users.
-#: actions/publicpeopletagcloud.php:77
-msgid "Be the first to list someone!"
-msgstr ""
-
-#. TRANS: Additional empty list message on page with public list cloud for anonymous users.
-#. TRANS: This message contains Markdown links in the form [description](link).
-#: actions/publicpeopletagcloud.php:82
-#, php-format
-msgid ""
-"Why not [register an account](%%action.register%%) and be the first to list "
-"someone!"
-msgstr ""
-
-#. TRANS: DT element on on page with public list cloud.
-#: actions/publicpeopletagcloud.php:136
-msgid "List cloud"
-msgstr ""
-
-#. TRANS: Link title for number of listed people. %d is the number of listed people.
-#: actions/publicpeopletagcloud.php:177
-#, php-format
-msgid "1 person listed"
-msgid_plural "%d people listed"
-msgstr[0] ""
-msgstr[1] ""
-
 #. TRANS: Public RSS feed description. %s is the StatusNet site name.
 #: actions/publicrss.php:106
 #, php-format
@@ -5579,7 +5295,7 @@ msgstr ""
 
 #. TRANS: Title for password recovery page in email sent mode.
 #. TRANS: Subject for password recovery e-mail.
-#: actions/recoverpassword.php:227 actions/recoverpassword.php:370
+#: actions/recoverpassword.php:227 classes/User.php:1146
 msgid "Password recovery requested"
 msgstr ""
 
@@ -5594,62 +5310,46 @@ msgid "6 or more characters, and do not forget it!"
 msgstr ""
 
 #. TRANS: Button text for password reset form.
-#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
-#: actions/recoverpassword.php:268 lib/designform.php:140
+#: actions/recoverpassword.php:268
 msgctxt "BUTTON"
 msgid "Reset"
 msgstr ""
 
 #. TRANS: Form instructions for password recovery form.
-#: actions/recoverpassword.php:278
+#: actions/recoverpassword.php:279
 msgid "Enter a nickname or email address."
 msgstr ""
 
-#. TRANS: Information on password recovery form if no known username or e-mail address was specified.
-#: actions/recoverpassword.php:313
-msgid "No user with that email address or username."
-msgstr ""
-
-#. TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.
-#: actions/recoverpassword.php:331
-msgid "No registered email address for that user."
-msgstr ""
-
-#. TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.
-#: actions/recoverpassword.php:346
-msgid "Error saving address confirmation."
-msgstr ""
-
 #. TRANS: User notification after an e-mail with instructions was sent from the password recovery form.
-#: actions/recoverpassword.php:374
+#: actions/recoverpassword.php:287
 msgid ""
 "Instructions for recovering your password have been sent to the email "
 "address registered to your account."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to reset as password without providing a user.
-#: actions/recoverpassword.php:395
+#: actions/recoverpassword.php:312
 msgid "Unexpected password reset."
 msgstr ""
 
 #. TRANS: Reset password form validation error message.
-#: actions/recoverpassword.php:404
+#: actions/recoverpassword.php:321
 msgid "Password must be 6 characters or more."
 msgstr ""
 
 #. TRANS: Reset password form validation error message.
-#: actions/recoverpassword.php:409
+#: actions/recoverpassword.php:326
 msgid "Password and confirmation do not match."
 msgstr ""
 
 #. TRANS: Server error displayed when something does wrong with the user object during password reset.
 #. TRANS: Server error displayed when saving fails during user registration.
-#: actions/recoverpassword.php:430 actions/register.php:263
+#: actions/recoverpassword.php:347 actions/register.php:263
 msgid "Error setting user."
 msgstr ""
 
 #. TRANS: Success message for user after password reset.
-#: actions/recoverpassword.php:438
+#: actions/recoverpassword.php:355
 msgid "New password successfully saved. You are now logged in."
 msgstr ""
 
@@ -5804,92 +5504,16 @@ msgid ""
 "to confirm your email address.)"
 msgstr ""
 
-#. TRANS: Page notice for remote subscribe. This message contains Markdown links.
-#. TRANS: Ensure to keep the correct markup of [link description](link).
-#: actions/remotesubscribe.php:101
-#, 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 ""
-
-#. TRANS: Page title for Remote subscribe.
-#: actions/remotesubscribe.php:116
-msgid "Remote subscribe"
-msgstr ""
-
-#. TRANS: Field legend on page for remote subscribe.
-#: actions/remotesubscribe.php:129
-msgid "Subscribe to a remote user"
-msgstr ""
-
-#. TRANS: Field label on page for remote subscribe.
-#: actions/remotesubscribe.php:135
-msgid "User nickname"
-msgstr ""
-
-#. TRANS: Field title on page for remote subscribe.
-#: actions/remotesubscribe.php:137
-msgid "Nickname of the user you want to follow."
-msgstr ""
-
-#. TRANS: Field label on page for remote subscribe.
-#: actions/remotesubscribe.php:141
-msgid "Profile URL"
-msgstr ""
-
-#. TRANS: Field title on page for remote subscribe.
-#: actions/remotesubscribe.php:143
-msgid "URL of your profile on another compatible microblogging service."
-msgstr ""
-
-#. TRANS: Button text on page for remote subscribe.
-#. TRANS: Link text for link that will subscribe to a remote profile.
-#. TRANS: Button text to subscribe to a user.
-#. TRANS: Button text for subscribing to a list.
-#: actions/remotesubscribe.php:147 lib/accountprofileblock.php:308
-#: lib/subscribeform.php:130 lib/subscribepeopletagform.php:106
-msgctxt "BUTTON"
-msgid "Subscribe"
-msgstr ""
-
-#. TRANS: Form validation error on page for remote subscribe when an invalid profile URL was provided.
-#: actions/remotesubscribe.php:172
-msgid "Invalid profile URL (bad format)."
-msgstr ""
-
-#. TRANS: Form validation error on page for remote subscribe when no the provided profile URL
-#. TRANS: does not contain expected data.
-#: actions/remotesubscribe.php:183
-msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
-msgstr ""
-
-#. TRANS: Form validation error on page for remote subscribe.
-#: actions/remotesubscribe.php:192
-msgid "That is a local profile! Login to subscribe."
-msgstr ""
-
-#. TRANS: Form validation error on page for remote subscribe when the remote service is not providing a request token.
-#: actions/remotesubscribe.php:200
-msgid "Could not get a request token."
-msgstr ""
-
-#. TRANS: Client error displayed when trying to (un)list an OMB 0.1 remote profile.
-#: actions/removepeopletag.php:122
-msgid "You cannot (un)list an OMB 0.1 remote profile with this action."
-msgstr ""
-
 #. TRANS: Client error displayed when an unknown error occurs while delisting a user.
 #. TRANS: %s is a username.
-#: actions/removepeopletag.php:152
+#: actions/removepeopletag.php:140
 #, php-format
 msgid "There was an unexpected error while delisting %s."
 msgstr ""
 
 #. TRANS: Client error displayed when an unknown error occurs while listing a user.
 #. TRANS: %s is a profile URL.
-#: actions/removepeopletag.php:157
+#: actions/removepeopletag.php:145
 #, php-format
 msgid ""
 "There was a problem listing %s. The remote server is probably not responding "
@@ -5897,7 +5521,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: Title after removing a user from a list.
-#: actions/removepeopletag.php:167
+#: actions/removepeopletag.php:155
 msgid "Unlisted"
 msgstr ""
 
@@ -5914,7 +5538,7 @@ msgstr ""
 
 #. TRANS: Title after repeating a notice.
 #. TRANS: Repeat form status in notice list when a notice has been repeated.
-#: actions/repeat.php:102 lib/noticelistitem.php:676
+#: actions/repeat.php:102 lib/noticelistitem.php:703
 msgid "Repeated"
 msgstr ""
 
@@ -5928,7 +5552,7 @@ msgstr ""
 #. TRANS: RSS reply feed title. %s is a user nickname.
 #. TRANS: Menu item title in personal group navigation menu.
 #. TRANS: %s is a username.
-#: actions/replies.php:126 actions/repliesrss.php:68
+#: actions/replies.php:129 actions/repliesrss.php:68
 #: lib/personalgroupnav.php:93
 #, php-format
 msgid "Replies to %s"
@@ -5936,35 +5560,42 @@ msgstr ""
 
 #. TRANS: Title for all but the first page of replies for a user.
 #. TRANS: %1$s is a user nickname, %2$d is a page number.
-#: actions/replies.php:130
+#: actions/replies.php:133
 #, php-format
 msgid "Replies to %1$s, page %2$d"
 msgstr ""
 
 #. TRANS: Link for feed with replies for a user.
 #. TRANS: %s is a user nickname.
-#: actions/replies.php:148
+#: actions/replies.php:153
+#, php-format
+msgid "Replies feed for %s (Activity Streams JSON)"
+msgstr ""
+
+#. TRANS: Link for feed with replies for a user.
+#. TRANS: %s is a user nickname.
+#: actions/replies.php:160
 #, php-format
 msgid "Replies feed for %s (RSS 1.0)"
 msgstr ""
 
 #. TRANS: Link for feed with replies for a user.
 #. TRANS: %s is a user nickname.
-#: actions/replies.php:157
+#: actions/replies.php:169
 #, php-format
 msgid "Replies feed for %s (RSS 2.0)"
 msgstr ""
 
 #. TRANS: Link for feed with replies for a user.
 #. TRANS: %s is a user nickname.
-#: actions/replies.php:166
+#: actions/replies.php:178
 #, php-format
 msgid "Replies feed for %s (Atom)"
 msgstr ""
 
 #. TRANS: Empty list message for page with replies for a user.
 #. TRANS: %1$s and %s$s are the user nickname.
-#: actions/replies.php:195
+#: actions/replies.php:207
 #, php-format
 msgid ""
 "This is the timeline showing replies to %1$s but %2$s hasn't received a "
@@ -5973,7 +5604,7 @@ msgstr ""
 
 #. TRANS: Empty list message for page with replies for a user for the logged in user.
 #. TRANS: This message contains a Markdown link in the form [link text](link).
-#: actions/replies.php:204
+#: actions/replies.php:216
 #, php-format
 msgid ""
 "You can engage other users in a conversation, subscribe to more people or "
@@ -5982,7 +5613,7 @@ msgstr ""
 
 #. TRANS: Empty list message for page with replies for a user for all logged in users but the user themselves.
 #. TRANS: %1$s, %2$s and %3$s are a user nickname. This message contains a Markdown link in the form [link text](link).
-#: actions/replies.php:208
+#: actions/replies.php:220
 #, php-format
 msgid ""
 "You can try to [nudge %1$s](../%2$s) or [post something to them](%%%%action."
@@ -6072,7 +5703,7 @@ msgstr ""
 #. TRANS: Form instructions for feed restore.
 #: actions/restoreaccount.php:342
 msgid ""
-"You can upload a backed-up stream in <a href=\"http://activitystrea.ms/"
+"You can upload a backed-up timeline in <a href=\"http://activitystrea.ms/"
 "\">Activity Streams</a> format."
 msgstr ""
 
@@ -6209,15 +5840,40 @@ msgstr ""
 msgid "Application info"
 msgstr ""
 
+#. TRANS: Field label on application page.
+#: actions/showapplication.php:257
+msgid "Consumer key"
+msgstr ""
+
+#. TRANS: Field label on application page.
+#: actions/showapplication.php:260
+msgid "Consumer secret"
+msgstr ""
+
+#. TRANS: Field label on application page.
+#: actions/showapplication.php:263
+msgid "Request token URL"
+msgstr ""
+
+#. TRANS: Field label on application page.
+#: actions/showapplication.php:266
+msgid "Access token URL"
+msgstr ""
+
+#. TRANS: Field label on application page.
+#: actions/showapplication.php:269
+msgid "Authorize URL"
+msgstr ""
+
 #. TRANS: Note on the OAuth application page about signature support.
-#: actions/showapplication.php:272
+#: actions/showapplication.php:275
 msgid ""
 "Note: HMAC-SHA1 signatures are supported. The plaintext signature method is "
 "not supported."
 msgstr ""
 
 #. TRANS: Text in confirmation dialog to reset consumer key and secret for an OAuth application.
-#: actions/showapplication.php:293
+#: actions/showapplication.php:296
 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr ""
 
@@ -6234,25 +5890,31 @@ msgid "Could not retrieve favorite notices."
 msgstr ""
 
 #. TRANS: Feed link text. %s is a username.
-#: actions/showfavorites.php:172
+#: actions/showfavorites.php:174
 #, php-format
-msgid "Feed for favorites of %s (RSS 1.0)"
+msgid "Feed for favorites of %s (Activity Streams JSON)"
 msgstr ""
 
 #. TRANS: Feed link text. %s is a username.
 #: actions/showfavorites.php:180
 #, php-format
-msgid "Feed for favorites of %s (RSS 2.0)"
+msgid "Feed for favorites of %s (RSS 1.0)"
 msgstr ""
 
 #. TRANS: Feed link text. %s is a username.
 #: actions/showfavorites.php:188
 #, php-format
+msgid "Feed for favorites of %s (RSS 2.0)"
+msgstr ""
+
+#. TRANS: Feed link text. %s is a username.
+#: actions/showfavorites.php:196
+#, php-format
 msgid "Feed for favorites of %s (Atom)"
 msgstr ""
 
 #. TRANS: Text displayed instead of favourite notices for the current logged in user that has no favourites.
-#: actions/showfavorites.php:198
+#: actions/showfavorites.php:206
 msgid ""
 "You haven't chosen any favorite notices yet. Click the fave button on "
 "notices you like to bookmark them for later or shed a spotlight on them."
@@ -6260,7 +5922,7 @@ msgstr ""
 
 #. TRANS: Text displayed instead of favourite notices for a user that has no favourites while logged in.
 #. TRANS: %s is a username.
-#: actions/showfavorites.php:202
+#: actions/showfavorites.php:210
 #, php-format
 msgid ""
 "%s hasn't added any favorite notices yet. Post something interesting they "
@@ -6270,7 +5932,7 @@ msgstr ""
 #. TRANS: Text displayed instead of favourite notices for a user that has no favourites while not logged in.
 #. TRANS: %s is a username, %%%%action.register%%%% is a link to the user registration page.
 #. TRANS: (link text)[link] is a Mark Down link.
-#: actions/showfavorites.php:209
+#: actions/showfavorites.php:217
 #, php-format
 msgid ""
 "%s hasn't added any favorite notices yet. Why not [register an account](%%%%"
@@ -6279,95 +5941,58 @@ msgid ""
 msgstr ""
 
 #. TRANS: Page notice for show favourites page.
-#: actions/showfavorites.php:240
+#: actions/showfavorites.php:248
 msgid "This is a way to share what you like."
 msgstr ""
 
 #. TRANS: Page title for first group page. %s is a group name.
-#: actions/showgroup.php:77
+#: actions/showgroup.php:75
 #, php-format
 msgid "%s group"
 msgstr ""
 
 #. TRANS: Page title for any but first group page.
 #. TRANS: %1$s is a group name, $2$s is a page number.
-#: actions/showgroup.php:81
+#: actions/showgroup.php:79
 #, php-format
 msgid "%1$s group, page %2$d"
 msgstr ""
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:227
+#: actions/showgroup.php:181
+#, php-format
+msgid "Notice feed for %s group (Activity Streams JSON)"
+msgstr ""
+
+#. TRANS: Tooltip for feed link. %s is a group nickname.
+#: actions/showgroup.php:187
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
 msgstr ""
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:234
+#: actions/showgroup.php:194
 #, php-format
 msgid "Notice feed for %s group (RSS 2.0)"
 msgstr ""
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:241
+#: actions/showgroup.php:201
 #, php-format
 msgid "Notice feed for %s group (Atom)"
 msgstr ""
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:247
+#: actions/showgroup.php:207
 #, php-format
 msgid "FOAF for %s group"
 msgstr ""
 
-#. TRANS: Header for mini list of group members on a group page (h2).
-#: actions/showgroup.php:284
-msgid "Members"
-msgstr ""
-
-#. TRANS: Description for mini list of group members on a group page when the group has no members.
-#. TRANS: Content of "Listed" page if there are no listed users.
-#. TRANS: Content of "People following tag x" if there are no subscribed users.
-#. TRANS: Empty list message for tags.
-#. TRANS: Text for user subscription statistics if the user has no subscriptions.
-#. TRANS: Text for user subscriber statistics if user has no subscribers.
-#. TRANS: Text for user user group membership statistics if user is not a member of any group.
-#. TRANS: Default content for section/sidebar widget.
-#: actions/showgroup.php:290 actions/showprofiletag.php:300
-#: actions/showprofiletag.php:338 lib/peopletags.php:166
-#: lib/profileaction.php:140 lib/profileaction.php:172
-#: lib/profileaction.php:270 lib/section.php:117
-msgid "(None)"
-msgstr ""
-
-#. TRANS: Link to all group members from mini list of group members if group has more than n members.
-#: actions/showgroup.php:299
-msgid "All members"
-msgstr ""
-
-#. TRANS: Header for group statistics on a group page (h2).
-#. TRANS: H2 text for user statistics.
-#: actions/showgroup.php:330 lib/profileaction.php:196
-msgid "Statistics"
-msgstr ""
-
-#. TRANS: Label for group creation date.
-#: actions/showgroup.php:335
-msgctxt "LABEL"
-msgid "Created"
-msgstr ""
-
-#. TRANS: Label for member count in statistics on group page.
-#: actions/showgroup.php:340
-msgctxt "LABEL"
-msgid "Members"
-msgstr ""
-
 #. TRANS: Notice on group pages for anonymous users for StatusNet sites that accept new registrations.
-#. TRANS: **%s** is the group alias, %%%%site.name%%%% is the site name,
+#. TRANS: %s is the group name, %%%%site.name%%%% is the site name,
 #. TRANS: %%%%action.register%%%% is the URL for registration, %%%%doc.help%%%% is a URL to help.
 #. TRANS: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
-#: actions/showgroup.php:355
+#: actions/showgroup.php:218
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -6378,21 +6003,15 @@ msgid ""
 msgstr ""
 
 #. TRANS: Notice on group pages for anonymous users for StatusNet sites that accept no new registrations.
-#. TRANS: **%s** is the group alias, %%%%site.name%%%% is the site name,
+#. TRANS: %s is the group name, %%%%site.name%%%% is the site name,
 #. TRANS: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
-#: actions/showgroup.php:365
+#: actions/showgroup.php:227
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
 "wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
 "[StatusNet](http://status.net/) tool. Its members share short messages about "
-"their life and interests. "
-msgstr ""
-
-#. TRANS: Title for list of group administrators on a group page.
-#: actions/showgroup.php:406
-msgctxt "TITLE"
-msgid "Admins"
+"their life and interests."
 msgstr ""
 
 #. TRANS: Client error displayed requesting a single message that does not exist.
@@ -6431,56 +6050,56 @@ msgstr ""
 
 #. TRANS: Title for private list timeline.
 #. TRANS: %1$s is a list, %2$s is a page number.
-#: actions/showprofiletag.php:125
+#: actions/showprofiletag.php:129
 #, php-format
 msgid "Private timeline for %1$s list by you, page %2$d"
 msgstr ""
 
 #. TRANS: Title for public list timeline where the viewer is the tagger.
 #. TRANS: %1$s is a list, %2$s is a page number.
-#: actions/showprofiletag.php:133
+#: actions/showprofiletag.php:137
 #, php-format
 msgid "Timeline for %1$s list by you, page %2$d"
 msgstr ""
 
 #. TRANS: Title for private list timeline.
 #. TRANS: %1$s is a list, %2$s is the tagger's nickname, %3$d is a page number.
-#: actions/showprofiletag.php:139
+#: actions/showprofiletag.php:143
 #, php-format
 msgid "Timeline for %1$s list by %2$s, page %3$d"
 msgstr ""
 
 #. TRANS: Title for private list timeline.
 #. TRANS: %s is a list.
-#: actions/showprofiletag.php:148
+#: actions/showprofiletag.php:152
 #, php-format
 msgid "Private timeline of %s list by you"
 msgstr ""
 
 #. TRANS: Title for public list timeline where the viewer is the tagger.
 #. TRANS: %s is a list.
-#: actions/showprofiletag.php:156
+#: actions/showprofiletag.php:160
 #, php-format
 msgid "Timeline for %s list by you"
 msgstr ""
 
 #. TRANS: Title for private list timeline.
 #. TRANS: %1$s is a list, %2$s is the tagger's nickname.
-#: actions/showprofiletag.php:162
+#: actions/showprofiletag.php:166
 #, php-format
 msgid "Timeline for %1$s list by %2$s"
 msgstr ""
 
 #. TRANS: Feed title.
 #. TRANS: %1$s is a list, %2$s is tagger's nickname.
-#: actions/showprofiletag.php:193
+#: actions/showprofiletag.php:208
 #, php-format
 msgid "Feed for %1$s list by %2$s (Atom)"
 msgstr ""
 
 #. TRANS: Empty list message for list timeline.
 #. TRANS: %1$s is a list, %2$s is a tagger's nickname.
-#: actions/showprofiletag.php:210
+#: actions/showprofiletag.php:225
 #, php-format
 msgid ""
 "This is the timeline for %1$s list by %2$s but no one has posted anything "
@@ -6488,13 +6107,13 @@ msgid ""
 msgstr ""
 
 #. TRANS: Additional empty list message for list timeline for currently logged in user tagged tags.
-#: actions/showprofiletag.php:218
+#: actions/showprofiletag.php:233
 msgid "Try tagging more people."
 msgstr ""
 
 #. TRANS: Additional empty list message for list timeline.
 #. TRANS: This message contains Markdown links in the form [description](link).
-#: actions/showprofiletag.php:223
+#: actions/showprofiletag.php:238
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and start following "
@@ -6502,109 +6121,126 @@ msgid ""
 msgstr ""
 
 #. TRANS: Header on show list page.
-#: actions/showprofiletag.php:291
+#. TRANS: Link description for link to list of users tagged with a tag (so part of a list).
+#: actions/showprofiletag.php:306 lib/peopletaglist.php:173
 msgid "Listed"
 msgstr ""
 
+#. TRANS: Content of "Listed" page if there are no listed users.
+#. TRANS: Content of "People following tag x" if there are no subscribed users.
+#. TRANS: Description for mini list of group members on a group page when the group has no members.
+#. TRANS: Empty list message for tags.
+#. TRANS: Text for user subscription statistics if the user has no subscriptions.
+#. TRANS: Text for user subscriber statistics if user has no subscribers.
+#. TRANS: Text for user user group membership statistics if user is not a member of any group.
+#. TRANS: Default content for section/sidebar widget.
+#: actions/showprofiletag.php:315 actions/showprofiletag.php:353
+#: lib/groupaction.php:163 lib/groupaction.php:256 lib/peopletags.php:166
+#: lib/profileaction.php:147 lib/profileaction.php:179
+#: lib/profileaction.php:277 lib/section.php:117
+msgid "(None)"
+msgstr ""
+
 #. TRANS: Link for more "People in list x by a user"
 #. TRANS: if there are more than the mini list's maximum.
-#: actions/showprofiletag.php:312
+#: actions/showprofiletag.php:327
 msgid "Show all"
 msgstr ""
 
 #. TRANS: Header for tag subscribers.
 #. TRANS: Link description for link to list of users subscribed to a tag.
-#: actions/showprofiletag.php:329 lib/peopletaglist.php:183
+#: actions/showprofiletag.php:344 lib/peopletaglist.php:183
 msgid "Subscribers"
 msgstr ""
 
-#. TRANS: Link for more "People following tag x"
-#. TRANS: if there are more than the mini list's maximum.
-#: actions/showprofiletag.php:350
-msgid "All subscribers"
-msgstr ""
-
-#. TRANS: Page title showing tagged notices in one user's stream.
+#. TRANS: Page title showing tagged notices in one user's timeline.
 #. TRANS: %1$s is the username, %2$s is the hash tag.
-#: actions/showstream.php:70
+#: actions/showstream.php:89
 #, php-format
 msgid "Notices by %1$s tagged %2$s"
 msgstr ""
 
-#. TRANS: Page title showing tagged notices in one user's stream.
+#. TRANS: Page title showing tagged notices in one user's timeline.
 #. TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number.
-#: actions/showstream.php:74
+#: actions/showstream.php:93
 #, php-format
 msgid "Notices by %1$s tagged %2$s, page %3$d"
 msgstr ""
 
-#. TRANS: Extended page title showing tagged notices in one user's stream.
+#. TRANS: Extended page title showing tagged notices in one user's timeline.
 #. TRANS: %1$s is the username, %2$d is the page number.
-#: actions/showstream.php:82
+#: actions/showstream.php:101
 #, php-format
 msgid "Notices by %1$s, page %2$d"
 msgstr ""
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %1$s is a user nickname, %2$s is a hashtag.
-#: actions/showstream.php:126
+#: actions/showstream.php:142
 #, php-format
 msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
 msgstr ""
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %s is a user nickname.
-#: actions/showstream.php:135
+#: actions/showstream.php:153
+#, php-format
+msgid "Notice feed for %s (Activity Streams JSON)"
+msgstr ""
+
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#: actions/showstream.php:160
 #, php-format
 msgid "Notice feed for %s (RSS 1.0)"
 msgstr ""
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %s is a user nickname.
-#: actions/showstream.php:144
+#: actions/showstream.php:169
 #, php-format
 msgid "Notice feed for %s (RSS 2.0)"
 msgstr ""
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %s is a user nickname.
-#: actions/showstream.php:153
+#: actions/showstream.php:178
 #, php-format
 msgid "Notice feed for %s (Atom)"
 msgstr ""
 
 #. TRANS: Title for link to notice feed. FOAF stands for Friend of a Friend.
 #. TRANS: More information at http://www.foaf-project.org. %s is a user nickname.
-#: actions/showstream.php:160
+#: actions/showstream.php:185
 #, php-format
 msgid "FOAF for %s"
 msgstr ""
 
-#. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
-#: actions/showstream.php:200
+#. TRANS: First sentence of empty list message for a timeline. $1%s is a user nickname.
+#: actions/showstream.php:225
 #, php-format
 msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
 msgstr ""
 
 #. TRANS: Second sentence of empty list message for a stream for the user themselves.
-#: actions/showstream.php:206
+#: actions/showstream.php:231
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
 msgstr ""
 
-#. TRANS: Second sentence of empty  list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
+#. TRANS: Second sentence of empty  list message for a non-self timeline. %1$s is a user nickname, %2$s is a part of a URL.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:210
+#: actions/showstream.php:235
 #, php-format
 msgid ""
 "You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
 "%?status_textarea=%2$s)."
 msgstr ""
 
-#. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
+#. TRANS: Announcement for anonymous users showing a timeline if site registrations are open.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:253
+#: actions/showstream.php:274
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -6613,18 +6249,18 @@ msgid ""
 "follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))"
 msgstr ""
 
-#. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
+#. TRANS: Announcement for anonymous users showing a timeline if site registrations are closed or invite only.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:260
+#: actions/showstream.php:281
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
 "wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
-"[StatusNet](http://status.net/) tool. "
+"[StatusNet](http://status.net/) tool."
 msgstr ""
 
 #. TRANS: Link to the author of a repeated notice. %s is a linked nickname.
-#: actions/showstream.php:336
+#: actions/showstream.php:359
 #, php-format
 msgid "Repeat of %s"
 msgstr ""
@@ -6652,134 +6288,160 @@ msgid "Basic settings for this StatusNet site"
 msgstr ""
 
 #. TRANS: Client error displayed trying to save an empty site name.
-#: actions/siteadminpanel.php:131
+#: actions/siteadminpanel.php:141
 msgid "Site name must have non-zero length."
 msgstr ""
 
 #. TRANS: Client error displayed trying to save site settings without a contact address.
-#: actions/siteadminpanel.php:140
+#: actions/siteadminpanel.php:150
 msgid "You must have a valid contact email address."
 msgstr ""
 
+#. TRANS: Client error displayed when a logo URL is not valid.
+#: actions/siteadminpanel.php:161
+msgid "Invalid logo URL."
+msgstr ""
+
+#. TRANS: Client error displayed when a SSL logo URL is invalid.
+#: actions/siteadminpanel.php:167
+msgid "Invalid SSL logo URL."
+msgstr ""
+
 #. TRANS: Client error displayed trying to save site settings with an invalid language code.
 #. TRANS: %s is the invalid language code.
-#: actions/siteadminpanel.php:162
+#: actions/siteadminpanel.php:185
 #, php-format
 msgid "Unknown language \"%s\"."
 msgstr ""
 
 #. TRANS: Client error displayed trying to save site settings with a text limit below 0.
-#: actions/siteadminpanel.php:169
+#: actions/siteadminpanel.php:192
 msgid "Minimum text limit is 0 (unlimited)."
 msgstr ""
 
 #. TRANS: Client error displayed trying to save site settings with a text limit below 1.
-#: actions/siteadminpanel.php:176
+#: actions/siteadminpanel.php:199
 msgid "Dupe limit must be one or more seconds."
 msgstr ""
 
 #. TRANS: Fieldset legend on site settings panel.
-#: actions/siteadminpanel.php:223
+#: actions/siteadminpanel.php:246
 msgctxt "LEGEND"
 msgid "General"
 msgstr ""
 
 #. TRANS: Field label on site settings panel.
-#: actions/siteadminpanel.php:227
+#: actions/siteadminpanel.php:250
 msgctxt "LABEL"
 msgid "Site name"
 msgstr ""
 
 #. TRANS: Field title on site settings panel.
-#: actions/siteadminpanel.php:229
+#: actions/siteadminpanel.php:252
 msgid "The name of your site, like \"Yourcompany Microblog\"."
 msgstr ""
 
 #. TRANS: Field label on site settings panel.
-#: actions/siteadminpanel.php:234
+#: actions/siteadminpanel.php:257
 msgid "Brought by"
 msgstr ""
 
 #. TRANS: Field title on site settings panel.
-#: actions/siteadminpanel.php:236
+#: actions/siteadminpanel.php:259
 msgid "Text used for credits link in footer of each page."
 msgstr ""
 
 #. TRANS: Field label on site settings panel.
-#: actions/siteadminpanel.php:241
+#: actions/siteadminpanel.php:264
 msgid "Brought by URL"
 msgstr ""
 
 #. TRANS: Field title on site settings panel.
-#: actions/siteadminpanel.php:243
+#: actions/siteadminpanel.php:266
 msgid "URL used for credits link in footer of each page."
 msgstr ""
 
 #. TRANS: Field label on site settings panel.
-#: actions/siteadminpanel.php:247
+#: actions/siteadminpanel.php:270
 msgid "Email"
 msgstr ""
 
 #. TRANS: Field title on site settings panel.
-#: actions/siteadminpanel.php:249
+#: actions/siteadminpanel.php:272
 msgid "Contact email address for your site."
 msgstr ""
 
 #. TRANS: Fieldset legend on site settings panel.
-#: actions/siteadminpanel.php:256
+#: actions/siteadminpanel.php:281
 msgctxt "LEGEND"
 msgid "Local"
 msgstr ""
 
 #. TRANS: Dropdown label on site settings panel.
-#: actions/siteadminpanel.php:268
+#: actions/siteadminpanel.php:293
 msgid "Default timezone"
 msgstr ""
 
 #. TRANS: Dropdown title on site settings panel.
-#: actions/siteadminpanel.php:270
+#: actions/siteadminpanel.php:295
 msgid "Default timezone for the site; usually UTC."
 msgstr ""
 
 #. TRANS: Dropdown label on site settings panel.
-#: actions/siteadminpanel.php:277
+#: actions/siteadminpanel.php:302
 msgid "Default language"
 msgstr ""
 
 #. TRANS: Dropdown title on site settings panel.
-#: actions/siteadminpanel.php:280
-msgid "Site language when autodetection from browser settings is not available"
+#: actions/siteadminpanel.php:305
+msgid ""
+"The site language when autodetection from browser settings is not available."
 msgstr ""
 
 #. TRANS: Fieldset legend on site settings panel.
-#: actions/siteadminpanel.php:289
+#: actions/siteadminpanel.php:314
 msgctxt "LEGEND"
 msgid "Limits"
 msgstr ""
 
 #. TRANS: Field label on site settings panel.
-#: actions/siteadminpanel.php:294
+#: actions/siteadminpanel.php:319
 msgid "Text limit"
 msgstr ""
 
 #. TRANS: Field title on site settings panel.
-#: actions/siteadminpanel.php:296
+#: actions/siteadminpanel.php:321
 msgid "Maximum number of characters for notices."
 msgstr ""
 
 #. TRANS: Field label on site settings panel.
-#: actions/siteadminpanel.php:302
+#: actions/siteadminpanel.php:327
 msgid "Dupe limit"
 msgstr ""
 
 #. TRANS: Field title on site settings panel.
-#: actions/siteadminpanel.php:304
+#: actions/siteadminpanel.php:329
 msgid "How long users must wait (in seconds) to post the same thing again."
 msgstr ""
 
+#. TRANS: Fieldset legend for form to change logo.
+#: actions/siteadminpanel.php:339
+msgid "Logo"
+msgstr ""
+
+#. TRANS: Field label for StatusNet site logo.
+#: actions/siteadminpanel.php:346
+msgid "Site logo"
+msgstr ""
+
+#. TRANS: Field label for SSL StatusNet site logo.
+#: actions/siteadminpanel.php:354
+msgid "SSL logo"
+msgstr ""
+
 #. TRANS: Button title for saving site settings.
-#: actions/siteadminpanel.php:323
-msgid "Save site settings"
+#: actions/siteadminpanel.php:377
+msgid "Save the site settings."
 msgstr ""
 
 #. TRANS: Page title for site-wide notice tab in admin panel.
@@ -6812,7 +6474,7 @@ msgstr ""
 msgid "Site-wide notice text (255 characters maximum; HTML allowed)"
 msgstr ""
 
-#. TRANS: Title for button to save site notice in admin panel.
+#. TRANS: Button title to save site notice in admin panel.
 #: actions/sitenoticeadminpanel.php:201
 msgid "Save site notice."
 msgstr ""
@@ -7041,7 +6703,7 @@ msgstr ""
 msgid "Snapshots will be sent to this URL."
 msgstr ""
 
-#. TRANS: Title for button to save snapshot settings.
+#. TRANS: Button title to save snapshot settings.
 #: actions/snapshotadminpanel.php:256
 msgid "Save snapshot settings."
 msgstr ""
@@ -7053,7 +6715,7 @@ msgstr ""
 
 #. TRANS: Server error displayed when updating a subscription fails with a database error.
 #. TRANS: Exception thrown when a subscription could not be stored on the server.
-#: actions/subedit.php:90 classes/Subscription.php:147
+#: actions/subedit.php:90 classes/Subscription.php:177
 msgid "Could not save subscription."
 msgstr ""
 
@@ -7081,13 +6743,8 @@ msgstr ""
 msgid "A list of users awaiting approval to subscribe to you."
 msgstr ""
 
-#. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
-#: actions/subscribe.php:121
-msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
-msgstr ""
-
 #. TRANS: Page title when subscription succeeded.
-#: actions/subscribe.php:149
+#: actions/subscribe.php:137
 msgid "Subscribed"
 msgstr ""
 
@@ -7198,60 +6855,66 @@ msgid ""
 "You're not listening to anyone's notices right now, try subscribing to "
 "people you know. Try [people search](%%action.peoplesearch%%), look for "
 "members in groups you're interested in and in our [featured users](%%action."
-"featured%%). If you're a [Twitter user](%%action.twittersettings%%), you can "
-"automatically subscribe to people you already follow there."
+"featured%%)."
 msgstr ""
 
 #. TRANS: Subscription list text when looking at the subscriptions for a of a user other
 #. TRANS: than the logged in user that has no subscriptions. %s is the user nickname.
 #. TRANS: Subscription list text when looking at the subscriptions for a of a user that has none
 #. TRANS: as an anonymous user. %s is the user nickname.
-#: actions/subscriptions.php:141 actions/subscriptions.php:147
+#: actions/subscriptions.php:139 actions/subscriptions.php:145
 #, php-format
 msgid "%s is not listening to anyone."
 msgstr ""
 
 #. TRANS: Atom feed title. %s is a profile nickname.
-#: actions/subscriptions.php:166
+#: actions/subscriptions.php:164
 #, php-format
 msgid "Subscription feed for %s (Atom)"
 msgstr ""
 
 #. TRANS: Checkbox label for enabling IM messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:231
+#: actions/subscriptions.php:229
 msgctxt "LABEL"
 msgid "IM"
 msgstr ""
 
 #. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:246
+#: actions/subscriptions.php:244
 msgid "SMS"
 msgstr ""
 
 #. TRANS: Title for all but the first page of notices with tags.
 #. TRANS: %1$s is the tag, %2$d is the page number.
-#: actions/tag.php:67
+#: actions/tag.php:69
 #, php-format
 msgid "Notices tagged with %1$s, page %2$d"
 msgstr ""
 
 #. TRANS: Link label for feed on "notices with tag" page.
 #. TRANS: %s is the tag the feed is for.
-#: actions/tag.php:87
+#: actions/tag.php:90
+#, php-format
+msgid "Notice feed for tag %s (Activity Streams JSON)"
+msgstr ""
+
+#. TRANS: Link label for feed on "notices with tag" page.
+#. TRANS: %s is the tag the feed is for.
+#: actions/tag.php:97
 #, php-format
 msgid "Notice feed for tag %s (RSS 1.0)"
 msgstr ""
 
 #. TRANS: Link label for feed on "notices with tag" page.
 #. TRANS: %s is the tag the feed is for.
-#: actions/tag.php:95
+#: actions/tag.php:105
 #, php-format
 msgid "Notice feed for tag %s (RSS 2.0)"
 msgstr ""
 
 #. TRANS: Link label for feed on "notices with tag" page.
 #. TRANS: %s is the tag the feed is for.
-#: actions/tag.php:103
+#: actions/tag.php:113
 #, php-format
 msgid "Notice feed for tag %s (Atom)"
 msgstr ""
@@ -7259,7 +6922,7 @@ msgstr ""
 #. TRANS: Client error displayed when trying to tag a user that cannot be tagged.
 #. TRANS: Client exception thrown trying to set a tag for a user that cannot be tagged.
 #. TRANS: Error displayed when trying to tag a user that cannot be tagged.
-#: actions/tagprofile.php:56 classes/Profile_tag.php:147 lib/command.php:440
+#: actions/tagprofile.php:56 classes/Profile_tag.php:171 lib/command.php:440
 #: lib/command.php:499
 msgid "You cannot tag this user."
 msgstr ""
@@ -7354,17 +7017,6 @@ msgstr ""
 msgid "%1$s unsubscribed from list %2$s by %3$s"
 msgstr ""
 
-#. TRANS: Client error displayed when trying to update profile with an incompatible license.
-#. TRANS: %1$s is the license incompatible with site license %2$s.
-#. TRANS: Exception thrown when licenses are not compatible for an authorisation request.
-#. TRANS: %1$s is the license for the listenee, %2$s is the license for "this" StatusNet site.
-#: actions/updateprofile.php:65 actions/userauthorization.php:342
-#, php-format
-msgid ""
-"Listenee stream license \"%1$s\" is not compatible with site license \"%2$s"
-"\"."
-msgstr ""
-
 #. TRANS: Title of URL settings tab in profile settings.
 #: actions/urlsettings.php:57
 msgid "URL settings"
@@ -7527,172 +7179,11 @@ msgstr ""
 msgid "Whether to allow users to invite new users."
 msgstr ""
 
-#. TRANS: Title for button to save user settings in user admin panel.
+#. TRANS: Button title to save user settings in user admin panel.
 #: actions/useradminpanel.php:304
 msgid "Save user settings."
 msgstr ""
 
-#. TRANS: Page title.
-#: actions/userauthorization.php:109
-msgid "Authorize subscription"
-msgstr ""
-
-#. TRANS: Page notice on "Authorize subscription" page.
-#: actions/userauthorization.php:115
-msgid ""
-"Please check these details to make sure that you want to subscribe to this "
-"user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
-"click \"Reject\"."
-msgstr ""
-
-#. TRANS: Button text on Authorise Subscription page.
-#. TRANS: Submit button text to accept a group membership request on approve group form.
-#. TRANS: Submit button text to accept a subscription request on approve sub form.
-#: actions/userauthorization.php:202 lib/approvegroupform.php:116
-#: lib/approvesubform.php:110
-msgctxt "BUTTON"
-msgid "Accept"
-msgstr ""
-
-#. TRANS: Title for button on Authorise Subscription page.
-#. TRANS: Button title to subscribe to a user.
-#: actions/userauthorization.php:204 lib/subscribeform.php:132
-msgid "Subscribe to this user."
-msgstr ""
-
-#. TRANS: Button text on Authorise Subscription page.
-#. TRANS: Submit button text to reject a group membership request on approve group form.
-#. TRANS: Submit button text to reject a subscription request on approve sub form.
-#: actions/userauthorization.php:207 lib/approvegroupform.php:118
-#: lib/approvesubform.php:112
-msgctxt "BUTTON"
-msgid "Reject"
-msgstr ""
-
-#. TRANS: Title for button on Authorise Subscription page.
-#: actions/userauthorization.php:209
-msgid "Reject this subscription."
-msgstr ""
-
-#. TRANS: Client error displayed for an empty authorisation request.
-#: actions/userauthorization.php:222
-msgid "No authorization request!"
-msgstr ""
-
-#. TRANS: Accept message header from Authorise subscription page.
-#: actions/userauthorization.php:245
-msgid "Subscription authorized"
-msgstr ""
-
-#. TRANS: Accept message text from Authorise subscription page.
-#: actions/userauthorization.php:248
-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 ""
-
-#. TRANS: Reject message header from Authorise subscription page.
-#: actions/userauthorization.php:259
-msgid "Subscription rejected"
-msgstr ""
-
-#. TRANS: Reject message from Authorise subscription page.
-#: actions/userauthorization.php:262
-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 ""
-
-#. TRANS: Exception thrown when no valid user is found for an authorisation request.
-#. TRANS: %s is a listener URI.
-#: actions/userauthorization.php:299
-#, php-format
-msgid "Listener URI \"%s\" not found here."
-msgstr ""
-
-#. TRANS: Exception thrown when listenee URI is too long for an authorisation request.
-#. TRANS: %s is a listenee URI.
-#: actions/userauthorization.php:306
-#, php-format
-msgid "Listenee URI \"%s\" is too long."
-msgstr ""
-
-#. TRANS: Exception thrown when listenee URI is a local user for an authorisation request.
-#. TRANS: %s is a listenee URI.
-#: actions/userauthorization.php:314
-#, php-format
-msgid "Listenee URI \"%s\" is a local user."
-msgstr ""
-
-#. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
-#. TRANS: %s is a profile URL.
-#: actions/userauthorization.php:332
-#, php-format
-msgid "Profile URL \"%s\" is for a local user."
-msgstr ""
-
-#. TRANS: Exception thrown when avatar URL is invalid for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:352
-#, php-format
-msgid "Avatar URL \"%s\" is not valid."
-msgstr ""
-
-#. TRANS: Exception thrown when avatar URL could not be read for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:359
-#, php-format
-msgid "Cannot read avatar URL \"%s\"."
-msgstr ""
-
-#. TRANS: Exception thrown when avatar URL return an invalid image type for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#: actions/userauthorization.php:366
-#, php-format
-msgid "Wrong image type for avatar URL \"%s\"."
-msgstr ""
-
-#. TRANS: Title for profile design page.
-#. TRANS: Page title for profile design page.
-#: actions/userdesignsettings.php:75 lib/designsettings.php:61
-msgid "Profile design"
-msgstr ""
-
-#. TRANS: Instructions for Profile design page.
-#. TRANS: Instructions for profile design page.
-#: actions/userdesignsettings.php:86 lib/designsettings.php:72
-msgid ""
-"Customize the way your profile looks with a background image and a colour "
-"palette of your choice."
-msgstr ""
-
-#. TRANS: Succes message on Profile design page when finding an easter egg.
-#: actions/userdesignsettings.php:297
-msgid "Enjoy your hotdog!"
-msgstr ""
-
-#. TRANS: Form legend on Profile design page.
-#: actions/userdesignsettings.php:335
-msgid "Design settings"
-msgstr ""
-
-#. TRANS: Checkbox label on Profile design page.
-#: actions/userdesignsettings.php:351
-msgid "View profile designs"
-msgstr ""
-
-#. TRANS: Title for checkbox on Profile design page.
-#: actions/userdesignsettings.php:353
-msgid "Show or hide profile designs."
-msgstr ""
-
-#. TRANS: Form legend on Profile design page for form to choose a background image.
-#: actions/userdesignsettings.php:361
-msgid "Background file"
-msgstr ""
-
 #. TRANS: Page title for all but the first page of groups for a user.
 #. TRANS: %1$s is a nickname, %2$d is a page number.
 #: actions/usergroups.php:67
@@ -7724,7 +7215,7 @@ msgstr ""
 #. TRANS: %1$s is a group name, %2$s is a site name.
 #. TRANS: Message is used as a subtitle in atom user notice feed.
 #. TRANS: %1$s is a user name, %2$s is a site name.
-#: actions/userrss.php:98 lib/atomgroupnoticefeed.php:70
+#: actions/userrss.php:96 lib/atomgroupnoticefeed.php:70
 #: lib/atomusernoticefeed.php:95
 #, php-format
 msgid "Updates from %1$s on %2$s!"
@@ -7741,7 +7232,7 @@ msgstr ""
 #: actions/version.php:151
 #, php-format
 msgid ""
-"This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, "
+"This site is powered by %1$s version %2$s, Copyright 2008-2011 StatusNet, "
 "Inc. and contributors."
 msgstr ""
 
@@ -7751,31 +7242,31 @@ msgid "Contributors"
 msgstr ""
 
 #. TRANS: Header for StatusNet license section on the version page.
-#: actions/version.php:166
+#: actions/version.php:167
 msgid "License"
 msgstr ""
 
 #. TRANS: Content part of StatusNet version page.
-#: actions/version.php:170
+#: actions/version.php:171
 msgid ""
 "StatusNet is free software: you can redistribute it and/or modify it under "
 "the terms of the GNU Affero General Public License as published by the Free "
 "Software Foundation, either version 3 of the License, or (at your option) "
-"any later version. "
+"any later version."
 msgstr ""
 
 #. TRANS: Content part of StatusNet version page.
-#: actions/version.php:177
+#: actions/version.php:178
 msgid ""
 "This program is distributed in the hope that it will be useful, but WITHOUT "
 "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
 "FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License "
-"for more details. "
+"for more details."
 msgstr ""
 
 #. TRANS: Content part of StatusNet version page.
 #. TRANS: %s is a link to the AGPL license with link description "http://www.gnu.org/licenses/agpl.html".
-#: actions/version.php:185
+#: actions/version.php:186
 #, php-format
 msgid ""
 "You should have received a copy of the GNU Affero General Public License "
@@ -7783,74 +7274,85 @@ msgid ""
 msgstr ""
 
 #. TRANS: Header for StatusNet plugins section on the version page.
-#: actions/version.php:195
+#: actions/version.php:196
 msgid "Plugins"
 msgstr ""
 
 #. TRANS: Column header for plugins table on version page.
-#: actions/version.php:202
+#: actions/version.php:203
 msgctxt "HEADER"
 msgid "Name"
 msgstr ""
 
 #. TRANS: Column header for plugins table on version page.
-#: actions/version.php:204
+#: actions/version.php:205
 msgctxt "HEADER"
 msgid "Version"
 msgstr ""
 
 #. TRANS: Column header for plugins table on version page.
-#: actions/version.php:206
+#: actions/version.php:207
 msgctxt "HEADER"
 msgid "Author(s)"
 msgstr ""
 
 #. TRANS: Column header for plugins table on version page.
-#: actions/version.php:208
+#: actions/version.php:209
 msgctxt "HEADER"
 msgid "Description"
 msgstr ""
 
 #. TRANS: Activity title when marking a notice as favorite.
-#: classes/Fave.php:112
+#: classes/Fave.php:140
 msgid "Favor"
 msgstr ""
 
 #. TRANS: Ntofication given when a user marks a notice as favorite.
 #. TRANS: %1$s is a user nickname or full name, %2$s is a notice URI.
-#: classes/Fave.php:115
+#: classes/Fave.php:143
 #, php-format
 msgid "%1$s marked notice %2$s as a favorite."
 msgstr ""
 
 #. TRANS: Server exception thrown when a URL cannot be processed.
-#: classes/File.php:162
+#: classes/File.php:175
 #, php-format
 msgid "Cannot process URL '%s'"
 msgstr ""
 
 #. TRANS: Server exception thrown when... Robin thinks something is impossible!
-#: classes/File.php:194
+#: classes/File.php:207
 msgid "Robin thinks something is impossible."
 msgstr ""
 
+#. TRANS: Message used to be inserted as %2$s in  the text "No file may
+#. TRANS: be larger than %1$d byte and the file you sent was %2$s.".
+#. TRANS: %1$d is the number of bytes of an uploaded file.
+#: classes/File.php:223
+#, php-format
+msgid "%1$d byte"
+msgid_plural "%1$d bytes"
+msgstr[0] ""
+msgstr[1] ""
+
 #. TRANS: Message given if an upload is larger than the configured maximum.
-#. TRANS: %1$d is the byte limit for uploads, %2$d is the byte count for the uploaded file.
-#. TRANS: %1$s is used for plural.
-#: classes/File.php:210
+#. TRANS: %1$d (used for plural) is the byte limit for uploads,
+#. TRANS: %2$s is the proper form of "n bytes". This is the only ways to have
+#. TRANS: gettext support multiple plurals in the same message, unfortunately...
+#: classes/File.php:230
 #, php-format
 msgid ""
-"No file may be larger than %1$d byte and the file you sent was %2$d bytes. "
-"Try to upload a smaller version."
+"No file may be larger than %1$d byte and the file you sent was %2$s. Try to "
+"upload a smaller version."
 msgid_plural ""
-"No file may be larger than %1$d bytes and the file you sent was %2$d bytes. "
-"Try to upload a smaller version."
+"No file may be larger than %1$d bytes and the file you sent was %2$s. Try to "
+"upload a smaller version."
 msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Message given if an upload would exceed user quota.
 #. TRANS: %d (number) is the user quota in bytes and is used for plural.
-#: classes/File.php:223
+#: classes/File.php:243
 #, php-format
 msgid "A file this large would exceed your user quota of %d byte."
 msgid_plural "A file this large would exceed your user quota of %d bytes."
@@ -7859,7 +7361,7 @@ msgstr[1] ""
 
 #. TRANS: Message given id an upload would exceed a user's monthly quota.
 #. TRANS: $d (number) is the monthly user quota in bytes and is used for plural.
-#: classes/File.php:235
+#: classes/File.php:255
 #, php-format
 msgid "A file this large would exceed your monthly quota of %d byte."
 msgid_plural "A file this large would exceed your monthly quota of %d bytes."
@@ -7867,182 +7369,189 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Client exception thrown if a file upload does not have a valid name.
-#: classes/File.php:282 classes/File.php:297
+#: classes/File.php:302 classes/File.php:317
 msgid "Invalid filename."
 msgstr ""
 
 #. TRANS: Exception thrown providing an invalid profile ID.
 #. TRANS: %s is the invalid profile ID.
-#: classes/Group_join_queue.php:66 classes/Group_member.php:86
+#: classes/Group_join_queue.php:66 classes/Group_member.php:117
 #, php-format
 msgid "Profile ID %s is invalid."
 msgstr ""
 
 #. TRANS: Exception thrown providing an invalid group ID.
 #. TRANS: %s is the invalid group ID.
-#: classes/Group_join_queue.php:79 classes/Group_member.php:99
+#: classes/Group_join_queue.php:79 classes/Group_member.php:130
 #, php-format
 msgid "Group ID %s is invalid."
 msgstr ""
 
 #. TRANS: Exception thrown when joining a group fails.
-#: classes/Group_member.php:52
+#: classes/Group_member.php:83
 msgid "Group join failed."
 msgstr ""
 
 #. TRANS: Exception thrown when trying to leave a group the user is not a member of.
-#: classes/Group_member.php:65
+#: classes/Group_member.php:96
 msgid "Not part of group."
 msgstr ""
 
 #. TRANS: Exception thrown when trying to leave a group fails.
-#: classes/Group_member.php:73
+#: classes/Group_member.php:104
 msgid "Group leave failed."
 msgstr ""
 
 #. TRANS: Activity title.
-#: classes/Group_member.php:148
+#: classes/Group_member.php:176
 msgid "Join"
 msgstr ""
 
 #. TRANS: Success message for subscribe to group attempt through OStatus.
 #. TRANS: %1$s is the member name, %2$s is the subscribed group's name.
-#: classes/Group_member.php:152
+#: classes/Group_member.php:180
 #, php-format
 msgid "%1$s has joined group %2$s."
 msgstr ""
 
 #. TRANS: Server exception thrown when updating a local group fails.
-#: classes/Local_group.php:42
+#: classes/Local_group.php:58
 msgid "Could not update local group."
 msgstr ""
 
 #. TRANS: Exception thrown when trying creating a login token failed.
 #. TRANS: %s is the user nickname for which token creation failed.
-#: classes/Login_token.php:78
+#: classes/Login_token.php:81
 #, php-format
 msgid "Could not create login token for %s"
 msgstr ""
 
+#. TRANS: Exception thrown when a program code class (%s) cannot be instantiated.
+#: classes/Memcached_DataObject.php:146 classes/Memcached_DataObject.php:254
+#: classes/Memcached_DataObject.php:311
+#, php-format
+msgid "Cannot instantiate class %s."
+msgstr ""
+
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.
-#: classes/Memcached_DataObject.php:555
+#: classes/Memcached_DataObject.php:846
 msgid "No database name or DSN found anywhere."
 msgstr ""
 
 #. TRANS: Client exception thrown when a user tries to send a direct message while being banned from sending them.
-#: classes/Message.php:45
+#: classes/Message.php:78
 msgid "You are banned from sending direct messages."
 msgstr ""
 
 #. TRANS: Message given when a message could not be stored on the server.
-#: classes/Message.php:69
+#: classes/Message.php:102
 msgid "Could not insert message."
 msgstr ""
 
 #. TRANS: Message given when a message could not be updated on the server.
-#: classes/Message.php:80
+#: classes/Message.php:113
 msgid "Could not update message with new URI."
 msgstr ""
 
 #. TRANS: Server exception thrown when a user profile for a notice cannot be found.
 #. TRANS: %1$d is a profile ID (number), %2$d is a notice ID (number).
-#: classes/Notice.php:109
+#: classes/Notice.php:167
 #, php-format
 msgid "No such profile (%1$d) for notice (%2$d)."
 msgstr ""
 
 #. TRANS: Server exception. %s are the error details.
-#: classes/Notice.php:211
+#: classes/Notice.php:274
 #, php-format
 msgid "Database error inserting hashtag: %s."
 msgstr ""
 
 #. TRANS: Client exception thrown if a notice contains too many characters.
-#: classes/Notice.php:294
+#: classes/Notice.php:360
 msgid "Problem saving notice. Too long."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to save a notice for an unknown user.
-#: classes/Notice.php:299
+#: classes/Notice.php:365
 msgid "Problem saving notice. Unknown user."
 msgstr ""
 
 #. TRANS: Client exception thrown when a user tries to post too many notices in a given time frame.
-#: classes/Notice.php:305
+#: classes/Notice.php:371
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
 
 #. TRANS: Client exception thrown when a user tries to post too many duplicate notices in a given time frame.
-#: classes/Notice.php:312
+#: classes/Notice.php:378
 msgid ""
 "Too many duplicate messages too quickly; take a breather and post again in a "
 "few minutes."
 msgstr ""
 
 #. TRANS: Client exception thrown when a user tries to post while being banned.
-#: classes/Notice.php:320
+#: classes/Notice.php:386
 msgid "You are banned from posting notices on this site."
 msgstr ""
 
 #. TRANS: Client exception thrown in notice when trying to repeat a missing or deleted notice.
-#: classes/Notice.php:367
+#: classes/Notice.php:433
 msgid "Cannot repeat; original notice is missing or deleted."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to repeat an own notice.
-#: classes/Notice.php:372
+#: classes/Notice.php:438
 msgid "You cannot repeat your own notice."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to repeat a non-public notice.
-#: classes/Notice.php:378
+#: classes/Notice.php:444
 msgid "Cannot repeat a private notice."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to repeat a notice you cannot access.
-#: classes/Notice.php:384
+#: classes/Notice.php:450
 msgid "Cannot repeat a notice you cannot read."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to repeat an already repeated notice.
-#: classes/Notice.php:389
+#: classes/Notice.php:455
 msgid "You already repeated that notice."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to reply to a notice a the target has no access to.
 #. TRANS: %1$s is a user nickname, %2$d is a notice ID (number).
-#: classes/Notice.php:401
+#: classes/Notice.php:467
 #, php-format
 msgid "%1$s has no access to notice %2$d."
 msgstr ""
 
 #. TRANS: Server exception thrown when a notice cannot be saved.
 #. TRANS: Server exception thrown when a notice cannot be updated.
-#: classes/Notice.php:490 classes/Notice.php:517
+#: classes/Notice.php:567 classes/Notice.php:594
 msgid "Problem saving notice."
 msgstr ""
 
 #. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:1098
+#: classes/Notice.php:1143
 msgid "Bad type provided to saveKnownGroups."
 msgstr ""
 
 #. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:1190
+#: classes/Notice.php:1235
 msgid "Problem saving group inbox."
 msgstr ""
 
 #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
 #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1824
+#: classes/Notice.php:1864
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr ""
 
 #. TRANS: Full name of a profile or group (%1$s) followed by nickname (%2$s) in parentheses.
 #. TRANS: Full name of a profile or group followed by nickname in parens
-#: classes/Profile.php:186 classes/User_group.php:248
+#: classes/Profile.php:263 classes/User_group.php:307
 #, php-format
 msgctxt "FANCYNAME"
 msgid "%1$s (%2$s)"
@@ -8050,50 +7559,50 @@ msgstr ""
 
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:1005
+#: classes/Profile.php:1097
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr ""
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:1014
+#: classes/Profile.php:1106
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
 
 #. TRANS: Server exception.
-#: classes/Profile_list.php:358
+#: classes/Profile_list.php:395
 msgid "The tag you are trying to rename to already exists."
 msgstr ""
 
 #. TRANS: Server exception saving new tag without having a tagger specified.
-#: classes/Profile_list.php:593
+#: classes/Profile_list.php:630
 msgid "No tagger specified."
 msgstr ""
 
 #. TRANS: Server exception saving new tag without having a tag specified.
-#: classes/Profile_list.php:598
+#: classes/Profile_list.php:635
 msgid "No tag specified."
 msgstr ""
 
 #. TRANS: Server exception saving new tag.
-#: classes/Profile_list.php:636
+#: classes/Profile_list.php:673
 msgid "Could not create profile tag."
 msgstr ""
 
 #. TRANS: Server exception saving new tag.
-#: classes/Profile_list.php:646
+#: classes/Profile_list.php:683
 msgid "Could not set profile tag URI."
 msgstr ""
 
 #. TRANS: Server exception saving new tag.
-#: classes/Profile_list.php:663
+#: classes/Profile_list.php:700
 msgid "Could not set profile tag mainpage."
 msgstr ""
 
 #. TRANS: Client exception thrown trying to set more tags than allowed.
-#: classes/Profile_tag.php:157
+#: classes/Profile_tag.php:181
 #, php-format
 msgid ""
 "You already have created %d or more tags which is the maximum allowed number "
@@ -8101,20 +7610,20 @@ msgid ""
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to add more people than allowed to a list.
-#: classes/Profile_tag.php:171
+#: classes/Profile_tag.php:195
 #, php-format
 msgid ""
 "You already have %1$d or more people in list %2$s, which is the maximum "
-"allowed number.Try unlisting others first."
+"allowed number. Try unlisting others first."
 msgstr ""
 
 #. TRANS: Exception thrown when inserting a list subscription in the database fails.
-#: classes/Profile_tag_subscription.php:54
+#: classes/Profile_tag_subscription.php:77
 msgid "Adding list subscription failed."
 msgstr ""
 
 #. TRANS: Exception thrown when deleting a list subscription from the database fails.
-#: classes/Profile_tag_subscription.php:81
+#: classes/Profile_tag_subscription.php:104
 msgid "Removing list subscription failed."
 msgstr ""
 
@@ -8124,98 +7633,107 @@ msgid "Missing profile."
 msgstr ""
 
 #. TRANS: Exception thrown when a tag cannot be saved.
-#: classes/Status_network.php:341
+#: classes/Status_network.php:348
 msgid "Unable to save tag."
 msgstr ""
 
 #. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
-#. TRANS: Error message displayed to a banned user when they try to subscribe.
-#: classes/Subscription.php:79 lib/oauthstore.php:483
+#: classes/Subscription.php:106
 msgid "You have been banned from subscribing."
 msgstr ""
 
 #. TRANS: Exception thrown when trying to subscribe while already subscribed.
-#: classes/Subscription.php:84
+#: classes/Subscription.php:111
 msgid "Already subscribed!"
 msgstr ""
 
 #. TRANS: Exception thrown when trying to subscribe to a user who has blocked the subscribing user.
-#: classes/Subscription.php:89
+#: classes/Subscription.php:116
 msgid "User has blocked you."
 msgstr ""
 
 #. TRANS: Exception thrown when trying to unsibscribe without a subscription.
-#: classes/Subscription.php:182
+#: classes/Subscription.php:212
 msgid "Not subscribed!"
 msgstr ""
 
 #. TRANS: Exception thrown when trying to unsubscribe a user from themselves.
-#: classes/Subscription.php:189
+#: classes/Subscription.php:219
 msgid "Could not delete self-subscription."
 msgstr ""
 
-#. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
-#: classes/Subscription.php:217
-msgid "Could not delete subscription OMB token."
-msgstr ""
-
 #. TRANS: Exception thrown when a subscription could not be deleted on the server.
-#: classes/Subscription.php:229
+#: classes/Subscription.php:236
 msgid "Could not delete subscription."
 msgstr ""
 
 #. TRANS: Activity title when subscribing to another person.
-#: classes/Subscription.php:271
+#: classes/Subscription.php:275
 msgctxt "TITLE"
 msgid "Follow"
 msgstr ""
 
 #. TRANS: Notification given when one person starts following another.
 #. TRANS: %1$s is the subscriber, %2$s is the subscribed.
-#: classes/Subscription.php:274
+#: classes/Subscription.php:278
 #, php-format
 msgid "%1$s is now following %2$s."
 msgstr ""
 
 #. TRANS: Notice given on user registration.
 #. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
-#: classes/User.php:409
+#: classes/User.php:466
 #, php-format
 msgid "Welcome to %1$s, @%2$s!"
 msgstr ""
 
 #. TRANS: Exception thrown when trying view "repeated to me".
-#: classes/User.php:813
+#: classes/User.php:865
 msgid "Not implemented since inbox change."
 msgstr ""
 
 #. TRANS: Server exception.
-#: classes/User.php:899
+#: classes/User.php:951
 msgid "No single user defined for single-user mode."
 msgstr ""
 
 #. TRANS: Server exception.
-#: classes/User.php:903
+#: classes/User.php:955
 msgid "Single-user mode code called when not enabled."
 msgstr ""
 
+#. TRANS: Information on password recovery form if no known username or e-mail address was specified.
+#: classes/User.php:1089
+msgid "No user with that email address or username."
+msgstr ""
+
+#. TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.
+#: classes/User.php:1107
+msgid "No registered email address for that user."
+msgstr ""
+
+#. TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.
+#: classes/User.php:1122
+msgid "Error saving address confirmation."
+msgstr ""
+
 #. TRANS: Server exception thrown when creating a group failed.
-#: classes/User_group.php:540
+#: classes/User_group.php:606
 msgid "Could not create group."
 msgstr ""
 
 #. TRANS: Server exception thrown when updating a group URI failed.
-#: classes/User_group.php:550
+#: classes/User_group.php:616
 msgid "Could not set group URI."
 msgstr ""
 
 #. TRANS: Server exception thrown when setting group membership failed.
-#: classes/User_group.php:573
+#: classes/User_group.php:639
 msgid "Could not set group membership."
 msgstr ""
 
 #. TRANS: Server exception thrown when saving local group information failed.
-#: classes/User_group.php:590
+#: classes/User_group.php:656
 msgid "Could not save local group info."
 msgstr ""
 
@@ -8252,45 +7770,45 @@ msgid "User deletion in progress..."
 msgstr ""
 
 #. TRANS: Link title for link on user profile.
-#: lib/accountprofileblock.php:151
+#: lib/accountprofileblock.php:148
 msgid "Edit profile settings."
 msgstr ""
 
 #. TRANS: Link text for link on user profile.
-#: lib/accountprofileblock.php:153
+#: lib/accountprofileblock.php:150 lib/groupprofileblock.php:122
 msgctxt "BUTTON"
 msgid "Edit"
 msgstr ""
 
 #. TRANS: Link title for link on user profile.
-#: lib/accountprofileblock.php:180
+#: lib/accountprofileblock.php:177
 msgid "Send a direct message to this user."
 msgstr ""
 
 #. TRANS: Link text for link on user profile.
-#: lib/accountprofileblock.php:182
+#: lib/accountprofileblock.php:179
 msgctxt "BUTTON"
 msgid "Message"
 msgstr ""
 
 #. TRANS: Label text on user profile to select a user role.
-#: lib/accountprofileblock.php:224
+#: lib/accountprofileblock.php:221
 msgid "Moderate"
 msgstr ""
 
 #. TRANS: Label text on user profile to select a user role.
-#: lib/accountprofileblock.php:263
+#: lib/accountprofileblock.php:260
 msgid "User role"
 msgstr ""
 
 #. TRANS: Role that can be set for a user profile.
-#: lib/accountprofileblock.php:266
+#: lib/accountprofileblock.php:263
 msgctxt "role"
 msgid "Administrator"
 msgstr ""
 
 #. TRANS: Role that can be set for a user profile.
-#: lib/accountprofileblock.php:268
+#: lib/accountprofileblock.php:265
 msgctxt "role"
 msgid "Moderator"
 msgstr ""
@@ -8320,12 +7838,12 @@ msgstr ""
 
 #. TRANS: Placeholder text for inline reply form. Clicking in this box will turn it into a mini notice form.
 #. TRANS: Field label for reply mini form.
-#: lib/action.php:369 lib/threadednoticelist.php:396
+#: lib/action.php:369 lib/threadednoticelist.php:412
 msgid "Write a reply..."
 msgstr ""
 
 #. TRANS: Tab on the notice form.
-#: lib/action.php:619
+#: lib/action.php:627
 msgctxt "TAB"
 msgid "Status"
 msgstr ""
@@ -8334,7 +7852,7 @@ msgstr ""
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:995
+#: lib/action.php:1003
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -8342,7 +7860,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:998
+#: lib/action.php:1006
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr ""
@@ -8351,7 +7869,7 @@ msgstr ""
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:1005
+#: lib/action.php:1013
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -8361,39 +7879,39 @@ msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:1023
+#: lib/action.php:1031
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:1030
+#: lib/action.php:1038
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:1034
+#: lib/action.php:1042
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:1066
+#: lib/action.php:1074
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr ""
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1412
+#: lib/action.php:1427
 msgid "After"
 msgstr ""
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1422
+#: lib/action.php:1437
 msgid "Before"
 msgstr ""
 
@@ -8476,17 +7994,17 @@ msgid "%1$s %2$s %3$s"
 msgstr ""
 
 #. TRANS: Client exception thrown when there is no source attribute.
-#: lib/activityutils.php:200
+#: lib/activityutils.php:229
 msgid "Can't handle remote content yet."
 msgstr ""
 
 #. TRANS: Client exception thrown when there embedded XML content is found that cannot be processed yet.
-#: lib/activityutils.php:237
+#: lib/activityutils.php:266
 msgid "Can't handle embedded XML content yet."
 msgstr ""
 
 #. TRANS: Client exception thrown when base64 encoded content is found that cannot be processed yet.
-#: lib/activityutils.php:242
+#: lib/activityutils.php:271
 msgid "Can't handle embedded Base64 content yet."
 msgstr ""
 
@@ -8510,143 +8028,113 @@ msgstr ""
 msgid "saveSettings() not implemented."
 msgstr ""
 
-#. TRANS: Client error message thrown if design settings could not be deleted in
-#. TRANS: the admin panel Design.
-#: lib/adminpanelaction.php:274
-msgid "Unable to delete design setting."
-msgstr ""
-
 #. TRANS: Header in administrator navigation panel.
-#. TRANS: Header in settings navigation panel.
-#: lib/adminpanelnav.php:65 lib/settingsnav.php:65
+#: lib/adminpanelnav.php:66
 msgctxt "HEADER"
 msgid "Home"
 msgstr ""
 
-#. TRANS: Menu item in administrator navigation panel.
-#. TRANS: Menu item in default local navigation panel.
-#. TRANS: Menu item in personal group navigation menu.
-#. TRANS: Menu item in settings navigation panel.
-#: lib/adminpanelnav.php:70 lib/defaultlocalnav.php:60
-#: lib/personalgroupnav.php:74 lib/settingsnav.php:70
-msgctxt "MENU"
-msgid "Home"
-msgstr ""
-
 #. TRANS: Header in administrator navigation panel.
-#: lib/adminpanelnav.php:81
+#: lib/adminpanelnav.php:84
 msgctxt "HEADER"
 msgid "Admin"
 msgstr ""
 
 #. TRANS: Menu item title in administrator navigation panel.
-#: lib/adminpanelnav.php:88
+#: lib/adminpanelnav.php:91
 msgid "Basic site configuration"
 msgstr ""
 
 #. TRANS: Menu item in administrator navigation panel.
-#: lib/adminpanelnav.php:90
+#: lib/adminpanelnav.php:93
 msgctxt "MENU"
 msgid "Site"
 msgstr ""
 
 #. TRANS: Menu item title in administrator navigation panel.
-#: lib/adminpanelnav.php:96
-msgid "Design configuration"
-msgstr ""
-
-#. TRANS: Menu item in administrator navigation panel.
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: Menu item in settings navigation panel.
-#: lib/adminpanelnav.php:98 lib/groupnav.php:143 lib/settingsnav.php:115
-msgctxt "MENU"
-msgid "Design"
-msgstr ""
-
-#. TRANS: Menu item title in administrator navigation panel.
-#: lib/adminpanelnav.php:104
+#: lib/adminpanelnav.php:99
 msgid "User configuration"
 msgstr ""
 
 #. TRANS: Menu item in administrator navigation panel.
-#: lib/adminpanelnav.php:106
+#: lib/adminpanelnav.php:101
 msgctxt "MENU"
 msgid "User"
 msgstr ""
 
 #. TRANS: Menu item title in administrator navigation panel.
-#: lib/adminpanelnav.php:112
+#: lib/adminpanelnav.php:107
 msgid "Access configuration"
 msgstr ""
 
 #. TRANS: Menu item in administrator navigation panel.
-#: lib/adminpanelnav.php:114
+#: lib/adminpanelnav.php:109
 msgctxt "MENU"
 msgid "Access"
 msgstr ""
 
 #. TRANS: Menu item title in administrator navigation panel.
-#: lib/adminpanelnav.php:120
+#: lib/adminpanelnav.php:115
 msgid "Paths configuration"
 msgstr ""
 
 #. TRANS: Menu item in administrator navigation panel.
-#: lib/adminpanelnav.php:122
+#: lib/adminpanelnav.php:117
 msgctxt "MENU"
 msgid "Paths"
 msgstr ""
 
 #. TRANS: Menu item title in administrator navigation panel.
-#: lib/adminpanelnav.php:128
+#: lib/adminpanelnav.php:123
 msgid "Sessions configuration"
 msgstr ""
 
 #. TRANS: Menu item in administrator navigation panel.
-#: lib/adminpanelnav.php:130
+#: lib/adminpanelnav.php:125
 msgctxt "MENU"
 msgid "Sessions"
 msgstr ""
 
 #. TRANS: Menu item title in administrator navigation panel.
-#: lib/adminpanelnav.php:136
+#: lib/adminpanelnav.php:131
 msgid "Edit site notice"
 msgstr ""
 
 #. TRANS: Menu item in administrator navigation panel.
-#: lib/adminpanelnav.php:138
+#: lib/adminpanelnav.php:133
 msgctxt "MENU"
 msgid "Site notice"
 msgstr ""
 
 #. TRANS: Menu item title in administrator navigation panel.
-#: lib/adminpanelnav.php:144
+#: lib/adminpanelnav.php:139
 msgid "Snapshots configuration"
 msgstr ""
 
 #. TRANS: Menu item in administrator navigation panel.
-#: lib/adminpanelnav.php:146
+#: lib/adminpanelnav.php:141
 msgctxt "MENU"
 msgid "Snapshots"
 msgstr ""
 
 #. TRANS: Menu item title in administrator navigation panel.
-#: lib/adminpanelnav.php:152
+#: lib/adminpanelnav.php:147
 msgid "Set site license"
 msgstr ""
 
 #. TRANS: Menu item in administrator navigation panel.
-#: lib/adminpanelnav.php:154
+#: lib/adminpanelnav.php:149
 msgctxt "MENU"
 msgid "License"
 msgstr ""
 
 #. TRANS: Menu item title in administrator navigation panel.
-#: lib/adminpanelnav.php:160
+#: lib/adminpanelnav.php:155
 msgid "Plugins configuration"
 msgstr ""
 
 #. TRANS: Menu item in administrator navigation panel.
-#: lib/adminpanelnav.php:162
+#: lib/adminpanelnav.php:157
 msgctxt "MENU"
 msgid "Plugins"
 msgstr ""
@@ -8662,67 +8150,26 @@ msgid "No application for that consumer key."
 msgstr ""
 
 #. TRANS: Authorization exception thrown when a user without API access tries to access the API.
-#: lib/apiauth.php:203 lib/apiauth.php:286
+#: lib/apiauth.php:203 lib/apiauth.php:291
 msgid "Not allowed to use API."
 msgstr ""
 
 #. TRANS: OAuth exception given when an incorrect access token was given for a user.
-#: lib/apiauth.php:226
+#: lib/apiauth.php:231
 msgid "Bad access token."
 msgstr ""
 
 #. TRANS: OAuth exception given when no user was found for a given token (no token was found).
-#: lib/apiauth.php:231
+#: lib/apiauth.php:236
 msgid "No user for that token."
 msgstr ""
 
 #. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel".
 #. TRANS: Client error thrown when authentication fails.
-#: lib/apiauth.php:273 lib/apiauth.php:304
+#: lib/apiauth.php:278 lib/apiauth.php:309
 msgid "Could not authenticate you."
 msgstr ""
 
-#. TRANS: Server error displayed when trying to create an anynymous OAuth consumer.
-#: lib/apioauthstore.php:46
-msgid "Could not create anonymous consumer."
-msgstr ""
-
-#. TRANS: Server error displayed when trying to create an anynymous OAuth application.
-#: lib/apioauthstore.php:70
-msgid "Could not create anonymous OAuth application."
-msgstr ""
-
-#. TRANS: Exception thrown when no token association could be found.
-#: lib/apioauthstore.php:152
-msgid ""
-"Could not find a profile and application associated with the request token."
-msgstr ""
-
-#. TRANS: Exception thrown when no access token can be issued.
-#: lib/apioauthstore.php:210
-msgid "Could not issue access token."
-msgstr ""
-
-#. TRANS: Exception thrown when a database error occurs.
-#: lib/apioauthstore.php:318
-msgid "Database error inserting OAuth application user."
-msgstr ""
-
-#. TRANS: Exception thrown when a database error occurs.
-#: lib/apioauthstore.php:346
-msgid "Database error updating OAuth application user."
-msgstr ""
-
-#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
-#: lib/apioauthstore.php:372
-msgid "Tried to revoke unknown token."
-msgstr ""
-
-#. TRANS: Exception thrown when an attempt is made to remove a revoked token.
-#: lib/apioauthstore.php:377
-msgid "Failed to delete revoked token."
-msgstr ""
-
 #. TRANS: Form input field label for application icon.
 #: lib/applicationeditform.php:177
 msgid "Icon"
@@ -8823,13 +8270,12 @@ msgstr ""
 
 #. TRANS: Submit button title.
 #: lib/applicationeditform.php:353
-msgid "Cancel"
+msgid "Cancel application changes."
 msgstr ""
 
 #. TRANS: Submit button title.
-#. TRANS: Button text to save a list.
-#: lib/applicationeditform.php:357 lib/peopletageditform.php:168
-msgid "Save"
+#: lib/applicationeditform.php:357
+msgid "Save application changes."
 msgstr ""
 
 #. TRANS: Name for an anonymous application in application list.
@@ -8872,6 +8318,20 @@ msgctxt "BUTTON"
 msgid "Revoke"
 msgstr ""
 
+#. TRANS: Submit button text to accept a group membership request on approve group form.
+#. TRANS: Submit button text to accept a subscription request on approve sub form.
+#: lib/approvegroupform.php:116 lib/approvesubform.php:110
+msgctxt "BUTTON"
+msgid "Accept"
+msgstr ""
+
+#. TRANS: Submit button text to reject a group membership request on approve group form.
+#. TRANS: Submit button text to reject a subscription request on approve sub form.
+#: lib/approvegroupform.php:118 lib/approvesubform.php:112
+msgctxt "BUTTON"
+msgid "Reject"
+msgstr ""
+
 #. TRANS: Atom feed exception thrown when an author element does not contain a name element.
 #: lib/atom10feed.php:113
 msgid "Author element must contain a name element."
@@ -8896,7 +8356,7 @@ msgid "Updates from %1$s's list %2$s on %3$s!"
 msgstr ""
 
 #. TRANS: Title.
-#: lib/attachmentnoticesection.php:67
+#: lib/attachmentnoticesection.php:68
 msgid "Notices where this attachment appears"
 msgstr ""
 
@@ -9055,7 +8515,7 @@ msgstr[1] ""
 
 #. TRANS: Separator for list of tags.
 #. TRANS: Separator in list of user names like "Jim, Bob, Mary".
-#: lib/command.php:481 lib/command.php:534 lib/threadednoticelist.php:456
+#: lib/command.php:481 lib/command.php:534 lib/threadednoticelist.php:472
 msgid ", "
 msgstr ""
 
@@ -9100,7 +8560,7 @@ msgstr ""
 #. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in notification e-mail.
 #. TRANS: %s is a location.
-#: lib/command.php:561 lib/mail.php:339
+#: lib/command.php:561 lib/mail.php:345
 #, php-format
 msgid "Location: %s"
 msgstr ""
@@ -9108,7 +8568,7 @@ msgstr ""
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in notification e-mail.
 #. TRANS: %s is a homepage.
-#: lib/command.php:565 lib/mail.php:344
+#: lib/command.php:565 lib/mail.php:350
 #, php-format
 msgid "Homepage: %s"
 msgstr ""
@@ -9132,7 +8592,7 @@ msgstr ""
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
 #. TRANS: Message given when a status is too long. %1$s is the maximum number of characters,
 #. TRANS: %2$s is the number of characters sent (used for plural).
-#: lib/command.php:615 lib/implugin.php:492
+#: lib/command.php:615 lib/implugin.php:491
 #, php-format
 msgid "Message too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Message too long - maximum is %1$d characters, you sent %2$d."
@@ -9515,6 +8975,12 @@ msgstr ""
 msgid "Go to the installer."
 msgstr ""
 
+#. TRANS: Header on conversation page. Hidden by default (h2).
+#. TRANS: Label for user statistics.
+#: lib/conversationtree.php:64 lib/profileaction.php:223
+msgid "Notices"
+msgstr ""
+
 #. TRANS: Page title for when a database error occurs.
 #: lib/dberroraction.php:60
 msgid "Database error"
@@ -9522,20 +8988,11 @@ msgstr ""
 
 #. TRANS: Menu item in default local navigation panel.
 #. TRANS: Menu item in search group navigation panel.
-#: lib/defaultlocalnav.php:65 lib/publicgroupnav.php:66
+#: lib/defaultlocalnav.php:65 lib/publicgroupnav.php:67
 msgctxt "MENU"
 msgid "Public"
 msgstr ""
 
-#. TRANS: Menu item in default local navigation panel.
-#. TRANS: Menu item in search group navigation panel.
-#. TRANS: Menu item in local navigation menu.
-#: lib/defaultlocalnav.php:71 lib/publicgroupnav.php:71
-#: lib/searchgroupnav.php:82 lib/subgroupnav.php:124
-msgctxt "MENU"
-msgid "Groups"
-msgstr ""
-
 #. TRANS: Menu item in default local navigation panel.
 #. TRANS: Menu item title in local navigation menu.
 #: lib/defaultlocalnav.php:79 lib/subgroupnav.php:135
@@ -9545,7 +9002,7 @@ msgstr ""
 
 #. TRANS: Title of form for deleting a user.
 #. TRANS: Link text in notice list item to delete a notice.
-#: lib/deleteuserform.php:64 lib/noticelistitem.php:653
+#: lib/deleteuserform.php:64 lib/noticelistitem.php:680
 msgid "Delete"
 msgstr ""
 
@@ -9554,50 +9011,6 @@ msgstr ""
 msgid "Delete this user"
 msgstr ""
 
-#. TRANS: Form legend of form for changing the page design.
-#: lib/designform.php:110
-msgid "Change design"
-msgstr ""
-
-#. TRANS: Fieldset legend on profile design page to change profile page colours.
-#: lib/designform.php:126
-msgid "Change colours"
-msgstr ""
-
-#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-#: lib/designform.php:133
-msgid "Use defaults"
-msgstr ""
-
-#. TRANS: Label in form on profile design page.
-#. TRANS: Field contains file name on user's computer that could be that user's custom profile background image.
-#: lib/designform.php:153
-msgid "Upload file"
-msgstr ""
-
-#. TRANS: Instructions for form on profile design page.
-#: lib/designform.php:158
-msgid ""
-"You can upload your personal background image. The maximum file size is 2MB."
-msgstr ""
-
-#. TRANS: Radio button on profile design page that will enable use of the uploaded profile image.
-#: lib/designform.php:189
-msgctxt "RADIO"
-msgid "On"
-msgstr ""
-
-#. TRANS: Radio button on profile design page that will disable use of the uploaded profile image.
-#: lib/designform.php:206
-msgctxt "RADIO"
-msgid "Off"
-msgstr ""
-
-#. TRANS: Success message displayed if design settings were saved after clicking "Use defaults".
-#: lib/designsettings.php:245
-msgid "Design defaults restored."
-msgstr ""
-
 #. TRANS: Exception. %s is an ID.
 #: lib/discovery.php:153
 #, php-format
@@ -9605,8 +9018,7 @@ msgid "Unable to find services for %s."
 msgstr ""
 
 #. TRANS: Form legend for removing the favourite status for a favourite notice.
-#. TRANS: Title for button text for removing the favourite status for a favourite notice.
-#: lib/disfavorform.php:108 lib/disfavorform.php:140
+#: lib/disfavorform.php:108
 msgid "Disfavor this notice"
 msgstr ""
 
@@ -9616,9 +9028,13 @@ msgctxt "BUTTON"
 msgid "Disfavor favorite"
 msgstr ""
 
+#. TRANS: Button title for removing the favourite status for a favourite notice.
+#: lib/disfavorform.php:140
+msgid "Remove this notice from your list of favorite notices."
+msgstr ""
+
 #. TRANS: Form legend for adding the favourite status to a notice.
-#. TRANS: Title for button text for adding the favourite status to a notice.
-#: lib/favorform.php:108 lib/favorform.php:139
+#: lib/favorform.php:108
 msgid "Favor this notice"
 msgstr ""
 
@@ -9628,26 +9044,36 @@ msgctxt "BUTTON"
 msgid "Favor"
 msgstr ""
 
-#. TRANS: Feed type name.
-#: lib/feed.php:85
-msgid "RSS 1.0"
+#. TRANS: Button title for adding the favourite status to a notice.
+#: lib/favorform.php:139
+msgid "Add this notice to your list of favorite notices."
 msgstr ""
 
 #. TRANS: Feed type name.
 #: lib/feed.php:88
-msgid "RSS 2.0"
+msgid "RSS 1.0"
 msgstr ""
 
 #. TRANS: Feed type name.
 #: lib/feed.php:91
+msgid "RSS 2.0"
+msgstr ""
+
+#. TRANS: Feed type name.
+#: lib/feed.php:94
 msgid "Atom"
 msgstr ""
 
 #. TRANS: Feed type name. FOAF stands for Friend of a Friend.
-#: lib/feed.php:94
+#: lib/feed.php:97
 msgid "FOAF"
 msgstr ""
 
+#. TRANS: Feed type name. See http://activitystrea.ms/
+#: lib/feed.php:100
+msgid "Activity Streams"
+msgstr ""
+
 #. TRANS: Client exception thrown when an imported feed does not have an author.
 #: lib/feedimporter.php:82
 msgid "No author in the feed."
@@ -9686,6 +9112,32 @@ msgstr ""
 msgid "Grant this user the \"%s\" role"
 msgstr ""
 
+#. TRANS: Header for mini list of group members on a group page (h2).
+#: lib/groupaction.php:151
+msgid "Members"
+msgstr ""
+
+#. TRANS: Link to all group members from mini list of group members if group has more than n members.
+#: lib/groupaction.php:172 lib/groupaction.php:265
+msgid "All members"
+msgstr ""
+
+#. TRANS: Header for mini list of users with a pending membership request on a group page (h2).
+#: lib/groupaction.php:209
+msgid "Pending"
+msgstr ""
+
+#. TRANS: Header for mini list of users that are blocked in a group page (h2).
+#: lib/groupaction.php:244
+msgid "Blocked"
+msgstr ""
+
+#. TRANS: Title for list of group administrators on a group page.
+#: lib/groupaction.php:316
+msgctxt "TITLE"
+msgid "Admins"
+msgstr ""
+
 #. TRANS: Button text for the form that will block a user from a group.
 #: lib/groupblockform.php:124
 msgctxt "BUTTON"
@@ -9695,7 +9147,7 @@ msgstr ""
 #. TRANS: Submit button title.
 #: lib/groupblockform.php:128
 msgctxt "TOOLTIP"
-msgid "Block this user"
+msgid "Block this user so that they can no longer post messages to it."
 msgstr ""
 
 #. TRANS: Field title on group edit form.
@@ -9753,106 +9205,31 @@ msgctxt "GROUPADMIN"
 msgid "Admin"
 msgstr ""
 
-#. TRANS: Menu item in the group navigation page.
-#: lib/groupnav.php:81
-msgctxt "MENU"
-msgid "Group"
-msgstr ""
-
-#. TRANS: Tooltip for menu item in the group navigation page.
-#. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:84
-#, php-format
-msgctxt "TOOLTIP"
-msgid "%s group"
-msgstr ""
-
-#. TRANS: Menu item in the group navigation page.
-#: lib/groupnav.php:90
-msgctxt "MENU"
-msgid "Members"
-msgstr ""
-
-#. TRANS: Tooltip for menu item in the group navigation page.
-#. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:93
-#, php-format
-msgctxt "TOOLTIP"
-msgid "%s group members"
-msgstr ""
-
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: %d is the number of pending members.
-#: lib/groupnav.php:106
-#, php-format
-msgctxt "MENU"
-msgid "Pending members (%d)"
-msgid_plural "Pending members (%d)"
-msgstr[0] ""
-msgstr[1] ""
-
-#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:109
-#, php-format
-msgctxt "TOOLTIP"
-msgid "%s pending members"
-msgstr ""
-
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/groupnav.php:116
-msgctxt "MENU"
-msgid "Blocked"
+#. TRANS: Group actions header (h2). Text hidden by default.
+#: lib/groupprofileblock.php:93
+msgid "Group actions"
 msgstr ""
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:119
-#, php-format
-msgctxt "TOOLTIP"
-msgid "%s blocked users"
-msgstr ""
-
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: Menu item in primary navigation panel.
-#: lib/groupnav.php:125 lib/primarynav.php:66
-msgctxt "MENU"
-msgid "Admin"
-msgstr ""
-
-#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:128
+#: lib/groupprofileblock.php:120
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Edit %s group properties"
 msgstr ""
 
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/groupnav.php:134
-msgctxt "MENU"
-msgid "Logo"
-msgstr ""
-
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:137
+#: lib/groupprofileblock.php:129
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Add or edit %s logo"
 msgstr ""
 
-#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:146
-#, php-format
-msgctxt "TOOLTIP"
-msgid "Add or edit %s design"
-msgstr ""
-
-#. TRANS: Group actions header (h2). Text hidden by default.
-#: lib/groupprofileblock.php:94
-msgid "Group actions"
+#. TRANS: Link text for link on user profile.
+#: lib/groupprofileblock.php:131
+msgctxt "MENU"
+msgid "Logo"
 msgstr ""
 
 #. TRANS: Title for groups with the most members section.
@@ -9865,11 +9242,21 @@ msgstr ""
 msgid "Active groups"
 msgstr ""
 
-#. TRANS: Title for group tag cloud section.
-#. TRANS: %s is a group name.
-#: lib/grouptagcloudsection.php:57
-#, php-format
-msgid "Tags in %s group's notices"
+#. TRANS: Link description for seeing all groups.
+#. TRANS: Link description for seeing all lists.
+#: lib/groupsnav.php:89 lib/listsnav.php:88
+msgid "See all"
+msgstr ""
+
+#. TRANS: Link title for seeing all groups.
+#: lib/groupsnav.php:91
+msgid "See all groups you belong to."
+msgstr ""
+
+#. TRANS: Menu item title in personal group navigation menu.
+#. TRANS: %s is a username.
+#: lib/homestubnav.php:58
+msgid "Back to top"
 msgstr ""
 
 #. TRANS: Client exception 406
@@ -9937,7 +9324,7 @@ msgstr[1] ""
 #. TRANS: Body text for confirmation code e-mail.
 #. TRANS: %1$s is a user nickname, %2$s is the StatusNet sitename,
 #. TRANS: %3$s is the display name of an IM plugin.
-#: lib/implugin.php:265
+#: lib/implugin.php:264
 #, php-format
 msgid ""
 "User \"%1$s\" on %2$s has said that your %3$s screenname belongs to them. If "
@@ -9949,18 +9336,18 @@ msgstr ""
 
 #. TRANS: Exception thrown when trying to deliver a notice to an unknown inbox.
 #. TRANS: %d is the unknown inbox ID (number).
-#: lib/implugin.php:353
+#: lib/implugin.php:352
 #, php-format
 msgid "Unknown inbox source %d."
 msgstr ""
 
 #. TRANS: Server exception thrown trying to initialise an IM plugin without meeting all prerequisites.
-#: lib/implugin.php:629
+#: lib/implugin.php:633
 msgid "Queueing must be enabled to use IM plugins."
 msgstr ""
 
 #. TRANS: Server exception thrown trying to initialise an IM plugin without a transport method.
-#: lib/implugin.php:634
+#: lib/implugin.php:638
 msgid "Transport cannot be null."
 msgstr ""
 
@@ -9970,12 +9357,49 @@ msgctxt "TITLE"
 msgid "Trends"
 msgstr ""
 
-#. TRANS: Button text for inviting more users to the StatusNet instance.
-#: lib/invitebuttonsection.php:60
+#. TRANS: Default button text for inviting more users to the StatusNet instance.
+#: lib/invitebuttonsection.php:56
 msgctxt "BUTTON"
 msgid "Invite more colleagues"
 msgstr ""
 
+#. TRANS: Form legend.
+#: lib/inviteform.php:85
+msgid "Invite collegues"
+msgstr ""
+
+#. TRANS: Field label for a list of e-mail addresses.
+#: lib/inviteform.php:100
+msgid "Email addresses"
+msgstr ""
+
+#. TRANS: Field title for a list of e-mail addresses.
+#: lib/inviteform.php:103
+msgid "Addresses of friends to invite (one per line)."
+msgstr ""
+
+#. TRANS: Field label for a personal message to send to invitees.
+#: lib/inviteform.php:109
+msgid "Personal message"
+msgstr ""
+
+#. TRANS: Field title for a personal message to send to invitees.
+#: lib/inviteform.php:112
+msgid "Optionally add a personal message to the invitation."
+msgstr ""
+
+#. TRANS: Send button for inviting friends
+#. TRANS: Button text for sending notice.
+#: lib/inviteform.php:128 lib/noticeform.php:302
+msgctxt "BUTTON"
+msgid "Send"
+msgstr ""
+
+#. TRANS: Submit button title.
+#: lib/inviteform.php:131
+msgid "Send invitations."
+msgstr ""
+
 #. TRANS: Button text for joining a group.
 #: lib/joinform.php:108
 msgctxt "BUTTON"
@@ -9988,6 +9412,11 @@ msgctxt "BUTTON"
 msgid "Leave"
 msgstr ""
 
+#. TRANS: Link title for seeing all lists.
+#: lib/listsnav.php:90
+msgid "See all lists you have created."
+msgstr ""
+
 #. TRANS: Menu item for logging in to the StatusNet site.
 #. TRANS: Menu item in primary navigation panel.
 #: lib/logingroupnav.php:64 lib/primarynav.php:82
@@ -10012,14 +9441,14 @@ msgid "Sign up for a new account"
 msgstr ""
 
 #. TRANS: Subject for address confirmation email.
-#: lib/mail.php:172
+#: lib/mail.php:179
 msgid "Email address confirmation"
 msgstr ""
 
 #. TRANS: Body for address confirmation email.
 #. TRANS: %1$s is the addressed user's nickname, %2$s is the StatusNet sitename,
 #. TRANS: %3$s is the URL to confirm at.
-#: lib/mail.php:177
+#: lib/mail.php:184
 #, php-format
 msgid ""
 "Hey, %1$s.\n"
@@ -10040,21 +9469,21 @@ msgstr ""
 #. TRANS: %1$s is the subscribing user's nickname, %2$s is the StatusNet sitename.
 #. TRANS: Main body of new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscriber's long name, %2$s is the StatusNet sitename.
-#: lib/mail.php:243 lib/mail.php:250
+#: lib/mail.php:250 lib/mail.php:256
 #, php-format
-msgid "%1$s is now listening to your notices on %2$s."
+msgid "%1$s is now following you on %2$s."
 msgstr ""
 
 #. TRANS: Subject of pending new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscribing user's nickname, %2$s is the StatusNet sitename.
-#: lib/mail.php:284
+#: lib/mail.php:290
 #, php-format
 msgid "%1$s would like to listen to your notices on %2$s."
 msgstr ""
 
 #. TRANS: Main body of pending new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscriber's long name, %2$s is the StatusNet sitename.
-#: lib/mail.php:291
+#: lib/mail.php:297
 #, php-format
 msgid ""
 "%1$s would like to listen to your notices on %2$s. You may approve or reject "
@@ -10064,7 +9493,7 @@ msgstr ""
 #. TRANS: Common footer block for StatusNet notification emails.
 #. TRANS: %1$s is the StatusNet sitename,
 #. TRANS: %2$s is a link to the addressed user's e-mail settings.
-#: lib/mail.php:310
+#: lib/mail.php:316
 #, php-format
 msgid ""
 "Faithfully yours,\n"
@@ -10076,21 +9505,21 @@ msgstr ""
 
 #. TRANS: Profile info line in notification e-mail.
 #. TRANS: %s is a URL.
-#: lib/mail.php:335
+#: lib/mail.php:341
 #, php-format
 msgid "Profile: %s"
 msgstr ""
 
 #. TRANS: Profile info line in notification e-mail.
 #. TRANS: %s is biographical information.
-#: lib/mail.php:349
+#: lib/mail.php:355
 #, php-format
 msgid "Bio: %s"
 msgstr ""
 
 #. TRANS: This is a paragraph in a new-subscriber e-mail.
 #. TRANS: %s is a URL where the subscriber can be reported as abusive.
-#: lib/mail.php:359
+#: lib/mail.php:365
 #, php-format
 msgid ""
 "If you believe this account is being used abusively, you can block them from "
@@ -10099,7 +9528,7 @@ msgstr ""
 
 #. TRANS: Subject of notification mail for new posting email address.
 #. TRANS: %s is the StatusNet sitename.
-#: lib/mail.php:387
+#: lib/mail.php:393
 #, php-format
 msgid "New email address for posting to %s"
 msgstr ""
@@ -10107,7 +9536,7 @@ msgstr ""
 #. TRANS: Body of notification mail for new posting email address.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is the e-mail address to send
 #. TRANS: to to post by e-mail, %3$s is a URL to more instructions.
-#: lib/mail.php:393
+#: lib/mail.php:399
 #, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
@@ -10119,26 +9548,26 @@ msgstr ""
 
 #. TRANS: Subject line for SMS-by-email notification messages.
 #. TRANS: %s is the posting user's nickname.
-#: lib/mail.php:514
+#: lib/mail.php:523
 #, php-format
 msgid "%s status"
 msgstr ""
 
 #. TRANS: Subject line for SMS-by-email address confirmation message.
-#: lib/mail.php:540
+#: lib/mail.php:549
 msgid "SMS confirmation"
 msgstr ""
 
 #. TRANS: Main body heading for SMS-by-email address confirmation message.
 #. TRANS: %s is the addressed user's nickname.
-#: lib/mail.php:544
+#: lib/mail.php:553
 #, php-format
 msgid "%s: confirm you own this phone number with this code:"
 msgstr ""
 
 #. TRANS: Subject for 'nudge' notification email.
 #. TRANS: %s is the nudging user.
-#: lib/mail.php:565
+#: lib/mail.php:574
 #, php-format
 msgid "You have been nudged by %s"
 msgstr ""
@@ -10146,7 +9575,7 @@ msgstr ""
 #. TRANS: Body for 'nudge' notification email.
 #. TRANS: %1$s is the nuding user's long name, $2$s is the nudging user's nickname,
 #. TRANS: %3$s is a URL to post notices at.
-#: lib/mail.php:572
+#: lib/mail.php:581
 #, php-format
 msgid ""
 "%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -10161,7 +9590,7 @@ msgstr ""
 
 #. TRANS: Subject for direct-message notification email.
 #. TRANS: %s is the sending user's nickname.
-#: lib/mail.php:617
+#: lib/mail.php:626
 #, php-format
 msgid "New private message from %s"
 msgstr ""
@@ -10169,7 +9598,7 @@ msgstr ""
 #. TRANS: Body for direct-message notification email.
 #. TRANS: %1$s is the sending user's long name, %2$s is the sending user's nickname,
 #. TRANS: %3$s is the message content, %4$s a URL to the message,
-#: lib/mail.php:624
+#: lib/mail.php:633
 #, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
@@ -10187,7 +9616,7 @@ msgstr ""
 
 #. TRANS: Subject for favorite notification e-mail.
 #. TRANS: %1$s is the adding user's long name, %2$s is the adding user's nickname.
-#: lib/mail.php:674
+#: lib/mail.php:683
 #, php-format
 msgid "%1$s (@%2$s) added your notice as a favorite"
 msgstr ""
@@ -10197,7 +9626,7 @@ msgstr ""
 #. TRANS: %3$s is a URL to the faved notice, %4$s is the faved notice text,
 #. TRANS: %5$s is a URL to all faves of the adding user, %6$s is the StatusNet sitename,
 #. TRANS: %7$s is the adding user's nickname.
-#: lib/mail.php:681
+#: lib/mail.php:690
 #, php-format
 msgid ""
 "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -10216,7 +9645,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:738
+#: lib/mail.php:747
 #, php-format
 msgid ""
 "The full conversation can be read here:\n"
@@ -10226,7 +9655,7 @@ msgstr ""
 
 #. TRANS: E-mail subject for notice notification.
 #. TRANS: %1$s is the sending user's long name, %2$s is the adding user's nickname.
-#: lib/mail.php:746
+#: lib/mail.php:755
 #, php-format
 msgid "%1$s (@%2$s) sent a notice to your attention"
 msgstr ""
@@ -10234,9 +9663,9 @@ msgstr ""
 #. TRANS: Body of @-reply notification e-mail.
 #. TRANS: %1$s is the sending user's name, $2$s is the StatusNet sitename,
 #. TRANS: %3$s is a URL to the notice, %4$s is the notice text,
-#. TRANS: %5$s is a URL to the full conversion if it exists (otherwise empty),
+#. TRANS: %5$s is the text "The full conversation can be read here:" and a URL to the full conversion if it exists (otherwise empty),
 #. TRANS: %6$s is a URL to reply to the notice, %7$s is a URL to all @-replies for the addressed user,
-#: lib/mail.php:753
+#: lib/mail.php:762
 #, php-format
 msgid ""
 "%1$s just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -10260,18 +9689,23 @@ msgstr ""
 
 #. TRANS: Subject of group join notification e-mail.
 #. TRANS: %1$s is the joining user's nickname, %2$s is the group name, and %3$s is the StatusNet sitename.
+#: lib/mail.php:833
+#, php-format
+msgid "%1$s has joined your group %2$s on %3$s"
+msgstr ""
+
 #. TRANS: Main body of group join notification e-mail.
 #. TRANS: %1$s is the subscriber's long name, %2$s is the group name, and %3$s is the StatusNet sitename,
 #. TRANS: %4$s is a block of profile info about the subscriber.
 #. TRANS: %5$s is a link to the addressed user's e-mail settings.
-#: lib/mail.php:824 lib/mail.php:834
+#: lib/mail.php:843
 #, php-format
 msgid "%1$s has joined your group %2$s on %3$s."
 msgstr ""
 
 #. TRANS: Subject of pending group join request notification e-mail.
 #. TRANS: %1$s is the joining user's nickname, %2$s is the group name, and %3$s is the StatusNet sitename.
-#: lib/mail.php:871
+#: lib/mail.php:880
 #, php-format
 msgid "%1$s wants to join your group %2$s on %3$s."
 msgstr ""
@@ -10279,7 +9713,7 @@ msgstr ""
 #. TRANS: Main body of pending group join request notification e-mail.
 #. TRANS: %1$s is the subscriber's long name, %2$s is the group name, and %3$s is the StatusNet sitename,
 #. TRANS: %4$s is the URL to the moderation queue page.
-#: lib/mail.php:879
+#: lib/mail.php:888
 #, php-format
 msgid ""
 "%1$s would like to join your group %2$s on %3$s. You may approve or reject "
@@ -10361,7 +9795,7 @@ msgstr ""
 #. TRANS: Submit button title.
 #: lib/makeadminform.php:124
 msgctxt "TOOLTIP"
-msgid "Make this user an admin"
+msgid "Make this user an admin."
 msgstr ""
 
 #. TRANS: Client exception thrown when a database error was thrown during a file upload operation.
@@ -10415,7 +9849,7 @@ msgstr ""
 msgid "Select recipient:"
 msgstr ""
 
-#. TRANS Entry in drop-down selection box in direct-message inbox/outbox when no one is available to message.
+#. TRANS: Entry in drop-down selection box in direct-message inbox/outbox when no one is available to message.
 #: lib/messageform.php:145
 msgid "No mutual subscribers."
 msgstr ""
@@ -10438,12 +9872,12 @@ msgstr ""
 
 #. TRANS: Followed by notice source (usually the client used to send the notice).
 #. TRANS: Followed by notice source.
-#: lib/messagelistitem.php:123 lib/noticelistitem.php:500
+#: lib/messagelistitem.php:123 lib/noticelistitem.php:526
 msgid "from"
 msgstr ""
 
 #. TRANS: A possible notice source (web interface).
-#: lib/messagelistitem.php:144 lib/noticelistitem.php:495
+#: lib/messagelistitem.php:144 lib/noticelistitem.php:521
 msgctxt "SOURCE"
 msgid "web"
 msgstr ""
@@ -10473,30 +9907,35 @@ msgid "api"
 msgstr ""
 
 #. TRANS: Client exception thrown when no author for an activity was found.
-#: lib/microappplugin.php:356
+#: lib/microappplugin.php:358
 msgid "Cannot get author for activity."
 msgstr ""
 
 #. TRANS: Client exception thrown when ...
-#: lib/microappplugin.php:394
+#: lib/microappplugin.php:396
 msgid "Bookmark not posted to this group."
 msgstr ""
 
 #. TRANS: Client exception when ...
-#: lib/microappplugin.php:408
+#: lib/microappplugin.php:410
 msgid "Object not posted to this user."
 msgstr ""
 
 #. TRANS: Server exception thrown when a micro app plugin uses a target that cannot be handled.
-#: lib/microappplugin.php:412
+#: lib/microappplugin.php:414
 msgid "Do not know how to handle this kind of target."
 msgstr ""
 
 #. TRANS: Server exception thrown when a micro app plugin developer has not done his job too well.
-#: lib/microappplugin.php:554
+#: lib/microappplugin.php:556
 msgid "You must implement either adaptNoticeListItem() or showNotice()."
 msgstr ""
 
+#. TRANS: Link description to show more items in a list.
+#: lib/moremenu.php:98
+msgid "More â–¼"
+msgstr ""
+
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 #: lib/nickname.php:178
 msgid "Nickname cannot be empty."
@@ -10549,33 +9988,28 @@ msgid ""
 msgstr ""
 
 #. TRANS: Separator in profile addressees list.
-#: lib/noticelistitem.php:246 lib/noticelistitem.php:272
+#: lib/noticelistitem.php:255
 msgctxt "SEPARATOR"
 msgid ", "
 msgstr ""
 
-#. TRANS: Start of profile addressees list.
-#: lib/noticelistitem.php:248 lib/noticelistitem.php:275
-msgid " â–¸ "
-msgstr ""
-
 #. TRANS: Used in coordinates as abbreviation of north.
-#: lib/noticelistitem.php:423
+#: lib/noticelistitem.php:449
 msgid "N"
 msgstr ""
 
 #. TRANS: Used in coordinates as abbreviation of south.
-#: lib/noticelistitem.php:425
+#: lib/noticelistitem.php:451
 msgid "S"
 msgstr ""
 
 #. TRANS: Used in coordinates as abbreviation of east.
-#: lib/noticelistitem.php:427
+#: lib/noticelistitem.php:453
 msgid "E"
 msgstr ""
 
 #. TRANS: Used in coordinates as abbreviation of west.
-#: lib/noticelistitem.php:429
+#: lib/noticelistitem.php:455
 msgid "W"
 msgstr ""
 
@@ -10584,43 +10018,43 @@ msgstr ""
 #. TRANS: %3$s is lattitude seconds, %4$s is N (north) or S (south) depending on lattitude,
 #. TRANS: %5$s is longitude degrees, %6$s is longitude minutes,
 #. TRANS: %7$s is longitude seconds, %8$s is E (east) or W (west) depending on longitude,
-#: lib/noticelistitem.php:436
+#: lib/noticelistitem.php:462
 #, php-format
 msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 msgstr ""
 
 #. TRANS: Followed by geo location.
-#: lib/noticelistitem.php:446
+#: lib/noticelistitem.php:472
 msgid "at"
 msgstr ""
 
 #. TRANS: Addition in notice list item if notice is part of a conversation.
-#: lib/noticelistitem.php:561
+#: lib/noticelistitem.php:587
 msgid "in context"
 msgstr ""
 
 #. TRANS: Addition in notice list item if notice was repeated. Followed by a span with a nickname.
-#: lib/noticelistitem.php:596
+#: lib/noticelistitem.php:622
 msgid "Repeated by"
 msgstr ""
 
 #. TRANS: Link title in notice list item to reply to a notice.
-#: lib/noticelistitem.php:623
-msgid "Reply to this notice"
+#: lib/noticelistitem.php:650
+msgid "Reply to this notice."
 msgstr ""
 
 #. TRANS: Link text in notice list item to reply to a notice.
-#: lib/noticelistitem.php:625
+#: lib/noticelistitem.php:652
 msgid "Reply"
 msgstr ""
 
 #. TRANS: Link title in notice list item to delete a notice.
-#: lib/noticelistitem.php:651
-msgid "Delete this notice"
+#: lib/noticelistitem.php:678
+msgid "Delete this notice from the timeline."
 msgstr ""
 
 #. TRANS: Title for repeat form status in notice list when a notice has been repeated.
-#: lib/noticelistitem.php:674
+#: lib/noticelistitem.php:701
 msgid "Notice repeated."
 msgstr ""
 
@@ -10645,31 +10079,6 @@ msgstr ""
 msgid "Send a nudge to this user."
 msgstr ""
 
-#. TRANS: Exception thrown when creating a new profile fails in OAuth store.
-#: lib/oauthstore.php:291
-msgid "Error inserting new profile."
-msgstr ""
-
-#. TRANS: Exception thrown when creating a new avatar fails in OAuth store.
-#: lib/oauthstore.php:300
-msgid "Error inserting avatar."
-msgstr ""
-
-#. TRANS: Exception thrown when creating a remote profile fails in OAuth store.
-#: lib/oauthstore.php:322
-msgid "Error inserting remote profile."
-msgstr ""
-
-#. TRANS: Exception thrown when a notice is denied because it has been sent before.
-#: lib/oauthstore.php:362
-msgid "Duplicate notice."
-msgstr ""
-
-#. TRANS: Exception thrown when creating a new subscription fails in OAuth store.
-#: lib/oauthstore.php:509
-msgid "Could not insert new subscription."
-msgstr ""
-
 #. TRANS: Server exception thrown in oEmbed action if no API endpoint is available.
 #: lib/oembedhelper.php:135
 msgid "No oEmbed API endpoint available."
@@ -10717,56 +10126,51 @@ msgid "Search"
 msgstr ""
 
 #. TRANS: Menu item in list navigation panel.
-#: lib/peopletaggroupnav.php:107
+#: lib/peopletaggroupnav.php:113
 msgctxt "MENU"
 msgid "List"
 msgstr ""
 
 #. TRANS: Menu item title in list navigation panel.
 #. TRANS: %1$s is a list, %2$s is a nickname.
-#: lib/peopletaggroupnav.php:110 lib/peopletaggroupnav.php:121
+#: lib/peopletaggroupnav.php:116 lib/peopletaggroupnav.php:127
 #, php-format
 msgid "%1$s list by %2$s."
 msgstr ""
 
 #. TRANS: Menu item in list navigation panel.
-#: lib/peopletaggroupnav.php:118
+#: lib/peopletaggroupnav.php:124
 msgctxt "MENU"
 msgid "Listed"
 msgstr ""
 
 #. TRANS: Menu item in list navigation panel.
 #. TRANS: Menu item in local navigation menu.
-#: lib/peopletaggroupnav.php:129 lib/subgroupnav.php:96
+#: lib/peopletaggroupnav.php:135 lib/subgroupnav.php:96
 msgctxt "MENU"
 msgid "Subscribers"
 msgstr ""
 
 #. TRANS: Menu item title in list navigation panel.
 #. TRANS: %1$s is a list, %2$s is a nickname.
-#: lib/peopletaggroupnav.php:132
+#: lib/peopletaggroupnav.php:138
 #, php-format
 msgid "Subscribers to %1$s list by %2$s."
 msgstr ""
 
 #. TRANS: Menu item in list navigation panel.
-#: lib/peopletaggroupnav.php:142
+#: lib/peopletaggroupnav.php:148
 msgctxt "MENU"
 msgid "Edit"
 msgstr ""
 
 #. TRANS: Menu item title in list navigation panel.
 #. TRANS: %s is a list.
-#: lib/peopletaggroupnav.php:145
+#: lib/peopletaggroupnav.php:151
 #, php-format
 msgid "Edit %s list by you."
 msgstr ""
 
-#. TRANS: Link description for link to list of users tagged with a tag.
-#: lib/peopletaglist.php:173
-msgid "Tagged"
-msgstr ""
-
 #. TRANS: Title for link to edit list settings.
 #: lib/peopletaglist.php:196
 msgid "Edit list settings."
@@ -10880,7 +10284,7 @@ msgstr ""
 #. TRANS: Menu item in personal group navigation menu.
 #. TRANS: Menu item in settings navigation panel.
 #. TRANS: Menu item in local navigation menu.
-#: lib/personalgroupnav.php:82 lib/settingsnav.php:87 lib/subgroupnav.php:77
+#: lib/personalgroupnav.php:82 lib/settingsnav.php:74 lib/subgroupnav.php:77
 msgctxt "MENU"
 msgid "Profile"
 msgstr ""
@@ -10936,9 +10340,11 @@ msgctxt "plugin"
 msgid "Enable"
 msgstr ""
 
-#: lib/pluginlist.php:196
+#. TRANS: Plugin description for a disabled plugin.
+#: lib/pluginlist.php:195
 msgctxt "plugin-description"
-msgid "(Plugin descriptions unavailable when disabled.)"
+msgid ""
+"(The plugin description is unavailable when a plugin has been disabled.)"
 msgstr ""
 
 #. TRANS: Menu item in primary navigation panel.
@@ -10952,6 +10358,12 @@ msgstr ""
 msgid "Change your personal settings."
 msgstr ""
 
+#. TRANS: Menu item in primary navigation panel.
+#: lib/primarynav.php:66
+msgctxt "MENU"
+msgid "Admin"
+msgstr ""
+
 #. TRANS: Menu item title in primary navigation panel.
 #: lib/primarynav.php:68
 msgid "Site configuration."
@@ -10973,55 +10385,48 @@ msgstr ""
 msgid "Login to the site."
 msgstr ""
 
-#. TRANS: Menu item in primary navigation panel.
-#: lib/primarynav.php:92
-msgctxt "MENU"
-msgid "Search"
-msgstr ""
-
-#. TRANS: Menu item title in primary navigation panel.
-#: lib/primarynav.php:94
-msgid "Search the site."
+#: lib/profileaction.php:93
+msgid "This profile has been silenced by site moderators"
 msgstr ""
 
 #. TRANS: H2 text for user subscription statistics.
-#: lib/profileaction.php:128
+#: lib/profileaction.php:135
 msgid "Following"
 msgstr ""
 
 #. TRANS: H2 text for user subscriber statistics.
-#: lib/profileaction.php:160
+#: lib/profileaction.php:167
 msgid "Followers"
 msgstr ""
 
+#. TRANS: H2 text for user statistics.
+#: lib/profileaction.php:203
+msgid "Statistics"
+msgstr ""
+
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:204
+#: lib/profileaction.php:211
 msgid "User ID"
 msgstr ""
 
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:210
+#: lib/profileaction.php:217
 msgid "Member since"
 msgstr ""
 
-#. TRANS: Label for user statistics.
-#: lib/profileaction.php:216
-msgid "Notices"
-msgstr ""
-
 #. TRANS: Label for user statistics.
 #. TRANS: Average count of posts made per day since account registration.
-#: lib/profileaction.php:223
+#: lib/profileaction.php:230
 msgid "Daily average"
 msgstr ""
 
 #. TRANS: H2 text for user group membership statistics.
-#: lib/profileaction.php:260
+#: lib/profileaction.php:267
 msgid "Groups"
 msgstr ""
 
 #. TRANS: H2 text for user list membership statistics.
-#: lib/profileaction.php:298
+#: lib/profileaction.php:305
 msgid "Lists"
 msgstr ""
 
@@ -11031,29 +10436,29 @@ msgid "Unimplemented method."
 msgstr ""
 
 #. TRANS: Menu item title in search group navigation panel.
-#: lib/publicgroupnav.php:73
+#: lib/publicgroupnav.php:75
 msgid "User groups"
 msgstr ""
 
 #. TRANS: Menu item in search group navigation panel.
-#: lib/publicgroupnav.php:76
+#: lib/publicgroupnav.php:79
 msgctxt "MENU"
 msgid "Recent tags"
 msgstr ""
 
 #. TRANS: Menu item title in search group navigation panel.
-#: lib/publicgroupnav.php:78
+#: lib/publicgroupnav.php:81
 msgid "Recent tags"
 msgstr ""
 
 #. TRANS: Menu item in search group navigation panel.
-#: lib/publicgroupnav.php:82
+#: lib/publicgroupnav.php:86
 msgctxt "MENU"
 msgid "Featured"
 msgstr ""
 
 #. TRANS: Menu item in search group navigation panel.
-#: lib/publicgroupnav.php:88
+#: lib/publicgroupnav.php:93
 msgctxt "MENU"
 msgid "Popular"
 msgstr ""
@@ -11086,7 +10491,7 @@ msgid "Revoke the \"%s\" role from this user"
 msgstr ""
 
 #. TRANS: Client error on action trying to visit a non-existing page.
-#: lib/router.php:1159
+#: lib/router.php:1140
 msgid "Page not found."
 msgstr ""
 
@@ -11113,8 +10518,9 @@ msgid "Keyword(s)"
 msgstr ""
 
 #. TRANS: Button text for searching site.
+#. TRANS: Button text for search button on search form.
 #. TRANS: Button text to search profiles.
-#: lib/searchaction.php:116 lib/togglepeopletag.php:134
+#: lib/searchaction.php:116 lib/searchform.php:76 lib/togglepeopletag.php:134
 msgctxt "BUTTON"
 msgid "Search"
 msgstr ""
@@ -11169,24 +10575,6 @@ msgstr ""
 msgid "Find groups on this site"
 msgstr ""
 
-#. TRANS: Secondary navigation menu item leading to help on StatusNet.
-#: lib/secondarynav.php:56
-msgctxt "MENU"
-msgid "Help"
-msgstr ""
-
-#. TRANS: Secondary navigation menu item leading to text about StatusNet site.
-#: lib/secondarynav.php:59
-msgctxt "MENU"
-msgid "About"
-msgstr ""
-
-#. TRANS: Secondary navigation menu item leading to Frequently Asked Questions.
-#: lib/secondarynav.php:62
-msgctxt "MENU"
-msgid "FAQ"
-msgstr ""
-
 #. TRANS: Secondary navigation menu item leading to Terms of Service.
 #: lib/secondarynav.php:67
 msgctxt "MENU"
@@ -11211,19 +10599,6 @@ msgctxt "MENU"
 msgid "Version"
 msgstr ""
 
-#. TRANS: Secondary navigation menu item leading to e-mail contact information on the
-#. TRANS: StatusNet site, where to report bugs, ...
-#: lib/secondarynav.php:81
-msgctxt "MENU"
-msgid "Contact"
-msgstr ""
-
-#. TRANS: Secondary navigation menu item. Leads to information about embedding a timeline widget.
-#: lib/secondarynav.php:84
-msgctxt "MENU"
-msgid "Badge"
-msgstr ""
-
 #. TRANS: Default title for section/sidebar widget.
 #: lib/section.php:105
 msgid "Untitled section"
@@ -11235,98 +10610,104 @@ msgid "More..."
 msgstr ""
 
 #. TRANS: Header in settings navigation panel.
-#: lib/settingsnav.php:81
+#: lib/settingsnav.php:68
 msgctxt "HEADER"
 msgid "Settings"
 msgstr ""
 
 #. TRANS: Menu item title in settings navigation panel.
-#: lib/settingsnav.php:89
+#: lib/settingsnav.php:76
 msgid "Change your profile settings"
 msgstr ""
 
 #. TRANS: Menu item in settings navigation panel.
-#: lib/settingsnav.php:94
+#: lib/settingsnav.php:81
 msgctxt "MENU"
 msgid "Avatar"
 msgstr ""
 
 #. TRANS: Menu item title in settings navigation panel.
-#: lib/settingsnav.php:96
+#: lib/settingsnav.php:83
 msgid "Upload an avatar"
 msgstr ""
 
 #. TRANS: Menu item in settings navigation panel.
-#: lib/settingsnav.php:101
+#: lib/settingsnav.php:88
 msgctxt "MENU"
 msgid "Password"
 msgstr ""
 
 #. TRANS: Menu item title in settings navigation panel.
-#: lib/settingsnav.php:103
+#: lib/settingsnav.php:90
 msgid "Change your password"
 msgstr ""
 
 #. TRANS: Menu item in settings navigation panel.
-#: lib/settingsnav.php:108
+#: lib/settingsnav.php:95
 msgctxt "MENU"
 msgid "Email"
 msgstr ""
 
 #. TRANS: Menu item title in settings navigation panel.
-#: lib/settingsnav.php:110
+#: lib/settingsnav.php:97
 msgid "Change email handling"
 msgstr ""
 
-#. TRANS: Menu item title in settings navigation panel.
-#: lib/settingsnav.php:117
-msgid "Design your profile"
-msgstr ""
-
 #. TRANS: Menu item in settings navigation panel.
-#: lib/settingsnav.php:122
+#: lib/settingsnav.php:102
 msgctxt "MENU"
 msgid "URL"
 msgstr ""
 
 #. TRANS: Menu item title in settings navigation panel.
-#: lib/settingsnav.php:124
+#: lib/settingsnav.php:104
 msgid "URL shorteners"
 msgstr ""
 
 #. TRANS: Menu item in settings navigation panel.
-#: lib/settingsnav.php:132
+#: lib/settingsnav.php:116
 msgctxt "MENU"
 msgid "IM"
 msgstr ""
 
 #. TRANS: Menu item title in settings navigation panel.
-#: lib/settingsnav.php:134
+#: lib/settingsnav.php:118
 msgid "Updates by instant messenger (IM)"
 msgstr ""
 
 #. TRANS: Menu item in settings navigation panel.
-#: lib/settingsnav.php:141
+#: lib/settingsnav.php:125
 msgctxt "MENU"
 msgid "SMS"
 msgstr ""
 
 #. TRANS: Menu item title in settings navigation panel.
-#: lib/settingsnav.php:143
+#: lib/settingsnav.php:127
 msgid "Updates by SMS"
 msgstr ""
 
 #. TRANS: Menu item in settings navigation panel.
-#: lib/settingsnav.php:149
+#: lib/settingsnav.php:133
 msgctxt "MENU"
 msgid "Connections"
 msgstr ""
 
 #. TRANS: Menu item title in settings navigation panel.
-#: lib/settingsnav.php:151
+#: lib/settingsnav.php:135
 msgid "Authorized connected applications"
 msgstr ""
 
+#. TRANS: Menu item in settings navigation panel.
+#: lib/settingsnav.php:141
+msgctxt "MENU"
+msgid "Old school"
+msgstr ""
+
+#. TRANS: Menu item title in settings navigation panel.
+#: lib/settingsnav.php:143
+msgid "UI tweaks for old-school users"
+msgstr ""
+
 #. TRANS: Title of form to silence a user.
 #: lib/silenceform.php:65
 msgctxt "TITLE"
@@ -11338,6 +10719,47 @@ msgstr ""
 msgid "Silence this user"
 msgstr ""
 
+#. TRANS: Server error displayed when trying to create an anynymous OAuth consumer.
+#: lib/statusnetoauthstore.php:48
+msgid "Could not create anonymous consumer."
+msgstr ""
+
+#. TRANS: Server error displayed when trying to create an anynymous OAuth application.
+#: lib/statusnetoauthstore.php:72
+msgid "Could not create anonymous OAuth application."
+msgstr ""
+
+#. TRANS: Exception thrown when no token association could be found.
+#: lib/statusnetoauthstore.php:154
+msgid ""
+"Could not find a profile and application associated with the request token."
+msgstr ""
+
+#. TRANS: Exception thrown when no access token can be issued.
+#: lib/statusnetoauthstore.php:212
+msgid "Could not issue access token."
+msgstr ""
+
+#. TRANS: Exception thrown when a database error occurs.
+#: lib/statusnetoauthstore.php:320
+msgid "Database error inserting OAuth application user."
+msgstr ""
+
+#. TRANS: Exception thrown when a database error occurs.
+#: lib/statusnetoauthstore.php:348
+msgid "Database error updating OAuth application user."
+msgstr ""
+
+#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
+#: lib/statusnetoauthstore.php:374
+msgid "Tried to revoke unknown token."
+msgstr ""
+
+#. TRANS: Exception thrown when an attempt is made to remove a revoked token.
+#: lib/statusnetoauthstore.php:379
+msgid "Failed to delete revoked token."
+msgstr ""
+
 #. TRANS: Menu item in local navigation menu.
 #: lib/subgroupnav.php:85
 msgctxt "MENU"
@@ -11404,6 +10826,18 @@ msgstr ""
 msgid "Subscribe to this user"
 msgstr ""
 
+#. TRANS: Button text to subscribe to a user.
+#. TRANS: Button text for subscribing to a list.
+#: lib/subscribeform.php:130 lib/subscribepeopletagform.php:106
+msgctxt "BUTTON"
+msgid "Subscribe"
+msgstr ""
+
+#. TRANS: Button title to subscribe to a user.
+#: lib/subscribeform.php:132
+msgid "Subscribe to this user."
+msgstr ""
+
 #. TRANS: Title of personal tag cloud section.
 #: lib/subscriberspeopleselftagcloudsection.php:48
 #: lib/subscriptionspeopleselftagcloudsection.php:48
@@ -11423,7 +10857,7 @@ msgid "None"
 msgstr ""
 
 #. TRANS: Server exception displayed if a theme name was invalid.
-#: lib/theme.php:77
+#: lib/theme.php:79
 msgid "Invalid theme name."
 msgstr ""
 
@@ -11497,7 +10931,7 @@ msgstr ""
 
 #. TRANS: Link to show replies for a notice.
 #. TRANS: %d is the number of replies to a notice and used for plural.
-#: lib/threadednoticelist.php:355
+#: lib/threadednoticelist.php:371
 #, php-format
 msgid "Show reply"
 msgid_plural "Show all %d replies"
@@ -11505,21 +10939,21 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Reference to the logged in user in favourite list.
-#: lib/threadednoticelist.php:421
+#: lib/threadednoticelist.php:437
 msgctxt "FAVELIST"
 msgid "You"
 msgstr ""
 
 #. TRANS: For building a list such as "Jim, Bob, Mary and 5 others like this".
 #. TRANS: %1$s is a list of users, separated by a separator (default: ", "), %2$s is the last user in the list.
-#: lib/threadednoticelist.php:459
+#: lib/threadednoticelist.php:475
 #, php-format
 msgctxt "FAVELIST"
 msgid "%1$s and %2$s"
 msgstr ""
 
 #. TRANS: List message for notice favoured by logged in user.
-#: lib/threadednoticelist.php:493
+#: lib/threadednoticelist.php:509
 msgctxt "FAVELIST"
 msgid "You like this."
 msgstr ""
@@ -11527,7 +10961,7 @@ msgstr ""
 #. TRANS: List message for when more than 4 people like something.
 #. TRANS: %%s is a list of users liking a notice, %d is the number over 4 that like the notice.
 #. TRANS: Plural is decided on the total number of users liking the notice (count of %%s + %d).
-#: lib/threadednoticelist.php:498
+#: lib/threadednoticelist.php:514
 #, php-format
 msgid "%%s and %d others like this."
 msgid_plural "%%s and %d others like this."
@@ -11537,7 +10971,7 @@ msgstr[1] ""
 #. TRANS: List message for favoured notices.
 #. TRANS: %%s is a list of users liking a notice.
 #. TRANS: Plural is based on the number of of users that have favoured a notice.
-#: lib/threadednoticelist.php:506
+#: lib/threadednoticelist.php:522
 #, php-format
 msgid "%%s likes this."
 msgid_plural "%%s like this."
@@ -11545,17 +10979,28 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: List message for notice repeated by logged in user.
-#: lib/threadednoticelist.php:559
+#: lib/threadednoticelist.php:586
 msgctxt "REPEATLIST"
-msgid "You have repeated this notice."
+msgid "You repeated this."
 msgstr ""
 
-#. TRANS: List message for repeated notices.
-#. TRANS: %d is the number of users that have repeated a notice.
-#: lib/threadednoticelist.php:563
+#. TRANS: List message for when more than 4 people repeat something.
+#. TRANS: %%s is a list of users liking a notice, %d is the number over 4 that like the notice.
+#. TRANS: Plural is decided on the total number of users liking the notice (count of %%s + %d).
+#: lib/threadednoticelist.php:591
 #, php-format
-msgid "One person has repeated this notice."
-msgid_plural "%d people have repeated this notice."
+msgid "%%s and %d other repeated this."
+msgid_plural "%%s and %d others repeated this."
+msgstr[0] ""
+msgstr[1] ""
+
+#. TRANS: List message for favoured notices.
+#. TRANS: %%s is a list of users liking a notice.
+#. TRANS: Plural is based on the number of of users that have favoured a notice.
+#: lib/threadednoticelist.php:599
+#, php-format
+msgid "%%s repeated this."
+msgid_plural "%%s repeated this."
 msgstr[0] ""
 msgstr[1] ""
 
@@ -11668,8 +11113,7 @@ msgid "Unsilence this user"
 msgstr ""
 
 #. TRANS: Form legend on unsubscribe form.
-#. TRANS: Button title on unsubscribe form.
-#: lib/unsubscribeform.php:109 lib/unsubscribeform.php:134
+#: lib/unsubscribeform.php:109
 msgid "Unsubscribe from this user"
 msgstr ""
 
@@ -11680,6 +11124,11 @@ msgctxt "BUTTON"
 msgid "Unsubscribe"
 msgstr ""
 
+#. TRANS: Button title on unsubscribe form.
+#: lib/unsubscribeform.php:134
+msgid "Unsubscribe from this user."
+msgstr ""
+
 #. TRANS: Exception text shown when no profile can be found for a user.
 #. TRANS: %1$s is a user nickname, $2$d is a user ID (number).
 #: lib/usernoprofileexception.php:60
@@ -11693,17 +11142,17 @@ msgid "Not allowed to log in."
 msgstr ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1343
+#: lib/util.php:1346
 msgid "a few seconds ago"
 msgstr ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1346
+#: lib/util.php:1349
 msgid "about a minute ago"
 msgstr ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1350
+#: lib/util.php:1353
 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"
@@ -11711,12 +11160,12 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1353
+#: lib/util.php:1356
 msgid "about an hour ago"
 msgstr ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1357
+#: lib/util.php:1360
 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"
@@ -11724,12 +11173,12 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1360
+#: lib/util.php:1363
 msgid "about a day ago"
 msgstr ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1364
+#: lib/util.php:1367
 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"
@@ -11737,12 +11186,12 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1367
+#: lib/util.php:1370
 msgid "about a month ago"
 msgstr ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1371
+#: lib/util.php:1374
 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"
@@ -11750,7 +11199,7 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1374
+#: lib/util.php:1377
 msgid "about a year ago"
 msgstr ""
 
diff --git a/locale/sv/LC_MESSAGES/statusnet.po b/locale/sv/LC_MESSAGES/statusnet.po
index a9acb82f62..d5a8d6ffaf 100644
--- a/locale/sv/LC_MESSAGES/statusnet.po
+++ b/locale/sv/LC_MESSAGES/statusnet.po
@@ -1,6 +1,7 @@
-# Translation of StatusNet - Core to Swedish (Svenska)
+# Translation of StatusNet - Core to Swedish (svenska)
 # Exported from translatewiki.net
 #
+# Author: Ainali
 # Author: Jamminjohn
 # Author: Kjell
 # Author: McDutchie
@@ -14,17 +15,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:45+0000\n"
-"Language-Team: Swedish <http://translatewiki.net/wiki/Portal:sv>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:37+0000\n"
+"Language-Team: Swedish <https://translatewiki.net/wiki/Portal:sv>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: sv\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-05-05 10:52:40+0000\n"
+"X-POT-Import-Date: 2012-04-22 22:02:21+0000\n"
 
 #. TRANS: Database error message.
 #, php-format
@@ -39,14 +40,6 @@ msgstr ""
 "men du kan kontakta dem på %2$s för försäkra dig. Annars vänta ett par "
 "minuter och försök igen."
 
-#. TRANS: Error message.
-msgid ""
-"An important error occured, probably related to email setup. Check logfiles "
-"for more info."
-msgstr ""
-"Ett viktigt fel uppstod, förmodligen relaterat till e-postinställningar. "
-"Kontrollera loggfiler för mer info."
-
 #. TRANS: Error message.
 msgid "An error occurred."
 msgstr "Ett fel uppstod."
@@ -108,12 +101,11 @@ msgstr "Inaktivera nya registreringar."
 msgid "Closed"
 msgstr "Stängd"
 
-#. TRANS: Title for button to save access settings in site admin panel.
-msgid "Save access settings"
-msgstr "Spara inställningar för åtkomst"
+#. TRANS: Button title to save access settings in site admin panel.
+msgid "Save access settings."
+msgstr "Spara åtkomstinställningar."
 
-#. TRANS: Tooltip for button to save access settings in site admin panel.
-#. TRANS: Button text for saving theme settings.
+#. TRANS: Button text to save access settings in site admin panel.
 #. TRANS: Button label to save e-mail preferences.
 #. TRANS: Button label to save IM preferences.
 #. TRANS: Button text in the license admin panel.
@@ -129,7 +121,6 @@ msgstr "Spara inställningar för åtkomst"
 #. TRANS: Button text for saving "Other settings" in profile.
 #. TRANS: Button text to save user settings in user admin panel.
 #. TRANS: Button label in the "Edit application" form.
-#. TRANS: Button text on profile design page to save settings.
 #. TRANS: Text for save button on group edit form.
 #. TRANS: Button text to save tags for a profile.
 msgctxt "BUTTON"
@@ -168,10 +159,6 @@ msgstr "Ingen sådan profil."
 msgid "No such list."
 msgstr "Ingen sådan lista."
 
-#. TRANS: Client error displayed when trying to add an OMB 0.1 remote profile to a list.
-msgid "You cannot list an OMB 0.1 remote profile with this action."
-msgstr "Du kan inte lista en OMB 0,1-fjärrprofil med denna åtgärd."
-
 #. TRANS: Client error displayed when an unknown error occurs when adding a user to a list.
 #. TRANS: %s is a username.
 #, php-format
@@ -203,7 +190,6 @@ msgstr "Ingen sådan sida"
 #. TRANS: Client error when user not found for an rss related action.
 #. TRANS: Client error displayed when no existing user is provided for a user's delivery device setting.
 #. TRANS: Client error displayed if a user could not be found.
-#. TRANS: Client error when user not found updating a profile background image.
 #. TRANS: Client error displayed updating profile image without having a user object.
 #. TRANS: Client error displayed when making an Atom API request for an unknown user.
 #. TRANS: Client error displayed when trying to block a non-existing user or a user from another site.
@@ -229,14 +215,11 @@ msgstr "Ingen sådan sida"
 #. TRANS: Client error displayed when trying to get the RSS feed with favorites of a user that does not exist.
 #. TRANS: Client error displayed when requesting Friends of a Friend feed without providing a user nickname.
 #. TRANS: Client error displayed when requesting Friends of a Friend feed for an object that is not a user.
-#. TRANS: Client error displayed when trying to get a user hCard for a non-existing user.
 #. TRANS: Client error displayed trying to make a micro summary without providing a valid user.
 #. TRANS: Client error displayed trying to send a direct message to a non-existing user.
 #. TRANS: Client error displayed trying to use "one time password login" without using an existing user.
 #. TRANS: Client error displayed when referring to non-existing user.
 #. TRANS: Client error displayed trying to perform an action related to a non-existing user.
-#. TRANS: Form validation error on page for remote subscribe when no user was provided.
-#. TRANS: Form validation error on page for remote subscribe when no user profile was found.
 #. TRANS: Client error displayed when trying to reply to a non-exsting user.
 #. TRANS: Client error displayed when providing a non-existing nickname in a RSS 1.0 action.
 #. TRANS: Client error.
@@ -245,7 +228,6 @@ msgstr "Ingen sådan sida"
 #. TRANS: Client error displayed trying to find a user by ID for a non-existing ID.
 #. TRANS: Client error displayed requesting groups for a non-existing user.
 #. TRANS: Client error displayed when user not found for an action.
-#. TRANS: Client error displayed providing a non-existing nickname.
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #. TRANS: Client error displayed when trying to perform a gallery action with an unknown user.
 #. TRANS: Client error displayed when trying to access a mailbox without providing a user.
@@ -254,15 +236,21 @@ msgid "No such user."
 msgstr "Ingen sådan användare."
 
 #. TRANS: Title of a user's own start page.
-#, fuzzy
 msgid "Home timeline"
-msgstr "%s tidslinje"
+msgstr "Hemtidslinje"
 
 #. TRANS: Title of another user's start page.
 #. TRANS: %s is the other user's name.
-#, fuzzy, php-format
+#, php-format
 msgid "%s's home timeline"
-msgstr "%s tidslinje"
+msgstr "%ss hemtidslinje"
+
+#. TRANS: %s is user nickname.
+#. TRANS: Feed title.
+#. TRANS: %s is tagger's nickname.
+#, php-format
+msgid "Feed for friends of %s (Activity Streams JSON)"
+msgstr "Flöden för %ss vänner (Activity Streams JSON)"
 
 #. TRANS: %s is user nickname.
 #, php-format
@@ -307,7 +295,7 @@ msgstr ""
 "Var den första att [skriva i detta ämne](%%%%action.newnotice%%%%?"
 "status_textarea=%s)!"
 
-#. TRANS: Encoutagement displayed on empty timeline user pages for anonymous users.
+#. TRANS: Encouragement displayed on empty timeline user pages for anonymous users.
 #. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
 #. TRANS: Empty list message for page with replies for a user for not logged in users.
 #. TRANS: %1$s is a user nickname. This message contains a Markdown link in the form [link text](link).
@@ -321,6 +309,12 @@ msgstr ""
 "Varför inte [registrera ett konto](%%action.register%%) och bli först att "
 "posta en!"
 
+#. TRANS: Button text for inviting more users to the StatusNet instance.
+#. TRANS: Less business/enterprise-oriented language for public sites.
+msgctxt "BUTTON"
+msgid "Send invite"
+msgstr "Skicka inbjudning"
+
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Title of API timeline for a user and friends.
 #. TRANS: %s is a username.
@@ -329,8 +323,6 @@ msgstr ""
 #. TRANS: %s is a username.
 #. TRANS: Menu item title in personal group navigation menu.
 #. TRANS: %s is a username.
-#. TRANS: Menu item title in settings navigation panel.
-#. TRANS: %s is a username.
 #, php-format
 msgid "%s and friends"
 msgstr "%s och vänner"
@@ -368,7 +360,6 @@ msgstr "Du måste ange ett värdet på parametern 'device': sms, im, none"
 #. TRANS: Server error thrown on database error updating SMS preferences.
 #. TRANS: Server error thrown on database error removing a registered SMS phone number.
 #. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
-#. TRANS: Server exception thrown on Profile design page when updating design settings fails.
 msgid "Could not update user."
 msgstr "Kunde inte uppdatera användare."
 
@@ -383,7 +374,6 @@ msgstr "Kunde inte spara profil."
 
 #. TRANS: Client error displayed when the number of bytes in a POST request exceeds a limit.
 #. TRANS: %s is the number of bytes of the CONTENT_LENGTH.
-#. TRANS: Form validation error in design settings form. POST should remain untranslated.
 #, php-format
 msgid ""
 "The server was unable to handle that much POST data (%s byte) due to its "
@@ -398,24 +388,6 @@ msgstr[1] ""
 "Servern kunde inte hantera så mycket POST-data (%s byte) på grund av sin "
 "nuvarande konfiguration."
 
-#. TRANS: Client error displayed when saving design settings fails because of an empty id.
-#. TRANS: Client error displayed when saving design settings fails because of an empty result.
-#. TRANS: Client error displayed when a database error occurs inserting profile colours.
-#. TRANS: Client error displayed when a database error occurs updating profile colours.
-#. TRANS: Form validation error displayed when group design settings could not be saved because of an application issue.
-#. TRANS: Form validation error on Profile design page when saving design settings has failed.
-#. TRANS: Form validation error on Profile design page when updating design settings has failed.
-msgid "Unable to save your design settings."
-msgstr "Kunde inte spara dina utseendeinställningar."
-
-#. TRANS: Error displayed when updating design settings fails.
-#. TRANS: Client error displayed when a database error occurs updating profile colours.
-#. TRANS: Form validation error on Profile design page when updating design settings has failed.
-#. TRANS: Error message displayed if design settings could not be saved.
-#. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
-msgid "Could not update your design."
-msgstr "Kunde inte uppdatera din profils utseende."
-
 #. TRANS: Title for Atom feed.
 msgctxt "ATOM"
 msgid "Main"
@@ -462,6 +434,20 @@ msgstr "Blockering av användare misslyckades."
 msgid "Unblock user failed."
 msgstr "Hävning av blockering av användare misslyckades."
 
+#. TRANS: Client exception thrown when no conversation ID is given.
+msgid "No conversation ID."
+msgstr "Inget konversations-ID."
+
+#. TRANS: Client exception thrown when referring to a non-existing conversation ID (%d).
+#, php-format
+msgid "No conversation with ID %d."
+msgstr "Ingen konversation med ID %d."
+
+#. TRANS: Title for conversion timeline.
+msgctxt "TITLE"
+msgid "Conversation"
+msgstr "Konversation"
+
 #. TRANS: Title. %s is a user nickname.
 #, php-format
 msgid "Direct messages from %s"
@@ -505,6 +491,8 @@ msgid "Cannot send direct messages to users who aren't your friend."
 msgstr "Kan inte skicka direktmeddelanden till användare som inte är din vän."
 
 #. TRANS: Client error displayed trying to direct message self (403).
+#. TRANS: Client error displayed trying to send a direct message to self.
+#. TRANS: Error text shown when trying to send a direct message to self.
 msgid ""
 "Do not send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
@@ -735,7 +723,6 @@ msgstr "grupper på %s"
 
 #. TRANS: Client error displayed when trying to edit a group without being an admin.
 #. TRANS: Client error displayed trying to edit a group while not being a group admin.
-#. TRANS: Client error displayed trying to change group design settings without being a (group) admin.
 #. TRANS: Client error displayed when trying to change group logo settings while not being a group admin.
 msgid "You must be an admin to edit the group."
 msgstr "Du måste vara en administratör för att redigera gruppen."
@@ -845,7 +832,6 @@ msgstr "Databasfel vid infogning av oauth_token_association."
 
 #. TRANS: Client error given on when invalid data was passed through a form in the OAuth API.
 #. TRANS: Unexpected validation error on avatar upload form.
-#. TRANS: Client error displayed when the submitted form contains unexpected data.
 #. TRANS: Client error displayed submitting invalid form data for edit application.
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
 #. TRANS: Form validation error message when an unsupported argument is used.
@@ -854,7 +840,6 @@ msgstr "Databasfel vid infogning av oauth_token_association."
 #. TRANS: Client error when submitting a form with unexpected information.
 #. TRANS: Client error displayed when unexpected data is posted in the password recovery form.
 #. TRANS: Message given submitting a form with an unknown action in SMS settings.
-#. TRANS: Unknown form validation error in design settings form.
 msgid "Unexpected form submission."
 msgstr "Oväntat inskick av formulär."
 
@@ -899,7 +884,6 @@ msgstr "Konto"
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Field label on account registration page.
-#. TRANS: Label for nickname on user authorisation page.
 #. TRANS: Field label on group edit form.
 #. TRANS: Dropdown option for searching in profiles.
 msgid "Nickname"
@@ -1211,12 +1195,9 @@ msgstr "Du måste vara inloggad för att lämna en grupp."
 #. TRANS: Client error displayed when requesting Friends of a Friend feed for a nickname that is not a group.
 #. TRANS: Client error displayed trying to block a user from a group while specifying a non-existing group.
 #. TRANS: Client error displayed referring to a group's permalink for a non-existing group ID.
-#. TRANS: Client error displayed trying to change group design settings while providing a nickname for a non-existing group.
 #. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
 #. TRANS: Client error displayed when trying to view group members for a non-existing group.
 #. TRANS: Client error displayed when trying to view group members for an object that is not a group.
-#. TRANS: Client error displayed when trying to view group members for a non-existing group.
-#. TRANS: Client error displayed when trying to view group members for an object that is not a group.
 #. TRANS: Client error displayed when requesting a group RSS feed for group that does not exist.
 #. TRANS: Client error displayed when requesting a group RSS feed for an object that is not a group.
 #. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
@@ -1225,10 +1206,10 @@ msgstr "Du måste vara inloggad för att lämna en grupp."
 #. TRANS: Client error displayed when trying to leave a non-local group.
 #. TRANS: Client error displayed when trying to leave a non-existing group.
 #. TRANS: Client error displayed when providing an invalid group ID on the Make Admin page.
-#. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
-#. TRANS: Client error displayed if no local group with a given name was found requesting group page.
 #. TRANS: Command exception text shown when a group is requested that does not exist.
 #. TRANS: Error text shown when trying to leave a group that does not exist.
+#. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
+#. TRANS: Client error displayed if no local group with a given name was found requesting group page.
 msgid "No such group."
 msgstr "Ingen sådan grupp."
 
@@ -1298,6 +1279,7 @@ msgid "Join request canceled."
 msgstr "Anslutningsbegäran avbruten."
 
 #. TRANS: Client error displayed trying to approve subscription for a non-existing request.
+#. TRANS: %s is a user nickname.
 #, php-format
 msgid "%s is not in the moderation queue for your subscriptions."
 msgstr "%s är inte i moderationskön för dina prenumerationer."
@@ -1378,7 +1360,7 @@ msgstr "Okänd grupp."
 
 #. TRANS: Client exception thrown when trying to subscribe to an already subscribed group.
 msgid "Already a member."
-msgstr "Redan medlem."
+msgstr "Redan en medlem."
 
 #. TRANS: Client exception thrown when trying to subscribe to group while blocked from that group.
 msgid "Blocked by admin."
@@ -1449,7 +1431,6 @@ msgstr "Ingen sådan bilaga."
 #. TRANS: Client error displayed trying to get an avatar without providing a nickname.
 #. TRANS: Client error displayed when requesting a list of blocked users for a group without providing a group nickname.
 #. TRANS: Client error displayed trying to edit a group while not proving a nickname for the group to edit.
-#. TRANS: Client error displayed trying to change group design settings without providing a group nickname.
 #. TRANS: Client error displayed when trying to change group logo settings without providing a nickname.
 #. TRANS: Client error displayed when trying to view group members without providing a group nickname.
 #. TRANS: Client error displayed when requesting a group RSS feed without providing a group nickname.
@@ -1746,6 +1727,16 @@ msgstr "Adressen \"%s\" har blivit bekräftad för ditt konto."
 msgid "Conversation"
 msgstr "Konversationer"
 
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+msgid "Conversation feed (Activity Streams JSON)"
+msgstr "Konversationsflöde (Activity Streams JSON)"
+
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+msgid "Conversation feed (RSS 2.0)"
+msgstr "Konversationsflöde (RSS 2.0)"
+
 #. TRANS: Title for conversation page.
 #. TRANS: Title for page that shows a notice.
 msgctxt "TITLE"
@@ -1809,7 +1800,7 @@ msgid "Enter \"%s\" to confirm that you want to delete your account."
 msgstr "Ange \"%s\" för att bekräfta att du vill ta bort ditt konto."
 
 #. TRANS: Button title for user account deletion.
-msgid "Permanently delete your account"
+msgid "Permanently delete your account."
 msgstr "Ta bort ditt konto permanent."
 
 #. TRANS: Client error displayed trying to delete an application while not logged in.
@@ -1955,150 +1946,6 @@ msgstr "Ta inte bort den här användaren."
 msgid "Delete this user."
 msgstr "Ta bort den här användaren."
 
-#. TRANS: Message used as title for design settings for the site.
-msgid "Design"
-msgstr "Utseende"
-
-#. TRANS: Instructions for design adminsitration panel.
-msgid "Design settings for this StatusNet site"
-msgstr "Utseendeinställningar för den här StatusNet-webbplatsen"
-
-#. TRANS: Client error displayed when a logo URL does is not valid.
-msgid "Invalid logo URL."
-msgstr "Ogiltig webbadress för logtyp."
-
-#. TRANS: Client error displayed when an SSL logo URL is invalid.
-msgid "Invalid SSL logo URL."
-msgstr "Ogiltig webbadress för SSL-logtyp."
-
-#. TRANS: Client error displayed when a theme is submitted through the form that is not in the theme list.
-#. TRANS: %s is the chosen unavailable theme.
-#, php-format
-msgid "Theme not available: %s."
-msgstr "Tema inte tillgängligt: %s."
-
-#. TRANS: Fieldset legend for form to change logo.
-msgid "Change logo"
-msgstr "Byt logotyp"
-
-#. TRANS: Field label for StatusNet site logo.
-msgid "Site logo"
-msgstr "Webbplatslogotyp"
-
-#. TRANS: Field label for SSL StatusNet site logo.
-msgid "SSL logo"
-msgstr "SSL-logotyp"
-
-#. TRANS: Fieldset legend for form change StatusNet site's theme.
-msgid "Change theme"
-msgstr "Byt tema"
-
-#. TRANS: Field label for dropdown to choose site theme.
-msgid "Site theme"
-msgstr "Webbplatstema"
-
-#. TRANS: Title for field label for dropdown to choose site theme.
-msgid "Theme for the site."
-msgstr "Tema för webbplatsen."
-
-#. TRANS: Field label for uploading a cutom theme.
-msgid "Custom theme"
-msgstr "Anpassat tema"
-
-#. TRANS: Form instructions for uploading a cutom StatusNet theme.
-msgid "You can upload a custom StatusNet theme as a .ZIP archive."
-msgstr "Du kan ladda upp ett eget StatusNet-tema som ett .ZIP-arkiv."
-
-#. TRANS: Fieldset legend for theme background image.
-msgid "Change background image"
-msgstr "Ändra bakgrundsbild"
-
-#. TRANS: Field label for background image on theme designer page.
-#. TRANS: Field label for background color selector.
-#. TRANS: Label on profile design page for setting a profile page background colour.
-msgid "Background"
-msgstr "Bakgrund"
-
-#. TRANS: Form guide for background image upload form on theme designer page.
-#, php-format
-msgid ""
-"You can upload a background image for the site. The maximum file size is %1"
-"$s."
-msgstr ""
-"Du kan ladda upp en bakgrundsbild för denna webbplats. Den maximala "
-"filstorleken är %1$s."
-
-#. TRANS: Used as radio button label to add a background image.
-msgid "On"
-msgstr "PÃ¥"
-
-#. TRANS: Used as radio button label to not add a background image.
-msgid "Off"
-msgstr "Av"
-
-#. TRANS: Form guide for turning background image on or off on theme designer page.
-#. TRANS: Form guide for a set of radio buttons on the profile design page that will enable or disable
-#. TRANS: use of the uploaded profile image.
-msgid "Turn background image on or off."
-msgstr "Sätt på eller stäng av bakgrundsbild."
-
-#. TRANS: Checkbox label to title background image on theme designer page.
-#. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
-msgid "Tile background image"
-msgstr "Upprepa bakgrundsbild"
-
-#. TRANS: Fieldset legend for theme colors.
-msgid "Change colors"
-msgstr "Byt färger"
-
-#. TRANS: Field label for content color selector.
-#. TRANS: Label on profile design page for setting a profile page content colour.
-msgid "Content"
-msgstr "Innehåll"
-
-#. TRANS: Field label for sidebar color selector.
-#. TRANS: Label on profile design page for setting a profile page sidebar colour.
-msgid "Sidebar"
-msgstr "Sidofält"
-
-#. TRANS: Field label for text color selector.
-#. TRANS: Label on profile design page for setting a profile page text colour.
-msgid "Text"
-msgstr "Text"
-
-#. TRANS: Field label for link color selector.
-#. TRANS: Label on profile design page for setting a profile page links colour.
-msgid "Links"
-msgstr "Länkar"
-
-#. TRANS: Fieldset legend for advanced theme design settings.
-msgid "Advanced"
-msgstr "Avancerat"
-
-#. TRANS: Field label for custom CSS.
-msgid "Custom CSS"
-msgstr "Anpassad CSS"
-
-#. TRANS: Button text for resetting theme settings.
-msgctxt "BUTTON"
-msgid "Use defaults"
-msgstr "Använd standardvärden"
-
-#. TRANS: Title for button for resetting theme settings.
-#. TRANS: Title for button on profile design page to reset all colour settings to default.
-msgid "Restore default designs."
-msgstr "Återställ standardutseende."
-
-#. TRANS: Title for button for resetting theme settings.
-#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-msgid "Reset back to default."
-msgstr "Återställ till standard."
-
-#. TRANS: Title for button for saving theme settings.
-#. TRANS: Title for button on profile design page to save settings.
-msgid "Save design."
-msgstr "Spara utseende."
-
 #. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
 msgid "This notice is not a favorite!"
 msgstr "Denna notis är inte en favorit!"
@@ -2113,6 +1960,79 @@ msgstr "Lägg till i favoriter"
 msgid "No such document \"%s\"."
 msgstr "Inget sådant dokument \"%s\"."
 
+#. TRANS: Menu item in administrator navigation panel.
+#. TRANS: Menu item in default local navigation panel.
+#. TRANS: Menu item in personal group navigation menu.
+msgctxt "MENU"
+msgid "Home"
+msgstr "Hem"
+
+msgctxt "MENU"
+msgid "Docs"
+msgstr ""
+
+#. TRANS: Secondary navigation menu item leading to help on StatusNet.
+msgctxt "MENU"
+msgid "Help"
+msgstr "Hjälp"
+
+#, fuzzy
+msgid "Getting started"
+msgstr "Inställningar sparade."
+
+#. TRANS: Secondary navigation menu item leading to text about StatusNet site.
+msgctxt "MENU"
+msgid "About"
+msgstr "Om"
+
+#, fuzzy
+msgid "About this site"
+msgstr "Häv blockering av denna användare"
+
+#. TRANS: Secondary navigation menu item leading to Frequently Asked Questions.
+msgctxt "MENU"
+msgid "FAQ"
+msgstr "Vanliga frågor"
+
+msgid "Frequently asked questions"
+msgstr ""
+
+#. TRANS: Secondary navigation menu item leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+msgctxt "MENU"
+msgid "Contact"
+msgstr "Kontakt"
+
+#, fuzzy
+msgid "Contact info"
+msgstr "Kontakt"
+
+#, fuzzy
+msgctxt "MENU"
+msgid "Tags"
+msgstr "Taggar"
+
+msgid "Using tags"
+msgstr ""
+
+#. TRANS: Menu item in default local navigation panel.
+#. TRANS: Menu item in search group navigation panel.
+#. TRANS: Menu item in local navigation menu.
+msgctxt "MENU"
+msgid "Groups"
+msgstr "Grupper"
+
+#, fuzzy
+msgid "Using groups"
+msgstr "Användargrupper"
+
+msgctxt "MENU"
+msgid "API"
+msgstr ""
+
+msgid "RESTful API"
+msgstr ""
+
 #. TRANS: Title for "Edit application" form.
 #. TRANS: Form legend.
 msgid "Edit application"
@@ -2275,7 +2195,7 @@ msgstr ""
 "Ställa om en publik tagg som privat kommer permanent ta bort alla befintliga "
 "prenumerationer på den. Vill du fortfarande fortsätta?"
 
-#. TRANS: TRANS: Server error displayed when updating a list fails.
+#. TRANS: Server error displayed when updating a list fails.
 msgid "Could not update list."
 msgstr "Kunde inte uppdatera lista."
 
@@ -2580,40 +2500,6 @@ msgstr "Inga bilagor."
 msgid "No uploaded attachments."
 msgstr "Inga uppladdade bilagor."
 
-#. TRANS: Client error displayed when subscribing to a remote profile and an unexpected response is received.
-msgid "Not expecting this response!"
-msgstr "Väntade mig inte denna respons!"
-
-#. TRANS: Client error displayed when subscribing to a remote profile that does not exist.
-msgid "User being listened to does not exist."
-msgstr "Användaren som lyssnas på existerar inte."
-
-#. TRANS: Client error displayed when subscribing to a remote profile that is a local profile.
-#. TRANS: Client error displayed when using remote subscribe for a local entity.
-msgid "You can use the local subscription!"
-msgstr "Du kan använda den lokala prenumerationen!"
-
-#. TRANS: Client error displayed when subscribing to a remote profile that is blocked form subscribing to.
-msgid "That user has blocked you from subscribing."
-msgstr "Denna användaren har blockerat dig från att prenumerera."
-
-#. TRANS: Client error displayed when subscribing to a remote profile without providing an authorised token.
-msgid "You are not authorized."
-msgstr "Du har inte tillstånd."
-
-#. TRANS: Client error displayed when subscribing to a remote profile and conversion of the request token to access token fails.
-msgid "Could not convert request token to access token."
-msgstr "Kunde inte konvertera token för begäran till token för åtkomst."
-
-#. TRANS: Client error displayed when subscribing to a remote profile fails because of an unsupported version of the OMB protocol.
-msgid "Remote service uses unknown version of OMB protocol."
-msgstr "Fjärrtjänsten använder en okänd version av OMB-protokollet."
-
-#. TRANS: Server error displayed when subscribing to a remote profile fails because the remote profile could not be updated.
-#. TRANS: Exception thrown when updating a remote profile fails in OAuth store.
-msgid "Error updating remote profile."
-msgstr "Fel vid uppdatering av fjärrprofil."
-
 #. TRANS: Client error displayed when requesting a non-existent file.
 msgid "No such file."
 msgstr "Ingen sådan fil."
@@ -2701,30 +2587,6 @@ msgstr "Databasfel vid blockering av användare från grupp."
 msgid "No ID."
 msgstr "Ingen ID."
 
-#. TRANS: Client error displayed trying to change group design settings while not logged in.
-msgid "You must be logged in to edit a group."
-msgstr "Du måste vara inloggad för att redigera en grupp."
-
-#. TRANS: Title group design settings page.
-msgid "Group design"
-msgstr "Gruppens utseende"
-
-#. TRANS: Instructions for group design settings page.
-msgid ""
-"Customize the way your group looks with a background image and a colour "
-"palette of your choice."
-msgstr ""
-"Anpassa hur din grupp ser ut genom att välja bakgrundbild och färgpalett."
-
-#. TRANS: Form validation error displayed when group design settings could not be updated because of an application issue.
-msgid "Unable to update your design settings."
-msgstr "Det gick inte att uppdatera utseendeinställningarna."
-
-#. TRANS: Form text to confirm saved group design settings.
-#. TRANS: Confirmation message on Profile design page when saving design settings has succeeded.
-msgid "Design preferences saved."
-msgstr "Utseendeinställningar sparade."
-
 #. TRANS: Title for group logo settings page.
 #. TRANS: Group logo form legend.
 msgid "Group logo"
@@ -2899,8 +2761,8 @@ msgstr "Inställningar för snabbmeddelanden"
 #. TRANS: the order and formatting of link text and link should remain unchanged.
 #, php-format
 msgid ""
-"You can send and receive notices through instant messaging [instant messages]"
-"(%%doc.im%%). Configure your addresses and settings below."
+"You can send and receive notices through [instant messaging](%%doc.im%%). "
+"Configure your addresses and settings below."
 msgstr ""
 "Du kan skicka och ta emot meddelanden via [snabbmeddelanden](%%doc.im%%). "
 "Konfigurera adresser och inställningarna nedan."
@@ -3101,28 +2963,6 @@ msgstr ""
 "Använd detta formulär för att bjuda in dina vänner och kollegor att använda "
 "denna tjänst."
 
-#. TRANS: Field label for a list of e-mail addresses.
-msgid "Email addresses"
-msgstr "E-postadresser"
-
-#. TRANS: Tooltip for field label for a list of e-mail addresses.
-msgid "Addresses of friends to invite (one per line)."
-msgstr "Adresser till vänner att bjuda in (en per rad)."
-
-#. TRANS: Field label for a personal message to send to invitees.
-msgid "Personal message"
-msgstr "Personligt meddelande"
-
-#. TRANS: Tooltip for field label for a personal message to send to invitees.
-msgid "Optionally add a personal message to the invitation."
-msgstr "Om du vill, skriv ett personligt meddelande till inbjudan."
-
-#. TRANS: Send button for inviting friends
-#. TRANS: Button text for sending notice.
-msgctxt "BUTTON"
-msgid "Send"
-msgstr "Skicka"
-
 #. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral
 #. TRANS: singular 3rd-person pronoun in English. %1$s is the inviting user, $2$s is
 #. TRANS: the StatusNet sitename.
@@ -3253,12 +3093,6 @@ msgstr "Webbadress för en bild som visas med licensen."
 msgid "Save license settings."
 msgstr "Spara licensinsällningar."
 
-#. TRANS: Client error displayed when trying to log in while already logged in.
-#. TRANS: Client error displayed trying to use "one time password login" when already logged in.
-#. TRANS: Client error displayed when trying to register while already logged in.
-msgid "Already logged in."
-msgstr "Redan inloggad."
-
 #. TRANS: Form validation error displayed when trying to log in with incorrect credentials.
 msgid "Incorrect username or password."
 msgstr "Felaktigt användarnamn eller lösenord."
@@ -3277,9 +3111,8 @@ msgid "Login to site"
 msgstr "Logga in på webbplatsen"
 
 #. TRANS: Field label on login page.
-#, fuzzy
 msgid "Username or email address"
-msgstr "Smeknamn eller e-postadress"
+msgstr "Användarnamn eller e-postadress"
 
 #. TRANS: Checkbox label label on login page.
 #. TRANS: Checkbox label on account registration page.
@@ -3369,6 +3202,7 @@ msgstr "Webbadress till källa krävs."
 msgid "Could not create application."
 msgstr "Kunde inte skapa applikation."
 
+#. TRANS: Form validation error messages displayed when uploading an invalid application logo.
 msgid "Invalid image."
 msgstr "Ogiltig bild."
 
@@ -3405,14 +3239,6 @@ msgstr "Inget innehåll!"
 msgid "No recipient specified."
 msgstr "Ingen mottagare angiven."
 
-#. TRANS: Client error displayed trying to send a direct message to self.
-#. TRANS: Error text shown when trying to send a direct message to self.
-msgid ""
-"Don't send a message to yourself; just say it to yourself quietly instead."
-msgstr ""
-"Skicka inte meddelande till dig själv; viska lite tyst till dig själv "
-"istället."
-
 #. TRANS: Page title after sending a direct message.
 msgid "Message sent"
 msgstr "Meddelande skickat"
@@ -3616,6 +3442,33 @@ msgstr "Endast %s-webbadresser över vanlig HTTP."
 msgid "Not a supported data format."
 msgstr "Ett dataformat som inte stödjs"
 
+#. TRANS: Page title for profile settings.
+#, fuzzy
+msgid "Old school UI settings"
+msgstr "Inställningar för snabbmeddelanden"
+
+#. TRANS: Usage instructions for profile settings.
+msgid "If you like it \"the old way\", you can set that here."
+msgstr "Om du gillar det på \"det gamla sättet\", kan du ange det här."
+
+#. TRANS: Confirmation shown when user profile settings are saved.
+#. TRANS: Message after successful saving of administrative settings.
+msgid "Settings saved."
+msgstr "Inställningar sparade."
+
+msgid "Only stream mode (no conversations) in timelines"
+msgstr ""
+
+msgid "Show conversation page as hierarchical trees"
+msgstr ""
+
+msgid "Show nicknames (not full names) in timelines"
+msgstr "Visa smeknamn (inte fullständiga namn) i tidslinjer"
+
+#. TRANS: Button text to save a list.
+msgid "Save"
+msgstr "Spara"
+
 #. TRANS: ShortName in the OpenSearch interface when trying to find users.
 msgid "People Search"
 msgstr "Personsökning"
@@ -3624,6 +3477,11 @@ msgstr "Personsökning"
 msgid "Notice Search"
 msgstr "Notissökning"
 
+#. TRANS: Client error displayed trying to use "one time password login" when already logged in.
+#. TRANS: Client error displayed when trying to register while already logged in.
+msgid "Already logged in."
+msgstr "Redan inloggad."
+
 #. TRANS: Client error displayed trying to use "one time password login" without specifying a user.
 msgid "No user ID specified."
 msgstr "Ingen användar-ID angiven."
@@ -3693,7 +3551,7 @@ msgid "Confirm"
 msgstr "Bekräfta"
 
 #. TRANS: Field title on page where to change password.
-#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
+#. TRANS: Title for field label for password reset form where the password has to be typed again.
 #. TRANS: Field title on account registration page.
 msgid "Same as password above."
 msgstr "Samma lösenord som ovan."
@@ -3751,12 +3609,6 @@ msgstr "Katalog med teman är inte läsbar: %s."
 msgid "Avatar directory not writable: %s."
 msgstr "Katalog med avatarer är inte skrivbar: %s."
 
-#. TRANS: Client error in Paths admin panel.
-#. TRANS: %s is the background directory that could not be written to.
-#, php-format
-msgid "Background directory not writable: %s."
-msgstr "Katalog med bakgrunder är inte skrivbar: %s."
-
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the locales directory that could not be read from.
 #, php-format
@@ -3869,30 +3721,6 @@ msgstr "Katalog med avatarer"
 msgid "Directory where avatars are located."
 msgstr "Katalog där avatarer finns."
 
-#. TRANS: Fieldset legend in Paths admin panel.
-msgid "Backgrounds"
-msgstr "Bakgrunder"
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-msgid "Server for backgrounds."
-msgstr "Server för bakgrunder."
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-msgid "Web path to backgrounds."
-msgstr "Websökväg till bakgrunder."
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-msgid "Server for backgrounds on SSL pages."
-msgstr "Server för bakgrunder på SSL-sidor."
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-msgid "Web path to backgrounds on SSL pages."
-msgstr "Webbsökväg till bakgrunder på SSL-sidor."
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-msgid "Directory where backgrounds are located."
-msgstr "Katalog där bakgrunder finns."
-
 #. TRANS: Fieldset legens in Paths admin panel.
 msgid "Attachments"
 msgstr "Bilagor"
@@ -3948,8 +3776,8 @@ msgid "Server to direct SSL requests to."
 msgstr "Server att dirigera SSL-begäran till."
 
 #. TRANS: Button title text to store form data in the Paths admin panel.
-msgid "Save paths"
-msgstr "Spara sökvägar"
+msgid "Save path settings."
+msgstr "Spara sökvägsinställningar."
 
 #. TRANS: Instructions for the "People search" page.
 #. TRANS: %%site.name%% is the name of the StatusNet site.
@@ -4082,13 +3910,13 @@ msgid ""
 "%%%site.name%%%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
 "blogging) service based on the Free Software [StatusNet](http://status.net/) "
 "tool. You can easily keep track of what they are doing by subscribing to the "
-"tag's timeline."
+"list's timeline."
 msgstr ""
 "Dessa är listor som skapats av **%s**. Listor är hur du sorterar liknande "
 "personer på %%site.name%%, en [mikroblogg](http://sv.wikipedia.org/wiki/"
-"Mikroblogg)-tjänst baserat på den fria programvara [StatusNet](http://status."
-"net/). Du kan enkelt hålla reda på vad de gör genom att prenumerera på i "
-"listans tidslinje."
+"Mikroblogg)-tjänst baserat på den fria programvaran [StatusNet](http://"
+"status.net/). Du kan enkelt hålla reda på vad de gör genom att prenumerera "
+"på i listans tidslinje."
 
 #. TRANS: Message displayed on page that displays lists by a user when there are none.
 #. TRANS: This message contains Markdown links in the form [description](links).
@@ -4116,11 +3944,11 @@ msgid ""
 "site.name%%%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
 "blogging) service based on the Free Software [StatusNet](http://status.net/) "
 "tool. You can easily keep track of what they are doing by subscribing to the "
-"tag's timeline."
+"list's timeline."
 msgstr ""
 "Dessa är listor för **%s**. Listor är hur du sorterar liknande personer på %%"
 "site.name%%, en [mikroblogg](http://sv.wikipedia.org/wiki/Mikroblogg)-tjänst "
-"baserat på den fria programvara [StatusNet](http://status.net/). Du kan "
+"baserat på den fria programvaran [StatusNet](http://status.net/). Du kan "
 "enkelt hålla reda på vad de gör genom att prenumerera på i listans tidslinje."
 
 #. TRANS: Message displayed on page that displays lists a user was added to when there are none.
@@ -4223,17 +4051,6 @@ msgstr ""
 "Alla standardinsticksmoduler har inaktiverats från platsens "
 "konfigurationsfil."
 
-#. TRANS: Client error displayed if the notice posted has too many characters.
-msgid "Invalid notice content."
-msgstr "Ogiltigt notisinnehåll."
-
-#. TRANS: Exception thrown if a notice's license is not compatible with the StatusNet site license.
-#. TRANS: %1$s is the notice license, %2$s is the StatusNet site's license.
-#, php-format
-msgid "Notice license \"%1$s\" is not compatible with site license \"%2$s\"."
-msgstr ""
-"Licensen för notiser \"%1$s\" är inte förenlig webbplatslicensen \"%2$s\"."
-
 #. TRANS: Client error displayed when trying to add an unindentified field to profile.
 #. TRANS: %s is a field name.
 #, php-format
@@ -4328,6 +4145,8 @@ msgid "Share my current location when posting notices"
 msgstr "Dela min nuvarande plats när jag skickar notiser"
 
 #. TRANS: Field label in form for profile settings.
+#. TRANS: Title for group tag cloud section.
+#. TRANS: %s is a group name.
 msgid "Tags"
 msgstr "Taggar"
 
@@ -4357,10 +4176,10 @@ msgstr "I vilken tidszon befinner du dig normalt?"
 
 #. TRANS: Checkbox label in form for profile settings.
 msgid ""
-"Automatically subscribe to whoever subscribes to me (best for non-humans)."
+"Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr ""
 "Prenumerera automatiskt på den som prenumererar på mig (bäst för icke-"
-"människor)."
+"människa) "
 
 #. TRANS: Dropdown field label on profile settings, for what policies to apply when someone else tries to subscribe to your updates.
 msgid "Subscription policy"
@@ -4428,11 +4247,6 @@ msgstr "Kunde inte spara platsinställningar."
 msgid "Could not save tags."
 msgstr "Kunde inte spara taggar."
 
-#. TRANS: Confirmation shown when user profile settings are saved.
-#. TRANS: Message after successful saving of administrative settings.
-msgid "Settings saved."
-msgstr "Inställningar sparade."
-
 #. TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
 #. TRANS: Page title for page where a user account can be restored from backup.
 msgid "Restore account"
@@ -4445,8 +4259,8 @@ msgid "Beyond the page limit (%s)."
 msgstr "Bortom sidbegränsningen (%s)."
 
 #. TRANS: Server error displayed when a public timeline cannot be retrieved.
-msgid "Could not retrieve public stream."
-msgstr "Kunde inte hämta publik ström."
+msgid "Could not retrieve public timeline."
+msgstr "Kunde inte hämta offentlig tidslinje."
 
 #. TRANS: Title for all public timeline pages but the first.
 #. TRANS: %d is the page number.
@@ -4460,16 +4274,20 @@ msgid "Public timeline"
 msgstr "Publik tidslinje"
 
 #. TRANS: Link description for public timeline feed.
-msgid "Public Stream Feed (RSS 1.0)"
-msgstr "Publikt flöde av ström (RSS 1.0)"
+msgid "Public Timeline Feed (Activity Streams JSON)"
+msgstr "Offentlig tidslinjeflöde (Activity Streams JSON)"
 
 #. TRANS: Link description for public timeline feed.
-msgid "Public Stream Feed (RSS 2.0)"
-msgstr "Publikt flöde av ström (RSS 2.0)"
+msgid "Public Timeline Feed (RSS 1.0)"
+msgstr "Offentlig tidslinjeflöde (RSS 1.0)"
 
 #. TRANS: Link description for public timeline feed.
-msgid "Public Stream Feed (Atom)"
-msgstr "Publikt flöde av ström (Atom)"
+msgid "Public Timeline Feed (RSS 2.0)"
+msgstr "Offentlig tidslinjeflöde (RSS 2.0)"
+
+#. TRANS: Link description for public timeline feed.
+msgid "Public Timeline Feed (Atom)"
+msgstr "Offentlig tidslinjeflöde (Atom)"
 
 #. TRANS: Text displayed for public feed when there are no public notices.
 #, php-format
@@ -4518,47 +4336,6 @@ msgstr ""
 "Mikroblogg)tjänst baserad på den fria programvaran [StatusNet](http://status."
 "net/)."
 
-#. TRANS: Title for page with public list cloud.
-msgid "Public list cloud"
-msgstr "Publikt listmoln"
-
-#. TRANS: Page notice for page with public list cloud.
-#. TRANS: %s is a StatusNet sitename.
-#, php-format
-msgid "These are largest lists on %s"
-msgstr "Dessa är de största listorna på %s"
-
-#. TRANS: Empty list message on page with public list cloud.
-#. TRANS: This message contains Markdown links in the form [description](link).
-#, php-format
-msgid "No one has [listed](%%doc.tags%%) anyone yet."
-msgstr "Ingen har [listat] (%%doc.tags%%) någon ännu."
-
-#. TRANS: Additional empty list message on page with public list cloud for logged in users.
-msgid "Be the first to list someone!"
-msgstr "Var den första att lista någon!"
-
-#. TRANS: Additional empty list message on page with public list cloud for anonymous users.
-#. TRANS: This message contains Markdown links in the form [description](link).
-#, php-format
-msgid ""
-"Why not [register an account](%%action.register%%) and be the first to list "
-"someone!"
-msgstr ""
-"Varför inte [registrera ett konto] (%%action.register%%) och bli den första "
-"att lista någon!"
-
-#. TRANS: DT element on on page with public list cloud.
-msgid "List cloud"
-msgstr "Listmoln"
-
-#. TRANS: Link title for number of listed people. %d is the number of listed people.
-#, php-format
-msgid "1 person listed"
-msgid_plural "%d people listed"
-msgstr[0] " 1 person listad"
-msgstr[1] " %d personer listade"
-
 #. TRANS: Public RSS feed description. %s is the StatusNet site name.
 #, php-format
 msgid "%s updates from everyone."
@@ -4683,7 +4460,6 @@ msgid "6 or more characters, and do not forget it!"
 msgstr "6 eller fler tecken, och glöm inte bort det!"
 
 #. TRANS: Button text for password reset form.
-#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
 msgctxt "BUTTON"
 msgid "Reset"
 msgstr "Återställ"
@@ -4692,18 +4468,6 @@ msgstr "Återställ"
 msgid "Enter a nickname or email address."
 msgstr "Skriv in ett smeknamn eller en e-postadress."
 
-#. TRANS: Information on password recovery form if no known username or e-mail address was specified.
-msgid "No user with that email address or username."
-msgstr "Ingen användare med den e-postadressen eller användarnamn."
-
-#. TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.
-msgid "No registered email address for that user."
-msgstr "Ingen registrerad e-postadress för den användaren."
-
-#. TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.
-msgid "Error saving address confirmation."
-msgstr "Fel vid sparande av adressbekräftelse."
-
 #. TRANS: User notification after an e-mail with instructions was sent from the password recovery form.
 msgid ""
 "Instructions for recovering your password have been sent to the email "
@@ -4883,76 +4647,6 @@ msgstr ""
 "(Du kommer få ett meddelande med e-post inom kort med instruktioner hur du "
 "bekräftar din e-postadress.)"
 
-#. TRANS: Page notice for remote subscribe. This message contains Markdown links.
-#. TRANS: Ensure to keep the correct markup of [link description](link).
-#, php-format
-msgid ""
-"To subscribe, you can [login](%%action.login%%), or [register](%%action."
-"register%%) a new  account. If you already have an account  on a [compatible "
-"microblogging site](%%doc.openmublog%%),  enter your profile URL below."
-msgstr ""
-"För att prenumerera kan du [logga in](%%action.login%%) eller [registrera](%%"
-"action.register%%) ett nytt konto. Om du redan har ett konto på en "
-"[kompatibel mikrobloggwebbplats](%%doc.openmublog%%), fyll i din profils URL "
-"nedan."
-
-#. TRANS: Page title for Remote subscribe.
-msgid "Remote subscribe"
-msgstr "Fjärrprenumerera"
-
-#. TRANS: Field legend on page for remote subscribe.
-msgid "Subscribe to a remote user"
-msgstr "Prenumerera på en fjärranvändare"
-
-#. TRANS: Field label on page for remote subscribe.
-msgid "User nickname"
-msgstr "Användarens smeknamn"
-
-#. TRANS: Field title on page for remote subscribe.
-msgid "Nickname of the user you want to follow."
-msgstr "Smeknamn på den användare som du vill följa."
-
-#. TRANS: Field label on page for remote subscribe.
-msgid "Profile URL"
-msgstr "Profil-URL"
-
-#. TRANS: Field title on page for remote subscribe.
-msgid "URL of your profile on another compatible microblogging service."
-msgstr "Webbadressen till din profil på en annan kompatibel mikrobloggtjänst."
-
-#. TRANS: Button text on page for remote subscribe.
-#. TRANS: Link text for link that will subscribe to a remote profile.
-#. TRANS: Button text to subscribe to a user.
-#. TRANS: Button text for subscribing to a list.
-msgctxt "BUTTON"
-msgid "Subscribe"
-msgstr "Prenumerera"
-
-#. TRANS: Form validation error on page for remote subscribe when an invalid profile URL was provided.
-msgid "Invalid profile URL (bad format)."
-msgstr "Ogiltig profil-URL (dåligt format)."
-
-#. TRANS: Form validation error on page for remote subscribe when no the provided profile URL
-#. TRANS: does not contain expected data.
-msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
-msgstr ""
-"Inte en giltig profil-URL (inget YADIS-dokument eller ogiltig XRDS "
-"definerad)."
-
-#. TRANS: Form validation error on page for remote subscribe.
-msgid "That is a local profile! Login to subscribe."
-msgstr "Det är en lokal profil! Logga in för att prenumerera."
-
-#. TRANS: Form validation error on page for remote subscribe when the remote service is not providing a request token.
-msgid "Could not get a request token."
-msgstr "Kunde inte få en förfrågan-token."
-
-#. TRANS: Client error displayed when trying to (un)list an OMB 0.1 remote profile.
-msgid "You cannot (un)list an OMB 0.1 remote profile with this action."
-msgstr ""
-"Du kan inte lägga till eller ta bort en OMB 0.1-fjärrprofil från en lista "
-"med denna åtgärd."
-
 #. TRANS: Client error displayed when an unknown error occurs while delisting a user.
 #. TRANS: %s is a username.
 #, php-format
@@ -5006,6 +4700,12 @@ msgstr "Svarat till %s"
 msgid "Replies to %1$s, page %2$d"
 msgstr "Svar till %1$s, sida %2$s"
 
+#. TRANS: Link for feed with replies for a user.
+#. TRANS: %s is a user nickname.
+#, php-format
+msgid "Replies feed for %s (Activity Streams JSON)"
+msgstr "Flöde med svar för %s (Activity Streams JSON)"
+
 #. TRANS: Link for feed with replies for a user.
 #. TRANS: %s is a user nickname.
 #, php-format
@@ -5125,10 +4825,10 @@ msgstr "Flöde kommer att återställas. Vänta några minuter för resultat."
 
 #. TRANS: Form instructions for feed restore.
 msgid ""
-"You can upload a backed-up stream in <a href=\"http://activitystrea.ms/"
+"You can upload a backed-up timeline in <a href=\"http://activitystrea.ms/"
 "\">Activity Streams</a> format."
 msgstr ""
-"Du kan ladda upp ett säkerhetskopierat flöde i <a href=\"http://"
+"Du kan ladda upp en säkerhetskopierat tidslinje i <a href=\"http://"
 "activitystrea.ms/\">Activity Streams</a>-format."
 
 #. TRANS: Title for submit button to confirm upload of a user backup file for account restore.
@@ -5241,6 +4941,26 @@ msgstr "Återställ nyckel & hemlighet"
 msgid "Application info"
 msgstr "Information om applikation"
 
+#. TRANS: Field label on application page.
+msgid "Consumer key"
+msgstr "Nyckel för konsument"
+
+#. TRANS: Field label on application page.
+msgid "Consumer secret"
+msgstr "Hemlighet för konsument"
+
+#. TRANS: Field label on application page.
+msgid "Request token URL"
+msgstr "URL för begäran-token"
+
+#. TRANS: Field label on application page.
+msgid "Access token URL"
+msgstr "URL för åtkomst-token"
+
+#. TRANS: Field label on application page.
+msgid "Authorize URL"
+msgstr "Tillåt URL"
+
 #. TRANS: Note on the OAuth application page about signature support.
 msgid ""
 "Note: HMAC-SHA1 signatures are supported. The plaintext signature method is "
@@ -5263,6 +4983,11 @@ msgstr "%1$ss favoritnotiser, sida %2$d"
 msgid "Could not retrieve favorite notices."
 msgstr "Kunde inte hämta favoritnotiser."
 
+#. TRANS: Feed link text. %s is a username.
+#, php-format
+msgid "Feed for favorites of %s (Activity Streams JSON)"
+msgstr "Flöde för %ss favoriter (Activity Streams JSON)"
+
 #. TRANS: Feed link text. %s is a username.
 #, php-format
 msgid "Feed for favorites of %s (RSS 1.0)"
@@ -5324,6 +5049,11 @@ msgstr "%s grupp"
 msgid "%1$s group, page %2$d"
 msgstr "%1$s grupp, sida %2$d"
 
+#. TRANS: Tooltip for feed link. %s is a group nickname.
+#, php-format
+msgid "Notice feed for %s group (Activity Streams JSON)"
+msgstr "Flöde av notiser för %ss grupp (Activity Streams JSON)"
+
 #. TRANS: Tooltip for feed link. %s is a group nickname.
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
@@ -5344,42 +5074,8 @@ msgstr "Flöde av notiser för %s grupp (Atom)"
 msgid "FOAF for %s group"
 msgstr "FOAF för %s grupp"
 
-#. TRANS: Header for mini list of group members on a group page (h2).
-msgid "Members"
-msgstr "Medlemmar"
-
-#. TRANS: Description for mini list of group members on a group page when the group has no members.
-#. TRANS: Content of "Listed" page if there are no listed users.
-#. TRANS: Content of "People following tag x" if there are no subscribed users.
-#. TRANS: Empty list message for tags.
-#. TRANS: Text for user subscription statistics if the user has no subscriptions.
-#. TRANS: Text for user subscriber statistics if user has no subscribers.
-#. TRANS: Text for user user group membership statistics if user is not a member of any group.
-#. TRANS: Default content for section/sidebar widget.
-msgid "(None)"
-msgstr "(Ingen)"
-
-#. TRANS: Link to all group members from mini list of group members if group has more than n members.
-msgid "All members"
-msgstr "Alla medlemmar"
-
-#. TRANS: Header for group statistics on a group page (h2).
-#. TRANS: H2 text for user statistics.
-msgid "Statistics"
-msgstr "Statistik"
-
-#. TRANS: Label for group creation date.
-msgctxt "LABEL"
-msgid "Created"
-msgstr "Skapad"
-
-#. TRANS: Label for member count in statistics on group page.
-msgctxt "LABEL"
-msgid "Members"
-msgstr "Medlemmar"
-
 #. TRANS: Notice on group pages for anonymous users for StatusNet sites that accept new registrations.
-#. TRANS: **%s** is the group alias, %%%%site.name%%%% is the site name,
+#. TRANS: %s is the group name, %%%%site.name%%%% is the site name,
 #. TRANS: %%%%action.register%%%% is the URL for registration, %%%%doc.help%%%% is a URL to help.
 #. TRANS: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
 #, php-format
@@ -5397,25 +5093,20 @@ msgstr ""
 "del av denna grupp och många fler! ([Läs mer](%%%%doc.help%%%%))"
 
 #. TRANS: Notice on group pages for anonymous users for StatusNet sites that accept no new registrations.
-#. TRANS: **%s** is the group alias, %%%%site.name%%%% is the site name,
+#. TRANS: %s is the group name, %%%%site.name%%%% is the site name,
 #. TRANS: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
-#, php-format
+#, fuzzy, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
 "wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
 "[StatusNet](http://status.net/) tool. Its members share short messages about "
-"their life and interests. "
+"their life and interests."
 msgstr ""
 "**%s** är en användargrupp på %%%%site.name%%%%, en [mikroblogg](http://sv."
 "wikipedia.org/wiki/Mikroblogg)tjänst baserad den fria programvaran "
 "[StatusNet](http://status.net/). Dess medlemmar delar korta meddelande om "
 "sina liv och intressen. "
 
-#. TRANS: Title for list of group administrators on a group page.
-msgctxt "TITLE"
-msgid "Admins"
-msgstr "Administratörer"
-
 #. TRANS: Client error displayed requesting a single message that does not exist.
 msgid "No such message."
 msgstr "Inget sådant meddelande."
@@ -5510,9 +5201,21 @@ msgstr ""
 "följa denna tidslinje!"
 
 #. TRANS: Header on show list page.
+#. TRANS: Link description for link to list of users tagged with a tag (so part of a list).
 msgid "Listed"
 msgstr "Listade"
 
+#. TRANS: Content of "Listed" page if there are no listed users.
+#. TRANS: Content of "People following tag x" if there are no subscribed users.
+#. TRANS: Description for mini list of group members on a group page when the group has no members.
+#. TRANS: Empty list message for tags.
+#. TRANS: Text for user subscription statistics if the user has no subscriptions.
+#. TRANS: Text for user subscriber statistics if user has no subscribers.
+#. TRANS: Text for user user group membership statistics if user is not a member of any group.
+#. TRANS: Default content for section/sidebar widget.
+msgid "(None)"
+msgstr "(Ingen)"
+
 #. TRANS: Link for more "People in list x by a user"
 #. TRANS: if there are more than the mini list's maximum.
 msgid "Show all"
@@ -5523,24 +5226,19 @@ msgstr "Visa alla"
 msgid "Subscribers"
 msgstr "Prenumeranter"
 
-#. TRANS: Link for more "People following tag x"
-#. TRANS: if there are more than the mini list's maximum.
-msgid "All subscribers"
-msgstr "Alla prenumeranter"
-
-#. TRANS: Page title showing tagged notices in one user's stream.
+#. TRANS: Page title showing tagged notices in one user's timeline.
 #. TRANS: %1$s is the username, %2$s is the hash tag.
 #, php-format
 msgid "Notices by %1$s tagged %2$s"
 msgstr "Notiser av %1$s taggade %2$s"
 
-#. TRANS: Page title showing tagged notices in one user's stream.
+#. TRANS: Page title showing tagged notices in one user's timeline.
 #. TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number.
 #, php-format
 msgid "Notices by %1$s tagged %2$s, page %3$d"
 msgstr "Notiser av %1$s taggade %2$s , sida %3$d"
 
-#. TRANS: Extended page title showing tagged notices in one user's stream.
+#. TRANS: Extended page title showing tagged notices in one user's timeline.
 #. TRANS: %1$s is the username, %2$d is the page number.
 #, php-format
 msgid "Notices by %1$s, page %2$d"
@@ -5552,6 +5250,12 @@ msgstr "Notiser av %1$s, sida %2$d"
 msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
 msgstr "Flöde av notiser för %1$s taggade %2$s (RSS 1.0)"
 
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#, php-format
+msgid "Notice feed for %s (Activity Streams JSON)"
+msgstr "Flöde av notiser för %s (Activity Streams JSON)"
+
 #. TRANS: Title for link to notice feed.
 #. TRANS: %s is a user nickname.
 #, php-format
@@ -5576,7 +5280,7 @@ msgstr "Flöde av notiser för %s (Atom)"
 msgid "FOAF for %s"
 msgstr "FOAF för %s"
 
-#. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
+#. TRANS: First sentence of empty list message for a timeline. $1%s is a user nickname.
 #, php-format
 msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
 msgstr "Detta är tidslinjen för %1$s, men %1$s har inte skrivit något ännu."
@@ -5589,7 +5293,7 @@ msgstr ""
 "Sett något intressant nyligen? Du har inte postat några notiser än. Varför "
 "inte börja nu?"
 
-#. TRANS: Second sentence of empty  list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
+#. TRANS: Second sentence of empty  list message for a non-self timeline. %1$s is a user nickname, %2$s is a part of a URL.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
 #, php-format
 msgid ""
@@ -5599,7 +5303,7 @@ msgstr ""
 "Var den första att [skriva i detta ämne](%%%%action.newnotice%%%%?"
 "status_textarea=%s)!"
 
-#. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
+#. TRANS: Announcement for anonymous users showing a timeline if site registrations are open.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
 #, php-format
 msgid ""
@@ -5613,13 +5317,13 @@ msgstr ""
 "[StatusNet](http://status.net/). [Gå med nu](%%%%action.register%%%%) för "
 "att följa **%s**s notiser och många fler! ([Läs mer](%%%%doc.help%%%%))"
 
-#. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
+#. TRANS: Announcement for anonymous users showing a timeline if site registrations are closed or invite only.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#, php-format
+#, fuzzy, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
 "wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
-"[StatusNet](http://status.net/) tool. "
+"[StatusNet](http://status.net/) tool."
 msgstr ""
 "**%s** har ett konto på %%%%site.name%%%%, en [mikroblogg](http://sv."
 "wikipedia.org/wiki/Mikroblogg)tjänst baserad på den fria programvaran "
@@ -5656,6 +5360,14 @@ msgstr "Webbplatsnamnet måste vara minst ett tecken långt."
 msgid "You must have a valid contact email address."
 msgstr "Du måste ha en giltig e-postadress."
 
+#. TRANS: Client error displayed when a logo URL is not valid.
+msgid "Invalid logo URL."
+msgstr "Ogiltig webbadress för logtyp."
+
+#. TRANS: Client error displayed when a SSL logo URL is invalid.
+msgid "Invalid SSL logo URL."
+msgstr "Ogiltig webbadress för SSL-logtyp."
+
 #. TRANS: Client error displayed trying to save site settings with an invalid language code.
 #. TRANS: %s is the invalid language code.
 #, php-format
@@ -5726,10 +5438,11 @@ msgid "Default language"
 msgstr "Standardspråk"
 
 #. TRANS: Dropdown title on site settings panel.
-msgid "Site language when autodetection from browser settings is not available"
+msgid ""
+"The site language when autodetection from browser settings is not available."
 msgstr ""
-"Webbplatsspråk när automatisk identifiering av inställningar i webbläsaren "
-"inte är tillgänglig"
+"Webbplatsspråket, vid automatisk identifiering av inställningar i "
+"webbläsaren, är inte tillgänglig."
 
 #. TRANS: Fieldset legend on site settings panel.
 msgctxt "LEGEND"
@@ -5753,9 +5466,21 @@ msgid "How long users must wait (in seconds) to post the same thing again."
 msgstr ""
 "Hur länge användare måste vänta (i sekunder) för att posta samma sak igen."
 
+#. TRANS: Fieldset legend for form to change logo.
+msgid "Logo"
+msgstr "Logotyp"
+
+#. TRANS: Field label for StatusNet site logo.
+msgid "Site logo"
+msgstr "Webbplatslogotyp"
+
+#. TRANS: Field label for SSL StatusNet site logo.
+msgid "SSL logo"
+msgstr "SSL-logotyp"
+
 #. TRANS: Button title for saving site settings.
-msgid "Save site settings"
-msgstr "Spara webbplatsinställningar"
+msgid "Save the site settings."
+msgstr "Spara webbplatsinställningar."
 
 #. TRANS: Page title for site-wide notice tab in admin panel.
 msgid "Site Notice"
@@ -5781,7 +5506,7 @@ msgstr "Text för webbplatsnotis"
 msgid "Site-wide notice text (255 characters maximum; HTML allowed)"
 msgstr "Notistext för hela webbplatsen (max 255 tecken; HTML tillåts)"
 
-#. TRANS: Title for button to save site notice in admin panel.
+#. TRANS: Button title to save site notice in admin panel.
 msgid "Save site notice."
 msgstr "Spara webbplatsnotis."
 
@@ -5974,7 +5699,7 @@ msgstr "URL för rapport"
 msgid "Snapshots will be sent to this URL."
 msgstr "Ögonblicksbilder kommer att skickas till denna webbadress."
 
-#. TRANS: Title for button to save snapshot settings.
+#. TRANS: Button title to save snapshot settings.
 msgid "Save snapshot settings."
 msgstr "Spara inställningar för ögonblicksbild."
 
@@ -6008,10 +5733,6 @@ msgid "A list of users awaiting approval to subscribe to you."
 msgstr ""
 "En lista med användare som väntar på godkännande för att prenumerera på dig."
 
-#. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
-msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
-msgstr "Du kan inte prenumerera på en 0MB 0.1-fjärrprofil med denna åtgärd."
-
 #. TRANS: Page title when subscription succeeded.
 msgid "Subscribed"
 msgstr "Prenumerant"
@@ -6107,13 +5828,12 @@ msgstr "Det är dessa personer vars notiser %s lyssnar på."
 #. TRANS: This message contains Markdown URLs. The link description is between
 #. TRANS: square brackets, and the link between parentheses. Do not separate "]("
 #. TRANS: and do not change the URL part.
-#, php-format
+#, fuzzy, php-format
 msgid ""
 "You're not listening to anyone's notices right now, try subscribing to "
 "people you know. Try [people search](%%action.peoplesearch%%), look for "
 "members in groups you're interested in and in our [featured users](%%action."
-"featured%%). If you're a [Twitter user](%%action.twittersettings%%), you can "
-"automatically subscribe to people you already follow there."
+"featured%%)."
 msgstr ""
 "Du lyssnar inte på någons notiser just nu. Prova att prenumerera på personer "
 "du känner. Prova [personsökning](%%action.peoplesearch%%), leta bland "
@@ -6150,6 +5870,12 @@ msgstr "SMS"
 msgid "Notices tagged with %1$s, page %2$d"
 msgstr "Notiser taggade med %1$s, sida %2$d"
 
+#. TRANS: Link label for feed on "notices with tag" page.
+#. TRANS: %s is the tag the feed is for.
+#, php-format
+msgid "Notice feed for tag %s (Activity Streams JSON)"
+msgstr "Flöde av notiser för tagg %s (Activity Streams JSON)"
+
 #. TRANS: Link label for feed on "notices with tag" page.
 #. TRANS: %s is the tag the feed is for.
 #, php-format
@@ -6252,18 +5978,6 @@ msgstr "Prenumeration avslutad"
 msgid "%1$s unsubscribed from list %2$s by %3$s"
 msgstr "%1$s struken från listan %2$s av %3$s"
 
-#. TRANS: Client error displayed when trying to update profile with an incompatible license.
-#. TRANS: %1$s is the license incompatible with site license %2$s.
-#. TRANS: Exception thrown when licenses are not compatible for an authorisation request.
-#. TRANS: %1$s is the license for the listenee, %2$s is the license for "this" StatusNet site.
-#, php-format
-msgid ""
-"Listenee stream license \"%1$s\" is not compatible with site license \"%2$s"
-"\"."
-msgstr ""
-"Licensen för lyssnarströmmen \"%1$s\" är inte förenlig med webbplatslicensen "
-"\"%2$s\"."
-
 #. TRANS: Title of URL settings tab in profile settings.
 msgid "URL settings"
 msgstr "Webbadressinställningarna"
@@ -6400,154 +6114,10 @@ msgstr "Inbjudningar aktiverade"
 msgid "Whether to allow users to invite new users."
 msgstr "Hurvida användare skall tillåtas bjuda in nya användare."
 
-#. TRANS: Title for button to save user settings in user admin panel.
+#. TRANS: Button title to save user settings in user admin panel.
 msgid "Save user settings."
 msgstr "Spara användarinställningar."
 
-#. TRANS: Page title.
-msgid "Authorize subscription"
-msgstr "Godkänn prenumeration"
-
-#. TRANS: Page notice on "Authorize subscription" page.
-msgid ""
-"Please check these details to make sure that you want to subscribe to this "
-"user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
-"click \"Reject\"."
-msgstr ""
-"Vänligen kontrollera dessa detaljer för att försäkra dig om att du vill "
-"prenumerera på denna användares notiser. Om du inte bett om att prenumerera "
-"på någons meddelanden, klicka på \"Avvisa\"."
-
-#. TRANS: Button text on Authorise Subscription page.
-#. TRANS: Submit button text to accept a group membership request on approve group form.
-#. TRANS: Submit button text to accept a subscription request on approve sub form.
-msgctxt "BUTTON"
-msgid "Accept"
-msgstr "Acceptera"
-
-#. TRANS: Title for button on Authorise Subscription page.
-#. TRANS: Button title to subscribe to a user.
-msgid "Subscribe to this user."
-msgstr "Prenumerera på denna användaren."
-
-#. TRANS: Button text on Authorise Subscription page.
-#. TRANS: Submit button text to reject a group membership request on approve group form.
-#. TRANS: Submit button text to reject a subscription request on approve sub form.
-msgctxt "BUTTON"
-msgid "Reject"
-msgstr "Avvisa"
-
-#. TRANS: Title for button on Authorise Subscription page.
-msgid "Reject this subscription."
-msgstr "Avvisa den här prenumerationen."
-
-#. TRANS: Client error displayed for an empty authorisation request.
-msgid "No authorization request!"
-msgstr "Ingen begäran om godkännande!"
-
-#. TRANS: Accept message header from Authorise subscription page.
-msgid "Subscription authorized"
-msgstr "Prenumeration godkänd"
-
-#. TRANS: Accept message text from Authorise subscription page.
-msgid ""
-"The subscription has been authorized, but no callback URL was passed. Check "
-"with the site's instructions for details on how to authorize the "
-"subscription. Your subscription token is:"
-msgstr ""
-"Prenumerationen har godkänts, men ingen anrops-URL har gått igenom. Kolla "
-"med webbplatsens instruktioner hur du bekräftar en prenumeration. Din "
-"prenumerations-token är:"
-
-#. TRANS: Reject message header from Authorise subscription page.
-msgid "Subscription rejected"
-msgstr "Prenumeration avvisad"
-
-#. TRANS: Reject message from Authorise subscription page.
-msgid ""
-"The subscription has been rejected, but no callback URL was passed. Check "
-"with the site's instructions for details on how to fully reject the "
-"subscription."
-msgstr ""
-"Prenumerationen har blivit avvisad, men ingen URL har gått igenom. Kolla med "
-"webbplatsens instruktioner för detaljer om hur du fullständingt avvisar "
-"prenumerationen."
-
-#. TRANS: Exception thrown when no valid user is found for an authorisation request.
-#. TRANS: %s is a listener URI.
-#, php-format
-msgid "Listener URI \"%s\" not found here."
-msgstr "URI för lyssnare \"%s\" hittades inte här."
-
-#. TRANS: Exception thrown when listenee URI is too long for an authorisation request.
-#. TRANS: %s is a listenee URI.
-#, php-format
-msgid "Listenee URI \"%s\" is too long."
-msgstr "URI för lyssnare \"%s\" är för lång."
-
-#. TRANS: Exception thrown when listenee URI is a local user for an authorisation request.
-#. TRANS: %s is a listenee URI.
-#, php-format
-msgid "Listenee URI \"%s\" is a local user."
-msgstr "URI för lyssnare \"%s\" är en lokal användare."
-
-#. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
-#. TRANS: %s is a profile URL.
-#, php-format
-msgid "Profile URL \"%s\" is for a local user."
-msgstr "Profil-URL \"%s\" är för en lokal användare."
-
-#. TRANS: Exception thrown when avatar URL is invalid for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#, php-format
-msgid "Avatar URL \"%s\" is not valid."
-msgstr "Avatar-URL \"%s\" är inte giltig."
-
-#. TRANS: Exception thrown when avatar URL could not be read for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#, php-format
-msgid "Cannot read avatar URL \"%s\"."
-msgstr "Kan inte läsa avatar-URL \"%s\"."
-
-#. TRANS: Exception thrown when avatar URL return an invalid image type for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#, php-format
-msgid "Wrong image type for avatar URL \"%s\"."
-msgstr "Fel bildtyp för avatar-URL \"%s\"."
-
-#. TRANS: Title for profile design page.
-#. TRANS: Page title for profile design page.
-msgid "Profile design"
-msgstr "Profilutseende"
-
-#. TRANS: Instructions for Profile design page.
-#. TRANS: Instructions for profile design page.
-msgid ""
-"Customize the way your profile looks with a background image and a colour "
-"palette of your choice."
-msgstr ""
-"Anpassa hur din profil ser ut genom att välja bakgrundbild och färgpalett."
-
-#. TRANS: Succes message on Profile design page when finding an easter egg.
-msgid "Enjoy your hotdog!"
-msgstr "Smaklig måltid!"
-
-#. TRANS: Form legend on Profile design page.
-msgid "Design settings"
-msgstr "Utseendeinställningar"
-
-#. TRANS: Checkbox label on Profile design page.
-msgid "View profile designs"
-msgstr "Visa profilutseenden"
-
-#. TRANS: Title for checkbox on Profile design page.
-msgid "Show or hide profile designs."
-msgstr "Visa eller göm profilutseenden."
-
-#. TRANS: Form legend on Profile design page for form to choose a background image.
-msgid "Background file"
-msgstr "Fil för bakgrund"
-
 #. TRANS: Page title for all but the first page of groups for a user.
 #. TRANS: %1$s is a nickname, %2$d is a page number.
 #, php-format
@@ -6589,11 +6159,11 @@ msgstr "StatusNet %s"
 #. TRANS: %1$s is the engine name (StatusNet) and %2$s is the StatusNet version.
 #, php-format
 msgid ""
-"This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, "
+"This site is powered by %1$s version %2$s, Copyright 2008-2011 StatusNet, "
 "Inc. and contributors."
 msgstr ""
 "Denna webbplats drivs med %1$s version %2$s, Copyright 2008-2010 StatusNet, "
-"Inc. och medarbetare."
+"Inc. och bidragsgivare."
 
 #. TRANS: Header for StatusNet contributors section on the version page.
 msgid "Contributors"
@@ -6604,11 +6174,12 @@ msgid "License"
 msgstr "Licens"
 
 #. TRANS: Content part of StatusNet version page.
+#, fuzzy
 msgid ""
 "StatusNet is free software: you can redistribute it and/or modify it under "
 "the terms of the GNU Affero General Public License as published by the Free "
 "Software Foundation, either version 3 of the License, or (at your option) "
-"any later version. "
+"any later version."
 msgstr ""
 "StatusNet är fri programvara: du kan distribuera det och/eller modifiera den "
 "under GNU Affero General Public License såsom publicerad av Free Software "
@@ -6616,11 +6187,12 @@ msgstr ""
 "senare version. "
 
 #. TRANS: Content part of StatusNet version page.
+#, fuzzy
 msgid ""
 "This program is distributed in the hope that it will be useful, but WITHOUT "
 "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
 "FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License "
-"for more details. "
+"for more details."
 msgstr ""
 "Detta program distribueras i hopp om att det kommer att vara användbart, men "
 "UTAN NÅGRA GARANTIER; även utan underförstådda garantier om SÄLJBARHET eller "
@@ -6680,16 +6252,26 @@ msgstr "Webbadressen '%s' kan inte bearbeta"
 msgid "Robin thinks something is impossible."
 msgstr "Robin tycker att något är omöjligt"
 
-#. TRANS: Message given if an upload is larger than the configured maximum.
-#. TRANS: %1$d is the byte limit for uploads, %2$d is the byte count for the uploaded file.
-#. TRANS: %1$s is used for plural.
+#. TRANS: Message used to be inserted as %2$s in  the text "No file may
+#. TRANS: be larger than %1$d byte and the file you sent was %2$s.".
+#. TRANS: %1$d is the number of bytes of an uploaded file.
 #, php-format
+msgid "%1$d byte"
+msgid_plural "%1$d bytes"
+msgstr[0] ""
+msgstr[1] ""
+
+#. TRANS: Message given if an upload is larger than the configured maximum.
+#. TRANS: %1$d (used for plural) is the byte limit for uploads,
+#. TRANS: %2$s is the proper form of "n bytes". This is the only ways to have
+#. TRANS: gettext support multiple plurals in the same message, unfortunately...
+#, fuzzy, php-format
 msgid ""
-"No file may be larger than %1$d byte and the file you sent was %2$d bytes. "
-"Try to upload a smaller version."
+"No file may be larger than %1$d byte and the file you sent was %2$s. Try to "
+"upload a smaller version."
 msgid_plural ""
-"No file may be larger than %1$d bytes and the file you sent was %2$d bytes. "
-"Try to upload a smaller version."
+"No file may be larger than %1$d bytes and the file you sent was %2$s. Try to "
+"upload a smaller version."
 msgstr[0] ""
 "Ingen fil får vara större än %1$d byte och den fil du skickade var %2$d "
 "byte. Försök att ladda upp en mindre version."
@@ -6765,6 +6347,11 @@ msgstr "Kunde inte uppdatera lokal grupp."
 msgid "Could not create login token for %s"
 msgstr "Kunde inte skapa inloggnings-token för %s"
 
+#. TRANS: Exception thrown when a program code class (%s) cannot be instantiated.
+#, php-format
+msgid "Cannot instantiate class %s."
+msgstr "Kan inte initiera klass %s."
+
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.
 msgid "No database name or DSN found anywhere."
 msgstr "Inget databasnamn eller DSN funnen någonstans."
@@ -6917,10 +6504,10 @@ msgstr ""
 "antalet taggar. Försök använda eller stryka några befintliga taggar."
 
 #. TRANS: Client exception thrown when trying to add more people than allowed to a list.
-#, php-format
+#, fuzzy, php-format
 msgid ""
 "You already have %1$d or more people in list %2$s, which is the maximum "
-"allowed number.Try unlisting others first."
+"allowed number. Try unlisting others first."
 msgstr ""
 "Du har redan %1$d eller flera personer i listan %2$s, vilket är den högsta "
 "tillåtna antalet. Prova ta bort andra från listan först."
@@ -6942,7 +6529,6 @@ msgid "Unable to save tag."
 msgstr "Kunde inte spara tagg."
 
 #. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
-#. TRANS: Error message displayed to a banned user when they try to subscribe.
 msgid "You have been banned from subscribing."
 msgstr "Du har blivit utestängd från att prenumerera."
 
@@ -6962,10 +6548,6 @@ msgstr "Inte prenumerant!"
 msgid "Could not delete self-subscription."
 msgstr "Kunde inte spara prenumeration."
 
-#. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
-msgid "Could not delete subscription OMB token."
-msgstr "Kunde inte spara prenumeration."
-
 #. TRANS: Exception thrown when a subscription could not be deleted on the server.
 msgid "Could not delete subscription."
 msgstr "Kunde inte spara prenumeration."
@@ -6999,6 +6581,18 @@ msgstr "Ingen enskild användare definierad för enanvändarläge."
 msgid "Single-user mode code called when not enabled."
 msgstr "Enanvändarlägeskod anropad när den inte var aktiverad."
 
+#. TRANS: Information on password recovery form if no known username or e-mail address was specified.
+msgid "No user with that email address or username."
+msgstr "Ingen användare med den e-postadressen eller användarnamn."
+
+#. TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.
+msgid "No registered email address for that user."
+msgstr "Ingen registrerad e-postadress för den användaren."
+
+#. TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.
+msgid "Error saving address confirmation."
+msgstr "Fel vid sparande av adressbekräftelse."
+
 #. TRANS: Server exception thrown when creating a group failed.
 msgid "Could not create group."
 msgstr "Kunde inte skapa grupp."
@@ -7264,25 +6858,11 @@ msgstr "showForm() är inte implementerat."
 msgid "saveSettings() not implemented."
 msgstr "saveSetting() är inte implementerat."
 
-#. TRANS: Client error message thrown if design settings could not be deleted in
-#. TRANS: the admin panel Design.
-msgid "Unable to delete design setting."
-msgstr "Kunde inte ta bort utseendeinställning."
-
 #. TRANS: Header in administrator navigation panel.
-#. TRANS: Header in settings navigation panel.
 msgctxt "HEADER"
 msgid "Home"
 msgstr "Hem"
 
-#. TRANS: Menu item in administrator navigation panel.
-#. TRANS: Menu item in default local navigation panel.
-#. TRANS: Menu item in personal group navigation menu.
-#. TRANS: Menu item in settings navigation panel.
-msgctxt "MENU"
-msgid "Home"
-msgstr "Hem"
-
 #. TRANS: Header in administrator navigation panel.
 msgctxt "HEADER"
 msgid "Admin"
@@ -7297,17 +6877,6 @@ msgctxt "MENU"
 msgid "Site"
 msgstr "Webbplats"
 
-#. TRANS: Menu item title in administrator navigation panel.
-msgid "Design configuration"
-msgstr "Konfiguration av utseende"
-
-#. TRANS: Menu item in administrator navigation panel.
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: Menu item in settings navigation panel.
-msgctxt "MENU"
-msgid "Design"
-msgstr "Utseende"
-
 #. TRANS: Menu item title in administrator navigation panel.
 msgid "User configuration"
 msgstr "Konfiguration av användare"
@@ -7406,41 +6975,6 @@ msgstr "Ingen användare för den token."
 msgid "Could not authenticate you."
 msgstr "Kunde inte autentisera dig."
 
-#. TRANS: Server error displayed when trying to create an anynymous OAuth consumer.
-msgid "Could not create anonymous consumer."
-msgstr "Kunde inte skapa anonym konsument."
-
-#. TRANS: Server error displayed when trying to create an anynymous OAuth application.
-msgid "Could not create anonymous OAuth application."
-msgstr "Kunde inte skapa anonym OAuth-applikation."
-
-#. TRANS: Exception thrown when no token association could be found.
-msgid ""
-"Could not find a profile and application associated with the request token."
-msgstr ""
-"Kunde inte hitta en profil och applikation som är associerade med begäran-"
-"token."
-
-#. TRANS: Exception thrown when no access token can be issued.
-msgid "Could not issue access token."
-msgstr "Kunde inte utfärda åtkomst-token."
-
-#. TRANS: Exception thrown when a database error occurs.
-msgid "Database error inserting OAuth application user."
-msgstr "Databasfel vid infogning av OAuth-applikationsanvändare."
-
-#. TRANS: Exception thrown when a database error occurs.
-msgid "Database error updating OAuth application user."
-msgstr "Databasfel vid uppdatering av OAuth-applikationsanvändare."
-
-#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
-msgid "Tried to revoke unknown token."
-msgstr "Försökte återkalla okänd token."
-
-#. TRANS: Exception thrown when an attempt is made to remove a revoked token.
-msgid "Failed to delete revoked token."
-msgstr "Det gick inte att ta bort återkallad token."
-
 #. TRANS: Form input field label for application icon.
 msgid "Icon"
 msgstr "Ikon"
@@ -7522,13 +7056,12 @@ msgstr ""
 "Standardåtkomst för denna applikation: skrivskyddad, eller läs och skriv"
 
 #. TRANS: Submit button title.
-msgid "Cancel"
-msgstr "Avbryt"
+msgid "Cancel application changes."
+msgstr "Avbryt applikationsändringar."
 
 #. TRANS: Submit button title.
-#. TRANS: Button text to save a list.
-msgid "Save"
-msgstr "Spara"
+msgid "Save application changes."
+msgstr "Spara applikationsändringar."
 
 #. TRANS: Name for an anonymous application in application list.
 msgid "Unknown application"
@@ -7563,6 +7096,18 @@ msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "Ã…terkalla"
 
+#. TRANS: Submit button text to accept a group membership request on approve group form.
+#. TRANS: Submit button text to accept a subscription request on approve sub form.
+msgctxt "BUTTON"
+msgid "Accept"
+msgstr "Acceptera"
+
+#. TRANS: Submit button text to reject a group membership request on approve group form.
+#. TRANS: Submit button text to reject a subscription request on approve sub form.
+msgctxt "BUTTON"
+msgid "Reject"
+msgstr "Avvisa"
+
 #. TRANS: Atom feed exception thrown when an author element does not contain a name element.
 msgid "Author element must contain a name element."
 msgstr "Author-elementet måste innehålla ett name-element."
@@ -8109,6 +7654,11 @@ msgstr "Du kanske vill köra installeraren för att åtgärda detta."
 msgid "Go to the installer."
 msgstr "GÃ¥ till installeraren."
 
+#. TRANS: Header on conversation page. Hidden by default (h2).
+#. TRANS: Label for user statistics.
+msgid "Notices"
+msgstr "Notiser"
+
 #. TRANS: Page title for when a database error occurs.
 msgid "Database error"
 msgstr "Databasfel"
@@ -8119,13 +7669,6 @@ msgctxt "MENU"
 msgid "Public"
 msgstr "Publikt"
 
-#. TRANS: Menu item in default local navigation panel.
-#. TRANS: Menu item in search group navigation panel.
-#. TRANS: Menu item in local navigation menu.
-msgctxt "MENU"
-msgid "Groups"
-msgstr "Grupper"
-
 #. TRANS: Menu item in default local navigation panel.
 #. TRANS: Menu item title in local navigation menu.
 msgctxt "MENU"
@@ -8141,51 +7684,12 @@ msgstr "Ta bort"
 msgid "Delete this user"
 msgstr "Ta bort denna användare"
 
-#. TRANS: Form legend of form for changing the page design.
-msgid "Change design"
-msgstr "Ändra utseende"
-
-#. TRANS: Fieldset legend on profile design page to change profile page colours.
-msgid "Change colours"
-msgstr "Byt färger"
-
-#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-msgid "Use defaults"
-msgstr "Använd standardvärden"
-
-#. TRANS: Label in form on profile design page.
-#. TRANS: Field contains file name on user's computer that could be that user's custom profile background image.
-msgid "Upload file"
-msgstr "Ladda upp fil"
-
-#. TRANS: Instructions for form on profile design page.
-msgid ""
-"You can upload your personal background image. The maximum file size is 2MB."
-msgstr ""
-"Du kan ladda upp din personliga bakgrundbild. Den maximala filstorleken är "
-"2MB."
-
-#. TRANS: Radio button on profile design page that will enable use of the uploaded profile image.
-msgctxt "RADIO"
-msgid "On"
-msgstr "PÃ¥"
-
-#. TRANS: Radio button on profile design page that will disable use of the uploaded profile image.
-msgctxt "RADIO"
-msgid "Off"
-msgstr "Av"
-
-#. TRANS: Success message displayed if design settings were saved after clicking "Use defaults".
-msgid "Design defaults restored."
-msgstr "Standardvärden för utseende återställda."
-
 #. TRANS: Exception. %s is an ID.
 #, php-format
 msgid "Unable to find services for %s."
 msgstr "Det gick inte att hitta tjänster för %s."
 
 #. TRANS: Form legend for removing the favourite status for a favourite notice.
-#. TRANS: Title for button text for removing the favourite status for a favourite notice.
 msgid "Disfavor this notice"
 msgstr "Avmarkera denna notis som favorit"
 
@@ -8194,8 +7698,11 @@ msgctxt "BUTTON"
 msgid "Disfavor favorite"
 msgstr "Ta bort märkning som favorit"
 
+#. TRANS: Button title for removing the favourite status for a favourite notice.
+msgid "Remove this notice from your list of favorite notices."
+msgstr "Ta bort denna notis från din lista med favoritnotiser."
+
 #. TRANS: Form legend for adding the favourite status to a notice.
-#. TRANS: Title for button text for adding the favourite status to a notice.
 msgid "Favor this notice"
 msgstr "Markera denna notis som favorit"
 
@@ -8204,6 +7711,10 @@ msgctxt "BUTTON"
 msgid "Favor"
 msgstr "Markera som favorit"
 
+#. TRANS: Button title for adding the favourite status to a notice.
+msgid "Add this notice to your list of favorite notices."
+msgstr "Lägg till denna notis till din lista med favoritnotiser."
+
 #. TRANS: Feed type name.
 msgid "RSS 1.0"
 msgstr "RSS 1.0"
@@ -8220,6 +7731,10 @@ msgstr "Atom"
 msgid "FOAF"
 msgstr "FOAF"
 
+#. TRANS: Feed type name. See http://activitystrea.ms/
+msgid "Activity Streams"
+msgstr "Activity Streams"
+
 #. TRANS: Client exception thrown when an imported feed does not have an author.
 msgid "No author in the feed."
 msgstr "Ingen författare i flödet."
@@ -8251,6 +7766,27 @@ msgstr "Välj en tagg för att begränsa listan."
 msgid "Grant this user the \"%s\" role"
 msgstr "Bevilja denna användare \"%s\"-rollen"
 
+#. TRANS: Header for mini list of group members on a group page (h2).
+msgid "Members"
+msgstr "Medlemmar"
+
+#. TRANS: Link to all group members from mini list of group members if group has more than n members.
+msgid "All members"
+msgstr "Alla medlemmar"
+
+#. TRANS: Header for mini list of users with a pending membership request on a group page (h2).
+msgid "Pending"
+msgstr "Väntande"
+
+#. TRANS: Header for mini list of users that are blocked in a group page (h2).
+msgid "Blocked"
+msgstr "Blockerad"
+
+#. TRANS: Title for list of group administrators on a group page.
+msgctxt "TITLE"
+msgid "Admins"
+msgstr "Administratörer"
+
 #. TRANS: Button text for the form that will block a user from a group.
 msgctxt "BUTTON"
 msgid "Block"
@@ -8258,8 +7794,9 @@ msgstr "Blockera"
 
 #. TRANS: Submit button title.
 msgctxt "TOOLTIP"
-msgid "Block this user"
-msgstr "Blockera denna användare"
+msgid "Block this user so that they can no longer post messages to it."
+msgstr ""
+"Blockera denna användare så de inte längre kan skicka meddelanden till den."
 
 #. TRANS: Field title on group edit form.
 msgid "URL of the homepage or blog of the group or topic."
@@ -8314,63 +7851,9 @@ msgctxt "GROUPADMIN"
 msgid "Admin"
 msgstr "Administratör"
 
-#. TRANS: Menu item in the group navigation page.
-msgctxt "MENU"
-msgid "Group"
-msgstr "Grupp"
-
-#. TRANS: Tooltip for menu item in the group navigation page.
-#. TRANS: %s is the nickname of the group.
-#, php-format
-msgctxt "TOOLTIP"
-msgid "%s group"
-msgstr "%s grupp"
-
-#. TRANS: Menu item in the group navigation page.
-msgctxt "MENU"
-msgid "Members"
-msgstr "Medlemmar"
-
-#. TRANS: Tooltip for menu item in the group navigation page.
-#. TRANS: %s is the nickname of the group.
-#, php-format
-msgctxt "TOOLTIP"
-msgid "%s group members"
-msgstr "%s gruppmedlemmar"
-
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: %d is the number of pending members.
-#, php-format
-msgctxt "MENU"
-msgid "Pending members (%d)"
-msgid_plural "Pending members (%d)"
-msgstr[0] "Väntande medlemmar (%d) "
-msgstr[1] "Väntande medlemmar (%d)"
-
-#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: %s is the nickname of the group.
-#, php-format
-msgctxt "TOOLTIP"
-msgid "%s pending members"
-msgstr "%s väntande medlemmar"
-
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-msgctxt "MENU"
-msgid "Blocked"
-msgstr "Blockerade"
-
-#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: %s is the nickname of the group.
-#, php-format
-msgctxt "TOOLTIP"
-msgid "%s blocked users"
-msgstr "%s blockerade användare"
-
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: Menu item in primary navigation panel.
-msgctxt "MENU"
-msgid "Admin"
-msgstr "Administratör"
+#. TRANS: Group actions header (h2). Text hidden by default.
+msgid "Group actions"
+msgstr "Åtgärder för grupp"
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
@@ -8379,11 +7862,6 @@ msgctxt "TOOLTIP"
 msgid "Edit %s group properties"
 msgstr "Redigera %s gruppegenskaper"
 
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-msgctxt "MENU"
-msgid "Logo"
-msgstr "Logotyp"
-
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
 #, php-format
@@ -8391,16 +7869,10 @@ msgctxt "TOOLTIP"
 msgid "Add or edit %s logo"
 msgstr "Lägg till eller redigera %s logotyp"
 
-#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: %s is the nickname of the group.
-#, php-format
-msgctxt "TOOLTIP"
-msgid "Add or edit %s design"
-msgstr "Lägg till eller redigera %s utseende"
-
-#. TRANS: Group actions header (h2). Text hidden by default.
-msgid "Group actions"
-msgstr "Åtgärder för grupp"
+#. TRANS: Link text for link on user profile.
+msgctxt "MENU"
+msgid "Logo"
+msgstr "Logotyp"
 
 #. TRANS: Title for groups with the most members section.
 msgid "Popular groups"
@@ -8410,11 +7882,19 @@ msgstr "Populära grupper"
 msgid "Active groups"
 msgstr "Aktiva grupper"
 
-#. TRANS: Title for group tag cloud section.
-#. TRANS: %s is a group name.
-#, php-format
-msgid "Tags in %s group's notices"
-msgstr "Taggar i %s grupps notiser"
+#. TRANS: Link description for seeing all groups.
+#. TRANS: Link description for seeing all lists.
+msgid "See all"
+msgstr "Visa alla"
+
+#. TRANS: Link title for seeing all groups.
+msgid "See all groups you belong to."
+msgstr "Se alla grupper som du tillhör."
+
+#. TRANS: Menu item title in personal group navigation menu.
+#. TRANS: %s is a username.
+msgid "Back to top"
+msgstr ""
 
 #. TRANS: Client exception 406
 msgid "This page is not available in a media type you accept"
@@ -8505,11 +7985,41 @@ msgctxt "TITLE"
 msgid "Trends"
 msgstr "Trender"
 
-#. TRANS: Button text for inviting more users to the StatusNet instance.
+#. TRANS: Default button text for inviting more users to the StatusNet instance.
 msgctxt "BUTTON"
 msgid "Invite more colleagues"
 msgstr "Bjud in fler kollegor"
 
+#. TRANS: Form legend.
+msgid "Invite collegues"
+msgstr "Bjud in kollegor"
+
+#. TRANS: Field label for a list of e-mail addresses.
+msgid "Email addresses"
+msgstr "E-postadresser"
+
+#. TRANS: Field title for a list of e-mail addresses.
+msgid "Addresses of friends to invite (one per line)."
+msgstr "Adresser till vänner att bjuda in (en per rad)."
+
+#. TRANS: Field label for a personal message to send to invitees.
+msgid "Personal message"
+msgstr "Personligt meddelande"
+
+#. TRANS: Field title for a personal message to send to invitees.
+msgid "Optionally add a personal message to the invitation."
+msgstr "Om du vill, skriv ett personligt meddelande till inbjudan."
+
+#. TRANS: Send button for inviting friends
+#. TRANS: Button text for sending notice.
+msgctxt "BUTTON"
+msgid "Send"
+msgstr "Skicka"
+
+#. TRANS: Submit button title.
+msgid "Send invitations."
+msgstr "Skicka inbjudningar."
+
 #. TRANS: Button text for joining a group.
 msgctxt "BUTTON"
 msgid "Join"
@@ -8520,6 +8030,10 @@ msgctxt "BUTTON"
 msgid "Leave"
 msgstr "Leave"
 
+#. TRANS: Link title for seeing all lists.
+msgid "See all lists you have created."
+msgstr "Se alla listor som du har skapat."
+
 #. TRANS: Menu item for logging in to the StatusNet site.
 #. TRANS: Menu item in primary navigation panel.
 msgctxt "MENU"
@@ -8579,8 +8093,8 @@ msgstr ""
 #. TRANS: Main body of new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscriber's long name, %2$s is the StatusNet sitename.
 #, php-format
-msgid "%1$s is now listening to your notices on %2$s."
-msgstr "%1$s lyssnar nu på dina notiser på %2$s."
+msgid "%1$s is now following you on %2$s."
+msgstr "%1$s följer nu dig på %2$s."
 
 #. TRANS: Subject of pending new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscribing user's nickname, %2$s is the StatusNet sitename.
@@ -8802,7 +8316,7 @@ msgstr "%1$s (@%2$s) skickade en notis för din uppmärksamhet"
 #. TRANS: Body of @-reply notification e-mail.
 #. TRANS: %1$s is the sending user's name, $2$s is the StatusNet sitename,
 #. TRANS: %3$s is a URL to the notice, %4$s is the notice text,
-#. TRANS: %5$s is a URL to the full conversion if it exists (otherwise empty),
+#. TRANS: %5$s is the text "The full conversation can be read here:" and a URL to the full conversion if it exists (otherwise empty),
 #. TRANS: %6$s is a URL to reply to the notice, %7$s is a URL to all @-replies for the addressed user,
 #, php-format
 msgid ""
@@ -8844,6 +8358,10 @@ msgstr ""
 
 #. TRANS: Subject of group join notification e-mail.
 #. TRANS: %1$s is the joining user's nickname, %2$s is the group name, and %3$s is the StatusNet sitename.
+#, fuzzy, php-format
+msgid "%1$s has joined your group %2$s on %3$s"
+msgstr "%1$s har gått med i din grupp %2$s på %3$s."
+
 #. TRANS: Main body of group join notification e-mail.
 #. TRANS: %1$s is the subscriber's long name, %2$s is the group name, and %3$s is the StatusNet sitename,
 #. TRANS: %4$s is a block of profile info about the subscriber.
@@ -8933,8 +8451,8 @@ msgstr "Gör till administratör"
 
 #. TRANS: Submit button title.
 msgctxt "TOOLTIP"
-msgid "Make this user an admin"
-msgstr "Gör denna användare till administratör"
+msgid "Make this user an admin."
+msgstr "Gör denna användare till administratör."
 
 #. TRANS: Client exception thrown when a database error was thrown during a file upload operation.
 msgid "There was a database error while saving your file. Please try again."
@@ -8982,7 +8500,7 @@ msgstr "Skicka en direktnotis"
 msgid "Select recipient:"
 msgstr "Välj mottagare:"
 
-#. TRANS Entry in drop-down selection box in direct-message inbox/outbox when no one is available to message.
+#. TRANS: Entry in drop-down selection box in direct-message inbox/outbox when no one is available to message.
 msgid "No mutual subscribers."
 msgstr "Inga ömsesidiga prenumeranter."
 
@@ -9050,6 +8568,10 @@ msgid "You must implement either adaptNoticeListItem() or showNotice()."
 msgstr ""
 "Du måste implementera antingen adaptNoticeListItem() eller showNotice()."
 
+#. TRANS: Link description to show more items in a list.
+msgid "More â–¼"
+msgstr "Mer â–¼"
+
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 msgid "Nickname cannot be empty."
 msgstr "Smeknamn kan inte vara tomt."
@@ -9099,10 +8621,6 @@ msgctxt "SEPARATOR"
 msgid ", "
 msgstr ", "
 
-#. TRANS: Start of profile addressees list.
-msgid " â–¸ "
-msgstr " â–¸ "
-
 #. TRANS: Used in coordinates as abbreviation of north.
 msgid "N"
 msgstr "N"
@@ -9141,16 +8659,16 @@ msgid "Repeated by"
 msgstr "Upprepad av"
 
 #. TRANS: Link title in notice list item to reply to a notice.
-msgid "Reply to this notice"
-msgstr "Svara på denna notis"
+msgid "Reply to this notice."
+msgstr "Svara på denna notis."
 
 #. TRANS: Link text in notice list item to reply to a notice.
 msgid "Reply"
 msgstr "Svara"
 
 #. TRANS: Link title in notice list item to delete a notice.
-msgid "Delete this notice"
-msgstr "Ta bort denna notis"
+msgid "Delete this notice from the timeline."
+msgstr "Ta bort denna notis från tidslinjen."
 
 #. TRANS: Title for repeat form status in notice list when a notice has been repeated.
 msgid "Notice repeated."
@@ -9173,26 +8691,6 @@ msgstr "Knuffa"
 msgid "Send a nudge to this user."
 msgstr "Skicka en knuff till denna användare."
 
-#. TRANS: Exception thrown when creating a new profile fails in OAuth store.
-msgid "Error inserting new profile."
-msgstr "Fel vid infogning av ny profil."
-
-#. TRANS: Exception thrown when creating a new avatar fails in OAuth store.
-msgid "Error inserting avatar."
-msgstr "Fel vid infogning av avatar."
-
-#. TRANS: Exception thrown when creating a remote profile fails in OAuth store.
-msgid "Error inserting remote profile."
-msgstr "Fel vid infogning av fjärrprofil."
-
-#. TRANS: Exception thrown when a notice is denied because it has been sent before.
-msgid "Duplicate notice."
-msgstr "Duplicera notis."
-
-#. TRANS: Exception thrown when creating a new subscription fails in OAuth store.
-msgid "Could not insert new subscription."
-msgstr "Kunde inte infoga ny prenumeration."
-
 #. TRANS: Server exception thrown in oEmbed action if no API endpoint is available.
 msgid "No oEmbed API endpoint available."
 msgstr "Ingen oEmbed API-slutpunkt är tillgänglig."
@@ -9270,10 +8768,6 @@ msgstr "Redigera"
 msgid "Edit %s list by you."
 msgstr "Redigera %s-listan av dig."
 
-#. TRANS: Link description for link to list of users tagged with a tag.
-msgid "Tagged"
-msgstr "Taggade"
-
 #. TRANS: Title for link to edit list settings.
 msgid "Edit list settings."
 msgstr "Redigera listinställningar."
@@ -9416,9 +8910,13 @@ msgctxt "plugin"
 msgid "Enable"
 msgstr "Aktivera"
 
+#. TRANS: Plugin description for a disabled plugin.
 msgctxt "plugin-description"
-msgid "(Plugin descriptions unavailable when disabled.)"
-msgstr "(Beskrivningar av insticksmoduler inte tillgängliga när inaktiverade.)"
+msgid ""
+"(The plugin description is unavailable when a plugin has been disabled.)"
+msgstr ""
+"(Beskrivningar av insticksmoduler inte tillgängliga när den har blivit "
+"inaktiverad.)"
 
 #. TRANS: Menu item in primary navigation panel.
 msgctxt "MENU"
@@ -9429,6 +8927,11 @@ msgstr "Inställningar"
 msgid "Change your personal settings."
 msgstr "Ändra dina personliga inställningar."
 
+#. TRANS: Menu item in primary navigation panel.
+msgctxt "MENU"
+msgid "Admin"
+msgstr "Administratör"
+
 #. TRANS: Menu item title in primary navigation panel.
 msgid "Site configuration."
 msgstr "Webbplatskonfiguration."
@@ -9446,14 +8949,8 @@ msgstr "Logga ut från webbplatsen."
 msgid "Login to the site."
 msgstr "Logga in på webbplatsen."
 
-#. TRANS: Menu item in primary navigation panel.
-msgctxt "MENU"
-msgid "Search"
-msgstr "Sök"
-
-#. TRANS: Menu item title in primary navigation panel.
-msgid "Search the site."
-msgstr "Sök på webbplatsen."
+msgid "This profile has been silenced by site moderators"
+msgstr ""
 
 #. TRANS: H2 text for user subscription statistics.
 msgid "Following"
@@ -9463,6 +8960,10 @@ msgstr "Följer"
 msgid "Followers"
 msgstr "Prenumeranter"
 
+#. TRANS: H2 text for user statistics.
+msgid "Statistics"
+msgstr "Statistik"
+
 #. TRANS: Label for user statistics.
 msgid "User ID"
 msgstr "Användar-ID"
@@ -9471,10 +8972,6 @@ msgstr "Användar-ID"
 msgid "Member since"
 msgstr "Medlem sedan"
 
-#. TRANS: Label for user statistics.
-msgid "Notices"
-msgstr "Notiser"
-
 #. TRANS: Label for user statistics.
 #. TRANS: Average count of posts made per day since account registration.
 msgid "Daily average"
@@ -9560,27 +9057,26 @@ msgid "Keyword(s)"
 msgstr "Nyckelord"
 
 #. TRANS: Button text for searching site.
+#. TRANS: Button text for search button on search form.
 #. TRANS: Button text to search profiles.
 msgctxt "BUTTON"
 msgid "Search"
 msgstr "Sök"
 
 #. TRANS: Standard search suggestions shown when a search does not give any results.
-#, fuzzy
 msgid ""
 "* Make sure all words are spelled correctly.\n"
 "* Try different keywords.\n"
 "* Try more general keywords.\n"
 "* Try fewer keywords."
 msgstr ""
-" * Kontrollera att alla ord är korrekt stavade.\n"
-" * Prova olika nyckelord.\n"
-" * Prova mer allmänna nyckelord.\n"
-" * Prova färre nyckelord.\n"
-" "
+"* Kontrollera att alla ord är korrekt stavade.\n"
+"* Prova olika nyckelord.\n"
+"* Prova mer allmänna nyckelord.\n"
+"* Prova färre nyckelord."
 
 #. TRANS: Standard search suggestions shown when a search does not give any results.
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "You can also try your search on other engines:\n"
 "\n"
@@ -9599,8 +9095,7 @@ msgstr ""
 " * [Google] (http://www.google.com/search?q=site%%3A%%%%site.server%%%%+%s)\n"
 " * [Yahoo] (http://search.yahoo.com/search?p=site%%3A%%%%site.server%%%%+%"
 "s)\n"
-" * [Collecta] (http://collecta.com/#q=%s)\n"
-" "
+" * [Collecta] (http://collecta.com/#q=%s)"
 
 #. TRANS: Menu item in search group navigation panel.
 msgctxt "MENU"
@@ -9624,21 +9119,6 @@ msgstr "Hitta innehåll i notiser"
 msgid "Find groups on this site"
 msgstr "Hitta grupper på denna webbplats"
 
-#. TRANS: Secondary navigation menu item leading to help on StatusNet.
-msgctxt "MENU"
-msgid "Help"
-msgstr "Hjälp"
-
-#. TRANS: Secondary navigation menu item leading to text about StatusNet site.
-msgctxt "MENU"
-msgid "About"
-msgstr "Om"
-
-#. TRANS: Secondary navigation menu item leading to Frequently Asked Questions.
-msgctxt "MENU"
-msgid "FAQ"
-msgstr "Vanliga frågor"
-
 #. TRANS: Secondary navigation menu item leading to Terms of Service.
 msgctxt "MENU"
 msgid "TOS"
@@ -9659,17 +9139,6 @@ msgctxt "MENU"
 msgid "Version"
 msgstr "Version"
 
-#. TRANS: Secondary navigation menu item leading to e-mail contact information on the
-#. TRANS: StatusNet site, where to report bugs, ...
-msgctxt "MENU"
-msgid "Contact"
-msgstr "Kontakt"
-
-#. TRANS: Secondary navigation menu item. Leads to information about embedding a timeline widget.
-msgctxt "MENU"
-msgid "Badge"
-msgstr "Emblem"
-
 #. TRANS: Default title for section/sidebar widget.
 msgid "Untitled section"
 msgstr "Namnlös sektion"
@@ -9714,10 +9183,6 @@ msgstr "E-post"
 msgid "Change email handling"
 msgstr "Ändra e-posthantering"
 
-#. TRANS: Menu item title in settings navigation panel.
-msgid "Design your profile"
-msgstr "Designa din profil"
-
 #. TRANS: Menu item in settings navigation panel.
 msgctxt "MENU"
 msgid "URL"
@@ -9754,6 +9219,15 @@ msgstr "Anslutningar"
 msgid "Authorized connected applications"
 msgstr "Tillåt anslutna applikationer"
 
+#. TRANS: Menu item in settings navigation panel.
+msgctxt "MENU"
+msgid "Old school"
+msgstr "Gamla skolan"
+
+#. TRANS: Menu item title in settings navigation panel.
+msgid "UI tweaks for old-school users"
+msgstr ""
+
 #. TRANS: Title of form to silence a user.
 msgctxt "TITLE"
 msgid "Silence"
@@ -9763,6 +9237,41 @@ msgstr "Tysta ned"
 msgid "Silence this user"
 msgstr "Tysta ned denna användare"
 
+#. TRANS: Server error displayed when trying to create an anynymous OAuth consumer.
+msgid "Could not create anonymous consumer."
+msgstr "Kunde inte skapa anonym konsument."
+
+#. TRANS: Server error displayed when trying to create an anynymous OAuth application.
+msgid "Could not create anonymous OAuth application."
+msgstr "Kunde inte skapa anonym OAuth-applikation."
+
+#. TRANS: Exception thrown when no token association could be found.
+msgid ""
+"Could not find a profile and application associated with the request token."
+msgstr ""
+"Kunde inte hitta en profil och applikation som är associerade med begäran-"
+"token."
+
+#. TRANS: Exception thrown when no access token can be issued.
+msgid "Could not issue access token."
+msgstr "Kunde inte utfärda åtkomst-token."
+
+#. TRANS: Exception thrown when a database error occurs.
+msgid "Database error inserting OAuth application user."
+msgstr "Databasfel vid infogning av OAuth-applikationsanvändare."
+
+#. TRANS: Exception thrown when a database error occurs.
+msgid "Database error updating OAuth application user."
+msgstr "Databasfel vid uppdatering av OAuth-applikationsanvändare."
+
+#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
+msgid "Tried to revoke unknown token."
+msgstr "Försökte återkalla okänd token."
+
+#. TRANS: Exception thrown when an attempt is made to remove a revoked token.
+msgid "Failed to delete revoked token."
+msgstr "Det gick inte att ta bort återkallad token."
+
 #. TRANS: Menu item in local navigation menu.
 msgctxt "MENU"
 msgid "Subscriptions"
@@ -9819,6 +9328,16 @@ msgstr "Bjud in vänner och kollegor att gå med dig på %s."
 msgid "Subscribe to this user"
 msgstr "Prenumerera på denna användare"
 
+#. TRANS: Button text to subscribe to a user.
+#. TRANS: Button text for subscribing to a list.
+msgctxt "BUTTON"
+msgid "Subscribe"
+msgstr "Prenumerera"
+
+#. TRANS: Button title to subscribe to a user.
+msgid "Subscribe to this user."
+msgstr "Prenumerera på denna användaren."
+
 #. TRANS: Title of personal tag cloud section.
 msgid "People Tagcloud as self-tagged"
 msgstr "Taggmoln för person, såsom taggat själv"
@@ -9937,17 +9456,28 @@ msgstr[0] "%%s gillar detta. "
 msgstr[1] "%%s gillar detta."
 
 #. TRANS: List message for notice repeated by logged in user.
+#, fuzzy
 msgctxt "REPEATLIST"
-msgid "You have repeated this notice."
+msgid "You repeated this."
 msgstr "Du har upprepat denna notis."
 
-#. TRANS: List message for repeated notices.
-#. TRANS: %d is the number of users that have repeated a notice.
-#, php-format
-msgid "One person has repeated this notice."
-msgid_plural "%d people have repeated this notice."
-msgstr[0] " En person har upprepat denna notis."
-msgstr[1] "%d personer har upprepat denna notis."
+#. TRANS: List message for when more than 4 people repeat something.
+#. TRANS: %%s is a list of users liking a notice, %d is the number over 4 that like the notice.
+#. TRANS: Plural is decided on the total number of users liking the notice (count of %%s + %d).
+#, fuzzy, php-format
+msgid "%%s and %d other repeated this."
+msgid_plural "%%s and %d others repeated this."
+msgstr[0] "%%s och %d andra gillar detta. "
+msgstr[1] "%%s och %d andra gillar detta."
+
+#. TRANS: List message for favoured notices.
+#. TRANS: %%s is a list of users liking a notice.
+#. TRANS: Plural is based on the number of of users that have favoured a notice.
+#, fuzzy, php-format
+msgid "%%s repeated this."
+msgid_plural "%%s repeated this."
+msgstr[0] "%%s gillar detta. "
+msgstr[1] "%%s gillar detta."
 
 #. TRANS: Form legend.
 #, php-format
@@ -10039,7 +9569,6 @@ msgid "Unsilence this user"
 msgstr "Häv nedtystning av denna användare"
 
 #. TRANS: Form legend on unsubscribe form.
-#. TRANS: Button title on unsubscribe form.
 msgid "Unsubscribe from this user"
 msgstr "Avsluta prenumerationen på denna användare"
 
@@ -10049,6 +9578,10 @@ msgctxt "BUTTON"
 msgid "Unsubscribe"
 msgstr "Avsluta pren."
 
+#. TRANS: Button title on unsubscribe form.
+msgid "Unsubscribe from this user."
+msgstr "Avsluta prenumerationen på denna användare."
+
 #. TRANS: Exception text shown when no profile can be found for a user.
 #. TRANS: %1$s is a user nickname, $2$d is a user ID (number).
 #, php-format
@@ -10130,8 +9663,6 @@ msgstr "Ogiltig XML, saknar XRD-rot."
 msgid "Getting backup from file '%s'."
 msgstr "Hämtar säkerhetskopia från filen '%s'."
 
-#~ msgid "%1$s and friends, page %2$d"
-#~ msgstr "%1$s och vänner, sida %2$d"
-
-#~ msgid "You and friends"
-#~ msgstr "Du och vänner"
+#
+#~ msgid " "
+#~ msgstr " "
diff --git a/locale/te/LC_MESSAGES/statusnet.po b/locale/te/LC_MESSAGES/statusnet.po
index dae8e0238f..4f22a3e5bb 100644
--- a/locale/te/LC_MESSAGES/statusnet.po
+++ b/locale/te/LC_MESSAGES/statusnet.po
@@ -10,17 +10,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:47+0000\n"
-"Language-Team: Telugu <http://translatewiki.net/wiki/Portal:te>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:39+0000\n"
+"Language-Team: Telugu <https://translatewiki.net/wiki/Portal:te>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: te\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-05-05 10:52:40+0000\n"
+"X-POT-Import-Date: 2012-04-22 22:02:21+0000\n"
 
 #. TRANS: Database error message.
 #, php-format
@@ -31,12 +31,6 @@ msgid ""
 "again."
 msgstr ""
 
-#. TRANS: Error message.
-msgid ""
-"An important error occured, probably related to email setup. Check logfiles "
-"for more info."
-msgstr ""
-
 #. TRANS: Error message.
 msgid "An error occurred."
 msgstr "ఒక పొరపాట� దొర�లింది."
@@ -95,12 +89,12 @@ msgstr "కొత�త నమోద�లన� అచేతనంచేయి.
 msgid "Closed"
 msgstr "మూసివేయబడింది"
 
-#. TRANS: Title for button to save access settings in site admin panel.
-msgid "Save access settings"
+#. TRANS: Button title to save access settings in site admin panel.
+#, fuzzy
+msgid "Save access settings."
 msgstr "అంద�బాట� అమరికలన� భద�రపరచ�"
 
-#. TRANS: Tooltip for button to save access settings in site admin panel.
-#. TRANS: Button text for saving theme settings.
+#. TRANS: Button text to save access settings in site admin panel.
 #. TRANS: Button label to save e-mail preferences.
 #. TRANS: Button label to save IM preferences.
 #. TRANS: Button text in the license admin panel.
@@ -116,7 +110,6 @@ msgstr "అంద�బాట� అమరికలన� భద�రపరచ
 #. TRANS: Button text for saving "Other settings" in profile.
 #. TRANS: Button text to save user settings in user admin panel.
 #. TRANS: Button label in the "Edit application" form.
-#. TRANS: Button text on profile design page to save settings.
 #. TRANS: Text for save button on group edit form.
 #. TRANS: Button text to save tags for a profile.
 msgctxt "BUTTON"
@@ -155,11 +148,6 @@ msgstr "అట�వంటి ప�రొఫైల� లేద�."
 msgid "No such list."
 msgstr "అట�వంటి జాబితా లేద�."
 
-#. TRANS: Client error displayed when trying to add an OMB 0.1 remote profile to a list.
-#, fuzzy
-msgid "You cannot list an OMB 0.1 remote profile with this action."
-msgstr "ఈ సైట�లో మీర� వాడ�కరలకి పాత�రలన� ఇవ�వలేర�."
-
 #. TRANS: Client error displayed when an unknown error occurs when adding a user to a list.
 #. TRANS: %s is a username.
 #, php-format
@@ -189,7 +177,6 @@ msgstr "అట�వంటి పేజీ లేద�."
 #. TRANS: Client error when user not found for an rss related action.
 #. TRANS: Client error displayed when no existing user is provided for a user's delivery device setting.
 #. TRANS: Client error displayed if a user could not be found.
-#. TRANS: Client error when user not found updating a profile background image.
 #. TRANS: Client error displayed updating profile image without having a user object.
 #. TRANS: Client error displayed when making an Atom API request for an unknown user.
 #. TRANS: Client error displayed when trying to block a non-existing user or a user from another site.
@@ -215,14 +202,11 @@ msgstr "అట�వంటి పేజీ లేద�."
 #. TRANS: Client error displayed when trying to get the RSS feed with favorites of a user that does not exist.
 #. TRANS: Client error displayed when requesting Friends of a Friend feed without providing a user nickname.
 #. TRANS: Client error displayed when requesting Friends of a Friend feed for an object that is not a user.
-#. TRANS: Client error displayed when trying to get a user hCard for a non-existing user.
 #. TRANS: Client error displayed trying to make a micro summary without providing a valid user.
 #. TRANS: Client error displayed trying to send a direct message to a non-existing user.
 #. TRANS: Client error displayed trying to use "one time password login" without using an existing user.
 #. TRANS: Client error displayed when referring to non-existing user.
 #. TRANS: Client error displayed trying to perform an action related to a non-existing user.
-#. TRANS: Form validation error on page for remote subscribe when no user was provided.
-#. TRANS: Form validation error on page for remote subscribe when no user profile was found.
 #. TRANS: Client error displayed when trying to reply to a non-exsting user.
 #. TRANS: Client error displayed when providing a non-existing nickname in a RSS 1.0 action.
 #. TRANS: Client error.
@@ -231,7 +215,6 @@ msgstr "అట�వంటి పేజీ లేద�."
 #. TRANS: Client error displayed trying to find a user by ID for a non-existing ID.
 #. TRANS: Client error displayed requesting groups for a non-existing user.
 #. TRANS: Client error displayed when user not found for an action.
-#. TRANS: Client error displayed providing a non-existing nickname.
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #. TRANS: Client error displayed when trying to perform a gallery action with an unknown user.
 #. TRANS: Client error displayed when trying to access a mailbox without providing a user.
@@ -240,15 +223,21 @@ msgid "No such user."
 msgstr "అట�వంటి వాడ�కరి లేర�."
 
 #. TRANS: Title of a user's own start page.
-#, fuzzy
 msgid "Home timeline"
-msgstr "%s కాలరేఖ"
+msgstr "స�వంత కాలరేఖ"
 
 #. TRANS: Title of another user's start page.
 #. TRANS: %s is the other user's name.
-#, fuzzy, php-format
+#, php-format
 msgid "%s's home timeline"
-msgstr "%s కాలరేఖ"
+msgstr "%s యొక�క స�వంత కాలరేఖ"
+
+#. TRANS: %s is user nickname.
+#. TRANS: Feed title.
+#. TRANS: %s is tagger's nickname.
+#, fuzzy, php-format
+msgid "Feed for friends of %s (Activity Streams JSON)"
+msgstr "%s యొక�క మిత�ర�ల ఫీడ� (ఆటమ�)"
 
 #. TRANS: %s is user nickname.
 #, php-format
@@ -291,7 +280,7 @@ msgstr ""
 "ప�రొఫైల� ద�వారా [%1$sని కదిపి](../%2$s) చూడండి లేదా [వారికి �దైనా వ�రాయండి](%%%%action.newnotice%"
 "%%%?status_textarea=%3$s)."
 
-#. TRANS: Encoutagement displayed on empty timeline user pages for anonymous users.
+#. TRANS: Encouragement displayed on empty timeline user pages for anonymous users.
 #. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
 #. TRANS: Empty list message for page with replies for a user for not logged in users.
 #. TRANS: %1$s is a user nickname. This message contains a Markdown link in the form [link text](link).
@@ -304,6 +293,13 @@ msgid ""
 msgstr ""
 "[ఒక ఖాతాని నమోద�చేస�క�ని](%%%%action.register%%%%) %sని కదపండి లేదా వారికి ఒక టపాని పంపించండి!"
 
+#. TRANS: Button text for inviting more users to the StatusNet instance.
+#. TRANS: Less business/enterprise-oriented language for public sites.
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Send invite"
+msgstr "ఆహ�వానాల�"
+
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Title of API timeline for a user and friends.
 #. TRANS: %s is a username.
@@ -312,8 +308,6 @@ msgstr ""
 #. TRANS: %s is a username.
 #. TRANS: Menu item title in personal group navigation menu.
 #. TRANS: %s is a username.
-#. TRANS: Menu item title in settings navigation panel.
-#. TRANS: %s is a username.
 #, php-format
 msgid "%s and friends"
 msgstr "%s మరియ� మిత�ర�ల�"
@@ -351,7 +345,6 @@ msgstr ""
 #. TRANS: Server error thrown on database error updating SMS preferences.
 #. TRANS: Server error thrown on database error removing a registered SMS phone number.
 #. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
-#. TRANS: Server exception thrown on Profile design page when updating design settings fails.
 msgid "Could not update user."
 msgstr "వాడ�కరిని తాజాకరించలేక�న�నాం."
 
@@ -366,7 +359,6 @@ msgstr "ప�రొఫైల�ని భద�రపరచలేక�న�
 
 #. TRANS: Client error displayed when the number of bytes in a POST request exceeds a limit.
 #. TRANS: %s is the number of bytes of the CONTENT_LENGTH.
-#. TRANS: Form validation error in design settings form. POST should remain untranslated.
 #, php-format
 msgid ""
 "The server was unable to handle that much POST data (%s byte) due to its "
@@ -377,25 +369,6 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#. TRANS: Client error displayed when saving design settings fails because of an empty id.
-#. TRANS: Client error displayed when saving design settings fails because of an empty result.
-#. TRANS: Client error displayed when a database error occurs inserting profile colours.
-#. TRANS: Client error displayed when a database error occurs updating profile colours.
-#. TRANS: Form validation error displayed when group design settings could not be saved because of an application issue.
-#. TRANS: Form validation error on Profile design page when saving design settings has failed.
-#. TRANS: Form validation error on Profile design page when updating design settings has failed.
-msgid "Unable to save your design settings."
-msgstr "మీ రూప�రేఖల అమరికలని భద�రపరచలేక�న�నాం."
-
-#. TRANS: Error displayed when updating design settings fails.
-#. TRANS: Client error displayed when a database error occurs updating profile colours.
-#. TRANS: Form validation error on Profile design page when updating design settings has failed.
-#. TRANS: Error message displayed if design settings could not be saved.
-#. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
-#, fuzzy
-msgid "Could not update your design."
-msgstr "వాడ�కరిని తాజాకరించలేక�న�నాం."
-
 #. TRANS: Title for Atom feed.
 msgctxt "ATOM"
 msgid "Main"
@@ -443,6 +416,22 @@ msgstr "వాడ�కరి నిరోధం విఫలమైంది."
 msgid "Unblock user failed."
 msgstr "వాడ�కరి నిరోధం విఫలమైంది."
 
+#. TRANS: Client exception thrown when no conversation ID is given.
+#, fuzzy
+msgid "No conversation ID."
+msgstr "సంభాషణ"
+
+#. TRANS: Client exception thrown when referring to a non-existing conversation ID (%d).
+#, fuzzy, php-format
+msgid "No conversation with ID %d."
+msgstr "సంభాషణ"
+
+#. TRANS: Title for conversion timeline.
+#, fuzzy
+msgctxt "TITLE"
+msgid "Conversation"
+msgstr "సంభాషణ"
+
 #. TRANS: Title. %s is a user nickname.
 #, php-format
 msgid "Direct messages from %s"
@@ -486,6 +475,8 @@ msgid "Cannot send direct messages to users who aren't your friend."
 msgstr "మీ స�నేహిత�ల� కాని వాడ�కర�లకి నేర� సందేశాల� పంపించలేర�."
 
 #. TRANS: Client error displayed trying to direct message self (403).
+#. TRANS: Client error displayed trying to send a direct message to self.
+#. TRANS: Error text shown when trying to send a direct message to self.
 msgid ""
 "Do not send a message to yourself; just say it to yourself quietly instead."
 msgstr "మీక� మీరే సందేశాన�ని పంప�కోకండి; దాని బద�ల� మీ చెవిలో మీరే మెల�లగా చెప�ప�కోండి."
@@ -714,7 +705,6 @@ msgstr "%s పై గ�ంప�ల�"
 
 #. TRANS: Client error displayed when trying to edit a group without being an admin.
 #. TRANS: Client error displayed trying to edit a group while not being a group admin.
-#. TRANS: Client error displayed trying to change group design settings without being a (group) admin.
 #. TRANS: Client error displayed when trying to change group logo settings while not being a group admin.
 msgid "You must be an admin to edit the group."
 msgstr "గ�ంప�ని మార�చడానికి మీర� నిర�వాహక�లయి ఉండాలి."
@@ -830,7 +820,6 @@ msgstr "అవతారాన�ని పెట�టడంలో పొరప
 
 #. TRANS: Client error given on when invalid data was passed through a form in the OAuth API.
 #. TRANS: Unexpected validation error on avatar upload form.
-#. TRANS: Client error displayed when the submitted form contains unexpected data.
 #. TRANS: Client error displayed submitting invalid form data for edit application.
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
 #. TRANS: Form validation error message when an unsupported argument is used.
@@ -839,7 +828,6 @@ msgstr "అవతారాన�ని పెట�టడంలో పొరప
 #. TRANS: Client error when submitting a form with unexpected information.
 #. TRANS: Client error displayed when unexpected data is posted in the password recovery form.
 #. TRANS: Message given submitting a form with an unknown action in SMS settings.
-#. TRANS: Unknown form validation error in design settings form.
 msgid "Unexpected form submission."
 msgstr ""
 
@@ -878,7 +866,6 @@ msgstr "ఖాతా"
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Field label on account registration page.
-#. TRANS: Label for nickname on user authorisation page.
 #. TRANS: Field label on group edit form.
 #. TRANS: Dropdown option for searching in profiles.
 msgid "Nickname"
@@ -1010,8 +997,8 @@ msgstr ""
 #, php-format
 msgid "That's too long. Maximum notice size is %d character."
 msgid_plural "That's too long. Maximum notice size is %d characters."
-msgstr[0] "%d అక�షరం"
-msgstr[1] "%d అక�షరాల�"
+msgstr[0] "అది చాలా పొడవ�ంది. గరిష�ఠ నోటీస� పొడవ� %d అక�షరం."
+msgstr[1] "అది చాలా పొడవ�ంది. గరిష�ఠ నోటీస� పొడవ� %d అక�షరాల�."
 
 #. TRANS: Client error displayed when replying to a non-existing notice.
 #, fuzzy
@@ -1189,12 +1176,9 @@ msgstr "గ�ంప�ని వదిలివెళ�ళడానికి 
 #. TRANS: Client error displayed when requesting Friends of a Friend feed for a nickname that is not a group.
 #. TRANS: Client error displayed trying to block a user from a group while specifying a non-existing group.
 #. TRANS: Client error displayed referring to a group's permalink for a non-existing group ID.
-#. TRANS: Client error displayed trying to change group design settings while providing a nickname for a non-existing group.
 #. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
 #. TRANS: Client error displayed when trying to view group members for a non-existing group.
 #. TRANS: Client error displayed when trying to view group members for an object that is not a group.
-#. TRANS: Client error displayed when trying to view group members for a non-existing group.
-#. TRANS: Client error displayed when trying to view group members for an object that is not a group.
 #. TRANS: Client error displayed when requesting a group RSS feed for group that does not exist.
 #. TRANS: Client error displayed when requesting a group RSS feed for an object that is not a group.
 #. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
@@ -1203,10 +1187,10 @@ msgstr "గ�ంప�ని వదిలివెళ�ళడానికి 
 #. TRANS: Client error displayed when trying to leave a non-local group.
 #. TRANS: Client error displayed when trying to leave a non-existing group.
 #. TRANS: Client error displayed when providing an invalid group ID on the Make Admin page.
-#. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
-#. TRANS: Client error displayed if no local group with a given name was found requesting group page.
 #. TRANS: Command exception text shown when a group is requested that does not exist.
 #. TRANS: Error text shown when trying to leave a group that does not exist.
+#. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
+#. TRANS: Client error displayed if no local group with a given name was found requesting group page.
 msgid "No such group."
 msgstr "అట�వంటి గ�ంప� లేద�."
 
@@ -1274,6 +1258,7 @@ msgid "Join request canceled."
 msgstr ""
 
 #. TRANS: Client error displayed trying to approve subscription for a non-existing request.
+#. TRANS: %s is a user nickname.
 #, fuzzy, php-format
 msgid "%s is not in the moderation queue for your subscriptions."
 msgstr "ఈ గ�ంప�లో వాడ�కర�ల� జాబితా."
@@ -1332,9 +1317,9 @@ msgstr "అది ఇప�పటికే ఇష�టాంశం."
 
 #. TRANS: Title for group membership feed.
 #. TRANS: %s is a username.
-#, fuzzy, php-format
+#, php-format
 msgid "Group memberships of %s"
-msgstr "%s గ�ంప� సభ�యత�వాల�"
+msgstr "%s యొక�క గ�ంప� సభ�యత�వాల�"
 
 #. TRANS: Subtitle for group membership feed.
 #. TRANS: %1$s is a username, %2$s is the StatusNet sitename.
@@ -1429,7 +1414,6 @@ msgstr "అట�వంటి జోడింప� లేద�."
 #. TRANS: Client error displayed trying to get an avatar without providing a nickname.
 #. TRANS: Client error displayed when requesting a list of blocked users for a group without providing a group nickname.
 #. TRANS: Client error displayed trying to edit a group while not proving a nickname for the group to edit.
-#. TRANS: Client error displayed trying to change group design settings without providing a group nickname.
 #. TRANS: Client error displayed when trying to change group logo settings without providing a nickname.
 #. TRANS: Client error displayed when trying to view group members without providing a group nickname.
 #. TRANS: Client error displayed when requesting a group RSS feed without providing a group nickname.
@@ -1724,6 +1708,18 @@ msgstr "\"%s\" అనే చిర�నామా మీ ఖాతాకి న
 msgid "Conversation"
 msgstr "సంభాషణ"
 
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#, fuzzy
+msgid "Conversation feed (Activity Streams JSON)"
+msgstr "%s కొరక� స�పందనల ఫీడ� (ఆటమ�)"
+
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#, fuzzy
+msgid "Conversation feed (RSS 2.0)"
+msgstr "%s కొరక� స�పందనల ఫీడ� (RSS 2.0)"
+
 #. TRANS: Title for conversation page.
 #. TRANS: Title for page that shows a notice.
 msgctxt "TITLE"
@@ -1783,7 +1779,8 @@ msgid "Enter \"%s\" to confirm that you want to delete your account."
 msgstr "మీ ఖాతాన� తొలగించ�కోవాలన�క�ంట�న�నారని నిర�ధారించేంద�క� \"%s\" అని టైప�చెయ�యండి."
 
 #. TRANS: Button title for user account deletion.
-msgid "Permanently delete your account"
+#, fuzzy
+msgid "Permanently delete your account."
 msgstr "మీ ఖాతాని శాశ�వతంగా తొలగించ�కోండి"
 
 #. TRANS: Client error displayed trying to delete an application while not logged in.
@@ -1926,152 +1923,6 @@ msgstr "ఈ వాడ�కరిని తొలగించకండి."
 msgid "Delete this user."
 msgstr "ఈ వాడ�కరిని తొలగించండి."
 
-#. TRANS: Message used as title for design settings for the site.
-msgid "Design"
-msgstr "రూప�రేఖల�"
-
-#. TRANS: Instructions for design adminsitration panel.
-msgid "Design settings for this StatusNet site"
-msgstr "ఈ స�టేటస�&zwnj;నెట� సైట�కి రూప�రేఖల అమరికల�"
-
-#. TRANS: Client error displayed when a logo URL does is not valid.
-msgid "Invalid logo URL."
-msgstr "చిహ�నప� URL చెల�లద�."
-
-#. TRANS: Client error displayed when an SSL logo URL is invalid.
-msgid "Invalid SSL logo URL."
-msgstr "SSL చిహ�నప� URL చెల�లద�."
-
-#. TRANS: Client error displayed when a theme is submitted through the form that is not in the theme list.
-#. TRANS: %s is the chosen unavailable theme.
-#, php-format
-msgid "Theme not available: %s."
-msgstr "అలంకారం అంద�బాట�లో లేద�: %s."
-
-#. TRANS: Fieldset legend for form to change logo.
-msgid "Change logo"
-msgstr "చిహ�నాన�ని మార�చ�"
-
-#. TRANS: Field label for StatusNet site logo.
-msgid "Site logo"
-msgstr "సైట� చిహ�నం"
-
-#. TRANS: Field label for SSL StatusNet site logo.
-msgid "SSL logo"
-msgstr "SSL చిహ�నం"
-
-#. TRANS: Fieldset legend for form change StatusNet site's theme.
-msgid "Change theme"
-msgstr "అలంకారాన�ని మార�చ�"
-
-#. TRANS: Field label for dropdown to choose site theme.
-msgid "Site theme"
-msgstr "సైట� అలంకారం"
-
-#. TRANS: Title for field label for dropdown to choose site theme.
-msgid "Theme for the site."
-msgstr "సైట�కి అలంకారం."
-
-#. TRANS: Field label for uploading a cutom theme.
-msgid "Custom theme"
-msgstr "అభిమత అలంకారం"
-
-#. TRANS: Form instructions for uploading a cutom StatusNet theme.
-msgid "You can upload a custom StatusNet theme as a .ZIP archive."
-msgstr ""
-
-#. TRANS: Fieldset legend for theme background image.
-msgid "Change background image"
-msgstr "నేపథ�య చిత�రాన�ని మార�చ�"
-
-#. TRANS: Field label for background image on theme designer page.
-#. TRANS: Field label for background color selector.
-#. TRANS: Label on profile design page for setting a profile page background colour.
-msgid "Background"
-msgstr "నేపథ�యం"
-
-#. TRANS: Form guide for background image upload form on theme designer page.
-#, php-format
-msgid ""
-"You can upload a background image for the site. The maximum file size is %1"
-"$s."
-msgstr "సైట�కి మీర� నేపథ�యప� చిత�రాన�ని ఎక�కించవచ�చ�. గరిష�ఠ ఫైల� పరిమాణం %1$s."
-
-#. TRANS: Used as radio button label to add a background image.
-msgid "On"
-msgstr "ఆన�"
-
-#. TRANS: Used as radio button label to not add a background image.
-msgid "Off"
-msgstr "ఆఫ�"
-
-#. TRANS: Form guide for turning background image on or off on theme designer page.
-#. TRANS: Form guide for a set of radio buttons on the profile design page that will enable or disable
-#. TRANS: use of the uploaded profile image.
-#, fuzzy
-msgid "Turn background image on or off."
-msgstr "నేపథ�య చిత�రాన�ని మార�చ�"
-
-#. TRANS: Checkbox label to title background image on theme designer page.
-#. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
-#, fuzzy
-msgid "Tile background image"
-msgstr "నేపథ�య చిత�రాన�ని మార�చ�"
-
-#. TRANS: Fieldset legend for theme colors.
-msgid "Change colors"
-msgstr "రంగ�లన� మార�చ�"
-
-#. TRANS: Field label for content color selector.
-#. TRANS: Label on profile design page for setting a profile page content colour.
-msgid "Content"
-msgstr "విషయం"
-
-#. TRANS: Field label for sidebar color selector.
-#. TRANS: Label on profile design page for setting a profile page sidebar colour.
-msgid "Sidebar"
-msgstr "పక�కపట�టీ"
-
-#. TRANS: Field label for text color selector.
-#. TRANS: Label on profile design page for setting a profile page text colour.
-msgid "Text"
-msgstr "పాఠ�యం"
-
-#. TRANS: Field label for link color selector.
-#. TRANS: Label on profile design page for setting a profile page links colour.
-msgid "Links"
-msgstr "లంకెల�"
-
-#. TRANS: Fieldset legend for advanced theme design settings.
-msgid "Advanced"
-msgstr "ఉన�నత"
-
-#. TRANS: Field label for custom CSS.
-msgid "Custom CSS"
-msgstr "ప�రత�యేక CSS"
-
-#. TRANS: Button text for resetting theme settings.
-msgctxt "BUTTON"
-msgid "Use defaults"
-msgstr "అప�రమేయాలన� ఉపయోగించ�"
-
-#. TRANS: Title for button for resetting theme settings.
-#. TRANS: Title for button on profile design page to reset all colour settings to default.
-#, fuzzy
-msgid "Restore default designs."
-msgstr "అప�రమేయాలని ఉపయోగించ�"
-
-#. TRANS: Title for button for resetting theme settings.
-#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#, fuzzy
-msgid "Reset back to default."
-msgstr "అప�రమేయాలని ఉపయోగించ�"
-
-#. TRANS: Title for button for saving theme settings.
-#. TRANS: Title for button on profile design page to save settings.
-msgid "Save design."
-msgstr "రూప�రేఖలని భద�రపరచండి."
-
 #. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
 msgid "This notice is not a favorite!"
 msgstr "ఈ నోటీస� ఇష�టాంశం కాద�!"
@@ -2086,6 +1937,76 @@ msgstr "ఇష�టాంశాలక� చేర�చ�"
 msgid "No such document \"%s\"."
 msgstr "\"%s\" అనే పత�రం లేద�."
 
+#. TRANS: Menu item in administrator navigation panel.
+#. TRANS: Menu item in default local navigation panel.
+#. TRANS: Menu item in personal group navigation menu.
+msgctxt "MENU"
+msgid "Home"
+msgstr "మ�ంగిలి"
+
+msgctxt "MENU"
+msgid "Docs"
+msgstr ""
+
+#. TRANS: Secondary navigation menu item leading to help on StatusNet.
+msgctxt "MENU"
+msgid "Help"
+msgstr "సహాయం"
+
+msgid "Getting started"
+msgstr "మొదల�పెట�టడం"
+
+#. TRANS: Secondary navigation menu item leading to text about StatusNet site.
+msgctxt "MENU"
+msgid "About"
+msgstr "గ�రించి"
+
+msgid "About this site"
+msgstr "ఈ సైట� గ�రించి"
+
+#. TRANS: Secondary navigation menu item leading to Frequently Asked Questions.
+msgctxt "MENU"
+msgid "FAQ"
+msgstr "ప�రశ�నల�"
+
+msgid "Frequently asked questions"
+msgstr "తరచూ అడిగే ప�రశ�నల�"
+
+#. TRANS: Secondary navigation menu item leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+msgctxt "MENU"
+msgid "Contact"
+msgstr "సంప�రదింప�ల�"
+
+msgid "Contact info"
+msgstr "సంప�రదింప� సమాచారం"
+
+#, fuzzy
+msgctxt "MENU"
+msgid "Tags"
+msgstr "ట�యాగ�ల�"
+
+msgid "Using tags"
+msgstr ""
+
+#. TRANS: Menu item in default local navigation panel.
+#. TRANS: Menu item in search group navigation panel.
+#. TRANS: Menu item in local navigation menu.
+msgctxt "MENU"
+msgid "Groups"
+msgstr "గ�ంప�ల�"
+
+#, fuzzy
+msgid "Using groups"
+msgstr "వాడ�కరి గ�ంప�ల�"
+
+msgctxt "MENU"
+msgid "API"
+msgstr ""
+
+msgid "RESTful API"
+msgstr ""
+
 #. TRANS: Title for "Edit application" form.
 #. TRANS: Form legend.
 msgid "Edit application"
@@ -2250,7 +2171,7 @@ msgid ""
 "subscriptions to it. Do you still want to continue?"
 msgstr ""
 
-#. TRANS: TRANS: Server error displayed when updating a list fails.
+#. TRANS: Server error displayed when updating a list fails.
 #, fuzzy
 msgid "Could not update list."
 msgstr "వాడ�కరిని తాజాకరించలేక�న�నాం."
@@ -2559,41 +2480,6 @@ msgstr "జోడింప�ల� లేవ�."
 msgid "No uploaded attachments."
 msgstr "ఎక�కించిన జోడింప�లేమీ లేవ�."
 
-#. TRANS: Client error displayed when subscribing to a remote profile and an unexpected response is received.
-msgid "Not expecting this response!"
-msgstr ""
-
-#. TRANS: Client error displayed when subscribing to a remote profile that does not exist.
-msgid "User being listened to does not exist."
-msgstr ""
-
-#. TRANS: Client error displayed when subscribing to a remote profile that is a local profile.
-#. TRANS: Client error displayed when using remote subscribe for a local entity.
-msgid "You can use the local subscription!"
-msgstr "మీర� స�థానిక చందాని ఉపయోగించవచ�చ�!"
-
-#. TRANS: Client error displayed when subscribing to a remote profile that is blocked form subscribing to.
-msgid "That user has blocked you from subscribing."
-msgstr "ఆ వాడ�కరి మిమ�మల�ని చందాచేరక�ండా నిరోధించార�."
-
-#. TRANS: Client error displayed when subscribing to a remote profile without providing an authorised token.
-msgid "You are not authorized."
-msgstr "మీక� అధీకరణ లేద�."
-
-#. TRANS: Client error displayed when subscribing to a remote profile and conversion of the request token to access token fails.
-msgid "Could not convert request token to access token."
-msgstr ""
-
-#. TRANS: Client error displayed when subscribing to a remote profile fails because of an unsupported version of the OMB protocol.
-msgid "Remote service uses unknown version of OMB protocol."
-msgstr ""
-
-#. TRANS: Server error displayed when subscribing to a remote profile fails because the remote profile could not be updated.
-#. TRANS: Exception thrown when updating a remote profile fails in OAuth store.
-#, fuzzy
-msgid "Error updating remote profile."
-msgstr "దూరప� ప�రొపైల�ని తాజాకరించటంలో పొరపాట�"
-
 #. TRANS: Client error displayed when requesting a non-existent file.
 msgid "No such file."
 msgstr "అట�వంటి ఫైల� లేద�."
@@ -2682,29 +2568,6 @@ msgstr "ఈ వాడ�కరిని ఈ గ�ంప� న�ండి న
 msgid "No ID."
 msgstr "�డీ లేద�."
 
-#. TRANS: Client error displayed trying to change group design settings while not logged in.
-msgid "You must be logged in to edit a group."
-msgstr "గ�ంప�ని మార�చడానికి మీర� ప�రవేశించి ఉండాలి."
-
-#. TRANS: Title group design settings page.
-msgid "Group design"
-msgstr "గ�ంప� అలంకారం"
-
-#. TRANS: Instructions for group design settings page.
-msgid ""
-"Customize the way your group looks with a background image and a colour "
-"palette of your choice."
-msgstr "నేపథ�య చిత�రం మరియ� రంగ�ల ఎంపికతో మీ గ�ంప� ఎలా కనిపించాలో మలచ�కోండి."
-
-#. TRANS: Form validation error displayed when group design settings could not be updated because of an application issue.
-msgid "Unable to update your design settings."
-msgstr "మీ రూప�రేఖల అమరికలన� భద�రపరచలేక�న�నాం."
-
-#. TRANS: Form text to confirm saved group design settings.
-#. TRANS: Confirmation message on Profile design page when saving design settings has succeeded.
-msgid "Design preferences saved."
-msgstr "ఈమెయిల� అభిర�చ�ల� భద�రమయ�యాయి."
-
 #. TRANS: Title for group logo settings page.
 #. TRANS: Group logo form legend.
 msgid "Group logo"
@@ -2873,8 +2736,8 @@ msgstr "IM అమరికల�"
 #. TRANS: the order and formatting of link text and link should remain unchanged.
 #, php-format
 msgid ""
-"You can send and receive notices through instant messaging [instant messages]"
-"(%%doc.im%%). Configure your addresses and settings below."
+"You can send and receive notices through [instant messaging](%%doc.im%%). "
+"Configure your addresses and settings below."
 msgstr ""
 
 #. TRANS: Message given in the IM settings if IM is not enabled on the site.
@@ -3034,8 +2897,8 @@ msgstr "కొత�త వాడ�కర�లని ఆహ�వానిం
 #. TRANS: Followed by a bullet list.
 msgid "You are already subscribed to this user:"
 msgid_plural "You are already subscribed to these users:"
-msgstr[0] "వాడ�కర�కి"
-msgstr[1] "వాడ�కర�లక�"
+msgstr[0] "ఈ వాడ�కర�కి మీర� ఇప�పటికే చందాచేరార�:"
+msgstr[1] "ఈ వాడ�కర�లక� మీర� ఇప�పటికే చందాచేరార�:"
 
 #. TRANS: Used as list item for already subscribed users (%1$s is nickname, %2$s is e-mail address).
 #. TRANS: Used as list item for already registered people (%1$s is nickname, %2$s is e-mail address).
@@ -3050,8 +2913,8 @@ msgstr "%1$s (%2$s)"
 msgid "This person is already a user and you were automatically subscribed:"
 msgid_plural ""
 "These people are already users and you were automatically subscribed to them:"
-msgstr[0] "వ�యక�తి ఇప�పటికే ఒక వాడ�కరి"
-msgstr[1] "వ�యక�త�ల� ఇప�పటికే వాడ�కర�ల�"
+msgstr[0] "ఈ వ�యక�తి ఇప�పటికే ఒక వాడ�కరి మరియ� మిమ�మల�ని వారికి చందాదార�ల�గా చేర�చేసాం:"
+msgstr[1] "ఈ వ�యక�త�ల� ఇప�పటికే వాడ�కర�ల� మరియ� మిమ�మల�ని వారికి చందాదార�ల�గా చేర�చేసాం:"
 
 #. TRANS: Message displayed inviting users to use a StatusNet site. Plural form is
 #. TRANS: based on the number of invitations sent. Followed by a bullet list of
@@ -3075,28 +2938,6 @@ msgid ""
 "Use this form to invite your friends and colleagues to use this service."
 msgstr "ఈ ఫారాన�ని ఉపయోగించి మీ స�నేహిత�లన� మరియ� సహోద�యోగ�లన� ఈ సేవన� వినియోగించ�కోమని ఆహ�వానించండి."
 
-#. TRANS: Field label for a list of e-mail addresses.
-msgid "Email addresses"
-msgstr "ఈమెయిల� చిర�నామాల�"
-
-#. TRANS: Tooltip for field label for a list of e-mail addresses.
-msgid "Addresses of friends to invite (one per line)."
-msgstr "ఆహ�వానించాల�సిన మిత�ర�ల చిర�నామాల� (పంక�తికి ఒకటి చొప�ప�న)."
-
-#. TRANS: Field label for a personal message to send to invitees.
-msgid "Personal message"
-msgstr "వ�యక�తిగత సందేశం"
-
-#. TRANS: Tooltip for field label for a personal message to send to invitees.
-msgid "Optionally add a personal message to the invitation."
-msgstr "�చ�ఛికంగా ఆహ�వానానికి వ�యక�తిగత సందేశం చేర�చండి."
-
-#. TRANS: Send button for inviting friends
-#. TRANS: Button text for sending notice.
-msgctxt "BUTTON"
-msgid "Send"
-msgstr "పంపించ�"
-
 #. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral
 #. TRANS: singular 3rd-person pronoun in English. %1$s is the inviting user, $2$s is
 #. TRANS: the StatusNet sitename.
@@ -3227,12 +3068,6 @@ msgstr ""
 msgid "Save license settings."
 msgstr "లైసెన�స� అమరికలన� భద�రపరచండి."
 
-#. TRANS: Client error displayed when trying to log in while already logged in.
-#. TRANS: Client error displayed trying to use "one time password login" when already logged in.
-#. TRANS: Client error displayed when trying to register while already logged in.
-msgid "Already logged in."
-msgstr "ఇప�పటికే లోనికి ప�రవేశించార�."
-
 #. TRANS: Form validation error displayed when trying to log in with incorrect credentials.
 msgid "Incorrect username or password."
 msgstr "వాడ�కరిపేర� లేదా సంకేతపదం తప�ప�."
@@ -3341,6 +3176,7 @@ msgstr "పేర� తప�పనిసరి."
 msgid "Could not create application."
 msgstr "ఉపకరణాన�ని సృష�టించలేకపోయాం."
 
+#. TRANS: Form validation error messages displayed when uploading an invalid application logo.
 #, fuzzy
 msgid "Invalid image."
 msgstr "తప�ప�డ� పరిమాణం."
@@ -3379,12 +3215,6 @@ msgstr "విషయం లేద�!"
 msgid "No recipient specified."
 msgstr "ఎవరికి పంపించాలో పేర�కొనలేద�."
 
-#. TRANS: Client error displayed trying to send a direct message to self.
-#. TRANS: Error text shown when trying to send a direct message to self.
-msgid ""
-"Don't send a message to yourself; just say it to yourself quietly instead."
-msgstr "మీక� మీరే సందేశాన�ని పంప�కోకండి; దాని బద�ల� మీలో మీరే మెల�లగా చెప�ప�కోండి."
-
 #. TRANS: Page title after sending a direct message.
 msgid "Message sent"
 msgstr "సందేశాన�ని పంపించాం"
@@ -3585,6 +3415,33 @@ msgstr ""
 msgid "Not a supported data format."
 msgstr ""
 
+#. TRANS: Page title for profile settings.
+#, fuzzy
+msgid "Old school UI settings"
+msgstr "IM అమరికల�"
+
+#. TRANS: Usage instructions for profile settings.
+msgid "If you like it \"the old way\", you can set that here."
+msgstr ""
+
+#. TRANS: Confirmation shown when user profile settings are saved.
+#. TRANS: Message after successful saving of administrative settings.
+msgid "Settings saved."
+msgstr "అమరికల� భద�రమయ�యాయి."
+
+msgid "Only stream mode (no conversations) in timelines"
+msgstr ""
+
+msgid "Show conversation page as hierarchical trees"
+msgstr ""
+
+msgid "Show nicknames (not full names) in timelines"
+msgstr ""
+
+#. TRANS: Button text to save a list.
+msgid "Save"
+msgstr "భద�రపరచ�"
+
 #. TRANS: ShortName in the OpenSearch interface when trying to find users.
 msgid "People Search"
 msgstr "ప�రజల అన�వేషణ"
@@ -3593,6 +3450,11 @@ msgstr "ప�రజల అన�వేషణ"
 msgid "Notice Search"
 msgstr "నోటీస�ల అన�వేషణ"
 
+#. TRANS: Client error displayed trying to use "one time password login" when already logged in.
+#. TRANS: Client error displayed when trying to register while already logged in.
+msgid "Already logged in."
+msgstr "ఇప�పటికే లోనికి ప�రవేశించార�."
+
 #. TRANS: Client error displayed trying to use "one time password login" without specifying a user.
 msgid "No user ID specified."
 msgstr "గ�ంప� �మీ పేర�కొనలేద�."
@@ -3665,7 +3527,7 @@ msgid "Confirm"
 msgstr "నిర�థారించండి"
 
 #. TRANS: Field title on page where to change password.
-#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
+#. TRANS: Title for field label for password reset form where the password has to be typed again.
 #. TRANS: Field title on account registration page.
 msgid "Same as password above."
 msgstr "పై సంకేతపదం వలెనే."
@@ -3723,12 +3585,6 @@ msgstr "అలంకారం అంద�బాట�లో లేద�: %s."
 msgid "Avatar directory not writable: %s."
 msgstr "అవతారాల సంచయం"
 
-#. TRANS: Client error in Paths admin panel.
-#. TRANS: %s is the background directory that could not be written to.
-#, fuzzy, php-format
-msgid "Background directory not writable: %s."
-msgstr "నేపథ�యాల సంచయం"
-
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the locales directory that could not be read from.
 #, fuzzy, php-format
@@ -3849,31 +3705,6 @@ msgstr "అవతారాల సంచయం"
 msgid "Directory where avatars are located."
 msgstr ""
 
-#. TRANS: Fieldset legend in Paths admin panel.
-msgid "Backgrounds"
-msgstr "నేపథ�యాల�"
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-#, fuzzy
-msgid "Server for backgrounds."
-msgstr "సైట�కి అలంకారం."
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-msgid "Web path to backgrounds."
-msgstr ""
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-msgid "Server for backgrounds on SSL pages."
-msgstr ""
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-msgid "Web path to backgrounds on SSL pages."
-msgstr ""
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-msgid "Directory where backgrounds are located."
-msgstr ""
-
 #. TRANS: Fieldset legens in Paths admin panel.
 msgid "Attachments"
 msgstr "జోడింప�ల�"
@@ -3933,8 +3764,8 @@ msgstr ""
 
 #. TRANS: Button title text to store form data in the Paths admin panel.
 #, fuzzy
-msgid "Save paths"
-msgstr "కొత�త సందేశం"
+msgid "Save path settings."
+msgstr "సైట� అమరికలన� భద�రపరచ�"
 
 #. TRANS: Instructions for the "People search" page.
 #. TRANS: %%site.name%% is the name of the StatusNet site.
@@ -4076,7 +3907,7 @@ msgid ""
 "%%%site.name%%%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
 "blogging) service based on the Free Software [StatusNet](http://status.net/) "
 "tool. You can easily keep track of what they are doing by subscribing to the "
-"tag's timeline."
+"list's timeline."
 msgstr ""
 "**%s** అనేది [స�టేటస�‌నెట�](http://status.net/) అనే స�వేచ�ఛా ఉపకరణ అధారిత [సూక�ష�మ-బ�లాగింగ�]"
 "(http://en.wikipedia.org/wiki/Micro-blogging) సేవ అయిన %%%%site.name%%%%లో ఒక "
@@ -4111,7 +3942,7 @@ msgid ""
 "site.name%%%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
 "blogging) service based on the Free Software [StatusNet](http://status.net/) "
 "tool. You can easily keep track of what they are doing by subscribing to the "
-"tag's timeline."
+"list's timeline."
 msgstr ""
 "**%s** అనేది [స�టేటస�‌నెట�](http://status.net/) అనే స�వేచ�ఛా ఉపకరణ అధారిత [సూక�ష�మ-బ�లాగింగ�]"
 "(http://en.wikipedia.org/wiki/Micro-blogging) సేవ అయిన %%%%site.name%%%%లో ఒక "
@@ -4216,16 +4047,6 @@ msgid ""
 "All default plugins have been disabled from the site's configuration file."
 msgstr ""
 
-#. TRANS: Client error displayed if the notice posted has too many characters.
-msgid "Invalid notice content."
-msgstr "తప�ప�డ� దస�త�రప�పేర�.."
-
-#. TRANS: Exception thrown if a notice's license is not compatible with the StatusNet site license.
-#. TRANS: %1$s is the notice license, %2$s is the StatusNet site's license.
-#, php-format
-msgid "Notice license \"%1$s\" is not compatible with site license \"%2$s\"."
-msgstr ""
-
 #. TRANS: Client error displayed when trying to add an unindentified field to profile.
 #. TRANS: %s is a field name.
 #, php-format
@@ -4290,8 +4111,8 @@ msgstr "మీ హోమ� పేజీ, బ�లాగ�, లేదా వ
 #, php-format
 msgid "Describe yourself and your interests in %d character."
 msgid_plural "Describe yourself and your interests in %d characters."
-msgstr[0] "%d అక�షరంలో"
-msgstr[1] "%d అక�షరాల�లో"
+msgstr[0] "మీ గ�రించి మరియ� మీ ఆసక�త�ల గ�రించి %d అక�షరంలో చెప�పండి."
+msgstr[1] "మీ గ�రించి మరియ� మీ ఆసక�త�ల గ�రించి %d అక�షరాల�లో చెప�పండి."
 
 #. TRANS: Tooltip for field label in form for profile settings.
 #. TRANS: Text area title on account registration page.
@@ -4321,6 +4142,8 @@ msgid "Share my current location when posting notices"
 msgstr ""
 
 #. TRANS: Field label in form for profile settings.
+#. TRANS: Title for group tag cloud section.
+#. TRANS: %s is a group name.
 msgid "Tags"
 msgstr "ట�యాగ�ల�"
 
@@ -4349,7 +4172,7 @@ msgstr "మీర� సామాన�యంగా ఉండే కాలమం
 #. TRANS: Checkbox label in form for profile settings.
 #, fuzzy
 msgid ""
-"Automatically subscribe to whoever subscribes to me (best for non-humans)."
+"Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr "ఉపయోగించాల�సిన యాంత�రిక క�దింప� సేవ."
 
 #. TRANS: Dropdown field label on profile settings, for what policies to apply when someone else tries to subscribe to your updates.
@@ -4380,8 +4203,8 @@ msgstr ""
 #, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
-msgstr[0] "(%d అక�షరం గరిష�ఠం)."
-msgstr[1] "(%d అక�షరాల� గరిష�ఠం)."
+msgstr[0] "స�వపరిచయం చాలా పెద�దగా ఉంది (%d అక�షరం గరిష�ఠం)."
+msgstr[1] "స�వపరిచయం చాలా పెద�దగా ఉంది (%d అక�షరాల� గరిష�ఠం)."
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Client error displayed trying to save site settings without a timezone.
@@ -4417,11 +4240,6 @@ msgstr "ట�యాగ�లని భద�రపరచలేక�న�న
 msgid "Could not save tags."
 msgstr "ట�యాగ�లని భద�రపరచలేకపోయాం."
 
-#. TRANS: Confirmation shown when user profile settings are saved.
-#. TRANS: Message after successful saving of administrative settings.
-msgid "Settings saved."
-msgstr "అమరికల� భద�రమయ�యాయి."
-
 #. TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
 #. TRANS: Page title for page where a user account can be restored from backup.
 #, fuzzy
@@ -4436,7 +4254,7 @@ msgstr ""
 
 #. TRANS: Server error displayed when a public timeline cannot be retrieved.
 #, fuzzy
-msgid "Could not retrieve public stream."
+msgid "Could not retrieve public timeline."
 msgstr "మార�పేర�లని సృష�టించలేకపోయాం."
 
 #. TRANS: Title for all public timeline pages but the first.
@@ -4451,15 +4269,23 @@ msgid "Public timeline"
 msgstr "ప�రజా కాలరేఖ"
 
 #. TRANS: Link description for public timeline feed.
-msgid "Public Stream Feed (RSS 1.0)"
+#, fuzzy
+msgid "Public Timeline Feed (Activity Streams JSON)"
+msgstr "ప�రజా వాహిని ఫీడ� (ఆటమ�)"
+
+#. TRANS: Link description for public timeline feed.
+#, fuzzy
+msgid "Public Timeline Feed (RSS 1.0)"
 msgstr "ప�రజా వాహిని ఫీడ� (RSS 1.0)"
 
 #. TRANS: Link description for public timeline feed.
-msgid "Public Stream Feed (RSS 2.0)"
+#, fuzzy
+msgid "Public Timeline Feed (RSS 2.0)"
 msgstr "ప�రజా వాహిని ఫీడ� (RSS 2.0)"
 
 #. TRANS: Link description for public timeline feed.
-msgid "Public Stream Feed (Atom)"
+#, fuzzy
+msgid "Public Timeline Feed (Atom)"
 msgstr "ప�రజా వాహిని ఫీడ� (ఆటమ�)"
 
 #. TRANS: Text displayed for public feed when there are no public notices.
@@ -4504,47 +4330,6 @@ msgstr ""
 "ఇది %%site.name%%, స�వేచ�ఛా మృదూపకరమైన [స�టేటస�‌నెట�](http://status.net/) అనే పనిమ�ట�ట�పై "
 "ఆధారపడిన ఒక [మైక�రో-బ�లాగింగ�](http://en.wikipedia.org/wiki/Micro-blogging) సేవ."
 
-#. TRANS: Title for page with public list cloud.
-msgid "Public list cloud"
-msgstr "బహిరంగ జాబితా మేఘం"
-
-#. TRANS: Page notice for page with public list cloud.
-#. TRANS: %s is a StatusNet sitename.
-#, php-format
-msgid "These are largest lists on %s"
-msgstr "%sలో అత�యంత పెద�ద జాబితాల� ఇవి"
-
-#. TRANS: Empty list message on page with public list cloud.
-#. TRANS: This message contains Markdown links in the form [description](link).
-#, fuzzy, php-format
-msgid "No one has [listed](%%doc.tags%%) anyone yet."
-msgstr "[హ�యాష�‌ట�యాగ�](%%doc.tags%%)తో ఇంకా ఎవరూ నోటీస�ల� వ�రాయలేద�."
-
-#. TRANS: Additional empty list message on page with public list cloud for logged in users.
-msgid "Be the first to list someone!"
-msgstr "మీరే ఇతర�లన� జాబితాలో పెట�ట�క�నే మొదటివారవ�వండి!"
-
-#. TRANS: Additional empty list message on page with public list cloud for anonymous users.
-#. TRANS: This message contains Markdown links in the form [description](link).
-#, php-format
-msgid ""
-"Why not [register an account](%%action.register%%) and be the first to list "
-"someone!"
-msgstr ""
-"[ఒక ఖాతాని నమోద�చేస�క�ని](%%action.register%%) మీరే మొదటగా జాబితాలన� సృష�టించేవార� ఎంద�క� "
-"కాకూడద�!"
-
-#. TRANS: DT element on on page with public list cloud.
-msgid "List cloud"
-msgstr "జాబితా మేఘం"
-
-#. TRANS: Link title for number of listed people. %d is the number of listed people.
-#, php-format
-msgid "1 person listed"
-msgid_plural "%d people listed"
-msgstr[0] "1 వ�యక�తి"
-msgstr[1] "%d వ�యక�త�ల�"
-
 #. TRANS: Public RSS feed description. %s is the StatusNet site name.
 #, php-format
 msgid "%s updates from everyone."
@@ -4672,7 +4457,6 @@ msgid "6 or more characters, and do not forget it!"
 msgstr "6 లేదా అంతకంటే ఎక�క�వ అక�షరాల�, మర�చిపోకండి!"
 
 #. TRANS: Button text for password reset form.
-#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
 msgctxt "BUTTON"
 msgid "Reset"
 msgstr "రీసెట�"
@@ -4681,18 +4465,6 @@ msgstr "రీసెట�"
 msgid "Enter a nickname or email address."
 msgstr "పేర� లేదా ఈమెయిల� చిర�నామా ఇవ�వండి."
 
-#. TRANS: Information on password recovery form if no known username or e-mail address was specified.
-msgid "No user with that email address or username."
-msgstr "ఆ ఈమెయిల� చిర�నామా లేదా వాడ�కరిపేర�తో వాడ�కర�లెవరూ లేర�."
-
-#. TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.
-msgid "No registered email address for that user."
-msgstr "ఈ వాడ�కరికై నమోదైన ఈమెయిల� చిర�నామాల� �మీ లేవ�."
-
-#. TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.
-msgid "Error saving address confirmation."
-msgstr "చిర�నామా నిర�ధారణని భద�రపరచడంలో పొరపాట�."
-
 #. TRANS: User notification after an e-mail with instructions was sent from the password recovery form.
 msgid ""
 "Instructions for recovering your password have been sent to the email "
@@ -4867,73 +4639,6 @@ msgstr ""
 "(మీ ఈమెయిల� చిర�నామాని ఎలా నిర�ధారించాలో తెలిపే సూచనలతో ఒక సందేశం మీర� ఈమెయిల� ద�వారా మరి కొద�దిసేపట�లోనే "
 "అంద�త�ంది.)"
 
-#. TRANS: Page notice for remote subscribe. This message contains Markdown links.
-#. TRANS: Ensure to keep the correct markup of [link description](link).
-#, php-format
-msgid ""
-"To subscribe, you can [login](%%action.login%%), or [register](%%action."
-"register%%) a new  account. If you already have an account  on a [compatible "
-"microblogging site](%%doc.openmublog%%),  enter your profile URL below."
-msgstr ""
-"చందా చేరడానికి, మీర� [ప�రవేశించవచ�చ�](%%action.login%%), లేదా కొత�త ఖాతాని [నమోద�చేస�కోవచ�చ�](%%"
-"action.register%%). ఒకవేళ మీక� ఇప�పటికే �దైనా [పొసగే మైక�రోబ�లాగింగ� సైట�లో](%%doc.openmublog%"
-"%) ఖాతా ఉంటే, మీ ప�రొఫైల� చిర�నామాని క�రింద ఇవ�వండి."
-
-#. TRANS: Page title for Remote subscribe.
-msgid "Remote subscribe"
-msgstr "స�దూర చందా"
-
-#. TRANS: Field legend on page for remote subscribe.
-msgid "Subscribe to a remote user"
-msgstr "ఈ వాడ�కరికి చందాచేర�"
-
-#. TRANS: Field label on page for remote subscribe.
-msgid "User nickname"
-msgstr "వాడ�కరి పేర�"
-
-#. TRANS: Field title on page for remote subscribe.
-msgid "Nickname of the user you want to follow."
-msgstr "మీర� అన�సరించాలన�క�ంట�న�న వాడ�కరి యొక�క మ�ద�ద�పేర�."
-
-#. TRANS: Field label on page for remote subscribe.
-msgid "Profile URL"
-msgstr "ప�రొఫైల� URL"
-
-#. TRANS: Field title on page for remote subscribe.
-msgid "URL of your profile on another compatible microblogging service."
-msgstr ""
-
-#. TRANS: Button text on page for remote subscribe.
-#. TRANS: Link text for link that will subscribe to a remote profile.
-#. TRANS: Button text to subscribe to a user.
-#. TRANS: Button text for subscribing to a list.
-msgctxt "BUTTON"
-msgid "Subscribe"
-msgstr "చందాచేరండి"
-
-#. TRANS: Form validation error on page for remote subscribe when an invalid profile URL was provided.
-msgid "Invalid profile URL (bad format)."
-msgstr "ప�రొపైల� URL తప�ప� (చెల�లని ఫార�మాట�)."
-
-#. TRANS: Form validation error on page for remote subscribe when no the provided profile URL
-#. TRANS: does not contain expected data.
-msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
-msgstr ""
-
-#. TRANS: Form validation error on page for remote subscribe.
-msgid "That is a local profile! Login to subscribe."
-msgstr "అది స�థానిక ప�రొఫైల�! చందాచేరడానికి ప�రవేశించండి."
-
-#. TRANS: Form validation error on page for remote subscribe when the remote service is not providing a request token.
-#, fuzzy
-msgid "Could not get a request token."
-msgstr "ట�యాగ�లని భద�రపరచలేకపోయాం."
-
-#. TRANS: Client error displayed when trying to (un)list an OMB 0.1 remote profile.
-#, fuzzy
-msgid "You cannot (un)list an OMB 0.1 remote profile with this action."
-msgstr "ఈ సైట�లో మీర� వాడ�కరలకి పాత�రలన� ఇవ�వలేర�."
-
 #. TRANS: Client error displayed when an unknown error occurs while delisting a user.
 #. TRANS: %s is a username.
 #, php-format
@@ -4986,6 +4691,12 @@ msgstr "%sకి స�పందనల�"
 msgid "Replies to %1$s, page %2$d"
 msgstr "%1$sకి స�పందనల�, %2$dవ పేజీ"
 
+#. TRANS: Link for feed with replies for a user.
+#. TRANS: %s is a user nickname.
+#, fuzzy, php-format
+msgid "Replies feed for %s (Activity Streams JSON)"
+msgstr "%s కొరక� స�పందనల ఫీడ� (ఆటమ�)"
+
 #. TRANS: Link for feed with replies for a user.
 #. TRANS: %s is a user nickname.
 #, php-format
@@ -5100,7 +4811,7 @@ msgstr ""
 
 #. TRANS: Form instructions for feed restore.
 msgid ""
-"You can upload a backed-up stream in <a href=\"http://activitystrea.ms/"
+"You can upload a backed-up timeline in <a href=\"http://activitystrea.ms/"
 "\">Activity Streams</a> format."
 msgstr ""
 
@@ -5220,6 +4931,27 @@ msgstr ""
 msgid "Application info"
 msgstr "ఉపకరణ సమాచారం"
 
+#. TRANS: Field label on application page.
+msgid "Consumer key"
+msgstr ""
+
+#. TRANS: Field label on application page.
+msgid "Consumer secret"
+msgstr ""
+
+#. TRANS: Field label on application page.
+#, fuzzy
+msgid "Request token URL"
+msgstr "తప�ప�డ� పాత�ర."
+
+#. TRANS: Field label on application page.
+msgid "Access token URL"
+msgstr ""
+
+#. TRANS: Field label on application page.
+msgid "Authorize URL"
+msgstr "మూలమ�"
+
 #. TRANS: Note on the OAuth application page about signature support.
 msgid ""
 "Note: HMAC-SHA1 signatures are supported. The plaintext signature method is "
@@ -5242,6 +4974,11 @@ msgstr "%1$sకి ఇష�టమైన నోటీస�ల�, పేజీ
 msgid "Could not retrieve favorite notices."
 msgstr "ఇష�టాంశాన�ని సృష�టించలేకపోయాం."
 
+#. TRANS: Feed link text. %s is a username.
+#, fuzzy, php-format
+msgid "Feed for favorites of %s (Activity Streams JSON)"
+msgstr "%s యొక�క ఇష�టాంశాల ఫీడ� (ఆటమ�)"
+
 #. TRANS: Feed link text. %s is a username.
 #, php-format
 msgid "Feed for favorites of %s (RSS 1.0)"
@@ -5298,6 +5035,11 @@ msgstr "%s గ�ంప�"
 msgid "%1$s group, page %2$d"
 msgstr "%1$s గ�ంప� , %2$dవ పేజీ"
 
+#. TRANS: Tooltip for feed link. %s is a group nickname.
+#, fuzzy, php-format
+msgid "Notice feed for %s group (Activity Streams JSON)"
+msgstr "%s కొరక� స�పందనల ఫీడ� (ఆటమ�)"
+
 #. TRANS: Tooltip for feed link. %s is a group nickname.
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
@@ -5318,42 +5060,8 @@ msgstr "%s కొరక� స�పందనల ఫీడ� (ఆటమ�)"
 msgid "FOAF for %s group"
 msgstr "%s గ�ంప�"
 
-#. TRANS: Header for mini list of group members on a group page (h2).
-msgid "Members"
-msgstr "సభ�య�ల�"
-
-#. TRANS: Description for mini list of group members on a group page when the group has no members.
-#. TRANS: Content of "Listed" page if there are no listed users.
-#. TRANS: Content of "People following tag x" if there are no subscribed users.
-#. TRANS: Empty list message for tags.
-#. TRANS: Text for user subscription statistics if the user has no subscriptions.
-#. TRANS: Text for user subscriber statistics if user has no subscribers.
-#. TRANS: Text for user user group membership statistics if user is not a member of any group.
-#. TRANS: Default content for section/sidebar widget.
-msgid "(None)"
-msgstr "(�మీలేద�)"
-
-#. TRANS: Link to all group members from mini list of group members if group has more than n members.
-msgid "All members"
-msgstr "అందర� సభ�య�లూ"
-
-#. TRANS: Header for group statistics on a group page (h2).
-#. TRANS: H2 text for user statistics.
-msgid "Statistics"
-msgstr "గణాంకాల�"
-
-#. TRANS: Label for group creation date.
-msgctxt "LABEL"
-msgid "Created"
-msgstr "సృష�టితం"
-
-#. TRANS: Label for member count in statistics on group page.
-msgctxt "LABEL"
-msgid "Members"
-msgstr "సభ�య�ల�"
-
 #. TRANS: Notice on group pages for anonymous users for StatusNet sites that accept new registrations.
-#. TRANS: **%s** is the group alias, %%%%site.name%%%% is the site name,
+#. TRANS: %s is the group name, %%%%site.name%%%% is the site name,
 #. TRANS: %%%%action.register%%%% is the URL for registration, %%%%doc.help%%%% is a URL to help.
 #. TRANS: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
 #, php-format
@@ -5372,14 +5080,14 @@ msgstr ""
 "doc.help%%%%))"
 
 #. TRANS: Notice on group pages for anonymous users for StatusNet sites that accept no new registrations.
-#. TRANS: **%s** is the group alias, %%%%site.name%%%% is the site name,
+#. TRANS: %s is the group name, %%%%site.name%%%% is the site name,
 #. TRANS: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
 #, fuzzy, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
 "wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
 "[StatusNet](http://status.net/) tool. Its members share short messages about "
-"their life and interests. "
+"their life and interests."
 msgstr ""
 "**%s** అనేది [స�టేటస�‌నెట�](http://status.net/) అనే స�వేచ�ఛా ఉపకరణ అధారిత [సూక�ష�మ-బ�లాగింగ�]"
 "(http://en.wikipedia.org/wiki/Micro-blogging) సేవ అయిన %%%%site.name%%%%లో ఒక "
@@ -5388,11 +5096,6 @@ msgstr ""
 "చాల వాటిలో భాగస�త�లవ�వడానికి [ఇప�ప�డే చేరండి](%%%%action.register%%%%)! ([మరింత చదవండి](%%%%"
 "doc.help%%%%))"
 
-#. TRANS: Title for list of group administrators on a group page.
-msgctxt "TITLE"
-msgid "Admins"
-msgstr "నిర�వాహక�ల�"
-
 #. TRANS: Client error displayed requesting a single message that does not exist.
 msgid "No such message."
 msgstr "అట�వంటి సందేశం లేద�."
@@ -5484,10 +5187,22 @@ msgid ""
 msgstr "[ఒక ఖాతాని నమోద�చేస�క�ని](%%action.register%%) మీరే మొదట వ�రాసేవార� ఎంద�క� కాకూడద�!"
 
 #. TRANS: Header on show list page.
+#. TRANS: Link description for link to list of users tagged with a tag (so part of a list).
 #, fuzzy
 msgid "Listed"
 msgstr "లైసెన�స�"
 
+#. TRANS: Content of "Listed" page if there are no listed users.
+#. TRANS: Content of "People following tag x" if there are no subscribed users.
+#. TRANS: Description for mini list of group members on a group page when the group has no members.
+#. TRANS: Empty list message for tags.
+#. TRANS: Text for user subscription statistics if the user has no subscriptions.
+#. TRANS: Text for user subscriber statistics if user has no subscribers.
+#. TRANS: Text for user user group membership statistics if user is not a member of any group.
+#. TRANS: Default content for section/sidebar widget.
+msgid "(None)"
+msgstr "(�మీలేద�)"
+
 #. TRANS: Link for more "People in list x by a user"
 #. TRANS: if there are more than the mini list's maximum.
 msgid "Show all"
@@ -5498,24 +5213,19 @@ msgstr "అన�నీ చూపించ�"
 msgid "Subscribers"
 msgstr "చందాదార�ల�"
 
-#. TRANS: Link for more "People following tag x"
-#. TRANS: if there are more than the mini list's maximum.
-msgid "All subscribers"
-msgstr "అందర� చందాదార�ల�"
-
-#. TRANS: Page title showing tagged notices in one user's stream.
+#. TRANS: Page title showing tagged notices in one user's timeline.
 #. TRANS: %1$s is the username, %2$s is the hash tag.
 #, fuzzy, php-format
 msgid "Notices by %1$s tagged %2$s"
 msgstr "%1$s, %2$dవ పేజీ"
 
-#. TRANS: Page title showing tagged notices in one user's stream.
+#. TRANS: Page title showing tagged notices in one user's timeline.
 #. TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number.
 #, fuzzy, php-format
 msgid "Notices by %1$s tagged %2$s, page %3$d"
 msgstr "%2$sలో %1$s అనే ట�యాగ�తో ఉన�న నోటీస�ల�!"
 
-#. TRANS: Extended page title showing tagged notices in one user's stream.
+#. TRANS: Extended page title showing tagged notices in one user's timeline.
 #. TRANS: %1$s is the username, %2$d is the page number.
 #, fuzzy, php-format
 msgid "Notices by %1$s, page %2$d"
@@ -5527,6 +5237,12 @@ msgstr "%2$sలో %1$s అనే ట�యాగ�తో ఉన�న నో
 msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
 msgstr "%s కొరక� స�పందనల ఫీడ� (RSS 1.0)"
 
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#, fuzzy, php-format
+msgid "Notice feed for %s (Activity Streams JSON)"
+msgstr "%s కొరక� స�పందనల ఫీడ� (ఆటమ�)"
+
 #. TRANS: Title for link to notice feed.
 #. TRANS: %s is a user nickname.
 #, php-format
@@ -5551,7 +5267,7 @@ msgstr "%s కొరక� స�పందనల ఫీడ� (ఆటమ�)"
 msgid "FOAF for %s"
 msgstr "%s గ�ంప�"
 
-#. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
+#. TRANS: First sentence of empty list message for a timeline. $1%s is a user nickname.
 #, php-format
 msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
 msgstr "ఇది %1$s యొక�క కాలరేఖ కానీ %1$s ఇంకా �మీ రాయలేద�."
@@ -5563,7 +5279,7 @@ msgid ""
 msgstr ""
 "ఈమధ�యే �దైనా ఆసక�తికరమైనది చూసారా? మీర� ఇంకా నోటీస�లేమీ వ�రాయలేద�, మొదల�పెట�టడానికి ఇదే మంచి సమయం :)"
 
-#. TRANS: Second sentence of empty  list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
+#. TRANS: Second sentence of empty  list message for a non-self timeline. %1$s is a user nickname, %2$s is a part of a URL.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
 #, fuzzy, php-format
 msgid ""
@@ -5572,7 +5288,7 @@ msgid ""
 msgstr ""
 "[ఈ విషయంపై](%%%%action.newnotice%%%%?status_textarea=%s) వ�రాసే మొదటివార� మీరే అవ�వండి!"
 
-#. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
+#. TRANS: Announcement for anonymous users showing a timeline if site registrations are open.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
 #, fuzzy, php-format
 msgid ""
@@ -5588,13 +5304,13 @@ msgstr ""
 "చాల వాటిలో భాగస�త�లవ�వడానికి [ఇప�ప�డే చేరండి](%%%%action.register%%%%)! ([మరింత చదవండి](%%%%"
 "doc.help%%%%))"
 
-#. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
+#. TRANS: Announcement for anonymous users showing a timeline if site registrations are closed or invite only.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
 #, fuzzy, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
 "wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
-"[StatusNet](http://status.net/) tool. "
+"[StatusNet](http://status.net/) tool."
 msgstr ""
 "ఇది %%site.name%%, స�వేచ�ఛా మృదూపకరమైన [స�టేటస�‌నెట�](http://status.net/) అనే పనిమ�ట�ట�పై "
 "ఆధారపడిన ఒక [మైక�రో-బ�లాగింగ�](http://en.wikipedia.org/wiki/Micro-blogging) సేవ."
@@ -5632,6 +5348,14 @@ msgstr "సైట� పేర� తప�పనిసరిగా స�న�
 msgid "You must have a valid contact email address."
 msgstr "మీక� సరైన సంప�రదింప� ఈమెయిల� చిర�నామా ఉండాలి."
 
+#. TRANS: Client error displayed when a logo URL is not valid.
+msgid "Invalid logo URL."
+msgstr "చిహ�నప� URL చెల�లద�."
+
+#. TRANS: Client error displayed when a SSL logo URL is invalid.
+msgid "Invalid SSL logo URL."
+msgstr "SSL చిహ�నప� URL చెల�లద�."
+
 #. TRANS: Client error displayed trying to save site settings with an invalid language code.
 #. TRANS: %s is the invalid language code.
 #, php-format
@@ -5702,7 +5426,9 @@ msgid "Default language"
 msgstr "అప�రమేయ భాష"
 
 #. TRANS: Dropdown title on site settings panel.
-msgid "Site language when autodetection from browser settings is not available"
+#, fuzzy
+msgid ""
+"The site language when autodetection from browser settings is not available."
 msgstr "విహారిణి అమరికల న�ండి భాషని స�వయంచాలకంగా పొందలేకపోయినప�ప�డ� ఉపయోగించే సైట� భాష"
 
 #. TRANS: Fieldset legend on site settings panel.
@@ -5727,8 +5453,21 @@ msgstr "పాఠ�యప� పరిమితి"
 msgid "How long users must wait (in seconds) to post the same thing again."
 msgstr "అదే విషయాన�ని మళ�ళీ టపా చేయడానికి వాడ�కర�ల� ఎంత సమయం (క�షణాల�లో) వేచివ�ండాలి."
 
+#. TRANS: Fieldset legend for form to change logo.
+msgid "Logo"
+msgstr "చిహ�నం"
+
+#. TRANS: Field label for StatusNet site logo.
+msgid "Site logo"
+msgstr "సైట� చిహ�నం"
+
+#. TRANS: Field label for SSL StatusNet site logo.
+msgid "SSL logo"
+msgstr "SSL చిహ�నం"
+
 #. TRANS: Button title for saving site settings.
-msgid "Save site settings"
+#, fuzzy
+msgid "Save the site settings."
 msgstr "సైట� అమరికలన� భద�రపరచ�"
 
 #. TRANS: Page title for site-wide notice tab in admin panel.
@@ -5756,7 +5495,7 @@ msgstr "సైట� గమనిక పాఠ�యం"
 msgid "Site-wide notice text (255 characters maximum; HTML allowed)"
 msgstr "సైట�-వారీ నోటీస� పాఠ�యం (255 అక�షరాల� గరిష�ఠం; HTML ఇవ�వొచ�చ�)"
 
-#. TRANS: Title for button to save site notice in admin panel.
+#. TRANS: Button title to save site notice in admin panel.
 msgid "Save site notice."
 msgstr "సైట� గమనికన� భద�రపరచండి."
 
@@ -5951,7 +5690,7 @@ msgstr ""
 msgid "Snapshots will be sent to this URL."
 msgstr ""
 
-#. TRANS: Title for button to save snapshot settings.
+#. TRANS: Button title to save snapshot settings.
 #, fuzzy
 msgid "Save snapshot settings."
 msgstr "సైట� అమరికలన� భద�రపరచ�"
@@ -5987,10 +5726,6 @@ msgstr "అన�మతి కోసం వేచివ�న�న %1$s గ�
 msgid "A list of users awaiting approval to subscribe to you."
 msgstr "ఈ గ�ంప�లో చేరడానికి అన�మతి కోసం వేచివ�న�న వాడ�కర�ల జాబితా."
 
-#. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
-msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
-msgstr ""
-
 #. TRANS: Page title when subscription succeeded.
 msgid "Subscribed"
 msgstr "చందాచేరార�"
@@ -6092,8 +5827,7 @@ msgid ""
 "You're not listening to anyone's notices right now, try subscribing to "
 "people you know. Try [people search](%%action.peoplesearch%%), look for "
 "members in groups you're interested in and in our [featured users](%%action."
-"featured%%). If you're a [Twitter user](%%action.twittersettings%%), you can "
-"automatically subscribe to people you already follow there."
+"featured%%)."
 msgstr ""
 
 #. TRANS: Subscription list text when looking at the subscriptions for a of a user other
@@ -6124,6 +5858,12 @@ msgstr ""
 msgid "Notices tagged with %1$s, page %2$d"
 msgstr "%2$sలో %1$s అనే ట�యాగ�తో ఉన�న నోటీస�ల�!"
 
+#. TRANS: Link label for feed on "notices with tag" page.
+#. TRANS: %s is the tag the feed is for.
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (Activity Streams JSON)"
+msgstr "%s కొరక� స�పందనల ఫీడ� (ఆటమ�)"
+
 #. TRANS: Link label for feed on "notices with tag" page.
 #. TRANS: %s is the tag the feed is for.
 #, php-format
@@ -6175,10 +5915,9 @@ msgid "List user"
 msgstr "జాబితా వాడ�కరి"
 
 #. TRANS: Field label on list form.
-#, fuzzy
 msgctxt "LABEL"
 msgid "Lists"
-msgstr "పరిమిత�ల�"
+msgstr "జాబితాల�"
 
 #. TRANS: Field title on list form.
 msgid ""
@@ -6229,16 +5968,6 @@ msgstr "చందామాన�"
 msgid "%1$s unsubscribed from list %2$s by %3$s"
 msgstr "%3$s యొక�క %2$s అనే జాబితా న�ండి %1$s చందా విరమించార�"
 
-#. TRANS: Client error displayed when trying to update profile with an incompatible license.
-#. TRANS: %1$s is the license incompatible with site license %2$s.
-#. TRANS: Exception thrown when licenses are not compatible for an authorisation request.
-#. TRANS: %1$s is the license for the listenee, %2$s is the license for "this" StatusNet site.
-#, php-format
-msgid ""
-"Listenee stream license \"%1$s\" is not compatible with site license \"%2$s"
-"\"."
-msgstr ""
-
 #. TRANS: Title of URL settings tab in profile settings.
 msgid "URL settings"
 msgstr "URL అమరికల�"
@@ -6329,7 +6058,6 @@ msgid "Invalid default subscripton: \"%1$s\" is not a user."
 msgstr ""
 
 #. TRANS: Fieldset legend in user administration panel.
-#, fuzzy
 msgctxt "LEGEND"
 msgid "Profile"
 msgstr "ప�రొఫైల�"
@@ -6375,147 +6103,10 @@ msgstr "ఆహ�వానాలని చేతనంచేసాం"
 msgid "Whether to allow users to invite new users."
 msgstr "వాడ�కర�లన� కొత�త వారిని ఆహ�వానించడానికి అన�మతించాలా వద�దా."
 
-#. TRANS: Title for button to save user settings in user admin panel.
+#. TRANS: Button title to save user settings in user admin panel.
 msgid "Save user settings."
 msgstr "వాడ�కరి అమరికలన� భద�రపరచ�."
 
-#. TRANS: Page title.
-msgid "Authorize subscription"
-msgstr "చందాని అధీకరించండి"
-
-#. TRANS: Page notice on "Authorize subscription" page.
-msgid ""
-"Please check these details to make sure that you want to subscribe to this "
-"user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
-"click \"Reject\"."
-msgstr ""
-
-#. TRANS: Button text on Authorise Subscription page.
-#. TRANS: Submit button text to accept a group membership request on approve group form.
-#. TRANS: Submit button text to accept a subscription request on approve sub form.
-msgctxt "BUTTON"
-msgid "Accept"
-msgstr "అంగీకరించ�"
-
-#. TRANS: Title for button on Authorise Subscription page.
-#. TRANS: Button title to subscribe to a user.
-msgid "Subscribe to this user."
-msgstr "ఈ వాడ�కరికి చందాచేరండి."
-
-#. TRANS: Button text on Authorise Subscription page.
-#. TRANS: Submit button text to reject a group membership request on approve group form.
-#. TRANS: Submit button text to reject a subscription request on approve sub form.
-msgctxt "BUTTON"
-msgid "Reject"
-msgstr "తిరస�కరించ�"
-
-#. TRANS: Title for button on Authorise Subscription page.
-msgid "Reject this subscription."
-msgstr "ఈ చందాని తిరస�కరించండి."
-
-#. TRANS: Client error displayed for an empty authorisation request.
-msgid "No authorization request!"
-msgstr "అధీకరణ అభ�యర�థన లేద�!"
-
-#. TRANS: Accept message header from Authorise subscription page.
-msgid "Subscription authorized"
-msgstr "చందాని అధీకరించార�"
-
-#. TRANS: Accept message text from Authorise subscription page.
-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 ""
-
-#. TRANS: Reject message header from Authorise subscription page.
-msgid "Subscription rejected"
-msgstr "చందాని తిరస�కరించార�."
-
-#. TRANS: Reject message from Authorise subscription page.
-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 ""
-
-#. TRANS: Exception thrown when no valid user is found for an authorisation request.
-#. TRANS: %s is a listener URI.
-#, php-format
-msgid "Listener URI \"%s\" not found here."
-msgstr ""
-
-#. TRANS: Exception thrown when listenee URI is too long for an authorisation request.
-#. TRANS: %s is a listenee URI.
-#, php-format
-msgid "Listenee URI \"%s\" is too long."
-msgstr ""
-
-#. TRANS: Exception thrown when listenee URI is a local user for an authorisation request.
-#. TRANS: %s is a listenee URI.
-#, php-format
-msgid "Listenee URI \"%s\" is a local user."
-msgstr ""
-
-#. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
-#. TRANS: %s is a profile URL.
-#, php-format
-msgid "Profile URL \"%s\" is for a local user."
-msgstr ""
-
-#. TRANS: Exception thrown when avatar URL is invalid for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#, fuzzy, php-format
-msgid "Avatar URL \"%s\" is not valid."
-msgstr "హోమ� పేజీ URL సరైనది కాద�."
-
-#. TRANS: Exception thrown when avatar URL could not be read for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#, fuzzy, php-format
-msgid "Cannot read avatar URL \"%s\"."
-msgstr "'%s' అనే అవతారప� URL తప�ప�"
-
-#. TRANS: Exception thrown when avatar URL return an invalid image type for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#, fuzzy, php-format
-msgid "Wrong image type for avatar URL \"%s\"."
-msgstr "'%s' కొరక� తప�ప�డ� బొమ�మ రకం"
-
-#. TRANS: Title for profile design page.
-#. TRANS: Page title for profile design page.
-msgid "Profile design"
-msgstr "ఫ�రొఫైల� రూప�రేఖల�"
-
-#. TRANS: Instructions for Profile design page.
-#. TRANS: Instructions for profile design page.
-#, fuzzy
-msgid ""
-"Customize the way your profile looks with a background image and a colour "
-"palette of your choice."
-msgstr "నేపథ�య చిత�రం మరియ� రంగ�ల ఎంపికతో మీ గ�ంప� ఎలా కనిపించాలో మలచ�కోండి."
-
-#. TRANS: Succes message on Profile design page when finding an easter egg.
-msgid "Enjoy your hotdog!"
-msgstr ""
-
-#. TRANS: Form legend on Profile design page.
-msgid "Design settings"
-msgstr "రూప�రేఖల అమరికల�"
-
-#. TRANS: Checkbox label on Profile design page.
-msgid "View profile designs"
-msgstr "ఫ�రొఫైల� రూప�రేఖల�"
-
-#. TRANS: Title for checkbox on Profile design page.
-#, fuzzy
-msgid "Show or hide profile designs."
-msgstr "ఫ�రొఫైల� రూప�రేఖల�"
-
-#. TRANS: Form legend on Profile design page for form to choose a background image.
-#, fuzzy
-msgid "Background file"
-msgstr "నేపథ�యం"
-
 #. TRANS: Page title for all but the first page of groups for a user.
 #. TRANS: %1$s is a nickname, %2$d is a page number.
 #, php-format
@@ -6556,7 +6147,7 @@ msgstr "స�టేటస�‌నెట� %s"
 #. TRANS: %1$s is the engine name (StatusNet) and %2$s is the StatusNet version.
 #, php-format
 msgid ""
-"This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, "
+"This site is powered by %1$s version %2$s, Copyright 2008-2011 StatusNet, "
 "Inc. and contributors."
 msgstr ""
 
@@ -6574,7 +6165,7 @@ msgid ""
 "StatusNet is free software: you can redistribute it and/or modify it under "
 "the terms of the GNU Affero General Public License as published by the Free "
 "Software Foundation, either version 3 of the License, or (at your option) "
-"any later version. "
+"any later version."
 msgstr ""
 
 #. TRANS: Content part of StatusNet version page.
@@ -6582,7 +6173,7 @@ msgid ""
 "This program is distributed in the hope that it will be useful, but WITHOUT "
 "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
 "FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License "
-"for more details. "
+"for more details."
 msgstr ""
 
 #. TRANS: Content part of StatusNet version page.
@@ -6636,16 +6227,26 @@ msgstr ""
 msgid "Robin thinks something is impossible."
 msgstr "�దో అసాధ�యమని రాబిన� అన�క�ంట�న�నాడ�."
 
+#. TRANS: Message used to be inserted as %2$s in  the text "No file may
+#. TRANS: be larger than %1$d byte and the file you sent was %2$s.".
+#. TRANS: %1$d is the number of bytes of an uploaded file.
+#, php-format
+msgid "%1$d byte"
+msgid_plural "%1$d bytes"
+msgstr[0] ""
+msgstr[1] ""
+
 #. TRANS: Message given if an upload is larger than the configured maximum.
-#. TRANS: %1$d is the byte limit for uploads, %2$d is the byte count for the uploaded file.
-#. TRANS: %1$s is used for plural.
+#. TRANS: %1$d (used for plural) is the byte limit for uploads,
+#. TRANS: %2$s is the proper form of "n bytes". This is the only ways to have
+#. TRANS: gettext support multiple plurals in the same message, unfortunately...
 #, php-format
 msgid ""
-"No file may be larger than %1$d byte and the file you sent was %2$d bytes. "
-"Try to upload a smaller version."
+"No file may be larger than %1$d byte and the file you sent was %2$s. Try to "
+"upload a smaller version."
 msgid_plural ""
-"No file may be larger than %1$d bytes and the file you sent was %2$d bytes. "
-"Try to upload a smaller version."
+"No file may be larger than %1$d bytes and the file you sent was %2$s. Try to "
+"upload a smaller version."
 msgstr[0] ""
 msgstr[1] ""
 
@@ -6713,6 +6314,11 @@ msgstr "స�థానిక గ�ంప�ని తాజాకరించ
 msgid "Could not create login token for %s"
 msgstr "మార�పేర�లని సృష�టించలేకపోయాం."
 
+#. TRANS: Exception thrown when a program code class (%s) cannot be instantiated.
+#, fuzzy, php-format
+msgid "Cannot instantiate class %s."
+msgstr "కొత�త సంకేతపదాన�ని భద�రపరచలేక�న�నాం."
+
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.
 msgid "No database name or DSN found anywhere."
 msgstr ""
@@ -6874,7 +6480,7 @@ msgstr ""
 #, php-format
 msgid ""
 "You already have %1$d or more people in list %2$s, which is the maximum "
-"allowed number.Try unlisting others first."
+"allowed number. Try unlisting others first."
 msgstr ""
 
 #. TRANS: Exception thrown when inserting a list subscription in the database fails.
@@ -6897,7 +6503,6 @@ msgid "Unable to save tag."
 msgstr "ట�యాగ�లని భద�రపరచలేకపోయాం."
 
 #. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
-#. TRANS: Error message displayed to a banned user when they try to subscribe.
 msgid "You have been banned from subscribing."
 msgstr "చందాచేరడం న�ండి మిమ�మల�ని నిషేధించార�."
 
@@ -6917,10 +6522,6 @@ msgstr "చందాదార�ల� కాద�!"
 msgid "Could not delete self-subscription."
 msgstr "కొత�త చందాని చేర�చలేకపోయాం."
 
-#. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
-msgid "Could not delete subscription OMB token."
-msgstr "కొత�త చందాని చేర�చలేకపోయాం."
-
 #. TRANS: Exception thrown when a subscription could not be deleted on the server.
 msgid "Could not delete subscription."
 msgstr "కొత�త చందాని చేర�చలేకపోయాం."
@@ -6954,6 +6555,18 @@ msgstr ""
 msgid "Single-user mode code called when not enabled."
 msgstr ""
 
+#. TRANS: Information on password recovery form if no known username or e-mail address was specified.
+msgid "No user with that email address or username."
+msgstr "ఆ ఈమెయిల� చిర�నామా లేదా వాడ�కరిపేర�తో వాడ�కర�లెవరూ లేర�."
+
+#. TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.
+msgid "No registered email address for that user."
+msgstr "ఈ వాడ�కరికై నమోదైన ఈమెయిల� చిర�నామాల� �మీ లేవ�."
+
+#. TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.
+msgid "Error saving address confirmation."
+msgstr "చిర�నామా నిర�ధారణని భద�రపరచడంలో పొరపాట�."
+
 #. TRANS: Server exception thrown when creating a group failed.
 msgid "Could not create group."
 msgstr "గ�ంప�ని సృష�టించలేకపోయాం."
@@ -7221,26 +6834,11 @@ msgstr ""
 msgid "saveSettings() not implemented."
 msgstr ""
 
-#. TRANS: Client error message thrown if design settings could not be deleted in
-#. TRANS: the admin panel Design.
-#, fuzzy
-msgid "Unable to delete design setting."
-msgstr "మీ రూప�రేఖల అమరికలని భద�రపరచలేక�న�నాం."
-
 #. TRANS: Header in administrator navigation panel.
-#. TRANS: Header in settings navigation panel.
 msgctxt "HEADER"
 msgid "Home"
 msgstr "మ�ంగిలి"
 
-#. TRANS: Menu item in administrator navigation panel.
-#. TRANS: Menu item in default local navigation panel.
-#. TRANS: Menu item in personal group navigation menu.
-#. TRANS: Menu item in settings navigation panel.
-msgctxt "MENU"
-msgid "Home"
-msgstr "మ�ంగిలి"
-
 #. TRANS: Header in administrator navigation panel.
 msgctxt "HEADER"
 msgid "Admin"
@@ -7255,17 +6853,6 @@ msgctxt "MENU"
 msgid "Site"
 msgstr "సైట�"
 
-#. TRANS: Menu item title in administrator navigation panel.
-msgid "Design configuration"
-msgstr "రూపకల�పన స�వరూపణం"
-
-#. TRANS: Menu item in administrator navigation panel.
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: Menu item in settings navigation panel.
-msgctxt "MENU"
-msgid "Design"
-msgstr "రూప�రేఖల�"
-
 #. TRANS: Menu item title in administrator navigation panel.
 msgid "User configuration"
 msgstr "వాడ�కరి స�వరూపణం"
@@ -7365,44 +6952,6 @@ msgstr ""
 msgid "Could not authenticate you."
 msgstr "మిమ�మల�ని అధీకరించలేకపోయాం."
 
-#. TRANS: Server error displayed when trying to create an anynymous OAuth consumer.
-#, fuzzy
-msgid "Could not create anonymous consumer."
-msgstr "మార�పేర�లని సృష�టించలేకపోయాం."
-
-#. TRANS: Server error displayed when trying to create an anynymous OAuth application.
-#, fuzzy
-msgid "Could not create anonymous OAuth application."
-msgstr "ఉపకరణాన�ని సృష�టించలేకపోయాం."
-
-#. TRANS: Exception thrown when no token association could be found.
-msgid ""
-"Could not find a profile and application associated with the request token."
-msgstr ""
-
-#. TRANS: Exception thrown when no access token can be issued.
-#, fuzzy
-msgid "Could not issue access token."
-msgstr "ట�యాగ�లని భద�రపరచలేకపోయాం."
-
-#. TRANS: Exception thrown when a database error occurs.
-#, fuzzy
-msgid "Database error inserting OAuth application user."
-msgstr "అవతారాన�ని పెట�టడంలో పొరపాట�"
-
-#. TRANS: Exception thrown when a database error occurs.
-#, fuzzy
-msgid "Database error updating OAuth application user."
-msgstr "అవతారాన�ని పెట�టడంలో పొరపాట�"
-
-#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
-msgid "Tried to revoke unknown token."
-msgstr ""
-
-#. TRANS: Exception thrown when an attempt is made to remove a revoked token.
-msgid "Failed to delete revoked token."
-msgstr ""
-
 #. TRANS: Form input field label for application icon.
 msgid "Icon"
 msgstr "ప�రతీకం"
@@ -7484,13 +7033,14 @@ msgid "Default access for this application: read-only, or read-write"
 msgstr ""
 
 #. TRANS: Submit button title.
-msgid "Cancel"
-msgstr "రద�ద�చేయి"
+#, fuzzy
+msgid "Cancel application changes."
+msgstr "సంధానిత ఉపకరణాల�"
 
 #. TRANS: Submit button title.
-#. TRANS: Button text to save a list.
-msgid "Save"
-msgstr "భద�రపరచ�"
+#, fuzzy
+msgid "Save application changes."
+msgstr "కొత�త ఉపకరణం"
 
 #. TRANS: Name for an anonymous application in application list.
 msgid "Unknown application"
@@ -7526,6 +7076,18 @@ msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "తొలగించ�"
 
+#. TRANS: Submit button text to accept a group membership request on approve group form.
+#. TRANS: Submit button text to accept a subscription request on approve sub form.
+msgctxt "BUTTON"
+msgid "Accept"
+msgstr "అంగీకరించ�"
+
+#. TRANS: Submit button text to reject a group membership request on approve group form.
+#. TRANS: Submit button text to reject a subscription request on approve sub form.
+msgctxt "BUTTON"
+msgid "Reject"
+msgstr "తిరస�కరించ�"
+
 #. TRANS: Atom feed exception thrown when an author element does not contain a name element.
 msgid "Author element must contain a name element."
 msgstr ""
@@ -7758,8 +7320,8 @@ msgstr ""
 #, php-format
 msgid "Message too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Message too long - maximum is %1$d characters, you sent %2$d."
-msgstr[0] "%1$d అక�షరం గరిష�ఠం, మీర� %2$d పంపించార�."
-msgstr[1] "%1$d అక�షరాల� గరిష�ఠం, మీర� %2$d పంపించార�."
+msgstr[0] "నోటీస� చాలా పొడవ�గా ఉంది - %1$d అక�షరం గరిష�ఠం, మీర� %2$d పంపించార�."
+msgstr[1] "నోటీస� చాలా పొడవ�గా ఉంది - %1$d అక�షరాల� గరిష�ఠం, మీర� %2$d పంపించార�."
 
 #. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
 msgid "You can't send a message to this user."
@@ -7780,8 +7342,8 @@ msgstr "%s యొక�క నోటీస�ని ప�నరావృతి
 #, php-format
 msgid "Notice too long - maximum is %1$d character, you sent %2$d."
 msgid_plural "Notice too long - maximum is %1$d characters, you sent %2$d."
-msgstr[0] "%1$d అక�షరం గరిష�ఠం, మీర� %2$d పంపించార�"
-msgstr[1] "%1$d అక�షరాల� గరిష�ఠం, మీర� %2$d పంపించార�"
+msgstr[0] "నోటీస� చాలా పొడవ�గా ఉంది - %1$d అక�షరం గరిష�ఠం, మీర� %2$d పంపించార�."
+msgstr[1] "నోటీస� చాలా పొడవ�గా ఉంది - %1$d అక�షరాల� గరిష�ఠం, మీర� %2$d పంపించార�."
 
 #. TRANS: Text shown having sent a reply to a notice successfully.
 #. TRANS: %s is the nickname of the user of the notice the reply was sent to.
@@ -8088,6 +7650,11 @@ msgstr ""
 msgid "Go to the installer."
 msgstr "సైట� లోనికి ప�రవేశించండి"
 
+#. TRANS: Header on conversation page. Hidden by default (h2).
+#. TRANS: Label for user statistics.
+msgid "Notices"
+msgstr "సందేశాల�"
+
 #. TRANS: Page title for when a database error occurs.
 msgid "Database error"
 msgstr ""
@@ -8098,13 +7665,6 @@ msgctxt "MENU"
 msgid "Public"
 msgstr "బహిరంగం"
 
-#. TRANS: Menu item in default local navigation panel.
-#. TRANS: Menu item in search group navigation panel.
-#. TRANS: Menu item in local navigation menu.
-msgctxt "MENU"
-msgid "Groups"
-msgstr "గ�ంప�ల�"
-
 #. TRANS: Menu item in default local navigation panel.
 #. TRANS: Menu item title in local navigation menu.
 msgctxt "MENU"
@@ -8120,50 +7680,12 @@ msgstr "తొలగించ�"
 msgid "Delete this user"
 msgstr "ఈ వాడ�కరిని తొలగించ�"
 
-#. TRANS: Form legend of form for changing the page design.
-#, fuzzy
-msgid "Change design"
-msgstr "రూప�రేఖలని భద�రపరచ�"
-
-#. TRANS: Fieldset legend on profile design page to change profile page colours.
-msgid "Change colours"
-msgstr "రంగ�లన� మార�చ�"
-
-#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-msgid "Use defaults"
-msgstr "అప�రమేయాలన� ఉపయోగించ�"
-
-#. TRANS: Label in form on profile design page.
-#. TRANS: Field contains file name on user's computer that could be that user's custom profile background image.
-msgid "Upload file"
-msgstr "ఫైల�ని ఎక�కించ�"
-
-#. TRANS: Instructions for form on profile design page.
-msgid ""
-"You can upload your personal background image. The maximum file size is 2MB."
-msgstr "మీ వ�యక�తిగత నేపథ�యప� చిత�రాన�ని మీర� ఎక�కించవచ�చ�. గరిష�ఠ ఫైల� పరిమాణం 2మెబై."
-
-#. TRANS: Radio button on profile design page that will enable use of the uploaded profile image.
-msgctxt "RADIO"
-msgid "On"
-msgstr "ఆన�"
-
-#. TRANS: Radio button on profile design page that will disable use of the uploaded profile image.
-msgctxt "RADIO"
-msgid "Off"
-msgstr "ఆఫ�"
-
-#. TRANS: Success message displayed if design settings were saved after clicking "Use defaults".
-msgid "Design defaults restored."
-msgstr ""
-
 #. TRANS: Exception. %s is an ID.
 #, fuzzy, php-format
 msgid "Unable to find services for %s."
 msgstr "మీ ఉపకరణాన�ని మార�చడానికి ఈ ఫారాన�ని ఉపయోగించండి."
 
 #. TRANS: Form legend for removing the favourite status for a favourite notice.
-#. TRANS: Title for button text for removing the favourite status for a favourite notice.
 #, fuzzy
 msgid "Disfavor this notice"
 msgstr "ఈ నోటీస�ని తొలగించ�"
@@ -8174,8 +7696,12 @@ msgctxt "BUTTON"
 msgid "Disfavor favorite"
 msgstr "ఇష�టాంశాలక� చేర�చ�"
 
+#. TRANS: Button title for removing the favourite status for a favourite notice.
+#, fuzzy
+msgid "Remove this notice from your list of favorite notices."
+msgstr "ఇష�టాంశాన�ని సృష�టించలేకపోయాం."
+
 #. TRANS: Form legend for adding the favourite status to a notice.
-#. TRANS: Title for button text for adding the favourite status to a notice.
 msgid "Favor this notice"
 msgstr "ఈ నోటీస�ని ప�నరావృతించ�"
 
@@ -8184,6 +7710,11 @@ msgctxt "BUTTON"
 msgid "Favor"
 msgstr "ఇష�టపడండి"
 
+#. TRANS: Button title for adding the favourite status to a notice.
+#, fuzzy
+msgid "Add this notice to your list of favorite notices."
+msgstr "ఇష�టాంశాన�ని సృష�టించలేకపోయాం."
+
 #. TRANS: Feed type name.
 msgid "RSS 1.0"
 msgstr "RSS 1.0"
@@ -8200,6 +7731,10 @@ msgstr "ఆటమ�"
 msgid "FOAF"
 msgstr ""
 
+#. TRANS: Feed type name. See http://activitystrea.ms/
+msgid "Activity Streams"
+msgstr ""
+
 #. TRANS: Client exception thrown when an imported feed does not have an author.
 msgid "No author in the feed."
 msgstr ""
@@ -8231,6 +7766,28 @@ msgstr ""
 msgid "Grant this user the \"%s\" role"
 msgstr ""
 
+#. TRANS: Header for mini list of group members on a group page (h2).
+msgid "Members"
+msgstr "సభ�య�ల�"
+
+#. TRANS: Link to all group members from mini list of group members if group has more than n members.
+msgid "All members"
+msgstr "అందర� సభ�య�లూ"
+
+#. TRANS: Header for mini list of users with a pending membership request on a group page (h2).
+#, fuzzy
+msgid "Pending"
+msgstr "వేచివ�న�నవి (%d)"
+
+#. TRANS: Header for mini list of users that are blocked in a group page (h2).
+msgid "Blocked"
+msgstr "నిరోధించార�"
+
+#. TRANS: Title for list of group administrators on a group page.
+msgctxt "TITLE"
+msgid "Admins"
+msgstr "నిర�వాహక�ల�"
+
 #. TRANS: Button text for the form that will block a user from a group.
 msgctxt "BUTTON"
 msgid "Block"
@@ -8238,8 +7795,8 @@ msgstr "నిరోధించ�"
 
 #. TRANS: Submit button title.
 msgctxt "TOOLTIP"
-msgid "Block this user"
-msgstr "ఈ వాడ�కరిని నిరోధించ�"
+msgid "Block this user so that they can no longer post messages to it."
+msgstr ""
 
 #. TRANS: Field title on group edit form.
 #, fuzzy
@@ -8289,63 +7846,9 @@ msgctxt "GROUPADMIN"
 msgid "Admin"
 msgstr "నిర�వాహక�ల�"
 
-#. TRANS: Menu item in the group navigation page.
-msgctxt "MENU"
-msgid "Group"
-msgstr "సమూహం"
-
-#. TRANS: Tooltip for menu item in the group navigation page.
-#. TRANS: %s is the nickname of the group.
-#, php-format
-msgctxt "TOOLTIP"
-msgid "%s group"
-msgstr "%s సమూహం"
-
-#. TRANS: Menu item in the group navigation page.
-msgctxt "MENU"
-msgid "Members"
-msgstr "సభ�య�ల�"
-
-#. TRANS: Tooltip for menu item in the group navigation page.
-#. TRANS: %s is the nickname of the group.
-#, php-format
-msgctxt "TOOLTIP"
-msgid "%s group members"
-msgstr "%s సమూహ సభ�య�ల�"
-
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: %d is the number of pending members.
-#, php-format
-msgctxt "MENU"
-msgid "Pending members (%d)"
-msgid_plural "Pending members (%d)"
-msgstr[0] ""
-msgstr[1] ""
-
-#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: %s is the nickname of the group.
-#, php-format
-msgctxt "TOOLTIP"
-msgid "%s pending members"
-msgstr "%s వేచివ�న�న సభ�య�ల�"
-
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-msgctxt "MENU"
-msgid "Blocked"
-msgstr ""
-
-#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: %s is the nickname of the group.
-#, php-format
-msgctxt "TOOLTIP"
-msgid "%s blocked users"
-msgstr "%s న�ండి నిరోధించిన వాడ�కర�ల�"
-
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: Menu item in primary navigation panel.
-msgctxt "MENU"
-msgid "Admin"
-msgstr "నిర�వాహక�ల�"
+#. TRANS: Group actions header (h2). Text hidden by default.
+msgid "Group actions"
+msgstr "గ�ంప� చర�యల�"
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
@@ -8354,11 +7857,6 @@ msgctxt "TOOLTIP"
 msgid "Edit %s group properties"
 msgstr "%s గ�ంప� లక�షణాలన� మార�చండి"
 
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-msgctxt "MENU"
-msgid "Logo"
-msgstr "చిహ�నం"
-
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
 #, php-format
@@ -8366,16 +7864,10 @@ msgctxt "TOOLTIP"
 msgid "Add or edit %s logo"
 msgstr ""
 
-#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: %s is the nickname of the group.
-#, php-format
-msgctxt "TOOLTIP"
-msgid "Add or edit %s design"
-msgstr ""
-
-#. TRANS: Group actions header (h2). Text hidden by default.
-msgid "Group actions"
-msgstr "గ�ంప� చర�యల�"
+#. TRANS: Link text for link on user profile.
+msgctxt "MENU"
+msgid "Logo"
+msgstr "చిహ�నం"
 
 #. TRANS: Title for groups with the most members section.
 msgid "Popular groups"
@@ -8385,11 +7877,20 @@ msgstr "ప�రసిద�ధ గ�ంప�ల�"
 msgid "Active groups"
 msgstr "క�రియాశీల గ�ంప�ల�"
 
-#. TRANS: Title for group tag cloud section.
-#. TRANS: %s is a group name.
-#, fuzzy, php-format
-msgid "Tags in %s group's notices"
-msgstr "%s గ�ంప� లక�షణాలన� మార�చ�"
+#. TRANS: Link description for seeing all groups.
+#. TRANS: Link description for seeing all lists.
+#, fuzzy
+msgid "See all"
+msgstr "అన�నీ చూపించ�"
+
+#. TRANS: Link title for seeing all groups.
+msgid "See all groups you belong to."
+msgstr ""
+
+#. TRANS: Menu item title in personal group navigation menu.
+#. TRANS: %s is a username.
+msgid "Back to top"
+msgstr ""
 
 #. TRANS: Client exception 406
 msgid "This page is not available in a media type you accept"
@@ -8474,12 +7975,44 @@ msgctxt "TITLE"
 msgid "Trends"
 msgstr ""
 
-#. TRANS: Button text for inviting more users to the StatusNet instance.
+#. TRANS: Default button text for inviting more users to the StatusNet instance.
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Invite more colleagues"
 msgstr "కొత�త వాడ�కర�లని ఆహ�వానించండి"
 
+#. TRANS: Form legend.
+#, fuzzy
+msgid "Invite collegues"
+msgstr "కొత�త వాడ�కర�లని ఆహ�వానించండి"
+
+#. TRANS: Field label for a list of e-mail addresses.
+msgid "Email addresses"
+msgstr "ఈమెయిల� చిర�నామాల�"
+
+#. TRANS: Field title for a list of e-mail addresses.
+msgid "Addresses of friends to invite (one per line)."
+msgstr "ఆహ�వానించాల�సిన మిత�ర�ల చిర�నామాల� (పంక�తికి ఒకటి చొప�ప�న)."
+
+#. TRANS: Field label for a personal message to send to invitees.
+msgid "Personal message"
+msgstr "వ�యక�తిగత సందేశం"
+
+#. TRANS: Field title for a personal message to send to invitees.
+msgid "Optionally add a personal message to the invitation."
+msgstr "�చ�ఛికంగా ఆహ�వానానికి వ�యక�తిగత సందేశం చేర�చండి."
+
+#. TRANS: Send button for inviting friends
+#. TRANS: Button text for sending notice.
+msgctxt "BUTTON"
+msgid "Send"
+msgstr "పంపించ�"
+
+#. TRANS: Submit button title.
+#, fuzzy
+msgid "Send invitations."
+msgstr "ఆహ�వానాల�"
+
 #. TRANS: Button text for joining a group.
 msgctxt "BUTTON"
 msgid "Join"
@@ -8490,6 +8023,11 @@ msgctxt "BUTTON"
 msgid "Leave"
 msgstr "వైదొలగండి"
 
+#. TRANS: Link title for seeing all lists.
+#, fuzzy
+msgid "See all lists you have created."
+msgstr "మీర� నమోద� చేసివ�న�న ఉపకరణాల�"
+
 #. TRANS: Menu item for logging in to the StatusNet site.
 #. TRANS: Menu item in primary navigation panel.
 msgctxt "MENU"
@@ -8548,8 +8086,8 @@ msgstr ""
 #. TRANS: %1$s is the subscribing user's nickname, %2$s is the StatusNet sitename.
 #. TRANS: Main body of new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscriber's long name, %2$s is the StatusNet sitename.
-#, php-format
-msgid "%1$s is now listening to your notices on %2$s."
+#, fuzzy, php-format
+msgid "%1$s is now following you on %2$s."
 msgstr "%1$s ఇప�ప�డ� %2$sలో మీ నోటీస�లని వింట�న�నార�."
 
 #. TRANS: Subject of pending new-subscriber notification e-mail.
@@ -8767,7 +8305,7 @@ msgstr "%1$s (@%2$s) మీ దృష�టికి ఒక నోటిస�
 #. TRANS: Body of @-reply notification e-mail.
 #. TRANS: %1$s is the sending user's name, $2$s is the StatusNet sitename,
 #. TRANS: %3$s is a URL to the notice, %4$s is the notice text,
-#. TRANS: %5$s is a URL to the full conversion if it exists (otherwise empty),
+#. TRANS: %5$s is the text "The full conversation can be read here:" and a URL to the full conversion if it exists (otherwise empty),
 #. TRANS: %6$s is a URL to reply to the notice, %7$s is a URL to all @-replies for the addressed user,
 #, php-format
 msgid ""
@@ -8809,6 +8347,10 @@ msgstr ""
 
 #. TRANS: Subject of group join notification e-mail.
 #. TRANS: %1$s is the joining user's nickname, %2$s is the group name, and %3$s is the StatusNet sitename.
+#, fuzzy, php-format
+msgid "%1$s has joined your group %2$s on %3$s"
+msgstr "%3$s నంద� %1$s మీ %2$s గ�ంప�లో చేరార�."
+
 #. TRANS: Main body of group join notification e-mail.
 #. TRANS: %1$s is the subscriber's long name, %2$s is the group name, and %3$s is the StatusNet sitename,
 #. TRANS: %4$s is a block of profile info about the subscriber.
@@ -8898,8 +8440,9 @@ msgid "Make Admin"
 msgstr "నిర�వాహక�న�ని చేయి"
 
 #. TRANS: Submit button title.
+#, fuzzy
 msgctxt "TOOLTIP"
-msgid "Make this user an admin"
+msgid "Make this user an admin."
 msgstr "ఈ వాడ�కరిని నిర�వాహక�న�ని చేయి"
 
 #. TRANS: Client exception thrown when a database error was thrown during a file upload operation.
@@ -8946,7 +8489,7 @@ msgstr "సైట� గమనికని భద�రపరచ�"
 msgid "Select recipient:"
 msgstr ""
 
-#. TRANS Entry in drop-down selection box in direct-message inbox/outbox when no one is available to message.
+#. TRANS: Entry in drop-down selection box in direct-message inbox/outbox when no one is available to message.
 msgid "No mutual subscribers."
 msgstr "పరస�పర చందాదార�ల� ఎవరూలేర�."
 
@@ -9015,6 +8558,10 @@ msgstr ""
 msgid "You must implement either adaptNoticeListItem() or showNotice()."
 msgstr ""
 
+#. TRANS: Link description to show more items in a list.
+msgid "More â–¼"
+msgstr "మరిన�ని ▼"
+
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 msgid "Nickname cannot be empty."
 msgstr ""
@@ -9064,11 +8611,6 @@ msgctxt "SEPARATOR"
 msgid ", "
 msgstr ", "
 
-#. TRANS: Start of profile addressees list.
-#, fuzzy
-msgid " â–¸ "
-msgstr " â–¶ "
-
 #. TRANS: Used in coordinates as abbreviation of north.
 msgid "N"
 msgstr "à°‰"
@@ -9107,7 +8649,8 @@ msgid "Repeated by"
 msgstr "%s యొక�క ప�నరావృతం"
 
 #. TRANS: Link title in notice list item to reply to a notice.
-msgid "Reply to this notice"
+#, fuzzy
+msgid "Reply to this notice."
 msgstr "ఈ నోటీస�పై స�పందించండి"
 
 #. TRANS: Link text in notice list item to reply to a notice.
@@ -9115,8 +8658,9 @@ msgid "Reply"
 msgstr "స�పందించండి"
 
 #. TRANS: Link title in notice list item to delete a notice.
-msgid "Delete this notice"
-msgstr "ఈ నోటీస�ని తొలగించ�"
+#, fuzzy
+msgid "Delete this notice from the timeline."
+msgstr "ఈ నోటీస�ని తొలగించ�."
 
 #. TRANS: Title for repeat form status in notice list when a notice has been repeated.
 msgid "Notice repeated."
@@ -9142,27 +8686,6 @@ msgstr "బాడ�జి"
 msgid "Send a nudge to this user."
 msgstr "ఈ వాడ�కరికి ఒక నేర� సందేశాన�ని పంపించండి"
 
-#. TRANS: Exception thrown when creating a new profile fails in OAuth store.
-msgid "Error inserting new profile."
-msgstr ""
-
-#. TRANS: Exception thrown when creating a new avatar fails in OAuth store.
-msgid "Error inserting avatar."
-msgstr ""
-
-#. TRANS: Exception thrown when creating a remote profile fails in OAuth store.
-msgid "Error inserting remote profile."
-msgstr ""
-
-#. TRANS: Exception thrown when a notice is denied because it has been sent before.
-msgid "Duplicate notice."
-msgstr ""
-
-#. TRANS: Exception thrown when creating a new subscription fails in OAuth store.
-#, fuzzy
-msgid "Could not insert new subscription."
-msgstr "కొత�త చందాని చేర�చలేకపోయాం."
-
 #. TRANS: Server exception thrown in oEmbed action if no API endpoint is available.
 #, fuzzy
 msgid "No oEmbed API endpoint available."
@@ -9190,9 +8713,8 @@ msgstr[0] "గ�ంప� లేదా విషయాన�ని గ�రి
 msgstr[1] "గ�ంప� లేదా విషయాన�ని గ�రించి %d అక�షరాల�లో వివరించండి"
 
 #. TRANS: Button title to delete a list.
-#, fuzzy
 msgid "Delete this list."
-msgstr "ఈ వాడ�కరిని తొలగించండి."
+msgstr "ఈ జాబితాన� తొలగించండి."
 
 #. TRANS: Header in list edit form.
 msgid "Add or remove people"
@@ -9243,11 +8765,6 @@ msgstr "మార�చ�"
 msgid "Edit %s list by you."
 msgstr "%s గ�ంప�ని మార�చ�"
 
-#. TRANS: Link description for link to list of users tagged with a tag.
-#, fuzzy
-msgid "Tagged"
-msgstr "ట�యాగ�"
-
 #. TRANS: Title for link to edit list settings.
 #, fuzzy
 msgid "Edit list settings."
@@ -9395,8 +8912,10 @@ msgctxt "plugin"
 msgid "Enable"
 msgstr ""
 
+#. TRANS: Plugin description for a disabled plugin.
 msgctxt "plugin-description"
-msgid "(Plugin descriptions unavailable when disabled.)"
+msgid ""
+"(The plugin description is unavailable when a plugin has been disabled.)"
 msgstr ""
 
 #. TRANS: Menu item in primary navigation panel.
@@ -9409,6 +8928,11 @@ msgstr "అమరికల�"
 msgid "Change your personal settings."
 msgstr "ఫ�రొఫైల� అమరికలని మార�చ�"
 
+#. TRANS: Menu item in primary navigation panel.
+msgctxt "MENU"
+msgid "Admin"
+msgstr "నిర�వాహక�ల�"
+
 #. TRANS: Menu item title in primary navigation panel.
 #, fuzzy
 msgid "Site configuration."
@@ -9429,15 +8953,8 @@ msgstr "సైట� న�ండి నిష�క�రమించ�"
 msgid "Login to the site."
 msgstr "సైట�లోని ప�రవేశించ�"
 
-#. TRANS: Menu item in primary navigation panel.
-msgctxt "MENU"
-msgid "Search"
-msgstr "వెత�క�"
-
-#. TRANS: Menu item title in primary navigation panel.
-#, fuzzy
-msgid "Search the site."
-msgstr "సైట�ని వెత�క�"
+msgid "This profile has been silenced by site moderators"
+msgstr ""
 
 #. TRANS: H2 text for user subscription statistics.
 #, fuzzy
@@ -9448,6 +8965,10 @@ msgstr "అన�సరించ�"
 msgid "Followers"
 msgstr "అన�చర�ల�"
 
+#. TRANS: H2 text for user statistics.
+msgid "Statistics"
+msgstr "గణాంకాల�"
+
 #. TRANS: Label for user statistics.
 msgid "User ID"
 msgstr "వాడ�కరి ID"
@@ -9456,10 +8977,6 @@ msgstr "వాడ�కరి ID"
 msgid "Member since"
 msgstr "సభ�య�లైన తేదీ"
 
-#. TRANS: Label for user statistics.
-msgid "Notices"
-msgstr "సందేశాల�"
-
 #. TRANS: Label for user statistics.
 #. TRANS: Average count of posts made per day since account registration.
 msgid "Daily average"
@@ -9548,6 +9065,7 @@ msgid "Keyword(s)"
 msgstr "కీపదమ�(ల�)"
 
 #. TRANS: Button text for searching site.
+#. TRANS: Button text for search button on search form.
 #. TRANS: Button text to search profiles.
 msgctxt "BUTTON"
 msgid "Search"
@@ -9596,21 +9114,6 @@ msgstr ""
 msgid "Find groups on this site"
 msgstr "ఈ సైట�లోని గ�ంప�లని కన�గొనండి"
 
-#. TRANS: Secondary navigation menu item leading to help on StatusNet.
-msgctxt "MENU"
-msgid "Help"
-msgstr "సహాయం"
-
-#. TRANS: Secondary navigation menu item leading to text about StatusNet site.
-msgctxt "MENU"
-msgid "About"
-msgstr "గ�రించి"
-
-#. TRANS: Secondary navigation menu item leading to Frequently Asked Questions.
-msgctxt "MENU"
-msgid "FAQ"
-msgstr "ప�రశ�నల�"
-
 #. TRANS: Secondary navigation menu item leading to Terms of Service.
 msgctxt "MENU"
 msgid "TOS"
@@ -9632,17 +9135,6 @@ msgctxt "MENU"
 msgid "Version"
 msgstr "సంచిక"
 
-#. TRANS: Secondary navigation menu item leading to e-mail contact information on the
-#. TRANS: StatusNet site, where to report bugs, ...
-msgctxt "MENU"
-msgid "Contact"
-msgstr "సంప�రదింప�ల�"
-
-#. TRANS: Secondary navigation menu item. Leads to information about embedding a timeline widget.
-msgctxt "MENU"
-msgid "Badge"
-msgstr "బాడ�జీ"
-
 #. TRANS: Default title for section/sidebar widget.
 msgid "Untitled section"
 msgstr "శీర�షికలేని విభాగం"
@@ -9689,10 +9181,6 @@ msgstr "ఈమెయిల�"
 msgid "Change email handling"
 msgstr ""
 
-#. TRANS: Menu item title in settings navigation panel.
-msgid "Design your profile"
-msgstr "వాడ�కరి ప�రొఫైల�"
-
 #. TRANS: Menu item in settings navigation panel.
 msgctxt "MENU"
 msgid "URL"
@@ -9729,6 +9217,15 @@ msgstr "అన�సంధానాల�"
 msgid "Authorized connected applications"
 msgstr "అధీకృత అన�సంధాన ఉపకరణాల�"
 
+#. TRANS: Menu item in settings navigation panel.
+msgctxt "MENU"
+msgid "Old school"
+msgstr ""
+
+#. TRANS: Menu item title in settings navigation panel.
+msgid "UI tweaks for old-school users"
+msgstr ""
+
 #. TRANS: Title of form to silence a user.
 #, fuzzy
 msgctxt "TITLE"
@@ -9739,6 +9236,44 @@ msgstr "సైట� గమనిక"
 msgid "Silence this user"
 msgstr "ఈ వాడ�కరిని తొలగించ�"
 
+#. TRANS: Server error displayed when trying to create an anynymous OAuth consumer.
+#, fuzzy
+msgid "Could not create anonymous consumer."
+msgstr "మార�పేర�లని సృష�టించలేకపోయాం."
+
+#. TRANS: Server error displayed when trying to create an anynymous OAuth application.
+#, fuzzy
+msgid "Could not create anonymous OAuth application."
+msgstr "ఉపకరణాన�ని సృష�టించలేకపోయాం."
+
+#. TRANS: Exception thrown when no token association could be found.
+msgid ""
+"Could not find a profile and application associated with the request token."
+msgstr ""
+
+#. TRANS: Exception thrown when no access token can be issued.
+#, fuzzy
+msgid "Could not issue access token."
+msgstr "ట�యాగ�లని భద�రపరచలేకపోయాం."
+
+#. TRANS: Exception thrown when a database error occurs.
+#, fuzzy
+msgid "Database error inserting OAuth application user."
+msgstr "అవతారాన�ని పెట�టడంలో పొరపాట�"
+
+#. TRANS: Exception thrown when a database error occurs.
+#, fuzzy
+msgid "Database error updating OAuth application user."
+msgstr "అవతారాన�ని పెట�టడంలో పొరపాట�"
+
+#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
+msgid "Tried to revoke unknown token."
+msgstr ""
+
+#. TRANS: Exception thrown when an attempt is made to remove a revoked token.
+msgid "Failed to delete revoked token."
+msgstr ""
+
 #. TRANS: Menu item in local navigation menu.
 msgctxt "MENU"
 msgid "Subscriptions"
@@ -9795,6 +9330,16 @@ msgstr "%sలో తోడ�కై మీ స�నేహిత�లని మ
 msgid "Subscribe to this user"
 msgstr "ఈ వాడ�కరికి చందాచేర�"
 
+#. TRANS: Button text to subscribe to a user.
+#. TRANS: Button text for subscribing to a list.
+msgctxt "BUTTON"
+msgid "Subscribe"
+msgstr "చందాచేరండి"
+
+#. TRANS: Button title to subscribe to a user.
+msgid "Subscribe to this user."
+msgstr "ఈ వాడ�కరికి చందాచేరండి."
+
 #. TRANS: Title of personal tag cloud section.
 msgid "People Tagcloud as self-tagged"
 msgstr ""
@@ -9912,17 +9457,28 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: List message for notice repeated by logged in user.
+#, fuzzy
 msgctxt "REPEATLIST"
-msgid "You have repeated this notice."
+msgid "You repeated this."
 msgstr "మీర� ఈ నోటీస�న� ప�నరావృతించార�."
 
-#. TRANS: List message for repeated notices.
-#. TRANS: %d is the number of users that have repeated a notice.
+#. TRANS: List message for when more than 4 people repeat something.
+#. TRANS: %%s is a list of users liking a notice, %d is the number over 4 that like the notice.
+#. TRANS: Plural is decided on the total number of users liking the notice (count of %%s + %d).
+#, php-format
+msgid "%%s and %d other repeated this."
+msgid_plural "%%s and %d others repeated this."
+msgstr[0] ""
+msgstr[1] ""
+
+#. TRANS: List message for favoured notices.
+#. TRANS: %%s is a list of users liking a notice.
+#. TRANS: Plural is based on the number of of users that have favoured a notice.
 #, fuzzy, php-format
-msgid "One person has repeated this notice."
-msgid_plural "%d people have repeated this notice."
-msgstr[0] "ఒక వ�యక�తి"
-msgstr[1] "%d వ�యక�త�ల�"
+msgid "%%s repeated this."
+msgid_plural "%%s repeated this."
+msgstr[0] "%s యొక�క ప�నరావృతం"
+msgstr[1] "%s యొక�క ప�నరావృతం"
 
 #. TRANS: Form legend.
 #, fuzzy, php-format
@@ -10016,7 +9572,6 @@ msgid "Unsilence this user"
 msgstr "ఈ వాడ�కరిని తొలగించ�"
 
 #. TRANS: Form legend on unsubscribe form.
-#. TRANS: Button title on unsubscribe form.
 msgid "Unsubscribe from this user"
 msgstr "ఈ వాడ�కరి న�ండి చందామాన�"
 
@@ -10026,6 +9581,10 @@ msgctxt "BUTTON"
 msgid "Unsubscribe"
 msgstr "చందామాన�"
 
+#. TRANS: Button title on unsubscribe form.
+msgid "Unsubscribe from this user."
+msgstr "ఈ వాడ�కరి న�ండి చందాన� విరమించండి."
+
 #. TRANS: Exception text shown when no profile can be found for a user.
 #. TRANS: %1$s is a user nickname, $2$d is a user ID (number).
 #, php-format
@@ -10107,8 +9666,6 @@ msgstr ""
 msgid "Getting backup from file '%s'."
 msgstr ""
 
-#~ msgid "%1$s and friends, page %2$d"
-#~ msgstr "%1$s మరియ� మిత�ర�ల�, పేజీ %2$d"
-
-#~ msgid "You and friends"
-#~ msgstr "మీర� మరియ� మీ స�నేహిత�ల�"
+#, fuzzy
+#~ msgid " "
+#~ msgstr ", "
diff --git a/locale/tl/LC_MESSAGES/statusnet.po b/locale/tl/LC_MESSAGES/statusnet.po
index 335985150d..88302c7968 100644
--- a/locale/tl/LC_MESSAGES/statusnet.po
+++ b/locale/tl/LC_MESSAGES/statusnet.po
@@ -10,14 +10,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:48+0000\n"
-"Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:41+0000\n"
+"Language-Team: Tagalog <https://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-05-05 10:52:40+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2012-04-22 22:02:21+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -36,15 +36,6 @@ msgstr ""
 "kanila sa %2$s upang makatiyak.  Kung hindi, maghintay ng ilang mga minuto "
 "at subukan uli."
 
-#. TRANS: Error message.
-msgid ""
-"An important error occured, probably related to email setup. Check logfiles "
-"for more info."
-msgstr ""
-"Naganap ang isang mahalagang kamalian, maaaring may kaugnayan sa katakdaan "
-"ng e-liham.  Suriin ang mga talaksan ng talaan para sa mas marami pang "
-"kabatiran."
-
 #. TRANS: Error message.
 msgid "An error occurred."
 msgstr "Naganap ang isang kamalian."
@@ -107,12 +98,11 @@ msgstr "Huwag paganahin ang bagong mga pagpapatala."
 msgid "Closed"
 msgstr "Nakasara na"
 
-#. TRANS: Title for button to save access settings in site admin panel.
-msgid "Save access settings"
-msgstr "Sagipin ang mga itinakdang mapupuntahan"
+#. TRANS: Button title to save access settings in site admin panel.
+msgid "Save access settings."
+msgstr "Sagipin ang mga katakdaan ng pagpunta."
 
-#. TRANS: Tooltip for button to save access settings in site admin panel.
-#. TRANS: Button text for saving theme settings.
+#. TRANS: Button text to save access settings in site admin panel.
 #. TRANS: Button label to save e-mail preferences.
 #. TRANS: Button label to save IM preferences.
 #. TRANS: Button text in the license admin panel.
@@ -128,7 +118,6 @@ msgstr "Sagipin ang mga itinakdang mapupuntahan"
 #. TRANS: Button text for saving "Other settings" in profile.
 #. TRANS: Button text to save user settings in user admin panel.
 #. TRANS: Button label in the "Edit application" form.
-#. TRANS: Button text on profile design page to save settings.
 #. TRANS: Text for save button on group edit form.
 #. TRANS: Button text to save tags for a profile.
 msgctxt "BUTTON"
@@ -168,12 +157,6 @@ msgstr "Walang ganyang balangkas."
 msgid "No such list."
 msgstr "Walang ganyang talaan."
 
-#. TRANS: Client error displayed when trying to add an OMB 0.1 remote profile to a list.
-msgid "You cannot list an OMB 0.1 remote profile with this action."
-msgstr ""
-"Hindi mo maitatala ang isang malayong balangkas ng OMB 0.1 sa pamamagitan ng "
-"ganitong galaw."
-
 #. TRANS: Client error displayed when an unknown error occurs when adding a user to a list.
 #. TRANS: %s is a username.
 #, php-format
@@ -206,7 +189,6 @@ msgstr "Walang ganyang pahina."
 #. TRANS: Client error when user not found for an rss related action.
 #. TRANS: Client error displayed when no existing user is provided for a user's delivery device setting.
 #. TRANS: Client error displayed if a user could not be found.
-#. TRANS: Client error when user not found updating a profile background image.
 #. TRANS: Client error displayed updating profile image without having a user object.
 #. TRANS: Client error displayed when making an Atom API request for an unknown user.
 #. TRANS: Client error displayed when trying to block a non-existing user or a user from another site.
@@ -232,14 +214,11 @@ msgstr "Walang ganyang pahina."
 #. TRANS: Client error displayed when trying to get the RSS feed with favorites of a user that does not exist.
 #. TRANS: Client error displayed when requesting Friends of a Friend feed without providing a user nickname.
 #. TRANS: Client error displayed when requesting Friends of a Friend feed for an object that is not a user.
-#. TRANS: Client error displayed when trying to get a user hCard for a non-existing user.
 #. TRANS: Client error displayed trying to make a micro summary without providing a valid user.
 #. TRANS: Client error displayed trying to send a direct message to a non-existing user.
 #. TRANS: Client error displayed trying to use "one time password login" without using an existing user.
 #. TRANS: Client error displayed when referring to non-existing user.
 #. TRANS: Client error displayed trying to perform an action related to a non-existing user.
-#. TRANS: Form validation error on page for remote subscribe when no user was provided.
-#. TRANS: Form validation error on page for remote subscribe when no user profile was found.
 #. TRANS: Client error displayed when trying to reply to a non-exsting user.
 #. TRANS: Client error displayed when providing a non-existing nickname in a RSS 1.0 action.
 #. TRANS: Client error.
@@ -248,7 +227,6 @@ msgstr "Walang ganyang pahina."
 #. TRANS: Client error displayed trying to find a user by ID for a non-existing ID.
 #. TRANS: Client error displayed requesting groups for a non-existing user.
 #. TRANS: Client error displayed when user not found for an action.
-#. TRANS: Client error displayed providing a non-existing nickname.
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #. TRANS: Client error displayed when trying to perform a gallery action with an unknown user.
 #. TRANS: Client error displayed when trying to access a mailbox without providing a user.
@@ -257,15 +235,21 @@ msgid "No such user."
 msgstr "Walang ganyang tagagamit."
 
 #. TRANS: Title of a user's own start page.
-#, fuzzy
 msgid "Home timeline"
-msgstr "%s guhit ng panahon"
+msgstr "Guhit ng panahon ng tahanan"
 
 #. TRANS: Title of another user's start page.
 #. TRANS: %s is the other user's name.
-#, fuzzy, php-format
+#, php-format
 msgid "%s's home timeline"
-msgstr "%s guhit ng panahon"
+msgstr "Guhit ng panahon ng tahanan ni %s"
+
+#. TRANS: %s is user nickname.
+#. TRANS: Feed title.
+#. TRANS: %s is tagger's nickname.
+#, php-format
+msgid "Feed for friends of %s (Activity Streams JSON)"
+msgstr "Pakain para sa mga kaibigan ni %s (Activity Streams JSON)"
 
 #. TRANS: %s is user nickname.
 #, php-format
@@ -313,7 +297,7 @@ msgstr ""
 "balangkas o [magpaskil ng bagay sa kanila] (%%%%action.newnotice%%%%?"
 "status_textarea=%3$s)."
 
-#. TRANS: Encoutagement displayed on empty timeline user pages for anonymous users.
+#. TRANS: Encouragement displayed on empty timeline user pages for anonymous users.
 #. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
 #. TRANS: Empty list message for page with replies for a user for not logged in users.
 #. TRANS: %1$s is a user nickname. This message contains a Markdown link in the form [link text](link).
@@ -327,6 +311,12 @@ msgstr ""
 "Bakit hindi [magpatala ng isang akawnt] (%%%%action.register%%%%) at "
 "pagkaraan ay dunggulin ang %s o magpaskil ng isang pabatid sa kanila."
 
+#. TRANS: Button text for inviting more users to the StatusNet instance.
+#. TRANS: Less business/enterprise-oriented language for public sites.
+msgctxt "BUTTON"
+msgid "Send invite"
+msgstr "Magpadala ng paanyaya"
+
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Title of API timeline for a user and friends.
 #. TRANS: %s is a username.
@@ -335,8 +325,6 @@ msgstr ""
 #. TRANS: %s is a username.
 #. TRANS: Menu item title in personal group navigation menu.
 #. TRANS: %s is a username.
-#. TRANS: Menu item title in settings navigation panel.
-#. TRANS: %s is a username.
 #, php-format
 msgid "%s and friends"
 msgstr "%s at mga kaibigan"
@@ -376,7 +364,6 @@ msgstr ""
 #. TRANS: Server error thrown on database error updating SMS preferences.
 #. TRANS: Server error thrown on database error removing a registered SMS phone number.
 #. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
-#. TRANS: Server exception thrown on Profile design page when updating design settings fails.
 msgid "Could not update user."
 msgstr "Hindi maisapanahon ang tagagamit."
 
@@ -391,7 +378,6 @@ msgstr "Hindi masagip ang balangkas."
 
 #. TRANS: Client error displayed when the number of bytes in a POST request exceeds a limit.
 #. TRANS: %s is the number of bytes of the CONTENT_LENGTH.
-#. TRANS: Form validation error in design settings form. POST should remain untranslated.
 #, php-format
 msgid ""
 "The server was unable to handle that much POST data (%s byte) due to its "
@@ -406,24 +392,6 @@ msgstr[1] ""
 "Hindi nagawang mapanghawakan ng tagapaghain ang ganyang karaming dato ng "
 "PAGPAPASKIL (%s na mga byte) dahil sa pangkasalukuyang pagkakaasyos nito."
 
-#. TRANS: Client error displayed when saving design settings fails because of an empty id.
-#. TRANS: Client error displayed when saving design settings fails because of an empty result.
-#. TRANS: Client error displayed when a database error occurs inserting profile colours.
-#. TRANS: Client error displayed when a database error occurs updating profile colours.
-#. TRANS: Form validation error displayed when group design settings could not be saved because of an application issue.
-#. TRANS: Form validation error on Profile design page when saving design settings has failed.
-#. TRANS: Form validation error on Profile design page when updating design settings has failed.
-msgid "Unable to save your design settings."
-msgstr "Hindi nagawang sagipin ang mga pagtatakda mo ng disenyo."
-
-#. TRANS: Error displayed when updating design settings fails.
-#. TRANS: Client error displayed when a database error occurs updating profile colours.
-#. TRANS: Form validation error on Profile design page when updating design settings has failed.
-#. TRANS: Error message displayed if design settings could not be saved.
-#. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
-msgid "Could not update your design."
-msgstr "Hindi maisapanahon ang disenyo mo."
-
 #. TRANS: Title for Atom feed.
 msgctxt "ATOM"
 msgid "Main"
@@ -470,6 +438,20 @@ msgstr "Nabigo ang paghadlang ng tagagamit."
 msgid "Unblock user failed."
 msgstr "Nabigo ang hindi paghadlang sa tagagamit."
 
+#. TRANS: Client exception thrown when no conversation ID is given.
+msgid "No conversation ID."
+msgstr "Walang ID ng usapan."
+
+#. TRANS: Client exception thrown when referring to a non-existing conversation ID (%d).
+#, php-format
+msgid "No conversation with ID %d."
+msgstr "Walang usapan na may ID na %d."
+
+#. TRANS: Title for conversion timeline.
+msgctxt "TITLE"
+msgid "Conversation"
+msgstr "Usapan"
+
 #. TRANS: Title. %s is a user nickname.
 #, php-format
 msgid "Direct messages from %s"
@@ -516,6 +498,8 @@ msgstr ""
 "kaibigan."
 
 #. TRANS: Client error displayed trying to direct message self (403).
+#. TRANS: Client error displayed trying to send a direct message to self.
+#. TRANS: Error text shown when trying to send a direct message to self.
 msgid ""
 "Do not send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
@@ -748,7 +732,6 @@ msgstr "mga pangkat na nasa %s"
 
 #. TRANS: Client error displayed when trying to edit a group without being an admin.
 #. TRANS: Client error displayed trying to edit a group while not being a group admin.
-#. TRANS: Client error displayed trying to change group design settings without being a (group) admin.
 #. TRANS: Client error displayed when trying to change group logo settings while not being a group admin.
 msgid "You must be an admin to edit the group."
 msgstr "Dapat na isa kang tagapangasiwa upang baguhin ang pangkat."
@@ -863,7 +846,6 @@ msgstr ""
 
 #. TRANS: Client error given on when invalid data was passed through a form in the OAuth API.
 #. TRANS: Unexpected validation error on avatar upload form.
-#. TRANS: Client error displayed when the submitted form contains unexpected data.
 #. TRANS: Client error displayed submitting invalid form data for edit application.
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
 #. TRANS: Form validation error message when an unsupported argument is used.
@@ -872,7 +854,6 @@ msgstr ""
 #. TRANS: Client error when submitting a form with unexpected information.
 #. TRANS: Client error displayed when unexpected data is posted in the password recovery form.
 #. TRANS: Message given submitting a form with an unknown action in SMS settings.
-#. TRANS: Unknown form validation error in design settings form.
 msgid "Unexpected form submission."
 msgstr "Hindi inaasahang pagpapasa ng pormularyo."
 
@@ -918,7 +899,6 @@ msgstr "Akawnt"
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Field label on account registration page.
-#. TRANS: Label for nickname on user authorisation page.
 #. TRANS: Field label on group edit form.
 #. TRANS: Dropdown option for searching in profiles.
 msgid "Nickname"
@@ -1241,12 +1221,9 @@ msgstr "Dapat kang nakalagda upang makaalis mula sa isang pangkat."
 #. TRANS: Client error displayed when requesting Friends of a Friend feed for a nickname that is not a group.
 #. TRANS: Client error displayed trying to block a user from a group while specifying a non-existing group.
 #. TRANS: Client error displayed referring to a group's permalink for a non-existing group ID.
-#. TRANS: Client error displayed trying to change group design settings while providing a nickname for a non-existing group.
 #. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
 #. TRANS: Client error displayed when trying to view group members for a non-existing group.
 #. TRANS: Client error displayed when trying to view group members for an object that is not a group.
-#. TRANS: Client error displayed when trying to view group members for a non-existing group.
-#. TRANS: Client error displayed when trying to view group members for an object that is not a group.
 #. TRANS: Client error displayed when requesting a group RSS feed for group that does not exist.
 #. TRANS: Client error displayed when requesting a group RSS feed for an object that is not a group.
 #. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
@@ -1255,10 +1232,10 @@ msgstr "Dapat kang nakalagda upang makaalis mula sa isang pangkat."
 #. TRANS: Client error displayed when trying to leave a non-local group.
 #. TRANS: Client error displayed when trying to leave a non-existing group.
 #. TRANS: Client error displayed when providing an invalid group ID on the Make Admin page.
-#. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
-#. TRANS: Client error displayed if no local group with a given name was found requesting group page.
 #. TRANS: Command exception text shown when a group is requested that does not exist.
 #. TRANS: Error text shown when trying to leave a group that does not exist.
+#. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
+#. TRANS: Client error displayed if no local group with a given name was found requesting group page.
 msgid "No such group."
 msgstr "Walang ganyang pangkat."
 
@@ -1330,6 +1307,7 @@ msgid "Join request canceled."
 msgstr "Hindi itinuloy ang hiling na pagsali."
 
 #. TRANS: Client error displayed trying to approve subscription for a non-existing request.
+#. TRANS: %s is a user nickname.
 #, php-format
 msgid "%s is not in the moderation queue for your subscriptions."
 msgstr ""
@@ -1482,7 +1460,6 @@ msgstr "Walang ganyang kalakip."
 #. TRANS: Client error displayed trying to get an avatar without providing a nickname.
 #. TRANS: Client error displayed when requesting a list of blocked users for a group without providing a group nickname.
 #. TRANS: Client error displayed trying to edit a group while not proving a nickname for the group to edit.
-#. TRANS: Client error displayed trying to change group design settings without providing a group nickname.
 #. TRANS: Client error displayed when trying to change group logo settings without providing a nickname.
 #. TRANS: Client error displayed when trying to view group members without providing a group nickname.
 #. TRANS: Client error displayed when requesting a group RSS feed without providing a group nickname.
@@ -1785,6 +1762,16 @@ msgstr "Natiyak na ang tirahang \"%s\" para sa akawnt mo."
 msgid "Conversation"
 msgstr "Pag-uusap"
 
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+msgid "Conversation feed (Activity Streams JSON)"
+msgstr "Pakaing usapan para sa (Activity Streams JSON)"
+
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+msgid "Conversation feed (RSS 2.0)"
+msgstr "Pakaing usapan para sa (RSS 2.0)"
+
 #. TRANS: Title for conversation page.
 #. TRANS: Title for page that shows a notice.
 msgctxt "TITLE"
@@ -1850,8 +1837,8 @@ msgid "Enter \"%s\" to confirm that you want to delete your account."
 msgstr "Ipasok ang \"%s\" upang tiyakin na nais mong burahin ang akawnt mo."
 
 #. TRANS: Button title for user account deletion.
-msgid "Permanently delete your account"
-msgstr "Permanenteng burahin ang akawnt mo"
+msgid "Permanently delete your account."
+msgstr "Permanenteng burahin ang akawnt mo."
 
 #. TRANS: Client error displayed trying to delete an application while not logged in.
 msgid "You must be logged in to delete an application."
@@ -1998,152 +1985,6 @@ msgstr "Huwag burahin ang tagagamit na ito."
 msgid "Delete this user."
 msgstr "Burahin ang tagagamit na ito."
 
-#. TRANS: Message used as title for design settings for the site.
-msgid "Design"
-msgstr "Disenyo"
-
-#. TRANS: Instructions for design adminsitration panel.
-msgid "Design settings for this StatusNet site"
-msgstr "Mga katakdaan ng disensyo para sa sityong ito ng StatusNet"
-
-#. TRANS: Client error displayed when a logo URL does is not valid.
-msgid "Invalid logo URL."
-msgstr "Hindi katanggap-tanggap na URL ng logo."
-
-#. TRANS: Client error displayed when an SSL logo URL is invalid.
-msgid "Invalid SSL logo URL."
-msgstr "Hindi katanggap-tanggap na URL ng logo ng SSL."
-
-#. TRANS: Client error displayed when a theme is submitted through the form that is not in the theme list.
-#. TRANS: %s is the chosen unavailable theme.
-#, php-format
-msgid "Theme not available: %s."
-msgstr "Hindi makukuha ang tema: %s."
-
-#. TRANS: Fieldset legend for form to change logo.
-msgid "Change logo"
-msgstr "Baguhin ang logo"
-
-#. TRANS: Field label for StatusNet site logo.
-msgid "Site logo"
-msgstr "Logo ng sityo"
-
-#. TRANS: Field label for SSL StatusNet site logo.
-msgid "SSL logo"
-msgstr "Logo ng SSL"
-
-#. TRANS: Fieldset legend for form change StatusNet site's theme.
-msgid "Change theme"
-msgstr "Baguhin ang tema"
-
-#. TRANS: Field label for dropdown to choose site theme.
-msgid "Site theme"
-msgstr "Tema ng sityo"
-
-#. TRANS: Title for field label for dropdown to choose site theme.
-msgid "Theme for the site."
-msgstr "Tema para sa sityo."
-
-#. TRANS: Field label for uploading a cutom theme.
-msgid "Custom theme"
-msgstr "Pinasadyang tema"
-
-#. TRANS: Form instructions for uploading a cutom StatusNet theme.
-msgid "You can upload a custom StatusNet theme as a .ZIP archive."
-msgstr ""
-"Makapagkakarga kang papaitaas ng isang pinasadyang tema ng StatusNet bilang "
-"isang supnay na .ZIP."
-
-#. TRANS: Fieldset legend for theme background image.
-msgid "Change background image"
-msgstr "Baguhin ang panlikod na larawan"
-
-#. TRANS: Field label for background image on theme designer page.
-#. TRANS: Field label for background color selector.
-#. TRANS: Label on profile design page for setting a profile page background colour.
-msgid "Background"
-msgstr "Panlikurang tanawin"
-
-#. TRANS: Form guide for background image upload form on theme designer page.
-#, php-format
-msgid ""
-"You can upload a background image for the site. The maximum file size is %1"
-"$s."
-msgstr ""
-"Maaari kang makapagkargang papaitaas ng isang larawang panlikuran para sa "
-"sityo.  Ang pinakamataas na sukat ng talaksan ay %1$s."
-
-#. TRANS: Used as radio button label to add a background image.
-msgid "On"
-msgstr "Buhay"
-
-#. TRANS: Used as radio button label to not add a background image.
-msgid "Off"
-msgstr "Nakapatay"
-
-#. TRANS: Form guide for turning background image on or off on theme designer page.
-#. TRANS: Form guide for a set of radio buttons on the profile design page that will enable or disable
-#. TRANS: use of the uploaded profile image.
-msgid "Turn background image on or off."
-msgstr "Buhayin o patayin ang larawan na panglikuran."
-
-#. TRANS: Checkbox label to title background image on theme designer page.
-#. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
-msgid "Tile background image"
-msgstr "Panlikurang larawan ng tisa"
-
-#. TRANS: Fieldset legend for theme colors.
-msgid "Change colors"
-msgstr "Palitan ang mga kulay"
-
-#. TRANS: Field label for content color selector.
-#. TRANS: Label on profile design page for setting a profile page content colour.
-msgid "Content"
-msgstr "Nilalaman"
-
-#. TRANS: Field label for sidebar color selector.
-#. TRANS: Label on profile design page for setting a profile page sidebar colour.
-msgid "Sidebar"
-msgstr "Panggilid na halang"
-
-#. TRANS: Field label for text color selector.
-#. TRANS: Label on profile design page for setting a profile page text colour.
-msgid "Text"
-msgstr "Teksto"
-
-#. TRANS: Field label for link color selector.
-#. TRANS: Label on profile design page for setting a profile page links colour.
-msgid "Links"
-msgstr "Mga kawing"
-
-#. TRANS: Fieldset legend for advanced theme design settings.
-msgid "Advanced"
-msgstr "Mas masulong"
-
-#. TRANS: Field label for custom CSS.
-msgid "Custom CSS"
-msgstr "Pasadyang CSS"
-
-#. TRANS: Button text for resetting theme settings.
-msgctxt "BUTTON"
-msgid "Use defaults"
-msgstr "Gamitin ang likas na mga katakdaan"
-
-#. TRANS: Title for button for resetting theme settings.
-#. TRANS: Title for button on profile design page to reset all colour settings to default.
-msgid "Restore default designs."
-msgstr "Ibalik ang likas na nakatakdang mga disenyo."
-
-#. TRANS: Title for button for resetting theme settings.
-#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-msgid "Reset back to default."
-msgstr "Muling itakda pabalik sa likas na pagtatakda."
-
-#. TRANS: Title for button for saving theme settings.
-#. TRANS: Title for button on profile design page to save settings.
-msgid "Save design."
-msgstr "Sagipin ang disenyo."
-
 #. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
 msgid "This notice is not a favorite!"
 msgstr "Hindi isang kinagigiliwan ang pabatid na ito!"
@@ -2158,6 +1999,74 @@ msgstr "Idagdag sa mga kinagigiliwan"
 msgid "No such document \"%s\"."
 msgstr "Walang ganyang dokumentong \"%s\"."
 
+#. TRANS: Menu item in administrator navigation panel.
+#. TRANS: Menu item in default local navigation panel.
+#. TRANS: Menu item in personal group navigation menu.
+msgctxt "MENU"
+msgid "Home"
+msgstr "Tahanan"
+
+msgctxt "MENU"
+msgid "Docs"
+msgstr "Mga kasulatan"
+
+#. TRANS: Secondary navigation menu item leading to help on StatusNet.
+msgctxt "MENU"
+msgid "Help"
+msgstr "Tulong"
+
+msgid "Getting started"
+msgstr "Pagsisimula"
+
+#. TRANS: Secondary navigation menu item leading to text about StatusNet site.
+msgctxt "MENU"
+msgid "About"
+msgstr "Patungkol"
+
+msgid "About this site"
+msgstr "Patungkol sa sityong ito"
+
+#. TRANS: Secondary navigation menu item leading to Frequently Asked Questions.
+msgctxt "MENU"
+msgid "FAQ"
+msgstr "Mga malilimit na itanong"
+
+msgid "Frequently asked questions"
+msgstr "Mga madalas itanong"
+
+#. TRANS: Secondary navigation menu item leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+msgctxt "MENU"
+msgid "Contact"
+msgstr "Kaugnayan"
+
+msgid "Contact info"
+msgstr "Kabatiran sa kaugnayan"
+
+msgctxt "MENU"
+msgid "Tags"
+msgstr "Mga tatak"
+
+msgid "Using tags"
+msgstr "Paggamit ng mga tatak"
+
+#. TRANS: Menu item in default local navigation panel.
+#. TRANS: Menu item in search group navigation panel.
+#. TRANS: Menu item in local navigation menu.
+msgctxt "MENU"
+msgid "Groups"
+msgstr "Mga pangkat"
+
+msgid "Using groups"
+msgstr "Paggamit ng mga kapangkatan"
+
+msgctxt "MENU"
+msgid "API"
+msgstr "API"
+
+msgid "RESTful API"
+msgstr "MapagPAHINGAng API"
+
 #. TRANS: Title for "Edit application" form.
 #. TRANS: Form legend.
 msgid "Edit application"
@@ -2321,7 +2230,7 @@ msgstr ""
 "magtatanggal ng lahat ng umiiral na mga pagpapasipi mula rito. Nais mo pa "
 "ring magpatuloy?"
 
-#. TRANS: TRANS: Server error displayed when updating a list fails.
+#. TRANS: Server error displayed when updating a list fails.
 msgid "Could not update list."
 msgstr "Hindi maisapanahon ang talaan."
 
@@ -2641,44 +2550,6 @@ msgstr "Walang mga kalakip."
 msgid "No uploaded attachments."
 msgstr "Walang naikargang mga kalakip."
 
-#. TRANS: Client error displayed when subscribing to a remote profile and an unexpected response is received.
-msgid "Not expecting this response!"
-msgstr "Hindi inaasahan ang tugong ito!"
-
-#. TRANS: Client error displayed when subscribing to a remote profile that does not exist.
-msgid "User being listened to does not exist."
-msgstr "Hindi umiiral ang tagagamit na pinakikinggan."
-
-#. TRANS: Client error displayed when subscribing to a remote profile that is a local profile.
-#. TRANS: Client error displayed when using remote subscribe for a local entity.
-msgid "You can use the local subscription!"
-msgstr "Maaari mong gamitin ang katutubong pagpapasipi!"
-
-#. TRANS: Client error displayed when subscribing to a remote profile that is blocked form subscribing to.
-msgid "That user has blocked you from subscribing."
-msgstr "Hinadlangan ka ng tagagamit na iyan mula sa pagpapasipi."
-
-#. TRANS: Client error displayed when subscribing to a remote profile without providing an authorised token.
-msgid "You are not authorized."
-msgstr "Wala kang kapahintulutan."
-
-#. TRANS: Client error displayed when subscribing to a remote profile and conversion of the request token to access token fails.
-msgid "Could not convert request token to access token."
-msgstr ""
-"Hindi magawang baguhin ang kahalip ng kahilangan upang maging kahalip ng "
-"pagpunta."
-
-#. TRANS: Client error displayed when subscribing to a remote profile fails because of an unsupported version of the OMB protocol.
-msgid "Remote service uses unknown version of OMB protocol."
-msgstr ""
-"Gumagamit ang malayong palingkuran ng hindi nalalamang bersyon ng protokol "
-"ng OMB."
-
-#. TRANS: Server error displayed when subscribing to a remote profile fails because the remote profile could not be updated.
-#. TRANS: Exception thrown when updating a remote profile fails in OAuth store.
-msgid "Error updating remote profile."
-msgstr "Kamalian sa pagsasapanahon ng pangmalayuang balangkas."
-
 #. TRANS: Client error displayed when requesting a non-existent file.
 msgid "No such file."
 msgstr "Walang ganyang talaksan."
@@ -2769,31 +2640,6 @@ msgstr ""
 msgid "No ID."
 msgstr "Walang ID."
 
-#. TRANS: Client error displayed trying to change group design settings while not logged in.
-msgid "You must be logged in to edit a group."
-msgstr "Dapat kang nakalagda upang makapamatnugot ng isang pangkat."
-
-#. TRANS: Title group design settings page.
-msgid "Group design"
-msgstr "Disenyo ng pangkat"
-
-#. TRANS: Instructions for group design settings page.
-msgid ""
-"Customize the way your group looks with a background image and a colour "
-"palette of your choice."
-msgstr ""
-"Ipasadya ang paraan ng kaanyuan ng pangkat na may isang larawang panlikuran "
-"at isang paleta ng kulay na napili mo."
-
-#. TRANS: Form validation error displayed when group design settings could not be updated because of an application issue.
-msgid "Unable to update your design settings."
-msgstr "Hindi nagawang isapanahon ang mga pagtatakda mo ng disenyo."
-
-#. TRANS: Form text to confirm saved group design settings.
-#. TRANS: Confirmation message on Profile design page when saving design settings has succeeded.
-msgid "Design preferences saved."
-msgstr "Nasagip ang mga kagustuhan sa disenyo."
-
 #. TRANS: Title for group logo settings page.
 #. TRANS: Group logo form legend.
 msgid "Group logo"
@@ -2974,12 +2820,12 @@ msgstr "Mga katakdaan ng IM"
 #. TRANS: the order and formatting of link text and link should remain unchanged.
 #, php-format
 msgid ""
-"You can send and receive notices through instant messaging [instant messages]"
-"(%%doc.im%%). Configure your addresses and settings below."
+"You can send and receive notices through [instant messaging](%%doc.im%%). "
+"Configure your addresses and settings below."
 msgstr ""
 "Makapagpapadala at makatatanggap ka ng mga pabatid sa pamamagitan ng "
-"biglaang pagmemensahe [biglang mga mensahe](%%doc.im%%). Iayos ang mga "
-"tirahan at mga katakdaan mo sa ibaba."
+"[biglaang pagmemensahe] (%%doc.im%%). Iayos ang mga tirahan at mga katakdaan "
+"mong nasa ibaba."
 
 #. TRANS: Message given in the IM settings if IM is not enabled on the site.
 msgid "IM is not available."
@@ -3180,28 +3026,6 @@ msgstr ""
 "Gamitin ang pormularyong ito upang anyayahan ang mga kaibigan at mga "
 "kasamahan mo upang gamitin ang palingkurang ito."
 
-#. TRANS: Field label for a list of e-mail addresses.
-msgid "Email addresses"
-msgstr "Mga tirahan ng e-liham"
-
-#. TRANS: Tooltip for field label for a list of e-mail addresses.
-msgid "Addresses of friends to invite (one per line)."
-msgstr "Mga tirahan ng mga kaibigang aanyayahan (isa bawat guhit)."
-
-#. TRANS: Field label for a personal message to send to invitees.
-msgid "Personal message"
-msgstr "Personal na mensahe"
-
-#. TRANS: Tooltip for field label for a personal message to send to invitees.
-msgid "Optionally add a personal message to the invitation."
-msgstr "Maaaring idagdag o hindi ang isang mensaheng personal sa paanyaya."
-
-#. TRANS: Send button for inviting friends
-#. TRANS: Button text for sending notice.
-msgctxt "BUTTON"
-msgid "Send"
-msgstr "Ipadala"
-
 #. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral
 #. TRANS: singular 3rd-person pronoun in English. %1$s is the inviting user, $2$s is
 #. TRANS: the StatusNet sitename.
@@ -3339,12 +3163,6 @@ msgstr "URL para sa isang larawan na ipapakitang kasama ng lisensiya."
 msgid "Save license settings."
 msgstr "Sagipin ang mga katakdaan ng lisensiya."
 
-#. TRANS: Client error displayed when trying to log in while already logged in.
-#. TRANS: Client error displayed trying to use "one time password login" when already logged in.
-#. TRANS: Client error displayed when trying to register while already logged in.
-msgid "Already logged in."
-msgstr "Nakalagda na."
-
 #. TRANS: Form validation error displayed when trying to log in with incorrect credentials.
 msgid "Incorrect username or password."
 msgstr "Hindi tamang pangalan ng tagagamit o hudyat."
@@ -3363,9 +3181,8 @@ msgid "Login to site"
 msgstr "Lumagdang papasok sa pook"
 
 #. TRANS: Field label on login page.
-#, fuzzy
 msgid "Username or email address"
-msgstr "Palayaw o tirahan ng e-liham"
+msgstr "Pangalan ng tagagamit o tirahan ng e-liham"
 
 #. TRANS: Checkbox label label on login page.
 #. TRANS: Checkbox label on account registration page.
@@ -3460,6 +3277,7 @@ msgstr "Kailangan ang URL na pinagmumulan."
 msgid "Could not create application."
 msgstr "Hindi malikha ang aplikasyon."
 
+#. TRANS: Form validation error messages displayed when uploading an invalid application logo.
 msgid "Invalid image."
 msgstr "Hindi katanggap-tanggap na larawan."
 
@@ -3496,14 +3314,6 @@ msgstr "Walang nilalaman!"
 msgid "No recipient specified."
 msgstr "Walang tinukoy na tagatanggap."
 
-#. TRANS: Client error displayed trying to send a direct message to self.
-#. TRANS: Error text shown when trying to send a direct message to self.
-msgid ""
-"Don't send a message to yourself; just say it to yourself quietly instead."
-msgstr ""
-"Huwag magpadala ng isang mensahe na papunta sa sarili mo; sa halip ay "
-"sabihin lamang ito ng tahimik sa sarili mo."
-
 #. TRANS: Page title after sending a direct message.
 msgid "Message sent"
 msgstr "Naipadala na ang mensahe"
@@ -3714,6 +3524,33 @@ msgstr "Mangyaring tanging mga URL ng %s lamang sa ibabaw ng lantad na HTTP."
 msgid "Not a supported data format."
 msgstr "Isang hindi tinatangkilik na anyo ng dato."
 
+#. TRANS: Page title for profile settings.
+msgid "Old school UI settings"
+msgstr "Mga katakdaan ng UI sa dating kaparaanan"
+
+#. TRANS: Usage instructions for profile settings.
+msgid "If you like it \"the old way\", you can set that here."
+msgstr "Kung gusto mo \"ang dating paraan\", maitatakda mo iyan dito."
+
+#. TRANS: Confirmation shown when user profile settings are saved.
+#. TRANS: Message after successful saving of administrative settings.
+msgid "Settings saved."
+msgstr "Nasagip ang mga katakdaan."
+
+msgid "Only stream mode (no conversations) in timelines"
+msgstr "Kalakarang pangdaloy lang (walang usapan) sa mga guhit ng panahon"
+
+msgid "Show conversation page as hierarchical trees"
+msgstr "Ipakita ang pahina ng usapan bilang mga puno na panghirarkiya"
+
+msgid "Show nicknames (not full names) in timelines"
+msgstr ""
+"Ipakita ang mga bansag (hindi buong mga pangalan) sa mga guhit ng panahon"
+
+#. TRANS: Button text to save a list.
+msgid "Save"
+msgstr "Sagipin"
+
 #. TRANS: ShortName in the OpenSearch interface when trying to find users.
 msgid "People Search"
 msgstr "Paghahanap ng mga Tao"
@@ -3722,6 +3559,11 @@ msgstr "Paghahanap ng mga Tao"
 msgid "Notice Search"
 msgstr "Paghahanap ng mga Pabatid"
 
+#. TRANS: Client error displayed trying to use "one time password login" when already logged in.
+#. TRANS: Client error displayed when trying to register while already logged in.
+msgid "Already logged in."
+msgstr "Nakalagda na."
+
 #. TRANS: Client error displayed trying to use "one time password login" without specifying a user.
 msgid "No user ID specified."
 msgstr "Walang tinukoy na ID ng tagagamit."
@@ -3793,7 +3635,7 @@ msgid "Confirm"
 msgstr "Pagtibayin"
 
 #. TRANS: Field title on page where to change password.
-#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
+#. TRANS: Title for field label for password reset form where the password has to be typed again.
 #. TRANS: Field title on account registration page.
 msgid "Same as password above."
 msgstr "Katulad ng hudyat na nasa itaas."
@@ -3852,12 +3694,6 @@ msgstr "Hindi mabasa ang direktoryo ng tema: %s."
 msgid "Avatar directory not writable: %s."
 msgstr "Hindi masulatan ang direktoryo ng huwaran: %s."
 
-#. TRANS: Client error in Paths admin panel.
-#. TRANS: %s is the background directory that could not be written to.
-#, php-format
-msgid "Background directory not writable: %s."
-msgstr "Hindi masulatan ang direktoryo ng panlikuran: %s."
-
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the locales directory that could not be read from.
 #, php-format
@@ -3973,31 +3809,6 @@ msgstr "Direktoryo ng huwaran"
 msgid "Directory where avatars are located."
 msgstr "Direktoryo kung saan nakalagay ang mga huwaran."
 
-#. TRANS: Fieldset legend in Paths admin panel.
-msgid "Backgrounds"
-msgstr "Mga panlikuran"
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-msgid "Server for backgrounds."
-msgstr "Tagapaghain para sa mga panlikuran."
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-msgid "Web path to backgrounds."
-msgstr "Landas ng web papunta sa mga panlikuran."
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-msgid "Server for backgrounds on SSL pages."
-msgstr "Tagapaghain para sa mga panlikuran na nasa mga pahina ng SSL."
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-msgid "Web path to backgrounds on SSL pages."
-msgstr ""
-"Landas ng web papunta sa mga panlkuran na nasa ibabaw ng mga pahina ng SSL."
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-msgid "Directory where backgrounds are located."
-msgstr "Direktoryo kung saan matatagpuan ang mga panlikuran."
-
 #. TRANS: Fieldset legens in Paths admin panel.
 msgid "Attachments"
 msgstr "Mga kalakip"
@@ -4054,8 +3865,8 @@ msgid "Server to direct SSL requests to."
 msgstr "Tagapaghain kung saan ituturo ang mga kahilingan ng SSL."
 
 #. TRANS: Button title text to store form data in the Paths admin panel.
-msgid "Save paths"
-msgstr "Sagipin ang mga landas"
+msgid "Save path settings."
+msgstr "Sagipin ang mga katakdaan ng landas."
 
 #. TRANS: Instructions for the "People search" page.
 #. TRANS: %%site.name%% is the name of the StatusNet site.
@@ -4191,15 +4002,15 @@ msgid ""
 "%%%site.name%%%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
 "blogging) service based on the Free Software [StatusNet](http://status.net/) "
 "tool. You can easily keep track of what they are doing by subscribing to the "
-"tag's timeline."
+"list's timeline."
 msgstr ""
-"Ito ay mga talaang nilikha ni **%s**. Ang mga talaan ay kung paano mo "
-"pinagpapangkat-pangkat ang magkakahalintulad na mga tao sa %%site.name%%, "
-"isang palingkuran ng [maliitang pagboblog](http://en.wikipedia.org/wiki/"
-"Micro-blogging) na nakabatay sa kasangkapan ng Malayang Sopwer na [StatusNet]"
-"(http://status.net/). Kaya't maginhawa mong masusubaybayan ang kung ano ang "
-"kanilang ginagawa sa pamamagitan ng pagpapatanggap ng mga sipi sa guhit ng "
-"panahon ng tatak."
+"Ito ay mga talang nilikha ni **%s**. Ang mga tala ay kung paano mo "
+"pinagpapangkat-pangkat ang magkakahalintulad na mga tao sa %%%%site.name%%%"
+"%, isang palingkuran ng [maliitang pagboblog] (http://en.wikipedia.org/wiki/"
+"Micro-blogging) na nakabatay sa kasangkapan ng Malayang Sopwer na "
+"[StatusNet]  (http://status.net/). Maginhawa mong masusubaybayan ang kung "
+"ano ang kanilang ginagawa sa pamamagitan ng pagpapasipi ng guhit ng panahon "
+"ng tala."
 
 #. TRANS: Message displayed on page that displays lists by a user when there are none.
 #. TRANS: This message contains Markdown links in the form [description](links).
@@ -4228,15 +4039,14 @@ msgid ""
 "site.name%%%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
 "blogging) service based on the Free Software [StatusNet](http://status.net/) "
 "tool. You can easily keep track of what they are doing by subscribing to the "
-"tag's timeline."
+"list's timeline."
 msgstr ""
-"Ito ay mga talaan para sa **%s**. Ang mga talaan ay kung paano mo "
-"pinagpapangkat-pangkat ang magkakahalintulad na mga tao sa %%site.name%%, "
-"isang palingkuran ng [maliitang pagboblog](http://en.wikipedia.org/wiki/"
-"Micro-blogging) na nakabatay sa kasangkapan ng Malayang Sopwer na [StatusNet]"
-"(http://status.net/). Kaya't maginhawa mong masusubaybayan ang kung ano ang "
-"kanilang ginagawa sa pamamagitan ng pagpapatanggap ng mga sipi sa guhit ng "
-"panahon ng tatak."
+"Ito ay mga tala para sa **%s**. Ang mga tala ay kung paano mo pinagpapangkat-"
+"pangkat ang magkakahalintulad na mga tao sa %%%%site.name%%%%, isang "
+"palingkuran ng [maliitang pagboblog] (http://en.wikipedia.org/wiki/Micro-"
+"blogging) na nakabatay sa kasangkapan ng Malayang Sopwer na [StatusNet] "
+"(http://status.net/). Maginhawa mong masusubaybayan ang kung ano ang "
+"kanilang ginagawa sa pamamagitan ng pagpapasipi ng guhit ng panahon ng tala."
 
 #. TRANS: Message displayed on page that displays lists a user was added to when there are none.
 #. TRANS: This message contains Markdown links in the form [description](links).
@@ -4340,18 +4150,6 @@ msgstr ""
 "Hindi pinagagana ang lahat ng likas na nakatakdang mga pampasak mula sa "
 "talaksan ng pagkakaayos ng sityo."
 
-#. TRANS: Client error displayed if the notice posted has too many characters.
-msgid "Invalid notice content."
-msgstr "Hindi katanggap-tanggap na nilalaman ng pabatid."
-
-#. TRANS: Exception thrown if a notice's license is not compatible with the StatusNet site license.
-#. TRANS: %1$s is the notice license, %2$s is the StatusNet site's license.
-#, php-format
-msgid "Notice license \"%1$s\" is not compatible with site license \"%2$s\"."
-msgstr ""
-"Hindi akma ang lisensiyang \"%1$s\" ng pabatid sa lisensiyang \"%2$s\" ng "
-"sityo."
-
 #. TRANS: Client error displayed when trying to add an unindentified field to profile.
 #. TRANS: %s is a field name.
 #, php-format
@@ -4451,6 +4249,8 @@ msgstr ""
 "pabatid"
 
 #. TRANS: Field label in form for profile settings.
+#. TRANS: Title for group tag cloud section.
+#. TRANS: %s is a group name.
 msgid "Tags"
 msgstr "Mga tatak"
 
@@ -4480,10 +4280,10 @@ msgstr "Anong sona ng oras ka pangkaraniwang nakapaloob?"
 
 #. TRANS: Checkbox label in form for profile settings.
 msgid ""
-"Automatically subscribe to whoever subscribes to me (best for non-humans)."
+"Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr ""
-"Kusang magpasipi sa kung sino ang nagpapasipi sa akin (pinakamahusay sa mga "
-"hindi tao)."
+"Kusang magpasipi ng kung sino ang nagpapasipi mula sa akin (pinakamahusay "
+"para sa mga hindi tao)"
 
 #. TRANS: Dropdown field label on profile settings, for what policies to apply when someone else tries to subscribe to your updates.
 msgid "Subscription policy"
@@ -4552,11 +4352,6 @@ msgstr "Hindi masagip ang nais sa kinalalagyan."
 msgid "Could not save tags."
 msgstr "Hindi masagip ang mga tatak."
 
-#. TRANS: Confirmation shown when user profile settings are saved.
-#. TRANS: Message after successful saving of administrative settings.
-msgid "Settings saved."
-msgstr "Nasagip ang mga katakdaan."
-
 #. TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
 #. TRANS: Page title for page where a user account can be restored from backup.
 msgid "Restore account"
@@ -4569,8 +4364,8 @@ msgid "Beyond the page limit (%s)."
 msgstr "Lampas sa haggahan ng pahina (%s)."
 
 #. TRANS: Server error displayed when a public timeline cannot be retrieved.
-msgid "Could not retrieve public stream."
-msgstr "Hindi makuhang muli ang pangmadlang batis."
+msgid "Could not retrieve public timeline."
+msgstr "Hindi mabawi ang pangmadlang guhit ng panahon."
 
 #. TRANS: Title for all public timeline pages but the first.
 #. TRANS: %d is the page number.
@@ -4584,16 +4379,20 @@ msgid "Public timeline"
 msgstr "Pangmadlang guhit ng panahon"
 
 #. TRANS: Link description for public timeline feed.
-msgid "Public Stream Feed (RSS 1.0)"
-msgstr "Pasubo ng Pangmadlang Batis (RSS 1.0)"
+msgid "Public Timeline Feed (Activity Streams JSON)"
+msgstr "Pakain ng Pangmadlang Guhit ng Panahon (Mga Batis ng Gawain ng JSON)"
 
 #. TRANS: Link description for public timeline feed.
-msgid "Public Stream Feed (RSS 2.0)"
-msgstr "Pasubo ng Pangmadlang Batis (RSS 2.0)"
+msgid "Public Timeline Feed (RSS 1.0)"
+msgstr "Pakain ng Pangmadlang Guhit ng Panahon (RSS 1.0)"
 
 #. TRANS: Link description for public timeline feed.
-msgid "Public Stream Feed (Atom)"
-msgstr "Pasubo ng Pangmadlang Batis (Atom)"
+msgid "Public Timeline Feed (RSS 2.0)"
+msgstr "Pakain ng Pangmadlang Guhit ng Panahon (RSS 2.0)"
+
+#. TRANS: Link description for public timeline feed.
+msgid "Public Timeline Feed (Atom)"
+msgstr "Pakain ng Pangmadlang Guhit ng Panahon (Atom)"
 
 #. TRANS: Text displayed for public feed when there are no public notices.
 #, php-format
@@ -4644,47 +4443,6 @@ msgstr ""
 "en.wikipedia.org/wiki/Micro-blogging) na nakabatay sa kasangkapan ng "
 "Malayang Sopwer na [StatusNet](http://status.net/)."
 
-#. TRANS: Title for page with public list cloud.
-msgid "Public list cloud"
-msgstr "Ulap ng pangmadlang talaan"
-
-#. TRANS: Page notice for page with public list cloud.
-#. TRANS: %s is a StatusNet sitename.
-#, php-format
-msgid "These are largest lists on %s"
-msgstr "Ito ang mga pinakamalaking mga talaan sa %s"
-
-#. TRANS: Empty list message on page with public list cloud.
-#. TRANS: This message contains Markdown links in the form [description](link).
-#, php-format
-msgid "No one has [listed](%%doc.tags%%) anyone yet."
-msgstr "Wala pang [nagtatala](%%doc.tags%%) ng sinuman."
-
-#. TRANS: Additional empty list message on page with public list cloud for logged in users.
-msgid "Be the first to list someone!"
-msgstr "Maging pinakauna sa pagtatala ng isang tao!"
-
-#. TRANS: Additional empty list message on page with public list cloud for anonymous users.
-#. TRANS: This message contains Markdown links in the form [description](link).
-#, php-format
-msgid ""
-"Why not [register an account](%%action.register%%) and be the first to list "
-"someone!"
-msgstr ""
-"Bakit hindi [magpatala ng isang akawnt] (%%action.register%%) at maging "
-"pinakauna sa pagtatala ng isang tao!"
-
-#. TRANS: DT element on on page with public list cloud.
-msgid "List cloud"
-msgstr "Itala ang ulap"
-
-#. TRANS: Link title for number of listed people. %d is the number of listed people.
-#, php-format
-msgid "1 person listed"
-msgid_plural "%d people listed"
-msgstr[0] "1 taong naitala"
-msgstr[1] "%d mga taong naitala"
-
 #. TRANS: Public RSS feed description. %s is the StatusNet site name.
 #, php-format
 msgid "%s updates from everyone."
@@ -4812,7 +4570,6 @@ msgid "6 or more characters, and do not forget it!"
 msgstr "6 o mahigit pang mga panitik, at huwag itong kalimutan!"
 
 #. TRANS: Button text for password reset form.
-#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
 msgctxt "BUTTON"
 msgid "Reset"
 msgstr "Itakdang muli"
@@ -4821,19 +4578,6 @@ msgstr "Itakdang muli"
 msgid "Enter a nickname or email address."
 msgstr "Magpasok ng isang palayaw o tirahan ng e-liham."
 
-#. TRANS: Information on password recovery form if no known username or e-mail address was specified.
-msgid "No user with that email address or username."
-msgstr ""
-"Walang tagagamit na may ganyang tirahan ng e-liham o pangalan ng tagagamit."
-
-#. TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.
-msgid "No registered email address for that user."
-msgstr "Walang nakatalang tirahan ng e-liham para sa ganyang tagagamit."
-
-#. TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.
-msgid "Error saving address confirmation."
-msgstr "Kamalian sa pagsagip ng pagtitiyak ng tirahan."
-
 #. TRANS: User notification after an e-mail with instructions was sent from the password recovery form.
 msgid ""
 "Instructions for recovering your password have been sent to the email "
@@ -5021,77 +4765,6 @@ msgstr ""
 "ng ilang mga sandali, na may mga panuto kung paano titiyakin ang tirahan mo "
 "ng e-liham.)"
 
-#. TRANS: Page notice for remote subscribe. This message contains Markdown links.
-#. TRANS: Ensure to keep the correct markup of [link description](link).
-#, 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 ""
-"Upang makapagpasipi, maaari kang [lumagda](%%action.login%%), o [magpatala](%"
-"%action.register%%) ng isang bagong akawnt. Kung mayroon ka nang isang "
-"akawnt sa isang [kaakmang sityo ng maliitang pagboblog](%%doc.openmublog%"
-"%),  ipasok ang URL mo ng balangkas sa ibaba."
-
-#. TRANS: Page title for Remote subscribe.
-msgid "Remote subscribe"
-msgstr "Magpasipi ng malayo"
-
-#. TRANS: Field legend on page for remote subscribe.
-msgid "Subscribe to a remote user"
-msgstr "Magpasipi mula sa isang malayong tagagamit"
-
-#. TRANS: Field label on page for remote subscribe.
-msgid "User nickname"
-msgstr "Palayaw ng tagagamit"
-
-#. TRANS: Field title on page for remote subscribe.
-msgid "Nickname of the user you want to follow."
-msgstr "Palayaw ng tagagamit na nais mong sundan."
-
-#. TRANS: Field label on page for remote subscribe.
-msgid "Profile URL"
-msgstr "URL ng balangkas"
-
-#. TRANS: Field title on page for remote subscribe.
-msgid "URL of your profile on another compatible microblogging service."
-msgstr ""
-"URL ng balangkas mo sa ibang kaakmang palingkuran ng maliitang pagboblog."
-
-#. TRANS: Button text on page for remote subscribe.
-#. TRANS: Link text for link that will subscribe to a remote profile.
-#. TRANS: Button text to subscribe to a user.
-#. TRANS: Button text for subscribing to a list.
-msgctxt "BUTTON"
-msgid "Subscribe"
-msgstr "Pumayag na tumanggap ng sipi"
-
-#. TRANS: Form validation error on page for remote subscribe when an invalid profile URL was provided.
-msgid "Invalid profile URL (bad format)."
-msgstr "Hindi katanggap-tanggap na URL ng balangkas (masamang anyo)."
-
-#. TRANS: Form validation error on page for remote subscribe when no the provided profile URL
-#. TRANS: does not contain expected data.
-msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
-msgstr ""
-"Isang hindi katanggap-tanggap na URL ng balangkas (walang binigyang "
-"kahulugan na kasulatang YADIS o hindi katanggap-tanggap na XRDS)."
-
-#. TRANS: Form validation error on page for remote subscribe.
-msgid "That is a local profile! Login to subscribe."
-msgstr "Iyan ay isang katutubong balangkas! Lumagda upang makapagpasipi."
-
-#. TRANS: Form validation error on page for remote subscribe when the remote service is not providing a request token.
-msgid "Could not get a request token."
-msgstr "Hindi makakuha ng isang kahalip ng kahilingan."
-
-#. TRANS: Client error displayed when trying to (un)list an OMB 0.1 remote profile.
-msgid "You cannot (un)list an OMB 0.1 remote profile with this action."
-msgstr ""
-"Hindi mo (hindi) maitatala ang isang malayong balangkas ng OMB 0.1 sa "
-"pamamagitan ng ganitong galaw."
-
 #. TRANS: Client error displayed when an unknown error occurs while delisting a user.
 #. TRANS: %s is a username.
 #, php-format
@@ -5149,6 +4822,12 @@ msgstr "Mga tugon kay %s"
 msgid "Replies to %1$s, page %2$d"
 msgstr "Mga tugon kay %1$s, pahina %2$d"
 
+#. TRANS: Link for feed with replies for a user.
+#. TRANS: %s is a user nickname.
+#, php-format
+msgid "Replies feed for %s (Activity Streams JSON)"
+msgstr "Pakain ng mga tugon para sa %s (Mga Batis ng Gawain ng JSON)"
+
 #. TRANS: Link for feed with replies for a user.
 #. TRANS: %s is a user nickname.
 #, php-format
@@ -5276,11 +4955,11 @@ msgstr ""
 
 #. TRANS: Form instructions for feed restore.
 msgid ""
-"You can upload a backed-up stream in <a href=\"http://activitystrea.ms/"
+"You can upload a backed-up timeline in <a href=\"http://activitystrea.ms/"
 "\">Activity Streams</a> format."
 msgstr ""
-"Makapagkakarga ka ng isang pamalit na kopya ng batis na nasa anyong <a href="
-"\"http://activitystrea.ms/\">Mga Batis ng Gawain</a>."
+"Makapagkakarga kang paitaas ng isang may reserbang kopyang guhit ng panahon "
+"na nasa anyong <a href=\"http://activitystrea.ms/\">Mga Batis ng Gawain</a>."
 
 #. TRANS: Title for submit button to confirm upload of a user backup file for account restore.
 msgid "Upload the file"
@@ -5397,6 +5076,26 @@ msgstr "Muling itakda ang susi at lihim"
 msgid "Application info"
 msgstr "Kabatiran sa aplikasyon"
 
+#. TRANS: Field label on application page.
+msgid "Consumer key"
+msgstr "Susi ng tagaubos"
+
+#. TRANS: Field label on application page.
+msgid "Consumer secret"
+msgstr "Lihim ng tagaubos"
+
+#. TRANS: Field label on application page.
+msgid "Request token URL"
+msgstr "URL ng kahalip ng kahilingan"
+
+#. TRANS: Field label on application page.
+msgid "Access token URL"
+msgstr "URL ng kahalip ng pagpapapunta"
+
+#. TRANS: Field label on application page.
+msgid "Authorize URL"
+msgstr "Payagan ang URL"
+
 #. TRANS: Note on the OAuth application page about signature support.
 msgid ""
 "Note: HMAC-SHA1 signatures are supported. The plaintext signature method is "
@@ -5421,6 +5120,11 @@ msgstr "Mga pabatid na kinagigiliwan ni %1$s, pahina %2$d"
 msgid "Could not retrieve favorite notices."
 msgstr "Hindi makuhang muli ang kinagigiliwang mga pabatid."
 
+#. TRANS: Feed link text. %s is a username.
+#, php-format
+msgid "Feed for favorites of %s (Activity Streams JSON)"
+msgstr "Pakain para sa mga kinagigiliwan ni %s (Mga Batis ng Gawain ng JSON)"
+
 #. TRANS: Feed link text. %s is a username.
 #, php-format
 msgid "Feed for favorites of %s (RSS 1.0)"
@@ -5485,6 +5189,11 @@ msgstr "Pangkat ng %s"
 msgid "%1$s group, page %2$d"
 msgstr "Pangkat na %1$s, pahina %2$d"
 
+#. TRANS: Tooltip for feed link. %s is a group nickname.
+#, php-format
+msgid "Notice feed for %s group (Activity Streams JSON)"
+msgstr "Pakaing pabatid para sa pangkat ng %s (Mga Batis ng Gawain ng JSON)"
+
 #. TRANS: Tooltip for feed link. %s is a group nickname.
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
@@ -5505,42 +5214,8 @@ msgstr "Pasubong pabatid para sa pangkat na %s (Atom)"
 msgid "FOAF for %s group"
 msgstr "FOAF para sa pangkat na %s"
 
-#. TRANS: Header for mini list of group members on a group page (h2).
-msgid "Members"
-msgstr "Mga kasapi"
-
-#. TRANS: Description for mini list of group members on a group page when the group has no members.
-#. TRANS: Content of "Listed" page if there are no listed users.
-#. TRANS: Content of "People following tag x" if there are no subscribed users.
-#. TRANS: Empty list message for tags.
-#. TRANS: Text for user subscription statistics if the user has no subscriptions.
-#. TRANS: Text for user subscriber statistics if user has no subscribers.
-#. TRANS: Text for user user group membership statistics if user is not a member of any group.
-#. TRANS: Default content for section/sidebar widget.
-msgid "(None)"
-msgstr "(Wala)"
-
-#. TRANS: Link to all group members from mini list of group members if group has more than n members.
-msgid "All members"
-msgstr "Lahat ng mga kasapi"
-
-#. TRANS: Header for group statistics on a group page (h2).
-#. TRANS: H2 text for user statistics.
-msgid "Statistics"
-msgstr "Estadistika"
-
-#. TRANS: Label for group creation date.
-msgctxt "LABEL"
-msgid "Created"
-msgstr "Nalikha na"
-
-#. TRANS: Label for member count in statistics on group page.
-msgctxt "LABEL"
-msgid "Members"
-msgstr "Mga kasapi"
-
 #. TRANS: Notice on group pages for anonymous users for StatusNet sites that accept new registrations.
-#. TRANS: **%s** is the group alias, %%%%site.name%%%% is the site name,
+#. TRANS: %s is the group name, %%%%site.name%%%% is the site name,
 #. TRANS: %%%%action.register%%%% is the URL for registration, %%%%doc.help%%%% is a URL to help.
 #. TRANS: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
 #, php-format
@@ -5560,25 +5235,20 @@ msgstr ""
 "iba! ([Magbasa pa ng marami](%%%%doc.help%%%%))"
 
 #. TRANS: Notice on group pages for anonymous users for StatusNet sites that accept no new registrations.
-#. TRANS: **%s** is the group alias, %%%%site.name%%%% is the site name,
+#. TRANS: %s is the group name, %%%%site.name%%%% is the site name,
 #. TRANS: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
 "wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
 "[StatusNet](http://status.net/) tool. Its members share short messages about "
-"their life and interests. "
+"their life and interests."
 msgstr ""
-"Ang **%s** ay isang pangkat ng tagagamit sa %%%%site.name%%%%, isang "
-"palingkuran ng [maliitang pagboblog](http://en.wikipedia.org/wiki/Micro-"
-"blogging) na nakabatay sa kasangkapan ng Malayang Sopwer na [StatusNet]"
+"Ang **%s** ay isang pangkat ng tagagamit na nasa %%%%site.name%%%%, isang "
+"palingkuran ng [maliitang pagboblog] (http://en.wikipedia.org/wiki/Micro-"
+"blogging) na nakabatay sa kasangkapan ng Malayang Sopwer na [StatusNet] "
 "(http://status.net/). Ang mga kasapi nito ay nagbabahagi ng maiikling mga "
-"mensahe tungkol sa kanilang buhay at mga hilig. "
-
-#. TRANS: Title for list of group administrators on a group page.
-msgctxt "TITLE"
-msgid "Admins"
-msgstr "Mga tagapangasiwa"
+"mensaheng patungkol sa kanilang buhay at mga kahiligan."
 
 #. TRANS: Client error displayed requesting a single message that does not exist.
 msgid "No such message."
@@ -5677,9 +5347,21 @@ msgstr ""
 "magsimulang sundan ang guhit ng panahong ito!"
 
 #. TRANS: Header on show list page.
+#. TRANS: Link description for link to list of users tagged with a tag (so part of a list).
 msgid "Listed"
 msgstr "Naitala na"
 
+#. TRANS: Content of "Listed" page if there are no listed users.
+#. TRANS: Content of "People following tag x" if there are no subscribed users.
+#. TRANS: Description for mini list of group members on a group page when the group has no members.
+#. TRANS: Empty list message for tags.
+#. TRANS: Text for user subscription statistics if the user has no subscriptions.
+#. TRANS: Text for user subscriber statistics if user has no subscribers.
+#. TRANS: Text for user user group membership statistics if user is not a member of any group.
+#. TRANS: Default content for section/sidebar widget.
+msgid "(None)"
+msgstr "(Wala)"
+
 #. TRANS: Link for more "People in list x by a user"
 #. TRANS: if there are more than the mini list's maximum.
 msgid "Show all"
@@ -5690,24 +5372,19 @@ msgstr "Ipakitang lahat"
 msgid "Subscribers"
 msgstr "Mga nagpapasipi"
 
-#. TRANS: Link for more "People following tag x"
-#. TRANS: if there are more than the mini list's maximum.
-msgid "All subscribers"
-msgstr "Lahat ng mga nagpapasipi"
-
-#. TRANS: Page title showing tagged notices in one user's stream.
+#. TRANS: Page title showing tagged notices in one user's timeline.
 #. TRANS: %1$s is the username, %2$s is the hash tag.
 #, php-format
 msgid "Notices by %1$s tagged %2$s"
 msgstr "Mga pabatid ni %1$s na natatakan ng %2$s"
 
-#. TRANS: Page title showing tagged notices in one user's stream.
+#. TRANS: Page title showing tagged notices in one user's timeline.
 #. TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number.
 #, php-format
 msgid "Notices by %1$s tagged %2$s, page %3$d"
 msgstr "Mga pabatid ni %1$s na tinatakan ng %2$s, pahina %3$d"
 
-#. TRANS: Extended page title showing tagged notices in one user's stream.
+#. TRANS: Extended page title showing tagged notices in one user's timeline.
 #. TRANS: %1$s is the username, %2$d is the page number.
 #, php-format
 msgid "Notices by %1$s, page %2$d"
@@ -5719,6 +5396,12 @@ msgstr "Mga pabatid ni %1$s, pahina %2$d"
 msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
 msgstr "Pasubong pabatid para kay %1$s na tinatakan ng %2$s (RSS 1.0)"
 
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#, php-format
+msgid "Notice feed for %s (Activity Streams JSON)"
+msgstr "Pakaing pabatid para sa %s (Mga Batis ng Gawain ng JSON)"
+
 #. TRANS: Title for link to notice feed.
 #. TRANS: %s is a user nickname.
 #, php-format
@@ -5743,7 +5426,7 @@ msgstr "Pasubong pabatid para sa %s (Atom)"
 msgid "FOAF for %s"
 msgstr "FOAF para sa %s"
 
-#. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
+#. TRANS: First sentence of empty list message for a timeline. $1%s is a user nickname.
 #, php-format
 msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
 msgstr ""
@@ -5759,7 +5442,7 @@ msgstr ""
 "Hindi ka pa nagpapaskil ng anumang mga pabatid, ngayon na ang isang mabuting "
 "panahon upang magsimula :)"
 
-#. TRANS: Second sentence of empty  list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
+#. TRANS: Second sentence of empty  list message for a non-self timeline. %1$s is a user nickname, %2$s is a part of a URL.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
 #, php-format
 msgid ""
@@ -5769,7 +5452,7 @@ msgstr ""
 "Maaari mong subukang dunggulin si %1$s o [magpaskil ng isang bagay sa kanila]"
 "(%%%%action.newnotice%%%%?status_textarea=%2$s)."
 
-#. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
+#. TRANS: Announcement for anonymous users showing a timeline if site registrations are open.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
 #, php-format
 msgid ""
@@ -5785,18 +5468,18 @@ msgstr ""
 "pabatid ng **%s** at marami pang iba! ([Magbasa pa ng marami](%%%%doc.help%%%"
 "%))"
 
-#. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
+#. TRANS: Announcement for anonymous users showing a timeline if site registrations are closed or invite only.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
 "wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
-"[StatusNet](http://status.net/) tool. "
+"[StatusNet](http://status.net/) tool."
 msgstr ""
-"Si **%s** ay may isang akawnt sa %%%%site.name%%%%, isang palingkuran ng "
-"[maliitang pagboblog](http://en.wikipedia.org/wiki/Micro-blogging) na "
-"nakabatay sa kasangkapan ng Malayang Sopwer na [StatusNet](http://status."
-"net/). "
+"Si **%s** ay mayroong isang akawnt sa %%%%site.name%%%%, isang palingkuran "
+"ng [maliitang pagboblog] (http://en.wikipedia.org/wiki/Micro-blogging) na "
+"nakabatay sa kasangkapan ng Malayang Sopwer na [StatusNet] (http://status."
+"net/)."
 
 #. TRANS: Link to the author of a repeated notice. %s is a linked nickname.
 #, php-format
@@ -5829,6 +5512,14 @@ msgstr "Ang pangalan ng sityo ay dapat na may habang hindi sero."
 msgid "You must have a valid contact email address."
 msgstr "Dapat na mayroon ka ng isang katanggap-tanggap na tirahan ng e-liham."
 
+#. TRANS: Client error displayed when a logo URL is not valid.
+msgid "Invalid logo URL."
+msgstr "Hindi katanggap-tanggap na URL ng logo."
+
+#. TRANS: Client error displayed when a SSL logo URL is invalid.
+msgid "Invalid SSL logo URL."
+msgstr "Hindi katanggap-tanggap na URL ng logo ng SSL."
+
 #. TRANS: Client error displayed trying to save site settings with an invalid language code.
 #. TRANS: %s is the invalid language code.
 #, php-format
@@ -5904,10 +5595,11 @@ msgid "Default language"
 msgstr "Likas na nakatakdang wika"
 
 #. TRANS: Dropdown title on site settings panel.
-msgid "Site language when autodetection from browser settings is not available"
+msgid ""
+"The site language when autodetection from browser settings is not available."
 msgstr ""
-"Wika ng sityo kapag hindi makuha ang kusang pagpansin mula sa mga katakdaan "
-"ng pantingin-tingin"
+"Ang wika ng pook kapag hindi makukuha ang kusang pagpansin mula sa mga "
+"katakdaan ng pantingin-tingin."
 
 #. TRANS: Fieldset legend on site settings panel.
 msgctxt "LEGEND"
@@ -5932,9 +5624,21 @@ msgstr ""
 "Kung gaano katagal dapat na maghintay ang mga tagagamit (nasa mga segundo) "
 "upang maipaskil ulit ang katulad na bagay."
 
+#. TRANS: Fieldset legend for form to change logo.
+msgid "Logo"
+msgstr "Logo"
+
+#. TRANS: Field label for StatusNet site logo.
+msgid "Site logo"
+msgstr "Logo ng sityo"
+
+#. TRANS: Field label for SSL StatusNet site logo.
+msgid "SSL logo"
+msgstr "Logo ng SSL"
+
 #. TRANS: Button title for saving site settings.
-msgid "Save site settings"
-msgstr "Sagipin ang mga katakdaan ng sityo"
+msgid "Save the site settings."
+msgstr "Sagipin ang mga katakdaan ng pook."
 
 #. TRANS: Page title for site-wide notice tab in admin panel.
 msgid "Site Notice"
@@ -5964,7 +5668,7 @@ msgstr ""
 "Teksto ng pabatid na pambuong sityo (255 mga panitik ang pinakamataas; "
 "pinapayagan ang HTML)"
 
-#. TRANS: Title for button to save site notice in admin panel.
+#. TRANS: Button title to save site notice in admin panel.
 msgid "Save site notice."
 msgstr "Sagipin ang pabatid ng sityo."
 
@@ -6164,7 +5868,7 @@ msgstr "URL ng ulat"
 msgid "Snapshots will be sent to this URL."
 msgstr "Ang mga kuha ng kamera ay ipapadala sa URL na ito."
 
-#. TRANS: Title for button to save snapshot settings.
+#. TRANS: Button title to save snapshot settings.
 msgid "Save snapshot settings."
 msgstr "Sagipin ang mga pagtatakda sa kuha ng kamera."
 
@@ -6200,12 +5904,6 @@ msgid "A list of users awaiting approval to subscribe to you."
 msgstr ""
 "Isang tala ng mga tagagamit na naghihintay ng pagpayag upang makasipi sa iyo."
 
-#. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
-msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
-msgstr ""
-"Hindi ka maaaring magpasipi sa isang malayong balangkas ng OMB 0.1 sa "
-"pamamagitan ng galaw na ito."
-
 #. TRANS: Page title when subscription succeeded.
 msgid "Subscribed"
 msgstr "Tumatanggap na ng sipi"
@@ -6307,15 +6005,13 @@ msgid ""
 "You're not listening to anyone's notices right now, try subscribing to "
 "people you know. Try [people search](%%action.peoplesearch%%), look for "
 "members in groups you're interested in and in our [featured users](%%action."
-"featured%%). If you're a [Twitter user](%%action.twittersettings%%), you can "
-"automatically subscribe to people you already follow there."
+"featured%%)."
 msgstr ""
-"Hindi ka nakikinig sa ngayon sa mga pabatid ninuman, subukang magpasipi mula "
+"Hindi ka nakikinig sa ngayon ng mga pabatid ninuman, subukang magpasipi mula "
 "sa kakilala mong mga tao. Subukan ang [paghahanap ng mga tao](%%action."
-"peoplesearch%%), tumingin ng mga kasapi sa loob ng pangkat na makatatawag sa "
-"iyo ng pansin at sa loob ng aming [tampok na mga tagagamit](%%action.featured"
-"%%). Kung isa kang [tagagamit ng Twitter](%%action.twittersettings%%), kusa "
-"kang makapagpapasipi mula sa mga taong sinusundan mo na doon."
+"peoplesearch%%), tumingin ng mga kasapi sa loob ng pangkat na nakakatawag sa "
+"pagpansin mo at sa loob ng aming [tampok na mga tagagamit] (%%action.featured"
+"%%)."
 
 #. TRANS: Subscription list text when looking at the subscriptions for a of a user other
 #. TRANS: than the logged in user that has no subscriptions. %s is the user nickname.
@@ -6345,6 +6041,12 @@ msgstr "SMS"
 msgid "Notices tagged with %1$s, page %2$d"
 msgstr "Mga pabatid na tinatakan ng %1$s, pahina %2$d"
 
+#. TRANS: Link label for feed on "notices with tag" page.
+#. TRANS: %s is the tag the feed is for.
+#, php-format
+msgid "Notice feed for tag %s (Activity Streams JSON)"
+msgstr "Pakaing pabatid para sa tatak na %s (Mga Batis ng Gawain ng JSON)"
+
 #. TRANS: Link label for feed on "notices with tag" page.
 #. TRANS: %s is the tag the feed is for.
 #, php-format
@@ -6447,18 +6149,6 @@ msgstr "Hindi na nagpapasipi"
 msgid "%1$s unsubscribed from list %2$s by %3$s"
 msgstr "Hindi na nagpapasipi si %1$s  mula sa talaang %2$s ni %3$s"
 
-#. TRANS: Client error displayed when trying to update profile with an incompatible license.
-#. TRANS: %1$s is the license incompatible with site license %2$s.
-#. TRANS: Exception thrown when licenses are not compatible for an authorisation request.
-#. TRANS: %1$s is the license for the listenee, %2$s is the license for "this" StatusNet site.
-#, php-format
-msgid ""
-"Listenee stream license \"%1$s\" is not compatible with site license \"%2$s"
-"\"."
-msgstr ""
-"Hindi akma ang lisensiya ng agos na \"%1$s\" ng pabatid sa lisensiyang \"%2$s"
-"\" ng sityo."
-
 #. TRANS: Title of URL settings tab in profile settings.
 msgid "URL settings"
 msgstr "Mga katakdaan ng URL"
@@ -6605,155 +6295,10 @@ msgid "Whether to allow users to invite new users."
 msgstr ""
 "Kung papahintulutan ba mga tagagamit na mag-anyaya ng bagong mga tagagamit."
 
-#. TRANS: Title for button to save user settings in user admin panel.
+#. TRANS: Button title to save user settings in user admin panel.
 msgid "Save user settings."
 msgstr "Sagipin ang mga katakdaan ng tagagamit."
 
-#. TRANS: Page title.
-msgid "Authorize subscription"
-msgstr "Pahintulutan ang pagpapasipi"
-
-#. TRANS: Page notice on "Authorize subscription" page.
-msgid ""
-"Please check these details to make sure that you want to subscribe to this "
-"user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
-"click \"Reject\"."
-msgstr ""
-"Pakisuri ang mga detalyeng ito upang matiyak na nais mong magpasipi ng mga "
-"pabatid ng tagagamit na ito.  Kung hindi ka humiling na magpasipi ng mga "
-"pabatid mula kaninuman, pindutin ang \"Tanggihan\"."
-
-#. TRANS: Button text on Authorise Subscription page.
-#. TRANS: Submit button text to accept a group membership request on approve group form.
-#. TRANS: Submit button text to accept a subscription request on approve sub form.
-msgctxt "BUTTON"
-msgid "Accept"
-msgstr "Tanggapin"
-
-#. TRANS: Title for button on Authorise Subscription page.
-#. TRANS: Button title to subscribe to a user.
-msgid "Subscribe to this user."
-msgstr "Tumanggap ng pagpapasipi mula sa tagagamit na ito."
-
-#. TRANS: Button text on Authorise Subscription page.
-#. TRANS: Submit button text to reject a group membership request on approve group form.
-#. TRANS: Submit button text to reject a subscription request on approve sub form.
-msgctxt "BUTTON"
-msgid "Reject"
-msgstr "Tanggihan"
-
-#. TRANS: Title for button on Authorise Subscription page.
-msgid "Reject this subscription."
-msgstr "Tanggihan ang pagpapasiping ito."
-
-#. TRANS: Client error displayed for an empty authorisation request.
-msgid "No authorization request!"
-msgstr "Walang hiling ng pagpapahintulot!"
-
-#. TRANS: Accept message header from Authorise subscription page.
-msgid "Subscription authorized"
-msgstr "Pinahintulutan ang pagpapasipi"
-
-#. TRANS: Accept message text from Authorise subscription page.
-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 ""
-"Pinahintulutan ang pagpapasipi, ngunit walang ipinasang URL ng pagtawag na "
-"pabalik. Suriin ang panuto ng sityo para sa mga detalye kung paano "
-"papahintulutan ang pagpapasipi. Ang kahalip ng pagpapasipi mo ay:"
-
-#. TRANS: Reject message header from Authorise subscription page.
-msgid "Subscription rejected"
-msgstr "Tinanggihan ang pagpapasipi"
-
-#. TRANS: Reject message from Authorise subscription page.
-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 ""
-"Tinanggihan ang pagpapasipi, ngunit walang ipinasang URL ng pagtawag na "
-"pabalik. Suriin ang panuto ng sityo para sa mga detalye kung paano tanggihan "
-"nang buo ang pagpapasipi."
-
-#. TRANS: Exception thrown when no valid user is found for an authorisation request.
-#. TRANS: %s is a listener URI.
-#, php-format
-msgid "Listener URI \"%s\" not found here."
-msgstr "URI na \"%s\" ng tagapakinig hindi natagpuan dito."
-
-#. TRANS: Exception thrown when listenee URI is too long for an authorisation request.
-#. TRANS: %s is a listenee URI.
-#, php-format
-msgid "Listenee URI \"%s\" is too long."
-msgstr "URI na \"%s\" ng tagapakinig ay masyadong mahaba."
-
-#. TRANS: Exception thrown when listenee URI is a local user for an authorisation request.
-#. TRANS: %s is a listenee URI.
-#, php-format
-msgid "Listenee URI \"%s\" is a local user."
-msgstr "URI na \"%s\" ng tagapakinig ay isang katutubong tagagamit."
-
-#. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
-#. TRANS: %s is a profile URL.
-#, php-format
-msgid "Profile URL \"%s\" is for a local user."
-msgstr "Ang URL na \"%s\" ng balangkas ay para sa isang katutubong tagagamit."
-
-#. TRANS: Exception thrown when avatar URL is invalid for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#, php-format
-msgid "Avatar URL \"%s\" is not valid."
-msgstr "Hindi katanggap-tanggap ang URL na \"%s\" ng huwaran."
-
-#. TRANS: Exception thrown when avatar URL could not be read for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#, php-format
-msgid "Cannot read avatar URL \"%s\"."
-msgstr "Hindi mabasa ang URL na \"%s\" ng huwaran."
-
-#. TRANS: Exception thrown when avatar URL return an invalid image type for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#, php-format
-msgid "Wrong image type for avatar URL \"%s\"."
-msgstr "Maling uri ng larawan para sa URL na \"%s\" ng huwaran."
-
-#. TRANS: Title for profile design page.
-#. TRANS: Page title for profile design page.
-msgid "Profile design"
-msgstr "Disenyo ng balangkas"
-
-#. TRANS: Instructions for Profile design page.
-#. TRANS: Instructions for profile design page.
-msgid ""
-"Customize the way your profile looks with a background image and a colour "
-"palette of your choice."
-msgstr ""
-"Ipasadya ang paraan ng kaanyuan ng balangkas na may isang larawang "
-"panlikuran at isang paleta ng kulay na napili mo."
-
-#. TRANS: Succes message on Profile design page when finding an easter egg.
-msgid "Enjoy your hotdog!"
-msgstr "Masiyahan sa hotdog mo!"
-
-#. TRANS: Form legend on Profile design page.
-msgid "Design settings"
-msgstr "Mga katakdaan ng disenyo"
-
-#. TRANS: Checkbox label on Profile design page.
-msgid "View profile designs"
-msgstr "Tingnan ang mga disenyo ng balangkas"
-
-#. TRANS: Title for checkbox on Profile design page.
-msgid "Show or hide profile designs."
-msgstr "Ipakita o itago ang mga disenyo ng balangkas."
-
-#. TRANS: Form legend on Profile design page for form to choose a background image.
-msgid "Background file"
-msgstr "Talaksan ng panlikurang tanawin"
-
 #. TRANS: Page title for all but the first page of groups for a user.
 #. TRANS: %1$s is a nickname, %2$d is a page number.
 #, php-format
@@ -6796,11 +6341,11 @@ msgstr "StatusNet %s"
 #. TRANS: %1$s is the engine name (StatusNet) and %2$s is the StatusNet version.
 #, php-format
 msgid ""
-"This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, "
+"This site is powered by %1$s version %2$s, Copyright 2008-2011 StatusNet, "
 "Inc. and contributors."
 msgstr ""
-"Ang sityong ito ay binubuhay ng %1$s bersyong %2$s, Karapatang-Ari 2008-2010 "
-"StatusNet, Inc. at mga tagapag-ambag."
+"Ang pook na ito ay binubuhay ng %1$s na may bersiyong %2$s, Karapatang-Ari "
+"2008-2010 StatusNet, Inc. at mga tagapag-ambag."
 
 #. TRANS: Header for StatusNet contributors section on the version page.
 msgid "Contributors"
@@ -6815,25 +6360,26 @@ msgid ""
 "StatusNet is free software: you can redistribute it and/or modify it under "
 "the terms of the GNU Affero General Public License as published by the Free "
 "Software Foundation, either version 3 of the License, or (at your option) "
-"any later version. "
+"any later version."
 msgstr ""
 "Isang malayang sopwer ang StatusNet: maaari mo itong  ipamahaging muli at/o "
-"baguhin sa ilalim ng mga patakaran ng Lisensyang Panlahatang-Madla ng Affero "
-"ng GNU ayon sa pagkakalathala ng Pundasyon ng Malayang Sopwer, maaaring ika-"
-"3 bersyon ng Lisensiya, o (ayon sa pagpili mo) anumang bersyon sa paglaon. "
+"baguhin ito sa ilalim ng mga patakaran ng Lisensiyang Panlahatang-Madla ng "
+"Affero ng GNU ayon sa pagkakalathala ng Pundasyon ng Malayang Sopwer, "
+"maaaring ika-3 bersiyon ng Lisensiya, o (ayon sa pagpili mo) anumang "
+"bersiyon pagdaka."
 
 #. TRANS: Content part of StatusNet version page.
 msgid ""
 "This program is distributed in the hope that it will be useful, but WITHOUT "
 "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
 "FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License "
-"for more details. "
+"for more details."
 msgstr ""
-"Ang palatuntunan ay ipinamamahagi na inaaasahang magiging magagamit ito, "
-"ngunit WALANG ANUMANG PANGAKO NG KATUPARAN; na wala ring pahiwatig na "
+"Ang palatuntunang ito ay ipinamamahagi na inaaasahang magiging magagamit "
+"ito, ngunit WALANG ANUMANG PANGAKO NG KATUPARAN; na wala ring pahiwatig na "
 "pangako ng katuparan ng KAKAYAHANG MAIKALAKAL o KAANGKUPAN PAR SA ISANG "
 "TIYAK NA LAYUNIN. Tingnan ang Pangkalahatang Pangmadlang Lisensiya ng Affero "
-"ng GNU para sa marami pang mga detalye. "
+"ng GNU para sa mas marami pang mga detalye."
 
 #. TRANS: Content part of StatusNet version page.
 #. TRANS: %s is a link to the AGPL license with link description "http://www.gnu.org/licenses/agpl.html".
@@ -6889,24 +6435,34 @@ msgstr "Hindi maisagawa ang URL na '%s'"
 msgid "Robin thinks something is impossible."
 msgstr "Iniisip ni Robin na may isang bagay na hindi talaga maaaring mangyari."
 
+#. TRANS: Message used to be inserted as %2$s in  the text "No file may
+#. TRANS: be larger than %1$d byte and the file you sent was %2$s.".
+#. TRANS: %1$d is the number of bytes of an uploaded file.
+#, php-format
+msgid "%1$d byte"
+msgid_plural "%1$d bytes"
+msgstr[0] "%1$d byte"
+msgstr[1] "%1$d mga byte"
+
 #. TRANS: Message given if an upload is larger than the configured maximum.
-#. TRANS: %1$d is the byte limit for uploads, %2$d is the byte count for the uploaded file.
-#. TRANS: %1$s is used for plural.
+#. TRANS: %1$d (used for plural) is the byte limit for uploads,
+#. TRANS: %2$s is the proper form of "n bytes". This is the only ways to have
+#. TRANS: gettext support multiple plurals in the same message, unfortunately...
 #, php-format
 msgid ""
-"No file may be larger than %1$d byte and the file you sent was %2$d bytes. "
-"Try to upload a smaller version."
+"No file may be larger than %1$d byte and the file you sent was %2$s. Try to "
+"upload a smaller version."
 msgid_plural ""
-"No file may be larger than %1$d bytes and the file you sent was %2$d bytes. "
-"Try to upload a smaller version."
+"No file may be larger than %1$d bytes and the file you sent was %2$s. Try to "
+"upload a smaller version."
 msgstr[0] ""
-"Walang talaksan na maaaring maging mas malaki pa kaysa %1$d byte at ang "
-"talaksang nais mong ipadala ay %2$d mga byte. Subukang magkarga ng isang mas "
-"maliit na bersyon."
+"Walang talaksan ang maaaring maging mas malaki pa kaysa sa %1$d byte at ang "
+"talaksang ipinadala mo ay %2$s mga byte. Subukang magkargang paitaas ng "
+"isang mas maliit na bersiyon."
 msgstr[1] ""
-"Walang talaksan na maaaring maging mas malaki pa kaysa %1$d mga byte at ang "
-"talaksang nais mong ipadala ay %2$d mga byte. Subukang magkarga ng isang mas "
-"maliit na bersyon."
+"Walang talaksan ang maaaring maging mas malaki pa kaysa sa %1$d mga byte at "
+"ang talaksang ipinadala mo ay %2$s mga byte. Subukang magkargang paitaas ng "
+"isang mas maliit na bersiyon."
 
 #. TRANS: Message given if an upload would exceed user quota.
 #. TRANS: %d (number) is the user quota in bytes and is used for plural.
@@ -6980,6 +6536,11 @@ msgstr "Hindi maisapanahon ang katutubong pangkat."
 msgid "Could not create login token for %s"
 msgstr "Hindi malikha ang kahalip ng paglagdang papasok para kay %s"
 
+#. TRANS: Exception thrown when a program code class (%s) cannot be instantiated.
+#, php-format
+msgid "Cannot instantiate class %s."
+msgstr "Hindi mabigyang-halimbawa ang klaseng %s."
+
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.
 msgid "No database name or DSN found anywhere."
 msgstr ""
@@ -7142,11 +6703,11 @@ msgstr ""
 #, php-format
 msgid ""
 "You already have %1$d or more people in list %2$s, which is the maximum "
-"allowed number.Try unlisting others first."
+"allowed number. Try unlisting others first."
 msgstr ""
-"Naroroon na si %1$d o mahigit pang mga tao sa loob ng talaang %2$s, na "
-"siyang pinakamataas na pinahihintulutang bilang. Subukan munang tanggalin na "
-"sa talaan ang iba pa."
+"Mayroon ka nang %1$d o mahigit pang mga tao sa loob ng talang %2$s, na "
+"siyang pinakamataas na pinahihintulutang bilang. Subukang huwag na munang "
+"itala ang iba pa."
 
 #. TRANS: Exception thrown when inserting a list subscription in the database fails.
 msgid "Adding list subscription failed."
@@ -7165,7 +6726,6 @@ msgid "Unable to save tag."
 msgstr "Hindi nagawang sagipin ang tatak."
 
 #. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
-#. TRANS: Error message displayed to a banned user when they try to subscribe.
 msgid "You have been banned from subscribing."
 msgstr "Pinagbabawalan ka na mula sa pagpapasipi."
 
@@ -7185,10 +6745,6 @@ msgstr "Hindi nagpapasipi!"
 msgid "Could not delete self-subscription."
 msgstr "Hindi mabura ang pagpapasipi sa sarili."
 
-#. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
-msgid "Could not delete subscription OMB token."
-msgstr "Hindi mabura ang kahalip na OMB ng pagpapasipi."
-
 #. TRANS: Exception thrown when a subscription could not be deleted on the server.
 msgid "Could not delete subscription."
 msgstr "Hindi mabura ang pagpapasipi."
@@ -7226,6 +6782,19 @@ msgstr ""
 "Tinatawag ang kodigo ng pamamaraan ng isahang tagagamit kapag hindi "
 "pinagagana."
 
+#. TRANS: Information on password recovery form if no known username or e-mail address was specified.
+msgid "No user with that email address or username."
+msgstr ""
+"Walang tagagamit na may ganyang tirahan ng e-liham o pangalan ng tagagamit."
+
+#. TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.
+msgid "No registered email address for that user."
+msgstr "Walang nakatalang tirahan ng e-liham para sa ganyang tagagamit."
+
+#. TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.
+msgid "Error saving address confirmation."
+msgstr "Kamalian sa pagsagip ng pagtitiyak ng tirahan."
+
 #. TRANS: Server exception thrown when creating a group failed.
 msgid "Could not create group."
 msgstr "Hindi malikha ang pangkat."
@@ -7504,25 +7073,11 @@ msgstr "Hindi ipinatutupad ang ipakita ang Pormularyo()."
 msgid "saveSettings() not implemented."
 msgstr "Hindi ipinatutupad ang sagipin ang mga Katakdaan()."
 
-#. TRANS: Client error message thrown if design settings could not be deleted in
-#. TRANS: the admin panel Design.
-msgid "Unable to delete design setting."
-msgstr "Hindi nagawang burahin ang mga pagtatakda mo ng disenyo."
-
 #. TRANS: Header in administrator navigation panel.
-#. TRANS: Header in settings navigation panel.
 msgctxt "HEADER"
 msgid "Home"
 msgstr "Tahanan"
 
-#. TRANS: Menu item in administrator navigation panel.
-#. TRANS: Menu item in default local navigation panel.
-#. TRANS: Menu item in personal group navigation menu.
-#. TRANS: Menu item in settings navigation panel.
-msgctxt "MENU"
-msgid "Home"
-msgstr "Tahanan"
-
 #. TRANS: Header in administrator navigation panel.
 msgctxt "HEADER"
 msgid "Admin"
@@ -7537,17 +7092,6 @@ msgctxt "MENU"
 msgid "Site"
 msgstr "Sityo"
 
-#. TRANS: Menu item title in administrator navigation panel.
-msgid "Design configuration"
-msgstr "Pagkakaayos ng disenyo"
-
-#. TRANS: Menu item in administrator navigation panel.
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: Menu item in settings navigation panel.
-msgctxt "MENU"
-msgid "Design"
-msgstr "Disenyo"
-
 #. TRANS: Menu item title in administrator navigation panel.
 msgid "User configuration"
 msgstr "Pagkakaayos ng tagagamit"
@@ -7647,45 +7191,6 @@ msgstr "Walang tagagamit para sa ganyang kahalip."
 msgid "Could not authenticate you."
 msgstr "Hindi ka mapatunayan."
 
-#. TRANS: Server error displayed when trying to create an anynymous OAuth consumer.
-msgid "Could not create anonymous consumer."
-msgstr "Hindi makalikha ng hindi nagpapakilalang tagaubos."
-
-#. TRANS: Server error displayed when trying to create an anynymous OAuth application.
-msgid "Could not create anonymous OAuth application."
-msgstr "Hindi makalikha ng hindi nagpapakilalang aplikasyon ng OAuth."
-
-#. TRANS: Exception thrown when no token association could be found.
-msgid ""
-"Could not find a profile and application associated with the request token."
-msgstr ""
-"Hindi matagpuan ang isang balangkas at aplikasyon na may kaugnayan sa "
-"kahalip ng kahilingan."
-
-#. TRANS: Exception thrown when no access token can be issued.
-msgid "Could not issue access token."
-msgstr "Hindi maibigay ang kahalip ng pagpunta."
-
-#. TRANS: Exception thrown when a database error occurs.
-msgid "Database error inserting OAuth application user."
-msgstr ""
-"Kamalian ng kalipunan ng dato sa pagsisingit ng tagagamit ng aplikasyong "
-"OAuth."
-
-#. TRANS: Exception thrown when a database error occurs.
-msgid "Database error updating OAuth application user."
-msgstr ""
-"Kamalian ng kalipunan ng dato sa pagsasapanahon ng tagagamit ng aplikasyong "
-"OAuth."
-
-#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
-msgid "Tried to revoke unknown token."
-msgstr "Sinubukang bawiin ang hindi nalalamang kahalip."
-
-#. TRANS: Exception thrown when an attempt is made to remove a revoked token.
-msgid "Failed to delete revoked token."
-msgstr "Nabigo sa pagbura ng binawing kahalip."
-
 #. TRANS: Form input field label for application icon.
 msgid "Icon"
 msgstr "Kinatawang larawan"
@@ -7768,13 +7273,12 @@ msgstr ""
 "makakabasa at makakasulat"
 
 #. TRANS: Submit button title.
-msgid "Cancel"
-msgstr "Huwag ituloy"
+msgid "Cancel application changes."
+msgstr "Huwag ituloy ang mga pagbabago sa aplikasyon."
 
 #. TRANS: Submit button title.
-#. TRANS: Button text to save a list.
-msgid "Save"
-msgstr "Sagipin"
+msgid "Save application changes."
+msgstr "Sagipin ang mga pagbabago sa aplikasyon."
 
 #. TRANS: Name for an anonymous application in application list.
 msgid "Unknown application"
@@ -7809,6 +7313,18 @@ msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "Bawiin"
 
+#. TRANS: Submit button text to accept a group membership request on approve group form.
+#. TRANS: Submit button text to accept a subscription request on approve sub form.
+msgctxt "BUTTON"
+msgid "Accept"
+msgstr "Tanggapin"
+
+#. TRANS: Submit button text to reject a group membership request on approve group form.
+#. TRANS: Submit button text to reject a subscription request on approve sub form.
+msgctxt "BUTTON"
+msgid "Reject"
+msgstr "Tanggihan"
+
 #. TRANS: Atom feed exception thrown when an author element does not contain a name element.
 msgid "Author element must contain a name element."
 msgstr ""
@@ -8370,6 +7886,11 @@ msgstr "Maaaring naisin mong patakbuhin ang tagapagtalaga upang ayusin ito."
 msgid "Go to the installer."
 msgstr "Pumunta sa tagapagtalaga."
 
+#. TRANS: Header on conversation page. Hidden by default (h2).
+#. TRANS: Label for user statistics.
+msgid "Notices"
+msgstr "Mga pabatid"
+
 #. TRANS: Page title for when a database error occurs.
 msgid "Database error"
 msgstr "Kamalian sa kalipunan ng dato"
@@ -8380,13 +7901,6 @@ msgctxt "MENU"
 msgid "Public"
 msgstr "Pangmadla"
 
-#. TRANS: Menu item in default local navigation panel.
-#. TRANS: Menu item in search group navigation panel.
-#. TRANS: Menu item in local navigation menu.
-msgctxt "MENU"
-msgid "Groups"
-msgstr "Mga pangkat"
-
 #. TRANS: Menu item in default local navigation panel.
 #. TRANS: Menu item title in local navigation menu.
 msgctxt "MENU"
@@ -8402,51 +7916,12 @@ msgstr "Burahin"
 msgid "Delete this user"
 msgstr "Burahin ang tagagamit na ito"
 
-#. TRANS: Form legend of form for changing the page design.
-msgid "Change design"
-msgstr "Baguhin ang disenyo"
-
-#. TRANS: Fieldset legend on profile design page to change profile page colours.
-msgid "Change colours"
-msgstr "Baguhin ang mga kulay"
-
-#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-msgid "Use defaults"
-msgstr "Gamitin ang likas na mga katakdaan"
-
-#. TRANS: Label in form on profile design page.
-#. TRANS: Field contains file name on user's computer that could be that user's custom profile background image.
-msgid "Upload file"
-msgstr "Ikarga ang talaksan"
-
-#. TRANS: Instructions for form on profile design page.
-msgid ""
-"You can upload your personal background image. The maximum file size is 2MB."
-msgstr ""
-"Maaari mong ikargang papaitaas ang pansarili mong larawang panlikuran.  Ang "
-"pinakamataas na sukat ng talaksan ay 2MB."
-
-#. TRANS: Radio button on profile design page that will enable use of the uploaded profile image.
-msgctxt "RADIO"
-msgid "On"
-msgstr "Buhay"
-
-#. TRANS: Radio button on profile design page that will disable use of the uploaded profile image.
-msgctxt "RADIO"
-msgid "Off"
-msgstr "Patay"
-
-#. TRANS: Success message displayed if design settings were saved after clicking "Use defaults".
-msgid "Design defaults restored."
-msgstr "Naipanumbalik ang likas na mga katakdaan ng disenyo."
-
 #. TRANS: Exception. %s is an ID.
 #, php-format
 msgid "Unable to find services for %s."
 msgstr "Hindi matagpuan ang mga palingkuran para sa %s."
 
 #. TRANS: Form legend for removing the favourite status for a favourite notice.
-#. TRANS: Title for button text for removing the favourite status for a favourite notice.
 msgid "Disfavor this notice"
 msgstr "Huwag kagiliwan ang pabatid na ito"
 
@@ -8455,8 +7930,12 @@ msgctxt "BUTTON"
 msgid "Disfavor favorite"
 msgstr "Huwag kagiliwan ang kinagigiliwan"
 
+#. TRANS: Button title for removing the favourite status for a favourite notice.
+msgid "Remove this notice from your list of favorite notices."
+msgstr ""
+"Alisin ang pabatid na ito mula sa iyong lista ng kinagigiliwang mga pabatid."
+
 #. TRANS: Form legend for adding the favourite status to a notice.
-#. TRANS: Title for button text for adding the favourite status to a notice.
 msgid "Favor this notice"
 msgstr "Kagiliwan ang pabatid na ito"
 
@@ -8465,6 +7944,11 @@ msgctxt "BUTTON"
 msgid "Favor"
 msgstr "Kagiliwan"
 
+#. TRANS: Button title for adding the favourite status to a notice.
+msgid "Add this notice to your list of favorite notices."
+msgstr ""
+"Idagdag ang pabatid na ito sa iyong tala ng kinagigiliwang mga pabatid."
+
 #. TRANS: Feed type name.
 msgid "RSS 1.0"
 msgstr "RSS 1.0"
@@ -8481,6 +7965,10 @@ msgstr "Atom"
 msgid "FOAF"
 msgstr "FOAF"
 
+#. TRANS: Feed type name. See http://activitystrea.ms/
+msgid "Activity Streams"
+msgstr "Mga Daloy ng Gawain"
+
 #. TRANS: Client exception thrown when an imported feed does not have an author.
 msgid "No author in the feed."
 msgstr "Walang may-akda sa loob ng pasubo."
@@ -8512,6 +8000,27 @@ msgstr "Pumili ng isang tatak upang mapaunti ang talaan."
 msgid "Grant this user the \"%s\" role"
 msgstr "Bigyan ang tagagamit na ito ng gampaning \"%s\""
 
+#. TRANS: Header for mini list of group members on a group page (h2).
+msgid "Members"
+msgstr "Mga kasapi"
+
+#. TRANS: Link to all group members from mini list of group members if group has more than n members.
+msgid "All members"
+msgstr "Lahat ng mga kasapi"
+
+#. TRANS: Header for mini list of users with a pending membership request on a group page (h2).
+msgid "Pending"
+msgstr "Nakabinbin"
+
+#. TRANS: Header for mini list of users that are blocked in a group page (h2).
+msgid "Blocked"
+msgstr "Hinadlangan"
+
+#. TRANS: Title for list of group administrators on a group page.
+msgctxt "TITLE"
+msgid "Admins"
+msgstr "Mga tagapangasiwa"
+
 #. TRANS: Button text for the form that will block a user from a group.
 msgctxt "BUTTON"
 msgid "Block"
@@ -8519,8 +8028,9 @@ msgstr "Hadlangan"
 
 #. TRANS: Submit button title.
 msgctxt "TOOLTIP"
-msgid "Block this user"
-msgstr "Hadlangan ang tagagamit na ito"
+msgid "Block this user so that they can no longer post messages to it."
+msgstr ""
+"Harangin ang tagagamit upang hindi na sila makapagpaskil ng mga mensahe roon."
 
 #. TRANS: Field title on group edit form.
 msgid "URL of the homepage or blog of the group or topic."
@@ -8578,63 +8088,9 @@ msgctxt "GROUPADMIN"
 msgid "Admin"
 msgstr "Tagapangasiwa"
 
-#. TRANS: Menu item in the group navigation page.
-msgctxt "MENU"
-msgid "Group"
-msgstr "Pangkat"
-
-#. TRANS: Tooltip for menu item in the group navigation page.
-#. TRANS: %s is the nickname of the group.
-#, php-format
-msgctxt "TOOLTIP"
-msgid "%s group"
-msgstr "Pangkat ng %s"
-
-#. TRANS: Menu item in the group navigation page.
-msgctxt "MENU"
-msgid "Members"
-msgstr "Mga kasapi"
-
-#. TRANS: Tooltip for menu item in the group navigation page.
-#. TRANS: %s is the nickname of the group.
-#, php-format
-msgctxt "TOOLTIP"
-msgid "%s group members"
-msgstr "Mga kasapi ng pangkat na %s"
-
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: %d is the number of pending members.
-#, php-format
-msgctxt "MENU"
-msgid "Pending members (%d)"
-msgid_plural "Pending members (%d)"
-msgstr[0] "Nakabinbing mga kasapi (%d)"
-msgstr[1] "Nakabinbing mga kasapi (%d)"
-
-#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: %s is the nickname of the group.
-#, php-format
-msgctxt "TOOLTIP"
-msgid "%s pending members"
-msgstr "Nakabinbing mga kasapi ng %s"
-
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-msgctxt "MENU"
-msgid "Blocked"
-msgstr "Hinarang"
-
-#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: %s is the nickname of the group.
-#, php-format
-msgctxt "TOOLTIP"
-msgid "%s blocked users"
-msgstr "%s hinahadlangang mga tagagamit"
-
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: Menu item in primary navigation panel.
-msgctxt "MENU"
-msgid "Admin"
-msgstr "Tagapangasiwa"
+#. TRANS: Group actions header (h2). Text hidden by default.
+msgid "Group actions"
+msgstr "Mga galaw ng pangkat"
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
@@ -8643,11 +8099,6 @@ msgctxt "TOOLTIP"
 msgid "Edit %s group properties"
 msgstr "Baguhin ang mga pag-aari ng pangkat na %s"
 
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-msgctxt "MENU"
-msgid "Logo"
-msgstr "Logo"
-
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
 #, php-format
@@ -8655,16 +8106,10 @@ msgctxt "TOOLTIP"
 msgid "Add or edit %s logo"
 msgstr "Idagdag o baguhin ang logo ng %s"
 
-#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: %s is the nickname of the group.
-#, php-format
-msgctxt "TOOLTIP"
-msgid "Add or edit %s design"
-msgstr "Idagdag o baguhin ang disenyo ng %s"
-
-#. TRANS: Group actions header (h2). Text hidden by default.
-msgid "Group actions"
-msgstr "Mga galaw ng pangkat"
+#. TRANS: Link text for link on user profile.
+msgctxt "MENU"
+msgid "Logo"
+msgstr "Logo"
 
 #. TRANS: Title for groups with the most members section.
 msgid "Popular groups"
@@ -8674,11 +8119,19 @@ msgstr "Tanyag na mga pangkat"
 msgid "Active groups"
 msgstr "Masisiglang mga pangkat"
 
-#. TRANS: Title for group tag cloud section.
-#. TRANS: %s is a group name.
-#, php-format
-msgid "Tags in %s group's notices"
-msgstr "Mga tatak sa loob ng mga pabatid ng pangkat na %s"
+#. TRANS: Link description for seeing all groups.
+#. TRANS: Link description for seeing all lists.
+msgid "See all"
+msgstr "Tingnang lahat"
+
+#. TRANS: Link title for seeing all groups.
+msgid "See all groups you belong to."
+msgstr "Tingnan ang lahat ng mga pangkat na kinaaaniban mo."
+
+#. TRANS: Menu item title in personal group navigation menu.
+#. TRANS: %s is a username.
+msgid "Back to top"
+msgstr "Magbalik sa itaas"
 
 #. TRANS: Client exception 406
 msgid "This page is not available in a media type you accept"
@@ -8770,11 +8223,41 @@ msgctxt "TITLE"
 msgid "Trends"
 msgstr "Mga kalakaran"
 
-#. TRANS: Button text for inviting more users to the StatusNet instance.
+#. TRANS: Default button text for inviting more users to the StatusNet instance.
 msgctxt "BUTTON"
 msgid "Invite more colleagues"
 msgstr "Mag-anyaya ng marami pang mga kasamahan"
 
+#. TRANS: Form legend.
+msgid "Invite collegues"
+msgstr "Anyayahan ang mga kasamahan"
+
+#. TRANS: Field label for a list of e-mail addresses.
+msgid "Email addresses"
+msgstr "Mga tirahan ng e-liham"
+
+#. TRANS: Field title for a list of e-mail addresses.
+msgid "Addresses of friends to invite (one per line)."
+msgstr "Mga tirahan ng mga kaibigang aanyayahan (isa bawat guhit)."
+
+#. TRANS: Field label for a personal message to send to invitees.
+msgid "Personal message"
+msgstr "Personal na mensahe"
+
+#. TRANS: Field title for a personal message to send to invitees.
+msgid "Optionally add a personal message to the invitation."
+msgstr "Maaaring idagdag o hindi ang isang mensaheng personal sa paanyaya."
+
+#. TRANS: Send button for inviting friends
+#. TRANS: Button text for sending notice.
+msgctxt "BUTTON"
+msgid "Send"
+msgstr "Ipadala"
+
+#. TRANS: Submit button title.
+msgid "Send invitations."
+msgstr "Magpadala ng mga paanyaya."
+
 #. TRANS: Button text for joining a group.
 msgctxt "BUTTON"
 msgid "Join"
@@ -8785,6 +8268,10 @@ msgctxt "BUTTON"
 msgid "Leave"
 msgstr "Lumisan"
 
+#. TRANS: Link title for seeing all lists.
+msgid "See all lists you have created."
+msgstr "Tingnan ang lahat ng mga listahang nilikha mo."
+
 #. TRANS: Menu item for logging in to the StatusNet site.
 #. TRANS: Menu item in primary navigation panel.
 msgctxt "MENU"
@@ -8845,8 +8332,8 @@ msgstr ""
 #. TRANS: Main body of new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscriber's long name, %2$s is the StatusNet sitename.
 #, php-format
-msgid "%1$s is now listening to your notices on %2$s."
-msgstr "Nakikinig na si %1$s sa mga pabatid mo na nasa %2$s."
+msgid "%1$s is now following you on %2$s."
+msgstr "Sinusundan ka na ngayon ni %1$s sa %2$s."
 
 #. TRANS: Subject of pending new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscribing user's nickname, %2$s is the StatusNet sitename.
@@ -9074,7 +8561,7 @@ msgstr ""
 #. TRANS: Body of @-reply notification e-mail.
 #. TRANS: %1$s is the sending user's name, $2$s is the StatusNet sitename,
 #. TRANS: %3$s is a URL to the notice, %4$s is the notice text,
-#. TRANS: %5$s is a URL to the full conversion if it exists (otherwise empty),
+#. TRANS: %5$s is the text "The full conversation can be read here:" and a URL to the full conversion if it exists (otherwise empty),
 #. TRANS: %6$s is a URL to reply to the notice, %7$s is a URL to all @-replies for the addressed user,
 #, php-format
 msgid ""
@@ -9117,6 +8604,10 @@ msgstr ""
 
 #. TRANS: Subject of group join notification e-mail.
 #. TRANS: %1$s is the joining user's nickname, %2$s is the group name, and %3$s is the StatusNet sitename.
+#, php-format
+msgid "%1$s has joined your group %2$s on %3$s"
+msgstr "Sumali si %1$s sa pangkat mong %2$s na nasa %3$s."
+
 #. TRANS: Main body of group join notification e-mail.
 #. TRANS: %1$s is the subscriber's long name, %2$s is the group name, and %3$s is the StatusNet sitename,
 #. TRANS: %4$s is a block of profile info about the subscriber.
@@ -9208,8 +8699,8 @@ msgstr "Gawing Tagapangasiwa"
 
 #. TRANS: Submit button title.
 msgctxt "TOOLTIP"
-msgid "Make this user an admin"
-msgstr "Gawing isang tagapangasiwa ang tagagamit na ito"
+msgid "Make this user an admin."
+msgstr "Gawing isang tagapangasiwa ang tagagamit na ito."
 
 #. TRANS: Client exception thrown when a database error was thrown during a file upload operation.
 msgid "There was a database error while saving your file. Please try again."
@@ -9260,7 +8751,7 @@ msgstr "Magpadala ng isang tuwirang pabatid"
 msgid "Select recipient:"
 msgstr "Pumili ng tagatanggap:"
 
-#. TRANS Entry in drop-down selection box in direct-message inbox/outbox when no one is available to message.
+#. TRANS: Entry in drop-down selection box in direct-message inbox/outbox when no one is available to message.
 msgid "No mutual subscribers."
 msgstr "Walang nagbibigayang mga sumisipi."
 
@@ -9329,6 +8820,10 @@ msgstr ""
 "Dapat mong ipatupad ang iakma ang Bagay ng Talaan ng Pabatid() o ipakita ang "
 "Pabatid()."
 
+#. TRANS: Link description to show more items in a list.
+msgid "More â–¼"
+msgstr "Marami pa â–¼"
+
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 msgid "Nickname cannot be empty."
 msgstr "Hindi maaaring walang laman ang palayaw."
@@ -9379,10 +8874,6 @@ msgctxt "SEPARATOR"
 msgid ", "
 msgstr ", "
 
-#. TRANS: Start of profile addressees list.
-msgid " â–¸ "
-msgstr " â–¸ "
-
 #. TRANS: Used in coordinates as abbreviation of north.
 msgid "N"
 msgstr "H"
@@ -9421,16 +8912,16 @@ msgid "Repeated by"
 msgstr "Unulit ni"
 
 #. TRANS: Link title in notice list item to reply to a notice.
-msgid "Reply to this notice"
-msgstr "Tumugon sa pabatid na ito"
+msgid "Reply to this notice."
+msgstr "Tugunan ang pabatid na ito."
 
 #. TRANS: Link text in notice list item to reply to a notice.
 msgid "Reply"
 msgstr "Tumugon"
 
 #. TRANS: Link title in notice list item to delete a notice.
-msgid "Delete this notice"
-msgstr "Burahin ang pabatid na ito"
+msgid "Delete this notice from the timeline."
+msgstr "Burahin ang pabatid na ito mula sa guhit ng panahon."
 
 #. TRANS: Title for repeat form status in notice list when a notice has been repeated.
 msgid "Notice repeated."
@@ -9453,26 +8944,6 @@ msgstr "Dunggulin"
 msgid "Send a nudge to this user."
 msgstr "Magpadala ng isang pagdunggol sa tagagamit na ito."
 
-#. TRANS: Exception thrown when creating a new profile fails in OAuth store.
-msgid "Error inserting new profile."
-msgstr "Kamalian sa pagsisingit ng bagong balangkas."
-
-#. TRANS: Exception thrown when creating a new avatar fails in OAuth store.
-msgid "Error inserting avatar."
-msgstr "Kamalian sa pagsisingit ng huwaran."
-
-#. TRANS: Exception thrown when creating a remote profile fails in OAuth store.
-msgid "Error inserting remote profile."
-msgstr "Kamalian sa pagsisingit ng malayong balangkas."
-
-#. TRANS: Exception thrown when a notice is denied because it has been sent before.
-msgid "Duplicate notice."
-msgstr "Nagkadalawang pabatid."
-
-#. TRANS: Exception thrown when creating a new subscription fails in OAuth store.
-msgid "Could not insert new subscription."
-msgstr "Hindi maisingit ang bagong pagpapasipi."
-
 #. TRANS: Server exception thrown in oEmbed action if no API endpoint is available.
 msgid "No oEmbed API endpoint available."
 msgstr "Walang makukuhang dulong-katapusan ng API ng oEmbed."
@@ -9551,10 +9022,6 @@ msgstr "Baguhin"
 msgid "Edit %s list by you."
 msgstr "Baguhin ang talaan mong %s."
 
-#. TRANS: Link description for link to list of users tagged with a tag.
-msgid "Tagged"
-msgstr "Natatakan na"
-
 #. TRANS: Title for link to edit list settings.
 msgid "Edit list settings."
 msgstr "Baguhin ang mga katakdaan ng talaan."
@@ -9697,10 +9164,13 @@ msgctxt "plugin"
 msgid "Enable"
 msgstr "Paganahin"
 
+#. TRANS: Plugin description for a disabled plugin.
 msgctxt "plugin-description"
-msgid "(Plugin descriptions unavailable when disabled.)"
+msgid ""
+"(The plugin description is unavailable when a plugin has been disabled.)"
 msgstr ""
-"(Hindi makukuha ang mga paglalarawan ng pampasak kapag hindi gumagana.)"
+"(Hindi makuha ang mga paglalarawan ng pampasak kapag hindi gumagana ang "
+"isang pampasak.)"
 
 #. TRANS: Menu item in primary navigation panel.
 msgctxt "MENU"
@@ -9711,6 +9181,11 @@ msgstr "Mga katakdaan"
 msgid "Change your personal settings."
 msgstr "Baguhin ang pansariling mga katakdaan."
 
+#. TRANS: Menu item in primary navigation panel.
+msgctxt "MENU"
+msgid "Admin"
+msgstr "Tagapangasiwa"
+
 #. TRANS: Menu item title in primary navigation panel.
 msgid "Site configuration."
 msgstr "Pagkakaayos ng sityo."
@@ -9728,14 +9203,8 @@ msgstr "Lumabas magmula sa sityo."
 msgid "Login to the site."
 msgstr "Lumagdang papasok sa sityo."
 
-#. TRANS: Menu item in primary navigation panel.
-msgctxt "MENU"
-msgid "Search"
-msgstr "Maghanap"
-
-#. TRANS: Menu item title in primary navigation panel.
-msgid "Search the site."
-msgstr "Maghanap sa sityo."
+msgid "This profile has been silenced by site moderators"
+msgstr "Pinatahimik ng mga tagapamagitan ng pook ang balangkas na ito"
 
 #. TRANS: H2 text for user subscription statistics.
 msgid "Following"
@@ -9745,6 +9214,10 @@ msgstr "Sinusundan si"
 msgid "Followers"
 msgstr "Mga tagasunod"
 
+#. TRANS: H2 text for user statistics.
+msgid "Statistics"
+msgstr "Estadistika"
+
 #. TRANS: Label for user statistics.
 msgid "User ID"
 msgstr "ID ng tagagamit"
@@ -9753,10 +9226,6 @@ msgstr "ID ng tagagamit"
 msgid "Member since"
 msgstr "Kasapi magmula pa noong"
 
-#. TRANS: Label for user statistics.
-msgid "Notices"
-msgstr "Mga pabatid"
-
 #. TRANS: Label for user statistics.
 #. TRANS: Average count of posts made per day since account registration.
 msgid "Daily average"
@@ -9842,13 +9311,13 @@ msgid "Keyword(s)"
 msgstr "Mga susing-salita o salitang-naglalarawan (''keyword'')"
 
 #. TRANS: Button text for searching site.
+#. TRANS: Button text for search button on search form.
 #. TRANS: Button text to search profiles.
 msgctxt "BUTTON"
 msgid "Search"
 msgstr "Maghanap"
 
 #. TRANS: Standard search suggestions shown when a search does not give any results.
-#, fuzzy
 msgid ""
 "* Make sure all words are spelled correctly.\n"
 "* Try different keywords.\n"
@@ -9858,10 +9327,10 @@ msgstr ""
 "* Tiyakin na tama ang banghay ng lahat ng mga salita.\n"
 "* Sumubok ng ibang mga susing-salita.\n"
 "* Sumubok ng mas pangkalahatang mga susing-salita.\n"
-"* Sumubok ng mas kakaunting mga susing-salita.\n"
+"* Sumubok ng mas kakaunting mga susing-salita."
 
 #. TRANS: Standard search suggestions shown when a search does not give any results.
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "You can also try your search on other engines:\n"
 "\n"
@@ -9879,7 +9348,7 @@ msgstr ""
 "* [Tweet scan](http://www.tweetscan.com/indexi.php?s=%s)\n"
 "* [Google](http://www.google.com/search?q=site%%3A%%%%site.server%%%%+%s)\n"
 "* [Yahoo](http://search.yahoo.com/search?p=site%%3A%%%%site.server%%%%+%s)\n"
-"* [Collecta](http://collecta.com/#q=%s)\n"
+"* [Collecta](http://collecta.com/#q=%s)"
 
 #. TRANS: Menu item in search group navigation panel.
 msgctxt "MENU"
@@ -9903,21 +9372,6 @@ msgstr "Maghanap ng nilalaman ng mga pabatid"
 msgid "Find groups on this site"
 msgstr "Maghanap ng mga pangkat sa sityong ito"
 
-#. TRANS: Secondary navigation menu item leading to help on StatusNet.
-msgctxt "MENU"
-msgid "Help"
-msgstr "Tulong"
-
-#. TRANS: Secondary navigation menu item leading to text about StatusNet site.
-msgctxt "MENU"
-msgid "About"
-msgstr "Patungkol"
-
-#. TRANS: Secondary navigation menu item leading to Frequently Asked Questions.
-msgctxt "MENU"
-msgid "FAQ"
-msgstr "Mga malilimit na itanong"
-
 #. TRANS: Secondary navigation menu item leading to Terms of Service.
 msgctxt "MENU"
 msgid "TOS"
@@ -9938,17 +9392,6 @@ msgctxt "MENU"
 msgid "Version"
 msgstr "Bersyon"
 
-#. TRANS: Secondary navigation menu item leading to e-mail contact information on the
-#. TRANS: StatusNet site, where to report bugs, ...
-msgctxt "MENU"
-msgid "Contact"
-msgstr "Kaugnayan"
-
-#. TRANS: Secondary navigation menu item. Leads to information about embedding a timeline widget.
-msgctxt "MENU"
-msgid "Badge"
-msgstr "Tsapa"
-
 #. TRANS: Default title for section/sidebar widget.
 msgid "Untitled section"
 msgstr "Walang pamagat na seksyon"
@@ -9993,10 +9436,6 @@ msgstr "E-liham"
 msgid "Change email handling"
 msgstr "Baguhin ang paghawak sa e-liham"
 
-#. TRANS: Menu item title in settings navigation panel.
-msgid "Design your profile"
-msgstr "Magdisenyo ng balangkas mo"
-
 #. TRANS: Menu item in settings navigation panel.
 msgctxt "MENU"
 msgid "URL"
@@ -10033,6 +9472,15 @@ msgstr "Mga ugnay"
 msgid "Authorized connected applications"
 msgstr "Pinapahintulutang nakaugnay na mga aplikasyon"
 
+#. TRANS: Menu item in settings navigation panel.
+msgctxt "MENU"
+msgid "Old school"
+msgstr "Lumang paraan"
+
+#. TRANS: Menu item title in settings navigation panel.
+msgid "UI tweaks for old-school users"
+msgstr "Mga pagpingol sa UI para sa mga tagagamit ng lumang paraan"
+
 #. TRANS: Title of form to silence a user.
 msgctxt "TITLE"
 msgid "Silence"
@@ -10042,6 +9490,45 @@ msgstr "Katahimikan"
 msgid "Silence this user"
 msgstr "Patahimikin ang tagagamit na ito"
 
+#. TRANS: Server error displayed when trying to create an anynymous OAuth consumer.
+msgid "Could not create anonymous consumer."
+msgstr "Hindi makalikha ng hindi nagpapakilalang tagaubos."
+
+#. TRANS: Server error displayed when trying to create an anynymous OAuth application.
+msgid "Could not create anonymous OAuth application."
+msgstr "Hindi makalikha ng hindi nagpapakilalang aplikasyon ng OAuth."
+
+#. TRANS: Exception thrown when no token association could be found.
+msgid ""
+"Could not find a profile and application associated with the request token."
+msgstr ""
+"Hindi matagpuan ang isang balangkas at aplikasyon na may kaugnayan sa "
+"kahalip ng kahilingan."
+
+#. TRANS: Exception thrown when no access token can be issued.
+msgid "Could not issue access token."
+msgstr "Hindi maibigay ang kahalip ng pagpunta."
+
+#. TRANS: Exception thrown when a database error occurs.
+msgid "Database error inserting OAuth application user."
+msgstr ""
+"Kamalian ng kalipunan ng dato sa pagsisingit ng tagagamit ng aplikasyong "
+"OAuth."
+
+#. TRANS: Exception thrown when a database error occurs.
+msgid "Database error updating OAuth application user."
+msgstr ""
+"Kamalian ng kalipunan ng dato sa pagsasapanahon ng tagagamit ng aplikasyong "
+"OAuth."
+
+#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
+msgid "Tried to revoke unknown token."
+msgstr "Sinubukang bawiin ang hindi nalalamang kahalip."
+
+#. TRANS: Exception thrown when an attempt is made to remove a revoked token.
+msgid "Failed to delete revoked token."
+msgstr "Nabigo sa pagbura ng binawing kahalip."
+
 #. TRANS: Menu item in local navigation menu.
 msgctxt "MENU"
 msgid "Subscriptions"
@@ -10099,6 +9586,16 @@ msgstr ""
 msgid "Subscribe to this user"
 msgstr "Tagasipi sa tagagamit na ito"
 
+#. TRANS: Button text to subscribe to a user.
+#. TRANS: Button text for subscribing to a list.
+msgctxt "BUTTON"
+msgid "Subscribe"
+msgstr "Pumayag na tumanggap ng sipi"
+
+#. TRANS: Button title to subscribe to a user.
+msgid "Subscribe to this user."
+msgstr "Tumanggap ng pagpapasipi mula sa tagagamit na ito."
+
 #. TRANS: Title of personal tag cloud section.
 msgid "People Tagcloud as self-tagged"
 msgstr "Tatak ng ulap ng mga tao bilang nagtatak ng sarili"
@@ -10230,16 +9727,26 @@ msgstr[1] "Gusto ito ng %%s."
 
 #. TRANS: List message for notice repeated by logged in user.
 msgctxt "REPEATLIST"
-msgid "You have repeated this notice."
-msgstr "Inulit mo ang pabatid na ito."
+msgid "You repeated this."
+msgstr "Naulit mo ito."
 
-#. TRANS: List message for repeated notices.
-#. TRANS: %d is the number of users that have repeated a notice.
+#. TRANS: List message for when more than 4 people repeat something.
+#. TRANS: %%s is a list of users liking a notice, %d is the number over 4 that like the notice.
+#. TRANS: Plural is decided on the total number of users liking the notice (count of %%s + %d).
 #, php-format
-msgid "One person has repeated this notice."
-msgid_plural "%d people have repeated this notice."
-msgstr[0] "Isang tao ang umulit ng paunawang ito."
-msgstr[1] "%d mga tao ang umulit ng paunawang ito."
+msgid "%%s and %d other repeated this."
+msgid_plural "%%s and %d others repeated this."
+msgstr[0] "Inulit ito ng %%s at %d iba pa."
+msgstr[1] "Inulit ito ng %%s at %d mga iba pa."
+
+#. TRANS: List message for favoured notices.
+#. TRANS: %%s is a list of users liking a notice.
+#. TRANS: Plural is based on the number of of users that have favoured a notice.
+#, php-format
+msgid "%%s repeated this."
+msgid_plural "%%s repeated this."
+msgstr[0] "Inulit ito ng %%s."
+msgstr[1] "Inulit ito ng %%s."
 
 #. TRANS: Form legend.
 #, php-format
@@ -10331,7 +9838,6 @@ msgid "Unsilence this user"
 msgstr "Huwag patahimikin ang tagagamit na ito"
 
 #. TRANS: Form legend on unsubscribe form.
-#. TRANS: Button title on unsubscribe form.
 msgid "Unsubscribe from this user"
 msgstr "Huwag nang magpasipi mula sa tagagamit na ito"
 
@@ -10341,6 +9847,10 @@ msgctxt "BUTTON"
 msgid "Unsubscribe"
 msgstr "Pahintuin na ang pagtanggap ng sipi"
 
+#. TRANS: Button title on unsubscribe form.
+msgid "Unsubscribe from this user."
+msgstr "Huwag nang sumipi mula sa tagagamit na ito."
+
 #. TRANS: Exception text shown when no profile can be found for a user.
 #. TRANS: %1$s is a user nickname, $2$d is a user ID (number).
 #, php-format
@@ -10423,9 +9933,3 @@ msgstr "Hindi katanggap-tanggap na XML, nawawalang ugat ng XRD."
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr "Kinukuha ang kopyang pamalit mula sa talaksang '%s'"
-
-#~ msgid "%1$s and friends, page %2$d"
-#~ msgstr "%1$s at mga kaibigan, pahina %2$d"
-
-#~ msgid "You and friends"
-#~ msgstr "Ikaw at mga kaibigan"
diff --git a/locale/uk/LC_MESSAGES/statusnet.po b/locale/uk/LC_MESSAGES/statusnet.po
index fdae2240c4..ef5bbcf51c 100644
--- a/locale/uk/LC_MESSAGES/statusnet.po
+++ b/locale/uk/LC_MESSAGES/statusnet.po
@@ -1,8 +1,9 @@
-# Translation of StatusNet - Core to Ukrainian (Україн�ька)
+# Translation of StatusNet - Core to Ukrainian (україн�ька)
 # Exported from translatewiki.net
 #
 # Author: AS
 # Author: Boogie
+# Author: Dim Grits
 # Author: Prima klasy4na
 # Author: Те�т
 # --
@@ -12,18 +13,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:51+0000\n"
-"Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:42+0000\n"
+"Language-Team: Ukrainian <https://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
-"X-POT-Import-Date: 2011-05-05 10:52:40+0000\n"
+"X-POT-Import-Date: 2012-04-22 22:02:21+0000\n"
 
 #. TRANS: Database error message.
 #, php-format
@@ -38,14 +39,6 @@ msgstr ""
 "можете зв’�зати�� з ними на %2$s, щоби в тому упевнити�ь. В іншому випадку, "
 "зачекайте декілька хвилин і �пробуйте знову."
 
-#. TRANS: Error message.
-msgid ""
-"An important error occured, probably related to email setup. Check logfiles "
-"for more info."
-msgstr ""
-"Трапила�� важлива помилка, ймовірно, пов’�зана з налаштуванн�м електронної "
-"пошти. Перевірте файли конфігурації дл� отриманн� докладнішої інформації."
-
 #. TRANS: Error message.
 msgid "An error occurred."
 msgstr "Стала�� помилка."
@@ -108,12 +101,12 @@ msgstr "Ска�увати подальшу реє�трацію."
 msgid "Closed"
 msgstr "Закрито"
 
-#. TRANS: Title for button to save access settings in site admin panel.
-msgid "Save access settings"
+#. TRANS: Button title to save access settings in site admin panel.
+#, fuzzy
+msgid "Save access settings."
 msgstr "Зберегти параметри до�тупу"
 
-#. TRANS: Tooltip for button to save access settings in site admin panel.
-#. TRANS: Button text for saving theme settings.
+#. TRANS: Button text to save access settings in site admin panel.
 #. TRANS: Button label to save e-mail preferences.
 #. TRANS: Button label to save IM preferences.
 #. TRANS: Button text in the license admin panel.
@@ -129,7 +122,6 @@ msgstr "Зберегти параметри до�тупу"
 #. TRANS: Button text for saving "Other settings" in profile.
 #. TRANS: Button text to save user settings in user admin panel.
 #. TRANS: Button label in the "Edit application" form.
-#. TRANS: Button text on profile design page to save settings.
 #. TRANS: Text for save button on group edit form.
 #. TRANS: Button text to save tags for a profile.
 msgctxt "BUTTON"
@@ -169,10 +161,6 @@ msgstr "�емає такого профілю."
 msgid "No such list."
 msgstr "Такого �пи�ку немає."
 
-#. TRANS: Client error displayed when trying to add an OMB 0.1 remote profile to a list.
-msgid "You cannot list an OMB 0.1 remote profile with this action."
-msgstr "Цією дією ви не можете додати віддалений профіль OMB 0.1 до �пи�ку."
-
 #. TRANS: Client error displayed when an unknown error occurs when adding a user to a list.
 #. TRANS: %s is a username.
 #, php-format
@@ -204,7 +192,6 @@ msgstr "�емає такої �торінки."
 #. TRANS: Client error when user not found for an rss related action.
 #. TRANS: Client error displayed when no existing user is provided for a user's delivery device setting.
 #. TRANS: Client error displayed if a user could not be found.
-#. TRANS: Client error when user not found updating a profile background image.
 #. TRANS: Client error displayed updating profile image without having a user object.
 #. TRANS: Client error displayed when making an Atom API request for an unknown user.
 #. TRANS: Client error displayed when trying to block a non-existing user or a user from another site.
@@ -230,14 +217,11 @@ msgstr "�емає такої �торінки."
 #. TRANS: Client error displayed when trying to get the RSS feed with favorites of a user that does not exist.
 #. TRANS: Client error displayed when requesting Friends of a Friend feed without providing a user nickname.
 #. TRANS: Client error displayed when requesting Friends of a Friend feed for an object that is not a user.
-#. TRANS: Client error displayed when trying to get a user hCard for a non-existing user.
 #. TRANS: Client error displayed trying to make a micro summary without providing a valid user.
 #. TRANS: Client error displayed trying to send a direct message to a non-existing user.
 #. TRANS: Client error displayed trying to use "one time password login" without using an existing user.
 #. TRANS: Client error displayed when referring to non-existing user.
 #. TRANS: Client error displayed trying to perform an action related to a non-existing user.
-#. TRANS: Form validation error on page for remote subscribe when no user was provided.
-#. TRANS: Form validation error on page for remote subscribe when no user profile was found.
 #. TRANS: Client error displayed when trying to reply to a non-exsting user.
 #. TRANS: Client error displayed when providing a non-existing nickname in a RSS 1.0 action.
 #. TRANS: Client error.
@@ -246,7 +230,6 @@ msgstr "�емає такої �торінки."
 #. TRANS: Client error displayed trying to find a user by ID for a non-existing ID.
 #. TRANS: Client error displayed requesting groups for a non-existing user.
 #. TRANS: Client error displayed when user not found for an action.
-#. TRANS: Client error displayed providing a non-existing nickname.
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #. TRANS: Client error displayed when trying to perform a gallery action with an unknown user.
 #. TRANS: Client error displayed when trying to access a mailbox without providing a user.
@@ -255,15 +238,21 @@ msgid "No such user."
 msgstr "Такого кори�тувача немає."
 
 #. TRANS: Title of a user's own start page.
-#, fuzzy
 msgid "Home timeline"
-msgstr "%s �трічка"
+msgstr "Мо� �трічка"
 
 #. TRANS: Title of another user's start page.
 #. TRANS: %s is the other user's name.
-#, fuzzy, php-format
+#, php-format
 msgid "%s's home timeline"
-msgstr "%s �трічка"
+msgstr "Стрічка %s"
+
+#. TRANS: %s is user nickname.
+#. TRANS: Feed title.
+#. TRANS: %s is tagger's nickname.
+#, fuzzy, php-format
+msgid "Feed for friends of %s (Activity Streams JSON)"
+msgstr "Стрічка допи�ів дл� друзів %s (Atom)"
 
 #. TRANS: %s is user nickname.
 #, php-format
@@ -308,7 +297,7 @@ msgstr ""
 "Ви можете [«розштовхати» %1$s](../%2$s) зі �торінки його профілю або [що�ь "
 "йому напи�ати](%%%%action.newnotice%%%%?status_textarea=%3$s)."
 
-#. TRANS: Encoutagement displayed on empty timeline user pages for anonymous users.
+#. TRANS: Encouragement displayed on empty timeline user pages for anonymous users.
 #. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
 #. TRANS: Empty list message for page with replies for a user for not logged in users.
 #. TRANS: %1$s is a user nickname. This message contains a Markdown link in the form [link text](link).
@@ -322,6 +311,13 @@ msgstr ""
 "Чому б не [зареє�трувати�ь](%%%%action.register%%%%) і не �пробувати "
 "«розштовхати» %s або що�ь йому напи�ати."
 
+#. TRANS: Button text for inviting more users to the StatusNet instance.
+#. TRANS: Less business/enterprise-oriented language for public sites.
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Send invite"
+msgstr "�аді�лати запрошенн�."
+
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Title of API timeline for a user and friends.
 #. TRANS: %s is a username.
@@ -330,8 +326,6 @@ msgstr ""
 #. TRANS: %s is a username.
 #. TRANS: Menu item title in personal group navigation menu.
 #. TRANS: %s is a username.
-#. TRANS: Menu item title in settings navigation panel.
-#. TRANS: %s is a username.
 #, php-format
 msgid "%s and friends"
 msgstr "%s з друз�ми"
@@ -370,7 +364,6 @@ msgstr ""
 #. TRANS: Server error thrown on database error updating SMS preferences.
 #. TRANS: Server error thrown on database error removing a registered SMS phone number.
 #. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
-#. TRANS: Server exception thrown on Profile design page when updating design settings fails.
 msgid "Could not update user."
 msgstr "�е вдало�� оновити кори�тувача."
 
@@ -385,7 +378,6 @@ msgstr "�е вдало�� зберегти профіль."
 
 #. TRANS: Client error displayed when the number of bytes in a POST request exceeds a limit.
 #. TRANS: %s is the number of bytes of the CONTENT_LENGTH.
-#. TRANS: Form validation error in design settings form. POST should remain untranslated.
 #, php-format
 msgid ""
 "The server was unable to handle that much POST data (%s byte) due to its "
@@ -403,24 +395,6 @@ msgstr[2] ""
 "Сервер не здатен обробити таку кількі�ть даних (%s байтів) за поточної "
 "конфігурації."
 
-#. TRANS: Client error displayed when saving design settings fails because of an empty id.
-#. TRANS: Client error displayed when saving design settings fails because of an empty result.
-#. TRANS: Client error displayed when a database error occurs inserting profile colours.
-#. TRANS: Client error displayed when a database error occurs updating profile colours.
-#. TRANS: Form validation error displayed when group design settings could not be saved because of an application issue.
-#. TRANS: Form validation error on Profile design page when saving design settings has failed.
-#. TRANS: Form validation error on Profile design page when updating design settings has failed.
-msgid "Unable to save your design settings."
-msgstr "�е маю можливо�ті зберегти налаштуванн� дизайну."
-
-#. TRANS: Error displayed when updating design settings fails.
-#. TRANS: Client error displayed when a database error occurs updating profile colours.
-#. TRANS: Form validation error on Profile design page when updating design settings has failed.
-#. TRANS: Error message displayed if design settings could not be saved.
-#. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
-msgid "Could not update your design."
-msgstr "�е вдало�� оновити ваш дизайн."
-
 #. TRANS: Title for Atom feed.
 msgctxt "ATOM"
 msgid "Main"
@@ -467,6 +441,22 @@ msgstr "Спроба заблокувати кори�тувача невдал
 msgid "Unblock user failed."
 msgstr "Спроба розблокувати кори�тувача невдала."
 
+#. TRANS: Client exception thrown when no conversation ID is given.
+#, fuzzy
+msgid "No conversation ID."
+msgstr "Розмова"
+
+#. TRANS: Client exception thrown when referring to a non-existing conversation ID (%d).
+#, fuzzy, php-format
+msgid "No conversation with ID %d."
+msgstr "Розмова"
+
+#. TRANS: Title for conversion timeline.
+#, fuzzy
+msgctxt "TITLE"
+msgid "Conversation"
+msgstr "Розмова"
+
 #. TRANS: Title. %s is a user nickname.
 #, php-format
 msgid "Direct messages from %s"
@@ -513,6 +503,8 @@ msgstr ""
 "другом."
 
 #. TRANS: Client error displayed trying to direct message self (403).
+#. TRANS: Client error displayed trying to send a direct message to self.
+#. TRANS: Error text shown when trying to send a direct message to self.
 msgid ""
 "Do not send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
@@ -747,7 +739,6 @@ msgstr "�пільноти на %s"
 
 #. TRANS: Client error displayed when trying to edit a group without being an admin.
 #. TRANS: Client error displayed trying to edit a group while not being a group admin.
-#. TRANS: Client error displayed trying to change group design settings without being a (group) admin.
 #. TRANS: Client error displayed when trying to change group logo settings while not being a group admin.
 msgid "You must be an admin to edit the group."
 msgstr ""
@@ -862,7 +853,6 @@ msgstr "Помилка бази даних при додаванні парам
 
 #. TRANS: Client error given on when invalid data was passed through a form in the OAuth API.
 #. TRANS: Unexpected validation error on avatar upload form.
-#. TRANS: Client error displayed when the submitted form contains unexpected data.
 #. TRANS: Client error displayed submitting invalid form data for edit application.
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
 #. TRANS: Form validation error message when an unsupported argument is used.
@@ -871,7 +861,6 @@ msgstr "Помилка бази даних при додаванні парам
 #. TRANS: Client error when submitting a form with unexpected information.
 #. TRANS: Client error displayed when unexpected data is posted in the password recovery form.
 #. TRANS: Message given submitting a form with an unknown action in SMS settings.
-#. TRANS: Unknown form validation error in design settings form.
 msgid "Unexpected form submission."
 msgstr "�е�подіване пред�тавленн� форми."
 
@@ -917,7 +906,6 @@ msgstr "�каунт"
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Field label on account registration page.
-#. TRANS: Label for nickname on user authorisation page.
 #. TRANS: Field label on group edit form.
 #. TRANS: Dropdown option for searching in profiles.
 msgid "Nickname"
@@ -1237,12 +1225,9 @@ msgstr "Ви повинні �початку увійти на �айт, аби
 #. TRANS: Client error displayed when requesting Friends of a Friend feed for a nickname that is not a group.
 #. TRANS: Client error displayed trying to block a user from a group while specifying a non-existing group.
 #. TRANS: Client error displayed referring to a group's permalink for a non-existing group ID.
-#. TRANS: Client error displayed trying to change group design settings while providing a nickname for a non-existing group.
 #. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
 #. TRANS: Client error displayed when trying to view group members for a non-existing group.
 #. TRANS: Client error displayed when trying to view group members for an object that is not a group.
-#. TRANS: Client error displayed when trying to view group members for a non-existing group.
-#. TRANS: Client error displayed when trying to view group members for an object that is not a group.
 #. TRANS: Client error displayed when requesting a group RSS feed for group that does not exist.
 #. TRANS: Client error displayed when requesting a group RSS feed for an object that is not a group.
 #. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
@@ -1251,10 +1236,10 @@ msgstr "Ви повинні �початку увійти на �айт, аби
 #. TRANS: Client error displayed when trying to leave a non-local group.
 #. TRANS: Client error displayed when trying to leave a non-existing group.
 #. TRANS: Client error displayed when providing an invalid group ID on the Make Admin page.
-#. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
-#. TRANS: Client error displayed if no local group with a given name was found requesting group page.
 #. TRANS: Command exception text shown when a group is requested that does not exist.
 #. TRANS: Error text shown when trying to leave a group that does not exist.
+#. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
+#. TRANS: Client error displayed if no local group with a given name was found requesting group page.
 msgid "No such group."
 msgstr "Такої �пільноти не і�нує."
 
@@ -1326,6 +1311,7 @@ msgid "Join request canceled."
 msgstr "Запит на приєднанн� до �пільноти відхилено."
 
 #. TRANS: Client error displayed trying to approve subscription for a non-existing request.
+#. TRANS: %s is a user nickname.
 #, php-format
 msgid "%s is not in the moderation queue for your subscriptions."
 msgstr ""
@@ -1478,7 +1464,6 @@ msgstr "Такого вкладенн� немає."
 #. TRANS: Client error displayed trying to get an avatar without providing a nickname.
 #. TRANS: Client error displayed when requesting a list of blocked users for a group without providing a group nickname.
 #. TRANS: Client error displayed trying to edit a group while not proving a nickname for the group to edit.
-#. TRANS: Client error displayed trying to change group design settings without providing a group nickname.
 #. TRANS: Client error displayed when trying to change group logo settings without providing a nickname.
 #. TRANS: Client error displayed when trying to view group members without providing a group nickname.
 #. TRANS: Client error displayed when requesting a group RSS feed without providing a group nickname.
@@ -1776,6 +1761,18 @@ msgstr "�дре�у «%s» підтверджено дл� вашого ака
 msgid "Conversation"
 msgstr "Розмова"
 
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#, fuzzy
+msgid "Conversation feed (Activity Streams JSON)"
+msgstr "Стрічка допи�ів дл� %s (Atom)"
+
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#, fuzzy
+msgid "Conversation feed (RSS 2.0)"
+msgstr "Стрічка допи�ів дл� %s (RSS 2.0)"
+
 #. TRANS: Title for conversation page.
 #. TRANS: Title for page that shows a notice.
 msgctxt "TITLE"
@@ -1840,7 +1837,8 @@ msgid "Enter \"%s\" to confirm that you want to delete your account."
 msgstr "Введіть «%s», тим �амим підтверджуючи �вою згоду на видаленн� акаунту."
 
 #. TRANS: Button title for user account deletion.
-msgid "Permanently delete your account"
+#, fuzzy
+msgid "Permanently delete your account."
 msgstr "О�таточне і негайне видаленн� акаунту"
 
 #. TRANS: Client error displayed trying to delete an application while not logged in.
@@ -1984,150 +1982,6 @@ msgstr "�е видал�ти цього кори�тувача."
 msgid "Delete this user."
 msgstr "Видалити цього кори�тувача."
 
-#. TRANS: Message used as title for design settings for the site.
-msgid "Design"
-msgstr "Дизайн"
-
-#. TRANS: Instructions for design adminsitration panel.
-msgid "Design settings for this StatusNet site"
-msgstr "�алаштуванн� дизайну дл� цього �айту StatusNet"
-
-#. TRANS: Client error displayed when a logo URL does is not valid.
-msgid "Invalid logo URL."
-msgstr "Помилкова URL-адре�а логотипу."
-
-#. TRANS: Client error displayed when an SSL logo URL is invalid.
-msgid "Invalid SSL logo URL."
-msgstr "�евірний SSL або URL-адре�а логотипу."
-
-#. TRANS: Client error displayed when a theme is submitted through the form that is not in the theme list.
-#. TRANS: %s is the chosen unavailable theme.
-#, php-format
-msgid "Theme not available: %s."
-msgstr "Тема недо�тупна: %s."
-
-#. TRANS: Fieldset legend for form to change logo.
-msgid "Change logo"
-msgstr "Змінити логотип"
-
-#. TRANS: Field label for StatusNet site logo.
-msgid "Site logo"
-msgstr "Логотип �айту"
-
-#. TRANS: Field label for SSL StatusNet site logo.
-msgid "SSL logo"
-msgstr "Логотип �айту з SSL"
-
-#. TRANS: Fieldset legend for form change StatusNet site's theme.
-msgid "Change theme"
-msgstr "Змінити тему"
-
-#. TRANS: Field label for dropdown to choose site theme.
-msgid "Site theme"
-msgstr "Тема �айту"
-
-#. TRANS: Title for field label for dropdown to choose site theme.
-msgid "Theme for the site."
-msgstr "Тема дл� цього �айту."
-
-#. TRANS: Field label for uploading a cutom theme.
-msgid "Custom theme"
-msgstr "Сво� тема"
-
-#. TRANS: Form instructions for uploading a cutom StatusNet theme.
-msgid "You can upload a custom StatusNet theme as a .ZIP archive."
-msgstr "Ви можете завантажити �вою тему дл� �айту StatusNet �к .ZIP архів."
-
-#. TRANS: Fieldset legend for theme background image.
-msgid "Change background image"
-msgstr "Змінити фонове зображенн�"
-
-#. TRANS: Field label for background image on theme designer page.
-#. TRANS: Field label for background color selector.
-#. TRANS: Label on profile design page for setting a profile page background colour.
-msgid "Background"
-msgstr "Фон"
-
-#. TRANS: Form guide for background image upload form on theme designer page.
-#, php-format
-msgid ""
-"You can upload a background image for the site. The maximum file size is %1"
-"$s."
-msgstr ""
-"Ви можете завантажити фонове зображенн� дл� �айту. Мак�имальний розмір файлу "
-"%1$s."
-
-#. TRANS: Used as radio button label to add a background image.
-msgid "On"
-msgstr "Увімк."
-
-#. TRANS: Used as radio button label to not add a background image.
-msgid "Off"
-msgstr "Вимк."
-
-#. TRANS: Form guide for turning background image on or off on theme designer page.
-#. TRANS: Form guide for a set of radio buttons on the profile design page that will enable or disable
-#. TRANS: use of the uploaded profile image.
-msgid "Turn background image on or off."
-msgstr "Увімкнути або вимкнути фонове зображенн�."
-
-#. TRANS: Checkbox label to title background image on theme designer page.
-#. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
-msgid "Tile background image"
-msgstr "Замо�тити фон"
-
-#. TRANS: Fieldset legend for theme colors.
-msgid "Change colors"
-msgstr "Змінити кольори"
-
-#. TRANS: Field label for content color selector.
-#. TRANS: Label on profile design page for setting a profile page content colour.
-msgid "Content"
-msgstr "Змі�т"
-
-#. TRANS: Field label for sidebar color selector.
-#. TRANS: Label on profile design page for setting a profile page sidebar colour.
-msgid "Sidebar"
-msgstr "Сайдбар"
-
-#. TRANS: Field label for text color selector.
-#. TRANS: Label on profile design page for setting a profile page text colour.
-msgid "Text"
-msgstr "Тек�т"
-
-#. TRANS: Field label for link color selector.
-#. TRANS: Label on profile design page for setting a profile page links colour.
-msgid "Links"
-msgstr "По�иланн�"
-
-#. TRANS: Fieldset legend for advanced theme design settings.
-msgid "Advanced"
-msgstr "Додатково"
-
-#. TRANS: Field label for custom CSS.
-msgid "Custom CSS"
-msgstr "Свій CSS"
-
-#. TRANS: Button text for resetting theme settings.
-msgctxt "BUTTON"
-msgid "Use defaults"
-msgstr "За замовч."
-
-#. TRANS: Title for button for resetting theme settings.
-#. TRANS: Title for button on profile design page to reset all colour settings to default.
-msgid "Restore default designs."
-msgstr "Відновити �тандартні у�тановки."
-
-#. TRANS: Title for button for resetting theme settings.
-#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-msgid "Reset back to default."
-msgstr "Повернути�ь до �тандартних налаштувань."
-
-#. TRANS: Title for button for saving theme settings.
-#. TRANS: Title for button on profile design page to save settings.
-msgid "Save design."
-msgstr "Зберегти дизайн."
-
 #. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
 msgid "This notice is not a favorite!"
 msgstr "Цей допи� не є обраним!"
@@ -2142,6 +1996,79 @@ msgstr "Додати до обраних"
 msgid "No such document \"%s\"."
 msgstr "�емає такого документа «%s»."
 
+#. TRANS: Menu item in administrator navigation panel.
+#. TRANS: Menu item in default local navigation panel.
+#. TRANS: Menu item in personal group navigation menu.
+msgctxt "MENU"
+msgid "Home"
+msgstr "Головна"
+
+msgctxt "MENU"
+msgid "Docs"
+msgstr ""
+
+#. TRANS: Secondary navigation menu item leading to help on StatusNet.
+msgctxt "MENU"
+msgid "Help"
+msgstr "Довідка"
+
+#, fuzzy
+msgid "Getting started"
+msgstr "�алаштуванн� збережено."
+
+#. TRANS: Secondary navigation menu item leading to text about StatusNet site.
+msgctxt "MENU"
+msgid "About"
+msgstr "Деталі"
+
+#, fuzzy
+msgid "About this site"
+msgstr "Розблокувати цього кори�тувача"
+
+#. TRANS: Secondary navigation menu item leading to Frequently Asked Questions.
+msgctxt "MENU"
+msgid "FAQ"
+msgstr "ЧаП"
+
+msgid "Frequently asked questions"
+msgstr ""
+
+#. TRANS: Secondary navigation menu item leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+msgctxt "MENU"
+msgid "Contact"
+msgstr "Контакт"
+
+#, fuzzy
+msgid "Contact info"
+msgstr "Контакт"
+
+#, fuzzy
+msgctxt "MENU"
+msgid "Tags"
+msgstr "Теґи"
+
+msgid "Using tags"
+msgstr ""
+
+#. TRANS: Menu item in default local navigation panel.
+#. TRANS: Menu item in search group navigation panel.
+#. TRANS: Menu item in local navigation menu.
+msgctxt "MENU"
+msgid "Groups"
+msgstr "Спільноти"
+
+#, fuzzy
+msgid "Using groups"
+msgstr "Спільноти"
+
+msgctxt "MENU"
+msgid "API"
+msgstr ""
+
+msgid "RESTful API"
+msgstr ""
+
 #. TRANS: Title for "Edit application" form.
 #. TRANS: Form legend.
 msgid "Edit application"
@@ -2304,7 +2231,7 @@ msgstr ""
 "Зазначенн� теґу �к о�оби�того означатиме незворотне видаленн� в�іх підпи�ок "
 "до нього. Ви в�е ще хочете продовжити?"
 
-#. TRANS: TRANS: Server error displayed when updating a list fails.
+#. TRANS: Server error displayed when updating a list fails.
 msgid "Could not update list."
 msgstr "�е вдало�� оновити �пи�ок."
 
@@ -2606,40 +2533,6 @@ msgstr "�емає вкладень."
 msgid "No uploaded attachments."
 msgstr "�емає завантажених вкладень."
 
-#. TRANS: Client error displayed when subscribing to a remote profile and an unexpected response is received.
-msgid "Not expecting this response!"
-msgstr "Ц� відповідь не очікуєть��!"
-
-#. TRANS: Client error displayed when subscribing to a remote profile that does not exist.
-msgid "User being listened to does not exist."
-msgstr "Кори�тувача, �кий �лідкував за вашими повідомленн�ми, більше не і�нує."
-
-#. TRANS: Client error displayed when subscribing to a remote profile that is a local profile.
-#. TRANS: Client error displayed when using remote subscribe for a local entity.
-msgid "You can use the local subscription!"
-msgstr "Ви можете кори�тувати�ь локальними підпи�ками!"
-
-#. TRANS: Client error displayed when subscribing to a remote profile that is blocked form subscribing to.
-msgid "That user has blocked you from subscribing."
-msgstr "Цей кори�тувач позбавив ва� можливо�ті підпи�ати�ь до нього."
-
-#. TRANS: Client error displayed when subscribing to a remote profile without providing an authorised token.
-msgid "You are not authorized."
-msgstr "�е авторизовано."
-
-#. TRANS: Client error displayed when subscribing to a remote profile and conversion of the request token to access token fails.
-msgid "Could not convert request token to access token."
-msgstr "�е вдало�� перетворити токени запиту на токени зверненн�."
-
-#. TRANS: Client error displayed when subscribing to a remote profile fails because of an unsupported version of the OMB protocol.
-msgid "Remote service uses unknown version of OMB protocol."
-msgstr "�евідома вер�і� протоколу OMB."
-
-#. TRANS: Server error displayed when subscribing to a remote profile fails because the remote profile could not be updated.
-#. TRANS: Exception thrown when updating a remote profile fails in OAuth store.
-msgid "Error updating remote profile."
-msgstr "Помилка при оновленні віддаленого профілю."
-
 #. TRANS: Client error displayed when requesting a non-existent file.
 msgid "No such file."
 msgstr "Такого файлу немає."
@@ -2727,32 +2620,6 @@ msgstr "Виникла помилка при блокуванні кори�ту
 msgid "No ID."
 msgstr "�емає ID."
 
-#. TRANS: Client error displayed trying to change group design settings while not logged in.
-msgid "You must be logged in to edit a group."
-msgstr ""
-"Ви маєте �початку увійти, аби мати змогу відредагувати вла�тиво�ті �пільноти."
-
-#. TRANS: Title group design settings page.
-msgid "Group design"
-msgstr "Дизайн �пільноти"
-
-#. TRANS: Instructions for group design settings page.
-msgid ""
-"Customize the way your group looks with a background image and a colour "
-"palette of your choice."
-msgstr ""
-"�алаштуйте вигл�д �торінки �пільноти, викори�товуючи фонове зображенн� і "
-"кольори на �вій �мак."
-
-#. TRANS: Form validation error displayed when group design settings could not be updated because of an application issue.
-msgid "Unable to update your design settings."
-msgstr "�е вдало�� оновити налаштуванн� дизайну."
-
-#. TRANS: Form text to confirm saved group design settings.
-#. TRANS: Confirmation message on Profile design page when saving design settings has succeeded.
-msgid "Design preferences saved."
-msgstr "Преференції дизайну збережно."
-
 #. TRANS: Title for group logo settings page.
 #. TRANS: Group logo form legend.
 msgid "Group logo"
@@ -2928,10 +2795,10 @@ msgstr "�алаштуванн� ІМ"
 #. TRANS: Instant messaging settings page instructions.
 #. TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link.
 #. TRANS: the order and formatting of link text and link should remain unchanged.
-#, php-format
+#, fuzzy, php-format
 msgid ""
-"You can send and receive notices through instant messaging [instant messages]"
-"(%%doc.im%%). Configure your addresses and settings below."
+"You can send and receive notices through [instant messaging](%%doc.im%%). "
+"Configure your addresses and settings below."
 msgstr ""
 "Ви можете над�илати та отримувати допи�и через повідомленн� [�лужби миттєвих "
 "повідомлень](%%doc.im%%). Вкажіть �вою адре�у і налаштуйте опції нижче."
@@ -3135,29 +3002,6 @@ msgstr ""
 "Скори�тайте�ь цією формою, аби запро�ити ваших друзів та колег до нашого "
 "�ерві�у."
 
-#. TRANS: Field label for a list of e-mail addresses.
-msgid "Email addresses"
-msgstr "Електронні адре�и"
-
-#. TRANS: Tooltip for field label for a list of e-mail addresses.
-msgid "Addresses of friends to invite (one per line)."
-msgstr ""
-"�дре�и друзів, куди над�илатимуть�� запрошенн� (кожна адре�а окремим р�дком)."
-
-#. TRANS: Field label for a personal message to send to invitees.
-msgid "Personal message"
-msgstr "О�оби�ті повідомленн�"
-
-#. TRANS: Tooltip for field label for a personal message to send to invitees.
-msgid "Optionally add a personal message to the invitation."
-msgstr "Можна додати пер�ональне повідомленн� до запрошенн� (опціонально)."
-
-#. TRANS: Send button for inviting friends
-#. TRANS: Button text for sending notice.
-msgctxt "BUTTON"
-msgid "Send"
-msgstr "�аді�лати"
-
 #. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral
 #. TRANS: singular 3rd-person pronoun in English. %1$s is the inviting user, $2$s is
 #. TRANS: the StatusNet sitename.
@@ -3290,12 +3134,6 @@ msgstr "URL-адре�а зображенн� (логотипу) дл� пока
 msgid "Save license settings."
 msgstr "Зберегти налаштуванн� ліцензії."
 
-#. TRANS: Client error displayed when trying to log in while already logged in.
-#. TRANS: Client error displayed trying to use "one time password login" when already logged in.
-#. TRANS: Client error displayed when trying to register while already logged in.
-msgid "Already logged in."
-msgstr "Тепер ви увійшли."
-
 #. TRANS: Form validation error displayed when trying to log in with incorrect credentials.
 msgid "Incorrect username or password."
 msgstr "�еточне ім’� або пароль."
@@ -3314,9 +3152,8 @@ msgid "Login to site"
 msgstr "Вхід на �айт"
 
 #. TRANS: Field label on login page.
-#, fuzzy
 msgid "Username or email address"
-msgstr "Ім’� кори�тувача або поштова адре�а"
+msgstr "Ім’� кори�тувача або електронна адре�а"
 
 #. TRANS: Checkbox label label on login page.
 #. TRANS: Checkbox label on account registration page.
@@ -3411,6 +3248,7 @@ msgstr "Потрібна URL-адре�а."
 msgid "Could not create application."
 msgstr "�е вдало�� �творити додаток."
 
+#. TRANS: Form validation error messages displayed when uploading an invalid application logo.
 msgid "Invalid image."
 msgstr "�еприпу�тиме зображенн�."
 
@@ -3447,13 +3285,6 @@ msgstr "�емає змі�ту!"
 msgid "No recipient specified."
 msgstr "Жодного отримувача не визначено."
 
-#. TRANS: Client error displayed trying to send a direct message to self.
-#. TRANS: Error text shown when trying to send a direct message to self.
-msgid ""
-"Don't send a message to yourself; just say it to yourself quietly instead."
-msgstr ""
-"�е над�илайте повідомлень �амому �обі; краще поговоріть із �обою вголо�."
-
 #. TRANS: Page title after sending a direct message.
 msgid "Message sent"
 msgstr "Повідомленн� наді�лано"
@@ -3659,6 +3490,33 @@ msgstr "URL-адре�а %s лише в про�тому HTTP, будь ла�к
 msgid "Not a supported data format."
 msgstr "Такий формат даних не підтримуєть��."
 
+#. TRANS: Page title for profile settings.
+#, fuzzy
+msgid "Old school UI settings"
+msgstr "�алаштуванн� ІМ"
+
+#. TRANS: Usage instructions for profile settings.
+msgid "If you like it \"the old way\", you can set that here."
+msgstr ""
+
+#. TRANS: Confirmation shown when user profile settings are saved.
+#. TRANS: Message after successful saving of administrative settings.
+msgid "Settings saved."
+msgstr "�алаштуванн� збережено."
+
+msgid "Only stream mode (no conversations) in timelines"
+msgstr ""
+
+msgid "Show conversation page as hierarchical trees"
+msgstr ""
+
+msgid "Show nicknames (not full names) in timelines"
+msgstr ""
+
+#. TRANS: Button text to save a list.
+msgid "Save"
+msgstr "Зберегти"
+
 #. TRANS: ShortName in the OpenSearch interface when trying to find users.
 msgid "People Search"
 msgstr "Пошук людей"
@@ -3667,6 +3525,11 @@ msgstr "Пошук людей"
 msgid "Notice Search"
 msgstr "Пошук допи�ів"
 
+#. TRANS: Client error displayed trying to use "one time password login" when already logged in.
+#. TRANS: Client error displayed when trying to register while already logged in.
+msgid "Already logged in."
+msgstr "Тепер ви увійшли."
+
 #. TRANS: Client error displayed trying to use "one time password login" without specifying a user.
 msgid "No user ID specified."
 msgstr "ID кори�тувача не визначено."
@@ -3738,7 +3601,7 @@ msgid "Confirm"
 msgstr "Підтвердити"
 
 #. TRANS: Field title on page where to change password.
-#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
+#. TRANS: Title for field label for password reset form where the password has to be typed again.
 #. TRANS: Field title on account registration page.
 msgid "Same as password above."
 msgstr "Такий �амо, �к і пароль вище."
@@ -3796,12 +3659,6 @@ msgstr "Директорію теми не можна прочитати: %s."
 msgid "Avatar directory not writable: %s."
 msgstr "Директорі� аватарів не до�тупна дл� запи�у: %s."
 
-#. TRANS: Client error in Paths admin panel.
-#. TRANS: %s is the background directory that could not be written to.
-#, php-format
-msgid "Background directory not writable: %s."
-msgstr "Директорі� фонових зображень не до�тупна дл� запи�у:% s."
-
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the locales directory that could not be read from.
 #, php-format
@@ -3915,30 +3772,6 @@ msgstr "Директорі� аватари"
 msgid "Directory where avatars are located."
 msgstr "Директорі�, в �кій знаход�ть�� аватари."
 
-#. TRANS: Fieldset legend in Paths admin panel.
-msgid "Backgrounds"
-msgstr "Фони"
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-msgid "Server for backgrounds."
-msgstr "Сервер дл� фонових зображень."
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-msgid "Web path to backgrounds."
-msgstr "Шл�х до фонових зображень."
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-msgid "Server for backgrounds on SSL pages."
-msgstr "Сервер дл� фонових зображень на захищених SSL-�торінках."
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-msgid "Web path to backgrounds on SSL pages."
-msgstr "Шл�х до фонових зображень на захищених SSL-�торінках."
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-msgid "Directory where backgrounds are located."
-msgstr "Директорі�, в �кій знаход�ть�� фонові зображенн�."
-
 #. TRANS: Fieldset legens in Paths admin panel.
 msgid "Attachments"
 msgstr "Вкладенн�"
@@ -3994,8 +3827,9 @@ msgid "Server to direct SSL requests to."
 msgstr "Сервер на �кий направл�ти SSL-запити."
 
 #. TRANS: Button title text to store form data in the Paths admin panel.
-msgid "Save paths"
-msgstr "Зберегти шл�хи"
+#, fuzzy
+msgid "Save path settings."
+msgstr "Зберегти налаштуванн� �айту"
 
 #. TRANS: Instructions for the "People search" page.
 #. TRANS: %%site.name%% is the name of the StatusNet site.
@@ -4124,13 +3958,13 @@ msgstr "Перейти"
 #. TRANS: Message displayed for anonymous users on page that displays lists by a user.
 #. TRANS: This message contains Markdown links in the form [description](links).
 #. TRANS: %s is a tagger nickname.
-#, php-format
+#, fuzzy, php-format
 msgid ""
 "These are lists created by **%s**. Lists are how you sort similar people on %"
 "%%%site.name%%%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
 "blogging) service based on the Free Software [StatusNet](http://status.net/) "
 "tool. You can easily keep track of what they are doing by subscribing to the "
-"tag's timeline."
+"list's timeline."
 msgstr ""
 "Тут пред�тавлено �пи�ки, �творені **%s**. Спи�ки — це �по�іб групувати "
 "�хожих кори�тувачів на %%%%site.name%%%%, �ерві�і [мікроблоґів](http://uk."
@@ -4159,13 +3993,13 @@ msgstr "Спи�ки, до �ких входить %1$s, �торінка %2$d"
 #. TRANS: Message displayed for anonymous users on page that displays lists for a user.
 #. TRANS: This message contains Markdown links in the form [description](links).
 #. TRANS: %s is a tagger nickname.
-#, php-format
+#, fuzzy, php-format
 msgid ""
 "These are lists for **%s**. lists are how you sort similar people on %%%%"
 "site.name%%%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
 "blogging) service based on the Free Software [StatusNet](http://status.net/) "
 "tool. You can easily keep track of what they are doing by subscribing to the "
-"tag's timeline."
+"list's timeline."
 msgstr ""
 "Тут пред�тавлено �пи�ки дл� **%s**. Спи�ки — це �по�іб групувати �хожих "
 "кори�тувачів на %%%%site.name%%%%, �ерві�і [мікроблоґів](http://uk.wikipedia."
@@ -4276,16 +4110,6 @@ msgid ""
 msgstr ""
 "В�і додатки за замовчуванн�м було вимкнено у файлі конфігурації даного �айту."
 
-#. TRANS: Client error displayed if the notice posted has too many characters.
-msgid "Invalid notice content."
-msgstr "�едій�ний змі�т допи�у."
-
-#. TRANS: Exception thrown if a notice's license is not compatible with the StatusNet site license.
-#. TRANS: %1$s is the notice license, %2$s is the StatusNet site's license.
-#, php-format
-msgid "Notice license \"%1$s\" is not compatible with site license \"%2$s\"."
-msgstr "Ліцензі� допи�у «%1$s» є не�умі�ною з ліцензією �айту «%2$s»."
-
 #. TRANS: Client error displayed when trying to add an unindentified field to profile.
 #. TRANS: %s is a field name.
 #, php-format
@@ -4380,6 +4204,8 @@ msgid "Share my current location when posting notices"
 msgstr "Показувати моє мі�цезнаходженн� при над�иланні допи�ів"
 
 #. TRANS: Field label in form for profile settings.
+#. TRANS: Title for group tag cloud section.
+#. TRANS: %s is a group name.
 msgid "Tags"
 msgstr "Теґи"
 
@@ -4409,7 +4235,7 @@ msgstr "За �ким ча�овим по��ом ви живете?"
 
 #. TRANS: Checkbox label in form for profile settings.
 msgid ""
-"Automatically subscribe to whoever subscribes to me (best for non-humans)."
+"Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr ""
 "�втоматично підпи�увати�ь до тих, хто підпи�ав�� до мене. (Слава роботам!)"
 
@@ -4477,11 +4303,6 @@ msgstr "�е вдало�� зберегти преференції розташ
 msgid "Could not save tags."
 msgstr "�е вдало�� зберегти теґи."
 
-#. TRANS: Confirmation shown when user profile settings are saved.
-#. TRANS: Message after successful saving of administrative settings.
-msgid "Settings saved."
-msgstr "�алаштуванн� збережено."
-
 #. TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
 #. TRANS: Page title for page where a user account can be restored from backup.
 msgid "Restore account"
@@ -4494,7 +4315,8 @@ msgid "Beyond the page limit (%s)."
 msgstr "Перевищено ліміт �торінки (%s)."
 
 #. TRANS: Server error displayed when a public timeline cannot be retrieved.
-msgid "Could not retrieve public stream."
+#, fuzzy
+msgid "Could not retrieve public timeline."
 msgstr "�е вдаєть�� відновити загальну �трічку."
 
 #. TRANS: Title for all public timeline pages but the first.
@@ -4509,15 +4331,23 @@ msgid "Public timeline"
 msgstr "Загальна �трічка"
 
 #. TRANS: Link description for public timeline feed.
-msgid "Public Stream Feed (RSS 1.0)"
+#, fuzzy
+msgid "Public Timeline Feed (Activity Streams JSON)"
+msgstr "Стрічка публічних допи�ів (Atom)"
+
+#. TRANS: Link description for public timeline feed.
+#, fuzzy
+msgid "Public Timeline Feed (RSS 1.0)"
 msgstr "Стрічка публічних допи�ів (RSS 1.0)"
 
 #. TRANS: Link description for public timeline feed.
-msgid "Public Stream Feed (RSS 2.0)"
+#, fuzzy
+msgid "Public Timeline Feed (RSS 2.0)"
 msgstr "Стрічка публічних допи�ів (RSS 2.0)"
 
 #. TRANS: Link description for public timeline feed.
-msgid "Public Stream Feed (Atom)"
+#, fuzzy
+msgid "Public Timeline Feed (Atom)"
 msgstr "Стрічка публічних допи�ів (Atom)"
 
 #. TRANS: Text displayed for public feed when there are no public notices.
@@ -4567,48 +4397,6 @@ msgstr ""
 "Мікроблогінг), �кий працює на вільному програмному забезпеченні [StatusNet]"
 "(http://status.net/)."
 
-#. TRANS: Title for page with public list cloud.
-msgid "Public list cloud"
-msgstr "Загальна хмарка �пи�ків"
-
-#. TRANS: Page notice for page with public list cloud.
-#. TRANS: %s is a StatusNet sitename.
-#, php-format
-msgid "These are largest lists on %s"
-msgstr "Це найдовші �пи�ки на %s"
-
-#. TRANS: Empty list message on page with public list cloud.
-#. TRANS: This message contains Markdown links in the form [description](link).
-#, php-format
-msgid "No one has [listed](%%doc.tags%%) anyone yet."
-msgstr "Поки що ніхто нікого не додав до [�пи�ків](%%doc.tags%%)."
-
-#. TRANS: Additional empty list message on page with public list cloud for logged in users.
-msgid "Be the first to list someone!"
-msgstr "Станьте першим! Започаткуйте новий �пи�ок!"
-
-#. TRANS: Additional empty list message on page with public list cloud for anonymous users.
-#. TRANS: This message contains Markdown links in the form [description](link).
-#, php-format
-msgid ""
-"Why not [register an account](%%action.register%%) and be the first to list "
-"someone!"
-msgstr ""
-"Чому б не [зареє�трувати�ь](%%%%action.register%%%%) і не �творити новий "
-"�пи�ок!"
-
-#. TRANS: DT element on on page with public list cloud.
-msgid "List cloud"
-msgstr "Хмарка �пи�ку"
-
-#. TRANS: Link title for number of listed people. %d is the number of listed people.
-#, php-format
-msgid "1 person listed"
-msgid_plural "%d people listed"
-msgstr[0] "1 кори�тувач у �пи�ку"
-msgstr[1] "%d кори�тувачів у �пи�ку"
-msgstr[2] "%d кори�тувача у �пи�ку"
-
 #. TRANS: Public RSS feed description. %s is the StatusNet site name.
 #, php-format
 msgid "%s updates from everyone."
@@ -4733,7 +4521,6 @@ msgid "6 or more characters, and do not forget it!"
 msgstr "6 або більше знаків, і не забудьте їх!"
 
 #. TRANS: Button text for password reset form.
-#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
 msgctxt "BUTTON"
 msgid "Reset"
 msgstr "Скинути"
@@ -4742,18 +4529,6 @@ msgstr "Скинути"
 msgid "Enter a nickname or email address."
 msgstr "Введіть ім’� або електронну адре�у."
 
-#. TRANS: Information on password recovery form if no known username or e-mail address was specified.
-msgid "No user with that email address or username."
-msgstr "Кори�тувача з такою електронною адре�ою або ім’�м немає."
-
-#. TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.
-msgid "No registered email address for that user."
-msgstr "Дл� цього кори�тувача немає зареє�трованої електронної адре�и."
-
-#. TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.
-msgid "Error saving address confirmation."
-msgstr "Помилка при збереженні підтвердженн� адре�и."
-
 #. TRANS: User notification after an e-mail with instructions was sent from the password recovery form.
 msgid ""
 "Instructions for recovering your password have been sent to the email "
@@ -4932,73 +4707,6 @@ msgstr ""
 "(Ви маєте негайно отримати ли�та електронною поштою, в �кому знаходитимуть�� "
 "ін�трукції щодо підтвердженн� вашої електронної адре�и.)"
 
-#. TRANS: Page notice for remote subscribe. This message contains Markdown links.
-#. TRANS: Ensure to keep the correct markup of [link description](link).
-#, php-format
-msgid ""
-"To subscribe, you can [login](%%action.login%%), or [register](%%action."
-"register%%) a new  account. If you already have an account  on a [compatible "
-"microblogging site](%%doc.openmublog%%),  enter your profile URL below."
-msgstr ""
-"Щоб підпи�ати�ь, ви можете [увійти](%%action.login%%), або [зареє�трувати](%%"
-"action.register%%) новий  акаунт. Якщо ви вже маєте акаунт на [�умі�ному "
-"�айті](%%doc.openmublog%%), введіть URL-адре�у вашого профілю нижче."
-
-#. TRANS: Page title for Remote subscribe.
-msgid "Remote subscribe"
-msgstr "Віддалена підпи�ка"
-
-#. TRANS: Field legend on page for remote subscribe.
-msgid "Subscribe to a remote user"
-msgstr "Підпи�ати�ь до віддаленого кори�тувача"
-
-#. TRANS: Field label on page for remote subscribe.
-msgid "User nickname"
-msgstr "Ім’� кори�тувача"
-
-#. TRANS: Field title on page for remote subscribe.
-msgid "Nickname of the user you want to follow."
-msgstr "Ім’� кори�тувача, допи�и �кого ви хотіли б читати."
-
-#. TRANS: Field label on page for remote subscribe.
-msgid "Profile URL"
-msgstr "URL-адре�а профілю"
-
-#. TRANS: Field title on page for remote subscribe.
-msgid "URL of your profile on another compatible microblogging service."
-msgstr "URL-адре�а вашого профілю на іншому �умі�ному �ерві�і мікроблоґів."
-
-#. TRANS: Button text on page for remote subscribe.
-#. TRANS: Link text for link that will subscribe to a remote profile.
-#. TRANS: Button text to subscribe to a user.
-#. TRANS: Button text for subscribing to a list.
-msgctxt "BUTTON"
-msgid "Subscribe"
-msgstr "Підпи�ати�ь"
-
-#. TRANS: Form validation error on page for remote subscribe when an invalid profile URL was provided.
-msgid "Invalid profile URL (bad format)."
-msgstr "�еприпу�тима URL-адре�а профілю (неправильний формат)."
-
-#. TRANS: Form validation error on page for remote subscribe when no the provided profile URL
-#. TRANS: does not contain expected data.
-msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
-msgstr ""
-"�еправильна URL-адре�а профілю (немає документа YADIS, або помилковий XRDS)."
-
-#. TRANS: Form validation error on page for remote subscribe.
-msgid "That is a local profile! Login to subscribe."
-msgstr "Це локальний профіль! Увійдіть, щоб підпи�ати�ь."
-
-#. TRANS: Form validation error on page for remote subscribe when the remote service is not providing a request token.
-msgid "Could not get a request token."
-msgstr "�е вдало�� отримати токен запиту."
-
-#. TRANS: Client error displayed when trying to (un)list an OMB 0.1 remote profile.
-msgid "You cannot (un)list an OMB 0.1 remote profile with this action."
-msgstr ""
-"Ви можете цією дією додати/видалити віддалений профіль OMB 0.1 до �пи�ку."
-
 #. TRANS: Client error displayed when an unknown error occurs while delisting a user.
 #. TRANS: %s is a username.
 #, php-format
@@ -5052,6 +4760,12 @@ msgstr "Відповіді до %s"
 msgid "Replies to %1$s, page %2$d"
 msgstr "Відповіді до %1$s, �торінка %2$d"
 
+#. TRANS: Link for feed with replies for a user.
+#. TRANS: %s is a user nickname.
+#, fuzzy, php-format
+msgid "Replies feed for %s (Activity Streams JSON)"
+msgstr "Стрічка відповідей до %s (Atom)"
+
 #. TRANS: Link for feed with replies for a user.
 #. TRANS: %s is a user nickname.
 #, php-format
@@ -5173,8 +4887,9 @@ msgstr ""
 "Веб-�трічку невдовзі буде відновлено. Зачекайте, будь ла�ка, декілька хвилин."
 
 #. TRANS: Form instructions for feed restore.
+#, fuzzy
 msgid ""
-"You can upload a backed-up stream in <a href=\"http://activitystrea.ms/"
+"You can upload a backed-up timeline in <a href=\"http://activitystrea.ms/"
 "\">Activity Streams</a> format."
 msgstr ""
 "Ви можете завантажити резервну копію у форматі <a href=\"http://"
@@ -5291,6 +5006,26 @@ msgstr "Призначити новий ключ і таємне �лово"
 msgid "Application info"
 msgstr "Інфо додатку"
 
+#. TRANS: Field label on application page.
+msgid "Consumer key"
+msgstr "Ключ �поживача"
+
+#. TRANS: Field label on application page.
+msgid "Consumer secret"
+msgstr "Таємно �лово �поживача"
+
+#. TRANS: Field label on application page.
+msgid "Request token URL"
+msgstr "URL-адре�а токена запиту"
+
+#. TRANS: Field label on application page.
+msgid "Access token URL"
+msgstr "URL-адре�а токена дозволу"
+
+#. TRANS: Field label on application page.
+msgid "Authorize URL"
+msgstr "�вторизувати URL-адре�у"
+
 #. TRANS: Note on the OAuth application page about signature support.
 msgid ""
 "Note: HMAC-SHA1 signatures are supported. The plaintext signature method is "
@@ -5313,6 +5048,11 @@ msgstr "Обрані допи�и %1$s, �торінка %2$d"
 msgid "Could not retrieve favorite notices."
 msgstr "�е можна відновити обрані допи�и."
 
+#. TRANS: Feed link text. %s is a username.
+#, fuzzy, php-format
+msgid "Feed for favorites of %s (Activity Streams JSON)"
+msgstr "Стрічка обраних допи�ів %s (Atom)"
+
 #. TRANS: Feed link text. %s is a username.
 #, php-format
 msgid "Feed for favorites of %s (RSS 1.0)"
@@ -5375,6 +5115,11 @@ msgstr "Спільнота %s"
 msgid "%1$s group, page %2$d"
 msgstr "Спільнота %1$s, �торінка %2$d"
 
+#. TRANS: Tooltip for feed link. %s is a group nickname.
+#, fuzzy, php-format
+msgid "Notice feed for %s group (Activity Streams JSON)"
+msgstr "Стрічка допи�ів �пільноти %s (Atom)"
+
 #. TRANS: Tooltip for feed link. %s is a group nickname.
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
@@ -5395,42 +5140,8 @@ msgstr "Стрічка допи�ів �пільноти %s (Atom)"
 msgid "FOAF for %s group"
 msgstr "FOAF �пільноти %s"
 
-#. TRANS: Header for mini list of group members on a group page (h2).
-msgid "Members"
-msgstr "Уча�ники"
-
-#. TRANS: Description for mini list of group members on a group page when the group has no members.
-#. TRANS: Content of "Listed" page if there are no listed users.
-#. TRANS: Content of "People following tag x" if there are no subscribed users.
-#. TRANS: Empty list message for tags.
-#. TRANS: Text for user subscription statistics if the user has no subscriptions.
-#. TRANS: Text for user subscriber statistics if user has no subscribers.
-#. TRANS: Text for user user group membership statistics if user is not a member of any group.
-#. TRANS: Default content for section/sidebar widget.
-msgid "(None)"
-msgstr "(Пу�то)"
-
-#. TRANS: Link to all group members from mini list of group members if group has more than n members.
-msgid "All members"
-msgstr "В�і уча�ники"
-
-#. TRANS: Header for group statistics on a group page (h2).
-#. TRANS: H2 text for user statistics.
-msgid "Statistics"
-msgstr "Стати�тика"
-
-#. TRANS: Label for group creation date.
-msgctxt "LABEL"
-msgid "Created"
-msgstr "Створено"
-
-#. TRANS: Label for member count in statistics on group page.
-msgctxt "LABEL"
-msgid "Members"
-msgstr "Уча�ники"
-
 #. TRANS: Notice on group pages for anonymous users for StatusNet sites that accept new registrations.
-#. TRANS: **%s** is the group alias, %%%%site.name%%%% is the site name,
+#. TRANS: %s is the group name, %%%%site.name%%%% is the site name,
 #. TRANS: %%%%action.register%%%% is the URL for registration, %%%%doc.help%%%% is a URL to help.
 #. TRANS: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
 #, php-format
@@ -5449,25 +5160,20 @@ msgstr ""
 "help%%%%))"
 
 #. TRANS: Notice on group pages for anonymous users for StatusNet sites that accept no new registrations.
-#. TRANS: **%s** is the group alias, %%%%site.name%%%% is the site name,
+#. TRANS: %s is the group name, %%%%site.name%%%% is the site name,
 #. TRANS: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
-#, php-format
+#, fuzzy, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
 "wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
 "[StatusNet](http://status.net/) tool. Its members share short messages about "
-"their life and interests. "
+"their life and interests."
 msgstr ""
 "**%s** це �пільнота кори�тувачів на %%%%site.name%%%% — �ерві�і [мікроблоґів]"
 "(http://uk.wikipedia.org/wiki/Мікроблогінг), �кий працює на вільному "
 "програмному забезпеченні [StatusNet](http://status.net/). Уча�ники цієї "
 "�пільноти робл�ть короткі допи�и про �воє житт� та інтере�и. "
 
-#. TRANS: Title for list of group administrators on a group page.
-msgctxt "TITLE"
-msgid "Admins"
-msgstr "�дміни"
-
 #. TRANS: Client error displayed requesting a single message that does not exist.
 msgid "No such message."
 msgstr "�емає такого повідомленн�."
@@ -5562,9 +5268,21 @@ msgstr ""
 "від�лідковувати цю �трічку допи�ів!"
 
 #. TRANS: Header on show list page.
+#. TRANS: Link description for link to list of users tagged with a tag (so part of a list).
 msgid "Listed"
 msgstr "У �пи�ку"
 
+#. TRANS: Content of "Listed" page if there are no listed users.
+#. TRANS: Content of "People following tag x" if there are no subscribed users.
+#. TRANS: Description for mini list of group members on a group page when the group has no members.
+#. TRANS: Empty list message for tags.
+#. TRANS: Text for user subscription statistics if the user has no subscriptions.
+#. TRANS: Text for user subscriber statistics if user has no subscribers.
+#. TRANS: Text for user user group membership statistics if user is not a member of any group.
+#. TRANS: Default content for section/sidebar widget.
+msgid "(None)"
+msgstr "(Пу�то)"
+
 #. TRANS: Link for more "People in list x by a user"
 #. TRANS: if there are more than the mini list's maximum.
 msgid "Show all"
@@ -5575,24 +5293,19 @@ msgstr "Показати в�іх"
 msgid "Subscribers"
 msgstr "Підпи�ані"
 
-#. TRANS: Link for more "People following tag x"
-#. TRANS: if there are more than the mini list's maximum.
-msgid "All subscribers"
-msgstr "В�і підпи�ані"
-
-#. TRANS: Page title showing tagged notices in one user's stream.
+#. TRANS: Page title showing tagged notices in one user's timeline.
 #. TRANS: %1$s is the username, %2$s is the hash tag.
 #, php-format
 msgid "Notices by %1$s tagged %2$s"
 msgstr "Допи�и %1$s позначені теґом %2$s"
 
-#. TRANS: Page title showing tagged notices in one user's stream.
+#. TRANS: Page title showing tagged notices in one user's timeline.
 #. TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number.
 #, php-format
 msgid "Notices by %1$s tagged %2$s, page %3$d"
 msgstr "Допи�и %1$s позначені теґом %2$s, �торінка %3$d"
 
-#. TRANS: Extended page title showing tagged notices in one user's stream.
+#. TRANS: Extended page title showing tagged notices in one user's timeline.
 #. TRANS: %1$s is the username, %2$d is the page number.
 #, php-format
 msgid "Notices by %1$s, page %2$d"
@@ -5604,6 +5317,12 @@ msgstr "Допи�и %1$s, �торінка %2$d"
 msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
 msgstr "Стрічка допи�ів %1$s з теґом «%2$s» (RSS 1.0)"
 
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#, fuzzy, php-format
+msgid "Notice feed for %s (Activity Streams JSON)"
+msgstr "Стрічка допи�ів дл� %s (Atom)"
+
 #. TRANS: Title for link to notice feed.
 #. TRANS: %s is a user nickname.
 #, php-format
@@ -5628,7 +5347,7 @@ msgstr "Стрічка допи�ів дл� %s (Atom)"
 msgid "FOAF for %s"
 msgstr "FOAF дл� %s"
 
-#. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
+#. TRANS: First sentence of empty list message for a timeline. $1%s is a user nickname.
 #, php-format
 msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
 msgstr "Це �трічка допи�ів %1$s, але %1$s ще нічого не напи�ав."
@@ -5641,7 +5360,7 @@ msgstr ""
 "Побачили що�ь цікаве нещодавно? Ви ще нічого не напи�али і це �лушна нагода "
 "аби розпочати! :)"
 
-#. TRANS: Second sentence of empty  list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
+#. TRANS: Second sentence of empty  list message for a non-self timeline. %1$s is a user nickname, %2$s is a part of a URL.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
 #, php-format
 msgid ""
@@ -5651,7 +5370,7 @@ msgstr ""
 "Ви можете «розштовхати» %1$s або [що�ь йому напи�ати](%%%%action.newnotice%%%"
 "%?status_textarea=%2$s)."
 
-#. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
+#. TRANS: Announcement for anonymous users showing a timeline if site registrations are open.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
 #, php-format
 msgid ""
@@ -5666,13 +5385,13 @@ msgstr ""
 "register%%%%) зараз і �лідкуйте за допи�ами **%s**, також на ва� чекає "
 "багато іншого! ([Дізнати�� більше](%%%%doc.help%%%%))"
 
-#. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
+#. TRANS: Announcement for anonymous users showing a timeline if site registrations are closed or invite only.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#, php-format
+#, fuzzy, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
 "wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
-"[StatusNet](http://status.net/) tool. "
+"[StatusNet](http://status.net/) tool."
 msgstr ""
 "**%s** є вла�ником акаунту на �айті %%%%site.name%%%% — �ерві�і [мікроблоґів]"
 "(http://uk.wikipedia.org/wiki/Мікроблогінг), �кий працює на вільному "
@@ -5709,6 +5428,14 @@ msgstr "Ім’� �айту не може бути порожнім."
 msgid "You must have a valid contact email address."
 msgstr "Електронна адре�а має бути чинною."
 
+#. TRANS: Client error displayed when a logo URL is not valid.
+msgid "Invalid logo URL."
+msgstr "Помилкова URL-адре�а логотипу."
+
+#. TRANS: Client error displayed when a SSL logo URL is invalid.
+msgid "Invalid SSL logo URL."
+msgstr "�евірний SSL або URL-адре�а логотипу."
+
 #. TRANS: Client error displayed trying to save site settings with an invalid language code.
 #. TRANS: %s is the invalid language code.
 #, php-format
@@ -5781,7 +5508,9 @@ msgid "Default language"
 msgstr "Мова за замовчуванн�м"
 
 #. TRANS: Dropdown title on site settings panel.
-msgid "Site language when autodetection from browser settings is not available"
+#, fuzzy
+msgid ""
+"The site language when autodetection from browser settings is not available."
 msgstr ""
 "Мова �айту на випадок, коли автовизначенн� мови за на�тройками браузера не "
 "до�тупно"
@@ -5809,8 +5538,21 @@ msgstr ""
 "Як довго кори�тувачі мають зачекати (в �екундах) аби наді�лати той �амий "
 "допи� ще раз."
 
+#. TRANS: Fieldset legend for form to change logo.
+msgid "Logo"
+msgstr "Логотип"
+
+#. TRANS: Field label for StatusNet site logo.
+msgid "Site logo"
+msgstr "Логотип �айту"
+
+#. TRANS: Field label for SSL StatusNet site logo.
+msgid "SSL logo"
+msgstr "Логотип �айту з SSL"
+
 #. TRANS: Button title for saving site settings.
-msgid "Save site settings"
+#, fuzzy
+msgid "Save the site settings."
 msgstr "Зберегти налаштуванн� �айту"
 
 #. TRANS: Page title for site-wide notice tab in admin panel.
@@ -5838,7 +5580,7 @@ msgid "Site-wide notice text (255 characters maximum; HTML allowed)"
 msgstr ""
 "Тек�т повідомленн� �айту (255 �имволів мак�имум; де�кий HTML дозволено)"
 
-#. TRANS: Title for button to save site notice in admin panel.
+#. TRANS: Button title to save site notice in admin panel.
 msgid "Save site notice."
 msgstr "Зберегти повідомленн� �айту."
 
@@ -6031,7 +5773,7 @@ msgstr "Звітн� URL-адре�а"
 msgid "Snapshots will be sent to this URL."
 msgstr "Знімки над�илатимуть�� до цієї URL-адре�и."
 
-#. TRANS: Title for button to save snapshot settings.
+#. TRANS: Button title to save snapshot settings.
 msgid "Save snapshot settings."
 msgstr "Зберегти налаштуванн� знімків."
 
@@ -6064,10 +5806,6 @@ msgstr "Кори�тувачі, що очікують затвердженн� 
 msgid "A list of users awaiting approval to subscribe to you."
 msgstr "Спи�ок кори�тувачів, �кі очікують дозволу на підпи�ку до ва�."
 
-#. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
-msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
-msgstr "Цією дією ви не зможете підпи�ати�� до віддаленого профілю OMB 0.1."
-
 #. TRANS: Page title when subscription succeeded.
 msgid "Subscribed"
 msgstr "Підпи�ані"
@@ -6163,13 +5901,12 @@ msgstr "Тут пред�тавлені ті, за чиїми допи�ами 
 #. TRANS: This message contains Markdown URLs. The link description is between
 #. TRANS: square brackets, and the link between parentheses. Do not separate "]("
 #. TRANS: and do not change the URL part.
-#, php-format
+#, fuzzy, php-format
 msgid ""
 "You're not listening to anyone's notices right now, try subscribing to "
 "people you know. Try [people search](%%action.peoplesearch%%), look for "
 "members in groups you're interested in and in our [featured users](%%action."
-"featured%%). If you're a [Twitter user](%%action.twittersettings%%), you can "
-"automatically subscribe to people you already follow there."
+"featured%%)."
 msgstr ""
 "Ви не �лідкуєте за жодним з допи�увачів, �пробуйте підпи�ати�ь до тих, кого "
 "ви знаєте. Спробуйте [розшукати людей](%%action.peoplesearch%%), роздивіть�� "
@@ -6206,6 +5943,12 @@ msgstr "СМС"
 msgid "Notices tagged with %1$s, page %2$d"
 msgstr "Допи�и з теґом %1$s, �торінка %2$d"
 
+#. TRANS: Link label for feed on "notices with tag" page.
+#. TRANS: %s is the tag the feed is for.
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (Activity Streams JSON)"
+msgstr "Стрічка допи�ів дл� теґу %s (Atom)"
+
 #. TRANS: Link label for feed on "notices with tag" page.
 #. TRANS: %s is the tag the feed is for.
 #, php-format
@@ -6308,16 +6051,6 @@ msgstr "Відпи�ано"
 msgid "%1$s unsubscribed from list %2$s by %3$s"
 msgstr "%1$s відпи�ав�� від �пи�ку %2$s кори�тувача %3$s"
 
-#. TRANS: Client error displayed when trying to update profile with an incompatible license.
-#. TRANS: %1$s is the license incompatible with site license %2$s.
-#. TRANS: Exception thrown when licenses are not compatible for an authorisation request.
-#. TRANS: %1$s is the license for the listenee, %2$s is the license for "this" StatusNet site.
-#, php-format
-msgid ""
-"Listenee stream license \"%1$s\" is not compatible with site license \"%2$s"
-"\"."
-msgstr "Ліцензі� потоку «%1$s» є не�умі�ною з ліцензією �айту «%2$s»."
-
 #. TRANS: Title of URL settings tab in profile settings.
 msgid "URL settings"
 msgstr "�алаштуванн� URL"
@@ -6454,155 +6187,10 @@ msgid "Whether to allow users to invite new users."
 msgstr ""
 "В той чи інший �по�іб дозволити кори�тувачам вітати нових кори�тувачів."
 
-#. TRANS: Title for button to save user settings in user admin panel.
+#. TRANS: Button title to save user settings in user admin panel.
 msgid "Save user settings."
 msgstr "Зберегти налаштуванн� кори�тувача."
 
-#. TRANS: Page title.
-msgid "Authorize subscription"
-msgstr "�вторизувати підпи�ку"
-
-#. TRANS: Page notice on "Authorize subscription" page.
-msgid ""
-"Please check these details to make sure that you want to subscribe to this "
-"user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
-"click \"Reject\"."
-msgstr ""
-"Будь ла�ка, перевірте в�і деталі, аби упевнити�ь, що ви дій�но бажаєте "
-"підпи�ати�ь на допи�и цього кори�тувача. Якщо ви не збираєте�ь "
-"підпи�увати�ь, то про�то нати�ніть «Відмінити»."
-
-#. TRANS: Button text on Authorise Subscription page.
-#. TRANS: Submit button text to accept a group membership request on approve group form.
-#. TRANS: Submit button text to accept a subscription request on approve sub form.
-msgctxt "BUTTON"
-msgid "Accept"
-msgstr "Погодити�ь"
-
-#. TRANS: Title for button on Authorise Subscription page.
-#. TRANS: Button title to subscribe to a user.
-msgid "Subscribe to this user."
-msgstr "Підпи�ати�� до цього кори�тувача."
-
-#. TRANS: Button text on Authorise Subscription page.
-#. TRANS: Submit button text to reject a group membership request on approve group form.
-#. TRANS: Submit button text to reject a subscription request on approve sub form.
-msgctxt "BUTTON"
-msgid "Reject"
-msgstr "Відхилити"
-
-#. TRANS: Title for button on Authorise Subscription page.
-msgid "Reject this subscription."
-msgstr "Відхилити підпи�ку."
-
-#. TRANS: Client error displayed for an empty authorisation request.
-msgid "No authorization request!"
-msgstr "�емає запиту на авторизацію!"
-
-#. TRANS: Accept message header from Authorise subscription page.
-msgid "Subscription authorized"
-msgstr "Підпи�ку авторизовано"
-
-#. TRANS: Accept message text from Authorise subscription page.
-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-адре�а у відповідь не передавала��. "
-"Звірте�ь з ін�трукці�ми на �айті дл� більш конкретної інформації про те, �к "
-"авторизувати підпи�ку. Ваш підпи�ний токен:"
-
-#. TRANS: Reject message header from Authorise subscription page.
-msgid "Subscription rejected"
-msgstr "Підпи�ку �кинуто"
-
-#. TRANS: Reject message from Authorise subscription page.
-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-адре�а у відповідь не передавала��. Звірте�ь "
-"з ін�трукці�ми на �айті дл� більш конкретної інформації про те, �к �кинути "
-"підпи�ку."
-
-#. TRANS: Exception thrown when no valid user is found for an authorisation request.
-#. TRANS: %s is a listener URI.
-#, php-format
-msgid "Listener URI \"%s\" not found here."
-msgstr "URI �лухача «%s» тут не знайдено."
-
-#. TRANS: Exception thrown when listenee URI is too long for an authorisation request.
-#. TRANS: %s is a listenee URI.
-#, php-format
-msgid "Listenee URI \"%s\" is too long."
-msgstr "URI �лухача «%s» задовге."
-
-#. TRANS: Exception thrown when listenee URI is a local user for an authorisation request.
-#. TRANS: %s is a listenee URI.
-#, php-format
-msgid "Listenee URI \"%s\" is a local user."
-msgstr "URI �лухача «%s» — це локальний кори�тувач."
-
-#. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
-#. TRANS: %s is a profile URL.
-#, php-format
-msgid "Profile URL \"%s\" is for a local user."
-msgstr "URL-адре�а профілю «%s» дл� локального кори�тувача."
-
-#. TRANS: Exception thrown when avatar URL is invalid for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#, php-format
-msgid "Avatar URL \"%s\" is not valid."
-msgstr "URL-адре�а аватари «%s» не є дій�ною."
-
-#. TRANS: Exception thrown when avatar URL could not be read for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#, php-format
-msgid "Cannot read avatar URL \"%s\"."
-msgstr "�е вдало�� прочитати URL аватари «%s»."
-
-#. TRANS: Exception thrown when avatar URL return an invalid image type for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#, php-format
-msgid "Wrong image type for avatar URL \"%s\"."
-msgstr "�еправильний тип зображенн� дл� URL аватари «%s»."
-
-#. TRANS: Title for profile design page.
-#. TRANS: Page title for profile design page.
-msgid "Profile design"
-msgstr "Дизайн профілю"
-
-#. TRANS: Instructions for Profile design page.
-#. TRANS: Instructions for profile design page.
-msgid ""
-"Customize the way your profile looks with a background image and a colour "
-"palette of your choice."
-msgstr ""
-"�алаштуйте вигл�д �торінки �вого профілю, викори�товуючи фонове зображенн� і "
-"кольори на �вій �мак."
-
-#. TRANS: Succes message on Profile design page when finding an easter egg.
-msgid "Enjoy your hotdog!"
-msgstr "Пола�уйте бутербродом!"
-
-#. TRANS: Form legend on Profile design page.
-msgid "Design settings"
-msgstr "�алаштуванн� дизайну"
-
-#. TRANS: Checkbox label on Profile design page.
-msgid "View profile designs"
-msgstr "Перегл�дати дизайн кори�тувачів"
-
-#. TRANS: Title for checkbox on Profile design page.
-msgid "Show or hide profile designs."
-msgstr "Показувати або приховувати дизайни �торінок окремих кори�тувачів."
-
-#. TRANS: Form legend on Profile design page for form to choose a background image.
-msgid "Background file"
-msgstr "Файл фону"
-
 #. TRANS: Page title for all but the first page of groups for a user.
 #. TRANS: %1$s is a nickname, %2$d is a page number.
 #, php-format
@@ -6643,9 +6231,9 @@ msgstr "StatusNet %s"
 
 #. TRANS: Content part of StatusNet version page.
 #. TRANS: %1$s is the engine name (StatusNet) and %2$s is the StatusNet version.
-#, php-format
+#, fuzzy, php-format
 msgid ""
-"This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, "
+"This site is powered by %1$s version %2$s, Copyright 2008-2011 StatusNet, "
 "Inc. and contributors."
 msgstr ""
 "Цей �айт працює на %1$s, вер�і� %2$s. �втор�ькі права 2008-2010 StatusNet, "
@@ -6660,11 +6248,12 @@ msgid "License"
 msgstr "Ліцензі�"
 
 #. TRANS: Content part of StatusNet version page.
+#, fuzzy
 msgid ""
 "StatusNet is free software: you can redistribute it and/or modify it under "
 "the terms of the GNU Affero General Public License as published by the Free "
 "Software Foundation, either version 3 of the License, or (at your option) "
-"any later version. "
+"any later version."
 msgstr ""
 "StatusNet є вільним програмним забезпеченн�м: ви можете розпов�юджувати та/"
 "або змінювати його відповідно до умов GNU Affero General Public License, що "
@@ -6672,11 +6261,12 @@ msgstr ""
 "ваш роз�уд) будь-�ка подальша вер�і�. "
 
 #. TRANS: Content part of StatusNet version page.
+#, fuzzy
 msgid ""
 "This program is distributed in the hope that it will be useful, but WITHOUT "
 "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
 "FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License "
-"for more details. "
+"for more details."
 msgstr ""
 "Ми розміщуємо дану програму в надії, що вона �тане кори�ною, проте �Е Д�ЄМО "
 "ЖОД�ИХ Г�Р��ТІЙ; у тому чи�лі не�вних гарантій її КОМЕРЦІЙ�ОЇ ЦІ��ОСТІ або "
@@ -6736,16 +6326,27 @@ msgstr "�еможливо обробити URL «%s»"
 msgid "Robin thinks something is impossible."
 msgstr "Робін вважає, що це неможливо."
 
-#. TRANS: Message given if an upload is larger than the configured maximum.
-#. TRANS: %1$d is the byte limit for uploads, %2$d is the byte count for the uploaded file.
-#. TRANS: %1$s is used for plural.
+#. TRANS: Message used to be inserted as %2$s in  the text "No file may
+#. TRANS: be larger than %1$d byte and the file you sent was %2$s.".
+#. TRANS: %1$d is the number of bytes of an uploaded file.
 #, php-format
+msgid "%1$d byte"
+msgid_plural "%1$d bytes"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#. TRANS: Message given if an upload is larger than the configured maximum.
+#. TRANS: %1$d (used for plural) is the byte limit for uploads,
+#. TRANS: %2$s is the proper form of "n bytes". This is the only ways to have
+#. TRANS: gettext support multiple plurals in the same message, unfortunately...
+#, fuzzy, php-format
 msgid ""
-"No file may be larger than %1$d byte and the file you sent was %2$d bytes. "
-"Try to upload a smaller version."
+"No file may be larger than %1$d byte and the file you sent was %2$s. Try to "
+"upload a smaller version."
 msgid_plural ""
-"No file may be larger than %1$d bytes and the file you sent was %2$d bytes. "
-"Try to upload a smaller version."
+"No file may be larger than %1$d bytes and the file you sent was %2$s. Try to "
+"upload a smaller version."
 msgstr[0] ""
 "Файл не може бути більшим за %1$d байт, а те, що ви хочете наді�лати, важить "
 "%2$d байтів. Спробуйте завантажити меншу вер�ію."
@@ -6822,6 +6423,11 @@ msgstr "�е вдаєть�� оновити локальну �пільноту
 msgid "Could not create login token for %s"
 msgstr "�е вдало�� �творити токен входу дл� %s"
 
+#. TRANS: Exception thrown when a program code class (%s) cannot be instantiated.
+#, fuzzy, php-format
+msgid "Cannot instantiate class %s."
+msgstr "�е вдаєть�� зберегти новий пароль."
+
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.
 msgid "No database name or DSN found anywhere."
 msgstr "�емає імені бази даних або DSN ніде не знайдено"
@@ -6976,10 +6582,10 @@ msgstr ""
 "теґи."
 
 #. TRANS: Client exception thrown when trying to add more people than allowed to a list.
-#, php-format
+#, fuzzy, php-format
 msgid ""
 "You already have %1$d or more people in list %2$s, which is the maximum "
-"allowed number.Try unlisting others first."
+"allowed number. Try unlisting others first."
 msgstr ""
 "У вашому �пи�ку %2$s вже зазначено %1$d або більше кори�тувачів, що "
 "�тановить дозволений ліміт. Спробуйте �початку кого�ь видалити зі �пи�ку."
@@ -7001,7 +6607,6 @@ msgid "Unable to save tag."
 msgstr "�е вдаєть�� зберегти теґ."
 
 #. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
-#. TRANS: Error message displayed to a banned user when they try to subscribe.
 msgid "You have been banned from subscribing."
 msgstr "Ва� позбавлено можливо�ті підпи�ати�ь."
 
@@ -7021,10 +6626,6 @@ msgstr "�е підпи�ано!"
 msgid "Could not delete self-subscription."
 msgstr "�е можу видалити �амопідпи�ку."
 
-#. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
-msgid "Could not delete subscription OMB token."
-msgstr "�е вдаєть�� видалити токен підпи�ки OMB."
-
 #. TRANS: Exception thrown when a subscription could not be deleted on the server.
 msgid "Could not delete subscription."
 msgstr "�е вдало�� видалити підпи�ку."
@@ -7058,6 +6659,18 @@ msgstr "Кори�тувача дл� однокори�тувацького р
 msgid "Single-user mode code called when not enabled."
 msgstr "Код дл� однокори�тувацького режиму називаєть��, коли не ввімкнуто."
 
+#. TRANS: Information on password recovery form if no known username or e-mail address was specified.
+msgid "No user with that email address or username."
+msgstr "Кори�тувача з такою електронною адре�ою або ім’�м немає."
+
+#. TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.
+msgid "No registered email address for that user."
+msgstr "Дл� цього кори�тувача немає зареє�трованої електронної адре�и."
+
+#. TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.
+msgid "Error saving address confirmation."
+msgstr "Помилка при збереженні підтвердженн� адре�и."
+
 #. TRANS: Server exception thrown when creating a group failed.
 msgid "Could not create group."
 msgstr "�е вдало�� �творити нову �пільноту."
@@ -7159,7 +6772,7 @@ msgstr "Відпові�ти"
 #. TRANS: Placeholder text for inline reply form. Clicking in this box will turn it into a mini notice form.
 #. TRANS: Field label for reply mini form.
 msgid "Write a reply..."
-msgstr "Пише відповідь..."
+msgstr "�апи�ати відповідь..."
 
 #. TRANS: Tab on the notice form.
 msgctxt "TAB"
@@ -7325,25 +6938,11 @@ msgstr "showForm() не виконано."
 msgid "saveSettings() not implemented."
 msgstr "saveSettings() не виконано."
 
-#. TRANS: Client error message thrown if design settings could not be deleted in
-#. TRANS: the admin panel Design.
-msgid "Unable to delete design setting."
-msgstr "�емає можливо�ті видалити налаштуванн� дизайну."
-
 #. TRANS: Header in administrator navigation panel.
-#. TRANS: Header in settings navigation panel.
 msgctxt "HEADER"
 msgid "Home"
 msgstr "Головна"
 
-#. TRANS: Menu item in administrator navigation panel.
-#. TRANS: Menu item in default local navigation panel.
-#. TRANS: Menu item in personal group navigation menu.
-#. TRANS: Menu item in settings navigation panel.
-msgctxt "MENU"
-msgid "Home"
-msgstr "Головна"
-
 #. TRANS: Header in administrator navigation panel.
 msgctxt "HEADER"
 msgid "Admin"
@@ -7358,17 +6957,6 @@ msgctxt "MENU"
 msgid "Site"
 msgstr "Сайт"
 
-#. TRANS: Menu item title in administrator navigation panel.
-msgid "Design configuration"
-msgstr "Конфігураці� дизайну"
-
-#. TRANS: Menu item in administrator navigation panel.
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: Menu item in settings navigation panel.
-msgctxt "MENU"
-msgid "Design"
-msgstr "Дизайн"
-
 #. TRANS: Menu item title in administrator navigation panel.
 msgid "User configuration"
 msgstr "Конфігураці� кори�тувача"
@@ -7468,39 +7056,6 @@ msgstr "�емає кори�тувача дл� цього токену."
 msgid "Could not authenticate you."
 msgstr "�е вдало�� автентифікувати ва�."
 
-#. TRANS: Server error displayed when trying to create an anynymous OAuth consumer.
-msgid "Could not create anonymous consumer."
-msgstr "�е вдало�� �творити анонімного �поживача."
-
-#. TRANS: Server error displayed when trying to create an anynymous OAuth application.
-msgid "Could not create anonymous OAuth application."
-msgstr "�е вдало�� �творити анонімний додаток OAuth."
-
-#. TRANS: Exception thrown when no token association could be found.
-msgid ""
-"Could not find a profile and application associated with the request token."
-msgstr "�е вдало�� знайти профіль і додаток, пов’�заний з токеном запиту."
-
-#. TRANS: Exception thrown when no access token can be issued.
-msgid "Could not issue access token."
-msgstr "�е вдало�� видати токен до�тупу."
-
-#. TRANS: Exception thrown when a database error occurs.
-msgid "Database error inserting OAuth application user."
-msgstr "Помилка бази даних при додаванні кори�тувача OAuth-додатку."
-
-#. TRANS: Exception thrown when a database error occurs.
-msgid "Database error updating OAuth application user."
-msgstr "Помилка бази даних при додаванні кори�тувача OAuth-додатку."
-
-#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
-msgid "Tried to revoke unknown token."
-msgstr "Спроба �ка�увати невідомий токен."
-
-#. TRANS: Exception thrown when an attempt is made to remove a revoked token.
-msgid "Failed to delete revoked token."
-msgstr "�е вдало�� видалити �ка�ований токен."
-
 #. TRANS: Form input field label for application icon.
 msgid "Icon"
 msgstr "Іконка"
@@ -7583,13 +7138,14 @@ msgstr ""
 "Дозвіл за замовчуванн�м дл� цього додатку: лише читанн� або читати-пи�ати"
 
 #. TRANS: Submit button title.
-msgid "Cancel"
-msgstr "Ска�увати"
+#, fuzzy
+msgid "Cancel application changes."
+msgstr "Під’єднані додатки"
 
 #. TRANS: Submit button title.
-#. TRANS: Button text to save a list.
-msgid "Save"
-msgstr "Зберегти"
+#, fuzzy
+msgid "Save application changes."
+msgstr "�овий додаток"
 
 #. TRANS: Name for an anonymous application in application list.
 msgid "Unknown application"
@@ -7624,6 +7180,18 @@ msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "Відкликати"
 
+#. TRANS: Submit button text to accept a group membership request on approve group form.
+#. TRANS: Submit button text to accept a subscription request on approve sub form.
+msgctxt "BUTTON"
+msgid "Accept"
+msgstr "Погодити�ь"
+
+#. TRANS: Submit button text to reject a group membership request on approve group form.
+#. TRANS: Submit button text to reject a subscription request on approve sub form.
+msgctxt "BUTTON"
+msgid "Reject"
+msgstr "Відхилити"
+
 #. TRANS: Atom feed exception thrown when an author element does not contain a name element.
 msgid "Author element must contain a name element."
 msgstr "Елемент author повинен мі�тити елемент name."
@@ -8186,6 +7754,11 @@ msgstr "Запу�тіть файл ін�тал�ції, аби полагод
 msgid "Go to the installer."
 msgstr "Іти до файлу ін�тал�ції."
 
+#. TRANS: Header on conversation page. Hidden by default (h2).
+#. TRANS: Label for user statistics.
+msgid "Notices"
+msgstr "Допи�и"
+
 #. TRANS: Page title for when a database error occurs.
 msgid "Database error"
 msgstr "Помилка бази даних"
@@ -8196,13 +7769,6 @@ msgctxt "MENU"
 msgid "Public"
 msgstr "Загал"
 
-#. TRANS: Menu item in default local navigation panel.
-#. TRANS: Menu item in search group navigation panel.
-#. TRANS: Menu item in local navigation menu.
-msgctxt "MENU"
-msgid "Groups"
-msgstr "Спільноти"
-
 #. TRANS: Menu item in default local navigation panel.
 #. TRANS: Menu item title in local navigation menu.
 msgctxt "MENU"
@@ -8218,51 +7784,12 @@ msgstr "Видалити"
 msgid "Delete this user"
 msgstr "Видалити цього кори�тувача"
 
-#. TRANS: Form legend of form for changing the page design.
-msgid "Change design"
-msgstr "Змінити дизайн"
-
-#. TRANS: Fieldset legend on profile design page to change profile page colours.
-msgid "Change colours"
-msgstr "Змінити кольори"
-
-#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-msgid "Use defaults"
-msgstr "За замовч."
-
-#. TRANS: Label in form on profile design page.
-#. TRANS: Field contains file name on user's computer that could be that user's custom profile background image.
-msgid "Upload file"
-msgstr "Завантажити файл"
-
-#. TRANS: Instructions for form on profile design page.
-msgid ""
-"You can upload your personal background image. The maximum file size is 2MB."
-msgstr ""
-"Ви можете завантажити вла�не фонове зображенн�. Мак�имальний розмір файлу "
-"�тановить 2Мб."
-
-#. TRANS: Radio button on profile design page that will enable use of the uploaded profile image.
-msgctxt "RADIO"
-msgid "On"
-msgstr "Увімк."
-
-#. TRANS: Radio button on profile design page that will disable use of the uploaded profile image.
-msgctxt "RADIO"
-msgid "Off"
-msgstr "Вимк."
-
-#. TRANS: Success message displayed if design settings were saved after clicking "Use defaults".
-msgid "Design defaults restored."
-msgstr "Дизайн за замовчуванн�м відновлено."
-
 #. TRANS: Exception. %s is an ID.
 #, php-format
 msgid "Unable to find services for %s."
 msgstr "�е вдаєть�� знайти по�луги дл� %s."
 
 #. TRANS: Form legend for removing the favourite status for a favourite notice.
-#. TRANS: Title for button text for removing the favourite status for a favourite notice.
 msgid "Disfavor this notice"
 msgstr "Видалити з обраних"
 
@@ -8271,8 +7798,12 @@ msgctxt "BUTTON"
 msgid "Disfavor favorite"
 msgstr "Видалити з обраних"
 
+#. TRANS: Button title for removing the favourite status for a favourite notice.
+#, fuzzy
+msgid "Remove this notice from your list of favorite notices."
+msgstr "�е можна відновити обрані допи�и."
+
 #. TRANS: Form legend for adding the favourite status to a notice.
-#. TRANS: Title for button text for adding the favourite status to a notice.
 msgid "Favor this notice"
 msgstr "Позначити �к обране"
 
@@ -8281,6 +7812,11 @@ msgctxt "BUTTON"
 msgid "Favor"
 msgstr "Обрати"
 
+#. TRANS: Button title for adding the favourite status to a notice.
+#, fuzzy
+msgid "Add this notice to your list of favorite notices."
+msgstr "�е можна відновити обрані допи�и."
+
 #. TRANS: Feed type name.
 msgid "RSS 1.0"
 msgstr "RSS 1.0"
@@ -8297,6 +7833,10 @@ msgstr "Atom"
 msgid "FOAF"
 msgstr "FOAF"
 
+#. TRANS: Feed type name. See http://activitystrea.ms/
+msgid "Activity Streams"
+msgstr ""
+
 #. TRANS: Client exception thrown when an imported feed does not have an author.
 msgid "No author in the feed."
 msgstr "�емає автора в цій �трічці."
@@ -8328,6 +7868,28 @@ msgstr "Оберіть теґ дл� звуженого �пи�ку."
 msgid "Grant this user the \"%s\" role"
 msgstr "�адати цьому кори�тувачеві роль «%s»"
 
+#. TRANS: Header for mini list of group members on a group page (h2).
+msgid "Members"
+msgstr "Уча�ники"
+
+#. TRANS: Link to all group members from mini list of group members if group has more than n members.
+msgid "All members"
+msgstr "В�і уча�ники"
+
+#. TRANS: Header for mini list of users with a pending membership request on a group page (h2).
+#, fuzzy
+msgid "Pending"
+msgstr "В очікуванні (%d)"
+
+#. TRANS: Header for mini list of users that are blocked in a group page (h2).
+msgid "Blocked"
+msgstr "Блок"
+
+#. TRANS: Title for list of group administrators on a group page.
+msgctxt "TITLE"
+msgid "Admins"
+msgstr "�дміни"
+
 #. TRANS: Button text for the form that will block a user from a group.
 msgctxt "BUTTON"
 msgid "Block"
@@ -8335,8 +7897,8 @@ msgstr "Блок"
 
 #. TRANS: Submit button title.
 msgctxt "TOOLTIP"
-msgid "Block this user"
-msgstr "Блокувати кори�тувача"
+msgid "Block this user so that they can no longer post messages to it."
+msgstr ""
 
 #. TRANS: Field title on group edit form.
 msgid "URL of the homepage or blog of the group or topic."
@@ -8396,64 +7958,9 @@ msgctxt "GROUPADMIN"
 msgid "Admin"
 msgstr "�дмін"
 
-#. TRANS: Menu item in the group navigation page.
-msgctxt "MENU"
-msgid "Group"
-msgstr "Спільнота"
-
-#. TRANS: Tooltip for menu item in the group navigation page.
-#. TRANS: %s is the nickname of the group.
-#, php-format
-msgctxt "TOOLTIP"
-msgid "%s group"
-msgstr "Спільнота %s"
-
-#. TRANS: Menu item in the group navigation page.
-msgctxt "MENU"
-msgid "Members"
-msgstr "Уча�ники"
-
-#. TRANS: Tooltip for menu item in the group navigation page.
-#. TRANS: %s is the nickname of the group.
-#, php-format
-msgctxt "TOOLTIP"
-msgid "%s group members"
-msgstr "Уча�ники �пільноти %s"
-
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: %d is the number of pending members.
-#, php-format
-msgctxt "MENU"
-msgid "Pending members (%d)"
-msgid_plural "Pending members (%d)"
-msgstr[0] "В очікуванні уча�ників (%d)"
-msgstr[1] "В очікуванні уча�ників (%d)"
-msgstr[2] "В очікуванні уча�ників (%d)"
-
-#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: %s is the nickname of the group.
-#, php-format
-msgctxt "TOOLTIP"
-msgid "%s pending members"
-msgstr "Очікують підтвердженн� в %s"
-
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-msgctxt "MENU"
-msgid "Blocked"
-msgstr "Заблоковані"
-
-#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: %s is the nickname of the group.
-#, php-format
-msgctxt "TOOLTIP"
-msgid "%s blocked users"
-msgstr "Заблоковані кори�тувачі %s"
-
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: Menu item in primary navigation panel.
-msgctxt "MENU"
-msgid "Admin"
-msgstr "�дмін"
+#. TRANS: Group actions header (h2). Text hidden by default.
+msgid "Group actions"
+msgstr "Дії �пільноти"
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
@@ -8462,11 +7969,6 @@ msgctxt "TOOLTIP"
 msgid "Edit %s group properties"
 msgstr "Редагувати вла�тиво�ті �пільноти %s"
 
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-msgctxt "MENU"
-msgid "Logo"
-msgstr "Логотип"
-
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
 #, php-format
@@ -8474,16 +7976,10 @@ msgctxt "TOOLTIP"
 msgid "Add or edit %s logo"
 msgstr "Додати або редагувати логотип %s"
 
-#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: %s is the nickname of the group.
-#, php-format
-msgctxt "TOOLTIP"
-msgid "Add or edit %s design"
-msgstr "Додати або редагувати дизайн %s"
-
-#. TRANS: Group actions header (h2). Text hidden by default.
-msgid "Group actions"
-msgstr "Дії �пільноти"
+#. TRANS: Link text for link on user profile.
+msgctxt "MENU"
+msgid "Logo"
+msgstr "Логотип"
 
 #. TRANS: Title for groups with the most members section.
 msgid "Popular groups"
@@ -8493,11 +7989,20 @@ msgstr "Попул�рні �пільноти"
 msgid "Active groups"
 msgstr "�ктивні �пільноти"
 
-#. TRANS: Title for group tag cloud section.
-#. TRANS: %s is a group name.
-#, php-format
-msgid "Tags in %s group's notices"
-msgstr "Теґи у допи�ах �пільноти %s"
+#. TRANS: Link description for seeing all groups.
+#. TRANS: Link description for seeing all lists.
+#, fuzzy
+msgid "See all"
+msgstr "Показати в�іх"
+
+#. TRANS: Link title for seeing all groups.
+msgid "See all groups you belong to."
+msgstr ""
+
+#. TRANS: Menu item title in personal group navigation menu.
+#. TRANS: %s is a username.
+msgid "Back to top"
+msgstr ""
 
 #. TRANS: Client exception 406
 msgid "This page is not available in a media type you accept"
@@ -8591,11 +8096,42 @@ msgctxt "TITLE"
 msgid "Trends"
 msgstr "Тенденції"
 
-#. TRANS: Button text for inviting more users to the StatusNet instance.
+#. TRANS: Default button text for inviting more users to the StatusNet instance.
 msgctxt "BUTTON"
 msgid "Invite more colleagues"
 msgstr "Запро�ити більше колег"
 
+#. TRANS: Form legend.
+msgid "Invite collegues"
+msgstr "Запро�ити колег"
+
+#. TRANS: Field label for a list of e-mail addresses.
+msgid "Email addresses"
+msgstr "Електронні адре�и"
+
+#. TRANS: Field title for a list of e-mail addresses.
+msgid "Addresses of friends to invite (one per line)."
+msgstr ""
+"�дре�и друзів, куди над�илатимуть�� запрошенн� (кожна адре�а окремим р�дком)."
+
+#. TRANS: Field label for a personal message to send to invitees.
+msgid "Personal message"
+msgstr "О�оби�ті повідомленн�"
+
+#. TRANS: Field title for a personal message to send to invitees.
+msgid "Optionally add a personal message to the invitation."
+msgstr "Можна додати пер�ональне повідомленн� до запрошенн� (опціонально)."
+
+#. TRANS: Send button for inviting friends
+#. TRANS: Button text for sending notice.
+msgctxt "BUTTON"
+msgid "Send"
+msgstr "�аді�лати"
+
+#. TRANS: Submit button title.
+msgid "Send invitations."
+msgstr "�аді�лати запрошенн�."
+
 #. TRANS: Button text for joining a group.
 msgctxt "BUTTON"
 msgid "Join"
@@ -8606,6 +8142,11 @@ msgctxt "BUTTON"
 msgid "Leave"
 msgstr "Залишити"
 
+#. TRANS: Link title for seeing all lists.
+#, fuzzy
+msgid "See all lists you have created."
+msgstr "Додатки, �кі ви зареє�трували"
+
 #. TRANS: Menu item for logging in to the StatusNet site.
 #. TRANS: Menu item in primary navigation panel.
 msgctxt "MENU"
@@ -8665,7 +8206,7 @@ msgstr ""
 #. TRANS: Main body of new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscriber's long name, %2$s is the StatusNet sitename.
 #, php-format
-msgid "%1$s is now listening to your notices on %2$s."
+msgid "%1$s is now following you on %2$s."
 msgstr "%1$s тепер �лідкує за вашими допи�ами на %2$s."
 
 #. TRANS: Subject of pending new-subscriber notification e-mail.
@@ -8891,7 +8432,7 @@ msgstr "%1$s (@%2$s) пропонує до вашої уваги на�тупн
 #. TRANS: Body of @-reply notification e-mail.
 #. TRANS: %1$s is the sending user's name, $2$s is the StatusNet sitename,
 #. TRANS: %3$s is a URL to the notice, %4$s is the notice text,
-#. TRANS: %5$s is a URL to the full conversion if it exists (otherwise empty),
+#. TRANS: %5$s is the text "The full conversation can be read here:" and a URL to the full conversion if it exists (otherwise empty),
 #. TRANS: %6$s is a URL to reply to the notice, %7$s is a URL to all @-replies for the addressed user,
 #, php-format
 msgid ""
@@ -8933,6 +8474,10 @@ msgstr ""
 
 #. TRANS: Subject of group join notification e-mail.
 #. TRANS: %1$s is the joining user's nickname, %2$s is the group name, and %3$s is the StatusNet sitename.
+#, fuzzy, php-format
+msgid "%1$s has joined your group %2$s on %3$s"
+msgstr "%1$s долучив�� до �пільноти %2$s на %3$s."
+
 #. TRANS: Main body of group join notification e-mail.
 #. TRANS: %1$s is the subscriber's long name, %2$s is the group name, and %3$s is the StatusNet sitename,
 #. TRANS: %4$s is a block of profile info about the subscriber.
@@ -9023,8 +8568,9 @@ msgid "Make Admin"
 msgstr "Зробити адміном"
 
 #. TRANS: Submit button title.
+#, fuzzy
 msgctxt "TOOLTIP"
-msgid "Make this user an admin"
+msgid "Make this user an admin."
 msgstr "�адати цьому кори�тувачеві права адміні�тратора"
 
 #. TRANS: Client exception thrown when a database error was thrown during a file upload operation.
@@ -9072,7 +8618,7 @@ msgstr "�аді�лати пр�мий допи�"
 msgid "Select recipient:"
 msgstr "Оберіть одержувача:"
 
-#. TRANS Entry in drop-down selection box in direct-message inbox/outbox when no one is available to message.
+#. TRANS: Entry in drop-down selection box in direct-message inbox/outbox when no one is available to message.
 msgid "No mutual subscribers."
 msgstr "�емає відповідних абонентів."
 
@@ -9139,6 +8685,10 @@ msgstr "�е знаю, �к обробити ціль такого типу."
 msgid "You must implement either adaptNoticeListItem() or showNotice()."
 msgstr "Ви повинні виконати або adaptNoticeListItem(), або showNotice()."
 
+#. TRANS: Link description to show more items in a list.
+msgid "More â–¼"
+msgstr "Більше ▼"
+
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 msgid "Nickname cannot be empty."
 msgstr "П�евдонім не може бути порожнім."
@@ -9189,10 +8739,6 @@ msgctxt "SEPARATOR"
 msgid ", "
 msgstr ", "
 
-#. TRANS: Start of profile addressees list.
-msgid " â–¸ "
-msgstr "â–¸ "
-
 #. TRANS: Used in coordinates as abbreviation of north.
 msgid "N"
 msgstr "Півн."
@@ -9231,7 +8777,8 @@ msgid "Repeated by"
 msgstr "Повторено"
 
 #. TRANS: Link title in notice list item to reply to a notice.
-msgid "Reply to this notice"
+#, fuzzy
+msgid "Reply to this notice."
 msgstr "Відпові�ти на цей допи�"
 
 #. TRANS: Link text in notice list item to reply to a notice.
@@ -9239,8 +8786,9 @@ msgid "Reply"
 msgstr "Відпові�ти"
 
 #. TRANS: Link title in notice list item to delete a notice.
-msgid "Delete this notice"
-msgstr "Видалити допи�"
+#, fuzzy
+msgid "Delete this notice from the timeline."
+msgstr "Видалити допи�."
 
 #. TRANS: Title for repeat form status in notice list when a notice has been repeated.
 msgid "Notice repeated."
@@ -9263,26 +8811,6 @@ msgstr "«Розштовхати»"
 msgid "Send a nudge to this user."
 msgstr "Спробувати «розштовхати» цього кори�тувача."
 
-#. TRANS: Exception thrown when creating a new profile fails in OAuth store.
-msgid "Error inserting new profile."
-msgstr "Помилка при додаванні нового профілю."
-
-#. TRANS: Exception thrown when creating a new avatar fails in OAuth store.
-msgid "Error inserting avatar."
-msgstr "Помилка при додаванні аватари."
-
-#. TRANS: Exception thrown when creating a remote profile fails in OAuth store.
-msgid "Error inserting remote profile."
-msgstr "Помилка при додаванні віддаленого профілю."
-
-#. TRANS: Exception thrown when a notice is denied because it has been sent before.
-msgid "Duplicate notice."
-msgstr "Дублікат допи�у."
-
-#. TRANS: Exception thrown when creating a new subscription fails in OAuth store.
-msgid "Could not insert new subscription."
-msgstr "�е вдало�� в�тавити нову підпи�ку."
-
 #. TRANS: Server exception thrown in oEmbed action if no API endpoint is available.
 msgid "No oEmbed API endpoint available."
 msgstr "Кінцева точка oEmbed API є недо�тупною."
@@ -9361,10 +8889,6 @@ msgstr "Змінити"
 msgid "Edit %s list by you."
 msgstr "Змінити �вій �пи�ок %s."
 
-#. TRANS: Link description for link to list of users tagged with a tag.
-msgid "Tagged"
-msgstr "З теґом"
-
 #. TRANS: Title for link to edit list settings.
 msgid "Edit list settings."
 msgstr "Змінити налаштуванн� �пи�ку."
@@ -9507,8 +9031,11 @@ msgctxt "plugin"
 msgid "Enable"
 msgstr "Увімкнути"
 
+#. TRANS: Plugin description for a disabled plugin.
+#, fuzzy
 msgctxt "plugin-description"
-msgid "(Plugin descriptions unavailable when disabled.)"
+msgid ""
+"(The plugin description is unavailable when a plugin has been disabled.)"
 msgstr "(Опи� додатку недо�тупний, �кщо даний додаток вимкнутий.)"
 
 #. TRANS: Menu item in primary navigation panel.
@@ -9520,6 +9047,11 @@ msgstr "Параметри"
 msgid "Change your personal settings."
 msgstr "Змінити пер�ональні налаштуванн�."
 
+#. TRANS: Menu item in primary navigation panel.
+msgctxt "MENU"
+msgid "Admin"
+msgstr "�дмін"
+
 #. TRANS: Menu item title in primary navigation panel.
 msgid "Site configuration."
 msgstr "Конфігураці� �айту."
@@ -9537,14 +9069,8 @@ msgstr "Вийти з �айту."
 msgid "Login to the site."
 msgstr "Увійти на �айт."
 
-#. TRANS: Menu item in primary navigation panel.
-msgctxt "MENU"
-msgid "Search"
-msgstr "Пошук"
-
-#. TRANS: Menu item title in primary navigation panel.
-msgid "Search the site."
-msgstr "Пошук на �айті."
+msgid "This profile has been silenced by site moderators"
+msgstr ""
 
 #. TRANS: H2 text for user subscription statistics.
 msgid "Following"
@@ -9554,6 +9080,10 @@ msgstr "Читає"
 msgid "Followers"
 msgstr "Читачи"
 
+#. TRANS: H2 text for user statistics.
+msgid "Statistics"
+msgstr "Стати�тика"
+
 #. TRANS: Label for user statistics.
 msgid "User ID"
 msgstr "Ід. номер"
@@ -9562,10 +9092,6 @@ msgstr "Ід. номер"
 msgid "Member since"
 msgstr "Реє�траці�"
 
-#. TRANS: Label for user statistics.
-msgid "Notices"
-msgstr "Допи�и"
-
 #. TRANS: Label for user statistics.
 #. TRANS: Average count of posts made per day since account registration.
 msgid "Daily average"
@@ -9651,13 +9177,13 @@ msgid "Keyword(s)"
 msgstr "Ключові �лова"
 
 #. TRANS: Button text for searching site.
+#. TRANS: Button text for search button on search form.
 #. TRANS: Button text to search profiles.
 msgctxt "BUTTON"
 msgid "Search"
 msgstr "Пошук"
 
 #. TRANS: Standard search suggestions shown when a search does not give any results.
-#, fuzzy
 msgid ""
 "* Make sure all words are spelled correctly.\n"
 "* Try different keywords.\n"
@@ -9667,10 +9193,10 @@ msgstr ""
 "* Переконайте��, що в�і �лова напи�ано правильно.\n"
 "* Спробуйте різні ключові �лова.\n"
 "* Спробуйте узагальнити ключові �лова.\n"
-"* Спробуйте зменшити кількі�ть ключових �лів.\n"
+"* Спробуйте зменшити кількі�ть ключових �лів."
 
 #. TRANS: Standard search suggestions shown when a search does not give any results.
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "You can also try your search on other engines:\n"
 "\n"
@@ -9688,7 +9214,7 @@ msgstr ""
 "* [Tweet scan](http://www.tweetscan.com/indexi.php?s=%s)\n"
 "* [Google](http://www.google.com/search?q=site%%3A%%%%site.server%%%%+%s)\n"
 "* [Yahoo](http://search.yahoo.com/search?p=site%%3A%%%%site.server%%%%+%s)\n"
-"* [Collecta](http://collecta.com/#q=%s)\n"
+"* [Collecta](http://collecta.com/#q=%s)"
 
 #. TRANS: Menu item in search group navigation panel.
 msgctxt "MENU"
@@ -9712,21 +9238,6 @@ msgstr "Пошук допи�ів за змі�том"
 msgid "Find groups on this site"
 msgstr "Пошук �пільнот на цьому �айті"
 
-#. TRANS: Secondary navigation menu item leading to help on StatusNet.
-msgctxt "MENU"
-msgid "Help"
-msgstr "Довідка"
-
-#. TRANS: Secondary navigation menu item leading to text about StatusNet site.
-msgctxt "MENU"
-msgid "About"
-msgstr "Деталі"
-
-#. TRANS: Secondary navigation menu item leading to Frequently Asked Questions.
-msgctxt "MENU"
-msgid "FAQ"
-msgstr "ЧаП"
-
 #. TRANS: Secondary navigation menu item leading to Terms of Service.
 msgctxt "MENU"
 msgid "TOS"
@@ -9747,17 +9258,6 @@ msgctxt "MENU"
 msgid "Version"
 msgstr "Вер�і�"
 
-#. TRANS: Secondary navigation menu item leading to e-mail contact information on the
-#. TRANS: StatusNet site, where to report bugs, ...
-msgctxt "MENU"
-msgid "Contact"
-msgstr "Контакт"
-
-#. TRANS: Secondary navigation menu item. Leads to information about embedding a timeline widget.
-msgctxt "MENU"
-msgid "Badge"
-msgstr "Бедж"
-
 #. TRANS: Default title for section/sidebar widget.
 msgid "Untitled section"
 msgstr "Розділ без заголовку"
@@ -9802,10 +9302,6 @@ msgstr "Пошта"
 msgid "Change email handling"
 msgstr "Змінити електронну адре�у"
 
-#. TRANS: Menu item title in settings navigation panel.
-msgid "Design your profile"
-msgstr "Дизайн вашого профілю"
-
 #. TRANS: Menu item in settings navigation panel.
 msgctxt "MENU"
 msgid "URL"
@@ -9842,6 +9338,15 @@ msgstr "З’єднанн�"
 msgid "Authorized connected applications"
 msgstr "�вторизовані під’єднані додатки"
 
+#. TRANS: Menu item in settings navigation panel.
+msgctxt "MENU"
+msgid "Old school"
+msgstr ""
+
+#. TRANS: Menu item title in settings navigation panel.
+msgid "UI tweaks for old-school users"
+msgstr ""
+
 #. TRANS: Title of form to silence a user.
 msgctxt "TITLE"
 msgid "Silence"
@@ -9851,6 +9356,39 @@ msgstr "Вгамувати"
 msgid "Silence this user"
 msgstr "Зму�ити кори�тувача замовкнути, відправити у забутт�"
 
+#. TRANS: Server error displayed when trying to create an anynymous OAuth consumer.
+msgid "Could not create anonymous consumer."
+msgstr "�е вдало�� �творити анонімного �поживача."
+
+#. TRANS: Server error displayed when trying to create an anynymous OAuth application.
+msgid "Could not create anonymous OAuth application."
+msgstr "�е вдало�� �творити анонімний додаток OAuth."
+
+#. TRANS: Exception thrown when no token association could be found.
+msgid ""
+"Could not find a profile and application associated with the request token."
+msgstr "�е вдало�� знайти профіль і додаток, пов’�заний з токеном запиту."
+
+#. TRANS: Exception thrown when no access token can be issued.
+msgid "Could not issue access token."
+msgstr "�е вдало�� видати токен до�тупу."
+
+#. TRANS: Exception thrown when a database error occurs.
+msgid "Database error inserting OAuth application user."
+msgstr "Помилка бази даних при додаванні кори�тувача OAuth-додатку."
+
+#. TRANS: Exception thrown when a database error occurs.
+msgid "Database error updating OAuth application user."
+msgstr "Помилка бази даних при додаванні кори�тувача OAuth-додатку."
+
+#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
+msgid "Tried to revoke unknown token."
+msgstr "Спроба �ка�увати невідомий токен."
+
+#. TRANS: Exception thrown when an attempt is made to remove a revoked token.
+msgid "Failed to delete revoked token."
+msgstr "�е вдало�� видалити �ка�ований токен."
+
 #. TRANS: Menu item in local navigation menu.
 msgctxt "MENU"
 msgid "Subscriptions"
@@ -9907,6 +9445,16 @@ msgstr "Запро�іть друзів та колег приєднати�� 
 msgid "Subscribe to this user"
 msgstr "Підпи�ати�ь до цього кори�тувача"
 
+#. TRANS: Button text to subscribe to a user.
+#. TRANS: Button text for subscribing to a list.
+msgctxt "BUTTON"
+msgid "Subscribe"
+msgstr "Підпи�ати�ь"
+
+#. TRANS: Button title to subscribe to a user.
+msgid "Subscribe to this user."
+msgstr "Підпи�ати�� до цього кори�тувача."
+
 #. TRANS: Title of personal tag cloud section.
 msgid "People Tagcloud as self-tagged"
 msgstr "Хмарка теґів (позначки �амих кори�тувачів)"
@@ -10037,18 +9585,30 @@ msgstr[1] "%%s �подобало�� це."
 msgstr[2] "%%s �подобало�� це."
 
 #. TRANS: List message for notice repeated by logged in user.
+#, fuzzy
 msgctxt "REPEATLIST"
-msgid "You have repeated this notice."
+msgid "You repeated this."
 msgstr "Ви вже повторили цей допи�."
 
-#. TRANS: List message for repeated notices.
-#. TRANS: %d is the number of users that have repeated a notice.
-#, php-format
-msgid "One person has repeated this notice."
-msgid_plural "%d people have repeated this notice."
-msgstr[0] "Один кори�тувач повторив цей допи�."
-msgstr[1] "%d кори�тувачів повторили цей допи�."
-msgstr[2] "%d кори�тувачів повторили цей допи�."
+#. TRANS: List message for when more than 4 people repeat something.
+#. TRANS: %%s is a list of users liking a notice, %d is the number over 4 that like the notice.
+#. TRANS: Plural is decided on the total number of users liking the notice (count of %%s + %d).
+#, fuzzy, php-format
+msgid "%%s and %d other repeated this."
+msgid_plural "%%s and %d others repeated this."
+msgstr[0] "%%s і %d �подобало�� це."
+msgstr[1] "%%s і %d �подобало�� це."
+msgstr[2] "%%s і %d �подобало�� це."
+
+#. TRANS: List message for favoured notices.
+#. TRANS: %%s is a list of users liking a notice.
+#. TRANS: Plural is based on the number of of users that have favoured a notice.
+#, fuzzy, php-format
+msgid "%%s repeated this."
+msgid_plural "%%s repeated this."
+msgstr[0] "%%s �подобало�� це."
+msgstr[1] "%%s �подобало�� це."
+msgstr[2] "%%s �подобало�� це."
 
 #. TRANS: Form legend.
 #, php-format
@@ -10140,7 +9700,6 @@ msgid "Unsilence this user"
 msgstr "Вит�гти кл�п, дозволити базікати знов"
 
 #. TRANS: Form legend on unsubscribe form.
-#. TRANS: Button title on unsubscribe form.
 msgid "Unsubscribe from this user"
 msgstr "Відпи�ати�ь від цього кори�тувача"
 
@@ -10150,6 +9709,11 @@ msgctxt "BUTTON"
 msgid "Unsubscribe"
 msgstr "Відпи�ати�ь"
 
+#. TRANS: Button title on unsubscribe form.
+#, fuzzy
+msgid "Unsubscribe from this user."
+msgstr "Відпи�ати�ь від цього кори�тувача"
+
 #. TRANS: Exception text shown when no profile can be found for a user.
 #. TRANS: %1$s is a user nickname, $2$d is a user ID (number).
 #, php-format
@@ -10235,8 +9799,6 @@ msgstr "�еправильний XML, корінь XRD від�утній."
 msgid "Getting backup from file '%s'."
 msgstr "Отриманн� резервної копії файлу «%s»."
 
-#~ msgid "%1$s and friends, page %2$d"
-#~ msgstr "%1$s та друзі, �торінка %2$d"
-
-#~ msgid "You and friends"
-#~ msgstr "Ви з друз�ми"
+#, fuzzy
+#~ msgid " "
+#~ msgstr ", "
diff --git a/locale/zh_CN/LC_MESSAGES/statusnet.po b/locale/zh_CN/LC_MESSAGES/statusnet.po
index 27a39049b6..489528fa75 100644
--- a/locale/zh_CN/LC_MESSAGES/statusnet.po
+++ b/locale/zh_CN/LC_MESSAGES/statusnet.po
@@ -1,14 +1,17 @@
-# Translation of StatusNet - Core to Simplified Chinese (‪中文(简体)‬)
+# Translation of StatusNet - Core to Simplified Chinese (‪中文（简体）‬)
 # Exported from translatewiki.net
 #
 # Author: Brion
 # Author: Chenxiaoqino
 # Author: Happy
 # Author: Hydra
+# Author: Hzy980512
 # Author: March
 # Author: Shizhao
 # Author: Sweeite012f
 # Author: Tommyang
+# Author: Xiaomingyan
+# Author: Yfdyh000
 # Author: ZhengYiFeng
 # --
 # This file is distributed under the same license as the StatusNet package.
@@ -17,18 +20,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:53+0000\n"
-"Language-Team: Simplified Chinese <http://translatewiki.net/wiki/Portal:zh-"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:44+0000\n"
+"Language-Team: Simplified Chinese <https://translatewiki.net/wiki/Portal:zh-"
 "hans>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-POT-Import-Date: 2011-05-05 10:52:40+0000\n"
+"X-POT-Import-Date: 2012-04-22 22:02:21+0000\n"
 
 #. TRANS: Database error message.
 #, php-format
@@ -39,13 +42,7 @@ msgid ""
 "again."
 msgstr ""
 "%1$s 的数�库�应�正确，所以该站点将无法正常工作。站点管�员�能知�该问题，"
-"但是你�以通过 %2$s �系他们确认。或者等待几分钟，然��试"
-
-#. TRANS: Error message.
-msgid ""
-"An important error occured, probably related to email setup. Check logfiles "
-"for more info."
-msgstr "出现了一个��错误，�能与电�邮件设置有关。详细信�请检查日志文件。"
+"但是你�以通过 %2$s �系他们确认。或几分钟��试一下。"
 
 #. TRANS: Error message.
 msgid "An error occurred."
@@ -105,12 +102,11 @@ msgstr "�止新用户注册。"
 msgid "Closed"
 msgstr "�闭（��许新用户注册）"
 
-#. TRANS: Title for button to save access settings in site admin panel.
-msgid "Save access settings"
-msgstr "�存访问设置"
+#. TRANS: Button title to save access settings in site admin panel.
+msgid "Save access settings."
+msgstr "�存访问设置。"
 
-#. TRANS: Tooltip for button to save access settings in site admin panel.
-#. TRANS: Button text for saving theme settings.
+#. TRANS: Button text to save access settings in site admin panel.
 #. TRANS: Button label to save e-mail preferences.
 #. TRANS: Button label to save IM preferences.
 #. TRANS: Button text in the license admin panel.
@@ -126,7 +122,6 @@ msgstr "�存访问设置"
 #. TRANS: Button text for saving "Other settings" in profile.
 #. TRANS: Button text to save user settings in user admin panel.
 #. TRANS: Button label in the "Edit application" form.
-#. TRANS: Button text on profile design page to save settings.
 #. TRANS: Text for save button on group edit form.
 #. TRANS: Button text to save tags for a profile.
 msgctxt "BUTTON"
@@ -165,10 +160,6 @@ msgstr "没有这个文件。"
 msgid "No such list."
 msgstr "该���存在"
 
-#. TRANS: Client error displayed when trying to add an OMB 0.1 remote profile to a list.
-msgid "You cannot list an OMB 0.1 remote profile with this action."
-msgstr "你无法这样�作一个OMB 0.1的远程用户"
-
 #. TRANS: Client error displayed when an unknown error occurs when adding a user to a list.
 #. TRANS: %s is a username.
 #, php-format
@@ -198,7 +189,6 @@ msgstr "没有这个页�。"
 #. TRANS: Client error when user not found for an rss related action.
 #. TRANS: Client error displayed when no existing user is provided for a user's delivery device setting.
 #. TRANS: Client error displayed if a user could not be found.
-#. TRANS: Client error when user not found updating a profile background image.
 #. TRANS: Client error displayed updating profile image without having a user object.
 #. TRANS: Client error displayed when making an Atom API request for an unknown user.
 #. TRANS: Client error displayed when trying to block a non-existing user or a user from another site.
@@ -224,14 +214,11 @@ msgstr "没有这个页�。"
 #. TRANS: Client error displayed when trying to get the RSS feed with favorites of a user that does not exist.
 #. TRANS: Client error displayed when requesting Friends of a Friend feed without providing a user nickname.
 #. TRANS: Client error displayed when requesting Friends of a Friend feed for an object that is not a user.
-#. TRANS: Client error displayed when trying to get a user hCard for a non-existing user.
 #. TRANS: Client error displayed trying to make a micro summary without providing a valid user.
 #. TRANS: Client error displayed trying to send a direct message to a non-existing user.
 #. TRANS: Client error displayed trying to use "one time password login" without using an existing user.
 #. TRANS: Client error displayed when referring to non-existing user.
 #. TRANS: Client error displayed trying to perform an action related to a non-existing user.
-#. TRANS: Form validation error on page for remote subscribe when no user was provided.
-#. TRANS: Form validation error on page for remote subscribe when no user profile was found.
 #. TRANS: Client error displayed when trying to reply to a non-exsting user.
 #. TRANS: Client error displayed when providing a non-existing nickname in a RSS 1.0 action.
 #. TRANS: Client error.
@@ -240,7 +227,6 @@ msgstr "没有这个页�。"
 #. TRANS: Client error displayed trying to find a user by ID for a non-existing ID.
 #. TRANS: Client error displayed requesting groups for a non-existing user.
 #. TRANS: Client error displayed when user not found for an action.
-#. TRANS: Client error displayed providing a non-existing nickname.
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #. TRANS: Client error displayed when trying to perform a gallery action with an unknown user.
 #. TRANS: Client error displayed when trying to access a mailbox without providing a user.
@@ -249,16 +235,22 @@ msgid "No such user."
 msgstr "没有这个用户。"
 
 #. TRANS: Title of a user's own start page.
-#, fuzzy
 msgid "Home timeline"
-msgstr "%s的时间线"
+msgstr "主时间线"
 
 #. TRANS: Title of another user's start page.
 #. TRANS: %s is the other user's name.
-#, fuzzy, php-format
+#, php-format
 msgid "%s's home timeline"
 msgstr "%s的时间线"
 
+#. TRANS: %s is user nickname.
+#. TRANS: Feed title.
+#. TRANS: %s is tagger's nickname.
+#, php-format
+msgid "Feed for friends of %s (Activity Streams JSON)"
+msgstr "饲料的朋� %s（活动� JSON）"
+
 #. TRANS: %s is user nickname.
 #, php-format
 msgid "Feed for friends of %s (RSS 1.0)"
@@ -301,7 +293,7 @@ msgstr ""
 "你�以试�到他们的资料页 [呼�%1$s](../%2$s) 他们或者 [给他们�消�](%%%%"
 "action.newnotice%%%%?status_textarea=%3$s)。"
 
-#. TRANS: Encoutagement displayed on empty timeline user pages for anonymous users.
+#. TRANS: Encouragement displayed on empty timeline user pages for anonymous users.
 #. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
 #. TRANS: Empty list message for page with replies for a user for not logged in users.
 #. TRANS: %1$s is a user nickname. This message contains a Markdown link in the form [link text](link).
@@ -314,6 +306,12 @@ msgid ""
 msgstr ""
 "现在就[注册一个��](%%%%action.register%%%%)并呼�或者�一�消�给%s。"
 
+#. TRANS: Button text for inviting more users to the StatusNet instance.
+#. TRANS: Less business/enterprise-oriented language for public sites.
+msgctxt "BUTTON"
+msgid "Send invite"
+msgstr "��邀请。"
+
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Title of API timeline for a user and friends.
 #. TRANS: %s is a username.
@@ -322,8 +320,6 @@ msgstr ""
 #. TRANS: %s is a username.
 #. TRANS: Menu item title in personal group navigation menu.
 #. TRANS: %s is a username.
-#. TRANS: Menu item title in settings navigation panel.
-#. TRANS: %s is a username.
 #, php-format
 msgid "%s and friends"
 msgstr "%s 和好�们"
@@ -362,7 +358,6 @@ msgstr ""
 #. TRANS: Server error thrown on database error updating SMS preferences.
 #. TRANS: Server error thrown on database error removing a registered SMS phone number.
 #. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
-#. TRANS: Server exception thrown on Profile design page when updating design settings fails.
 msgid "Could not update user."
 msgstr "无法更新用户。"
 
@@ -377,7 +372,6 @@ msgstr "无法�存个人信�。"
 
 #. TRANS: Client error displayed when the number of bytes in a POST request exceeds a limit.
 #. TRANS: %s is the number of bytes of the CONTENT_LENGTH.
-#. TRANS: Form validation error in design settings form. POST should remain untranslated.
 #, php-format
 msgid ""
 "The server was unable to handle that much POST data (%s byte) due to its "
@@ -387,24 +381,6 @@ msgid_plural ""
 "current configuration."
 msgstr[0] "�务器当�的设置无法处�这么多的 POST 数�（%s bytes）。"
 
-#. TRANS: Client error displayed when saving design settings fails because of an empty id.
-#. TRANS: Client error displayed when saving design settings fails because of an empty result.
-#. TRANS: Client error displayed when a database error occurs inserting profile colours.
-#. TRANS: Client error displayed when a database error occurs updating profile colours.
-#. TRANS: Form validation error displayed when group design settings could not be saved because of an application issue.
-#. TRANS: Form validation error on Profile design page when saving design settings has failed.
-#. TRANS: Form validation error on Profile design page when updating design settings has failed.
-msgid "Unable to save your design settings."
-msgstr "无法�存你的外观设置。"
-
-#. TRANS: Error displayed when updating design settings fails.
-#. TRANS: Client error displayed when a database error occurs updating profile colours.
-#. TRANS: Form validation error on Profile design page when updating design settings has failed.
-#. TRANS: Error message displayed if design settings could not be saved.
-#. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
-msgid "Could not update your design."
-msgstr "无法更新你的外观。"
-
 #. TRANS: Title for Atom feed.
 msgctxt "ATOM"
 msgid "Main"
@@ -451,6 +427,21 @@ msgstr "�蔽用户失败。"
 msgid "Unblock user failed."
 msgstr "�消�蔽用户失败。"
 
+#. TRANS: Client exception thrown when no conversation ID is given.
+msgid "No conversation ID."
+msgstr "对�。"
+
+#. TRANS: Client exception thrown when referring to a non-existing conversation ID (%d).
+#, php-format
+msgid "No conversation with ID %d."
+msgstr "没有ID为%d的对�。"
+
+#. TRANS: Title for conversion timeline.
+#, fuzzy
+msgctxt "TITLE"
+msgid "Conversation"
+msgstr "对�"
+
 #. TRANS: Title. %s is a user nickname.
 #, php-format
 msgid "Direct messages from %s"
@@ -493,6 +484,8 @@ msgid "Cannot send direct messages to users who aren't your friend."
 msgstr "�能将直接邮件��到用户的�是你的朋�。"
 
 #. TRANS: Client error displayed trying to direct message self (403).
+#. TRANS: Client error displayed trying to send a direct message to self.
+#. TRANS: Error text shown when trying to send a direct message to self.
 msgid ""
 "Do not send a message to yourself; just say it to yourself quietly instead."
 msgstr "���自己��消�；跟自己悄悄说就得了。"
@@ -719,7 +712,6 @@ msgstr "在%s上的�组"
 
 #. TRANS: Client error displayed when trying to edit a group without being an admin.
 #. TRANS: Client error displayed trying to edit a group while not being a group admin.
-#. TRANS: Client error displayed trying to change group design settings without being a (group) admin.
 #. TRANS: Client error displayed when trying to change group logo settings while not being a group admin.
 msgid "You must be an admin to edit the group."
 msgstr "管�员��以编辑�组。"
@@ -828,7 +820,6 @@ msgstr "�入 oauth_token_association 时数�库出错。"
 
 #. TRANS: Client error given on when invalid data was passed through a form in the OAuth API.
 #. TRANS: Unexpected validation error on avatar upload form.
-#. TRANS: Client error displayed when the submitted form contains unexpected data.
 #. TRANS: Client error displayed submitting invalid form data for edit application.
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
 #. TRANS: Form validation error message when an unsupported argument is used.
@@ -837,7 +828,6 @@ msgstr "�入 oauth_token_association 时数�库出错。"
 #. TRANS: Client error when submitting a form with unexpected information.
 #. TRANS: Client error displayed when unexpected data is posted in the password recovery form.
 #. TRANS: Message given submitting a form with an unknown action in SMS settings.
-#. TRANS: Unknown form validation error in design settings form.
 msgid "Unexpected form submission."
 msgstr "未预料的表��交。"
 
@@ -880,7 +870,6 @@ msgstr "��"
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Field label on account registration page.
-#. TRANS: Label for nickname on user authorisation page.
 #. TRANS: Field label on group edit form.
 #. TRANS: Dropdown option for searching in profiles.
 msgid "Nickname"
@@ -1186,12 +1175,9 @@ msgstr "你必须登录�能离开�组。"
 #. TRANS: Client error displayed when requesting Friends of a Friend feed for a nickname that is not a group.
 #. TRANS: Client error displayed trying to block a user from a group while specifying a non-existing group.
 #. TRANS: Client error displayed referring to a group's permalink for a non-existing group ID.
-#. TRANS: Client error displayed trying to change group design settings while providing a nickname for a non-existing group.
 #. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
 #. TRANS: Client error displayed when trying to view group members for a non-existing group.
 #. TRANS: Client error displayed when trying to view group members for an object that is not a group.
-#. TRANS: Client error displayed when trying to view group members for a non-existing group.
-#. TRANS: Client error displayed when trying to view group members for an object that is not a group.
 #. TRANS: Client error displayed when requesting a group RSS feed for group that does not exist.
 #. TRANS: Client error displayed when requesting a group RSS feed for an object that is not a group.
 #. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
@@ -1200,10 +1186,10 @@ msgstr "你必须登录�能离开�组。"
 #. TRANS: Client error displayed when trying to leave a non-local group.
 #. TRANS: Client error displayed when trying to leave a non-existing group.
 #. TRANS: Client error displayed when providing an invalid group ID on the Make Admin page.
-#. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
-#. TRANS: Client error displayed if no local group with a given name was found requesting group page.
 #. TRANS: Command exception text shown when a group is requested that does not exist.
 #. TRANS: Error text shown when trying to leave a group that does not exist.
+#. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
+#. TRANS: Client error displayed if no local group with a given name was found requesting group page.
 msgid "No such group."
 msgstr "没有这个组。"
 
@@ -1270,6 +1256,7 @@ msgid "Join request canceled."
 msgstr "加入请求已�消。"
 
 #. TRANS: Client error displayed trying to approve subscription for a non-existing request.
+#. TRANS: %s is a user nickname.
 #, php-format
 msgid "%s is not in the moderation queue for your subscriptions."
 msgstr "%s �在你的待审核订阅队列中。"
@@ -1419,7 +1406,6 @@ msgstr "没有这个附件。"
 #. TRANS: Client error displayed trying to get an avatar without providing a nickname.
 #. TRANS: Client error displayed when requesting a list of blocked users for a group without providing a group nickname.
 #. TRANS: Client error displayed trying to edit a group while not proving a nickname for the group to edit.
-#. TRANS: Client error displayed trying to change group design settings without providing a group nickname.
 #. TRANS: Client error displayed when trying to change group logo settings without providing a nickname.
 #. TRANS: Client error displayed when trying to view group members without providing a group nickname.
 #. TRANS: Client error displayed when requesting a group RSS feed without providing a group nickname.
@@ -1711,6 +1697,18 @@ msgstr "你账户的地� \"%s\" 已被确认。"
 msgid "Conversation"
 msgstr "对�"
 
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#, fuzzy
+msgid "Conversation feed (Activity Streams JSON)"
+msgstr "饲料的通知 %s （活动� JSON）"
+
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#, fuzzy
+msgid "Conversation feed (RSS 2.0)"
+msgstr "%s的消��� (RSS 2.0)"
+
 #. TRANS: Title for conversation page.
 #. TRANS: Title for page that shows a notice.
 msgctxt "TITLE"
@@ -1770,7 +1768,8 @@ msgid "Enter \"%s\" to confirm that you want to delete your account."
 msgstr "输入\"%s\"，以确认您�删除您的�户。"
 
 #. TRANS: Button title for user account deletion.
-msgid "Permanently delete your account"
+#, fuzzy
+msgid "Permanently delete your account."
 msgstr "永久删除您的�户"
 
 #. TRANS: Client error displayed trying to delete an application while not logged in.
@@ -1911,148 +1910,6 @@ msgstr "请��删除该用户。"
 msgid "Delete this user."
 msgstr "删除此用户。"
 
-#. TRANS: Message used as title for design settings for the site.
-msgid "Design"
-msgstr "外观"
-
-#. TRANS: Instructions for design adminsitration panel.
-msgid "Design settings for this StatusNet site"
-msgstr "这个 StatusNet 网站的外观设置"
-
-#. TRANS: Client error displayed when a logo URL does is not valid.
-msgid "Invalid logo URL."
-msgstr "无效的 logo URL。"
-
-#. TRANS: Client error displayed when an SSL logo URL is invalid.
-msgid "Invalid SSL logo URL."
-msgstr "无效的 SSL logo URL。"
-
-#. TRANS: Client error displayed when a theme is submitted through the form that is not in the theme list.
-#. TRANS: %s is the chosen unavailable theme.
-#, php-format
-msgid "Theme not available: %s."
-msgstr "主题��用：%s。"
-
-#. TRANS: Fieldset legend for form to change logo.
-msgid "Change logo"
-msgstr "更� logo"
-
-#. TRANS: Field label for StatusNet site logo.
-msgid "Site logo"
-msgstr "网站 logo"
-
-#. TRANS: Field label for SSL StatusNet site logo.
-msgid "SSL logo"
-msgstr "网站 SSL logo"
-
-#. TRANS: Fieldset legend for form change StatusNet site's theme.
-msgid "Change theme"
-msgstr "更�主题"
-
-#. TRANS: Field label for dropdown to choose site theme.
-msgid "Site theme"
-msgstr "网站主题"
-
-#. TRANS: Title for field label for dropdown to choose site theme.
-msgid "Theme for the site."
-msgstr "这个网站的主题。"
-
-#. TRANS: Field label for uploading a cutom theme.
-msgid "Custom theme"
-msgstr "自定义主题"
-
-#. TRANS: Form instructions for uploading a cutom StatusNet theme.
-msgid "You can upload a custom StatusNet theme as a .ZIP archive."
-msgstr "你�以上传一个 .ZIP 压缩文件作为一个自定义的 StatusNet 主题"
-
-#. TRANS: Fieldset legend for theme background image.
-msgid "Change background image"
-msgstr "更�背景图�"
-
-#. TRANS: Field label for background image on theme designer page.
-#. TRANS: Field label for background color selector.
-#. TRANS: Label on profile design page for setting a profile page background colour.
-msgid "Background"
-msgstr "背景"
-
-#. TRANS: Form guide for background image upload form on theme designer page.
-#, php-format
-msgid ""
-"You can upload a background image for the site. The maximum file size is %1"
-"$s."
-msgstr "你�以为网站上传一个背景图�。文件大��制在%1$s以下。"
-
-#. TRANS: Used as radio button label to add a background image.
-msgid "On"
-msgstr "打开"
-
-#. TRANS: Used as radio button label to not add a background image.
-msgid "Off"
-msgstr "关闭"
-
-#. TRANS: Form guide for turning background image on or off on theme designer page.
-#. TRANS: Form guide for a set of radio buttons on the profile design page that will enable or disable
-#. TRANS: use of the uploaded profile image.
-msgid "Turn background image on or off."
-msgstr "打开或关闭背景图片"
-
-#. TRANS: Checkbox label to title background image on theme designer page.
-#. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
-msgid "Tile background image"
-msgstr "平铺背景图片"
-
-#. TRANS: Fieldset legend for theme colors.
-msgid "Change colors"
-msgstr "更改颜色"
-
-#. TRANS: Field label for content color selector.
-#. TRANS: Label on profile design page for setting a profile page content colour.
-msgid "Content"
-msgstr "内容"
-
-#. TRANS: Field label for sidebar color selector.
-#. TRANS: Label on profile design page for setting a profile page sidebar colour.
-msgid "Sidebar"
-msgstr "边�"
-
-#. TRANS: Field label for text color selector.
-#. TRANS: Label on profile design page for setting a profile page text colour.
-msgid "Text"
-msgstr "文字"
-
-#. TRANS: Field label for link color selector.
-#. TRANS: Label on profile design page for setting a profile page links colour.
-msgid "Links"
-msgstr "链接"
-
-#. TRANS: Fieldset legend for advanced theme design settings.
-msgid "Advanced"
-msgstr "高级"
-
-#. TRANS: Field label for custom CSS.
-msgid "Custom CSS"
-msgstr "自定义CSS"
-
-#. TRANS: Button text for resetting theme settings.
-msgctxt "BUTTON"
-msgid "Use defaults"
-msgstr "使用默认值"
-
-#. TRANS: Title for button for resetting theme settings.
-#. TRANS: Title for button on profile design page to reset all colour settings to default.
-msgid "Restore default designs."
-msgstr "还原默认设计。"
-
-#. TRANS: Title for button for resetting theme settings.
-#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-msgid "Reset back to default."
-msgstr "�置回默认值。"
-
-#. TRANS: Title for button for saving theme settings.
-#. TRANS: Title for button on profile design page to save settings.
-msgid "Save design."
-msgstr "�存设计。"
-
 #. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
 msgid "This notice is not a favorite!"
 msgstr "此消�未被收��"
@@ -2067,6 +1924,79 @@ msgstr "加入收�"
 msgid "No such document \"%s\"."
 msgstr "没有这样的文档\"%s\"。"
 
+#. TRANS: Menu item in administrator navigation panel.
+#. TRANS: Menu item in default local navigation panel.
+#. TRANS: Menu item in personal group navigation menu.
+msgctxt "MENU"
+msgid "Home"
+msgstr "主页"
+
+msgctxt "MENU"
+msgid "Docs"
+msgstr ""
+
+#. TRANS: Secondary navigation menu item leading to help on StatusNet.
+msgctxt "MENU"
+msgid "Help"
+msgstr "帮助"
+
+#, fuzzy
+msgid "Getting started"
+msgstr "设置已�存。"
+
+#. TRANS: Secondary navigation menu item leading to text about StatusNet site.
+msgctxt "MENU"
+msgid "About"
+msgstr "关于"
+
+#, fuzzy
+msgid "About this site"
+msgstr "�消�蔽这个用户。"
+
+#. TRANS: Secondary navigation menu item leading to Frequently Asked Questions.
+msgctxt "MENU"
+msgid "FAQ"
+msgstr "FAQ"
+
+msgid "Frequently asked questions"
+msgstr "常�问题"
+
+#. TRANS: Secondary navigation menu item leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+msgctxt "MENU"
+msgid "Contact"
+msgstr "�系"
+
+#, fuzzy
+msgid "Contact info"
+msgstr "�系"
+
+#, fuzzy
+msgctxt "MENU"
+msgid "Tags"
+msgstr "标签"
+
+msgid "Using tags"
+msgstr ""
+
+#. TRANS: Menu item in default local navigation panel.
+#. TRANS: Menu item in search group navigation panel.
+#. TRANS: Menu item in local navigation menu.
+msgctxt "MENU"
+msgid "Groups"
+msgstr "组"
+
+#, fuzzy
+msgid "Using groups"
+msgstr "用户�组"
+
+msgctxt "MENU"
+msgid "API"
+msgstr "API"
+
+msgid "RESTful API"
+msgstr ""
+
 #. TRANS: Title for "Edit application" form.
 #. TRANS: Form legend.
 msgid "Edit application"
@@ -2225,7 +2155,7 @@ msgid ""
 "subscriptions to it. Do you still want to continue?"
 msgstr "把一个公开标签设置为�有，将会永久移除所有该标签的订阅。��继续�？"
 
-#. TRANS: TRANS: Server error displayed when updating a list fails.
+#. TRANS: Server error displayed when updating a list fails.
 msgid "Could not update list."
 msgstr "无法更新��。"
 
@@ -2521,40 +2451,6 @@ msgstr "没有附件。"
 msgid "No uploaded attachments."
 msgstr "没有已上传的附件。"
 
-#. TRANS: Client error displayed when subscribing to a remote profile and an unexpected response is received.
-msgid "Not expecting this response!"
-msgstr "未预料的�应�"
-
-#. TRANS: Client error displayed when subscribing to a remote profile that does not exist.
-msgid "User being listened to does not exist."
-msgstr "�查看的用户�存在。"
-
-#. TRANS: Client error displayed when subscribing to a remote profile that is a local profile.
-#. TRANS: Client error displayed when using remote subscribe for a local entity.
-msgid "You can use the local subscription!"
-msgstr "你�以使用本地关注�"
-
-#. TRANS: Client error displayed when subscribing to a remote profile that is blocked form subscribing to.
-msgid "That user has blocked you from subscribing."
-msgstr "该用户�蔽了你，无法关注。"
-
-#. TRANS: Client error displayed when subscribing to a remote profile without providing an authorised token.
-msgid "You are not authorized."
-msgstr "你没有被授�。"
-
-#. TRANS: Client error displayed when subscribing to a remote profile and conversion of the request token to access token fails.
-msgid "Could not convert request token to access token."
-msgstr "无法将 request token 转�为 access token。"
-
-#. TRANS: Client error displayed when subscribing to a remote profile fails because of an unsupported version of the OMB protocol.
-msgid "Remote service uses unknown version of OMB protocol."
-msgstr "远程�务使用了未知版本的 OMB �议。"
-
-#. TRANS: Server error displayed when subscribing to a remote profile fails because the remote profile could not be updated.
-#. TRANS: Exception thrown when updating a remote profile fails in OAuth store.
-msgid "Error updating remote profile."
-msgstr "更新远程的个人信�时出错。"
-
 #. TRANS: Client error displayed when requesting a non-existent file.
 msgid "No such file."
 msgstr "没有这个文件。"
@@ -2641,29 +2537,6 @@ msgstr "在�组中�蔽用户时数�库�生错误。"
 msgid "No ID."
 msgstr "没有 ID。"
 
-#. TRANS: Client error displayed trying to change group design settings while not logged in.
-msgid "You must be logged in to edit a group."
-msgstr "你必须登录�能创建�组。"
-
-#. TRANS: Title group design settings page.
-msgid "Group design"
-msgstr "�组页�外观。"
-
-#. TRANS: Instructions for group design settings page.
-msgid ""
-"Customize the way your group looks with a background image and a colour "
-"palette of your choice."
-msgstr "通过背景图片和颜色��自定义你的�组的外观。"
-
-#. TRANS: Form validation error displayed when group design settings could not be updated because of an application issue.
-msgid "Unable to update your design settings."
-msgstr "无法更新你的外观设置。"
-
-#. TRANS: Form text to confirm saved group design settings.
-#. TRANS: Confirmation message on Profile design page when saving design settings has succeeded.
-msgid "Design preferences saved."
-msgstr "外观�好已�存。"
-
 #. TRANS: Title for group logo settings page.
 #. TRANS: Group logo form legend.
 msgid "Group logo"
@@ -2829,10 +2702,10 @@ msgstr "IM 设置"
 #. TRANS: Instant messaging settings page instructions.
 #. TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link.
 #. TRANS: the order and formatting of link text and link should remain unchanged.
-#, php-format
+#, fuzzy, php-format
 msgid ""
-"You can send and receive notices through instant messaging [instant messages]"
-"(%%doc.im%%). Configure your addresses and settings below."
+"You can send and receive notices through [instant messaging](%%doc.im%%). "
+"Configure your addresses and settings below."
 msgstr ""
 "你�以通过�时通讯 [�时通讯工具](%%doc.im%%)��和接收消�。在这里�置它们。"
 
@@ -3020,28 +2893,6 @@ msgid ""
 "Use this form to invite your friends and colleagues to use this service."
 msgstr "使用这个表��邀请好�和�事加入。"
 
-#. TRANS: Field label for a list of e-mail addresses.
-msgid "Email addresses"
-msgstr "电邮地�"
-
-#. TRANS: Tooltip for field label for a list of e-mail addresses.
-msgid "Addresses of friends to invite (one per line)."
-msgstr "朋�邀请的地�（�行一个）。"
-
-#. TRANS: Field label for a personal message to send to invitees.
-msgid "Personal message"
-msgstr "个人消�"
-
-#. TRANS: Tooltip for field label for a personal message to send to invitees.
-msgid "Optionally add a personal message to the invitation."
-msgstr "在邀请中加几��(�选)。"
-
-#. TRANS: Send button for inviting friends
-#. TRANS: Button text for sending notice.
-msgctxt "BUTTON"
-msgid "Send"
-msgstr "�布"
-
 #. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral
 #. TRANS: singular 3rd-person pronoun in English. %1$s is the inviting user, $2$s is
 #. TRANS: the StatusNet sitename.
@@ -3071,7 +2922,7 @@ msgstr "你�是该群�组�员。"
 #. TRANS: User admin panel title
 msgctxt "TITLE"
 msgid "License"
-msgstr "许��议"
+msgstr "授��议"
 
 #. TRANS: Form instructions for the site license admin panel.
 msgid "License for this StatusNet site"
@@ -3172,12 +3023,6 @@ msgstr "与许��议一起出现的图片 URL。"
 msgid "Save license settings."
 msgstr "�存许��议设置。"
 
-#. TRANS: Client error displayed when trying to log in while already logged in.
-#. TRANS: Client error displayed trying to use "one time password login" when already logged in.
-#. TRANS: Client error displayed when trying to register while already logged in.
-msgid "Already logged in."
-msgstr "已登录。"
-
 #. TRANS: Form validation error displayed when trying to log in with incorrect credentials.
 msgid "Incorrect username or password."
 msgstr "用户�或密��正确。"
@@ -3196,7 +3041,6 @@ msgid "Login to site"
 msgstr "登录"
 
 #. TRANS: Field label on login page.
-#, fuzzy
 msgid "Username or email address"
 msgstr "昵称或电�邮件"
 
@@ -3284,6 +3128,7 @@ msgstr "Source URL 必填。"
 msgid "Could not create application."
 msgstr "无法创建应用。"
 
+#. TRANS: Form validation error messages displayed when uploading an invalid application logo.
 msgid "Invalid image."
 msgstr "无效的图�。"
 
@@ -3320,12 +3165,6 @@ msgstr "没有内容�"
 msgid "No recipient specified."
 msgstr "没有收件人。"
 
-#. TRANS: Client error displayed trying to send a direct message to self.
-#. TRANS: Error text shown when trying to send a direct message to self.
-msgid ""
-"Don't send a message to yourself; just say it to yourself quietly instead."
-msgstr "���自己��消�；跟自己悄悄说就得了。"
-
 #. TRANS: Page title after sending a direct message.
 msgid "Message sent"
 msgstr "消�已��"
@@ -3526,6 +3365,33 @@ msgstr "请�用HTTP明文的%sURLs的地�。"
 msgid "Not a supported data format."
 msgstr "�支�的数�格�。"
 
+#. TRANS: Page title for profile settings.
+#, fuzzy
+msgid "Old school UI settings"
+msgstr "IM 设置"
+
+#. TRANS: Usage instructions for profile settings.
+msgid "If you like it \"the old way\", you can set that here."
+msgstr ""
+
+#. TRANS: Confirmation shown when user profile settings are saved.
+#. TRANS: Message after successful saving of administrative settings.
+msgid "Settings saved."
+msgstr "设置已�存。"
+
+msgid "Only stream mode (no conversations) in timelines"
+msgstr ""
+
+msgid "Show conversation page as hierarchical trees"
+msgstr ""
+
+msgid "Show nicknames (not full names) in timelines"
+msgstr ""
+
+#. TRANS: Button text to save a list.
+msgid "Save"
+msgstr "�存"
+
 #. TRANS: ShortName in the OpenSearch interface when trying to find users.
 msgid "People Search"
 msgstr "�索用户"
@@ -3534,6 +3400,11 @@ msgstr "�索用户"
 msgid "Notice Search"
 msgstr "�索消�"
 
+#. TRANS: Client error displayed trying to use "one time password login" when already logged in.
+#. TRANS: Client error displayed when trying to register while already logged in.
+msgid "Already logged in."
+msgstr "已登录。"
+
 #. TRANS: Client error displayed trying to use "one time password login" without specifying a user.
 msgid "No user ID specified."
 msgstr "没用指定用户 ID。"
@@ -3603,7 +3474,7 @@ msgid "Confirm"
 msgstr "�输一�"
 
 #. TRANS: Field title on page where to change password.
-#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
+#. TRANS: Title for field label for password reset form where the password has to be typed again.
 #. TRANS: Field title on account registration page.
 msgid "Same as password above."
 msgstr "与上�相�的密�"
@@ -3661,12 +3532,6 @@ msgstr "主题目录无法读�：%s。"
 msgid "Avatar directory not writable: %s."
 msgstr "头�目录无法写入：%s。"
 
-#. TRANS: Client error in Paths admin panel.
-#. TRANS: %s is the background directory that could not be written to.
-#, php-format
-msgid "Background directory not writable: %s."
-msgstr "背景目录无法写入：%s。"
-
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the locales directory that could not be read from.
 #, php-format
@@ -3779,30 +3644,6 @@ msgstr "头�目录"
 msgid "Directory where avatars are located."
 msgstr "头�文件的目录。"
 
-#. TRANS: Fieldset legend in Paths admin panel.
-msgid "Backgrounds"
-msgstr "背景"
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-msgid "Server for backgrounds."
-msgstr "背景�务器。"
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-msgid "Web path to backgrounds."
-msgstr "背景的网站路径。"
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-msgid "Server for backgrounds on SSL pages."
-msgstr "SSL 页�的背景�务器。"
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-msgid "Web path to backgrounds on SSL pages."
-msgstr "SSL 页�的背景网站路径。"
-
-#. TRANS: Tooltip for field label in Paths admin panel.
-msgid "Directory where backgrounds are located."
-msgstr "背景文件的目录。"
-
 #. TRANS: Fieldset legens in Paths admin panel.
 msgid "Attachments"
 msgstr "附件"
@@ -3858,8 +3699,8 @@ msgid "Server to direct SSL requests to."
 msgstr "直接SSL请求的�务器"
 
 #. TRANS: Button title text to store form data in the Paths admin panel.
-msgid "Save paths"
-msgstr "�存路径"
+msgid "Save path settings."
+msgstr "�存路径设置。"
 
 #. TRANS: Instructions for the "People search" page.
 #. TRANS: %%site.name%% is the name of the StatusNet site.
@@ -3985,13 +3826,13 @@ msgstr "转到"
 #. TRANS: Message displayed for anonymous users on page that displays lists by a user.
 #. TRANS: This message contains Markdown links in the form [description](links).
 #. TRANS: %s is a tagger nickname.
-#, php-format
+#, fuzzy, php-format
 msgid ""
 "These are lists created by **%s**. Lists are how you sort similar people on %"
 "%%%site.name%%%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
 "blogging) service based on the Free Software [StatusNet](http://status.net/) "
 "tool. You can easily keep track of what they are doing by subscribing to the "
-"tag's timeline."
+"list's timeline."
 msgstr ""
 "这些是由 **%s** 创建的��。���以方便汇集相似的人在 %%%%site.name%%%%里，"
 "一个 [微�客](http://en.wikipedia.org/wiki/Micro-blogging) �务，基于自由软"
@@ -4018,13 +3859,13 @@ msgstr "有 %1$s 的��，第 %2$d 页"
 #. TRANS: Message displayed for anonymous users on page that displays lists for a user.
 #. TRANS: This message contains Markdown links in the form [description](links).
 #. TRANS: %s is a tagger nickname.
-#, php-format
+#, fuzzy, php-format
 msgid ""
 "These are lists for **%s**. lists are how you sort similar people on %%%%"
 "site.name%%%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
 "blogging) service based on the Free Software [StatusNet](http://status.net/) "
 "tool. You can easily keep track of what they are doing by subscribing to the "
-"tag's timeline."
+"list's timeline."
 msgstr ""
 "这些是有 **%s** 的��。���以方便汇集相似的人在 %%%%site.name%%%%里，一个 "
 "[微�客](http://en.wikipedia.org/wiki/Micro-blogging) �务，基于自由软件 "
@@ -4127,16 +3968,6 @@ msgid ""
 "All default plugins have been disabled from the site's configuration file."
 msgstr "所有默认�件已在站点�置文件里�用。"
 
-#. TRANS: Client error displayed if the notice posted has too many characters.
-msgid "Invalid notice content."
-msgstr "无效的消�内容。"
-
-#. TRANS: Exception thrown if a notice's license is not compatible with the StatusNet site license.
-#. TRANS: %1$s is the notice license, %2$s is the StatusNet site's license.
-#, php-format
-msgid "Notice license \"%1$s\" is not compatible with site license \"%2$s\"."
-msgstr "消�的许��议 “%1$s� 与这个站点的许��议 “%2$s� �兼容。"
-
 #. TRANS: Client error displayed when trying to add an unindentified field to profile.
 #. TRANS: %s is a field name.
 #, php-format
@@ -4228,6 +4059,8 @@ msgid "Share my current location when posting notices"
 msgstr "当�布消�时分享我的地��置"
 
 #. TRANS: Field label in form for profile settings.
+#. TRANS: Title for group tag cloud section.
+#. TRANS: %s is a group name.
 msgid "Tags"
 msgstr "标签"
 
@@ -4255,8 +4088,8 @@ msgstr "你一般处于哪个时区？"
 
 #. TRANS: Checkbox label in form for profile settings.
 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 "自动关注任何关注我的人 (这个选项适�机器人)"
 
 #. TRANS: Dropdown field label on profile settings, for what policies to apply when someone else tries to subscribe to your updates.
 msgid "Subscription policy"
@@ -4320,11 +4153,6 @@ msgstr "无法�存�置设置。"
 msgid "Could not save tags."
 msgstr "无法�存标签。"
 
-#. TRANS: Confirmation shown when user profile settings are saved.
-#. TRANS: Message after successful saving of administrative settings.
-msgid "Settings saved."
-msgstr "设置已�存。"
-
 #. TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
 #. TRANS: Page title for page where a user account can be restored from backup.
 msgid "Restore account"
@@ -4337,7 +4165,8 @@ msgid "Beyond the page limit (%s)."
 msgstr "超出页��制(%s)。"
 
 #. TRANS: Server error displayed when a public timeline cannot be retrieved.
-msgid "Could not retrieve public stream."
+#, fuzzy
+msgid "Could not retrieve public timeline."
 msgstr "无法获�到公共的时间线。"
 
 #. TRANS: Title for all public timeline pages but the first.
@@ -4352,15 +4181,23 @@ msgid "Public timeline"
 msgstr "公共时间线"
 
 #. TRANS: Link description for public timeline feed.
-msgid "Public Stream Feed (RSS 1.0)"
+#, fuzzy
+msgid "Public Timeline Feed (Activity Streams JSON)"
+msgstr "公共�饲料 （活动� JSON）"
+
+#. TRANS: Link description for public timeline feed.
+#, fuzzy
+msgid "Public Timeline Feed (RSS 1.0)"
 msgstr "公开的 RSS �� (RSS 1.0)"
 
 #. TRANS: Link description for public timeline feed.
-msgid "Public Stream Feed (RSS 2.0)"
+#, fuzzy
+msgid "Public Timeline Feed (RSS 2.0)"
 msgstr "公开的 RSS �� (RSS 2.0)"
 
 #. TRANS: Link description for public timeline feed.
-msgid "Public Stream Feed (Atom)"
+#, fuzzy
+msgid "Public Timeline Feed (Atom)"
 msgstr "公开的 RSS �� (Atom)"
 
 #. TRANS: Text displayed for public feed when there are no public notices.
@@ -4405,44 +4242,6 @@ msgstr ""
 "这里是%%site.name%%，一个基于自由软件[StatusNet](http://status.net/)的[微�"
 "客](http://zh.wikipedia.org/zh-hans/%E5%BE%AE%E5%8D%9A%E5%AE%A2) 。"
 
-#. TRANS: Title for page with public list cloud.
-msgid "Public list cloud"
-msgstr "公开标签云"
-
-#. TRANS: Page notice for page with public list cloud.
-#. TRANS: %s is a StatusNet sitename.
-#, php-format
-msgid "These are largest lists on %s"
-msgstr "这些是 %s 上最�行的标签"
-
-#. TRANS: Empty list message on page with public list cloud.
-#. TRANS: This message contains Markdown links in the form [description](link).
-#, php-format
-msgid "No one has [listed](%%doc.tags%%) anyone yet."
-msgstr "还没有人拥有 [��] （%%doc.tags%%）。"
-
-#. TRANS: Additional empty list message on page with public list cloud for logged in users.
-msgid "Be the first to list someone!"
-msgstr "�为第一个创建��的人�"
-
-#. TRANS: Additional empty list message on page with public list cloud for anonymous users.
-#. TRANS: This message contains Markdown links in the form [description](link).
-#, php-format
-msgid ""
-"Why not [register an account](%%action.register%%) and be the first to list "
-"someone!"
-msgstr "现在就[注册](%%action.register%%)并创建第一个���"
-
-#. TRANS: DT element on on page with public list cloud.
-msgid "List cloud"
-msgstr "��云"
-
-#. TRANS: Link title for number of listed people. %d is the number of listed people.
-#, php-format
-msgid "1 person listed"
-msgid_plural "%d people listed"
-msgstr[0] "��里有1人"
-
 #. TRANS: Public RSS feed description. %s is the StatusNet site name.
 #, php-format
 msgid "%s updates from everyone."
@@ -4562,7 +4361,6 @@ msgid "6 or more characters, and do not forget it!"
 msgstr "至少6个字符，还有，别忘记它�"
 
 #. TRANS: Button text for password reset form.
-#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
 msgctxt "BUTTON"
 msgid "Reset"
 msgstr "�置"
@@ -4571,18 +4369,6 @@ msgstr "�置"
 msgid "Enter a nickname or email address."
 msgstr "输入昵称或电�邮件。"
 
-#. TRANS: Information on password recovery form if no known username or e-mail address was specified.
-msgid "No user with that email address or username."
-msgstr "没有拥有这个用户�或电�邮件的用户。"
-
-#. TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.
-msgid "No registered email address for that user."
-msgstr "该用户没有登记电�邮件。"
-
-#. TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.
-msgid "Error saving address confirmation."
-msgstr "�存地�确认时出错。"
-
 #. TRANS: User notification after an e-mail with instructions was sent from the password recovery form.
 msgid ""
 "Instructions for recovering your password have been sent to the email "
@@ -4751,71 +4537,6 @@ msgid ""
 "to confirm your email address.)"
 msgstr "(你将收到一�邮件，包�了如何确认邮件地�的说明。)"
 
-#. TRANS: Page notice for remote subscribe. This message contains Markdown links.
-#. TRANS: Ensure to keep the correct markup of [link description](link).
-#, php-format
-msgid ""
-"To subscribe, you can [login](%%action.login%%), or [register](%%action."
-"register%%) a new  account. If you already have an account  on a [compatible "
-"microblogging site](%%doc.openmublog%%),  enter your profile URL below."
-msgstr ""
-"�关注用户或�组，你需�[登录](%%action.login%%)，或[注册](%%action.register%"
-"%) 一个新账户。如果你已�在�一个[兼容的微�客](%%doc.openmublog%%)有账户，请"
-"填入你的资料页 URL。"
-
-#. TRANS: Page title for Remote subscribe.
-msgid "Remote subscribe"
-msgstr "远程关注"
-
-#. TRANS: Field legend on page for remote subscribe.
-msgid "Subscribe to a remote user"
-msgstr "关注一个远程用户"
-
-#. TRANS: Field label on page for remote subscribe.
-msgid "User nickname"
-msgstr "昵称"
-
-#. TRANS: Field title on page for remote subscribe.
-msgid "Nickname of the user you want to follow."
-msgstr "您�执行的用户的别�。"
-
-#. TRANS: Field label on page for remote subscribe.
-msgid "Profile URL"
-msgstr "资料页 URL"
-
-#. TRANS: Field title on page for remote subscribe.
-msgid "URL of your profile on another compatible microblogging service."
-msgstr "�一�兼容的微�客�务�置文件的 URL。"
-
-#. TRANS: Button text on page for remote subscribe.
-#. TRANS: Link text for link that will subscribe to a remote profile.
-#. TRANS: Button text to subscribe to a user.
-#. TRANS: Button text for subscribing to a list.
-msgctxt "BUTTON"
-msgid "Subscribe"
-msgstr "关注"
-
-#. TRANS: Form validation error on page for remote subscribe when an invalid profile URL was provided.
-msgid "Invalid profile URL (bad format)."
-msgstr "无效的用户 URL (格�错误)。"
-
-#. TRANS: Form validation error on page for remote subscribe when no the provided profile URL
-#. TRANS: does not contain expected data.
-msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
-msgstr "�是有效的资料页 URL (没有YADIS 文档或定义了无效的 XRDS)。"
-
-#. TRANS: Form validation error on page for remote subscribe.
-msgid "That is a local profile! Login to subscribe."
-msgstr "这是一个本地用户�请登录以关注。"
-
-#. TRANS: Form validation error on page for remote subscribe when the remote service is not providing a request token.
-msgid "Could not get a request token."
-msgstr "无法获得一个 request token。"
-
-#. TRANS: Client error displayed when trying to (un)list an OMB 0.1 remote profile.
-msgid "You cannot (un)list an OMB 0.1 remote profile with this action."
-msgstr "你�能用这个�作(�消)纳入一个 OMB 0.1 远程用户。"
-
 #. TRANS: Client error displayed when an unknown error occurs while delisting a user.
 #. TRANS: %s is a username.
 #, php-format
@@ -4867,6 +4588,12 @@ msgstr "对 %s 的回�"
 msgid "Replies to %1$s, page %2$d"
 msgstr "对%s的回�，第%2$d页"
 
+#. TRANS: Link for feed with replies for a user.
+#. TRANS: %s is a user nickname.
+#, php-format
+msgid "Replies feed for %s (Activity Streams JSON)"
+msgstr "进给的答� %s（活动� JSON）"
+
 #. TRANS: Link for feed with replies for a user.
 #. TRANS: %s is a user nickname.
 #, php-format
@@ -4979,8 +4706,9 @@ msgid "Feed will be restored. Please wait a few minutes for results."
 msgstr "将还原订阅�。请等待几分钟。"
 
 #. TRANS: Form instructions for feed restore.
+#, fuzzy
 msgid ""
-"You can upload a backed-up stream in <a href=\"http://activitystrea.ms/"
+"You can upload a backed-up timeline in <a href=\"http://activitystrea.ms/"
 "\">Activity Streams</a> format."
 msgstr ""
 "你�以以<a href=\"http://activitystrea.ms/\">Activity Streams</a>格�上传一个"
@@ -5072,10 +4800,10 @@ msgstr "未找到应用。"
 #. TRANS: Information output on an OAuth application page.
 #. TRANS: %1$s is the application creator, %2$s is "read-only" or "read-write",
 #. TRANS: %3$d is the number of users using the OAuth application.
-#, fuzzy, php-format
+#, php-format
 msgid "Created by %1$s - %2$s access by default - %3$d user"
 msgid_plural "Created by %1$s - %2$s access by default - %3$d users"
-msgstr[0] "由%1$s创建 - 默认访问��%2$s - %3$d个用户"
+msgstr[0] "由 %1$s 创建 - 默认%2$s�� - %3$d个用户"
 
 #. TRANS: Header on the OAuth application page.
 msgid "Application actions"
@@ -5095,12 +4823,31 @@ msgstr "�置key和secret"
 msgid "Application info"
 msgstr "应用程�信�"
 
+#. TRANS: Field label on application page.
+msgid "Consumer key"
+msgstr "Consumer key"
+
+#. TRANS: Field label on application page.
+msgid "Consumer secret"
+msgstr "Consumer secret"
+
+#. TRANS: Field label on application page.
+msgid "Request token URL"
+msgstr "请求令牌URL"
+
+#. TRANS: Field label on application page.
+msgid "Access token URL"
+msgstr "访问令牌URL"
+
+#. TRANS: Field label on application page.
+msgid "Authorize URL"
+msgstr "授�URL"
+
 #. TRANS: Note on the OAuth application page about signature support.
-#, fuzzy
 msgid ""
 "Note: HMAC-SHA1 signatures are supported. The plaintext signature method is "
 "not supported."
-msgstr "�示：我们支�HMAC-SHA1签�。我们�支�明文的签�方法。"
+msgstr "注：支�HMAC-SHA1签�。�支�明文的签�方法。"
 
 #. TRANS: Text in confirmation dialog to reset consumer key and secret for an OAuth application.
 msgid "Are you sure you want to reset your consumer key and secret?"
@@ -5116,6 +4863,11 @@ msgstr "%1$s收�的消�，第%2$d页"
 msgid "Could not retrieve favorite notices."
 msgstr "无法获�收�的消�。"
 
+#. TRANS: Feed link text. %s is a username.
+#, php-format
+msgid "Feed for favorites of %s (Activity Streams JSON)"
+msgstr "饲料的收�夹的 %s（活动� JSON）"
+
 #. TRANS: Feed link text. %s is a username.
 #, php-format
 msgid "Feed for favorites of %s (RSS 1.0)"
@@ -5174,6 +4926,11 @@ msgstr "%s �组"
 msgid "%1$s group, page %2$d"
 msgstr "%1$s�组，第%2$d页"
 
+#. TRANS: Tooltip for feed link. %s is a group nickname.
+#, php-format
+msgid "Notice feed for %s group (Activity Streams JSON)"
+msgstr "饲料的通知 %s 集团 （活动� JSON）"
+
 #. TRANS: Tooltip for feed link. %s is a group nickname.
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
@@ -5194,42 +4951,8 @@ msgstr "%s�组的消��� (Atom)"
 msgid "FOAF for %s group"
 msgstr "%s 的�件箱"
 
-#. TRANS: Header for mini list of group members on a group page (h2).
-msgid "Members"
-msgstr "�组�员"
-
-#. TRANS: Description for mini list of group members on a group page when the group has no members.
-#. TRANS: Content of "Listed" page if there are no listed users.
-#. TRANS: Content of "People following tag x" if there are no subscribed users.
-#. TRANS: Empty list message for tags.
-#. TRANS: Text for user subscription statistics if the user has no subscriptions.
-#. TRANS: Text for user subscriber statistics if user has no subscribers.
-#. TRANS: Text for user user group membership statistics if user is not a member of any group.
-#. TRANS: Default content for section/sidebar widget.
-msgid "(None)"
-msgstr "（无）"
-
-#. TRANS: Link to all group members from mini list of group members if group has more than n members.
-msgid "All members"
-msgstr "所有�员"
-
-#. TRANS: Header for group statistics on a group page (h2).
-#. TRANS: H2 text for user statistics.
-msgid "Statistics"
-msgstr "统计"
-
-#. TRANS: Label for group creation date.
-msgctxt "LABEL"
-msgid "Created"
-msgstr "已创建"
-
-#. TRANS: Label for member count in statistics on group page.
-msgctxt "LABEL"
-msgid "Members"
-msgstr "�员"
-
 #. TRANS: Notice on group pages for anonymous users for StatusNet sites that accept new registrations.
-#. TRANS: **%s** is the group alias, %%%%site.name%%%% is the site name,
+#. TRANS: %s is the group name, %%%%site.name%%%% is the site name,
 #. TRANS: %%%%action.register%%%% is the URL for registration, %%%%doc.help%%%% is a URL to help.
 #. TRANS: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
 #, php-format
@@ -5247,25 +4970,20 @@ msgstr ""
 "%%doc.help%%%%)）"
 
 #. TRANS: Notice on group pages for anonymous users for StatusNet sites that accept no new registrations.
-#. TRANS: **%s** is the group alias, %%%%site.name%%%% is the site name,
+#. TRANS: %s is the group name, %%%%site.name%%%% is the site name,
 #. TRANS: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
-#, php-format
+#, fuzzy, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
 "wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
 "[StatusNet](http://status.net/) tool. Its members share short messages about "
-"their life and interests. "
+"their life and interests."
 msgstr ""
 "**%s** 是%%%%site.name%%%%上的一个�组，%%%%site.name%%%%是一个基于自由软件 "
 "[StatusNet](http://status.net/) 的[微�客](http://zh.wikipedia.org/zh-hans/%"
 "E5%BE%AE%E5%8D%9A%E5%AE%A2)。%%%%site.name%%%%的用户分享关于他们生活和��兴"
 "趣的消�。"
 
-#. TRANS: Title for list of group administrators on a group page.
-msgctxt "TITLE"
-msgid "Admins"
-msgstr "管�员"
-
 #. TRANS: Client error displayed requesting a single message that does not exist.
 msgid "No such message."
 msgstr "未找到此消�。"
@@ -5357,9 +5075,21 @@ msgid ""
 msgstr "为何�[加入我们](%%action.register%%)开始关注这时间线呢�"
 
 #. TRANS: Header on show list page.
+#. TRANS: Link description for link to list of users tagged with a tag (so part of a list).
 msgid "Listed"
 msgstr "已有��"
 
+#. TRANS: Content of "Listed" page if there are no listed users.
+#. TRANS: Content of "People following tag x" if there are no subscribed users.
+#. TRANS: Description for mini list of group members on a group page when the group has no members.
+#. TRANS: Empty list message for tags.
+#. TRANS: Text for user subscription statistics if the user has no subscriptions.
+#. TRANS: Text for user subscriber statistics if user has no subscribers.
+#. TRANS: Text for user user group membership statistics if user is not a member of any group.
+#. TRANS: Default content for section/sidebar widget.
+msgid "(None)"
+msgstr "（无）"
+
 #. TRANS: Link for more "People in list x by a user"
 #. TRANS: if there are more than the mini list's maximum.
 msgid "Show all"
@@ -5370,24 +5100,19 @@ msgstr "显示全部"
 msgid "Subscribers"
 msgstr "关注者"
 
-#. TRANS: Link for more "People following tag x"
-#. TRANS: if there are more than the mini list's maximum.
-msgid "All subscribers"
-msgstr "所有关注者"
-
-#. TRANS: Page title showing tagged notices in one user's stream.
+#. TRANS: Page title showing tagged notices in one user's timeline.
 #. TRANS: %1$s is the username, %2$s is the hash tag.
 #, php-format
 msgid "Notices by %1$s tagged %2$s"
 msgstr "%1$s 带有标签 %2$s 的消�"
 
-#. TRANS: Page title showing tagged notices in one user's stream.
+#. TRANS: Page title showing tagged notices in one user's timeline.
 #. TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number.
 #, php-format
 msgid "Notices by %1$s tagged %2$s, page %3$d"
 msgstr "%1$s 带有标签 %2$s 的消�，第 %3$d 页"
 
-#. TRANS: Extended page title showing tagged notices in one user's stream.
+#. TRANS: Extended page title showing tagged notices in one user's timeline.
 #. TRANS: %1$s is the username, %2$d is the page number.
 #, php-format
 msgid "Notices by %1$s, page %2$d"
@@ -5399,6 +5124,12 @@ msgstr "%1$s 的消�，第%2$d页"
 msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
 msgstr "%1$s的有%2$s标签的消��� (RSS 1.0)"
 
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#, php-format
+msgid "Notice feed for %s (Activity Streams JSON)"
+msgstr "饲料的通知 %s （活动� JSON）"
+
 #. TRANS: Title for link to notice feed.
 #. TRANS: %s is a user nickname.
 #, php-format
@@ -5423,7 +5154,7 @@ msgstr "%s的消��� (Atom)"
 msgid "FOAF for %s"
 msgstr "%sçš„FOAF"
 
-#. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
+#. TRANS: First sentence of empty list message for a timeline. $1%s is a user nickname.
 #, php-format
 msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
 msgstr "这是%1$s的时间线，但是%1$s还没有�布任何内容。"
@@ -5434,7 +5165,7 @@ msgid ""
 "would be a good time to start :)"
 msgstr "最近看到了什么有趣的消�了么？你还没有�布消�呢，现在开始� :)"
 
-#. TRANS: Second sentence of empty  list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
+#. TRANS: Second sentence of empty  list message for a non-self timeline. %1$s is a user nickname, %2$s is a part of a URL.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
 #, php-format
 msgid ""
@@ -5444,7 +5175,7 @@ msgstr ""
 "你�以试�呼�%1$s或给他们 [�一些消�](%%%%action.newnotice%%%%?"
 "status_textarea=%2$s)。"
 
-#. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
+#. TRANS: Announcement for anonymous users showing a timeline if site registrations are open.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
 #, php-format
 msgid ""
@@ -5458,13 +5189,13 @@ msgstr ""
 "E5%BE%AE%E5%8D%9A%E5%AE%A2)�务。[现在加入](%%%%action.register%%%%)并关注**%"
 "s**的消�和享�更多�趣! （[阅读更多](%%%%doc.help%%%%)）"
 
-#. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
+#. TRANS: Announcement for anonymous users showing a timeline if site registrations are closed or invite only.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#, php-format
+#, fuzzy, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
 "wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
-"[StatusNet](http://status.net/) tool. "
+"[StatusNet](http://status.net/) tool."
 msgstr ""
 "**%s**在%%%%site.name%%%%有一个账�，%%%%site.name%%%%是一个基于自由软件"
 "[StatusNet](http://status.net/)的[微�客](http://zh.wikipedia.org/zh-hans/%"
@@ -5501,6 +5232,14 @@ msgstr "网站�称长度必须大于零。"
 msgid "You must have a valid contact email address."
 msgstr "你必须有一个有效的 email 地�。"
 
+#. TRANS: Client error displayed when a logo URL is not valid.
+msgid "Invalid logo URL."
+msgstr "无效的 logo URL。"
+
+#. TRANS: Client error displayed when a SSL logo URL is invalid.
+msgid "Invalid SSL logo URL."
+msgstr "无效的 SSL logo URL。"
+
 #. TRANS: Client error displayed trying to save site settings with an invalid language code.
 #. TRANS: %s is the invalid language code.
 #, php-format
@@ -5518,7 +5257,7 @@ msgstr "防刷新�制至少�1秒或者更长。"
 #. TRANS: Fieldset legend on site settings panel.
 msgctxt "LEGEND"
 msgid "General"
-msgstr "一般"
+msgstr "常规"
 
 #. TRANS: Field label on site settings panel.
 msgctxt "LABEL"
@@ -5526,39 +5265,34 @@ msgid "Site name"
 msgstr "网点�称"
 
 #. TRANS: Field title on site settings panel.
-#, fuzzy
 msgid "The name of your site, like \"Yourcompany Microblog\"."
-msgstr "你的网站�称，例如\\\"你公�网站的微�\\\""
+msgstr "你的网站�称，例如“你的公�微��。"
 
 #. TRANS: Field label on site settings panel.
 msgid "Brought by"
 msgstr "�供商"
 
 #. TRANS: Field title on site settings panel.
-#, fuzzy
 msgid "Text used for credits link in footer of each page."
-msgstr "用于�页页脚的 credits 链接文字"
+msgstr "用于�页页脚的 credits 链接文字。"
 
 #. TRANS: Field label on site settings panel.
 msgid "Brought by URL"
 msgstr "�供商 URL"
 
 #. TRANS: Field title on site settings panel.
-#, fuzzy
 msgid "URL used for credits link in footer of each page."
-msgstr "用于�页页脚的 credits URL"
+msgstr "用于�页页脚的 credits 链接地�。"
 
 #. TRANS: Field label on site settings panel.
 msgid "Email"
 msgstr "电�邮件"
 
 #. TRANS: Field title on site settings panel.
-#, fuzzy
 msgid "Contact email address for your site."
-msgstr "网站的�系我们电�邮件地�"
+msgstr "网站的�系我们电�邮件地�。"
 
 #. TRANS: Fieldset legend on site settings panel.
-#, fuzzy
 msgctxt "LEGEND"
 msgid "Local"
 msgstr "本地"
@@ -5576,11 +5310,11 @@ msgid "Default language"
 msgstr "默认语言"
 
 #. TRANS: Dropdown title on site settings panel.
-msgid "Site language when autodetection from browser settings is not available"
-msgstr "当从�览器自动获�语言��用时网站的语言"
+msgid ""
+"The site language when autodetection from browser settings is not available."
+msgstr "从�览器的设置自动检测��用时网站的语言。"
 
 #. TRANS: Fieldset legend on site settings panel.
-#, fuzzy
 msgctxt "LEGEND"
 msgid "Limits"
 msgstr "�制"
@@ -5601,9 +5335,21 @@ msgstr "防刷新�制"
 msgid "How long users must wait (in seconds) to post the same thing again."
 msgstr "用户�次�布相�内容时需�等待的时间（秒）。"
 
+#. TRANS: Fieldset legend for form to change logo.
+msgid "Logo"
+msgstr "Logo"
+
+#. TRANS: Field label for StatusNet site logo.
+msgid "Site logo"
+msgstr "网站 logo"
+
+#. TRANS: Field label for SSL StatusNet site logo.
+msgid "SSL logo"
+msgstr "网站 SSL logo"
+
 #. TRANS: Button title for saving site settings.
-msgid "Save site settings"
-msgstr "�存访问设置"
+msgid "Save the site settings."
+msgstr "�存网站设置。"
 
 #. TRANS: Page title for site-wide notice tab in admin panel.
 msgid "Site Notice"
@@ -5629,7 +5375,7 @@ msgstr "网站公告文字"
 msgid "Site-wide notice text (255 characters maximum; HTML allowed)"
 msgstr "整个网站的公告文字（最长255字符；�使用HTML）"
 
-#. TRANS: Title for button to save site notice in admin panel.
+#. TRANS: Button title to save site notice in admin panel.
 msgid "Save site notice."
 msgstr "�存网站公告。"
 
@@ -5761,7 +5507,6 @@ msgid "No code entered."
 msgstr "没有输入的代�。"
 
 #. TRANS: Title for admin panel to configure snapshots.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Snapshots"
 msgstr "å¿«ç…§"
@@ -5783,7 +5528,6 @@ msgid "Invalid snapshot report URL."
 msgstr "无效的快照报告 URL。"
 
 #. TRANS: Fieldset legend on admin panel for snapshots.
-#, fuzzy
 msgctxt "LEGEND"
 msgid "Snapshots"
 msgstr "å¿«ç…§"
@@ -5801,29 +5545,26 @@ msgid "Data snapshots"
 msgstr "数�快照"
 
 #. TRANS: Dropdown title for snapshot method in admin panel for snapshots.
-#, fuzzy
 msgid "When to send statistical data to status.net servers."
-msgstr "什么时候将统计数���到 status.net �务器"
+msgstr "什么时候将统计数���到 status.net �务器。"
 
 #. TRANS: Input field label for snapshot frequency in admin panel for snapshots.
 msgid "Frequency"
 msgstr "频率"
 
 #. TRANS: Input field title for snapshot frequency in admin panel for snapshots.
-#, fuzzy
 msgid "Snapshots will be sent once every N web hits."
-msgstr "�第N次访问是��快照"
+msgstr "�第N次访问是��快照。"
 
 #. TRANS: Input field label for snapshot report URL in admin panel for snapshots.
 msgid "Report URL"
 msgstr "报告 URL"
 
 #. TRANS: Input field title for snapshot report URL in admin panel for snapshots.
-#, fuzzy
 msgid "Snapshots will be sent to this URL."
-msgstr "快照将被��到这个 URL"
+msgstr "快照将被��到这个 URL。"
 
-#. TRANS: Title for button to save snapshot settings.
+#. TRANS: Button title to save snapshot settings.
 msgid "Save snapshot settings."
 msgstr "�存快照设置"
 
@@ -5856,10 +5597,6 @@ msgstr "%1$s 关注者等待通过，第 %2$d 页"
 msgid "A list of users awaiting approval to subscribe to you."
 msgstr "等待批准关注你的人的列表。"
 
-#. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
-msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
-msgstr "你�能用这个�作关注一个 OMB 0.1 远程用户。"
-
 #. TRANS: Page title when subscription succeeded.
 msgid "Subscribed"
 msgstr "已关注"
@@ -5880,9 +5617,9 @@ msgstr "无法将 %1$s 添加到�� %2$s：%3$s"
 
 #. TRANS: Title of form to subscribe to a list.
 #. TRANS: %1%s is a user nickname, %2$s is a list, %3$s is a tagger nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s subscribed to list %2$s by %3$s"
-msgstr "%1$s的关注者，第%2$d页"
+msgstr "%1$s 订阅了由 %3$s 创建的列表  %2$s 。"
 
 #. TRANS: Header for list of subscribers for a user (first page).
 #. TRANS: %s is the user's nickname.
@@ -5953,13 +5690,12 @@ msgstr "这是%s关注的用户。"
 #. TRANS: This message contains Markdown URLs. The link description is between
 #. TRANS: square brackets, and the link between parentheses. Do not separate "]("
 #. TRANS: and do not change the URL part.
-#, php-format
+#, fuzzy, php-format
 msgid ""
 "You're not listening to anyone's notices right now, try subscribing to "
 "people you know. Try [people search](%%action.peoplesearch%%), look for "
 "members in groups you're interested in and in our [featured users](%%action."
-"featured%%). If you're a [Twitter user](%%action.twittersettings%%), you can "
-"automatically subscribe to people you already follow there."
+"featured%%)."
 msgstr ""
 "你现在还看�到其他人的消�，试�去关注一些你认识的人。试一下 [用户�索](%%"
 "action.peoplesearch%%)，在我们的 [推�用户](%%action.featured%%) 中找一些你感"
@@ -5980,7 +5716,6 @@ msgid "Subscription feed for %s (Atom)"
 msgstr "%s的订阅� (Atom)"
 
 #. TRANS: Checkbox label for enabling IM messages for a profile in a subscriptions list.
-#, fuzzy
 msgctxt "LABEL"
 msgid "IM"
 msgstr "�时通讯IM"
@@ -5995,6 +5730,12 @@ msgstr "SMS"
 msgid "Notices tagged with %1$s, page %2$d"
 msgstr "带%1$s标签的消�，第%2$d页"
 
+#. TRANS: Link label for feed on "notices with tag" page.
+#. TRANS: %s is the tag the feed is for.
+#, php-format
+msgid "Notice feed for tag %s (Activity Streams JSON)"
+msgstr "饲料标签的通知 %s （活动� JSON）"
+
 #. TRANS: Link label for feed on "notices with tag" page.
 #. TRANS: %s is the tag the feed is for.
 #, php-format
@@ -6016,65 +5757,56 @@ msgstr "%s标签的消��� (Atom)"
 #. TRANS: Client error displayed when trying to tag a user that cannot be tagged.
 #. TRANS: Client exception thrown trying to set a tag for a user that cannot be tagged.
 #. TRANS: Error displayed when trying to tag a user that cannot be tagged.
-#, fuzzy
 msgid "You cannot tag this user."
-msgstr "无法�此用户��消�。"
+msgstr "无法标记此用户"
 
 #. TRANS: Title for list form when not on a profile page.
-#, fuzzy
 msgid "List a profile"
-msgstr "用户页�"
+msgstr "列出的�置文件"
 
 #. TRANS: Title for list form when on a profile page.
 #. TRANS: %s is a profile nickname.
-#, fuzzy, php-format
+#, php-format
 msgctxt "ADDTOLIST"
 msgid "List %s"
-msgstr "�制"
+msgstr "列表 %s"
 
 #. TRANS: Title for list form when an error has occurred.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Error"
-msgstr "Ajax错误"
+msgstr "错误"
 
 #. TRANS: Header in list form.
 msgid "User profile"
 msgstr "用户页�"
 
 #. TRANS: Fieldset legend for list form.
-#, fuzzy
 msgid "List user"
-msgstr "�制"
+msgstr "将用户添加到列表"
 
 #. TRANS: Field label on list form.
-#, fuzzy
 msgctxt "LABEL"
 msgid "Lists"
-msgstr "�制"
+msgstr "列表"
 
 #. TRANS: Field title on list form.
-#, fuzzy
 msgid ""
 "Lists for this user (letters, numbers, -, ., and _), comma- or space- "
 "separated."
-msgstr "你的标签 (字��数字�“-��“. �和“ _�)， 以逗�或空格分隔"
+msgstr "列出此用户 （字�� 数字�-�。和 _），逗�或空间-分隔。"
 
 #. TRANS: Title for personal tag cloud section.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Tags"
 msgstr "标签"
 
 #. TRANS: Success message if lists are saved.
-#, fuzzy
 msgid "Lists saved."
-msgstr "密�已�存。"
+msgstr "列表已�存。"
 
 #. TRANS: Page notice.
-#, fuzzy
 msgid "Use this form to add your subscribers or subscriptions to lists."
-msgstr "使用这个表�给你的关注者或你关注的用户添加标签。"
+msgstr "使用这个表�将你的关注者或你关注的用户添加到列表。"
 
 #. TRANS: Client error when requesting a tag feed for a non-existing tag.
 msgid "No such tag."
@@ -6098,24 +5830,13 @@ msgstr "已�消关注"
 
 #. TRANS: Page title for form that allows unsubscribing from a list.
 #. TRANS: %1$s is a nickname, %2$s is a list, %3$s is a tagger nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s unsubscribed from list %2$s by %3$s"
-msgstr "%1$s的关注者，第%2$d页"
-
-#. TRANS: Client error displayed when trying to update profile with an incompatible license.
-#. TRANS: %1$s is the license incompatible with site license %2$s.
-#. TRANS: Exception thrown when licenses are not compatible for an authorisation request.
-#. TRANS: %1$s is the license for the listenee, %2$s is the license for "this" StatusNet site.
-#, fuzzy, php-format
-msgid ""
-"Listenee stream license \"%1$s\" is not compatible with site license \"%2$s"
-"\"."
-msgstr "Listenee stream 许��“‘%1$s� 与本网站的许�� “%2$s��兼容。"
+msgstr "%1$s �消订阅了由 %3$s 创建的列表 %2$s。"
 
 #. TRANS: Title of URL settings tab in profile settings.
-#, fuzzy
 msgid "URL settings"
-msgstr "IM 设置"
+msgstr "URL 设置"
 
 #. TRANS: Instructions for tab "Other" in user profile settings.
 msgid "Manage various other options."
@@ -6128,13 +5849,12 @@ msgid " (free service)"
 msgstr "（�费�务）"
 
 #. TRANS: Default value for URL shortening settings.
-#, fuzzy
 msgid "[none]"
 msgstr "æ— "
 
 #. TRANS: Default value for URL shortening settings.
 msgid "[internal]"
-msgstr ""
+msgstr "[站内]"
 
 #. TRANS: Label for dropdown with URL shortener services.
 msgid "Shorten URLs with"
@@ -6146,38 +5866,36 @@ msgstr "�使用的自动短网��务。"
 
 #. TRANS: Field label in URL settings in profile.
 msgid "URL longer than"
-msgstr ""
+msgstr "URL 长度超过"
 
 #. TRANS: Field title in URL settings in profile.
 msgid "URLs longer than this will be shortened, 0 means always shorten."
-msgstr ""
+msgstr "URL 长度超过此设置将被缩短，0 代表总是缩短网�。"
 
 #. TRANS: Field label in URL settings in profile.
 msgid "Text longer than"
-msgstr ""
+msgstr "文字长度超过"
 
 #. TRANS: Field title in URL settings in profile.
 msgid ""
 "URLs in notices longer than this will be shortened, 0 means always shorten."
-msgstr ""
+msgstr "此消�中的 URLs 长度超过此设置将被缩短，0 代表总是缩短网�。"
 
 #. TRANS: Form validation error for form "Other settings" in user profile.
 msgid "URL shortening service is too long (maximum 50 characters)."
 msgstr "短网��务过长(�能超过50个字符)。"
 
 #. TRANS: Client exception thrown when the maximum URL settings value is invalid in profile URL settings.
-#, fuzzy
 msgid "Invalid number for maximum URL length."
-msgstr "无效的消�内容。"
+msgstr "无效的最大 URL 长度数字。"
 
 #. TRANS: Client exception thrown when the maximum notice length settings value is invalid in profile URL settings.
-#, fuzzy
 msgid "Invalid number for maximum notice length."
-msgstr "无效的消�内容。"
+msgstr "无效的最大消�长度数字。"
 
 #. TRANS: Server exception thrown in profile URL settings when preferences could not be saved.
 msgid "Error saving user URL shortening preferences."
-msgstr ""
+msgstr "�存短网��务�置出错。"
 
 #. TRANS: User admin panel title.
 msgctxt "TITLE"
@@ -6203,7 +5921,6 @@ msgid "Invalid default subscripton: \"%1$s\" is not a user."
 msgstr "无效的默认关注：“%1$s��是一个用户。"
 
 #. TRANS: Fieldset legend in user administration panel.
-#, fuzzy
 msgctxt "LEGEND"
 msgid "Profile"
 msgstr "个人信�"
@@ -6248,150 +5965,10 @@ msgstr "邀请已�用"
 msgid "Whether to allow users to invite new users."
 msgstr "是��许用户��注册邀请。"
 
-#. TRANS: Title for button to save user settings in user admin panel.
+#. TRANS: Button title to save user settings in user admin panel.
 msgid "Save user settings."
 msgstr "�存用户设置。"
 
-#. TRANS: Page title.
-msgid "Authorize subscription"
-msgstr "授�关注"
-
-#. TRANS: Page notice on "Authorize subscription" page.
-msgid ""
-"Please check these details to make sure that you want to subscribe to this "
-"user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
-"click \"Reject\"."
-msgstr ""
-"请检查这些详细信�，请确�您�订阅此用户的通知。如果您��是�求�人的通知订"
-"阅，请�击\"拒�\"。"
-
-#. TRANS: Button text on Authorise Subscription page.
-#. TRANS: Submit button text to accept a group membership request on approve group form.
-#. TRANS: Submit button text to accept a subscription request on approve sub form.
-msgctxt "BUTTON"
-msgid "Accept"
-msgstr "接�"
-
-#. TRANS: Title for button on Authorise Subscription page.
-#. TRANS: Button title to subscribe to a user.
-msgid "Subscribe to this user."
-msgstr "订阅此用户。"
-
-#. TRANS: Button text on Authorise Subscription page.
-#. TRANS: Submit button text to reject a group membership request on approve group form.
-#. TRANS: Submit button text to reject a subscription request on approve sub form.
-msgctxt "BUTTON"
-msgid "Reject"
-msgstr "拒�"
-
-#. TRANS: Title for button on Authorise Subscription page.
-msgid "Reject this subscription."
-msgstr "拒�此订阅。"
-
-#. TRANS: Client error displayed for an empty authorisation request.
-msgid "No authorization request!"
-msgstr "没有授�请求�"
-
-#. TRANS: Accept message header from Authorise subscription page.
-msgid "Subscription authorized"
-msgstr "已授�关注"
-
-#. TRANS: Accept message text from Authorise subscription page.
-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。请到网站查看如何授�关注。你的 subscription "
-"token 是："
-
-#. TRANS: Reject message header from Authorise subscription page.
-msgid "Subscription rejected"
-msgstr "关注已拒�"
-
-#. TRANS: Reject message from Authorise subscription page.
-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。请到网站查看如何完全拒�关注。"
-
-#. TRANS: Exception thrown when no valid user is found for an authorisation request.
-#. TRANS: %s is a listener URI.
-#, fuzzy, php-format
-msgid "Listener URI \"%s\" not found here."
-msgstr "Listener URI ‘%s’ 没有找到。"
-
-#. TRANS: Exception thrown when listenee URI is too long for an authorisation request.
-#. TRANS: %s is a listenee URI.
-#, fuzzy, php-format
-msgid "Listenee URI \"%s\" is too long."
-msgstr "Listenee URI ‘%s’ 过长。"
-
-#. TRANS: Exception thrown when listenee URI is a local user for an authorisation request.
-#. TRANS: %s is a listenee URI.
-#, fuzzy, php-format
-msgid "Listenee URI \"%s\" is a local user."
-msgstr "Listenee URI ‘%s’ 是一个本地用户。"
-
-#. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
-#. TRANS: %s is a profile URL.
-#, fuzzy, php-format
-msgid "Profile URL \"%s\" is for a local user."
-msgstr "个人信� URL “%s� 是为本地用户的。"
-
-#. TRANS: Exception thrown when avatar URL is invalid for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#, fuzzy, php-format
-msgid "Avatar URL \"%s\" is not valid."
-msgstr "头�地�‘%s’无效。"
-
-#. TRANS: Exception thrown when avatar URL could not be read for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#, fuzzy, php-format
-msgid "Cannot read avatar URL \"%s\"."
-msgstr "无法读�头� URL '%s'。"
-
-#. TRANS: Exception thrown when avatar URL return an invalid image type for an authorisation request.
-#. TRANS: %s is an avatar URL.
-#, fuzzy, php-format
-msgid "Wrong image type for avatar URL \"%s\"."
-msgstr "头� URL ‘%s’ 图�格�错误。"
-
-#. TRANS: Title for profile design page.
-#. TRANS: Page title for profile design page.
-msgid "Profile design"
-msgstr "个人页�外观"
-
-#. TRANS: Instructions for Profile design page.
-#. TRANS: Instructions for profile design page.
-msgid ""
-"Customize the way your profile looks with a background image and a colour "
-"palette of your choice."
-msgstr "通过背景图片和调色�自定义你的页�外观。"
-
-#. TRANS: Succes message on Profile design page when finding an easter egg.
-msgid "Enjoy your hotdog!"
-msgstr "享�你的�果��"
-
-#. TRANS: Form legend on Profile design page.
-#, fuzzy
-msgid "Design settings"
-msgstr "�存访问设置"
-
-#. TRANS: Checkbox label on Profile design page.
-msgid "View profile designs"
-msgstr "查看个人页�外观"
-
-#. TRANS: Title for checkbox on Profile design page.
-msgid "Show or hide profile designs."
-msgstr "显示或��个人页�外观。"
-
-#. TRANS: Form legend on Profile design page for form to choose a background image.
-#, fuzzy
-msgid "Background file"
-msgstr "背景"
-
 #. TRANS: Page title for all but the first page of groups for a user.
 #. TRANS: %1$s is a nickname, %2$d is a page number.
 #, php-format
@@ -6430,9 +6007,9 @@ msgstr "StatusNet %s"
 
 #. TRANS: Content part of StatusNet version page.
 #. TRANS: %1$s is the engine name (StatusNet) and %2$s is the StatusNet version.
-#, php-format
+#, fuzzy, php-format
 msgid ""
-"This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, "
+"This site is powered by %1$s version %2$s, Copyright 2008-2011 StatusNet, "
 "Inc. and contributors."
 msgstr ""
 "此网站使用%1$s版本%2$s，2008-2010 StatusNet, Inc. 和其他贡献者版�所有。"
@@ -6446,21 +6023,23 @@ msgid "License"
 msgstr "许��议"
 
 #. TRANS: Content part of StatusNet version page.
+#, fuzzy
 msgid ""
 "StatusNet is free software: you can redistribute it and/or modify it under "
 "the terms of the GNU Affero General Public License as published by the Free "
 "Software Foundation, either version 3 of the License, or (at your option) "
-"any later version. "
+"any later version."
 msgstr ""
 "StatusNet 是一个�费软件，你�以在�守自由软件基金会�布的 GNU Affero GPL 或"
 "第三版或以�的版本的情况下�新部署或者修改它，"
 
 #. TRANS: Content part of StatusNet version page.
+#, fuzzy
 msgid ""
 "This program is distributed in the hope that it will be useful, but WITHOUT "
 "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
 "FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License "
-"for more details. "
+"for more details."
 msgstr ""
 "这个程�的�布是希望它�以有用，但没有任何的担�；也没有售�性或者符�其他特"
 "别目的的担�。查看 GNU Affero GPL 了解更多信�。"
@@ -6478,25 +6057,21 @@ msgid "Plugins"
 msgstr "�件"
 
 #. TRANS: Column header for plugins table on version page.
-#, fuzzy
 msgctxt "HEADER"
 msgid "Name"
 msgstr "�称"
 
 #. TRANS: Column header for plugins table on version page.
-#, fuzzy
 msgctxt "HEADER"
 msgid "Version"
 msgstr "版本"
 
 #. TRANS: Column header for plugins table on version page.
-#, fuzzy
 msgctxt "HEADER"
 msgid "Author(s)"
 msgstr "作者"
 
 #. TRANS: Column header for plugins table on version page.
-#, fuzzy
 msgctxt "HEADER"
 msgid "Description"
 msgstr "�述"
@@ -6520,16 +6095,25 @@ msgstr "�能处� URL “%s�"
 msgid "Robin thinks something is impossible."
 msgstr "麦�认为�烧麦是份很令人愉快的工作。"
 
-#. TRANS: Message given if an upload is larger than the configured maximum.
-#. TRANS: %1$d is the byte limit for uploads, %2$d is the byte count for the uploaded file.
-#. TRANS: %1$s is used for plural.
+#. TRANS: Message used to be inserted as %2$s in  the text "No file may
+#. TRANS: be larger than %1$d byte and the file you sent was %2$s.".
+#. TRANS: %1$d is the number of bytes of an uploaded file.
 #, php-format
+msgid "%1$d byte"
+msgid_plural "%1$d bytes"
+msgstr[0] ""
+
+#. TRANS: Message given if an upload is larger than the configured maximum.
+#. TRANS: %1$d (used for plural) is the byte limit for uploads,
+#. TRANS: %2$s is the proper form of "n bytes". This is the only ways to have
+#. TRANS: gettext support multiple plurals in the same message, unfortunately...
+#, fuzzy, php-format
 msgid ""
-"No file may be larger than %1$d byte and the file you sent was %2$d bytes. "
-"Try to upload a smaller version."
+"No file may be larger than %1$d byte and the file you sent was %2$s. Try to "
+"upload a smaller version."
 msgid_plural ""
-"No file may be larger than %1$d bytes and the file you sent was %2$d bytes. "
-"Try to upload a smaller version."
+"No file may be larger than %1$d bytes and the file you sent was %2$s. Try to "
+"upload a smaller version."
 msgstr[0] "文件�能大于%1$d字节，而你上传的文件是%2$d字节。�个�点的试一下。"
 
 #. TRANS: Message given if an upload would exceed user quota.
@@ -6594,6 +6178,11 @@ msgstr "无法更新本地�组。"
 msgid "Could not create login token for %s"
 msgstr "无法创建别�。"
 
+#. TRANS: Exception thrown when a program code class (%s) cannot be instantiated.
+#, fuzzy, php-format
+msgid "Cannot instantiate class %s."
+msgstr "无法�存新密�。"
+
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.
 msgid "No database name or DSN found anywhere."
 msgstr "没有找到数�库�称或者 DSN。"
@@ -6617,9 +6206,9 @@ msgid "No such profile (%1$d) for notice (%2$d)."
 msgstr "没有对于 消� (%2$d) 的 个人信�页 (%1$d) 。"
 
 #. TRANS: Server exception. %s are the error details.
-#, fuzzy, php-format
+#, php-format
 msgid "Database error inserting hashtag: %s."
-msgstr "�入标签时数�库出错：%s"
+msgstr "�入 hashtag“%s�时数�库出错。"
 
 #. TRANS: Client exception thrown if a notice contains too many characters.
 msgid "Problem saving notice. Too long."
@@ -6645,23 +6234,20 @@ msgid "You are banned from posting notices on this site."
 msgstr "在这个网站你被�止�布消�。"
 
 #. TRANS: Client exception thrown in notice when trying to repeat a missing or deleted notice.
-#, fuzzy
 msgid "Cannot repeat; original notice is missing or deleted."
-msgstr "�能转�你自己的消�。"
+msgstr "�能转�，原始的消�消失或已被删除。"
 
 #. TRANS: Client error displayed when trying to repeat an own notice.
 msgid "You cannot repeat your own notice."
 msgstr "你�能��自己的消�。"
 
 #. TRANS: Client error displayed when trying to repeat a non-public notice.
-#, fuzzy
 msgid "Cannot repeat a private notice."
-msgstr "�能转�你自己的消�。"
+msgstr "�能转�设置��的消�。"
 
 #. TRANS: Client error displayed when trying to repeat a notice you cannot access.
-#, fuzzy
 msgid "Cannot repeat a notice you cannot read."
-msgstr "�能转�你自己的消�。"
+msgstr "�能转�你无法看到的消�。"
 
 #. TRANS: Client error displayed when trying to repeat an already repeated notice.
 msgid "You already repeated that notice."
@@ -6669,9 +6255,9 @@ msgstr "你已转�过了那个消�。"
 
 #. TRANS: Client error displayed when trying to reply to a notice a the target has no access to.
 #. TRANS: %1$s is a user nickname, %2$d is a notice ID (number).
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s has no access to notice %2$d."
-msgstr "用户没有最�一�的消�。"
+msgstr "以下的�数没有用到： %1$s，%2$d"
 
 #. TRANS: Server exception thrown when a notice cannot be saved.
 #. TRANS: Server exception thrown when a notice cannot be updated.
@@ -6713,32 +6299,27 @@ msgstr "无法�消用户#%2$d的\\\"%1$s\\\"��，数�库错误。"
 
 #. TRANS: Server exception.
 msgid "The tag you are trying to rename to already exists."
-msgstr ""
+msgstr "你想�命�的标签已�存在了。"
 
 #. TRANS: Server exception saving new tag without having a tagger specified.
-#, fuzzy
 msgid "No tagger specified."
-msgstr "没有指定�组。"
+msgstr "指定没有这些。"
 
 #. TRANS: Server exception saving new tag without having a tag specified.
-#, fuzzy
 msgid "No tag specified."
-msgstr "没有指定�组。"
+msgstr "没有指定标签。"
 
 #. TRANS: Server exception saving new tag.
-#, fuzzy
 msgid "Could not create profile tag."
-msgstr "无法�存个人信�。"
+msgstr "无法创建个人信�标签。"
 
 #. TRANS: Server exception saving new tag.
-#, fuzzy
 msgid "Could not set profile tag URI."
-msgstr "无法�存个人信�。"
+msgstr "无法设置个人信�标签 URI。"
 
 #. TRANS: Server exception saving new tag.
-#, fuzzy
 msgid "Could not set profile tag mainpage."
-msgstr "无法�存个人信�。"
+msgstr "无法设置个人信�标签页�。"
 
 #. TRANS: Client exception thrown trying to set more tags than allowed.
 #, php-format
@@ -6746,23 +6327,25 @@ msgid ""
 "You already have created %d or more tags which is the maximum allowed number "
 "of tags. Try using or deleting some existing tags."
 msgstr ""
+"你已�创建了 %d �或更多的标签，达到了标签数�的上�。试下删掉一些已�创建的"
+"标签。"
 
 #. TRANS: Client exception thrown when trying to add more people than allowed to a list.
-#, php-format
+#, fuzzy, php-format
 msgid ""
 "You already have %1$d or more people in list %2$s, which is the maximum "
-"allowed number.Try unlisting others first."
+"allowed number. Try unlisting others first."
 msgstr ""
+"你已�有了 %1$d 或更多的人到列表 %2$s，达到了�许添加的人数上�。试下将其他人"
+"从列表中删除。"
 
 #. TRANS: Exception thrown when inserting a list subscription in the database fails.
-#, fuzzy
 msgid "Adding list subscription failed."
-msgstr "无法�消关注。"
+msgstr "添加列表订阅失败。"
 
 #. TRANS: Exception thrown when deleting a list subscription from the database fails.
-#, fuzzy
 msgid "Removing list subscription failed."
-msgstr "无法�消关注。"
+msgstr "删除列表订阅失败。"
 
 #. TRANS: Exception thrown when a right for a non-existing user profile is checked.
 msgid "Missing profile."
@@ -6773,7 +6356,6 @@ msgid "Unable to save tag."
 msgstr "无法�存标签。"
 
 #. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
-#. TRANS: Error message displayed to a banned user when they try to subscribe.
 msgid "You have been banned from subscribing."
 msgstr "你被�止添加关注。"
 
@@ -6793,16 +6375,11 @@ msgstr "未关注�"
 msgid "Could not delete self-subscription."
 msgstr "无法删除自我关注。"
 
-#. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
-msgid "Could not delete subscription OMB token."
-msgstr "无法删除关注 OMB token。"
-
 #. TRANS: Exception thrown when a subscription could not be deleted on the server.
 msgid "Could not delete subscription."
 msgstr "无法�消关注。"
 
 #. TRANS: Activity title when subscribing to another person.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Follow"
 msgstr "关注"
@@ -6821,7 +6398,7 @@ msgstr "欢迎�到 %1$s, @%2$s!"
 
 #. TRANS: Exception thrown when trying view "repeated to me".
 msgid "Not implemented since inbox change."
-msgstr ""
+msgstr "自收件箱更改�未实现。"
 
 #. TRANS: Server exception.
 msgid "No single user defined for single-user mode."
@@ -6831,6 +6408,18 @@ msgstr "没有�独的用户被定义为�用户模�。"
 msgid "Single-user mode code called when not enabled."
 msgstr "没�用�用户模�的代�。"
 
+#. TRANS: Information on password recovery form if no known username or e-mail address was specified.
+msgid "No user with that email address or username."
+msgstr "没有拥有这个用户�或电�邮件的用户。"
+
+#. TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.
+msgid "No registered email address for that user."
+msgstr "该用户没有登记电�邮件。"
+
+#. TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.
+msgid "Error saving address confirmation."
+msgstr "�存地�确认时出错。"
+
 #. TRANS: Server exception thrown when creating a group failed.
 msgid "Could not create group."
 msgstr "无法创建�组。"
@@ -6857,13 +6446,13 @@ msgstr "找�到�户 %s。"
 #. TRANS: %s is the remote site.
 #, php-format
 msgid "Cannot find XRD for %s."
-msgstr ""
+msgstr "无法找到 %s 的 XRD。"
 
 #. TRANS: Exception thrown when an account could not be located when it should be moved.
 #. TRANS: %s is the remote site.
 #, php-format
 msgid "No AtomPub API service for %s."
-msgstr ""
+msgstr "没有为 %s 的 AtomPub API �务。"
 
 #. TRANS: H2 for user actions in a profile.
 #. TRANS: H2 for entity actions in a profile.
@@ -6875,23 +6464,19 @@ msgid "User deletion in progress..."
 msgstr "用户删除处�中……"
 
 #. TRANS: Link title for link on user profile.
-#, fuzzy
 msgid "Edit profile settings."
 msgstr "编辑个人信�设置"
 
 #. TRANS: Link text for link on user profile.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Edit"
 msgstr "编辑"
 
 #. TRANS: Link title for link on user profile.
-#, fuzzy
 msgid "Send a direct message to this user."
 msgstr "给该用户���信"
 
 #. TRANS: Link text for link on user profile.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Message"
 msgstr "�信"
@@ -6929,7 +6514,6 @@ msgid "Show more"
 msgstr "显示更多"
 
 #. TRANS: Inline reply form submit button: submits a reply comment.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Reply"
 msgstr "回�"
@@ -6937,13 +6521,12 @@ msgstr "回�"
 #. TRANS: Placeholder text for inline reply form. Clicking in this box will turn it into a mini notice form.
 #. TRANS: Field label for reply mini form.
 msgid "Write a reply..."
-msgstr ""
+msgstr "写一个回�..."
 
 #. TRANS: Tab on the notice form.
-#, fuzzy
 msgctxt "TAB"
 msgid "Status"
-msgstr "StatusNet"
+msgstr "消�"
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
 #. TRANS: Text between [] is a link description, text between () is the link itself.
@@ -7057,9 +6640,9 @@ msgid "No content for notice %s."
 msgstr "通知 %s 没有内容。"
 
 #. TRANS: Exception thrown if a non-existing user is provided. %s is a user ID.
-#, fuzzy, php-format
+#, php-format
 msgid "No such user \"%s\"."
-msgstr "没有这样的用户 %s。"
+msgstr "没有这样的用户 \"%s\"。"
 
 #. TRANS: Client exception thrown when post to collection fails with a 400 status.
 #. TRANS: %1$s is a URL, %2$s is the status, %s$s is the fail reason.
@@ -7100,29 +6683,12 @@ msgstr "showForm() 尚未实现。"
 msgid "saveSettings() not implemented."
 msgstr "saveSettings() 尚未实现。"
 
-#. TRANS: Client error message thrown if design settings could not be deleted in
-#. TRANS: the admin panel Design.
-msgid "Unable to delete design setting."
-msgstr "无法删除外观设置。"
-
 #. TRANS: Header in administrator navigation panel.
-#. TRANS: Header in settings navigation panel.
-#, fuzzy
 msgctxt "HEADER"
 msgid "Home"
 msgstr "主页"
 
-#. TRANS: Menu item in administrator navigation panel.
-#. TRANS: Menu item in default local navigation panel.
-#. TRANS: Menu item in personal group navigation menu.
-#. TRANS: Menu item in settings navigation panel.
-#, fuzzy
-msgctxt "MENU"
-msgid "Home"
-msgstr "主页"
-
 #. TRANS: Header in administrator navigation panel.
-#, fuzzy
 msgctxt "HEADER"
 msgid "Admin"
 msgstr "管�"
@@ -7136,23 +6702,11 @@ msgctxt "MENU"
 msgid "Site"
 msgstr "网站"
 
-#. TRANS: Menu item title in administrator navigation panel.
-msgid "Design configuration"
-msgstr "外观�置"
-
-#. TRANS: Menu item in administrator navigation panel.
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: Menu item in settings navigation panel.
-msgctxt "MENU"
-msgid "Design"
-msgstr "外观"
-
 #. TRANS: Menu item title in administrator navigation panel.
 msgid "User configuration"
 msgstr "用户�置"
 
 #. TRANS: Menu item in administrator navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "User"
 msgstr "用户"
@@ -7171,7 +6725,6 @@ msgid "Paths configuration"
 msgstr "路径�置"
 
 #. TRANS: Menu item in administrator navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Paths"
 msgstr "路径"
@@ -7190,17 +6743,15 @@ msgid "Edit site notice"
 msgstr "编辑网站消�"
 
 #. TRANS: Menu item in administrator navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Site notice"
-msgstr "网站消�"
+msgstr "网站公告"
 
 #. TRANS: Menu item title in administrator navigation panel.
 msgid "Snapshots configuration"
 msgstr "更改站点�置"
 
 #. TRANS: Menu item in administrator navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Snapshots"
 msgstr "å¿«ç…§"
@@ -7210,18 +6761,15 @@ msgid "Set site license"
 msgstr "设置网站许��议"
 
 #. TRANS: Menu item in administrator navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "License"
 msgstr "许��议"
 
 #. TRANS: Menu item title in administrator navigation panel.
-#, fuzzy
 msgid "Plugins configuration"
-msgstr "路径�置"
+msgstr "�件�置"
 
 #. TRANS: Menu item in administrator navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Plugins"
 msgstr "�件"
@@ -7236,7 +6784,7 @@ msgstr "没有应用使用这个 consumer key。"
 
 #. TRANS: Authorization exception thrown when a user without API access tries to access the API.
 msgid "Not allowed to use API."
-msgstr ""
+msgstr "��许使用 API。"
 
 #. TRANS: OAuth exception given when an incorrect access token was given for a user.
 msgid "Bad access token."
@@ -7251,39 +6799,6 @@ msgstr "没有用户使用这个 token。"
 msgid "Could not authenticate you."
 msgstr "无法验�你。"
 
-#. TRANS: Server error displayed when trying to create an anynymous OAuth consumer.
-msgid "Could not create anonymous consumer."
-msgstr "无法创建匿� consumer。"
-
-#. TRANS: Server error displayed when trying to create an anynymous OAuth application.
-msgid "Could not create anonymous OAuth application."
-msgstr "无法创建匿� OAuth 应用。"
-
-#. TRANS: Exception thrown when no token association could be found.
-msgid ""
-"Could not find a profile and application associated with the request token."
-msgstr "无法找到请求 token 对应的用户和应用。"
-
-#. TRANS: Exception thrown when no access token can be issued.
-msgid "Could not issue access token."
-msgstr "无法�行 access token。"
-
-#. TRANS: Exception thrown when a database error occurs.
-msgid "Database error inserting OAuth application user."
-msgstr "�入 OAuth 应用用户时数�库出错。"
-
-#. TRANS: Exception thrown when a database error occurs.
-msgid "Database error updating OAuth application user."
-msgstr "�入 OAuth 应用用户时数�库出错。"
-
-#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
-msgid "Tried to revoke unknown token."
-msgstr "�试了�消未知的 token。"
-
-#. TRANS: Exception thrown when an attempt is made to remove a revoked token.
-msgid "Failed to delete revoked token."
-msgstr "删除�消的 token 失败。"
-
 #. TRANS: Form input field label for application icon.
 msgid "Icon"
 msgstr "图标"
@@ -7363,18 +6878,18 @@ msgid "Default access for this application: read-only, or read-write"
 msgstr "该应用默认的访问��：�读或读写"
 
 #. TRANS: Submit button title.
-msgid "Cancel"
-msgstr "�消"
+#, fuzzy
+msgid "Cancel application changes."
+msgstr "关�的应用"
 
 #. TRANS: Submit button title.
-#. TRANS: Button text to save a list.
-msgid "Save"
-msgstr "�存"
+#, fuzzy
+msgid "Save application changes."
+msgstr "新应用"
 
 #. TRANS: Name for an anonymous application in application list.
-#, fuzzy
 msgid "Unknown application"
-msgstr "未知动作"
+msgstr "未知应用"
 
 #. TRANS: Message has a leading space and a trailing space. Used in application list.
 #. TRANS: Before this message the application name is put, behind it the organisation that manages it.
@@ -7405,6 +6920,18 @@ msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "�消"
 
+#. TRANS: Submit button text to accept a group membership request on approve group form.
+#. TRANS: Submit button text to accept a subscription request on approve sub form.
+msgctxt "BUTTON"
+msgid "Accept"
+msgstr "接�"
+
+#. TRANS: Submit button text to reject a group membership request on approve group form.
+#. TRANS: Submit button text to reject a subscription request on approve sub form.
+msgctxt "BUTTON"
+msgid "Reject"
+msgstr "拒�"
+
 #. TRANS: Atom feed exception thrown when an author element does not contain a name element.
 msgid "Author element must contain a name element."
 msgstr "作者元素必须包�一个�称元素。"
@@ -7451,13 +6978,12 @@ msgstr "�蔽这个用户"
 #. TRANS: Submit button text on form to cancel group join request.
 msgctxt "BUTTON"
 msgid "Cancel join request"
-msgstr ""
+msgstr "�消加入申请"
 
 #. TRANS: Button text for form action to cancel a subscription request.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Cancel subscription request"
-msgstr "所有关注的"
+msgstr "�消订阅请求"
 
 #. TRANS: Title for command results.
 msgid "Command results"
@@ -7526,9 +7052,8 @@ msgstr ""
 "消�数： %3$s"
 
 #. TRANS: Error message text shown when a favorite could not be set because it has already been favorited.
-#, fuzzy
 msgid "Could not create favorite: Already favorited."
-msgstr "无法创建收�。"
+msgstr "无法创建喜欢： 已�喜欢。"
 
 #. TRANS: Text shown when a notice has been marked as favourite successfully.
 msgid "Notice marked as fave."
@@ -7550,20 +7075,20 @@ msgstr "%1$s离开了%2$s�组。"
 #. TRANS: %1$s is the tagged user, %2$s is the error message (no punctuation).
 #, php-format
 msgid "Error tagging %1$s: %2$s"
-msgstr ""
+msgstr "标签 %1$s: %2$s 出现错误"
 
 #. TRANS: Succes message displayed if tagging a user succeeds.
 #. TRANS: %1$s is the tagged user's nickname, %2$s is a list of tags.
 #. TRANS: Plural is decided based on the number of tags added (not part of message).
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s was tagged %2$s"
 msgid_plural "%1$s was tagged %2$s"
-msgstr[0] "%1$s - %2$s"
+msgstr[0] "%1$s 被人�作 %2$s"
 
 #. TRANS: Separator for list of tags.
 #. TRANS: Separator in list of user names like "Jim, Bob, Mary".
 msgid ", "
-msgstr ""
+msgstr "�"
 
 #. TRANS: Error displayed if a given tag is invalid.
 #. TRANS: %s is the invalid tag.
@@ -7575,7 +7100,7 @@ msgstr "无效的标签：\"%s\"。"
 #. TRANS: %1$s is the untagged user, %2$s is the error message (no punctuation).
 #, php-format
 msgid "Error untagging %1$s: %2$s"
-msgstr ""
+msgstr "�消标签 %1$s: %2$s 出现错误"
 
 #. TRANS: Succes message displayed if untagging a user succeeds.
 #. TRANS: %1$s is the untagged user's nickname, %2$s is a list of tags.
@@ -7583,7 +7108,7 @@ msgstr ""
 #, php-format
 msgid "The following tag was removed from user %1$s: %2$s."
 msgid_plural "The following tags were removed from user %1$s: %2$s."
-msgstr[0] ""
+msgstr[0] "下�的标签已从用户 %1$s: %2$s 中删除。"
 
 #. TRANS: Whois output.
 #. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
@@ -7762,163 +7287,150 @@ msgid_plural "You are a member of these groups:"
 msgstr[0] "你是该�组�员："
 
 #. TRANS: Header line of help text for commands.
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "Commands:"
-msgstr "执行结果"
+msgstr "命令："
 
 #. TRANS: Help message for IM/SMS command "on".
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "turn on notifications"
-msgstr "无法开�通知。"
+msgstr "开�通知"
 
 #. TRANS: Help message for IM/SMS command "off".
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "turn off notifications"
-msgstr "无法关闭通知。"
+msgstr "关闭通知"
 
 #. TRANS: Help message for IM/SMS command "help".
 msgctxt "COMMANDHELP"
 msgid "show this help"
-msgstr ""
+msgstr "显示此帮助"
 
 #. TRANS: Help message for IM/SMS command "follow <nickname>".
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "subscribe to user"
-msgstr "关注这个用户"
+msgstr "关注用户"
 
 #. TRANS: Help message for IM/SMS command "groups".
 msgctxt "COMMANDHELP"
 msgid "lists the groups you have joined"
-msgstr ""
+msgstr "你加入的�组列表"
 
 #. TRANS: Help message for IM/SMS command "tag".
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "tag a user"
-msgstr "将用户加为标签"
+msgstr "给用户添加标签"
 
 #. TRANS: Help message for IM/SMS command "untag".
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "untag a user"
-msgstr "将用户加为标签"
+msgstr "�消用户标签"
 
 #. TRANS: Help message for IM/SMS command "subscriptions".
 msgctxt "COMMANDHELP"
 msgid "list the people you follow"
-msgstr ""
+msgstr "你关注的用户列表"
 
 #. TRANS: Help message for IM/SMS command "subscribers".
 msgctxt "COMMANDHELP"
 msgid "list the people that follow you"
-msgstr ""
+msgstr "关注你的用户列表"
 
 #. TRANS: Help message for IM/SMS command "leave <nickname>".
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "unsubscribe from user"
 msgstr "�消关注这个用户"
 
 #. TRANS: Help message for IM/SMS command "d <nickname> <text>".
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "direct message to user"
-msgstr "�给%s的�信"
+msgstr "给用户��信"
 
 #. TRANS: Help message for IM/SMS command "get <nickname>".
 msgctxt "COMMANDHELP"
 msgid "get last notice from user"
-msgstr ""
+msgstr "获�最�一�消�，�自"
 
 #. TRANS: Help message for IM/SMS command "whois <nickname>".
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "get profile info on user"
-msgstr "远程�置文件�是一个组 �"
+msgstr "获�用户的个人信�"
 
 #. TRANS: Help message for IM/SMS command "lose <nickname>".
 msgctxt "COMMANDHELP"
 msgid "force user to stop following you"
-msgstr ""
+msgstr "强制用户�消关注你"
 
 #. TRANS: Help message for IM/SMS command "fav <nickname>".
 msgctxt "COMMANDHELP"
 msgid "add user's last notice as a 'fave'"
-msgstr ""
+msgstr "将用户最�一�消�标记为“收��"
 
 #. TRANS: Help message for IM/SMS command "fav #<notice_id>".
 msgctxt "COMMANDHELP"
 msgid "add notice with the given id as a 'fave'"
-msgstr ""
+msgstr "将带有所给 id 的消�标记为“收��"
 
 #. TRANS: Help message for IM/SMS command "repeat #<notice_id>".
 msgctxt "COMMANDHELP"
 msgid "repeat a notice with a given id"
-msgstr ""
+msgstr "用已给id��通知"
 
 #. TRANS: Help message for IM/SMS command "repeat <nickname>".
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "repeat the last notice from user"
-msgstr "转�"
+msgstr "转�用户的最�一�消�"
 
 #. TRANS: Help message for IM/SMS command "reply #<notice_id>".
 msgctxt "COMMANDHELP"
 msgid "reply to notice with a given id"
-msgstr ""
+msgstr "用已给出的id回�通知"
 
 #. TRANS: Help message for IM/SMS command "reply <nickname>".
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "reply to the last notice from user"
-msgstr "回�"
+msgstr "回�用户的最�一�消�"
 
 #. TRANS: Help message for IM/SMS command "join <group>".
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "join group"
-msgstr "未知的组。"
+msgstr "加入�组"
 
 #. TRANS: Help message for IM/SMS command "login".
 msgctxt "COMMANDHELP"
 msgid "Get a link to login to the web interface"
-msgstr ""
+msgstr "获�链接登录到网络界�"
 
 #. TRANS: Help message for IM/SMS command "drop <group>".
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "leave group"
-msgstr "删除�组"
+msgstr "离开�组"
 
 #. TRANS: Help message for IM/SMS command "stats".
 msgctxt "COMMANDHELP"
 msgid "get your stats"
-msgstr ""
+msgstr "得到你的统计信�"
 
 #. TRANS: Help message for IM/SMS command "stop".
 #. TRANS: Help message for IM/SMS command "quit".
 msgctxt "COMMANDHELP"
 msgid "same as 'off'"
-msgstr ""
+msgstr "�‘关闭’"
 
 #. TRANS: Help message for IM/SMS command "sub <nickname>".
 msgctxt "COMMANDHELP"
 msgid "same as 'follow'"
-msgstr ""
+msgstr "�‘跟踪’"
 
 #. TRANS: Help message for IM/SMS command "unsub <nickname>".
 msgctxt "COMMANDHELP"
 msgid "same as 'leave'"
-msgstr ""
+msgstr "�‘�’"
 
 #. TRANS: Help message for IM/SMS command "last <nickname>".
 msgctxt "COMMANDHELP"
 msgid "same as 'get'"
-msgstr ""
+msgstr "�‘�’"
 
 #. TRANS: Help message for IM/SMS command "on <nickname>".
 #. TRANS: Help message for IM/SMS command "off <nickname>".
@@ -7929,15 +7441,14 @@ msgstr ""
 #. TRANS: Help message for IM/SMS command "untrack all".
 #. TRANS: Help message for IM/SMS command "tracks".
 #. TRANS: Help message for IM/SMS command "tracking".
-#, fuzzy
 msgctxt "COMMANDHELP"
 msgid "not yet implemented."
-msgstr "命令尚未实现。"
+msgstr "尚未实现。"
 
 #. TRANS: Help message for IM/SMS command "nudge <nickname>".
 msgctxt "COMMANDHELP"
 msgid "remind a user to update."
-msgstr ""
+msgstr "�醒用户更新。"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 msgid "No configuration file found."
@@ -7957,31 +7468,26 @@ msgstr "或许你想�行安装程��解决这个问题。"
 msgid "Go to the installer."
 msgstr "去安装程�。"
 
+#. TRANS: Header on conversation page. Hidden by default (h2).
+#. TRANS: Label for user statistics.
+msgid "Notices"
+msgstr "消�"
+
 #. TRANS: Page title for when a database error occurs.
 msgid "Database error"
 msgstr "数�库错误"
 
 #. TRANS: Menu item in default local navigation panel.
 #. TRANS: Menu item in search group navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Public"
 msgstr "公共"
 
-#. TRANS: Menu item in default local navigation panel.
-#. TRANS: Menu item in search group navigation panel.
-#. TRANS: Menu item in local navigation menu.
-#, fuzzy
-msgctxt "MENU"
-msgid "Groups"
-msgstr "�组"
-
 #. TRANS: Menu item in default local navigation panel.
 #. TRANS: Menu item title in local navigation menu.
-#, fuzzy
 msgctxt "MENU"
 msgid "Lists"
-msgstr "�制"
+msgstr "列表"
 
 #. TRANS: Title of form for deleting a user.
 #. TRANS: Link text in notice list item to delete a notice.
@@ -7992,50 +7498,12 @@ msgstr "删除"
 msgid "Delete this user"
 msgstr "删除这个用户"
 
-#. TRANS: Form legend of form for changing the page design.
-#, fuzzy
-msgid "Change design"
-msgstr "�存外观"
-
-#. TRANS: Fieldset legend on profile design page to change profile page colours.
-msgid "Change colours"
-msgstr "改�颜色"
-
-#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-msgid "Use defaults"
-msgstr "使用默认值"
-
-#. TRANS: Label in form on profile design page.
-#. TRANS: Field contains file name on user's computer that could be that user's custom profile background image.
-msgid "Upload file"
-msgstr "上传文件"
-
-#. TRANS: Instructions for form on profile design page.
-msgid ""
-"You can upload your personal background image. The maximum file size is 2MB."
-msgstr "你�以上传你的个人页�背景。文件最大 2MB。"
-
-#. TRANS: Radio button on profile design page that will enable use of the uploaded profile image.
-msgctxt "RADIO"
-msgid "On"
-msgstr "打开"
-
-#. TRANS: Radio button on profile design page that will disable use of the uploaded profile image.
-msgctxt "RADIO"
-msgid "Off"
-msgstr "关闭"
-
-#. TRANS: Success message displayed if design settings were saved after clicking "Use defaults".
-msgid "Design defaults restored."
-msgstr "默认外观已��。"
-
 #. TRANS: Exception. %s is an ID.
 #, php-format
 msgid "Unable to find services for %s."
 msgstr "无法找到 %s 的�务。"
 
 #. TRANS: Form legend for removing the favourite status for a favourite notice.
-#. TRANS: Title for button text for removing the favourite status for a favourite notice.
 msgid "Disfavor this notice"
 msgstr "�消收�这个消�"
 
@@ -8044,8 +7512,12 @@ msgctxt "BUTTON"
 msgid "Disfavor favorite"
 msgstr "�赞�的最爱"
 
+#. TRANS: Button title for removing the favourite status for a favourite notice.
+#, fuzzy
+msgid "Remove this notice from your list of favorite notices."
+msgstr "无法获�收�的消�。"
+
 #. TRANS: Form legend for adding the favourite status to a notice.
-#. TRANS: Title for button text for adding the favourite status to a notice.
 msgid "Favor this notice"
 msgstr "收�"
 
@@ -8054,6 +7526,11 @@ msgctxt "BUTTON"
 msgid "Favor"
 msgstr "请"
 
+#. TRANS: Button title for adding the favourite status to a notice.
+#, fuzzy
+msgid "Add this notice to your list of favorite notices."
+msgstr "无法获�收�的消�。"
+
 #. TRANS: Feed type name.
 msgid "RSS 1.0"
 msgstr "RSS 1.0"
@@ -8070,13 +7547,16 @@ msgstr "Atom"
 msgid "FOAF"
 msgstr "FOAF"
 
+#. TRANS: Feed type name. See http://activitystrea.ms/
+msgid "Activity Streams"
+msgstr "活动�"
+
 #. TRANS: Client exception thrown when an imported feed does not have an author.
 msgid "No author in the feed."
 msgstr "没有在�中的作者。"
 
 #. TRANS: Client exception thrown when an imported feed does not have an author that
 #. TRANS: can be associated with a user.
-#, fuzzy
 msgid "Cannot import without a user."
 msgstr "没有用户无法导入。"
 
@@ -8085,7 +7565,6 @@ msgid "Feeds"
 msgstr "Feeds"
 
 #. TRANS: List element on gallery action page to show all tags.
-#, fuzzy
 msgctxt "TAGS"
 msgid "All"
 msgstr "全部"
@@ -8095,15 +7574,36 @@ msgid "Tag"
 msgstr "标签"
 
 #. TRANS: Dropdown field title on gallery action page for a list containing tags.
-#, fuzzy
 msgid "Choose a tag to narrow list."
-msgstr "选择标签缩�清�"
+msgstr "选择�窄列表中的标记。"
 
 #. TRANS: Description on form for granting a role.
 #, php-format
 msgid "Grant this user the \"%s\" role"
 msgstr "给这个用户添加\\\"%s\\\"��"
 
+#. TRANS: Header for mini list of group members on a group page (h2).
+msgid "Members"
+msgstr "�组�员"
+
+#. TRANS: Link to all group members from mini list of group members if group has more than n members.
+msgid "All members"
+msgstr "所有�员"
+
+#. TRANS: Header for mini list of users with a pending membership request on a group page (h2).
+#, fuzzy
+msgid "Pending"
+msgstr "挂起（%d）"
+
+#. TRANS: Header for mini list of users that are blocked in a group page (h2).
+msgid "Blocked"
+msgstr "�蔽用户"
+
+#. TRANS: Title for list of group administrators on a group page.
+msgctxt "TITLE"
+msgid "Admins"
+msgstr "管�员"
+
 #. TRANS: Button text for the form that will block a user from a group.
 msgctxt "BUTTON"
 msgid "Block"
@@ -8111,17 +7611,16 @@ msgstr "�蔽"
 
 #. TRANS: Submit button title.
 msgctxt "TOOLTIP"
-msgid "Block this user"
-msgstr "�蔽这个用户"
+msgid "Block this user so that they can no longer post messages to it."
+msgstr ""
 
 #. TRANS: Field title on group edit form.
 msgid "URL of the homepage or blog of the group or topic."
 msgstr "这个�组或主题的主页或�客 URL。"
 
 #. TRANS: Text area title for group description when there is no text limit.
-#, fuzzy
 msgid "Describe the group or topic."
-msgstr "�组或主题的�述"
+msgstr "�述组或主题。"
 
 #. TRANS: Text area title for group description.
 #. TRANS: %d is the number of characters available for the description.
@@ -8153,70 +7652,16 @@ msgstr[0] "该�组�外的昵称，用逗�或者空格分隔开，最多%d
 #. TRANS: Checkbox field title on group edit form to mark a group private.
 msgid ""
 "New members must be approved by admin and all posts are forced to be private."
-msgstr ""
+msgstr "新�员必须由管�员批准和所有��被都强迫为�有。"
 
 #. TRANS: Indicator in group members list that this user is a group administrator.
-#, fuzzy
 msgctxt "GROUPADMIN"
 msgid "Admin"
-msgstr "管�"
+msgstr "管�员"
 
-#. TRANS: Menu item in the group navigation page.
-msgctxt "MENU"
-msgid "Group"
-msgstr "�组"
-
-#. TRANS: Tooltip for menu item in the group navigation page.
-#. TRANS: %s is the nickname of the group.
-#, php-format
-msgctxt "TOOLTIP"
-msgid "%s group"
-msgstr "%s�组"
-
-#. TRANS: Menu item in the group navigation page.
-msgctxt "MENU"
-msgid "Members"
-msgstr "组员"
-
-#. TRANS: Tooltip for menu item in the group navigation page.
-#. TRANS: %s is the nickname of the group.
-#, php-format
-msgctxt "TOOLTIP"
-msgid "%s group members"
-msgstr "%s �组�员"
-
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: %d is the number of pending members.
-#, php-format
-msgctxt "MENU"
-msgid "Pending members (%d)"
-msgid_plural "Pending members (%d)"
-msgstr[0] ""
-
-#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: %s is the nickname of the group.
-#, fuzzy, php-format
-msgctxt "TOOLTIP"
-msgid "%s pending members"
-msgstr "%s 的�组�员"
-
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-msgctxt "MENU"
-msgid "Blocked"
-msgstr "�蔽的用户"
-
-#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: %s is the nickname of the group.
-#, php-format
-msgctxt "TOOLTIP"
-msgid "%s blocked users"
-msgstr "%s �蔽的用户"
-
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: Menu item in primary navigation panel.
-msgctxt "MENU"
-msgid "Admin"
-msgstr "管�"
+#. TRANS: Group actions header (h2). Text hidden by default.
+msgid "Group actions"
+msgstr "�组动作"
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
@@ -8225,11 +7670,6 @@ msgctxt "TOOLTIP"
 msgid "Edit %s group properties"
 msgstr "编辑 %s �组设置"
 
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-msgctxt "MENU"
-msgid "Logo"
-msgstr "Logo"
-
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
 #, php-format
@@ -8237,32 +7677,33 @@ msgctxt "TOOLTIP"
 msgid "Add or edit %s logo"
 msgstr "添加或编辑 %s logo"
 
-#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: %s is the nickname of the group.
-#, php-format
-msgctxt "TOOLTIP"
-msgid "Add or edit %s design"
-msgstr "添加或编辑 %s 外观"
-
-#. TRANS: Group actions header (h2). Text hidden by default.
-msgid "Group actions"
-msgstr "�组动作"
+#. TRANS: Link text for link on user profile.
+msgctxt "MENU"
+msgid "Logo"
+msgstr "Logo"
 
 #. TRANS: Title for groups with the most members section.
-#, fuzzy
 msgid "Popular groups"
-msgstr "最新被收�的消�"
+msgstr "热门的�组"
 
 #. TRANS: Title for groups with the most posts section.
-#, fuzzy
 msgid "Active groups"
-msgstr "所有�组"
+msgstr "活跃的�组"
 
-#. TRANS: Title for group tag cloud section.
-#. TRANS: %s is a group name.
-#, php-format
-msgid "Tags in %s group's notices"
-msgstr "这个组所�布的消�的标签"
+#. TRANS: Link description for seeing all groups.
+#. TRANS: Link description for seeing all lists.
+#, fuzzy
+msgid "See all"
+msgstr "显示全部"
+
+#. TRANS: Link title for seeing all groups.
+msgid "See all groups you belong to."
+msgstr ""
+
+#. TRANS: Menu item title in personal group navigation menu.
+#. TRANS: %s is a username.
+msgid "Back to top"
+msgstr "返回顶部"
 
 #. TRANS: Client exception 406
 msgid "This page is not available in a media type you accept"
@@ -8337,31 +7778,63 @@ msgstr ""
 
 #. TRANS: Server exception thrown trying to initialise an IM plugin without a transport method.
 msgid "Transport cannot be null."
-msgstr ""
+msgstr "�输�能为空。"
 
 #. TRANS: Title for inbox tag cloud section.
 msgctxt "TITLE"
 msgid "Trends"
-msgstr ""
+msgstr "趋势"
 
-#. TRANS: Button text for inviting more users to the StatusNet instance.
-#, fuzzy
+#. TRANS: Default button text for inviting more users to the StatusNet instance.
 msgctxt "BUTTON"
 msgid "Invite more colleagues"
-msgstr "邀请新用户"
+msgstr "邀请更多用户"
+
+#. TRANS: Form legend.
+msgid "Invite collegues"
+msgstr "邀请�事"
+
+#. TRANS: Field label for a list of e-mail addresses.
+msgid "Email addresses"
+msgstr "电邮地�"
+
+#. TRANS: Field title for a list of e-mail addresses.
+msgid "Addresses of friends to invite (one per line)."
+msgstr "朋�邀请的地�（�行一个）。"
+
+#. TRANS: Field label for a personal message to send to invitees.
+msgid "Personal message"
+msgstr "个人消�"
+
+#. TRANS: Field title for a personal message to send to invitees.
+msgid "Optionally add a personal message to the invitation."
+msgstr "在邀请中加几��(�选)。"
+
+#. TRANS: Send button for inviting friends
+#. TRANS: Button text for sending notice.
+msgctxt "BUTTON"
+msgid "Send"
+msgstr "�布"
+
+#. TRANS: Submit button title.
+msgid "Send invitations."
+msgstr "��邀请。"
 
 #. TRANS: Button text for joining a group.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Join"
 msgstr "加入"
 
 #. TRANS: Button text on form to leave a group.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Leave"
 msgstr "离开"
 
+#. TRANS: Link title for seeing all lists.
+#, fuzzy
+msgid "See all lists you have created."
+msgstr "你已�登记的程�。"
+
 #. TRANS: Menu item for logging in to the StatusNet site.
 #. TRANS: Menu item in primary navigation panel.
 msgctxt "MENU"
@@ -8420,9 +7893,9 @@ msgstr ""
 #. TRANS: %1$s is the subscribing user's nickname, %2$s is the StatusNet sitename.
 #. TRANS: Main body of new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscriber's long name, %2$s is the StatusNet sitename.
-#, php-format
-msgid "%1$s is now listening to your notices on %2$s."
-msgstr "%1$s 开始关注你在 %2$s 的消�。"
+#, fuzzy, php-format
+msgid "%1$s is now following you on %2$s."
+msgstr "%1$s 现在开始关注了 %2$s。"
 
 #. TRANS: Subject of pending new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscribing user's nickname, %2$s is the StatusNet sitename.
@@ -8462,9 +7935,9 @@ msgstr ""
 
 #. TRANS: Profile info line in notification e-mail.
 #. TRANS: %s is a URL.
-#, fuzzy, php-format
+#, php-format
 msgid "Profile: %s"
-msgstr "个人信�"
+msgstr "个人信�：%s"
 
 #. TRANS: Profile info line in notification e-mail.
 #. TRANS: %s is biographical information.
@@ -8592,7 +8065,7 @@ msgstr ""
 "请勿回�此邮件，他/她�会收到此邮件的内容。\n"
 "\n"
 "亲切的问候，\n"
-"%5$s\n"
+"%5$s"
 
 #. TRANS: Subject for favorite notification e-mail.
 #. TRANS: %1$s is the adding user's long name, %2$s is the adding user's nickname.
@@ -8658,7 +8131,7 @@ msgstr "%1$s (@%2$s) 给你��了一�消�"
 #. TRANS: Body of @-reply notification e-mail.
 #. TRANS: %1$s is the sending user's name, $2$s is the StatusNet sitename,
 #. TRANS: %3$s is a URL to the notice, %4$s is the notice text,
-#. TRANS: %5$s is a URL to the full conversion if it exists (otherwise empty),
+#. TRANS: %5$s is the text "The full conversation can be read here:" and a URL to the full conversion if it exists (otherwise empty),
 #. TRANS: %6$s is a URL to reply to the notice, %7$s is a URL to all @-replies for the addressed user,
 #, fuzzy, php-format
 msgid ""
@@ -8705,6 +8178,10 @@ msgstr ""
 
 #. TRANS: Subject of group join notification e-mail.
 #. TRANS: %1$s is the joining user's nickname, %2$s is the group name, and %3$s is the StatusNet sitename.
+#, fuzzy, php-format
+msgid "%1$s has joined your group %2$s on %3$s"
+msgstr "%1$s加入了%2$s�组。"
+
 #. TRANS: Main body of group join notification e-mail.
 #. TRANS: %1$s is the subscriber's long name, %2$s is the group name, and %3$s is the StatusNet sitename,
 #. TRANS: %4$s is a block of profile info about the subscriber.
@@ -8746,9 +8223,8 @@ msgid "Inbox"
 msgstr "收件箱"
 
 #. TRANS: Menu item title in mailbox menu. Leads to incoming private messages.
-#, fuzzy
 msgid "Your incoming messages."
-msgstr "你收到的�信"
+msgstr "传入的邮件。"
 
 #. TRANS: Menu item in mailbox menu. Leads to outgoing private messages.
 msgctxt "MENU"
@@ -8756,9 +8232,8 @@ msgid "Outbox"
 msgstr "�件箱"
 
 #. TRANS: Menu item title in mailbox menu. Leads to outgoing private messages.
-#, fuzzy
 msgid "Your sent messages."
-msgstr "你��的�信"
+msgstr "已��的邮件。"
 
 #. TRANS: Error message in incoming mail handler used when an incoming e-mail cannot be processed.
 msgid "Could not parse message."
@@ -8778,9 +8253,9 @@ msgstr "抱歉，现在��许电�邮件�布。"
 
 #. TRANS: Error message in incoming mail handler used when an incoming e-mail is of an unsupported type.
 #. TRANS: %s is the unsupported type.
-#, fuzzy, php-format
+#, php-format
 msgid "Unsupported message type: %s."
-msgstr "�支�的信�格�：%s"
+msgstr "��支�的消�类型：%s。"
 
 #. TRANS: Form legend for form to make a user a group admin.
 msgid "Make user an admin of the group"
@@ -8793,8 +8268,8 @@ msgstr "设置管�员"
 
 #. TRANS: Submit button title.
 msgctxt "TOOLTIP"
-msgid "Make this user an admin"
-msgstr "将这个用户设为管�员"
+msgid "Make this user an admin."
+msgstr "将此用户设为管�员"
 
 #. TRANS: Client exception thrown when a database error was thrown during a file upload operation.
 msgid "There was a database error while saving your file. Please try again."
@@ -8839,7 +8314,7 @@ msgstr "��一��信"
 msgid "Select recipient:"
 msgstr "选择收件人："
 
-#. TRANS Entry in drop-down selection box in direct-message inbox/outbox when no one is available to message.
+#. TRANS: Entry in drop-down selection box in direct-message inbox/outbox when no one is available to message.
 msgid "No mutual subscribers."
 msgstr "没有共�的关注者。"
 
@@ -8862,10 +8337,9 @@ msgid "from"
 msgstr "通过"
 
 #. TRANS: A possible notice source (web interface).
-#, fuzzy
 msgctxt "SOURCE"
 msgid "web"
-msgstr "网页"
+msgstr "网络"
 
 #. TRANS: A possible notice source (XMPP).
 msgctxt "SOURCE"
@@ -8873,10 +8347,9 @@ msgid "xmpp"
 msgstr ""
 
 #. TRANS: A possible notice source (e-mail).
-#, fuzzy
 msgctxt "SOURCE"
 msgid "mail"
-msgstr "电�邮件"
+msgstr "邮件"
 
 #. TRANS: A possible notice source (OpenMicroBlogging).
 msgctxt "SOURCE"
@@ -8890,26 +8363,28 @@ msgstr ""
 
 #. TRANS: Client exception thrown when no author for an activity was found.
 msgid "Cannot get author for activity."
-msgstr ""
+msgstr "找�到作者的活动。"
 
 #. TRANS: Client exception thrown when ...
-#, fuzzy
 msgid "Bookmark not posted to this group."
-msgstr "你�能删除这个�组。"
+msgstr "���到此组的书签。"
 
 #. TRANS: Client exception when ...
-#, fuzzy
 msgid "Object not posted to this user."
-msgstr "请��删除该用户。"
+msgstr "对象没有投递到此用户。"
 
 #. TRANS: Server exception thrown when a micro app plugin uses a target that cannot be handled.
 msgid "Do not know how to handle this kind of target."
-msgstr ""
+msgstr "�知�如何处�这�类型的目标。"
 
 #. TRANS: Server exception thrown when a micro app plugin developer has not done his job too well.
 msgid "You must implement either adaptNoticeListItem() or showNotice()."
 msgstr ""
 
+#. TRANS: Link description to show more items in a list.
+msgid "More â–¼"
+msgstr ""
+
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 msgid "Nickname cannot be empty."
 msgstr "昵称�能为空。"
@@ -8934,9 +8409,8 @@ msgid "Attach"
 msgstr "附件"
 
 #. TRANS: Title for input field to attach a file to a notice.
-#, fuzzy
 msgid "Attach a file."
-msgstr "添加一个文件附件"
+msgstr "附加的文件。"
 
 #. TRANS: Field label to add location to a notice.
 msgid "Share my location"
@@ -8955,11 +8429,7 @@ msgstr "抱歉，获�你的地��置时间过长，请�候�试"
 #. TRANS: Separator in profile addressees list.
 msgctxt "SEPARATOR"
 msgid ", "
-msgstr ""
-
-#. TRANS: Start of profile addressees list.
-msgid " â–¸ "
-msgstr ""
+msgstr "�"
 
 #. TRANS: Used in coordinates as abbreviation of north.
 msgid "N"
@@ -8999,7 +8469,8 @@ msgid "Repeated by"
 msgstr "转��自"
 
 #. TRANS: Link title in notice list item to reply to a notice.
-msgid "Reply to this notice"
+#, fuzzy
+msgid "Reply to this notice."
 msgstr "回�"
 
 #. TRANS: Link text in notice list item to reply to a notice.
@@ -9007,53 +8478,30 @@ msgid "Reply"
 msgstr "回�"
 
 #. TRANS: Link title in notice list item to delete a notice.
-msgid "Delete this notice"
-msgstr "删除"
+#, fuzzy
+msgid "Delete this notice from the timeline."
+msgstr "删除此通知。"
 
 #. TRANS: Title for repeat form status in notice list when a notice has been repeated.
-#, fuzzy
 msgid "Notice repeated."
-msgstr "消�已转�"
+msgstr "��的通知。"
 
 #. TRANS: Field label for notice text.
 msgid "Update your status..."
-msgstr ""
+msgstr "更新您的状�..."
 
 #. TRANS: Form legend of form to nudge/ping another user.
 msgid "Nudge this user"
 msgstr "呼�用户"
 
 #. TRANS: Button text to nudge/ping another user.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Nudge"
-msgstr "呼�"
+msgstr "微移"
 
 #. TRANS: Button title to nudge/ping another user.
-#, fuzzy
 msgid "Send a nudge to this user."
-msgstr "呼�这个用户"
-
-#. TRANS: Exception thrown when creating a new profile fails in OAuth store.
-msgid "Error inserting new profile."
-msgstr "添加新个人信�出错。"
-
-#. TRANS: Exception thrown when creating a new avatar fails in OAuth store.
-msgid "Error inserting avatar."
-msgstr "添加头�出错。"
-
-#. TRANS: Exception thrown when creating a remote profile fails in OAuth store.
-msgid "Error inserting remote profile."
-msgstr "添加远程个人信�时出错。"
-
-#. TRANS: Exception thrown when a notice is denied because it has been sent before.
-msgid "Duplicate notice."
-msgstr "�制消�。"
-
-#. TRANS: Exception thrown when creating a new subscription fails in OAuth store.
-#, fuzzy
-msgid "Could not insert new subscription."
-msgstr "无法添加新的关注。"
+msgstr "�该用户��闪�振动。"
 
 #. TRANS: Server exception thrown in oEmbed action if no API endpoint is available.
 #, fuzzy
@@ -9061,10 +8509,9 @@ msgid "No oEmbed API endpoint available."
 msgstr "IM ��用。"
 
 #. TRANS: Field label for list.
-#, fuzzy
 msgctxt "LABEL"
 msgid "List"
-msgstr "链接"
+msgstr "列表"
 
 #. TRANS: Field title for list.
 #, fuzzy
@@ -9073,9 +8520,8 @@ msgstr ""
 "给这个用户加注标签 (字�letters, 数字numbers, -, ., and _), 逗�或空格分隔"
 
 #. TRANS: Field title for description of list.
-#, fuzzy
 msgid "Describe the list or topic."
-msgstr "�组或主题的�述"
+msgstr "�述列表或主题。"
 
 #. TRANS: Field title for description of list.
 #. TRANS: %d is the maximum number of characters for the description.
@@ -9085,146 +8531,128 @@ msgid_plural "Describe the list or topic in %d characters."
 msgstr[0] "用�超过%d个字符�述你的应用"
 
 #. TRANS: Button title to delete a list.
-#, fuzzy
 msgid "Delete this list."
-msgstr "删除此用户。"
+msgstr "删除此列表。"
 
 #. TRANS: Header in list edit form.
 msgid "Add or remove people"
-msgstr ""
+msgstr "添加或删除用户"
 
 #. TRANS: Header in list edit form.
-#, fuzzy
 msgctxt "HEADER"
 msgid "Search"
 msgstr "�索"
 
 #. TRANS: Menu item in list navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "List"
-msgstr "链接"
+msgstr "列表"
 
 #. TRANS: Menu item title in list navigation panel.
 #. TRANS: %1$s is a list, %2$s is a nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s list by %2$s."
-msgstr "%1$s - %2$s"
+msgstr "%1$s 列出的 %2$s。"
 
 #. TRANS: Menu item in list navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Listed"
-msgstr "许��议"
+msgstr "列出"
 
 #. TRANS: Menu item in list navigation panel.
 #. TRANS: Menu item in local navigation menu.
-#, fuzzy
 msgctxt "MENU"
 msgid "Subscribers"
-msgstr "关注者"
+msgstr "订阅�务器"
 
 #. TRANS: Menu item title in list navigation panel.
 #. TRANS: %1$s is a list, %2$s is a nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "Subscribers to %1$s list by %2$s."
-msgstr "已关注%s。"
+msgstr "订阅�务器%1$s 列出的 %2$s。"
 
 #. TRANS: Menu item in list navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Edit"
 msgstr "编辑"
 
 #. TRANS: Menu item title in list navigation panel.
 #. TRANS: %s is a list.
-#, fuzzy, php-format
+#, php-format
 msgid "Edit %s list by you."
-msgstr "编辑 %s �组"
-
-#. TRANS: Link description for link to list of users tagged with a tag.
-#, fuzzy
-msgid "Tagged"
-msgstr "标签"
+msgstr "编辑 %s 由您的列表。"
 
 #. TRANS: Title for link to edit list settings.
-#, fuzzy
 msgid "Edit list settings."
-msgstr "编辑个人信�设置"
+msgstr "编辑列表中的设置。"
 
 #. TRANS: Text for link to edit list settings.
 msgid "Edit"
 msgstr "编辑"
 
 #. TRANS: Privacy mode text in list list item for private list.
-#, fuzzy
 msgctxt "MODE"
 msgid "Private"
-msgstr "�有"
+msgstr "�人"
 
 #. TRANS: Menu item in the group navigation page.
-#, fuzzy
 msgctxt "MENU"
 msgid "List Subscriptions"
-msgstr "关注的"
+msgstr "列表订阅"
 
 #. TRANS: Tooltip for menu item in the group navigation page.
 #. TRANS: %s is a user nickname.
-#, fuzzy, php-format
+#, php-format
 msgctxt "TOOLTIP"
 msgid "Lists subscribed to by %s."
-msgstr "已关注%s。"
+msgstr "通过订阅列表 %s。"
 
 #. TRANS: Menu item in the group navigation page.
 #. TRANS: %s is a user nickname.
-#, fuzzy, php-format
+#, php-format
 msgctxt "MENU"
 msgid "Lists with %s"
-msgstr "\"%s\"çš„æ›´æ–°"
+msgstr "以列表 %s"
 
 #. TRANS: Tooltip for menu item in the group navigation page.
 #. TRANS: %s is a user nickname.
-#, fuzzy, php-format
+#, php-format
 msgctxt "TOOLTIP"
 msgid "Lists with %s."
-msgstr "\"%s\"çš„æ›´æ–°"
+msgstr "列出了与 %s。"
 
 #. TRANS: Menu item in the group navigation page.
 #. TRANS: %s is a user nickname.
 #, php-format
 msgctxt "MENU"
 msgid "Lists by %s"
-msgstr ""
+msgstr "按列表 %s"
 
 #. TRANS: Tooltip for menu item in the group navigation page.
 #. TRANS: %s is a user nickname.
-#, fuzzy, php-format
+#, php-format
 msgctxt "TOOLTIP"
 msgid "Lists by %s."
-msgstr "%1$s - %2$s"
+msgstr "列出的 %s。"
 
 #. TRANS: Label in lists widget.
-#, fuzzy
 msgctxt "LABEL"
 msgid "Your lists"
-msgstr "最新被收�的消�"
+msgstr "您的列表"
 
 #. TRANS: Fieldset legend in lists widget.
-#, fuzzy
 msgctxt "LEGEND"
 msgid "Edit lists"
-msgstr "�是有效的标签：%s。"
+msgstr "编辑列表"
 
 #. TRANS: Label in self tags widget.
-#, fuzzy
 msgctxt "LABEL"
 msgid "Tags"
 msgstr "标签"
 
 #. TRANS: Title for section contaning lists with the most subscribers.
-#, fuzzy
 msgid "Popular lists"
-msgstr "最新被收�的消�"
+msgstr "�行列表"
 
 #. TRANS: List summary. %1$d is the number of users in the list,
 #. TRANS: %2$d is the number of subscribers to the list.
@@ -9233,20 +8661,19 @@ msgid "Listed: %1$d Subscribers: %2$d"
 msgstr "%1$s的关注者，第%2$d页"
 
 #. TRANS: Title for page that displays which lists current user is part of.
-#, fuzzy, php-format
+#, php-format
 msgid "Lists with you"
-msgstr "API方法没有找到。"
+msgstr "与您的列表"
 
 #. TRANS: Title for page that displays which lists a user is part of.
 #. TRANS: %s is a profile name.
-#, fuzzy, php-format
+#, php-format
 msgid "Lists with %s"
-msgstr "\"%s\"çš„æ›´æ–°"
+msgstr "以列表 %s"
 
 #. TRANS: Title for page that displays lists a user has subscribed to.
-#, fuzzy
 msgid "List subscriptions"
-msgstr "%s 关注的用户"
+msgstr "列表订阅"
 
 #. TRANS: Menu item in personal group navigation menu.
 #. TRANS: Menu item in settings navigation panel.
@@ -9270,13 +8697,11 @@ msgid "Favorites"
 msgstr "收�夹"
 
 #. TRANS: Replaces %s in '%s\'s favorite notices'. (Yes, we know we need to fix this.)
-#, fuzzy
 msgctxt "FIXME"
 msgid "User"
 msgstr "用户"
 
 #. TRANS: Menu item in personal group navigation menu.
-#, fuzzy
 msgctxt "MENU"
 msgid "Messages"
 msgstr "消�"
@@ -9292,32 +8717,36 @@ msgstr "未知的"
 #. TRANS: Plugin admin panel controls
 msgctxt "plugin"
 msgid "Disable"
-msgstr ""
+msgstr "�用"
 
 #. TRANS: Plugin admin panel controls
 msgctxt "plugin"
 msgid "Enable"
-msgstr ""
+msgstr "�用"
 
+#. TRANS: Plugin description for a disabled plugin.
 msgctxt "plugin-description"
-msgid "(Plugin descriptions unavailable when disabled.)"
+msgid ""
+"(The plugin description is unavailable when a plugin has been disabled.)"
 msgstr ""
 
 #. TRANS: Menu item in primary navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Settings"
-msgstr "SMS 设置"
+msgstr "设置"
 
 #. TRANS: Menu item title in primary navigation panel.
-#, fuzzy
 msgid "Change your personal settings."
-msgstr "修改你的个人信�"
+msgstr "更改您的个人设置。"
+
+#. TRANS: Menu item in primary navigation panel.
+msgctxt "MENU"
+msgid "Admin"
+msgstr "管�"
 
 #. TRANS: Menu item title in primary navigation panel.
-#, fuzzy
 msgid "Site configuration."
-msgstr "用户�置"
+msgstr "网站�置。"
 
 #. TRANS: Menu item in primary navigation panel.
 msgctxt "MENU"
@@ -9325,34 +8754,27 @@ msgid "Logout"
 msgstr "登出"
 
 #. TRANS: Menu item title in primary navigation panel.
-#, fuzzy
 msgid "Logout from the site."
-msgstr "从网站登出"
+msgstr "从网站注销。"
 
 #. TRANS: Menu item title in primary navigation panel.
-#, fuzzy
 msgid "Login to the site."
-msgstr "登录这个网站"
+msgstr "请登录网站。"
 
-#. TRANS: Menu item in primary navigation panel.
-msgctxt "MENU"
-msgid "Search"
-msgstr "�索"
-
-#. TRANS: Menu item title in primary navigation panel.
-#, fuzzy
-msgid "Search the site."
-msgstr "�索帮助"
+msgid "This profile has been silenced by site moderators"
+msgstr ""
 
 #. TRANS: H2 text for user subscription statistics.
-#, fuzzy
 msgid "Following"
-msgstr "关注"
+msgstr "关注的"
 
 #. TRANS: H2 text for user subscriber statistics.
-#, fuzzy
 msgid "Followers"
-msgstr "关注"
+msgstr "关注者"
+
+#. TRANS: H2 text for user statistics.
+msgid "Statistics"
+msgstr "统计"
 
 #. TRANS: Label for user statistics.
 msgid "User ID"
@@ -9362,10 +8784,6 @@ msgstr "用户 ID"
 msgid "Member since"
 msgstr "注册时间"
 
-#. TRANS: Label for user statistics.
-msgid "Notices"
-msgstr "消�"
-
 #. TRANS: Label for user statistics.
 #. TRANS: Average count of posts made per day since account registration.
 msgid "Daily average"
@@ -9376,9 +8794,8 @@ msgid "Groups"
 msgstr "�组"
 
 #. TRANS: H2 text for user list membership statistics.
-#, fuzzy
 msgid "Lists"
-msgstr "�制"
+msgstr "列表"
 
 #. TRANS: Server error displayed when using an unimplemented method.
 msgid "Unimplemented method."
@@ -9389,7 +8806,6 @@ msgid "User groups"
 msgstr "用户�组"
 
 #. TRANS: Menu item in search group navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Recent tags"
 msgstr "最近标签"
@@ -9399,13 +8815,11 @@ msgid "Recent tags"
 msgstr "最近标签"
 
 #. TRANS: Menu item in search group navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Featured"
 msgstr "推�用户"
 
 #. TRANS: Menu item in search group navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Popular"
 msgstr "热门收�"
@@ -9413,7 +8827,7 @@ msgstr "热门收�"
 #. TRANS: Title for inbox tag cloud section.
 msgctxt "TITLE"
 msgid "Trending topics"
-msgstr ""
+msgstr "热门主题"
 
 #. TRANS: Client error displayed when return-to was defined without a target.
 msgid "No return-to arguments."
@@ -9424,9 +8838,8 @@ msgid "Repeat this notice?"
 msgstr "转�这个消�？"
 
 #. TRANS: Button title to repeat a notice on notice repeat form.
-#, fuzzy
 msgid "Repeat this notice."
-msgstr "转�"
+msgstr "��此通知。"
 
 #. TRANS: Description of role revoke form. %s is the role to be revoked.
 #, php-format
@@ -9438,10 +8851,9 @@ msgid "Page not found."
 msgstr "没有找到页�。"
 
 #. TRANS: Title of form to sandbox a user.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Sandbox"
-msgstr "沙盒"
+msgstr "沙箱"
 
 #. TRANS: Description of form to sandbox a user.
 msgid "Sandbox this user"
@@ -9457,6 +8869,7 @@ msgid "Keyword(s)"
 msgstr "关键�"
 
 #. TRANS: Button text for searching site.
+#. TRANS: Button text for search button on search form.
 #. TRANS: Button text to search profiles.
 msgctxt "BUTTON"
 msgid "Search"
@@ -9484,17 +8897,15 @@ msgid ""
 msgstr ""
 
 #. TRANS: Menu item in search group navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "People"
-msgstr "用户"
+msgstr "人"
 
 #. TRANS: Menu item title in search group navigation panel.
 msgid "Find people on this site"
 msgstr "�索本站用户"
 
 #. TRANS: Menu item in search group navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Notices"
 msgstr "消�"
@@ -9507,60 +8918,26 @@ msgstr "�索消�内容"
 msgid "Find groups on this site"
 msgstr "�索本站�组"
 
-#. TRANS: Secondary navigation menu item leading to help on StatusNet.
-msgctxt "MENU"
-msgid "Help"
-msgstr "帮助"
-
-#. TRANS: Secondary navigation menu item leading to text about StatusNet site.
-#, fuzzy
-msgctxt "MENU"
-msgid "About"
-msgstr "关于"
-
-#. TRANS: Secondary navigation menu item leading to Frequently Asked Questions.
-#, fuzzy
-msgctxt "MENU"
-msgid "FAQ"
-msgstr "FAQ"
-
 #. TRANS: Secondary navigation menu item leading to Terms of Service.
-#, fuzzy
 msgctxt "MENU"
 msgid "TOS"
 msgstr "�款"
 
 #. TRANS: Secondary navigation menu item leading to privacy policy.
-#, fuzzy
 msgctxt "MENU"
 msgid "Privacy"
 msgstr "��"
 
 #. TRANS: Secondary navigation menu item. Leads to information about StatusNet and its license.
-#, fuzzy
 msgctxt "MENU"
 msgid "Source"
 msgstr "��"
 
 #. TRANS: Secondary navigation menu item leading to version information on the StatusNet site.
-#, fuzzy
 msgctxt "MENU"
 msgid "Version"
 msgstr "版本"
 
-#. TRANS: Secondary navigation menu item leading to e-mail contact information on the
-#. TRANS: StatusNet site, where to report bugs, ...
-#, fuzzy
-msgctxt "MENU"
-msgid "Contact"
-msgstr "�系"
-
-#. TRANS: Secondary navigation menu item. Leads to information about embedding a timeline widget.
-#, fuzzy
-msgctxt "MENU"
-msgid "Badge"
-msgstr "挂件"
-
 #. TRANS: Default title for section/sidebar widget.
 msgid "Untitled section"
 msgstr "无标题章节"
@@ -9570,17 +8947,15 @@ msgid "More..."
 msgstr "更多..."
 
 #. TRANS: Header in settings navigation panel.
-#, fuzzy
 msgctxt "HEADER"
 msgid "Settings"
-msgstr "SMS 设置"
+msgstr "设置"
 
 #. TRANS: Menu item title in settings navigation panel.
 msgid "Change your profile settings"
 msgstr "修改你的个人信�"
 
 #. TRANS: Menu item in settings navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Avatar"
 msgstr "头�"
@@ -9590,7 +8965,6 @@ msgid "Upload an avatar"
 msgstr "上传一个头�。"
 
 #. TRANS: Menu item in settings navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Password"
 msgstr "密�"
@@ -9600,7 +8974,6 @@ msgid "Change your password"
 msgstr "修改密�"
 
 #. TRANS: Menu item in settings navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Email"
 msgstr "电�邮件"
@@ -9609,15 +8982,10 @@ msgstr "电�邮件"
 msgid "Change email handling"
 msgstr "修改电�邮件"
 
-#. TRANS: Menu item title in settings navigation panel.
-msgid "Design your profile"
-msgstr "设计你的个人页�外观"
-
 #. TRANS: Menu item in settings navigation panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "URL"
-msgstr "URL 互�网地�"
+msgstr "URL"
 
 #. TRANS: Menu item title in settings navigation panel.
 msgid "URL shorteners"
@@ -9650,8 +9018,16 @@ msgstr "关�"
 msgid "Authorized connected applications"
 msgstr "被授�已连接的应用"
 
+#. TRANS: Menu item in settings navigation panel.
+msgctxt "MENU"
+msgid "Old school"
+msgstr ""
+
+#. TRANS: Menu item title in settings navigation panel.
+msgid "UI tweaks for old-school users"
+msgstr ""
+
 #. TRANS: Title of form to silence a user.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Silence"
 msgstr "�言"
@@ -9660,47 +9036,79 @@ msgstr "�言"
 msgid "Silence this user"
 msgstr "将此用户�言"
 
+#. TRANS: Server error displayed when trying to create an anynymous OAuth consumer.
+msgid "Could not create anonymous consumer."
+msgstr "无法创建匿� consumer。"
+
+#. TRANS: Server error displayed when trying to create an anynymous OAuth application.
+msgid "Could not create anonymous OAuth application."
+msgstr "无法创建匿� OAuth 应用。"
+
+#. TRANS: Exception thrown when no token association could be found.
+msgid ""
+"Could not find a profile and application associated with the request token."
+msgstr "无法找到请求 token 对应的用户和应用。"
+
+#. TRANS: Exception thrown when no access token can be issued.
+msgid "Could not issue access token."
+msgstr "无法�行 access token。"
+
+#. TRANS: Exception thrown when a database error occurs.
+msgid "Database error inserting OAuth application user."
+msgstr "�入 OAuth 应用用户时数�库出错。"
+
+#. TRANS: Exception thrown when a database error occurs.
+msgid "Database error updating OAuth application user."
+msgstr "�入 OAuth 应用用户时数�库出错。"
+
+#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
+msgid "Tried to revoke unknown token."
+msgstr "�试了�消未知的 token。"
+
+#. TRANS: Exception thrown when an attempt is made to remove a revoked token.
+msgid "Failed to delete revoked token."
+msgstr "删除�消的 token 失败。"
+
 #. TRANS: Menu item in local navigation menu.
-#, fuzzy
 msgctxt "MENU"
 msgid "Subscriptions"
 msgstr "关注的"
 
 #. TRANS: Menu item title in local navigation menu.
 #. TRANS: %s is a user nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "People %s subscribes to."
-msgstr "%s关注的用户"
+msgstr "人 %s 订阅。"
 
 #. TRANS: Menu item title in local navigation menu.
 #. TRANS: %s is a user nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "People subscribed to %s."
-msgstr "关注了%s的用户"
+msgstr "人订阅了 %s。"
 
 #. TRANS: Menu item in local navigation menu.
 #. TRANS: %d is the number of pending subscription requests.
 #, php-format
 msgctxt "MENU"
 msgid "Pending (%d)"
-msgstr ""
+msgstr "挂起（%d）"
 
 #. TRANS: Menu item title in local navigation menu.
 #, php-format
 msgid "Approve pending subscription requests."
-msgstr ""
+msgstr "批准挂起订阅请求。"
 
 #. TRANS: Menu item title in local navigation menu.
 #. TRANS: %s is a user nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "Groups %s is a member of."
-msgstr "%s 组是�员组�了"
+msgstr "组 %s 的�员。"
 
 #. TRANS: Menu item title in local navigation menu.
 #. TRANS: %s is a user nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "List subscriptions by %s."
-msgstr "关注了%s的用户"
+msgstr "列出的订阅 %s。"
 
 #. TRANS: Menu item in local navigation menu.
 msgctxt "MENU"
@@ -9709,14 +9117,24 @@ msgstr "邀请"
 
 #. TRANS: Menu item title in local navigation menu.
 #. TRANS: %s is the StatusNet sitename.
-#, fuzzy, php-format
+#, php-format
 msgid "Invite friends and colleagues to join you on %s."
-msgstr "邀请朋�和�事�%s一起和你交�"
+msgstr "邀请加入您的朋�和�事 %s。"
 
 #. TRANS: Form of form to subscribe to a user.
 msgid "Subscribe to this user"
 msgstr "关注这个用户"
 
+#. TRANS: Button text to subscribe to a user.
+#. TRANS: Button text for subscribing to a list.
+msgctxt "BUTTON"
+msgid "Subscribe"
+msgstr "关注"
+
+#. TRANS: Button title to subscribe to a user.
+msgid "Subscribe to this user."
+msgstr "订阅此用户。"
+
 #. TRANS: Title of personal tag cloud section.
 msgid "People Tagcloud as self-tagged"
 msgstr "自己添加标签的用户标签云"
@@ -9726,7 +9144,6 @@ msgid "People Tagcloud as tagged"
 msgstr "被添加标签的用户标签云"
 
 #. TRANS: Content displayed in a tag cloud section if there are no tags.
-#, fuzzy
 msgctxt "NOTAGS"
 msgid "None"
 msgstr "æ— "
@@ -9749,9 +9166,8 @@ msgid "Failed saving theme."
 msgstr "�存主题失败"
 
 #. TRANS: Server exception thrown when an uploaded theme has an incorrect structure.
-#, fuzzy
 msgid "Invalid theme: Bad directory structure."
-msgstr "无效的主题：目录结构��。"
+msgstr "无效的主题： �的目录结构。"
 
 #. TRANS: Client exception thrown when an uploaded theme is larger than the limit.
 #. TRANS: %d is the number of bytes of the uncompressed theme.
@@ -9762,9 +9178,8 @@ msgid_plural ""
 msgstr[0] "上传的主题过大，解压�必须�于%d字节。"
 
 #. TRANS: Server exception thrown when an uploaded theme is incomplete.
-#, fuzzy
 msgid "Invalid theme archive: Missing file css/display.css"
-msgstr "无效的主题存档：css/display.css 文件丢失"
+msgstr "无效的主题存档： 缺少文件 css/display.css"
 
 #. TRANS: Server exception thrown when an uploaded theme has an incorrect file or folder name.
 msgid ""
@@ -9788,35 +9203,33 @@ msgid "Error opening theme archive."
 msgstr "打开主题文件时出错。"
 
 #. TRANS: Header for Notices section.
-#, fuzzy
 msgctxt "HEADER"
 msgid "Notices"
-msgstr "消�"
+msgstr "公告"
 
 #. TRANS: Link to show replies for a notice.
 #. TRANS: %d is the number of replies to a notice and used for plural.
-#, fuzzy, php-format
+#, php-format
 msgid "Show reply"
 msgid_plural "Show all %d replies"
-msgstr[0] "显示更多"
+msgstr[0] "显示回应"
 
 #. TRANS: Reference to the logged in user in favourite list.
 msgctxt "FAVELIST"
 msgid "You"
-msgstr ""
+msgstr "ä½ "
 
 #. TRANS: For building a list such as "Jim, Bob, Mary and 5 others like this".
 #. TRANS: %1$s is a list of users, separated by a separator (default: ", "), %2$s is the last user in the list.
-#, fuzzy, php-format
+#, php-format
 msgctxt "FAVELIST"
 msgid "%1$s and %2$s"
-msgstr "%1$s - %2$s"
+msgstr "%1$s 和 %2$s"
 
 #. TRANS: List message for notice favoured by logged in user.
-#, fuzzy
 msgctxt "FAVELIST"
 msgid "You like this."
-msgstr "最新被收�的消�"
+msgstr "你喜欢这。"
 
 #. TRANS: List message for when more than 4 people like something.
 #. TRANS: %%s is a list of users liking a notice, %d is the number over 4 that like the notice.
@@ -9837,27 +9250,35 @@ msgstr[0] ""
 #. TRANS: List message for notice repeated by logged in user.
 #, fuzzy
 msgctxt "REPEATLIST"
-msgid "You have repeated this notice."
-msgstr "你已转�过了那个消�。"
+msgid "You repeated this."
+msgstr "你有��此通知。"
 
-#. TRANS: List message for repeated notices.
-#. TRANS: %d is the number of users that have repeated a notice.
+#. TRANS: List message for when more than 4 people repeat something.
+#. TRANS: %%s is a list of users liking a notice, %d is the number over 4 that like the notice.
+#. TRANS: Plural is decided on the total number of users liking the notice (count of %%s + %d).
+#, php-format
+msgid "%%s and %d other repeated this."
+msgid_plural "%%s and %d others repeated this."
+msgstr[0] ""
+
+#. TRANS: List message for favoured notices.
+#. TRANS: %%s is a list of users liking a notice.
+#. TRANS: Plural is based on the number of of users that have favoured a notice.
 #, fuzzy, php-format
-msgid "One person has repeated this notice."
-msgid_plural "%d people have repeated this notice."
-msgstr[0] "已转�了该消�。"
+msgid "%%s repeated this."
+msgid_plural "%%s repeated this."
+msgstr[0] "转�给%s"
 
 #. TRANS: Form legend.
-#, fuzzy, php-format
+#, php-format
 msgid "Search and list people"
-msgstr "�索帮助"
+msgstr "�索与列表中的人"
 
 #. TRANS: Dropdown option for searching in profiles.
 msgid "Everything"
-msgstr ""
+msgstr "一切"
 
 #. TRANS: Dropdown option for searching in profiles.
-#, fuzzy
 msgid "Fullname"
 msgstr "全�"
 
@@ -9866,27 +9287,25 @@ msgid "URI (Remote users)"
 msgstr ""
 
 #. TRANS: Dropdown field label.
-#, fuzzy
 msgctxt "LABEL"
 msgid "Search in"
-msgstr "�索帮助"
+msgstr "�索于"
 
 #. TRANS: Dropdown field title.
-#, fuzzy
 msgid "Choose a field to search."
-msgstr "选择标签缩�清�"
+msgstr "选择��索的字段。"
 
 #. TRANS: Form legend.
 #. TRANS: %1$s is a nickname, $2$s is a list.
-#, fuzzy, php-format
+#, php-format
 msgid "Remove %1$s from list %2$s"
-msgstr "%1$s - %2$s"
+msgstr "%2$s列表中删除%1$s"
 
 #. TRANS: Legend on form to add a profile to a list.
 #. TRANS: %1$s is a nickname, %2$s is a list.
-#, fuzzy, php-format
+#, php-format
 msgid "Add %1$s to list %2$s"
-msgstr "%1$s - %2$s"
+msgstr "添加%1$s到列表%2$s中"
 
 #. TRANS: Title for top posters section.
 msgid "Top posters"
@@ -9895,29 +9314,27 @@ msgstr "�水精英"
 #. TRANS: Option in drop-down of potential addressees.
 msgctxt "SENDTO"
 msgid "Everyone"
-msgstr ""
+msgstr "�个人"
 
 #. TRANS: Option in drop-down of potential addressees.
 #. TRANS: %s is a StatusNet sitename.
 #, php-format
 msgid "My colleagues at %s"
-msgstr ""
+msgstr "我的�事在 %s"
 
 #. TRANS: Label for drop-down of potential addressees.
-#, fuzzy
 msgctxt "LABEL"
 msgid "To:"
-msgstr "到"
+msgstr "至："
 
 #. TRANS: Checkbox label in widget for selecting potential addressees to mark the notice private.
-#, fuzzy
 msgid "Private?"
-msgstr "�有"
+msgstr "�有？"
 
 #. TRANS: Client exception thrown in widget for selecting potential addressees when an invalid fill option was received.
-#, fuzzy, php-format
+#, php-format
 msgid "Unknown to value: \"%s\"."
-msgstr "未知的动�：“%s�"
+msgstr "未知值：\"%s\"。"
 
 #. TRANS: Title for the form to unblock a user.
 msgctxt "TITLE"
@@ -9925,7 +9342,6 @@ msgid "Unblock"
 msgstr "�消�蔽"
 
 #. TRANS: Title for unsandbox form.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Unsandbox"
 msgstr "移出沙盒"
@@ -9943,17 +9359,20 @@ msgid "Unsilence this user"
 msgstr "�消对这个用户的�言"
 
 #. TRANS: Form legend on unsubscribe form.
-#. TRANS: Button title on unsubscribe form.
 msgid "Unsubscribe from this user"
 msgstr "�消关注这个用户"
 
 #. TRANS: Button text on unsubscribe form.
 #. TRANS: Button text for unsubscribing from a list.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Unsubscribe"
 msgstr "�消关注"
 
+#. TRANS: Button title on unsubscribe form.
+#, fuzzy
+msgid "Unsubscribe from this user."
+msgstr "�消关注这个用户"
+
 #. TRANS: Exception text shown when no profile can be found for a user.
 #. TRANS: %1$s is a user nickname, $2$d is a user ID (number).
 #, php-format
@@ -10031,8 +9450,6 @@ msgstr "��法的XML, 缺少XRD根"
 msgid "Getting backup from file '%s'."
 msgstr "从文件'%s'获�备份。"
 
-#~ msgid "%1$s and friends, page %2$d"
-#~ msgstr "%1$s 和好�，第%2$d页"
-
-#~ msgid "You and friends"
-#~ msgstr "你和好�们"
+#, fuzzy
+#~ msgid " "
+#~ msgstr "�"
diff --git a/plugins/APC/locale/APC.pot b/plugins/APC/locale/APC.pot
index 76981f2395..f1bfc29977 100644
--- a/plugins/APC/locale/APC.pot
+++ b/plugins/APC/locale/APC.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
+"POT-Creation-Date: 2012-06-30 11:07+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"
diff --git a/plugins/APC/locale/ast/LC_MESSAGES/APC.po b/plugins/APC/locale/ast/LC_MESSAGES/APC.po
index 2ba540c5b8..7782c92362 100644
--- a/plugins/APC/locale/ast/LC_MESSAGES/APC.po
+++ b/plugins/APC/locale/ast/LC_MESSAGES/APC.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - APC to Asturian (Asturianu)
+# Translation of StatusNet - APC to Asturian (asturianu)
 # Exported from translatewiki.net
 #
 # Author: Xuacu
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - APC\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:37+0000\n"
-"Language-Team: Asturian <http://translatewiki.net/wiki/Portal:ast>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:37+0000\n"
+"Language-Team: Asturian <https://translatewiki.net/wiki/Portal:ast>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-13 13:56:51+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-18 16:18:40+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ast\n"
 "X-Message-Group: #out-statusnet-plugin-apc\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/APC/locale/be-tarask/LC_MESSAGES/APC.po b/plugins/APC/locale/be-tarask/LC_MESSAGES/APC.po
index 5f19cfdd22..008562f58c 100644
--- a/plugins/APC/locale/be-tarask/LC_MESSAGES/APC.po
+++ b/plugins/APC/locale/be-tarask/LC_MESSAGES/APC.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - APC to Belarusian (Taraškievica orthography) (‪Белару�ка� (тарашкевіца)‬)
+# Translation of StatusNet - APC to Belarusian (Taraškievica orthography) (‪белару�ка� (тарашкевіца)‬)
 # Exported from translatewiki.net
 #
 # Author: EugeneZelenko
@@ -9,15 +9,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - APC\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:37+0000\n"
-"Language-Team: Belarusian (Taraškievica orthography) <http://translatewiki."
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:37+0000\n"
+"Language-Team: Belarusian (Taraškievica orthography) <https://translatewiki."
 "net/wiki/Portal:be-tarask>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-13 13:56:51+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-18 16:18:40+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: be-tarask\n"
 "X-Message-Group: #out-statusnet-plugin-apc\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/APC/locale/br/LC_MESSAGES/APC.po b/plugins/APC/locale/br/LC_MESSAGES/APC.po
index afd26d0571..f34f343150 100644
--- a/plugins/APC/locale/br/LC_MESSAGES/APC.po
+++ b/plugins/APC/locale/br/LC_MESSAGES/APC.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - APC to Breton (Brezhoneg)
+# Translation of StatusNet - APC to Breton (brezhoneg)
 # Exported from translatewiki.net
 #
 # Author: Fulup
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - APC\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:38+0000\n"
-"Language-Team: Breton <http://translatewiki.net/wiki/Portal:br>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:37+0000\n"
+"Language-Team: Breton <https://translatewiki.net/wiki/Portal:br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-13 13:56:51+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-18 16:18:40+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-apc\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
diff --git a/plugins/APC/locale/de/LC_MESSAGES/APC.po b/plugins/APC/locale/de/LC_MESSAGES/APC.po
index 40bdba23a7..f04f6fd7ee 100644
--- a/plugins/APC/locale/de/LC_MESSAGES/APC.po
+++ b/plugins/APC/locale/de/LC_MESSAGES/APC.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - APC\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:38+0000\n"
-"Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:37+0000\n"
+"Language-Team: German <https://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-13 13:56:51+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-18 16:18:40+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-apc\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/APC/locale/es/LC_MESSAGES/APC.po b/plugins/APC/locale/es/LC_MESSAGES/APC.po
index acaf63ac53..06292172bf 100644
--- a/plugins/APC/locale/es/LC_MESSAGES/APC.po
+++ b/plugins/APC/locale/es/LC_MESSAGES/APC.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - APC to Spanish (Español)
+# Translation of StatusNet - APC to Spanish (español)
 # Exported from translatewiki.net
 #
 # Author: Translationista
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - APC\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:38+0000\n"
-"Language-Team: Spanish <http://translatewiki.net/wiki/Portal:es>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:37+0000\n"
+"Language-Team: Spanish <https://translatewiki.net/wiki/Portal:es>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-13 13:56:51+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-18 16:18:40+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-plugin-apc\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/APC/locale/eu/LC_MESSAGES/APC.po b/plugins/APC/locale/eu/LC_MESSAGES/APC.po
new file mode 100644
index 0000000000..10ef3d5781
--- /dev/null
+++ b/plugins/APC/locale/eu/LC_MESSAGES/APC.po
@@ -0,0 +1,27 @@
+# Translation of StatusNet - APC to Basque (euskara)
+# Exported from translatewiki.net
+#
+# Author: Artsuaga
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - APC\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:37+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-18 16:18:40+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin description.
+msgid ""
+"Use the <a href=\"http://pecl.php.net/package/apc\">APC</a> variable cache "
+"to cache query results."
+msgstr ""
+"Erabili <a href=\"http://pecl.php.net/package/apc\">APC</a> aldagairen "
+"katxea kontsultako emaitzak katxean kopiatzeko."
diff --git a/plugins/APC/locale/fr/LC_MESSAGES/APC.po b/plugins/APC/locale/fr/LC_MESSAGES/APC.po
index 5d55c6d0ab..ae3819591c 100644
--- a/plugins/APC/locale/fr/LC_MESSAGES/APC.po
+++ b/plugins/APC/locale/fr/LC_MESSAGES/APC.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - APC to French (Français)
+# Translation of StatusNet - APC to French (français)
 # Exported from translatewiki.net
 #
 # Author: Verdy p
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - APC\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:38+0000\n"
-"Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:38+0000\n"
+"Language-Team: French <https://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-13 13:56:51+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-18 16:18:40+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-apc\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
diff --git a/plugins/APC/locale/gl/LC_MESSAGES/APC.po b/plugins/APC/locale/gl/LC_MESSAGES/APC.po
index 3c53728466..d8181340fb 100644
--- a/plugins/APC/locale/gl/LC_MESSAGES/APC.po
+++ b/plugins/APC/locale/gl/LC_MESSAGES/APC.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - APC to Galician (Galego)
+# Translation of StatusNet - APC to Galician (galego)
 # Exported from translatewiki.net
 #
 # Author: Toliño
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - APC\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:38+0000\n"
-"Language-Team: Galician <http://translatewiki.net/wiki/Portal:gl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:38+0000\n"
+"Language-Team: Galician <https://translatewiki.net/wiki/Portal:gl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-13 13:56:51+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-18 16:18:40+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: gl\n"
 "X-Message-Group: #out-statusnet-plugin-apc\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/APC/locale/he/LC_MESSAGES/APC.po b/plugins/APC/locale/he/LC_MESSAGES/APC.po
index c1f591daf8..ed0603cc2d 100644
--- a/plugins/APC/locale/he/LC_MESSAGES/APC.po
+++ b/plugins/APC/locale/he/LC_MESSAGES/APC.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - APC\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:38+0000\n"
-"Language-Team: Hebrew <http://translatewiki.net/wiki/Portal:he>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:38+0000\n"
+"Language-Team: Hebrew <https://translatewiki.net/wiki/Portal:he>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-13 13:56:51+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-18 16:18:40+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: he\n"
 "X-Message-Group: #out-statusnet-plugin-apc\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/APC/locale/ia/LC_MESSAGES/APC.po b/plugins/APC/locale/ia/LC_MESSAGES/APC.po
index c2c8735f10..0e54c48c49 100644
--- a/plugins/APC/locale/ia/LC_MESSAGES/APC.po
+++ b/plugins/APC/locale/ia/LC_MESSAGES/APC.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - APC to Interlingua (Interlingua)
+# Translation of StatusNet - APC to Interlingua (interlingua)
 # Exported from translatewiki.net
 #
 # Author: McDutchie
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - APC\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:38+0000\n"
-"Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:38+0000\n"
+"Language-Team: Interlingua <https://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-13 13:56:51+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-18 16:18:40+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-apc\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/APC/locale/id/LC_MESSAGES/APC.po b/plugins/APC/locale/id/LC_MESSAGES/APC.po
index 20e70c1078..3a03574d46 100644
--- a/plugins/APC/locale/id/LC_MESSAGES/APC.po
+++ b/plugins/APC/locale/id/LC_MESSAGES/APC.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - APC\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:38+0000\n"
-"Language-Team: Indonesian <http://translatewiki.net/wiki/Portal:id>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:38+0000\n"
+"Language-Team: Indonesian <https://translatewiki.net/wiki/Portal:id>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-13 13:56:51+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-18 16:18:40+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: id\n"
 "X-Message-Group: #out-statusnet-plugin-apc\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
diff --git a/plugins/APC/locale/it/LC_MESSAGES/APC.po b/plugins/APC/locale/it/LC_MESSAGES/APC.po
new file mode 100644
index 0000000000..da7bfc1c74
--- /dev/null
+++ b/plugins/APC/locale/it/LC_MESSAGES/APC.po
@@ -0,0 +1,27 @@
+# Translation of StatusNet - APC to Italian (italiano)
+# Exported from translatewiki.net
+#
+# Author: Ximo17
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - APC\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:38+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-18 16:18:40+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin description.
+msgid ""
+"Use the <a href=\"http://pecl.php.net/package/apc\">APC</a> variable cache "
+"to cache query results."
+msgstr ""
+"Utilizzare la cache variabile <a href=\"http://pecl.php.net/package/apc"
+"\">APC</a> per i risultati della query cache."
diff --git a/plugins/APC/locale/mk/LC_MESSAGES/APC.po b/plugins/APC/locale/mk/LC_MESSAGES/APC.po
index d28d1b7ed8..a146ba75a2 100644
--- a/plugins/APC/locale/mk/LC_MESSAGES/APC.po
+++ b/plugins/APC/locale/mk/LC_MESSAGES/APC.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - APC to Macedonian (Македон�ки)
+# Translation of StatusNet - APC to Macedonian (македон�ки)
 # Exported from translatewiki.net
 #
 # Author: Bjankuloski06
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - APC\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:38+0000\n"
-"Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:38+0000\n"
+"Language-Team: Macedonian <https://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-13 13:56:51+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-18 16:18:40+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-apc\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
diff --git a/plugins/APC/locale/ms/LC_MESSAGES/APC.po b/plugins/APC/locale/ms/LC_MESSAGES/APC.po
new file mode 100644
index 0000000000..c020f23dd3
--- /dev/null
+++ b/plugins/APC/locale/ms/LC_MESSAGES/APC.po
@@ -0,0 +1,30 @@
+# Translation of StatusNet - APC to Malay (Bahasa Melayu)
+# Exported from translatewiki.net
+#
+# Author: Anakmalaysia
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - APC\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:38+0000\n"
+"Language-Team: Malay <https://translatewiki.net/wiki/Portal:ms>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-18 16:18:40+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: ms\n"
+"X-Message-Group: #out-statusnet-plugin-apc\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#. TRANS: Plugin description.
+msgid ""
+"Use the <a href=\"http://pecl.php.net/package/apc\">APC</a> variable cache "
+"to cache query results."
+msgstr ""
+"Gunakan cache pembolehubah <a href=\"http://pecl.php.net/package/apc\">APC</"
+"a> untuk meng-cache-kan hasil pertanyaan."
diff --git a/plugins/APC/locale/nb/LC_MESSAGES/APC.po b/plugins/APC/locale/nb/LC_MESSAGES/APC.po
index 7f57d4cb9c..8196b42f82 100644
--- a/plugins/APC/locale/nb/LC_MESSAGES/APC.po
+++ b/plugins/APC/locale/nb/LC_MESSAGES/APC.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - APC to Norwegian (bokmål)‬ (‪Norsk (bokmål)‬)
+# Translation of StatusNet - APC to Norwegian Bokmål (‪norsk (bokmål)‬)
 # Exported from translatewiki.net
 #
 # Author: Nghtwlkr
@@ -9,15 +9,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - APC\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:38+0000\n"
-"Language-Team: Norwegian (bokmål)‬ <http://translatewiki.net/wiki/Portal:no>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:38+0000\n"
+"Language-Team: Norwegian Bokmål <https://translatewiki.net/wiki/Portal:nb>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-13 13:56:51+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
-"X-Language-Code: no\n"
+"X-POT-Import-Date: 2011-06-18 16:18:40+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: nb\n"
 "X-Message-Group: #out-statusnet-plugin-apc\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
diff --git a/plugins/APC/locale/nl/LC_MESSAGES/APC.po b/plugins/APC/locale/nl/LC_MESSAGES/APC.po
index 7a92512c87..6676ef1b03 100644
--- a/plugins/APC/locale/nl/LC_MESSAGES/APC.po
+++ b/plugins/APC/locale/nl/LC_MESSAGES/APC.po
@@ -2,6 +2,7 @@
 # Exported from translatewiki.net
 #
 # Author: McDutchie
+# Author: Siebrand
 # --
 # This file is distributed under the same license as the StatusNet package.
 #
@@ -9,14 +10,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - APC\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:38+0000\n"
-"Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:38+0000\n"
+"Language-Team: Dutch <https://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-13 13:56:51+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-18 16:18:40+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-apc\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -27,4 +28,4 @@ msgid ""
 "to cache query results."
 msgstr ""
 "De variabelencache <a href=\"http://pecl.php.net/package/apc\">APC</a> "
-"gebruiken op resultaten van zoekopdrachten te cachen."
+"gebruiken om resultaten van zoekopdrachten te cachen."
diff --git a/plugins/APC/locale/pl/LC_MESSAGES/APC.po b/plugins/APC/locale/pl/LC_MESSAGES/APC.po
index b5a42c0d6e..4d043702e9 100644
--- a/plugins/APC/locale/pl/LC_MESSAGES/APC.po
+++ b/plugins/APC/locale/pl/LC_MESSAGES/APC.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - APC to Polish (Polski)
+# Translation of StatusNet - APC to Polish (polski)
 # Exported from translatewiki.net
 #
 # Author: Sp5uhe
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - APC\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:38+0000\n"
-"Language-Team: Polish <http://translatewiki.net/wiki/Portal:pl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:39+0000\n"
+"Language-Team: Polish <https://translatewiki.net/wiki/Portal:pl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-13 13:56:51+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-18 16:18:40+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: pl\n"
 "X-Message-Group: #out-statusnet-plugin-apc\n"
 "Plural-Forms: nplurals=3; plural=(n == 1) ? 0 : ( (n%10 >= 2 && n%10 <= 4 && "
diff --git a/plugins/APC/locale/pt/LC_MESSAGES/APC.po b/plugins/APC/locale/pt/LC_MESSAGES/APC.po
index 0788c02fb6..2a639cfbe0 100644
--- a/plugins/APC/locale/pt/LC_MESSAGES/APC.po
+++ b/plugins/APC/locale/pt/LC_MESSAGES/APC.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - APC to Portuguese (Português)
+# Translation of StatusNet - APC to Portuguese (português)
 # Exported from translatewiki.net
 #
 # Author: Waldir
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - APC\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:38+0000\n"
-"Language-Team: Portuguese <http://translatewiki.net/wiki/Portal:pt>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:39+0000\n"
+"Language-Team: Portuguese <https://translatewiki.net/wiki/Portal:pt>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-13 13:56:51+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-18 16:18:40+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: pt\n"
 "X-Message-Group: #out-statusnet-plugin-apc\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/APC/locale/pt_BR/LC_MESSAGES/APC.po b/plugins/APC/locale/pt_BR/LC_MESSAGES/APC.po
index 27c13001ed..b029a0abee 100644
--- a/plugins/APC/locale/pt_BR/LC_MESSAGES/APC.po
+++ b/plugins/APC/locale/pt_BR/LC_MESSAGES/APC.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - APC to Brazilian Portuguese (Português do Brasil)
+# Translation of StatusNet - APC to Brazilian Portuguese (português do Brasil)
 # Exported from translatewiki.net
 #
 # Author: Giro720
@@ -9,15 +9,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - APC\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:38+0000\n"
-"Language-Team: Brazilian Portuguese <http://translatewiki.net/wiki/Portal:pt-"
-"br>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:39+0000\n"
+"Language-Team: Brazilian Portuguese <https://translatewiki.net/wiki/Portal:"
+"pt-br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-13 13:56:51+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-18 16:18:40+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: pt-br\n"
 "X-Message-Group: #out-statusnet-plugin-apc\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
diff --git a/plugins/APC/locale/ru/LC_MESSAGES/APC.po b/plugins/APC/locale/ru/LC_MESSAGES/APC.po
index 15fb454bcf..3a67e1bd1a 100644
--- a/plugins/APC/locale/ru/LC_MESSAGES/APC.po
+++ b/plugins/APC/locale/ru/LC_MESSAGES/APC.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - APC to Russian (Ру��кий)
+# Translation of StatusNet - APC to Russian (ру��кий)
 # Exported from translatewiki.net
 #
 # Author: �лек�андр Сигачёв
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - APC\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:38+0000\n"
-"Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:39+0000\n"
+"Language-Team: Russian <https://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-13 13:56:51+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-18 16:18:40+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-apc\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
diff --git a/plugins/APC/locale/tl/LC_MESSAGES/APC.po b/plugins/APC/locale/tl/LC_MESSAGES/APC.po
index e3c56bcbae..2ade2232d2 100644
--- a/plugins/APC/locale/tl/LC_MESSAGES/APC.po
+++ b/plugins/APC/locale/tl/LC_MESSAGES/APC.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - APC\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:38+0000\n"
-"Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:39+0000\n"
+"Language-Team: Tagalog <https://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-13 13:56:51+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-18 16:18:40+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-apc\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/APC/locale/uk/LC_MESSAGES/APC.po b/plugins/APC/locale/uk/LC_MESSAGES/APC.po
index ff1e8c3c56..18b70e496f 100644
--- a/plugins/APC/locale/uk/LC_MESSAGES/APC.po
+++ b/plugins/APC/locale/uk/LC_MESSAGES/APC.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - APC to Ukrainian (Україн�ька)
+# Translation of StatusNet - APC to Ukrainian (україн�ька)
 # Exported from translatewiki.net
 #
 # Author: Boogie
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - APC\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:39+0000\n"
-"Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:39+0000\n"
+"Language-Team: Ukrainian <https://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-13 13:56:51+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-18 16:18:40+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-apc\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
diff --git a/plugins/APC/locale/zh_CN/LC_MESSAGES/APC.po b/plugins/APC/locale/zh_CN/LC_MESSAGES/APC.po
index 59e5acbcb1..34b06cdedf 100644
--- a/plugins/APC/locale/zh_CN/LC_MESSAGES/APC.po
+++ b/plugins/APC/locale/zh_CN/LC_MESSAGES/APC.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - APC to Simplified Chinese (‪中文(简体)‬)
+# Translation of StatusNet - APC to Simplified Chinese (‪中文（简体）‬)
 # Exported from translatewiki.net
 #
 # Author: Chenxiaoqino
@@ -9,15 +9,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - APC\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:39+0000\n"
-"Language-Team: Simplified Chinese <http://translatewiki.net/wiki/Portal:zh-"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:39+0000\n"
+"Language-Team: Simplified Chinese <https://translatewiki.net/wiki/Portal:zh-"
 "hans>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-13 13:56:51+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-18 16:18:40+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: #out-statusnet-plugin-apc\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
diff --git a/plugins/AccountManager/locale/AccountManager.pot b/plugins/AccountManager/locale/AccountManager.pot
index 5f29060b48..dd2bb7c82d 100644
--- a/plugins/AccountManager/locale/AccountManager.pot
+++ b/plugins/AccountManager/locale/AccountManager.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
+"POT-Creation-Date: 2012-06-30 11:07+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"
diff --git a/plugins/AccountManager/locale/af/LC_MESSAGES/AccountManager.po b/plugins/AccountManager/locale/af/LC_MESSAGES/AccountManager.po
index c831e675fb..ab82ab4561 100644
--- a/plugins/AccountManager/locale/af/LC_MESSAGES/AccountManager.po
+++ b/plugins/AccountManager/locale/af/LC_MESSAGES/AccountManager.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - AccountManager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:31+0000\n"
-"Language-Team: Afrikaans <http://translatewiki.net/wiki/Portal:af>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:26+0000\n"
+"Language-Team: Afrikaans <https://translatewiki.net/wiki/Portal:af>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-09 18:55:57+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-08-30 10:01:05+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: af\n"
 "X-Message-Group: #out-statusnet-plugin-accountmanager\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/AccountManager/locale/ast/LC_MESSAGES/AccountManager.po b/plugins/AccountManager/locale/ast/LC_MESSAGES/AccountManager.po
index fc2a97c30f..a442a9c9cb 100644
--- a/plugins/AccountManager/locale/ast/LC_MESSAGES/AccountManager.po
+++ b/plugins/AccountManager/locale/ast/LC_MESSAGES/AccountManager.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - AccountManager to Asturian (Asturianu)
+# Translation of StatusNet - AccountManager to Asturian (asturianu)
 # Exported from translatewiki.net
 #
 # Author: Xuacu
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - AccountManager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:31+0000\n"
-"Language-Team: Asturian <http://translatewiki.net/wiki/Portal:ast>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:26+0000\n"
+"Language-Team: Asturian <https://translatewiki.net/wiki/Portal:ast>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-09 18:55:57+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-08-30 10:01:05+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ast\n"
 "X-Message-Group: #out-statusnet-plugin-accountmanager\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/AccountManager/locale/ca/LC_MESSAGES/AccountManager.po b/plugins/AccountManager/locale/ca/LC_MESSAGES/AccountManager.po
index cacf2e4c85..93609dd463 100644
--- a/plugins/AccountManager/locale/ca/LC_MESSAGES/AccountManager.po
+++ b/plugins/AccountManager/locale/ca/LC_MESSAGES/AccountManager.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - AccountManager to Catalan (Català)
+# Translation of StatusNet - AccountManager to Catalan (català)
 # Exported from translatewiki.net
 #
 # Author: Toniher
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - AccountManager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:31+0000\n"
-"Language-Team: Catalan <http://translatewiki.net/wiki/Portal:ca>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:27+0000\n"
+"Language-Team: Catalan <https://translatewiki.net/wiki/Portal:ca>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-09 18:55:57+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-08-30 10:01:05+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ca\n"
 "X-Message-Group: #out-statusnet-plugin-accountmanager\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/AccountManager/locale/de/LC_MESSAGES/AccountManager.po b/plugins/AccountManager/locale/de/LC_MESSAGES/AccountManager.po
index 36d3e9178a..0bfac88e02 100644
--- a/plugins/AccountManager/locale/de/LC_MESSAGES/AccountManager.po
+++ b/plugins/AccountManager/locale/de/LC_MESSAGES/AccountManager.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - AccountManager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:31+0000\n"
-"Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:27+0000\n"
+"Language-Team: German <https://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-09 18:55:57+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-08-30 10:01:05+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-accountmanager\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/AccountManager/locale/es/LC_MESSAGES/AccountManager.po b/plugins/AccountManager/locale/es/LC_MESSAGES/AccountManager.po
new file mode 100644
index 0000000000..952c7cbfb1
--- /dev/null
+++ b/plugins/AccountManager/locale/es/LC_MESSAGES/AccountManager.po
@@ -0,0 +1,29 @@
+# Translation of StatusNet - AccountManager to Spanish (español)
+# Exported from translatewiki.net
+#
+# Author: Erchache2000
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - AccountManager\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:27+0000\n"
+"Language-Team: Spanish <https://translatewiki.net/wiki/Portal:es>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-08-30 10:01:05+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: es\n"
+"X-Message-Group: #out-statusnet-plugin-accountmanager\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin description.
+msgid ""
+"The Account Manager plugin implements the Account Manager specification."
+msgstr ""
+"El plugin Account Manager implementa la especificación de la cuenta "
+"Administrador."
diff --git a/plugins/AccountManager/locale/eu/LC_MESSAGES/AccountManager.po b/plugins/AccountManager/locale/eu/LC_MESSAGES/AccountManager.po
new file mode 100644
index 0000000000..64b000eb3c
--- /dev/null
+++ b/plugins/AccountManager/locale/eu/LC_MESSAGES/AccountManager.po
@@ -0,0 +1,28 @@
+# Translation of StatusNet - AccountManager to Basque (euskara)
+# Exported from translatewiki.net
+#
+# Author: Artsuaga
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - AccountManager\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:27+0000\n"
+"Language-Team: Basque <https://translatewiki.net/wiki/Portal:eu>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-08-30 10:01:05+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: eu\n"
+"X-Message-Group: #out-statusnet-plugin-accountmanager\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin description.
+msgid ""
+"The Account Manager plugin implements the Account Manager specification."
+msgstr ""
+"Kontu Kudeatzaile pluginak Kontu Kudeatzaile zehaztapenak ezartzen ditu."
diff --git a/plugins/AccountManager/locale/fi/LC_MESSAGES/AccountManager.po b/plugins/AccountManager/locale/fi/LC_MESSAGES/AccountManager.po
index 64944124c8..abcb7fa70b 100644
--- a/plugins/AccountManager/locale/fi/LC_MESSAGES/AccountManager.po
+++ b/plugins/AccountManager/locale/fi/LC_MESSAGES/AccountManager.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - AccountManager to Finnish (Suomi)
+# Translation of StatusNet - AccountManager to Finnish (suomi)
 # Exported from translatewiki.net
 #
 # Author: Nike
@@ -10,14 +10,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - AccountManager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:31+0000\n"
-"Language-Team: Finnish <http://translatewiki.net/wiki/Portal:fi>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:27+0000\n"
+"Language-Team: Finnish <https://translatewiki.net/wiki/Portal:fi>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-09 18:55:57+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-08-30 10:01:05+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: fi\n"
 "X-Message-Group: #out-statusnet-plugin-accountmanager\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/AccountManager/locale/fr/LC_MESSAGES/AccountManager.po b/plugins/AccountManager/locale/fr/LC_MESSAGES/AccountManager.po
index ab56c616b8..15091263dc 100644
--- a/plugins/AccountManager/locale/fr/LC_MESSAGES/AccountManager.po
+++ b/plugins/AccountManager/locale/fr/LC_MESSAGES/AccountManager.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - AccountManager to French (Français)
+# Translation of StatusNet - AccountManager to French (français)
 # Exported from translatewiki.net
 #
 # Author: Crochet.david
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - AccountManager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:31+0000\n"
-"Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:27+0000\n"
+"Language-Team: French <https://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-09 18:55:57+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-08-30 10:01:05+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-accountmanager\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
diff --git a/plugins/AccountManager/locale/gl/LC_MESSAGES/AccountManager.po b/plugins/AccountManager/locale/gl/LC_MESSAGES/AccountManager.po
new file mode 100644
index 0000000000..994bf0b42c
--- /dev/null
+++ b/plugins/AccountManager/locale/gl/LC_MESSAGES/AccountManager.po
@@ -0,0 +1,29 @@
+# Translation of StatusNet - AccountManager to Galician (galego)
+# Exported from translatewiki.net
+#
+# Author: Toliño
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - AccountManager\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:27+0000\n"
+"Language-Team: Galician <https://translatewiki.net/wiki/Portal:gl>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-08-30 10:01:05+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: gl\n"
+"X-Message-Group: #out-statusnet-plugin-accountmanager\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin description.
+msgid ""
+"The Account Manager plugin implements the Account Manager specification."
+msgstr ""
+"O complemento de xestión de contas aplica a especificación do xestor de "
+"contas."
diff --git a/plugins/AccountManager/locale/he/LC_MESSAGES/AccountManager.po b/plugins/AccountManager/locale/he/LC_MESSAGES/AccountManager.po
new file mode 100644
index 0000000000..4a1873e655
--- /dev/null
+++ b/plugins/AccountManager/locale/he/LC_MESSAGES/AccountManager.po
@@ -0,0 +1,27 @@
+# Translation of StatusNet - AccountManager to Hebrew (עברית)
+# Exported from translatewiki.net
+#
+# Author: Amire80
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - AccountManager\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:27+0000\n"
+"Language-Team: Hebrew <https://translatewiki.net/wiki/Portal:he>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-08-30 10:01:05+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: he\n"
+"X-Message-Group: #out-statusnet-plugin-accountmanager\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin description.
+msgid ""
+"The Account Manager plugin implements the Account Manager specification."
+msgstr "תוסף מנהל החשבון מייש� �ת מִפרט מנהל החשבון."
diff --git a/plugins/AccountManager/locale/ia/LC_MESSAGES/AccountManager.po b/plugins/AccountManager/locale/ia/LC_MESSAGES/AccountManager.po
index 0b9b842d5f..92b300937b 100644
--- a/plugins/AccountManager/locale/ia/LC_MESSAGES/AccountManager.po
+++ b/plugins/AccountManager/locale/ia/LC_MESSAGES/AccountManager.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - AccountManager to Interlingua (Interlingua)
+# Translation of StatusNet - AccountManager to Interlingua (interlingua)
 # Exported from translatewiki.net
 #
 # Author: McDutchie
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - AccountManager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:31+0000\n"
-"Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:27+0000\n"
+"Language-Team: Interlingua <https://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-09 18:55:57+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-08-30 10:01:05+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-accountmanager\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/AccountManager/locale/it/LC_MESSAGES/AccountManager.po b/plugins/AccountManager/locale/it/LC_MESSAGES/AccountManager.po
new file mode 100644
index 0000000000..2bfbb992e0
--- /dev/null
+++ b/plugins/AccountManager/locale/it/LC_MESSAGES/AccountManager.po
@@ -0,0 +1,24 @@
+# Translation of StatusNet - AccountManager to Italian (italiano)
+# Exported from translatewiki.net
+#
+# Author: Ximo17
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - AccountManager\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:27+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-08-30 10:01:05+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin description.
+msgid ""
+"The Account Manager plugin implements the Account Manager specification."
+msgstr "Il plugin Account Manager implementa le specifiche Account Manager."
diff --git a/plugins/AccountManager/locale/ja/LC_MESSAGES/AccountManager.po b/plugins/AccountManager/locale/ja/LC_MESSAGES/AccountManager.po
new file mode 100644
index 0000000000..6309e10561
--- /dev/null
+++ b/plugins/AccountManager/locale/ja/LC_MESSAGES/AccountManager.po
@@ -0,0 +1,27 @@
+# Translation of StatusNet - AccountManager to Japanese (日本語)
+# Exported from translatewiki.net
+#
+# Author: Miwa ka
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - AccountManager\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:27+0000\n"
+"Language-Team: Japanese <https://translatewiki.net/wiki/Portal:ja>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-08-30 10:01:05+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: ja\n"
+"X-Message-Group: #out-statusnet-plugin-accountmanager\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#. TRANS: Plugin description.
+msgid ""
+"The Account Manager plugin implements the Account Manager specification."
+msgstr "Account Manager プラグイン��アカウント管��仕様を実装�����"
diff --git a/plugins/AccountManager/locale/mk/LC_MESSAGES/AccountManager.po b/plugins/AccountManager/locale/mk/LC_MESSAGES/AccountManager.po
index a11511338d..6c3a28a6f3 100644
--- a/plugins/AccountManager/locale/mk/LC_MESSAGES/AccountManager.po
+++ b/plugins/AccountManager/locale/mk/LC_MESSAGES/AccountManager.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - AccountManager to Macedonian (Македон�ки)
+# Translation of StatusNet - AccountManager to Macedonian (македон�ки)
 # Exported from translatewiki.net
 #
 # Author: Bjankuloski06
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - AccountManager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:31+0000\n"
-"Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:28+0000\n"
+"Language-Team: Macedonian <https://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-09 18:55:57+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-08-30 10:01:05+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-accountmanager\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
diff --git a/plugins/AccountManager/locale/ms/LC_MESSAGES/AccountManager.po b/plugins/AccountManager/locale/ms/LC_MESSAGES/AccountManager.po
new file mode 100644
index 0000000000..1a0e037f67
--- /dev/null
+++ b/plugins/AccountManager/locale/ms/LC_MESSAGES/AccountManager.po
@@ -0,0 +1,27 @@
+# Translation of StatusNet - AccountManager to Malay (Bahasa Melayu)
+# Exported from translatewiki.net
+#
+# Author: Anakmalaysia
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - AccountManager\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:28+0000\n"
+"Language-Team: Malay <https://translatewiki.net/wiki/Portal:ms>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-08-30 10:01:05+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: ms\n"
+"X-Message-Group: #out-statusnet-plugin-accountmanager\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#. TRANS: Plugin description.
+msgid ""
+"The Account Manager plugin implements the Account Manager specification."
+msgstr "Pemalam Pengurus Akaun melaksanakan spesifikasi Pengurus Akaun."
diff --git a/plugins/AccountManager/locale/nl/LC_MESSAGES/AccountManager.po b/plugins/AccountManager/locale/nl/LC_MESSAGES/AccountManager.po
index 2cba5559d2..71c41faae5 100644
--- a/plugins/AccountManager/locale/nl/LC_MESSAGES/AccountManager.po
+++ b/plugins/AccountManager/locale/nl/LC_MESSAGES/AccountManager.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - AccountManager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:31+0000\n"
-"Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:28+0000\n"
+"Language-Team: Dutch <https://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-09 18:55:57+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-08-30 10:01:05+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-accountmanager\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/AccountManager/locale/pl/LC_MESSAGES/AccountManager.po b/plugins/AccountManager/locale/pl/LC_MESSAGES/AccountManager.po
new file mode 100644
index 0000000000..0a0d58318e
--- /dev/null
+++ b/plugins/AccountManager/locale/pl/LC_MESSAGES/AccountManager.po
@@ -0,0 +1,25 @@
+# Translation of StatusNet - AccountManager to Polish (polski)
+# Exported from translatewiki.net
+#
+# Author: BeginaFelicysym
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - AccountManager\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:28+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-08-30 10:01:05+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=3; plural=(n == 1) ? 0 : ( (n%10 >= 2 && n%10 <= 4 && "
+"(n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
+
+#. TRANS: Plugin description.
+msgid ""
+"The Account Manager plugin implements the Account Manager specification."
+msgstr "Wtyczka menedżer kont implementuje specyfikację menedżera kont."
diff --git a/plugins/AccountManager/locale/pt/LC_MESSAGES/AccountManager.po b/plugins/AccountManager/locale/pt/LC_MESSAGES/AccountManager.po
index 3d6d0dbae5..a4a4d9c79b 100644
--- a/plugins/AccountManager/locale/pt/LC_MESSAGES/AccountManager.po
+++ b/plugins/AccountManager/locale/pt/LC_MESSAGES/AccountManager.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - AccountManager to Portuguese (Português)
+# Translation of StatusNet - AccountManager to Portuguese (português)
 # Exported from translatewiki.net
 #
 # Author: SandroHc
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - AccountManager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:31+0000\n"
-"Language-Team: Portuguese <http://translatewiki.net/wiki/Portal:pt>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:28+0000\n"
+"Language-Team: Portuguese <https://translatewiki.net/wiki/Portal:pt>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-09 18:55:57+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-08-30 10:01:05+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: pt\n"
 "X-Message-Group: #out-statusnet-plugin-accountmanager\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/AccountManager/locale/ru/LC_MESSAGES/AccountManager.po b/plugins/AccountManager/locale/ru/LC_MESSAGES/AccountManager.po
index 57a48d062d..e0a963f862 100644
--- a/plugins/AccountManager/locale/ru/LC_MESSAGES/AccountManager.po
+++ b/plugins/AccountManager/locale/ru/LC_MESSAGES/AccountManager.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - AccountManager to Russian (Ру��кий)
+# Translation of StatusNet - AccountManager to Russian (ру��кий)
 # Exported from translatewiki.net
 #
 # Author: �лек�андр Сигачёв
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - AccountManager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:31+0000\n"
-"Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:28+0000\n"
+"Language-Team: Russian <https://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-09 18:55:57+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-08-30 10:01:05+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-accountmanager\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
diff --git a/plugins/AccountManager/locale/tl/LC_MESSAGES/AccountManager.po b/plugins/AccountManager/locale/tl/LC_MESSAGES/AccountManager.po
index 24471f187d..c190cef4f2 100644
--- a/plugins/AccountManager/locale/tl/LC_MESSAGES/AccountManager.po
+++ b/plugins/AccountManager/locale/tl/LC_MESSAGES/AccountManager.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - AccountManager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:31+0000\n"
-"Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:28+0000\n"
+"Language-Team: Tagalog <https://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-09 18:55:57+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-08-30 10:01:05+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-accountmanager\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/AccountManager/locale/uk/LC_MESSAGES/AccountManager.po b/plugins/AccountManager/locale/uk/LC_MESSAGES/AccountManager.po
index f2f79c7dea..a70bf28a2e 100644
--- a/plugins/AccountManager/locale/uk/LC_MESSAGES/AccountManager.po
+++ b/plugins/AccountManager/locale/uk/LC_MESSAGES/AccountManager.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - AccountManager to Ukrainian (Україн�ька)
+# Translation of StatusNet - AccountManager to Ukrainian (україн�ька)
 # Exported from translatewiki.net
 #
 # Author: Boogie
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - AccountManager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:31+0000\n"
-"Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:28+0000\n"
+"Language-Team: Ukrainian <https://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-09 18:55:57+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-08-30 10:01:05+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-accountmanager\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
diff --git a/plugins/Activity/ActivityPlugin.php b/plugins/Activity/ActivityPlugin.php
new file mode 100644
index 0000000000..aa718d079e
--- /dev/null
+++ b/plugins/Activity/ActivityPlugin.php
@@ -0,0 +1,430 @@
+<?php
+/**
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2010, StatusNet, Inc.
+ *
+ * Shows social activities in the output feed
+ *
+ * PHP version 5
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Activity
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2010 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    // This check helps protect against security problems;
+    // your code file can't be executed directly from the web.
+    exit(1);
+}
+
+/**
+ * Activity plugin main class
+ *
+ * @category  Activity
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2010 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+class ActivityPlugin extends Plugin
+{
+    const VERSION = '0.1';
+    const SOURCE  = 'activity';
+
+    // Flags to switch off certain activity notices
+    public $StartFollowUser = true;
+    public $StopFollowUser  = false;
+    public $JoinGroup = true;
+    public $LeaveGroup = false;
+    public $StartLike = false;
+    public $StopLike = false;
+
+    function onAutoload($cls)
+    {
+        $dir = dirname(__FILE__);
+
+        switch ($cls)
+        {
+        case 'JoinListItem':
+        case 'LeaveListItem':
+        case 'FollowListItem':
+        case 'UnfollowListItem':
+        case 'SystemListItem':
+            include_once $dir . '/'.strtolower($cls).'.php';
+            return false;
+        default:
+            return true;
+        }
+    }
+
+    function onEndSubscribe($subscriber, $other)
+    {
+        // Only do this if config is enabled
+        if(!$this->StartFollowUser) return true;
+        $user = $subscriber->getUser();
+        if (!empty($user)) {
+            $sub = Subscription::pkeyGet(array('subscriber' => $subscriber->id,
+                                               'subscribed' => $other->id));
+            // TRANS: Text for "started following" item in activity plugin.
+            // TRANS: %1$s is a profile URL, %2$s is a profile name,
+            // TRANS: %3$s is a profile URL, %4$s is a profile name.
+            $rendered = sprintf(_m('<a href="%1$s">%2$s</a> started following <a href="%3$s">%4$s</a>.'),
+                                $subscriber->profileurl,
+                                $subscriber->getBestName(),
+                                $other->profileurl,
+                                $other->getBestName());
+            // TRANS: Text for "started following" item in activity plugin.
+            // TRANS: %1$s is a profile name, %2$s is a profile URL,
+            // TRANS: %3$s is a profile name, %4$s is a profile URL.
+            $content  = sprintf(_m('%1$s (%2$s) started following %3$s (%4$s).'),
+                                $subscriber->getBestName(),
+                                $subscriber->profileurl,
+                                $other->getBestName(),
+                                $other->profileurl);
+
+            $notice = Notice::saveNew($user->id,
+                                      $content,
+                                      ActivityPlugin::SOURCE,
+                                      array('rendered' => $rendered,
+                                            'urls' => array(),
+                                            'replies' => array($other->getUri()),
+                                            'verb' => ActivityVerb::FOLLOW,
+                                            'object_type' => ActivityObject::PERSON,
+                                            'uri' => $sub->uri));
+        }
+        return true;
+    }
+
+    function onEndUnsubscribe($subscriber, $other)
+    {
+        // Only do this if config is enabled
+        if(!$this->StopFollowUser) return true;
+        $user = $subscriber->getUser();
+        if (!empty($user)) {
+            // TRANS: Text for "stopped following" item in activity plugin.
+            // TRANS: %1$s is a profile URL, %2$s is a profile name,
+            // TRANS: %3$s is a profile URL, %4$s is a profile name.
+            $rendered = sprintf(_m('<a href="%1$s">%2$s</a> stopped following <a href="%3$s">%4$s</a>.'),
+                                $subscriber->profileurl,
+                                $subscriber->getBestName(),
+                                $other->profileurl,
+                                $other->getBestName());
+            // TRANS: Text for "stopped following" item in activity plugin.
+            // TRANS: %1$s is a profile name, %2$s is a profile URL,
+            // TRANS: %3$s is a profile name, %4$s is a profile URL.
+            $content  = sprintf(_m('%1$s (%2$s) stopped following %3$s (%4$s).'),
+                                $subscriber->getBestName(),
+                                $subscriber->profileurl,
+                                $other->getBestName(),
+                                $other->profileurl);
+
+            $uri = TagURI::mint('stop-following:%d:%d:%s',
+                                $subscriber->id,
+                                $other->id,
+                                common_date_iso8601(common_sql_now()));
+
+            $notice = Notice::saveNew($user->id,
+                                      $content,
+                                      ActivityPlugin::SOURCE,
+                                      array('rendered' => $rendered,
+                                            'urls' => array(),
+                                            'replies' => array($other->getUri()),
+                                            'uri' => $uri,
+                                            'verb' => ActivityVerb::UNFOLLOW,
+                                            'object_type' => ActivityObject::PERSON));
+        }
+        return true;
+    }
+
+    function onEndFavorNotice($profile, $notice)
+    {
+        //  Only do this if config is enabled
+        if(!$this->StartLike) return true;
+
+        $user = $profile->getUser();
+
+        if (!empty($user)) {
+
+            $author = $notice->getProfile();
+            $fave   = Fave::pkeyGet(array('user_id' => $user->id,
+                                          'notice_id' => $notice->id));
+
+            // TRANS: Text for "liked" item in activity plugin.
+            // TRANS: %1$s is a profile URL, %2$s is a profile name,
+            // TRANS: %3$s is a notice URL, %4$s is an author name.
+            $rendered = sprintf(_m('<a href="%1$s">%2$s</a> liked <a href="%3$s">%4$s\'s update</a>.'),
+                                $profile->profileurl,
+                                $profile->getBestName(),
+                                $notice->bestUrl(),
+                                $author->getBestName());
+            // TRANS: Text for "liked" item in activity plugin.
+            // TRANS: %1$s is a profile name, %2$s is a profile URL,
+            // TRANS: %3$s is an author name, %4$s is a notice URL.
+            $content  = sprintf(_m('%1$s (%2$s) liked %3$s\'s status (%4$s).'),
+                                $profile->getBestName(),
+                                $profile->profileurl,
+                                $author->getBestName(),
+                                $notice->bestUrl());
+
+            $notice = Notice::saveNew($user->id,
+                                      $content,
+                                      ActivityPlugin::SOURCE,
+                                      array('rendered' => $rendered,
+                                            'urls' => array(),
+                                            'replies' => array($author->getUri()),
+                                            'uri' => $fave->getURI(),
+                                            'verb' => ActivityVerb::FAVORITE,
+                                            'object_type' => (($notice->verb == ActivityVerb::POST) ?
+                                                             $notice->object_type : ActivityObject::ACTIVITY)));
+        }
+        return true;
+    }
+
+    function onEndDisfavorNotice($profile, $notice)
+    {
+        // Only do this if config is enabled
+        if(!$this->StopLike) return true;
+        $user = User::staticGet('id', $profile->id);
+
+        if (!empty($user)) {
+            $author = Profile::staticGet('id', $notice->profile_id);
+            // TRANS: Text for "stopped liking" item in activity plugin.
+            // TRANS: %1$s is a profile URL, %2$s is a profile name,
+            // TRANS: %3$s is a notice URL, %4$s is an author name.
+            $rendered = sprintf(_m('<a href="%1$s">%2$s</a> stopped liking <a href="%3$s">%4$s\'s update</a>.'),
+                                $profile->profileurl,
+                                $profile->getBestName(),
+                                $notice->bestUrl(),
+                                $author->getBestName());
+            // TRANS: Text for "stopped liking" item in activity plugin.
+            // TRANS: %1$s is a profile name, %2$s is a profile URL,
+            // TRANS: %3$s is an author name, %4$s is a notice URL.
+            $content  = sprintf(_m('%1$s (%2$s) stopped liking %3$s\'s status (%4$s).'),
+                                $profile->getBestName(),
+                                $profile->profileurl,
+                                $author->getBestName(),
+                                $notice->bestUrl());
+
+            $uri = TagURI::mint('unlike:%d:%d:%s',
+                                $profile->id,
+                                $notice->id,
+                                common_date_iso8601(common_sql_now()));
+
+            $notice = Notice::saveNew($user->id,
+                                      $content,
+                                      ActivityPlugin::SOURCE,
+                                      array('rendered' => $rendered,
+                                            'urls' => array(),
+                                            'replies' => array($author->getUri()),
+                                            'uri' => $uri,
+                                            'verb' => ActivityVerb::UNFAVORITE,
+                                            'object_type' => (($notice->verb == ActivityVerb::POST) ?
+                                                             $notice->object_type : ActivityObject::ACTIVITY)));
+        }
+        return true;
+    }
+
+    function onEndJoinGroup($group, $profile)
+    {
+        // Only do this if config is enabled
+        if(!$this->JoinGroup) return true;
+
+        $user = $profile->getUser();
+
+        if (empty($user)) {
+            return true;
+        }
+
+        // TRANS: Text for "joined group" item in activity plugin.
+        // TRANS: %1$s is a profile URL, %2$s is a profile name,
+        // TRANS: %3$s is a group URL, %4$s is a group name.
+        $rendered = sprintf(_m('<a href="%1$s">%2$s</a> joined the group <a href="%3$s">%4$s</a>.'),
+                            $profile->profileurl,
+                            $profile->getBestName(),
+                            $group->homeUrl(),
+                            $group->getBestName());
+        // TRANS: Text for "joined group" item in activity plugin.
+        // TRANS: %1$s is a profile name, %2$s is a profile URL,
+        // TRANS: %3$s is a group name, %4$s is a group URL.
+        $content  = sprintf(_m('%1$s (%2$s) joined the group %3$s (%4$s).'),
+                            $profile->getBestName(),
+                            $profile->profileurl,
+                            $group->getBestName(),
+                            $group->homeUrl());
+
+        $mem = Group_member::pkeyGet(array('group_id' => $group->id,
+                                           'profile_id' => $profile->id));
+
+        $notice = Notice::saveNew($user->id,
+                                  $content,
+                                  ActivityPlugin::SOURCE,
+                                  array('rendered' => $rendered,
+                                        'urls' => array(),
+                                        'groups' => array($group->id),
+                                        'uri' => $mem->getURI(),
+                                        'verb' => ActivityVerb::JOIN,
+                                        'object_type' => ActivityObject::GROUP));
+        return true;
+    }
+
+    function onEndLeaveGroup($group, $profile)
+    {
+        // Only do this if config is enabled
+        if(!$this->LeaveGroup) return true;
+
+        $user = $profile->getUser();
+
+        if (empty($user)) {
+            return true;
+        }
+
+        // TRANS: Text for "left group" item in activity plugin.
+        // TRANS: %1$s is a profile URL, %2$s is a profile name,
+        // TRANS: %3$s is a group URL, %4$s is a group name.
+        $rendered = sprintf(_m('<a href="%1$s">%2$s</a> left the group <a href="%3$s">%4$s</a>.'),
+                            $profile->profileurl,
+                            $profile->getBestName(),
+                            $group->homeUrl(),
+                            $group->getBestName());
+        // TRANS: Text for "left group" item in activity plugin.
+        // TRANS: %1$s is a profile name, %2$s is a profile URL,
+        // TRANS: %3$s is a group name, %4$s is a group URL.
+        $content  = sprintf(_m('%1$s (%2$s) left the group %3$s (%4$s).'),
+                            $profile->getBestName(),
+                            $profile->profileurl,
+                            $group->getBestName(),
+                            $group->homeUrl());
+
+        $uri = TagURI::mint('leave:%d:%d:%s',
+                            $user->id,
+                            $group->id,
+                            common_date_iso8601(common_sql_now()));
+
+        $notice = Notice::saveNew($user->id,
+                                  $content,
+                                  ActivityPlugin::SOURCE,
+                                  array('rendered' => $rendered,
+                                        'urls' => array(),
+                                        'groups' => array($group->id),
+                                        'uri' => $uri,
+                                        'verb' => ActivityVerb::LEAVE,
+                                        'object_type' => ActivityObject::GROUP));
+        return true;
+    }
+
+    function onStartShowNoticeItem($nli)
+    {
+        $notice = $nli->notice;
+
+        $adapter = null;
+
+        switch ($notice->verb) {
+        case ActivityVerb::FAVORITE:
+        case ActivityVerb::UNFAVORITE:
+            $adapter = new SystemListItem($nli);
+            break;
+        case ActivityVerb::JOIN:
+            $adapter = new JoinListItem($nli);
+            break;
+        case ActivityVerb::LEAVE:
+            $adapter = new JoinListItem($nli);
+            break;
+        case ActivityVerb::FOLLOW:
+            $adapter = new FollowListItem($nli);
+            break;
+        case ActivityVerb::UNFOLLOW:
+            $adapter = new UnfollowListItem($nli);
+            break;
+        }
+
+        if (!empty($adapter)) {
+            $adapter->showNotice();
+            $adapter->showNoticeAttachments();
+            $adapter->showNoticeInfo();
+            $adapter->showNoticeOptions();
+            return false;
+        }
+
+        return true;
+    }
+
+    function onEndNoticeAsActivity($notice, &$activity)
+    {
+        switch ($notice->verb) {
+        case ActivityVerb::FAVORITE:
+            $fave = Fave::staticGet('uri', $notice->uri);
+            if (!empty($fave)) {
+                $notice = Notice::staticGet('id', $fave->notice_id);
+                if (!empty($notice)) {
+                    $cur = common_current_user();
+                    $target = $notice->asActivity($cur);
+                    if ($target->verb == ActivityVerb::POST) {
+                        // "I like the thing you posted"
+                        $activity->objects = $target->objects;
+                    } else {
+                        // "I like that you did whatever you did"
+                        $activity->objects = array($target);
+                    }
+                }
+            }
+            break;
+        case ActivityVerb::UNFAVORITE:
+            // FIXME: do something here
+            break;
+        case ActivityVerb::JOIN:
+            $mem = Group_member::staticGet('uri', $notice->uri);
+            if (!empty($mem)) {
+                $group = $mem->getGroup();
+                $activity->objects = array(ActivityObject::fromGroup($group));
+            }
+            break;
+        case ActivityVerb::LEAVE:
+            // FIXME: ????
+            break;
+        case ActivityVerb::FOLLOW:
+            $sub = Subscription::staticGet('uri', $notice->uri);
+            if (!empty($sub)) {
+                $profile = Profile::staticGet('id', $sub->subscribed);
+                if (!empty($profile)) {
+                    $activity->objects = array(ActivityObject::fromProfile($profile));
+                }
+            }
+            break;
+        case ActivityVerb::UNFOLLOW:
+            // FIXME: ????
+            break;
+        }
+
+        return true;
+    }
+
+    function onPluginVersion(&$versions)
+    {
+        $versions[] = array('name' => 'Activity',
+                            'version' => self::VERSION,
+                            'author' => 'Evan Prodromou',
+                            'homepage' => 'http://status.net/wiki/Plugin:Activity',
+                            'rawdescription' =>
+                            // TRANS: Plugin description.
+                            _m('Emits notices when social activities happen.'));
+        return true;
+    }
+}
diff --git a/plugins/Activity/followlistitem.php b/plugins/Activity/followlistitem.php
new file mode 100644
index 0000000000..d8b9819cab
--- /dev/null
+++ b/plugins/Activity/followlistitem.php
@@ -0,0 +1,49 @@
+<?php
+/**
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2011, StatusNet, Inc.
+ *
+ * Title of module
+ *
+ * PHP version 5
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Cache
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2011 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    // This check helps protect against security problems;
+    // your code file can't be executed directly from the web.
+    exit(1);
+}
+
+/**
+ * NoticeListItemAdapter for join activities
+ *
+ * @category  General
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2011 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+class FollowListItem extends SystemListItem
+{
+}
diff --git a/plugins/Activity/joinlistitem.php b/plugins/Activity/joinlistitem.php
new file mode 100644
index 0000000000..c795225ef8
--- /dev/null
+++ b/plugins/Activity/joinlistitem.php
@@ -0,0 +1,75 @@
+<?php
+/**
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2011, StatusNet, Inc.
+ *
+ * List item for when you join a group
+ *
+ * PHP version 5
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Cache
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2011 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    // This check helps protect against security problems;
+    // your code file can't be executed directly from the web.
+    exit(1);
+}
+
+/**
+ * NoticeListItemAdapter for join activities
+ *
+ * @category  General
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2011 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+class JoinListItem extends SystemListItem
+{
+    function showContent()
+    {
+        $notice = $this->nli->notice;
+        $out    = $this->nli->out;
+
+        $mem = Group_member::staticGet('uri', $notice->uri);
+
+        if (!empty($mem)) {
+            $out->elementStart('div', 'join-activity');
+            $profile = $mem->getMember();
+            $group = $mem->getGroup();
+
+            // TRANS: Text for "joined list" item in activity plugin.
+            // TRANS: %1$s is a profile URL, %2$s is a profile name,
+            // TRANS: %3$s is a group home URL, %4$s is a group name.
+            $out->raw(sprintf(_m('<a href="%1$s">%2$s</a> joined the group <a href="%3$s">%4$s</a>.'),
+                                $profile->profileurl,
+                                $profile->getBestName(),
+                                $group->homeUrl(),
+                                $group->getBestName()));
+
+            $out->elementEnd('div');
+        } else {
+            parent::showContent();
+        }
+    }
+}
diff --git a/plugins/Activity/leavelistitem.php b/plugins/Activity/leavelistitem.php
new file mode 100644
index 0000000000..8448d703d8
--- /dev/null
+++ b/plugins/Activity/leavelistitem.php
@@ -0,0 +1,49 @@
+<?php
+/**
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2011, StatusNet, Inc.
+ *
+ * List item for when you leave a group
+ *
+ * PHP version 5
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Cache
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2011 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    // This check helps protect against security problems;
+    // your code file can't be executed directly from the web.
+    exit(1);
+}
+
+/**
+ * NoticeListItemAdapter for leave activities
+ *
+ * @category  General
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2011 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+class LeaveListItem extends SystemListItem
+{
+}
diff --git a/plugins/Activity/locale/Activity.pot b/plugins/Activity/locale/Activity.pot
new file mode 100644
index 0000000000..c48c24d4d4
--- /dev/null
+++ b/plugins/Activity/locale/Activity.pot
@@ -0,0 +1,122 @@
+# 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: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. TRANS: Text for "joined list" item in activity plugin.
+#. TRANS: %1$s is a profile URL, %2$s is a profile name,
+#. TRANS: %3$s is a group home URL, %4$s is a group name.
+#. TRANS: Text for "joined group" item in activity plugin.
+#. TRANS: %1$s is a profile URL, %2$s is a profile name,
+#. TRANS: %3$s is a group URL, %4$s is a group name.
+#: joinlistitem.php:64 ActivityPlugin.php:259
+#, php-format
+msgid "<a href=\"%1$s\">%2$s</a> joined the group <a href=\"%3$s\">%4$s</a>."
+msgstr ""
+
+#. TRANS: Text for "started following" item in activity plugin.
+#. TRANS: %1$s is a profile URL, %2$s is a profile name,
+#. TRANS: %3$s is a profile URL, %4$s is a profile name.
+#: ActivityPlugin.php:89
+#, php-format
+msgid "<a href=\"%1$s\">%2$s</a> started following <a href=\"%3$s\">%4$s</a>."
+msgstr ""
+
+#. TRANS: Text for "started following" item in activity plugin.
+#. TRANS: %1$s is a profile name, %2$s is a profile URL,
+#. TRANS: %3$s is a profile name, %4$s is a profile URL.
+#: ActivityPlugin.php:97
+#, php-format
+msgid "%1$s (%2$s) started following %3$s (%4$s)."
+msgstr ""
+
+#. TRANS: Text for "stopped following" item in activity plugin.
+#. TRANS: %1$s is a profile URL, %2$s is a profile name,
+#. TRANS: %3$s is a profile URL, %4$s is a profile name.
+#: ActivityPlugin.php:125
+#, php-format
+msgid "<a href=\"%1$s\">%2$s</a> stopped following <a href=\"%3$s\">%4$s</a>."
+msgstr ""
+
+#. TRANS: Text for "stopped following" item in activity plugin.
+#. TRANS: %1$s is a profile name, %2$s is a profile URL,
+#. TRANS: %3$s is a profile name, %4$s is a profile URL.
+#: ActivityPlugin.php:133
+#, php-format
+msgid "%1$s (%2$s) stopped following %3$s (%4$s)."
+msgstr ""
+
+#. TRANS: Text for "liked" item in activity plugin.
+#. TRANS: %1$s is a profile URL, %2$s is a profile name,
+#. TRANS: %3$s is a notice URL, %4$s is an author name.
+#: ActivityPlugin.php:173
+#, php-format
+msgid "<a href=\"%1$s\">%2$s</a> liked <a href=\"%3$s\">%4$s's update</a>."
+msgstr ""
+
+#. TRANS: Text for "liked" item in activity plugin.
+#. TRANS: %1$s is a profile name, %2$s is a profile URL,
+#. TRANS: %3$s is an author name, %4$s is a notice URL.
+#: ActivityPlugin.php:181
+#, php-format
+msgid "%1$s (%2$s) liked %3$s's status (%4$s)."
+msgstr ""
+
+#. TRANS: Text for "stopped liking" item in activity plugin.
+#. TRANS: %1$s is a profile URL, %2$s is a profile name,
+#. TRANS: %3$s is a notice URL, %4$s is an author name.
+#: ActivityPlugin.php:212
+#, php-format
+msgid ""
+"<a href=\"%1$s\">%2$s</a> stopped liking <a href=\"%3$s\">%4$s's update</a>."
+msgstr ""
+
+#. TRANS: Text for "stopped liking" item in activity plugin.
+#. TRANS: %1$s is a profile name, %2$s is a profile URL,
+#. TRANS: %3$s is an author name, %4$s is a notice URL.
+#: ActivityPlugin.php:220
+#, php-format
+msgid "%1$s (%2$s) stopped liking %3$s's status (%4$s)."
+msgstr ""
+
+#. TRANS: Text for "joined group" item in activity plugin.
+#. TRANS: %1$s is a profile name, %2$s is a profile URL,
+#. TRANS: %3$s is a group name, %4$s is a group URL.
+#: ActivityPlugin.php:267
+#, php-format
+msgid "%1$s (%2$s) joined the group %3$s (%4$s)."
+msgstr ""
+
+#. TRANS: Text for "left group" item in activity plugin.
+#. TRANS: %1$s is a profile URL, %2$s is a profile name,
+#. TRANS: %3$s is a group URL, %4$s is a group name.
+#: ActivityPlugin.php:302
+#, php-format
+msgid "<a href=\"%1$s\">%2$s</a> left the group <a href=\"%3$s\">%4$s</a>."
+msgstr ""
+
+#. TRANS: Text for "left group" item in activity plugin.
+#. TRANS: %1$s is a profile name, %2$s is a profile URL,
+#. TRANS: %3$s is a group name, %4$s is a group URL.
+#: ActivityPlugin.php:310
+#, php-format
+msgid "%1$s (%2$s) left the group %3$s (%4$s)."
+msgstr ""
+
+#. TRANS: Plugin description.
+#: ActivityPlugin.php:427
+msgid "Emits notices when social activities happen."
+msgstr ""
diff --git a/plugins/Activity/locale/ar/LC_MESSAGES/Activity.po b/plugins/Activity/locale/ar/LC_MESSAGES/Activity.po
new file mode 100644
index 0000000000..24fc8b18ad
--- /dev/null
+++ b/plugins/Activity/locale/ar/LC_MESSAGES/Activity.po
@@ -0,0 +1,118 @@
+# Translation of StatusNet - Activity to Arabic (العربية)
+# Exported from translatewiki.net
+#
+# Author: DRIHEM
+# Author: OsamaK
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Activity\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:28+0000\n"
+"Language-Team: Arabic <https://translatewiki.net/wiki/Portal:ar>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2012-01-30 18:15:05+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: ar\n"
+"X-Message-Group: #out-statusnet-plugin-activity\n"
+"Plural-Forms: nplurals=6; plural=(n == 0) ? 0 : ( (n == 1) ? 1 : ( (n == "
+"2) ? 2 : ( (n%100 >= 3 && n%100 <= 10) ? 3 : ( (n%100 >= 11 && n%100 <= "
+"99) ? 4 : 5 ) ) ) );\n"
+
+#. TRANS: Text for "joined list" item in activity plugin.
+#. TRANS: %1$s is a profile URL, %2$s is a profile name,
+#. TRANS: %3$s is a group home URL, %4$s is a group name.
+#. TRANS: Text for "joined group" item in activity plugin.
+#. TRANS: %1$s is a profile URL, %2$s is a profile name,
+#. TRANS: %3$s is a group URL, %4$s is a group name.
+#, php-format
+msgid "<a href=\"%1$s\">%2$s</a> joined the group <a href=\"%3$s\">%4$s</a>."
+msgstr "<a href=\"%1$s\">%2$s</a> انضم لمجموعة <a href=\"%3$s\">%4$s</a>."
+
+#. TRANS: Text for "started following" item in activity plugin.
+#. TRANS: %1$s is a profile URL, %2$s is a profile name,
+#. TRANS: %3$s is a profile URL, %4$s is a profile name.
+#, php-format
+msgid "<a href=\"%1$s\">%2$s</a> started following <a href=\"%3$s\">%4$s</a>."
+msgstr "<a href=\"%1$s\">%2$s</a> بدأ متابعة <a href=\"%3$s\">%4$s</a>."
+
+#. TRANS: Text for "started following" item in activity plugin.
+#. TRANS: %1$s is a profile name, %2$s is a profile URL,
+#. TRANS: %3$s is a profile name, %4$s is a profile URL.
+#, php-format
+msgid "%1$s (%2$s) started following %3$s (%4$s)."
+msgstr "%1$s (%2$s) بدأ متابعة %3$s (%4$s)."
+
+#. TRANS: Text for "stopped following" item in activity plugin.
+#. TRANS: %1$s is a profile URL, %2$s is a profile name,
+#. TRANS: %3$s is a profile URL, %4$s is a profile name.
+#, php-format
+msgid "<a href=\"%1$s\">%2$s</a> stopped following <a href=\"%3$s\">%4$s</a>."
+msgstr "<a href=\"%1$s\">%2$s</a> توق� عن متابعة <a href=\"%3$s\">%4$s</a>."
+
+#. TRANS: Text for "stopped following" item in activity plugin.
+#. TRANS: %1$s is a profile name, %2$s is a profile URL,
+#. TRANS: %3$s is a profile name, %4$s is a profile URL.
+#, php-format
+msgid "%1$s (%2$s) stopped following %3$s (%4$s)."
+msgstr "%1$s (%2$s) توق� عن متابعة %3$s (%4$s)."
+
+#. TRANS: Text for "liked" item in activity plugin.
+#. TRANS: %1$s is a profile URL, %2$s is a profile name,
+#. TRANS: %3$s is a notice URL, %4$s is an author name.
+#, php-format
+msgid "<a href=\"%1$s\">%2$s</a> liked <a href=\"%3$s\">%4$s's update</a>."
+msgstr "<a href=\"%1$s\">%2$s</a> أعجبه <a href=\"%3$s\">مستجد %4$s</a>."
+
+#. TRANS: Text for "liked" item in activity plugin.
+#. TRANS: %1$s is a profile name, %2$s is a profile URL,
+#. TRANS: %3$s is an author name, %4$s is a notice URL.
+#, php-format
+msgid "%1$s (%2$s) liked %3$s's status (%4$s)."
+msgstr "%1$s (%2$s) أعجبته حالة %3$s (%4$s)."
+
+#. TRANS: Text for "stopped liking" item in activity plugin.
+#. TRANS: %1$s is a profile URL, %2$s is a profile name,
+#. TRANS: %3$s is a notice URL, %4$s is an author name.
+#, php-format
+msgid ""
+"<a href=\"%1$s\">%2$s</a> stopped liking <a href=\"%3$s\">%4$s's update</a>."
+msgstr ""
+"<a href=\"%1$s\">%2$s</a> لم يعد يعجبه <a href=\"%3$s\">مستجد %4$s</a>."
+
+#. TRANS: Text for "stopped liking" item in activity plugin.
+#. TRANS: %1$s is a profile name, %2$s is a profile URL,
+#. TRANS: %3$s is an author name, %4$s is a notice URL.
+#, php-format
+msgid "%1$s (%2$s) stopped liking %3$s's status (%4$s)."
+msgstr "%1$s (%2$s) لم تعد تعجبه حالة %3$s (%4$s)."
+
+#. TRANS: Text for "joined group" item in activity plugin.
+#. TRANS: %1$s is a profile name, %2$s is a profile URL,
+#. TRANS: %3$s is a group name, %4$s is a group URL.
+#, php-format
+msgid "%1$s (%2$s) joined the group %3$s (%4$s)."
+msgstr "%1$s (%2$s) انضم لمجموعة %3$s (%4$s)."
+
+#. TRANS: Text for "left group" item in activity plugin.
+#. TRANS: %1$s is a profile URL, %2$s is a profile name,
+#. TRANS: %3$s is a group URL, %4$s is a group name.
+#, php-format
+msgid "<a href=\"%1$s\">%2$s</a> left the group <a href=\"%3$s\">%4$s</a>."
+msgstr "<a href=\"%1$s\">%2$s</a> غادر مجموعة <a href=\"%3$s\">%4$s</a>."
+
+#. TRANS: Text for "left group" item in activity plugin.
+#. TRANS: %1$s is a profile name, %2$s is a profile URL,
+#. TRANS: %3$s is a group name, %4$s is a group URL.
+#, php-format
+msgid "%1$s (%2$s) left the group %3$s (%4$s)."
+msgstr "%1$s (%2$s) غادر مجموعة %3$s (%4$s)."
+
+#. TRANS: Plugin description.
+msgid "Emits notices when social activities happen."
+msgstr "يرسل إشعارات عند حدوث أنشطة إجتماعية."
diff --git a/plugins/Activity/locale/ca/LC_MESSAGES/Activity.po b/plugins/Activity/locale/ca/LC_MESSAGES/Activity.po
new file mode 100644
index 0000000000..f0c5db72c6
--- /dev/null
+++ b/plugins/Activity/locale/ca/LC_MESSAGES/Activity.po
@@ -0,0 +1,120 @@
+# Translation of StatusNet - Activity to Catalan (català)
+# Exported from translatewiki.net
+#
+# Author: Toniher
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Activity\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:28+0000\n"
+"Language-Team: Catalan <https://translatewiki.net/wiki/Portal:ca>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2012-01-30 18:15:05+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: ca\n"
+"X-Message-Group: #out-statusnet-plugin-activity\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Text for "joined list" item in activity plugin.
+#. TRANS: %1$s is a profile URL, %2$s is a profile name,
+#. TRANS: %3$s is a group home URL, %4$s is a group name.
+#. TRANS: Text for "joined group" item in activity plugin.
+#. TRANS: %1$s is a profile URL, %2$s is a profile name,
+#. TRANS: %3$s is a group URL, %4$s is a group name.
+#, php-format
+msgid "<a href=\"%1$s\">%2$s</a> joined the group <a href=\"%3$s\">%4$s</a>."
+msgstr "<a href=\"%1$s\">%2$s</a> s'ha unit al grup <a href=\"%3$s\">%4$s</a>."
+
+#. TRANS: Text for "started following" item in activity plugin.
+#. TRANS: %1$s is a profile URL, %2$s is a profile name,
+#. TRANS: %3$s is a profile URL, %4$s is a profile name.
+#, php-format
+msgid "<a href=\"%1$s\">%2$s</a> started following <a href=\"%3$s\">%4$s</a>."
+msgstr ""
+"<a href=\"%1$s\">%2$s</a> ha començat a seguir <a href=\"%3$s\">%4$s</a>."
+
+#. TRANS: Text for "started following" item in activity plugin.
+#. TRANS: %1$s is a profile name, %2$s is a profile URL,
+#. TRANS: %3$s is a profile name, %4$s is a profile URL.
+#, php-format
+msgid "%1$s (%2$s) started following %3$s (%4$s)."
+msgstr "%1$s (%2$s) ha començat a seguir %3$s (%4$s)."
+
+#. TRANS: Text for "stopped following" item in activity plugin.
+#. TRANS: %1$s is a profile URL, %2$s is a profile name,
+#. TRANS: %3$s is a profile URL, %4$s is a profile name.
+#, php-format
+msgid "<a href=\"%1$s\">%2$s</a> stopped following <a href=\"%3$s\">%4$s</a>."
+msgstr ""
+"<a href=\"%1$s\">%2$s</a> ha deixat de seguir <a href=\"%3$s\">%4$s</a>."
+
+#. TRANS: Text for "stopped following" item in activity plugin.
+#. TRANS: %1$s is a profile name, %2$s is a profile URL,
+#. TRANS: %3$s is a profile name, %4$s is a profile URL.
+#, php-format
+msgid "%1$s (%2$s) stopped following %3$s (%4$s)."
+msgstr "%1$s (%2$s) ha deixat de seguir %3$s (%4$s)."
+
+#. TRANS: Text for "liked" item in activity plugin.
+#. TRANS: %1$s is a profile URL, %2$s is a profile name,
+#. TRANS: %3$s is a notice URL, %4$s is an author name.
+#, php-format
+msgid "<a href=\"%1$s\">%2$s</a> liked <a href=\"%3$s\">%4$s's update</a>."
+msgstr ""
+"A <a href=\"%1$s\">%2$s</a> li ha agradat l'actualització de <a href=\"%3$s"
+"\">%4$s</a>."
+
+#. TRANS: Text for "liked" item in activity plugin.
+#. TRANS: %1$s is a profile name, %2$s is a profile URL,
+#. TRANS: %3$s is an author name, %4$s is a notice URL.
+#, php-format
+msgid "%1$s (%2$s) liked %3$s's status (%4$s)."
+msgstr "A %1$s (%2$s) li ha agradat l'estat de %3$s (%4$s)."
+
+#. TRANS: Text for "stopped liking" item in activity plugin.
+#. TRANS: %1$s is a profile URL, %2$s is a profile name,
+#. TRANS: %3$s is a notice URL, %4$s is an author name.
+#, php-format
+msgid ""
+"<a href=\"%1$s\">%2$s</a> stopped liking <a href=\"%3$s\">%4$s's update</a>."
+msgstr ""
+"A <a href=\"%1$s\">%2$s</a> li ha deixat d'agradar l'actualització de <a "
+"href=\"%3$s\">%4$s</a>."
+
+#. TRANS: Text for "stopped liking" item in activity plugin.
+#. TRANS: %1$s is a profile name, %2$s is a profile URL,
+#. TRANS: %3$s is an author name, %4$s is a notice URL.
+#, php-format
+msgid "%1$s (%2$s) stopped liking %3$s's status (%4$s)."
+msgstr "A %1$s (%2$s) li ha deixat d'agradar l'estat de %3$s (%4$s)."
+
+#. TRANS: Text for "joined group" item in activity plugin.
+#. TRANS: %1$s is a profile name, %2$s is a profile URL,
+#. TRANS: %3$s is a group name, %4$s is a group URL.
+#, php-format
+msgid "%1$s (%2$s) joined the group %3$s (%4$s)."
+msgstr "%1$s (%2$s) s'ha unit al grup %3$s (%4$s)."
+
+#. TRANS: Text for "left group" item in activity plugin.
+#. TRANS: %1$s is a profile URL, %2$s is a profile name,
+#. TRANS: %3$s is a group URL, %4$s is a group name.
+#, php-format
+msgid "<a href=\"%1$s\">%2$s</a> left the group <a href=\"%3$s\">%4$s</a>."
+msgstr "<a href=\"%1$s\">%2$s</a> ha deixat el grup <a href=\"%3$s\">%4$s</a>."
+
+#. TRANS: Text for "left group" item in activity plugin.
+#. TRANS: %1$s is a profile name, %2$s is a profile URL,
+#. TRANS: %3$s is a group name, %4$s is a group URL.
+#, php-format
+msgid "%1$s (%2$s) left the group %3$s (%4$s)."
+msgstr "%1$s (%2$s) ha deixat el grup %3$s (%4$s)."
+
+#. TRANS: Plugin description.
+msgid "Emits notices when social activities happen."
+msgstr "Emet avisos quan passen activitats socials."
diff --git a/plugins/Activity/locale/de/LC_MESSAGES/Activity.po b/plugins/Activity/locale/de/LC_MESSAGES/Activity.po
new file mode 100644
index 0000000000..c67061a893
--- /dev/null
+++ b/plugins/Activity/locale/de/LC_MESSAGES/Activity.po
@@ -0,0 +1,120 @@
+# Translation of StatusNet - Activity to German (Deutsch)
+# Exported from translatewiki.net
+#
+# Author: Marcel083
+# Author: Tiin
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Activity\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:29+0000\n"
+"Language-Team: German <https://translatewiki.net/wiki/Portal:de>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2012-01-30 18:15:05+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: de\n"
+"X-Message-Group: #out-statusnet-plugin-activity\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Text for "joined list" item in activity plugin.
+#. TRANS: %1$s is a profile URL, %2$s is a profile name,
+#. TRANS: %3$s is a group home URL, %4$s is a group name.
+#. TRANS: Text for "joined group" item in activity plugin.
+#. TRANS: %1$s is a profile URL, %2$s is a profile name,
+#. TRANS: %3$s is a group URL, %4$s is a group name.
+#, php-format
+msgid "<a href=\"%1$s\">%2$s</a> joined the group <a href=\"%3$s\">%4$s</a>."
+msgstr ""
+"<a href=\"%1$s\">%2$s</a> hat die Gruppe <a href=\"%3$s\">%4$s</a> betreten."
+
+#. TRANS: Text for "started following" item in activity plugin.
+#. TRANS: %1$s is a profile URL, %2$s is a profile name,
+#. TRANS: %3$s is a profile URL, %4$s is a profile name.
+#, php-format
+msgid "<a href=\"%1$s\">%2$s</a> started following <a href=\"%3$s\">%4$s</a>."
+msgstr "<a href=\"%1$s\">%2$s</a> folgt jetzt <a href=\"%3$s\">%4$s</a>."
+
+#. TRANS: Text for "started following" item in activity plugin.
+#. TRANS: %1$s is a profile name, %2$s is a profile URL,
+#. TRANS: %3$s is a profile name, %4$s is a profile URL.
+#, php-format
+msgid "%1$s (%2$s) started following %3$s (%4$s)."
+msgstr "%1$s (%2$s) folgt jetzt %3$s (%4$s)."
+
+#. TRANS: Text for "stopped following" item in activity plugin.
+#. TRANS: %1$s is a profile URL, %2$s is a profile name,
+#. TRANS: %3$s is a profile URL, %4$s is a profile name.
+#, php-format
+msgid "<a href=\"%1$s\">%2$s</a> stopped following <a href=\"%3$s\">%4$s</a>."
+msgstr ""
+"<a href=\"%1$s\">%2$s</a> folgt jetzt nicht mehr <a href=\"%3$s\">%4$s</a>."
+
+#. TRANS: Text for "stopped following" item in activity plugin.
+#. TRANS: %1$s is a profile name, %2$s is a profile URL,
+#. TRANS: %3$s is a profile name, %4$s is a profile URL.
+#, php-format
+msgid "%1$s (%2$s) stopped following %3$s (%4$s)."
+msgstr "%1$s (%2$s) folgt jetzt nicht mehr %3$s (%4$s)."
+
+#. TRANS: Text for "liked" item in activity plugin.
+#. TRANS: %1$s is a profile URL, %2$s is a profile name,
+#. TRANS: %3$s is a notice URL, %4$s is an author name.
+#, php-format
+msgid "<a href=\"%1$s\">%2$s</a> liked <a href=\"%3$s\">%4$s's update</a>."
+msgstr "<a href=\"%1$s\">%2$s</a> gefällt <a href=\"%3$s\">%4$s's Post</a>."
+
+#. TRANS: Text for "liked" item in activity plugin.
+#. TRANS: %1$s is a profile name, %2$s is a profile URL,
+#. TRANS: %3$s is an author name, %4$s is a notice URL.
+#, php-format
+msgid "%1$s (%2$s) liked %3$s's status (%4$s)."
+msgstr "%1$s (%2$s) gefällt %3$s's Status (%4$s)."
+
+#. TRANS: Text for "stopped liking" item in activity plugin.
+#. TRANS: %1$s is a profile URL, %2$s is a profile name,
+#. TRANS: %3$s is a notice URL, %4$s is an author name.
+#, php-format
+msgid ""
+"<a href=\"%1$s\">%2$s</a> stopped liking <a href=\"%3$s\">%4$s's update</a>."
+msgstr ""
+"<a href=\"%1$s\">%2$s</a> gefällt <a href=\"%3$s\">%4$s's Update</a> nicht "
+"mehr."
+
+#. TRANS: Text for "stopped liking" item in activity plugin.
+#. TRANS: %1$s is a profile name, %2$s is a profile URL,
+#. TRANS: %3$s is an author name, %4$s is a notice URL.
+#, php-format
+msgid "%1$s (%2$s) stopped liking %3$s's status (%4$s)."
+msgstr "%1$s (%2$s) gefällt %3$s's Status (%4$s) nicht mehr."
+
+#. TRANS: Text for "joined group" item in activity plugin.
+#. TRANS: %1$s is a profile name, %2$s is a profile URL,
+#. TRANS: %3$s is a group name, %4$s is a group URL.
+#, php-format
+msgid "%1$s (%2$s) joined the group %3$s (%4$s)."
+msgstr "%1$s (%2$s) hat die Gruppe %3$s (%4$s) betreten."
+
+#. TRANS: Text for "left group" item in activity plugin.
+#. TRANS: %1$s is a profile URL, %2$s is a profile name,
+#. TRANS: %3$s is a group URL, %4$s is a group name.
+#, php-format
+msgid "<a href=\"%1$s\">%2$s</a> left the group <a href=\"%3$s\">%4$s</a>."
+msgstr ""
+"<a href=\"%1$s\">%2$s</a> hat die Gruppe <a href=\"%3$s\">%4$s</a> verlassen."
+
+#. TRANS: Text for "left group" item in activity plugin.
+#. TRANS: %1$s is a profile name, %2$s is a profile URL,
+#. TRANS: %3$s is a group name, %4$s is a group URL.
+#, php-format
+msgid "%1$s (%2$s) left the group %3$s (%4$s)."
+msgstr "%1$s (%2$s) hat die Gruppe %3$s (%4$s) verlassen."
+
+#. TRANS: Plugin description.
+msgid "Emits notices when social activities happen."
+msgstr "Gibt Hinweise, wenn soziale Aktivitäten geschehen."
diff --git a/plugins/Activity/locale/es/LC_MESSAGES/Activity.po b/plugins/Activity/locale/es/LC_MESSAGES/Activity.po
new file mode 100644
index 0000000000..9c96fb9d55
--- /dev/null
+++ b/plugins/Activity/locale/es/LC_MESSAGES/Activity.po
@@ -0,0 +1,118 @@
+# Translation of StatusNet - Activity to Spanish (español)
+# Exported from translatewiki.net
+#
+# Author: Erchache2000
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Activity\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:29+0000\n"
+"Language-Team: Spanish <https://translatewiki.net/wiki/Portal:es>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2012-01-30 18:15:05+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: es\n"
+"X-Message-Group: #out-statusnet-plugin-activity\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Text for "joined list" item in activity plugin.
+#. TRANS: %1$s is a profile URL, %2$s is a profile name,
+#. TRANS: %3$s is a group home URL, %4$s is a group name.
+#. TRANS: Text for "joined group" item in activity plugin.
+#. TRANS: %1$s is a profile URL, %2$s is a profile name,
+#. TRANS: %3$s is a group URL, %4$s is a group name.
+#, php-format
+msgid "<a href=\"%1$s\">%2$s</a> joined the group <a href=\"%3$s\">%4$s</a>."
+msgstr "<a href=\"%1$s\">%2$s</a> se unió al grupo <a href=\"%3$s\">%4$s</a>."
+
+#. TRANS: Text for "started following" item in activity plugin.
+#. TRANS: %1$s is a profile URL, %2$s is a profile name,
+#. TRANS: %3$s is a profile URL, %4$s is a profile name.
+#, php-format
+msgid "<a href=\"%1$s\">%2$s</a> started following <a href=\"%3$s\">%4$s</a>."
+msgstr "<a href=\"%1$s\">%2$s</a> empieza a seguir <a href=\"%3$s\">%4$s</a>."
+
+#. TRANS: Text for "started following" item in activity plugin.
+#. TRANS: %1$s is a profile name, %2$s is a profile URL,
+#. TRANS: %3$s is a profile name, %4$s is a profile URL.
+#, php-format
+msgid "%1$s (%2$s) started following %3$s (%4$s)."
+msgstr "%1$s (%2$s) empieza a seguir %3$s (%4$s)."
+
+#. TRANS: Text for "stopped following" item in activity plugin.
+#. TRANS: %1$s is a profile URL, %2$s is a profile name,
+#. TRANS: %3$s is a profile URL, %4$s is a profile name.
+#, php-format
+msgid "<a href=\"%1$s\">%2$s</a> stopped following <a href=\"%3$s\">%4$s</a>."
+msgstr "<a href=\"%1$s\">%2$s</a> deja de seguir <a href=\"%3$s\">%4$s</a>."
+
+#. TRANS: Text for "stopped following" item in activity plugin.
+#. TRANS: %1$s is a profile name, %2$s is a profile URL,
+#. TRANS: %3$s is a profile name, %4$s is a profile URL.
+#, php-format
+msgid "%1$s (%2$s) stopped following %3$s (%4$s)."
+msgstr "%1$s (%2$s) deja de seguir %3$s (%4$s)."
+
+#. TRANS: Text for "liked" item in activity plugin.
+#. TRANS: %1$s is a profile URL, %2$s is a profile name,
+#. TRANS: %3$s is a notice URL, %4$s is an author name.
+#, php-format
+msgid "<a href=\"%1$s\">%2$s</a> liked <a href=\"%3$s\">%4$s's update</a>."
+msgstr ""
+"<a href=\"%1$s\">%2$s</a> le gusta <a href=\"%3$s\">%4$s's actualizaciones</"
+"a>."
+
+#. TRANS: Text for "liked" item in activity plugin.
+#. TRANS: %1$s is a profile name, %2$s is a profile URL,
+#. TRANS: %3$s is an author name, %4$s is a notice URL.
+#, php-format
+msgid "%1$s (%2$s) liked %3$s's status (%4$s)."
+msgstr "%1$s (%2$s) le gusta el estado de %3$s's (%4$s)."
+
+#. TRANS: Text for "stopped liking" item in activity plugin.
+#. TRANS: %1$s is a profile URL, %2$s is a profile name,
+#. TRANS: %3$s is a notice URL, %4$s is an author name.
+#, php-format
+msgid ""
+"<a href=\"%1$s\">%2$s</a> stopped liking <a href=\"%3$s\">%4$s's update</a>."
+msgstr ""
+"<a href=\"%1$s\">%2$s</a> deja de seguir las actualizaciones de <a href=\"%3"
+"$s\">%4$s</a>."
+
+#. TRANS: Text for "stopped liking" item in activity plugin.
+#. TRANS: %1$s is a profile name, %2$s is a profile URL,
+#. TRANS: %3$s is an author name, %4$s is a notice URL.
+#, php-format
+msgid "%1$s (%2$s) stopped liking %3$s's status (%4$s)."
+msgstr "%1$s( %2$s ) dejó de seguir el estado de %3$s ( %4$s )."
+
+#. TRANS: Text for "joined group" item in activity plugin.
+#. TRANS: %1$s is a profile name, %2$s is a profile URL,
+#. TRANS: %3$s is a group name, %4$s is a group URL.
+#, php-format
+msgid "%1$s (%2$s) joined the group %3$s (%4$s)."
+msgstr "%1$s( %2$s ) se unió al grupo  %3$s  ( %4$s )."
+
+#. TRANS: Text for "left group" item in activity plugin.
+#. TRANS: %1$s is a profile URL, %2$s is a profile name,
+#. TRANS: %3$s is a group URL, %4$s is a group name.
+#, php-format
+msgid "<a href=\"%1$s\">%2$s</a> left the group <a href=\"%3$s\">%4$s</a>."
+msgstr "<a href=\"%1$s\">%2$s</a> deja al grupo <a href=\"%3$s\">%4$s</a>."
+
+#. TRANS: Text for "left group" item in activity plugin.
+#. TRANS: %1$s is a profile name, %2$s is a profile URL,
+#. TRANS: %3$s is a group name, %4$s is a group URL.
+#, php-format
+msgid "%1$s (%2$s) left the group %3$s (%4$s)."
+msgstr "%1$s( %2$s ) deja al grupo  %3$s  ( %4$s )."
+
+#. TRANS: Plugin description.
+msgid "Emits notices when social activities happen."
+msgstr "Emite mensajes cuando se producen actividades sociales."
diff --git a/plugins/Activity/locale/eu/LC_MESSAGES/Activity.po b/plugins/Activity/locale/eu/LC_MESSAGES/Activity.po
new file mode 100644
index 0000000000..d2ac432c2b
--- /dev/null
+++ b/plugins/Activity/locale/eu/LC_MESSAGES/Activity.po
@@ -0,0 +1,124 @@
+# Translation of StatusNet - Activity to Basque (euskara)
+# Exported from translatewiki.net
+#
+# Author: Artsuaga
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Activity\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:29+0000\n"
+"Language-Team: Basque <https://translatewiki.net/wiki/Portal:eu>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2012-01-30 18:15:05+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: eu\n"
+"X-Message-Group: #out-statusnet-plugin-activity\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Text for "joined list" item in activity plugin.
+#. TRANS: %1$s is a profile URL, %2$s is a profile name,
+#. TRANS: %3$s is a group home URL, %4$s is a group name.
+#. TRANS: Text for "joined group" item in activity plugin.
+#. TRANS: %1$s is a profile URL, %2$s is a profile name,
+#. TRANS: %3$s is a group URL, %4$s is a group name.
+#, php-format
+msgid "<a href=\"%1$s\">%2$s</a> joined the group <a href=\"%3$s\">%4$s</a>."
+msgstr "<a href=\"%1$s\">%2$s</a> <a href=\"%3$s\">%4$s</a> taldekoa da orain."
+
+#. TRANS: Text for "started following" item in activity plugin.
+#. TRANS: %1$s is a profile URL, %2$s is a profile name,
+#. TRANS: %3$s is a profile URL, %4$s is a profile name.
+#, php-format
+msgid "<a href=\"%1$s\">%2$s</a> started following <a href=\"%3$s\">%4$s</a>."
+msgstr ""
+"<a href=\"%1$s\">%2$s</a> <a href=\"%3$s\">%4$s</a> jarraitzen hasi da."
+
+#. TRANS: Text for "started following" item in activity plugin.
+#. TRANS: %1$s is a profile name, %2$s is a profile URL,
+#. TRANS: %3$s is a profile name, %4$s is a profile URL.
+#, php-format
+msgid "%1$s (%2$s) started following %3$s (%4$s)."
+msgstr "%1$s (%2$s) %3$s (%4$s) jarraitzen hasi da."
+
+#. TRANS: Text for "stopped following" item in activity plugin.
+#. TRANS: %1$s is a profile URL, %2$s is a profile name,
+#. TRANS: %3$s is a profile URL, %4$s is a profile name.
+#, php-format
+msgid "<a href=\"%1$s\">%2$s</a> stopped following <a href=\"%3$s\">%4$s</a>."
+msgstr ""
+"<a href=\"%1$s\">%2$s</a>(e)k <a href=\"%3$s\">%4$s</a> jarraitzeari utzi "
+"dio."
+
+#. TRANS: Text for "stopped following" item in activity plugin.
+#. TRANS: %1$s is a profile name, %2$s is a profile URL,
+#. TRANS: %3$s is a profile name, %4$s is a profile URL.
+#, php-format
+msgid "%1$s (%2$s) stopped following %3$s (%4$s)."
+msgstr "%1$s(e)k (%2$s) %3$s (%4$s) jarraitzeari utzi dio."
+
+#. TRANS: Text for "liked" item in activity plugin.
+#. TRANS: %1$s is a profile URL, %2$s is a profile name,
+#. TRANS: %3$s is a notice URL, %4$s is an author name.
+#, php-format
+msgid "<a href=\"%1$s\">%2$s</a> liked <a href=\"%3$s\">%4$s's update</a>."
+msgstr ""
+"<a href=\"%1$s\">%2$s</a>(e)k <a href=\"%3$s\">%4$s(r)en eguneraketa</a> "
+"atsegin du."
+
+#. TRANS: Text for "liked" item in activity plugin.
+#. TRANS: %1$s is a profile name, %2$s is a profile URL,
+#. TRANS: %3$s is an author name, %4$s is a notice URL.
+#, php-format
+msgid "%1$s (%2$s) liked %3$s's status (%4$s)."
+msgstr "%1$s(e)k (%2$s) %3$s(r)en egoera (%4$s) atsegin du."
+
+#. TRANS: Text for "stopped liking" item in activity plugin.
+#. TRANS: %1$s is a profile URL, %2$s is a profile name,
+#. TRANS: %3$s is a notice URL, %4$s is an author name.
+#, php-format
+msgid ""
+"<a href=\"%1$s\">%2$s</a> stopped liking <a href=\"%3$s\">%4$s's update</a>."
+msgstr ""
+"<a href=\"%1$s\">%2$s</a>(r)i ez zaio dagoeneko <a href=\"%3$s\">%4$s(r)en "
+"eguneraketa</a> atsegin."
+
+#. TRANS: Text for "stopped liking" item in activity plugin.
+#. TRANS: %1$s is a profile name, %2$s is a profile URL,
+#. TRANS: %3$s is an author name, %4$s is a notice URL.
+#, php-format
+msgid "%1$s (%2$s) stopped liking %3$s's status (%4$s)."
+msgstr "%1$s(r)i (%2$s) ez zaio dagoeneko %3$s(r)en egoera (%4$s) atsegin."
+
+#. TRANS: Text for "joined group" item in activity plugin.
+#. TRANS: %1$s is a profile name, %2$s is a profile URL,
+#. TRANS: %3$s is a group name, %4$s is a group URL.
+#, php-format
+msgid "%1$s (%2$s) joined the group %3$s (%4$s)."
+msgstr "%1$s (%2$s) %3$s (%4$s) taldera batu da."
+
+#. TRANS: Text for "left group" item in activity plugin.
+#. TRANS: %1$s is a profile URL, %2$s is a profile name,
+#. TRANS: %3$s is a group URL, %4$s is a group name.
+#, php-format
+msgid "<a href=\"%1$s\">%2$s</a> left the group <a href=\"%3$s\">%4$s</a>."
+msgstr ""
+"<a href=\"%1$s\">%2$s</a>(e)k <a href=\"%3$s\">%4$s</a> taldea utzi du."
+
+#. TRANS: Text for "left group" item in activity plugin.
+#. TRANS: %1$s is a profile name, %2$s is a profile URL,
+#. TRANS: %3$s is a group name, %4$s is a group URL.
+#, php-format
+msgid "%1$s (%2$s) left the group %3$s (%4$s)."
+msgstr "%1$s(e)k (%2$s) %3$s (%4$s) taldea utzi du."
+
+#. TRANS: Plugin description.
+msgid "Emits notices when social activities happen."
+msgstr ""
+"Oharrak argitaratzen ditu iharduera bat dagoenean (lagun egin, taldekide "
+"izan, taldea utzi...)."
diff --git a/plugins/Activity/locale/fr/LC_MESSAGES/Activity.po b/plugins/Activity/locale/fr/LC_MESSAGES/Activity.po
new file mode 100644
index 0000000000..50d5b95284
--- /dev/null
+++ b/plugins/Activity/locale/fr/LC_MESSAGES/Activity.po
@@ -0,0 +1,117 @@
+# Translation of StatusNet - Activity to French (français)
+# Exported from translatewiki.net
+#
+# Author: Gomoko
+# Author: Jean-Frédéric
+# Author: Od1n
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Activity\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:29+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2012-01-30 18:15:05+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#. TRANS: Text for "joined list" item in activity plugin.
+#. TRANS: %1$s is a profile URL, %2$s is a profile name,
+#. TRANS: %3$s is a group home URL, %4$s is a group name.
+#. TRANS: Text for "joined group" item in activity plugin.
+#. TRANS: %1$s is a profile URL, %2$s is a profile name,
+#. TRANS: %3$s is a group URL, %4$s is a group name.
+#, php-format
+msgid "<a href=\"%1$s\">%2$s</a> joined the group <a href=\"%3$s\">%4$s</a>."
+msgstr ""
+"<a href=\"%1$s\">%2$s</a> a rejoint le groupe <a href=\"%3$s\">%4$s</a>."
+
+#. TRANS: Text for "started following" item in activity plugin.
+#. TRANS: %1$s is a profile URL, %2$s is a profile name,
+#. TRANS: %3$s is a profile URL, %4$s is a profile name.
+#, php-format
+msgid "<a href=\"%1$s\">%2$s</a> started following <a href=\"%3$s\">%4$s</a>."
+msgstr "<a href=\"%1$s\">%2$s</a> suit désormais <a href=\"%3$s\">%4$s</a>."
+
+#. TRANS: Text for "started following" item in activity plugin.
+#. TRANS: %1$s is a profile name, %2$s is a profile URL,
+#. TRANS: %3$s is a profile name, %4$s is a profile URL.
+#, php-format
+msgid "%1$s (%2$s) started following %3$s (%4$s)."
+msgstr "%1$s (%2$s) suit désormais %3$s (%4$s)."
+
+#. TRANS: Text for "stopped following" item in activity plugin.
+#. TRANS: %1$s is a profile URL, %2$s is a profile name,
+#. TRANS: %3$s is a profile URL, %4$s is a profile name.
+#, php-format
+msgid "<a href=\"%1$s\">%2$s</a> stopped following <a href=\"%3$s\">%4$s</a>."
+msgstr "<a href=\"%1$s\">%2$s</a> a cessé de suivre <a href=\"%3$s\">%4$s</a>."
+
+#. TRANS: Text for "stopped following" item in activity plugin.
+#. TRANS: %1$s is a profile name, %2$s is a profile URL,
+#. TRANS: %3$s is a profile name, %4$s is a profile URL.
+#, php-format
+msgid "%1$s (%2$s) stopped following %3$s (%4$s)."
+msgstr "%1$s (%2$s) a arrêté de suivre %3$s (%4$s)."
+
+#. TRANS: Text for "liked" item in activity plugin.
+#. TRANS: %1$s is a profile URL, %2$s is a profile name,
+#. TRANS: %3$s is a notice URL, %4$s is an author name.
+#, php-format
+msgid "<a href=\"%1$s\">%2$s</a> liked <a href=\"%3$s\">%4$s's update</a>."
+msgstr "<a href=\"%1$s\">%2$s</a> a aimé <a href=\"%3$s\">%4$s's update</a>."
+
+#. TRANS: Text for "liked" item in activity plugin.
+#. TRANS: %1$s is a profile name, %2$s is a profile URL,
+#. TRANS: %3$s is an author name, %4$s is a notice URL.
+#, php-format
+msgid "%1$s (%2$s) liked %3$s's status (%4$s)."
+msgstr "%1$s (%2$s) a aimé le statut de %3$s (%4$s)."
+
+#. TRANS: Text for "stopped liking" item in activity plugin.
+#. TRANS: %1$s is a profile URL, %2$s is a profile name,
+#. TRANS: %3$s is a notice URL, %4$s is an author name.
+#, php-format
+msgid ""
+"<a href=\"%1$s\">%2$s</a> stopped liking <a href=\"%3$s\">%4$s's update</a>."
+msgstr ""
+"<a href=\"%1$s\">%2$s</a> n'aime plus <a href=\"%3$s\">les mises à jour de %4"
+"$s</a>."
+
+#. TRANS: Text for "stopped liking" item in activity plugin.
+#. TRANS: %1$s is a profile name, %2$s is a profile URL,
+#. TRANS: %3$s is an author name, %4$s is a notice URL.
+#, php-format
+msgid "%1$s (%2$s) stopped liking %3$s's status (%4$s)."
+msgstr "%1$s (%2$s) n'aime plus le statut de %3$s (%4$s)."
+
+#. TRANS: Text for "joined group" item in activity plugin.
+#. TRANS: %1$s is a profile name, %2$s is a profile URL,
+#. TRANS: %3$s is a group name, %4$s is a group URL.
+#, php-format
+msgid "%1$s (%2$s) joined the group %3$s (%4$s)."
+msgstr "%1$s (%2$s) a rejoint le groupe %3$s (%4$s)."
+
+#. TRANS: Text for "left group" item in activity plugin.
+#. TRANS: %1$s is a profile URL, %2$s is a profile name,
+#. TRANS: %3$s is a group URL, %4$s is a group name.
+#, php-format
+msgid "<a href=\"%1$s\">%2$s</a> left the group <a href=\"%3$s\">%4$s</a>."
+msgstr ""
+"<a href=\"%1$s\">%2$s</a> a quitté le groupe <a href=\"%3$s\">%4$s</a>."
+
+#. TRANS: Text for "left group" item in activity plugin.
+#. TRANS: %1$s is a profile name, %2$s is a profile URL,
+#. TRANS: %3$s is a group name, %4$s is a group URL.
+#, php-format
+msgid "%1$s (%2$s) left the group %3$s (%4$s)."
+msgstr "%1$s (%2$s) a quitté le groupe %3$s (%4$s)."
+
+#. TRANS: Plugin description.
+msgid "Emits notices when social activities happen."
+msgstr "Émettre des avis lorsque des activités sociales se produisent."
diff --git a/plugins/Activity/locale/gl/LC_MESSAGES/Activity.po b/plugins/Activity/locale/gl/LC_MESSAGES/Activity.po
new file mode 100644
index 0000000000..11f3c9f46d
--- /dev/null
+++ b/plugins/Activity/locale/gl/LC_MESSAGES/Activity.po
@@ -0,0 +1,120 @@
+# Translation of StatusNet - Activity to Galician (galego)
+# Exported from translatewiki.net
+#
+# Author: Toliño
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Activity\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:29+0000\n"
+"Language-Team: Galician <https://translatewiki.net/wiki/Portal:gl>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2012-01-30 18:15:05+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: gl\n"
+"X-Message-Group: #out-statusnet-plugin-activity\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Text for "joined list" item in activity plugin.
+#. TRANS: %1$s is a profile URL, %2$s is a profile name,
+#. TRANS: %3$s is a group home URL, %4$s is a group name.
+#. TRANS: Text for "joined group" item in activity plugin.
+#. TRANS: %1$s is a profile URL, %2$s is a profile name,
+#. TRANS: %3$s is a group URL, %4$s is a group name.
+#, php-format
+msgid "<a href=\"%1$s\">%2$s</a> joined the group <a href=\"%3$s\">%4$s</a>."
+msgstr "<a href=\"%1$s\">%2$s</a> uniuse ao grupo <a href=\"%3$s\">%4$s</a>."
+
+#. TRANS: Text for "started following" item in activity plugin.
+#. TRANS: %1$s is a profile URL, %2$s is a profile name,
+#. TRANS: %3$s is a profile URL, %4$s is a profile name.
+#, php-format
+msgid "<a href=\"%1$s\">%2$s</a> started following <a href=\"%3$s\">%4$s</a>."
+msgstr ""
+"<a href=\"%1$s\">%2$s</a> comezou a seguir a <a href=\"%3$s\">%4$s</a>."
+
+#. TRANS: Text for "started following" item in activity plugin.
+#. TRANS: %1$s is a profile name, %2$s is a profile URL,
+#. TRANS: %3$s is a profile name, %4$s is a profile URL.
+#, php-format
+msgid "%1$s (%2$s) started following %3$s (%4$s)."
+msgstr "%1$s (%2$s) comezou a seguir a %3$s (%4$s)."
+
+#. TRANS: Text for "stopped following" item in activity plugin.
+#. TRANS: %1$s is a profile URL, %2$s is a profile name,
+#. TRANS: %3$s is a profile URL, %4$s is a profile name.
+#, php-format
+msgid "<a href=\"%1$s\">%2$s</a> stopped following <a href=\"%3$s\">%4$s</a>."
+msgstr ""
+"<a href=\"%1$s\">%2$s</a> deixou de seguir a <a href=\"%3$s\">%4$s</a>."
+
+#. TRANS: Text for "stopped following" item in activity plugin.
+#. TRANS: %1$s is a profile name, %2$s is a profile URL,
+#. TRANS: %3$s is a profile name, %4$s is a profile URL.
+#, php-format
+msgid "%1$s (%2$s) stopped following %3$s (%4$s)."
+msgstr "%1$s (%2$s) deixou de seguir a %3$s (%4$s)."
+
+#. TRANS: Text for "liked" item in activity plugin.
+#. TRANS: %1$s is a profile URL, %2$s is a profile name,
+#. TRANS: %3$s is a notice URL, %4$s is an author name.
+#, php-format
+msgid "<a href=\"%1$s\">%2$s</a> liked <a href=\"%3$s\">%4$s's update</a>."
+msgstr ""
+"<a href=\"%1$s\">%2$s</a> gustou da <a href=\"%3$s\">actualización de %4$s</"
+"a>."
+
+#. TRANS: Text for "liked" item in activity plugin.
+#. TRANS: %1$s is a profile name, %2$s is a profile URL,
+#. TRANS: %3$s is an author name, %4$s is a notice URL.
+#, php-format
+msgid "%1$s (%2$s) liked %3$s's status (%4$s)."
+msgstr "%1$s (%2$s) gustou do estado de %3$s (%4$s)."
+
+#. TRANS: Text for "stopped liking" item in activity plugin.
+#. TRANS: %1$s is a profile URL, %2$s is a profile name,
+#. TRANS: %3$s is a notice URL, %4$s is an author name.
+#, php-format
+msgid ""
+"<a href=\"%1$s\">%2$s</a> stopped liking <a href=\"%3$s\">%4$s's update</a>."
+msgstr ""
+"<a href=\"%1$s\">%2$s</a> deixou de gustar da <a href=\"%3$s\">actualización "
+"de %4$s</a>."
+
+#. TRANS: Text for "stopped liking" item in activity plugin.
+#. TRANS: %1$s is a profile name, %2$s is a profile URL,
+#. TRANS: %3$s is an author name, %4$s is a notice URL.
+#, php-format
+msgid "%1$s (%2$s) stopped liking %3$s's status (%4$s)."
+msgstr "%1$s (%2$s) deixou de gustar do estado de %3$s (%4$s)."
+
+#. TRANS: Text for "joined group" item in activity plugin.
+#. TRANS: %1$s is a profile name, %2$s is a profile URL,
+#. TRANS: %3$s is a group name, %4$s is a group URL.
+#, php-format
+msgid "%1$s (%2$s) joined the group %3$s (%4$s)."
+msgstr "%1$s (%2$s) uniuse ao grupo %3$s (%4$s)."
+
+#. TRANS: Text for "left group" item in activity plugin.
+#. TRANS: %1$s is a profile URL, %2$s is a profile name,
+#. TRANS: %3$s is a group URL, %4$s is a group name.
+#, php-format
+msgid "<a href=\"%1$s\">%2$s</a> left the group <a href=\"%3$s\">%4$s</a>."
+msgstr "<a href=\"%1$s\">%2$s</a> deixou o grupo <a href=\"%3$s\">%4$s</a>."
+
+#. TRANS: Text for "left group" item in activity plugin.
+#. TRANS: %1$s is a profile name, %2$s is a profile URL,
+#. TRANS: %3$s is a group name, %4$s is a group URL.
+#, php-format
+msgid "%1$s (%2$s) left the group %3$s (%4$s)."
+msgstr "%1$s (%2$s) deixou o grupo %3$s (%4$s)."
+
+#. TRANS: Plugin description.
+msgid "Emits notices when social activities happen."
+msgstr "Emite notificacións cando acontecen actividades sociais."
diff --git a/plugins/Activity/locale/ia/LC_MESSAGES/Activity.po b/plugins/Activity/locale/ia/LC_MESSAGES/Activity.po
new file mode 100644
index 0000000000..2de08a4ce2
--- /dev/null
+++ b/plugins/Activity/locale/ia/LC_MESSAGES/Activity.po
@@ -0,0 +1,120 @@
+# Translation of StatusNet - Activity to Interlingua (interlingua)
+# Exported from translatewiki.net
+#
+# Author: McDutchie
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Activity\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:29+0000\n"
+"Language-Team: Interlingua <https://translatewiki.net/wiki/Portal:ia>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2012-01-30 18:15:05+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: ia\n"
+"X-Message-Group: #out-statusnet-plugin-activity\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Text for "joined list" item in activity plugin.
+#. TRANS: %1$s is a profile URL, %2$s is a profile name,
+#. TRANS: %3$s is a group home URL, %4$s is a group name.
+#. TRANS: Text for "joined group" item in activity plugin.
+#. TRANS: %1$s is a profile URL, %2$s is a profile name,
+#. TRANS: %3$s is a group URL, %4$s is a group name.
+#, php-format
+msgid "<a href=\"%1$s\">%2$s</a> joined the group <a href=\"%3$s\">%4$s</a>."
+msgstr ""
+"<a href=\"%1$s\">%2$s</a> adhereva al gruppo <a href=\"%3$s\">%4$s</a>."
+
+#. TRANS: Text for "started following" item in activity plugin.
+#. TRANS: %1$s is a profile URL, %2$s is a profile name,
+#. TRANS: %3$s is a profile URL, %4$s is a profile name.
+#, php-format
+msgid "<a href=\"%1$s\">%2$s</a> started following <a href=\"%3$s\">%4$s</a>."
+msgstr ""
+"<a href=\"%1$s\">%2$s</a> comenciava a sequer <a href=\"%3$s\">%4$s</a>."
+
+#. TRANS: Text for "started following" item in activity plugin.
+#. TRANS: %1$s is a profile name, %2$s is a profile URL,
+#. TRANS: %3$s is a profile name, %4$s is a profile URL.
+#, php-format
+msgid "%1$s (%2$s) started following %3$s (%4$s)."
+msgstr "%1$s (%2$s) comenciava a sequer %3$s (%4$s)."
+
+#. TRANS: Text for "stopped following" item in activity plugin.
+#. TRANS: %1$s is a profile URL, %2$s is a profile name,
+#. TRANS: %3$s is a profile URL, %4$s is a profile name.
+#, php-format
+msgid "<a href=\"%1$s\">%2$s</a> stopped following <a href=\"%3$s\">%4$s</a>."
+msgstr "<a href=\"%1$s\">%2$s</a> cessava de sequer <a href=\"%3$s\">%4$s</a>."
+
+#. TRANS: Text for "stopped following" item in activity plugin.
+#. TRANS: %1$s is a profile name, %2$s is a profile URL,
+#. TRANS: %3$s is a profile name, %4$s is a profile URL.
+#, php-format
+msgid "%1$s (%2$s) stopped following %3$s (%4$s)."
+msgstr "%1$s (%2$s) cessava de sequer %3$s (%4$s)."
+
+#. TRANS: Text for "liked" item in activity plugin.
+#. TRANS: %1$s is a profile URL, %2$s is a profile name,
+#. TRANS: %3$s is a notice URL, %4$s is an author name.
+#, php-format
+msgid "<a href=\"%1$s\">%2$s</a> liked <a href=\"%3$s\">%4$s's update</a>."
+msgstr ""
+"<a href=\"%1$s\">%2$s</a> amava <a href=\"%3$s\">le actualisation de %4$s</"
+"a>."
+
+#. TRANS: Text for "liked" item in activity plugin.
+#. TRANS: %1$s is a profile name, %2$s is a profile URL,
+#. TRANS: %3$s is an author name, %4$s is a notice URL.
+#, php-format
+msgid "%1$s (%2$s) liked %3$s's status (%4$s)."
+msgstr "%1$s (%2$s) amava le stato de %3$s (%4$s)."
+
+#. TRANS: Text for "stopped liking" item in activity plugin.
+#. TRANS: %1$s is a profile URL, %2$s is a profile name,
+#. TRANS: %3$s is a notice URL, %4$s is an author name.
+#, php-format
+msgid ""
+"<a href=\"%1$s\">%2$s</a> stopped liking <a href=\"%3$s\">%4$s's update</a>."
+msgstr ""
+"<a href=\"%1$s\">%2$s</a> cessava de amar <a href=\"%3$s\">le actualisation "
+"de %4$s</a>."
+
+#. TRANS: Text for "stopped liking" item in activity plugin.
+#. TRANS: %1$s is a profile name, %2$s is a profile URL,
+#. TRANS: %3$s is an author name, %4$s is a notice URL.
+#, php-format
+msgid "%1$s (%2$s) stopped liking %3$s's status (%4$s)."
+msgstr "%1$s (%2$s) cessava de amar le stato de %3$s (%4$s)."
+
+#. TRANS: Text for "joined group" item in activity plugin.
+#. TRANS: %1$s is a profile name, %2$s is a profile URL,
+#. TRANS: %3$s is a group name, %4$s is a group URL.
+#, php-format
+msgid "%1$s (%2$s) joined the group %3$s (%4$s)."
+msgstr "%1$s (%2$s) adhereva al gruppo %3$s (%4$s)."
+
+#. TRANS: Text for "left group" item in activity plugin.
+#. TRANS: %1$s is a profile URL, %2$s is a profile name,
+#. TRANS: %3$s is a group URL, %4$s is a group name.
+#, php-format
+msgid "<a href=\"%1$s\">%2$s</a> left the group <a href=\"%3$s\">%4$s</a>."
+msgstr "<a href=\"%1$s\">%2$s</a> quitava le gruppo <a href=\"%3$s\">%4$s</a>."
+
+#. TRANS: Text for "left group" item in activity plugin.
+#. TRANS: %1$s is a profile name, %2$s is a profile URL,
+#. TRANS: %3$s is a group name, %4$s is a group URL.
+#, php-format
+msgid "%1$s (%2$s) left the group %3$s (%4$s)."
+msgstr "%1$s (%2$s) quitava le gruppo %3$s (%4$s)."
+
+#. TRANS: Plugin description.
+msgid "Emits notices when social activities happen."
+msgstr "Emitte notificationes quando activitates social occurre."
diff --git a/plugins/Activity/locale/it/LC_MESSAGES/Activity.po b/plugins/Activity/locale/it/LC_MESSAGES/Activity.po
new file mode 100644
index 0000000000..98664c5d46
--- /dev/null
+++ b/plugins/Activity/locale/it/LC_MESSAGES/Activity.po
@@ -0,0 +1,118 @@
+# Translation of StatusNet - Activity to Italian (italiano)
+# Exported from translatewiki.net
+#
+# Author: Ximo17
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Activity\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:29+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2012-01-30 18:15:05+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Text for "joined list" item in activity plugin.
+#. TRANS: %1$s is a profile URL, %2$s is a profile name,
+#. TRANS: %3$s is a group home URL, %4$s is a group name.
+#. TRANS: Text for "joined group" item in activity plugin.
+#. TRANS: %1$s is a profile URL, %2$s is a profile name,
+#. TRANS: %3$s is a group URL, %4$s is a group name.
+#, php-format
+msgid "<a href=\"%1$s\">%2$s</a> joined the group <a href=\"%3$s\">%4$s</a>."
+msgstr ""
+"<a href=\"%1$s\">%2$s</a> unisciti al gruppo <a href=\"%3$s\">%4$s</a>."
+
+#. TRANS: Text for "started following" item in activity plugin.
+#. TRANS: %1$s is a profile URL, %2$s is a profile name,
+#. TRANS: %3$s is a profile URL, %4$s is a profile name.
+#, php-format
+msgid "<a href=\"%1$s\">%2$s</a> started following <a href=\"%3$s\">%4$s</a>."
+msgstr ""
+"<a href=\"%1$s\">%2$s</a> ha iniziato a seguire <a href=\"%3$s\">%4$s</a>."
+
+#. TRANS: Text for "started following" item in activity plugin.
+#. TRANS: %1$s is a profile name, %2$s is a profile URL,
+#. TRANS: %3$s is a profile name, %4$s is a profile URL.
+#, php-format
+msgid "%1$s (%2$s) started following %3$s (%4$s)."
+msgstr "%1$s (%2$s) ha iniziato a seguire %3$s (%4$s)."
+
+#. TRANS: Text for "stopped following" item in activity plugin.
+#. TRANS: %1$s is a profile URL, %2$s is a profile name,
+#. TRANS: %3$s is a profile URL, %4$s is a profile name.
+#, php-format
+msgid "<a href=\"%1$s\">%2$s</a> stopped following <a href=\"%3$s\">%4$s</a>."
+msgstr ""
+"<a href=\"%1$s\">%2$s</a> ha smesso di seguire <a href=\"%3$s\">%4$s</a>."
+
+#. TRANS: Text for "stopped following" item in activity plugin.
+#. TRANS: %1$s is a profile name, %2$s is a profile URL,
+#. TRANS: %3$s is a profile name, %4$s is a profile URL.
+#, php-format
+msgid "%1$s (%2$s) stopped following %3$s (%4$s)."
+msgstr "%1$s (%2$s) ha smesso di seguire %3$s (%4$s)."
+
+#. TRANS: Text for "liked" item in activity plugin.
+#. TRANS: %1$s is a profile URL, %2$s is a profile name,
+#. TRANS: %3$s is a notice URL, %4$s is an author name.
+#, php-format
+msgid "<a href=\"%1$s\">%2$s</a> liked <a href=\"%3$s\">%4$s's update</a>."
+msgstr ""
+"<a href=\"%1$s\">%2$s</a> piace <a href=\"%3$s\">l'aggiornamento di %4$s</a>."
+
+#. TRANS: Text for "liked" item in activity plugin.
+#. TRANS: %1$s is a profile name, %2$s is a profile URL,
+#. TRANS: %3$s is an author name, %4$s is a notice URL.
+#, php-format
+msgid "%1$s (%2$s) liked %3$s's status (%4$s)."
+msgstr "%1$s (%2$s) piace lo stato di %3$s (%4$s)."
+
+#. TRANS: Text for "stopped liking" item in activity plugin.
+#. TRANS: %1$s is a profile URL, %2$s is a profile name,
+#. TRANS: %3$s is a notice URL, %4$s is an author name.
+#, php-format
+msgid ""
+"<a href=\"%1$s\">%2$s</a> stopped liking <a href=\"%3$s\">%4$s's update</a>."
+msgstr ""
+"<a href=\"%1$s\">%2$s</a> non piace più <a href=\"%3$s\">l'aggiornamento di %"
+"4$s</a>."
+
+#. TRANS: Text for "stopped liking" item in activity plugin.
+#. TRANS: %1$s is a profile name, %2$s is a profile URL,
+#. TRANS: %3$s is an author name, %4$s is a notice URL.
+#, php-format
+msgid "%1$s (%2$s) stopped liking %3$s's status (%4$s)."
+msgstr "%1$s (%2$s) non piace più lo stato di %3$s (%4$s)."
+
+#. TRANS: Text for "joined group" item in activity plugin.
+#. TRANS: %1$s is a profile name, %2$s is a profile URL,
+#. TRANS: %3$s is a group name, %4$s is a group URL.
+#, php-format
+msgid "%1$s (%2$s) joined the group %3$s (%4$s)."
+msgstr "%1$s (%2$s) si è unito al gruppo %3$s (%4$s)."
+
+#. TRANS: Text for "left group" item in activity plugin.
+#. TRANS: %1$s is a profile URL, %2$s is a profile name,
+#. TRANS: %3$s is a group URL, %4$s is a group name.
+#, php-format
+msgid "<a href=\"%1$s\">%2$s</a> left the group <a href=\"%3$s\">%4$s</a>."
+msgstr ""
+"<a href=\"%1$s\">%2$s</a> è uscito dal gruppo <a href=\"%3$s\">%4$s</a>."
+
+#. TRANS: Text for "left group" item in activity plugin.
+#. TRANS: %1$s is a profile name, %2$s is a profile URL,
+#. TRANS: %3$s is a group name, %4$s is a group URL.
+#, php-format
+msgid "%1$s (%2$s) left the group %3$s (%4$s)."
+msgstr "%1$s (%2$s) è uscito dal gruppo %3$s (%4$s)."
+
+#. TRANS: Plugin description.
+msgid "Emits notices when social activities happen."
+msgstr "Emette avvisi quando avvengono le attività sociali."
diff --git a/plugins/Activity/locale/lt/LC_MESSAGES/Activity.po b/plugins/Activity/locale/lt/LC_MESSAGES/Activity.po
new file mode 100644
index 0000000000..7cdad0c43f
--- /dev/null
+++ b/plugins/Activity/locale/lt/LC_MESSAGES/Activity.po
@@ -0,0 +1,116 @@
+# Translation of StatusNet - Activity to Lithuanian (lietuvių)
+# Exported from translatewiki.net
+#
+# Author: Eitvys200
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Activity\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:29+0000\n"
+"Language-Team: Lithuanian <https://translatewiki.net/wiki/Portal:lt>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2012-01-30 18:15:05+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: lt\n"
+"X-Message-Group: #out-statusnet-plugin-activity\n"
+"Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
+"2 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
+
+#. TRANS: Text for "joined list" item in activity plugin.
+#. TRANS: %1$s is a profile URL, %2$s is a profile name,
+#. TRANS: %3$s is a group home URL, %4$s is a group name.
+#. TRANS: Text for "joined group" item in activity plugin.
+#. TRANS: %1$s is a profile URL, %2$s is a profile name,
+#. TRANS: %3$s is a group URL, %4$s is a group name.
+#, php-format
+msgid "<a href=\"%1$s\">%2$s</a> joined the group <a href=\"%3$s\">%4$s</a>."
+msgstr ""
+"<a href=\"%1$s\">%2$s</a> prisijungÄ— prie grupÄ—s <a href=\"%3$s\">%4$s</a>."
+
+#. TRANS: Text for "started following" item in activity plugin.
+#. TRANS: %1$s is a profile URL, %2$s is a profile name,
+#. TRANS: %3$s is a profile URL, %4$s is a profile name.
+#, php-format
+msgid "<a href=\"%1$s\">%2$s</a> started following <a href=\"%3$s\">%4$s</a>."
+msgstr "<a href=\"%1$s\">%2$s</a> pradÄ—jo sekti <a href=\"%3$s\">%4$s</a>."
+
+#. TRANS: Text for "started following" item in activity plugin.
+#. TRANS: %1$s is a profile name, %2$s is a profile URL,
+#. TRANS: %3$s is a profile name, %4$s is a profile URL.
+#, php-format
+msgid "%1$s (%2$s) started following %3$s (%4$s)."
+msgstr ""
+
+#. TRANS: Text for "stopped following" item in activity plugin.
+#. TRANS: %1$s is a profile URL, %2$s is a profile name,
+#. TRANS: %3$s is a profile URL, %4$s is a profile name.
+#, php-format
+msgid "<a href=\"%1$s\">%2$s</a> stopped following <a href=\"%3$s\">%4$s</a>."
+msgstr "<a href=\"%1$s\">%2$s</a> nustojo sekti <a href=\"%3$s\">%4$s</a>."
+
+#. TRANS: Text for "stopped following" item in activity plugin.
+#. TRANS: %1$s is a profile name, %2$s is a profile URL,
+#. TRANS: %3$s is a profile name, %4$s is a profile URL.
+#, php-format
+msgid "%1$s (%2$s) stopped following %3$s (%4$s)."
+msgstr ""
+
+#. TRANS: Text for "liked" item in activity plugin.
+#. TRANS: %1$s is a profile URL, %2$s is a profile name,
+#. TRANS: %3$s is a notice URL, %4$s is an author name.
+#, php-format
+msgid "<a href=\"%1$s\">%2$s</a> liked <a href=\"%3$s\">%4$s's update</a>."
+msgstr ""
+
+#. TRANS: Text for "liked" item in activity plugin.
+#. TRANS: %1$s is a profile name, %2$s is a profile URL,
+#. TRANS: %3$s is an author name, %4$s is a notice URL.
+#, php-format
+msgid "%1$s (%2$s) liked %3$s's status (%4$s)."
+msgstr ""
+
+#. TRANS: Text for "stopped liking" item in activity plugin.
+#. TRANS: %1$s is a profile URL, %2$s is a profile name,
+#. TRANS: %3$s is a notice URL, %4$s is an author name.
+#, php-format
+msgid ""
+"<a href=\"%1$s\">%2$s</a> stopped liking <a href=\"%3$s\">%4$s's update</a>."
+msgstr ""
+
+#. TRANS: Text for "stopped liking" item in activity plugin.
+#. TRANS: %1$s is a profile name, %2$s is a profile URL,
+#. TRANS: %3$s is an author name, %4$s is a notice URL.
+#, php-format
+msgid "%1$s (%2$s) stopped liking %3$s's status (%4$s)."
+msgstr ""
+
+#. TRANS: Text for "joined group" item in activity plugin.
+#. TRANS: %1$s is a profile name, %2$s is a profile URL,
+#. TRANS: %3$s is a group name, %4$s is a group URL.
+#, php-format
+msgid "%1$s (%2$s) joined the group %3$s (%4$s)."
+msgstr "%1$s (%2$s) prisijungÄ— prie grupÄ—s %3$s (%4$s)."
+
+#. TRANS: Text for "left group" item in activity plugin.
+#. TRANS: %1$s is a profile URL, %2$s is a profile name,
+#. TRANS: %3$s is a group URL, %4$s is a group name.
+#, php-format
+msgid "<a href=\"%1$s\">%2$s</a> left the group <a href=\"%3$s\">%4$s</a>."
+msgstr "<a href=\"%1$s\">%2$s</a> paliko grupÄ™ <a href=\"%3$s\">%4$s</a>."
+
+#. TRANS: Text for "left group" item in activity plugin.
+#. TRANS: %1$s is a profile name, %2$s is a profile URL,
+#. TRANS: %3$s is a group name, %4$s is a group URL.
+#, php-format
+msgid "%1$s (%2$s) left the group %3$s (%4$s)."
+msgstr "%1$s (%2$s) paliko grupÄ™ %3$s (%4$s)."
+
+#. TRANS: Plugin description.
+msgid "Emits notices when social activities happen."
+msgstr ""
diff --git a/plugins/Activity/locale/mk/LC_MESSAGES/Activity.po b/plugins/Activity/locale/mk/LC_MESSAGES/Activity.po
new file mode 100644
index 0000000000..d00560de16
--- /dev/null
+++ b/plugins/Activity/locale/mk/LC_MESSAGES/Activity.po
@@ -0,0 +1,123 @@
+# Translation of StatusNet - Activity to Macedonian (македон�ки)
+# Exported from translatewiki.net
+#
+# Author: Bjankuloski06
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Activity\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:29+0000\n"
+"Language-Team: Macedonian <https://translatewiki.net/wiki/Portal:mk>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2012-01-30 18:15:05+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: mk\n"
+"X-Message-Group: #out-statusnet-plugin-activity\n"
+"Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
+
+#. TRANS: Text for "joined list" item in activity plugin.
+#. TRANS: %1$s is a profile URL, %2$s is a profile name,
+#. TRANS: %3$s is a group home URL, %4$s is a group name.
+#. TRANS: Text for "joined group" item in activity plugin.
+#. TRANS: %1$s is a profile URL, %2$s is a profile name,
+#. TRANS: %3$s is a group URL, %4$s is a group name.
+#, php-format
+msgid "<a href=\"%1$s\">%2$s</a> joined the group <a href=\"%3$s\">%4$s</a>."
+msgstr ""
+"<a href=\"%1$s\">%2$s</a> �е зачлени во групата <a href=\"%3$s\">%4$s</a>."
+
+#. TRANS: Text for "started following" item in activity plugin.
+#. TRANS: %1$s is a profile URL, %2$s is a profile name,
+#. TRANS: %3$s is a profile URL, %4$s is a profile name.
+#, php-format
+msgid "<a href=\"%1$s\">%2$s</a> started following <a href=\"%3$s\">%4$s</a>."
+msgstr ""
+"<a href=\"%1$s\">%2$s</a> почна да го �леди кори�никот <a href=\"%3$s\">%4"
+"$s</a>."
+
+#. TRANS: Text for "started following" item in activity plugin.
+#. TRANS: %1$s is a profile name, %2$s is a profile URL,
+#. TRANS: %3$s is a profile name, %4$s is a profile URL.
+#, php-format
+msgid "%1$s (%2$s) started following %3$s (%4$s)."
+msgstr "%1$s (%2$s) почна да го �леди кори�никот %3$s (%4$s)."
+
+#. TRANS: Text for "stopped following" item in activity plugin.
+#. TRANS: %1$s is a profile URL, %2$s is a profile name,
+#. TRANS: %3$s is a profile URL, %4$s is a profile name.
+#, php-format
+msgid "<a href=\"%1$s\">%2$s</a> stopped following <a href=\"%3$s\">%4$s</a>."
+msgstr ""
+"<a href=\"%1$s\">%2$s</a> пре�тана да го �леди кори�никот <a href=\"%3$s\">%4"
+"$s</a>."
+
+#. TRANS: Text for "stopped following" item in activity plugin.
+#. TRANS: %1$s is a profile name, %2$s is a profile URL,
+#. TRANS: %3$s is a profile name, %4$s is a profile URL.
+#, php-format
+msgid "%1$s (%2$s) stopped following %3$s (%4$s)."
+msgstr "%1$s (%2$s) пре�тана да го �леди кори�никот %3$s (%4$s)."
+
+#. TRANS: Text for "liked" item in activity plugin.
+#. TRANS: %1$s is a profile URL, %2$s is a profile name,
+#. TRANS: %3$s is a notice URL, %4$s is an author name.
+#, php-format
+msgid "<a href=\"%1$s\">%2$s</a> liked <a href=\"%3$s\">%4$s's update</a>."
+msgstr ""
+"<a href=\"%1$s\">%2$s</a> ја бенди�а <a href=\"%3$s\">објавата на %4$s</a>."
+
+#. TRANS: Text for "liked" item in activity plugin.
+#. TRANS: %1$s is a profile name, %2$s is a profile URL,
+#. TRANS: %3$s is an author name, %4$s is a notice URL.
+#, php-format
+msgid "%1$s (%2$s) liked %3$s's status (%4$s)."
+msgstr "%1$s (%2$s) го бенди�а �тату�от на %3$s (%4$s)."
+
+#. TRANS: Text for "stopped liking" item in activity plugin.
+#. TRANS: %1$s is a profile URL, %2$s is a profile name,
+#. TRANS: %3$s is a notice URL, %4$s is an author name.
+#, php-format
+msgid ""
+"<a href=\"%1$s\">%2$s</a> stopped liking <a href=\"%3$s\">%4$s's update</a>."
+msgstr ""
+"<a href=\"%1$s\">%2$s</a> повеќе не ја бенди�ува <a href=\"%3$s\">објавата "
+"на %4$s</a>."
+
+#. TRANS: Text for "stopped liking" item in activity plugin.
+#. TRANS: %1$s is a profile name, %2$s is a profile URL,
+#. TRANS: %3$s is an author name, %4$s is a notice URL.
+#, php-format
+msgid "%1$s (%2$s) stopped liking %3$s's status (%4$s)."
+msgstr "%1$s (%2$s) повеќе не го бенди�ува �тату�от на %3$s (%4$s)."
+
+#. TRANS: Text for "joined group" item in activity plugin.
+#. TRANS: %1$s is a profile name, %2$s is a profile URL,
+#. TRANS: %3$s is a group name, %4$s is a group URL.
+#, php-format
+msgid "%1$s (%2$s) joined the group %3$s (%4$s)."
+msgstr "%1$s (%2$s) �е зачлени во групата %3$s (%4$s)."
+
+#. TRANS: Text for "left group" item in activity plugin.
+#. TRANS: %1$s is a profile URL, %2$s is a profile name,
+#. TRANS: %3$s is a group URL, %4$s is a group name.
+#, php-format
+msgid "<a href=\"%1$s\">%2$s</a> left the group <a href=\"%3$s\">%4$s</a>."
+msgstr ""
+"<a href=\"%1$s\">%2$s</a> ја напушти групата <a href=\"%3$s\">%4$s</a>."
+
+#. TRANS: Text for "left group" item in activity plugin.
+#. TRANS: %1$s is a profile name, %2$s is a profile URL,
+#. TRANS: %3$s is a group name, %4$s is a group URL.
+#, php-format
+msgid "%1$s (%2$s) left the group %3$s (%4$s)."
+msgstr "%1$s (%2$s) ја напушти групата %3$s (%4$s)."
+
+#. TRANS: Plugin description.
+msgid "Emits notices when social activities happen."
+msgstr "Емитува изве�тувања кога �е одвиваат друштвени активно�ти."
diff --git a/plugins/Activity/locale/nl/LC_MESSAGES/Activity.po b/plugins/Activity/locale/nl/LC_MESSAGES/Activity.po
new file mode 100644
index 0000000000..b724afa46e
--- /dev/null
+++ b/plugins/Activity/locale/nl/LC_MESSAGES/Activity.po
@@ -0,0 +1,120 @@
+# Translation of StatusNet - Activity to Dutch (Nederlands)
+# Exported from translatewiki.net
+#
+# Author: Siebrand
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Activity\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:29+0000\n"
+"Language-Team: Dutch <https://translatewiki.net/wiki/Portal:nl>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2012-01-30 18:15:05+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: nl\n"
+"X-Message-Group: #out-statusnet-plugin-activity\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Text for "joined list" item in activity plugin.
+#. TRANS: %1$s is a profile URL, %2$s is a profile name,
+#. TRANS: %3$s is a group home URL, %4$s is a group name.
+#. TRANS: Text for "joined group" item in activity plugin.
+#. TRANS: %1$s is a profile URL, %2$s is a profile name,
+#. TRANS: %3$s is a group URL, %4$s is a group name.
+#, php-format
+msgid "<a href=\"%1$s\">%2$s</a> joined the group <a href=\"%3$s\">%4$s</a>."
+msgstr ""
+"<a href=\"%1$s\">%2$s</a> is lid geworden van de groep <a href=\"%3$s\">%4"
+"$s</a>."
+
+#. TRANS: Text for "started following" item in activity plugin.
+#. TRANS: %1$s is a profile URL, %2$s is a profile name,
+#. TRANS: %3$s is a profile URL, %4$s is a profile name.
+#, php-format
+msgid "<a href=\"%1$s\">%2$s</a> started following <a href=\"%3$s\">%4$s</a>."
+msgstr "<a href=\"%1$s\">%2$s</a> is <a href=\"%3$s\">%4$s</a> gaan volgen."
+
+#. TRANS: Text for "started following" item in activity plugin.
+#. TRANS: %1$s is a profile name, %2$s is a profile URL,
+#. TRANS: %3$s is a profile name, %4$s is a profile URL.
+#, php-format
+msgid "%1$s (%2$s) started following %3$s (%4$s)."
+msgstr "%1$s (%2$s) is %3$s (%4$s) gaan volgen."
+
+#. TRANS: Text for "stopped following" item in activity plugin.
+#. TRANS: %1$s is a profile URL, %2$s is a profile name,
+#. TRANS: %3$s is a profile URL, %4$s is a profile name.
+#, php-format
+msgid "<a href=\"%1$s\">%2$s</a> stopped following <a href=\"%3$s\">%4$s</a>."
+msgstr "<a href=\"%1$s\">%2$s</a> volgt <a href=\"%3$s\">%4$s</a> niet langer."
+
+#. TRANS: Text for "stopped following" item in activity plugin.
+#. TRANS: %1$s is a profile name, %2$s is a profile URL,
+#. TRANS: %3$s is a profile name, %4$s is a profile URL.
+#, php-format
+msgid "%1$s (%2$s) stopped following %3$s (%4$s)."
+msgstr "%1$s (%2$s) volgt %3$s (%4$s) niet langer."
+
+#. TRANS: Text for "liked" item in activity plugin.
+#. TRANS: %1$s is a profile URL, %2$s is a profile name,
+#. TRANS: %3$s is a notice URL, %4$s is an author name.
+#, php-format
+msgid "<a href=\"%1$s\">%2$s</a> liked <a href=\"%3$s\">%4$s's update</a>."
+msgstr ""
+"<a href=\"%1$s\">%2$s</a> vindt de <a href=\"%3$s\">status van %4$s</a> leuk."
+
+#. TRANS: Text for "liked" item in activity plugin.
+#. TRANS: %1$s is a profile name, %2$s is a profile URL,
+#. TRANS: %3$s is an author name, %4$s is a notice URL.
+#, php-format
+msgid "%1$s (%2$s) liked %3$s's status (%4$s)."
+msgstr "%1$s (%2$s) vindt de status van %3$s leuk (%4$s)."
+
+#. TRANS: Text for "stopped liking" item in activity plugin.
+#. TRANS: %1$s is a profile URL, %2$s is a profile name,
+#. TRANS: %3$s is a notice URL, %4$s is an author name.
+#, php-format
+msgid ""
+"<a href=\"%1$s\">%2$s</a> stopped liking <a href=\"%3$s\">%4$s's update</a>."
+msgstr ""
+"<a href=\"%1$s\">%2$s</a> vindt de <a href=\"%3$s\">status van %4$s</a> niet "
+"langer leuk."
+
+#. TRANS: Text for "stopped liking" item in activity plugin.
+#. TRANS: %1$s is a profile name, %2$s is a profile URL,
+#. TRANS: %3$s is an author name, %4$s is a notice URL.
+#, php-format
+msgid "%1$s (%2$s) stopped liking %3$s's status (%4$s)."
+msgstr "%1$s (%2$s) vindt de status van %3$s niet langer leuk (%4$s)."
+
+#. TRANS: Text for "joined group" item in activity plugin.
+#. TRANS: %1$s is a profile name, %2$s is a profile URL,
+#. TRANS: %3$s is a group name, %4$s is a group URL.
+#, php-format
+msgid "%1$s (%2$s) joined the group %3$s (%4$s)."
+msgstr "%1$s (%2$s) is lid geworden van de groep %3$s (%4$s)."
+
+#. TRANS: Text for "left group" item in activity plugin.
+#. TRANS: %1$s is a profile URL, %2$s is a profile name,
+#. TRANS: %3$s is a group URL, %4$s is a group name.
+#, php-format
+msgid "<a href=\"%1$s\">%2$s</a> left the group <a href=\"%3$s\">%4$s</a>."
+msgstr ""
+"<a href=\"%1$s\">%2$s</a> heeft de groep <a href=\"%3$s\">%4$s</a> verlaten."
+
+#. TRANS: Text for "left group" item in activity plugin.
+#. TRANS: %1$s is a profile name, %2$s is a profile URL,
+#. TRANS: %3$s is a group name, %4$s is a group URL.
+#, php-format
+msgid "%1$s (%2$s) left the group %3$s (%4$s)."
+msgstr "%1$s (%2$s) heeft de groep %3$s verlaten (%4$s)."
+
+#. TRANS: Plugin description.
+msgid "Emits notices when social activities happen."
+msgstr "Verstuurt mededelingen als sociale activiteiten gebeuren."
diff --git a/plugins/Activity/locale/pl/LC_MESSAGES/Activity.po b/plugins/Activity/locale/pl/LC_MESSAGES/Activity.po
new file mode 100644
index 0000000000..e1c9e7e9bc
--- /dev/null
+++ b/plugins/Activity/locale/pl/LC_MESSAGES/Activity.po
@@ -0,0 +1,117 @@
+# Translation of StatusNet - Activity to Polish (polski)
+# Exported from translatewiki.net
+#
+# Author: BeginaFelicysym
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Activity\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:30+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2012-01-30 18:15:05+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=3; plural=(n == 1) ? 0 : ( (n%10 >= 2 && n%10 <= 4 && "
+"(n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
+
+#. TRANS: Text for "joined list" item in activity plugin.
+#. TRANS: %1$s is a profile URL, %2$s is a profile name,
+#. TRANS: %3$s is a group home URL, %4$s is a group name.
+#. TRANS: Text for "joined group" item in activity plugin.
+#. TRANS: %1$s is a profile URL, %2$s is a profile name,
+#. TRANS: %3$s is a group URL, %4$s is a group name.
+#, php-format
+msgid "<a href=\"%1$s\">%2$s</a> joined the group <a href=\"%3$s\">%4$s</a>."
+msgstr "<a href=\"%1$s\">%2$s</a> dołączył do grupy <a href=\"%3$s\">%4$s</a>."
+
+#. TRANS: Text for "started following" item in activity plugin.
+#. TRANS: %1$s is a profile URL, %2$s is a profile name,
+#. TRANS: %3$s is a profile URL, %4$s is a profile name.
+#, php-format
+msgid "<a href=\"%1$s\">%2$s</a> started following <a href=\"%3$s\">%4$s</a>."
+msgstr "<a href=\"%1$s\">%2$s</a> zaczął obserwować <a href=\"%3$s\">%4$s</a>."
+
+#. TRANS: Text for "started following" item in activity plugin.
+#. TRANS: %1$s is a profile name, %2$s is a profile URL,
+#. TRANS: %3$s is a profile name, %4$s is a profile URL.
+#, php-format
+msgid "%1$s (%2$s) started following %3$s (%4$s)."
+msgstr "%1$s (%2$s) zaczął obserwować %3$s (%4$s)."
+
+#. TRANS: Text for "stopped following" item in activity plugin.
+#. TRANS: %1$s is a profile URL, %2$s is a profile name,
+#. TRANS: %3$s is a profile URL, %4$s is a profile name.
+#, php-format
+msgid "<a href=\"%1$s\">%2$s</a> stopped following <a href=\"%3$s\">%4$s</a>."
+msgstr ""
+"<a href=\"%1$s\">%2$s</a> zakończył obserwację <a href=\"%3$s\">%4$s</a>."
+
+#. TRANS: Text for "stopped following" item in activity plugin.
+#. TRANS: %1$s is a profile name, %2$s is a profile URL,
+#. TRANS: %3$s is a profile name, %4$s is a profile URL.
+#, php-format
+msgid "%1$s (%2$s) stopped following %3$s (%4$s)."
+msgstr "%1$s (%2$s) zakończył obserwację %3$s (%4$s)."
+
+#. TRANS: Text for "liked" item in activity plugin.
+#. TRANS: %1$s is a profile URL, %2$s is a profile name,
+#. TRANS: %3$s is a notice URL, %4$s is an author name.
+#, php-format
+msgid "<a href=\"%1$s\">%2$s</a> liked <a href=\"%3$s\">%4$s's update</a>."
+msgstr ""
+"<a href=\"%1$s\">%2$s</a> polubił <a href=\"%3$s\">aktualizację użytkownika %"
+"4$s</a>."
+
+#. TRANS: Text for "liked" item in activity plugin.
+#. TRANS: %1$s is a profile name, %2$s is a profile URL,
+#. TRANS: %3$s is an author name, %4$s is a notice URL.
+#, php-format
+msgid "%1$s (%2$s) liked %3$s's status (%4$s)."
+msgstr "%1$s (%2$s) polubił status (%4$s) użytkownika %3$s."
+
+#. TRANS: Text for "stopped liking" item in activity plugin.
+#. TRANS: %1$s is a profile URL, %2$s is a profile name,
+#. TRANS: %3$s is a notice URL, %4$s is an author name.
+#, php-format
+msgid ""
+"<a href=\"%1$s\">%2$s</a> stopped liking <a href=\"%3$s\">%4$s's update</a>."
+msgstr ""
+"<a href=\"%1$s\">%2$s</a> przestał lubić <a href=\"%3$s\">aktualizację "
+"użytkownika %4$s</a>."
+
+#. TRANS: Text for "stopped liking" item in activity plugin.
+#. TRANS: %1$s is a profile name, %2$s is a profile URL,
+#. TRANS: %3$s is an author name, %4$s is a notice URL.
+#, php-format
+msgid "%1$s (%2$s) stopped liking %3$s's status (%4$s)."
+msgstr "%1$s (%2$s) przestał lubić status (%4$s) użytkownika %3$s."
+
+#. TRANS: Text for "joined group" item in activity plugin.
+#. TRANS: %1$s is a profile name, %2$s is a profile URL,
+#. TRANS: %3$s is a group name, %4$s is a group URL.
+#, php-format
+msgid "%1$s (%2$s) joined the group %3$s (%4$s)."
+msgstr "%1$s (%2$s) dołączył do grupy %3$s (%4$s)."
+
+#. TRANS: Text for "left group" item in activity plugin.
+#. TRANS: %1$s is a profile URL, %2$s is a profile name,
+#. TRANS: %3$s is a group URL, %4$s is a group name.
+#, php-format
+msgid "<a href=\"%1$s\">%2$s</a> left the group <a href=\"%3$s\">%4$s</a>."
+msgstr "<a href=\"%1$s\">%2$s</a> opuścił grupę <a href=\"%3$s\">%4$s</a>."
+
+#. TRANS: Text for "left group" item in activity plugin.
+#. TRANS: %1$s is a profile name, %2$s is a profile URL,
+#. TRANS: %3$s is a group name, %4$s is a group URL.
+#, php-format
+msgid "%1$s (%2$s) left the group %3$s (%4$s)."
+msgstr "%1$s (%2$s) opuścił grupę %3$s (%4$s)."
+
+#. TRANS: Plugin description.
+msgid "Emits notices when social activities happen."
+msgstr "Wysyła ogłoszenia, gdy się dzieją się zdarzenia towarzyskie."
diff --git a/plugins/Activity/locale/ru/LC_MESSAGES/Activity.po b/plugins/Activity/locale/ru/LC_MESSAGES/Activity.po
new file mode 100644
index 0000000000..59377cb696
--- /dev/null
+++ b/plugins/Activity/locale/ru/LC_MESSAGES/Activity.po
@@ -0,0 +1,121 @@
+# Translation of StatusNet - Activity to Russian (ру��кий)
+# Exported from translatewiki.net
+#
+# Author: Lockal
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Activity\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:30+0000\n"
+"Language-Team: Russian <https://translatewiki.net/wiki/Portal:ru>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2012-01-30 18:15:05+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: ru\n"
+"X-Message-Group: #out-statusnet-plugin-activity\n"
+"Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
+"2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
+
+#. TRANS: Text for "joined list" item in activity plugin.
+#. TRANS: %1$s is a profile URL, %2$s is a profile name,
+#. TRANS: %3$s is a group home URL, %4$s is a group name.
+#. TRANS: Text for "joined group" item in activity plugin.
+#. TRANS: %1$s is a profile URL, %2$s is a profile name,
+#. TRANS: %3$s is a group URL, %4$s is a group name.
+#, php-format
+msgid "<a href=\"%1$s\">%2$s</a> joined the group <a href=\"%3$s\">%4$s</a>."
+msgstr ""
+"<a href=\"%1$s\">%2$s</a> при�оединил�� к группе <a href=\"%3$s\">%4$s</a>."
+
+#. TRANS: Text for "started following" item in activity plugin.
+#. TRANS: %1$s is a profile URL, %2$s is a profile name,
+#. TRANS: %3$s is a profile URL, %4$s is a profile name.
+#, fuzzy, php-format
+msgid "<a href=\"%1$s\">%2$s</a> started following <a href=\"%3$s\">%4$s</a>."
+msgstr "<a href=\"%1$s\">%2$s</a> начал �ледить за <a href=\"%2$s\">%4$s</a>."
+
+#. TRANS: Text for "started following" item in activity plugin.
+#. TRANS: %1$s is a profile name, %2$s is a profile URL,
+#. TRANS: %3$s is a profile name, %4$s is a profile URL.
+#, php-format
+msgid "%1$s (%2$s) started following %3$s (%4$s)."
+msgstr "%1$s (%2$s) начал �ледить за %3$s (%4$s)."
+
+#. TRANS: Text for "stopped following" item in activity plugin.
+#. TRANS: %1$s is a profile URL, %2$s is a profile name,
+#. TRANS: %3$s is a profile URL, %4$s is a profile name.
+#, php-format
+msgid "<a href=\"%1$s\">%2$s</a> stopped following <a href=\"%3$s\">%4$s</a>."
+msgstr ""
+"<a href=\"%1$s\">%2$s</a> пере�тал �ледить за <a href=\"%3$s\">%4$s</a>."
+
+#. TRANS: Text for "stopped following" item in activity plugin.
+#. TRANS: %1$s is a profile name, %2$s is a profile URL,
+#. TRANS: %3$s is a profile name, %4$s is a profile URL.
+#, php-format
+msgid "%1$s (%2$s) stopped following %3$s (%4$s)."
+msgstr "%1$s (%2$s) пере�тал �ледить за %3$s (%4$s)."
+
+#. TRANS: Text for "liked" item in activity plugin.
+#. TRANS: %1$s is a profile URL, %2$s is a profile name,
+#. TRANS: %3$s is a notice URL, %4$s is an author name.
+#, php-format
+msgid "<a href=\"%1$s\">%2$s</a> liked <a href=\"%3$s\">%4$s's update</a>."
+msgstr ""
+"<a href=\"%1$s\">%2$s</a> добавил <a href=\"%3$s\">обновление %4$s</a> в "
+"чи�ло любимых."
+
+#. TRANS: Text for "liked" item in activity plugin.
+#. TRANS: %1$s is a profile name, %2$s is a profile URL,
+#. TRANS: %3$s is an author name, %4$s is a notice URL.
+#, php-format
+msgid "%1$s (%2$s) liked %3$s's status (%4$s)."
+msgstr "%1$s (%2$s) добавил �тату� %3$s в чи�ло любимых (%4$s)."
+
+#. TRANS: Text for "stopped liking" item in activity plugin.
+#. TRANS: %1$s is a profile URL, %2$s is a profile name,
+#. TRANS: %3$s is a notice URL, %4$s is an author name.
+#, php-format
+msgid ""
+"<a href=\"%1$s\">%2$s</a> stopped liking <a href=\"%3$s\">%4$s's update</a>."
+msgstr ""
+"<a href=\"%1$s\">%2$s</a> убрал <a href=\"%3$s\">обновление %4$s</a> из "
+"чи�ла любимых."
+
+#. TRANS: Text for "stopped liking" item in activity plugin.
+#. TRANS: %1$s is a profile name, %2$s is a profile URL,
+#. TRANS: %3$s is an author name, %4$s is a notice URL.
+#, php-format
+msgid "%1$s (%2$s) stopped liking %3$s's status (%4$s)."
+msgstr "%1$s (%2$s) убрал �тату� %3$s из чи�ла любимых (%4$s)."
+
+#. TRANS: Text for "joined group" item in activity plugin.
+#. TRANS: %1$s is a profile name, %2$s is a profile URL,
+#. TRANS: %3$s is a group name, %4$s is a group URL.
+#, php-format
+msgid "%1$s (%2$s) joined the group %3$s (%4$s)."
+msgstr "%1$s (%2$s) при�оединил�� к группе %3$s (%4$s)."
+
+#. TRANS: Text for "left group" item in activity plugin.
+#. TRANS: %1$s is a profile URL, %2$s is a profile name,
+#. TRANS: %3$s is a group URL, %4$s is a group name.
+#, php-format
+msgid "<a href=\"%1$s\">%2$s</a> left the group <a href=\"%3$s\">%4$s</a>."
+msgstr "<a href=\"%1$s\">%2$s</a> покинул группу <a href=\"%3$s\">%4$s</a>."
+
+#. TRANS: Text for "left group" item in activity plugin.
+#. TRANS: %1$s is a profile name, %2$s is a profile URL,
+#. TRANS: %3$s is a group name, %4$s is a group URL.
+#, php-format
+msgid "%1$s (%2$s) left the group %3$s (%4$s)."
+msgstr "%1$s (%2$s) покинул группу %3$s (%4$s)."
+
+#. TRANS: Plugin description.
+msgid "Emits notices when social activities happen."
+msgstr "Выдаёт уведомлени�, когда прои�ходит �оциальна� де�тельно�ть."
diff --git a/plugins/Activity/locale/tl/LC_MESSAGES/Activity.po b/plugins/Activity/locale/tl/LC_MESSAGES/Activity.po
new file mode 100644
index 0000000000..31be464cba
--- /dev/null
+++ b/plugins/Activity/locale/tl/LC_MESSAGES/Activity.po
@@ -0,0 +1,121 @@
+# Translation of StatusNet - Activity to Tagalog (Tagalog)
+# Exported from translatewiki.net
+#
+# Author: AnakngAraw
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Activity\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:30+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2012-01-30 18:15:05+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Text for "joined list" item in activity plugin.
+#. TRANS: %1$s is a profile URL, %2$s is a profile name,
+#. TRANS: %3$s is a group home URL, %4$s is a group name.
+#. TRANS: Text for "joined group" item in activity plugin.
+#. TRANS: %1$s is a profile URL, %2$s is a profile name,
+#. TRANS: %3$s is a group URL, %4$s is a group name.
+#, php-format
+msgid "<a href=\"%1$s\">%2$s</a> joined the group <a href=\"%3$s\">%4$s</a>."
+msgstr ""
+"Sumali si <a href=\"%1$s\">%2$s</a> sa pangkat na <a href=\"%3$s\">%4$s</a>."
+
+#. TRANS: Text for "started following" item in activity plugin.
+#. TRANS: %1$s is a profile URL, %2$s is a profile name,
+#. TRANS: %3$s is a profile URL, %4$s is a profile name.
+#, php-format
+msgid "<a href=\"%1$s\">%2$s</a> started following <a href=\"%3$s\">%4$s</a>."
+msgstr ""
+"Nagsimulang sundan ni <a href=\"%1$s\">%2$s</a> si <a href=\"%3$s\">%4$s</a>."
+
+#. TRANS: Text for "started following" item in activity plugin.
+#. TRANS: %1$s is a profile name, %2$s is a profile URL,
+#. TRANS: %3$s is a profile name, %4$s is a profile URL.
+#, php-format
+msgid "%1$s (%2$s) started following %3$s (%4$s)."
+msgstr "Nagsimulang sundan ni %1$s (%2$s) si %3$s (%4$s)."
+
+#. TRANS: Text for "stopped following" item in activity plugin.
+#. TRANS: %1$s is a profile URL, %2$s is a profile name,
+#. TRANS: %3$s is a profile URL, %4$s is a profile name.
+#, php-format
+msgid "<a href=\"%1$s\">%2$s</a> stopped following <a href=\"%3$s\">%4$s</a>."
+msgstr ""
+"Huminto si <a href=\"%1$s\">%2$s</a> sa pagsunod kay <a href=\"%3$s\">%4$s</"
+"a>."
+
+#. TRANS: Text for "stopped following" item in activity plugin.
+#. TRANS: %1$s is a profile name, %2$s is a profile URL,
+#. TRANS: %3$s is a profile name, %4$s is a profile URL.
+#, php-format
+msgid "%1$s (%2$s) stopped following %3$s (%4$s)."
+msgstr "Huminto si %1$s (%2$s) sa pagsunod kay %3$s (%4$s)."
+
+#. TRANS: Text for "liked" item in activity plugin.
+#. TRANS: %1$s is a profile URL, %2$s is a profile name,
+#. TRANS: %3$s is a notice URL, %4$s is an author name.
+#, php-format
+msgid "<a href=\"%1$s\">%2$s</a> liked <a href=\"%3$s\">%4$s's update</a>."
+msgstr ""
+"Nagustuhan ni <a href=\"%1$s\">%2$s</a> ang <a href=\"%3$s\">pagsasapanahon "
+"ni %4$s</a>."
+
+#. TRANS: Text for "liked" item in activity plugin.
+#. TRANS: %1$s is a profile name, %2$s is a profile URL,
+#. TRANS: %3$s is an author name, %4$s is a notice URL.
+#, php-format
+msgid "%1$s (%2$s) liked %3$s's status (%4$s)."
+msgstr "Nagustuhan ni %1$s (%2$s) ang katayuan ni %3$s (%4$s)."
+
+#. TRANS: Text for "stopped liking" item in activity plugin.
+#. TRANS: %1$s is a profile URL, %2$s is a profile name,
+#. TRANS: %3$s is a notice URL, %4$s is an author name.
+#, php-format
+msgid ""
+"<a href=\"%1$s\">%2$s</a> stopped liking <a href=\"%3$s\">%4$s's update</a>."
+msgstr ""
+"Huminto sa paggusto si <a href=\"%1$s\">%2$s</a> kay <a href=\"%3$s\">%4$s's "
+"update</a>."
+
+#. TRANS: Text for "stopped liking" item in activity plugin.
+#. TRANS: %1$s is a profile name, %2$s is a profile URL,
+#. TRANS: %3$s is an author name, %4$s is a notice URL.
+#, php-format
+msgid "%1$s (%2$s) stopped liking %3$s's status (%4$s)."
+msgstr "Huminto si %1$s (%2$s) sa paggusto ng katayuan ni %3$s (%4$s)."
+
+#. TRANS: Text for "joined group" item in activity plugin.
+#. TRANS: %1$s is a profile name, %2$s is a profile URL,
+#. TRANS: %3$s is a group name, %4$s is a group URL.
+#, php-format
+msgid "%1$s (%2$s) joined the group %3$s (%4$s)."
+msgstr "Sumali si %1$s (%2$s) sa pangkat na %3$s (%4$s)."
+
+#. TRANS: Text for "left group" item in activity plugin.
+#. TRANS: %1$s is a profile URL, %2$s is a profile name,
+#. TRANS: %3$s is a group URL, %4$s is a group name.
+#, php-format
+msgid "<a href=\"%1$s\">%2$s</a> left the group <a href=\"%3$s\">%4$s</a>."
+msgstr ""
+"Umalis si <a href=\"%1$s\">%2$s</a> mula sa pangkat na <a href=\"%3$s\">%4"
+"$s</a>."
+
+#. TRANS: Text for "left group" item in activity plugin.
+#. TRANS: %1$s is a profile name, %2$s is a profile URL,
+#. TRANS: %3$s is a group name, %4$s is a group URL.
+#, php-format
+msgid "%1$s (%2$s) left the group %3$s (%4$s)."
+msgstr "Umalis si %1$s (%2$s) mula sa pangkat na %3$s (%4$s)."
+
+#. TRANS: Plugin description.
+msgid "Emits notices when social activities happen."
+msgstr "Nagbubuga ng mga pabatid kapag nagaganap ang mga gawaing panlipunan."
diff --git a/plugins/Activity/systemlistitem.php b/plugins/Activity/systemlistitem.php
new file mode 100644
index 0000000000..c6753e5ff1
--- /dev/null
+++ b/plugins/Activity/systemlistitem.php
@@ -0,0 +1,89 @@
+<?php
+/**
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2011, StatusNet, Inc.
+ *
+ * Superclass for system event items
+ *
+ * PHP version 5
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Activity
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2011 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    // This check helps protect against security problems;
+    // your code file can't be executed directly from the web.
+    exit(1);
+}
+
+/**
+ * NoticeListItemAdapter for system activities
+ *
+ * @category  General
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2011 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+class SystemListItem extends NoticeListItemAdapter
+{
+    /**
+     * Show the activity
+     *
+     * @return void
+     */
+    function showNotice()
+    {
+        $out = $this->nli->out;
+        $out->elementStart('div', 'entry-title');
+        $this->showContent();
+        $out->elementEnd('div');
+    }
+
+    function showContent()
+    {
+        $notice = $this->nli->notice;
+        $out    = $this->nli->out;
+
+        // FIXME: get the actual data on the leave
+
+        $out->elementStart('div', 'system-activity');
+
+        $out->raw($notice->rendered);
+
+        $out->elementEnd('div');
+    }
+
+    function showNoticeOptions()
+    {
+        if (Event::handle('StartShowNoticeOptions', array($this))) {
+            $user = common_current_user();
+            if (!empty($user)) {
+                $this->nli->out->elementStart('div', 'notice-options');
+                $this->showFaveForm();
+                $this->showReplyLink();
+                $this->nli->out->elementEnd('div');
+            }
+            Event::handle('EndShowNoticeOptions', array($this));
+        }
+    }
+}
diff --git a/plugins/Activity/unfollowlistitem.php b/plugins/Activity/unfollowlistitem.php
new file mode 100644
index 0000000000..0ecb8bef5a
--- /dev/null
+++ b/plugins/Activity/unfollowlistitem.php
@@ -0,0 +1,75 @@
+<?php
+/**
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2011, StatusNet, Inc.
+ *
+ * Unfollow list item
+ *
+ * PHP version 5
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Activity
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2011 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    // This check helps protect against security problems;
+    // your code file can't be executed directly from the web.
+    exit(1);
+}
+
+/**
+ * NoticeListItemAdapter for join activities
+ *
+ * @category  General
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2011 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+class UnfollowListItem extends SystemListItem
+{
+    /**
+     * Show the join activity
+     *
+     * @return void
+     */
+    function showNotice()
+    {
+        $out = $this->nli->out;
+        $out->elementStart('div', 'entry-title');
+        $this->showContent();
+        $out->elementEnd('div');
+    }
+
+    function showContent()
+    {
+        $notice = $this->nli->notice;
+        $out    = $this->nli->out;
+
+		// FIXME: get the actual data on the leave
+
+        $out->elementStart('div', 'unfollow-activity');
+
+        $out->raw($notice->rendered);
+
+        $out->elementEnd('div');
+    }
+}
diff --git a/plugins/ActivitySpam/ActivitySpamPlugin.php b/plugins/ActivitySpam/ActivitySpamPlugin.php
new file mode 100644
index 0000000000..978f8b4cf8
--- /dev/null
+++ b/plugins/ActivitySpam/ActivitySpamPlugin.php
@@ -0,0 +1,293 @@
+<?php
+/**
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2011,2012, StatusNet, Inc.
+ *
+ * ActivitySpam Plugin
+ *
+ * PHP version 5
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Spam
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2011,2012 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    // This check helps protect against security problems;
+    // your code file can't be executed directly from the web.
+    exit(1);
+}
+
+/**
+ * Check new notices with activity spam service.
+ * 
+ * @category  Spam
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2011,2012 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+class ActivitySpamPlugin extends Plugin
+{
+    public $server = null;
+    public $hideSpam = false;
+
+    const REVIEWSPAM = 'ActivitySpamPlugin::REVIEWSPAM';
+    const TRAINSPAM = 'ActivitySpamPlugin::TRAINSPAM';
+
+    /**
+     * Initializer
+     *
+     * @return boolean hook value; true means continue processing, false means stop.
+     */
+    function initialize()
+    {
+        $this->filter = new SpamFilter(common_config('activityspam', 'server'),
+                                       common_config('activityspam', 'consumerkey'),
+                                       common_config('activityspam', 'secret'));
+
+        $this->hideSpam = common_config('activityspam', 'hidespam');
+
+        // Let DB_DataObject find Spam_score
+
+        common_config_set('db', 'class_location', 
+                          common_config('db', 'class_location') .':'.dirname(__FILE__));
+
+        return true;
+    }
+
+    /**
+     * Database schema setup
+     *
+     * @see Schema
+     * @see ColumnDef
+     *
+     * @return boolean hook value; true means continue processing, false means stop.
+     */
+
+    function onCheckSchema()
+    {
+        $schema = Schema::get();
+        $schema->ensureTable('spam_score', Spam_score::schemaDef());
+
+        Spam_score::upgrade();
+
+        return true;
+    }
+
+    /**
+     * Load related modules when needed
+     *
+     * @param string $cls Name of the class to be loaded
+     *
+     * @return boolean hook value; true means continue processing, false means stop.
+     */
+
+    function onAutoload($cls)
+    {
+        $dir = dirname(__FILE__);
+
+        switch ($cls)
+        {
+        case 'TrainAction':
+        case 'SpamAction':
+            include_once $dir . '/' . strtolower(mb_substr($cls, 0, -6)) . '.php';
+            return false;
+        case 'Spam_score':
+            include_once $dir . '/'.$cls.'.php';
+            return false;
+        case 'SpamFilter':
+        case 'SpamNoticeStream':
+        case 'TrainSpamForm':
+        case 'TrainHamForm':
+            include_once $dir . '/'.strtolower($cls).'.php';
+            return false;
+        default:
+            return true;
+        }
+    }
+
+    /**
+     * When a notice is saved, check its spam score
+     * 
+     * @param Notice $notice Notice that was just saved
+     *
+     * @return boolean hook value; true means continue processing, false means stop.
+     */
+
+    function onEndNoticeSave($notice)
+    {
+        try {
+
+            $result = $this->filter->test($notice);
+
+            $score = Spam_score::saveNew($notice, $result);
+
+            $this->log(LOG_INFO, "Notice " . $notice->id . " has spam score " . $score->score);
+
+        } catch (Exception $e) {
+            // Log but continue 
+            $this->log(LOG_ERR, $e->getMessage());
+        }
+
+        return true;
+    }
+
+    function onNoticeDeleteRelated($notice) {
+        $score = Spam_score::staticGet('notice_id', $notice->id);
+        if (!empty($score)) {
+            $score->delete();
+        }
+        return true;
+    }
+
+    function onUserRightsCheck($profile, $right, &$result) {
+        switch ($right) {
+        case self::REVIEWSPAM:
+        case self::TRAINSPAM:
+            $result = ($profile->hasRole(Profile_role::MODERATOR) || $profile->hasRole('modhelper'));
+            return false;
+        default:
+            return true;
+        }
+    }
+
+    function onGetSpamFilter(&$filter) {
+        $filter = $this->filter;
+        return false;
+    }
+
+    function onEndShowNoticeOptionItems($nli)
+    {
+        $profile = Profile::current();
+
+        if (!empty($profile) && $profile->hasRight(self::TRAINSPAM)) {
+
+            $notice = $nli->getNotice();
+            $out = $nli->getOut();
+
+            if (!empty($notice)) {
+
+                $score = Spam_score::staticGet('notice_id', $notice->id);
+
+                if (empty($score)) {
+                    // If it's empty, we can train it.
+                    $form = new TrainSpamForm($out, $notice);
+                    $form->show();
+                } else if ($score->is_spam) {
+                    $form = new TrainHamForm($out, $notice);
+                    $form->show();
+                } else if (!$score->is_spam) {
+                    $form = new TrainSpamForm($out, $notice);
+                    $form->show();
+                }
+            }
+        }
+
+        return true;
+    }
+    
+    /**
+     * Map URLs to actions
+     *
+     * @param Net_URL_Mapper $m path-to-action mapper
+     *
+     * @return boolean hook value; true means continue processing, false means stop.
+     */
+
+    function onRouterInitialized($m)
+    {
+        $m->connect('main/train/spam',
+                    array('action' => 'train', 'category' => 'spam'));
+        $m->connect('main/train/ham',
+                    array('action' => 'train', 'category' => 'ham'));
+        $m->connect('main/spam',
+                    array('action' => 'spam'));
+        return true;
+    }
+
+    function onEndShowStyles($action)
+    {
+        $action->element('style', null,
+                         '.form-train-spam input.submit { background: url('.$this->path('icons/bullet_black.png').') no-repeat 0px 0px } ' . "\n" .
+                         '.form-train-ham input.submit { background: url('.$this->path('icons/exclamation.png').') no-repeat 0px 0px } ');
+        return true;
+    }
+
+    function onEndPublicGroupNav($nav)
+    {
+        $user = common_current_user();
+
+        if (!empty($user) && $user->hasRight(self::REVIEWSPAM)) {
+            $nav->out->menuItem(common_local_url('spam'),
+                                _m('MENU','Spam'),
+                                // TRANS: Menu item title in search group navigation panel.
+                                _('Notices marked as spam'),
+                                $nav->actionName == 'spam',
+                                'nav_timeline_spam');
+        }
+
+        return true;
+    }
+
+    function onPluginVersion(&$versions)
+    {
+        $versions[] = array('name' => 'ActivitySpam',
+                            'version' => STATUSNET_VERSION,
+                            'author' => 'Evan Prodromou',
+                            'homepage' => 'http://status.net/wiki/Plugin:ActivitySpam',
+                            'description' =>
+                            _m('Test notices against the Activity Spam service.'));
+        return true;
+    }
+
+    function onEndNoticeInScope($notice, $profile, &$bResult)
+    {
+        if ($this->hideSpam) {
+            if ($bResult) {
+
+                $score = Spam_score::staticGet('notice_id', $notice->id);
+
+                if (!empty($score) && $score->is_spam) {
+                    if (empty($profile) ||
+                        ($profile->id !== $notice->profile_id &&
+                         !$profile->hasRight(self::REVIEWSPAM))) {
+                        $bResult = false;
+                    }
+                }
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * Pre-cache our spam scores if needed.
+     */
+    function onEndNoticeListPrefill(&$notices, &$profiles, $avatarSize) {
+        if ($this->hideSpam) {
+            foreach ($notices as $notice) {
+                $ids[] = $notice->id;
+            }
+            Memcached_DataObject::multiGet('Spam_score', 'notice_id', $ids);
+        }
+        return true;
+    }
+}
diff --git a/plugins/ActivitySpam/Spam_score.php b/plugins/ActivitySpam/Spam_score.php
new file mode 100644
index 0000000000..997a9f83ad
--- /dev/null
+++ b/plugins/ActivitySpam/Spam_score.php
@@ -0,0 +1,216 @@
+<?php
+  /**
+   * StatusNet - the distributed open-source microblogging tool
+   * Copyright (C) 2011, StatusNet, Inc.
+   *
+   * Score of a notice by activity spam service
+   * 
+   * PHP version 5
+   *
+   * This program is free software: you can redistribute it and/or modify
+   * it under the terms of the GNU Affero General Public License as published by
+   * the Free Software Foundation, either version 3 of the License, or
+   * (at your option) any later version.
+   *
+   * This program is distributed in the hope that it will be useful,
+   * but WITHOUT ANY WARRANTY; without even the implied warranty of
+   * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   * GNU Affero General Public License for more details.
+   *
+   * You should have received a copy of the GNU Affero General Public License
+   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+   *
+   * @category  Spam
+   * @package   StatusNet
+   * @author    Evan Prodromou <evan@status.net>
+   * @copyright 2011 StatusNet, Inc.
+   * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+   * @link      http://status.net/
+   */
+
+if (!defined('STATUSNET')) {
+    exit(1);
+}
+
+/**
+ * Score of a notice per the activity spam service
+ *
+ * @category Spam
+ * @package  StatusNet
+ * @author   Evan Prodromou <evan@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
+ * @link     http://status.net/
+ *
+ * @see      DB_DataObject
+ */
+
+class Spam_score extends Managed_DataObject
+{
+    const MAX_SCALE = 10000;
+    public $__table = 'spam_score'; // table name
+
+    public $notice_id;   // int
+    public $score;       // float
+    public $created;     // datetime
+
+    /**
+     * Get an instance by key
+     *
+     * @param string $k Key to use to lookup (usually 'notice_id' for this class)
+     * @param mixed  $v Value to lookup
+     *
+     * @return Spam_score object found, or null for no hits
+     *
+     */
+    function staticGet($k, $v=null)
+    {
+        return Managed_DataObject::staticGet('Spam_score', $k, $v);
+    }
+
+    function saveNew($notice, $result) {
+
+        $score = new Spam_score();
+
+        $score->notice_id      = $notice->id;
+        $score->score          = $result->probability;
+        $score->is_spam        = $result->isSpam;
+        $score->scaled         = Spam_score::scale($score->score);
+        $score->created        = common_sql_now();
+        $score->notice_created = $notice->created;
+
+        $score->insert();
+
+        self::blow('spam_score:notice_ids');
+
+        return $score;
+    }
+
+    function save($notice, $result) {
+
+        $orig  = null;
+        $score = Spam_score::staticGet('notice_id', $notice->id);
+
+        if (empty($score)) {
+            $score = new Spam_score();
+        } else {
+            $orig = clone($score);
+        }
+
+        $score->notice_id      = $notice->id;
+        $score->score          = $result->probability;
+        $score->is_spam        = $result->isSpam;
+        $score->scaled         = Spam_score::scale($score->score);
+        $score->created        = common_sql_now();
+        $score->notice_created = $notice->created;
+
+        if (empty($orig)) {
+            $score->insert();
+        } else {
+            $score->update($orig);
+        }
+        
+        self::blow('spam_score:notice_ids');
+
+        return $score;
+    }
+
+    function delete()
+    {
+        self::blow('spam_score:notice_ids');
+        self::blow('spam_score:notice_ids;last');
+        parent::delete();
+    }
+
+    /**
+     * The One True Thingy that must be defined and declared.
+     */
+    public static function schemaDef()
+    {
+        return array(
+            'description' => 'score of the notice per activityspam',
+            'fields' => array(
+                'notice_id' => array('type' => 'int',
+                                     'not null' => true,
+                                     'description' => 'notice getting scored'),
+                'score' => array('type' => 'double',
+                                 'not null' => true,
+                                 'description' => 'score for the notice (0.0, 1.0)'),
+                'scaled' => array('type' => 'int',
+                                  'description' => 'scaled score for the notice (0, 10000)'),
+                'is_spam' => array('type' => 'tinyint',
+                                   'description' => 'flag for spamosity'),
+                'created' => array('type' => 'datetime',
+                                   'not null' => true,
+                                   'description' => 'date this record was created'),
+                'notice_created' => array('type' => 'datetime',
+                                          'description' => 'date the notice was created'),
+            ),
+            'primary key' => array('notice_id'),
+            'foreign keys' => array(
+                'spam_score_notice_id_fkey' => array('notice', array('notice_id' => 'id')),
+            ),
+            'indexes' => array(
+                'spam_score_created_idx' => array('created'),
+                'spam_score_scaled_idx' => array('scaled'),
+            ),
+        );
+    }
+
+    public static function upgrade()
+    {
+        Spam_score::upgradeScaled();
+        Spam_score::upgradeIsSpam();
+        Spam_score::upgradeNoticeCreated();
+    }
+
+    protected static function upgradeScaled()
+    {
+        $score = new Spam_score();
+        $score->whereAdd('scaled IS NULL');
+        
+        if ($score->find()) {
+            while ($score->fetch()) {
+                $orig = clone($score);
+                $score->scaled = Spam_score::scale($score->score);
+                $score->update($orig);
+            }
+        }
+    }
+
+    protected static function upgradeIsSpam()
+    {
+        $score = new Spam_score();
+        $score->whereAdd('is_spam IS NULL');
+        
+        if ($score->find()) {
+            while ($score->fetch()) {
+                $orig = clone($score);
+                $score->is_spam = ($score->score >= 0.90) ? 1 : 0;
+                $score->update($orig);
+            }
+        }
+    }
+
+    protected static function upgradeNoticeCreated()
+    {
+        $score = new Spam_score();
+        $score->whereAdd('notice_created IS NULL');
+        
+        if ($score->find()) {
+            while ($score->fetch()) {
+                $notice = Notice::staticGet('id', $score->notice_id);
+                if (!empty($notice)) {
+                    $orig = clone($score);
+                    $score->notice_created = $notice->created;
+                    $score->update($orig);
+                }
+            }
+        }
+    }
+
+    public static function scale($score)
+    {
+        $raw = round($score * Spam_score::MAX_SCALE);
+        return max(0, min(Spam_score::MAX_SCALE, $raw));
+    }
+}
diff --git a/plugins/ActivitySpam/icons/bullet_black.png b/plugins/ActivitySpam/icons/bullet_black.png
new file mode 100644
index 0000000000..57619706d1
Binary files /dev/null and b/plugins/ActivitySpam/icons/bullet_black.png differ
diff --git a/plugins/ActivitySpam/icons/exclamation.png b/plugins/ActivitySpam/icons/exclamation.png
new file mode 100644
index 0000000000..c37bd062e6
Binary files /dev/null and b/plugins/ActivitySpam/icons/exclamation.png differ
diff --git a/plugins/ActivitySpam/locale/ActivitySpam.pot b/plugins/ActivitySpam/locale/ActivitySpam.pot
new file mode 100644
index 0000000000..e5030f3849
--- /dev/null
+++ b/plugins/ActivitySpam/locale/ActivitySpam.pot
@@ -0,0 +1,26 @@
+# 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: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ActivitySpamPlugin.php:240
+msgctxt "MENU"
+msgid "Spam"
+msgstr ""
+
+#: ActivitySpamPlugin.php:257
+msgid "Test notices against the Activity Spam service."
+msgstr ""
diff --git a/plugins/ActivitySpam/locale/de/LC_MESSAGES/ActivitySpam.po b/plugins/ActivitySpam/locale/de/LC_MESSAGES/ActivitySpam.po
new file mode 100644
index 0000000000..055ae2c0aa
--- /dev/null
+++ b/plugins/ActivitySpam/locale/de/LC_MESSAGES/ActivitySpam.po
@@ -0,0 +1,26 @@
+# Translation of StatusNet - ActivitySpam to German (Deutsch)
+# Exported from translatewiki.net
+#
+# Author: PtM
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - ActivitySpam\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:30+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2012-06-18 00:06:35+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgctxt "MENU"
+msgid "Spam"
+msgstr "Spam"
+
+msgid "Test notices against the Activity Spam service."
+msgstr "Nachrichten am Activity-Spam-Service testen"
diff --git a/plugins/ActivitySpam/locale/es/LC_MESSAGES/ActivitySpam.po b/plugins/ActivitySpam/locale/es/LC_MESSAGES/ActivitySpam.po
new file mode 100644
index 0000000000..cdc0b05a6f
--- /dev/null
+++ b/plugins/ActivitySpam/locale/es/LC_MESSAGES/ActivitySpam.po
@@ -0,0 +1,26 @@
+# Translation of StatusNet - ActivitySpam to Spanish (español)
+# Exported from translatewiki.net
+#
+# Author: Armando-Martin
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - ActivitySpam\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:30+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2012-06-18 00:06:35+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgctxt "MENU"
+msgid "Spam"
+msgstr "Spam"
+
+msgid "Test notices against the Activity Spam service."
+msgstr "Probar los avisos contra el servicio de actividad de spam."
diff --git a/plugins/ActivitySpam/locale/fr/LC_MESSAGES/ActivitySpam.po b/plugins/ActivitySpam/locale/fr/LC_MESSAGES/ActivitySpam.po
new file mode 100644
index 0000000000..c72ff453db
--- /dev/null
+++ b/plugins/ActivitySpam/locale/fr/LC_MESSAGES/ActivitySpam.po
@@ -0,0 +1,26 @@
+# Translation of StatusNet - ActivitySpam to French (français)
+# Exported from translatewiki.net
+#
+# Author: Gomoko
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - ActivitySpam\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:30+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2012-06-18 00:06:35+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+msgctxt "MENU"
+msgid "Spam"
+msgstr "Courrier polluant"
+
+msgid "Test notices against the Activity Spam service."
+msgstr "Avis de test à l'encontre du service d'activité du courrier polluant."
diff --git a/plugins/ActivitySpam/locale/gl/LC_MESSAGES/ActivitySpam.po b/plugins/ActivitySpam/locale/gl/LC_MESSAGES/ActivitySpam.po
new file mode 100644
index 0000000000..ebc137ad68
--- /dev/null
+++ b/plugins/ActivitySpam/locale/gl/LC_MESSAGES/ActivitySpam.po
@@ -0,0 +1,26 @@
+# Translation of StatusNet - ActivitySpam to Galician (galego)
+# Exported from translatewiki.net
+#
+# Author: Toliño
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - ActivitySpam\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:30+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2012-06-18 00:06:35+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgctxt "MENU"
+msgid "Spam"
+msgstr "Spam"
+
+msgid "Test notices against the Activity Spam service."
+msgstr "Probar os avisos co servizo de actividade de spam."
diff --git a/plugins/ActivitySpam/locale/ia/LC_MESSAGES/ActivitySpam.po b/plugins/ActivitySpam/locale/ia/LC_MESSAGES/ActivitySpam.po
new file mode 100644
index 0000000000..aa0f94c09a
--- /dev/null
+++ b/plugins/ActivitySpam/locale/ia/LC_MESSAGES/ActivitySpam.po
@@ -0,0 +1,26 @@
+# Translation of StatusNet - ActivitySpam to Interlingua (interlingua)
+# Exported from translatewiki.net
+#
+# Author: McDutchie
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - ActivitySpam\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:30+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2012-06-18 00:06:35+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgctxt "MENU"
+msgid "Spam"
+msgstr "Spam"
+
+msgid "Test notices against the Activity Spam service."
+msgstr "Testar avisos contra le servicio Activity Spam."
diff --git a/plugins/ActivitySpam/locale/it/LC_MESSAGES/ActivitySpam.po b/plugins/ActivitySpam/locale/it/LC_MESSAGES/ActivitySpam.po
new file mode 100644
index 0000000000..606421a140
--- /dev/null
+++ b/plugins/ActivitySpam/locale/it/LC_MESSAGES/ActivitySpam.po
@@ -0,0 +1,27 @@
+# Translation of StatusNet - ActivitySpam to Italian (italiano)
+# Exported from translatewiki.net
+#
+# Author: GreenFox
+# Author: Ximo17
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - ActivitySpam\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:30+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2012-06-18 00:06:35+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgctxt "MENU"
+msgid "Spam"
+msgstr "Spam"
+
+msgid "Test notices against the Activity Spam service."
+msgstr "Avvisi di prova contro il servizio Spam Activity."
diff --git a/plugins/ActivitySpam/locale/mk/LC_MESSAGES/ActivitySpam.po b/plugins/ActivitySpam/locale/mk/LC_MESSAGES/ActivitySpam.po
new file mode 100644
index 0000000000..06b684c814
--- /dev/null
+++ b/plugins/ActivitySpam/locale/mk/LC_MESSAGES/ActivitySpam.po
@@ -0,0 +1,26 @@
+# Translation of StatusNet - ActivitySpam to Macedonian (македон�ки)
+# Exported from translatewiki.net
+#
+# Author: Bjankuloski06
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - ActivitySpam\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:30+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2012-06-18 00:06:35+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
+
+msgctxt "MENU"
+msgid "Spam"
+msgstr "Спам"
+
+msgid "Test notices against the Activity Spam service."
+msgstr "И�пробување на забелешките �о Службата за �пам во активно�тите."
diff --git a/plugins/ActivitySpam/locale/nl/LC_MESSAGES/ActivitySpam.po b/plugins/ActivitySpam/locale/nl/LC_MESSAGES/ActivitySpam.po
new file mode 100644
index 0000000000..b254086edf
--- /dev/null
+++ b/plugins/ActivitySpam/locale/nl/LC_MESSAGES/ActivitySpam.po
@@ -0,0 +1,26 @@
+# Translation of StatusNet - ActivitySpam to Dutch (Nederlands)
+# Exported from translatewiki.net
+#
+# Author: Siebrand
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - ActivitySpam\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:30+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2012-06-18 00:06:35+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgctxt "MENU"
+msgid "Spam"
+msgstr "Spam"
+
+msgid "Test notices against the Activity Spam service."
+msgstr "Mededelingen testen tegen de dienst Activity Spam."
diff --git a/plugins/ActivitySpam/locale/tl/LC_MESSAGES/ActivitySpam.po b/plugins/ActivitySpam/locale/tl/LC_MESSAGES/ActivitySpam.po
new file mode 100644
index 0000000000..3b40b180e6
--- /dev/null
+++ b/plugins/ActivitySpam/locale/tl/LC_MESSAGES/ActivitySpam.po
@@ -0,0 +1,26 @@
+# Translation of StatusNet - ActivitySpam to Tagalog (Tagalog)
+# Exported from translatewiki.net
+#
+# Author: AnakngAraw
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - ActivitySpam\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:30+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2012-06-18 00:06:35+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgctxt "MENU"
+msgid "Spam"
+msgstr "Manlulusob"
+
+msgid "Test notices against the Activity Spam service."
+msgstr "Mga pabatid na pangsubok laban sa palingkuran ng Gawain ng Manlulusob."
diff --git a/plugins/ActivitySpam/scripts/silencespammer.php b/plugins/ActivitySpam/scripts/silencespammer.php
new file mode 100644
index 0000000000..fde299e982
--- /dev/null
+++ b/plugins/ActivitySpam/scripts/silencespammer.php
@@ -0,0 +1,120 @@
+<?php
+/*
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2013 StatusNet, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+define('INSTALLDIR', realpath(dirname(__FILE__) . '/../../..'));
+
+$shortoptions = 'i:n:a';
+$longoptions = array('id=', 'nickname=', 'all');
+
+$helptext = <<<END_OF_SILENCESPAMMER_HELP
+silencespammer.php [options]
+Users who post a lot of spam get silenced
+
+  -i --id       ID of user to test and silence
+  -n --nickname nickname of the user to test and silence
+  -a --all      All users
+END_OF_SILENCESPAMMER_HELP;
+
+require_once INSTALLDIR.'/scripts/commandline.inc';
+
+function testAllUsers($filter, $minimum, $percent) {
+    $found = false;
+    $offset = 0;
+    $limit  = 1000;
+
+    do {
+
+        $user = new User();
+        $user->orderBy('created');
+        $user->limit($offset, $limit);
+
+        $found = $user->find();
+
+        if ($found) {
+            while ($user->fetch()) {
+                try {
+                    silencespammer($filter, $user, $minimum, $percent);
+                } catch (Exception $e) {
+                    printfnq("ERROR testing user %s\n: %s", $user->nickname, $e->getMessage());
+                }
+            }
+            $offset += $found;
+        }
+
+    } while ($found > 0);
+}
+
+function silencespammer($filter, $user, $minimum, $percent) {
+
+    printfnq("Testing user %s\n", $user->nickname);
+
+    $profile = Profile::staticGet('id', $user->id);
+
+    if ($profile->isSilenced()) {
+	printfnq("Already silenced %s\n", $user->nickname);
+	return;
+    }
+    
+    $cnt = $profile->noticeCount();
+
+    if ($cnt < $minimum) {
+        printfnq("Only %d notices posted (minimum %d); skipping\n", $cnt, $minimum);
+	return;
+    }
+
+    $ss = new Spam_score();
+
+    $ss->query(sprintf("SELECT count(*) as spam_count ".
+                       "FROM notice join spam_score on notice.id = spam_score.notice_id ".
+                       "WHERE notice.profile_id = %d AND spam_score.is_spam = 1", $profile->id));
+
+    while ($ss->fetch()) {
+        $spam_count = $ss->spam_count;
+    }                 
+
+    $spam_percent = ($spam_count * 100.0 / $cnt);
+
+    if ($spam_percent > $percent) {
+        printfnq("Silencing user %s (%d/%d = %0.2f%% spam)\n", $user->nickname, $spam_count, $cnt, $spam_percent);
+        try {
+            $profile->silence();
+        } catch(Exception $e) {
+            printfnq("Error: %s", $e->getMessage());
+        }       
+    }    
+}
+
+try {
+    $filter = null;
+    $minimum = 5;
+    $percent = 80;
+    Event::handle('GetSpamFilter', array(&$filter));
+    if (empty($filter)) {
+        throw new Exception(_("No spam filter."));
+    }
+    if (have_option('a', 'all')) {
+        testAllUsers($filter, $minimum, $percent);
+    } else {
+        $user = getUser();
+        silencespammer($filter, $user, $minimum, $percent);
+    }
+} catch (Exception $e) {
+    print $e->getMessage()."\n";
+    exit(1);
+}
diff --git a/plugins/ActivitySpam/scripts/testuser.php b/plugins/ActivitySpam/scripts/testuser.php
new file mode 100644
index 0000000000..0b776bd42b
--- /dev/null
+++ b/plugins/ActivitySpam/scripts/testuser.php
@@ -0,0 +1,105 @@
+<?php
+/*
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2012 StatusNet, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+define('INSTALLDIR', realpath(dirname(__FILE__) . '/../../..'));
+
+$shortoptions = 'i:n:a';
+$longoptions = array('id=', 'nickname=', 'all');
+
+$helptext = <<<END_OF_TESTUSER_HELP
+testuser.php [options]
+Test user activities against the spam filter
+
+  -i --id       ID of user to export
+  -n --nickname nickname of the user to export
+  -a --all      All users
+END_OF_TESTUSER_HELP;
+
+require_once INSTALLDIR.'/scripts/commandline.inc';
+
+function testAllUsers($filter) {
+    $found = false;
+    $offset = 0;
+    $limit  = 1000;
+
+    do {
+
+        $user = new User();
+        $user->orderBy('created');
+        $user->limit($offset, $limit);
+
+        $found = $user->find();
+
+        if ($found) {
+            while ($user->fetch()) {
+                try {
+                    testUser($filter, $user);
+                } catch (Exception $e) {
+                    printfnq("ERROR testing user %s\n: %s", $user->nickname, $e->getMessage());
+                }
+            }
+            $offset += $found;
+        }
+
+    } while ($found > 0);
+}
+
+function testUser($filter, $user) {
+
+    printfnq("Testing user %s\n", $user->nickname);
+
+    $profile = Profile::staticGet('id', $user->id);
+
+    $str = new ProfileNoticeStream($profile, $profile);
+
+    $offset = 0;
+    $limit  = 100;
+
+    do {
+        $notice = $str->getNotices($offset, $limit);
+        while ($notice->fetch()) {
+            try {
+                printfv("Testing notice %d...", $notice->id);
+                $result = $filter->test($notice);
+                Spam_score::save($notice, $result);
+                printfv("%s\n", ($result->isSpam) ? "SPAM" : "HAM");
+            } catch (Exception $e) {
+                printfnq("ERROR testing notice %d: %s\n", $notice->id, $e->getMessage());
+            }
+        }
+        $offset += $notice->N;
+    } while ($notice->N > 0);
+}
+
+try {
+    $filter = null;
+    Event::handle('GetSpamFilter', array(&$filter));
+    if (empty($filter)) {
+        throw new Exception(_("No spam filter."));
+    }
+    if (have_option('a', 'all')) {
+        testAllUsers($filter);
+    } else {
+        $user = getUser();
+        testUser($filter, $user);
+    }
+} catch (Exception $e) {
+    print $e->getMessage()."\n";
+    exit(1);
+}
diff --git a/plugins/ActivitySpam/scripts/trainuser.php b/plugins/ActivitySpam/scripts/trainuser.php
new file mode 100644
index 0000000000..f3739ac7b8
--- /dev/null
+++ b/plugins/ActivitySpam/scripts/trainuser.php
@@ -0,0 +1,81 @@
+<?php
+/*
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2012 StatusNet, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+define('INSTALLDIR', realpath(dirname(__FILE__) . '/../../..'));
+
+$shortoptions = 'i:n:t:';
+$longoptions = array('id=', 'nickname=', 'category=');
+
+$helptext = <<<END_OF_TRAINUSER_HELP
+trainuser.php [options]
+Train user activities against the spam filter
+
+  -i --id       ID of user to export
+  -n --nickname nickname of the user to export
+  -t --category Category; one of "spam" or "ham"
+
+END_OF_TRAINUSER_HELP;
+
+require_once INSTALLDIR.'/scripts/commandline.inc';
+
+function trainUser($filter, $user, $category) {
+
+    printfnq("Training user %s\n", $user->nickname);
+
+    $profile = Profile::staticGet('id', $user->id);
+
+    $str = new ProfileNoticeStream($profile, $profile);
+
+    $offset = 0;
+    $limit  = 100;
+
+    do {
+        $notice = $str->getNotices($offset, $limit);
+        while ($notice->fetch()) {
+            try {
+                printfv("Training notice %d...", $notice->id);
+                $filter->trainOnError($notice, $category);
+                $result = $filter->test($notice);
+                $score = Spam_score::save($notice, $result);
+                printfv("%s\n", ($result->isSpam) ? "SPAM" : "HAM");
+            } catch (Exception $e) {
+                printfnq("ERROR training notice %d\n: %s", $notice->id, $e->getMessage());
+            }
+        }
+        $offset += $notice->N;
+    } while ($notice->N > 0);
+}
+
+try {
+    $filter = null;
+    Event::handle('GetSpamFilter', array(&$filter));
+    if (empty($filter)) {
+        throw new Exception(_("No spam filter."));
+    }
+    $user = getUser();
+    $category = get_option_value('t', 'category');
+    if ($category !== SpamFilter::HAM &&
+        $category !== SpamFilter::SPAM) {
+        throw new Exception(_("No such category."));
+    }
+    trainUser($filter, $user, $category);
+} catch (Exception $e) {
+    print $e->getMessage()."\n";
+    exit(1);
+}
diff --git a/plugins/ActivitySpam/spam.php b/plugins/ActivitySpam/spam.php
new file mode 100644
index 0000000000..a66b73a829
--- /dev/null
+++ b/plugins/ActivitySpam/spam.php
@@ -0,0 +1,165 @@
+<?php
+/**
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2012, StatusNet, Inc.
+ *
+ * Stream of latest spam messages
+ * 
+ * PHP version 5
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Spam
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2012 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    // This check helps protect against security problems;
+    // your code file can't be executed directly from the web.
+    exit(1);
+}
+
+require_once INSTALLDIR.'/lib/noticelist.php';
+
+/**
+ * SpamAction
+ * 
+ * Shows the latest spam on the service
+ * 
+ * @category  Spam
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2012 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+
+class SpamAction extends Action
+{
+    var $page = null;
+    var $notices = null;
+
+    function title() {
+        return _("Latest Spam");
+    }
+
+    /**
+     * For initializing members of the class.
+     *
+     * @param array $argarray misc. arguments
+     *
+     * @return boolean true
+     */
+
+    function prepare($argarray)
+    {
+        parent::prepare($argarray);
+
+        $this->page = ($this->arg('page')) ? ($this->arg('page')+0) : 1;
+
+        // User must be logged in.
+
+        $user = common_current_user();
+
+        if (empty($user)) {
+            throw new ClientException(_("You must be logged in to review."), 403);
+        }
+
+        // User must have the right to review spam
+
+        if (!$user->hasRight(ActivitySpamPlugin::REVIEWSPAM)) {
+            throw new ClientException(_('You cannot review spam on this site.'), 403);
+        }
+
+        $stream = new SpamNoticeStream($user->getProfile());
+
+        $this->notices = $stream->getNotices(($this->page-1)*NOTICES_PER_PAGE,
+                                             NOTICES_PER_PAGE + 1);
+
+        if($this->page > 1 && $this->notices->N == 0) {
+            throw new ClientException(_('No such page.'), 404);
+        }
+
+        return true;
+    }
+
+    /**
+     * Handler method
+     *
+     * @param array $argarray is ignored since it's now passed in in prepare()
+     *
+     * @return void
+     */
+
+    function handle($argarray=null)
+    {
+        parent::handle($args);
+
+        $this->showPage();
+    }
+
+    /**
+     * Fill the content area
+     *
+     * Shows a list of the notices in the public stream, with some pagination
+     * controls.
+     *
+     * @return void
+     */
+
+    function showContent()
+    {
+        $nl = new NoticeList($this->notices, $this);
+
+        $cnt = $nl->show();
+
+        if ($cnt == 0) {
+            $this->showEmptyList();
+        }
+
+        $this->pagination($this->page > 1, 
+                          $cnt > NOTICES_PER_PAGE,
+                          $this->page,
+                          'spam');
+    }
+
+    function showEmptyList()
+    {
+        // TRANS: Text displayed for public feed when there are no public notices.
+        $message = _('This is the timeline of spam messages for %%site.name%% but none have been detected yet.');
+
+        $this->elementStart('div', 'guide');
+        $this->raw(common_markup_to_html($message));
+        $this->elementEnd('div');
+    }
+
+    /**
+     * Return true if read only.
+     *
+     * MAY override
+     *
+     * @param array $args other arguments
+     *
+     * @return boolean is read only action?
+     */
+
+    function isReadOnly($args)
+    {
+        return true;
+    }
+}
diff --git a/plugins/ActivitySpam/spamfilter.php b/plugins/ActivitySpam/spamfilter.php
new file mode 100644
index 0000000000..3ddfdad039
--- /dev/null
+++ b/plugins/ActivitySpam/spamfilter.php
@@ -0,0 +1,171 @@
+<?php
+  /**
+   * StatusNet - the distributed open-source microblogging tool
+   * Copyright (C) 2012, StatusNet, Inc.
+   *
+   * Spam filter class
+   * 
+   * PHP version 5
+   *
+   * This program is free software: you can redistribute it and/or modify
+   * it under the terms of the GNU Affero General Public License as published by
+   * the Free Software Foundation, either version 3 of the License, or
+   * (at your option) any later version.
+   *
+   * This program is distributed in the hope that it will be useful,
+   * but WITHOUT ANY WARRANTY; without even the implied warranty of
+   * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   * GNU Affero General Public License for more details.
+   *
+   * You should have received a copy of the GNU Affero General Public License
+   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+   *
+   * @category  Spam
+   * @package   StatusNet
+   * @author    Evan Prodromou <evan@status.net>
+   * @copyright 2012 StatusNet, Inc.
+   * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+   * @link      http://status.net/
+   */
+
+if (!defined('STATUSNET')) {
+    // This check helps protect against security problems;
+    // your code file can't be executed directly from the web.
+    exit(1);
+}
+
+/**
+ * Spam filter class
+ *
+ * Local proxy for remote filter
+ *
+ * @category  Spam
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2012 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+
+class SpamFilter extends OAuthClient {
+
+    const HAM  = 'ham';
+    const SPAM = 'spam';
+
+    public $server;
+
+    function __construct($server, $consumerKey, $secret) {
+        parent::__construct($consumerKey, $secret);
+        $this->server = $server;
+    }
+
+    protected function toActivity($notice) {
+        // FIXME: need this to autoload ActivityStreamsMediaLink
+        $doc = new ActivityStreamJSONDocument();
+
+        $activity = $notice->asActivity(null);
+
+        return $activity;
+    }
+
+    public function test($notice) {
+
+        $activity = $this->toActivity($notice);
+        return $this->testActivity($activity);
+    }
+    
+    public function testActivity($activity) {
+
+        $response = $this->postJSON($this->server . "/is-this-spam", $activity->asArray());
+
+        $result = json_decode($response->getBody());
+
+        return $result;
+    }
+
+    public function train($notice, $category) {
+
+        $activity = $this->toActivity($notice);
+        return $this->trainActivity($activity, $category);
+
+    }
+
+    public function trainActivity($activity, $category) {
+
+        switch ($category) {
+        case self::HAM:
+            $endpoint = '/this-is-ham';
+            break;
+        case self::SPAM:
+            $endpoint = '/this-is-spam';
+            break;
+        default:
+            throw new Exception("Unknown category: " + $category);
+        }
+
+        $response = $this->postJSON($this->server . $endpoint, $activity->asArray());
+
+        // We don't do much with the results
+        return true;
+    }
+
+    public function trainOnError($notice, $category) {
+
+        $activity = $this->toActivity($notice);
+
+        return $this->trainActivityOnError($activity, $category);
+    }
+    
+    public function trainActivityOnError($activity, $category) {
+
+        $result = $this->testActivity($activity);
+
+        if (($category === self::SPAM && $result->isSpam) ||
+            ($category === self::HAM && !$result->isSpam)) {
+            return true;
+        } else {
+            return $this->trainActivity($activity, $category);
+        }
+    }
+
+    function postJSON($url, $body)
+    {
+        $request = OAuthRequest::from_consumer_and_token($this->consumer,
+                                                         $this->token,
+                                                         'POST',
+                                                         $url);
+
+        $request->sign_request($this->sha1_method,
+                               $this->consumer,
+                               $this->token);
+
+        $hclient = new HTTPClient($url);
+
+        $hclient->setConfig(array('connect_timeout' => 120,
+                                  'timeout' => 120,
+                                  'follow_redirects' => true,
+                                  'ssl_verify_peer' => false,
+                                  'ssl_verify_host' => false));
+
+        $hclient->setMethod(HTTP_Request2::METHOD_POST);
+        $hclient->setBody(json_encode($body));
+        $hclient->setHeader('Content-Type', 'application/json');
+        $hclient->setHeader($request->to_header());
+
+        // Twitter is strict about accepting invalid "Expect" headers
+        // No reason not to clear it still here -ESP
+
+        $hclient->setHeader('Expect', '');
+
+        try {
+            $response = $hclient->send();
+            $code = $response->getStatus();
+            if (!$response->isOK()) {
+                throw new OAuthClientException($response->getBody(), $code);
+            }
+            return $response;
+        } catch (Exception $e) {
+            throw new OAuthClientException($e->getMessage(), $e->getCode());
+        }
+    }
+}
diff --git a/plugins/ActivitySpam/spamnoticestream.php b/plugins/ActivitySpam/spamnoticestream.php
new file mode 100644
index 0000000000..ffb8d08025
--- /dev/null
+++ b/plugins/ActivitySpam/spamnoticestream.php
@@ -0,0 +1,101 @@
+<?php
+/**
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2012, StatusNet, Inc.
+ *
+ * Spam notice stream
+ * 
+ * PHP version 5
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Spam
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2012 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    // This check helps protect against security problems;
+    // your code file can't be executed directly from the web.
+    exit(1);
+}
+
+/**
+ * Spam notice stream
+ *
+ * @category  Spam
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2012 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+
+class SpamNoticeStream extends ScopingNoticeStream
+{
+    function __construct($tag, $profile = -1)
+    {
+        if (is_int($profile) && $profile == -1) {
+            $profile = Profile::current();
+        }
+        parent::__construct(new CachingNoticeStream(new RawSpamNoticeStream(),
+                                                    'spam_score:notice_ids'));
+    }
+}
+
+/**
+ * Raw stream of spammy notices
+ *
+ * @category  Stream
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2011 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+
+class RawSpamNoticeStream extends NoticeStream
+{
+    function getNoticeIds($offset, $limit, $since_id, $max_id)
+    {
+        $ss = new Spam_score();
+
+        $ss->is_spam = 1;
+
+        $ss->selectAdd();
+        $ss->selectAdd('notice_id');
+
+        Notice::addWhereSinceId($ss, $since_id, 'notice_id');
+        Notice::addWhereMaxId($ss, $max_id, 'notice_id');
+
+        $ss->orderBy('notice_created DESC, notice_id DESC');
+
+        if (!is_null($offset)) {
+            $ss->limit($offset, $limit);
+        }
+
+        $ids = array();
+
+        if ($ss->find()) {
+            while ($ss->fetch()) {
+                $ids[] = $ss->notice_id;
+            }
+        }
+
+        return $ids;
+    }
+}
diff --git a/plugins/ActivitySpam/train.php b/plugins/ActivitySpam/train.php
new file mode 100644
index 0000000000..f5c82361cc
--- /dev/null
+++ b/plugins/ActivitySpam/train.php
@@ -0,0 +1,155 @@
+<?php
+/**
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2012, StatusNet, Inc.
+ *
+ * Train a notice as spam
+ * 
+ * PHP version 5
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Spam
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2012 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    // This check helps protect against security problems;
+    // your code file can't be executed directly from the web.
+    exit(1);
+}
+
+/**
+ * Train a notice as spam
+ *
+ * @category  Spam
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2012 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+
+class TrainAction extends Action
+{
+    protected $notice = null;
+    protected $filter = null;
+    protected $category = null;
+
+    /**
+     * For initializing members of the class.
+     *
+     * @param array $argarray misc. arguments
+     *
+     * @return boolean true
+     */
+
+    function prepare($argarray)
+    {
+        parent::prepare($argarray);
+
+        // User must be logged in.
+
+        $user = common_current_user();
+
+        if (empty($user)) {
+            throw new ClientException(_("You must be logged in to train spam."), 403);
+        }
+
+        // User must have the right to review spam
+
+        if (!$user->hasRight(ActivitySpamPlugin::TRAINSPAM)) {
+            throw new ClientException(_('You cannot review spam on this site.'), 403);
+        }
+
+        $id = $this->trimmed('notice');
+
+        $this->notice = Notice::staticGet('id', $id);
+
+        if (empty($this->notice)) {
+            throw new ClientException(_("No such notice."));
+        }
+
+        $this->checkSessionToken();
+
+        $filter = null;
+
+        Event::handle('GetSpamFilter', array(&$filter));
+
+        if (empty($filter)) {
+            throw new ServerException(_("No spam filter configured."));
+        }
+
+        $this->filter = $filter;
+
+        $this->category = $this->trimmed('category');
+
+        if ($this->category !== SpamFilter::SPAM &&
+            $this->category !== SpamFilter::HAM)
+        {
+            throw new ClientException(_("No such category."));
+        }
+
+        return true;
+    }
+
+    /**
+     * Handler method
+     *
+     * @param array $argarray is ignored since it's now passed in in prepare()
+     *
+     * @return void
+     */
+
+    function handle($argarray=null)
+    {
+        // Train
+
+        $this->filter->trainOnError($this->notice, $this->category);
+
+        // Re-test
+
+        $result = $this->filter->test($this->notice);
+
+        // Update or insert
+
+        $score = Spam_score::save($this->notice, $result);
+
+        // Show new toggle form
+
+        if ($this->category === SpamFilter::SPAM) {
+            $form = new TrainHamForm($this, $this->notice);
+        } else {
+            $form = new TrainSpamForm($this, $this->notice);
+        }
+
+        if ($this->boolean('ajax')) {
+            $this->startHTML('text/xml;charset=utf-8');
+            $this->elementStart('head');
+            // TRANS: Page title for page on which favorite notices can be unfavourited.
+            $this->element('title', null, _('Disfavor favorite.'));
+            $this->elementEnd('head');
+            $this->elementStart('body');
+            $form->show();
+            $this->elementEnd('body');
+            $this->elementEnd('html');
+        } else {
+            common_redirect(common_local_url('spam'), 303);
+        }
+    }
+}
diff --git a/plugins/ActivitySpam/trainhamform.php b/plugins/ActivitySpam/trainhamform.php
new file mode 100644
index 0000000000..5a4c9c07af
--- /dev/null
+++ b/plugins/ActivitySpam/trainhamform.php
@@ -0,0 +1,146 @@
+<?php
+/**
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2011, StatusNet, Inc.
+ *
+ * Toggle indicating spam, click to train as ham
+ * 
+ * PHP version 5
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Spam
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2011 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    // This check helps protect against security problems;
+    // your code file can't be executed directly from the web.
+    exit(1);
+}
+
+/**
+ * Form 
+ *
+ * @category  Spam
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2011 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+
+class TrainHamForm extends Form {
+
+    var $notice  = null;
+
+    function __construct($out, $notice) {
+        parent::__construct($out);
+        $this->notice = $notice;
+    }
+
+    /**
+     * Name of the form
+     *
+     * Sub-classes should overload this with the name of their form.
+     *
+     * @return void
+     */
+
+    function formLegend()
+    {
+        return _("Train ham");
+    }
+
+    /**
+     * Visible or invisible data elements
+     *
+     * Display the form fields that make up the data of the form.
+     * Sub-classes should overload this to show their data.
+     *
+     * @return void
+     */
+
+    function formData()
+    {
+        $this->hidden('notice', $this->notice->id);
+    }
+
+    /**
+     * Buttons for form actions
+     *
+     * Submit and cancel buttons (or whatever)
+     * Sub-classes should overload this to show their own buttons.
+     *
+     * @return void
+     */
+
+    function formActions()
+    {
+        $this->submit('train-ham-submit-' . $this->notice->id,
+                      _('Clear spam'),
+                      'submit',
+                      null,
+                      _("Clear spam"));
+    }
+
+    /**
+     * ID of the form
+     *
+     * Should be unique on the page. Sub-classes should overload this
+     * to show their own IDs.
+     *
+     * @return int ID of the form
+     */
+
+    function id()
+    {
+        return 'train-ham-' . $this->notice->id;
+    }
+
+    /**
+     * Action of the form.
+     *
+     * URL to post to. Should be overloaded by subclasses to give
+     * somewhere to post to.
+     *
+     * @return string URL to post to
+     */
+
+    function action()
+    {
+        return common_local_url('train', array('category' => 'ham'));
+    }
+
+    /**
+     * Class of the form. May include space-separated list of multiple classes.
+     *
+     * If 'ajax' is included, the form will automatically be submitted with
+     * an 'ajax=1' parameter added, and the resulting form or error message
+     * will replace the form after submission.
+     *
+     * It's up to you to make sure that the target action supports this!
+     *
+     * @return string the form's class
+     */
+
+    function formClass()
+    {
+        return 'form-train-ham ajax';
+    }
+}
diff --git a/plugins/ActivitySpam/trainspamform.php b/plugins/ActivitySpam/trainspamform.php
new file mode 100644
index 0000000000..ee1ecd2a74
--- /dev/null
+++ b/plugins/ActivitySpam/trainspamform.php
@@ -0,0 +1,146 @@
+<?php
+/**
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2011, StatusNet, Inc.
+ *
+ * Toggle indicating ham, click to train as spam
+ * 
+ * PHP version 5
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Spam
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2011 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    // This check helps protect against security problems;
+    // your code file can't be executed directly from the web.
+    exit(1);
+}
+
+/**
+ * Form 
+ *
+ * @category  Spam
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2011 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+
+class TrainSpamForm extends Form {
+
+    var $notice  = null;
+
+    function __construct($out, $notice) {
+        parent::__construct($out);
+        $this->notice = $notice;
+    }
+
+    /**
+     * Name of the form
+     *
+     * Sub-classes should overload this with the name of their form.
+     *
+     * @return void
+     */
+
+    function formLegend()
+    {
+        return _("Train spam");
+    }
+
+    /**
+     * Visible or invisible data elements
+     *
+     * Display the form fields that make up the data of the form.
+     * Sub-classes should overload this to show their data.
+     *
+     * @return void
+     */
+
+    function formData()
+    {
+        $this->hidden('notice', $this->notice->id);
+    }
+
+    /**
+     * Buttons for form actions
+     *
+     * Submit and cancel buttons (or whatever)
+     * Sub-classes should overload this to show their own buttons.
+     *
+     * @return void
+     */
+
+    function formActions()
+    {
+        $this->submit('train-spam-submit-' . $this->notice->id,
+                      _('Train spam'),
+                      'submit',
+                      null,
+                      _("Mark as spam"));
+    }
+
+    /**
+     * ID of the form
+     *
+     * Should be unique on the page. Sub-classes should overload this
+     * to show their own IDs.
+     *
+     * @return int ID of the form
+     */
+
+    function id()
+    {
+        return 'train-spam-' . $this->notice->id;
+    }
+
+    /**
+     * Action of the form.
+     *
+     * URL to post to. Should be overloaded by subclasses to give
+     * somewhere to post to.
+     *
+     * @return string URL to post to
+     */
+
+    function action()
+    {
+        return common_local_url('train', array('category' => 'spam'));
+    }
+
+    /**
+     * Class of the form. May include space-separated list of multiple classes.
+     *
+     * If 'ajax' is included, the form will automatically be submitted with
+     * an 'ajax=1' parameter added, and the resulting form or error message
+     * will replace the form after submission.
+     *
+     * It's up to you to make sure that the target action supports this!
+     *
+     * @return string the form's class
+     */
+
+    function formClass()
+    {
+        return 'form-train-spam ajax';
+    }
+}
diff --git a/plugins/Adsense/locale/Adsense.pot b/plugins/Adsense/locale/Adsense.pot
index 0cecd5a7cb..059633a21f 100644
--- a/plugins/Adsense/locale/Adsense.pot
+++ b/plugins/Adsense/locale/Adsense.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
+"POT-Creation-Date: 2012-06-30 11:07+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"
diff --git a/plugins/Adsense/locale/be-tarask/LC_MESSAGES/Adsense.po b/plugins/Adsense/locale/be-tarask/LC_MESSAGES/Adsense.po
index 553ab3df2d..7e25c7e38f 100644
--- a/plugins/Adsense/locale/be-tarask/LC_MESSAGES/Adsense.po
+++ b/plugins/Adsense/locale/be-tarask/LC_MESSAGES/Adsense.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Adsense to Belarusian (Taraškievica orthography) (‪Белару�ка� (тарашкевіца)‬)
+# Translation of StatusNet - Adsense to Belarusian (Taraškievica orthography) (‪белару�ка� (тарашкевіца)‬)
 # Exported from translatewiki.net
 #
 # Author: EugeneZelenko
@@ -10,15 +10,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Adsense\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:33+0000\n"
-"Language-Team: Belarusian (Taraškievica orthography) <http://translatewiki."
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:31+0000\n"
+"Language-Team: Belarusian (Taraškievica orthography) <https://translatewiki."
 "net/wiki/Portal:be-tarask>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:25:53+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-12-03 10:22:41+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: be-tarask\n"
 "X-Message-Group: #out-statusnet-plugin-adsense\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/Adsense/locale/br/LC_MESSAGES/Adsense.po b/plugins/Adsense/locale/br/LC_MESSAGES/Adsense.po
index 9bcd29710a..f26af607c5 100644
--- a/plugins/Adsense/locale/br/LC_MESSAGES/Adsense.po
+++ b/plugins/Adsense/locale/br/LC_MESSAGES/Adsense.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Adsense to Breton (Brezhoneg)
+# Translation of StatusNet - Adsense to Breton (brezhoneg)
 # Exported from translatewiki.net
 #
 # Author: Y-M D
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Adsense\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:33+0000\n"
-"Language-Team: Breton <http://translatewiki.net/wiki/Portal:br>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:31+0000\n"
+"Language-Team: Breton <https://translatewiki.net/wiki/Portal:br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:25:53+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-12-03 10:22:41+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-adsense\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
diff --git a/plugins/Adsense/locale/ca/LC_MESSAGES/Adsense.po b/plugins/Adsense/locale/ca/LC_MESSAGES/Adsense.po
index 7cadbaceb6..602471f357 100644
--- a/plugins/Adsense/locale/ca/LC_MESSAGES/Adsense.po
+++ b/plugins/Adsense/locale/ca/LC_MESSAGES/Adsense.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Adsense to Catalan (Català)
+# Translation of StatusNet - Adsense to Catalan (català)
 # Exported from translatewiki.net
 #
 # Author: Toniher
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Adsense\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:33+0000\n"
-"Language-Team: Catalan <http://translatewiki.net/wiki/Portal:ca>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:31+0000\n"
+"Language-Team: Catalan <https://translatewiki.net/wiki/Portal:ca>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:25:53+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-12-03 10:22:41+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ca\n"
 "X-Message-Group: #out-statusnet-plugin-adsense\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/Adsense/locale/de/LC_MESSAGES/Adsense.po b/plugins/Adsense/locale/de/LC_MESSAGES/Adsense.po
index 3c0a4a5dde..446abce765 100644
--- a/plugins/Adsense/locale/de/LC_MESSAGES/Adsense.po
+++ b/plugins/Adsense/locale/de/LC_MESSAGES/Adsense.po
@@ -4,6 +4,7 @@
 # Author: Fujnky
 # Author: Giftpflanze
 # Author: MF-Warburg
+# Author: Marcel083
 # Author: Michael
 # Author: The Evil IP address
 # --
@@ -13,14 +14,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Adsense\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:33+0000\n"
-"Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:31+0000\n"
+"Language-Team: German <https://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:25:53+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-12-03 10:22:41+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-adsense\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -52,7 +53,6 @@ msgid "Client ID"
 msgstr "Client-ID"
 
 #. TRANS: Field title in AdSense administration panel.
-#, fuzzy
 msgid "Google client ID."
 msgstr "Google-Client-ID"
 
@@ -61,7 +61,6 @@ msgid "Ad script URL"
 msgstr "Skript-URL"
 
 #. TRANS: Field title in AdSense administration panel.
-#, fuzzy
 msgid "Script URL (advanced)."
 msgstr "Skript-URL (erweitert)"
 
@@ -78,9 +77,8 @@ msgid "Rectangle"
 msgstr "Rechteck"
 
 #. TRANS: Field title in AdSense administration panel.
-#, fuzzy
 msgid "Rectangle slot code."
-msgstr "Rechteck"
+msgstr "Rectangle-Slot-Code."
 
 #. TRANS: Field label in AdSense administration panel.
 msgid "Leaderboard"
@@ -99,12 +97,10 @@ msgid "Wide skyscraper slot code."
 msgstr "Slotcode des weiten Hochhauses."
 
 #. TRANS: Button text to save settings in AdSense administration panel.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Speichern"
 
 #. TRANS: Button title to save settings in AdSense administration panel.
-#, fuzzy
 msgid "Save AdSense settings."
 msgstr "AdSense-Einstellungen speichern"
diff --git a/plugins/Adsense/locale/es/LC_MESSAGES/Adsense.po b/plugins/Adsense/locale/es/LC_MESSAGES/Adsense.po
index d0f830861b..20f3e6e92c 100644
--- a/plugins/Adsense/locale/es/LC_MESSAGES/Adsense.po
+++ b/plugins/Adsense/locale/es/LC_MESSAGES/Adsense.po
@@ -1,6 +1,8 @@
-# Translation of StatusNet - Adsense to Spanish (Español)
+# Translation of StatusNet - Adsense to Spanish (español)
 # Exported from translatewiki.net
 #
+# Author: Armando-Martin
+# Author: Erchache2000
 # Author: Translationista
 # --
 # This file is distributed under the same license as the StatusNet package.
@@ -9,14 +11,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Adsense\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:33+0000\n"
-"Language-Team: Spanish <http://translatewiki.net/wiki/Portal:es>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:31+0000\n"
+"Language-Team: Spanish <https://translatewiki.net/wiki/Portal:es>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:25:53+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-12-03 10:22:41+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-plugin-adsense\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -26,7 +28,6 @@ msgid "AdSense configuration"
 msgstr "Configuración de \"AdSense\""
 
 #. TRANS: Menu item for site administration
-#, fuzzy
 msgctxt "MENU"
 msgid "AdSense"
 msgstr "AdSense"
@@ -49,7 +50,6 @@ msgid "Client ID"
 msgstr "ID de cliente"
 
 #. TRANS: Field title in AdSense administration panel.
-#, fuzzy
 msgid "Google client ID."
 msgstr "ID de cliente de Google"
 
@@ -58,7 +58,6 @@ msgid "Ad script URL"
 msgstr "URL del script del anuncio"
 
 #. TRANS: Field title in AdSense administration panel.
-#, fuzzy
 msgid "Script URL (advanced)."
 msgstr "URL del script (avanzado)"
 
@@ -67,7 +66,6 @@ msgid "Medium rectangle"
 msgstr "Rectángulo mediano"
 
 #. TRANS: Field title in AdSense administration panel.
-#, fuzzy
 msgid "Medium rectangle slot code."
 msgstr "Código de espacio de rectángulo mediano"
 
@@ -76,7 +74,6 @@ msgid "Rectangle"
 msgstr "Rectángulo"
 
 #. TRANS: Field title in AdSense administration panel.
-#, fuzzy
 msgid "Rectangle slot code."
 msgstr "Código de espacio de rectángulo"
 
@@ -85,26 +82,22 @@ msgid "Leaderboard"
 msgstr "Clasificación"
 
 #. TRANS: Field title in AdSense administration panel.
-#, fuzzy
 msgid "Leaderboard slot code."
-msgstr "Código de espacio de clasificación"
+msgstr "Código colocado en el panel de comandos"
 
 #. TRANS: Field label in AdSense administration panel.
 msgid "Skyscraper"
 msgstr "Banderola rascacielos"
 
 #. TRANS: Field title in AdSense administration panel.
-#, fuzzy
 msgid "Wide skyscraper slot code."
-msgstr "Código de espacio de banderola rascacielos ancha"
+msgstr "Código colocado en rectángulo (''banner'') vertical ancho"
 
 #. TRANS: Button text to save settings in AdSense administration panel.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Guardar"
 
 #. TRANS: Button title to save settings in AdSense administration panel.
-#, fuzzy
 msgid "Save AdSense settings."
-msgstr "Guardar la configuración de AdSense"
+msgstr "Guardar configuración de AdSense."
diff --git a/plugins/Adsense/locale/eu/LC_MESSAGES/Adsense.po b/plugins/Adsense/locale/eu/LC_MESSAGES/Adsense.po
new file mode 100644
index 0000000000..883700a089
--- /dev/null
+++ b/plugins/Adsense/locale/eu/LC_MESSAGES/Adsense.po
@@ -0,0 +1,102 @@
+# Translation of StatusNet - Adsense to Basque (euskara)
+# Exported from translatewiki.net
+#
+# Author: Artsuaga
+# Author: Unai Fdz. de Betoño
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Adsense\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:31+0000\n"
+"Language-Team: Basque <https://translatewiki.net/wiki/Portal:eu>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-12-03 10:22:41+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: eu\n"
+"X-Message-Group: #out-statusnet-plugin-adsense\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Menu item title/tooltip
+msgid "AdSense configuration"
+msgstr "AdSense konfigurazioa"
+
+#. TRANS: Menu item for site administration
+msgctxt "MENU"
+msgid "AdSense"
+msgstr "AdSense"
+
+#. TRANS: Plugin description.
+msgid "Plugin to add Google AdSense to StatusNet sites."
+msgstr "Google Adsense Statusnet guneetara gehitzeko plugina."
+
+#. TRANS: Title of AdSense administrator panel.
+msgctxt "TITLE"
+msgid "AdSense"
+msgstr "AdSense"
+
+#. TRANS: Instructions for AdSense administrator panel.
+msgid "AdSense settings for this StatusNet site"
+msgstr "AdSense aukerak StatusNet gune hontarako"
+
+#. TRANS: Field label in AdSense administration panel.
+msgid "Client ID"
+msgstr "ID bezeroa"
+
+#. TRANS: Field title in AdSense administration panel.
+msgid "Google client ID."
+msgstr "Google bezero IDa."
+
+#. TRANS: Field label in AdSense administration panel.
+msgid "Ad script URL"
+msgstr "Gehitu scriptaren URLa"
+
+#. TRANS: Field title in AdSense administration panel.
+msgid "Script URL (advanced)."
+msgstr "Scriptaren URLa (aurreratua)."
+
+#. TRANS: Field label in AdSense administration panel.
+msgid "Medium rectangle"
+msgstr "Laukizuzen ertaina"
+
+#. TRANS: Field title in AdSense administration panel.
+msgid "Medium rectangle slot code."
+msgstr "Lauki ertaineko kodea."
+
+#. TRANS: Field label in AdSense administration panel.
+msgid "Rectangle"
+msgstr "Laukizuzena"
+
+#. TRANS: Field title in AdSense administration panel.
+msgid "Rectangle slot code."
+msgstr "Laukiko kodea."
+
+#. TRANS: Field label in AdSense administration panel.
+msgid "Leaderboard"
+msgstr "Sailkapena"
+
+#. TRANS: Field title in AdSense administration panel.
+msgid "Leaderboard slot code."
+msgstr "Sailkapeneko kodea."
+
+#. TRANS: Field label in AdSense administration panel.
+msgid "Skyscraper"
+msgstr "Lauki bertikala"
+
+#. TRANS: Field title in AdSense administration panel.
+msgid "Wide skyscraper slot code."
+msgstr "Lauki bertikaleko kodea."
+
+#. TRANS: Button text to save settings in AdSense administration panel.
+msgctxt "BUTTON"
+msgid "Save"
+msgstr "Gorde"
+
+#. TRANS: Button title to save settings in AdSense administration panel.
+msgid "Save AdSense settings."
+msgstr "Gorde AdSense aukerak."
diff --git a/plugins/Adsense/locale/fr/LC_MESSAGES/Adsense.po b/plugins/Adsense/locale/fr/LC_MESSAGES/Adsense.po
index 89b72d796d..5b7e4c5e98 100644
--- a/plugins/Adsense/locale/fr/LC_MESSAGES/Adsense.po
+++ b/plugins/Adsense/locale/fr/LC_MESSAGES/Adsense.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Adsense to French (Français)
+# Translation of StatusNet - Adsense to French (français)
 # Exported from translatewiki.net
 #
 # Author: Brunoperel
@@ -13,14 +13,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Adsense\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:33+0000\n"
-"Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:31+0000\n"
+"Language-Team: French <https://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:25:53+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-12-03 10:22:41+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-adsense\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
diff --git a/plugins/Adsense/locale/gl/LC_MESSAGES/Adsense.po b/plugins/Adsense/locale/gl/LC_MESSAGES/Adsense.po
index 7832a2608f..a054ca872d 100644
--- a/plugins/Adsense/locale/gl/LC_MESSAGES/Adsense.po
+++ b/plugins/Adsense/locale/gl/LC_MESSAGES/Adsense.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Adsense to Galician (Galego)
+# Translation of StatusNet - Adsense to Galician (galego)
 # Exported from translatewiki.net
 #
 # Author: Toliño
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Adsense\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:33+0000\n"
-"Language-Team: Galician <http://translatewiki.net/wiki/Portal:gl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:31+0000\n"
+"Language-Team: Galician <https://translatewiki.net/wiki/Portal:gl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:25:53+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-12-03 10:22:41+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: gl\n"
 "X-Message-Group: #out-statusnet-plugin-adsense\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -26,14 +26,13 @@ msgid "AdSense configuration"
 msgstr "Configuración de AdSense"
 
 #. TRANS: Menu item for site administration
-#, fuzzy
 msgctxt "MENU"
 msgid "AdSense"
 msgstr "AdSense"
 
 #. TRANS: Plugin description.
 msgid "Plugin to add Google AdSense to StatusNet sites."
-msgstr ""
+msgstr "Complemento para engadir Google AdSense aos sitios de StatusNet."
 
 #. TRANS: Title of AdSense administrator panel.
 msgctxt "TITLE"
@@ -49,43 +48,40 @@ msgid "Client ID"
 msgstr "Identificación do cliente"
 
 #. TRANS: Field title in AdSense administration panel.
-#, fuzzy
 msgid "Google client ID."
-msgstr "Identificación do cliente de Google"
+msgstr "Identificación do cliente de Google."
 
 #. TRANS: Field label in AdSense administration panel.
 msgid "Ad script URL"
-msgstr ""
+msgstr "Enderezo URL da escritura do anuncio"
 
 #. TRANS: Field title in AdSense administration panel.
 msgid "Script URL (advanced)."
-msgstr ""
+msgstr "Enderezo URL da escritura (avanzado)."
 
 #. TRANS: Field label in AdSense administration panel.
 msgid "Medium rectangle"
-msgstr ""
+msgstr "Rectángulo mediano"
 
 #. TRANS: Field title in AdSense administration panel.
 msgid "Medium rectangle slot code."
-msgstr ""
+msgstr "Código disposto no rectángulo mediano."
 
 #. TRANS: Field label in AdSense administration panel.
 msgid "Rectangle"
 msgstr "Rectángulo"
 
 #. TRANS: Field title in AdSense administration panel.
-#, fuzzy
 msgid "Rectangle slot code."
-msgstr "Rectángulo"
+msgstr "Código disposto no rectángulo."
 
 #. TRANS: Field label in AdSense administration panel.
 msgid "Leaderboard"
 msgstr "Taboleiro de logros"
 
 #. TRANS: Field title in AdSense administration panel.
-#, fuzzy
 msgid "Leaderboard slot code."
-msgstr "Taboleiro de logros"
+msgstr "Código disposto no taboleiro de logros."
 
 #. TRANS: Field label in AdSense administration panel.
 msgid "Skyscraper"
@@ -93,15 +89,13 @@ msgstr "Rañaceos"
 
 #. TRANS: Field title in AdSense administration panel.
 msgid "Wide skyscraper slot code."
-msgstr ""
+msgstr "Código disposto no rañaceos."
 
 #. TRANS: Button text to save settings in AdSense administration panel.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Gardar"
 
 #. TRANS: Button title to save settings in AdSense administration panel.
-#, fuzzy
 msgid "Save AdSense settings."
-msgstr "Gardar a configuración de AdSense"
+msgstr "Gardar a configuración de AdSense."
diff --git a/plugins/Adsense/locale/ia/LC_MESSAGES/Adsense.po b/plugins/Adsense/locale/ia/LC_MESSAGES/Adsense.po
index 1151854ec8..a0f7d9efaa 100644
--- a/plugins/Adsense/locale/ia/LC_MESSAGES/Adsense.po
+++ b/plugins/Adsense/locale/ia/LC_MESSAGES/Adsense.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Adsense to Interlingua (Interlingua)
+# Translation of StatusNet - Adsense to Interlingua (interlingua)
 # Exported from translatewiki.net
 #
 # Author: McDutchie
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Adsense\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:33+0000\n"
-"Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:31+0000\n"
+"Language-Team: Interlingua <https://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:25:53+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-12-03 10:22:41+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-adsense\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/Adsense/locale/it/LC_MESSAGES/Adsense.po b/plugins/Adsense/locale/it/LC_MESSAGES/Adsense.po
index 94f11daee8..97187bd245 100644
--- a/plugins/Adsense/locale/it/LC_MESSAGES/Adsense.po
+++ b/plugins/Adsense/locale/it/LC_MESSAGES/Adsense.po
@@ -1,8 +1,10 @@
-# Translation of StatusNet - Adsense to Italian (Italiano)
+# Translation of StatusNet - Adsense to Italian (italiano)
 # Exported from translatewiki.net
 #
 # Author: Milocasagrande
 # Author: Od1n
+# Author: Rippitippi
+# Author: Ximo17
 # --
 # This file is distributed under the same license as the StatusNet package.
 #
@@ -10,14 +12,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Adsense\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:33+0000\n"
-"Language-Team: Italian <http://translatewiki.net/wiki/Portal:it>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:32+0000\n"
+"Language-Team: Italian <https://translatewiki.net/wiki/Portal:it>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:25:53+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-12-03 10:22:41+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: it\n"
 "X-Message-Group: #out-statusnet-plugin-adsense\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -27,7 +29,6 @@ msgid "AdSense configuration"
 msgstr "Configurazione AdSene"
 
 #. TRANS: Menu item for site administration
-#, fuzzy
 msgctxt "MENU"
 msgid "AdSense"
 msgstr "AdSense"
@@ -50,16 +51,14 @@ msgid "Client ID"
 msgstr "ID client"
 
 #. TRANS: Field title in AdSense administration panel.
-#, fuzzy
 msgid "Google client ID."
-msgstr "ID client Google"
+msgstr "Codice utente Google"
 
 #. TRANS: Field label in AdSense administration panel.
 msgid "Ad script URL"
 msgstr "URL script Ad"
 
 #. TRANS: Field title in AdSense administration panel.
-#, fuzzy
 msgid "Script URL (advanced)."
 msgstr "URL script (avanzato)"
 
@@ -68,7 +67,6 @@ msgid "Medium rectangle"
 msgstr "Rettangolo medio"
 
 #. TRANS: Field title in AdSense administration panel.
-#, fuzzy
 msgid "Medium rectangle slot code."
 msgstr "Rettangolo medio"
 
@@ -77,25 +75,24 @@ msgid "Rectangle"
 msgstr "Rettangolo"
 
 #. TRANS: Field title in AdSense administration panel.
-#, fuzzy
 msgid "Rectangle slot code."
-msgstr "Rettangolo"
+msgstr "Codice di apertura del rettangolo."
 
 #. TRANS: Field label in AdSense administration panel.
 msgid "Leaderboard"
-msgstr ""
+msgstr "Classifica"
 
 #. TRANS: Field title in AdSense administration panel.
 msgid "Leaderboard slot code."
-msgstr ""
+msgstr "Codice di apertura della bacheca principale."
 
 #. TRANS: Field label in AdSense administration panel.
 msgid "Skyscraper"
-msgstr ""
+msgstr "Banner"
 
 #. TRANS: Field title in AdSense administration panel.
 msgid "Wide skyscraper slot code."
-msgstr ""
+msgstr "Codice di apertura del banner esteso."
 
 #. TRANS: Button text to save settings in AdSense administration panel.
 msgctxt "BUTTON"
@@ -104,4 +101,4 @@ msgstr "Salva"
 
 #. TRANS: Button title to save settings in AdSense administration panel.
 msgid "Save AdSense settings."
-msgstr ""
+msgstr "Salva le impostazioni di AdSense."
diff --git a/plugins/Adsense/locale/ja/LC_MESSAGES/Adsense.po b/plugins/Adsense/locale/ja/LC_MESSAGES/Adsense.po
new file mode 100644
index 0000000000..f8e243f74b
--- /dev/null
+++ b/plugins/Adsense/locale/ja/LC_MESSAGES/Adsense.po
@@ -0,0 +1,99 @@
+# Translation of StatusNet - Adsense to Japanese (日本語)
+# Exported from translatewiki.net
+#
+# Author: Miwa ka
+# Author: Shirayuki
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Adsense\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:32+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-12-03 10:22:41+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#. TRANS: Menu item title/tooltip
+msgid "AdSense configuration"
+msgstr "AdSense �設定"
+
+#. TRANS: Menu item for site administration
+msgctxt "MENU"
+msgid "AdSense"
+msgstr "AdSense"
+
+#. TRANS: Plugin description.
+msgid "Plugin to add Google AdSense to StatusNet sites."
+msgstr ""
+
+#. TRANS: Title of AdSense administrator panel.
+msgctxt "TITLE"
+msgid "AdSense"
+msgstr "AdSense"
+
+#. TRANS: Instructions for AdSense administrator panel.
+msgid "AdSense settings for this StatusNet site"
+msgstr ""
+
+#. TRANS: Field label in AdSense administration panel.
+msgid "Client ID"
+msgstr "クライアント ID"
+
+#. TRANS: Field title in AdSense administration panel.
+msgid "Google client ID."
+msgstr "Google �クライアント ID ��。"
+
+#. TRANS: Field label in AdSense administration panel.
+msgid "Ad script URL"
+msgstr ""
+
+#. TRANS: Field title in AdSense administration panel.
+msgid "Script URL (advanced)."
+msgstr ""
+
+#. TRANS: Field label in AdSense administration panel.
+msgid "Medium rectangle"
+msgstr ""
+
+#. TRANS: Field title in AdSense administration panel.
+msgid "Medium rectangle slot code."
+msgstr ""
+
+#. TRANS: Field label in AdSense administration panel.
+msgid "Rectangle"
+msgstr ""
+
+#. TRANS: Field title in AdSense administration panel.
+msgid "Rectangle slot code."
+msgstr ""
+
+#. TRANS: Field label in AdSense administration panel.
+msgid "Leaderboard"
+msgstr ""
+
+#. TRANS: Field title in AdSense administration panel.
+msgid "Leaderboard slot code."
+msgstr ""
+
+#. TRANS: Field label in AdSense administration panel.
+msgid "Skyscraper"
+msgstr ""
+
+#. TRANS: Field title in AdSense administration panel.
+msgid "Wide skyscraper slot code."
+msgstr ""
+
+#. TRANS: Button text to save settings in AdSense administration panel.
+msgctxt "BUTTON"
+msgid "Save"
+msgstr "�存"
+
+#. TRANS: Button title to save settings in AdSense administration panel.
+msgid "Save AdSense settings."
+msgstr "AdSense 設定を�存�る"
diff --git a/plugins/Adsense/locale/ka/LC_MESSAGES/Adsense.po b/plugins/Adsense/locale/ka/LC_MESSAGES/Adsense.po
index 3b975f4686..38fa7a54ad 100644
--- a/plugins/Adsense/locale/ka/LC_MESSAGES/Adsense.po
+++ b/plugins/Adsense/locale/ka/LC_MESSAGES/Adsense.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Adsense\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:33+0000\n"
-"Language-Team: Georgian <http://translatewiki.net/wiki/Portal:ka>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:32+0000\n"
+"Language-Team: Georgian <https://translatewiki.net/wiki/Portal:ka>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:25:53+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-12-03 10:22:41+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ka\n"
 "X-Message-Group: #out-statusnet-plugin-adsense\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
diff --git a/plugins/Adsense/locale/lt/LC_MESSAGES/Adsense.po b/plugins/Adsense/locale/lt/LC_MESSAGES/Adsense.po
new file mode 100644
index 0000000000..eb6c6b1abc
--- /dev/null
+++ b/plugins/Adsense/locale/lt/LC_MESSAGES/Adsense.po
@@ -0,0 +1,102 @@
+# Translation of StatusNet - Adsense to Lithuanian (lietuvių)
+# Exported from translatewiki.net
+#
+# Author: Eitvys200
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Adsense\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:32+0000\n"
+"Language-Team: Lithuanian <https://translatewiki.net/wiki/Portal:lt>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-12-03 10:22:41+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: lt\n"
+"X-Message-Group: #out-statusnet-plugin-adsense\n"
+"Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
+"2 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
+
+#. TRANS: Menu item title/tooltip
+msgid "AdSense configuration"
+msgstr "AdSense konfigūracija"
+
+#. TRANS: Menu item for site administration
+msgctxt "MENU"
+msgid "AdSense"
+msgstr "AdSense"
+
+#. TRANS: Plugin description.
+msgid "Plugin to add Google AdSense to StatusNet sites."
+msgstr "Įskiepiai Google AdSense pridėjimui į StatusNet svetaines."
+
+#. TRANS: Title of AdSense administrator panel.
+msgctxt "TITLE"
+msgid "AdSense"
+msgstr "AdSense"
+
+#. TRANS: Instructions for AdSense administrator panel.
+msgid "AdSense settings for this StatusNet site"
+msgstr "AdSense nustatymui Å¡iai StatusNet svetainei"
+
+#. TRANS: Field label in AdSense administration panel.
+msgid "Client ID"
+msgstr "Kliento ID"
+
+#. TRANS: Field title in AdSense administration panel.
+msgid "Google client ID."
+msgstr "Google kliento ID."
+
+#. TRANS: Field label in AdSense administration panel.
+msgid "Ad script URL"
+msgstr ""
+
+#. TRANS: Field title in AdSense administration panel.
+msgid "Script URL (advanced)."
+msgstr ""
+
+#. TRANS: Field label in AdSense administration panel.
+msgid "Medium rectangle"
+msgstr ""
+
+#. TRANS: Field title in AdSense administration panel.
+msgid "Medium rectangle slot code."
+msgstr ""
+
+#. TRANS: Field label in AdSense administration panel.
+msgid "Rectangle"
+msgstr ""
+
+#. TRANS: Field title in AdSense administration panel.
+msgid "Rectangle slot code."
+msgstr ""
+
+#. TRANS: Field label in AdSense administration panel.
+msgid "Leaderboard"
+msgstr ""
+
+#. TRANS: Field title in AdSense administration panel.
+msgid "Leaderboard slot code."
+msgstr ""
+
+#. TRANS: Field label in AdSense administration panel.
+msgid "Skyscraper"
+msgstr ""
+
+#. TRANS: Field title in AdSense administration panel.
+msgid "Wide skyscraper slot code."
+msgstr ""
+
+#. TRANS: Button text to save settings in AdSense administration panel.
+msgctxt "BUTTON"
+msgid "Save"
+msgstr "IÅ¡saugoti"
+
+#. TRANS: Button title to save settings in AdSense administration panel.
+msgid "Save AdSense settings."
+msgstr "IÅ¡saugoti AdSense nustatymus."
diff --git a/plugins/Adsense/locale/mk/LC_MESSAGES/Adsense.po b/plugins/Adsense/locale/mk/LC_MESSAGES/Adsense.po
index 171efa9e62..4fd523f69c 100644
--- a/plugins/Adsense/locale/mk/LC_MESSAGES/Adsense.po
+++ b/plugins/Adsense/locale/mk/LC_MESSAGES/Adsense.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Adsense to Macedonian (Македон�ки)
+# Translation of StatusNet - Adsense to Macedonian (македон�ки)
 # Exported from translatewiki.net
 #
 # Author: Bjankuloski06
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Adsense\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:33+0000\n"
-"Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:32+0000\n"
+"Language-Team: Macedonian <https://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:25:53+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-12-03 10:22:41+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-adsense\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
diff --git a/plugins/Adsense/locale/ms/LC_MESSAGES/Adsense.po b/plugins/Adsense/locale/ms/LC_MESSAGES/Adsense.po
new file mode 100644
index 0000000000..bf7e0ce03d
--- /dev/null
+++ b/plugins/Adsense/locale/ms/LC_MESSAGES/Adsense.po
@@ -0,0 +1,101 @@
+# Translation of StatusNet - Adsense to Malay (Bahasa Melayu)
+# Exported from translatewiki.net
+#
+# Author: Anakmalaysia
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Adsense\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:32+0000\n"
+"Language-Team: Malay <https://translatewiki.net/wiki/Portal:ms>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-12-03 10:22:41+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: ms\n"
+"X-Message-Group: #out-statusnet-plugin-adsense\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#. TRANS: Menu item title/tooltip
+msgid "AdSense configuration"
+msgstr "Konfigurasi AdSense"
+
+#. TRANS: Menu item for site administration
+msgctxt "MENU"
+msgid "AdSense"
+msgstr "AdSense"
+
+#. TRANS: Plugin description.
+msgid "Plugin to add Google AdSense to StatusNet sites."
+msgstr "Pemalam untuk menambahkan Google AdSense pada tapak StatusNet."
+
+#. TRANS: Title of AdSense administrator panel.
+msgctxt "TITLE"
+msgid "AdSense"
+msgstr "AdSense"
+
+#. TRANS: Instructions for AdSense administrator panel.
+msgid "AdSense settings for this StatusNet site"
+msgstr "Tetapan pengguna untuk tapak StatusNet ini"
+
+#. TRANS: Field label in AdSense administration panel.
+msgid "Client ID"
+msgstr "ID Klien"
+
+#. TRANS: Field title in AdSense administration panel.
+msgid "Google client ID."
+msgstr "ID klien Google."
+
+#. TRANS: Field label in AdSense administration panel.
+msgid "Ad script URL"
+msgstr "URL skrip iklan"
+
+#. TRANS: Field title in AdSense administration panel.
+msgid "Script URL (advanced)."
+msgstr "URL Skrip (termaju)."
+
+#. TRANS: Field label in AdSense administration panel.
+msgid "Medium rectangle"
+msgstr "Medium rectangle"
+
+#. TRANS: Field title in AdSense administration panel.
+msgid "Medium rectangle slot code."
+msgstr "Kod slot segi Medium rectangle."
+
+#. TRANS: Field label in AdSense administration panel.
+msgid "Rectangle"
+msgstr "Rectangle"
+
+#. TRANS: Field title in AdSense administration panel.
+msgid "Rectangle slot code."
+msgstr "Kod slot Rectangle."
+
+#. TRANS: Field label in AdSense administration panel.
+msgid "Leaderboard"
+msgstr "Leaderboard"
+
+#. TRANS: Field title in AdSense administration panel.
+msgid "Leaderboard slot code."
+msgstr "Kod slot Leaderboard."
+
+#. TRANS: Field label in AdSense administration panel.
+msgid "Skyscraper"
+msgstr "Skyscraper"
+
+#. TRANS: Field title in AdSense administration panel.
+msgid "Wide skyscraper slot code."
+msgstr "Kod slot Wide skyscraper."
+
+#. TRANS: Button text to save settings in AdSense administration panel.
+msgctxt "BUTTON"
+msgid "Save"
+msgstr "Simpan"
+
+#. TRANS: Button title to save settings in AdSense administration panel.
+msgid "Save AdSense settings."
+msgstr "Simpan tetapan AdSense."
diff --git a/plugins/Adsense/locale/nb/LC_MESSAGES/Adsense.po b/plugins/Adsense/locale/nb/LC_MESSAGES/Adsense.po
index 8550f94bd6..3a6b923780 100644
--- a/plugins/Adsense/locale/nb/LC_MESSAGES/Adsense.po
+++ b/plugins/Adsense/locale/nb/LC_MESSAGES/Adsense.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Adsense to Norwegian (bokmål)‬ (‪Norsk (bokmål)‬)
+# Translation of StatusNet - Adsense to Norwegian Bokmål (‪norsk (bokmål)‬)
 # Exported from translatewiki.net
 #
 # Author: Nghtwlkr
@@ -9,15 +9,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Adsense\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:33+0000\n"
-"Language-Team: Norwegian (bokmål)‬ <http://translatewiki.net/wiki/Portal:no>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:32+0000\n"
+"Language-Team: Norwegian Bokmål <https://translatewiki.net/wiki/Portal:nb>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:25:53+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
-"X-Language-Code: no\n"
+"X-POT-Import-Date: 2011-12-03 10:22:41+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: nb\n"
 "X-Message-Group: #out-statusnet-plugin-adsense\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
diff --git a/plugins/Adsense/locale/nl/LC_MESSAGES/Adsense.po b/plugins/Adsense/locale/nl/LC_MESSAGES/Adsense.po
index 32ebb0a130..f08fe0504e 100644
--- a/plugins/Adsense/locale/nl/LC_MESSAGES/Adsense.po
+++ b/plugins/Adsense/locale/nl/LC_MESSAGES/Adsense.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Adsense\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:33+0000\n"
-"Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:32+0000\n"
+"Language-Team: Dutch <https://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:25:53+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-12-03 10:22:41+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-adsense\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/Adsense/locale/pt/LC_MESSAGES/Adsense.po b/plugins/Adsense/locale/pt/LC_MESSAGES/Adsense.po
index d06a6bbdfa..0d8b9cd40f 100644
--- a/plugins/Adsense/locale/pt/LC_MESSAGES/Adsense.po
+++ b/plugins/Adsense/locale/pt/LC_MESSAGES/Adsense.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Adsense to Portuguese (Português)
+# Translation of StatusNet - Adsense to Portuguese (português)
 # Exported from translatewiki.net
 #
 # Author: Waldir
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Adsense\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:33+0000\n"
-"Language-Team: Portuguese <http://translatewiki.net/wiki/Portal:pt>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:32+0000\n"
+"Language-Team: Portuguese <https://translatewiki.net/wiki/Portal:pt>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:25:53+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-12-03 10:22:41+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: pt\n"
 "X-Message-Group: #out-statusnet-plugin-adsense\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/Adsense/locale/pt_BR/LC_MESSAGES/Adsense.po b/plugins/Adsense/locale/pt_BR/LC_MESSAGES/Adsense.po
index d9c70d1834..658e7f0440 100644
--- a/plugins/Adsense/locale/pt_BR/LC_MESSAGES/Adsense.po
+++ b/plugins/Adsense/locale/pt_BR/LC_MESSAGES/Adsense.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Adsense to Brazilian Portuguese (Português do Brasil)
+# Translation of StatusNet - Adsense to Brazilian Portuguese (português do Brasil)
 # Exported from translatewiki.net
 #
 # Author: Giro720
@@ -10,15 +10,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Adsense\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:34+0000\n"
-"Language-Team: Brazilian Portuguese <http://translatewiki.net/wiki/Portal:pt-"
-"br>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:33+0000\n"
+"Language-Team: Brazilian Portuguese <https://translatewiki.net/wiki/Portal:"
+"pt-br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:25:53+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-12-03 10:22:41+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: pt-br\n"
 "X-Message-Group: #out-statusnet-plugin-adsense\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
diff --git a/plugins/Adsense/locale/ru/LC_MESSAGES/Adsense.po b/plugins/Adsense/locale/ru/LC_MESSAGES/Adsense.po
index fc336f9832..f25d75269d 100644
--- a/plugins/Adsense/locale/ru/LC_MESSAGES/Adsense.po
+++ b/plugins/Adsense/locale/ru/LC_MESSAGES/Adsense.po
@@ -1,6 +1,7 @@
-# Translation of StatusNet - Adsense to Russian (Ру��кий)
+# Translation of StatusNet - Adsense to Russian (ру��кий)
 # Exported from translatewiki.net
 #
+# Author: Eleferen
 # Author: Lockal
 # Author: Сrower
 # --
@@ -10,14 +11,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Adsense\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:34+0000\n"
-"Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:33+0000\n"
+"Language-Team: Russian <https://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:25:53+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-12-03 10:22:41+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-adsense\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
@@ -28,7 +29,6 @@ msgid "AdSense configuration"
 msgstr "Конфигураци� AdSense"
 
 #. TRANS: Menu item for site administration
-#, fuzzy
 msgctxt "MENU"
 msgid "AdSense"
 msgstr "AdSense"
@@ -51,18 +51,16 @@ msgid "Client ID"
 msgstr "ID клиента"
 
 #. TRANS: Field title in AdSense administration panel.
-#, fuzzy
 msgid "Google client ID."
-msgstr "ID клиента Google"
+msgstr "Идентификатор клиента Google."
 
 #. TRANS: Field label in AdSense administration panel.
 msgid "Ad script URL"
 msgstr "URL-адре� �крипта рекламы"
 
 #. TRANS: Field title in AdSense administration panel.
-#, fuzzy
 msgid "Script URL (advanced)."
-msgstr "URL-адре� �крипта (ра�ширенна� на�тройка)"
+msgstr "URL-адре� �крипта (ра�ширенна� на�тройка)."
 
 #. TRANS: Field label in AdSense administration panel.
 msgid "Medium rectangle"
@@ -101,12 +99,10 @@ msgid "Wide skyscraper slot code."
 msgstr "Слот-код широкого небо�креба"
 
 #. TRANS: Button text to save settings in AdSense administration panel.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Сохранить"
 
 #. TRANS: Button title to save settings in AdSense administration panel.
-#, fuzzy
 msgid "Save AdSense settings."
-msgstr "Сохранить на�тройки AdSense"
+msgstr "Сохранить на�тройки AdSense."
diff --git a/plugins/Adsense/locale/sv/LC_MESSAGES/Adsense.po b/plugins/Adsense/locale/sv/LC_MESSAGES/Adsense.po
index 0b792e0b69..e670f59f6a 100644
--- a/plugins/Adsense/locale/sv/LC_MESSAGES/Adsense.po
+++ b/plugins/Adsense/locale/sv/LC_MESSAGES/Adsense.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Adsense to Swedish (Svenska)
+# Translation of StatusNet - Adsense to Swedish (svenska)
 # Exported from translatewiki.net
 #
 # Author: Jamminjohn
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Adsense\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:34+0000\n"
-"Language-Team: Swedish <http://translatewiki.net/wiki/Portal:sv>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:33+0000\n"
+"Language-Team: Swedish <https://translatewiki.net/wiki/Portal:sv>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:25:53+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-12-03 10:22:41+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: sv\n"
 "X-Message-Group: #out-statusnet-plugin-adsense\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/Adsense/locale/tl/LC_MESSAGES/Adsense.po b/plugins/Adsense/locale/tl/LC_MESSAGES/Adsense.po
index 3ec0b82d16..e153c2b8c6 100644
--- a/plugins/Adsense/locale/tl/LC_MESSAGES/Adsense.po
+++ b/plugins/Adsense/locale/tl/LC_MESSAGES/Adsense.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Adsense\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:34+0000\n"
-"Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:33+0000\n"
+"Language-Team: Tagalog <https://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:25:53+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-12-03 10:22:41+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-adsense\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/Adsense/locale/uk/LC_MESSAGES/Adsense.po b/plugins/Adsense/locale/uk/LC_MESSAGES/Adsense.po
index c95dcfa100..f2b4f9d802 100644
--- a/plugins/Adsense/locale/uk/LC_MESSAGES/Adsense.po
+++ b/plugins/Adsense/locale/uk/LC_MESSAGES/Adsense.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Adsense to Ukrainian (Україн�ька)
+# Translation of StatusNet - Adsense to Ukrainian (україн�ька)
 # Exported from translatewiki.net
 #
 # Author: Boogie
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Adsense\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:34+0000\n"
-"Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:33+0000\n"
+"Language-Team: Ukrainian <https://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:25:53+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-12-03 10:22:41+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-adsense\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
diff --git a/plugins/Adsense/locale/zh_CN/LC_MESSAGES/Adsense.po b/plugins/Adsense/locale/zh_CN/LC_MESSAGES/Adsense.po
index 9c0421ab9e..7fae863229 100644
--- a/plugins/Adsense/locale/zh_CN/LC_MESSAGES/Adsense.po
+++ b/plugins/Adsense/locale/zh_CN/LC_MESSAGES/Adsense.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Adsense to Simplified Chinese (‪中文(简体)‬)
+# Translation of StatusNet - Adsense to Simplified Chinese (‪中文（简体）‬)
 # Exported from translatewiki.net
 #
 # Author: Chenxiaoqino
@@ -10,15 +10,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Adsense\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:34+0000\n"
-"Language-Team: Simplified Chinese <http://translatewiki.net/wiki/Portal:zh-"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:33+0000\n"
+"Language-Team: Simplified Chinese <https://translatewiki.net/wiki/Portal:zh-"
 "hans>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:25:53+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-12-03 10:22:41+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: #out-statusnet-plugin-adsense\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
diff --git a/plugins/Aim/locale/Aim.pot b/plugins/Aim/locale/Aim.pot
index 0f16da0b36..323e95c5c7 100644
--- a/plugins/Aim/locale/Aim.pot
+++ b/plugins/Aim/locale/Aim.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
+"POT-Creation-Date: 2012-06-30 11:07+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"
diff --git a/plugins/Aim/locale/af/LC_MESSAGES/Aim.po b/plugins/Aim/locale/af/LC_MESSAGES/Aim.po
index 14bf8efcf9..b634420e27 100644
--- a/plugins/Aim/locale/af/LC_MESSAGES/Aim.po
+++ b/plugins/Aim/locale/af/LC_MESSAGES/Aim.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Aim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:34+0000\n"
-"Language-Team: Afrikaans <http://translatewiki.net/wiki/Portal:af>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:33+0000\n"
+"Language-Team: Afrikaans <https://translatewiki.net/wiki/Portal:af>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:25:55+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-18 16:18:38+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: af\n"
 "X-Message-Group: #out-statusnet-plugin-aim\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/Aim/locale/ca/LC_MESSAGES/Aim.po b/plugins/Aim/locale/ca/LC_MESSAGES/Aim.po
index bbc4bf1fe0..ff774deaf8 100644
--- a/plugins/Aim/locale/ca/LC_MESSAGES/Aim.po
+++ b/plugins/Aim/locale/ca/LC_MESSAGES/Aim.po
@@ -1,7 +1,9 @@
-# Translation of StatusNet - Aim to Catalan (Català)
+# Translation of StatusNet - Aim to Catalan (català)
 # Exported from translatewiki.net
 #
 # Author: Dvdgmz
+# Author: Gemmaa
+# Author: Toniher
 # --
 # This file is distributed under the same license as the StatusNet package.
 #
@@ -9,25 +11,25 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Aim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:35+0000\n"
-"Language-Team: Catalan <http://translatewiki.net/wiki/Portal:ca>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:33+0000\n"
+"Language-Team: Catalan <https://translatewiki.net/wiki/Portal:ca>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:25:55+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-18 16:18:38+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ca\n"
 "X-Message-Group: #out-statusnet-plugin-aim\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANS: No idea what the use case for this message is.
 msgid "Send me a message to post a notice"
-msgstr ""
+msgstr "Envia'm un missatge per publicar un avís"
 
 #. TRANS: Display name.
 msgid "AIM"
-msgstr ""
+msgstr "AIM"
 
 #. TRANS: Exception thrown in AIM plugin when user has not been specified.
 msgid "Must specify a user."
@@ -41,3 +43,5 @@ msgstr "Has d'especificar una contrassenya"
 msgid ""
 "The AIM plugin allows users to send and receive notices over the AIM network."
 msgstr ""
+"El connector XMPP permet als usuaris enviar i rebre avisos des de la xarxa "
+"XMPP/Jabber."
diff --git a/plugins/Aim/locale/de/LC_MESSAGES/Aim.po b/plugins/Aim/locale/de/LC_MESSAGES/Aim.po
index 52a46d3577..5beba69dbf 100644
--- a/plugins/Aim/locale/de/LC_MESSAGES/Aim.po
+++ b/plugins/Aim/locale/de/LC_MESSAGES/Aim.po
@@ -2,6 +2,7 @@
 # Exported from translatewiki.net
 #
 # Author: Giftpflanze
+# Author: Marcel083
 # --
 # This file is distributed under the same license as the StatusNet package.
 #
@@ -9,21 +10,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Aim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:35+0000\n"
-"Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:34+0000\n"
+"Language-Team: German <https://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:25:55+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-18 16:18:38+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-aim\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANS: No idea what the use case for this message is.
 msgid "Send me a message to post a notice"
-msgstr "Sende mir eine Nachricht um eine Nachricht zu schreiben"
+msgstr "Sende mir eine Nachricht um eine Notiz zu schreiben"
 
 #. TRANS: Display name.
 msgid "AIM"
diff --git a/plugins/Aim/locale/es/LC_MESSAGES/Aim.po b/plugins/Aim/locale/es/LC_MESSAGES/Aim.po
new file mode 100644
index 0000000000..6eaa92141d
--- /dev/null
+++ b/plugins/Aim/locale/es/LC_MESSAGES/Aim.po
@@ -0,0 +1,47 @@
+# Translation of StatusNet - Aim to Spanish (español)
+# Exported from translatewiki.net
+#
+# Author: Erchache2000
+# Author: Od1n
+# Author: Plaxed
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Aim\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:34+0000\n"
+"Language-Team: Spanish <https://translatewiki.net/wiki/Portal:es>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-18 16:18:38+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: es\n"
+"X-Message-Group: #out-statusnet-plugin-aim\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: No idea what the use case for this message is.
+msgid "Send me a message to post a notice"
+msgstr "Enviarme un mensaje para publicar un aviso"
+
+#. TRANS: Display name.
+msgid "AIM"
+msgstr "AIM"
+
+#. TRANS: Exception thrown in AIM plugin when user has not been specified.
+msgid "Must specify a user."
+msgstr "Debe especificar un usuario."
+
+#. TRANS: Exception thrown in AIM plugin when password has not been specified.
+msgid "Must specify a password."
+msgstr "Debe especificar una contraseña."
+
+#. TRANS: Plugin description.
+msgid ""
+"The AIM plugin allows users to send and receive notices over the AIM network."
+msgstr ""
+"El plugin AIM permite a los usuarios enviar y recibir mensajes de una red "
+"AIM."
diff --git a/plugins/Aim/locale/eu/LC_MESSAGES/Aim.po b/plugins/Aim/locale/eu/LC_MESSAGES/Aim.po
new file mode 100644
index 0000000000..874f0d9599
--- /dev/null
+++ b/plugins/Aim/locale/eu/LC_MESSAGES/Aim.po
@@ -0,0 +1,45 @@
+# Translation of StatusNet - Aim to Basque (euskara)
+# Exported from translatewiki.net
+#
+# Author: Artsuaga
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Aim\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:34+0000\n"
+"Language-Team: Basque <https://translatewiki.net/wiki/Portal:eu>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-18 16:18:38+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: eu\n"
+"X-Message-Group: #out-statusnet-plugin-aim\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: No idea what the use case for this message is.
+msgid "Send me a message to post a notice"
+msgstr "Bidali mezu bat niri ohar bat argitartzeko"
+
+#. TRANS: Display name.
+msgid "AIM"
+msgstr "AIM"
+
+#. TRANS: Exception thrown in AIM plugin when user has not been specified.
+msgid "Must specify a user."
+msgstr "Erabiltzaile bat zehaztu."
+
+#. TRANS: Exception thrown in AIM plugin when password has not been specified.
+msgid "Must specify a password."
+msgstr "Pasahitz bat zehaztu."
+
+#. TRANS: Plugin description.
+msgid ""
+"The AIM plugin allows users to send and receive notices over the AIM network."
+msgstr ""
+"AIM pluginak erabiltzaileei AIM sare bidez mezuak bidali eta jasotzea "
+"ahalbidetzen die."
diff --git a/plugins/Aim/locale/fi/LC_MESSAGES/Aim.po b/plugins/Aim/locale/fi/LC_MESSAGES/Aim.po
new file mode 100644
index 0000000000..e9ef6a7485
--- /dev/null
+++ b/plugins/Aim/locale/fi/LC_MESSAGES/Aim.po
@@ -0,0 +1,45 @@
+# Translation of StatusNet - Aim to Finnish (suomi)
+# Exported from translatewiki.net
+#
+# Author: Tne
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Aim\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:34+0000\n"
+"Language-Team: Finnish <https://translatewiki.net/wiki/Portal:fi>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-18 16:18:38+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: fi\n"
+"X-Message-Group: #out-statusnet-plugin-aim\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: No idea what the use case for this message is.
+msgid "Send me a message to post a notice"
+msgstr "Lähetä minulle viesti lähettääksesi päivityksen"
+
+#. TRANS: Display name.
+msgid "AIM"
+msgstr "AIM"
+
+#. TRANS: Exception thrown in AIM plugin when user has not been specified.
+msgid "Must specify a user."
+msgstr "Käyttäjä pitää määrittää."
+
+#. TRANS: Exception thrown in AIM plugin when password has not been specified.
+msgid "Must specify a password."
+msgstr "Salasana pitää määrittää."
+
+#. TRANS: Plugin description.
+msgid ""
+"The AIM plugin allows users to send and receive notices over the AIM network."
+msgstr ""
+"AIM-liitännäisen avulla käyttäjät voivat lähettää ja vastaanottaa "
+"päivityksiä AIM-verkoston kautta."
diff --git a/plugins/Aim/locale/fr/LC_MESSAGES/Aim.po b/plugins/Aim/locale/fr/LC_MESSAGES/Aim.po
index eec18d0c05..8a20feca26 100644
--- a/plugins/Aim/locale/fr/LC_MESSAGES/Aim.po
+++ b/plugins/Aim/locale/fr/LC_MESSAGES/Aim.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Aim to French (Français)
+# Translation of StatusNet - Aim to French (français)
 # Exported from translatewiki.net
 #
 # Author: Coyau
@@ -10,14 +10,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Aim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:35+0000\n"
-"Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:34+0000\n"
+"Language-Team: French <https://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:25:55+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-18 16:18:38+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-aim\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
diff --git a/plugins/Aim/locale/gl/LC_MESSAGES/Aim.po b/plugins/Aim/locale/gl/LC_MESSAGES/Aim.po
new file mode 100644
index 0000000000..0f9e3f6d02
--- /dev/null
+++ b/plugins/Aim/locale/gl/LC_MESSAGES/Aim.po
@@ -0,0 +1,45 @@
+# Translation of StatusNet - Aim to Galician (galego)
+# Exported from translatewiki.net
+#
+# Author: Toliño
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Aim\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:34+0000\n"
+"Language-Team: Galician <https://translatewiki.net/wiki/Portal:gl>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-18 16:18:38+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: gl\n"
+"X-Message-Group: #out-statusnet-plugin-aim\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: No idea what the use case for this message is.
+msgid "Send me a message to post a notice"
+msgstr "Envíame unha mensaxe para publicar unha nota"
+
+#. TRANS: Display name.
+msgid "AIM"
+msgstr "AIM"
+
+#. TRANS: Exception thrown in AIM plugin when user has not been specified.
+msgid "Must specify a user."
+msgstr "Cómpre especificar un usuario."
+
+#. TRANS: Exception thrown in AIM plugin when password has not been specified.
+msgid "Must specify a password."
+msgstr "Cómpre especificar un contrasinal."
+
+#. TRANS: Plugin description.
+msgid ""
+"The AIM plugin allows users to send and receive notices over the AIM network."
+msgstr ""
+"O complemento AIM permite aos usuarios enviar e recibir mensaxes desde a "
+"rede de AIM."
diff --git a/plugins/Aim/locale/ia/LC_MESSAGES/Aim.po b/plugins/Aim/locale/ia/LC_MESSAGES/Aim.po
index b996175572..bc198b8186 100644
--- a/plugins/Aim/locale/ia/LC_MESSAGES/Aim.po
+++ b/plugins/Aim/locale/ia/LC_MESSAGES/Aim.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Aim to Interlingua (Interlingua)
+# Translation of StatusNet - Aim to Interlingua (interlingua)
 # Exported from translatewiki.net
 #
 # Author: McDutchie
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Aim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:35+0000\n"
-"Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:34+0000\n"
+"Language-Team: Interlingua <https://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:25:55+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-18 16:18:38+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-aim\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/Aim/locale/it/LC_MESSAGES/Aim.po b/plugins/Aim/locale/it/LC_MESSAGES/Aim.po
new file mode 100644
index 0000000000..b48753fcf6
--- /dev/null
+++ b/plugins/Aim/locale/it/LC_MESSAGES/Aim.po
@@ -0,0 +1,43 @@
+# Translation of StatusNet - Aim to Italian (italiano)
+# Exported from translatewiki.net
+#
+# Author: Od1n
+# Author: Ximo17
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Aim\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:34+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-18 16:18:38+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: No idea what the use case for this message is.
+msgid "Send me a message to post a notice"
+msgstr "Mandami un messaggio per pubblicare una notizia"
+
+#. TRANS: Display name.
+msgid "AIM"
+msgstr "AIM"
+
+#. TRANS: Exception thrown in AIM plugin when user has not been specified.
+msgid "Must specify a user."
+msgstr "Devi specificare un utente."
+
+#. TRANS: Exception thrown in AIM plugin when password has not been specified.
+msgid "Must specify a password."
+msgstr "Devi specificare una password."
+
+#. TRANS: Plugin description.
+msgid ""
+"The AIM plugin allows users to send and receive notices over the AIM network."
+msgstr ""
+"Il plugin per AIM consente agli utenti di inviare e ricevere le notizie "
+"tramite la rete AIM."
diff --git a/plugins/Aim/locale/mk/LC_MESSAGES/Aim.po b/plugins/Aim/locale/mk/LC_MESSAGES/Aim.po
index c4f254b8f0..cefdc673d1 100644
--- a/plugins/Aim/locale/mk/LC_MESSAGES/Aim.po
+++ b/plugins/Aim/locale/mk/LC_MESSAGES/Aim.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Aim to Macedonian (Македон�ки)
+# Translation of StatusNet - Aim to Macedonian (македон�ки)
 # Exported from translatewiki.net
 #
 # Author: Bjankuloski06
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Aim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:35+0000\n"
-"Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:34+0000\n"
+"Language-Team: Macedonian <https://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:25:55+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-18 16:18:38+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-aim\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
diff --git a/plugins/Aim/locale/ms/LC_MESSAGES/Aim.po b/plugins/Aim/locale/ms/LC_MESSAGES/Aim.po
new file mode 100644
index 0000000000..d15de49735
--- /dev/null
+++ b/plugins/Aim/locale/ms/LC_MESSAGES/Aim.po
@@ -0,0 +1,45 @@
+# Translation of StatusNet - Aim to Malay (Bahasa Melayu)
+# Exported from translatewiki.net
+#
+# Author: Anakmalaysia
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Aim\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:34+0000\n"
+"Language-Team: Malay <https://translatewiki.net/wiki/Portal:ms>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-18 16:18:38+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: ms\n"
+"X-Message-Group: #out-statusnet-plugin-aim\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#. TRANS: No idea what the use case for this message is.
+msgid "Send me a message to post a notice"
+msgstr "Hantarkan pesanan kepada saya untuk mengirim notis"
+
+#. TRANS: Display name.
+msgid "AIM"
+msgstr "AIM"
+
+#. TRANS: Exception thrown in AIM plugin when user has not been specified.
+msgid "Must specify a user."
+msgstr "Pengguna mesti ditentukan."
+
+#. TRANS: Exception thrown in AIM plugin when password has not been specified.
+msgid "Must specify a password."
+msgstr "Kata laluan mesti ditentukan."
+
+#. TRANS: Plugin description.
+msgid ""
+"The AIM plugin allows users to send and receive notices over the AIM network."
+msgstr ""
+"Pemalam AIM membolehkan pengguna menghantar dan menerima notis menerusi "
+"rangkaian AIM."
diff --git a/plugins/Aim/locale/nl/LC_MESSAGES/Aim.po b/plugins/Aim/locale/nl/LC_MESSAGES/Aim.po
index a5d88540ca..6869d795e2 100644
--- a/plugins/Aim/locale/nl/LC_MESSAGES/Aim.po
+++ b/plugins/Aim/locale/nl/LC_MESSAGES/Aim.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Aim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:35+0000\n"
-"Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:34+0000\n"
+"Language-Team: Dutch <https://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:25:55+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-18 16:18:38+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-aim\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/Aim/locale/pl/LC_MESSAGES/Aim.po b/plugins/Aim/locale/pl/LC_MESSAGES/Aim.po
new file mode 100644
index 0000000000..56a4cea1b3
--- /dev/null
+++ b/plugins/Aim/locale/pl/LC_MESSAGES/Aim.po
@@ -0,0 +1,43 @@
+# Translation of StatusNet - Aim to Polish (polski)
+# Exported from translatewiki.net
+#
+# Author: BeginaFelicysym
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Aim\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:34+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-18 16:18:38+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=3; plural=(n == 1) ? 0 : ( (n%10 >= 2 && n%10 <= 4 && "
+"(n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
+
+#. TRANS: No idea what the use case for this message is.
+msgid "Send me a message to post a notice"
+msgstr "Wyślij do mnie wiadomość by dodać ogłoszenie"
+
+#. TRANS: Display name.
+msgid "AIM"
+msgstr "AIM"
+
+#. TRANS: Exception thrown in AIM plugin when user has not been specified.
+msgid "Must specify a user."
+msgstr "Należy określić użytkownika."
+
+#. TRANS: Exception thrown in AIM plugin when password has not been specified.
+msgid "Must specify a password."
+msgstr "Należy określić hasło."
+
+#. TRANS: Plugin description.
+msgid ""
+"The AIM plugin allows users to send and receive notices over the AIM network."
+msgstr ""
+"Wtyczka AIM umożliwia użytkownikom wysyłanie i otrzymywanie powiadomień w "
+"sieci AIM."
diff --git a/plugins/Aim/locale/pt/LC_MESSAGES/Aim.po b/plugins/Aim/locale/pt/LC_MESSAGES/Aim.po
index 11cff367cd..82fedba464 100644
--- a/plugins/Aim/locale/pt/LC_MESSAGES/Aim.po
+++ b/plugins/Aim/locale/pt/LC_MESSAGES/Aim.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Aim to Portuguese (Português)
+# Translation of StatusNet - Aim to Portuguese (português)
 # Exported from translatewiki.net
 #
 # Author: SandroHc
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Aim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:35+0000\n"
-"Language-Team: Portuguese <http://translatewiki.net/wiki/Portal:pt>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:35+0000\n"
+"Language-Team: Portuguese <https://translatewiki.net/wiki/Portal:pt>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:25:55+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-18 16:18:38+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: pt\n"
 "X-Message-Group: #out-statusnet-plugin-aim\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/Aim/locale/sv/LC_MESSAGES/Aim.po b/plugins/Aim/locale/sv/LC_MESSAGES/Aim.po
index 0e46faeeee..ac000fb8e7 100644
--- a/plugins/Aim/locale/sv/LC_MESSAGES/Aim.po
+++ b/plugins/Aim/locale/sv/LC_MESSAGES/Aim.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Aim to Swedish (Svenska)
+# Translation of StatusNet - Aim to Swedish (svenska)
 # Exported from translatewiki.net
 #
 # Author: Jamminjohn
@@ -10,14 +10,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Aim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:35+0000\n"
-"Language-Team: Swedish <http://translatewiki.net/wiki/Portal:sv>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:35+0000\n"
+"Language-Team: Swedish <https://translatewiki.net/wiki/Portal:sv>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:25:55+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-18 16:18:38+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: sv\n"
 "X-Message-Group: #out-statusnet-plugin-aim\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/Aim/locale/tl/LC_MESSAGES/Aim.po b/plugins/Aim/locale/tl/LC_MESSAGES/Aim.po
index 4e638b05f8..f8c6c1d1fa 100644
--- a/plugins/Aim/locale/tl/LC_MESSAGES/Aim.po
+++ b/plugins/Aim/locale/tl/LC_MESSAGES/Aim.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Aim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:35+0000\n"
-"Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:35+0000\n"
+"Language-Team: Tagalog <https://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:25:55+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-18 16:18:38+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-aim\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/Aim/locale/uk/LC_MESSAGES/Aim.po b/plugins/Aim/locale/uk/LC_MESSAGES/Aim.po
index 15ed71748e..2acc6ae8d3 100644
--- a/plugins/Aim/locale/uk/LC_MESSAGES/Aim.po
+++ b/plugins/Aim/locale/uk/LC_MESSAGES/Aim.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Aim to Ukrainian (Україн�ька)
+# Translation of StatusNet - Aim to Ukrainian (україн�ька)
 # Exported from translatewiki.net
 #
 # Author: Boogie
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Aim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:35+0000\n"
-"Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:35+0000\n"
+"Language-Team: Ukrainian <https://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:25:55+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-18 16:18:38+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-aim\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
diff --git a/plugins/AnonymousFave/locale/AnonymousFave.pot b/plugins/AnonymousFave/locale/AnonymousFave.pot
index 7083506f7e..68951da17e 100644
--- a/plugins/AnonymousFave/locale/AnonymousFave.pot
+++ b/plugins/AnonymousFave/locale/AnonymousFave.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
+"POT-Creation-Date: 2012-06-30 11:07+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"
diff --git a/plugins/AnonymousFave/locale/ar/LC_MESSAGES/AnonymousFave.po b/plugins/AnonymousFave/locale/ar/LC_MESSAGES/AnonymousFave.po
new file mode 100644
index 0000000000..59804ce285
--- /dev/null
+++ b/plugins/AnonymousFave/locale/ar/LC_MESSAGES/AnonymousFave.po
@@ -0,0 +1,86 @@
+# Translation of StatusNet - AnonymousFave to Arabic (العربية)
+# Exported from translatewiki.net
+#
+# Author: OsamaK
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - AnonymousFave\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:35+0000\n"
+"Language-Team: Arabic <https://translatewiki.net/wiki/Portal:ar>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:49:09+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: ar\n"
+"X-Message-Group: #out-statusnet-plugin-anonymousfave\n"
+"Plural-Forms: nplurals=6; plural=(n == 0) ? 0 : ( (n == 1) ? 1 : ( (n == "
+"2) ? 2 : ( (n%100 >= 3 && n%100 <= 10) ? 3 : ( (n%100 >= 11 && n%100 <= "
+"99) ? 4 : 5 ) ) ) );\n"
+
+#. TRANS: Server exception.
+#. TRANS: %d is the notice ID (number).
+#, php-format
+msgid "Could not update favorite tally for notice ID %d."
+msgstr ""
+
+#. TRANS: Server exception.
+#. TRANS: %d is the notice ID (number).
+#, php-format
+msgid "Could not create favorite tally for notice ID %d."
+msgstr ""
+
+#. TRANS: Client error.
+msgid ""
+"Could not disfavor notice! Please make sure your browser has cookies enabled."
+msgstr ""
+
+#. TRANS: Client error.
+msgid "There was a problem with your session token. Try again, please."
+msgstr ""
+
+#. TRANS: Client error.
+msgid "This notice is not a favorite!"
+msgstr "هذا الإشعار ليس م�ضلًا!"
+
+#. TRANS: Server error.
+msgid "Could not delete favorite."
+msgstr "تعذّر حذ� الم�ضلة."
+
+#. TRANS: Title.
+msgid "Add to favorites"
+msgstr "أض� إلى الم�ضلات"
+
+#. TRANS: Label for tally for number of times a notice was favored.
+msgid "Favored"
+msgstr "م�ضل"
+
+#. TRANS: Server exception.
+msgid "Could not create anonymous user session."
+msgstr ""
+
+#. TRANS: Plugin description.
+msgid "Allow anonymous users to favorite notices."
+msgstr "اسمح للمستخدمين المجهولين بت�ضيل الإشعارات."
+
+#. TRANS: Client error.
+msgid ""
+"Could not favor notice! Please make sure your browser has cookies enabled."
+msgstr ""
+
+#. TRANS: Client error.
+msgid "This notice is already a favorite!"
+msgstr "هذا الإشعار م�ضل سابقا!"
+
+#. TRANS: Server error.
+msgid "Could not create favorite."
+msgstr "تعذّر إنشاء م�ضلة."
+
+#. TRANS: Title.
+msgid "Disfavor favorite"
+msgstr "إلغاء الت�ضيل"
diff --git a/plugins/AnonymousFave/locale/be-tarask/LC_MESSAGES/AnonymousFave.po b/plugins/AnonymousFave/locale/be-tarask/LC_MESSAGES/AnonymousFave.po
index 61bb9ce1d7..c6bd81bb67 100644
--- a/plugins/AnonymousFave/locale/be-tarask/LC_MESSAGES/AnonymousFave.po
+++ b/plugins/AnonymousFave/locale/be-tarask/LC_MESSAGES/AnonymousFave.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - AnonymousFave to Belarusian (Taraškievica orthography) (‪Белару�ка� (тарашкевіца)‬)
+# Translation of StatusNet - AnonymousFave to Belarusian (Taraškievica orthography) (‪белару�ка� (тарашкевіца)‬)
 # Exported from translatewiki.net
 #
 # Author: EugeneZelenko
@@ -10,15 +10,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - AnonymousFave\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:36+0000\n"
-"Language-Team: Belarusian (Taraškievica orthography) <http://translatewiki."
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:35+0000\n"
+"Language-Team: Belarusian (Taraškievica orthography) <https://translatewiki."
 "net/wiki/Portal:be-tarask>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:25:56+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:49:09+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: be-tarask\n"
 "X-Message-Group: #out-statusnet-plugin-anonymousfave\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/AnonymousFave/locale/br/LC_MESSAGES/AnonymousFave.po b/plugins/AnonymousFave/locale/br/LC_MESSAGES/AnonymousFave.po
index 02ff65d1ea..6c77de00e9 100644
--- a/plugins/AnonymousFave/locale/br/LC_MESSAGES/AnonymousFave.po
+++ b/plugins/AnonymousFave/locale/br/LC_MESSAGES/AnonymousFave.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - AnonymousFave to Breton (Brezhoneg)
+# Translation of StatusNet - AnonymousFave to Breton (brezhoneg)
 # Exported from translatewiki.net
 #
 # Author: Y-M D
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - AnonymousFave\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:36+0000\n"
-"Language-Team: Breton <http://translatewiki.net/wiki/Portal:br>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:35+0000\n"
+"Language-Team: Breton <https://translatewiki.net/wiki/Portal:br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:25:56+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:49:09+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-anonymousfave\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
diff --git a/plugins/AnonymousFave/locale/ca/LC_MESSAGES/AnonymousFave.po b/plugins/AnonymousFave/locale/ca/LC_MESSAGES/AnonymousFave.po
index fdaa82328f..310a509615 100644
--- a/plugins/AnonymousFave/locale/ca/LC_MESSAGES/AnonymousFave.po
+++ b/plugins/AnonymousFave/locale/ca/LC_MESSAGES/AnonymousFave.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - AnonymousFave to Catalan (Català)
+# Translation of StatusNet - AnonymousFave to Catalan (català)
 # Exported from translatewiki.net
 #
 # Author: Toniher
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - AnonymousFave\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:36+0000\n"
-"Language-Team: Catalan <http://translatewiki.net/wiki/Portal:ca>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:35+0000\n"
+"Language-Team: Catalan <https://translatewiki.net/wiki/Portal:ca>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:25:56+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:49:09+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ca\n"
 "X-Message-Group: #out-statusnet-plugin-anonymousfave\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -37,10 +37,14 @@ msgstr ""
 msgid ""
 "Could not disfavor notice! Please make sure your browser has cookies enabled."
 msgstr ""
+"No s'ha pogut marcar l'avís com a no preferit. Assegureu-vos que el "
+"navegador té habilitades les galetes."
 
 #. TRANS: Client error.
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
+"S'ha produït un problema amb el vostre testimoni de sessió. Torneu-ho a "
+"provar."
 
 #. TRANS: Client error.
 msgid "This notice is not a favorite!"
diff --git a/plugins/AnonymousFave/locale/de/LC_MESSAGES/AnonymousFave.po b/plugins/AnonymousFave/locale/de/LC_MESSAGES/AnonymousFave.po
index ab2414d5a6..82a8586250 100644
--- a/plugins/AnonymousFave/locale/de/LC_MESSAGES/AnonymousFave.po
+++ b/plugins/AnonymousFave/locale/de/LC_MESSAGES/AnonymousFave.po
@@ -1,6 +1,7 @@
 # Translation of StatusNet - AnonymousFave to German (Deutsch)
 # Exported from translatewiki.net
 #
+# Author: DaSch
 # Author: The Evil IP address
 # --
 # This file is distributed under the same license as the StatusNet package.
@@ -9,29 +10,31 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - AnonymousFave\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:37+0000\n"
-"Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:35+0000\n"
+"Language-Team: German <https://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:25:56+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:49:09+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-anonymousfave\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANS: Server exception.
 #. TRANS: %d is the notice ID (number).
-#, fuzzy, php-format
+#, php-format
 msgid "Could not update favorite tally for notice ID %d."
-msgstr "Konnte Favoritenzähler der Nachrichten-ID %d nicht aktualisieren."
+msgstr ""
+"Konnte Favoritenzähler der Nachricht mit der ID %d nicht aktualisieren."
 
 #. TRANS: Server exception.
 #. TRANS: %d is the notice ID (number).
-#, fuzzy, php-format
+#, php-format
 msgid "Could not create favorite tally for notice ID %d."
-msgstr "Konnte keinen Favoritenzähler der Nachrichten-ID %d erstellen."
+msgstr ""
+"Konnte keinen Favoritenzähler für die Nachricht mit der ID %d erstellen."
 
 #. TRANS: Client error.
 msgid ""
@@ -61,7 +64,6 @@ msgid "Favored"
 msgstr "Favorisiert"
 
 #. TRANS: Server exception.
-#, fuzzy
 msgid "Could not create anonymous user session."
 msgstr "Konnte keine anonyme Benutzer-Sitzung erstellen."
 
diff --git a/plugins/AnonymousFave/locale/es/LC_MESSAGES/AnonymousFave.po b/plugins/AnonymousFave/locale/es/LC_MESSAGES/AnonymousFave.po
index 715897ef71..5b70d5f048 100644
--- a/plugins/AnonymousFave/locale/es/LC_MESSAGES/AnonymousFave.po
+++ b/plugins/AnonymousFave/locale/es/LC_MESSAGES/AnonymousFave.po
@@ -1,6 +1,7 @@
-# Translation of StatusNet - AnonymousFave to Spanish (Español)
+# Translation of StatusNet - AnonymousFave to Spanish (español)
 # Exported from translatewiki.net
 #
+# Author: Erchache2000
 # Author: Locos epraix
 # Author: Translationista
 # --
@@ -10,27 +11,27 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - AnonymousFave\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:37+0000\n"
-"Language-Team: Spanish <http://translatewiki.net/wiki/Portal:es>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:36+0000\n"
+"Language-Team: Spanish <https://translatewiki.net/wiki/Portal:es>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:25:56+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:49:09+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-plugin-anonymousfave\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANS: Server exception.
 #. TRANS: %d is the notice ID (number).
-#, fuzzy, php-format
+#, php-format
 msgid "Could not update favorite tally for notice ID %d."
-msgstr "No se pudo actualizar el la cuenta favorita para el mensaje de ID %d."
+msgstr "No se pudo actualizar la cuenta favorita para el mensaje de ID %d."
 
 #. TRANS: Server exception.
 #. TRANS: %d is the notice ID (number).
-#, fuzzy, php-format
+#, php-format
 msgid "Could not create favorite tally for notice ID %d."
 msgstr "No se pudo crear una cuenta favorita para el mensaje de ID %d."
 
@@ -63,9 +64,8 @@ msgid "Favored"
 msgstr "Favorito"
 
 #. TRANS: Server exception.
-#, fuzzy
 msgid "Could not create anonymous user session."
-msgstr "No se pudo crear sesión de usuario anónimo."
+msgstr "No se pudo crear la sesión de usuario anónimo."
 
 #. TRANS: Plugin description.
 msgid "Allow anonymous users to favorite notices."
diff --git a/plugins/AnonymousFave/locale/eu/LC_MESSAGES/AnonymousFave.po b/plugins/AnonymousFave/locale/eu/LC_MESSAGES/AnonymousFave.po
new file mode 100644
index 0000000000..2de9cb2484
--- /dev/null
+++ b/plugins/AnonymousFave/locale/eu/LC_MESSAGES/AnonymousFave.po
@@ -0,0 +1,85 @@
+# Translation of StatusNet - AnonymousFave to Basque (euskara)
+# Exported from translatewiki.net
+#
+# Author: Artsuaga
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - AnonymousFave\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:36+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:49:09+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Server exception.
+#. TRANS: %d is the notice ID (number).
+#, php-format
+msgid "Could not update favorite tally for notice ID %d."
+msgstr "%d IDa daukan mezuarentzako gogoko kontua ezin izan da eguneratu."
+
+#. TRANS: Server exception.
+#. TRANS: %d is the notice ID (number).
+#, php-format
+msgid "Could not create favorite tally for notice ID %d."
+msgstr "%d IDa daukan mezuarentzako gogoko kontua ezin izan da sortu."
+
+#. TRANS: Client error.
+msgid ""
+"Could not disfavor notice! Please make sure your browser has cookies enabled."
+msgstr ""
+"Ezin izan da oharra gogokoenetatik kendu! Mesedez ziurtatu zure "
+"nabigatzailean cookieak gaiturik dituzula."
+
+#. TRANS: Client error.
+msgid "There was a problem with your session token. Try again, please."
+msgstr "Zure saio tokenarekin arazo bat egon da. Saiatu berriro, mesedez."
+
+#. TRANS: Client error.
+msgid "This notice is not a favorite!"
+msgstr "Ohar hau ez da gogoko bat!"
+
+#. TRANS: Server error.
+msgid "Could not delete favorite."
+msgstr "Ezin da gogokoa ezabatu."
+
+#. TRANS: Title.
+msgid "Add to favorites"
+msgstr "Gehitu gogokoetara"
+
+#. TRANS: Label for tally for number of times a notice was favored.
+msgid "Favored"
+msgstr "Gogokoa"
+
+#. TRANS: Server exception.
+msgid "Could not create anonymous user session."
+msgstr "Ezin izan da erabiltzaile anonimoarekin saioa hasi."
+
+#. TRANS: Plugin description.
+msgid "Allow anonymous users to favorite notices."
+msgstr "Utzi erabiltzaile anonimoei oharrak gogoko gisa markatzen."
+
+#. TRANS: Client error.
+msgid ""
+"Could not favor notice! Please make sure your browser has cookies enabled."
+msgstr ""
+"Ezin izan da oharra gogoko gida gehitu! Mesedez ziurtatu zure nabigatzailean "
+"cookieak gaiturik dituzula."
+
+#. TRANS: Client error.
+msgid "This notice is already a favorite!"
+msgstr "Ohar hau dagoeneko gogokoa da!"
+
+#. TRANS: Server error.
+msgid "Could not create favorite."
+msgstr "Ezin da gogokoa sortu."
+
+#. TRANS: Title.
+msgid "Disfavor favorite"
+msgstr "Gogokoa kendu"
diff --git a/plugins/AnonymousFave/locale/fr/LC_MESSAGES/AnonymousFave.po b/plugins/AnonymousFave/locale/fr/LC_MESSAGES/AnonymousFave.po
index e2cdddd53a..773cf37099 100644
--- a/plugins/AnonymousFave/locale/fr/LC_MESSAGES/AnonymousFave.po
+++ b/plugins/AnonymousFave/locale/fr/LC_MESSAGES/AnonymousFave.po
@@ -1,8 +1,9 @@
-# Translation of StatusNet - AnonymousFave to French (Français)
+# Translation of StatusNet - AnonymousFave to French (français)
 # Exported from translatewiki.net
 #
 # Author: Iketsi
 # Author: Peter17
+# Author: Verdy p
 # --
 # This file is distributed under the same license as the StatusNet package.
 #
@@ -10,14 +11,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - AnonymousFave\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:37+0000\n"
-"Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:36+0000\n"
+"Language-Team: French <https://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:25:56+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:49:09+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-anonymousfave\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
@@ -88,4 +89,4 @@ msgstr "Impossible de créer le favori."
 
 #. TRANS: Title.
 msgid "Disfavor favorite"
-msgstr "Retirer ce favori"
+msgstr "Retirer le favori"
diff --git a/plugins/AnonymousFave/locale/gl/LC_MESSAGES/AnonymousFave.po b/plugins/AnonymousFave/locale/gl/LC_MESSAGES/AnonymousFave.po
index 1608598b1d..7b71a1902e 100644
--- a/plugins/AnonymousFave/locale/gl/LC_MESSAGES/AnonymousFave.po
+++ b/plugins/AnonymousFave/locale/gl/LC_MESSAGES/AnonymousFave.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - AnonymousFave to Galician (Galego)
+# Translation of StatusNet - AnonymousFave to Galician (galego)
 # Exported from translatewiki.net
 #
 # Author: Toliño
@@ -9,34 +9,36 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - AnonymousFave\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:37+0000\n"
-"Language-Team: Galician <http://translatewiki.net/wiki/Portal:gl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:36+0000\n"
+"Language-Team: Galician <https://translatewiki.net/wiki/Portal:gl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:25:56+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:49:09+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: gl\n"
 "X-Message-Group: #out-statusnet-plugin-anonymousfave\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANS: Server exception.
 #. TRANS: %d is the notice ID (number).
-#, fuzzy, php-format
+#, php-format
 msgid "Could not update favorite tally for notice ID %d."
-msgstr "Non se puido eliminar o favorito."
+msgstr "Non se puido actualizar o favorito do aviso con ID %d."
 
 #. TRANS: Server exception.
 #. TRANS: %d is the notice ID (number).
-#, fuzzy, php-format
+#, php-format
 msgid "Could not create favorite tally for notice ID %d."
-msgstr "Non se puido crear o favorito."
+msgstr "Non se puido crear o favorito do aviso con ID %d."
 
 #. TRANS: Client error.
 msgid ""
 "Could not disfavor notice! Please make sure your browser has cookies enabled."
 msgstr ""
+"Non se puido eliminar a nota dos favoritos! Asegúrese de que o navegador ten "
+"as cookies habilitadas."
 
 #. TRANS: Client error.
 msgid "There was a problem with your session token. Try again, please."
@@ -56,21 +58,22 @@ msgstr "Engadir aos favoritos"
 
 #. TRANS: Label for tally for number of times a notice was favored.
 msgid "Favored"
-msgstr ""
+msgstr "Favorita"
 
 #. TRANS: Server exception.
-#, fuzzy
 msgid "Could not create anonymous user session."
-msgstr "Non se puido crear o favorito."
+msgstr "Non se puido crear a sesión de usuario anónimo."
 
 #. TRANS: Plugin description.
 msgid "Allow anonymous users to favorite notices."
-msgstr ""
+msgstr "Permitir aos usuarios anónimos marcar notas como favoritas."
 
 #. TRANS: Client error.
 msgid ""
 "Could not favor notice! Please make sure your browser has cookies enabled."
 msgstr ""
+"Non se puido engadir a nota aos favoritos! Asegúrese de que o navegador ten "
+"as cookies habilitadas."
 
 #. TRANS: Client error.
 msgid "This notice is already a favorite!"
diff --git a/plugins/AnonymousFave/locale/ia/LC_MESSAGES/AnonymousFave.po b/plugins/AnonymousFave/locale/ia/LC_MESSAGES/AnonymousFave.po
index 096c113ee4..0b2ed0f494 100644
--- a/plugins/AnonymousFave/locale/ia/LC_MESSAGES/AnonymousFave.po
+++ b/plugins/AnonymousFave/locale/ia/LC_MESSAGES/AnonymousFave.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - AnonymousFave to Interlingua (Interlingua)
+# Translation of StatusNet - AnonymousFave to Interlingua (interlingua)
 # Exported from translatewiki.net
 #
 # Author: McDutchie
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - AnonymousFave\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:37+0000\n"
-"Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:36+0000\n"
+"Language-Team: Interlingua <https://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:25:56+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:49:09+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-anonymousfave\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/AnonymousFave/locale/it/LC_MESSAGES/AnonymousFave.po b/plugins/AnonymousFave/locale/it/LC_MESSAGES/AnonymousFave.po
new file mode 100644
index 0000000000..3e7368c6be
--- /dev/null
+++ b/plugins/AnonymousFave/locale/it/LC_MESSAGES/AnonymousFave.po
@@ -0,0 +1,86 @@
+# Translation of StatusNet - AnonymousFave to Italian (italiano)
+# Exported from translatewiki.net
+#
+# Author: Ximo17
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - AnonymousFave\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:36+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:49:09+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Server exception.
+#. TRANS: %d is the notice ID (number).
+#, php-format
+msgid "Could not update favorite tally for notice ID %d."
+msgstr "Impossibile aggiornare il totale dei preferiti per la notizia ID  %d ."
+
+#. TRANS: Server exception.
+#. TRANS: %d is the notice ID (number).
+#, php-format
+msgid "Could not create favorite tally for notice ID %d."
+msgstr "Impossibile creare il totale dei preferiti per la notizia ID  %d ."
+
+#. TRANS: Client error.
+msgid ""
+"Could not disfavor notice! Please make sure your browser has cookies enabled."
+msgstr ""
+"Impossibile rimuovere la notizia dai preferiti! Assicurati che i cookies del "
+"tuo browser siano abilitati."
+
+#. TRANS: Client error.
+msgid "There was a problem with your session token. Try again, please."
+msgstr ""
+"Si è verificato un problema con il tuo token di sessione. Prova di nuovo."
+
+#. TRANS: Client error.
+msgid "This notice is not a favorite!"
+msgstr "Questo messaggio non è un preferito!"
+
+#. TRANS: Server error.
+msgid "Could not delete favorite."
+msgstr "Impossibile eliminare un preferito."
+
+#. TRANS: Title.
+msgid "Add to favorites"
+msgstr "Aggiungi ai preferiti"
+
+#. TRANS: Label for tally for number of times a notice was favored.
+msgid "Favored"
+msgstr "Preferito"
+
+#. TRANS: Server exception.
+msgid "Could not create anonymous user session."
+msgstr "Impossibile creare una sessione per utente anonimo."
+
+#. TRANS: Plugin description.
+msgid "Allow anonymous users to favorite notices."
+msgstr "Consentire agli utenti anonimi di aggiungere le notizie ai preferiti."
+
+#. TRANS: Client error.
+msgid ""
+"Could not favor notice! Please make sure your browser has cookies enabled."
+msgstr ""
+"Impossibile aggiungere la notizia ai preferiti! Assicurati che i cookies del "
+"tuo browser siano abilitati."
+
+#. TRANS: Client error.
+msgid "This notice is already a favorite!"
+msgstr "Questa notizia è già un preferito!"
+
+#. TRANS: Server error.
+msgid "Could not create favorite."
+msgstr "Impossibile creare un preferito."
+
+#. TRANS: Title.
+msgid "Disfavor favorite"
+msgstr "Rimuovi dai preferiti"
diff --git a/plugins/AnonymousFave/locale/mk/LC_MESSAGES/AnonymousFave.po b/plugins/AnonymousFave/locale/mk/LC_MESSAGES/AnonymousFave.po
index 5a255ca49d..c84e94f0cc 100644
--- a/plugins/AnonymousFave/locale/mk/LC_MESSAGES/AnonymousFave.po
+++ b/plugins/AnonymousFave/locale/mk/LC_MESSAGES/AnonymousFave.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - AnonymousFave to Macedonian (Македон�ки)
+# Translation of StatusNet - AnonymousFave to Macedonian (македон�ки)
 # Exported from translatewiki.net
 #
 # Author: Bjankuloski06
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - AnonymousFave\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:37+0000\n"
-"Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:36+0000\n"
+"Language-Team: Macedonian <https://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:25:56+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:49:09+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-anonymousfave\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
diff --git a/plugins/AnonymousFave/locale/nl/LC_MESSAGES/AnonymousFave.po b/plugins/AnonymousFave/locale/nl/LC_MESSAGES/AnonymousFave.po
index 3fa25b75c5..03f8b34074 100644
--- a/plugins/AnonymousFave/locale/nl/LC_MESSAGES/AnonymousFave.po
+++ b/plugins/AnonymousFave/locale/nl/LC_MESSAGES/AnonymousFave.po
@@ -10,14 +10,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - AnonymousFave\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:37+0000\n"
-"Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:36+0000\n"
+"Language-Team: Dutch <https://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:25:56+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:49:09+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-anonymousfave\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/AnonymousFave/locale/pt/LC_MESSAGES/AnonymousFave.po b/plugins/AnonymousFave/locale/pt/LC_MESSAGES/AnonymousFave.po
index 65446c70fe..4e150fcde2 100644
--- a/plugins/AnonymousFave/locale/pt/LC_MESSAGES/AnonymousFave.po
+++ b/plugins/AnonymousFave/locale/pt/LC_MESSAGES/AnonymousFave.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - AnonymousFave to Portuguese (Português)
+# Translation of StatusNet - AnonymousFave to Portuguese (português)
 # Exported from translatewiki.net
 #
 # Author: Waldir
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - AnonymousFave\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:37+0000\n"
-"Language-Team: Portuguese <http://translatewiki.net/wiki/Portal:pt>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:37+0000\n"
+"Language-Team: Portuguese <https://translatewiki.net/wiki/Portal:pt>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:25:56+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:49:09+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: pt\n"
 "X-Message-Group: #out-statusnet-plugin-anonymousfave\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/AnonymousFave/locale/tl/LC_MESSAGES/AnonymousFave.po b/plugins/AnonymousFave/locale/tl/LC_MESSAGES/AnonymousFave.po
index c3cdb8db67..d3a994017c 100644
--- a/plugins/AnonymousFave/locale/tl/LC_MESSAGES/AnonymousFave.po
+++ b/plugins/AnonymousFave/locale/tl/LC_MESSAGES/AnonymousFave.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - AnonymousFave\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:37+0000\n"
-"Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:37+0000\n"
+"Language-Team: Tagalog <https://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:25:56+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:49:09+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-anonymousfave\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/AnonymousFave/locale/uk/LC_MESSAGES/AnonymousFave.po b/plugins/AnonymousFave/locale/uk/LC_MESSAGES/AnonymousFave.po
index 5468b421b9..1a641242af 100644
--- a/plugins/AnonymousFave/locale/uk/LC_MESSAGES/AnonymousFave.po
+++ b/plugins/AnonymousFave/locale/uk/LC_MESSAGES/AnonymousFave.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - AnonymousFave to Ukrainian (Україн�ька)
+# Translation of StatusNet - AnonymousFave to Ukrainian (україн�ька)
 # Exported from translatewiki.net
 #
 # Author: Boogie
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - AnonymousFave\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:37+0000\n"
-"Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:37+0000\n"
+"Language-Team: Ukrainian <https://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:25:56+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:49:09+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-anonymousfave\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
diff --git a/plugins/ApiLogger/locale/ApiLogger.pot b/plugins/ApiLogger/locale/ApiLogger.pot
index 5a2f70cb68..7eedfd70fc 100644
--- a/plugins/ApiLogger/locale/ApiLogger.pot
+++ b/plugins/ApiLogger/locale/ApiLogger.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
+"POT-Creation-Date: 2012-06-30 11:07+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"
diff --git a/plugins/ApiLogger/locale/ast/LC_MESSAGES/ApiLogger.po b/plugins/ApiLogger/locale/ast/LC_MESSAGES/ApiLogger.po
index 5395fd584e..2240c1324d 100644
--- a/plugins/ApiLogger/locale/ast/LC_MESSAGES/ApiLogger.po
+++ b/plugins/ApiLogger/locale/ast/LC_MESSAGES/ApiLogger.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - ApiLogger to Asturian (Asturianu)
+# Translation of StatusNet - ApiLogger to Asturian (asturianu)
 # Exported from translatewiki.net
 #
 # Author: Xuacu
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ApiLogger\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:39+0000\n"
-"Language-Team: Asturian <http://translatewiki.net/wiki/Portal:ast>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:39+0000\n"
+"Language-Team: Asturian <https://translatewiki.net/wiki/Portal:ast>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:25:57+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-18 16:18:40+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ast\n"
 "X-Message-Group: #out-statusnet-plugin-apilogger\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/ApiLogger/locale/de/LC_MESSAGES/ApiLogger.po b/plugins/ApiLogger/locale/de/LC_MESSAGES/ApiLogger.po
index c9edf600d1..0462f241c5 100644
--- a/plugins/ApiLogger/locale/de/LC_MESSAGES/ApiLogger.po
+++ b/plugins/ApiLogger/locale/de/LC_MESSAGES/ApiLogger.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ApiLogger\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:39+0000\n"
-"Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:39+0000\n"
+"Language-Team: German <https://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:25:57+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-18 16:18:40+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-apilogger\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/ApiLogger/locale/es/LC_MESSAGES/ApiLogger.po b/plugins/ApiLogger/locale/es/LC_MESSAGES/ApiLogger.po
new file mode 100644
index 0000000000..bfb7e7d390
--- /dev/null
+++ b/plugins/ApiLogger/locale/es/LC_MESSAGES/ApiLogger.po
@@ -0,0 +1,26 @@
+# Translation of StatusNet - ApiLogger to Spanish (español)
+# Exported from translatewiki.net
+#
+# Author: Erchache2000
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - ApiLogger\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:39+0000\n"
+"Language-Team: Spanish <https://translatewiki.net/wiki/Portal:es>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-18 16:18:40+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: es\n"
+"X-Message-Group: #out-statusnet-plugin-apilogger\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin description.
+msgid "Allows random sampling of API requests."
+msgstr "Permite un muestreo aleatorio de las solicitudes de API."
diff --git a/plugins/ApiLogger/locale/eu/LC_MESSAGES/ApiLogger.po b/plugins/ApiLogger/locale/eu/LC_MESSAGES/ApiLogger.po
new file mode 100644
index 0000000000..48e1949ec3
--- /dev/null
+++ b/plugins/ApiLogger/locale/eu/LC_MESSAGES/ApiLogger.po
@@ -0,0 +1,23 @@
+# Translation of StatusNet - ApiLogger to Basque (euskara)
+# Exported from translatewiki.net
+#
+# Author: Artsuaga
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - ApiLogger\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:40+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-18 16:18:40+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin description.
+msgid "Allows random sampling of API requests."
+msgstr "API eskarien ausazko laginketa baimentzen du."
diff --git a/plugins/ApiLogger/locale/fr/LC_MESSAGES/ApiLogger.po b/plugins/ApiLogger/locale/fr/LC_MESSAGES/ApiLogger.po
index 3caee056be..1bbf0683e0 100644
--- a/plugins/ApiLogger/locale/fr/LC_MESSAGES/ApiLogger.po
+++ b/plugins/ApiLogger/locale/fr/LC_MESSAGES/ApiLogger.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - ApiLogger to French (Français)
+# Translation of StatusNet - ApiLogger to French (français)
 # Exported from translatewiki.net
 #
 # Author: Iketsi
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ApiLogger\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:39+0000\n"
-"Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:40+0000\n"
+"Language-Team: French <https://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:25:57+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-18 16:18:40+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-apilogger\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
diff --git a/plugins/ApiLogger/locale/gl/LC_MESSAGES/ApiLogger.po b/plugins/ApiLogger/locale/gl/LC_MESSAGES/ApiLogger.po
new file mode 100644
index 0000000000..42e52d5056
--- /dev/null
+++ b/plugins/ApiLogger/locale/gl/LC_MESSAGES/ApiLogger.po
@@ -0,0 +1,26 @@
+# Translation of StatusNet - ApiLogger to Galician (galego)
+# Exported from translatewiki.net
+#
+# Author: Toliño
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - ApiLogger\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:40+0000\n"
+"Language-Team: Galician <https://translatewiki.net/wiki/Portal:gl>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-18 16:18:40+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: gl\n"
+"X-Message-Group: #out-statusnet-plugin-apilogger\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin description.
+msgid "Allows random sampling of API requests."
+msgstr "Permite dar unha mostra aleatoria das solicitudes da API."
diff --git a/plugins/ApiLogger/locale/he/LC_MESSAGES/ApiLogger.po b/plugins/ApiLogger/locale/he/LC_MESSAGES/ApiLogger.po
new file mode 100644
index 0000000000..1f6a468625
--- /dev/null
+++ b/plugins/ApiLogger/locale/he/LC_MESSAGES/ApiLogger.po
@@ -0,0 +1,26 @@
+# Translation of StatusNet - ApiLogger to Hebrew (עברית)
+# Exported from translatewiki.net
+#
+# Author: Amire80
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - ApiLogger\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:40+0000\n"
+"Language-Team: Hebrew <https://translatewiki.net/wiki/Portal:he>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-18 16:18:40+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: he\n"
+"X-Message-Group: #out-statusnet-plugin-apilogger\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin description.
+msgid "Allows random sampling of API requests."
+msgstr "מ�פשר דגימה מקרית של בקשות API."
diff --git a/plugins/ApiLogger/locale/ia/LC_MESSAGES/ApiLogger.po b/plugins/ApiLogger/locale/ia/LC_MESSAGES/ApiLogger.po
index 06aa32c8b9..0f4cac2d1f 100644
--- a/plugins/ApiLogger/locale/ia/LC_MESSAGES/ApiLogger.po
+++ b/plugins/ApiLogger/locale/ia/LC_MESSAGES/ApiLogger.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - ApiLogger to Interlingua (Interlingua)
+# Translation of StatusNet - ApiLogger to Interlingua (interlingua)
 # Exported from translatewiki.net
 #
 # Author: McDutchie
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ApiLogger\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:39+0000\n"
-"Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:40+0000\n"
+"Language-Team: Interlingua <https://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:25:57+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-18 16:18:40+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-apilogger\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/ApiLogger/locale/it/LC_MESSAGES/ApiLogger.po b/plugins/ApiLogger/locale/it/LC_MESSAGES/ApiLogger.po
new file mode 100644
index 0000000000..c140fd5968
--- /dev/null
+++ b/plugins/ApiLogger/locale/it/LC_MESSAGES/ApiLogger.po
@@ -0,0 +1,23 @@
+# Translation of StatusNet - ApiLogger to Italian (italiano)
+# Exported from translatewiki.net
+#
+# Author: Ximo17
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - ApiLogger\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:40+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-18 16:18:40+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin description.
+msgid "Allows random sampling of API requests."
+msgstr "Permette il campionamento casuale delle richieste API."
diff --git a/plugins/ApiLogger/locale/ksh/LC_MESSAGES/ApiLogger.po b/plugins/ApiLogger/locale/ksh/LC_MESSAGES/ApiLogger.po
new file mode 100644
index 0000000000..1b85cc96a7
--- /dev/null
+++ b/plugins/ApiLogger/locale/ksh/LC_MESSAGES/ApiLogger.po
@@ -0,0 +1,28 @@
+# Translation of StatusNet - ApiLogger to Colognian (Ripoarisch)
+# Exported from translatewiki.net
+#
+# Author: Purodha
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - ApiLogger\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:40+0000\n"
+"Language-Team: Colognian <https://translatewiki.net/wiki/Portal:ksh>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-18 16:18:40+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: ksh\n"
+"X-Message-Group: #out-statusnet-plugin-apilogger\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin description.
+msgid "Allows random sampling of API requests."
+msgstr ""
+"Määt et müjjelesch, vun zohfälleje Oprohfe un dä <i lang=\"en\">API</i> "
+"Schteschproobe ze maache."
diff --git a/plugins/ApiLogger/locale/mk/LC_MESSAGES/ApiLogger.po b/plugins/ApiLogger/locale/mk/LC_MESSAGES/ApiLogger.po
index bc36b30ea4..44e651e7c6 100644
--- a/plugins/ApiLogger/locale/mk/LC_MESSAGES/ApiLogger.po
+++ b/plugins/ApiLogger/locale/mk/LC_MESSAGES/ApiLogger.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - ApiLogger to Macedonian (Македон�ки)
+# Translation of StatusNet - ApiLogger to Macedonian (македон�ки)
 # Exported from translatewiki.net
 #
 # Author: Bjankuloski06
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ApiLogger\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:39+0000\n"
-"Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:40+0000\n"
+"Language-Team: Macedonian <https://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:25:57+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-18 16:18:40+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-apilogger\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
diff --git a/plugins/ApiLogger/locale/ms/LC_MESSAGES/ApiLogger.po b/plugins/ApiLogger/locale/ms/LC_MESSAGES/ApiLogger.po
new file mode 100644
index 0000000000..68f6222d0e
--- /dev/null
+++ b/plugins/ApiLogger/locale/ms/LC_MESSAGES/ApiLogger.po
@@ -0,0 +1,26 @@
+# Translation of StatusNet - ApiLogger to Malay (Bahasa Melayu)
+# Exported from translatewiki.net
+#
+# Author: Anakmalaysia
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - ApiLogger\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:40+0000\n"
+"Language-Team: Malay <https://translatewiki.net/wiki/Portal:ms>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-18 16:18:40+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: ms\n"
+"X-Message-Group: #out-statusnet-plugin-apilogger\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#. TRANS: Plugin description.
+msgid "Allows random sampling of API requests."
+msgstr "Membolehkan pensampelan permohonan API secara rawak."
diff --git a/plugins/ApiLogger/locale/nl/LC_MESSAGES/ApiLogger.po b/plugins/ApiLogger/locale/nl/LC_MESSAGES/ApiLogger.po
index c61d13e63a..81555d25a7 100644
--- a/plugins/ApiLogger/locale/nl/LC_MESSAGES/ApiLogger.po
+++ b/plugins/ApiLogger/locale/nl/LC_MESSAGES/ApiLogger.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ApiLogger\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:39+0000\n"
-"Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:40+0000\n"
+"Language-Team: Dutch <https://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:25:57+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-18 16:18:40+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-apilogger\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/ApiLogger/locale/pl/LC_MESSAGES/ApiLogger.po b/plugins/ApiLogger/locale/pl/LC_MESSAGES/ApiLogger.po
new file mode 100644
index 0000000000..62cedbdfac
--- /dev/null
+++ b/plugins/ApiLogger/locale/pl/LC_MESSAGES/ApiLogger.po
@@ -0,0 +1,24 @@
+# Translation of StatusNet - ApiLogger to Polish (polski)
+# Exported from translatewiki.net
+#
+# Author: BeginaFelicysym
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - ApiLogger\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:40+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-18 16:18:40+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=3; plural=(n == 1) ? 0 : ( (n%10 >= 2 && n%10 <= 4 && "
+"(n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
+
+#. TRANS: Plugin description.
+msgid "Allows random sampling of API requests."
+msgstr "Umożliwia losowe próbkowanie żądań interfejsu API."
diff --git a/plugins/ApiLogger/locale/pt/LC_MESSAGES/ApiLogger.po b/plugins/ApiLogger/locale/pt/LC_MESSAGES/ApiLogger.po
index 22c25223d9..9a2ed49aaa 100644
--- a/plugins/ApiLogger/locale/pt/LC_MESSAGES/ApiLogger.po
+++ b/plugins/ApiLogger/locale/pt/LC_MESSAGES/ApiLogger.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - ApiLogger to Portuguese (Português)
+# Translation of StatusNet - ApiLogger to Portuguese (português)
 # Exported from translatewiki.net
 #
 # Author: Diego Queiroz
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ApiLogger\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:39+0000\n"
-"Language-Team: Portuguese <http://translatewiki.net/wiki/Portal:pt>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:41+0000\n"
+"Language-Team: Portuguese <https://translatewiki.net/wiki/Portal:pt>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:25:57+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-18 16:18:40+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: pt\n"
 "X-Message-Group: #out-statusnet-plugin-apilogger\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/ApiLogger/locale/tl/LC_MESSAGES/ApiLogger.po b/plugins/ApiLogger/locale/tl/LC_MESSAGES/ApiLogger.po
index 727e3b24bc..0c29c9b2bf 100644
--- a/plugins/ApiLogger/locale/tl/LC_MESSAGES/ApiLogger.po
+++ b/plugins/ApiLogger/locale/tl/LC_MESSAGES/ApiLogger.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ApiLogger\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:39+0000\n"
-"Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:41+0000\n"
+"Language-Team: Tagalog <https://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:25:57+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-18 16:18:40+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-apilogger\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/ApiLogger/locale/uk/LC_MESSAGES/ApiLogger.po b/plugins/ApiLogger/locale/uk/LC_MESSAGES/ApiLogger.po
index 5d7f3c0414..936715d027 100644
--- a/plugins/ApiLogger/locale/uk/LC_MESSAGES/ApiLogger.po
+++ b/plugins/ApiLogger/locale/uk/LC_MESSAGES/ApiLogger.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - ApiLogger to Ukrainian (Україн�ька)
+# Translation of StatusNet - ApiLogger to Ukrainian (україн�ька)
 # Exported from translatewiki.net
 #
 # Author: Boogie
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ApiLogger\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:40+0000\n"
-"Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:41+0000\n"
+"Language-Team: Ukrainian <https://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:25:57+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-18 16:18:40+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-apilogger\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
diff --git a/plugins/AutoSandbox/locale/AutoSandbox.pot b/plugins/AutoSandbox/locale/AutoSandbox.pot
index 0242cf03f4..487b923632 100644
--- a/plugins/AutoSandbox/locale/AutoSandbox.pot
+++ b/plugins/AutoSandbox/locale/AutoSandbox.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
+"POT-Creation-Date: 2012-06-30 11:07+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"
diff --git a/plugins/AutoSandbox/locale/be-tarask/LC_MESSAGES/AutoSandbox.po b/plugins/AutoSandbox/locale/be-tarask/LC_MESSAGES/AutoSandbox.po
index 71db899958..f46e6fb7ef 100644
--- a/plugins/AutoSandbox/locale/be-tarask/LC_MESSAGES/AutoSandbox.po
+++ b/plugins/AutoSandbox/locale/be-tarask/LC_MESSAGES/AutoSandbox.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - AutoSandbox to Belarusian (Taraškievica orthography) (‪Белару�ка� (тарашкевіца)‬)
+# Translation of StatusNet - AutoSandbox to Belarusian (Taraškievica orthography) (‪белару�ка� (тарашкевіца)‬)
 # Exported from translatewiki.net
 #
 # Author: EugeneZelenko
@@ -9,15 +9,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - AutoSandbox\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:41+0000\n"
-"Language-Team: Belarusian (Taraškievica orthography) <http://translatewiki."
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:43+0000\n"
+"Language-Team: Belarusian (Taraškievica orthography) <https://translatewiki."
 "net/wiki/Portal:be-tarask>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:25:59+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:49:46+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: be-tarask\n"
 "X-Message-Group: #out-statusnet-plugin-autosandbox\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/AutoSandbox/locale/br/LC_MESSAGES/AutoSandbox.po b/plugins/AutoSandbox/locale/br/LC_MESSAGES/AutoSandbox.po
index ff872b45bc..2e20f529bd 100644
--- a/plugins/AutoSandbox/locale/br/LC_MESSAGES/AutoSandbox.po
+++ b/plugins/AutoSandbox/locale/br/LC_MESSAGES/AutoSandbox.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - AutoSandbox to Breton (Brezhoneg)
+# Translation of StatusNet - AutoSandbox to Breton (brezhoneg)
 # Exported from translatewiki.net
 #
 # Author: Fulup
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - AutoSandbox\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:41+0000\n"
-"Language-Team: Breton <http://translatewiki.net/wiki/Portal:br>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:43+0000\n"
+"Language-Team: Breton <https://translatewiki.net/wiki/Portal:br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:25:59+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:49:46+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-autosandbox\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
diff --git a/plugins/AutoSandbox/locale/de/LC_MESSAGES/AutoSandbox.po b/plugins/AutoSandbox/locale/de/LC_MESSAGES/AutoSandbox.po
index c70deb17be..4f217cd931 100644
--- a/plugins/AutoSandbox/locale/de/LC_MESSAGES/AutoSandbox.po
+++ b/plugins/AutoSandbox/locale/de/LC_MESSAGES/AutoSandbox.po
@@ -1,6 +1,7 @@
 # Translation of StatusNet - AutoSandbox to German (Deutsch)
 # Exported from translatewiki.net
 #
+# Author: DaSch
 # Author: The Evil IP address
 # --
 # This file is distributed under the same license as the StatusNet package.
@@ -9,14 +10,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - AutoSandbox\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:41+0000\n"
-"Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:43+0000\n"
+"Language-Team: German <https://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:25:59+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:49:46+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-autosandbox\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -35,12 +36,12 @@ msgstr ""
 
 #. TRANS: User instructions after registration.
 #. TRANS: %s is a clickable e-mailaddress.
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "Note you will initially be \"sandboxed\" so your posts will not appear in "
 "the public timeline. Send a message to %s to speed up the unsandboxing "
 "process."
 msgstr ""
-"Beachte, dass du anfangs in die „Spielwiese“ gesetzt wirst, sodass deine "
-"Beiträge nicht in der öffentlichen Zeitleiste erscheinen. Schicke eine "
-"Nachricht an $contactlink, um schneller aus der Spielwiese rauszukommen."
+"Beachte, dass du anfangs in den „Sandkasten“ gesetzt wirst, das heißt dass "
+"deine Beiträge nicht in der öffentlichen Zeitleiste erscheinen. Schicke eine "
+"Nachricht an %s, um schneller aus dem Sandkasten rauszukommen."
diff --git a/plugins/AutoSandbox/locale/es/LC_MESSAGES/AutoSandbox.po b/plugins/AutoSandbox/locale/es/LC_MESSAGES/AutoSandbox.po
index 4c648ae5e5..2075d53b89 100644
--- a/plugins/AutoSandbox/locale/es/LC_MESSAGES/AutoSandbox.po
+++ b/plugins/AutoSandbox/locale/es/LC_MESSAGES/AutoSandbox.po
@@ -1,6 +1,7 @@
-# Translation of StatusNet - AutoSandbox to Spanish (Español)
+# Translation of StatusNet - AutoSandbox to Spanish (español)
 # Exported from translatewiki.net
 #
+# Author: Erchache2000
 # Author: Translationista
 # --
 # This file is distributed under the same license as the StatusNet package.
@@ -9,14 +10,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - AutoSandbox\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:41+0000\n"
-"Language-Team: Spanish <http://translatewiki.net/wiki/Portal:es>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:43+0000\n"
+"Language-Team: Spanish <https://translatewiki.net/wiki/Portal:es>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:25:59+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:49:46+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-plugin-autosandbox\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -36,12 +37,12 @@ msgstr ""
 
 #. TRANS: User instructions after registration.
 #. TRANS: %s is a clickable e-mailaddress.
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "Note you will initially be \"sandboxed\" so your posts will not appear in "
 "the public timeline. Send a message to %s to speed up the unsandboxing "
 "process."
 msgstr ""
 "Ten en cuenta que inicialmente serás enviado a la zona de pruebas, así que "
-"tus mensajes no aparecerán en la línea temporal pública. Envía un mensaje a "
-"$contactlink para acelerar el proceso de exclusión de la zona de pruebas."
+"tus mensajes no aparecerán en la línea temporal pública. Envía un mensaje a %"
+"s para acelerar el proceso de exclusión de la zona de pruebas."
diff --git a/plugins/AutoSandbox/locale/eu/LC_MESSAGES/AutoSandbox.po b/plugins/AutoSandbox/locale/eu/LC_MESSAGES/AutoSandbox.po
new file mode 100644
index 0000000000..a7e73b2cab
--- /dev/null
+++ b/plugins/AutoSandbox/locale/eu/LC_MESSAGES/AutoSandbox.po
@@ -0,0 +1,43 @@
+# Translation of StatusNet - AutoSandbox to Basque (euskara)
+# Exported from translatewiki.net
+#
+# Author: Artsuaga
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - AutoSandbox\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:43+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:49:46+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin description.
+msgid "Automatically sandboxes newly registered members."
+msgstr "Erregistratzen diren erabiltzaile berriak automatikoki isolatzen ditu."
+
+#. TRANS: User instructions after registration.
+msgid ""
+"Note you will initially be \"sandboxed\" so your posts will not appear in "
+"the public timeline."
+msgstr ""
+"Izan kontutan haseran isolatua izango zarela, eta beraz zure oharrak ez "
+"direla denbora lerro publikoan azalduko."
+
+#. TRANS: User instructions after registration.
+#. TRANS: %s is a clickable e-mailaddress.
+#, php-format
+msgid ""
+"Note you will initially be \"sandboxed\" so your posts will not appear in "
+"the public timeline. Send a message to %s to speed up the unsandboxing "
+"process."
+msgstr ""
+"Izan kontutan haseran isolatua izango zarela, eta beraz zure oharrak ez "
+"direla denbora lerro publikoan azalduko. Isolamendutik ateratzeko prozesua "
+"arintzeko bidali mezu bat %s(e)ri."
diff --git a/plugins/AutoSandbox/locale/fr/LC_MESSAGES/AutoSandbox.po b/plugins/AutoSandbox/locale/fr/LC_MESSAGES/AutoSandbox.po
index 055acfed26..a04621ebe8 100644
--- a/plugins/AutoSandbox/locale/fr/LC_MESSAGES/AutoSandbox.po
+++ b/plugins/AutoSandbox/locale/fr/LC_MESSAGES/AutoSandbox.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - AutoSandbox to French (Français)
+# Translation of StatusNet - AutoSandbox to French (français)
 # Exported from translatewiki.net
 #
 # Author: Peter17
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - AutoSandbox\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:41+0000\n"
-"Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:43+0000\n"
+"Language-Team: French <https://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:25:59+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:49:46+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-autosandbox\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
diff --git a/plugins/AutoSandbox/locale/gl/LC_MESSAGES/AutoSandbox.po b/plugins/AutoSandbox/locale/gl/LC_MESSAGES/AutoSandbox.po
new file mode 100644
index 0000000000..a856cccb70
--- /dev/null
+++ b/plugins/AutoSandbox/locale/gl/LC_MESSAGES/AutoSandbox.po
@@ -0,0 +1,46 @@
+# Translation of StatusNet - AutoSandbox to Galician (galego)
+# Exported from translatewiki.net
+#
+# Author: Toliño
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - AutoSandbox\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:43+0000\n"
+"Language-Team: Galician <https://translatewiki.net/wiki/Portal:gl>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:49:46+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: gl\n"
+"X-Message-Group: #out-statusnet-plugin-autosandbox\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin description.
+msgid "Automatically sandboxes newly registered members."
+msgstr "Sitúa de xeito automático aos novos usuarios nunha zona de probas."
+
+#. TRANS: User instructions after registration.
+msgid ""
+"Note you will initially be \"sandboxed\" so your posts will not appear in "
+"the public timeline."
+msgstr ""
+"Teña en conta que inicialmente será enviado a unha zona de probas, de xeito "
+"que as súas mensaxes non apareceran na liña temporal pública."
+
+#. TRANS: User instructions after registration.
+#. TRANS: %s is a clickable e-mailaddress.
+#, php-format
+msgid ""
+"Note you will initially be \"sandboxed\" so your posts will not appear in "
+"the public timeline. Send a message to %s to speed up the unsandboxing "
+"process."
+msgstr ""
+"Teña en conta que inicialmente será enviado a unha zona de probas, de xeito "
+"que as súas mensaxes non apareceran na liña temporal pública. Envíe unha "
+"mensaxe a %s para acelerar o proceso de abandonar a zona de probas."
diff --git a/plugins/AutoSandbox/locale/ia/LC_MESSAGES/AutoSandbox.po b/plugins/AutoSandbox/locale/ia/LC_MESSAGES/AutoSandbox.po
index 984e6ab26b..d2d9ae935e 100644
--- a/plugins/AutoSandbox/locale/ia/LC_MESSAGES/AutoSandbox.po
+++ b/plugins/AutoSandbox/locale/ia/LC_MESSAGES/AutoSandbox.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - AutoSandbox to Interlingua (Interlingua)
+# Translation of StatusNet - AutoSandbox to Interlingua (interlingua)
 # Exported from translatewiki.net
 #
 # Author: McDutchie
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - AutoSandbox\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:41+0000\n"
-"Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:43+0000\n"
+"Language-Team: Interlingua <https://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:25:59+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:49:46+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-autosandbox\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/AutoSandbox/locale/it/LC_MESSAGES/AutoSandbox.po b/plugins/AutoSandbox/locale/it/LC_MESSAGES/AutoSandbox.po
new file mode 100644
index 0000000000..978317b9f5
--- /dev/null
+++ b/plugins/AutoSandbox/locale/it/LC_MESSAGES/AutoSandbox.po
@@ -0,0 +1,43 @@
+# Translation of StatusNet - AutoSandbox to Italian (italiano)
+# Exported from translatewiki.net
+#
+# Author: Ximo17
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - AutoSandbox\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:44+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:49:46+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin description.
+msgid "Automatically sandboxes newly registered members."
+msgstr "I nuovi membri registrati saranno automaticamente inseriti in sandbox."
+
+#. TRANS: User instructions after registration.
+msgid ""
+"Note you will initially be \"sandboxed\" so your posts will not appear in "
+"the public timeline."
+msgstr ""
+"Nota che inizialmente sarai \"sandboxato\" e i tuoi post non compariranno "
+"nella cronologia pubblica."
+
+#. TRANS: User instructions after registration.
+#. TRANS: %s is a clickable e-mailaddress.
+#, php-format
+msgid ""
+"Note you will initially be \"sandboxed\" so your posts will not appear in "
+"the public timeline. Send a message to %s to speed up the unsandboxing "
+"process."
+msgstr ""
+"Nota che inizialmente sarai \"sandboxato\" e i tuoi post non compariranno "
+"nella cronologia pubblica. Invia un messaggio a  %s  per accelerare il "
+"processo di uscita dal sandbox."
diff --git a/plugins/AutoSandbox/locale/mk/LC_MESSAGES/AutoSandbox.po b/plugins/AutoSandbox/locale/mk/LC_MESSAGES/AutoSandbox.po
index b718eff693..031885ae08 100644
--- a/plugins/AutoSandbox/locale/mk/LC_MESSAGES/AutoSandbox.po
+++ b/plugins/AutoSandbox/locale/mk/LC_MESSAGES/AutoSandbox.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - AutoSandbox to Macedonian (Македон�ки)
+# Translation of StatusNet - AutoSandbox to Macedonian (македон�ки)
 # Exported from translatewiki.net
 #
 # Author: Bjankuloski06
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - AutoSandbox\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:41+0000\n"
-"Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:44+0000\n"
+"Language-Team: Macedonian <https://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:25:59+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:49:46+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-autosandbox\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
diff --git a/plugins/AutoSandbox/locale/nl/LC_MESSAGES/AutoSandbox.po b/plugins/AutoSandbox/locale/nl/LC_MESSAGES/AutoSandbox.po
index 3b4da89167..73e857a1fd 100644
--- a/plugins/AutoSandbox/locale/nl/LC_MESSAGES/AutoSandbox.po
+++ b/plugins/AutoSandbox/locale/nl/LC_MESSAGES/AutoSandbox.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - AutoSandbox\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:41+0000\n"
-"Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:44+0000\n"
+"Language-Team: Dutch <https://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:25:59+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:49:46+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-autosandbox\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/AutoSandbox/locale/pl/LC_MESSAGES/AutoSandbox.po b/plugins/AutoSandbox/locale/pl/LC_MESSAGES/AutoSandbox.po
new file mode 100644
index 0000000000..145cc3f98e
--- /dev/null
+++ b/plugins/AutoSandbox/locale/pl/LC_MESSAGES/AutoSandbox.po
@@ -0,0 +1,45 @@
+# Translation of StatusNet - AutoSandbox to Polish (polski)
+# Exported from translatewiki.net
+#
+# Author: BeginaFelicysym
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - AutoSandbox\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:44+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:49:46+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=3; plural=(n == 1) ? 0 : ( (n%10 >= 2 && n%10 <= 4 && "
+"(n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
+
+#. TRANS: Plugin description.
+msgid "Automatically sandboxes newly registered members."
+msgstr ""
+"Automatycznie umieszcza nowozarejestrowanych użytkowników w piaskownicy."
+
+#. TRANS: User instructions after registration.
+msgid ""
+"Note you will initially be \"sandboxed\" so your posts will not appear in "
+"the public timeline."
+msgstr ""
+"Zauważ, że początkowo będziesz w \"trybie piaskownicy\" więc ogłoszenia nie "
+"pojawiÄ… siÄ™ w strumieniach publicznych."
+
+#. TRANS: User instructions after registration.
+#. TRANS: %s is a clickable e-mailaddress.
+#, php-format
+msgid ""
+"Note you will initially be \"sandboxed\" so your posts will not appear in "
+"the public timeline. Send a message to %s to speed up the unsandboxing "
+"process."
+msgstr ""
+"Zauważ, że początkowo będziesz w \"trybie piaskownicy\" więc ogłoszenia nie "
+"pojawią się w strumieniach publicznych. Wyślij wiadomość do  %s  by "
+"przyspieszenia proces wyjścia z pisakownicy."
diff --git a/plugins/AutoSandbox/locale/ru/LC_MESSAGES/AutoSandbox.po b/plugins/AutoSandbox/locale/ru/LC_MESSAGES/AutoSandbox.po
index 6523d0862c..de3d10314f 100644
--- a/plugins/AutoSandbox/locale/ru/LC_MESSAGES/AutoSandbox.po
+++ b/plugins/AutoSandbox/locale/ru/LC_MESSAGES/AutoSandbox.po
@@ -1,7 +1,8 @@
-# Translation of StatusNet - AutoSandbox to Russian (Ру��кий)
+# Translation of StatusNet - AutoSandbox to Russian (ру��кий)
 # Exported from translatewiki.net
 #
 # Author: MaxSem
+# Author: �лек�андр Сигачёв
 # --
 # This file is distributed under the same license as the StatusNet package.
 #
@@ -9,14 +10,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - AutoSandbox\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:42+0000\n"
-"Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:44+0000\n"
+"Language-Team: Russian <https://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:25:59+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:49:46+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-autosandbox\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
@@ -36,7 +37,7 @@ msgstr ""
 
 #. TRANS: User instructions after registration.
 #. TRANS: %s is a clickable e-mailaddress.
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "Note you will initially be \"sandboxed\" so your posts will not appear in "
 "the public timeline. Send a message to %s to speed up the unsandboxing "
@@ -44,4 +45,4 @@ msgid ""
 msgstr ""
 "Обратите внимание, что �начала вы будете находить�� в «пе�очнице», так что "
 "ваши �ообщени� не будут по�вл�ть�� в общей ленте. Отправьте �ообщение на "
-"адре� $contactlink, чтобы у�корить перевод из пе�очницы."
+"адре� %s, чтобы у�корить перевод из пе�очницы."
diff --git a/plugins/AutoSandbox/locale/tl/LC_MESSAGES/AutoSandbox.po b/plugins/AutoSandbox/locale/tl/LC_MESSAGES/AutoSandbox.po
index 5749d3becb..fff03024f7 100644
--- a/plugins/AutoSandbox/locale/tl/LC_MESSAGES/AutoSandbox.po
+++ b/plugins/AutoSandbox/locale/tl/LC_MESSAGES/AutoSandbox.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - AutoSandbox\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:42+0000\n"
-"Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:44+0000\n"
+"Language-Team: Tagalog <https://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:25:59+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:49:46+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-autosandbox\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/AutoSandbox/locale/uk/LC_MESSAGES/AutoSandbox.po b/plugins/AutoSandbox/locale/uk/LC_MESSAGES/AutoSandbox.po
index a49e73375b..bb8fe21253 100644
--- a/plugins/AutoSandbox/locale/uk/LC_MESSAGES/AutoSandbox.po
+++ b/plugins/AutoSandbox/locale/uk/LC_MESSAGES/AutoSandbox.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - AutoSandbox to Ukrainian (Україн�ька)
+# Translation of StatusNet - AutoSandbox to Ukrainian (україн�ька)
 # Exported from translatewiki.net
 #
 # Author: Boogie
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - AutoSandbox\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:42+0000\n"
-"Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:44+0000\n"
+"Language-Team: Ukrainian <https://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:25:59+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:49:46+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-autosandbox\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
diff --git a/plugins/AutoSandbox/locale/zh_CN/LC_MESSAGES/AutoSandbox.po b/plugins/AutoSandbox/locale/zh_CN/LC_MESSAGES/AutoSandbox.po
index f23da1337d..c5fa7e3417 100644
--- a/plugins/AutoSandbox/locale/zh_CN/LC_MESSAGES/AutoSandbox.po
+++ b/plugins/AutoSandbox/locale/zh_CN/LC_MESSAGES/AutoSandbox.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - AutoSandbox to Simplified Chinese (‪中文(简体)‬)
+# Translation of StatusNet - AutoSandbox to Simplified Chinese (‪中文（简体）‬)
 # Exported from translatewiki.net
 #
 # Author: ZhengYiFeng
@@ -9,15 +9,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - AutoSandbox\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:42+0000\n"
-"Language-Team: Simplified Chinese <http://translatewiki.net/wiki/Portal:zh-"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:44+0000\n"
+"Language-Team: Simplified Chinese <https://translatewiki.net/wiki/Portal:zh-"
 "hans>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:25:59+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:49:46+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: #out-statusnet-plugin-autosandbox\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
diff --git a/plugins/Autocomplete/locale/Autocomplete.pot b/plugins/Autocomplete/locale/Autocomplete.pot
index 7882057a92..05d82d75db 100644
--- a/plugins/Autocomplete/locale/Autocomplete.pot
+++ b/plugins/Autocomplete/locale/Autocomplete.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
+"POT-Creation-Date: 2012-06-30 11:07+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"
diff --git a/plugins/Autocomplete/locale/ar/LC_MESSAGES/Autocomplete.po b/plugins/Autocomplete/locale/ar/LC_MESSAGES/Autocomplete.po
new file mode 100644
index 0000000000..a09cacd8c9
--- /dev/null
+++ b/plugins/Autocomplete/locale/ar/LC_MESSAGES/Autocomplete.po
@@ -0,0 +1,32 @@
+# Translation of StatusNet - Autocomplete to Arabic (العربية)
+# Exported from translatewiki.net
+#
+# Author: OsamaK
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Autocomplete\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:41+0000\n"
+"Language-Team: Arabic <https://translatewiki.net/wiki/Portal:ar>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:49:45+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: ar\n"
+"X-Message-Group: #out-statusnet-plugin-autocomplete\n"
+"Plural-Forms: nplurals=6; plural=(n == 0) ? 0 : ( (n == 1) ? 1 : ( (n == "
+"2) ? 2 : ( (n%100 >= 3 && n%100 <= 10) ? 3 : ( (n%100 >= 11 && n%100 <= "
+"99) ? 4 : 5 ) ) ) );\n"
+
+#. TRANS: Plugin description.
+msgid "The autocomplete plugin adds autocompletion for @ replies."
+msgstr ""
+
+#. TRANS: Client exception in autocomplete plugin.
+msgid "Access forbidden."
+msgstr "الوصول محظور."
diff --git a/plugins/Autocomplete/locale/ast/LC_MESSAGES/Autocomplete.po b/plugins/Autocomplete/locale/ast/LC_MESSAGES/Autocomplete.po
index e01a562b47..674d031a60 100644
--- a/plugins/Autocomplete/locale/ast/LC_MESSAGES/Autocomplete.po
+++ b/plugins/Autocomplete/locale/ast/LC_MESSAGES/Autocomplete.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Autocomplete to Asturian (Asturianu)
+# Translation of StatusNet - Autocomplete to Asturian (asturianu)
 # Exported from translatewiki.net
 #
 # Author: Xuacu
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Autocomplete\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:40+0000\n"
-"Language-Team: Asturian <http://translatewiki.net/wiki/Portal:ast>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:41+0000\n"
+"Language-Team: Asturian <https://translatewiki.net/wiki/Portal:ast>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:25:58+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:49:45+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ast\n"
 "X-Message-Group: #out-statusnet-plugin-autocomplete\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/Autocomplete/locale/ca/LC_MESSAGES/Autocomplete.po b/plugins/Autocomplete/locale/ca/LC_MESSAGES/Autocomplete.po
index 8f6d4c4257..9d17a77fac 100644
--- a/plugins/Autocomplete/locale/ca/LC_MESSAGES/Autocomplete.po
+++ b/plugins/Autocomplete/locale/ca/LC_MESSAGES/Autocomplete.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Autocomplete to Catalan (Català)
+# Translation of StatusNet - Autocomplete to Catalan (català)
 # Exported from translatewiki.net
 #
 # Author: Toniher
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Autocomplete\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:40+0000\n"
-"Language-Team: Catalan <http://translatewiki.net/wiki/Portal:ca>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:41+0000\n"
+"Language-Team: Catalan <https://translatewiki.net/wiki/Portal:ca>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:25:58+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:49:45+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ca\n"
 "X-Message-Group: #out-statusnet-plugin-autocomplete\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/Autocomplete/locale/de/LC_MESSAGES/Autocomplete.po b/plugins/Autocomplete/locale/de/LC_MESSAGES/Autocomplete.po
index 63f38a6d12..7f73f6ea83 100644
--- a/plugins/Autocomplete/locale/de/LC_MESSAGES/Autocomplete.po
+++ b/plugins/Autocomplete/locale/de/LC_MESSAGES/Autocomplete.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Autocomplete\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:40+0000\n"
-"Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:41+0000\n"
+"Language-Team: German <https://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:25:58+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:49:45+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-autocomplete\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/Autocomplete/locale/es/LC_MESSAGES/Autocomplete.po b/plugins/Autocomplete/locale/es/LC_MESSAGES/Autocomplete.po
index 301089ccf2..209d00c6eb 100644
--- a/plugins/Autocomplete/locale/es/LC_MESSAGES/Autocomplete.po
+++ b/plugins/Autocomplete/locale/es/LC_MESSAGES/Autocomplete.po
@@ -1,6 +1,7 @@
-# Translation of StatusNet - Autocomplete to Spanish (Español)
+# Translation of StatusNet - Autocomplete to Spanish (español)
 # Exported from translatewiki.net
 #
+# Author: Erchache2000
 # Author: Od1n
 # --
 # This file is distributed under the same license as the StatusNet package.
@@ -9,21 +10,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Autocomplete\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:40+0000\n"
-"Language-Team: Spanish <http://translatewiki.net/wiki/Portal:es>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:41+0000\n"
+"Language-Team: Spanish <https://translatewiki.net/wiki/Portal:es>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:25:58+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:49:45+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-plugin-autocomplete\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANS: Plugin description.
 msgid "The autocomplete plugin adds autocompletion for @ replies."
-msgstr ""
+msgstr "El plugin de Autocompletar agrega autocompletado para @ respuestas."
 
 #. TRANS: Client exception in autocomplete plugin.
 msgid "Access forbidden."
diff --git a/plugins/Autocomplete/locale/eu/LC_MESSAGES/Autocomplete.po b/plugins/Autocomplete/locale/eu/LC_MESSAGES/Autocomplete.po
new file mode 100644
index 0000000000..e6966c5b65
--- /dev/null
+++ b/plugins/Autocomplete/locale/eu/LC_MESSAGES/Autocomplete.po
@@ -0,0 +1,30 @@
+# Translation of StatusNet - Autocomplete to Basque (euskara)
+# Exported from translatewiki.net
+#
+# Author: Artsuaga
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Autocomplete\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:41+0000\n"
+"Language-Team: Basque <https://translatewiki.net/wiki/Portal:eu>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:49:45+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: eu\n"
+"X-Message-Group: #out-statusnet-plugin-autocomplete\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin description.
+msgid "The autocomplete plugin adds autocompletion for @ replies."
+msgstr "Autocomplete pluginak @ erantzunak berez osatzen ditu."
+
+#. TRANS: Client exception in autocomplete plugin.
+msgid "Access forbidden."
+msgstr "Atzipena debekaturik."
diff --git a/plugins/Autocomplete/locale/fr/LC_MESSAGES/Autocomplete.po b/plugins/Autocomplete/locale/fr/LC_MESSAGES/Autocomplete.po
index b325ad15c3..3b34521a57 100644
--- a/plugins/Autocomplete/locale/fr/LC_MESSAGES/Autocomplete.po
+++ b/plugins/Autocomplete/locale/fr/LC_MESSAGES/Autocomplete.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Autocomplete to French (Français)
+# Translation of StatusNet - Autocomplete to French (français)
 # Exported from translatewiki.net
 #
 # Author: Crochet.david
@@ -10,14 +10,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Autocomplete\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:40+0000\n"
-"Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:41+0000\n"
+"Language-Team: French <https://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:25:58+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:49:45+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-autocomplete\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
diff --git a/plugins/Autocomplete/locale/gl/LC_MESSAGES/Autocomplete.po b/plugins/Autocomplete/locale/gl/LC_MESSAGES/Autocomplete.po
new file mode 100644
index 0000000000..16e8c625b3
--- /dev/null
+++ b/plugins/Autocomplete/locale/gl/LC_MESSAGES/Autocomplete.po
@@ -0,0 +1,32 @@
+# Translation of StatusNet - Autocomplete to Galician (galego)
+# Exported from translatewiki.net
+#
+# Author: Toliño
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Autocomplete\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:41+0000\n"
+"Language-Team: Galician <https://translatewiki.net/wiki/Portal:gl>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:49:45+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: gl\n"
+"X-Message-Group: #out-statusnet-plugin-autocomplete\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin description.
+msgid "The autocomplete plugin adds autocompletion for @ replies."
+msgstr ""
+"O complemento de completar automaticamente engade o completado automático "
+"para as respostas @."
+
+#. TRANS: Client exception in autocomplete plugin.
+msgid "Access forbidden."
+msgstr "Acceso prohibido."
diff --git a/plugins/Autocomplete/locale/he/LC_MESSAGES/Autocomplete.po b/plugins/Autocomplete/locale/he/LC_MESSAGES/Autocomplete.po
new file mode 100644
index 0000000000..1733e05da2
--- /dev/null
+++ b/plugins/Autocomplete/locale/he/LC_MESSAGES/Autocomplete.po
@@ -0,0 +1,30 @@
+# Translation of StatusNet - Autocomplete to Hebrew (עברית)
+# Exported from translatewiki.net
+#
+# Author: Amire80
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Autocomplete\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:41+0000\n"
+"Language-Team: Hebrew <https://translatewiki.net/wiki/Portal:he>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:49:45+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: he\n"
+"X-Message-Group: #out-statusnet-plugin-autocomplete\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin description.
+msgid "The autocomplete plugin adds autocompletion for @ replies."
+msgstr "תוסף השלמה �וטומטית מ�פשר השלמה �וטומטית של תשובות ב־@."
+
+#. TRANS: Client exception in autocomplete plugin.
+msgid "Access forbidden."
+msgstr "הגישה �סורה."
diff --git a/plugins/Autocomplete/locale/ia/LC_MESSAGES/Autocomplete.po b/plugins/Autocomplete/locale/ia/LC_MESSAGES/Autocomplete.po
index f099417ffa..934da304d0 100644
--- a/plugins/Autocomplete/locale/ia/LC_MESSAGES/Autocomplete.po
+++ b/plugins/Autocomplete/locale/ia/LC_MESSAGES/Autocomplete.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Autocomplete to Interlingua (Interlingua)
+# Translation of StatusNet - Autocomplete to Interlingua (interlingua)
 # Exported from translatewiki.net
 #
 # Author: McDutchie
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Autocomplete\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:40+0000\n"
-"Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:42+0000\n"
+"Language-Team: Interlingua <https://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:25:58+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:49:45+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-autocomplete\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/Autocomplete/locale/it/LC_MESSAGES/Autocomplete.po b/plugins/Autocomplete/locale/it/LC_MESSAGES/Autocomplete.po
new file mode 100644
index 0000000000..fef70104f0
--- /dev/null
+++ b/plugins/Autocomplete/locale/it/LC_MESSAGES/Autocomplete.po
@@ -0,0 +1,29 @@
+# Translation of StatusNet - Autocomplete to Italian (italiano)
+# Exported from translatewiki.net
+#
+# Author: Ximo17
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Autocomplete\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:42+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:49:45+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin description.
+msgid "The autocomplete plugin adds autocompletion for @ replies."
+msgstr ""
+"Il plugin di completamento automatico aggiunge il completamento automatico "
+"per le @ risposte."
+
+#. TRANS: Client exception in autocomplete plugin.
+msgid "Access forbidden."
+msgstr "Accesso vietato."
diff --git a/plugins/Autocomplete/locale/lt/LC_MESSAGES/Autocomplete.po b/plugins/Autocomplete/locale/lt/LC_MESSAGES/Autocomplete.po
new file mode 100644
index 0000000000..22ff414f0a
--- /dev/null
+++ b/plugins/Autocomplete/locale/lt/LC_MESSAGES/Autocomplete.po
@@ -0,0 +1,31 @@
+# Translation of StatusNet - Autocomplete to Lithuanian (lietuvių)
+# Exported from translatewiki.net
+#
+# Author: Eitvys200
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Autocomplete\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:42+0000\n"
+"Language-Team: Lithuanian <https://translatewiki.net/wiki/Portal:lt>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:49:45+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: lt\n"
+"X-Message-Group: #out-statusnet-plugin-autocomplete\n"
+"Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
+"2 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
+
+#. TRANS: Plugin description.
+msgid "The autocomplete plugin adds autocompletion for @ replies."
+msgstr ""
+
+#. TRANS: Client exception in autocomplete plugin.
+msgid "Access forbidden."
+msgstr "Prieiga uždrausta."
diff --git a/plugins/Autocomplete/locale/mk/LC_MESSAGES/Autocomplete.po b/plugins/Autocomplete/locale/mk/LC_MESSAGES/Autocomplete.po
index 6c54f71c16..7ce15c09d6 100644
--- a/plugins/Autocomplete/locale/mk/LC_MESSAGES/Autocomplete.po
+++ b/plugins/Autocomplete/locale/mk/LC_MESSAGES/Autocomplete.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Autocomplete to Macedonian (Македон�ки)
+# Translation of StatusNet - Autocomplete to Macedonian (македон�ки)
 # Exported from translatewiki.net
 #
 # Author: Bjankuloski06
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Autocomplete\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:40+0000\n"
-"Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:42+0000\n"
+"Language-Team: Macedonian <https://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:25:58+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:49:45+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-autocomplete\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
diff --git a/plugins/Autocomplete/locale/ms/LC_MESSAGES/Autocomplete.po b/plugins/Autocomplete/locale/ms/LC_MESSAGES/Autocomplete.po
new file mode 100644
index 0000000000..0ea3b3c645
--- /dev/null
+++ b/plugins/Autocomplete/locale/ms/LC_MESSAGES/Autocomplete.po
@@ -0,0 +1,31 @@
+# Translation of StatusNet - Autocomplete to Malay (Bahasa Melayu)
+# Exported from translatewiki.net
+#
+# Author: Anakmalaysia
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Autocomplete\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:42+0000\n"
+"Language-Team: Malay <https://translatewiki.net/wiki/Portal:ms>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:49:45+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: ms\n"
+"X-Message-Group: #out-statusnet-plugin-autocomplete\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#. TRANS: Plugin description.
+msgid "The autocomplete plugin adds autocompletion for @ replies."
+msgstr ""
+"Pemalam autolengkap menambahkan ciri pelengkapan automatik untuk balasan @."
+
+#. TRANS: Client exception in autocomplete plugin.
+msgid "Access forbidden."
+msgstr "Akses dilarang."
diff --git a/plugins/Autocomplete/locale/nl/LC_MESSAGES/Autocomplete.po b/plugins/Autocomplete/locale/nl/LC_MESSAGES/Autocomplete.po
index 1586360727..3a9421fb26 100644
--- a/plugins/Autocomplete/locale/nl/LC_MESSAGES/Autocomplete.po
+++ b/plugins/Autocomplete/locale/nl/LC_MESSAGES/Autocomplete.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Autocomplete\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:40+0000\n"
-"Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:42+0000\n"
+"Language-Team: Dutch <https://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:25:58+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:49:45+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-autocomplete\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/Autocomplete/locale/pl/LC_MESSAGES/Autocomplete.po b/plugins/Autocomplete/locale/pl/LC_MESSAGES/Autocomplete.po
new file mode 100644
index 0000000000..170e92f85f
--- /dev/null
+++ b/plugins/Autocomplete/locale/pl/LC_MESSAGES/Autocomplete.po
@@ -0,0 +1,33 @@
+# Translation of StatusNet - Autocomplete to Polish (polski)
+# Exported from translatewiki.net
+#
+# Author: BeginaFelicysym
+# Author: Woytecr
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Autocomplete\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:42+0000\n"
+"Language-Team: Polish <https://translatewiki.net/wiki/Portal:pl>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:49:45+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: pl\n"
+"X-Message-Group: #out-statusnet-plugin-autocomplete\n"
+"Plural-Forms: nplurals=3; plural=(n == 1) ? 0 : ( (n%10 >= 2 && n%10 <= 4 && "
+"(n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
+
+#. TRANS: Plugin description.
+msgid "The autocomplete plugin adds autocompletion for @ replies."
+msgstr ""
+"Wtyczka autouzupełniania dodaje automatyczne uzupełnianie dla odpowiedzi @."
+
+#. TRANS: Client exception in autocomplete plugin.
+msgid "Access forbidden."
+msgstr "Dostęp zabroniony."
diff --git a/plugins/Autocomplete/locale/sv/LC_MESSAGES/Autocomplete.po b/plugins/Autocomplete/locale/sv/LC_MESSAGES/Autocomplete.po
new file mode 100644
index 0000000000..f31db9b598
--- /dev/null
+++ b/plugins/Autocomplete/locale/sv/LC_MESSAGES/Autocomplete.po
@@ -0,0 +1,30 @@
+# Translation of StatusNet - Autocomplete to Swedish (svenska)
+# Exported from translatewiki.net
+#
+# Author: Ainali
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Autocomplete\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:42+0000\n"
+"Language-Team: Swedish <https://translatewiki.net/wiki/Portal:sv>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:49:45+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: sv\n"
+"X-Message-Group: #out-statusnet-plugin-autocomplete\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin description.
+msgid "The autocomplete plugin adds autocompletion for @ replies."
+msgstr ""
+
+#. TRANS: Client exception in autocomplete plugin.
+msgid "Access forbidden."
+msgstr "Tillträde förbjudet."
diff --git a/plugins/Autocomplete/locale/tl/LC_MESSAGES/Autocomplete.po b/plugins/Autocomplete/locale/tl/LC_MESSAGES/Autocomplete.po
index af79abe570..f9cdc1ac80 100644
--- a/plugins/Autocomplete/locale/tl/LC_MESSAGES/Autocomplete.po
+++ b/plugins/Autocomplete/locale/tl/LC_MESSAGES/Autocomplete.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Autocomplete\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:41+0000\n"
-"Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:42+0000\n"
+"Language-Team: Tagalog <https://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:25:58+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:49:45+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-autocomplete\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/Autocomplete/locale/uk/LC_MESSAGES/Autocomplete.po b/plugins/Autocomplete/locale/uk/LC_MESSAGES/Autocomplete.po
index 3e3779e0c4..5d10d12b4e 100644
--- a/plugins/Autocomplete/locale/uk/LC_MESSAGES/Autocomplete.po
+++ b/plugins/Autocomplete/locale/uk/LC_MESSAGES/Autocomplete.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Autocomplete to Ukrainian (Україн�ька)
+# Translation of StatusNet - Autocomplete to Ukrainian (україн�ька)
 # Exported from translatewiki.net
 #
 # Author: Boogie
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Autocomplete\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:41+0000\n"
-"Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:43+0000\n"
+"Language-Team: Ukrainian <https://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:25:58+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:49:45+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-autocomplete\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
diff --git a/plugins/Awesomeness/AwesomenessPlugin.php b/plugins/Awesomeness/AwesomenessPlugin.php
index edcbe6660f..55a596b569 100644
--- a/plugins/Awesomeness/AwesomenessPlugin.php
+++ b/plugins/Awesomeness/AwesomenessPlugin.php
@@ -52,8 +52,7 @@ class AwesomenessPlugin extends Plugin
             'author' => 'Jeroen De Dauw',
             'homepage' => 'http://status.net/wiki/Plugin:Awesomeness',
             // TRANS: Plugin description for a sample plugin.
-            'rawdescription' => _m(
-                'The Awesomeness plugin adds additional awesomeness ' .
+            'rawdescription' => _m('The Awesomeness plugin adds additional awesomeness ' .
                 'to a StatusNet installation.'
             )
         );
diff --git a/plugins/Awesomeness/locale/Awesomeness.pot b/plugins/Awesomeness/locale/Awesomeness.pot
index f3e201100a..28cb119331 100644
--- a/plugins/Awesomeness/locale/Awesomeness.pot
+++ b/plugins/Awesomeness/locale/Awesomeness.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,7 +16,8 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: AwesomenessPlugin.php:56
+#. TRANS: Plugin description for a sample plugin.
+#: AwesomenessPlugin.php:55
 msgid ""
 "The Awesomeness plugin adds additional awesomeness to a StatusNet "
 "installation."
diff --git a/plugins/Awesomeness/locale/be-tarask/LC_MESSAGES/Awesomeness.po b/plugins/Awesomeness/locale/be-tarask/LC_MESSAGES/Awesomeness.po
index dcb7b81c4c..e9f7a2e23a 100644
--- a/plugins/Awesomeness/locale/be-tarask/LC_MESSAGES/Awesomeness.po
+++ b/plugins/Awesomeness/locale/be-tarask/LC_MESSAGES/Awesomeness.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Awesomeness to Belarusian (Taraškievica orthography) (‪Белару�ка� (тарашкевіца)‬)
+# Translation of StatusNet - Awesomeness to Belarusian (Taraškievica orthography) (‪белару�ка� (тарашкевіца)‬)
 # Exported from translatewiki.net
 #
 # Author: EugeneZelenko
@@ -9,19 +9,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Awesomeness\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:42+0000\n"
-"Language-Team: Belarusian (Taraškievica orthography) <http://translatewiki."
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:45+0000\n"
+"Language-Team: Belarusian (Taraškievica orthography) <https://translatewiki."
 "net/wiki/Portal:be-tarask>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-17 18:38:57+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:49:46+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: be-tarask\n"
 "X-Message-Group: #out-statusnet-plugin-awesomeness\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Plugin description for a sample plugin.
 msgid ""
 "The Awesomeness plugin adds additional awesomeness to a StatusNet "
 "installation."
diff --git a/plugins/Awesomeness/locale/de/LC_MESSAGES/Awesomeness.po b/plugins/Awesomeness/locale/de/LC_MESSAGES/Awesomeness.po
index 68878f63dc..da6d046a3f 100644
--- a/plugins/Awesomeness/locale/de/LC_MESSAGES/Awesomeness.po
+++ b/plugins/Awesomeness/locale/de/LC_MESSAGES/Awesomeness.po
@@ -9,18 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Awesomeness\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:42+0000\n"
-"Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:45+0000\n"
+"Language-Team: German <https://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-17 18:38:57+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:49:46+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-awesomeness\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Plugin description for a sample plugin.
 msgid ""
 "The Awesomeness plugin adds additional awesomeness to a StatusNet "
 "installation."
diff --git a/plugins/Awesomeness/locale/es/LC_MESSAGES/Awesomeness.po b/plugins/Awesomeness/locale/es/LC_MESSAGES/Awesomeness.po
new file mode 100644
index 0000000000..6c10d39507
--- /dev/null
+++ b/plugins/Awesomeness/locale/es/LC_MESSAGES/Awesomeness.po
@@ -0,0 +1,29 @@
+# Translation of StatusNet - Awesomeness to Spanish (español)
+# Exported from translatewiki.net
+#
+# Author: Erchache2000
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Awesomeness\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:45+0000\n"
+"Language-Team: Spanish <https://translatewiki.net/wiki/Portal:es>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:49:46+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: es\n"
+"X-Message-Group: #out-statusnet-plugin-awesomeness\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin description for a sample plugin.
+msgid ""
+"The Awesomeness plugin adds additional awesomeness to a StatusNet "
+"installation."
+msgstr ""
+"El plugin Awsomeness añade información adicional a una instalación StatusNet."
diff --git a/plugins/Awesomeness/locale/eu/LC_MESSAGES/Awesomeness.po b/plugins/Awesomeness/locale/eu/LC_MESSAGES/Awesomeness.po
new file mode 100644
index 0000000000..1322f06bda
--- /dev/null
+++ b/plugins/Awesomeness/locale/eu/LC_MESSAGES/Awesomeness.po
@@ -0,0 +1,27 @@
+# Translation of StatusNet - Awesomeness to Basque (euskara)
+# Exported from translatewiki.net
+#
+# Author: Artsuaga
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Awesomeness\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:45+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:49:46+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin description for a sample plugin.
+msgid ""
+"The Awesomeness plugin adds additional awesomeness to a StatusNet "
+"installation."
+msgstr ""
+"Awesomeness pluginak informazio osagarria gehitzen dio StatusNet "
+"instalatzioari."
diff --git a/plugins/Awesomeness/locale/fi/LC_MESSAGES/Awesomeness.po b/plugins/Awesomeness/locale/fi/LC_MESSAGES/Awesomeness.po
index b88ddaf5ad..822976a6a5 100644
--- a/plugins/Awesomeness/locale/fi/LC_MESSAGES/Awesomeness.po
+++ b/plugins/Awesomeness/locale/fi/LC_MESSAGES/Awesomeness.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Awesomeness to Finnish (Suomi)
+# Translation of StatusNet - Awesomeness to Finnish (suomi)
 # Exported from translatewiki.net
 #
 # Author: Nike
@@ -10,18 +10,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Awesomeness\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:42+0000\n"
-"Language-Team: Finnish <http://translatewiki.net/wiki/Portal:fi>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:45+0000\n"
+"Language-Team: Finnish <https://translatewiki.net/wiki/Portal:fi>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-17 18:38:57+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:49:46+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: fi\n"
 "X-Message-Group: #out-statusnet-plugin-awesomeness\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Plugin description for a sample plugin.
 msgid ""
 "The Awesomeness plugin adds additional awesomeness to a StatusNet "
 "installation."
diff --git a/plugins/Awesomeness/locale/fr/LC_MESSAGES/Awesomeness.po b/plugins/Awesomeness/locale/fr/LC_MESSAGES/Awesomeness.po
index c6a8c2ab09..2ec09648d9 100644
--- a/plugins/Awesomeness/locale/fr/LC_MESSAGES/Awesomeness.po
+++ b/plugins/Awesomeness/locale/fr/LC_MESSAGES/Awesomeness.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Awesomeness to French (Français)
+# Translation of StatusNet - Awesomeness to French (français)
 # Exported from translatewiki.net
 #
 # Author: Sherbrooke
@@ -9,18 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Awesomeness\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:42+0000\n"
-"Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:45+0000\n"
+"Language-Team: French <https://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-17 18:38:57+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:49:46+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-awesomeness\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#. TRANS: Plugin description for a sample plugin.
 msgid ""
 "The Awesomeness plugin adds additional awesomeness to a StatusNet "
 "installation."
diff --git a/plugins/Awesomeness/locale/gl/LC_MESSAGES/Awesomeness.po b/plugins/Awesomeness/locale/gl/LC_MESSAGES/Awesomeness.po
new file mode 100644
index 0000000000..fcc72fba2b
--- /dev/null
+++ b/plugins/Awesomeness/locale/gl/LC_MESSAGES/Awesomeness.po
@@ -0,0 +1,30 @@
+# Translation of StatusNet - Awesomeness to Galician (galego)
+# Exported from translatewiki.net
+#
+# Author: Toliño
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Awesomeness\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:45+0000\n"
+"Language-Team: Galician <https://translatewiki.net/wiki/Portal:gl>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:49:46+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: gl\n"
+"X-Message-Group: #out-statusnet-plugin-awesomeness\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin description for a sample plugin.
+msgid ""
+"The Awesomeness plugin adds additional awesomeness to a StatusNet "
+"installation."
+msgstr ""
+"O complemento impresionante engade suplementos impresionantes á instalación "
+"do StatusNet."
diff --git a/plugins/Awesomeness/locale/he/LC_MESSAGES/Awesomeness.po b/plugins/Awesomeness/locale/he/LC_MESSAGES/Awesomeness.po
new file mode 100644
index 0000000000..d0c205363c
--- /dev/null
+++ b/plugins/Awesomeness/locale/he/LC_MESSAGES/Awesomeness.po
@@ -0,0 +1,28 @@
+# Translation of StatusNet - Awesomeness to Hebrew (עברית)
+# Exported from translatewiki.net
+#
+# Author: Amire80
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Awesomeness\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:45+0000\n"
+"Language-Team: Hebrew <https://translatewiki.net/wiki/Portal:he>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:49:46+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: he\n"
+"X-Message-Group: #out-statusnet-plugin-awesomeness\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin description for a sample plugin.
+msgid ""
+"The Awesomeness plugin adds additional awesomeness to a StatusNet "
+"installation."
+msgstr "תוסף מגניבות מוסיף עוד מגניבות להתקנה של סטטוסנט."
diff --git a/plugins/Awesomeness/locale/ia/LC_MESSAGES/Awesomeness.po b/plugins/Awesomeness/locale/ia/LC_MESSAGES/Awesomeness.po
index d9f8c0d15b..e4bab60c08 100644
--- a/plugins/Awesomeness/locale/ia/LC_MESSAGES/Awesomeness.po
+++ b/plugins/Awesomeness/locale/ia/LC_MESSAGES/Awesomeness.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Awesomeness to Interlingua (Interlingua)
+# Translation of StatusNet - Awesomeness to Interlingua (interlingua)
 # Exported from translatewiki.net
 #
 # Author: McDutchie
@@ -9,18 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Awesomeness\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:42+0000\n"
-"Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:45+0000\n"
+"Language-Team: Interlingua <https://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-17 18:38:57+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:49:46+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-awesomeness\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Plugin description for a sample plugin.
 msgid ""
 "The Awesomeness plugin adds additional awesomeness to a StatusNet "
 "installation."
diff --git a/plugins/Awesomeness/locale/it/LC_MESSAGES/Awesomeness.po b/plugins/Awesomeness/locale/it/LC_MESSAGES/Awesomeness.po
new file mode 100644
index 0000000000..d58c9dafa7
--- /dev/null
+++ b/plugins/Awesomeness/locale/it/LC_MESSAGES/Awesomeness.po
@@ -0,0 +1,27 @@
+# Translation of StatusNet - Awesomeness to Italian (italiano)
+# Exported from translatewiki.net
+#
+# Author: Ximo17
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Awesomeness\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:45+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:49:46+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin description for a sample plugin.
+msgid ""
+"The Awesomeness plugin adds additional awesomeness to a StatusNet "
+"installation."
+msgstr ""
+"Il plugin Awesomeness aggiunge ulteriore imponenza all'installazione di "
+"StatusNet."
diff --git a/plugins/Awesomeness/locale/mk/LC_MESSAGES/Awesomeness.po b/plugins/Awesomeness/locale/mk/LC_MESSAGES/Awesomeness.po
index 5f788e3e7d..ac835a0757 100644
--- a/plugins/Awesomeness/locale/mk/LC_MESSAGES/Awesomeness.po
+++ b/plugins/Awesomeness/locale/mk/LC_MESSAGES/Awesomeness.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Awesomeness to Macedonian (Македон�ки)
+# Translation of StatusNet - Awesomeness to Macedonian (македон�ки)
 # Exported from translatewiki.net
 #
 # Author: Bjankuloski06
@@ -9,18 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Awesomeness\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:42+0000\n"
-"Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:45+0000\n"
+"Language-Team: Macedonian <https://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-17 18:38:57+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:49:46+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-awesomeness\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
 
+#. TRANS: Plugin description for a sample plugin.
 msgid ""
 "The Awesomeness plugin adds additional awesomeness to a StatusNet "
 "installation."
diff --git a/plugins/Awesomeness/locale/nl/LC_MESSAGES/Awesomeness.po b/plugins/Awesomeness/locale/nl/LC_MESSAGES/Awesomeness.po
index dd279512b8..f1bf702db1 100644
--- a/plugins/Awesomeness/locale/nl/LC_MESSAGES/Awesomeness.po
+++ b/plugins/Awesomeness/locale/nl/LC_MESSAGES/Awesomeness.po
@@ -9,18 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Awesomeness\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:42+0000\n"
-"Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:46+0000\n"
+"Language-Team: Dutch <https://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-17 18:38:57+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:49:46+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-awesomeness\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Plugin description for a sample plugin.
 msgid ""
 "The Awesomeness plugin adds additional awesomeness to a StatusNet "
 "installation."
diff --git a/plugins/Awesomeness/locale/pl/LC_MESSAGES/Awesomeness.po b/plugins/Awesomeness/locale/pl/LC_MESSAGES/Awesomeness.po
new file mode 100644
index 0000000000..e1994fbb9f
--- /dev/null
+++ b/plugins/Awesomeness/locale/pl/LC_MESSAGES/Awesomeness.po
@@ -0,0 +1,27 @@
+# Translation of StatusNet - Awesomeness to Polish (polski)
+# Exported from translatewiki.net
+#
+# Author: BeginaFelicysym
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Awesomeness\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:46+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:49:46+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=3; plural=(n == 1) ? 0 : ( (n%10 >= 2 && n%10 <= 4 && "
+"(n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
+
+#. TRANS: Plugin description for a sample plugin.
+msgid ""
+"The Awesomeness plugin adds additional awesomeness to a StatusNet "
+"installation."
+msgstr ""
+"Wtyczka Awesomeness dodaje dodatkowe niesamowitości do instalacji StatusNet."
diff --git a/plugins/Awesomeness/locale/pt/LC_MESSAGES/Awesomeness.po b/plugins/Awesomeness/locale/pt/LC_MESSAGES/Awesomeness.po
index b45238f94e..db8dee9d08 100644
--- a/plugins/Awesomeness/locale/pt/LC_MESSAGES/Awesomeness.po
+++ b/plugins/Awesomeness/locale/pt/LC_MESSAGES/Awesomeness.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Awesomeness to Portuguese (Português)
+# Translation of StatusNet - Awesomeness to Portuguese (português)
 # Exported from translatewiki.net
 #
 # Author: Waldir
@@ -9,18 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Awesomeness\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:42+0000\n"
-"Language-Team: Portuguese <http://translatewiki.net/wiki/Portal:pt>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:46+0000\n"
+"Language-Team: Portuguese <https://translatewiki.net/wiki/Portal:pt>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-17 18:38:57+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:49:46+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: pt\n"
 "X-Message-Group: #out-statusnet-plugin-awesomeness\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Plugin description for a sample plugin.
 msgid ""
 "The Awesomeness plugin adds additional awesomeness to a StatusNet "
 "installation."
diff --git a/plugins/Awesomeness/locale/ru/LC_MESSAGES/Awesomeness.po b/plugins/Awesomeness/locale/ru/LC_MESSAGES/Awesomeness.po
index 7932195ff6..c404729b37 100644
--- a/plugins/Awesomeness/locale/ru/LC_MESSAGES/Awesomeness.po
+++ b/plugins/Awesomeness/locale/ru/LC_MESSAGES/Awesomeness.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Awesomeness to Russian (Ру��кий)
+# Translation of StatusNet - Awesomeness to Russian (ру��кий)
 # Exported from translatewiki.net
 #
 # Author: �лек�андр Сигачёв
@@ -9,19 +9,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Awesomeness\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:42+0000\n"
-"Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:46+0000\n"
+"Language-Team: Russian <https://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-17 18:38:57+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:49:46+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-awesomeness\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
+#. TRANS: Plugin description for a sample plugin.
 msgid ""
 "The Awesomeness plugin adds additional awesomeness to a StatusNet "
 "installation."
diff --git a/plugins/Awesomeness/locale/tl/LC_MESSAGES/Awesomeness.po b/plugins/Awesomeness/locale/tl/LC_MESSAGES/Awesomeness.po
index 18e35b7f20..05d44576fb 100644
--- a/plugins/Awesomeness/locale/tl/LC_MESSAGES/Awesomeness.po
+++ b/plugins/Awesomeness/locale/tl/LC_MESSAGES/Awesomeness.po
@@ -9,18 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Awesomeness\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:42+0000\n"
-"Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:46+0000\n"
+"Language-Team: Tagalog <https://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-17 18:38:57+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:49:46+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-awesomeness\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Plugin description for a sample plugin.
 msgid ""
 "The Awesomeness plugin adds additional awesomeness to a StatusNet "
 "installation."
diff --git a/plugins/Awesomeness/locale/uk/LC_MESSAGES/Awesomeness.po b/plugins/Awesomeness/locale/uk/LC_MESSAGES/Awesomeness.po
index 90feb3dcac..b40e0141ff 100644
--- a/plugins/Awesomeness/locale/uk/LC_MESSAGES/Awesomeness.po
+++ b/plugins/Awesomeness/locale/uk/LC_MESSAGES/Awesomeness.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Awesomeness to Ukrainian (Україн�ька)
+# Translation of StatusNet - Awesomeness to Ukrainian (україн�ька)
 # Exported from translatewiki.net
 #
 # Author: Boogie
@@ -9,19 +9,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Awesomeness\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:43+0000\n"
-"Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:46+0000\n"
+"Language-Team: Ukrainian <https://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-17 18:38:57+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:49:46+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-awesomeness\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
+#. TRANS: Plugin description for a sample plugin.
 msgid ""
 "The Awesomeness plugin adds additional awesomeness to a StatusNet "
 "installation."
diff --git a/plugins/BitlyUrl/BitlyUrlPlugin.php b/plugins/BitlyUrl/BitlyUrlPlugin.php
index 24a260ec40..5efd573896 100644
--- a/plugins/BitlyUrl/BitlyUrlPlugin.php
+++ b/plugins/BitlyUrl/BitlyUrlPlugin.php
@@ -36,7 +36,7 @@ if (!defined('STATUSNET')) {
 class BitlyUrlPlugin extends UrlShortenerPlugin
 {
     public $shortenerName = 'bit.ly';
-    public $serviceUrl = 'http://bit.ly/api?method=shorten&version=2.0.1&longUrl=%s';
+    public $serviceUrl = 'http://api.bit.ly/v3/shorten?longUrl=%s';
     public $login; // To set a site-default when admins or users don't override it.
     public $apiKey;
 
@@ -69,12 +69,10 @@ class BitlyUrlPlugin extends UrlShortenerPlugin
      * @return string shortened version of the url, or null if URL shortening failed
      */
     protected function shorten($url) {
+	common_log(LOG_INFO, "bit.ly call for $url");
         $response = $this->query($url);
-        if ($this->isOk($url, $response)) {
-            return $this->decode($url, $response->getBody());
-        } else {
-            return null;
-        }
+	common_log(LOG_INFO, "bit.ly answer for $url is ".$response->getBody());
+	return $this->decode($url, $response);
     }
 
     /**
@@ -126,42 +124,25 @@ class BitlyUrlPlugin extends UrlShortenerPlugin
     /**
      * JSON decode for API result
      */
-    protected function decode($url, $body)
+    protected function decode($url, $response)
     {
-        $json = json_decode($body, true);
-        return $json['results'][$url]['shortUrl'];
-    }
-
-    /**
-     * JSON decode for API result
-     */
-    protected function isOk($url, $response)
-    {
-        $code = 'unknown';
-        $msg = '';
+        $msg = "bit.ly returned unknown response with unknown message for $url";
         if ($response->isOk()) {
             $body = $response->getBody();
             common_log(LOG_INFO, $body);
             $json = json_decode($body, true);
-            if ($json['statusCode'] == 'OK') {
-                if (!isset($json['results'][$url])) {
-                    common_log(LOG_ERR, "bit.ly returned OK response, but didn't find expected URL $url in $body");
-                    return false;
+            if ($json['status_code'] == 200) {
+                if (isset($json['data']['url'])) {
+					common_log(LOG_INFO, "bit.ly returned ".$json['data']['url']." as short URL for $url");
+                    return $json['data']['url'];
                 }
-                $data = $json['results'][$url];
-                if (isset($data['shortUrl'])) {
-                    return true;
-                } else if (isset($data['statusCode']) && $data['statusCode'] == 'ERROR') {
-                    $code = $data['errorCode'];
-                    $msg = $data['errorMessage'];
-                }
-            } else if ($json['statusCode'] == 'ERROR') {
-                $code = $json['errorCode'];
-                $msg = $json['errorMessage'];
-            }
-            common_log(LOG_ERR, "bit.ly returned error $code $msg for $url");
-        }
-        return false;
+				$msg = "bit.ly returned ".$json['status_code']." response, but didn't find expected URL $url in $body";
+			}else{
+				$msg = "bit.ly returned ".$json['status_code']." response with ".$json['status_txt']." for $url";
+			}
+		}
+		common_log(LOG_ERR, $msg);
+		return null;
     }
 
     function onPluginVersion(&$versions)
diff --git a/plugins/BitlyUrl/locale/BitlyUrl.pot b/plugins/BitlyUrl/locale/BitlyUrl.pot
index 3fa35aa116..253c30e497 100644
--- a/plugins/BitlyUrl/locale/BitlyUrl.pot
+++ b/plugins/BitlyUrl/locale/BitlyUrl.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
+"POT-Creation-Date: 2012-06-30 11:07+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"
@@ -83,17 +83,17 @@ msgid "You must specify a serviceUrl for bit.ly URL shortening."
 msgstr ""
 
 #. TRANS: Plugin description. %1$s is the URL shortening service base URL (for example "bit.ly").
-#: BitlyUrlPlugin.php:175
+#: BitlyUrlPlugin.php:156
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr ""
 
 #. TRANS: Menu item in administration menus for bit.ly URL shortening settings.
-#: BitlyUrlPlugin.php:217
+#: BitlyUrlPlugin.php:198
 msgid "bit.ly"
 msgstr ""
 
 #. TRANS: Title for menu item in administration menus for bit.ly URL shortening settings.
-#: BitlyUrlPlugin.php:219
+#: BitlyUrlPlugin.php:200
 msgid "bit.ly URL shortening."
 msgstr ""
diff --git a/plugins/BitlyUrl/locale/be-tarask/LC_MESSAGES/BitlyUrl.po b/plugins/BitlyUrl/locale/be-tarask/LC_MESSAGES/BitlyUrl.po
index 34987331a6..98918dddb6 100644
--- a/plugins/BitlyUrl/locale/be-tarask/LC_MESSAGES/BitlyUrl.po
+++ b/plugins/BitlyUrl/locale/be-tarask/LC_MESSAGES/BitlyUrl.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - BitlyUrl to Belarusian (Taraškievica orthography) (‪Белару�ка� (тарашкевіца)‬)
+# Translation of StatusNet - BitlyUrl to Belarusian (Taraškievica orthography) (‪белару�ка� (тарашкевіца)‬)
 # Exported from translatewiki.net
 #
 # Author: EugeneZelenko
@@ -10,15 +10,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BitlyUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:44+0000\n"
-"Language-Team: Belarusian (Taraškievica orthography) <http://translatewiki."
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:46+0000\n"
+"Language-Team: Belarusian (Taraškievica orthography) <https://translatewiki."
 "net/wiki/Portal:be-tarask>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:26:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-12-03 13:48:51+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: be-tarask\n"
 "X-Message-Group: #out-statusnet-plugin-bitlyurl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/BitlyUrl/locale/ca/LC_MESSAGES/BitlyUrl.po b/plugins/BitlyUrl/locale/ca/LC_MESSAGES/BitlyUrl.po
index cfa4774c70..56e51b17b2 100644
--- a/plugins/BitlyUrl/locale/ca/LC_MESSAGES/BitlyUrl.po
+++ b/plugins/BitlyUrl/locale/ca/LC_MESSAGES/BitlyUrl.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - BitlyUrl to Catalan (Català)
+# Translation of StatusNet - BitlyUrl to Catalan (català)
 # Exported from translatewiki.net
 #
 # Author: Toniher
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BitlyUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:44+0000\n"
-"Language-Team: Catalan <http://translatewiki.net/wiki/Portal:ca>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:46+0000\n"
+"Language-Team: Catalan <https://translatewiki.net/wiki/Portal:ca>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:26:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-12-03 13:48:51+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ca\n"
 "X-Message-Group: #out-statusnet-plugin-bitlyurl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/BitlyUrl/locale/de/LC_MESSAGES/BitlyUrl.po b/plugins/BitlyUrl/locale/de/LC_MESSAGES/BitlyUrl.po
index 55880afc21..634f581cf4 100644
--- a/plugins/BitlyUrl/locale/de/LC_MESSAGES/BitlyUrl.po
+++ b/plugins/BitlyUrl/locale/de/LC_MESSAGES/BitlyUrl.po
@@ -2,8 +2,10 @@
 # Exported from translatewiki.net
 #
 # Author: Giftpflanze
+# Author: Marcel083
 # Author: Michael
 # Author: The Evil IP address
+# Author: Tiin
 # --
 # This file is distributed under the same license as the StatusNet package.
 #
@@ -11,14 +13,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BitlyUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:44+0000\n"
-"Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:46+0000\n"
+"Language-Team: German <https://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:26:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-12-03 13:48:51+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-bitlyurl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -40,17 +42,14 @@ msgstr ""
 "benutzerdefinierte Domains."
 
 #. TRANS: Client error displayed when using too long a key.
-#, fuzzy
 msgid "Invalid login. Maximum length is 255 characters."
 msgstr "Ungültige Anmeldung. Maximale Länge sind 255 Zeichen."
 
 #. TRANS: Client error displayed when using too long a key.
-#, fuzzy
 msgid "Invalid API key. Maximum length is 255 characters."
-msgstr "Ungültiger API-Schlüssel. Maximale Länge sind 255 Zeichen."
+msgstr "Ungültiger API-Schlüssel. Maximale Länge beträgt 255 Zeichen."
 
 #. TRANS: Fieldset legend in administration panel for bit.ly username and API key.
-#, fuzzy
 msgctxt "LEGEND"
 msgid "Credentials"
 msgstr "Anmeldeinformationen"
@@ -82,9 +81,8 @@ msgid "Save bit.ly settings"
 msgstr "bit.ly-Einstellungen speichern"
 
 #. TRANS: Exception thrown when bit.ly URL shortening plugin was configured incorrectly.
-#, fuzzy
 msgid "You must specify a serviceUrl for bit.ly URL shortening."
-msgstr "Du musst eine „serviceUrl“ zur bit.ly-URL-Kürzung angeben."
+msgstr "Es muss eine serviceUrl zur bit.ly-URL-Kürzung angegeben werden."
 
 #. TRANS: Plugin description. %1$s is the URL shortening service base URL (for example "bit.ly").
 #, php-format
@@ -96,6 +94,5 @@ msgid "bit.ly"
 msgstr "bit.ly"
 
 #. TRANS: Title for menu item in administration menus for bit.ly URL shortening settings.
-#, fuzzy
 msgid "bit.ly URL shortening."
 msgstr "bit.ly-URL-Kürzung"
diff --git a/plugins/BitlyUrl/locale/es/LC_MESSAGES/BitlyUrl.po b/plugins/BitlyUrl/locale/es/LC_MESSAGES/BitlyUrl.po
index e1cad4db23..3cf0bad24f 100644
--- a/plugins/BitlyUrl/locale/es/LC_MESSAGES/BitlyUrl.po
+++ b/plugins/BitlyUrl/locale/es/LC_MESSAGES/BitlyUrl.po
@@ -1,6 +1,9 @@
-# Translation of StatusNet - BitlyUrl to Spanish (Español)
-# Expored from translatewiki.net
+# Translation of StatusNet - BitlyUrl to Spanish (español)
+# Exported from translatewiki.net
 #
+# Author: Erchache2000
+# Author: Od1n
+# Author: Plaxed
 # Author: Translationista
 # --
 # This file is distributed under the same license as the StatusNet package.
@@ -9,72 +12,85 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BitlyUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-09 14:04+0000\n"
-"PO-Revision-Date: 2010-10-09 14:07:16+0000\n"
-"Language-Team: Spanish <http://translatewiki.net/wiki/Portal:es>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:47+0000\n"
+"Language-Team: Spanish <https://translatewiki.net/wiki/Portal:es>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2010-10-03 20:54:25+0000\n"
-"X-Generator: MediaWiki 1.17alpha (r74529); Translate extension (2010-09-17)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-12-03 13:48:51+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-plugin-bitlyurl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: BitlyUrlPlugin.php:48
-#, fuzzy
-msgid "You must specify a serviceUrl for bit.ly shortening."
-msgstr "Debes especificar un serviceUrl."
-
-#: BitlyUrlPlugin.php:171
-#, php-format
-msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
-msgstr ""
-"Utiliza el servicio de acortamiento de URL <a href=\"http://%1$s/\">%1$s</a>."
-
-#: BitlyUrlPlugin.php:212
-msgid "bit.ly"
-msgstr ""
-
-#: BitlyUrlPlugin.php:213 bitlyadminpanelaction.php:54
+#. TRANS: Title of administration panel.
 msgid "bit.ly URL shortening"
-msgstr ""
+msgstr "acortamiento de URL bit.ly"
 
-#: bitlyadminpanelaction.php:65
+#. TRANS: Instructions for administration panel.
+#. TRANS: This message contains Markdown links in the form [decsription](link).
 msgid ""
 "URL shortening with bit.ly requires [a bit.ly account and API key](http://"
 "bit.ly/a/your_api_key). This verifies that this is an authorized account, "
 "and allow you to use bit.ly's tracking features and custom domains."
 msgstr ""
+"URL acortado con bit.ly requiere [cuenta bit.ly y API key](http://bit.ly/a/"
+"your_api_key). Esto comprueba que tiene una cuenta autorizada y permite "
+"utilizar funciones de seguimiento y dominios personalizados de bit.ly."
 
-#: bitlyadminpanelaction.php:132
-msgid "Invalid login. Max length is 255 characters."
-msgstr ""
+#. TRANS: Client error displayed when using too long a key.
+msgid "Invalid login. Maximum length is 255 characters."
+msgstr "Acceso invalido. La longitud máxima es de 255 caracteres."
 
-#: bitlyadminpanelaction.php:138
-msgid "Invalid API key. Max length is 255 characters."
-msgstr ""
+#. TRANS: Client error displayed when using too long a key.
+msgid "Invalid API key. Maximum length is 255 characters."
+msgstr "Clave de API no válida. Longitud máxima es de 255 caracteres."
 
-#: bitlyadminpanelaction.php:191
+#. TRANS: Fieldset legend in administration panel for bit.ly username and API key.
+msgctxt "LEGEND"
 msgid "Credentials"
-msgstr ""
+msgstr "Credenciales"
 
-#: bitlyadminpanelaction.php:199
+#. TRANS: Form guide in administration panel for bit.ly URL shortening.
 msgid "Leave these empty to use global default credentials."
-msgstr ""
+msgstr "Dejelo vacío para usar las credenciales globales por defecto."
 
-#: bitlyadminpanelaction.php:202
+#. TRANS: Form guide in administration panel for bit.ly URL shortening.
 msgid "If you leave these empty, bit.ly will be unavailable to users."
-msgstr ""
+msgstr "Si se deja vacío, bit.ly no estarán disponibles para los usuarios."
 
-#: bitlyadminpanelaction.php:209
+#. TRANS: Field label in administration panel for bit.ly URL shortening.
 msgid "Login name"
-msgstr ""
+msgstr "Nombre de usuario"
 
-#: bitlyadminpanelaction.php:218
+#. TRANS: Field label in administration panel for bit.ly URL shortening.
 msgid "API key"
-msgstr ""
+msgstr "API key"
 
-#: bitlyadminpanelaction.php:236
+#. TRANS: Button text to save setting in administration panel for bit.ly URL shortening.
+msgctxt "BUTTON"
+msgid "Save"
+msgstr "Guardar"
+
+#. TRANS: Button title to save setting in administration panel for bit.ly URL shortening.
 msgid "Save bit.ly settings"
+msgstr "Guardar configuración de bit.ly"
+
+#. TRANS: Exception thrown when bit.ly URL shortening plugin was configured incorrectly.
+msgid "You must specify a serviceUrl for bit.ly URL shortening."
+msgstr "Debe especificar un serviceUrl URL bit.ly"
+
+#. TRANS: Plugin description. %1$s is the URL shortening service base URL (for example "bit.ly").
+#, php-format
+msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr ""
+"Utiliza el servicio de acortamiento de URL <a href=\"http://%1$s/\">%1$s</a>."
+
+#. TRANS: Menu item in administration menus for bit.ly URL shortening settings.
+msgid "bit.ly"
+msgstr "bit.ly"
+
+#. TRANS: Title for menu item in administration menus for bit.ly URL shortening settings.
+msgid "bit.ly URL shortening."
+msgstr "acortamiento de URL bit.ly."
diff --git a/plugins/BitlyUrl/locale/eu/LC_MESSAGES/BitlyUrl.po b/plugins/BitlyUrl/locale/eu/LC_MESSAGES/BitlyUrl.po
new file mode 100644
index 0000000000..40bea6dc84
--- /dev/null
+++ b/plugins/BitlyUrl/locale/eu/LC_MESSAGES/BitlyUrl.po
@@ -0,0 +1,91 @@
+# Translation of StatusNet - BitlyUrl to Basque (euskara)
+# Exported from translatewiki.net
+#
+# Author: Artsuaga
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - BitlyUrl\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:47+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-12-03 13:48:51+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Title of administration panel.
+msgid "bit.ly URL shortening"
+msgstr "bit.ly URL laburtzailea"
+
+#. TRANS: Instructions for administration panel.
+#. TRANS: This message contains Markdown links in the form [decsription](link).
+msgid ""
+"URL shortening with bit.ly requires [a bit.ly account and API key](http://"
+"bit.ly/a/your_api_key). This verifies that this is an authorized account, "
+"and allow you to use bit.ly's tracking features and custom domains."
+msgstr ""
+"bit.ly URL laburtzailearentzako beharrezko dira [bit.ly kontu bat eta API "
+"giltza] (http://bit.ly/a/your_api_key). Baimendutako kontu bat dela "
+"ziurtatzeko eta bit.ly zerbitzuaren bereiztasunak eta domeinuak erabili ahal "
+"izateko."
+
+#. TRANS: Client error displayed when using too long a key.
+msgid "Invalid login. Maximum length is 255 characters."
+msgstr "Saio hasera baliogabea. Luzera maximoa 255 karakterekoa da."
+
+#. TRANS: Client error displayed when using too long a key.
+msgid "Invalid API key. Maximum length is 255 characters."
+msgstr "API gako okerra. Luzera maximoa 255 karakterekoa da."
+
+#. TRANS: Fieldset legend in administration panel for bit.ly username and API key.
+msgctxt "LEGEND"
+msgid "Credentials"
+msgstr "Egiaztagiriak"
+
+#. TRANS: Form guide in administration panel for bit.ly URL shortening.
+msgid "Leave these empty to use global default credentials."
+msgstr "Berezko egiaztagiri orokorrak erabiltzeko utzi hutsik."
+
+#. TRANS: Form guide in administration panel for bit.ly URL shortening.
+msgid "If you leave these empty, bit.ly will be unavailable to users."
+msgstr ""
+"Hau utsik uzten baduzu, bit.ly ez da gaiturik egongo erabiltzaileentzat."
+
+#. TRANS: Field label in administration panel for bit.ly URL shortening.
+msgid "Login name"
+msgstr "Saioa hasteko izena"
+
+#. TRANS: Field label in administration panel for bit.ly URL shortening.
+msgid "API key"
+msgstr "API giltza"
+
+#. TRANS: Button text to save setting in administration panel for bit.ly URL shortening.
+msgctxt "BUTTON"
+msgid "Save"
+msgstr "Gorde"
+
+#. TRANS: Button title to save setting in administration panel for bit.ly URL shortening.
+msgid "Save bit.ly settings"
+msgstr "Gorde bit.ly ezarpenak"
+
+#. TRANS: Exception thrown when bit.ly URL shortening plugin was configured incorrectly.
+msgid "You must specify a serviceUrl for bit.ly URL shortening."
+msgstr "Url zerbitzu bat zehaztu beharko zenuke bil.ly URL laburketetarako."
+
+#. TRANS: Plugin description. %1$s is the URL shortening service base URL (for example "bit.ly").
+#, php-format
+msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
+msgstr "<a href=\"http://%1$s/\">%1$s</a> URL-laburtze zerbitzua erabiliz."
+
+#. TRANS: Menu item in administration menus for bit.ly URL shortening settings.
+msgid "bit.ly"
+msgstr "bit.ly"
+
+#. TRANS: Title for menu item in administration menus for bit.ly URL shortening settings.
+msgid "bit.ly URL shortening."
+msgstr "bit.ly URL laburtzailea."
diff --git a/plugins/BitlyUrl/locale/fr/LC_MESSAGES/BitlyUrl.po b/plugins/BitlyUrl/locale/fr/LC_MESSAGES/BitlyUrl.po
index 9645d50feb..e439defec8 100644
--- a/plugins/BitlyUrl/locale/fr/LC_MESSAGES/BitlyUrl.po
+++ b/plugins/BitlyUrl/locale/fr/LC_MESSAGES/BitlyUrl.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - BitlyUrl to French (Français)
+# Translation of StatusNet - BitlyUrl to French (français)
 # Exported from translatewiki.net
 #
 # Author: Iketsi
@@ -10,14 +10,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BitlyUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:44+0000\n"
-"Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:47+0000\n"
+"Language-Team: French <https://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:26:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-12-03 13:48:51+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-bitlyurl\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
diff --git a/plugins/BitlyUrl/locale/fur/LC_MESSAGES/BitlyUrl.po b/plugins/BitlyUrl/locale/fur/LC_MESSAGES/BitlyUrl.po
index 748384b892..e6e4711d02 100644
--- a/plugins/BitlyUrl/locale/fur/LC_MESSAGES/BitlyUrl.po
+++ b/plugins/BitlyUrl/locale/fur/LC_MESSAGES/BitlyUrl.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - BitlyUrl to Friulian (Furlan)
+# Translation of StatusNet - BitlyUrl to Friulian (furlan)
 # Exported from translatewiki.net
 #
 # Author: Klenje
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BitlyUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:44+0000\n"
-"Language-Team: Friulian <http://translatewiki.net/wiki/Portal:fur>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:47+0000\n"
+"Language-Team: Friulian <https://translatewiki.net/wiki/Portal:fur>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:26:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-12-03 13:48:51+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: fur\n"
 "X-Message-Group: #out-statusnet-plugin-bitlyurl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/BitlyUrl/locale/gl/LC_MESSAGES/BitlyUrl.po b/plugins/BitlyUrl/locale/gl/LC_MESSAGES/BitlyUrl.po
index 04f4d2ac3f..6e91e8b2e3 100644
--- a/plugins/BitlyUrl/locale/gl/LC_MESSAGES/BitlyUrl.po
+++ b/plugins/BitlyUrl/locale/gl/LC_MESSAGES/BitlyUrl.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - BitlyUrl to Galician (Galego)
+# Translation of StatusNet - BitlyUrl to Galician (galego)
 # Exported from translatewiki.net
 #
 # Author: Toliño
@@ -9,21 +9,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BitlyUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-04-09 18:34+0000\n"
-"PO-Revision-Date: 2011-04-09 18:36:37+0000\n"
-"Language-Team: Galician <http://translatewiki.net/wiki/Portal:gl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:47+0000\n"
+"Language-Team: Galician <https://translatewiki.net/wiki/Portal:gl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-03 13:40:20+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r85732); Translate extension (2011-03-11)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-12-03 13:48:51+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: gl\n"
 "X-Message-Group: #out-statusnet-plugin-bitlyurl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANS: Title of administration panel.
 msgid "bit.ly URL shortening"
-msgstr ""
+msgstr "Servizo de acurtamento de enderezos URL bit.ly"
 
 #. TRANS: Instructions for administration panel.
 #. TRANS: This message contains Markdown links in the form [decsription](link).
@@ -32,29 +32,32 @@ msgid ""
 "bit.ly/a/your_api_key). This verifies that this is an authorized account, "
 "and allow you to use bit.ly's tracking features and custom domains."
 msgstr ""
+"O acurtamento de enderezos URL bit.ly necesita [unha conta de bit.ly e unha "
+"clave API](http://bit.ly/a/your_api_key). Isto comproba que esta é unha "
+"conta autorizada e permite usar as características de seguimento e dominios "
+"personalizados de bit.ly."
 
 #. TRANS: Client error displayed when using too long a key.
-#, fuzzy
 msgid "Invalid login. Maximum length is 255 characters."
 msgstr "Rexistro incorrecto. A extensión máxima é de 255 caracteres."
 
 #. TRANS: Client error displayed when using too long a key.
-#, fuzzy
 msgid "Invalid API key. Maximum length is 255 characters."
 msgstr "Clave API incorrecta. A extensión máxima é de 255 caracteres."
 
 #. TRANS: Fieldset legend in administration panel for bit.ly username and API key.
 msgctxt "LEGEND"
 msgid "Credentials"
-msgstr ""
+msgstr "Credenciais"
 
 #. TRANS: Form guide in administration panel for bit.ly URL shortening.
 msgid "Leave these empty to use global default credentials."
-msgstr ""
+msgstr "Deixe isto en branco para usar as credenciais globais por defecto."
 
 #. TRANS: Form guide in administration panel for bit.ly URL shortening.
 msgid "If you leave these empty, bit.ly will be unavailable to users."
 msgstr ""
+"Se deixa isto en branco, bit.ly non estará dispoñible para os usuarios."
 
 #. TRANS: Field label in administration panel for bit.ly URL shortening.
 msgid "Login name"
@@ -62,12 +65,12 @@ msgstr "Nome de usuario"
 
 #. TRANS: Field label in administration panel for bit.ly URL shortening.
 msgid "API key"
-msgstr ""
+msgstr "Clave API"
 
 #. TRANS: Button text to save setting in administration panel for bit.ly URL shortening.
 msgctxt "BUTTON"
 msgid "Save"
-msgstr ""
+msgstr "Gardar"
 
 #. TRANS: Button title to save setting in administration panel for bit.ly URL shortening.
 msgid "Save bit.ly settings"
@@ -76,6 +79,8 @@ msgstr "Gardar a configuración bit.ly"
 #. TRANS: Exception thrown when bit.ly URL shortening plugin was configured incorrectly.
 msgid "You must specify a serviceUrl for bit.ly URL shortening."
 msgstr ""
+"Debe especificar un serviceUrl para o servizo de abreviación de enderezos "
+"URL bit.ly."
 
 #. TRANS: Plugin description. %1$s is the URL shortening service base URL (for example "bit.ly").
 #, php-format
@@ -86,8 +91,8 @@ msgstr ""
 
 #. TRANS: Menu item in administration menus for bit.ly URL shortening settings.
 msgid "bit.ly"
-msgstr ""
+msgstr "bit.ly"
 
 #. TRANS: Title for menu item in administration menus for bit.ly URL shortening settings.
 msgid "bit.ly URL shortening."
-msgstr ""
+msgstr "Servizo de acurtamento de enderezos URL bit.ly."
diff --git a/plugins/BitlyUrl/locale/ia/LC_MESSAGES/BitlyUrl.po b/plugins/BitlyUrl/locale/ia/LC_MESSAGES/BitlyUrl.po
index 536dd31f38..7a3ed57d3e 100644
--- a/plugins/BitlyUrl/locale/ia/LC_MESSAGES/BitlyUrl.po
+++ b/plugins/BitlyUrl/locale/ia/LC_MESSAGES/BitlyUrl.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - BitlyUrl to Interlingua (Interlingua)
+# Translation of StatusNet - BitlyUrl to Interlingua (interlingua)
 # Exported from translatewiki.net
 #
 # Author: McDutchie
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BitlyUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:44+0000\n"
-"Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:47+0000\n"
+"Language-Team: Interlingua <https://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:26:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-12-03 13:48:51+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-bitlyurl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/BitlyUrl/locale/it/LC_MESSAGES/BitlyUrl.po b/plugins/BitlyUrl/locale/it/LC_MESSAGES/BitlyUrl.po
new file mode 100644
index 0000000000..b567712c08
--- /dev/null
+++ b/plugins/BitlyUrl/locale/it/LC_MESSAGES/BitlyUrl.po
@@ -0,0 +1,95 @@
+# Translation of StatusNet - BitlyUrl to Italian (italiano)
+# Exported from translatewiki.net
+#
+# Author: Od1n
+# Author: Ximo17
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - BitlyUrl\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:47+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-12-03 13:48:51+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Title of administration panel.
+msgid "bit.ly URL shortening"
+msgstr "accorciamento della URL bit.ly"
+
+#. TRANS: Instructions for administration panel.
+#. TRANS: This message contains Markdown links in the form [decsription](link).
+msgid ""
+"URL shortening with bit.ly requires [a bit.ly account and API key](http://"
+"bit.ly/a/your_api_key). This verifies that this is an authorized account, "
+"and allow you to use bit.ly's tracking features and custom domains."
+msgstr ""
+"L'accorciamento della URL con bit. ly richiede [un account bit.ly e una "
+"chiave API](http://bit.ly/a/your_api_key). Questo permette di verificare se "
+"si tratta di un account autorizzato e consente di utilizzare la funzionalità "
+"di rilevamento di bit.ly e i domini personalizzati."
+
+#. TRANS: Client error displayed when using too long a key.
+msgid "Invalid login. Maximum length is 255 characters."
+msgstr "Accesso non valido. La lunghezza massima è di 255 caratteri."
+
+#. TRANS: Client error displayed when using too long a key.
+msgid "Invalid API key. Maximum length is 255 characters."
+msgstr "Chiave API non valida. La lunghezza massima è di 255 caratteri."
+
+#. TRANS: Fieldset legend in administration panel for bit.ly username and API key.
+msgctxt "LEGEND"
+msgid "Credentials"
+msgstr "Credenziali"
+
+#. TRANS: Form guide in administration panel for bit.ly URL shortening.
+msgid "Leave these empty to use global default credentials."
+msgstr ""
+"Lascia questo spazio vuoto per usare le credenziali predefinite globali."
+
+#. TRANS: Form guide in administration panel for bit.ly URL shortening.
+msgid "If you leave these empty, bit.ly will be unavailable to users."
+msgstr ""
+"Se lasci questo spazio vuoto, bit.ly non sarà disponibile per gli utenti."
+
+#. TRANS: Field label in administration panel for bit.ly URL shortening.
+msgid "Login name"
+msgstr "Nome utente"
+
+#. TRANS: Field label in administration panel for bit.ly URL shortening.
+msgid "API key"
+msgstr "Chiave API"
+
+#. TRANS: Button text to save setting in administration panel for bit.ly URL shortening.
+msgctxt "BUTTON"
+msgid "Save"
+msgstr "Salva"
+
+#. TRANS: Button title to save setting in administration panel for bit.ly URL shortening.
+msgid "Save bit.ly settings"
+msgstr "Salvare le impostazioni bit.ly"
+
+#. TRANS: Exception thrown when bit.ly URL shortening plugin was configured incorrectly.
+msgid "You must specify a serviceUrl for bit.ly URL shortening."
+msgstr ""
+"È necessario specificare un serviceUrl per l'accorciamento della URL di bit."
+"ly."
+
+#. TRANS: Plugin description. %1$s is the URL shortening service base URL (for example "bit.ly").
+#, php-format
+msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
+msgstr "Usa il servizio URL-breve <a href=\"http://%1$s/\">%1$s</a>."
+
+#. TRANS: Menu item in administration menus for bit.ly URL shortening settings.
+msgid "bit.ly"
+msgstr "bit.ly"
+
+#. TRANS: Title for menu item in administration menus for bit.ly URL shortening settings.
+msgid "bit.ly URL shortening."
+msgstr "Abbreviazione della URL con bit.ly."
diff --git a/plugins/BitlyUrl/locale/mk/LC_MESSAGES/BitlyUrl.po b/plugins/BitlyUrl/locale/mk/LC_MESSAGES/BitlyUrl.po
index 79514b42e6..1ed592b3e7 100644
--- a/plugins/BitlyUrl/locale/mk/LC_MESSAGES/BitlyUrl.po
+++ b/plugins/BitlyUrl/locale/mk/LC_MESSAGES/BitlyUrl.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - BitlyUrl to Macedonian (Македон�ки)
+# Translation of StatusNet - BitlyUrl to Macedonian (македон�ки)
 # Exported from translatewiki.net
 #
 # Author: Bjankuloski06
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BitlyUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:44+0000\n"
-"Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:47+0000\n"
+"Language-Team: Macedonian <https://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:26:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-12-03 13:48:51+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-bitlyurl\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
@@ -48,7 +48,7 @@ msgstr "�еважечки API-клуч. Дозволени �е највеќе
 #. TRANS: Fieldset legend in administration panel for bit.ly username and API key.
 msgctxt "LEGEND"
 msgid "Credentials"
-msgstr "Уверенија"
+msgstr "Полномоштва"
 
 #. TRANS: Form guide in administration panel for bit.ly URL shortening.
 msgid "Leave these empty to use global default credentials."
diff --git a/plugins/BitlyUrl/locale/nb/LC_MESSAGES/BitlyUrl.po b/plugins/BitlyUrl/locale/nb/LC_MESSAGES/BitlyUrl.po
index dbc49b6dfb..de9250eb3e 100644
--- a/plugins/BitlyUrl/locale/nb/LC_MESSAGES/BitlyUrl.po
+++ b/plugins/BitlyUrl/locale/nb/LC_MESSAGES/BitlyUrl.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - BitlyUrl to Norwegian (bokmål)‬ (‪Norsk (bokmål)‬)
+# Translation of StatusNet - BitlyUrl to Norwegian Bokmål (‪norsk (bokmål)‬)
 # Exported from translatewiki.net
 #
 # Author: Nghtwlkr
@@ -9,15 +9,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BitlyUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:44+0000\n"
-"Language-Team: Norwegian (bokmål)‬ <http://translatewiki.net/wiki/Portal:no>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:47+0000\n"
+"Language-Team: Norwegian Bokmål <https://translatewiki.net/wiki/Portal:nb>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:26:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
-"X-Language-Code: no\n"
+"X-POT-Import-Date: 2011-12-03 13:48:51+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: nb\n"
 "X-Message-Group: #out-statusnet-plugin-bitlyurl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
@@ -37,20 +37,17 @@ msgstr ""
 "tillater deg å bruke bit.lys sporingsfunksjoner og egendefinerte domener."
 
 #. TRANS: Client error displayed when using too long a key.
-#, fuzzy
 msgid "Invalid login. Maximum length is 255 characters."
-msgstr "Ugyldig pålogging. Maks lengde er 255 tegn."
+msgstr "Ugyldig brukernavn. Maks lengde er 255 tegn."
 
 #. TRANS: Client error displayed when using too long a key.
-#, fuzzy
 msgid "Invalid API key. Maximum length is 255 characters."
 msgstr "Ugyldig API-nøkkel. Maks lengde er 255 tegn."
 
 #. TRANS: Fieldset legend in administration panel for bit.ly username and API key.
-#, fuzzy
 msgctxt "LEGEND"
 msgid "Credentials"
-msgstr "Attester"
+msgstr "PÃ¥loggingsinformasjon"
 
 #. TRANS: Form guide in administration panel for bit.ly URL shortening.
 msgid "Leave these empty to use global default credentials."
@@ -78,9 +75,8 @@ msgid "Save bit.ly settings"
 msgstr "Lagre bit.ly-innstillinger"
 
 #. TRANS: Exception thrown when bit.ly URL shortening plugin was configured incorrectly.
-#, fuzzy
 msgid "You must specify a serviceUrl for bit.ly URL shortening."
-msgstr "Du må angi en serviceUrl for bit.ly-forkortelse."
+msgstr "Du må angi en serviceUrl for bit.ly URL-forkortelse."
 
 #. TRANS: Plugin description. %1$s is the URL shortening service base URL (for example "bit.ly").
 #, php-format
@@ -92,6 +88,5 @@ msgid "bit.ly"
 msgstr "bit.ly"
 
 #. TRANS: Title for menu item in administration menus for bit.ly URL shortening settings.
-#, fuzzy
 msgid "bit.ly URL shortening."
-msgstr "bit.ly URL-forkortelse"
+msgstr "bit.ly URL-forkortelse."
diff --git a/plugins/BitlyUrl/locale/nl/LC_MESSAGES/BitlyUrl.po b/plugins/BitlyUrl/locale/nl/LC_MESSAGES/BitlyUrl.po
index 8786343484..ec67ae6a6d 100644
--- a/plugins/BitlyUrl/locale/nl/LC_MESSAGES/BitlyUrl.po
+++ b/plugins/BitlyUrl/locale/nl/LC_MESSAGES/BitlyUrl.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BitlyUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:44+0000\n"
-"Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:48+0000\n"
+"Language-Team: Dutch <https://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:26:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-12-03 13:48:51+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-bitlyurl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/BitlyUrl/locale/ru/LC_MESSAGES/BitlyUrl.po b/plugins/BitlyUrl/locale/ru/LC_MESSAGES/BitlyUrl.po
index d8c267fa19..9527b085b0 100644
--- a/plugins/BitlyUrl/locale/ru/LC_MESSAGES/BitlyUrl.po
+++ b/plugins/BitlyUrl/locale/ru/LC_MESSAGES/BitlyUrl.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - BitlyUrl to Russian (Ру��кий)
+# Translation of StatusNet - BitlyUrl to Russian (ру��кий)
 # Exported from translatewiki.net
 #
 # Author: Eleferen
@@ -11,14 +11,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BitlyUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:44+0000\n"
-"Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:48+0000\n"
+"Language-Team: Russian <https://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:26:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-12-03 13:48:51+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-bitlyurl\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
@@ -51,7 +51,6 @@ msgid "Invalid API key. Maximum length is 255 characters."
 msgstr "�еверный ключ API. Мак�имальна� длина �о�тавл�ет 255 �имволов."
 
 #. TRANS: Fieldset legend in administration panel for bit.ly username and API key.
-#, fuzzy
 msgctxt "LEGEND"
 msgid "Credentials"
 msgstr "Полномочи�"
diff --git a/plugins/BitlyUrl/locale/sv/LC_MESSAGES/BitlyUrl.po b/plugins/BitlyUrl/locale/sv/LC_MESSAGES/BitlyUrl.po
index 328ba5d9e1..78f1d14ad8 100644
--- a/plugins/BitlyUrl/locale/sv/LC_MESSAGES/BitlyUrl.po
+++ b/plugins/BitlyUrl/locale/sv/LC_MESSAGES/BitlyUrl.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - BitlyUrl to Swedish (Svenska)
+# Translation of StatusNet - BitlyUrl to Swedish (svenska)
 # Exported from translatewiki.net
 #
 # Author: Jamminjohn
@@ -10,14 +10,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BitlyUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:44+0000\n"
-"Language-Team: Swedish <http://translatewiki.net/wiki/Portal:sv>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:48+0000\n"
+"Language-Team: Swedish <https://translatewiki.net/wiki/Portal:sv>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:26:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-12-03 13:48:51+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: sv\n"
 "X-Message-Group: #out-statusnet-plugin-bitlyurl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/BitlyUrl/locale/tl/LC_MESSAGES/BitlyUrl.po b/plugins/BitlyUrl/locale/tl/LC_MESSAGES/BitlyUrl.po
index 4d0b40c892..b9763d0bff 100644
--- a/plugins/BitlyUrl/locale/tl/LC_MESSAGES/BitlyUrl.po
+++ b/plugins/BitlyUrl/locale/tl/LC_MESSAGES/BitlyUrl.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BitlyUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:44+0000\n"
-"Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:48+0000\n"
+"Language-Team: Tagalog <https://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:26:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-12-03 13:48:51+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-bitlyurl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/BitlyUrl/locale/uk/LC_MESSAGES/BitlyUrl.po b/plugins/BitlyUrl/locale/uk/LC_MESSAGES/BitlyUrl.po
index 9123f575ee..6adb4c883b 100644
--- a/plugins/BitlyUrl/locale/uk/LC_MESSAGES/BitlyUrl.po
+++ b/plugins/BitlyUrl/locale/uk/LC_MESSAGES/BitlyUrl.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - BitlyUrl to Ukrainian (Україн�ька)
+# Translation of StatusNet - BitlyUrl to Ukrainian (україн�ька)
 # Exported from translatewiki.net
 #
 # Author: Boogie
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BitlyUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:44+0000\n"
-"Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:48+0000\n"
+"Language-Team: Ukrainian <https://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:26:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-12-03 13:48:51+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-bitlyurl\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
diff --git a/plugins/Blacklist/BlacklistPlugin.php b/plugins/Blacklist/BlacklistPlugin.php
index babf703131..e0d2a04dd8 100644
--- a/plugins/Blacklist/BlacklistPlugin.php
+++ b/plugins/Blacklist/BlacklistPlugin.php
@@ -505,14 +505,16 @@ class BlacklistPlugin extends Plugin
             }
         }
 
-        $nickname = strtolower($actor->poco->preferredUsername);
+        if (!empty($actor->poco)) {
+            $nickname = strtolower($actor->poco->preferredUsername);
 
-        if (!empty($nickname)) {
-            if (!$this->_checkNickname($nickname)) {
-                // TRANS: Exception thrown trying to post a notice while having a blocked nickname. %s is the blocked nickname.
-                $msg = sprintf(_m("Notices from nickname \"%s\" disallowed."),
-                               $nickname);
-                throw new ClientException($msg);
+            if (!empty($nickname)) {
+                if (!$this->_checkNickname($nickname)) {
+                    // TRANS: Exception thrown trying to post a notice while having a blocked nickname. %s is the blocked nickname.
+                    $msg = sprintf(_m("Notices from nickname \"%s\" are disallowed."),
+                                   $nickname);
+                    throw new ClientException($msg);
+                }
             }
         }
 
diff --git a/plugins/Blacklist/locale/Blacklist.pot b/plugins/Blacklist/locale/Blacklist.pot
index b2a0f4634a..5067ce90d4 100644
--- a/plugins/Blacklist/locale/Blacklist.pot
+++ b/plugins/Blacklist/locale/Blacklist.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -82,19 +82,19 @@ msgstr ""
 
 #. TRANS: Exception thrown trying to post a notice while having set a blocked homepage URL. %s is the blocked URL.
 #. TRANS: Client exception thrown trying to subscribe to a person with a blocked homepage or site URL. %s is the blocked URL.
-#: BlacklistPlugin.php:502 BlacklistPlugin.php:537
+#: BlacklistPlugin.php:502 BlacklistPlugin.php:539
 #, php-format
 msgid "Users from \"%s\" are blocked."
 msgstr ""
 
 #. TRANS: Exception thrown trying to post a notice while having a blocked nickname. %s is the blocked nickname.
-#: BlacklistPlugin.php:513
+#: BlacklistPlugin.php:514
 #, php-format
-msgid "Notices from nickname \"%s\" disallowed."
+msgid "Notices from nickname \"%s\" are disallowed."
 msgstr ""
 
 #. TRANS: Client exception thrown trying to subscribe to a person with a blocked nickname. %s is the blocked nickname.
-#: BlacklistPlugin.php:548
+#: BlacklistPlugin.php:550
 #, php-format
 msgid "Cannot subscribe to nickname \"%s\"."
 msgstr ""
diff --git a/plugins/Blacklist/locale/be-tarask/LC_MESSAGES/Blacklist.po b/plugins/Blacklist/locale/be-tarask/LC_MESSAGES/Blacklist.po
index acd9cdbaf7..f5a134b132 100644
--- a/plugins/Blacklist/locale/be-tarask/LC_MESSAGES/Blacklist.po
+++ b/plugins/Blacklist/locale/be-tarask/LC_MESSAGES/Blacklist.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Blacklist to Belarusian (Taraškievica orthography) (‪Белару�ка� (тарашкевіца)‬)
+# Translation of StatusNet - Blacklist to Belarusian (Taraškievica orthography) (‪белару�ка� (тарашкевіца)‬)
 # Exported from translatewiki.net
 #
 # Author: EugeneZelenko
@@ -10,15 +10,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Blacklist\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:46+0000\n"
-"Language-Team: Belarusian (Taraškievica orthography) <http://translatewiki."
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:48+0000\n"
+"Language-Team: Belarusian (Taraškievica orthography) <https://translatewiki."
 "net/wiki/Portal:be-tarask>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:26:01+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2012-03-01 18:55:46+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: be-tarask\n"
 "X-Message-Group: #out-statusnet-plugin-blacklist\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -85,7 +85,7 @@ msgstr "Кары�тальнік з «%s» забл�каваны."
 
 #. TRANS: Exception thrown trying to post a notice while having a blocked nickname. %s is the blocked nickname.
 #, fuzzy, php-format
-msgid "Notices from nickname \"%s\" disallowed."
+msgid "Notices from nickname \"%s\" are disallowed."
 msgstr "Паведамленьні ад кары�тальніка «%s» забаронены�."
 
 #. TRANS: Client exception thrown trying to subscribe to a person with a blocked nickname. %s is the blocked nickname.
diff --git a/plugins/Blacklist/locale/ca/LC_MESSAGES/Blacklist.po b/plugins/Blacklist/locale/ca/LC_MESSAGES/Blacklist.po
index 75d2e2b677..36c0cd6b85 100644
--- a/plugins/Blacklist/locale/ca/LC_MESSAGES/Blacklist.po
+++ b/plugins/Blacklist/locale/ca/LC_MESSAGES/Blacklist.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Blacklist to Catalan (Català)
+# Translation of StatusNet - Blacklist to Catalan (català)
 # Exported from translatewiki.net
 #
 # Author: SMP
@@ -10,14 +10,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Blacklist\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:46+0000\n"
-"Language-Team: Catalan <http://translatewiki.net/wiki/Portal:ca>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:48+0000\n"
+"Language-Team: Catalan <https://translatewiki.net/wiki/Portal:ca>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:26:01+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2012-03-01 18:55:46+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ca\n"
 "X-Message-Group: #out-statusnet-plugin-blacklist\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -83,8 +83,8 @@ msgstr "S'han blocat els usuaris de «%s»."
 
 #. TRANS: Exception thrown trying to post a notice while having a blocked nickname. %s is the blocked nickname.
 #, php-format
-msgid "Notices from nickname \"%s\" disallowed."
-msgstr "No es permeten avisos del sobrenom «%s»."
+msgid "Notices from nickname \"%s\" are disallowed."
+msgstr "No es permeten els avisos del sobrenom «%s»."
 
 #. TRANS: Client exception thrown trying to subscribe to a person with a blocked nickname. %s is the blocked nickname.
 #, php-format
diff --git a/plugins/Blacklist/locale/de/LC_MESSAGES/Blacklist.po b/plugins/Blacklist/locale/de/LC_MESSAGES/Blacklist.po
index d77ee53d8a..70b89d13e2 100644
--- a/plugins/Blacklist/locale/de/LC_MESSAGES/Blacklist.po
+++ b/plugins/Blacklist/locale/de/LC_MESSAGES/Blacklist.po
@@ -3,6 +3,7 @@
 #
 # Author: Giftpflanze
 # Author: MF-Warburg
+# Author: PtM
 # Author: The Evil IP address
 # --
 # This file is distributed under the same license as the StatusNet package.
@@ -11,14 +12,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Blacklist\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:46+0000\n"
-"Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:49+0000\n"
+"Language-Team: German <https://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:26:01+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2012-03-01 18:55:46+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-blacklist\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -84,7 +85,7 @@ msgstr "Benutzer von „%s“ sind gesperrt."
 
 #. TRANS: Exception thrown trying to post a notice while having a blocked nickname. %s is the blocked nickname.
 #, php-format
-msgid "Notices from nickname \"%s\" disallowed."
+msgid "Notices from nickname \"%s\" are disallowed."
 msgstr "Beiträge vom Benutzernamen „%s“ sind nicht erlaubt."
 
 #. TRANS: Client exception thrown trying to subscribe to a person with a blocked nickname. %s is the blocked nickname.
diff --git a/plugins/Blacklist/locale/es/LC_MESSAGES/Blacklist.po b/plugins/Blacklist/locale/es/LC_MESSAGES/Blacklist.po
index c8e7e0682c..2491a9b4a9 100644
--- a/plugins/Blacklist/locale/es/LC_MESSAGES/Blacklist.po
+++ b/plugins/Blacklist/locale/es/LC_MESSAGES/Blacklist.po
@@ -1,6 +1,8 @@
-# Translation of StatusNet - Blacklist to Spanish (Español)
+# Translation of StatusNet - Blacklist to Spanish (español)
 # Exported from translatewiki.net
 #
+# Author: Armando-Martin
+# Author: Erchache2000
 # Author: Peter17
 # Author: Translationista
 # --
@@ -10,39 +12,41 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Blacklist\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-04-09 18:34+0000\n"
-"PO-Revision-Date: 2011-04-09 18:36:39+0000\n"
-"Language-Team: Spanish <http://translatewiki.net/wiki/Portal:es>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:49+0000\n"
+"Language-Team: Spanish <https://translatewiki.net/wiki/Portal:es>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:06:03+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r85732); Translate extension (2011-03-11)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2012-03-01 18:55:46+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-plugin-blacklist\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Exception thrown if the Blacklist plugin configuration is incorrect.
+#. TRANS: %1$s is a configuration section, %2$s is a configuration setting.
 #, php-format
 msgid "Unknown data type for config %1$s + %2$s."
-msgstr ""
+msgstr "Tipo de datos desconocidos para config  %1$s  +  %2$s ."
 
 #. TRANS: Validation failure for URL. %s is the URL.
-#, fuzzy, php-format
+#, php-format
 msgid "You may not register with homepage \"%s\"."
-msgstr "No puedes registrarte con la página principal '%s'."
+msgstr "No puedes registrate con la página de inicio \"%s\"."
 
 #. TRANS: Validation failure for nickname. %s is the nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "You may not register with nickname \"%s\"."
 msgstr "No puedes registrarte con el nombre de usuario '%s'."
 
 #. TRANS: Validation failure for URL. %s is the URL.
-#, fuzzy, php-format
+#, php-format
 msgid "You may not use homepage \"%s\"."
 msgstr "No puedes utilizar la página de inicio '%s'."
 
 #. TRANS: Validation failure for nickname. %s is the nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "You may not use nickname \"%s\"."
 msgstr "No puedes utilizar el nombre de usuario '%s'."
 
@@ -57,16 +61,14 @@ msgstr ""
 "Mantiene una lista negra de patrones de nombres de usuario y URL prohibidos."
 
 #. TRANS: Menu item in admin panel.
-#, fuzzy
 msgctxt "MENU"
 msgid "Blacklist"
 msgstr "Lista negra"
 
 #. TRANS: Tooltip for menu item in admin panel.
-#, fuzzy
 msgctxt "TOOLTIP"
 msgid "Blacklist configuration."
-msgstr "Configuración de lista negra"
+msgstr "Configuración de la lista negra."
 
 #. TRANS: Checkbox label in the blacklist user form.
 msgid "Add this nickname pattern to blacklist"
@@ -80,20 +82,19 @@ msgstr "Añadir este patrón de página principal a la lista negra"
 #. TRANS: Client exception thrown trying to subscribe to a person with a blocked homepage or site URL. %s is the blocked URL.
 #, php-format
 msgid "Users from \"%s\" are blocked."
-msgstr ""
+msgstr "Los usuarios de \" %s \" están bloqueados."
 
 #. TRANS: Exception thrown trying to post a notice while having a blocked nickname. %s is the blocked nickname.
 #, php-format
-msgid "Notices from nickname \"%s\" disallowed."
-msgstr ""
+msgid "Notices from nickname \"%s\" are disallowed."
+msgstr "No están permitidos los mensajes del alias \"%s\"."
 
 #. TRANS: Client exception thrown trying to subscribe to a person with a blocked nickname. %s is the blocked nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "Cannot subscribe to nickname \"%s\"."
-msgstr "No puedes utilizar el nombre de usuario '%s'."
+msgstr "No es posible suscribirse al usuario \" %s \"."
 
 #. TRANS: Title of blacklist plugin administration panel.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Blacklist"
 msgstr "Lista negra"
@@ -107,7 +108,6 @@ msgid "Nicknames"
 msgstr "Nombres de usuario"
 
 #. TRANS: Field title in blacklist plugin administration panel.
-#, fuzzy
 msgid "Patterns of nicknames to block, one per line."
 msgstr "Patrones de nombres de usuario a bloquear, uno por línea"
 
@@ -116,17 +116,14 @@ msgid "URLs"
 msgstr "URLs"
 
 #. TRANS: Field title in blacklist plugin administration panel.
-#, fuzzy
 msgid "Patterns of URLs to block, one per line."
 msgstr "Patrones de URL a bloquear, uno por línea"
 
 #. TRANS: Button text in blacklist plugin administration panel to save settings.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Guardar"
 
 #. TRANS: Button title in blacklist plugin administration panel to save settings.
-#, fuzzy
 msgid "Save site settings."
-msgstr "Guardar la configuración del sitio"
+msgstr "Guardar la configuración del sitio."
diff --git a/plugins/Blacklist/locale/eu/LC_MESSAGES/Blacklist.po b/plugins/Blacklist/locale/eu/LC_MESSAGES/Blacklist.po
new file mode 100644
index 0000000000..6903fcd244
--- /dev/null
+++ b/plugins/Blacklist/locale/eu/LC_MESSAGES/Blacklist.po
@@ -0,0 +1,123 @@
+# Translation of StatusNet - Blacklist to Basque (euskara)
+# Exported from translatewiki.net
+#
+# Author: Artsuaga
+# Author: Unai Fdz. de Betoño
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Blacklist\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:49+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2012-03-01 18:55:46+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Exception thrown if the Blacklist plugin configuration is incorrect.
+#. TRANS: %1$s is a configuration section, %2$s is a configuration setting.
+#, php-format
+msgid "Unknown data type for config %1$s + %2$s."
+msgstr "%1$s + %2$s konfiguratzeko datu modu ezezaguna."
+
+#. TRANS: Validation failure for URL. %s is the URL.
+#, php-format
+msgid "You may not register with homepage \"%s\"."
+msgstr "Ezin zara erregistratu \"%s\" hasera orriarekin."
+
+#. TRANS: Validation failure for nickname. %s is the nickname.
+#, php-format
+msgid "You may not register with nickname \"%s\"."
+msgstr "Ezin zara erregistratu \"%s\" goitizenarekin."
+
+#. TRANS: Validation failure for URL. %s is the URL.
+#, php-format
+msgid "You may not use homepage \"%s\"."
+msgstr "Ezin duzu \"%s\" hasera orria erabili."
+
+#. TRANS: Validation failure for nickname. %s is the nickname.
+#, php-format
+msgid "You may not use nickname \"%s\"."
+msgstr "Ezin duzu \"%s\" goitizena erabili."
+
+#. TRANS: Validation failure for URL. %s is the URL.
+#, php-format
+msgid "You may not use URL \"%s\" in notices."
+msgstr "Ezin duzu \"%s\" URLa erabili oharretan."
+
+#. TRANS: Plugin description.
+msgid "Keeps a blacklist of forbidden nickname and URL patterns."
+msgstr "Galerazitako goitizen eta URL ereduen zerrenda beltza mantentzen du."
+
+#. TRANS: Menu item in admin panel.
+msgctxt "MENU"
+msgid "Blacklist"
+msgstr "Zerrenda beltza"
+
+#. TRANS: Tooltip for menu item in admin panel.
+msgctxt "TOOLTIP"
+msgid "Blacklist configuration."
+msgstr "Zerrenda beltzaren konfigurazioa."
+
+#. TRANS: Checkbox label in the blacklist user form.
+msgid "Add this nickname pattern to blacklist"
+msgstr "Gehitu goitizen honen modukoak zerrenda beltzari."
+
+#. TRANS: Checkbox label in the blacklist user form.
+msgid "Add this homepage pattern to blacklist"
+msgstr "Gehitu hasera orri honen modukoak zerrenda beltzari"
+
+#. TRANS: Exception thrown trying to post a notice while having set a blocked homepage URL. %s is the blocked URL.
+#. TRANS: Client exception thrown trying to subscribe to a person with a blocked homepage or site URL. %s is the blocked URL.
+#, php-format
+msgid "Users from \"%s\" are blocked."
+msgstr "%s(e)ko erabiltzaileak blokeaturik daude."
+
+#. TRANS: Exception thrown trying to post a notice while having a blocked nickname. %s is the blocked nickname.
+#, php-format
+msgid "Notices from nickname \"%s\" are disallowed."
+msgstr "\"%s\" goitizenarekin idatzitako oharrak debekaturik daude."
+
+#. TRANS: Client exception thrown trying to subscribe to a person with a blocked nickname. %s is the blocked nickname.
+#, php-format
+msgid "Cannot subscribe to nickname \"%s\"."
+msgstr "Ezin da \"%s\" goitizenera harpidetu."
+
+#. TRANS: Title of blacklist plugin administration panel.
+msgctxt "TITLE"
+msgid "Blacklist"
+msgstr "Zerrenda beltza"
+
+#. TRANS: Instructions for blacklist plugin administration panel.
+msgid "Blacklisted URLs and nicknames"
+msgstr "Zerrenda beltzeko URL eta goitizenak"
+
+#. TRANS: Field label in blacklist plugin administration panel.
+msgid "Nicknames"
+msgstr "Goitizenak"
+
+#. TRANS: Field title in blacklist plugin administration panel.
+msgid "Patterns of nicknames to block, one per line."
+msgstr "Blokeatutako goitizenen ereduak, bat lerroko."
+
+#. TRANS: Field label in blacklist plugin administration panel.
+msgid "URLs"
+msgstr "URLak"
+
+#. TRANS: Field title in blacklist plugin administration panel.
+msgid "Patterns of URLs to block, one per line."
+msgstr "Blokeatutako URLen ereduak, bat lerroko."
+
+#. TRANS: Button text in blacklist plugin administration panel to save settings.
+msgctxt "BUTTON"
+msgid "Save"
+msgstr "Gorde"
+
+#. TRANS: Button title in blacklist plugin administration panel to save settings.
+msgid "Save site settings."
+msgstr "Gorde gunearen ezarpenak."
diff --git a/plugins/Blacklist/locale/fr/LC_MESSAGES/Blacklist.po b/plugins/Blacklist/locale/fr/LC_MESSAGES/Blacklist.po
index df776a878b..8f98242ebc 100644
--- a/plugins/Blacklist/locale/fr/LC_MESSAGES/Blacklist.po
+++ b/plugins/Blacklist/locale/fr/LC_MESSAGES/Blacklist.po
@@ -1,6 +1,7 @@
-# Translation of StatusNet - Blacklist to French (Français)
+# Translation of StatusNet - Blacklist to French (français)
 # Exported from translatewiki.net
 #
+# Author: Davidtsm
 # Author: Iketsi
 # Author: Peter17
 # Author: Verdy p
@@ -11,14 +12,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Blacklist\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:46+0000\n"
-"Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:49+0000\n"
+"Language-Team: French <https://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:26:01+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2012-03-01 18:55:46+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-blacklist\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
@@ -84,8 +85,8 @@ msgstr "Les utilisateurs de « %s » sont bloqués."
 
 #. TRANS: Exception thrown trying to post a notice while having a blocked nickname. %s is the blocked nickname.
 #, php-format
-msgid "Notices from nickname \"%s\" disallowed."
-msgstr "Messages de « %s » refusés."
+msgid "Notices from nickname \"%s\" are disallowed."
+msgstr " Notifications du pseudonyme « %s » ne sont plus autorisées."
 
 #. TRANS: Client exception thrown trying to subscribe to a person with a blocked nickname. %s is the blocked nickname.
 #, php-format
diff --git a/plugins/Blacklist/locale/gl/LC_MESSAGES/Blacklist.po b/plugins/Blacklist/locale/gl/LC_MESSAGES/Blacklist.po
index c805cf773c..4ac3b456ad 100644
--- a/plugins/Blacklist/locale/gl/LC_MESSAGES/Blacklist.po
+++ b/plugins/Blacklist/locale/gl/LC_MESSAGES/Blacklist.po
@@ -1,5 +1,5 @@
-# Translation of StatusNet - Blacklist to Galician (Galego)
-# Expored from translatewiki.net
+# Translation of StatusNet - Blacklist to Galician (galego)
+# Exported from translatewiki.net
 #
 # Author: Toliño
 # --
@@ -9,123 +9,118 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Blacklist\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:34+0000\n"
-"Language-Team: Galician <http://translatewiki.net/wiki/Portal:gl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:49+0000\n"
+"Language-Team: Galician <https://translatewiki.net/wiki/Portal:gl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2010-11-30 17:54:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2012-03-01 18:55:46+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: gl\n"
 "X-Message-Group: #out-statusnet-plugin-blacklist\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Exception thrown if the Blacklist plugin configuration is incorrect.
+#. TRANS: %1$s is a configuration section, %2$s is a configuration setting.
+#, php-format
+msgid "Unknown data type for config %1$s + %2$s."
+msgstr "Tipo de datos descoñecido para a configuración %1$s + %2$s."
+
 #. TRANS: Validation failure for URL. %s is the URL.
-#: BlacklistPlugin.php:149
 #, php-format
 msgid "You may not register with homepage \"%s\"."
-msgstr ""
+msgstr "Non se pode rexistrar coa páxina de inicio \"%s\"."
 
 #. TRANS: Validation failure for nickname. %s is the nickname.
-#: BlacklistPlugin.php:160
 #, php-format
 msgid "You may not register with nickname \"%s\"."
-msgstr ""
+msgstr "Non se pode rexistrar co alcume \"%s\"."
 
 #. TRANS: Validation failure for URL. %s is the URL.
-#: BlacklistPlugin.php:185
 #, php-format
 msgid "You may not use homepage \"%s\"."
-msgstr ""
+msgstr "Non pode usar a páxina de inicio \"%s\"."
 
 #. TRANS: Validation failure for nickname. %s is the nickname.
-#: BlacklistPlugin.php:196
 #, php-format
 msgid "You may not use nickname \"%s\"."
-msgstr ""
+msgstr "Non pode usar o alcume \"%s\"."
 
 #. TRANS: Validation failure for URL. %s is the URL.
-#: BlacklistPlugin.php:239
 #, php-format
 msgid "You may not use URL \"%s\" in notices."
-msgstr ""
+msgstr "Non pode usar o enderezo URL \"%s\" nas notas."
 
-#: BlacklistPlugin.php:343
+#. TRANS: Plugin description.
 msgid "Keeps a blacklist of forbidden nickname and URL patterns."
 msgstr ""
+"Mantén unha lista negra cos patróns de alcumes e de enderezos URL prohibidos."
 
 #. TRANS: Menu item in admin panel.
-#: BlacklistPlugin.php:381
-#, fuzzy
 msgctxt "MENU"
 msgid "Blacklist"
 msgstr "Lista negra"
 
 #. TRANS: Tooltip for menu item in admin panel.
-#: BlacklistPlugin.php:383
-#, fuzzy
 msgctxt "TOOLTIP"
-msgid "Blacklist configuration"
-msgstr "Configuración da lista negra"
+msgid "Blacklist configuration."
+msgstr "Configuración da lista negra."
 
-#. TRANS: Checkbox with text label in the delete user form.
-#: BlacklistPlugin.php:410
+#. TRANS: Checkbox label in the blacklist user form.
 msgid "Add this nickname pattern to blacklist"
-msgstr ""
+msgstr "Engadir o patrón deste alcume á lista negra"
 
-#. TRANS: Checkbox with text label in the delete user form.
-#: BlacklistPlugin.php:420
+#. TRANS: Checkbox label in the blacklist user form.
 msgid "Add this homepage pattern to blacklist"
-msgstr ""
+msgstr "Engadir o patrón desta páxina de inicio á lista negra"
 
 #. TRANS: Exception thrown trying to post a notice while having set a blocked homepage URL. %s is the blocked URL.
 #. TRANS: Client exception thrown trying to subscribe to a person with a blocked homepage or site URL. %s is the blocked URL.
-#: BlacklistPlugin.php:499 BlacklistPlugin.php:534
 #, php-format
-msgid "Users from \"%s\" blocked."
-msgstr ""
+msgid "Users from \"%s\" are blocked."
+msgstr "Os usuarios de \"%s\" están bloqueados."
 
 #. TRANS: Exception thrown trying to post a notice while having a blocked nickname. %s is the blocked nickname.
-#: BlacklistPlugin.php:510
 #, php-format
-msgid "Posts from nickname \"%s\" disallowed."
-msgstr ""
+msgid "Notices from nickname \"%s\" are disallowed."
+msgstr "As notas do alcume \"%s\" non están permitidas."
 
 #. TRANS: Client exception thrown trying to subscribe to a person with a blocked nickname. %s is the blocked nickname.
-#: BlacklistPlugin.php:545
 #, php-format
-msgid "Can't subscribe to nickname \"%s\"."
-msgstr ""
+msgid "Cannot subscribe to nickname \"%s\"."
+msgstr "Non pode subscribirse ao alcume \"%s\"."
 
-#: blacklistadminpanel.php:52
+#. TRANS: Title of blacklist plugin administration panel.
+msgctxt "TITLE"
 msgid "Blacklist"
 msgstr "Lista negra"
 
-#: blacklistadminpanel.php:62
+#. TRANS: Instructions for blacklist plugin administration panel.
 msgid "Blacklisted URLs and nicknames"
-msgstr ""
+msgstr "Enderezos URL e alcumes na lista negra"
 
-#: blacklistadminpanel.php:174
+#. TRANS: Field label in blacklist plugin administration panel.
 msgid "Nicknames"
 msgstr "Alcumes"
 
-#: blacklistadminpanel.php:176
-msgid "Patterns of nicknames to block, one per line"
-msgstr ""
+#. TRANS: Field title in blacklist plugin administration panel.
+msgid "Patterns of nicknames to block, one per line."
+msgstr "Patróns de alcumes a bloquear, un por liña."
 
-#: blacklistadminpanel.php:182
+#. TRANS: Field label in blacklist plugin administration panel.
 msgid "URLs"
 msgstr "Enderezos URL"
 
-#: blacklistadminpanel.php:184
-msgid "Patterns of URLs to block, one per line"
-msgstr ""
+#. TRANS: Field title in blacklist plugin administration panel.
+msgid "Patterns of URLs to block, one per line."
+msgstr "Patróns de enderezos URL a bloquear, un por liña."
 
-#: blacklistadminpanel.php:198
+#. TRANS: Button text in blacklist plugin administration panel to save settings.
+msgctxt "BUTTON"
 msgid "Save"
 msgstr "Gardar"
 
-#: blacklistadminpanel.php:201
-msgid "Save site settings"
-msgstr "Gardar a configuración do sitio"
+#. TRANS: Button title in blacklist plugin administration panel to save settings.
+msgid "Save site settings."
+msgstr "Gardar a configuración do sitio."
diff --git a/plugins/Blacklist/locale/ia/LC_MESSAGES/Blacklist.po b/plugins/Blacklist/locale/ia/LC_MESSAGES/Blacklist.po
index af110d44f6..e225498c41 100644
--- a/plugins/Blacklist/locale/ia/LC_MESSAGES/Blacklist.po
+++ b/plugins/Blacklist/locale/ia/LC_MESSAGES/Blacklist.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Blacklist to Interlingua (Interlingua)
+# Translation of StatusNet - Blacklist to Interlingua (interlingua)
 # Exported from translatewiki.net
 #
 # Author: McDutchie
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Blacklist\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:46+0000\n"
-"Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:49+0000\n"
+"Language-Team: Interlingua <https://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:26:01+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2012-03-01 18:55:46+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-blacklist\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -83,8 +83,8 @@ msgstr "Le usatores de \"%s\" es blocate."
 
 #. TRANS: Exception thrown trying to post a notice while having a blocked nickname. %s is the blocked nickname.
 #, php-format
-msgid "Notices from nickname \"%s\" disallowed."
-msgstr "Notas del pseudonymo \"%s\" non permittite."
+msgid "Notices from nickname \"%s\" are disallowed."
+msgstr "Le notas del pseudonymo \"%s\" non es permittite."
 
 #. TRANS: Client exception thrown trying to subscribe to a person with a blocked nickname. %s is the blocked nickname.
 #, php-format
diff --git a/plugins/Blacklist/locale/it/LC_MESSAGES/Blacklist.po b/plugins/Blacklist/locale/it/LC_MESSAGES/Blacklist.po
new file mode 100644
index 0000000000..29bccd5609
--- /dev/null
+++ b/plugins/Blacklist/locale/it/LC_MESSAGES/Blacklist.po
@@ -0,0 +1,123 @@
+# Translation of StatusNet - Blacklist to Italian (italiano)
+# Exported from translatewiki.net
+#
+# Author: Od1n
+# Author: Ximo17
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Blacklist\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:49+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2012-03-01 18:55:46+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Exception thrown if the Blacklist plugin configuration is incorrect.
+#. TRANS: %1$s is a configuration section, %2$s is a configuration setting.
+#, php-format
+msgid "Unknown data type for config %1$s + %2$s."
+msgstr "Tipo dati sconosciuto per config %1$s + %2$s."
+
+#. TRANS: Validation failure for URL. %s is the URL.
+#, php-format
+msgid "You may not register with homepage \"%s\"."
+msgstr "Impossibile registrarsi con la homepage \"%s\"."
+
+#. TRANS: Validation failure for nickname. %s is the nickname.
+#, php-format
+msgid "You may not register with nickname \"%s\"."
+msgstr "Impossibile registrarsi con il nickname \"%s\"."
+
+#. TRANS: Validation failure for URL. %s is the URL.
+#, php-format
+msgid "You may not use homepage \"%s\"."
+msgstr "Impossibile utilizzare la homepage \"%s\"."
+
+#. TRANS: Validation failure for nickname. %s is the nickname.
+#, php-format
+msgid "You may not use nickname \"%s\"."
+msgstr "Non è possibile utilizzare il nickname \"%s\"."
+
+#. TRANS: Validation failure for URL. %s is the URL.
+#, php-format
+msgid "You may not use URL \"%s\" in notices."
+msgstr "Impossibile utilizzare la URL \"%s\" nelle notizie."
+
+#. TRANS: Plugin description.
+msgid "Keeps a blacklist of forbidden nickname and URL patterns."
+msgstr "Mantiene una lista nera di nickname vietati e modelli di URL."
+
+#. TRANS: Menu item in admin panel.
+msgctxt "MENU"
+msgid "Blacklist"
+msgstr "Lista nera"
+
+#. TRANS: Tooltip for menu item in admin panel.
+msgctxt "TOOLTIP"
+msgid "Blacklist configuration."
+msgstr "Configurazione lista nera."
+
+#. TRANS: Checkbox label in the blacklist user form.
+msgid "Add this nickname pattern to blacklist"
+msgstr "Aggiungi questo modello di nickname alla lista nera"
+
+#. TRANS: Checkbox label in the blacklist user form.
+msgid "Add this homepage pattern to blacklist"
+msgstr "Aggiungi questo modello di homepage alla lista nera"
+
+#. TRANS: Exception thrown trying to post a notice while having set a blocked homepage URL. %s is the blocked URL.
+#. TRANS: Client exception thrown trying to subscribe to a person with a blocked homepage or site URL. %s is the blocked URL.
+#, php-format
+msgid "Users from \"%s\" are blocked."
+msgstr "Gli utenti provenienti da \" %s \" sono bloccati."
+
+#. TRANS: Exception thrown trying to post a notice while having a blocked nickname. %s is the blocked nickname.
+#, php-format
+msgid "Notices from nickname \"%s\" are disallowed."
+msgstr "Le notizie del nickname \"%s\" non sono consentite."
+
+#. TRANS: Client exception thrown trying to subscribe to a person with a blocked nickname. %s is the blocked nickname.
+#, php-format
+msgid "Cannot subscribe to nickname \"%s\"."
+msgstr "Impossibile iscriversi al nickname \"%s\"."
+
+#. TRANS: Title of blacklist plugin administration panel.
+msgctxt "TITLE"
+msgid "Blacklist"
+msgstr "Lista nera"
+
+#. TRANS: Instructions for blacklist plugin administration panel.
+msgid "Blacklisted URLs and nicknames"
+msgstr "Lista nera URL e nickname"
+
+#. TRANS: Field label in blacklist plugin administration panel.
+msgid "Nicknames"
+msgstr "Nickname"
+
+#. TRANS: Field title in blacklist plugin administration panel.
+msgid "Patterns of nicknames to block, one per line."
+msgstr "Modelli di nickname da bloccare, uno per riga."
+
+#. TRANS: Field label in blacklist plugin administration panel.
+msgid "URLs"
+msgstr "URL"
+
+#. TRANS: Field title in blacklist plugin administration panel.
+msgid "Patterns of URLs to block, one per line."
+msgstr "Modelli di URL da bloccare, uno per riga."
+
+#. TRANS: Button text in blacklist plugin administration panel to save settings.
+msgctxt "BUTTON"
+msgid "Save"
+msgstr "Salva"
+
+#. TRANS: Button title in blacklist plugin administration panel to save settings.
+msgid "Save site settings."
+msgstr "Salva le impostazioni del sito."
diff --git a/plugins/Blacklist/locale/mk/LC_MESSAGES/Blacklist.po b/plugins/Blacklist/locale/mk/LC_MESSAGES/Blacklist.po
index 79bd975b69..e64228ec21 100644
--- a/plugins/Blacklist/locale/mk/LC_MESSAGES/Blacklist.po
+++ b/plugins/Blacklist/locale/mk/LC_MESSAGES/Blacklist.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Blacklist to Macedonian (Македон�ки)
+# Translation of StatusNet - Blacklist to Macedonian (македон�ки)
 # Exported from translatewiki.net
 #
 # Author: Bjankuloski06
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Blacklist\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:46+0000\n"
-"Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:50+0000\n"
+"Language-Team: Macedonian <https://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:26:01+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2012-03-01 18:55:46+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-blacklist\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
@@ -82,7 +82,7 @@ msgstr "Кори�ниците од „%s“ �е блокирани."
 
 #. TRANS: Exception thrown trying to post a notice while having a blocked nickname. %s is the blocked nickname.
 #, php-format
-msgid "Notices from nickname \"%s\" disallowed."
+msgid "Notices from nickname \"%s\" are disallowed."
 msgstr "Забелешките од прекарот „%s“ не �е дозволени."
 
 #. TRANS: Client exception thrown trying to subscribe to a person with a blocked nickname. %s is the blocked nickname.
diff --git a/plugins/Blacklist/locale/nl/LC_MESSAGES/Blacklist.po b/plugins/Blacklist/locale/nl/LC_MESSAGES/Blacklist.po
index 55ca4641dc..9b2bddead7 100644
--- a/plugins/Blacklist/locale/nl/LC_MESSAGES/Blacklist.po
+++ b/plugins/Blacklist/locale/nl/LC_MESSAGES/Blacklist.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Blacklist\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:46+0000\n"
-"Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:50+0000\n"
+"Language-Team: Dutch <https://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:26:01+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2012-03-01 18:55:46+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-blacklist\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -82,7 +82,7 @@ msgstr "Gebruikers van \"%s\" zijn geblokkeerd."
 
 #. TRANS: Exception thrown trying to post a notice while having a blocked nickname. %s is the blocked nickname.
 #, php-format
-msgid "Notices from nickname \"%s\" disallowed."
+msgid "Notices from nickname \"%s\" are disallowed."
 msgstr "Gebruiker \"%s\" mag geen berichten plaatsen."
 
 #. TRANS: Client exception thrown trying to subscribe to a person with a blocked nickname. %s is the blocked nickname.
diff --git a/plugins/Blacklist/locale/ru/LC_MESSAGES/Blacklist.po b/plugins/Blacklist/locale/ru/LC_MESSAGES/Blacklist.po
index ce5af81d7a..4c12d881f8 100644
--- a/plugins/Blacklist/locale/ru/LC_MESSAGES/Blacklist.po
+++ b/plugins/Blacklist/locale/ru/LC_MESSAGES/Blacklist.po
@@ -1,7 +1,8 @@
-# Translation of StatusNet - Blacklist to Russian (Ру��кий)
+# Translation of StatusNet - Blacklist to Russian (ру��кий)
 # Exported from translatewiki.net
 #
 # Author: Eleferen
+# Author: Express2000
 # Author: Lockal
 # --
 # This file is distributed under the same license as the StatusNet package.
@@ -10,14 +11,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Blacklist\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:46+0000\n"
-"Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:50+0000\n"
+"Language-Team: Russian <https://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:26:01+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2012-03-01 18:55:46+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-blacklist\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
@@ -65,10 +66,9 @@ msgid "Blacklist"
 msgstr "Чёрный �пи�ок"
 
 #. TRANS: Tooltip for menu item in admin panel.
-#, fuzzy
 msgctxt "TOOLTIP"
 msgid "Blacklist configuration."
-msgstr "Конфигураци� чёрного �пи�ка"
+msgstr "Конфигураци� чёрного �пи�ка."
 
 #. TRANS: Checkbox label in the blacklist user form.
 msgid "Add this nickname pattern to blacklist"
@@ -85,9 +85,9 @@ msgid "Users from \"%s\" are blocked."
 msgstr "Пользователи � «%s» заблокированы."
 
 #. TRANS: Exception thrown trying to post a notice while having a blocked nickname. %s is the blocked nickname.
-#, fuzzy, php-format
-msgid "Notices from nickname \"%s\" disallowed."
-msgstr "Сообщени� от имени «%s» не допу�кают��."
+#, php-format
+msgid "Notices from nickname \"%s\" are disallowed."
+msgstr "Сообщени� от имени \"%s\" не допу�кают��."
 
 #. TRANS: Client exception thrown trying to subscribe to a person with a blocked nickname. %s is the blocked nickname.
 #, fuzzy, php-format
@@ -95,7 +95,6 @@ msgid "Cannot subscribe to nickname \"%s\"."
 msgstr "�ельз� подпи�ать�� на пользовател� � именем «%s»."
 
 #. TRANS: Title of blacklist plugin administration panel.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Blacklist"
 msgstr "Чёрный �пи�ок"
@@ -123,12 +122,10 @@ msgid "Patterns of URLs to block, one per line."
 msgstr "Шаблоны URL-адре�ов дл� блокировки, по одному на �троку"
 
 #. TRANS: Button text in blacklist plugin administration panel to save settings.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Сохранить"
 
 #. TRANS: Button title in blacklist plugin administration panel to save settings.
-#, fuzzy
 msgid "Save site settings."
-msgstr "Сохранить на�тройки �айта"
+msgstr "Сохранить на�тройки �айта."
diff --git a/plugins/Blacklist/locale/sv/LC_MESSAGES/Blacklist.po b/plugins/Blacklist/locale/sv/LC_MESSAGES/Blacklist.po
index 0c54dfb744..2cabb3fdb1 100644
--- a/plugins/Blacklist/locale/sv/LC_MESSAGES/Blacklist.po
+++ b/plugins/Blacklist/locale/sv/LC_MESSAGES/Blacklist.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Blacklist to Swedish (Svenska)
+# Translation of StatusNet - Blacklist to Swedish (svenska)
 # Exported from translatewiki.net
 #
 # Author: Jamminjohn
@@ -10,14 +10,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Blacklist\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:46+0000\n"
-"Language-Team: Swedish <http://translatewiki.net/wiki/Portal:sv>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:50+0000\n"
+"Language-Team: Swedish <https://translatewiki.net/wiki/Portal:sv>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:26:01+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2012-03-01 18:55:46+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: sv\n"
 "X-Message-Group: #out-statusnet-plugin-blacklist\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -82,9 +82,9 @@ msgid "Users from \"%s\" are blocked."
 msgstr "Användare från \"%s\" är blockerade."
 
 #. TRANS: Exception thrown trying to post a notice while having a blocked nickname. %s is the blocked nickname.
-#, php-format
-msgid "Notices from nickname \"%s\" disallowed."
-msgstr ""
+#, fuzzy, php-format
+msgid "Notices from nickname \"%s\" are disallowed."
+msgstr "Användare från \"%s\" är blockerade."
 
 #. TRANS: Client exception thrown trying to subscribe to a person with a blocked nickname. %s is the blocked nickname.
 #, php-format
diff --git a/plugins/Blacklist/locale/tl/LC_MESSAGES/Blacklist.po b/plugins/Blacklist/locale/tl/LC_MESSAGES/Blacklist.po
index 451d0c435c..8e2156cba6 100644
--- a/plugins/Blacklist/locale/tl/LC_MESSAGES/Blacklist.po
+++ b/plugins/Blacklist/locale/tl/LC_MESSAGES/Blacklist.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Blacklist\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:46+0000\n"
-"Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:50+0000\n"
+"Language-Team: Tagalog <https://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:26:01+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2012-03-01 18:55:46+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-blacklist\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -84,8 +84,9 @@ msgstr "Hinahadlangan ang mga tagagamit na mula sa \"%s\"."
 
 #. TRANS: Exception thrown trying to post a notice while having a blocked nickname. %s is the blocked nickname.
 #, php-format
-msgid "Notices from nickname \"%s\" disallowed."
-msgstr "Hindi pinapayagan ang mga pabatid mula sa palayaw na \"%s\"."
+msgid "Notices from nickname \"%s\" are disallowed."
+msgstr ""
+"Hindi pinapahintulutan ang mga pabatid na nagmumula sa palayaw na \"%s\"."
 
 #. TRANS: Client exception thrown trying to subscribe to a person with a blocked nickname. %s is the blocked nickname.
 #, php-format
diff --git a/plugins/Blacklist/locale/uk/LC_MESSAGES/Blacklist.po b/plugins/Blacklist/locale/uk/LC_MESSAGES/Blacklist.po
index 58cbb46058..1667273a39 100644
--- a/plugins/Blacklist/locale/uk/LC_MESSAGES/Blacklist.po
+++ b/plugins/Blacklist/locale/uk/LC_MESSAGES/Blacklist.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Blacklist to Ukrainian (Україн�ька)
+# Translation of StatusNet - Blacklist to Ukrainian (україн�ька)
 # Exported from translatewiki.net
 #
 # Author: Boogie
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Blacklist\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:47+0000\n"
-"Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:50+0000\n"
+"Language-Team: Ukrainian <https://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:26:01+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2012-03-01 18:55:46+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-blacklist\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
@@ -82,8 +82,8 @@ msgid "Users from \"%s\" are blocked."
 msgstr "Кори�тувачів з «%s» заблоковано."
 
 #. TRANS: Exception thrown trying to post a notice while having a blocked nickname. %s is the blocked nickname.
-#, php-format
-msgid "Notices from nickname \"%s\" disallowed."
+#, fuzzy, php-format
+msgid "Notices from nickname \"%s\" are disallowed."
 msgstr "Допи�и від кори�тувача «%s» заборонені."
 
 #. TRANS: Client exception thrown trying to subscribe to a person with a blocked nickname. %s is the blocked nickname.
diff --git a/plugins/Blacklist/locale/zh_CN/LC_MESSAGES/Blacklist.po b/plugins/Blacklist/locale/zh_CN/LC_MESSAGES/Blacklist.po
index 1e45831f20..ac2835adff 100644
--- a/plugins/Blacklist/locale/zh_CN/LC_MESSAGES/Blacklist.po
+++ b/plugins/Blacklist/locale/zh_CN/LC_MESSAGES/Blacklist.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Blacklist to Simplified Chinese (‪中文(简体)‬)
+# Translation of StatusNet - Blacklist to Simplified Chinese (‪中文（简体）‬)
 # Exported from translatewiki.net
 #
 # Author: Chenxiaoqino
@@ -10,15 +10,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Blacklist\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:47+0000\n"
-"Language-Team: Simplified Chinese <http://translatewiki.net/wiki/Portal:zh-"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:50+0000\n"
+"Language-Team: Simplified Chinese <https://translatewiki.net/wiki/Portal:zh-"
 "hans>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:26:01+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2012-03-01 18:55:46+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: #out-statusnet-plugin-blacklist\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
@@ -85,7 +85,7 @@ msgstr ""
 
 #. TRANS: Exception thrown trying to post a notice while having a blocked nickname. %s is the blocked nickname.
 #, php-format
-msgid "Notices from nickname \"%s\" disallowed."
+msgid "Notices from nickname \"%s\" are disallowed."
 msgstr ""
 
 #. TRANS: Client exception thrown trying to subscribe to a person with a blocked nickname. %s is the blocked nickname.
diff --git a/plugins/BlankAd/locale/BlankAd.pot b/plugins/BlankAd/locale/BlankAd.pot
index f807164565..88aead89fb 100644
--- a/plugins/BlankAd/locale/BlankAd.pot
+++ b/plugins/BlankAd/locale/BlankAd.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
+"POT-Creation-Date: 2012-06-30 11:07+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"
diff --git a/plugins/BlankAd/locale/ast/LC_MESSAGES/BlankAd.po b/plugins/BlankAd/locale/ast/LC_MESSAGES/BlankAd.po
new file mode 100644
index 0000000000..fd55a4b932
--- /dev/null
+++ b/plugins/BlankAd/locale/ast/LC_MESSAGES/BlankAd.po
@@ -0,0 +1,26 @@
+# Translation of StatusNet - BlankAd to Asturian (asturianu)
+# Exported from translatewiki.net
+#
+# Author: Xuacu
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - BlankAd\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:51+0000\n"
+"Language-Team: Asturian <https://translatewiki.net/wiki/Portal:ast>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:49:49+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: ast\n"
+"X-Message-Group: #out-statusnet-plugin-blankad\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin description.
+msgid "Plugin for testing ad layout."
+msgstr "Complementu pa probar la maquetación de publicidad."
diff --git a/plugins/BlankAd/locale/be-tarask/LC_MESSAGES/BlankAd.po b/plugins/BlankAd/locale/be-tarask/LC_MESSAGES/BlankAd.po
index 5a4dff714c..e529fa8b2a 100644
--- a/plugins/BlankAd/locale/be-tarask/LC_MESSAGES/BlankAd.po
+++ b/plugins/BlankAd/locale/be-tarask/LC_MESSAGES/BlankAd.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - BlankAd to Belarusian (Taraškievica orthography) (‪Белару�ка� (тарашкевіца)‬)
+# Translation of StatusNet - BlankAd to Belarusian (Taraškievica orthography) (‪белару�ка� (тарашкевіца)‬)
 # Exported from translatewiki.net
 #
 # Author: EugeneZelenko
@@ -9,15 +9,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BlankAd\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:47+0000\n"
-"Language-Team: Belarusian (Taraškievica orthography) <http://translatewiki."
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:51+0000\n"
+"Language-Team: Belarusian (Taraškievica orthography) <https://translatewiki."
 "net/wiki/Portal:be-tarask>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-16 23:17:21+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:49:49+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: be-tarask\n"
 "X-Message-Group: #out-statusnet-plugin-blankad\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/BlankAd/locale/br/LC_MESSAGES/BlankAd.po b/plugins/BlankAd/locale/br/LC_MESSAGES/BlankAd.po
index 5c87e00b22..4f875d53bd 100644
--- a/plugins/BlankAd/locale/br/LC_MESSAGES/BlankAd.po
+++ b/plugins/BlankAd/locale/br/LC_MESSAGES/BlankAd.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - BlankAd to Breton (Brezhoneg)
+# Translation of StatusNet - BlankAd to Breton (brezhoneg)
 # Exported from translatewiki.net
 #
 # Author: Fulup
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BlankAd\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:47+0000\n"
-"Language-Team: Breton <http://translatewiki.net/wiki/Portal:br>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:51+0000\n"
+"Language-Team: Breton <https://translatewiki.net/wiki/Portal:br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-16 23:17:21+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:49:49+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-blankad\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
diff --git a/plugins/BlankAd/locale/de/LC_MESSAGES/BlankAd.po b/plugins/BlankAd/locale/de/LC_MESSAGES/BlankAd.po
index 08478086db..be90d8d6c1 100644
--- a/plugins/BlankAd/locale/de/LC_MESSAGES/BlankAd.po
+++ b/plugins/BlankAd/locale/de/LC_MESSAGES/BlankAd.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BlankAd\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:47+0000\n"
-"Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:51+0000\n"
+"Language-Team: German <https://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-16 23:17:21+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:49:49+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-blankad\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/BlankAd/locale/es/LC_MESSAGES/BlankAd.po b/plugins/BlankAd/locale/es/LC_MESSAGES/BlankAd.po
index c9031c9332..ab96b1c22b 100644
--- a/plugins/BlankAd/locale/es/LC_MESSAGES/BlankAd.po
+++ b/plugins/BlankAd/locale/es/LC_MESSAGES/BlankAd.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - BlankAd to Spanish (Español)
+# Translation of StatusNet - BlankAd to Spanish (español)
 # Exported from translatewiki.net
 #
 # Author: Translationista
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BlankAd\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:47+0000\n"
-"Language-Team: Spanish <http://translatewiki.net/wiki/Portal:es>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:51+0000\n"
+"Language-Team: Spanish <https://translatewiki.net/wiki/Portal:es>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-16 23:17:21+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:49:49+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-plugin-blankad\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/BlankAd/locale/eu/LC_MESSAGES/BlankAd.po b/plugins/BlankAd/locale/eu/LC_MESSAGES/BlankAd.po
new file mode 100644
index 0000000000..fa577f0a53
--- /dev/null
+++ b/plugins/BlankAd/locale/eu/LC_MESSAGES/BlankAd.po
@@ -0,0 +1,23 @@
+# Translation of StatusNet - BlankAd to Basque (euskara)
+# Exported from translatewiki.net
+#
+# Author: Artsuaga
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - BlankAd\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:51+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:49:49+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin description.
+msgid "Plugin for testing ad layout."
+msgstr "Iragarkien maketatzea probatzeko plugina."
diff --git a/plugins/BlankAd/locale/fi/LC_MESSAGES/BlankAd.po b/plugins/BlankAd/locale/fi/LC_MESSAGES/BlankAd.po
index 19de5c90bc..9558fb2f8b 100644
--- a/plugins/BlankAd/locale/fi/LC_MESSAGES/BlankAd.po
+++ b/plugins/BlankAd/locale/fi/LC_MESSAGES/BlankAd.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - BlankAd to Finnish (Suomi)
+# Translation of StatusNet - BlankAd to Finnish (suomi)
 # Exported from translatewiki.net
 #
 # Author: XTL
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BlankAd\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:47+0000\n"
-"Language-Team: Finnish <http://translatewiki.net/wiki/Portal:fi>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:51+0000\n"
+"Language-Team: Finnish <https://translatewiki.net/wiki/Portal:fi>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-16 23:17:21+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:49:49+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: fi\n"
 "X-Message-Group: #out-statusnet-plugin-blankad\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/BlankAd/locale/fr/LC_MESSAGES/BlankAd.po b/plugins/BlankAd/locale/fr/LC_MESSAGES/BlankAd.po
index 523e07cad7..ce14d5cc70 100644
--- a/plugins/BlankAd/locale/fr/LC_MESSAGES/BlankAd.po
+++ b/plugins/BlankAd/locale/fr/LC_MESSAGES/BlankAd.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - BlankAd to French (Français)
+# Translation of StatusNet - BlankAd to French (français)
 # Exported from translatewiki.net
 #
 # Author: Peter17
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BlankAd\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:47+0000\n"
-"Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:51+0000\n"
+"Language-Team: French <https://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-16 23:17:21+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:49:49+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-blankad\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
diff --git a/plugins/BlankAd/locale/gl/LC_MESSAGES/BlankAd.po b/plugins/BlankAd/locale/gl/LC_MESSAGES/BlankAd.po
new file mode 100644
index 0000000000..c149c77891
--- /dev/null
+++ b/plugins/BlankAd/locale/gl/LC_MESSAGES/BlankAd.po
@@ -0,0 +1,26 @@
+# Translation of StatusNet - BlankAd to Galician (galego)
+# Exported from translatewiki.net
+#
+# Author: Toliño
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - BlankAd\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:51+0000\n"
+"Language-Team: Galician <https://translatewiki.net/wiki/Portal:gl>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:49:49+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: gl\n"
+"X-Message-Group: #out-statusnet-plugin-blankad\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin description.
+msgid "Plugin for testing ad layout."
+msgstr "Complemento para probar o deseño dos anuncios."
diff --git a/plugins/BlankAd/locale/he/LC_MESSAGES/BlankAd.po b/plugins/BlankAd/locale/he/LC_MESSAGES/BlankAd.po
index 1113b24997..2a59af8861 100644
--- a/plugins/BlankAd/locale/he/LC_MESSAGES/BlankAd.po
+++ b/plugins/BlankAd/locale/he/LC_MESSAGES/BlankAd.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BlankAd\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:47+0000\n"
-"Language-Team: Hebrew <http://translatewiki.net/wiki/Portal:he>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:51+0000\n"
+"Language-Team: Hebrew <https://translatewiki.net/wiki/Portal:he>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-16 23:17:21+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:49:49+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: he\n"
 "X-Message-Group: #out-statusnet-plugin-blankad\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/BlankAd/locale/ia/LC_MESSAGES/BlankAd.po b/plugins/BlankAd/locale/ia/LC_MESSAGES/BlankAd.po
index da77ae6b32..66ea2f981a 100644
--- a/plugins/BlankAd/locale/ia/LC_MESSAGES/BlankAd.po
+++ b/plugins/BlankAd/locale/ia/LC_MESSAGES/BlankAd.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - BlankAd to Interlingua (Interlingua)
+# Translation of StatusNet - BlankAd to Interlingua (interlingua)
 # Exported from translatewiki.net
 #
 # Author: McDutchie
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BlankAd\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:47+0000\n"
-"Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:51+0000\n"
+"Language-Team: Interlingua <https://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-16 23:17:21+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:49:49+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-blankad\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/BlankAd/locale/it/LC_MESSAGES/BlankAd.po b/plugins/BlankAd/locale/it/LC_MESSAGES/BlankAd.po
new file mode 100644
index 0000000000..5ed34d084b
--- /dev/null
+++ b/plugins/BlankAd/locale/it/LC_MESSAGES/BlankAd.po
@@ -0,0 +1,23 @@
+# Translation of StatusNet - BlankAd to Italian (italiano)
+# Exported from translatewiki.net
+#
+# Author: Ximo17
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - BlankAd\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:52+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:49:49+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin description.
+msgid "Plugin for testing ad layout."
+msgstr "Plugin per le prove e il layout."
diff --git a/plugins/BlankAd/locale/mk/LC_MESSAGES/BlankAd.po b/plugins/BlankAd/locale/mk/LC_MESSAGES/BlankAd.po
index b00d92265d..ab3741a61b 100644
--- a/plugins/BlankAd/locale/mk/LC_MESSAGES/BlankAd.po
+++ b/plugins/BlankAd/locale/mk/LC_MESSAGES/BlankAd.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - BlankAd to Macedonian (Македон�ки)
+# Translation of StatusNet - BlankAd to Macedonian (македон�ки)
 # Exported from translatewiki.net
 #
 # Author: Bjankuloski06
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BlankAd\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:47+0000\n"
-"Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:52+0000\n"
+"Language-Team: Macedonian <https://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-16 23:17:21+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:49:49+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-blankad\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
diff --git a/plugins/BlankAd/locale/nb/LC_MESSAGES/BlankAd.po b/plugins/BlankAd/locale/nb/LC_MESSAGES/BlankAd.po
index 73e5204ed4..705619520f 100644
--- a/plugins/BlankAd/locale/nb/LC_MESSAGES/BlankAd.po
+++ b/plugins/BlankAd/locale/nb/LC_MESSAGES/BlankAd.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - BlankAd to Norwegian (bokmål)‬ (‪Norsk (bokmål)‬)
+# Translation of StatusNet - BlankAd to Norwegian Bokmål (‪norsk (bokmål)‬)
 # Exported from translatewiki.net
 #
 # Author: Nghtwlkr
@@ -9,15 +9,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BlankAd\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:48+0000\n"
-"Language-Team: Norwegian (bokmål)‬ <http://translatewiki.net/wiki/Portal:no>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:52+0000\n"
+"Language-Team: Norwegian Bokmål <https://translatewiki.net/wiki/Portal:nb>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-16 23:17:21+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
-"X-Language-Code: no\n"
+"X-POT-Import-Date: 2011-06-05 21:49:49+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: nb\n"
 "X-Message-Group: #out-statusnet-plugin-blankad\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
diff --git a/plugins/BlankAd/locale/nl/LC_MESSAGES/BlankAd.po b/plugins/BlankAd/locale/nl/LC_MESSAGES/BlankAd.po
index 55dc78059b..dc9397533e 100644
--- a/plugins/BlankAd/locale/nl/LC_MESSAGES/BlankAd.po
+++ b/plugins/BlankAd/locale/nl/LC_MESSAGES/BlankAd.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BlankAd\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:47+0000\n"
-"Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:52+0000\n"
+"Language-Team: Dutch <https://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-16 23:17:21+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:49:49+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-blankad\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/BlankAd/locale/pt/LC_MESSAGES/BlankAd.po b/plugins/BlankAd/locale/pt/LC_MESSAGES/BlankAd.po
index ab8827cb39..d0e3e64d50 100644
--- a/plugins/BlankAd/locale/pt/LC_MESSAGES/BlankAd.po
+++ b/plugins/BlankAd/locale/pt/LC_MESSAGES/BlankAd.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - BlankAd to Portuguese (Português)
+# Translation of StatusNet - BlankAd to Portuguese (português)
 # Exported from translatewiki.net
 #
 # Author: GTNS
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BlankAd\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:48+0000\n"
-"Language-Team: Portuguese <http://translatewiki.net/wiki/Portal:pt>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:52+0000\n"
+"Language-Team: Portuguese <https://translatewiki.net/wiki/Portal:pt>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-16 23:17:21+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:49:49+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: pt\n"
 "X-Message-Group: #out-statusnet-plugin-blankad\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/BlankAd/locale/ru/LC_MESSAGES/BlankAd.po b/plugins/BlankAd/locale/ru/LC_MESSAGES/BlankAd.po
index b9fb5994d0..8cea34abfa 100644
--- a/plugins/BlankAd/locale/ru/LC_MESSAGES/BlankAd.po
+++ b/plugins/BlankAd/locale/ru/LC_MESSAGES/BlankAd.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - BlankAd to Russian (Ру��кий)
+# Translation of StatusNet - BlankAd to Russian (ру��кий)
 # Exported from translatewiki.net
 #
 # Author: Eleferen
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BlankAd\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:48+0000\n"
-"Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:52+0000\n"
+"Language-Team: Russian <https://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-16 23:17:21+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:49:49+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-blankad\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
diff --git a/plugins/BlankAd/locale/sv/LC_MESSAGES/BlankAd.po b/plugins/BlankAd/locale/sv/LC_MESSAGES/BlankAd.po
index 58464c28a5..b850a57a03 100644
--- a/plugins/BlankAd/locale/sv/LC_MESSAGES/BlankAd.po
+++ b/plugins/BlankAd/locale/sv/LC_MESSAGES/BlankAd.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - BlankAd to Swedish (Svenska)
+# Translation of StatusNet - BlankAd to Swedish (svenska)
 # Exported from translatewiki.net
 #
 # Author: Jamminjohn
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BlankAd\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:48+0000\n"
-"Language-Team: Swedish <http://translatewiki.net/wiki/Portal:sv>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:52+0000\n"
+"Language-Team: Swedish <https://translatewiki.net/wiki/Portal:sv>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-16 23:17:21+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:49:49+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: sv\n"
 "X-Message-Group: #out-statusnet-plugin-blankad\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/BlankAd/locale/tl/LC_MESSAGES/BlankAd.po b/plugins/BlankAd/locale/tl/LC_MESSAGES/BlankAd.po
index 3a474cce85..a15ba93cf5 100644
--- a/plugins/BlankAd/locale/tl/LC_MESSAGES/BlankAd.po
+++ b/plugins/BlankAd/locale/tl/LC_MESSAGES/BlankAd.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BlankAd\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:48+0000\n"
-"Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:52+0000\n"
+"Language-Team: Tagalog <https://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-16 23:17:21+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:49:49+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-blankad\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/BlankAd/locale/uk/LC_MESSAGES/BlankAd.po b/plugins/BlankAd/locale/uk/LC_MESSAGES/BlankAd.po
index c7398d6998..a81fd3f8c2 100644
--- a/plugins/BlankAd/locale/uk/LC_MESSAGES/BlankAd.po
+++ b/plugins/BlankAd/locale/uk/LC_MESSAGES/BlankAd.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - BlankAd to Ukrainian (Україн�ька)
+# Translation of StatusNet - BlankAd to Ukrainian (україн�ька)
 # Exported from translatewiki.net
 #
 # Author: Boogie
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BlankAd\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:48+0000\n"
-"Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:52+0000\n"
+"Language-Team: Ukrainian <https://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-16 23:17:21+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:49:49+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-blankad\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
diff --git a/plugins/BlankAd/locale/zh_CN/LC_MESSAGES/BlankAd.po b/plugins/BlankAd/locale/zh_CN/LC_MESSAGES/BlankAd.po
index ad8312a8c2..7ba1600b06 100644
--- a/plugins/BlankAd/locale/zh_CN/LC_MESSAGES/BlankAd.po
+++ b/plugins/BlankAd/locale/zh_CN/LC_MESSAGES/BlankAd.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - BlankAd to Simplified Chinese (‪中文(简体)‬)
+# Translation of StatusNet - BlankAd to Simplified Chinese (‪中文（简体）‬)
 # Exported from translatewiki.net
 #
 # Author: ZhengYiFeng
@@ -9,15 +9,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BlankAd\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:48+0000\n"
-"Language-Team: Simplified Chinese <http://translatewiki.net/wiki/Portal:zh-"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:52+0000\n"
+"Language-Team: Simplified Chinese <https://translatewiki.net/wiki/Portal:zh-"
 "hans>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-16 23:17:21+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:49:49+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: #out-statusnet-plugin-blankad\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
diff --git a/plugins/Blog/BlogPlugin.php b/plugins/Blog/BlogPlugin.php
new file mode 100644
index 0000000000..eb1f5833c4
--- /dev/null
+++ b/plugins/Blog/BlogPlugin.php
@@ -0,0 +1,222 @@
+<?php
+/**
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2011, StatusNet, Inc.
+ *
+ * A microapp to implement lite blogging
+ *
+ * PHP version 5
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Blog
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2011 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    // This check helps protect against security problems;
+    // your code file can't be executed directly from the web.
+    exit(1);
+}
+
+/**
+ * Blog plugin
+ *
+ * Many social systems have a way to write and share long-form texts with
+ * your network. This microapp plugin lets users post blog entries.
+ *
+ * @category  Blog
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2011 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+
+class BlogPlugin extends MicroAppPlugin
+{
+    /**
+     * Database schema setup
+     *
+     * @see Schema
+     * @see ColumnDef
+     *
+     * @return boolean hook value; true means continue processing, false means stop.
+     */
+    function onCheckSchema()
+    {
+        $schema = Schema::get();
+
+        $schema->ensureTable('blog_entry', Blog_entry::schemaDef());
+
+        return true;
+    }
+
+    /**
+     * Load related modules when needed
+     *
+     * @param string $cls Name of the class to be loaded
+     *
+     * @return boolean hook value; true means continue processing, false means stop.
+     */
+    function onAutoload($cls)
+    {
+        $dir = dirname(__FILE__);
+
+        switch ($cls)
+        {
+        case 'NewblogentryAction':
+        case 'ShowblogentryAction':
+            include_once $dir . '/' . strtolower(mb_substr($cls, 0, -6)) . '.php';
+            return false;
+        case 'BlogEntryForm':
+        case 'BlogEntryListItem':
+            include_once $dir . '/'.strtolower($cls).'.php';
+            return false;
+        case 'Blog_entry':
+            include_once $dir . '/'.$cls.'.php';
+            return false;
+        default:
+            return true;
+        }
+    }
+
+    /**
+     * Map URLs to actions
+     *
+     * @param Net_URL_Mapper $m path-to-action mapper
+     *
+     * @return boolean hook value; true means continue processing, false means stop.
+     */
+    function onRouterInitialized($m)
+    {
+        $m->connect('blog/new',
+                    array('action' => 'newblogentry'));
+        $m->connect('blog/:id',
+                    array('action' => 'showblogentry'),
+                    array('id' => UUID::REGEX));
+        return true;
+    }
+
+    function onPluginVersion(&$versions)
+    {
+        $versions[] = array('name' => 'Blog',
+                            'version' => STATUSNET_VERSION,
+                            'author' => 'Evan Prodromou',
+                            'homepage' => 'http://status.net/wiki/Plugin:Blog',
+                            'rawdescription' =>
+                            // TRANS: Plugin description.
+                            _m('Let users write and share long-form texts.'));
+        return true;
+    }
+
+    function appTitle()
+    {
+        // TRANS: Blog application title.
+        return _m('TITLE','Blog');
+    }
+
+    function tag()
+    {
+        return 'blog';
+    }
+
+    function types()
+    {
+        return array(Blog_entry::TYPE);
+    }
+
+    function saveNoticeFromActivity($activity, $actor, $options=array())
+    {
+        if (count($activity->objects) != 1) {
+            // TRANS: Exception thrown when there are too many activity objects.
+            throw new ClientException(_m('Too many activity objects.'));
+        }
+
+        $entryObj = $activity->objects[0];
+
+        if ($entryObj->type != Blog_entry::TYPE) {
+            // TRANS: Exception thrown when blog plugin comes across a non-blog entry type object.
+            throw new ClientException(_m('Wrong type for object.'));
+        }
+
+        $notice = null;
+
+        switch ($activity->verb) {
+        case ActivityVerb::POST:
+            $notice = Blog_entry::saveNew($actor,
+                                         $entryObj->title,
+                                         $entryObj->content,
+                                         $options);
+            break;
+        default:
+            // TRANS: Exception thrown when blog plugin comes across a undefined verb.
+            throw new ClientException(_m('Unknown verb for blog entries.'));
+        }
+
+        return $notice;
+    }
+
+    function activityObjectFromNotice($notice)
+    {
+        $entry = Blog_entry::fromNotice($notice);
+
+        if (empty($entry)) {
+            // TRANS: Exception thrown when requesting a non-existing blog entry for notice.
+            throw new ClientException(sprintf(_m('No blog entry for notice %s.'),
+                        $notice->id));
+        }
+
+        return $entry->asActivityObject();
+    }
+
+    function entryForm($out)
+    {
+        return new BlogEntryForm($out);
+    }
+
+    function deleteRelated($notice)
+    {
+        if ($notice->object_type == Blog_entry::TYPE) {
+            $entry = Blog_entry::fromNotice($notice);
+            if (!empty($entry)) {
+                $entry->delete();
+            }
+        }
+    }
+
+    function adaptNoticeListItem($nli)
+    {
+        $notice = $nli->notice;
+
+        if ($notice->object_type == Blog_entry::TYPE) {
+            return new BlogEntryListItem($nli);
+        }
+
+        return null;
+    }
+
+    function onEndShowScripts($action)
+    {
+        $action->script(common_path('plugins/TinyMCE/js/jquery.tinymce.js'));
+        $action->inlineScript('var _tinymce_path = "'.common_path('plugins/TinyMCE/js/tiny_mce.js').'";'."\n".
+                              'var _tinymce_placeholder = "'.common_path('plugins/TinyMCE/icons/placeholder.png').'";'."\n");
+        $action->script($this->path('blog.js'));
+        return true;
+    }
+}
diff --git a/plugins/Blog/Blog_entry.php b/plugins/Blog/Blog_entry.php
new file mode 100644
index 0000000000..b40039b2d7
--- /dev/null
+++ b/plugins/Blog/Blog_entry.php
@@ -0,0 +1,261 @@
+<?php
+/**
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2011, StatusNet, Inc.
+ *
+ * Data structure for blog entries
+ * 
+ * PHP version 5
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Blog
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2011 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    // This check helps protect against security problems;
+    // your code file can't be executed directly from the web.
+    exit(1);
+}
+
+/**
+ * Data structure for blog entries
+ *
+ * @category  Blog
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2011 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+
+class Blog_entry extends Managed_DataObject
+{
+    public $__table = 'blog_entry';
+
+    public $id; // UUID
+    public $profile_id; // int
+    public $title; // varchar(255)
+    public $summary; // text
+    public $content; // text
+    public $uri; // text
+    public $url; // text
+    public $created; // datetime
+    public $modified; // datetime
+
+    const TYPE = ActivityObject::ARTICLE;
+    
+    function staticGet($k, $v=null)
+    {
+        return Managed_DataObject::staticGet('Blog_entry', $k, $v);
+    }
+
+    static function schemaDef()
+    {
+        return array(
+            'description' => 'lite blog entry',
+            'fields' => array(
+                'id' => array('type' => 'char',
+                              'length' => 36,
+                              'not null' => true,
+                              'description' => 'Unique ID (UUID)'),
+                'profile_id' => array('type' => 'int',
+                                      'not null' => true,
+                                      'description' => 'Author profile ID'),
+                'title' => array('type' => 'varchar',
+                                 'length' => 255,
+                                 'description' => 'title of the entry'),
+                'summary' => array('type' => 'text',
+                                   'description' => 'initial summary'),
+                'content' => array('type' => 'text',
+                                   'description' => 'HTML content of the entry'),
+                'uri' => array('type' => 'varchar',
+                               'length' => 255,
+                               'description' => 'URI (probably http://) for this entry'),
+                'url' => array('type' => 'varchar',
+                               'length' => 255,
+                               'description' => 'URL (probably http://) for this entry'),
+                'created' => array('type' => 'datetime',
+                                   'not null' => true,
+                                   'description' => 'date this record was created'),
+                'modified' => array('type' => 'datetime',
+                                    'not null' => true,
+                                    'description' => 'date this record was created'),
+            ),
+            'primary key' => array('id'),
+            'unique keys' => array(
+                'blog_entry_uri_key' => array('uri'),
+            ),
+            'foreign keys' => array(
+                'blog_entry_profile_id_fkey' => array('profile', array('profile_id' => 'id')),
+            ),
+            'indexes' => array(
+                'blog_entry_created_idx' => array('created')
+            ),
+        );
+    }
+
+    static function saveNew($profile, $title, $content, $options=null)
+    {
+        if (is_null($options)) {
+            $options = array();
+        }
+
+        $be             = new Blog_entry();
+        $be->id         = (string) new UUID();
+        $be->profile_id = $profile->id;
+        $be->title      = $title; // Note: not HTML-protected
+        $be->content    = self::purify($content);
+
+        if (array_key_exists('summary', $options)) {
+            $be->summary = self::purify($options['summary']);
+        } else {
+            // Already purified
+            $be->summary = self::summarize($be->content);
+        }
+
+        // Don't save an identical summary
+
+        if ($be->summary == $be->content) {
+            $be->summary = null;
+        }
+
+        $url = common_local_url('showblogentry', array('id' => $be->id));
+
+        if (!array_key_exists('uri', $options)) {
+            $options['uri'] = $url;
+        } 
+
+        $be->uri = $options['uri'];
+
+        if (!array_key_exists('url', $options)) {
+            $options['url'] = $url;
+        }
+
+        $be->url = $options['url'];
+
+        if (!array_key_exists('created', $options)) {
+            $be->created = common_sql_now();
+        }
+        
+        $be->created = $options['created'];
+
+        $be->modified = common_sql_now();
+
+        $be->insert();
+
+        // Use user's preferences for short URLs, if possible
+
+        try {
+            $user = $profile->getUser();
+            $shortUrl = File_redirection::makeShort($url,
+                                                    empty($user) ? null : $user);
+        } catch (Exception $e) {
+            // Don't let this stop us.
+            $shortUrl = $url;
+        }
+
+        // XXX: this might be too long.
+
+        if (!empty($be->summary)) {
+            $options['rendered'] = $be->summary . ' ' . 
+                XMLStringer::estring('a', array('href' => $url,
+                                                'class' => 'blog-entry'),
+                                     _('More...'));
+            $text = html_entity_decode(strip_tags($be->summary), ENT_QUOTES, 'UTF-8');
+        } else {
+            $options['rendered'] = $be->content;
+            $text = html_entity_decode(strip_tags($be->content), ENT_QUOTES, 'UTF-8');
+        }
+
+
+        if (Notice::contentTooLong($text)) {
+            $text = substr($text, 0, Notice::maxContent() - mb_strlen($shortUrl) - 2) .
+                '… ' . $shortUrl;
+        }
+
+        // Override this no matter what.
+        
+        $options['object_type'] = self::TYPE;
+
+        $source = array_key_exists('source', $options) ?
+                                    $options['source'] : 'web';
+        
+        $saved = Notice::saveNew($profile->id, $text, $source, $options);
+
+        return $saved;
+    }
+
+    /**
+     * Summarize the contents of a blog post
+     *
+     * We take the first div or paragraph of the blog post if there's a hit;
+     * Otherwise we take the whole thing.
+     * 
+     * @param string $html HTML of full content
+     */
+    static function summarize($html)
+    {
+        if (preg_match('#<p>.*?</p>#s', $html, $matches)) {
+            return $matches[0];
+        } else if (preg_match('#<div>.*?</div>#s', $html, $matches)) {
+            return $matches[0];
+        } else {
+            return $html;
+        }
+    }
+
+    static function fromNotice($notice)
+    {
+        return Blog_entry::staticGet('uri', $notice->uri);
+    }
+
+    function getNotice()
+    {
+        return Notice::staticGet('uri', $this->uri);
+    }
+
+    function asActivityObject()
+    {
+        $obj = new ActivityObject();
+
+        $obj->id      = $this->uri;
+        $obj->type    = self::TYPE;
+        $obj->title   = $this->title;
+        $obj->summary = $this->summary;
+        $obj->content = $this->content;
+        $obj->link    = $this->url;
+
+        return $obj;
+    }
+
+    /**
+     * Clean up input HTML
+     */
+    static function purify($html)
+    {
+        require_once INSTALLDIR.'/extlib/htmLawed/htmLawed.php';
+
+        $config = array('safe' => 1,
+                        'deny_attribute' => 'id,style,on*');
+        $pure = htmLawed($html, $config);
+
+        return $pure;
+    }
+}
diff --git a/plugins/Blog/blog.js b/plugins/Blog/blog.js
new file mode 100644
index 0000000000..333a2891d3
--- /dev/null
+++ b/plugins/Blog/blog.js
@@ -0,0 +1,33 @@
+(function() {
+    var origInit = SN.Init.NoticeFormSetup;
+    SN.Init.NoticeFormSetup = function(form) {
+        origInit(form);
+        var content = form.find("#blog-entry-content");
+        if (content.length > 0) {
+            content.tinymce({
+                script_url : window._tinymce_path,
+                // General options
+                theme : "advanced",
+                plugins : "paste,fullscreen,autoresize,autolink,inlinepopups,tabfocus",
+                theme_advanced_buttons1 : "bold,italic,strikethrough,|,undo,redo,|,link,unlink,image",
+                theme_advanced_buttons2 : "",
+                theme_advanced_buttons3 : "",
+                add_form_submit_trigger : false,
+                theme_advanced_resizing : true,
+                tabfocus_elements: ":prev,:next",
+                setup: function(ed) {
+
+                    form.find('.submit:first').click(function() {
+                        tinymce.triggerSave();
+                    });
+
+                    form.find('input[type=file]').change(function() {
+                        var img = '<img src="'+window._tinymce_placeholder+'" class="placeholder" width="320" height="240">';
+                        var html = tinyMCE.activeEditor.getContent();
+                        ed.setContent(html + img);
+                    });
+                }
+            });
+        }
+    };
+})();
\ No newline at end of file
diff --git a/plugins/Blog/blogentryform.php b/plugins/Blog/blogentryform.php
new file mode 100644
index 0000000000..2da2a1397e
--- /dev/null
+++ b/plugins/Blog/blogentryform.php
@@ -0,0 +1,132 @@
+<?php
+/**
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2011, StatusNet, Inc.
+ *
+ * Form for creating a blog entry
+ *
+ * PHP version 5
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Blog
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2011 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    // This check helps protect against security problems;
+    // your code file can't be executed directly from the web.
+    exit(1);
+}
+
+/**
+ * Form for creating a blog entry
+ *
+ * @category  Blog
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2011 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+class BlogEntryForm extends Form
+{
+    /**
+     * ID of the form
+     *
+     * @return int ID of the form
+     */
+    function id()
+    {
+        return 'form_new_blog_entry';
+    }
+
+    /**
+     * class of the form
+     *
+     * @return string class of the form
+     */
+    function formClass()
+    {
+        return 'form_settings ajax-notice';
+    }
+
+    /**
+     * Action of the form
+     *
+     * @return string URL of the action
+     */
+    function action()
+    {
+        return common_local_url('newblogentry');
+    }
+
+    /**
+     * Data elements of the form
+     *
+     * @return void
+     */
+    function formData()
+    {
+        $this->out->elementStart('fieldset', array('id' => 'new_blog_entry_data'));
+        $this->out->elementStart('ul', 'form_data');
+
+        $this->li();
+        $this->out->input('blog-entry-title',
+                          // TRANS: Field label on blog entry form.
+                          _m('LABEL','Title'),
+                          null,
+                          // TRANS: Field title on blog entry form.
+                          _m('Title of the blog entry.'),
+                          'title');
+        $this->unli();
+
+        $this->li();
+        $this->out->textarea('blog-entry-content',
+                             // TRANS: Field label on blog entry form.
+                             _m('LABEL','Text'),
+                            null,
+                            // TRANS: Field title on blog entry form.
+                            _m('Text of the blog entry.'),
+                            'content');
+        $this->unli();
+
+        $this->out->elementEnd('ul');
+
+        $toWidget = new ToSelector($this->out,
+                                   common_current_user(),
+                                   null);
+        $toWidget->show();
+
+        $this->out->elementEnd('fieldset');
+    }
+
+    /**
+     * Action elements
+     *
+     * @return void
+     */
+    function formActions()
+    {
+        $this->out->submit('blog-entry-submit',
+                           // TRANS: Button text to save a blog entry.
+                           _m('BUTTON', 'Save'),
+                           'submit',
+                           'submit');
+    }
+}
diff --git a/plugins/Blog/blogentrylistitem.php b/plugins/Blog/blogentrylistitem.php
new file mode 100644
index 0000000000..a89a562b77
--- /dev/null
+++ b/plugins/Blog/blogentrylistitem.php
@@ -0,0 +1,101 @@
+<?php
+/**
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2011, StatusNet, Inc.
+ *
+ * NoticeListItem adapter for blog entries
+ * 
+ * PHP version 5
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Blog
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2011 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    // This check helps protect against security problems;
+    // your code file can't be executed directly from the web.
+    exit(1);
+}
+
+/**
+ * NoticeListItem adapter for blog entries
+ *
+ * @category  General
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2011 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+
+class BlogEntryListItem extends NoticeListItemAdapter
+{
+    function showNotice()
+    {
+        $out = $this->nli->out;
+        $out->elementStart('div', 'entry-title');
+        $this->showAuthor();
+        $this->showContent();
+        $out->elementEnd('div');
+    }
+
+    function showContent()
+    {
+        $notice = $this->nli->notice;
+        $out    = $this->nli->out;
+
+        $entry  = Blog_entry::fromNotice($notice);
+
+        if (empty($entry)) {
+            throw new Exception('BlogEntryListItem used for non-blog notice.');
+        }
+
+        $out->elementStart('h4', array('class' => 'blog-entry-title'));
+        $out->element('a', array('href' => $notice->bestUrl()), $entry->title);
+        $out->elementEnd('h4');
+
+        // XXX: kind of a hack
+
+        $actionName = $out->trimmed('action');
+
+        if ($actionName == 'shownotice' ||
+            $actionName == 'showblogentry' ||
+            $actionName == 'conversation') {
+
+            $out->elementStart('div', 'blog-entry-content');
+            $out->raw($entry->content);
+            $out->elementEnd('div');
+
+        } else {
+
+            if (!empty($entry->summary)) {
+                $out->elementStart('div', 'blog-entry-summary');
+                $out->raw($entry->summary);
+                $out->elementEnd('div');
+            }
+
+            $url = ($entry->url) ? $entry->url : $notice->bestUrl();
+            $out->element('a',
+                          array('href' => $url,
+                                'class' => 'blog-entry-link'),
+                          _('More...'));
+        }
+    }
+}
diff --git a/plugins/Blog/locale/Blog.pot b/plugins/Blog/locale/Blog.pot
new file mode 100644
index 0000000000..a6f308317f
--- /dev/null
+++ b/plugins/Blog/locale/Blog.pot
@@ -0,0 +1,107 @@
+# 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: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. TRANS: Client exception thrown when trying to post a blog entry while not logged in.
+#: newblogentry.php:74
+msgid "Must be logged in to post a blog entry."
+msgstr ""
+
+#. TRANS: Client exception thrown when trying to post a blog entry without providing a title.
+#: newblogentry.php:84
+msgid "Title required."
+msgstr ""
+
+#. TRANS: Client exception thrown when trying to post a blog entry without providing content.
+#: newblogentry.php:91
+msgid "Content required."
+msgstr ""
+
+#. TRANS: Page title after sending a notice.
+#: newblogentry.php:128
+msgid "Blog entry saved"
+msgstr ""
+
+#. TRANS: Plugin description.
+#: BlogPlugin.php:124
+msgid "Let users write and share long-form texts."
+msgstr ""
+
+#. TRANS: Blog application title.
+#: BlogPlugin.php:131
+msgctxt "TITLE"
+msgid "Blog"
+msgstr ""
+
+#. TRANS: Exception thrown when there are too many activity objects.
+#: BlogPlugin.php:148
+msgid "Too many activity objects."
+msgstr ""
+
+#. TRANS: Exception thrown when blog plugin comes across a non-blog entry type object.
+#: BlogPlugin.php:155
+msgid "Wrong type for object."
+msgstr ""
+
+#. TRANS: Exception thrown when blog plugin comes across a undefined verb.
+#: BlogPlugin.php:169
+msgid "Unknown verb for blog entries."
+msgstr ""
+
+#. TRANS: Exception thrown when requesting a non-existing blog entry for notice.
+#: BlogPlugin.php:181
+#, php-format
+msgid "No blog entry for notice %s."
+msgstr ""
+
+#. TRANS: Client exception thrown when referring to a non-existing blog entry.
+#: showblogentry.php:60 showblogentry.php:67
+msgid "No such entry."
+msgstr ""
+
+#. TRANS: Title for a blog entry without a title.
+#: showblogentry.php:84
+msgid "Untitled"
+msgstr ""
+
+#. TRANS: Field label on blog entry form.
+#: blogentryform.php:92
+msgctxt "LABEL"
+msgid "Title"
+msgstr ""
+
+#. TRANS: Field title on blog entry form.
+#: blogentryform.php:95
+msgid "Title of the blog entry."
+msgstr ""
+
+#. TRANS: Field label on blog entry form.
+#: blogentryform.php:102
+msgctxt "LABEL"
+msgid "Text"
+msgstr ""
+
+#. TRANS: Field title on blog entry form.
+#: blogentryform.php:105
+msgid "Text of the blog entry."
+msgstr ""
+
+#. TRANS: Button text to save a blog entry.
+#: blogentryform.php:128
+msgctxt "BUTTON"
+msgid "Save"
+msgstr ""
diff --git a/plugins/Blog/locale/ar/LC_MESSAGES/Blog.po b/plugins/Blog/locale/ar/LC_MESSAGES/Blog.po
new file mode 100644
index 0000000000..da9cdcd423
--- /dev/null
+++ b/plugins/Blog/locale/ar/LC_MESSAGES/Blog.po
@@ -0,0 +1,97 @@
+# Translation of StatusNet - Blog to Arabic (العربية)
+# Exported from translatewiki.net
+#
+# Author: OsamaK
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Blog\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:52+0000\n"
+"Language-Team: Arabic <https://translatewiki.net/wiki/Portal:ar>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2012-02-25 15:25:35+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: ar\n"
+"X-Message-Group: #out-statusnet-plugin-blog\n"
+"Plural-Forms: nplurals=6; plural=(n == 0) ? 0 : ( (n == 1) ? 1 : ( (n == "
+"2) ? 2 : ( (n%100 >= 3 && n%100 <= 10) ? 3 : ( (n%100 >= 11 && n%100 <= "
+"99) ? 4 : 5 ) ) ) );\n"
+
+#. TRANS: Client exception thrown when trying to post a blog entry while not logged in.
+msgid "Must be logged in to post a blog entry."
+msgstr ""
+
+#. TRANS: Client exception thrown when trying to post a blog entry without providing a title.
+msgid "Title required."
+msgstr ""
+
+#. TRANS: Client exception thrown when trying to post a blog entry without providing content.
+msgid "Content required."
+msgstr ""
+
+#. TRANS: Page title after sending a notice.
+msgid "Blog entry saved"
+msgstr ""
+
+#. TRANS: Plugin description.
+msgid "Let users write and share long-form texts."
+msgstr ""
+
+#. TRANS: Blog application title.
+msgctxt "TITLE"
+msgid "Blog"
+msgstr "مدونة"
+
+#. TRANS: Exception thrown when there are too many activity objects.
+msgid "Too many activity objects."
+msgstr ""
+
+#. TRANS: Exception thrown when blog plugin comes across a non-blog entry type object.
+msgid "Wrong type for object."
+msgstr ""
+
+#. TRANS: Exception thrown when blog plugin comes across a undefined verb.
+msgid "Unknown verb for blog entries."
+msgstr ""
+
+#. TRANS: Exception thrown when requesting a non-existing blog entry for notice.
+#, php-format
+msgid "No blog entry for notice %s."
+msgstr ""
+
+#. TRANS: Client exception thrown when referring to a non-existing blog entry.
+msgid "No such entry."
+msgstr ""
+
+#. TRANS: Title for a blog entry without a title.
+msgid "Untitled"
+msgstr ""
+
+#. TRANS: Field label on blog entry form.
+msgctxt "LABEL"
+msgid "Title"
+msgstr "العنوان"
+
+#. TRANS: Field title on blog entry form.
+msgid "Title of the blog entry."
+msgstr "عنوان التدوينة."
+
+#. TRANS: Field label on blog entry form.
+msgctxt "LABEL"
+msgid "Text"
+msgstr "النص"
+
+#. TRANS: Field title on blog entry form.
+msgid "Text of the blog entry."
+msgstr "نص التدوينة."
+
+#. TRANS: Button text to save a blog entry.
+msgctxt "BUTTON"
+msgid "Save"
+msgstr "اح�ظ"
diff --git a/plugins/Blog/locale/br/LC_MESSAGES/Blog.po b/plugins/Blog/locale/br/LC_MESSAGES/Blog.po
new file mode 100644
index 0000000000..6035f20577
--- /dev/null
+++ b/plugins/Blog/locale/br/LC_MESSAGES/Blog.po
@@ -0,0 +1,95 @@
+# Translation of StatusNet - Blog to Breton (brezhoneg)
+# Exported from translatewiki.net
+#
+# Author: Y-M D
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Blog\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:53+0000\n"
+"Language-Team: Breton <https://translatewiki.net/wiki/Portal:br>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2012-02-25 15:25:35+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: br\n"
+"X-Message-Group: #out-statusnet-plugin-blog\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#. TRANS: Client exception thrown when trying to post a blog entry while not logged in.
+msgid "Must be logged in to post a blog entry."
+msgstr ""
+
+#. TRANS: Client exception thrown when trying to post a blog entry without providing a title.
+msgid "Title required."
+msgstr "Ezhomm 'zo eus un titl."
+
+#. TRANS: Client exception thrown when trying to post a blog entry without providing content.
+msgid "Content required."
+msgstr ""
+
+#. TRANS: Page title after sending a notice.
+msgid "Blog entry saved"
+msgstr ""
+
+#. TRANS: Plugin description.
+msgid "Let users write and share long-form texts."
+msgstr ""
+
+#. TRANS: Blog application title.
+msgctxt "TITLE"
+msgid "Blog"
+msgstr "Blog"
+
+#. TRANS: Exception thrown when there are too many activity objects.
+msgid "Too many activity objects."
+msgstr ""
+
+#. TRANS: Exception thrown when blog plugin comes across a non-blog entry type object.
+msgid "Wrong type for object."
+msgstr ""
+
+#. TRANS: Exception thrown when blog plugin comes across a undefined verb.
+msgid "Unknown verb for blog entries."
+msgstr ""
+
+#. TRANS: Exception thrown when requesting a non-existing blog entry for notice.
+#, php-format
+msgid "No blog entry for notice %s."
+msgstr ""
+
+#. TRANS: Client exception thrown when referring to a non-existing blog entry.
+msgid "No such entry."
+msgstr ""
+
+#. TRANS: Title for a blog entry without a title.
+msgid "Untitled"
+msgstr "Hep titl"
+
+#. TRANS: Field label on blog entry form.
+msgctxt "LABEL"
+msgid "Title"
+msgstr "Titl"
+
+#. TRANS: Field title on blog entry form.
+msgid "Title of the blog entry."
+msgstr ""
+
+#. TRANS: Field label on blog entry form.
+msgctxt "LABEL"
+msgid "Text"
+msgstr "Testenn"
+
+#. TRANS: Field title on blog entry form.
+msgid "Text of the blog entry."
+msgstr ""
+
+#. TRANS: Button text to save a blog entry.
+msgctxt "BUTTON"
+msgid "Save"
+msgstr "Enrollañ"
diff --git a/plugins/Blog/locale/ca/LC_MESSAGES/Blog.po b/plugins/Blog/locale/ca/LC_MESSAGES/Blog.po
new file mode 100644
index 0000000000..169702e951
--- /dev/null
+++ b/plugins/Blog/locale/ca/LC_MESSAGES/Blog.po
@@ -0,0 +1,95 @@
+# Translation of StatusNet - Blog to Catalan (català)
+# Exported from translatewiki.net
+#
+# Author: Toniher
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Blog\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:53+0000\n"
+"Language-Team: Catalan <https://translatewiki.net/wiki/Portal:ca>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2012-02-25 15:25:35+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: ca\n"
+"X-Message-Group: #out-statusnet-plugin-blog\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Client exception thrown when trying to post a blog entry while not logged in.
+msgid "Must be logged in to post a blog entry."
+msgstr "Cal haver iniciat una sessió per enviar una entrada de blog."
+
+#. TRANS: Client exception thrown when trying to post a blog entry without providing a title.
+msgid "Title required."
+msgstr "Cal un títol."
+
+#. TRANS: Client exception thrown when trying to post a blog entry without providing content.
+msgid "Content required."
+msgstr "Cal un contingut."
+
+#. TRANS: Page title after sending a notice.
+msgid "Blog entry saved"
+msgstr "S'ha desat l'entrada de blog."
+
+#. TRANS: Plugin description.
+msgid "Let users write and share long-form texts."
+msgstr "Permet als usuaris escriure i compartir textos de formularis llargs."
+
+#. TRANS: Blog application title.
+msgctxt "TITLE"
+msgid "Blog"
+msgstr "Blog"
+
+#. TRANS: Exception thrown when there are too many activity objects.
+msgid "Too many activity objects."
+msgstr "Masses objectes d'activitat."
+
+#. TRANS: Exception thrown when blog plugin comes across a non-blog entry type object.
+msgid "Wrong type for object."
+msgstr "Tipus d'objecte incorrecte."
+
+#. TRANS: Exception thrown when blog plugin comes across a undefined verb.
+msgid "Unknown verb for blog entries."
+msgstr "Verb desconegut de les entrades de blog."
+
+#. TRANS: Exception thrown when requesting a non-existing blog entry for notice.
+#, php-format
+msgid "No blog entry for notice %s."
+msgstr "No hi ha entrada de blog de l'avís %s."
+
+#. TRANS: Client exception thrown when referring to a non-existing blog entry.
+msgid "No such entry."
+msgstr "No existeix l'entrada."
+
+#. TRANS: Title for a blog entry without a title.
+msgid "Untitled"
+msgstr "Sense títol"
+
+#. TRANS: Field label on blog entry form.
+msgctxt "LABEL"
+msgid "Title"
+msgstr "Títol"
+
+#. TRANS: Field title on blog entry form.
+msgid "Title of the blog entry."
+msgstr "Títol de l'entrada de blog."
+
+#. TRANS: Field label on blog entry form.
+msgctxt "LABEL"
+msgid "Text"
+msgstr "Text"
+
+#. TRANS: Field title on blog entry form.
+msgid "Text of the blog entry."
+msgstr "Text de l'entrada de blog."
+
+#. TRANS: Button text to save a blog entry.
+msgctxt "BUTTON"
+msgid "Save"
+msgstr "Desa"
diff --git a/plugins/Blog/locale/de/LC_MESSAGES/Blog.po b/plugins/Blog/locale/de/LC_MESSAGES/Blog.po
new file mode 100644
index 0000000000..4e9fc24053
--- /dev/null
+++ b/plugins/Blog/locale/de/LC_MESSAGES/Blog.po
@@ -0,0 +1,97 @@
+# Translation of StatusNet - Blog to German (Deutsch)
+# Exported from translatewiki.net
+#
+# Author: Inkowik
+# Author: Marcel083
+# Author: Tiin
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Blog\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:53+0000\n"
+"Language-Team: German <https://translatewiki.net/wiki/Portal:de>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2012-02-25 15:25:35+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: de\n"
+"X-Message-Group: #out-statusnet-plugin-blog\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Client exception thrown when trying to post a blog entry while not logged in.
+msgid "Must be logged in to post a blog entry."
+msgstr "Du musst angemeldet sein, um einen Blog-Eintrag zu erstellen."
+
+#. TRANS: Client exception thrown when trying to post a blog entry without providing a title.
+msgid "Title required."
+msgstr "Titel erforderlich."
+
+#. TRANS: Client exception thrown when trying to post a blog entry without providing content.
+msgid "Content required."
+msgstr "Inhalt erforderlich."
+
+#. TRANS: Page title after sending a notice.
+msgid "Blog entry saved"
+msgstr "Blog-Eintrag gespeichert"
+
+#. TRANS: Plugin description.
+msgid "Let users write and share long-form texts."
+msgstr "Benutzer lange Tetxte schreiben und teilen lassen."
+
+#. TRANS: Blog application title.
+msgctxt "TITLE"
+msgid "Blog"
+msgstr "Blog"
+
+#. TRANS: Exception thrown when there are too many activity objects.
+msgid "Too many activity objects."
+msgstr "Zu viele Aktivitätsobjekte."
+
+#. TRANS: Exception thrown when blog plugin comes across a non-blog entry type object.
+msgid "Wrong type for object."
+msgstr "Falscher Objekktyp."
+
+#. TRANS: Exception thrown when blog plugin comes across a undefined verb.
+msgid "Unknown verb for blog entries."
+msgstr "Unbekanntes Verb für Blogeinträge."
+
+#. TRANS: Exception thrown when requesting a non-existing blog entry for notice.
+#, php-format
+msgid "No blog entry for notice %s."
+msgstr "Kein Blogeintrag für %s."
+
+#. TRANS: Client exception thrown when referring to a non-existing blog entry.
+msgid "No such entry."
+msgstr "Kein solcher Eintrag"
+
+#. TRANS: Title for a blog entry without a title.
+msgid "Untitled"
+msgstr "Ohne Titel"
+
+#. TRANS: Field label on blog entry form.
+msgctxt "LABEL"
+msgid "Title"
+msgstr "Titel"
+
+#. TRANS: Field title on blog entry form.
+msgid "Title of the blog entry."
+msgstr "Titel des Blog-Eintrags"
+
+#. TRANS: Field label on blog entry form.
+msgctxt "LABEL"
+msgid "Text"
+msgstr "Text"
+
+#. TRANS: Field title on blog entry form.
+msgid "Text of the blog entry."
+msgstr "Text des Blog-Eintrages"
+
+#. TRANS: Button text to save a blog entry.
+msgctxt "BUTTON"
+msgid "Save"
+msgstr "Speichern"
diff --git a/plugins/Blog/locale/es/LC_MESSAGES/Blog.po b/plugins/Blog/locale/es/LC_MESSAGES/Blog.po
new file mode 100644
index 0000000000..92269f0e2f
--- /dev/null
+++ b/plugins/Blog/locale/es/LC_MESSAGES/Blog.po
@@ -0,0 +1,96 @@
+# Translation of StatusNet - Blog to Spanish (español)
+# Exported from translatewiki.net
+#
+# Author: Erchache2000
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Blog\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:53+0000\n"
+"Language-Team: Spanish <https://translatewiki.net/wiki/Portal:es>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2012-02-25 15:25:35+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: es\n"
+"X-Message-Group: #out-statusnet-plugin-blog\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Client exception thrown when trying to post a blog entry while not logged in.
+msgid "Must be logged in to post a blog entry."
+msgstr "Debe haber iniciado sesión para publicar una entrada de blog."
+
+#. TRANS: Client exception thrown when trying to post a blog entry without providing a title.
+msgid "Title required."
+msgstr "Título requerido."
+
+#. TRANS: Client exception thrown when trying to post a blog entry without providing content.
+msgid "Content required."
+msgstr "Contenido requerido."
+
+#. TRANS: Page title after sending a notice.
+msgid "Blog entry saved"
+msgstr "Entrada de blog guardada"
+
+#. TRANS: Plugin description.
+msgid "Let users write and share long-form texts."
+msgstr ""
+"Permiten a los usuarios escribir y compartir formulario con texto largo."
+
+#. TRANS: Blog application title.
+msgctxt "TITLE"
+msgid "Blog"
+msgstr "Blog"
+
+#. TRANS: Exception thrown when there are too many activity objects.
+msgid "Too many activity objects."
+msgstr "Demasiados objetos de actividad."
+
+#. TRANS: Exception thrown when blog plugin comes across a non-blog entry type object.
+msgid "Wrong type for object."
+msgstr "Tipo incorrecto para el objeto."
+
+#. TRANS: Exception thrown when blog plugin comes across a undefined verb.
+msgid "Unknown verb for blog entries."
+msgstr "Verbo desconocido para las entradas de blog."
+
+#. TRANS: Exception thrown when requesting a non-existing blog entry for notice.
+#, php-format
+msgid "No blog entry for notice %s."
+msgstr "Ninguna entrada de blog de notificación  %s ."
+
+#. TRANS: Client exception thrown when referring to a non-existing blog entry.
+msgid "No such entry."
+msgstr "No hay tal entrada."
+
+#. TRANS: Title for a blog entry without a title.
+msgid "Untitled"
+msgstr "Sin título"
+
+#. TRANS: Field label on blog entry form.
+msgctxt "LABEL"
+msgid "Title"
+msgstr "Título"
+
+#. TRANS: Field title on blog entry form.
+msgid "Title of the blog entry."
+msgstr "Título de la entrada de blog."
+
+#. TRANS: Field label on blog entry form.
+msgctxt "LABEL"
+msgid "Text"
+msgstr "Texto"
+
+#. TRANS: Field title on blog entry form.
+msgid "Text of the blog entry."
+msgstr "Texto de la entrada de blog."
+
+#. TRANS: Button text to save a blog entry.
+msgctxt "BUTTON"
+msgid "Save"
+msgstr "Guardar"
diff --git a/plugins/Blog/locale/eu/LC_MESSAGES/Blog.po b/plugins/Blog/locale/eu/LC_MESSAGES/Blog.po
new file mode 100644
index 0000000000..fc0479b9bf
--- /dev/null
+++ b/plugins/Blog/locale/eu/LC_MESSAGES/Blog.po
@@ -0,0 +1,95 @@
+# Translation of StatusNet - Blog to Basque (euskara)
+# Exported from translatewiki.net
+#
+# Author: Artsuaga
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Blog\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:53+0000\n"
+"Language-Team: Basque <https://translatewiki.net/wiki/Portal:eu>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2012-02-25 15:25:35+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: eu\n"
+"X-Message-Group: #out-statusnet-plugin-blog\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Client exception thrown when trying to post a blog entry while not logged in.
+msgid "Must be logged in to post a blog entry."
+msgstr "Saioa hasi behar duzu blogean sarrera bat idazteko."
+
+#. TRANS: Client exception thrown when trying to post a blog entry without providing a title.
+msgid "Title required."
+msgstr "Titulua beharrezkoa."
+
+#. TRANS: Client exception thrown when trying to post a blog entry without providing content.
+msgid "Content required."
+msgstr "Edukia beharrezkoa."
+
+#. TRANS: Page title after sending a notice.
+msgid "Blog entry saved"
+msgstr "Blog sarrera gordea"
+
+#. TRANS: Plugin description.
+msgid "Let users write and share long-form texts."
+msgstr "Erabiltzaileei testu luzeak idatzi eta partekatzen uzten die."
+
+#. TRANS: Blog application title.
+msgctxt "TITLE"
+msgid "Blog"
+msgstr "Bloga"
+
+#. TRANS: Exception thrown when there are too many activity objects.
+msgid "Too many activity objects."
+msgstr "Jarduera objetu gehiegi."
+
+#. TRANS: Exception thrown when blog plugin comes across a non-blog entry type object.
+msgid "Wrong type for object."
+msgstr "Objetuarentzat moeta okerra."
+
+#. TRANS: Exception thrown when blog plugin comes across a undefined verb.
+msgid "Unknown verb for blog entries."
+msgstr "Aditz ezezaguna blog sarerrentzat."
+
+#. TRANS: Exception thrown when requesting a non-existing blog entry for notice.
+#, php-format
+msgid "No blog entry for notice %s."
+msgstr "%s oharrarentzat ez dago blog sarrerarik."
+
+#. TRANS: Client exception thrown when referring to a non-existing blog entry.
+msgid "No such entry."
+msgstr "Ez dago sarrera hori."
+
+#. TRANS: Title for a blog entry without a title.
+msgid "Untitled"
+msgstr "Titulurik gabea"
+
+#. TRANS: Field label on blog entry form.
+msgctxt "LABEL"
+msgid "Title"
+msgstr "Titulua"
+
+#. TRANS: Field title on blog entry form.
+msgid "Title of the blog entry."
+msgstr "Blog sarreraren titulua."
+
+#. TRANS: Field label on blog entry form.
+msgctxt "LABEL"
+msgid "Text"
+msgstr "Testua"
+
+#. TRANS: Field title on blog entry form.
+msgid "Text of the blog entry."
+msgstr "Blog sarreraren testua."
+
+#. TRANS: Button text to save a blog entry.
+msgctxt "BUTTON"
+msgid "Save"
+msgstr "Gorde"
diff --git a/plugins/Blog/locale/fr/LC_MESSAGES/Blog.po b/plugins/Blog/locale/fr/LC_MESSAGES/Blog.po
new file mode 100644
index 0000000000..51d31c1cb2
--- /dev/null
+++ b/plugins/Blog/locale/fr/LC_MESSAGES/Blog.po
@@ -0,0 +1,100 @@
+# Translation of StatusNet - Blog to French (français)
+# Exported from translatewiki.net
+#
+# Author: Davidtsm
+# Author: Gomoko
+# Author: Karl1263
+# Author: Lucky
+# Author: Od1n
+# Author: Sherbrooke
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Blog\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:53+0000\n"
+"Language-Team: French <https://translatewiki.net/wiki/Portal:fr>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2012-02-25 15:25:35+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: fr\n"
+"X-Message-Group: #out-statusnet-plugin-blog\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#. TRANS: Client exception thrown when trying to post a blog entry while not logged in.
+msgid "Must be logged in to post a blog entry."
+msgstr "Vous devez être connecté pour publier un billet."
+
+#. TRANS: Client exception thrown when trying to post a blog entry without providing a title.
+msgid "Title required."
+msgstr "Titre requis."
+
+#. TRANS: Client exception thrown when trying to post a blog entry without providing content.
+msgid "Content required."
+msgstr "Contenu requis."
+
+#. TRANS: Page title after sending a notice.
+msgid "Blog entry saved"
+msgstr "Billet enregistré"
+
+#. TRANS: Plugin description.
+msgid "Let users write and share long-form texts."
+msgstr "Laissez les utilisateurs écrire et partager des textes longs"
+
+#. TRANS: Blog application title.
+msgctxt "TITLE"
+msgid "Blog"
+msgstr "Blog"
+
+#. TRANS: Exception thrown when there are too many activity objects.
+msgid "Too many activity objects."
+msgstr "Trop d'objets d'activité"
+
+#. TRANS: Exception thrown when blog plugin comes across a non-blog entry type object.
+msgid "Wrong type for object."
+msgstr "Mauvais type d'objet."
+
+#. TRANS: Exception thrown when blog plugin comes across a undefined verb.
+msgid "Unknown verb for blog entries."
+msgstr "Verbe inconnu pour les entrées du blog."
+
+#. TRANS: Exception thrown when requesting a non-existing blog entry for notice.
+#, php-format
+msgid "No blog entry for notice %s."
+msgstr "Aucune entrée de blog pour l'avis %s."
+
+#. TRANS: Client exception thrown when referring to a non-existing blog entry.
+msgid "No such entry."
+msgstr "Enregistrement introuvable"
+
+#. TRANS: Title for a blog entry without a title.
+msgid "Untitled"
+msgstr "Sans titre"
+
+#. TRANS: Field label on blog entry form.
+msgctxt "LABEL"
+msgid "Title"
+msgstr "Titre"
+
+#. TRANS: Field title on blog entry form.
+msgid "Title of the blog entry."
+msgstr "Titre de l'entrée de blog."
+
+#. TRANS: Field label on blog entry form.
+msgctxt "LABEL"
+msgid "Text"
+msgstr "Texte"
+
+#. TRANS: Field title on blog entry form.
+msgid "Text of the blog entry."
+msgstr "Texte de l'entrée de blog."
+
+#. TRANS: Button text to save a blog entry.
+msgctxt "BUTTON"
+msgid "Save"
+msgstr "Enregistrer"
diff --git a/plugins/Blog/locale/gl/LC_MESSAGES/Blog.po b/plugins/Blog/locale/gl/LC_MESSAGES/Blog.po
new file mode 100644
index 0000000000..6c870e324e
--- /dev/null
+++ b/plugins/Blog/locale/gl/LC_MESSAGES/Blog.po
@@ -0,0 +1,95 @@
+# Translation of StatusNet - Blog to Galician (galego)
+# Exported from translatewiki.net
+#
+# Author: Toliño
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Blog\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:53+0000\n"
+"Language-Team: Galician <https://translatewiki.net/wiki/Portal:gl>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2012-02-25 15:25:35+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: gl\n"
+"X-Message-Group: #out-statusnet-plugin-blog\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Client exception thrown when trying to post a blog entry while not logged in.
+msgid "Must be logged in to post a blog entry."
+msgstr "Cómpre estar rexistrado para publicar unha entrada de blogue."
+
+#. TRANS: Client exception thrown when trying to post a blog entry without providing a title.
+msgid "Title required."
+msgstr "O título é obrigatorio."
+
+#. TRANS: Client exception thrown when trying to post a blog entry without providing content.
+msgid "Content required."
+msgstr "Cómpre algún contido."
+
+#. TRANS: Page title after sending a notice.
+msgid "Blog entry saved"
+msgstr "Entrada de blogue gardada"
+
+#. TRANS: Plugin description.
+msgid "Let users write and share long-form texts."
+msgstr "Permite aos usuarios escribir e compartir textos longos."
+
+#. TRANS: Blog application title.
+msgctxt "TITLE"
+msgid "Blog"
+msgstr "Blogue"
+
+#. TRANS: Exception thrown when there are too many activity objects.
+msgid "Too many activity objects."
+msgstr "Demasiados obxectos de actividade."
+
+#. TRANS: Exception thrown when blog plugin comes across a non-blog entry type object.
+msgid "Wrong type for object."
+msgstr "Tipo incorrecto para o obxecto."
+
+#. TRANS: Exception thrown when blog plugin comes across a undefined verb.
+msgid "Unknown verb for blog entries."
+msgstr "Verbo descoñecido para a entrada de blogue."
+
+#. TRANS: Exception thrown when requesting a non-existing blog entry for notice.
+#, php-format
+msgid "No blog entry for notice %s."
+msgstr "A nota %s non ten ningunha entrada de blogue."
+
+#. TRANS: Client exception thrown when referring to a non-existing blog entry.
+msgid "No such entry."
+msgstr "Non hai tal entrada."
+
+#. TRANS: Title for a blog entry without a title.
+msgid "Untitled"
+msgstr "Sen título"
+
+#. TRANS: Field label on blog entry form.
+msgctxt "LABEL"
+msgid "Title"
+msgstr "Título"
+
+#. TRANS: Field title on blog entry form.
+msgid "Title of the blog entry."
+msgstr "Título da entrada de blogue."
+
+#. TRANS: Field label on blog entry form.
+msgctxt "LABEL"
+msgid "Text"
+msgstr "Texto"
+
+#. TRANS: Field title on blog entry form.
+msgid "Text of the blog entry."
+msgstr "Texto da entrada de blogue."
+
+#. TRANS: Button text to save a blog entry.
+msgctxt "BUTTON"
+msgid "Save"
+msgstr "Gardar"
diff --git a/plugins/Blog/locale/ia/LC_MESSAGES/Blog.po b/plugins/Blog/locale/ia/LC_MESSAGES/Blog.po
new file mode 100644
index 0000000000..f2aa789cfd
--- /dev/null
+++ b/plugins/Blog/locale/ia/LC_MESSAGES/Blog.po
@@ -0,0 +1,95 @@
+# Translation of StatusNet - Blog to Interlingua (interlingua)
+# Exported from translatewiki.net
+#
+# Author: McDutchie
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Blog\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:53+0000\n"
+"Language-Team: Interlingua <https://translatewiki.net/wiki/Portal:ia>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2012-02-25 15:25:35+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: ia\n"
+"X-Message-Group: #out-statusnet-plugin-blog\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Client exception thrown when trying to post a blog entry while not logged in.
+msgid "Must be logged in to post a blog entry."
+msgstr "Es necessari aperir session pro publicar un articulo de blog."
+
+#. TRANS: Client exception thrown when trying to post a blog entry without providing a title.
+msgid "Title required."
+msgstr "Titulo requirite."
+
+#. TRANS: Client exception thrown when trying to post a blog entry without providing content.
+msgid "Content required."
+msgstr "Contento requirite."
+
+#. TRANS: Page title after sending a notice.
+msgid "Blog entry saved"
+msgstr "Articulo de blog salveguardate"
+
+#. TRANS: Plugin description.
+msgid "Let users write and share long-form texts."
+msgstr "Permitte que usatores scribe e divide textos longe."
+
+#. TRANS: Blog application title.
+msgctxt "TITLE"
+msgid "Blog"
+msgstr "Blog"
+
+#. TRANS: Exception thrown when there are too many activity objects.
+msgid "Too many activity objects."
+msgstr "Troppo de objectos de activitate."
+
+#. TRANS: Exception thrown when blog plugin comes across a non-blog entry type object.
+msgid "Wrong type for object."
+msgstr "Typo errate pro iste objecto."
+
+#. TRANS: Exception thrown when blog plugin comes across a undefined verb.
+msgid "Unknown verb for blog entries."
+msgstr "Verbo incognite pro articulos de blog."
+
+#. TRANS: Exception thrown when requesting a non-existing blog entry for notice.
+#, php-format
+msgid "No blog entry for notice %s."
+msgstr "Nulle articulo de blog pro le nota %s."
+
+#. TRANS: Client exception thrown when referring to a non-existing blog entry.
+msgid "No such entry."
+msgstr "Articulo non existe."
+
+#. TRANS: Title for a blog entry without a title.
+msgid "Untitled"
+msgstr "Sin titulo"
+
+#. TRANS: Field label on blog entry form.
+msgctxt "LABEL"
+msgid "Title"
+msgstr "Titulo"
+
+#. TRANS: Field title on blog entry form.
+msgid "Title of the blog entry."
+msgstr "Le titulo del articulo de blog."
+
+#. TRANS: Field label on blog entry form.
+msgctxt "LABEL"
+msgid "Text"
+msgstr "Texto"
+
+#. TRANS: Field title on blog entry form.
+msgid "Text of the blog entry."
+msgstr "Le texto del articulo de blog."
+
+#. TRANS: Button text to save a blog entry.
+msgctxt "BUTTON"
+msgid "Save"
+msgstr "Salveguardar"
diff --git a/plugins/Blog/locale/it/LC_MESSAGES/Blog.po b/plugins/Blog/locale/it/LC_MESSAGES/Blog.po
new file mode 100644
index 0000000000..a39b43dcff
--- /dev/null
+++ b/plugins/Blog/locale/it/LC_MESSAGES/Blog.po
@@ -0,0 +1,93 @@
+# Translation of StatusNet - Blog to Italian (italiano)
+# Exported from translatewiki.net
+#
+# Author: Ximo17
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Blog\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:54+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2012-02-25 15:25:35+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Client exception thrown when trying to post a blog entry while not logged in.
+msgid "Must be logged in to post a blog entry."
+msgstr "Bisogna effettuare l'accesso per poter scrivere qualcosa nel blog."
+
+#. TRANS: Client exception thrown when trying to post a blog entry without providing a title.
+msgid "Title required."
+msgstr "Titolo richiesto."
+
+#. TRANS: Client exception thrown when trying to post a blog entry without providing content.
+msgid "Content required."
+msgstr "Contenuto richiesto."
+
+#. TRANS: Page title after sending a notice.
+msgid "Blog entry saved"
+msgstr "Voce del blog salvata"
+
+#. TRANS: Plugin description.
+msgid "Let users write and share long-form texts."
+msgstr ""
+"Consentire agli utenti di scrivere e condividere testi con un formato lungo."
+
+#. TRANS: Blog application title.
+msgctxt "TITLE"
+msgid "Blog"
+msgstr "Blog"
+
+#. TRANS: Exception thrown when there are too many activity objects.
+msgid "Too many activity objects."
+msgstr "Troppi oggetti dell'attività."
+
+#. TRANS: Exception thrown when blog plugin comes across a non-blog entry type object.
+msgid "Wrong type for object."
+msgstr "Tipo di oggetto sbagliato."
+
+#. TRANS: Exception thrown when blog plugin comes across a undefined verb.
+msgid "Unknown verb for blog entries."
+msgstr "Verbo sconosciuto per le voci del blog."
+
+#. TRANS: Exception thrown when requesting a non-existing blog entry for notice.
+#, php-format
+msgid "No blog entry for notice %s."
+msgstr "Nessuna voce del blog per la notizia  %s ."
+
+#. TRANS: Client exception thrown when referring to a non-existing blog entry.
+msgid "No such entry."
+msgstr "Nessuna voce."
+
+#. TRANS: Title for a blog entry without a title.
+msgid "Untitled"
+msgstr "Senza titolo"
+
+#. TRANS: Field label on blog entry form.
+msgctxt "LABEL"
+msgid "Title"
+msgstr "Titolo"
+
+#. TRANS: Field title on blog entry form.
+msgid "Title of the blog entry."
+msgstr "Titolo della voce del blog."
+
+#. TRANS: Field label on blog entry form.
+msgctxt "LABEL"
+msgid "Text"
+msgstr "Testo"
+
+#. TRANS: Field title on blog entry form.
+msgid "Text of the blog entry."
+msgstr "Testo della voce del blog."
+
+#. TRANS: Button text to save a blog entry.
+msgctxt "BUTTON"
+msgid "Save"
+msgstr "Salva"
diff --git a/plugins/Blog/locale/lt/LC_MESSAGES/Blog.po b/plugins/Blog/locale/lt/LC_MESSAGES/Blog.po
new file mode 100644
index 0000000000..a9ddfd53dc
--- /dev/null
+++ b/plugins/Blog/locale/lt/LC_MESSAGES/Blog.po
@@ -0,0 +1,96 @@
+# Translation of StatusNet - Blog to Lithuanian (lietuvių)
+# Exported from translatewiki.net
+#
+# Author: Eitvys200
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Blog\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:54+0000\n"
+"Language-Team: Lithuanian <https://translatewiki.net/wiki/Portal:lt>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2012-02-25 15:25:35+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: lt\n"
+"X-Message-Group: #out-statusnet-plugin-blog\n"
+"Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
+"2 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
+
+#. TRANS: Client exception thrown when trying to post a blog entry while not logged in.
+msgid "Must be logged in to post a blog entry."
+msgstr "Turite būti prisijungęs, kad galėtumėte rašyti dienoraš�io įrašą."
+
+#. TRANS: Client exception thrown when trying to post a blog entry without providing a title.
+msgid "Title required."
+msgstr "Pavadinimas būtinas."
+
+#. TRANS: Client exception thrown when trying to post a blog entry without providing content.
+msgid "Content required."
+msgstr "Turinys būtinas."
+
+#. TRANS: Page title after sending a notice.
+msgid "Blog entry saved"
+msgstr "Dienoraš�io įrašas išsaugotas"
+
+#. TRANS: Plugin description.
+msgid "Let users write and share long-form texts."
+msgstr ""
+
+#. TRANS: Blog application title.
+msgctxt "TITLE"
+msgid "Blog"
+msgstr "Dienoraštis"
+
+#. TRANS: Exception thrown when there are too many activity objects.
+msgid "Too many activity objects."
+msgstr "Per daug aktyvių objektui."
+
+#. TRANS: Exception thrown when blog plugin comes across a non-blog entry type object.
+msgid "Wrong type for object."
+msgstr ""
+
+#. TRANS: Exception thrown when blog plugin comes across a undefined verb.
+msgid "Unknown verb for blog entries."
+msgstr ""
+
+#. TRANS: Exception thrown when requesting a non-existing blog entry for notice.
+#, php-format
+msgid "No blog entry for notice %s."
+msgstr ""
+
+#. TRANS: Client exception thrown when referring to a non-existing blog entry.
+msgid "No such entry."
+msgstr "Tokio įrašo nėra."
+
+#. TRANS: Title for a blog entry without a title.
+msgid "Untitled"
+msgstr ""
+
+#. TRANS: Field label on blog entry form.
+msgctxt "LABEL"
+msgid "Title"
+msgstr ""
+
+#. TRANS: Field title on blog entry form.
+msgid "Title of the blog entry."
+msgstr ""
+
+#. TRANS: Field label on blog entry form.
+msgctxt "LABEL"
+msgid "Text"
+msgstr "Tekstas"
+
+#. TRANS: Field title on blog entry form.
+msgid "Text of the blog entry."
+msgstr ""
+
+#. TRANS: Button text to save a blog entry.
+msgctxt "BUTTON"
+msgid "Save"
+msgstr "IÅ¡saugoti"
diff --git a/plugins/Blog/locale/mk/LC_MESSAGES/Blog.po b/plugins/Blog/locale/mk/LC_MESSAGES/Blog.po
new file mode 100644
index 0000000000..21e0623605
--- /dev/null
+++ b/plugins/Blog/locale/mk/LC_MESSAGES/Blog.po
@@ -0,0 +1,97 @@
+# Translation of StatusNet - Blog to Macedonian (македон�ки)
+# Exported from translatewiki.net
+#
+# Author: Bjankuloski06
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Blog\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:54+0000\n"
+"Language-Team: Macedonian <https://translatewiki.net/wiki/Portal:mk>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2012-02-25 15:25:35+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: mk\n"
+"X-Message-Group: #out-statusnet-plugin-blog\n"
+"Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
+
+#. TRANS: Client exception thrown when trying to post a blog entry while not logged in.
+msgid "Must be logged in to post a blog entry."
+msgstr "Мора да �те најавени за да објавите блогов�ки запи�."
+
+#. TRANS: Client exception thrown when trying to post a blog entry without providing a title.
+msgid "Title required."
+msgstr "Се бара на�лов."
+
+#. TRANS: Client exception thrown when trying to post a blog entry without providing content.
+msgid "Content required."
+msgstr "Се бара �одржина."
+
+#. TRANS: Page title after sending a notice.
+msgid "Blog entry saved"
+msgstr "Блогов�киот запи� е зачуван."
+
+#. TRANS: Plugin description.
+msgid "Let users write and share long-form texts."
+msgstr ""
+"Им овозможува на кори�ниците да пишуваат и �поделуваат тек�тови во долг "
+"облик."
+
+#. TRANS: Blog application title.
+msgctxt "TITLE"
+msgid "Blog"
+msgstr "Блог"
+
+#. TRANS: Exception thrown when there are too many activity objects.
+msgid "Too many activity objects."
+msgstr "Премногу објекти на активно�т."
+
+#. TRANS: Exception thrown when blog plugin comes across a non-blog entry type object.
+msgid "Wrong type for object."
+msgstr "Погрешен тип на објект."
+
+#. TRANS: Exception thrown when blog plugin comes across a undefined verb.
+msgid "Unknown verb for blog entries."
+msgstr "�епознат глаголот за блогов�ките запи�и."
+
+#. TRANS: Exception thrown when requesting a non-existing blog entry for notice.
+#, php-format
+msgid "No blog entry for notice %s."
+msgstr "�ема блогов�ки запи� за забелешката %s."
+
+#. TRANS: Client exception thrown when referring to a non-existing blog entry.
+msgid "No such entry."
+msgstr "�ема таква �тавка."
+
+#. TRANS: Title for a blog entry without a title.
+msgid "Untitled"
+msgstr "Без на�лов"
+
+#. TRANS: Field label on blog entry form.
+msgctxt "LABEL"
+msgid "Title"
+msgstr "�а�лов"
+
+#. TRANS: Field title on blog entry form.
+msgid "Title of the blog entry."
+msgstr "�а�лов на блогов�киот запи�."
+
+#. TRANS: Field label on blog entry form.
+msgctxt "LABEL"
+msgid "Text"
+msgstr "Тек�т"
+
+#. TRANS: Field title on blog entry form.
+msgid "Text of the blog entry."
+msgstr "Тек�т на блогов�киот запи�."
+
+#. TRANS: Button text to save a blog entry.
+msgctxt "BUTTON"
+msgid "Save"
+msgstr "Зачувај"
diff --git a/plugins/Blog/locale/nl/LC_MESSAGES/Blog.po b/plugins/Blog/locale/nl/LC_MESSAGES/Blog.po
new file mode 100644
index 0000000000..7849e07582
--- /dev/null
+++ b/plugins/Blog/locale/nl/LC_MESSAGES/Blog.po
@@ -0,0 +1,96 @@
+# Translation of StatusNet - Blog to Dutch (Nederlands)
+# Exported from translatewiki.net
+#
+# Author: SPQRobin
+# Author: Siebrand
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Blog\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:54+0000\n"
+"Language-Team: Dutch <https://translatewiki.net/wiki/Portal:nl>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2012-02-25 15:25:35+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: nl\n"
+"X-Message-Group: #out-statusnet-plugin-blog\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Client exception thrown when trying to post a blog entry while not logged in.
+msgid "Must be logged in to post a blog entry."
+msgstr "U moet aangemeld zijn om een ​​blogbericht te posten."
+
+#. TRANS: Client exception thrown when trying to post a blog entry without providing a title.
+msgid "Title required."
+msgstr "Titel is verplicht."
+
+#. TRANS: Client exception thrown when trying to post a blog entry without providing content.
+msgid "Content required."
+msgstr "Inhoud is verplicht."
+
+#. TRANS: Page title after sending a notice.
+msgid "Blog entry saved"
+msgstr "Blogbericht is opgeslagen"
+
+#. TRANS: Plugin description.
+msgid "Let users write and share long-form texts."
+msgstr "Laat gebruikers langere teksten schrijven en delen."
+
+#. TRANS: Blog application title.
+msgctxt "TITLE"
+msgid "Blog"
+msgstr "Blog"
+
+#. TRANS: Exception thrown when there are too many activity objects.
+msgid "Too many activity objects."
+msgstr "Te veel activiteitobjecten."
+
+#. TRANS: Exception thrown when blog plugin comes across a non-blog entry type object.
+msgid "Wrong type for object."
+msgstr "Verkeerde type voor object."
+
+#. TRANS: Exception thrown when blog plugin comes across a undefined verb.
+msgid "Unknown verb for blog entries."
+msgstr "Onbekende werkwoord voor blogberichten."
+
+#. TRANS: Exception thrown when requesting a non-existing blog entry for notice.
+#, php-format
+msgid "No blog entry for notice %s."
+msgstr "Er is geen blogbericht voor de mededeling %s."
+
+#. TRANS: Client exception thrown when referring to a non-existing blog entry.
+msgid "No such entry."
+msgstr "Geen dergelijke vermelding."
+
+#. TRANS: Title for a blog entry without a title.
+msgid "Untitled"
+msgstr "Zonder titel"
+
+#. TRANS: Field label on blog entry form.
+msgctxt "LABEL"
+msgid "Title"
+msgstr "Titel"
+
+#. TRANS: Field title on blog entry form.
+msgid "Title of the blog entry."
+msgstr "Titel van het blogbericht."
+
+#. TRANS: Field label on blog entry form.
+msgctxt "LABEL"
+msgid "Text"
+msgstr "Tekst"
+
+#. TRANS: Field title on blog entry form.
+msgid "Text of the blog entry."
+msgstr "Tekst van het blogbericht."
+
+#. TRANS: Button text to save a blog entry.
+msgctxt "BUTTON"
+msgid "Save"
+msgstr "Opslaan"
diff --git a/plugins/Blog/locale/tl/LC_MESSAGES/Blog.po b/plugins/Blog/locale/tl/LC_MESSAGES/Blog.po
new file mode 100644
index 0000000000..9fc21eed56
--- /dev/null
+++ b/plugins/Blog/locale/tl/LC_MESSAGES/Blog.po
@@ -0,0 +1,94 @@
+# Translation of StatusNet - Blog to Tagalog (Tagalog)
+# Exported from translatewiki.net
+#
+# Author: AnakngAraw
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Blog\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:54+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2012-02-25 15:25:35+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Client exception thrown when trying to post a blog entry while not logged in.
+msgid "Must be logged in to post a blog entry."
+msgstr "Kailangang nakalagda upang makapagpaskil ng isang pagpapasok ng blog."
+
+#. TRANS: Client exception thrown when trying to post a blog entry without providing a title.
+msgid "Title required."
+msgstr "Kailangan ang pamagat."
+
+#. TRANS: Client exception thrown when trying to post a blog entry without providing content.
+msgid "Content required."
+msgstr "Kailangang may nilalaman."
+
+#. TRANS: Page title after sending a notice.
+msgid "Blog entry saved"
+msgstr "Nasagip ang pagpapasok ng blog"
+
+#. TRANS: Plugin description.
+msgid "Let users write and share long-form texts."
+msgstr ""
+"Payagan ang mga tagagamit na makapagsulat at magsalo ng mga tekstong "
+"mahahaba."
+
+#. TRANS: Blog application title.
+msgctxt "TITLE"
+msgid "Blog"
+msgstr "Blog"
+
+#. TRANS: Exception thrown when there are too many activity objects.
+msgid "Too many activity objects."
+msgstr "Masyadong maraming mga bagay ng gawain."
+
+#. TRANS: Exception thrown when blog plugin comes across a non-blog entry type object.
+msgid "Wrong type for object."
+msgstr "Maling uri para sa bagay."
+
+#. TRANS: Exception thrown when blog plugin comes across a undefined verb.
+msgid "Unknown verb for blog entries."
+msgstr "Hindi nalalamang pandiwa para sa mga pagpapasok ng blog."
+
+#. TRANS: Exception thrown when requesting a non-existing blog entry for notice.
+#, php-format
+msgid "No blog entry for notice %s."
+msgstr "Walang pagpapasok ng blog para sa pabatid na %s."
+
+#. TRANS: Client exception thrown when referring to a non-existing blog entry.
+msgid "No such entry."
+msgstr "Walang ganyang pagpapasok."
+
+#. TRANS: Title for a blog entry without a title.
+msgid "Untitled"
+msgstr "Walang pamagat"
+
+#. TRANS: Field label on blog entry form.
+msgctxt "LABEL"
+msgid "Title"
+msgstr "Pamagat"
+
+#. TRANS: Field title on blog entry form.
+msgid "Title of the blog entry."
+msgstr "Pamagat ng pagpapasok ng blog."
+
+#. TRANS: Field label on blog entry form.
+msgctxt "LABEL"
+msgid "Text"
+msgstr "Teksto"
+
+#. TRANS: Field title on blog entry form.
+msgid "Text of the blog entry."
+msgstr "Pamagat ng pagpapasok ng blog."
+
+#. TRANS: Button text to save a blog entry.
+msgctxt "BUTTON"
+msgid "Save"
+msgstr "Sagipin"
diff --git a/plugins/Blog/locale/tr/LC_MESSAGES/Blog.po b/plugins/Blog/locale/tr/LC_MESSAGES/Blog.po
new file mode 100644
index 0000000000..c15fff1086
--- /dev/null
+++ b/plugins/Blog/locale/tr/LC_MESSAGES/Blog.po
@@ -0,0 +1,95 @@
+# Translation of StatusNet - Blog to Turkish (Türkçe)
+# Exported from translatewiki.net
+#
+# Author: Emperyan
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Blog\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:54+0000\n"
+"Language-Team: Turkish <https://translatewiki.net/wiki/Portal:tr>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2012-02-25 15:25:35+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: tr\n"
+"X-Message-Group: #out-statusnet-plugin-blog\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#. TRANS: Client exception thrown when trying to post a blog entry while not logged in.
+msgid "Must be logged in to post a blog entry."
+msgstr ""
+
+#. TRANS: Client exception thrown when trying to post a blog entry without providing a title.
+msgid "Title required."
+msgstr "Başlık gerekli."
+
+#. TRANS: Client exception thrown when trying to post a blog entry without providing content.
+msgid "Content required."
+msgstr "İçerik gerekli."
+
+#. TRANS: Page title after sending a notice.
+msgid "Blog entry saved"
+msgstr "Günce girdisini kaydedildi."
+
+#. TRANS: Plugin description.
+msgid "Let users write and share long-form texts."
+msgstr ""
+
+#. TRANS: Blog application title.
+msgctxt "TITLE"
+msgid "Blog"
+msgstr "Günce"
+
+#. TRANS: Exception thrown when there are too many activity objects.
+msgid "Too many activity objects."
+msgstr ""
+
+#. TRANS: Exception thrown when blog plugin comes across a non-blog entry type object.
+msgid "Wrong type for object."
+msgstr ""
+
+#. TRANS: Exception thrown when blog plugin comes across a undefined verb.
+msgid "Unknown verb for blog entries."
+msgstr "Günce girişleri için bilinmeyen bir eylem."
+
+#. TRANS: Exception thrown when requesting a non-existing blog entry for notice.
+#, php-format
+msgid "No blog entry for notice %s."
+msgstr ""
+
+#. TRANS: Client exception thrown when referring to a non-existing blog entry.
+msgid "No such entry."
+msgstr "Böyle bir girdi yok."
+
+#. TRANS: Title for a blog entry without a title.
+msgid "Untitled"
+msgstr "Başlıksız"
+
+#. TRANS: Field label on blog entry form.
+msgctxt "LABEL"
+msgid "Title"
+msgstr "Başlık"
+
+#. TRANS: Field title on blog entry form.
+msgid "Title of the blog entry."
+msgstr ""
+
+#. TRANS: Field label on blog entry form.
+msgctxt "LABEL"
+msgid "Text"
+msgstr "Metin"
+
+#. TRANS: Field title on blog entry form.
+msgid "Text of the blog entry."
+msgstr ""
+
+#. TRANS: Button text to save a blog entry.
+msgctxt "BUTTON"
+msgid "Save"
+msgstr "Kaydet"
diff --git a/plugins/Blog/newblogentry.php b/plugins/Blog/newblogentry.php
new file mode 100644
index 0000000000..d6421abea2
--- /dev/null
+++ b/plugins/Blog/newblogentry.php
@@ -0,0 +1,139 @@
+<?php
+/**
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2011, StatusNet, Inc.
+ *
+ * Save a new blog entry
+ * 
+ * PHP version 5
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Blog
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2011 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    // This check helps protect against security problems;
+    // your code file can't be executed directly from the web.
+    exit(1);
+}
+
+/**
+ * Save a new blog entry
+ *
+ * @category  Action
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2011 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+
+class NewblogentryAction extends Action
+{
+    protected $user;
+    protected $title;
+    protected $content;
+    
+    /**
+     * For initializing members of the class.
+     *
+     * @param array $argarray misc. arguments
+     *
+     * @return boolean true
+     */
+
+    function prepare($argarray)
+    {
+        parent::prepare($argarray);
+
+        if (!$this->isPost()) {
+            throw new ClientException(_('Must be a POST.'), 405);
+        }
+
+        $this->user = common_current_user();
+
+        if (empty($this->user)) {
+            // TRANS: Client exception thrown when trying to post a blog entry while not logged in.
+            throw new ClientException(_m('Must be logged in to post a blog entry.'),
+                                      403);
+        }
+
+        $this->checkSessionToken();
+        
+        $this->title = $this->trimmed('title');
+
+        if (empty($this->title)) {
+            // TRANS: Client exception thrown when trying to post a blog entry without providing a title.
+            throw new ClientException(_m('Title required.'));
+        }
+
+        $this->content = $this->trimmed('content');
+
+        if (empty($this->content)) {
+            // TRANS: Client exception thrown when trying to post a blog entry without providing content.
+            throw new ClientException(_m('Content required.'));
+        }
+        
+        return true;
+    }
+
+    /**
+     * Handler method
+     *
+     * @param array $argarray is ignored since it's now passed in in prepare()
+     *
+     * @return void
+     */
+
+    function handle($argarray=null)
+    {
+        $options = array();
+
+        // Does the heavy-lifting for getting "To:" information
+
+        ToSelector::fillOptions($this, $options);
+
+        $options['source'] = 'web';
+            
+        $profile = $this->user->getProfile();
+
+        $saved = Blog_entry::saveNew($profile,
+                                    $this->title,
+                                    $this->content,
+                                    $options);
+        
+        if ($this->boolean('ajax')) {
+            header('Content-Type: text/xml; charset=utf-8');
+            $this->xw->startDocument('1.0', 'UTF-8');
+            $this->elementStart('html');
+            $this->elementStart('head');
+            // TRANS: Page title after sending a notice.
+            $this->element('title', null, _m('Blog entry saved'));
+            $this->elementEnd('head');
+            $this->elementStart('body');
+            $nli = new NoticeListItem($saved, $this);
+            $nli->show();
+            $this->elementEnd('body');
+            $this->elementEnd('html');
+        } else {
+            common_redirect($saved->bestUrl(), 303);
+        }
+    }
+}
diff --git a/plugins/Blog/showblogentry.php b/plugins/Blog/showblogentry.php
new file mode 100644
index 0000000000..288527b42a
--- /dev/null
+++ b/plugins/Blog/showblogentry.php
@@ -0,0 +1,86 @@
+<?php
+/**
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2011, StatusNet, Inc.
+ *
+ * Show a blog entry
+ *
+ * PHP version 5
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Blog
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2011 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    // This check helps protect against security problems;
+    // your code file can't be executed directly from the web.
+    exit(1);
+}
+
+/**
+ * Show a blog entry
+ *
+ * @category  Blog
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2011 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+class ShowblogentryAction extends ShownoticeAction
+{
+    protected $id;
+    protected $entry;
+
+    function getNotice()
+    {
+        $this->id = $this->trimmed('id');
+
+        $this->entry = Blog_entry::staticGet('id', $this->id);
+
+        if (empty($this->entry)) {
+            // TRANS: Client exception thrown when referring to a non-existing blog entry.
+            throw new ClientException(_m('No such entry.'), 404);
+        }
+
+        $notice = $this->entry->getNotice();
+
+        if (empty($notice)) {
+            // TRANS: Client exception thrown when referring to a non-existing blog entry.
+            throw new ClientException(_m('No such entry.'), 404);
+        }
+
+        return $notice;
+    }
+
+    /**
+     * Title of the page
+     *
+     * Used by Action class for layout.
+     *
+     * @return string page tile
+     */
+    function title()
+    {
+        // XXX: check for double-encoding
+        // TRANS: Title for a blog entry without a title.
+        return (empty($this->entry->title)) ? _m('Untitled') : $this->entry->title;
+    }
+}
diff --git a/plugins/BlogspamNet/locale/BlogspamNet.pot b/plugins/BlogspamNet/locale/BlogspamNet.pot
index 1d93b406fb..25f1710495 100644
--- a/plugins/BlogspamNet/locale/BlogspamNet.pot
+++ b/plugins/BlogspamNet/locale/BlogspamNet.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
+"POT-Creation-Date: 2012-06-30 11:07+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"
diff --git a/plugins/BlogspamNet/locale/de/LC_MESSAGES/BlogspamNet.po b/plugins/BlogspamNet/locale/de/LC_MESSAGES/BlogspamNet.po
index ec1025720b..419326db8a 100644
--- a/plugins/BlogspamNet/locale/de/LC_MESSAGES/BlogspamNet.po
+++ b/plugins/BlogspamNet/locale/de/LC_MESSAGES/BlogspamNet.po
@@ -10,14 +10,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BlogspamNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:48+0000\n"
-"Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:54+0000\n"
+"Language-Team: German <https://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:26:02+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2012-01-30 18:14:59+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-blogspamnet\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/BlogspamNet/locale/es/LC_MESSAGES/BlogspamNet.po b/plugins/BlogspamNet/locale/es/LC_MESSAGES/BlogspamNet.po
index 38e6c908d8..713b6a2ef6 100644
--- a/plugins/BlogspamNet/locale/es/LC_MESSAGES/BlogspamNet.po
+++ b/plugins/BlogspamNet/locale/es/LC_MESSAGES/BlogspamNet.po
@@ -1,6 +1,7 @@
-# Translation of StatusNet - BlogspamNet to Spanish (Español)
+# Translation of StatusNet - BlogspamNet to Spanish (español)
 # Exported from translatewiki.net
 #
+# Author: Erchache2000
 # Author: Translationista
 # --
 # This file is distributed under the same license as the StatusNet package.
@@ -9,14 +10,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BlogspamNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-04-09 18:34+0000\n"
-"PO-Revision-Date: 2011-04-09 18:36:41+0000\n"
-"Language-Team: Spanish <http://translatewiki.net/wiki/Portal:es>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:54+0000\n"
+"Language-Team: Spanish <https://translatewiki.net/wiki/Portal:es>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-03 13:40:22+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r85732); Translate extension (2011-03-11)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2012-01-30 18:14:59+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-plugin-blogspamnet\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -25,19 +26,19 @@ msgstr ""
 #. TRANS: %1$s is the base URL, %2$s is the error (unknown contents; no period).
 #, php-format
 msgid "Error from %1$s: %2$s"
-msgstr ""
+msgstr "Error de %1$s: %2$s"
 
 #. TRANS: Server exception thrown when blogspam.net returns spam status.
 #. TRANS: Does not end with period because of unknown contents for %s (spam match).
 #, php-format
 msgid "Spam checker results: %s"
-msgstr ""
+msgstr "Resultados de comprobador de spam:%s"
 
 #. TRANS: Server exception thrown when blogspam.net returns an unexpected status.
 #. TRANS: %1$s is the base URL, %2$s is the response (unknown contents; no period).
 #, php-format
 msgid "Unexpected response from %1$s: %2$s"
-msgstr ""
+msgstr "Respuesta inesperada de  %1$s :%2$s"
 
 #. TRANS: Plugin description.
 msgid "Plugin to check submitted notices with blogspam.net."
diff --git a/plugins/BlogspamNet/locale/eu/LC_MESSAGES/BlogspamNet.po b/plugins/BlogspamNet/locale/eu/LC_MESSAGES/BlogspamNet.po
new file mode 100644
index 0000000000..67f0790e03
--- /dev/null
+++ b/plugins/BlogspamNet/locale/eu/LC_MESSAGES/BlogspamNet.po
@@ -0,0 +1,41 @@
+# Translation of StatusNet - BlogspamNet to Basque (euskara)
+# Exported from translatewiki.net
+#
+# Author: Artsuaga
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - BlogspamNet\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:54+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2012-01-30 18:14:59+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Server exception thrown when blogspam.net returns error status.
+#. TRANS: %1$s is the base URL, %2$s is the error (unknown contents; no period).
+#, php-format
+msgid "Error from %1$s: %2$s"
+msgstr "%1$s(e)n akatsa: %2$s"
+
+#. TRANS: Server exception thrown when blogspam.net returns spam status.
+#. TRANS: Does not end with period because of unknown contents for %s (spam match).
+#, php-format
+msgid "Spam checker results: %s"
+msgstr "Spam egiaztatzailearen emaitza: %s"
+
+#. TRANS: Server exception thrown when blogspam.net returns an unexpected status.
+#. TRANS: %1$s is the base URL, %2$s is the response (unknown contents; no period).
+#, php-format
+msgid "Unexpected response from %1$s: %2$s"
+msgstr "Ezusteko erantzuna %1$s(e)n: %2$s"
+
+#. TRANS: Plugin description.
+msgid "Plugin to check submitted notices with blogspam.net."
+msgstr "blogspam.net-ekin oharrak egiaztatzeko plugina."
diff --git a/plugins/BlogspamNet/locale/fr/LC_MESSAGES/BlogspamNet.po b/plugins/BlogspamNet/locale/fr/LC_MESSAGES/BlogspamNet.po
index 6b9fb85eed..f2a3373472 100644
--- a/plugins/BlogspamNet/locale/fr/LC_MESSAGES/BlogspamNet.po
+++ b/plugins/BlogspamNet/locale/fr/LC_MESSAGES/BlogspamNet.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - BlogspamNet to French (Français)
+# Translation of StatusNet - BlogspamNet to French (français)
 # Exported from translatewiki.net
 #
 # Author: Iketsi
@@ -10,14 +10,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BlogspamNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:48+0000\n"
-"Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:54+0000\n"
+"Language-Team: French <https://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:26:02+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2012-01-30 18:14:59+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-blogspamnet\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
diff --git a/plugins/BlogspamNet/locale/gl/LC_MESSAGES/BlogspamNet.po b/plugins/BlogspamNet/locale/gl/LC_MESSAGES/BlogspamNet.po
new file mode 100644
index 0000000000..e2c4bcd962
--- /dev/null
+++ b/plugins/BlogspamNet/locale/gl/LC_MESSAGES/BlogspamNet.po
@@ -0,0 +1,44 @@
+# Translation of StatusNet - BlogspamNet to Galician (galego)
+# Exported from translatewiki.net
+#
+# Author: Toliño
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - BlogspamNet\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:55+0000\n"
+"Language-Team: Galician <https://translatewiki.net/wiki/Portal:gl>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2012-01-30 18:14:59+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: gl\n"
+"X-Message-Group: #out-statusnet-plugin-blogspamnet\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Server exception thrown when blogspam.net returns error status.
+#. TRANS: %1$s is the base URL, %2$s is the error (unknown contents; no period).
+#, php-format
+msgid "Error from %1$s: %2$s"
+msgstr "Erro de %1$s: %2$s"
+
+#. TRANS: Server exception thrown when blogspam.net returns spam status.
+#. TRANS: Does not end with period because of unknown contents for %s (spam match).
+#, php-format
+msgid "Spam checker results: %s"
+msgstr "Resultados do verificador de spam: %s"
+
+#. TRANS: Server exception thrown when blogspam.net returns an unexpected status.
+#. TRANS: %1$s is the base URL, %2$s is the response (unknown contents; no period).
+#, php-format
+msgid "Unexpected response from %1$s: %2$s"
+msgstr "Resposta inesperada de %1$s: %2$s"
+
+#. TRANS: Plugin description.
+msgid "Plugin to check submitted notices with blogspam.net."
+msgstr "Complemento para comprobar as notas enviadas con blogspam.net."
diff --git a/plugins/BlogspamNet/locale/ia/LC_MESSAGES/BlogspamNet.po b/plugins/BlogspamNet/locale/ia/LC_MESSAGES/BlogspamNet.po
index 3438775689..763225e94e 100644
--- a/plugins/BlogspamNet/locale/ia/LC_MESSAGES/BlogspamNet.po
+++ b/plugins/BlogspamNet/locale/ia/LC_MESSAGES/BlogspamNet.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - BlogspamNet to Interlingua (Interlingua)
+# Translation of StatusNet - BlogspamNet to Interlingua (interlingua)
 # Exported from translatewiki.net
 #
 # Author: McDutchie
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BlogspamNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:49+0000\n"
-"Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:55+0000\n"
+"Language-Team: Interlingua <https://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:26:02+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2012-01-30 18:14:59+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-blogspamnet\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/BlogspamNet/locale/it/LC_MESSAGES/BlogspamNet.po b/plugins/BlogspamNet/locale/it/LC_MESSAGES/BlogspamNet.po
new file mode 100644
index 0000000000..6ed5a0acf4
--- /dev/null
+++ b/plugins/BlogspamNet/locale/it/LC_MESSAGES/BlogspamNet.po
@@ -0,0 +1,41 @@
+# Translation of StatusNet - BlogspamNet to Italian (italiano)
+# Exported from translatewiki.net
+#
+# Author: Ximo17
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - BlogspamNet\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:55+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2012-01-30 18:14:59+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Server exception thrown when blogspam.net returns error status.
+#. TRANS: %1$s is the base URL, %2$s is the error (unknown contents; no period).
+#, php-format
+msgid "Error from %1$s: %2$s"
+msgstr "Errore da %1$s: %2$s"
+
+#. TRANS: Server exception thrown when blogspam.net returns spam status.
+#. TRANS: Does not end with period because of unknown contents for %s (spam match).
+#, php-format
+msgid "Spam checker results: %s"
+msgstr "Risultati verifica spam: %s"
+
+#. TRANS: Server exception thrown when blogspam.net returns an unexpected status.
+#. TRANS: %1$s is the base URL, %2$s is the response (unknown contents; no period).
+#, php-format
+msgid "Unexpected response from %1$s: %2$s"
+msgstr "Risposta inaspettata da %1$s: %2$s"
+
+#. TRANS: Plugin description.
+msgid "Plugin to check submitted notices with blogspam.net."
+msgstr "Plugin per controllare gli avvisi inviati con blogspam.net."
diff --git a/plugins/BlogspamNet/locale/lt/LC_MESSAGES/BlogspamNet.po b/plugins/BlogspamNet/locale/lt/LC_MESSAGES/BlogspamNet.po
new file mode 100644
index 0000000000..41090c436b
--- /dev/null
+++ b/plugins/BlogspamNet/locale/lt/LC_MESSAGES/BlogspamNet.po
@@ -0,0 +1,45 @@
+# Translation of StatusNet - BlogspamNet to Lithuanian (lietuvių)
+# Exported from translatewiki.net
+#
+# Author: Eitvys200
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - BlogspamNet\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:55+0000\n"
+"Language-Team: Lithuanian <https://translatewiki.net/wiki/Portal:lt>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2012-01-30 18:14:59+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: lt\n"
+"X-Message-Group: #out-statusnet-plugin-blogspamnet\n"
+"Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
+"2 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
+
+#. TRANS: Server exception thrown when blogspam.net returns error status.
+#. TRANS: %1$s is the base URL, %2$s is the error (unknown contents; no period).
+#, php-format
+msgid "Error from %1$s: %2$s"
+msgstr "Klaida iš %1$s: %2$s"
+
+#. TRANS: Server exception thrown when blogspam.net returns spam status.
+#. TRANS: Does not end with period because of unknown contents for %s (spam match).
+#, php-format
+msgid "Spam checker results: %s"
+msgstr "Šlamštas tikrintuvo rezultatai: %s"
+
+#. TRANS: Server exception thrown when blogspam.net returns an unexpected status.
+#. TRANS: %1$s is the base URL, %2$s is the response (unknown contents; no period).
+#, php-format
+msgid "Unexpected response from %1$s: %2$s"
+msgstr "Netikėtas atsakymas iš %1$s: %2$s"
+
+#. TRANS: Plugin description.
+msgid "Plugin to check submitted notices with blogspam.net."
+msgstr ""
diff --git a/plugins/BlogspamNet/locale/mk/LC_MESSAGES/BlogspamNet.po b/plugins/BlogspamNet/locale/mk/LC_MESSAGES/BlogspamNet.po
index 1e1987c03b..9b3e030630 100644
--- a/plugins/BlogspamNet/locale/mk/LC_MESSAGES/BlogspamNet.po
+++ b/plugins/BlogspamNet/locale/mk/LC_MESSAGES/BlogspamNet.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - BlogspamNet to Macedonian (Македон�ки)
+# Translation of StatusNet - BlogspamNet to Macedonian (македон�ки)
 # Exported from translatewiki.net
 #
 # Author: Bjankuloski06
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BlogspamNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:49+0000\n"
-"Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:55+0000\n"
+"Language-Team: Macedonian <https://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:26:02+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2012-01-30 18:14:59+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-blogspamnet\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
diff --git a/plugins/BlogspamNet/locale/nb/LC_MESSAGES/BlogspamNet.po b/plugins/BlogspamNet/locale/nb/LC_MESSAGES/BlogspamNet.po
index e78e8f41ae..ddefda9e7b 100644
--- a/plugins/BlogspamNet/locale/nb/LC_MESSAGES/BlogspamNet.po
+++ b/plugins/BlogspamNet/locale/nb/LC_MESSAGES/BlogspamNet.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - BlogspamNet to Norwegian (bokmål)‬ (‪Norsk (bokmål)‬)
+# Translation of StatusNet - BlogspamNet to Norwegian Bokmål (‪norsk (bokmål)‬)
 # Exported from translatewiki.net
 #
 # Author: Nghtwlkr
@@ -9,15 +9,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BlogspamNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:49+0000\n"
-"Language-Team: Norwegian (bokmål)‬ <http://translatewiki.net/wiki/Portal:no>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:55+0000\n"
+"Language-Team: Norwegian Bokmål <https://translatewiki.net/wiki/Portal:nb>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:26:02+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
-"X-Language-Code: no\n"
+"X-POT-Import-Date: 2012-01-30 18:14:59+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: nb\n"
 "X-Message-Group: #out-statusnet-plugin-blogspamnet\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
diff --git a/plugins/BlogspamNet/locale/nl/LC_MESSAGES/BlogspamNet.po b/plugins/BlogspamNet/locale/nl/LC_MESSAGES/BlogspamNet.po
index 7f0fe47c4c..c670386829 100644
--- a/plugins/BlogspamNet/locale/nl/LC_MESSAGES/BlogspamNet.po
+++ b/plugins/BlogspamNet/locale/nl/LC_MESSAGES/BlogspamNet.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BlogspamNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:49+0000\n"
-"Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:55+0000\n"
+"Language-Team: Dutch <https://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:26:02+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2012-01-30 18:14:59+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-blogspamnet\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/BlogspamNet/locale/ru/LC_MESSAGES/BlogspamNet.po b/plugins/BlogspamNet/locale/ru/LC_MESSAGES/BlogspamNet.po
index fa178901f1..18c7ed9674 100644
--- a/plugins/BlogspamNet/locale/ru/LC_MESSAGES/BlogspamNet.po
+++ b/plugins/BlogspamNet/locale/ru/LC_MESSAGES/BlogspamNet.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - BlogspamNet to Russian (Ру��кий)
+# Translation of StatusNet - BlogspamNet to Russian (ру��кий)
 # Exported from translatewiki.net
 #
 # Author: �лек�андр Сигачёв
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BlogspamNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:49+0000\n"
-"Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:55+0000\n"
+"Language-Team: Russian <https://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:26:02+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2012-01-30 18:14:59+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-blogspamnet\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
diff --git a/plugins/BlogspamNet/locale/tl/LC_MESSAGES/BlogspamNet.po b/plugins/BlogspamNet/locale/tl/LC_MESSAGES/BlogspamNet.po
index 8803b0bbc8..12fe15c029 100644
--- a/plugins/BlogspamNet/locale/tl/LC_MESSAGES/BlogspamNet.po
+++ b/plugins/BlogspamNet/locale/tl/LC_MESSAGES/BlogspamNet.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BlogspamNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:49+0000\n"
-"Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:55+0000\n"
+"Language-Team: Tagalog <https://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:26:02+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2012-01-30 18:14:59+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-blogspamnet\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/BlogspamNet/locale/uk/LC_MESSAGES/BlogspamNet.po b/plugins/BlogspamNet/locale/uk/LC_MESSAGES/BlogspamNet.po
index cc3fe9e296..61a65d7ea9 100644
--- a/plugins/BlogspamNet/locale/uk/LC_MESSAGES/BlogspamNet.po
+++ b/plugins/BlogspamNet/locale/uk/LC_MESSAGES/BlogspamNet.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - BlogspamNet to Ukrainian (Україн�ька)
+# Translation of StatusNet - BlogspamNet to Ukrainian (україн�ька)
 # Exported from translatewiki.net
 #
 # Author: Boogie
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BlogspamNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:49+0000\n"
-"Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:55+0000\n"
+"Language-Team: Ukrainian <https://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:26:02+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2012-01-30 18:14:59+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-blogspamnet\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
diff --git a/plugins/Bookmark/BookmarkPlugin.php b/plugins/Bookmark/BookmarkPlugin.php
index f8db77e2b7..f644289ed4 100644
--- a/plugins/Bookmark/BookmarkPlugin.php
+++ b/plugins/Bookmark/BookmarkPlugin.php
@@ -148,6 +148,9 @@ class BookmarkPlugin extends MicroAppPlugin
 
         switch ($cls)
         {
+        case 'BookmarksAction':
+        case 'BookmarksrssAction':
+        case 'ApiTimelineBookmarksAction':
         case 'ShowbookmarkAction':
         case 'NewbookmarkAction':
         case 'BookmarkpopupAction':
@@ -180,6 +183,26 @@ class BookmarkPlugin extends MicroAppPlugin
      */
     function onRouterInitialized($m)
     {
+        if (common_config('singleuser', 'enabled')) {
+            $nickname = User::singleUserNickname();
+            $m->connect('bookmarks',
+                        array('action' => 'bookmarks', 'nickname' => $nickname));
+            $m->connect('bookmarks/rss',
+                        array('action' => 'bookmarksrss', 'nickname' => $nickname));
+        } else {
+            $m->connect(':nickname/bookmarks',
+                        array('action' => 'bookmarks'),
+                        array('nickname' => Nickname::DISPLAY_FMT));
+            $m->connect(':nickname/bookmarks/rss',
+                        array('action' => 'bookmarksrss'),
+                        array('nickname' => Nickname::DISPLAY_FMT));
+        }
+
+        $m->connect('api/bookmarks/:id.:format',
+                    array('action' => 'ApiTimelineBookmarks',
+                          'id' => Nickname::INPUT_FMT,
+                          'format' => '(xml|json|rss|atom|as)'));
+
         $m->connect('main/bookmark/new',
                     array('action' => 'newbookmark'),
                     array('id' => '[0-9]+'));
@@ -230,11 +253,13 @@ class BookmarkPlugin extends MicroAppPlugin
     {
         $versions[] = array('name' => 'Bookmark',
                             'version' => self::VERSION,
-                            'author' => 'Evan Prodromou',
+                            'author' => 'Evan Prodromou, Stephane Berube, Jean Baptiste Favre',
                             'homepage' => 'http://status.net/wiki/Plugin:Bookmark',
                             'description' =>
                             // TRANS: Plugin description.
-                            _m('Simple extension for supporting bookmarks.'));
+                            _m('Simple extension for supporting bookmarks. ') .
+                            'BookmarkList feature has been developped by Stephane Berube. ' .
+                            'Integration has been done by Jean Baptiste Favre.');
         return true;
     }
 
@@ -292,18 +317,61 @@ class BookmarkPlugin extends MicroAppPlugin
 
     function onStartOpenNoticeListItemElement($nli)
     {
+    	if (!$this->isMyNotice($nli->notice)) {
+    		return true;
+    	}
+    	
         $nb = Bookmark::getByNotice($nli->notice);
-        if (!empty($nb)) {
-            $id = (empty($nli->repeat)) ? $nli->notice->id : $nli->repeat->id;
-            $class = 'hentry notice bookmark';
-            if ($nli->notice->scope != 0 && $nli->notice->scope != 1) {
-                $class .= ' limited-scope';
-            }
-            $nli->out->elementStart('li', array('class' => $class,
-                                                 'id' => 'notice-' . $id));
-            Event::handle('EndOpenNoticeListItemElement', array($nli));
+        
+        if (empty($nb)) {
+        	$this->log(LOG_INFO, "Notice {$nli->notice->id} has bookmark class but no matching Bookmark record.");
+        	return true;
+        }
+	        
+	    $id = (empty($nli->repeat)) ? $nli->notice->id : $nli->repeat->id;
+	    $class = 'hentry notice bookmark';
+	    if ($nli->notice->scope != 0 && $nli->notice->scope != 1) {
+	    	$class .= ' limited-scope';
+	    }
+	    $nli->out->elementStart('li', array('class' => $class,
+	                                        'id' => 'notice-' . $id));
+	                                        
+	    Event::handle('EndOpenNoticeListItemElement', array($nli));
+	    return false;
+    }
+
+    /**
+     * Modify the default menu to link to our custom action
+     *
+     * Using event handlers, it's possible to modify the default UI for pages
+     * almost without limit. In this method, we add a menu item to the default
+     * primary menu for the interface to link to our action.
+     *
+     * The Action class provides a rich set of events to hook, as well as output
+     * methods.
+     *
+     * @param Action $action The current action handler. Use this to
+     * do any output.
+     *
+     * @return boolean hook value; true means continue processing, false means stop.
+     *
+     * @see Action
+     */
+    function onEndPersonalGroupNav($action)
+    {
+        $this->user = common_current_user();
+
+        if (!$this->user) {
+            // TRANS: Client error displayed when trying to display bookmarks for a non-existing user.
+            $this->clientError(_('No such user.'));
             return false;
         }
+
+        $action->menuItem(common_local_url('bookmarks', array('nickname' => $this->user->nickname)),
+                          // TRANS: Menu item in sample plugin.
+                          _m('Bookmarks'),
+                          // TRANS: Menu item title in sample plugin.
+                          _m('A list of your bookmarks'), false, 'nav_timeline_bookmarks');
         return true;
     }
 
@@ -322,7 +390,7 @@ class BookmarkPlugin extends MicroAppPlugin
 
         $options = array('uri' => $bookmark->id,
                          'url' => $bookmark->link,
-                         'is_local' => Notice::REMOTE_OMB,
+                         'is_local' => Notice::REMOTE,
                          'source' => 'ostatus');
 
         return self::_postBookmark($author->localProfile(), $activity, $options);
@@ -355,12 +423,15 @@ class BookmarkPlugin extends MicroAppPlugin
      */
     function deleteRelated($notice)
     {
-        $nb = Bookmark::getByNotice($notice);
-
-        if (!empty($nb)) {
-            $nb->delete();
-        }
+    	if ($this->isMyNotice($notice)) {
+    		
+        	$nb = Bookmark::getByNotice($notice);
 
+        	if (!empty($nb)) {
+            	$nb->delete();
+        	}
+    	}
+    	
         return true;
     }
 
@@ -540,4 +611,41 @@ class BookmarkPlugin extends MicroAppPlugin
         // TRANS: Application title.
         return _m('TITLE','Bookmark');
     }
+
+    function onEndUpgrade()
+    {
+        // Version 0.9.x of the plugin didn't stamp notices
+        // with verb and object-type (for obvious reasons). Update
+        // those notices here.
+
+        $notice = new Notice();
+        
+        $notice->whereAdd('exists (select uri from bookmark where bookmark.uri = notice.uri)');
+        $notice->whereAdd('((object_type is null) or (object_type = "' .ActivityObject::NOTE.'"))');
+
+        $notice->find();
+
+        while ($notice->fetch()) {
+            $original = clone($notice);
+            $notice->verb        = ActivityVerb::POST;
+            $notice->object_type = ActivityObject::BOOKMARK;
+            $notice->update($original);
+        }
+    }
+
+    public function activityObjectOutputJson(ActivityObject $obj, array &$out)
+    {
+        assert($obj->type == ActivityObject::BOOKMARK);
+
+        $bm = Bookmark::staticGet('uri', $obj->id);
+
+        if (empty($bm)) {
+            throw new ServerException("Unknown bookmark: " . $obj->id);
+        }
+
+        $out['displayName'] = $bm->title;
+        $out['targetUrl']   = $bm->url;
+
+        return true;
+    }
 }
diff --git a/plugins/Bookmark/apitimelinebookmarks.php b/plugins/Bookmark/apitimelinebookmarks.php
new file mode 100644
index 0000000000..1753462350
--- /dev/null
+++ b/plugins/Bookmark/apitimelinebookmarks.php
@@ -0,0 +1,268 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Show a user's favorite notices
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  API
+ * @package   StatusNet
+ * @author    Craig Andrews <candrews@integralblue.com>
+ * @author    Evan Prodromou <evan@status.net>
+ * @author    Zach Copley <zach@status.net>
+ * @copyright 2009-2010 StatusNet, Inc.
+ * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    exit(1);
+}
+
+require_once INSTALLDIR.'/lib/apibareauth.php';
+require_once 'bookmarksnoticestream.php';
+
+/**
+ * Returns the 20 most recent favorite notices for the authenticating user or user
+ * specified by the ID parameter in the requested format.
+ *
+ * @category API
+ * @package  StatusNet
+ * @author   Craig Andrews <candrews@integralblue.com>
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Zach Copley <zach@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://status.net/
+ */
+class ApiTimelineBookmarksAction extends ApiBareAuthAction
+{
+    var $notices  = null;
+
+    /**
+     * Take arguments for running
+     *
+     * @param array $args $_REQUEST args
+     *
+     * @return boolean success flag
+     */
+    function prepare($args)
+    {
+        parent::prepare($args);
+
+        $this->user = $this->getTargetUser($this->arg('id'));
+
+        if (empty($this->user)) {
+            // TRANS: Client error displayed when requesting most recent favourite notices by a user for a non-existing user.
+            $this->clientError(_('No such user.'), 404, $this->format);
+            return;
+        }
+
+        $this->notices = $this->getNotices();
+
+        return true;
+    }
+
+    /**
+     * Handle the request
+     *
+     * Just show the notices
+     *
+     * @param array $args $_REQUEST data (unused)
+     *
+     * @return void
+     */
+    function handle($args)
+    {
+        parent::handle($args);
+        $this->showTimeline();
+    }
+
+    /**
+     * Show the timeline of notices
+     *
+     * @return void
+     */
+    function showTimeline()
+    {
+        $profile  = $this->user->getProfile();
+        $avatar   = $profile->getAvatar(AVATAR_PROFILE_SIZE);
+
+        $sitename = common_config('site', 'name');
+        $title    = sprintf(
+            // TRANS: Title for timeline of most recent favourite notices by a user.
+            // TRANS: %1$s is the StatusNet sitename, %2$s is a user nickname.
+            _('%1$s / Bookmarks from %2$s'),
+            $sitename,
+            $this->user->nickname
+        );
+
+        $taguribase = TagURI::base();
+        $id         = "tag:$taguribase:Bookmarks:" . $this->user->id;
+
+        $subtitle = sprintf(
+            // TRANS: Subtitle for timeline of most recent favourite notices by a user.
+            // TRANS: %1$s is the StatusNet sitename, %2$s is a user's full name,
+            // TRANS: %3$s is a user nickname.
+            _('%1$s updates bookmarked by %2$s / %3$s.'),
+            $sitename,
+            $profile->getBestName(),
+            $this->user->nickname
+        );
+        $logo = !empty($avatar)
+            ? $avatar->displayUrl()
+            : Avatar::defaultImage(AVATAR_PROFILE_SIZE);
+
+        $link = common_local_url(
+            'bookmarks',
+            array('nickname' => $this->user->nickname)
+        );
+
+        $self = $this->getSelfUri();
+
+        switch($this->format) {
+        case 'xml':
+            $this->showXmlTimeline($this->notices);
+            break;
+        case 'rss':
+            $this->showRssTimeline(
+                $this->notices,
+                $title,
+                $link,
+                $subtitle,
+                null,
+                $logo,
+                $self
+            );
+            break;
+        case 'atom':
+            header('Content-Type: application/atom+xml; charset=utf-8');
+
+            $atom = new AtomNoticeFeed($this->auth_user);
+
+            $atom->setId($id);
+            $atom->setTitle($title);
+            $atom->setSubtitle($subtitle);
+            $atom->setLogo($logo);
+            $atom->setUpdated('now');
+
+            $atom->addLink($link);
+            $atom->setSelfLink($self);
+
+            $atom->addEntryFromNotices($this->notices);
+
+            $this->raw($atom->getString());
+            break;
+        case 'json':
+            $this->showJsonTimeline($this->notices);
+            break;
+        case 'as':
+            header('Content-Type: ' . ActivityStreamJSONDocument::CONTENT_TYPE);
+            $doc = new ActivityStreamJSONDocument($this->auth_user);
+            $doc->setTitle($title);
+            $doc->addLink($link,'alternate', 'text/html');
+            $doc->addItemsFromNotices($this->notices);
+            $this->raw($doc->asString());
+            break;
+        default:
+            // TRANS: Client error displayed when coming across a non-supported API method.
+            $this->clientError(_('API method not found.'), $code = 404);
+            break;
+        }
+    }
+
+    /**
+     * Get notices
+     *
+     * @return array notices
+     */
+    function getNotices()
+    {
+        $notices = array();
+
+        common_debug("since id = " . $this->since_id . " max id = " . $this->max_id);
+
+        $notice = new BookmarksNoticeStream($this->user->id, true);
+        $notice = $notice->getNotices(
+            ($this->page-1) * $this->count,
+            $this->count,
+            $this->since_id,
+            $this->max_id
+        );
+
+        while ($notice->fetch()) {
+            $notices[] = clone($notice);
+        }
+
+        return $notices;
+    }
+
+    /**
+     * Is this action read only?
+     *
+     * @param array $args other arguments
+     *
+     * @return boolean true
+     */
+    function isReadOnly($args)
+    {
+        return true;
+    }
+
+    /**
+     * When was this feed last modified?
+     *
+     * @return string datestamp of the latest notice in the stream
+     */
+    function lastModified()
+    {
+        if (!empty($this->notices) && (count($this->notices) > 0)) {
+            return strtotime($this->notices[0]->created);
+        }
+
+        return null;
+    }
+
+    /**
+     * An entity tag for this stream
+     *
+     * Returns an Etag based on the action name, language, user ID, and
+     * timestamps of the first and last notice in the timeline
+     *
+     * @return string etag
+     */
+    function etag()
+    {
+        if (!empty($this->notices) && (count($this->notices) > 0)) {
+
+            $last = count($this->notices) - 1;
+
+            return '"' . implode(
+                ':',
+                array($this->arg('action'),
+                      common_user_cache_hash($this->auth_user),
+                      common_language(),
+                      $this->user->id,
+                      strtotime($this->notices[0]->created),
+                      strtotime($this->notices[$last]->created))
+            )
+            . '"';
+        }
+
+        return null;
+    }
+}
diff --git a/plugins/Bookmark/bookmarkforurl.php b/plugins/Bookmark/bookmarkforurl.php
index d3a1a2c76f..e4dedf4a48 100644
--- a/plugins/Bookmark/bookmarkforurl.php
+++ b/plugins/Bookmark/bookmarkforurl.php
@@ -47,9 +47,10 @@ if (!defined('STATUSNET')) {
 
 class BookmarkforurlAction extends Action
 {
-    protected $url;
-    protected $oembed;
-    protected $thumbnail;
+    protected $url        = null;
+    protected $oembed     = null;
+    protected $thumbnail  = null;
+    protected $title      = null;
 
     /**
      * For initializing members of the class.
@@ -77,7 +78,13 @@ class BookmarkforurlAction extends Action
             throw new ClientException(_('Invalid URL.'), 400);
         }
 
-        $f = File::processNew($this->url);
+        $f = File::staticGet('url', $this->url);
+
+        if (empty($url)) { 
+           $f = File::processNew($this->url);
+        }
+
+        // How about now?
 
         if (!empty($f)) {
             $this->oembed    = File_oembed::staticGet('file_id', $f->id);
diff --git a/plugins/Bookmark/bookmarklet b/plugins/Bookmark/bookmarklet
index fc1f8b9d05..31a0ac4935 100644
--- a/plugins/Bookmark/bookmarklet
+++ b/plugins/Bookmark/bookmarklet
@@ -6,4 +6,4 @@ A bookmarklet is a small piece of javascript code used as a bookmark. This one w
 
 Drag-and-drop the following link to your bookmarks bar or right-click it and add it to your browser favorites to keep it handy.
 
-<a href="javascript:(function(){var%20d=document,w=window,e=w.getSelection,k=d.getSelection,x=d.selection,s=(e?e():(k)?k():(x?x.createRange().text:0)),f='http://%%site.server%%/%%site.path%%/index.php?action=bookmarkpopup',l=d.location,e=encodeURIComponent,g=f+'&title='+((e(s))?e(s):e(document.title))+'&url='+e(l.href);function%20a(){if(!w.open(g,'t','toolbar=0,resizable=0,scrollbars=1,status=1,width=650,height=470')){l.href=g;}}a();})()">Bookmark on %%site.name%%</a>
+<a href="javascript:(function(){var%20d=document,w=window,e=w.getSelection,k=d.getSelection,x=d.selection,s=(e?e():(k)?k():(x?x.createRange().text:0)),f='http://%%site.server%%/%%site.path%%/index.php?action=bookmarkpopup',l=d.location,e=encodeURIComponent,g=f+'&title='+((e(s))?e(s):e(document.title))+'&url='+e(l.href);function%20a(){if(!w.open(g,'t','toolbar=0,resizable=0,scrollbars=1,status=1,width=650,height=520')){l.href=g;}}a();})()">Bookmark on %%site.name%%</a>
diff --git a/plugins/Bookmark/bookmarklistitem.php b/plugins/Bookmark/bookmarklistitem.php
index d099c75ecd..a2dbf8156d 100644
--- a/plugins/Bookmark/bookmarklistitem.php
+++ b/plugins/Bookmark/bookmarklistitem.php
@@ -4,7 +4,7 @@
  * Copyright (C) 2011, StatusNet, Inc.
  *
  * Adapter to show bookmarks in a nicer way
- * 
+ *
  * PHP version 5
  *
  * This program is free software: you can redistribute it and/or modify
@@ -60,29 +60,38 @@ class BookmarkListItem extends NoticeListItemAdapter
         $notice = $this->nli->notice;
         $out    = $this->nli->out;
 
-        $out->elementStart('p', array('class' => 'entry-content'));
-
         $nb = Bookmark::getByNotice($notice);
 
+        if (empty($nb)) {
+            common_log(LOG_ERR, "No bookmark for notice {$notice->id}");
+            parent::showContent();
+            return;
+        } else if (empty($nb->url)) {
+            common_log(LOG_ERR, "No url for bookmark {$nb->id} for notice {$notice->id}");
+            parent::showContent();
+            return;
+        }
+
         $profile = $notice->getProfile();
 
-        $atts = $notice->attachments();
+        $out->elementStart('p', array('class' => 'entry-content'));
 
-        if (count($atts) < 1) {
-            // Something wrong; let default code deal with it.
-            // TRANS: Exception thrown when a bookmark has no attachments.
-            // TRANS: %1$s is a bookmark ID, %2$s is a notice ID (number).
-            throw new Exception(sprintf(_m('Bookmark %1$s (notice %2$d) has no attachments.'),
-                                        $nb->id,
-                                        $notice->id));
+        // Whether to nofollow
+
+        $attrs = array('href' => $nb->url,
+                       'class' => 'bookmark-title');
+
+        $nf = common_config('nofollow', 'external');
+
+        if ($nf == 'never' || ($nf == 'sometimes' and $out instanceof ShowstreamAction)) {
+            $attrs['rel'] = 'external';
+        } else {
+            $attrs['rel'] = 'nofollow external';
         }
 
-        $att = $atts[0];
-
         $out->elementStart('h3');
         $out->element('a',
-                      array('href' => $att->url,
-                            'class' => 'bookmark-title'),
+                      $attrs,
                       $nb->title);
         $out->elementEnd('h3');
 
diff --git a/plugins/Bookmark/bookmarkpopup.php b/plugins/Bookmark/bookmarkpopup.php
index 3defe08d30..1400c0a1ea 100644
--- a/plugins/Bookmark/bookmarkpopup.php
+++ b/plugins/Bookmark/bookmarkpopup.php
@@ -70,7 +70,7 @@ class BookmarkpopupAction extends NewbookmarkAction
         $this->elementStart('div', array('id' => 'header'));
         $this->elementStart('address');
         $this->element('a', array('class' => 'url',
-                                  'href' => common_local_url('public')),
+                                  'href' => common_local_url('top')),
                          '');
         $this->elementEnd('address');
         if (common_logged_in()) {
diff --git a/plugins/Bookmark/bookmarks.php b/plugins/Bookmark/bookmarks.php
new file mode 100644
index 0000000000..6faf99929c
--- /dev/null
+++ b/plugins/Bookmark/bookmarks.php
@@ -0,0 +1,233 @@
+<?php
+/**
+ * Give a warm greeting to our friendly user
+ *
+ * PHP version 5
+ *
+ * @category Bookmark
+ * @package  StatusNet
+ * @author   Evan Prodromou <evan@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
+ * @link     http://status.net/
+ *
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2009, StatusNet, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+if (!defined('STATUSNET')) {
+    exit(1);
+}
+
+require_once 'bookmarksnoticestream.php';
+
+/**
+ * List currently logged-in user's bookmakrs
+ *
+ * @category Bookmark
+ * @package  StatusNet
+ * @author   Stephane Berube <chimo@chromic.org>
+ * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
+ * @link     https://github.com/chimo/BookmarkList
+ */
+class BookmarksAction extends Action
+{
+    var $user = null;
+    var $gc   = null;
+
+    /**
+     * Take arguments for running
+     *
+     * This method is called first, and it lets the action class get
+     * all its arguments and validate them. It's also the time
+     * to fetch any relevant data from the database.
+     *
+     * Action classes should run parent::prepare($args) as the first
+     * line of this method to make sure the default argument-processing
+     * happens.
+     *
+     * @param array $args $_REQUEST args
+     *
+     * @return boolean success flag
+     */
+    function prepare($args)
+    {
+        parent::prepare($args);
+
+        if (common_config('singleuser', 'enabled')) {
+            $nickname = User::singleUserNickname();
+        } else {
+            // PHP 5.4
+            // $nickname = $this->returnToArgs()[1]['nickname'];
+
+            // PHP < 5.4
+            $nickname = $this->returnToArgs();
+            $nickname = $nickname[1]['nickname'];
+        }
+        
+        $this->user = User::staticGet('nickname', $nickname);
+
+        if (!$this->user) {
+            // TRANS: Client error displayed when trying to display bookmarks for a non-existing user.
+            $this->clientError(_('No such user.'));
+            return false;
+        }
+
+        $this->page = ($this->arg('page')) ? ($this->arg('page')+0) : 1;
+
+        $stream = new BookmarksNoticeStream($this->user->id, true);
+        $this->notices = $stream->getNotices(($this->page-1)*NOTICES_PER_PAGE,
+                                                NOTICES_PER_PAGE + 1); 
+
+        if($this->page > 1 && $this->notices->N == 0) {
+            throw new ClientException(_('No such page.'), 404);
+        }
+
+        return true;
+    }
+
+    /**
+     * Handle request
+     *
+     * This is the main method for handling a request. Note that
+     * most preparation should be done in the prepare() method;
+     * by the time handle() is called the action should be
+     * more or less ready to go.
+     *
+     * @param array $args $_REQUEST args; handled in prepare()
+     *
+     * @return void
+     */
+    function handle($args)
+    {
+        parent::handle($args);
+        $this->showPage();
+    }
+
+    /**
+     * Title of this page
+     *
+     * Override this method to show a custom title.
+     *
+     * @return string Title of the page
+     */
+    function title()
+    {
+
+        if (empty($this->user)) {
+            // TRANS: Page title for sample plugin.
+            return _m('Log in');
+        } else {
+            // TRANS: Page title for sample plugin. %s is a user nickname.
+            return sprintf(_m('%s\'s bookmarks'), $this->user->nickname);
+        }
+    }
+
+    /**
+     * Feeds for the <head> section
+     *
+     * @return array Feed objects to show
+     */
+    function getFeeds()
+    {
+        return array(new Feed(Feed::JSON,
+                              common_local_url('ApiTimelineBookmarks',
+                                               array(
+                                                    'id' => $this->user->nickname,
+                                                    'format' => 'as')),
+                              // TRANS: Feed link text. %s is a username.
+                              sprintf(_('Feed for favorites of %s (Activity Streams JSON)'),
+                                      $this->user->nickname)),
+                     new Feed(Feed::RSS1,
+                              common_local_url('bookmarksrss',
+                                               array('nickname' => $this->user->nickname)),
+                              // TRANS: Feed link text. %s is a username.
+                              sprintf(_('Feed for favorites of %s (RSS 1.0)'),
+                                      $this->user->nickname)),
+                     new Feed(Feed::RSS2,
+                              common_local_url('ApiTimelineBookmarks',
+                                               array(
+                                                    'id' => $this->user->nickname,
+                                                    'format' => 'rss')),
+                              // TRANS: Feed link text. %s is a username.
+                              sprintf(_('Feed for favorites of %s (RSS 2.0)'),
+                                      $this->user->nickname)),
+                     new Feed(Feed::ATOM,
+                              common_local_url('ApiTimelineBookmarks',
+                                               array(
+                                                    'id' => $this->user->nickname,
+                                                    'format' => 'atom')),
+                              // TRANS: Feed link text. %s is a username.
+                              sprintf(_('Feed for favorites of %s (Atom)'),
+                                      $this->user->nickname)));
+    }
+
+    /**
+     * Show content in the content area
+     *
+     * The default StatusNet page has a lot of decorations: menus,
+     * logos, tabs, all that jazz. This method is used to show
+     * content in the content area of the page; it's the main
+     * thing you want to overload.
+     *
+     * This method also demonstrates use of a plural localized string.
+     *
+     * @return void
+     */
+    function showContent()
+    {
+
+        $nl = new NoticeList($this->notices, $this);
+
+        $cnt = $nl->show();
+
+        if ($cnt == 0) {
+            $this->showEmptyList();
+        }
+
+        $this->pagination($this->page > 1,
+                $cnt > NOTICES_PER_PAGE,
+                $this->page, 'bookmarks',
+                array('nickname' => $this->user->nickname));
+    }
+
+    function showEmptyList() {
+        $message = sprintf(_('This is %1$s\'s bookmark stream, but %1$s hasn\'t bookmarked anything yet.'), $this->user->nickname) . ' ';
+
+        $this->elementStart('div', 'guide');
+        $this->raw(common_markup_to_html($message));
+        $this->elementEnd('div');
+    }
+
+    /**
+     * Return true if read only.
+     *
+     * Some actions only read from the database; others read and write.
+     * The simple database load-balancer built into StatusNet will
+     * direct read-only actions to database mirrors (if they are configured),
+     * and read-write actions to the master database.
+     *
+     * This defaults to false to avoid data integrity issues, but you
+     * should make sure to overload it for performance gains.
+     *
+     * @param array $args other arguments, if RO/RW status depends on them.
+     *
+     * @return boolean is read only action?
+     */
+    function isReadOnly($args)
+    {
+        return true;
+    }
+}
diff --git a/plugins/Bookmark/bookmarksnoticestream.php b/plugins/Bookmark/bookmarksnoticestream.php
new file mode 100644
index 0000000000..a3ac0359d7
--- /dev/null
+++ b/plugins/Bookmark/bookmarksnoticestream.php
@@ -0,0 +1,80 @@
+<?php
+
+class RawBookmarksNoticeStream extends NoticeStream
+{
+    protected $user_id;
+    protected $own;
+
+    function __construct($user_id, $own)
+    {
+        $this->user_id = $user_id;
+        $this->own     = $own;
+    }
+
+    function getNoticeIds($offset, $limit, $since_id, $max_id)
+    {
+        $notice = new Notice();
+        $qry = null;
+
+        $qry =  'SELECT notice.* FROM notice ';
+        $qry .= 'INNER JOIN bookmark ON bookmark.uri = notice.uri ';
+        $qry .= 'WHERE bookmark.profile_id = ' . $this->user_id . ' ';
+        $qry .= 'AND notice.is_local != ' . Notice::GATEWAY . ' ';
+
+        if ($since_id != 0) {
+            $qry .= 'AND notice.id > ' . $since_id . ' ';
+        }
+
+        if ($max_id != 0) {
+            $qry .= 'AND notice.id <= ' . $max_id . ' ';
+        }
+
+        // NOTE: we sort by bookmark time, not by notice time!
+        $qry .= 'ORDER BY created DESC ';
+        if (!is_null($offset)) {
+            $qry .= "LIMIT $limit OFFSET $offset";
+        }
+
+        $notice->query($qry);
+        $ids = array();
+        while ($notice->fetch()) {
+            $ids[] = $notice->id;
+        }
+
+        $notice->free();
+        unset($notice);
+        return $ids;
+    }
+}
+
+/**
+ * Notice stream for bookmarks
+ *
+ * @category  Stream
+ * @package   StatusNet
+ * @author    Stephane Berube <chimo@chromic.org>
+ * @copyright 2011 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+
+class BookmarksNoticeStream extends ScopingNoticeStream
+{
+    function __construct($user_id, $own, $profile = -1)
+    {
+        $stream = new RawBookmarksNoticeStream($user_id, $own);
+
+        if ($own) {
+            $key = 'bookmark:ids_by_user_own:'.$user_id;
+        } else {
+            $key = 'bookmark:ids_by_user:'.$user_id;
+        }
+
+        if (is_int($profile) && $profile == -1) {
+            $profile = Profile::current();
+        }
+
+        parent::__construct(new CachingNoticeStream($stream, $key),
+                            $profile);
+    }
+}
diff --git a/plugins/Bookmark/bookmarksrss.php b/plugins/Bookmark/bookmarksrss.php
new file mode 100644
index 0000000000..63534cac79
--- /dev/null
+++ b/plugins/Bookmark/bookmarksrss.php
@@ -0,0 +1,137 @@
+<?php
+/**
+ * RSS feed for user bookmarks action class.
+ *
+ * PHP version 5
+ *
+ * @category Action
+ * @package  StatusNet
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Robin Millette <millette@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
+ * @link     http://status.net/
+ *
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2008, 2009, StatusNet, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+if (!defined('STATUSNET') && !defined('LACONICA')) {
+    exit(1);
+}
+
+require_once INSTALLDIR.'/lib/rssaction.php';
+require_once 'bookmarksnoticestream.php';
+
+/**
+ * RSS feed for user bookmarks action class.
+ *
+ * Formatting of RSS handled by Rss10Action
+ *
+ * @category Action
+ * @package  StatusNet
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Robin Millette <millette@status.net>
+ * @author   Zach Copley <zach@status.net>
+ * @author   Stephane Berube <chimo@chromic.org> (modified 'favoritesrss.php' to show bookmarks instead)
+ * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
+ * @link     http://status.net/
+ */
+class BookmarksrssAction extends Rss10Action
+{
+    /** The user whose bookmarks to display */
+
+    var $user = null;
+
+    /**
+     * Find the user to display by supplied nickname
+     *
+     * @param array $args Arguments from $_REQUEST
+     *
+     * @return boolean success
+     */
+    function prepare($args)
+    {        
+        parent::prepare($args);
+
+        $nickname   = $this->trimmed('nickname');
+        $this->user = User::staticGet('nickname', $nickname);
+
+        if (!$this->user) {
+            // TRANS: Client error displayed when trying to get the RSS feed with bookmarks of a user that does not exist.
+            $this->clientError(_('No such user.'));
+            return false;
+        } else {
+            $this->notices = $this->getNotices($this->limit);
+            return true;
+        }
+    }
+
+    /**
+     * Get notices
+     *
+     * @param integer $limit max number of notices to return
+     *
+     * @return array notices
+     */
+    function getNotices($limit=0)
+    {
+        $user    = $this->user;
+
+        $notice = new BookmarksNoticeStream($this->user->id, true);
+        $notice = $notice->getNotices(0, NOTICES_PER_PAGE);
+
+        $notices = array();
+        while ($notice->fetch()) {
+            $notices[] = clone($notice);
+        }
+        return $notices;
+    }
+
+     /**
+     * Get channel.
+     *
+     * @return array associative array on channel information
+     */
+    function getChannel()
+    {
+        $user = $this->user;
+        $c    = array('url' => common_local_url('bookmarksrss',
+                                        array('nickname' =>
+                                        $user->nickname)),
+                   // TRANS: Title of RSS feed with bookmarks of a user.
+                   // TRANS: %s is a user's nickname.
+                   'title' => sprintf(_("%s's bookmarks"), $user->nickname),
+                   'link' => common_local_url('bookmarks',
+                                        array('nickname' =>
+                                        $user->nickname)),
+                   // TRANS: Desciption of RSS feed with bookmarks of a user.
+                   // TRANS: %1$s is a user's nickname, %2$s is the name of the StatusNet site.
+                   'description' => sprintf(_('Bookmarks posted by %1$s on %2$s!'),
+                                        $user->nickname, common_config('site', 'name')));
+        return $c;
+    }
+
+    /**
+     * Get image.
+     *
+     * @return void
+    */
+    function getImage()
+    {
+        return null;
+    }
+
+}
diff --git a/plugins/Bookmark/deliciousbackupimporter.php b/plugins/Bookmark/deliciousbackupimporter.php
index 54a618b73a..0ceba61d89 100644
--- a/plugins/Bookmark/deliciousbackupimporter.php
+++ b/plugins/Bookmark/deliciousbackupimporter.php
@@ -74,7 +74,13 @@ class DeliciousBackupImporter extends QueueHandler
     {
         list($user, $body) = $data;
 
-        $doc = $this->importHTML($body);
+        try {
+            $doc = $this->importHTML($body);
+        } catch (ClientException $cex) {
+            // XXX: message to the user
+            common_log(LOG_WARNING, $cex->getMessage());
+            return true;
+        }
 
         // If we can't parse it, it's no good
 
@@ -85,8 +91,9 @@ class DeliciousBackupImporter extends QueueHandler
         $dls = $doc->getElementsByTagName('dl');
 
         if ($dls->length != 1) {
-            // TRANS: Client exception thrown when a file upload is incorrect.
-            throw new ClientException(_m('Bad import file.'));
+            // XXX: message to the user
+            common_log(LOG_WARNING, 'Bad input file');
+            return true;
         }
 
         $dl = $dls->item(0);
diff --git a/plugins/Bookmark/deliciousbookmarkimporter.php b/plugins/Bookmark/deliciousbookmarkimporter.php
index 96fe621c2f..4065fc3085 100644
--- a/plugins/Bookmark/deliciousbookmarkimporter.php
+++ b/plugins/Bookmark/deliciousbookmarkimporter.php
@@ -75,10 +75,17 @@ class DeliciousBookmarkImporter extends QueueHandler
                                        $data['description'],
                                        array('created' => $data['created'],
                                              'distribute' => false));
-        } catch (ClientException $e) {
+        } catch (ClientException $ce) {
             // Most likely a duplicate -- continue on with the rest!
-            common_log(LOG_ERR, "Error importing delicious bookmark to $data[url]: " . $e->getMessage());
+            common_log(LOG_ERR, "Error importing delicious bookmark to $data[url]: " . $ce->getMessage());
             return true;
+        } catch (Exception $ex) {
+            if (preg_match("/DB Error: already exists/", $ex->getMessage())) {
+                common_log(LOG_ERR, "Error importing delicious bookmark to $data[url]: " . $ce->getMessage());
+                return true;
+            } else {
+                throw $ex;
+            }
         }
 
         return true;
diff --git a/plugins/Bookmark/locale/Bookmark.pot b/plugins/Bookmark/locale/Bookmark.pot
index 0376343111..f94bfc5111 100644
--- a/plugins/Bookmark/locale/Bookmark.pot
+++ b/plugins/Bookmark/locale/Bookmark.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,18 +16,13 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#. TRANS: Client exception thrown when a file upload is incorrect.
-#: deliciousbackupimporter.php:89
-msgid "Bad import file."
-msgstr ""
-
 #. TRANS: Client exception thrown when a bookmark in an import file is incorrectly formatted.
-#: deliciousbackupimporter.php:174
+#: deliciousbackupimporter.php:181
 msgid "No <A> tag in a <DT>."
 msgstr ""
 
 #. TRANS: Client exception thrown when a bookmark in an import file is private.
-#: deliciousbackupimporter.php:183
+#: deliciousbackupimporter.php:190
 msgid "Skipping private bookmark."
 msgstr ""
 
@@ -55,28 +50,21 @@ msgid "Import del.icio.us bookmarks"
 msgstr ""
 
 #. TRANS: Client exception thrown when a bookmark is formatted incorrectly.
-#: BookmarkPlugin.php:384
+#: BookmarkPlugin.php:395
 msgid "Expected exactly 1 link rel=related in a Bookmark."
 msgstr ""
 
 #. TRANS: Server exception thrown when a bookmark has multiple attachments.
-#: BookmarkPlugin.php:478
+#: BookmarkPlugin.php:489
 msgid "Bookmark notice with the wrong number of attachments."
 msgstr ""
 
 #. TRANS: Application title.
-#: BookmarkPlugin.php:541
+#: BookmarkPlugin.php:552
 msgctxt "TITLE"
 msgid "Bookmark"
 msgstr ""
 
-#. TRANS: Exception thrown when a bookmark has no attachments.
-#. TRANS: %1$s is a bookmark ID, %2$s is a notice ID (number).
-#: bookmarklistitem.php:75
-#, php-format
-msgid "Bookmark %1$s (notice %2$d) has no attachments."
-msgstr ""
-
 #. TRANS: Title for mini-posting window loaded from bookmarklet.
 #. TRANS: %s is the StatusNet site name.
 #: bookmarkpopup.php:57
@@ -297,7 +285,7 @@ msgid "Bookmark must have an URL."
 msgstr ""
 
 #. TRANS: Page title after posting a bookmark.
-#: newbookmark.php:167
+#: newbookmark.php:178
 msgid "Bookmark posted"
 msgstr ""
 
diff --git a/plugins/Bookmark/locale/ar/LC_MESSAGES/Bookmark.po b/plugins/Bookmark/locale/ar/LC_MESSAGES/Bookmark.po
index 571672f576..0d0262588f 100644
--- a/plugins/Bookmark/locale/ar/LC_MESSAGES/Bookmark.po
+++ b/plugins/Bookmark/locale/ar/LC_MESSAGES/Bookmark.po
@@ -1,6 +1,7 @@
 # Translation of StatusNet - Bookmark to Arabic (العربية)
 # Exported from translatewiki.net
 #
+# Author: Majid Al-Dharrab
 # Author: Mutarjem horr
 # Author: OsamaK
 # --
@@ -10,24 +11,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Bookmark\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:52+0000\n"
-"Language-Team: Arabic <http://translatewiki.net/wiki/Portal:ar>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:56+0000\n"
+"Language-Team: Arabic <https://translatewiki.net/wiki/Portal:ar>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:26:03+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-10-10 14:11:41+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ar\n"
 "X-Message-Group: #out-statusnet-plugin-bookmark\n"
 "Plural-Forms: nplurals=6; plural=(n == 0) ? 0 : ( (n == 1) ? 1 : ( (n == "
 "2) ? 2 : ( (n%100 >= 3 && n%100 <= 10) ? 3 : ( (n%100 >= 11 && n%100 <= "
 "99) ? 4 : 5 ) ) ) );\n"
 
-#. TRANS: Client exception thrown when a file upload is incorrect.
-msgid "Bad import file."
-msgstr "مل� الاستيراد غير صحيح."
-
 #. TRANS: Client exception thrown when a bookmark in an import file is incorrectly formatted.
 msgid "No <A> tag in a <DT>."
 msgstr ""
@@ -38,13 +35,13 @@ msgstr ""
 
 #. TRANS: Client exception thrown when referring to a non-existing bookmark.
 msgid "No such bookmark."
-msgstr "لا يوجد علامة قراءة كهذه."
+msgstr "العلامة المقصودة غير موجودة."
 
 #. TRANS: Title for bookmark.
 #. TRANS: %1$s is a user nickname, %2$s is a bookmark title.
 #, php-format
 msgid "%1$s's bookmark for \"%2$s\""
-msgstr ""
+msgstr "علامة %1$s ل%2$s\""
 
 #. TRANS: Plugin description.
 msgid "Simple extension for supporting bookmarks."
@@ -53,7 +50,7 @@ msgstr ""
 #. TRANS: Link text in proile leading to import form.
 #. TRANS: Title for page to import del.icio.us bookmark backups on.
 msgid "Import del.icio.us bookmarks"
-msgstr "إستيراد علامات القراءة من del.icio.us"
+msgstr "استورد علامات من del.icio.us"
 
 #. TRANS: Client exception thrown when a bookmark is formatted incorrectly.
 msgid "Expected exactly 1 link rel=related in a Bookmark."
@@ -66,30 +63,24 @@ msgstr ""
 #. TRANS: Application title.
 msgctxt "TITLE"
 msgid "Bookmark"
-msgstr "علامة القراءة"
-
-#. TRANS: Exception thrown when a bookmark has no attachments.
-#. TRANS: %1$s is a bookmark ID, %2$s is a notice ID (number).
-#, php-format
-msgid "Bookmark %1$s (notice %2$d) has no attachments."
-msgstr ""
+msgstr "علامة"
 
 #. TRANS: Title for mini-posting window loaded from bookmarklet.
 #. TRANS: %s is the StatusNet site name.
 #, php-format
 msgid "Bookmark on %s"
-msgstr "ضع علامة قراءة على %s"
+msgstr "ضع علامة �ي %s"
 
 #. TRANS: Client exception thrown when trying to save a new bookmark that already exists.
 msgid "Bookmark already exists."
-msgstr "علامة القراءة موجودة سابقاّ"
+msgstr "العلامة موجودة سابقاّ"
 
 #. TRANS: Bookmark content.
 #. TRANS: %1$s is a title, %2$s is a short URL, %3$s is the bookmark description,
 #. TRANS: %4$s is space separated list of hash tags.
 #, php-format
 msgid "\"%1$s\" %2$s %3$s %4$s"
-msgstr ""
+msgstr "\"%1$s\" %2$s %3$s %4$s"
 
 #. TRANS: Rendered bookmark content.
 #. TRANS: %1$s is a URL, %2$s the bookmark title, %3$s is the bookmark description,
@@ -100,11 +91,14 @@ msgid ""
 "<span class=\"description\">%3$s</span> <span class=\"meta\">%4$s</span></"
 "span>"
 msgstr ""
+"<span class=\"xfolkentry\"><a class=\"taggedlink\" href=\"%1$s\">%2$s</a> "
+"<span class=\"description\">%3$s</span> <span class=\"meta\">%4$s</span></"
+"span>"
 
 #. TRANS: Field label on form for adding a new bookmark.
 msgctxt "LABEL"
 msgid "URL"
-msgstr ""
+msgstr "المسار"
 
 #. TRANS: Button text for action to save a new bookmark.
 msgctxt "BUTTON"
@@ -119,13 +113,13 @@ msgstr ""
 #. TRANS: %s is the URL.
 #, php-format
 msgid "Notices linking to %s"
-msgstr ""
+msgstr "الإشعار التي تصل ب%s"
 
 #. TRANS: Title of notice stream of notices with a given attachment (all but first page).
 #. TRANS: %1$s is the URL, %2$s is the page number.
 #, php-format
 msgid "Notices linking to %1$s, page %2$d"
-msgstr ""
+msgstr "الإشعار التي تصل ب%1$s، الص�حة %2$d"
 
 #. TRANS: Client exception thrown when trying to import bookmarks without being logged in.
 msgid "Only logged-in users can import del.icio.us backups."
@@ -133,7 +127,7 @@ msgstr ""
 
 #. TRANS: Client exception thrown when trying to import bookmarks without having the rights to do so.
 msgid "You may not restore your account."
-msgstr "لن يسمح لك بإستعادة حسابك."
+msgstr "لا يسمح لك باستعادة حسابك."
 
 #. TRANS: Client exception thrown when trying to import bookmarks and upload fails.
 #. TRANS: Client exception thrown when a file upload has failed.
@@ -152,7 +146,7 @@ msgstr ""
 
 #. TRANS: Client exception thrown when a file was only partially uploaded.
 msgid "The uploaded file was only partially uploaded."
-msgstr "لقد تم تحميل المل� جزئياّ �قط."
+msgstr "لقد تم تحميل المل� جزئيًا �قط."
 
 #. TRANS: Client exception thrown when a temporary folder is not present.
 msgid "Missing a temporary folder."
@@ -198,11 +192,11 @@ msgstr "المل� \"%s\" غير قابل للقراءة."
 msgid ""
 "Bookmarks have been imported. Your bookmarks should now appear in search and "
 "your profile page."
-msgstr ""
+msgstr "استوردت العلامات. ستظهر علاماتك الآن عند البحث و�ي ص�حتك الشخصية."
 
 #. TRANS: Busy message for importing bookmarks.
 msgid "Bookmarks are being imported. Please wait a few minutes for results."
-msgstr ""
+msgstr "يستورد العلامات. الرجاء الانتظار دقائق معدودة لتظهر النتيجة."
 
 #. TRANS: Form instructions for importing bookmarks.
 msgid "You can upload a backed-up delicious.com bookmarks file."
@@ -220,7 +214,7 @@ msgstr "حمّل المل�."
 #. TRANS: Field label on form for adding a new bookmark.
 msgctxt "LABEL"
 msgid "Title"
-msgstr "الإسم"
+msgstr "العنوان"
 
 #. TRANS: Field label on form for adding a new bookmark.
 msgctxt "LABEL"
@@ -234,7 +228,7 @@ msgstr "الوسوم"
 
 #. TRANS: Field title on form for adding a new bookmark.
 msgid "Comma- or space-separated list of tags."
-msgstr "لائحة وسومات من�صلة ب�اصلة أو ب�راغ."
+msgstr "قائمة بوسوم م�صولة ب�اصلة أو ب�راغ."
 
 #. TRANS: Button text for action to save a new bookmark.
 msgctxt "BUTTON"
@@ -243,11 +237,11 @@ msgstr "اح�ظ"
 
 #. TRANS: Title for action to create a new bookmark.
 msgid "New bookmark"
-msgstr "علامة قراءة جديدة"
+msgstr "علامة جديدة"
 
 #. TRANS: Client exception thrown when trying to create a new bookmark while not logged in.
 msgid "Must be logged in to post a bookmark."
-msgstr "يجب أن تكون مسجل الدخول كي تعلن عن علامة قراءة."
+msgstr "يجب أن تكون والجا لتنشر العلامات."
 
 #. TRANS: Client exception thrown when trying to create a new bookmark without a title.
 msgid "Bookmark must have a title."
@@ -255,13 +249,13 @@ msgstr "يجب تسمية علامة القراءة."
 
 #. TRANS: Client exception thrown when trying to create a new bookmark without a URL.
 msgid "Bookmark must have an URL."
-msgstr ""
+msgstr "يجب أن تحتوي العلامة على مسار."
 
 #. TRANS: Page title after posting a bookmark.
 msgid "Bookmark posted"
-msgstr ""
+msgstr "أرسلت العلامة"
 
 #. TRANS: %s is the filename that contains a backup for a user.
 #, php-format
 msgid "Getting backup from file \"%s\"."
-msgstr ""
+msgstr "جلب النسخة الاحتياطية من \"%s\"."
diff --git a/plugins/Bookmark/locale/ca/LC_MESSAGES/Bookmark.po b/plugins/Bookmark/locale/ca/LC_MESSAGES/Bookmark.po
index 48f6aaf940..aa2c7889ef 100644
--- a/plugins/Bookmark/locale/ca/LC_MESSAGES/Bookmark.po
+++ b/plugins/Bookmark/locale/ca/LC_MESSAGES/Bookmark.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Bookmark to Catalan (Català)
+# Translation of StatusNet - Bookmark to Catalan (català)
 # Exported from translatewiki.net
 #
 # Author: Dvdgmz
@@ -12,52 +12,48 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Bookmark\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:52+0000\n"
-"Language-Team: Catalan <http://translatewiki.net/wiki/Portal:ca>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:56+0000\n"
+"Language-Team: Catalan <https://translatewiki.net/wiki/Portal:ca>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:26:03+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-10-10 14:11:41+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ca\n"
 "X-Message-Group: #out-statusnet-plugin-bookmark\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#. TRANS: Client exception thrown when a file upload is incorrect.
-msgid "Bad import file."
-msgstr "No s'ha importat bé el fitxer."
-
 #. TRANS: Client exception thrown when a bookmark in an import file is incorrectly formatted.
 msgid "No <A> tag in a <DT>."
-msgstr ""
+msgstr "No hi ha l'etiqueta <A> en un <DT>."
 
 #. TRANS: Client exception thrown when a bookmark in an import file is private.
 msgid "Skipping private bookmark."
-msgstr ""
+msgstr "S'omet l'adreça d'interès privada."
 
 #. TRANS: Client exception thrown when referring to a non-existing bookmark.
 msgid "No such bookmark."
-msgstr ""
+msgstr "No existeix l'adreça d'interès."
 
 #. TRANS: Title for bookmark.
 #. TRANS: %1$s is a user nickname, %2$s is a bookmark title.
 #, php-format
 msgid "%1$s's bookmark for \"%2$s\""
-msgstr ""
+msgstr "Adreça d'interès de %1$s per a «%2$s»"
 
 #. TRANS: Plugin description.
 msgid "Simple extension for supporting bookmarks."
-msgstr ""
+msgstr "Extensió simple per habilitar les adreces d'interès."
 
 #. TRANS: Link text in proile leading to import form.
 #. TRANS: Title for page to import del.icio.us bookmark backups on.
 msgid "Import del.icio.us bookmarks"
-msgstr "Importar adreces favorites de del.icio.us"
+msgstr "Importa adreces d'interès del del.icio.us"
 
 #. TRANS: Client exception thrown when a bookmark is formatted incorrectly.
 msgid "Expected exactly 1 link rel=related in a Bookmark."
-msgstr ""
+msgstr "S'esperava exactament 1 enllaç rel=related en una adreça d'interès."
 
 #. TRANS: Server exception thrown when a bookmark has multiple attachments.
 msgid "Bookmark notice with the wrong number of attachments."
@@ -66,13 +62,7 @@ msgstr "Avís d'adreça d'interès amb un nombre incorrecte d'adjuncions."
 #. TRANS: Application title.
 msgctxt "TITLE"
 msgid "Bookmark"
-msgstr "Adreça d'interès"
-
-#. TRANS: Exception thrown when a bookmark has no attachments.
-#. TRANS: %1$s is a bookmark ID, %2$s is a notice ID (number).
-#, php-format
-msgid "Bookmark %1$s (notice %2$d) has no attachments."
-msgstr ""
+msgstr "Adreça"
 
 #. TRANS: Title for mini-posting window loaded from bookmarklet.
 #. TRANS: %s is the StatusNet site name.
@@ -138,42 +128,46 @@ msgstr ""
 
 #. TRANS: Client exception thrown when trying to import bookmarks without having the rights to do so.
 msgid "You may not restore your account."
-msgstr ""
+msgstr "No podeu restaurar el compte."
 
 #. TRANS: Client exception thrown when trying to import bookmarks and upload fails.
 #. TRANS: Client exception thrown when a file upload has failed.
 msgid "No uploaded file."
-msgstr ""
+msgstr "No hi ha cap fitxer pujat."
 
 #. TRANS: Client exception thrown when an uploaded file is too large.
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
 msgstr ""
+"El fitxer pujat excedeix allò que s'especifica a la directiva "
+"upload_max_filesize de php.ini."
 
 #. TRANS: Client exception thrown when an uploaded file is too large.
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form."
 msgstr ""
+"El fitxer pujat excedeix allò que s'estableix a la directiva MAX_FILE_SIZE "
+"especificada al formulari HTML."
 
 #. TRANS: Client exception thrown when a file was only partially uploaded.
 msgid "The uploaded file was only partially uploaded."
-msgstr ""
+msgstr "El fitxer pujat només ho ha estat parcialment."
 
 #. TRANS: Client exception thrown when a temporary folder is not present.
 msgid "Missing a temporary folder."
-msgstr ""
+msgstr "Manca una carpeta temporal."
 
 #. TRANS: Client exception thrown when writing to disk is not possible.
 msgid "Failed to write file to disk."
-msgstr ""
+msgstr "No s'ha pogut escriure el fitxer al disc."
 
 #. TRANS: Client exception thrown when a file upload has been stopped.
 msgid "File upload stopped by extension."
-msgstr ""
+msgstr "Una extensió ha aturat la pujada del fitxer."
 
 #. TRANS: Client exception thrown when a file upload operation has failed.
 msgid "System error uploading file."
-msgstr ""
+msgstr "S'ha produït un error de sistema en pujar el fitxer."
 
 #. TRANS: Server exception thrown when a file upload cannot be found.
 #. TRANS: %s is the file that could not be found.
@@ -197,21 +191,27 @@ msgstr "No és un fitxer regular: «%s»."
 #. TRANS: %s is the file that could not be read.
 #, php-format
 msgid "File \"%s\" not readable."
-msgstr ""
+msgstr "El fitxer «%s» no es pot llegir."
 
 #. TRANS: Success message after importing bookmarks.
 msgid ""
 "Bookmarks have been imported. Your bookmarks should now appear in search and "
 "your profile page."
 msgstr ""
+"S'han importat les adreces d'interès. Les vostres adreces d'interès haurien "
+"d'aparèixer ara a la cerca i a la vostra pàgina de perfil."
 
 #. TRANS: Busy message for importing bookmarks.
 msgid "Bookmarks are being imported. Please wait a few minutes for results."
 msgstr ""
+"S'estan important les adreces d'interès. Espereu uns pocs minuts per a "
+"veure'n els resultats."
 
 #. TRANS: Form instructions for importing bookmarks.
 msgid "You can upload a backed-up delicious.com bookmarks file."
 msgstr ""
+"Podeu pujar una fitxer de còpia de seguretat d'adreces d'interès de "
+"delicious.com."
 
 #. TRANS: Button text on form to import bookmarks.
 msgctxt "BUTTON"
@@ -252,15 +252,15 @@ msgstr "Nou marcador"
 
 #. TRANS: Client exception thrown when trying to create a new bookmark while not logged in.
 msgid "Must be logged in to post a bookmark."
-msgstr ""
+msgstr "Cal haver iniciat una sessió per publicar una adreça d'interès."
 
 #. TRANS: Client exception thrown when trying to create a new bookmark without a title.
 msgid "Bookmark must have a title."
-msgstr ""
+msgstr "L'adreça d'interès cal que tingui un títol."
 
 #. TRANS: Client exception thrown when trying to create a new bookmark without a URL.
 msgid "Bookmark must have an URL."
-msgstr ""
+msgstr "L'adreça d'interès ha de tenir un URL."
 
 #. TRANS: Page title after posting a bookmark.
 msgid "Bookmark posted"
@@ -269,4 +269,4 @@ msgstr "S'ha publicat l'adreça d'interès"
 #. TRANS: %s is the filename that contains a backup for a user.
 #, php-format
 msgid "Getting backup from file \"%s\"."
-msgstr ""
+msgstr "S'està recuperant la còpia de seguretat del fitxer \"%s\"."
diff --git a/plugins/Bookmark/locale/de/LC_MESSAGES/Bookmark.po b/plugins/Bookmark/locale/de/LC_MESSAGES/Bookmark.po
index 8c48ab1e93..603514c787 100644
--- a/plugins/Bookmark/locale/de/LC_MESSAGES/Bookmark.po
+++ b/plugins/Bookmark/locale/de/LC_MESSAGES/Bookmark.po
@@ -10,22 +10,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Bookmark\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:52+0000\n"
-"Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:56+0000\n"
+"Language-Team: German <https://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:26:03+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-10-10 14:11:41+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-bookmark\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#. TRANS: Client exception thrown when a file upload is incorrect.
-msgid "Bad import file."
-msgstr "Fehlerhafte Importdatei."
-
 #. TRANS: Client exception thrown when a bookmark in an import file is incorrectly formatted.
 msgid "No <A> tag in a <DT>."
 msgstr "Kein <a>-Tag in <dt>."
@@ -66,12 +62,6 @@ msgctxt "TITLE"
 msgid "Bookmark"
 msgstr "Lesezeichen"
 
-#. TRANS: Exception thrown when a bookmark has no attachments.
-#. TRANS: %1$s is a bookmark ID, %2$s is a notice ID (number).
-#, php-format
-msgid "Bookmark %1$s (notice %2$d) has no attachments."
-msgstr "Lesezeichen %1$s (Notiz %2$d) hat keine Anhänge."
-
 #. TRANS: Title for mini-posting window loaded from bookmarklet.
 #. TRANS: %s is the StatusNet site name.
 #, php-format
diff --git a/plugins/Bookmark/locale/es/LC_MESSAGES/Bookmark.po b/plugins/Bookmark/locale/es/LC_MESSAGES/Bookmark.po
new file mode 100644
index 0000000000..de0808df58
--- /dev/null
+++ b/plugins/Bookmark/locale/es/LC_MESSAGES/Bookmark.po
@@ -0,0 +1,269 @@
+# Translation of StatusNet - Bookmark to Spanish (español)
+# Exported from translatewiki.net
+#
+# Author: Erchache2000
+# Author: Fitoschido
+# Author: Od1n
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Bookmark\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:56+0000\n"
+"Language-Team: Spanish <https://translatewiki.net/wiki/Portal:es>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-10-10 14:11:41+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: es\n"
+"X-Message-Group: #out-statusnet-plugin-bookmark\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Client exception thrown when a bookmark in an import file is incorrectly formatted.
+msgid "No <A> tag in a <DT>."
+msgstr "No hay etiqueta <A> en un <DT>."
+
+#. TRANS: Client exception thrown when a bookmark in an import file is private.
+msgid "Skipping private bookmark."
+msgstr "Se omitirá el marcador privado."
+
+#. TRANS: Client exception thrown when referring to a non-existing bookmark.
+msgid "No such bookmark."
+msgstr "No hay tal marcador."
+
+#. TRANS: Title for bookmark.
+#. TRANS: %1$s is a user nickname, %2$s is a bookmark title.
+#, php-format
+msgid "%1$s's bookmark for \"%2$s\""
+msgstr "Marcador de %1$s para \" %2$s \""
+
+#. TRANS: Plugin description.
+msgid "Simple extension for supporting bookmarks."
+msgstr "Extensión simple para soporte de marcadores."
+
+#. TRANS: Link text in proile leading to import form.
+#. TRANS: Title for page to import del.icio.us bookmark backups on.
+msgid "Import del.icio.us bookmarks"
+msgstr "Importar favoritos de del.icio.us"
+
+#. TRANS: Client exception thrown when a bookmark is formatted incorrectly.
+msgid "Expected exactly 1 link rel=related in a Bookmark."
+msgstr "Se espera exáctamente 1 link rel=related en el marcador."
+
+#. TRANS: Server exception thrown when a bookmark has multiple attachments.
+msgid "Bookmark notice with the wrong number of attachments."
+msgstr "Aviso de marcardor con un número incorrecto de datos adjuntos."
+
+#. TRANS: Application title.
+msgctxt "TITLE"
+msgid "Bookmark"
+msgstr "Marcador"
+
+#. TRANS: Title for mini-posting window loaded from bookmarklet.
+#. TRANS: %s is the StatusNet site name.
+#, php-format
+msgid "Bookmark on %s"
+msgstr "Marcador en %s"
+
+#. TRANS: Client exception thrown when trying to save a new bookmark that already exists.
+msgid "Bookmark already exists."
+msgstr "Ya existe el marcador."
+
+#. TRANS: Bookmark content.
+#. TRANS: %1$s is a title, %2$s is a short URL, %3$s is the bookmark description,
+#. TRANS: %4$s is space separated list of hash tags.
+#, php-format
+msgid "\"%1$s\" %2$s %3$s %4$s"
+msgstr "\"%1$s\" %2$s %3$s %4$s"
+
+#. TRANS: Rendered bookmark content.
+#. TRANS: %1$s is a URL, %2$s the bookmark title, %3$s is the bookmark description,
+#. TRANS: %4$s is space separated list of hash tags.
+#, php-format
+msgid ""
+"<span class=\"xfolkentry\"><a class=\"taggedlink\" href=\"%1$s\">%2$s</a> "
+"<span class=\"description\">%3$s</span> <span class=\"meta\">%4$s</span></"
+"span>"
+msgstr ""
+"<span class=\"xfolkentry\"><a class=\"taggedlink\" href=\"%1$s\">%2$s</a> "
+"<span class=\"description\">%3$s</span> <span class=\"meta\">%4$s</span></"
+"span>"
+
+#. TRANS: Field label on form for adding a new bookmark.
+msgctxt "LABEL"
+msgid "URL"
+msgstr "URL"
+
+#. TRANS: Button text for action to save a new bookmark.
+msgctxt "BUTTON"
+msgid "Add"
+msgstr "Añadir"
+
+#. TRANS: Client exception thrown when an unknown URL is provided.
+msgid "Unknown URL."
+msgstr "URL desconocida."
+
+#. TRANS: Title of notice stream of notices with a given attachment (first page).
+#. TRANS: %s is the URL.
+#, php-format
+msgid "Notices linking to %s"
+msgstr "Mensajes enlazados a %s"
+
+#. TRANS: Title of notice stream of notices with a given attachment (all but first page).
+#. TRANS: %1$s is the URL, %2$s is the page number.
+#, php-format
+msgid "Notices linking to %1$s, page %2$d"
+msgstr "Mensajes enlazados a %1$s, página %2$d"
+
+#. TRANS: Client exception thrown when trying to import bookmarks without being logged in.
+msgid "Only logged-in users can import del.icio.us backups."
+msgstr ""
+"Sólo usuarios registrados pueden importar copias de seguridad de del.icio.us."
+
+#. TRANS: Client exception thrown when trying to import bookmarks without having the rights to do so.
+msgid "You may not restore your account."
+msgstr "No se puede restaurar tu cuenta."
+
+#. TRANS: Client exception thrown when trying to import bookmarks and upload fails.
+#. TRANS: Client exception thrown when a file upload has failed.
+msgid "No uploaded file."
+msgstr "Ningún archivo cargado."
+
+#. TRANS: Client exception thrown when an uploaded file is too large.
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
+msgstr ""
+"El archivo subido sobrepasa la directiva upload_max_filesize en php.ini"
+
+#. TRANS: Client exception thrown when an uploaded file is too large.
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form."
+msgstr ""
+"El archivo subido sobrepasa la directiva MAX_FILE_SIZE que se especificó en "
+"el formulario HTML."
+
+#. TRANS: Client exception thrown when a file was only partially uploaded.
+msgid "The uploaded file was only partially uploaded."
+msgstr "El archivo subido sólo fue parcialmente subido."
+
+#. TRANS: Client exception thrown when a temporary folder is not present.
+msgid "Missing a temporary folder."
+msgstr "Falta una carpeta temporal."
+
+#. TRANS: Client exception thrown when writing to disk is not possible.
+msgid "Failed to write file to disk."
+msgstr "No se pudo escribir el archivo en el disco."
+
+#. TRANS: Client exception thrown when a file upload has been stopped.
+msgid "File upload stopped by extension."
+msgstr "La subida de archivos se detuvo por una extensión."
+
+#. TRANS: Client exception thrown when a file upload operation has failed.
+msgid "System error uploading file."
+msgstr "Error del sistema al subir el archivo"
+
+#. TRANS: Server exception thrown when a file upload cannot be found.
+#. TRANS: %s is the file that could not be found.
+#. TRANS: Exception thrown when a file upload cannot be found.
+#. TRANS: %s is the file that could not be found.
+#, php-format
+msgid "No such file \"%s\"."
+msgstr "No hay tal archivo \" %s \"."
+
+#. TRANS: Server exception thrown when a file upload is incorrect.
+#. TRANS: %s is the irregular file.
+#. TRANS: Exception thrown when a file upload is incorrect.
+#. TRANS: %s is the irregular file.
+#, php-format
+msgid "Not a regular file: \"%s\"."
+msgstr "No es un archivo regular: \" %s \"."
+
+#. TRANS: Server exception thrown when a file upload is not readable.
+#. TRANS: %s is the file that could not be read.
+#. TRANS: Exception thrown when a file upload is not readable.
+#. TRANS: %s is the file that could not be read.
+#, php-format
+msgid "File \"%s\" not readable."
+msgstr "Archivo \" %s \" no legible."
+
+#. TRANS: Success message after importing bookmarks.
+msgid ""
+"Bookmarks have been imported. Your bookmarks should now appear in search and "
+"your profile page."
+msgstr ""
+"Marcadores han sido importados. Tus marcadores deben aparecer ahora en la "
+"búsqueda y la página de perfil."
+
+#. TRANS: Busy message for importing bookmarks.
+msgid "Bookmarks are being imported. Please wait a few minutes for results."
+msgstr ""
+"Los marcadores se están importando. Por favor, espere unos minutos para "
+"obtener los resultados."
+
+#. TRANS: Form instructions for importing bookmarks.
+msgid "You can upload a backed-up delicious.com bookmarks file."
+msgstr ""
+"Puede cargar una copia de seguridad del archivo de marcadores de delicious."
+"com."
+
+#. TRANS: Button text on form to import bookmarks.
+msgctxt "BUTTON"
+msgid "Upload"
+msgstr "Subir"
+
+#. TRANS: Button title on form to import bookmarks.
+msgid "Upload the file."
+msgstr "Subir este archivo"
+
+#. TRANS: Field label on form for adding a new bookmark.
+msgctxt "LABEL"
+msgid "Title"
+msgstr "Título"
+
+#. TRANS: Field label on form for adding a new bookmark.
+msgctxt "LABEL"
+msgid "Notes"
+msgstr "Notas"
+
+#. TRANS: Field label on form for adding a new bookmark.
+msgctxt "LABEL"
+msgid "Tags"
+msgstr "Etiquetas"
+
+#. TRANS: Field title on form for adding a new bookmark.
+msgid "Comma- or space-separated list of tags."
+msgstr "Lista de etiquetas, separada por comas o espacio."
+
+#. TRANS: Button text for action to save a new bookmark.
+msgctxt "BUTTON"
+msgid "Save"
+msgstr "Guardar"
+
+#. TRANS: Title for action to create a new bookmark.
+msgid "New bookmark"
+msgstr "Marcador nuevo"
+
+#. TRANS: Client exception thrown when trying to create a new bookmark while not logged in.
+msgid "Must be logged in to post a bookmark."
+msgstr "Debe haber iniciado sesión publicar un marcador."
+
+#. TRANS: Client exception thrown when trying to create a new bookmark without a title.
+msgid "Bookmark must have a title."
+msgstr "Marcador debe tener un título."
+
+#. TRANS: Client exception thrown when trying to create a new bookmark without a URL.
+msgid "Bookmark must have an URL."
+msgstr "Marcador debe tener una dirección URL."
+
+#. TRANS: Page title after posting a bookmark.
+msgid "Bookmark posted"
+msgstr "Marcador publicado"
+
+#. TRANS: %s is the filename that contains a backup for a user.
+#, php-format
+msgid "Getting backup from file \"%s\"."
+msgstr "Obtener copia de seguridad del archivo \" %s \"."
diff --git a/plugins/Bookmark/locale/eu/LC_MESSAGES/Bookmark.po b/plugins/Bookmark/locale/eu/LC_MESSAGES/Bookmark.po
new file mode 100644
index 0000000000..47a4fc0379
--- /dev/null
+++ b/plugins/Bookmark/locale/eu/LC_MESSAGES/Bookmark.po
@@ -0,0 +1,263 @@
+# Translation of StatusNet - Bookmark to Basque (euskara)
+# Exported from translatewiki.net
+#
+# Author: Artsuaga
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Bookmark\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:56+0000\n"
+"Language-Team: Basque <https://translatewiki.net/wiki/Portal:eu>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-10-10 14:11:41+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: eu\n"
+"X-Message-Group: #out-statusnet-plugin-bookmark\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Client exception thrown when a bookmark in an import file is incorrectly formatted.
+msgid "No <A> tag in a <DT>."
+msgstr "Ez dago <A> etiketari <DT> batean."
+
+#. TRANS: Client exception thrown when a bookmark in an import file is private.
+msgid "Skipping private bookmark."
+msgstr "Lastermarka pribatutik irteten."
+
+#. TRANS: Client exception thrown when referring to a non-existing bookmark.
+msgid "No such bookmark."
+msgstr "Ez dago lastermarka hori."
+
+#. TRANS: Title for bookmark.
+#. TRANS: %1$s is a user nickname, %2$s is a bookmark title.
+#, php-format
+msgid "%1$s's bookmark for \"%2$s\""
+msgstr "%1$s(r)en \"%2$s\" lastermarkak"
+
+#. TRANS: Plugin description.
+msgid "Simple extension for supporting bookmarks."
+msgstr "Lastermarkak jasateko oinarrizko hedapena"
+
+#. TRANS: Link text in proile leading to import form.
+#. TRANS: Title for page to import del.icio.us bookmark backups on.
+msgid "Import del.icio.us bookmarks"
+msgstr "Inportatu del.icio.us-eko lastermarkak"
+
+#. TRANS: Client exception thrown when a bookmark is formatted incorrectly.
+msgid "Expected exactly 1 link rel=related in a Bookmark."
+msgstr "Lastermarka batean rel=related esteka bat espero zen."
+
+#. TRANS: Server exception thrown when a bookmark has multiple attachments.
+msgid "Bookmark notice with the wrong number of attachments."
+msgstr "Lastermarka oharra eranskin kopuru okerrarekin."
+
+#. TRANS: Application title.
+msgctxt "TITLE"
+msgid "Bookmark"
+msgstr "Lastermarka"
+
+#. TRANS: Title for mini-posting window loaded from bookmarklet.
+#. TRANS: %s is the StatusNet site name.
+#, php-format
+msgid "Bookmark on %s"
+msgstr "%s(e)n lastermarkak"
+
+#. TRANS: Client exception thrown when trying to save a new bookmark that already exists.
+msgid "Bookmark already exists."
+msgstr "Lastermarka hori existizen da jada."
+
+#. TRANS: Bookmark content.
+#. TRANS: %1$s is a title, %2$s is a short URL, %3$s is the bookmark description,
+#. TRANS: %4$s is space separated list of hash tags.
+#, php-format
+msgid "\"%1$s\" %2$s %3$s %4$s"
+msgstr "\"%1$s\" %2$s %3$s %4$s"
+
+#. TRANS: Rendered bookmark content.
+#. TRANS: %1$s is a URL, %2$s the bookmark title, %3$s is the bookmark description,
+#. TRANS: %4$s is space separated list of hash tags.
+#, php-format
+msgid ""
+"<span class=\"xfolkentry\"><a class=\"taggedlink\" href=\"%1$s\">%2$s</a> "
+"<span class=\"description\">%3$s</span> <span class=\"meta\">%4$s</span></"
+"span>"
+msgstr ""
+"<span class=\"xfolkentry\"><a class=\"taggedlink\" href=\"%1$s\">%2$s</a> "
+"<span class=\"description\">%3$s</span> <span class=\"meta\">%4$s</span></"
+"span>"
+
+#. TRANS: Field label on form for adding a new bookmark.
+msgctxt "LABEL"
+msgid "URL"
+msgstr "URL"
+
+#. TRANS: Button text for action to save a new bookmark.
+msgctxt "BUTTON"
+msgid "Add"
+msgstr "Gehitu"
+
+#. TRANS: Client exception thrown when an unknown URL is provided.
+msgid "Unknown URL."
+msgstr "URL ezezaguna."
+
+#. TRANS: Title of notice stream of notices with a given attachment (first page).
+#. TRANS: %s is the URL.
+#, php-format
+msgid "Notices linking to %s"
+msgstr "%s(r)a estekatzen duten oharrak"
+
+#. TRANS: Title of notice stream of notices with a given attachment (all but first page).
+#. TRANS: %1$s is the URL, %2$s is the page number.
+#, php-format
+msgid "Notices linking to %1$s, page %2$d"
+msgstr "%1$s(r)a estekatzen duten oharrak, %2$d. orria"
+
+#. TRANS: Client exception thrown when trying to import bookmarks without being logged in.
+msgid "Only logged-in users can import del.icio.us backups."
+msgstr ""
+"Izen emandako erabiltzaileek soilik inporta ditzakete del.icio.us "
+"babeskopiak."
+
+#. TRANS: Client exception thrown when trying to import bookmarks without having the rights to do so.
+msgid "You may not restore your account."
+msgstr "Ez zenuke zure kontua leheneratu behar."
+
+#. TRANS: Client exception thrown when trying to import bookmarks and upload fails.
+#. TRANS: Client exception thrown when a file upload has failed.
+msgid "No uploaded file."
+msgstr "Ez dago igotako fitxategirik."
+
+#. TRANS: Client exception thrown when an uploaded file is too large.
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
+msgstr ""
+"php.ini-ko upload_max_filesize aldagaia gainditzen du igotako fitxategiak."
+
+#. TRANS: Client exception thrown when an uploaded file is too large.
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form."
+msgstr ""
+"HTML inprimakiko MAX_FILE_SIZE aldagaia gainditzen du igotako fitxategiak.."
+
+#. TRANS: Client exception thrown when a file was only partially uploaded.
+msgid "The uploaded file was only partially uploaded."
+msgstr "Igotako fitxategiaren zati bat soilik igo da."
+
+#. TRANS: Client exception thrown when a temporary folder is not present.
+msgid "Missing a temporary folder."
+msgstr "Karpeta tenporala falta da."
+
+#. TRANS: Client exception thrown when writing to disk is not possible.
+msgid "Failed to write file to disk."
+msgstr "Fitxategia diskoan idaztean akatsa."
+
+#. TRANS: Client exception thrown when a file upload has been stopped.
+msgid "File upload stopped by extension."
+msgstr "Fitxategi igoera gelditu egin da luzapen okerragatik."
+
+#. TRANS: Client exception thrown when a file upload operation has failed.
+msgid "System error uploading file."
+msgstr "Fitxateiga igotzean sistema akatsa."
+
+#. TRANS: Server exception thrown when a file upload cannot be found.
+#. TRANS: %s is the file that could not be found.
+#. TRANS: Exception thrown when a file upload cannot be found.
+#. TRANS: %s is the file that could not be found.
+#, php-format
+msgid "No such file \"%s\"."
+msgstr "Ez dago \"%s\" fitxategirik."
+
+#. TRANS: Server exception thrown when a file upload is incorrect.
+#. TRANS: %s is the irregular file.
+#. TRANS: Exception thrown when a file upload is incorrect.
+#. TRANS: %s is the irregular file.
+#, php-format
+msgid "Not a regular file: \"%s\"."
+msgstr "Ez da fitxategi erregularra: \"%s\"."
+
+#. TRANS: Server exception thrown when a file upload is not readable.
+#. TRANS: %s is the file that could not be read.
+#. TRANS: Exception thrown when a file upload is not readable.
+#. TRANS: %s is the file that could not be read.
+#, php-format
+msgid "File \"%s\" not readable."
+msgstr "\"%s\" fitxategia irakurtezina."
+
+#. TRANS: Success message after importing bookmarks.
+msgid ""
+"Bookmarks have been imported. Your bookmarks should now appear in search and "
+"your profile page."
+msgstr ""
+"Lastermarkak inportatu dira. Zure lastermarkak bilaketan eta zure profilean "
+"agertu beharko lukete."
+
+#. TRANS: Busy message for importing bookmarks.
+msgid "Bookmarks are being imported. Please wait a few minutes for results."
+msgstr "Lastermarkak inportatzen ari dira. Itxaron minutu gutxi batzuk."
+
+#. TRANS: Form instructions for importing bookmarks.
+msgid "You can upload a backed-up delicious.com bookmarks file."
+msgstr "Delicious.com-eko babeskopia fitxategi bat igo dezakezu."
+
+#. TRANS: Button text on form to import bookmarks.
+msgctxt "BUTTON"
+msgid "Upload"
+msgstr "Igo"
+
+#. TRANS: Button title on form to import bookmarks.
+msgid "Upload the file."
+msgstr "Fitxategia igo."
+
+#. TRANS: Field label on form for adding a new bookmark.
+msgctxt "LABEL"
+msgid "Title"
+msgstr "Titulua"
+
+#. TRANS: Field label on form for adding a new bookmark.
+msgctxt "LABEL"
+msgid "Notes"
+msgstr "Oharrak"
+
+#. TRANS: Field label on form for adding a new bookmark.
+msgctxt "LABEL"
+msgid "Tags"
+msgstr "Etiketak"
+
+#. TRANS: Field title on form for adding a new bookmark.
+msgid "Comma- or space-separated list of tags."
+msgstr "Koma edo espazioz banandutako etiketa zerrenda."
+
+#. TRANS: Button text for action to save a new bookmark.
+msgctxt "BUTTON"
+msgid "Save"
+msgstr "Gorde"
+
+#. TRANS: Title for action to create a new bookmark.
+msgid "New bookmark"
+msgstr "Lastermarka berria"
+
+#. TRANS: Client exception thrown when trying to create a new bookmark while not logged in.
+msgid "Must be logged in to post a bookmark."
+msgstr "Lastermarka bat bidaltzeko saioa hasi behar duzu."
+
+#. TRANS: Client exception thrown when trying to create a new bookmark without a title.
+msgid "Bookmark must have a title."
+msgstr "Lastermarkak titulu bat behar du."
+
+#. TRANS: Client exception thrown when trying to create a new bookmark without a URL.
+msgid "Bookmark must have an URL."
+msgstr "Lastermarkak URL bat behar du."
+
+#. TRANS: Page title after posting a bookmark.
+msgid "Bookmark posted"
+msgstr "Lastermarka bidali da"
+
+#. TRANS: %s is the filename that contains a backup for a user.
+#, php-format
+msgid "Getting backup from file \"%s\"."
+msgstr "\"%s\" fitxategitik babeskopia lortzen."
diff --git a/plugins/Bookmark/locale/fr/LC_MESSAGES/Bookmark.po b/plugins/Bookmark/locale/fr/LC_MESSAGES/Bookmark.po
index ce986c0e11..382fb2a81e 100644
--- a/plugins/Bookmark/locale/fr/LC_MESSAGES/Bookmark.po
+++ b/plugins/Bookmark/locale/fr/LC_MESSAGES/Bookmark.po
@@ -1,8 +1,9 @@
-# Translation of StatusNet - Bookmark to French (Français)
+# Translation of StatusNet - Bookmark to French (français)
 # Exported from translatewiki.net
 #
 # Author: Brunoperel
 # Author: Crochet.david
+# Author: Gomoko
 # Author: IAlex
 # Author: Iketsi
 # Author: Notafish
@@ -14,29 +15,25 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Bookmark\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:52+0000\n"
-"Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:56+0000\n"
+"Language-Team: French <https://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:26:03+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-10-10 14:11:41+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-bookmark\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#. TRANS: Client exception thrown when a file upload is incorrect.
-msgid "Bad import file."
-msgstr "Mauvais fichier d'importation"
-
 #. TRANS: Client exception thrown when a bookmark in an import file is incorrectly formatted.
 msgid "No <A> tag in a <DT>."
 msgstr "Les balises <A> sont interdites au sein des balises <DT>."
 
 #. TRANS: Client exception thrown when a bookmark in an import file is private.
 msgid "Skipping private bookmark."
-msgstr ""
+msgstr "Sauter le signet privé."
 
 #. TRANS: Client exception thrown when referring to a non-existing bookmark.
 msgid "No such bookmark."
@@ -46,7 +43,7 @@ msgstr "Ce signet n'existe pas."
 #. TRANS: %1$s is a user nickname, %2$s is a bookmark title.
 #, php-format
 msgid "%1$s's bookmark for \"%2$s\""
-msgstr ""
+msgstr "Signet de %1$s pour \"%2$s\""
 
 #. TRANS: Plugin description.
 msgid "Simple extension for supporting bookmarks."
@@ -63,19 +60,13 @@ msgstr "Un seul lien rel=related doit être inclus dans un signet"
 
 #. TRANS: Server exception thrown when a bookmark has multiple attachments.
 msgid "Bookmark notice with the wrong number of attachments."
-msgstr ""
+msgstr "Avis de signet avec le mauvais nombre d'attachements."
 
 #. TRANS: Application title.
 msgctxt "TITLE"
 msgid "Bookmark"
 msgstr "Favoris"
 
-#. TRANS: Exception thrown when a bookmark has no attachments.
-#. TRANS: %1$s is a bookmark ID, %2$s is a notice ID (number).
-#, php-format
-msgid "Bookmark %1$s (notice %2$d) has no attachments."
-msgstr "Le signet %1$s (notice %2$d) ne possède pas de pièces jointes."
-
 #. TRANS: Title for mini-posting window loaded from bookmarklet.
 #. TRANS: %s is the StatusNet site name.
 #, php-format
@@ -124,13 +115,13 @@ msgstr "URL inconnu."
 #. TRANS: %s is the URL.
 #, php-format
 msgid "Notices linking to %s"
-msgstr ""
+msgstr "Notices faisant référence à %s"
 
 #. TRANS: Title of notice stream of notices with a given attachment (all but first page).
 #. TRANS: %1$s is the URL, %2$s is the page number.
 #, php-format
 msgid "Notices linking to %1$s, page %2$d"
-msgstr ""
+msgstr "Avis faisant référence à %1$s, page %2$d"
 
 #. TRANS: Client exception thrown when trying to import bookmarks without being logged in.
 msgid "Only logged-in users can import del.icio.us backups."
diff --git a/plugins/Bookmark/locale/gl/LC_MESSAGES/Bookmark.po b/plugins/Bookmark/locale/gl/LC_MESSAGES/Bookmark.po
new file mode 100644
index 0000000000..f24b88c521
--- /dev/null
+++ b/plugins/Bookmark/locale/gl/LC_MESSAGES/Bookmark.po
@@ -0,0 +1,263 @@
+# Translation of StatusNet - Bookmark to Galician (galego)
+# Exported from translatewiki.net
+#
+# Author: Toliño
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Bookmark\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:56+0000\n"
+"Language-Team: Galician <https://translatewiki.net/wiki/Portal:gl>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-10-10 14:11:41+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: gl\n"
+"X-Message-Group: #out-statusnet-plugin-bookmark\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Client exception thrown when a bookmark in an import file is incorrectly formatted.
+msgid "No <A> tag in a <DT>."
+msgstr "Falta a etiqueta <A> nunha <DT>."
+
+#. TRANS: Client exception thrown when a bookmark in an import file is private.
+msgid "Skipping private bookmark."
+msgstr "Saltando o marcador privado."
+
+#. TRANS: Client exception thrown when referring to a non-existing bookmark.
+msgid "No such bookmark."
+msgstr "Non existe ese marcador."
+
+#. TRANS: Title for bookmark.
+#. TRANS: %1$s is a user nickname, %2$s is a bookmark title.
+#, php-format
+msgid "%1$s's bookmark for \"%2$s\""
+msgstr "Marcador de %1$s para \"%2$s\""
+
+#. TRANS: Plugin description.
+msgid "Simple extension for supporting bookmarks."
+msgstr "Extensión simple para soportar marcadores."
+
+#. TRANS: Link text in proile leading to import form.
+#. TRANS: Title for page to import del.icio.us bookmark backups on.
+msgid "Import del.icio.us bookmarks"
+msgstr "Importar os marcadores de del.icio.us"
+
+#. TRANS: Client exception thrown when a bookmark is formatted incorrectly.
+msgid "Expected exactly 1 link rel=related in a Bookmark."
+msgstr "Agardábase exactamente 1 ligazón rel=related nun marcador."
+
+#. TRANS: Server exception thrown when a bookmark has multiple attachments.
+msgid "Bookmark notice with the wrong number of attachments."
+msgstr "A nota do marcador ten un número incorrecto de anexos."
+
+#. TRANS: Application title.
+msgctxt "TITLE"
+msgid "Bookmark"
+msgstr "Favorito"
+
+#. TRANS: Title for mini-posting window loaded from bookmarklet.
+#. TRANS: %s is the StatusNet site name.
+#, php-format
+msgid "Bookmark on %s"
+msgstr "Marcador en %s"
+
+#. TRANS: Client exception thrown when trying to save a new bookmark that already exists.
+msgid "Bookmark already exists."
+msgstr "O marcador xa existe."
+
+#. TRANS: Bookmark content.
+#. TRANS: %1$s is a title, %2$s is a short URL, %3$s is the bookmark description,
+#. TRANS: %4$s is space separated list of hash tags.
+#, php-format
+msgid "\"%1$s\" %2$s %3$s %4$s"
+msgstr "\"%1$s\" %2$s %3$s %4$s"
+
+#. TRANS: Rendered bookmark content.
+#. TRANS: %1$s is a URL, %2$s the bookmark title, %3$s is the bookmark description,
+#. TRANS: %4$s is space separated list of hash tags.
+#, php-format
+msgid ""
+"<span class=\"xfolkentry\"><a class=\"taggedlink\" href=\"%1$s\">%2$s</a> "
+"<span class=\"description\">%3$s</span> <span class=\"meta\">%4$s</span></"
+"span>"
+msgstr ""
+"<span class=\"xfolkentry\"><a class=\"taggedlink\" href=\"%1$s\">%2$s</a> "
+"<span class=\"description\">%3$s</span> <span class=\"meta\">%4$s</span></"
+"span>"
+
+#. TRANS: Field label on form for adding a new bookmark.
+msgctxt "LABEL"
+msgid "URL"
+msgstr "URL"
+
+#. TRANS: Button text for action to save a new bookmark.
+msgctxt "BUTTON"
+msgid "Add"
+msgstr "Engadir"
+
+#. TRANS: Client exception thrown when an unknown URL is provided.
+msgid "Unknown URL."
+msgstr "Enderezo URL descoñecido."
+
+#. TRANS: Title of notice stream of notices with a given attachment (first page).
+#. TRANS: %s is the URL.
+#, php-format
+msgid "Notices linking to %s"
+msgstr "Notas que ligan con %s"
+
+#. TRANS: Title of notice stream of notices with a given attachment (all but first page).
+#. TRANS: %1$s is the URL, %2$s is the page number.
+#, php-format
+msgid "Notices linking to %1$s, page %2$d"
+msgstr "Notas que ligan con %1$s, páxina %2$d"
+
+#. TRANS: Client exception thrown when trying to import bookmarks without being logged in.
+msgid "Only logged-in users can import del.icio.us backups."
+msgstr ""
+"Unicamente os usuarios rexistrados poden importar copias de seguridade de "
+"del.icio.us."
+
+#. TRANS: Client exception thrown when trying to import bookmarks without having the rights to do so.
+msgid "You may not restore your account."
+msgstr "Non pode restaurar a súa conta."
+
+#. TRANS: Client exception thrown when trying to import bookmarks and upload fails.
+#. TRANS: Client exception thrown when a file upload has failed.
+msgid "No uploaded file."
+msgstr "Ningún ficheiro cargado."
+
+#. TRANS: Client exception thrown when an uploaded file is too large.
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
+msgstr "O ficheiro subido supera a directiva upload_max_filesize no php.ini."
+
+#. TRANS: Client exception thrown when an uploaded file is too large.
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form."
+msgstr ""
+"O ficheiro subido supera a directiva MAX_FILE_SIZE especificada no "
+"formulario HTML."
+
+#. TRANS: Client exception thrown when a file was only partially uploaded.
+msgid "The uploaded file was only partially uploaded."
+msgstr "O ficheiro só se subiu parcialmente."
+
+#. TRANS: Client exception thrown when a temporary folder is not present.
+msgid "Missing a temporary folder."
+msgstr "Falta un cartafol temporal."
+
+#. TRANS: Client exception thrown when writing to disk is not possible.
+msgid "Failed to write file to disk."
+msgstr "Non se puido escribir o ficheiro no disco."
+
+#. TRANS: Client exception thrown when a file upload has been stopped.
+msgid "File upload stopped by extension."
+msgstr "Interrompeuse a carga do ficheiro por mor da extensión."
+
+#. TRANS: Client exception thrown when a file upload operation has failed.
+msgid "System error uploading file."
+msgstr "Houbo un erro no sistema ao cargar o ficheiro."
+
+#. TRANS: Server exception thrown when a file upload cannot be found.
+#. TRANS: %s is the file that could not be found.
+#. TRANS: Exception thrown when a file upload cannot be found.
+#. TRANS: %s is the file that could not be found.
+#, php-format
+msgid "No such file \"%s\"."
+msgstr "Non existe o ficheiro \"%s\"."
+
+#. TRANS: Server exception thrown when a file upload is incorrect.
+#. TRANS: %s is the irregular file.
+#. TRANS: Exception thrown when a file upload is incorrect.
+#. TRANS: %s is the irregular file.
+#, php-format
+msgid "Not a regular file: \"%s\"."
+msgstr "O ficheiro non é normal: \"%s\"."
+
+#. TRANS: Server exception thrown when a file upload is not readable.
+#. TRANS: %s is the file that could not be read.
+#. TRANS: Exception thrown when a file upload is not readable.
+#. TRANS: %s is the file that could not be read.
+#, php-format
+msgid "File \"%s\" not readable."
+msgstr "Non se pode ler o ficheiro \"%s\"."
+
+#. TRANS: Success message after importing bookmarks.
+msgid ""
+"Bookmarks have been imported. Your bookmarks should now appear in search and "
+"your profile page."
+msgstr ""
+"Importáronse os marcadores. Os seus marcadores debería aparecer nas procuras "
+"e na páxina do seu perfil."
+
+#. TRANS: Busy message for importing bookmarks.
+msgid "Bookmarks are being imported. Please wait a few minutes for results."
+msgstr "Estanse importando os marcadores. Agarde uns minutos polos resultados."
+
+#. TRANS: Form instructions for importing bookmarks.
+msgid "You can upload a backed-up delicious.com bookmarks file."
+msgstr "Pode cargar unha copia de seguridade de marcadores de delicious.com ."
+
+#. TRANS: Button text on form to import bookmarks.
+msgctxt "BUTTON"
+msgid "Upload"
+msgstr "Cargar"
+
+#. TRANS: Button title on form to import bookmarks.
+msgid "Upload the file."
+msgstr "Cargar o ficheiro."
+
+#. TRANS: Field label on form for adding a new bookmark.
+msgctxt "LABEL"
+msgid "Title"
+msgstr "Título"
+
+#. TRANS: Field label on form for adding a new bookmark.
+msgctxt "LABEL"
+msgid "Notes"
+msgstr "Notas"
+
+#. TRANS: Field label on form for adding a new bookmark.
+msgctxt "LABEL"
+msgid "Tags"
+msgstr "Etiquetas"
+
+#. TRANS: Field title on form for adding a new bookmark.
+msgid "Comma- or space-separated list of tags."
+msgstr "Lista de etiquetas separadas por comas ou por espazos en branco."
+
+#. TRANS: Button text for action to save a new bookmark.
+msgctxt "BUTTON"
+msgid "Save"
+msgstr "Gardar"
+
+#. TRANS: Title for action to create a new bookmark.
+msgid "New bookmark"
+msgstr "Novo marcador"
+
+#. TRANS: Client exception thrown when trying to create a new bookmark while not logged in.
+msgid "Must be logged in to post a bookmark."
+msgstr "Cómpre estar rexistrado para publicar un marcador."
+
+#. TRANS: Client exception thrown when trying to create a new bookmark without a title.
+msgid "Bookmark must have a title."
+msgstr "O marcador debe ter un título."
+
+#. TRANS: Client exception thrown when trying to create a new bookmark without a URL.
+msgid "Bookmark must have an URL."
+msgstr "O marcador debe ter un enderezo URL."
+
+#. TRANS: Page title after posting a bookmark.
+msgid "Bookmark posted"
+msgstr "Marcador publicado"
+
+#. TRANS: %s is the filename that contains a backup for a user.
+#, php-format
+msgid "Getting backup from file \"%s\"."
+msgstr "Obtendo a copia de seguridade desde o ficheiro \"%s\"."
diff --git a/plugins/Bookmark/locale/ia/LC_MESSAGES/Bookmark.po b/plugins/Bookmark/locale/ia/LC_MESSAGES/Bookmark.po
index 74a72b8d6d..a1cd3b0b2a 100644
--- a/plugins/Bookmark/locale/ia/LC_MESSAGES/Bookmark.po
+++ b/plugins/Bookmark/locale/ia/LC_MESSAGES/Bookmark.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Bookmark to Interlingua (Interlingua)
+# Translation of StatusNet - Bookmark to Interlingua (interlingua)
 # Exported from translatewiki.net
 #
 # Author: McDutchie
@@ -9,22 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Bookmark\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:52+0000\n"
-"Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:57+0000\n"
+"Language-Team: Interlingua <https://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:26:03+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-10-10 14:11:41+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-bookmark\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#. TRANS: Client exception thrown when a file upload is incorrect.
-msgid "Bad import file."
-msgstr "Mal file de importation."
-
 #. TRANS: Client exception thrown when a bookmark in an import file is incorrectly formatted.
 msgid "No <A> tag in a <DT>."
 msgstr "Etiquetta <A> mancante in un <DT>."
@@ -66,12 +62,6 @@ msgctxt "TITLE"
 msgid "Bookmark"
 msgstr "Marcapaginas"
 
-#. TRANS: Exception thrown when a bookmark has no attachments.
-#. TRANS: %1$s is a bookmark ID, %2$s is a notice ID (number).
-#, php-format
-msgid "Bookmark %1$s (notice %2$d) has no attachments."
-msgstr "Le marcapaginas %1$s (nota %2$d) non ha annexos."
-
 #. TRANS: Title for mini-posting window loaded from bookmarklet.
 #. TRANS: %s is the StatusNet site name.
 #, php-format
diff --git a/plugins/Bookmark/locale/it/LC_MESSAGES/Bookmark.po b/plugins/Bookmark/locale/it/LC_MESSAGES/Bookmark.po
new file mode 100644
index 0000000000..d1b580fc18
--- /dev/null
+++ b/plugins/Bookmark/locale/it/LC_MESSAGES/Bookmark.po
@@ -0,0 +1,264 @@
+# Translation of StatusNet - Bookmark to Italian (italiano)
+# Exported from translatewiki.net
+#
+# Author: Od1n
+# Author: Ximo17
+# Author: 1009
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Bookmark\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:57+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-10-10 14:11:41+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Client exception thrown when a bookmark in an import file is incorrectly formatted.
+msgid "No <A> tag in a <DT>."
+msgstr "Nessun tag <A> in un <DT>."
+
+#. TRANS: Client exception thrown when a bookmark in an import file is private.
+msgid "Skipping private bookmark."
+msgstr "Saltare il segnalibro privato."
+
+#. TRANS: Client exception thrown when referring to a non-existing bookmark.
+msgid "No such bookmark."
+msgstr "Nessun bookmark di questo tipo."
+
+#. TRANS: Title for bookmark.
+#. TRANS: %1$s is a user nickname, %2$s is a bookmark title.
+#, php-format
+msgid "%1$s's bookmark for \"%2$s\""
+msgstr "Il segnalibro di %1$s per \"%2$s\""
+
+#. TRANS: Plugin description.
+msgid "Simple extension for supporting bookmarks."
+msgstr "Estensione semplice per supportare i segnalibri."
+
+#. TRANS: Link text in proile leading to import form.
+#. TRANS: Title for page to import del.icio.us bookmark backups on.
+msgid "Import del.icio.us bookmarks"
+msgstr "Importa i segnalibri di del.icio.us"
+
+#. TRANS: Client exception thrown when a bookmark is formatted incorrectly.
+msgid "Expected exactly 1 link rel=related in a Bookmark."
+msgstr "Previsto esattamente 1 link rel=related in un segnalibro."
+
+#. TRANS: Server exception thrown when a bookmark has multiple attachments.
+msgid "Bookmark notice with the wrong number of attachments."
+msgstr "Avviso segnalibro con il numero errato di allegati."
+
+#. TRANS: Application title.
+msgctxt "TITLE"
+msgid "Bookmark"
+msgstr "Segnalibro"
+
+#. TRANS: Title for mini-posting window loaded from bookmarklet.
+#. TRANS: %s is the StatusNet site name.
+#, php-format
+msgid "Bookmark on %s"
+msgstr "Segnalibro di %s"
+
+#. TRANS: Client exception thrown when trying to save a new bookmark that already exists.
+msgid "Bookmark already exists."
+msgstr "Segnalibro già esistente."
+
+#. TRANS: Bookmark content.
+#. TRANS: %1$s is a title, %2$s is a short URL, %3$s is the bookmark description,
+#. TRANS: %4$s is space separated list of hash tags.
+#, php-format
+msgid "\"%1$s\" %2$s %3$s %4$s"
+msgstr "\"%1$s\" %2$s %3$s %4$s"
+
+#. TRANS: Rendered bookmark content.
+#. TRANS: %1$s is a URL, %2$s the bookmark title, %3$s is the bookmark description,
+#. TRANS: %4$s is space separated list of hash tags.
+#, php-format
+msgid ""
+"<span class=\"xfolkentry\"><a class=\"taggedlink\" href=\"%1$s\">%2$s</a> "
+"<span class=\"description\">%3$s</span> <span class=\"meta\">%4$s</span></"
+"span>"
+msgstr ""
+"<span class=\"xfolkentry\"><a class=\"taggedlink\" href=\"%1$s\">%2$s</a> "
+"<span class=\"description\">%3$s</span> <span class=\"meta\">%4$s</span></"
+"span>"
+
+#. TRANS: Field label on form for adding a new bookmark.
+msgctxt "LABEL"
+msgid "URL"
+msgstr "URL"
+
+#. TRANS: Button text for action to save a new bookmark.
+msgctxt "BUTTON"
+msgid "Add"
+msgstr "Aggiungi"
+
+#. TRANS: Client exception thrown when an unknown URL is provided.
+msgid "Unknown URL."
+msgstr "URL sconosciuto."
+
+#. TRANS: Title of notice stream of notices with a given attachment (first page).
+#. TRANS: %s is the URL.
+#, php-format
+msgid "Notices linking to %s"
+msgstr "Notizie collegate a %s"
+
+#. TRANS: Title of notice stream of notices with a given attachment (all but first page).
+#. TRANS: %1$s is the URL, %2$s is the page number.
+#, php-format
+msgid "Notices linking to %1$s, page %2$d"
+msgstr "Notizie collegate a %1$s, pagina %2$d"
+
+#. TRANS: Client exception thrown when trying to import bookmarks without being logged in.
+msgid "Only logged-in users can import del.icio.us backups."
+msgstr ""
+"Solo gli utenti che hanno effettuato l'accesso possono importare i backup "
+"del.icio.us."
+
+#. TRANS: Client exception thrown when trying to import bookmarks without having the rights to do so.
+msgid "You may not restore your account."
+msgstr "Non puoi ripristinare il tuo account."
+
+#. TRANS: Client exception thrown when trying to import bookmarks and upload fails.
+#. TRANS: Client exception thrown when a file upload has failed.
+msgid "No uploaded file."
+msgstr "Nessun file caricato."
+
+#. TRANS: Client exception thrown when an uploaded file is too large.
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
+msgstr "Il file caricato eccede la direttiva upload_max_filesize in php.ini."
+
+#. TRANS: Client exception thrown when an uploaded file is too large.
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form."
+msgstr ""
+"Il file caricato eccede la direttiva MAX_FILE_SIZE specificata nel modulo "
+"HTML."
+
+#. TRANS: Client exception thrown when a file was only partially uploaded.
+msgid "The uploaded file was only partially uploaded."
+msgstr "Il file caricato è stato caricato solo parzialmente."
+
+#. TRANS: Client exception thrown when a temporary folder is not present.
+msgid "Missing a temporary folder."
+msgstr "Manca una directory temporanea."
+
+#. TRANS: Client exception thrown when writing to disk is not possible.
+msgid "Failed to write file to disk."
+msgstr "Scrittura del file su disco non riuscita."
+
+#. TRANS: Client exception thrown when a file upload has been stopped.
+msgid "File upload stopped by extension."
+msgstr "Caricamento del file bloccato dall'estensione."
+
+#. TRANS: Client exception thrown when a file upload operation has failed.
+msgid "System error uploading file."
+msgstr "Errore di sistema nel caricare il file."
+
+#. TRANS: Server exception thrown when a file upload cannot be found.
+#. TRANS: %s is the file that could not be found.
+#. TRANS: Exception thrown when a file upload cannot be found.
+#. TRANS: %s is the file that could not be found.
+#, php-format
+msgid "No such file \"%s\"."
+msgstr "File \"%s\" inesistente."
+
+#. TRANS: Server exception thrown when a file upload is incorrect.
+#. TRANS: %s is the irregular file.
+#. TRANS: Exception thrown when a file upload is incorrect.
+#. TRANS: %s is the irregular file.
+#, php-format
+msgid "Not a regular file: \"%s\"."
+msgstr "Non è un file normale: \" %s \"."
+
+#. TRANS: Server exception thrown when a file upload is not readable.
+#. TRANS: %s is the file that could not be read.
+#. TRANS: Exception thrown when a file upload is not readable.
+#. TRANS: %s is the file that could not be read.
+#, php-format
+msgid "File \"%s\" not readable."
+msgstr "File \" %s \" non leggibile."
+
+#. TRANS: Success message after importing bookmarks.
+msgid ""
+"Bookmarks have been imported. Your bookmarks should now appear in search and "
+"your profile page."
+msgstr ""
+"I segnalibri sono stati importati. I tuoi segnalibri ora dovrebbero apparire "
+"nella ricerca e la pagina del tuo profilo."
+
+#. TRANS: Busy message for importing bookmarks.
+msgid "Bookmarks are being imported. Please wait a few minutes for results."
+msgstr ""
+"Stiamo impostando i segnalibri. Si prega di attendere qualche minuto per i "
+"risultati."
+
+#. TRANS: Form instructions for importing bookmarks.
+msgid "You can upload a backed-up delicious.com bookmarks file."
+msgstr "È possibile caricare un file segnalibro di backup delicious.com."
+
+#. TRANS: Button text on form to import bookmarks.
+msgctxt "BUTTON"
+msgid "Upload"
+msgstr "Carica"
+
+#. TRANS: Button title on form to import bookmarks.
+msgid "Upload the file."
+msgstr "Carica il file."
+
+#. TRANS: Field label on form for adding a new bookmark.
+msgctxt "LABEL"
+msgid "Title"
+msgstr "Titolo"
+
+#. TRANS: Field label on form for adding a new bookmark.
+msgctxt "LABEL"
+msgid "Notes"
+msgstr "Note"
+
+#. TRANS: Field label on form for adding a new bookmark.
+msgctxt "LABEL"
+msgid "Tags"
+msgstr "Tag"
+
+#. TRANS: Field title on form for adding a new bookmark.
+msgid "Comma- or space-separated list of tags."
+msgstr "Lista dei tag separato da virgole o spazi."
+
+#. TRANS: Button text for action to save a new bookmark.
+msgctxt "BUTTON"
+msgid "Save"
+msgstr "Salva"
+
+#. TRANS: Title for action to create a new bookmark.
+msgid "New bookmark"
+msgstr "Nuovo segnalibro"
+
+#. TRANS: Client exception thrown when trying to create a new bookmark while not logged in.
+msgid "Must be logged in to post a bookmark."
+msgstr "Bisogna effettuare l'accesso per poter pubblicare un segnalibro."
+
+#. TRANS: Client exception thrown when trying to create a new bookmark without a title.
+msgid "Bookmark must have a title."
+msgstr "Il segnalibro deve avere un titolo."
+
+#. TRANS: Client exception thrown when trying to create a new bookmark without a URL.
+msgid "Bookmark must have an URL."
+msgstr "Il segnalibro deve avere un URL."
+
+#. TRANS: Page title after posting a bookmark.
+msgid "Bookmark posted"
+msgstr "Segnalibro pubblicato"
+
+#. TRANS: %s is the filename that contains a backup for a user.
+#, php-format
+msgid "Getting backup from file \"%s\"."
+msgstr "Ottenere il backup dal file \"%s\"."
diff --git a/plugins/Bookmark/locale/ja/LC_MESSAGES/Bookmark.po b/plugins/Bookmark/locale/ja/LC_MESSAGES/Bookmark.po
new file mode 100644
index 0000000000..55c8b3f04b
--- /dev/null
+++ b/plugins/Bookmark/locale/ja/LC_MESSAGES/Bookmark.po
@@ -0,0 +1,262 @@
+# Translation of StatusNet - Bookmark to Japanese (日本語)
+# Exported from translatewiki.net
+#
+# Author: Miwa ka
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Bookmark\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:57+0000\n"
+"Language-Team: Japanese <https://translatewiki.net/wiki/Portal:ja>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-10-10 14:11:41+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: ja\n"
+"X-Message-Group: #out-statusnet-plugin-bookmark\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#. TRANS: Client exception thrown when a bookmark in an import file is incorrectly formatted.
+msgid "No <A> tag in a <DT>."
+msgstr ""
+
+#. TRANS: Client exception thrown when a bookmark in an import file is private.
+msgid "Skipping private bookmark."
+msgstr "プライベートブックマークをスキップ���"
+
+#. TRANS: Client exception thrown when referring to a non-existing bookmark.
+msgid "No such bookmark."
+msgstr "��よ��ブックマーク��り��ん"
+
+#. TRANS: Title for bookmark.
+#. TRANS: %1$s is a user nickname, %2$s is a bookmark title.
+#, php-format
+msgid "%1$s's bookmark for \"%2$s\""
+msgstr "\"%2$s\" 用� %1$s �ん�ブックマーク"
+
+#. TRANS: Plugin description.
+msgid "Simple extension for supporting bookmarks."
+msgstr "ブックマークをサ�ート�る����シンプル�拡張機能"
+
+#. TRANS: Link text in proile leading to import form.
+#. TRANS: Title for page to import del.icio.us bookmark backups on.
+msgid "Import del.icio.us bookmarks"
+msgstr "del.icio.us �ブックマークをイン�ート�る"
+
+#. TRANS: Client exception thrown when a bookmark is formatted incorrectly.
+msgid "Expected exactly 1 link rel=related in a Bookmark."
+msgstr ""
+
+#. TRANS: Server exception thrown when a bookmark has multiple attachments.
+msgid "Bookmark notice with the wrong number of attachments."
+msgstr ""
+
+#. TRANS: Application title.
+msgctxt "TITLE"
+msgid "Bookmark"
+msgstr "ブックマーク"
+
+#. TRANS: Title for mini-posting window loaded from bookmarklet.
+#. TRANS: %s is the StatusNet site name.
+#, php-format
+msgid "Bookmark on %s"
+msgstr "%s 上�ブックマーク"
+
+#. TRANS: Client exception thrown when trying to save a new bookmark that already exists.
+msgid "Bookmark already exists."
+msgstr "ブックマーク�既�存在���"
+
+#. TRANS: Bookmark content.
+#. TRANS: %1$s is a title, %2$s is a short URL, %3$s is the bookmark description,
+#. TRANS: %4$s is space separated list of hash tags.
+#, php-format
+msgid "\"%1$s\" %2$s %3$s %4$s"
+msgstr ""
+
+#. TRANS: Rendered bookmark content.
+#. TRANS: %1$s is a URL, %2$s the bookmark title, %3$s is the bookmark description,
+#. TRANS: %4$s is space separated list of hash tags.
+#, php-format
+msgid ""
+"<span class=\"xfolkentry\"><a class=\"taggedlink\" href=\"%1$s\">%2$s</a> "
+"<span class=\"description\">%3$s</span> <span class=\"meta\">%4$s</span></"
+"span>"
+msgstr ""
+
+#. TRANS: Field label on form for adding a new bookmark.
+msgctxt "LABEL"
+msgid "URL"
+msgstr ""
+
+#. TRANS: Button text for action to save a new bookmark.
+msgctxt "BUTTON"
+msgid "Add"
+msgstr "追加"
+
+#. TRANS: Client exception thrown when an unknown URL is provided.
+msgid "Unknown URL."
+msgstr "�明� URL"
+
+#. TRANS: Title of notice stream of notices with a given attachment (first page).
+#. TRANS: %s is the URL.
+#, php-format
+msgid "Notices linking to %s"
+msgstr "%s �リンク���る��や�"
+
+#. TRANS: Title of notice stream of notices with a given attachment (all but first page).
+#. TRANS: %1$s is the URL, %2$s is the page number.
+#, php-format
+msgid "Notices linking to %1$s, page %2$d"
+msgstr "%1$s �リンク���る��や��ページ %2$d"
+
+#. TRANS: Client exception thrown when trying to import bookmarks without being logged in.
+msgid "Only logged-in users can import del.icio.us backups."
+msgstr ""
+"ログイン���るユーザ�� del.icio.us �ックアップをイン�ート�る�����"
+"��"
+
+#. TRANS: Client exception thrown when trying to import bookmarks without having the rights to do so.
+msgid "You may not restore your account."
+msgstr "����アカウントを復元�る�������ん"
+
+#. TRANS: Client exception thrown when trying to import bookmarks and upload fails.
+#. TRANS: Client exception thrown when a file upload has failed.
+msgid "No uploaded file."
+msgstr "アップロード�れ�ファイル��り��ん"
+
+#. TRANS: Client exception thrown when an uploaded file is too large.
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
+msgstr ""
+"アップロード�れ�ファイル��php.ini � upload_max_filesize ディレクティブ�"
+"値を超�����"
+
+#. TRANS: Client exception thrown when an uploaded file is too large.
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form."
+msgstr ""
+"アップロード�れ�ファイル��HTML フォーム�指定�れ� MAX_FILE_SIZE ディレ"
+"クティブを超�����"
+
+#. TRANS: Client exception thrown when a file was only partially uploaded.
+msgid "The uploaded file was only partially uploaded."
+msgstr "アップロード�れ�ファイル��一部��アップロード�れ����ん"
+
+#. TRANS: Client exception thrown when a temporary folder is not present.
+msgid "Missing a temporary folder."
+msgstr "テン�ラリーフォルダー�誤�����"
+
+#. TRANS: Client exception thrown when writing to disk is not possible.
+msgid "Failed to write file to disk."
+msgstr "ディスク��ファイル�書�込��失敗����。"
+
+#. TRANS: Client exception thrown when a file upload has been stopped.
+msgid "File upload stopped by extension."
+msgstr "拡張機能�より�ファイルアップロードを中止����"
+
+#. TRANS: Client exception thrown when a file upload operation has failed.
+msgid "System error uploading file."
+msgstr "ファイルアップロード中�システムエラー�発生����"
+
+#. TRANS: Server exception thrown when a file upload cannot be found.
+#. TRANS: %s is the file that could not be found.
+#. TRANS: Exception thrown when a file upload cannot be found.
+#. TRANS: %s is the file that could not be found.
+#, php-format
+msgid "No such file \"%s\"."
+msgstr "ファイル \"%s\" ��り��ん"
+
+#. TRANS: Server exception thrown when a file upload is incorrect.
+#. TRANS: %s is the irregular file.
+#. TRANS: Exception thrown when a file upload is incorrect.
+#. TRANS: %s is the irregular file.
+#, php-format
+msgid "Not a regular file: \"%s\"."
+msgstr "正��ファイル���り��ん: \"%s\""
+
+#. TRANS: Server exception thrown when a file upload is not readable.
+#. TRANS: %s is the file that could not be read.
+#. TRANS: Exception thrown when a file upload is not readable.
+#. TRANS: %s is the file that could not be read.
+#, php-format
+msgid "File \"%s\" not readable."
+msgstr "ファイル \"%s\" �読���ん"
+
+#. TRANS: Success message after importing bookmarks.
+msgid ""
+"Bookmarks have been imported. Your bookmarks should now appear in search and "
+"your profile page."
+msgstr ""
+"ブックマーク�イン�ート�れ���。����ブックマーク�検索やプロファイル"
+"ページ�表示�れ��"
+
+#. TRANS: Busy message for importing bookmarks.
+msgid "Bookmarks are being imported. Please wait a few minutes for results."
+msgstr ""
+
+#. TRANS: Form instructions for importing bookmarks.
+msgid "You can upload a backed-up delicious.com bookmarks file."
+msgstr ""
+
+#. TRANS: Button text on form to import bookmarks.
+msgctxt "BUTTON"
+msgid "Upload"
+msgstr "アップロード"
+
+#. TRANS: Button title on form to import bookmarks.
+msgid "Upload the file."
+msgstr "ファイルをアップロード"
+
+#. TRANS: Field label on form for adding a new bookmark.
+msgctxt "LABEL"
+msgid "Title"
+msgstr "タイトル"
+
+#. TRANS: Field label on form for adding a new bookmark.
+msgctxt "LABEL"
+msgid "Notes"
+msgstr "メモ"
+
+#. TRANS: Field label on form for adding a new bookmark.
+msgctxt "LABEL"
+msgid "Tags"
+msgstr "ã‚¿ã‚°"
+
+#. TRANS: Field title on form for adding a new bookmark.
+msgid "Comma- or space-separated list of tags."
+msgstr "カンマ���空白�区切られ�タグ�リスト"
+
+#. TRANS: Button text for action to save a new bookmark.
+msgctxt "BUTTON"
+msgid "Save"
+msgstr "�存"
+
+#. TRANS: Title for action to create a new bookmark.
+msgid "New bookmark"
+msgstr "新��ブックマーク"
+
+#. TRANS: Client exception thrown when trying to create a new bookmark while not logged in.
+msgid "Must be logged in to post a bookmark."
+msgstr "ブックマーク�投稿�る���ログイン�る必���り��"
+
+#. TRANS: Client exception thrown when trying to create a new bookmark without a title.
+msgid "Bookmark must have a title."
+msgstr "ブックマーク�タイトル�必���"
+
+#. TRANS: Client exception thrown when trying to create a new bookmark without a URL.
+msgid "Bookmark must have an URL."
+msgstr "ブックマーク� URL �必���"
+
+#. TRANS: Page title after posting a bookmark.
+msgid "Bookmark posted"
+msgstr ""
+
+#. TRANS: %s is the filename that contains a backup for a user.
+#, php-format
+msgid "Getting backup from file \"%s\"."
+msgstr "ファイル \"%s\" �ら�ックアップを�得�る"
diff --git a/plugins/Bookmark/locale/mk/LC_MESSAGES/Bookmark.po b/plugins/Bookmark/locale/mk/LC_MESSAGES/Bookmark.po
index 6c8ba3329c..28ad0bfcac 100644
--- a/plugins/Bookmark/locale/mk/LC_MESSAGES/Bookmark.po
+++ b/plugins/Bookmark/locale/mk/LC_MESSAGES/Bookmark.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Bookmark to Macedonian (Македон�ки)
+# Translation of StatusNet - Bookmark to Macedonian (македон�ки)
 # Exported from translatewiki.net
 #
 # Author: Bjankuloski06
@@ -9,22 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Bookmark\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:53+0000\n"
-"Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:57+0000\n"
+"Language-Team: Macedonian <https://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:26:03+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-10-10 14:11:41+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-bookmark\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
 
-#. TRANS: Client exception thrown when a file upload is incorrect.
-msgid "Bad import file."
-msgstr "�еправилна податотека за увоз."
-
 #. TRANS: Client exception thrown when a bookmark in an import file is incorrectly formatted.
 msgid "No <A> tag in a <DT>."
 msgstr "�ема ознака <A> во <DT>."
@@ -65,12 +61,6 @@ msgctxt "TITLE"
 msgid "Bookmark"
 msgstr "Одбележување"
 
-#. TRANS: Exception thrown when a bookmark has no attachments.
-#. TRANS: %1$s is a bookmark ID, %2$s is a notice ID (number).
-#, php-format
-msgid "Bookmark %1$s (notice %2$d) has no attachments."
-msgstr "Одбележувачот %1$s (забелешка %2$d) нема прилози."
-
 #. TRANS: Title for mini-posting window loaded from bookmarklet.
 #. TRANS: %s is the StatusNet site name.
 #, php-format
diff --git a/plugins/Bookmark/locale/nl/LC_MESSAGES/Bookmark.po b/plugins/Bookmark/locale/nl/LC_MESSAGES/Bookmark.po
index af4268c9c6..9e5d4f940d 100644
--- a/plugins/Bookmark/locale/nl/LC_MESSAGES/Bookmark.po
+++ b/plugins/Bookmark/locale/nl/LC_MESSAGES/Bookmark.po
@@ -9,22 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Bookmark\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:53+0000\n"
-"Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:57+0000\n"
+"Language-Team: Dutch <https://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:26:03+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-10-10 14:11:41+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-bookmark\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#. TRANS: Client exception thrown when a file upload is incorrect.
-msgid "Bad import file."
-msgstr "Ongeldig importbestand."
-
 #. TRANS: Client exception thrown when a bookmark in an import file is incorrectly formatted.
 msgid "No <A> tag in a <DT>."
 msgstr "Geen label <A> in een <DT>."
@@ -66,12 +62,6 @@ msgctxt "TITLE"
 msgid "Bookmark"
 msgstr "Bladwijzer"
 
-#. TRANS: Exception thrown when a bookmark has no attachments.
-#. TRANS: %1$s is a bookmark ID, %2$s is a notice ID (number).
-#, php-format
-msgid "Bookmark %1$s (notice %2$d) has no attachments."
-msgstr "De bladwijzer %1$s (%2$d) heeft geen bijlagen."
-
 #. TRANS: Title for mini-posting window loaded from bookmarklet.
 #. TRANS: %s is the StatusNet site name.
 #, php-format
diff --git a/plugins/Bookmark/locale/pl/LC_MESSAGES/Bookmark.po b/plugins/Bookmark/locale/pl/LC_MESSAGES/Bookmark.po
new file mode 100644
index 0000000000..9cdf69af54
--- /dev/null
+++ b/plugins/Bookmark/locale/pl/LC_MESSAGES/Bookmark.po
@@ -0,0 +1,253 @@
+# Translation of StatusNet - Bookmark to Polish (polski)
+# Exported from translatewiki.net
+#
+# Author: BeginaFelicysym
+# Author: Woytecr
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Bookmark\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:57+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-10-10 14:11:41+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=3; plural=(n == 1) ? 0 : ( (n%10 >= 2 && n%10 <= 4 && "
+"(n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
+
+#. TRANS: Client exception thrown when a bookmark in an import file is incorrectly formatted.
+msgid "No <A> tag in a <DT>."
+msgstr ""
+
+#. TRANS: Client exception thrown when a bookmark in an import file is private.
+msgid "Skipping private bookmark."
+msgstr ""
+
+#. TRANS: Client exception thrown when referring to a non-existing bookmark.
+msgid "No such bookmark."
+msgstr "Nie ma takiej zakładki."
+
+#. TRANS: Title for bookmark.
+#. TRANS: %1$s is a user nickname, %2$s is a bookmark title.
+#, php-format
+msgid "%1$s's bookmark for \"%2$s\""
+msgstr ""
+
+#. TRANS: Plugin description.
+msgid "Simple extension for supporting bookmarks."
+msgstr ""
+
+#. TRANS: Link text in proile leading to import form.
+#. TRANS: Title for page to import del.icio.us bookmark backups on.
+msgid "Import del.icio.us bookmarks"
+msgstr "Importowanie zakładek del.icio.us"
+
+#. TRANS: Client exception thrown when a bookmark is formatted incorrectly.
+msgid "Expected exactly 1 link rel=related in a Bookmark."
+msgstr ""
+
+#. TRANS: Server exception thrown when a bookmark has multiple attachments.
+msgid "Bookmark notice with the wrong number of attachments."
+msgstr ""
+
+#. TRANS: Application title.
+msgctxt "TITLE"
+msgid "Bookmark"
+msgstr "Zakładka"
+
+#. TRANS: Title for mini-posting window loaded from bookmarklet.
+#. TRANS: %s is the StatusNet site name.
+#, php-format
+msgid "Bookmark on %s"
+msgstr ""
+
+#. TRANS: Client exception thrown when trying to save a new bookmark that already exists.
+msgid "Bookmark already exists."
+msgstr "Zakładka już istnieje."
+
+#. TRANS: Bookmark content.
+#. TRANS: %1$s is a title, %2$s is a short URL, %3$s is the bookmark description,
+#. TRANS: %4$s is space separated list of hash tags.
+#, php-format
+msgid "\"%1$s\" %2$s %3$s %4$s"
+msgstr ""
+
+#. TRANS: Rendered bookmark content.
+#. TRANS: %1$s is a URL, %2$s the bookmark title, %3$s is the bookmark description,
+#. TRANS: %4$s is space separated list of hash tags.
+#, php-format
+msgid ""
+"<span class=\"xfolkentry\"><a class=\"taggedlink\" href=\"%1$s\">%2$s</a> "
+"<span class=\"description\">%3$s</span> <span class=\"meta\">%4$s</span></"
+"span>"
+msgstr ""
+
+#. TRANS: Field label on form for adding a new bookmark.
+msgctxt "LABEL"
+msgid "URL"
+msgstr "Adres URL"
+
+#. TRANS: Button text for action to save a new bookmark.
+msgctxt "BUTTON"
+msgid "Add"
+msgstr "Dodaj"
+
+#. TRANS: Client exception thrown when an unknown URL is provided.
+msgid "Unknown URL."
+msgstr "Nieznany adres URL."
+
+#. TRANS: Title of notice stream of notices with a given attachment (first page).
+#. TRANS: %s is the URL.
+#, php-format
+msgid "Notices linking to %s"
+msgstr ""
+
+#. TRANS: Title of notice stream of notices with a given attachment (all but first page).
+#. TRANS: %1$s is the URL, %2$s is the page number.
+#, php-format
+msgid "Notices linking to %1$s, page %2$d"
+msgstr ""
+
+#. TRANS: Client exception thrown when trying to import bookmarks without being logged in.
+msgid "Only logged-in users can import del.icio.us backups."
+msgstr ""
+
+#. TRANS: Client exception thrown when trying to import bookmarks without having the rights to do so.
+msgid "You may not restore your account."
+msgstr ""
+
+#. TRANS: Client exception thrown when trying to import bookmarks and upload fails.
+#. TRANS: Client exception thrown when a file upload has failed.
+msgid "No uploaded file."
+msgstr ""
+
+#. TRANS: Client exception thrown when an uploaded file is too large.
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
+msgstr ""
+
+#. TRANS: Client exception thrown when an uploaded file is too large.
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form."
+msgstr ""
+
+#. TRANS: Client exception thrown when a file was only partially uploaded.
+msgid "The uploaded file was only partially uploaded."
+msgstr ""
+
+#. TRANS: Client exception thrown when a temporary folder is not present.
+msgid "Missing a temporary folder."
+msgstr "Brak katalogu tymczasowego."
+
+#. TRANS: Client exception thrown when writing to disk is not possible.
+msgid "Failed to write file to disk."
+msgstr "Zapisanie pliku na dysku nie powiodło się."
+
+#. TRANS: Client exception thrown when a file upload has been stopped.
+msgid "File upload stopped by extension."
+msgstr "Wysłanie pliku zostało zatrzymane przez rozszerzenie."
+
+#. TRANS: Client exception thrown when a file upload operation has failed.
+msgid "System error uploading file."
+msgstr "Błąd systemu podczas wysyłania pliku."
+
+#. TRANS: Server exception thrown when a file upload cannot be found.
+#. TRANS: %s is the file that could not be found.
+#. TRANS: Exception thrown when a file upload cannot be found.
+#. TRANS: %s is the file that could not be found.
+#, php-format
+msgid "No such file \"%s\"."
+msgstr "Nie ma takiego pliku: \"%s\"."
+
+#. TRANS: Server exception thrown when a file upload is incorrect.
+#. TRANS: %s is the irregular file.
+#. TRANS: Exception thrown when a file upload is incorrect.
+#. TRANS: %s is the irregular file.
+#, php-format
+msgid "Not a regular file: \"%s\"."
+msgstr "To nie jest zwykły plik: \"%s\"."
+
+#. TRANS: Server exception thrown when a file upload is not readable.
+#. TRANS: %s is the file that could not be read.
+#. TRANS: Exception thrown when a file upload is not readable.
+#. TRANS: %s is the file that could not be read.
+#, php-format
+msgid "File \"%s\" not readable."
+msgstr "Plik \" %s \" nie do odczytu."
+
+#. TRANS: Success message after importing bookmarks.
+msgid ""
+"Bookmarks have been imported. Your bookmarks should now appear in search and "
+"your profile page."
+msgstr ""
+
+#. TRANS: Busy message for importing bookmarks.
+msgid "Bookmarks are being imported. Please wait a few minutes for results."
+msgstr ""
+
+#. TRANS: Form instructions for importing bookmarks.
+msgid "You can upload a backed-up delicious.com bookmarks file."
+msgstr ""
+
+#. TRANS: Button text on form to import bookmarks.
+msgctxt "BUTTON"
+msgid "Upload"
+msgstr "Prześlij"
+
+#. TRANS: Button title on form to import bookmarks.
+msgid "Upload the file."
+msgstr "Prześlij plik"
+
+#. TRANS: Field label on form for adding a new bookmark.
+msgctxt "LABEL"
+msgid "Title"
+msgstr "Tytuł"
+
+#. TRANS: Field label on form for adding a new bookmark.
+msgctxt "LABEL"
+msgid "Notes"
+msgstr ""
+
+#. TRANS: Field label on form for adding a new bookmark.
+msgctxt "LABEL"
+msgid "Tags"
+msgstr ""
+
+#. TRANS: Field title on form for adding a new bookmark.
+msgid "Comma- or space-separated list of tags."
+msgstr ""
+
+#. TRANS: Button text for action to save a new bookmark.
+msgctxt "BUTTON"
+msgid "Save"
+msgstr "Zapisz"
+
+#. TRANS: Title for action to create a new bookmark.
+msgid "New bookmark"
+msgstr "Nowa zakładka"
+
+#. TRANS: Client exception thrown when trying to create a new bookmark while not logged in.
+msgid "Must be logged in to post a bookmark."
+msgstr ""
+
+#. TRANS: Client exception thrown when trying to create a new bookmark without a title.
+msgid "Bookmark must have a title."
+msgstr ""
+
+#. TRANS: Client exception thrown when trying to create a new bookmark without a URL.
+msgid "Bookmark must have an URL."
+msgstr ""
+
+#. TRANS: Page title after posting a bookmark.
+msgid "Bookmark posted"
+msgstr ""
+
+#. TRANS: %s is the filename that contains a backup for a user.
+#, php-format
+msgid "Getting backup from file \"%s\"."
+msgstr ""
diff --git a/plugins/Bookmark/locale/sv/LC_MESSAGES/Bookmark.po b/plugins/Bookmark/locale/sv/LC_MESSAGES/Bookmark.po
index 085ed822b3..566c370dc0 100644
--- a/plugins/Bookmark/locale/sv/LC_MESSAGES/Bookmark.po
+++ b/plugins/Bookmark/locale/sv/LC_MESSAGES/Bookmark.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Bookmark to Swedish (Svenska)
+# Translation of StatusNet - Bookmark to Swedish (svenska)
 # Exported from translatewiki.net
 #
 # Author: Jamminjohn
@@ -10,22 +10,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Bookmark\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:53+0000\n"
-"Language-Team: Swedish <http://translatewiki.net/wiki/Portal:sv>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:58+0000\n"
+"Language-Team: Swedish <https://translatewiki.net/wiki/Portal:sv>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:26:03+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-10-10 14:11:41+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: sv\n"
 "X-Message-Group: #out-statusnet-plugin-bookmark\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#. TRANS: Client exception thrown when a file upload is incorrect.
-msgid "Bad import file."
-msgstr ""
-
 #. TRANS: Client exception thrown when a bookmark in an import file is incorrectly formatted.
 msgid "No <A> tag in a <DT>."
 msgstr ""
@@ -66,12 +62,6 @@ msgctxt "TITLE"
 msgid "Bookmark"
 msgstr ""
 
-#. TRANS: Exception thrown when a bookmark has no attachments.
-#. TRANS: %1$s is a bookmark ID, %2$s is a notice ID (number).
-#, php-format
-msgid "Bookmark %1$s (notice %2$d) has no attachments."
-msgstr ""
-
 #. TRANS: Title for mini-posting window loaded from bookmarklet.
 #. TRANS: %s is the StatusNet site name.
 #, php-format
diff --git a/plugins/Bookmark/locale/tl/LC_MESSAGES/Bookmark.po b/plugins/Bookmark/locale/tl/LC_MESSAGES/Bookmark.po
index a0452ac9d8..a791111716 100644
--- a/plugins/Bookmark/locale/tl/LC_MESSAGES/Bookmark.po
+++ b/plugins/Bookmark/locale/tl/LC_MESSAGES/Bookmark.po
@@ -9,22 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Bookmark\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:53+0000\n"
-"Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:58+0000\n"
+"Language-Team: Tagalog <https://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:26:03+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-10-10 14:11:41+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-bookmark\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#. TRANS: Client exception thrown when a file upload is incorrect.
-msgid "Bad import file."
-msgstr "Masamang talaksan ng pag-angkat."
-
 #. TRANS: Client exception thrown when a bookmark in an import file is incorrectly formatted.
 msgid "No <A> tag in a <DT>."
 msgstr "Walang tatak na <A> sa loob ng isang <DT>."
@@ -66,12 +62,6 @@ msgctxt "TITLE"
 msgid "Bookmark"
 msgstr "Pananda"
 
-#. TRANS: Exception thrown when a bookmark has no attachments.
-#. TRANS: %1$s is a bookmark ID, %2$s is a notice ID (number).
-#, php-format
-msgid "Bookmark %1$s (notice %2$d) has no attachments."
-msgstr "Ang panandang %1$s (pabatid na %2$d) ay walang mga kalakip."
-
 #. TRANS: Title for mini-posting window loaded from bookmarklet.
 #. TRANS: %s is the StatusNet site name.
 #, php-format
diff --git a/plugins/Bookmark/locale/uk/LC_MESSAGES/Bookmark.po b/plugins/Bookmark/locale/uk/LC_MESSAGES/Bookmark.po
index 116771798d..21dd6de1b0 100644
--- a/plugins/Bookmark/locale/uk/LC_MESSAGES/Bookmark.po
+++ b/plugins/Bookmark/locale/uk/LC_MESSAGES/Bookmark.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Bookmark to Ukrainian (Україн�ька)
+# Translation of StatusNet - Bookmark to Ukrainian (україн�ька)
 # Exported from translatewiki.net
 #
 # Author: Boogie
@@ -9,23 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Bookmark\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:53+0000\n"
-"Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:58+0000\n"
+"Language-Team: Ukrainian <https://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:26:03+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-10-10 14:11:41+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-bookmark\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
-#. TRANS: Client exception thrown when a file upload is incorrect.
-msgid "Bad import file."
-msgstr "Помилковий імпорт файлу."
-
 #. TRANS: Client exception thrown when a bookmark in an import file is incorrectly formatted.
 msgid "No <A> tag in a <DT>."
 msgstr "Від�утній теґ <a> в <dt>."
@@ -66,12 +62,6 @@ msgctxt "TITLE"
 msgid "Bookmark"
 msgstr "Закладка"
 
-#. TRANS: Exception thrown when a bookmark has no attachments.
-#. TRANS: %1$s is a bookmark ID, %2$s is a notice ID (number).
-#, php-format
-msgid "Bookmark %1$s (notice %2$d) has no attachments."
-msgstr "Закладка %1$s (допи� %2$d) має не вкладень."
-
 #. TRANS: Title for mini-posting window loaded from bookmarklet.
 #. TRANS: %s is the StatusNet site name.
 #, php-format
diff --git a/plugins/Bookmark/newbookmark.php b/plugins/Bookmark/newbookmark.php
index d60d3d4670..57be783b38 100644
--- a/plugins/Bookmark/newbookmark.php
+++ b/plugins/Bookmark/newbookmark.php
@@ -150,7 +150,18 @@ class NewbookmarkAction extends Action
 
         } catch (ClientException $ce) {
             if ($this->boolean('ajax')) {
-                throw $ce;
+                header('Content-Type: text/xml;charset=utf-8');
+                $this->xw->startDocument('1.0', 'UTF-8');
+                $this->elementStart('html');
+                $this->elementStart('head');
+                // TRANS: Page title after an AJAX error occurs
+                $this->element('title', null, _('Ajax Error'));
+                $this->elementEnd('head');
+                $this->elementStart('body');
+                $this->element('p', array('id' => 'error'), $ce->getMessage());
+                $this->elementEnd('body');
+                $this->elementEnd('html');
+                return;
             } else {
                 $this->error = $ce->getMessage();
                 $this->showPage();
diff --git a/plugins/CacheLog/locale/CacheLog.pot b/plugins/CacheLog/locale/CacheLog.pot
index 654207e0a1..60b03cda58 100644
--- a/plugins/CacheLog/locale/CacheLog.pot
+++ b/plugins/CacheLog/locale/CacheLog.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
+"POT-Creation-Date: 2012-06-30 11:07+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"
diff --git a/plugins/CacheLog/locale/ast/LC_MESSAGES/CacheLog.po b/plugins/CacheLog/locale/ast/LC_MESSAGES/CacheLog.po
new file mode 100644
index 0000000000..8bfe3bd57b
--- /dev/null
+++ b/plugins/CacheLog/locale/ast/LC_MESSAGES/CacheLog.po
@@ -0,0 +1,26 @@
+# Translation of StatusNet - CacheLog to Asturian (asturianu)
+# Exported from translatewiki.net
+#
+# Author: Xuacu
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - CacheLog\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:58+0000\n"
+"Language-Team: Asturian <https://translatewiki.net/wiki/Portal:ast>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:49:51+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: ast\n"
+"X-Message-Group: #out-statusnet-plugin-cachelog\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin description.
+msgid "Log reads and writes to the cache."
+msgstr "Rexistrar llectures y escritures na caché."
diff --git a/plugins/CacheLog/locale/be-tarask/LC_MESSAGES/CacheLog.po b/plugins/CacheLog/locale/be-tarask/LC_MESSAGES/CacheLog.po
index dde94a0d87..c0e36acb24 100644
--- a/plugins/CacheLog/locale/be-tarask/LC_MESSAGES/CacheLog.po
+++ b/plugins/CacheLog/locale/be-tarask/LC_MESSAGES/CacheLog.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - CacheLog to Belarusian (Taraškievica orthography) (‪Белару�ка� (тарашкевіца)‬)
+# Translation of StatusNet - CacheLog to Belarusian (Taraškievica orthography) (‪белару�ка� (тарашкевіца)‬)
 # Exported from translatewiki.net
 #
 # Author: Jim-by
@@ -9,15 +9,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - CacheLog\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:53+0000\n"
-"Language-Team: Belarusian (Taraškievica orthography) <http://translatewiki."
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:58+0000\n"
+"Language-Team: Belarusian (Taraškievica orthography) <https://translatewiki."
 "net/wiki/Portal:be-tarask>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:26:35+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:49:51+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: be-tarask\n"
 "X-Message-Group: #out-statusnet-plugin-cachelog\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/CacheLog/locale/br/LC_MESSAGES/CacheLog.po b/plugins/CacheLog/locale/br/LC_MESSAGES/CacheLog.po
index 81acd7ee40..fa16c7e7f5 100644
--- a/plugins/CacheLog/locale/br/LC_MESSAGES/CacheLog.po
+++ b/plugins/CacheLog/locale/br/LC_MESSAGES/CacheLog.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - CacheLog to Breton (Brezhoneg)
+# Translation of StatusNet - CacheLog to Breton (brezhoneg)
 # Exported from translatewiki.net
 #
 # Author: Fulup
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - CacheLog\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:53+0000\n"
-"Language-Team: Breton <http://translatewiki.net/wiki/Portal:br>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:58+0000\n"
+"Language-Team: Breton <https://translatewiki.net/wiki/Portal:br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:26:35+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:49:51+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-cachelog\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
diff --git a/plugins/CacheLog/locale/de/LC_MESSAGES/CacheLog.po b/plugins/CacheLog/locale/de/LC_MESSAGES/CacheLog.po
index 25d392d4f6..7ce6ab5e77 100644
--- a/plugins/CacheLog/locale/de/LC_MESSAGES/CacheLog.po
+++ b/plugins/CacheLog/locale/de/LC_MESSAGES/CacheLog.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - CacheLog\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:53+0000\n"
-"Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:58+0000\n"
+"Language-Team: German <https://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:26:35+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:49:51+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-cachelog\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/CacheLog/locale/es/LC_MESSAGES/CacheLog.po b/plugins/CacheLog/locale/es/LC_MESSAGES/CacheLog.po
index 17f8c08aa2..cb6ace4820 100644
--- a/plugins/CacheLog/locale/es/LC_MESSAGES/CacheLog.po
+++ b/plugins/CacheLog/locale/es/LC_MESSAGES/CacheLog.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - CacheLog to Spanish (Español)
+# Translation of StatusNet - CacheLog to Spanish (español)
 # Exported from translatewiki.net
 #
 # Author: Translationista
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - CacheLog\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:53+0000\n"
-"Language-Team: Spanish <http://translatewiki.net/wiki/Portal:es>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:58+0000\n"
+"Language-Team: Spanish <https://translatewiki.net/wiki/Portal:es>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:26:35+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:49:51+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-plugin-cachelog\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/CacheLog/locale/eu/LC_MESSAGES/CacheLog.po b/plugins/CacheLog/locale/eu/LC_MESSAGES/CacheLog.po
new file mode 100644
index 0000000000..2cbea76cab
--- /dev/null
+++ b/plugins/CacheLog/locale/eu/LC_MESSAGES/CacheLog.po
@@ -0,0 +1,23 @@
+# Translation of StatusNet - CacheLog to Basque (euskara)
+# Exported from translatewiki.net
+#
+# Author: Artsuaga
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - CacheLog\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:58+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:49:51+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin description.
+msgid "Log reads and writes to the cache."
+msgstr "Katxeko irakurketa eta idazketak erregistratzen ditu."
diff --git a/plugins/CacheLog/locale/fr/LC_MESSAGES/CacheLog.po b/plugins/CacheLog/locale/fr/LC_MESSAGES/CacheLog.po
index d19765bbee..ec8356ddf4 100644
--- a/plugins/CacheLog/locale/fr/LC_MESSAGES/CacheLog.po
+++ b/plugins/CacheLog/locale/fr/LC_MESSAGES/CacheLog.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - CacheLog to French (Français)
+# Translation of StatusNet - CacheLog to French (français)
 # Exported from translatewiki.net
 #
 # Author: Verdy p
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - CacheLog\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:54+0000\n"
-"Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:58+0000\n"
+"Language-Team: French <https://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:26:35+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:49:51+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-cachelog\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
diff --git a/plugins/CacheLog/locale/gl/LC_MESSAGES/CacheLog.po b/plugins/CacheLog/locale/gl/LC_MESSAGES/CacheLog.po
new file mode 100644
index 0000000000..549cd154c3
--- /dev/null
+++ b/plugins/CacheLog/locale/gl/LC_MESSAGES/CacheLog.po
@@ -0,0 +1,26 @@
+# Translation of StatusNet - CacheLog to Galician (galego)
+# Exported from translatewiki.net
+#
+# Author: Toliño
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - CacheLog\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:59+0000\n"
+"Language-Team: Galician <https://translatewiki.net/wiki/Portal:gl>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:49:51+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: gl\n"
+"X-Message-Group: #out-statusnet-plugin-cachelog\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin description.
+msgid "Log reads and writes to the cache."
+msgstr "Rexistra as lecturas e escrituras na memoria caché."
diff --git a/plugins/CacheLog/locale/he/LC_MESSAGES/CacheLog.po b/plugins/CacheLog/locale/he/LC_MESSAGES/CacheLog.po
index d96adb6bee..bd1e8e6fda 100644
--- a/plugins/CacheLog/locale/he/LC_MESSAGES/CacheLog.po
+++ b/plugins/CacheLog/locale/he/LC_MESSAGES/CacheLog.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - CacheLog\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:54+0000\n"
-"Language-Team: Hebrew <http://translatewiki.net/wiki/Portal:he>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:59+0000\n"
+"Language-Team: Hebrew <https://translatewiki.net/wiki/Portal:he>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:26:35+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:49:51+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: he\n"
 "X-Message-Group: #out-statusnet-plugin-cachelog\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/CacheLog/locale/ia/LC_MESSAGES/CacheLog.po b/plugins/CacheLog/locale/ia/LC_MESSAGES/CacheLog.po
index 01e1e83796..a067559a7b 100644
--- a/plugins/CacheLog/locale/ia/LC_MESSAGES/CacheLog.po
+++ b/plugins/CacheLog/locale/ia/LC_MESSAGES/CacheLog.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - CacheLog to Interlingua (Interlingua)
+# Translation of StatusNet - CacheLog to Interlingua (interlingua)
 # Exported from translatewiki.net
 #
 # Author: McDutchie
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - CacheLog\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:54+0000\n"
-"Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:59+0000\n"
+"Language-Team: Interlingua <https://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:26:35+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:49:51+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-cachelog\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/CacheLog/locale/it/LC_MESSAGES/CacheLog.po b/plugins/CacheLog/locale/it/LC_MESSAGES/CacheLog.po
new file mode 100644
index 0000000000..f5a97bc31a
--- /dev/null
+++ b/plugins/CacheLog/locale/it/LC_MESSAGES/CacheLog.po
@@ -0,0 +1,23 @@
+# Translation of StatusNet - CacheLog to Italian (italiano)
+# Exported from translatewiki.net
+#
+# Author: Ximo17
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - CacheLog\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:59+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:49:51+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin description.
+msgid "Log reads and writes to the cache."
+msgstr "Registro legge e scrive nella cache."
diff --git a/plugins/CacheLog/locale/mk/LC_MESSAGES/CacheLog.po b/plugins/CacheLog/locale/mk/LC_MESSAGES/CacheLog.po
index 4f17299897..f07e70624b 100644
--- a/plugins/CacheLog/locale/mk/LC_MESSAGES/CacheLog.po
+++ b/plugins/CacheLog/locale/mk/LC_MESSAGES/CacheLog.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - CacheLog to Macedonian (Македон�ки)
+# Translation of StatusNet - CacheLog to Macedonian (македон�ки)
 # Exported from translatewiki.net
 #
 # Author: Bjankuloski06
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - CacheLog\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:54+0000\n"
-"Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:59+0000\n"
+"Language-Team: Macedonian <https://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:26:35+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:49:51+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-cachelog\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
diff --git a/plugins/CacheLog/locale/nb/LC_MESSAGES/CacheLog.po b/plugins/CacheLog/locale/nb/LC_MESSAGES/CacheLog.po
index 121169dfff..0d20438902 100644
--- a/plugins/CacheLog/locale/nb/LC_MESSAGES/CacheLog.po
+++ b/plugins/CacheLog/locale/nb/LC_MESSAGES/CacheLog.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - CacheLog to Norwegian (bokmål)‬ (‪Norsk (bokmål)‬)
+# Translation of StatusNet - CacheLog to Norwegian Bokmål (‪norsk (bokmål)‬)
 # Exported from translatewiki.net
 #
 # Author: Nghtwlkr
@@ -9,15 +9,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - CacheLog\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:54+0000\n"
-"Language-Team: Norwegian (bokmål)‬ <http://translatewiki.net/wiki/Portal:no>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:59+0000\n"
+"Language-Team: Norwegian Bokmål <https://translatewiki.net/wiki/Portal:nb>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:26:35+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
-"X-Language-Code: no\n"
+"X-POT-Import-Date: 2011-06-05 21:49:51+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: nb\n"
 "X-Message-Group: #out-statusnet-plugin-cachelog\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
diff --git a/plugins/CacheLog/locale/nl/LC_MESSAGES/CacheLog.po b/plugins/CacheLog/locale/nl/LC_MESSAGES/CacheLog.po
index 9651122580..a3e7699277 100644
--- a/plugins/CacheLog/locale/nl/LC_MESSAGES/CacheLog.po
+++ b/plugins/CacheLog/locale/nl/LC_MESSAGES/CacheLog.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - CacheLog\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:54+0000\n"
-"Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:59+0000\n"
+"Language-Team: Dutch <https://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:26:35+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:49:51+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-cachelog\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/CacheLog/locale/pt/LC_MESSAGES/CacheLog.po b/plugins/CacheLog/locale/pt/LC_MESSAGES/CacheLog.po
index 76cf873a14..3e8e57dc5f 100644
--- a/plugins/CacheLog/locale/pt/LC_MESSAGES/CacheLog.po
+++ b/plugins/CacheLog/locale/pt/LC_MESSAGES/CacheLog.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - CacheLog to Portuguese (Português)
+# Translation of StatusNet - CacheLog to Portuguese (português)
 # Exported from translatewiki.net
 #
 # Author: Waldir
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - CacheLog\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:54+0000\n"
-"Language-Team: Portuguese <http://translatewiki.net/wiki/Portal:pt>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:59+0000\n"
+"Language-Team: Portuguese <https://translatewiki.net/wiki/Portal:pt>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:26:35+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:49:51+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: pt\n"
 "X-Message-Group: #out-statusnet-plugin-cachelog\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/CacheLog/locale/ru/LC_MESSAGES/CacheLog.po b/plugins/CacheLog/locale/ru/LC_MESSAGES/CacheLog.po
index 00bef9677e..e0e3770974 100644
--- a/plugins/CacheLog/locale/ru/LC_MESSAGES/CacheLog.po
+++ b/plugins/CacheLog/locale/ru/LC_MESSAGES/CacheLog.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - CacheLog to Russian (Ру��кий)
+# Translation of StatusNet - CacheLog to Russian (ру��кий)
 # Exported from translatewiki.net
 #
 # Author: �лек�андр Сигачёв
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - CacheLog\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:54+0000\n"
-"Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:59+0000\n"
+"Language-Team: Russian <https://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:26:35+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:49:51+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-cachelog\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
diff --git a/plugins/CacheLog/locale/tl/LC_MESSAGES/CacheLog.po b/plugins/CacheLog/locale/tl/LC_MESSAGES/CacheLog.po
index fd44f6f4d0..796bb88902 100644
--- a/plugins/CacheLog/locale/tl/LC_MESSAGES/CacheLog.po
+++ b/plugins/CacheLog/locale/tl/LC_MESSAGES/CacheLog.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - CacheLog\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:54+0000\n"
-"Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:59+0000\n"
+"Language-Team: Tagalog <https://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:26:35+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:49:51+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-cachelog\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/CacheLog/locale/uk/LC_MESSAGES/CacheLog.po b/plugins/CacheLog/locale/uk/LC_MESSAGES/CacheLog.po
index 500d49b113..3c23f387f1 100644
--- a/plugins/CacheLog/locale/uk/LC_MESSAGES/CacheLog.po
+++ b/plugins/CacheLog/locale/uk/LC_MESSAGES/CacheLog.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - CacheLog to Ukrainian (Україн�ька)
+# Translation of StatusNet - CacheLog to Ukrainian (україн�ька)
 # Exported from translatewiki.net
 #
 # Author: Boogie
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - CacheLog\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:54+0000\n"
-"Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:07:59+0000\n"
+"Language-Team: Ukrainian <https://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:26:35+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:49:51+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-cachelog\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
diff --git a/plugins/CacheLog/locale/zh_CN/LC_MESSAGES/CacheLog.po b/plugins/CacheLog/locale/zh_CN/LC_MESSAGES/CacheLog.po
index 6c75b083e1..4d688de3b6 100644
--- a/plugins/CacheLog/locale/zh_CN/LC_MESSAGES/CacheLog.po
+++ b/plugins/CacheLog/locale/zh_CN/LC_MESSAGES/CacheLog.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - CacheLog to Simplified Chinese (‪中文(简体)‬)
+# Translation of StatusNet - CacheLog to Simplified Chinese (‪中文（简体）‬)
 # Exported from translatewiki.net
 #
 # Author: ZhengYiFeng
@@ -9,15 +9,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - CacheLog\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:54+0000\n"
-"Language-Team: Simplified Chinese <http://translatewiki.net/wiki/Portal:zh-"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:00+0000\n"
+"Language-Team: Simplified Chinese <https://translatewiki.net/wiki/Portal:zh-"
 "hans>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:26:35+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:49:51+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: #out-statusnet-plugin-cachelog\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
diff --git a/plugins/CasAuthentication/locale/CasAuthentication.pot b/plugins/CasAuthentication/locale/CasAuthentication.pot
index 3b825125b4..e873e4aa50 100644
--- a/plugins/CasAuthentication/locale/CasAuthentication.pot
+++ b/plugins/CasAuthentication/locale/CasAuthentication.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
+"POT-Creation-Date: 2012-06-30 11:07+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"
diff --git a/plugins/CasAuthentication/locale/be-tarask/LC_MESSAGES/CasAuthentication.po b/plugins/CasAuthentication/locale/be-tarask/LC_MESSAGES/CasAuthentication.po
index 1aea0b20b6..b46c141fc9 100644
--- a/plugins/CasAuthentication/locale/be-tarask/LC_MESSAGES/CasAuthentication.po
+++ b/plugins/CasAuthentication/locale/be-tarask/LC_MESSAGES/CasAuthentication.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - CasAuthentication to Belarusian (Taraškievica orthography) (‪Белару�ка� (тарашкевіца)‬)
+# Translation of StatusNet - CasAuthentication to Belarusian (Taraškievica orthography) (‪белару�ка� (тарашкевіца)‬)
 # Exported from translatewiki.net
 #
 # Author: EugeneZelenko
@@ -10,15 +10,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - CasAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:55+0000\n"
-"Language-Team: Belarusian (Taraškievica orthography) <http://translatewiki."
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:00+0000\n"
+"Language-Team: Belarusian (Taraškievica orthography) <https://translatewiki."
 "net/wiki/Portal:be-tarask>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:26:35+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:49:52+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: be-tarask\n"
 "X-Message-Group: #out-statusnet-plugin-casauthentication\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -69,4 +69,4 @@ msgstr "���лушнае ім� кары�тальніка ці пароль."
 
 #. TRANS: Server error displayed when login fails in CAS authentication plugin.
 msgid "Error setting user. You are probably not authorized."
-msgstr "Памылка ў�таноўкі удзельніка. Верагодна Вы не аўтарызаваны."
+msgstr "Памылка ў�таноўкі кары�тальніка. Верагодна Вы не аўтарызаваны."
diff --git a/plugins/CasAuthentication/locale/br/LC_MESSAGES/CasAuthentication.po b/plugins/CasAuthentication/locale/br/LC_MESSAGES/CasAuthentication.po
index 350cbb1cf3..0194dedcf0 100644
--- a/plugins/CasAuthentication/locale/br/LC_MESSAGES/CasAuthentication.po
+++ b/plugins/CasAuthentication/locale/br/LC_MESSAGES/CasAuthentication.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - CasAuthentication to Breton (Brezhoneg)
+# Translation of StatusNet - CasAuthentication to Breton (brezhoneg)
 # Exported from translatewiki.net
 #
 # Author: Y-M D
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - CasAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:55+0000\n"
-"Language-Team: Breton <http://translatewiki.net/wiki/Portal:br>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:00+0000\n"
+"Language-Team: Breton <https://translatewiki.net/wiki/Portal:br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:26:35+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:49:52+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-casauthentication\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
diff --git a/plugins/CasAuthentication/locale/ca/LC_MESSAGES/CasAuthentication.po b/plugins/CasAuthentication/locale/ca/LC_MESSAGES/CasAuthentication.po
new file mode 100644
index 0000000000..8c1430017a
--- /dev/null
+++ b/plugins/CasAuthentication/locale/ca/LC_MESSAGES/CasAuthentication.po
@@ -0,0 +1,70 @@
+# Translation of StatusNet - CasAuthentication to Catalan (català)
+# Exported from translatewiki.net
+#
+# Author: Solde
+# Author: Toniher
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - CasAuthentication\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:00+0000\n"
+"Language-Team: Catalan <https://translatewiki.net/wiki/Portal:ca>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:49:52+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: ca\n"
+"X-Message-Group: #out-statusnet-plugin-casauthentication\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Menu item. CAS is Central Authentication Service.
+msgid "CAS"
+msgstr "CAS"
+
+#. TRANS: Tooltip for menu item. CAS is Central Authentication Service.
+msgid "Login or register with CAS."
+msgstr "Inici de sessió o registre amb CAS."
+
+#. TRANS: Invitation to users with a CAS account to log in using the service.
+#. TRANS: "[CAS login]" is a link description. (%%action.caslogin%%) is the URL.
+#. TRANS: These two elements may not be separated.
+#, php-format
+msgid "(Have an account with CAS? Try our [CAS login](%%action.caslogin%%)!)"
+msgstr ""
+
+#. TRANS: Exception thrown when the CAS Authentication plugin has been configured incorrectly.
+msgid "Specifying a server is required."
+msgstr "Cal especificar un servidor."
+
+#. TRANS: Exception thrown when the CAS Authentication plugin has been configured incorrectly.
+msgid "Specifying a port is required."
+msgstr "Cal especificar un port."
+
+#. TRANS: Exception thrown when the CAS Authentication plugin has been configured incorrectly.
+msgid "Specifying a path is required."
+msgstr "Cal especificar un camí."
+
+#. TRANS: Plugin description. CAS is Central Authentication Service.
+msgid ""
+"The CAS Authentication plugin allows for StatusNet to handle authentication "
+"through CAS (Central Authentication Service)."
+msgstr ""
+
+#. TRANS: Client error displayed when trying to log in while already logged on.
+msgid "Already logged in."
+msgstr "Ja heu iniciat una sessió."
+
+#. TRANS: Server error displayed when trying to log in with incorrect username or password.
+msgid "Incorrect username or password."
+msgstr "Nom d'usuari o contrasenya incorrectes."
+
+#. TRANS: Server error displayed when login fails in CAS authentication plugin.
+msgid "Error setting user. You are probably not authorized."
+msgstr ""
+"S'ha produït un error en definir l'usuari. Probablement no hi esteu "
+"autoritzat."
diff --git a/plugins/CasAuthentication/locale/de/LC_MESSAGES/CasAuthentication.po b/plugins/CasAuthentication/locale/de/LC_MESSAGES/CasAuthentication.po
index b4745d2b09..3dae0f13dd 100644
--- a/plugins/CasAuthentication/locale/de/LC_MESSAGES/CasAuthentication.po
+++ b/plugins/CasAuthentication/locale/de/LC_MESSAGES/CasAuthentication.po
@@ -10,14 +10,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - CasAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:55+0000\n"
-"Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:00+0000\n"
+"Language-Team: German <https://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:26:35+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:49:52+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-casauthentication\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/CasAuthentication/locale/es/LC_MESSAGES/CasAuthentication.po b/plugins/CasAuthentication/locale/es/LC_MESSAGES/CasAuthentication.po
index 50fcc2fbd6..b5acd4786b 100644
--- a/plugins/CasAuthentication/locale/es/LC_MESSAGES/CasAuthentication.po
+++ b/plugins/CasAuthentication/locale/es/LC_MESSAGES/CasAuthentication.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - CasAuthentication to Spanish (Español)
+# Translation of StatusNet - CasAuthentication to Spanish (español)
 # Exported from translatewiki.net
 #
 # Author: Locos epraix
@@ -10,14 +10,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - CasAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:55+0000\n"
-"Language-Team: Spanish <http://translatewiki.net/wiki/Portal:es>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:00+0000\n"
+"Language-Team: Spanish <https://translatewiki.net/wiki/Portal:es>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:26:35+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:49:52+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-plugin-casauthentication\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/CasAuthentication/locale/eu/LC_MESSAGES/CasAuthentication.po b/plugins/CasAuthentication/locale/eu/LC_MESSAGES/CasAuthentication.po
new file mode 100644
index 0000000000..5d204f7216
--- /dev/null
+++ b/plugins/CasAuthentication/locale/eu/LC_MESSAGES/CasAuthentication.po
@@ -0,0 +1,71 @@
+# Translation of StatusNet - CasAuthentication to Basque (euskara)
+# Exported from translatewiki.net
+#
+# Author: Artsuaga
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - CasAuthentication\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:00+0000\n"
+"Language-Team: Basque <https://translatewiki.net/wiki/Portal:eu>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:49:52+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: eu\n"
+"X-Message-Group: #out-statusnet-plugin-casauthentication\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Menu item. CAS is Central Authentication Service.
+msgid "CAS"
+msgstr "AZZ"
+
+#. TRANS: Tooltip for menu item. CAS is Central Authentication Service.
+msgid "Login or register with CAS."
+msgstr "AZZrekin izen eman."
+
+#. TRANS: Invitation to users with a CAS account to log in using the service.
+#. TRANS: "[CAS login]" is a link description. (%%action.caslogin%%) is the URL.
+#. TRANS: These two elements may not be separated.
+#, php-format
+msgid "(Have an account with CAS? Try our [CAS login](%%action.caslogin%%)!)"
+msgstr ""
+"(AZZrekin konturik bai? Saiatu gure [AZZ saio haserarekin](%%action.caslogin%"
+"%)!"
+
+#. TRANS: Exception thrown when the CAS Authentication plugin has been configured incorrectly.
+msgid "Specifying a server is required."
+msgstr "Zerbitzari bat zehaztea beharrezkoa da."
+
+#. TRANS: Exception thrown when the CAS Authentication plugin has been configured incorrectly.
+msgid "Specifying a port is required."
+msgstr "Portu bat zehaztea beharrezkoa da."
+
+#. TRANS: Exception thrown when the CAS Authentication plugin has been configured incorrectly.
+msgid "Specifying a path is required."
+msgstr "Bide bat zehaztea beharrezkoa da."
+
+#. TRANS: Plugin description. CAS is Central Authentication Service.
+msgid ""
+"The CAS Authentication plugin allows for StatusNet to handle authentication "
+"through CAS (Central Authentication Service)."
+msgstr ""
+"AZZ autentifikazio pluginak StatusNet-en AZZ (Autentifikazio Zerbitzu "
+"Zentrala) bidez autentifikatzea ahalbidetzen du."
+
+#. TRANS: Client error displayed when trying to log in while already logged on.
+msgid "Already logged in."
+msgstr "Dagoeneko saioa hasita."
+
+#. TRANS: Server error displayed when trying to log in with incorrect username or password.
+msgid "Incorrect username or password."
+msgstr "Erabiltzaile edo pasahitz okerra."
+
+#. TRANS: Server error displayed when login fails in CAS authentication plugin.
+msgid "Error setting user. You are probably not authorized."
+msgstr "Akatsa erabiltzailea ezartzean. Ziurrenik ez zaude baimenduta."
diff --git a/plugins/CasAuthentication/locale/fr/LC_MESSAGES/CasAuthentication.po b/plugins/CasAuthentication/locale/fr/LC_MESSAGES/CasAuthentication.po
index de62f114c3..56e7d8aab7 100644
--- a/plugins/CasAuthentication/locale/fr/LC_MESSAGES/CasAuthentication.po
+++ b/plugins/CasAuthentication/locale/fr/LC_MESSAGES/CasAuthentication.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - CasAuthentication to French (Français)
+# Translation of StatusNet - CasAuthentication to French (français)
 # Exported from translatewiki.net
 #
 # Author: Verdy p
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - CasAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:55+0000\n"
-"Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:00+0000\n"
+"Language-Team: French <https://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:26:35+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:49:52+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-casauthentication\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
diff --git a/plugins/CasAuthentication/locale/gl/LC_MESSAGES/CasAuthentication.po b/plugins/CasAuthentication/locale/gl/LC_MESSAGES/CasAuthentication.po
index b0382ce901..92b08b753b 100644
--- a/plugins/CasAuthentication/locale/gl/LC_MESSAGES/CasAuthentication.po
+++ b/plugins/CasAuthentication/locale/gl/LC_MESSAGES/CasAuthentication.po
@@ -1,5 +1,5 @@
-# Translation of StatusNet - CasAuthentication to Galician (Galego)
-# Expored from translatewiki.net
+# Translation of StatusNet - CasAuthentication to Galician (galego)
+# Exported from translatewiki.net
 #
 # Author: Toliño
 # --
@@ -9,64 +9,63 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - CasAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:51+0000\n"
-"Language-Team: Galician <http://translatewiki.net/wiki/Portal:gl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:01+0000\n"
+"Language-Team: Galician <https://translatewiki.net/wiki/Portal:gl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:25:59+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:49:52+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: gl\n"
 "X-Message-Group: #out-statusnet-plugin-casauthentication\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANS: Menu item. CAS is Central Authentication Service.
-#: CasAuthenticationPlugin.php:83
 msgid "CAS"
-msgstr ""
+msgstr "Servizo de autenticación central (SAC)"
 
 #. TRANS: Tooltip for menu item. CAS is Central Authentication Service.
-#: CasAuthenticationPlugin.php:85
 msgid "Login or register with CAS."
-msgstr ""
+msgstr "Iniciar sesión ou rexistrarse co SAC."
 
 #. TRANS: Invitation to users with a CAS account to log in using the service.
 #. TRANS: "[CAS login]" is a link description. (%%action.caslogin%%) is the URL.
 #. TRANS: These two elements may not be separated.
-#: CasAuthenticationPlugin.php:101
 #, php-format
 msgid "(Have an account with CAS? Try our [CAS login](%%action.caslogin%%)!)"
 msgstr ""
+"(Ten unha conta co SAC? Probe o noso [rexistro SAC](%%action.caslogin%%)!)"
 
-#: CasAuthenticationPlugin.php:128
+#. TRANS: Exception thrown when the CAS Authentication plugin has been configured incorrectly.
 msgid "Specifying a server is required."
-msgstr ""
+msgstr "Cómpre especificar un servidor."
 
-#: CasAuthenticationPlugin.php:131
+#. TRANS: Exception thrown when the CAS Authentication plugin has been configured incorrectly.
 msgid "Specifying a port is required."
-msgstr ""
+msgstr "Cómpre especificar un porto."
 
-#: CasAuthenticationPlugin.php:134
+#. TRANS: Exception thrown when the CAS Authentication plugin has been configured incorrectly.
 msgid "Specifying a path is required."
-msgstr ""
+msgstr "Cómpre especificar unha ruta."
 
 #. TRANS: Plugin description. CAS is Central Authentication Service.
-#: CasAuthenticationPlugin.php:154
 msgid ""
 "The CAS Authentication plugin allows for StatusNet to handle authentication "
 "through CAS (Central Authentication Service)."
 msgstr ""
+"O complemento de autenticación SAC permite a StatusNet manexar a "
+"autenticación a través do SAC (servizo de autenticación central)."
 
-#: caslogin.php:28
+#. TRANS: Client error displayed when trying to log in while already logged on.
 msgid "Already logged in."
 msgstr "Xa se identificou."
 
-#: caslogin.php:39
+#. TRANS: Server error displayed when trying to log in with incorrect username or password.
 msgid "Incorrect username or password."
 msgstr "Nome de usuario ou contrasinal incorrectos."
 
-#: caslogin.php:45
+#. TRANS: Server error displayed when login fails in CAS authentication plugin.
 msgid "Error setting user. You are probably not authorized."
 msgstr ""
 "Houbo un erro ao configurar o usuario. Probablemente non estea autorizado "
diff --git a/plugins/CasAuthentication/locale/hu/LC_MESSAGES/CasAuthentication.po b/plugins/CasAuthentication/locale/hu/LC_MESSAGES/CasAuthentication.po
index 1a0f4bb853..0e507ae74a 100644
--- a/plugins/CasAuthentication/locale/hu/LC_MESSAGES/CasAuthentication.po
+++ b/plugins/CasAuthentication/locale/hu/LC_MESSAGES/CasAuthentication.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - CasAuthentication to Hungarian (Magyar)
+# Translation of StatusNet - CasAuthentication to Hungarian (magyar)
 # Exported from translatewiki.net
 #
 # Author: Dani
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - CasAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:55+0000\n"
-"Language-Team: Hungarian <http://translatewiki.net/wiki/Portal:hu>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:01+0000\n"
+"Language-Team: Hungarian <https://translatewiki.net/wiki/Portal:hu>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:26:35+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:49:52+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: hu\n"
 "X-Message-Group: #out-statusnet-plugin-casauthentication\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/CasAuthentication/locale/ia/LC_MESSAGES/CasAuthentication.po b/plugins/CasAuthentication/locale/ia/LC_MESSAGES/CasAuthentication.po
index 471cf5ce76..5c3b6fcf9e 100644
--- a/plugins/CasAuthentication/locale/ia/LC_MESSAGES/CasAuthentication.po
+++ b/plugins/CasAuthentication/locale/ia/LC_MESSAGES/CasAuthentication.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - CasAuthentication to Interlingua (Interlingua)
+# Translation of StatusNet - CasAuthentication to Interlingua (interlingua)
 # Exported from translatewiki.net
 #
 # Author: McDutchie
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - CasAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:56+0000\n"
-"Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:01+0000\n"
+"Language-Team: Interlingua <https://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:26:35+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:49:52+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-casauthentication\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/CasAuthentication/locale/it/LC_MESSAGES/CasAuthentication.po b/plugins/CasAuthentication/locale/it/LC_MESSAGES/CasAuthentication.po
new file mode 100644
index 0000000000..c8da3ba4c3
--- /dev/null
+++ b/plugins/CasAuthentication/locale/it/LC_MESSAGES/CasAuthentication.po
@@ -0,0 +1,68 @@
+# Translation of StatusNet - CasAuthentication to Italian (italiano)
+# Exported from translatewiki.net
+#
+# Author: Ximo17
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - CasAuthentication\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:01+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:49:52+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Menu item. CAS is Central Authentication Service.
+msgid "CAS"
+msgstr "CAS"
+
+#. TRANS: Tooltip for menu item. CAS is Central Authentication Service.
+msgid "Login or register with CAS."
+msgstr "Autenticati o registrati con CAS."
+
+#. TRANS: Invitation to users with a CAS account to log in using the service.
+#. TRANS: "[CAS login]" is a link description. (%%action.caslogin%%) is the URL.
+#. TRANS: These two elements may not be separated.
+#, php-format
+msgid "(Have an account with CAS? Try our [CAS login](%%action.caslogin%%)!)"
+msgstr ""
+"(Hai un account con CAS? Prova il nostro [login CAS] (% %action.caslogin% "
+"%)!)"
+
+#. TRANS: Exception thrown when the CAS Authentication plugin has been configured incorrectly.
+msgid "Specifying a server is required."
+msgstr "E' necessario specificare un server."
+
+#. TRANS: Exception thrown when the CAS Authentication plugin has been configured incorrectly.
+msgid "Specifying a port is required."
+msgstr "E' necessario specificare una porta."
+
+#. TRANS: Exception thrown when the CAS Authentication plugin has been configured incorrectly.
+msgid "Specifying a path is required."
+msgstr "E' necessario specificare un percorso."
+
+#. TRANS: Plugin description. CAS is Central Authentication Service.
+msgid ""
+"The CAS Authentication plugin allows for StatusNet to handle authentication "
+"through CAS (Central Authentication Service)."
+msgstr ""
+"Il plugin di autenticazione CAS permette a StatusNet di gestire "
+"l'autenticazione attraverso il CAS (Servizio di Autenticazione Centrale)."
+
+#. TRANS: Client error displayed when trying to log in while already logged on.
+msgid "Already logged in."
+msgstr "Accesso già effettuato."
+
+#. TRANS: Server error displayed when trying to log in with incorrect username or password.
+msgid "Incorrect username or password."
+msgstr "Nome utente o password non corretti."
+
+#. TRANS: Server error displayed when login fails in CAS authentication plugin.
+msgid "Error setting user. You are probably not authorized."
+msgstr "Errore nell'impostare l'utente. Forse non hai l'autorizzazione."
diff --git a/plugins/CasAuthentication/locale/mk/LC_MESSAGES/CasAuthentication.po b/plugins/CasAuthentication/locale/mk/LC_MESSAGES/CasAuthentication.po
index 57e5b3a858..17db3c763e 100644
--- a/plugins/CasAuthentication/locale/mk/LC_MESSAGES/CasAuthentication.po
+++ b/plugins/CasAuthentication/locale/mk/LC_MESSAGES/CasAuthentication.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - CasAuthentication to Macedonian (Македон�ки)
+# Translation of StatusNet - CasAuthentication to Macedonian (македон�ки)
 # Exported from translatewiki.net
 #
 # Author: Bjankuloski06
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - CasAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:56+0000\n"
-"Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:01+0000\n"
+"Language-Team: Macedonian <https://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:26:35+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:49:52+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-casauthentication\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
diff --git a/plugins/CasAuthentication/locale/nl/LC_MESSAGES/CasAuthentication.po b/plugins/CasAuthentication/locale/nl/LC_MESSAGES/CasAuthentication.po
index ec99286f9a..b3621fc199 100644
--- a/plugins/CasAuthentication/locale/nl/LC_MESSAGES/CasAuthentication.po
+++ b/plugins/CasAuthentication/locale/nl/LC_MESSAGES/CasAuthentication.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - CasAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:56+0000\n"
-"Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:01+0000\n"
+"Language-Team: Dutch <https://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:26:35+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:49:52+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-casauthentication\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/CasAuthentication/locale/pt_BR/LC_MESSAGES/CasAuthentication.po b/plugins/CasAuthentication/locale/pt_BR/LC_MESSAGES/CasAuthentication.po
index 980bc714f4..006b67f355 100644
--- a/plugins/CasAuthentication/locale/pt_BR/LC_MESSAGES/CasAuthentication.po
+++ b/plugins/CasAuthentication/locale/pt_BR/LC_MESSAGES/CasAuthentication.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - CasAuthentication to Brazilian Portuguese (Português do Brasil)
+# Translation of StatusNet - CasAuthentication to Brazilian Portuguese (português do Brasil)
 # Exported from translatewiki.net
 #
 # Author: Luckas Blade
@@ -9,15 +9,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - CasAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:56+0000\n"
-"Language-Team: Brazilian Portuguese <http://translatewiki.net/wiki/Portal:pt-"
-"br>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:01+0000\n"
+"Language-Team: Brazilian Portuguese <https://translatewiki.net/wiki/Portal:"
+"pt-br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:26:35+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:49:52+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: pt-br\n"
 "X-Message-Group: #out-statusnet-plugin-casauthentication\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
diff --git a/plugins/CasAuthentication/locale/ru/LC_MESSAGES/CasAuthentication.po b/plugins/CasAuthentication/locale/ru/LC_MESSAGES/CasAuthentication.po
index cda3fa9eab..3b57e2a56f 100644
--- a/plugins/CasAuthentication/locale/ru/LC_MESSAGES/CasAuthentication.po
+++ b/plugins/CasAuthentication/locale/ru/LC_MESSAGES/CasAuthentication.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - CasAuthentication to Russian (Ру��кий)
+# Translation of StatusNet - CasAuthentication to Russian (ру��кий)
 # Exported from translatewiki.net
 #
 # Author: Lockal
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - CasAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:56+0000\n"
-"Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:02+0000\n"
+"Language-Team: Russian <https://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:26:35+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:49:52+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-casauthentication\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
diff --git a/plugins/CasAuthentication/locale/tl/LC_MESSAGES/CasAuthentication.po b/plugins/CasAuthentication/locale/tl/LC_MESSAGES/CasAuthentication.po
index b99f162012..09069fa2ae 100644
--- a/plugins/CasAuthentication/locale/tl/LC_MESSAGES/CasAuthentication.po
+++ b/plugins/CasAuthentication/locale/tl/LC_MESSAGES/CasAuthentication.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - CasAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:56+0000\n"
-"Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:02+0000\n"
+"Language-Team: Tagalog <https://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:26:35+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:49:52+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-casauthentication\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/CasAuthentication/locale/uk/LC_MESSAGES/CasAuthentication.po b/plugins/CasAuthentication/locale/uk/LC_MESSAGES/CasAuthentication.po
index ba2c624275..578fbbd933 100644
--- a/plugins/CasAuthentication/locale/uk/LC_MESSAGES/CasAuthentication.po
+++ b/plugins/CasAuthentication/locale/uk/LC_MESSAGES/CasAuthentication.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - CasAuthentication to Ukrainian (Україн�ька)
+# Translation of StatusNet - CasAuthentication to Ukrainian (україн�ька)
 # Exported from translatewiki.net
 #
 # Author: Boogie
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - CasAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:56+0000\n"
-"Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:02+0000\n"
+"Language-Team: Ukrainian <https://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:26:35+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:49:52+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-casauthentication\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
diff --git a/plugins/CasAuthentication/locale/zh_CN/LC_MESSAGES/CasAuthentication.po b/plugins/CasAuthentication/locale/zh_CN/LC_MESSAGES/CasAuthentication.po
index 0c35fae2cc..f9b302aaa9 100644
--- a/plugins/CasAuthentication/locale/zh_CN/LC_MESSAGES/CasAuthentication.po
+++ b/plugins/CasAuthentication/locale/zh_CN/LC_MESSAGES/CasAuthentication.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - CasAuthentication to Simplified Chinese (‪中文(简体)‬)
+# Translation of StatusNet - CasAuthentication to Simplified Chinese (‪中文（简体）‬)
 # Exported from translatewiki.net
 #
 # Author: Chenxiaoqino
@@ -9,15 +9,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - CasAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:56+0000\n"
-"Language-Team: Simplified Chinese <http://translatewiki.net/wiki/Portal:zh-"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:02+0000\n"
+"Language-Team: Simplified Chinese <https://translatewiki.net/wiki/Portal:zh-"
 "hans>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:26:35+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:49:52+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: #out-statusnet-plugin-casauthentication\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
diff --git a/plugins/ClientSideShorten/ClientSideShortenPlugin.php b/plugins/ClientSideShorten/ClientSideShortenPlugin.php
index 6379acd334..cc10929231 100644
--- a/plugins/ClientSideShorten/ClientSideShortenPlugin.php
+++ b/plugins/ClientSideShorten/ClientSideShortenPlugin.php
@@ -55,7 +55,7 @@ class ClientSideShortenPlugin extends Plugin
             $user = common_current_user();
             $action->inlineScript('var maxNoticeLength = ' . User_urlshortener_prefs::maxNoticeLength($user));
             $action->inlineScript('var maxUrlLength = ' . User_urlshortener_prefs::maxUrlLength($user));
-            $action->script('plugins/ClientSideShorten/shorten.js');
+            $action->script($this->path('shorten.js'));
         }
     }
 
diff --git a/plugins/ClientSideShorten/locale/ClientSideShorten.pot b/plugins/ClientSideShorten/locale/ClientSideShorten.pot
index fc72140dc0..2a09f0cf74 100644
--- a/plugins/ClientSideShorten/locale/ClientSideShorten.pot
+++ b/plugins/ClientSideShorten/locale/ClientSideShorten.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
+"POT-Creation-Date: 2012-06-30 11:07+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"
diff --git a/plugins/ClientSideShorten/locale/be-tarask/LC_MESSAGES/ClientSideShorten.po b/plugins/ClientSideShorten/locale/be-tarask/LC_MESSAGES/ClientSideShorten.po
index d495382b78..e9a541f74a 100644
--- a/plugins/ClientSideShorten/locale/be-tarask/LC_MESSAGES/ClientSideShorten.po
+++ b/plugins/ClientSideShorten/locale/be-tarask/LC_MESSAGES/ClientSideShorten.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - ClientSideShorten to Belarusian (Taraškievica orthography) (‪Белару�ка� (тарашкевіца)‬)
+# Translation of StatusNet - ClientSideShorten to Belarusian (Taraškievica orthography) (‪белару�ка� (тарашкевіца)‬)
 # Exported from translatewiki.net
 #
 # Author: EugeneZelenko
@@ -9,15 +9,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ClientSideShorten\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:56+0000\n"
-"Language-Team: Belarusian (Taraškievica orthography) <http://translatewiki."
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:02+0000\n"
+"Language-Team: Belarusian (Taraškievica orthography) <https://translatewiki."
 "net/wiki/Portal:be-tarask>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:26:36+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:49:52+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: be-tarask\n"
 "X-Message-Group: #out-statusnet-plugin-clientsideshorten\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/ClientSideShorten/locale/de/LC_MESSAGES/ClientSideShorten.po b/plugins/ClientSideShorten/locale/de/LC_MESSAGES/ClientSideShorten.po
index 9ad580b2a9..a32a1c1b0c 100644
--- a/plugins/ClientSideShorten/locale/de/LC_MESSAGES/ClientSideShorten.po
+++ b/plugins/ClientSideShorten/locale/de/LC_MESSAGES/ClientSideShorten.po
@@ -10,14 +10,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ClientSideShorten\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:57+0000\n"
-"Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:02+0000\n"
+"Language-Team: German <https://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:26:36+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:49:52+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-clientsideshorten\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/ClientSideShorten/locale/es/LC_MESSAGES/ClientSideShorten.po b/plugins/ClientSideShorten/locale/es/LC_MESSAGES/ClientSideShorten.po
index 6788702954..2fee930915 100644
--- a/plugins/ClientSideShorten/locale/es/LC_MESSAGES/ClientSideShorten.po
+++ b/plugins/ClientSideShorten/locale/es/LC_MESSAGES/ClientSideShorten.po
@@ -1,6 +1,7 @@
-# Translation of StatusNet - ClientSideShorten to Spanish (Español)
+# Translation of StatusNet - ClientSideShorten to Spanish (español)
 # Exported from translatewiki.net
 #
+# Author: Erchache2000
 # Author: Translationista
 # --
 # This file is distributed under the same license as the StatusNet package.
@@ -9,14 +10,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ClientSideShorten\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:57+0000\n"
-"Language-Team: Spanish <http://translatewiki.net/wiki/Portal:es>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:02+0000\n"
+"Language-Team: Spanish <https://translatewiki.net/wiki/Portal:es>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:26:36+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:49:52+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-plugin-clientsideshorten\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -31,6 +32,5 @@ msgstr ""
 "envíe el mensaje."
 
 #. TRANS: Client exception thrown when a text argument is not present.
-#, fuzzy
 msgid "\"text\" argument must be specified."
 msgstr "Debe especificarse el argumento 'texto'."
diff --git a/plugins/ClientSideShorten/locale/eu/LC_MESSAGES/ClientSideShorten.po b/plugins/ClientSideShorten/locale/eu/LC_MESSAGES/ClientSideShorten.po
new file mode 100644
index 0000000000..11e1b6c895
--- /dev/null
+++ b/plugins/ClientSideShorten/locale/eu/LC_MESSAGES/ClientSideShorten.po
@@ -0,0 +1,34 @@
+# Translation of StatusNet - ClientSideShorten to Basque (euskara)
+# Exported from translatewiki.net
+#
+# Author: Artsuaga
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - ClientSideShorten\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:02+0000\n"
+"Language-Team: Basque <https://translatewiki.net/wiki/Portal:eu>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:49:52+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: eu\n"
+"X-Message-Group: #out-statusnet-plugin-clientsideshorten\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin description.
+msgid ""
+"ClientSideShorten causes the web interface's notice form to automatically "
+"shorten URLs as they entered, and before the notice is submitted."
+msgstr ""
+"ClientSideShorten-ekin web interfazeko ohar imprimakiak URLa  idazten duzun "
+"einean laburtuko du automatikoki, oharra bidali aurretik."
+
+#. TRANS: Client exception thrown when a text argument is not present.
+msgid "\"text\" argument must be specified."
+msgstr "\"testua\" argumentua zehaztu behar da."
diff --git a/plugins/ClientSideShorten/locale/fr/LC_MESSAGES/ClientSideShorten.po b/plugins/ClientSideShorten/locale/fr/LC_MESSAGES/ClientSideShorten.po
index b0dbc9e10e..57003ed61c 100644
--- a/plugins/ClientSideShorten/locale/fr/LC_MESSAGES/ClientSideShorten.po
+++ b/plugins/ClientSideShorten/locale/fr/LC_MESSAGES/ClientSideShorten.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - ClientSideShorten to French (Français)
+# Translation of StatusNet - ClientSideShorten to French (français)
 # Exported from translatewiki.net
 #
 # Author: Peter17
@@ -10,14 +10,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ClientSideShorten\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:57+0000\n"
-"Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:03+0000\n"
+"Language-Team: French <https://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:26:36+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:49:52+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-clientsideshorten\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
diff --git a/plugins/ClientSideShorten/locale/gl/LC_MESSAGES/ClientSideShorten.po b/plugins/ClientSideShorten/locale/gl/LC_MESSAGES/ClientSideShorten.po
new file mode 100644
index 0000000000..a4dcbe6db6
--- /dev/null
+++ b/plugins/ClientSideShorten/locale/gl/LC_MESSAGES/ClientSideShorten.po
@@ -0,0 +1,34 @@
+# Translation of StatusNet - ClientSideShorten to Galician (galego)
+# Exported from translatewiki.net
+#
+# Author: Toliño
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - ClientSideShorten\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:03+0000\n"
+"Language-Team: Galician <https://translatewiki.net/wiki/Portal:gl>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:49:52+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: gl\n"
+"X-Message-Group: #out-statusnet-plugin-clientsideshorten\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin description.
+msgid ""
+"ClientSideShorten causes the web interface's notice form to automatically "
+"shorten URLs as they entered, and before the notice is submitted."
+msgstr ""
+"ClientSideShorten causa que o formulario de notas da interface acurte os "
+"enderezos URL automaticamente á vez que se escriben e antes de enviar a nota."
+
+#. TRANS: Client exception thrown when a text argument is not present.
+msgid "\"text\" argument must be specified."
+msgstr "Cómpre especificar o argumento \"text\"."
diff --git a/plugins/ClientSideShorten/locale/he/LC_MESSAGES/ClientSideShorten.po b/plugins/ClientSideShorten/locale/he/LC_MESSAGES/ClientSideShorten.po
index 8eeee7a0ef..1525bbe0e4 100644
--- a/plugins/ClientSideShorten/locale/he/LC_MESSAGES/ClientSideShorten.po
+++ b/plugins/ClientSideShorten/locale/he/LC_MESSAGES/ClientSideShorten.po
@@ -1,6 +1,7 @@
 # Translation of StatusNet - ClientSideShorten to Hebrew (עברית)
 # Exported from translatewiki.net
 #
+# Author: Amire80
 # Author: YaronSh
 # --
 # This file is distributed under the same license as the StatusNet package.
@@ -9,14 +10,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ClientSideShorten\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:57+0000\n"
-"Language-Team: Hebrew <http://translatewiki.net/wiki/Portal:he>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:03+0000\n"
+"Language-Team: Hebrew <https://translatewiki.net/wiki/Portal:he>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:26:36+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:49:52+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: he\n"
 "X-Message-Group: #out-statusnet-plugin-clientsideshorten\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -26,10 +27,9 @@ msgid ""
 "ClientSideShorten causes the web interface's notice form to automatically "
 "shorten URLs as they entered, and before the notice is submitted."
 msgstr ""
-"התוסף ClientSideShorten (קיצור מצד הלקוח) גור� לטופס ההתרעה שבמנשק המשתמש "
-"לקצר �וטומטית כתובות כ�שר הן מוזנות ולפני שההתרעה נשלחת."
+"התוסף ClientSideShorten (קיצור מצד הלקוח) גור� לטופס הזנת העדכון בממשק הוובי "
+"לקצר �וטומטית כתובות כ�שר הן מוזנות ולפני שהעדכון נשלח."
 
 #. TRANS: Client exception thrown when a text argument is not present.
-#, fuzzy
 msgid "\"text\" argument must be specified."
-msgstr "יש ציין �ת המשתנה 'text'"
+msgstr "יש ציין �ת המשתנה \"text\"."
diff --git a/plugins/ClientSideShorten/locale/ia/LC_MESSAGES/ClientSideShorten.po b/plugins/ClientSideShorten/locale/ia/LC_MESSAGES/ClientSideShorten.po
index 1a1a311507..ae3bfde87b 100644
--- a/plugins/ClientSideShorten/locale/ia/LC_MESSAGES/ClientSideShorten.po
+++ b/plugins/ClientSideShorten/locale/ia/LC_MESSAGES/ClientSideShorten.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - ClientSideShorten to Interlingua (Interlingua)
+# Translation of StatusNet - ClientSideShorten to Interlingua (interlingua)
 # Exported from translatewiki.net
 #
 # Author: McDutchie
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ClientSideShorten\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:57+0000\n"
-"Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:03+0000\n"
+"Language-Team: Interlingua <https://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:26:36+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:49:52+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-clientsideshorten\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/ClientSideShorten/locale/id/LC_MESSAGES/ClientSideShorten.po b/plugins/ClientSideShorten/locale/id/LC_MESSAGES/ClientSideShorten.po
index ec80b3c000..0abc37a6ba 100644
--- a/plugins/ClientSideShorten/locale/id/LC_MESSAGES/ClientSideShorten.po
+++ b/plugins/ClientSideShorten/locale/id/LC_MESSAGES/ClientSideShorten.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ClientSideShorten\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:57+0000\n"
-"Language-Team: Indonesian <http://translatewiki.net/wiki/Portal:id>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:03+0000\n"
+"Language-Team: Indonesian <https://translatewiki.net/wiki/Portal:id>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:26:36+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:49:52+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: id\n"
 "X-Message-Group: #out-statusnet-plugin-clientsideshorten\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
diff --git a/plugins/ClientSideShorten/locale/it/LC_MESSAGES/ClientSideShorten.po b/plugins/ClientSideShorten/locale/it/LC_MESSAGES/ClientSideShorten.po
new file mode 100644
index 0000000000..4aff0eb7fc
--- /dev/null
+++ b/plugins/ClientSideShorten/locale/it/LC_MESSAGES/ClientSideShorten.po
@@ -0,0 +1,32 @@
+# Translation of StatusNet - ClientSideShorten to Italian (italiano)
+# Exported from translatewiki.net
+#
+# Author: Ximo17
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - ClientSideShorten\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:03+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:49:52+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin description.
+msgid ""
+"ClientSideShorten causes the web interface's notice form to automatically "
+"shorten URLs as they entered, and before the notice is submitted."
+msgstr ""
+"ClientSideShorten genera il form di notifica d'interfaccia web per "
+"accorciare automaticamente gli URL non appena vengono inseriti, e prima che "
+"la notifica venga inviata."
+
+#. TRANS: Client exception thrown when a text argument is not present.
+msgid "\"text\" argument must be specified."
+msgstr "è necessario specificare l'argomento del \"testo\"."
diff --git a/plugins/ClientSideShorten/locale/mk/LC_MESSAGES/ClientSideShorten.po b/plugins/ClientSideShorten/locale/mk/LC_MESSAGES/ClientSideShorten.po
index ae121020fd..b93b6b1fd4 100644
--- a/plugins/ClientSideShorten/locale/mk/LC_MESSAGES/ClientSideShorten.po
+++ b/plugins/ClientSideShorten/locale/mk/LC_MESSAGES/ClientSideShorten.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - ClientSideShorten to Macedonian (Македон�ки)
+# Translation of StatusNet - ClientSideShorten to Macedonian (македон�ки)
 # Exported from translatewiki.net
 #
 # Author: Bjankuloski06
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ClientSideShorten\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:57+0000\n"
-"Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:03+0000\n"
+"Language-Team: Macedonian <https://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:26:36+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:49:52+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-clientsideshorten\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
diff --git a/plugins/ClientSideShorten/locale/nb/LC_MESSAGES/ClientSideShorten.po b/plugins/ClientSideShorten/locale/nb/LC_MESSAGES/ClientSideShorten.po
index d4bdcfe2bb..59e1d226b5 100644
--- a/plugins/ClientSideShorten/locale/nb/LC_MESSAGES/ClientSideShorten.po
+++ b/plugins/ClientSideShorten/locale/nb/LC_MESSAGES/ClientSideShorten.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - ClientSideShorten to Norwegian (bokmål)‬ (‪Norsk (bokmål)‬)
+# Translation of StatusNet - ClientSideShorten to Norwegian Bokmål (‪norsk (bokmål)‬)
 # Exported from translatewiki.net
 #
 # Author: Nghtwlkr
@@ -9,15 +9,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ClientSideShorten\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:57+0000\n"
-"Language-Team: Norwegian (bokmål)‬ <http://translatewiki.net/wiki/Portal:no>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:03+0000\n"
+"Language-Team: Norwegian Bokmål <https://translatewiki.net/wiki/Portal:nb>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:26:36+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
-"X-Language-Code: no\n"
+"X-POT-Import-Date: 2011-06-05 21:49:52+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: nb\n"
 "X-Message-Group: #out-statusnet-plugin-clientsideshorten\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
@@ -30,6 +30,5 @@ msgstr ""
 "forkorter URL-er mens de skrives inn, og før notisen sendes inn."
 
 #. TRANS: Client exception thrown when a text argument is not present.
-#, fuzzy
 msgid "\"text\" argument must be specified."
-msgstr "'text'-argument må spesifiseres."
+msgstr "«text»-argumentet må spesifiseres."
diff --git a/plugins/ClientSideShorten/locale/nl/LC_MESSAGES/ClientSideShorten.po b/plugins/ClientSideShorten/locale/nl/LC_MESSAGES/ClientSideShorten.po
index 403da65b6f..96945cf148 100644
--- a/plugins/ClientSideShorten/locale/nl/LC_MESSAGES/ClientSideShorten.po
+++ b/plugins/ClientSideShorten/locale/nl/LC_MESSAGES/ClientSideShorten.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ClientSideShorten\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:57+0000\n"
-"Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:03+0000\n"
+"Language-Team: Dutch <https://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:26:36+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:49:52+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-clientsideshorten\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/ClientSideShorten/locale/ru/LC_MESSAGES/ClientSideShorten.po b/plugins/ClientSideShorten/locale/ru/LC_MESSAGES/ClientSideShorten.po
index e24e0c5679..3dca49f79e 100644
--- a/plugins/ClientSideShorten/locale/ru/LC_MESSAGES/ClientSideShorten.po
+++ b/plugins/ClientSideShorten/locale/ru/LC_MESSAGES/ClientSideShorten.po
@@ -1,6 +1,7 @@
-# Translation of StatusNet - ClientSideShorten to Russian (Ру��кий)
+# Translation of StatusNet - ClientSideShorten to Russian (ру��кий)
 # Exported from translatewiki.net
 #
+# Author: Adata80
 # Author: Lockal
 # Author: �лек�андр Сигачёв
 # --
@@ -10,14 +11,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ClientSideShorten\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:57+0000\n"
-"Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:04+0000\n"
+"Language-Team: Russian <https://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:26:36+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:49:52+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-clientsideshorten\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
@@ -32,6 +33,5 @@ msgstr ""
 "вводе в форму веб-интерфей�а перед отправкой запи�и."
 
 #. TRANS: Client exception thrown when a text argument is not present.
-#, fuzzy
 msgid "\"text\" argument must be specified."
-msgstr "Должен быть указан параметр «text»."
+msgstr "\"text\" параметр должен быть указан."
diff --git a/plugins/ClientSideShorten/locale/tl/LC_MESSAGES/ClientSideShorten.po b/plugins/ClientSideShorten/locale/tl/LC_MESSAGES/ClientSideShorten.po
index 463e7d6b21..3da7751cdf 100644
--- a/plugins/ClientSideShorten/locale/tl/LC_MESSAGES/ClientSideShorten.po
+++ b/plugins/ClientSideShorten/locale/tl/LC_MESSAGES/ClientSideShorten.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ClientSideShorten\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:57+0000\n"
-"Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:04+0000\n"
+"Language-Team: Tagalog <https://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:26:36+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:49:52+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-clientsideshorten\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/ClientSideShorten/locale/uk/LC_MESSAGES/ClientSideShorten.po b/plugins/ClientSideShorten/locale/uk/LC_MESSAGES/ClientSideShorten.po
index dc83524ff1..a91ff1b6a9 100644
--- a/plugins/ClientSideShorten/locale/uk/LC_MESSAGES/ClientSideShorten.po
+++ b/plugins/ClientSideShorten/locale/uk/LC_MESSAGES/ClientSideShorten.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - ClientSideShorten to Ukrainian (Україн�ька)
+# Translation of StatusNet - ClientSideShorten to Ukrainian (україн�ька)
 # Exported from translatewiki.net
 #
 # Author: Boogie
@@ -10,14 +10,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ClientSideShorten\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:57+0000\n"
-"Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:04+0000\n"
+"Language-Team: Ukrainian <https://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:26:36+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:49:52+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-clientsideshorten\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
diff --git a/plugins/ClientSideShorten/locale/zh_CN/LC_MESSAGES/ClientSideShorten.po b/plugins/ClientSideShorten/locale/zh_CN/LC_MESSAGES/ClientSideShorten.po
index ce65001e0f..1b9a1b4bca 100644
--- a/plugins/ClientSideShorten/locale/zh_CN/LC_MESSAGES/ClientSideShorten.po
+++ b/plugins/ClientSideShorten/locale/zh_CN/LC_MESSAGES/ClientSideShorten.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - ClientSideShorten to Simplified Chinese (‪中文(简体)‬)
+# Translation of StatusNet - ClientSideShorten to Simplified Chinese (‪中文（简体）‬)
 # Exported from translatewiki.net
 #
 # Author: Chenxiaoqino
@@ -10,15 +10,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ClientSideShorten\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:57+0000\n"
-"Language-Team: Simplified Chinese <http://translatewiki.net/wiki/Portal:zh-"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:04+0000\n"
+"Language-Team: Simplified Chinese <https://translatewiki.net/wiki/Portal:zh-"
 "hans>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:26:36+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:49:52+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: #out-statusnet-plugin-clientsideshorten\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
diff --git a/plugins/Comet/locale/Comet.pot b/plugins/Comet/locale/Comet.pot
index 0aa1b5844a..12405fc4e8 100644
--- a/plugins/Comet/locale/Comet.pot
+++ b/plugins/Comet/locale/Comet.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
+"POT-Creation-Date: 2012-06-30 11:07+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"
diff --git a/plugins/Comet/locale/de/LC_MESSAGES/Comet.po b/plugins/Comet/locale/de/LC_MESSAGES/Comet.po
index 3ea8d25afe..4193bbded0 100644
--- a/plugins/Comet/locale/de/LC_MESSAGES/Comet.po
+++ b/plugins/Comet/locale/de/LC_MESSAGES/Comet.po
@@ -10,14 +10,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Comet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:58+0000\n"
-"Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:04+0000\n"
+"Language-Team: German <https://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:26:36+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:49:53+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-comet\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/Comet/locale/es/LC_MESSAGES/Comet.po b/plugins/Comet/locale/es/LC_MESSAGES/Comet.po
index f77e757f53..0f89d791d1 100644
--- a/plugins/Comet/locale/es/LC_MESSAGES/Comet.po
+++ b/plugins/Comet/locale/es/LC_MESSAGES/Comet.po
@@ -1,6 +1,7 @@
-# Translation of StatusNet - Comet to Spanish (Español)
+# Translation of StatusNet - Comet to Spanish (español)
 # Exported from translatewiki.net
 #
+# Author: Erchache2000
 # Author: Translationista
 # --
 # This file is distributed under the same license as the StatusNet package.
@@ -9,22 +10,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Comet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-31 21:06+0000\n"
-"PO-Revision-Date: 2011-03-31 21:09:04+0000\n"
-"Language-Team: Spanish <http://translatewiki.net/wiki/Portal:es>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:04+0000\n"
+"Language-Team: Spanish <https://translatewiki.net/wiki/Portal:es>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-24 15:24:57+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r85082); Translate extension (2011-03-11)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:49:53+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-plugin-comet\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANS: Plugin description message. Bayeux is a protocol for transporting asynchronous messages
 #. TRANS: and Comet is a web application model.
-#, fuzzy
 msgid "Plugin to make updates using Comet and Bayeux."
 msgstr ""
-"Extensión para hacer actualizaciones en \"tiempo real\" utilizando Comet/"
+"Extensión para hacer actualizaciones en \"tiempo real\" utilizando Comet y "
 "Bayeux."
diff --git a/plugins/Comet/locale/eu/LC_MESSAGES/Comet.po b/plugins/Comet/locale/eu/LC_MESSAGES/Comet.po
new file mode 100644
index 0000000000..d6de8387de
--- /dev/null
+++ b/plugins/Comet/locale/eu/LC_MESSAGES/Comet.po
@@ -0,0 +1,24 @@
+# Translation of StatusNet - Comet to Basque (euskara)
+# Exported from translatewiki.net
+#
+# Author: Artsuaga
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Comet\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:04+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:49:53+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin description message. Bayeux is a protocol for transporting asynchronous messages
+#. TRANS: and Comet is a web application model.
+msgid "Plugin to make updates using Comet and Bayeux."
+msgstr "Comet and Bayeux erabiliz eguneraketa egiteko plugina."
diff --git a/plugins/Comet/locale/fr/LC_MESSAGES/Comet.po b/plugins/Comet/locale/fr/LC_MESSAGES/Comet.po
index b59b2d54e7..ae9b0a1310 100644
--- a/plugins/Comet/locale/fr/LC_MESSAGES/Comet.po
+++ b/plugins/Comet/locale/fr/LC_MESSAGES/Comet.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Comet to French (Français)
+# Translation of StatusNet - Comet to French (français)
 # Exported from translatewiki.net
 #
 # Author: Peter17
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Comet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:58+0000\n"
-"Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:05+0000\n"
+"Language-Team: French <https://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:26:36+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:49:53+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-comet\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
diff --git a/plugins/Comet/locale/gl/LC_MESSAGES/Comet.po b/plugins/Comet/locale/gl/LC_MESSAGES/Comet.po
new file mode 100644
index 0000000000..509c462d02
--- /dev/null
+++ b/plugins/Comet/locale/gl/LC_MESSAGES/Comet.po
@@ -0,0 +1,27 @@
+# Translation of StatusNet - Comet to Galician (galego)
+# Exported from translatewiki.net
+#
+# Author: Toliño
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Comet\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:05+0000\n"
+"Language-Team: Galician <https://translatewiki.net/wiki/Portal:gl>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:49:53+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: gl\n"
+"X-Message-Group: #out-statusnet-plugin-comet\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin description message. Bayeux is a protocol for transporting asynchronous messages
+#. TRANS: and Comet is a web application model.
+msgid "Plugin to make updates using Comet and Bayeux."
+msgstr "Complemento para realizar actualizacións mediante Comet e Bayeux."
diff --git a/plugins/Comet/locale/he/LC_MESSAGES/Comet.po b/plugins/Comet/locale/he/LC_MESSAGES/Comet.po
index 3dc3915e1c..67591d086f 100644
--- a/plugins/Comet/locale/he/LC_MESSAGES/Comet.po
+++ b/plugins/Comet/locale/he/LC_MESSAGES/Comet.po
@@ -1,6 +1,7 @@
 # Translation of StatusNet - Comet to Hebrew (עברית)
 # Exported from translatewiki.net
 #
+# Author: Amire80
 # Author: YaronSh
 # --
 # This file is distributed under the same license as the StatusNet package.
@@ -9,20 +10,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Comet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-31 21:06+0000\n"
-"PO-Revision-Date: 2011-03-31 21:09:04+0000\n"
-"Language-Team: Hebrew <http://translatewiki.net/wiki/Portal:he>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:05+0000\n"
+"Language-Team: Hebrew <https://translatewiki.net/wiki/Portal:he>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-24 15:24:57+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r85082); Translate extension (2011-03-11)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:49:53+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: he\n"
 "X-Message-Group: #out-statusnet-plugin-comet\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANS: Plugin description message. Bayeux is a protocol for transporting asynchronous messages
 #. TRANS: and Comet is a web application model.
-#, fuzzy
 msgid "Plugin to make updates using Comet and Bayeux."
-msgstr "תוסף לביצוע עדכוני� \"בזמן �מת\" ב�מצעות Comet/Bayeux."
+msgstr "תוסף לביצוע עדכוני� ב�מצעות Comet ו־Bayeux."
diff --git a/plugins/Comet/locale/ia/LC_MESSAGES/Comet.po b/plugins/Comet/locale/ia/LC_MESSAGES/Comet.po
index 67ee5b6ab9..9cbd80b6ba 100644
--- a/plugins/Comet/locale/ia/LC_MESSAGES/Comet.po
+++ b/plugins/Comet/locale/ia/LC_MESSAGES/Comet.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Comet to Interlingua (Interlingua)
+# Translation of StatusNet - Comet to Interlingua (interlingua)
 # Exported from translatewiki.net
 #
 # Author: McDutchie
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Comet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:58+0000\n"
-"Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:05+0000\n"
+"Language-Team: Interlingua <https://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:26:36+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:49:53+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-comet\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/Comet/locale/it/LC_MESSAGES/Comet.po b/plugins/Comet/locale/it/LC_MESSAGES/Comet.po
new file mode 100644
index 0000000000..8cba2da738
--- /dev/null
+++ b/plugins/Comet/locale/it/LC_MESSAGES/Comet.po
@@ -0,0 +1,24 @@
+# Translation of StatusNet - Comet to Italian (italiano)
+# Exported from translatewiki.net
+#
+# Author: Ximo17
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Comet\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:05+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:49:53+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin description message. Bayeux is a protocol for transporting asynchronous messages
+#. TRANS: and Comet is a web application model.
+msgid "Plugin to make updates using Comet and Bayeux."
+msgstr "Plugin per effettuare aggiornamenti utilizzando Comet e Bayeux."
diff --git a/plugins/Comet/locale/mk/LC_MESSAGES/Comet.po b/plugins/Comet/locale/mk/LC_MESSAGES/Comet.po
index b48541ae4d..0e4629628e 100644
--- a/plugins/Comet/locale/mk/LC_MESSAGES/Comet.po
+++ b/plugins/Comet/locale/mk/LC_MESSAGES/Comet.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Comet to Macedonian (Македон�ки)
+# Translation of StatusNet - Comet to Macedonian (македон�ки)
 # Exported from translatewiki.net
 #
 # Author: Bjankuloski06
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Comet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:58+0000\n"
-"Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:05+0000\n"
+"Language-Team: Macedonian <https://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:26:36+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:49:53+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-comet\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
diff --git a/plugins/Comet/locale/nb/LC_MESSAGES/Comet.po b/plugins/Comet/locale/nb/LC_MESSAGES/Comet.po
index ddce34653c..7367ad09d6 100644
--- a/plugins/Comet/locale/nb/LC_MESSAGES/Comet.po
+++ b/plugins/Comet/locale/nb/LC_MESSAGES/Comet.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Comet to Norwegian (bokmål)‬ (‪Norsk (bokmål)‬)
+# Translation of StatusNet - Comet to Norwegian Bokmål (‪norsk (bokmål)‬)
 # Exported from translatewiki.net
 #
 # Author: Nghtwlkr
@@ -9,15 +9,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Comet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:58+0000\n"
-"Language-Team: Norwegian (bokmål)‬ <http://translatewiki.net/wiki/Portal:no>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:05+0000\n"
+"Language-Team: Norwegian Bokmål <https://translatewiki.net/wiki/Portal:nb>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:26:36+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
-"X-Language-Code: no\n"
+"X-POT-Import-Date: 2011-06-05 21:49:53+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: nb\n"
 "X-Message-Group: #out-statusnet-plugin-comet\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
diff --git a/plugins/Comet/locale/nl/LC_MESSAGES/Comet.po b/plugins/Comet/locale/nl/LC_MESSAGES/Comet.po
index 4ae1d86291..6d61cb2c84 100644
--- a/plugins/Comet/locale/nl/LC_MESSAGES/Comet.po
+++ b/plugins/Comet/locale/nl/LC_MESSAGES/Comet.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Comet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:58+0000\n"
-"Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:05+0000\n"
+"Language-Team: Dutch <https://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:26:36+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:49:53+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-comet\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/Comet/locale/ru/LC_MESSAGES/Comet.po b/plugins/Comet/locale/ru/LC_MESSAGES/Comet.po
index 79831d9e83..001766ea01 100644
--- a/plugins/Comet/locale/ru/LC_MESSAGES/Comet.po
+++ b/plugins/Comet/locale/ru/LC_MESSAGES/Comet.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Comet to Russian (Ру��кий)
+# Translation of StatusNet - Comet to Russian (ру��кий)
 # Exported from translatewiki.net
 #
 # Author: �лек�андр Сигачёв
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Comet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:58+0000\n"
-"Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:05+0000\n"
+"Language-Team: Russian <https://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:26:36+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:49:53+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-comet\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
diff --git a/plugins/Comet/locale/tl/LC_MESSAGES/Comet.po b/plugins/Comet/locale/tl/LC_MESSAGES/Comet.po
index c05441cecc..4b530c2c00 100644
--- a/plugins/Comet/locale/tl/LC_MESSAGES/Comet.po
+++ b/plugins/Comet/locale/tl/LC_MESSAGES/Comet.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Comet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:58+0000\n"
-"Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:06+0000\n"
+"Language-Team: Tagalog <https://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:26:36+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:49:53+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-comet\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/Comet/locale/uk/LC_MESSAGES/Comet.po b/plugins/Comet/locale/uk/LC_MESSAGES/Comet.po
index edbe069e11..6c978c33b3 100644
--- a/plugins/Comet/locale/uk/LC_MESSAGES/Comet.po
+++ b/plugins/Comet/locale/uk/LC_MESSAGES/Comet.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Comet to Ukrainian (Україн�ька)
+# Translation of StatusNet - Comet to Ukrainian (україн�ька)
 # Exported from translatewiki.net
 #
 # Author: Boogie
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Comet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:58+0000\n"
-"Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:06+0000\n"
+"Language-Team: Ukrainian <https://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:26:36+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:49:53+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-comet\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
diff --git a/plugins/DirectionDetector/DirectionDetectorPlugin.php b/plugins/DirectionDetector/DirectionDetectorPlugin.php
index be8dbea8e5..890af06807 100644
--- a/plugins/DirectionDetector/DirectionDetectorPlugin.php
+++ b/plugins/DirectionDetector/DirectionDetectorPlugin.php
@@ -42,15 +42,6 @@ class DirectionDetectorPlugin extends Plugin {
         return true;
     }
 
-    /**
-     * SN plugin API, here we will add css needed for modifiyed rendered
-     *
-     * @param Action $xml
-     */
-    public function onEndShowStatusNetStyles($xml){
-        $xml->element('style', array('type' => 'text/css'), 'span.rtl {display:block;direction:rtl;text-align:right;float:right;} .notice .author {float:left}');
-    }
-
     /**
      * is passed string a rtl content or not
      *
diff --git a/plugins/DirectionDetector/locale/DirectionDetector.pot b/plugins/DirectionDetector/locale/DirectionDetector.pot
index aa9589b701..68e2a17f38 100644
--- a/plugins/DirectionDetector/locale/DirectionDetector.pot
+++ b/plugins/DirectionDetector/locale/DirectionDetector.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
+"POT-Creation-Date: 2012-06-30 11:07+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,6 +17,6 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. TRANS: Plugin description.
-#: DirectionDetectorPlugin.php:265
+#: DirectionDetectorPlugin.php:256
 msgid "Shows notices with right-to-left content in correct direction."
 msgstr ""
diff --git a/plugins/DirectionDetector/locale/ast/LC_MESSAGES/DirectionDetector.po b/plugins/DirectionDetector/locale/ast/LC_MESSAGES/DirectionDetector.po
new file mode 100644
index 0000000000..3acb4efc02
--- /dev/null
+++ b/plugins/DirectionDetector/locale/ast/LC_MESSAGES/DirectionDetector.po
@@ -0,0 +1,28 @@
+# Translation of StatusNet - DirectionDetector to Asturian (asturianu)
+# Exported from translatewiki.net
+#
+# Author: Xuacu
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - DirectionDetector\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:06+0000\n"
+"Language-Team: Asturian <https://translatewiki.net/wiki/Portal:ast>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-09-11 15:10:27+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: ast\n"
+"X-Message-Group: #out-statusnet-plugin-directiondetector\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin description.
+msgid "Shows notices with right-to-left content in correct direction."
+msgstr ""
+"Amosar los mensaxes con conteníu de drecha-a-izquierda na direición "
+"afayadiza."
diff --git a/plugins/DirectionDetector/locale/be-tarask/LC_MESSAGES/DirectionDetector.po b/plugins/DirectionDetector/locale/be-tarask/LC_MESSAGES/DirectionDetector.po
index 0a57ab934c..d5338ebc09 100644
--- a/plugins/DirectionDetector/locale/be-tarask/LC_MESSAGES/DirectionDetector.po
+++ b/plugins/DirectionDetector/locale/be-tarask/LC_MESSAGES/DirectionDetector.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - DirectionDetector to Belarusian (Taraškievica orthography) (‪Белару�ка� (тарашкевіца)‬)
+# Translation of StatusNet - DirectionDetector to Belarusian (Taraškievica orthography) (‪белару�ка� (тарашкевіца)‬)
 # Exported from translatewiki.net
 #
 # Author: EugeneZelenko
@@ -9,15 +9,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - DirectionDetector\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:59+0000\n"
-"Language-Team: Belarusian (Taraškievica orthography) <http://translatewiki."
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:06+0000\n"
+"Language-Team: Belarusian (Taraškievica orthography) <https://translatewiki."
 "net/wiki/Portal:be-tarask>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-24 15:24:58+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-09-11 15:10:27+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: be-tarask\n"
 "X-Message-Group: #out-statusnet-plugin-directiondetector\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/DirectionDetector/locale/br/LC_MESSAGES/DirectionDetector.po b/plugins/DirectionDetector/locale/br/LC_MESSAGES/DirectionDetector.po
index a168b0dc6b..dfca0cee03 100644
--- a/plugins/DirectionDetector/locale/br/LC_MESSAGES/DirectionDetector.po
+++ b/plugins/DirectionDetector/locale/br/LC_MESSAGES/DirectionDetector.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - DirectionDetector to Breton (Brezhoneg)
+# Translation of StatusNet - DirectionDetector to Breton (brezhoneg)
 # Exported from translatewiki.net
 #
 # Author: Fulup
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - DirectionDetector\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:59+0000\n"
-"Language-Team: Breton <http://translatewiki.net/wiki/Portal:br>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:06+0000\n"
+"Language-Team: Breton <https://translatewiki.net/wiki/Portal:br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-24 15:24:58+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-09-11 15:10:27+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-directiondetector\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
diff --git a/plugins/DirectionDetector/locale/de/LC_MESSAGES/DirectionDetector.po b/plugins/DirectionDetector/locale/de/LC_MESSAGES/DirectionDetector.po
index ddeeb722a6..18339280b5 100644
--- a/plugins/DirectionDetector/locale/de/LC_MESSAGES/DirectionDetector.po
+++ b/plugins/DirectionDetector/locale/de/LC_MESSAGES/DirectionDetector.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - DirectionDetector\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:59+0000\n"
-"Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:06+0000\n"
+"Language-Team: German <https://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-24 15:24:58+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-09-11 15:10:27+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-directiondetector\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/DirectionDetector/locale/es/LC_MESSAGES/DirectionDetector.po b/plugins/DirectionDetector/locale/es/LC_MESSAGES/DirectionDetector.po
index 9f4a01b273..18951f3a78 100644
--- a/plugins/DirectionDetector/locale/es/LC_MESSAGES/DirectionDetector.po
+++ b/plugins/DirectionDetector/locale/es/LC_MESSAGES/DirectionDetector.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - DirectionDetector to Spanish (Español)
+# Translation of StatusNet - DirectionDetector to Spanish (español)
 # Exported from translatewiki.net
 #
 # Author: Translationista
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - DirectionDetector\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:59+0000\n"
-"Language-Team: Spanish <http://translatewiki.net/wiki/Portal:es>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:06+0000\n"
+"Language-Team: Spanish <https://translatewiki.net/wiki/Portal:es>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-24 15:24:58+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-09-11 15:10:27+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-plugin-directiondetector\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/DirectionDetector/locale/eu/LC_MESSAGES/DirectionDetector.po b/plugins/DirectionDetector/locale/eu/LC_MESSAGES/DirectionDetector.po
new file mode 100644
index 0000000000..52e619fff8
--- /dev/null
+++ b/plugins/DirectionDetector/locale/eu/LC_MESSAGES/DirectionDetector.po
@@ -0,0 +1,23 @@
+# Translation of StatusNet - DirectionDetector to Basque (euskara)
+# Exported from translatewiki.net
+#
+# Author: Artsuaga
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - DirectionDetector\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:06+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-09-11 15:10:27+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin description.
+msgid "Shows notices with right-to-left content in correct direction."
+msgstr "Oharrak eskubitik ezkerrera erakusten ditu norabide zuzenean."
diff --git a/plugins/DirectionDetector/locale/fi/LC_MESSAGES/DirectionDetector.po b/plugins/DirectionDetector/locale/fi/LC_MESSAGES/DirectionDetector.po
index 54d48df2b0..268a60caac 100644
--- a/plugins/DirectionDetector/locale/fi/LC_MESSAGES/DirectionDetector.po
+++ b/plugins/DirectionDetector/locale/fi/LC_MESSAGES/DirectionDetector.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - DirectionDetector to Finnish (Suomi)
+# Translation of StatusNet - DirectionDetector to Finnish (suomi)
 # Exported from translatewiki.net
 #
 # Author: Nike
@@ -10,14 +10,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - DirectionDetector\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:59+0000\n"
-"Language-Team: Finnish <http://translatewiki.net/wiki/Portal:fi>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:06+0000\n"
+"Language-Team: Finnish <https://translatewiki.net/wiki/Portal:fi>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-24 15:24:58+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-09-11 15:10:27+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: fi\n"
 "X-Message-Group: #out-statusnet-plugin-directiondetector\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/DirectionDetector/locale/fr/LC_MESSAGES/DirectionDetector.po b/plugins/DirectionDetector/locale/fr/LC_MESSAGES/DirectionDetector.po
index b3ba058b85..43aee32507 100644
--- a/plugins/DirectionDetector/locale/fr/LC_MESSAGES/DirectionDetector.po
+++ b/plugins/DirectionDetector/locale/fr/LC_MESSAGES/DirectionDetector.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - DirectionDetector to French (Français)
+# Translation of StatusNet - DirectionDetector to French (français)
 # Exported from translatewiki.net
 #
 # Author: Peter17
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - DirectionDetector\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:59+0000\n"
-"Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:06+0000\n"
+"Language-Team: French <https://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-24 15:24:58+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-09-11 15:10:27+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-directiondetector\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
diff --git a/plugins/DirectionDetector/locale/gl/LC_MESSAGES/DirectionDetector.po b/plugins/DirectionDetector/locale/gl/LC_MESSAGES/DirectionDetector.po
new file mode 100644
index 0000000000..a2b006b128
--- /dev/null
+++ b/plugins/DirectionDetector/locale/gl/LC_MESSAGES/DirectionDetector.po
@@ -0,0 +1,26 @@
+# Translation of StatusNet - DirectionDetector to Galician (galego)
+# Exported from translatewiki.net
+#
+# Author: Toliño
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - DirectionDetector\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:07+0000\n"
+"Language-Team: Galician <https://translatewiki.net/wiki/Portal:gl>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-09-11 15:10:27+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: gl\n"
+"X-Message-Group: #out-statusnet-plugin-directiondetector\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin description.
+msgid "Shows notices with right-to-left content in correct direction."
+msgstr "Mostra notas con contidos de dereita á esquerda na dirección correcta."
diff --git a/plugins/DirectionDetector/locale/he/LC_MESSAGES/DirectionDetector.po b/plugins/DirectionDetector/locale/he/LC_MESSAGES/DirectionDetector.po
index ffd0a46e76..3151d14ae3 100644
--- a/plugins/DirectionDetector/locale/he/LC_MESSAGES/DirectionDetector.po
+++ b/plugins/DirectionDetector/locale/he/LC_MESSAGES/DirectionDetector.po
@@ -1,6 +1,7 @@
 # Translation of StatusNet - DirectionDetector to Hebrew (עברית)
 # Exported from translatewiki.net
 #
+# Author: Amire80
 # Author: YaronSh
 # --
 # This file is distributed under the same license as the StatusNet package.
@@ -9,18 +10,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - DirectionDetector\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:59+0000\n"
-"Language-Team: Hebrew <http://translatewiki.net/wiki/Portal:he>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:07+0000\n"
+"Language-Team: Hebrew <https://translatewiki.net/wiki/Portal:he>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-24 15:24:58+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-09-11 15:10:27+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: he\n"
 "X-Message-Group: #out-statusnet-plugin-directiondetector\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANS: Plugin description.
 msgid "Shows notices with right-to-left content in correct direction."
-msgstr "הצגת הערות ע� תוכן מימין לשמ�ל בכיוון הנכון."
+msgstr "הצגת עדכוני� ע� תוכן מימין לשמ�ל בכיוון הנכון."
diff --git a/plugins/DirectionDetector/locale/ia/LC_MESSAGES/DirectionDetector.po b/plugins/DirectionDetector/locale/ia/LC_MESSAGES/DirectionDetector.po
index 317e303c11..5d7bf62410 100644
--- a/plugins/DirectionDetector/locale/ia/LC_MESSAGES/DirectionDetector.po
+++ b/plugins/DirectionDetector/locale/ia/LC_MESSAGES/DirectionDetector.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - DirectionDetector to Interlingua (Interlingua)
+# Translation of StatusNet - DirectionDetector to Interlingua (interlingua)
 # Exported from translatewiki.net
 #
 # Author: McDutchie
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - DirectionDetector\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:59+0000\n"
-"Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:07+0000\n"
+"Language-Team: Interlingua <https://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-24 15:24:58+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-09-11 15:10:27+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-directiondetector\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/DirectionDetector/locale/id/LC_MESSAGES/DirectionDetector.po b/plugins/DirectionDetector/locale/id/LC_MESSAGES/DirectionDetector.po
index 7e64980a24..c9ec7ec804 100644
--- a/plugins/DirectionDetector/locale/id/LC_MESSAGES/DirectionDetector.po
+++ b/plugins/DirectionDetector/locale/id/LC_MESSAGES/DirectionDetector.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - DirectionDetector\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:59+0000\n"
-"Language-Team: Indonesian <http://translatewiki.net/wiki/Portal:id>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:07+0000\n"
+"Language-Team: Indonesian <https://translatewiki.net/wiki/Portal:id>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-24 15:24:58+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-09-11 15:10:27+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: id\n"
 "X-Message-Group: #out-statusnet-plugin-directiondetector\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
diff --git a/plugins/DirectionDetector/locale/it/LC_MESSAGES/DirectionDetector.po b/plugins/DirectionDetector/locale/it/LC_MESSAGES/DirectionDetector.po
new file mode 100644
index 0000000000..b00a04ebfd
--- /dev/null
+++ b/plugins/DirectionDetector/locale/it/LC_MESSAGES/DirectionDetector.po
@@ -0,0 +1,24 @@
+# Translation of StatusNet - DirectionDetector to Italian (italiano)
+# Exported from translatewiki.net
+#
+# Author: Ximo17
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - DirectionDetector\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:07+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-09-11 15:10:27+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin description.
+msgid "Shows notices with right-to-left content in correct direction."
+msgstr ""
+"Mostra avvisi con contenuti da destra a sinistra nella direzione corretta."
diff --git a/plugins/DirectionDetector/locale/ja/LC_MESSAGES/DirectionDetector.po b/plugins/DirectionDetector/locale/ja/LC_MESSAGES/DirectionDetector.po
index bed837e78a..5c4af3559c 100644
--- a/plugins/DirectionDetector/locale/ja/LC_MESSAGES/DirectionDetector.po
+++ b/plugins/DirectionDetector/locale/ja/LC_MESSAGES/DirectionDetector.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - DirectionDetector\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:59+0000\n"
-"Language-Team: Japanese <http://translatewiki.net/wiki/Portal:ja>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:07+0000\n"
+"Language-Team: Japanese <https://translatewiki.net/wiki/Portal:ja>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-24 15:24:58+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-09-11 15:10:27+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ja\n"
 "X-Message-Group: #out-statusnet-plugin-directiondetector\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
diff --git a/plugins/DirectionDetector/locale/lb/LC_MESSAGES/DirectionDetector.po b/plugins/DirectionDetector/locale/lb/LC_MESSAGES/DirectionDetector.po
index 241487db2a..345ff4f6dd 100644
--- a/plugins/DirectionDetector/locale/lb/LC_MESSAGES/DirectionDetector.po
+++ b/plugins/DirectionDetector/locale/lb/LC_MESSAGES/DirectionDetector.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - DirectionDetector\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:59+0000\n"
-"Language-Team: Luxembourgish <http://translatewiki.net/wiki/Portal:lb>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:07+0000\n"
+"Language-Team: Luxembourgish <https://translatewiki.net/wiki/Portal:lb>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-24 15:24:58+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-09-11 15:10:27+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: lb\n"
 "X-Message-Group: #out-statusnet-plugin-directiondetector\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/DirectionDetector/locale/mk/LC_MESSAGES/DirectionDetector.po b/plugins/DirectionDetector/locale/mk/LC_MESSAGES/DirectionDetector.po
index f5ffad6c82..c6a878cfcd 100644
--- a/plugins/DirectionDetector/locale/mk/LC_MESSAGES/DirectionDetector.po
+++ b/plugins/DirectionDetector/locale/mk/LC_MESSAGES/DirectionDetector.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - DirectionDetector to Macedonian (Македон�ки)
+# Translation of StatusNet - DirectionDetector to Macedonian (македон�ки)
 # Exported from translatewiki.net
 #
 # Author: Bjankuloski06
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - DirectionDetector\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:48:59+0000\n"
-"Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:07+0000\n"
+"Language-Team: Macedonian <https://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-24 15:24:58+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-09-11 15:10:27+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-directiondetector\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
diff --git a/plugins/DirectionDetector/locale/nb/LC_MESSAGES/DirectionDetector.po b/plugins/DirectionDetector/locale/nb/LC_MESSAGES/DirectionDetector.po
index fd51ccef4a..9ba6b59b30 100644
--- a/plugins/DirectionDetector/locale/nb/LC_MESSAGES/DirectionDetector.po
+++ b/plugins/DirectionDetector/locale/nb/LC_MESSAGES/DirectionDetector.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - DirectionDetector to Norwegian (bokmål)‬ (‪Norsk (bokmål)‬)
+# Translation of StatusNet - DirectionDetector to Norwegian Bokmål (‪norsk (bokmål)‬)
 # Exported from translatewiki.net
 #
 # Author: Nghtwlkr
@@ -9,15 +9,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - DirectionDetector\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:00+0000\n"
-"Language-Team: Norwegian (bokmål)‬ <http://translatewiki.net/wiki/Portal:no>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:07+0000\n"
+"Language-Team: Norwegian Bokmål <https://translatewiki.net/wiki/Portal:nb>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-24 15:24:58+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
-"X-Language-Code: no\n"
+"X-POT-Import-Date: 2011-09-11 15:10:27+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: nb\n"
 "X-Message-Group: #out-statusnet-plugin-directiondetector\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
diff --git a/plugins/DirectionDetector/locale/nl/LC_MESSAGES/DirectionDetector.po b/plugins/DirectionDetector/locale/nl/LC_MESSAGES/DirectionDetector.po
index 9e5c902b54..83483587b0 100644
--- a/plugins/DirectionDetector/locale/nl/LC_MESSAGES/DirectionDetector.po
+++ b/plugins/DirectionDetector/locale/nl/LC_MESSAGES/DirectionDetector.po
@@ -9,17 +9,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - DirectionDetector\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:00+0000\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:07+0000\n"
 "Last-Translator: Siebrand Mazeland <s.mazeland@xs4all.nl>\n"
-"Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
+"Language-Team: Dutch <https://translatewiki.net/wiki/Portal:nl>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-03-24 15:24:58+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-09-11 15:10:27+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-directiondetector\n"
 
diff --git a/plugins/DirectionDetector/locale/pt/LC_MESSAGES/DirectionDetector.po b/plugins/DirectionDetector/locale/pt/LC_MESSAGES/DirectionDetector.po
index 9162cea42c..7febadd3b3 100644
--- a/plugins/DirectionDetector/locale/pt/LC_MESSAGES/DirectionDetector.po
+++ b/plugins/DirectionDetector/locale/pt/LC_MESSAGES/DirectionDetector.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - DirectionDetector to Portuguese (Português)
+# Translation of StatusNet - DirectionDetector to Portuguese (português)
 # Exported from translatewiki.net
 #
 # Author: GTNS
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - DirectionDetector\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:00+0000\n"
-"Language-Team: Portuguese <http://translatewiki.net/wiki/Portal:pt>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:07+0000\n"
+"Language-Team: Portuguese <https://translatewiki.net/wiki/Portal:pt>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-24 15:24:58+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-09-11 15:10:27+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: pt\n"
 "X-Message-Group: #out-statusnet-plugin-directiondetector\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/DirectionDetector/locale/ru/LC_MESSAGES/DirectionDetector.po b/plugins/DirectionDetector/locale/ru/LC_MESSAGES/DirectionDetector.po
index f7c0a5460e..1e755b7832 100644
--- a/plugins/DirectionDetector/locale/ru/LC_MESSAGES/DirectionDetector.po
+++ b/plugins/DirectionDetector/locale/ru/LC_MESSAGES/DirectionDetector.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - DirectionDetector to Russian (Ру��кий)
+# Translation of StatusNet - DirectionDetector to Russian (ру��кий)
 # Exported from translatewiki.net
 #
 # Author: �лек�андр Сигачёв
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - DirectionDetector\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:00+0000\n"
-"Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:08+0000\n"
+"Language-Team: Russian <https://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-24 15:24:58+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-09-11 15:10:27+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-directiondetector\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
diff --git a/plugins/DirectionDetector/locale/tl/LC_MESSAGES/DirectionDetector.po b/plugins/DirectionDetector/locale/tl/LC_MESSAGES/DirectionDetector.po
index 6dc86980ea..2c102471a4 100644
--- a/plugins/DirectionDetector/locale/tl/LC_MESSAGES/DirectionDetector.po
+++ b/plugins/DirectionDetector/locale/tl/LC_MESSAGES/DirectionDetector.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - DirectionDetector\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:00+0000\n"
-"Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:08+0000\n"
+"Language-Team: Tagalog <https://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-24 15:24:58+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-09-11 15:10:27+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-directiondetector\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/DirectionDetector/locale/uk/LC_MESSAGES/DirectionDetector.po b/plugins/DirectionDetector/locale/uk/LC_MESSAGES/DirectionDetector.po
index 55fe0cb0cb..cf8438acd6 100644
--- a/plugins/DirectionDetector/locale/uk/LC_MESSAGES/DirectionDetector.po
+++ b/plugins/DirectionDetector/locale/uk/LC_MESSAGES/DirectionDetector.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - DirectionDetector to Ukrainian (Україн�ька)
+# Translation of StatusNet - DirectionDetector to Ukrainian (україн�ька)
 # Exported from translatewiki.net
 #
 # Author: Boogie
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - DirectionDetector\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:00+0000\n"
-"Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:08+0000\n"
+"Language-Team: Ukrainian <https://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-24 15:24:58+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-09-11 15:10:27+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-directiondetector\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
diff --git a/plugins/DirectionDetector/locale/zh_CN/LC_MESSAGES/DirectionDetector.po b/plugins/DirectionDetector/locale/zh_CN/LC_MESSAGES/DirectionDetector.po
index 56cf65319a..64cc231cc3 100644
--- a/plugins/DirectionDetector/locale/zh_CN/LC_MESSAGES/DirectionDetector.po
+++ b/plugins/DirectionDetector/locale/zh_CN/LC_MESSAGES/DirectionDetector.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - DirectionDetector to Simplified Chinese (‪中文(简体)‬)
+# Translation of StatusNet - DirectionDetector to Simplified Chinese (‪中文（简体）‬)
 # Exported from translatewiki.net
 #
 # Author: Chenxiaoqino
@@ -9,15 +9,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - DirectionDetector\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:00+0000\n"
-"Language-Team: Simplified Chinese <http://translatewiki.net/wiki/Portal:zh-"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:08+0000\n"
+"Language-Team: Simplified Chinese <https://translatewiki.net/wiki/Portal:zh-"
 "hans>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-24 15:24:58+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-09-11 15:10:27+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: #out-statusnet-plugin-directiondetector\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
diff --git a/plugins/Directory/DirectoryPlugin.php b/plugins/Directory/DirectoryPlugin.php
index ad7fc82049..5979bb0e80 100644
--- a/plugins/Directory/DirectoryPlugin.php
+++ b/plugins/Directory/DirectoryPlugin.php
@@ -115,21 +115,25 @@ class DirectoryPlugin extends Plugin
     {
 
         $m->connect(
-            'directory/users',
+            'directory/users/:filter',
             array('action' => 'userdirectory'),
-            array('filter' => 'all')
+            array('filter' => '[0-9a-zA-Z]|(0-9)')
         );
 
         $m->connect(
-            'directory/users/:filter',
-            array('action' => 'userdirectory'),
-            array('filter' => '([0-9a-zA-Z_]{1,64}|0-9)')
+            'directory/users',
+            array('action' => 'userdirectory')
         );
 
         $m->connect(
             'groups/:filter',
             array('action' => 'groupdirectory'),
-            array('filter' => '([0-9a-zA-Z_]{1,64}|0-9)')
+            array('filter' => '[0-9a-zA-Z]|(0-9)')
+        );
+
+        $m->connect(
+            'groups',
+            array('action' => 'groupdirectory')
         );
 
         return true;
diff --git a/plugins/Directory/actions/groupdirectory.php b/plugins/Directory/actions/groupdirectory.php
index b9ffee94e5..5e532fc214 100644
--- a/plugins/Directory/actions/groupdirectory.php
+++ b/plugins/Directory/actions/groupdirectory.php
@@ -124,7 +124,7 @@ class GroupdirectoryAction extends Action
         // TRANS: Page instructions.
         return _m("After you join a group you can send messages to all other members\n".
                  "using the syntax \"!groupname\".\n\n".
-                 "Browse groups, or search for groups on by their name, location or topic.\n".
+                 "Browse groups, or search for groups by their name, location or topic.\n".
                  "Separate the terms by spaces; they must be three characters or more.") . "\n";
     }
 
diff --git a/plugins/Directory/actions/userdirectory.php b/plugins/Directory/actions/userdirectory.php
index b12d1171ea..749442caf5 100644
--- a/plugins/Directory/actions/userdirectory.php
+++ b/plugins/Directory/actions/userdirectory.php
@@ -87,21 +87,26 @@ class UserdirectoryAction extends Action
      */
     function title()
     {
-        // @fixme: This looks kinda gross
+        // @todo fixme: This looks kinda gross
 
         if ($this->filter == 'all') {
             if ($this->page != 1) {
+                // TRANS: Page title for user directory. %d is a page number.
                 return(sprintf(_m('User Directory, page %d'), $this->page));
             }
+            // TRANS: Page title for user directory.
             return _m('User directory');
         } else if ($this->page == 1) {
             return sprintf(
+                // TRANS: Page title for user directory. %s is the applied filter.
                 _m('User directory - %s'),
                 strtoupper($this->filter)
             );
         } else {
             return sprintf(
-                _m('User directory - %s, page %d'),
+                // TRANS: Page title for user directory.
+                // TRANS: %1$s is the applied filter, %2$d is a page number.
+                _m('User directory - %1$s, page %2$d'),
                 strtoupper($this->filter),
                 $this->page
             );
@@ -116,8 +121,7 @@ class UserdirectoryAction extends Action
     function getInstructions()
     {
         // TRANS: %%site.name%% is the name of the StatusNet site.
-        return _m(
-            'Search for people on %%site.name%% by their name, '
+        return _m('Search for people on %%site.name%% by their name, '
             . 'location, or interests. Separate the terms by spaces; '
             . ' they must be 3 characters or more.'
         );
@@ -256,12 +260,15 @@ class UserdirectoryAction extends Action
 
         $this->elementStart('fieldset');
 
+        // TRANS: Fieldset legend.
         $this->element('legend', null, _m('Search site'));
         $this->elementStart('ul', 'form_data');
         $this->elementStart('li');
 
+        // TRANS: Field label for user directory filter.
         $this->input('q', _m('Keyword(s)'), $this->q);
 
+        // TRANS: Button text.
         $this->submit('search', _m('BUTTON','Search'));
         $this->elementEnd('li');
         $this->elementEnd('ul');
@@ -367,23 +374,24 @@ class UserdirectoryAction extends Action
                 'p',
                 'error',
                 sprintf(
+                    // TRANS: Empty list message for user directory.
                     _m('No users starting with %s'),
                     $this->filter
                 )
             );
         } else {
+            // TRANS: Empty list message for user directory.
             $this->element('p', 'error', _m('No results.'));
-            $message = _m(<<<E_O_T
-* Make sure all words are spelled correctly.
+            // TRANS: Standard search suggestions shown when a search does not give any results.
+            $message = _m("* Make sure all words are spelled correctly.
 * Try different keywords.
 * Try more general keywords.
-* Try fewer keywords.
-E_O_T
-);
+* Try fewer keywords.");
+            $message .= "\n";
+
             $this->elementStart('div', 'help instructions');
             $this->raw(common_markup_to_html($message));
             $this->elementEnd('div');
         }
     }
-
 }
diff --git a/plugins/Directory/lib/sortablesubscriptionlist.php b/plugins/Directory/lib/sortablesubscriptionlist.php
index 234923c003..750a0f2491 100644
--- a/plugins/Directory/lib/sortablesubscriptionlist.php
+++ b/plugins/Directory/lib/sortablesubscriptionlist.php
@@ -130,17 +130,21 @@ class SortableSubscriptionList extends SubscriptionList
 
     function showProfiles()
     {
-        $cnt = 0;
+        // Note: we don't use fetchAll() because it's borked with query()
+
+        $profiles = array();
 
         while ($this->profile->fetch()) {
-            $cnt++;
-            if($cnt > PROFILES_PER_PAGE) {
-                break;
-            }
+            $profiles[] = clone($this->profile);
+        }
 
-            $odd = ($cnt % 2 == 0); // for zebra striping
+        $cnt = count($profiles);
 
-            $pli = $this->newListItem($this->profile, $odd);
+        $max = min($cnt, $this->maxProfiles());
+
+        for ($i = 0; $i < $max; $i++) {
+            $odd = ($i % 2 == 0); // for zebra striping
+            $pli = $this->newListItem($profiles[$i], $odd);
             $pli->show();
         }
 
diff --git a/plugins/Directory/locale/Directory.pot b/plugins/Directory/locale/Directory.pot
index 52d96d860a..ad977da2c0 100644
--- a/plugins/Directory/locale/Directory.pot
+++ b/plugins/Directory/locale/Directory.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,57 +16,78 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: actions/userdirectory.php:94
+#. TRANS: Page title for user directory. %d is a page number.
+#: actions/userdirectory.php:95
 #, php-format
 msgid "User Directory, page %d"
 msgstr ""
 
-#: actions/userdirectory.php:96
+#. TRANS: Page title for user directory.
+#: actions/userdirectory.php:98
 msgid "User directory"
 msgstr ""
 
-#: actions/userdirectory.php:99
+#. TRANS: Page title for user directory. %s is the applied filter.
+#: actions/userdirectory.php:102
 #, php-format
 msgid "User directory - %s"
 msgstr ""
 
-#: actions/userdirectory.php:104
+#. TRANS: Page title for user directory.
+#. TRANS: %1$s is the applied filter, %2$d is a page number.
+#: actions/userdirectory.php:109
 #, php-format
-msgid "User directory - %s, page %d"
+msgid "User directory - %1$s, page %2$d"
 msgstr ""
 
-#: actions/userdirectory.php:120
+#. TRANS: %%site.name%% is the name of the StatusNet site.
+#: actions/userdirectory.php:124
 #, 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/userdirectory.php:259
+#. TRANS: Fieldset legend.
+#: actions/userdirectory.php:264
 msgid "Search site"
 msgstr ""
 
+#. TRANS: Field label for user directory filter.
 #. TRANS: Field label for input of one or more keywords.
-#: actions/userdirectory.php:263 actions/groupdirectory.php:288
+#: actions/userdirectory.php:269 actions/groupdirectory.php:288
 msgid "Keyword(s)"
 msgstr ""
 
+#. TRANS: Button text.
 #. TRANS: Button text for searching group directory.
-#: actions/userdirectory.php:265 actions/groupdirectory.php:291
+#: actions/userdirectory.php:272 actions/groupdirectory.php:291
 msgctxt "BUTTON"
 msgid "Search"
 msgstr ""
 
-#: actions/userdirectory.php:370
+#. TRANS: Empty list message for user directory.
+#: actions/userdirectory.php:378
 #, php-format
 msgid "No users starting with %s"
 msgstr ""
 
+#. TRANS: Empty list message for user directory.
 #. TRANS: Empty list message for searching group directory.
-#: actions/userdirectory.php:375 actions/groupdirectory.php:414
+#: actions/userdirectory.php:384 actions/groupdirectory.php:414
 msgid "No results."
 msgstr ""
 
+#. TRANS: Standard search suggestions shown when a search does not give any results.
+#. TRANS: Help text for searching group directory.
+#: actions/userdirectory.php:386 actions/groupdirectory.php:416
+msgid ""
+"* Make sure all words are spelled correctly.\n"
+"* Try different keywords.\n"
+"* Try more general keywords.\n"
+"* Try fewer keywords."
+msgstr ""
+
 #. TRANS: Title for group directory page. %d is a page number.
 #: actions/groupdirectory.php:95
 #, php-format
@@ -98,7 +119,7 @@ msgid ""
 "After you join a group you can send messages to all other members\n"
 "using the syntax \"!groupname\".\n"
 "\n"
-"Browse groups, or search for groups on by their name, location or topic.\n"
+"Browse groups, or search for groups by their name, location or topic.\n"
 "Separate the terms by spaces; they must be three characters or more."
 msgstr ""
 
@@ -119,33 +140,24 @@ msgstr ""
 msgid "No groups starting with %s."
 msgstr ""
 
-#. TRANS: Help text for searching group directory.
-#: actions/groupdirectory.php:416
-msgid ""
-"* Make sure all words are spelled correctly.\n"
-"* Try different keywords.\n"
-"* Try more general keywords.\n"
-"* Try fewer keywords."
-msgstr ""
-
 #. TRANS: Menu item text for user directory.
-#: DirectoryPlugin.php:237
+#: DirectoryPlugin.php:241
 msgctxt "MENU"
 msgid "Directory"
 msgstr ""
 
 #. TRANS: Menu item title for user directory.
-#: DirectoryPlugin.php:239
+#: DirectoryPlugin.php:243
 msgid "User Directory."
 msgstr ""
 
 #. TRANS: Plugin description.
-#: DirectoryPlugin.php:258
+#: DirectoryPlugin.php:262
 msgid "Add a user directory."
 msgstr ""
 
 #. TRANS: Column header in table for user nickname.
-#: lib/sortablesubscriptionlist.php:66 lib/sortablegrouplist.php:65
+#: lib/sortablesubscriptionlist.php:65 lib/sortablegrouplist.php:65
 msgid "Nickname"
 msgstr ""
 
@@ -154,6 +166,16 @@ msgstr ""
 msgid "Created"
 msgstr ""
 
+#. TRANS: Column header for number of subscriptions.
+#: lib/sortablesubscriptionlist.php:114
+msgid "Subscriptions"
+msgstr ""
+
+#. TRANS: Column header for number of notices.
+#: lib/sortablesubscriptionlist.php:116
+msgid "Notices"
+msgstr ""
+
 #. TRANS: Column header in table for members of a group.
 #: lib/sortablegrouplist.php:113
 msgid "Members"
diff --git a/plugins/Directory/locale/ar/LC_MESSAGES/Directory.po b/plugins/Directory/locale/ar/LC_MESSAGES/Directory.po
index e6202e7ed7..7cc26904a2 100644
--- a/plugins/Directory/locale/ar/LC_MESSAGES/Directory.po
+++ b/plugins/Directory/locale/ar/LC_MESSAGES/Directory.po
@@ -1,6 +1,7 @@
 # Translation of StatusNet - Directory to Arabic (العربية)
 # Exported from translatewiki.net
 #
+# Author: DRIHEM
 # Author: Mutarjem horr
 # Author: OsamaK
 # --
@@ -10,35 +11,41 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Directory\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:02+0000\n"
-"Language-Team: Arabic <http://translatewiki.net/wiki/Portal:ar>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:08+0000\n"
+"Language-Team: Arabic <https://translatewiki.net/wiki/Portal:ar>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-05-05 11:55:22+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-08-30 09:57:06+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ar\n"
 "X-Message-Group: #out-statusnet-plugin-directory\n"
 "Plural-Forms: nplurals=6; plural=(n == 0) ? 0 : ( (n == 1) ? 1 : ( (n == "
 "2) ? 2 : ( (n%100 >= 3 && n%100 <= 10) ? 3 : ( (n%100 >= 11 && n%100 <= "
 "99) ? 4 : 5 ) ) ) );\n"
 
+#. TRANS: Page title for user directory. %d is a page number.
 #, php-format
 msgid "User Directory, page %d"
 msgstr "دليل المستخدمين، الص�حة %d"
 
+#. TRANS: Page title for user directory.
 msgid "User directory"
 msgstr "دليل المستخدمين"
 
+#. TRANS: Page title for user directory. %s is the applied filter.
 #, php-format
 msgid "User directory - %s"
 msgstr "دليل المستخدمين - %s"
 
+#. TRANS: Page title for user directory.
+#. TRANS: %1$s is the applied filter, %2$d is a page number.
 #, php-format
-msgid "User directory - %s, page %d"
-msgstr "دليل المستخدمين - %s، الص�حة %d"
+msgid "User directory - %1$s, page %2$d"
+msgstr "دليل المستخدمين - %1$s، الص�حة %2$d"
 
+#. TRANS: %%site.name%% is the name of the StatusNet site.
 #, php-format
 msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
@@ -47,26 +54,44 @@ msgstr ""
 "ابحث عن أشخاص على %%site.name%% بدلالة الاسم أو الموقع أو الاهتمامات. ا�صل "
 "عبارات البحث بمسا�ات؛ ويجب أن تتكون تلك العبارات من 3 أحر� أو أكثر."
 
+#. TRANS: Fieldset legend.
 msgid "Search site"
 msgstr "ابحث �ي الموقع"
 
+#. TRANS: Field label for user directory filter.
 #. TRANS: Field label for input of one or more keywords.
 msgid "Keyword(s)"
 msgstr "الكلمات الم�تاحية"
 
+#. TRANS: Button text.
 #. TRANS: Button text for searching group directory.
 msgctxt "BUTTON"
 msgid "Search"
 msgstr "ابحث"
 
+#. TRANS: Empty list message for user directory.
 #, php-format
 msgid "No users starting with %s"
 msgstr "لا يوجد مستخدمون يبدؤون ب%s"
 
+#. TRANS: Empty list message for user directory.
 #. TRANS: Empty list message for searching group directory.
 msgid "No results."
 msgstr "لا توجد نتائج."
 
+#. TRANS: Standard search suggestions shown when a search does not give any results.
+#. TRANS: Help text for searching group directory.
+msgid ""
+"* Make sure all words are spelled correctly.\n"
+"* Try different keywords.\n"
+"* Try more general keywords.\n"
+"* Try fewer keywords."
+msgstr ""
+"* تأكد من أن كل الكلمات صحيحة التهجئة.\n"
+"* حاول بكلمات أخرى.\n"
+"* حاول بكلمات أكثر عمومًا.\n"
+"* حاول بكلمات أقل."
+
 #. TRANS: Title for group directory page. %d is a page number.
 #, php-format
 msgid "Group Directory, page %d"
@@ -93,9 +118,14 @@ msgid ""
 "After you join a group you can send messages to all other members\n"
 "using the syntax \"!groupname\".\n"
 "\n"
-"Browse groups, or search for groups on by their name, location or topic.\n"
+"Browse groups, or search for groups by their name, location or topic.\n"
 "Separate the terms by spaces; they must be three characters or more."
 msgstr ""
+"بعد إنضمامك إلى مجموعة يمكنك أن ترسل الرسائل إلى جميع الأعضاء بأستخدام الأمر "
+"\"!groupname\".\n"
+"\n"
+"تص�ح المجموعات أو إبحث عن المجموعات عن طريق إسمها، مكانها أو الموضوع.\n"
+"قم ب�صل العبارات بمسا�ات، يجب أن تتكون من ثلاثة أحر� أو أكثر."
 
 #. TRANS: Link to create a new group on the group list page.
 msgid "Create a new group"
@@ -111,18 +141,6 @@ msgstr "ابحث �ي المجموعات"
 msgid "No groups starting with %s."
 msgstr "لا توجد مجموعات تبدء بــ %s."
 
-#. TRANS: Help text for searching group directory.
-msgid ""
-"* Make sure all words are spelled correctly.\n"
-"* Try different keywords.\n"
-"* Try more general keywords.\n"
-"* Try fewer keywords."
-msgstr ""
-"* تأكد من أن كل الكلمات صحيحة التهجئة.\n"
-"*حاول بكلمات متعددة.\n"
-"* حاول بكلمات أكثر عموماّ.\n"
-"* حاول بكلمات أقل."
-
 #. TRANS: Menu item text for user directory.
 msgctxt "MENU"
 msgid "Directory"
@@ -142,7 +160,15 @@ msgstr "الاسم المستعار"
 
 #. TRANS: Column header in table for timestamp when user was created.
 msgid "Created"
-msgstr "تم إنشاءه"
+msgstr "أنشئ �ي"
+
+#. TRANS: Column header for number of subscriptions.
+msgid "Subscriptions"
+msgstr "الاشتراكات"
+
+#. TRANS: Column header for number of notices.
+msgid "Notices"
+msgstr "الإشعارات"
 
 #. TRANS: Column header in table for members of a group.
 msgid "Members"
diff --git a/plugins/Directory/locale/ca/LC_MESSAGES/Directory.po b/plugins/Directory/locale/ca/LC_MESSAGES/Directory.po
index bbf19c7508..90334e14db 100644
--- a/plugins/Directory/locale/ca/LC_MESSAGES/Directory.po
+++ b/plugins/Directory/locale/ca/LC_MESSAGES/Directory.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Directory to Catalan (Català)
+# Translation of StatusNet - Directory to Catalan (català)
 # Exported from translatewiki.net
 #
 # Author: Solde
@@ -10,33 +10,39 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Directory\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:02+0000\n"
-"Language-Team: Catalan <http://translatewiki.net/wiki/Portal:ca>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:08+0000\n"
+"Language-Team: Catalan <https://translatewiki.net/wiki/Portal:ca>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-05-05 11:55:22+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-08-30 09:57:06+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ca\n"
 "X-Message-Group: #out-statusnet-plugin-directory\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Page title for user directory. %d is a page number.
 #, php-format
 msgid "User Directory, page %d"
 msgstr "Directori d'usuaris, pàgina %d"
 
+#. TRANS: Page title for user directory.
 msgid "User directory"
 msgstr "Directori d'usuari"
 
+#. TRANS: Page title for user directory. %s is the applied filter.
 #, php-format
 msgid "User directory - %s"
 msgstr "Directori d'usuari — %s"
 
+#. TRANS: Page title for user directory.
+#. TRANS: %1$s is the applied filter, %2$d is a page number.
 #, php-format
-msgid "User directory - %s, page %d"
-msgstr "Directori d'usuari — %s, pàgina %d"
+msgid "User directory - %1$s, page %2$d"
+msgstr "Directori d'usuari — %1$s, pàgina %2$d"
 
+#. TRANS: %%site.name%% is the name of the StatusNet site.
 #, php-format
 msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
@@ -45,26 +51,44 @@ msgstr ""
 "Cerca gent a %%site.name%% per nom, ubicació o interessos. Separa els termes "
 "amb espais: han de ser de 3 o més caràcters."
 
+#. TRANS: Fieldset legend.
 msgid "Search site"
 msgstr "Cerca al lloc"
 
+#. TRANS: Field label for user directory filter.
 #. TRANS: Field label for input of one or more keywords.
 msgid "Keyword(s)"
 msgstr "Paraules clau"
 
+#. TRANS: Button text.
 #. TRANS: Button text for searching group directory.
 msgctxt "BUTTON"
 msgid "Search"
 msgstr "Cerca"
 
+#. TRANS: Empty list message for user directory.
 #, php-format
 msgid "No users starting with %s"
 msgstr "No hi ha cap usuari que comenci amb %s"
 
+#. TRANS: Empty list message for user directory.
 #. TRANS: Empty list message for searching group directory.
 msgid "No results."
 msgstr "No hi ha cap resultat."
 
+#. TRANS: Standard search suggestions shown when a search does not give any results.
+#. TRANS: Help text for searching group directory.
+msgid ""
+"* Make sure all words are spelled correctly.\n"
+"* Try different keywords.\n"
+"* Try more general keywords.\n"
+"* Try fewer keywords."
+msgstr ""
+"* Assegureu-vos que tots les paraules estan escrites correctament.\n"
+"* Proveu diferents paraules clau.\n"
+"* Proveu paraules clau més generals.\n"
+"* Proveu menys paraules claus."
+
 #. TRANS: Title for group directory page. %d is a page number.
 #, php-format
 msgid "Group Directory, page %d"
@@ -91,9 +115,14 @@ msgid ""
 "After you join a group you can send messages to all other members\n"
 "using the syntax \"!groupname\".\n"
 "\n"
-"Browse groups, or search for groups on by their name, location or topic.\n"
+"Browse groups, or search for groups by their name, location or topic.\n"
 "Separate the terms by spaces; they must be three characters or more."
 msgstr ""
+"Després d'unir-vos a un grup podeu enviar missatges als altres membres\n"
+"fent servir la sintaxi \"!nomdelgrup\".\n"
+"\n"
+"Navegueu pels grups, o cerqueu grups pel nom, ubicació o temàtica.\n"
+"Separeu els termes per espai; han de contenir 3 o més caràcters."
 
 #. TRANS: Link to create a new group on the group list page.
 msgid "Create a new group"
@@ -109,14 +138,6 @@ msgstr "Cerca als grups"
 msgid "No groups starting with %s."
 msgstr "No hi ha cap grup que comenci amb %s."
 
-#. TRANS: Help text for searching group directory.
-msgid ""
-"* Make sure all words are spelled correctly.\n"
-"* Try different keywords.\n"
-"* Try more general keywords.\n"
-"* Try fewer keywords."
-msgstr ""
-
 #. TRANS: Menu item text for user directory.
 msgctxt "MENU"
 msgid "Directory"
@@ -138,6 +159,14 @@ msgstr "Sobrenom"
 msgid "Created"
 msgstr "S'ha creat"
 
+#. TRANS: Column header for number of subscriptions.
+msgid "Subscriptions"
+msgstr "Subscripcions"
+
+#. TRANS: Column header for number of notices.
+msgid "Notices"
+msgstr "Avisos"
+
 #. TRANS: Column header in table for members of a group.
 msgid "Members"
 msgstr "Membres"
diff --git a/plugins/Directory/locale/de/LC_MESSAGES/Directory.po b/plugins/Directory/locale/de/LC_MESSAGES/Directory.po
index 2cf70fd757..013f10ecb1 100644
--- a/plugins/Directory/locale/de/LC_MESSAGES/Directory.po
+++ b/plugins/Directory/locale/de/LC_MESSAGES/Directory.po
@@ -2,6 +2,9 @@
 # Exported from translatewiki.net
 #
 # Author: Giftpflanze
+# Author: Inkowik
+# Author: Marcel083
+# Author: Tiin
 # --
 # This file is distributed under the same license as the StatusNet package.
 #
@@ -9,33 +12,39 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Directory\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:02+0000\n"
-"Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:08+0000\n"
+"Language-Team: German <https://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-05-05 11:55:22+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-08-30 09:57:06+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-directory\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Page title for user directory. %d is a page number.
 #, php-format
 msgid "User Directory, page %d"
 msgstr "Benutzerverzeichnis, Seite %d"
 
+#. TRANS: Page title for user directory.
 msgid "User directory"
 msgstr "Benutzerverzeichnis"
 
+#. TRANS: Page title for user directory. %s is the applied filter.
 #, php-format
 msgid "User directory - %s"
 msgstr "Benutzerverzeichnis – %s"
 
+#. TRANS: Page title for user directory.
+#. TRANS: %1$s is the applied filter, %2$d is a page number.
 #, php-format
-msgid "User directory - %s, page %d"
-msgstr "Benutzerverzeichnis – %s, Seite %d"
+msgid "User directory - %1$s, page %2$d"
+msgstr "Benutzerverzeichnis – %1$s, Seite %2$d"
 
+#. TRANS: %%site.name%% is the name of the StatusNet site.
 #, php-format
 msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
@@ -45,26 +54,44 @@ msgstr ""
 "Interessen. Trenne die Begriffe mit Leerzeichen; sie müssen mindestens 3 "
 "Zeichen lang sein."
 
+#. TRANS: Fieldset legend.
 msgid "Search site"
 msgstr "Website durchsuchen"
 
+#. TRANS: Field label for user directory filter.
 #. TRANS: Field label for input of one or more keywords.
 msgid "Keyword(s)"
 msgstr "Schlüsselwort(e)"
 
+#. TRANS: Button text.
 #. TRANS: Button text for searching group directory.
 msgctxt "BUTTON"
 msgid "Search"
 msgstr "Suchen"
 
+#. TRANS: Empty list message for user directory.
 #, php-format
 msgid "No users starting with %s"
 msgstr "Keine Benutzer, die mit %s beginnen"
 
+#. TRANS: Empty list message for user directory.
 #. TRANS: Empty list message for searching group directory.
 msgid "No results."
 msgstr "Keine Ergebnisse."
 
+#. TRANS: Standard search suggestions shown when a search does not give any results.
+#. TRANS: Help text for searching group directory.
+msgid ""
+"* Make sure all words are spelled correctly.\n"
+"* Try different keywords.\n"
+"* Try more general keywords.\n"
+"* Try fewer keywords."
+msgstr ""
+"* Stelle sicher, dass alle Wörter richtig geschrieben sind.\n"
+"* Versuche, andere Schlüsselwörter zu verwenden.\n"
+"* Versuche, allgemeinere Schlüsselwörter zu verwenden.\n"
+"* Versuche, weniger Schlüsselwörter zu verwenden."
+
 #. TRANS: Title for group directory page. %d is a page number.
 #, php-format
 msgid "Group Directory, page %d"
@@ -87,21 +114,20 @@ msgid "Group directory - %1$s, page %2$d"
 msgstr "Gruppenverzeichnis – %1$s, Seite %2$d"
 
 #. TRANS: Page instructions.
-#, fuzzy
 msgid ""
 "After you join a group you can send messages to all other members\n"
 "using the syntax \"!groupname\".\n"
 "\n"
-"Browse groups, or search for groups on by their name, location or topic.\n"
+"Browse groups, or search for groups by their name, location or topic.\n"
 "Separate the terms by spaces; they must be three characters or more."
 msgstr ""
-"Nachdem du einer Gruppe beigetreten bist, kannst du mit der Syntax „!"
+"Nachdem Du einer Gruppe beigetreten bist, kannst du mit der Syntax „!"
 "Gruppenname“ Nachrichten an alle anderen Mitglieder schicken.\n"
 "\n"
 "Durchstöbere Gruppen oder suche nach Gruppen über ihren Namen, Standort oder "
 "ihr Thema.\n"
 "Trenne die Suchbegriffe mit Leerzeichen, sie müssen mindestens 3 Zeichen "
-"lang sein.\n"
+"lang sein."
 
 #. TRANS: Link to create a new group on the group list page.
 msgid "Create a new group"
@@ -117,18 +143,6 @@ msgstr "Nach Gruppen suchen"
 msgid "No groups starting with %s."
 msgstr "Keine Gruppen, deren Name mit %s beginnt."
 
-#. TRANS: Help text for searching group directory.
-msgid ""
-"* Make sure all words are spelled correctly.\n"
-"* Try different keywords.\n"
-"* Try more general keywords.\n"
-"* Try fewer keywords."
-msgstr ""
-"* Stelle sicher, dass alle Wörter richtig geschrieben sind.\n"
-"* Versuche, andere Schlüsselwörter zu verwenden.\n"
-"* Versuche, allgemeinere Schlüsselwörter zu verwenden.\n"
-"* Versuche, weniger Schlüsselwörter zu verwenden."
-
 #. TRANS: Menu item text for user directory.
 msgctxt "MENU"
 msgid "Directory"
@@ -150,6 +164,14 @@ msgstr "Benutzername"
 msgid "Created"
 msgstr "Erstellt"
 
+#. TRANS: Column header for number of subscriptions.
+msgid "Subscriptions"
+msgstr "Abonnements"
+
+#. TRANS: Column header for number of notices.
+msgid "Notices"
+msgstr "Hinweise"
+
 #. TRANS: Column header in table for members of a group.
 msgid "Members"
 msgstr "Mitglieder"
diff --git a/plugins/Directory/locale/es/LC_MESSAGES/Directory.po b/plugins/Directory/locale/es/LC_MESSAGES/Directory.po
new file mode 100644
index 0000000000..3bc2fbc7d9
--- /dev/null
+++ b/plugins/Directory/locale/es/LC_MESSAGES/Directory.po
@@ -0,0 +1,172 @@
+# Translation of StatusNet - Directory to Spanish (español)
+# Exported from translatewiki.net
+#
+# Author: Erchache2000
+# Author: Od1n
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Directory\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:08+0000\n"
+"Language-Team: Spanish <https://translatewiki.net/wiki/Portal:es>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-08-30 09:57:06+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: es\n"
+"X-Message-Group: #out-statusnet-plugin-directory\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Page title for user directory. %d is a page number.
+#, php-format
+msgid "User Directory, page %d"
+msgstr "Directorio de usuarios, página %d"
+
+#. TRANS: Page title for user directory.
+msgid "User directory"
+msgstr "Directorio de usuarios"
+
+#. TRANS: Page title for user directory. %s is the applied filter.
+#, php-format
+msgid "User directory - %s"
+msgstr "Directorio de usuario - %s"
+
+#. TRANS: Page title for user directory.
+#. TRANS: %1$s is the applied filter, %2$d is a page number.
+#, php-format
+msgid "User directory - %1$s, page %2$d"
+msgstr "Directorio de usuario -  %1$s , página %2$d"
+
+#. TRANS: %%site.name%% is the name of the StatusNet site.
+#, 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 ""
+"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."
+
+#. TRANS: Fieldset legend.
+msgid "Search site"
+msgstr "Buscar en el sitio"
+
+#. TRANS: Field label for user directory filter.
+#. TRANS: Field label for input of one or more keywords.
+msgid "Keyword(s)"
+msgstr "Palabra(s) clave"
+
+#. TRANS: Button text.
+#. TRANS: Button text for searching group directory.
+msgctxt "BUTTON"
+msgid "Search"
+msgstr "Búsqueda"
+
+#. TRANS: Empty list message for user directory.
+#, php-format
+msgid "No users starting with %s"
+msgstr "Ningún usuario que comience con %s"
+
+#. TRANS: Empty list message for user directory.
+#. TRANS: Empty list message for searching group directory.
+msgid "No results."
+msgstr "No hay resultados."
+
+#. TRANS: Standard search suggestions shown when a search does not give any results.
+#. TRANS: Help text for searching group directory.
+msgid ""
+"* Make sure all words are spelled correctly.\n"
+"* Try different keywords.\n"
+"* Try more general keywords.\n"
+"* Try fewer keywords."
+msgstr ""
+"* Asegúrese de que todas las palabras estén escritas correctamente.\n"
+"* Pruebe con palabras clave diferentes.\n"
+"* Pruebe con palabras clave más generales.\n"
+"* Pruebe con menos palabras clave."
+
+#. TRANS: Title for group directory page. %d is a page number.
+#, php-format
+msgid "Group Directory, page %d"
+msgstr "Directorio de grupo, página %d"
+
+#. TRANS: Title for group directory page.
+msgid "Group directory"
+msgstr "Directorio de grupo"
+
+#. TRANS: Title for group directory page when it is filtered.
+#. TRANS: %s is the filter string.
+#, php-format
+msgid "Group directory - %s"
+msgstr "Directorio de grupo - %s"
+
+#. TRANS: Title for group directory page when it is filtered.
+#. TRANS: %1$s is the filter string, %2$d is a page number.
+#, php-format
+msgid "Group directory - %1$s, page %2$d"
+msgstr "Directorio de grupo -  %1$s , página %2$d"
+
+#. TRANS: Page instructions.
+msgid ""
+"After you join a group you can send messages to all other members\n"
+"using the syntax \"!groupname\".\n"
+"\n"
+"Browse groups, or search for groups by their name, location or topic.\n"
+"Separate the terms by spaces; they must be three characters or more."
+msgstr ""
+"Después de unirte a un grupo puedes enviar mensajes a todos los otros "
+"miembros usando la síntaxis \"!nombregrupo\".\n"
+"\n"
+"Navega por los grupos, o busca grupos por su nombre, localización o tipo. "
+"Separa los términos con espacios, debe tener al menos 3 caracteres."
+
+#. TRANS: Link to create a new group on the group list page.
+msgid "Create a new group"
+msgstr "Crear un grupo nuevo"
+
+#. TRANS: Fieldset legend.
+msgid "Search groups"
+msgstr "Buscar grupos"
+
+#. TRANS: Empty list message for searching group directory.
+#. TRANS: %s is the search string.
+#, php-format
+msgid "No groups starting with %s."
+msgstr "No hay grupos empezando por  %s ."
+
+#. TRANS: Menu item text for user directory.
+msgctxt "MENU"
+msgid "Directory"
+msgstr "Directorio"
+
+#. TRANS: Menu item title for user directory.
+msgid "User Directory."
+msgstr "Directorio de usuarios"
+
+#. TRANS: Plugin description.
+msgid "Add a user directory."
+msgstr "Agregar un directorio de usuario."
+
+#. TRANS: Column header in table for user nickname.
+msgid "Nickname"
+msgstr "Nombres de usuario"
+
+#. TRANS: Column header in table for timestamp when user was created.
+msgid "Created"
+msgstr "Creado"
+
+#. TRANS: Column header for number of subscriptions.
+msgid "Subscriptions"
+msgstr "Suscripciones"
+
+#. TRANS: Column header for number of notices.
+msgid "Notices"
+msgstr "Mensajes"
+
+#. TRANS: Column header in table for members of a group.
+msgid "Members"
+msgstr "Miembros"
diff --git a/plugins/Directory/locale/eu/LC_MESSAGES/Directory.po b/plugins/Directory/locale/eu/LC_MESSAGES/Directory.po
new file mode 100644
index 0000000000..aeb6a14f1f
--- /dev/null
+++ b/plugins/Directory/locale/eu/LC_MESSAGES/Directory.po
@@ -0,0 +1,172 @@
+# Translation of StatusNet - Directory to Basque (euskara)
+# Exported from translatewiki.net
+#
+# Author: Artsuaga
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Directory\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:09+0000\n"
+"Language-Team: Basque <https://translatewiki.net/wiki/Portal:eu>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-08-30 09:57:06+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: eu\n"
+"X-Message-Group: #out-statusnet-plugin-directory\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Page title for user directory. %d is a page number.
+#, php-format
+msgid "User Directory, page %d"
+msgstr "Erabiltzaile Direktorioa, %d. orria"
+
+#. TRANS: Page title for user directory.
+msgid "User directory"
+msgstr "Erabiltzaile direktorioa"
+
+#. TRANS: Page title for user directory. %s is the applied filter.
+#, php-format
+msgid "User directory - %s"
+msgstr "Erabiltzaile direktorioa - %s"
+
+#. TRANS: Page title for user directory.
+#. TRANS: %1$s is the applied filter, %2$d is a page number.
+#, php-format
+msgid "User directory - %1$s, page %2$d"
+msgstr "Erabiltzaile direktorioa - %1$s, %2$d. orria"
+
+#. TRANS: %%site.name%% is the name of the StatusNet site.
+#, 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 ""
+"Bilatu jendea %%site.name%%n bere izenez, kokapenaz edo interesez. Banandu "
+"espazioekin terminoak, 3 karaktere edo gehiago izan behar dituzte."
+
+#. TRANS: Fieldset legend.
+msgid "Search site"
+msgstr "Leku bilaketa"
+
+#. TRANS: Field label for user directory filter.
+#. TRANS: Field label for input of one or more keywords.
+msgid "Keyword(s)"
+msgstr "Gakoa(k)"
+
+#. TRANS: Button text.
+#. TRANS: Button text for searching group directory.
+msgctxt "BUTTON"
+msgid "Search"
+msgstr "Bilatu"
+
+#. TRANS: Empty list message for user directory.
+#, php-format
+msgid "No users starting with %s"
+msgstr "Ez dago %s(r)ekin hasten den erabiltzailerik"
+
+#. TRANS: Empty list message for user directory.
+#. TRANS: Empty list message for searching group directory.
+msgid "No results."
+msgstr "Emaitzarik ez."
+
+#. TRANS: Standard search suggestions shown when a search does not give any results.
+#. TRANS: Help text for searching group directory.
+msgid ""
+"* Make sure all words are spelled correctly.\n"
+"* Try different keywords.\n"
+"* Try more general keywords.\n"
+"* Try fewer keywords."
+msgstr ""
+"* Ziurtatu hitz guztiak ondo idatziak daudela.\n"
+"* Saiatu gako ezberdinekin.\n"
+"* Saiatu gako orokorragoekin.\n"
+"* Saiatu gako gutxiagorekin."
+
+#. TRANS: Title for group directory page. %d is a page number.
+#, php-format
+msgid "Group Directory, page %d"
+msgstr "Talde Direktorioa, %d. orria"
+
+#. TRANS: Title for group directory page.
+msgid "Group directory"
+msgstr "Talde direktorioa"
+
+#. TRANS: Title for group directory page when it is filtered.
+#. TRANS: %s is the filter string.
+#, php-format
+msgid "Group directory - %s"
+msgstr "Talde direktorioa - %s"
+
+#. TRANS: Title for group directory page when it is filtered.
+#. TRANS: %1$s is the filter string, %2$d is a page number.
+#, php-format
+msgid "Group directory - %1$s, page %2$d"
+msgstr "Talde direktorioa - %1$s,  %2$d. orria"
+
+#. TRANS: Page instructions.
+msgid ""
+"After you join a group you can send messages to all other members\n"
+"using the syntax \"!groupname\".\n"
+"\n"
+"Browse groups, or search for groups by their name, location or topic.\n"
+"Separate the terms by spaces; they must be three characters or more."
+msgstr ""
+"Behin talde batera batzen zarenean, bertako taldekide guztiei mezue bidal "
+"diezaiekezu \"!taldeizena\" sintaxia erabiliz.\n"
+"\n"
+"Arakatu taldeak, edo bilatu bere izen, kokapen edo gaiaren bidez.\n"
+"Banandu espazioekin terminoak, terminoek 3 karaktere edo gehiago izan behar "
+"dituzte."
+
+#. TRANS: Link to create a new group on the group list page.
+msgid "Create a new group"
+msgstr "Sortu talde berri bat"
+
+#. TRANS: Fieldset legend.
+msgid "Search groups"
+msgstr "Taldeak bilatu"
+
+#. TRANS: Empty list message for searching group directory.
+#. TRANS: %s is the search string.
+#, php-format
+msgid "No groups starting with %s."
+msgstr "Ez dago %s(r)ekin hasten den talderik."
+
+#. TRANS: Menu item text for user directory.
+msgctxt "MENU"
+msgid "Directory"
+msgstr "Direktorioa"
+
+#. TRANS: Menu item title for user directory.
+msgid "User Directory."
+msgstr "Erabiltzaile Direktorioa."
+
+#. TRANS: Plugin description.
+msgid "Add a user directory."
+msgstr "Gehitu erabiltzaile direktorio bat."
+
+#. TRANS: Column header in table for user nickname.
+msgid "Nickname"
+msgstr "Goitizena"
+
+#. TRANS: Column header in table for timestamp when user was created.
+msgid "Created"
+msgstr "Sortua"
+
+#. TRANS: Column header for number of subscriptions.
+msgid "Subscriptions"
+msgstr "Harpidetzak"
+
+#. TRANS: Column header for number of notices.
+msgid "Notices"
+msgstr "Oharrak"
+
+#. TRANS: Column header in table for members of a group.
+msgid "Members"
+msgstr "Kideak"
diff --git a/plugins/Directory/locale/fi/LC_MESSAGES/Directory.po b/plugins/Directory/locale/fi/LC_MESSAGES/Directory.po
new file mode 100644
index 0000000000..119c7b28ac
--- /dev/null
+++ b/plugins/Directory/locale/fi/LC_MESSAGES/Directory.po
@@ -0,0 +1,160 @@
+# Translation of StatusNet - Directory to Finnish (suomi)
+# Exported from translatewiki.net
+#
+# Author: Silvonen
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Directory\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:09+0000\n"
+"Language-Team: Finnish <https://translatewiki.net/wiki/Portal:fi>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-08-30 09:57:06+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: fi\n"
+"X-Message-Group: #out-statusnet-plugin-directory\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Page title for user directory. %d is a page number.
+#, php-format
+msgid "User Directory, page %d"
+msgstr "Käyttäjähakemisto, sivu %d"
+
+#. TRANS: Page title for user directory.
+msgid "User directory"
+msgstr "Käyttäjähakemisto"
+
+#. TRANS: Page title for user directory. %s is the applied filter.
+#, php-format
+msgid "User directory - %s"
+msgstr "Käyttäjähakemisto - %s"
+
+#. TRANS: Page title for user directory.
+#. TRANS: %1$s is the applied filter, %2$d is a page number.
+#, fuzzy, php-format
+msgid "User directory - %1$s, page %2$d"
+msgstr "Käyttäjähakemisto - %s, sivu %d"
+
+#. TRANS: %%site.name%% is the name of the StatusNet site.
+#, 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 ""
+
+#. TRANS: Fieldset legend.
+msgid "Search site"
+msgstr ""
+
+#. TRANS: Field label for user directory filter.
+#. TRANS: Field label for input of one or more keywords.
+msgid "Keyword(s)"
+msgstr ""
+
+#. TRANS: Button text.
+#. TRANS: Button text for searching group directory.
+msgctxt "BUTTON"
+msgid "Search"
+msgstr ""
+
+#. TRANS: Empty list message for user directory.
+#, php-format
+msgid "No users starting with %s"
+msgstr ""
+
+#. TRANS: Empty list message for user directory.
+#. TRANS: Empty list message for searching group directory.
+msgid "No results."
+msgstr ""
+
+#. TRANS: Standard search suggestions shown when a search does not give any results.
+#. TRANS: Help text for searching group directory.
+msgid ""
+"* Make sure all words are spelled correctly.\n"
+"* Try different keywords.\n"
+"* Try more general keywords.\n"
+"* Try fewer keywords."
+msgstr ""
+
+#. TRANS: Title for group directory page. %d is a page number.
+#, php-format
+msgid "Group Directory, page %d"
+msgstr "Ryhmähakemisto, sivu %d"
+
+#. TRANS: Title for group directory page.
+msgid "Group directory"
+msgstr "Ryhmähakemisto"
+
+#. TRANS: Title for group directory page when it is filtered.
+#. TRANS: %s is the filter string.
+#, php-format
+msgid "Group directory - %s"
+msgstr "Ryhmähakemisto - %s"
+
+#. TRANS: Title for group directory page when it is filtered.
+#. TRANS: %1$s is the filter string, %2$d is a page number.
+#, php-format
+msgid "Group directory - %1$s, page %2$d"
+msgstr "Ryhmähakemisto - %1$s, sivu %2$d"
+
+#. TRANS: Page instructions.
+msgid ""
+"After you join a group you can send messages to all other members\n"
+"using the syntax \"!groupname\".\n"
+"\n"
+"Browse groups, or search for groups by their name, location or topic.\n"
+"Separate the terms by spaces; they must be three characters or more."
+msgstr ""
+
+#. TRANS: Link to create a new group on the group list page.
+msgid "Create a new group"
+msgstr ""
+
+#. TRANS: Fieldset legend.
+msgid "Search groups"
+msgstr ""
+
+#. TRANS: Empty list message for searching group directory.
+#. TRANS: %s is the search string.
+#, php-format
+msgid "No groups starting with %s."
+msgstr ""
+
+#. TRANS: Menu item text for user directory.
+msgctxt "MENU"
+msgid "Directory"
+msgstr "Hakemisto"
+
+#. TRANS: Menu item title for user directory.
+msgid "User Directory."
+msgstr "Käyttäjähakemisto."
+
+#. TRANS: Plugin description.
+msgid "Add a user directory."
+msgstr "Lisää käyttäjähakemisto."
+
+#. TRANS: Column header in table for user nickname.
+msgid "Nickname"
+msgstr ""
+
+#. TRANS: Column header in table for timestamp when user was created.
+msgid "Created"
+msgstr ""
+
+#. TRANS: Column header for number of subscriptions.
+msgid "Subscriptions"
+msgstr ""
+
+#. TRANS: Column header for number of notices.
+msgid "Notices"
+msgstr ""
+
+#. TRANS: Column header in table for members of a group.
+msgid "Members"
+msgstr ""
diff --git a/plugins/Directory/locale/fr/LC_MESSAGES/Directory.po b/plugins/Directory/locale/fr/LC_MESSAGES/Directory.po
index d10c23f4ce..6693f8a438 100644
--- a/plugins/Directory/locale/fr/LC_MESSAGES/Directory.po
+++ b/plugins/Directory/locale/fr/LC_MESSAGES/Directory.po
@@ -1,8 +1,11 @@
-# Translation of StatusNet - Directory to French (Français)
+# Translation of StatusNet - Directory to French (français)
 # Exported from translatewiki.net
 #
 # Author: Brunoperel
+# Author: Davidtsm
 # Author: Iketsi
+# Author: JojoBoulix
+# Author: Lucky
 # Author: Od1n
 # --
 # This file is distributed under the same license as the StatusNet package.
@@ -11,33 +14,39 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Directory\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:02+0000\n"
-"Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:09+0000\n"
+"Language-Team: French <https://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-05-05 11:55:22+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-08-30 09:57:06+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-directory\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#. TRANS: Page title for user directory. %d is a page number.
 #, php-format
 msgid "User Directory, page %d"
 msgstr "Annuaire des utilisateurs, page %d"
 
+#. TRANS: Page title for user directory.
 msgid "User directory"
 msgstr "Annuaire des utilisateurs"
 
+#. TRANS: Page title for user directory. %s is the applied filter.
 #, php-format
 msgid "User directory - %s"
 msgstr "Annuaire des utilisateurs - %s"
 
+#. TRANS: Page title for user directory.
+#. TRANS: %1$s is the applied filter, %2$d is a page number.
 #, php-format
-msgid "User directory - %s, page %d"
-msgstr "Annuaire des utilisateurs - %s, page %d"
+msgid "User directory - %1$s, page %2$d"
+msgstr "Annuaire des utilisateurs - %1$s, page %2$d"
 
+#. TRANS: %%site.name%% is the name of the StatusNet site.
 #, php-format
 msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
@@ -47,26 +56,44 @@ msgstr ""
 "leurs intérêts. Séparez les termes par des espaces ; ils doivent être "
 "composés de 3 caractères ou plus."
 
+#. TRANS: Fieldset legend.
 msgid "Search site"
 msgstr "Rechercher sur le site"
 
+#. TRANS: Field label for user directory filter.
 #. TRANS: Field label for input of one or more keywords.
 msgid "Keyword(s)"
 msgstr "Mot(s) clé(s)"
 
+#. TRANS: Button text.
 #. TRANS: Button text for searching group directory.
 msgctxt "BUTTON"
 msgid "Search"
 msgstr "Recherche"
 
+#. TRANS: Empty list message for user directory.
 #, php-format
 msgid "No users starting with %s"
 msgstr "Aucun utilisateur ne commence par %s"
 
+#. TRANS: Empty list message for user directory.
 #. TRANS: Empty list message for searching group directory.
 msgid "No results."
 msgstr "Aucun résultat."
 
+#. TRANS: Standard search suggestions shown when a search does not give any results.
+#. TRANS: Help text for searching group directory.
+msgid ""
+"* Make sure all words are spelled correctly.\n"
+"* Try different keywords.\n"
+"* Try more general keywords.\n"
+"* Try fewer keywords."
+msgstr ""
+"* Assurez-vous que tous les mots sont correctement orthographiés.\n"
+"* Essayez d'autres mots-clés.\n"
+"* Utilisez des mots plus généraux.\n"
+"* Essayez avec moins de mots-clés."
+
 #. TRANS: Title for group directory page. %d is a page number.
 #, php-format
 msgid "Group Directory, page %d"
@@ -89,12 +116,11 @@ msgid "Group directory - %1$s, page %2$d"
 msgstr "Annuaire des groupes - %1$s, page %2$d"
 
 #. TRANS: Page instructions.
-#, fuzzy
 msgid ""
 "After you join a group you can send messages to all other members\n"
 "using the syntax \"!groupname\".\n"
 "\n"
-"Browse groups, or search for groups on by their name, location or topic.\n"
+"Browse groups, or search for groups by their name, location or topic.\n"
 "Separate the terms by spaces; they must be three characters or more."
 msgstr ""
 "Après avoir rejoint un groupe, vous pouvez envoyer des messages à tous les "
@@ -119,18 +145,6 @@ msgstr "Recherche de groupes."
 msgid "No groups starting with %s."
 msgstr "Aucun groupe ne commence par %s."
 
-#. TRANS: Help text for searching group directory.
-msgid ""
-"* Make sure all words are spelled correctly.\n"
-"* Try different keywords.\n"
-"* Try more general keywords.\n"
-"* Try fewer keywords."
-msgstr ""
-"* Assurez-vous que tous les mots sont correctement orthographiés.\n"
-"* Essayez d'autres mots-clés.\n"
-"* Utilisez des mots plus généraux.\n"
-"* Essayez avec moins de mots-clés."
-
 #. TRANS: Menu item text for user directory.
 msgctxt "MENU"
 msgid "Directory"
@@ -152,6 +166,14 @@ msgstr "Surnom"
 msgid "Created"
 msgstr "Créé"
 
+#. TRANS: Column header for number of subscriptions.
+msgid "Subscriptions"
+msgstr "Abonnements"
+
+#. TRANS: Column header for number of notices.
+msgid "Notices"
+msgstr "Notifications"
+
 #. TRANS: Column header in table for members of a group.
 msgid "Members"
 msgstr "Membres"
diff --git a/plugins/Directory/locale/gl/LC_MESSAGES/Directory.po b/plugins/Directory/locale/gl/LC_MESSAGES/Directory.po
new file mode 100644
index 0000000000..abc87b9caf
--- /dev/null
+++ b/plugins/Directory/locale/gl/LC_MESSAGES/Directory.po
@@ -0,0 +1,174 @@
+# Translation of StatusNet - Directory to Galician (galego)
+# Exported from translatewiki.net
+#
+# Author: Toliño
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Directory\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:09+0000\n"
+"Language-Team: Galician <https://translatewiki.net/wiki/Portal:gl>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-08-30 09:57:06+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: gl\n"
+"X-Message-Group: #out-statusnet-plugin-directory\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Page title for user directory. %d is a page number.
+#, php-format
+msgid "User Directory, page %d"
+msgstr "Directorio de usuario, páxina %d"
+
+#. TRANS: Page title for user directory.
+msgid "User directory"
+msgstr "Directorio de usuario"
+
+#. TRANS: Page title for user directory. %s is the applied filter.
+#, php-format
+msgid "User directory - %s"
+msgstr "Directorio de usuario - %s"
+
+#. TRANS: Page title for user directory.
+#. TRANS: %1$s is the applied filter, %2$d is a page number.
+#, php-format
+msgid "User directory - %1$s, page %2$d"
+msgstr "Directorio de usuario - %1$s, páxina %2$d"
+
+#. TRANS: %%site.name%% is the name of the StatusNet site.
+#, 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 ""
+"Buscar xente en %%site.name%% por nome, lugar ou intereses. Separe os termos "
+"con espazos en branco. Cada termo ten que estar formado por tres ou máis "
+"caracteres."
+
+#. TRANS: Fieldset legend.
+msgid "Search site"
+msgstr "Buscar no sitio"
+
+#. TRANS: Field label for user directory filter.
+#. TRANS: Field label for input of one or more keywords.
+msgid "Keyword(s)"
+msgstr "Termos de busca"
+
+#. TRANS: Button text.
+#. TRANS: Button text for searching group directory.
+msgctxt "BUTTON"
+msgid "Search"
+msgstr "Procurar"
+
+#. TRANS: Empty list message for user directory.
+#, php-format
+msgid "No users starting with %s"
+msgstr "Non hai usuarios que comecen por %s"
+
+#. TRANS: Empty list message for user directory.
+#. TRANS: Empty list message for searching group directory.
+msgid "No results."
+msgstr "Non hai resultados."
+
+#. TRANS: Standard search suggestions shown when a search does not give any results.
+#. TRANS: Help text for searching group directory.
+msgid ""
+"* Make sure all words are spelled correctly.\n"
+"* Try different keywords.\n"
+"* Try more general keywords.\n"
+"* Try fewer keywords."
+msgstr ""
+"* Asegúrese de que non haxa faltas de ortografía.\n"
+"* Probe con palabras clave diferentes.\n"
+"* Probe con máis palabras clave xerais.\n"
+"* Probe con menos palabras clave."
+
+#. TRANS: Title for group directory page. %d is a page number.
+#, php-format
+msgid "Group Directory, page %d"
+msgstr "Directorio de grupo, páxina %d"
+
+#. TRANS: Title for group directory page.
+msgid "Group directory"
+msgstr "Directorio de grupo"
+
+#. TRANS: Title for group directory page when it is filtered.
+#. TRANS: %s is the filter string.
+#, php-format
+msgid "Group directory - %s"
+msgstr "Directorio de grupo - %s"
+
+#. TRANS: Title for group directory page when it is filtered.
+#. TRANS: %1$s is the filter string, %2$d is a page number.
+#, php-format
+msgid "Group directory - %1$s, page %2$d"
+msgstr "Directorio de grupo - %1$s, páxina %2$d"
+
+#. TRANS: Page instructions.
+msgid ""
+"After you join a group you can send messages to all other members\n"
+"using the syntax \"!groupname\".\n"
+"\n"
+"Browse groups, or search for groups by their name, location or topic.\n"
+"Separate the terms by spaces; they must be three characters or more."
+msgstr ""
+"Despois de unirse a un grupo, pode enviar mensaxes a outros membros\n"
+"mediante a sintaxe \"!nomedegrupo\".\n"
+"\n"
+"Navegue polos grupos ou busque grupos polos seus nomes, localizacións ou "
+"temas.\n"
+"Separe os termos con espazos en branco. Cada termo ten que estar formado por "
+"tres ou máis caracteres."
+
+#. TRANS: Link to create a new group on the group list page.
+msgid "Create a new group"
+msgstr "Crear un novo grupo"
+
+#. TRANS: Fieldset legend.
+msgid "Search groups"
+msgstr "Procurar grupos"
+
+#. TRANS: Empty list message for searching group directory.
+#. TRANS: %s is the search string.
+#, php-format
+msgid "No groups starting with %s."
+msgstr "Non hai grupos que comecen por %s."
+
+#. TRANS: Menu item text for user directory.
+msgctxt "MENU"
+msgid "Directory"
+msgstr "Directorio"
+
+#. TRANS: Menu item title for user directory.
+msgid "User Directory."
+msgstr "Directorio de usuario."
+
+#. TRANS: Plugin description.
+msgid "Add a user directory."
+msgstr "Engadir un directorio de usuario."
+
+#. TRANS: Column header in table for user nickname.
+msgid "Nickname"
+msgstr "Alcume"
+
+#. TRANS: Column header in table for timestamp when user was created.
+msgid "Created"
+msgstr "Creado"
+
+#. TRANS: Column header for number of subscriptions.
+msgid "Subscriptions"
+msgstr "Subscricións"
+
+#. TRANS: Column header for number of notices.
+msgid "Notices"
+msgstr "Notas"
+
+#. TRANS: Column header in table for members of a group.
+msgid "Members"
+msgstr "Membros"
diff --git a/plugins/Directory/locale/hu/LC_MESSAGES/Directory.po b/plugins/Directory/locale/hu/LC_MESSAGES/Directory.po
index c0e695888c..0fd93efdbe 100644
--- a/plugins/Directory/locale/hu/LC_MESSAGES/Directory.po
+++ b/plugins/Directory/locale/hu/LC_MESSAGES/Directory.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Directory\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:02+0000\n"
+"POT-Creation-Date: 2011-06-05 09:13+0000\n"
+"PO-Revision-Date: 2011-06-05 09:14:07+0000\n"
 "Language-Team: Hungarian <http://translatewiki.net/wiki/Portal:hu>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-05-05 11:55:22+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
+"X-POT-Import-Date: 2011-05-05 21:44:38+0000\n"
+"X-Generator: MediaWiki 1.19alpha (r89487); Translate extension (2011-06-02)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: hu\n"
 "X-Message-Group: #out-statusnet-plugin-directory\n"
@@ -135,6 +135,14 @@ msgstr "Becenév"
 msgid "Created"
 msgstr "Létrehozás ideje"
 
+#. TRANS: Column header for number of subscriptions.
+msgid "Subscriptions"
+msgstr ""
+
+#. TRANS: Column header for number of notices.
+msgid "Notices"
+msgstr ""
+
 #. TRANS: Column header in table for members of a group.
 msgid "Members"
 msgstr "Tagok"
diff --git a/plugins/Directory/locale/ia/LC_MESSAGES/Directory.po b/plugins/Directory/locale/ia/LC_MESSAGES/Directory.po
index 1266f2a095..e86d41ddb0 100644
--- a/plugins/Directory/locale/ia/LC_MESSAGES/Directory.po
+++ b/plugins/Directory/locale/ia/LC_MESSAGES/Directory.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Directory to Interlingua (Interlingua)
+# Translation of StatusNet - Directory to Interlingua (interlingua)
 # Exported from translatewiki.net
 #
 # Author: McDutchie
@@ -9,33 +9,39 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Directory\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:02+0000\n"
-"Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:09+0000\n"
+"Language-Team: Interlingua <https://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-05-05 11:55:22+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-08-30 09:57:06+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-directory\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Page title for user directory. %d is a page number.
 #, php-format
 msgid "User Directory, page %d"
 msgstr "Catalogo de usatores, pagina %d"
 
+#. TRANS: Page title for user directory.
 msgid "User directory"
 msgstr "Catalogo de usatores"
 
+#. TRANS: Page title for user directory. %s is the applied filter.
 #, php-format
 msgid "User directory - %s"
 msgstr "Catalogo de usatores - %s"
 
+#. TRANS: Page title for user directory.
+#. TRANS: %1$s is the applied filter, %2$d is a page number.
 #, php-format
-msgid "User directory - %s, page %d"
-msgstr "Catalogo de usatores - %s, pagina %d"
+msgid "User directory - %1$s, page %2$d"
+msgstr "Catalogo de usatores - %1$s, pagina %2$d"
 
+#. TRANS: %%site.name%% is the name of the StatusNet site.
 #, php-format
 msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
@@ -44,26 +50,44 @@ msgstr ""
 "Cerca personas in %%site.name%% per nomine, loco o interesses. Separa le "
 "terminos per spatios; illos debe haber 3 characteres o plus."
 
+#. TRANS: Fieldset legend.
 msgid "Search site"
 msgstr "Cercar in sito"
 
+#. TRANS: Field label for user directory filter.
 #. TRANS: Field label for input of one or more keywords.
 msgid "Keyword(s)"
 msgstr "Parola(s)-clave"
 
+#. TRANS: Button text.
 #. TRANS: Button text for searching group directory.
 msgctxt "BUTTON"
 msgid "Search"
 msgstr "Cercar"
 
+#. TRANS: Empty list message for user directory.
 #, php-format
 msgid "No users starting with %s"
 msgstr "Il non ha usatores de qui le nomine comencia con \"%s\""
 
+#. TRANS: Empty list message for user directory.
 #. TRANS: Empty list message for searching group directory.
 msgid "No results."
 msgstr "Nulle resultato."
 
+#. TRANS: Standard search suggestions shown when a search does not give any results.
+#. TRANS: Help text for searching group directory.
+msgid ""
+"* Make sure all words are spelled correctly.\n"
+"* Try different keywords.\n"
+"* Try more general keywords.\n"
+"* Try fewer keywords."
+msgstr ""
+"* Verifica que tote le parolas es orthographiate correctemente.\n"
+"* Proba differente parolas-clave.\n"
+"* Proba parolas-clave plus general.\n"
+"* Proba minus parolas-clave."
+
 #. TRANS: Title for group directory page. %d is a page number.
 #, php-format
 msgid "Group Directory, page %d"
@@ -86,12 +110,11 @@ msgid "Group directory - %1$s, page %2$d"
 msgstr "Catalogo de gruppos - %1$s, pagina %2$d"
 
 #. TRANS: Page instructions.
-#, fuzzy
 msgid ""
 "After you join a group you can send messages to all other members\n"
 "using the syntax \"!groupname\".\n"
 "\n"
-"Browse groups, or search for groups on by their name, location or topic.\n"
+"Browse groups, or search for groups by their name, location or topic.\n"
 "Separate the terms by spaces; they must be three characters or more."
 msgstr ""
 "Post adherer a un gruppo, tu pote inviar messages a tote le altere membros\n"
@@ -99,7 +122,7 @@ msgstr ""
 "\n"
 "Percurre le gruppos, o cerca gruppos per nomine, localitate o topico.\n"
 "Separa le terminos per spatios; illos debe consister de tres characteres o "
-"plus.\n"
+"plus."
 
 #. TRANS: Link to create a new group on the group list page.
 msgid "Create a new group"
@@ -115,18 +138,6 @@ msgstr "Cercar in gruppos"
 msgid "No groups starting with %s."
 msgstr "Il non ha gruppos de que le nomine comencia con \"%s\"."
 
-#. TRANS: Help text for searching group directory.
-msgid ""
-"* Make sure all words are spelled correctly.\n"
-"* Try different keywords.\n"
-"* Try more general keywords.\n"
-"* Try fewer keywords."
-msgstr ""
-"* Verifica que tote le parolas es orthographiate correctemente.\n"
-"* Proba differente parolas-clave.\n"
-"* Proba parolas-clave plus general.\n"
-"* Proba minus parolas-clave."
-
 #. TRANS: Menu item text for user directory.
 msgctxt "MENU"
 msgid "Directory"
@@ -148,6 +159,14 @@ msgstr "Pseudonymo"
 msgid "Created"
 msgstr "Create le"
 
+#. TRANS: Column header for number of subscriptions.
+msgid "Subscriptions"
+msgstr "Subscriptiones"
+
+#. TRANS: Column header for number of notices.
+msgid "Notices"
+msgstr "Notas"
+
 #. TRANS: Column header in table for members of a group.
 msgid "Members"
 msgstr "Membros"
diff --git a/plugins/Directory/locale/it/LC_MESSAGES/Directory.po b/plugins/Directory/locale/it/LC_MESSAGES/Directory.po
new file mode 100644
index 0000000000..2470c08273
--- /dev/null
+++ b/plugins/Directory/locale/it/LC_MESSAGES/Directory.po
@@ -0,0 +1,168 @@
+# Translation of StatusNet - Directory to Italian (italiano)
+# Exported from translatewiki.net
+#
+# Author: Ximo17
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Directory\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:09+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-08-30 09:57:06+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Page title for user directory. %d is a page number.
+#, php-format
+msgid "User Directory, page %d"
+msgstr "Directory dell'utente, pagina %d"
+
+#. TRANS: Page title for user directory.
+msgid "User directory"
+msgstr "Directory utente"
+
+#. TRANS: Page title for user directory. %s is the applied filter.
+#, php-format
+msgid "User directory - %s"
+msgstr "Directory utente - %s"
+
+#. TRANS: Page title for user directory.
+#. TRANS: %1$s is the applied filter, %2$d is a page number.
+#, php-format
+msgid "User directory - %1$s, page %2$d"
+msgstr "Directory utente - %1$s, pagina %2$d"
+
+#. TRANS: %%site.name%% is the name of the StatusNet site.
+#, 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 ""
+"Cerca tra le persone su %%site.name%% per nome, luogo o interessi. Separa i "
+"termini di ricerca con degli spazi; lunghezza minima 3 caratteri."
+
+#. TRANS: Fieldset legend.
+msgid "Search site"
+msgstr "Cerca nel sito"
+
+#. TRANS: Field label for user directory filter.
+#. TRANS: Field label for input of one or more keywords.
+msgid "Keyword(s)"
+msgstr "Parola chiave (s)"
+
+#. TRANS: Button text.
+#. TRANS: Button text for searching group directory.
+msgctxt "BUTTON"
+msgid "Search"
+msgstr "Cerca"
+
+#. TRANS: Empty list message for user directory.
+#, php-format
+msgid "No users starting with %s"
+msgstr "Nessun utente che inizia per %s"
+
+#. TRANS: Empty list message for user directory.
+#. TRANS: Empty list message for searching group directory.
+msgid "No results."
+msgstr "Nessun risultato."
+
+#. TRANS: Standard search suggestions shown when a search does not give any results.
+#. TRANS: Help text for searching group directory.
+msgid ""
+"* Make sure all words are spelled correctly.\n"
+"* Try different keywords.\n"
+"* Try more general keywords.\n"
+"* Try fewer keywords."
+msgstr ""
+"* Accertati che tutte le parole siano digitate correttamente.\n"
+"* Prova parole chiave differenti.\n"
+"* Prova parole chiave più generali.\n"
+"* Prova meno parole chiave."
+
+#. TRANS: Title for group directory page. %d is a page number.
+#, php-format
+msgid "Group Directory, page %d"
+msgstr "Directory del gruppo, pagina %d"
+
+#. TRANS: Title for group directory page.
+msgid "Group directory"
+msgstr "Directory del gruppo"
+
+#. TRANS: Title for group directory page when it is filtered.
+#. TRANS: %s is the filter string.
+#, php-format
+msgid "Group directory - %s"
+msgstr "Directory del gruppo - %s"
+
+#. TRANS: Title for group directory page when it is filtered.
+#. TRANS: %1$s is the filter string, %2$d is a page number.
+#, php-format
+msgid "Group directory - %1$s, page %2$d"
+msgstr "Directory del gruppo - %1$s, pagina %2$d"
+
+#. TRANS: Page instructions.
+msgid ""
+"After you join a group you can send messages to all other members\n"
+"using the syntax \"!groupname\".\n"
+"\n"
+"Browse groups, or search for groups by their name, location or topic.\n"
+"Separate the terms by spaces; they must be three characters or more."
+msgstr ""
+"Una volta unito ad un gruppo puoi inviare messaggi a tutti gli altri membri\n"
+"utilizzando la sintassi \"!nomegruppo\".\n"
+"\n"
+"Sfoglia i gruppi, o cercali per nome, luogo o argomento.\n"
+"Separa i termini con degli spazi; minimo 3 o più caratteri."
+
+#. TRANS: Link to create a new group on the group list page.
+msgid "Create a new group"
+msgstr "Crea un nuovo gruppo"
+
+#. TRANS: Fieldset legend.
+msgid "Search groups"
+msgstr "Gruppi di ricerca"
+
+#. TRANS: Empty list message for searching group directory.
+#. TRANS: %s is the search string.
+#, php-format
+msgid "No groups starting with %s."
+msgstr "Nessun gruppo inizia con %s ."
+
+#. TRANS: Menu item text for user directory.
+msgctxt "MENU"
+msgid "Directory"
+msgstr "Directory"
+
+#. TRANS: Menu item title for user directory.
+msgid "User Directory."
+msgstr "Directory Utente."
+
+#. TRANS: Plugin description.
+msgid "Add a user directory."
+msgstr "Aggiungere una directory utente."
+
+#. TRANS: Column header in table for user nickname.
+msgid "Nickname"
+msgstr "Nickname"
+
+#. TRANS: Column header in table for timestamp when user was created.
+msgid "Created"
+msgstr "Creato"
+
+#. TRANS: Column header for number of subscriptions.
+msgid "Subscriptions"
+msgstr "Iscrizioni"
+
+#. TRANS: Column header for number of notices.
+msgid "Notices"
+msgstr "Notizie"
+
+#. TRANS: Column header in table for members of a group.
+msgid "Members"
+msgstr "Membri"
diff --git a/plugins/Directory/locale/ja/LC_MESSAGES/Directory.po b/plugins/Directory/locale/ja/LC_MESSAGES/Directory.po
new file mode 100644
index 0000000000..a6164f6897
--- /dev/null
+++ b/plugins/Directory/locale/ja/LC_MESSAGES/Directory.po
@@ -0,0 +1,173 @@
+# Translation of StatusNet - Directory to Japanese (日本語)
+# Exported from translatewiki.net
+#
+# Author: Miwa ka
+# Author: Shirayuki
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Directory\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:09+0000\n"
+"Language-Team: Japanese <https://translatewiki.net/wiki/Portal:ja>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-08-30 09:57:06+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: ja\n"
+"X-Message-Group: #out-statusnet-plugin-directory\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#. TRANS: Page title for user directory. %d is a page number.
+#, php-format
+msgid "User Directory, page %d"
+msgstr "ユーザーディレクトリ, ページ %d"
+
+#. TRANS: Page title for user directory.
+msgid "User directory"
+msgstr "ユーザーディレクトリ"
+
+#. TRANS: Page title for user directory. %s is the applied filter.
+#, php-format
+msgid "User directory - %s"
+msgstr "ユーザーディレクトリ - %s"
+
+#. TRANS: Page title for user directory.
+#. TRANS: %1$s is the applied filter, %2$d is a page number.
+#, php-format
+msgid "User directory - %1$s, page %2$d"
+msgstr "ユーザーディレクトリ - %1$s, ページ %2$d"
+
+#. TRANS: %%site.name%% is the name of the StatusNet site.
+#, 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字以上"
+
+#. TRANS: Fieldset legend.
+msgid "Search site"
+msgstr "サイト検索"
+
+#. TRANS: Field label for user directory filter.
+#. TRANS: Field label for input of one or more keywords.
+msgid "Keyword(s)"
+msgstr "キーワード(複数�)"
+
+#. TRANS: Button text.
+#. TRANS: Button text for searching group directory.
+msgctxt "BUTTON"
+msgid "Search"
+msgstr "検索"
+
+#. TRANS: Empty list message for user directory.
+#, php-format
+msgid "No users starting with %s"
+msgstr "%s �始�るユーザー����ん"
+
+#. TRANS: Empty list message for user directory.
+#. TRANS: Empty list message for searching group directory.
+msgid "No results."
+msgstr "�果��り��ん。"
+
+#. TRANS: Standard search suggestions shown when a search does not give any results.
+#. TRANS: Help text for searching group directory.
+msgid ""
+"* Make sure all words are spelled correctly.\n"
+"* Try different keywords.\n"
+"* Try more general keywords.\n"
+"* Try fewer keywords."
+msgstr ""
+"* �����語�スペルを確�������\n"
+"* 別�キーワードを試��������\n"
+"* も��一般的�キーワードを試��������\n"
+"* キーワード�数を減ら��������"
+
+#. TRANS: Title for group directory page. %d is a page number.
+#, php-format
+msgid "Group Directory, page %d"
+msgstr "グループディレクトリ, ページ %d"
+
+#. TRANS: Title for group directory page.
+msgid "Group directory"
+msgstr "グループディレクトリ"
+
+#. TRANS: Title for group directory page when it is filtered.
+#. TRANS: %s is the filter string.
+#, php-format
+msgid "Group directory - %s"
+msgstr "グループディレクトリ - %s"
+
+#. TRANS: Title for group directory page when it is filtered.
+#. TRANS: %1$s is the filter string, %2$d is a page number.
+#, php-format
+msgid "Group directory - %1$s, page %2$d"
+msgstr "グループディレクトリ - %1$s, ページ %2$d"
+
+#. TRANS: Page instructions.
+#, fuzzy
+msgid ""
+"After you join a group you can send messages to all other members\n"
+"using the syntax \"!groupname\".\n"
+"\n"
+"Browse groups, or search for groups by their name, location or topic.\n"
+"Separate the terms by spaces; they must be three characters or more."
+msgstr ""
+"グループ��加��後��他�����メン�ー� \"!groupname\" 構文を使��"
+"メッセージを�信�る�������\n"
+"\n"
+"グループを�照�������場所���トピック�らグループを検索。\n"
+"空白�区切り; 3文字以上���れ��り��ん。"
+
+#. TRANS: Link to create a new group on the group list page.
+msgid "Create a new group"
+msgstr "新��グループを作�"
+
+#. TRANS: Fieldset legend.
+msgid "Search groups"
+msgstr "グループを検索"
+
+#. TRANS: Empty list message for searching group directory.
+#. TRANS: %s is the search string.
+#, php-format
+msgid "No groups starting with %s."
+msgstr "%s �始�るグループ��り��ん"
+
+#. TRANS: Menu item text for user directory.
+msgctxt "MENU"
+msgid "Directory"
+msgstr "ディレクトリ"
+
+#. TRANS: Menu item title for user directory.
+msgid "User Directory."
+msgstr "ユーザーディレクトリ"
+
+#. TRANS: Plugin description.
+msgid "Add a user directory."
+msgstr "ユーザーディレクトリを追加�る"
+
+#. TRANS: Column header in table for user nickname.
+msgid "Nickname"
+msgstr "ニック�ーム"
+
+#. TRANS: Column header in table for timestamp when user was created.
+msgid "Created"
+msgstr "作�日時"
+
+#. TRANS: Column header for number of subscriptions.
+msgid "Subscriptions"
+msgstr "フォロー"
+
+#. TRANS: Column header for number of notices.
+msgid "Notices"
+msgstr "��や�"
+
+#. TRANS: Column header in table for members of a group.
+msgid "Members"
+msgstr "メン�ー"
diff --git a/plugins/Directory/locale/mk/LC_MESSAGES/Directory.po b/plugins/Directory/locale/mk/LC_MESSAGES/Directory.po
index a9eda1b74d..bd5e906ee2 100644
--- a/plugins/Directory/locale/mk/LC_MESSAGES/Directory.po
+++ b/plugins/Directory/locale/mk/LC_MESSAGES/Directory.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Directory to Macedonian (Македон�ки)
+# Translation of StatusNet - Directory to Macedonian (македон�ки)
 # Exported from translatewiki.net
 #
 # Author: Bjankuloski06
@@ -9,33 +9,39 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Directory\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:02+0000\n"
-"Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:10+0000\n"
+"Language-Team: Macedonian <https://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-05-05 11:55:22+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-08-30 09:57:06+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-directory\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
 
+#. TRANS: Page title for user directory. %d is a page number.
 #, php-format
 msgid "User Directory, page %d"
 msgstr "Кори�нички именик, �тр. %d"
 
+#. TRANS: Page title for user directory.
 msgid "User directory"
 msgstr "Кори�нички именик"
 
+#. TRANS: Page title for user directory. %s is the applied filter.
 #, php-format
 msgid "User directory - %s"
 msgstr "Кори�нички именик - %s"
 
+#. TRANS: Page title for user directory.
+#. TRANS: %1$s is the applied filter, %2$d is a page number.
 #, php-format
-msgid "User directory - %s, page %d"
-msgstr "Кори�нички именик - %s, �тр. %d"
+msgid "User directory - %1$s, page %2$d"
+msgstr "Именик на кори�ници - %1$s, �траница %2$d"
 
+#. TRANS: %%site.name%% is the name of the StatusNet site.
 #, php-format
 msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
@@ -44,26 +50,44 @@ msgstr ""
 "Пребарајте луѓе на %%site.name%% по име, ме�тоположба или интере�и. Одделете "
 "ги поимите �о празни ме�та; зборовите мора да имаат барем по 3 букви."
 
+#. TRANS: Fieldset legend.
 msgid "Search site"
 msgstr "Пребарај"
 
+#. TRANS: Field label for user directory filter.
 #. TRANS: Field label for input of one or more keywords.
 msgid "Keyword(s)"
 msgstr "Клучни зборови"
 
+#. TRANS: Button text.
 #. TRANS: Button text for searching group directory.
 msgctxt "BUTTON"
 msgid "Search"
 msgstr "Пребарај"
 
+#. TRANS: Empty list message for user directory.
 #, php-format
 msgid "No users starting with %s"
 msgstr "�ема кори�ници што почнуваат на %s"
 
+#. TRANS: Empty list message for user directory.
 #. TRANS: Empty list message for searching group directory.
 msgid "No results."
 msgstr "�ема резултати."
 
+#. TRANS: Standard search suggestions shown when a search does not give any results.
+#. TRANS: Help text for searching group directory.
+msgid ""
+"* Make sure all words are spelled correctly.\n"
+"* Try different keywords.\n"
+"* Try more general keywords.\n"
+"* Try fewer keywords."
+msgstr ""
+"* Проверете дали �ите зборови �е напишани како што треба.\n"
+"* Обидете �е �о други клучни зборови.\n"
+"* Обидете �е �о поопшти клучни зборови.\n"
+"* Обидете �е помалку клучни зборови."
+
 #. TRANS: Title for group directory page. %d is a page number.
 #, php-format
 msgid "Group Directory, page %d"
@@ -86,12 +110,11 @@ msgid "Group directory - %1$s, page %2$d"
 msgstr "Именик на групи - %1$s, �траница %2$d"
 
 #. TRANS: Page instructions.
-#, fuzzy
 msgid ""
 "After you join a group you can send messages to all other members\n"
 "using the syntax \"!groupname\".\n"
 "\n"
-"Browse groups, or search for groups on by their name, location or topic.\n"
+"Browse groups, or search for groups by their name, location or topic.\n"
 "Separate the terms by spaces; they must be three characters or more."
 msgstr ""
 "Откако ќе �е зачлените во групата ќе можете да им и�праќате пораки на �ите "
@@ -101,7 +124,7 @@ msgstr ""
 "Групите можете да ги прели�тувате или да ги пребарувате по име, ме�то или "
 "тема.\n"
 "Одделете ги поимите �о празни ме�та. Секој поим мора да �одржи барем три "
-"знака.\n"
+"знака."
 
 #. TRANS: Link to create a new group on the group list page.
 msgid "Create a new group"
@@ -117,18 +140,6 @@ msgstr "Пребарај групи"
 msgid "No groups starting with %s."
 msgstr "�ема групи што почнуваат на %s."
 
-#. TRANS: Help text for searching group directory.
-msgid ""
-"* Make sure all words are spelled correctly.\n"
-"* Try different keywords.\n"
-"* Try more general keywords.\n"
-"* Try fewer keywords."
-msgstr ""
-"* Проверете дали �ите зборови �е напишани како што треба.\n"
-"* Обидете �е �о други клучни зборови.\n"
-"* Обидете �е �о поопшти клучни зборови.\n"
-"* Обидете �е помалку клучни зборови.\n"
-
 #. TRANS: Menu item text for user directory.
 msgctxt "MENU"
 msgid "Directory"
@@ -150,6 +161,14 @@ msgstr "Прекар"
 msgid "Created"
 msgstr "Создадено"
 
+#. TRANS: Column header for number of subscriptions.
+msgid "Subscriptions"
+msgstr "Претплати"
+
+#. TRANS: Column header for number of notices.
+msgid "Notices"
+msgstr "Забелешки"
+
 #. TRANS: Column header in table for members of a group.
 msgid "Members"
 msgstr "Членови"
diff --git a/plugins/Directory/locale/nb/LC_MESSAGES/Directory.po b/plugins/Directory/locale/nb/LC_MESSAGES/Directory.po
index a7ff1cf618..fe17480787 100644
--- a/plugins/Directory/locale/nb/LC_MESSAGES/Directory.po
+++ b/plugins/Directory/locale/nb/LC_MESSAGES/Directory.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Directory\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:02+0000\n"
+"POT-Creation-Date: 2011-06-05 09:13+0000\n"
+"PO-Revision-Date: 2011-06-05 09:14:07+0000\n"
 "Language-Team: Norwegian (bokmål)‬ <http://translatewiki.net/wiki/Portal:no>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-05-05 11:55:22+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
+"X-POT-Import-Date: 2011-05-05 21:44:38+0000\n"
+"X-Generator: MediaWiki 1.19alpha (r89487); Translate extension (2011-06-02)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: no\n"
 "X-Message-Group: #out-statusnet-plugin-directory\n"
@@ -139,6 +139,14 @@ msgstr "Kallenavn"
 msgid "Created"
 msgstr "Opprettet"
 
+#. TRANS: Column header for number of subscriptions.
+msgid "Subscriptions"
+msgstr ""
+
+#. TRANS: Column header for number of notices.
+msgid "Notices"
+msgstr ""
+
 #. TRANS: Column header in table for members of a group.
 msgid "Members"
 msgstr "Medlemmer"
diff --git a/plugins/Directory/locale/nl/LC_MESSAGES/Directory.po b/plugins/Directory/locale/nl/LC_MESSAGES/Directory.po
index ad07cdb9fd..7c4dd687f7 100644
--- a/plugins/Directory/locale/nl/LC_MESSAGES/Directory.po
+++ b/plugins/Directory/locale/nl/LC_MESSAGES/Directory.po
@@ -10,33 +10,39 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Directory\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:02+0000\n"
-"Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:10+0000\n"
+"Language-Team: Dutch <https://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-05-05 11:55:22+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-08-30 09:57:06+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-directory\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Page title for user directory. %d is a page number.
 #, php-format
 msgid "User Directory, page %d"
 msgstr "Gebruikerslijst, pagina %d"
 
+#. TRANS: Page title for user directory.
 msgid "User directory"
 msgstr "Gebruikerslijst"
 
+#. TRANS: Page title for user directory. %s is the applied filter.
 #, php-format
 msgid "User directory - %s"
 msgstr "Gebruikerslijst - %s"
 
+#. TRANS: Page title for user directory.
+#. TRANS: %1$s is the applied filter, %2$d is a page number.
 #, php-format
-msgid "User directory - %s, page %d"
-msgstr "Gebruikerslijst - %s, pagina %d"
+msgid "User directory - %1$s, page %2$d"
+msgstr "Gebruikerslijst - %1$s, pagina %2$d"
 
+#. TRANS: %%site.name%% is the name of the StatusNet site.
 #, php-format
 msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
@@ -46,26 +52,44 @@ msgstr ""
 "interesses. Scheid de zoektermen met spaties. Zoektermen moeten uit drie of "
 "meer tekens bestaan."
 
+#. TRANS: Fieldset legend.
 msgid "Search site"
 msgstr "Site doorzoeken"
 
+#. TRANS: Field label for user directory filter.
 #. TRANS: Field label for input of one or more keywords.
 msgid "Keyword(s)"
 msgstr "Trefwoord(en)"
 
+#. TRANS: Button text.
 #. TRANS: Button text for searching group directory.
 msgctxt "BUTTON"
 msgid "Search"
 msgstr "Zoeken"
 
+#. TRANS: Empty list message for user directory.
 #, php-format
 msgid "No users starting with %s"
 msgstr "Er zijn geen gebruikers wiens naam begint met \"%s\""
 
+#. TRANS: Empty list message for user directory.
 #. TRANS: Empty list message for searching group directory.
 msgid "No results."
 msgstr "Geen resultaten."
 
+#. TRANS: Standard search suggestions shown when a search does not give any results.
+#. TRANS: Help text for searching group directory.
+msgid ""
+"* Make sure all words are spelled correctly.\n"
+"* Try different keywords.\n"
+"* Try more general keywords.\n"
+"* Try fewer keywords."
+msgstr ""
+"* Zorg ervoor dat alle woorden correct zijn gespeld.\n"
+"* Gebruik verschillende trefwoorden.\n"
+"* Gebruik meer algemene trefwoorden.\n"
+"* Gebruik minder zoekwoorden."
+
 #. TRANS: Title for group directory page. %d is a page number.
 #, php-format
 msgid "Group Directory, page %d"
@@ -88,21 +112,20 @@ msgid "Group directory - %1$s, page %2$d"
 msgstr "Gebruikerslijst - %1$s, pagina %2$d"
 
 #. TRANS: Page instructions.
-#, fuzzy
 msgid ""
 "After you join a group you can send messages to all other members\n"
 "using the syntax \"!groupname\".\n"
 "\n"
-"Browse groups, or search for groups on by their name, location or topic.\n"
+"Browse groups, or search for groups by their name, location or topic.\n"
 "Separate the terms by spaces; they must be three characters or more."
 msgstr ""
 "Nadat u lid bent geworden van een groep kunt u berichten naar de groep "
 "zenden door \"\"!groepsnaam\" te gebruiken in uw bericht.\n"
 "\n"
-"Blader door groepen or zoek naar groepen op basis van hun naam, locatie of "
+"Blader door groepen of zoek naar groepen op basis van hun naam, locatie of "
 "onderwerp.\n"
 "Scheid trefwoorden met spaties; trefwoorden moeten bestaat uit drie of meer "
-"tekens.\n"
+"tekens."
 
 #. TRANS: Link to create a new group on the group list page.
 msgid "Create a new group"
@@ -118,18 +141,6 @@ msgstr "Groepen doorzoeken"
 msgid "No groups starting with %s."
 msgstr "Er zijn geen groepsnamen die beginnen met \"%s\"."
 
-#. TRANS: Help text for searching group directory.
-msgid ""
-"* Make sure all words are spelled correctly.\n"
-"* Try different keywords.\n"
-"* Try more general keywords.\n"
-"* Try fewer keywords."
-msgstr ""
-"* Zorg ervoor dat alle woorden correct zijn gespeld.\n"
-"* Gebruik verschillende trefwoorden.\n"
-"* Gebruik meer algemene trefwoorden.\n"
-"* Gebruik minder zoekwoorden."
-
 #. TRANS: Menu item text for user directory.
 msgctxt "MENU"
 msgid "Directory"
@@ -151,6 +162,14 @@ msgstr "Gebruikersnaam"
 msgid "Created"
 msgstr "Aangemaakt"
 
+#. TRANS: Column header for number of subscriptions.
+msgid "Subscriptions"
+msgstr "Abonnementen"
+
+#. TRANS: Column header for number of notices.
+msgid "Notices"
+msgstr "Mededelingen"
+
 #. TRANS: Column header in table for members of a group.
 msgid "Members"
 msgstr "Leden"
diff --git a/plugins/Directory/locale/sv/LC_MESSAGES/Directory.po b/plugins/Directory/locale/sv/LC_MESSAGES/Directory.po
new file mode 100644
index 0000000000..aa9f7b301c
--- /dev/null
+++ b/plugins/Directory/locale/sv/LC_MESSAGES/Directory.po
@@ -0,0 +1,165 @@
+# Translation of StatusNet - Directory to Swedish (svenska)
+# Exported from translatewiki.net
+#
+# Author: Ainali
+# Author: Lokal Profil
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Directory\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:10+0000\n"
+"Language-Team: Swedish <https://translatewiki.net/wiki/Portal:sv>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-08-30 09:57:06+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: sv\n"
+"X-Message-Group: #out-statusnet-plugin-directory\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Page title for user directory. %d is a page number.
+#, php-format
+msgid "User Directory, page %d"
+msgstr ""
+
+#. TRANS: Page title for user directory.
+msgid "User directory"
+msgstr ""
+
+#. TRANS: Page title for user directory. %s is the applied filter.
+#, php-format
+msgid "User directory - %s"
+msgstr ""
+
+#. TRANS: Page title for user directory.
+#. TRANS: %1$s is the applied filter, %2$d is a page number.
+#, php-format
+msgid "User directory - %1$s, page %2$d"
+msgstr ""
+
+#. TRANS: %%site.name%% is the name of the StatusNet site.
+#, 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 ""
+
+#. TRANS: Fieldset legend.
+msgid "Search site"
+msgstr "Sök webbplats"
+
+#. TRANS: Field label for user directory filter.
+#. TRANS: Field label for input of one or more keywords.
+msgid "Keyword(s)"
+msgstr "Nyckelord"
+
+#. TRANS: Button text.
+#. TRANS: Button text for searching group directory.
+msgctxt "BUTTON"
+msgid "Search"
+msgstr "Sök"
+
+#. TRANS: Empty list message for user directory.
+#, php-format
+msgid "No users starting with %s"
+msgstr ""
+
+#. TRANS: Empty list message for user directory.
+#. TRANS: Empty list message for searching group directory.
+msgid "No results."
+msgstr "Inga resultat."
+
+#. TRANS: Standard search suggestions shown when a search does not give any results.
+#. TRANS: Help text for searching group directory.
+msgid ""
+"* Make sure all words are spelled correctly.\n"
+"* Try different keywords.\n"
+"* Try more general keywords.\n"
+"* Try fewer keywords."
+msgstr ""
+"* Kontrollera att alla ord är korrekt stavade.\n"
+"* Prova olika nyckelord.\n"
+"* Prova mer allmänna nyckelord.\n"
+"* Prova färre nyckelord."
+
+#. TRANS: Title for group directory page. %d is a page number.
+#, php-format
+msgid "Group Directory, page %d"
+msgstr ""
+
+#. TRANS: Title for group directory page.
+msgid "Group directory"
+msgstr ""
+
+#. TRANS: Title for group directory page when it is filtered.
+#. TRANS: %s is the filter string.
+#, php-format
+msgid "Group directory - %s"
+msgstr ""
+
+#. TRANS: Title for group directory page when it is filtered.
+#. TRANS: %1$s is the filter string, %2$d is a page number.
+#, php-format
+msgid "Group directory - %1$s, page %2$d"
+msgstr ""
+
+#. TRANS: Page instructions.
+msgid ""
+"After you join a group you can send messages to all other members\n"
+"using the syntax \"!groupname\".\n"
+"\n"
+"Browse groups, or search for groups by their name, location or topic.\n"
+"Separate the terms by spaces; they must be three characters or more."
+msgstr ""
+
+#. TRANS: Link to create a new group on the group list page.
+msgid "Create a new group"
+msgstr "Skapa en ny grupp"
+
+#. TRANS: Fieldset legend.
+msgid "Search groups"
+msgstr "Sök grupper"
+
+#. TRANS: Empty list message for searching group directory.
+#. TRANS: %s is the search string.
+#, php-format
+msgid "No groups starting with %s."
+msgstr "Inga grupper som börjar med %s."
+
+#. TRANS: Menu item text for user directory.
+msgctxt "MENU"
+msgid "Directory"
+msgstr "Katalog"
+
+#. TRANS: Menu item title for user directory.
+msgid "User Directory."
+msgstr "Användarkatalog."
+
+#. TRANS: Plugin description.
+msgid "Add a user directory."
+msgstr "Lägga till en användarkatalog."
+
+#. TRANS: Column header in table for user nickname.
+msgid "Nickname"
+msgstr "Smeknamn"
+
+#. TRANS: Column header in table for timestamp when user was created.
+msgid "Created"
+msgstr "Skapad"
+
+#. TRANS: Column header for number of subscriptions.
+msgid "Subscriptions"
+msgstr ""
+
+#. TRANS: Column header for number of notices.
+msgid "Notices"
+msgstr ""
+
+#. TRANS: Column header in table for members of a group.
+msgid "Members"
+msgstr "Medlemmar"
diff --git a/plugins/Directory/locale/tl/LC_MESSAGES/Directory.po b/plugins/Directory/locale/tl/LC_MESSAGES/Directory.po
index 1002ef420e..64b1e38167 100644
--- a/plugins/Directory/locale/tl/LC_MESSAGES/Directory.po
+++ b/plugins/Directory/locale/tl/LC_MESSAGES/Directory.po
@@ -9,33 +9,39 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Directory\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:03+0000\n"
-"Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:10+0000\n"
+"Language-Team: Tagalog <https://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-05-05 11:55:22+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-08-30 09:57:06+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-directory\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Page title for user directory. %d is a page number.
 #, php-format
 msgid "User Directory, page %d"
 msgstr "Direktoryo ng Tagagamit, pahina %d"
 
+#. TRANS: Page title for user directory.
 msgid "User directory"
 msgstr "Direktoryo ng tagagamit"
 
+#. TRANS: Page title for user directory. %s is the applied filter.
 #, php-format
 msgid "User directory - %s"
 msgstr "Direktoryo ng tagagamit - %s"
 
+#. TRANS: Page title for user directory.
+#. TRANS: %1$s is the applied filter, %2$d is a page number.
 #, php-format
-msgid "User directory - %s, page %d"
-msgstr "Direktoryo ng tagagamit - %s, pahina %d"
+msgid "User directory - %1$s, page %2$d"
+msgstr "Direktoryo ng tagagamit - %1$s, pahina %2$d"
 
+#. TRANS: %%site.name%% is the name of the StatusNet site.
 #, php-format
 msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
@@ -45,26 +51,44 @@ msgstr ""
 "kinalalagyan, o kinahihiligan.  Paghiwa-hiwalayin ang mga kataga sa "
 "pamamagitan ng mga puwang; dapat silang 3 mga panitik o mahigit pa."
 
+#. TRANS: Fieldset legend.
 msgid "Search site"
 msgstr "Hanapin sa sityo"
 
+#. TRANS: Field label for user directory filter.
 #. TRANS: Field label for input of one or more keywords.
 msgid "Keyword(s)"
 msgstr "(Mga) susi"
 
+#. TRANS: Button text.
 #. TRANS: Button text for searching group directory.
 msgctxt "BUTTON"
 msgid "Search"
 msgstr "Hanapin"
 
+#. TRANS: Empty list message for user directory.
 #, php-format
 msgid "No users starting with %s"
 msgstr "Walang mga tagagamit na nagsisimula sa %s"
 
+#. TRANS: Empty list message for user directory.
 #. TRANS: Empty list message for searching group directory.
 msgid "No results."
 msgstr "Walang mga kinalabasan."
 
+#. TRANS: Standard search suggestions shown when a search does not give any results.
+#. TRANS: Help text for searching group directory.
+msgid ""
+"* Make sure all words are spelled correctly.\n"
+"* Try different keywords.\n"
+"* Try more general keywords.\n"
+"* Try fewer keywords."
+msgstr ""
+"* Tiyakin na tama ang pagbabanghay ng lahat ng mga salita.\n"
+"* Sumubok ng ibang mga susing-salita.\n"
+"* Sumubok ng mas pangkalahatang mga susing-salita.\n"
+"* Sumubok ng mas kakaunting mga susing-salita."
+
 #. TRANS: Title for group directory page. %d is a page number.
 #, php-format
 msgid "Group Directory, page %d"
@@ -87,22 +111,21 @@ msgid "Group directory - %1$s, page %2$d"
 msgstr "Direktoryo ng pangkat - %1$s, pahina %2$d"
 
 #. TRANS: Page instructions.
-#, fuzzy
 msgid ""
 "After you join a group you can send messages to all other members\n"
 "using the syntax \"!groupname\".\n"
 "\n"
-"Browse groups, or search for groups on by their name, location or topic.\n"
+"Browse groups, or search for groups by their name, location or topic.\n"
 "Separate the terms by spaces; they must be three characters or more."
 msgstr ""
-"Pagkaraan mong sumali sa isang pangkat makapagpapadala ka ng mensahe sa "
-"lahat ng iba pang mga kasapi \n"
+"Pagkaraan mong salihan ang isang pangkat ay makapagpapadala ka ng mga "
+"mensahe sa lahat ng iba pang mga kasapi \n"
 "na ginagamit ang palaugnayang \"!pangalan ng pangkat\".\n"
 "\n"
 "Tumingin-tingin ng mga pangkat, o maghanap ng mga pangkat sa pamamagitan ng "
 "kanilang pangalan, kinalalagyan o paksa.\n"
-"Paghiwa-hiwalayin ang mga kataga sa pamamagitan ng mga puwang; dapat silang "
-"may tatlong mga panitik o mahigit pa."
+"Paghiwa-hiwalayin ang mga kataga sa pamamagitan ng mga puwang; dapat na "
+"mayroon sila ng tatlong mga panitik o mahigit pa."
 
 #. TRANS: Link to create a new group on the group list page.
 msgid "Create a new group"
@@ -118,18 +141,6 @@ msgstr "Hanapin sa mga pangkat"
 msgid "No groups starting with %s."
 msgstr "Walang mga pangkat na nagsisimula sa %s."
 
-#. TRANS: Help text for searching group directory.
-msgid ""
-"* Make sure all words are spelled correctly.\n"
-"* Try different keywords.\n"
-"* Try more general keywords.\n"
-"* Try fewer keywords."
-msgstr ""
-"* Tiyakin na tama ang pagbabanghay ng lahat ng mga salita.\n"
-"* Sumubok ng ibang mga susing-salita.\n"
-"* Sumubok ng mas pangkalahatang mga susing-salita.\n"
-"* Sumubok ng mas kakaunting mga susing-salita.\n"
-
 #. TRANS: Menu item text for user directory.
 msgctxt "MENU"
 msgid "Directory"
@@ -151,6 +162,14 @@ msgstr "Palayaw"
 msgid "Created"
 msgstr "Nalikha na"
 
+#. TRANS: Column header for number of subscriptions.
+msgid "Subscriptions"
+msgstr "Mga pagpapasipi"
+
+#. TRANS: Column header for number of notices.
+msgid "Notices"
+msgstr "Mga pabatid"
+
 #. TRANS: Column header in table for members of a group.
 msgid "Members"
 msgstr "Mga kasapi"
diff --git a/plugins/Directory/locale/uk/LC_MESSAGES/Directory.po b/plugins/Directory/locale/uk/LC_MESSAGES/Directory.po
index 89c4f82256..5f3d0bd8b1 100644
--- a/plugins/Directory/locale/uk/LC_MESSAGES/Directory.po
+++ b/plugins/Directory/locale/uk/LC_MESSAGES/Directory.po
@@ -1,7 +1,8 @@
-# Translation of StatusNet - Directory to Ukrainian (Україн�ька)
+# Translation of StatusNet - Directory to Ukrainian (україн�ька)
 # Exported from translatewiki.net
 #
 # Author: Boogie
+# Author: Dim Grits
 # --
 # This file is distributed under the same license as the StatusNet package.
 #
@@ -9,34 +10,40 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Directory\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:03+0000\n"
-"Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:10+0000\n"
+"Language-Team: Ukrainian <https://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-05-05 11:55:22+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-08-30 09:57:06+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-directory\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
+#. TRANS: Page title for user directory. %d is a page number.
 #, php-format
 msgid "User Directory, page %d"
-msgstr "Каталог кори�тувача, �торінка %d"
+msgstr "Каталог кори�тувачів, �торінка %d"
 
+#. TRANS: Page title for user directory.
 msgid "User directory"
-msgstr "Каталог кори�тувача"
+msgstr "Каталог кори�тувачів"
 
+#. TRANS: Page title for user directory. %s is the applied filter.
 #, php-format
 msgid "User directory - %s"
-msgstr "Каталог кори�тувача — %s"
+msgstr "Каталог кори�тувачів — %s"
 
+#. TRANS: Page title for user directory.
+#. TRANS: %1$s is the applied filter, %2$d is a page number.
 #, php-format
-msgid "User directory - %s, page %d"
-msgstr "Каталог кори�тувача — %s, �торінка %d"
+msgid "User directory - %1$s, page %2$d"
+msgstr "Каталог кори�тувачів — %1$s, �торінка %2$d"
 
+#. TRANS: %%site.name%% is the name of the StatusNet site.
 #, php-format
 msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
@@ -46,26 +53,44 @@ msgstr ""
 "інтере�ами. Відокремлюйте пошукові умови інтервалами; вони повинні "
 "�кладати�ь з 3 або більше знаків."
 
+#. TRANS: Fieldset legend.
 msgid "Search site"
 msgstr "Пошук на �айті"
 
+#. TRANS: Field label for user directory filter.
 #. TRANS: Field label for input of one or more keywords.
 msgid "Keyword(s)"
 msgstr "Ключові �лова"
 
+#. TRANS: Button text.
 #. TRANS: Button text for searching group directory.
 msgctxt "BUTTON"
 msgid "Search"
 msgstr "Пошук"
 
+#. TRANS: Empty list message for user directory.
 #, php-format
 msgid "No users starting with %s"
 msgstr "�емає кори�тувачів, починаючи з %s"
 
+#. TRANS: Empty list message for user directory.
 #. TRANS: Empty list message for searching group directory.
 msgid "No results."
 msgstr "�емає результатів."
 
+#. TRANS: Standard search suggestions shown when a search does not give any results.
+#. TRANS: Help text for searching group directory.
+msgid ""
+"* Make sure all words are spelled correctly.\n"
+"* Try different keywords.\n"
+"* Try more general keywords.\n"
+"* Try fewer keywords."
+msgstr ""
+"* Переконайте��, що в�і �лова напи�ано правильно.\n"
+"* Спробуйте різні ключові �лова.\n"
+"* Спробуйте узагальнити ключові �лова.\n"
+"* Спробуйте зменшити кількі�ть ключових �лів."
+
 #. TRANS: Title for group directory page. %d is a page number.
 #, php-format
 msgid "Group Directory, page %d"
@@ -88,21 +113,20 @@ msgid "Group directory - %1$s, page %2$d"
 msgstr "Каталог �пільноти — %1$s, �торінка %2$d"
 
 #. TRANS: Page instructions.
-#, fuzzy
 msgid ""
 "After you join a group you can send messages to all other members\n"
 "using the syntax \"!groupname\".\n"
 "\n"
-"Browse groups, or search for groups on by their name, location or topic.\n"
+"Browse groups, or search for groups by their name, location or topic.\n"
 "Separate the terms by spaces; they must be three characters or more."
 msgstr ""
-"Пі�л� того, �к ви приєднаєте�� до �пільноти, ви зможете над�илати "
-"повідомленн� до в�іх уча�ників даної �пільноти викори�товуючи �интак�и� «!"
-"spilnota» будь-де в тілі повідомленн�.\n"
+"Пі�л� приєднанн� до групи ви зможете над�илати повідомленн� в�ім уча�никам "
+"даної групи, викори�товуючи �интак�и� \"!groupname\".\n"
 "\n"
-"Огл�ньте або розшукайте інші �пільноти за їхніми назвами, розташуванн�м або "
-"темою. Відокремлюйте пошукові запити пробілами; пошуковий запит має "
-"�тановити щонайменше три �имволи.\n"
+"Огл�дайте або шукайте інші групи за їхніми назвами, розташуванн�м або "
+"тематикою. \n"
+"Відокремлюйте пошукові запити пробілами; пошуковий запит має �тановити "
+"щонайменше три �имволи."
 
 #. TRANS: Link to create a new group on the group list page.
 msgid "Create a new group"
@@ -118,18 +142,6 @@ msgstr "Пошук �пільнот"
 msgid "No groups starting with %s."
 msgstr "�емає �пільнот, що починають�� з %s."
 
-#. TRANS: Help text for searching group directory.
-msgid ""
-"* Make sure all words are spelled correctly.\n"
-"* Try different keywords.\n"
-"* Try more general keywords.\n"
-"* Try fewer keywords."
-msgstr ""
-"* Переконайте��, що в�і �лова напи�ано правильно.\n"
-"* Спробуйте різні ключові �лова.\n"
-"* Спробуйте узагальнити ключові �лова.\n"
-"* Спробуйте зменшити кількі�ть ключових �лів."
-
 #. TRANS: Menu item text for user directory.
 msgctxt "MENU"
 msgid "Directory"
@@ -151,6 +163,14 @@ msgstr "П�евдонім"
 msgid "Created"
 msgstr "Створено"
 
+#. TRANS: Column header for number of subscriptions.
+msgid "Subscriptions"
+msgstr "Підпи�ки"
+
+#. TRANS: Column header for number of notices.
+msgid "Notices"
+msgstr "Допи�и"
+
 #. TRANS: Column header in table for members of a group.
 msgid "Members"
 msgstr "Уча�ники"
diff --git a/plugins/DiskCache/locale/DiskCache.pot b/plugins/DiskCache/locale/DiskCache.pot
index 5195966d22..708785094b 100644
--- a/plugins/DiskCache/locale/DiskCache.pot
+++ b/plugins/DiskCache/locale/DiskCache.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
+"POT-Creation-Date: 2012-06-30 11:07+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"
diff --git a/plugins/DiskCache/locale/be-tarask/LC_MESSAGES/DiskCache.po b/plugins/DiskCache/locale/be-tarask/LC_MESSAGES/DiskCache.po
index 92df4ae5ed..4d0f80be23 100644
--- a/plugins/DiskCache/locale/be-tarask/LC_MESSAGES/DiskCache.po
+++ b/plugins/DiskCache/locale/be-tarask/LC_MESSAGES/DiskCache.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - DiskCache to Belarusian (Taraškievica orthography) (‪Белару�ка� (тарашкевіца)‬)
+# Translation of StatusNet - DiskCache to Belarusian (Taraškievica orthography) (‪белару�ка� (тарашкевіца)‬)
 # Exported from translatewiki.net
 #
 # Author: EugeneZelenko
@@ -9,15 +9,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - DiskCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:03+0000\n"
-"Language-Team: Belarusian (Taraškievica orthography) <http://translatewiki."
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:10+0000\n"
+"Language-Team: Belarusian (Taraškievica orthography) <https://translatewiki."
 "net/wiki/Portal:be-tarask>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-09 18:58:37+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:49:58+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: be-tarask\n"
 "X-Message-Group: #out-statusnet-plugin-diskcache\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/DiskCache/locale/br/LC_MESSAGES/DiskCache.po b/plugins/DiskCache/locale/br/LC_MESSAGES/DiskCache.po
index f25bfa74e0..c06ada061a 100644
--- a/plugins/DiskCache/locale/br/LC_MESSAGES/DiskCache.po
+++ b/plugins/DiskCache/locale/br/LC_MESSAGES/DiskCache.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - DiskCache to Breton (Brezhoneg)
+# Translation of StatusNet - DiskCache to Breton (brezhoneg)
 # Exported from translatewiki.net
 #
 # Author: Fulup
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - DiskCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:03+0000\n"
-"Language-Team: Breton <http://translatewiki.net/wiki/Portal:br>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:10+0000\n"
+"Language-Team: Breton <https://translatewiki.net/wiki/Portal:br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-09 18:58:37+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:49:58+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-diskcache\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
diff --git a/plugins/DiskCache/locale/ca/LC_MESSAGES/DiskCache.po b/plugins/DiskCache/locale/ca/LC_MESSAGES/DiskCache.po
index 336ae217ce..72a468b1cd 100644
--- a/plugins/DiskCache/locale/ca/LC_MESSAGES/DiskCache.po
+++ b/plugins/DiskCache/locale/ca/LC_MESSAGES/DiskCache.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - DiskCache to Catalan (Català)
+# Translation of StatusNet - DiskCache to Catalan (català)
 # Exported from translatewiki.net
 #
 # Author: Toniher
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - DiskCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:03+0000\n"
-"Language-Team: Catalan <http://translatewiki.net/wiki/Portal:ca>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:11+0000\n"
+"Language-Team: Catalan <https://translatewiki.net/wiki/Portal:ca>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-09 18:58:37+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:49:58+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ca\n"
 "X-Message-Group: #out-statusnet-plugin-diskcache\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/DiskCache/locale/de/LC_MESSAGES/DiskCache.po b/plugins/DiskCache/locale/de/LC_MESSAGES/DiskCache.po
index c78d114122..8599e1b1ed 100644
--- a/plugins/DiskCache/locale/de/LC_MESSAGES/DiskCache.po
+++ b/plugins/DiskCache/locale/de/LC_MESSAGES/DiskCache.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - DiskCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:03+0000\n"
-"Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:11+0000\n"
+"Language-Team: German <https://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-09 18:58:37+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:49:58+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-diskcache\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/DiskCache/locale/es/LC_MESSAGES/DiskCache.po b/plugins/DiskCache/locale/es/LC_MESSAGES/DiskCache.po
index 9e424c059d..56f5b57a14 100644
--- a/plugins/DiskCache/locale/es/LC_MESSAGES/DiskCache.po
+++ b/plugins/DiskCache/locale/es/LC_MESSAGES/DiskCache.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - DiskCache to Spanish (Español)
+# Translation of StatusNet - DiskCache to Spanish (español)
 # Exported from translatewiki.net
 #
 # Author: Translationista
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - DiskCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:03+0000\n"
-"Language-Team: Spanish <http://translatewiki.net/wiki/Portal:es>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:11+0000\n"
+"Language-Team: Spanish <https://translatewiki.net/wiki/Portal:es>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-09 18:58:37+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:49:58+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-plugin-diskcache\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/DiskCache/locale/eu/LC_MESSAGES/DiskCache.po b/plugins/DiskCache/locale/eu/LC_MESSAGES/DiskCache.po
new file mode 100644
index 0000000000..b7068bbe64
--- /dev/null
+++ b/plugins/DiskCache/locale/eu/LC_MESSAGES/DiskCache.po
@@ -0,0 +1,23 @@
+# Translation of StatusNet - DiskCache to Basque (euskara)
+# Exported from translatewiki.net
+#
+# Author: Artsuaga
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - DiskCache\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:11+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:49:58+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin description.
+msgid "Plugin to implement cache interface with disk files."
+msgstr "Disko fitxategiekin katxe intefazea ezartzeko plugina."
diff --git a/plugins/DiskCache/locale/fi/LC_MESSAGES/DiskCache.po b/plugins/DiskCache/locale/fi/LC_MESSAGES/DiskCache.po
index 061f946d6c..688b4d7d39 100644
--- a/plugins/DiskCache/locale/fi/LC_MESSAGES/DiskCache.po
+++ b/plugins/DiskCache/locale/fi/LC_MESSAGES/DiskCache.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - DiskCache to Finnish (Suomi)
+# Translation of StatusNet - DiskCache to Finnish (suomi)
 # Exported from translatewiki.net
 #
 # Author: Nike
@@ -10,14 +10,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - DiskCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:04+0000\n"
-"Language-Team: Finnish <http://translatewiki.net/wiki/Portal:fi>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:11+0000\n"
+"Language-Team: Finnish <https://translatewiki.net/wiki/Portal:fi>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-09 18:58:37+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:49:58+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: fi\n"
 "X-Message-Group: #out-statusnet-plugin-diskcache\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/DiskCache/locale/fr/LC_MESSAGES/DiskCache.po b/plugins/DiskCache/locale/fr/LC_MESSAGES/DiskCache.po
index 730b203388..0da5d912a4 100644
--- a/plugins/DiskCache/locale/fr/LC_MESSAGES/DiskCache.po
+++ b/plugins/DiskCache/locale/fr/LC_MESSAGES/DiskCache.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - DiskCache to French (Français)
+# Translation of StatusNet - DiskCache to French (français)
 # Exported from translatewiki.net
 #
 # Author: Peter17
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - DiskCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:04+0000\n"
-"Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:11+0000\n"
+"Language-Team: French <https://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-09 18:58:37+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:49:58+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-diskcache\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
diff --git a/plugins/DiskCache/locale/gl/LC_MESSAGES/DiskCache.po b/plugins/DiskCache/locale/gl/LC_MESSAGES/DiskCache.po
new file mode 100644
index 0000000000..d97c95ad65
--- /dev/null
+++ b/plugins/DiskCache/locale/gl/LC_MESSAGES/DiskCache.po
@@ -0,0 +1,28 @@
+# Translation of StatusNet - DiskCache to Galician (galego)
+# Exported from translatewiki.net
+#
+# Author: Toliño
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - DiskCache\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:11+0000\n"
+"Language-Team: Galician <https://translatewiki.net/wiki/Portal:gl>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:49:58+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: gl\n"
+"X-Message-Group: #out-statusnet-plugin-diskcache\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin description.
+msgid "Plugin to implement cache interface with disk files."
+msgstr ""
+"Complemento para executar a interface de memoria caché con ficheiros do "
+"disco."
diff --git a/plugins/DiskCache/locale/he/LC_MESSAGES/DiskCache.po b/plugins/DiskCache/locale/he/LC_MESSAGES/DiskCache.po
index a7467adb36..c305d39952 100644
--- a/plugins/DiskCache/locale/he/LC_MESSAGES/DiskCache.po
+++ b/plugins/DiskCache/locale/he/LC_MESSAGES/DiskCache.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - DiskCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:04+0000\n"
-"Language-Team: Hebrew <http://translatewiki.net/wiki/Portal:he>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:11+0000\n"
+"Language-Team: Hebrew <https://translatewiki.net/wiki/Portal:he>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-09 18:58:37+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:49:58+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: he\n"
 "X-Message-Group: #out-statusnet-plugin-diskcache\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/DiskCache/locale/ia/LC_MESSAGES/DiskCache.po b/plugins/DiskCache/locale/ia/LC_MESSAGES/DiskCache.po
index da40d94cf2..9dace72c54 100644
--- a/plugins/DiskCache/locale/ia/LC_MESSAGES/DiskCache.po
+++ b/plugins/DiskCache/locale/ia/LC_MESSAGES/DiskCache.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - DiskCache to Interlingua (Interlingua)
+# Translation of StatusNet - DiskCache to Interlingua (interlingua)
 # Exported from translatewiki.net
 #
 # Author: McDutchie
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - DiskCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:04+0000\n"
-"Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:11+0000\n"
+"Language-Team: Interlingua <https://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-09 18:58:37+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:49:58+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-diskcache\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/DiskCache/locale/id/LC_MESSAGES/DiskCache.po b/plugins/DiskCache/locale/id/LC_MESSAGES/DiskCache.po
index 6b484cc88d..0cb17d3b50 100644
--- a/plugins/DiskCache/locale/id/LC_MESSAGES/DiskCache.po
+++ b/plugins/DiskCache/locale/id/LC_MESSAGES/DiskCache.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - DiskCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:04+0000\n"
-"Language-Team: Indonesian <http://translatewiki.net/wiki/Portal:id>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:11+0000\n"
+"Language-Team: Indonesian <https://translatewiki.net/wiki/Portal:id>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-09 18:58:37+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:49:58+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: id\n"
 "X-Message-Group: #out-statusnet-plugin-diskcache\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
diff --git a/plugins/DiskCache/locale/it/LC_MESSAGES/DiskCache.po b/plugins/DiskCache/locale/it/LC_MESSAGES/DiskCache.po
new file mode 100644
index 0000000000..f2e20c48dc
--- /dev/null
+++ b/plugins/DiskCache/locale/it/LC_MESSAGES/DiskCache.po
@@ -0,0 +1,23 @@
+# Translation of StatusNet - DiskCache to Italian (italiano)
+# Exported from translatewiki.net
+#
+# Author: Ximo17
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - DiskCache\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:11+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:49:58+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin description.
+msgid "Plugin to implement cache interface with disk files."
+msgstr "Plugin per implementare l'interfaccia della cache con i file su disco."
diff --git a/plugins/DiskCache/locale/mk/LC_MESSAGES/DiskCache.po b/plugins/DiskCache/locale/mk/LC_MESSAGES/DiskCache.po
index 5e2ec7a7c9..ab6339865c 100644
--- a/plugins/DiskCache/locale/mk/LC_MESSAGES/DiskCache.po
+++ b/plugins/DiskCache/locale/mk/LC_MESSAGES/DiskCache.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - DiskCache to Macedonian (Македон�ки)
+# Translation of StatusNet - DiskCache to Macedonian (македон�ки)
 # Exported from translatewiki.net
 #
 # Author: Bjankuloski06
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - DiskCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:04+0000\n"
-"Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:12+0000\n"
+"Language-Team: Macedonian <https://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-09 18:58:37+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:49:58+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-diskcache\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
diff --git a/plugins/DiskCache/locale/nb/LC_MESSAGES/DiskCache.po b/plugins/DiskCache/locale/nb/LC_MESSAGES/DiskCache.po
index 39a3daabcf..a13cc5a001 100644
--- a/plugins/DiskCache/locale/nb/LC_MESSAGES/DiskCache.po
+++ b/plugins/DiskCache/locale/nb/LC_MESSAGES/DiskCache.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - DiskCache to Norwegian (bokmål)‬ (‪Norsk (bokmål)‬)
+# Translation of StatusNet - DiskCache to Norwegian Bokmål (‪norsk (bokmål)‬)
 # Exported from translatewiki.net
 #
 # Author: Nghtwlkr
@@ -9,15 +9,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - DiskCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:04+0000\n"
-"Language-Team: Norwegian (bokmål)‬ <http://translatewiki.net/wiki/Portal:no>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:12+0000\n"
+"Language-Team: Norwegian Bokmål <https://translatewiki.net/wiki/Portal:nb>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-09 18:58:37+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
-"X-Language-Code: no\n"
+"X-POT-Import-Date: 2011-06-05 21:49:58+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: nb\n"
 "X-Message-Group: #out-statusnet-plugin-diskcache\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
diff --git a/plugins/DiskCache/locale/nl/LC_MESSAGES/DiskCache.po b/plugins/DiskCache/locale/nl/LC_MESSAGES/DiskCache.po
index 368a837b9d..9e34fb7e77 100644
--- a/plugins/DiskCache/locale/nl/LC_MESSAGES/DiskCache.po
+++ b/plugins/DiskCache/locale/nl/LC_MESSAGES/DiskCache.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - DiskCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:04+0000\n"
-"Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:12+0000\n"
+"Language-Team: Dutch <https://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-09 18:58:37+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:49:58+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-diskcache\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/DiskCache/locale/pt/LC_MESSAGES/DiskCache.po b/plugins/DiskCache/locale/pt/LC_MESSAGES/DiskCache.po
index e18d94f597..e9a49de3a7 100644
--- a/plugins/DiskCache/locale/pt/LC_MESSAGES/DiskCache.po
+++ b/plugins/DiskCache/locale/pt/LC_MESSAGES/DiskCache.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - DiskCache to Portuguese (Português)
+# Translation of StatusNet - DiskCache to Portuguese (português)
 # Exported from translatewiki.net
 #
 # Author: Hamilton Abreu
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - DiskCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:04+0000\n"
-"Language-Team: Portuguese <http://translatewiki.net/wiki/Portal:pt>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:12+0000\n"
+"Language-Team: Portuguese <https://translatewiki.net/wiki/Portal:pt>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-09 18:58:37+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:49:58+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: pt\n"
 "X-Message-Group: #out-statusnet-plugin-diskcache\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/DiskCache/locale/pt_BR/LC_MESSAGES/DiskCache.po b/plugins/DiskCache/locale/pt_BR/LC_MESSAGES/DiskCache.po
index 8acc6b28d6..f491115213 100644
--- a/plugins/DiskCache/locale/pt_BR/LC_MESSAGES/DiskCache.po
+++ b/plugins/DiskCache/locale/pt_BR/LC_MESSAGES/DiskCache.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - DiskCache to Brazilian Portuguese (Português do Brasil)
+# Translation of StatusNet - DiskCache to Brazilian Portuguese (português do Brasil)
 # Exported from translatewiki.net
 #
 # Author: Giro720
@@ -9,15 +9,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - DiskCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:04+0000\n"
-"Language-Team: Brazilian Portuguese <http://translatewiki.net/wiki/Portal:pt-"
-"br>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:12+0000\n"
+"Language-Team: Brazilian Portuguese <https://translatewiki.net/wiki/Portal:"
+"pt-br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-09 18:58:37+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:49:58+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: pt-br\n"
 "X-Message-Group: #out-statusnet-plugin-diskcache\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
diff --git a/plugins/DiskCache/locale/ru/LC_MESSAGES/DiskCache.po b/plugins/DiskCache/locale/ru/LC_MESSAGES/DiskCache.po
index 843bf0bc8d..1eda4349fa 100644
--- a/plugins/DiskCache/locale/ru/LC_MESSAGES/DiskCache.po
+++ b/plugins/DiskCache/locale/ru/LC_MESSAGES/DiskCache.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - DiskCache to Russian (Ру��кий)
+# Translation of StatusNet - DiskCache to Russian (ру��кий)
 # Exported from translatewiki.net
 #
 # Author: �лек�андр Сигачёв
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - DiskCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:04+0000\n"
-"Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:12+0000\n"
+"Language-Team: Russian <https://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-09 18:58:37+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:49:58+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-diskcache\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
diff --git a/plugins/DiskCache/locale/sv/LC_MESSAGES/DiskCache.po b/plugins/DiskCache/locale/sv/LC_MESSAGES/DiskCache.po
new file mode 100644
index 0000000000..fcdabe63c0
--- /dev/null
+++ b/plugins/DiskCache/locale/sv/LC_MESSAGES/DiskCache.po
@@ -0,0 +1,26 @@
+# Translation of StatusNet - DiskCache to Swedish (svenska)
+# Exported from translatewiki.net
+#
+# Author: Ainali
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - DiskCache\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:12+0000\n"
+"Language-Team: Swedish <https://translatewiki.net/wiki/Portal:sv>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:49:58+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: sv\n"
+"X-Message-Group: #out-statusnet-plugin-diskcache\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin description.
+msgid "Plugin to implement cache interface with disk files."
+msgstr "Plugin för att implementera cache gränssnitt med diskfiler."
diff --git a/plugins/DiskCache/locale/tl/LC_MESSAGES/DiskCache.po b/plugins/DiskCache/locale/tl/LC_MESSAGES/DiskCache.po
index df485de5eb..5cb3e2ff01 100644
--- a/plugins/DiskCache/locale/tl/LC_MESSAGES/DiskCache.po
+++ b/plugins/DiskCache/locale/tl/LC_MESSAGES/DiskCache.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - DiskCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:05+0000\n"
-"Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:12+0000\n"
+"Language-Team: Tagalog <https://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-09 18:58:37+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:49:58+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-diskcache\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/DiskCache/locale/uk/LC_MESSAGES/DiskCache.po b/plugins/DiskCache/locale/uk/LC_MESSAGES/DiskCache.po
index 0d55757522..c672dddf04 100644
--- a/plugins/DiskCache/locale/uk/LC_MESSAGES/DiskCache.po
+++ b/plugins/DiskCache/locale/uk/LC_MESSAGES/DiskCache.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - DiskCache to Ukrainian (Україн�ька)
+# Translation of StatusNet - DiskCache to Ukrainian (україн�ька)
 # Exported from translatewiki.net
 #
 # Author: Boogie
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - DiskCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:05+0000\n"
-"Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:12+0000\n"
+"Language-Team: Ukrainian <https://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-09 18:58:37+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:49:58+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-diskcache\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
diff --git a/plugins/DiskCache/locale/zh_CN/LC_MESSAGES/DiskCache.po b/plugins/DiskCache/locale/zh_CN/LC_MESSAGES/DiskCache.po
index 85db6c7bbe..ed064047ef 100644
--- a/plugins/DiskCache/locale/zh_CN/LC_MESSAGES/DiskCache.po
+++ b/plugins/DiskCache/locale/zh_CN/LC_MESSAGES/DiskCache.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - DiskCache to Simplified Chinese (‪中文(简体)‬)
+# Translation of StatusNet - DiskCache to Simplified Chinese (‪中文（简体）‬)
 # Exported from translatewiki.net
 #
 # Author: ZhengYiFeng
@@ -9,15 +9,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - DiskCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:05+0000\n"
-"Language-Team: Simplified Chinese <http://translatewiki.net/wiki/Portal:zh-"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:12+0000\n"
+"Language-Team: Simplified Chinese <https://translatewiki.net/wiki/Portal:zh-"
 "hans>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-09 18:58:37+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:49:58+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: #out-statusnet-plugin-diskcache\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
diff --git a/plugins/Disqus/locale/Disqus.pot b/plugins/Disqus/locale/Disqus.pot
index 4e54416415..fa9bb2c0fc 100644
--- a/plugins/Disqus/locale/Disqus.pot
+++ b/plugins/Disqus/locale/Disqus.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
+"POT-Creation-Date: 2012-06-30 11:07+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"
diff --git a/plugins/Disqus/locale/be-tarask/LC_MESSAGES/Disqus.po b/plugins/Disqus/locale/be-tarask/LC_MESSAGES/Disqus.po
index f56870b411..27d06bf1eb 100644
--- a/plugins/Disqus/locale/be-tarask/LC_MESSAGES/Disqus.po
+++ b/plugins/Disqus/locale/be-tarask/LC_MESSAGES/Disqus.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Disqus to Belarusian (Taraškievica orthography) (‪Белару�ка� (тарашкевіца)‬)
+# Translation of StatusNet - Disqus to Belarusian (Taraškievica orthography) (‪белару�ка� (тарашкевіца)‬)
 # Exported from translatewiki.net
 #
 # Author: EugeneZelenko
@@ -10,15 +10,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Disqus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:05+0000\n"
-"Language-Team: Belarusian (Taraškievica orthography) <http://translatewiki."
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:12+0000\n"
+"Language-Team: Belarusian (Taraškievica orthography) <https://translatewiki."
 "net/wiki/Portal:be-tarask>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:06:09+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:49:59+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: be-tarask\n"
 "X-Message-Group: #out-statusnet-plugin-disqus\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/Disqus/locale/br/LC_MESSAGES/Disqus.po b/plugins/Disqus/locale/br/LC_MESSAGES/Disqus.po
index af88686be8..82e2e1df25 100644
--- a/plugins/Disqus/locale/br/LC_MESSAGES/Disqus.po
+++ b/plugins/Disqus/locale/br/LC_MESSAGES/Disqus.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Disqus to Breton (Brezhoneg)
+# Translation of StatusNet - Disqus to Breton (brezhoneg)
 # Exported from translatewiki.net
 #
 # Author: Y-M D
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Disqus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:05+0000\n"
-"Language-Team: Breton <http://translatewiki.net/wiki/Portal:br>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:13+0000\n"
+"Language-Team: Breton <https://translatewiki.net/wiki/Portal:br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:06:09+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:49:59+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-disqus\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
diff --git a/plugins/Disqus/locale/ca/LC_MESSAGES/Disqus.po b/plugins/Disqus/locale/ca/LC_MESSAGES/Disqus.po
new file mode 100644
index 0000000000..a799e01d22
--- /dev/null
+++ b/plugins/Disqus/locale/ca/LC_MESSAGES/Disqus.po
@@ -0,0 +1,44 @@
+# Translation of StatusNet - Disqus to Catalan (català)
+# Exported from translatewiki.net
+#
+# Author: Toniher
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Disqus\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:13+0000\n"
+"Language-Team: Catalan <https://translatewiki.net/wiki/Portal:ca>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:49:59+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: ca\n"
+"X-Message-Group: #out-statusnet-plugin-disqus\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: User notification that JavaScript is required for Disqus comment display.
+#. TRANS: This message contains Markdown links in the form [description](link).
+#, php-format
+msgid ""
+"Please enable JavaScript to view the [comments powered by Disqus](http://"
+"disqus.com/?ref_noscript=%s)."
+msgstr ""
+
+#. TRANS: This message is followed by a Disqus logo. Alt text is "Disqus".
+msgid "Comments powered by "
+msgstr "Comentaris gràcies a "
+
+#. TRANS: Plugin supplied feature for Disqus comments to notices.
+msgid "Comments"
+msgstr "Comentaris"
+
+#. TRANS: Plugin description.
+msgid ""
+"Use <a href=\"http://disqus.com/\">Disqus</a> to add commenting to notice "
+"pages."
+msgstr ""
diff --git a/plugins/Disqus/locale/de/LC_MESSAGES/Disqus.po b/plugins/Disqus/locale/de/LC_MESSAGES/Disqus.po
index c439254cd3..afcb7821b4 100644
--- a/plugins/Disqus/locale/de/LC_MESSAGES/Disqus.po
+++ b/plugins/Disqus/locale/de/LC_MESSAGES/Disqus.po
@@ -11,14 +11,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Disqus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:05+0000\n"
-"Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:13+0000\n"
+"Language-Team: German <https://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:06:09+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:49:59+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-disqus\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/Disqus/locale/es/LC_MESSAGES/Disqus.po b/plugins/Disqus/locale/es/LC_MESSAGES/Disqus.po
index e0e722eaa9..14fe80df99 100644
--- a/plugins/Disqus/locale/es/LC_MESSAGES/Disqus.po
+++ b/plugins/Disqus/locale/es/LC_MESSAGES/Disqus.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Disqus to Spanish (Español)
+# Translation of StatusNet - Disqus to Spanish (español)
 # Exported from translatewiki.net
 #
 # Author: Translationista
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Disqus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:05+0000\n"
-"Language-Team: Spanish <http://translatewiki.net/wiki/Portal:es>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:13+0000\n"
+"Language-Team: Spanish <https://translatewiki.net/wiki/Portal:es>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:06:09+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:49:59+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-plugin-disqus\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/Disqus/locale/eu/LC_MESSAGES/Disqus.po b/plugins/Disqus/locale/eu/LC_MESSAGES/Disqus.po
new file mode 100644
index 0000000000..4dc79e5eab
--- /dev/null
+++ b/plugins/Disqus/locale/eu/LC_MESSAGES/Disqus.po
@@ -0,0 +1,45 @@
+# Translation of StatusNet - Disqus to Basque (euskara)
+# Exported from translatewiki.net
+#
+# Author: Artsuaga
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Disqus\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:13+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:49:59+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: User notification that JavaScript is required for Disqus comment display.
+#. TRANS: This message contains Markdown links in the form [description](link).
+#, php-format
+msgid ""
+"Please enable JavaScript to view the [comments powered by Disqus](http://"
+"disqus.com/?ref_noscript=%s)."
+msgstr ""
+"[Disqus bidez egindako](http://disqus.com/?ref_noscript=%s) iruzkinak "
+"ikusteko gaitu JavaScript mesedez."
+
+#. TRANS: This message is followed by a Disqus logo. Alt text is "Disqus".
+msgid "Comments powered by "
+msgstr "Iruzkin hauetarako erabili da "
+
+#. TRANS: Plugin supplied feature for Disqus comments to notices.
+msgid "Comments"
+msgstr "Iruzkinak"
+
+#. TRANS: Plugin description.
+msgid ""
+"Use <a href=\"http://disqus.com/\">Disqus</a> to add commenting to notice "
+"pages."
+msgstr ""
+"Erabili <a href=\"http://disqus.com/\">Disqus</a> oharren orriei iruzkinak "
+"gehitzeko."
diff --git a/plugins/Disqus/locale/fr/LC_MESSAGES/Disqus.po b/plugins/Disqus/locale/fr/LC_MESSAGES/Disqus.po
index 142328007d..8b1fe03444 100644
--- a/plugins/Disqus/locale/fr/LC_MESSAGES/Disqus.po
+++ b/plugins/Disqus/locale/fr/LC_MESSAGES/Disqus.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Disqus to French (Français)
+# Translation of StatusNet - Disqus to French (français)
 # Exported from translatewiki.net
 #
 # Author: Peter17
@@ -10,14 +10,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Disqus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:06+0000\n"
-"Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:13+0000\n"
+"Language-Team: French <https://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:06:09+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:49:59+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-disqus\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
diff --git a/plugins/Disqus/locale/gl/LC_MESSAGES/Disqus.po b/plugins/Disqus/locale/gl/LC_MESSAGES/Disqus.po
index 1252b0997e..a77a30f5ff 100644
--- a/plugins/Disqus/locale/gl/LC_MESSAGES/Disqus.po
+++ b/plugins/Disqus/locale/gl/LC_MESSAGES/Disqus.po
@@ -1,5 +1,5 @@
-# Translation of StatusNet - Disqus to Galician (Galego)
-# Expored from translatewiki.net
+# Translation of StatusNet - Disqus to Galician (galego)
+# Exported from translatewiki.net
 #
 # Author: Toliño
 # --
@@ -9,39 +9,40 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Disqus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 23:32+0000\n"
-"PO-Revision-Date: 2011-01-14 23:35:47+0000\n"
-"Language-Team: Galician <http://translatewiki.net/wiki/Portal:gl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:13+0000\n"
+"Language-Team: Galician <https://translatewiki.net/wiki/Portal:gl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-14 13:21:12+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80343); Translate extension (2010-09-17)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:49:59+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: gl\n"
 "X-Message-Group: #out-statusnet-plugin-disqus\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANS: User notification that JavaScript is required for Disqus comment display.
-#: DisqusPlugin.php:143
+#. TRANS: This message contains Markdown links in the form [description](link).
 #, php-format
 msgid ""
 "Please enable JavaScript to view the [comments powered by Disqus](http://"
 "disqus.com/?ref_noscript=%s)."
 msgstr ""
+"Active o JavaScript para ollar os [comentarios mediante Disqus](http://"
+"disqus.com/?ref_noscript=%s)."
 
 #. TRANS: This message is followed by a Disqus logo. Alt text is "Disqus".
-#: DisqusPlugin.php:151
 msgid "Comments powered by "
-msgstr ""
+msgstr "Comentarios proporcionados por "
 
 #. TRANS: Plugin supplied feature for Disqus comments to notices.
-#: DisqusPlugin.php:204
 msgid "Comments"
 msgstr "Comentarios"
 
 #. TRANS: Plugin description.
-#: DisqusPlugin.php:245
 msgid ""
 "Use <a href=\"http://disqus.com/\">Disqus</a> to add commenting to notice "
 "pages."
 msgstr ""
+"Usa <a href=\"http://disqus.com/\">Disqus</a> para engadir comentarios ás "
+"páxinas das notas."
diff --git a/plugins/Disqus/locale/ia/LC_MESSAGES/Disqus.po b/plugins/Disqus/locale/ia/LC_MESSAGES/Disqus.po
index f07c355de7..675d7c8dda 100644
--- a/plugins/Disqus/locale/ia/LC_MESSAGES/Disqus.po
+++ b/plugins/Disqus/locale/ia/LC_MESSAGES/Disqus.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Disqus to Interlingua (Interlingua)
+# Translation of StatusNet - Disqus to Interlingua (interlingua)
 # Exported from translatewiki.net
 #
 # Author: McDutchie
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Disqus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:06+0000\n"
-"Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:13+0000\n"
+"Language-Team: Interlingua <https://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:06:09+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:49:59+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-disqus\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/Disqus/locale/it/LC_MESSAGES/Disqus.po b/plugins/Disqus/locale/it/LC_MESSAGES/Disqus.po
new file mode 100644
index 0000000000..630d75ebfd
--- /dev/null
+++ b/plugins/Disqus/locale/it/LC_MESSAGES/Disqus.po
@@ -0,0 +1,46 @@
+# Translation of StatusNet - Disqus to Italian (italiano)
+# Exported from translatewiki.net
+#
+# Author: Od1n
+# Author: Ximo17
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Disqus\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:13+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:49:59+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: User notification that JavaScript is required for Disqus comment display.
+#. TRANS: This message contains Markdown links in the form [description](link).
+#, php-format
+msgid ""
+"Please enable JavaScript to view the [comments powered by Disqus](http://"
+"disqus.com/?ref_noscript=%s)."
+msgstr ""
+"Si prega di abilitare JavaScript per visualizzare i [commenti di Disqus] "
+"(http://disqus.com/?ref_noscript=%s)."
+
+#. TRANS: This message is followed by a Disqus logo. Alt text is "Disqus".
+msgid "Comments powered by "
+msgstr "Commenti creati da "
+
+#. TRANS: Plugin supplied feature for Disqus comments to notices.
+msgid "Comments"
+msgstr "Commenti"
+
+#. TRANS: Plugin description.
+msgid ""
+"Use <a href=\"http://disqus.com/\">Disqus</a> to add commenting to notice "
+"pages."
+msgstr ""
+"Utilizza <a href=\"http://disqus.com/\">Disqus</a> per aggiungere commenti "
+"alle pagine delle notizie."
diff --git a/plugins/Disqus/locale/mk/LC_MESSAGES/Disqus.po b/plugins/Disqus/locale/mk/LC_MESSAGES/Disqus.po
index 53db544c25..c89a0f7e64 100644
--- a/plugins/Disqus/locale/mk/LC_MESSAGES/Disqus.po
+++ b/plugins/Disqus/locale/mk/LC_MESSAGES/Disqus.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Disqus to Macedonian (Македон�ки)
+# Translation of StatusNet - Disqus to Macedonian (македон�ки)
 # Exported from translatewiki.net
 #
 # Author: Bjankuloski06
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Disqus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:06+0000\n"
-"Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:13+0000\n"
+"Language-Team: Macedonian <https://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:06:09+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:49:59+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-disqus\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
diff --git a/plugins/Disqus/locale/nb/LC_MESSAGES/Disqus.po b/plugins/Disqus/locale/nb/LC_MESSAGES/Disqus.po
index cbd92c53fc..e38646ecc6 100644
--- a/plugins/Disqus/locale/nb/LC_MESSAGES/Disqus.po
+++ b/plugins/Disqus/locale/nb/LC_MESSAGES/Disqus.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Disqus to Norwegian (bokmål)‬ (‪Norsk (bokmål)‬)
+# Translation of StatusNet - Disqus to Norwegian Bokmål (‪norsk (bokmål)‬)
 # Exported from translatewiki.net
 #
 # Author: Nghtwlkr
@@ -9,15 +9,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Disqus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:06+0000\n"
-"Language-Team: Norwegian (bokmål)‬ <http://translatewiki.net/wiki/Portal:no>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:13+0000\n"
+"Language-Team: Norwegian Bokmål <https://translatewiki.net/wiki/Portal:nb>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:06:09+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
-"X-Language-Code: no\n"
+"X-POT-Import-Date: 2011-06-05 21:49:59+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: nb\n"
 "X-Message-Group: #out-statusnet-plugin-disqus\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
diff --git a/plugins/Disqus/locale/nl/LC_MESSAGES/Disqus.po b/plugins/Disqus/locale/nl/LC_MESSAGES/Disqus.po
index 59d94d85d6..22c161f582 100644
--- a/plugins/Disqus/locale/nl/LC_MESSAGES/Disqus.po
+++ b/plugins/Disqus/locale/nl/LC_MESSAGES/Disqus.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Disqus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:06+0000\n"
-"Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:14+0000\n"
+"Language-Team: Dutch <https://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:06:09+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:49:59+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-disqus\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/Disqus/locale/pl/LC_MESSAGES/Disqus.po b/plugins/Disqus/locale/pl/LC_MESSAGES/Disqus.po
new file mode 100644
index 0000000000..42f393b3a5
--- /dev/null
+++ b/plugins/Disqus/locale/pl/LC_MESSAGES/Disqus.po
@@ -0,0 +1,46 @@
+# Translation of StatusNet - Disqus to Polish (polski)
+# Exported from translatewiki.net
+#
+# Author: BeginaFelicysym
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Disqus\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:14+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:49:59+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=3; plural=(n == 1) ? 0 : ( (n%10 >= 2 && n%10 <= 4 && "
+"(n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
+
+#. TRANS: User notification that JavaScript is required for Disqus comment display.
+#. TRANS: This message contains Markdown links in the form [description](link).
+#, php-format
+msgid ""
+"Please enable JavaScript to view the [comments powered by Disqus](http://"
+"disqus.com/?ref_noscript=%s)."
+msgstr ""
+"Włącz JavaScript, aby wyświetlić [komentarze zasilane przez Disqus] (http://"
+"disqus.com/?ref_noscript= %s )."
+
+#. TRANS: This message is followed by a Disqus logo. Alt text is "Disqus".
+msgid "Comments powered by "
+msgstr "Komentarze zasilane przez "
+
+#. TRANS: Plugin supplied feature for Disqus comments to notices.
+msgid "Comments"
+msgstr "Komentarze"
+
+#. TRANS: Plugin description.
+msgid ""
+"Use <a href=\"http://disqus.com/\">Disqus</a> to add commenting to notice "
+"pages."
+msgstr ""
+"Użyj <a href=\"http://disqus.com/\">Disqus</a>  by dodawać komentarze do "
+"stron ogłoszeń."
diff --git a/plugins/Disqus/locale/pt/LC_MESSAGES/Disqus.po b/plugins/Disqus/locale/pt/LC_MESSAGES/Disqus.po
index 8461e3f6df..29c3f31c38 100644
--- a/plugins/Disqus/locale/pt/LC_MESSAGES/Disqus.po
+++ b/plugins/Disqus/locale/pt/LC_MESSAGES/Disqus.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Disqus to Portuguese (Português)
+# Translation of StatusNet - Disqus to Portuguese (português)
 # Exported from translatewiki.net
 #
 # Author: SandroHc
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Disqus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:06+0000\n"
-"Language-Team: Portuguese <http://translatewiki.net/wiki/Portal:pt>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:14+0000\n"
+"Language-Team: Portuguese <https://translatewiki.net/wiki/Portal:pt>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:06:09+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:49:59+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: pt\n"
 "X-Message-Group: #out-statusnet-plugin-disqus\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/Disqus/locale/ru/LC_MESSAGES/Disqus.po b/plugins/Disqus/locale/ru/LC_MESSAGES/Disqus.po
index 18f9fb4ea3..75e8a8b8d8 100644
--- a/plugins/Disqus/locale/ru/LC_MESSAGES/Disqus.po
+++ b/plugins/Disqus/locale/ru/LC_MESSAGES/Disqus.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Disqus to Russian (Ру��кий)
+# Translation of StatusNet - Disqus to Russian (ру��кий)
 # Exported from translatewiki.net
 #
 # Author: MaxSem
@@ -10,14 +10,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Disqus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:06+0000\n"
-"Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:14+0000\n"
+"Language-Team: Russian <https://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:06:09+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:49:59+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-disqus\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
diff --git a/plugins/Disqus/locale/tl/LC_MESSAGES/Disqus.po b/plugins/Disqus/locale/tl/LC_MESSAGES/Disqus.po
index 9fb4246afc..e8e73af5c8 100644
--- a/plugins/Disqus/locale/tl/LC_MESSAGES/Disqus.po
+++ b/plugins/Disqus/locale/tl/LC_MESSAGES/Disqus.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Disqus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:06+0000\n"
-"Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:14+0000\n"
+"Language-Team: Tagalog <https://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:06:09+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:49:59+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-disqus\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/Disqus/locale/uk/LC_MESSAGES/Disqus.po b/plugins/Disqus/locale/uk/LC_MESSAGES/Disqus.po
index ee134865e7..da719de916 100644
--- a/plugins/Disqus/locale/uk/LC_MESSAGES/Disqus.po
+++ b/plugins/Disqus/locale/uk/LC_MESSAGES/Disqus.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Disqus to Ukrainian (Україн�ька)
+# Translation of StatusNet - Disqus to Ukrainian (україн�ька)
 # Exported from translatewiki.net
 #
 # Author: Boogie
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Disqus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:06+0000\n"
-"Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:14+0000\n"
+"Language-Team: Ukrainian <https://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:06:09+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:49:59+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-disqus\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
diff --git a/plugins/Disqus/locale/zh_CN/LC_MESSAGES/Disqus.po b/plugins/Disqus/locale/zh_CN/LC_MESSAGES/Disqus.po
index c9d5a22caf..6c17936596 100644
--- a/plugins/Disqus/locale/zh_CN/LC_MESSAGES/Disqus.po
+++ b/plugins/Disqus/locale/zh_CN/LC_MESSAGES/Disqus.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Disqus to Simplified Chinese (‪中文(简体)‬)
+# Translation of StatusNet - Disqus to Simplified Chinese (‪中文（简体）‬)
 # Exported from translatewiki.net
 #
 # Author: ZhengYiFeng
@@ -9,15 +9,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Disqus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:06+0000\n"
-"Language-Team: Simplified Chinese <http://translatewiki.net/wiki/Portal:zh-"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:14+0000\n"
+"Language-Team: Simplified Chinese <https://translatewiki.net/wiki/Portal:zh-"
 "hans>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:06:09+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:49:59+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: #out-statusnet-plugin-disqus\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
diff --git a/plugins/DomainStatusNetwork/DomainStatusNetworkPlugin.php b/plugins/DomainStatusNetwork/DomainStatusNetworkPlugin.php
index 9390a6e083..10208cfbe7 100644
--- a/plugins/DomainStatusNetwork/DomainStatusNetworkPlugin.php
+++ b/plugins/DomainStatusNetwork/DomainStatusNetworkPlugin.php
@@ -97,8 +97,15 @@ class DomainStatusNetworkPlugin extends Plugin
 
         switch ($cls)
         {
+        case 'GlobalregisterAction':
+        case 'GloballoginAction':
+        case 'GlobalrecoverAction':
+            include_once $dir . '/actions/' . strtolower(mb_substr($cls, 0, -6)) . '.php';
+            return false;
         case 'DomainStatusNetworkInstaller':
-            include_once $dir . '/' . strtolower($cls) . '.php';
+        case 'GlobalApiAction':
+        case 'FreeEmail':
+            include_once $dir . '/lib/' . strtolower($cls) . '.php';
             return false;
         default:
             return true;
@@ -138,6 +145,26 @@ class DomainStatusNetworkPlugin extends Plugin
         return true;
     }
 
+    function onRouterInitialized($m)
+    {
+        if (common_config('globalapi', 'enabled')) {
+            foreach (array('register', 'login', 'recover') as $method) {
+                $m->connect('api/statusnet/global/'.$method,
+                            array('action' => 'global'.$method));
+            }
+        }
+        return true;
+    }
+
+    function onLoginAction($action, &$login) {
+        $this->debug($action);
+        if (in_array($action, array('globalregister', 'globallogin', 'globalrecover'))) {
+            $login = true;
+            return false;
+        }
+        return true;
+    }
+
     static function nicknameForDomain($domain)
     {
         $registered = self::registeredDomain($domain);
@@ -195,6 +222,107 @@ class DomainStatusNetworkPlugin extends Plugin
                             _m('A plugin that maps a single status_network to an email domain.'));
         return true;
     }
+
+    static function userExists($email)
+    {
+        $domain = self::toDomain($email);
+
+        $sn = self::siteForDomain($domain);
+
+        if (empty($sn)) {
+            return false;
+        }
+
+        StatusNet::switchSite($sn->nickname);
+
+        $user = User::staticGet('email', $email);
+
+        return !empty($user);
+    }
+
+    static function registerEmail($email)
+    {
+        $domain = self::toDomain($email);
+
+        if (FreeEmail::isFree($domain)) {
+            throw new ClientException(_("Use your work email."));
+        }
+
+        $sn = self::siteForDomain($domain);
+
+        if (empty($sn)) {
+            $installer = new DomainStatusNetworkInstaller($domain);
+
+            // Do the thing
+            $installer->main();
+
+            $sn = $installer->getStatusNetwork();
+
+            $config = $installer->getConfig();
+
+            Status_network::$wildcard = $config['WILDCARD'];
+        }
+
+        StatusNet::switchSite($sn->nickname);
+
+        $confirm = EmailRegistrationPlugin::registerEmail($email);
+
+        return $confirm;
+    }
+
+    static function login($email, $password)
+    {
+        $domain = self::toDomain($email);
+
+        $sn = self::siteForDomain($domain);
+
+        if (empty($sn)) {
+            throw new ClientException(_("No such site."));
+        }
+
+        StatusNet::switchSite($sn->nickname);
+
+        $user = common_check_user($email, $password);
+
+        if (empty($user)) {
+            // TRANS: Form validation error displayed when trying to log in with incorrect credentials.
+            throw new ClientException(_('Incorrect username or password.'));
+        }
+
+        $loginToken = Login_token::makeNew($user);
+
+        if (empty($loginToken)) {
+            throw new ServerException(sprintf(_('Could not create new login token for user %s'), $user->nickname));
+        }
+
+        $url = common_local_url('otp', array('user_id' => $loginToken->user_id,
+                                             'token' => $loginToken->token));
+
+        if (empty($url)) {
+            throw new ServerException(sprintf(_('Could not create new OTP URL for user %s'), $user->nickname));
+        }
+
+        return $url;
+    }
+
+    static function recoverPassword($email)
+    {
+        $domain = self::toDomain($email);
+
+        $sn = self::siteForDomain($domain);
+
+        if (empty($sn)) {
+            throw new NoSuchUserException(array('email' => $email));
+        }
+
+        StatusNet::switchSite($sn->nickname);
+
+        $user = User::staticGet('email', $email);
+        
+        if (empty($user)) {
+            throw new ClientException(_('No such user.'));
+        }
+    }
 }
 
 // The way addPlugin() works, this global variable gets disappeared.
diff --git a/plugins/DomainStatusNetwork/actions/globallogin.php b/plugins/DomainStatusNetwork/actions/globallogin.php
new file mode 100644
index 0000000000..f843392f44
--- /dev/null
+++ b/plugins/DomainStatusNetwork/actions/globallogin.php
@@ -0,0 +1,96 @@
+<?php
+/**
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2011, StatusNet, Inc.
+ *
+ * Log into a site globally
+ * 
+ * PHP version 5
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  DomainStatusNetwork
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2011 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    // This check helps protect against security problems;
+    // your code file can't be executed directly from the web.
+    exit(1);
+}
+
+/**
+ * Login to a site
+ *
+ * @category  Action
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2011 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+
+class GloballoginAction extends GlobalApiAction
+{
+    var $password;
+
+    /**
+     * For initializing members of the class.
+     *
+     * @param array $argarray misc. arguments
+     *
+     * @return boolean true
+     */
+
+    function prepare($argarray)
+    {
+        parent::prepare($argarray);
+
+        $password = $this->trimmed('password');
+
+        if (empty($password)) {
+            throw new ClientException(_('No password.'));
+        }
+
+        $this->password = $password;
+
+        return true;
+    }
+
+    /**
+     * Handler method
+     *
+     * @param array $argarray is ignored since it's now passed in in prepare()
+     *
+     * @return void
+     */
+
+    function handle($argarray=null)
+    {
+        try {
+            $url = DomainStatusNetworkPlugin::login($email, $password);
+            $this->showSuccess(array('url' => $url));
+        } catch (ClientException $ce) {
+            $this->showError($ce->getMessage());
+        } catch (Exception $e) {
+            common_log(LOG_ERR, $e->getMessage());
+            $this->showError(_('An internal error occurred.'));
+        }
+        return;
+    }
+}
diff --git a/plugins/DomainStatusNetwork/actions/globalrecover.php b/plugins/DomainStatusNetwork/actions/globalrecover.php
new file mode 100644
index 0000000000..9b688cbe70
--- /dev/null
+++ b/plugins/DomainStatusNetwork/actions/globalrecover.php
@@ -0,0 +1,85 @@
+<?php
+/**
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2011, StatusNet, Inc.
+ *
+ * Recover a password
+ * 
+ * PHP version 5
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  DomainStatusNetwork
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2011 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    // This check helps protect against security problems;
+    // your code file can't be executed directly from the web.
+    exit(1);
+}
+
+/**
+ * Recover a password
+ *
+ * @category  Action
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2011 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+
+class GlobalrecoverAction extends GlobalApiAction
+{
+    /**
+     * For initializing members of the class.
+     *
+     * @param array $argarray misc. arguments
+     *
+     * @return boolean true
+     */
+
+    function prepare($argarray)
+    {
+        parent::prepare($argarray);
+        return true;
+    }
+
+    /**
+     * Handler method
+     *
+     * @param array $argarray is ignored since it's now passed in in prepare()
+     *
+     * @return void
+     */
+
+    function handle($argarray=null)
+    {
+        try {
+            DomainStatusNetworkPlugin::recoverPassword($email);
+            $this->showSuccess();
+        } catch (ClientException $ce) {
+            $this->showError($ce->getMessage());
+        } catch (Exception $e) {
+            common_log(LOG_ERR, $e->getMessage());
+            $this->showError(_('An internal error occurred.'));
+        }
+        return;
+    }
+}
diff --git a/plugins/DomainStatusNetwork/actions/globalregister.php b/plugins/DomainStatusNetwork/actions/globalregister.php
new file mode 100644
index 0000000000..1e34261099
--- /dev/null
+++ b/plugins/DomainStatusNetwork/actions/globalregister.php
@@ -0,0 +1,96 @@
+<?php
+/**
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2011, StatusNet, Inc.
+ *
+ * Register a user to a site by their email address
+ * 
+ * PHP version 5
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  DomainStatusNetwork
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2011 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    // This check helps protect against security problems;
+    // your code file can't be executed directly from the web.
+    exit(1);
+}
+
+/**
+ * An action to globally register a new user
+ *
+ * @category  Action
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2011 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+
+class GlobalregisterAction extends GlobalApiAction
+{
+    /**
+     * For initializing members of the class.
+     *
+     * @param array $argarray misc. arguments
+     *
+     * @return boolean true
+     */
+
+    function prepare($argarray)
+    {
+        try {
+            parent::prepare($argarray);
+            return true;
+        } catch (ClientException $e) {
+            $this->showError($e->getMessage(), $e->getCode());
+            return false;
+        } catch (Exception $e) {
+            common_log(LOG_ERR, $e->getMessage());
+            $this->showError(_('An internal error occurred.'), 500);
+            return false;
+        }
+    }
+
+    /**
+     * Handler method
+     *
+     * @param array $argarray is ignored since it's now passed in in prepare()
+     *
+     * @return void
+     */
+
+    function handle($argarray=null)
+    {
+        try {
+            $confirm = DomainStatusNetworkPlugin::registerEmail($this->email);
+            EmailRegistrationPlugin::sendConfirmEmail($confirm);
+            $this->showSuccess();
+        } catch (ClientException $e) {
+            $this->showError($e->getMessage(), $e->getCode());
+        } catch (Exception $e) {
+            common_log(LOG_ERR, $e->getMessage());
+            $this->showError(_('An internal error occurred.'), 500);
+        }
+
+        return;
+    }
+}
diff --git a/plugins/DomainStatusNetwork/domainstatusnetworkinstaller.php b/plugins/DomainStatusNetwork/lib/domainstatusnetworkinstaller.php
similarity index 91%
rename from plugins/DomainStatusNetwork/domainstatusnetworkinstaller.php
rename to plugins/DomainStatusNetwork/lib/domainstatusnetworkinstaller.php
index b2042abe94..a30ab110ab 100644
--- a/plugins/DomainStatusNetwork/domainstatusnetworkinstaller.php
+++ b/plugins/DomainStatusNetwork/lib/domainstatusnetworkinstaller.php
@@ -117,9 +117,17 @@ class DomainStatusNetworkInstaller extends Installer
 
         $this->rootname = $config['ADMIN'];
         $this->rootpass = $config['ADMINPASS'];
-        $this->sitehost = $config['DBHOST'];
+        $this->sitehost = $config['SITEDBHOSTNAME'];
         $this->sitedb   = $config['SITEDB'];
 
+        $tagstr = $config['TAGS'];
+
+        if (!empty($tagstr)) {
+            $this->tags = preg_split('/[\s,]+/', $tagstr);
+        } else {
+            $this->tags = array();
+        }
+
         // Explicitly empty
 
         $this->adminNick    = null;
@@ -170,6 +178,7 @@ class DomainStatusNetworkInstaller extends Installer
         $sn->dbpass   = $this->password;
         $sn->dbname   = $this->database;
         $sn->sitename = $this->sitename;
+        $sn->created  = common_sql_now();
 
         $result = $sn->insert();
 
@@ -185,7 +194,15 @@ class DomainStatusNetworkInstaller extends Installer
             throw new ServerException("Created {$this->nickname} status_network and could not find it again.");
         }
 
-        $sn->setTags(array('domain='.$this->domain));
+        // Set default tags
+
+        $tags = $this->tags;
+
+        // Add domain tag
+
+        $tags[] = 'domain='.$this->domain;
+
+        $sn->setTags($tags);
 
         $this->sn = $sn;
     }
@@ -198,6 +215,21 @@ class DomainStatusNetworkInstaller extends Installer
 
         StatusNet::switchSite($this->nickname);
 
+        // We need to initialize the schema_version stuff to make later setup easier
+
+        $schema = array();
+        require INSTALLDIR.'/db/core.php';
+        $tableDefs = $schema;
+
+        $schema = Schema::get();
+        $schemaUpdater = new SchemaUpdater($schema);
+
+        foreach ($tableDefs as $table => $def) {
+            $schemaUpdater->register($table, $def);
+        }
+
+        $schemaUpdater->checkSchema();
+
         Event::handle('CheckSchema');
     }
 
diff --git a/plugins/DomainStatusNetwork/lib/freeemail.php b/plugins/DomainStatusNetwork/lib/freeemail.php
new file mode 100644
index 0000000000..3f8f4452e9
--- /dev/null
+++ b/plugins/DomainStatusNetwork/lib/freeemail.php
@@ -0,0 +1,605 @@
+<?php
+
+class FreeEmail {
+
+    static $domains =
+        array('111mail.com',
+              '123iran.com',
+              '126.com',
+              '163.com',
+              '1-usa.com',
+              '2die4.com',
+              '37.com',
+              '420email.com',
+              '4degreez.com',
+              '4-music-today.com',
+              '5.am',
+              '5005.lv',
+              '8.am',
+              'a.org.ua',
+              'abha.cc',
+              'abv.bg',
+              'accountant.com',
+              'actingbiz.com',
+              'adexec.com',
+              'africamail.com',
+              'agadir.cc',
+              'ahsa.ws',
+              'aim.com',
+              'ajman.cc',
+              'ajman.us',
+              'ajman.ws',
+              'albaha.cc',
+              'alex4all.com',
+              'alexandria.cc',
+              'algerie.cc',
+              'allergist.com',
+              'allhiphop.com',
+              'alriyadh.cc',
+              'alumnidirector.com',
+              'amman.cc',
+              'anatomicrock.com',
+              'animeone.com',
+              'anjungcafe.com',
+              'any-mail.co.uk',
+              'aqaba.cc',
+              'arar.ws',
+              'archaeologist.com',
+              'arcticmail.com',
+              'artlover.com',
+              'asia.com',
+              'asiancutes.com',
+              'aswan.cc',
+              'a-teens.net',
+              'att.net', // not free but consumer
+              'ausi.com',
+              'australiamail.com',
+              'autoindia.com',
+              'autopm.com',
+              'baalbeck.cc',
+              'bahraini.cc',
+              'baidu.com',
+              'banha.cc',
+              'barriolife.com',
+              'b-boy.com',
+              'beautifulboy.com',
+              'berlin.com',
+              'bgay.com',
+              'bicycledata.com',
+              'bicycling.com',
+              'bigheavyworld.com',
+              'bigmailbox.net',
+              'bikerheaven.net',
+              'bikerider.com',
+              'bikermail.com',
+              'billssite.com',
+              'binkmail.com',
+              'bizerte.cc',
+              'bk.ru',
+              'blackandchristian.com',
+              'blackcity.net',
+              'blackvault.com',
+              'blida.info',
+              'blumail.org',
+              'bmx.lv',
+              'bmxtrix.com',
+              'boarderzone.com',
+              'boatnerd.com',
+              'bol.com.br',
+              'bolbox.com',
+              'bongmail.com',
+              'bowl.com',
+              'btamail.net.cn',
+              'buraydah.cc',
+              'butch-femme.org',
+              'byke.com',
+              'cablevision.com',
+              'calle22.com',
+              'cameroon.cc',
+              'cannabismail.com',
+              'catlover.com',
+              'catlovers.com',
+              'certifiedbitches.com',
+              'championboxing.com',
+              'chatway.com',
+              'cheerful.com',
+              'chemist.com',
+              'chillymail.com',
+              'classprod.com',
+              'classycouples.com',
+              'clerk.com',
+              'cliffhanger.com',
+              'columnist.com',
+              'comcast.net',
+              'comic.com',
+              'company.org.ua',
+              'congiu.net',
+              'consultant.com',
+              'coolmail.ru',
+              'coolshit.com',
+              'corpusmail.com',
+              'counsellor.com',
+              'cutey.com',
+              'cyberunlimited.org',
+              'cycledata.com',
+              'darkfear.com',
+              'darkforces.com',
+              'deliveryman.com',
+              'dhahran.cc',
+              'dhofar.cc',
+              'dino.lv',
+              'diplomats.com',
+              'dirtythird.com',
+              'djibouti.cc',
+              'doctor.com',
+              'doglover.com',
+              'dominican.cc',
+              'dopefiends.com',
+              'dr.com',
+              'draac.com',
+              'drakmail.net',
+              'dr-dre.com',
+              'dreamstop.com',
+              'dublin.com',
+              'earthling.net',
+              'earthling.net',
+              'eclub.lv',
+              'egypt.net',
+              'e-mail.am',
+              'email.com',
+              'email.cz',
+              'email.it',
+              'e-mail.ru',
+              'emailfast.com',
+              'emails.ru',
+              'e-mails.ru',
+              'eminemfans .com',
+              'envirocitizen.com',
+              'eritrea.cc',
+              'eritrea.cc',
+              'escapeartist.com',
+              'europe.com',
+              'execs.com',
+              'ezsweeps.com',
+              'facebook.com',
+              'falasteen.cc',
+              'famous.as',
+              'farts.com',
+              'feelingnaughty.com',
+              'financier.com',
+              'firemyst.com',
+              'fit.lv',
+              'foxmail.com',
+              'free.fr',
+              'freeonline.com',
+              'fromru.com',
+              'front.ru',
+              'fudge.com',
+              'fujairah.cc',
+              'fujairah.us',
+              'fujairah.ws',
+              'funkytimes.com',
+              'gabes.cc',
+              'gafsa.cc',
+              'gala.net',
+              'gamerssolution.com',
+              'gardener.com',
+              'gawab.com',
+              'gazabo.net',
+              'geologist.com',
+              'giza.cc',
+              'glittergrrrls.com',
+              'gmail.com',
+              'gmx.com',
+              'gmx.de',
+              'gmx.net',
+              'goatrance.com',
+              'goddess.com',
+              'gohip.com',
+              'goldenmail.ru',
+              'goldmail.ru',
+              'gospelcity.com',
+              'gothicgirl.com',
+              'gotomy.com',
+              'grapemail.net',
+              'graphic-designer.com',
+              'greatautos.org',
+              'guinea.cc',
+              'guinea.cc',
+              'guy.com',
+              'hacker.am',
+              'hairdresser.net',
+              'haitisurf.com',
+              'hamra.cc',
+              'happyhippo.com',
+              'hasakah.com',
+              'hateinthebox.com',
+              'hebron.tv',
+              'hip hopmail.com',
+              'homs.cc',
+              'home.nl',
+              'hotbox.ru',
+              'hotmail.ca',
+              'hotmail.com',
+              'hotmail.com.ar',
+              'hotmail.com.br',
+              'hotmail.com.tr',
+              'hotmail.co.id',
+              'hotmail.co.in',
+              'hotmail.co.jp',
+              'hotmail.co.th',
+              'hotmail.co.uk',
+              'hotmail.co.za',
+              'hotmail.cz',
+              'hotmail.de',
+              'hotmail.dk',
+              'hotmail.es',
+              'hotmail.fr',
+              'hotmail.gr',
+              'hotmail.it',
+              'hotmail.my',
+              'hotmail.nl',
+              'hotmail.no',
+              'hotmail.net',
+              'hotmail.ru',
+              'hotmail.se',
+              'hotmail.sg',
+              'hot-shot.com',
+              'houseofhorrors.com',
+              'hugkiss.com',
+              'hullnumber.com',
+              'human.lv',
+              'hush.com',
+              'ibra.cc',
+              'idunno4recipes.com',
+              'ig.com',
+              'ig.com.br',
+              'ihatenetscape.com',
+              'in.com',
+              'iname.com',
+              'inbox.com',
+              'inbox.lv',
+              'inbox.ru',
+              'inorbit.com',
+              'insurer.com',
+              'intimatefire.com',
+              'iphon.biz',
+              'irbid.ws',
+              'irow.com',
+              'ismailia.cc',
+              'jadida.cc',
+              'jadida.org',
+              'japan.com',
+              'jazzemail.com',
+              'jerash.cc',
+              'jizan.cc',
+              'jouf.cc',
+              'journalist.com',
+              'juanitabynum.com',
+              'kairouan.cc',
+              'kanoodle.com',
+              'karak.cc',
+              'khaimah.cc',
+              'khartoum.cc',
+              'khobar.cc',
+              'kickboxing.com',
+              'kidrock.com',
+              'kinkyemail.com',
+              'klzlk.com',
+              'kool-things.com',
+              'krovatka.net',
+              'kuwaiti.tv',
+              'kwick.de',
+              'kyrgyzstan.cc',
+              'land.ru',
+              'laposte.net',
+              'latakia.cc',
+              'latchess.com',
+              'latinabarbie.com',
+              'latinmail.com',
+              'latinogreeks.com',
+              'lavabit.com',
+              'lawyer.com',
+              'lebanese.cc',
+              'leesville.com',
+              'legislator.com',
+              'list.ru',
+              'live.at',
+              'live.be',
+              'live.cl',
+              'live.cn',
+              'live.com',
+              'live.com.ar',
+              'live.com.ph',
+              'live.com.sg',
+              'live.co.uk',
+              'live.com.mx',
+              'live.ca',
+              'live.cn',
+              'live.com.sg',
+              'live.de',
+              'live.dk',
+              'live.fr',
+              'live.hk',
+              'live.in',
+              'live.it',
+              'live.jp',
+              'live.nl',
+              'live.no',
+              'live.ru',
+              'live.se',
+              'lobbyist.com',
+              'london.com',
+              'lonestar.org',
+              'loveable.com',
+              'loveemail.com',
+              'loveis.lv',
+              'lovers-mail.com',
+              'lowrider.com',
+              'lubnan.cc',
+              'lubnan.ws',
+              'lucky7lotto.net',
+              'lv-inter.net',
+              'mac.com',
+              'mad.scientist.com',
+              'madeniggaz.net',
+              'madinah.cc',
+              'madrid.com',
+              'maghreb.cc',
+              'mail.be',
+              'mail.com',
+              'mail.ru',
+              'mail15.com',
+              'mail333.com',
+              'mailbomb.com',
+              'mailinator.com',
+              'manama.cc',
+              'mansoura.tv',
+              'marillion.net',
+              'marrakesh.cc',
+              'mascara.ws',
+              'me.com',
+              'megarave.com',
+              'meknes.cc',
+              'mesra.net',
+              'mindless.com',
+              'minister.com',
+              'mofa.com',
+              'moscowmail.com',
+              'motley.com',
+              'munich.com',
+              'muscat.tv',
+              'muscat.ws',
+              'music.com',
+              'musician.net',
+              'musician.org',
+              'musicsites.com',
+              'myopera.com',
+              'myself.com',
+              'nabeul.cc',
+              'nabeul.info',
+              'nablus.cc',
+              'nador.cc',
+              'najaf.cc',
+              'narod.ru',
+              'naver.com',
+              'nepwk.com',
+              'netbroadcaster.com',
+              'netfingers.com',
+              'net-surf.com',
+              'nettaxi.com',
+              'newmail.ru',
+              'ni cedriveway.com',
+              'nightmail.ru',
+              'nm.ru',
+              'nocharge.com',
+              'nycmail.com',
+              'o2.co.uk',
+              'o2.pl',
+              'omani.ws',
+              'omdurman.cc',
+              'operationivy.com',
+              'optician.com',
+              'oran.cc',
+              'oued.info',
+              'oued.org',
+              'oujda.biz',
+              'oujda.cc',
+              'ovi.com',
+              'paidoffers.net',
+              'pakistani.ws',
+              'palmyra.cc',
+              'palmyra.ws',
+              'pcbee.com',
+              'pediatrician.com',
+              'persian.com',
+              'petrofind.com',
+              'phunkybitches.com',
+              'pikaguam.com',
+              'pinkcity.net',
+              'pisem.net',
+              'pitbullmail.com',
+              'planetsmeg.com',
+              'playful.com',
+              'pochta.ru',
+              'pochtamt.ru',
+              'poetic.com',
+              'pookmail.com',
+              'poop.com',
+              'poormail.com',
+              'pop3.ru',
+              'popstar.com',
+              'portsaid.cc',
+              'post.com',
+              'potsmokersnet.com',
+              'presidency.com',
+              'priest.com',
+              'primetap.com',
+              'programmer.net',
+              'project420.com',
+              'prolife.net',
+              'publicist.com',
+              'puertoricowow.com',
+              'puppetweb.com',
+              'qassem.cc',
+              'qq.com',
+              'quds.cc',
+              'rabat.cc',
+              'rafah.cc',
+              'ramallah.cc',
+              'rambler.ru',
+              'rapstar.com',
+              'rapworld.com',
+              'rastamall.com',
+              'ratedx.net',
+              'ravermail.com',
+              'rbcmail.ru',
+              'realtyagent.com',
+              'rediffmail.com',
+              'registerednurses.com',
+              'relapsecult.com',
+              'remixer.com',
+              'repairman.com',
+              'representative.com',
+              'rescueteam.com',
+              'rockeros.com',
+              'rocketmail.com',
+              'romance106fm.com',
+              'rome.com',
+              'rr.com',
+              'sa veourplanet.org',
+              'safat.biz',
+              'safat.info',
+              'safat.us',
+              'safat.ws',
+              'safe-mail.com',
+              'safetypost.de',
+              'saintly.com',
+              'salalah.cc',
+              'salmiya.biz',
+              'samerica.com',
+              'sanaa.cc',
+              'sanfranmail.com',
+              'sbcglobal.com',
+              'sbcglobal.net',
+              'scientist.com',
+              'seductive.com',
+              'seeb.cc',
+              'sexriga.lv',
+              'sdf.lonestar.org',
+              'sfax.ws',
+              'sharm.cc',
+              'sina.com',
+              'sinai.cc',
+              'singalongcenter.com',
+              'singapore.com',
+              'siria.cc',
+              'sketchyfriends.com',
+              'slayerized.com',
+              'smartstocks.com',
+              'smtp.ru',
+              'sociologist.com',
+              'sok.lv',
+              'soon.com',
+              'soulja-beatz.org',
+              'sousse.cc',
+              'spam.lv',
+              'specialoperations.com',
+              'speedymail.net',
+              'spells.com',
+              'streetracing.com',
+              'subspacemail.com',
+              'sudanese.cc',
+              'suez.cc',
+              'sugarray.com',
+              'superbikeclub.com',
+              'superintendents.net',
+              'supermail.ru',
+              'surfguiden.com',
+              'sweetwishes.com',
+              't-online.de',
+              'tabouk.cc',
+              'tajikistan.cc',
+              'tangiers.cc',
+              'tanta.cc',
+              'tattoodesign.com',
+              'tayef.cc',
+              'teamster.net',
+              'techie.com',
+              'technologist.com',
+              'teenchatnow.com',
+              'tetouan.cc',
+              'the5thquarter.com',
+              'theblackmarket.com',
+              'timor.cc',
+              'tokyo.com',
+              'tombstone.ws',
+              'trash-mail.com',
+              'troamail.org',
+              'tunisian.cc',
+              'tunisian.cc',
+              'tut.by',
+              'tx.am',
+              'u2tours.com',
+              'ua.fm',
+              'uaix.info',
+              'ukr.net',
+              'umpire.com',
+              'urdun.cc',
+              'usa.com',
+              'vipmail.ru',
+              'vitalogy.org',
+              'whatisthis.com',
+              'whoever.com',
+              'windowslive.com',
+              'winning.com',
+              'witty.com',
+              'wrestlezone.com',
+              'writeme.com',
+              'yahoo.ca',
+              'yahoo.cl',
+              'yahoo.co.id',
+              'yahoo.co.in',
+              'yahoo.co.jp',
+              'yahoo.co.nz',
+              'yahoo.co.uk',
+              'yahoo.com',
+              'yahoo.com.ar',
+              'yahoo.com.au',
+              'yahoo.com.cn',
+              'yahoo.com.hk',
+              'yahoo.com.my',
+              'yahoo.com.mx',
+              'yahoo.com.ph',
+              'yahoo.com.sg',
+              'yahoo.com.tr',
+              'yahoo.com.ve',
+              'yahoo.com.vn',
+              'yahoo.de',
+              'yahoo.dk',
+              'yahoo.es',
+              'yahoo.fr',
+              'yahoo.gr',
+              'yahoo.in',
+              'yahoo.it',
+              'yahoo.pl',
+              'yahoo.ro',
+              'yahoo.se',
+              'yanbo.cc',
+              'yandex.ru',
+              'yepmail.com',
+              'yemeni.cc',
+              'yogaelements.com',
+              'yopmail.fr',
+              'yours.com',
+              'yunus.cc',
+              'zabor.lv',
+              'zagazig.cc',
+              'zambia.cc',
+              'zarqa.cc',
+              'zerogravityclub.com');
+
+    static function isFree($domain) {
+        return in_array($domain, self::$domains);
+    }
+}
\ No newline at end of file
diff --git a/plugins/DomainStatusNetwork/lib/globalapiaction.php b/plugins/DomainStatusNetwork/lib/globalapiaction.php
new file mode 100644
index 0000000000..cd0c7f9526
--- /dev/null
+++ b/plugins/DomainStatusNetwork/lib/globalapiaction.php
@@ -0,0 +1,131 @@
+<?php
+/**
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2011, StatusNet, Inc.
+ *
+ * An action that requires an API key
+ * 
+ * PHP version 5
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  DomainStatusNetwork
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2011 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    // This check helps protect against security problems;
+    // your code file can't be executed directly from the web.
+    exit(1);
+}
+
+/**
+ * An action that requires an API key
+ *
+ * @category  General
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2011 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+
+class GlobalApiAction extends Action
+{
+    var $email;
+
+    /**
+     * Check for an API key, and throw an exception if it's not set
+     *
+     * @param array $args URL and POST params
+     *
+     * @return boolean continuation flag
+     */
+
+    function prepare($args)
+    {
+        StatusNet::setApi(true); // reduce exception reports to aid in debugging
+
+        parent::prepare($args);
+
+        if (!common_config('globalapi', 'enabled')) {
+            throw new ClientException(_('Global API not enabled.'), 403);
+        }
+
+        $apikey = $this->trimmed('apikey');
+
+        if (empty($apikey)) {
+            throw new ClientException(_('No API key.'), 403);
+        }
+
+        $expected = common_config('globalapi', 'key');
+
+        if ($expected != $apikey) {
+            // FIXME: increment a counter by IP address to prevent brute-force
+            // attacks on the key.
+            throw new ClientException(_('Bad API key.'), 403);
+        }
+
+        $email = common_canonical_email($this->trimmed('email'));
+
+        if (empty($email)) {
+            throw new ClientException(_('No email address.'));
+        }
+
+        if (!Validate::email($email, common_config('email', 'check_domain'))) {
+            throw new ClientException(_('Invalid email address.'));
+        }
+
+        $this->email = $email;
+
+        return true;
+    }
+
+    function showError($message, $code=400)
+    {
+        $this->showOutput(array('error' => $message), $code);
+    }
+
+    function showSuccess($values=null, $code=200)
+    {
+        if (empty($values)) {
+            $values = array();
+        }
+        $values['success'] = 1;
+        $this->showOutput($values, $code);
+    }
+
+    function showOutput($values, $code)
+    {
+        if (array_key_exists($code, ClientErrorAction::$status)) {
+            $status_string = ClientErrorAction::$status[$code];
+        } else if (array_key_exists($code, ServerErrorAction::$status)) {
+            $status_string = ServerErrorAction::$status[$code];
+        } else {
+            // bad code!
+            $code = 500;
+            $status_string = ServerErrorAction::$status[$code];
+        }
+
+        header('HTTP/1.1 '.$code.' '.$status_string);
+
+        header('Content-Type: application/json; charset=utf-8');
+        print(json_encode($values));
+        print("\n");
+    }
+}
diff --git a/plugins/DomainStatusNetwork/locale/DomainStatusNetwork.pot b/plugins/DomainStatusNetwork/locale/DomainStatusNetwork.pot
index 48213a19f0..d7fbb8b2da 100644
--- a/plugins/DomainStatusNetwork/locale/DomainStatusNetwork.pot
+++ b/plugins/DomainStatusNetwork/locale/DomainStatusNetwork.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
+"POT-Creation-Date: 2012-06-30 11:07+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,6 +17,6 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. TRANS: Plugin description.
-#: DomainStatusNetworkPlugin.php:194
+#: DomainStatusNetworkPlugin.php:222
 msgid "A plugin that maps a single status_network to an email domain."
 msgstr ""
diff --git a/plugins/DomainStatusNetwork/locale/de/LC_MESSAGES/DomainStatusNetwork.po b/plugins/DomainStatusNetwork/locale/de/LC_MESSAGES/DomainStatusNetwork.po
new file mode 100644
index 0000000000..6d4675a507
--- /dev/null
+++ b/plugins/DomainStatusNetwork/locale/de/LC_MESSAGES/DomainStatusNetwork.po
@@ -0,0 +1,28 @@
+# Translation of StatusNet - DomainStatusNetwork to German (Deutsch)
+# Exported from translatewiki.net
+#
+# Author: Giftpflanze
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - DomainStatusNetwork\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:14+0000\n"
+"Language-Team: German <https://translatewiki.net/wiki/Portal:de>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-18 16:19:16+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: de\n"
+"X-Message-Group: #out-statusnet-plugin-domainstatusnetwork\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin description.
+msgid "A plugin that maps a single status_network to an email domain."
+msgstr ""
+"Plugin, das ein einzelnes StatusNet-Netzwerk mit einer E-Mail-Domäne "
+"verknüpft."
diff --git a/plugins/DomainStatusNetwork/locale/es/LC_MESSAGES/DomainStatusNetwork.po b/plugins/DomainStatusNetwork/locale/es/LC_MESSAGES/DomainStatusNetwork.po
new file mode 100644
index 0000000000..7bf934ff4f
--- /dev/null
+++ b/plugins/DomainStatusNetwork/locale/es/LC_MESSAGES/DomainStatusNetwork.po
@@ -0,0 +1,28 @@
+# Translation of StatusNet - DomainStatusNetwork to Spanish (español)
+# Exported from translatewiki.net
+#
+# Author: Erchache2000
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - DomainStatusNetwork\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:14+0000\n"
+"Language-Team: Spanish <https://translatewiki.net/wiki/Portal:es>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-18 16:19:16+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: es\n"
+"X-Message-Group: #out-statusnet-plugin-domainstatusnetwork\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin description.
+msgid "A plugin that maps a single status_network to an email domain."
+msgstr ""
+"Un plugin que asigna un solo estado de red a un dominio de correo "
+"electrónico."
diff --git a/plugins/DomainStatusNetwork/locale/eu/LC_MESSAGES/DomainStatusNetwork.po b/plugins/DomainStatusNetwork/locale/eu/LC_MESSAGES/DomainStatusNetwork.po
new file mode 100644
index 0000000000..6be0e5d564
--- /dev/null
+++ b/plugins/DomainStatusNetwork/locale/eu/LC_MESSAGES/DomainStatusNetwork.po
@@ -0,0 +1,24 @@
+# Translation of StatusNet - DomainStatusNetwork to Basque (euskara)
+# Exported from translatewiki.net
+#
+# Author: Artsuaga
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - DomainStatusNetwork\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:15+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-18 16:19:16+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin description.
+msgid "A plugin that maps a single status_network to an email domain."
+msgstr ""
+"Eposta helbide baten domeinuari sare egoera bakarra esleitzen dion plugina."
diff --git a/plugins/DomainStatusNetwork/locale/fr/LC_MESSAGES/DomainStatusNetwork.po b/plugins/DomainStatusNetwork/locale/fr/LC_MESSAGES/DomainStatusNetwork.po
new file mode 100644
index 0000000000..b5ace705fa
--- /dev/null
+++ b/plugins/DomainStatusNetwork/locale/fr/LC_MESSAGES/DomainStatusNetwork.po
@@ -0,0 +1,28 @@
+# Translation of StatusNet - DomainStatusNetwork to French (français)
+# Exported from translatewiki.net
+#
+# Author: Crochet.david
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - DomainStatusNetwork\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:15+0000\n"
+"Language-Team: French <https://translatewiki.net/wiki/Portal:fr>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-18 16:19:16+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: fr\n"
+"X-Message-Group: #out-statusnet-plugin-domainstatusnetwork\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#. TRANS: Plugin description.
+msgid "A plugin that maps a single status_network to an email domain."
+msgstr ""
+"Un plugin qui fait correspondre un status_network unique à un domaine de "
+"messagerie."
diff --git a/plugins/DomainStatusNetwork/locale/gl/LC_MESSAGES/DomainStatusNetwork.po b/plugins/DomainStatusNetwork/locale/gl/LC_MESSAGES/DomainStatusNetwork.po
new file mode 100644
index 0000000000..9f270291cd
--- /dev/null
+++ b/plugins/DomainStatusNetwork/locale/gl/LC_MESSAGES/DomainStatusNetwork.po
@@ -0,0 +1,28 @@
+# Translation of StatusNet - DomainStatusNetwork to Galician (galego)
+# Exported from translatewiki.net
+#
+# Author: Toliño
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - DomainStatusNetwork\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:15+0000\n"
+"Language-Team: Galician <https://translatewiki.net/wiki/Portal:gl>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-18 16:19:16+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: gl\n"
+"X-Message-Group: #out-statusnet-plugin-domainstatusnetwork\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin description.
+msgid "A plugin that maps a single status_network to an email domain."
+msgstr ""
+"Un complemento que fai corresponder un status_network único cun dominio de "
+"correo electrónico."
diff --git a/plugins/DomainStatusNetwork/locale/he/LC_MESSAGES/DomainStatusNetwork.po b/plugins/DomainStatusNetwork/locale/he/LC_MESSAGES/DomainStatusNetwork.po
new file mode 100644
index 0000000000..9cfe5ff715
--- /dev/null
+++ b/plugins/DomainStatusNetwork/locale/he/LC_MESSAGES/DomainStatusNetwork.po
@@ -0,0 +1,26 @@
+# Translation of StatusNet - DomainStatusNetwork to Hebrew (עברית)
+# Exported from translatewiki.net
+#
+# Author: Amire80
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - DomainStatusNetwork\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:15+0000\n"
+"Language-Team: Hebrew <https://translatewiki.net/wiki/Portal:he>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-18 16:19:16+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: he\n"
+"X-Message-Group: #out-statusnet-plugin-domainstatusnetwork\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin description.
+msgid "A plugin that maps a single status_network to an email domain."
+msgstr "תוסף שממפה status_network �חד למתח� של דו�ר �לקטרוני."
diff --git a/plugins/DomainStatusNetwork/locale/ia/LC_MESSAGES/DomainStatusNetwork.po b/plugins/DomainStatusNetwork/locale/ia/LC_MESSAGES/DomainStatusNetwork.po
new file mode 100644
index 0000000000..791508e5ed
--- /dev/null
+++ b/plugins/DomainStatusNetwork/locale/ia/LC_MESSAGES/DomainStatusNetwork.po
@@ -0,0 +1,26 @@
+# Translation of StatusNet - DomainStatusNetwork to Interlingua (interlingua)
+# Exported from translatewiki.net
+#
+# Author: McDutchie
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - DomainStatusNetwork\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:15+0000\n"
+"Language-Team: Interlingua <https://translatewiki.net/wiki/Portal:ia>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-18 16:19:16+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: ia\n"
+"X-Message-Group: #out-statusnet-plugin-domainstatusnetwork\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin description.
+msgid "A plugin that maps a single status_network to an email domain."
+msgstr "Un plug-in que liga un sol status_network a un dominio de e-mail."
diff --git a/plugins/DomainStatusNetwork/locale/it/LC_MESSAGES/DomainStatusNetwork.po b/plugins/DomainStatusNetwork/locale/it/LC_MESSAGES/DomainStatusNetwork.po
new file mode 100644
index 0000000000..570ea5759e
--- /dev/null
+++ b/plugins/DomainStatusNetwork/locale/it/LC_MESSAGES/DomainStatusNetwork.po
@@ -0,0 +1,25 @@
+# Translation of StatusNet - DomainStatusNetwork to Italian (italiano)
+# Exported from translatewiki.net
+#
+# Author: Ximo17
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - DomainStatusNetwork\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:15+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-18 16:19:16+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin description.
+msgid "A plugin that maps a single status_network to an email domain."
+msgstr ""
+"Un plugin che esegue il mapping di un singolo status_network a un dominio di "
+"posta elettronica."
diff --git a/plugins/DomainStatusNetwork/locale/mk/LC_MESSAGES/DomainStatusNetwork.po b/plugins/DomainStatusNetwork/locale/mk/LC_MESSAGES/DomainStatusNetwork.po
new file mode 100644
index 0000000000..737a4c55d0
--- /dev/null
+++ b/plugins/DomainStatusNetwork/locale/mk/LC_MESSAGES/DomainStatusNetwork.po
@@ -0,0 +1,26 @@
+# Translation of StatusNet - DomainStatusNetwork to Macedonian (македон�ки)
+# Exported from translatewiki.net
+#
+# Author: Bjankuloski06
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - DomainStatusNetwork\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:15+0000\n"
+"Language-Team: Macedonian <https://translatewiki.net/wiki/Portal:mk>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-18 16:19:16+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: mk\n"
+"X-Message-Group: #out-statusnet-plugin-domainstatusnetwork\n"
+"Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
+
+#. TRANS: Plugin description.
+msgid "A plugin that maps a single status_network to an email domain."
+msgstr "Приклучок што �овпаѓа еден status_network �о домен за е-пошта."
diff --git a/plugins/DomainStatusNetwork/locale/nb/LC_MESSAGES/DomainStatusNetwork.po b/plugins/DomainStatusNetwork/locale/nb/LC_MESSAGES/DomainStatusNetwork.po
new file mode 100644
index 0000000000..e62d4e37e9
--- /dev/null
+++ b/plugins/DomainStatusNetwork/locale/nb/LC_MESSAGES/DomainStatusNetwork.po
@@ -0,0 +1,27 @@
+# Translation of StatusNet - DomainStatusNetwork to Norwegian Bokmål (‪norsk (bokmål)‬)
+# Exported from translatewiki.net
+#
+# Author: Nghtwlkr
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - DomainStatusNetwork\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:15+0000\n"
+"Language-Team: Norwegian Bokmål <https://translatewiki.net/wiki/Portal:nb>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-18 16:19:16+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: nb\n"
+"X-Message-Group: #out-statusnet-plugin-domainstatusnetwork\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin description.
+msgid "A plugin that maps a single status_network to an email domain."
+msgstr ""
+"En utvidelse som kartlegger et enkelt status_network til et e-postdomene."
diff --git a/plugins/DomainStatusNetwork/locale/nl/LC_MESSAGES/DomainStatusNetwork.po b/plugins/DomainStatusNetwork/locale/nl/LC_MESSAGES/DomainStatusNetwork.po
new file mode 100644
index 0000000000..4f22d12bdd
--- /dev/null
+++ b/plugins/DomainStatusNetwork/locale/nl/LC_MESSAGES/DomainStatusNetwork.po
@@ -0,0 +1,26 @@
+# Translation of StatusNet - DomainStatusNetwork to Dutch (Nederlands)
+# Exported from translatewiki.net
+#
+# Author: Siebrand
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - DomainStatusNetwork\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:15+0000\n"
+"Language-Team: Dutch <https://translatewiki.net/wiki/Portal:nl>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-18 16:19:16+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: nl\n"
+"X-Message-Group: #out-statusnet-plugin-domainstatusnetwork\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin description.
+msgid "A plugin that maps a single status_network to an email domain."
+msgstr "Een plugin die een status_netwerk koppelt aan en e-maildomein."
diff --git a/plugins/DomainStatusNetwork/locale/tl/LC_MESSAGES/DomainStatusNetwork.po b/plugins/DomainStatusNetwork/locale/tl/LC_MESSAGES/DomainStatusNetwork.po
new file mode 100644
index 0000000000..bff58fc736
--- /dev/null
+++ b/plugins/DomainStatusNetwork/locale/tl/LC_MESSAGES/DomainStatusNetwork.po
@@ -0,0 +1,28 @@
+# Translation of StatusNet - DomainStatusNetwork to Tagalog (Tagalog)
+# Exported from translatewiki.net
+#
+# Author: AnakngAraw
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - DomainStatusNetwork\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:15+0000\n"
+"Language-Team: Tagalog <https://translatewiki.net/wiki/Portal:tl>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-18 16:19:16+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: tl\n"
+"X-Message-Group: #out-statusnet-plugin-domainstatusnetwork\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin description.
+msgid "A plugin that maps a single status_network to an email domain."
+msgstr ""
+"Isang pamasak na nagmamapa ng isang nag-iisang lambatan_ng_katayuan sa isang "
+"nasasakupan ng e-liham."
diff --git a/plugins/DomainStatusNetwork/locale/uk/LC_MESSAGES/DomainStatusNetwork.po b/plugins/DomainStatusNetwork/locale/uk/LC_MESSAGES/DomainStatusNetwork.po
new file mode 100644
index 0000000000..dcda9bdce0
--- /dev/null
+++ b/plugins/DomainStatusNetwork/locale/uk/LC_MESSAGES/DomainStatusNetwork.po
@@ -0,0 +1,28 @@
+# Translation of StatusNet - DomainStatusNetwork to Ukrainian (україн�ька)
+# Exported from translatewiki.net
+#
+# Author: Boogie
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - DomainStatusNetwork\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:16+0000\n"
+"Language-Team: Ukrainian <https://translatewiki.net/wiki/Portal:uk>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-18 16:19:16+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: uk\n"
+"X-Message-Group: #out-statusnet-plugin-domainstatusnetwork\n"
+"Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
+"2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
+
+#. TRANS: Plugin description.
+msgid "A plugin that maps a single status_network to an email domain."
+msgstr ""
+"Додаток �кий «прив’�зує» окремий StatusNet-�умі�ний �айт до поштового домену."
diff --git a/plugins/DomainStatusNetwork/scripts/installforemail.php b/plugins/DomainStatusNetwork/scripts/installforemail.php
index 98ce620c28..f773094a74 100644
--- a/plugins/DomainStatusNetwork/scripts/installforemail.php
+++ b/plugins/DomainStatusNetwork/scripts/installforemail.php
@@ -39,39 +39,24 @@ require_once INSTALLDIR.'/scripts/commandline.inc';
 
 $email = $args[0];
 
-$domain = DomainStatusNetworkPlugin::toDomain($email);
+$sendWelcome = have_option('w', 'welcome');
 
-$sn = DomainStatusNetworkPlugin::siteForDomain($domain);
-
-if (empty($sn)) {
-    $installer = new DomainStatusNetworkInstaller($domain);
-
-    $installer->verbose = have_option('v', 'verbose');
-
-    // Do the thing
-    $installer->main();
-
-    $sn = $installer->getStatusNetwork();
-
-    $config = $installer->getConfig();
-
-    Status_network::$wildcard = $config['WILDCARD'];
+if ($sendWelcome && have_option('t', 'template')) {
+    $template = get_option_value('t', 'template');
 }
 
-StatusNet::switchSite($sn->nickname);
+try {
 
-$confirm = EmailRegistrationPlugin::registerEmail($email);
+    $confirm = DomainStatusNetworkPlugin::registerEmail($email);
 
-if (have_option('w', 'welcome')) {
-    if (have_option('t', 'template')) {
-        // use the provided template
-        EmailRegistrationPlugin::sendConfirmEmail($confirm, get_option_value('t', 'template'));
-    } else {
-        // use the default template
-        EmailRegistrationPlugin::sendConfirmEmail($confirm);
+    if ($sendWelcome) {
+        EmailRegistrationPlugin::sendConfirmEmail($confirm, $template);
     }
+
+    $confirmUrl = common_local_url('register', array('code' => $confirm->code));
+
+    print $confirmUrl."\n";
+
+} catch (Exception $e) {
+    print "ERROR: " . $e->getMessage() . "\n";
 }
-
-$confirmUrl = common_local_url('register', array('code' => $confirm->code));
-
-print $confirmUrl."\n";
diff --git a/plugins/DomainWhitelist/locale/DomainWhitelist.pot b/plugins/DomainWhitelist/locale/DomainWhitelist.pot
index 7aaf972889..be98e0a3ee 100644
--- a/plugins/DomainWhitelist/locale/DomainWhitelist.pot
+++ b/plugins/DomainWhitelist/locale/DomainWhitelist.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,18 +18,71 @@ msgstr ""
 
 #. TRANS: Client exception thrown when a given e-mailaddress is not in the domain whitelist.
 #. TRANS: %s is a whitelisted e-mail domain.
-#: DomainWhitelistPlugin.php:63
+#: DomainWhitelistPlugin.php:116
 #, php-format
 msgid "Email address must be in this domain: %s."
 msgstr ""
 
+#. TRANS: Client exception thrown when a given e-mailaddress is not in the domain whitelist.
+#. TRANS: %s are whitelisted e-mail domains separated by comma's (localisable).
+#: DomainWhitelistPlugin.php:121
+#, php-format
+msgid "Email address must be in one of these domains: %s."
+msgstr ""
+
 #. TRANS: Separator for whitelisted domains.
-#: DomainWhitelistPlugin.php:70
+#: DomainWhitelistPlugin.php:123
 msgctxt "SEPARATOR"
 msgid ", "
 msgstr ""
 
+#. TRANS: Exception thrown when an e-mail address does not match the site's domain whitelist.
+#: DomainWhitelistPlugin.php:135
+msgid "That email address is not allowed on this site."
+msgstr ""
+
+#. TRANS: Title for invitiation deletion dialog.
+#: DomainWhitelistPlugin.php:264
+msgid "Confirmation Required"
+msgstr ""
+
+#. TRANS: Confirmation text for invitation deletion dialog.
+#: DomainWhitelistPlugin.php:267
+msgid "Really delete this invitation?"
+msgstr ""
+
 #. TRANS: Plugin description.
-#: DomainWhitelistPlugin.php:131
+#: DomainWhitelistPlugin.php:304
 msgid "Restrict domains for email users."
 msgstr ""
+
+#. TRANS: Form legend.
+#: lib/whitelistinviteform.php:89
+msgid "Invite collegues"
+msgstr ""
+
+#. TRANS: Field label for a personal message to send to invitees.
+#: lib/whitelistinviteform.php:106
+msgid "Personal message"
+msgstr ""
+
+#. TRANS: Field title for a personal message to send to invitees.
+#: lib/whitelistinviteform.php:109
+msgid "Optionally add a personal message to the invitation."
+msgstr ""
+
+#. TRANS: Link description to action to add another item to a list.
+#: lib/whitelistinviteform.php:158
+msgid "Add another item"
+msgstr ""
+
+#. TRANS: Send button for inviting friends.
+#: lib/whitelistinviteform.php:172
+msgctxt "BUTTON"
+msgid "Send"
+msgstr ""
+
+#. TRANS: Submit button title.
+#: lib/whitelistinviteform.php:175
+msgid "Send invitations."
+msgstr ""
diff --git a/plugins/DomainWhitelist/locale/ar/LC_MESSAGES/DomainWhitelist.po b/plugins/DomainWhitelist/locale/ar/LC_MESSAGES/DomainWhitelist.po
new file mode 100644
index 0000000000..308180ef9e
--- /dev/null
+++ b/plugins/DomainWhitelist/locale/ar/LC_MESSAGES/DomainWhitelist.po
@@ -0,0 +1,82 @@
+# Translation of StatusNet - DomainWhitelist to Arabic (العربية)
+# Exported from translatewiki.net
+#
+# Author: OsamaK
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - DomainWhitelist\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:16+0000\n"
+"Language-Team: Arabic <https://translatewiki.net/wiki/Portal:ar>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2012-01-02 10:11:33+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: ar\n"
+"X-Message-Group: #out-statusnet-plugin-domainwhitelist\n"
+"Plural-Forms: nplurals=6; plural=(n == 0) ? 0 : ( (n == 1) ? 1 : ( (n == "
+"2) ? 2 : ( (n%100 >= 3 && n%100 <= 10) ? 3 : ( (n%100 >= 11 && n%100 <= "
+"99) ? 4 : 5 ) ) ) );\n"
+
+#. TRANS: Client exception thrown when a given e-mailaddress is not in the domain whitelist.
+#. TRANS: %s is a whitelisted e-mail domain.
+#, php-format
+msgid "Email address must be in this domain: %s."
+msgstr ""
+
+#. TRANS: Client exception thrown when a given e-mailaddress is not in the domain whitelist.
+#. TRANS: %s are whitelisted e-mail domains separated by comma's (localisable).
+#, php-format
+msgid "Email address must be in one of these domains: %s."
+msgstr ""
+
+#. TRANS: Separator for whitelisted domains.
+msgctxt "SEPARATOR"
+msgid ", "
+msgstr "Ùˆ "
+
+#. TRANS: Exception thrown when an e-mail address does not match the site's domain whitelist.
+msgid "That email address is not allowed on this site."
+msgstr ""
+
+#. TRANS: Title for invitiation deletion dialog.
+msgid "Confirmation Required"
+msgstr ""
+
+#. TRANS: Confirmation text for invitation deletion dialog.
+msgid "Really delete this invitation?"
+msgstr "أأحذ� هذه الدعوة حقا؟"
+
+#. TRANS: Plugin description.
+msgid "Restrict domains for email users."
+msgstr ""
+
+#. TRANS: Form legend.
+msgid "Invite collegues"
+msgstr "دعوة أصدقاء"
+
+#. TRANS: Field label for a personal message to send to invitees.
+msgid "Personal message"
+msgstr "رسالة شخصية"
+
+#. TRANS: Field title for a personal message to send to invitees.
+msgid "Optionally add a personal message to the invitation."
+msgstr "أض� إن شئت رسالة شخصية للدعوة."
+
+#. TRANS: Link description to action to add another item to a list.
+msgid "Add another item"
+msgstr "أرسل"
+
+#. TRANS: Send button for inviting friends.
+msgctxt "BUTTON"
+msgid "Send"
+msgstr "أرسل"
+
+#. TRANS: Submit button title.
+msgid "Send invitations."
+msgstr "أرسل الدعوات."
diff --git a/plugins/DomainWhitelist/locale/ca/LC_MESSAGES/DomainWhitelist.po b/plugins/DomainWhitelist/locale/ca/LC_MESSAGES/DomainWhitelist.po
new file mode 100644
index 0000000000..4ee7a1908f
--- /dev/null
+++ b/plugins/DomainWhitelist/locale/ca/LC_MESSAGES/DomainWhitelist.po
@@ -0,0 +1,81 @@
+# Translation of StatusNet - DomainWhitelist to Catalan (català)
+# Exported from translatewiki.net
+#
+# Author: Solde
+# Author: Toniher
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - DomainWhitelist\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:16+0000\n"
+"Language-Team: Catalan <https://translatewiki.net/wiki/Portal:ca>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2012-01-02 10:11:33+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: ca\n"
+"X-Message-Group: #out-statusnet-plugin-domainwhitelist\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Client exception thrown when a given e-mailaddress is not in the domain whitelist.
+#. TRANS: %s is a whitelisted e-mail domain.
+#, php-format
+msgid "Email address must be in this domain: %s."
+msgstr "L'adreça electrònica ha de ser en aquest domini: %s."
+
+#. TRANS: Client exception thrown when a given e-mailaddress is not in the domain whitelist.
+#. TRANS: %s are whitelisted e-mail domains separated by comma's (localisable).
+#, php-format
+msgid "Email address must be in one of these domains: %s."
+msgstr "L'adreça electrònica ha de ser en un d'aquests dominis: %s."
+
+#. TRANS: Separator for whitelisted domains.
+msgctxt "SEPARATOR"
+msgid ", "
+msgstr ", "
+
+#. TRANS: Exception thrown when an e-mail address does not match the site's domain whitelist.
+msgid "That email address is not allowed on this site."
+msgstr ""
+
+#. TRANS: Title for invitiation deletion dialog.
+msgid "Confirmation Required"
+msgstr "Cal confirmació"
+
+#. TRANS: Confirmation text for invitation deletion dialog.
+msgid "Really delete this invitation?"
+msgstr "Voleu eliminar aquesta invitació?"
+
+#. TRANS: Plugin description.
+msgid "Restrict domains for email users."
+msgstr ""
+
+#. TRANS: Form legend.
+msgid "Invite collegues"
+msgstr "Convida els col·legues"
+
+#. TRANS: Field label for a personal message to send to invitees.
+msgid "Personal message"
+msgstr "Missatge personal"
+
+#. TRANS: Field title for a personal message to send to invitees.
+msgid "Optionally add a personal message to the invitation."
+msgstr "Opcionalment, afegiu un missatge personal a la invitació."
+
+#. TRANS: Link description to action to add another item to a list.
+msgid "Add another item"
+msgstr "Afegeix un altre element"
+
+#. TRANS: Send button for inviting friends.
+msgctxt "BUTTON"
+msgid "Send"
+msgstr "Envia"
+
+#. TRANS: Submit button title.
+msgid "Send invitations."
+msgstr "Envia invitacions."
diff --git a/plugins/DomainWhitelist/locale/de/LC_MESSAGES/DomainWhitelist.po b/plugins/DomainWhitelist/locale/de/LC_MESSAGES/DomainWhitelist.po
index c9b564d16a..022b9cc3a4 100644
--- a/plugins/DomainWhitelist/locale/de/LC_MESSAGES/DomainWhitelist.po
+++ b/plugins/DomainWhitelist/locale/de/LC_MESSAGES/DomainWhitelist.po
@@ -2,6 +2,8 @@
 # Exported from translatewiki.net
 #
 # Author: Giftpflanze
+# Author: Inkowik
+# Author: Marcel083
 # --
 # This file is distributed under the same license as the StatusNet package.
 #
@@ -9,14 +11,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - DomainWhitelist\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:07+0000\n"
-"Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:16+0000\n"
+"Language-Team: German <https://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:26:37+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2012-01-02 10:11:33+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-domainwhitelist\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -27,11 +29,54 @@ msgstr ""
 msgid "Email address must be in this domain: %s."
 msgstr "E-Mail-Adressen müssen diese Domain benutzen: %s"
 
+#. TRANS: Client exception thrown when a given e-mailaddress is not in the domain whitelist.
+#. TRANS: %s are whitelisted e-mail domains separated by comma's (localisable).
+#, php-format
+msgid "Email address must be in one of these domains: %s."
+msgstr "E-Mail-Adressen müssen eine dieser Domains benutzen: %s"
+
 #. TRANS: Separator for whitelisted domains.
 msgctxt "SEPARATOR"
 msgid ", "
 msgstr ", "
 
+#. TRANS: Exception thrown when an e-mail address does not match the site's domain whitelist.
+msgid "That email address is not allowed on this site."
+msgstr "Diese E-Mail-Adresse darf auf dieser Seite nicht verwendet werden."
+
+#. TRANS: Title for invitiation deletion dialog.
+msgid "Confirmation Required"
+msgstr "Bestätigung erforderlich"
+
+#. TRANS: Confirmation text for invitation deletion dialog.
+msgid "Really delete this invitation?"
+msgstr "Diese Einladung wirklich löschen?"
+
 #. TRANS: Plugin description.
 msgid "Restrict domains for email users."
 msgstr "Domains für E-Mail-Benutzer beschränken."
+
+#. TRANS: Form legend.
+msgid "Invite collegues"
+msgstr "Kollegen einladen"
+
+#. TRANS: Field label for a personal message to send to invitees.
+msgid "Personal message"
+msgstr "Persönliche Nachricht"
+
+#. TRANS: Field title for a personal message to send to invitees.
+msgid "Optionally add a personal message to the invitation."
+msgstr "Eine persönliche Nachricht zu der Einladung hinzufügen (optional)"
+
+#. TRANS: Link description to action to add another item to a list.
+msgid "Add another item"
+msgstr "Ein weiteres Element hinzufügen"
+
+#. TRANS: Send button for inviting friends.
+msgctxt "BUTTON"
+msgid "Send"
+msgstr "Senden"
+
+#. TRANS: Submit button title.
+msgid "Send invitations."
+msgstr "Einladungen senden"
diff --git a/plugins/DomainWhitelist/locale/es/LC_MESSAGES/DomainWhitelist.po b/plugins/DomainWhitelist/locale/es/LC_MESSAGES/DomainWhitelist.po
new file mode 100644
index 0000000000..2eebec34b7
--- /dev/null
+++ b/plugins/DomainWhitelist/locale/es/LC_MESSAGES/DomainWhitelist.po
@@ -0,0 +1,81 @@
+# Translation of StatusNet - DomainWhitelist to Spanish (español)
+# Exported from translatewiki.net
+#
+# Author: Erchache2000
+# Author: Od1n
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - DomainWhitelist\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:16+0000\n"
+"Language-Team: Spanish <https://translatewiki.net/wiki/Portal:es>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2012-01-02 10:11:33+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: es\n"
+"X-Message-Group: #out-statusnet-plugin-domainwhitelist\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Client exception thrown when a given e-mailaddress is not in the domain whitelist.
+#. TRANS: %s is a whitelisted e-mail domain.
+#, php-format
+msgid "Email address must be in this domain: %s."
+msgstr "Dirección de correo electrónico debe estar en este dominio:  %s ."
+
+#. TRANS: Client exception thrown when a given e-mailaddress is not in the domain whitelist.
+#. TRANS: %s are whitelisted e-mail domains separated by comma's (localisable).
+#, php-format
+msgid "Email address must be in one of these domains: %s."
+msgstr "Dirección de correo electrónico debe estar en este dominio:  %s ."
+
+#. TRANS: Separator for whitelisted domains.
+msgctxt "SEPARATOR"
+msgid ", "
+msgstr ", "
+
+#. TRANS: Exception thrown when an e-mail address does not match the site's domain whitelist.
+msgid "That email address is not allowed on this site."
+msgstr "Esa dirección de correo electrónico no está permitido en este sitio."
+
+#. TRANS: Title for invitiation deletion dialog.
+msgid "Confirmation Required"
+msgstr "Confirmación requerida"
+
+#. TRANS: Confirmation text for invitation deletion dialog.
+msgid "Really delete this invitation?"
+msgstr "¿Realmente desea eliminar esta invitación?"
+
+#. TRANS: Plugin description.
+msgid "Restrict domains for email users."
+msgstr "Restringir los dominios para los usuarios de correo electrónico."
+
+#. TRANS: Form legend.
+msgid "Invite collegues"
+msgstr "Invitar a amigos"
+
+#. TRANS: Field label for a personal message to send to invitees.
+msgid "Personal message"
+msgstr "Mensaje personal"
+
+#. TRANS: Field title for a personal message to send to invitees.
+msgid "Optionally add a personal message to the invitation."
+msgstr "Opcionalmente añada un mensaje personalizado a su invitación."
+
+#. TRANS: Link description to action to add another item to a list.
+msgid "Add another item"
+msgstr "Añadir otro elemento"
+
+#. TRANS: Send button for inviting friends.
+msgctxt "BUTTON"
+msgid "Send"
+msgstr "Enviar"
+
+#. TRANS: Submit button title.
+msgid "Send invitations."
+msgstr "Enviar invitaciones."
diff --git a/plugins/DomainWhitelist/locale/eu/LC_MESSAGES/DomainWhitelist.po b/plugins/DomainWhitelist/locale/eu/LC_MESSAGES/DomainWhitelist.po
new file mode 100644
index 0000000000..46ff48ae5a
--- /dev/null
+++ b/plugins/DomainWhitelist/locale/eu/LC_MESSAGES/DomainWhitelist.po
@@ -0,0 +1,77 @@
+# Translation of StatusNet - DomainWhitelist to Basque (euskara)
+# Exported from translatewiki.net
+#
+# Author: Artsuaga
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - DomainWhitelist\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:16+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2012-01-02 10:11:33+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Client exception thrown when a given e-mailaddress is not in the domain whitelist.
+#. TRANS: %s is a whitelisted e-mail domain.
+#, php-format
+msgid "Email address must be in this domain: %s."
+msgstr "Eposta helbideak %s domeinukoa izan beharko du."
+
+#. TRANS: Client exception thrown when a given e-mailaddress is not in the domain whitelist.
+#. TRANS: %s are whitelisted e-mail domains separated by comma's (localisable).
+#, php-format
+msgid "Email address must be in one of these domains: %s."
+msgstr "Eposta helbideak domeinu hauetakoren batean egon beharko du: %s."
+
+#. TRANS: Separator for whitelisted domains.
+msgctxt "SEPARATOR"
+msgid ", "
+msgstr ", "
+
+#. TRANS: Exception thrown when an e-mail address does not match the site's domain whitelist.
+msgid "That email address is not allowed on this site."
+msgstr "Eposta helbide hori ez dago onartua gune hontan."
+
+#. TRANS: Title for invitiation deletion dialog.
+msgid "Confirmation Required"
+msgstr "Konfirmatzea Beharrezkoa"
+
+#. TRANS: Confirmation text for invitation deletion dialog.
+msgid "Really delete this invitation?"
+msgstr "Ziur gonbidapen hau ezabatu nahi duzula?"
+
+#. TRANS: Plugin description.
+msgid "Restrict domains for email users."
+msgstr "Eposta erabiltzaileentzat domeinuak murriztu."
+
+#. TRANS: Form legend.
+msgid "Invite collegues"
+msgstr "Gonbidatu lankideak"
+
+#. TRANS: Field label for a personal message to send to invitees.
+msgid "Personal message"
+msgstr "Mezu pertsonala"
+
+#. TRANS: Field title for a personal message to send to invitees.
+msgid "Optionally add a personal message to the invitation."
+msgstr "Aukeran, gehitu mezu pertsonal bat gonbidapenari."
+
+#. TRANS: Link description to action to add another item to a list.
+msgid "Add another item"
+msgstr "Gehitu eremu berria"
+
+#. TRANS: Send button for inviting friends.
+msgctxt "BUTTON"
+msgid "Send"
+msgstr "Bidali"
+
+#. TRANS: Submit button title.
+msgid "Send invitations."
+msgstr "Bidali gonbidapenak."
diff --git a/plugins/DomainWhitelist/locale/fr/LC_MESSAGES/DomainWhitelist.po b/plugins/DomainWhitelist/locale/fr/LC_MESSAGES/DomainWhitelist.po
index d4e386809c..ff3bfea8a8 100644
--- a/plugins/DomainWhitelist/locale/fr/LC_MESSAGES/DomainWhitelist.po
+++ b/plugins/DomainWhitelist/locale/fr/LC_MESSAGES/DomainWhitelist.po
@@ -1,8 +1,12 @@
-# Translation of StatusNet - DomainWhitelist to French (Français)
+# Translation of StatusNet - DomainWhitelist to French (français)
 # Exported from translatewiki.net
 #
+# Author: Gomoko
 # Author: Iketsi
+# Author: Lucky
+# Author: Od1n
 # Author: Peter17
+# Author: Sherbrooke
 # --
 # This file is distributed under the same license as the StatusNet package.
 #
@@ -10,14 +14,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - DomainWhitelist\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:07+0000\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:16+0000\n"
 "Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:26:37+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2012-01-02 10:11:33+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-domainwhitelist\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
@@ -28,11 +32,54 @@ msgstr ""
 msgid "Email address must be in this domain: %s."
 msgstr "Adresse de courriel doit être dans ce domaine : %s."
 
+#. TRANS: Client exception thrown when a given e-mailaddress is not in the domain whitelist.
+#. TRANS: %s are whitelisted e-mail domains separated by comma's (localisable).
+#, php-format
+msgid "Email address must be in one of these domains: %s."
+msgstr "Cette adresse de courriel doit appartenir à l'un de ces domaines : %s."
+
 #. TRANS: Separator for whitelisted domains.
 msgctxt "SEPARATOR"
 msgid ", "
 msgstr ", "
 
+#. TRANS: Exception thrown when an e-mail address does not match the site's domain whitelist.
+msgid "That email address is not allowed on this site."
+msgstr "Cette adresse de courriel n'est pas autorisée sur ce site."
+
+#. TRANS: Title for invitiation deletion dialog.
+msgid "Confirmation Required"
+msgstr "Confirmation requise"
+
+#. TRANS: Confirmation text for invitation deletion dialog.
+msgid "Really delete this invitation?"
+msgstr "Voulez-vous vraiment effacer cette invitation ?"
+
 #. TRANS: Plugin description.
 msgid "Restrict domains for email users."
 msgstr "Restreindre les domaines pour les utilisateurs de messagerie."
+
+#. TRANS: Form legend.
+msgid "Invite collegues"
+msgstr "Inviter des collègues"
+
+#. TRANS: Field label for a personal message to send to invitees.
+msgid "Personal message"
+msgstr "Message personnel"
+
+#. TRANS: Field title for a personal message to send to invitees.
+msgid "Optionally add a personal message to the invitation."
+msgstr "Ajouter éventuellement un message personnel à l’invitation."
+
+#. TRANS: Link description to action to add another item to a list.
+msgid "Add another item"
+msgstr "Ajouter un autre élément"
+
+#. TRANS: Send button for inviting friends.
+msgctxt "BUTTON"
+msgid "Send"
+msgstr "Envoyer"
+
+#. TRANS: Submit button title.
+msgid "Send invitations."
+msgstr "Envoyer les invitations."
diff --git a/plugins/DomainWhitelist/locale/gl/LC_MESSAGES/DomainWhitelist.po b/plugins/DomainWhitelist/locale/gl/LC_MESSAGES/DomainWhitelist.po
new file mode 100644
index 0000000000..3ffeb860cc
--- /dev/null
+++ b/plugins/DomainWhitelist/locale/gl/LC_MESSAGES/DomainWhitelist.po
@@ -0,0 +1,80 @@
+# Translation of StatusNet - DomainWhitelist to Galician (galego)
+# Exported from translatewiki.net
+#
+# Author: Toliño
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - DomainWhitelist\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:16+0000\n"
+"Language-Team: Galician <https://translatewiki.net/wiki/Portal:gl>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2012-01-02 10:11:33+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: gl\n"
+"X-Message-Group: #out-statusnet-plugin-domainwhitelist\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Client exception thrown when a given e-mailaddress is not in the domain whitelist.
+#. TRANS: %s is a whitelisted e-mail domain.
+#, php-format
+msgid "Email address must be in this domain: %s."
+msgstr "O enderezo de correo electrónico debe ser deste dominio: %s."
+
+#. TRANS: Client exception thrown when a given e-mailaddress is not in the domain whitelist.
+#. TRANS: %s are whitelisted e-mail domains separated by comma's (localisable).
+#, php-format
+msgid "Email address must be in one of these domains: %s."
+msgstr "O enderezo de correo electrónico debe ser dun destes dominios: %s."
+
+#. TRANS: Separator for whitelisted domains.
+msgctxt "SEPARATOR"
+msgid ", "
+msgstr ", "
+
+#. TRANS: Exception thrown when an e-mail address does not match the site's domain whitelist.
+msgid "That email address is not allowed on this site."
+msgstr "Ese enderezo de correo electrónico non está permitido neste sitio."
+
+#. TRANS: Title for invitiation deletion dialog.
+msgid "Confirmation Required"
+msgstr "Cómpre confirmación"
+
+#. TRANS: Confirmation text for invitation deletion dialog.
+msgid "Really delete this invitation?"
+msgstr "Está seguro de querer borrar esta invitación?"
+
+#. TRANS: Plugin description.
+msgid "Restrict domains for email users."
+msgstr "Restrinxir os dominios para os usuarios de correo electrónico."
+
+#. TRANS: Form legend.
+msgid "Invite collegues"
+msgstr "Convidar colegas"
+
+#. TRANS: Field label for a personal message to send to invitees.
+msgid "Personal message"
+msgstr "Mensaxe persoal"
+
+#. TRANS: Field title for a personal message to send to invitees.
+msgid "Optionally add a personal message to the invitation."
+msgstr "Engadir opcionalmente unha mensaxe persoal á invitación."
+
+#. TRANS: Link description to action to add another item to a list.
+msgid "Add another item"
+msgstr "Engadir outro elemento"
+
+#. TRANS: Send button for inviting friends.
+msgctxt "BUTTON"
+msgid "Send"
+msgstr "Enviar"
+
+#. TRANS: Submit button title.
+msgid "Send invitations."
+msgstr "Enviar as invitacións."
diff --git a/plugins/DomainWhitelist/locale/ia/LC_MESSAGES/DomainWhitelist.po b/plugins/DomainWhitelist/locale/ia/LC_MESSAGES/DomainWhitelist.po
index c8c40c2ccc..eb10229f20 100644
--- a/plugins/DomainWhitelist/locale/ia/LC_MESSAGES/DomainWhitelist.po
+++ b/plugins/DomainWhitelist/locale/ia/LC_MESSAGES/DomainWhitelist.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - DomainWhitelist to Interlingua (Interlingua)
+# Translation of StatusNet - DomainWhitelist to Interlingua (interlingua)
 # Exported from translatewiki.net
 #
 # Author: McDutchie
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - DomainWhitelist\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:07+0000\n"
-"Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:16+0000\n"
+"Language-Team: Interlingua <https://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:26:37+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2012-01-02 10:11:33+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-domainwhitelist\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -27,11 +27,54 @@ msgstr ""
 msgid "Email address must be in this domain: %s."
 msgstr "Le adresse de e-mail debe esser in iste dominio: %s."
 
+#. TRANS: Client exception thrown when a given e-mailaddress is not in the domain whitelist.
+#. TRANS: %s are whitelisted e-mail domains separated by comma's (localisable).
+#, php-format
+msgid "Email address must be in one of these domains: %s."
+msgstr "Le adresse de e-mail debe esser in un de iste dominios: %s."
+
 #. TRANS: Separator for whitelisted domains.
 msgctxt "SEPARATOR"
 msgid ", "
 msgstr ", "
 
+#. TRANS: Exception thrown when an e-mail address does not match the site's domain whitelist.
+msgid "That email address is not allowed on this site."
+msgstr "Iste adresse de e-mail non es permittite in iste sito."
+
+#. TRANS: Title for invitiation deletion dialog.
+msgid "Confirmation Required"
+msgstr "Confirmation necessari"
+
+#. TRANS: Confirmation text for invitation deletion dialog.
+msgid "Really delete this invitation?"
+msgstr "Es tu secur de voler deler iste invitation?"
+
 #. TRANS: Plugin description.
 msgid "Restrict domains for email users."
 msgstr "Restringer dominios pro usatores de e-mail."
+
+#. TRANS: Form legend.
+msgid "Invite collegues"
+msgstr "Invitar collegas"
+
+#. TRANS: Field label for a personal message to send to invitees.
+msgid "Personal message"
+msgstr "Message personal"
+
+#. TRANS: Field title for a personal message to send to invitees.
+msgid "Optionally add a personal message to the invitation."
+msgstr "Si tu vole, adde un message personal al invitation."
+
+#. TRANS: Link description to action to add another item to a list.
+msgid "Add another item"
+msgstr "Adder un altere elemento"
+
+#. TRANS: Send button for inviting friends.
+msgctxt "BUTTON"
+msgid "Send"
+msgstr "Inviar"
+
+#. TRANS: Submit button title.
+msgid "Send invitations."
+msgstr "Inviar invitationes."
diff --git a/plugins/DomainWhitelist/locale/it/LC_MESSAGES/DomainWhitelist.po b/plugins/DomainWhitelist/locale/it/LC_MESSAGES/DomainWhitelist.po
new file mode 100644
index 0000000000..5f14305ed1
--- /dev/null
+++ b/plugins/DomainWhitelist/locale/it/LC_MESSAGES/DomainWhitelist.po
@@ -0,0 +1,78 @@
+# Translation of StatusNet - DomainWhitelist to Italian (italiano)
+# Exported from translatewiki.net
+#
+# Author: Od1n
+# Author: Ximo17
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - DomainWhitelist\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:17+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2012-01-02 10:11:33+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Client exception thrown when a given e-mailaddress is not in the domain whitelist.
+#. TRANS: %s is a whitelisted e-mail domain.
+#, php-format
+msgid "Email address must be in this domain: %s."
+msgstr "L'indirizzo email deve essere in questo dominio: %s."
+
+#. TRANS: Client exception thrown when a given e-mailaddress is not in the domain whitelist.
+#. TRANS: %s are whitelisted e-mail domains separated by comma's (localisable).
+#, php-format
+msgid "Email address must be in one of these domains: %s."
+msgstr "L'indirizzo email deve essere in uno di questi domini: %s."
+
+#. TRANS: Separator for whitelisted domains.
+msgctxt "SEPARATOR"
+msgid ", "
+msgstr ", "
+
+#. TRANS: Exception thrown when an e-mail address does not match the site's domain whitelist.
+msgid "That email address is not allowed on this site."
+msgstr "Questo indirizzo email non è consentito su questo sito."
+
+#. TRANS: Title for invitiation deletion dialog.
+msgid "Confirmation Required"
+msgstr "Richiesta Conferma"
+
+#. TRANS: Confirmation text for invitation deletion dialog.
+msgid "Really delete this invitation?"
+msgstr "Vuoi davvero cancellare questo invito?"
+
+#. TRANS: Plugin description.
+msgid "Restrict domains for email users."
+msgstr "Limitare i domini per gli utenti di posta ettronica."
+
+#. TRANS: Form legend.
+msgid "Invite collegues"
+msgstr "Invita colleghi"
+
+#. TRANS: Field label for a personal message to send to invitees.
+msgid "Personal message"
+msgstr "Messaggio personale"
+
+#. TRANS: Field title for a personal message to send to invitees.
+msgid "Optionally add a personal message to the invitation."
+msgstr "Puoi aggiungere un messaggio personale agli inviti."
+
+#. TRANS: Link description to action to add another item to a list.
+msgid "Add another item"
+msgstr "Aggiungi un altro oggetto"
+
+#. TRANS: Send button for inviting friends.
+msgctxt "BUTTON"
+msgid "Send"
+msgstr "Invia"
+
+#. TRANS: Submit button title.
+msgid "Send invitations."
+msgstr "Manda inviti."
diff --git a/plugins/DomainWhitelist/locale/ksh/LC_MESSAGES/DomainWhitelist.po b/plugins/DomainWhitelist/locale/ksh/LC_MESSAGES/DomainWhitelist.po
new file mode 100644
index 0000000000..521b04086a
--- /dev/null
+++ b/plugins/DomainWhitelist/locale/ksh/LC_MESSAGES/DomainWhitelist.po
@@ -0,0 +1,81 @@
+# Translation of StatusNet - DomainWhitelist to Colognian (Ripoarisch)
+# Exported from translatewiki.net
+#
+# Author: Purodha
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - DomainWhitelist\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-06-05 09:13+0000\n"
+"PO-Revision-Date: 2011-06-05 09:14:12+0000\n"
+"Language-Team: Colognian <http://translatewiki.net/wiki/Portal:ksh>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-05-05 21:44:42+0000\n"
+"X-Generator: MediaWiki 1.19alpha (r89487); Translate extension (2011-06-02)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: ksh\n"
+"X-Message-Group: #out-statusnet-plugin-domainwhitelist\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Client exception thrown when a given e-mailaddress is not in the domain whitelist.
+#. TRANS: %s is a whitelisted e-mail domain.
+#, php-format
+msgid "Email address must be in this domain: %s."
+msgstr "Adräße för de <i lang=\"en\">e-mail</i> möße heh di Domain han: %s"
+
+#. TRANS: Client exception thrown when a given e-mailaddress is not in the domain whitelist.
+#. TRANS: %s are whitelisted e-mail domains separated by comma's (localisable).
+#, fuzzy, php-format
+msgid "Email address must be in one of these domains: %s."
+msgstr "Adräße för de <i lang=\"en\">e-mail</i> möße heh di Domain han: %s"
+
+#. TRANS: Separator for whitelisted domains.
+msgctxt "SEPARATOR"
+msgid ", "
+msgstr ", "
+
+#. TRANS: Exception thrown when an e-mail address does not match the site's domain whitelist.
+#, fuzzy
+msgid "That email address is not allowed on this site."
+msgstr "Adräße för de <i lang=\"en\">e-mail</i> möße heh di Domain han: %s"
+
+#. TRANS: Title for invitiation deletion dialog.
+msgid "Confirmation Required"
+msgstr ""
+
+#. TRANS: Confirmation text for invitation deletion dialog.
+msgid "Really delete this invitation?"
+msgstr ""
+
+#. TRANS: Plugin description.
+msgid "Restrict domains for email users."
+msgstr "Domains för de <i lang=\"en\">e-mail</i> beschrängke."
+
+#. TRANS: Form legend.
+msgid "Invite collegues"
+msgstr ""
+
+#. TRANS: Field label for a personal message to send to invitees.
+msgid "Personal message"
+msgstr ""
+
+#. TRANS: Field title for a personal message to send to invitees.
+msgid "Optionally add a personal message to the invitation."
+msgstr ""
+
+#. TRANS: Link description to action to add another item to a list.
+msgid "Add another item"
+msgstr ""
+
+#. TRANS: Send button for inviting friends.
+msgctxt "BUTTON"
+msgid "Send"
+msgstr ""
+
+#. TRANS: Submit button title.
+msgid "Send invitations."
+msgstr ""
diff --git a/plugins/DomainWhitelist/locale/lt/LC_MESSAGES/DomainWhitelist.po b/plugins/DomainWhitelist/locale/lt/LC_MESSAGES/DomainWhitelist.po
new file mode 100644
index 0000000000..e9659c9863
--- /dev/null
+++ b/plugins/DomainWhitelist/locale/lt/LC_MESSAGES/DomainWhitelist.po
@@ -0,0 +1,81 @@
+# Translation of StatusNet - DomainWhitelist to Lithuanian (lietuvių)
+# Exported from translatewiki.net
+#
+# Author: Eitvys200
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - DomainWhitelist\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:17+0000\n"
+"Language-Team: Lithuanian <https://translatewiki.net/wiki/Portal:lt>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2012-01-02 10:11:33+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: lt\n"
+"X-Message-Group: #out-statusnet-plugin-domainwhitelist\n"
+"Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
+"2 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
+
+#. TRANS: Client exception thrown when a given e-mailaddress is not in the domain whitelist.
+#. TRANS: %s is a whitelisted e-mail domain.
+#, php-format
+msgid "Email address must be in this domain: %s."
+msgstr "Elektroninio pašto adresas turi būti šiame domene:  %s."
+
+#. TRANS: Client exception thrown when a given e-mailaddress is not in the domain whitelist.
+#. TRANS: %s are whitelisted e-mail domains separated by comma's (localisable).
+#, php-format
+msgid "Email address must be in one of these domains: %s."
+msgstr "Elektroninio pašto adresas turi būti viename iš šių domenų:  %s."
+
+#. TRANS: Separator for whitelisted domains.
+msgctxt "SEPARATOR"
+msgid ", "
+msgstr ", "
+
+#. TRANS: Exception thrown when an e-mail address does not match the site's domain whitelist.
+msgid "That email address is not allowed on this site."
+msgstr "Šis el. pašto adresas neleidžiamas šioje svetainėje."
+
+#. TRANS: Title for invitiation deletion dialog.
+msgid "Confirmation Required"
+msgstr "Reikalingas Patvirtinimas"
+
+#. TRANS: Confirmation text for invitation deletion dialog.
+msgid "Really delete this invitation?"
+msgstr ""
+
+#. TRANS: Plugin description.
+msgid "Restrict domains for email users."
+msgstr ""
+
+#. TRANS: Form legend.
+msgid "Invite collegues"
+msgstr ""
+
+#. TRANS: Field label for a personal message to send to invitees.
+msgid "Personal message"
+msgstr "Asmeninis pranešimas"
+
+#. TRANS: Field title for a personal message to send to invitees.
+msgid "Optionally add a personal message to the invitation."
+msgstr ""
+
+#. TRANS: Link description to action to add another item to a list.
+msgid "Add another item"
+msgstr "PridÄ—ti kitÄ… failÄ…"
+
+#. TRANS: Send button for inviting friends.
+msgctxt "BUTTON"
+msgid "Send"
+msgstr "Siųsti"
+
+#. TRANS: Submit button title.
+msgid "Send invitations."
+msgstr "Siųsti kvietimus."
diff --git a/plugins/DomainWhitelist/locale/mk/LC_MESSAGES/DomainWhitelist.po b/plugins/DomainWhitelist/locale/mk/LC_MESSAGES/DomainWhitelist.po
index b79a47e162..73b2119b40 100644
--- a/plugins/DomainWhitelist/locale/mk/LC_MESSAGES/DomainWhitelist.po
+++ b/plugins/DomainWhitelist/locale/mk/LC_MESSAGES/DomainWhitelist.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - DomainWhitelist to Macedonian (Македон�ки)
+# Translation of StatusNet - DomainWhitelist to Macedonian (македон�ки)
 # Exported from translatewiki.net
 #
 # Author: Bjankuloski06
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - DomainWhitelist\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:07+0000\n"
-"Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:17+0000\n"
+"Language-Team: Macedonian <https://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:26:37+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2012-01-02 10:11:33+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-domainwhitelist\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
@@ -27,11 +27,54 @@ msgstr ""
 msgid "Email address must be in this domain: %s."
 msgstr "Е-поштен�ката адре�а мора да биде во �ледниов домен: %s."
 
+#. TRANS: Client exception thrown when a given e-mailaddress is not in the domain whitelist.
+#. TRANS: %s are whitelisted e-mail domains separated by comma's (localisable).
+#, php-format
+msgid "Email address must be in one of these domains: %s."
+msgstr "Е-поштен�ката адре�а мора да биде во еден од �ледниве домени: %s."
+
 #. TRANS: Separator for whitelisted domains.
 msgctxt "SEPARATOR"
 msgid ", "
 msgstr ", "
 
+#. TRANS: Exception thrown when an e-mail address does not match the site's domain whitelist.
+msgid "That email address is not allowed on this site."
+msgstr "Таа е-поштен�ка адре�а не е дозволена на ова мрежно ме�то."
+
+#. TRANS: Title for invitiation deletion dialog.
+msgid "Confirmation Required"
+msgstr "Се бара потврда"
+
+#. TRANS: Confirmation text for invitation deletion dialog.
+msgid "Really delete this invitation?"
+msgstr "�ави�тина да ја избришам поканава?"
+
 #. TRANS: Plugin description.
 msgid "Restrict domains for email users."
 msgstr "Ограничување на домените за кори�ници на е-пошта"
+
+#. TRANS: Form legend.
+msgid "Invite collegues"
+msgstr "Покани колеги"
+
+#. TRANS: Field label for a personal message to send to invitees.
+msgid "Personal message"
+msgstr "Лична порака"
+
+#. TRANS: Field title for a personal message to send to invitees.
+msgid "Optionally add a personal message to the invitation."
+msgstr "Можете да додадете и лична порака во поканата."
+
+#. TRANS: Link description to action to add another item to a list.
+msgid "Add another item"
+msgstr "Додај друга �тавка"
+
+#. TRANS: Send button for inviting friends.
+msgctxt "BUTTON"
+msgid "Send"
+msgstr "И�прати"
+
+#. TRANS: Submit button title.
+msgid "Send invitations."
+msgstr "И�прати покани."
diff --git a/plugins/DomainWhitelist/locale/nb/LC_MESSAGES/DomainWhitelist.po b/plugins/DomainWhitelist/locale/nb/LC_MESSAGES/DomainWhitelist.po
index 3374f3e721..ad9836ba8c 100644
--- a/plugins/DomainWhitelist/locale/nb/LC_MESSAGES/DomainWhitelist.po
+++ b/plugins/DomainWhitelist/locale/nb/LC_MESSAGES/DomainWhitelist.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - DomainWhitelist\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:07+0000\n"
+"POT-Creation-Date: 2011-06-05 09:13+0000\n"
+"PO-Revision-Date: 2011-06-05 09:14:12+0000\n"
 "Language-Team: Norwegian (bokmål)‬ <http://translatewiki.net/wiki/Portal:no>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:26:37+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
+"X-POT-Import-Date: 2011-05-05 21:44:42+0000\n"
+"X-Generator: MediaWiki 1.19alpha (r89487); Translate extension (2011-06-02)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: no\n"
 "X-Message-Group: #out-statusnet-plugin-domainwhitelist\n"
@@ -27,11 +27,55 @@ msgstr ""
 msgid "Email address must be in this domain: %s."
 msgstr "E-postadresser må være i dette domenet: %s."
 
+#. TRANS: Client exception thrown when a given e-mailaddress is not in the domain whitelist.
+#. TRANS: %s are whitelisted e-mail domains separated by comma's (localisable).
+#, fuzzy, php-format
+msgid "Email address must be in one of these domains: %s."
+msgstr "E-postadresser må være i dette domenet: %s."
+
 #. TRANS: Separator for whitelisted domains.
 msgctxt "SEPARATOR"
 msgid ", "
 msgstr ", "
 
+#. TRANS: Exception thrown when an e-mail address does not match the site's domain whitelist.
+#, fuzzy
+msgid "That email address is not allowed on this site."
+msgstr "E-postadresser må være i dette domenet: %s."
+
+#. TRANS: Title for invitiation deletion dialog.
+msgid "Confirmation Required"
+msgstr ""
+
+#. TRANS: Confirmation text for invitation deletion dialog.
+msgid "Really delete this invitation?"
+msgstr ""
+
 #. TRANS: Plugin description.
 msgid "Restrict domains for email users."
 msgstr ""
+
+#. TRANS: Form legend.
+msgid "Invite collegues"
+msgstr ""
+
+#. TRANS: Field label for a personal message to send to invitees.
+msgid "Personal message"
+msgstr ""
+
+#. TRANS: Field title for a personal message to send to invitees.
+msgid "Optionally add a personal message to the invitation."
+msgstr ""
+
+#. TRANS: Link description to action to add another item to a list.
+msgid "Add another item"
+msgstr ""
+
+#. TRANS: Send button for inviting friends.
+msgctxt "BUTTON"
+msgid "Send"
+msgstr ""
+
+#. TRANS: Submit button title.
+msgid "Send invitations."
+msgstr ""
diff --git a/plugins/DomainWhitelist/locale/nl/LC_MESSAGES/DomainWhitelist.po b/plugins/DomainWhitelist/locale/nl/LC_MESSAGES/DomainWhitelist.po
index 1fbbd7dc97..7889f53e10 100644
--- a/plugins/DomainWhitelist/locale/nl/LC_MESSAGES/DomainWhitelist.po
+++ b/plugins/DomainWhitelist/locale/nl/LC_MESSAGES/DomainWhitelist.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - DomainWhitelist\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:07+0000\n"
-"Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:17+0000\n"
+"Language-Team: Dutch <https://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:26:37+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2012-01-02 10:11:33+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-domainwhitelist\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -27,11 +27,54 @@ msgstr ""
 msgid "Email address must be in this domain: %s."
 msgstr "Het e-mailadres moet in dit domein zitten: %s."
 
+#. TRANS: Client exception thrown when a given e-mailaddress is not in the domain whitelist.
+#. TRANS: %s are whitelisted e-mail domains separated by comma's (localisable).
+#, php-format
+msgid "Email address must be in one of these domains: %s."
+msgstr "Het e-mailadres moet in een van de volgende domeinen zitten: %s."
+
 #. TRANS: Separator for whitelisted domains.
 msgctxt "SEPARATOR"
 msgid ", "
 msgstr ", "
 
+#. TRANS: Exception thrown when an e-mail address does not match the site's domain whitelist.
+msgid "That email address is not allowed on this site."
+msgstr "Dat e-mailadres is niet toegestaan op deze site."
+
+#. TRANS: Title for invitiation deletion dialog.
+msgid "Confirmation Required"
+msgstr "Bevestiging vereist"
+
+#. TRANS: Confirmation text for invitation deletion dialog.
+msgid "Really delete this invitation?"
+msgstr "Deze uitnodiging verwijderen?"
+
 #. TRANS: Plugin description.
 msgid "Restrict domains for email users."
 msgstr "Domeinbeperkingen voor e-mailadressen van gebruikers."
+
+#. TRANS: Form legend.
+msgid "Invite collegues"
+msgstr "Collega's uitnodigen"
+
+#. TRANS: Field label for a personal message to send to invitees.
+msgid "Personal message"
+msgstr "Persoonlijk bericht"
+
+#. TRANS: Field title for a personal message to send to invitees.
+msgid "Optionally add a personal message to the invitation."
+msgstr "Persoonlijk bericht bij de uitnodiging (optioneel)."
+
+#. TRANS: Link description to action to add another item to a list.
+msgid "Add another item"
+msgstr "Item toevoegen"
+
+#. TRANS: Send button for inviting friends.
+msgctxt "BUTTON"
+msgid "Send"
+msgstr "Verzenden"
+
+#. TRANS: Submit button title.
+msgid "Send invitations."
+msgstr "Uitnodigingen verzenden."
diff --git a/plugins/DomainWhitelist/locale/tl/LC_MESSAGES/DomainWhitelist.po b/plugins/DomainWhitelist/locale/tl/LC_MESSAGES/DomainWhitelist.po
index 38b2becfec..3302da6191 100644
--- a/plugins/DomainWhitelist/locale/tl/LC_MESSAGES/DomainWhitelist.po
+++ b/plugins/DomainWhitelist/locale/tl/LC_MESSAGES/DomainWhitelist.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - DomainWhitelist\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:07+0000\n"
-"Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:17+0000\n"
+"Language-Team: Tagalog <https://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:26:37+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2012-01-02 10:11:33+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-domainwhitelist\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -27,11 +27,56 @@ msgstr ""
 msgid "Email address must be in this domain: %s."
 msgstr "Ang tirahan ng e-liham ay dapat na nasa loob ng nasasakupang ito: %s."
 
+#. TRANS: Client exception thrown when a given e-mailaddress is not in the domain whitelist.
+#. TRANS: %s are whitelisted e-mail domains separated by comma's (localisable).
+#, php-format
+msgid "Email address must be in one of these domains: %s."
+msgstr ""
+"Ang tirahan ng e-liham ay dapat na nasa loob ng isa sa mga nasasakupang ito: "
+"%s."
+
 #. TRANS: Separator for whitelisted domains.
 msgctxt "SEPARATOR"
 msgid ", "
 msgstr ", "
 
+#. TRANS: Exception thrown when an e-mail address does not match the site's domain whitelist.
+msgid "That email address is not allowed on this site."
+msgstr "Ang tirahan ng e-liham ay hindi pinapayagan sa loob ng sityong ito."
+
+#. TRANS: Title for invitiation deletion dialog.
+msgid "Confirmation Required"
+msgstr "Kailangan ang Pagpapatunay"
+
+#. TRANS: Confirmation text for invitation deletion dialog.
+msgid "Really delete this invitation?"
+msgstr "Buburahin na talaga ang paanyayang ito?"
+
 #. TRANS: Plugin description.
 msgid "Restrict domains for email users."
 msgstr "Hangganan ang mga nasasakupan sa mga tagagamit ng e-liham."
+
+#. TRANS: Form legend.
+msgid "Invite collegues"
+msgstr "Anyayahan ang mga kasamahan"
+
+#. TRANS: Field label for a personal message to send to invitees.
+msgid "Personal message"
+msgstr "Personal na mensahe"
+
+#. TRANS: Field title for a personal message to send to invitees.
+msgid "Optionally add a personal message to the invitation."
+msgstr "Opsyonal na magdagdag ng isang personal na mensahe sa paanyaya."
+
+#. TRANS: Link description to action to add another item to a list.
+msgid "Add another item"
+msgstr "Magdagdag ng isa pang larawan"
+
+#. TRANS: Send button for inviting friends.
+msgctxt "BUTTON"
+msgid "Send"
+msgstr "Ipadala"
+
+#. TRANS: Submit button title.
+msgid "Send invitations."
+msgstr "Magpadala ng mga paanyaya."
diff --git a/plugins/DomainWhitelist/locale/uk/LC_MESSAGES/DomainWhitelist.po b/plugins/DomainWhitelist/locale/uk/LC_MESSAGES/DomainWhitelist.po
index 3bc4befc6e..ec1a5d052c 100644
--- a/plugins/DomainWhitelist/locale/uk/LC_MESSAGES/DomainWhitelist.po
+++ b/plugins/DomainWhitelist/locale/uk/LC_MESSAGES/DomainWhitelist.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - DomainWhitelist to Ukrainian (Україн�ька)
+# Translation of StatusNet - DomainWhitelist to Ukrainian (україн�ька)
 # Exported from translatewiki.net
 #
 # Author: Boogie
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - DomainWhitelist\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:07+0000\n"
-"Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:17+0000\n"
+"Language-Team: Ukrainian <https://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:26:37+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2012-01-02 10:11:33+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-domainwhitelist\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
@@ -28,11 +28,54 @@ msgstr ""
 msgid "Email address must be in this domain: %s."
 msgstr "�дре�а електронної пошти повинна бути в цьому домені: %s."
 
+#. TRANS: Client exception thrown when a given e-mailaddress is not in the domain whitelist.
+#. TRANS: %s are whitelisted e-mail domains separated by comma's (localisable).
+#, php-format
+msgid "Email address must be in one of these domains: %s."
+msgstr "�дре�а електронної пошти повинна бути в одному з цих доменів: %s."
+
 #. TRANS: Separator for whitelisted domains.
 msgctxt "SEPARATOR"
 msgid ", "
 msgstr ", "
 
+#. TRANS: Exception thrown when an e-mail address does not match the site's domain whitelist.
+msgid "That email address is not allowed on this site."
+msgstr "Така адре�а електронної пошти є неприпу�тимою на цьому �айті."
+
+#. TRANS: Title for invitiation deletion dialog.
+msgid "Confirmation Required"
+msgstr "�еобхідне підтвердженн�"
+
+#. TRANS: Confirmation text for invitation deletion dialog.
+msgid "Really delete this invitation?"
+msgstr "Дій�но видалити це запрошенн�?"
+
 #. TRANS: Plugin description.
 msgid "Restrict domains for email users."
 msgstr "Обмежити домени дл� електронної пошти кори�тувачів."
+
+#. TRANS: Form legend.
+msgid "Invite collegues"
+msgstr "Запро�ити колег"
+
+#. TRANS: Field label for a personal message to send to invitees.
+msgid "Personal message"
+msgstr "О�оби�те повідомленн�"
+
+#. TRANS: Field title for a personal message to send to invitees.
+msgid "Optionally add a personal message to the invitation."
+msgstr "При необхідно�ті додайте о�оби�те повідомленн� до запрошенн�."
+
+#. TRANS: Link description to action to add another item to a list.
+msgid "Add another item"
+msgstr "Додати ще один пункт"
+
+#. TRANS: Send button for inviting friends.
+msgctxt "BUTTON"
+msgid "Send"
+msgstr "�аді�лати"
+
+#. TRANS: Submit button title.
+msgid "Send invitations."
+msgstr "�аді�лати запрошенн�."
diff --git a/plugins/Echo/locale/Echo.pot b/plugins/Echo/locale/Echo.pot
index b8f8887abe..e2cb4968c5 100644
--- a/plugins/Echo/locale/Echo.pot
+++ b/plugins/Echo/locale/Echo.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
+"POT-Creation-Date: 2012-06-30 11:07+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"
diff --git a/plugins/Echo/locale/ar/LC_MESSAGES/Echo.po b/plugins/Echo/locale/ar/LC_MESSAGES/Echo.po
index 56980ca206..3a2155fe50 100644
--- a/plugins/Echo/locale/ar/LC_MESSAGES/Echo.po
+++ b/plugins/Echo/locale/ar/LC_MESSAGES/Echo.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Echo\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:08+0000\n"
-"Language-Team: Arabic <http://translatewiki.net/wiki/Portal:ar>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:17+0000\n"
+"Language-Team: Arabic <https://translatewiki.net/wiki/Portal:ar>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:06:09+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:02+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ar\n"
 "X-Message-Group: #out-statusnet-plugin-echo\n"
 "Plural-Forms: nplurals=6; plural=(n == 0) ? 0 : ( (n == 1) ? 1 : ( (n == "
diff --git a/plugins/Echo/locale/be-tarask/LC_MESSAGES/Echo.po b/plugins/Echo/locale/be-tarask/LC_MESSAGES/Echo.po
index a3577e58a1..d62bdb44db 100644
--- a/plugins/Echo/locale/be-tarask/LC_MESSAGES/Echo.po
+++ b/plugins/Echo/locale/be-tarask/LC_MESSAGES/Echo.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Echo to Belarusian (Taraškievica orthography) (‪Белару�ка� (тарашкевіца)‬)
+# Translation of StatusNet - Echo to Belarusian (Taraškievica orthography) (‪белару�ка� (тарашкевіца)‬)
 # Exported from translatewiki.net
 #
 # Author: Jim-by
@@ -9,15 +9,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Echo\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:08+0000\n"
-"Language-Team: Belarusian (Taraškievica orthography) <http://translatewiki."
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:17+0000\n"
+"Language-Team: Belarusian (Taraškievica orthography) <https://translatewiki."
 "net/wiki/Portal:be-tarask>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:06:09+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:02+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: be-tarask\n"
 "X-Message-Group: #out-statusnet-plugin-echo\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/Echo/locale/br/LC_MESSAGES/Echo.po b/plugins/Echo/locale/br/LC_MESSAGES/Echo.po
index fffe6698bf..53a5d0ffc3 100644
--- a/plugins/Echo/locale/br/LC_MESSAGES/Echo.po
+++ b/plugins/Echo/locale/br/LC_MESSAGES/Echo.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Echo to Breton (Brezhoneg)
+# Translation of StatusNet - Echo to Breton (brezhoneg)
 # Exported from translatewiki.net
 #
 # Author: Y-M D
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Echo\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:08+0000\n"
-"Language-Team: Breton <http://translatewiki.net/wiki/Portal:br>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:17+0000\n"
+"Language-Team: Breton <https://translatewiki.net/wiki/Portal:br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:06:09+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:02+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-echo\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
diff --git a/plugins/Echo/locale/de/LC_MESSAGES/Echo.po b/plugins/Echo/locale/de/LC_MESSAGES/Echo.po
index cddd14ec0e..eed897f38f 100644
--- a/plugins/Echo/locale/de/LC_MESSAGES/Echo.po
+++ b/plugins/Echo/locale/de/LC_MESSAGES/Echo.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Echo\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:08+0000\n"
-"Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:17+0000\n"
+"Language-Team: German <https://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:06:09+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:02+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-echo\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/Echo/locale/es/LC_MESSAGES/Echo.po b/plugins/Echo/locale/es/LC_MESSAGES/Echo.po
index 17ac2d1055..e8c9694ebc 100644
--- a/plugins/Echo/locale/es/LC_MESSAGES/Echo.po
+++ b/plugins/Echo/locale/es/LC_MESSAGES/Echo.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Echo to Spanish (Español)
+# Translation of StatusNet - Echo to Spanish (español)
 # Exported from translatewiki.net
 #
 # Author: Translationista
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Echo\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:08+0000\n"
-"Language-Team: Spanish <http://translatewiki.net/wiki/Portal:es>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:18+0000\n"
+"Language-Team: Spanish <https://translatewiki.net/wiki/Portal:es>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:06:09+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:02+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-plugin-echo\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/Echo/locale/eu/LC_MESSAGES/Echo.po b/plugins/Echo/locale/eu/LC_MESSAGES/Echo.po
new file mode 100644
index 0000000000..8a97c70f39
--- /dev/null
+++ b/plugins/Echo/locale/eu/LC_MESSAGES/Echo.po
@@ -0,0 +1,30 @@
+# Translation of StatusNet - Echo to Basque (euskara)
+# Exported from translatewiki.net
+#
+# Author: Artsuaga
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Echo\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:18+0000\n"
+"Language-Team: Basque <https://translatewiki.net/wiki/Portal:eu>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:50:02+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: eu\n"
+"X-Message-Group: #out-statusnet-plugin-echo\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin description.
+msgid ""
+"Use <a href=\"http://aboutecho.com/\">Echo</a> to add commenting to notice "
+"pages."
+msgstr ""
+"Erabili <a href=\"http://aboutecho.com/\">Echo</a> oharren orriei iruzkinak "
+"gehitzeko."
diff --git a/plugins/Echo/locale/fi/LC_MESSAGES/Echo.po b/plugins/Echo/locale/fi/LC_MESSAGES/Echo.po
index 81166f68e5..34bde12f7b 100644
--- a/plugins/Echo/locale/fi/LC_MESSAGES/Echo.po
+++ b/plugins/Echo/locale/fi/LC_MESSAGES/Echo.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Echo to Finnish (Suomi)
+# Translation of StatusNet - Echo to Finnish (suomi)
 # Exported from translatewiki.net
 #
 # Author: Nike
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Echo\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:08+0000\n"
-"Language-Team: Finnish <http://translatewiki.net/wiki/Portal:fi>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:18+0000\n"
+"Language-Team: Finnish <https://translatewiki.net/wiki/Portal:fi>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:06:09+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:02+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: fi\n"
 "X-Message-Group: #out-statusnet-plugin-echo\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/Echo/locale/fr/LC_MESSAGES/Echo.po b/plugins/Echo/locale/fr/LC_MESSAGES/Echo.po
index c7f0498b3b..00db601145 100644
--- a/plugins/Echo/locale/fr/LC_MESSAGES/Echo.po
+++ b/plugins/Echo/locale/fr/LC_MESSAGES/Echo.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Echo to French (Français)
+# Translation of StatusNet - Echo to French (français)
 # Exported from translatewiki.net
 #
 # Author: Verdy p
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Echo\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:08+0000\n"
-"Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:18+0000\n"
+"Language-Team: French <https://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:06:09+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:02+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-echo\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
diff --git a/plugins/Echo/locale/gl/LC_MESSAGES/Echo.po b/plugins/Echo/locale/gl/LC_MESSAGES/Echo.po
new file mode 100644
index 0000000000..8e274c1590
--- /dev/null
+++ b/plugins/Echo/locale/gl/LC_MESSAGES/Echo.po
@@ -0,0 +1,30 @@
+# Translation of StatusNet - Echo to Galician (galego)
+# Exported from translatewiki.net
+#
+# Author: Toliño
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Echo\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:18+0000\n"
+"Language-Team: Galician <https://translatewiki.net/wiki/Portal:gl>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:50:02+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: gl\n"
+"X-Message-Group: #out-statusnet-plugin-echo\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin description.
+msgid ""
+"Use <a href=\"http://aboutecho.com/\">Echo</a> to add commenting to notice "
+"pages."
+msgstr ""
+"Usa <a href=\"http://aboutecho.com/\">Echo</a> para engadir comentarios ás "
+"páxinas das notas."
diff --git a/plugins/Echo/locale/he/LC_MESSAGES/Echo.po b/plugins/Echo/locale/he/LC_MESSAGES/Echo.po
index 2ba7576ceb..0ed6d3b903 100644
--- a/plugins/Echo/locale/he/LC_MESSAGES/Echo.po
+++ b/plugins/Echo/locale/he/LC_MESSAGES/Echo.po
@@ -1,6 +1,7 @@
 # Translation of StatusNet - Echo to Hebrew (עברית)
 # Exported from translatewiki.net
 #
+# Author: Amire80
 # Author: YaronSh
 # --
 # This file is distributed under the same license as the StatusNet package.
@@ -9,14 +10,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Echo\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:08+0000\n"
-"Language-Team: Hebrew <http://translatewiki.net/wiki/Portal:he>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:18+0000\n"
+"Language-Team: Hebrew <https://translatewiki.net/wiki/Portal:he>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:06:09+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:02+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: he\n"
 "X-Message-Group: #out-statusnet-plugin-echo\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -26,5 +27,5 @@ msgid ""
 "Use <a href=\"http://aboutecho.com/\">Echo</a> to add commenting to notice "
 "pages."
 msgstr ""
-"ניתן להשתמש ב־<a href=\"http://aboutecho.com/\">Echo</a> (הד) כדי להוסיף "
-"הערות לדפי התרעה."
+"להשתמש ב־<a href=\"http://aboutecho.com/\">Echo</a> כדי להוסיף הערות לדפי "
+"עדכון."
diff --git a/plugins/Echo/locale/ia/LC_MESSAGES/Echo.po b/plugins/Echo/locale/ia/LC_MESSAGES/Echo.po
index ee21597d78..2b07a3981c 100644
--- a/plugins/Echo/locale/ia/LC_MESSAGES/Echo.po
+++ b/plugins/Echo/locale/ia/LC_MESSAGES/Echo.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Echo to Interlingua (Interlingua)
+# Translation of StatusNet - Echo to Interlingua (interlingua)
 # Exported from translatewiki.net
 #
 # Author: McDutchie
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Echo\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:08+0000\n"
-"Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:18+0000\n"
+"Language-Team: Interlingua <https://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:06:09+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:02+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-echo\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/Echo/locale/id/LC_MESSAGES/Echo.po b/plugins/Echo/locale/id/LC_MESSAGES/Echo.po
index 7a66fd13e1..72d4f0fee2 100644
--- a/plugins/Echo/locale/id/LC_MESSAGES/Echo.po
+++ b/plugins/Echo/locale/id/LC_MESSAGES/Echo.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Echo\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:08+0000\n"
-"Language-Team: Indonesian <http://translatewiki.net/wiki/Portal:id>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:18+0000\n"
+"Language-Team: Indonesian <https://translatewiki.net/wiki/Portal:id>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:06:09+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:02+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: id\n"
 "X-Message-Group: #out-statusnet-plugin-echo\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
diff --git a/plugins/Echo/locale/it/LC_MESSAGES/Echo.po b/plugins/Echo/locale/it/LC_MESSAGES/Echo.po
new file mode 100644
index 0000000000..38ea05de7b
--- /dev/null
+++ b/plugins/Echo/locale/it/LC_MESSAGES/Echo.po
@@ -0,0 +1,27 @@
+# Translation of StatusNet - Echo to Italian (italiano)
+# Exported from translatewiki.net
+#
+# Author: Ximo17
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Echo\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:18+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:50:02+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin description.
+msgid ""
+"Use <a href=\"http://aboutecho.com/\">Echo</a> to add commenting to notice "
+"pages."
+msgstr ""
+"Utilizza <a href=\"http://aboutecho.com/\">Echo</a> per aggiungere commenti "
+"alle pagine delle notizie."
diff --git a/plugins/Echo/locale/lb/LC_MESSAGES/Echo.po b/plugins/Echo/locale/lb/LC_MESSAGES/Echo.po
index 21b18796a8..e39961de3f 100644
--- a/plugins/Echo/locale/lb/LC_MESSAGES/Echo.po
+++ b/plugins/Echo/locale/lb/LC_MESSAGES/Echo.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Echo\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:08+0000\n"
-"Language-Team: Luxembourgish <http://translatewiki.net/wiki/Portal:lb>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:18+0000\n"
+"Language-Team: Luxembourgish <https://translatewiki.net/wiki/Portal:lb>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:06:09+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:02+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: lb\n"
 "X-Message-Group: #out-statusnet-plugin-echo\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/Echo/locale/mk/LC_MESSAGES/Echo.po b/plugins/Echo/locale/mk/LC_MESSAGES/Echo.po
index 870f3061fd..32a6d743c8 100644
--- a/plugins/Echo/locale/mk/LC_MESSAGES/Echo.po
+++ b/plugins/Echo/locale/mk/LC_MESSAGES/Echo.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Echo to Macedonian (Македон�ки)
+# Translation of StatusNet - Echo to Macedonian (македон�ки)
 # Exported from translatewiki.net
 #
 # Author: Bjankuloski06
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Echo\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:08+0000\n"
-"Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:19+0000\n"
+"Language-Team: Macedonian <https://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:06:09+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:02+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-echo\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
diff --git a/plugins/Echo/locale/nb/LC_MESSAGES/Echo.po b/plugins/Echo/locale/nb/LC_MESSAGES/Echo.po
index bf6e13e9c9..6a4c18adc2 100644
--- a/plugins/Echo/locale/nb/LC_MESSAGES/Echo.po
+++ b/plugins/Echo/locale/nb/LC_MESSAGES/Echo.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Echo to Norwegian (bokmål)‬ (‪Norsk (bokmål)‬)
+# Translation of StatusNet - Echo to Norwegian Bokmål (‪norsk (bokmål)‬)
 # Exported from translatewiki.net
 #
 # Author: Nghtwlkr
@@ -9,15 +9,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Echo\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:09+0000\n"
-"Language-Team: Norwegian (bokmål)‬ <http://translatewiki.net/wiki/Portal:no>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:19+0000\n"
+"Language-Team: Norwegian Bokmål <https://translatewiki.net/wiki/Portal:nb>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:06:09+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
-"X-Language-Code: no\n"
+"X-POT-Import-Date: 2011-06-05 21:50:02+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: nb\n"
 "X-Message-Group: #out-statusnet-plugin-echo\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
diff --git a/plugins/Echo/locale/nl/LC_MESSAGES/Echo.po b/plugins/Echo/locale/nl/LC_MESSAGES/Echo.po
index 06bbe41026..91f68ea7e3 100644
--- a/plugins/Echo/locale/nl/LC_MESSAGES/Echo.po
+++ b/plugins/Echo/locale/nl/LC_MESSAGES/Echo.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Echo\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:09+0000\n"
-"Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:19+0000\n"
+"Language-Team: Dutch <https://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:06:09+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:02+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-echo\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/Echo/locale/pl/LC_MESSAGES/Echo.po b/plugins/Echo/locale/pl/LC_MESSAGES/Echo.po
new file mode 100644
index 0000000000..1dac07861c
--- /dev/null
+++ b/plugins/Echo/locale/pl/LC_MESSAGES/Echo.po
@@ -0,0 +1,28 @@
+# Translation of StatusNet - Echo to Polish (polski)
+# Exported from translatewiki.net
+#
+# Author: BeginaFelicysym
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Echo\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:19+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:50:02+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=3; plural=(n == 1) ? 0 : ( (n%10 >= 2 && n%10 <= 4 && "
+"(n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
+
+#. TRANS: Plugin description.
+msgid ""
+"Use <a href=\"http://aboutecho.com/\">Echo</a> to add commenting to notice "
+"pages."
+msgstr ""
+"<a href=\"http://aboutecho.com/\">Echo</a> umożliwia dodawanie komentarzy do "
+"stron ogłoszeń."
diff --git a/plugins/Echo/locale/pt/LC_MESSAGES/Echo.po b/plugins/Echo/locale/pt/LC_MESSAGES/Echo.po
index 0c27c1efd0..3ddc6b0dbb 100644
--- a/plugins/Echo/locale/pt/LC_MESSAGES/Echo.po
+++ b/plugins/Echo/locale/pt/LC_MESSAGES/Echo.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Echo to Portuguese (Português)
+# Translation of StatusNet - Echo to Portuguese (português)
 # Exported from translatewiki.net
 #
 # Author: Hamilton Abreu
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Echo\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:09+0000\n"
-"Language-Team: Portuguese <http://translatewiki.net/wiki/Portal:pt>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:19+0000\n"
+"Language-Team: Portuguese <https://translatewiki.net/wiki/Portal:pt>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:06:09+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:02+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: pt\n"
 "X-Message-Group: #out-statusnet-plugin-echo\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/Echo/locale/pt_BR/LC_MESSAGES/Echo.po b/plugins/Echo/locale/pt_BR/LC_MESSAGES/Echo.po
index 9a81f477c3..39ed3646cd 100644
--- a/plugins/Echo/locale/pt_BR/LC_MESSAGES/Echo.po
+++ b/plugins/Echo/locale/pt_BR/LC_MESSAGES/Echo.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Echo to Brazilian Portuguese (Português do Brasil)
+# Translation of StatusNet - Echo to Brazilian Portuguese (português do Brasil)
 # Exported from translatewiki.net
 #
 # Author: Giro720
@@ -9,15 +9,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Echo\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:09+0000\n"
-"Language-Team: Brazilian Portuguese <http://translatewiki.net/wiki/Portal:pt-"
-"br>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:19+0000\n"
+"Language-Team: Brazilian Portuguese <https://translatewiki.net/wiki/Portal:"
+"pt-br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:06:09+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:02+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: pt-br\n"
 "X-Message-Group: #out-statusnet-plugin-echo\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
diff --git a/plugins/Echo/locale/ru/LC_MESSAGES/Echo.po b/plugins/Echo/locale/ru/LC_MESSAGES/Echo.po
index ecb23ddc43..09b36ae18e 100644
--- a/plugins/Echo/locale/ru/LC_MESSAGES/Echo.po
+++ b/plugins/Echo/locale/ru/LC_MESSAGES/Echo.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Echo to Russian (Ру��кий)
+# Translation of StatusNet - Echo to Russian (ру��кий)
 # Exported from translatewiki.net
 #
 # Author: �лек�андр Сигачёв
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Echo\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:09+0000\n"
-"Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:19+0000\n"
+"Language-Team: Russian <https://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:06:09+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:02+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-echo\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
diff --git a/plugins/Echo/locale/tl/LC_MESSAGES/Echo.po b/plugins/Echo/locale/tl/LC_MESSAGES/Echo.po
index cc431af544..93ca84c719 100644
--- a/plugins/Echo/locale/tl/LC_MESSAGES/Echo.po
+++ b/plugins/Echo/locale/tl/LC_MESSAGES/Echo.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Echo\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:09+0000\n"
-"Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:20+0000\n"
+"Language-Team: Tagalog <https://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:06:09+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:02+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-echo\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/Echo/locale/uk/LC_MESSAGES/Echo.po b/plugins/Echo/locale/uk/LC_MESSAGES/Echo.po
index 3d23a66263..44856e8ec0 100644
--- a/plugins/Echo/locale/uk/LC_MESSAGES/Echo.po
+++ b/plugins/Echo/locale/uk/LC_MESSAGES/Echo.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Echo to Ukrainian (Україн�ька)
+# Translation of StatusNet - Echo to Ukrainian (україн�ька)
 # Exported from translatewiki.net
 #
 # Author: Boogie
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Echo\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:09+0000\n"
-"Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:20+0000\n"
+"Language-Team: Ukrainian <https://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:06:09+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:02+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-echo\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
diff --git a/plugins/Echo/locale/zh_CN/LC_MESSAGES/Echo.po b/plugins/Echo/locale/zh_CN/LC_MESSAGES/Echo.po
index c86096f3a8..a9192d289f 100644
--- a/plugins/Echo/locale/zh_CN/LC_MESSAGES/Echo.po
+++ b/plugins/Echo/locale/zh_CN/LC_MESSAGES/Echo.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Echo to Simplified Chinese (‪中文(简体)‬)
+# Translation of StatusNet - Echo to Simplified Chinese (‪中文（简体）‬)
 # Exported from translatewiki.net
 #
 # Author: ZhengYiFeng
@@ -9,15 +9,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Echo\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:09+0000\n"
-"Language-Team: Simplified Chinese <http://translatewiki.net/wiki/Portal:zh-"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:20+0000\n"
+"Language-Team: Simplified Chinese <https://translatewiki.net/wiki/Portal:zh-"
 "hans>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:06:09+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:02+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: #out-statusnet-plugin-echo\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
diff --git a/plugins/EmailAuthentication/locale/EmailAuthentication.pot b/plugins/EmailAuthentication/locale/EmailAuthentication.pot
index e2cdf35e28..32c605dd9d 100644
--- a/plugins/EmailAuthentication/locale/EmailAuthentication.pot
+++ b/plugins/EmailAuthentication/locale/EmailAuthentication.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
+"POT-Creation-Date: 2012-06-30 11:07+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"
diff --git a/plugins/EmailAuthentication/locale/be-tarask/LC_MESSAGES/EmailAuthentication.po b/plugins/EmailAuthentication/locale/be-tarask/LC_MESSAGES/EmailAuthentication.po
index 4b42b48b40..bb0ffea8a2 100644
--- a/plugins/EmailAuthentication/locale/be-tarask/LC_MESSAGES/EmailAuthentication.po
+++ b/plugins/EmailAuthentication/locale/be-tarask/LC_MESSAGES/EmailAuthentication.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - EmailAuthentication to Belarusian (Taraškievica orthography) (‪Белару�ка� (тарашкевіца)‬)
+# Translation of StatusNet - EmailAuthentication to Belarusian (Taraškievica orthography) (‪белару�ка� (тарашкевіца)‬)
 # Exported from translatewiki.net
 #
 # Author: EugeneZelenko
@@ -9,15 +9,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - EmailAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:10+0000\n"
-"Language-Team: Belarusian (Taraškievica orthography) <http://translatewiki."
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:20+0000\n"
+"Language-Team: Belarusian (Taraškievica orthography) <https://translatewiki."
 "net/wiki/Portal:be-tarask>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-17 22:47:43+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:02+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: be-tarask\n"
 "X-Message-Group: #out-statusnet-plugin-emailauthentication\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/EmailAuthentication/locale/br/LC_MESSAGES/EmailAuthentication.po b/plugins/EmailAuthentication/locale/br/LC_MESSAGES/EmailAuthentication.po
index e4fd1158d7..88f3f230b5 100644
--- a/plugins/EmailAuthentication/locale/br/LC_MESSAGES/EmailAuthentication.po
+++ b/plugins/EmailAuthentication/locale/br/LC_MESSAGES/EmailAuthentication.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - EmailAuthentication to Breton (Brezhoneg)
+# Translation of StatusNet - EmailAuthentication to Breton (brezhoneg)
 # Exported from translatewiki.net
 #
 # Author: Fulup
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - EmailAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:10+0000\n"
-"Language-Team: Breton <http://translatewiki.net/wiki/Portal:br>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:20+0000\n"
+"Language-Team: Breton <https://translatewiki.net/wiki/Portal:br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-17 22:47:43+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:02+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-emailauthentication\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
diff --git a/plugins/EmailAuthentication/locale/ca/LC_MESSAGES/EmailAuthentication.po b/plugins/EmailAuthentication/locale/ca/LC_MESSAGES/EmailAuthentication.po
index 8cb73416fe..c2909a5c92 100644
--- a/plugins/EmailAuthentication/locale/ca/LC_MESSAGES/EmailAuthentication.po
+++ b/plugins/EmailAuthentication/locale/ca/LC_MESSAGES/EmailAuthentication.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - EmailAuthentication to Catalan (Català)
+# Translation of StatusNet - EmailAuthentication to Catalan (català)
 # Exported from translatewiki.net
 #
 # Author: Toniher
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - EmailAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:10+0000\n"
-"Language-Team: Catalan <http://translatewiki.net/wiki/Portal:ca>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:20+0000\n"
+"Language-Team: Catalan <https://translatewiki.net/wiki/Portal:ca>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-17 22:47:43+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:02+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ca\n"
 "X-Message-Group: #out-statusnet-plugin-emailauthentication\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/EmailAuthentication/locale/de/LC_MESSAGES/EmailAuthentication.po b/plugins/EmailAuthentication/locale/de/LC_MESSAGES/EmailAuthentication.po
index b59675d507..d0437a6833 100644
--- a/plugins/EmailAuthentication/locale/de/LC_MESSAGES/EmailAuthentication.po
+++ b/plugins/EmailAuthentication/locale/de/LC_MESSAGES/EmailAuthentication.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - EmailAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:10+0000\n"
-"Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:20+0000\n"
+"Language-Team: German <https://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-17 22:47:43+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:02+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-emailauthentication\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/EmailAuthentication/locale/es/LC_MESSAGES/EmailAuthentication.po b/plugins/EmailAuthentication/locale/es/LC_MESSAGES/EmailAuthentication.po
index 12429769b4..36263979da 100644
--- a/plugins/EmailAuthentication/locale/es/LC_MESSAGES/EmailAuthentication.po
+++ b/plugins/EmailAuthentication/locale/es/LC_MESSAGES/EmailAuthentication.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - EmailAuthentication to Spanish (Español)
+# Translation of StatusNet - EmailAuthentication to Spanish (español)
 # Exported from translatewiki.net
 #
 # Author: Translationista
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - EmailAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:10+0000\n"
-"Language-Team: Spanish <http://translatewiki.net/wiki/Portal:es>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:20+0000\n"
+"Language-Team: Spanish <https://translatewiki.net/wiki/Portal:es>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-17 22:47:43+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:02+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-plugin-emailauthentication\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/EmailAuthentication/locale/eu/LC_MESSAGES/EmailAuthentication.po b/plugins/EmailAuthentication/locale/eu/LC_MESSAGES/EmailAuthentication.po
new file mode 100644
index 0000000000..242d2a467f
--- /dev/null
+++ b/plugins/EmailAuthentication/locale/eu/LC_MESSAGES/EmailAuthentication.po
@@ -0,0 +1,30 @@
+# Translation of StatusNet - EmailAuthentication to Basque (euskara)
+# Exported from translatewiki.net
+#
+# Author: Artsuaga
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - EmailAuthentication\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:20+0000\n"
+"Language-Team: Basque <https://translatewiki.net/wiki/Portal:eu>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:50:02+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: eu\n"
+"X-Message-Group: #out-statusnet-plugin-emailauthentication\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin description.
+msgid ""
+"The Email Authentication plugin allows users to login using their email "
+"address."
+msgstr ""
+"Email Authentication pluginak erabiltzaileei heuren email helbidearekin "
+"saioa hasten uzten die."
diff --git a/plugins/EmailAuthentication/locale/fi/LC_MESSAGES/EmailAuthentication.po b/plugins/EmailAuthentication/locale/fi/LC_MESSAGES/EmailAuthentication.po
index 3f8d97ec0a..c2cd6055bd 100644
--- a/plugins/EmailAuthentication/locale/fi/LC_MESSAGES/EmailAuthentication.po
+++ b/plugins/EmailAuthentication/locale/fi/LC_MESSAGES/EmailAuthentication.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - EmailAuthentication to Finnish (Suomi)
+# Translation of StatusNet - EmailAuthentication to Finnish (suomi)
 # Exported from translatewiki.net
 #
 # Author: Nike
@@ -10,14 +10,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - EmailAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:10+0000\n"
-"Language-Team: Finnish <http://translatewiki.net/wiki/Portal:fi>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:21+0000\n"
+"Language-Team: Finnish <https://translatewiki.net/wiki/Portal:fi>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-17 22:47:43+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:02+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: fi\n"
 "X-Message-Group: #out-statusnet-plugin-emailauthentication\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/EmailAuthentication/locale/fr/LC_MESSAGES/EmailAuthentication.po b/plugins/EmailAuthentication/locale/fr/LC_MESSAGES/EmailAuthentication.po
index bd26d69b21..7934e8805b 100644
--- a/plugins/EmailAuthentication/locale/fr/LC_MESSAGES/EmailAuthentication.po
+++ b/plugins/EmailAuthentication/locale/fr/LC_MESSAGES/EmailAuthentication.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - EmailAuthentication to French (Français)
+# Translation of StatusNet - EmailAuthentication to French (français)
 # Exported from translatewiki.net
 #
 # Author: Peter17
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - EmailAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:10+0000\n"
-"Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:21+0000\n"
+"Language-Team: French <https://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-17 22:47:43+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:02+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-emailauthentication\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
diff --git a/plugins/EmailAuthentication/locale/gl/LC_MESSAGES/EmailAuthentication.po b/plugins/EmailAuthentication/locale/gl/LC_MESSAGES/EmailAuthentication.po
new file mode 100644
index 0000000000..6b26033b10
--- /dev/null
+++ b/plugins/EmailAuthentication/locale/gl/LC_MESSAGES/EmailAuthentication.po
@@ -0,0 +1,30 @@
+# Translation of StatusNet - EmailAuthentication to Galician (galego)
+# Exported from translatewiki.net
+#
+# Author: Toliño
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - EmailAuthentication\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:21+0000\n"
+"Language-Team: Galician <https://translatewiki.net/wiki/Portal:gl>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:50:02+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: gl\n"
+"X-Message-Group: #out-statusnet-plugin-emailauthentication\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin description.
+msgid ""
+"The Email Authentication plugin allows users to login using their email "
+"address."
+msgstr ""
+"O complemento de autenticación por correo electrónico permite aos usuarios "
+"rexistrarse mediante o seu enderezo de correo electrónico."
diff --git a/plugins/EmailAuthentication/locale/he/LC_MESSAGES/EmailAuthentication.po b/plugins/EmailAuthentication/locale/he/LC_MESSAGES/EmailAuthentication.po
index 25e60cf5cf..549811c8dc 100644
--- a/plugins/EmailAuthentication/locale/he/LC_MESSAGES/EmailAuthentication.po
+++ b/plugins/EmailAuthentication/locale/he/LC_MESSAGES/EmailAuthentication.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - EmailAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:10+0000\n"
-"Language-Team: Hebrew <http://translatewiki.net/wiki/Portal:he>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:21+0000\n"
+"Language-Team: Hebrew <https://translatewiki.net/wiki/Portal:he>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-17 22:47:43+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:02+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: he\n"
 "X-Message-Group: #out-statusnet-plugin-emailauthentication\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/EmailAuthentication/locale/ia/LC_MESSAGES/EmailAuthentication.po b/plugins/EmailAuthentication/locale/ia/LC_MESSAGES/EmailAuthentication.po
index a052005e64..29eed526a6 100644
--- a/plugins/EmailAuthentication/locale/ia/LC_MESSAGES/EmailAuthentication.po
+++ b/plugins/EmailAuthentication/locale/ia/LC_MESSAGES/EmailAuthentication.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - EmailAuthentication to Interlingua (Interlingua)
+# Translation of StatusNet - EmailAuthentication to Interlingua (interlingua)
 # Exported from translatewiki.net
 #
 # Author: McDutchie
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - EmailAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:10+0000\n"
-"Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:21+0000\n"
+"Language-Team: Interlingua <https://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-17 22:47:43+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:02+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-emailauthentication\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/EmailAuthentication/locale/id/LC_MESSAGES/EmailAuthentication.po b/plugins/EmailAuthentication/locale/id/LC_MESSAGES/EmailAuthentication.po
index fae536ff2b..f308c1141d 100644
--- a/plugins/EmailAuthentication/locale/id/LC_MESSAGES/EmailAuthentication.po
+++ b/plugins/EmailAuthentication/locale/id/LC_MESSAGES/EmailAuthentication.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - EmailAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:10+0000\n"
-"Language-Team: Indonesian <http://translatewiki.net/wiki/Portal:id>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:21+0000\n"
+"Language-Team: Indonesian <https://translatewiki.net/wiki/Portal:id>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-17 22:47:43+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:02+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: id\n"
 "X-Message-Group: #out-statusnet-plugin-emailauthentication\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
diff --git a/plugins/EmailAuthentication/locale/it/LC_MESSAGES/EmailAuthentication.po b/plugins/EmailAuthentication/locale/it/LC_MESSAGES/EmailAuthentication.po
new file mode 100644
index 0000000000..826a0b7134
--- /dev/null
+++ b/plugins/EmailAuthentication/locale/it/LC_MESSAGES/EmailAuthentication.po
@@ -0,0 +1,27 @@
+# Translation of StatusNet - EmailAuthentication to Italian (italiano)
+# Exported from translatewiki.net
+#
+# Author: Ximo17
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - EmailAuthentication\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:21+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:50:02+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin description.
+msgid ""
+"The Email Authentication plugin allows users to login using their email "
+"address."
+msgstr ""
+"Il plugin di autenticazione dell'email consente agli utenti di accedere al "
+"sito utilizzando il loro indirizzo e-mail."
diff --git a/plugins/EmailAuthentication/locale/ja/LC_MESSAGES/EmailAuthentication.po b/plugins/EmailAuthentication/locale/ja/LC_MESSAGES/EmailAuthentication.po
index 6db326de2a..9728ae0014 100644
--- a/plugins/EmailAuthentication/locale/ja/LC_MESSAGES/EmailAuthentication.po
+++ b/plugins/EmailAuthentication/locale/ja/LC_MESSAGES/EmailAuthentication.po
@@ -1,6 +1,7 @@
 # Translation of StatusNet - EmailAuthentication to Japanese (日本語)
 # Exported from translatewiki.net
 #
+# Author: Shirayuki
 # Author: ��守歌
 # --
 # This file is distributed under the same license as the StatusNet package.
@@ -9,14 +10,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - EmailAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:10+0000\n"
-"Language-Team: Japanese <http://translatewiki.net/wiki/Portal:ja>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:21+0000\n"
+"Language-Team: Japanese <https://translatewiki.net/wiki/Portal:ja>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-17 22:47:43+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:02+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ja\n"
 "X-Message-Group: #out-statusnet-plugin-emailauthentication\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
@@ -26,5 +27,5 @@ msgid ""
 "The Email Authentication plugin allows users to login using their email "
 "address."
 msgstr ""
-"電�メール�証プラグイン��ユーザー��電�メールアドレス�ログイン�る��"
-"を許����。"
+"メール�証プラグイン��ユーザー�メールアドレス�ログイン�る��を許���"
+"�。"
diff --git a/plugins/EmailAuthentication/locale/mk/LC_MESSAGES/EmailAuthentication.po b/plugins/EmailAuthentication/locale/mk/LC_MESSAGES/EmailAuthentication.po
index 562b0e7d5c..c50e34a2fd 100644
--- a/plugins/EmailAuthentication/locale/mk/LC_MESSAGES/EmailAuthentication.po
+++ b/plugins/EmailAuthentication/locale/mk/LC_MESSAGES/EmailAuthentication.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - EmailAuthentication to Macedonian (Македон�ки)
+# Translation of StatusNet - EmailAuthentication to Macedonian (македон�ки)
 # Exported from translatewiki.net
 #
 # Author: Bjankuloski06
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - EmailAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:10+0000\n"
-"Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:21+0000\n"
+"Language-Team: Macedonian <https://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-17 22:47:43+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:02+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-emailauthentication\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
diff --git a/plugins/EmailAuthentication/locale/nb/LC_MESSAGES/EmailAuthentication.po b/plugins/EmailAuthentication/locale/nb/LC_MESSAGES/EmailAuthentication.po
index ed620b53fc..94225cef34 100644
--- a/plugins/EmailAuthentication/locale/nb/LC_MESSAGES/EmailAuthentication.po
+++ b/plugins/EmailAuthentication/locale/nb/LC_MESSAGES/EmailAuthentication.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - EmailAuthentication to Norwegian (bokmål)‬ (‪Norsk (bokmål)‬)
+# Translation of StatusNet - EmailAuthentication to Norwegian Bokmål (‪norsk (bokmål)‬)
 # Exported from translatewiki.net
 #
 # Author: Nghtwlkr
@@ -9,15 +9,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - EmailAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:10+0000\n"
-"Language-Team: Norwegian (bokmål)‬ <http://translatewiki.net/wiki/Portal:no>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:21+0000\n"
+"Language-Team: Norwegian Bokmål <https://translatewiki.net/wiki/Portal:nb>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-17 22:47:43+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
-"X-Language-Code: no\n"
+"X-POT-Import-Date: 2011-06-05 21:50:02+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: nb\n"
 "X-Message-Group: #out-statusnet-plugin-emailauthentication\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
diff --git a/plugins/EmailAuthentication/locale/nl/LC_MESSAGES/EmailAuthentication.po b/plugins/EmailAuthentication/locale/nl/LC_MESSAGES/EmailAuthentication.po
index e67f41088c..b325e7c5e6 100644
--- a/plugins/EmailAuthentication/locale/nl/LC_MESSAGES/EmailAuthentication.po
+++ b/plugins/EmailAuthentication/locale/nl/LC_MESSAGES/EmailAuthentication.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - EmailAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:10+0000\n"
-"Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:22+0000\n"
+"Language-Team: Dutch <https://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-17 22:47:43+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:02+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-emailauthentication\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/EmailAuthentication/locale/pl/LC_MESSAGES/EmailAuthentication.po b/plugins/EmailAuthentication/locale/pl/LC_MESSAGES/EmailAuthentication.po
new file mode 100644
index 0000000000..9ba42ef870
--- /dev/null
+++ b/plugins/EmailAuthentication/locale/pl/LC_MESSAGES/EmailAuthentication.po
@@ -0,0 +1,28 @@
+# Translation of StatusNet - EmailAuthentication to Polish (polski)
+# Exported from translatewiki.net
+#
+# Author: BeginaFelicysym
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - EmailAuthentication\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:22+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:50:02+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=3; plural=(n == 1) ? 0 : ( (n%10 >= 2 && n%10 <= 4 && "
+"(n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
+
+#. TRANS: Plugin description.
+msgid ""
+"The Email Authentication plugin allows users to login using their email "
+"address."
+msgstr ""
+"Wtyczka uwierzytelniania wiadomości E-mail pozwala użytkownikom na logowanie "
+"przy użyciu ich adresów e-mail."
diff --git a/plugins/EmailAuthentication/locale/pt/LC_MESSAGES/EmailAuthentication.po b/plugins/EmailAuthentication/locale/pt/LC_MESSAGES/EmailAuthentication.po
index 3fca2de977..cc8ab7f2ec 100644
--- a/plugins/EmailAuthentication/locale/pt/LC_MESSAGES/EmailAuthentication.po
+++ b/plugins/EmailAuthentication/locale/pt/LC_MESSAGES/EmailAuthentication.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - EmailAuthentication to Portuguese (Português)
+# Translation of StatusNet - EmailAuthentication to Portuguese (português)
 # Exported from translatewiki.net
 #
 # Author: Waldir
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - EmailAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:11+0000\n"
-"Language-Team: Portuguese <http://translatewiki.net/wiki/Portal:pt>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:22+0000\n"
+"Language-Team: Portuguese <https://translatewiki.net/wiki/Portal:pt>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-17 22:47:43+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:02+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: pt\n"
 "X-Message-Group: #out-statusnet-plugin-emailauthentication\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/EmailAuthentication/locale/pt_BR/LC_MESSAGES/EmailAuthentication.po b/plugins/EmailAuthentication/locale/pt_BR/LC_MESSAGES/EmailAuthentication.po
index e1bd73f258..e2aa05d83a 100644
--- a/plugins/EmailAuthentication/locale/pt_BR/LC_MESSAGES/EmailAuthentication.po
+++ b/plugins/EmailAuthentication/locale/pt_BR/LC_MESSAGES/EmailAuthentication.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - EmailAuthentication to Brazilian Portuguese (Português do Brasil)
+# Translation of StatusNet - EmailAuthentication to Brazilian Portuguese (português do Brasil)
 # Exported from translatewiki.net
 #
 # Author: Giro720
@@ -9,15 +9,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - EmailAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:11+0000\n"
-"Language-Team: Brazilian Portuguese <http://translatewiki.net/wiki/Portal:pt-"
-"br>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:22+0000\n"
+"Language-Team: Brazilian Portuguese <https://translatewiki.net/wiki/Portal:"
+"pt-br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-17 22:47:43+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:02+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: pt-br\n"
 "X-Message-Group: #out-statusnet-plugin-emailauthentication\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
diff --git a/plugins/EmailAuthentication/locale/ru/LC_MESSAGES/EmailAuthentication.po b/plugins/EmailAuthentication/locale/ru/LC_MESSAGES/EmailAuthentication.po
index 460787ee81..7477b5bff1 100644
--- a/plugins/EmailAuthentication/locale/ru/LC_MESSAGES/EmailAuthentication.po
+++ b/plugins/EmailAuthentication/locale/ru/LC_MESSAGES/EmailAuthentication.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - EmailAuthentication to Russian (Ру��кий)
+# Translation of StatusNet - EmailAuthentication to Russian (ру��кий)
 # Exported from translatewiki.net
 #
 # Author: �лек�андр Сигачёв
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - EmailAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:11+0000\n"
-"Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:22+0000\n"
+"Language-Team: Russian <https://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-17 22:47:43+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:02+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-emailauthentication\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
diff --git a/plugins/EmailAuthentication/locale/tl/LC_MESSAGES/EmailAuthentication.po b/plugins/EmailAuthentication/locale/tl/LC_MESSAGES/EmailAuthentication.po
index 90a0276b50..96c94f12f4 100644
--- a/plugins/EmailAuthentication/locale/tl/LC_MESSAGES/EmailAuthentication.po
+++ b/plugins/EmailAuthentication/locale/tl/LC_MESSAGES/EmailAuthentication.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - EmailAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:11+0000\n"
-"Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:22+0000\n"
+"Language-Team: Tagalog <https://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-17 22:47:43+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:02+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-emailauthentication\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/EmailAuthentication/locale/uk/LC_MESSAGES/EmailAuthentication.po b/plugins/EmailAuthentication/locale/uk/LC_MESSAGES/EmailAuthentication.po
index 3e6ea966ed..ff2caf6bf7 100644
--- a/plugins/EmailAuthentication/locale/uk/LC_MESSAGES/EmailAuthentication.po
+++ b/plugins/EmailAuthentication/locale/uk/LC_MESSAGES/EmailAuthentication.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - EmailAuthentication to Ukrainian (Україн�ька)
+# Translation of StatusNet - EmailAuthentication to Ukrainian (україн�ька)
 # Exported from translatewiki.net
 #
 # Author: Boogie
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - EmailAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:11+0000\n"
-"Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:22+0000\n"
+"Language-Team: Ukrainian <https://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-17 22:47:43+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:02+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-emailauthentication\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
diff --git a/plugins/EmailAuthentication/locale/zh_CN/LC_MESSAGES/EmailAuthentication.po b/plugins/EmailAuthentication/locale/zh_CN/LC_MESSAGES/EmailAuthentication.po
index 6628a463da..429646b910 100644
--- a/plugins/EmailAuthentication/locale/zh_CN/LC_MESSAGES/EmailAuthentication.po
+++ b/plugins/EmailAuthentication/locale/zh_CN/LC_MESSAGES/EmailAuthentication.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - EmailAuthentication to Simplified Chinese (‪中文(简体)‬)
+# Translation of StatusNet - EmailAuthentication to Simplified Chinese (‪中文（简体）‬)
 # Exported from translatewiki.net
 #
 # Author: ZhengYiFeng
@@ -9,15 +9,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - EmailAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:11+0000\n"
-"Language-Team: Simplified Chinese <http://translatewiki.net/wiki/Portal:zh-"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:22+0000\n"
+"Language-Team: Simplified Chinese <https://translatewiki.net/wiki/Portal:zh-"
 "hans>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-17 22:47:43+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:02+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: #out-statusnet-plugin-emailauthentication\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
diff --git a/plugins/EmailRegistration/Email_confirmation.php b/plugins/EmailRegistration/Email_confirmation.php
deleted file mode 100644
index 949556fc10..0000000000
--- a/plugins/EmailRegistration/Email_confirmation.php
+++ /dev/null
@@ -1,183 +0,0 @@
-<?php
-/**
- * Data class for counting greetings
- *
- * PHP version 5
- *
- * @category Data
- * @package  StatusNet
- * @author   Evan Prodromou <evan@status.net>
- * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
- * @link     http://status.net/
- *
- * StatusNet - the distributed open-source microblogging tool
- * Copyright (C) 2009, StatusNet, Inc.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.     See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-if (!defined('STATUSNET')) {
-    exit(1);
-}
-
-require_once INSTALLDIR . '/classes/Memcached_DataObject.php';
-
-/**
- * Data class for counting greetings
- *
- * We use the DB_DataObject framework for data classes in StatusNet. Each
- * table maps to a particular data class, making it easier to manipulate
- * data.
- *
- * Data classes should extend Memcached_DataObject, the (slightly misnamed)
- * extension of DB_DataObject that provides caching, internationalization,
- * and other bits of good functionality to StatusNet-specific data classes.
- *
- * @category Action
- * @package  StatusNet
- * @author   Evan Prodromou <evan@status.net>
- * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
- * @link     http://status.net/
- *
- * @see      DB_DataObject
- */
-class User_greeting_count extends Memcached_DataObject
-{
-    public $__table = 'user_greeting_count'; // table name
-    public $user_id;                         // int(4)  primary_key not_null
-    public $greeting_count;                  // int(4)
-
-    /**
-     * Get an instance by key
-     *
-     * This is a utility method to get a single instance with a given key value.
-     *
-     * @param string $k Key to use to lookup (usually 'user_id' for this class)
-     * @param mixed  $v Value to lookup
-     *
-     * @return User_greeting_count object found, or null for no hits
-     *
-     */
-    function staticGet($k, $v=null)
-    {
-        return Memcached_DataObject::staticGet('User_greeting_count', $k, $v);
-    }
-
-    /**
-     * return table definition for DB_DataObject
-     *
-     * DB_DataObject needs to know something about the table to manipulate
-     * instances. This method provides all the DB_DataObject needs to know.
-     *
-     * @return array array of column definitions
-     */
-    function table()
-    {
-        return array('user_id' => DB_DATAOBJECT_INT + DB_DATAOBJECT_NOTNULL,
-                     'greeting_count' => DB_DATAOBJECT_INT);
-    }
-
-    /**
-     * return key definitions for DB_DataObject
-     *
-     * DB_DataObject needs to know about keys that the table has, since it
-     * won't appear in StatusNet's own keys list. In most cases, this will
-     * simply reference your keyTypes() function.
-     *
-     * @return array list of key field names
-     */
-    function keys()
-    {
-        return array_keys($this->keyTypes());
-    }
-
-    /**
-     * return key definitions for Memcached_DataObject
-     *
-     * Our caching system uses the same key definitions, but uses a different
-     * method to get them. This key information is used to store and clear
-     * cached data, so be sure to list any key that will be used for static
-     * lookups.
-     *
-     * @return array associative array of key definitions, field name to type:
-     *         'K' for primary key: for compound keys, add an entry for each component;
-     *         'U' for unique keys: compound keys are not well supported here.
-     */
-    function keyTypes()
-    {
-        return array('user_id' => 'K');
-    }
-
-    /**
-     * Magic formula for non-autoincrementing integer primary keys
-     *
-     * If a table has a single integer column as its primary key, DB_DataObject
-     * assumes that the column is auto-incrementing and makes a sequence table
-     * to do this incrementation. Since we don't need this for our class, we
-     * overload this method and return the magic formula that DB_DataObject needs.
-     *
-     * @return array magic three-false array that stops auto-incrementing.
-     */
-    function sequenceKey()
-    {
-        return array(false, false, false);
-    }
-
-    /**
-     * Increment a user's greeting count and return instance
-     *
-     * This method handles the ins and outs of creating a new greeting_count for a
-     * user or fetching the existing greeting count and incrementing its value.
-     *
-     * @param integer $user_id ID of the user to get a count for
-     *
-     * @return User_greeting_count instance for this user, with count already incremented.
-     */
-    static function inc($user_id)
-    {
-        $gc = User_greeting_count::staticGet('user_id', $user_id);
-
-        if (empty($gc)) {
-
-            $gc = new User_greeting_count();
-
-            $gc->user_id        = $user_id;
-            $gc->greeting_count = 1;
-
-            $result = $gc->insert();
-
-            if (!$result) {
-                // TRANS: Exception thrown when the user greeting count could not be saved in the database.
-                // TRANS: %d is a user ID (number).
-                throw Exception(sprintf(_m("Could not save new greeting count for %d."),
-                                        $user_id));
-            }
-        } else {
-            $orig = clone($gc);
-
-            $gc->greeting_count++;
-
-            $result = $gc->update($orig);
-
-            if (!$result) {
-                // TRANS: Exception thrown when the user greeting count could not be saved in the database.
-                // TRANS: %d is a user ID (number).
-                throw Exception(sprintf(_m('Could not increment greeting count for %d.'),
-                                        $user_id));
-            }
-        }
-
-        return $gc;
-    }
-}
diff --git a/plugins/EmailRegistration/emailregister.php b/plugins/EmailRegistration/emailregister.php
index 1b0902587f..e5c7d8a56c 100644
--- a/plugins/EmailRegistration/emailregister.php
+++ b/plugins/EmailRegistration/emailregister.php
@@ -80,7 +80,8 @@ class EmailregisterAction extends Action
         parent::prepare($argarray);
 
         if (common_config('site', 'closed')) {
-            throw new ClientException(_('Registration not allowed.'), 403);
+            // TRANS: Client exception trown when registration by e-mail is not allowed.
+            throw new ClientException(_m('Registration not allowed.'), 403);
         }
 
         if ($this->isPost()) {
@@ -91,7 +92,8 @@ class EmailregisterAction extends Action
 
             if (!empty($this->email)) {
                 if (common_config('site', 'inviteonly')) {
-                    throw new ClientException(_('Sorry, only invited people can register.'), 403);
+                    // TRANS: Client exception trown when trying to register without an invitation.
+                    throw new ClientException(_m('Sorry, only invited people can register.'), 403);
                 }
                 $this->email = common_canonical_email($this->email);
                 $this->state = self::NEWEMAIL;
@@ -109,6 +111,7 @@ class EmailregisterAction extends Action
 
                 if (!empty($this->invitation)) {
                     if (!empty($this->invitation->registered_user_id)) {
+                        // TRANS: Client exception trown when using an invitation multiple times.
                         throw new ClientException(_m('Invitation already used.'), 403);
                     }
                 } else {
@@ -131,13 +134,15 @@ class EmailregisterAction extends Action
 
             if (empty($this->code)) {
                 if (common_config('site', 'inviteonly')) {
-                    throw new ClientException(_('Sorry, only invited people can register.'), 403);
+                    // TRANS: Client exception trown when trying to register without an invitation.
+                    throw new ClientException(_m('Sorry, only invited people can register.'), 403);
                 }
                 $this->state = self::NEWREGISTER;
             } else {
                 $this->invitation = Invitation::staticGet('code', $this->code);
                 if (!empty($this->invitation)) {
                     if (!empty($this->invitation->registered_user_id)) {
+                        // TRANS: Client exception trown when using an invitation multiple times.
                         throw new ClientException(_m('Invitation already used.'), 403);
                     }
                     $this->state = self::CONFIRMINVITE;
@@ -180,7 +185,6 @@ class EmailregisterAction extends Action
      *
      * @return void
      */
-
     function handle($argarray=null)
     {
         $cur = common_current_user();
@@ -263,7 +267,8 @@ class EmailregisterAction extends Action
             } else if (!empty($this->confirmation)) {
                 $email = trim($this->confirmation->address);
             } else {
-                throw new Exception('No confirmation thing.');
+                // TRANS: Client exception trown when trying to set password with an invalid confirmation code.
+                throw new Exception(_m('No confirmation thing.'));
             }
 
             if (!$this->tos) {
@@ -308,7 +313,8 @@ class EmailregisterAction extends Action
             }
 
             if (empty($this->user)) {
-                throw new Exception('Failed to register user.');
+                // TRANS: Exception trown when using an invitation multiple times.
+                throw new Exception(_m('Failed to register user.'));
             }
 
             common_set_user($this->user);
@@ -346,8 +352,8 @@ class EmailregisterAction extends Action
 
         $confirmUrl = common_local_url('register', array('code' => $confirm->code));
 
-         // TRANS: Body for confirmation e-mail.
-         // TRANS: %1$s is the StatusNet sitename, %2$s is the confirmation URL.
+        // TRANS: Body for confirmation e-mail.
+        // TRANS: %1$s is the StatusNet sitename, %2$s is the confirmation URL.
         $body = sprintf(_m('Someone (probably you) has requested an account on %1$s using this email address.'.
                           "\n".
                           'To confirm the address, click the following URL or copy it into the address bar of your browser.'.
diff --git a/plugins/EmailRegistration/locale/EmailRegistration.pot b/plugins/EmailRegistration/locale/EmailRegistration.pot
index eadabf3cba..69986a495b 100644
--- a/plugins/EmailRegistration/locale/EmailRegistration.pot
+++ b/plugins/EmailRegistration/locale/EmailRegistration.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,67 +16,92 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#. TRANS: Client exception trown when registration by e-mail is not allowed.
+#: emailregister.php:84
+msgid "Registration not allowed."
+msgstr ""
+
+#. TRANS: Client exception trown when trying to register without an invitation.
+#: emailregister.php:96 emailregister.php:138
+msgid "Sorry, only invited people can register."
+msgstr ""
+
 #. TRANS: Client exception thrown when no confirmation code was provided.
-#: emailregister.php:105
+#: emailregister.php:107
 msgid "No confirmation code."
 msgstr ""
 
+#. TRANS: Client exception trown when using an invitation multiple times.
+#: emailregister.php:115 emailregister.php:146
+msgid "Invitation already used."
+msgstr ""
+
 #. TRANS: Client exception thrown when given confirmation code was not issued.
-#: emailregister.php:116 emailregister.php:143
+#: emailregister.php:123 emailregister.php:155
 msgid "No such confirmation code."
 msgstr ""
 
 #. TRANS: Title for registration page.
-#: emailregister.php:158
+#: emailregister.php:170
 msgctxt "TITLE"
 msgid "Register"
 msgstr ""
 
 #. TRANS: Title for page where to register with a confirmation code.
-#: emailregister.php:164
+#: emailregister.php:176
 msgctxt "TITLE"
 msgid "Complete registration"
 msgstr ""
 
 #. TRANS: Confirmation text after initial registration.
 #. TRANS: %s an e-mail address.
-#: emailregister.php:226
+#: emailregister.php:237
 #, php-format
 msgid ""
 "An email was sent to %s to confirm that address. Check your email inbox for "
 "instructions."
 msgstr ""
 
+#. TRANS: Client exception trown when trying to set password with an invalid confirmation code.
+#: emailregister.php:271
+msgid "No confirmation thing."
+msgstr ""
+
 #. TRANS: Error text when trying to register without agreeing to the terms.
-#: emailregister.php:264
+#: emailregister.php:276
 msgid "You must accept the terms of service and privacy policy to register."
 msgstr ""
 
 #. TRANS: Error text when trying to register without a password.
-#: emailregister.php:267
+#: emailregister.php:279
 msgid "You must set a password"
 msgstr ""
 
 #. TRANS: Error text when trying to register with too short a password.
-#: emailregister.php:270
+#: emailregister.php:282
 msgid "Password must be 6 or more characters."
 msgstr ""
 
 #. TRANS: Error text when trying to register without providing the same password twice.
-#: emailregister.php:273
+#: emailregister.php:285
 msgid "Passwords do not match."
 msgstr ""
 
+#. TRANS: Exception trown when using an invitation multiple times.
+#: emailregister.php:317
+msgid "Failed to register user."
+msgstr ""
+
 #. TRANS: Subject for confirmation e-mail.
 #. TRANS: %s is the StatusNet sitename.
-#: emailregister.php:343
+#: emailregister.php:351
 #, php-format
 msgid "Confirm your registration on %s"
 msgstr ""
 
 #. TRANS: Body for confirmation e-mail.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is the confirmation URL.
-#: emailregister.php:349
+#: emailregister.php:357
 #, php-format
 msgid ""
 "Someone (probably you) has requested an account on %1$s using this email "
@@ -175,17 +200,3 @@ msgstr ""
 #: EmailRegistrationPlugin.php:201
 msgid "Use email only for registration."
 msgstr ""
-
-#. TRANS: Exception thrown when the user greeting count could not be saved in the database.
-#. TRANS: %d is a user ID (number).
-#: Email_confirmation.php:163
-#, php-format
-msgid "Could not save new greeting count for %d."
-msgstr ""
-
-#. TRANS: Exception thrown when the user greeting count could not be saved in the database.
-#. TRANS: %d is a user ID (number).
-#: Email_confirmation.php:176
-#, php-format
-msgid "Could not increment greeting count for %d."
-msgstr ""
diff --git a/plugins/EmailRegistration/locale/ar/LC_MESSAGES/EmailRegistration.po b/plugins/EmailRegistration/locale/ar/LC_MESSAGES/EmailRegistration.po
index 82baeb29d0..2f9d83e03d 100644
--- a/plugins/EmailRegistration/locale/ar/LC_MESSAGES/EmailRegistration.po
+++ b/plugins/EmailRegistration/locale/ar/LC_MESSAGES/EmailRegistration.po
@@ -1,6 +1,7 @@
 # Translation of StatusNet - EmailRegistration to Arabic (العربية)
 # Exported from translatewiki.net
 #
+# Author: Majid Al-Dharrab
 # Author: OsamaK
 # --
 # This file is distributed under the same license as the StatusNet package.
@@ -9,27 +10,39 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - EmailRegistration\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:13+0000\n"
-"Language-Team: Arabic <http://translatewiki.net/wiki/Portal:ar>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:22+0000\n"
+"Language-Team: Arabic <https://translatewiki.net/wiki/Portal:ar>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:26:37+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-18 16:19:42+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ar\n"
 "X-Message-Group: #out-statusnet-plugin-emailregistration\n"
 "Plural-Forms: nplurals=6; plural=(n == 0) ? 0 : ( (n == 1) ? 1 : ( (n == "
 "2) ? 2 : ( (n%100 >= 3 && n%100 <= 10) ? 3 : ( (n%100 >= 11 && n%100 <= "
 "99) ? 4 : 5 ) ) ) );\n"
 
+#. TRANS: Client exception trown when registration by e-mail is not allowed.
+msgid "Registration not allowed."
+msgstr "لا ي�سمح بالتسجيل."
+
+#. TRANS: Client exception trown when trying to register without an invitation.
+msgid "Sorry, only invited people can register."
+msgstr "عذرًا، الأشخاص المدعوون وحدهم يستطيعون التسجيل."
+
 #. TRANS: Client exception thrown when no confirmation code was provided.
 msgid "No confirmation code."
 msgstr "لا رمز تأكيد."
 
+#. TRANS: Client exception trown when using an invitation multiple times.
+msgid "Invitation already used."
+msgstr ""
+
 #. TRANS: Client exception thrown when given confirmation code was not issued.
 msgid "No such confirmation code."
-msgstr "لا رمز تأكيد كهذا."
+msgstr "رمز التأكيد هذا غير موجود."
 
 #. TRANS: Title for registration page.
 msgctxt "TITLE"
@@ -51,6 +64,11 @@ msgstr ""
 "أرسل بريد إلكتروني إلى %s لتأكييد الحساب. راجع صندوق البريد الإلكتروني "
 "الوارد من أجل التعليمات."
 
+#. TRANS: Client exception trown when trying to set password with an invalid confirmation code.
+#, fuzzy
+msgid "No confirmation thing."
+msgstr "لا رمز تأكيد."
+
 #. TRANS: Error text when trying to register without agreeing to the terms.
 msgid "You must accept the terms of service and privacy policy to register."
 msgstr "يجب أن تقبل بشروط الخدمة وبسياسة الخصوصية لتسجل."
@@ -67,6 +85,10 @@ msgstr "يجب أن تكون كلمة السر 6 حرو� أو أكثر."
 msgid "Passwords do not match."
 msgstr "كلمتا السر غير متطابقتين."
 
+#. TRANS: Exception trown when using an invitation multiple times.
+msgid "Failed to register user."
+msgstr "�شل تسجيل المستخدم."
+
 #. TRANS: Subject for confirmation e-mail.
 #. TRANS: %s is the StatusNet sitename.
 #, php-format
@@ -157,20 +179,8 @@ msgstr "ليس عنوان بريد صالح."
 #. TRANS: %s is the StatusNet sitename.
 #, php-format
 msgid "Welcome to %s"
-msgstr ""
+msgstr "مرحبا بكم �ي %s"
 
 #. TRANS: Plugin description.
 msgid "Use email only for registration."
 msgstr "استخدام البريد �قط للتسجيل."
-
-#. TRANS: Exception thrown when the user greeting count could not be saved in the database.
-#. TRANS: %d is a user ID (number).
-#, php-format
-msgid "Could not save new greeting count for %d."
-msgstr ""
-
-#. TRANS: Exception thrown when the user greeting count could not be saved in the database.
-#. TRANS: %d is a user ID (number).
-#, php-format
-msgid "Could not increment greeting count for %d."
-msgstr ""
diff --git a/plugins/EmailRegistration/locale/br/LC_MESSAGES/EmailRegistration.po b/plugins/EmailRegistration/locale/br/LC_MESSAGES/EmailRegistration.po
new file mode 100644
index 0000000000..97f3d98187
--- /dev/null
+++ b/plugins/EmailRegistration/locale/br/LC_MESSAGES/EmailRegistration.po
@@ -0,0 +1,178 @@
+# Translation of StatusNet - EmailRegistration to Breton (brezhoneg)
+# Exported from translatewiki.net
+#
+# Author: Y-M D
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - EmailRegistration\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:23+0000\n"
+"Language-Team: Breton <https://translatewiki.net/wiki/Portal:br>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-18 16:19:42+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: br\n"
+"X-Message-Group: #out-statusnet-plugin-emailregistration\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#. TRANS: Client exception trown when registration by e-mail is not allowed.
+msgid "Registration not allowed."
+msgstr "N'eo ket aotreet krouiñ kontoù."
+
+#. TRANS: Client exception trown when trying to register without an invitation.
+msgid "Sorry, only invited people can register."
+msgstr ""
+"Digarezit, met n'eus nemet an implijerien bet pedet hag a c'hell en em "
+"enskrivañ."
+
+#. TRANS: Client exception thrown when no confirmation code was provided.
+msgid "No confirmation code."
+msgstr "Kod kadarnaat ebet."
+
+#. TRANS: Client exception trown when using an invitation multiple times.
+msgid "Invitation already used."
+msgstr ""
+
+#. TRANS: Client exception thrown when given confirmation code was not issued.
+msgid "No such confirmation code."
+msgstr ""
+
+#. TRANS: Title for registration page.
+msgctxt "TITLE"
+msgid "Register"
+msgstr "En em enskrivañ"
+
+#. TRANS: Title for page where to register with a confirmation code.
+msgctxt "TITLE"
+msgid "Complete registration"
+msgstr ""
+
+#. TRANS: Confirmation text after initial registration.
+#. TRANS: %s an e-mail address.
+#, php-format
+msgid ""
+"An email was sent to %s to confirm that address. Check your email inbox for "
+"instructions."
+msgstr ""
+
+#. TRANS: Client exception trown when trying to set password with an invalid confirmation code.
+msgid "No confirmation thing."
+msgstr ""
+
+#. TRANS: Error text when trying to register without agreeing to the terms.
+msgid "You must accept the terms of service and privacy policy to register."
+msgstr ""
+
+#. TRANS: Error text when trying to register without a password.
+msgid "You must set a password"
+msgstr ""
+
+#. TRANS: Error text when trying to register with too short a password.
+msgid "Password must be 6 or more characters."
+msgstr ""
+
+#. TRANS: Error text when trying to register without providing the same password twice.
+msgid "Passwords do not match."
+msgstr ""
+
+#. TRANS: Exception trown when using an invitation multiple times.
+msgid "Failed to register user."
+msgstr ""
+
+#. TRANS: Subject for confirmation e-mail.
+#. TRANS: %s is the StatusNet sitename.
+#, php-format
+msgid "Confirm your registration on %s"
+msgstr ""
+
+#. TRANS: Body for confirmation e-mail.
+#. TRANS: %1$s is the StatusNet sitename, %2$s is the confirmation URL.
+#, php-format
+msgid ""
+"Someone (probably you) has requested an account on %1$s using this email "
+"address.\n"
+"To confirm the address, click the following URL or copy it into the address "
+"bar of your browser.\n"
+"%2$s\n"
+"If it was not you, you can safely ignore this message."
+msgstr ""
+
+#. TRANS: Form instructions.
+msgid "Enter your email address to register for an account."
+msgstr ""
+
+#. TRANS: Field label on form for registering an account.
+msgctxt "LABEL"
+msgid "E-mail address"
+msgstr "Chomlec'h postel"
+
+#. TRANS: Button text for registering an account.
+#. TRANS: Button text for action to register.
+msgctxt "BUTTON"
+msgid "Register"
+msgstr "En em enskrivañ"
+
+#. TRANS: Form instructions.
+msgid "Enter a password to confirm your new account."
+msgstr ""
+
+#. TRANS: Field label in e-mail registration form.
+msgctxt "LABEL"
+msgid "User name"
+msgstr "Anv implijer"
+
+#. TRANS: Field label.
+msgid "Email address"
+msgstr "Chomlec'h postel"
+
+#. TRANS: Field label on account registration page.
+msgid "Password"
+msgstr "Ger-tremen"
+
+#. TRANS: Field title on account registration page.
+msgid "6 or more characters."
+msgstr "6 arouezenn pe muioc'h."
+
+#. TRANS: Field label on account registration page. In this field the password has to be entered a second time.
+msgctxt "PASSWORD"
+msgid "Confirm"
+msgstr "Kadarnaat"
+
+#. TRANS: Field title on account registration page.
+msgid "Same as password above."
+msgstr ""
+
+#. TRANS: Checkbox title for terms of service and privacy policy.
+#, php-format
+msgid ""
+"I agree to the <a href=\"%1$s\">Terms of service</a> and <a href=\"%1$s"
+"\">Privacy policy</a> of this site."
+msgstr ""
+
+#. TRANS: Error text when trying to register with an already registered e-mail address.
+#. TRANS: %s is the URL to recover password at.
+#, php-format
+msgid ""
+"A user with that email address already exists. You can use the <a href=\"%s"
+"\">password recovery</a> tool to recover a missing password."
+msgstr ""
+
+#. TRANS: Error text when trying to register with an invalid e-mail address.
+msgid "Not a valid email address."
+msgstr ""
+
+#. TRANS: Subject for confirmation e-mail.
+#. TRANS: %s is the StatusNet sitename.
+#, php-format
+msgid "Welcome to %s"
+msgstr "Degemer mat da %s"
+
+#. TRANS: Plugin description.
+msgid "Use email only for registration."
+msgstr ""
diff --git a/plugins/EmailRegistration/locale/ca/LC_MESSAGES/EmailRegistration.po b/plugins/EmailRegistration/locale/ca/LC_MESSAGES/EmailRegistration.po
index d25c186dc4..e1e6b6a943 100644
--- a/plugins/EmailRegistration/locale/ca/LC_MESSAGES/EmailRegistration.po
+++ b/plugins/EmailRegistration/locale/ca/LC_MESSAGES/EmailRegistration.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - EmailRegistration to Catalan (Català)
+# Translation of StatusNet - EmailRegistration to Catalan (català)
 # Exported from translatewiki.net
 #
 # Author: Dvdgmz
@@ -11,22 +11,34 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - EmailRegistration\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:13+0000\n"
-"Language-Team: Catalan <http://translatewiki.net/wiki/Portal:ca>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:23+0000\n"
+"Language-Team: Catalan <https://translatewiki.net/wiki/Portal:ca>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:26:37+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-18 16:19:42+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ca\n"
 "X-Message-Group: #out-statusnet-plugin-emailregistration\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Client exception trown when registration by e-mail is not allowed.
+msgid "Registration not allowed."
+msgstr "No es permet el registre."
+
+#. TRANS: Client exception trown when trying to register without an invitation.
+msgid "Sorry, only invited people can register."
+msgstr "Només es poden registrar les persones convidades."
+
 #. TRANS: Client exception thrown when no confirmation code was provided.
 msgid "No confirmation code."
 msgstr "No hi ha cap codi de confirmació."
 
+#. TRANS: Client exception trown when using an invitation multiple times.
+msgid "Invitation already used."
+msgstr "Ja s'ha utilitzat la invitació."
+
 #. TRANS: Client exception thrown when given confirmation code was not issued.
 msgid "No such confirmation code."
 msgstr "No existeix el codi de confirmació."
@@ -39,7 +51,7 @@ msgstr "Registrar-se"
 #. TRANS: Title for page where to register with a confirmation code.
 msgctxt "TITLE"
 msgid "Complete registration"
-msgstr ""
+msgstr "Registre complet"
 
 #. TRANS: Confirmation text after initial registration.
 #. TRANS: %s an e-mail address.
@@ -49,6 +61,10 @@ msgid ""
 "instructions."
 msgstr ""
 
+#. TRANS: Client exception trown when trying to set password with an invalid confirmation code.
+msgid "No confirmation thing."
+msgstr "No hi ha res de confirmació."
+
 #. TRANS: Error text when trying to register without agreeing to the terms.
 msgid "You must accept the terms of service and privacy policy to register."
 msgstr ""
@@ -61,17 +77,21 @@ msgstr "Cal que defineixis una contrassenya"
 
 #. TRANS: Error text when trying to register with too short a password.
 msgid "Password must be 6 or more characters."
-msgstr ""
+msgstr "La contrasenya ha de tenir 6 o més caràcters."
 
 #. TRANS: Error text when trying to register without providing the same password twice.
 msgid "Passwords do not match."
-msgstr ""
+msgstr "Les contrasenyes no coincideixen."
+
+#. TRANS: Exception trown when using an invitation multiple times.
+msgid "Failed to register user."
+msgstr "No s'ha pogut registrar l'usuari."
 
 #. TRANS: Subject for confirmation e-mail.
 #. TRANS: %s is the StatusNet sitename.
 #, php-format
 msgid "Confirm your registration on %s"
-msgstr ""
+msgstr "Confirmeu el vostre registre a %s"
 
 #. TRANS: Body for confirmation e-mail.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is the confirmation URL.
@@ -87,7 +107,7 @@ msgstr ""
 
 #. TRANS: Form instructions.
 msgid "Enter your email address to register for an account."
-msgstr ""
+msgstr "Introduïu la vostra adreça electrònica per registrar un compte."
 
 #. TRANS: Field label on form for registering an account.
 msgctxt "LABEL"
@@ -158,20 +178,8 @@ msgstr "No és una adreça de correu electrònic vàlida."
 #. TRANS: %s is the StatusNet sitename.
 #, php-format
 msgid "Welcome to %s"
-msgstr ""
+msgstr "Us donem la benvinguda a %s"
 
 #. TRANS: Plugin description.
 msgid "Use email only for registration."
-msgstr ""
-
-#. TRANS: Exception thrown when the user greeting count could not be saved in the database.
-#. TRANS: %d is a user ID (number).
-#, php-format
-msgid "Could not save new greeting count for %d."
-msgstr ""
-
-#. TRANS: Exception thrown when the user greeting count could not be saved in the database.
-#. TRANS: %d is a user ID (number).
-#, php-format
-msgid "Could not increment greeting count for %d."
-msgstr ""
+msgstr "Utilitza el correu electrònic només per al registre."
diff --git a/plugins/EmailRegistration/locale/de/LC_MESSAGES/EmailRegistration.po b/plugins/EmailRegistration/locale/de/LC_MESSAGES/EmailRegistration.po
index 7388ca4195..8fba8a8a32 100644
--- a/plugins/EmailRegistration/locale/de/LC_MESSAGES/EmailRegistration.po
+++ b/plugins/EmailRegistration/locale/de/LC_MESSAGES/EmailRegistration.po
@@ -1,7 +1,10 @@
 # Translation of StatusNet - EmailRegistration to German (Deutsch)
 # Exported from translatewiki.net
 #
+# Author: ChrisiPK
+# Author: DaSch
 # Author: Giftpflanze
+# Author: Inkowik
 # --
 # This file is distributed under the same license as the StatusNet package.
 #
@@ -9,22 +12,34 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - EmailRegistration\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:13+0000\n"
-"Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:23+0000\n"
+"Language-Team: German <https://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:26:37+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-18 16:19:42+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-emailregistration\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Client exception trown when registration by e-mail is not allowed.
+msgid "Registration not allowed."
+msgstr "Registrierung nicht erlaubt."
+
+#. TRANS: Client exception trown when trying to register without an invitation.
+msgid "Sorry, only invited people can register."
+msgstr "Es tut uns leid, zum Registrieren benötigst du eine Einladung."
+
 #. TRANS: Client exception thrown when no confirmation code was provided.
 msgid "No confirmation code."
 msgstr "Kein Bestätigungscode."
 
+#. TRANS: Client exception trown when using an invitation multiple times.
+msgid "Invitation already used."
+msgstr "Einladung bereits verwendet."
+
 #. TRANS: Client exception thrown when given confirmation code was not issued.
 msgid "No such confirmation code."
 msgstr "Bestätigungscode nicht vorhanden."
@@ -49,6 +64,10 @@ msgstr ""
 "An %s wurde eine E-Mail versandt, um die Adresse zu bestätigen. Schaue in "
 "deinem Postfach nach weiteren Instruktionen."
 
+#. TRANS: Client exception trown when trying to set password with an invalid confirmation code.
+msgid "No confirmation thing."
+msgstr "Kein Bestätigungscode."
+
 #. TRANS: Error text when trying to register without agreeing to the terms.
 msgid "You must accept the terms of service and privacy policy to register."
 msgstr ""
@@ -67,6 +86,10 @@ msgstr "Passwort muss mindestens 6 Zeichen lang sein."
 msgid "Passwords do not match."
 msgstr "Passwörter stimmen nicht überein."
 
+#. TRANS: Exception trown when using an invitation multiple times.
+msgid "Failed to register user."
+msgstr "Registrieren des Benutzers fehlgeschlagen"
+
 #. TRANS: Subject for confirmation e-mail.
 #. TRANS: %s is the StatusNet sitename.
 #, php-format
@@ -164,20 +187,8 @@ msgstr "Keine gültige E-Mail-Adresse."
 #. TRANS: %s is the StatusNet sitename.
 #, php-format
 msgid "Welcome to %s"
-msgstr ""
+msgstr "Willkommen bei %s"
 
 #. TRANS: Plugin description.
 msgid "Use email only for registration."
 msgstr "E-Mail nur für die Registrierung benutzen."
-
-#. TRANS: Exception thrown when the user greeting count could not be saved in the database.
-#. TRANS: %d is a user ID (number).
-#, php-format
-msgid "Could not save new greeting count for %d."
-msgstr "Konnte neuen Begrüßungszähler für %d nicht speichern."
-
-#. TRANS: Exception thrown when the user greeting count could not be saved in the database.
-#. TRANS: %d is a user ID (number).
-#, php-format
-msgid "Could not increment greeting count for %d."
-msgstr "Konnte Begrüßungszähler für %d nicht erhöhen."
diff --git a/plugins/EmailRegistration/locale/es/LC_MESSAGES/EmailRegistration.po b/plugins/EmailRegistration/locale/es/LC_MESSAGES/EmailRegistration.po
new file mode 100644
index 0000000000..c9cc6f68bb
--- /dev/null
+++ b/plugins/EmailRegistration/locale/es/LC_MESSAGES/EmailRegistration.po
@@ -0,0 +1,193 @@
+# Translation of StatusNet - EmailRegistration to Spanish (español)
+# Exported from translatewiki.net
+#
+# Author: Armando-Martin
+# Author: Erchache2000
+# Author: Od1n
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - EmailRegistration\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:23+0000\n"
+"Language-Team: Spanish <https://translatewiki.net/wiki/Portal:es>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-18 16:19:42+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: es\n"
+"X-Message-Group: #out-statusnet-plugin-emailregistration\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Client exception trown when registration by e-mail is not allowed.
+msgid "Registration not allowed."
+msgstr "Registro no permitido."
+
+#. TRANS: Client exception trown when trying to register without an invitation.
+msgid "Sorry, only invited people can register."
+msgstr "Disculpa, sólo personas invitadas pueden registrarse."
+
+#. TRANS: Client exception thrown when no confirmation code was provided.
+msgid "No confirmation code."
+msgstr "Ningún código de confirmación."
+
+#. TRANS: Client exception trown when using an invitation multiple times.
+msgid "Invitation already used."
+msgstr "Invitación ya utilizada."
+
+#. TRANS: Client exception thrown when given confirmation code was not issued.
+msgid "No such confirmation code."
+msgstr "No hay tal código de confirmación."
+
+#. TRANS: Title for registration page.
+msgctxt "TITLE"
+msgid "Register"
+msgstr "Registrarse"
+
+#. TRANS: Title for page where to register with a confirmation code.
+msgctxt "TITLE"
+msgid "Complete registration"
+msgstr "Completar el registro"
+
+#. TRANS: Confirmation text after initial registration.
+#. TRANS: %s an e-mail address.
+#, php-format
+msgid ""
+"An email was sent to %s to confirm that address. Check your email inbox for "
+"instructions."
+msgstr ""
+"Fue enviado un correo electrónico a  %s  para confirmar esa dirección. "
+"Compruebe su bandeja de entrada de correo electrónico para obtener "
+"instrucciones."
+
+#. TRANS: Client exception trown when trying to set password with an invalid confirmation code.
+msgid "No confirmation thing."
+msgstr "Ningún código de confirmación."
+
+#. TRANS: Error text when trying to register without agreeing to the terms.
+msgid "You must accept the terms of service and privacy policy to register."
+msgstr ""
+"Debe aceptar los términos del servicio y política de privacidad para "
+"registrarse."
+
+#. TRANS: Error text when trying to register without a password.
+msgid "You must set a password"
+msgstr "Debe establecer una contraseña"
+
+#. TRANS: Error text when trying to register with too short a password.
+msgid "Password must be 6 or more characters."
+msgstr "La contraseña debe tener 6 o más caracteres."
+
+#. TRANS: Error text when trying to register without providing the same password twice.
+msgid "Passwords do not match."
+msgstr "Las contraseñas no coinciden."
+
+#. TRANS: Exception trown when using an invitation multiple times.
+msgid "Failed to register user."
+msgstr "Error al registrar usuario."
+
+#. TRANS: Subject for confirmation e-mail.
+#. TRANS: %s is the StatusNet sitename.
+#, php-format
+msgid "Confirm your registration on %s"
+msgstr "Confirma tu registro en %s"
+
+#. TRANS: Body for confirmation e-mail.
+#. TRANS: %1$s is the StatusNet sitename, %2$s is the confirmation URL.
+#, php-format
+msgid ""
+"Someone (probably you) has requested an account on %1$s using this email "
+"address.\n"
+"To confirm the address, click the following URL or copy it into the address "
+"bar of your browser.\n"
+"%2$s\n"
+"If it was not you, you can safely ignore this message."
+msgstr ""
+"Alguien (probablemente usted) ha solicitado una cuenta en  %1$s  usando esta "
+"dirección de correo electrónico. Para confirmar la dirección, haga clic en "
+"la siguiente dirección URL o copiarlo en la barra de direcciones del "
+"navegador. %2$s Si no fue usted, usted puede ignorar este mensaje."
+
+#. TRANS: Form instructions.
+msgid "Enter your email address to register for an account."
+msgstr ""
+"Introduzca su dirección de correo electrónico para registrar una cuenta."
+
+#. TRANS: Field label on form for registering an account.
+msgctxt "LABEL"
+msgid "E-mail address"
+msgstr "Dirección de correo electrónico"
+
+#. TRANS: Button text for registering an account.
+#. TRANS: Button text for action to register.
+msgctxt "BUTTON"
+msgid "Register"
+msgstr "Registrarse"
+
+#. TRANS: Form instructions.
+msgid "Enter a password to confirm your new account."
+msgstr "Introduzca una contraseña para confirmar tu nueva cuenta."
+
+#. TRANS: Field label in e-mail registration form.
+msgctxt "LABEL"
+msgid "User name"
+msgstr "Nombre de usuario"
+
+#. TRANS: Field label.
+msgid "Email address"
+msgstr "Dirección de correo electrónico"
+
+#. TRANS: Field label on account registration page.
+msgid "Password"
+msgstr "Contraseña"
+
+#. TRANS: Field title on account registration page.
+msgid "6 or more characters."
+msgstr "6 o más caracteres."
+
+#. TRANS: Field label on account registration page. In this field the password has to be entered a second time.
+msgctxt "PASSWORD"
+msgid "Confirm"
+msgstr "Confirmar"
+
+#. TRANS: Field title on account registration page.
+msgid "Same as password above."
+msgstr "Igual a la contraseña anterior"
+
+#. TRANS: Checkbox title for terms of service and privacy policy.
+#, php-format
+msgid ""
+"I agree to the <a href=\"%1$s\">Terms of service</a> and <a href=\"%1$s"
+"\">Privacy policy</a> of this site."
+msgstr ""
+"Estoy de acuerdo con los <a href=\"%1$s\">Términos de servicio</a> y la <a "
+"href=\"%1$s\">Política de protección de datos</a> de este sitio."
+
+#. TRANS: Error text when trying to register with an already registered e-mail address.
+#. TRANS: %s is the URL to recover password at.
+#, php-format
+msgid ""
+"A user with that email address already exists. You can use the <a href=\"%s"
+"\">password recovery</a> tool to recover a missing password."
+msgstr ""
+"Ya existe un usuario con esa dirección de correo electrónico. Puede utilizar "
+"la herramienta de <a href=\"<span class=\" notranslate\"=\"\">%s \"> "
+"recuperación de contraseñas </a> para recuperar una contraseña de falta."
+
+#. TRANS: Error text when trying to register with an invalid e-mail address.
+msgid "Not a valid email address."
+msgstr "Correo electrónico no válido"
+
+#. TRANS: Subject for confirmation e-mail.
+#. TRANS: %s is the StatusNet sitename.
+#, php-format
+msgid "Welcome to %s"
+msgstr "Bienvenido a %s"
+
+#. TRANS: Plugin description.
+msgid "Use email only for registration."
+msgstr "Usar el correo electrónico sólo para el registro."
diff --git a/plugins/EmailRegistration/locale/eu/LC_MESSAGES/EmailRegistration.po b/plugins/EmailRegistration/locale/eu/LC_MESSAGES/EmailRegistration.po
new file mode 100644
index 0000000000..f9d41f584e
--- /dev/null
+++ b/plugins/EmailRegistration/locale/eu/LC_MESSAGES/EmailRegistration.po
@@ -0,0 +1,191 @@
+# Translation of StatusNet - EmailRegistration to Basque (euskara)
+# Exported from translatewiki.net
+#
+# Author: Artsuaga
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - EmailRegistration\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:23+0000\n"
+"Language-Team: Basque <https://translatewiki.net/wiki/Portal:eu>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-18 16:19:42+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: eu\n"
+"X-Message-Group: #out-statusnet-plugin-emailregistration\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Client exception trown when registration by e-mail is not allowed.
+msgid "Registration not allowed."
+msgstr "Ezin da izen eman."
+
+#. TRANS: Client exception trown when trying to register without an invitation.
+msgid "Sorry, only invited people can register."
+msgstr "Barkatu, soilik gonbidatuak erregitra daitezke."
+
+#. TRANS: Client exception thrown when no confirmation code was provided.
+msgid "No confirmation code."
+msgstr "Ez dago baieztatze koderik."
+
+#. TRANS: Client exception trown when using an invitation multiple times.
+msgid "Invitation already used."
+msgstr "Gonbidapen hau dagoeneko erabili da."
+
+#. TRANS: Client exception thrown when given confirmation code was not issued.
+msgid "No such confirmation code."
+msgstr "Baieztapen kode hori falta da."
+
+#. TRANS: Title for registration page.
+msgctxt "TITLE"
+msgid "Register"
+msgstr "Izen eman"
+
+#. TRANS: Title for page where to register with a confirmation code.
+msgctxt "TITLE"
+msgid "Complete registration"
+msgstr "Izen ematea osatu"
+
+#. TRANS: Confirmation text after initial registration.
+#. TRANS: %s an e-mail address.
+#, php-format
+msgid ""
+"An email was sent to %s to confirm that address. Check your email inbox for "
+"instructions."
+msgstr ""
+"Mezu bat bidali da %s helbidea baieztatzeko. Begiratu zure sarrera "
+"postontzia argibideetarako."
+
+#. TRANS: Client exception trown when trying to set password with an invalid confirmation code.
+msgid "No confirmation thing."
+msgstr "Konfirmazio kode okerra."
+
+#. TRANS: Error text when trying to register without agreeing to the terms.
+msgid "You must accept the terms of service and privacy policy to register."
+msgstr ""
+"Izen emateko erabilera baldintzak eta pribazitate politika onartu behar "
+"dituzu."
+
+#. TRANS: Error text when trying to register without a password.
+msgid "You must set a password"
+msgstr "Pasahitza zehaztu behar duzu."
+
+#. TRANS: Error text when trying to register with too short a password.
+msgid "Password must be 6 or more characters."
+msgstr "Pasahitzak 6 edo karaktere gehiago behar ditu."
+
+#. TRANS: Error text when trying to register without providing the same password twice.
+msgid "Passwords do not match."
+msgstr "Pasahitzak ez datoz bat."
+
+#. TRANS: Exception trown when using an invitation multiple times.
+msgid "Failed to register user."
+msgstr "Izen ematean akatsa."
+
+#. TRANS: Subject for confirmation e-mail.
+#. TRANS: %s is the StatusNet sitename.
+#, php-format
+msgid "Confirm your registration on %s"
+msgstr "Erregistro baieztapena %s-en"
+
+#. TRANS: Body for confirmation e-mail.
+#. TRANS: %1$s is the StatusNet sitename, %2$s is the confirmation URL.
+#, php-format
+msgid ""
+"Someone (probably you) has requested an account on %1$s using this email "
+"address.\n"
+"To confirm the address, click the following URL or copy it into the address "
+"bar of your browser.\n"
+"%2$s\n"
+"If it was not you, you can safely ignore this message."
+msgstr ""
+"Norbaitek (ziurrenik zuk)  email kontu hau erabiliz %1$s gunean izen eman "
+"nahi du.\n"
+"Helbidea baieztatzeko, hurrengo URLan klik egin edo kopiatu ezazu zure "
+"nabigatzailearen helbide barran.\n"
+"%2$s\n"
+"Ez bazara zu izan, ez egin kasurik mezu honi."
+
+#. TRANS: Form instructions.
+msgid "Enter your email address to register for an account."
+msgstr "Sartu zure eposta helbidea izen emateko."
+
+#. TRANS: Field label on form for registering an account.
+msgctxt "LABEL"
+msgid "E-mail address"
+msgstr "Email helbidea"
+
+#. TRANS: Button text for registering an account.
+#. TRANS: Button text for action to register.
+msgctxt "BUTTON"
+msgid "Register"
+msgstr "Izen eman"
+
+#. TRANS: Form instructions.
+msgid "Enter a password to confirm your new account."
+msgstr "Sartu pasahitz bat zure kontu berria baieztatzeko."
+
+#. TRANS: Field label in e-mail registration form.
+msgctxt "LABEL"
+msgid "User name"
+msgstr "Erabiltzaile izena"
+
+#. TRANS: Field label.
+msgid "Email address"
+msgstr "Email helbidea"
+
+#. TRANS: Field label on account registration page.
+msgid "Password"
+msgstr "Pasahitza"
+
+#. TRANS: Field title on account registration page.
+msgid "6 or more characters."
+msgstr "6 edo karaktere gehiago."
+
+#. TRANS: Field label on account registration page. In this field the password has to be entered a second time.
+msgctxt "PASSWORD"
+msgid "Confirm"
+msgstr "Baieztatu"
+
+#. TRANS: Field title on account registration page.
+msgid "Same as password above."
+msgstr "Gaineko pasahitzaren berdina."
+
+#. TRANS: Checkbox title for terms of service and privacy policy.
+#, php-format
+msgid ""
+"I agree to the <a href=\"%1$s\">Terms of service</a> and <a href=\"%1$s"
+"\">Privacy policy</a> of this site."
+msgstr ""
+"Ados nago gune hontako <a href=\"%1$s\">erabilera baldintzekin</a> eta <a "
+"href=\"%1$s\">pribazitate politikarekin</a>."
+
+#. TRANS: Error text when trying to register with an already registered e-mail address.
+#. TRANS: %s is the URL to recover password at.
+#, php-format
+msgid ""
+"A user with that email address already exists. You can use the <a href=\"%s"
+"\">password recovery</a> tool to recover a missing password."
+msgstr ""
+"Dagoeneko badago email kontu horrekin erabiltzaile bat. <a href=\"%s"
+"\">Pasahitz berreskuratze</a> tresna erabil dezakezu pasahitz berri bat "
+"lortzeko."
+
+#. TRANS: Error text when trying to register with an invalid e-mail address.
+msgid "Not a valid email address."
+msgstr "Email helbide horrek ez du balio."
+
+#. TRANS: Subject for confirmation e-mail.
+#. TRANS: %s is the StatusNet sitename.
+#, php-format
+msgid "Welcome to %s"
+msgstr "Ongi etorri %s-ra"
+
+#. TRANS: Plugin description.
+msgid "Use email only for registration."
+msgstr "Erabili eposta izen ematekosoilik."
diff --git a/plugins/EmailRegistration/locale/fr/LC_MESSAGES/EmailRegistration.po b/plugins/EmailRegistration/locale/fr/LC_MESSAGES/EmailRegistration.po
index 1003da20e2..6c79da8193 100644
--- a/plugins/EmailRegistration/locale/fr/LC_MESSAGES/EmailRegistration.po
+++ b/plugins/EmailRegistration/locale/fr/LC_MESSAGES/EmailRegistration.po
@@ -1,9 +1,12 @@
-# Translation of StatusNet - EmailRegistration to French (Français)
+# Translation of StatusNet - EmailRegistration to French (français)
 # Exported from translatewiki.net
 #
 # Author: Brunoperel
+# Author: Crochet.david
 # Author: Iketsi
 # Author: Od1n
+# Author: OngolaBoy
+# Author: Valeryan 24
 # --
 # This file is distributed under the same license as the StatusNet package.
 #
@@ -11,22 +14,34 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - EmailRegistration\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:13+0000\n"
-"Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:23+0000\n"
+"Language-Team: French <https://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:26:37+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-18 16:19:42+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-emailregistration\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#. TRANS: Client exception trown when registration by e-mail is not allowed.
+msgid "Registration not allowed."
+msgstr "Inscription non autorisée."
+
+#. TRANS: Client exception trown when trying to register without an invitation.
+msgid "Sorry, only invited people can register."
+msgstr "Désolé, seulement les personnes invitées peuvent s'inscrire."
+
 #. TRANS: Client exception thrown when no confirmation code was provided.
 msgid "No confirmation code."
 msgstr "Aucun code de confirmation."
 
+#. TRANS: Client exception trown when using an invitation multiple times.
+msgid "Invitation already used."
+msgstr "Invitation déjà utilisée."
+
 #. TRANS: Client exception thrown when given confirmation code was not issued.
 msgid "No such confirmation code."
 msgstr "Aucun code confirmation similaire."
@@ -34,7 +49,7 @@ msgstr "Aucun code confirmation similaire."
 #. TRANS: Title for registration page.
 msgctxt "TITLE"
 msgid "Register"
-msgstr "S'inscrire"
+msgstr "S’inscrire"
 
 #. TRANS: Title for page where to register with a confirmation code.
 msgctxt "TITLE"
@@ -51,6 +66,10 @@ msgstr ""
 "Un courriel a été envoyé à %s pour confirmer cette adresse. Vérifiez votre "
 "boîte de courriel pour les instructions."
 
+#. TRANS: Client exception trown when trying to set password with an invalid confirmation code.
+msgid "No confirmation thing."
+msgstr "Aucun élément de confirmation."
+
 #. TRANS: Error text when trying to register without agreeing to the terms.
 msgid "You must accept the terms of service and privacy policy to register."
 msgstr ""
@@ -69,6 +88,10 @@ msgstr "Le mot de passe doit être constitué de 6 caractères ou plus."
 msgid "Passwords do not match."
 msgstr "Les mots de passe ne correspondent pas."
 
+#. TRANS: Exception trown when using an invitation multiple times.
+msgid "Failed to register user."
+msgstr "Impossible d'enregistrer cet utilisateur."
+
 #. TRANS: Subject for confirmation e-mail.
 #. TRANS: %s is the StatusNet sitename.
 #, php-format
@@ -106,7 +129,7 @@ msgstr "Adresse de courriel"
 #. TRANS: Button text for action to register.
 msgctxt "BUTTON"
 msgid "Register"
-msgstr "S'inscrire"
+msgstr "S’inscrire"
 
 #. TRANS: Form instructions.
 msgid "Enter a password to confirm your new account."
@@ -115,7 +138,7 @@ msgstr "Entrez un mot de passe pour confirmer votre nouveau compte."
 #. TRANS: Field label in e-mail registration form.
 msgctxt "LABEL"
 msgid "User name"
-msgstr "Nom d'utilisateur"
+msgstr "Nom d’utilisateur"
 
 #. TRANS: Field label.
 msgid "Email address"
@@ -166,20 +189,8 @@ msgstr "Adresse courriel invalide."
 #. TRANS: %s is the StatusNet sitename.
 #, php-format
 msgid "Welcome to %s"
-msgstr ""
+msgstr "Bienvenue à %s"
 
 #. TRANS: Plugin description.
 msgid "Use email only for registration."
 msgstr "Utiliser seulement le courrier électronique pour l'inscription."
-
-#. TRANS: Exception thrown when the user greeting count could not be saved in the database.
-#. TRANS: %d is a user ID (number).
-#, php-format
-msgid "Could not save new greeting count for %d."
-msgstr ""
-
-#. TRANS: Exception thrown when the user greeting count could not be saved in the database.
-#. TRANS: %d is a user ID (number).
-#, php-format
-msgid "Could not increment greeting count for %d."
-msgstr ""
diff --git a/plugins/EmailRegistration/locale/gl/LC_MESSAGES/EmailRegistration.po b/plugins/EmailRegistration/locale/gl/LC_MESSAGES/EmailRegistration.po
new file mode 100644
index 0000000000..a1258585b0
--- /dev/null
+++ b/plugins/EmailRegistration/locale/gl/LC_MESSAGES/EmailRegistration.po
@@ -0,0 +1,191 @@
+# Translation of StatusNet - EmailRegistration to Galician (galego)
+# Exported from translatewiki.net
+#
+# Author: Toliño
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - EmailRegistration\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:23+0000\n"
+"Language-Team: Galician <https://translatewiki.net/wiki/Portal:gl>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-18 16:19:42+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: gl\n"
+"X-Message-Group: #out-statusnet-plugin-emailregistration\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Client exception trown when registration by e-mail is not allowed.
+msgid "Registration not allowed."
+msgstr "Non se permite o rexistro."
+
+#. TRANS: Client exception trown when trying to register without an invitation.
+msgid "Sorry, only invited people can register."
+msgstr "Só se pode rexistrar mediante invitación."
+
+#. TRANS: Client exception thrown when no confirmation code was provided.
+msgid "No confirmation code."
+msgstr "Sen código de confirmación."
+
+#. TRANS: Client exception trown when using an invitation multiple times.
+msgid "Invitation already used."
+msgstr "Xa se empregou esta invitación."
+
+#. TRANS: Client exception thrown when given confirmation code was not issued.
+msgid "No such confirmation code."
+msgstr "Non hai tal código de confirmación."
+
+#. TRANS: Title for registration page.
+msgctxt "TITLE"
+msgid "Register"
+msgstr "Rexistrarse"
+
+#. TRANS: Title for page where to register with a confirmation code.
+msgctxt "TITLE"
+msgid "Complete registration"
+msgstr "Completar o rexistro"
+
+#. TRANS: Confirmation text after initial registration.
+#. TRANS: %s an e-mail address.
+#, php-format
+msgid ""
+"An email was sent to %s to confirm that address. Check your email inbox for "
+"instructions."
+msgstr ""
+"Enviouse un correo a %s para confirmar ese enderezo. Comprobe a súa caixa de "
+"entrada para ollar as instrucións."
+
+#. TRANS: Client exception trown when trying to set password with an invalid confirmation code.
+msgid "No confirmation thing."
+msgstr "Sen elemento de confirmación."
+
+#. TRANS: Error text when trying to register without agreeing to the terms.
+msgid "You must accept the terms of service and privacy policy to register."
+msgstr ""
+"Debe aceptar os termos do servizo e a política de protección de datos para "
+"rexistrarse."
+
+#. TRANS: Error text when trying to register without a password.
+msgid "You must set a password"
+msgstr "Ten que definir un contrasinal"
+
+#. TRANS: Error text when trying to register with too short a password.
+msgid "Password must be 6 or more characters."
+msgstr "O contrasinal debe conter seis ou máis caracteres."
+
+#. TRANS: Error text when trying to register without providing the same password twice.
+msgid "Passwords do not match."
+msgstr "Os contrasinais non coinciden."
+
+#. TRANS: Exception trown when using an invitation multiple times.
+msgid "Failed to register user."
+msgstr "Erro ao rexistrar o usuario."
+
+#. TRANS: Subject for confirmation e-mail.
+#. TRANS: %s is the StatusNet sitename.
+#, php-format
+msgid "Confirm your registration on %s"
+msgstr "Confirme o seu rexistro en %s"
+
+#. TRANS: Body for confirmation e-mail.
+#. TRANS: %1$s is the StatusNet sitename, %2$s is the confirmation URL.
+#, php-format
+msgid ""
+"Someone (probably you) has requested an account on %1$s using this email "
+"address.\n"
+"To confirm the address, click the following URL or copy it into the address "
+"bar of your browser.\n"
+"%2$s\n"
+"If it was not you, you can safely ignore this message."
+msgstr ""
+"Alguén (probablemente vostede) solicitou unha conta en %1$s usando este "
+"enderezo de correo electrónico.\n"
+"Para confirmar o enderezo, prema no seguinte enderezo URL ou cópieo na barra "
+"de enderezos do navegador.\n"
+"%2$s\n"
+"Se non foi vostede, pode ignorar esta pensaxe sen problema ningún."
+
+#. TRANS: Form instructions.
+msgid "Enter your email address to register for an account."
+msgstr "Insira o seu enderezo de correo electrónico para rexistrar unha conta."
+
+#. TRANS: Field label on form for registering an account.
+msgctxt "LABEL"
+msgid "E-mail address"
+msgstr "Enderezo de correo electrónico"
+
+#. TRANS: Button text for registering an account.
+#. TRANS: Button text for action to register.
+msgctxt "BUTTON"
+msgid "Register"
+msgstr "Rexistrarse"
+
+#. TRANS: Form instructions.
+msgid "Enter a password to confirm your new account."
+msgstr "Insira un contrasinal para confirmar a nova conta."
+
+#. TRANS: Field label in e-mail registration form.
+msgctxt "LABEL"
+msgid "User name"
+msgstr "Nome de usuario"
+
+#. TRANS: Field label.
+msgid "Email address"
+msgstr "Enderezo de correo electrónico"
+
+#. TRANS: Field label on account registration page.
+msgid "Password"
+msgstr "Contrasinal"
+
+#. TRANS: Field title on account registration page.
+msgid "6 or more characters."
+msgstr "Seis ou máis caracteres."
+
+#. TRANS: Field label on account registration page. In this field the password has to be entered a second time.
+msgctxt "PASSWORD"
+msgid "Confirm"
+msgstr "Confirmar"
+
+#. TRANS: Field title on account registration page.
+msgid "Same as password above."
+msgstr "Igual ao contrasinal anterior."
+
+#. TRANS: Checkbox title for terms of service and privacy policy.
+#, php-format
+msgid ""
+"I agree to the <a href=\"%1$s\">Terms of service</a> and <a href=\"%1$s"
+"\">Privacy policy</a> of this site."
+msgstr ""
+"Acepto os <a href=\"%1$s\">termos do servizo</a> e a <a href=\"%1$s"
+"\">política de protección de datos</a> do sitio."
+
+#. TRANS: Error text when trying to register with an already registered e-mail address.
+#. TRANS: %s is the URL to recover password at.
+#, php-format
+msgid ""
+"A user with that email address already exists. You can use the <a href=\"%s"
+"\">password recovery</a> tool to recover a missing password."
+msgstr ""
+"Xa existe un usuario con ese enderezo de correo electrónico. Pode usar a "
+"ferramenta de <a href=\"%s\">recuperación do contrasinal</a> para recuperar "
+"un contrasinal esquecido."
+
+#. TRANS: Error text when trying to register with an invalid e-mail address.
+msgid "Not a valid email address."
+msgstr "O enderezo de correo electrónico é incorrecto."
+
+#. TRANS: Subject for confirmation e-mail.
+#. TRANS: %s is the StatusNet sitename.
+#, php-format
+msgid "Welcome to %s"
+msgstr "Benvido a %s"
+
+#. TRANS: Plugin description.
+msgid "Use email only for registration."
+msgstr "Utilizar soamente o correo electrónico para o rexistro."
diff --git a/plugins/EmailRegistration/locale/hu/LC_MESSAGES/EmailRegistration.po b/plugins/EmailRegistration/locale/hu/LC_MESSAGES/EmailRegistration.po
index b92efc2bf5..5cc25b631d 100644
--- a/plugins/EmailRegistration/locale/hu/LC_MESSAGES/EmailRegistration.po
+++ b/plugins/EmailRegistration/locale/hu/LC_MESSAGES/EmailRegistration.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - EmailRegistration to Hungarian (Magyar)
+# Translation of StatusNet - EmailRegistration to Hungarian (magyar)
 # Exported from translatewiki.net
 #
 # Author: Dani
@@ -9,22 +9,34 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - EmailRegistration\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:13+0000\n"
-"Language-Team: Hungarian <http://translatewiki.net/wiki/Portal:hu>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:24+0000\n"
+"Language-Team: Hungarian <https://translatewiki.net/wiki/Portal:hu>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:26:37+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-18 16:19:42+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: hu\n"
 "X-Message-Group: #out-statusnet-plugin-emailregistration\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Client exception trown when registration by e-mail is not allowed.
+msgid "Registration not allowed."
+msgstr ""
+
+#. TRANS: Client exception trown when trying to register without an invitation.
+msgid "Sorry, only invited people can register."
+msgstr ""
+
 #. TRANS: Client exception thrown when no confirmation code was provided.
 msgid "No confirmation code."
 msgstr ""
 
+#. TRANS: Client exception trown when using an invitation multiple times.
+msgid "Invitation already used."
+msgstr ""
+
 #. TRANS: Client exception thrown when given confirmation code was not issued.
 msgid "No such confirmation code."
 msgstr ""
@@ -47,6 +59,10 @@ msgid ""
 "instructions."
 msgstr ""
 
+#. TRANS: Client exception trown when trying to set password with an invalid confirmation code.
+msgid "No confirmation thing."
+msgstr ""
+
 #. TRANS: Error text when trying to register without agreeing to the terms.
 msgid "You must accept the terms of service and privacy policy to register."
 msgstr ""
@@ -63,6 +79,10 @@ msgstr "A jelszónak legalább 6 karakter hosszúnak kell lennie."
 msgid "Passwords do not match."
 msgstr "A jelszavak nem egyeznek meg."
 
+#. TRANS: Exception trown when using an invitation multiple times.
+msgid "Failed to register user."
+msgstr ""
+
 #. TRANS: Subject for confirmation e-mail.
 #. TRANS: %s is the StatusNet sitename.
 #, php-format
@@ -154,15 +174,3 @@ msgstr ""
 #. TRANS: Plugin description.
 msgid "Use email only for registration."
 msgstr ""
-
-#. TRANS: Exception thrown when the user greeting count could not be saved in the database.
-#. TRANS: %d is a user ID (number).
-#, php-format
-msgid "Could not save new greeting count for %d."
-msgstr ""
-
-#. TRANS: Exception thrown when the user greeting count could not be saved in the database.
-#. TRANS: %d is a user ID (number).
-#, php-format
-msgid "Could not increment greeting count for %d."
-msgstr ""
diff --git a/plugins/EmailRegistration/locale/ia/LC_MESSAGES/EmailRegistration.po b/plugins/EmailRegistration/locale/ia/LC_MESSAGES/EmailRegistration.po
index 2b4604dafe..f058eb9a27 100644
--- a/plugins/EmailRegistration/locale/ia/LC_MESSAGES/EmailRegistration.po
+++ b/plugins/EmailRegistration/locale/ia/LC_MESSAGES/EmailRegistration.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - EmailRegistration to Interlingua (Interlingua)
+# Translation of StatusNet - EmailRegistration to Interlingua (interlingua)
 # Exported from translatewiki.net
 #
 # Author: McDutchie
@@ -9,22 +9,34 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - EmailRegistration\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:13+0000\n"
-"Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:24+0000\n"
+"Language-Team: Interlingua <https://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:26:37+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-18 16:19:42+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-emailregistration\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Client exception trown when registration by e-mail is not allowed.
+msgid "Registration not allowed."
+msgstr "Creation de conto non permittite."
+
+#. TRANS: Client exception trown when trying to register without an invitation.
+msgid "Sorry, only invited people can register."
+msgstr "Pardono, solmente personas invitate pote crear un conto."
+
 #. TRANS: Client exception thrown when no confirmation code was provided.
 msgid "No confirmation code."
 msgstr "Nulle codice de confirmation."
 
+#. TRANS: Client exception trown when using an invitation multiple times.
+msgid "Invitation already used."
+msgstr "Invitation jam usate."
+
 #. TRANS: Client exception thrown when given confirmation code was not issued.
 msgid "No such confirmation code."
 msgstr "Iste codice de confirmation non existe."
@@ -49,6 +61,10 @@ msgstr ""
 "Un e-mail ha essite inviate a %s pro confirmar iste adresse. Vide le "
 "instructiones in le message de e-mail."
 
+#. TRANS: Client exception trown when trying to set password with an invalid confirmation code.
+msgid "No confirmation thing."
+msgstr "Nulle cosa de confirmation."
+
 #. TRANS: Error text when trying to register without agreeing to the terms.
 msgid "You must accept the terms of service and privacy policy to register."
 msgstr ""
@@ -67,6 +83,10 @@ msgstr "Le contrasigno debe haber al minus 6 characteres."
 msgid "Passwords do not match."
 msgstr "Le contrasignos non corresponde."
 
+#. TRANS: Exception trown when using an invitation multiple times.
+msgid "Failed to register user."
+msgstr "Le creation del conto ha fallite."
+
 #. TRANS: Subject for confirmation e-mail.
 #. TRANS: %s is the StatusNet sitename.
 #, php-format
@@ -165,20 +185,8 @@ msgstr "Adresse de e-mail invalide."
 #. TRANS: %s is the StatusNet sitename.
 #, php-format
 msgid "Welcome to %s"
-msgstr ""
+msgstr "Benvenite a %s"
 
 #. TRANS: Plugin description.
 msgid "Use email only for registration."
 msgstr "Usar e-mail solmente pro creation de conto."
-
-#. TRANS: Exception thrown when the user greeting count could not be saved in the database.
-#. TRANS: %d is a user ID (number).
-#, php-format
-msgid "Could not save new greeting count for %d."
-msgstr "Non poteva salveguardar le numero de salutationes pro %d."
-
-#. TRANS: Exception thrown when the user greeting count could not be saved in the database.
-#. TRANS: %d is a user ID (number).
-#, php-format
-msgid "Could not increment greeting count for %d."
-msgstr "Non poteva incrementar le numero de salutationes pro %d."
diff --git a/plugins/EmailRegistration/locale/it/LC_MESSAGES/EmailRegistration.po b/plugins/EmailRegistration/locale/it/LC_MESSAGES/EmailRegistration.po
new file mode 100644
index 0000000000..a23ffb9f6c
--- /dev/null
+++ b/plugins/EmailRegistration/locale/it/LC_MESSAGES/EmailRegistration.po
@@ -0,0 +1,190 @@
+# Translation of StatusNet - EmailRegistration to Italian (italiano)
+# Exported from translatewiki.net
+#
+# Author: Od1n
+# Author: Ximo17
+# Author: 1009
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - EmailRegistration\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:24+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-18 16:19:42+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Client exception trown when registration by e-mail is not allowed.
+msgid "Registration not allowed."
+msgstr "Registrazione non consentita."
+
+#. TRANS: Client exception trown when trying to register without an invitation.
+msgid "Sorry, only invited people can register."
+msgstr "Siamo spiacenti, solo le persone invitate possono registrarsi."
+
+#. TRANS: Client exception thrown when no confirmation code was provided.
+msgid "No confirmation code."
+msgstr "Nessun codice di conferma."
+
+#. TRANS: Client exception trown when using an invitation multiple times.
+msgid "Invitation already used."
+msgstr "L'invito è già stato utilizzato."
+
+#. TRANS: Client exception thrown when given confirmation code was not issued.
+msgid "No such confirmation code."
+msgstr "Questo codice di conferma non esiste."
+
+#. TRANS: Title for registration page.
+msgctxt "TITLE"
+msgid "Register"
+msgstr "Registrati"
+
+#. TRANS: Title for page where to register with a confirmation code.
+msgctxt "TITLE"
+msgid "Complete registration"
+msgstr "Completare la registrazione"
+
+#. TRANS: Confirmation text after initial registration.
+#. TRANS: %s an e-mail address.
+#, php-format
+msgid ""
+"An email was sent to %s to confirm that address. Check your email inbox for "
+"instructions."
+msgstr ""
+"È stata inviata un'email a  %s  per confermare l'indirizzo. Controlla la tua "
+"casella di posta per le istruzioni."
+
+#. TRANS: Client exception trown when trying to set password with an invalid confirmation code.
+msgid "No confirmation thing."
+msgstr "Nessuna conferma."
+
+#. TRANS: Error text when trying to register without agreeing to the terms.
+msgid "You must accept the terms of service and privacy policy to register."
+msgstr ""
+"Per registrarsi è necessario accettare i termini di servizio e le norme "
+"sulla privacy."
+
+#. TRANS: Error text when trying to register without a password.
+msgid "You must set a password"
+msgstr "È necessario impostare una password"
+
+#. TRANS: Error text when trying to register with too short a password.
+msgid "Password must be 6 or more characters."
+msgstr "La password deve essere di 6 caratteri o più."
+
+#. TRANS: Error text when trying to register without providing the same password twice.
+msgid "Passwords do not match."
+msgstr "Le password non corrispondono."
+
+#. TRANS: Exception trown when using an invitation multiple times.
+msgid "Failed to register user."
+msgstr "Impossibile eseguire la registrazione utente."
+
+#. TRANS: Subject for confirmation e-mail.
+#. TRANS: %s is the StatusNet sitename.
+#, php-format
+msgid "Confirm your registration on %s"
+msgstr "Confermare la registrazione su %s"
+
+#. TRANS: Body for confirmation e-mail.
+#. TRANS: %1$s is the StatusNet sitename, %2$s is the confirmation URL.
+#, php-format
+msgid ""
+"Someone (probably you) has requested an account on %1$s using this email "
+"address.\n"
+"To confirm the address, click the following URL or copy it into the address "
+"bar of your browser.\n"
+"%2$s\n"
+"If it was not you, you can safely ignore this message."
+msgstr ""
+"Qualcuno (probabilmente tu) ha richiesto un account su %1$s utilizzando "
+"questo indirizzo email.\n"
+"Per confermare l'indirizzo, clicca il seguente URL o copiarlo nella barra "
+"degli indirizzi del tuo browser.\n"
+"%2$s\n"
+"Se non lo hai richiesto tu, ignora tranquillamente questo messaggio."
+
+#. TRANS: Form instructions.
+msgid "Enter your email address to register for an account."
+msgstr "Inserisci il tuo indirizzo email per registrare un account."
+
+#. TRANS: Field label on form for registering an account.
+msgctxt "LABEL"
+msgid "E-mail address"
+msgstr "Indirizzo e-mail"
+
+#. TRANS: Button text for registering an account.
+#. TRANS: Button text for action to register.
+msgctxt "BUTTON"
+msgid "Register"
+msgstr "Registrati"
+
+#. TRANS: Form instructions.
+msgid "Enter a password to confirm your new account."
+msgstr "Immettere una password per confermare il tuo nuovo account."
+
+#. TRANS: Field label in e-mail registration form.
+msgctxt "LABEL"
+msgid "User name"
+msgstr "Nome dell'utente"
+
+#. TRANS: Field label.
+msgid "Email address"
+msgstr "Indirizzo email"
+
+#. TRANS: Field label on account registration page.
+msgid "Password"
+msgstr "Password"
+
+#. TRANS: Field title on account registration page.
+msgid "6 or more characters."
+msgstr "6 caratteri o più."
+
+#. TRANS: Field label on account registration page. In this field the password has to be entered a second time.
+msgctxt "PASSWORD"
+msgid "Confirm"
+msgstr "Conferma"
+
+#. TRANS: Field title on account registration page.
+msgid "Same as password above."
+msgstr "La stessa password di sopra."
+
+#. TRANS: Checkbox title for terms of service and privacy policy.
+#, php-format
+msgid ""
+"I agree to the <a href=\"%1$s\">Terms of service</a> and <a href=\"%1$s"
+"\">Privacy policy</a> of this site."
+msgstr ""
+"Sono d'accordo con i <a href=\"%1$s\">Termini di utilizzo</a> e le <a href="
+"\"%1$s\">Norme sulla privacy</a> di questo sito."
+
+#. TRANS: Error text when trying to register with an already registered e-mail address.
+#. TRANS: %s is the URL to recover password at.
+#, php-format
+msgid ""
+"A user with that email address already exists. You can use the <a href=\"%s"
+"\">password recovery</a> tool to recover a missing password."
+msgstr ""
+"Esiste già un utente con quell'indirizzo email. Probabilmente sei già "
+"registrato e non ricordi la password, per recuperarla puoi utilizzare lo "
+"strumento <a href=\"%s\">recupero password</a>."
+
+#. TRANS: Error text when trying to register with an invalid e-mail address.
+msgid "Not a valid email address."
+msgstr "Non è un indirizzo email valido."
+
+#. TRANS: Subject for confirmation e-mail.
+#. TRANS: %s is the StatusNet sitename.
+#, php-format
+msgid "Welcome to %s"
+msgstr "Benvenuto su %s"
+
+#. TRANS: Plugin description.
+msgid "Use email only for registration."
+msgstr "Utilizza l'email solo per la registrazione."
diff --git a/plugins/EmailRegistration/locale/ja/LC_MESSAGES/EmailRegistration.po b/plugins/EmailRegistration/locale/ja/LC_MESSAGES/EmailRegistration.po
new file mode 100644
index 0000000000..ac2c488fbd
--- /dev/null
+++ b/plugins/EmailRegistration/locale/ja/LC_MESSAGES/EmailRegistration.po
@@ -0,0 +1,175 @@
+# Translation of StatusNet - EmailRegistration to Japanese (日本語)
+# Exported from translatewiki.net
+#
+# Author: Shirayuki
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - EmailRegistration\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:24+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-18 16:19:42+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#. TRANS: Client exception trown when registration by e-mail is not allowed.
+msgid "Registration not allowed."
+msgstr ""
+
+#. TRANS: Client exception trown when trying to register without an invitation.
+msgid "Sorry, only invited people can register."
+msgstr ""
+
+#. TRANS: Client exception thrown when no confirmation code was provided.
+msgid "No confirmation code."
+msgstr ""
+
+#. TRANS: Client exception trown when using an invitation multiple times.
+msgid "Invitation already used."
+msgstr ""
+
+#. TRANS: Client exception thrown when given confirmation code was not issued.
+msgid "No such confirmation code."
+msgstr ""
+
+#. TRANS: Title for registration page.
+msgctxt "TITLE"
+msgid "Register"
+msgstr ""
+
+#. TRANS: Title for page where to register with a confirmation code.
+msgctxt "TITLE"
+msgid "Complete registration"
+msgstr "登録を完了"
+
+#. TRANS: Confirmation text after initial registration.
+#. TRANS: %s an e-mail address.
+#, php-format
+msgid ""
+"An email was sent to %s to confirm that address. Check your email inbox for "
+"instructions."
+msgstr ""
+
+#. TRANS: Client exception trown when trying to set password with an invalid confirmation code.
+msgid "No confirmation thing."
+msgstr ""
+
+#. TRANS: Error text when trying to register without agreeing to the terms.
+msgid "You must accept the terms of service and privacy policy to register."
+msgstr ""
+
+#. TRANS: Error text when trying to register without a password.
+msgid "You must set a password"
+msgstr ""
+
+#. TRANS: Error text when trying to register with too short a password.
+msgid "Password must be 6 or more characters."
+msgstr ""
+
+#. TRANS: Error text when trying to register without providing the same password twice.
+msgid "Passwords do not match."
+msgstr ""
+
+#. TRANS: Exception trown when using an invitation multiple times.
+msgid "Failed to register user."
+msgstr ""
+
+#. TRANS: Subject for confirmation e-mail.
+#. TRANS: %s is the StatusNet sitename.
+#, php-format
+msgid "Confirm your registration on %s"
+msgstr ""
+
+#. TRANS: Body for confirmation e-mail.
+#. TRANS: %1$s is the StatusNet sitename, %2$s is the confirmation URL.
+#, php-format
+msgid ""
+"Someone (probably you) has requested an account on %1$s using this email "
+"address.\n"
+"To confirm the address, click the following URL or copy it into the address "
+"bar of your browser.\n"
+"%2$s\n"
+"If it was not you, you can safely ignore this message."
+msgstr ""
+
+#. TRANS: Form instructions.
+msgid "Enter your email address to register for an account."
+msgstr ""
+
+#. TRANS: Field label on form for registering an account.
+msgctxt "LABEL"
+msgid "E-mail address"
+msgstr ""
+
+#. TRANS: Button text for registering an account.
+#. TRANS: Button text for action to register.
+msgctxt "BUTTON"
+msgid "Register"
+msgstr ""
+
+#. TRANS: Form instructions.
+msgid "Enter a password to confirm your new account."
+msgstr ""
+
+#. TRANS: Field label in e-mail registration form.
+msgctxt "LABEL"
+msgid "User name"
+msgstr "ユーザー�"
+
+#. TRANS: Field label.
+msgid "Email address"
+msgstr "メール アドレス"
+
+#. TRANS: Field label on account registration page.
+msgid "Password"
+msgstr "パスワード"
+
+#. TRANS: Field title on account registration page.
+msgid "6 or more characters."
+msgstr "6 文字以上��。"
+
+#. TRANS: Field label on account registration page. In this field the password has to be entered a second time.
+msgctxt "PASSWORD"
+msgid "Confirm"
+msgstr "確�"
+
+#. TRANS: Field title on account registration page.
+msgid "Same as password above."
+msgstr "上記�パスワード�����。"
+
+#. TRANS: Checkbox title for terms of service and privacy policy.
+#, php-format
+msgid ""
+"I agree to the <a href=\"%1$s\">Terms of service</a> and <a href=\"%1$s"
+"\">Privacy policy</a> of this site."
+msgstr ""
+"<a href=\"%1$s\">サービス利用�約</a>�<a href=\"%1$s\">プライ�シー �リシー"
+"</a>������。"
+
+#. TRANS: Error text when trying to register with an already registered e-mail address.
+#. TRANS: %s is the URL to recover password at.
+#, php-format
+msgid ""
+"A user with that email address already exists. You can use the <a href=\"%s"
+"\">password recovery</a> tool to recover a missing password."
+msgstr ""
+
+#. TRANS: Error text when trying to register with an invalid e-mail address.
+msgid "Not a valid email address."
+msgstr "正��メール アドレス���り��ん。"
+
+#. TRANS: Subject for confirmation e-mail.
+#. TRANS: %s is the StatusNet sitename.
+#, php-format
+msgid "Welcome to %s"
+msgstr "%s �よ���"
+
+#. TRANS: Plugin description.
+msgid "Use email only for registration."
+msgstr "メール�登録���使用���。"
diff --git a/plugins/EmailRegistration/locale/mk/LC_MESSAGES/EmailRegistration.po b/plugins/EmailRegistration/locale/mk/LC_MESSAGES/EmailRegistration.po
index 56cdb8c651..f14325ce25 100644
--- a/plugins/EmailRegistration/locale/mk/LC_MESSAGES/EmailRegistration.po
+++ b/plugins/EmailRegistration/locale/mk/LC_MESSAGES/EmailRegistration.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - EmailRegistration to Macedonian (Македон�ки)
+# Translation of StatusNet - EmailRegistration to Macedonian (македон�ки)
 # Exported from translatewiki.net
 #
 # Author: Bjankuloski06
@@ -9,22 +9,34 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - EmailRegistration\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:13+0000\n"
-"Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:24+0000\n"
+"Language-Team: Macedonian <https://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:26:37+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-18 16:19:42+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-emailregistration\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
 
+#. TRANS: Client exception trown when registration by e-mail is not allowed.
+msgid "Registration not allowed."
+msgstr "Реги�трирањето не е дозволено."
+
+#. TRANS: Client exception trown when trying to register without an invitation.
+msgid "Sorry, only invited people can register."
+msgstr "Жалиме, реги�трацијата е �амо �о покана."
+
 #. TRANS: Client exception thrown when no confirmation code was provided.
 msgid "No confirmation code."
 msgstr "�ема потврден код."
 
+#. TRANS: Client exception trown when using an invitation multiple times.
+msgid "Invitation already used."
+msgstr "Поканата е веќе и�кори�тена."
+
 #. TRANS: Client exception thrown when given confirmation code was not issued.
 msgid "No such confirmation code."
 msgstr "�ема таков потврден код."
@@ -49,6 +61,10 @@ msgstr ""
 "Ви и�пративме порака на адре�ата %s за да ја потврдите. Погледнете во "
 "дојдовната пошта и про�ледете ги напат�твијата."
 
+#. TRANS: Client exception trown when trying to set password with an invalid confirmation code.
+msgid "No confirmation thing."
+msgstr "�ема потврден код."
+
 #. TRANS: Error text when trying to register without agreeing to the terms.
 msgid "You must accept the terms of service and privacy policy to register."
 msgstr ""
@@ -67,6 +83,10 @@ msgstr "Лозинката мора да �одржи барем 6 знаци."
 msgid "Passwords do not match."
 msgstr "Лозинките не �е �овпаѓаат."
 
+#. TRANS: Exception trown when using an invitation multiple times.
+msgid "Failed to register user."
+msgstr "�е у�пеав да го реги�трирам кори�никот."
+
 #. TRANS: Subject for confirmation e-mail.
 #. TRANS: %s is the StatusNet sitename.
 #, php-format
@@ -162,20 +182,8 @@ msgstr "Ова не е важечка е-пошта."
 #. TRANS: %s is the StatusNet sitename.
 #, php-format
 msgid "Welcome to %s"
-msgstr ""
+msgstr "Добредојдовте на %s"
 
 #. TRANS: Plugin description.
 msgid "Use email only for registration."
 msgstr "Кори�ти ја е-поштата �амо за реги�трација."
-
-#. TRANS: Exception thrown when the user greeting count could not be saved in the database.
-#. TRANS: %d is a user ID (number).
-#, php-format
-msgid "Could not save new greeting count for %d."
-msgstr "�е можев да го зачувам бројот на нови поздрави за %d."
-
-#. TRANS: Exception thrown when the user greeting count could not be saved in the database.
-#. TRANS: %d is a user ID (number).
-#, php-format
-msgid "Could not increment greeting count for %d."
-msgstr "�е можев да го дополнам бројот на поздрави за %d."
diff --git a/plugins/EmailRegistration/locale/nl/LC_MESSAGES/EmailRegistration.po b/plugins/EmailRegistration/locale/nl/LC_MESSAGES/EmailRegistration.po
index 593a8c0564..60fd261925 100644
--- a/plugins/EmailRegistration/locale/nl/LC_MESSAGES/EmailRegistration.po
+++ b/plugins/EmailRegistration/locale/nl/LC_MESSAGES/EmailRegistration.po
@@ -9,22 +9,34 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - EmailRegistration\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:14+0000\n"
-"Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:24+0000\n"
+"Language-Team: Dutch <https://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:26:37+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-18 16:19:42+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-emailregistration\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Client exception trown when registration by e-mail is not allowed.
+msgid "Registration not allowed."
+msgstr "Registratie is niet toegestaan."
+
+#. TRANS: Client exception trown when trying to register without an invitation.
+msgid "Sorry, only invited people can register."
+msgstr "U kunt zich alleen registreren als u wordt uitgenodigd."
+
 #. TRANS: Client exception thrown when no confirmation code was provided.
 msgid "No confirmation code."
 msgstr "Geen bevestigingscode."
 
+#. TRANS: Client exception trown when using an invitation multiple times.
+msgid "Invitation already used."
+msgstr "De uitnodiging is al gebruikt."
+
 #. TRANS: Client exception thrown when given confirmation code was not issued.
 msgid "No such confirmation code."
 msgstr "De bevestigingscode bestaat niet."
@@ -49,6 +61,10 @@ msgstr ""
 "Er is een e-mail verzonden naar %s om dat adres te bevestigen. Controleer uw "
 "e-mail voor instructies."
 
+#. TRANS: Client exception trown when trying to set password with an invalid confirmation code.
+msgid "No confirmation thing."
+msgstr "Geen bevestigingscode."
+
 #. TRANS: Error text when trying to register without agreeing to the terms.
 msgid "You must accept the terms of service and privacy policy to register."
 msgstr ""
@@ -67,6 +83,10 @@ msgstr "Het wachtwoord moet zes of meer tekens bevatten."
 msgid "Passwords do not match."
 msgstr "De wachtwoorden komen niet overeen."
 
+#. TRANS: Exception trown when using an invitation multiple times.
+msgid "Failed to register user."
+msgstr "De gebruikersregistratie is mislukt."
+
 #. TRANS: Subject for confirmation e-mail.
 #. TRANS: %s is the StatusNet sitename.
 #, php-format
@@ -163,20 +183,8 @@ msgstr "Geen geldig e-mailadres."
 #. TRANS: %s is the StatusNet sitename.
 #, php-format
 msgid "Welcome to %s"
-msgstr ""
+msgstr "Welkom bij %s"
 
 #. TRANS: Plugin description.
 msgid "Use email only for registration."
 msgstr "Alleen registeren per e-mail gebruiken."
-
-#. TRANS: Exception thrown when the user greeting count could not be saved in the database.
-#. TRANS: %d is a user ID (number).
-#, php-format
-msgid "Could not save new greeting count for %d."
-msgstr "Het was niet mogelijk het aantal begroetingen op te slaan voor %d."
-
-#. TRANS: Exception thrown when the user greeting count could not be saved in the database.
-#. TRANS: %d is a user ID (number).
-#, php-format
-msgid "Could not increment greeting count for %d."
-msgstr "Het was niet mogelijk het aantal begroetingen op te hogen voor %d."
diff --git a/plugins/EmailRegistration/locale/ru/LC_MESSAGES/EmailRegistration.po b/plugins/EmailRegistration/locale/ru/LC_MESSAGES/EmailRegistration.po
new file mode 100644
index 0000000000..fb413d4902
--- /dev/null
+++ b/plugins/EmailRegistration/locale/ru/LC_MESSAGES/EmailRegistration.po
@@ -0,0 +1,177 @@
+# Translation of StatusNet - EmailRegistration to Russian (ру��кий)
+# Exported from translatewiki.net
+#
+# Author: Eleferen
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - EmailRegistration\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:24+0000\n"
+"Language-Team: Russian <https://translatewiki.net/wiki/Portal:ru>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-18 16:19:42+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: ru\n"
+"X-Message-Group: #out-statusnet-plugin-emailregistration\n"
+"Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
+"2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
+
+#. TRANS: Client exception trown when registration by e-mail is not allowed.
+msgid "Registration not allowed."
+msgstr ""
+
+#. TRANS: Client exception trown when trying to register without an invitation.
+msgid "Sorry, only invited people can register."
+msgstr ""
+
+#. TRANS: Client exception thrown when no confirmation code was provided.
+msgid "No confirmation code."
+msgstr ""
+
+#. TRANS: Client exception trown when using an invitation multiple times.
+msgid "Invitation already used."
+msgstr ""
+
+#. TRANS: Client exception thrown when given confirmation code was not issued.
+msgid "No such confirmation code."
+msgstr ""
+
+#. TRANS: Title for registration page.
+msgctxt "TITLE"
+msgid "Register"
+msgstr ""
+
+#. TRANS: Title for page where to register with a confirmation code.
+msgctxt "TITLE"
+msgid "Complete registration"
+msgstr ""
+
+#. TRANS: Confirmation text after initial registration.
+#. TRANS: %s an e-mail address.
+#, php-format
+msgid ""
+"An email was sent to %s to confirm that address. Check your email inbox for "
+"instructions."
+msgstr ""
+
+#. TRANS: Client exception trown when trying to set password with an invalid confirmation code.
+msgid "No confirmation thing."
+msgstr ""
+
+#. TRANS: Error text when trying to register without agreeing to the terms.
+msgid "You must accept the terms of service and privacy policy to register."
+msgstr ""
+
+#. TRANS: Error text when trying to register without a password.
+msgid "You must set a password"
+msgstr "Вы должны у�тановить пароль"
+
+#. TRANS: Error text when trying to register with too short a password.
+msgid "Password must be 6 or more characters."
+msgstr "Пароль должен быть длиной не менее 6 �имволов."
+
+#. TRANS: Error text when trying to register without providing the same password twice.
+msgid "Passwords do not match."
+msgstr "Пароли не �овпадают."
+
+#. TRANS: Exception trown when using an invitation multiple times.
+msgid "Failed to register user."
+msgstr "�е удало�ь зареги�трировать пользовател�."
+
+#. TRANS: Subject for confirmation e-mail.
+#. TRANS: %s is the StatusNet sitename.
+#, php-format
+msgid "Confirm your registration on %s"
+msgstr ""
+
+#. TRANS: Body for confirmation e-mail.
+#. TRANS: %1$s is the StatusNet sitename, %2$s is the confirmation URL.
+#, php-format
+msgid ""
+"Someone (probably you) has requested an account on %1$s using this email "
+"address.\n"
+"To confirm the address, click the following URL or copy it into the address "
+"bar of your browser.\n"
+"%2$s\n"
+"If it was not you, you can safely ignore this message."
+msgstr ""
+
+#. TRANS: Form instructions.
+msgid "Enter your email address to register for an account."
+msgstr "Введите �вой адре� �лектронной почты дл� реги�трации учётной запи�и."
+
+#. TRANS: Field label on form for registering an account.
+msgctxt "LABEL"
+msgid "E-mail address"
+msgstr "�дре� �лектронной почты"
+
+#. TRANS: Button text for registering an account.
+#. TRANS: Button text for action to register.
+msgctxt "BUTTON"
+msgid "Register"
+msgstr "Реги�траци�"
+
+#. TRANS: Form instructions.
+msgid "Enter a password to confirm your new account."
+msgstr "Введите пароль дл� подтверждени� новой учётной запи�и."
+
+#. TRANS: Field label in e-mail registration form.
+msgctxt "LABEL"
+msgid "User name"
+msgstr "Им� пользовател�"
+
+#. TRANS: Field label.
+msgid "Email address"
+msgstr "�дре� �л. почты"
+
+#. TRANS: Field label on account registration page.
+msgid "Password"
+msgstr "Пароль"
+
+#. TRANS: Field title on account registration page.
+msgid "6 or more characters."
+msgstr "6 или более �имволов."
+
+#. TRANS: Field label on account registration page. In this field the password has to be entered a second time.
+msgctxt "PASSWORD"
+msgid "Confirm"
+msgstr ""
+
+#. TRANS: Field title on account registration page.
+msgid "Same as password above."
+msgstr ""
+
+#. TRANS: Checkbox title for terms of service and privacy policy.
+#, php-format
+msgid ""
+"I agree to the <a href=\"%1$s\">Terms of service</a> and <a href=\"%1$s"
+"\">Privacy policy</a> of this site."
+msgstr ""
+
+#. TRANS: Error text when trying to register with an already registered e-mail address.
+#. TRANS: %s is the URL to recover password at.
+#, php-format
+msgid ""
+"A user with that email address already exists. You can use the <a href=\"%s"
+"\">password recovery</a> tool to recover a missing password."
+msgstr ""
+
+#. TRANS: Error text when trying to register with an invalid e-mail address.
+msgid "Not a valid email address."
+msgstr ""
+
+#. TRANS: Subject for confirmation e-mail.
+#. TRANS: %s is the StatusNet sitename.
+#, php-format
+msgid "Welcome to %s"
+msgstr "Добро пожаловать в %s"
+
+#. TRANS: Plugin description.
+msgid "Use email only for registration."
+msgstr ""
diff --git a/plugins/EmailRegistration/locale/sv/LC_MESSAGES/EmailRegistration.po b/plugins/EmailRegistration/locale/sv/LC_MESSAGES/EmailRegistration.po
index c8f9aeed1c..e7c490762e 100644
--- a/plugins/EmailRegistration/locale/sv/LC_MESSAGES/EmailRegistration.po
+++ b/plugins/EmailRegistration/locale/sv/LC_MESSAGES/EmailRegistration.po
@@ -1,6 +1,7 @@
-# Translation of StatusNet - EmailRegistration to Swedish (Svenska)
+# Translation of StatusNet - EmailRegistration to Swedish (svenska)
 # Exported from translatewiki.net
 #
+# Author: Ainali
 # Author: Lokal Profil
 # --
 # This file is distributed under the same license as the StatusNet package.
@@ -9,22 +10,34 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - EmailRegistration\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:14+0000\n"
-"Language-Team: Swedish <http://translatewiki.net/wiki/Portal:sv>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:24+0000\n"
+"Language-Team: Swedish <https://translatewiki.net/wiki/Portal:sv>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:26:37+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-18 16:19:42+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: sv\n"
 "X-Message-Group: #out-statusnet-plugin-emailregistration\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Client exception trown when registration by e-mail is not allowed.
+msgid "Registration not allowed."
+msgstr ""
+
+#. TRANS: Client exception trown when trying to register without an invitation.
+msgid "Sorry, only invited people can register."
+msgstr ""
+
 #. TRANS: Client exception thrown when no confirmation code was provided.
 msgid "No confirmation code."
 msgstr ""
 
+#. TRANS: Client exception trown when using an invitation multiple times.
+msgid "Invitation already used."
+msgstr ""
+
 #. TRANS: Client exception thrown when given confirmation code was not issued.
 msgid "No such confirmation code."
 msgstr ""
@@ -46,10 +59,17 @@ msgid ""
 "An email was sent to %s to confirm that address. Check your email inbox for "
 "instructions."
 msgstr ""
+"Ett e-postmeddelande skickades till %s för att bekräfta att adressen. Kolla "
+"i inkorgen för instruktioner."
+
+#. TRANS: Client exception trown when trying to set password with an invalid confirmation code.
+msgid "No confirmation thing."
+msgstr ""
 
 #. TRANS: Error text when trying to register without agreeing to the terms.
 msgid "You must accept the terms of service and privacy policy to register."
 msgstr ""
+"Du måste acceptera villkoren och sekretesspolicyn för att registrera dig."
 
 #. TRANS: Error text when trying to register without a password.
 msgid "You must set a password"
@@ -63,11 +83,15 @@ msgstr "Lösenordet måste vara minst 6 tecken."
 msgid "Passwords do not match."
 msgstr "Lösenorden matchar inte."
 
+#. TRANS: Exception trown when using an invitation multiple times.
+msgid "Failed to register user."
+msgstr ""
+
 #. TRANS: Subject for confirmation e-mail.
 #. TRANS: %s is the StatusNet sitename.
 #, php-format
 msgid "Confirm your registration on %s"
-msgstr ""
+msgstr "Bekräfta din registrering på %s"
 
 #. TRANS: Body for confirmation e-mail.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is the confirmation URL.
@@ -80,6 +104,12 @@ msgid ""
 "%2$s\n"
 "If it was not you, you can safely ignore this message."
 msgstr ""
+"Någon (förmodligen du) har begärt ett konto på %1$s med hjälp av denna e-"
+"postadress.\n"
+"För att bekräfta adressen, klicka på följande URL eller kopiera det i "
+"adressfältet i webbläsaren.\n"
+"%2$s\n"
+"Om det inte var du, kan du ignorera detta meddelande."
 
 #. TRANS: Form instructions.
 msgid "Enter your email address to register for an account."
@@ -154,15 +184,3 @@ msgstr ""
 #. TRANS: Plugin description.
 msgid "Use email only for registration."
 msgstr ""
-
-#. TRANS: Exception thrown when the user greeting count could not be saved in the database.
-#. TRANS: %d is a user ID (number).
-#, php-format
-msgid "Could not save new greeting count for %d."
-msgstr ""
-
-#. TRANS: Exception thrown when the user greeting count could not be saved in the database.
-#. TRANS: %d is a user ID (number).
-#, php-format
-msgid "Could not increment greeting count for %d."
-msgstr ""
diff --git a/plugins/EmailRegistration/locale/tl/LC_MESSAGES/EmailRegistration.po b/plugins/EmailRegistration/locale/tl/LC_MESSAGES/EmailRegistration.po
index b23377befa..466a0c9c6d 100644
--- a/plugins/EmailRegistration/locale/tl/LC_MESSAGES/EmailRegistration.po
+++ b/plugins/EmailRegistration/locale/tl/LC_MESSAGES/EmailRegistration.po
@@ -9,22 +9,34 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - EmailRegistration\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:14+0000\n"
-"Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:25+0000\n"
+"Language-Team: Tagalog <https://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:26:37+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-18 16:19:42+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-emailregistration\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Client exception trown when registration by e-mail is not allowed.
+msgid "Registration not allowed."
+msgstr "Hindi pinapayagan ang pagpapatala."
+
+#. TRANS: Client exception trown when trying to register without an invitation.
+msgid "Sorry, only invited people can register."
+msgstr "Paumanhin, tanging inanyayahang mga tao lamang ang makakapagpatala."
+
 #. TRANS: Client exception thrown when no confirmation code was provided.
 msgid "No confirmation code."
 msgstr "Walang kodigo ng pagtitiyak."
 
+#. TRANS: Client exception trown when using an invitation multiple times.
+msgid "Invitation already used."
+msgstr "Nagamit na ang paanyaya."
+
 #. TRANS: Client exception thrown when given confirmation code was not issued.
 msgid "No such confirmation code."
 msgstr "Walang ganyang kodigo ng pagtitiyak."
@@ -49,6 +61,10 @@ msgstr ""
 "Isang e-liham ang ipinadala sa %s upang tiyakin ang tirahang iyon. Suriin "
 "ang kahong-tanggapan ng e-lliham para sa mga panuto."
 
+#. TRANS: Client exception trown when trying to set password with an invalid confirmation code.
+msgid "No confirmation thing."
+msgstr "Walang bagay ng pagtitiyak."
+
 #. TRANS: Error text when trying to register without agreeing to the terms.
 msgid "You must accept the terms of service and privacy policy to register."
 msgstr ""
@@ -67,6 +83,10 @@ msgstr "Ang hudyat ay dapat na 6 o mahigit pang mga panitik."
 msgid "Passwords do not match."
 msgstr "Hindi magkatugma ang mga hudyat."
 
+#. TRANS: Exception trown when using an invitation multiple times.
+msgid "Failed to register user."
+msgstr "Nabigo sa pagtatala ng tagagamit."
+
 #. TRANS: Subject for confirmation e-mail.
 #. TRANS: %s is the StatusNet sitename.
 #, php-format
@@ -165,20 +185,8 @@ msgstr "Hindi isang katanggap-tanggap na tirahan ng e-liham."
 #. TRANS: %s is the StatusNet sitename.
 #, php-format
 msgid "Welcome to %s"
-msgstr ""
+msgstr "Maligayang pagdating sa %s"
 
 #. TRANS: Plugin description.
 msgid "Use email only for registration."
 msgstr "Gamitin lamang ang e-liham para sa pagpapatala."
-
-#. TRANS: Exception thrown when the user greeting count could not be saved in the database.
-#. TRANS: %d is a user ID (number).
-#, php-format
-msgid "Could not save new greeting count for %d."
-msgstr "Hindi masagip ang bagong bilang ng pagbati para sa %d."
-
-#. TRANS: Exception thrown when the user greeting count could not be saved in the database.
-#. TRANS: %d is a user ID (number).
-#, php-format
-msgid "Could not increment greeting count for %d."
-msgstr "Hindi masudlungan ang bilang ng pagbati para sa %d."
diff --git a/plugins/EmailRegistration/locale/uk/LC_MESSAGES/EmailRegistration.po b/plugins/EmailRegistration/locale/uk/LC_MESSAGES/EmailRegistration.po
index 8c26064538..a028b18b26 100644
--- a/plugins/EmailRegistration/locale/uk/LC_MESSAGES/EmailRegistration.po
+++ b/plugins/EmailRegistration/locale/uk/LC_MESSAGES/EmailRegistration.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - EmailRegistration to Ukrainian (Україн�ька)
+# Translation of StatusNet - EmailRegistration to Ukrainian (україн�ька)
 # Exported from translatewiki.net
 #
 # Author: Boogie
@@ -9,23 +9,35 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - EmailRegistration\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:14+0000\n"
-"Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:25+0000\n"
+"Language-Team: Ukrainian <https://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:26:37+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-18 16:19:42+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-emailregistration\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
+#. TRANS: Client exception trown when registration by e-mail is not allowed.
+msgid "Registration not allowed."
+msgstr "Реє�трацію не дозволено."
+
+#. TRANS: Client exception trown when trying to register without an invitation.
+msgid "Sorry, only invited people can register."
+msgstr "Вибачте, але реє�траці� лише за запрошенн�ми."
+
 #. TRANS: Client exception thrown when no confirmation code was provided.
 msgid "No confirmation code."
 msgstr "�емає коду підтвердженн�."
 
+#. TRANS: Client exception trown when using an invitation multiple times.
+msgid "Invitation already used."
+msgstr "Це запрошенн� вже було викори�тано."
+
 #. TRANS: Client exception thrown when given confirmation code was not issued.
 msgid "No such confirmation code."
 msgstr "�емає такого коду підтвердженн�."
@@ -50,6 +62,10 @@ msgstr ""
 "Ли�т було наді�лано %s дл� підтвердженн� цієї адре�и. Перевірте вашу поштову "
 "�криньку дл� отриманн� ін�трукцій."
 
+#. TRANS: Client exception trown when trying to set password with an invalid confirmation code.
+msgid "No confirmation thing."
+msgstr "�емає коду підтвердженн�."
+
 #. TRANS: Error text when trying to register without agreeing to the terms.
 msgid "You must accept the terms of service and privacy policy to register."
 msgstr ""
@@ -68,6 +84,10 @@ msgstr "Пароль має �кладати�ь з 6-ти або більше 
 msgid "Passwords do not match."
 msgstr "Паролі не збігають��."
 
+#. TRANS: Exception trown when using an invitation multiple times.
+msgid "Failed to register user."
+msgstr "�е вдало�� зареє�трувати кори�тувача."
+
 #. TRANS: Subject for confirmation e-mail.
 #. TRANS: %s is the StatusNet sitename.
 #, php-format
@@ -164,20 +184,8 @@ msgstr "Це не дій�на електронна адре�а."
 #. TRANS: %s is the StatusNet sitename.
 #, php-format
 msgid "Welcome to %s"
-msgstr ""
+msgstr "Ла�каво про�имо до %s"
 
 #. TRANS: Plugin description.
 msgid "Use email only for registration."
 msgstr "Викори�танн� електронної пошти тільки дл� реє�трації."
-
-#. TRANS: Exception thrown when the user greeting count could not be saved in the database.
-#. TRANS: %d is a user ID (number).
-#, php-format
-msgid "Could not save new greeting count for %d."
-msgstr "�е вдало�� зберегти новий лічильник привітань дл� %d."
-
-#. TRANS: Exception thrown when the user greeting count could not be saved in the database.
-#. TRANS: %d is a user ID (number).
-#, php-format
-msgid "Could not increment greeting count for %d."
-msgstr "�е вдало�� перерахувати лічильник привітань дл� %d."
diff --git a/plugins/EmailReminder/EmailReminderPlugin.php b/plugins/EmailReminder/EmailReminderPlugin.php
new file mode 100644
index 0000000000..72583f5349
--- /dev/null
+++ b/plugins/EmailReminder/EmailReminderPlugin.php
@@ -0,0 +1,221 @@
+<?php
+/**
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2011, StatusNet, Inc.
+ *
+ * Plugin for sending email reminders about various things
+ *
+ * PHP version 5
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  OnDemand
+ * @package   StatusNet
+ * @author    Zach Copley <zach@status.net>
+ * @copyright 2011 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    // This check helps protect against security problems;
+    // your code file can't be executed directly from the web.
+    exit(1);
+}
+
+/**
+ * Email reminder plugin
+ *
+ * @category  Plugin
+ * @package   StatusNet
+ * @author    Zach Copley <zach@status.net>
+ * @copyright 2011 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+class EmailReminderPlugin extends Plugin
+{
+    /**
+     * Set up email_reminder table
+     *
+     * @see Schema
+     * @see ColumnDef
+     *
+     * @return boolean hook value; true means continue processing, false means stop.
+     */
+    function onCheckSchema()
+    {
+        $schema = Schema::get();
+        $schema->ensureTable('email_reminder', Email_reminder::schemaDef());
+        return true;
+    }
+
+    /**
+     * Load related modules when needed
+     *
+     * @param string $cls Name of the class to be loaded
+     *
+     * @return boolean hook value; true means continue processing, false
+     *         means stop.
+     */
+    function onAutoload($cls) {
+        $base = dirname(__FILE__);
+        $lower = strtolower($cls);
+
+        $files = array("$base/classes/$cls.php",
+            "$base/lib/$lower.php");
+        if (substr($lower, -6) == 'action') {
+            $files[] = "$base/actions/" . substr($lower, 0, -6) . ".php";
+        }
+        foreach ($files as $file) {
+            if (file_exists($file)) {
+                include_once $file;
+                return false;
+            }
+        }
+        return true;
+    }
+
+    /**
+     * Register our queue handlers
+     *
+     * @param QueueManager $qm Current queue manager
+     *
+     * @return boolean hook value
+     */
+    function onEndInitializeQueueManager($qm)
+    {
+        $qm->connect('siterem', 'SiteConfirmReminderHandler');
+        $qm->connect('uregrem', 'UserConfirmRegReminderHandler');
+        $qm->connect('uinvrem', 'UserInviteReminderHandler');
+
+        return true;
+    }
+
+    function onEndDocFileForTitle($title, $paths, &$filename)
+    {
+        if (empty($filename)) {
+            $filename = dirname(__FILE__) . '/mail-src/' . $title;
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Send a reminder and record doing so
+     *
+     * @param string $type      type of reminder
+     * @param mixed  $object    Confirm_address or Invitation object
+     * @param string $subject   subjct of the email reminder
+     * @param int    $day       number of days
+     */
+    static function sendReminder($type, $object, $subject, $day)
+    {
+        // XXX: -1 is a for the special one-time reminder (maybe 30) would be
+        // better?  Like >= 30 days?
+        if ($day == -1) {
+            $title = "{$type}-onetime";
+        } else {
+            $title = "{$type}-{$day}";
+        }
+
+        // Record the fact that we sent a reminder
+        if (self::sendReminderEmail($type, $object, $subject, $title)) {
+            try {
+                Email_reminder::recordReminder($type, $object, $day);
+                common_log(
+                    LOG_INFO,
+                    "Sent {$type} reminder to {$object->address}.",
+                    __FILE__
+                );
+            } catch (Exception $e) {
+                // oh noez
+                common_log(LOG_ERR, $e->getMessage(), __FILE__);
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * Send a real live email reminder
+     *
+     * @todo This would probably be better as two or more sep functions
+     *
+     * @param string $type      type of reminder
+     * @param mixed  $object    Confirm_address or Invitation object
+     * @param string $subject   subjct of the email reminder
+     * @param string $title     title of the email reminder
+     * @return boolean true if the email subsystem doesn't explode
+     */
+    static function sendReminderEmail($type, $object, $subject, $title = null) {
+
+        $sitename   = common_config('site', 'name');
+        $recipients = array($object->address);
+        $inviter    = null;
+        $inviterurl = null;
+
+        if ($type == UserInviteReminderHandler::INVITE_REMINDER) {
+            $user = User::staticGet($object->user_id);
+            if (!empty($user)) {
+                $profile    = $user->getProfile();
+                $inviter    = $profile->getBestName();
+                $inviterUrl = $profile->profileurl;
+            }
+        }
+
+        $headers['From'] = mail_notify_from();
+        $headers['To']   = trim($object->address);
+        // TRANS: Subject for confirmation e-mail.
+        // TRANS: %s is the StatusNet sitename.
+        $headers['Subject']      = $subject;
+        $headers['Content-Type'] = 'text/html; charset=UTF-8';
+
+        $confirmUrl = common_local_url('register', array('code' => $object->code));
+
+        $template = DocFile::forTitle($title, DocFile::mailPaths());
+
+        $blankfillers = array('confirmurl' => $confirmUrl);
+
+        if ($type == UserInviteReminderHandler::INVITE_REMINDER) {
+            $blankfillers['inviter'] = $inviter;
+            $blankfillers['inviterurl'] = $inviterUrl;
+            // @todo private invitation message?
+        }
+
+        $body = $template->toHTML($blankfillers);
+
+        return mail_send($recipients, $headers, $body);
+    }
+
+    /**
+     *
+     * @param type $versions
+     * @return type
+     */
+    function onPluginVersion(&$versions)
+    {
+        $versions[] = array(
+            'name'           => 'EmailReminder',
+            'version'        => STATUSNET_VERSION,
+            'author'         => 'Zach Copley',
+            'homepage'       => 'http://status.net/wiki/Plugin:EmailReminder',
+            // TRANS: Plugin description.
+            'rawdescription' => _m('Send email reminders for various things.')
+        );
+        return true;
+    }
+
+}
diff --git a/plugins/EmailReminder/classes/Email_reminder.php b/plugins/EmailReminder/classes/Email_reminder.php
new file mode 100644
index 0000000000..29af05a915
--- /dev/null
+++ b/plugins/EmailReminder/classes/Email_reminder.php
@@ -0,0 +1,157 @@
+<?php
+/**
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2011, StatusNet, Inc.
+ *
+ * Data class for email reminders
+ *
+ * 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  Data
+ * @package   EmailReminder
+ * @author    Zach Copley <zach@status.net>
+ * @copyright 2011 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+
+class Email_reminder extends Managed_DataObject
+{
+    public $__table = 'email_reminder';
+
+    public $type;     // type of reminder
+    public $code;     // confirmation code
+    public $days;     // number of days after code was created
+    public $sent;     // timestamp
+    public $created;  // timestamp
+    public $modified; // timestamp
+
+    /**
+     * Get an instance by key
+     *
+     * This is a utility method to get a single instance with a given key value.
+     *
+     * @param string $k Key to use to lookup
+     * @param mixed  $v Value to lookup
+     *
+     * @return QnA_Answer object found, or null for no hits
+     */
+    function staticGet($k, $v=null)
+    {
+        return Memcached_DataObject::staticGet('email_reminder', $k, $v);
+    }
+
+    /**
+     * Do we need to send a reminder?
+     *
+     * @param string $type      type of reminder
+     * @param Object $object    an object with a 'code' property
+     *                          (Confirm_address or Invitation)
+     * @param int    $days      Number of days after the code was created
+     * @return boolean true if any Email_reminder records were found
+     */
+    static function needsReminder($type, $object, $days = null) {
+
+        $reminder        = new Email_reminder();
+        $reminder->type  = $type;
+        $reminder->code  = $object->code;
+        if (!empty($days)) {
+            $reminder->days  = $days;
+        }
+        $result = $reminder->find();
+
+        if (!empty($result)) {
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Record a record of sending the reminder
+     *
+     * @param string $type      type of reminder
+     * @param Object $object    an object with a 'code' property
+     *                          (Confirm_address or Invitation)
+     * @param int    $days      Number of days after the code was created
+     * @return int   $result    row ID of the new reminder record
+     */
+    static function recordReminder($type, $object, $days) {
+
+        $reminder        = new Email_reminder();
+        $reminder->type  = $type;
+        $reminder->code  = $object->code;
+        $reminder->days  = $days;
+        $reminder->sent  = $reminder->created = common_sql_now();
+        $result          = $reminder->insert();
+
+        if (empty($result)) {
+            common_log_db_error($reminder, 'INSERT', __FILE__);
+                throw new ServerException(
+                    // TRANS: Server exception thrown when a reminder record could not be inserted into the database.
+                    _m('Database error inserting reminder record.')
+            );
+        }
+
+        return $result;
+    }
+
+    /**
+     * Data definition for email reminders
+     */
+    public static function schemaDef()
+    {
+        return array(
+            'description' => 'Record of email reminders that have been sent',
+            'fields'      => array(
+                'type'     => array(
+                    'type'          => 'varchar',
+                    'length'        => 255,
+                    'not null'      => true,
+                    'description'   => 'type of reminder'
+                ),
+                'code' => array(
+                    'type'        => 'varchar',
+                    'not null'    => 'true',
+                    'length'      => 255,
+                    'description' => 'confirmation code'
+                 ),
+                'days' => array(
+                    'type'        => 'int',
+                    'not null'    => 'true',
+                    'description' => 'number of days since code creation'
+                 ),
+                'sent' => array(
+                    'type'        => 'datetime',
+                    'not null'    => true,
+                    'description' => 'Date and time the reminder was sent'
+                ),
+                'created' => array(
+                    'type'        => 'datetime',
+                    'not null'    => true,
+                    'description' => 'Date and time the record was created'
+                ),
+                'modified'        => array(
+                    'type'        => 'timestamp',
+                    'not null'    => true,
+                    'description' => 'Date and time the record was last modified'
+                ),
+            ),
+            'primary key' => array('type', 'code', 'days'),
+            'indexes' => array(
+                'sent_idx' => array('sent'),
+             ),
+        );
+    }
+}
diff --git a/plugins/EmailReminder/lib/siteconfirmreminderhandler.php b/plugins/EmailReminder/lib/siteconfirmreminderhandler.php
new file mode 100644
index 0000000000..e5b4a5e2ab
--- /dev/null
+++ b/plugins/EmailReminder/lib/siteconfirmreminderhandler.php
@@ -0,0 +1,116 @@
+<?php
+/*
+ * StatusNet - the distributed open-source microblogging tool
+ *
+ * Handler for reminder queue items which send reminder emails to all users
+ * we would like to complete a given process (e.g.: registration).
+ *
+ * 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  Email
+ * @package   StatusNet
+ * @author    Zach Copley <zach@status.net>
+ * @copyright 2011 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    exit(1);
+}
+
+/**
+ * Handler for reminder queue items which send reminder emails to all users
+ * we would like to complete a given process (e.g.: registration)
+ *
+ * @category  Email
+ * @package   StatusNet
+ * @author    Zach Copley <zach@status.net>
+ * @copyright 2011 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+class SiteConfirmReminderHandler extends QueueHandler
+{
+    /**
+     * Return transport keyword which identifies items this queue handler
+     * services; must be defined for all subclasses.
+     *
+     * Must be 8 characters or less to fit in the queue_item database.
+     * ex "email", "jabber", "sms", "irc", ...
+     *
+     * @return string
+     */
+    function transport()
+    {
+        return 'siterem';
+    }
+
+    /**
+     * Handle the site
+     *
+     * @param array $remitem type of reminder to send and any special options
+     * @return boolean true on success, false on failure
+     */
+    function handle($remitem)
+    {
+        list($type, $opts) = $remitem;
+
+        $qm = QueueManager::get();
+
+        try {
+            switch($type) {
+            case UserConfirmRegReminderHandler::REGISTER_REMINDER:
+                $confirm               = new Confirm_address();
+                $confirm->address_type = $type;
+                $confirm->find();
+                while ($confirm->fetch()) {
+                    try {
+                        $qm->enqueue(array($confirm, $opts), 'uregrem');
+                    } catch (Exception $e) {
+                        common_log(LOG_WARNING, $e->getMessage());
+                        continue;
+                    }
+                }
+                break;
+            case UserInviteReminderHandler::INVITE_REMINDER:
+                $invitation = new Invitation();
+                // Only send one reminder (the latest one), regardless of how many invitations a user has
+                $sql = 'SELECT * FROM (SELECT * FROM invitation WHERE registered_user_id IS NULL ORDER BY created DESC) invitees GROUP BY invitees.address';
+                $invitation->query($sql);
+                while ($invitation->fetch()) {
+                    try {
+                        $qm->enqueue(array($invitation, $opts), 'uinvrem');
+                    } catch (Exception $e) {
+                        common_log(LOG_WARNING, $e->getMessage());
+                        continue;
+                    }
+                }
+                break;
+            default:
+                // WTF?
+                common_log(
+                    LOG_ERR,
+                    "Received unknown confirmation address type",
+                    __FILE__
+                );
+            }
+        } catch (Exception $e) {
+            common_log(LOG_ERR, $e->getMessage());
+            return false;
+        }
+
+        return true;
+    }
+}
diff --git a/plugins/EmailReminder/lib/userconfirmregreminderhandler.php b/plugins/EmailReminder/lib/userconfirmregreminderhandler.php
new file mode 100644
index 0000000000..1ea57aa6db
--- /dev/null
+++ b/plugins/EmailReminder/lib/userconfirmregreminderhandler.php
@@ -0,0 +1,150 @@
+<?php
+/**
+ * StatusNet - the distributed open-source microblogging tool
+ *
+ * Handler for queue items of type 'uregem' - sends email registration
+ * confirmation reminders to a particular user.
+ *
+ * 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  Email
+ * @package   StatusNet
+ * @author    Zach Copley <zach@status.net>
+ * @copyright 2011 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    exit(1);
+}
+
+/**
+ * Handler for queue items of type 'uregrem'
+ *
+ * @category  Email
+ * @package   StatusNet
+ * @author    Zach Copley <zach@status.net>
+ * @copyright 2011 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+class UserConfirmRegReminderHandler extends UserReminderHandler {
+
+    const REGISTER_REMINDER = 'register';
+
+    /**
+     * Return transport keyword which identifies items this queue handler
+     * services; must be defined for all subclasses.
+     *
+     * Must be 8 characters or less to fit in the queue_item database.
+     * ex "email", "jabber", "sms", "irc", ...
+     *
+     * @return string
+     */
+    function transport() {
+        return 'uregrem';
+    }
+
+    /**
+     * Send an email registration confirmation reminder until the user
+     * confirms her registration. We'll send a reminder after one day,
+     * three days, and a full week.
+     *
+     * @todo abstract this bit further
+     *
+     * @param array $regitem confirmation address and any special options
+     * @return boolean success value
+     */
+    function sendNextReminder($regitem)
+    {
+        list($confirm, $opts) = $regitem;
+
+        $regDate = strtotime($confirm->modified); // Seems like my best bet
+        $now     = strtotime('now');
+
+        // Days since registration
+        $days = ($now - $regDate) / 86499; // 60*60*24 = 86499
+        // $days = ($now - $regDate) / 120; // Two mins, good for testing
+
+        if ($days > 7 && isset($opts['onetime'])) {
+            // Don't send the reminder if we're past the normal reminder window and
+            // we've already pestered her at all before
+            if (Email_reminder::needsReminder(self::REGISTER_REMINDER, $confirm)) {
+                common_log(LOG_INFO, "Sending one-time registration confirmation reminder to {$confirm->address}", __FILE__);
+                $subject = _m("Reminder - please confirm your registration!");
+                return EmailReminderPlugin::sendReminder(
+                    self::REGISTER_REMINDER,
+                    $confirm,
+                    $subject,
+                    -1 // special one-time indicator
+                );
+            }
+        }
+
+        // Welcome to one of the ugliest switch statement I've ever written
+
+        switch($days) {
+        case ($days > 1 && $days < 2):
+            if (Email_reminder::needsReminder(self::REGISTER_REMINDER, $confirm, 1)) {
+                common_log(LOG_INFO, "Sending one day registration confirmation reminder to {$confirm->address}", __FILE__);
+                // TRANS: Subject for reminder e-mail.
+                $subject = _m('Reminder - please confirm your registration!');
+                return EmailReminderPlugin::sendReminder(
+                    self::REGISTER_REMINDER,
+                    $confirm,
+                    $subject,
+                    1
+                );
+            } else {
+                return true;
+            }
+            break;
+        case ($days > 3 && $days < 4):
+            if (Email_reminder::needsReminder(self::REGISTER_REMINDER, $confirm, 3)) {
+                common_log(LOG_INFO, "Sending three day registration confirmation reminder to {$confirm->address}", __FILE__);
+                // TRANS: Subject for reminder e-mail.
+                $subject = _m('Second reminder - please confirm your registration!');
+                    return EmailReminderPlugin::sendReminder(
+                        self::REGISTER_REMINDER,
+                        $confirm,
+                        $subject,
+                        3
+                    );
+                } else {
+                    return true;
+                }
+            break;
+        case ($days > 7 && $days < 8):
+            if (Email_reminder::needsReminder(self::REGISTER_REMINDER, $confirm, 7)) {
+                common_log(LOG_INFO, "Sending one week registration confirmation reminder to {$confirm->address}", __FILE__);
+                // TRANS: Subject for reminder e-mail.
+                $subject = _m('Final reminder - please confirm your registration!');
+                return EmailReminderPlugin::sendReminder(
+                    self::REGISTER_REMINDER,
+                    $confirm,
+                    $subject,
+                    7
+                );
+            } else {
+                return true;
+            }
+            break;
+        default:
+            common_log(LOG_INFO, "No need to send registration reminder to {$confirm->address}.", __FILE__);
+            break;
+        }
+        return true;
+    }
+}
diff --git a/plugins/EmailReminder/lib/userinvitereminderhandler.php b/plugins/EmailReminder/lib/userinvitereminderhandler.php
new file mode 100644
index 0000000000..38c84f18bb
--- /dev/null
+++ b/plugins/EmailReminder/lib/userinvitereminderhandler.php
@@ -0,0 +1,133 @@
+<?php
+/**
+ * StatusNet - the distributed open-source microblogging tool
+ *
+ * Handler for queue items of type 'uinvrem' - sends an email reminder to
+ * an email address of someone who has been invited to the site
+ *
+ * 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  Email
+ * @package   StatusNet
+ * @author    Zach Copley <zach@status.net>
+ * @copyright 2011 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    exit(1);
+}
+
+/**
+ * Handler for queue items of type 'uinvrem' (user invite reminder)
+ *
+ * @category  Email
+ * @package   StatusNet
+ * @author    Zach Copley <zach@status.net>
+ * @copyright 2011 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+class UserInviteReminderHandler extends UserReminderHandler {
+
+    const INVITE_REMINDER = 'invite';
+
+    /**
+     * Return transport keyword which identifies items this queue handler
+     * services; must be defined for all subclasses.
+     *
+     * Must be 8 characters or less to fit in the queue_item database.
+     * ex "email", "jabber", "sms", "irc", ...
+     *
+     * @return string
+     */
+    function transport() {
+        return 'uinvrem';
+    }
+
+    /**
+     * Send an invitation reminder. We'll send one after one day, and then
+     * one after three days.
+     *
+     * @todo Abstract this stuff further
+     *
+     * @param array $invitem Invitation obj and any special options
+     * @return boolean success value
+     */
+    function sendNextReminder($invitem)
+    {
+        list($invitation, $opts) = $invitem;
+
+        $invDate = strtotime($invitation->created);
+        $now     = strtotime('now');
+
+        // Days since first invitation was sent
+        $days = ($now - $invDate) / 86499; // 60*60*24 = 86499
+        // $days = ($now - $regDate) / 120; // Two mins, good for testing
+
+        $siteName = common_config('site', 'name');
+
+        if ($days > 7 && isset($opts['onetime'])) {
+            // Don't send the reminder if we're past the normal reminder window and
+            // we've already pestered her at all before
+            if (Email_reminder::needsReminder(self::INVITE_REMINDER, $invitation)) {
+                common_log(LOG_INFO, "Sending one-time invitation reminder to {$invitation->address}", __FILE__);
+                $subject = _m("Reminder - you have been invited to join {$siteName}!");
+                return EmailReminderPlugin::sendReminder(
+                    self::INVITE_REMINDER,
+                    $invitation,
+                    $subject,
+                    -1 // special one-time indicator
+                );
+            }
+        }
+
+        switch($days) {
+        case ($days > 1 && $days < 2):
+            if (Email_reminder::needsReminder(self::INVITE_REMINDER, $invitation, 1)) {
+                common_log(LOG_INFO, "Sending one day invitation reminder to {$invitation->address}", __FILE__);
+                // TRANS: Subject for reminder e-mail. %s is the StatusNet sitename.
+                $subject = sprintf(_m('Reminder - You have been invited to join %s!'),$siteName);
+                return EmailReminderPlugin::sendReminder(
+                    self::INVITE_REMINDER,
+                    $invitation,
+                    $subject,
+                1);
+            } else {
+                return true;
+            }
+            break;
+        case ($days > 3 && $days < 4):
+            if (Email_reminder::needsReminder(self::INVITE_REMINDER, $invitation, 3)) {
+                common_log(LOG_INFO, "Sending three day invitation reminder to {$invitation->address}", __FILE__);
+                // TRANS: Subject for reminder e-mail. %s is the StatusNet sitename.
+                $subject = sprintf(_m('Final reminder - you have been invited to join %s!'),$siteName);
+                    return EmailReminderPlugin::sendReminder(
+                        self::INVITE_REMINDER,
+                        $invitation,
+                        $subject,
+                        3
+                    );
+                } else {
+                    return true;
+                }
+            break;
+        default:
+            common_log(LOG_INFO, "No need to send invitation reminder to {$invitation->address}.", __FILE__);
+            break;
+        }
+        return true;
+    }
+}
diff --git a/plugins/EmailReminder/lib/userreminderhandler.php b/plugins/EmailReminder/lib/userreminderhandler.php
new file mode 100644
index 0000000000..e9d38a00a7
--- /dev/null
+++ b/plugins/EmailReminder/lib/userreminderhandler.php
@@ -0,0 +1,62 @@
+<?php
+/**
+ * StatusNet - the distributed open-source microblogging tool
+ *
+ * Base handler for email reminders
+ *
+ * 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  Email
+ * @package   StatusNet
+ * @author    Zach Copley <zach@status.net>
+ * @copyright 2011 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    exit(1);
+}
+
+/**
+ * Handler for email reminder queue items
+ *
+ * @category  Email
+ * @package   StatusNet
+ * @author    Zach Copley <zach@status.net>
+ * @copyright 2011 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+class UserReminderHandler extends QueueHandler {
+    /**
+     * Send the next email reminder to the confirm address
+     *
+     * @param Confirm_address $confirm the confirmation email/code
+     * @return boolean true on success, false on failure
+     */
+    function handle($confirm) {
+        return $this->sendNextReminder($confirm);
+    }
+
+    /**
+     * Send the next reminder if one needs sending.
+     * Subclasses must override
+     *
+     * @param Confirm_address $confirm the confirmation email/code
+     */
+    function sendNextReminder($confirm)
+    {
+    }
+}
diff --git a/plugins/EmailReminder/locale/EmailReminder.pot b/plugins/EmailReminder/locale/EmailReminder.pot
new file mode 100644
index 0000000000..f0a93d1a1b
--- /dev/null
+++ b/plugins/EmailReminder/locale/EmailReminder.pot
@@ -0,0 +1,55 @@
+# 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: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. TRANS: Plugin description.
+#: EmailReminderPlugin.php:216
+msgid "Send email reminders for various things."
+msgstr ""
+
+#. TRANS: Server exception thrown when a reminder record could not be inserted into the database.
+#: classes/Email_reminder.php:103
+msgid "Database error inserting reminder record."
+msgstr ""
+
+#. TRANS: Subject for reminder e-mail.
+#: lib/userconfirmregreminderhandler.php:86
+#: lib/userconfirmregreminderhandler.php:103
+msgid "Reminder - please confirm your registration!"
+msgstr ""
+
+#. TRANS: Subject for reminder e-mail.
+#: lib/userconfirmregreminderhandler.php:118
+msgid "Second reminder - please confirm your registration!"
+msgstr ""
+
+#. TRANS: Subject for reminder e-mail.
+#: lib/userconfirmregreminderhandler.php:133
+msgid "Final reminder - please confirm your registration!"
+msgstr ""
+
+#. TRANS: Subject for reminder e-mail. %s is the StatusNet sitename.
+#: lib/userinvitereminderhandler.php:102
+#, php-format
+msgid "Reminder - You have been invited to join %s!"
+msgstr ""
+
+#. TRANS: Subject for reminder e-mail. %s is the StatusNet sitename.
+#: lib/userinvitereminderhandler.php:116
+#, php-format
+msgid "Final reminder - you have been invited to join %s!"
+msgstr ""
diff --git a/plugins/EmailReminder/locale/ar/LC_MESSAGES/EmailReminder.po b/plugins/EmailReminder/locale/ar/LC_MESSAGES/EmailReminder.po
new file mode 100644
index 0000000000..d3ed0efaf8
--- /dev/null
+++ b/plugins/EmailReminder/locale/ar/LC_MESSAGES/EmailReminder.po
@@ -0,0 +1,55 @@
+# Translation of StatusNet - EmailReminder to Arabic (العربية)
+# Exported from translatewiki.net
+#
+# Author: Majid Al-Dharrab
+# Author: OsamaK
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - EmailReminder\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:25+0000\n"
+"Language-Team: Arabic <https://translatewiki.net/wiki/Portal:ar>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-19 11:23:04+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: ar\n"
+"X-Message-Group: #out-statusnet-plugin-emailreminder\n"
+"Plural-Forms: nplurals=6; plural=(n == 0) ? 0 : ( (n == 1) ? 1 : ( (n == "
+"2) ? 2 : ( (n%100 >= 3 && n%100 <= 10) ? 3 : ( (n%100 >= 11 && n%100 <= "
+"99) ? 4 : 5 ) ) ) );\n"
+
+#. TRANS: Plugin description.
+msgid "Send email reminders for various things."
+msgstr "يرسل رسائل تذكيرية لأمور عديدة."
+
+#. TRANS: Server exception thrown when a reminder record could not be inserted into the database.
+msgid "Database error inserting reminder record."
+msgstr ""
+
+#. TRANS: Subject for reminder e-mail.
+msgid "Reminder - please confirm your registration!"
+msgstr "تذكير: يرجى تأكيد تسجيلك!"
+
+#. TRANS: Subject for reminder e-mail.
+msgid "Second reminder - please confirm your registration!"
+msgstr "التذكير الثاني: يرجى تأكيد تسجيلك!"
+
+#. TRANS: Subject for reminder e-mail.
+msgid "Final reminder - please confirm your registration!"
+msgstr "التذكير النهائي: يرجى تأكيد تسجيلك!"
+
+#. TRANS: Subject for reminder e-mail. %s is the StatusNet sitename.
+#, php-format
+msgid "Reminder - You have been invited to join %s!"
+msgstr "تذكير: لقد وصلتك دعوة للتسجيل �ي %s!"
+
+#. TRANS: Subject for reminder e-mail. %s is the StatusNet sitename.
+#, php-format
+msgid "Final reminder - you have been invited to join %s!"
+msgstr "التذكير النهائي: لقد وصلتك دعوة للتسجيل �ي %s!"
diff --git a/plugins/EmailReminder/locale/ca/LC_MESSAGES/EmailReminder.po b/plugins/EmailReminder/locale/ca/LC_MESSAGES/EmailReminder.po
new file mode 100644
index 0000000000..843704e757
--- /dev/null
+++ b/plugins/EmailReminder/locale/ca/LC_MESSAGES/EmailReminder.po
@@ -0,0 +1,49 @@
+# Translation of StatusNet - EmailReminder to Catalan (català)
+# Exported from translatewiki.net
+#
+# Author: Toniher
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - EmailReminder\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:25+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-19 11:23:04+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin description.
+msgid "Send email reminders for various things."
+msgstr ""
+
+#. TRANS: Server exception thrown when a reminder record could not be inserted into the database.
+msgid "Database error inserting reminder record."
+msgstr ""
+
+#. TRANS: Subject for reminder e-mail.
+msgid "Reminder - please confirm your registration!"
+msgstr "Recordatori - confirmeu el registre!"
+
+#. TRANS: Subject for reminder e-mail.
+msgid "Second reminder - please confirm your registration!"
+msgstr "Segon recordatori - confirmeu el registre!"
+
+#. TRANS: Subject for reminder e-mail.
+msgid "Final reminder - please confirm your registration!"
+msgstr "Recordatori final - confirmeu el registre!"
+
+#. TRANS: Subject for reminder e-mail. %s is the StatusNet sitename.
+#, php-format
+msgid "Reminder - You have been invited to join %s!"
+msgstr ""
+
+#. TRANS: Subject for reminder e-mail. %s is the StatusNet sitename.
+#, php-format
+msgid "Final reminder - you have been invited to join %s!"
+msgstr ""
diff --git a/plugins/EmailReminder/locale/de/LC_MESSAGES/EmailReminder.po b/plugins/EmailReminder/locale/de/LC_MESSAGES/EmailReminder.po
new file mode 100644
index 0000000000..dcbd49360b
--- /dev/null
+++ b/plugins/EmailReminder/locale/de/LC_MESSAGES/EmailReminder.po
@@ -0,0 +1,53 @@
+# Translation of StatusNet - EmailReminder to German (Deutsch)
+# Exported from translatewiki.net
+#
+# Author: ChrisiPK
+# Author: Inkowik
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - EmailReminder\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:25+0000\n"
+"Language-Team: German <https://translatewiki.net/wiki/Portal:de>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-19 11:23:04+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: de\n"
+"X-Message-Group: #out-statusnet-plugin-emailreminder\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin description.
+msgid "Send email reminders for various things."
+msgstr "E-Mail-Erinnerungen für verschiedene Sachen schicken."
+
+#. TRANS: Server exception thrown when a reminder record could not be inserted into the database.
+msgid "Database error inserting reminder record."
+msgstr "Datenbankfehler beim Einfügen des Erinnerungsdatensatzes."
+
+#. TRANS: Subject for reminder e-mail.
+msgid "Reminder - please confirm your registration!"
+msgstr "Erinnerung - bitte bestätige deine Registrierung!"
+
+#. TRANS: Subject for reminder e-mail.
+msgid "Second reminder - please confirm your registration!"
+msgstr "Zweite Erinnerung - Bitte bestätige deine Registrierung!"
+
+#. TRANS: Subject for reminder e-mail.
+msgid "Final reminder - please confirm your registration!"
+msgstr "Letzte Erinnerung - Bitte bestätige deine Registrierung!"
+
+#. TRANS: Subject for reminder e-mail. %s is the StatusNet sitename.
+#, php-format
+msgid "Reminder - You have been invited to join %s!"
+msgstr "Erinnerung - Du wurdest eingeladen, %s beizutreten!"
+
+#. TRANS: Subject for reminder e-mail. %s is the StatusNet sitename.
+#, php-format
+msgid "Final reminder - you have been invited to join %s!"
+msgstr "Letzte Erinnerung - Du wurdest eingeladen, %s beizutreten"
diff --git a/plugins/EmailReminder/locale/es/LC_MESSAGES/EmailReminder.po b/plugins/EmailReminder/locale/es/LC_MESSAGES/EmailReminder.po
new file mode 100644
index 0000000000..17edc48592
--- /dev/null
+++ b/plugins/EmailReminder/locale/es/LC_MESSAGES/EmailReminder.po
@@ -0,0 +1,52 @@
+# Translation of StatusNet - EmailReminder to Spanish (español)
+# Exported from translatewiki.net
+#
+# Author: Erchache2000
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - EmailReminder\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:25+0000\n"
+"Language-Team: Spanish <https://translatewiki.net/wiki/Portal:es>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-19 11:23:04+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: es\n"
+"X-Message-Group: #out-statusnet-plugin-emailreminder\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin description.
+msgid "Send email reminders for various things."
+msgstr "Enviar correo electrónico de recuerdo para varias cosas."
+
+#. TRANS: Server exception thrown when a reminder record could not be inserted into the database.
+msgid "Database error inserting reminder record."
+msgstr "Error de base de datos al insertar registro de recuerdo."
+
+#. TRANS: Subject for reminder e-mail.
+msgid "Reminder - please confirm your registration!"
+msgstr "Recordatorio - por favor confirma tu registro!"
+
+#. TRANS: Subject for reminder e-mail.
+msgid "Second reminder - please confirm your registration!"
+msgstr "Segundo recordatorio - por favor confirma tu registro!"
+
+#. TRANS: Subject for reminder e-mail.
+msgid "Final reminder - please confirm your registration!"
+msgstr "Recordatorio final - por favor CONFIRMA tu registro!"
+
+#. TRANS: Subject for reminder e-mail. %s is the StatusNet sitename.
+#, php-format
+msgid "Reminder - You have been invited to join %s!"
+msgstr "Recordatorio - ha sido invitados a unirse a  %s !"
+
+#. TRANS: Subject for reminder e-mail. %s is the StatusNet sitename.
+#, php-format
+msgid "Final reminder - you have been invited to join %s!"
+msgstr "Recordatorio final - ha sido invitado a unirse a  %s !"
diff --git a/plugins/EmailReminder/locale/eu/LC_MESSAGES/EmailReminder.po b/plugins/EmailReminder/locale/eu/LC_MESSAGES/EmailReminder.po
new file mode 100644
index 0000000000..be8940c89c
--- /dev/null
+++ b/plugins/EmailReminder/locale/eu/LC_MESSAGES/EmailReminder.po
@@ -0,0 +1,52 @@
+# Translation of StatusNet - EmailReminder to Basque (euskara)
+# Exported from translatewiki.net
+#
+# Author: Artsuaga
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - EmailReminder\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:25+0000\n"
+"Language-Team: Basque <https://translatewiki.net/wiki/Portal:eu>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-19 11:23:04+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: eu\n"
+"X-Message-Group: #out-statusnet-plugin-emailreminder\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin description.
+msgid "Send email reminders for various things."
+msgstr "Bidali email ohartarazpenak gauza anitzetarako."
+
+#. TRANS: Server exception thrown when a reminder record could not be inserted into the database.
+msgid "Database error inserting reminder record."
+msgstr "Datubase akatsa ohartarazpe aukera txertatzean."
+
+#. TRANS: Subject for reminder e-mail.
+msgid "Reminder - please confirm your registration!"
+msgstr "Ohartarazpena -  mesedez baieztatu zure izen ematea!"
+
+#. TRANS: Subject for reminder e-mail.
+msgid "Second reminder - please confirm your registration!"
+msgstr "Bigarren ohartarazpena - mesedez baieztatu zure izen ematea!"
+
+#. TRANS: Subject for reminder e-mail.
+msgid "Final reminder - please confirm your registration!"
+msgstr "Azken ohartarazpena - mesedez baieztatu zure izen ematea!"
+
+#. TRANS: Subject for reminder e-mail. %s is the StatusNet sitename.
+#, php-format
+msgid "Reminder - You have been invited to join %s!"
+msgstr "Ohartarazpena - gonbidatuta zaude %s gunearekin bat egitera!"
+
+#. TRANS: Subject for reminder e-mail. %s is the StatusNet sitename.
+#, php-format
+msgid "Final reminder - you have been invited to join %s!"
+msgstr "Azken ohartarazpena - gonbidatuta zaude %s gunearekin bat egitera!"
diff --git a/plugins/EmailReminder/locale/fr/LC_MESSAGES/EmailReminder.po b/plugins/EmailReminder/locale/fr/LC_MESSAGES/EmailReminder.po
new file mode 100644
index 0000000000..23c4ee587a
--- /dev/null
+++ b/plugins/EmailReminder/locale/fr/LC_MESSAGES/EmailReminder.po
@@ -0,0 +1,55 @@
+# Translation of StatusNet - EmailReminder to French (français)
+# Exported from translatewiki.net
+#
+# Author: Gomoko
+# Author: Od1n
+# Author: OngolaBoy
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - EmailReminder\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:25+0000\n"
+"Language-Team: French <https://translatewiki.net/wiki/Portal:fr>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-19 11:23:04+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: fr\n"
+"X-Message-Group: #out-statusnet-plugin-emailreminder\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#. TRANS: Plugin description.
+msgid "Send email reminders for various things."
+msgstr "Envoyer des rappels par courriel pour diverses choses."
+
+#. TRANS: Server exception thrown when a reminder record could not be inserted into the database.
+msgid "Database error inserting reminder record."
+msgstr ""
+"Erreur de base de données lors de l'insertion d'un enregistrement de rappel."
+
+#. TRANS: Subject for reminder e-mail.
+msgid "Reminder - please confirm your registration!"
+msgstr "Rappel - veuillez confirmer votre inscription !"
+
+#. TRANS: Subject for reminder e-mail.
+msgid "Second reminder - please confirm your registration!"
+msgstr "Deuxième rappel - veuillez confirmer votre inscription !"
+
+#. TRANS: Subject for reminder e-mail.
+msgid "Final reminder - please confirm your registration!"
+msgstr "Dernier rappel - veuillez confirmer votre inscription !"
+
+#. TRANS: Subject for reminder e-mail. %s is the StatusNet sitename.
+#, php-format
+msgid "Reminder - You have been invited to join %s!"
+msgstr "Rappel - Vous avez été invité à joindre %s !"
+
+#. TRANS: Subject for reminder e-mail. %s is the StatusNet sitename.
+#, php-format
+msgid "Final reminder - you have been invited to join %s!"
+msgstr "Dernier rappel - Vous avez été invité à joindre %s !"
diff --git a/plugins/EmailReminder/locale/gl/LC_MESSAGES/EmailReminder.po b/plugins/EmailReminder/locale/gl/LC_MESSAGES/EmailReminder.po
new file mode 100644
index 0000000000..bc0099ff5d
--- /dev/null
+++ b/plugins/EmailReminder/locale/gl/LC_MESSAGES/EmailReminder.po
@@ -0,0 +1,52 @@
+# Translation of StatusNet - EmailReminder to Galician (galego)
+# Exported from translatewiki.net
+#
+# Author: Toliño
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - EmailReminder\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:25+0000\n"
+"Language-Team: Galician <https://translatewiki.net/wiki/Portal:gl>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-19 11:23:04+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: gl\n"
+"X-Message-Group: #out-statusnet-plugin-emailreminder\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin description.
+msgid "Send email reminders for various things."
+msgstr "Enviar recordatorios por correo para varias cousas."
+
+#. TRANS: Server exception thrown when a reminder record could not be inserted into the database.
+msgid "Database error inserting reminder record."
+msgstr "Erro na base de datos ao inserir o rexistro do recordatorio."
+
+#. TRANS: Subject for reminder e-mail.
+msgid "Reminder - please confirm your registration!"
+msgstr "Recordatorio: Confirme o seu rexistro!"
+
+#. TRANS: Subject for reminder e-mail.
+msgid "Second reminder - please confirm your registration!"
+msgstr "Segundo recordatorio: Confirme o seu rexistro!"
+
+#. TRANS: Subject for reminder e-mail.
+msgid "Final reminder - please confirm your registration!"
+msgstr "Último recordatorio: Confirme o seu rexistro!"
+
+#. TRANS: Subject for reminder e-mail. %s is the StatusNet sitename.
+#, php-format
+msgid "Reminder - You have been invited to join %s!"
+msgstr "Recordatorio: Está convidado a unirse a %s!"
+
+#. TRANS: Subject for reminder e-mail. %s is the StatusNet sitename.
+#, php-format
+msgid "Final reminder - you have been invited to join %s!"
+msgstr "Último recordatorio: Está convidado a unirse a %s!"
diff --git a/plugins/EmailReminder/locale/ia/LC_MESSAGES/EmailReminder.po b/plugins/EmailReminder/locale/ia/LC_MESSAGES/EmailReminder.po
new file mode 100644
index 0000000000..5c24291550
--- /dev/null
+++ b/plugins/EmailReminder/locale/ia/LC_MESSAGES/EmailReminder.po
@@ -0,0 +1,53 @@
+# Translation of StatusNet - EmailReminder to Interlingua (interlingua)
+# Exported from translatewiki.net
+#
+# Author: McDutchie
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - EmailReminder\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:26+0000\n"
+"Language-Team: Interlingua <https://translatewiki.net/wiki/Portal:ia>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-19 11:23:04+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: ia\n"
+"X-Message-Group: #out-statusnet-plugin-emailreminder\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin description.
+msgid "Send email reminders for various things."
+msgstr "Inviar rememorationes in e-mail pro varie cosas."
+
+#. TRANS: Server exception thrown when a reminder record could not be inserted into the database.
+msgid "Database error inserting reminder record."
+msgstr ""
+"Error in base de datos durante le insertion de un registro de rememoration."
+
+#. TRANS: Subject for reminder e-mail.
+msgid "Reminder - please confirm your registration!"
+msgstr "Rememoration: per favor confirma tu registration!"
+
+#. TRANS: Subject for reminder e-mail.
+msgid "Second reminder - please confirm your registration!"
+msgstr "Secunde rememoration: per favor confirma tu registration!"
+
+#. TRANS: Subject for reminder e-mail.
+msgid "Final reminder - please confirm your registration!"
+msgstr "Rememoration final: per favor confirma tu registration!"
+
+#. TRANS: Subject for reminder e-mail. %s is the StatusNet sitename.
+#, php-format
+msgid "Reminder - You have been invited to join %s!"
+msgstr "Rememoration: Tu ha essite invitate a adherer a %s!"
+
+#. TRANS: Subject for reminder e-mail. %s is the StatusNet sitename.
+#, php-format
+msgid "Final reminder - you have been invited to join %s!"
+msgstr "Rememoration final: tu ha essite invitate a adherer a %s!"
diff --git a/plugins/EmailReminder/locale/it/LC_MESSAGES/EmailReminder.po b/plugins/EmailReminder/locale/it/LC_MESSAGES/EmailReminder.po
new file mode 100644
index 0000000000..e919a8c8b7
--- /dev/null
+++ b/plugins/EmailReminder/locale/it/LC_MESSAGES/EmailReminder.po
@@ -0,0 +1,49 @@
+# Translation of StatusNet - EmailReminder to Italian (italiano)
+# Exported from translatewiki.net
+#
+# Author: Ximo17
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - EmailReminder\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:26+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-19 11:23:04+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin description.
+msgid "Send email reminders for various things."
+msgstr "Inviare e-mail promemoria per varie cose."
+
+#. TRANS: Server exception thrown when a reminder record could not be inserted into the database.
+msgid "Database error inserting reminder record."
+msgstr "Errore nel database nell'inserire i record di promemoria."
+
+#. TRANS: Subject for reminder e-mail.
+msgid "Reminder - please confirm your registration!"
+msgstr "Promemoria - si prega di confermare la registrazione!"
+
+#. TRANS: Subject for reminder e-mail.
+msgid "Second reminder - please confirm your registration!"
+msgstr "Secondo promemoria - si prega di confermare la registrazione!"
+
+#. TRANS: Subject for reminder e-mail.
+msgid "Final reminder - please confirm your registration!"
+msgstr "Ultimo promemoria - si prega di confermare la registrazione!"
+
+#. TRANS: Subject for reminder e-mail. %s is the StatusNet sitename.
+#, php-format
+msgid "Reminder - You have been invited to join %s!"
+msgstr "Promemoria - Sei stato invitato ad unirti a %s!"
+
+#. TRANS: Subject for reminder e-mail. %s is the StatusNet sitename.
+#, php-format
+msgid "Final reminder - you have been invited to join %s!"
+msgstr "Ultimo promemoria - Sei stato invitato ad unirti a %s!"
diff --git a/plugins/EmailReminder/locale/mk/LC_MESSAGES/EmailReminder.po b/plugins/EmailReminder/locale/mk/LC_MESSAGES/EmailReminder.po
new file mode 100644
index 0000000000..cc2c7f149f
--- /dev/null
+++ b/plugins/EmailReminder/locale/mk/LC_MESSAGES/EmailReminder.po
@@ -0,0 +1,52 @@
+# Translation of StatusNet - EmailReminder to Macedonian (македон�ки)
+# Exported from translatewiki.net
+#
+# Author: Bjankuloski06
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - EmailReminder\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:26+0000\n"
+"Language-Team: Macedonian <https://translatewiki.net/wiki/Portal:mk>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-19 11:23:04+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: mk\n"
+"X-Message-Group: #out-statusnet-plugin-emailreminder\n"
+"Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
+
+#. TRANS: Plugin description.
+msgid "Send email reminders for various things."
+msgstr "И�праќај пот�етници за разни нешта по е-пошта."
+
+#. TRANS: Server exception thrown when a reminder record could not be inserted into the database.
+msgid "Database error inserting reminder record."
+msgstr "Грешка во базата при вметнувањето на евиденцијата за пот�етување."
+
+#. TRANS: Subject for reminder e-mail.
+msgid "Reminder - please confirm your registration!"
+msgstr "Пот�етување - потврдете ја Вашата реги�трација!"
+
+#. TRANS: Subject for reminder e-mail.
+msgid "Second reminder - please confirm your registration!"
+msgstr "По�ледно пот�етување - потврдете ја Вашата реги�трација!"
+
+#. TRANS: Subject for reminder e-mail.
+msgid "Final reminder - please confirm your registration!"
+msgstr "По�ледно пот�етување - потврдете ја Вашата реги�трација!"
+
+#. TRANS: Subject for reminder e-mail. %s is the StatusNet sitename.
+#, php-format
+msgid "Reminder - You have been invited to join %s!"
+msgstr "Пот�етување - Имате покана да �е придружите на %s!"
+
+#. TRANS: Subject for reminder e-mail. %s is the StatusNet sitename.
+#, php-format
+msgid "Final reminder - you have been invited to join %s!"
+msgstr "По�ледно пот�етување - Имате покана да �е придружите на %s!"
diff --git a/plugins/EmailReminder/locale/nl/LC_MESSAGES/EmailReminder.po b/plugins/EmailReminder/locale/nl/LC_MESSAGES/EmailReminder.po
new file mode 100644
index 0000000000..0eee0cce17
--- /dev/null
+++ b/plugins/EmailReminder/locale/nl/LC_MESSAGES/EmailReminder.po
@@ -0,0 +1,54 @@
+# Translation of StatusNet - EmailReminder to Dutch (Nederlands)
+# Exported from translatewiki.net
+#
+# Author: Siebrand
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - EmailReminder\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:26+0000\n"
+"Language-Team: Dutch <https://translatewiki.net/wiki/Portal:nl>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-19 11:23:04+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: nl\n"
+"X-Message-Group: #out-statusnet-plugin-emailreminder\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin description.
+msgid "Send email reminders for various things."
+msgstr "E-mailherinnering verzenden voor verschillende dingen."
+
+#. TRANS: Server exception thrown when a reminder record could not be inserted into the database.
+msgid "Database error inserting reminder record."
+msgstr ""
+"Er is een databasefout opgetreden tijdens het invoegen van een "
+"herinneringsrecord."
+
+#. TRANS: Subject for reminder e-mail.
+msgid "Reminder - please confirm your registration!"
+msgstr "Herinnering - bevestig uw registratie!"
+
+#. TRANS: Subject for reminder e-mail.
+msgid "Second reminder - please confirm your registration!"
+msgstr "Tweede herinnering - bevestig uw registratie!"
+
+#. TRANS: Subject for reminder e-mail.
+msgid "Final reminder - please confirm your registration!"
+msgstr "Laatste herinnering - bevestig uw registratie!"
+
+#. TRANS: Subject for reminder e-mail. %s is the StatusNet sitename.
+#, php-format
+msgid "Reminder - You have been invited to join %s!"
+msgstr "Herinnering: u bent uitgenodigd om lid te worden van %s!"
+
+#. TRANS: Subject for reminder e-mail. %s is the StatusNet sitename.
+#, php-format
+msgid "Final reminder - you have been invited to join %s!"
+msgstr "Laatste herinnering: u bent uitgenodigd om lid te worden van %s!"
diff --git a/plugins/EmailReminder/locale/pt/LC_MESSAGES/EmailReminder.po b/plugins/EmailReminder/locale/pt/LC_MESSAGES/EmailReminder.po
new file mode 100644
index 0000000000..46b87c5997
--- /dev/null
+++ b/plugins/EmailReminder/locale/pt/LC_MESSAGES/EmailReminder.po
@@ -0,0 +1,52 @@
+# Translation of StatusNet - EmailReminder to Portuguese (português)
+# Exported from translatewiki.net
+#
+# Author: Analuisa
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - EmailReminder\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:26+0000\n"
+"Language-Team: Portuguese <https://translatewiki.net/wiki/Portal:pt>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-19 11:23:04+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: pt\n"
+"X-Message-Group: #out-statusnet-plugin-emailreminder\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin description.
+msgid "Send email reminders for various things."
+msgstr "Enviar lembretes de e-mail para várias coisas."
+
+#. TRANS: Server exception thrown when a reminder record could not be inserted into the database.
+msgid "Database error inserting reminder record."
+msgstr "Erro na base de dados ao inserir o registo de lembretes."
+
+#. TRANS: Subject for reminder e-mail.
+msgid "Reminder - please confirm your registration!"
+msgstr "Lembrete- por favor confirme a sua inscrição!"
+
+#. TRANS: Subject for reminder e-mail.
+msgid "Second reminder - please confirm your registration!"
+msgstr "Segundo lembrete - por favor confirme a sua inscrição!"
+
+#. TRANS: Subject for reminder e-mail.
+msgid "Final reminder - please confirm your registration!"
+msgstr "Último lembrete - por favor confirme a sua inscrição!"
+
+#. TRANS: Subject for reminder e-mail. %s is the StatusNet sitename.
+#, php-format
+msgid "Reminder - You have been invited to join %s!"
+msgstr "Lembrete - Foi convidado(a) para se juntar %s"
+
+#. TRANS: Subject for reminder e-mail. %s is the StatusNet sitename.
+#, php-format
+msgid "Final reminder - you have been invited to join %s!"
+msgstr "Último lembrete - foi convidado(a) para se juntar %s!"
diff --git a/plugins/EmailReminder/locale/tl/LC_MESSAGES/EmailReminder.po b/plugins/EmailReminder/locale/tl/LC_MESSAGES/EmailReminder.po
new file mode 100644
index 0000000000..b7858a07b5
--- /dev/null
+++ b/plugins/EmailReminder/locale/tl/LC_MESSAGES/EmailReminder.po
@@ -0,0 +1,50 @@
+# Translation of StatusNet - EmailReminder to Tagalog (Tagalog)
+# Exported from translatewiki.net
+#
+# Author: AnakngAraw
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - EmailReminder\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:26+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-19 11:23:04+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin description.
+msgid "Send email reminders for various things."
+msgstr ""
+"Magpadala ng mga pampaalalang mga e-liham para sa samu't saring mga bagay."
+
+#. TRANS: Server exception thrown when a reminder record could not be inserted into the database.
+msgid "Database error inserting reminder record."
+msgstr "Kamalian ng kalipunan ng dato sa pagsisingit ng tala ng paalala."
+
+#. TRANS: Subject for reminder e-mail.
+msgid "Reminder - please confirm your registration!"
+msgstr "Paalala - pakitiyak ang pagpapatala mo!"
+
+#. TRANS: Subject for reminder e-mail.
+msgid "Second reminder - please confirm your registration!"
+msgstr "Ikalawang paalala - pakitiyak ang pagpapatala mo!"
+
+#. TRANS: Subject for reminder e-mail.
+msgid "Final reminder - please confirm your registration!"
+msgstr "Huling paalala - pakitiyak ang pagpapatala mo!"
+
+#. TRANS: Subject for reminder e-mail. %s is the StatusNet sitename.
+#, php-format
+msgid "Reminder - You have been invited to join %s!"
+msgstr "Paalala - Inanyayahan kang sumali sa %s!"
+
+#. TRANS: Subject for reminder e-mail. %s is the StatusNet sitename.
+#, php-format
+msgid "Final reminder - you have been invited to join %s!"
+msgstr "Huling paalala - inanyayahan kang sumali sa %s!"
diff --git a/plugins/EmailReminder/mail-src/invite-1 b/plugins/EmailReminder/mail-src/invite-1
new file mode 100644
index 0000000000..f1abf0b5d6
--- /dev/null
+++ b/plugins/EmailReminder/mail-src/invite-1
@@ -0,0 +1,26 @@
+First reminder...
+
+%%arg.inviter%% has invited you to join them on %%site.name%%.
+
+%%site.name%% is a micro-blogging service that lets you keep
+up-to-date with people you know and people who interest you.
+
+You can also share news about yourself, your thoughts, or your life
+online with people who know about you.
+
+It's great for meeting new people who share your interests.
+
+You can see %%arg.inviter%%'s profile page on %%site.name%% here:
+
+> [%%arg.inviterurl%%](%%arg.inviterurl%%)
+
+If you'd like to try the service, click on the link below to accept
+the invitation.
+
+> [%%arg.confirmurl%%](%%arg.confirmurl%%)
+
+If not, you can ignore this message. Thanks for your patience and your time.
+
+Sincerely,
+
+%%site.name%%
diff --git a/plugins/EmailReminder/mail-src/invite-3 b/plugins/EmailReminder/mail-src/invite-3
new file mode 100644
index 0000000000..8955443b24
--- /dev/null
+++ b/plugins/EmailReminder/mail-src/invite-3
@@ -0,0 +1,26 @@
+Second and final reminder...
+
+%%arg.inviter%% has invited you to join them on %%site.name%%.
+
+%%site.name%% is a micro-blogging service that lets you keep
+up-to-date with people you know and people who interest you.
+
+You can also share news about yourself, your thoughts, or your life
+online with people who know about you.
+
+It's great for meeting new people who share your interests.
+
+You can see %%arg.inviter%%'s profile page on %%site.name%% here:
+
+> [%%arg.inviterurl%%](%%arg.inviterurl%%)
+
+If you'd like to try the service, click on the link below to accept
+the invitation.
+
+> [%%arg.confirmurl%%](%%arg.confirmurl%%)
+
+If not, you can ignore this message. Thanks for your patience and your time.
+
+Sincerely,
+
+%%site.name%%
diff --git a/plugins/EmailReminder/mail-src/invite-onetime b/plugins/EmailReminder/mail-src/invite-onetime
new file mode 100644
index 0000000000..0426e4f7de
--- /dev/null
+++ b/plugins/EmailReminder/mail-src/invite-onetime
@@ -0,0 +1,26 @@
+Special ONE TIME reminder...
+
+%%arg.inviter%% has invited you to join them on %%site.name%%.
+
+%%site.name%% is a micro-blogging service that lets you keep
+up-to-date with people you know and people who interest you.
+
+You can also share news about yourself, your thoughts, or your life
+online with people who know about you.
+
+It's great for meeting new people who share your interests.
+
+You can see %%arg.inviter%%'s profile page on %%site.name%% here:
+
+> [%%arg.inviterurl%%](%%arg.inviterurl%%)
+
+If you'd like to try the service, click on the link below to accept
+the invitation.
+
+> [%%arg.confirmurl%%](%%arg.confirmurl%%)
+
+If not, you can ignore this message. Thanks for your patience and your time.
+
+Sincerely,
+
+%%site.name%%
diff --git a/plugins/EmailReminder/mail-src/register-1 b/plugins/EmailReminder/mail-src/register-1
new file mode 100644
index 0000000000..3caa451452
--- /dev/null
+++ b/plugins/EmailReminder/mail-src/register-1
@@ -0,0 +1,9 @@
+Reminder:
+
+Someone (probably you) has requested an account on %%site.name%% using this email address.
+
+To confirm the address, click the following URL or copy it into the address bar of your browser.
+
+> [%%arg.confirmurl%%](%%arg.confirmurl%%)
+
+If it was not you, you can safely ignore this message.
diff --git a/plugins/EmailReminder/mail-src/register-3 b/plugins/EmailReminder/mail-src/register-3
new file mode 100644
index 0000000000..3065622477
--- /dev/null
+++ b/plugins/EmailReminder/mail-src/register-3
@@ -0,0 +1,9 @@
+Hey, it's been three days!!
+
+Someone (probably you) has requested an account on %%site.name%% using this email address.
+
+To confirm the address, click the following URL or copy it into the address bar of your browser.
+
+> [%%arg.confirmurl%%](%%arg.confirmurl%%)
+
+If it was not you, you can safely ignore this message.
diff --git a/plugins/EmailReminder/mail-src/register-7 b/plugins/EmailReminder/mail-src/register-7
new file mode 100644
index 0000000000..75db0ebfeb
--- /dev/null
+++ b/plugins/EmailReminder/mail-src/register-7
@@ -0,0 +1,9 @@
+IT'S BEEN A WHOLE WEEK! Final reminder...
+
+Someone (probably you) has requested an account on %%site.name%% using this email address.
+
+To confirm the address, click the following URL or copy it into the address bar of your browser.
+
+> [%%arg.confirmurl%%](%%arg.confirmurl%%)
+
+If it was not you, you can safely ignore this message.
diff --git a/plugins/EmailReminder/mail-src/register-onetime b/plugins/EmailReminder/mail-src/register-onetime
new file mode 100644
index 0000000000..0cefd12532
--- /dev/null
+++ b/plugins/EmailReminder/mail-src/register-onetime
@@ -0,0 +1,9 @@
+Hi, this is a special ONE TIME reminder.
+
+Someone (probably you) has requested an account on %%site.name%% using this email address.
+
+To confirm the address, click the following URL or copy it into the address bar of your browser.
+
+> [%%arg.confirmurl%%](%%arg.confirmurl%%)
+
+If it was not you, you can safely ignore this message.
diff --git a/plugins/EmailReminder/scripts/cron.sample b/plugins/EmailReminder/scripts/cron.sample
new file mode 100644
index 0000000000..91981e73d3
--- /dev/null
+++ b/plugins/EmailReminder/scripts/cron.sample
@@ -0,0 +1 @@
+* * * * * /opt/local/bin/php /path/to/statusnet/plugins/EmailReminder/scripts/sendemailreminder.php -t all -a -q > /tmp/cron.log
diff --git a/plugins/EmailReminder/scripts/sendemailreminder.php b/plugins/EmailReminder/scripts/sendemailreminder.php
new file mode 100644
index 0000000000..2cc214a671
--- /dev/null
+++ b/plugins/EmailReminder/scripts/sendemailreminder.php
@@ -0,0 +1,153 @@
+#!/usr/bin/env php
+<?php
+/*
+* StatusNet - a distributed open-source microblogging tool
+* Copyright (C) 2011, StatusNet, Inc.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Affero General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU Affero General Public License for more details.
+*
+* You should have received a copy of the GNU Affero General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+define('INSTALLDIR', realpath(dirname(__FILE__) . '/../../..'));
+
+$shortoptions = 't:e:auo';
+$longoptions = array('type=', 'email=', 'all', 'universe', 'onetime');
+
+$helptext = <<<END_OF_SENDEMAILREMINDER_HELP
+sendemailreminder.php [options]
+Send an email summary of the inbox to users
+
+ -t --type     type of reminder to send (register | invite | all)
+ -e --email    email address to send reminder to
+ -a --all      send reminder to all addresses
+ -u --universe send reminder to all addresses on all sites
+ -o --onetime  send one-time reminder to older addresses
+
+END_OF_SENDEMAILREMINDER_HELP;
+
+require_once INSTALLDIR . '/scripts/commandline.inc';
+
+$quiet = have_option('q', 'quiet');
+
+$types = array(
+    // registration confirmation reminder
+    'register' => array(
+        'type'       => 'register',
+        'className'  => 'Confirm_address',
+        'utransport' => 'uregrem'
+     ),
+    // invitation confirmation reminder
+    'invite'   => array(
+        'type'       => 'invite',
+        'className'  => 'Invitation',
+        'utransport' => 'uinvrem'
+    )
+    // ... add more here
+);
+
+$type = null;
+$opts = array(); // special options like "onetime"
+
+if (have_option('t', 'type')) {
+    $type = trim(get_option_value('t', 'type'));
+    if (!in_array($type, array_keys($types)) && $type !== 'all') {
+       print _m("Unknown reminder type: {$type}.\n");
+       exit(1);
+    }
+} else {
+   show_help();
+   exit(1);
+}
+
+if (have_option('o', 'onetime')) {
+    $opts['onetime'] = true;
+    if (!$quiet) { print "Special one-time reminder mode.\n"; }
+}
+
+$reminders = array();
+
+switch($type) {
+case 'register':
+    $reminders[] = $types['register'];
+    break;
+case 'invite':
+    $reminders[] = $types['invite'];
+    break;
+case 'all':
+    $reminders = $types;
+    break;
+}
+
+if (have_option('u', 'universe')) {
+    $sn = new Status_network();
+    try {
+        if ($sn->find()) {
+            while ($sn->fetch()) {
+                try {
+                    $server = $sn->getServerName();
+                    StatusNet::init($server);
+                    // Different queue manager, maybe!
+                    $qm = QueueManager::get();
+                    foreach ($reminders as $reminder) {
+                        extract($reminder);
+                        $qm->enqueue(array($type, $opts), 'siterem');
+                        if (!$quiet) { print "Sent pending {$type} reminders for {$server}.\n"; }
+                    }
+                } catch (Exception $e) {
+                    // keep going
+                    common_log(LOG_ERR, "Couldn't init {$server}.\n", __FILE__);
+                    if (!$quiet) { print "Couldn't init {$server}.\n"; }
+                    continue;
+                }
+            }
+           if (!$quiet) { print "Done! Reminders sent to all unconfirmed addresses in the known universe.\n"; }
+        }
+    } catch (Exception $e) {
+        if (!$quiet) { print $e->getMessage() . "\n"; }
+        common_log(LOG_ERR, $e->getMessage(), __FILE__);
+        exit(1);
+    }
+} else {
+    $qm = QueueManager::get();
+    try {
+        // enqueue reminder for specific email address or all unconfirmed addresses
+        if (have_option('e', 'email')) {
+            $address = trim(get_option_value('e', 'email'));
+            foreach ($reminders as $reminder) {
+                // real bad voodoo here
+                extract($reminder);
+                $confirm = new $className;
+                $confirm->address = $address;
+                $result = $confirm->find(true);
+                if (empty($result)) {
+                    throw new Exception("No confirmation code found for {$address}.");
+                }
+                $qm->enqueue(array($confirm, $opts), $utransport);
+                if (!$quiet) { print "Sent all pending {$type} reminder to {$address}.\n"; }
+            }
+        } else if (have_option('a', 'all')) {
+            foreach ($reminders as $reminder) {
+                extract($reminder);
+                $qm->enqueue(array($type, $opts), 'siterem');
+                if (!$quiet) { print "Sent pending {$type} reminders to all unconfirmed addresses on the site.\n"; }
+            }
+        } else {
+            show_help();
+            exit(1);
+        }
+    } catch (Exception $e) {
+        if (!$quiet) { print $e->getMessage() . "\n"; }
+        common_log(LOG_ERR, $e->getMessage(), __FILE__);
+        exit(1);
+    }
+}
diff --git a/plugins/EmailSummary/locale/EmailSummary.pot b/plugins/EmailSummary/locale/EmailSummary.pot
index 4db9cf4ea7..64e42b0899 100644
--- a/plugins/EmailSummary/locale/EmailSummary.pot
+++ b/plugins/EmailSummary/locale/EmailSummary.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,30 +16,31 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#. TRANS: Subject for e-mail.
+#: useremailsummaryhandler.php:124
+#, php-format
+msgid "Your latest updates from %s"
+msgstr ""
+
 #. TRANS: Text in e-mail summary.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is the recipient's profile name.
-#: useremailsummaryhandler.php:129
+#: useremailsummaryhandler.php:139
 #, php-format
 msgid "Recent updates from %1$s for %2$s:"
 msgstr ""
 
 #. TRANS: Link text for link to conversation view.
-#: useremailsummaryhandler.php:185
+#: useremailsummaryhandler.php:195
 msgid "in context"
 msgstr ""
 
 #. TRANS: Link text for link to e-mail settings.
 #. TRANS: %1$s is a link to the e-mail settings, %2$s is the StatusNet sitename.
-#: useremailsummaryhandler.php:197
+#: useremailsummaryhandler.php:207
 #, php-format
 msgid "<a href=\"%1$s\">change your email settings for %2$s</a>"
 msgstr ""
 
-#. TRANS: Subject for e-mail.
-#: useremailsummaryhandler.php:208
-msgid "Updates from your network"
-msgstr ""
-
 #. TRANS: Plugin description.
 #: EmailSummaryPlugin.php:115
 msgid "Send an email summary of the inbox to users."
diff --git a/plugins/EmailSummary/locale/ca/LC_MESSAGES/EmailSummary.po b/plugins/EmailSummary/locale/ca/LC_MESSAGES/EmailSummary.po
index 5ed34fd9cf..ba1d2b433d 100644
--- a/plugins/EmailSummary/locale/ca/LC_MESSAGES/EmailSummary.po
+++ b/plugins/EmailSummary/locale/ca/LC_MESSAGES/EmailSummary.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - EmailSummary to Catalan (Català)
+# Translation of StatusNet - EmailSummary to Catalan (català)
 # Exported from translatewiki.net
 #
 # Author: Toniher
@@ -9,23 +9,28 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - EmailSummary\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:15+0000\n"
-"Language-Team: Catalan <http://translatewiki.net/wiki/Portal:ca>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:26+0000\n"
+"Language-Team: Catalan <https://translatewiki.net/wiki/Portal:ca>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:26:47+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-07-01 11:18:46+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ca\n"
 "X-Message-Group: #out-statusnet-plugin-emailsummary\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Subject for e-mail.
+#, php-format
+msgid "Your latest updates from %s"
+msgstr "Les vostres darreres actualitzacions de %s"
+
 #. TRANS: Text in e-mail summary.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is the recipient's profile name.
 #, php-format
 msgid "Recent updates from %1$s for %2$s:"
-msgstr ""
+msgstr "Actualitzacions recents de %1$s per a %2$s:"
 
 #. TRANS: Link text for link to conversation view.
 msgid "in context"
@@ -37,10 +42,6 @@ msgstr "en context"
 msgid "<a href=\"%1$s\">change your email settings for %2$s</a>"
 msgstr ""
 
-#. TRANS: Subject for e-mail.
-msgid "Updates from your network"
-msgstr "Actualitzacions de la vostra xarxa"
-
 #. TRANS: Plugin description.
 msgid "Send an email summary of the inbox to users."
 msgstr "Envia un resum de correu a la safata d'entrada dels usuaris."
diff --git a/plugins/EmailSummary/locale/de/LC_MESSAGES/EmailSummary.po b/plugins/EmailSummary/locale/de/LC_MESSAGES/EmailSummary.po
index 29d9c6d2e8..3d156b7218 100644
--- a/plugins/EmailSummary/locale/de/LC_MESSAGES/EmailSummary.po
+++ b/plugins/EmailSummary/locale/de/LC_MESSAGES/EmailSummary.po
@@ -1,6 +1,7 @@
 # Translation of StatusNet - EmailSummary to German (Deutsch)
 # Exported from translatewiki.net
 #
+# Author: ChrisiPK
 # Author: Fujnky
 # Author: Giftpflanze
 # Author: MF-Warburg
@@ -11,18 +12,23 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - EmailSummary\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:15+0000\n"
-"Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:26+0000\n"
+"Language-Team: German <https://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:26:47+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-07-01 11:18:46+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-emailsummary\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Subject for e-mail.
+#, php-format
+msgid "Your latest updates from %s"
+msgstr "Deine neuesten Updates von %s"
+
 #. TRANS: Text in e-mail summary.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is the recipient's profile name.
 #, php-format
@@ -39,10 +45,6 @@ msgstr "im Kontext"
 msgid "<a href=\"%1$s\">change your email settings for %2$s</a>"
 msgstr "<a href=\"%1$s\">E-Mail-Einstellungen für %2$s ändern</a>"
 
-#. TRANS: Subject for e-mail.
-msgid "Updates from your network"
-msgstr "Aktualisierungen von deinem Netzwerk"
-
 #. TRANS: Plugin description.
 msgid "Send an email summary of the inbox to users."
 msgstr ""
diff --git a/plugins/EmailSummary/locale/es/LC_MESSAGES/EmailSummary.po b/plugins/EmailSummary/locale/es/LC_MESSAGES/EmailSummary.po
new file mode 100644
index 0000000000..8001a68c95
--- /dev/null
+++ b/plugins/EmailSummary/locale/es/LC_MESSAGES/EmailSummary.po
@@ -0,0 +1,55 @@
+# Translation of StatusNet - EmailSummary to Spanish (español)
+# Exported from translatewiki.net
+#
+# Author: Armando-Martin
+# Author: Erchache2000
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - EmailSummary\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:26+0000\n"
+"Language-Team: Spanish <https://translatewiki.net/wiki/Portal:es>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-07-01 11:18:46+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: es\n"
+"X-Message-Group: #out-statusnet-plugin-emailsummary\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Subject for e-mail.
+#, php-format
+msgid "Your latest updates from %s"
+msgstr "Las actualizaciones más recientes de %s"
+
+#. TRANS: Text in e-mail summary.
+#. TRANS: %1$s is the StatusNet sitename, %2$s is the recipient's profile name.
+#, php-format
+msgid "Recent updates from %1$s for %2$s:"
+msgstr "Las actualizaciones más recientes de  %1$s  para  %2$s :"
+
+#. TRANS: Link text for link to conversation view.
+msgid "in context"
+msgstr "en contexto"
+
+#. TRANS: Link text for link to e-mail settings.
+#. TRANS: %1$s is a link to the e-mail settings, %2$s is the StatusNet sitename.
+#, php-format
+msgid "<a href=\"%1$s\">change your email settings for %2$s</a>"
+msgstr ""
+"<a href=\"%1$s\"> cambia su configuración de correo electrónico para %2$s</a>"
+
+#. TRANS: Plugin description.
+msgid "Send an email summary of the inbox to users."
+msgstr ""
+"Enviar un resumen de correo electrónico de la bandeja de entrada para los "
+"usuarios."
+
+#. TRANS: Checkbox label in e-mail preferences form.
+msgid "Send me a periodic summary of updates from my network"
+msgstr "Enviarme un resumen periódico de actualizaciones de mi red"
diff --git a/plugins/EmailSummary/locale/eu/LC_MESSAGES/EmailSummary.po b/plugins/EmailSummary/locale/eu/LC_MESSAGES/EmailSummary.po
new file mode 100644
index 0000000000..0de8f4ce01
--- /dev/null
+++ b/plugins/EmailSummary/locale/eu/LC_MESSAGES/EmailSummary.po
@@ -0,0 +1,51 @@
+# Translation of StatusNet - EmailSummary to Basque (euskara)
+# Exported from translatewiki.net
+#
+# Author: Artsuaga
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - EmailSummary\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:26+0000\n"
+"Language-Team: Basque <https://translatewiki.net/wiki/Portal:eu>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-07-01 11:18:46+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: eu\n"
+"X-Message-Group: #out-statusnet-plugin-emailsummary\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Subject for e-mail.
+#, php-format
+msgid "Your latest updates from %s"
+msgstr "Zure azken eguneraketak %s(e)n"
+
+#. TRANS: Text in e-mail summary.
+#. TRANS: %1$s is the StatusNet sitename, %2$s is the recipient's profile name.
+#, php-format
+msgid "Recent updates from %1$s for %2$s:"
+msgstr "%2$s(e)n eguneraketa berrienak %1$s(e)n:"
+
+#. TRANS: Link text for link to conversation view.
+msgid "in context"
+msgstr "kontestuan"
+
+#. TRANS: Link text for link to e-mail settings.
+#. TRANS: %1$s is a link to the e-mail settings, %2$s is the StatusNet sitename.
+#, php-format
+msgid "<a href=\"%1$s\">change your email settings for %2$s</a>"
+msgstr "<a href=\"%1$s\">aldatu zure email aukerak %2$s(e)n</a>"
+
+#. TRANS: Plugin description.
+msgid "Send an email summary of the inbox to users."
+msgstr "Bidali email laburpen bat erabiltzaileen postontzira."
+
+#. TRANS: Checkbox label in e-mail preferences form.
+msgid "Send me a periodic summary of updates from my network"
+msgstr "Bidali neri eguneraketen laburpen bat aldioro nere saretik."
diff --git a/plugins/EmailSummary/locale/fr/LC_MESSAGES/EmailSummary.po b/plugins/EmailSummary/locale/fr/LC_MESSAGES/EmailSummary.po
index eab6ce42cd..50496cadbc 100644
--- a/plugins/EmailSummary/locale/fr/LC_MESSAGES/EmailSummary.po
+++ b/plugins/EmailSummary/locale/fr/LC_MESSAGES/EmailSummary.po
@@ -1,6 +1,8 @@
-# Translation of StatusNet - EmailSummary to French (Français)
+# Translation of StatusNet - EmailSummary to French (français)
 # Exported from translatewiki.net
 #
+# Author: Iketsi
+# Author: OngolaBoy
 # Author: Peter17
 # --
 # This file is distributed under the same license as the StatusNet package.
@@ -9,40 +11,45 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - EmailSummary\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-31 21:06+0000\n"
-"PO-Revision-Date: 2011-03-31 21:09:12+0000\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:26+0000\n"
 "Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:07:04+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r85082); Translate extension (2011-03-11)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-07-01 11:18:46+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-emailsummary\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#. TRANS: Subject for e-mail.
 #, php-format
-msgid "Recent updates from %1s for %2s:"
-msgstr ""
+msgid "Your latest updates from %s"
+msgstr "Les dernières activités en provenance de %s"
 
+#. TRANS: Text in e-mail summary.
+#. TRANS: %1$s is the StatusNet sitename, %2$s is the recipient's profile name.
+#, php-format
+msgid "Recent updates from %1$s for %2$s:"
+msgstr "Dernières activités de %1$s pour %2$s:"
+
+#. TRANS: Link text for link to conversation view.
 msgid "in context"
-msgstr ""
+msgstr "dans le contexte"
 
+#. TRANS: Link text for link to e-mail settings.
+#. TRANS: %1$s is a link to the e-mail settings, %2$s is the StatusNet sitename.
 #, php-format
-msgid "<p><a href=\"%1s\">change your email settings for %2s</a></p>"
-msgstr ""
-
-msgid "Updates from your network"
-msgstr ""
+msgid "<a href=\"%1$s\">change your email settings for %2$s</a>"
+msgstr "<a href=\"%1$s\">changer vos paramètres de messagerie pour %2$s</a>"
 
+#. TRANS: Plugin description.
 msgid "Send an email summary of the inbox to users."
 msgstr ""
 "Envoyer un résumé de la boîte de réception par courrier électronique aux "
 "utilisateurs."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#, fuzzy
-msgid "Send me a periodic summary of updates from my network."
-msgstr ""
-"Envoyer un résumé de la boîte de réception par courrier électronique aux "
-"utilisateurs."
+msgid "Send me a periodic summary of updates from my network"
+msgstr "M'envoyer un rapport périodique des activités de mon réseau"
diff --git a/plugins/EmailSummary/locale/gl/LC_MESSAGES/EmailSummary.po b/plugins/EmailSummary/locale/gl/LC_MESSAGES/EmailSummary.po
new file mode 100644
index 0000000000..2723e8770b
--- /dev/null
+++ b/plugins/EmailSummary/locale/gl/LC_MESSAGES/EmailSummary.po
@@ -0,0 +1,53 @@
+# Translation of StatusNet - EmailSummary to Galician (galego)
+# Exported from translatewiki.net
+#
+# Author: Toliño
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - EmailSummary\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:27+0000\n"
+"Language-Team: Galician <https://translatewiki.net/wiki/Portal:gl>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-07-01 11:18:46+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: gl\n"
+"X-Message-Group: #out-statusnet-plugin-emailsummary\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Subject for e-mail.
+#, php-format
+msgid "Your latest updates from %s"
+msgstr "As súas últimas actualizacións desde %s"
+
+#. TRANS: Text in e-mail summary.
+#. TRANS: %1$s is the StatusNet sitename, %2$s is the recipient's profile name.
+#, php-format
+msgid "Recent updates from %1$s for %2$s:"
+msgstr "Actualizacións recentes desde %1$s para %2$s:"
+
+#. TRANS: Link text for link to conversation view.
+msgid "in context"
+msgstr "no contexto"
+
+#. TRANS: Link text for link to e-mail settings.
+#. TRANS: %1$s is a link to the e-mail settings, %2$s is the StatusNet sitename.
+#, php-format
+msgid "<a href=\"%1$s\">change your email settings for %2$s</a>"
+msgstr ""
+"<a href=\"%1$s\">cambiar a configuración do correo electrónico para %2$s</a>"
+
+#. TRANS: Plugin description.
+msgid "Send an email summary of the inbox to users."
+msgstr ""
+"Enviar aos usuarios por correo electrónico un resumo da caixa de entrada."
+
+#. TRANS: Checkbox label in e-mail preferences form.
+msgid "Send me a periodic summary of updates from my network"
+msgstr "Enviádeme un resumo periódico coas actualizacións da miña rede"
diff --git a/plugins/EmailSummary/locale/ia/LC_MESSAGES/EmailSummary.po b/plugins/EmailSummary/locale/ia/LC_MESSAGES/EmailSummary.po
index 51d7a856c7..4bd2281ef7 100644
--- a/plugins/EmailSummary/locale/ia/LC_MESSAGES/EmailSummary.po
+++ b/plugins/EmailSummary/locale/ia/LC_MESSAGES/EmailSummary.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - EmailSummary to Interlingua (Interlingua)
+# Translation of StatusNet - EmailSummary to Interlingua (interlingua)
 # Exported from translatewiki.net
 #
 # Author: McDutchie
@@ -9,18 +9,23 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - EmailSummary\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:15+0000\n"
-"Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:27+0000\n"
+"Language-Team: Interlingua <https://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:26:47+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-07-01 11:18:46+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-emailsummary\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Subject for e-mail.
+#, php-format
+msgid "Your latest updates from %s"
+msgstr "Tu ultime actualisationes de %s"
+
 #. TRANS: Text in e-mail summary.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is the recipient's profile name.
 #, php-format
@@ -37,10 +42,6 @@ msgstr "in contexto"
 msgid "<a href=\"%1$s\">change your email settings for %2$s</a>"
 msgstr "<a href=\"%1$s\">modificar tu configuration de e-mail pro %2$s</a>"
 
-#. TRANS: Subject for e-mail.
-msgid "Updates from your network"
-msgstr "Actualisationes de tu rete"
-
 #. TRANS: Plugin description.
 msgid "Send an email summary of the inbox to users."
 msgstr "Inviar in e-mail un summario del cassa de entrata al usatores."
diff --git a/plugins/EmailSummary/locale/it/LC_MESSAGES/EmailSummary.po b/plugins/EmailSummary/locale/it/LC_MESSAGES/EmailSummary.po
new file mode 100644
index 0000000000..a28cc249e7
--- /dev/null
+++ b/plugins/EmailSummary/locale/it/LC_MESSAGES/EmailSummary.po
@@ -0,0 +1,48 @@
+# Translation of StatusNet - EmailSummary to Italian (italiano)
+# Exported from translatewiki.net
+#
+# Author: Ximo17
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - EmailSummary\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:27+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-07-01 11:18:46+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Subject for e-mail.
+#, php-format
+msgid "Your latest updates from %s"
+msgstr "I tuoi aggiornamenti più recenti su %s"
+
+#. TRANS: Text in e-mail summary.
+#. TRANS: %1$s is the StatusNet sitename, %2$s is the recipient's profile name.
+#, php-format
+msgid "Recent updates from %1$s for %2$s:"
+msgstr "Aggiornamenti recenti da  %1$s di %2$s:"
+
+#. TRANS: Link text for link to conversation view.
+msgid "in context"
+msgstr "in una discussione"
+
+#. TRANS: Link text for link to e-mail settings.
+#. TRANS: %1$s is a link to the e-mail settings, %2$s is the StatusNet sitename.
+#, php-format
+msgid "<a href=\"%1$s\">change your email settings for %2$s</a>"
+msgstr "<a href=\"%1$s\">modifica le tue impostazioni email per %2$s</a>"
+
+#. TRANS: Plugin description.
+msgid "Send an email summary of the inbox to users."
+msgstr "Invia un riepilogo di e-mail di posta in arrivo agli utenti."
+
+#. TRANS: Checkbox label in e-mail preferences form.
+msgid "Send me a periodic summary of updates from my network"
+msgstr "Mandami un riepilogo periodico degli aggiornamenti dalla mia rete"
diff --git a/plugins/EmailSummary/locale/mk/LC_MESSAGES/EmailSummary.po b/plugins/EmailSummary/locale/mk/LC_MESSAGES/EmailSummary.po
index 834098683b..4995e90ef3 100644
--- a/plugins/EmailSummary/locale/mk/LC_MESSAGES/EmailSummary.po
+++ b/plugins/EmailSummary/locale/mk/LC_MESSAGES/EmailSummary.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - EmailSummary to Macedonian (Македон�ки)
+# Translation of StatusNet - EmailSummary to Macedonian (македон�ки)
 # Exported from translatewiki.net
 #
 # Author: Bjankuloski06
@@ -9,18 +9,23 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - EmailSummary\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:15+0000\n"
-"Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:27+0000\n"
+"Language-Team: Macedonian <https://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:26:47+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-07-01 11:18:46+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-emailsummary\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
 
+#. TRANS: Subject for e-mail.
+#, php-format
+msgid "Your latest updates from %s"
+msgstr "�ајново од %s"
+
 #. TRANS: Text in e-mail summary.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is the recipient's profile name.
 #, php-format
@@ -37,10 +42,6 @@ msgstr "во контек�т"
 msgid "<a href=\"%1$s\">change your email settings for %2$s</a>"
 msgstr "<a href=\"%1$s\">�менете �и ги нагодувањата за е-пошта на %2$s</a>"
 
-#. TRANS: Subject for e-mail.
-msgid "Updates from your network"
-msgstr "Поднови од Вашата мрежа"
-
 #. TRANS: Plugin description.
 msgid "Send an email summary of the inbox to users."
 msgstr "И�прати им на кори�ниците краток преглед на примената пошта."
diff --git a/plugins/EmailSummary/locale/nl/LC_MESSAGES/EmailSummary.po b/plugins/EmailSummary/locale/nl/LC_MESSAGES/EmailSummary.po
index 975c95c82c..44ed0a4435 100644
--- a/plugins/EmailSummary/locale/nl/LC_MESSAGES/EmailSummary.po
+++ b/plugins/EmailSummary/locale/nl/LC_MESSAGES/EmailSummary.po
@@ -1,6 +1,7 @@
 # Translation of StatusNet - EmailSummary to Dutch (Nederlands)
 # Exported from translatewiki.net
 #
+# Author: SPQRobin
 # Author: Siebrand
 # --
 # This file is distributed under the same license as the StatusNet package.
@@ -9,18 +10,23 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - EmailSummary\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:15+0000\n"
-"Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:27+0000\n"
+"Language-Team: Dutch <https://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:26:47+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-07-01 11:18:46+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-emailsummary\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Subject for e-mail.
+#, php-format
+msgid "Your latest updates from %s"
+msgstr "Uw recentste updates van %s"
+
 #. TRANS: Text in e-mail summary.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is the recipient's profile name.
 #, php-format
@@ -37,10 +43,6 @@ msgstr "in context"
 msgid "<a href=\"%1$s\">change your email settings for %2$s</a>"
 msgstr "<a href=\"%1$s\">wijzig uw e-mailinstellingen voor %2$s</a>"
 
-#. TRANS: Subject for e-mail.
-msgid "Updates from your network"
-msgstr "Updates uit uw netwerk"
-
 #. TRANS: Plugin description.
 msgid "Send an email summary of the inbox to users."
 msgstr "E-mailsamenvatting verzenden naar het Postvak IN van gebruikers."
diff --git a/plugins/EmailSummary/locale/tl/LC_MESSAGES/EmailSummary.po b/plugins/EmailSummary/locale/tl/LC_MESSAGES/EmailSummary.po
index 36a4b3e233..d9833b3548 100644
--- a/plugins/EmailSummary/locale/tl/LC_MESSAGES/EmailSummary.po
+++ b/plugins/EmailSummary/locale/tl/LC_MESSAGES/EmailSummary.po
@@ -9,18 +9,23 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - EmailSummary\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:15+0000\n"
-"Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:27+0000\n"
+"Language-Team: Tagalog <https://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:26:47+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-07-01 11:18:46+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-emailsummary\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Subject for e-mail.
+#, php-format
+msgid "Your latest updates from %s"
+msgstr "Pinakahuli mong mga pagsasapanahon mula sa %s"
+
 #. TRANS: Text in e-mail summary.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is the recipient's profile name.
 #, php-format
@@ -38,10 +43,6 @@ msgid "<a href=\"%1$s\">change your email settings for %2$s</a>"
 msgstr ""
 "<a href=\"%1$s\">baguhin ang mga katakdaan mo ng e-liham para sa %2$s</a>"
 
-#. TRANS: Subject for e-mail.
-msgid "Updates from your network"
-msgstr "Mga pagsasapanahon mula sa lambatan mo"
-
 #. TRANS: Plugin description.
 msgid "Send an email summary of the inbox to users."
 msgstr ""
diff --git a/plugins/EmailSummary/locale/uk/LC_MESSAGES/EmailSummary.po b/plugins/EmailSummary/locale/uk/LC_MESSAGES/EmailSummary.po
index 0d4b98eec8..8d15c8f435 100644
--- a/plugins/EmailSummary/locale/uk/LC_MESSAGES/EmailSummary.po
+++ b/plugins/EmailSummary/locale/uk/LC_MESSAGES/EmailSummary.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - EmailSummary to Ukrainian (Україн�ька)
+# Translation of StatusNet - EmailSummary to Ukrainian (україн�ька)
 # Exported from translatewiki.net
 #
 # Author: Boogie
@@ -9,19 +9,24 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - EmailSummary\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:15+0000\n"
-"Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:27+0000\n"
+"Language-Team: Ukrainian <https://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:26:47+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-07-01 11:18:46+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-emailsummary\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
+#. TRANS: Subject for e-mail.
+#, php-format
+msgid "Your latest updates from %s"
+msgstr ""
+
 #. TRANS: Text in e-mail summary.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is the recipient's profile name.
 #, php-format
@@ -38,10 +43,6 @@ msgstr "у контек�ті"
 msgid "<a href=\"%1$s\">change your email settings for %2$s</a>"
 msgstr "<a href=\"%1$s\">змінити налаштуванн� електронної пошти дл� %2$s</a>"
 
-#. TRANS: Subject for e-mail.
-msgid "Updates from your network"
-msgstr "Оновленн� з вашої мережі"
-
 #. TRANS: Plugin description.
 msgid "Send an email summary of the inbox to users."
 msgstr ""
diff --git a/plugins/EmailSummary/sendemailsummary.php b/plugins/EmailSummary/sendemailsummary.php
index aad79c7360..01c11a210a 100644
--- a/plugins/EmailSummary/sendemailsummary.php
+++ b/plugins/EmailSummary/sendemailsummary.php
@@ -1,22 +1,21 @@
-#!/usr/bin/env php
-   <?php
-   /*
-    * StatusNet - a distributed open-source microblogging tool
-    * Copyright (C) 2010, StatusNet, Inc.
-    *
-    * This program is free software: you can redistribute it and/or modify
-    * it under the terms of the GNU Affero General Public License as published by
-    * the Free Software Foundation, either version 3 of the License, or
-    * (at your option) any later version.
-    *
-    * This program is distributed in the hope that it will be useful,
-    * but WITHOUT ANY WARRANTY; without even the implied warranty of
-    * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    * GNU Affero General Public License for more details.
-    *
-    * You should have received a copy of the GNU Affero General Public License
-    * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-    */
+<?php
+/*
+ * StatusNet - a distributed open-source microblogging tool
+ * Copyright (C) 2010, StatusNet, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
 
 define('INSTALLDIR', realpath(dirname(__FILE__) . '/../..'));
 
@@ -44,7 +43,7 @@ if (have_option('u', 'universe')) {
             StatusNet::init($server);
             // Different queue manager, maybe!
             $qm = QueueManager::get();
-            $qm->enqueue(null, 'sitesum');
+            $qm->enqueue(1, 'sitesum');
         }
     }
 } else {
@@ -54,6 +53,6 @@ if (have_option('u', 'universe')) {
         $user = getUser();
         $qm->enqueue($user->id, 'usersum');
     } catch (NoUserArgumentException $nuae) {
-        $qm->enqueue(null, 'sitesum');
+        $qm->enqueue(1, 'sitesum');
     }
 }
diff --git a/plugins/EmailSummary/useremailsummaryhandler.php b/plugins/EmailSummary/useremailsummaryhandler.php
index e2a7700f9e..61542e4f3b 100644
--- a/plugins/EmailSummary/useremailsummaryhandler.php
+++ b/plugins/EmailSummary/useremailsummaryhandler.php
@@ -57,7 +57,7 @@ class UserEmailSummaryHandler extends QueueHandler
      */
     function transport()
     {
-        return 'sitesum';
+        return 'usersum';
     }
 
     /**
@@ -102,7 +102,9 @@ class UserEmailSummaryHandler extends QueueHandler
             return true;
         }
 
-        $notice = $user->ownFriendsTimeline(0, self::MAX_NOTICES, $since_id);
+        $stream = new InboxNoticeStream($user, $user->getProfile());
+
+        $notice = $stream->getNotices(0, self::MAX_NOTICES, $since_id);
 
         if (empty($notice) || $notice->N == 0) {
             common_log(LOG_WARNING, sprintf('Not sending email summary for user %s; no notices.', $user_id));
@@ -118,8 +120,16 @@ class UserEmailSummaryHandler extends QueueHandler
             $new_top = $notice->_items[0]->id;
         }
 
-        $out = new XMLStringer();
+        // TRANS: Subject for e-mail.
+        $subject = sprintf(_m('Your latest updates from %s'), common_config('site', 'name'));
 
+        $out = new XMLStringer(true);
+
+        $out->elementStart('html');
+        $out->elementStart('head');
+        $out->element('title', null, $subject);
+        $out->elementEnd('head');
+        $out->elementStart('body');
         $out->elementStart('div', array('width' => '100%',
                                         'style' => 'background-color: #ffffff; border: 4px solid #4c609a; padding: 10px;'));
 
@@ -199,14 +209,18 @@ class UserEmailSummaryHandler extends QueueHandler
                           common_config('site', 'name'))."</p>");
 
         $out->elementEnd('div');
+        $out->elementEnd('body');
+        $out->elementEnd('html');
 
         $body = $out->getString();
 
         // FIXME: do something for people who don't like HTML email
 
-        // TRANS: Subject for e-mail.
-        mail_to_user($user, _m('Updates from your network'), $body,
-                     array('Content-Type' => 'text/html; charset=UTF-8'));
+        mail_to_user($user,
+                     $subject,
+                     $body,
+                     array('Content-Type' => 'text/html; charset=utf-8',
+                           'Mime-Version' => '1.0'));
 
         if (empty($ess)) {
             $ess = new Email_summary_status();
diff --git a/plugins/Event/EventPlugin.php b/plugins/Event/EventPlugin.php
index c88c42b396..f2396b8075 100644
--- a/plugins/Event/EventPlugin.php
+++ b/plugins/Event/EventPlugin.php
@@ -37,7 +37,7 @@ if (!defined('STATUSNET')) {
 /**
  * Event plugin
  *
- * @category  Sample
+ * @category  Event
  * @package   StatusNet
  * @author    Evan Prodromou <evan@status.net>
  * @copyright 2011 StatusNet, Inc.
@@ -82,6 +82,7 @@ class EventPlugin extends MicroappPlugin
         case 'CancelrsvpAction':
         case 'ShoweventAction':
         case 'ShowrsvpAction':
+        case 'TimelistAction':
             include_once $dir . '/' . strtolower(mb_substr($cls, 0, -6)) . '.php';
             return false;
         case 'EventListItem':
@@ -89,6 +90,7 @@ class EventPlugin extends MicroappPlugin
         case 'EventForm':
         case 'RSVPForm':
         case 'CancelRSVPForm':
+        case 'EventTimeList':
             include_once $dir . '/'.strtolower($cls).'.php';
             break;
         case 'Happening':
@@ -121,6 +123,8 @@ class EventPlugin extends MicroappPlugin
         $m->connect('rsvp/:id',
                     array('action' => 'showrsvp'),
                     array('id' => '[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}'));
+        $m->connect('main/event/updatetimes',
+                    array('action' => 'timelist'));
         return true;
     }
 
@@ -180,13 +184,15 @@ class EventPlugin extends MicroappPlugin
 
         switch ($activity->verb) {
         case ActivityVerb::POST:
+        	// FIXME: get startTime, endTime, location and URL
             $notice = Happening::saveNew($actor,
-                                     $start_time,
-                                     $end_time,
-                                     $happeningObj->title,
-                                     null,
-                                     $happeningObj->summary,
-                                     $options);
+                                         $start_time,
+                                         $end_time,
+                                         $happeningObj->title,
+                                         null,
+                                         $happeningObj->summary,
+                                         null,
+                                         $options);
             break;
         case RSVP::POSITIVE:
         case RSVP::NEGATIVE:
@@ -260,6 +266,9 @@ class EventPlugin extends MicroappPlugin
                               array('xmlns' => 'urn:ietf:params:xml:ns:xcal'),
                               common_date_iso8601($happening->end_time));
 
+		// FIXME: add location
+		// FIXME: add URL
+		
         // XXX: probably need other stuff here
 
         return $obj;
@@ -340,7 +349,7 @@ class EventPlugin extends MicroappPlugin
 
     function onEndShowScripts($action)
     {
-        $action->inlineScript('$(document).ready(function() { $("#event-startdate").datepicker(); $("#event-enddate").datepicker(); });');
+        $action->script($this->path('event.js'));
     }
 
     function onEndShowStyles($action)
diff --git a/plugins/Event/Happening.php b/plugins/Event/Happening.php
index a2811252c0..b8347bdb2c 100644
--- a/plugins/Event/Happening.php
+++ b/plugins/Event/Happening.php
@@ -116,7 +116,7 @@ class Happening extends Managed_DataObject
         );
     }
 
-    function saveNew($profile, $start_time, $end_time, $title, $location, $description, $url, $options=array())
+    static function saveNew($profile, $start_time, $end_time, $title, $location, $description, $url, $options=array())
     {
         if (array_key_exists('uri', $options)) {
             $other = Happening::staticGet('uri', $options['uri']);
@@ -155,7 +155,7 @@ class Happening extends Managed_DataObject
         // XXX: does this get truncated?
 
         // TRANS: Event description. %1$s is a title, %2$s is start time, %3$s is end time,
-	// TRANS: %4$s is location, %5$s is a description.
+        // TRANS: %4$s is location, %5$s is a description.
         $content = sprintf(_m('"%1$s" %2$s - %3$s (%4$s): %5$s'),
                            $title,
                            common_exact_date($ev->start_time),
@@ -164,8 +164,8 @@ class Happening extends Managed_DataObject
                            $description);
 
         // TRANS: Rendered event description. %1$s is a title, %2$s is start time, %3$s is start time,
-	// TRANS: %4$s is end time, %5$s is end time, %6$s is location, %7$s is description.
-	// TRANS: Class names should not be translated.
+        // TRANS: %4$s is end time, %5$s is end time, %6$s is location, %7$s is description.
+        // TRANS: Class names should not be translated.
         $rendered = sprintf(_m('<span class="vevent">'.
                               '<span class="summary">%1$s</span> '.
                               '<abbr class="dtstart" title="%2$s">%3$s</a> - '.
diff --git a/plugins/Event/event.css b/plugins/Event/event.css
index 8c9cbbb082..e5af5cf515 100644
--- a/plugins/Event/event.css
+++ b/plugins/Event/event.css
@@ -6,3 +6,34 @@
 .event-title { margin-left: 0px; }
 #content .event .entry-title { margin-left: 0px; }
 #content .event .entry-content { margin-left: 0px; }
+.ui-autocomplete {
+    max-height: 100px;
+    overflow-y: auto;
+    /* prevent horizontal scrollbar */
+    overflow-x: hidden;
+    /* add padding to account for vertical scrollbar */
+    padding-right: 20px;
+}
+
+.attending-list { list-style-type: none; float: left; width: 100%; }
+
+#form_event_rsvp { clear: left; }
+
+li.rsvp-list { float: left; clear: left; }
+
+li.rsvp-list ul.entities {
+    display:inline;
+}
+li.rsvp-list .entities li {
+    list-style-type: none;
+    margin-right: 3px;
+    margin-bottom: 8px;
+    display: inline;
+}
+li.rsvp-list .entities li .photo {
+    margin: 0 !important;
+    float: none !important;
+}
+li.rsvp-list .entities li .fn {
+    display: none;
+}
diff --git a/plugins/Event/event.js b/plugins/Event/event.js
new file mode 100644
index 0000000000..696176edbd
--- /dev/null
+++ b/plugins/Event/event.js
@@ -0,0 +1,144 @@
+$(document).ready(function() {
+
+    // get current time from server
+    var today = new Date($('now').val());
+
+    $("#event-startdate").datepicker({
+        // Don't let the user set a start date < before today
+        minDate: today,
+        onClose: onStartDateSelected
+    });
+
+    $("#event-enddate").datepicker({
+        minDate: today,
+        onClose: onEndDateSelected
+    });
+
+    $("#event-starttime").change(function(e) {
+        var tz = $("#tz").val();
+
+        var startDate = $("#event-startdate").val();
+        var startTime = $("#event-starttime option:selected").val().replace(/(pm|am)/, ' $1');
+        var startStr = startDate + ' ' + startTime + ' ' + tz;
+
+        var endDate =  $("#event-enddate").val();
+        var endTime = $("#event-endtime option:selected").val();
+        var endStr = endDate + ' ' + endTime.replace(/(pm|am)/, ' $1') + ' ' + tz;
+
+        // just need to compare hours
+        var start = new Date(startStr);
+        var end = new Date(endStr);
+
+        updateTimes(startStr, (startDate === endDate), function (data) {
+            var times = [];
+            $.each(data, function(key, val) {
+                times.push('<option value="' + key + '">' + val + '</option>');
+            });
+            $("#event-endtime").html(times.join(''));
+
+            if (start > end) {
+                $("#event-endtime").val(startTime).attr("selected", "selected");
+            } else {
+                $("#event-endtime").val(endTime).attr("selected", "selected");
+            }
+        });
+
+    });
+
+    $("#event-endtime").change(function(e) {
+        var HOUR = 60 * 60 * 1000;
+        var tz = $("#tz").val();
+        var startDate = $("#event-startdate").val();
+        var endDate = $("#event-enddate").val();
+        var starttime = $("#event-starttime option:selected").val();
+        var endtime = $("#event-endtime option:selected").val();
+        var endtimeText = $("#event-endtime option:selected").text();
+
+        // If the end time is in the next day then update the start date
+        if (startDate === endDate) {
+            var startstr = startDate + ' ' + starttime.replace(/(pm|am)/, ' $1') + ' ' + tz;
+            var start = new Date(startstr);
+            var matches = endtimeText.match(/\(.*\)/);
+            var hours;
+            if (matches) {
+                hours = matches[0].substr(1).split(' ')[0]; // get x from (x hours)
+                if (hours) {
+                    if (hours == 30) {
+                        hours = .5; // special case: x == 30 from (30 mins)
+                    }
+                    var end = new Date(start.getTime() + (hours * HOUR));
+                    if (end.getDate() > start.getDate()) {
+                        $("#event-enddate").datepicker('setDate', end);
+                        var endstr = endDate + ' 12:00 am ' +  tz;
+                        updateTimes(endstr, false, function(data) {
+                            var times = [];
+                            $.each(data, function(key, val) {
+                                times.push('<option value="' + key + '">' + val + '</option>');
+                            });
+                            $("#event-endtime").html(times.join(''));
+
+                            if (start > end) {
+                                $("#event-endtime").val(starttime).attr("selected", "selected");
+                            } else {
+                                $("#event-endtime").val(endtime).attr("selected", "selected");
+                            }
+                        });
+                    }
+                }
+            }
+        }
+    });
+
+    function onStartDateSelected(dateText, inst) {
+        var tz = $("#tz").val();
+        var startTime = $("#event-starttime option:selected").val();
+        var startDateTime = new Date(dateText + ' ' + startTime.replace(/(pm|am)/, ' $1') + ' ' + tz);
+
+        // When we update the start date and time, we need to update the end date and time
+        // to make sure they are equal or in the future
+        $("#event-enddate").datepicker('option', 'minDate', startDateTime);
+
+        recalculateTimes();
+    }
+
+    function onEndDateSelected(dateText, inst) {
+        recalculateTimes();
+    }
+
+    function recalculateTimes(showDuration) {
+        var tz = $("#tz").val();
+
+        var startDate = $("#event-startdate").val();
+        var startTime = $("#event-starttime option:selected").val();
+        var startStr = startDate + ' ' + startTime.replace(/(pm|am)/, ' $1') + ' ' + tz;
+        var startDateTime = new Date(startStr);
+
+        var endDate = $("#event-enddate").val();
+        var endTime = $("#event-endtime option:selected").val();
+        var endDateTime = new Date(endDate + ' ' + endTime.replace(/(pm|am)/, ' $1') + ' ' + tz);
+        var showDuration = true;
+
+        if (endDateTime.getDate() !== startDateTime.getDate()) {
+            starStr = endDate + ' 12:00 am ' +  tz;
+            showDuration = false;
+        }
+
+        updateTimes(startStr, showDuration, function(data) {
+            var times = [];
+            $.each(data, function(key, val) {
+                times.push('<option value="' + key + '">' + val + '</option>');
+            });
+            $("#event-endtime").html(times.join(''));
+            if (startDateTime > endDateTime) {
+                $("#event-endtime").val(startTime).attr("selected", "selected");
+            } else {
+                $("#event-endtime").val(endTime).attr("selected", "selected");
+            }
+        });
+    }
+
+    function updateTimes(start, duration, onSuccess) {
+        $.getJSON($('#timelist_action_url').val(), {start: start, ajax: true, duration: duration}, onSuccess);
+    }
+
+});
diff --git a/plugins/Event/eventform.php b/plugins/Event/eventform.php
index 6a6e17e77b..8100e5903b 100644
--- a/plugins/Event/eventform.php
+++ b/plugins/Event/eventform.php
@@ -84,6 +84,17 @@ class EventForm extends Form
     function formData()
     {
         $this->out->elementStart('fieldset', array('id' => 'new_event_data'));
+
+        // Passing in the URL of the Ajax action that the .js for this form hits
+        // when selecting event start and end times. JavaScript will try to
+        // use a relative path, unless explicitely told where an action is,
+        // and that's a bit difficult to calculate since the event form is on
+        // so many pages with different paths. It might be worth solving this
+        // globally by putting the base site path in the Identifier-URL meta tag
+        // or something similar, so it would be easy to calculate the exact path
+        // for actions and other things in JavaScripts. -z
+        $this->out->hidden('timelist_action_url', common_local_url('timelist'));
+
         $this->out->elementStart('ul', 'form_data');
 
         $this->li();
@@ -97,49 +108,70 @@ class EventForm extends Form
         $this->unli();
 
         $this->li();
+
+        $today = new DateTime('now');
+        $today->setTimezone(new DateTimeZone(common_timezone()));
+
         $this->out->input('event-startdate',
                           // TRANS: Field label on event form.
                           _m('LABEL','Start date'),
-                          null,
+                          $today->format('m/d/Y'),
                           // TRANS: Field title on event form.
                           _m('Date the event starts.'),
                           'startdate');
         $this->unli();
 
         $this->li();
-        $this->out->input('event-starttime',
-                          // TRANS: Field label on event form.
-                          _m('LABEL','Start time'),
-                          null,
-                          // TRANS: Field title on event form.
-                          _m('Time the event starts.'),
-                          'starttime');
+
+        $times = EventTimeList::getTimes($today->format('m/d/Y 12:00') . ' am ' . $today->format('T'));
+        $start = EventTimeList::nearestHalfHour($today->format('c'));
+        $start->setTimezone(new DateTimeZone(common_timezone()));
+
+        $this->out->dropdown(
+            'event-starttime',
+            // TRANS: Field label on event form.
+            _m('LABEL','Start time'),
+            $times,
+            // TRANS: Field title on event form. %s is the abbreviated timezone
+            sprintf(_m("Time the event starts (%s)."), $today->format('T')),
+            false,
+            $start->format('g:ia')
+        );
+
+        // Need to keep JavaScript TZ in sync with PHP TZ
+        $this->out->hidden('tz', $today->format('T'));
+        $this->out->hidden('now', $today->format('F d, Y H:i:s T'));
+
         $this->unli();
 
         $this->li();
         $this->out->input('event-enddate',
                           // TRANS: Field label on event form.
                           _m('LABEL','End date'),
-                          null,
+                          $today->format('m/d/Y'),
                           // TRANS: Field title on event form.
                           _m('Date the event ends.'),
                           'enddate');
         $this->unli();
 
         $this->li();
-        $this->out->input('event-endtime',
-                          // TRANS: Field label on event form.
-                          _m('LABEL','End time'),
-                          null,
-                          // TRANS: Field title on event form.
-                          _m('Time the event ends.'),
-                          'endtime');
+
+        $this->out->dropdown(
+            'event-endtime',
+            // TRANS: Field label on event form.
+            _m('LABEL','End time'),
+            EventTimeList::getTimes($start->format('c'), true),
+            // TRANS: Field title on event form.
+            _m('Time the event ends.'),
+            false,
+            null
+        );
         $this->unli();
 
         $this->li();
         $this->out->input('event-location',
                           // TRANS: Field label on event form.
-                          _m('LABEL','Location'),
+                          _m('LABEL','Where?'),
                           null,
                           // TRANS: Field title on event form.
                           _m('Event location.'),
diff --git a/plugins/Event/eventlistitem.php b/plugins/Event/eventlistitem.php
index 9bf34e765b..b563e228f9 100644
--- a/plugins/Event/eventlistitem.php
+++ b/plugins/Event/eventlistitem.php
@@ -83,13 +83,33 @@ class EventListItem extends NoticeListItemAdapter
 
         $out->elementEnd('h3'); // VEVENT/H3 OUT
 
-        $startDate = strftime("%x", strtotime($event->start_time));
-        $startTime = strftime("%R", strtotime($event->start_time));
+        $now       = new DateTime();
+        $startDate = new DateTime($event->start_time);
+        $endDate   = new DateTime($event->end_time);
+        $userTz    = new DateTimeZone(common_timezone());
 
-        $endDate = strftime("%x", strtotime($event->end_time));
-        $endTime = strftime("%R", strtotime($event->end_time));
+        // Localize the time for the observer
+        $now->setTimeZone($userTz);
+        $startDate->setTimezone($userTz);
+        $endDate->setTimezone($userTz);
 
-        // FIXME: better dates
+        $thisYear  = $now->format('Y');
+        $startYear = $startDate->format('Y');
+        $endYear   = $endDate->format('Y');
+
+        $dateFmt = 'D, F j, '; // e.g.: Mon, Aug 31
+
+        if ($startYear != $thisYear || $endYear != $thisYear) {
+            $dateFmt .= 'Y,'; // append year if we need to think about years
+        }
+
+        $startDateStr = $startDate->format($dateFmt);
+        $endDateStr = $endDate->format($dateFmt);
+
+        $timeFmt = 'g:ia';
+
+        $startTimeStr = $startDate->format($timeFmt);
+        $endTimeStr = $endDate->format("{$timeFmt} (T)");
 
         $out->elementStart('div', 'event-times'); // VEVENT/EVENT-TIMES IN
 
@@ -98,16 +118,16 @@ class EventListItem extends NoticeListItemAdapter
 
         $out->element('abbr', array('class' => 'dtstart',
                                     'title' => common_date_iso8601($event->start_time)),
-                      $startDate . ' ' . $startTime);
-        $out->text(' - ');
-        if ($startDate == $endDate) {
+                      $startDateStr . ' ' . $startTimeStr);
+        $out->text(' – ');
+        if ($startDateStr == $endDateStr) {
             $out->element('span', array('class' => 'dtend',
                                         'title' => common_date_iso8601($event->end_time)),
-                          $endTime);
+                          $endTimeStr);
         } else {
             $out->element('span', array('class' => 'dtend',
                                         'title' => common_date_iso8601($event->end_time)),
-                          $endDate . ' ' . $endTime);
+                          $endDateStr . ' ' . $endTimeStr);
         }
 
         $out->elementEnd('div'); // VEVENT/EVENT-TIMES OUT
@@ -132,14 +152,38 @@ class EventListItem extends NoticeListItemAdapter
 
         $out->elementStart('div', 'event-rsvps');
         // TRANS: Field label for event description.
-        $out->element('strong', null, _m('Attending:'));
-        $out->element('span', 'event-rsvps',
-                      // TRANS: RSVP counts.
-                      // TRANS: %1$d, %2$d and %3$d are numbers of RSVPs.
-                      sprintf(_m('Yes: %1$d No: %2$d Maybe: %3$d'),
-                              count($rsvps[RSVP::POSITIVE]),
-                              count($rsvps[RSVP::NEGATIVE]),
-                              count($rsvps[RSVP::POSSIBLE])));
+
+        $out->text(_('Attending:'));
+        $out->elementStart('ul', 'attending-list');
+
+        foreach ($rsvps as $verb => $responses) {
+            $out->elementStart('li', 'rsvp-list');
+            switch ($verb)
+            {
+            case RSVP::POSITIVE:
+                $out->text(_('Yes:'));
+                break;
+            case RSVP::NEGATIVE:
+                $out->text(_('No:'));
+                break;
+            case RSVP::POSSIBLE:
+                $out->text(_('Maybe:'));
+                break;
+            }
+            $ids = array();
+            foreach ($responses as $response) {
+                $ids[] = $response->profile_id;
+            }
+            $ids = array_slice($ids, 0, ProfileMiniList::MAX_PROFILES + 1);
+            $profiles = Profile::pivotGet('id', $ids);
+            $profile  = new ArrayWrapper(array_values($profiles));
+            $minilist = new ProfileMiniList($profile, $out);
+            $minilist->show();
+
+            $out->elementEnd('li');
+        }
+
+        $out->elementEnd('ul');
         $out->elementEnd('div');
 
         $user = common_current_user();
diff --git a/plugins/Event/eventtimelist.php b/plugins/Event/eventtimelist.php
new file mode 100644
index 0000000000..2436a4fc6e
--- /dev/null
+++ b/plugins/Event/eventtimelist.php
@@ -0,0 +1,113 @@
+<?php
+/**
+ * Helper class for calculating and displaying event times
+ *
+ * PHP version 5
+ *
+ * @category Data
+ * @package  StatusNet
+ * @author   Zach Copley <zach@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
+ * @link     http://status.net/
+ *
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2011, StatusNet, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.     See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *  Class to get fancy times for the dropdowns on the new event form
+ */
+class EventTimeList {
+    /**
+     * Round up to the nearest half hour
+     *
+     * @param string $time the time to round (date/time string)
+     * @return DateTime    the rounded time
+     */
+    public static function nearestHalfHour($time)
+    {
+        $startd = new DateTime($time);
+
+        $minutes = $startd->format('i');
+        $hour    = $startd->format('H');
+
+        if ($minutes >= 30) {
+            $minutes = '00';
+            $hour++;
+        } else {
+            $minutes = '30';
+        }
+
+        $startd->setTime($hour, $minutes, 0);
+
+        return $startd;
+    }
+
+    /**
+     * Output a list of times in half-hour intervals
+     *
+     * @param string  $start       Time to start with (date string, usually a ts)
+     * @param boolean $duration    Whether to include the duration of the event
+     *                             (from the start)
+     * @return array  $times (localized 24 hour time string => fancy time string)
+     */
+    public static function getTimes($start = 'now', $duration = false)
+    {
+        $newTime = new DateTime($start);
+        $times   = array();
+        $len     = 0;
+
+        $newTime->setTimezone(new DateTimeZone(common_timezone()));
+
+        for ($i = 0; $i < 47; $i++) {
+
+            $localTime = $newTime->format("g:ia");
+
+            // pretty up the end-time option list a bit
+            if ($duration) {
+                $hours = $len / 60;
+                switch ($hours) {
+                case 0:
+                    // TRANS: 0 minutes abbreviated. Used in a list.
+                    $total = ' ' . _m('(0 min)');
+                    break;
+                case .5:
+                    // TRANS: 30 minutes abbreviated. Used in a list.
+                    $total = ' ' . _m('(30 min)');
+                    break;
+                case 1:
+                    // TRANS: 1 hour. Used in a list.
+                    $total = ' ' . _m('(1 hour)');
+                    break;
+                default:
+                    // TRANS: Number of hours (%.1f and %d). Used in a list.
+                    $format = is_float($hours) 
+                        ? _m('(%.1f hours)')
+                        : _m('(%d hours)');
+                    $total = ' ' . sprintf($format, $hours);
+                    break;
+                }
+                $localTime .= $total;
+                $len += 30;
+            }
+
+            $times[$newTime->format('g:ia')] = $localTime;
+            $newTime->modify('+30min'); // 30 min intervals
+        }
+
+        return $times;
+    }
+}
diff --git a/plugins/Event/locale/Event.pot b/plugins/Event/locale/Event.pot
index cb89a0cc74..ff698ee1db 100644
--- a/plugins/Event/locale/Event.pot
+++ b/plugins/Event/locale/Event.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,6 +16,31 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#. TRANS: 0 minutes abbreviated. Used in a list.
+#: eventtimelist.php:85
+msgid "(0 min)"
+msgstr ""
+
+#. TRANS: 30 minutes abbreviated. Used in a list.
+#: eventtimelist.php:89
+msgid "(30 min)"
+msgstr ""
+
+#. TRANS: 1 hour. Used in a list.
+#: eventtimelist.php:93
+msgid "(1 hour)"
+msgstr ""
+
+#: eventtimelist.php:98
+#, php-format
+msgid "(%.1f hours)"
+msgstr ""
+
+#: eventtimelist.php:99
+#, php-format
+msgid "(%d hours)"
+msgstr ""
+
 #. TRANS: Client exception thrown when trying to create an event that already exists.
 #: Happening.php:125
 msgid "Event already exists."
@@ -40,6 +65,21 @@ msgid ""
 "$s</span> </span>"
 msgstr ""
 
+#. TRANS: Error message displayed when trying to perform an action that requires a logged in user.
+#: timelist.php:65
+msgid "Not logged in."
+msgstr ""
+
+#. TRANS: Client error when submitting a form with unexpected information.
+#: timelist.php:73
+msgid "Unexpected form submission."
+msgstr ""
+
+#. TRANS: Client error displayed when using an action in a non-AJAX way.
+#: timelist.php:82
+msgid "This action is AJAX only."
+msgstr ""
+
 #. TRANS: Client exception thrown when referring to a non-existing RSVP.
 #. TRANS: RSVP stands for "Please reply".
 #. TRANS: Client exception thrown when referring to a non-existing RSVP ("please respond") item.
@@ -47,8 +87,6 @@ msgstr ""
 msgid "No such RSVP."
 msgstr ""
 
-#. TRANS: Client exception thrown when referring to a non-existing event.
-#. TRANS: Client exception thrown when requesting a non-exsting event.
 #. TRANS: Client exception thrown when referring to a non-existing event.
 #: showrsvp.php:68 newrsvp.php:82 newrsvp.php:89 cancelrsvp.php:96
 #: showevent.php:60 showevent.php:68
@@ -102,7 +140,7 @@ msgstr ""
 
 #. TRANS: Page title after creating an event.
 #. TRANS: Page title after sending a notice.
-#: newrsvp.php:163 cancelrsvp.php:158 newevent.php:234
+#: newrsvp.php:163 cancelrsvp.php:158 newevent.php:252
 msgid "Event saved"
 msgstr ""
 
@@ -141,137 +179,138 @@ msgid "Maybe"
 msgstr ""
 
 #. TRANS: Field label on event form.
-#: eventform.php:92
+#: eventform.php:103
 msgctxt "LABEL"
 msgid "Title"
 msgstr ""
 
 #. TRANS: Field title on event form.
-#: eventform.php:95
+#: eventform.php:106
 msgid "Title of the event."
 msgstr ""
 
 #. TRANS: Field label on event form.
-#: eventform.php:102
+#: eventform.php:117
 msgctxt "LABEL"
 msgid "Start date"
 msgstr ""
 
 #. TRANS: Field title on event form.
-#: eventform.php:105
+#: eventform.php:120
 msgid "Date the event starts."
 msgstr ""
 
 #. TRANS: Field label on event form.
-#: eventform.php:112
+#: eventform.php:133
 msgctxt "LABEL"
 msgid "Start time"
 msgstr ""
 
-#. TRANS: Field title on event form.
-#: eventform.php:115
-msgid "Time the event starts."
+#. TRANS: Field title on event form. %s is the abbreviated timezone
+#: eventform.php:136
+#, php-format
+msgid "Time the event starts (%s)."
 msgstr ""
 
 #. TRANS: Field label on event form.
-#: eventform.php:122
+#: eventform.php:150
 msgctxt "LABEL"
 msgid "End date"
 msgstr ""
 
 #. TRANS: Field title on event form.
-#: eventform.php:125
+#: eventform.php:153
 msgid "Date the event ends."
 msgstr ""
 
-#. TRANS: Field label on event form.
-#: eventform.php:132
-msgctxt "LABEL"
-msgid "End time"
-msgstr ""
-
-#. TRANS: Field title on event form.
-#: eventform.php:135
-msgid "Time the event ends."
-msgstr ""
-
-#. TRANS: Field label on event form.
-#: eventform.php:142
-msgctxt "LABEL"
-msgid "Location"
-msgstr ""
-
-#. TRANS: Field title on event form.
-#: eventform.php:145
-msgid "Event location."
-msgstr ""
-
-#. TRANS: Field label on event form.
-#: eventform.php:152
-msgctxt "LABEL"
-msgid "URL"
-msgstr ""
-
-#. TRANS: Field title on event form.
-#: eventform.php:155
-msgid "URL for more information."
-msgstr ""
-
 #. TRANS: Field label on event form.
 #: eventform.php:162
 msgctxt "LABEL"
-msgid "Description"
+msgid "End time"
 msgstr ""
 
 #. TRANS: Field title on event form.
 #: eventform.php:165
+msgid "Time the event ends."
+msgstr ""
+
+#. TRANS: Field label on event form.
+#: eventform.php:174
+msgctxt "LABEL"
+msgid "Where?"
+msgstr ""
+
+#. TRANS: Field title on event form.
+#: eventform.php:177
+msgid "Event location."
+msgstr ""
+
+#. TRANS: Field label on event form.
+#: eventform.php:184
+msgctxt "LABEL"
+msgid "URL"
+msgstr ""
+
+#. TRANS: Field title on event form.
+#: eventform.php:187
+msgid "URL for more information."
+msgstr ""
+
+#. TRANS: Field label on event form.
+#: eventform.php:194
+msgctxt "LABEL"
+msgid "Description"
+msgstr ""
+
+#. TRANS: Field title on event form.
+#: eventform.php:197
 msgid "Description of the event."
 msgstr ""
 
 #. TRANS: Button text to save an event..
-#: eventform.php:187
+#: eventform.php:219
 msgctxt "BUTTON"
 msgid "Save"
 msgstr ""
 
 #. TRANS: Plugin description.
-#: EventPlugin.php:135
+#: EventPlugin.php:139
 msgid "Event invitations and RSVPs."
 msgstr ""
 
 #. TRANS: Title for event application.
-#: EventPlugin.php:141
+#: EventPlugin.php:145
 msgctxt "TITLE"
 msgid "Event"
 msgstr ""
 
 #. TRANS: Exception thrown when there are too many activity objects.
-#: EventPlugin.php:169
+#: EventPlugin.php:173
 msgid "Too many activity objects."
 msgstr ""
 
 #. TRANS: Exception thrown when event plugin comes across a non-event type object.
-#: EventPlugin.php:176
+#: EventPlugin.php:180
 msgid "Wrong type for object."
 msgstr ""
 
 #. TRANS: Exception thrown when trying to RSVP for an unknown event.
-#: EventPlugin.php:198
+#: EventPlugin.php:204
 msgid "RSVP for unknown event."
 msgstr ""
 
 #. TRANS: Exception thrown when event plugin comes across a undefined verb.
-#: EventPlugin.php:204
+#: EventPlugin.php:210
 msgid "Unknown verb for events."
 msgstr ""
 
 #. TRANS: Exception thrown when event plugin comes across a unknown object type.
-#: EventPlugin.php:235
+#: EventPlugin.php:241
 msgid "Unknown object type."
 msgstr ""
 
 #. TRANS: Exception thrown when referring to a notice that is not an event an in event context.
-#: EventPlugin.php:242
+#: EventPlugin.php:248
 msgid "Unknown event notice."
 msgstr ""
 
@@ -389,65 +428,58 @@ msgid "Must be logged in to post a event."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to post an event without providing a title.
-#: newevent.php:96
+#: newevent.php:98
 msgid "Title required."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to post an event without providing a start date.
-#: newevent.php:107
+#: newevent.php:110
 msgid "Start date required."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to post an event without providing an end date.
-#: newevent.php:120
+#: newevent.php:123
 msgid "End date required."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to post an event with a date that cannot be processed.
 #. TRANS: %s is the data that could not be processed.
-#: newevent.php:143 newevent.php:151
+#: newevent.php:141 newevent.php:148
 #, php-format
 msgid "Could not parse date \"%s\"."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to post an event without providing a title.
-#: newevent.php:188
+#: newevent.php:196
 msgid "Event must have a title."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to post an event without providing a start time.
-#: newevent.php:193
+#: newevent.php:201
 msgid "Event must have a start time."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to post an event without providing an end time.
-#: newevent.php:198
+#: newevent.php:206
 msgid "Event must have an end time."
 msgstr ""
 
+#. TRANS: Client exception thrown when trying to post an event with an invalid URL.
+#: newevent.php:211
+msgid "URL must be valid."
+msgstr ""
+
 #. TRANS: Field label for event description.
-#: eventlistitem.php:97
+#: eventlistitem.php:117
 msgid "Time:"
 msgstr ""
 
 #. TRANS: Field label for event description.
-#: eventlistitem.php:118
+#: eventlistitem.php:138
 msgid "Location:"
 msgstr ""
 
 #. TRANS: Field label for event description.
-#: eventlistitem.php:126
+#: eventlistitem.php:146
 msgid "Description:"
 msgstr ""
-
-#. TRANS: Field label for event description.
-#: eventlistitem.php:135
-msgid "Attending:"
-msgstr ""
-
-#. TRANS: RSVP counts.
-#. TRANS: %1$d, %2$d and %3$d are numbers of RSVPs.
-#: eventlistitem.php:139
-#, php-format
-msgid "Yes: %1$d No: %2$d Maybe: %3$d"
-msgstr ""
diff --git a/plugins/Event/locale/ar/LC_MESSAGES/Event.po b/plugins/Event/locale/ar/LC_MESSAGES/Event.po
index 2e45d2907d..0048c3b41d 100644
--- a/plugins/Event/locale/ar/LC_MESSAGES/Event.po
+++ b/plugins/Event/locale/ar/LC_MESSAGES/Event.po
@@ -1,6 +1,7 @@
 # Translation of StatusNet - Event to Arabic (العربية)
 # Exported from translatewiki.net
 #
+# Author: Majid Al-Dharrab
 # Author: OsamaK
 # --
 # This file is distributed under the same license as the StatusNet package.
@@ -9,20 +10,41 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Event\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-31 21:06+0000\n"
-"PO-Revision-Date: 2011-03-31 21:09:14+0000\n"
-"Language-Team: Arabic <http://translatewiki.net/wiki/Portal:ar>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:27+0000\n"
+"Language-Team: Arabic <https://translatewiki.net/wiki/Portal:ar>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-24 15:25:01+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r85082); Translate extension (2011-03-11)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2012-01-02 10:11:52+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ar\n"
 "X-Message-Group: #out-statusnet-plugin-event\n"
 "Plural-Forms: nplurals=6; plural=(n == 0) ? 0 : ( (n == 1) ? 1 : ( (n == "
 "2) ? 2 : ( (n%100 >= 3 && n%100 <= 10) ? 3 : ( (n%100 >= 11 && n%100 <= "
 "99) ? 4 : 5 ) ) ) );\n"
 
+#. TRANS: 0 minutes abbreviated. Used in a list.
+msgid "(0 min)"
+msgstr ""
+
+#. TRANS: 30 minutes abbreviated. Used in a list.
+msgid "(30 min)"
+msgstr ""
+
+#. TRANS: 1 hour. Used in a list.
+msgid "(1 hour)"
+msgstr ""
+
+#, php-format
+msgid "(%.1f hours)"
+msgstr ""
+
+#, php-format
+msgid "(%d hours)"
+msgstr ""
+
+#. TRANS: Client exception thrown when trying to create an event that already exists.
 msgid "Event already exists."
 msgstr ""
 
@@ -30,8 +52,11 @@ msgstr ""
 #. TRANS: %4$s is location, %5$s is a description.
 #, php-format
 msgid "\"%1$s\" %2$s - %3$s (%4$s): %5$s"
-msgstr ""
+msgstr "\"%1$s\" %2$s - %3$s (%4$s): %5$s"
 
+#. TRANS: Rendered event description. %1$s is a title, %2$s is start time, %3$s is start time,
+#. TRANS: %4$s is end time, %5$s is end time, %6$s is location, %7$s is description.
+#. TRANS: Class names should not be translated.
 #, php-format
 msgid ""
 "<span class=\"vevent\"><span class=\"summary\">%1$s</span> <abbr class="
@@ -39,14 +64,31 @@ msgid ""
 "$s</a> (<span class=\"location\">%6$s</span>): <span class=\"description\">%7"
 "$s</span> </span>"
 msgstr ""
+"<span class=\"vevent\"><span class=\"summary\">%1$s</span> <abbr class="
+"\"dtstart\" title=\"%2$s\">%3$s</a> - <abbr class=\"dtend\" title=\"%4$s\">%5"
+"$s</a> (<span class=\"location\">%6$s</span>): <span class=\"description\">%7"
+"$s</span> </span>"
+
+#. TRANS: Error message displayed when trying to perform an action that requires a logged in user.
+msgid "Not logged in."
+msgstr "لست والجًا."
+
+#. TRANS: Client error when submitting a form with unexpected information.
+msgid "Unexpected form submission."
+msgstr ""
+
+#. TRANS: Client error displayed when using an action in a non-AJAX way.
+msgid "This action is AJAX only."
+msgstr ""
 
 #. TRANS: Client exception thrown when referring to a non-existing RSVP.
 #. TRANS: RSVP stands for "Please reply".
+#. TRANS: Client exception thrown when referring to a non-existing RSVP ("please respond") item.
 msgid "No such RSVP."
 msgstr ""
 
 #. TRANS: Client exception thrown when referring to a non-existing event.
-msgid "No such Event."
+msgid "No such event."
 msgstr ""
 
 #. TRANS: Title for event.
@@ -55,196 +97,326 @@ msgstr ""
 msgid "%1$s's RSVP for \"%2$s\""
 msgstr ""
 
+#. TRANS: Possible status for RSVP ("please respond") item.
 msgid "You will attend this event."
-msgstr ""
+msgstr "سو� تحضر هذا الحدث."
 
+#. TRANS: Possible status for RSVP ("please respond") item.
 msgid "You will not attend this event."
-msgstr ""
+msgstr "لن تحضر هذا الحدث."
 
+#. TRANS: Possible status for RSVP ("please respond") item.
 msgid "You might attend this event."
-msgstr ""
+msgstr "قد تحضر هذا الحدث."
 
+#. TRANS: Button text to cancel responding to an RSVP ("please respond") item.
 msgctxt "BUTTON"
 msgid "Cancel"
 msgstr "ألغ�"
 
+#. TRANS: Title for RSVP ("please respond") action.
+msgctxt "TITLE"
 msgid "New RSVP"
 msgstr ""
 
-#. TRANS: Client exception thrown when referring to a non-existing event.
-msgid "No such event."
-msgstr ""
-
+#. TRANS: Client exception thrown when trying to RSVP ("please respond") while not logged in.
+#. TRANS: Client exception thrown when trying tp RSVP ("please respond") while not logged in.
 msgid "You must be logged in to RSVP for an event."
 msgstr ""
 
-#. TRANS: Page title after sending a notice.
-msgid "Event saved"
+#. TRANS: Client exception thrown when using an invalid value for RSVP ("please respond").
+msgid "Unknown submit value."
 msgstr ""
 
-#, fuzzy
-msgid "Cancel RSVP"
-msgstr "ألغ�"
+#. TRANS: Page title after creating an event.
+#. TRANS: Page title after sending a notice.
+msgid "Event saved"
+msgstr "ح��ظ الحدث"
 
+#. TRANS: Title for RSVP ("please respond") action.
+msgctxt "TITLE"
+msgid "Cancel RSVP"
+msgstr ""
+
+#. TRANS: Content for a deleted RSVP list item (RSVP stands for "please respond").
+msgid "Deleted."
+msgstr ""
+
+#. TRANS: Field label on form to RSVP ("please respond") for an event.
 msgid "RSVP:"
 msgstr ""
 
+#. TRANS: Button text for RSVP ("please respond") reply to confirm attendence.
 msgctxt "BUTTON"
 msgid "Yes"
 msgstr "نعم"
 
+#. TRANS: Button text for RSVP ("please respond") reply to deny attendence.
 msgctxt "BUTTON"
 msgid "No"
 msgstr "لا"
 
+#. TRANS: Button text for RSVP ("please respond") reply to indicate one might attend.
 msgctxt "BUTTON"
 msgid "Maybe"
-msgstr ""
+msgstr "ربما"
 
+#. TRANS: Field label on event form.
 msgctxt "LABEL"
 msgid "Title"
-msgstr ""
+msgstr "العنوان"
 
-msgid "Title of the event"
-msgstr ""
+#. TRANS: Field title on event form.
+msgid "Title of the event."
+msgstr "عنوان الحدث."
 
+#. TRANS: Field label on event form.
 msgctxt "LABEL"
 msgid "Start date"
-msgstr ""
+msgstr "تاريخ البدء"
 
-msgid "Date the event starts"
-msgstr ""
+#. TRANS: Field title on event form.
+msgid "Date the event starts."
+msgstr "تاريخ بدء الحدث."
 
+#. TRANS: Field label on event form.
 msgctxt "LABEL"
 msgid "Start time"
-msgstr ""
+msgstr "وقت البدء"
 
-msgid "Time the event starts"
-msgstr ""
+#. TRANS: Field title on event form. %s is the abbreviated timezone
+#, fuzzy, php-format
+msgid "Time the event starts (%s)."
+msgstr "وقت بدء الحدث."
 
+#. TRANS: Field label on event form.
 msgctxt "LABEL"
 msgid "End date"
-msgstr ""
+msgstr "تاريخ الانتهاء"
 
-msgid "Date the event ends"
-msgstr ""
+#. TRANS: Field title on event form.
+msgid "Date the event ends."
+msgstr "تاريخ انتهاء الحدث."
 
+#. TRANS: Field label on event form.
 msgctxt "LABEL"
 msgid "End time"
-msgstr ""
+msgstr "وقت الانتهاء"
 
-msgid "Time the event ends"
-msgstr ""
+#. TRANS: Field title on event form.
+msgid "Time the event ends."
+msgstr "وقت نهاية الحدث."
 
+#. TRANS: Field label on event form.
 msgctxt "LABEL"
-msgid "Location"
-msgstr ""
+msgid "Where?"
+msgstr "أين؟"
 
-msgid "Event location"
-msgstr ""
+#. TRANS: Field title on event form.
+msgid "Event location."
+msgstr "موقع الحدث."
 
+#. TRANS: Field label on event form.
 msgctxt "LABEL"
 msgid "URL"
-msgstr ""
+msgstr "المسار"
 
-msgid "URL for more information"
-msgstr ""
+#. TRANS: Field title on event form.
+msgid "URL for more information."
+msgstr "مسار مزيد من المعلومات"
 
+#. TRANS: Field label on event form.
 msgctxt "LABEL"
 msgid "Description"
-msgstr ""
+msgstr "الوص�"
 
-msgid "Description of the event"
-msgstr ""
+#. TRANS: Field title on event form.
+msgid "Description of the event."
+msgstr "وص� الحدث."
 
+#. TRANS: Button text to save an event..
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "اح�ظ"
 
+#. TRANS: Plugin description.
 msgid "Event invitations and RSVPs."
 msgstr ""
 
+#. TRANS: Title for event application.
+msgctxt "TITLE"
 msgid "Event"
+msgstr "حدث"
+
+#. TRANS: Exception thrown when there are too many activity objects.
+msgid "Too many activity objects."
 msgstr ""
 
-msgid "Time:"
+#. TRANS: Exception thrown when event plugin comes across a non-event type object.
+msgid "Wrong type for object."
 msgstr ""
 
-msgid "Location:"
+#. TRANS: Exception thrown when trying to RSVP for an unknown event.
+msgid "RSVP for unknown event."
 msgstr ""
 
-msgid "Description:"
+#. TRANS: Exception thrown when event plugin comes across a undefined verb.
+msgid "Unknown verb for events."
 msgstr ""
 
-msgid "Attending:"
+#. TRANS: Exception thrown when event plugin comes across a unknown object type.
+msgid "Unknown object type."
 msgstr ""
 
-#. TRANS: RSVP counts.
-#. TRANS: %1$d, %2$d and %3$d are numbers of RSVPs.
-#, php-format
-msgid "Yes: %1$d No: %2$d Maybe: %3$d"
+#. TRANS: Exception thrown when referring to a notice that is not an event an in event context.
+msgid "Unknown event notice."
 msgstr ""
 
+#. TRANS: Client exception thrown when trying to save an already existing RSVP ("please respond").
 msgid "RSVP already exists."
 msgstr ""
 
+#. TRANS: Exception thrown when requesting an undefined verb for RSVP.
 #, php-format
-msgid ""
-"<span class='automatic event-rsvp'><a href='%1s'>%2s</a> is attending <a "
-"href='%3s'>%4s</a>.</span>"
+msgid "Unknown verb \"%s\"."
 msgstr ""
 
+#. TRANS: Exception thrown when requesting an undefined code for RSVP.
 #, php-format
-msgid ""
-"<span class='automatic event-rsvp'><a href='%1s'>%2s</a> is not attending <a "
-"href='%3s'>%4s</a>.</span>"
+msgid "Unknown code \"%s\"."
 msgstr ""
 
+#. TRANS: Server exception thrown when requesting a non-exsting notice for an RSVP ("please respond").
+#. TRANS: %s is the RSVP with the missing notice.
 #, php-format
-msgid ""
-"<span class='automatic event-rsvp'><a href='%1s'>%2s</a> might attend <a "
-"href='%3s'>%4s</a>.</span>"
+msgid "RSVP %s does not correspond to a notice in the database."
 msgstr ""
 
+#. TRANS: Exception thrown when requesting a non-existing profile.
+#. TRANS: %s is the ID of the non-existing profile.
+#, php-format
+msgid "No profile with ID %s."
+msgstr ""
+
+#. TRANS: Exception thrown when requesting a non-existing event.
+#. TRANS: %s is the ID of the non-existing event.
+#, php-format
+msgid "No event with ID %s."
+msgstr ""
+
+#. TRANS: HTML version of an RSVP ("please respond") status for a user.
+#. TRANS: %1$s is a profile URL, %2$s a profile name,
+#. TRANS: %3$s is an event URL, %4$s an event title.
+#, php-format
+msgid ""
+"<span class='automatic event-rsvp'><a href='%1$s'>%2$s</a> is attending <a "
+"href='%3$s'>%4$s</a>.</span>"
+msgstr ""
+"<span class='automatic event-rsvp'><a href='%1$s'>%2$s</a> سيحضر <a href='%3"
+"$s'>%4$s</a>.</span>"
+
+#. TRANS: HTML version of an RSVP ("please respond") status for a user.
+#. TRANS: %1$s is a profile URL, %2$s a profile name,
+#. TRANS: %3$s is an event URL, %4$s an event title.
+#, php-format
+msgid ""
+"<span class='automatic event-rsvp'><a href='%1$s'>%2$s</a> is not attending "
+"<a href='%3$s'>%4$s</a>.</span>"
+msgstr ""
+"<span class='automatic event-rsvp'><a href='%1$s'>%2$s</a> لن يحضر <a href='%"
+"3$s'>%4$s</a>.</span>"
+
+#. TRANS: HTML version of an RSVP ("please respond") status for a user.
+#. TRANS: %1$s is a profile URL, %2$s a profile name,
+#. TRANS: %3$s is an event URL, %4$s an event title.
+#, php-format
+msgid ""
+"<span class='automatic event-rsvp'><a href='%1$s'>%2$s</a> might attend <a "
+"href='%3$s'>%4$s</a>.</span>"
+msgstr ""
+"<span class='automatic event-rsvp'><a href='%1$s'>%2$s</a> قد يحضر <a href='%"
+"3$s'>%4$s</a>.</span>"
+
+#. TRANS: Exception thrown when requesting a user's RSVP status for a non-existing response code.
+#. TRANS: %s is the non-existing response code.
+#, php-format
+msgid "Unknown response code %s."
+msgstr ""
+
+#. TRANS: Used as event title when not event title is available.
+#. TRANS: Used as: Username [is [not ] attending|might attend] an unknown event.
 msgid "an unknown event"
 msgstr ""
 
+#. TRANS: Plain text version of an RSVP ("please respond") status for a user.
+#. TRANS: %1$s is a profile name, %2$s is an event title.
 #, php-format
-msgid "%1s is attending %2s."
-msgstr ""
+msgid "%1$s is attending %2$s."
+msgstr "%1$s سو� يحضر %2$s"
 
+#. TRANS: Plain text version of an RSVP ("please respond") status for a user.
+#. TRANS: %1$s is a profile name, %2$s is an event title.
 #, php-format
-msgid "%1s is not attending %2s."
-msgstr ""
+msgid "%1$s is not attending %2$s."
+msgstr "%1$s لن يحضر %2$s"
 
+#. TRANS: Plain text version of an RSVP ("please respond") status for a user.
+#. TRANS: %1$s is a profile name, %2$s is an event title.
 #, php-format
-msgid "%1s might attend %2s.>"
-msgstr ""
+msgid "%1$s might attend %2$s."
+msgstr "%1$s قد يحضر %2$s"
 
+#. TRANS: Title for new event form.
+msgctxt "TITLE"
 msgid "New event"
-msgstr ""
+msgstr "حدث جديد"
 
+#. TRANS: Client exception thrown when trying to post an event while not logged in.
 msgid "Must be logged in to post a event."
 msgstr ""
 
+#. TRANS: Client exception thrown when trying to post an event without providing a title.
 msgid "Title required."
 msgstr ""
 
+#. TRANS: Client exception thrown when trying to post an event without providing a start date.
 msgid "Start date required."
 msgstr ""
 
+#. TRANS: Client exception thrown when trying to post an event without providing an end date.
 msgid "End date required."
 msgstr ""
 
+#. TRANS: Client exception thrown when trying to post an event with a date that cannot be processed.
+#. TRANS: %s is the data that could not be processed.
 #, php-format
-msgid "Could not parse date \"%s\""
+msgid "Could not parse date \"%s\"."
 msgstr ""
 
+#. TRANS: Client exception thrown when trying to post an event without providing a title.
 msgid "Event must have a title."
-msgstr ""
+msgstr "يجب أن يكون للحدث عنوانًا."
 
+#. TRANS: Client exception thrown when trying to post an event without providing a start time.
 msgid "Event must have a start time."
+msgstr "يجب أن يكون للحدث وقت بدء."
+
+#. TRANS: Client exception thrown when trying to post an event without providing an end time.
+msgid "Event must have an end time."
+msgstr "يجب أن يكون للحدث وقت انتهاء."
+
+#. TRANS: Client exception thrown when trying to post an event with an invalid URL.
+msgid "URL must be valid."
 msgstr ""
 
-msgid "Event must have an end time."
-msgstr ""
+#. TRANS: Field label for event description.
+msgid "Time:"
+msgstr "الوقت:"
+
+#. TRANS: Field label for event description.
+msgid "Location:"
+msgstr "المكان:"
+
+#. TRANS: Field label for event description.
+msgid "Description:"
+msgstr "الوص�:"
diff --git a/plugins/Event/locale/br/LC_MESSAGES/Event.po b/plugins/Event/locale/br/LC_MESSAGES/Event.po
index 0f30a1b82c..eaf00af0d8 100644
--- a/plugins/Event/locale/br/LC_MESSAGES/Event.po
+++ b/plugins/Event/locale/br/LC_MESSAGES/Event.po
@@ -1,6 +1,7 @@
-# Translation of StatusNet - Event to Breton (Brezhoneg)
+# Translation of StatusNet - Event to Breton (brezhoneg)
 # Exported from translatewiki.net
 #
+# Author: Fulup
 # Author: Y-M D
 # --
 # This file is distributed under the same license as the StatusNet package.
@@ -9,21 +10,41 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Event\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:20+0000\n"
-"Language-Team: Breton <http://translatewiki.net/wiki/Portal:br>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:27+0000\n"
+"Language-Team: Breton <https://translatewiki.net/wiki/Portal:br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:26:39+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2012-01-02 10:11:52+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-event\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#. TRANS: 0 minutes abbreviated. Used in a list.
+msgid "(0 min)"
+msgstr "(0 mun)"
+
+#. TRANS: 30 minutes abbreviated. Used in a list.
+msgid "(30 min)"
+msgstr "(30 mun)"
+
+#. TRANS: 1 hour. Used in a list.
+msgid "(1 hour)"
+msgstr "(1 eurvezh)"
+
+#, php-format
+msgid "(%.1f hours)"
+msgstr ""
+
+#, php-format
+msgid "(%d hours)"
+msgstr ""
+
 #. TRANS: Client exception thrown when trying to create an event that already exists.
 msgid "Event already exists."
-msgstr "An darvoud zo anezhañ dija."
+msgstr "An darvoud-mañ zo anezhañ c'hoazh."
 
 #. TRANS: Event description. %1$s is a title, %2$s is start time, %3$s is end time,
 #. TRANS: %4$s is location, %5$s is a description.
@@ -42,14 +63,24 @@ msgid ""
 "$s</span> </span>"
 msgstr ""
 
+#. TRANS: Error message displayed when trying to perform an action that requires a logged in user.
+msgid "Not logged in."
+msgstr "Digevreet."
+
+#. TRANS: Client error when submitting a form with unexpected information.
+msgid "Unexpected form submission."
+msgstr ""
+
+#. TRANS: Client error displayed when using an action in a non-AJAX way.
+msgid "This action is AJAX only."
+msgstr ""
+
 #. TRANS: Client exception thrown when referring to a non-existing RSVP.
 #. TRANS: RSVP stands for "Please reply".
 #. TRANS: Client exception thrown when referring to a non-existing RSVP ("please respond") item.
 msgid "No such RSVP."
 msgstr "N'eus ket eus an RSVP-se."
 
-#. TRANS: Client exception thrown when referring to a non-existing event.
-#. TRANS: Client exception thrown when requesting a non-exsting event.
 #. TRANS: Client exception thrown when referring to a non-existing event.
 msgid "No such event."
 msgstr "N'eus ket eus an darvoud-se."
@@ -105,7 +136,7 @@ msgstr "Nullañ an RSVP"
 
 #. TRANS: Content for a deleted RSVP list item (RSVP stands for "please respond").
 msgid "Deleted."
-msgstr ""
+msgstr "Bet diverket."
 
 #. TRANS: Field label on form to RSVP ("please respond") for an event.
 msgid "RSVP:"
@@ -149,9 +180,10 @@ msgctxt "LABEL"
 msgid "Start time"
 msgstr "Eurvezh kregiñ"
 
-#. TRANS: Field title on event form.
-msgid "Time the event starts."
-msgstr ""
+#. TRANS: Field title on event form. %s is the abbreviated timezone
+#, fuzzy, php-format
+msgid "Time the event starts (%s)."
+msgstr "An eurvezh evit pehini e krog an darvoud."
 
 #. TRANS: Field label on event form.
 msgctxt "LABEL"
@@ -169,12 +201,12 @@ msgstr "Eurvezh echuiñ"
 
 #. TRANS: Field title on event form.
 msgid "Time the event ends."
-msgstr ""
+msgstr "An eurvezh evit pehini ec'h echu an darvoud."
 
 #. TRANS: Field label on event form.
 msgctxt "LABEL"
-msgid "Location"
-msgstr "Lec'hiadur"
+msgid "Where?"
+msgstr "Pelec'h ?"
 
 #. TRANS: Field title on event form.
 msgid "Event location."
@@ -366,6 +398,10 @@ msgstr ""
 msgid "Event must have an end time."
 msgstr ""
 
+#. TRANS: Client exception thrown when trying to post an event with an invalid URL.
+msgid "URL must be valid."
+msgstr ""
+
 #. TRANS: Field label for event description.
 msgid "Time:"
 msgstr "Deiziad :"
@@ -377,13 +413,3 @@ msgstr "Lec'hiadur :"
 #. TRANS: Field label for event description.
 msgid "Description:"
 msgstr "Deskrivadur :"
-
-#. TRANS: Field label for event description.
-msgid "Attending:"
-msgstr ""
-
-#. TRANS: RSVP counts.
-#. TRANS: %1$d, %2$d and %3$d are numbers of RSVPs.
-#, php-format
-msgid "Yes: %1$d No: %2$d Maybe: %3$d"
-msgstr "Ya : %1$d Nann : %2$d Marteze : %3$d"
diff --git a/plugins/Event/locale/ca/LC_MESSAGES/Event.po b/plugins/Event/locale/ca/LC_MESSAGES/Event.po
index fae0432464..dcac6d3507 100644
--- a/plugins/Event/locale/ca/LC_MESSAGES/Event.po
+++ b/plugins/Event/locale/ca/LC_MESSAGES/Event.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Event to Catalan (Català)
+# Translation of StatusNet - Event to Catalan (català)
 # Exported from translatewiki.net
 #
 # Author: Toniher
@@ -9,18 +9,38 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Event\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:20+0000\n"
-"Language-Team: Catalan <http://translatewiki.net/wiki/Portal:ca>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:28+0000\n"
+"Language-Team: Catalan <https://translatewiki.net/wiki/Portal:ca>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:26:39+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2012-01-02 10:11:52+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ca\n"
 "X-Message-Group: #out-statusnet-plugin-event\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: 0 minutes abbreviated. Used in a list.
+msgid "(0 min)"
+msgstr "(0 min)"
+
+#. TRANS: 30 minutes abbreviated. Used in a list.
+msgid "(30 min)"
+msgstr "(30 min)"
+
+#. TRANS: 1 hour. Used in a list.
+msgid "(1 hour)"
+msgstr "(1 hora)"
+
+#, php-format
+msgid "(%.1f hours)"
+msgstr ""
+
+#, php-format
+msgid "(%d hours)"
+msgstr ""
+
 #. TRANS: Client exception thrown when trying to create an event that already exists.
 msgid "Event already exists."
 msgstr "L'esdeveniment ja existeix."
@@ -42,35 +62,45 @@ msgid ""
 "$s</span> </span>"
 msgstr ""
 
+#. TRANS: Error message displayed when trying to perform an action that requires a logged in user.
+msgid "Not logged in."
+msgstr "No s'ha iniciat la sessió."
+
+#. TRANS: Client error when submitting a form with unexpected information.
+msgid "Unexpected form submission."
+msgstr "Tramesa de formulari no esperada."
+
+#. TRANS: Client error displayed when using an action in a non-AJAX way.
+msgid "This action is AJAX only."
+msgstr "Aquesta acció és només en AJAX."
+
 #. TRANS: Client exception thrown when referring to a non-existing RSVP.
 #. TRANS: RSVP stands for "Please reply".
 #. TRANS: Client exception thrown when referring to a non-existing RSVP ("please respond") item.
 msgid "No such RSVP."
-msgstr ""
+msgstr "No existeix la RSVP."
 
-#. TRANS: Client exception thrown when referring to a non-existing event.
-#. TRANS: Client exception thrown when requesting a non-exsting event.
 #. TRANS: Client exception thrown when referring to a non-existing event.
 msgid "No such event."
-msgstr ""
+msgstr "No existeix l'esdeveniment."
 
 #. TRANS: Title for event.
 #. TRANS: %1$s is a user nickname, %2$s is an event title.
 #, php-format
 msgid "%1$s's RSVP for \"%2$s\""
-msgstr ""
+msgstr "RSVP de %1$s per a «%2$s»"
 
 #. TRANS: Possible status for RSVP ("please respond") item.
 msgid "You will attend this event."
-msgstr ""
+msgstr "Assistireu a l'esdeveniment."
 
 #. TRANS: Possible status for RSVP ("please respond") item.
 msgid "You will not attend this event."
-msgstr ""
+msgstr "No assistireu a l'esdeveniment."
 
 #. TRANS: Possible status for RSVP ("please respond") item.
 msgid "You might attend this event."
-msgstr ""
+msgstr "Potser assistireu a l'esdeveniment."
 
 #. TRANS: Button text to cancel responding to an RSVP ("please respond") item.
 msgctxt "BUTTON"
@@ -80,12 +110,12 @@ msgstr "Cancel·la"
 #. TRANS: Title for RSVP ("please respond") action.
 msgctxt "TITLE"
 msgid "New RSVP"
-msgstr ""
+msgstr "RSVP nova"
 
 #. TRANS: Client exception thrown when trying to RSVP ("please respond") while not logged in.
 #. TRANS: Client exception thrown when trying tp RSVP ("please respond") while not logged in.
 msgid "You must be logged in to RSVP for an event."
-msgstr ""
+msgstr "Cal que hàgiu iniciat una sessió per a una RSVP d'un esdeveniment."
 
 #. TRANS: Client exception thrown when using an invalid value for RSVP ("please respond").
 msgid "Unknown submit value."
@@ -94,7 +124,7 @@ msgstr ""
 #. TRANS: Page title after creating an event.
 #. TRANS: Page title after sending a notice.
 msgid "Event saved"
-msgstr ""
+msgstr "S'ha desat l'esdeveniment"
 
 #. TRANS: Title for RSVP ("please respond") action.
 msgctxt "TITLE"
@@ -103,11 +133,11 @@ msgstr "Cancel·la el RSVP"
 
 #. TRANS: Content for a deleted RSVP list item (RSVP stands for "please respond").
 msgid "Deleted."
-msgstr ""
+msgstr "Eliminat."
 
 #. TRANS: Field label on form to RSVP ("please respond") for an event.
 msgid "RSVP:"
-msgstr ""
+msgstr "RSVP:"
 
 #. TRANS: Button text for RSVP ("please respond") reply to confirm attendence.
 msgctxt "BUTTON"
@@ -147,32 +177,33 @@ msgctxt "LABEL"
 msgid "Start time"
 msgstr "Hora d'inici"
 
-#. TRANS: Field title on event form.
-msgid "Time the event starts."
-msgstr "Hora d'inici de l'esdeveniment."
+#. TRANS: Field title on event form. %s is the abbreviated timezone
+#, php-format
+msgid "Time the event starts (%s)."
+msgstr "L'hora en què l'esdeveniment comença (%s)."
 
 #. TRANS: Field label on event form.
 msgctxt "LABEL"
 msgid "End date"
-msgstr "Dara final"
+msgstr "Data de finalització"
 
 #. TRANS: Field title on event form.
 msgid "Date the event ends."
-msgstr "Data final de l'esdeveniment."
+msgstr "Data de finalització de l'esdeveniment."
 
 #. TRANS: Field label on event form.
 msgctxt "LABEL"
 msgid "End time"
-msgstr ""
+msgstr "Hora de finalització"
 
 #. TRANS: Field title on event form.
 msgid "Time the event ends."
-msgstr ""
+msgstr "L'hora en què l'esdeveniment acaba."
 
 #. TRANS: Field label on event form.
 msgctxt "LABEL"
-msgid "Location"
-msgstr "Ubicació"
+msgid "Where?"
+msgstr "On?"
 
 #. TRANS: Field title on event form.
 msgid "Event location."
@@ -203,62 +234,62 @@ msgstr "Desa"
 
 #. TRANS: Plugin description.
 msgid "Event invitations and RSVPs."
-msgstr ""
+msgstr "Invitacions a esdeveniments i RSVP."
 
 #. TRANS: Title for event application.
 msgctxt "TITLE"
 msgid "Event"
-msgstr ""
+msgstr "Esdeveniment"
 
 #. TRANS: Exception thrown when there are too many activity objects.
 msgid "Too many activity objects."
-msgstr ""
+msgstr "Hi ha massa objectes d'activitat."
 
 #. TRANS: Exception thrown when event plugin comes across a non-event type object.
 msgid "Wrong type for object."
-msgstr ""
+msgstr "Tipus incorrecte per a l'objecte."
 
 #. TRANS: Exception thrown when trying to RSVP for an unknown event.
 msgid "RSVP for unknown event."
-msgstr ""
+msgstr "RSVP d'un esdeveniment desconegut."
 
 #. TRANS: Exception thrown when event plugin comes across a undefined verb.
 msgid "Unknown verb for events."
-msgstr ""
+msgstr "Verb desconegut per als esdeveniments."
 
 #. TRANS: Exception thrown when event plugin comes across a unknown object type.
 msgid "Unknown object type."
-msgstr ""
+msgstr "Tipus d'objecte desconegut."
 
 #. TRANS: Exception thrown when referring to a notice that is not an event an in event context.
 msgid "Unknown event notice."
-msgstr ""
+msgstr "Avís d'esdeveniment desconegut."
 
 #. TRANS: Client exception thrown when trying to save an already existing RSVP ("please respond").
 msgid "RSVP already exists."
-msgstr ""
+msgstr "Ja existeix la RSVP."
 
 #. TRANS: Exception thrown when requesting an undefined verb for RSVP.
 #, php-format
 msgid "Unknown verb \"%s\"."
-msgstr ""
+msgstr "Verb desconegut «%s»."
 
 #. TRANS: Exception thrown when requesting an undefined code for RSVP.
 #, php-format
 msgid "Unknown code \"%s\"."
-msgstr ""
+msgstr "Codi desconegut «%s»."
 
 #. TRANS: Server exception thrown when requesting a non-exsting notice for an RSVP ("please respond").
 #. TRANS: %s is the RSVP with the missing notice.
 #, php-format
 msgid "RSVP %s does not correspond to a notice in the database."
-msgstr ""
+msgstr "La RSVP %s no correspon a cap avís de la base de dades."
 
 #. TRANS: Exception thrown when requesting a non-existing profile.
 #. TRANS: %s is the ID of the non-existing profile.
 #, php-format
 msgid "No profile with ID %s."
-msgstr ""
+msgstr "No hi ha cap perfil amb l'ID %s."
 
 #. TRANS: Exception thrown when requesting a non-existing event.
 #. TRANS: %s is the ID of the non-existing event.
@@ -297,39 +328,39 @@ msgstr ""
 #. TRANS: %s is the non-existing response code.
 #, php-format
 msgid "Unknown response code %s."
-msgstr ""
+msgstr "Codi de resposta desconegut %s."
 
 #. TRANS: Used as event title when not event title is available.
 #. TRANS: Used as: Username [is [not ] attending|might attend] an unknown event.
 msgid "an unknown event"
-msgstr ""
+msgstr "un esdeveniment desconegut"
 
 #. TRANS: Plain text version of an RSVP ("please respond") status for a user.
 #. TRANS: %1$s is a profile name, %2$s is an event title.
 #, php-format
 msgid "%1$s is attending %2$s."
-msgstr ""
+msgstr "%1$s assisteix a %2$s."
 
 #. TRANS: Plain text version of an RSVP ("please respond") status for a user.
 #. TRANS: %1$s is a profile name, %2$s is an event title.
 #, php-format
 msgid "%1$s is not attending %2$s."
-msgstr ""
+msgstr "%1$s no assisteix a %2$s."
 
 #. TRANS: Plain text version of an RSVP ("please respond") status for a user.
 #. TRANS: %1$s is a profile name, %2$s is an event title.
 #, php-format
 msgid "%1$s might attend %2$s."
-msgstr ""
+msgstr "%1$s potser assisteix a %2$s."
 
 #. TRANS: Title for new event form.
 msgctxt "TITLE"
 msgid "New event"
-msgstr ""
+msgstr "Esdeveniment nou"
 
 #. TRANS: Client exception thrown when trying to post an event while not logged in.
 msgid "Must be logged in to post a event."
-msgstr ""
+msgstr "Cal que hàgiu iniciat una sessió per publicar un esdeveniment."
 
 #. TRANS: Client exception thrown when trying to post an event without providing a title.
 msgid "Title required."
@@ -337,11 +368,11 @@ msgstr "Cal un títol"
 
 #. TRANS: Client exception thrown when trying to post an event without providing a start date.
 msgid "Start date required."
-msgstr ""
+msgstr "Cal una data d'inici."
 
 #. TRANS: Client exception thrown when trying to post an event without providing an end date.
 msgid "End date required."
-msgstr ""
+msgstr "Cal una data de finalització."
 
 #. TRANS: Client exception thrown when trying to post an event with a date that cannot be processed.
 #. TRANS: %s is the data that could not be processed.
@@ -351,15 +382,19 @@ msgstr ""
 
 #. TRANS: Client exception thrown when trying to post an event without providing a title.
 msgid "Event must have a title."
-msgstr ""
+msgstr "L'esdeveniment ha de tenir un títol."
 
 #. TRANS: Client exception thrown when trying to post an event without providing a start time.
 msgid "Event must have a start time."
-msgstr ""
+msgstr "L'esdeveniment ha de tenir una hora d'inici."
 
 #. TRANS: Client exception thrown when trying to post an event without providing an end time.
 msgid "Event must have an end time."
-msgstr ""
+msgstr "L'esdeveniment ha de tenir una hora de finalització."
+
+#. TRANS: Client exception thrown when trying to post an event with an invalid URL.
+msgid "URL must be valid."
+msgstr "L'URL ha de ser vàlid."
 
 #. TRANS: Field label for event description.
 msgid "Time:"
@@ -372,13 +407,3 @@ msgstr "Ubicació:"
 #. TRANS: Field label for event description.
 msgid "Description:"
 msgstr "Descripció:"
-
-#. TRANS: Field label for event description.
-msgid "Attending:"
-msgstr "Assistents:"
-
-#. TRANS: RSVP counts.
-#. TRANS: %1$d, %2$d and %3$d are numbers of RSVPs.
-#, php-format
-msgid "Yes: %1$d No: %2$d Maybe: %3$d"
-msgstr "Sí: %1$d No: %2$d Potser: %3$d"
diff --git a/plugins/Event/locale/de/LC_MESSAGES/Event.po b/plugins/Event/locale/de/LC_MESSAGES/Event.po
index 14a0c9c530..25ee077b3d 100644
--- a/plugins/Event/locale/de/LC_MESSAGES/Event.po
+++ b/plugins/Event/locale/de/LC_MESSAGES/Event.po
@@ -2,6 +2,8 @@
 # Exported from translatewiki.net
 #
 # Author: Giftpflanze
+# Author: PtM
+# Author: Tiin
 # --
 # This file is distributed under the same license as the StatusNet package.
 #
@@ -9,18 +11,38 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Event\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:20+0000\n"
-"Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:28+0000\n"
+"Language-Team: German <https://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:26:39+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2012-01-02 10:11:52+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-event\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: 0 minutes abbreviated. Used in a list.
+msgid "(0 min)"
+msgstr "(0 min)"
+
+#. TRANS: 30 minutes abbreviated. Used in a list.
+msgid "(30 min)"
+msgstr "(30 min)"
+
+#. TRANS: 1 hour. Used in a list.
+msgid "(1 hour)"
+msgstr "(1 Stunde)"
+
+#, php-format
+msgid "(%.1f hours)"
+msgstr "(%.1f Stunden)"
+
+#, php-format
+msgid "(%d hours)"
+msgstr "(%d Stunden)"
+
 #. TRANS: Client exception thrown when trying to create an event that already exists.
 msgid "Event already exists."
 msgstr "Ereignis existiert bereits."
@@ -46,14 +68,24 @@ msgstr ""
 "$s</a> (<span class=\"location\">%6$s</span>): <span class=\"description\">%7"
 "$s</span> </span>"
 
+#. TRANS: Error message displayed when trying to perform an action that requires a logged in user.
+msgid "Not logged in."
+msgstr "Nicht angemeldet."
+
+#. TRANS: Client error when submitting a form with unexpected information.
+msgid "Unexpected form submission."
+msgstr "Unerwartete Formulareingabe."
+
+#. TRANS: Client error displayed when using an action in a non-AJAX way.
+msgid "This action is AJAX only."
+msgstr "Diese Aktion ist auf AJAX beschränkt."
+
 #. TRANS: Client exception thrown when referring to a non-existing RSVP.
 #. TRANS: RSVP stands for "Please reply".
 #. TRANS: Client exception thrown when referring to a non-existing RSVP ("please respond") item.
 msgid "No such RSVP."
 msgstr "Keine solche Antwortanfrage."
 
-#. TRANS: Client exception thrown when referring to a non-existing event.
-#. TRANS: Client exception thrown when requesting a non-exsting event.
 #. TRANS: Client exception thrown when referring to a non-existing event.
 msgid "No such event."
 msgstr "Kein solches Ereignis."
@@ -151,9 +183,10 @@ msgctxt "LABEL"
 msgid "Start time"
 msgstr "Startzeit"
 
-#. TRANS: Field title on event form.
-msgid "Time the event starts."
-msgstr "Zeit, an der das Ereignis anfängt."
+#. TRANS: Field title on event form. %s is the abbreviated timezone
+#, php-format
+msgid "Time the event starts (%s)."
+msgstr "Zeit, an der das Ereignis anfängt (%s)."
 
 #. TRANS: Field label on event form.
 msgctxt "LABEL"
@@ -175,8 +208,8 @@ msgstr "Zeit, zu der das Ereignis zu Ende ist."
 
 #. TRANS: Field label on event form.
 msgctxt "LABEL"
-msgid "Location"
-msgstr "Örtlichkeit"
+msgid "Where?"
+msgstr "Wo?"
 
 #. TRANS: Field title on event form.
 msgid "Event location."
@@ -371,6 +404,10 @@ msgstr "Ereignis muss ein Startdatum haben."
 msgid "Event must have an end time."
 msgstr "Ereignis muss ein Enddatum haben."
 
+#. TRANS: Client exception thrown when trying to post an event with an invalid URL.
+msgid "URL must be valid."
+msgstr "URL muss gültig sein."
+
 #. TRANS: Field label for event description.
 msgid "Time:"
 msgstr "Zeit:"
@@ -382,13 +419,3 @@ msgstr "Örtlichkeit:"
 #. TRANS: Field label for event description.
 msgid "Description:"
 msgstr "Beschreibung:"
-
-#. TRANS: Field label for event description.
-msgid "Attending:"
-msgstr "Teilnehmende:"
-
-#. TRANS: RSVP counts.
-#. TRANS: %1$d, %2$d and %3$d are numbers of RSVPs.
-#, php-format
-msgid "Yes: %1$d No: %2$d Maybe: %3$d"
-msgstr "Ja: %1$d Nein: %2$d Vielleicht: %3$d"
diff --git a/plugins/Event/locale/es/LC_MESSAGES/Event.po b/plugins/Event/locale/es/LC_MESSAGES/Event.po
new file mode 100644
index 0000000000..d4e941d52f
--- /dev/null
+++ b/plugins/Event/locale/es/LC_MESSAGES/Event.po
@@ -0,0 +1,419 @@
+# Translation of StatusNet - Event to Spanish (español)
+# Exported from translatewiki.net
+#
+# Author: Armando-Martin
+# Author: Erchache2000
+# Author: McDutchie
+# Author: Od1n
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Event\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:28+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2012-01-02 10:11:52+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: 0 minutes abbreviated. Used in a list.
+msgid "(0 min)"
+msgstr "(0 min)"
+
+#. TRANS: 30 minutes abbreviated. Used in a list.
+msgid "(30 min)"
+msgstr "(30 min)"
+
+#. TRANS: 1 hour. Used in a list.
+msgid "(1 hour)"
+msgstr "(1 hour)"
+
+#, php-format
+msgid "(%.1f hours)"
+msgstr "(%.1f horas)"
+
+#, php-format
+msgid "(%d hours)"
+msgstr "(%d horas)"
+
+#. TRANS: Client exception thrown when trying to create an event that already exists.
+msgid "Event already exists."
+msgstr "Evento ya existe."
+
+#. TRANS: Event description. %1$s is a title, %2$s is start time, %3$s is end time,
+#. TRANS: %4$s is location, %5$s is a description.
+#, php-format
+msgid "\"%1$s\" %2$s - %3$s (%4$s): %5$s"
+msgstr "\"%1$s\" %2$s - %3$s (%4$s): %5$s"
+
+#. TRANS: Rendered event description. %1$s is a title, %2$s is start time, %3$s is start time,
+#. TRANS: %4$s is end time, %5$s is end time, %6$s is location, %7$s is description.
+#. TRANS: Class names should not be translated.
+#, php-format
+msgid ""
+"<span class=\"vevent\"><span class=\"summary\">%1$s</span> <abbr class="
+"\"dtstart\" title=\"%2$s\">%3$s</a> - <abbr class=\"dtend\" title=\"%4$s\">%5"
+"$s</a> (<span class=\"location\">%6$s</span>): <span class=\"description\">%7"
+"$s</span> </span>"
+msgstr ""
+"<span class=\"vevent\"><span class=\"summary\">%1$s</span> <abbr class="
+"\"dtstart\" title=\"%2$s\">%3$s</a> - <abbr class=\"dtend\" title=\"%4$s\">%5"
+"$s</a> (<span class=\"location\">%6$s</span>): <span class=\"description\">%7"
+"$s</span> </span>"
+
+#. TRANS: Error message displayed when trying to perform an action that requires a logged in user.
+msgid "Not logged in."
+msgstr "No conectado."
+
+#. TRANS: Client error when submitting a form with unexpected information.
+msgid "Unexpected form submission."
+msgstr "Envío de formulario inesperado."
+
+#. TRANS: Client error displayed when using an action in a non-AJAX way.
+msgid "This action is AJAX only."
+msgstr "Esta acción sólo es AJAX."
+
+#. TRANS: Client exception thrown when referring to a non-existing RSVP.
+#. TRANS: RSVP stands for "Please reply".
+#. TRANS: Client exception thrown when referring to a non-existing RSVP ("please respond") item.
+msgid "No such RSVP."
+msgstr "No hay tal RSVP."
+
+#. TRANS: Client exception thrown when referring to a non-existing event.
+msgid "No such event."
+msgstr "No hay tal evento."
+
+#. TRANS: Title for event.
+#. TRANS: %1$s is a user nickname, %2$s is an event title.
+#, php-format
+msgid "%1$s's RSVP for \"%2$s\""
+msgstr "%1$s de RSVP para \" %2$s \""
+
+#. TRANS: Possible status for RSVP ("please respond") item.
+msgid "You will attend this event."
+msgstr "Usted asistirá a este evento."
+
+#. TRANS: Possible status for RSVP ("please respond") item.
+msgid "You will not attend this event."
+msgstr "Usted no asistirá a este evento."
+
+#. TRANS: Possible status for RSVP ("please respond") item.
+msgid "You might attend this event."
+msgstr "Usted puede asistir a este evento."
+
+#. TRANS: Button text to cancel responding to an RSVP ("please respond") item.
+msgctxt "BUTTON"
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. TRANS: Title for RSVP ("please respond") action.
+msgctxt "TITLE"
+msgid "New RSVP"
+msgstr "Nuevo RSVP"
+
+#. TRANS: Client exception thrown when trying to RSVP ("please respond") while not logged in.
+#. TRANS: Client exception thrown when trying tp RSVP ("please respond") while not logged in.
+msgid "You must be logged in to RSVP for an event."
+msgstr "Debe iniciar sesión para ver un evento RSVP."
+
+#. TRANS: Client exception thrown when using an invalid value for RSVP ("please respond").
+msgid "Unknown submit value."
+msgstr "Valor desconocido enviado."
+
+#. TRANS: Page title after creating an event.
+#. TRANS: Page title after sending a notice.
+msgid "Event saved"
+msgstr "Evento registrado"
+
+#. TRANS: Title for RSVP ("please respond") action.
+msgctxt "TITLE"
+msgid "Cancel RSVP"
+msgstr "Cancelar RSVP"
+
+#. TRANS: Content for a deleted RSVP list item (RSVP stands for "please respond").
+msgid "Deleted."
+msgstr "Borrado."
+
+#. TRANS: Field label on form to RSVP ("please respond") for an event.
+msgid "RSVP:"
+msgstr "RSVP:"
+
+#. TRANS: Button text for RSVP ("please respond") reply to confirm attendence.
+msgctxt "BUTTON"
+msgid "Yes"
+msgstr "Sí"
+
+#. TRANS: Button text for RSVP ("please respond") reply to deny attendence.
+msgctxt "BUTTON"
+msgid "No"
+msgstr "No"
+
+#. TRANS: Button text for RSVP ("please respond") reply to indicate one might attend.
+msgctxt "BUTTON"
+msgid "Maybe"
+msgstr "Quizás"
+
+#. TRANS: Field label on event form.
+msgctxt "LABEL"
+msgid "Title"
+msgstr "Título"
+
+#. TRANS: Field title on event form.
+msgid "Title of the event."
+msgstr "Título del evento."
+
+#. TRANS: Field label on event form.
+msgctxt "LABEL"
+msgid "Start date"
+msgstr "Fecha de inicio"
+
+#. TRANS: Field title on event form.
+msgid "Date the event starts."
+msgstr "Fecha de inicio del evento"
+
+#. TRANS: Field label on event form.
+msgctxt "LABEL"
+msgid "Start time"
+msgstr "Hora de inicio"
+
+#. TRANS: Field title on event form. %s is the abbreviated timezone
+#, php-format
+msgid "Time the event starts (%s)."
+msgstr "El evento empieza a las (%s)."
+
+#. TRANS: Field label on event form.
+msgctxt "LABEL"
+msgid "End date"
+msgstr "Fecha de finalización"
+
+#. TRANS: Field title on event form.
+msgid "Date the event ends."
+msgstr "Fecha de fin del evento"
+
+#. TRANS: Field label on event form.
+msgctxt "LABEL"
+msgid "End time"
+msgstr "Hora de fin"
+
+#. TRANS: Field title on event form.
+msgid "Time the event ends."
+msgstr "Hora de fin del evento"
+
+#. TRANS: Field label on event form.
+msgctxt "LABEL"
+msgid "Where?"
+msgstr "¿Dónde?"
+
+#. TRANS: Field title on event form.
+msgid "Event location."
+msgstr "Lugar del evento"
+
+#. TRANS: Field label on event form.
+msgctxt "LABEL"
+msgid "URL"
+msgstr "URL"
+
+#. TRANS: Field title on event form.
+msgid "URL for more information."
+msgstr "Dirección URL para más información"
+
+#. TRANS: Field label on event form.
+msgctxt "LABEL"
+msgid "Description"
+msgstr "Descripción"
+
+#. TRANS: Field title on event form.
+msgid "Description of the event."
+msgstr "Descripción del evento"
+
+#. TRANS: Button text to save an event..
+msgctxt "BUTTON"
+msgid "Save"
+msgstr "Guardar"
+
+#. TRANS: Plugin description.
+msgid "Event invitations and RSVPs."
+msgstr "Invitaciones al evento y RSVP."
+
+#. TRANS: Title for event application.
+msgctxt "TITLE"
+msgid "Event"
+msgstr "Evento"
+
+#. TRANS: Exception thrown when there are too many activity objects.
+msgid "Too many activity objects."
+msgstr "Demasiados objetos de actividad"
+
+#. TRANS: Exception thrown when event plugin comes across a non-event type object.
+msgid "Wrong type for object."
+msgstr "Tipo de objeto erróneo"
+
+#. TRANS: Exception thrown when trying to RSVP for an unknown event.
+msgid "RSVP for unknown event."
+msgstr "RSVP para evento desconocido."
+
+#. TRANS: Exception thrown when event plugin comes across a undefined verb.
+msgid "Unknown verb for events."
+msgstr "Verbo desconocido para los eventos."
+
+#. TRANS: Exception thrown when event plugin comes across a unknown object type.
+msgid "Unknown object type."
+msgstr "Tipo de objeto desconocido."
+
+#. TRANS: Exception thrown when referring to a notice that is not an event an in event context.
+msgid "Unknown event notice."
+msgstr "Aviso de evento desconocido."
+
+#. TRANS: Client exception thrown when trying to save an already existing RSVP ("please respond").
+msgid "RSVP already exists."
+msgstr "RSVP ya existe."
+
+#. TRANS: Exception thrown when requesting an undefined verb for RSVP.
+#, php-format
+msgid "Unknown verb \"%s\"."
+msgstr "Verbo \"%s\" desconocido."
+
+#. TRANS: Exception thrown when requesting an undefined code for RSVP.
+#, php-format
+msgid "Unknown code \"%s\"."
+msgstr "Código \"%s\" desconocido."
+
+#. TRANS: Server exception thrown when requesting a non-exsting notice for an RSVP ("please respond").
+#. TRANS: %s is the RSVP with the missing notice.
+#, php-format
+msgid "RSVP %s does not correspond to a notice in the database."
+msgstr "RSVP %s no se corresponde con un aviso en la base de datos."
+
+#. TRANS: Exception thrown when requesting a non-existing profile.
+#. TRANS: %s is the ID of the non-existing profile.
+#, php-format
+msgid "No profile with ID %s."
+msgstr "Ningún perfil con el ID %s."
+
+#. TRANS: Exception thrown when requesting a non-existing event.
+#. TRANS: %s is the ID of the non-existing event.
+#, php-format
+msgid "No event with ID %s."
+msgstr "Ningún evento con el ID %s."
+
+#. TRANS: HTML version of an RSVP ("please respond") status for a user.
+#. TRANS: %1$s is a profile URL, %2$s a profile name,
+#. TRANS: %3$s is an event URL, %4$s an event title.
+#, php-format
+msgid ""
+"<span class='automatic event-rsvp'><a href='%1$s'>%2$s</a> is attending <a "
+"href='%3$s'>%4$s</a>.</span>"
+msgstr ""
+"<span class='automatic event-rsvp'><a href='%1$s'>%2$s</a> está asistiendo a "
+"<a href='%3$s'>%4$s</a>.</span>"
+
+#. TRANS: HTML version of an RSVP ("please respond") status for a user.
+#. TRANS: %1$s is a profile URL, %2$s a profile name,
+#. TRANS: %3$s is an event URL, %4$s an event title.
+#, php-format
+msgid ""
+"<span class='automatic event-rsvp'><a href='%1$s'>%2$s</a> is not attending "
+"<a href='%3$s'>%4$s</a>.</span>"
+msgstr ""
+"<span class='automatic event-rsvp'><a href='%1$s'>%2$s</a> no asiste a <a "
+"href='%3$s'>%4$s</a>.</span>"
+
+#. TRANS: HTML version of an RSVP ("please respond") status for a user.
+#. TRANS: %1$s is a profile URL, %2$s a profile name,
+#. TRANS: %3$s is an event URL, %4$s an event title.
+#, php-format
+msgid ""
+"<span class='automatic event-rsvp'><a href='%1$s'>%2$s</a> might attend <a "
+"href='%3$s'>%4$s</a>.</span>"
+msgstr ""
+"<span class='automatic event-rsvp'><a href='%1$s'>%2$s</a> quizás asista a "
+"<a href='%3$s'>%4$s</a>.</span>"
+
+#. TRANS: Exception thrown when requesting a user's RSVP status for a non-existing response code.
+#. TRANS: %s is the non-existing response code.
+#, php-format
+msgid "Unknown response code %s."
+msgstr "Código de respuesta desconocido %s."
+
+#. TRANS: Used as event title when not event title is available.
+#. TRANS: Used as: Username [is [not ] attending|might attend] an unknown event.
+msgid "an unknown event"
+msgstr "un evento desconocido"
+
+#. TRANS: Plain text version of an RSVP ("please respond") status for a user.
+#. TRANS: %1$s is a profile name, %2$s is an event title.
+#, php-format
+msgid "%1$s is attending %2$s."
+msgstr "%1$s asiste a %2$s."
+
+#. TRANS: Plain text version of an RSVP ("please respond") status for a user.
+#. TRANS: %1$s is a profile name, %2$s is an event title.
+#, php-format
+msgid "%1$s is not attending %2$s."
+msgstr "%1$s no asiste a %2$s."
+
+#. TRANS: Plain text version of an RSVP ("please respond") status for a user.
+#. TRANS: %1$s is a profile name, %2$s is an event title.
+#, php-format
+msgid "%1$s might attend %2$s."
+msgstr "%1$s podría asistir a  %2$s ."
+
+#. TRANS: Title for new event form.
+msgctxt "TITLE"
+msgid "New event"
+msgstr "Nuevo evento"
+
+#. TRANS: Client exception thrown when trying to post an event while not logged in.
+msgid "Must be logged in to post a event."
+msgstr "Debe estar conectado para poder publicar un evento"
+
+#. TRANS: Client exception thrown when trying to post an event without providing a title.
+msgid "Title required."
+msgstr "Título requerido"
+
+#. TRANS: Client exception thrown when trying to post an event without providing a start date.
+msgid "Start date required."
+msgstr "Fecha de inicio requerida"
+
+#. TRANS: Client exception thrown when trying to post an event without providing an end date.
+msgid "End date required."
+msgstr "Fecha de término requerida"
+
+#. TRANS: Client exception thrown when trying to post an event with a date that cannot be processed.
+#. TRANS: %s is the data that could not be processed.
+#, php-format
+msgid "Could not parse date \"%s\"."
+msgstr "No fue posible analizar la fecha \"%s\""
+
+#. TRANS: Client exception thrown when trying to post an event without providing a title.
+msgid "Event must have a title."
+msgstr "El evento debe tener un título"
+
+#. TRANS: Client exception thrown when trying to post an event without providing a start time.
+msgid "Event must have a start time."
+msgstr "El evento debe tener hora de inicio"
+
+#. TRANS: Client exception thrown when trying to post an event without providing an end time.
+msgid "Event must have an end time."
+msgstr "El evento debe tener hora de término"
+
+#. TRANS: Client exception thrown when trying to post an event with an invalid URL.
+msgid "URL must be valid."
+msgstr "La dirección URL debe ser válida"
+
+#. TRANS: Field label for event description.
+msgid "Time:"
+msgstr "Hora:"
+
+#. TRANS: Field label for event description.
+msgid "Location:"
+msgstr "Lugar:"
+
+#. TRANS: Field label for event description.
+msgid "Description:"
+msgstr "Descripción:"
diff --git a/plugins/Event/locale/eu/LC_MESSAGES/Event.po b/plugins/Event/locale/eu/LC_MESSAGES/Event.po
new file mode 100644
index 0000000000..81610024f4
--- /dev/null
+++ b/plugins/Event/locale/eu/LC_MESSAGES/Event.po
@@ -0,0 +1,420 @@
+# Translation of StatusNet - Event to Basque (euskara)
+# Exported from translatewiki.net
+#
+# Author: Artsuaga
+# Author: Xabier Armendaritz
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Event\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:28+0000\n"
+"Language-Team: Basque <https://translatewiki.net/wiki/Portal:eu>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2012-01-02 10:11:52+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: eu\n"
+"X-Message-Group: #out-statusnet-plugin-event\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: 0 minutes abbreviated. Used in a list.
+msgid "(0 min)"
+msgstr "(0 min)"
+
+#. TRANS: 30 minutes abbreviated. Used in a list.
+msgid "(30 min)"
+msgstr "(30 min)"
+
+#. TRANS: 1 hour. Used in a list.
+msgid "(1 hour)"
+msgstr "(ordubete)"
+
+#, php-format
+msgid "(%.1f hours)"
+msgstr "(%.1f ordu)"
+
+#, php-format
+msgid "(%d hours)"
+msgstr "(%d ordu)"
+
+#. TRANS: Client exception thrown when trying to create an event that already exists.
+msgid "Event already exists."
+msgstr "Ekitaldea exisititzen da jada."
+
+#. TRANS: Event description. %1$s is a title, %2$s is start time, %3$s is end time,
+#. TRANS: %4$s is location, %5$s is a description.
+#, php-format
+msgid "\"%1$s\" %2$s - %3$s (%4$s): %5$s"
+msgstr "\"%1$s\" %2$s - %3$s (%4$s): %5$s"
+
+#. TRANS: Rendered event description. %1$s is a title, %2$s is start time, %3$s is start time,
+#. TRANS: %4$s is end time, %5$s is end time, %6$s is location, %7$s is description.
+#. TRANS: Class names should not be translated.
+#, php-format
+msgid ""
+"<span class=\"vevent\"><span class=\"summary\">%1$s</span> <abbr class="
+"\"dtstart\" title=\"%2$s\">%3$s</a> - <abbr class=\"dtend\" title=\"%4$s\">%5"
+"$s</a> (<span class=\"location\">%6$s</span>): <span class=\"description\">%7"
+"$s</span> </span>"
+msgstr ""
+"<span class=\"vevent\"><span class=\"summary\">%1$s</span> <abbr class="
+"\"dtstart\" title=\"%2$s\">%3$s</a> - <abbr class=\"dtend\" title=\"%4$s\">%5"
+"$s</a> (<span class=\"location\">%6$s</span>): <span class=\"description\">%7"
+"$s</span> </span>"
+
+#. TRANS: Error message displayed when trying to perform an action that requires a logged in user.
+msgid "Not logged in."
+msgstr "Saioa hasi gabe."
+
+#. TRANS: Client error when submitting a form with unexpected information.
+msgid "Unexpected form submission."
+msgstr "Ustekabeko inprimaki bidalketa."
+
+#. TRANS: Client error displayed when using an action in a non-AJAX way.
+msgid "This action is AJAX only."
+msgstr "Ekintza hau AJAX bidez egin liteke soilik."
+
+#. TRANS: Client exception thrown when referring to a non-existing RSVP.
+#. TRANS: RSVP stands for "Please reply".
+#. TRANS: Client exception thrown when referring to a non-existing RSVP ("please respond") item.
+msgid "No such RSVP."
+msgstr "Ez horrelako RSVPrik."
+
+#. TRANS: Client exception thrown when referring to a non-existing event.
+msgid "No such event."
+msgstr "Ez dago ekitaldi hori."
+
+#. TRANS: Title for event.
+#. TRANS: %1$s is a user nickname, %2$s is an event title.
+#, php-format
+msgid "%1$s's RSVP for \"%2$s\""
+msgstr "%1$s(r)en RSVP \"%2$s(r)entzako\""
+
+#. TRANS: Possible status for RSVP ("please respond") item.
+msgid "You will attend this event."
+msgstr "Ekitaldi hontara joango zara."
+
+#. TRANS: Possible status for RSVP ("please respond") item.
+msgid "You will not attend this event."
+msgstr "Ez zara ekitaldi hontara joango."
+
+#. TRANS: Possible status for RSVP ("please respond") item.
+msgid "You might attend this event."
+msgstr "Ekitaldi hontara joan beharko zenuke."
+
+#. TRANS: Button text to cancel responding to an RSVP ("please respond") item.
+msgctxt "BUTTON"
+msgid "Cancel"
+msgstr "Utzi"
+
+#. TRANS: Title for RSVP ("please respond") action.
+msgctxt "TITLE"
+msgid "New RSVP"
+msgstr "RSVP berria"
+
+#. TRANS: Client exception thrown when trying to RSVP ("please respond") while not logged in.
+#. TRANS: Client exception thrown when trying tp RSVP ("please respond") while not logged in.
+msgid "You must be logged in to RSVP for an event."
+msgstr "Ekitaldi baten RSVP eskatzeko saioa hasi behar duzu."
+
+#. TRANS: Client exception thrown when using an invalid value for RSVP ("please respond").
+msgid "Unknown submit value."
+msgstr "Bidalitako balio ezezaguna."
+
+#. TRANS: Page title after creating an event.
+#. TRANS: Page title after sending a notice.
+msgid "Event saved"
+msgstr "Ekitaldia gorderik"
+
+#. TRANS: Title for RSVP ("please respond") action.
+msgctxt "TITLE"
+msgid "Cancel RSVP"
+msgstr "Utzi RSVP"
+
+#. TRANS: Content for a deleted RSVP list item (RSVP stands for "please respond").
+msgid "Deleted."
+msgstr "Ezabaturik."
+
+#. TRANS: Field label on form to RSVP ("please respond") for an event.
+msgid "RSVP:"
+msgstr "RSVP:"
+
+#. TRANS: Button text for RSVP ("please respond") reply to confirm attendence.
+msgctxt "BUTTON"
+msgid "Yes"
+msgstr "Bai"
+
+#. TRANS: Button text for RSVP ("please respond") reply to deny attendence.
+msgctxt "BUTTON"
+msgid "No"
+msgstr "Ez"
+
+#. TRANS: Button text for RSVP ("please respond") reply to indicate one might attend.
+msgctxt "BUTTON"
+msgid "Maybe"
+msgstr "Agian"
+
+#. TRANS: Field label on event form.
+msgctxt "LABEL"
+msgid "Title"
+msgstr "Titulua"
+
+#. TRANS: Field title on event form.
+msgid "Title of the event."
+msgstr "Ekitaldiaren titulua."
+
+#. TRANS: Field label on event form.
+msgctxt "LABEL"
+msgid "Start date"
+msgstr "Hasera data"
+
+#. TRANS: Field title on event form.
+msgid "Date the event starts."
+msgstr "Ekitaldia hasten den data."
+
+#. TRANS: Field label on event form.
+msgctxt "LABEL"
+msgid "Start time"
+msgstr "Hasera ordua"
+
+#. TRANS: Field title on event form. %s is the abbreviated timezone
+#, php-format
+msgid "Time the event starts (%s)."
+msgstr "Ekitaldi hau hasten den ordua (%s)."
+
+#. TRANS: Field label on event form.
+msgctxt "LABEL"
+msgid "End date"
+msgstr "Amaiera data"
+
+#. TRANS: Field title on event form.
+msgid "Date the event ends."
+msgstr "Ekitaldia amaitzen den data."
+
+#. TRANS: Field label on event form.
+msgctxt "LABEL"
+msgid "End time"
+msgstr "Amaiera ordua"
+
+#. TRANS: Field title on event form.
+msgid "Time the event ends."
+msgstr "Ekitaldia amaitzen den ordua."
+
+#. TRANS: Field label on event form.
+msgctxt "LABEL"
+msgid "Where?"
+msgstr "Non?"
+
+#. TRANS: Field title on event form.
+msgid "Event location."
+msgstr "Ekitaldiaren kokapena."
+
+#. TRANS: Field label on event form.
+msgctxt "LABEL"
+msgid "URL"
+msgstr "URL"
+
+#. TRANS: Field title on event form.
+msgid "URL for more information."
+msgstr "Informazio gehiagorako URLa."
+
+#. TRANS: Field label on event form.
+msgctxt "LABEL"
+msgid "Description"
+msgstr "Deskribapena"
+
+#. TRANS: Field title on event form.
+msgid "Description of the event."
+msgstr "Ekitaldiaren deskribapena."
+
+#. TRANS: Button text to save an event..
+msgctxt "BUTTON"
+msgid "Save"
+msgstr "Gorde"
+
+#. TRANS: Plugin description.
+msgid "Event invitations and RSVPs."
+msgstr "Ekitaldi gonbidapenak eta RSVPak."
+
+#. TRANS: Title for event application.
+msgctxt "TITLE"
+msgid "Event"
+msgstr "Ekitaldia"
+
+#. TRANS: Exception thrown when there are too many activity objects.
+msgid "Too many activity objects."
+msgstr "Ekitnza objetu gehiegi."
+
+#. TRANS: Exception thrown when event plugin comes across a non-event type object.
+msgid "Wrong type for object."
+msgstr "Objetu mota okerra."
+
+#. TRANS: Exception thrown when trying to RSVP for an unknown event.
+msgid "RSVP for unknown event."
+msgstr "Ekitaldi ezezagunerako RSVP."
+
+#. TRANS: Exception thrown when event plugin comes across a undefined verb.
+msgid "Unknown verb for events."
+msgstr "Ekitaldientzako aditz ezezaguna."
+
+#. TRANS: Exception thrown when event plugin comes across a unknown object type.
+msgid "Unknown object type."
+msgstr "Objetu mota ezezaguna."
+
+#. TRANS: Exception thrown when referring to a notice that is not an event an in event context.
+msgid "Unknown event notice."
+msgstr "Ekitaldi ohar ezezaguna."
+
+#. TRANS: Client exception thrown when trying to save an already existing RSVP ("please respond").
+msgid "RSVP already exists."
+msgstr "RSVPa existizen da dagoeneko."
+
+#. TRANS: Exception thrown when requesting an undefined verb for RSVP.
+#, php-format
+msgid "Unknown verb \"%s\"."
+msgstr "\"%s\" aditz ezezaguna."
+
+#. TRANS: Exception thrown when requesting an undefined code for RSVP.
+#, php-format
+msgid "Unknown code \"%s\"."
+msgstr "\"%s\" kode ezezaguna."
+
+#. TRANS: Server exception thrown when requesting a non-exsting notice for an RSVP ("please respond").
+#. TRANS: %s is the RSVP with the missing notice.
+#, php-format
+msgid "RSVP %s does not correspond to a notice in the database."
+msgstr "%s RSVPak ez dator bat datubaseko ohar batekin."
+
+#. TRANS: Exception thrown when requesting a non-existing profile.
+#. TRANS: %s is the ID of the non-existing profile.
+#, php-format
+msgid "No profile with ID %s."
+msgstr "%s IDarekin profilik ez dago."
+
+#. TRANS: Exception thrown when requesting a non-existing event.
+#. TRANS: %s is the ID of the non-existing event.
+#, php-format
+msgid "No event with ID %s."
+msgstr "%s IDarekin ekitaldirik ez."
+
+#. TRANS: HTML version of an RSVP ("please respond") status for a user.
+#. TRANS: %1$s is a profile URL, %2$s a profile name,
+#. TRANS: %3$s is an event URL, %4$s an event title.
+#, php-format
+msgid ""
+"<span class='automatic event-rsvp'><a href='%1$s'>%2$s</a> is attending <a "
+"href='%3$s'>%4$s</a>.</span>"
+msgstr ""
+"<span class='automatic event-rsvp'><a href='%1$s'>%2$s</a> <a href='%3$s'>%4"
+"$s</a>(e)ra joango da.</span>"
+
+#. TRANS: HTML version of an RSVP ("please respond") status for a user.
+#. TRANS: %1$s is a profile URL, %2$s a profile name,
+#. TRANS: %3$s is an event URL, %4$s an event title.
+#, php-format
+msgid ""
+"<span class='automatic event-rsvp'><a href='%1$s'>%2$s</a> is not attending "
+"<a href='%3$s'>%4$s</a>.</span>"
+msgstr ""
+"<span class='automatic event-rsvp'><a href='%1$s'>%2$s</a> ez da <a href='%3"
+"$s'>%4$s</a>(e)ra joango.</span>"
+
+#. TRANS: HTML version of an RSVP ("please respond") status for a user.
+#. TRANS: %1$s is a profile URL, %2$s a profile name,
+#. TRANS: %3$s is an event URL, %4$s an event title.
+#, php-format
+msgid ""
+"<span class='automatic event-rsvp'><a href='%1$s'>%2$s</a> might attend <a "
+"href='%3$s'>%4$s</a>.</span>"
+msgstr ""
+"<span class='automatic event-rsvp'><a href='%1$s'>%2$s</a> <a href='%3$s'>%4"
+"$s</a>(e)ra joango da agian.</span>"
+
+#. TRANS: Exception thrown when requesting a user's RSVP status for a non-existing response code.
+#. TRANS: %s is the non-existing response code.
+#, php-format
+msgid "Unknown response code %s."
+msgstr "%s erantzun kode ezezaguna."
+
+#. TRANS: Used as event title when not event title is available.
+#. TRANS: Used as: Username [is [not ] attending|might attend] an unknown event.
+msgid "an unknown event"
+msgstr "ekitaldi ezezagun bat"
+
+#. TRANS: Plain text version of an RSVP ("please respond") status for a user.
+#. TRANS: %1$s is a profile name, %2$s is an event title.
+#, php-format
+msgid "%1$s is attending %2$s."
+msgstr "%1$s %2$s(e)ra joango da."
+
+#. TRANS: Plain text version of an RSVP ("please respond") status for a user.
+#. TRANS: %1$s is a profile name, %2$s is an event title.
+#, php-format
+msgid "%1$s is not attending %2$s."
+msgstr "%1$s ez da %2$s(e)ra joango."
+
+#. TRANS: Plain text version of an RSVP ("please respond") status for a user.
+#. TRANS: %1$s is a profile name, %2$s is an event title.
+#, php-format
+msgid "%1$s might attend %2$s."
+msgstr "%1$s %2$s(e)ra joango da agian."
+
+#. TRANS: Title for new event form.
+msgctxt "TITLE"
+msgid "New event"
+msgstr "Ekitaldi berria"
+
+#. TRANS: Client exception thrown when trying to post an event while not logged in.
+msgid "Must be logged in to post a event."
+msgstr "Saioa hasi behar duzu ekitaldi bat bidaltzeko."
+
+#. TRANS: Client exception thrown when trying to post an event without providing a title.
+msgid "Title required."
+msgstr "Titulua beharrezkoa."
+
+#. TRANS: Client exception thrown when trying to post an event without providing a start date.
+msgid "Start date required."
+msgstr "Hasera data beharrezkoa."
+
+#. TRANS: Client exception thrown when trying to post an event without providing an end date.
+msgid "End date required."
+msgstr "Bukaera data beharrezkoa."
+
+#. TRANS: Client exception thrown when trying to post an event with a date that cannot be processed.
+#. TRANS: %s is the data that could not be processed.
+#, php-format
+msgid "Could not parse date \"%s\"."
+msgstr "Ezin izan da \"%s\" data arakatu."
+
+#. TRANS: Client exception thrown when trying to post an event without providing a title.
+msgid "Event must have a title."
+msgstr "Ekitaldiak titulu bat behar du."
+
+#. TRANS: Client exception thrown when trying to post an event without providing a start time.
+msgid "Event must have a start time."
+msgstr "Ekitaldiak hasera ordu bat behar du."
+
+#. TRANS: Client exception thrown when trying to post an event without providing an end time.
+msgid "Event must have an end time."
+msgstr "Ekitaldiak amaiera ordu bat behar du."
+
+#. TRANS: Client exception thrown when trying to post an event with an invalid URL.
+msgid "URL must be valid."
+msgstr "URLak baliozkoa izan behar du."
+
+#. TRANS: Field label for event description.
+msgid "Time:"
+msgstr "Ordua:"
+
+#. TRANS: Field label for event description.
+msgid "Location:"
+msgstr "Kokapena:"
+
+#. TRANS: Field label for event description.
+msgid "Description:"
+msgstr "Deskribapena:"
diff --git a/plugins/Event/locale/fr/LC_MESSAGES/Event.po b/plugins/Event/locale/fr/LC_MESSAGES/Event.po
index 4716615705..e88a61059a 100644
--- a/plugins/Event/locale/fr/LC_MESSAGES/Event.po
+++ b/plugins/Event/locale/fr/LC_MESSAGES/Event.po
@@ -1,9 +1,14 @@
-# Translation of StatusNet - Event to French (Français)
+# Translation of StatusNet - Event to French (français)
 # Exported from translatewiki.net
 #
 # Author: Brunoperel
+# Author: Crochet.david
+# Author: Gomoko
 # Author: Iketsi
+# Author: Lucky
 # Author: Od1n
+# Author: Valeryan 24
+# Author: Verdy p
 # --
 # This file is distributed under the same license as the StatusNet package.
 #
@@ -11,18 +16,38 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Event\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:20+0000\n"
-"Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:28+0000\n"
+"Language-Team: French <https://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:26:39+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2012-01-02 10:11:52+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-event\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#. TRANS: 0 minutes abbreviated. Used in a list.
+msgid "(0 min)"
+msgstr "(0 min)"
+
+#. TRANS: 30 minutes abbreviated. Used in a list.
+msgid "(30 min)"
+msgstr "(30 min)"
+
+#. TRANS: 1 hour. Used in a list.
+msgid "(1 hour)"
+msgstr "(1 heure)"
+
+#, php-format
+msgid "(%.1f hours)"
+msgstr "(%.1f heures)"
+
+#, php-format
+msgid "(%d hours)"
+msgstr "(%d heures)"
+
 #. TRANS: Client exception thrown when trying to create an event that already exists.
 msgid "Event already exists."
 msgstr "Cet événement existe déjà."
@@ -48,14 +73,24 @@ msgstr ""
 "$s</a> (<span class=\"location\">%6$s</span>): <span class=\"description\">%7"
 "$s</span> </span>"
 
+#. TRANS: Error message displayed when trying to perform an action that requires a logged in user.
+msgid "Not logged in."
+msgstr "Vous n'êtes pas connecté"
+
+#. TRANS: Client error when submitting a form with unexpected information.
+msgid "Unexpected form submission."
+msgstr "Soumission de formulaire inattendue."
+
+#. TRANS: Client error displayed when using an action in a non-AJAX way.
+msgid "This action is AJAX only."
+msgstr "Cette action est uniquement en AJAX."
+
 #. TRANS: Client exception thrown when referring to a non-existing RSVP.
 #. TRANS: RSVP stands for "Please reply".
 #. TRANS: Client exception thrown when referring to a non-existing RSVP ("please respond") item.
 msgid "No such RSVP."
 msgstr "RSVP introuvable."
 
-#. TRANS: Client exception thrown when referring to a non-existing event.
-#. TRANS: Client exception thrown when requesting a non-exsting event.
 #. TRANS: Client exception thrown when referring to a non-existing event.
 msgid "No such event."
 msgstr "Evénement introuvable."
@@ -151,11 +186,12 @@ msgstr "Date de début de l'événement."
 #. TRANS: Field label on event form.
 msgctxt "LABEL"
 msgid "Start time"
-msgstr "Heure de départ"
+msgstr "Heure de début"
 
-#. TRANS: Field title on event form.
-msgid "Time the event starts."
-msgstr "Heure de début de l'événement."
+#. TRANS: Field title on event form. %s is the abbreviated timezone
+#, php-format
+msgid "Time the event starts (%s)."
+msgstr "Heure de début de l'événement (%s)."
 
 #. TRANS: Field label on event form.
 msgctxt "LABEL"
@@ -177,8 +213,8 @@ msgstr "Heure de fin de l'événement."
 
 #. TRANS: Field label on event form.
 msgctxt "LABEL"
-msgid "Location"
-msgstr "Emplacement"
+msgid "Where?"
+msgstr "Où ?"
 
 #. TRANS: Field title on event form.
 msgid "Event location."
@@ -214,7 +250,7 @@ msgstr "Invitations aux événements et RSVP."
 #. TRANS: Title for event application.
 msgctxt "TITLE"
 msgid "Event"
-msgstr "Evénement"
+msgstr "Évènement"
 
 #. TRANS: Exception thrown when there are too many activity objects.
 msgid "Too many activity objects."
@@ -258,7 +294,7 @@ msgstr "Code « %s » inconnu."
 #. TRANS: %s is the RSVP with the missing notice.
 #, php-format
 msgid "RSVP %s does not correspond to a notice in the database."
-msgstr ""
+msgstr "RSVP %s ne correspond pas à un avis dans la base de données."
 
 #. TRANS: Exception thrown when requesting a non-existing profile.
 #. TRANS: %s is the ID of the non-existing profile.
@@ -373,9 +409,13 @@ msgstr "L'événement doit avoir une heure de début."
 msgid "Event must have an end time."
 msgstr "L'événement doit avoir une heure de fin."
 
+#. TRANS: Client exception thrown when trying to post an event with an invalid URL.
+msgid "URL must be valid."
+msgstr "L’URL doit être valide."
+
 #. TRANS: Field label for event description.
 msgid "Time:"
-msgstr "Heure:"
+msgstr "Heure :"
 
 #. TRANS: Field label for event description.
 msgid "Location:"
@@ -384,13 +424,3 @@ msgstr "Lieu :"
 #. TRANS: Field label for event description.
 msgid "Description:"
 msgstr "Description :"
-
-#. TRANS: Field label for event description.
-msgid "Attending:"
-msgstr "Participants :"
-
-#. TRANS: RSVP counts.
-#. TRANS: %1$d, %2$d and %3$d are numbers of RSVPs.
-#, php-format
-msgid "Yes: %1$d No: %2$d Maybe: %3$d"
-msgstr "Oui : %1$d Non : %2$d Peut-être : %3$d"
diff --git a/plugins/Event/locale/gl/LC_MESSAGES/Event.po b/plugins/Event/locale/gl/LC_MESSAGES/Event.po
new file mode 100644
index 0000000000..9de8855e42
--- /dev/null
+++ b/plugins/Event/locale/gl/LC_MESSAGES/Event.po
@@ -0,0 +1,419 @@
+# Translation of StatusNet - Event to Galician (galego)
+# Exported from translatewiki.net
+#
+# Author: Toliño
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Event\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:28+0000\n"
+"Language-Team: Galician <https://translatewiki.net/wiki/Portal:gl>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2012-01-02 10:11:52+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: gl\n"
+"X-Message-Group: #out-statusnet-plugin-event\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: 0 minutes abbreviated. Used in a list.
+msgid "(0 min)"
+msgstr "(0 min)"
+
+#. TRANS: 30 minutes abbreviated. Used in a list.
+msgid "(30 min)"
+msgstr "(30 min)"
+
+#. TRANS: 1 hour. Used in a list.
+msgid "(1 hour)"
+msgstr "(1 hora)"
+
+#, php-format
+msgid "(%.1f hours)"
+msgstr "(%.1f horas)"
+
+#, php-format
+msgid "(%d hours)"
+msgstr "(%d horas)"
+
+#. TRANS: Client exception thrown when trying to create an event that already exists.
+msgid "Event already exists."
+msgstr "O evento xa existe."
+
+#. TRANS: Event description. %1$s is a title, %2$s is start time, %3$s is end time,
+#. TRANS: %4$s is location, %5$s is a description.
+#, php-format
+msgid "\"%1$s\" %2$s - %3$s (%4$s): %5$s"
+msgstr "\"%1$s\" %2$s - %3$s (%4$s): %5$s"
+
+#. TRANS: Rendered event description. %1$s is a title, %2$s is start time, %3$s is start time,
+#. TRANS: %4$s is end time, %5$s is end time, %6$s is location, %7$s is description.
+#. TRANS: Class names should not be translated.
+#, php-format
+msgid ""
+"<span class=\"vevent\"><span class=\"summary\">%1$s</span> <abbr class="
+"\"dtstart\" title=\"%2$s\">%3$s</a> - <abbr class=\"dtend\" title=\"%4$s\">%5"
+"$s</a> (<span class=\"location\">%6$s</span>): <span class=\"description\">%7"
+"$s</span> </span>"
+msgstr ""
+"<span class=\"vevent\"><span class=\"summary\">%1$s</span> <abbr class="
+"\"dtstart\" title=\"%2$s\">%3$s</a> - <abbr class=\"dtend\" title=\"%4$s\">%5"
+"$s</a> (<span class=\"location\">%6$s</span>): <span class=\"description\">%7"
+"$s</span> </span>"
+
+#. TRANS: Error message displayed when trying to perform an action that requires a logged in user.
+msgid "Not logged in."
+msgstr "Non iniciou sesión."
+
+#. TRANS: Client error when submitting a form with unexpected information.
+msgid "Unexpected form submission."
+msgstr "Envío de formulario inesperado."
+
+#. TRANS: Client error displayed when using an action in a non-AJAX way.
+msgid "This action is AJAX only."
+msgstr "Esta acción unicamente se pode executar con AJAX."
+
+#. TRANS: Client exception thrown when referring to a non-existing RSVP.
+#. TRANS: RSVP stands for "Please reply".
+#. TRANS: Client exception thrown when referring to a non-existing RSVP ("please respond") item.
+msgid "No such RSVP."
+msgstr "Non existe ese RSPV."
+
+#. TRANS: Client exception thrown when referring to a non-existing event.
+msgid "No such event."
+msgstr "Non existe ese evento."
+
+#. TRANS: Title for event.
+#. TRANS: %1$s is a user nickname, %2$s is an event title.
+#, php-format
+msgid "%1$s's RSVP for \"%2$s\""
+msgstr "RSPV de %1$s en \"%2$s\""
+
+#. TRANS: Possible status for RSVP ("please respond") item.
+msgid "You will attend this event."
+msgstr "Vai asistir a este evento."
+
+#. TRANS: Possible status for RSVP ("please respond") item.
+msgid "You will not attend this event."
+msgstr "Non vai asistir a este evento."
+
+#. TRANS: Possible status for RSVP ("please respond") item.
+msgid "You might attend this event."
+msgstr "Quizais asista a este evento."
+
+#. TRANS: Button text to cancel responding to an RSVP ("please respond") item.
+msgctxt "BUTTON"
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. TRANS: Title for RSVP ("please respond") action.
+msgctxt "TITLE"
+msgid "New RSVP"
+msgstr "Novo RSVP"
+
+#. TRANS: Client exception thrown when trying to RSVP ("please respond") while not logged in.
+#. TRANS: Client exception thrown when trying tp RSVP ("please respond") while not logged in.
+msgid "You must be logged in to RSVP for an event."
+msgstr "Debe acceder ao sistema para responder a un evento."
+
+#. TRANS: Client exception thrown when using an invalid value for RSVP ("please respond").
+msgid "Unknown submit value."
+msgstr "Valor de envío descoñecido."
+
+#. TRANS: Page title after creating an event.
+#. TRANS: Page title after sending a notice.
+msgid "Event saved"
+msgstr "Evento gardado"
+
+#. TRANS: Title for RSVP ("please respond") action.
+msgctxt "TITLE"
+msgid "Cancel RSVP"
+msgstr "Cancelar RSVP"
+
+#. TRANS: Content for a deleted RSVP list item (RSVP stands for "please respond").
+msgid "Deleted."
+msgstr "Borrado."
+
+#. TRANS: Field label on form to RSVP ("please respond") for an event.
+msgid "RSVP:"
+msgstr "RSVP:"
+
+#. TRANS: Button text for RSVP ("please respond") reply to confirm attendence.
+msgctxt "BUTTON"
+msgid "Yes"
+msgstr "Si"
+
+#. TRANS: Button text for RSVP ("please respond") reply to deny attendence.
+msgctxt "BUTTON"
+msgid "No"
+msgstr "Non"
+
+#. TRANS: Button text for RSVP ("please respond") reply to indicate one might attend.
+msgctxt "BUTTON"
+msgid "Maybe"
+msgstr "Quizais"
+
+#. TRANS: Field label on event form.
+msgctxt "LABEL"
+msgid "Title"
+msgstr "Título"
+
+#. TRANS: Field title on event form.
+msgid "Title of the event."
+msgstr "Título do evento."
+
+#. TRANS: Field label on event form.
+msgctxt "LABEL"
+msgid "Start date"
+msgstr "Data de inicio"
+
+#. TRANS: Field title on event form.
+msgid "Date the event starts."
+msgstr "Data na que comeza o evento."
+
+#. TRANS: Field label on event form.
+msgctxt "LABEL"
+msgid "Start time"
+msgstr "Hora de inicio"
+
+#. TRANS: Field title on event form. %s is the abbreviated timezone
+#, php-format
+msgid "Time the event starts (%s)."
+msgstr "Hora na que comeza o evento (%s)."
+
+#. TRANS: Field label on event form.
+msgctxt "LABEL"
+msgid "End date"
+msgstr "Data de fin"
+
+#. TRANS: Field title on event form.
+msgid "Date the event ends."
+msgstr "Data na que finaliza o evento."
+
+#. TRANS: Field label on event form.
+msgctxt "LABEL"
+msgid "End time"
+msgstr "Hora de fin"
+
+#. TRANS: Field title on event form.
+msgid "Time the event ends."
+msgstr "Hora na que finaliza o evento."
+
+#. TRANS: Field label on event form.
+msgctxt "LABEL"
+msgid "Where?"
+msgstr "Onde?"
+
+#. TRANS: Field title on event form.
+msgid "Event location."
+msgstr "Lugar do evento."
+
+#. TRANS: Field label on event form.
+msgctxt "LABEL"
+msgid "URL"
+msgstr "URL"
+
+#. TRANS: Field title on event form.
+msgid "URL for more information."
+msgstr "URL con máis información."
+
+#. TRANS: Field label on event form.
+msgctxt "LABEL"
+msgid "Description"
+msgstr "Descrición"
+
+#. TRANS: Field title on event form.
+msgid "Description of the event."
+msgstr "Descrición do evento."
+
+#. TRANS: Button text to save an event..
+msgctxt "BUTTON"
+msgid "Save"
+msgstr "Gardar"
+
+#. TRANS: Plugin description.
+msgid "Event invitations and RSVPs."
+msgstr "Invitacións aos eventos e RSVP."
+
+#. TRANS: Title for event application.
+msgctxt "TITLE"
+msgid "Event"
+msgstr "Evento"
+
+#. TRANS: Exception thrown when there are too many activity objects.
+msgid "Too many activity objects."
+msgstr "Demasiados obxectos de actividade."
+
+#. TRANS: Exception thrown when event plugin comes across a non-event type object.
+msgid "Wrong type for object."
+msgstr "Tipo incorrecto para o obxecto."
+
+#. TRANS: Exception thrown when trying to RSVP for an unknown event.
+msgid "RSVP for unknown event."
+msgstr "RSVP para un evento descoñecido."
+
+#. TRANS: Exception thrown when event plugin comes across a undefined verb.
+msgid "Unknown verb for events."
+msgstr "Verbo descoñecido para os eventos."
+
+#. TRANS: Exception thrown when event plugin comes across a unknown object type.
+msgid "Unknown object type."
+msgstr "Tipo de obxecto descoñecido."
+
+#. TRANS: Exception thrown when referring to a notice that is not an event an in event context.
+msgid "Unknown event notice."
+msgstr "Nota de evento descoñecida."
+
+#. TRANS: Client exception thrown when trying to save an already existing RSVP ("please respond").
+msgid "RSVP already exists."
+msgstr "RSVP xa existe."
+
+#. TRANS: Exception thrown when requesting an undefined verb for RSVP.
+#, php-format
+msgid "Unknown verb \"%s\"."
+msgstr "Descoñécese o verbo \"%s\"."
+
+#. TRANS: Exception thrown when requesting an undefined code for RSVP.
+#, php-format
+msgid "Unknown code \"%s\"."
+msgstr "Descoñécese o código \"%s\"."
+
+#. TRANS: Server exception thrown when requesting a non-exsting notice for an RSVP ("please respond").
+#. TRANS: %s is the RSVP with the missing notice.
+#, php-format
+msgid "RSVP %s does not correspond to a notice in the database."
+msgstr "RSVP %s non se corresponde con ningunha nota da base de datos."
+
+#. TRANS: Exception thrown when requesting a non-existing profile.
+#. TRANS: %s is the ID of the non-existing profile.
+#, php-format
+msgid "No profile with ID %s."
+msgstr "Non hai ningún perfil co ID %s."
+
+#. TRANS: Exception thrown when requesting a non-existing event.
+#. TRANS: %s is the ID of the non-existing event.
+#, php-format
+msgid "No event with ID %s."
+msgstr "Non hai ningún evento co ID %s."
+
+#. TRANS: HTML version of an RSVP ("please respond") status for a user.
+#. TRANS: %1$s is a profile URL, %2$s a profile name,
+#. TRANS: %3$s is an event URL, %4$s an event title.
+#, php-format
+msgid ""
+"<span class='automatic event-rsvp'><a href='%1$s'>%2$s</a> is attending <a "
+"href='%3$s'>%4$s</a>.</span>"
+msgstr ""
+"<span class='automatic event-rsvp'><a href='%1$s'>%2$s</a> asiste a <a "
+"href='%3$s'>%4$s</a>.</span>"
+
+#. TRANS: HTML version of an RSVP ("please respond") status for a user.
+#. TRANS: %1$s is a profile URL, %2$s a profile name,
+#. TRANS: %3$s is an event URL, %4$s an event title.
+#, php-format
+msgid ""
+"<span class='automatic event-rsvp'><a href='%1$s'>%2$s</a> is not attending "
+"<a href='%3$s'>%4$s</a>.</span>"
+msgstr ""
+"<span class='automatic event-rsvp'><a href='%1$s'>%2$s</a> non asiste a <a "
+"href='%3$s'>%4$s</a>.</span>"
+
+#. TRANS: HTML version of an RSVP ("please respond") status for a user.
+#. TRANS: %1$s is a profile URL, %2$s a profile name,
+#. TRANS: %3$s is an event URL, %4$s an event title.
+#, php-format
+msgid ""
+"<span class='automatic event-rsvp'><a href='%1$s'>%2$s</a> might attend <a "
+"href='%3$s'>%4$s</a>.</span>"
+msgstr ""
+"<span class='automatic event-rsvp'><a href='%1$s'>%2$s</a> quizais asista a "
+"<a href='%3$s'>%4$s</a>.</span>"
+
+#. TRANS: Exception thrown when requesting a user's RSVP status for a non-existing response code.
+#. TRANS: %s is the non-existing response code.
+#, php-format
+msgid "Unknown response code %s."
+msgstr "Descoñécese o código de resposta %s."
+
+#. TRANS: Used as event title when not event title is available.
+#. TRANS: Used as: Username [is [not ] attending|might attend] an unknown event.
+msgid "an unknown event"
+msgstr "un evento descoñecido"
+
+#. TRANS: Plain text version of an RSVP ("please respond") status for a user.
+#. TRANS: %1$s is a profile name, %2$s is an event title.
+#, php-format
+msgid "%1$s is attending %2$s."
+msgstr "%1$s asiste a %2$s."
+
+#. TRANS: Plain text version of an RSVP ("please respond") status for a user.
+#. TRANS: %1$s is a profile name, %2$s is an event title.
+#, php-format
+msgid "%1$s is not attending %2$s."
+msgstr "%1$s non asiste a %2$s."
+
+#. TRANS: Plain text version of an RSVP ("please respond") status for a user.
+#. TRANS: %1$s is a profile name, %2$s is an event title.
+#, php-format
+msgid "%1$s might attend %2$s."
+msgstr "%1$s quizais asista a %2$s."
+
+#. TRANS: Title for new event form.
+msgctxt "TITLE"
+msgid "New event"
+msgstr "Novo evento"
+
+#. TRANS: Client exception thrown when trying to post an event while not logged in.
+msgid "Must be logged in to post a event."
+msgstr "Cómpre estar rexistrado para publicar un evento."
+
+#. TRANS: Client exception thrown when trying to post an event without providing a title.
+msgid "Title required."
+msgstr "O título é obrigatorio."
+
+#. TRANS: Client exception thrown when trying to post an event without providing a start date.
+msgid "Start date required."
+msgstr "A data de inicio é obrigatoria."
+
+#. TRANS: Client exception thrown when trying to post an event without providing an end date.
+msgid "End date required."
+msgstr "A data de fin é obrigatoria."
+
+#. TRANS: Client exception thrown when trying to post an event with a date that cannot be processed.
+#. TRANS: %s is the data that could not be processed.
+#, php-format
+msgid "Could not parse date \"%s\"."
+msgstr "Non se puido analizar a data \"%s\"."
+
+#. TRANS: Client exception thrown when trying to post an event without providing a title.
+msgid "Event must have a title."
+msgstr "O evento debe ter un título."
+
+#. TRANS: Client exception thrown when trying to post an event without providing a start time.
+msgid "Event must have a start time."
+msgstr "O evento debe ter unha data de inicio."
+
+#. TRANS: Client exception thrown when trying to post an event without providing an end time.
+msgid "Event must have an end time."
+msgstr "O evento debe ter unha data de fin."
+
+#. TRANS: Client exception thrown when trying to post an event with an invalid URL.
+msgid "URL must be valid."
+msgstr "O enderezo URL debe ser válido."
+
+#. TRANS: Field label for event description.
+msgid "Time:"
+msgstr "Hora:"
+
+#. TRANS: Field label for event description.
+msgid "Location:"
+msgstr "Lugar:"
+
+#. TRANS: Field label for event description.
+msgid "Description:"
+msgstr "Descrición:"
diff --git a/plugins/Event/locale/hu/LC_MESSAGES/Event.po b/plugins/Event/locale/hu/LC_MESSAGES/Event.po
index 019e5ed6d7..77af4d6fd9 100644
--- a/plugins/Event/locale/hu/LC_MESSAGES/Event.po
+++ b/plugins/Event/locale/hu/LC_MESSAGES/Event.po
@@ -9,18 +9,27 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Event\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:20+0000\n"
-"Language-Team: Hungarian <http://translatewiki.net/wiki/Portal:hu>\n"
+"POT-Creation-Date: 2011-08-15 14:19+0000\n"
+"PO-Revision-Date: 2011-08-15 14:20:32+0000\n"
+"Language-Team: Hungarian <//translatewiki.net/wiki/Portal:hu>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:26:39+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:05+0000\n"
+"X-Generator: MediaWiki 1.19alpha (r94516); Translate extension (2011-07-09)\n"
+"X-Translation-Project: translatewiki.net at //translatewiki.net\n"
 "X-Language-Code: hu\n"
 "X-Message-Group: #out-statusnet-plugin-event\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+msgid "hour"
+msgstr ""
+
+msgid "hrs"
+msgstr ""
+
+msgid "mins"
+msgstr ""
+
 #. TRANS: Client exception thrown when trying to create an event that already exists.
 msgid "Event already exists."
 msgstr ""
@@ -42,6 +51,12 @@ msgid ""
 "$s</span> </span>"
 msgstr ""
 
+msgid "Unexpected form submission."
+msgstr ""
+
+msgid "This action is AJAX only."
+msgstr ""
+
 #. TRANS: Client exception thrown when referring to a non-existing RSVP.
 #. TRANS: RSVP stands for "Please reply".
 #. TRANS: Client exception thrown when referring to a non-existing RSVP ("please respond") item.
@@ -171,8 +186,8 @@ msgstr "Az esemény befejezésének ideje."
 
 #. TRANS: Field label on event form.
 msgctxt "LABEL"
-msgid "Location"
-msgstr "Helyszín"
+msgid "Where?"
+msgstr ""
 
 #. TRANS: Field title on event form.
 msgid "Event location."
@@ -382,3 +397,7 @@ msgstr ""
 #, php-format
 msgid "Yes: %1$d No: %2$d Maybe: %3$d"
 msgstr ""
+
+#~ msgctxt "LABEL"
+#~ msgid "Location"
+#~ msgstr "Helyszín"
diff --git a/plugins/Event/locale/ia/LC_MESSAGES/Event.po b/plugins/Event/locale/ia/LC_MESSAGES/Event.po
index fa952e7733..21ded0c1df 100644
--- a/plugins/Event/locale/ia/LC_MESSAGES/Event.po
+++ b/plugins/Event/locale/ia/LC_MESSAGES/Event.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Event to Interlingua (Interlingua)
+# Translation of StatusNet - Event to Interlingua (interlingua)
 # Exported from translatewiki.net
 #
 # Author: McDutchie
@@ -9,18 +9,38 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Event\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:20+0000\n"
-"Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:28+0000\n"
+"Language-Team: Interlingua <https://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:26:39+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2012-01-02 10:11:52+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-event\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: 0 minutes abbreviated. Used in a list.
+msgid "(0 min)"
+msgstr "(0 min.)"
+
+#. TRANS: 30 minutes abbreviated. Used in a list.
+msgid "(30 min)"
+msgstr "(30 min.)"
+
+#. TRANS: 1 hour. Used in a list.
+msgid "(1 hour)"
+msgstr "(1 hora)"
+
+#, php-format
+msgid "(%.1f hours)"
+msgstr "(%.1f horas)"
+
+#, php-format
+msgid "(%d hours)"
+msgstr "(%d horas)"
+
 #. TRANS: Client exception thrown when trying to create an event that already exists.
 msgid "Event already exists."
 msgstr "Le evento ja existe."
@@ -46,14 +66,24 @@ msgstr ""
 "$s</a> (<span class=\"location\">%6$s</span>): <span class=\"description\">%7"
 "$s</span> </span>"
 
+#. TRANS: Error message displayed when trying to perform an action that requires a logged in user.
+msgid "Not logged in."
+msgstr "Tu non ha aperite un session."
+
+#. TRANS: Client error when submitting a form with unexpected information.
+msgid "Unexpected form submission."
+msgstr "Submission de formulario inexpectate."
+
+#. TRANS: Client error displayed when using an action in a non-AJAX way.
+msgid "This action is AJAX only."
+msgstr "Iste action pote esser exequite solmente per AJAX."
+
 #. TRANS: Client exception thrown when referring to a non-existing RSVP.
 #. TRANS: RSVP stands for "Please reply".
 #. TRANS: Client exception thrown when referring to a non-existing RSVP ("please respond") item.
 msgid "No such RSVP."
 msgstr "Iste RSVP non existe."
 
-#. TRANS: Client exception thrown when referring to a non-existing event.
-#. TRANS: Client exception thrown when requesting a non-exsting event.
 #. TRANS: Client exception thrown when referring to a non-existing event.
 msgid "No such event."
 msgstr "Iste evento non existe."
@@ -151,9 +181,10 @@ msgctxt "LABEL"
 msgid "Start time"
 msgstr "Hora de initio"
 
-#. TRANS: Field title on event form.
-msgid "Time the event starts."
-msgstr "Le hora a que le evento comencia."
+#. TRANS: Field title on event form. %s is the abbreviated timezone
+#, php-format
+msgid "Time the event starts (%s)."
+msgstr "Le hora a que le evento comencia (%s)."
 
 #. TRANS: Field label on event form.
 msgctxt "LABEL"
@@ -175,8 +206,8 @@ msgstr "Le hora a que le evento fini."
 
 #. TRANS: Field label on event form.
 msgctxt "LABEL"
-msgid "Location"
-msgstr "Loco"
+msgid "Where?"
+msgstr "Ubi?"
 
 #. TRANS: Field title on event form.
 msgid "Event location."
@@ -371,6 +402,10 @@ msgstr "Le evento debe haber un hora de initio."
 msgid "Event must have an end time."
 msgstr "Le evento debe haber un hora de fin."
 
+#. TRANS: Client exception thrown when trying to post an event with an invalid URL.
+msgid "URL must be valid."
+msgstr "Le URL debe esser valide."
+
 #. TRANS: Field label for event description.
 msgid "Time:"
 msgstr "Hora:"
@@ -382,13 +417,3 @@ msgstr "Loco:"
 #. TRANS: Field label for event description.
 msgid "Description:"
 msgstr "Description:"
-
-#. TRANS: Field label for event description.
-msgid "Attending:"
-msgstr "Presente:"
-
-#. TRANS: RSVP counts.
-#. TRANS: %1$d, %2$d and %3$d are numbers of RSVPs.
-#, php-format
-msgid "Yes: %1$d No: %2$d Maybe: %3$d"
-msgstr "Si: %1$d No: %2$d Forsan: %3$d"
diff --git a/plugins/Event/locale/it/LC_MESSAGES/Event.po b/plugins/Event/locale/it/LC_MESSAGES/Event.po
new file mode 100644
index 0000000000..332e6c8606
--- /dev/null
+++ b/plugins/Event/locale/it/LC_MESSAGES/Event.po
@@ -0,0 +1,417 @@
+# Translation of StatusNet - Event to Italian (italiano)
+# Exported from translatewiki.net
+#
+# Author: Od1n
+# Author: Ximo17
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Event\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:29+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2012-01-02 10:11:52+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: 0 minutes abbreviated. Used in a list.
+msgid "(0 min)"
+msgstr "(0 min)"
+
+#. TRANS: 30 minutes abbreviated. Used in a list.
+msgid "(30 min)"
+msgstr "(30 min)"
+
+#. TRANS: 1 hour. Used in a list.
+msgid "(1 hour)"
+msgstr "(1 ora)"
+
+#, php-format
+msgid "(%.1f hours)"
+msgstr "(%.1f ore)"
+
+#, php-format
+msgid "(%d hours)"
+msgstr "(%d ore)"
+
+#. TRANS: Client exception thrown when trying to create an event that already exists.
+msgid "Event already exists."
+msgstr "Evento già esistente."
+
+#. TRANS: Event description. %1$s is a title, %2$s is start time, %3$s is end time,
+#. TRANS: %4$s is location, %5$s is a description.
+#, php-format
+msgid "\"%1$s\" %2$s - %3$s (%4$s): %5$s"
+msgstr "\"%1$s\" %2$s - %3$s (%4$s): %5$s"
+
+#. TRANS: Rendered event description. %1$s is a title, %2$s is start time, %3$s is start time,
+#. TRANS: %4$s is end time, %5$s is end time, %6$s is location, %7$s is description.
+#. TRANS: Class names should not be translated.
+#, php-format
+msgid ""
+"<span class=\"vevent\"><span class=\"summary\">%1$s</span> <abbr class="
+"\"dtstart\" title=\"%2$s\">%3$s</a> - <abbr class=\"dtend\" title=\"%4$s\">%5"
+"$s</a> (<span class=\"location\">%6$s</span>): <span class=\"description\">%7"
+"$s</span> </span>"
+msgstr ""
+"<span class=\"vevent\"><span class=\"summary\">%1$s</span> <abbr class="
+"\"dtstart\" title=\"%2$s\">%3$s</a> - <abbr class=\"dtend\" title=\"%4$s\">%5"
+"$s</a> (<span class=\"location\">%6$s</span>): <span class=\"description\">%7"
+"$s</span> </span>"
+
+#. TRANS: Error message displayed when trying to perform an action that requires a logged in user.
+msgid "Not logged in."
+msgstr "Accesso non effettuato."
+
+#. TRANS: Client error when submitting a form with unexpected information.
+msgid "Unexpected form submission."
+msgstr "Invio del modulo inaspettato."
+
+#. TRANS: Client error displayed when using an action in a non-AJAX way.
+msgid "This action is AJAX only."
+msgstr "Questa azione è solo per AJAX."
+
+#. TRANS: Client exception thrown when referring to a non-existing RSVP.
+#. TRANS: RSVP stands for "Please reply".
+#. TRANS: Client exception thrown when referring to a non-existing RSVP ("please respond") item.
+msgid "No such RSVP."
+msgstr "Questa RSVP non esiste."
+
+#. TRANS: Client exception thrown when referring to a non-existing event.
+msgid "No such event."
+msgstr "Questo evento non esiste."
+
+#. TRANS: Title for event.
+#. TRANS: %1$s is a user nickname, %2$s is an event title.
+#, php-format
+msgid "%1$s's RSVP for \"%2$s\""
+msgstr "RSVP di %1$s a \"%2$s\""
+
+#. TRANS: Possible status for RSVP ("please respond") item.
+msgid "You will attend this event."
+msgstr "Parteciperai a quest'evento."
+
+#. TRANS: Possible status for RSVP ("please respond") item.
+msgid "You will not attend this event."
+msgstr "Non parteciperai a quest'evento."
+
+#. TRANS: Possible status for RSVP ("please respond") item.
+msgid "You might attend this event."
+msgstr "Forse parteciperai a questo evento."
+
+#. TRANS: Button text to cancel responding to an RSVP ("please respond") item.
+msgctxt "BUTTON"
+msgid "Cancel"
+msgstr "Annulla"
+
+#. TRANS: Title for RSVP ("please respond") action.
+msgctxt "TITLE"
+msgid "New RSVP"
+msgstr "Nuovo RSVP"
+
+#. TRANS: Client exception thrown when trying to RSVP ("please respond") while not logged in.
+#. TRANS: Client exception thrown when trying tp RSVP ("please respond") while not logged in.
+msgid "You must be logged in to RSVP for an event."
+msgstr "Devi eseguire l'accesso per rispondere ad un evento."
+
+#. TRANS: Client exception thrown when using an invalid value for RSVP ("please respond").
+msgid "Unknown submit value."
+msgstr "Valore di invio sconosciuto."
+
+#. TRANS: Page title after creating an event.
+#. TRANS: Page title after sending a notice.
+msgid "Event saved"
+msgstr "Evento salvato"
+
+#. TRANS: Title for RSVP ("please respond") action.
+msgctxt "TITLE"
+msgid "Cancel RSVP"
+msgstr "Annulla RSVP"
+
+#. TRANS: Content for a deleted RSVP list item (RSVP stands for "please respond").
+msgid "Deleted."
+msgstr "Cancellato."
+
+#. TRANS: Field label on form to RSVP ("please respond") for an event.
+msgid "RSVP:"
+msgstr "RSVP:"
+
+#. TRANS: Button text for RSVP ("please respond") reply to confirm attendence.
+msgctxt "BUTTON"
+msgid "Yes"
+msgstr "Sì"
+
+#. TRANS: Button text for RSVP ("please respond") reply to deny attendence.
+msgctxt "BUTTON"
+msgid "No"
+msgstr "No"
+
+#. TRANS: Button text for RSVP ("please respond") reply to indicate one might attend.
+msgctxt "BUTTON"
+msgid "Maybe"
+msgstr "Forse"
+
+#. TRANS: Field label on event form.
+msgctxt "LABEL"
+msgid "Title"
+msgstr "Titolo"
+
+#. TRANS: Field title on event form.
+msgid "Title of the event."
+msgstr "Titolo dell'evento."
+
+#. TRANS: Field label on event form.
+msgctxt "LABEL"
+msgid "Start date"
+msgstr "Data di inizio"
+
+#. TRANS: Field title on event form.
+msgid "Date the event starts."
+msgstr "Data di inizio dell'evento."
+
+#. TRANS: Field label on event form.
+msgctxt "LABEL"
+msgid "Start time"
+msgstr "Ora di inizio"
+
+#. TRANS: Field title on event form. %s is the abbreviated timezone
+#, php-format
+msgid "Time the event starts (%s)."
+msgstr "Ora di inizio dell'evento ( %s )."
+
+#. TRANS: Field label on event form.
+msgctxt "LABEL"
+msgid "End date"
+msgstr "Data del termine"
+
+#. TRANS: Field title on event form.
+msgid "Date the event ends."
+msgstr "Data in cui termina l'evento."
+
+#. TRANS: Field label on event form.
+msgctxt "LABEL"
+msgid "End time"
+msgstr "Ora del termine"
+
+#. TRANS: Field title on event form.
+msgid "Time the event ends."
+msgstr "Ora in cui termina l'evento."
+
+#. TRANS: Field label on event form.
+msgctxt "LABEL"
+msgid "Where?"
+msgstr "Dove?"
+
+#. TRANS: Field title on event form.
+msgid "Event location."
+msgstr "Luogo dell'evento."
+
+#. TRANS: Field label on event form.
+msgctxt "LABEL"
+msgid "URL"
+msgstr "URL"
+
+#. TRANS: Field title on event form.
+msgid "URL for more information."
+msgstr "URL per ulteriori informazioni."
+
+#. TRANS: Field label on event form.
+msgctxt "LABEL"
+msgid "Description"
+msgstr "Descrizione"
+
+#. TRANS: Field title on event form.
+msgid "Description of the event."
+msgstr "Descrizione dell'evento."
+
+#. TRANS: Button text to save an event..
+msgctxt "BUTTON"
+msgid "Save"
+msgstr "Salva"
+
+#. TRANS: Plugin description.
+msgid "Event invitations and RSVPs."
+msgstr "Inviti e RSVP all'evento."
+
+#. TRANS: Title for event application.
+msgctxt "TITLE"
+msgid "Event"
+msgstr "Evento"
+
+#. TRANS: Exception thrown when there are too many activity objects.
+msgid "Too many activity objects."
+msgstr "Troppi oggetti dell'attività."
+
+#. TRANS: Exception thrown when event plugin comes across a non-event type object.
+msgid "Wrong type for object."
+msgstr "Tipo di oggetto sbagliato."
+
+#. TRANS: Exception thrown when trying to RSVP for an unknown event.
+msgid "RSVP for unknown event."
+msgstr "RSVP ad un evento sconosciuto."
+
+#. TRANS: Exception thrown when event plugin comes across a undefined verb.
+msgid "Unknown verb for events."
+msgstr "Verbo sconosciuto per gli eventi."
+
+#. TRANS: Exception thrown when event plugin comes across a unknown object type.
+msgid "Unknown object type."
+msgstr "Tipo di oggetto sconosciuto."
+
+#. TRANS: Exception thrown when referring to a notice that is not an event an in event context.
+msgid "Unknown event notice."
+msgstr "Avviso di evento sconosciuto."
+
+#. TRANS: Client exception thrown when trying to save an already existing RSVP ("please respond").
+msgid "RSVP already exists."
+msgstr "RSVP già esistente."
+
+#. TRANS: Exception thrown when requesting an undefined verb for RSVP.
+#, php-format
+msgid "Unknown verb \"%s\"."
+msgstr "Verbo sconosciuto \"%s\"."
+
+#. TRANS: Exception thrown when requesting an undefined code for RSVP.
+#, php-format
+msgid "Unknown code \"%s\"."
+msgstr "Codice sconosciuto \"%s\"."
+
+#. TRANS: Server exception thrown when requesting a non-exsting notice for an RSVP ("please respond").
+#. TRANS: %s is the RSVP with the missing notice.
+#, php-format
+msgid "RSVP %s does not correspond to a notice in the database."
+msgstr "RSVP  %s  non corrisponde a un avviso nel database."
+
+#. TRANS: Exception thrown when requesting a non-existing profile.
+#. TRANS: %s is the ID of the non-existing profile.
+#, php-format
+msgid "No profile with ID %s."
+msgstr "Nessun profilo con ID %s."
+
+#. TRANS: Exception thrown when requesting a non-existing event.
+#. TRANS: %s is the ID of the non-existing event.
+#, php-format
+msgid "No event with ID %s."
+msgstr "Nessun evento con ID %s."
+
+#. TRANS: HTML version of an RSVP ("please respond") status for a user.
+#. TRANS: %1$s is a profile URL, %2$s a profile name,
+#. TRANS: %3$s is an event URL, %4$s an event title.
+#, php-format
+msgid ""
+"<span class='automatic event-rsvp'><a href='%1$s'>%2$s</a> is attending <a "
+"href='%3$s'>%4$s</a>.</span>"
+msgstr ""
+"<span class='automatic event-rsvp'><a href='%1$s'>%2$s</a> parteciperà a <a "
+"href='%3$s'>%4$s</a>.</span>"
+
+#. TRANS: HTML version of an RSVP ("please respond") status for a user.
+#. TRANS: %1$s is a profile URL, %2$s a profile name,
+#. TRANS: %3$s is an event URL, %4$s an event title.
+#, php-format
+msgid ""
+"<span class='automatic event-rsvp'><a href='%1$s'>%2$s</a> is not attending "
+"<a href='%3$s'>%4$s</a>.</span>"
+msgstr ""
+"<span class='automatic event-rsvp'><a href='%1$s'>%2$s</a> non parteciperà a "
+"<a href='%3$s'>%4$s</a>.</span>"
+
+#. TRANS: HTML version of an RSVP ("please respond") status for a user.
+#. TRANS: %1$s is a profile URL, %2$s a profile name,
+#. TRANS: %3$s is an event URL, %4$s an event title.
+#, php-format
+msgid ""
+"<span class='automatic event-rsvp'><a href='%1$s'>%2$s</a> might attend <a "
+"href='%3$s'>%4$s</a>.</span>"
+msgstr ""
+"<span class='automatic event-rsvp'><a href='%1$s'>%2$s</a> forse parteciperà "
+"a <a href='%3$s'>%4$s</a>.</span>"
+
+#. TRANS: Exception thrown when requesting a user's RSVP status for a non-existing response code.
+#. TRANS: %s is the non-existing response code.
+#, php-format
+msgid "Unknown response code %s."
+msgstr "Codice di risposta sconosciuto  %s."
+
+#. TRANS: Used as event title when not event title is available.
+#. TRANS: Used as: Username [is [not ] attending|might attend] an unknown event.
+msgid "an unknown event"
+msgstr "un evento sconosciuto"
+
+#. TRANS: Plain text version of an RSVP ("please respond") status for a user.
+#. TRANS: %1$s is a profile name, %2$s is an event title.
+#, php-format
+msgid "%1$s is attending %2$s."
+msgstr "%1$s parteciperà a %2$s."
+
+#. TRANS: Plain text version of an RSVP ("please respond") status for a user.
+#. TRANS: %1$s is a profile name, %2$s is an event title.
+#, php-format
+msgid "%1$s is not attending %2$s."
+msgstr "%1$s non parteciperà a %2$s."
+
+#. TRANS: Plain text version of an RSVP ("please respond") status for a user.
+#. TRANS: %1$s is a profile name, %2$s is an event title.
+#, php-format
+msgid "%1$s might attend %2$s."
+msgstr "%1$s forse parteciperà a %2$s."
+
+#. TRANS: Title for new event form.
+msgctxt "TITLE"
+msgid "New event"
+msgstr "Nuovo evento"
+
+#. TRANS: Client exception thrown when trying to post an event while not logged in.
+msgid "Must be logged in to post a event."
+msgstr "Bisogna effettuare l'accesso per poter inserire un evento."
+
+#. TRANS: Client exception thrown when trying to post an event without providing a title.
+msgid "Title required."
+msgstr "Titolo richiesto."
+
+#. TRANS: Client exception thrown when trying to post an event without providing a start date.
+msgid "Start date required."
+msgstr "Necessaria data di inizio."
+
+#. TRANS: Client exception thrown when trying to post an event without providing an end date.
+msgid "End date required."
+msgstr "Necessaria data di termine."
+
+#. TRANS: Client exception thrown when trying to post an event with a date that cannot be processed.
+#. TRANS: %s is the data that could not be processed.
+#, php-format
+msgid "Could not parse date \"%s\"."
+msgstr "Impossibile analizzare il dato \"%s\"."
+
+#. TRANS: Client exception thrown when trying to post an event without providing a title.
+msgid "Event must have a title."
+msgstr "L'evento deve avere un titolo."
+
+#. TRANS: Client exception thrown when trying to post an event without providing a start time.
+msgid "Event must have a start time."
+msgstr "L'evento deve avere un orario di inizio."
+
+#. TRANS: Client exception thrown when trying to post an event without providing an end time.
+msgid "Event must have an end time."
+msgstr "L'evento deve avere un orario di termine."
+
+#. TRANS: Client exception thrown when trying to post an event with an invalid URL.
+msgid "URL must be valid."
+msgstr "La URL deve essere valida."
+
+#. TRANS: Field label for event description.
+msgid "Time:"
+msgstr "Ora:"
+
+#. TRANS: Field label for event description.
+msgid "Location:"
+msgstr "Luogo:"
+
+#. TRANS: Field label for event description.
+msgid "Description:"
+msgstr "Descrizione:"
diff --git a/plugins/Event/locale/ja/LC_MESSAGES/Event.po b/plugins/Event/locale/ja/LC_MESSAGES/Event.po
new file mode 100644
index 0000000000..c3052b2cb4
--- /dev/null
+++ b/plugins/Event/locale/ja/LC_MESSAGES/Event.po
@@ -0,0 +1,407 @@
+# Translation of StatusNet - Event to Japanese (日本語)
+# Exported from translatewiki.net
+#
+# Author: Miwa ka
+# Author: Shirayuki
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Event\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:29+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2012-01-02 10:11:52+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#. TRANS: 0 minutes abbreviated. Used in a list.
+msgid "(0 min)"
+msgstr "(0 分)"
+
+#. TRANS: 30 minutes abbreviated. Used in a list.
+msgid "(30 min)"
+msgstr "(30 分)"
+
+#. TRANS: 1 hour. Used in a list.
+msgid "(1 hour)"
+msgstr "(1 時間)"
+
+#, php-format
+msgid "(%.1f hours)"
+msgstr "(%.1f 時間)"
+
+#, php-format
+msgid "(%d hours)"
+msgstr "(%d 時間)"
+
+#. TRANS: Client exception thrown when trying to create an event that already exists.
+msgid "Event already exists."
+msgstr "イベント�既�存在�����"
+
+#. TRANS: Event description. %1$s is a title, %2$s is start time, %3$s is end time,
+#. TRANS: %4$s is location, %5$s is a description.
+#, php-format
+msgid "\"%1$s\" %2$s - %3$s (%4$s): %5$s"
+msgstr "「%1$s�%2$s - %3$s (%4$s): %5$s"
+
+#. TRANS: Rendered event description. %1$s is a title, %2$s is start time, %3$s is start time,
+#. TRANS: %4$s is end time, %5$s is end time, %6$s is location, %7$s is description.
+#. TRANS: Class names should not be translated.
+#, php-format
+msgid ""
+"<span class=\"vevent\"><span class=\"summary\">%1$s</span> <abbr class="
+"\"dtstart\" title=\"%2$s\">%3$s</a> - <abbr class=\"dtend\" title=\"%4$s\">%5"
+"$s</a> (<span class=\"location\">%6$s</span>): <span class=\"description\">%7"
+"$s</span> </span>"
+msgstr ""
+
+#. TRANS: Error message displayed when trying to perform an action that requires a logged in user.
+msgid "Not logged in."
+msgstr "ログイン�����ん。"
+
+#. TRANS: Client error when submitting a form with unexpected information.
+msgid "Unexpected form submission."
+msgstr "予期���フォーム�信��。"
+
+#. TRANS: Client error displayed when using an action in a non-AJAX way.
+msgid "This action is AJAX only."
+msgstr "��アクション� AJAX ����。"
+
+#. TRANS: Client exception thrown when referring to a non-existing RSVP.
+#. TRANS: RSVP stands for "Please reply".
+#. TRANS: Client exception thrown when referring to a non-existing RSVP ("please respond") item.
+msgid "No such RSVP."
+msgstr "��よ��RSVP��り��ん。"
+
+#. TRANS: Client exception thrown when referring to a non-existing event.
+msgid "No such event."
+msgstr "��よ��イベント��り��ん。"
+
+#. TRANS: Title for event.
+#. TRANS: %1$s is a user nickname, %2$s is an event title.
+#, php-format
+msgid "%1$s's RSVP for \"%2$s\""
+msgstr "\"%2$s\" � %1$s �ん�RSVP"
+
+#. TRANS: Possible status for RSVP ("please respond") item.
+msgid "You will attend this event."
+msgstr "��イベント�出席���。"
+
+#. TRANS: Possible status for RSVP ("please respond") item.
+msgid "You will not attend this event."
+msgstr "��イベントを欠席���。"
+
+#. TRANS: Possible status for RSVP ("please respond") item.
+msgid "You might attend this event."
+msgstr "��イベント�出席�る�能性��り��。"
+
+#. TRANS: Button text to cancel responding to an RSVP ("please respond") item.
+msgctxt "BUTTON"
+msgid "Cancel"
+msgstr "キャンセル"
+
+#. TRANS: Title for RSVP ("please respond") action.
+msgctxt "TITLE"
+msgid "New RSVP"
+msgstr "新� RSVP"
+
+#. TRANS: Client exception thrown when trying to RSVP ("please respond") while not logged in.
+#. TRANS: Client exception thrown when trying tp RSVP ("please respond") while not logged in.
+msgid "You must be logged in to RSVP for an event."
+msgstr ""
+
+#. TRANS: Client exception thrown when using an invalid value for RSVP ("please respond").
+msgid "Unknown submit value."
+msgstr ""
+
+#. TRANS: Page title after creating an event.
+#. TRANS: Page title after sending a notice.
+msgid "Event saved"
+msgstr ""
+
+#. TRANS: Title for RSVP ("please respond") action.
+msgctxt "TITLE"
+msgid "Cancel RSVP"
+msgstr "RSVP をキャンセル"
+
+#. TRANS: Content for a deleted RSVP list item (RSVP stands for "please respond").
+msgid "Deleted."
+msgstr "削除����。"
+
+#. TRANS: Field label on form to RSVP ("please respond") for an event.
+msgid "RSVP:"
+msgstr "RSVP："
+
+#. TRANS: Button text for RSVP ("please respond") reply to confirm attendence.
+msgctxt "BUTTON"
+msgid "Yes"
+msgstr "��"
+
+#. TRANS: Button text for RSVP ("please respond") reply to deny attendence.
+msgctxt "BUTTON"
+msgid "No"
+msgstr "���"
+
+#. TRANS: Button text for RSVP ("please respond") reply to indicate one might attend.
+msgctxt "BUTTON"
+msgid "Maybe"
+msgstr "��ら�"
+
+#. TRANS: Field label on event form.
+msgctxt "LABEL"
+msgid "Title"
+msgstr ""
+
+#. TRANS: Field title on event form.
+msgid "Title of the event."
+msgstr ""
+
+#. TRANS: Field label on event form.
+msgctxt "LABEL"
+msgid "Start date"
+msgstr ""
+
+#. TRANS: Field title on event form.
+msgid "Date the event starts."
+msgstr ""
+
+#. TRANS: Field label on event form.
+msgctxt "LABEL"
+msgid "Start time"
+msgstr ""
+
+#. TRANS: Field title on event form. %s is the abbreviated timezone
+#, php-format
+msgid "Time the event starts (%s)."
+msgstr ""
+
+#. TRANS: Field label on event form.
+msgctxt "LABEL"
+msgid "End date"
+msgstr ""
+
+#. TRANS: Field title on event form.
+msgid "Date the event ends."
+msgstr ""
+
+#. TRANS: Field label on event form.
+msgctxt "LABEL"
+msgid "End time"
+msgstr ""
+
+#. TRANS: Field title on event form.
+msgid "Time the event ends."
+msgstr ""
+
+#. TRANS: Field label on event form.
+msgctxt "LABEL"
+msgid "Where?"
+msgstr ""
+
+#. TRANS: Field title on event form.
+msgid "Event location."
+msgstr ""
+
+#. TRANS: Field label on event form.
+msgctxt "LABEL"
+msgid "URL"
+msgstr ""
+
+#. TRANS: Field title on event form.
+msgid "URL for more information."
+msgstr ""
+
+#. TRANS: Field label on event form.
+msgctxt "LABEL"
+msgid "Description"
+msgstr ""
+
+#. TRANS: Field title on event form.
+msgid "Description of the event."
+msgstr ""
+
+#. TRANS: Button text to save an event..
+msgctxt "BUTTON"
+msgid "Save"
+msgstr ""
+
+#. TRANS: Plugin description.
+msgid "Event invitations and RSVPs."
+msgstr ""
+
+#. TRANS: Title for event application.
+msgctxt "TITLE"
+msgid "Event"
+msgstr ""
+
+#. TRANS: Exception thrown when there are too many activity objects.
+msgid "Too many activity objects."
+msgstr ""
+
+#. TRANS: Exception thrown when event plugin comes across a non-event type object.
+msgid "Wrong type for object."
+msgstr ""
+
+#. TRANS: Exception thrown when trying to RSVP for an unknown event.
+msgid "RSVP for unknown event."
+msgstr ""
+
+#. TRANS: Exception thrown when event plugin comes across a undefined verb.
+msgid "Unknown verb for events."
+msgstr ""
+
+#. TRANS: Exception thrown when event plugin comes across a unknown object type.
+msgid "Unknown object type."
+msgstr ""
+
+#. TRANS: Exception thrown when referring to a notice that is not an event an in event context.
+msgid "Unknown event notice."
+msgstr ""
+
+#. TRANS: Client exception thrown when trying to save an already existing RSVP ("please respond").
+msgid "RSVP already exists."
+msgstr ""
+
+#. TRANS: Exception thrown when requesting an undefined verb for RSVP.
+#, php-format
+msgid "Unknown verb \"%s\"."
+msgstr ""
+
+#. TRANS: Exception thrown when requesting an undefined code for RSVP.
+#, php-format
+msgid "Unknown code \"%s\"."
+msgstr ""
+
+#. TRANS: Server exception thrown when requesting a non-exsting notice for an RSVP ("please respond").
+#. TRANS: %s is the RSVP with the missing notice.
+#, php-format
+msgid "RSVP %s does not correspond to a notice in the database."
+msgstr ""
+
+#. TRANS: Exception thrown when requesting a non-existing profile.
+#. TRANS: %s is the ID of the non-existing profile.
+#, php-format
+msgid "No profile with ID %s."
+msgstr ""
+
+#. TRANS: Exception thrown when requesting a non-existing event.
+#. TRANS: %s is the ID of the non-existing event.
+#, php-format
+msgid "No event with ID %s."
+msgstr ""
+
+#. TRANS: HTML version of an RSVP ("please respond") status for a user.
+#. TRANS: %1$s is a profile URL, %2$s a profile name,
+#. TRANS: %3$s is an event URL, %4$s an event title.
+#, php-format
+msgid ""
+"<span class='automatic event-rsvp'><a href='%1$s'>%2$s</a> is attending <a "
+"href='%3$s'>%4$s</a>.</span>"
+msgstr ""
+
+#. TRANS: HTML version of an RSVP ("please respond") status for a user.
+#. TRANS: %1$s is a profile URL, %2$s a profile name,
+#. TRANS: %3$s is an event URL, %4$s an event title.
+#, php-format
+msgid ""
+"<span class='automatic event-rsvp'><a href='%1$s'>%2$s</a> is not attending "
+"<a href='%3$s'>%4$s</a>.</span>"
+msgstr ""
+
+#. TRANS: HTML version of an RSVP ("please respond") status for a user.
+#. TRANS: %1$s is a profile URL, %2$s a profile name,
+#. TRANS: %3$s is an event URL, %4$s an event title.
+#, php-format
+msgid ""
+"<span class='automatic event-rsvp'><a href='%1$s'>%2$s</a> might attend <a "
+"href='%3$s'>%4$s</a>.</span>"
+msgstr ""
+
+#. TRANS: Exception thrown when requesting a user's RSVP status for a non-existing response code.
+#. TRANS: %s is the non-existing response code.
+#, php-format
+msgid "Unknown response code %s."
+msgstr ""
+
+#. TRANS: Used as event title when not event title is available.
+#. TRANS: Used as: Username [is [not ] attending|might attend] an unknown event.
+msgid "an unknown event"
+msgstr ""
+
+#. TRANS: Plain text version of an RSVP ("please respond") status for a user.
+#. TRANS: %1$s is a profile name, %2$s is an event title.
+#, php-format
+msgid "%1$s is attending %2$s."
+msgstr ""
+
+#. TRANS: Plain text version of an RSVP ("please respond") status for a user.
+#. TRANS: %1$s is a profile name, %2$s is an event title.
+#, php-format
+msgid "%1$s is not attending %2$s."
+msgstr ""
+
+#. TRANS: Plain text version of an RSVP ("please respond") status for a user.
+#. TRANS: %1$s is a profile name, %2$s is an event title.
+#, php-format
+msgid "%1$s might attend %2$s."
+msgstr ""
+
+#. TRANS: Title for new event form.
+msgctxt "TITLE"
+msgid "New event"
+msgstr "新�イベント"
+
+#. TRANS: Client exception thrown when trying to post an event while not logged in.
+msgid "Must be logged in to post a event."
+msgstr ""
+
+#. TRANS: Client exception thrown when trying to post an event without providing a title.
+msgid "Title required."
+msgstr ""
+
+#. TRANS: Client exception thrown when trying to post an event without providing a start date.
+msgid "Start date required."
+msgstr "開始日�必���。"
+
+#. TRANS: Client exception thrown when trying to post an event without providing an end date.
+msgid "End date required."
+msgstr "終了日�必���。"
+
+#. TRANS: Client exception thrown when trying to post an event with a date that cannot be processed.
+#. TRANS: %s is the data that could not be processed.
+#, php-format
+msgid "Could not parse date \"%s\"."
+msgstr ""
+
+#. TRANS: Client exception thrown when trying to post an event without providing a title.
+msgid "Event must have a title."
+msgstr ""
+
+#. TRANS: Client exception thrown when trying to post an event without providing a start time.
+msgid "Event must have a start time."
+msgstr ""
+
+#. TRANS: Client exception thrown when trying to post an event without providing an end time.
+msgid "Event must have an end time."
+msgstr ""
+
+#. TRANS: Client exception thrown when trying to post an event with an invalid URL.
+msgid "URL must be valid."
+msgstr ""
+
+#. TRANS: Field label for event description.
+msgid "Time:"
+msgstr "時刻："
+
+#. TRANS: Field label for event description.
+msgid "Location:"
+msgstr "場所："
+
+#. TRANS: Field label for event description.
+msgid "Description:"
+msgstr "説明："
diff --git a/plugins/Event/locale/mk/LC_MESSAGES/Event.po b/plugins/Event/locale/mk/LC_MESSAGES/Event.po
index c3e50ebbe8..e180f94d5e 100644
--- a/plugins/Event/locale/mk/LC_MESSAGES/Event.po
+++ b/plugins/Event/locale/mk/LC_MESSAGES/Event.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Event to Macedonian (Македон�ки)
+# Translation of StatusNet - Event to Macedonian (македон�ки)
 # Exported from translatewiki.net
 #
 # Author: Bjankuloski06
@@ -9,18 +9,38 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Event\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:20+0000\n"
-"Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:29+0000\n"
+"Language-Team: Macedonian <https://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:26:39+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2012-01-02 10:11:52+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-event\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
 
+#. TRANS: 0 minutes abbreviated. Used in a list.
+msgid "(0 min)"
+msgstr "(0 мин)"
+
+#. TRANS: 30 minutes abbreviated. Used in a list.
+msgid "(30 min)"
+msgstr "(30 мин)"
+
+#. TRANS: 1 hour. Used in a list.
+msgid "(1 hour)"
+msgstr "(1 ча�)"
+
+#, php-format
+msgid "(%.1f hours)"
+msgstr "(%.1f ча�а)"
+
+#, php-format
+msgid "(%d hours)"
+msgstr "(%d ча�а)"
+
 #. TRANS: Client exception thrown when trying to create an event that already exists.
 msgid "Event already exists."
 msgstr "�а�танот веќе по�тои."
@@ -46,14 +66,24 @@ msgstr ""
 "$s</a> (<span class=\"location\">%6$s</span>): <span class=\"description\">%7"
 "$s</span> </span>"
 
+#. TRANS: Error message displayed when trying to perform an action that requires a logged in user.
+msgid "Not logged in."
+msgstr "�е �те најавени."
+
+#. TRANS: Client error when submitting a form with unexpected information.
+msgid "Unexpected form submission."
+msgstr "�еочекувано подне�ување на образец."
+
+#. TRANS: Client error displayed when using an action in a non-AJAX way.
+msgid "This action is AJAX only."
+msgstr "Ова деј�тво е �амо за AJAX."
+
 #. TRANS: Client exception thrown when referring to a non-existing RSVP.
 #. TRANS: RSVP stands for "Please reply".
 #. TRANS: Client exception thrown when referring to a non-existing RSVP ("please respond") item.
 msgid "No such RSVP."
 msgstr "�ема таков одѕив."
 
-#. TRANS: Client exception thrown when referring to a non-existing event.
-#. TRANS: Client exception thrown when requesting a non-exsting event.
 #. TRANS: Client exception thrown when referring to a non-existing event.
 msgid "No such event."
 msgstr "�ема таков на�тан."
@@ -151,9 +181,10 @@ msgctxt "LABEL"
 msgid "Start time"
 msgstr "Време на почеток"
 
-#. TRANS: Field title on event form.
-msgid "Time the event starts."
-msgstr "Во колку ча�от почнува на�танот."
+#. TRANS: Field title on event form. %s is the abbreviated timezone
+#, php-format
+msgid "Time the event starts (%s)."
+msgstr "Во колку ча�от почнува на�танот (%s)."
 
 #. TRANS: Field label on event form.
 msgctxt "LABEL"
@@ -175,8 +206,8 @@ msgstr "Во колку ча�от завршува на�танот."
 
 #. TRANS: Field label on event form.
 msgctxt "LABEL"
-msgid "Location"
-msgstr "Ме�то"
+msgid "Where?"
+msgstr "Каде?"
 
 #. TRANS: Field title on event form.
 msgid "Event location."
@@ -262,7 +293,7 @@ msgstr "Одзивот %s не �оодвет�твува на забелешк
 #. TRANS: %s is the ID of the non-existing profile.
 #, php-format
 msgid "No profile with ID %s."
-msgstr "�ема профил �о ID %s."
+msgstr "�ема профил �о назнака %s."
 
 #. TRANS: Exception thrown when requesting a non-existing event.
 #. TRANS: %s is the ID of the non-existing event.
@@ -371,6 +402,10 @@ msgstr "�а�танот мора да има почетно време."
 msgid "Event must have an end time."
 msgstr "�а�танот мора да има завршно време."
 
+#. TRANS: Client exception thrown when trying to post an event with an invalid URL.
+msgid "URL must be valid."
+msgstr "URL-адре�ата мора да е важечка."
+
 #. TRANS: Field label for event description.
 msgid "Time:"
 msgstr "Време:"
@@ -382,13 +417,3 @@ msgstr "Ме�то:"
 #. TRANS: Field label for event description.
 msgid "Description:"
 msgstr "Опи�:"
-
-#. TRANS: Field label for event description.
-msgid "Attending:"
-msgstr "При�у�тво:"
-
-#. TRANS: RSVP counts.
-#. TRANS: %1$d, %2$d and %3$d are numbers of RSVPs.
-#, php-format
-msgid "Yes: %1$d No: %2$d Maybe: %3$d"
-msgstr "Да: %1$d �е: %2$d Можеби: %3$d"
diff --git a/plugins/Event/locale/ms/LC_MESSAGES/Event.po b/plugins/Event/locale/ms/LC_MESSAGES/Event.po
index 26519b91fd..f9209a1cdd 100644
--- a/plugins/Event/locale/ms/LC_MESSAGES/Event.po
+++ b/plugins/Event/locale/ms/LC_MESSAGES/Event.po
@@ -9,27 +9,47 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Event\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:20+0000\n"
-"Language-Team: Malay <http://translatewiki.net/wiki/Portal:ms>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:29+0000\n"
+"Language-Team: Malay <https://translatewiki.net/wiki/Portal:ms>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:26:39+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2012-01-02 10:11:52+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ms\n"
 "X-Message-Group: #out-statusnet-plugin-event\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#. TRANS: 0 minutes abbreviated. Used in a list.
+msgid "(0 min)"
+msgstr ""
+
+#. TRANS: 30 minutes abbreviated. Used in a list.
+msgid "(30 min)"
+msgstr ""
+
+#. TRANS: 1 hour. Used in a list.
+msgid "(1 hour)"
+msgstr ""
+
+#, php-format
+msgid "(%.1f hours)"
+msgstr ""
+
+#, php-format
+msgid "(%d hours)"
+msgstr ""
+
 #. TRANS: Client exception thrown when trying to create an event that already exists.
 msgid "Event already exists."
-msgstr ""
+msgstr "Acara sudah wujud."
 
 #. TRANS: Event description. %1$s is a title, %2$s is start time, %3$s is end time,
 #. TRANS: %4$s is location, %5$s is a description.
 #, php-format
 msgid "\"%1$s\" %2$s - %3$s (%4$s): %5$s"
-msgstr ""
+msgstr "\"%1$s\" %2$s - %3$s (%4$s): %5$s"
 
 #. TRANS: Rendered event description. %1$s is a title, %2$s is start time, %3$s is start time,
 #. TRANS: %4$s is end time, %5$s is end time, %6$s is location, %7$s is description.
@@ -41,6 +61,22 @@ msgid ""
 "$s</a> (<span class=\"location\">%6$s</span>): <span class=\"description\">%7"
 "$s</span> </span>"
 msgstr ""
+"<span class=\"vevent\"><span class=\"summary\">%1$s</span> <abbr class="
+"\"dtstart\" title=\"%2$s\">%3$s</a> - <abbr class=\"dtend\" title=\"%4$s\">%5"
+"$s</a> (<span class=\"location\">%6$s</span>): <span class=\"description\">%7"
+"$s</span> </span>"
+
+#. TRANS: Error message displayed when trying to perform an action that requires a logged in user.
+msgid "Not logged in."
+msgstr ""
+
+#. TRANS: Client error when submitting a form with unexpected information.
+msgid "Unexpected form submission."
+msgstr ""
+
+#. TRANS: Client error displayed when using an action in a non-AJAX way.
+msgid "This action is AJAX only."
+msgstr ""
 
 #. TRANS: Client exception thrown when referring to a non-existing RSVP.
 #. TRANS: RSVP stands for "Please reply".
@@ -48,8 +84,6 @@ msgstr ""
 msgid "No such RSVP."
 msgstr "RSVP ini tidak wujud."
 
-#. TRANS: Client exception thrown when referring to a non-existing event.
-#. TRANS: Client exception thrown when requesting a non-exsting event.
 #. TRANS: Client exception thrown when referring to a non-existing event.
 msgid "No such event."
 msgstr "Acara ini tidak wujud."
@@ -78,7 +112,6 @@ msgid "Cancel"
 msgstr "Batalkan"
 
 #. TRANS: Title for RSVP ("please respond") action.
-#, fuzzy
 msgctxt "TITLE"
 msgid "New RSVP"
 msgstr "RSVP baru"
@@ -90,7 +123,7 @@ msgstr "Anda mesti log masuk untuk membuat RSVP untuk acara."
 
 #. TRANS: Client exception thrown when using an invalid value for RSVP ("please respond").
 msgid "Unknown submit value."
-msgstr ""
+msgstr "Nilai serahan tidak dikenali."
 
 #. TRANS: Page title after creating an event.
 #. TRANS: Page title after sending a notice.
@@ -98,14 +131,13 @@ msgid "Event saved"
 msgstr "Acara disimpan"
 
 #. TRANS: Title for RSVP ("please respond") action.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Cancel RSVP"
 msgstr "Batalkan RSVP"
 
 #. TRANS: Content for a deleted RSVP list item (RSVP stands for "please respond").
 msgid "Deleted."
-msgstr ""
+msgstr "Dihapuskan."
 
 #. TRANS: Field label on form to RSVP ("please respond") for an event.
 msgid "RSVP:"
@@ -132,7 +164,6 @@ msgid "Title"
 msgstr "Tajuk"
 
 #. TRANS: Field title on event form.
-#, fuzzy
 msgid "Title of the event."
 msgstr "Nama acara"
 
@@ -142,19 +173,18 @@ msgid "Start date"
 msgstr "Tarikh mula"
 
 #. TRANS: Field title on event form.
-#, fuzzy
 msgid "Date the event starts."
-msgstr "Tarikh acara bermula"
+msgstr "Tarikh acara bermula."
 
 #. TRANS: Field label on event form.
 msgctxt "LABEL"
 msgid "Start time"
 msgstr "Waktu bermula"
 
-#. TRANS: Field title on event form.
-#, fuzzy
-msgid "Time the event starts."
-msgstr "Waktu acara bermula"
+#. TRANS: Field title on event form. %s is the abbreviated timezone
+#, fuzzy, php-format
+msgid "Time the event starts (%s)."
+msgstr "Waktu acara bermula."
 
 #. TRANS: Field label on event form.
 msgctxt "LABEL"
@@ -162,9 +192,8 @@ msgid "End date"
 msgstr "Tarikh tamat"
 
 #. TRANS: Field title on event form.
-#, fuzzy
 msgid "Date the event ends."
-msgstr "Tarikh acara berakhir"
+msgstr "Tarikh acara berakhir."
 
 #. TRANS: Field label on event form.
 msgctxt "LABEL"
@@ -172,19 +201,17 @@ msgid "End time"
 msgstr "Waktu tamat"
 
 #. TRANS: Field title on event form.
-#, fuzzy
 msgid "Time the event ends."
-msgstr "Waktu acara berakhir"
+msgstr "Waktu acara berakhir."
 
 #. TRANS: Field label on event form.
 msgctxt "LABEL"
-msgid "Location"
-msgstr "Lokasi"
+msgid "Where?"
+msgstr ""
 
 #. TRANS: Field title on event form.
-#, fuzzy
 msgid "Event location."
-msgstr "Lokasi acara"
+msgstr "Lokasi acara."
 
 #. TRANS: Field label on event form.
 msgctxt "LABEL"
@@ -192,9 +219,8 @@ msgid "URL"
 msgstr "URL"
 
 #. TRANS: Field title on event form.
-#, fuzzy
 msgid "URL for more information."
-msgstr "URL untuk keterangan lanjut"
+msgstr "URL untuk keterangan lanjut."
 
 #. TRANS: Field label on event form.
 msgctxt "LABEL"
@@ -202,9 +228,8 @@ msgid "Description"
 msgstr "Keterangan"
 
 #. TRANS: Field title on event form.
-#, fuzzy
 msgid "Description of the event."
-msgstr "Keterangan acara"
+msgstr "Keterangan acara."
 
 #. TRANS: Button text to save an event..
 msgctxt "BUTTON"
@@ -216,69 +241,65 @@ msgid "Event invitations and RSVPs."
 msgstr "Jemputan dan RSVP acara."
 
 #. TRANS: Title for event application.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Event"
 msgstr "Acara"
 
 #. TRANS: Exception thrown when there are too many activity objects.
 msgid "Too many activity objects."
-msgstr ""
+msgstr "Terlalu banyak objek aktiviti."
 
 #. TRANS: Exception thrown when event plugin comes across a non-event type object.
 msgid "Wrong type for object."
-msgstr ""
+msgstr "Jenis yang salah untuk objek."
 
 #. TRANS: Exception thrown when trying to RSVP for an unknown event.
-#, fuzzy
 msgid "RSVP for unknown event."
-msgstr "acara yang tidak dikenali"
+msgstr "RSVP untuk acara yang tidak dikenali."
 
 #. TRANS: Exception thrown when event plugin comes across a undefined verb.
-#, fuzzy
 msgid "Unknown verb for events."
-msgstr "acara yang tidak dikenali"
+msgstr "Kata kerja tidak dikenali untuk acara."
 
 #. TRANS: Exception thrown when event plugin comes across a unknown object type.
 msgid "Unknown object type."
-msgstr ""
+msgstr "Jenis objek tidak dikenali."
 
 #. TRANS: Exception thrown when referring to a notice that is not an event an in event context.
-#, fuzzy
 msgid "Unknown event notice."
-msgstr "acara yang tidak dikenali"
+msgstr "Notis acara tidak diketahui."
 
 #. TRANS: Client exception thrown when trying to save an already existing RSVP ("please respond").
 msgid "RSVP already exists."
 msgstr "RSVP sudah ada."
 
 #. TRANS: Exception thrown when requesting an undefined verb for RSVP.
-#, fuzzy, php-format
+#, php-format
 msgid "Unknown verb \"%s\"."
-msgstr "acara yang tidak dikenali"
+msgstr "Kata kerja tidak diketahui \"%s\"."
 
 #. TRANS: Exception thrown when requesting an undefined code for RSVP.
 #, php-format
 msgid "Unknown code \"%s\"."
-msgstr ""
+msgstr "Kod tidak diketahui \"%s\"."
 
 #. TRANS: Server exception thrown when requesting a non-exsting notice for an RSVP ("please respond").
 #. TRANS: %s is the RSVP with the missing notice.
 #, php-format
 msgid "RSVP %s does not correspond to a notice in the database."
-msgstr ""
+msgstr "RSVP %s tidak berpadan dengan sebarang notis dalam pangkalan data."
 
 #. TRANS: Exception thrown when requesting a non-existing profile.
 #. TRANS: %s is the ID of the non-existing profile.
 #, php-format
 msgid "No profile with ID %s."
-msgstr ""
+msgstr "Tiada profil dengan ID %s."
 
 #. TRANS: Exception thrown when requesting a non-existing event.
 #. TRANS: %s is the ID of the non-existing event.
 #, php-format
 msgid "No event with ID %s."
-msgstr ""
+msgstr "Tiada acara dengan ID %s."
 
 #. TRANS: HTML version of an RSVP ("please respond") status for a user.
 #. TRANS: %1$s is a profile URL, %2$s a profile name,
@@ -288,6 +309,8 @@ msgid ""
 "<span class='automatic event-rsvp'><a href='%1$s'>%2$s</a> is attending <a "
 "href='%3$s'>%4$s</a>.</span>"
 msgstr ""
+"<span class='automatic event-rsvp'><a href='%1$s'>%2$s</a> akan menghadiri "
+"<a href='%3$s'>%4$s</a>.</span>"
 
 #. TRANS: HTML version of an RSVP ("please respond") status for a user.
 #. TRANS: %1$s is a profile URL, %2$s a profile name,
@@ -297,6 +320,8 @@ msgid ""
 "<span class='automatic event-rsvp'><a href='%1$s'>%2$s</a> is not attending "
 "<a href='%3$s'>%4$s</a>.</span>"
 msgstr ""
+"<span class='automatic event-rsvp'><a href='%1$s'>%2$s</a> tidak menghadiri "
+"<a href='%3$s'>%4$s</a>.</span>"
 
 #. TRANS: HTML version of an RSVP ("please respond") status for a user.
 #. TRANS: %1$s is a profile URL, %2$s a profile name,
@@ -306,12 +331,14 @@ msgid ""
 "<span class='automatic event-rsvp'><a href='%1$s'>%2$s</a> might attend <a "
 "href='%3$s'>%4$s</a>.</span>"
 msgstr ""
+"<span class='automatic event-rsvp'><a href='%1$s'>%2$s</a> mungkin "
+"menghadiri <a href='%3$s'>%4$s</a>.</span>"
 
 #. TRANS: Exception thrown when requesting a user's RSVP status for a non-existing response code.
 #. TRANS: %s is the non-existing response code.
 #, php-format
 msgid "Unknown response code %s."
-msgstr ""
+msgstr "Kod respons tidak diketahui %s."
 
 #. TRANS: Used as event title when not event title is available.
 #. TRANS: Used as: Username [is [not ] attending|might attend] an unknown event.
@@ -322,58 +349,61 @@ msgstr "acara yang tidak dikenali"
 #. TRANS: %1$s is a profile name, %2$s is an event title.
 #, php-format
 msgid "%1$s is attending %2$s."
-msgstr ""
+msgstr "%1$s akan menghadiri %2$s."
 
 #. TRANS: Plain text version of an RSVP ("please respond") status for a user.
 #. TRANS: %1$s is a profile name, %2$s is an event title.
 #, php-format
 msgid "%1$s is not attending %2$s."
-msgstr ""
+msgstr "%1$s tidak menghadiri %2$s."
 
 #. TRANS: Plain text version of an RSVP ("please respond") status for a user.
 #. TRANS: %1$s is a profile name, %2$s is an event title.
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s might attend %2$s."
-msgstr "Anda mungkin menghadiri acara ini."
+msgstr "%1$s mungkin menghadiri %2$s."
 
 #. TRANS: Title for new event form.
-#, fuzzy
 msgctxt "TITLE"
 msgid "New event"
-msgstr "Acara ini tidak wujud."
+msgstr "Acara baru"
 
 #. TRANS: Client exception thrown when trying to post an event while not logged in.
 msgid "Must be logged in to post a event."
-msgstr ""
+msgstr "Mesti log masuk untuk mengirim acara."
 
 #. TRANS: Client exception thrown when trying to post an event without providing a title.
 msgid "Title required."
-msgstr ""
+msgstr "Nama diperlukan."
 
 #. TRANS: Client exception thrown when trying to post an event without providing a start date.
 msgid "Start date required."
-msgstr ""
+msgstr "Tarikh mula diperlukan."
 
 #. TRANS: Client exception thrown when trying to post an event without providing an end date.
 msgid "End date required."
-msgstr ""
+msgstr "Tarikh tamat diperlukan."
 
 #. TRANS: Client exception thrown when trying to post an event with a date that cannot be processed.
 #. TRANS: %s is the data that could not be processed.
 #, php-format
 msgid "Could not parse date \"%s\"."
-msgstr ""
+msgstr "Tarikh \"%s\" tidak dapat dihurai."
 
 #. TRANS: Client exception thrown when trying to post an event without providing a title.
 msgid "Event must have a title."
-msgstr ""
+msgstr "Acara mesti ada nama."
 
 #. TRANS: Client exception thrown when trying to post an event without providing a start time.
 msgid "Event must have a start time."
-msgstr ""
+msgstr "Acara mesti ada waktu mula."
 
 #. TRANS: Client exception thrown when trying to post an event without providing an end time.
 msgid "Event must have an end time."
+msgstr "Acara mesti ada waktu tamat."
+
+#. TRANS: Client exception thrown when trying to post an event with an invalid URL.
+msgid "URL must be valid."
 msgstr ""
 
 #. TRANS: Field label for event description.
@@ -387,13 +417,3 @@ msgstr "Lokasi:"
 #. TRANS: Field label for event description.
 msgid "Description:"
 msgstr "Keterangan:"
-
-#. TRANS: Field label for event description.
-msgid "Attending:"
-msgstr "Hadir:"
-
-#. TRANS: RSVP counts.
-#. TRANS: %1$d, %2$d and %3$d are numbers of RSVPs.
-#, php-format
-msgid "Yes: %1$d No: %2$d Maybe: %3$d"
-msgstr "Ya: %1$d Tidak: %2$d Mungkin: %3$d"
diff --git a/plugins/Event/locale/nl/LC_MESSAGES/Event.po b/plugins/Event/locale/nl/LC_MESSAGES/Event.po
index 4e9d369216..55df8122c1 100644
--- a/plugins/Event/locale/nl/LC_MESSAGES/Event.po
+++ b/plugins/Event/locale/nl/LC_MESSAGES/Event.po
@@ -10,18 +10,38 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Event\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:21+0000\n"
-"Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:29+0000\n"
+"Language-Team: Dutch <https://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:26:39+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2012-01-02 10:11:52+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-event\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: 0 minutes abbreviated. Used in a list.
+msgid "(0 min)"
+msgstr "(0 min.)"
+
+#. TRANS: 30 minutes abbreviated. Used in a list.
+msgid "(30 min)"
+msgstr "(30 min.)"
+
+#. TRANS: 1 hour. Used in a list.
+msgid "(1 hour)"
+msgstr "(1 uur)"
+
+#, php-format
+msgid "(%.1f hours)"
+msgstr "(%.1f uur)"
+
+#, php-format
+msgid "(%d hours)"
+msgstr "(%d uur)"
+
 #. TRANS: Client exception thrown when trying to create an event that already exists.
 msgid "Event already exists."
 msgstr "Evenement bestaat al."
@@ -47,14 +67,24 @@ msgstr ""
 "$s</a> (<span class=\"location\">%6$s</span>): <span class=\"description\">%7"
 "$s</span> </span>"
 
+#. TRANS: Error message displayed when trying to perform an action that requires a logged in user.
+msgid "Not logged in."
+msgstr "Niet aangemeld."
+
+#. TRANS: Client error when submitting a form with unexpected information.
+msgid "Unexpected form submission."
+msgstr "Het formulier is onverwacht ingezonden."
+
+#. TRANS: Client error displayed when using an action in a non-AJAX way.
+msgid "This action is AJAX only."
+msgstr "Deze handeling kan alleen via AJAX uitgevoerd worden."
+
 #. TRANS: Client exception thrown when referring to a non-existing RSVP.
 #. TRANS: RSVP stands for "Please reply".
 #. TRANS: Client exception thrown when referring to a non-existing RSVP ("please respond") item.
 msgid "No such RSVP."
 msgstr "Het verzoek tot antwoorden kon niet worden gevonden."
 
-#. TRANS: Client exception thrown when referring to a non-existing event.
-#. TRANS: Client exception thrown when requesting a non-exsting event.
 #. TRANS: Client exception thrown when referring to a non-existing event.
 msgid "No such event."
 msgstr "Dat evenement bestaat niet."
@@ -153,9 +183,10 @@ msgctxt "LABEL"
 msgid "Start time"
 msgstr "Starttijd"
 
-#. TRANS: Field title on event form.
-msgid "Time the event starts."
-msgstr "Tijd waarop het evenement begint."
+#. TRANS: Field title on event form. %s is the abbreviated timezone
+#, php-format
+msgid "Time the event starts (%s)."
+msgstr "Tijd waarop het evenement begint (%s)."
 
 #. TRANS: Field label on event form.
 msgctxt "LABEL"
@@ -177,8 +208,8 @@ msgstr "Tijd waarop het evenement eindigt."
 
 #. TRANS: Field label on event form.
 msgctxt "LABEL"
-msgid "Location"
-msgstr "Locatie"
+msgid "Where?"
+msgstr "Waar?"
 
 #. TRANS: Field title on event form.
 msgid "Event location."
@@ -375,6 +406,10 @@ msgstr "Een evenement moet een begintijd hebben."
 msgid "Event must have an end time."
 msgstr "Een evenement moet een eindtijd hebben."
 
+#. TRANS: Client exception thrown when trying to post an event with an invalid URL.
+msgid "URL must be valid."
+msgstr "De URL moet geldig zijn."
+
 #. TRANS: Field label for event description.
 msgid "Time:"
 msgstr "Tijd:"
@@ -386,13 +421,3 @@ msgstr "Locatie:"
 #. TRANS: Field label for event description.
 msgid "Description:"
 msgstr "Beschrijving:"
-
-#. TRANS: Field label for event description.
-msgid "Attending:"
-msgstr "Aanwezig:"
-
-#. TRANS: RSVP counts.
-#. TRANS: %1$d, %2$d and %3$d are numbers of RSVPs.
-#, php-format
-msgid "Yes: %1$d No: %2$d Maybe: %3$d"
-msgstr "Ja: %1$d Nee: %2$d Misschien: %3$d"
diff --git a/plugins/Event/locale/pt/LC_MESSAGES/Event.po b/plugins/Event/locale/pt/LC_MESSAGES/Event.po
new file mode 100644
index 0000000000..61fd934a4e
--- /dev/null
+++ b/plugins/Event/locale/pt/LC_MESSAGES/Event.po
@@ -0,0 +1,409 @@
+# Translation of StatusNet - Event to Portuguese (português)
+# Exported from translatewiki.net
+#
+# Author: Analuisa
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Event\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:30+0000\n"
+"Language-Team: Portuguese <https://translatewiki.net/wiki/Portal:pt>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2012-01-02 10:11:52+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: pt\n"
+"X-Message-Group: #out-statusnet-plugin-event\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: 0 minutes abbreviated. Used in a list.
+msgid "(0 min)"
+msgstr ""
+
+#. TRANS: 30 minutes abbreviated. Used in a list.
+msgid "(30 min)"
+msgstr ""
+
+#. TRANS: 1 hour. Used in a list.
+msgid "(1 hour)"
+msgstr ""
+
+#, php-format
+msgid "(%.1f hours)"
+msgstr ""
+
+#, php-format
+msgid "(%d hours)"
+msgstr ""
+
+#. TRANS: Client exception thrown when trying to create an event that already exists.
+msgid "Event already exists."
+msgstr "O evento já existe."
+
+#. TRANS: Event description. %1$s is a title, %2$s is start time, %3$s is end time,
+#. TRANS: %4$s is location, %5$s is a description.
+#, php-format
+msgid "\"%1$s\" %2$s - %3$s (%4$s): %5$s"
+msgstr ""
+
+#. TRANS: Rendered event description. %1$s is a title, %2$s is start time, %3$s is start time,
+#. TRANS: %4$s is end time, %5$s is end time, %6$s is location, %7$s is description.
+#. TRANS: Class names should not be translated.
+#, php-format
+msgid ""
+"<span class=\"vevent\"><span class=\"summary\">%1$s</span> <abbr class="
+"\"dtstart\" title=\"%2$s\">%3$s</a> - <abbr class=\"dtend\" title=\"%4$s\">%5"
+"$s</a> (<span class=\"location\">%6$s</span>): <span class=\"description\">%7"
+"$s</span> </span>"
+msgstr ""
+
+#. TRANS: Error message displayed when trying to perform an action that requires a logged in user.
+msgid "Not logged in."
+msgstr ""
+
+#. TRANS: Client error when submitting a form with unexpected information.
+msgid "Unexpected form submission."
+msgstr ""
+
+#. TRANS: Client error displayed when using an action in a non-AJAX way.
+msgid "This action is AJAX only."
+msgstr ""
+
+#. TRANS: Client exception thrown when referring to a non-existing RSVP.
+#. TRANS: RSVP stands for "Please reply".
+#. TRANS: Client exception thrown when referring to a non-existing RSVP ("please respond") item.
+msgid "No such RSVP."
+msgstr ""
+
+#. TRANS: Client exception thrown when referring to a non-existing event.
+msgid "No such event."
+msgstr ""
+
+#. TRANS: Title for event.
+#. TRANS: %1$s is a user nickname, %2$s is an event title.
+#, php-format
+msgid "%1$s's RSVP for \"%2$s\""
+msgstr ""
+
+#. TRANS: Possible status for RSVP ("please respond") item.
+msgid "You will attend this event."
+msgstr ""
+
+#. TRANS: Possible status for RSVP ("please respond") item.
+msgid "You will not attend this event."
+msgstr ""
+
+#. TRANS: Possible status for RSVP ("please respond") item.
+msgid "You might attend this event."
+msgstr ""
+
+#. TRANS: Button text to cancel responding to an RSVP ("please respond") item.
+msgctxt "BUTTON"
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. TRANS: Title for RSVP ("please respond") action.
+msgctxt "TITLE"
+msgid "New RSVP"
+msgstr ""
+
+#. TRANS: Client exception thrown when trying to RSVP ("please respond") while not logged in.
+#. TRANS: Client exception thrown when trying tp RSVP ("please respond") while not logged in.
+msgid "You must be logged in to RSVP for an event."
+msgstr ""
+
+#. TRANS: Client exception thrown when using an invalid value for RSVP ("please respond").
+msgid "Unknown submit value."
+msgstr ""
+
+#. TRANS: Page title after creating an event.
+#. TRANS: Page title after sending a notice.
+msgid "Event saved"
+msgstr ""
+
+#. TRANS: Title for RSVP ("please respond") action.
+msgctxt "TITLE"
+msgid "Cancel RSVP"
+msgstr ""
+
+#. TRANS: Content for a deleted RSVP list item (RSVP stands for "please respond").
+msgid "Deleted."
+msgstr "Apagado."
+
+#. TRANS: Field label on form to RSVP ("please respond") for an event.
+msgid "RSVP:"
+msgstr "RSVP:"
+
+#. TRANS: Button text for RSVP ("please respond") reply to confirm attendence.
+msgctxt "BUTTON"
+msgid "Yes"
+msgstr "Sim"
+
+#. TRANS: Button text for RSVP ("please respond") reply to deny attendence.
+msgctxt "BUTTON"
+msgid "No"
+msgstr "Não"
+
+#. TRANS: Button text for RSVP ("please respond") reply to indicate one might attend.
+msgctxt "BUTTON"
+msgid "Maybe"
+msgstr "Talvez"
+
+#. TRANS: Field label on event form.
+msgctxt "LABEL"
+msgid "Title"
+msgstr "Título"
+
+#. TRANS: Field title on event form.
+msgid "Title of the event."
+msgstr "Título do evento"
+
+#. TRANS: Field label on event form.
+msgctxt "LABEL"
+msgid "Start date"
+msgstr ""
+
+#. TRANS: Field title on event form.
+msgid "Date the event starts."
+msgstr "Data de começo do evento."
+
+#. TRANS: Field label on event form.
+msgctxt "LABEL"
+msgid "Start time"
+msgstr "Data do começo"
+
+#. TRANS: Field title on event form. %s is the abbreviated timezone
+#, fuzzy, php-format
+msgid "Time the event starts (%s)."
+msgstr "Hora a que o evento começa."
+
+#. TRANS: Field label on event form.
+msgctxt "LABEL"
+msgid "End date"
+msgstr "Data de término."
+
+#. TRANS: Field title on event form.
+msgid "Date the event ends."
+msgstr "Data a que o evento termina."
+
+#. TRANS: Field label on event form.
+msgctxt "LABEL"
+msgid "End time"
+msgstr ""
+
+#. TRANS: Field title on event form.
+msgid "Time the event ends."
+msgstr "Hora a que o evento termina."
+
+#. TRANS: Field label on event form.
+msgctxt "LABEL"
+msgid "Where?"
+msgstr ""
+
+#. TRANS: Field title on event form.
+msgid "Event location."
+msgstr "Local do evento."
+
+#. TRANS: Field label on event form.
+msgctxt "LABEL"
+msgid "URL"
+msgstr "URL"
+
+#. TRANS: Field title on event form.
+msgid "URL for more information."
+msgstr "URL para mais informações."
+
+#. TRANS: Field label on event form.
+msgctxt "LABEL"
+msgid "Description"
+msgstr "Descrição"
+
+#. TRANS: Field title on event form.
+msgid "Description of the event."
+msgstr "Descrição do evento."
+
+#. TRANS: Button text to save an event..
+msgctxt "BUTTON"
+msgid "Save"
+msgstr "Guardar"
+
+#. TRANS: Plugin description.
+msgid "Event invitations and RSVPs."
+msgstr "Convites para eventos e RSPVs."
+
+#. TRANS: Title for event application.
+msgctxt "TITLE"
+msgid "Event"
+msgstr "Eventos"
+
+#. TRANS: Exception thrown when there are too many activity objects.
+msgid "Too many activity objects."
+msgstr "Demasiados objectos de actividade."
+
+#. TRANS: Exception thrown when event plugin comes across a non-event type object.
+msgid "Wrong type for object."
+msgstr "Tipo errado para objecto."
+
+#. TRANS: Exception thrown when trying to RSVP for an unknown event.
+msgid "RSVP for unknown event."
+msgstr "RSVP para evento desconhecido."
+
+#. TRANS: Exception thrown when event plugin comes across a undefined verb.
+msgid "Unknown verb for events."
+msgstr "Verbo desconhecido para eventos."
+
+#. TRANS: Exception thrown when event plugin comes across a unknown object type.
+msgid "Unknown object type."
+msgstr "Tipo de objecto desconhecido."
+
+#. TRANS: Exception thrown when referring to a notice that is not an event an in event context.
+msgid "Unknown event notice."
+msgstr "Aviso de evento desconhecido."
+
+#. TRANS: Client exception thrown when trying to save an already existing RSVP ("please respond").
+msgid "RSVP already exists."
+msgstr "RSVP já existe."
+
+#. TRANS: Exception thrown when requesting an undefined verb for RSVP.
+#, php-format
+msgid "Unknown verb \"%s\"."
+msgstr "Verbo desconhecido \"%s\"."
+
+#. TRANS: Exception thrown when requesting an undefined code for RSVP.
+#, php-format
+msgid "Unknown code \"%s\"."
+msgstr "Código desconhecido \"%s\"."
+
+#. TRANS: Server exception thrown when requesting a non-exsting notice for an RSVP ("please respond").
+#. TRANS: %s is the RSVP with the missing notice.
+#, php-format
+msgid "RSVP %s does not correspond to a notice in the database."
+msgstr "RSVP %s não corresponde a uma aviso na base de dados."
+
+#. TRANS: Exception thrown when requesting a non-existing profile.
+#. TRANS: %s is the ID of the non-existing profile.
+#, php-format
+msgid "No profile with ID %s."
+msgstr "Não foi encontrado um perfil com essa identificação %s"
+
+#. TRANS: Exception thrown when requesting a non-existing event.
+#. TRANS: %s is the ID of the non-existing event.
+#, php-format
+msgid "No event with ID %s."
+msgstr "Nenhum evento com essa identificação %s."
+
+#. TRANS: HTML version of an RSVP ("please respond") status for a user.
+#. TRANS: %1$s is a profile URL, %2$s a profile name,
+#. TRANS: %3$s is an event URL, %4$s an event title.
+#, php-format
+msgid ""
+"<span class='automatic event-rsvp'><a href='%1$s'>%2$s</a> is attending <a "
+"href='%3$s'>%4$s</a>.</span>"
+msgstr ""
+
+#. TRANS: HTML version of an RSVP ("please respond") status for a user.
+#. TRANS: %1$s is a profile URL, %2$s a profile name,
+#. TRANS: %3$s is an event URL, %4$s an event title.
+#, php-format
+msgid ""
+"<span class='automatic event-rsvp'><a href='%1$s'>%2$s</a> is not attending "
+"<a href='%3$s'>%4$s</a>.</span>"
+msgstr ""
+
+#. TRANS: HTML version of an RSVP ("please respond") status for a user.
+#. TRANS: %1$s is a profile URL, %2$s a profile name,
+#. TRANS: %3$s is an event URL, %4$s an event title.
+#, php-format
+msgid ""
+"<span class='automatic event-rsvp'><a href='%1$s'>%2$s</a> might attend <a "
+"href='%3$s'>%4$s</a>.</span>"
+msgstr ""
+
+#. TRANS: Exception thrown when requesting a user's RSVP status for a non-existing response code.
+#. TRANS: %s is the non-existing response code.
+#, php-format
+msgid "Unknown response code %s."
+msgstr ""
+
+#. TRANS: Used as event title when not event title is available.
+#. TRANS: Used as: Username [is [not ] attending|might attend] an unknown event.
+msgid "an unknown event"
+msgstr ""
+
+#. TRANS: Plain text version of an RSVP ("please respond") status for a user.
+#. TRANS: %1$s is a profile name, %2$s is an event title.
+#, php-format
+msgid "%1$s is attending %2$s."
+msgstr ""
+
+#. TRANS: Plain text version of an RSVP ("please respond") status for a user.
+#. TRANS: %1$s is a profile name, %2$s is an event title.
+#, php-format
+msgid "%1$s is not attending %2$s."
+msgstr ""
+
+#. TRANS: Plain text version of an RSVP ("please respond") status for a user.
+#. TRANS: %1$s is a profile name, %2$s is an event title.
+#, php-format
+msgid "%1$s might attend %2$s."
+msgstr ""
+
+#. TRANS: Title for new event form.
+msgctxt "TITLE"
+msgid "New event"
+msgstr ""
+
+#. TRANS: Client exception thrown when trying to post an event while not logged in.
+msgid "Must be logged in to post a event."
+msgstr ""
+
+#. TRANS: Client exception thrown when trying to post an event without providing a title.
+msgid "Title required."
+msgstr ""
+
+#. TRANS: Client exception thrown when trying to post an event without providing a start date.
+msgid "Start date required."
+msgstr ""
+
+#. TRANS: Client exception thrown when trying to post an event without providing an end date.
+msgid "End date required."
+msgstr ""
+
+#. TRANS: Client exception thrown when trying to post an event with a date that cannot be processed.
+#. TRANS: %s is the data that could not be processed.
+#, php-format
+msgid "Could not parse date \"%s\"."
+msgstr ""
+
+#. TRANS: Client exception thrown when trying to post an event without providing a title.
+msgid "Event must have a title."
+msgstr ""
+
+#. TRANS: Client exception thrown when trying to post an event without providing a start time.
+msgid "Event must have a start time."
+msgstr ""
+
+#. TRANS: Client exception thrown when trying to post an event without providing an end time.
+msgid "Event must have an end time."
+msgstr ""
+
+#. TRANS: Client exception thrown when trying to post an event with an invalid URL.
+msgid "URL must be valid."
+msgstr ""
+
+#. TRANS: Field label for event description.
+msgid "Time:"
+msgstr ""
+
+#. TRANS: Field label for event description.
+msgid "Location:"
+msgstr ""
+
+#. TRANS: Field label for event description.
+msgid "Description:"
+msgstr ""
diff --git a/plugins/Event/locale/tl/LC_MESSAGES/Event.po b/plugins/Event/locale/tl/LC_MESSAGES/Event.po
index ae71276006..0706b9867d 100644
--- a/plugins/Event/locale/tl/LC_MESSAGES/Event.po
+++ b/plugins/Event/locale/tl/LC_MESSAGES/Event.po
@@ -9,18 +9,38 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Event\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:21+0000\n"
-"Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:30+0000\n"
+"Language-Team: Tagalog <https://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:26:39+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2012-01-02 10:11:52+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-event\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: 0 minutes abbreviated. Used in a list.
+msgid "(0 min)"
+msgstr "(0 minuto)"
+
+#. TRANS: 30 minutes abbreviated. Used in a list.
+msgid "(30 min)"
+msgstr "(30 minuto)"
+
+#. TRANS: 1 hour. Used in a list.
+msgid "(1 hour)"
+msgstr "(1 oras)"
+
+#, php-format
+msgid "(%.1f hours)"
+msgstr "(%.1f oras)"
+
+#, php-format
+msgid "(%d hours)"
+msgstr "(%d oras)"
+
 #. TRANS: Client exception thrown when trying to create an event that already exists.
 msgid "Event already exists."
 msgstr "Umiiral na ang kaganapan."
@@ -46,14 +66,24 @@ msgstr ""
 "$s</a> (<span class=\"location\">%6$s</span>): <span class=\"description\">%7"
 "$s</span> </span>"
 
+#. TRANS: Error message displayed when trying to perform an action that requires a logged in user.
+msgid "Not logged in."
+msgstr "Hindi nakalagda."
+
+#. TRANS: Client error when submitting a form with unexpected information.
+msgid "Unexpected form submission."
+msgstr "Hindi inaasahang pagpapasa ng pormularyo."
+
+#. TRANS: Client error displayed when using an action in a non-AJAX way.
+msgid "This action is AJAX only."
+msgstr "Ang galaw ay AJAX lang."
+
 #. TRANS: Client exception thrown when referring to a non-existing RSVP.
 #. TRANS: RSVP stands for "Please reply".
 #. TRANS: Client exception thrown when referring to a non-existing RSVP ("please respond") item.
 msgid "No such RSVP."
 msgstr "Walang ganyang paghiling ng pagtugon."
 
-#. TRANS: Client exception thrown when referring to a non-existing event.
-#. TRANS: Client exception thrown when requesting a non-exsting event.
 #. TRANS: Client exception thrown when referring to a non-existing event.
 msgid "No such event."
 msgstr "Walang ganyang kaganapan."
@@ -152,9 +182,10 @@ msgctxt "LABEL"
 msgid "Start time"
 msgstr "Oras ng simula"
 
-#. TRANS: Field title on event form.
-msgid "Time the event starts."
-msgstr "Oras ng pagsisimula ng kaganapan."
+#. TRANS: Field title on event form. %s is the abbreviated timezone
+#, php-format
+msgid "Time the event starts (%s)."
+msgstr "Oras ng pagsisimula ng kaganapan (%s)."
 
 #. TRANS: Field label on event form.
 msgctxt "LABEL"
@@ -176,8 +207,8 @@ msgstr "Oras ng pagwawakas ng kaganapan."
 
 #. TRANS: Field label on event form.
 msgctxt "LABEL"
-msgid "Location"
-msgstr "Kinalalagyan"
+msgid "Where?"
+msgstr "Saan?"
 
 #. TRANS: Field title on event form.
 msgid "Event location."
@@ -374,6 +405,10 @@ msgstr "Dapat na may isang oras ng simula ang kaganapan."
 msgid "Event must have an end time."
 msgstr "Dapat na may isang oras ng wakas ang kaganapan."
 
+#. TRANS: Client exception thrown when trying to post an event with an invalid URL.
+msgid "URL must be valid."
+msgstr "Dapat na katanggap-tanggap ang URL."
+
 #. TRANS: Field label for event description.
 msgid "Time:"
 msgstr "Oras:"
@@ -385,13 +420,3 @@ msgstr "Kinalalagyan:"
 #. TRANS: Field label for event description.
 msgid "Description:"
 msgstr "Paglalarawan:"
-
-#. TRANS: Field label for event description.
-msgid "Attending:"
-msgstr "Dadalo:"
-
-#. TRANS: RSVP counts.
-#. TRANS: %1$d, %2$d and %3$d are numbers of RSVPs.
-#, php-format
-msgid "Yes: %1$d No: %2$d Maybe: %3$d"
-msgstr "Oo: %1$d Hindi: %2$d Baka: %3$d"
diff --git a/plugins/Event/locale/uk/LC_MESSAGES/Event.po b/plugins/Event/locale/uk/LC_MESSAGES/Event.po
index 3c0b41ca4d..d05139cd8e 100644
--- a/plugins/Event/locale/uk/LC_MESSAGES/Event.po
+++ b/plugins/Event/locale/uk/LC_MESSAGES/Event.po
@@ -1,6 +1,7 @@
-# Translation of StatusNet - Event to Ukrainian (Україн�ька)
+# Translation of StatusNet - Event to Ukrainian (україн�ька)
 # Exported from translatewiki.net
 #
+# Author: AS
 # Author: Boogie
 # --
 # This file is distributed under the same license as the StatusNet package.
@@ -9,19 +10,39 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Event\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:21+0000\n"
-"Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:30+0000\n"
+"Language-Team: Ukrainian <https://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:26:39+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2012-01-02 10:11:52+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-event\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
+#. TRANS: 0 minutes abbreviated. Used in a list.
+msgid "(0 min)"
+msgstr ""
+
+#. TRANS: 30 minutes abbreviated. Used in a list.
+msgid "(30 min)"
+msgstr ""
+
+#. TRANS: 1 hour. Used in a list.
+msgid "(1 hour)"
+msgstr ""
+
+#, php-format
+msgid "(%.1f hours)"
+msgstr ""
+
+#, php-format
+msgid "(%d hours)"
+msgstr ""
+
 #. TRANS: Client exception thrown when trying to create an event that already exists.
 msgid "Event already exists."
 msgstr "Поді� вже і�нує."
@@ -47,14 +68,24 @@ msgstr ""
 "$s</a> (<span class=\"location\">%6$s</span>): <span class=\"description\">%7"
 "$s</span> </span>"
 
+#. TRANS: Error message displayed when trying to perform an action that requires a logged in user.
+msgid "Not logged in."
+msgstr ""
+
+#. TRANS: Client error when submitting a form with unexpected information.
+msgid "Unexpected form submission."
+msgstr ""
+
+#. TRANS: Client error displayed when using an action in a non-AJAX way.
+msgid "This action is AJAX only."
+msgstr ""
+
 #. TRANS: Client exception thrown when referring to a non-existing RSVP.
 #. TRANS: RSVP stands for "Please reply".
 #. TRANS: Client exception thrown when referring to a non-existing RSVP ("please respond") item.
 msgid "No such RSVP."
 msgstr "�емає такого запиту на підтвердженн� запрошенн�."
 
-#. TRANS: Client exception thrown when referring to a non-existing event.
-#. TRANS: Client exception thrown when requesting a non-exsting event.
 #. TRANS: Client exception thrown when referring to a non-existing event.
 msgid "No such event."
 msgstr "�емає такого події."
@@ -80,7 +111,7 @@ msgstr "Ви могли б вз�ти уча�ть у цьому заході."
 #. TRANS: Button text to cancel responding to an RSVP ("please respond") item.
 msgctxt "BUTTON"
 msgid "Cancel"
-msgstr "Відміна"
+msgstr "Ска�увати"
 
 #. TRANS: Title for RSVP ("please respond") action.
 msgctxt "TITLE"
@@ -154,8 +185,9 @@ msgctxt "LABEL"
 msgid "Start time"
 msgstr "Ча� початку"
 
-#. TRANS: Field title on event form.
-msgid "Time the event starts."
+#. TRANS: Field title on event form. %s is the abbreviated timezone
+#, fuzzy, php-format
+msgid "Time the event starts (%s)."
 msgstr "Ча� початку заходу."
 
 #. TRANS: Field label on event form.
@@ -178,8 +210,8 @@ msgstr "Ча� закінченн� заходу."
 
 #. TRANS: Field label on event form.
 msgctxt "LABEL"
-msgid "Location"
-msgstr "Розташуванн�"
+msgid "Where?"
+msgstr ""
 
 #. TRANS: Field title on event form.
 msgid "Event location."
@@ -374,6 +406,10 @@ msgstr "В події має бути зазначеним ча� початку
 msgid "Event must have an end time."
 msgstr "В події має бути зазначеним ча� закінченн�."
 
+#. TRANS: Client exception thrown when trying to post an event with an invalid URL.
+msgid "URL must be valid."
+msgstr ""
+
 #. TRANS: Field label for event description.
 msgid "Time:"
 msgstr "Ча�:"
@@ -385,13 +421,3 @@ msgstr "Розташуванн�:"
 #. TRANS: Field label for event description.
 msgid "Description:"
 msgstr "Опи�:"
-
-#. TRANS: Field label for event description.
-msgid "Attending:"
-msgstr "При�утні:"
-
-#. TRANS: RSVP counts.
-#. TRANS: %1$d, %2$d and %3$d are numbers of RSVPs.
-#, php-format
-msgid "Yes: %1$d No: %2$d Maybe: %3$d"
-msgstr "Так: %1$d �і: %2$d Можливо: %3$d"
diff --git a/plugins/Event/newevent.php b/plugins/Event/newevent.php
index cadf0e1433..4c2157e01e 100644
--- a/plugins/Event/newevent.php
+++ b/plugins/Event/newevent.php
@@ -52,8 +52,8 @@ class NeweventAction extends Action
     protected $title       = null;
     protected $location    = null;
     protected $description = null;
-    protected $startTime  = null;
-    protected $endTime    = null;
+    protected $startTime   = null;
+    protected $endTime     = null;
 
     /**
      * Returns the title of the action
@@ -89,67 +89,74 @@ class NeweventAction extends Action
             $this->checkSessionToken();
         }
 
-        $this->title       = $this->trimmed('title');
+        try {
 
-        if (empty($this->title)) {
-            // TRANS: Client exception thrown when trying to post an event without providing a title.
-            throw new ClientException(_m('Title required.'));
-        }
+            $this->title = $this->trimmed('title');
 
-        $this->location    = $this->trimmed('location');
-        $this->url         = $this->trimmed('url');
-        $this->description = $this->trimmed('description');
+            if (empty($this->title)) {
+                // TRANS: Client exception thrown when trying to post an event without providing a title.
+                throw new ClientException(_m('Title required.'));
+            }
 
-        $startDate = $this->trimmed('startdate');
+            $this->location    = $this->trimmed('location');
+            $this->url         = $this->trimmed('url');
+            $this->description = $this->trimmed('description');
+            $tz                = $this->trimmed('tz');
 
-        if (empty($startDate)) {
-            // TRANS: Client exception thrown when trying to post an event without providing a start date.
-            throw new ClientException(_m('Start date required.'));
-        }
+            $startDate = $this->trimmed('startdate');
 
-        $startTime = $this->trimmed('starttime');
+            if (empty($startDate)) {
+                // TRANS: Client exception thrown when trying to post an event without providing a start date.
+                throw new ClientException(_m('Start date required.'));
+            }
 
-        if (empty($startTime)) {
-            $startTime = '00:00';
-        }
+            $startTime = $this->trimmed('event-starttime');
 
-        $endDate   = $this->trimmed('enddate');
+            if (empty($startTime)) {
+                $startTime = '00:00';
+            }
 
-        if (empty($endDate)) {
-            // TRANS: Client exception thrown when trying to post an event without providing an end date.
-            throw new ClientException(_m('End date required.'));
-        }
+            $endDate   = $this->trimmed('enddate');
 
-        $endTime   = $this->trimmed('endtime');
+            if (empty($endDate)) {
+                // TRANS: Client exception thrown when trying to post an event without providing an end date.
+                throw new ClientException(_m('End date required.'));
+            }
 
-        if (empty($endTime)) {
-            $endTime = '00:00';
-        }
+            $endTime   = $this->trimmed('event-endtime');
 
-        $start = $startDate . ' ' . $startTime;
+            if (empty($endTime)) {
+                $endTime = '00:00';
+            }
 
-        common_debug("Event start: '$start'");
+            $start = $startDate . ' ' . $startTime . ' ' . $tz;
+            $end   = $endDate . ' ' . $endTime . ' ' . $tz;
 
-        $end = $endDate . ' ' . $endTime;
+            $this->startTime = strtotime($start);
+            $this->endTime   = strtotime($end);
 
-        common_debug("Event start: '$end'");
+            if ($this->startTime == 0) {
+                // TRANS: Client exception thrown when trying to post an event with a date that cannot be processed.
+                // TRANS: %s is the data that could not be processed.
+                throw new ClientException(sprintf(_m('Could not parse date "%s".'),
+                                            $start));
+            }
 
-        $this->startTime = strtotime($start);
-        $this->endTime   = strtotime($end);
-
-        if ($this->startTime == 0) {
-            // TRANS: Client exception thrown when trying to post an event with a date that cannot be processed.
-            // TRANS: %s is the data that could not be processed.
-            throw new Exception(sprintf(_m('Could not parse date "%s".'),
-                                        $start));
-        }
-
-
-        if ($this->endTime == 0) {
-            // TRANS: Client exception thrown when trying to post an event with a date that cannot be processed.
-            // TRANS: %s is the data that could not be processed.
-            throw new Exception(sprintf(_m('Could not parse date "%s".'),
-                                        $end));
+            if ($this->endTime == 0) {
+                // TRANS: Client exception thrown when trying to post an event with a date that cannot be processed.
+                // TRANS: %s is the data that could not be processed.
+                throw new ClientException(sprintf(_m('Could not parse date "%s".'),
+                                            $end));
+            }
+        } catch (ClientException $ce) {
+            if ($this->boolean('ajax')) {
+                $this->outputAjaxError($ce->getMessage());
+                return false;
+            } else {
+                $this->error = $ce->getMessage();
+                $this->showPage();
+                return false;
+            }
         }
 
         return true;
@@ -183,6 +190,7 @@ class NeweventAction extends Action
     function newEvent()
     {
         try {
+
             if (empty($this->title)) {
                 // TRANS: Client exception thrown when trying to post an event without providing a title.
                 throw new ClientException(_m('Event must have a title.'));
@@ -198,6 +206,11 @@ class NeweventAction extends Action
                 throw new ClientException(_m('Event must have an end time.'));
             }
 
+            if (!empty($this->url) && Validate::uri($this->url) === false) {
+                // TRANS: Client exception thrown when trying to post an event with an invalid URL.
+                throw new ClientException(_m('URL must be valid.'));
+            }
+
             $options = array();
 
             // Does the heavy-lifting for getting "To:" information
@@ -220,9 +233,14 @@ class NeweventAction extends Action
             RSVP::saveNew($profile, $event, RSVP::POSITIVE);
 
         } catch (ClientException $ce) {
-            $this->error = $ce->getMessage();
-            $this->showPage();
-            return;
+            if ($this->boolean('ajax')) {
+                $this->outputAjaxError($ce->getMessage());
+                return;
+            } else {
+                $this->error = $ce->getMessage();
+                $this->showPage();
+                return;
+            }
         }
 
         if ($this->boolean('ajax')) {
@@ -242,6 +260,23 @@ class NeweventAction extends Action
         }
     }
 
+    // @todo factor this out into a base class
+    function outputAjaxError($msg)
+    {
+        header('Content-Type: text/xml;charset=utf-8');
+        $this->xw->startDocument('1.0', 'UTF-8');
+        $this->elementStart('html');
+        $this->elementStart('head');
+        // TRANS: Page title after an AJAX error occurs
+        $this->element('title', null, _('Ajax Error'));
+        $this->elementEnd('head');
+        $this->elementStart('body');
+        $this->element('p', array('id' => 'error'), $msg);
+        $this->elementEnd('body');
+        $this->elementEnd('html');
+        return;
+    }
+
     /**
      * Show the event form
      *
diff --git a/plugins/Event/newrsvp.php b/plugins/Event/newrsvp.php
index e9adf405d8..8052b972a4 100644
--- a/plugins/Event/newrsvp.php
+++ b/plugins/Event/newrsvp.php
@@ -78,14 +78,14 @@ class NewrsvpAction extends Action
         $eventId = $this->trimmed('event');
 
         if (empty($eventId)) {
-            // TRANS: Client exception thrown when requesting a non-exsting event.
+            // TRANS: Client exception thrown when referring to a non-existing event.
             throw new ClientException(_m('No such event.'));
         }
 
         $this->event = Happening::staticGet('id', $eventId);
 
         if (empty($this->event)) {
-            // TRANS: Client exception thrown when requesting a non-exsting event.
+            // TRANS: Client exception thrown when referring to a non-existing event.
             throw new ClientException(_m('No such event.'));
         }
 
diff --git a/plugins/Event/timelist.php b/plugins/Event/timelist.php
new file mode 100644
index 0000000000..cb8efb3c1d
--- /dev/null
+++ b/plugins/Event/timelist.php
@@ -0,0 +1,107 @@
+<?php
+/**
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2011, StatusNet, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Event
+ * @package   StatusNet
+ * @author    Zach Copley <zach@status.net>
+ * @copyright 2011 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    exit(1);
+}
+
+/**
+ * Callback handler to populate end time dropdown
+ */
+class TimelistAction extends Action {
+    private $start;
+    private $duration;
+
+    /**
+     * Get ready
+     *
+     * @param array $args misc. arguments
+     *
+     * @return boolean true
+     */
+    function prepare($args) {
+        parent::prepare($args);
+        $this->start = $this->arg('start');
+        $this->duration = $this->boolean('duration', false);
+        return true;
+    }
+
+    /**
+     * Handle input and ouput something
+     *
+     * @param array $args $_REQUEST arguments
+     *
+     * @return void
+     */
+    function handle($args)
+    {
+        parent::handle($args);
+
+        if (!common_logged_in()) {
+            // TRANS: Error message displayed when trying to perform an action that requires a logged in user.
+            $this->clientError(_m('Not logged in.'));
+            return;
+        }
+
+        if (!empty($this->start)) {
+            $times = EventTimeList::getTimes($this->start, $this->duration);
+        } else {
+            // TRANS: Client error when submitting a form with unexpected information.
+            $this->clientError(_m('Unexpected form submission.'));
+            return;
+        }
+
+        if ($this->boolean('ajax')) {
+            header('Content-Type: application/json; charset=utf-8');
+            print json_encode($times);
+        } else {
+            // TRANS: Client error displayed when using an action in a non-AJAX way.
+            $this->clientError(_m('This action is AJAX only.'));
+        }
+    }
+
+    /**
+     * Override the regular error handler to show something more
+     * ajaxy
+     *
+     * @param string $msg   error message
+     * @param int    $code  error code
+     */
+    function clientError($msg, $code = 400) {
+        if ($this->boolean('ajax')) {
+            header('Content-Type: application/json; charset=utf-8');
+            print json_encode(
+                array(
+                    'success' => false,
+                    'code'    => $code,
+                    'message' => $msg
+                )
+            );
+        } else {
+            parent::clientError($msg, $code);
+        }
+    }
+}
diff --git a/plugins/ExtendedProfile/actions/profiledetailsettings.php b/plugins/ExtendedProfile/actions/profiledetailsettings.php
index f01c25fc5f..1cf7003473 100644
--- a/plugins/ExtendedProfile/actions/profiledetailsettings.php
+++ b/plugins/ExtendedProfile/actions/profiledetailsettings.php
@@ -23,9 +23,9 @@ if (!defined('STATUSNET')) {
 
 class ProfileDetailSettingsAction extends ProfileSettingsAction
 {
-
     function title()
     {
+        // TRANS: Title for extended profile settings.
         return _m('Extended profile settings');
     }
 
@@ -59,8 +59,8 @@ class ProfileDetailSettingsAction extends ProfileSettingsAction
         $token = $this->trimmed('token');
         if (!$token || $token != common_session_token()) {
             $this->showForm(
-                _m(
-                    'There was a problem with your session token. '
+                // TRANS: Client error displayed when the session token does not match or is not given.
+                _m('There was a problem with your session token. '
                     .   'Try again, please.'
                   )
             );
@@ -133,6 +133,7 @@ class ProfileDetailSettingsAction extends ProfileSettingsAction
             return;
         }
 
+        // TRANS: Success message after saving extended profile details.
         $this->showForm(_m('Details saved.'), true);
 
     }
@@ -520,6 +521,7 @@ class ProfileDetailSettingsAction extends ProfileSettingsAction
             $result = $detail->insert();
             if (empty($result)) {
                 common_log_db_error($detail, 'INSERT', __FILE__);
+                // TRANS: Server error displayed when a field could not be saved in the database.
                 $this->serverError(_m('Could not save profile details.'));
             }
         } else {
@@ -532,6 +534,7 @@ class ProfileDetailSettingsAction extends ProfileSettingsAction
             $result = $detail->update($orig);
             if (empty($result)) {
                 common_log_db_error($detail, 'UPDATE', __FILE__);
+                // TRANS: Server error displayed when a field could not be saved in the database.
                 $this->serverError(_m('Could not save profile details.'));
             }
         }
diff --git a/plugins/ExtendedProfile/locale/ExtendedProfile.pot b/plugins/ExtendedProfile/locale/ExtendedProfile.pot
index c43be9f1c4..702edeacf4 100644
--- a/plugins/ExtendedProfile/locale/ExtendedProfile.pot
+++ b/plugins/ExtendedProfile/locale/ExtendedProfile.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,6 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#. TRANS: Title for extended profile settings.
 #: actions/profiledetailsettings.php:29
 msgid "Extended profile settings"
 msgstr ""
@@ -26,6 +27,7 @@ msgid ""
 "You can update your personal profile info here so people know more about you."
 msgstr ""
 
+#. TRANS: Client error displayed when the session token does not match or is not given.
 #: actions/profiledetailsettings.php:63
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
@@ -35,49 +37,51 @@ msgstr ""
 msgid "Unexpected form submission."
 msgstr ""
 
-#: actions/profiledetailsettings.php:136
+#. TRANS: Success message after saving extended profile details.
+#: actions/profiledetailsettings.php:137
 msgid "Details saved."
 msgstr ""
 
 #. TRANS: Exception thrown when no date was entered in a required date field.
 #. TRANS: %s is the field name.
-#: actions/profiledetailsettings.php:147
+#: actions/profiledetailsettings.php:148
 #, php-format
 msgid "You must supply a date for \"%s\"."
 msgstr ""
 
 #. TRANS: Exception thrown on incorrect data input.
 #. TRANS: %1$s is a field name, %2$s is the incorrect input.
-#: actions/profiledetailsettings.php:159
+#: actions/profiledetailsettings.php:160
 #, php-format
 msgid "Invalid date entered for \"%1$s\": %2$s."
 msgstr ""
 
 #. TRANS: Exception thrown when entering an invalid URL.
 #. TRANS: %s is the invalid URL.
-#: actions/profiledetailsettings.php:275
+#: actions/profiledetailsettings.php:276
 #, php-format
 msgid "Invalid URL: %s."
 msgstr ""
 
-#: actions/profiledetailsettings.php:523 actions/profiledetailsettings.php:535
+#. TRANS: Server error displayed when a field could not be saved in the database.
+#: actions/profiledetailsettings.php:525 actions/profiledetailsettings.php:538
 msgid "Could not save profile details."
 msgstr ""
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
-#: actions/profiledetailsettings.php:580
+#: actions/profiledetailsettings.php:583
 #, php-format
 msgid "Invalid tag: \"%s\"."
 msgstr ""
 
 #. TRANS: Server error thrown when user profile settings could not be saved.
-#: actions/profiledetailsettings.php:622
+#: actions/profiledetailsettings.php:625
 msgid "Could not save profile."
 msgstr ""
 
 #. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profiledetailsettings.php:631
+#: actions/profiledetailsettings.php:634
 msgid "Could not save tags."
 msgstr ""
 
@@ -124,19 +128,13 @@ msgstr ""
 msgid "Company"
 msgstr ""
 
-#. TRANS: Field label in experience area of extended profile (when did one start a position).
-#. TRANS: Field label in experience edit area of extended profile (when did one start at a company).
-#. TRANS: Field label in education area of extended profile (when did one start an education).
-#. TRANS: Field label in education edit area of extended profile (when did one start an education).
+#. TRANS: Field label in extended profile (when did one start a position or education).
 #: lib/extendedprofilewidget.php:332 lib/extendedprofilewidget.php:380
 #: lib/extendedprofilewidget.php:426 lib/extendedprofilewidget.php:481
 msgid "Start"
 msgstr ""
 
-#. TRANS: Field label in experience area of extended profile (when did one end a position).
-#. TRANS: Field label in experience edit area of extended profile (when did one terminate at a company).
-#. TRANS: Field label in education area of extended profile (when did one end a education).
-#. TRANS: Field label in education edit area of extended profile (when did one end an education).
+#. TRANS: Field label in extended profile (when did one end a position or education).
 #: lib/extendedprofilewidget.php:340 lib/extendedprofilewidget.php:388
 #: lib/extendedprofilewidget.php:434 lib/extendedprofilewidget.php:490
 msgid "End"
@@ -160,8 +158,7 @@ msgstr ""
 msgid "Institution"
 msgstr ""
 
-#. TRANS: Field label in education area of extended profile.
-#. TRANS: Field label in education edit area of extended profile.
+#. TRANS: Field label in extended profile for specifying an academic degree.
 #: lib/extendedprofilewidget.php:420 lib/extendedprofilewidget.php:464
 msgid "Degree"
 msgstr ""
diff --git a/plugins/ExtendedProfile/locale/ar/LC_MESSAGES/ExtendedProfile.po b/plugins/ExtendedProfile/locale/ar/LC_MESSAGES/ExtendedProfile.po
new file mode 100644
index 0000000000..e17bb9f76f
--- /dev/null
+++ b/plugins/ExtendedProfile/locale/ar/LC_MESSAGES/ExtendedProfile.po
@@ -0,0 +1,233 @@
+# Translation of StatusNet - ExtendedProfile to Arabic (العربية)
+# Exported from translatewiki.net
+#
+# Author: OsamaK
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - ExtendedProfile\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:30+0000\n"
+"Language-Team: Arabic <https://translatewiki.net/wiki/Portal:ar>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:50:06+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: ar\n"
+"X-Message-Group: #out-statusnet-plugin-extendedprofile\n"
+"Plural-Forms: nplurals=6; plural=(n == 0) ? 0 : ( (n == 1) ? 1 : ( (n == "
+"2) ? 2 : ( (n%100 >= 3 && n%100 <= 10) ? 3 : ( (n%100 >= 11 && n%100 <= "
+"99) ? 4 : 5 ) ) ) );\n"
+
+#. TRANS: Title for extended profile settings.
+msgid "Extended profile settings"
+msgstr ""
+
+#. TRANS: Usage instructions for profile settings.
+msgid ""
+"You can update your personal profile info here so people know more about you."
+msgstr "يمكن أن تحدث معلومات مل�ك الشخصي ليعر� الناس عنك أكثر."
+
+#. TRANS: Client error displayed when the session token does not match or is not given.
+msgid "There was a problem with your session token. Try again, please."
+msgstr ""
+
+#. TRANS: Message given submitting a form with an unknown action.
+msgid "Unexpected form submission."
+msgstr ""
+
+#. TRANS: Success message after saving extended profile details.
+msgid "Details saved."
+msgstr "ح�ظت الت�اصيل."
+
+#. TRANS: Exception thrown when no date was entered in a required date field.
+#. TRANS: %s is the field name.
+#, php-format
+msgid "You must supply a date for \"%s\"."
+msgstr ""
+
+#. TRANS: Exception thrown on incorrect data input.
+#. TRANS: %1$s is a field name, %2$s is the incorrect input.
+#, php-format
+msgid "Invalid date entered for \"%1$s\": %2$s."
+msgstr ""
+
+#. TRANS: Exception thrown when entering an invalid URL.
+#. TRANS: %s is the invalid URL.
+#, php-format
+msgid "Invalid URL: %s."
+msgstr "مسار غير صالح: %s."
+
+#. TRANS: Server error displayed when a field could not be saved in the database.
+msgid "Could not save profile details."
+msgstr ""
+
+#. TRANS: Validation error in form for profile settings.
+#. TRANS: %s is an invalid tag.
+#, php-format
+msgid "Invalid tag: \"%s\"."
+msgstr "وسم غير صالح: \"%s\"."
+
+#. TRANS: Server error thrown when user profile settings could not be saved.
+msgid "Could not save profile."
+msgstr "تعذر ح�ظ المل� الشخصي."
+
+#. TRANS: Server error thrown when user profile settings tags could not be saved.
+msgid "Could not save tags."
+msgstr "تعذّر ح�ظ الوسوم."
+
+#. TRANS: Link title for link on user profile.
+msgid "Edit extended profile settings"
+msgstr ""
+
+#. TRANS: Link text for link on user profile.
+msgid "Edit"
+msgstr "عدل"
+
+#. TRANS: Plugin description.
+msgid "UI extensions for additional profile fields."
+msgstr ""
+
+#. TRANS: Link text on user profile page leading to extended profile page.
+msgid "More details..."
+msgstr "مزيد من الت�اصيل..."
+
+#. TRANS: Title for extended profile entry deletion dialog.
+msgid "Confirmation Required"
+msgstr ""
+
+#. TRANS: Confirmation text for extended profile entry deletion dialog.
+msgid "Really delete this entry?"
+msgstr "أأحذ� هذه المدخلة حقا؟"
+
+#. TRANS: Value between parentheses (phone number, website, or IM address).
+#, php-format
+msgid "(%s)"
+msgstr "(%s)"
+
+#. TRANS: Field label in experience area of extended profile.
+#. TRANS: Field label in experience edit area of extended profile (which company does one work for).
+msgid "Company"
+msgstr "الشركة"
+
+#. TRANS: Field label in extended profile (when did one start a position or education).
+msgid "Start"
+msgstr "البدء"
+
+#. TRANS: Field label in extended profile (when did one end a position or education).
+msgid "End"
+msgstr "الانتهاء"
+
+#. TRANS: Field value in experience area of extended profile (one still holds a position).
+msgid "(Current)"
+msgstr "الحالية"
+
+#. TRANS: Checkbox label in experience edit area of extended profile (one still works at a company).
+msgid "Current"
+msgstr "حالي"
+
+#. TRANS: Field label in education area of extended profile.
+#. TRANS: Field label in education edit area of extended profile.
+#. TRANS: Field label for extended profile properties.
+msgid "Institution"
+msgstr "المنشأة"
+
+#. TRANS: Field label in extended profile for specifying an academic degree.
+msgid "Degree"
+msgstr "الشهادة"
+
+#. TRANS: Field label in education area of extended profile.
+#. TRANS: Field label in education edit area of extended profile.
+msgid "Description"
+msgstr "الوص�"
+
+#. TRANS: Link description in extended profile page to add another profile element.
+msgid "Add another item"
+msgstr "أض� عنصرا آخرا"
+
+#. TRANS: Field label for undefined field in extended profile.
+#, php-format
+msgid "TYPE: %s"
+msgstr ""
+
+#. TRANS: Button text for saving extended profile properties.
+msgctxt "BUTTON"
+msgid "Save"
+msgstr "اح�ظ"
+
+#. TRANS: .
+#. TRANS: Button title for saving extended profile properties.
+msgid "Save details"
+msgstr "اح�ظ الت�اصيل"
+
+#. TRANS: Field label for extended profile properties.
+msgid "Phone"
+msgstr "الهات�"
+
+#. TRANS: Field label for extended profile properties (Instant Messaging).
+msgid "IM"
+msgstr "المراسلة ال�ورية"
+
+#. TRANS: Field label for extended profile properties.
+msgid "Website"
+msgstr "موقع الوب"
+
+#. TRANS: Field label for extended profile properties.
+msgid "Employer"
+msgstr ""
+
+#. TRANS: Field label for extended profile properties.
+msgid "Personal"
+msgstr "معلومات شخصية"
+
+#. TRANS: Field label for extended profile properties.
+msgid "Full name"
+msgstr "الاسم الكامل"
+
+#. TRANS: Field label for extended profile properties.
+msgid "Title"
+msgstr "الم�سمى"
+
+#. TRANS: Field label for extended profile properties.
+msgid "Manager"
+msgstr ""
+
+#. TRANS: Field label for extended profile properties.
+msgid "Location"
+msgstr "المكان"
+
+#. TRANS: Field label for extended profile properties.
+msgid "Bio"
+msgstr "السيرة"
+
+#. TRANS: Field label for extended profile properties.
+msgid "Tags"
+msgstr "الوسوم"
+
+#. TRANS: Field label for extended profile properties.
+msgid "Contact"
+msgstr "معلومات الاتصال"
+
+#. TRANS: Field label for extended profile properties.
+msgid "Birthday"
+msgstr "عيد الميلاد"
+
+#. TRANS: Field label for extended profile properties.
+msgid "Spouse's name"
+msgstr "اسم الزوج"
+
+#. TRANS: Field label for extended profile properties.
+msgid "Kids' names"
+msgstr "أسماء الأط�ال"
+
+#. TRANS: Field label for extended profile properties.
+msgid "Work experience"
+msgstr "الخبرات المهنية"
+
+#. TRANS: Field label for extended profile properties.
+msgid "Education"
+msgstr "التعليم"
diff --git a/plugins/ExtendedProfile/locale/br/LC_MESSAGES/ExtendedProfile.po b/plugins/ExtendedProfile/locale/br/LC_MESSAGES/ExtendedProfile.po
index c80afffe39..004331a16e 100644
--- a/plugins/ExtendedProfile/locale/br/LC_MESSAGES/ExtendedProfile.po
+++ b/plugins/ExtendedProfile/locale/br/LC_MESSAGES/ExtendedProfile.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - ExtendedProfile to Breton (Brezhoneg)
+# Translation of StatusNet - ExtendedProfile to Breton (brezhoneg)
 # Exported from translatewiki.net
 #
 # Author: Y-M D
@@ -9,18 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ExtendedProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:24+0000\n"
-"Language-Team: Breton <http://translatewiki.net/wiki/Portal:br>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:30+0000\n"
+"Language-Team: Breton <https://translatewiki.net/wiki/Portal:br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:26:39+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:06+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-extendedprofile\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#. TRANS: Title for extended profile settings.
 msgid "Extended profile settings"
 msgstr "Arventennoù ledanet ar profil"
 
@@ -29,6 +30,7 @@ msgid ""
 "You can update your personal profile info here so people know more about you."
 msgstr ""
 
+#. TRANS: Client error displayed when the session token does not match or is not given.
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 
@@ -36,8 +38,9 @@ msgstr ""
 msgid "Unexpected form submission."
 msgstr ""
 
+#. TRANS: Success message after saving extended profile details.
 msgid "Details saved."
-msgstr ""
+msgstr "Munudoù bet enrollet."
 
 #. TRANS: Exception thrown when no date was entered in a required date field.
 #. TRANS: %s is the field name.
@@ -55,8 +58,9 @@ msgstr ""
 #. TRANS: %s is the invalid URL.
 #, php-format
 msgid "Invalid URL: %s."
-msgstr ""
+msgstr "URL direizh : %s."
 
+#. TRANS: Server error displayed when a field could not be saved in the database.
 msgid "Could not save profile details."
 msgstr ""
 
@@ -101,34 +105,28 @@ msgstr ""
 #. TRANS: Value between parentheses (phone number, website, or IM address).
 #, php-format
 msgid "(%s)"
-msgstr ""
+msgstr "(%s)"
 
 #. TRANS: Field label in experience area of extended profile.
 #. TRANS: Field label in experience edit area of extended profile (which company does one work for).
 msgid "Company"
-msgstr ""
+msgstr "Embregerezh"
 
-#. TRANS: Field label in experience area of extended profile (when did one start a position).
-#. TRANS: Field label in experience edit area of extended profile (when did one start at a company).
-#. TRANS: Field label in education area of extended profile (when did one start an education).
-#. TRANS: Field label in education edit area of extended profile (when did one start an education).
+#. TRANS: Field label in extended profile (when did one start a position or education).
 msgid "Start"
-msgstr ""
+msgstr "Deroù"
 
-#. TRANS: Field label in experience area of extended profile (when did one end a position).
-#. TRANS: Field label in experience edit area of extended profile (when did one terminate at a company).
-#. TRANS: Field label in education area of extended profile (when did one end a education).
-#. TRANS: Field label in education edit area of extended profile (when did one end an education).
+#. TRANS: Field label in extended profile (when did one end a position or education).
 msgid "End"
-msgstr ""
+msgstr "Fin"
 
 #. TRANS: Field value in experience area of extended profile (one still holds a position).
 msgid "(Current)"
-msgstr ""
+msgstr "(Red)"
 
 #. TRANS: Checkbox label in experience edit area of extended profile (one still works at a company).
 msgid "Current"
-msgstr ""
+msgstr "Red"
 
 #. TRANS: Field label in education area of extended profile.
 #. TRANS: Field label in education edit area of extended profile.
@@ -136,34 +134,33 @@ msgstr ""
 msgid "Institution"
 msgstr "Ensavadur"
 
-#. TRANS: Field label in education area of extended profile.
-#. TRANS: Field label in education edit area of extended profile.
+#. TRANS: Field label in extended profile for specifying an academic degree.
 msgid "Degree"
-msgstr ""
+msgstr "Diplom"
 
 #. TRANS: Field label in education area of extended profile.
 #. TRANS: Field label in education edit area of extended profile.
 msgid "Description"
-msgstr ""
+msgstr "Deskrivadur"
 
 #. TRANS: Link description in extended profile page to add another profile element.
 msgid "Add another item"
-msgstr ""
+msgstr "Ouzhpennañ un elfenn all"
 
 #. TRANS: Field label for undefined field in extended profile.
 #, php-format
 msgid "TYPE: %s"
-msgstr ""
+msgstr "SEURT : %s"
 
 #. TRANS: Button text for saving extended profile properties.
 msgctxt "BUTTON"
 msgid "Save"
-msgstr ""
+msgstr "Enrollañ"
 
 #. TRANS: .
 #. TRANS: Button title for saving extended profile properties.
 msgid "Save details"
-msgstr ""
+msgstr "Enrollañ ar munudoù"
 
 #. TRANS: Field label for extended profile properties.
 msgid "Phone"
@@ -174,13 +171,12 @@ msgid "IM"
 msgstr "IM"
 
 #. TRANS: Field label for extended profile properties.
-#, fuzzy
 msgid "Website"
-msgstr "Lec'hiennoù web"
+msgstr "Lec'hienn internet"
 
 #. TRANS: Field label for extended profile properties.
 msgid "Employer"
-msgstr ""
+msgstr "Implijer"
 
 #. TRANS: Field label for extended profile properties.
 msgid "Personal"
diff --git a/plugins/ExtendedProfile/locale/ca/LC_MESSAGES/ExtendedProfile.po b/plugins/ExtendedProfile/locale/ca/LC_MESSAGES/ExtendedProfile.po
index 5418a89a21..1efb477b8d 100644
--- a/plugins/ExtendedProfile/locale/ca/LC_MESSAGES/ExtendedProfile.po
+++ b/plugins/ExtendedProfile/locale/ca/LC_MESSAGES/ExtendedProfile.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - ExtendedProfile to Catalan (Català)
+# Translation of StatusNet - ExtendedProfile to Catalan (català)
 # Exported from translatewiki.net
 #
 # Author: Solde
@@ -10,33 +10,40 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ExtendedProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:24+0000\n"
-"Language-Team: Catalan <http://translatewiki.net/wiki/Portal:ca>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:30+0000\n"
+"Language-Team: Catalan <https://translatewiki.net/wiki/Portal:ca>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:26:39+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:06+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ca\n"
 "X-Message-Group: #out-statusnet-plugin-extendedprofile\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Title for extended profile settings.
 msgid "Extended profile settings"
-msgstr ""
+msgstr "Paràmetres de perfil estès"
 
 #. TRANS: Usage instructions for profile settings.
 msgid ""
 "You can update your personal profile info here so people know more about you."
 msgstr ""
+"Podeu actualitzar la vostra informació personal a continuació per tal que la "
+"gent us conegui més."
 
+#. TRANS: Client error displayed when the session token does not match or is not given.
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
+"S'ha produït un problema amb el vostre testimoni de sessió. Torneu-ho a "
+"provar."
 
 #. TRANS: Message given submitting a form with an unknown action.
 msgid "Unexpected form submission."
-msgstr ""
+msgstr "Tramesa de formulari no esperada."
 
+#. TRANS: Success message after saving extended profile details.
 msgid "Details saved."
 msgstr "S'han desat els detalls."
 
@@ -56,16 +63,17 @@ msgstr ""
 #. TRANS: %s is the invalid URL.
 #, php-format
 msgid "Invalid URL: %s."
-msgstr ""
+msgstr "URL no vàlid: %s."
 
+#. TRANS: Server error displayed when a field could not be saved in the database.
 msgid "Could not save profile details."
-msgstr ""
+msgstr "No es poden desar els detalls de perfil."
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
 #, php-format
 msgid "Invalid tag: \"%s\"."
-msgstr ""
+msgstr "Etiqueta no vàlida: «%s»."
 
 #. TRANS: Server error thrown when user profile settings could not be saved.
 msgid "Could not save profile."
@@ -85,47 +93,41 @@ msgstr "Edita"
 
 #. TRANS: Plugin description.
 msgid "UI extensions for additional profile fields."
-msgstr ""
+msgstr "Extensions d'interfície per a camps de perfil addicionals."
 
 #. TRANS: Link text on user profile page leading to extended profile page.
 msgid "More details..."
-msgstr ""
+msgstr "Més detalls..."
 
 #. TRANS: Title for extended profile entry deletion dialog.
 msgid "Confirmation Required"
-msgstr ""
+msgstr "Cal una confirmació"
 
 #. TRANS: Confirmation text for extended profile entry deletion dialog.
 msgid "Really delete this entry?"
-msgstr ""
+msgstr "Voleu eliminar aquesta entrada?"
 
 #. TRANS: Value between parentheses (phone number, website, or IM address).
 #, php-format
 msgid "(%s)"
-msgstr ""
+msgstr "(%s)"
 
 #. TRANS: Field label in experience area of extended profile.
 #. TRANS: Field label in experience edit area of extended profile (which company does one work for).
 msgid "Company"
 msgstr "Empresa"
 
-#. TRANS: Field label in experience area of extended profile (when did one start a position).
-#. TRANS: Field label in experience edit area of extended profile (when did one start at a company).
-#. TRANS: Field label in education area of extended profile (when did one start an education).
-#. TRANS: Field label in education edit area of extended profile (when did one start an education).
+#. TRANS: Field label in extended profile (when did one start a position or education).
 msgid "Start"
 msgstr "Comença"
 
-#. TRANS: Field label in experience area of extended profile (when did one end a position).
-#. TRANS: Field label in experience edit area of extended profile (when did one terminate at a company).
-#. TRANS: Field label in education area of extended profile (when did one end a education).
-#. TRANS: Field label in education edit area of extended profile (when did one end an education).
+#. TRANS: Field label in extended profile (when did one end a position or education).
 msgid "End"
 msgstr "Acaba"
 
 #. TRANS: Field value in experience area of extended profile (one still holds a position).
 msgid "(Current)"
-msgstr ""
+msgstr "(Actual)"
 
 #. TRANS: Checkbox label in experience edit area of extended profile (one still works at a company).
 msgid "Current"
@@ -137,8 +139,7 @@ msgstr "Actual"
 msgid "Institution"
 msgstr "Institució"
 
-#. TRANS: Field label in education area of extended profile.
-#. TRANS: Field label in education edit area of extended profile.
+#. TRANS: Field label in extended profile for specifying an academic degree.
 msgid "Degree"
 msgstr "Titolació"
 
@@ -149,7 +150,7 @@ msgstr "Descripció"
 
 #. TRANS: Link description in extended profile page to add another profile element.
 msgid "Add another item"
-msgstr ""
+msgstr "Afegeix un altre element"
 
 #. TRANS: Field label for undefined field in extended profile.
 #, php-format
diff --git a/plugins/ExtendedProfile/locale/de/LC_MESSAGES/ExtendedProfile.po b/plugins/ExtendedProfile/locale/de/LC_MESSAGES/ExtendedProfile.po
index 46713dfe84..528dc77451 100644
--- a/plugins/ExtendedProfile/locale/de/LC_MESSAGES/ExtendedProfile.po
+++ b/plugins/ExtendedProfile/locale/de/LC_MESSAGES/ExtendedProfile.po
@@ -3,6 +3,7 @@
 #
 # Author: George Animal
 # Author: Giftpflanze
+# Author: Kghbln
 # --
 # This file is distributed under the same license as the StatusNet package.
 #
@@ -10,18 +11,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ExtendedProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:24+0000\n"
-"Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:30+0000\n"
+"Language-Team: German <https://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:26:39+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:06+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-extendedprofile\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Title for extended profile settings.
 msgid "Extended profile settings"
 msgstr "Erweiterte Profileinstellungen"
 
@@ -32,6 +34,7 @@ msgstr ""
 "Du kannst hier dein persönliches Profil aktualisieren, damit andere Personen "
 "mehr über dich wissen."
 
+#. TRANS: Client error displayed when the session token does not match or is not given.
 msgid "There was a problem with your session token. Try again, please."
 msgstr "Es gab ein Problem mit deinem Sessiontoken. Bitte versuche es erneut."
 
@@ -39,6 +42,7 @@ msgstr "Es gab ein Problem mit deinem Sessiontoken. Bitte versuche es erneut."
 msgid "Unexpected form submission."
 msgstr "Unerwartete Formulareingabe."
 
+#. TRANS: Success message after saving extended profile details.
 msgid "Details saved."
 msgstr "Informationen gespeichert."
 
@@ -60,6 +64,7 @@ msgstr "Ungültiges Datum %2$s für „%1$s“ eingegeben."
 msgid "Invalid URL: %s."
 msgstr "Ungültige URL: %s."
 
+#. TRANS: Server error displayed when a field could not be saved in the database.
 msgid "Could not save profile details."
 msgstr "Konnte Profilinformationen nicht speichern."
 
@@ -111,17 +116,11 @@ msgstr "(%s)"
 msgid "Company"
 msgstr "Unternehmen"
 
-#. TRANS: Field label in experience area of extended profile (when did one start a position).
-#. TRANS: Field label in experience edit area of extended profile (when did one start at a company).
-#. TRANS: Field label in education area of extended profile (when did one start an education).
-#. TRANS: Field label in education edit area of extended profile (when did one start an education).
+#. TRANS: Field label in extended profile (when did one start a position or education).
 msgid "Start"
 msgstr "Beginn"
 
-#. TRANS: Field label in experience area of extended profile (when did one end a position).
-#. TRANS: Field label in experience edit area of extended profile (when did one terminate at a company).
-#. TRANS: Field label in education area of extended profile (when did one end a education).
-#. TRANS: Field label in education edit area of extended profile (when did one end an education).
+#. TRANS: Field label in extended profile (when did one end a position or education).
 msgid "End"
 msgstr "Ende"
 
@@ -139,8 +138,7 @@ msgstr "bis heute"
 msgid "Institution"
 msgstr "Einrichtung"
 
-#. TRANS: Field label in education area of extended profile.
-#. TRANS: Field label in education edit area of extended profile.
+#. TRANS: Field label in extended profile for specifying an academic degree.
 msgid "Degree"
 msgstr "Akademischer Grad"
 
@@ -198,7 +196,7 @@ msgstr "Titel"
 
 #. TRANS: Field label for extended profile properties.
 msgid "Manager"
-msgstr "Manager"
+msgstr "Verwalter"
 
 #. TRANS: Field label for extended profile properties.
 msgid "Location"
diff --git a/plugins/ExtendedProfile/locale/diq/LC_MESSAGES/ExtendedProfile.po b/plugins/ExtendedProfile/locale/diq/LC_MESSAGES/ExtendedProfile.po
new file mode 100644
index 0000000000..88fd863f49
--- /dev/null
+++ b/plugins/ExtendedProfile/locale/diq/LC_MESSAGES/ExtendedProfile.po
@@ -0,0 +1,228 @@
+# Translation of StatusNet - ExtendedProfile to Zazaki (Zazaki)
+# Exported from translatewiki.net
+#
+# Author: Erdemaslancan
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - ExtendedProfile\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:31+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:50:06+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Title for extended profile settings.
+msgid "Extended profile settings"
+msgstr ""
+
+#. TRANS: Usage instructions for profile settings.
+msgid ""
+"You can update your personal profile info here so people know more about you."
+msgstr ""
+
+#. TRANS: Client error displayed when the session token does not match or is not given.
+msgid "There was a problem with your session token. Try again, please."
+msgstr ""
+
+#. TRANS: Message given submitting a form with an unknown action.
+msgid "Unexpected form submission."
+msgstr ""
+
+#. TRANS: Success message after saving extended profile details.
+msgid "Details saved."
+msgstr ""
+
+#. TRANS: Exception thrown when no date was entered in a required date field.
+#. TRANS: %s is the field name.
+#, php-format
+msgid "You must supply a date for \"%s\"."
+msgstr ""
+
+#. TRANS: Exception thrown on incorrect data input.
+#. TRANS: %1$s is a field name, %2$s is the incorrect input.
+#, php-format
+msgid "Invalid date entered for \"%1$s\": %2$s."
+msgstr ""
+
+#. TRANS: Exception thrown when entering an invalid URL.
+#. TRANS: %s is the invalid URL.
+#, php-format
+msgid "Invalid URL: %s."
+msgstr ""
+
+#. TRANS: Server error displayed when a field could not be saved in the database.
+msgid "Could not save profile details."
+msgstr ""
+
+#. TRANS: Validation error in form for profile settings.
+#. TRANS: %s is an invalid tag.
+#, php-format
+msgid "Invalid tag: \"%s\"."
+msgstr ""
+
+#. TRANS: Server error thrown when user profile settings could not be saved.
+msgid "Could not save profile."
+msgstr ""
+
+#. TRANS: Server error thrown when user profile settings tags could not be saved.
+msgid "Could not save tags."
+msgstr ""
+
+#. TRANS: Link title for link on user profile.
+msgid "Edit extended profile settings"
+msgstr ""
+
+#. TRANS: Link text for link on user profile.
+msgid "Edit"
+msgstr "Bıvurne"
+
+#. TRANS: Plugin description.
+msgid "UI extensions for additional profile fields."
+msgstr ""
+
+#. TRANS: Link text on user profile page leading to extended profile page.
+msgid "More details..."
+msgstr ""
+
+#. TRANS: Title for extended profile entry deletion dialog.
+msgid "Confirmation Required"
+msgstr ""
+
+#. TRANS: Confirmation text for extended profile entry deletion dialog.
+msgid "Really delete this entry?"
+msgstr ""
+
+#. TRANS: Value between parentheses (phone number, website, or IM address).
+#, php-format
+msgid "(%s)"
+msgstr "(%s)"
+
+#. TRANS: Field label in experience area of extended profile.
+#. TRANS: Field label in experience edit area of extended profile (which company does one work for).
+msgid "Company"
+msgstr "Åžirket"
+
+#. TRANS: Field label in extended profile (when did one start a position or education).
+msgid "Start"
+msgstr "Dest pêkey"
+
+#. TRANS: Field label in extended profile (when did one end a position or education).
+msgid "End"
+msgstr "Qedya"
+
+#. TRANS: Field value in experience area of extended profile (one still holds a position).
+msgid "(Current)"
+msgstr "(Nıkayên)"
+
+#. TRANS: Checkbox label in experience edit area of extended profile (one still works at a company).
+msgid "Current"
+msgstr "Nıkayên"
+
+#. TRANS: Field label in education area of extended profile.
+#. TRANS: Field label in education edit area of extended profile.
+#. TRANS: Field label for extended profile properties.
+msgid "Institution"
+msgstr ""
+
+#. TRANS: Field label in extended profile for specifying an academic degree.
+msgid "Degree"
+msgstr ""
+
+#. TRANS: Field label in education area of extended profile.
+#. TRANS: Field label in education edit area of extended profile.
+msgid "Description"
+msgstr ""
+
+#. TRANS: Link description in extended profile page to add another profile element.
+msgid "Add another item"
+msgstr ""
+
+#. TRANS: Field label for undefined field in extended profile.
+#, php-format
+msgid "TYPE: %s"
+msgstr "Babet: %s"
+
+#. TRANS: Button text for saving extended profile properties.
+msgctxt "BUTTON"
+msgid "Save"
+msgstr "Star ke"
+
+#. TRANS: .
+#. TRANS: Button title for saving extended profile properties.
+msgid "Save details"
+msgstr ""
+
+#. TRANS: Field label for extended profile properties.
+msgid "Phone"
+msgstr "Telefun"
+
+#. TRANS: Field label for extended profile properties (Instant Messaging).
+msgid "IM"
+msgstr "IM"
+
+#. TRANS: Field label for extended profile properties.
+msgid "Website"
+msgstr "Websita"
+
+#. TRANS: Field label for extended profile properties.
+msgid "Employer"
+msgstr ""
+
+#. TRANS: Field label for extended profile properties.
+msgid "Personal"
+msgstr "Personel"
+
+#. TRANS: Field label for extended profile properties.
+msgid "Full name"
+msgstr ""
+
+#. TRANS: Field label for extended profile properties.
+msgid "Title"
+msgstr "Sername"
+
+#. TRANS: Field label for extended profile properties.
+msgid "Manager"
+msgstr ""
+
+#. TRANS: Field label for extended profile properties.
+msgid "Location"
+msgstr "Lokasyon"
+
+#. TRANS: Field label for extended profile properties.
+msgid "Bio"
+msgstr "Bio"
+
+#. TRANS: Field label for extended profile properties.
+msgid "Tags"
+msgstr "Etiketi"
+
+#. TRANS: Field label for extended profile properties.
+msgid "Contact"
+msgstr "Ä°rtibat"
+
+#. TRANS: Field label for extended profile properties.
+msgid "Birthday"
+msgstr "Rocbiyayış"
+
+#. TRANS: Field label for extended profile properties.
+msgid "Spouse's name"
+msgstr ""
+
+#. TRANS: Field label for extended profile properties.
+msgid "Kids' names"
+msgstr ""
+
+#. TRANS: Field label for extended profile properties.
+msgid "Work experience"
+msgstr ""
+
+#. TRANS: Field label for extended profile properties.
+msgid "Education"
+msgstr "Terbiyet"
diff --git a/plugins/ExtendedProfile/locale/es/LC_MESSAGES/ExtendedProfile.po b/plugins/ExtendedProfile/locale/es/LC_MESSAGES/ExtendedProfile.po
new file mode 100644
index 0000000000..e6212271de
--- /dev/null
+++ b/plugins/ExtendedProfile/locale/es/LC_MESSAGES/ExtendedProfile.po
@@ -0,0 +1,232 @@
+# Translation of StatusNet - ExtendedProfile to Spanish (español)
+# Exported from translatewiki.net
+#
+# Author: Armando-Martin
+# Author: Od1n
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - ExtendedProfile\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:31+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:50:06+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Title for extended profile settings.
+msgid "Extended profile settings"
+msgstr "Parámetros de perfil extendidos"
+
+#. TRANS: Usage instructions for profile settings.
+msgid ""
+"You can update your personal profile info here so people know more about you."
+msgstr ""
+"Puede actualizar su información de perfil personal aquí para que la gente "
+"pueda saber más sobre usted."
+
+#. TRANS: Client error displayed when the session token does not match or is not given.
+msgid "There was a problem with your session token. Try again, please."
+msgstr "Hay un problema con su contraseña de sesión. Inténtelo de nuevo."
+
+#. TRANS: Message given submitting a form with an unknown action.
+msgid "Unexpected form submission."
+msgstr "Envío de formulario no esperado."
+
+#. TRANS: Success message after saving extended profile details.
+msgid "Details saved."
+msgstr "Detalles guardados."
+
+#. TRANS: Exception thrown when no date was entered in a required date field.
+#. TRANS: %s is the field name.
+#, php-format
+msgid "You must supply a date for \"%s\"."
+msgstr "Debe suministrar una fecha para \"%s\""
+
+#. TRANS: Exception thrown on incorrect data input.
+#. TRANS: %1$s is a field name, %2$s is the incorrect input.
+#, php-format
+msgid "Invalid date entered for \"%1$s\": %2$s."
+msgstr "Fecha inválida introducida para \"%1$s\": %2$s."
+
+#. TRANS: Exception thrown when entering an invalid URL.
+#. TRANS: %s is the invalid URL.
+#, php-format
+msgid "Invalid URL: %s."
+msgstr "Dirección URL no válida: %s."
+
+#. TRANS: Server error displayed when a field could not be saved in the database.
+msgid "Could not save profile details."
+msgstr "No se pudieron guardar los detalles del perfil."
+
+#. TRANS: Validation error in form for profile settings.
+#. TRANS: %s is an invalid tag.
+#, php-format
+msgid "Invalid tag: \"%s\"."
+msgstr "Etiqueta incorrecta: \"%s\"."
+
+#. TRANS: Server error thrown when user profile settings could not be saved.
+msgid "Could not save profile."
+msgstr "No se pudo guardar el perfil."
+
+#. TRANS: Server error thrown when user profile settings tags could not be saved.
+msgid "Could not save tags."
+msgstr "No se pudieron guardar las etiquetas."
+
+#. TRANS: Link title for link on user profile.
+msgid "Edit extended profile settings"
+msgstr "Modificar la configuración extendida de perfil"
+
+#. TRANS: Link text for link on user profile.
+msgid "Edit"
+msgstr "Editar"
+
+#. TRANS: Plugin description.
+msgid "UI extensions for additional profile fields."
+msgstr ""
+"Extensiones de la interfaz de usuario para los campos de perfil adicionales."
+
+#. TRANS: Link text on user profile page leading to extended profile page.
+msgid "More details..."
+msgstr "Más detalles..."
+
+#. TRANS: Title for extended profile entry deletion dialog.
+msgid "Confirmation Required"
+msgstr "Se necesita confirmación"
+
+#. TRANS: Confirmation text for extended profile entry deletion dialog.
+msgid "Really delete this entry?"
+msgstr "¿Está seguro de querer borrar esta entrada?"
+
+#. TRANS: Value between parentheses (phone number, website, or IM address).
+#, php-format
+msgid "(%s)"
+msgstr "(%s)"
+
+#. TRANS: Field label in experience area of extended profile.
+#. TRANS: Field label in experience edit area of extended profile (which company does one work for).
+msgid "Company"
+msgstr "Compañía"
+
+#. TRANS: Field label in extended profile (when did one start a position or education).
+msgid "Start"
+msgstr "Inicio"
+
+#. TRANS: Field label in extended profile (when did one end a position or education).
+msgid "End"
+msgstr "Fin"
+
+#. TRANS: Field value in experience area of extended profile (one still holds a position).
+msgid "(Current)"
+msgstr "(Actual)"
+
+#. TRANS: Checkbox label in experience edit area of extended profile (one still works at a company).
+msgid "Current"
+msgstr "Actual"
+
+#. TRANS: Field label in education area of extended profile.
+#. TRANS: Field label in education edit area of extended profile.
+#. TRANS: Field label for extended profile properties.
+msgid "Institution"
+msgstr "Institución"
+
+#. TRANS: Field label in extended profile for specifying an academic degree.
+msgid "Degree"
+msgstr "Diploma"
+
+#. TRANS: Field label in education area of extended profile.
+#. TRANS: Field label in education edit area of extended profile.
+msgid "Description"
+msgstr "Descripción"
+
+#. TRANS: Link description in extended profile page to add another profile element.
+msgid "Add another item"
+msgstr "Añadir otro elemento"
+
+#. TRANS: Field label for undefined field in extended profile.
+#, php-format
+msgid "TYPE: %s"
+msgstr "TYPE : %s"
+
+#. TRANS: Button text for saving extended profile properties.
+msgctxt "BUTTON"
+msgid "Save"
+msgstr "Guardar"
+
+#. TRANS: .
+#. TRANS: Button title for saving extended profile properties.
+msgid "Save details"
+msgstr "Guardar los detalles"
+
+#. TRANS: Field label for extended profile properties.
+msgid "Phone"
+msgstr "Teléfono"
+
+#. TRANS: Field label for extended profile properties (Instant Messaging).
+msgid "IM"
+msgstr "IM"
+
+#. TRANS: Field label for extended profile properties.
+msgid "Website"
+msgstr "Sitio Web"
+
+#. TRANS: Field label for extended profile properties.
+msgid "Employer"
+msgstr "Empleador"
+
+#. TRANS: Field label for extended profile properties.
+msgid "Personal"
+msgstr "Personal"
+
+#. TRANS: Field label for extended profile properties.
+msgid "Full name"
+msgstr "Nombre completo"
+
+#. TRANS: Field label for extended profile properties.
+msgid "Title"
+msgstr "Título"
+
+#. TRANS: Field label for extended profile properties.
+msgid "Manager"
+msgstr "Administrador"
+
+#. TRANS: Field label for extended profile properties.
+msgid "Location"
+msgstr "Localización"
+
+#. TRANS: Field label for extended profile properties.
+msgid "Bio"
+msgstr "Biografía"
+
+#. TRANS: Field label for extended profile properties.
+msgid "Tags"
+msgstr "Etiquetas"
+
+#. TRANS: Field label for extended profile properties.
+msgid "Contact"
+msgstr "Contacto"
+
+#. TRANS: Field label for extended profile properties.
+msgid "Birthday"
+msgstr "Fecha de nacimiento"
+
+#. TRANS: Field label for extended profile properties.
+msgid "Spouse's name"
+msgstr "Nombre del/de la cónyuge"
+
+#. TRANS: Field label for extended profile properties.
+msgid "Kids' names"
+msgstr "Nombre de los hijos"
+
+#. TRANS: Field label for extended profile properties.
+msgid "Work experience"
+msgstr "Experiencia profesional"
+
+#. TRANS: Field label for extended profile properties.
+msgid "Education"
+msgstr "Educación"
diff --git a/plugins/ExtendedProfile/locale/eu/LC_MESSAGES/ExtendedProfile.po b/plugins/ExtendedProfile/locale/eu/LC_MESSAGES/ExtendedProfile.po
new file mode 100644
index 0000000000..1f2d6a2338
--- /dev/null
+++ b/plugins/ExtendedProfile/locale/eu/LC_MESSAGES/ExtendedProfile.po
@@ -0,0 +1,233 @@
+# Translation of StatusNet - ExtendedProfile to Basque (euskara)
+# Exported from translatewiki.net
+#
+# Author: Artsuaga
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - ExtendedProfile\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:31+0000\n"
+"Language-Team: Basque <https://translatewiki.net/wiki/Portal:eu>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:50:06+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: eu\n"
+"X-Message-Group: #out-statusnet-plugin-extendedprofile\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Title for extended profile settings.
+msgid "Extended profile settings"
+msgstr "Hedaturiko profil aukerak"
+
+#. TRANS: Usage instructions for profile settings.
+msgid ""
+"You can update your personal profile info here so people know more about you."
+msgstr ""
+"Hemen eguneratu dezakezu zure profil pertsonalaren informazioa, jendeak zuri "
+"buruz gehiago jakin dezan."
+
+#. TRANS: Client error displayed when the session token does not match or is not given.
+msgid "There was a problem with your session token. Try again, please."
+msgstr "Zure sesio tokenarekin arazo bat izan da. Saiatu berriro, mesedez."
+
+#. TRANS: Message given submitting a form with an unknown action.
+msgid "Unexpected form submission."
+msgstr "Ustekabeko inprimakiaren bidalketa."
+
+#. TRANS: Success message after saving extended profile details.
+msgid "Details saved."
+msgstr "Xehetasunak gorde dira"
+
+#. TRANS: Exception thrown when no date was entered in a required date field.
+#. TRANS: %s is the field name.
+#, php-format
+msgid "You must supply a date for \"%s\"."
+msgstr "\"%s\"(r)entzako data bat eman beharko zenuke."
+
+#. TRANS: Exception thrown on incorrect data input.
+#. TRANS: %1$s is a field name, %2$s is the incorrect input.
+#, php-format
+msgid "Invalid date entered for \"%1$s\": %2$s."
+msgstr "Okerreko data \"%1$s\"(r)entzako: %2$s."
+
+#. TRANS: Exception thrown when entering an invalid URL.
+#. TRANS: %s is the invalid URL.
+#, php-format
+msgid "Invalid URL: %s."
+msgstr "URL okerra: %s."
+
+#. TRANS: Server error displayed when a field could not be saved in the database.
+msgid "Could not save profile details."
+msgstr "Ezin izan dira profilaren xehetasunak gorde."
+
+#. TRANS: Validation error in form for profile settings.
+#. TRANS: %s is an invalid tag.
+#, php-format
+msgid "Invalid tag: \"%s\"."
+msgstr "Etiketa okerra: \"%s\"."
+
+#. TRANS: Server error thrown when user profile settings could not be saved.
+msgid "Could not save profile."
+msgstr "Ezin izan da profila gorde."
+
+#. TRANS: Server error thrown when user profile settings tags could not be saved.
+msgid "Could not save tags."
+msgstr "Ezin izan dira etiketak gorde."
+
+#. TRANS: Link title for link on user profile.
+msgid "Edit extended profile settings"
+msgstr "Editatu profil hedatuaren aukerak"
+
+#. TRANS: Link text for link on user profile.
+msgid "Edit"
+msgstr "Editatu"
+
+#. TRANS: Plugin description.
+msgid "UI extensions for additional profile fields."
+msgstr "UI luzapenak profilari eremu berriak gehitzeko."
+
+#. TRANS: Link text on user profile page leading to extended profile page.
+msgid "More details..."
+msgstr "Detaile gehiago..."
+
+#. TRANS: Title for extended profile entry deletion dialog.
+msgid "Confirmation Required"
+msgstr "Konfirmatzea Beharrezkoa"
+
+#. TRANS: Confirmation text for extended profile entry deletion dialog.
+msgid "Really delete this entry?"
+msgstr "Benetan ezabatu nahi duzu sarrera hau?"
+
+#. TRANS: Value between parentheses (phone number, website, or IM address).
+#, php-format
+msgid "(%s)"
+msgstr "(%s)"
+
+#. TRANS: Field label in experience area of extended profile.
+#. TRANS: Field label in experience edit area of extended profile (which company does one work for).
+msgid "Company"
+msgstr "Enpresa"
+
+#. TRANS: Field label in extended profile (when did one start a position or education).
+msgid "Start"
+msgstr "Hasi"
+
+#. TRANS: Field label in extended profile (when did one end a position or education).
+msgid "End"
+msgstr "Amaitu"
+
+#. TRANS: Field value in experience area of extended profile (one still holds a position).
+msgid "(Current)"
+msgstr "(Egungoa)"
+
+#. TRANS: Checkbox label in experience edit area of extended profile (one still works at a company).
+msgid "Current"
+msgstr "Egungoa"
+
+#. TRANS: Field label in education area of extended profile.
+#. TRANS: Field label in education edit area of extended profile.
+#. TRANS: Field label for extended profile properties.
+msgid "Institution"
+msgstr "Istituzioa"
+
+#. TRANS: Field label in extended profile for specifying an academic degree.
+msgid "Degree"
+msgstr "Maila"
+
+#. TRANS: Field label in education area of extended profile.
+#. TRANS: Field label in education edit area of extended profile.
+msgid "Description"
+msgstr "Deskribapena"
+
+#. TRANS: Link description in extended profile page to add another profile element.
+msgid "Add another item"
+msgstr "Gehitu eremu berria"
+
+#. TRANS: Field label for undefined field in extended profile.
+#, php-format
+msgid "TYPE: %s"
+msgstr "MOTA: %s"
+
+#. TRANS: Button text for saving extended profile properties.
+msgctxt "BUTTON"
+msgid "Save"
+msgstr "Gorde"
+
+#. TRANS: .
+#. TRANS: Button title for saving extended profile properties.
+msgid "Save details"
+msgstr "Xehetasunak gorde"
+
+#. TRANS: Field label for extended profile properties.
+msgid "Phone"
+msgstr "Telefonoa"
+
+#. TRANS: Field label for extended profile properties (Instant Messaging).
+msgid "IM"
+msgstr "BM"
+
+#. TRANS: Field label for extended profile properties.
+msgid "Website"
+msgstr "Webgunea"
+
+#. TRANS: Field label for extended profile properties.
+msgid "Employer"
+msgstr "Enplegatzailea"
+
+#. TRANS: Field label for extended profile properties.
+msgid "Personal"
+msgstr "Pertsonala"
+
+#. TRANS: Field label for extended profile properties.
+msgid "Full name"
+msgstr "Izen osoa"
+
+#. TRANS: Field label for extended profile properties.
+msgid "Title"
+msgstr "Titulua"
+
+#. TRANS: Field label for extended profile properties.
+msgid "Manager"
+msgstr "Kudeatzailea"
+
+#. TRANS: Field label for extended profile properties.
+msgid "Location"
+msgstr "Kokapena"
+
+#. TRANS: Field label for extended profile properties.
+msgid "Bio"
+msgstr "Biografia"
+
+#. TRANS: Field label for extended profile properties.
+msgid "Tags"
+msgstr "Etiketak"
+
+#. TRANS: Field label for extended profile properties.
+msgid "Contact"
+msgstr "Kontaktua"
+
+#. TRANS: Field label for extended profile properties.
+msgid "Birthday"
+msgstr "Jaioteguna"
+
+#. TRANS: Field label for extended profile properties.
+msgid "Spouse's name"
+msgstr "Ezkontidearen izena"
+
+#. TRANS: Field label for extended profile properties.
+msgid "Kids' names"
+msgstr "Haurren izenak"
+
+#. TRANS: Field label for extended profile properties.
+msgid "Work experience"
+msgstr "Lan esperientzia"
+
+#. TRANS: Field label for extended profile properties.
+msgid "Education"
+msgstr "Ikasketak"
diff --git a/plugins/ExtendedProfile/locale/fr/LC_MESSAGES/ExtendedProfile.po b/plugins/ExtendedProfile/locale/fr/LC_MESSAGES/ExtendedProfile.po
index 7f1061f178..f319574dcc 100644
--- a/plugins/ExtendedProfile/locale/fr/LC_MESSAGES/ExtendedProfile.po
+++ b/plugins/ExtendedProfile/locale/fr/LC_MESSAGES/ExtendedProfile.po
@@ -1,7 +1,8 @@
-# Translation of StatusNet - ExtendedProfile to French (Français)
+# Translation of StatusNet - ExtendedProfile to French (français)
 # Exported from translatewiki.net
 #
 # Author: Brunoperel
+# Author: Crochet.david
 # Author: Iketsi
 # Author: Od1n
 # --
@@ -11,18 +12,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ExtendedProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:24+0000\n"
-"Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:31+0000\n"
+"Language-Team: French <https://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:26:39+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:06+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-extendedprofile\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#. TRANS: Title for extended profile settings.
 msgid "Extended profile settings"
 msgstr "Paramètres de profil étendus"
 
@@ -33,6 +35,7 @@ msgstr ""
 "Vous pouvez mettre à jour les informations de votre profil pour qu’on en "
 "sache plus à votre sujet."
 
+#. TRANS: Client error displayed when the session token does not match or is not given.
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 "Un problème est survenu avec votre session. Merci d'essayer de nouveau."
@@ -41,6 +44,7 @@ msgstr ""
 msgid "Unexpected form submission."
 msgstr "Soumission de formulaire inattendue."
 
+#. TRANS: Success message after saving extended profile details.
 msgid "Details saved."
 msgstr "Détails enregistrés."
 
@@ -62,6 +66,7 @@ msgstr "Date invalide entrée pour \"%1$s\": %2$s."
 msgid "Invalid URL: %s."
 msgstr "URL invalide : %s."
 
+#. TRANS: Server error displayed when a field could not be saved in the database.
 msgid "Could not save profile details."
 msgstr "Impossible de sauvegarder les détails du profil."
 
@@ -115,17 +120,11 @@ msgstr "(%s)"
 msgid "Company"
 msgstr "Société"
 
-#. TRANS: Field label in experience area of extended profile (when did one start a position).
-#. TRANS: Field label in experience edit area of extended profile (when did one start at a company).
-#. TRANS: Field label in education area of extended profile (when did one start an education).
-#. TRANS: Field label in education edit area of extended profile (when did one start an education).
+#. TRANS: Field label in extended profile (when did one start a position or education).
 msgid "Start"
 msgstr "Début"
 
-#. TRANS: Field label in experience area of extended profile (when did one end a position).
-#. TRANS: Field label in experience edit area of extended profile (when did one terminate at a company).
-#. TRANS: Field label in education area of extended profile (when did one end a education).
-#. TRANS: Field label in education edit area of extended profile (when did one end an education).
+#. TRANS: Field label in extended profile (when did one end a position or education).
 msgid "End"
 msgstr "Fin"
 
@@ -143,8 +142,7 @@ msgstr "Actuel"
 msgid "Institution"
 msgstr "Institution"
 
-#. TRANS: Field label in education area of extended profile.
-#. TRANS: Field label in education edit area of extended profile.
+#. TRANS: Field label in extended profile for specifying an academic degree.
 msgid "Degree"
 msgstr "Diplôme"
 
@@ -214,7 +212,7 @@ msgstr "Bio"
 
 #. TRANS: Field label for extended profile properties.
 msgid "Tags"
-msgstr ""
+msgstr "Balises"
 
 #. TRANS: Field label for extended profile properties.
 msgid "Contact"
diff --git a/plugins/ExtendedProfile/locale/gl/LC_MESSAGES/ExtendedProfile.po b/plugins/ExtendedProfile/locale/gl/LC_MESSAGES/ExtendedProfile.po
new file mode 100644
index 0000000000..d5506dc2c4
--- /dev/null
+++ b/plugins/ExtendedProfile/locale/gl/LC_MESSAGES/ExtendedProfile.po
@@ -0,0 +1,234 @@
+# Translation of StatusNet - ExtendedProfile to Galician (galego)
+# Exported from translatewiki.net
+#
+# Author: Toliño
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - ExtendedProfile\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:31+0000\n"
+"Language-Team: Galician <https://translatewiki.net/wiki/Portal:gl>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:50:06+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: gl\n"
+"X-Message-Group: #out-statusnet-plugin-extendedprofile\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Title for extended profile settings.
+msgid "Extended profile settings"
+msgstr "Configuración do perfil estendida"
+
+#. TRANS: Usage instructions for profile settings.
+msgid ""
+"You can update your personal profile info here so people know more about you."
+msgstr ""
+"Pode actualizar a información do seu perfil persoal para que a xente o "
+"coñeza mellor."
+
+#. TRANS: Client error displayed when the session token does not match or is not given.
+msgid "There was a problem with your session token. Try again, please."
+msgstr "Houbo un erro co seu pase. Inténteo de novo."
+
+#. TRANS: Message given submitting a form with an unknown action.
+msgid "Unexpected form submission."
+msgstr "Envío de formulario inesperado."
+
+#. TRANS: Success message after saving extended profile details.
+msgid "Details saved."
+msgstr "Detalles gardados."
+
+#. TRANS: Exception thrown when no date was entered in a required date field.
+#. TRANS: %s is the field name.
+#, php-format
+msgid "You must supply a date for \"%s\"."
+msgstr "Cómpre especificar unha data para \"%s\"."
+
+#. TRANS: Exception thrown on incorrect data input.
+#. TRANS: %1$s is a field name, %2$s is the incorrect input.
+#, php-format
+msgid "Invalid date entered for \"%1$s\": %2$s."
+msgstr "Data incorrecta para \"%1$s\": %2$s."
+
+#. TRANS: Exception thrown when entering an invalid URL.
+#. TRANS: %s is the invalid URL.
+#, php-format
+msgid "Invalid URL: %s."
+msgstr "URL non válido: %s."
+
+#. TRANS: Server error displayed when a field could not be saved in the database.
+msgid "Could not save profile details."
+msgstr "Non se puideron gardar os detalles do perfil."
+
+#. TRANS: Validation error in form for profile settings.
+#. TRANS: %s is an invalid tag.
+#, php-format
+msgid "Invalid tag: \"%s\"."
+msgstr "Etiqueta incorrecta: \"%s\"."
+
+#. TRANS: Server error thrown when user profile settings could not be saved.
+msgid "Could not save profile."
+msgstr "Non se puido gardar o perfil."
+
+#. TRANS: Server error thrown when user profile settings tags could not be saved.
+msgid "Could not save tags."
+msgstr "Non se puideron gardar as etiquetas."
+
+#. TRANS: Link title for link on user profile.
+msgid "Edit extended profile settings"
+msgstr "Modificar a configuración do perfil estendida"
+
+#. TRANS: Link text for link on user profile.
+msgid "Edit"
+msgstr "Editar"
+
+#. TRANS: Plugin description.
+msgid "UI extensions for additional profile fields."
+msgstr ""
+"Extensións da interface de usuario para os campos de perfil adicionais."
+
+#. TRANS: Link text on user profile page leading to extended profile page.
+msgid "More details..."
+msgstr "Máis detalles..."
+
+#. TRANS: Title for extended profile entry deletion dialog.
+msgid "Confirmation Required"
+msgstr "Cómpre confirmación"
+
+#. TRANS: Confirmation text for extended profile entry deletion dialog.
+msgid "Really delete this entry?"
+msgstr "Está seguro de querer borrar esta entrada?"
+
+#. TRANS: Value between parentheses (phone number, website, or IM address).
+#, php-format
+msgid "(%s)"
+msgstr "(%s)"
+
+#. TRANS: Field label in experience area of extended profile.
+#. TRANS: Field label in experience edit area of extended profile (which company does one work for).
+msgid "Company"
+msgstr "Empresa"
+
+#. TRANS: Field label in extended profile (when did one start a position or education).
+msgid "Start"
+msgstr "Comezo"
+
+#. TRANS: Field label in extended profile (when did one end a position or education).
+msgid "End"
+msgstr "Fin"
+
+#. TRANS: Field value in experience area of extended profile (one still holds a position).
+msgid "(Current)"
+msgstr "(Actual)"
+
+#. TRANS: Checkbox label in experience edit area of extended profile (one still works at a company).
+msgid "Current"
+msgstr "Actual"
+
+#. TRANS: Field label in education area of extended profile.
+#. TRANS: Field label in education edit area of extended profile.
+#. TRANS: Field label for extended profile properties.
+msgid "Institution"
+msgstr "Institución"
+
+#. TRANS: Field label in extended profile for specifying an academic degree.
+msgid "Degree"
+msgstr "Grao"
+
+#. TRANS: Field label in education area of extended profile.
+#. TRANS: Field label in education edit area of extended profile.
+msgid "Description"
+msgstr "Descrición"
+
+#. TRANS: Link description in extended profile page to add another profile element.
+msgid "Add another item"
+msgstr "Engadir outro elemento"
+
+#. TRANS: Field label for undefined field in extended profile.
+#, php-format
+msgid "TYPE: %s"
+msgstr "TIPO: %s"
+
+#. TRANS: Button text for saving extended profile properties.
+msgctxt "BUTTON"
+msgid "Save"
+msgstr "Gardar"
+
+#. TRANS: .
+#. TRANS: Button title for saving extended profile properties.
+msgid "Save details"
+msgstr "Gardar os detalles"
+
+#. TRANS: Field label for extended profile properties.
+msgid "Phone"
+msgstr "Teléfono"
+
+#. TRANS: Field label for extended profile properties (Instant Messaging).
+msgid "IM"
+msgstr "MI"
+
+#. TRANS: Field label for extended profile properties.
+msgid "Website"
+msgstr "Páxina web"
+
+#. TRANS: Field label for extended profile properties.
+msgid "Employer"
+msgstr "Empregado"
+
+#. TRANS: Field label for extended profile properties.
+msgid "Personal"
+msgstr "Persoal"
+
+#. TRANS: Field label for extended profile properties.
+msgid "Full name"
+msgstr "Nome completo"
+
+#. TRANS: Field label for extended profile properties.
+msgid "Title"
+msgstr "Título"
+
+#. TRANS: Field label for extended profile properties.
+msgid "Manager"
+msgstr "Xestor"
+
+#. TRANS: Field label for extended profile properties.
+msgid "Location"
+msgstr "Localización"
+
+#. TRANS: Field label for extended profile properties.
+msgid "Bio"
+msgstr "Biografía"
+
+#. TRANS: Field label for extended profile properties.
+msgid "Tags"
+msgstr "Etiquetas"
+
+#. TRANS: Field label for extended profile properties.
+msgid "Contact"
+msgstr "Contacto"
+
+#. TRANS: Field label for extended profile properties.
+msgid "Birthday"
+msgstr "Aniversario"
+
+#. TRANS: Field label for extended profile properties.
+msgid "Spouse's name"
+msgstr "Nome do/da cónxuxe"
+
+#. TRANS: Field label for extended profile properties.
+msgid "Kids' names"
+msgstr "Nome dos fillos"
+
+#. TRANS: Field label for extended profile properties.
+msgid "Work experience"
+msgstr "Experiencia profesional"
+
+#. TRANS: Field label for extended profile properties.
+msgid "Education"
+msgstr "Educación"
diff --git a/plugins/ExtendedProfile/locale/ia/LC_MESSAGES/ExtendedProfile.po b/plugins/ExtendedProfile/locale/ia/LC_MESSAGES/ExtendedProfile.po
index 3637bfd663..ab05952c68 100644
--- a/plugins/ExtendedProfile/locale/ia/LC_MESSAGES/ExtendedProfile.po
+++ b/plugins/ExtendedProfile/locale/ia/LC_MESSAGES/ExtendedProfile.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - ExtendedProfile to Interlingua (Interlingua)
+# Translation of StatusNet - ExtendedProfile to Interlingua (interlingua)
 # Exported from translatewiki.net
 #
 # Author: McDutchie
@@ -9,18 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ExtendedProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:24+0000\n"
-"Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:31+0000\n"
+"Language-Team: Interlingua <https://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:26:39+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:06+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-extendedprofile\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Title for extended profile settings.
 msgid "Extended profile settings"
 msgstr "Configuration extendite del profilo"
 
@@ -31,6 +32,7 @@ msgstr ""
 "Tu pote actualisar hic le informationes personal de tu profilo a fin que le "
 "gente pote saper plus de te."
 
+#. TRANS: Client error displayed when the session token does not match or is not given.
 msgid "There was a problem with your session token. Try again, please."
 msgstr "Occurreva un problema con le indicio de tu session. Per favor reproba."
 
@@ -38,6 +40,7 @@ msgstr "Occurreva un problema con le indicio de tu session. Per favor reproba."
 msgid "Unexpected form submission."
 msgstr "Submission de formulario inexpectate."
 
+#. TRANS: Success message after saving extended profile details.
 msgid "Details saved."
 msgstr "Detalios salveguardate."
 
@@ -59,6 +62,7 @@ msgstr "Data invalide entrate pro \"%1$s\": %2$s."
 msgid "Invalid URL: %s."
 msgstr "URL invalide: %s."
 
+#. TRANS: Server error displayed when a field could not be saved in the database.
 msgid "Could not save profile details."
 msgstr "Non poteva salveguardar le detalios del profilo."
 
@@ -110,17 +114,11 @@ msgstr "(%s)"
 msgid "Company"
 msgstr "Compania"
 
-#. TRANS: Field label in experience area of extended profile (when did one start a position).
-#. TRANS: Field label in experience edit area of extended profile (when did one start at a company).
-#. TRANS: Field label in education area of extended profile (when did one start an education).
-#. TRANS: Field label in education edit area of extended profile (when did one start an education).
+#. TRANS: Field label in extended profile (when did one start a position or education).
 msgid "Start"
 msgstr "Initio"
 
-#. TRANS: Field label in experience area of extended profile (when did one end a position).
-#. TRANS: Field label in experience edit area of extended profile (when did one terminate at a company).
-#. TRANS: Field label in education area of extended profile (when did one end a education).
-#. TRANS: Field label in education edit area of extended profile (when did one end an education).
+#. TRANS: Field label in extended profile (when did one end a position or education).
 msgid "End"
 msgstr "Fin"
 
@@ -138,8 +136,7 @@ msgstr "Actual"
 msgid "Institution"
 msgstr "Institution"
 
-#. TRANS: Field label in education area of extended profile.
-#. TRANS: Field label in education edit area of extended profile.
+#. TRANS: Field label in extended profile for specifying an academic degree.
 msgid "Degree"
 msgstr "Grado"
 
diff --git a/plugins/ExtendedProfile/locale/it/LC_MESSAGES/ExtendedProfile.po b/plugins/ExtendedProfile/locale/it/LC_MESSAGES/ExtendedProfile.po
new file mode 100644
index 0000000000..c5c4eecc16
--- /dev/null
+++ b/plugins/ExtendedProfile/locale/it/LC_MESSAGES/ExtendedProfile.po
@@ -0,0 +1,231 @@
+# Translation of StatusNet - ExtendedProfile to Italian (italiano)
+# Exported from translatewiki.net
+#
+# Author: Ximo17
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - ExtendedProfile\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:31+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:50:06+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Title for extended profile settings.
+msgid "Extended profile settings"
+msgstr "Impostazioni del profilo esteso"
+
+#. TRANS: Usage instructions for profile settings.
+msgid ""
+"You can update your personal profile info here so people know more about you."
+msgstr ""
+"Qui puoi aggiornare le informazioni del tuo profilo personale, così gli "
+"altri potranno conoscere qualcosa in più su di te."
+
+#. TRANS: Client error displayed when the session token does not match or is not given.
+msgid "There was a problem with your session token. Try again, please."
+msgstr ""
+"Si è verificato un problema con il tuo token di sessione. Prova di nuovo."
+
+#. TRANS: Message given submitting a form with an unknown action.
+msgid "Unexpected form submission."
+msgstr "Invio del modulo inaspettato."
+
+#. TRANS: Success message after saving extended profile details.
+msgid "Details saved."
+msgstr "Dettagli salvati."
+
+#. TRANS: Exception thrown when no date was entered in a required date field.
+#. TRANS: %s is the field name.
+#, php-format
+msgid "You must supply a date for \"%s\"."
+msgstr "È necessario fornire una data per \"%s\"."
+
+#. TRANS: Exception thrown on incorrect data input.
+#. TRANS: %1$s is a field name, %2$s is the incorrect input.
+#, php-format
+msgid "Invalid date entered for \"%1$s\": %2$s."
+msgstr "Immessa data non valida per \"%1$s\": %2$s."
+
+#. TRANS: Exception thrown when entering an invalid URL.
+#. TRANS: %s is the invalid URL.
+#, php-format
+msgid "Invalid URL: %s."
+msgstr "URL non valido: %s."
+
+#. TRANS: Server error displayed when a field could not be saved in the database.
+msgid "Could not save profile details."
+msgstr "Impossibile salvare i dettagli del profilo."
+
+#. TRANS: Validation error in form for profile settings.
+#. TRANS: %s is an invalid tag.
+#, php-format
+msgid "Invalid tag: \"%s\"."
+msgstr "Tag non valido: \"%s\"."
+
+#. TRANS: Server error thrown when user profile settings could not be saved.
+msgid "Could not save profile."
+msgstr "Impossibile salvare il profilo."
+
+#. TRANS: Server error thrown when user profile settings tags could not be saved.
+msgid "Could not save tags."
+msgstr "Impossibile salvare i tag."
+
+#. TRANS: Link title for link on user profile.
+msgid "Edit extended profile settings"
+msgstr "Modificare le impostazioni del profilo esteso"
+
+#. TRANS: Link text for link on user profile.
+msgid "Edit"
+msgstr "Modifica"
+
+#. TRANS: Plugin description.
+msgid "UI extensions for additional profile fields."
+msgstr "Estensioni dell'interfaccia utente per i campi aggiuntivi del profilo."
+
+#. TRANS: Link text on user profile page leading to extended profile page.
+msgid "More details..."
+msgstr "Maggiori dettagli..."
+
+#. TRANS: Title for extended profile entry deletion dialog.
+msgid "Confirmation Required"
+msgstr "Richiesta Conferma"
+
+#. TRANS: Confirmation text for extended profile entry deletion dialog.
+msgid "Really delete this entry?"
+msgstr "Vuoi davvero eliminare questa voce?"
+
+#. TRANS: Value between parentheses (phone number, website, or IM address).
+#, php-format
+msgid "(%s)"
+msgstr "(%s)"
+
+#. TRANS: Field label in experience area of extended profile.
+#. TRANS: Field label in experience edit area of extended profile (which company does one work for).
+msgid "Company"
+msgstr "Società"
+
+#. TRANS: Field label in extended profile (when did one start a position or education).
+msgid "Start"
+msgstr "Inizio"
+
+#. TRANS: Field label in extended profile (when did one end a position or education).
+msgid "End"
+msgstr "Fine"
+
+#. TRANS: Field value in experience area of extended profile (one still holds a position).
+msgid "(Current)"
+msgstr "(Attuale)"
+
+#. TRANS: Checkbox label in experience edit area of extended profile (one still works at a company).
+msgid "Current"
+msgstr "Attuale"
+
+#. TRANS: Field label in education area of extended profile.
+#. TRANS: Field label in education edit area of extended profile.
+#. TRANS: Field label for extended profile properties.
+msgid "Institution"
+msgstr "Istituzione"
+
+#. TRANS: Field label in extended profile for specifying an academic degree.
+msgid "Degree"
+msgstr "Titolo di studio"
+
+#. TRANS: Field label in education area of extended profile.
+#. TRANS: Field label in education edit area of extended profile.
+msgid "Description"
+msgstr "Descrizione"
+
+#. TRANS: Link description in extended profile page to add another profile element.
+msgid "Add another item"
+msgstr "Aggiungi un altro oggetto"
+
+#. TRANS: Field label for undefined field in extended profile.
+#, php-format
+msgid "TYPE: %s"
+msgstr "TIPO: %s"
+
+#. TRANS: Button text for saving extended profile properties.
+msgctxt "BUTTON"
+msgid "Save"
+msgstr "Salva"
+
+#. TRANS: .
+#. TRANS: Button title for saving extended profile properties.
+msgid "Save details"
+msgstr "Salvare i dettagli"
+
+#. TRANS: Field label for extended profile properties.
+msgid "Phone"
+msgstr "Telefono"
+
+#. TRANS: Field label for extended profile properties (Instant Messaging).
+msgid "IM"
+msgstr "IM"
+
+#. TRANS: Field label for extended profile properties.
+msgid "Website"
+msgstr "Sito web"
+
+#. TRANS: Field label for extended profile properties.
+msgid "Employer"
+msgstr "Datore di lavoro"
+
+#. TRANS: Field label for extended profile properties.
+msgid "Personal"
+msgstr "Personale"
+
+#. TRANS: Field label for extended profile properties.
+msgid "Full name"
+msgstr "Nome e cognome"
+
+#. TRANS: Field label for extended profile properties.
+msgid "Title"
+msgstr "Qualifica"
+
+#. TRANS: Field label for extended profile properties.
+msgid "Manager"
+msgstr "Manager"
+
+#. TRANS: Field label for extended profile properties.
+msgid "Location"
+msgstr "Luogo"
+
+#. TRANS: Field label for extended profile properties.
+msgid "Bio"
+msgstr "Biografia"
+
+#. TRANS: Field label for extended profile properties.
+msgid "Tags"
+msgstr "Tag"
+
+#. TRANS: Field label for extended profile properties.
+msgid "Contact"
+msgstr "Contatto"
+
+#. TRANS: Field label for extended profile properties.
+msgid "Birthday"
+msgstr "Compleanno"
+
+#. TRANS: Field label for extended profile properties.
+msgid "Spouse's name"
+msgstr "Nome del coniuge"
+
+#. TRANS: Field label for extended profile properties.
+msgid "Kids' names"
+msgstr "Nome dei figli"
+
+#. TRANS: Field label for extended profile properties.
+msgid "Work experience"
+msgstr "Esperienza lavorativa"
+
+#. TRANS: Field label for extended profile properties.
+msgid "Education"
+msgstr "Istruzione"
diff --git a/plugins/ExtendedProfile/locale/ja/LC_MESSAGES/ExtendedProfile.po b/plugins/ExtendedProfile/locale/ja/LC_MESSAGES/ExtendedProfile.po
new file mode 100644
index 0000000000..bb17572cec
--- /dev/null
+++ b/plugins/ExtendedProfile/locale/ja/LC_MESSAGES/ExtendedProfile.po
@@ -0,0 +1,234 @@
+# Translation of StatusNet - ExtendedProfile to Japanese (日本語)
+# Exported from translatewiki.net
+#
+# Author: Miwa ka
+# Author: Shirayuki
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - ExtendedProfile\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:31+0000\n"
+"Language-Team: Japanese <https://translatewiki.net/wiki/Portal:ja>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:50:06+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: ja\n"
+"X-Message-Group: #out-statusnet-plugin-extendedprofile\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#. TRANS: Title for extended profile settings.
+msgid "Extended profile settings"
+msgstr "拡張プロファイル�設定"
+
+#. TRANS: Usage instructions for profile settings.
+msgid ""
+"You can update your personal profile info here so people know more about you."
+msgstr ""
+"����������知��もら��������個人プロファイル情報を更新��"
+"��"
+
+#. TRANS: Client error displayed when the session token does not match or is not given.
+msgid "There was a problem with your session token. Try again, please."
+msgstr "セッション トークン��題��り���。も�一度試������。"
+
+#. TRANS: Message given submitting a form with an unknown action.
+msgid "Unexpected form submission."
+msgstr "予期���フォーム�信��。"
+
+#. TRANS: Success message after saving extended profile details.
+msgid "Details saved."
+msgstr "詳細を�存����"
+
+#. TRANS: Exception thrown when no date was entered in a required date field.
+#. TRANS: %s is the field name.
+#, php-format
+msgid "You must supply a date for \"%s\"."
+msgstr "\"%s\" �日付を指定�る必���り��。"
+
+#. TRANS: Exception thrown on incorrect data input.
+#. TRANS: %1$s is a field name, %2$s is the incorrect input.
+#, php-format
+msgid "Invalid date entered for \"%1$s\": %2$s."
+msgstr "\"%1$s\" �正����日付を入力����：%2$s。"
+
+#. TRANS: Exception thrown when entering an invalid URL.
+#. TRANS: %s is the invalid URL.
+#, php-format
+msgid "Invalid URL: %s."
+msgstr "正���� URL ��：%s。"
+
+#. TRANS: Server error displayed when a field could not be saved in the database.
+msgid "Could not save profile details."
+msgstr "プロファイル�詳細を�存����ん���。"
+
+#. TRANS: Validation error in form for profile settings.
+#. TRANS: %s is an invalid tag.
+#, php-format
+msgid "Invalid tag: \"%s\"."
+msgstr "正����タグ��：\"%s\"。"
+
+#. TRANS: Server error thrown when user profile settings could not be saved.
+msgid "Could not save profile."
+msgstr "プロファイルを�存����ん���。"
+
+#. TRANS: Server error thrown when user profile settings tags could not be saved.
+msgid "Could not save tags."
+msgstr "タグを�存����ん���。"
+
+#. TRANS: Link title for link on user profile.
+msgid "Edit extended profile settings"
+msgstr "拡張プロファイル設定を編集"
+
+#. TRANS: Link text for link on user profile.
+msgid "Edit"
+msgstr "編集"
+
+#. TRANS: Plugin description.
+msgid "UI extensions for additional profile fields."
+msgstr "プロファイル項目を追加�る UI 拡張機能��。"
+
+#. TRANS: Link text on user profile page leading to extended profile page.
+msgid "More details..."
+msgstr "詳細..."
+
+#. TRANS: Title for extended profile entry deletion dialog.
+msgid "Confirmation Required"
+msgstr "確��必���"
+
+#. TRANS: Confirmation text for extended profile entry deletion dialog.
+msgid "Really delete this entry?"
+msgstr "本当���エントリを削除����?"
+
+#. TRANS: Value between parentheses (phone number, website, or IM address).
+#, php-format
+msgid "(%s)"
+msgstr "(%s)"
+
+#. TRANS: Field label in experience area of extended profile.
+#. TRANS: Field label in experience edit area of extended profile (which company does one work for).
+msgid "Company"
+msgstr "会社"
+
+#. TRANS: Field label in extended profile (when did one start a position or education).
+msgid "Start"
+msgstr "開始"
+
+#. TRANS: Field label in extended profile (when did one end a position or education).
+msgid "End"
+msgstr "終了"
+
+#. TRANS: Field value in experience area of extended profile (one still holds a position).
+msgid "(Current)"
+msgstr "(�在)"
+
+#. TRANS: Checkbox label in experience edit area of extended profile (one still works at a company).
+msgid "Current"
+msgstr "�在"
+
+#. TRANS: Field label in education area of extended profile.
+#. TRANS: Field label in education edit area of extended profile.
+#. TRANS: Field label for extended profile properties.
+msgid "Institution"
+msgstr ""
+
+#. TRANS: Field label in extended profile for specifying an academic degree.
+msgid "Degree"
+msgstr ""
+
+#. TRANS: Field label in education area of extended profile.
+#. TRANS: Field label in education edit area of extended profile.
+msgid "Description"
+msgstr "説明"
+
+#. TRANS: Link description in extended profile page to add another profile element.
+msgid "Add another item"
+msgstr "別�アイテムを追加"
+
+#. TRANS: Field label for undefined field in extended profile.
+#, php-format
+msgid "TYPE: %s"
+msgstr ""
+
+#. TRANS: Button text for saving extended profile properties.
+msgctxt "BUTTON"
+msgid "Save"
+msgstr "�存"
+
+#. TRANS: .
+#. TRANS: Button title for saving extended profile properties.
+msgid "Save details"
+msgstr "詳細を�存"
+
+#. TRANS: Field label for extended profile properties.
+msgid "Phone"
+msgstr "電話"
+
+#. TRANS: Field label for extended profile properties (Instant Messaging).
+msgid "IM"
+msgstr ""
+
+#. TRANS: Field label for extended profile properties.
+msgid "Website"
+msgstr "Webサイト"
+
+#. TRANS: Field label for extended profile properties.
+msgid "Employer"
+msgstr ""
+
+#. TRANS: Field label for extended profile properties.
+msgid "Personal"
+msgstr ""
+
+#. TRANS: Field label for extended profile properties.
+msgid "Full name"
+msgstr "フル�ーム"
+
+#. TRANS: Field label for extended profile properties.
+msgid "Title"
+msgstr ""
+
+#. TRANS: Field label for extended profile properties.
+msgid "Manager"
+msgstr ""
+
+#. TRANS: Field label for extended profile properties.
+msgid "Location"
+msgstr "場所"
+
+#. TRANS: Field label for extended profile properties.
+msgid "Bio"
+msgstr "自己紹介"
+
+#. TRANS: Field label for extended profile properties.
+msgid "Tags"
+msgstr "ã‚¿ã‚°"
+
+#. TRANS: Field label for extended profile properties.
+msgid "Contact"
+msgstr "連絡先"
+
+#. TRANS: Field label for extended profile properties.
+msgid "Birthday"
+msgstr "誕生日"
+
+#. TRANS: Field label for extended profile properties.
+msgid "Spouse's name"
+msgstr "��者���"
+
+#. TRANS: Field label for extended profile properties.
+msgid "Kids' names"
+msgstr "�供���"
+
+#. TRANS: Field label for extended profile properties.
+msgid "Work experience"
+msgstr "仕事�経験"
+
+#. TRANS: Field label for extended profile properties.
+msgid "Education"
+msgstr "教育"
diff --git a/plugins/ExtendedProfile/locale/mk/LC_MESSAGES/ExtendedProfile.po b/plugins/ExtendedProfile/locale/mk/LC_MESSAGES/ExtendedProfile.po
index 1ed5c8b398..e2e3955a8d 100644
--- a/plugins/ExtendedProfile/locale/mk/LC_MESSAGES/ExtendedProfile.po
+++ b/plugins/ExtendedProfile/locale/mk/LC_MESSAGES/ExtendedProfile.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - ExtendedProfile to Macedonian (Македон�ки)
+# Translation of StatusNet - ExtendedProfile to Macedonian (македон�ки)
 # Exported from translatewiki.net
 #
 # Author: Bjankuloski06
@@ -9,18 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ExtendedProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:24+0000\n"
-"Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:32+0000\n"
+"Language-Team: Macedonian <https://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:26:39+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:06+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-extendedprofile\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
 
+#. TRANS: Title for extended profile settings.
 msgid "Extended profile settings"
 msgstr "Проширени профилни нагодувања"
 
@@ -31,6 +32,7 @@ msgstr ""
 "Тука можете да �и ги подновите податоците во личниот профил, и така луѓето "
 "да дознаат повеќе за Ва�."
 
+#. TRANS: Client error displayed when the session token does not match or is not given.
 msgid "There was a problem with your session token. Try again, please."
 msgstr "Се појави проблем �о жетонот на Вашата �е�ија. Обидете �е повторно."
 
@@ -38,6 +40,7 @@ msgstr "Се појави проблем �о жетонот на Вашата 
 msgid "Unexpected form submission."
 msgstr "�еочекувано подне�ување на образец."
 
+#. TRANS: Success message after saving extended profile details.
 msgid "Details saved."
 msgstr "Податоците �е зачувани."
 
@@ -59,6 +62,7 @@ msgstr "�аведен е неважечки датум за „%1$s“: %2$s."
 msgid "Invalid URL: %s."
 msgstr "�еважечка URL-адре�а: %s."
 
+#. TRANS: Server error displayed when a field could not be saved in the database.
 msgid "Could not save profile details."
 msgstr "�е можев да ги зачувам рофилните податоци."
 
@@ -110,17 +114,11 @@ msgstr "(%s)"
 msgid "Company"
 msgstr "Фирма"
 
-#. TRANS: Field label in experience area of extended profile (when did one start a position).
-#. TRANS: Field label in experience edit area of extended profile (when did one start at a company).
-#. TRANS: Field label in education area of extended profile (when did one start an education).
-#. TRANS: Field label in education edit area of extended profile (when did one start an education).
+#. TRANS: Field label in extended profile (when did one start a position or education).
 msgid "Start"
 msgstr "Почеток"
 
-#. TRANS: Field label in experience area of extended profile (when did one end a position).
-#. TRANS: Field label in experience edit area of extended profile (when did one terminate at a company).
-#. TRANS: Field label in education area of extended profile (when did one end a education).
-#. TRANS: Field label in education edit area of extended profile (when did one end an education).
+#. TRANS: Field label in extended profile (when did one end a position or education).
 msgid "End"
 msgstr "Завршеток"
 
@@ -138,8 +136,7 @@ msgstr "Тековно"
 msgid "Institution"
 msgstr "У�танова"
 
-#. TRANS: Field label in education area of extended profile.
-#. TRANS: Field label in education edit area of extended profile.
+#. TRANS: Field label in extended profile for specifying an academic degree.
 msgid "Degree"
 msgstr "Диплома"
 
diff --git a/plugins/ExtendedProfile/locale/nl/LC_MESSAGES/ExtendedProfile.po b/plugins/ExtendedProfile/locale/nl/LC_MESSAGES/ExtendedProfile.po
index ad0707e3bc..3536060384 100644
--- a/plugins/ExtendedProfile/locale/nl/LC_MESSAGES/ExtendedProfile.po
+++ b/plugins/ExtendedProfile/locale/nl/LC_MESSAGES/ExtendedProfile.po
@@ -9,18 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ExtendedProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:24+0000\n"
-"Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:32+0000\n"
+"Language-Team: Dutch <https://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:26:39+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:06+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-extendedprofile\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Title for extended profile settings.
 msgid "Extended profile settings"
 msgstr "Uitgebreide profielinstellingen"
 
@@ -31,6 +32,7 @@ msgstr ""
 "Hier kunt u uw persoonlijke profiel bijwerken met informatie over uzelf voor "
 "andere gebruikers."
 
+#. TRANS: Client error displayed when the session token does not match or is not given.
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 "Er is een probleem ontstaan met uw sessie. Probeer het nog een keer, "
@@ -40,6 +42,7 @@ msgstr ""
 msgid "Unexpected form submission."
 msgstr "Het formulier is onverwacht ingezonden."
 
+#. TRANS: Success message after saving extended profile details.
 msgid "Details saved."
 msgstr "De gegevens zijn opgeslagen."
 
@@ -61,6 +64,7 @@ msgstr "Er is een ongeldige datum opgegeven voor \"%1$s\": %2$s."
 msgid "Invalid URL: %s."
 msgstr "Ongeldige URL: %s."
 
+#. TRANS: Server error displayed when a field could not be saved in the database.
 msgid "Could not save profile details."
 msgstr "Het was niet mogelijk de profielgegevens op te slaan."
 
@@ -112,17 +116,11 @@ msgstr "(%s)"
 msgid "Company"
 msgstr "Bedrijf"
 
-#. TRANS: Field label in experience area of extended profile (when did one start a position).
-#. TRANS: Field label in experience edit area of extended profile (when did one start at a company).
-#. TRANS: Field label in education area of extended profile (when did one start an education).
-#. TRANS: Field label in education edit area of extended profile (when did one start an education).
+#. TRANS: Field label in extended profile (when did one start a position or education).
 msgid "Start"
 msgstr "Begin"
 
-#. TRANS: Field label in experience area of extended profile (when did one end a position).
-#. TRANS: Field label in experience edit area of extended profile (when did one terminate at a company).
-#. TRANS: Field label in education area of extended profile (when did one end a education).
-#. TRANS: Field label in education edit area of extended profile (when did one end an education).
+#. TRANS: Field label in extended profile (when did one end a position or education).
 msgid "End"
 msgstr "Eind"
 
@@ -140,8 +138,7 @@ msgstr "Huidig"
 msgid "Institution"
 msgstr "Instelling"
 
-#. TRANS: Field label in education area of extended profile.
-#. TRANS: Field label in education edit area of extended profile.
+#. TRANS: Field label in extended profile for specifying an academic degree.
 msgid "Degree"
 msgstr "Graad"
 
diff --git a/plugins/ExtendedProfile/locale/pl/LC_MESSAGES/ExtendedProfile.po b/plugins/ExtendedProfile/locale/pl/LC_MESSAGES/ExtendedProfile.po
new file mode 100644
index 0000000000..58cf10b294
--- /dev/null
+++ b/plugins/ExtendedProfile/locale/pl/LC_MESSAGES/ExtendedProfile.po
@@ -0,0 +1,229 @@
+# Translation of StatusNet - ExtendedProfile to Polish (polski)
+# Exported from translatewiki.net
+#
+# Author: BeginaFelicysym
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - ExtendedProfile\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:32+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:50:06+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=3; plural=(n == 1) ? 0 : ( (n%10 >= 2 && n%10 <= 4 && "
+"(n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
+
+#. TRANS: Title for extended profile settings.
+msgid "Extended profile settings"
+msgstr ""
+
+#. TRANS: Usage instructions for profile settings.
+msgid ""
+"You can update your personal profile info here so people know more about you."
+msgstr ""
+
+#. TRANS: Client error displayed when the session token does not match or is not given.
+msgid "There was a problem with your session token. Try again, please."
+msgstr ""
+
+#. TRANS: Message given submitting a form with an unknown action.
+msgid "Unexpected form submission."
+msgstr ""
+
+#. TRANS: Success message after saving extended profile details.
+msgid "Details saved."
+msgstr ""
+
+#. TRANS: Exception thrown when no date was entered in a required date field.
+#. TRANS: %s is the field name.
+#, php-format
+msgid "You must supply a date for \"%s\"."
+msgstr ""
+
+#. TRANS: Exception thrown on incorrect data input.
+#. TRANS: %1$s is a field name, %2$s is the incorrect input.
+#, php-format
+msgid "Invalid date entered for \"%1$s\": %2$s."
+msgstr ""
+
+#. TRANS: Exception thrown when entering an invalid URL.
+#. TRANS: %s is the invalid URL.
+#, php-format
+msgid "Invalid URL: %s."
+msgstr ""
+
+#. TRANS: Server error displayed when a field could not be saved in the database.
+msgid "Could not save profile details."
+msgstr ""
+
+#. TRANS: Validation error in form for profile settings.
+#. TRANS: %s is an invalid tag.
+#, php-format
+msgid "Invalid tag: \"%s\"."
+msgstr ""
+
+#. TRANS: Server error thrown when user profile settings could not be saved.
+msgid "Could not save profile."
+msgstr ""
+
+#. TRANS: Server error thrown when user profile settings tags could not be saved.
+msgid "Could not save tags."
+msgstr ""
+
+#. TRANS: Link title for link on user profile.
+msgid "Edit extended profile settings"
+msgstr ""
+
+#. TRANS: Link text for link on user profile.
+msgid "Edit"
+msgstr ""
+
+#. TRANS: Plugin description.
+msgid "UI extensions for additional profile fields."
+msgstr ""
+
+#. TRANS: Link text on user profile page leading to extended profile page.
+msgid "More details..."
+msgstr ""
+
+#. TRANS: Title for extended profile entry deletion dialog.
+msgid "Confirmation Required"
+msgstr ""
+
+#. TRANS: Confirmation text for extended profile entry deletion dialog.
+msgid "Really delete this entry?"
+msgstr ""
+
+#. TRANS: Value between parentheses (phone number, website, or IM address).
+#, php-format
+msgid "(%s)"
+msgstr ""
+
+#. TRANS: Field label in experience area of extended profile.
+#. TRANS: Field label in experience edit area of extended profile (which company does one work for).
+msgid "Company"
+msgstr ""
+
+#. TRANS: Field label in extended profile (when did one start a position or education).
+msgid "Start"
+msgstr ""
+
+#. TRANS: Field label in extended profile (when did one end a position or education).
+msgid "End"
+msgstr ""
+
+#. TRANS: Field value in experience area of extended profile (one still holds a position).
+msgid "(Current)"
+msgstr ""
+
+#. TRANS: Checkbox label in experience edit area of extended profile (one still works at a company).
+msgid "Current"
+msgstr ""
+
+#. TRANS: Field label in education area of extended profile.
+#. TRANS: Field label in education edit area of extended profile.
+#. TRANS: Field label for extended profile properties.
+msgid "Institution"
+msgstr ""
+
+#. TRANS: Field label in extended profile for specifying an academic degree.
+msgid "Degree"
+msgstr ""
+
+#. TRANS: Field label in education area of extended profile.
+#. TRANS: Field label in education edit area of extended profile.
+msgid "Description"
+msgstr ""
+
+#. TRANS: Link description in extended profile page to add another profile element.
+msgid "Add another item"
+msgstr ""
+
+#. TRANS: Field label for undefined field in extended profile.
+#, php-format
+msgid "TYPE: %s"
+msgstr ""
+
+#. TRANS: Button text for saving extended profile properties.
+msgctxt "BUTTON"
+msgid "Save"
+msgstr "Zapisz"
+
+#. TRANS: .
+#. TRANS: Button title for saving extended profile properties.
+msgid "Save details"
+msgstr "Zapisz szczegóły"
+
+#. TRANS: Field label for extended profile properties.
+msgid "Phone"
+msgstr "Telefon"
+
+#. TRANS: Field label for extended profile properties (Instant Messaging).
+msgid "IM"
+msgstr "Komunikator"
+
+#. TRANS: Field label for extended profile properties.
+msgid "Website"
+msgstr "Strona internetowa"
+
+#. TRANS: Field label for extended profile properties.
+msgid "Employer"
+msgstr "Pracodawca"
+
+#. TRANS: Field label for extended profile properties.
+msgid "Personal"
+msgstr "Osobisty"
+
+#. TRANS: Field label for extended profile properties.
+msgid "Full name"
+msgstr "ImiÄ™ i nazwisko"
+
+#. TRANS: Field label for extended profile properties.
+msgid "Title"
+msgstr "Tytuł"
+
+#. TRANS: Field label for extended profile properties.
+msgid "Manager"
+msgstr "Menadżer"
+
+#. TRANS: Field label for extended profile properties.
+msgid "Location"
+msgstr "Położenie"
+
+#. TRANS: Field label for extended profile properties.
+msgid "Bio"
+msgstr "Biografia"
+
+#. TRANS: Field label for extended profile properties.
+msgid "Tags"
+msgstr "Znaczniki"
+
+#. TRANS: Field label for extended profile properties.
+msgid "Contact"
+msgstr "Kontakt"
+
+#. TRANS: Field label for extended profile properties.
+msgid "Birthday"
+msgstr "Data urodzenia"
+
+#. TRANS: Field label for extended profile properties.
+msgid "Spouse's name"
+msgstr "Imię, nazwisko współmałżonka"
+
+#. TRANS: Field label for extended profile properties.
+msgid "Kids' names"
+msgstr "Imiona dzieci"
+
+#. TRANS: Field label for extended profile properties.
+msgid "Work experience"
+msgstr "Doświadczenie zawodowe"
+
+#. TRANS: Field label for extended profile properties.
+msgid "Education"
+msgstr "Wykształcenie"
diff --git a/plugins/ExtendedProfile/locale/sv/LC_MESSAGES/ExtendedProfile.po b/plugins/ExtendedProfile/locale/sv/LC_MESSAGES/ExtendedProfile.po
index b073872780..2db45233e2 100644
--- a/plugins/ExtendedProfile/locale/sv/LC_MESSAGES/ExtendedProfile.po
+++ b/plugins/ExtendedProfile/locale/sv/LC_MESSAGES/ExtendedProfile.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - ExtendedProfile to Swedish (Svenska)
+# Translation of StatusNet - ExtendedProfile to Swedish (svenska)
 # Exported from translatewiki.net
 #
 # Author: Lokal Profil
@@ -10,18 +10,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ExtendedProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:24+0000\n"
-"Language-Team: Swedish <http://translatewiki.net/wiki/Portal:sv>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:32+0000\n"
+"Language-Team: Swedish <https://translatewiki.net/wiki/Portal:sv>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:26:39+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:06+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: sv\n"
 "X-Message-Group: #out-statusnet-plugin-extendedprofile\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Title for extended profile settings.
 msgid "Extended profile settings"
 msgstr "Utökade profilinställningar"
 
@@ -30,6 +31,7 @@ msgid ""
 "You can update your personal profile info here so people know more about you."
 msgstr ""
 
+#. TRANS: Client error displayed when the session token does not match or is not given.
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 
@@ -37,6 +39,7 @@ msgstr ""
 msgid "Unexpected form submission."
 msgstr ""
 
+#. TRANS: Success message after saving extended profile details.
 msgid "Details saved."
 msgstr "Detaljer sparade."
 
@@ -58,6 +61,7 @@ msgstr ""
 msgid "Invalid URL: %s."
 msgstr ""
 
+#. TRANS: Server error displayed when a field could not be saved in the database.
 msgid "Could not save profile details."
 msgstr ""
 
@@ -109,17 +113,11 @@ msgstr ""
 msgid "Company"
 msgstr "Företag"
 
-#. TRANS: Field label in experience area of extended profile (when did one start a position).
-#. TRANS: Field label in experience edit area of extended profile (when did one start at a company).
-#. TRANS: Field label in education area of extended profile (when did one start an education).
-#. TRANS: Field label in education edit area of extended profile (when did one start an education).
+#. TRANS: Field label in extended profile (when did one start a position or education).
 msgid "Start"
 msgstr "Start"
 
-#. TRANS: Field label in experience area of extended profile (when did one end a position).
-#. TRANS: Field label in experience edit area of extended profile (when did one terminate at a company).
-#. TRANS: Field label in education area of extended profile (when did one end a education).
-#. TRANS: Field label in education edit area of extended profile (when did one end an education).
+#. TRANS: Field label in extended profile (when did one end a position or education).
 msgid "End"
 msgstr "Slut"
 
@@ -137,8 +135,7 @@ msgstr ""
 msgid "Institution"
 msgstr "Institution"
 
-#. TRANS: Field label in education area of extended profile.
-#. TRANS: Field label in education edit area of extended profile.
+#. TRANS: Field label in extended profile for specifying an academic degree.
 msgid "Degree"
 msgstr ""
 
diff --git a/plugins/ExtendedProfile/locale/te/LC_MESSAGES/ExtendedProfile.po b/plugins/ExtendedProfile/locale/te/LC_MESSAGES/ExtendedProfile.po
index 62a54ba151..78f0101cbe 100644
--- a/plugins/ExtendedProfile/locale/te/LC_MESSAGES/ExtendedProfile.po
+++ b/plugins/ExtendedProfile/locale/te/LC_MESSAGES/ExtendedProfile.po
@@ -9,18 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ExtendedProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:25+0000\n"
-"Language-Team: Telugu <http://translatewiki.net/wiki/Portal:te>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:32+0000\n"
+"Language-Team: Telugu <https://translatewiki.net/wiki/Portal:te>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:26:39+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:06+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: te\n"
 "X-Message-Group: #out-statusnet-plugin-extendedprofile\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Title for extended profile settings.
 msgid "Extended profile settings"
 msgstr ""
 
@@ -29,6 +30,7 @@ msgid ""
 "You can update your personal profile info here so people know more about you."
 msgstr ""
 
+#. TRANS: Client error displayed when the session token does not match or is not given.
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 
@@ -36,6 +38,7 @@ msgstr ""
 msgid "Unexpected form submission."
 msgstr ""
 
+#. TRANS: Success message after saving extended profile details.
 msgid "Details saved."
 msgstr ""
 
@@ -57,6 +60,7 @@ msgstr ""
 msgid "Invalid URL: %s."
 msgstr ""
 
+#. TRANS: Server error displayed when a field could not be saved in the database.
 msgid "Could not save profile details."
 msgstr ""
 
@@ -108,17 +112,11 @@ msgstr "(%s)"
 msgid "Company"
 msgstr ""
 
-#. TRANS: Field label in experience area of extended profile (when did one start a position).
-#. TRANS: Field label in experience edit area of extended profile (when did one start at a company).
-#. TRANS: Field label in education area of extended profile (when did one start an education).
-#. TRANS: Field label in education edit area of extended profile (when did one start an education).
+#. TRANS: Field label in extended profile (when did one start a position or education).
 msgid "Start"
 msgstr ""
 
-#. TRANS: Field label in experience area of extended profile (when did one end a position).
-#. TRANS: Field label in experience edit area of extended profile (when did one terminate at a company).
-#. TRANS: Field label in education area of extended profile (when did one end a education).
-#. TRANS: Field label in education edit area of extended profile (when did one end an education).
+#. TRANS: Field label in extended profile (when did one end a position or education).
 msgid "End"
 msgstr ""
 
@@ -136,8 +134,7 @@ msgstr "ప�రస�త�త"
 msgid "Institution"
 msgstr ""
 
-#. TRANS: Field label in education area of extended profile.
-#. TRANS: Field label in education edit area of extended profile.
+#. TRANS: Field label in extended profile for specifying an academic degree.
 msgid "Degree"
 msgstr ""
 
diff --git a/plugins/ExtendedProfile/locale/tl/LC_MESSAGES/ExtendedProfile.po b/plugins/ExtendedProfile/locale/tl/LC_MESSAGES/ExtendedProfile.po
index 4d9336b0e5..066020e7ca 100644
--- a/plugins/ExtendedProfile/locale/tl/LC_MESSAGES/ExtendedProfile.po
+++ b/plugins/ExtendedProfile/locale/tl/LC_MESSAGES/ExtendedProfile.po
@@ -9,18 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ExtendedProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:25+0000\n"
-"Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:32+0000\n"
+"Language-Team: Tagalog <https://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:26:39+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:06+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-extendedprofile\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Title for extended profile settings.
 msgid "Extended profile settings"
 msgstr "Dinugtungang mga katakdaan ng balangkas"
 
@@ -31,6 +32,7 @@ msgstr ""
 "Maisasapanahon mo rito ang kabatiran sa iyong pansariling balangkas upang "
 "makaalam pa ng mas marami ang mga tao tungkol sa iyo."
 
+#. TRANS: Client error displayed when the session token does not match or is not given.
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 "May isang suliranin sa iyong sesyon ng kahalip.  Mangyaring subukan uli."
@@ -39,6 +41,7 @@ msgstr ""
 msgid "Unexpected form submission."
 msgstr "Hindi inaasahang pagpapasa ng pormularyo."
 
+#. TRANS: Success message after saving extended profile details.
 msgid "Details saved."
 msgstr "Nasagip na ang mga detalye."
 
@@ -60,6 +63,7 @@ msgstr "Hindi katanggap-tanggap na ipinasok na petsa para sa \"%1$s\": %2$s."
 msgid "Invalid URL: %s."
 msgstr "Hindi katanggap-tanggap na URL: %s."
 
+#. TRANS: Server error displayed when a field could not be saved in the database.
 msgid "Could not save profile details."
 msgstr "Hindi masagip ang mga detalye ng balangkas."
 
@@ -111,17 +115,11 @@ msgstr "(%s)"
 msgid "Company"
 msgstr "Kumpanya"
 
-#. TRANS: Field label in experience area of extended profile (when did one start a position).
-#. TRANS: Field label in experience edit area of extended profile (when did one start at a company).
-#. TRANS: Field label in education area of extended profile (when did one start an education).
-#. TRANS: Field label in education edit area of extended profile (when did one start an education).
+#. TRANS: Field label in extended profile (when did one start a position or education).
 msgid "Start"
 msgstr "Magsimula"
 
-#. TRANS: Field label in experience area of extended profile (when did one end a position).
-#. TRANS: Field label in experience edit area of extended profile (when did one terminate at a company).
-#. TRANS: Field label in education area of extended profile (when did one end a education).
-#. TRANS: Field label in education edit area of extended profile (when did one end an education).
+#. TRANS: Field label in extended profile (when did one end a position or education).
 msgid "End"
 msgstr "Tapusin"
 
@@ -139,8 +137,7 @@ msgstr "Pangkasalukuyan"
 msgid "Institution"
 msgstr "Institusyon"
 
-#. TRANS: Field label in education area of extended profile.
-#. TRANS: Field label in education edit area of extended profile.
+#. TRANS: Field label in extended profile for specifying an academic degree.
 msgid "Degree"
 msgstr "Antas"
 
diff --git a/plugins/ExtendedProfile/locale/uk/LC_MESSAGES/ExtendedProfile.po b/plugins/ExtendedProfile/locale/uk/LC_MESSAGES/ExtendedProfile.po
index 9834125f0e..ca4058f4b0 100644
--- a/plugins/ExtendedProfile/locale/uk/LC_MESSAGES/ExtendedProfile.po
+++ b/plugins/ExtendedProfile/locale/uk/LC_MESSAGES/ExtendedProfile.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - ExtendedProfile to Ukrainian (Україн�ька)
+# Translation of StatusNet - ExtendedProfile to Ukrainian (україн�ька)
 # Exported from translatewiki.net
 #
 # Author: Boogie
@@ -9,19 +9,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ExtendedProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:25+0000\n"
-"Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:32+0000\n"
+"Language-Team: Ukrainian <https://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:26:39+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:06+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-extendedprofile\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
+#. TRANS: Title for extended profile settings.
 msgid "Extended profile settings"
 msgstr "Розширені налаштуванн� профілю"
 
@@ -32,6 +33,7 @@ msgstr ""
 "Тут ви можете заповнити �вій о�оби�тий профіль і люди знатимуть про ва� "
 "більше."
 
+#. TRANS: Client error displayed when the session token does not match or is not given.
 msgid "There was a problem with your session token. Try again, please."
 msgstr "Виникли певні проблеми з токеном �е�ії. Спробуйте знов, будь ла�ка."
 
@@ -39,6 +41,7 @@ msgstr "Виникли певні проблеми з токеном �е�ії.
 msgid "Unexpected form submission."
 msgstr "�е�подіване пред�тавленн� форми."
 
+#. TRANS: Success message after saving extended profile details.
 msgid "Details saved."
 msgstr "Подробиці збережено."
 
@@ -60,6 +63,7 @@ msgstr "�еприпу�тиме значенн� дати дл� «%1$s»: %2$s
 msgid "Invalid URL: %s."
 msgstr "�евірний URL: %s."
 
+#. TRANS: Server error displayed when a field could not be saved in the database.
 msgid "Could not save profile details."
 msgstr "�е вдало�� зберегти деталі профілю."
 
@@ -111,17 +115,11 @@ msgstr "(%s)"
 msgid "Company"
 msgstr "Компані�"
 
-#. TRANS: Field label in experience area of extended profile (when did one start a position).
-#. TRANS: Field label in experience edit area of extended profile (when did one start at a company).
-#. TRANS: Field label in education area of extended profile (when did one start an education).
-#. TRANS: Field label in education edit area of extended profile (when did one start an education).
+#. TRANS: Field label in extended profile (when did one start a position or education).
 msgid "Start"
 msgstr "Почати"
 
-#. TRANS: Field label in experience area of extended profile (when did one end a position).
-#. TRANS: Field label in experience edit area of extended profile (when did one terminate at a company).
-#. TRANS: Field label in education area of extended profile (when did one end a education).
-#. TRANS: Field label in education edit area of extended profile (when did one end an education).
+#. TRANS: Field label in extended profile (when did one end a position or education).
 msgid "End"
 msgstr "Кінець"
 
@@ -139,8 +137,7 @@ msgstr "Поточне"
 msgid "Institution"
 msgstr "У�танова"
 
-#. TRANS: Field label in education area of extended profile.
-#. TRANS: Field label in education edit area of extended profile.
+#. TRANS: Field label in extended profile for specifying an academic degree.
 msgid "Degree"
 msgstr "Ступінь"
 
diff --git a/plugins/FacebookBridge/FacebookBridgePlugin.php b/plugins/FacebookBridge/FacebookBridgePlugin.php
index d893baf62d..07a149785c 100644
--- a/plugins/FacebookBridge/FacebookBridgePlugin.php
+++ b/plugins/FacebookBridge/FacebookBridgePlugin.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * StatusNet - the distributed open-source microblogging tool
- * Copyright (C) 2010, StatusNet, Inc.
+ * Copyright (C) 2010-2011, StatusNet, Inc.
  *
  * A plugin for integrating Facebook with StatusNet. Includes single-sign-on
  * and publishing notices to Facebook using Facebook's Graph API.
@@ -21,7 +21,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
- * @category  Pugin
+ * @category  Plugin
  * @package   StatusNet
  * @author    Zach Copley <zach@status.net>
  * @copyright 2011 StatusNet, Inc.
@@ -41,7 +41,7 @@ define("FACEBOOK_SERVICE", 2);
  * @category  Plugin
  * @package   StatusNet
  * @author    Zach Copley <zach@status.net>
- * @copyright 2010 StatusNet, Inc.
+ * @copyright 2010-2011 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
  * @link      http://status.net/
  */
@@ -103,11 +103,10 @@ class FacebookBridgePlugin extends Plugin
     {
         $dir = dirname(__FILE__);
 
-        //common_debug("class = " . $cls);
-
         switch ($cls)
         {
         case 'Facebook': // Facebook PHP SDK
+            include_once $dir . '/extlib/base_facebook.php';
             include_once $dir . '/extlib/facebook.php';
             return false;
         case 'FacebookloginAction':
@@ -277,8 +276,7 @@ class FacebookBridgePlugin extends Plugin
         if ($this->hasApplication()) {
             $action_name = $action->trimmed('action');
 
-            // CurrentUserDesignAction stores the current user in $cur
-            $user = $action->getCurrentUser();
+            $user = common_current_user();
 
             $flink = null;
 
@@ -352,26 +350,35 @@ class FacebookBridgePlugin extends Plugin
             $action->script('https://connect.facebook.net/en_US/all.js');
 
             $script = <<<ENDOFSCRIPT
-FB.init({appId: %1\$s, session: %2\$s, status: true, cookie: true, xfbml: true});
+function setCookie(name, value) {
+    var date = new Date();
+    date.setTime(date.getTime() + (5 * 60 * 1000)); // 5 mins
+    var expires = "; expires=" + date.toGMTString();
+    document.cookie = name + "=" + value + expires + "; path=/";
+}
+
+FB.init({appId: %1\$s, status: true, cookie: true, xfbml: true, oauth: true});
 
 $('#facebook_button').bind('click', function(event) {
 
     event.preventDefault();
 
     FB.login(function(response) {
-        if (response.session && response.perms) {
-            window.location.href = '%3\$s';
+        if (response.authResponse) {
+            // put the access token in a cookie for the next step
+            setCookie('fb_access_token', response.authResponse.accessToken);
+            window.location.href = '%2\$s';
         } else {
             // NOP (user cancelled login)
         }
-    }, {perms:'read_stream,publish_stream,offline_access,user_status,user_location,user_website,email'});
+    }, {scope:'read_stream,publish_stream,offline_access,user_status,user_location,user_website,email'});
 });
 ENDOFSCRIPT;
 
             $action->inlineScript(
-                sprintf($script,
+                sprintf(
+                    $script,
                     json_encode($this->facebook->getAppId()),
-                    json_encode($this->facebook->getSession()),
                     common_local_url('facebookfinishlogin')
                 )
             );
@@ -383,26 +390,30 @@ ENDOFSCRIPT;
      *
      * @param Action action the current action
      */
-    function onEndLogout($action)
+    function onStartLogout($action)
     {
         if ($this->hasApplication()) {
-            $session = $this->facebook->getSession();
-            $fbuser  = null;
-            $fbuid   = null;
 
-            if ($session) {
-                try {
-                    $fbuid  = $this->facebook->getUser();
-                    $fbuser = $this->facebook->api('/me');
-                 } catch (FacebookApiException $e) {
-                     common_log(LOG_ERROR, $e, __FILE__);
-                 }
-            }
+            $cur = common_current_user();
+            $flink = Foreign_link::getByUserID($cur->id, FACEBOOK_SERVICE);
 
-            if (!empty($fbuser)) {
+            if (!empty($flink)) {
+
+                $this->facebook->setAccessToken($flink->credentials);
+
+                if (common_config('singleuser', 'enabled')) {
+                    $user = User::singleUser();
+
+                    $destination = common_local_url(
+                        'showstream',
+                        array('nickname' => $user->nickname)
+                    );
+                } else {
+                    $destination = common_local_url('public');
+                }
 
                 $logoutUrl = $this->facebook->getLogoutUrl(
-                    array('next' => common_local_url('public'))
+                    array('next' => $destination)
                 );
 
                 common_log(
@@ -413,9 +424,14 @@ ENDOFSCRIPT;
                     ),
                     __FILE__
                 );
-                common_debug("LOGOUT URL = $logoutUrl");
+
+                $action->logout();
+
                 common_redirect($logoutUrl, 303);
+                return false; // probably never get here, but hey
             }
+
+            return true;
         }
     }
 
@@ -543,6 +559,69 @@ ENDOFSCRIPT;
         return true;
     }
 
+    /**
+     * Add links in the user's profile block to their Facebook profile URL.
+     *
+     * @param Profile $profile The profile being shown
+     * @param Array   &$links  Writeable array of arrays (href, text, image).
+     *
+     * @return boolean hook value (true)
+     */
+
+    function onOtherAccountProfiles($profile, &$links)
+    {
+        $fuser = null;
+
+        $flink = Foreign_link::getByUserID($profile->id, FACEBOOK_SERVICE);
+
+        if (!empty($flink)) {
+
+            $fuser = $this->getFacebookUser($flink->foreign_id);
+
+            if (!empty($fuser)) {
+                $links[] = array("href" => $fuser->link,
+                                 "text" => sprintf(_("%s on Facebook"), $fuser->name),
+                                 "image" => $this->path("images/f_logo.png"));
+            }
+        }
+
+        return true;
+    }
+
+    function getFacebookUser($id) {
+
+        $key = Cache::key(sprintf("FacebookBridgePlugin:userdata:%s", $id));
+
+        $c = Cache::instance();
+
+        if ($c) {
+            $obj = $c->get($key);
+            if ($obj) {
+                return $obj;
+            }
+        }
+
+        $url = sprintf("https://graph.facebook.com/%s", $id);
+        $client = new HTTPClient();
+        $resp = $client->get($url);
+
+        if (!$resp->isOK()) {
+            return null;
+        }
+
+        $user = json_decode($resp->getBody());
+
+        if ($user->error) {
+            return null;
+        }
+
+        if ($c) {
+            $c->set($key, $user);
+        }
+
+        return $user;
+    }
+
     /*
      * Add version info for this plugin
      *
diff --git a/plugins/FacebookBridge/actions/facebookdeauthorize.php b/plugins/FacebookBridge/actions/facebookdeauthorize.php
index 1a83c3a003..443b768f5c 100644
--- a/plugins/FacebookBridge/actions/facebookdeauthorize.php
+++ b/plugins/FacebookBridge/actions/facebookdeauthorize.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * StatusNet - the distributed open-source microblogging tool
- * Copyright (C) 2010, StatusNet, Inc.
+ * Copyright (C) 2010-2011, StatusNet, Inc.
  *
  * An action that handles deauthorize callbacks from Facebook
  *
@@ -23,7 +23,7 @@
  * @category  Plugin
  * @package   StatusNet
  * @author    Zach Copley <zach@status.net>
- * @copyright 2010 StatusNet, Inc.
+ * @copyright 2010-2011 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
  * @link      http://status.net/
  */
diff --git a/plugins/FacebookBridge/actions/facebookfinishlogin.php b/plugins/FacebookBridge/actions/facebookfinishlogin.php
index 3d2fb571d7..2703ab8554 100644
--- a/plugins/FacebookBridge/actions/facebookfinishlogin.php
+++ b/plugins/FacebookBridge/actions/facebookfinishlogin.php
@@ -22,7 +22,7 @@
  * @category  Plugin
  * @package   StatusNet
  * @author    Zach Copley <zach@status.net>
- * @copyright 2010 StatusNet, Inc.
+ * @copyright 2010-2011 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
  */
@@ -33,42 +33,34 @@ if (!defined('STATUSNET')) {
 
 class FacebookfinishloginAction extends Action
 {
-    private $facebook = null; // Facebook client
-    private $fbuid    = null; // Facebook user ID
-    private $fbuser   = null; // Facebook user object (JSON)
+    private $fbuid       = null; // Facebook user ID
+    private $fbuser      = null; // Facebook user object (JSON)
+    private $accessToken = null; // Access token provided by Facebook JS API
 
     function prepare($args) {
         parent::prepare($args);
 
-        $this->facebook = new Facebook(
-            array(
-                'appId'  => common_config('facebook', 'appid'),
-                'secret' => common_config('facebook', 'secret'),
-                'cookie' => true,
-            )
-        );
+        // Check cookie for a valid access_token
 
-        // Check for a Facebook user session
-
-        $session = $this->facebook->getSession();
-        $me      = null;
-
-        if ($session) {
-            try {
-                $this->fbuid  = $this->facebook->getUser();
-                $this->fbuser = $this->facebook->api('/me');
-            } catch (FacebookApiException $e) {
-                common_log(LOG_ERROR, $e, __FILE__);
-            }
+        if (isset($_COOKIE['fb_access_token'])) {
+            $this->accessToken = $_COOKIE['fb_access_token'];
         }
 
-        if (!empty($this->fbuser)) {
-            // OKAY, all is well... proceed to register
+        if (empty($this->accessToken)) {
+            $this->clientError(_m("Unable to authenticate you with Facebook."));
+            return false;
+        }
 
-            common_debug("Found a valid Facebook user.", __FILE__);
+        $graphUrl = 'https://graph.facebook.com/me?access_token=' . urlencode($this->accessToken);
+        $this->fbuser = json_decode(file_get_contents($graphUrl));
+
+        if (!empty($this->fbuser)) {
+            $this->fbuid  = $this->fbuser->id;
+            // OKAY, all is well... proceed to register
+            return true;
         } else {
 
-            // This shouldn't happen in the regular course of things
+            // log badness
 
             list($proxy, $ip) = common_client_ip();
 
@@ -88,7 +80,7 @@ class FacebookfinishloginAction extends Action
             );
         }
 
-        return true;
+        return false;
     }
 
     function handle($args)
@@ -97,34 +89,14 @@ class FacebookfinishloginAction extends Action
 
         if (common_is_real_login()) {
 
-            // User is already logged in, are her accounts already linked?
+            // This will throw a client exception if the user already
+            // has some sort of foreign_link to Facebook.
 
-            $flink = Foreign_link::getByForeignID($this->fbuid, FACEBOOK_SERVICE);
+            $this->checkForExistingLink();
 
-            if (!empty($flink)) {
+            // Possibly reconnect an existing account
 
-                // User already has a linked Facebook account and shouldn't be here!
-
-                common_debug(
-                    sprintf(
-                        'There\'s already a local user %d linked with Facebook user %s.',
-                        $flink->user_id,
-                        $this->fbuid
-                    )
-                );
-
-                $this->clientError(
-                    // TRANS: Client error displayed when trying to connect to a Facebook account that is already linked
-                    // TRANS: in the same StatusNet site.
-                    _m('There is already a local account linked with that Facebook account.')
-                );
-
-            } else {
-
-                // Possibly reconnect an existing account
-
-                $this->connectUser();
-            }
+            $this->connectUser();
 
         } else if ($_SERVER['REQUEST_METHOD'] == 'POST') {
             $this->handlePost();
@@ -133,10 +105,47 @@ class FacebookfinishloginAction extends Action
         }
     }
 
+    function checkForExistingLink() {
+
+        // User is already logged in, are her accounts already linked?
+
+        $flink = Foreign_link::getByForeignID($this->fbuid, FACEBOOK_SERVICE);
+
+        if (!empty($flink)) {
+
+            // User already has a linked Facebook account and shouldn't be here!
+
+            $this->clientError(
+                // TRANS: Client error displayed when trying to connect to a Facebook account that is already linked
+                // TRANS: in the same StatusNet site.
+                _m('There is already a local account linked with that Facebook account.')
+            );
+
+            return;
+       }
+
+       $cur = common_current_user();
+       $flink = Foreign_link::getByUserID($cur->id, FACEBOOK_SERVICE);
+
+       if (!empty($flink)) {
+
+            // There's already a local user linked to this Facebook account.
+
+            $this->clientError(
+                // TRANS: Client error displayed when trying to connect to a Facebook account that is already linked
+                // TRANS: in the same StatusNet site.
+                _m('There is already a local account linked with that Facebook account.')
+            );
+
+            return;
+        }
+    }
+
     function handlePost()
     {
         $token = $this->trimmed('token');
 
+        // CSRF protection
         if (!$token || $token != common_session_token()) {
             $this->showForm(
                 // TRANS: Client error displayed when the session token does not match or is not given.
@@ -365,19 +374,19 @@ class FacebookfinishloginAction extends Action
         }
 
         $args = array(
-            'nickname'        => $nickname,
-            'fullname'        => $this->fbuser['first_name']
-                . ' ' . $this->fbuser['last_name'],
-            'homepage'        => $this->fbuser['website'],
-            'bio'             => $this->fbuser['about'],
-            'location'        => $this->fbuser['location']['name']
+            'nickname' => $nickname,
+            'fullname' => $this->fbuser->name,
+            'homepage' => $this->fbuser->website,
+            'location' => $this->fbuser->location->name
         );
 
         // It's possible that the email address is already in our
         // DB. It's a unique key, so we need to check
-        if ($this->isNewEmail($this->fbuser['email'])) {
-            $args['email']           = $this->fbuser['email'];
-            $args['email_confirmed'] = true;
+        if ($this->isNewEmail($this->fbuser->email)) {
+            $args['email']           = $this->fbuser->email;
+            if (isset($this->fuser->verified) && $this->fuser->verified == true) {
+                $args['email_confirmed'] = true;
+            }
         }
 
         if (!empty($invite)) {
@@ -407,7 +416,7 @@ class FacebookfinishloginAction extends Action
                 'Registered new user %s (%d) from Facebook user %s, (fbuid %d)',
                 $user->nickname,
                 $user->id,
-                $this->fbuser['name'],
+                $this->fbuser->name,
                 $this->fbuid
             ),
             __FILE__
@@ -424,64 +433,62 @@ class FacebookfinishloginAction extends Action
      */
     function setAvatar($user)
     {
-        $picUrl = sprintf(
-            'http://graph.facebook.com/%s/picture?type=large',
-            $this->fbuid
-        );
-
-        // fetch the picture from Facebook
-        $client = new HTTPClient();
-
-        // fetch the actual picture
-        $response = $client->get($picUrl);
-
-        if ($response->isOk()) {
-
-            $finalUrl = $client->getUrl();
-
-            // Make sure the filename is unique becuase it's possible for a user
-            // to deauthorize our app, and then come back in as a new user but
-            // have the same Facebook picture (avatar URLs have a unique index
-            // and their URLs are based on the filenames).
-            $filename = 'facebook-' . common_good_rand(4) . '-'
-                . substr(strrchr($finalUrl, '/'), 1);
-
-            $ok = file_put_contents(
-                Avatar::path($filename),
-                $response->getBody()
+         try {
+            $picUrl = sprintf(
+                'http://graph.facebook.com/%d/picture?type=large',
+                $this->fbuser->id
             );
 
-            if (!$ok) {
-                common_log(
-                    LOG_WARNING,
-                    sprintf(
-                        'Couldn\'t save Facebook avatar %s',
-                        $tmp
-                    ),
-                    __FILE__
+            // fetch the picture from Facebook
+            $client = new HTTPClient();
+
+            // fetch the actual picture
+            $response = $client->get($picUrl);
+
+            if ($response->isOk()) {
+
+                // seems to always be jpeg, but not sure
+                $tmpname = "facebook-avatar-tmp-" . common_good_rand(4);
+
+                $ok = file_put_contents(
+                    Avatar::path($tmpname),
+                    $response->getBody()
                 );
 
-            } else {
+                if (!$ok) {
+                    common_log(LOG_WARNING, 'Couldn\'t save tmp Facebook avatar: ' . $tmpname, __FILE__);
+                } else {
+                    // save it as an avatar
 
-                // save it as an avatar
-                $profile = $user->getProfile();
+                    $file = new ImageFile($user->id, Avatar::path($tmpname));
+                    $filename = $file->resize(180); // size of the biggest img we get from Facebook
+
+                    $profile   = $user->getProfile();
+
+                    if ($profile->setOriginal($filename)) {
+                        common_log(
+                            LOG_INFO,
+                            sprintf(
+                                'Saved avatar for %s (%d) from Facebook picture for '
+                                    . '%s (fbuid %d), filename = %s',
+                                 $user->nickname,
+                                 $user->id,
+                                 $this->fbuser->name,
+                                 $this->fbuid,
+                                 $filename
+                             ),
+                             __FILE__
+                        );
+
+                        // clean up tmp file
+                        @unlink(Avatar::path($tmpname));
+                    }
 
-                if ($profile->setOriginal($filename)) {
-                    common_log(
-                        LOG_INFO,
-                        sprintf(
-                            'Saved avatar for %s (%d) from Facebook picture for '
-                                . '%s (fbuid %d), filename = %s',
-                             $user->nickname,
-                             $user->id,
-                             $this->fbuser['name'],
-                             $this->fbuid,
-                             $filename
-                        ),
-                        __FILE__
-                    );
                 }
             }
+        } catch (Exception $e) {
+            common_log(LOG_WARNING, 'Couldn\'t save Facebook avatar: ' . $e->getMessage(), __FILE__);
+            // error isn't fatal, continue
         }
     }
 
@@ -498,22 +505,14 @@ class FacebookfinishloginAction extends Action
 
         $user = User::staticGet('nickname', $nickname);
 
-        if (!empty($user)) {
-            common_debug(
-                sprintf(
-                    'Found a legit user to connect to Facebook: %s (%d)',
-                    $user->nickname,
-                    $user->id
-                ),
-                __FILE__
-            );
-        }
-
         $this->tryLinkUser($user);
 
         common_set_user($user);
         common_real_login(true);
 
+        // clear out the stupid cookie
+        setcookie('fb_access_token', '', time() - 3600); // one hour ago
+
         $this->goHome($user->nickname);
     }
 
@@ -521,6 +520,9 @@ class FacebookfinishloginAction extends Action
     {
         $user = common_current_user();
         $this->tryLinkUser($user);
+
+        // clear out the stupid cookie
+        setcookie('fb_access_token', '', time() - 3600); // one hour ago
         common_redirect(common_local_url('facebookfinishlogin'), 303);
     }
 
@@ -533,29 +535,10 @@ class FacebookfinishloginAction extends Action
             $this->serverError(_m('Error connecting user to Facebook.'));
             return;
         }
-
-        common_debug(
-            sprintf(
-                'Connected Facebook user %s (fbuid %d) to local user %s (%d)',
-                $this->fbuser['name'],
-                $this->fbuid,
-                $user->nickname,
-                $user->id
-            ),
-            __FILE__
-        );
     }
 
     function tryLogin()
     {
-        common_debug(
-            sprintf(
-                'Trying login for Facebook user %s',
-                $this->fbuid
-            ),
-            __FILE__
-        );
-
         $flink = Foreign_link::getByForeignID($this->fbuid, FACEBOOK_SERVICE);
 
         if (!empty($flink)) {
@@ -576,19 +559,14 @@ class FacebookfinishloginAction extends Action
 
                 common_set_user($user);
                 common_real_login(true);
+
+                // clear out the stupid cookie
+                setcookie('fb_access_token', '', time() - 3600); // one hour ago
+
                 $this->goHome($user->nickname);
             }
 
         } else {
-
-            common_debug(
-                sprintf(
-                    'No flink found for fbuid: %s - new user',
-                    $this->fbuid
-                ),
-                __FILE__
-            );
-
             $this->showForm(null, $this->bestNewNickname());
         }
     }
@@ -611,14 +589,12 @@ class FacebookfinishloginAction extends Action
     function flinkUser($user_id, $fbuid)
     {
         $flink = new Foreign_link();
-        $flink->user_id = $user_id;
-        $flink->foreign_id = $fbuid;
-        $flink->service = FACEBOOK_SERVICE;
 
-        // Pull the access token from the Facebook cookies
-        $flink->credentials = $this->facebook->getAccessToken();
-
-        $flink->created = common_sql_now();
+        $flink->user_id     = $user_id;
+        $flink->foreign_id  = $fbuid;
+        $flink->service     = FACEBOOK_SERVICE;
+        $flink->credentials = $this->accessToken;
+        $flink->created     = common_sql_now();
 
         $flink_id = $flink->insert();
 
@@ -627,8 +603,8 @@ class FacebookfinishloginAction extends Action
 
     function bestNewNickname()
     {
-        if (!empty($this->fbuser['name'])) {
-            $nickname = $this->nicknamize($this->fbuser['name']);
+        if (!empty($this->fbuser->username)) {
+            $nickname = $this->nicknamize($this->fbuser->username);
             if ($this->isNewNickname($nickname)) {
                 return $nickname;
             }
@@ -636,8 +612,7 @@ class FacebookfinishloginAction extends Action
 
         // Try the full name
 
-        $fullname = trim($this->fbuser['first_name'] .
-            ' ' . $this->fbuser['last_name']);
+        $fullname = $this->fbuser->name;
 
         if (!empty($fullname)) {
             $fullname = $this->nicknamize($fullname);
@@ -694,10 +669,8 @@ class FacebookfinishloginAction extends Action
          $result = User::staticGet('email', $email);
 
          if (empty($result)) {
-             common_debug("XXXXXXXXXXXXXXXXXX We've never seen this email before!!!");
              return true;
          }
-         common_debug("XXXXXXXXXXXXXXXXXX dupe email address!!!!");
 
          return false;
      }
diff --git a/plugins/FacebookBridge/actions/facebooklogin.php b/plugins/FacebookBridge/actions/facebooklogin.php
index fa3cc7a6f2..f30822b63f 100644
--- a/plugins/FacebookBridge/actions/facebooklogin.php
+++ b/plugins/FacebookBridge/actions/facebooklogin.php
@@ -23,7 +23,7 @@
  * @category  Plugin
  * @package   StatusNet
  * @author    Zach Copley <zach@status.net>
- * @copyright 2010 StatusNet, Inc.
+ * @copyright 2010-2011 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
  * @link      http://status.net/
  */
@@ -72,17 +72,16 @@ class FacebookloginAction extends Action
 
         $facebook = Facebookclient::getFacebook();
 
+        $params = array(
+          'scope' => 'read_stream,publish_stream,offline_access,user_status,user_location,user_website,email',
+          'redirect_uri' => common_local_url('facebookfinishlogin')
+        );
+
         // Degrade to plain link if JavaScript is not available
         $this->elementStart(
             'a',
             array(
-                'href' => $facebook->getLoginUrl(
-                    array(
-                        'next'       => common_local_url('facebookfinishlogin'),
-                        'cancel'     => common_local_url('facebooklogin'),
-                        'req_perms'  => 'read_stream,publish_stream,offline_access,user_status,user_location,user_website,email'
-                    )
-                 ),
+                'href' => $facebook->getLoginUrl($params),
                 'id'    => 'facebook_button'
             )
         );
@@ -99,16 +98,6 @@ class FacebookloginAction extends Action
 
         $this->elementEnd('a');
 
-        /*
-        $this->element('div', array('id' => 'fb-root'));
-        $this->script(
-            sprintf(
-                'http://connect.facebook.net/en_US/all.js#appId=%s&xfbml=1',
-                common_config('facebook', 'appid')
-            )
-        );
-        $this->element('fb:facepile', array('max-rows' => '2', 'width' =>'300'));
-        */
         $this->elementEnd('fieldset');
     }
 
diff --git a/plugins/FacebookBridge/actions/facebooksettings.php b/plugins/FacebookBridge/actions/facebooksettings.php
index aaa2204035..3f56421b4f 100644
--- a/plugins/FacebookBridge/actions/facebooksettings.php
+++ b/plugins/FacebookBridge/actions/facebooksettings.php
@@ -201,10 +201,8 @@ class FacebooksettingsAction extends SettingsAction {
 
                 $msg = sprintf(
                     // TRANS: Notice in disconnect from Facebook form if user has no local StatusNet password.
-                    _m(
-                        'Disconnecting your Faceboook would make it impossible to '
-                            . 'log in! Please [set a password](%s) first.'
-                    ),
+                    _m('Disconnecting your Faceboook would make it impossible to '.
+                       'log in! Please [set a password](%s) first.'),
                     common_local_url('passwordsettings')
                 );
 
diff --git a/plugins/FacebookBridge/extlib/base_facebook.php b/plugins/FacebookBridge/extlib/base_facebook.php
new file mode 100644
index 0000000000..6e8486092e
--- /dev/null
+++ b/plugins/FacebookBridge/extlib/base_facebook.php
@@ -0,0 +1,1126 @@
+<?php
+/**
+ * Copyright 2011 Facebook, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License. You may obtain
+ * a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
+if (!function_exists('curl_init')) {
+  throw new Exception('Facebook needs the CURL PHP extension.');
+}
+if (!function_exists('json_decode')) {
+  throw new Exception('Facebook needs the JSON PHP extension.');
+}
+
+/**
+ * Thrown when an API call returns an exception.
+ *
+ * @author Naitik Shah <naitik@facebook.com>
+ */
+class FacebookApiException extends Exception
+{
+  /**
+   * The result from the API server that represents the exception information.
+   */
+  protected $result;
+
+  /**
+   * Make a new API Exception with the given result.
+   *
+   * @param array $result The result from the API server
+   */
+  public function __construct($result) {
+    $this->result = $result;
+
+    $code = isset($result['error_code']) ? $result['error_code'] : 0;
+
+    if (isset($result['error_description'])) {
+      // OAuth 2.0 Draft 10 style
+      $msg = $result['error_description'];
+    } else if (isset($result['error']) && is_array($result['error'])) {
+      // OAuth 2.0 Draft 00 style
+      $msg = $result['error']['message'];
+    } else if (isset($result['error_msg'])) {
+      // Rest server style
+      $msg = $result['error_msg'];
+    } else {
+      $msg = 'Unknown Error. Check getResult()';
+    }
+
+    parent::__construct($msg, $code);
+  }
+
+  /**
+   * Return the associated result object returned by the API server.
+   *
+   * @return array The result from the API server
+   */
+  public function getResult() {
+    return $this->result;
+  }
+
+  /**
+   * Returns the associated type for the error. This will default to
+   * 'Exception' when a type is not available.
+   *
+   * @return string
+   */
+  public function getType() {
+    if (isset($this->result['error'])) {
+      $error = $this->result['error'];
+      if (is_string($error)) {
+        // OAuth 2.0 Draft 10 style
+        return $error;
+      } else if (is_array($error)) {
+        // OAuth 2.0 Draft 00 style
+        if (isset($error['type'])) {
+          return $error['type'];
+        }
+      }
+    }
+
+    return 'Exception';
+  }
+
+  /**
+   * To make debugging easier.
+   *
+   * @return string The string representation of the error
+   */
+  public function __toString() {
+    $str = $this->getType() . ': ';
+    if ($this->code != 0) {
+      $str .= $this->code . ': ';
+    }
+    return $str . $this->message;
+  }
+}
+
+/**
+ * Provides access to the Facebook Platform.  This class provides
+ * a majority of the functionality needed, but the class is abstract
+ * because it is designed to be sub-classed.  The subclass must
+ * implement the four abstract methods listed at the bottom of
+ * the file.
+ *
+ * @author Naitik Shah <naitik@facebook.com>
+ */
+abstract class BaseFacebook
+{
+  /**
+   * Version.
+   */
+  const VERSION = '3.1.1';
+
+  /**
+   * Default options for curl.
+   */
+  public static $CURL_OPTS = array(
+    CURLOPT_CONNECTTIMEOUT => 10,
+    CURLOPT_RETURNTRANSFER => true,
+    CURLOPT_TIMEOUT        => 60,
+    CURLOPT_USERAGENT      => 'facebook-php-3.1',
+  );
+
+  /**
+   * List of query parameters that get automatically dropped when rebuilding
+   * the current URL.
+   */
+  protected static $DROP_QUERY_PARAMS = array(
+    'code',
+    'state',
+    'signed_request',
+  );
+
+  /**
+   * Maps aliases to Facebook domains.
+   */
+  public static $DOMAIN_MAP = array(
+    'api'       => 'https://api.facebook.com/',
+    'api_video' => 'https://api-video.facebook.com/',
+    'api_read'  => 'https://api-read.facebook.com/',
+    'graph'     => 'https://graph.facebook.com/',
+    'www'       => 'https://www.facebook.com/',
+  );
+
+  /**
+   * The Application ID.
+   *
+   * @var string
+   */
+  protected $appId;
+
+  /**
+   * The Application API Secret.
+   *
+   * @var string
+   */
+  protected $apiSecret;
+
+  /**
+   * The ID of the Facebook user, or 0 if the user is logged out.
+   *
+   * @var integer
+   */
+  protected $user;
+
+  /**
+   * The data from the signed_request token.
+   */
+  protected $signedRequest;
+
+  /**
+   * A CSRF state variable to assist in the defense against CSRF attacks.
+   */
+  protected $state;
+
+  /**
+   * The OAuth access token received in exchange for a valid authorization
+   * code.  null means the access token has yet to be determined.
+   *
+   * @var string
+   */
+  protected $accessToken = null;
+
+  /**
+   * Indicates if the CURL based @ syntax for file uploads is enabled.
+   *
+   * @var boolean
+   */
+  protected $fileUploadSupport = false;
+
+  /**
+   * Initialize a Facebook Application.
+   *
+   * The configuration:
+   * - appId: the application ID
+   * - secret: the application secret
+   * - fileUpload: (optional) boolean indicating if file uploads are enabled
+   *
+   * @param array $config The application configuration
+   */
+  public function __construct($config) {
+    $this->setAppId($config['appId']);
+    $this->setApiSecret($config['secret']);
+    if (isset($config['fileUpload'])) {
+      $this->setFileUploadSupport($config['fileUpload']);
+    }
+
+    $state = $this->getPersistentData('state');
+    if (!empty($state)) {
+      $this->state = $this->getPersistentData('state');
+    }
+  }
+
+  /**
+   * Set the Application ID.
+   *
+   * @param string $appId The Application ID
+   * @return BaseFacebook
+   */
+  public function setAppId($appId) {
+    $this->appId = $appId;
+    return $this;
+  }
+
+  /**
+   * Get the Application ID.
+   *
+   * @return string the Application ID
+   */
+  public function getAppId() {
+    return $this->appId;
+  }
+
+  /**
+   * Set the API Secret.
+   *
+   * @param string $apiSecret The API Secret
+   * @return BaseFacebook
+   */
+  public function setApiSecret($apiSecret) {
+    $this->apiSecret = $apiSecret;
+    return $this;
+  }
+
+  /**
+   * Get the API Secret.
+   *
+   * @return string the API Secret
+   */
+  public function getApiSecret() {
+    return $this->apiSecret;
+  }
+
+  /**
+   * Set the file upload support status.
+   *
+   * @param boolean $fileUploadSupport The file upload support status.
+   * @return BaseFacebook
+   */
+  public function setFileUploadSupport($fileUploadSupport) {
+    $this->fileUploadSupport = $fileUploadSupport;
+    return $this;
+  }
+
+  /**
+   * Get the file upload support status.
+   *
+   * @return boolean true if and only if the server supports file upload.
+   */
+  public function useFileUploadSupport() {
+    return $this->fileUploadSupport;
+  }
+
+  /**
+   * Sets the access token for api calls.  Use this if you get
+   * your access token by other means and just want the SDK
+   * to use it.
+   *
+   * @param string $access_token an access token.
+   * @return BaseFacebook
+   */
+  public function setAccessToken($access_token) {
+    $this->accessToken = $access_token;
+    return $this;
+  }
+
+  /**
+   * Determines the access token that should be used for API calls.
+   * The first time this is called, $this->accessToken is set equal
+   * to either a valid user access token, or it's set to the application
+   * access token if a valid user access token wasn't available.  Subsequent
+   * calls return whatever the first call returned.
+   *
+   * @return string The access token
+   */
+  public function getAccessToken() {
+    if ($this->accessToken !== null) {
+      // we've done this already and cached it.  Just return.
+      return $this->accessToken;
+    }
+
+    // first establish access token to be the application
+    // access token, in case we navigate to the /oauth/access_token
+    // endpoint, where SOME access token is required.
+    $this->setAccessToken($this->getApplicationAccessToken());
+    if ($user_access_token = $this->getUserAccessToken()) {
+      $this->setAccessToken($user_access_token);
+    }
+
+    return $this->accessToken;
+  }
+
+  /**
+   * Determines and returns the user access token, first using
+   * the signed request if present, and then falling back on
+   * the authorization code if present.  The intent is to
+   * return a valid user access token, or false if one is determined
+   * to not be available.
+   *
+   * @return string A valid user access token, or false if one
+   *                could not be determined.
+   */
+  protected function getUserAccessToken() {
+    // first, consider a signed request if it's supplied.
+    // if there is a signed request, then it alone determines
+    // the access token.
+    $signed_request = $this->getSignedRequest();
+    if ($signed_request) {
+      // apps.facebook.com hands the access_token in the signed_request
+      if (array_key_exists('oauth_token', $signed_request)) {
+        $access_token = $signed_request['oauth_token'];
+        $this->setPersistentData('access_token', $access_token);
+        return $access_token;
+      }
+
+      // the JS SDK puts a code in with the redirect_uri of ''
+      if (array_key_exists('code', $signed_request)) {
+        $code = $signed_request['code'];
+        $access_token = $this->getAccessTokenFromCode($code, '');
+        if ($access_token) {
+          $this->setPersistentData('code', $code);
+          $this->setPersistentData('access_token', $access_token);
+          return $access_token;
+        }
+      }
+
+      // signed request states there's no access token, so anything
+      // stored should be cleared.
+      $this->clearAllPersistentData();
+      return false; // respect the signed request's data, even
+                    // if there's an authorization code or something else
+    }
+
+    $code = $this->getCode();
+    if ($code && $code != $this->getPersistentData('code')) {
+      $access_token = $this->getAccessTokenFromCode($code);
+      if ($access_token) {
+        $this->setPersistentData('code', $code);
+        $this->setPersistentData('access_token', $access_token);
+        return $access_token;
+      }
+
+      // code was bogus, so everything based on it should be invalidated.
+      $this->clearAllPersistentData();
+      return false;
+    }
+
+    // as a fallback, just return whatever is in the persistent
+    // store, knowing nothing explicit (signed request, authorization
+    // code, etc.) was present to shadow it (or we saw a code in $_REQUEST,
+    // but it's the same as what's in the persistent store)
+    return $this->getPersistentData('access_token');
+  }
+
+  /**
+   * Retrieve the signed request, either from a request parameter or,
+   * if not present, from a cookie.
+   *
+   * @return string the signed request, if available, or null otherwise.
+   */
+  public function getSignedRequest() {
+    if (!$this->signedRequest) {
+      if (isset($_REQUEST['signed_request'])) {
+        $this->signedRequest = $this->parseSignedRequest(
+          $_REQUEST['signed_request']);
+      } else if (isset($_COOKIE[$this->getSignedRequestCookieName()])) {
+        $this->signedRequest = $this->parseSignedRequest(
+          $_COOKIE[$this->getSignedRequestCookieName()]);
+      }
+    }
+    return $this->signedRequest;
+  }
+
+  /**
+   * Get the UID of the connected user, or 0
+   * if the Facebook user is not connected.
+   *
+   * @return string the UID if available.
+   */
+  public function getUser() {
+    if ($this->user !== null) {
+      // we've already determined this and cached the value.
+      return $this->user;
+    }
+
+    return $this->user = $this->getUserFromAvailableData();
+  }
+
+  /**
+   * Determines the connected user by first examining any signed
+   * requests, then considering an authorization code, and then
+   * falling back to any persistent store storing the user.
+   *
+   * @return integer The id of the connected Facebook user,
+   *                 or 0 if no such user exists.
+   */
+  protected function getUserFromAvailableData() {
+    // if a signed request is supplied, then it solely determines
+    // who the user is.
+    $signed_request = $this->getSignedRequest();
+    if ($signed_request) {
+      if (array_key_exists('user_id', $signed_request)) {
+        $user = $signed_request['user_id'];
+        $this->setPersistentData('user_id', $signed_request['user_id']);
+        return $user;
+      }
+
+      // if the signed request didn't present a user id, then invalidate
+      // all entries in any persistent store.
+      $this->clearAllPersistentData();
+      return 0;
+    }
+
+    $user = $this->getPersistentData('user_id', $default = 0);
+    $persisted_access_token = $this->getPersistentData('access_token');
+
+    // use access_token to fetch user id if we have a user access_token, or if
+    // the cached access token has changed.
+    $access_token = $this->getAccessToken();
+    if ($access_token &&
+        $access_token != $this->getApplicationAccessToken() &&
+        !($user && $persisted_access_token == $access_token)) {
+      $user = $this->getUserFromAccessToken();
+      if ($user) {
+        $this->setPersistentData('user_id', $user);
+      } else {
+        $this->clearAllPersistentData();
+      }
+    }
+
+    return $user;
+  }
+
+  /**
+   * Get a Login URL for use with redirects. By default, full page redirect is
+   * assumed. If you are using the generated URL with a window.open() call in
+   * JavaScript, you can pass in display=popup as part of the $params.
+   *
+   * The parameters:
+   * - redirect_uri: the url to go to after a successful login
+   * - scope: comma separated list of requested extended perms
+   *
+   * @param array $params Provide custom parameters
+   * @return string The URL for the login flow
+   */
+  public function getLoginUrl($params=array()) {
+    $this->establishCSRFTokenState();
+    $currentUrl = $this->getCurrentUrl();
+
+    // if 'scope' is passed as an array, convert to comma separated list
+    $scopeParams = isset($params['scope']) ? $params['scope'] : null;
+    if ($scopeParams && is_array($scopeParams)) {
+      $params['scope'] = implode(',', $scopeParams);
+    }
+
+    return $this->getUrl(
+      'www',
+      'dialog/oauth',
+      array_merge(array(
+                    'client_id' => $this->getAppId(),
+                    'redirect_uri' => $currentUrl, // possibly overwritten
+                    'state' => $this->state),
+                  $params));
+  }
+
+  /**
+   * Get a Logout URL suitable for use with redirects.
+   *
+   * The parameters:
+   * - next: the url to go to after a successful logout
+   *
+   * @param array $params Provide custom parameters
+   * @return string The URL for the logout flow
+   */
+  public function getLogoutUrl($params=array()) {
+    return $this->getUrl(
+      'www',
+      'logout.php',
+      array_merge(array(
+        'next' => $this->getCurrentUrl(),
+        'access_token' => $this->getAccessToken(),
+      ), $params)
+    );
+  }
+
+  /**
+   * Get a login status URL to fetch the status from Facebook.
+   *
+   * The parameters:
+   * - ok_session: the URL to go to if a session is found
+   * - no_session: the URL to go to if the user is not connected
+   * - no_user: the URL to go to if the user is not signed into facebook
+   *
+   * @param array $params Provide custom parameters
+   * @return string The URL for the logout flow
+   */
+  public function getLoginStatusUrl($params=array()) {
+    return $this->getUrl(
+      'www',
+      'extern/login_status.php',
+      array_merge(array(
+        'api_key' => $this->getAppId(),
+        'no_session' => $this->getCurrentUrl(),
+        'no_user' => $this->getCurrentUrl(),
+        'ok_session' => $this->getCurrentUrl(),
+        'session_version' => 3,
+      ), $params)
+    );
+  }
+
+  /**
+   * Make an API call.
+   *
+   * @return mixed The decoded response
+   */
+  public function api(/* polymorphic */) {
+    $args = func_get_args();
+    if (is_array($args[0])) {
+      return $this->_restserver($args[0]);
+    } else {
+      return call_user_func_array(array($this, '_graph'), $args);
+    }
+  }
+
+  /**
+   * Constructs and returns the name of the cookie that
+   * potentially houses the signed request for the app user.
+   * The cookie is not set by the BaseFacebook class, but
+   * it may be set by the JavaScript SDK.
+   *
+   * @return string the name of the cookie that would house
+   *         the signed request value.
+   */
+  protected function getSignedRequestCookieName() {
+    return 'fbsr_'.$this->getAppId();
+  }
+
+  /**
+   * Get the authorization code from the query parameters, if it exists,
+   * and otherwise return false to signal no authorization code was
+   * discoverable.
+   *
+   * @return mixed The authorization code, or false if the authorization
+   *               code could not be determined.
+   */
+  protected function getCode() {
+    if (isset($_REQUEST['code'])) {
+      if ($this->state !== null &&
+          isset($_REQUEST['state']) &&
+          $this->state === $_REQUEST['state']) {
+
+        // CSRF state has done its job, so clear it
+        $this->state = null;
+        $this->clearPersistentData('state');
+        return $_REQUEST['code'];
+      } else {
+        self::errorLog('CSRF state token does not match one provided.');
+        return false;
+      }
+    }
+
+    return false;
+  }
+
+  /**
+   * Retrieves the UID with the understanding that
+   * $this->accessToken has already been set and is
+   * seemingly legitimate.  It relies on Facebook's Graph API
+   * to retrieve user information and then extract
+   * the user ID.
+   *
+   * @return integer Returns the UID of the Facebook user, or 0
+   *                 if the Facebook user could not be determined.
+   */
+  protected function getUserFromAccessToken() {
+    try {
+      $user_info = $this->api('/me');
+      return $user_info['id'];
+    } catch (FacebookApiException $e) {
+      return 0;
+    }
+  }
+
+  /**
+   * Returns the access token that should be used for logged out
+   * users when no authorization code is available.
+   *
+   * @return string The application access token, useful for gathering
+   *                public information about users and applications.
+   */
+  protected function getApplicationAccessToken() {
+    return $this->appId.'|'.$this->apiSecret;
+  }
+
+  /**
+   * Lays down a CSRF state token for this process.
+   *
+   * @return void
+   */
+  protected function establishCSRFTokenState() {
+    if ($this->state === null) {
+      $this->state = md5(uniqid(mt_rand(), true));
+      $this->setPersistentData('state', $this->state);
+    }
+  }
+
+  /**
+   * Retrieves an access token for the given authorization code
+   * (previously generated from www.facebook.com on behalf of
+   * a specific user).  The authorization code is sent to graph.facebook.com
+   * and a legitimate access token is generated provided the access token
+   * and the user for which it was generated all match, and the user is
+   * either logged in to Facebook or has granted an offline access permission.
+   *
+   * @param string $code An authorization code.
+   * @return mixed An access token exchanged for the authorization code, or
+   *               false if an access token could not be generated.
+   */
+  protected function getAccessTokenFromCode($code, $redirect_uri = null) {
+    if (empty($code)) {
+      return false;
+    }
+
+    if ($redirect_uri === null) {
+      $redirect_uri = $this->getCurrentUrl();
+    }
+
+    try {
+      // need to circumvent json_decode by calling _oauthRequest
+      // directly, since response isn't JSON format.
+      $access_token_response =
+        $this->_oauthRequest(
+          $this->getUrl('graph', '/oauth/access_token'),
+          $params = array('client_id' => $this->getAppId(),
+                          'client_secret' => $this->getApiSecret(),
+                          'redirect_uri' => $redirect_uri,
+                          'code' => $code));
+    } catch (FacebookApiException $e) {
+      // most likely that user very recently revoked authorization.
+      // In any event, we don't have an access token, so say so.
+      return false;
+    }
+
+    if (empty($access_token_response)) {
+      return false;
+    }
+
+    $response_params = array();
+    parse_str($access_token_response, $response_params);
+    if (!isset($response_params['access_token'])) {
+      return false;
+    }
+
+    return $response_params['access_token'];
+  }
+
+  /**
+   * Invoke the old restserver.php endpoint.
+   *
+   * @param array $params Method call object
+   *
+   * @return mixed The decoded response object
+   * @throws FacebookApiException
+   */
+  protected function _restserver($params) {
+    // generic application level parameters
+    $params['api_key'] = $this->getAppId();
+    $params['format'] = 'json-strings';
+
+    $result = json_decode($this->_oauthRequest(
+      $this->getApiUrl($params['method']),
+      $params
+    ), true);
+
+    // results are returned, errors are thrown
+    if (is_array($result) && isset($result['error_code'])) {
+      throw new FacebookApiException($result);
+    }
+
+    return $result;
+  }
+
+  /**
+   * Invoke the Graph API.
+   *
+   * @param string $path The path (required)
+   * @param string $method The http method (default 'GET')
+   * @param array $params The query/post data
+   *
+   * @return mixed The decoded response object
+   * @throws FacebookApiException
+   */
+  protected function _graph($path, $method = 'GET', $params = array()) {
+    if (is_array($method) && empty($params)) {
+      $params = $method;
+      $method = 'GET';
+    }
+    $params['method'] = $method; // method override as we always do a POST
+
+    $result = json_decode($this->_oauthRequest(
+      $this->getUrl('graph', $path),
+      $params
+    ), true);
+
+    // results are returned, errors are thrown
+    if (is_array($result) && isset($result['error'])) {
+      $this->throwAPIException($result);
+    }
+
+    return $result;
+  }
+
+  /**
+   * Make a OAuth Request.
+   *
+   * @param string $url The path (required)
+   * @param array $params The query/post data
+   *
+   * @return string The decoded response object
+   * @throws FacebookApiException
+   */
+  protected function _oauthRequest($url, $params) {
+    if (!isset($params['access_token'])) {
+      $params['access_token'] = $this->getAccessToken();
+    }
+
+    // json_encode all params values that are not strings
+    foreach ($params as $key => $value) {
+      if (!is_string($value)) {
+        $params[$key] = json_encode($value);
+      }
+    }
+
+    return $this->makeRequest($url, $params);
+  }
+
+  /**
+   * Makes an HTTP request. This method can be overridden by subclasses if
+   * developers want to do fancier things or use something other than curl to
+   * make the request.
+   *
+   * @param string $url The URL to make the request to
+   * @param array $params The parameters to use for the POST body
+   * @param CurlHandler $ch Initialized curl handle
+   *
+   * @return string The response text
+   */
+  protected function makeRequest($url, $params, $ch=null) {
+    if (!$ch) {
+      $ch = curl_init();
+    }
+
+    $opts = self::$CURL_OPTS;
+    if ($this->useFileUploadSupport()) {
+      $opts[CURLOPT_POSTFIELDS] = $params;
+    } else {
+      $opts[CURLOPT_POSTFIELDS] = http_build_query($params, null, '&');
+    }
+    $opts[CURLOPT_URL] = $url;
+
+    // disable the 'Expect: 100-continue' behaviour. This causes CURL to wait
+    // for 2 seconds if the server does not support this header.
+    if (isset($opts[CURLOPT_HTTPHEADER])) {
+      $existing_headers = $opts[CURLOPT_HTTPHEADER];
+      $existing_headers[] = 'Expect:';
+      $opts[CURLOPT_HTTPHEADER] = $existing_headers;
+    } else {
+      $opts[CURLOPT_HTTPHEADER] = array('Expect:');
+    }
+
+    curl_setopt_array($ch, $opts);
+    $result = curl_exec($ch);
+
+    if (curl_errno($ch) == 60) { // CURLE_SSL_CACERT
+      self::errorLog('Invalid or no certificate authority found, '.
+                     'using bundled information');
+      curl_setopt($ch, CURLOPT_CAINFO,
+                  dirname(__FILE__) . '/fb_ca_chain_bundle.crt');
+      $result = curl_exec($ch);
+    }
+
+    if ($result === false) {
+      $e = new FacebookApiException(array(
+        'error_code' => curl_errno($ch),
+        'error' => array(
+        'message' => curl_error($ch),
+        'type' => 'CurlException',
+        ),
+      ));
+      curl_close($ch);
+      throw $e;
+    }
+    curl_close($ch);
+    return $result;
+  }
+
+  /**
+   * Parses a signed_request and validates the signature.
+   *
+   * @param string $signed_request A signed token
+   * @return array The payload inside it or null if the sig is wrong
+   */
+  protected function parseSignedRequest($signed_request) {
+    list($encoded_sig, $payload) = explode('.', $signed_request, 2);
+
+    // decode the data
+    $sig = self::base64UrlDecode($encoded_sig);
+    $data = json_decode(self::base64UrlDecode($payload), true);
+
+    if (strtoupper($data['algorithm']) !== 'HMAC-SHA256') {
+      self::errorLog('Unknown algorithm. Expected HMAC-SHA256');
+      return null;
+    }
+
+    // check sig
+    $expected_sig = hash_hmac('sha256', $payload,
+                              $this->getApiSecret(), $raw = true);
+    if ($sig !== $expected_sig) {
+      self::errorLog('Bad Signed JSON signature!');
+      return null;
+    }
+
+    return $data;
+  }
+
+  /**
+   * Build the URL for api given parameters.
+   *
+   * @param $method String the method name.
+   * @return string The URL for the given parameters
+   */
+  protected function getApiUrl($method) {
+    static $READ_ONLY_CALLS =
+      array('admin.getallocation' => 1,
+            'admin.getappproperties' => 1,
+            'admin.getbannedusers' => 1,
+            'admin.getlivestreamvialink' => 1,
+            'admin.getmetrics' => 1,
+            'admin.getrestrictioninfo' => 1,
+            'application.getpublicinfo' => 1,
+            'auth.getapppublickey' => 1,
+            'auth.getsession' => 1,
+            'auth.getsignedpublicsessiondata' => 1,
+            'comments.get' => 1,
+            'connect.getunconnectedfriendscount' => 1,
+            'dashboard.getactivity' => 1,
+            'dashboard.getcount' => 1,
+            'dashboard.getglobalnews' => 1,
+            'dashboard.getnews' => 1,
+            'dashboard.multigetcount' => 1,
+            'dashboard.multigetnews' => 1,
+            'data.getcookies' => 1,
+            'events.get' => 1,
+            'events.getmembers' => 1,
+            'fbml.getcustomtags' => 1,
+            'feed.getappfriendstories' => 1,
+            'feed.getregisteredtemplatebundlebyid' => 1,
+            'feed.getregisteredtemplatebundles' => 1,
+            'fql.multiquery' => 1,
+            'fql.query' => 1,
+            'friends.arefriends' => 1,
+            'friends.get' => 1,
+            'friends.getappusers' => 1,
+            'friends.getlists' => 1,
+            'friends.getmutualfriends' => 1,
+            'gifts.get' => 1,
+            'groups.get' => 1,
+            'groups.getmembers' => 1,
+            'intl.gettranslations' => 1,
+            'links.get' => 1,
+            'notes.get' => 1,
+            'notifications.get' => 1,
+            'pages.getinfo' => 1,
+            'pages.isadmin' => 1,
+            'pages.isappadded' => 1,
+            'pages.isfan' => 1,
+            'permissions.checkavailableapiaccess' => 1,
+            'permissions.checkgrantedapiaccess' => 1,
+            'photos.get' => 1,
+            'photos.getalbums' => 1,
+            'photos.gettags' => 1,
+            'profile.getinfo' => 1,
+            'profile.getinfooptions' => 1,
+            'stream.get' => 1,
+            'stream.getcomments' => 1,
+            'stream.getfilters' => 1,
+            'users.getinfo' => 1,
+            'users.getloggedinuser' => 1,
+            'users.getstandardinfo' => 1,
+            'users.hasapppermission' => 1,
+            'users.isappuser' => 1,
+            'users.isverified' => 1,
+            'video.getuploadlimits' => 1);
+    $name = 'api';
+    if (isset($READ_ONLY_CALLS[strtolower($method)])) {
+      $name = 'api_read';
+    } else if (strtolower($method) == 'video.upload') {
+      $name = 'api_video';
+    }
+    return self::getUrl($name, 'restserver.php');
+  }
+
+  /**
+   * Build the URL for given domain alias, path and parameters.
+   *
+   * @param $name string The name of the domain
+   * @param $path string Optional path (without a leading slash)
+   * @param $params array Optional query parameters
+   *
+   * @return string The URL for the given parameters
+   */
+  protected function getUrl($name, $path='', $params=array()) {
+    $url = self::$DOMAIN_MAP[$name];
+    if ($path) {
+      if ($path[0] === '/') {
+        $path = substr($path, 1);
+      }
+      $url .= $path;
+    }
+    if ($params) {
+      $url .= '?' . http_build_query($params, null, '&');
+    }
+
+    return $url;
+  }
+
+  /**
+   * Returns the Current URL, stripping it of known FB parameters that should
+   * not persist.
+   *
+   * @return string The current URL
+   */
+  protected function getCurrentUrl() {
+    if (isset($_SERVER['HTTPS']) && ($_SERVER['HTTPS'] == 'on' || $_SERVER['HTTPS'] == 1)
+      || isset($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https'
+    ) {
+      $protocol = 'https://';
+    }
+    else {
+      $protocol = 'http://';
+    }
+    $currentUrl = $protocol . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];
+    $parts = parse_url($currentUrl);
+
+    $query = '';
+    if (!empty($parts['query'])) {
+      // drop known fb params
+      $params = explode('&', $parts['query']);
+      $retained_params = array();
+      foreach ($params as $param) {
+        if ($this->shouldRetainParam($param)) {
+          $retained_params[] = $param;
+        }
+      }
+
+      if (!empty($retained_params)) {
+        $query = '?'.implode($retained_params, '&');
+      }
+    }
+
+    // use port if non default
+    $port =
+      isset($parts['port']) &&
+      (($protocol === 'http://' && $parts['port'] !== 80) ||
+       ($protocol === 'https://' && $parts['port'] !== 443))
+      ? ':' . $parts['port'] : '';
+
+    // rebuild
+    return $protocol . $parts['host'] . $port . $parts['path'] . $query;
+  }
+
+  /**
+   * Returns true if and only if the key or key/value pair should
+   * be retained as part of the query string.  This amounts to
+   * a brute-force search of the very small list of Facebook-specific
+   * params that should be stripped out.
+   *
+   * @param string $param A key or key/value pair within a URL's query (e.g.
+   *                     'foo=a', 'foo=', or 'foo'.
+   *
+   * @return boolean
+   */
+  protected function shouldRetainParam($param) {
+    foreach (self::$DROP_QUERY_PARAMS as $drop_query_param) {
+      if (strpos($param, $drop_query_param.'=') === 0) {
+        return false;
+      }
+    }
+
+    return true;
+  }
+
+  /**
+   * Analyzes the supplied result to see if it was thrown
+   * because the access token is no longer valid.  If that is
+   * the case, then the persistent store is cleared.
+   *
+   * @param $result array A record storing the error message returned
+   *                      by a failed API call.
+   */
+  protected function throwAPIException($result) {
+    $e = new FacebookApiException($result);
+    switch ($e->getType()) {
+      // OAuth 2.0 Draft 00 style
+      case 'OAuthException':
+        // OAuth 2.0 Draft 10 style
+      case 'invalid_token':
+        $message = $e->getMessage();
+      if ((strpos($message, 'Error validating access token') !== false) ||
+          (strpos($message, 'Invalid OAuth access token') !== false)) {
+        $this->setAccessToken(null);
+        $this->user = 0;
+        $this->clearAllPersistentData();
+      }
+    }
+
+    throw $e;
+  }
+
+
+  /**
+   * Prints to the error log if you aren't in command line mode.
+   *
+   * @param string $msg Log message
+   */
+  protected static function errorLog($msg) {
+    // disable error log if we are running in a CLI environment
+    // @codeCoverageIgnoreStart
+    if (php_sapi_name() != 'cli') {
+      error_log($msg);
+    }
+    // uncomment this if you want to see the errors on the page
+    // print 'error_log: '.$msg."\n";
+    // @codeCoverageIgnoreEnd
+  }
+
+  /**
+   * Base64 encoding that doesn't need to be urlencode()ed.
+   * Exactly the same as base64_encode except it uses
+   *   - instead of +
+   *   _ instead of /
+   *
+   * @param string $input base64UrlEncoded string
+   * @return string
+   */
+  protected static function base64UrlDecode($input) {
+    return base64_decode(strtr($input, '-_', '+/'));
+  }
+
+  /**
+   * Each of the following four methods should be overridden in
+   * a concrete subclass, as they are in the provided Facebook class.
+   * The Facebook class uses PHP sessions to provide a primitive
+   * persistent store, but another subclass--one that you implement--
+   * might use a database, memcache, or an in-memory cache.
+   *
+   * @see Facebook
+   */
+
+  /**
+   * Stores the given ($key, $value) pair, so that future calls to
+   * getPersistentData($key) return $value. This call may be in another request.
+   *
+   * @param string $key
+   * @param array $value
+   *
+   * @return void
+   */
+  abstract protected function setPersistentData($key, $value);
+
+  /**
+   * Get the data for $key, persisted by BaseFacebook::setPersistentData()
+   *
+   * @param string $key The key of the data to retrieve
+   * @param boolean $default The default value to return if $key is not found
+   *
+   * @return mixed
+   */
+  abstract protected function getPersistentData($key, $default = false);
+
+  /**
+   * Clear the data with $key from the persistent storage
+   *
+   * @param string $key
+   * @return void
+   */
+  abstract protected function clearPersistentData($key);
+
+  /**
+   * Clear all data from the persistent storage
+   *
+   * @return void
+   */
+  abstract protected function clearAllPersistentData();
+}
diff --git a/plugins/FacebookBridge/extlib/facebook.php b/plugins/FacebookBridge/extlib/facebook.php
index d2d2e866bf..c577c2aa4e 100644
--- a/plugins/FacebookBridge/extlib/facebook.php
+++ b/plugins/FacebookBridge/extlib/facebook.php
@@ -1,963 +1,93 @@
 <?php
+/**
+ * Copyright 2011 Facebook, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License. You may obtain
+ * a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
 
-if (!function_exists('curl_init')) {
-  throw new Exception('Facebook needs the CURL PHP extension.');
-}
-if (!function_exists('json_decode')) {
-  throw new Exception('Facebook needs the JSON PHP extension.');
-}
+require_once "base_facebook.php";
 
 /**
- * Thrown when an API call returns an exception.
- *
- * @author Naitik Shah <naitik@facebook.com>
+ * Extends the BaseFacebook class with the intent of using
+ * PHP sessions to store user ids and access tokens.
  */
-class FacebookApiException extends Exception
+class Facebook extends BaseFacebook
 {
   /**
-   * The result from the API server that represents the exception information.
-   */
-  protected $result;
-
-  /**
-   * Make a new API Exception with the given result.
+   * Identical to the parent constructor, except that
+   * we start a PHP session to store the user ID and
+   * access token if during the course of execution
+   * we discover them.
    *
-   * @param Array $result the result from the API server
-   */
-  public function __construct($result) {
-    $this->result = $result;
-
-    $code = isset($result['error_code']) ? $result['error_code'] : 0;
-
-    if (isset($result['error_description'])) {
-      // OAuth 2.0 Draft 10 style
-      $msg = $result['error_description'];
-    } else if (isset($result['error']) && is_array($result['error'])) {
-      // OAuth 2.0 Draft 00 style
-      $msg = $result['error']['message'];
-    } else if (isset($result['error_msg'])) {
-      // Rest server style
-      $msg = $result['error_msg'];
-    } else {
-      $msg = 'Unknown Error. Check getResult()';
-    }
-
-    parent::__construct($msg, $code);
-  }
-
-  /**
-   * Return the associated result object returned by the API server.
-   *
-   * @returns Array the result from the API server
-   */
-  public function getResult() {
-    return $this->result;
-  }
-
-  /**
-   * Returns the associated type for the error. This will default to
-   * 'Exception' when a type is not available.
-   *
-   * @return String
-   */
-  public function getType() {
-    if (isset($this->result['error'])) {
-      $error = $this->result['error'];
-      if (is_string($error)) {
-        // OAuth 2.0 Draft 10 style
-        return $error;
-      } else if (is_array($error)) {
-        // OAuth 2.0 Draft 00 style
-        if (isset($error['type'])) {
-          return $error['type'];
-        }
-      }
-    }
-    return 'Exception';
-  }
-
-  /**
-   * To make debugging easier.
-   *
-   * @returns String the string representation of the error
-   */
-  public function __toString() {
-    $str = $this->getType() . ': ';
-    if ($this->code != 0) {
-      $str .= $this->code . ': ';
-    }
-    return $str . $this->message;
-  }
-}
-
-/**
- * Provides access to the Facebook Platform.
- *
- * @author Naitik Shah <naitik@facebook.com>
- */
-class Facebook
-{
-  /**
-   * Version.
-   */
-  const VERSION = '2.1.2';
-
-  /**
-   * Default options for curl.
-   */
-  public static $CURL_OPTS = array(
-    CURLOPT_CONNECTTIMEOUT => 10,
-    CURLOPT_RETURNTRANSFER => true,
-    CURLOPT_TIMEOUT        => 60,
-    CURLOPT_USERAGENT      => 'facebook-php-2.0',
-  );
-
-  /**
-   * List of query parameters that get automatically dropped when rebuilding
-   * the current URL.
-   */
-  protected static $DROP_QUERY_PARAMS = array(
-    'session',
-    'signed_request',
-  );
-
-  /**
-   * Maps aliases to Facebook domains.
-   */
-  public static $DOMAIN_MAP = array(
-    'api'      => 'https://api.facebook.com/',
-    'api_read' => 'https://api-read.facebook.com/',
-    'graph'    => 'https://graph.facebook.com/',
-    'www'      => 'https://www.facebook.com/',
-  );
-
-  /**
-   * The Application ID.
-   */
-  protected $appId;
-
-  /**
-   * The Application API Secret.
-   */
-  protected $apiSecret;
-
-  /**
-   * The active user session, if one is available.
-   */
-  protected $session;
-
-  /**
-   * The data from the signed_request token.
-   */
-  protected $signedRequest;
-
-  /**
-   * Indicates that we already loaded the session as best as we could.
-   */
-  protected $sessionLoaded = false;
-
-  /**
-   * Indicates if Cookie support should be enabled.
-   */
-  protected $cookieSupport = false;
-
-  /**
-   * Base domain for the Cookie.
-   */
-  protected $baseDomain = '';
-
-  /**
-   * Indicates if the CURL based @ syntax for file uploads is enabled.
-   */
-  protected $fileUploadSupport = false;
-
-  /**
-   * Initialize a Facebook Application.
-   *
-   * The configuration:
-   * - appId: the application ID
-   * - secret: the application secret
-   * - cookie: (optional) boolean true to enable cookie support
-   * - domain: (optional) domain for the cookie
-   * - fileUpload: (optional) boolean indicating if file uploads are enabled
-   *
-   * @param Array $config the application configuration
+   * @param Array $config the application configuration.
+   * @see BaseFacebook::__construct in facebook.php
    */
   public function __construct($config) {
-    $this->setAppId($config['appId']);
-    $this->setApiSecret($config['secret']);
-    if (isset($config['cookie'])) {
-      $this->setCookieSupport($config['cookie']);
-    }
-    if (isset($config['domain'])) {
-      $this->setBaseDomain($config['domain']);
-    }
-    if (isset($config['fileUpload'])) {
-      $this->setFileUploadSupport($config['fileUpload']);
+    if (!session_id()) {
+      session_start();
     }
+    parent::__construct($config);
   }
 
-  /**
-   * Set the Application ID.
-   *
-   * @param String $appId the Application ID
-   */
-  public function setAppId($appId) {
-    $this->appId = $appId;
-    return $this;
-  }
+  protected static $kSupportedKeys =
+    array('state', 'code', 'access_token', 'user_id');
 
   /**
-   * Get the Application ID.
-   *
-   * @return String the Application ID
+   * Provides the implementations of the inherited abstract
+   * methods.  The implementation uses PHP sessions to maintain
+   * a store for authorization codes, user ids, CSRF states, and
+   * access tokens.
    */
-  public function getAppId() {
-    return $this->appId;
-  }
-
-  /**
-   * Set the API Secret.
-   *
-   * @param String $appId the API Secret
-   */
-  public function setApiSecret($apiSecret) {
-    $this->apiSecret = $apiSecret;
-    return $this;
-  }
-
-  /**
-   * Get the API Secret.
-   *
-   * @return String the API Secret
-   */
-  public function getApiSecret() {
-    return $this->apiSecret;
-  }
-
-  /**
-   * Set the Cookie Support status.
-   *
-   * @param Boolean $cookieSupport the Cookie Support status
-   */
-  public function setCookieSupport($cookieSupport) {
-    $this->cookieSupport = $cookieSupport;
-    return $this;
-  }
-
-  /**
-   * Get the Cookie Support status.
-   *
-   * @return Boolean the Cookie Support status
-   */
-  public function useCookieSupport() {
-    return $this->cookieSupport;
-  }
-
-  /**
-   * Set the base domain for the Cookie.
-   *
-   * @param String $domain the base domain
-   */
-  public function setBaseDomain($domain) {
-    $this->baseDomain = $domain;
-    return $this;
-  }
-
-  /**
-   * Get the base domain for the Cookie.
-   *
-   * @return String the base domain
-   */
-  public function getBaseDomain() {
-    return $this->baseDomain;
-  }
-
-  /**
-   * Set the file upload support status.
-   *
-   * @param String $domain the base domain
-   */
-  public function setFileUploadSupport($fileUploadSupport) {
-    $this->fileUploadSupport = $fileUploadSupport;
-    return $this;
-  }
-
-  /**
-   * Get the file upload support status.
-   *
-   * @return String the base domain
-   */
-  public function useFileUploadSupport() {
-    return $this->fileUploadSupport;
-  }
-
-  /**
-   * Get the data from a signed_request token
-   *
-   * @return String the base domain
-   */
-  public function getSignedRequest() {
-    if (!$this->signedRequest) {
-      if (isset($_REQUEST['signed_request'])) {
-        $this->signedRequest = $this->parseSignedRequest(
-          $_REQUEST['signed_request']);
-      }
-    }
-    return $this->signedRequest;
-  }
-
-  /**
-   * Set the Session.
-   *
-   * @param Array $session the session
-   * @param Boolean $write_cookie indicate if a cookie should be written. this
-   * value is ignored if cookie support has been disabled.
-   */
-  public function setSession($session=null, $write_cookie=true) {
-    $session = $this->validateSessionObject($session);
-    $this->sessionLoaded = true;
-    $this->session = $session;
-    if ($write_cookie) {
-      $this->setCookieFromSession($session);
-    }
-    return $this;
-  }
-
-  /**
-   * Get the session object. This will automatically look for a signed session
-   * sent via the signed_request, Cookie or Query Parameters if needed.
-   *
-   * @return Array the session
-   */
-  public function getSession() {
-    if (!$this->sessionLoaded) {
-      $session = null;
-      $write_cookie = true;
-
-      // try loading session from signed_request in $_REQUEST
-      $signedRequest = $this->getSignedRequest();
-      if ($signedRequest) {
-        // sig is good, use the signedRequest
-        $session = $this->createSessionFromSignedRequest($signedRequest);
-      }
-
-      // try loading session from $_REQUEST
-      if (!$session && isset($_REQUEST['session'])) {
-        $session = json_decode(
-          get_magic_quotes_gpc()
-            ? stripslashes($_REQUEST['session'])
-            : $_REQUEST['session'],
-          true
-        );
-        $session = $this->validateSessionObject($session);
-      }
-
-      // try loading session from cookie if necessary
-      if (!$session && $this->useCookieSupport()) {
-        $cookieName = $this->getSessionCookieName();
-        if (isset($_COOKIE[$cookieName])) {
-          $session = array();
-          parse_str(trim(
-            get_magic_quotes_gpc()
-              ? stripslashes($_COOKIE[$cookieName])
-              : $_COOKIE[$cookieName],
-            '"'
-          ), $session);
-          $session = $this->validateSessionObject($session);
-          // write only if we need to delete a invalid session cookie
-          $write_cookie = empty($session);
-        }
-      }
-
-      $this->setSession($session, $write_cookie);
-    }
-
-    return $this->session;
-  }
-
-  /**
-   * Get the UID from the session.
-   *
-   * @return String the UID if available
-   */
-  public function getUser() {
-    $session = $this->getSession();
-    return $session ? $session['uid'] : null;
-  }
-
-  /**
-   * Gets a OAuth access token.
-   *
-   * @return String the access token
-   */
-  public function getAccessToken() {
-    $session = $this->getSession();
-    // either user session signed, or app signed
-    if ($session) {
-      return $session['access_token'];
-    } else {
-      return $this->getAppId() .'|'. $this->getApiSecret();
-    }
-  }
-
-  /**
-   * Get a Login URL for use with redirects. By default, full page redirect is
-   * assumed. If you are using the generated URL with a window.open() call in
-   * JavaScript, you can pass in display=popup as part of the $params.
-   *
-   * The parameters:
-   * - next: the url to go to after a successful login
-   * - cancel_url: the url to go to after the user cancels
-   * - req_perms: comma separated list of requested extended perms
-   * - display: can be "page" (default, full page) or "popup"
-   *
-   * @param Array $params provide custom parameters
-   * @return String the URL for the login flow
-   */
-  public function getLoginUrl($params=array()) {
-    $currentUrl = $this->getCurrentUrl();
-    return $this->getUrl(
-      'www',
-      'login.php',
-      array_merge(array(
-        'api_key'         => $this->getAppId(),
-        'cancel_url'      => $currentUrl,
-        'display'         => 'page',
-        'fbconnect'       => 1,
-        'next'            => $currentUrl,
-        'return_session'  => 1,
-        'session_version' => 3,
-        'v'               => '1.0',
-      ), $params)
-    );
-  }
-
-  /**
-   * Get a Logout URL suitable for use with redirects.
-   *
-   * The parameters:
-   * - next: the url to go to after a successful logout
-   *
-   * @param Array $params provide custom parameters
-   * @return String the URL for the logout flow
-   */
-  public function getLogoutUrl($params=array()) {
-    return $this->getUrl(
-      'www',
-      'logout.php',
-      array_merge(array(
-        'next'         => $this->getCurrentUrl(),
-        'access_token' => $this->getAccessToken(),
-      ), $params)
-    );
-  }
-
-  /**
-   * Get a login status URL to fetch the status from facebook.
-   *
-   * The parameters:
-   * - ok_session: the URL to go to if a session is found
-   * - no_session: the URL to go to if the user is not connected
-   * - no_user: the URL to go to if the user is not signed into facebook
-   *
-   * @param Array $params provide custom parameters
-   * @return String the URL for the logout flow
-   */
-  public function getLoginStatusUrl($params=array()) {
-    return $this->getUrl(
-      'www',
-      'extern/login_status.php',
-      array_merge(array(
-        'api_key'         => $this->getAppId(),
-        'no_session'      => $this->getCurrentUrl(),
-        'no_user'         => $this->getCurrentUrl(),
-        'ok_session'      => $this->getCurrentUrl(),
-        'session_version' => 3,
-      ), $params)
-    );
-  }
-
-  /**
-   * Make an API call.
-   *
-   * @param Array $params the API call parameters
-   * @return the decoded response
-   */
-  public function api(/* polymorphic */) {
-    $args = func_get_args();
-    if (is_array($args[0])) {
-      return $this->_restserver($args[0]);
-    } else {
-      return call_user_func_array(array($this, '_graph'), $args);
-    }
-  }
-
-  /**
-   * Invoke the old restserver.php endpoint.
-   *
-   * @param Array $params method call object
-   * @return the decoded response object
-   * @throws FacebookApiException
-   */
-  protected function _restserver($params) {
-    // generic application level parameters
-    $params['api_key'] = $this->getAppId();
-    $params['format'] = 'json-strings';
-
-    $result = json_decode($this->_oauthRequest(
-      $this->getApiUrl($params['method']),
-      $params
-    ), true);
-
-    // results are returned, errors are thrown
-    if (is_array($result) && isset($result['error_code'])) {
-      throw new FacebookApiException($result);
-    }
-    return $result;
-  }
-
-  /**
-   * Invoke the Graph API.
-   *
-   * @param String $path the path (required)
-   * @param String $method the http method (default 'GET')
-   * @param Array $params the query/post data
-   * @return the decoded response object
-   * @throws FacebookApiException
-   */
-  protected function _graph($path, $method='GET', $params=array()) {
-    if (is_array($method) && empty($params)) {
-      $params = $method;
-      $method = 'GET';
-    }
-    $params['method'] = $method; // method override as we always do a POST
-
-    $result = json_decode($this->_oauthRequest(
-      $this->getUrl('graph', $path),
-      $params
-    ), true);
-
-    // results are returned, errors are thrown
-    if (is_array($result) && isset($result['error'])) {
-      $e = new FacebookApiException($result);
-      switch ($e->getType()) {
-        // OAuth 2.0 Draft 00 style
-        case 'OAuthException':
-        // OAuth 2.0 Draft 10 style
-        case 'invalid_token':
-          $this->setSession(null);
-      }
-      throw $e;
-    }
-    return $result;
-  }
-
-  /**
-   * Make a OAuth Request
-   *
-   * @param String $path the path (required)
-   * @param Array $params the query/post data
-   * @return the decoded response object
-   * @throws FacebookApiException
-   */
-  protected function _oauthRequest($url, $params) {
-    if (!isset($params['access_token'])) {
-      $params['access_token'] = $this->getAccessToken();
-    }
-
-    // json_encode all params values that are not strings
-    foreach ($params as $key => $value) {
-      if (!is_string($value)) {
-        $params[$key] = json_encode($value);
-      }
-    }
-    return $this->makeRequest($url, $params);
-  }
-
-  /**
-   * Makes an HTTP request. This method can be overriden by subclasses if
-   * developers want to do fancier things or use something other than curl to
-   * make the request.
-   *
-   * @param String $url the URL to make the request to
-   * @param Array $params the parameters to use for the POST body
-   * @param CurlHandler $ch optional initialized curl handle
-   * @return String the response text
-   */
-  protected function makeRequest($url, $params, $ch=null) {
-    if (!$ch) {
-      $ch = curl_init();
-    }
-
-    $opts = self::$CURL_OPTS;
-    if ($this->useFileUploadSupport()) {
-      $opts[CURLOPT_POSTFIELDS] = $params;
-    } else {
-      $opts[CURLOPT_POSTFIELDS] = http_build_query($params, null, '&');
-    }
-    $opts[CURLOPT_URL] = $url;
-
-    // disable the 'Expect: 100-continue' behaviour. This causes CURL to wait
-    // for 2 seconds if the server does not support this header.
-    if (isset($opts[CURLOPT_HTTPHEADER])) {
-      $existing_headers = $opts[CURLOPT_HTTPHEADER];
-      $existing_headers[] = 'Expect:';
-      $opts[CURLOPT_HTTPHEADER] = $existing_headers;
-    } else {
-      $opts[CURLOPT_HTTPHEADER] = array('Expect:');
-    }
-
-    curl_setopt_array($ch, $opts);
-    $result = curl_exec($ch);
-
-    if (curl_errno($ch) == 60) { // CURLE_SSL_CACERT
-      self::errorLog('Invalid or no certificate authority found, using bundled information');
-      curl_setopt($ch, CURLOPT_CAINFO,
-                  dirname(__FILE__) . '/fb_ca_chain_bundle.crt');
-      $result = curl_exec($ch);
-    }
-
-    if ($result === false) {
-      $e = new FacebookApiException(array(
-        'error_code' => curl_errno($ch),
-        'error'      => array(
-          'message' => curl_error($ch),
-          'type'    => 'CurlException',
-        ),
-      ));
-      curl_close($ch);
-      throw $e;
-    }
-    curl_close($ch);
-    return $result;
-  }
-
-  /**
-   * The name of the Cookie that contains the session.
-   *
-   * @return String the cookie name
-   */
-  protected function getSessionCookieName() {
-    return 'fbs_' . $this->getAppId();
-  }
-
-  /**
-   * Set a JS Cookie based on the _passed in_ session. It does not use the
-   * currently stored session -- you need to explicitly pass it in.
-   *
-   * @param Array $session the session to use for setting the cookie
-   */
-  protected function setCookieFromSession($session=null) {
-    if (!$this->useCookieSupport()) {
+  protected function setPersistentData($key, $value) {
+    if (!in_array($key, self::$kSupportedKeys)) {
+      self::errorLog('Unsupported key passed to setPersistentData.');
       return;
     }
 
-    $cookieName = $this->getSessionCookieName();
-    $value = 'deleted';
-    $expires = time() - 3600;
-    $domain = $this->getBaseDomain();
-    if ($session) {
-      $value = '"' . http_build_query($session, null, '&') . '"';
-      if (isset($session['base_domain'])) {
-        $domain = $session['base_domain'];
-      }
-      $expires = $session['expires'];
+    $session_var_name = $this->constructSessionVariableName($key);
+    $_SESSION[$session_var_name] = $value;
+  }
+
+  protected function getPersistentData($key, $default = false) {
+    if (!in_array($key, self::$kSupportedKeys)) {
+      self::errorLog('Unsupported key passed to getPersistentData.');
+      return $default;
     }
 
-    // prepend dot if a domain is found
-    if ($domain) {
-      $domain = '.' . $domain;
-    }
+    $session_var_name = $this->constructSessionVariableName($key);
+    return isset($_SESSION[$session_var_name]) ?
+      $_SESSION[$session_var_name] : $default;
+  }
 
-    // if an existing cookie is not set, we dont need to delete it
-    if ($value == 'deleted' && empty($_COOKIE[$cookieName])) {
+  protected function clearPersistentData($key) {
+    if (!in_array($key, self::$kSupportedKeys)) {
+      self::errorLog('Unsupported key passed to clearPersistentData.');
       return;
     }
 
-    if (headers_sent()) {
-      self::errorLog('Could not set cookie. Headers already sent.');
-
-    // ignore for code coverage as we will never be able to setcookie in a CLI
-    // environment
-    // @codeCoverageIgnoreStart
-    } else {
-      setcookie($cookieName, $value, $expires, '/', $domain);
-    }
-    // @codeCoverageIgnoreEnd
+    $session_var_name = $this->constructSessionVariableName($key);
+    unset($_SESSION[$session_var_name]);
   }
 
-  /**
-   * Validates a session_version=3 style session object.
-   *
-   * @param Array $session the session object
-   * @return Array the session object if it validates, null otherwise
-   */
-  protected function validateSessionObject($session) {
-    // make sure some essential fields exist
-    if (is_array($session) &&
-        isset($session['uid']) &&
-        isset($session['access_token']) &&
-        isset($session['sig'])) {
-      // validate the signature
-      $session_without_sig = $session;
-      unset($session_without_sig['sig']);
-      $expected_sig = self::generateSignature(
-        $session_without_sig,
-        $this->getApiSecret()
-      );
-      if ($session['sig'] != $expected_sig) {
-        self::errorLog('Got invalid session signature in cookie.');
-        $session = null;
-      }
-      // check expiry time
-    } else {
-      $session = null;
+  protected function clearAllPersistentData() {
+    foreach (self::$kSupportedKeys as $key) {
+      $this->clearPersistentData($key);
     }
-    return $session;
   }
 
-  /**
-   * Returns something that looks like our JS session object from the
-   * signed token's data
-   *
-   * TODO: Nuke this once the login flow uses OAuth2
-   *
-   * @param Array the output of getSignedRequest
-   * @return Array Something that will work as a session
-   */
-  protected function createSessionFromSignedRequest($data) {
-    if (!isset($data['oauth_token'])) {
-      return null;
-    }
-
-    $session = array(
-      'uid'          => $data['user_id'],
-      'access_token' => $data['oauth_token'],
-      'expires'      => $data['expires'],
-    );
-
-    // put a real sig, so that validateSignature works
-    $session['sig'] = self::generateSignature(
-      $session,
-      $this->getApiSecret()
-    );
-
-    return $session;
-  }
-
-  /**
-   * Parses a signed_request and validates the signature.
-   * Then saves it in $this->signed_data
-   *
-   * @param String A signed token
-   * @param Boolean Should we remove the parts of the payload that
-   *                are used by the algorithm?
-   * @return Array the payload inside it or null if the sig is wrong
-   */
-  protected function parseSignedRequest($signed_request) {
-    list($encoded_sig, $payload) = explode('.', $signed_request, 2);
-
-    // decode the data
-    $sig = self::base64UrlDecode($encoded_sig);
-    $data = json_decode(self::base64UrlDecode($payload), true);
-
-    if (strtoupper($data['algorithm']) !== 'HMAC-SHA256') {
-      self::errorLog('Unknown algorithm. Expected HMAC-SHA256');
-      return null;
-    }
-
-    // check sig
-    $expected_sig = hash_hmac('sha256', $payload,
-                              $this->getApiSecret(), $raw = true);
-    if ($sig !== $expected_sig) {
-      self::errorLog('Bad Signed JSON signature!');
-      return null;
-    }
-
-    return $data;
-  }
-
-  /**
-   * Build the URL for api given parameters.
-   *
-   * @param $method String the method name.
-   * @return String the URL for the given parameters
-   */
-  protected function getApiUrl($method) {
-    static $READ_ONLY_CALLS =
-      array('admin.getallocation' => 1,
-            'admin.getappproperties' => 1,
-            'admin.getbannedusers' => 1,
-            'admin.getlivestreamvialink' => 1,
-            'admin.getmetrics' => 1,
-            'admin.getrestrictioninfo' => 1,
-            'application.getpublicinfo' => 1,
-            'auth.getapppublickey' => 1,
-            'auth.getsession' => 1,
-            'auth.getsignedpublicsessiondata' => 1,
-            'comments.get' => 1,
-            'connect.getunconnectedfriendscount' => 1,
-            'dashboard.getactivity' => 1,
-            'dashboard.getcount' => 1,
-            'dashboard.getglobalnews' => 1,
-            'dashboard.getnews' => 1,
-            'dashboard.multigetcount' => 1,
-            'dashboard.multigetnews' => 1,
-            'data.getcookies' => 1,
-            'events.get' => 1,
-            'events.getmembers' => 1,
-            'fbml.getcustomtags' => 1,
-            'feed.getappfriendstories' => 1,
-            'feed.getregisteredtemplatebundlebyid' => 1,
-            'feed.getregisteredtemplatebundles' => 1,
-            'fql.multiquery' => 1,
-            'fql.query' => 1,
-            'friends.arefriends' => 1,
-            'friends.get' => 1,
-            'friends.getappusers' => 1,
-            'friends.getlists' => 1,
-            'friends.getmutualfriends' => 1,
-            'gifts.get' => 1,
-            'groups.get' => 1,
-            'groups.getmembers' => 1,
-            'intl.gettranslations' => 1,
-            'links.get' => 1,
-            'notes.get' => 1,
-            'notifications.get' => 1,
-            'pages.getinfo' => 1,
-            'pages.isadmin' => 1,
-            'pages.isappadded' => 1,
-            'pages.isfan' => 1,
-            'permissions.checkavailableapiaccess' => 1,
-            'permissions.checkgrantedapiaccess' => 1,
-            'photos.get' => 1,
-            'photos.getalbums' => 1,
-            'photos.gettags' => 1,
-            'profile.getinfo' => 1,
-            'profile.getinfooptions' => 1,
-            'stream.get' => 1,
-            'stream.getcomments' => 1,
-            'stream.getfilters' => 1,
-            'users.getinfo' => 1,
-            'users.getloggedinuser' => 1,
-            'users.getstandardinfo' => 1,
-            'users.hasapppermission' => 1,
-            'users.isappuser' => 1,
-            'users.isverified' => 1,
-            'video.getuploadlimits' => 1);
-    $name = 'api';
-    if (isset($READ_ONLY_CALLS[strtolower($method)])) {
-      $name = 'api_read';
-    }
-    return self::getUrl($name, 'restserver.php');
-  }
-
-  /**
-   * Build the URL for given domain alias, path and parameters.
-   *
-   * @param $name String the name of the domain
-   * @param $path String optional path (without a leading slash)
-   * @param $params Array optional query parameters
-   * @return String the URL for the given parameters
-   */
-  protected function getUrl($name, $path='', $params=array()) {
-    $url = self::$DOMAIN_MAP[$name];
-    if ($path) {
-      if ($path[0] === '/') {
-        $path = substr($path, 1);
-      }
-      $url .= $path;
-    }
-    if ($params) {
-      $url .= '?' . http_build_query($params, null, '&');
-    }
-    return $url;
-  }
-
-  /**
-   * Returns the Current URL, stripping it of known FB parameters that should
-   * not persist.
-   *
-   * @return String the current URL
-   */
-  protected function getCurrentUrl() {
-    $protocol = isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on'
-      ? 'https://'
-      : 'http://';
-    $currentUrl = $protocol . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];
-    $parts = parse_url($currentUrl);
-
-    // drop known fb params
-    $query = '';
-    if (!empty($parts['query'])) {
-      $params = array();
-      parse_str($parts['query'], $params);
-      foreach(self::$DROP_QUERY_PARAMS as $key) {
-        unset($params[$key]);
-      }
-      if (!empty($params)) {
-        $query = '?' . http_build_query($params, null, '&');
-      }
-    }
-
-    // use port if non default
-    $port =
-      isset($parts['port']) &&
-      (($protocol === 'http://' && $parts['port'] !== 80) ||
-       ($protocol === 'https://' && $parts['port'] !== 443))
-      ? ':' . $parts['port'] : '';
-
-    // rebuild
-    return $protocol . $parts['host'] . $port . $parts['path'] . $query;
-  }
-
-  /**
-   * Generate a signature for the given params and secret.
-   *
-   * @param Array $params the parameters to sign
-   * @param String $secret the secret to sign with
-   * @return String the generated signature
-   */
-  protected static function generateSignature($params, $secret) {
-    // work with sorted data
-    ksort($params);
-
-    // generate the base string
-    $base_string = '';
-    foreach($params as $key => $value) {
-      $base_string .= $key . '=' . $value;
-    }
-    $base_string .= $secret;
-
-    return md5($base_string);
-  }
-
-  /**
-   * Prints to the error log if you aren't in command line mode.
-   *
-   * @param String log message
-   */
-  protected static function errorLog($msg) {
-    // disable error log if we are running in a CLI environment
-    // @codeCoverageIgnoreStart
-    if (php_sapi_name() != 'cli') {
-      error_log($msg);
-    }
-    // uncomment this if you want to see the errors on the page
-    // print 'error_log: '.$msg."\n";
-    // @codeCoverageIgnoreEnd
-  }
-
-  /**
-   * Base64 encoding that doesn't need to be urlencode()ed.
-   * Exactly the same as base64_encode except it uses
-   *   - instead of +
-   *   _ instead of /
-   *
-   * @param String base64UrlEncodeded string
-   */
-  protected static function base64UrlDecode($input) {
-    return base64_decode(strtr($input, '-_', '+/'));
+  protected function constructSessionVariableName($key) {
+    return implode('_', array('fb',
+                              $this->getAppId(),
+                              $key));
   }
 }
diff --git a/plugins/FacebookBridge/images/f_logo.png b/plugins/FacebookBridge/images/f_logo.png
new file mode 100644
index 0000000000..b54e21cadf
Binary files /dev/null and b/plugins/FacebookBridge/images/f_logo.png differ
diff --git a/plugins/FacebookBridge/lib/facebookclient.php b/plugins/FacebookBridge/lib/facebookclient.php
index 0469ce8aca..26e21cbd6e 100644
--- a/plugins/FacebookBridge/lib/facebookclient.php
+++ b/plugins/FacebookBridge/lib/facebookclient.php
@@ -23,7 +23,7 @@
  * @package   StatusNet
  * @author    Craig Andrews <candrews@integralblue.com>
  * @author    Zach Copley <zach@status.net>
- * @copyright 2009-2010 StatusNet, Inc.
+ * @copyright 2009-2011 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
  */
@@ -176,7 +176,8 @@ class Facebookclient
 
         // If it's not a reply, or if the user WANTS to send @-replies,
         // then, yeah, it can go to Facebook.
-        if (!preg_match('/@[a-zA-Z0-9_]{1,15}\b/u', $this->notice->content) ||
+
+        if (empty($this->notice->reply_to) ||
             ($this->flink->noticesync & FOREIGN_NOTICE_SEND_REPLY)) {
             return true;
         }
@@ -916,7 +917,7 @@ class Facebookclient
     static function addFacebookUser($fbuser)
     {
         // remove any existing, possibly outdated, record
-        $luser = Foreign_user::getForeignUser($fbuser['id'], FACEBOOK_SERVICE);
+        $luser = Foreign_user::getForeignUser($fbuser->id, FACEBOOK_SERVICE);
 
         if (!empty($luser)) {
 
@@ -927,8 +928,8 @@ class Facebookclient
                     LOG_INFO,
                     sprintf(
                         'Removed old Facebook user: %s, fbuid %d',
-                        $fbuid['name'],
-                        $fbuid['id']
+                        $fbuid->name,
+                        $fbuid->id
                     ),
                     __FILE__
                 );
@@ -937,9 +938,9 @@ class Facebookclient
 
         $fuser = new Foreign_user();
 
-        $fuser->nickname = $fbuser['name'];
-        $fuser->uri      = $fbuser['link'];
-        $fuser->id       = $fbuser['id'];
+        $fuser->nickname = $fbuser->username;
+        $fuser->uri      = $fbuser->link;
+        $fuser->id       = $fbuser->id;
         $fuser->service  = FACEBOOK_SERVICE;
         $fuser->created  = common_sql_now();
 
@@ -950,8 +951,8 @@ class Facebookclient
                 LOG_WARNING,
                     sprintf(
                         'Failed to add new Facebook user: %s, fbuid %d',
-                        $fbuser['name'],
-                        $fbuser['id']
+                        $fbuser->username,
+                        $fbuser->id
                     ),
                     __FILE__
             );
@@ -962,8 +963,8 @@ class Facebookclient
                 LOG_INFO,
                 sprintf(
                     'Added new Facebook user: %s, fbuid %d',
-                    $fbuser['name'],
-                    $fbuser['id']
+                    $fbuser->name,
+                    $fbuser->id
                 ),
                 __FILE__
             );
diff --git a/plugins/FacebookBridge/locale/FacebookBridge.pot b/plugins/FacebookBridge/locale/FacebookBridge.pot
index ba78cf3cd8..63c5df4dec 100644
--- a/plugins/FacebookBridge/locale/FacebookBridge.pot
+++ b/plugins/FacebookBridge/locale/FacebookBridge.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
+"POT-Creation-Date: 2012-06-30 11:07+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"
@@ -28,12 +28,12 @@ msgstr ""
 
 #. TRANS: Page title.
 #. TRANS: Alt text for "Login with Facebook" image.
-#: actions/facebooklogin.php:67 actions/facebooklogin.php:93
+#: actions/facebooklogin.php:67 actions/facebooklogin.php:92
 msgid "Login with Facebook"
 msgstr ""
 
 #. TRANS: Title for "Login with Facebook" image.
-#: actions/facebooklogin.php:95
+#: actions/facebooklogin.php:94
 msgid "Login with Facebook."
 msgstr ""
 
@@ -96,7 +96,7 @@ msgid "Save Facebook settings."
 msgstr ""
 
 #. TRANS: Client error displayed when the session token does not match or is not given.
-#: actions/facebooksettings.php:87 actions/facebookfinishlogin.php:143
+#: actions/facebooksettings.php:87 actions/facebookfinishlogin.php:152
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 
@@ -131,7 +131,8 @@ msgstr ""
 msgid "Disconnect my account from Facebook"
 msgstr ""
 
-#: actions/facebooksettings.php:205
+#. TRANS: Notice in disconnect from Facebook form if user has no local StatusNet password.
+#: actions/facebooksettings.php:204
 #, php-format
 msgid ""
 "Disconnecting your Faceboook would make it impossible to log in! Please [set "
@@ -140,7 +141,7 @@ msgstr ""
 
 #. TRANS: Message displayed when initiating disconnect of a StatusNet user
 #. TRANS: from a Facebook account. %1$s is the StatusNet site name.
-#: actions/facebooksettings.php:217
+#: actions/facebooksettings.php:215
 #, php-format
 msgid ""
 "Keep your %1$s account but disconnect from Facebook. You'll use your %1$s "
@@ -148,56 +149,60 @@ msgid ""
 msgstr ""
 
 #. TRANS: Submit button.
-#: actions/facebooksettings.php:223
+#: actions/facebooksettings.php:221
 msgctxt "BUTTON"
 msgid "Disconnect"
 msgstr ""
 
 #. TRANS: Notice in case saving of synchronisation preferences fail.
-#: actions/facebooksettings.php:247
+#: actions/facebooksettings.php:245
 msgid "There was a problem saving your sync preferences."
 msgstr ""
 
 #. TRANS: Confirmation that synchronisation settings have been saved into the system.
-#: actions/facebooksettings.php:250
+#: actions/facebooksettings.php:248
 msgid "Sync preferences saved."
 msgstr ""
 
 #. TRANS: Server error displayed when deleting the link to a Facebook account fails.
-#: actions/facebooksettings.php:265
+#: actions/facebooksettings.php:263
 msgid "Could not delete link to Facebook."
 msgstr ""
 
 #. TRANS: Confirmation message. StatusNet account was unlinked from Facebook.
-#: actions/facebooksettings.php:270
+#: actions/facebooksettings.php:268
 msgid "You have disconnected from Facebook."
 msgstr ""
 
+#: actions/facebookfinishlogin.php:50
+msgid "Unable to authenticate you with Facebook."
+msgstr ""
+
 #. TRANS: Client error displayed when trying to connect to Facebook while not logged in.
-#: actions/facebookfinishlogin.php:87
+#: actions/facebookfinishlogin.php:79
 msgid ""
 "You must be logged into Facebook to register a local account using Facebook."
 msgstr ""
 
 #. TRANS: Client error displayed when trying to connect to a Facebook account that is already linked
 #. TRANS: in the same StatusNet site.
-#: actions/facebookfinishlogin.php:119
+#: actions/facebookfinishlogin.php:121 actions/facebookfinishlogin.php:137
 msgid "There is already a local account linked with that Facebook account."
 msgstr ""
 
 #. TRANS: Form validation error displayed when user has not agreed to the license.
-#: actions/facebookfinishlogin.php:153
+#: actions/facebookfinishlogin.php:162
 msgid "You cannot register if you do not agree to the license."
 msgstr ""
 
 #. TRANS: Form validation error displayed when an unhandled error occurs.
-#: actions/facebookfinishlogin.php:171
+#: actions/facebookfinishlogin.php:180
 msgid "An unknown error has occured."
 msgstr ""
 
 #. TRANS: Form instructions for connecting to Facebook.
 #. TRANS: %s is the site name.
-#: actions/facebookfinishlogin.php:190
+#: actions/facebookfinishlogin.php:199
 #, php-format
 msgid ""
 "This is the first time you have logged into %s so we must connect your "
@@ -206,17 +211,17 @@ msgid ""
 msgstr ""
 
 #. TRANS: Page title.
-#: actions/facebookfinishlogin.php:200
+#: actions/facebookfinishlogin.php:209
 msgid "Facebook Setup"
 msgstr ""
 
 #. TRANS: Fieldset legend.
-#: actions/facebookfinishlogin.php:234
+#: actions/facebookfinishlogin.php:243
 msgid "Connection options"
 msgstr ""
 
 #. TRANS: %s is the name of the license used by the user for their status updates.
-#: actions/facebookfinishlogin.php:244
+#: actions/facebookfinishlogin.php:253
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
@@ -224,125 +229,125 @@ msgid ""
 msgstr ""
 
 #. TRANS: Fieldset legend.
-#: actions/facebookfinishlogin.php:261
+#: actions/facebookfinishlogin.php:270
 msgid "Create new account"
 msgstr ""
 
 #. TRANS: Form instructions.
-#: actions/facebookfinishlogin.php:264
+#: actions/facebookfinishlogin.php:273
 msgid "Create a new user with this nickname."
 msgstr ""
 
 #. TRANS: Field label.
-#: actions/facebookfinishlogin.php:272
+#: actions/facebookfinishlogin.php:281
 msgid "New nickname"
 msgstr ""
 
 #. TRANS: Field title.
-#: actions/facebookfinishlogin.php:275
+#: actions/facebookfinishlogin.php:284
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr ""
 
 #. TRANS: Submit button to create a new account.
-#: actions/facebookfinishlogin.php:283
+#: actions/facebookfinishlogin.php:292
 msgctxt "BUTTON"
 msgid "Create"
 msgstr ""
 
 #. TRANS: Fieldset legend.
-#: actions/facebookfinishlogin.php:289
+#: actions/facebookfinishlogin.php:298
 msgid "Connect existing account"
 msgstr ""
 
 #. TRANS: Form instructions.
-#: actions/facebookfinishlogin.php:292
+#: actions/facebookfinishlogin.php:301
 msgid ""
 "If you already have an account, login with your username and password to "
 "connect it to your Facebook."
 msgstr ""
 
 #. TRANS: Field label.
-#: actions/facebookfinishlogin.php:296
+#: actions/facebookfinishlogin.php:305
 msgid "Existing nickname"
 msgstr ""
 
 #. TRANS: Field label.
-#: actions/facebookfinishlogin.php:300
+#: actions/facebookfinishlogin.php:309
 msgid "Password"
 msgstr ""
 
 #. TRANS: Submit button to connect a Facebook account to an existing StatusNet account.
-#: actions/facebookfinishlogin.php:304
+#: actions/facebookfinishlogin.php:313
 msgctxt "BUTTON"
 msgid "Connect"
 msgstr ""
 
 #. TRANS: Client error trying to register with registrations not allowed.
 #. TRANS: Client error trying to register with registrations 'invite only'.
-#: actions/facebookfinishlogin.php:325 actions/facebookfinishlogin.php:335
+#: actions/facebookfinishlogin.php:334 actions/facebookfinishlogin.php:344
 msgid "Registration not allowed."
 msgstr ""
 
 #. TRANS: Client error trying to register with an invalid invitation code.
-#: actions/facebookfinishlogin.php:343
+#: actions/facebookfinishlogin.php:352
 msgid "Not a valid invitation code."
 msgstr ""
 
 #. TRANS: Form validation error displayed when picking a nickname that is not allowed.
-#: actions/facebookfinishlogin.php:357
+#: actions/facebookfinishlogin.php:366
 msgid "Nickname not allowed."
 msgstr ""
 
 #. TRANS: Form validation error displayed when picking a nickname that is already in use.
-#: actions/facebookfinishlogin.php:363
+#: actions/facebookfinishlogin.php:372
 msgid "Nickname already in use. Try another one."
 msgstr ""
 
 #. TRANS: Server error displayed when connecting to Facebook fails.
-#: actions/facebookfinishlogin.php:392 actions/facebookfinishlogin.php:533
+#: actions/facebookfinishlogin.php:401 actions/facebookfinishlogin.php:535
 msgid "Error connecting user to Facebook."
 msgstr ""
 
 #. TRANS: Form validation error displayed when username/password combination is incorrect.
-#: actions/facebookfinishlogin.php:495
+#: actions/facebookfinishlogin.php:502
 msgid "Invalid username or password."
 msgstr ""
 
 #. TRANS: Menu item for "Facebook" in administration panel.
 #. TRANS: Menu item for "Facebook" in user settings.
-#: FacebookBridgePlugin.php:217 FacebookBridgePlugin.php:256
-#: FacebookBridgePlugin.php:297
+#: FacebookBridgePlugin.php:216 FacebookBridgePlugin.php:255
+#: FacebookBridgePlugin.php:295
 msgctxt "MENU"
 msgid "Facebook"
 msgstr ""
 
 #. TRANS: Menu title for "Facebook" login.
-#: FacebookBridgePlugin.php:219
+#: FacebookBridgePlugin.php:218
 msgid "Login or register using Facebook."
 msgstr ""
 
 #. TRANS: Menu title for "Facebook" in administration panel.
-#: FacebookBridgePlugin.php:258
+#: FacebookBridgePlugin.php:257
 msgid "Facebook integration configuration."
 msgstr ""
 
 #. TRANS: Menu title for "Facebook" in user settings.
-#: FacebookBridgePlugin.php:299
+#: FacebookBridgePlugin.php:297
 msgid "Facebook settings."
 msgstr ""
 
 #. TRANS: Plugin description.
-#: FacebookBridgePlugin.php:560
+#: FacebookBridgePlugin.php:576
 msgid "A plugin for integrating StatusNet with Facebook."
 msgstr ""
 
 #. TRANS: E-mail subject.
-#: lib/facebookclient.php:788
+#: lib/facebookclient.php:789
 msgid "Your Facebook connection has been removed"
 msgstr ""
 
 #. TRANS: E-mail body. %1$s is a username, %2$s is the StatusNet sitename.
-#: lib/facebookclient.php:791
+#: lib/facebookclient.php:792
 #, php-format
 msgid ""
 "Hi %1$s,\n"
@@ -362,14 +367,14 @@ msgid ""
 msgstr ""
 
 #. TRANS: E-mail subject. %s is the StatusNet sitename.
-#: lib/facebookclient.php:844
+#: lib/facebookclient.php:845
 #, php-format
 msgid "Contact the %s administrator to retrieve your account"
 msgstr ""
 
 #. TRANS: E-mail body. %1$s is a username,
 #. TRANS: %2$s is the StatusNet sitename, %3$s is the site contact e-mail address.
-#: lib/facebookclient.php:848
+#: lib/facebookclient.php:849
 #, php-format
 msgid ""
 "Hi %1$s,\n"
diff --git a/plugins/FacebookBridge/locale/ar/LC_MESSAGES/FacebookBridge.po b/plugins/FacebookBridge/locale/ar/LC_MESSAGES/FacebookBridge.po
index 0072a92f5c..df3d70be2a 100644
--- a/plugins/FacebookBridge/locale/ar/LC_MESSAGES/FacebookBridge.po
+++ b/plugins/FacebookBridge/locale/ar/LC_MESSAGES/FacebookBridge.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - FacebookBridge\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:29+0000\n"
-"Language-Team: Arabic <http://translatewiki.net/wiki/Portal:ar>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:32+0000\n"
+"Language-Team: Arabic <https://translatewiki.net/wiki/Portal:ar>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:26:40+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2012-04-19 14:01:11+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ar\n"
 "X-Message-Group: #out-statusnet-plugin-facebookbridge\n"
 "Plural-Forms: nplurals=6; plural=(n == 0) ? 0 : ( (n == 1) ? 1 : ( (n == "
@@ -25,31 +25,29 @@ msgstr ""
 
 #. TRANS: Client error displayed when trying to login while already logged in.
 msgid "Already logged in."
-msgstr ""
+msgstr "والج بال�عل."
 
 #. TRANS: Form instructions.
 msgid "Login with your Facebook Account"
-msgstr ""
+msgstr "ل�ج بحسابك على �يسبك"
 
 #. TRANS: Page title.
 #. TRANS: Alt text for "Login with Facebook" image.
 msgid "Login with Facebook"
-msgstr ""
+msgstr "ل�ج ب�يسبك"
 
 #. TRANS: Title for "Login with Facebook" image.
-#, fuzzy
 msgid "Login with Facebook."
-msgstr "ل�ج أو سجّل باستخدام �يسبك"
+msgstr "ل�ج ب�يسبك."
 
 #. TRANS: Title for Facebook administration panel.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Facebook integration settings"
-msgstr "ضبط تكامل �يسبك"
+msgstr "إعدادات تكامل �يسبك"
 
 #. TRANS: Instruction for Facebook administration panel.
 msgid "Facebook integration settings"
-msgstr ""
+msgstr "إعدادات تكامل �يسبك"
 
 #. TRANS: Client error displayed when providing too long a Facebook application ID.
 msgid "Invalid Facebook ID. Maximum length is 255 characters."
@@ -86,16 +84,14 @@ msgid "Save"
 msgstr "اح�ظ"
 
 #. TRANS: Button title to save Facebook integration settings.
-#, fuzzy
 msgid "Save Facebook settings."
-msgstr "اح�ظ إعدادات �يسبك"
+msgstr "اح�ظ إعدادات �يسبك."
 
 #. TRANS: Client error displayed when the session token does not match or is not given.
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 
 #. TRANS: Page title for Facebook settings.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Facebook settings"
 msgstr "إعدادات �يسبك"
@@ -106,7 +102,7 @@ msgstr "إعدادات �يسبك"
 
 #. TRANS: Form note. User is connected to facebook.
 msgid "Connected Facebook user"
-msgstr "مستخدم �يسبك متصل"
+msgstr "مستخدم �يسبك مربوط"
 
 #. TRANS: Checkbox label in Facebook settings.
 msgid "Publish my notices to Facebook."
@@ -118,14 +114,15 @@ msgstr "أرسل الردود \"@\" إلى �يسبك."
 
 #. TRANS: Fieldset legend for form to disconnect from Facebook.
 msgid "Disconnect my account from Facebook"
-msgstr "اقطع اتصال حسابي ب�يسبك."
+msgstr "اقطع ربط حسابي ب�يسبك."
 
+#. TRANS: Notice in disconnect from Facebook form if user has no local StatusNet password.
 #, php-format
 msgid ""
 "Disconnecting your Faceboook would make it impossible to log in! Please [set "
 "a password](%s) first."
 msgstr ""
-"قطع اتصال حسابك ب�يسبك سيجعل دخولك مستحيلا! الرجاء [ضبط كلمة سر](%s) أولا."
+"قطع ربط حسابك ب�يسبك سيجعل دخولك مستحيلا! الرجاء [تعيين كلمة سر](%s) أولا."
 
 #. TRANS: Message displayed when initiating disconnect of a StatusNet user
 #. TRANS: from a Facebook account. %1$s is the StatusNet site name.
@@ -134,13 +131,13 @@ msgid ""
 "Keep your %1$s account but disconnect from Facebook. You'll use your %1$s "
 "password to log in."
 msgstr ""
-"أبق� حسابك على %1$s واقطع الاتصال ب�يسبك. سو� يتعين عليك استخدام كلمة السر "
-"على %1$s للدخول."
+"أبق� حسابك على %1$s واقطع الربط ب�يسبك. سو� يتعين عليك استخدام كلمة السر على %"
+"1$s للدخول."
 
 #. TRANS: Submit button.
 msgctxt "BUTTON"
 msgid "Disconnect"
-msgstr "اقطع الاتصال"
+msgstr "اقطع الربط"
 
 #. TRANS: Notice in case saving of synchronisation preferences fail.
 msgid "There was a problem saving your sync preferences."
@@ -151,13 +148,15 @@ msgid "Sync preferences saved."
 msgstr "ح��ظت ت�ضيلات المزامنة."
 
 #. TRANS: Server error displayed when deleting the link to a Facebook account fails.
-#, fuzzy
 msgid "Could not delete link to Facebook."
-msgstr "تعذر حذ� وصلة �يسبك."
+msgstr "تعذر حذ� ارتباط �يسبك."
 
 #. TRANS: Confirmation message. StatusNet account was unlinked from Facebook.
 msgid "You have disconnected from Facebook."
-msgstr "لقد قطعت الاتصال من �يسبك."
+msgstr "لقد قطعت الربط ب�يسبك."
+
+msgid "Unable to authenticate you with Facebook."
+msgstr ""
 
 #. TRANS: Client error displayed when trying to connect to Facebook while not logged in.
 msgid ""
@@ -192,7 +191,7 @@ msgstr "ضبط �يسبك"
 
 #. TRANS: Fieldset legend.
 msgid "Connection options"
-msgstr "خيارات الاتصال"
+msgstr "خيارات الربط"
 
 #. TRANS: %s is the name of the license used by the user for their status updates.
 #, php-format
@@ -200,7 +199,7 @@ msgid ""
 "My text and files are available under %s except this private data: password, "
 "email address, IM address, and phone number."
 msgstr ""
-"تخضع نصوصي ومل�ات ل%s إلا البيانات الخاصة التالية: كلمة السر وعنوان البريد "
+"تخضع نصوصي ومل�اتي ل%s إلا البيانات الخاصة التالية: كلمة السر وعنوان البريد "
 "الإلكتروني وعنوان المراسلة ال�ورية ورقم الهات�."
 
 #. TRANS: Fieldset legend.
@@ -209,7 +208,7 @@ msgstr "أنشئ حسابًا جديدًا"
 
 #. TRANS: Form instructions.
 msgid "Create a new user with this nickname."
-msgstr ""
+msgstr "أنشئ مستخدمًا جديدًا بهذا الاسم المستعار."
 
 #. TRANS: Field label.
 msgid "New nickname"
@@ -217,7 +216,7 @@ msgstr "الاسم المستعار الجديد"
 
 #. TRANS: Field title.
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
-msgstr ""
+msgstr "1-64 حر�ًا إنجليزيًا أو رقمًا، بدون نقاط أو مسا�ات."
 
 #. TRANS: Submit button to create a new account.
 msgctxt "BUTTON"
@@ -226,7 +225,7 @@ msgstr "أنشئ"
 
 #. TRANS: Fieldset legend.
 msgid "Connect existing account"
-msgstr ""
+msgstr "اربط حسابا موجودا"
 
 #. TRANS: Form instructions.
 msgid ""
@@ -236,7 +235,7 @@ msgstr ""
 
 #. TRANS: Field label.
 msgid "Existing nickname"
-msgstr ""
+msgstr "الاسم المستعار الموجود"
 
 #. TRANS: Field label.
 msgid "Password"
@@ -279,19 +278,16 @@ msgid "Facebook"
 msgstr "�يسبك"
 
 #. TRANS: Menu title for "Facebook" login.
-#, fuzzy
 msgid "Login or register using Facebook."
-msgstr "ل�ج أو سجّل باستخدام �يسبك"
+msgstr "ل�ج أو سجّل باستخدام �يسبك."
 
 #. TRANS: Menu title for "Facebook" in administration panel.
-#, fuzzy
 msgid "Facebook integration configuration."
-msgstr "ضبط تكامل �يسبك"
+msgstr "ضبط تكامل �يسبك."
 
 #. TRANS: Menu title for "Facebook" in user settings.
-#, fuzzy
 msgid "Facebook settings."
-msgstr "إعدادات �يسبك"
+msgstr "إعدادات �يسبك."
 
 #. TRANS: Plugin description.
 msgid "A plugin for integrating StatusNet with Facebook."
@@ -299,7 +295,7 @@ msgstr ""
 
 #. TRANS: E-mail subject.
 msgid "Your Facebook connection has been removed"
-msgstr ""
+msgstr "أزيل ارتباطك ب�يسبك"
 
 #. TRANS: E-mail body. %1$s is a username, %2$s is the StatusNet sitename.
 #, php-format
diff --git a/plugins/FacebookBridge/locale/br/LC_MESSAGES/FacebookBridge.po b/plugins/FacebookBridge/locale/br/LC_MESSAGES/FacebookBridge.po
index 51e375d951..66abf65931 100644
--- a/plugins/FacebookBridge/locale/br/LC_MESSAGES/FacebookBridge.po
+++ b/plugins/FacebookBridge/locale/br/LC_MESSAGES/FacebookBridge.po
@@ -1,6 +1,7 @@
-# Translation of StatusNet - FacebookBridge to Breton (Brezhoneg)
+# Translation of StatusNet - FacebookBridge to Breton (brezhoneg)
 # Exported from translatewiki.net
 #
+# Author: Fulup
 # Author: Y-M D
 # --
 # This file is distributed under the same license as the StatusNet package.
@@ -9,14 +10,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - FacebookBridge\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:29+0000\n"
-"Language-Team: Breton <http://translatewiki.net/wiki/Portal:br>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:33+0000\n"
+"Language-Team: Breton <https://translatewiki.net/wiki/Portal:br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:26:40+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2012-04-19 14:01:11+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-facebookbridge\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
@@ -35,12 +36,10 @@ msgid "Login with Facebook"
 msgstr "Kevreañ gant Facebook"
 
 #. TRANS: Title for "Login with Facebook" image.
-#, fuzzy
 msgid "Login with Facebook."
-msgstr "Kevreañ gant Facebook"
+msgstr "Kevreañ gant Facebook."
 
 #. TRANS: Title for Facebook administration panel.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Facebook integration settings"
 msgstr "Arventennoù enframmañ Facebook"
@@ -66,9 +65,8 @@ msgid "Application ID"
 msgstr "ID ar poellad"
 
 #. TRANS: Field title for Facebook application ID.
-#, fuzzy
 msgid "ID of your Facebook application."
-msgstr "ID ho poellad Facebook"
+msgstr "ID ho poellad Facebook."
 
 #. TRANS: Field label for Facebook secret key.
 msgid "Secret"
@@ -86,16 +84,14 @@ msgid "Save"
 msgstr "Enrollañ"
 
 #. TRANS: Button title to save Facebook integration settings.
-#, fuzzy
 msgid "Save Facebook settings."
-msgstr "Enrollañ arventennoù Facebook"
+msgstr "Enrollañ arventennoù Facebook."
 
 #. TRANS: Client error displayed when the session token does not match or is not given.
 msgid "There was a problem with your session token. Try again, please."
 msgstr "Ur gudenn 'zo bet gant ho jedaouer dalc'h. Mar plij adklaskit."
 
 #. TRANS: Page title for Facebook settings.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Facebook settings"
 msgstr "Arventennoù Facebook"
@@ -120,6 +116,7 @@ msgstr "Kas respontoù \"@\" da Facebook."
 msgid "Disconnect my account from Facebook"
 msgstr "Digevreañ ma c'hont deus Facebook"
 
+#. TRANS: Notice in disconnect from Facebook form if user has no local StatusNet password.
 #, php-format
 msgid ""
 "Disconnecting your Faceboook would make it impossible to log in! Please [set "
@@ -156,6 +153,9 @@ msgstr "N'eus ket bet gallet diverkañ al liamm war-du Facebook."
 msgid "You have disconnected from Facebook."
 msgstr "Digevreet ho peus deus Facebook."
 
+msgid "Unable to authenticate you with Facebook."
+msgstr ""
+
 #. TRANS: Client error displayed when trying to connect to Facebook while not logged in.
 msgid ""
 "You must be logged into Facebook to register a local account using Facebook."
@@ -175,7 +175,7 @@ msgstr ""
 
 #. TRANS: Form validation error displayed when an unhandled error occurs.
 msgid "An unknown error has occured."
-msgstr "Ur gudenn dizanv a zo bet."
+msgstr "C'hoarvezet ez eus ur gudenn dianav."
 
 #. TRANS: Form instructions for connecting to Facebook.
 #. TRANS: %s is the site name.
@@ -188,7 +188,7 @@ msgstr ""
 
 #. TRANS: Page title.
 msgid "Facebook Setup"
-msgstr ""
+msgstr "Kefluniadur Facebook"
 
 #. TRANS: Fieldset legend.
 msgid "Connection options"
diff --git a/plugins/FacebookBridge/locale/ca/LC_MESSAGES/FacebookBridge.po b/plugins/FacebookBridge/locale/ca/LC_MESSAGES/FacebookBridge.po
index 5b80dd7d8c..3da6f8f6d1 100644
--- a/plugins/FacebookBridge/locale/ca/LC_MESSAGES/FacebookBridge.po
+++ b/plugins/FacebookBridge/locale/ca/LC_MESSAGES/FacebookBridge.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - FacebookBridge to Catalan (Català)
+# Translation of StatusNet - FacebookBridge to Catalan (català)
 # Exported from translatewiki.net
 #
 # Author: Toniher
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - FacebookBridge\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:29+0000\n"
-"Language-Team: Catalan <http://translatewiki.net/wiki/Portal:ca>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:33+0000\n"
+"Language-Team: Catalan <https://translatewiki.net/wiki/Portal:ca>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:26:40+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2012-04-19 14:01:11+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ca\n"
 "X-Message-Group: #out-statusnet-plugin-facebookbridge\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -117,6 +117,7 @@ msgstr "Envia respostes amb «@» al Facebook."
 msgid "Disconnect my account from Facebook"
 msgstr "Desconnecta el meu compte del Facebook"
 
+#. TRANS: Notice in disconnect from Facebook form if user has no local StatusNet password.
 #, php-format
 msgid ""
 "Disconnecting your Faceboook would make it impossible to log in! Please [set "
@@ -156,6 +157,9 @@ msgstr "No s'ha pogut eliminar l'enllaç al Facebook."
 msgid "You have disconnected from Facebook."
 msgstr "Us heu desconnectat del Facebook."
 
+msgid "Unable to authenticate you with Facebook."
+msgstr "No s'ha pogut autenticar-vos amb el Facebook."
+
 #. TRANS: Client error displayed when trying to connect to Facebook while not logged in.
 msgid ""
 "You must be logged into Facebook to register a local account using Facebook."
diff --git a/plugins/FacebookBridge/locale/de/LC_MESSAGES/FacebookBridge.po b/plugins/FacebookBridge/locale/de/LC_MESSAGES/FacebookBridge.po
index 263f143d6a..a862089024 100644
--- a/plugins/FacebookBridge/locale/de/LC_MESSAGES/FacebookBridge.po
+++ b/plugins/FacebookBridge/locale/de/LC_MESSAGES/FacebookBridge.po
@@ -1,9 +1,12 @@
 # Translation of StatusNet - FacebookBridge to German (Deutsch)
 # Exported from translatewiki.net
 #
+# Author: ChrisiPK
 # Author: Fujnky
 # Author: Giftpflanze
+# Author: Kghbln
 # Author: MF-Warburg
+# Author: Tiin
 # --
 # This file is distributed under the same license as the StatusNet package.
 #
@@ -11,14 +14,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - FacebookBridge\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:29+0000\n"
-"Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:33+0000\n"
+"Language-Team: German <https://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:26:40+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2012-04-19 14:01:11+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-facebookbridge\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -75,7 +78,7 @@ msgstr "Geheimnis"
 
 #. TRANS: Field title for Facebook secret key.
 msgid "Application secret."
-msgstr "Anwendungs-Geheimnis."
+msgstr "Geheimer Schlüssel der Anwendung"
 
 #. TRANS: Button text to save Facebook integration settings.
 #. TRANS: Submit button to save synchronisation settings.
@@ -116,6 +119,7 @@ msgstr "\"@\"-Antworten zu Facebook senden."
 msgid "Disconnect my account from Facebook"
 msgstr "Mein Konto von Facebook trennen"
 
+#. TRANS: Notice in disconnect from Facebook form if user has no local StatusNet password.
 #, php-format
 msgid ""
 "Disconnecting your Faceboook would make it impossible to log in! Please [set "
@@ -157,6 +161,9 @@ msgstr "Konnte die Verbindung zu Facebook nicht löschen."
 msgid "You have disconnected from Facebook."
 msgstr "Du bist nun nicht mehr mit Facebook verbunden."
 
+msgid "Unable to authenticate you with Facebook."
+msgstr "Konnte dich nicht mit Facebook authentifizieren."
+
 #. TRANS: Client error displayed when trying to connect to Facebook while not logged in.
 msgid ""
 "You must be logged into Facebook to register a local account using Facebook."
diff --git a/plugins/FacebookBridge/locale/es/LC_MESSAGES/FacebookBridge.po b/plugins/FacebookBridge/locale/es/LC_MESSAGES/FacebookBridge.po
new file mode 100644
index 0000000000..fb229d54df
--- /dev/null
+++ b/plugins/FacebookBridge/locale/es/LC_MESSAGES/FacebookBridge.po
@@ -0,0 +1,377 @@
+# Translation of StatusNet - FacebookBridge to Spanish (español)
+# Exported from translatewiki.net
+#
+# Author: Armando-Martin
+# Author: Johnarupire
+# Author: Od1n
+# Author: Toliño
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - FacebookBridge\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:33+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2012-04-19 14:01:11+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Client error displayed when trying to login while already logged in.
+msgid "Already logged in."
+msgstr "Ya está conectado"
+
+#. TRANS: Form instructions.
+msgid "Login with your Facebook Account"
+msgstr "Inicie sesión con su cuenta de Facebook"
+
+#. TRANS: Page title.
+#. TRANS: Alt text for "Login with Facebook" image.
+msgid "Login with Facebook"
+msgstr "Inicio de sesión con Facebook"
+
+#. TRANS: Title for "Login with Facebook" image.
+msgid "Login with Facebook."
+msgstr "Inicio de sesión con Facebook."
+
+#. TRANS: Title for Facebook administration panel.
+msgctxt "TITLE"
+msgid "Facebook integration settings"
+msgstr "Configuración de la integración de Facebook"
+
+#. TRANS: Instruction for Facebook administration panel.
+msgid "Facebook integration settings"
+msgstr "Configuración de la integración de Facebook"
+
+#. TRANS: Client error displayed when providing too long a Facebook application ID.
+msgid "Invalid Facebook ID. Maximum length is 255 characters."
+msgstr ""
+"El identificador ID de Facebook no es válido. La longitud máxima es de 255 "
+"caracteres."
+
+#. TRANS: Client error displayed when providing too long a Facebook secret key.
+msgid "Invalid Facebook secret. Maximum length is 255 characters."
+msgstr ""
+"La frase secreta de Facebook es incorrecta. La extensión máxima es de 255 "
+"caracteres."
+
+#. TRANS: Fieldset legend.
+msgid "Facebook application settings"
+msgstr "Configuración de la aplicación de Facebook"
+
+#. TRANS: Field label for Facebook application ID.
+msgid "Application ID"
+msgstr "Identificador ID de aplicación"
+
+#. TRANS: Field title for Facebook application ID.
+msgid "ID of your Facebook application."
+msgstr "Identificador ID de su aplicación de Facebook."
+
+#. TRANS: Field label for Facebook secret key.
+msgid "Secret"
+msgstr "Frase secreta"
+
+#. TRANS: Field title for Facebook secret key.
+msgid "Application secret."
+msgstr "Frase secreta de la aplicación."
+
+#. TRANS: Button text to save Facebook integration settings.
+#. TRANS: Submit button to save synchronisation settings.
+msgctxt "BUTTON"
+msgid "Save"
+msgstr "Guardar"
+
+#. TRANS: Button title to save Facebook integration settings.
+msgid "Save Facebook settings."
+msgstr "Guardar configuración de Facebook."
+
+#. TRANS: Client error displayed when the session token does not match or is not given.
+msgid "There was a problem with your session token. Try again, please."
+msgstr ""
+"Hubo un problema con su clave (token) de sesión. Inténtelo de nuevo, por "
+"favor."
+
+#. TRANS: Page title for Facebook settings.
+msgctxt "TITLE"
+msgid "Facebook settings"
+msgstr "Configuración de Facebook"
+
+#. TRANS: Instructions for Facebook settings.
+msgid "Facebook settings"
+msgstr "Configuración de Facebook"
+
+#. TRANS: Form note. User is connected to facebook.
+msgid "Connected Facebook user"
+msgstr "Usuario de Facebook conectado"
+
+#. TRANS: Checkbox label in Facebook settings.
+msgid "Publish my notices to Facebook."
+msgstr "Publicar mis avisos en Facebook."
+
+#. TRANS: Checkbox label in Facebook settings.
+msgid "Send \"@\" replies to Facebook."
+msgstr "Enviar las respuestas \"@\" a Facebook."
+
+#. TRANS: Fieldset legend for form to disconnect from Facebook.
+msgid "Disconnect my account from Facebook"
+msgstr "Desconectar mi cuenta de Facebook"
+
+#. TRANS: Notice in disconnect from Facebook form if user has no local StatusNet password.
+#, php-format
+msgid ""
+"Disconnecting your Faceboook would make it impossible to log in! Please [set "
+"a password](%s) first."
+msgstr ""
+"¡Al desconectar tu Faceboook será imposible iniciar sesión! Por favor "
+"[establezca una contraseña] (%s) primero."
+
+#. TRANS: Message displayed when initiating disconnect of a StatusNet user
+#. TRANS: from a Facebook account. %1$s is the StatusNet site name.
+#, php-format
+msgid ""
+"Keep your %1$s account but disconnect from Facebook. You'll use your %1$s "
+"password to log in."
+msgstr ""
+"Mantener su cuenta %1$s pero desconectarse de Facebook. Utilizará su "
+"contraseña %1$s para iniciar sesión."
+
+#. TRANS: Submit button.
+msgctxt "BUTTON"
+msgid "Disconnect"
+msgstr "Desconectar"
+
+#. TRANS: Notice in case saving of synchronisation preferences fail.
+msgid "There was a problem saving your sync preferences."
+msgstr "Hubo un problema al guardar sus preferencias de sincronización."
+
+#. TRANS: Confirmation that synchronisation settings have been saved into the system.
+msgid "Sync preferences saved."
+msgstr "Preferencias de sincronización guardadas."
+
+#. TRANS: Server error displayed when deleting the link to a Facebook account fails.
+msgid "Could not delete link to Facebook."
+msgstr "No se pudo eliminar el enlace a Facebook."
+
+#. TRANS: Confirmation message. StatusNet account was unlinked from Facebook.
+msgid "You have disconnected from Facebook."
+msgstr "Se ha desconectado de Facebook."
+
+msgid "Unable to authenticate you with Facebook."
+msgstr "No se ha podido realizar su autenticación con Facebook."
+
+#. TRANS: Client error displayed when trying to connect to Facebook while not logged in.
+msgid ""
+"You must be logged into Facebook to register a local account using Facebook."
+msgstr ""
+"Debe iniciar sesión en Facebook para registrar una cuenta local usando "
+"Facebook."
+
+#. TRANS: Client error displayed when trying to connect to a Facebook account that is already linked
+#. TRANS: in the same StatusNet site.
+msgid "There is already a local account linked with that Facebook account."
+msgstr "Ya existe una cuenta local vinculada con esa cuenta de Facebook."
+
+#. TRANS: Form validation error displayed when user has not agreed to the license.
+msgid "You cannot register if you do not agree to the license."
+msgstr "No puede registrarse si no acepta la licencia."
+
+#. TRANS: Form validation error displayed when an unhandled error occurs.
+msgid "An unknown error has occured."
+msgstr "Ha ocurrido un error desconocido."
+
+#. TRANS: Form instructions for connecting to Facebook.
+#. TRANS: %s is the site name.
+#, php-format
+msgid ""
+"This is the first time you have logged into %s so we must connect your "
+"Facebook to a local account. You can either create a new local account, or "
+"connect with an existing local account."
+msgstr ""
+"Esta es la primera vez que ha iniciado sesión en %s por lo que debemos "
+"conectar su Facebook a una cuenta local. Puede crear una nueva cuenta local "
+"o conectarse con una cuenta local existente."
+
+#. TRANS: Page title.
+msgid "Facebook Setup"
+msgstr "Configuración de Facebook"
+
+#. TRANS: Fieldset legend.
+msgid "Connection options"
+msgstr "Opciones de conexión"
+
+#. TRANS: %s is the name of the license used by the user for their status updates.
+#, php-format
+msgid ""
+"My text and files are available under %s except this private data: password, "
+"email address, IM address, and phone number."
+msgstr ""
+"Mi texto y archivos están disponibles bajo %s con excepción de esta "
+"información privada: contraseña, dirección de correo electrónico, dirección "
+"de mensajería instantánea y número de teléfono."
+
+#. TRANS: Fieldset legend.
+msgid "Create new account"
+msgstr "Crear nueva cuenta"
+
+#. TRANS: Form instructions.
+msgid "Create a new user with this nickname."
+msgstr "Crear un nuevo usuario con este alias."
+
+#. TRANS: Field label.
+msgid "New nickname"
+msgstr "Nuevo alias"
+
+#. TRANS: Field title.
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
+msgstr ""
+"De 1 a 64 letras en minúscula o números, sin signos de puntuación ni "
+"espacios."
+
+#. TRANS: Submit button to create a new account.
+msgctxt "BUTTON"
+msgid "Create"
+msgstr "Crear"
+
+#. TRANS: Fieldset legend.
+msgid "Connect existing account"
+msgstr "Conectar a una cuenta existente"
+
+#. TRANS: Form instructions.
+msgid ""
+"If you already have an account, login with your username and password to "
+"connect it to your Facebook."
+msgstr ""
+"Si ya tiene una cuenta, inicie sesión con su nombre de usuario y contraseña "
+"para conectarse a su cuenta de Facebook."
+
+#. TRANS: Field label.
+msgid "Existing nickname"
+msgstr "Alias existente"
+
+#. TRANS: Field label.
+msgid "Password"
+msgstr "Contraseña"
+
+#. TRANS: Submit button to connect a Facebook account to an existing StatusNet account.
+msgctxt "BUTTON"
+msgid "Connect"
+msgstr "Conectar"
+
+#. TRANS: Client error trying to register with registrations not allowed.
+#. TRANS: Client error trying to register with registrations 'invite only'.
+msgid "Registration not allowed."
+msgstr "Registro no permitido."
+
+#. TRANS: Client error trying to register with an invalid invitation code.
+msgid "Not a valid invitation code."
+msgstr "El código de invitación no es válido."
+
+#. TRANS: Form validation error displayed when picking a nickname that is not allowed.
+msgid "Nickname not allowed."
+msgstr "Alias no permitido."
+
+#. TRANS: Form validation error displayed when picking a nickname that is already in use.
+msgid "Nickname already in use. Try another one."
+msgstr "El alias ya existe. Pruebe con otro."
+
+#. TRANS: Server error displayed when connecting to Facebook fails.
+msgid "Error connecting user to Facebook."
+msgstr "Error al conectar el usuario a Facebook."
+
+#. TRANS: Form validation error displayed when username/password combination is incorrect.
+msgid "Invalid username or password."
+msgstr "Usuario o contraseña inválidos."
+
+#. TRANS: Menu item for "Facebook" in administration panel.
+#. TRANS: Menu item for "Facebook" in user settings.
+msgctxt "MENU"
+msgid "Facebook"
+msgstr "Facebook"
+
+#. TRANS: Menu title for "Facebook" login.
+msgid "Login or register using Facebook."
+msgstr "Inicie sesión o regístrese usando Facebook."
+
+#. TRANS: Menu title for "Facebook" in administration panel.
+msgid "Facebook integration configuration."
+msgstr "Configuración de integración de Facebook."
+
+#. TRANS: Menu title for "Facebook" in user settings.
+msgid "Facebook settings."
+msgstr "Configuración de Facebook."
+
+#. TRANS: Plugin description.
+msgid "A plugin for integrating StatusNet with Facebook."
+msgstr "Un complemento (plugin) para integrar StatusNet con Facebook."
+
+#. TRANS: E-mail subject.
+msgid "Your Facebook connection has been removed"
+msgstr "Su conexión de Facebook ha sido eliminada"
+
+#. TRANS: E-mail body. %1$s is a username, %2$s is the StatusNet sitename.
+#, php-format
+msgid ""
+"Hi %1$s,\n"
+"\n"
+"We are sorry to inform you we are unable to publish your notice to\n"
+"Facebook, and have removed the connection between your %2$s account and\n"
+"Facebook.\n"
+"\n"
+"This may have happened because you have removed permission for %2$s\n"
+"to post on your behalf, or perhaps you have deactivated your Facebook\n"
+"account. You can reconnect your %2$s account to Facebook at any time by\n"
+"logging in with Facebook again.\n"
+"\n"
+"Sincerely,\n"
+"\n"
+"%2$s\n"
+msgstr ""
+"Hola %1$s,\n"
+"\n"
+"Lamentamos informarle que somos incapaces de publicar su nota en Facebook, y "
+"se ha eliminado la conexión entre su   cuenta %2$s y Facebook.\n"
+"\n"
+"Esto puede haber ocurrido porque se ha eliminado el permiso para que %2$s "
+"publique en su nombre, o quizás han desactivado su cuenta de Facebook.  "
+"Puede volver a conectar su cuenta %2$s a Facebook en cualquier momento "
+"iniciando sesión con Facebook nuevamente.\n"
+"\n"
+"Sinceramente,\n"
+"\n"
+"%2$s\n"
+
+#. TRANS: E-mail subject. %s is the StatusNet sitename.
+#, php-format
+msgid "Contact the %s administrator to retrieve your account"
+msgstr "Contacte con el administrador %s para recuperar su cuenta"
+
+#. TRANS: E-mail body. %1$s is a username,
+#. TRANS: %2$s is the StatusNet sitename, %3$s is the site contact e-mail address.
+#, php-format
+msgid ""
+"Hi %1$s,\n"
+"\n"
+"We have noticed you have deauthorized the Facebook connection for your\n"
+"%2$s account.  You have not set a password for your %2$s account yet, so\n"
+"you will not be able to login. If you wish to continue using your %2$s\n"
+"account, please contact the site administrator (%3$s) to set a password.\n"
+"\n"
+"Sincerely,\n"
+"\n"
+"%2$s\n"
+msgstr ""
+"Hola %1$s,\n"
+"\n"
+"Hemos notado que ha desautorizado la conexión mediante Facebook para su "
+"cuenta %2$s.  Aun no ha definido una contraseña para su cuenta %2$s, por lo "
+"que no podrá iniciar sesión. Si desea seguir utilizando su cuenta %2$s, "
+"póngase en contacto con el administrador del sitio (%3$s) para definir una "
+"contraseña.\n"
+"\n"
+"Sinceramente\n"
+"\n"
+"%2$s\n"
diff --git a/plugins/FacebookBridge/locale/eu/LC_MESSAGES/FacebookBridge.po b/plugins/FacebookBridge/locale/eu/LC_MESSAGES/FacebookBridge.po
new file mode 100644
index 0000000000..526e66df77
--- /dev/null
+++ b/plugins/FacebookBridge/locale/eu/LC_MESSAGES/FacebookBridge.po
@@ -0,0 +1,369 @@
+# Translation of StatusNet - FacebookBridge to Basque (euskara)
+# Exported from translatewiki.net
+#
+# Author: Artsuaga
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - FacebookBridge\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:33+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2012-04-19 14:01:11+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Client error displayed when trying to login while already logged in.
+msgid "Already logged in."
+msgstr "Dagoeneko saioa hasita."
+
+#. TRANS: Form instructions.
+msgid "Login with your Facebook Account"
+msgstr "Saioa hasi zure Facebook kontuarekin"
+
+#. TRANS: Page title.
+#. TRANS: Alt text for "Login with Facebook" image.
+msgid "Login with Facebook"
+msgstr "Saioa hasi Facebookekin"
+
+#. TRANS: Title for "Login with Facebook" image.
+msgid "Login with Facebook."
+msgstr "Saioa hasi Facebookekin."
+
+#. TRANS: Title for Facebook administration panel.
+msgctxt "TITLE"
+msgid "Facebook integration settings"
+msgstr "Integrazio aukerak Facebookekin"
+
+#. TRANS: Instruction for Facebook administration panel.
+msgid "Facebook integration settings"
+msgstr "Integrazio aukerak Facebookekin"
+
+#. TRANS: Client error displayed when providing too long a Facebook application ID.
+msgid "Invalid Facebook ID. Maximum length is 255 characters."
+msgstr "Facebook ID baliogabea. Luzera maximoa 255 karakterekoa da."
+
+#. TRANS: Client error displayed when providing too long a Facebook secret key.
+msgid "Invalid Facebook secret. Maximum length is 255 characters."
+msgstr "Facebook sekretu baliogabea. Luzera maximoa 255 karakterekoa da."
+
+#. TRANS: Fieldset legend.
+msgid "Facebook application settings"
+msgstr "Aplikazio aukerak Facebookekin"
+
+#. TRANS: Field label for Facebook application ID.
+msgid "Application ID"
+msgstr "Aplikazio IDa"
+
+#. TRANS: Field title for Facebook application ID.
+msgid "ID of your Facebook application."
+msgstr "Zure Facebook aplikazioaren IDa."
+
+#. TRANS: Field label for Facebook secret key.
+msgid "Secret"
+msgstr "Sekretua"
+
+#. TRANS: Field title for Facebook secret key.
+msgid "Application secret."
+msgstr "Aplikazio sekretua."
+
+#. TRANS: Button text to save Facebook integration settings.
+#. TRANS: Submit button to save synchronisation settings.
+msgctxt "BUTTON"
+msgid "Save"
+msgstr "Gorde"
+
+#. TRANS: Button title to save Facebook integration settings.
+msgid "Save Facebook settings."
+msgstr "Gorde Facebook aukerak."
+
+#. TRANS: Client error displayed when the session token does not match or is not given.
+msgid "There was a problem with your session token. Try again, please."
+msgstr "Zure saio tokenarekin arazo bat egon da. Saiatu berriro, mesedez."
+
+#. TRANS: Page title for Facebook settings.
+msgctxt "TITLE"
+msgid "Facebook settings"
+msgstr "Facebook aukerak."
+
+#. TRANS: Instructions for Facebook settings.
+msgid "Facebook settings"
+msgstr "Facebook aukerak."
+
+#. TRANS: Form note. User is connected to facebook.
+msgid "Connected Facebook user"
+msgstr "Konektaturiko Facebook erabiltzailea"
+
+#. TRANS: Checkbox label in Facebook settings.
+msgid "Publish my notices to Facebook."
+msgstr "Argitaratu nere oharrak Facebooken."
+
+#. TRANS: Checkbox label in Facebook settings.
+msgid "Send \"@\" replies to Facebook."
+msgstr "Bidali \"@\" erantzunak Facebookera."
+
+#. TRANS: Fieldset legend for form to disconnect from Facebook.
+msgid "Disconnect my account from Facebook"
+msgstr "Deskonektatu nere kontua Facebooketik"
+
+#. TRANS: Notice in disconnect from Facebook form if user has no local StatusNet password.
+#, php-format
+msgid ""
+"Disconnecting your Faceboook would make it impossible to log in! Please [set "
+"a password](%s) first."
+msgstr ""
+"Zure Facebooketik deskonektatzen bazara ezinezkoa izango da saioa hastea! "
+"Mesedez aurretik [sartu pasahitza](%s)."
+
+#. TRANS: Message displayed when initiating disconnect of a StatusNet user
+#. TRANS: from a Facebook account. %1$s is the StatusNet site name.
+#, php-format
+msgid ""
+"Keep your %1$s account but disconnect from Facebook. You'll use your %1$s "
+"password to log in."
+msgstr ""
+"Mantendu zure %1$s kontua baina Facebooketik deskonektatu. Zure %1$s "
+"pasahitza erabiliko duzu saioa hasteko."
+
+#. TRANS: Submit button.
+msgctxt "BUTTON"
+msgid "Disconnect"
+msgstr "Deskonektatu"
+
+#. TRANS: Notice in case saving of synchronisation preferences fail.
+msgid "There was a problem saving your sync preferences."
+msgstr "Arazo bat egon da zure sinkronizazio hobespenak gordetzerakoan."
+
+#. TRANS: Confirmation that synchronisation settings have been saved into the system.
+msgid "Sync preferences saved."
+msgstr "Sinkronizazio hobespenak gordeta."
+
+#. TRANS: Server error displayed when deleting the link to a Facebook account fails.
+msgid "Could not delete link to Facebook."
+msgstr "Ezin izan da Facebookera esteka ezabatu."
+
+#. TRANS: Confirmation message. StatusNet account was unlinked from Facebook.
+msgid "You have disconnected from Facebook."
+msgstr "Facebooketik deskonektatu zara."
+
+msgid "Unable to authenticate you with Facebook."
+msgstr "Ezin izan zara Facebookekin autentikatu."
+
+#. TRANS: Client error displayed when trying to connect to Facebook while not logged in.
+msgid ""
+"You must be logged into Facebook to register a local account using Facebook."
+msgstr ""
+"Facebooken saioa hasi behar duzu kontu lokal bat Facebookeekin erregistratu "
+"nahi baduzu."
+
+#. TRANS: Client error displayed when trying to connect to a Facebook account that is already linked
+#. TRANS: in the same StatusNet site.
+msgid "There is already a local account linked with that Facebook account."
+msgstr "Dagoeneko kontu lokal bat dago Facebook kontu horrekin loturik."
+
+#. TRANS: Form validation error displayed when user has not agreed to the license.
+msgid "You cannot register if you do not agree to the license."
+msgstr "Ezin duzu izenik eman ez bazaude lizentziarekin ados."
+
+#. TRANS: Form validation error displayed when an unhandled error occurs.
+msgid "An unknown error has occured."
+msgstr "Akats ezezaguna."
+
+#. TRANS: Form instructions for connecting to Facebook.
+#. TRANS: %s is the site name.
+#, php-format
+msgid ""
+"This is the first time you have logged into %s so we must connect your "
+"Facebook to a local account. You can either create a new local account, or "
+"connect with an existing local account."
+msgstr ""
+"Hau da lehenbiziko aldia %s(e)n saioa hasten duzuna, zure Facebook kontua "
+"kontu lokal batekin batuko dugu. Kontu berri bat sor dezakezu baita ere, edo "
+"dagoeneko bat baldin baduzu kontu horrekin konektatu zaitezke."
+
+#. TRANS: Page title.
+msgid "Facebook Setup"
+msgstr "Facebook Konfigurazioa"
+
+#. TRANS: Fieldset legend.
+msgid "Connection options"
+msgstr "Koneksio aukerak"
+
+#. TRANS: %s is the name of the license used by the user for their status updates.
+#, php-format
+msgid ""
+"My text and files are available under %s except this private data: password, "
+"email address, IM address, and phone number."
+msgstr ""
+"Nire testu eta fitxategiak %s lizentziapean daude, datu pribatu hauek izan "
+"ezik: pasahitza, helbide elektronikoa, BM helbidea eta telefono zenbakia."
+
+#. TRANS: Fieldset legend.
+msgid "Create new account"
+msgstr "Sortu kontu berria"
+
+#. TRANS: Form instructions.
+msgid "Create a new user with this nickname."
+msgstr "Sortu erabiltzaile berri bat goitizen honekin."
+
+#. TRANS: Field label.
+msgid "New nickname"
+msgstr "Goitizen berria"
+
+#. TRANS: Field title.
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
+msgstr "1-64 letra xehe edo zenbaki, puntuazio edo espaziorik gabe."
+
+#. TRANS: Submit button to create a new account.
+msgctxt "BUTTON"
+msgid "Create"
+msgstr "Sortu"
+
+#. TRANS: Fieldset legend.
+msgid "Connect existing account"
+msgstr "Konektatu sorturiko kontuarekin"
+
+#. TRANS: Form instructions.
+msgid ""
+"If you already have an account, login with your username and password to "
+"connect it to your Facebook."
+msgstr ""
+"Dagoeneko kontu bat baduzu, hasi saioa zure erabiltzaile eta pasahitzarekin "
+"zure Facebookera konektatzeko."
+
+#. TRANS: Field label.
+msgid "Existing nickname"
+msgstr "Goitizena existitzen da"
+
+#. TRANS: Field label.
+msgid "Password"
+msgstr "Pasahitza"
+
+#. TRANS: Submit button to connect a Facebook account to an existing StatusNet account.
+msgctxt "BUTTON"
+msgid "Connect"
+msgstr "Konektatu"
+
+#. TRANS: Client error trying to register with registrations not allowed.
+#. TRANS: Client error trying to register with registrations 'invite only'.
+msgid "Registration not allowed."
+msgstr "Ezin da izen eman."
+
+#. TRANS: Client error trying to register with an invalid invitation code.
+msgid "Not a valid invitation code."
+msgstr "Gonbidapen kodea ez da baliozkoa."
+
+#. TRANS: Form validation error displayed when picking a nickname that is not allowed.
+msgid "Nickname not allowed."
+msgstr "Goitizen hori ez da onartzen."
+
+#. TRANS: Form validation error displayed when picking a nickname that is already in use.
+msgid "Nickname already in use. Try another one."
+msgstr "Goitizen hori hartua dago. Saiatu beste batekin."
+
+#. TRANS: Server error displayed when connecting to Facebook fails.
+msgid "Error connecting user to Facebook."
+msgstr "Akatsa erabiltzailea Facebookera konektatzean."
+
+#. TRANS: Form validation error displayed when username/password combination is incorrect.
+msgid "Invalid username or password."
+msgstr "Erabiltzaile edo pasahitz baliogabea."
+
+#. TRANS: Menu item for "Facebook" in administration panel.
+#. TRANS: Menu item for "Facebook" in user settings.
+msgctxt "MENU"
+msgid "Facebook"
+msgstr "Facebook"
+
+#. TRANS: Menu title for "Facebook" login.
+msgid "Login or register using Facebook."
+msgstr "Saioa hasi edo erregistratu Facebook erabiliz."
+
+#. TRANS: Menu title for "Facebook" in administration panel.
+msgid "Facebook integration configuration."
+msgstr "Facebook integrazio konfigurazioa."
+
+#. TRANS: Menu title for "Facebook" in user settings.
+msgid "Facebook settings."
+msgstr "Facebook aukerak."
+
+#. TRANS: Plugin description.
+msgid "A plugin for integrating StatusNet with Facebook."
+msgstr "StatusNet Facebookekin lotzeko plugina."
+
+#. TRANS: E-mail subject.
+msgid "Your Facebook connection has been removed"
+msgstr "Zure Facebookera lotura ezabatua izan da"
+
+#. TRANS: E-mail body. %1$s is a username, %2$s is the StatusNet sitename.
+#, php-format
+msgid ""
+"Hi %1$s,\n"
+"\n"
+"We are sorry to inform you we are unable to publish your notice to\n"
+"Facebook, and have removed the connection between your %2$s account and\n"
+"Facebook.\n"
+"\n"
+"This may have happened because you have removed permission for %2$s\n"
+"to post on your behalf, or perhaps you have deactivated your Facebook\n"
+"account. You can reconnect your %2$s account to Facebook at any time by\n"
+"logging in with Facebook again.\n"
+"\n"
+"Sincerely,\n"
+"\n"
+"%2$s\n"
+msgstr ""
+"Kaixo %1$s,\n"
+"\n"
+"Sentitzen dugu jakinarazi behar izatea zure oharra Facebooken ezin izan "
+"dugula argitaratu \n"
+"eta zure %2$s(e)ko kontua eta Facebooken arteko koneksioa ezabatu dela.\n"
+"\n"
+"%2$s(e)ri Facebooken argitaratzeko baimenak kendu dizkiozulako izan daiteke, "
+"edo beharbada\n"
+"zure Facebook kontua ezgaitu duzu. %2$s(e)ko kontua Facebookekin lotu "
+"dezakezu berriro \n"
+"Facebookekin saio hasita.\n"
+"\n"
+"Ondo segi,\n"
+"\n"
+"%2$s\n"
+
+#. TRANS: E-mail subject. %s is the StatusNet sitename.
+#, php-format
+msgid "Contact the %s administrator to retrieve your account"
+msgstr "Kontaktatu %s(e)ko administratzailearekin zure kontua berreskuratzeko"
+
+#. TRANS: E-mail body. %1$s is a username,
+#. TRANS: %2$s is the StatusNet sitename, %3$s is the site contact e-mail address.
+#, php-format
+msgid ""
+"Hi %1$s,\n"
+"\n"
+"We have noticed you have deauthorized the Facebook connection for your\n"
+"%2$s account.  You have not set a password for your %2$s account yet, so\n"
+"you will not be able to login. If you wish to continue using your %2$s\n"
+"account, please contact the site administrator (%3$s) to set a password.\n"
+"\n"
+"Sincerely,\n"
+"\n"
+"%2$s\n"
+msgstr ""
+"Kaixo%1$s,\n"
+"\n"
+"Konturatu gara Facebookekin konektatzeko %2$s(e)ko kontua baliogabetu "
+"duzula. Oraindik ez duzu \n"
+"zure %2$s(e)ko konturako pasahitzik zehaztu, beraz ezingo duzu saiorik hasi. "
+"%2$s(e)ko kontua\n"
+"erabiltzen jarraitu nahi baduzu jar zaitez guneko administratzailearekin (%3"
+"$s) kontaktuan pasahitz\n"
+"bat lortzeko.\n"
+"\n"
+"Ondo segi,\n"
+"\n"
+"%2$s\n"
diff --git a/plugins/FacebookBridge/locale/fr/LC_MESSAGES/FacebookBridge.po b/plugins/FacebookBridge/locale/fr/LC_MESSAGES/FacebookBridge.po
index 4f278811a3..934468d181 100644
--- a/plugins/FacebookBridge/locale/fr/LC_MESSAGES/FacebookBridge.po
+++ b/plugins/FacebookBridge/locale/fr/LC_MESSAGES/FacebookBridge.po
@@ -1,9 +1,11 @@
-# Translation of StatusNet - FacebookBridge to French (Français)
+# Translation of StatusNet - FacebookBridge to French (français)
 # Exported from translatewiki.net
 #
 # Author: Brunoperel
+# Author: Crochet.david
 # Author: Iketsi
 # Author: Od1n
+# Author: Peter17
 # Author: Phoenamandre
 # --
 # This file is distributed under the same license as the StatusNet package.
@@ -12,14 +14,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - FacebookBridge\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:29+0000\n"
-"Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:33+0000\n"
+"Language-Team: French <https://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:26:40+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2012-04-19 14:01:11+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-facebookbridge\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
@@ -121,6 +123,7 @@ msgstr "Envoyer les réponses \"@\" sur Facebook."
 msgid "Disconnect my account from Facebook"
 msgstr "Déconnecter mon compte de Facebook"
 
+#. TRANS: Notice in disconnect from Facebook form if user has no local StatusNet password.
 #, php-format
 msgid ""
 "Disconnecting your Faceboook would make it impossible to log in! Please [set "
@@ -162,6 +165,9 @@ msgstr "Impossible de supprimer le lien vers Facebook."
 msgid "You have disconnected from Facebook."
 msgstr "Vous avez été déconnecté de Facebook."
 
+msgid "Unable to authenticate you with Facebook."
+msgstr "Impossible de vous authentifier avec Facebook."
+
 #. TRANS: Client error displayed when trying to connect to Facebook while not logged in.
 msgid ""
 "You must be logged into Facebook to register a local account using Facebook."
@@ -176,7 +182,7 @@ msgstr "Il existe déjà un compte local lié à ce compte Facebook."
 
 #. TRANS: Form validation error displayed when user has not agreed to the license.
 msgid "You cannot register if you do not agree to the license."
-msgstr "Vous ne pouvez pas vous inscrire si vous n'acceptez pas la licence."
+msgstr "Vous ne pouvez pas vous inscrire si vous n’acceptez pas la licence."
 
 #. TRANS: Form validation error displayed when an unhandled error occurs.
 msgid "An unknown error has occured."
diff --git a/plugins/FacebookBridge/locale/fur/LC_MESSAGES/FacebookBridge.po b/plugins/FacebookBridge/locale/fur/LC_MESSAGES/FacebookBridge.po
index 147612af37..2d61f35b2c 100644
--- a/plugins/FacebookBridge/locale/fur/LC_MESSAGES/FacebookBridge.po
+++ b/plugins/FacebookBridge/locale/fur/LC_MESSAGES/FacebookBridge.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - FacebookBridge to Friulian (Furlan)
+# Translation of StatusNet - FacebookBridge to Friulian (furlan)
 # Exported from translatewiki.net
 #
 # Author: Klenje
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - FacebookBridge\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:29+0000\n"
-"Language-Team: Friulian <http://translatewiki.net/wiki/Portal:fur>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:34+0000\n"
+"Language-Team: Friulian <https://translatewiki.net/wiki/Portal:fur>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:26:40+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2012-04-19 14:01:11+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: fur\n"
 "X-Message-Group: #out-statusnet-plugin-facebookbridge\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -114,6 +114,7 @@ msgstr "Mande lis rispuestis cun \"@\" a Facebook."
 msgid "Disconnect my account from Facebook"
 msgstr ""
 
+#. TRANS: Notice in disconnect from Facebook form if user has no local StatusNet password.
 #, php-format
 msgid ""
 "Disconnecting your Faceboook would make it impossible to log in! Please [set "
@@ -149,6 +150,9 @@ msgstr ""
 msgid "You have disconnected from Facebook."
 msgstr ""
 
+msgid "Unable to authenticate you with Facebook."
+msgstr ""
+
 #. TRANS: Client error displayed when trying to connect to Facebook while not logged in.
 msgid ""
 "You must be logged into Facebook to register a local account using Facebook."
diff --git a/plugins/FacebookBridge/locale/gl/LC_MESSAGES/FacebookBridge.po b/plugins/FacebookBridge/locale/gl/LC_MESSAGES/FacebookBridge.po
new file mode 100644
index 0000000000..7cf35e5794
--- /dev/null
+++ b/plugins/FacebookBridge/locale/gl/LC_MESSAGES/FacebookBridge.po
@@ -0,0 +1,373 @@
+# Translation of StatusNet - FacebookBridge to Galician (galego)
+# Exported from translatewiki.net
+#
+# Author: Toliño
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - FacebookBridge\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:34+0000\n"
+"Language-Team: Galician <https://translatewiki.net/wiki/Portal:gl>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2012-04-19 14:01:11+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: gl\n"
+"X-Message-Group: #out-statusnet-plugin-facebookbridge\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Client error displayed when trying to login while already logged in.
+msgid "Already logged in."
+msgstr "Xa se identificou."
+
+#. TRANS: Form instructions.
+msgid "Login with your Facebook Account"
+msgstr "Acceder coa conta do Facebook"
+
+#. TRANS: Page title.
+#. TRANS: Alt text for "Login with Facebook" image.
+msgid "Login with Facebook"
+msgstr "Acceda co Facebook"
+
+#. TRANS: Title for "Login with Facebook" image.
+msgid "Login with Facebook."
+msgstr "Acceda co Facebook."
+
+#. TRANS: Title for Facebook administration panel.
+msgctxt "TITLE"
+msgid "Facebook integration settings"
+msgstr "Configuración da integración do Facebook"
+
+#. TRANS: Instruction for Facebook administration panel.
+msgid "Facebook integration settings"
+msgstr "Configuración da integración do Facebook"
+
+#. TRANS: Client error displayed when providing too long a Facebook application ID.
+msgid "Invalid Facebook ID. Maximum length is 255 characters."
+msgstr "ID do Facebook incorrecto. A extensión máxima é de 255 caracteres."
+
+#. TRANS: Client error displayed when providing too long a Facebook secret key.
+msgid "Invalid Facebook secret. Maximum length is 255 characters."
+msgstr ""
+"Frase secreta do Facebook incorrecta. A extensión máxima é de 255 caracteres."
+
+#. TRANS: Fieldset legend.
+msgid "Facebook application settings"
+msgstr "Configuración da aplicación do Facebook"
+
+#. TRANS: Field label for Facebook application ID.
+msgid "Application ID"
+msgstr "ID da aplicación"
+
+#. TRANS: Field title for Facebook application ID.
+msgid "ID of your Facebook application."
+msgstr "ID da súa aplicación do Facebook."
+
+#. TRANS: Field label for Facebook secret key.
+msgid "Secret"
+msgstr "Frase secreta"
+
+#. TRANS: Field title for Facebook secret key.
+msgid "Application secret."
+msgstr "Frase secreta da aplicación."
+
+#. TRANS: Button text to save Facebook integration settings.
+#. TRANS: Submit button to save synchronisation settings.
+msgctxt "BUTTON"
+msgid "Save"
+msgstr "Gardar"
+
+#. TRANS: Button title to save Facebook integration settings.
+msgid "Save Facebook settings."
+msgstr "Gardar a configuración do Facebook."
+
+#. TRANS: Client error displayed when the session token does not match or is not given.
+msgid "There was a problem with your session token. Try again, please."
+msgstr "Houbo un erro co seu pase. Inténteo de novo."
+
+#. TRANS: Page title for Facebook settings.
+msgctxt "TITLE"
+msgid "Facebook settings"
+msgstr "Configuración do Facebook"
+
+#. TRANS: Instructions for Facebook settings.
+msgid "Facebook settings"
+msgstr "Configuración do Facebook"
+
+#. TRANS: Form note. User is connected to facebook.
+msgid "Connected Facebook user"
+msgstr "Usuario do Facebook conectado"
+
+#. TRANS: Checkbox label in Facebook settings.
+msgid "Publish my notices to Facebook."
+msgstr "Publicar as miñas notas no Facebook."
+
+#. TRANS: Checkbox label in Facebook settings.
+msgid "Send \"@\" replies to Facebook."
+msgstr "Enviar as respostas \"@\" ao Facebook."
+
+#. TRANS: Fieldset legend for form to disconnect from Facebook.
+msgid "Disconnect my account from Facebook"
+msgstr "Desconectar a miña conta do Facebook"
+
+#. TRANS: Notice in disconnect from Facebook form if user has no local StatusNet password.
+#, php-format
+msgid ""
+"Disconnecting your Faceboook would make it impossible to log in! Please [set "
+"a password](%s) first."
+msgstr ""
+"Ao desconectar o Facebook será imposible acceder ao sistema! [Defina un "
+"contrasinal](%s) primeiro."
+
+#. TRANS: Message displayed when initiating disconnect of a StatusNet user
+#. TRANS: from a Facebook account. %1$s is the StatusNet site name.
+#, php-format
+msgid ""
+"Keep your %1$s account but disconnect from Facebook. You'll use your %1$s "
+"password to log in."
+msgstr ""
+"Manter a conta de %1$s pero desconectala do Facebook. Agora usará o seu "
+"contrasinal de %1$s para acceder ao sistema."
+
+#. TRANS: Submit button.
+msgctxt "BUTTON"
+msgid "Disconnect"
+msgstr "Desconectarse"
+
+#. TRANS: Notice in case saving of synchronisation preferences fail.
+msgid "There was a problem saving your sync preferences."
+msgstr "Houbo un problema ao gardar as súas preferencias de sincronización."
+
+#. TRANS: Confirmation that synchronisation settings have been saved into the system.
+msgid "Sync preferences saved."
+msgstr "Gardáronse as preferencias de sincronización."
+
+#. TRANS: Server error displayed when deleting the link to a Facebook account fails.
+msgid "Could not delete link to Facebook."
+msgstr "Non se puido borrar a ligazón co Facebook."
+
+#. TRANS: Confirmation message. StatusNet account was unlinked from Facebook.
+msgid "You have disconnected from Facebook."
+msgstr "Desconectouse do Facebook."
+
+msgid "Unable to authenticate you with Facebook."
+msgstr "Non foi posible facer a autenticación co Facebook."
+
+#. TRANS: Client error displayed when trying to connect to Facebook while not logged in.
+msgid ""
+"You must be logged into Facebook to register a local account using Facebook."
+msgstr ""
+"Cómpre iniciar sesión no Facebook para rexistrar unha conta local a través "
+"do Facebook."
+
+#. TRANS: Client error displayed when trying to connect to a Facebook account that is already linked
+#. TRANS: in the same StatusNet site.
+msgid "There is already a local account linked with that Facebook account."
+msgstr "Xa hai unha conta local ligada con esa conta do Facebook."
+
+#. TRANS: Form validation error displayed when user has not agreed to the license.
+msgid "You cannot register if you do not agree to the license."
+msgstr "Non pode rexistrarse se non acepta a licenza."
+
+#. TRANS: Form validation error displayed when an unhandled error occurs.
+msgid "An unknown error has occured."
+msgstr "Houbo un erro descoñecido."
+
+#. TRANS: Form instructions for connecting to Facebook.
+#. TRANS: %s is the site name.
+#, php-format
+msgid ""
+"This is the first time you have logged into %s so we must connect your "
+"Facebook to a local account. You can either create a new local account, or "
+"connect with an existing local account."
+msgstr ""
+"Esta é a primeira vez que accede ao sistema de %s, de modo que debemos "
+"conectar o seu Facebook cunha conta local. Pode crear unha nova conta local "
+"ou ben conectar con outra conta local existente."
+
+#. TRANS: Page title.
+msgid "Facebook Setup"
+msgstr "Configuración do Facebook"
+
+#. TRANS: Fieldset legend.
+msgid "Connection options"
+msgstr "Opcións de conexión"
+
+#. TRANS: %s is the name of the license used by the user for their status updates.
+#, php-format
+msgid ""
+"My text and files are available under %s except this private data: password, "
+"email address, IM address, and phone number."
+msgstr ""
+"Os meus textos e ficheiros están dispoñibles baixo %s, salvo os seguintes "
+"datos privados: contrasinais, enderezos de correo electrónico e mensaxería "
+"instantánea e números de teléfono."
+
+#. TRANS: Fieldset legend.
+msgid "Create new account"
+msgstr "Crear unha conta nova"
+
+#. TRANS: Form instructions.
+msgid "Create a new user with this nickname."
+msgstr "Crear un novo usuario con este alcume."
+
+#. TRANS: Field label.
+msgid "New nickname"
+msgstr "Novo alcume"
+
+#. TRANS: Field title.
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
+msgstr ""
+"Entre 1 e 64 letras minúsculas ou números, sen signos de puntuación, "
+"espazos, tiles ou eñes."
+
+#. TRANS: Submit button to create a new account.
+msgctxt "BUTTON"
+msgid "Create"
+msgstr "Crear"
+
+#. TRANS: Fieldset legend.
+msgid "Connect existing account"
+msgstr "Conectar cunha conta existente"
+
+#. TRANS: Form instructions.
+msgid ""
+"If you already have an account, login with your username and password to "
+"connect it to your Facebook."
+msgstr ""
+"Se xa ten unha conta, acceda ao sistema co seu nome de usuario e contrasinal "
+"para conectala coa do Facebook."
+
+#. TRANS: Field label.
+msgid "Existing nickname"
+msgstr "Alcume existente"
+
+#. TRANS: Field label.
+msgid "Password"
+msgstr "Contrasinal"
+
+#. TRANS: Submit button to connect a Facebook account to an existing StatusNet account.
+msgctxt "BUTTON"
+msgid "Connect"
+msgstr "Conectar"
+
+#. TRANS: Client error trying to register with registrations not allowed.
+#. TRANS: Client error trying to register with registrations 'invite only'.
+msgid "Registration not allowed."
+msgstr "Non se permite o rexistro."
+
+#. TRANS: Client error trying to register with an invalid invitation code.
+msgid "Not a valid invitation code."
+msgstr "O código da invitación é incorrecto."
+
+#. TRANS: Form validation error displayed when picking a nickname that is not allowed.
+msgid "Nickname not allowed."
+msgstr "Alcume non permitido."
+
+#. TRANS: Form validation error displayed when picking a nickname that is already in use.
+msgid "Nickname already in use. Try another one."
+msgstr "Ese alcume xa está en uso. Probe con outro."
+
+#. TRANS: Server error displayed when connecting to Facebook fails.
+msgid "Error connecting user to Facebook."
+msgstr "Erro ao conectar o usuario co Facebook."
+
+#. TRANS: Form validation error displayed when username/password combination is incorrect.
+msgid "Invalid username or password."
+msgstr "O nome de usuario ou contrasinal non son correctos."
+
+#. TRANS: Menu item for "Facebook" in administration panel.
+#. TRANS: Menu item for "Facebook" in user settings.
+msgctxt "MENU"
+msgid "Facebook"
+msgstr "Facebook"
+
+#. TRANS: Menu title for "Facebook" login.
+msgid "Login or register using Facebook."
+msgstr "Acceda ou rexístrese mediante o Facebook."
+
+#. TRANS: Menu title for "Facebook" in administration panel.
+msgid "Facebook integration configuration."
+msgstr "Configuración da integración do Facebook."
+
+#. TRANS: Menu title for "Facebook" in user settings.
+msgid "Facebook settings."
+msgstr "Configuración do Facebook."
+
+#. TRANS: Plugin description.
+msgid "A plugin for integrating StatusNet with Facebook."
+msgstr "Un complemento para integrar StatusNet co Facebook."
+
+#. TRANS: E-mail subject.
+msgid "Your Facebook connection has been removed"
+msgstr "Eliminouse a súa conexión co Facebook"
+
+#. TRANS: E-mail body. %1$s is a username, %2$s is the StatusNet sitename.
+#, php-format
+msgid ""
+"Hi %1$s,\n"
+"\n"
+"We are sorry to inform you we are unable to publish your notice to\n"
+"Facebook, and have removed the connection between your %2$s account and\n"
+"Facebook.\n"
+"\n"
+"This may have happened because you have removed permission for %2$s\n"
+"to post on your behalf, or perhaps you have deactivated your Facebook\n"
+"account. You can reconnect your %2$s account to Facebook at any time by\n"
+"logging in with Facebook again.\n"
+"\n"
+"Sincerely,\n"
+"\n"
+"%2$s\n"
+msgstr ""
+"Ola, %1$s:\n"
+"\n"
+"Sentimos informar de que somos incapaces de publicar a súa nota no\n"
+"Facebook e de que eliminamos a conexión entre a súa conta de %2$s e o\n"
+"Facebook.\n"
+"\n"
+"Isto puido ocorrer porque eliminou os permisos que %2$s tiña\n"
+"para publicar no seu nome ou quizais desactivou a súa conta do\n"
+"Facebook. Pode volver conectar a súa conta de %2$s coa do Facebook en\n"
+"calquera momento iniciando sesión no Facebook de novo.\n"
+"\n"
+"Atentamente,\n"
+"\n"
+"%2$s\n"
+
+#. TRANS: E-mail subject. %s is the StatusNet sitename.
+#, php-format
+msgid "Contact the %s administrator to retrieve your account"
+msgstr "Póñase en contacto co administrador de %s para recuperar a súa conta"
+
+#. TRANS: E-mail body. %1$s is a username,
+#. TRANS: %2$s is the StatusNet sitename, %3$s is the site contact e-mail address.
+#, php-format
+msgid ""
+"Hi %1$s,\n"
+"\n"
+"We have noticed you have deauthorized the Facebook connection for your\n"
+"%2$s account.  You have not set a password for your %2$s account yet, so\n"
+"you will not be able to login. If you wish to continue using your %2$s\n"
+"account, please contact the site administrator (%3$s) to set a password.\n"
+"\n"
+"Sincerely,\n"
+"\n"
+"%2$s\n"
+msgstr ""
+"Ola, %1$s:\n"
+"\n"
+"Decatámonos de que desautorizou a conexión co Facebook para a súa\n"
+"conta de %2$s. Aínda non definiu un contrasinal para a conta de %2$s,\n"
+"de modo que non poderá iniciar sesión. Se quere seguir usando a súa conta\n"
+"de %2$s, póñase en contacto cun administrador (%3$s) para establecer un "
+"contrasinal.\n"
+"\n"
+"Atentamente,\n"
+"\n"
+"%2$s\n"
diff --git a/plugins/FacebookBridge/locale/ia/LC_MESSAGES/FacebookBridge.po b/plugins/FacebookBridge/locale/ia/LC_MESSAGES/FacebookBridge.po
index fa59b80aaa..dbdf765c90 100644
--- a/plugins/FacebookBridge/locale/ia/LC_MESSAGES/FacebookBridge.po
+++ b/plugins/FacebookBridge/locale/ia/LC_MESSAGES/FacebookBridge.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - FacebookBridge to Interlingua (Interlingua)
+# Translation of StatusNet - FacebookBridge to Interlingua (interlingua)
 # Exported from translatewiki.net
 #
 # Author: McDutchie
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - FacebookBridge\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:29+0000\n"
-"Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:34+0000\n"
+"Language-Team: Interlingua <https://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:26:40+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2012-04-19 14:01:11+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-facebookbridge\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -114,6 +114,7 @@ msgstr "Inviar responsas \"@\" a Facebook."
 msgid "Disconnect my account from Facebook"
 msgstr "Disconnecter mi conto ab Facebook"
 
+#. TRANS: Notice in disconnect from Facebook form if user has no local StatusNet password.
 #, php-format
 msgid ""
 "Disconnecting your Faceboook would make it impossible to log in! Please [set "
@@ -155,6 +156,9 @@ msgstr "Non poteva deler le ligamine a Facebook."
 msgid "You have disconnected from Facebook."
 msgstr "Tu te ha disconnectite de Facebook."
 
+msgid "Unable to authenticate you with Facebook."
+msgstr "Impossibile authenticar te con Facebook."
+
 #. TRANS: Client error displayed when trying to connect to Facebook while not logged in.
 msgid ""
 "You must be logged into Facebook to register a local account using Facebook."
diff --git a/plugins/FacebookBridge/locale/it/LC_MESSAGES/FacebookBridge.po b/plugins/FacebookBridge/locale/it/LC_MESSAGES/FacebookBridge.po
new file mode 100644
index 0000000000..dee6c3c771
--- /dev/null
+++ b/plugins/FacebookBridge/locale/it/LC_MESSAGES/FacebookBridge.po
@@ -0,0 +1,380 @@
+# Translation of StatusNet - FacebookBridge to Italian (italiano)
+# Exported from translatewiki.net
+#
+# Author: Od1n
+# Author: Ximo17
+# Author: 1009
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - FacebookBridge\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:34+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2012-04-19 14:01:11+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Client error displayed when trying to login while already logged in.
+msgid "Already logged in."
+msgstr "Accesso già effettuato."
+
+#. TRANS: Form instructions.
+msgid "Login with your Facebook Account"
+msgstr "Autenticati tramite il tuo account Facebook"
+
+#. TRANS: Page title.
+#. TRANS: Alt text for "Login with Facebook" image.
+msgid "Login with Facebook"
+msgstr "Autenticati tramite Facebook"
+
+#. TRANS: Title for "Login with Facebook" image.
+msgid "Login with Facebook."
+msgstr "Autenticati tramite Facebook."
+
+#. TRANS: Title for Facebook administration panel.
+msgctxt "TITLE"
+msgid "Facebook integration settings"
+msgstr "Integrazione delle impostazioni di Facebook"
+
+#. TRANS: Instruction for Facebook administration panel.
+msgid "Facebook integration settings"
+msgstr "Integrazione delle impostazioni di Facebook"
+
+#. TRANS: Client error displayed when providing too long a Facebook application ID.
+msgid "Invalid Facebook ID. Maximum length is 255 characters."
+msgstr "ID di Facebook non valido. La lunghezza massima è di 255 caratteri."
+
+#. TRANS: Client error displayed when providing too long a Facebook secret key.
+msgid "Invalid Facebook secret. Maximum length is 255 characters."
+msgstr ""
+"Chiave segreta di Facebook non valida. La lunghezza massima è di 255 "
+"caratteri."
+
+#. TRANS: Fieldset legend.
+msgid "Facebook application settings"
+msgstr "Impostazioni dell'applicazione Facebook"
+
+#. TRANS: Field label for Facebook application ID.
+msgid "Application ID"
+msgstr "ID applicazione"
+
+#. TRANS: Field title for Facebook application ID.
+msgid "ID of your Facebook application."
+msgstr "ID dell'applicazione Facebook."
+
+#. TRANS: Field label for Facebook secret key.
+msgid "Secret"
+msgstr "Chiave segreta"
+
+#. TRANS: Field title for Facebook secret key.
+msgid "Application secret."
+msgstr "Chiave segreta dell' applicazione."
+
+#. TRANS: Button text to save Facebook integration settings.
+#. TRANS: Submit button to save synchronisation settings.
+msgctxt "BUTTON"
+msgid "Save"
+msgstr "Salva"
+
+#. TRANS: Button title to save Facebook integration settings.
+msgid "Save Facebook settings."
+msgstr "Salva le impostazioni di Facebook."
+
+#. TRANS: Client error displayed when the session token does not match or is not given.
+msgid "There was a problem with your session token. Try again, please."
+msgstr ""
+"Si è verificato un problema con il tuo token di sessione. Prova di nuovo."
+
+#. TRANS: Page title for Facebook settings.
+msgctxt "TITLE"
+msgid "Facebook settings"
+msgstr "Impostazioni di Facebook"
+
+#. TRANS: Instructions for Facebook settings.
+msgid "Facebook settings"
+msgstr "Impostazioni di Facebook"
+
+#. TRANS: Form note. User is connected to facebook.
+msgid "Connected Facebook user"
+msgstr "Utente Facebook connesso"
+
+#. TRANS: Checkbox label in Facebook settings.
+msgid "Publish my notices to Facebook."
+msgstr "Pubblica le mie notizie su Facebook."
+
+#. TRANS: Checkbox label in Facebook settings.
+msgid "Send \"@\" replies to Facebook."
+msgstr "Invia le \"@\" risposte a Facebook."
+
+#. TRANS: Fieldset legend for form to disconnect from Facebook.
+msgid "Disconnect my account from Facebook"
+msgstr "Disconnetti il mio account da Facebook"
+
+#. TRANS: Notice in disconnect from Facebook form if user has no local StatusNet password.
+#, php-format
+msgid ""
+"Disconnecting your Faceboook would make it impossible to log in! Please [set "
+"a password](%s) first."
+msgstr ""
+"Se disconnetti il tuo account da Facebook non puoi effettuare il login! Per "
+"favore [imposta una password] (%s) prima."
+
+#. TRANS: Message displayed when initiating disconnect of a StatusNet user
+#. TRANS: from a Facebook account. %1$s is the StatusNet site name.
+#, php-format
+msgid ""
+"Keep your %1$s account but disconnect from Facebook. You'll use your %1$s "
+"password to log in."
+msgstr ""
+"Mantieni il tuo account %1$s ma disconnettiti da Facebook. Per accedere "
+"potrai usare la tua password %1$s."
+
+#. TRANS: Submit button.
+msgctxt "BUTTON"
+msgid "Disconnect"
+msgstr "Disconnetti"
+
+#. TRANS: Notice in case saving of synchronisation preferences fail.
+msgid "There was a problem saving your sync preferences."
+msgstr ""
+"Si è verificato un problema durante il salvataggio delle preferenze di "
+"sincronizzazione."
+
+#. TRANS: Confirmation that synchronisation settings have been saved into the system.
+msgid "Sync preferences saved."
+msgstr "Preferenze di sincronizzazione salvate."
+
+#. TRANS: Server error displayed when deleting the link to a Facebook account fails.
+msgid "Could not delete link to Facebook."
+msgstr "Impossibile eliminare il collegamento a Facebook."
+
+#. TRANS: Confirmation message. StatusNet account was unlinked from Facebook.
+msgid "You have disconnected from Facebook."
+msgstr "Sei stato disconnesso da Facebook."
+
+msgid "Unable to authenticate you with Facebook."
+msgstr "Impossibile eseguire l'autenticazione tramite Facebook."
+
+#. TRANS: Client error displayed when trying to connect to Facebook while not logged in.
+msgid ""
+"You must be logged into Facebook to register a local account using Facebook."
+msgstr ""
+"Devi effettuare l'accesso a Facebook per registrare un account locale "
+"utilizzando Facebook."
+
+#. TRANS: Client error displayed when trying to connect to a Facebook account that is already linked
+#. TRANS: in the same StatusNet site.
+msgid "There is already a local account linked with that Facebook account."
+msgstr "Esiste già un account locale collegato a questo account di Facebook."
+
+#. TRANS: Form validation error displayed when user has not agreed to the license.
+msgid "You cannot register if you do not agree to the license."
+msgstr "Non puoi registrarti se non accetti la licenza."
+
+#. TRANS: Form validation error displayed when an unhandled error occurs.
+msgid "An unknown error has occured."
+msgstr "Si è verificato un errore sconosciuto."
+
+#. TRANS: Form instructions for connecting to Facebook.
+#. TRANS: %s is the site name.
+#, php-format
+msgid ""
+"This is the first time you have logged into %s so we must connect your "
+"Facebook to a local account. You can either create a new local account, or "
+"connect with an existing local account."
+msgstr ""
+"Questo è il tuo primo accesso a %s perciò dovremo connettere il tuo account "
+"Facebook ad un account locale. Puoi inoltre creare un nuovo account locale, "
+"o connetterti tramite un account locale già esistente."
+
+#. TRANS: Page title.
+msgid "Facebook Setup"
+msgstr "Installazione di Facebook"
+
+#. TRANS: Fieldset legend.
+msgid "Connection options"
+msgstr "Opzioni di connessione"
+
+#. TRANS: %s is the name of the license used by the user for their status updates.
+#, php-format
+msgid ""
+"My text and files are available under %s except this private data: password, "
+"email address, IM address, and phone number."
+msgstr ""
+"I miei testi e file sono disponibili nei termini di %s a eccezione di questi "
+"dati personali: password, indirizzo email, indirizzo messaggistica "
+"istantanea e numero di telefono."
+
+#. TRANS: Fieldset legend.
+msgid "Create new account"
+msgstr "Crea nuovo account"
+
+#. TRANS: Form instructions.
+msgid "Create a new user with this nickname."
+msgstr "Crea un nuovo utente con questo nickname."
+
+#. TRANS: Field label.
+msgid "New nickname"
+msgstr "Nuovo nickname"
+
+#. TRANS: Field title.
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
+msgstr "1-64 lettere minuscole o numeri, senza punteggiatura o spazi."
+
+#. TRANS: Submit button to create a new account.
+msgctxt "BUTTON"
+msgid "Create"
+msgstr "Crea"
+
+#. TRANS: Fieldset legend.
+msgid "Connect existing account"
+msgstr "Connettere un account esistente"
+
+#. TRANS: Form instructions.
+msgid ""
+"If you already have an account, login with your username and password to "
+"connect it to your Facebook."
+msgstr ""
+"Se hai già un account, effettua l'accesso con lo username e la password "
+"corrispondenti per collegarlo al tuo Facebook."
+
+#. TRANS: Field label.
+msgid "Existing nickname"
+msgstr "Nickname esistente"
+
+#. TRANS: Field label.
+msgid "Password"
+msgstr "Password"
+
+#. TRANS: Submit button to connect a Facebook account to an existing StatusNet account.
+msgctxt "BUTTON"
+msgid "Connect"
+msgstr "Connetti"
+
+#. TRANS: Client error trying to register with registrations not allowed.
+#. TRANS: Client error trying to register with registrations 'invite only'.
+msgid "Registration not allowed."
+msgstr "Registrazione non consentita."
+
+#. TRANS: Client error trying to register with an invalid invitation code.
+msgid "Not a valid invitation code."
+msgstr "Il codice di invito non è valido."
+
+#. TRANS: Form validation error displayed when picking a nickname that is not allowed.
+msgid "Nickname not allowed."
+msgstr "Nickname non consentito."
+
+#. TRANS: Form validation error displayed when picking a nickname that is already in use.
+msgid "Nickname already in use. Try another one."
+msgstr "Nickname già in uso. Provane un altro."
+
+#. TRANS: Server error displayed when connecting to Facebook fails.
+msgid "Error connecting user to Facebook."
+msgstr "Errore durante la connessione dell'utente a Facebook."
+
+#. TRANS: Form validation error displayed when username/password combination is incorrect.
+msgid "Invalid username or password."
+msgstr "Nome utente o password non validi."
+
+#. TRANS: Menu item for "Facebook" in administration panel.
+#. TRANS: Menu item for "Facebook" in user settings.
+msgctxt "MENU"
+msgid "Facebook"
+msgstr "Facebook"
+
+#. TRANS: Menu title for "Facebook" login.
+msgid "Login or register using Facebook."
+msgstr "Accedi o registrati tramite Facebook."
+
+#. TRANS: Menu title for "Facebook" in administration panel.
+msgid "Facebook integration configuration."
+msgstr "Integrazione della configurazione di Facebook."
+
+#. TRANS: Menu title for "Facebook" in user settings.
+msgid "Facebook settings."
+msgstr "Impostazioni di Facebook."
+
+#. TRANS: Plugin description.
+msgid "A plugin for integrating StatusNet with Facebook."
+msgstr "Un plugin per integrare StatusNet con Facebook."
+
+#. TRANS: E-mail subject.
+msgid "Your Facebook connection has been removed"
+msgstr "La tua connessione Facebook è stata rimossa"
+
+#. TRANS: E-mail body. %1$s is a username, %2$s is the StatusNet sitename.
+#, php-format
+msgid ""
+"Hi %1$s,\n"
+"\n"
+"We are sorry to inform you we are unable to publish your notice to\n"
+"Facebook, and have removed the connection between your %2$s account and\n"
+"Facebook.\n"
+"\n"
+"This may have happened because you have removed permission for %2$s\n"
+"to post on your behalf, or perhaps you have deactivated your Facebook\n"
+"account. You can reconnect your %2$s account to Facebook at any time by\n"
+"logging in with Facebook again.\n"
+"\n"
+"Sincerely,\n"
+"\n"
+"%2$s\n"
+msgstr ""
+"Ciao %1$s,\n"
+"\n"
+"Siamo spiacenti di informarti che ci è impossibile pubblicare la tua notizia "
+"su\n"
+"Facebook, e di conseguenza abbiamo dovuto rimuovere il collegamento tra "
+"l'account %2$s e\n"
+"Facebook.\n"
+"\n"
+"Ciò può essere accaduto perché hai rimosso i permessi che consentivano a %2"
+"$s \n"
+"di postare a tuo nome, o forse perché hai disattivato il tuo account di "
+"Facebook. \n"
+"Puoi ricollegare il tuo account %2$s a Facebook, in qualsiasi momento, \n"
+"effettuando nuovamente l'accesso tramite Facebook.\n"
+"\n"
+"Cordiali saluti,\n"
+"\n"
+"%2$s\n"
+
+#. TRANS: E-mail subject. %s is the StatusNet sitename.
+#, php-format
+msgid "Contact the %s administrator to retrieve your account"
+msgstr "Contatta l'amministratore di %s per recuperare il tuo account"
+
+#. TRANS: E-mail body. %1$s is a username,
+#. TRANS: %2$s is the StatusNet sitename, %3$s is the site contact e-mail address.
+#, php-format
+msgid ""
+"Hi %1$s,\n"
+"\n"
+"We have noticed you have deauthorized the Facebook connection for your\n"
+"%2$s account.  You have not set a password for your %2$s account yet, so\n"
+"you will not be able to login. If you wish to continue using your %2$s\n"
+"account, please contact the site administrator (%3$s) to set a password.\n"
+"\n"
+"Sincerely,\n"
+"\n"
+"%2$s\n"
+msgstr ""
+"Ciao %1$s,\n"
+"\n"
+"Abbiamo notato che hai revocato l'autorizzazione a Facebook ad accedere al "
+"tuo account %2$s. \n"
+"Non avendo ancora impostato la password per il tuo account %2$s, non potrai "
+"più accedervi. \n"
+"Se desideri continuare ad utilizzare il tuo account %2$s, ti invitiamo a "
+"contattare l'amministratore \n"
+"del sito (%3$s) per impostare una password.\n"
+"\n"
+"Cordiali saluti,\n"
+"\n"
+"%2$s\n"
diff --git a/plugins/FacebookBridge/locale/mg/LC_MESSAGES/FacebookBridge.po b/plugins/FacebookBridge/locale/mg/LC_MESSAGES/FacebookBridge.po
new file mode 100644
index 0000000000..52381f5961
--- /dev/null
+++ b/plugins/FacebookBridge/locale/mg/LC_MESSAGES/FacebookBridge.po
@@ -0,0 +1,374 @@
+# Translation of StatusNet - FacebookBridge to Malagasy (Malagasy)
+# Exported from translatewiki.net
+#
+# Author: Jagwar
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - FacebookBridge\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:34+0000\n"
+"Language-Team: Malagasy <https://translatewiki.net/wiki/Portal:mg>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2012-04-19 14:01:11+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: mg\n"
+"X-Message-Group: #out-statusnet-plugin-facebookbridge\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#. TRANS: Client error displayed when trying to login while already logged in.
+msgid "Already logged in."
+msgstr "Efa tafiditra."
+
+#. TRANS: Form instructions.
+msgid "Login with your Facebook Account"
+msgstr "Hiditra amin'ny kaontinao Facebook"
+
+#. TRANS: Page title.
+#. TRANS: Alt text for "Login with Facebook" image.
+msgid "Login with Facebook"
+msgstr "Hiditra amin'i Facebook"
+
+#. TRANS: Title for "Login with Facebook" image.
+msgid "Login with Facebook."
+msgstr "Hiditra amin'i Facebook"
+
+#. TRANS: Title for Facebook administration panel.
+msgctxt "TITLE"
+msgid "Facebook integration settings"
+msgstr "Parametatra fampiaraha-mandeha amin'i Facebook"
+
+#. TRANS: Instruction for Facebook administration panel.
+msgid "Facebook integration settings"
+msgstr "Parametatra fampiarah-mandeha amin'i Facebook"
+
+#. TRANS: Client error displayed when providing too long a Facebook application ID.
+msgid "Invalid Facebook ID. Maximum length is 255 characters."
+msgstr ""
+"Hadisoana amin'ny isa mamantatra Facebook. 255 soratra ny halavan'ny ID "
+"farafahabetsany."
+
+#. TRANS: Client error displayed when providing too long a Facebook secret key.
+msgid "Invalid Facebook secret. Maximum length is 255 characters."
+msgstr ""
+"Hadisoana tamin'ny fehezanteny miafina Facebook. 255 soratra ny halavan'ilay "
+"fehezanteny farafahabetsany."
+
+#. TRANS: Fieldset legend.
+msgid "Facebook application settings"
+msgstr "Parametatry ny application Facebook"
+
+#. TRANS: Field label for Facebook application ID.
+msgid "Application ID"
+msgstr "ID ny application"
+
+#. TRANS: Field title for Facebook application ID.
+msgid "ID of your Facebook application."
+msgstr "Isa mamantatra ny application Facebook anao."
+
+#. TRANS: Field label for Facebook secret key.
+msgid "Secret"
+msgstr "Fehezanteny miafina"
+
+#. TRANS: Field title for Facebook secret key.
+msgid "Application secret."
+msgstr "Fehezanteny miafin'ilay application."
+
+#. TRANS: Button text to save Facebook integration settings.
+#. TRANS: Submit button to save synchronisation settings.
+msgctxt "BUTTON"
+msgid "Save"
+msgstr "Tehirizina"
+
+#. TRANS: Button title to save Facebook integration settings.
+msgid "Save Facebook settings."
+msgstr "Hitahiry ny parametatra Facebook."
+
+#. TRANS: Client error displayed when the session token does not match or is not given.
+msgid "There was a problem with your session token. Try again, please."
+msgstr "Nisy olana nitranga tamin'ny fidiranao. Andramo fanindroany azafady."
+
+#. TRANS: Page title for Facebook settings.
+msgctxt "TITLE"
+msgid "Facebook settings"
+msgstr "Parametatra Facebook"
+
+#. TRANS: Instructions for Facebook settings.
+msgid "Facebook settings"
+msgstr "Parametatra Facebook"
+
+#. TRANS: Form note. User is connected to facebook.
+msgid "Connected Facebook user"
+msgstr "Mpikambana Facebook efa tafiditra"
+
+#. TRANS: Checkbox label in Facebook settings.
+msgid "Publish my notices to Facebook."
+msgstr "Avoaka eo amin'i Facebook ny hevitro."
+
+#. TRANS: Checkbox label in Facebook settings.
+msgid "Send \"@\" replies to Facebook."
+msgstr "Alefa eo amin'i Facebook ny valinkafatra \"@\"."
+
+#. TRANS: Fieldset legend for form to disconnect from Facebook.
+msgid "Disconnect my account from Facebook"
+msgstr "Hivoaka amin'i Facebook"
+
+#. TRANS: Notice in disconnect from Facebook form if user has no local StatusNet password.
+#, php-format
+msgid ""
+"Disconnecting your Faceboook would make it impossible to log in! Please [set "
+"a password](%s) first."
+msgstr ""
+"Tsy hahatafitra anao ny fivoahanao amin'i Facebook ! Atsofohy aloha ny "
+"[hampiditra tenimiafina] (%s)"
+
+#. TRANS: Message displayed when initiating disconnect of a StatusNet user
+#. TRANS: from a Facebook account. %1$s is the StatusNet site name.
+#, php-format
+msgid ""
+"Keep your %1$s account but disconnect from Facebook. You'll use your %1$s "
+"password to log in."
+msgstr ""
+"Hitazona ny kaontinao fa hivoaka amin'i Facebook. Azonao ampiasaina ny "
+"tenimafina %1$s rehefa hiditra ianao."
+
+#. TRANS: Submit button.
+msgctxt "BUTTON"
+msgid "Disconnect"
+msgstr "Hivoaka"
+
+#. TRANS: Notice in case saving of synchronisation preferences fail.
+msgid "There was a problem saving your sync preferences."
+msgstr "Niolana nitranga teo ampitahirizana ny safidy sync anao."
+
+#. TRANS: Confirmation that synchronisation settings have been saved into the system.
+msgid "Sync preferences saved."
+msgstr "Voatahiry ny safidy sync."
+
+#. TRANS: Server error displayed when deleting the link to a Facebook account fails.
+msgid "Could not delete link to Facebook."
+msgstr "Tsy afaka mamafa ilay rohy mankany amin'i Facebook."
+
+#. TRANS: Confirmation message. StatusNet account was unlinked from Facebook.
+msgid "You have disconnected from Facebook."
+msgstr "Efa nivoaka tamin'i Facebook ianao"
+
+msgid "Unable to authenticate you with Facebook."
+msgstr ""
+
+#. TRANS: Client error displayed when trying to connect to Facebook while not logged in.
+msgid ""
+"You must be logged into Facebook to register a local account using Facebook."
+msgstr ""
+"Mila tafiditra eo amin'i Facebook ianao mba hahafahanao manokatra kaonty eto "
+"antoerana amin'ny alalan'ny Facebook."
+
+#. TRANS: Client error displayed when trying to connect to a Facebook account that is already linked
+#. TRANS: in the same StatusNet site.
+msgid "There is already a local account linked with that Facebook account."
+msgstr "Efa misy kaonty antoerana ho an'io kaonty Facebook io eto."
+
+#. TRANS: Form validation error displayed when user has not agreed to the license.
+msgid "You cannot register if you do not agree to the license."
+msgstr "Tsy afaka misoratra anarana ianao raha tsy ekenao ny lisansa."
+
+#. TRANS: Form validation error displayed when an unhandled error occurs.
+msgid "An unknown error has occured."
+msgstr "Nisy hadisoana tsy fantatra nitranga."
+
+#. TRANS: Form instructions for connecting to Facebook.
+#. TRANS: %s is the site name.
+#, php-format
+msgid ""
+"This is the first time you have logged into %s so we must connect your "
+"Facebook to a local account. You can either create a new local account, or "
+"connect with an existing local account."
+msgstr ""
+"Voalohany indrindra ianao no miditra eto amin'i %s, izay ny antony idiranao "
+"eo amin'ny eto amin'ny alalan'ny kaonty Facebook anao. Na ianao manokatra "
+"kaonty eto antoerana, na ianao miditra amin'ny alalana kaonty efa misy."
+
+#. TRANS: Page title.
+msgid "Facebook Setup"
+msgstr "Configuration Facebook"
+
+#. TRANS: Fieldset legend.
+msgid "Connection options"
+msgstr "Safidim-pidirana"
+
+#. TRANS: %s is the name of the license used by the user for their status updates.
+#, php-format
+msgid ""
+"My text and files are available under %s except this private data: password, "
+"email address, IM address, and phone number."
+msgstr ""
+"Mitondra ny lisansa %s ny lahatsoratro ary ny rakitro afatsy ireo "
+"fampahalalana tsy sarababembahoaka : tenimiafina, adiresy imailaka, adiresim-"
+"pifandraisana antsoratra mivantana ary ny niomerao telefaona."
+
+#. TRANS: Fieldset legend.
+msgid "Create new account"
+msgstr "Hanokatra kaonty vaovao"
+
+#. TRANS: Form instructions.
+msgid "Create a new user with this nickname."
+msgstr "Hamorona mpikambana vaovao miaraka amin'ilay solonanarana."
+
+#. TRANS: Field label.
+msgid "New nickname"
+msgstr "Solonanarana vaovao"
+
+#. TRANS: Field title.
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
+msgstr "litera zanatsoratra 1 hatramin'ny 63, tsy misy teboteboka na fotsy."
+
+#. TRANS: Submit button to create a new account.
+msgctxt "BUTTON"
+msgid "Create"
+msgstr "Foronona"
+
+#. TRANS: Fieldset legend.
+msgid "Connect existing account"
+msgstr "Hiditra amin'ny kaonty efa misy"
+
+#. TRANS: Form instructions.
+msgid ""
+"If you already have an account, login with your username and password to "
+"connect it to your Facebook."
+msgstr ""
+"Efa manana kaonty ianao eto, midira miaraka amin'ny anaram-pikambanao ary ny "
+"tenimiafina mba hampikambana azy amin'ny kaonty Facebook anao."
+
+#. TRANS: Field label.
+msgid "Existing nickname"
+msgstr "Solonanarana efa misy"
+
+#. TRANS: Field label.
+msgid "Password"
+msgstr "Tenimiafina"
+
+#. TRANS: Submit button to connect a Facebook account to an existing StatusNet account.
+msgctxt "BUTTON"
+msgid "Connect"
+msgstr "Hiditra"
+
+#. TRANS: Client error trying to register with registrations not allowed.
+#. TRANS: Client error trying to register with registrations 'invite only'.
+msgid "Registration not allowed."
+msgstr "Fidirana tsy nahazo alalana"
+
+#. TRANS: Client error trying to register with an invalid invitation code.
+msgid "Not a valid invitation code."
+msgstr "Kaodim-panasaina diso."
+
+#. TRANS: Form validation error displayed when picking a nickname that is not allowed.
+msgid "Nickname not allowed."
+msgstr "Solonanarana tsy ekena."
+
+#. TRANS: Form validation error displayed when picking a nickname that is already in use.
+msgid "Nickname already in use. Try another one."
+msgstr "Solonanarana efa miasa. Makà solonanarana hafa."
+
+#. TRANS: Server error displayed when connecting to Facebook fails.
+msgid "Error connecting user to Facebook."
+msgstr "Hadisoana teo am-pidirana ilay mpikambana teo amin'i Facebook."
+
+#. TRANS: Form validation error displayed when username/password combination is incorrect.
+msgid "Invalid username or password."
+msgstr "Solonanarana na tenimiafina diso."
+
+#. TRANS: Menu item for "Facebook" in administration panel.
+#. TRANS: Menu item for "Facebook" in user settings.
+msgctxt "MENU"
+msgid "Facebook"
+msgstr "Facebook"
+
+#. TRANS: Menu title for "Facebook" login.
+msgid "Login or register using Facebook."
+msgstr "Hisoratra anarana na hiditra amin'ny alalan'i Facebook"
+
+#. TRANS: Menu title for "Facebook" in administration panel.
+msgid "Facebook integration configuration."
+msgstr ""
+
+#. TRANS: Menu title for "Facebook" in user settings.
+msgid "Facebook settings."
+msgstr "Parametatra Facebook"
+
+#. TRANS: Plugin description.
+msgid "A plugin for integrating StatusNet with Facebook."
+msgstr "Plugin iray hampifanaraka an'i StatusNet amin'i Facebook."
+
+#. TRANS: E-mail subject.
+msgid "Your Facebook connection has been removed"
+msgstr "Nalàna ny fidiranao teo amin'i Facebook"
+
+#. TRANS: E-mail body. %1$s is a username, %2$s is the StatusNet sitename.
+#, php-format
+msgid ""
+"Hi %1$s,\n"
+"\n"
+"We are sorry to inform you we are unable to publish your notice to\n"
+"Facebook, and have removed the connection between your %2$s account and\n"
+"Facebook.\n"
+"\n"
+"This may have happened because you have removed permission for %2$s\n"
+"to post on your behalf, or perhaps you have deactivated your Facebook\n"
+"account. You can reconnect your %2$s account to Facebook at any time by\n"
+"logging in with Facebook again.\n"
+"\n"
+"Sincerely,\n"
+"\n"
+"%2$s\n"
+msgstr ""
+"Miarahaba anao %1$s,\n"
+"\n"
+"Miala tsiny aminao izahay fa tsy nahavao ny satanao teo amin'i Facebook, ary "
+"nesorinao ny fidirana amin'ny kaontinao %2$s ary ny fidiranao amin'ny "
+"alalan'i Facebook.\n"
+"\n"
+"Mety mitranga izany raha nesorinao ny fanomezandalan'i %2$s mametraka "
+"hafatra amin'ny anaranao, na mety notapahanao ny kaontinao Facebook. Afaka "
+"miverina miditra amin'ny kaontinao %2$s amin'i Facebook ianao na ohaviana na "
+"ohaviana amin'ny alalan'ny fidiranao eo amin'ny tranonkala Facebook.\n"
+"\n"
+"Misaotra indrindra,\n"
+"\n"
+"%2$s \n"
+
+#. TRANS: E-mail subject. %s is the StatusNet sitename.
+#, php-format
+msgid "Contact the %s administrator to retrieve your account"
+msgstr "Mifandraisa amin'ny mpandrindran'i %s raha hiverina haka ny kaontinao"
+
+#. TRANS: E-mail body. %1$s is a username,
+#. TRANS: %2$s is the StatusNet sitename, %3$s is the site contact e-mail address.
+#, php-format
+msgid ""
+"Hi %1$s,\n"
+"\n"
+"We have noticed you have deauthorized the Facebook connection for your\n"
+"%2$s account.  You have not set a password for your %2$s account yet, so\n"
+"you will not be able to login. If you wish to continue using your %2$s\n"
+"account, please contact the site administrator (%3$s) to set a password.\n"
+"\n"
+"Sincerely,\n"
+"\n"
+"%2$s\n"
+msgstr ""
+"Miarahaba %1$s,\n"
+"\n"
+"Hitanay fa nanala ny fifandraisana amin'ny kaontinao %2$s sy Facebook ianao. "
+"Noho ianao tsy nampiditra tenimiafina ho an'ny kaontinao %2$s hatramin'izao, "
+"tsy havela hiditra ianao. Raha mbola te-hampiasa ny kaontinao ianao, dia "
+"mifandraisa amin'ny mpandrindran'ny tranonkala %3$s mba hampiditra "
+"tenimiafina iray.\n"
+"\n"
+"Misaotra indrindra,\n"
+"\n"
+"%2$s\n"
diff --git a/plugins/FacebookBridge/locale/mk/LC_MESSAGES/FacebookBridge.po b/plugins/FacebookBridge/locale/mk/LC_MESSAGES/FacebookBridge.po
index 1fe0b7fa8f..dc845f96c1 100644
--- a/plugins/FacebookBridge/locale/mk/LC_MESSAGES/FacebookBridge.po
+++ b/plugins/FacebookBridge/locale/mk/LC_MESSAGES/FacebookBridge.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - FacebookBridge to Macedonian (Македон�ки)
+# Translation of StatusNet - FacebookBridge to Macedonian (македон�ки)
 # Exported from translatewiki.net
 #
 # Author: Bjankuloski06
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - FacebookBridge\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:29+0000\n"
-"Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:34+0000\n"
+"Language-Team: Macedonian <https://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:26:40+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2012-04-19 14:01:11+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-facebookbridge\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
@@ -114,6 +114,7 @@ msgstr "И�праќај „@“-одговори на Facebook."
 msgid "Disconnect my account from Facebook"
 msgstr "И�клучи ми ја �метката од Facebook"
 
+#. TRANS: Notice in disconnect from Facebook form if user has no local StatusNet password.
 #, php-format
 msgid ""
 "Disconnecting your Faceboook would make it impossible to log in! Please [set "
@@ -135,7 +136,7 @@ msgstr ""
 #. TRANS: Submit button.
 msgctxt "BUTTON"
 msgid "Disconnect"
-msgstr "И�клучи"
+msgstr "Прекрати"
 
 #. TRANS: Notice in case saving of synchronisation preferences fail.
 msgid "There was a problem saving your sync preferences."
@@ -153,6 +154,9 @@ msgstr "�е можев да ја избришам вр�ката до Facebook.
 msgid "You have disconnected from Facebook."
 msgstr "Сега �те и�клучени од Facebook."
 
+msgid "Unable to authenticate you with Facebook."
+msgstr "�е можам да Ве потврдам �о Facebook."
+
 #. TRANS: Client error displayed when trying to connect to Facebook while not logged in.
 msgid ""
 "You must be logged into Facebook to register a local account using Facebook."
diff --git a/plugins/FacebookBridge/locale/nl/LC_MESSAGES/FacebookBridge.po b/plugins/FacebookBridge/locale/nl/LC_MESSAGES/FacebookBridge.po
index 30a03a18a0..f5338a3bb1 100644
--- a/plugins/FacebookBridge/locale/nl/LC_MESSAGES/FacebookBridge.po
+++ b/plugins/FacebookBridge/locale/nl/LC_MESSAGES/FacebookBridge.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - FacebookBridge\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:29+0000\n"
-"Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:34+0000\n"
+"Language-Team: Dutch <https://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:26:40+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2012-04-19 14:01:11+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-facebookbridge\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -116,6 +116,7 @@ msgstr "Antwoorden met \"@\" naar Facebook verzenden."
 msgid "Disconnect my account from Facebook"
 msgstr "Mijn gebruiker loskoppelen van Facebook"
 
+#. TRANS: Notice in disconnect from Facebook form if user has no local StatusNet password.
 #, php-format
 msgid ""
 "Disconnecting your Faceboook would make it impossible to log in! Please [set "
@@ -157,6 +158,9 @@ msgstr "Het was niet mogelijk de verwijzing naar Facebook te verwijderen."
 msgid "You have disconnected from Facebook."
 msgstr "U bent losgekoppeld van Facebook."
 
+msgid "Unable to authenticate you with Facebook."
+msgstr "Het was niet mogelijk u via Facebook aan te melden."
+
 #. TRANS: Client error displayed when trying to connect to Facebook while not logged in.
 msgid ""
 "You must be logged into Facebook to register a local account using Facebook."
diff --git a/plugins/FacebookBridge/locale/tl/LC_MESSAGES/FacebookBridge.po b/plugins/FacebookBridge/locale/tl/LC_MESSAGES/FacebookBridge.po
index d122cc2e3c..deecb4f66f 100644
--- a/plugins/FacebookBridge/locale/tl/LC_MESSAGES/FacebookBridge.po
+++ b/plugins/FacebookBridge/locale/tl/LC_MESSAGES/FacebookBridge.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - FacebookBridge\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:30+0000\n"
-"Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:35+0000\n"
+"Language-Team: Tagalog <https://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:26:40+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2012-04-19 14:01:11+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-facebookbridge\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -119,6 +119,7 @@ msgstr "Ipadala ang mga tugong \"@\" papunta sa Facebook."
 msgid "Disconnect my account from Facebook"
 msgstr "Huwag iugnay ang akawnt ko mula sa Facebook"
 
+#. TRANS: Notice in disconnect from Facebook form if user has no local StatusNet password.
 #, php-format
 msgid ""
 "Disconnecting your Faceboook would make it impossible to log in! Please [set "
@@ -158,6 +159,9 @@ msgstr "Hindi mabura ang kawing sa Facebook."
 msgid "You have disconnected from Facebook."
 msgstr "Kumalas ka na mula sa Facebook."
 
+msgid "Unable to authenticate you with Facebook."
+msgstr "Hindi ka napatunayan sa Facebook."
+
 #. TRANS: Client error displayed when trying to connect to Facebook while not logged in.
 msgid ""
 "You must be logged into Facebook to register a local account using Facebook."
diff --git a/plugins/FacebookBridge/locale/uk/LC_MESSAGES/FacebookBridge.po b/plugins/FacebookBridge/locale/uk/LC_MESSAGES/FacebookBridge.po
index 9911243e25..6d02907305 100644
--- a/plugins/FacebookBridge/locale/uk/LC_MESSAGES/FacebookBridge.po
+++ b/plugins/FacebookBridge/locale/uk/LC_MESSAGES/FacebookBridge.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - FacebookBridge to Ukrainian (Україн�ька)
+# Translation of StatusNet - FacebookBridge to Ukrainian (україн�ька)
 # Exported from translatewiki.net
 #
 # Author: Boogie
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - FacebookBridge\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:30+0000\n"
-"Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:35+0000\n"
+"Language-Team: Ukrainian <https://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:26:40+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2012-04-19 14:01:11+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-facebookbridge\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
@@ -116,6 +116,7 @@ msgstr "�ад�илати «@» відповіді до Facebook."
 msgid "Disconnect my account from Facebook"
 msgstr "Від’єднати мій акаунт від Facebook"
 
+#. TRANS: Notice in disconnect from Facebook form if user has no local StatusNet password.
 #, php-format
 msgid ""
 "Disconnecting your Faceboook would make it impossible to log in! Please [set "
@@ -155,6 +156,9 @@ msgstr "�е можу видалити по�иланн� на Facebook."
 msgid "You have disconnected from Facebook."
 msgstr "Ви від’єднали�� від Facebook."
 
+msgid "Unable to authenticate you with Facebook."
+msgstr ""
+
 #. TRANS: Client error displayed when trying to connect to Facebook while not logged in.
 msgid ""
 "You must be logged into Facebook to register a local account using Facebook."
diff --git a/plugins/FacebookBridge/locale/zh_CN/LC_MESSAGES/FacebookBridge.po b/plugins/FacebookBridge/locale/zh_CN/LC_MESSAGES/FacebookBridge.po
index d21a77776a..c64c46e3de 100644
--- a/plugins/FacebookBridge/locale/zh_CN/LC_MESSAGES/FacebookBridge.po
+++ b/plugins/FacebookBridge/locale/zh_CN/LC_MESSAGES/FacebookBridge.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - FacebookBridge to Simplified Chinese (‪中文(简体)‬)
+# Translation of StatusNet - FacebookBridge to Simplified Chinese (‪中文（简体）‬)
 # Exported from translatewiki.net
 #
 # Author: Hydra
@@ -9,15 +9,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - FacebookBridge\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:30+0000\n"
-"Language-Team: Simplified Chinese <http://translatewiki.net/wiki/Portal:zh-"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:35+0000\n"
+"Language-Team: Simplified Chinese <https://translatewiki.net/wiki/Portal:zh-"
 "hans>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:26:40+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2012-04-19 14:01:11+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: #out-statusnet-plugin-facebookbridge\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
@@ -123,6 +123,7 @@ msgstr "�� \"@\" Facebook 的答�。"
 msgid "Disconnect my account from Facebook"
 msgstr "从 Facebook 拔下我的账户"
 
+#. TRANS: Notice in disconnect from Facebook form if user has no local StatusNet password.
 #, php-format
 msgid ""
 "Disconnecting your Faceboook would make it impossible to log in! Please [set "
@@ -159,6 +160,9 @@ msgstr "将我的通知�布到 Facebook。"
 msgid "You have disconnected from Facebook."
 msgstr ""
 
+msgid "Unable to authenticate you with Facebook."
+msgstr ""
+
 #. TRANS: Client error displayed when trying to connect to Facebook while not logged in.
 msgid ""
 "You must be logged into Facebook to register a local account using Facebook."
diff --git a/plugins/FirePHP/locale/FirePHP.pot b/plugins/FirePHP/locale/FirePHP.pot
index fac8fdce48..bd9e342997 100644
--- a/plugins/FirePHP/locale/FirePHP.pot
+++ b/plugins/FirePHP/locale/FirePHP.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
+"POT-Creation-Date: 2012-06-30 11:07+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"
diff --git a/plugins/FirePHP/locale/ca/LC_MESSAGES/FirePHP.po b/plugins/FirePHP/locale/ca/LC_MESSAGES/FirePHP.po
index 2a52dcfaa8..03a1cec3c5 100644
--- a/plugins/FirePHP/locale/ca/LC_MESSAGES/FirePHP.po
+++ b/plugins/FirePHP/locale/ca/LC_MESSAGES/FirePHP.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - FirePHP to Catalan (Català)
+# Translation of StatusNet - FirePHP to Catalan (català)
 # Exported from translatewiki.net
 #
 # Author: Solde
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - FirePHP\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:30+0000\n"
-"Language-Team: Catalan <http://translatewiki.net/wiki/Portal:ca>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:35+0000\n"
+"Language-Team: Catalan <https://translatewiki.net/wiki/Portal:ca>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:07:06+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:08+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ca\n"
 "X-Message-Group: #out-statusnet-plugin-firephp\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/FirePHP/locale/de/LC_MESSAGES/FirePHP.po b/plugins/FirePHP/locale/de/LC_MESSAGES/FirePHP.po
index bfae111c73..8a5fd88f2f 100644
--- a/plugins/FirePHP/locale/de/LC_MESSAGES/FirePHP.po
+++ b/plugins/FirePHP/locale/de/LC_MESSAGES/FirePHP.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - FirePHP\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:30+0000\n"
-"Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:35+0000\n"
+"Language-Team: German <https://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:07:06+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:08+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-firephp\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/FirePHP/locale/es/LC_MESSAGES/FirePHP.po b/plugins/FirePHP/locale/es/LC_MESSAGES/FirePHP.po
index 7047f38719..f466a79163 100644
--- a/plugins/FirePHP/locale/es/LC_MESSAGES/FirePHP.po
+++ b/plugins/FirePHP/locale/es/LC_MESSAGES/FirePHP.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - FirePHP to Spanish (Español)
+# Translation of StatusNet - FirePHP to Spanish (español)
 # Exported from translatewiki.net
 #
 # Author: Translationista
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - FirePHP\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:30+0000\n"
-"Language-Team: Spanish <http://translatewiki.net/wiki/Portal:es>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:35+0000\n"
+"Language-Team: Spanish <https://translatewiki.net/wiki/Portal:es>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:07:06+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:08+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-plugin-firephp\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/FirePHP/locale/eu/LC_MESSAGES/FirePHP.po b/plugins/FirePHP/locale/eu/LC_MESSAGES/FirePHP.po
new file mode 100644
index 0000000000..3d6a89263e
--- /dev/null
+++ b/plugins/FirePHP/locale/eu/LC_MESSAGES/FirePHP.po
@@ -0,0 +1,23 @@
+# Translation of StatusNet - FirePHP to Basque (euskara)
+# Exported from translatewiki.net
+#
+# Author: Artsuaga
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - FirePHP\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:35+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:50:08+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin description.
+msgid "The FirePHP plugin writes StatusNet's log output to FirePHP."
+msgstr "FirePHP pluginak StatusNeten erregistro irteera FirePHPn idazten du."
diff --git a/plugins/FirePHP/locale/fi/LC_MESSAGES/FirePHP.po b/plugins/FirePHP/locale/fi/LC_MESSAGES/FirePHP.po
index 3f13f16845..e8d2c62800 100644
--- a/plugins/FirePHP/locale/fi/LC_MESSAGES/FirePHP.po
+++ b/plugins/FirePHP/locale/fi/LC_MESSAGES/FirePHP.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - FirePHP to Finnish (Suomi)
+# Translation of StatusNet - FirePHP to Finnish (suomi)
 # Exported from translatewiki.net
 #
 # Author: Nike
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - FirePHP\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:30+0000\n"
-"Language-Team: Finnish <http://translatewiki.net/wiki/Portal:fi>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:35+0000\n"
+"Language-Team: Finnish <https://translatewiki.net/wiki/Portal:fi>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:07:06+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:08+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: fi\n"
 "X-Message-Group: #out-statusnet-plugin-firephp\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/FirePHP/locale/fr/LC_MESSAGES/FirePHP.po b/plugins/FirePHP/locale/fr/LC_MESSAGES/FirePHP.po
index 2d5bafda95..9eeed02172 100644
--- a/plugins/FirePHP/locale/fr/LC_MESSAGES/FirePHP.po
+++ b/plugins/FirePHP/locale/fr/LC_MESSAGES/FirePHP.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - FirePHP to French (Français)
+# Translation of StatusNet - FirePHP to French (français)
 # Exported from translatewiki.net
 #
 # Author: Peter17
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - FirePHP\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:31+0000\n"
-"Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:35+0000\n"
+"Language-Team: French <https://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:07:06+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:08+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-firephp\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
diff --git a/plugins/FirePHP/locale/gl/LC_MESSAGES/FirePHP.po b/plugins/FirePHP/locale/gl/LC_MESSAGES/FirePHP.po
new file mode 100644
index 0000000000..f4650962a5
--- /dev/null
+++ b/plugins/FirePHP/locale/gl/LC_MESSAGES/FirePHP.po
@@ -0,0 +1,27 @@
+# Translation of StatusNet - FirePHP to Galician (galego)
+# Exported from translatewiki.net
+#
+# Author: Toliño
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - FirePHP\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:36+0000\n"
+"Language-Team: Galician <https://translatewiki.net/wiki/Portal:gl>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:50:08+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: gl\n"
+"X-Message-Group: #out-statusnet-plugin-firephp\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin description.
+msgid "The FirePHP plugin writes StatusNet's log output to FirePHP."
+msgstr ""
+"O complemento FirePHP escribe a saída do rexistro de StatusNet en FirePHP."
diff --git a/plugins/FirePHP/locale/he/LC_MESSAGES/FirePHP.po b/plugins/FirePHP/locale/he/LC_MESSAGES/FirePHP.po
index 6a85f65e64..e96fd7b083 100644
--- a/plugins/FirePHP/locale/he/LC_MESSAGES/FirePHP.po
+++ b/plugins/FirePHP/locale/he/LC_MESSAGES/FirePHP.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - FirePHP\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:31+0000\n"
-"Language-Team: Hebrew <http://translatewiki.net/wiki/Portal:he>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:36+0000\n"
+"Language-Team: Hebrew <https://translatewiki.net/wiki/Portal:he>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:07:06+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:08+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: he\n"
 "X-Message-Group: #out-statusnet-plugin-firephp\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/FirePHP/locale/ia/LC_MESSAGES/FirePHP.po b/plugins/FirePHP/locale/ia/LC_MESSAGES/FirePHP.po
index 8330fb0c61..d3bac3d655 100644
--- a/plugins/FirePHP/locale/ia/LC_MESSAGES/FirePHP.po
+++ b/plugins/FirePHP/locale/ia/LC_MESSAGES/FirePHP.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - FirePHP to Interlingua (Interlingua)
+# Translation of StatusNet - FirePHP to Interlingua (interlingua)
 # Exported from translatewiki.net
 #
 # Author: McDutchie
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - FirePHP\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:31+0000\n"
-"Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:36+0000\n"
+"Language-Team: Interlingua <https://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:07:06+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:08+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-firephp\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/FirePHP/locale/id/LC_MESSAGES/FirePHP.po b/plugins/FirePHP/locale/id/LC_MESSAGES/FirePHP.po
index d4711c1687..3679f78f3d 100644
--- a/plugins/FirePHP/locale/id/LC_MESSAGES/FirePHP.po
+++ b/plugins/FirePHP/locale/id/LC_MESSAGES/FirePHP.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - FirePHP\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:31+0000\n"
-"Language-Team: Indonesian <http://translatewiki.net/wiki/Portal:id>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:36+0000\n"
+"Language-Team: Indonesian <https://translatewiki.net/wiki/Portal:id>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:07:06+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:08+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: id\n"
 "X-Message-Group: #out-statusnet-plugin-firephp\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
diff --git a/plugins/FirePHP/locale/it/LC_MESSAGES/FirePHP.po b/plugins/FirePHP/locale/it/LC_MESSAGES/FirePHP.po
new file mode 100644
index 0000000000..fb77258a8c
--- /dev/null
+++ b/plugins/FirePHP/locale/it/LC_MESSAGES/FirePHP.po
@@ -0,0 +1,23 @@
+# Translation of StatusNet - FirePHP to Italian (italiano)
+# Exported from translatewiki.net
+#
+# Author: Ximo17
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - FirePHP\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:36+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:50:08+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin description.
+msgid "The FirePHP plugin writes StatusNet's log output to FirePHP."
+msgstr "Il plugin FirePHP scrive l'output del registro di StatusNet FirePHP."
diff --git a/plugins/FirePHP/locale/ja/LC_MESSAGES/FirePHP.po b/plugins/FirePHP/locale/ja/LC_MESSAGES/FirePHP.po
index 637d4dd5cf..1ec8bc8b96 100644
--- a/plugins/FirePHP/locale/ja/LC_MESSAGES/FirePHP.po
+++ b/plugins/FirePHP/locale/ja/LC_MESSAGES/FirePHP.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - FirePHP\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:31+0000\n"
-"Language-Team: Japanese <http://translatewiki.net/wiki/Portal:ja>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:36+0000\n"
+"Language-Team: Japanese <https://translatewiki.net/wiki/Portal:ja>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:07:06+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:08+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ja\n"
 "X-Message-Group: #out-statusnet-plugin-firephp\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
diff --git a/plugins/FirePHP/locale/mk/LC_MESSAGES/FirePHP.po b/plugins/FirePHP/locale/mk/LC_MESSAGES/FirePHP.po
index ee200a81cb..e45af82dd6 100644
--- a/plugins/FirePHP/locale/mk/LC_MESSAGES/FirePHP.po
+++ b/plugins/FirePHP/locale/mk/LC_MESSAGES/FirePHP.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - FirePHP to Macedonian (Македон�ки)
+# Translation of StatusNet - FirePHP to Macedonian (македон�ки)
 # Exported from translatewiki.net
 #
 # Author: Bjankuloski06
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - FirePHP\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:31+0000\n"
-"Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:36+0000\n"
+"Language-Team: Macedonian <https://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:07:06+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:08+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-firephp\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
diff --git a/plugins/FirePHP/locale/nb/LC_MESSAGES/FirePHP.po b/plugins/FirePHP/locale/nb/LC_MESSAGES/FirePHP.po
index 912a43399d..50a509ea58 100644
--- a/plugins/FirePHP/locale/nb/LC_MESSAGES/FirePHP.po
+++ b/plugins/FirePHP/locale/nb/LC_MESSAGES/FirePHP.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - FirePHP to Norwegian (bokmål)‬ (‪Norsk (bokmål)‬)
+# Translation of StatusNet - FirePHP to Norwegian Bokmål (‪norsk (bokmål)‬)
 # Exported from translatewiki.net
 #
 # Author: Nghtwlkr
@@ -9,15 +9,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - FirePHP\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:31+0000\n"
-"Language-Team: Norwegian (bokmål)‬ <http://translatewiki.net/wiki/Portal:no>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:36+0000\n"
+"Language-Team: Norwegian Bokmål <https://translatewiki.net/wiki/Portal:nb>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:07:06+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
-"X-Language-Code: no\n"
+"X-POT-Import-Date: 2011-06-05 21:50:08+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: nb\n"
 "X-Message-Group: #out-statusnet-plugin-firephp\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
diff --git a/plugins/FirePHP/locale/nl/LC_MESSAGES/FirePHP.po b/plugins/FirePHP/locale/nl/LC_MESSAGES/FirePHP.po
index 595b57d6ea..d88f3ba5a4 100644
--- a/plugins/FirePHP/locale/nl/LC_MESSAGES/FirePHP.po
+++ b/plugins/FirePHP/locale/nl/LC_MESSAGES/FirePHP.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - FirePHP\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:31+0000\n"
-"Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:36+0000\n"
+"Language-Team: Dutch <https://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:07:06+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:08+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-firephp\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/FirePHP/locale/pt/LC_MESSAGES/FirePHP.po b/plugins/FirePHP/locale/pt/LC_MESSAGES/FirePHP.po
index 0eb8f7f6b8..be87e747fa 100644
--- a/plugins/FirePHP/locale/pt/LC_MESSAGES/FirePHP.po
+++ b/plugins/FirePHP/locale/pt/LC_MESSAGES/FirePHP.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - FirePHP to Portuguese (Português)
+# Translation of StatusNet - FirePHP to Portuguese (português)
 # Exported from translatewiki.net
 #
 # Author: Waldir
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - FirePHP\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:31+0000\n"
-"Language-Team: Portuguese <http://translatewiki.net/wiki/Portal:pt>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:36+0000\n"
+"Language-Team: Portuguese <https://translatewiki.net/wiki/Portal:pt>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:07:06+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:08+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: pt\n"
 "X-Message-Group: #out-statusnet-plugin-firephp\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/FirePHP/locale/ru/LC_MESSAGES/FirePHP.po b/plugins/FirePHP/locale/ru/LC_MESSAGES/FirePHP.po
index 7352126eb6..9540ed63e6 100644
--- a/plugins/FirePHP/locale/ru/LC_MESSAGES/FirePHP.po
+++ b/plugins/FirePHP/locale/ru/LC_MESSAGES/FirePHP.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - FirePHP to Russian (Ру��кий)
+# Translation of StatusNet - FirePHP to Russian (ру��кий)
 # Exported from translatewiki.net
 #
 # Author: �лек�андр Сигачёв
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - FirePHP\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:31+0000\n"
-"Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:37+0000\n"
+"Language-Team: Russian <https://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:07:06+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:08+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-firephp\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
diff --git a/plugins/FirePHP/locale/tl/LC_MESSAGES/FirePHP.po b/plugins/FirePHP/locale/tl/LC_MESSAGES/FirePHP.po
index 0badae8f1e..48bae3ea8f 100644
--- a/plugins/FirePHP/locale/tl/LC_MESSAGES/FirePHP.po
+++ b/plugins/FirePHP/locale/tl/LC_MESSAGES/FirePHP.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - FirePHP\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:31+0000\n"
-"Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:37+0000\n"
+"Language-Team: Tagalog <https://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:07:06+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:08+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-firephp\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/FirePHP/locale/uk/LC_MESSAGES/FirePHP.po b/plugins/FirePHP/locale/uk/LC_MESSAGES/FirePHP.po
index 0053c1c3d5..1cf643de90 100644
--- a/plugins/FirePHP/locale/uk/LC_MESSAGES/FirePHP.po
+++ b/plugins/FirePHP/locale/uk/LC_MESSAGES/FirePHP.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - FirePHP to Ukrainian (Україн�ька)
+# Translation of StatusNet - FirePHP to Ukrainian (україн�ька)
 # Exported from translatewiki.net
 #
 # Author: Boogie
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - FirePHP\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:31+0000\n"
-"Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:37+0000\n"
+"Language-Team: Ukrainian <https://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:07:06+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:08+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-firephp\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
diff --git a/plugins/FirePHP/locale/zh_CN/LC_MESSAGES/FirePHP.po b/plugins/FirePHP/locale/zh_CN/LC_MESSAGES/FirePHP.po
index 59e3f88732..8a04df4790 100644
--- a/plugins/FirePHP/locale/zh_CN/LC_MESSAGES/FirePHP.po
+++ b/plugins/FirePHP/locale/zh_CN/LC_MESSAGES/FirePHP.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - FirePHP to Simplified Chinese (‪中文(简体)‬)
+# Translation of StatusNet - FirePHP to Simplified Chinese (‪中文（简体）‬)
 # Exported from translatewiki.net
 #
 # Author: ZhengYiFeng
@@ -9,15 +9,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - FirePHP\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:31+0000\n"
-"Language-Team: Simplified Chinese <http://translatewiki.net/wiki/Portal:zh-"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:37+0000\n"
+"Language-Team: Simplified Chinese <https://translatewiki.net/wiki/Portal:zh-"
 "hans>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:07:06+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:08+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: #out-statusnet-plugin-firephp\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
diff --git a/plugins/FollowEveryone/locale/FollowEveryone.pot b/plugins/FollowEveryone/locale/FollowEveryone.pot
index b55ebe2270..df6928e1c0 100644
--- a/plugins/FollowEveryone/locale/FollowEveryone.pot
+++ b/plugins/FollowEveryone/locale/FollowEveryone.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
+"POT-Creation-Date: 2012-06-30 11:07+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"
diff --git a/plugins/FollowEveryone/locale/br/LC_MESSAGES/FollowEveryone.po b/plugins/FollowEveryone/locale/br/LC_MESSAGES/FollowEveryone.po
new file mode 100644
index 0000000000..477ce7156f
--- /dev/null
+++ b/plugins/FollowEveryone/locale/br/LC_MESSAGES/FollowEveryone.po
@@ -0,0 +1,30 @@
+# Translation of StatusNet - FollowEveryone to Breton (brezhoneg)
+# Exported from translatewiki.net
+#
+# Author: Y-M D
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - FollowEveryone\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:37+0000\n"
+"Language-Team: Breton <https://translatewiki.net/wiki/Portal:br>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:50:08+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: br\n"
+"X-Message-Group: #out-statusnet-plugin-followeveryone\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#. TRANS: Checkbox label in form for profile settings.
+msgid "Follow everyone"
+msgstr "Heuliañ an holl"
+
+#. TRANS: Plugin description.
+msgid "New users follow everyone at registration and are followed in return."
+msgstr ""
diff --git a/plugins/FollowEveryone/locale/ca/LC_MESSAGES/FollowEveryone.po b/plugins/FollowEveryone/locale/ca/LC_MESSAGES/FollowEveryone.po
new file mode 100644
index 0000000000..917d548ab3
--- /dev/null
+++ b/plugins/FollowEveryone/locale/ca/LC_MESSAGES/FollowEveryone.po
@@ -0,0 +1,31 @@
+# Translation of StatusNet - FollowEveryone to Catalan (català)
+# Exported from translatewiki.net
+#
+# Author: Toniher
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - FollowEveryone\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:37+0000\n"
+"Language-Team: Catalan <https://translatewiki.net/wiki/Portal:ca>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:50:08+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: ca\n"
+"X-Message-Group: #out-statusnet-plugin-followeveryone\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Checkbox label in form for profile settings.
+msgid "Follow everyone"
+msgstr "Segueix a tothom"
+
+#. TRANS: Plugin description.
+msgid "New users follow everyone at registration and are followed in return."
+msgstr ""
+"Els usuaris nous segueixen a tothom en registrar-se i són seguits en retorn."
diff --git a/plugins/FollowEveryone/locale/de/LC_MESSAGES/FollowEveryone.po b/plugins/FollowEveryone/locale/de/LC_MESSAGES/FollowEveryone.po
index 68622962a5..5590dc1d02 100644
--- a/plugins/FollowEveryone/locale/de/LC_MESSAGES/FollowEveryone.po
+++ b/plugins/FollowEveryone/locale/de/LC_MESSAGES/FollowEveryone.po
@@ -10,14 +10,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - FollowEveryone\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:32+0000\n"
-"Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:37+0000\n"
+"Language-Team: German <https://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:27:28+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:08+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-followeveryone\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/FollowEveryone/locale/es/LC_MESSAGES/FollowEveryone.po b/plugins/FollowEveryone/locale/es/LC_MESSAGES/FollowEveryone.po
new file mode 100644
index 0000000000..e3ebcbafd6
--- /dev/null
+++ b/plugins/FollowEveryone/locale/es/LC_MESSAGES/FollowEveryone.po
@@ -0,0 +1,28 @@
+# Translation of StatusNet - FollowEveryone to Spanish (español)
+# Exported from translatewiki.net
+#
+# Author: Armando-Martin
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - FollowEveryone\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:37+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:50:08+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Checkbox label in form for profile settings.
+msgid "Follow everyone"
+msgstr "Seguir a todos"
+
+#. TRANS: Plugin description.
+msgid "New users follow everyone at registration and are followed in return."
+msgstr ""
+"Los nuevos usuarios siguen a todos al registrarse y son seguidos a cambio."
diff --git a/plugins/FollowEveryone/locale/eu/LC_MESSAGES/FollowEveryone.po b/plugins/FollowEveryone/locale/eu/LC_MESSAGES/FollowEveryone.po
new file mode 100644
index 0000000000..26804c5f6f
--- /dev/null
+++ b/plugins/FollowEveryone/locale/eu/LC_MESSAGES/FollowEveryone.po
@@ -0,0 +1,32 @@
+# Translation of StatusNet - FollowEveryone to Basque (euskara)
+# Exported from translatewiki.net
+#
+# Author: Artsuaga
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - FollowEveryone\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:37+0000\n"
+"Language-Team: Basque <https://translatewiki.net/wiki/Portal:eu>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:50:08+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: eu\n"
+"X-Message-Group: #out-statusnet-plugin-followeveryone\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Checkbox label in form for profile settings.
+msgid "Follow everyone"
+msgstr "Jarraitu guztiak"
+
+#. TRANS: Plugin description.
+msgid "New users follow everyone at registration and are followed in return."
+msgstr ""
+"Erabiltzaile berriak izen ematean erabiltzaile zahar guztien jarraitzale eta "
+"alderantziz egiteko."
diff --git a/plugins/FollowEveryone/locale/fi/LC_MESSAGES/FollowEveryone.po b/plugins/FollowEveryone/locale/fi/LC_MESSAGES/FollowEveryone.po
new file mode 100644
index 0000000000..6f0d101ae6
--- /dev/null
+++ b/plugins/FollowEveryone/locale/fi/LC_MESSAGES/FollowEveryone.po
@@ -0,0 +1,30 @@
+# Translation of StatusNet - FollowEveryone to Finnish (suomi)
+# Exported from translatewiki.net
+#
+# Author: Silvonen
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - FollowEveryone\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:37+0000\n"
+"Language-Team: Finnish <https://translatewiki.net/wiki/Portal:fi>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:50:08+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: fi\n"
+"X-Message-Group: #out-statusnet-plugin-followeveryone\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Checkbox label in form for profile settings.
+msgid "Follow everyone"
+msgstr "Seuraa kaikkia"
+
+#. TRANS: Plugin description.
+msgid "New users follow everyone at registration and are followed in return."
+msgstr ""
diff --git a/plugins/FollowEveryone/locale/fr/LC_MESSAGES/FollowEveryone.po b/plugins/FollowEveryone/locale/fr/LC_MESSAGES/FollowEveryone.po
index ef4444ca28..8871681040 100644
--- a/plugins/FollowEveryone/locale/fr/LC_MESSAGES/FollowEveryone.po
+++ b/plugins/FollowEveryone/locale/fr/LC_MESSAGES/FollowEveryone.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - FollowEveryone to French (Français)
+# Translation of StatusNet - FollowEveryone to French (français)
 # Exported from translatewiki.net
 #
 # Author: Od1n
@@ -10,14 +10,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - FollowEveryone\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:32+0000\n"
-"Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:37+0000\n"
+"Language-Team: French <https://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:27:28+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:08+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-followeveryone\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
diff --git a/plugins/FollowEveryone/locale/gl/LC_MESSAGES/FollowEveryone.po b/plugins/FollowEveryone/locale/gl/LC_MESSAGES/FollowEveryone.po
new file mode 100644
index 0000000000..b0d0a6e388
--- /dev/null
+++ b/plugins/FollowEveryone/locale/gl/LC_MESSAGES/FollowEveryone.po
@@ -0,0 +1,32 @@
+# Translation of StatusNet - FollowEveryone to Galician (galego)
+# Exported from translatewiki.net
+#
+# Author: Toliño
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - FollowEveryone\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:38+0000\n"
+"Language-Team: Galician <https://translatewiki.net/wiki/Portal:gl>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:50:08+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: gl\n"
+"X-Message-Group: #out-statusnet-plugin-followeveryone\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Checkbox label in form for profile settings.
+msgid "Follow everyone"
+msgstr "Seguir a todos"
+
+#. TRANS: Plugin description.
+msgid "New users follow everyone at registration and are followed in return."
+msgstr ""
+"Os novos usuarios siguen a todos durante o rexistro e, a cambio, son "
+"seguidos."
diff --git a/plugins/FollowEveryone/locale/he/LC_MESSAGES/FollowEveryone.po b/plugins/FollowEveryone/locale/he/LC_MESSAGES/FollowEveryone.po
index 07bff3ffe6..198efe036a 100644
--- a/plugins/FollowEveryone/locale/he/LC_MESSAGES/FollowEveryone.po
+++ b/plugins/FollowEveryone/locale/he/LC_MESSAGES/FollowEveryone.po
@@ -1,6 +1,7 @@
 # Translation of StatusNet - FollowEveryone to Hebrew (עברית)
 # Exported from translatewiki.net
 #
+# Author: Amire80
 # Author: YaronSh
 # --
 # This file is distributed under the same license as the StatusNet package.
@@ -9,21 +10,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - FollowEveryone\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:32+0000\n"
-"Language-Team: Hebrew <http://translatewiki.net/wiki/Portal:he>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:38+0000\n"
+"Language-Team: Hebrew <https://translatewiki.net/wiki/Portal:he>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:27:28+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:08+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: he\n"
 "X-Message-Group: #out-statusnet-plugin-followeveryone\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANS: Checkbox label in form for profile settings.
 msgid "Follow everyone"
-msgstr ""
+msgstr "לעקוב �חרי כול�"
 
 #. TRANS: Plugin description.
 msgid "New users follow everyone at registration and are followed in return."
diff --git a/plugins/FollowEveryone/locale/ia/LC_MESSAGES/FollowEveryone.po b/plugins/FollowEveryone/locale/ia/LC_MESSAGES/FollowEveryone.po
index 1f8f5406b2..b976924c57 100644
--- a/plugins/FollowEveryone/locale/ia/LC_MESSAGES/FollowEveryone.po
+++ b/plugins/FollowEveryone/locale/ia/LC_MESSAGES/FollowEveryone.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - FollowEveryone to Interlingua (Interlingua)
+# Translation of StatusNet - FollowEveryone to Interlingua (interlingua)
 # Exported from translatewiki.net
 #
 # Author: McDutchie
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - FollowEveryone\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:32+0000\n"
-"Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:38+0000\n"
+"Language-Team: Interlingua <https://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:27:28+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:08+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-followeveryone\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/FollowEveryone/locale/it/LC_MESSAGES/FollowEveryone.po b/plugins/FollowEveryone/locale/it/LC_MESSAGES/FollowEveryone.po
new file mode 100644
index 0000000000..1193694389
--- /dev/null
+++ b/plugins/FollowEveryone/locale/it/LC_MESSAGES/FollowEveryone.po
@@ -0,0 +1,29 @@
+# Translation of StatusNet - FollowEveryone to Italian (italiano)
+# Exported from translatewiki.net
+#
+# Author: Ximo17
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - FollowEveryone\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:38+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:50:08+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Checkbox label in form for profile settings.
+msgid "Follow everyone"
+msgstr "Segui tutti"
+
+#. TRANS: Plugin description.
+msgid "New users follow everyone at registration and are followed in return."
+msgstr ""
+"I nuovi utenti seguono tutti al momento della registrazione e in cambio sono "
+"seguiti."
diff --git a/plugins/FollowEveryone/locale/mk/LC_MESSAGES/FollowEveryone.po b/plugins/FollowEveryone/locale/mk/LC_MESSAGES/FollowEveryone.po
index 39973d6370..583a12b8b0 100644
--- a/plugins/FollowEveryone/locale/mk/LC_MESSAGES/FollowEveryone.po
+++ b/plugins/FollowEveryone/locale/mk/LC_MESSAGES/FollowEveryone.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - FollowEveryone to Macedonian (Македон�ки)
+# Translation of StatusNet - FollowEveryone to Macedonian (македон�ки)
 # Exported from translatewiki.net
 #
 # Author: Bjankuloski06
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - FollowEveryone\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:32+0000\n"
-"Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:38+0000\n"
+"Language-Team: Macedonian <https://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:27:28+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:08+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-followeveryone\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
diff --git a/plugins/FollowEveryone/locale/nl/LC_MESSAGES/FollowEveryone.po b/plugins/FollowEveryone/locale/nl/LC_MESSAGES/FollowEveryone.po
index 4ae699ccb3..c0e92e3f54 100644
--- a/plugins/FollowEveryone/locale/nl/LC_MESSAGES/FollowEveryone.po
+++ b/plugins/FollowEveryone/locale/nl/LC_MESSAGES/FollowEveryone.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - FollowEveryone\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:32+0000\n"
-"Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:38+0000\n"
+"Language-Team: Dutch <https://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:27:28+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:08+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-followeveryone\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/FollowEveryone/locale/pl/LC_MESSAGES/FollowEveryone.po b/plugins/FollowEveryone/locale/pl/LC_MESSAGES/FollowEveryone.po
new file mode 100644
index 0000000000..1b3c6b9adb
--- /dev/null
+++ b/plugins/FollowEveryone/locale/pl/LC_MESSAGES/FollowEveryone.po
@@ -0,0 +1,30 @@
+# Translation of StatusNet - FollowEveryone to Polish (polski)
+# Exported from translatewiki.net
+#
+# Author: BeginaFelicysym
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - FollowEveryone\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:38+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:50:08+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=3; plural=(n == 1) ? 0 : ( (n%10 >= 2 && n%10 <= 4 && "
+"(n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
+
+#. TRANS: Checkbox label in form for profile settings.
+msgid "Follow everyone"
+msgstr "Obserwuj wszystkich"
+
+#. TRANS: Plugin description.
+msgid "New users follow everyone at registration and are followed in return."
+msgstr ""
+"Nowi użytkownicy obserwują wszystkich przy rejestracji i są również "
+"obserwowani."
diff --git a/plugins/FollowEveryone/locale/pt/LC_MESSAGES/FollowEveryone.po b/plugins/FollowEveryone/locale/pt/LC_MESSAGES/FollowEveryone.po
index 1146b33c52..01ffe8d9c3 100644
--- a/plugins/FollowEveryone/locale/pt/LC_MESSAGES/FollowEveryone.po
+++ b/plugins/FollowEveryone/locale/pt/LC_MESSAGES/FollowEveryone.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - FollowEveryone to Portuguese (Português)
+# Translation of StatusNet - FollowEveryone to Portuguese (português)
 # Exported from translatewiki.net
 #
 # Author: Waldir
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - FollowEveryone\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:32+0000\n"
-"Language-Team: Portuguese <http://translatewiki.net/wiki/Portal:pt>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:38+0000\n"
+"Language-Team: Portuguese <https://translatewiki.net/wiki/Portal:pt>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:27:28+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:08+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: pt\n"
 "X-Message-Group: #out-statusnet-plugin-followeveryone\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/FollowEveryone/locale/ru/LC_MESSAGES/FollowEveryone.po b/plugins/FollowEveryone/locale/ru/LC_MESSAGES/FollowEveryone.po
index b14ea1a1fb..607b3bc1b4 100644
--- a/plugins/FollowEveryone/locale/ru/LC_MESSAGES/FollowEveryone.po
+++ b/plugins/FollowEveryone/locale/ru/LC_MESSAGES/FollowEveryone.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - FollowEveryone to Russian (Ру��кий)
+# Translation of StatusNet - FollowEveryone to Russian (ру��кий)
 # Exported from translatewiki.net
 #
 # Author: Lockal
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - FollowEveryone\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:32+0000\n"
-"Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:38+0000\n"
+"Language-Team: Russian <https://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:27:28+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:08+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-followeveryone\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
diff --git a/plugins/FollowEveryone/locale/tl/LC_MESSAGES/FollowEveryone.po b/plugins/FollowEveryone/locale/tl/LC_MESSAGES/FollowEveryone.po
index 2167872059..718088cab6 100644
--- a/plugins/FollowEveryone/locale/tl/LC_MESSAGES/FollowEveryone.po
+++ b/plugins/FollowEveryone/locale/tl/LC_MESSAGES/FollowEveryone.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - FollowEveryone\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:32+0000\n"
-"Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:38+0000\n"
+"Language-Team: Tagalog <https://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:27:28+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:08+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-followeveryone\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/FollowEveryone/locale/uk/LC_MESSAGES/FollowEveryone.po b/plugins/FollowEveryone/locale/uk/LC_MESSAGES/FollowEveryone.po
index 6deee1039e..474edb5e30 100644
--- a/plugins/FollowEveryone/locale/uk/LC_MESSAGES/FollowEveryone.po
+++ b/plugins/FollowEveryone/locale/uk/LC_MESSAGES/FollowEveryone.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - FollowEveryone to Ukrainian (Україн�ька)
+# Translation of StatusNet - FollowEveryone to Ukrainian (україн�ька)
 # Exported from translatewiki.net
 #
 # Author: Boogie
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - FollowEveryone\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:32+0000\n"
-"Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:38+0000\n"
+"Language-Team: Ukrainian <https://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:27:28+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:08+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-followeveryone\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
diff --git a/plugins/ForceGroup/locale/ForceGroup.pot b/plugins/ForceGroup/locale/ForceGroup.pot
index 9a7d528f7a..bbdc40543f 100644
--- a/plugins/ForceGroup/locale/ForceGroup.pot
+++ b/plugins/ForceGroup/locale/ForceGroup.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
+"POT-Creation-Date: 2012-06-30 11:07+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"
diff --git a/plugins/ForceGroup/locale/br/LC_MESSAGES/ForceGroup.po b/plugins/ForceGroup/locale/br/LC_MESSAGES/ForceGroup.po
index 4ea4ac511c..9effb9a41e 100644
--- a/plugins/ForceGroup/locale/br/LC_MESSAGES/ForceGroup.po
+++ b/plugins/ForceGroup/locale/br/LC_MESSAGES/ForceGroup.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - ForceGroup to Breton (Brezhoneg)
+# Translation of StatusNet - ForceGroup to Breton (brezhoneg)
 # Exported from translatewiki.net
 #
 # Author: Y-M D
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ForceGroup\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:33+0000\n"
-"Language-Team: Breton <http://translatewiki.net/wiki/Portal:br>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:38+0000\n"
+"Language-Team: Breton <https://translatewiki.net/wiki/Portal:br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:07:08+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:09+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-forcegroup\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
diff --git a/plugins/ForceGroup/locale/ca/LC_MESSAGES/ForceGroup.po b/plugins/ForceGroup/locale/ca/LC_MESSAGES/ForceGroup.po
new file mode 100644
index 0000000000..2063580749
--- /dev/null
+++ b/plugins/ForceGroup/locale/ca/LC_MESSAGES/ForceGroup.po
@@ -0,0 +1,34 @@
+# Translation of StatusNet - ForceGroup to Catalan (català)
+# Exported from translatewiki.net
+#
+# Author: Toniher
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - ForceGroup\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:38+0000\n"
+"Language-Team: Catalan <https://translatewiki.net/wiki/Portal:ca>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:50:09+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: ca\n"
+"X-Message-Group: #out-statusnet-plugin-forcegroup\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Server exception.
+#. TRANS: %1$s is a user nickname, %2$s is a group nickname.
+#, php-format
+msgid "Could not join user %1$s to group %2$s."
+msgstr "No s'ha pogut unir l'usuari %1$s al grup %2$s."
+
+#. TRANS: Plugin description.
+msgid ""
+"Allows forced group memberships and forces all notices to appear in groups "
+"that users were forced in."
+msgstr ""
diff --git a/plugins/ForceGroup/locale/de/LC_MESSAGES/ForceGroup.po b/plugins/ForceGroup/locale/de/LC_MESSAGES/ForceGroup.po
index 1295b57b43..3f2335857b 100644
--- a/plugins/ForceGroup/locale/de/LC_MESSAGES/ForceGroup.po
+++ b/plugins/ForceGroup/locale/de/LC_MESSAGES/ForceGroup.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ForceGroup\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:33+0000\n"
-"Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:38+0000\n"
+"Language-Team: German <https://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:07:08+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:09+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-forcegroup\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/ForceGroup/locale/es/LC_MESSAGES/ForceGroup.po b/plugins/ForceGroup/locale/es/LC_MESSAGES/ForceGroup.po
index 9d88e96ee2..719d81f824 100644
--- a/plugins/ForceGroup/locale/es/LC_MESSAGES/ForceGroup.po
+++ b/plugins/ForceGroup/locale/es/LC_MESSAGES/ForceGroup.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - ForceGroup to Spanish (Español)
+# Translation of StatusNet - ForceGroup to Spanish (español)
 # Exported from translatewiki.net
 #
 # Author: Translationista
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ForceGroup\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:33+0000\n"
-"Language-Team: Spanish <http://translatewiki.net/wiki/Portal:es>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:38+0000\n"
+"Language-Team: Spanish <https://translatewiki.net/wiki/Portal:es>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:07:08+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:09+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-plugin-forcegroup\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/ForceGroup/locale/eu/LC_MESSAGES/ForceGroup.po b/plugins/ForceGroup/locale/eu/LC_MESSAGES/ForceGroup.po
new file mode 100644
index 0000000000..66bf175a61
--- /dev/null
+++ b/plugins/ForceGroup/locale/eu/LC_MESSAGES/ForceGroup.po
@@ -0,0 +1,33 @@
+# Translation of StatusNet - ForceGroup to Basque (euskara)
+# Exported from translatewiki.net
+#
+# Author: Artsuaga
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - ForceGroup\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:39+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:50:09+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Server exception.
+#. TRANS: %1$s is a user nickname, %2$s is a group nickname.
+#, php-format
+msgid "Could not join user %1$s to group %2$s."
+msgstr "%1$s erabiltzailea ezin izan da %2$s taldera gehitu."
+
+#. TRANS: Plugin description.
+msgid ""
+"Allows forced group memberships and forces all notices to appear in groups "
+"that users were forced in."
+msgstr ""
+"<a href=\"http://www.google.com/analytics/\">Google Analytics</a> erabiltzen "
+"du web gunera atzipenak jarraitu ahal izateko."
diff --git a/plugins/ForceGroup/locale/fr/LC_MESSAGES/ForceGroup.po b/plugins/ForceGroup/locale/fr/LC_MESSAGES/ForceGroup.po
index 877a5b5289..fef9c40311 100644
--- a/plugins/ForceGroup/locale/fr/LC_MESSAGES/ForceGroup.po
+++ b/plugins/ForceGroup/locale/fr/LC_MESSAGES/ForceGroup.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - ForceGroup to French (Français)
+# Translation of StatusNet - ForceGroup to French (français)
 # Exported from translatewiki.net
 #
 # Author: Peter17
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ForceGroup\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:33+0000\n"
-"Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:39+0000\n"
+"Language-Team: French <https://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:07:08+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:09+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-forcegroup\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
diff --git a/plugins/ForceGroup/locale/gl/LC_MESSAGES/ForceGroup.po b/plugins/ForceGroup/locale/gl/LC_MESSAGES/ForceGroup.po
new file mode 100644
index 0000000000..0ae73c734b
--- /dev/null
+++ b/plugins/ForceGroup/locale/gl/LC_MESSAGES/ForceGroup.po
@@ -0,0 +1,36 @@
+# Translation of StatusNet - ForceGroup to Galician (galego)
+# Exported from translatewiki.net
+#
+# Author: Toliño
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - ForceGroup\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:39+0000\n"
+"Language-Team: Galician <https://translatewiki.net/wiki/Portal:gl>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:50:09+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: gl\n"
+"X-Message-Group: #out-statusnet-plugin-forcegroup\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Server exception.
+#. TRANS: %1$s is a user nickname, %2$s is a group nickname.
+#, php-format
+msgid "Could not join user %1$s to group %2$s."
+msgstr "O usuario %1$s non se puido engadir ao grupo %2$s."
+
+#. TRANS: Plugin description.
+msgid ""
+"Allows forced group memberships and forces all notices to appear in groups "
+"that users were forced in."
+msgstr ""
+"Permite forzar a inscripción nun grupo e forza a que todas as notas aparezan "
+"nos grupos onde os usuarios se ven forzados a estar."
diff --git a/plugins/ForceGroup/locale/he/LC_MESSAGES/ForceGroup.po b/plugins/ForceGroup/locale/he/LC_MESSAGES/ForceGroup.po
index 04671c3e18..80f07fb5b0 100644
--- a/plugins/ForceGroup/locale/he/LC_MESSAGES/ForceGroup.po
+++ b/plugins/ForceGroup/locale/he/LC_MESSAGES/ForceGroup.po
@@ -1,6 +1,7 @@
 # Translation of StatusNet - ForceGroup to Hebrew (עברית)
 # Exported from translatewiki.net
 #
+# Author: Amire80
 # Author: YaronSh
 # --
 # This file is distributed under the same license as the StatusNet package.
@@ -9,14 +10,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ForceGroup\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:33+0000\n"
-"Language-Team: Hebrew <http://translatewiki.net/wiki/Portal:he>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:39+0000\n"
+"Language-Team: Hebrew <https://translatewiki.net/wiki/Portal:he>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:07:08+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:09+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: he\n"
 "X-Message-Group: #out-statusnet-plugin-forcegroup\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -32,5 +33,5 @@ msgid ""
 "Allows forced group memberships and forces all notices to appear in groups "
 "that users were forced in."
 msgstr ""
-"מתן ה�פשרות לחברויות מ�ולצות בקבוצות ו�ילוץ הצגת כל ההתרעות בקבוצות �ליהן "
-"�ולצו המשתמשי� להצטרף."
+"מתן ה�פשרות לחברויות מ�ולצות בקבוצות ו�ילוץ הצגת כל העדכוני� בקבוצות "
+"שהמשתמשי� �ולצו להצטרף �ליהן."
diff --git a/plugins/ForceGroup/locale/ia/LC_MESSAGES/ForceGroup.po b/plugins/ForceGroup/locale/ia/LC_MESSAGES/ForceGroup.po
index 41ddb5cf8c..f8c82a9752 100644
--- a/plugins/ForceGroup/locale/ia/LC_MESSAGES/ForceGroup.po
+++ b/plugins/ForceGroup/locale/ia/LC_MESSAGES/ForceGroup.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - ForceGroup to Interlingua (Interlingua)
+# Translation of StatusNet - ForceGroup to Interlingua (interlingua)
 # Exported from translatewiki.net
 #
 # Author: McDutchie
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ForceGroup\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:33+0000\n"
-"Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:39+0000\n"
+"Language-Team: Interlingua <https://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:07:08+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:09+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-forcegroup\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/ForceGroup/locale/id/LC_MESSAGES/ForceGroup.po b/plugins/ForceGroup/locale/id/LC_MESSAGES/ForceGroup.po
index 46e7aee9f6..1752d81292 100644
--- a/plugins/ForceGroup/locale/id/LC_MESSAGES/ForceGroup.po
+++ b/plugins/ForceGroup/locale/id/LC_MESSAGES/ForceGroup.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ForceGroup\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:33+0000\n"
-"Language-Team: Indonesian <http://translatewiki.net/wiki/Portal:id>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:39+0000\n"
+"Language-Team: Indonesian <https://translatewiki.net/wiki/Portal:id>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:07:08+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:09+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: id\n"
 "X-Message-Group: #out-statusnet-plugin-forcegroup\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
diff --git a/plugins/ForceGroup/locale/it/LC_MESSAGES/ForceGroup.po b/plugins/ForceGroup/locale/it/LC_MESSAGES/ForceGroup.po
new file mode 100644
index 0000000000..332bf84a4f
--- /dev/null
+++ b/plugins/ForceGroup/locale/it/LC_MESSAGES/ForceGroup.po
@@ -0,0 +1,34 @@
+# Translation of StatusNet - ForceGroup to Italian (italiano)
+# Exported from translatewiki.net
+#
+# Author: GreenFox
+# Author: Ximo17
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - ForceGroup\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:39+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:50:09+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Server exception.
+#. TRANS: %1$s is a user nickname, %2$s is a group nickname.
+#, php-format
+msgid "Could not join user %1$s to group %2$s."
+msgstr "Impossibile iscrivere l'utente %1$s al gruppo %2$s."
+
+#. TRANS: Plugin description.
+msgid ""
+"Allows forced group memberships and forces all notices to appear in groups "
+"that users were forced in."
+msgstr ""
+"Permette l'iscrizione forzata ad un gruppo e costringe tutti gli avvisi ad "
+"apparire nei gruppi dove gli utenti sono stati iscritti forzatamente."
diff --git a/plugins/ForceGroup/locale/mk/LC_MESSAGES/ForceGroup.po b/plugins/ForceGroup/locale/mk/LC_MESSAGES/ForceGroup.po
index 1b31f3f031..ce5c557b91 100644
--- a/plugins/ForceGroup/locale/mk/LC_MESSAGES/ForceGroup.po
+++ b/plugins/ForceGroup/locale/mk/LC_MESSAGES/ForceGroup.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - ForceGroup to Macedonian (Македон�ки)
+# Translation of StatusNet - ForceGroup to Macedonian (македон�ки)
 # Exported from translatewiki.net
 #
 # Author: Bjankuloski06
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ForceGroup\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:33+0000\n"
-"Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:39+0000\n"
+"Language-Team: Macedonian <https://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:07:08+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:09+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-forcegroup\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
diff --git a/plugins/ForceGroup/locale/nl/LC_MESSAGES/ForceGroup.po b/plugins/ForceGroup/locale/nl/LC_MESSAGES/ForceGroup.po
index b21f28d93e..d78e191c60 100644
--- a/plugins/ForceGroup/locale/nl/LC_MESSAGES/ForceGroup.po
+++ b/plugins/ForceGroup/locale/nl/LC_MESSAGES/ForceGroup.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ForceGroup\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:33+0000\n"
-"Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:39+0000\n"
+"Language-Team: Dutch <https://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:07:08+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:09+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-forcegroup\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/ForceGroup/locale/pt/LC_MESSAGES/ForceGroup.po b/plugins/ForceGroup/locale/pt/LC_MESSAGES/ForceGroup.po
index 3c4df1d7d1..bf43ebfe81 100644
--- a/plugins/ForceGroup/locale/pt/LC_MESSAGES/ForceGroup.po
+++ b/plugins/ForceGroup/locale/pt/LC_MESSAGES/ForceGroup.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - ForceGroup to Portuguese (Português)
+# Translation of StatusNet - ForceGroup to Portuguese (português)
 # Exported from translatewiki.net
 #
 # Author: SandroHc
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ForceGroup\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:33+0000\n"
-"Language-Team: Portuguese <http://translatewiki.net/wiki/Portal:pt>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:40+0000\n"
+"Language-Team: Portuguese <https://translatewiki.net/wiki/Portal:pt>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:07:08+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:09+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: pt\n"
 "X-Message-Group: #out-statusnet-plugin-forcegroup\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/ForceGroup/locale/te/LC_MESSAGES/ForceGroup.po b/plugins/ForceGroup/locale/te/LC_MESSAGES/ForceGroup.po
index 04362c4c9c..9c325708d1 100644
--- a/plugins/ForceGroup/locale/te/LC_MESSAGES/ForceGroup.po
+++ b/plugins/ForceGroup/locale/te/LC_MESSAGES/ForceGroup.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ForceGroup\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:34+0000\n"
-"Language-Team: Telugu <http://translatewiki.net/wiki/Portal:te>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:40+0000\n"
+"Language-Team: Telugu <https://translatewiki.net/wiki/Portal:te>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:07:08+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:09+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: te\n"
 "X-Message-Group: #out-statusnet-plugin-forcegroup\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/ForceGroup/locale/tl/LC_MESSAGES/ForceGroup.po b/plugins/ForceGroup/locale/tl/LC_MESSAGES/ForceGroup.po
index 67d4eec4a5..4dd76d3b19 100644
--- a/plugins/ForceGroup/locale/tl/LC_MESSAGES/ForceGroup.po
+++ b/plugins/ForceGroup/locale/tl/LC_MESSAGES/ForceGroup.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ForceGroup\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:34+0000\n"
-"Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:40+0000\n"
+"Language-Team: Tagalog <https://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:07:08+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:09+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-forcegroup\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/ForceGroup/locale/uk/LC_MESSAGES/ForceGroup.po b/plugins/ForceGroup/locale/uk/LC_MESSAGES/ForceGroup.po
index 23f78c134a..452ed198c9 100644
--- a/plugins/ForceGroup/locale/uk/LC_MESSAGES/ForceGroup.po
+++ b/plugins/ForceGroup/locale/uk/LC_MESSAGES/ForceGroup.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - ForceGroup to Ukrainian (Україн�ька)
+# Translation of StatusNet - ForceGroup to Ukrainian (україн�ька)
 # Exported from translatewiki.net
 #
 # Author: Boogie
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ForceGroup\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:34+0000\n"
-"Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:40+0000\n"
+"Language-Team: Ukrainian <https://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:07:08+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:09+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-forcegroup\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
diff --git a/plugins/GeoURL/locale/GeoURL.pot b/plugins/GeoURL/locale/GeoURL.pot
index 2665c53b19..569b4c82a0 100644
--- a/plugins/GeoURL/locale/GeoURL.pot
+++ b/plugins/GeoURL/locale/GeoURL.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
+"POT-Creation-Date: 2012-06-30 11:07+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"
diff --git a/plugins/GeoURL/locale/ca/LC_MESSAGES/GeoURL.po b/plugins/GeoURL/locale/ca/LC_MESSAGES/GeoURL.po
index fdf0ffae0b..523e75ad88 100644
--- a/plugins/GeoURL/locale/ca/LC_MESSAGES/GeoURL.po
+++ b/plugins/GeoURL/locale/ca/LC_MESSAGES/GeoURL.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - GeoURL to Catalan (Català)
+# Translation of StatusNet - GeoURL to Catalan (català)
 # Exported from translatewiki.net
 #
 # Author: Toniher
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - GeoURL\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:35+0000\n"
-"Language-Team: Catalan <http://translatewiki.net/wiki/Portal:ca>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:41+0000\n"
+"Language-Team: Catalan <https://translatewiki.net/wiki/Portal:ca>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-16 23:17:46+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:15+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ca\n"
 "X-Message-Group: #out-statusnet-plugin-geourl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/GeoURL/locale/de/LC_MESSAGES/GeoURL.po b/plugins/GeoURL/locale/de/LC_MESSAGES/GeoURL.po
index f087e455e6..41dc35425b 100644
--- a/plugins/GeoURL/locale/de/LC_MESSAGES/GeoURL.po
+++ b/plugins/GeoURL/locale/de/LC_MESSAGES/GeoURL.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - GeoURL\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:35+0000\n"
-"Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:41+0000\n"
+"Language-Team: German <https://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-16 23:17:46+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:15+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-geourl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/GeoURL/locale/eo/LC_MESSAGES/GeoURL.po b/plugins/GeoURL/locale/eo/LC_MESSAGES/GeoURL.po
index b2eedcf0fb..9b6263c9c2 100644
--- a/plugins/GeoURL/locale/eo/LC_MESSAGES/GeoURL.po
+++ b/plugins/GeoURL/locale/eo/LC_MESSAGES/GeoURL.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - GeoURL\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:35+0000\n"
-"Language-Team: Esperanto <http://translatewiki.net/wiki/Portal:eo>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:41+0000\n"
+"Language-Team: Esperanto <https://translatewiki.net/wiki/Portal:eo>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-16 23:17:46+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:15+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: eo\n"
 "X-Message-Group: #out-statusnet-plugin-geourl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/GeoURL/locale/es/LC_MESSAGES/GeoURL.po b/plugins/GeoURL/locale/es/LC_MESSAGES/GeoURL.po
index f2f52e2281..dcbedeff48 100644
--- a/plugins/GeoURL/locale/es/LC_MESSAGES/GeoURL.po
+++ b/plugins/GeoURL/locale/es/LC_MESSAGES/GeoURL.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - GeoURL to Spanish (Español)
+# Translation of StatusNet - GeoURL to Spanish (español)
 # Exported from translatewiki.net
 #
 # Author: Translationista
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - GeoURL\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:35+0000\n"
-"Language-Team: Spanish <http://translatewiki.net/wiki/Portal:es>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:42+0000\n"
+"Language-Team: Spanish <https://translatewiki.net/wiki/Portal:es>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-16 23:17:46+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:15+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-plugin-geourl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/GeoURL/locale/eu/LC_MESSAGES/GeoURL.po b/plugins/GeoURL/locale/eu/LC_MESSAGES/GeoURL.po
new file mode 100644
index 0000000000..bca2dd4446
--- /dev/null
+++ b/plugins/GeoURL/locale/eu/LC_MESSAGES/GeoURL.po
@@ -0,0 +1,30 @@
+# Translation of StatusNet - GeoURL to Basque (euskara)
+# Exported from translatewiki.net
+#
+# Author: Artsuaga
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - GeoURL\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:42+0000\n"
+"Language-Team: Basque <https://translatewiki.net/wiki/Portal:eu>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:50:15+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: eu\n"
+"X-Message-Group: #out-statusnet-plugin-geourl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin description.
+msgid ""
+"Ping <a href=\"http://geourl.org/\">GeoURL</a> when new geolocation-enhanced "
+"notices are posted."
+msgstr ""
+"Egin ping <a href=\"http://geourl.org/\">GeoURL</a>ri hobetutako "
+"geolokalizazio ohar berriak argitaratzen diren aldiko."
diff --git a/plugins/GeoURL/locale/fi/LC_MESSAGES/GeoURL.po b/plugins/GeoURL/locale/fi/LC_MESSAGES/GeoURL.po
index 0548183476..56ce4f5573 100644
--- a/plugins/GeoURL/locale/fi/LC_MESSAGES/GeoURL.po
+++ b/plugins/GeoURL/locale/fi/LC_MESSAGES/GeoURL.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - GeoURL to Finnish (Suomi)
+# Translation of StatusNet - GeoURL to Finnish (suomi)
 # Exported from translatewiki.net
 #
 # Author: Nike
@@ -10,14 +10,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - GeoURL\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:35+0000\n"
-"Language-Team: Finnish <http://translatewiki.net/wiki/Portal:fi>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:42+0000\n"
+"Language-Team: Finnish <https://translatewiki.net/wiki/Portal:fi>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-16 23:17:46+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:15+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: fi\n"
 "X-Message-Group: #out-statusnet-plugin-geourl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/GeoURL/locale/fr/LC_MESSAGES/GeoURL.po b/plugins/GeoURL/locale/fr/LC_MESSAGES/GeoURL.po
index ac87e2dba6..ceba2c5390 100644
--- a/plugins/GeoURL/locale/fr/LC_MESSAGES/GeoURL.po
+++ b/plugins/GeoURL/locale/fr/LC_MESSAGES/GeoURL.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - GeoURL to French (Français)
+# Translation of StatusNet - GeoURL to French (français)
 # Exported from translatewiki.net
 #
 # Author: Verdy p
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - GeoURL\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:35+0000\n"
-"Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:42+0000\n"
+"Language-Team: French <https://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-16 23:17:46+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:15+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-geourl\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
diff --git a/plugins/GeoURL/locale/gl/LC_MESSAGES/GeoURL.po b/plugins/GeoURL/locale/gl/LC_MESSAGES/GeoURL.po
new file mode 100644
index 0000000000..4a97d6d112
--- /dev/null
+++ b/plugins/GeoURL/locale/gl/LC_MESSAGES/GeoURL.po
@@ -0,0 +1,30 @@
+# Translation of StatusNet - GeoURL to Galician (galego)
+# Exported from translatewiki.net
+#
+# Author: Toliño
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - GeoURL\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:42+0000\n"
+"Language-Team: Galician <https://translatewiki.net/wiki/Portal:gl>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:50:15+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: gl\n"
+"X-Message-Group: #out-statusnet-plugin-geourl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin description.
+msgid ""
+"Ping <a href=\"http://geourl.org/\">GeoURL</a> when new geolocation-enhanced "
+"notices are posted."
+msgstr ""
+"Ping <a href=\"http://geourl.org/\">GeoURL</a> ao publicar novas notas de "
+"xeolocalización mellorada."
diff --git a/plugins/GeoURL/locale/he/LC_MESSAGES/GeoURL.po b/plugins/GeoURL/locale/he/LC_MESSAGES/GeoURL.po
index bc01e79473..87a107bc47 100644
--- a/plugins/GeoURL/locale/he/LC_MESSAGES/GeoURL.po
+++ b/plugins/GeoURL/locale/he/LC_MESSAGES/GeoURL.po
@@ -1,6 +1,7 @@
 # Translation of StatusNet - GeoURL to Hebrew (עברית)
 # Exported from translatewiki.net
 #
+# Author: Amire80
 # Author: YaronSh
 # --
 # This file is distributed under the same license as the StatusNet package.
@@ -9,14 +10,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - GeoURL\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:36+0000\n"
-"Language-Team: Hebrew <http://translatewiki.net/wiki/Portal:he>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:42+0000\n"
+"Language-Team: Hebrew <https://translatewiki.net/wiki/Portal:he>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-16 23:17:46+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:15+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: he\n"
 "X-Message-Group: #out-statusnet-plugin-geourl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -26,5 +27,5 @@ msgid ""
 "Ping <a href=\"http://geourl.org/\">GeoURL</a> when new geolocation-enhanced "
 "notices are posted."
 msgstr ""
-"שליחת פינג ל־<a href=\"http://geourl.org/\">GeoURL</a> כ�שר מפורסמות התרעות "
-"המועשרות בנתוני מיקו� ג�וגרפי."
+"שליחת פינג ל־<a href=\"http://geourl.org/\">GeoURL</a> כ�שר מפורסמי� עדכוני� "
+"מועשרי� בנתוני מיקו� ג�וגרפי."
diff --git a/plugins/GeoURL/locale/ia/LC_MESSAGES/GeoURL.po b/plugins/GeoURL/locale/ia/LC_MESSAGES/GeoURL.po
index 0dd36cd82d..e3747c5b6b 100644
--- a/plugins/GeoURL/locale/ia/LC_MESSAGES/GeoURL.po
+++ b/plugins/GeoURL/locale/ia/LC_MESSAGES/GeoURL.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - GeoURL to Interlingua (Interlingua)
+# Translation of StatusNet - GeoURL to Interlingua (interlingua)
 # Exported from translatewiki.net
 #
 # Author: McDutchie
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - GeoURL\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:36+0000\n"
-"Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:42+0000\n"
+"Language-Team: Interlingua <https://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-16 23:17:46+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:15+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-geourl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/GeoURL/locale/id/LC_MESSAGES/GeoURL.po b/plugins/GeoURL/locale/id/LC_MESSAGES/GeoURL.po
index a24fe796ae..20f72c117c 100644
--- a/plugins/GeoURL/locale/id/LC_MESSAGES/GeoURL.po
+++ b/plugins/GeoURL/locale/id/LC_MESSAGES/GeoURL.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - GeoURL\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:36+0000\n"
-"Language-Team: Indonesian <http://translatewiki.net/wiki/Portal:id>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:42+0000\n"
+"Language-Team: Indonesian <https://translatewiki.net/wiki/Portal:id>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-16 23:17:46+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:15+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: id\n"
 "X-Message-Group: #out-statusnet-plugin-geourl\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
diff --git a/plugins/GeoURL/locale/it/LC_MESSAGES/GeoURL.po b/plugins/GeoURL/locale/it/LC_MESSAGES/GeoURL.po
new file mode 100644
index 0000000000..825802b48c
--- /dev/null
+++ b/plugins/GeoURL/locale/it/LC_MESSAGES/GeoURL.po
@@ -0,0 +1,27 @@
+# Translation of StatusNet - GeoURL to Italian (italiano)
+# Exported from translatewiki.net
+#
+# Author: Ximo17
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - GeoURL\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:42+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:50:15+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin description.
+msgid ""
+"Ping <a href=\"http://geourl.org/\">GeoURL</a> when new geolocation-enhanced "
+"notices are posted."
+msgstr ""
+"Manda un ping <a href=\"http://geourl.org/\">GeoURL</a> quando vengono "
+"pubblicati nuovi avvisi di geolocalizzazione avanzata."
diff --git a/plugins/GeoURL/locale/mk/LC_MESSAGES/GeoURL.po b/plugins/GeoURL/locale/mk/LC_MESSAGES/GeoURL.po
index 5e8abd35b9..0d4a72f6a7 100644
--- a/plugins/GeoURL/locale/mk/LC_MESSAGES/GeoURL.po
+++ b/plugins/GeoURL/locale/mk/LC_MESSAGES/GeoURL.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - GeoURL to Macedonian (Македон�ки)
+# Translation of StatusNet - GeoURL to Macedonian (македон�ки)
 # Exported from translatewiki.net
 #
 # Author: Bjankuloski06
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - GeoURL\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:36+0000\n"
-"Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:42+0000\n"
+"Language-Team: Macedonian <https://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-16 23:17:46+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:15+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-geourl\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
diff --git a/plugins/GeoURL/locale/nb/LC_MESSAGES/GeoURL.po b/plugins/GeoURL/locale/nb/LC_MESSAGES/GeoURL.po
index be380ff71f..f3652f8a3b 100644
--- a/plugins/GeoURL/locale/nb/LC_MESSAGES/GeoURL.po
+++ b/plugins/GeoURL/locale/nb/LC_MESSAGES/GeoURL.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - GeoURL to Norwegian (bokmål)‬ (‪Norsk (bokmål)‬)
+# Translation of StatusNet - GeoURL to Norwegian Bokmål (‪norsk (bokmål)‬)
 # Exported from translatewiki.net
 #
 # Author: Nghtwlkr
@@ -9,15 +9,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - GeoURL\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:36+0000\n"
-"Language-Team: Norwegian (bokmål)‬ <http://translatewiki.net/wiki/Portal:no>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:42+0000\n"
+"Language-Team: Norwegian Bokmål <https://translatewiki.net/wiki/Portal:nb>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-16 23:17:46+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
-"X-Language-Code: no\n"
+"X-POT-Import-Date: 2011-06-05 21:50:15+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: nb\n"
 "X-Message-Group: #out-statusnet-plugin-geourl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
diff --git a/plugins/GeoURL/locale/nl/LC_MESSAGES/GeoURL.po b/plugins/GeoURL/locale/nl/LC_MESSAGES/GeoURL.po
index a6bf99d05a..58d121096c 100644
--- a/plugins/GeoURL/locale/nl/LC_MESSAGES/GeoURL.po
+++ b/plugins/GeoURL/locale/nl/LC_MESSAGES/GeoURL.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - GeoURL\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:36+0000\n"
-"Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:43+0000\n"
+"Language-Team: Dutch <https://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-16 23:17:46+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:15+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-geourl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/GeoURL/locale/pl/LC_MESSAGES/GeoURL.po b/plugins/GeoURL/locale/pl/LC_MESSAGES/GeoURL.po
index c2ab5e1a5d..e9e2b79775 100644
--- a/plugins/GeoURL/locale/pl/LC_MESSAGES/GeoURL.po
+++ b/plugins/GeoURL/locale/pl/LC_MESSAGES/GeoURL.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - GeoURL to Polish (Polski)
+# Translation of StatusNet - GeoURL to Polish (polski)
 # Exported from translatewiki.net
 #
 # Author: Raven
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - GeoURL\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:36+0000\n"
-"Language-Team: Polish <http://translatewiki.net/wiki/Portal:pl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:43+0000\n"
+"Language-Team: Polish <https://translatewiki.net/wiki/Portal:pl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-16 23:17:46+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:15+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: pl\n"
 "X-Message-Group: #out-statusnet-plugin-geourl\n"
 "Plural-Forms: nplurals=3; plural=(n == 1) ? 0 : ( (n%10 >= 2 && n%10 <= 4 && "
diff --git a/plugins/GeoURL/locale/pt/LC_MESSAGES/GeoURL.po b/plugins/GeoURL/locale/pt/LC_MESSAGES/GeoURL.po
index 4517d7f7b4..67ba3422e1 100644
--- a/plugins/GeoURL/locale/pt/LC_MESSAGES/GeoURL.po
+++ b/plugins/GeoURL/locale/pt/LC_MESSAGES/GeoURL.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - GeoURL to Portuguese (Português)
+# Translation of StatusNet - GeoURL to Portuguese (português)
 # Exported from translatewiki.net
 #
 # Author: GTNS
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - GeoURL\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:36+0000\n"
-"Language-Team: Portuguese <http://translatewiki.net/wiki/Portal:pt>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:43+0000\n"
+"Language-Team: Portuguese <https://translatewiki.net/wiki/Portal:pt>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-16 23:17:46+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:15+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: pt\n"
 "X-Message-Group: #out-statusnet-plugin-geourl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/GeoURL/locale/ru/LC_MESSAGES/GeoURL.po b/plugins/GeoURL/locale/ru/LC_MESSAGES/GeoURL.po
index ce7bd27b05..0c6ee0c09e 100644
--- a/plugins/GeoURL/locale/ru/LC_MESSAGES/GeoURL.po
+++ b/plugins/GeoURL/locale/ru/LC_MESSAGES/GeoURL.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - GeoURL to Russian (Ру��кий)
+# Translation of StatusNet - GeoURL to Russian (ру��кий)
 # Exported from translatewiki.net
 #
 # Author: �лек�андр Сигачёв
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - GeoURL\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:36+0000\n"
-"Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:43+0000\n"
+"Language-Team: Russian <https://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-16 23:17:46+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:15+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-geourl\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
diff --git a/plugins/GeoURL/locale/sv/LC_MESSAGES/GeoURL.po b/plugins/GeoURL/locale/sv/LC_MESSAGES/GeoURL.po
index 5043c3519e..c84f409f4e 100644
--- a/plugins/GeoURL/locale/sv/LC_MESSAGES/GeoURL.po
+++ b/plugins/GeoURL/locale/sv/LC_MESSAGES/GeoURL.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - GeoURL to Swedish (Svenska)
+# Translation of StatusNet - GeoURL to Swedish (svenska)
 # Exported from translatewiki.net
 #
 # Author: Jamminjohn
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - GeoURL\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:36+0000\n"
-"Language-Team: Swedish <http://translatewiki.net/wiki/Portal:sv>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:43+0000\n"
+"Language-Team: Swedish <https://translatewiki.net/wiki/Portal:sv>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-16 23:17:46+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:15+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: sv\n"
 "X-Message-Group: #out-statusnet-plugin-geourl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/GeoURL/locale/tl/LC_MESSAGES/GeoURL.po b/plugins/GeoURL/locale/tl/LC_MESSAGES/GeoURL.po
index e900e54890..d7ac8f0f23 100644
--- a/plugins/GeoURL/locale/tl/LC_MESSAGES/GeoURL.po
+++ b/plugins/GeoURL/locale/tl/LC_MESSAGES/GeoURL.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - GeoURL\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:36+0000\n"
-"Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:43+0000\n"
+"Language-Team: Tagalog <https://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-16 23:17:46+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:15+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-geourl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/GeoURL/locale/uk/LC_MESSAGES/GeoURL.po b/plugins/GeoURL/locale/uk/LC_MESSAGES/GeoURL.po
index 4ea509ab4b..6e6f6e20d5 100644
--- a/plugins/GeoURL/locale/uk/LC_MESSAGES/GeoURL.po
+++ b/plugins/GeoURL/locale/uk/LC_MESSAGES/GeoURL.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - GeoURL to Ukrainian (Україн�ька)
+# Translation of StatusNet - GeoURL to Ukrainian (україн�ька)
 # Exported from translatewiki.net
 #
 # Author: Boogie
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - GeoURL\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:36+0000\n"
-"Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:43+0000\n"
+"Language-Team: Ukrainian <https://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-16 23:17:46+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:15+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-geourl\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
diff --git a/plugins/Geonames/locale/Geonames.pot b/plugins/Geonames/locale/Geonames.pot
index bb8327fced..d05f2a1691 100644
--- a/plugins/Geonames/locale/Geonames.pot
+++ b/plugins/Geonames/locale/Geonames.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
+"POT-Creation-Date: 2012-06-30 11:07+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"
diff --git a/plugins/Geonames/locale/ca/LC_MESSAGES/Geonames.po b/plugins/Geonames/locale/ca/LC_MESSAGES/Geonames.po
index a072e50e36..45ea245c70 100644
--- a/plugins/Geonames/locale/ca/LC_MESSAGES/Geonames.po
+++ b/plugins/Geonames/locale/ca/LC_MESSAGES/Geonames.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Geonames to Catalan (Català)
+# Translation of StatusNet - Geonames to Catalan (català)
 # Exported from translatewiki.net
 #
 # Author: Toniher
@@ -9,37 +9,37 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Geonames\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-04-09 18:34+0000\n"
-"PO-Revision-Date: 2011-04-09 18:37:13+0000\n"
-"Language-Team: Catalan <http://translatewiki.net/wiki/Portal:ca>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:40+0000\n"
+"Language-Team: Catalan <https://translatewiki.net/wiki/Portal:ca>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-24 15:25:03+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r85732); Translate extension (2011-03-11)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:14+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ca\n"
 "X-Message-Group: #out-statusnet-plugin-geonames\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANS: Exception thrown when a geo names service is not used because of a recent timeout.
 msgid "Skipping due to recent web service timeout."
-msgstr ""
+msgstr "S'ignora pel recent temps d'espera esgotat del web."
 
 #. TRANS: Exception thrown when a geo names service does not return an expected response.
 #. TRANS: %s is an HTTP error code.
 #, php-format
 msgid "HTTP error code %s."
-msgstr ""
+msgstr "Codi d'error HTTP %s."
 
 #. TRANS: Exception thrown when a geo names service returns an empty body.
 msgid "Empty HTTP body in response."
-msgstr ""
+msgstr "Cos HTTP buit a la resposta."
 
 #. TRANS: Exception thrown when a geo names service return a specific error number and error text.
 #. TRANS: %1$s is an error code, %2$s is an error message.
 #, php-format
 msgid "Error #%1$s (\"%2$s\")."
-msgstr ""
+msgstr "Error #%1$s (\"%2$s\")."
 
 #. TRANS: Plugin description.
 msgid ""
diff --git a/plugins/Geonames/locale/de/LC_MESSAGES/Geonames.po b/plugins/Geonames/locale/de/LC_MESSAGES/Geonames.po
index 9d8e6f5588..2a0d97ad98 100644
--- a/plugins/Geonames/locale/de/LC_MESSAGES/Geonames.po
+++ b/plugins/Geonames/locale/de/LC_MESSAGES/Geonames.po
@@ -10,14 +10,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Geonames\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:34+0000\n"
-"Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:40+0000\n"
+"Language-Team: German <https://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:27:29+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:14+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-geonames\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/Geonames/locale/es/LC_MESSAGES/Geonames.po b/plugins/Geonames/locale/es/LC_MESSAGES/Geonames.po
index 2b3c3ecbb3..cc75e4bb61 100644
--- a/plugins/Geonames/locale/es/LC_MESSAGES/Geonames.po
+++ b/plugins/Geonames/locale/es/LC_MESSAGES/Geonames.po
@@ -1,6 +1,7 @@
-# Translation of StatusNet - Geonames to Spanish (Español)
+# Translation of StatusNet - Geonames to Spanish (español)
 # Exported from translatewiki.net
 #
+# Author: Armando-Martin
 # Author: Translationista
 # --
 # This file is distributed under the same license as the StatusNet package.
@@ -9,14 +10,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Geonames\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-04-09 18:34+0000\n"
-"PO-Revision-Date: 2011-04-09 18:37:13+0000\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:40+0000\n"
 "Language-Team: Spanish <http://translatewiki.net/wiki/Portal:es>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-24 15:25:03+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r85732); Translate extension (2011-03-11)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:14+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-plugin-geonames\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -24,22 +25,24 @@ msgstr ""
 #. TRANS: Exception thrown when a geo names service is not used because of a recent timeout.
 msgid "Skipping due to recent web service timeout."
 msgstr ""
+"Omitiendo debido a recientes tiempos de espera excedidos por parte del "
+"servicio web."
 
 #. TRANS: Exception thrown when a geo names service does not return an expected response.
 #. TRANS: %s is an HTTP error code.
 #, php-format
 msgid "HTTP error code %s."
-msgstr ""
+msgstr "Código de error HTTP  %s ."
 
 #. TRANS: Exception thrown when a geo names service returns an empty body.
 msgid "Empty HTTP body in response."
-msgstr ""
+msgstr "Cuerpo de HTTP vacío en la respuesta."
 
 #. TRANS: Exception thrown when a geo names service return a specific error number and error text.
 #. TRANS: %1$s is an error code, %2$s is an error message.
 #, php-format
 msgid "Error #%1$s (\"%2$s\")."
-msgstr ""
+msgstr "Error #%1$s (\"%2$s\")."
 
 #. TRANS: Plugin description.
 msgid ""
diff --git a/plugins/Geonames/locale/eu/LC_MESSAGES/Geonames.po b/plugins/Geonames/locale/eu/LC_MESSAGES/Geonames.po
new file mode 100644
index 0000000000..170b35b7be
--- /dev/null
+++ b/plugins/Geonames/locale/eu/LC_MESSAGES/Geonames.po
@@ -0,0 +1,52 @@
+# Translation of StatusNet - Geonames to Basque (euskara)
+# Exported from translatewiki.net
+#
+# Author: Artsuaga
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Geonames\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:40+0000\n"
+"Language-Team: Basque <https://translatewiki.net/wiki/Portal:eu>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:50:14+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: eu\n"
+"X-Message-Group: #out-statusnet-plugin-geonames\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Exception thrown when a geo names service is not used because of a recent timeout.
+msgid "Skipping due to recent web service timeout."
+msgstr "Web zerbitzua denboraz kanpo geratu delako salto egiten."
+
+#. TRANS: Exception thrown when a geo names service does not return an expected response.
+#. TRANS: %s is an HTTP error code.
+#, php-format
+msgid "HTTP error code %s."
+msgstr "%s HTTP akats kodea."
+
+#. TRANS: Exception thrown when a geo names service returns an empty body.
+msgid "Empty HTTP body in response."
+msgstr "HTTP body hutsa erantzunean."
+
+#. TRANS: Exception thrown when a geo names service return a specific error number and error text.
+#. TRANS: %1$s is an error code, %2$s is an error message.
+#, php-format
+msgid "Error #%1$s (\"%2$s\")."
+msgstr "Akatsa #%1$s (\"%2$s\")."
+
+#. TRANS: Plugin description.
+msgid ""
+"Uses <a href=\"http://geonames.org/\">Geonames</a> service to get human-"
+"readable names for locations based on user-provided lat/long pairs."
+msgstr ""
+"Uses <a href=\"http://geonames.org/\">Geonames</a> service to get human-"
+"readable names for locations based on user-provided lat/long pairs.\n"
+"<a href=\"http://geonames.org/\">Geonames</a> zerbitzua erabiltzen du "
+"latitude eta longitude bidez kokapenaren toponimoa lortzeko."
diff --git a/plugins/Geonames/locale/fi/LC_MESSAGES/Geonames.po b/plugins/Geonames/locale/fi/LC_MESSAGES/Geonames.po
index 41a16a71fd..a3aff184f0 100644
--- a/plugins/Geonames/locale/fi/LC_MESSAGES/Geonames.po
+++ b/plugins/Geonames/locale/fi/LC_MESSAGES/Geonames.po
@@ -1,7 +1,8 @@
-# Translation of StatusNet - Geonames to Finnish (Suomi)
+# Translation of StatusNet - Geonames to Finnish (suomi)
 # Exported from translatewiki.net
 #
 # Author: Nike
+# Author: Silvonen
 # Author: XTL
 # --
 # This file is distributed under the same license as the StatusNet package.
@@ -10,14 +11,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Geonames\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-04-09 18:34+0000\n"
-"PO-Revision-Date: 2011-04-09 18:37:13+0000\n"
-"Language-Team: Finnish <http://translatewiki.net/wiki/Portal:fi>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:40+0000\n"
+"Language-Team: Finnish <https://translatewiki.net/wiki/Portal:fi>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-24 15:25:03+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r85732); Translate extension (2011-03-11)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:14+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: fi\n"
 "X-Message-Group: #out-statusnet-plugin-geonames\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -30,7 +31,7 @@ msgstr ""
 #. TRANS: %s is an HTTP error code.
 #, php-format
 msgid "HTTP error code %s."
-msgstr ""
+msgstr "HTTP-virhekoodi %s."
 
 #. TRANS: Exception thrown when a geo names service returns an empty body.
 msgid "Empty HTTP body in response."
diff --git a/plugins/Geonames/locale/fr/LC_MESSAGES/Geonames.po b/plugins/Geonames/locale/fr/LC_MESSAGES/Geonames.po
index 2f2a4b7508..3a7ac916bf 100644
--- a/plugins/Geonames/locale/fr/LC_MESSAGES/Geonames.po
+++ b/plugins/Geonames/locale/fr/LC_MESSAGES/Geonames.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Geonames to French (Français)
+# Translation of StatusNet - Geonames to French (français)
 # Exported from translatewiki.net
 #
 # Author: Brunoperel
@@ -11,14 +11,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Geonames\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:34+0000\n"
-"Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:41+0000\n"
+"Language-Team: French <https://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:27:29+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:14+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-geonames\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
diff --git a/plugins/Geonames/locale/gl/LC_MESSAGES/Geonames.po b/plugins/Geonames/locale/gl/LC_MESSAGES/Geonames.po
new file mode 100644
index 0000000000..20a55ab5be
--- /dev/null
+++ b/plugins/Geonames/locale/gl/LC_MESSAGES/Geonames.po
@@ -0,0 +1,51 @@
+# Translation of StatusNet - Geonames to Galician (galego)
+# Exported from translatewiki.net
+#
+# Author: Toliño
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Geonames\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:41+0000\n"
+"Language-Team: Galician <https://translatewiki.net/wiki/Portal:gl>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:50:14+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: gl\n"
+"X-Message-Group: #out-statusnet-plugin-geonames\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Exception thrown when a geo names service is not used because of a recent timeout.
+msgid "Skipping due to recent web service timeout."
+msgstr "Sáltase debido ao excesivo tempo de espera por parte do servizo web."
+
+#. TRANS: Exception thrown when a geo names service does not return an expected response.
+#. TRANS: %s is an HTTP error code.
+#, php-format
+msgid "HTTP error code %s."
+msgstr "Código de erro HTTP %s."
+
+#. TRANS: Exception thrown when a geo names service returns an empty body.
+msgid "Empty HTTP body in response."
+msgstr "Corpo HTTP baleiro na resposta."
+
+#. TRANS: Exception thrown when a geo names service return a specific error number and error text.
+#. TRANS: %1$s is an error code, %2$s is an error message.
+#, php-format
+msgid "Error #%1$s (\"%2$s\")."
+msgstr "Erro #%1$s (\"%2$s\")."
+
+#. TRANS: Plugin description.
+msgid ""
+"Uses <a href=\"http://geonames.org/\">Geonames</a> service to get human-"
+"readable names for locations based on user-provided lat/long pairs."
+msgstr ""
+"Usa o servizo <a href=\"http://geonames.org/\">Geonames</a> para obter nomes "
+"xeográficos lexibles polas persoas baseándose nos pares de latitudes e "
+"lonxitudes dados polo usuario."
diff --git a/plugins/Geonames/locale/ia/LC_MESSAGES/Geonames.po b/plugins/Geonames/locale/ia/LC_MESSAGES/Geonames.po
index 0dde793ed4..1c276cdfc7 100644
--- a/plugins/Geonames/locale/ia/LC_MESSAGES/Geonames.po
+++ b/plugins/Geonames/locale/ia/LC_MESSAGES/Geonames.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Geonames to Interlingua (Interlingua)
+# Translation of StatusNet - Geonames to Interlingua (interlingua)
 # Exported from translatewiki.net
 #
 # Author: McDutchie
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Geonames\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:34+0000\n"
-"Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:41+0000\n"
+"Language-Team: Interlingua <https://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:27:29+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:14+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-geonames\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/Geonames/locale/it/LC_MESSAGES/Geonames.po b/plugins/Geonames/locale/it/LC_MESSAGES/Geonames.po
new file mode 100644
index 0000000000..4e9749e15a
--- /dev/null
+++ b/plugins/Geonames/locale/it/LC_MESSAGES/Geonames.po
@@ -0,0 +1,48 @@
+# Translation of StatusNet - Geonames to Italian (italiano)
+# Exported from translatewiki.net
+#
+# Author: Ximo17
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Geonames\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:41+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:50:14+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Exception thrown when a geo names service is not used because of a recent timeout.
+msgid "Skipping due to recent web service timeout."
+msgstr "Saltato a causa di un recente timeout del servizio web."
+
+#. TRANS: Exception thrown when a geo names service does not return an expected response.
+#. TRANS: %s is an HTTP error code.
+#, php-format
+msgid "HTTP error code %s."
+msgstr "Codice di errore HTTP %s."
+
+#. TRANS: Exception thrown when a geo names service returns an empty body.
+msgid "Empty HTTP body in response."
+msgstr "Corpo vuoto HTTP in risposta."
+
+#. TRANS: Exception thrown when a geo names service return a specific error number and error text.
+#. TRANS: %1$s is an error code, %2$s is an error message.
+#, php-format
+msgid "Error #%1$s (\"%2$s\")."
+msgstr "Errore #%1$s (\"%2$s\")."
+
+#. TRANS: Plugin description.
+msgid ""
+"Uses <a href=\"http://geonames.org/\">Geonames</a> service to get human-"
+"readable names for locations based on user-provided lat/long pairs."
+msgstr ""
+"Utilizza il servizio di <a href=\"http://geonames.org/\">Geonames</a> per "
+"ottenere nomi leggibili dei luoghi, basati sui dati di latitudine e "
+"longitudine forniti dall'utente."
diff --git a/plugins/Geonames/locale/mk/LC_MESSAGES/Geonames.po b/plugins/Geonames/locale/mk/LC_MESSAGES/Geonames.po
index 52bbb922b1..d32c0337f5 100644
--- a/plugins/Geonames/locale/mk/LC_MESSAGES/Geonames.po
+++ b/plugins/Geonames/locale/mk/LC_MESSAGES/Geonames.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Geonames to Macedonian (Македон�ки)
+# Translation of StatusNet - Geonames to Macedonian (македон�ки)
 # Exported from translatewiki.net
 #
 # Author: Bjankuloski06
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Geonames\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:35+0000\n"
-"Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:41+0000\n"
+"Language-Team: Macedonian <https://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:27:29+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:14+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-geonames\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
diff --git a/plugins/Geonames/locale/nl/LC_MESSAGES/Geonames.po b/plugins/Geonames/locale/nl/LC_MESSAGES/Geonames.po
index 0ecbc9e5b0..79852d81ad 100644
--- a/plugins/Geonames/locale/nl/LC_MESSAGES/Geonames.po
+++ b/plugins/Geonames/locale/nl/LC_MESSAGES/Geonames.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Geonames\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:35+0000\n"
-"Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:41+0000\n"
+"Language-Team: Dutch <https://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:27:29+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:14+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-geonames\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/Geonames/locale/sv/LC_MESSAGES/Geonames.po b/plugins/Geonames/locale/sv/LC_MESSAGES/Geonames.po
index a899d471d1..d655865e48 100644
--- a/plugins/Geonames/locale/sv/LC_MESSAGES/Geonames.po
+++ b/plugins/Geonames/locale/sv/LC_MESSAGES/Geonames.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Geonames to Swedish (Svenska)
+# Translation of StatusNet - Geonames to Swedish (svenska)
 # Exported from translatewiki.net
 #
 # Author: Jamminjohn
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Geonames\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:35+0000\n"
-"Language-Team: Swedish <http://translatewiki.net/wiki/Portal:sv>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:41+0000\n"
+"Language-Team: Swedish <https://translatewiki.net/wiki/Portal:sv>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:27:29+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:14+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: sv\n"
 "X-Message-Group: #out-statusnet-plugin-geonames\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/Geonames/locale/tl/LC_MESSAGES/Geonames.po b/plugins/Geonames/locale/tl/LC_MESSAGES/Geonames.po
index df78b70f73..4b89c3402d 100644
--- a/plugins/Geonames/locale/tl/LC_MESSAGES/Geonames.po
+++ b/plugins/Geonames/locale/tl/LC_MESSAGES/Geonames.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Geonames\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:35+0000\n"
-"Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:41+0000\n"
+"Language-Team: Tagalog <https://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:27:29+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:14+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-geonames\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/Geonames/locale/uk/LC_MESSAGES/Geonames.po b/plugins/Geonames/locale/uk/LC_MESSAGES/Geonames.po
index b2c81cf668..211182a029 100644
--- a/plugins/Geonames/locale/uk/LC_MESSAGES/Geonames.po
+++ b/plugins/Geonames/locale/uk/LC_MESSAGES/Geonames.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Geonames to Ukrainian (Україн�ька)
+# Translation of StatusNet - Geonames to Ukrainian (україн�ька)
 # Exported from translatewiki.net
 #
 # Author: Boogie
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Geonames\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:35+0000\n"
-"Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:41+0000\n"
+"Language-Team: Ukrainian <https://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:27:29+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:14+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-geonames\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
diff --git a/plugins/GoogleAnalytics/GoogleAnalyticsPlugin.php b/plugins/GoogleAnalytics/GoogleAnalyticsPlugin.php
index b34fe203ec..640330b850 100644
--- a/plugins/GoogleAnalytics/GoogleAnalyticsPlugin.php
+++ b/plugins/GoogleAnalytics/GoogleAnalyticsPlugin.php
@@ -49,31 +49,66 @@ if (!defined('STATUSNET')) {
  */
 class GoogleAnalyticsPlugin extends Plugin
 {
-    var $code = null;
+    var $code;
+    var $domain;
+
+    const VERSION = '0.2';
 
     function __construct($code=null)
     {
-        $this->code = $code;
+        if (!empty($code)) {
+            global $config;
+            $config['googleanalytics']['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->inlineScript($js1);
-        $action->inlineScript($js2);
+        $code = common_config('googleanalytics', 'code');
+        if (empty($code)) {
+            $code = $this->code;
+        }
+        $domain = common_config('googleanalytics', 'domain');
+        if (empty($domain)) {
+            $domain = $this->domain;
+        }
+
+        $js = <<<ENDOFSCRIPT0
+
+var _gaq = _gaq || [];
+_gaq.push(['_setAccount', '{$code}']);
+_gaq.push(['_trackPageview']);
+
+ENDOFSCRIPT0;
+
+if (!empty($domain)) {
+        $js .= <<<ENDOFSCRIPT1
+
+_gaq.push(['_setDomainName', '{$domain}']);
+_gaq.push(['_setAllowHash', false]);
+
+ENDOFSCRIPT1;
+}
+
+        $js .= <<<ENDOFSCRIPT2
+
+(function() {
+   var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+   ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+   var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+})();
+
+ENDOFSCRIPT2;
+
+       $action->inlineScript($js);
     }
 
     function onPluginVersion(&$versions)
     {
         $versions[] = array('name' => 'GoogleAnalytics',
-                            'version' => STATUSNET_VERSION,
+                            'version' => self::VERSION,
                             'author' => 'Evan Prodromou',
                             'homepage' => 'http://status.net/wiki/Plugin:GoogleAnalytics',
                             'rawdescription' =>
diff --git a/plugins/GoogleAnalytics/locale/GoogleAnalytics.pot b/plugins/GoogleAnalytics/locale/GoogleAnalytics.pot
index 8775a0354e..bb44625a06 100644
--- a/plugins/GoogleAnalytics/locale/GoogleAnalytics.pot
+++ b/plugins/GoogleAnalytics/locale/GoogleAnalytics.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
+"POT-Creation-Date: 2012-06-30 11:07+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,7 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. TRANS: Plugin description.
-#: GoogleAnalyticsPlugin.php:81
+#: GoogleAnalyticsPlugin.php:116
 msgid ""
 "Use <a href=\"http://www.google.com/analytics/\">Google Analytics</a> to "
 "track web access."
diff --git a/plugins/GoogleAnalytics/locale/br/LC_MESSAGES/GoogleAnalytics.po b/plugins/GoogleAnalytics/locale/br/LC_MESSAGES/GoogleAnalytics.po
index 1964c4c46b..c3a0f8ae60 100644
--- a/plugins/GoogleAnalytics/locale/br/LC_MESSAGES/GoogleAnalytics.po
+++ b/plugins/GoogleAnalytics/locale/br/LC_MESSAGES/GoogleAnalytics.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - GoogleAnalytics to Breton (Brezhoneg)
+# Translation of StatusNet - GoogleAnalytics to Breton (brezhoneg)
 # Exported from translatewiki.net
 #
 # Author: Fulup
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - GoogleAnalytics\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:37+0000\n"
-"Language-Team: Breton <http://translatewiki.net/wiki/Portal:br>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:43+0000\n"
+"Language-Team: Breton <https://translatewiki.net/wiki/Portal:br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-24 15:25:04+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-18 16:19:21+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-googleanalytics\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
diff --git a/plugins/GoogleAnalytics/locale/ca/LC_MESSAGES/GoogleAnalytics.po b/plugins/GoogleAnalytics/locale/ca/LC_MESSAGES/GoogleAnalytics.po
new file mode 100644
index 0000000000..d02cd08447
--- /dev/null
+++ b/plugins/GoogleAnalytics/locale/ca/LC_MESSAGES/GoogleAnalytics.po
@@ -0,0 +1,30 @@
+# Translation of StatusNet - GoogleAnalytics to Catalan (català)
+# Exported from translatewiki.net
+#
+# Author: Toniher
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - GoogleAnalytics\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:43+0000\n"
+"Language-Team: Catalan <https://translatewiki.net/wiki/Portal:ca>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-18 16:19:21+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: ca\n"
+"X-Message-Group: #out-statusnet-plugin-googleanalytics\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin description.
+msgid ""
+"Use <a href=\"http://www.google.com/analytics/\">Google Analytics</a> to "
+"track web access."
+msgstr ""
+"Utilitzeu el <a href=\"http://www.google.com/analytics/\">Google Analytics</"
+"a> per tracejar l'accés al web."
diff --git a/plugins/GoogleAnalytics/locale/de/LC_MESSAGES/GoogleAnalytics.po b/plugins/GoogleAnalytics/locale/de/LC_MESSAGES/GoogleAnalytics.po
index de5d06773a..3a0db9c16e 100644
--- a/plugins/GoogleAnalytics/locale/de/LC_MESSAGES/GoogleAnalytics.po
+++ b/plugins/GoogleAnalytics/locale/de/LC_MESSAGES/GoogleAnalytics.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - GoogleAnalytics\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:37+0000\n"
-"Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:43+0000\n"
+"Language-Team: German <https://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-24 15:25:04+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-18 16:19:21+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-googleanalytics\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/GoogleAnalytics/locale/es/LC_MESSAGES/GoogleAnalytics.po b/plugins/GoogleAnalytics/locale/es/LC_MESSAGES/GoogleAnalytics.po
index 360f7b34c7..8c72d257fb 100644
--- a/plugins/GoogleAnalytics/locale/es/LC_MESSAGES/GoogleAnalytics.po
+++ b/plugins/GoogleAnalytics/locale/es/LC_MESSAGES/GoogleAnalytics.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - GoogleAnalytics to Spanish (Español)
+# Translation of StatusNet - GoogleAnalytics to Spanish (español)
 # Exported from translatewiki.net
 #
 # Author: Translationista
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - GoogleAnalytics\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:37+0000\n"
-"Language-Team: Spanish <http://translatewiki.net/wiki/Portal:es>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:43+0000\n"
+"Language-Team: Spanish <https://translatewiki.net/wiki/Portal:es>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-24 15:25:04+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-18 16:19:21+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-plugin-googleanalytics\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/GoogleAnalytics/locale/eu/LC_MESSAGES/GoogleAnalytics.po b/plugins/GoogleAnalytics/locale/eu/LC_MESSAGES/GoogleAnalytics.po
new file mode 100644
index 0000000000..dfaedfc238
--- /dev/null
+++ b/plugins/GoogleAnalytics/locale/eu/LC_MESSAGES/GoogleAnalytics.po
@@ -0,0 +1,27 @@
+# Translation of StatusNet - GoogleAnalytics to Basque (euskara)
+# Exported from translatewiki.net
+#
+# Author: Artsuaga
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - GoogleAnalytics\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:43+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-18 16:19:21+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin description.
+msgid ""
+"Use <a href=\"http://www.google.com/analytics/\">Google Analytics</a> to "
+"track web access."
+msgstr ""
+"Erabili <a href=\"http://www.google.com/analytics/\">Google Analytics</a> "
+"webera egindako atzipenak jarraitzeko."
diff --git a/plugins/GoogleAnalytics/locale/fi/LC_MESSAGES/GoogleAnalytics.po b/plugins/GoogleAnalytics/locale/fi/LC_MESSAGES/GoogleAnalytics.po
index 7a96bf26d9..9397b90115 100644
--- a/plugins/GoogleAnalytics/locale/fi/LC_MESSAGES/GoogleAnalytics.po
+++ b/plugins/GoogleAnalytics/locale/fi/LC_MESSAGES/GoogleAnalytics.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - GoogleAnalytics to Finnish (Suomi)
+# Translation of StatusNet - GoogleAnalytics to Finnish (suomi)
 # Exported from translatewiki.net
 #
 # Author: Nike
@@ -10,14 +10,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - GoogleAnalytics\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:37+0000\n"
-"Language-Team: Finnish <http://translatewiki.net/wiki/Portal:fi>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:44+0000\n"
+"Language-Team: Finnish <https://translatewiki.net/wiki/Portal:fi>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-24 15:25:04+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-18 16:19:21+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: fi\n"
 "X-Message-Group: #out-statusnet-plugin-googleanalytics\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/GoogleAnalytics/locale/fr/LC_MESSAGES/GoogleAnalytics.po b/plugins/GoogleAnalytics/locale/fr/LC_MESSAGES/GoogleAnalytics.po
index bf0c5976ed..f92666aab6 100644
--- a/plugins/GoogleAnalytics/locale/fr/LC_MESSAGES/GoogleAnalytics.po
+++ b/plugins/GoogleAnalytics/locale/fr/LC_MESSAGES/GoogleAnalytics.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - GoogleAnalytics to French (Français)
+# Translation of StatusNet - GoogleAnalytics to French (français)
 # Exported from translatewiki.net
 #
 # Author: Verdy p
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - GoogleAnalytics\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:37+0000\n"
-"Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:44+0000\n"
+"Language-Team: French <https://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-24 15:25:04+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-18 16:19:21+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-googleanalytics\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
diff --git a/plugins/GoogleAnalytics/locale/gl/LC_MESSAGES/GoogleAnalytics.po b/plugins/GoogleAnalytics/locale/gl/LC_MESSAGES/GoogleAnalytics.po
new file mode 100644
index 0000000000..5b757cd85a
--- /dev/null
+++ b/plugins/GoogleAnalytics/locale/gl/LC_MESSAGES/GoogleAnalytics.po
@@ -0,0 +1,30 @@
+# Translation of StatusNet - GoogleAnalytics to Galician (galego)
+# Exported from translatewiki.net
+#
+# Author: Toliño
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - GoogleAnalytics\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:44+0000\n"
+"Language-Team: Galician <https://translatewiki.net/wiki/Portal:gl>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-18 16:19:21+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: gl\n"
+"X-Message-Group: #out-statusnet-plugin-googleanalytics\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin description.
+msgid ""
+"Use <a href=\"http://www.google.com/analytics/\">Google Analytics</a> to "
+"track web access."
+msgstr ""
+"Usar o <a href=\"http://www.google.com/analytics/\">Google Analytics</a> "
+"para seguir o acceso á web."
diff --git a/plugins/GoogleAnalytics/locale/he/LC_MESSAGES/GoogleAnalytics.po b/plugins/GoogleAnalytics/locale/he/LC_MESSAGES/GoogleAnalytics.po
index 9e8d149d00..17dbf1d335 100644
--- a/plugins/GoogleAnalytics/locale/he/LC_MESSAGES/GoogleAnalytics.po
+++ b/plugins/GoogleAnalytics/locale/he/LC_MESSAGES/GoogleAnalytics.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - GoogleAnalytics\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:37+0000\n"
-"Language-Team: Hebrew <http://translatewiki.net/wiki/Portal:he>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:44+0000\n"
+"Language-Team: Hebrew <https://translatewiki.net/wiki/Portal:he>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-24 15:25:04+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-18 16:19:21+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: he\n"
 "X-Message-Group: #out-statusnet-plugin-googleanalytics\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/GoogleAnalytics/locale/ia/LC_MESSAGES/GoogleAnalytics.po b/plugins/GoogleAnalytics/locale/ia/LC_MESSAGES/GoogleAnalytics.po
index 12deea4798..17cee1b41c 100644
--- a/plugins/GoogleAnalytics/locale/ia/LC_MESSAGES/GoogleAnalytics.po
+++ b/plugins/GoogleAnalytics/locale/ia/LC_MESSAGES/GoogleAnalytics.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - GoogleAnalytics to Interlingua (Interlingua)
+# Translation of StatusNet - GoogleAnalytics to Interlingua (interlingua)
 # Exported from translatewiki.net
 #
 # Author: McDutchie
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - GoogleAnalytics\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:37+0000\n"
-"Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:44+0000\n"
+"Language-Team: Interlingua <https://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-24 15:25:04+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-18 16:19:21+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-googleanalytics\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/GoogleAnalytics/locale/id/LC_MESSAGES/GoogleAnalytics.po b/plugins/GoogleAnalytics/locale/id/LC_MESSAGES/GoogleAnalytics.po
index bbc1200102..6c5ff8b716 100644
--- a/plugins/GoogleAnalytics/locale/id/LC_MESSAGES/GoogleAnalytics.po
+++ b/plugins/GoogleAnalytics/locale/id/LC_MESSAGES/GoogleAnalytics.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - GoogleAnalytics\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:37+0000\n"
-"Language-Team: Indonesian <http://translatewiki.net/wiki/Portal:id>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:44+0000\n"
+"Language-Team: Indonesian <https://translatewiki.net/wiki/Portal:id>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-24 15:25:04+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-18 16:19:21+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: id\n"
 "X-Message-Group: #out-statusnet-plugin-googleanalytics\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
diff --git a/plugins/GoogleAnalytics/locale/it/LC_MESSAGES/GoogleAnalytics.po b/plugins/GoogleAnalytics/locale/it/LC_MESSAGES/GoogleAnalytics.po
new file mode 100644
index 0000000000..51ec7c8fa2
--- /dev/null
+++ b/plugins/GoogleAnalytics/locale/it/LC_MESSAGES/GoogleAnalytics.po
@@ -0,0 +1,27 @@
+# Translation of StatusNet - GoogleAnalytics to Italian (italiano)
+# Exported from translatewiki.net
+#
+# Author: Ximo17
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - GoogleAnalytics\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:44+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-18 16:19:21+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin description.
+msgid ""
+"Use <a href=\"http://www.google.com/analytics/\">Google Analytics</a> to "
+"track web access."
+msgstr ""
+"Utilizza <a href=\"http://www.google.com/analytics/\">Google Analytics</a> "
+"per monitorare l'accesso web."
diff --git a/plugins/GoogleAnalytics/locale/mk/LC_MESSAGES/GoogleAnalytics.po b/plugins/GoogleAnalytics/locale/mk/LC_MESSAGES/GoogleAnalytics.po
index 41d7a0efee..19608b1cd6 100644
--- a/plugins/GoogleAnalytics/locale/mk/LC_MESSAGES/GoogleAnalytics.po
+++ b/plugins/GoogleAnalytics/locale/mk/LC_MESSAGES/GoogleAnalytics.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - GoogleAnalytics to Macedonian (Македон�ки)
+# Translation of StatusNet - GoogleAnalytics to Macedonian (македон�ки)
 # Exported from translatewiki.net
 #
 # Author: Bjankuloski06
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - GoogleAnalytics\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:37+0000\n"
-"Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:44+0000\n"
+"Language-Team: Macedonian <https://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-24 15:25:04+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-18 16:19:21+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-googleanalytics\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
diff --git a/plugins/GoogleAnalytics/locale/nb/LC_MESSAGES/GoogleAnalytics.po b/plugins/GoogleAnalytics/locale/nb/LC_MESSAGES/GoogleAnalytics.po
index 60abf7f7c1..bb6f74abcb 100644
--- a/plugins/GoogleAnalytics/locale/nb/LC_MESSAGES/GoogleAnalytics.po
+++ b/plugins/GoogleAnalytics/locale/nb/LC_MESSAGES/GoogleAnalytics.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - GoogleAnalytics to Norwegian (bokmål)‬ (‪Norsk (bokmål)‬)
+# Translation of StatusNet - GoogleAnalytics to Norwegian Bokmål (‪norsk (bokmål)‬)
 # Exported from translatewiki.net
 #
 # Author: Nghtwlkr
@@ -9,15 +9,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - GoogleAnalytics\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:37+0000\n"
-"Language-Team: Norwegian (bokmål)‬ <http://translatewiki.net/wiki/Portal:no>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:44+0000\n"
+"Language-Team: Norwegian Bokmål <https://translatewiki.net/wiki/Portal:nb>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-24 15:25:04+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
-"X-Language-Code: no\n"
+"X-POT-Import-Date: 2011-06-18 16:19:21+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: nb\n"
 "X-Message-Group: #out-statusnet-plugin-googleanalytics\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
diff --git a/plugins/GoogleAnalytics/locale/nl/LC_MESSAGES/GoogleAnalytics.po b/plugins/GoogleAnalytics/locale/nl/LC_MESSAGES/GoogleAnalytics.po
index 4ac01c98d5..f8882f969c 100644
--- a/plugins/GoogleAnalytics/locale/nl/LC_MESSAGES/GoogleAnalytics.po
+++ b/plugins/GoogleAnalytics/locale/nl/LC_MESSAGES/GoogleAnalytics.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - GoogleAnalytics\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:37+0000\n"
-"Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:44+0000\n"
+"Language-Team: Dutch <https://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-24 15:25:04+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-18 16:19:21+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-googleanalytics\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/GoogleAnalytics/locale/pt/LC_MESSAGES/GoogleAnalytics.po b/plugins/GoogleAnalytics/locale/pt/LC_MESSAGES/GoogleAnalytics.po
index 34cb3a3f56..a74f110876 100644
--- a/plugins/GoogleAnalytics/locale/pt/LC_MESSAGES/GoogleAnalytics.po
+++ b/plugins/GoogleAnalytics/locale/pt/LC_MESSAGES/GoogleAnalytics.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - GoogleAnalytics to Portuguese (Português)
+# Translation of StatusNet - GoogleAnalytics to Portuguese (português)
 # Exported from translatewiki.net
 #
 # Author: GTNS
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - GoogleAnalytics\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:37+0000\n"
-"Language-Team: Portuguese <http://translatewiki.net/wiki/Portal:pt>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:44+0000\n"
+"Language-Team: Portuguese <https://translatewiki.net/wiki/Portal:pt>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-24 15:25:04+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-18 16:19:21+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: pt\n"
 "X-Message-Group: #out-statusnet-plugin-googleanalytics\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/GoogleAnalytics/locale/pt_BR/LC_MESSAGES/GoogleAnalytics.po b/plugins/GoogleAnalytics/locale/pt_BR/LC_MESSAGES/GoogleAnalytics.po
index 76dd36dbc5..77448e9e83 100644
--- a/plugins/GoogleAnalytics/locale/pt_BR/LC_MESSAGES/GoogleAnalytics.po
+++ b/plugins/GoogleAnalytics/locale/pt_BR/LC_MESSAGES/GoogleAnalytics.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - GoogleAnalytics to Brazilian Portuguese (Português do Brasil)
+# Translation of StatusNet - GoogleAnalytics to Brazilian Portuguese (português do Brasil)
 # Exported from translatewiki.net
 #
 # Author: Giro720
@@ -9,15 +9,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - GoogleAnalytics\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:37+0000\n"
-"Language-Team: Brazilian Portuguese <http://translatewiki.net/wiki/Portal:pt-"
-"br>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:44+0000\n"
+"Language-Team: Brazilian Portuguese <https://translatewiki.net/wiki/Portal:"
+"pt-br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-24 15:25:04+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-18 16:19:21+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: pt-br\n"
 "X-Message-Group: #out-statusnet-plugin-googleanalytics\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
diff --git a/plugins/GoogleAnalytics/locale/ru/LC_MESSAGES/GoogleAnalytics.po b/plugins/GoogleAnalytics/locale/ru/LC_MESSAGES/GoogleAnalytics.po
index f7232de077..33ab9fee6d 100644
--- a/plugins/GoogleAnalytics/locale/ru/LC_MESSAGES/GoogleAnalytics.po
+++ b/plugins/GoogleAnalytics/locale/ru/LC_MESSAGES/GoogleAnalytics.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - GoogleAnalytics to Russian (Ру��кий)
+# Translation of StatusNet - GoogleAnalytics to Russian (ру��кий)
 # Exported from translatewiki.net
 #
 # Author: Сrower
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - GoogleAnalytics\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:37+0000\n"
-"Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:44+0000\n"
+"Language-Team: Russian <https://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-24 15:25:04+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-18 16:19:21+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-googleanalytics\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
diff --git a/plugins/GoogleAnalytics/locale/sv/LC_MESSAGES/GoogleAnalytics.po b/plugins/GoogleAnalytics/locale/sv/LC_MESSAGES/GoogleAnalytics.po
new file mode 100644
index 0000000000..e10c49a56e
--- /dev/null
+++ b/plugins/GoogleAnalytics/locale/sv/LC_MESSAGES/GoogleAnalytics.po
@@ -0,0 +1,30 @@
+# Translation of StatusNet - GoogleAnalytics to Swedish (svenska)
+# Exported from translatewiki.net
+#
+# Author: WikiPhoenix
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - GoogleAnalytics\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:44+0000\n"
+"Language-Team: Swedish <https://translatewiki.net/wiki/Portal:sv>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-18 16:19:21+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: sv\n"
+"X-Message-Group: #out-statusnet-plugin-googleanalytics\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin description.
+msgid ""
+"Use <a href=\"http://www.google.com/analytics/\">Google Analytics</a> to "
+"track web access."
+msgstr ""
+"Använd <a href=\"http://www.google.com/analytics/\">Google Analytics</a> för "
+"att spåra webbåtkomst."
diff --git a/plugins/GoogleAnalytics/locale/tl/LC_MESSAGES/GoogleAnalytics.po b/plugins/GoogleAnalytics/locale/tl/LC_MESSAGES/GoogleAnalytics.po
index fa3562251c..bdbbcde9b1 100644
--- a/plugins/GoogleAnalytics/locale/tl/LC_MESSAGES/GoogleAnalytics.po
+++ b/plugins/GoogleAnalytics/locale/tl/LC_MESSAGES/GoogleAnalytics.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - GoogleAnalytics\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:38+0000\n"
-"Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:45+0000\n"
+"Language-Team: Tagalog <https://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-24 15:25:04+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-18 16:19:21+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-googleanalytics\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/GoogleAnalytics/locale/uk/LC_MESSAGES/GoogleAnalytics.po b/plugins/GoogleAnalytics/locale/uk/LC_MESSAGES/GoogleAnalytics.po
index 9e603c5ec1..b2d3fe341f 100644
--- a/plugins/GoogleAnalytics/locale/uk/LC_MESSAGES/GoogleAnalytics.po
+++ b/plugins/GoogleAnalytics/locale/uk/LC_MESSAGES/GoogleAnalytics.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - GoogleAnalytics to Ukrainian (Україн�ька)
+# Translation of StatusNet - GoogleAnalytics to Ukrainian (україн�ька)
 # Exported from translatewiki.net
 #
 # Author: Boogie
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - GoogleAnalytics\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:38+0000\n"
-"Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:45+0000\n"
+"Language-Team: Ukrainian <https://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-24 15:25:04+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-18 16:19:21+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-googleanalytics\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
diff --git a/plugins/GoogleAnalytics/locale/zh_CN/LC_MESSAGES/GoogleAnalytics.po b/plugins/GoogleAnalytics/locale/zh_CN/LC_MESSAGES/GoogleAnalytics.po
index 5ee76f6f73..abd5517dbc 100644
--- a/plugins/GoogleAnalytics/locale/zh_CN/LC_MESSAGES/GoogleAnalytics.po
+++ b/plugins/GoogleAnalytics/locale/zh_CN/LC_MESSAGES/GoogleAnalytics.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - GoogleAnalytics to Simplified Chinese (‪中文(简体)‬)
+# Translation of StatusNet - GoogleAnalytics to Simplified Chinese (‪中文（简体）‬)
 # Exported from translatewiki.net
 #
 # Author: ZhengYiFeng
@@ -9,15 +9,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - GoogleAnalytics\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:38+0000\n"
-"Language-Team: Simplified Chinese <http://translatewiki.net/wiki/Portal:zh-"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:45+0000\n"
+"Language-Team: Simplified Chinese <https://translatewiki.net/wiki/Portal:zh-"
 "hans>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-24 15:25:04+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-18 16:19:21+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: #out-statusnet-plugin-googleanalytics\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
diff --git a/plugins/Gravatar/locale/Gravatar.pot b/plugins/Gravatar/locale/Gravatar.pot
index 02f2f95b15..ac4cc73534 100644
--- a/plugins/Gravatar/locale/Gravatar.pot
+++ b/plugins/Gravatar/locale/Gravatar.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
+"POT-Creation-Date: 2012-06-30 11:07+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"
diff --git a/plugins/Gravatar/locale/ca/LC_MESSAGES/Gravatar.po b/plugins/Gravatar/locale/ca/LC_MESSAGES/Gravatar.po
index ac5c457198..7350a5698a 100644
--- a/plugins/Gravatar/locale/ca/LC_MESSAGES/Gravatar.po
+++ b/plugins/Gravatar/locale/ca/LC_MESSAGES/Gravatar.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Gravatar to Catalan (Català)
+# Translation of StatusNet - Gravatar to Catalan (català)
 # Exported from translatewiki.net
 #
 # Author: Toniher
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Gravatar\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:38+0000\n"
-"Language-Team: Catalan <http://translatewiki.net/wiki/Portal:ca>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:45+0000\n"
+"Language-Team: Catalan <https://translatewiki.net/wiki/Portal:ca>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-16 23:17:51+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:17+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ca\n"
 "X-Message-Group: #out-statusnet-plugin-gravatar\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/Gravatar/locale/de/LC_MESSAGES/Gravatar.po b/plugins/Gravatar/locale/de/LC_MESSAGES/Gravatar.po
index eb9f713109..768219620f 100644
--- a/plugins/Gravatar/locale/de/LC_MESSAGES/Gravatar.po
+++ b/plugins/Gravatar/locale/de/LC_MESSAGES/Gravatar.po
@@ -10,14 +10,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Gravatar\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:38+0000\n"
-"Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:45+0000\n"
+"Language-Team: German <https://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-16 23:17:51+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:17+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-gravatar\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/Gravatar/locale/es/LC_MESSAGES/Gravatar.po b/plugins/Gravatar/locale/es/LC_MESSAGES/Gravatar.po
index 23c58bc8d8..b7261d80a6 100644
--- a/plugins/Gravatar/locale/es/LC_MESSAGES/Gravatar.po
+++ b/plugins/Gravatar/locale/es/LC_MESSAGES/Gravatar.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Gravatar to Spanish (Español)
+# Translation of StatusNet - Gravatar to Spanish (español)
 # Exported from translatewiki.net
 #
 # Author: Peter17
@@ -10,14 +10,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Gravatar\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:38+0000\n"
-"Language-Team: Spanish <http://translatewiki.net/wiki/Portal:es>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:45+0000\n"
+"Language-Team: Spanish <https://translatewiki.net/wiki/Portal:es>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-16 23:17:51+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:17+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-plugin-gravatar\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/Gravatar/locale/eu/LC_MESSAGES/Gravatar.po b/plugins/Gravatar/locale/eu/LC_MESSAGES/Gravatar.po
new file mode 100644
index 0000000000..b7f5ad939f
--- /dev/null
+++ b/plugins/Gravatar/locale/eu/LC_MESSAGES/Gravatar.po
@@ -0,0 +1,30 @@
+# Translation of StatusNet - Gravatar to Basque (euskara)
+# Exported from translatewiki.net
+#
+# Author: Artsuaga
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Gravatar\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:45+0000\n"
+"Language-Team: Basque <https://translatewiki.net/wiki/Portal:eu>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:50:17+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: eu\n"
+"X-Message-Group: #out-statusnet-plugin-gravatar\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin decsription.
+msgid ""
+"The Gravatar plugin allows users to use their <a href=\"http://www.gravatar."
+"com/\">Gravatar</a> with StatusNet."
+msgstr ""
+"Gravatar pluginak erabiltzaileei heuren <a href=\"http://www.gravatar.com/"
+"\">Gravatar</a>ra StatusNet-en erabiltzen uzten die."
diff --git a/plugins/Gravatar/locale/fr/LC_MESSAGES/Gravatar.po b/plugins/Gravatar/locale/fr/LC_MESSAGES/Gravatar.po
index b88db38448..09296a71ac 100644
--- a/plugins/Gravatar/locale/fr/LC_MESSAGES/Gravatar.po
+++ b/plugins/Gravatar/locale/fr/LC_MESSAGES/Gravatar.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Gravatar to French (Français)
+# Translation of StatusNet - Gravatar to French (français)
 # Exported from translatewiki.net
 #
 # Author: Verdy p
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Gravatar\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:38+0000\n"
-"Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:45+0000\n"
+"Language-Team: French <https://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-16 23:17:51+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:17+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-gravatar\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
diff --git a/plugins/Gravatar/locale/gl/LC_MESSAGES/Gravatar.po b/plugins/Gravatar/locale/gl/LC_MESSAGES/Gravatar.po
index 534e5eb6bf..fe81d8dde7 100644
--- a/plugins/Gravatar/locale/gl/LC_MESSAGES/Gravatar.po
+++ b/plugins/Gravatar/locale/gl/LC_MESSAGES/Gravatar.po
@@ -1,5 +1,5 @@
-# Translation of StatusNet - Gravatar to Galician (Galego)
-# Expored from translatewiki.net
+# Translation of StatusNet - Gravatar to Galician (galego)
+# Exported from translatewiki.net
 #
 # Author: Toliño
 # --
@@ -9,64 +9,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Gravatar\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-15 00:20+0000\n"
-"PO-Revision-Date: 2011-01-15 00:23:48+0000\n"
-"Language-Team: Galician <http://translatewiki.net/wiki/Portal:gl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:45+0000\n"
+"Language-Team: Galician <https://translatewiki.net/wiki/Portal:gl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:02+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80364); Translate extension (2010-09-17)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:17+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: gl\n"
 "X-Message-Group: #out-statusnet-plugin-gravatar\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: GravatarPlugin.php:60
-msgid "Set Gravatar"
-msgstr ""
-
-#: GravatarPlugin.php:63
-msgid "If you want to use your Gravatar image, click \"Add\"."
-msgstr ""
-
-#: GravatarPlugin.php:68
-msgid "Add"
-msgstr "Engadir"
-
-#: GravatarPlugin.php:78
-msgid "Remove Gravatar"
-msgstr ""
-
-#: GravatarPlugin.php:81
-msgid "If you want to remove your Gravatar image, click \"Remove\"."
-msgstr ""
-
-#: GravatarPlugin.php:86
-msgid "Remove"
-msgstr "Eliminar"
-
-#: GravatarPlugin.php:91
-msgid "To use a Gravatar first enter in an email address."
-msgstr ""
-
-#: GravatarPlugin.php:140
-msgid "You do not have an email address set in your profile."
-msgstr ""
-
-#: GravatarPlugin.php:158
-msgid "Failed to save Gravatar to the database."
-msgstr ""
-
-#: GravatarPlugin.php:162
-msgid "Gravatar added."
-msgstr ""
-
-#: GravatarPlugin.php:180
-msgid "Gravatar removed."
-msgstr ""
-
-#: GravatarPlugin.php:200
+#. TRANS: Plugin decsription.
 msgid ""
 "The Gravatar plugin allows users to use their <a href=\"http://www.gravatar."
 "com/\">Gravatar</a> with StatusNet."
 msgstr ""
+"O complemento Gravatar permite aos usuarios usar o seu <a href=\"http://www."
+"gravatar.com/\">Gravatar</a> co StatusNet."
diff --git a/plugins/Gravatar/locale/he/LC_MESSAGES/Gravatar.po b/plugins/Gravatar/locale/he/LC_MESSAGES/Gravatar.po
new file mode 100644
index 0000000000..02c37f0abf
--- /dev/null
+++ b/plugins/Gravatar/locale/he/LC_MESSAGES/Gravatar.po
@@ -0,0 +1,30 @@
+# Translation of StatusNet - Gravatar to Hebrew (עברית)
+# Exported from translatewiki.net
+#
+# Author: Amire80
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Gravatar\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:45+0000\n"
+"Language-Team: Hebrew <https://translatewiki.net/wiki/Portal:he>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:50:17+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: he\n"
+"X-Message-Group: #out-statusnet-plugin-gravatar\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin decsription.
+msgid ""
+"The Gravatar plugin allows users to use their <a href=\"http://www.gravatar."
+"com/\">Gravatar</a> with StatusNet."
+msgstr ""
+"תוסף Gravatar מ�פשר למשתמשי� להציג �ת ה־<a href=\"http://www.gravatar.com/"
+"\">Gravatar</a> שלה� בסטטוסנט."
diff --git a/plugins/Gravatar/locale/ia/LC_MESSAGES/Gravatar.po b/plugins/Gravatar/locale/ia/LC_MESSAGES/Gravatar.po
index c9341b017a..913d7e0d88 100644
--- a/plugins/Gravatar/locale/ia/LC_MESSAGES/Gravatar.po
+++ b/plugins/Gravatar/locale/ia/LC_MESSAGES/Gravatar.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Gravatar to Interlingua (Interlingua)
+# Translation of StatusNet - Gravatar to Interlingua (interlingua)
 # Exported from translatewiki.net
 #
 # Author: McDutchie
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Gravatar\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:38+0000\n"
-"Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:45+0000\n"
+"Language-Team: Interlingua <https://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-16 23:17:51+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:17+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-gravatar\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/Gravatar/locale/it/LC_MESSAGES/Gravatar.po b/plugins/Gravatar/locale/it/LC_MESSAGES/Gravatar.po
new file mode 100644
index 0000000000..d4537a4090
--- /dev/null
+++ b/plugins/Gravatar/locale/it/LC_MESSAGES/Gravatar.po
@@ -0,0 +1,27 @@
+# Translation of StatusNet - Gravatar to Italian (italiano)
+# Exported from translatewiki.net
+#
+# Author: Ximo17
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Gravatar\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:45+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:50:17+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin decsription.
+msgid ""
+"The Gravatar plugin allows users to use their <a href=\"http://www.gravatar."
+"com/\">Gravatar</a> with StatusNet."
+msgstr ""
+"Il plugin Gravatar consente agli utenti di utilizzare i loro <a href="
+"\"http://www.gravatar.com/\">Gravatar</a> con StatusNet."
diff --git a/plugins/Gravatar/locale/mk/LC_MESSAGES/Gravatar.po b/plugins/Gravatar/locale/mk/LC_MESSAGES/Gravatar.po
index 2e925301f0..ca9abb1c15 100644
--- a/plugins/Gravatar/locale/mk/LC_MESSAGES/Gravatar.po
+++ b/plugins/Gravatar/locale/mk/LC_MESSAGES/Gravatar.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Gravatar to Macedonian (Македон�ки)
+# Translation of StatusNet - Gravatar to Macedonian (македон�ки)
 # Exported from translatewiki.net
 #
 # Author: Bjankuloski06
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Gravatar\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:38+0000\n"
-"Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:45+0000\n"
+"Language-Team: Macedonian <https://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-16 23:17:51+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:17+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-gravatar\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
diff --git a/plugins/Gravatar/locale/nl/LC_MESSAGES/Gravatar.po b/plugins/Gravatar/locale/nl/LC_MESSAGES/Gravatar.po
index a8c45d61f7..b999f6f12d 100644
--- a/plugins/Gravatar/locale/nl/LC_MESSAGES/Gravatar.po
+++ b/plugins/Gravatar/locale/nl/LC_MESSAGES/Gravatar.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Gravatar\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:38+0000\n"
-"Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:46+0000\n"
+"Language-Team: Dutch <https://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-16 23:17:51+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:17+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-gravatar\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/Gravatar/locale/pl/LC_MESSAGES/Gravatar.po b/plugins/Gravatar/locale/pl/LC_MESSAGES/Gravatar.po
index 3121ae0835..fbdbd1501e 100644
--- a/plugins/Gravatar/locale/pl/LC_MESSAGES/Gravatar.po
+++ b/plugins/Gravatar/locale/pl/LC_MESSAGES/Gravatar.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Gravatar to Polish (Polski)
+# Translation of StatusNet - Gravatar to Polish (polski)
 # Exported from translatewiki.net
 #
 # Author: Raven
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Gravatar\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:38+0000\n"
-"Language-Team: Polish <http://translatewiki.net/wiki/Portal:pl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:46+0000\n"
+"Language-Team: Polish <https://translatewiki.net/wiki/Portal:pl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-16 23:17:51+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:17+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: pl\n"
 "X-Message-Group: #out-statusnet-plugin-gravatar\n"
 "Plural-Forms: nplurals=3; plural=(n == 1) ? 0 : ( (n%10 >= 2 && n%10 <= 4 && "
diff --git a/plugins/Gravatar/locale/pt/LC_MESSAGES/Gravatar.po b/plugins/Gravatar/locale/pt/LC_MESSAGES/Gravatar.po
index 8ec53faecf..de53cb1cba 100644
--- a/plugins/Gravatar/locale/pt/LC_MESSAGES/Gravatar.po
+++ b/plugins/Gravatar/locale/pt/LC_MESSAGES/Gravatar.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Gravatar to Portuguese (Português)
+# Translation of StatusNet - Gravatar to Portuguese (português)
 # Exported from translatewiki.net
 #
 # Author: GTNS
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Gravatar\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:39+0000\n"
-"Language-Team: Portuguese <http://translatewiki.net/wiki/Portal:pt>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:46+0000\n"
+"Language-Team: Portuguese <https://translatewiki.net/wiki/Portal:pt>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-16 23:17:51+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:17+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: pt\n"
 "X-Message-Group: #out-statusnet-plugin-gravatar\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/Gravatar/locale/sv/LC_MESSAGES/Gravatar.po b/plugins/Gravatar/locale/sv/LC_MESSAGES/Gravatar.po
new file mode 100644
index 0000000000..fcc37d95af
--- /dev/null
+++ b/plugins/Gravatar/locale/sv/LC_MESSAGES/Gravatar.po
@@ -0,0 +1,30 @@
+# Translation of StatusNet - Gravatar to Swedish (svenska)
+# Exported from translatewiki.net
+#
+# Author: WikiPhoenix
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Gravatar\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:46+0000\n"
+"Language-Team: Swedish <https://translatewiki.net/wiki/Portal:sv>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:50:17+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: sv\n"
+"X-Message-Group: #out-statusnet-plugin-gravatar\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin decsription.
+msgid ""
+"The Gravatar plugin allows users to use their <a href=\"http://www.gravatar."
+"com/\">Gravatar</a> with StatusNet."
+msgstr ""
+"Gravatar-tillägget låter användare använda deras <a href=\"http://www."
+"gravatar.com/\">Gravatar</a> med StatusNet."
diff --git a/plugins/Gravatar/locale/tl/LC_MESSAGES/Gravatar.po b/plugins/Gravatar/locale/tl/LC_MESSAGES/Gravatar.po
index 2a3763f2a2..13a070976b 100644
--- a/plugins/Gravatar/locale/tl/LC_MESSAGES/Gravatar.po
+++ b/plugins/Gravatar/locale/tl/LC_MESSAGES/Gravatar.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Gravatar\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:39+0000\n"
-"Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:46+0000\n"
+"Language-Team: Tagalog <https://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-16 23:17:51+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:17+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-gravatar\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/Gravatar/locale/uk/LC_MESSAGES/Gravatar.po b/plugins/Gravatar/locale/uk/LC_MESSAGES/Gravatar.po
index f42f03bcce..fa011a870e 100644
--- a/plugins/Gravatar/locale/uk/LC_MESSAGES/Gravatar.po
+++ b/plugins/Gravatar/locale/uk/LC_MESSAGES/Gravatar.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Gravatar to Ukrainian (Україн�ька)
+# Translation of StatusNet - Gravatar to Ukrainian (україн�ька)
 # Exported from translatewiki.net
 #
 # Author: Boogie
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Gravatar\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:39+0000\n"
-"Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:46+0000\n"
+"Language-Team: Ukrainian <https://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-16 23:17:51+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:17+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-gravatar\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
diff --git a/plugins/Gravatar/locale/zh_CN/LC_MESSAGES/Gravatar.po b/plugins/Gravatar/locale/zh_CN/LC_MESSAGES/Gravatar.po
index 2d4f02acf2..4236dec409 100644
--- a/plugins/Gravatar/locale/zh_CN/LC_MESSAGES/Gravatar.po
+++ b/plugins/Gravatar/locale/zh_CN/LC_MESSAGES/Gravatar.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Gravatar to Simplified Chinese (‪中文(简体)‬)
+# Translation of StatusNet - Gravatar to Simplified Chinese (‪中文（简体）‬)
 # Exported from translatewiki.net
 #
 # Author: ZhengYiFeng
@@ -9,15 +9,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Gravatar\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:39+0000\n"
-"Language-Team: Simplified Chinese <http://translatewiki.net/wiki/Portal:zh-"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:46+0000\n"
+"Language-Team: Simplified Chinese <https://translatewiki.net/wiki/Portal:zh-"
 "hans>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-16 23:17:51+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:17+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: #out-statusnet-plugin-gravatar\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
diff --git a/plugins/GroupFavorited/locale/GroupFavorited.pot b/plugins/GroupFavorited/locale/GroupFavorited.pot
index c041138ddf..7249a93559 100644
--- a/plugins/GroupFavorited/locale/GroupFavorited.pot
+++ b/plugins/GroupFavorited/locale/GroupFavorited.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
+"POT-Creation-Date: 2012-06-30 11:07+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"
diff --git a/plugins/GroupFavorited/locale/ar/LC_MESSAGES/GroupFavorited.po b/plugins/GroupFavorited/locale/ar/LC_MESSAGES/GroupFavorited.po
new file mode 100644
index 0000000000..946de0a439
--- /dev/null
+++ b/plugins/GroupFavorited/locale/ar/LC_MESSAGES/GroupFavorited.po
@@ -0,0 +1,50 @@
+# Translation of StatusNet - GroupFavorited to Arabic (العربية)
+# Exported from translatewiki.net
+#
+# Author: OsamaK
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - GroupFavorited\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:46+0000\n"
+"Language-Team: Arabic <https://translatewiki.net/wiki/Portal:ar>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:50:17+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: ar\n"
+"X-Message-Group: #out-statusnet-plugin-groupfavorited\n"
+"Plural-Forms: nplurals=6; plural=(n == 0) ? 0 : ( (n == 1) ? 1 : ( (n == "
+"2) ? 2 : ( (n%100 >= 3 && n%100 <= 10) ? 3 : ( (n%100 >= 11 && n%100 <= "
+"99) ? 4 : 5 ) ) ) );\n"
+
+#. TRANS: Menu item in the group navigation page.
+msgctxt "MENU"
+msgid "Popular"
+msgstr "محبوبة"
+
+#. TRANS: Tooltip for menu item in the group navigation page.
+#. TRANS: %s is the nickname of the group.
+#, php-format
+msgctxt "TOOLTIP"
+msgid "Popular notices in %s group"
+msgstr "إشعارات محبوبة �ي مجموعة %s"
+
+#. TRANS: Plugin description.
+msgid "This plugin adds a menu item for popular notices in groups."
+msgstr ""
+
+#. TRANS: %s is a group name.
+#, php-format
+msgid "Popular posts in %s group"
+msgstr ""
+
+#. TRANS: %1$s is a group name, %2$s is a group number.
+#, php-format
+msgid "Popular posts in %1$s group, page %2$d"
+msgstr ""
diff --git a/plugins/GroupFavorited/locale/br/LC_MESSAGES/GroupFavorited.po b/plugins/GroupFavorited/locale/br/LC_MESSAGES/GroupFavorited.po
index 2c37db48c1..177f5808bd 100644
--- a/plugins/GroupFavorited/locale/br/LC_MESSAGES/GroupFavorited.po
+++ b/plugins/GroupFavorited/locale/br/LC_MESSAGES/GroupFavorited.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - GroupFavorited to Breton (Brezhoneg)
+# Translation of StatusNet - GroupFavorited to Breton (brezhoneg)
 # Exported from translatewiki.net
 #
 # Author: Y-M D
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - GroupFavorited\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:39+0000\n"
-"Language-Team: Breton <http://translatewiki.net/wiki/Portal:br>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:46+0000\n"
+"Language-Team: Breton <https://translatewiki.net/wiki/Portal:br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:07:11+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:17+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-groupfavorited\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
diff --git a/plugins/GroupFavorited/locale/ca/LC_MESSAGES/GroupFavorited.po b/plugins/GroupFavorited/locale/ca/LC_MESSAGES/GroupFavorited.po
index 8f51174e95..ddb8b1227d 100644
--- a/plugins/GroupFavorited/locale/ca/LC_MESSAGES/GroupFavorited.po
+++ b/plugins/GroupFavorited/locale/ca/LC_MESSAGES/GroupFavorited.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - GroupFavorited to Catalan (Català)
+# Translation of StatusNet - GroupFavorited to Catalan (català)
 # Exported from translatewiki.net
 #
 # Author: Toniher
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - GroupFavorited\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:39+0000\n"
-"Language-Team: Catalan <http://translatewiki.net/wiki/Portal:ca>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:46+0000\n"
+"Language-Team: Catalan <https://translatewiki.net/wiki/Portal:ca>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:07:11+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:17+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ca\n"
 "X-Message-Group: #out-statusnet-plugin-groupfavorited\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/GroupFavorited/locale/de/LC_MESSAGES/GroupFavorited.po b/plugins/GroupFavorited/locale/de/LC_MESSAGES/GroupFavorited.po
index 39cc04b1c0..f2793b3411 100644
--- a/plugins/GroupFavorited/locale/de/LC_MESSAGES/GroupFavorited.po
+++ b/plugins/GroupFavorited/locale/de/LC_MESSAGES/GroupFavorited.po
@@ -10,14 +10,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - GroupFavorited\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:39+0000\n"
-"Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:46+0000\n"
+"Language-Team: German <https://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:07:11+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:17+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-groupfavorited\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/GroupFavorited/locale/es/LC_MESSAGES/GroupFavorited.po b/plugins/GroupFavorited/locale/es/LC_MESSAGES/GroupFavorited.po
index 1ca92988b8..b1c67cb233 100644
--- a/plugins/GroupFavorited/locale/es/LC_MESSAGES/GroupFavorited.po
+++ b/plugins/GroupFavorited/locale/es/LC_MESSAGES/GroupFavorited.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - GroupFavorited to Spanish (Español)
+# Translation of StatusNet - GroupFavorited to Spanish (español)
 # Exported from translatewiki.net
 #
 # Author: Translationista
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - GroupFavorited\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:39+0000\n"
-"Language-Team: Spanish <http://translatewiki.net/wiki/Portal:es>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:46+0000\n"
+"Language-Team: Spanish <https://translatewiki.net/wiki/Portal:es>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:07:11+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:17+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-plugin-groupfavorited\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/GroupFavorited/locale/eu/LC_MESSAGES/GroupFavorited.po b/plugins/GroupFavorited/locale/eu/LC_MESSAGES/GroupFavorited.po
new file mode 100644
index 0000000000..2081095c87
--- /dev/null
+++ b/plugins/GroupFavorited/locale/eu/LC_MESSAGES/GroupFavorited.po
@@ -0,0 +1,48 @@
+# Translation of StatusNet - GroupFavorited to Basque (euskara)
+# Exported from translatewiki.net
+#
+# Author: Artsuaga
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - GroupFavorited\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:46+0000\n"
+"Language-Team: Basque <https://translatewiki.net/wiki/Portal:eu>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:50:17+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: eu\n"
+"X-Message-Group: #out-statusnet-plugin-groupfavorited\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Menu item in the group navigation page.
+msgctxt "MENU"
+msgid "Popular"
+msgstr "Arrakastatsua"
+
+#. TRANS: Tooltip for menu item in the group navigation page.
+#. TRANS: %s is the nickname of the group.
+#, php-format
+msgctxt "TOOLTIP"
+msgid "Popular notices in %s group"
+msgstr "Ohar arrakastatsuak %s taldean"
+
+#. TRANS: Plugin description.
+msgid "This plugin adds a menu item for popular notices in groups."
+msgstr "Plugin honek taldeetako ohar arrakastatsuentzako menu bat gehitzen du."
+
+#. TRANS: %s is a group name.
+#, php-format
+msgid "Popular posts in %s group"
+msgstr "Sarrera arrakastatsuak %s taldean"
+
+#. TRANS: %1$s is a group name, %2$s is a group number.
+#, php-format
+msgid "Popular posts in %1$s group, page %2$d"
+msgstr "Sarrera arrakastatsuak %1$s taldean, %2$d. orria"
diff --git a/plugins/GroupFavorited/locale/fr/LC_MESSAGES/GroupFavorited.po b/plugins/GroupFavorited/locale/fr/LC_MESSAGES/GroupFavorited.po
index 52a1a80817..5afa9ede9d 100644
--- a/plugins/GroupFavorited/locale/fr/LC_MESSAGES/GroupFavorited.po
+++ b/plugins/GroupFavorited/locale/fr/LC_MESSAGES/GroupFavorited.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - GroupFavorited to French (Français)
+# Translation of StatusNet - GroupFavorited to French (français)
 # Exported from translatewiki.net
 #
 # Author: Peter17
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - GroupFavorited\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:40+0000\n"
-"Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:47+0000\n"
+"Language-Team: French <https://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:07:11+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:17+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-groupfavorited\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
diff --git a/plugins/GroupFavorited/locale/gl/LC_MESSAGES/GroupFavorited.po b/plugins/GroupFavorited/locale/gl/LC_MESSAGES/GroupFavorited.po
index 1dd12d7343..e830ef1c28 100644
--- a/plugins/GroupFavorited/locale/gl/LC_MESSAGES/GroupFavorited.po
+++ b/plugins/GroupFavorited/locale/gl/LC_MESSAGES/GroupFavorited.po
@@ -1,5 +1,5 @@
-# Translation of StatusNet - GroupFavorited to Galician (Galego)
-# Expored from translatewiki.net
+# Translation of StatusNet - GroupFavorited to Galician (galego)
+# Exported from translatewiki.net
 #
 # Author: Toliño
 # --
@@ -9,45 +9,42 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - GroupFavorited\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:07+0000\n"
-"Language-Team: Galician <http://translatewiki.net/wiki/Portal:gl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:47+0000\n"
+"Language-Team: Galician <https://translatewiki.net/wiki/Portal:gl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2010-11-30 20:40:36+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:17+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: gl\n"
 "X-Message-Group: #out-statusnet-plugin-groupfavorited\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#. TRANS: %s is a group name.
-#: groupfavoritedaction.php:48
-#, php-format
-msgid "Popular posts in %s group"
-msgstr ""
-
-#. TRANS: %1$s is a group name, %2$s is a group number.
-#: groupfavoritedaction.php:51
-#, php-format
-msgid "Popular posts in %1$s group, page %2$d"
-msgstr ""
-
 #. TRANS: Menu item in the group navigation page.
-#: GroupFavoritedPlugin.php:72
 msgctxt "MENU"
 msgid "Popular"
 msgstr "Populares"
 
 #. TRANS: Tooltip for menu item in the group navigation page.
 #. TRANS: %s is the nickname of the group.
-#: GroupFavoritedPlugin.php:75
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Popular notices in %s group"
-msgstr ""
+msgstr "Notas populares no grupo %s"
 
 #. TRANS: Plugin description.
-#: GroupFavoritedPlugin.php:99
 msgid "This plugin adds a menu item for popular notices in groups."
 msgstr ""
+"Este complemento engade un elemento de menú para as notas populares nos "
+"grupos."
+
+#. TRANS: %s is a group name.
+#, php-format
+msgid "Popular posts in %s group"
+msgstr "Mensaxes populares no grupo %s"
+
+#. TRANS: %1$s is a group name, %2$s is a group number.
+#, php-format
+msgid "Popular posts in %1$s group, page %2$d"
+msgstr "Mensaxes populares no grupo %1$s, páxina %2$d"
diff --git a/plugins/GroupFavorited/locale/ia/LC_MESSAGES/GroupFavorited.po b/plugins/GroupFavorited/locale/ia/LC_MESSAGES/GroupFavorited.po
index a3e5f5046f..e71711dcc1 100644
--- a/plugins/GroupFavorited/locale/ia/LC_MESSAGES/GroupFavorited.po
+++ b/plugins/GroupFavorited/locale/ia/LC_MESSAGES/GroupFavorited.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - GroupFavorited to Interlingua (Interlingua)
+# Translation of StatusNet - GroupFavorited to Interlingua (interlingua)
 # Exported from translatewiki.net
 #
 # Author: McDutchie
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - GroupFavorited\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:40+0000\n"
-"Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:47+0000\n"
+"Language-Team: Interlingua <https://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:07:11+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:17+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-groupfavorited\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/GroupFavorited/locale/it/LC_MESSAGES/GroupFavorited.po b/plugins/GroupFavorited/locale/it/LC_MESSAGES/GroupFavorited.po
new file mode 100644
index 0000000000..f2864edf62
--- /dev/null
+++ b/plugins/GroupFavorited/locale/it/LC_MESSAGES/GroupFavorited.po
@@ -0,0 +1,47 @@
+# Translation of StatusNet - GroupFavorited to Italian (italiano)
+# Exported from translatewiki.net
+#
+# Author: Ximo17
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - GroupFavorited\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:47+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:50:17+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Menu item in the group navigation page.
+msgctxt "MENU"
+msgid "Popular"
+msgstr "Popolare"
+
+#. TRANS: Tooltip for menu item in the group navigation page.
+#. TRANS: %s is the nickname of the group.
+#, php-format
+msgctxt "TOOLTIP"
+msgid "Popular notices in %s group"
+msgstr "Notizie popolari nel gruppo %s"
+
+#. TRANS: Plugin description.
+msgid "This plugin adds a menu item for popular notices in groups."
+msgstr ""
+"Questo plugin aggiunge una voce di menu per le notizie popolari contenute "
+"nei gruppi."
+
+#. TRANS: %s is a group name.
+#, php-format
+msgid "Popular posts in %s group"
+msgstr "Post popolari nel gruppo %s"
+
+#. TRANS: %1$s is a group name, %2$s is a group number.
+#, php-format
+msgid "Popular posts in %1$s group, page %2$d"
+msgstr "Post popolari nel gruppo %1$s, page %2$d"
diff --git a/plugins/GroupFavorited/locale/mk/LC_MESSAGES/GroupFavorited.po b/plugins/GroupFavorited/locale/mk/LC_MESSAGES/GroupFavorited.po
index c4282b2853..4cf74c2031 100644
--- a/plugins/GroupFavorited/locale/mk/LC_MESSAGES/GroupFavorited.po
+++ b/plugins/GroupFavorited/locale/mk/LC_MESSAGES/GroupFavorited.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - GroupFavorited to Macedonian (Македон�ки)
+# Translation of StatusNet - GroupFavorited to Macedonian (македон�ки)
 # Exported from translatewiki.net
 #
 # Author: Bjankuloski06
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - GroupFavorited\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:40+0000\n"
-"Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:47+0000\n"
+"Language-Team: Macedonian <https://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:07:11+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:17+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-groupfavorited\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
diff --git a/plugins/GroupFavorited/locale/nl/LC_MESSAGES/GroupFavorited.po b/plugins/GroupFavorited/locale/nl/LC_MESSAGES/GroupFavorited.po
index 4bfa441ba6..a5f9647c26 100644
--- a/plugins/GroupFavorited/locale/nl/LC_MESSAGES/GroupFavorited.po
+++ b/plugins/GroupFavorited/locale/nl/LC_MESSAGES/GroupFavorited.po
@@ -10,14 +10,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - GroupFavorited\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:40+0000\n"
-"Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:47+0000\n"
+"Language-Team: Dutch <https://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:07:11+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:17+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-groupfavorited\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/GroupFavorited/locale/ru/LC_MESSAGES/GroupFavorited.po b/plugins/GroupFavorited/locale/ru/LC_MESSAGES/GroupFavorited.po
index 0f77383ff7..cd1e236119 100644
--- a/plugins/GroupFavorited/locale/ru/LC_MESSAGES/GroupFavorited.po
+++ b/plugins/GroupFavorited/locale/ru/LC_MESSAGES/GroupFavorited.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - GroupFavorited to Russian (Ру��кий)
+# Translation of StatusNet - GroupFavorited to Russian (ру��кий)
 # Exported from translatewiki.net
 #
 # Author: Eleferen
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - GroupFavorited\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:40+0000\n"
-"Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:47+0000\n"
+"Language-Team: Russian <https://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:07:11+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:17+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-groupfavorited\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
diff --git a/plugins/GroupFavorited/locale/te/LC_MESSAGES/GroupFavorited.po b/plugins/GroupFavorited/locale/te/LC_MESSAGES/GroupFavorited.po
index b3e752c8a2..0830604acd 100644
--- a/plugins/GroupFavorited/locale/te/LC_MESSAGES/GroupFavorited.po
+++ b/plugins/GroupFavorited/locale/te/LC_MESSAGES/GroupFavorited.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - GroupFavorited\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:40+0000\n"
-"Language-Team: Telugu <http://translatewiki.net/wiki/Portal:te>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:47+0000\n"
+"Language-Team: Telugu <https://translatewiki.net/wiki/Portal:te>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:07:11+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:17+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: te\n"
 "X-Message-Group: #out-statusnet-plugin-groupfavorited\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/GroupFavorited/locale/tl/LC_MESSAGES/GroupFavorited.po b/plugins/GroupFavorited/locale/tl/LC_MESSAGES/GroupFavorited.po
index 842fbf83ef..aa1163bd50 100644
--- a/plugins/GroupFavorited/locale/tl/LC_MESSAGES/GroupFavorited.po
+++ b/plugins/GroupFavorited/locale/tl/LC_MESSAGES/GroupFavorited.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - GroupFavorited\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:40+0000\n"
-"Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:47+0000\n"
+"Language-Team: Tagalog <https://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:07:11+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:17+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-groupfavorited\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/GroupFavorited/locale/uk/LC_MESSAGES/GroupFavorited.po b/plugins/GroupFavorited/locale/uk/LC_MESSAGES/GroupFavorited.po
index c88a0a885f..c3710a5216 100644
--- a/plugins/GroupFavorited/locale/uk/LC_MESSAGES/GroupFavorited.po
+++ b/plugins/GroupFavorited/locale/uk/LC_MESSAGES/GroupFavorited.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - GroupFavorited to Ukrainian (Україн�ька)
+# Translation of StatusNet - GroupFavorited to Ukrainian (україн�ька)
 # Exported from translatewiki.net
 #
 # Author: Boogie
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - GroupFavorited\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:40+0000\n"
-"Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:47+0000\n"
+"Language-Team: Ukrainian <https://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:07:11+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:17+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-groupfavorited\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
diff --git a/plugins/GroupPrivateMessage/groupinbox.php b/plugins/GroupPrivateMessage/groupinbox.php
index 3464a1202a..b6308c663f 100644
--- a/plugins/GroupPrivateMessage/groupinbox.php
+++ b/plugins/GroupPrivateMessage/groupinbox.php
@@ -44,7 +44,7 @@ if (!defined('STATUSNET')) {
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
  * @link      http://status.net/
  */
-class GroupinboxAction extends GroupDesignAction
+class GroupinboxAction extends GroupAction
 {
     var $gm;
 
diff --git a/plugins/GroupPrivateMessage/locale/GroupPrivateMessage.pot b/plugins/GroupPrivateMessage/locale/GroupPrivateMessage.pot
index 231116a60d..406f727405 100644
--- a/plugins/GroupPrivateMessage/locale/GroupPrivateMessage.pot
+++ b/plugins/GroupPrivateMessage/locale/GroupPrivateMessage.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
+"POT-Creation-Date: 2012-06-30 11:07+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"
diff --git a/plugins/GroupPrivateMessage/locale/ar/LC_MESSAGES/GroupPrivateMessage.po b/plugins/GroupPrivateMessage/locale/ar/LC_MESSAGES/GroupPrivateMessage.po
new file mode 100644
index 0000000000..408fedef72
--- /dev/null
+++ b/plugins/GroupPrivateMessage/locale/ar/LC_MESSAGES/GroupPrivateMessage.po
@@ -0,0 +1,299 @@
+# Translation of StatusNet - GroupPrivateMessage to Arabic (العربية)
+# Exported from translatewiki.net
+#
+# Author: Majid Al-Dharrab
+# Author: OsamaK
+# Author: ترجمان05
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - GroupPrivateMessage\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:47+0000\n"
+"Language-Team: Arabic <https://translatewiki.net/wiki/Portal:ar>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-12-03 13:48:53+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: ar\n"
+"X-Message-Group: #out-statusnet-plugin-groupprivatemessage\n"
+"Plural-Forms: nplurals=6; plural=(n == 0) ? 0 : ( (n == 1) ? 1 : ( (n == "
+"2) ? 2 : ( (n%100 >= 3 && n%100 <= 10) ? 3 : ( (n%100 >= 11 && n%100 <= "
+"99) ? 4 : 5 ) ) ) );\n"
+
+#. TRANS: Client exception thrown when trying to send a private group message while not logged in.
+msgid "Must be logged in."
+msgstr "يجب الولوج."
+
+#. TRANS: Exception thrown when user %s is not allowed to send a private group message.
+#. TRANS: Exception thrown when trying to send group private message without having the right to do that.
+#. TRANS: %s is a user nickname.
+#, php-format
+msgid "User %s is not allowed to send private messages."
+msgstr "لا يسمح للمستخدم %s بإرسال رسائل خاصة."
+
+#. TRANS: Client exception thrown when trying to send a private group message to a non-existing group.
+#. TRANS: Client exception thrown when trying to view group inbox for non-existing group.
+msgid "No such group."
+msgstr "لا توجد مجموعة بهذا الاسم."
+
+#. TRANS: Title after sending a private group message.
+msgid "Message sent"
+msgstr "أ�رسلت الرسالة"
+
+#. TRANS: Succes text after sending a direct message to group %s.
+#, php-format
+msgid "Direct message to %s sent."
+msgstr "أ�رسلت رسالة مباشرة إلى %s."
+
+#. TRANS: Title of form for new private group message.
+#, php-format
+msgid "New message to group %s"
+msgstr "رسالة جديدة لمجموعة %s"
+
+#. TRANS: Subject for direct-message notification email.
+#. TRANS: %1$s is the sending user's nickname, %2$s is the group nickname.
+#, php-format
+msgid "New private message from %1$s to group %2$s"
+msgstr "رسالة جديدة من %1$s إلى مجموعة %2$s"
+
+#. TRANS: Body for direct-message notification email.
+#. TRANS: %1$s is the sending user's long name, %2$s is the sending user's nickname,
+#. TRANS: %3$s is the message content, %4$s a URL to the message,
+#. TRANS: %5$s is the StatusNet sitename.
+#, php-format
+msgid ""
+"%1$s (%2$s) sent a private message to group %3$s:\n"
+"\n"
+"------------------------------------------------------\n"
+"%4$s\n"
+"------------------------------------------------------\n"
+"\n"
+"You can reply to their message here:\n"
+"\n"
+"%5$s\n"
+"\n"
+"Do not reply to this email; it will not get to them.\n"
+"\n"
+"With kind regards,\n"
+"%6$s"
+msgstr ""
+"أرسل %1$s (%2$s) رسالة خاصة لمجموعة %3$s:\n"
+"\n"
+"------------------------------------------------------\n"
+"%4$s\n"
+"------------------------------------------------------\n"
+"\n"
+"يمكن أن ترد على رسالته من:\n"
+"\n"
+"%5$s\n"
+"\n"
+"لا ترد على هذا البريد؛ لأنه لن يصل إلى المستخدم.\n"
+"\n"
+"مع تحياتنا العطرة،\n"
+"%6$s"
+
+#. TRANS: Menu item in group page.
+msgctxt "MENU"
+msgid "Inbox"
+msgstr "صندوق الوارد"
+
+#. TRANS: Menu title in group page.
+msgid "Private messages for this group."
+msgstr "الرسائل الخاصة بهذه المجموعة."
+
+#. TRANS: Dropdown label in group settings page for if group allows private messages.
+msgid "Private messages"
+msgstr "الرسائل الخاصة"
+
+#. TRANS: Dropdown option in group settings page for allowing private messages.
+msgid "Sometimes"
+msgstr "أحيانًا"
+
+#. TRANS: Dropdown option in group settings page for allowing private messages.
+msgid "Always"
+msgstr "دائمًا"
+
+#. TRANS: Dropdown option in group settings page for allowing private messages.
+msgid "Never"
+msgstr "مطلقا"
+
+#. TRANS: Dropdown title in group settings page for if group allows private messages.
+msgid "Whether to allow private messages to this group."
+msgstr "هل تود السماح بالرسائل الخاصة لهذه المجموعة؟"
+
+#. TRANS: Dropdown label in group settings page for who can send private messages to the group.
+msgid "Private senders"
+msgstr "مرسلون خاصون"
+
+#. TRANS: Dropdown option in group settings page for who can send private messages.
+msgid "Everyone"
+msgstr "الجميع"
+
+#. TRANS: Dropdown option in group settings page for who can send private messages.
+msgid "Member"
+msgstr "العضو"
+
+#. TRANS: Dropdown option in group settings page for who can send private messages.
+msgid "Admin"
+msgstr "الإداري"
+
+#. TRANS: Dropdown title in group settings page for who can send private messages to the group.
+msgid "Who can send private messages to the group."
+msgstr "من يستطيع إرسال رسائل خاصة للمجموعة."
+
+#. TRANS: Title for action in group actions list.
+msgid "Send a direct message to this group."
+msgstr ""
+
+#. TRANS: Link text for action in group actions list to send a private message to a group.
+msgctxt "LINKTEXT"
+msgid "Message"
+msgstr "راسل"
+
+#. TRANS: Client exception thrown when a private group message has to be forced.
+msgid "Forced notice to private group message."
+msgstr ""
+
+#. TRANS: Indicator on the group page that the group is (essentially) private.
+msgid "Private"
+msgstr "خاصة"
+
+#. TRANS: Plugin description.
+msgid "Allow posting private messages to groups."
+msgstr "هل تود السماح بإرسال رسائل خاصة للمجموعات؟"
+
+#. TRANS: Client exception thrown when trying to view group inbox while not logged in.
+msgid "Only for logged-in users."
+msgstr ""
+
+#. TRANS: Client exception thrown when trying to view group inbox while not a member.
+msgid "Only for members."
+msgstr "�قط للأعضاء."
+
+#. TRANS: Text of group inbox if no private messages were sent to it.
+msgid "This group has not received any private messages."
+msgstr "لم تتلقَ هذه المجموعة أي رسائل خاصة."
+
+#. TRANS: Title of inbox for group %s.
+#, php-format
+msgid "%s group inbox"
+msgstr "صندوق مجموعة %s الوارد"
+
+#. TRANS: Page title for any but first group page.
+#. TRANS: %1$s is a group name, $2$s is a page number.
+#, php-format
+msgid "%1$s group inbox, page %2$d"
+msgstr "صندوق مجموعة %1$s الوارد، الص�حة %2$d"
+
+#. TRANS: Instructions for user inbox page.
+msgid ""
+"This is the group inbox, which lists all incoming private messages for this "
+"group."
+msgstr ""
+
+#. TRANS: Form legend for sending private message to group %s.
+#, php-format
+msgid "Message to %s"
+msgstr "رسالة إلى %s."
+
+#. TRANS: Field label for private group message to group %s.
+#, php-format
+msgid "Direct message to %s"
+msgstr "رسالة مباشرة ل%s"
+
+#. TRANS: Indicator for number of chatacters still available for notice.
+msgid "Available characters"
+msgstr "الأحر� المتاحة"
+
+#. TRANS: Send button text for sending private group notice.
+msgctxt "Send button for sending notice"
+msgid "Send"
+msgstr "أرسل"
+
+#. TRANS: Exception thrown when trying to set group privacy setting if group %s does not allow private messages.
+#, php-format
+msgid "Group %s does not allow private messages."
+msgstr "لا تمسح المجموعة %s بالرسائل الخاصة."
+
+#. TRANS: Exception thrown when trying to send group private message while blocked from that group.
+#. TRANS: %1$s is a user nickname, %2$s is a group nickname.
+#, php-format
+msgid "User %1$s is blocked from group %2$s."
+msgstr "المستخدم %1$s ممنوع من القائمة %2$s."
+
+#. TRANS: Exception thrown when trying to send group private message while not a member.
+#. TRANS: %1$s is a user nickname, %2$s is a group nickname.
+#, php-format
+msgid "User %1$s is not a member of group %2$s."
+msgstr "المستخدم %1$s ليس عضوا �ي المجموعة %2$s."
+
+#. TRANS: Exception thrown when trying to send group private message while not a group administrator.
+#. TRANS: %1$s is a user nickname, %2$s is a group nickname.
+#, php-format
+msgid "User %1$s is not an administrator of group %2$s."
+msgstr "المستخدم %1$s  ليس إداريا للمجموعة %2$s."
+
+#. TRANS: Exception thrown when encountering undefined group privacy settings.
+#. TRANS: %s is a group nickname.
+#, php-format
+msgid "Unknown privacy settings for group %s."
+msgstr "إعدادات الخصوصية للمجموعة %s غير معرو�ة."
+
+#. TRANS: Exception thrown when trying to send group private message that is too long.
+#. TRANS: %d is the maximum meggage length.
+#, php-format
+msgid "That's too long. Maximum message size is %d character."
+msgid_plural "That's too long. Maximum message size is %d characters."
+msgstr[0] "هذا أطول من الحد المسموح به. لا يسمح بوضع حر� واحد �ي الرسالة."
+msgstr[1] "هذا أطول من الحد المسموح به. لا يسمح بوضع أكثر حر� واحد �ي الرسالة."
+msgstr[2] "هذا أطول من الحد المسموح به. لا يسمح بوضع أكثر من حر�ين �ي الرسالة."
+msgstr[3] ""
+"هذا أطول من الحد المسموح به. لا يسمح بوضع أكثر من %d أحر� �ي الرسالة."
+msgstr[4] ""
+"هذا أطول من الحد المسموح به. لا يسمح بوضع أكثر من %d حر�ًا �ي الرسالة."
+msgstr[5] ""
+"هذا أطول من الحد المسموح به. لا يسمح بوضع أكثر من %d حر� �ي الرسالة."
+
+#. TRANS: Exception thrown when trying to send group private message to a non-existing group.
+msgid "No group for group message."
+msgstr ""
+
+#. TRANS: Exception thrown when trying to send group private message without having a sender.
+msgid "No sender for group message."
+msgstr ""
+
+#. TRANS: Client exception thrown when trying to view group private messages without being logged in.
+msgid "Only logged-in users can view private messages."
+msgstr ""
+
+#. TRANS: Client exception thrown when trying to view a non-existing group private message.
+msgid "No such message."
+msgstr ""
+
+#. TRANS: Server exception thrown when trying to view group private messages for a non-exsting group.
+msgid "Group not found."
+msgstr "المجموعة غير موجودة."
+
+#. TRANS: Client exception thrown when trying to view a group private message without being a group member.
+msgid "Cannot read message."
+msgstr "تعذرت قراءة الرسالة."
+
+#. TRANS: Server exception thrown when trying to view a group private message without a sender.
+msgid "No sender found."
+msgstr ""
+
+#. TRANS: Title for private group message.
+#. TRANS: %1$s is the sender name, %2$s is the group name, %3$s is a timestamp.
+#, php-format
+msgid "Message from %1$s to group %2$s on %3$s"
+msgstr "رسالة من %1$s إلى مجموعة %2$s �ي %3$s"
+
+#. TRANS: Succes message after sending private group message to group %s.
+#, php-format
+msgid "Direct message to group %s sent."
+msgstr "أرسلت رسالة مبشارة إلى مجموعة %s."
diff --git a/plugins/GroupPrivateMessage/locale/ca/LC_MESSAGES/GroupPrivateMessage.po b/plugins/GroupPrivateMessage/locale/ca/LC_MESSAGES/GroupPrivateMessage.po
new file mode 100644
index 0000000000..0a3951205a
--- /dev/null
+++ b/plugins/GroupPrivateMessage/locale/ca/LC_MESSAGES/GroupPrivateMessage.po
@@ -0,0 +1,289 @@
+# Translation of StatusNet - GroupPrivateMessage to Catalan (català)
+# Exported from translatewiki.net
+#
+# Author: Toniher
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - GroupPrivateMessage\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:48+0000\n"
+"Language-Team: Catalan <https://translatewiki.net/wiki/Portal:ca>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-12-03 13:48:53+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: ca\n"
+"X-Message-Group: #out-statusnet-plugin-groupprivatemessage\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Client exception thrown when trying to send a private group message while not logged in.
+msgid "Must be logged in."
+msgstr "Cal que hàgiu iniciat una sessió."
+
+#. TRANS: Exception thrown when user %s is not allowed to send a private group message.
+#. TRANS: Exception thrown when trying to send group private message without having the right to do that.
+#. TRANS: %s is a user nickname.
+#, php-format
+msgid "User %s is not allowed to send private messages."
+msgstr "L'usuari %s no té permisos per enviar missatges privats."
+
+#. TRANS: Client exception thrown when trying to send a private group message to a non-existing group.
+#. TRANS: Client exception thrown when trying to view group inbox for non-existing group.
+msgid "No such group."
+msgstr "No existeix el grup."
+
+#. TRANS: Title after sending a private group message.
+msgid "Message sent"
+msgstr "S'ha enviat el missatge"
+
+#. TRANS: Succes text after sending a direct message to group %s.
+#, php-format
+msgid "Direct message to %s sent."
+msgstr "S'ha enviat el missatge directe a %s."
+
+#. TRANS: Title of form for new private group message.
+#, php-format
+msgid "New message to group %s"
+msgstr "Missatge nou al grup %s"
+
+#. TRANS: Subject for direct-message notification email.
+#. TRANS: %1$s is the sending user's nickname, %2$s is the group nickname.
+#, php-format
+msgid "New private message from %1$s to group %2$s"
+msgstr "Nou missatge privat de %1$s al grup %2$s"
+
+#. TRANS: Body for direct-message notification email.
+#. TRANS: %1$s is the sending user's long name, %2$s is the sending user's nickname,
+#. TRANS: %3$s is the message content, %4$s a URL to the message,
+#. TRANS: %5$s is the StatusNet sitename.
+#, php-format
+msgid ""
+"%1$s (%2$s) sent a private message to group %3$s:\n"
+"\n"
+"------------------------------------------------------\n"
+"%4$s\n"
+"------------------------------------------------------\n"
+"\n"
+"You can reply to their message here:\n"
+"\n"
+"%5$s\n"
+"\n"
+"Do not reply to this email; it will not get to them.\n"
+"\n"
+"With kind regards,\n"
+"%6$s"
+msgstr ""
+"%1$s (%2$s) ha enviat un missatge privat al grup %3$s:\n"
+"\n"
+"------------------------------------------------------\n"
+"%4$s\n"
+"------------------------------------------------------\n"
+"\n"
+"Podeu respondre al missatge des d'aquí:\n"
+"%5$s\n"
+"\n"
+"No respongueu aquest missatge; no el rebran.\n"
+"\n"
+"Atentament,\n"
+"%6$s"
+
+#. TRANS: Menu item in group page.
+msgctxt "MENU"
+msgid "Inbox"
+msgstr "Safata d'entrada"
+
+#. TRANS: Menu title in group page.
+msgid "Private messages for this group."
+msgstr "Missatges privats del grup."
+
+#. TRANS: Dropdown label in group settings page for if group allows private messages.
+msgid "Private messages"
+msgstr "Missatges privats"
+
+#. TRANS: Dropdown option in group settings page for allowing private messages.
+msgid "Sometimes"
+msgstr "A vegades"
+
+#. TRANS: Dropdown option in group settings page for allowing private messages.
+msgid "Always"
+msgstr "Sempre"
+
+#. TRANS: Dropdown option in group settings page for allowing private messages.
+msgid "Never"
+msgstr "Mai"
+
+#. TRANS: Dropdown title in group settings page for if group allows private messages.
+msgid "Whether to allow private messages to this group."
+msgstr "Si permetre missatges privat al grup."
+
+#. TRANS: Dropdown label in group settings page for who can send private messages to the group.
+msgid "Private senders"
+msgstr "Remitents privats"
+
+#. TRANS: Dropdown option in group settings page for who can send private messages.
+msgid "Everyone"
+msgstr "Tothom"
+
+#. TRANS: Dropdown option in group settings page for who can send private messages.
+msgid "Member"
+msgstr "Membre"
+
+#. TRANS: Dropdown option in group settings page for who can send private messages.
+msgid "Admin"
+msgstr "Administrador"
+
+#. TRANS: Dropdown title in group settings page for who can send private messages to the group.
+msgid "Who can send private messages to the group."
+msgstr "Qui pot enviar missatges al grup."
+
+#. TRANS: Title for action in group actions list.
+msgid "Send a direct message to this group."
+msgstr "Envia un missatge directe al grup."
+
+#. TRANS: Link text for action in group actions list to send a private message to a group.
+msgctxt "LINKTEXT"
+msgid "Message"
+msgstr "Missatge"
+
+#. TRANS: Client exception thrown when a private group message has to be forced.
+msgid "Forced notice to private group message."
+msgstr ""
+
+#. TRANS: Indicator on the group page that the group is (essentially) private.
+msgid "Private"
+msgstr "Privat"
+
+#. TRANS: Plugin description.
+msgid "Allow posting private messages to groups."
+msgstr "Permet publicar missatges privats als grups."
+
+#. TRANS: Client exception thrown when trying to view group inbox while not logged in.
+msgid "Only for logged-in users."
+msgstr "Només per a usuaris que han iniciat una sessió"
+
+#. TRANS: Client exception thrown when trying to view group inbox while not a member.
+msgid "Only for members."
+msgstr "Només per a membres."
+
+#. TRANS: Text of group inbox if no private messages were sent to it.
+msgid "This group has not received any private messages."
+msgstr "Aquest grup no ha rebut cap missatge privat."
+
+#. TRANS: Title of inbox for group %s.
+#, php-format
+msgid "%s group inbox"
+msgstr "Safata d'entrada del grup %s"
+
+#. TRANS: Page title for any but first group page.
+#. TRANS: %1$s is a group name, $2$s is a page number.
+#, php-format
+msgid "%1$s group inbox, page %2$d"
+msgstr "Safata d'entrada del grup %1$s, pàgina %2$d"
+
+#. TRANS: Instructions for user inbox page.
+msgid ""
+"This is the group inbox, which lists all incoming private messages for this "
+"group."
+msgstr ""
+"Aquesta és la safata d'entrada del grup, que llista tots els missatges "
+"privats entrants que arriben al grup."
+
+#. TRANS: Form legend for sending private message to group %s.
+#, php-format
+msgid "Message to %s"
+msgstr "Missatge a %s"
+
+#. TRANS: Field label for private group message to group %s.
+#, php-format
+msgid "Direct message to %s"
+msgstr "Missatge directe a %s"
+
+#. TRANS: Indicator for number of chatacters still available for notice.
+msgid "Available characters"
+msgstr "Caràcters disponibles"
+
+#. TRANS: Send button text for sending private group notice.
+msgctxt "Send button for sending notice"
+msgid "Send"
+msgstr "Envia"
+
+#. TRANS: Exception thrown when trying to set group privacy setting if group %s does not allow private messages.
+#, php-format
+msgid "Group %s does not allow private messages."
+msgstr "El grup %s no permet missatges privats."
+
+#. TRANS: Exception thrown when trying to send group private message while blocked from that group.
+#. TRANS: %1$s is a user nickname, %2$s is a group nickname.
+#, php-format
+msgid "User %1$s is blocked from group %2$s."
+msgstr "L'usuari %1$s està blocat del grup %2$s."
+
+#. TRANS: Exception thrown when trying to send group private message while not a member.
+#. TRANS: %1$s is a user nickname, %2$s is a group nickname.
+#, php-format
+msgid "User %1$s is not a member of group %2$s."
+msgstr "L'usuari %1$s no és un membre del grup %2$s."
+
+#. TRANS: Exception thrown when trying to send group private message while not a group administrator.
+#. TRANS: %1$s is a user nickname, %2$s is a group nickname.
+#, php-format
+msgid "User %1$s is not an administrator of group %2$s."
+msgstr "L'usuari %1$s no és un administrador del grup %2$s."
+
+#. TRANS: Exception thrown when encountering undefined group privacy settings.
+#. TRANS: %s is a group nickname.
+#, php-format
+msgid "Unknown privacy settings for group %s."
+msgstr "Paràmetres de privadesa incorrectes del grup %s."
+
+#. TRANS: Exception thrown when trying to send group private message that is too long.
+#. TRANS: %d is the maximum meggage length.
+#, php-format
+msgid "That's too long. Maximum message size is %d character."
+msgid_plural "That's too long. Maximum message size is %d characters."
+msgstr[0] "És massa llarg. La mida màxima del missatge és %d caràcter."
+msgstr[1] "És massa llarg. La mida màxima del missatge és %d caràcters."
+
+#. TRANS: Exception thrown when trying to send group private message to a non-existing group.
+msgid "No group for group message."
+msgstr ""
+
+#. TRANS: Exception thrown when trying to send group private message without having a sender.
+msgid "No sender for group message."
+msgstr ""
+
+#. TRANS: Client exception thrown when trying to view group private messages without being logged in.
+msgid "Only logged-in users can view private messages."
+msgstr ""
+
+#. TRANS: Client exception thrown when trying to view a non-existing group private message.
+msgid "No such message."
+msgstr "No existeix el missatge."
+
+#. TRANS: Server exception thrown when trying to view group private messages for a non-exsting group.
+msgid "Group not found."
+msgstr "No s'ha trobat el grup."
+
+#. TRANS: Client exception thrown when trying to view a group private message without being a group member.
+msgid "Cannot read message."
+msgstr "No es pot llegir el missatge."
+
+#. TRANS: Server exception thrown when trying to view a group private message without a sender.
+msgid "No sender found."
+msgstr "No s'ha trobat el remitent."
+
+#. TRANS: Title for private group message.
+#. TRANS: %1$s is the sender name, %2$s is the group name, %3$s is a timestamp.
+#, php-format
+msgid "Message from %1$s to group %2$s on %3$s"
+msgstr ""
+
+#. TRANS: Succes message after sending private group message to group %s.
+#, php-format
+msgid "Direct message to group %s sent."
+msgstr "S'ha enviat el missatge directe al grup %s."
diff --git a/plugins/GroupPrivateMessage/locale/de/LC_MESSAGES/GroupPrivateMessage.po b/plugins/GroupPrivateMessage/locale/de/LC_MESSAGES/GroupPrivateMessage.po
index 1de1cd03b7..f28422c0ea 100644
--- a/plugins/GroupPrivateMessage/locale/de/LC_MESSAGES/GroupPrivateMessage.po
+++ b/plugins/GroupPrivateMessage/locale/de/LC_MESSAGES/GroupPrivateMessage.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - GroupPrivateMessage\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:43+0000\n"
-"Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:48+0000\n"
+"Language-Team: German <https://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:27:30+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-12-03 13:48:53+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-groupprivatemessage\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/GroupPrivateMessage/locale/es/LC_MESSAGES/GroupPrivateMessage.po b/plugins/GroupPrivateMessage/locale/es/LC_MESSAGES/GroupPrivateMessage.po
new file mode 100644
index 0000000000..10d8a712de
--- /dev/null
+++ b/plugins/GroupPrivateMessage/locale/es/LC_MESSAGES/GroupPrivateMessage.po
@@ -0,0 +1,289 @@
+# Translation of StatusNet - GroupPrivateMessage to Spanish (español)
+# Exported from translatewiki.net
+#
+# Author: Armando-Martin
+# Author: Od1n
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - GroupPrivateMessage\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:48+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-12-03 13:48:53+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Client exception thrown when trying to send a private group message while not logged in.
+msgid "Must be logged in."
+msgstr "Debe estar conectado."
+
+#. TRANS: Exception thrown when user %s is not allowed to send a private group message.
+#. TRANS: Exception thrown when trying to send group private message without having the right to do that.
+#. TRANS: %s is a user nickname.
+#, php-format
+msgid "User %s is not allowed to send private messages."
+msgstr "El usuario %s no tiene permiso para enviar mensajes privados."
+
+#. TRANS: Client exception thrown when trying to send a private group message to a non-existing group.
+#. TRANS: Client exception thrown when trying to view group inbox for non-existing group.
+msgid "No such group."
+msgstr "No existe ese grupo."
+
+#. TRANS: Title after sending a private group message.
+msgid "Message sent"
+msgstr "Mensaje enviado"
+
+#. TRANS: Succes text after sending a direct message to group %s.
+#, php-format
+msgid "Direct message to %s sent."
+msgstr "Se ha enviado un mensaje directo a %s."
+
+#. TRANS: Title of form for new private group message.
+#, php-format
+msgid "New message to group %s"
+msgstr "Nuevo mensaje para el grupo %s"
+
+#. TRANS: Subject for direct-message notification email.
+#. TRANS: %1$s is the sending user's nickname, %2$s is the group nickname.
+#, php-format
+msgid "New private message from %1$s to group %2$s"
+msgstr "Nuevo mensaje privado de %1$s al grupo %2$s"
+
+#. TRANS: Body for direct-message notification email.
+#. TRANS: %1$s is the sending user's long name, %2$s is the sending user's nickname,
+#. TRANS: %3$s is the message content, %4$s a URL to the message,
+#. TRANS: %5$s is the StatusNet sitename.
+#, php-format
+msgid ""
+"%1$s (%2$s) sent a private message to group %3$s:\n"
+"\n"
+"------------------------------------------------------\n"
+"%4$s\n"
+"------------------------------------------------------\n"
+"\n"
+"You can reply to their message here:\n"
+"\n"
+"%5$s\n"
+"\n"
+"Do not reply to this email; it will not get to them.\n"
+"\n"
+"With kind regards,\n"
+"%6$s"
+msgstr ""
+"%1$s (%2$s) ha enviado un mensaje privado al grupo %3$s:\n"
+"\n"
+"----------------------------------------------------------------------------\n"
+"%4$s\n"
+"----------------------------------------------------------------------------\n"
+"\n"
+"Puede responder a este mensaje aquí:\n"
+"\n"
+"%5$s\n"
+"\n"
+"No responda a este correo electrónico. No llegará a ningún sitio.\n"
+"\n"
+"Saludos,\n"
+"%6$s"
+
+#. TRANS: Menu item in group page.
+msgctxt "MENU"
+msgid "Inbox"
+msgstr "Bandeja de entrada"
+
+#. TRANS: Menu title in group page.
+msgid "Private messages for this group."
+msgstr "Mensajes privados para este grupo."
+
+#. TRANS: Dropdown label in group settings page for if group allows private messages.
+msgid "Private messages"
+msgstr "Mensajes privados"
+
+#. TRANS: Dropdown option in group settings page for allowing private messages.
+msgid "Sometimes"
+msgstr "A veces"
+
+#. TRANS: Dropdown option in group settings page for allowing private messages.
+msgid "Always"
+msgstr "Siempre"
+
+#. TRANS: Dropdown option in group settings page for allowing private messages.
+msgid "Never"
+msgstr "Nunca"
+
+#. TRANS: Dropdown title in group settings page for if group allows private messages.
+msgid "Whether to allow private messages to this group."
+msgstr "Permitir o no permitir mensajes privados a este grupo."
+
+#. TRANS: Dropdown label in group settings page for who can send private messages to the group.
+msgid "Private senders"
+msgstr "Remitentes privados"
+
+#. TRANS: Dropdown option in group settings page for who can send private messages.
+msgid "Everyone"
+msgstr "Todo el mundo"
+
+#. TRANS: Dropdown option in group settings page for who can send private messages.
+msgid "Member"
+msgstr "Miembro"
+
+#. TRANS: Dropdown option in group settings page for who can send private messages.
+msgid "Admin"
+msgstr "Administrador"
+
+#. TRANS: Dropdown title in group settings page for who can send private messages to the group.
+msgid "Who can send private messages to the group."
+msgstr "Quién puede enviar mensajes privados al grupo."
+
+#. TRANS: Title for action in group actions list.
+msgid "Send a direct message to this group."
+msgstr "Enviar un mensaje directo a este grupo."
+
+#. TRANS: Link text for action in group actions list to send a private message to a group.
+msgctxt "LINKTEXT"
+msgid "Message"
+msgstr "Mensaje"
+
+#. TRANS: Client exception thrown when a private group message has to be forced.
+msgid "Forced notice to private group message."
+msgstr "Nota obligada al mensaje de grupo privado."
+
+#. TRANS: Indicator on the group page that the group is (essentially) private.
+msgid "Private"
+msgstr "Privado"
+
+#. TRANS: Plugin description.
+msgid "Allow posting private messages to groups."
+msgstr "Permitir publicar mensajes privados para grupos."
+
+#. TRANS: Client exception thrown when trying to view group inbox while not logged in.
+msgid "Only for logged-in users."
+msgstr "Sólo para usuarios que han iniciado sesión."
+
+#. TRANS: Client exception thrown when trying to view group inbox while not a member.
+msgid "Only for members."
+msgstr "Sólo para los miembros."
+
+#. TRANS: Text of group inbox if no private messages were sent to it.
+msgid "This group has not received any private messages."
+msgstr "Este grupo no ha recibido ningún mensaje privado."
+
+#. TRANS: Title of inbox for group %s.
+#, php-format
+msgid "%s group inbox"
+msgstr "bandeja de entrada del grupo %s"
+
+#. TRANS: Page title for any but first group page.
+#. TRANS: %1$s is a group name, $2$s is a page number.
+#, php-format
+msgid "%1$s group inbox, page %2$d"
+msgstr "bandeja de entrada de grupo  %1$s, página %2$d"
+
+#. TRANS: Instructions for user inbox page.
+msgid ""
+"This is the group inbox, which lists all incoming private messages for this "
+"group."
+msgstr ""
+"Esta es la bandeja de entrada del grupo, que contiene todos los mensajes "
+"entrantes privados para este grupo."
+
+#. TRANS: Form legend for sending private message to group %s.
+#, php-format
+msgid "Message to %s"
+msgstr "Mensaje a %s"
+
+#. TRANS: Field label for private group message to group %s.
+#, php-format
+msgid "Direct message to %s"
+msgstr "Mensaje directo a %s"
+
+#. TRANS: Indicator for number of chatacters still available for notice.
+msgid "Available characters"
+msgstr "Caracteres disponibles"
+
+#. TRANS: Send button text for sending private group notice.
+msgctxt "Send button for sending notice"
+msgid "Send"
+msgstr "Enviar"
+
+#. TRANS: Exception thrown when trying to set group privacy setting if group %s does not allow private messages.
+#, php-format
+msgid "Group %s does not allow private messages."
+msgstr "El grupo %s no permite mensajes privados."
+
+#. TRANS: Exception thrown when trying to send group private message while blocked from that group.
+#. TRANS: %1$s is a user nickname, %2$s is a group nickname.
+#, php-format
+msgid "User %1$s is blocked from group %2$s."
+msgstr "El usuario %1$s está bloqueado en el grupo %2$s."
+
+#. TRANS: Exception thrown when trying to send group private message while not a member.
+#. TRANS: %1$s is a user nickname, %2$s is a group nickname.
+#, php-format
+msgid "User %1$s is not a member of group %2$s."
+msgstr "El usuario %1$s no es un miembro del grupo %2$s."
+
+#. TRANS: Exception thrown when trying to send group private message while not a group administrator.
+#. TRANS: %1$s is a user nickname, %2$s is a group nickname.
+#, php-format
+msgid "User %1$s is not an administrator of group %2$s."
+msgstr "El usuario %1$s no es un administrador del grupo %2$s."
+
+#. TRANS: Exception thrown when encountering undefined group privacy settings.
+#. TRANS: %s is a group nickname.
+#, php-format
+msgid "Unknown privacy settings for group %s."
+msgstr "Configuración de protección de datos desconocida para el grupo %s."
+
+#. TRANS: Exception thrown when trying to send group private message that is too long.
+#. TRANS: %d is the maximum meggage length.
+#, php-format
+msgid "That's too long. Maximum message size is %d character."
+msgid_plural "That's too long. Maximum message size is %d characters."
+msgstr[0] "Es demasiado largo. El tamaño máximo del mensaje es de %d carácter."
+msgstr[1] ""
+"Es demasiado largo. El tamaño máximo del mensaje es de %d caracteres."
+
+#. TRANS: Exception thrown when trying to send group private message to a non-existing group.
+msgid "No group for group message."
+msgstr "No hay ningún grupo para el mensaje de grupo."
+
+#. TRANS: Exception thrown when trying to send group private message without having a sender.
+msgid "No sender for group message."
+msgstr "No hay remitente para el mensaje de grupo."
+
+#. TRANS: Client exception thrown when trying to view group private messages without being logged in.
+msgid "Only logged-in users can view private messages."
+msgstr "Sólo los usuarios que han iniciado pueden ver los mensajes privados."
+
+#. TRANS: Client exception thrown when trying to view a non-existing group private message.
+msgid "No such message."
+msgstr "No existe este mensaje."
+
+#. TRANS: Server exception thrown when trying to view group private messages for a non-exsting group.
+msgid "Group not found."
+msgstr "Grupo no encontrado."
+
+#. TRANS: Client exception thrown when trying to view a group private message without being a group member.
+msgid "Cannot read message."
+msgstr "No se puede leer el mensaje."
+
+#. TRANS: Server exception thrown when trying to view a group private message without a sender.
+msgid "No sender found."
+msgstr "No se encontró ningún remitente."
+
+#. TRANS: Title for private group message.
+#. TRANS: %1$s is the sender name, %2$s is the group name, %3$s is a timestamp.
+#, php-format
+msgid "Message from %1$s to group %2$s on %3$s"
+msgstr "Mensaje de %1$s al grupo %2$s el %3$s"
+
+#. TRANS: Succes message after sending private group message to group %s.
+#, php-format
+msgid "Direct message to group %s sent."
+msgstr "Se ha enviado un mensaje directo al grupo %s."
diff --git a/plugins/GroupPrivateMessage/locale/eu/LC_MESSAGES/GroupPrivateMessage.po b/plugins/GroupPrivateMessage/locale/eu/LC_MESSAGES/GroupPrivateMessage.po
new file mode 100644
index 0000000000..5ad6afcbab
--- /dev/null
+++ b/plugins/GroupPrivateMessage/locale/eu/LC_MESSAGES/GroupPrivateMessage.po
@@ -0,0 +1,291 @@
+# Translation of StatusNet - GroupPrivateMessage to Basque (euskara)
+# Exported from translatewiki.net
+#
+# Author: An13sa
+# Author: Artsuaga
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - GroupPrivateMessage\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:48+0000\n"
+"Language-Team: Basque <https://translatewiki.net/wiki/Portal:eu>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-12-03 13:48:53+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: eu\n"
+"X-Message-Group: #out-statusnet-plugin-groupprivatemessage\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Client exception thrown when trying to send a private group message while not logged in.
+msgid "Must be logged in."
+msgstr "Saioa hasi behar duzu."
+
+#. TRANS: Exception thrown when user %s is not allowed to send a private group message.
+#. TRANS: Exception thrown when trying to send group private message without having the right to do that.
+#. TRANS: %s is a user nickname.
+#, php-format
+msgid "User %s is not allowed to send private messages."
+msgstr "%s erabiltzailea ez dago baimendurik mezu pribatuak bidaltzeko."
+
+#. TRANS: Client exception thrown when trying to send a private group message to a non-existing group.
+#. TRANS: Client exception thrown when trying to view group inbox for non-existing group.
+msgid "No such group."
+msgstr "Ez dago talde hori."
+
+#. TRANS: Title after sending a private group message.
+msgid "Message sent"
+msgstr "Mezua bidalita"
+
+#. TRANS: Succes text after sending a direct message to group %s.
+#, php-format
+msgid "Direct message to %s sent."
+msgstr "%s(r)i mezu zuzena bidalita."
+
+#. TRANS: Title of form for new private group message.
+#, php-format
+msgid "New message to group %s"
+msgstr "%s taldeari mezu berria"
+
+#. TRANS: Subject for direct-message notification email.
+#. TRANS: %1$s is the sending user's nickname, %2$s is the group nickname.
+#, php-format
+msgid "New private message from %1$s to group %2$s"
+msgstr "%1$s(e)k %2$s taldera bidalitako mezu pribatu berria"
+
+#. TRANS: Body for direct-message notification email.
+#. TRANS: %1$s is the sending user's long name, %2$s is the sending user's nickname,
+#. TRANS: %3$s is the message content, %4$s a URL to the message,
+#. TRANS: %5$s is the StatusNet sitename.
+#, php-format
+msgid ""
+"%1$s (%2$s) sent a private message to group %3$s:\n"
+"\n"
+"------------------------------------------------------\n"
+"%4$s\n"
+"------------------------------------------------------\n"
+"\n"
+"You can reply to their message here:\n"
+"\n"
+"%5$s\n"
+"\n"
+"Do not reply to this email; it will not get to them.\n"
+"\n"
+"With kind regards,\n"
+"%6$s"
+msgstr ""
+"%1$s(e)k (%2$s) %3$s taldera mezu pribatu berria bidali du:\n"
+"\n"
+"------------------------------------------------------\n"
+"%4$s\n"
+"------------------------------------------------------\n"
+"\n"
+"Mezuari hemen erantzun diezaiokezu:\n"
+"\n"
+"%5$s\n"
+"\n"
+"Ez erantzun email honi; ez da inora iritsiko eta.\n"
+"\n"
+"Ondo segi,\n"
+"%6$s"
+
+#. TRANS: Menu item in group page.
+msgctxt "MENU"
+msgid "Inbox"
+msgstr "Sarrera"
+
+#. TRANS: Menu title in group page.
+msgid "Private messages for this group."
+msgstr "Mezu pribatuak talde honentzat."
+
+#. TRANS: Dropdown label in group settings page for if group allows private messages.
+msgid "Private messages"
+msgstr "Mezu pribatuak"
+
+#. TRANS: Dropdown option in group settings page for allowing private messages.
+msgid "Sometimes"
+msgstr "Batzutan"
+
+#. TRANS: Dropdown option in group settings page for allowing private messages.
+msgid "Always"
+msgstr "Beti"
+
+#. TRANS: Dropdown option in group settings page for allowing private messages.
+msgid "Never"
+msgstr "Inoiz"
+
+#. TRANS: Dropdown title in group settings page for if group allows private messages.
+msgid "Whether to allow private messages to this group."
+msgstr "Talde hontan mezu pribatuen onarpena."
+
+#. TRANS: Dropdown label in group settings page for who can send private messages to the group.
+msgid "Private senders"
+msgstr "Mezu pribatu bidaltzaileak"
+
+#. TRANS: Dropdown option in group settings page for who can send private messages.
+msgid "Everyone"
+msgstr "Denak"
+
+#. TRANS: Dropdown option in group settings page for who can send private messages.
+msgid "Member"
+msgstr "Kideak"
+
+#. TRANS: Dropdown option in group settings page for who can send private messages.
+msgid "Admin"
+msgstr "Administrazaileak"
+
+#. TRANS: Dropdown title in group settings page for who can send private messages to the group.
+msgid "Who can send private messages to the group."
+msgstr "Nork bidal ditzakeen mezu pribatuak taldera."
+
+#. TRANS: Title for action in group actions list.
+msgid "Send a direct message to this group."
+msgstr "Bidali mezu zuzen bat talde honi."
+
+#. TRANS: Link text for action in group actions list to send a private message to a group.
+msgctxt "LINKTEXT"
+msgid "Message"
+msgstr "Mezua"
+
+#. TRANS: Client exception thrown when a private group message has to be forced.
+msgid "Forced notice to private group message."
+msgstr "Derrigorrezko oharra talde pribatuko mezuari."
+
+#. TRANS: Indicator on the group page that the group is (essentially) private.
+msgid "Private"
+msgstr "Pribatua"
+
+#. TRANS: Plugin description.
+msgid "Allow posting private messages to groups."
+msgstr "Utzi mezu pribatuak taldeetan argitaratzen."
+
+#. TRANS: Client exception thrown when trying to view group inbox while not logged in.
+msgid "Only for logged-in users."
+msgstr "Saioa hasitako erabiltzaileentzat soilik."
+
+#. TRANS: Client exception thrown when trying to view group inbox while not a member.
+msgid "Only for members."
+msgstr "Erabiltzaileentzako soilik."
+
+#. TRANS: Text of group inbox if no private messages were sent to it.
+msgid "This group has not received any private messages."
+msgstr "Talde honek ez du mezu pribaturik jaso."
+
+#. TRANS: Title of inbox for group %s.
+#, php-format
+msgid "%s group inbox"
+msgstr "%s taldearen sarrera"
+
+#. TRANS: Page title for any but first group page.
+#. TRANS: %1$s is a group name, $2$s is a page number.
+#, php-format
+msgid "%1$s group inbox, page %2$d"
+msgstr "%1$s taldearen sarrera, %2$d. orria"
+
+#. TRANS: Instructions for user inbox page.
+msgid ""
+"This is the group inbox, which lists all incoming private messages for this "
+"group."
+msgstr ""
+"Hau taldearen sarrera ontzia da, talde honek jasotako mezu pribatu guztiak "
+"zerrendatzen ditu."
+
+#. TRANS: Form legend for sending private message to group %s.
+#, php-format
+msgid "Message to %s"
+msgstr "%s(r)i mezua"
+
+#. TRANS: Field label for private group message to group %s.
+#, php-format
+msgid "Direct message to %s"
+msgstr "%s(r)i mezu zuzena"
+
+#. TRANS: Indicator for number of chatacters still available for notice.
+msgid "Available characters"
+msgstr "Karaktere erabilgarriak"
+
+#. TRANS: Send button text for sending private group notice.
+msgctxt "Send button for sending notice"
+msgid "Send"
+msgstr "Bidali"
+
+#. TRANS: Exception thrown when trying to set group privacy setting if group %s does not allow private messages.
+#, php-format
+msgid "Group %s does not allow private messages."
+msgstr "%s taldeak ez ditu mezu pribatuak onartzen."
+
+#. TRANS: Exception thrown when trying to send group private message while blocked from that group.
+#. TRANS: %1$s is a user nickname, %2$s is a group nickname.
+#, php-format
+msgid "User %1$s is blocked from group %2$s."
+msgstr "%1$s erabiltzailea %2$s taldean blokeaturik dago."
+
+#. TRANS: Exception thrown when trying to send group private message while not a member.
+#. TRANS: %1$s is a user nickname, %2$s is a group nickname.
+#, php-format
+msgid "User %1$s is not a member of group %2$s."
+msgstr "%1$s erabiltzailea ez da %2$s taldeko kidea."
+
+#. TRANS: Exception thrown when trying to send group private message while not a group administrator.
+#. TRANS: %1$s is a user nickname, %2$s is a group nickname.
+#, php-format
+msgid "User %1$s is not an administrator of group %2$s."
+msgstr "%1$s erabiltzailea ez da %2$s taldeko administratzailea."
+
+#. TRANS: Exception thrown when encountering undefined group privacy settings.
+#. TRANS: %s is a group nickname.
+#, php-format
+msgid "Unknown privacy settings for group %s."
+msgstr "%s taldearentzako pribazitate aukera ezezagunak."
+
+#. TRANS: Exception thrown when trying to send group private message that is too long.
+#. TRANS: %d is the maximum meggage length.
+#, php-format
+msgid "That's too long. Maximum message size is %d character."
+msgid_plural "That's too long. Maximum message size is %d characters."
+msgstr[0] "Luzeegia.Gehienezko mezu luzera karaktera %d da."
+msgstr[1] "Luzeegia.Gehienezko mezu luzera %d karaktere dira."
+
+#. TRANS: Exception thrown when trying to send group private message to a non-existing group.
+msgid "No group for group message."
+msgstr "Ez dago talderik talde mezurako."
+
+#. TRANS: Exception thrown when trying to send group private message without having a sender.
+msgid "No sender for group message."
+msgstr "Ez dago bidaltzailerik talde mezurako."
+
+#. TRANS: Client exception thrown when trying to view group private messages without being logged in.
+msgid "Only logged-in users can view private messages."
+msgstr "Saioa hasi duten erabiltzaileek soilik ikus ditzakete mezu pribatuak."
+
+#. TRANS: Client exception thrown when trying to view a non-existing group private message.
+msgid "No such message."
+msgstr "Ez dago mezu hori."
+
+#. TRANS: Server exception thrown when trying to view group private messages for a non-exsting group.
+msgid "Group not found."
+msgstr "Ez da taldea aurkitu."
+
+#. TRANS: Client exception thrown when trying to view a group private message without being a group member.
+msgid "Cannot read message."
+msgstr "Ezin da mezua irakurri."
+
+#. TRANS: Server exception thrown when trying to view a group private message without a sender.
+msgid "No sender found."
+msgstr "Ez da bidaltzailerik aurkitu."
+
+#. TRANS: Title for private group message.
+#. TRANS: %1$s is the sender name, %2$s is the group name, %3$s is a timestamp.
+#, php-format
+msgid "Message from %1$s to group %2$s on %3$s"
+msgstr "%1$s(e)k %3$s(e)ko %2$s taldera bidalitako mezua"
+
+#. TRANS: Succes message after sending private group message to group %s.
+#, php-format
+msgid "Direct message to group %s sent."
+msgstr "Bidali da mezu zuzena %s taldera."
diff --git a/plugins/GroupPrivateMessage/locale/fr/LC_MESSAGES/GroupPrivateMessage.po b/plugins/GroupPrivateMessage/locale/fr/LC_MESSAGES/GroupPrivateMessage.po
index 8f05bded75..b9e167c605 100644
--- a/plugins/GroupPrivateMessage/locale/fr/LC_MESSAGES/GroupPrivateMessage.po
+++ b/plugins/GroupPrivateMessage/locale/fr/LC_MESSAGES/GroupPrivateMessage.po
@@ -1,9 +1,11 @@
-# Translation of StatusNet - GroupPrivateMessage to French (Français)
+# Translation of StatusNet - GroupPrivateMessage to French (français)
 # Exported from translatewiki.net
 #
 # Author: Brunoperel
+# Author: Gomoko
 # Author: Iketsi
 # Author: Od1n
+# Author: Verdy p
 # --
 # This file is distributed under the same license as the StatusNet package.
 #
@@ -11,14 +13,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - GroupPrivateMessage\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:43+0000\n"
-"Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:48+0000\n"
+"Language-Team: French <https://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:27:30+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-12-03 13:48:53+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-groupprivatemessage\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
@@ -139,7 +141,7 @@ msgstr "Membre"
 
 #. TRANS: Dropdown option in group settings page for who can send private messages.
 msgid "Admin"
-msgstr "Admin"
+msgstr "Administrateur"
 
 #. TRANS: Dropdown title in group settings page for who can send private messages to the group.
 msgid "Who can send private messages to the group."
@@ -156,7 +158,7 @@ msgstr "Message"
 
 #. TRANS: Client exception thrown when a private group message has to be forced.
 msgid "Forced notice to private group message."
-msgstr ""
+msgstr "Avis forcé pour un message de groupe privé."
 
 #. TRANS: Indicator on the group page that the group is (essentially) private.
 msgid "Private"
diff --git a/plugins/GroupPrivateMessage/locale/gl/LC_MESSAGES/GroupPrivateMessage.po b/plugins/GroupPrivateMessage/locale/gl/LC_MESSAGES/GroupPrivateMessage.po
new file mode 100644
index 0000000000..7e2bfbcfd0
--- /dev/null
+++ b/plugins/GroupPrivateMessage/locale/gl/LC_MESSAGES/GroupPrivateMessage.po
@@ -0,0 +1,292 @@
+# Translation of StatusNet - GroupPrivateMessage to Galician (galego)
+# Exported from translatewiki.net
+#
+# Author: Toliño
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - GroupPrivateMessage\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:48+0000\n"
+"Language-Team: Galician <https://translatewiki.net/wiki/Portal:gl>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-12-03 13:48:53+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: gl\n"
+"X-Message-Group: #out-statusnet-plugin-groupprivatemessage\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Client exception thrown when trying to send a private group message while not logged in.
+msgid "Must be logged in."
+msgstr "Cómpre acceder ao sistema."
+
+#. TRANS: Exception thrown when user %s is not allowed to send a private group message.
+#. TRANS: Exception thrown when trying to send group private message without having the right to do that.
+#. TRANS: %s is a user nickname.
+#, php-format
+msgid "User %s is not allowed to send private messages."
+msgstr "O usuario %s non ten permiso para enviar mensaxes privadas."
+
+#. TRANS: Client exception thrown when trying to send a private group message to a non-existing group.
+#. TRANS: Client exception thrown when trying to view group inbox for non-existing group.
+msgid "No such group."
+msgstr "Non existe tal grupo."
+
+#. TRANS: Title after sending a private group message.
+msgid "Message sent"
+msgstr "Mensaxe enviada"
+
+#. TRANS: Succes text after sending a direct message to group %s.
+#, php-format
+msgid "Direct message to %s sent."
+msgstr "Enviouse a mensaxe directa a %s."
+
+#. TRANS: Title of form for new private group message.
+#, php-format
+msgid "New message to group %s"
+msgstr "Nova mensaxe ao grupo %s"
+
+#. TRANS: Subject for direct-message notification email.
+#. TRANS: %1$s is the sending user's nickname, %2$s is the group nickname.
+#, php-format
+msgid "New private message from %1$s to group %2$s"
+msgstr "Nova mensaxe privada de %1$s ao grupo %2$s"
+
+#. TRANS: Body for direct-message notification email.
+#. TRANS: %1$s is the sending user's long name, %2$s is the sending user's nickname,
+#. TRANS: %3$s is the message content, %4$s a URL to the message,
+#. TRANS: %5$s is the StatusNet sitename.
+#, php-format
+msgid ""
+"%1$s (%2$s) sent a private message to group %3$s:\n"
+"\n"
+"------------------------------------------------------\n"
+"%4$s\n"
+"------------------------------------------------------\n"
+"\n"
+"You can reply to their message here:\n"
+"\n"
+"%5$s\n"
+"\n"
+"Do not reply to this email; it will not get to them.\n"
+"\n"
+"With kind regards,\n"
+"%6$s"
+msgstr ""
+"%1$s (%2$s) envioulle unha mensaxe privada ao grupo %3$s:\n"
+"\n"
+"------------------------------------------------------\n"
+"%4$s\n"
+"------------------------------------------------------\n"
+"\n"
+"Pode responder á mensaxe aquí:\n"
+"\n"
+"%5$s\n"
+"\n"
+"Non responda a este correo electrónico, non lle chegará ao remitente.\n"
+"\n"
+"Atentamente,\n"
+"%6$s"
+
+#. TRANS: Menu item in group page.
+msgctxt "MENU"
+msgid "Inbox"
+msgstr "Caixa de entrada"
+
+#. TRANS: Menu title in group page.
+msgid "Private messages for this group."
+msgstr "Mensaxes privadas para este grupo."
+
+#. TRANS: Dropdown label in group settings page for if group allows private messages.
+msgid "Private messages"
+msgstr "Mensaxes privadas"
+
+#. TRANS: Dropdown option in group settings page for allowing private messages.
+msgid "Sometimes"
+msgstr "�s veces"
+
+#. TRANS: Dropdown option in group settings page for allowing private messages.
+msgid "Always"
+msgstr "Sempre"
+
+#. TRANS: Dropdown option in group settings page for allowing private messages.
+msgid "Never"
+msgstr "Nunca"
+
+#. TRANS: Dropdown title in group settings page for if group allows private messages.
+msgid "Whether to allow private messages to this group."
+msgstr "Permitir ou non as mensaxes privadas para este grupo."
+
+#. TRANS: Dropdown label in group settings page for who can send private messages to the group.
+msgid "Private senders"
+msgstr "Remitentes privados"
+
+#. TRANS: Dropdown option in group settings page for who can send private messages.
+msgid "Everyone"
+msgstr "Todos"
+
+#. TRANS: Dropdown option in group settings page for who can send private messages.
+msgid "Member"
+msgstr "Membro"
+
+#. TRANS: Dropdown option in group settings page for who can send private messages.
+msgid "Admin"
+msgstr "Administrador"
+
+#. TRANS: Dropdown title in group settings page for who can send private messages to the group.
+msgid "Who can send private messages to the group."
+msgstr "Quen pode enviar mensaxes privadas ao grupo."
+
+#. TRANS: Title for action in group actions list.
+msgid "Send a direct message to this group."
+msgstr "Enviarlle unha mensaxe directa a este grupo."
+
+#. TRANS: Link text for action in group actions list to send a private message to a group.
+msgctxt "LINKTEXT"
+msgid "Message"
+msgstr "Mensaxe"
+
+#. TRANS: Client exception thrown when a private group message has to be forced.
+msgid "Forced notice to private group message."
+msgstr "Nota obrigada á mensaxe de grupo privado."
+
+#. TRANS: Indicator on the group page that the group is (essentially) private.
+msgid "Private"
+msgstr "Privado"
+
+#. TRANS: Plugin description.
+msgid "Allow posting private messages to groups."
+msgstr "Permitir a publicación de mensaxes privadas nos grupos."
+
+#. TRANS: Client exception thrown when trying to view group inbox while not logged in.
+msgid "Only for logged-in users."
+msgstr "Unicamente para os usuarios rexistrados."
+
+#. TRANS: Client exception thrown when trying to view group inbox while not a member.
+msgid "Only for members."
+msgstr "Unicamente para os membros."
+
+#. TRANS: Text of group inbox if no private messages were sent to it.
+msgid "This group has not received any private messages."
+msgstr "Este grupo non recibiu mensaxe privada ningunha."
+
+#. TRANS: Title of inbox for group %s.
+#, php-format
+msgid "%s group inbox"
+msgstr "Caixa de entrada do grupo %s"
+
+#. TRANS: Page title for any but first group page.
+#. TRANS: %1$s is a group name, $2$s is a page number.
+#, php-format
+msgid "%1$s group inbox, page %2$d"
+msgstr "Caixa de entrada do grupo %1$s, páxina %2$d"
+
+#. TRANS: Instructions for user inbox page.
+msgid ""
+"This is the group inbox, which lists all incoming private messages for this "
+"group."
+msgstr ""
+"Esta é a caixa de entrada do grupo, que lista todas as mensaxes privadas "
+"entrantes enviadas a este grupo."
+
+#. TRANS: Form legend for sending private message to group %s.
+#, php-format
+msgid "Message to %s"
+msgstr "Mensaxe a %s"
+
+#. TRANS: Field label for private group message to group %s.
+#, php-format
+msgid "Direct message to %s"
+msgstr "Mensaxe directa a %s"
+
+#. TRANS: Indicator for number of chatacters still available for notice.
+msgid "Available characters"
+msgstr "Caracteres dispoñibles"
+
+#. TRANS: Send button text for sending private group notice.
+msgctxt "Send button for sending notice"
+msgid "Send"
+msgstr "Enviar"
+
+#. TRANS: Exception thrown when trying to set group privacy setting if group %s does not allow private messages.
+#, php-format
+msgid "Group %s does not allow private messages."
+msgstr "O grupo %s non permite as mensaxes privadas."
+
+#. TRANS: Exception thrown when trying to send group private message while blocked from that group.
+#. TRANS: %1$s is a user nickname, %2$s is a group nickname.
+#, php-format
+msgid "User %1$s is blocked from group %2$s."
+msgstr "O usuario %1$s está bloqueado no grupo %2$s."
+
+#. TRANS: Exception thrown when trying to send group private message while not a member.
+#. TRANS: %1$s is a user nickname, %2$s is a group nickname.
+#, php-format
+msgid "User %1$s is not a member of group %2$s."
+msgstr "O usuario %1$s non pertence ao grupo %2$s."
+
+#. TRANS: Exception thrown when trying to send group private message while not a group administrator.
+#. TRANS: %1$s is a user nickname, %2$s is a group nickname.
+#, php-format
+msgid "User %1$s is not an administrator of group %2$s."
+msgstr "O usuario %1$s non é un administrador o grupo %2$s."
+
+#. TRANS: Exception thrown when encountering undefined group privacy settings.
+#. TRANS: %s is a group nickname.
+#, php-format
+msgid "Unknown privacy settings for group %s."
+msgstr "Configuración de protección de datos descoñecida para o grupo %s."
+
+#. TRANS: Exception thrown when trying to send group private message that is too long.
+#. TRANS: %d is the maximum meggage length.
+#, php-format
+msgid "That's too long. Maximum message size is %d character."
+msgid_plural "That's too long. Maximum message size is %d characters."
+msgstr[0] ""
+"Iso é longo de máis. A lonxitude máxima das mensaxes é de %d caracteres."
+msgstr[1] ""
+"Iso é longo de máis. A lonxitude máxima das mensaxes é de %d caracteres."
+
+#. TRANS: Exception thrown when trying to send group private message to a non-existing group.
+msgid "No group for group message."
+msgstr "Non hai grupo ningún para a mensaxe de grupo."
+
+#. TRANS: Exception thrown when trying to send group private message without having a sender.
+msgid "No sender for group message."
+msgstr "Non hai remitente ningún para a mensaxe de grupo."
+
+#. TRANS: Client exception thrown when trying to view group private messages without being logged in.
+msgid "Only logged-in users can view private messages."
+msgstr "Unicamente os usuarios rexistrados poden ler as mensaxes privadas."
+
+#. TRANS: Client exception thrown when trying to view a non-existing group private message.
+msgid "No such message."
+msgstr "Non se atopou esa mensaxe."
+
+#. TRANS: Server exception thrown when trying to view group private messages for a non-exsting group.
+msgid "Group not found."
+msgstr "Non se atopou o grupo."
+
+#. TRANS: Client exception thrown when trying to view a group private message without being a group member.
+msgid "Cannot read message."
+msgstr "Non se puido ler a mensaxe."
+
+#. TRANS: Server exception thrown when trying to view a group private message without a sender.
+msgid "No sender found."
+msgstr "Non se atopou ningún remitente."
+
+#. TRANS: Title for private group message.
+#. TRANS: %1$s is the sender name, %2$s is the group name, %3$s is a timestamp.
+#, php-format
+msgid "Message from %1$s to group %2$s on %3$s"
+msgstr "Mensaxe de %1$s ao grupo %2$s o %3$s"
+
+#. TRANS: Succes message after sending private group message to group %s.
+#, php-format
+msgid "Direct message to group %s sent."
+msgstr "Enviouse a mensaxe directa ao grupo %s."
diff --git a/plugins/GroupPrivateMessage/locale/ia/LC_MESSAGES/GroupPrivateMessage.po b/plugins/GroupPrivateMessage/locale/ia/LC_MESSAGES/GroupPrivateMessage.po
index 4fc3b10907..cee544b056 100644
--- a/plugins/GroupPrivateMessage/locale/ia/LC_MESSAGES/GroupPrivateMessage.po
+++ b/plugins/GroupPrivateMessage/locale/ia/LC_MESSAGES/GroupPrivateMessage.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - GroupPrivateMessage to Interlingua (Interlingua)
+# Translation of StatusNet - GroupPrivateMessage to Interlingua (interlingua)
 # Exported from translatewiki.net
 #
 # Author: McDutchie
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - GroupPrivateMessage\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:43+0000\n"
-"Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:48+0000\n"
+"Language-Team: Interlingua <https://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:27:30+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-12-03 13:48:53+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-groupprivatemessage\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/GroupPrivateMessage/locale/it/LC_MESSAGES/GroupPrivateMessage.po b/plugins/GroupPrivateMessage/locale/it/LC_MESSAGES/GroupPrivateMessage.po
new file mode 100644
index 0000000000..a35aeb4e49
--- /dev/null
+++ b/plugins/GroupPrivateMessage/locale/it/LC_MESSAGES/GroupPrivateMessage.po
@@ -0,0 +1,293 @@
+# Translation of StatusNet - GroupPrivateMessage to Italian (italiano)
+# Exported from translatewiki.net
+#
+# Author: GreenFox
+# Author: Od1n
+# Author: Ximo17
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - GroupPrivateMessage\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:49+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-12-03 13:48:53+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Client exception thrown when trying to send a private group message while not logged in.
+msgid "Must be logged in."
+msgstr "Devi prima effettuare l'accesso."
+
+#. TRANS: Exception thrown when user %s is not allowed to send a private group message.
+#. TRANS: Exception thrown when trying to send group private message without having the right to do that.
+#. TRANS: %s is a user nickname.
+#, php-format
+msgid "User %s is not allowed to send private messages."
+msgstr "L'utente %s non è autorizzato ad inviare messaggi privati."
+
+#. TRANS: Client exception thrown when trying to send a private group message to a non-existing group.
+#. TRANS: Client exception thrown when trying to view group inbox for non-existing group.
+msgid "No such group."
+msgstr "Nessun gruppo."
+
+#. TRANS: Title after sending a private group message.
+msgid "Message sent"
+msgstr "Messaggio inviato"
+
+#. TRANS: Succes text after sending a direct message to group %s.
+#, php-format
+msgid "Direct message to %s sent."
+msgstr "Il messaggio diretto a %s è stato inviato."
+
+#. TRANS: Title of form for new private group message.
+#, php-format
+msgid "New message to group %s"
+msgstr "Nuovo messaggio al gruppo %s"
+
+#. TRANS: Subject for direct-message notification email.
+#. TRANS: %1$s is the sending user's nickname, %2$s is the group nickname.
+#, php-format
+msgid "New private message from %1$s to group %2$s"
+msgstr "Nuovo messaggio privato da  %1$s al gruppo %2$s"
+
+#. TRANS: Body for direct-message notification email.
+#. TRANS: %1$s is the sending user's long name, %2$s is the sending user's nickname,
+#. TRANS: %3$s is the message content, %4$s a URL to the message,
+#. TRANS: %5$s is the StatusNet sitename.
+#, php-format
+msgid ""
+"%1$s (%2$s) sent a private message to group %3$s:\n"
+"\n"
+"------------------------------------------------------\n"
+"%4$s\n"
+"------------------------------------------------------\n"
+"\n"
+"You can reply to their message here:\n"
+"\n"
+"%5$s\n"
+"\n"
+"Do not reply to this email; it will not get to them.\n"
+"\n"
+"With kind regards,\n"
+"%6$s"
+msgstr ""
+"%1$s (%2$s) ha inviato un messaggio privato al gruppo %3$s:\n"
+"\n"
+"------------------------------------------------------\n"
+"%4$s\n"
+"------------------------------------------------------\n"
+"\n"
+"Puoi rispondere al messaggio a questo indirizzo:\n"
+"\n"
+"%5$s\n"
+"\n"
+"Non rispondere a questa email, nessuno la riceverà!\n"
+"\n"
+"Cordiali saluti,\n"
+"%6$s"
+
+#. TRANS: Menu item in group page.
+msgctxt "MENU"
+msgid "Inbox"
+msgstr "Posta in Arrivo"
+
+#. TRANS: Menu title in group page.
+msgid "Private messages for this group."
+msgstr "Messaggi privati per questo gruppo."
+
+#. TRANS: Dropdown label in group settings page for if group allows private messages.
+msgid "Private messages"
+msgstr "Messaggi privati"
+
+#. TRANS: Dropdown option in group settings page for allowing private messages.
+msgid "Sometimes"
+msgstr "A volte"
+
+#. TRANS: Dropdown option in group settings page for allowing private messages.
+msgid "Always"
+msgstr "Sempre"
+
+#. TRANS: Dropdown option in group settings page for allowing private messages.
+msgid "Never"
+msgstr "Mai"
+
+#. TRANS: Dropdown title in group settings page for if group allows private messages.
+msgid "Whether to allow private messages to this group."
+msgstr "Se consentire i messaggi privati ​​di questo gruppo."
+
+#. TRANS: Dropdown label in group settings page for who can send private messages to the group.
+msgid "Private senders"
+msgstr "Mittenti privati"
+
+#. TRANS: Dropdown option in group settings page for who can send private messages.
+msgid "Everyone"
+msgstr "Tutti"
+
+#. TRANS: Dropdown option in group settings page for who can send private messages.
+msgid "Member"
+msgstr "Membro"
+
+#. TRANS: Dropdown option in group settings page for who can send private messages.
+msgid "Admin"
+msgstr "Amministratore"
+
+#. TRANS: Dropdown title in group settings page for who can send private messages to the group.
+msgid "Who can send private messages to the group."
+msgstr "Chi può inviare messaggi privati al gruppo."
+
+#. TRANS: Title for action in group actions list.
+msgid "Send a direct message to this group."
+msgstr "Invia un messaggio diretto a questo gruppo."
+
+#. TRANS: Link text for action in group actions list to send a private message to a group.
+msgctxt "LINKTEXT"
+msgid "Message"
+msgstr "Messaggio"
+
+#. TRANS: Client exception thrown when a private group message has to be forced.
+msgid "Forced notice to private group message."
+msgstr "Comunicazione obbligatoria per un messaggio di un gruppo privato."
+
+#. TRANS: Indicator on the group page that the group is (essentially) private.
+msgid "Private"
+msgstr "Privato"
+
+#. TRANS: Plugin description.
+msgid "Allow posting private messages to groups."
+msgstr "Permette la pubblicazione di messaggi privati nei gruppi."
+
+#. TRANS: Client exception thrown when trying to view group inbox while not logged in.
+msgid "Only for logged-in users."
+msgstr "Solo per utenti autenticati."
+
+#. TRANS: Client exception thrown when trying to view group inbox while not a member.
+msgid "Only for members."
+msgstr "Solo per i membri."
+
+#. TRANS: Text of group inbox if no private messages were sent to it.
+msgid "This group has not received any private messages."
+msgstr "Questo gruppo non ha ricevuto alcun messaggio privato."
+
+#. TRANS: Title of inbox for group %s.
+#, php-format
+msgid "%s group inbox"
+msgstr "Posta in arrivo del gruppo %s"
+
+#. TRANS: Page title for any but first group page.
+#. TRANS: %1$s is a group name, $2$s is a page number.
+#, php-format
+msgid "%1$s group inbox, page %2$d"
+msgstr "Posta in arrivo del gruppo %1$s, pagina %2$d"
+
+#. TRANS: Instructions for user inbox page.
+msgid ""
+"This is the group inbox, which lists all incoming private messages for this "
+"group."
+msgstr ""
+"Questa è la posta in arrivo del gruppo, che elenca tutti i messaggi privati "
+"in arrivo per questo gruppo."
+
+#. TRANS: Form legend for sending private message to group %s.
+#, php-format
+msgid "Message to %s"
+msgstr "Messaggio per %s"
+
+#. TRANS: Field label for private group message to group %s.
+#, php-format
+msgid "Direct message to %s"
+msgstr "Messaggi diretti a %s"
+
+#. TRANS: Indicator for number of chatacters still available for notice.
+msgid "Available characters"
+msgstr "Caratteri disponibili"
+
+#. TRANS: Send button text for sending private group notice.
+msgctxt "Send button for sending notice"
+msgid "Send"
+msgstr "Invia"
+
+#. TRANS: Exception thrown when trying to set group privacy setting if group %s does not allow private messages.
+#, php-format
+msgid "Group %s does not allow private messages."
+msgstr "Il gruppo %s non consente i messaggi privati."
+
+#. TRANS: Exception thrown when trying to send group private message while blocked from that group.
+#. TRANS: %1$s is a user nickname, %2$s is a group nickname.
+#, php-format
+msgid "User %1$s is blocked from group %2$s."
+msgstr "L'utente %1$s è stato bloccato dal gruppo %2$s."
+
+#. TRANS: Exception thrown when trying to send group private message while not a member.
+#. TRANS: %1$s is a user nickname, %2$s is a group nickname.
+#, php-format
+msgid "User %1$s is not a member of group %2$s."
+msgstr "L'utente %1$s non è un membro del gruppo %2$s."
+
+#. TRANS: Exception thrown when trying to send group private message while not a group administrator.
+#. TRANS: %1$s is a user nickname, %2$s is a group nickname.
+#, php-format
+msgid "User %1$s is not an administrator of group %2$s."
+msgstr "L'utente %1$s non è un amministratore del gruppo %2$s."
+
+#. TRANS: Exception thrown when encountering undefined group privacy settings.
+#. TRANS: %s is a group nickname.
+#, php-format
+msgid "Unknown privacy settings for group %s."
+msgstr "Impostazioni della privacy sconosciute per il gruppo %s."
+
+#. TRANS: Exception thrown when trying to send group private message that is too long.
+#. TRANS: %d is the maximum meggage length.
+#, php-format
+msgid "That's too long. Maximum message size is %d character."
+msgid_plural "That's too long. Maximum message size is %d characters."
+msgstr[0] ""
+"Troppo lungo. La dimensione massima di un messaggio è di %d carattere."
+msgstr[1] ""
+"Troppo lungo. La dimensione massima di un messaggio è di %d caratteri."
+
+#. TRANS: Exception thrown when trying to send group private message to a non-existing group.
+msgid "No group for group message."
+msgstr "Nessun gruppo per il messaggio di gruppo."
+
+#. TRANS: Exception thrown when trying to send group private message without having a sender.
+msgid "No sender for group message."
+msgstr "Nessun mittente per il messaggio di gruppo."
+
+#. TRANS: Client exception thrown when trying to view group private messages without being logged in.
+msgid "Only logged-in users can view private messages."
+msgstr ""
+"I messaggi privati possono essere visualizzati solo dagli utenti che hanno "
+"effettuato l'accesso."
+
+#. TRANS: Client exception thrown when trying to view a non-existing group private message.
+msgid "No such message."
+msgstr "Nessun messaggio."
+
+#. TRANS: Server exception thrown when trying to view group private messages for a non-exsting group.
+msgid "Group not found."
+msgstr "Gruppo non trovato."
+
+#. TRANS: Client exception thrown when trying to view a group private message without being a group member.
+msgid "Cannot read message."
+msgstr "Impossibile leggere il messaggio."
+
+#. TRANS: Server exception thrown when trying to view a group private message without a sender.
+msgid "No sender found."
+msgstr "Nessun mittente trovato."
+
+#. TRANS: Title for private group message.
+#. TRANS: %1$s is the sender name, %2$s is the group name, %3$s is a timestamp.
+#, php-format
+msgid "Message from %1$s to group %2$s on %3$s"
+msgstr "Messaggio da %1$s al gruppo %2$s su %3$s"
+
+#. TRANS: Succes message after sending private group message to group %s.
+#, php-format
+msgid "Direct message to group %s sent."
+msgstr "Il messaggio diretto al gruppo %s è stato inviato."
diff --git a/plugins/GroupPrivateMessage/locale/mk/LC_MESSAGES/GroupPrivateMessage.po b/plugins/GroupPrivateMessage/locale/mk/LC_MESSAGES/GroupPrivateMessage.po
index 55f974f05b..6fd947ad22 100644
--- a/plugins/GroupPrivateMessage/locale/mk/LC_MESSAGES/GroupPrivateMessage.po
+++ b/plugins/GroupPrivateMessage/locale/mk/LC_MESSAGES/GroupPrivateMessage.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - GroupPrivateMessage to Macedonian (Македон�ки)
+# Translation of StatusNet - GroupPrivateMessage to Macedonian (македон�ки)
 # Exported from translatewiki.net
 #
 # Author: Bjankuloski06
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - GroupPrivateMessage\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:43+0000\n"
-"Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:49+0000\n"
+"Language-Team: Macedonian <https://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:27:30+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-12-03 13:48:53+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-groupprivatemessage\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
diff --git a/plugins/GroupPrivateMessage/locale/nl/LC_MESSAGES/GroupPrivateMessage.po b/plugins/GroupPrivateMessage/locale/nl/LC_MESSAGES/GroupPrivateMessage.po
index 5cad31d5cb..3cb7da6960 100644
--- a/plugins/GroupPrivateMessage/locale/nl/LC_MESSAGES/GroupPrivateMessage.po
+++ b/plugins/GroupPrivateMessage/locale/nl/LC_MESSAGES/GroupPrivateMessage.po
@@ -11,14 +11,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - GroupPrivateMessage\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:43+0000\n"
-"Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:49+0000\n"
+"Language-Team: Dutch <https://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:27:30+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-12-03 13:48:53+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-groupprivatemessage\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/GroupPrivateMessage/locale/sv/LC_MESSAGES/GroupPrivateMessage.po b/plugins/GroupPrivateMessage/locale/sv/LC_MESSAGES/GroupPrivateMessage.po
index b8ebe96d22..d96706c7ee 100644
--- a/plugins/GroupPrivateMessage/locale/sv/LC_MESSAGES/GroupPrivateMessage.po
+++ b/plugins/GroupPrivateMessage/locale/sv/LC_MESSAGES/GroupPrivateMessage.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - GroupPrivateMessage to Swedish (Svenska)
+# Translation of StatusNet - GroupPrivateMessage to Swedish (svenska)
 # Exported from translatewiki.net
 #
 # Author: Lokal Profil
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - GroupPrivateMessage\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:43+0000\n"
-"Language-Team: Swedish <http://translatewiki.net/wiki/Portal:sv>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:49+0000\n"
+"Language-Team: Swedish <https://translatewiki.net/wiki/Portal:sv>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:27:30+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-12-03 13:48:53+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: sv\n"
 "X-Message-Group: #out-statusnet-plugin-groupprivatemessage\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/GroupPrivateMessage/locale/tl/LC_MESSAGES/GroupPrivateMessage.po b/plugins/GroupPrivateMessage/locale/tl/LC_MESSAGES/GroupPrivateMessage.po
index 077fa7180f..c8f209f0e7 100644
--- a/plugins/GroupPrivateMessage/locale/tl/LC_MESSAGES/GroupPrivateMessage.po
+++ b/plugins/GroupPrivateMessage/locale/tl/LC_MESSAGES/GroupPrivateMessage.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - GroupPrivateMessage\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:44+0000\n"
-"Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:49+0000\n"
+"Language-Team: Tagalog <https://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:27:30+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-12-03 13:48:53+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-groupprivatemessage\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/GroupPrivateMessage/locale/uk/LC_MESSAGES/GroupPrivateMessage.po b/plugins/GroupPrivateMessage/locale/uk/LC_MESSAGES/GroupPrivateMessage.po
index 871231e835..b99a26b42d 100644
--- a/plugins/GroupPrivateMessage/locale/uk/LC_MESSAGES/GroupPrivateMessage.po
+++ b/plugins/GroupPrivateMessage/locale/uk/LC_MESSAGES/GroupPrivateMessage.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - GroupPrivateMessage to Ukrainian (Україн�ька)
+# Translation of StatusNet - GroupPrivateMessage to Ukrainian (україн�ька)
 # Exported from translatewiki.net
 #
 # Author: Boogie
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - GroupPrivateMessage\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:44+0000\n"
-"Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:49+0000\n"
+"Language-Team: Ukrainian <https://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:27:30+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-12-03 13:48:53+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-groupprivatemessage\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
diff --git a/plugins/Imap/locale/Imap.pot b/plugins/Imap/locale/Imap.pot
index 0ec31fe4bd..53af9d69f0 100644
--- a/plugins/Imap/locale/Imap.pot
+++ b/plugins/Imap/locale/Imap.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
+"POT-Creation-Date: 2012-06-30 11:07+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"
diff --git a/plugins/Imap/locale/br/LC_MESSAGES/Imap.po b/plugins/Imap/locale/br/LC_MESSAGES/Imap.po
index 413373dcb6..c619284a45 100644
--- a/plugins/Imap/locale/br/LC_MESSAGES/Imap.po
+++ b/plugins/Imap/locale/br/LC_MESSAGES/Imap.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Imap to Breton (Brezhoneg)
+# Translation of StatusNet - Imap to Breton (brezhoneg)
 # Exported from translatewiki.net
 #
 # Author: Y-M D
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Imap\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:44+0000\n"
-"Language-Team: Breton <http://translatewiki.net/wiki/Portal:br>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:49+0000\n"
+"Language-Team: Breton <https://translatewiki.net/wiki/Portal:br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:27:31+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:20+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-imap\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
diff --git a/plugins/Imap/locale/ca/LC_MESSAGES/Imap.po b/plugins/Imap/locale/ca/LC_MESSAGES/Imap.po
new file mode 100644
index 0000000000..ea5d7c9b4b
--- /dev/null
+++ b/plugins/Imap/locale/ca/LC_MESSAGES/Imap.po
@@ -0,0 +1,55 @@
+# Translation of StatusNet - Imap to Catalan (català)
+# Exported from translatewiki.net
+#
+# Author: Toniher
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Imap\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:49+0000\n"
+"Language-Team: Catalan <https://translatewiki.net/wiki/Portal:ca>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:50:20+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: ca\n"
+"X-Message-Group: #out-statusnet-plugin-imap\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: E-mail subject in case of an error.
+msgid "Error"
+msgstr "Error"
+
+#. TRANS: Exception thrown when the ImapManager is used incorrectly in the code.
+msgid ""
+"ImapManager should be created using its constructor, not using the static "
+"\"get()\" method."
+msgstr ""
+
+#. TRANS: Exception thrown when configuration of the IMAP plugin is incorrect.
+msgid "A mailbox must be specified."
+msgstr "Cal especificar una bústia de correu."
+
+#. TRANS: Exception thrown when configuration of the IMAP plugin is incorrect.
+msgid "A user must be specified."
+msgstr "Cal especificar un usuari."
+
+#. TRANS: Exception thrown when configuration of the IMAP plugin is incorrect.
+msgid "A password must be specified."
+msgstr "Cal especificar una contrasenya."
+
+#. TRANS: Exception thrown when configuration of the IMAP plugin is incorrect.
+#. TRANS: poll_frequency is a setting that should not be translated.
+msgid "A poll_frequency must be specified."
+msgstr "Cal especificar una freqüència de les enquestes (poll_frequency)."
+
+#. TRANS: Plugin description.
+msgid ""
+"The IMAP plugin allows for StatusNet to check a POP or IMAP mailbox for "
+"incoming mail containing user posts."
+msgstr ""
diff --git a/plugins/Imap/locale/de/LC_MESSAGES/Imap.po b/plugins/Imap/locale/de/LC_MESSAGES/Imap.po
index 209d859057..738bd7fb72 100644
--- a/plugins/Imap/locale/de/LC_MESSAGES/Imap.po
+++ b/plugins/Imap/locale/de/LC_MESSAGES/Imap.po
@@ -11,14 +11,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Imap\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:44+0000\n"
-"Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:49+0000\n"
+"Language-Team: German <https://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:27:31+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:20+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-imap\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/Imap/locale/es/LC_MESSAGES/Imap.po b/plugins/Imap/locale/es/LC_MESSAGES/Imap.po
new file mode 100644
index 0000000000..3f5b48a691
--- /dev/null
+++ b/plugins/Imap/locale/es/LC_MESSAGES/Imap.po
@@ -0,0 +1,58 @@
+# Translation of StatusNet - Imap to Spanish (español)
+# Exported from translatewiki.net
+#
+# Author: Armando-Martin
+# Author: Peter17
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Imap\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:50+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:50:20+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: E-mail subject in case of an error.
+msgid "Error"
+msgstr "Error"
+
+#. TRANS: Exception thrown when the ImapManager is used incorrectly in the code.
+msgid ""
+"ImapManager should be created using its constructor, not using the static "
+"\"get()\" method."
+msgstr ""
+"ImapManager debe crearse utilizando su constructor, no utilizando el método "
+"estático \"get()\"."
+
+#. TRANS: Exception thrown when configuration of the IMAP plugin is incorrect.
+msgid "A mailbox must be specified."
+msgstr "Debe especificarse un buzón."
+
+#. TRANS: Exception thrown when configuration of the IMAP plugin is incorrect.
+msgid "A user must be specified."
+msgstr "Debe especificar un usuario."
+
+#. TRANS: Exception thrown when configuration of the IMAP plugin is incorrect.
+msgid "A password must be specified."
+msgstr "Debe especificar una contraseña."
+
+#. TRANS: Exception thrown when configuration of the IMAP plugin is incorrect.
+#. TRANS: poll_frequency is a setting that should not be translated.
+msgid "A poll_frequency must be specified."
+msgstr "Debe especificarse una poll_frequency (frecuencia de interrogación)."
+
+#. TRANS: Plugin description.
+msgid ""
+"The IMAP plugin allows for StatusNet to check a POP or IMAP mailbox for "
+"incoming mail containing user posts."
+msgstr ""
+"El complemento (plugin) IMAP permite a StatusNet comprobar un buzón de "
+"correo POP o IMAP para el correo entrante que contenga entradas (post) de "
+"usuario."
diff --git a/plugins/Imap/locale/eu/LC_MESSAGES/Imap.po b/plugins/Imap/locale/eu/LC_MESSAGES/Imap.po
new file mode 100644
index 0000000000..a181330439
--- /dev/null
+++ b/plugins/Imap/locale/eu/LC_MESSAGES/Imap.po
@@ -0,0 +1,60 @@
+# Translation of StatusNet - Imap to Basque (euskara)
+# Exported from translatewiki.net
+#
+# Author: An13sa
+# Author: Artsuaga
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Imap\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:50+0000\n"
+"Language-Team: Basque <https://translatewiki.net/wiki/Portal:eu>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:50:20+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: eu\n"
+"X-Message-Group: #out-statusnet-plugin-imap\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: E-mail subject in case of an error.
+msgid "Error"
+msgstr "Errorea"
+
+#. TRANS: Exception thrown when the ImapManager is used incorrectly in the code.
+msgid ""
+"ImapManager should be created using its constructor, not using the static "
+"\"get()\" method."
+msgstr ""
+"ImapManager bere eraikitzailea erabiliz sortu behar da, ez \"get ()\" metodo "
+"estatikoa erabiliz."
+
+#. TRANS: Exception thrown when configuration of the IMAP plugin is incorrect.
+msgid "A mailbox must be specified."
+msgstr "Postontzi bat zehaztu behar da."
+
+#. TRANS: Exception thrown when configuration of the IMAP plugin is incorrect.
+msgid "A user must be specified."
+msgstr "Erabiltzaile bat zehaztu behar da."
+
+#. TRANS: Exception thrown when configuration of the IMAP plugin is incorrect.
+msgid "A password must be specified."
+msgstr "Pasahitz bat zehaztu behar da."
+
+#. TRANS: Exception thrown when configuration of the IMAP plugin is incorrect.
+#. TRANS: poll_frequency is a setting that should not be translated.
+msgid "A poll_frequency must be specified."
+msgstr "Galdeketa frekuentzia zehaztu behar da."
+
+#. TRANS: Plugin description.
+msgid ""
+"The IMAP plugin allows for StatusNet to check a POP or IMAP mailbox for "
+"incoming mail containing user posts."
+msgstr ""
+"IMAP pluginak StatusNet-i erabiltzaileen sarrerak dituzten mezuak "
+"egiaztatzen uzten dio POP edo IMAP postontzietan."
diff --git a/plugins/Imap/locale/fr/LC_MESSAGES/Imap.po b/plugins/Imap/locale/fr/LC_MESSAGES/Imap.po
index a9696c489a..1ea0e0182c 100644
--- a/plugins/Imap/locale/fr/LC_MESSAGES/Imap.po
+++ b/plugins/Imap/locale/fr/LC_MESSAGES/Imap.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Imap to French (Français)
+# Translation of StatusNet - Imap to French (français)
 # Exported from translatewiki.net
 #
 # Author: Crochet.david
@@ -11,14 +11,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Imap\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:44+0000\n"
-"Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:50+0000\n"
+"Language-Team: French <https://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:27:31+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:20+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-imap\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
diff --git a/plugins/Imap/locale/gl/LC_MESSAGES/Imap.po b/plugins/Imap/locale/gl/LC_MESSAGES/Imap.po
new file mode 100644
index 0000000000..dcf95526f5
--- /dev/null
+++ b/plugins/Imap/locale/gl/LC_MESSAGES/Imap.po
@@ -0,0 +1,59 @@
+# Translation of StatusNet - Imap to Galician (galego)
+# Exported from translatewiki.net
+#
+# Author: Toliño
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Imap\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:50+0000\n"
+"Language-Team: Galician <https://translatewiki.net/wiki/Portal:gl>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:50:20+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: gl\n"
+"X-Message-Group: #out-statusnet-plugin-imap\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: E-mail subject in case of an error.
+msgid "Error"
+msgstr "Erro"
+
+#. TRANS: Exception thrown when the ImapManager is used incorrectly in the code.
+msgid ""
+"ImapManager should be created using its constructor, not using the static "
+"\"get()\" method."
+msgstr ""
+"ImapManager debería crearse mediante o seu construtor e non utilizando o "
+"método estático \"get()\"."
+
+#. TRANS: Exception thrown when configuration of the IMAP plugin is incorrect.
+msgid "A mailbox must be specified."
+msgstr "Cómpre especificar unha caixa de correos."
+
+#. TRANS: Exception thrown when configuration of the IMAP plugin is incorrect.
+msgid "A user must be specified."
+msgstr "Cómpre especificar un usuario."
+
+#. TRANS: Exception thrown when configuration of the IMAP plugin is incorrect.
+msgid "A password must be specified."
+msgstr "Cómpre especificar un contrasinal."
+
+#. TRANS: Exception thrown when configuration of the IMAP plugin is incorrect.
+#. TRANS: poll_frequency is a setting that should not be translated.
+msgid "A poll_frequency must be specified."
+msgstr "Cómpre especificar un poll_frequency."
+
+#. TRANS: Plugin description.
+msgid ""
+"The IMAP plugin allows for StatusNet to check a POP or IMAP mailbox for "
+"incoming mail containing user posts."
+msgstr ""
+"O complemento IMAP permite a StatusNet comprobar se as caixas de entrada POP "
+"ou IMAP posúen novas mensaxes que conteñan publicacións de usuario."
diff --git a/plugins/Imap/locale/ia/LC_MESSAGES/Imap.po b/plugins/Imap/locale/ia/LC_MESSAGES/Imap.po
index 22877b407c..3a0d8a7a6d 100644
--- a/plugins/Imap/locale/ia/LC_MESSAGES/Imap.po
+++ b/plugins/Imap/locale/ia/LC_MESSAGES/Imap.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Imap to Interlingua (Interlingua)
+# Translation of StatusNet - Imap to Interlingua (interlingua)
 # Exported from translatewiki.net
 #
 # Author: McDutchie
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Imap\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:45+0000\n"
-"Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:50+0000\n"
+"Language-Team: Interlingua <https://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:27:31+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:20+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-imap\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/Imap/locale/it/LC_MESSAGES/Imap.po b/plugins/Imap/locale/it/LC_MESSAGES/Imap.po
new file mode 100644
index 0000000000..749e9a04d1
--- /dev/null
+++ b/plugins/Imap/locale/it/LC_MESSAGES/Imap.po
@@ -0,0 +1,58 @@
+# Translation of StatusNet - Imap to Italian (italiano)
+# Exported from translatewiki.net
+#
+# Author: Od1n
+# Author: Ximo17
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Imap\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:50+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:50:20+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: E-mail subject in case of an error.
+msgid "Error"
+msgstr "Errore"
+
+#. TRANS: Exception thrown when the ImapManager is used incorrectly in the code.
+msgid ""
+"ImapManager should be created using its constructor, not using the static "
+"\"get()\" method."
+msgstr ""
+"ImapManager dovrebbe essere creato utilizzando il suo costruttore, non "
+"utilizzando il metodo statico \"ottieni ()\"."
+
+#. TRANS: Exception thrown when configuration of the IMAP plugin is incorrect.
+msgid "A mailbox must be specified."
+msgstr "È necessario specificare una casella di posta elettronica."
+
+#. TRANS: Exception thrown when configuration of the IMAP plugin is incorrect.
+msgid "A user must be specified."
+msgstr "È necessario specificare un utente."
+
+#. TRANS: Exception thrown when configuration of the IMAP plugin is incorrect.
+msgid "A password must be specified."
+msgstr "È necessario specificare una password."
+
+#. TRANS: Exception thrown when configuration of the IMAP plugin is incorrect.
+#. TRANS: poll_frequency is a setting that should not be translated.
+msgid "A poll_frequency must be specified."
+msgstr "È necessario specificare una poll_frequency."
+
+#. TRANS: Plugin description.
+msgid ""
+"The IMAP plugin allows for StatusNet to check a POP or IMAP mailbox for "
+"incoming mail containing user posts."
+msgstr ""
+"Il plugin IMAP consente a StatusNet di controllare una casella di posta "
+"elettronica POP o IMAP per la posta in arrivo contenente i messaggi "
+"dell'utente."
diff --git a/plugins/Imap/locale/mk/LC_MESSAGES/Imap.po b/plugins/Imap/locale/mk/LC_MESSAGES/Imap.po
index 0645156f95..e351026615 100644
--- a/plugins/Imap/locale/mk/LC_MESSAGES/Imap.po
+++ b/plugins/Imap/locale/mk/LC_MESSAGES/Imap.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Imap to Macedonian (Македон�ки)
+# Translation of StatusNet - Imap to Macedonian (македон�ки)
 # Exported from translatewiki.net
 #
 # Author: Bjankuloski06
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Imap\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:45+0000\n"
-"Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:50+0000\n"
+"Language-Team: Macedonian <https://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:27:31+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:20+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-imap\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
@@ -35,15 +35,15 @@ msgstr ""
 
 #. TRANS: Exception thrown when configuration of the IMAP plugin is incorrect.
 msgid "A mailbox must be specified."
-msgstr "Мора да назначите �андаче."
+msgstr "Мора да наведете �андаче."
 
 #. TRANS: Exception thrown when configuration of the IMAP plugin is incorrect.
 msgid "A user must be specified."
-msgstr "Мора да назначите кори�ник."
+msgstr "Мора да наведете кори�ник."
 
 #. TRANS: Exception thrown when configuration of the IMAP plugin is incorrect.
 msgid "A password must be specified."
-msgstr "Мора да назначите лозинка."
+msgstr "Мора да наведете лозинка."
 
 #. TRANS: Exception thrown when configuration of the IMAP plugin is incorrect.
 #. TRANS: poll_frequency is a setting that should not be translated.
diff --git a/plugins/Imap/locale/nb/LC_MESSAGES/Imap.po b/plugins/Imap/locale/nb/LC_MESSAGES/Imap.po
index 42c8b5c396..5b2aaaea55 100644
--- a/plugins/Imap/locale/nb/LC_MESSAGES/Imap.po
+++ b/plugins/Imap/locale/nb/LC_MESSAGES/Imap.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Imap to Norwegian (bokmål)‬ (‪Norsk (bokmål)‬)
+# Translation of StatusNet - Imap to Norwegian Bokmål (‪norsk (bokmål)‬)
 # Exported from translatewiki.net
 #
 # Author: Nghtwlkr
@@ -9,15 +9,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Imap\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:45+0000\n"
-"Language-Team: Norwegian (bokmål)‬ <http://translatewiki.net/wiki/Portal:no>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:50+0000\n"
+"Language-Team: Norwegian Bokmål <https://translatewiki.net/wiki/Portal:nb>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:27:31+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
-"X-Language-Code: no\n"
+"X-POT-Import-Date: 2011-06-05 21:50:20+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: nb\n"
 "X-Message-Group: #out-statusnet-plugin-imap\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
@@ -26,13 +26,12 @@ msgid "Error"
 msgstr "Feil"
 
 #. TRANS: Exception thrown when the ImapManager is used incorrectly in the code.
-#, fuzzy
 msgid ""
 "ImapManager should be created using its constructor, not using the static "
 "\"get()\" method."
 msgstr ""
 "ImapManager bør opprettes ved å bruke dets konstruktør, ikke ved å bruke "
-"dets statiske get-metode."
+"dets statiske «get()»-metode."
 
 #. TRANS: Exception thrown when configuration of the IMAP plugin is incorrect.
 msgid "A mailbox must be specified."
diff --git a/plugins/Imap/locale/nl/LC_MESSAGES/Imap.po b/plugins/Imap/locale/nl/LC_MESSAGES/Imap.po
index a618b3ddcc..2c02aecff2 100644
--- a/plugins/Imap/locale/nl/LC_MESSAGES/Imap.po
+++ b/plugins/Imap/locale/nl/LC_MESSAGES/Imap.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Imap\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:45+0000\n"
-"Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:50+0000\n"
+"Language-Team: Dutch <https://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:27:31+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:20+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-imap\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/Imap/locale/ru/LC_MESSAGES/Imap.po b/plugins/Imap/locale/ru/LC_MESSAGES/Imap.po
index 73dc9fa3f8..71303e5680 100644
--- a/plugins/Imap/locale/ru/LC_MESSAGES/Imap.po
+++ b/plugins/Imap/locale/ru/LC_MESSAGES/Imap.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Imap to Russian (Ру��кий)
+# Translation of StatusNet - Imap to Russian (ру��кий)
 # Exported from translatewiki.net
 #
 # Author: Eleferen
@@ -10,14 +10,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Imap\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:45+0000\n"
-"Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:50+0000\n"
+"Language-Team: Russian <https://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:27:31+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:20+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-imap\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
diff --git a/plugins/Imap/locale/sv/LC_MESSAGES/Imap.po b/plugins/Imap/locale/sv/LC_MESSAGES/Imap.po
index 53551ca989..a1c2e10e43 100644
--- a/plugins/Imap/locale/sv/LC_MESSAGES/Imap.po
+++ b/plugins/Imap/locale/sv/LC_MESSAGES/Imap.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Imap to Swedish (Svenska)
+# Translation of StatusNet - Imap to Swedish (svenska)
 # Exported from translatewiki.net
 #
 # Author: Jamminjohn
@@ -10,14 +10,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Imap\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:45+0000\n"
-"Language-Team: Swedish <http://translatewiki.net/wiki/Portal:sv>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:50+0000\n"
+"Language-Team: Swedish <https://translatewiki.net/wiki/Portal:sv>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:27:31+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:20+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: sv\n"
 "X-Message-Group: #out-statusnet-plugin-imap\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/Imap/locale/tl/LC_MESSAGES/Imap.po b/plugins/Imap/locale/tl/LC_MESSAGES/Imap.po
index 85c89a0e8a..aaadc837c9 100644
--- a/plugins/Imap/locale/tl/LC_MESSAGES/Imap.po
+++ b/plugins/Imap/locale/tl/LC_MESSAGES/Imap.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Imap\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:45+0000\n"
-"Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:50+0000\n"
+"Language-Team: Tagalog <https://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:27:31+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:20+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-imap\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/Imap/locale/uk/LC_MESSAGES/Imap.po b/plugins/Imap/locale/uk/LC_MESSAGES/Imap.po
index 73ccfe8c9e..ad83f8331e 100644
--- a/plugins/Imap/locale/uk/LC_MESSAGES/Imap.po
+++ b/plugins/Imap/locale/uk/LC_MESSAGES/Imap.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Imap to Ukrainian (Україн�ька)
+# Translation of StatusNet - Imap to Ukrainian (україн�ька)
 # Exported from translatewiki.net
 #
 # Author: Boogie
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Imap\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:45+0000\n"
-"Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:51+0000\n"
+"Language-Team: Ukrainian <https://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:27:31+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:20+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-imap\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
diff --git a/plugins/Imap/locale/zh_CN/LC_MESSAGES/Imap.po b/plugins/Imap/locale/zh_CN/LC_MESSAGES/Imap.po
index 29b3b431ea..0afd206a13 100644
--- a/plugins/Imap/locale/zh_CN/LC_MESSAGES/Imap.po
+++ b/plugins/Imap/locale/zh_CN/LC_MESSAGES/Imap.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Imap to Simplified Chinese (‪中文(简体)‬)
+# Translation of StatusNet - Imap to Simplified Chinese (‪中文（简体）‬)
 # Exported from translatewiki.net
 #
 # Author: Hydra
@@ -10,15 +10,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Imap\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:45+0000\n"
-"Language-Team: Simplified Chinese <http://translatewiki.net/wiki/Portal:zh-"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:51+0000\n"
+"Language-Team: Simplified Chinese <https://translatewiki.net/wiki/Portal:zh-"
 "hans>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:27:31+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:20+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: #out-statusnet-plugin-imap\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
diff --git a/plugins/InProcessCache/locale/InProcessCache.pot b/plugins/InProcessCache/locale/InProcessCache.pot
index 104b73bb50..58dc4d9910 100644
--- a/plugins/InProcessCache/locale/InProcessCache.pot
+++ b/plugins/InProcessCache/locale/InProcessCache.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
+"POT-Creation-Date: 2012-06-30 11:07+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"
diff --git a/plugins/InProcessCache/locale/de/LC_MESSAGES/InProcessCache.po b/plugins/InProcessCache/locale/de/LC_MESSAGES/InProcessCache.po
index eaf546f7ab..407215bb94 100644
--- a/plugins/InProcessCache/locale/de/LC_MESSAGES/InProcessCache.po
+++ b/plugins/InProcessCache/locale/de/LC_MESSAGES/InProcessCache.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - InProcessCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:47+0000\n"
-"Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:52+0000\n"
+"Language-Team: German <https://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-11 13:15:59+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:22+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-inprocesscache\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/InProcessCache/locale/es/LC_MESSAGES/InProcessCache.po b/plugins/InProcessCache/locale/es/LC_MESSAGES/InProcessCache.po
new file mode 100644
index 0000000000..7904a31162
--- /dev/null
+++ b/plugins/InProcessCache/locale/es/LC_MESSAGES/InProcessCache.po
@@ -0,0 +1,23 @@
+# Translation of StatusNet - InProcessCache to Spanish (español)
+# Exported from translatewiki.net
+#
+# Author: Armando-Martin
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - InProcessCache\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:53+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:50:22+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin dscription.
+msgid "Additional in-process cache for plugins."
+msgstr "Memoria caché adicional para los complementos (plugins)."
diff --git a/plugins/InProcessCache/locale/eu/LC_MESSAGES/InProcessCache.po b/plugins/InProcessCache/locale/eu/LC_MESSAGES/InProcessCache.po
new file mode 100644
index 0000000000..d16be7444a
--- /dev/null
+++ b/plugins/InProcessCache/locale/eu/LC_MESSAGES/InProcessCache.po
@@ -0,0 +1,23 @@
+# Translation of StatusNet - InProcessCache to Basque (euskara)
+# Exported from translatewiki.net
+#
+# Author: Artsuaga
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - InProcessCache\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:53+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:50:22+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin dscription.
+msgid "Additional in-process cache for plugins."
+msgstr "Pluginentzako katxe memoria gehigarria."
diff --git a/plugins/InProcessCache/locale/fr/LC_MESSAGES/InProcessCache.po b/plugins/InProcessCache/locale/fr/LC_MESSAGES/InProcessCache.po
index 21e06f96c1..677e62c30c 100644
--- a/plugins/InProcessCache/locale/fr/LC_MESSAGES/InProcessCache.po
+++ b/plugins/InProcessCache/locale/fr/LC_MESSAGES/InProcessCache.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - InProcessCache to French (Français)
+# Translation of StatusNet - InProcessCache to French (français)
 # Exported from translatewiki.net
 #
 # Author: Sherbrooke
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - InProcessCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:47+0000\n"
-"Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:53+0000\n"
+"Language-Team: French <https://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-11 13:15:59+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:22+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-inprocesscache\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
diff --git a/plugins/InProcessCache/locale/gl/LC_MESSAGES/InProcessCache.po b/plugins/InProcessCache/locale/gl/LC_MESSAGES/InProcessCache.po
new file mode 100644
index 0000000000..6f79f8b1d3
--- /dev/null
+++ b/plugins/InProcessCache/locale/gl/LC_MESSAGES/InProcessCache.po
@@ -0,0 +1,26 @@
+# Translation of StatusNet - InProcessCache to Galician (galego)
+# Exported from translatewiki.net
+#
+# Author: Toliño
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - InProcessCache\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:53+0000\n"
+"Language-Team: Galician <https://translatewiki.net/wiki/Portal:gl>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:50:22+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: gl\n"
+"X-Message-Group: #out-statusnet-plugin-inprocesscache\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin dscription.
+msgid "Additional in-process cache for plugins."
+msgstr "Memoria caché adicional para os complementos."
diff --git a/plugins/InProcessCache/locale/he/LC_MESSAGES/InProcessCache.po b/plugins/InProcessCache/locale/he/LC_MESSAGES/InProcessCache.po
new file mode 100644
index 0000000000..1959ae6ac1
--- /dev/null
+++ b/plugins/InProcessCache/locale/he/LC_MESSAGES/InProcessCache.po
@@ -0,0 +1,26 @@
+# Translation of StatusNet - InProcessCache to Hebrew (עברית)
+# Exported from translatewiki.net
+#
+# Author: Amire80
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - InProcessCache\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:53+0000\n"
+"Language-Team: Hebrew <https://translatewiki.net/wiki/Portal:he>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:50:22+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: he\n"
+"X-Message-Group: #out-statusnet-plugin-inprocesscache\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin dscription.
+msgid "Additional in-process cache for plugins."
+msgstr "מטמון תוך־תהליכי נוסף לתוספי�."
diff --git a/plugins/InProcessCache/locale/ia/LC_MESSAGES/InProcessCache.po b/plugins/InProcessCache/locale/ia/LC_MESSAGES/InProcessCache.po
index e3cdd3c436..3e968a72ee 100644
--- a/plugins/InProcessCache/locale/ia/LC_MESSAGES/InProcessCache.po
+++ b/plugins/InProcessCache/locale/ia/LC_MESSAGES/InProcessCache.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - InProcessCache to Interlingua (Interlingua)
+# Translation of StatusNet - InProcessCache to Interlingua (interlingua)
 # Exported from translatewiki.net
 #
 # Author: McDutchie
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - InProcessCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:47+0000\n"
-"Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:53+0000\n"
+"Language-Team: Interlingua <https://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-11 13:15:59+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:22+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-inprocesscache\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/InProcessCache/locale/it/LC_MESSAGES/InProcessCache.po b/plugins/InProcessCache/locale/it/LC_MESSAGES/InProcessCache.po
new file mode 100644
index 0000000000..5225425a04
--- /dev/null
+++ b/plugins/InProcessCache/locale/it/LC_MESSAGES/InProcessCache.po
@@ -0,0 +1,23 @@
+# Translation of StatusNet - InProcessCache to Italian (italiano)
+# Exported from translatewiki.net
+#
+# Author: Ximo17
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - InProcessCache\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:53+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:50:22+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin dscription.
+msgid "Additional in-process cache for plugins."
+msgstr "Ulteriore cache in-process per i plugin."
diff --git a/plugins/InProcessCache/locale/mk/LC_MESSAGES/InProcessCache.po b/plugins/InProcessCache/locale/mk/LC_MESSAGES/InProcessCache.po
index be45b124cf..0fc0aee5ac 100644
--- a/plugins/InProcessCache/locale/mk/LC_MESSAGES/InProcessCache.po
+++ b/plugins/InProcessCache/locale/mk/LC_MESSAGES/InProcessCache.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - InProcessCache to Macedonian (Македон�ки)
+# Translation of StatusNet - InProcessCache to Macedonian (македон�ки)
 # Exported from translatewiki.net
 #
 # Author: Bjankuloski06
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - InProcessCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:47+0000\n"
-"Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:53+0000\n"
+"Language-Team: Macedonian <https://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-11 13:15:59+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:22+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-inprocesscache\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
diff --git a/plugins/InProcessCache/locale/nl/LC_MESSAGES/InProcessCache.po b/plugins/InProcessCache/locale/nl/LC_MESSAGES/InProcessCache.po
index 4c396792d9..3c66a75930 100644
--- a/plugins/InProcessCache/locale/nl/LC_MESSAGES/InProcessCache.po
+++ b/plugins/InProcessCache/locale/nl/LC_MESSAGES/InProcessCache.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - InProcessCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:47+0000\n"
-"Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:53+0000\n"
+"Language-Team: Dutch <https://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-11 13:15:59+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:22+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-inprocesscache\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/InProcessCache/locale/pt/LC_MESSAGES/InProcessCache.po b/plugins/InProcessCache/locale/pt/LC_MESSAGES/InProcessCache.po
index d1077a295e..128e6f4a6e 100644
--- a/plugins/InProcessCache/locale/pt/LC_MESSAGES/InProcessCache.po
+++ b/plugins/InProcessCache/locale/pt/LC_MESSAGES/InProcessCache.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - InProcessCache to Portuguese (Português)
+# Translation of StatusNet - InProcessCache to Portuguese (português)
 # Exported from translatewiki.net
 #
 # Author: Waldir
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - InProcessCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:47+0000\n"
-"Language-Team: Portuguese <http://translatewiki.net/wiki/Portal:pt>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:53+0000\n"
+"Language-Team: Portuguese <https://translatewiki.net/wiki/Portal:pt>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-11 13:15:59+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:22+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: pt\n"
 "X-Message-Group: #out-statusnet-plugin-inprocesscache\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/InProcessCache/locale/ru/LC_MESSAGES/InProcessCache.po b/plugins/InProcessCache/locale/ru/LC_MESSAGES/InProcessCache.po
index c9b998bb84..2570e9ce41 100644
--- a/plugins/InProcessCache/locale/ru/LC_MESSAGES/InProcessCache.po
+++ b/plugins/InProcessCache/locale/ru/LC_MESSAGES/InProcessCache.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - InProcessCache to Russian (Ру��кий)
+# Translation of StatusNet - InProcessCache to Russian (ру��кий)
 # Exported from translatewiki.net
 #
 # Author: �лек�андр Сигачёв
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - InProcessCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:47+0000\n"
-"Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:53+0000\n"
+"Language-Team: Russian <https://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-11 13:15:59+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:22+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-inprocesscache\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
diff --git a/plugins/InProcessCache/locale/tl/LC_MESSAGES/InProcessCache.po b/plugins/InProcessCache/locale/tl/LC_MESSAGES/InProcessCache.po
index 581bc472cc..81a8d2de4c 100644
--- a/plugins/InProcessCache/locale/tl/LC_MESSAGES/InProcessCache.po
+++ b/plugins/InProcessCache/locale/tl/LC_MESSAGES/InProcessCache.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - InProcessCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:47+0000\n"
-"Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:53+0000\n"
+"Language-Team: Tagalog <https://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-11 13:15:59+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:22+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-inprocesscache\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/InProcessCache/locale/uk/LC_MESSAGES/InProcessCache.po b/plugins/InProcessCache/locale/uk/LC_MESSAGES/InProcessCache.po
index d0c56cd081..424eb9d2bc 100644
--- a/plugins/InProcessCache/locale/uk/LC_MESSAGES/InProcessCache.po
+++ b/plugins/InProcessCache/locale/uk/LC_MESSAGES/InProcessCache.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - InProcessCache to Ukrainian (Україн�ька)
+# Translation of StatusNet - InProcessCache to Ukrainian (україн�ька)
 # Exported from translatewiki.net
 #
 # Author: Boogie
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - InProcessCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:47+0000\n"
-"Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:54+0000\n"
+"Language-Team: Ukrainian <https://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-11 13:15:59+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:22+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-inprocesscache\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
diff --git a/plugins/InProcessCache/locale/zh_CN/LC_MESSAGES/InProcessCache.po b/plugins/InProcessCache/locale/zh_CN/LC_MESSAGES/InProcessCache.po
index 556a7c15bf..29b2e9149d 100644
--- a/plugins/InProcessCache/locale/zh_CN/LC_MESSAGES/InProcessCache.po
+++ b/plugins/InProcessCache/locale/zh_CN/LC_MESSAGES/InProcessCache.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - InProcessCache to Simplified Chinese (‪中文(简体)‬)
+# Translation of StatusNet - InProcessCache to Simplified Chinese (‪中文（简体）‬)
 # Exported from translatewiki.net
 #
 # Author: Hydra
@@ -9,15 +9,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - InProcessCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:47+0000\n"
-"Language-Team: Simplified Chinese <http://translatewiki.net/wiki/Portal:zh-"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:54+0000\n"
+"Language-Team: Simplified Chinese <https://translatewiki.net/wiki/Portal:zh-"
 "hans>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-11 13:15:59+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:22+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: #out-statusnet-plugin-inprocesscache\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
diff --git a/plugins/InfiniteScroll/InfiniteScrollPlugin.php b/plugins/InfiniteScroll/InfiniteScrollPlugin.php
index 376d88abb0..cec1a53524 100644
--- a/plugins/InfiniteScroll/InfiniteScrollPlugin.php
+++ b/plugins/InfiniteScroll/InfiniteScrollPlugin.php
@@ -33,6 +33,9 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
 
 class InfiniteScrollPlugin extends Plugin
 {
+
+    public $on_next_only = false;
+
     function __construct()
     {
         parent::__construct();
@@ -41,6 +44,7 @@ class InfiniteScrollPlugin extends Plugin
     function onEndShowScripts($action)
     {
         $action->inlineScript('var infinite_scroll_on_next_only = ' . ($this->on_next_only?'true':'false') . ';');
+        $action->inlineScript('var ajax_loader_url = "' . ($this->path('ajax-loader.gif')) . '";');
         $action->script($this->path('jquery.infinitescroll.js'));
         $action->script($this->path('infinitescroll.js'));
     }
diff --git a/plugins/InfiniteScroll/infinitescroll.js b/plugins/InfiniteScroll/infinitescroll.js
index f28c90a808..6fcf098dfe 100644
--- a/plugins/InfiniteScroll/infinitescroll.js
+++ b/plugins/InfiniteScroll/infinitescroll.js
@@ -9,7 +9,7 @@ jQuery(document).ready(function($){
                       'body#showfavorites li.nav_next a,'+
                       'body#showgroup li.nav_next a,'+
                       'body#favorited li.nav_next a',
-    loadingImg      : $('address .url')[0].href+'plugins/InfiniteScroll/ajax-loader.gif',
+    loadingImg      : ajax_loader_url,
     text            : "<em>Loading the next set of posts...</em>",
     donetext        : "<em>Congratulations, you\'ve reached the end of the Internet.</em>",
     navSelector     : "#pagination",
diff --git a/plugins/InfiniteScroll/locale/InfiniteScroll.pot b/plugins/InfiniteScroll/locale/InfiniteScroll.pot
index 250388e77a..64cdc9f958 100644
--- a/plugins/InfiniteScroll/locale/InfiniteScroll.pot
+++ b/plugins/InfiniteScroll/locale/InfiniteScroll.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
+"POT-Creation-Date: 2012-06-30 11:07+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"
diff --git a/plugins/InfiniteScroll/locale/de/LC_MESSAGES/InfiniteScroll.po b/plugins/InfiniteScroll/locale/de/LC_MESSAGES/InfiniteScroll.po
index 32a1dfe913..09a0208e1d 100644
--- a/plugins/InfiniteScroll/locale/de/LC_MESSAGES/InfiniteScroll.po
+++ b/plugins/InfiniteScroll/locale/de/LC_MESSAGES/InfiniteScroll.po
@@ -10,14 +10,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - InfiniteScroll\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:45+0000\n"
-"Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:51+0000\n"
+"Language-Team: German <https://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:07:13+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:21+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-infinitescroll\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/InfiniteScroll/locale/es/LC_MESSAGES/InfiniteScroll.po b/plugins/InfiniteScroll/locale/es/LC_MESSAGES/InfiniteScroll.po
index 8ca360d167..46eb668262 100644
--- a/plugins/InfiniteScroll/locale/es/LC_MESSAGES/InfiniteScroll.po
+++ b/plugins/InfiniteScroll/locale/es/LC_MESSAGES/InfiniteScroll.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - InfiniteScroll to Spanish (Español)
+# Translation of StatusNet - InfiniteScroll to Spanish (español)
 # Exported from translatewiki.net
 #
 # Author: Translationista
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - InfiniteScroll\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:46+0000\n"
-"Language-Team: Spanish <http://translatewiki.net/wiki/Portal:es>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:51+0000\n"
+"Language-Team: Spanish <https://translatewiki.net/wiki/Portal:es>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:07:13+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:21+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-plugin-infinitescroll\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/InfiniteScroll/locale/eu/LC_MESSAGES/InfiniteScroll.po b/plugins/InfiniteScroll/locale/eu/LC_MESSAGES/InfiniteScroll.po
new file mode 100644
index 0000000000..150988d030
--- /dev/null
+++ b/plugins/InfiniteScroll/locale/eu/LC_MESSAGES/InfiniteScroll.po
@@ -0,0 +1,33 @@
+# Translation of StatusNet - InfiniteScroll to Basque (euskara)
+# Exported from translatewiki.net
+#
+# Author: Artsuaga
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - InfiniteScroll\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:51+0000\n"
+"Language-Team: Basque <https://translatewiki.net/wiki/Portal:eu>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:50:21+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: eu\n"
+"X-Message-Group: #out-statusnet-plugin-infinitescroll\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin dscription.
+msgid ""
+"Infinite Scroll adds the following functionality to your StatusNet "
+"installation: When a user scrolls towards the bottom of the page, the next "
+"page of notices is automatically retrieved and appended. This means they "
+"never need to click \"Next Page\", which dramatically increases stickiness."
+msgstr ""
+"Infinite Scroll pluginak scrollarekin behera egin einean orria luzatzen du "
+"ohar zaharrak azpikaldean gehituz, \"Hurrengo Orria\" linka ezabatzen du "
+"aldi berean."
diff --git a/plugins/InfiniteScroll/locale/fr/LC_MESSAGES/InfiniteScroll.po b/plugins/InfiniteScroll/locale/fr/LC_MESSAGES/InfiniteScroll.po
index 9002811471..5c6f05eb02 100644
--- a/plugins/InfiniteScroll/locale/fr/LC_MESSAGES/InfiniteScroll.po
+++ b/plugins/InfiniteScroll/locale/fr/LC_MESSAGES/InfiniteScroll.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - InfiniteScroll to French (Français)
+# Translation of StatusNet - InfiniteScroll to French (français)
 # Exported from translatewiki.net
 #
 # Author: Peter17
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - InfiniteScroll\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:46+0000\n"
-"Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:51+0000\n"
+"Language-Team: French <https://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:07:13+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:21+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-infinitescroll\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
diff --git a/plugins/InfiniteScroll/locale/gl/LC_MESSAGES/InfiniteScroll.po b/plugins/InfiniteScroll/locale/gl/LC_MESSAGES/InfiniteScroll.po
new file mode 100644
index 0000000000..f25573b926
--- /dev/null
+++ b/plugins/InfiniteScroll/locale/gl/LC_MESSAGES/InfiniteScroll.po
@@ -0,0 +1,35 @@
+# Translation of StatusNet - InfiniteScroll to Galician (galego)
+# Exported from translatewiki.net
+#
+# Author: Toliño
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - InfiniteScroll\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:51+0000\n"
+"Language-Team: Galician <https://translatewiki.net/wiki/Portal:gl>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:50:21+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: gl\n"
+"X-Message-Group: #out-statusnet-plugin-infinitescroll\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin dscription.
+msgid ""
+"Infinite Scroll adds the following functionality to your StatusNet "
+"installation: When a user scrolls towards the bottom of the page, the next "
+"page of notices is automatically retrieved and appended. This means they "
+"never need to click \"Next Page\", which dramatically increases stickiness."
+msgstr ""
+"Infinite Scroll engade a seguinte funcionalizade á súa instalación de "
+"StatusNet: Cando un usuario se despraza ata o pé da páxina, recupérase e "
+"engádese a seguinte páxina de notas. Isto significa que non é necesario "
+"premer en \"Páxina seguinte\", algo que aumenta considerablemente a "
+"capacidade de retención."
diff --git a/plugins/InfiniteScroll/locale/he/LC_MESSAGES/InfiniteScroll.po b/plugins/InfiniteScroll/locale/he/LC_MESSAGES/InfiniteScroll.po
index 34d651e147..8785b4b9dd 100644
--- a/plugins/InfiniteScroll/locale/he/LC_MESSAGES/InfiniteScroll.po
+++ b/plugins/InfiniteScroll/locale/he/LC_MESSAGES/InfiniteScroll.po
@@ -1,6 +1,7 @@
 # Translation of StatusNet - InfiniteScroll to Hebrew (עברית)
 # Exported from translatewiki.net
 #
+# Author: Amire80
 # Author: YaronSh
 # --
 # This file is distributed under the same license as the StatusNet package.
@@ -9,14 +10,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - InfiniteScroll\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:46+0000\n"
-"Language-Team: Hebrew <http://translatewiki.net/wiki/Portal:he>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:51+0000\n"
+"Language-Team: Hebrew <https://translatewiki.net/wiki/Portal:he>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:07:13+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:21+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: he\n"
 "X-Message-Group: #out-statusnet-plugin-infinitescroll\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -29,6 +30,6 @@ msgid ""
 "never need to click \"Next Page\", which dramatically increases stickiness."
 msgstr ""
 "Infinite Scroll (גלילה �ינסופית) מוסיפה �ת התכונות הב�ות להתקנת ה־StatusNet "
-"שלך: כ�שר משתמש גולל �ל עבר תחתית הדף, דף ההודעות הב� נטען ונוסף �וטומטית. "
+"שלך: כ�שר משתמש גולל �ל עבר תחתית הדף, דף העדכוני� הב� נטען ונוסף �וטומטית. "
 "משמעות הדבר הי� ש�ין על המשתמשי� ללחוץ על \"הדף הב�\", מה שמגביר �ת תחושת "
 "הדבקות בצורה דרמטית."
diff --git a/plugins/InfiniteScroll/locale/ia/LC_MESSAGES/InfiniteScroll.po b/plugins/InfiniteScroll/locale/ia/LC_MESSAGES/InfiniteScroll.po
index d5e70e89ca..b3bc7500f9 100644
--- a/plugins/InfiniteScroll/locale/ia/LC_MESSAGES/InfiniteScroll.po
+++ b/plugins/InfiniteScroll/locale/ia/LC_MESSAGES/InfiniteScroll.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - InfiniteScroll to Interlingua (Interlingua)
+# Translation of StatusNet - InfiniteScroll to Interlingua (interlingua)
 # Exported from translatewiki.net
 #
 # Author: McDutchie
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - InfiniteScroll\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:46+0000\n"
-"Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:51+0000\n"
+"Language-Team: Interlingua <https://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:07:13+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:21+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-infinitescroll\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/InfiniteScroll/locale/id/LC_MESSAGES/InfiniteScroll.po b/plugins/InfiniteScroll/locale/id/LC_MESSAGES/InfiniteScroll.po
index e67c09b47b..796785c628 100644
--- a/plugins/InfiniteScroll/locale/id/LC_MESSAGES/InfiniteScroll.po
+++ b/plugins/InfiniteScroll/locale/id/LC_MESSAGES/InfiniteScroll.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - InfiniteScroll\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:46+0000\n"
-"Language-Team: Indonesian <http://translatewiki.net/wiki/Portal:id>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:51+0000\n"
+"Language-Team: Indonesian <https://translatewiki.net/wiki/Portal:id>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:07:13+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:21+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: id\n"
 "X-Message-Group: #out-statusnet-plugin-infinitescroll\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
diff --git a/plugins/InfiniteScroll/locale/it/LC_MESSAGES/InfiniteScroll.po b/plugins/InfiniteScroll/locale/it/LC_MESSAGES/InfiniteScroll.po
new file mode 100644
index 0000000000..d0347fb0c4
--- /dev/null
+++ b/plugins/InfiniteScroll/locale/it/LC_MESSAGES/InfiniteScroll.po
@@ -0,0 +1,33 @@
+# Translation of StatusNet - InfiniteScroll to Italian (italiano)
+# Exported from translatewiki.net
+#
+# Author: GreenFox
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - InfiniteScroll\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:52+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:50:21+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin dscription.
+msgid ""
+"Infinite Scroll adds the following functionality to your StatusNet "
+"installation: When a user scrolls towards the bottom of the page, the next "
+"page of notices is automatically retrieved and appended. This means they "
+"never need to click \"Next Page\", which dramatically increases stickiness."
+msgstr ""
+"InfiniteScroll aggiunge le seguenti funzionalità alla vostra installazione "
+"di StatusNet: quando un utente scorre verso il fondo della pagina, la pagina "
+"delle comunicazioni seguenti è automaticamente recuperata e messa di "
+"seguito. Questo significa che gli utenti non necessitano di cliccare su "
+"\"Pagina seguente\", che aumenta considerevolmente la concentrazione "
+"dell'utilizzatore"
diff --git a/plugins/InfiniteScroll/locale/ja/LC_MESSAGES/InfiniteScroll.po b/plugins/InfiniteScroll/locale/ja/LC_MESSAGES/InfiniteScroll.po
index b9527528a6..0fbd2be483 100644
--- a/plugins/InfiniteScroll/locale/ja/LC_MESSAGES/InfiniteScroll.po
+++ b/plugins/InfiniteScroll/locale/ja/LC_MESSAGES/InfiniteScroll.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - InfiniteScroll\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:46+0000\n"
-"Language-Team: Japanese <http://translatewiki.net/wiki/Portal:ja>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:52+0000\n"
+"Language-Team: Japanese <https://translatewiki.net/wiki/Portal:ja>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:07:13+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:21+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ja\n"
 "X-Message-Group: #out-statusnet-plugin-infinitescroll\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
diff --git a/plugins/InfiniteScroll/locale/mk/LC_MESSAGES/InfiniteScroll.po b/plugins/InfiniteScroll/locale/mk/LC_MESSAGES/InfiniteScroll.po
index fcbc211703..ad627e7cf3 100644
--- a/plugins/InfiniteScroll/locale/mk/LC_MESSAGES/InfiniteScroll.po
+++ b/plugins/InfiniteScroll/locale/mk/LC_MESSAGES/InfiniteScroll.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - InfiniteScroll to Macedonian (Македон�ки)
+# Translation of StatusNet - InfiniteScroll to Macedonian (македон�ки)
 # Exported from translatewiki.net
 #
 # Author: Bjankuloski06
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - InfiniteScroll\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:46+0000\n"
-"Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:52+0000\n"
+"Language-Team: Macedonian <https://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:07:13+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:21+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-infinitescroll\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
diff --git a/plugins/InfiniteScroll/locale/nb/LC_MESSAGES/InfiniteScroll.po b/plugins/InfiniteScroll/locale/nb/LC_MESSAGES/InfiniteScroll.po
index b50887ebe3..efa2ca6b6b 100644
--- a/plugins/InfiniteScroll/locale/nb/LC_MESSAGES/InfiniteScroll.po
+++ b/plugins/InfiniteScroll/locale/nb/LC_MESSAGES/InfiniteScroll.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - InfiniteScroll to Norwegian (bokmål)‬ (‪Norsk (bokmål)‬)
+# Translation of StatusNet - InfiniteScroll to Norwegian Bokmål (‪norsk (bokmål)‬)
 # Exported from translatewiki.net
 #
 # Author: Nghtwlkr
@@ -9,15 +9,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - InfiniteScroll\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:46+0000\n"
-"Language-Team: Norwegian (bokmål)‬ <http://translatewiki.net/wiki/Portal:no>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:52+0000\n"
+"Language-Team: Norwegian Bokmål <https://translatewiki.net/wiki/Portal:nb>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:07:13+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
-"X-Language-Code: no\n"
+"X-POT-Import-Date: 2011-06-05 21:50:21+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: nb\n"
 "X-Message-Group: #out-statusnet-plugin-infinitescroll\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
diff --git a/plugins/InfiniteScroll/locale/nl/LC_MESSAGES/InfiniteScroll.po b/plugins/InfiniteScroll/locale/nl/LC_MESSAGES/InfiniteScroll.po
index 3d4501b558..bd62ebaa35 100644
--- a/plugins/InfiniteScroll/locale/nl/LC_MESSAGES/InfiniteScroll.po
+++ b/plugins/InfiniteScroll/locale/nl/LC_MESSAGES/InfiniteScroll.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - InfiniteScroll\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:46+0000\n"
-"Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:52+0000\n"
+"Language-Team: Dutch <https://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:07:13+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:21+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-infinitescroll\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/InfiniteScroll/locale/pt_BR/LC_MESSAGES/InfiniteScroll.po b/plugins/InfiniteScroll/locale/pt_BR/LC_MESSAGES/InfiniteScroll.po
index 3f682433c5..e898c542d3 100644
--- a/plugins/InfiniteScroll/locale/pt_BR/LC_MESSAGES/InfiniteScroll.po
+++ b/plugins/InfiniteScroll/locale/pt_BR/LC_MESSAGES/InfiniteScroll.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - InfiniteScroll to Brazilian Portuguese (Português do Brasil)
+# Translation of StatusNet - InfiniteScroll to Brazilian Portuguese (português do Brasil)
 # Exported from translatewiki.net
 #
 # Author: Giro720
@@ -9,15 +9,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - InfiniteScroll\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:46+0000\n"
-"Language-Team: Brazilian Portuguese <http://translatewiki.net/wiki/Portal:pt-"
-"br>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:52+0000\n"
+"Language-Team: Brazilian Portuguese <https://translatewiki.net/wiki/Portal:"
+"pt-br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:07:13+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:21+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: pt-br\n"
 "X-Message-Group: #out-statusnet-plugin-infinitescroll\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
diff --git a/plugins/InfiniteScroll/locale/ru/LC_MESSAGES/InfiniteScroll.po b/plugins/InfiniteScroll/locale/ru/LC_MESSAGES/InfiniteScroll.po
index 510ed7ec12..380e292737 100644
--- a/plugins/InfiniteScroll/locale/ru/LC_MESSAGES/InfiniteScroll.po
+++ b/plugins/InfiniteScroll/locale/ru/LC_MESSAGES/InfiniteScroll.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - InfiniteScroll to Russian (Ру��кий)
+# Translation of StatusNet - InfiniteScroll to Russian (ру��кий)
 # Exported from translatewiki.net
 #
 # Author: Сrower
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - InfiniteScroll\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:46+0000\n"
-"Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:52+0000\n"
+"Language-Team: Russian <https://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:07:13+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:21+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-infinitescroll\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
diff --git a/plugins/InfiniteScroll/locale/tl/LC_MESSAGES/InfiniteScroll.po b/plugins/InfiniteScroll/locale/tl/LC_MESSAGES/InfiniteScroll.po
index 1831744452..82b4ce143c 100644
--- a/plugins/InfiniteScroll/locale/tl/LC_MESSAGES/InfiniteScroll.po
+++ b/plugins/InfiniteScroll/locale/tl/LC_MESSAGES/InfiniteScroll.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - InfiniteScroll\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:46+0000\n"
-"Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:52+0000\n"
+"Language-Team: Tagalog <https://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:07:13+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:21+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-infinitescroll\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/InfiniteScroll/locale/uk/LC_MESSAGES/InfiniteScroll.po b/plugins/InfiniteScroll/locale/uk/LC_MESSAGES/InfiniteScroll.po
index 82d640c305..4790234423 100644
--- a/plugins/InfiniteScroll/locale/uk/LC_MESSAGES/InfiniteScroll.po
+++ b/plugins/InfiniteScroll/locale/uk/LC_MESSAGES/InfiniteScroll.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - InfiniteScroll to Ukrainian (Україн�ька)
+# Translation of StatusNet - InfiniteScroll to Ukrainian (україн�ька)
 # Exported from translatewiki.net
 #
 # Author: Boogie
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - InfiniteScroll\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:46+0000\n"
-"Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:52+0000\n"
+"Language-Team: Ukrainian <https://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:07:13+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:21+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-infinitescroll\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
diff --git a/plugins/InfiniteScroll/locale/zh_CN/LC_MESSAGES/InfiniteScroll.po b/plugins/InfiniteScroll/locale/zh_CN/LC_MESSAGES/InfiniteScroll.po
index 6392624ee2..34d8e581c0 100644
--- a/plugins/InfiniteScroll/locale/zh_CN/LC_MESSAGES/InfiniteScroll.po
+++ b/plugins/InfiniteScroll/locale/zh_CN/LC_MESSAGES/InfiniteScroll.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - InfiniteScroll to Simplified Chinese (‪中文(简体)‬)
+# Translation of StatusNet - InfiniteScroll to Simplified Chinese (‪中文（简体）‬)
 # Exported from translatewiki.net
 #
 # Author: ZhengYiFeng
@@ -9,15 +9,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - InfiniteScroll\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:46+0000\n"
-"Language-Team: Simplified Chinese <http://translatewiki.net/wiki/Portal:zh-"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:52+0000\n"
+"Language-Team: Simplified Chinese <https://translatewiki.net/wiki/Portal:zh-"
 "hans>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:07:13+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:21+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: #out-statusnet-plugin-infinitescroll\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
diff --git a/plugins/Irc/locale/Irc.pot b/plugins/Irc/locale/Irc.pot
index dcf89ec410..5a4abaea28 100644
--- a/plugins/Irc/locale/Irc.pot
+++ b/plugins/Irc/locale/Irc.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
+"POT-Creation-Date: 2012-06-30 11:07+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"
diff --git a/plugins/Irc/locale/ca/LC_MESSAGES/Irc.po b/plugins/Irc/locale/ca/LC_MESSAGES/Irc.po
new file mode 100644
index 0000000000..70819f3d28
--- /dev/null
+++ b/plugins/Irc/locale/ca/LC_MESSAGES/Irc.po
@@ -0,0 +1,84 @@
+# Translation of StatusNet - Irc to Catalan (català)
+# Exported from translatewiki.net
+#
+# Author: Toniher
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Irc\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:54+0000\n"
+"Language-Team: Catalan <https://translatewiki.net/wiki/Portal:ca>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:50:23+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: ca\n"
+"X-Message-Group: #out-statusnet-plugin-irc\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Service name for IRC.
+msgid "IRC"
+msgstr "IRC"
+
+#. TRANS: Body text for e-mail confirmation message for IRC.
+#. TRANS: %1$s is a user nickname, %2$s is the StatusNet sitename,
+#. TRANS: %3$s is the plugin display name ("IRC"), %4$s is the confirm address URL.
+#, php-format
+msgid ""
+"User \"%1$s\" on %2$s has said that your %3$s screenname belongs to them. If "
+"that's true, you can confirm by clicking on this URL: %4$s . (If you cannot "
+"click it, copy-and-paste it into the address bar of your browser). If that "
+"user is not you, or if you did not request this confirmation, just ignore "
+"this message."
+msgstr ""
+"L'usuari «%1$s» a %2$s diu que el vostre nom %3$s li pertany. Si això fos "
+"veritat, podeu confirmar-ho clicant a l'URL: %4$s . (Si no podeu clicar-hi, "
+"copieu-la i enganxeu-la a la barra d'ubicació del vostre navegador). Si no "
+"fóssiu aquest usuari, o bé si no heu sol·licitat aquesta confirmació, "
+"simplement ignoreu el missatge."
+
+#. TRANS: Exception thrown when initialising the IRC plugin fails because of an incorrect configuration.
+msgid "You must specify a host."
+msgstr "Heu d'especificar un servidor central."
+
+#. TRANS: Exception thrown when initialising the IRC plugin fails because of an incorrect configuration.
+msgid "You must specify a username."
+msgstr "Heu d'especificar un nom d'usuari."
+
+#. TRANS: Exception thrown when initialising the IRC plugin fails because of an incorrect configuration.
+msgid "You must specify a \"real name\"."
+msgstr "Heu d'especificar un «nom real»."
+
+#. TRANS: Exception thrown when initialising the IRC plugin fails because of an incorrect configuration.
+msgid "You must specify a nickname."
+msgstr "Heu d'especificar un sobrenom."
+
+#. TRANS: Plugin description.
+msgid ""
+"The IRC plugin allows users to send and receive notices over an IRC network."
+msgstr ""
+"El connector IRC permet als usuaris enviar i rebre avisos des d'una xarxa "
+"IRC."
+
+#. TRANS: Exception thrown when an IRC attempts count could not be updated.
+#. TRANS: %d is the object ID for which the count could not be updated.
+#, php-format
+msgid "Could not increment attempts count for %d."
+msgstr ""
+
+#. TRANS: Message given when using an unregistered IRC nickname.
+msgid "Your nickname is not registered so IRC connectivity cannot be enabled."
+msgstr ""
+
+#. TRANS: Server error thrown on database error when deleting IRC nickname confirmation.
+msgid "Could not delete confirmation."
+msgstr "No s'ha pogut eliminar la confirmació."
+
+#. TRANS: Server exception thrown when an IRC waiting queue item could not be added to the database.
+msgid "Database error inserting IRC waiting queue item."
+msgstr ""
diff --git a/plugins/Irc/locale/de/LC_MESSAGES/Irc.po b/plugins/Irc/locale/de/LC_MESSAGES/Irc.po
index 7b79f7aeb8..1ed8c11ea6 100644
--- a/plugins/Irc/locale/de/LC_MESSAGES/Irc.po
+++ b/plugins/Irc/locale/de/LC_MESSAGES/Irc.po
@@ -10,14 +10,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Irc\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:48+0000\n"
-"Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:54+0000\n"
+"Language-Team: German <https://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:27:55+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:23+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-irc\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/Irc/locale/es/LC_MESSAGES/Irc.po b/plugins/Irc/locale/es/LC_MESSAGES/Irc.po
new file mode 100644
index 0000000000..d05279f2d1
--- /dev/null
+++ b/plugins/Irc/locale/es/LC_MESSAGES/Irc.po
@@ -0,0 +1,84 @@
+# Translation of StatusNet - Irc to Spanish (español)
+# Exported from translatewiki.net
+#
+# Author: Armando-Martin
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Irc\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:54+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:50:23+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Service name for IRC.
+msgid "IRC"
+msgstr "IRC"
+
+#. TRANS: Body text for e-mail confirmation message for IRC.
+#. TRANS: %1$s is a user nickname, %2$s is the StatusNet sitename,
+#. TRANS: %3$s is the plugin display name ("IRC"), %4$s is the confirm address URL.
+#, php-format
+msgid ""
+"User \"%1$s\" on %2$s has said that your %3$s screenname belongs to them. If "
+"that's true, you can confirm by clicking on this URL: %4$s . (If you cannot "
+"click it, copy-and-paste it into the address bar of your browser). If that "
+"user is not you, or if you did not request this confirmation, just ignore "
+"this message."
+msgstr ""
+"El usuario \"%1$s\" de  %2$s  ha dicho que su pseudónimo  %3$s le pertenece. "
+"Si eso es cierto, puede confirmarlo haciendo clic en esta dirección URL:  %4"
+"$s  . (Si no puede hacer clic en esa dirección, cópiela y péguela en la "
+"barra de direcciones del navegador). Si el usuario no es usted, o si no "
+"pidió esta confirmación, simplemente ignore este mensaje."
+
+#. TRANS: Exception thrown when initialising the IRC plugin fails because of an incorrect configuration.
+msgid "You must specify a host."
+msgstr "Debe especificar un servidor (host)."
+
+#. TRANS: Exception thrown when initialising the IRC plugin fails because of an incorrect configuration.
+msgid "You must specify a username."
+msgstr "Debe especificar un nombre de usuario."
+
+#. TRANS: Exception thrown when initialising the IRC plugin fails because of an incorrect configuration.
+msgid "You must specify a \"real name\"."
+msgstr "Debe especificar un \"nombre real\"."
+
+#. TRANS: Exception thrown when initialising the IRC plugin fails because of an incorrect configuration.
+msgid "You must specify a nickname."
+msgstr "Debe especificar un alias."
+
+#. TRANS: Plugin description.
+msgid ""
+"The IRC plugin allows users to send and receive notices over an IRC network."
+msgstr ""
+"El complemento (plugin) IRC permite a los usuarios enviar y recibir mensajes "
+"mediante una red IRC."
+
+#. TRANS: Exception thrown when an IRC attempts count could not be updated.
+#. TRANS: %d is the object ID for which the count could not be updated.
+#, php-format
+msgid "Could not increment attempts count for %d."
+msgstr "No se pudo incrementar el número de intentos de %d."
+
+#. TRANS: Message given when using an unregistered IRC nickname.
+msgid "Your nickname is not registered so IRC connectivity cannot be enabled."
+msgstr ""
+"Su pseudónimo (nickname) no está registrado, por lo que no se puede "
+"habilitar la conectividad IRC."
+
+#. TRANS: Server error thrown on database error when deleting IRC nickname confirmation.
+msgid "Could not delete confirmation."
+msgstr "No se pudo eliminar la confirmación."
+
+#. TRANS: Server exception thrown when an IRC waiting queue item could not be added to the database.
+msgid "Database error inserting IRC waiting queue item."
+msgstr ""
+"Error de base de datos al insertar un elemento en la cola de espera de IRC."
diff --git a/plugins/Irc/locale/eu/LC_MESSAGES/Irc.po b/plugins/Irc/locale/eu/LC_MESSAGES/Irc.po
new file mode 100644
index 0000000000..84e9a790d9
--- /dev/null
+++ b/plugins/Irc/locale/eu/LC_MESSAGES/Irc.po
@@ -0,0 +1,80 @@
+# Translation of StatusNet - Irc to Basque (euskara)
+# Exported from translatewiki.net
+#
+# Author: Artsuaga
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Irc\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:54+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:50:23+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Service name for IRC.
+msgid "IRC"
+msgstr "IRC"
+
+#. TRANS: Body text for e-mail confirmation message for IRC.
+#. TRANS: %1$s is a user nickname, %2$s is the StatusNet sitename,
+#. TRANS: %3$s is the plugin display name ("IRC"), %4$s is the confirm address URL.
+#, php-format
+msgid ""
+"User \"%1$s\" on %2$s has said that your %3$s screenname belongs to them. If "
+"that's true, you can confirm by clicking on this URL: %4$s . (If you cannot "
+"click it, copy-and-paste it into the address bar of your browser). If that "
+"user is not you, or if you did not request this confirmation, just ignore "
+"this message."
+msgstr ""
+"%2$s guneko %1$s erabiltzaileak %3$s izena berea dela dio. Egia bada, URL "
+"honetan klik eginda baiezta dezakezu: %4$s . (Ezin baduzu klik egin, kopiatu "
+"eta zure nabigatzailearen helbide barran itsatsi).  Erailtzaile hori zu ez "
+"bazara, edo ez baduzu baieztapen-eskaririk egin, ez egin jaramonik mezu honi."
+
+#. TRANS: Exception thrown when initialising the IRC plugin fails because of an incorrect configuration.
+msgid "You must specify a host."
+msgstr "Host bat zehaztu behar duzu."
+
+#. TRANS: Exception thrown when initialising the IRC plugin fails because of an incorrect configuration.
+msgid "You must specify a username."
+msgstr "Erabiltzaile izen bat zehaztu behar duzu."
+
+#. TRANS: Exception thrown when initialising the IRC plugin fails because of an incorrect configuration.
+msgid "You must specify a \"real name\"."
+msgstr "Benetako izen bat zehaztu behar duzu."
+
+#. TRANS: Exception thrown when initialising the IRC plugin fails because of an incorrect configuration.
+msgid "You must specify a nickname."
+msgstr "Ezizen bat zehaztu behar duzu."
+
+#. TRANS: Plugin description.
+msgid ""
+"The IRC plugin allows users to send and receive notices over an IRC network."
+msgstr ""
+"IRC pluginak erabiltzaileei IRC sare bidez oharrak bidali eta jasotzen uzten "
+"die."
+
+#. TRANS: Exception thrown when an IRC attempts count could not be updated.
+#. TRANS: %d is the object ID for which the count could not be updated.
+#, php-format
+msgid "Could not increment attempts count for %d."
+msgstr "Ezin izan da gehitu %d(r)entzako saiakera kopurua."
+
+#. TRANS: Message given when using an unregistered IRC nickname.
+msgid "Your nickname is not registered so IRC connectivity cannot be enabled."
+msgstr "Zure ezizena erregistraturik ez dagoenez IRC koneksioa ezin da gaitu."
+
+#. TRANS: Server error thrown on database error when deleting IRC nickname confirmation.
+msgid "Could not delete confirmation."
+msgstr "Ezin izan da baieztapena ezabatu."
+
+#. TRANS: Server exception thrown when an IRC waiting queue item could not be added to the database.
+msgid "Database error inserting IRC waiting queue item."
+msgstr "Datubase akatsa IRC itxarote zerrendan elementu bat gehitzean."
diff --git a/plugins/Irc/locale/fr/LC_MESSAGES/Irc.po b/plugins/Irc/locale/fr/LC_MESSAGES/Irc.po
index 55514129b4..39971df856 100644
--- a/plugins/Irc/locale/fr/LC_MESSAGES/Irc.po
+++ b/plugins/Irc/locale/fr/LC_MESSAGES/Irc.po
@@ -1,8 +1,10 @@
-# Translation of StatusNet - Irc to French (Français)
+# Translation of StatusNet - Irc to French (français)
 # Exported from translatewiki.net
 #
 # Author: Coyau
+# Author: Gomoko
 # Author: Hashar
+# Author: IAlex
 # Author: Od1n
 # --
 # This file is distributed under the same license as the StatusNet package.
@@ -11,14 +13,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Irc\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-04-27 12:36+0000\n"
-"PO-Revision-Date: 2011-04-27 12:37:25+0000\n"
-"Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:54+0000\n"
+"Language-Team: French <https://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-17 22:40:37+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87008); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:23+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-irc\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
@@ -38,22 +40,28 @@ msgid ""
 "user is not you, or if you did not request this confirmation, just ignore "
 "this message."
 msgstr ""
+"L’utilisateur \"%1$s\" sur %2$s a déclaré que votre nom affiché %3$s lui "
+"appartient. Si c'est le cas, vous pouvez le confirmer en cliquant sur cette "
+"URL: %4$s. (Si vous ne pouvez pas cliquer dessus, copiez-collez l’URL dans "
+"la barre d’adresse de votre navigateur). Si cet utilisateur n’est pas vous, "
+"ou si vous n’avez pas vous-même demandé cette confirmation, veuillez "
+"simplement ignorer ce message."
 
 #. TRANS: Exception thrown when initialising the IRC plugin fails because of an incorrect configuration.
 msgid "You must specify a host."
-msgstr ""
+msgstr "Vous devez indiquer un hôte."
 
 #. TRANS: Exception thrown when initialising the IRC plugin fails because of an incorrect configuration.
 msgid "You must specify a username."
-msgstr ""
+msgstr "Vous devez indiquer un nom d'utilisateur"
 
 #. TRANS: Exception thrown when initialising the IRC plugin fails because of an incorrect configuration.
 msgid "You must specify a \"real name\"."
-msgstr ""
+msgstr "Vous devez indiquer un « vrai nom »."
 
 #. TRANS: Exception thrown when initialising the IRC plugin fails because of an incorrect configuration.
 msgid "You must specify a nickname."
-msgstr ""
+msgstr "Vous devez indiquer un pseudonyme."
 
 #. TRANS: Plugin description.
 msgid ""
@@ -66,13 +74,13 @@ msgstr ""
 #. TRANS: %d is the object ID for which the count could not be updated.
 #, php-format
 msgid "Could not increment attempts count for %d."
-msgstr ""
+msgstr "Impossible d'augmenter le décompte de l'objet %d"
 
 #. TRANS: Message given when using an unregistered IRC nickname.
-#, fuzzy
 msgid "Your nickname is not registered so IRC connectivity cannot be enabled."
 msgstr ""
-"Votre pseudo n'est pas enregistré, la connexion IRC ne peut pas être activée"
+"Votre pseudo n'est pas enregistré, la connexion IRC ne peut donc pas être "
+"activée"
 
 #. TRANS: Server error thrown on database error when deleting IRC nickname confirmation.
 msgid "Could not delete confirmation."
@@ -81,3 +89,5 @@ msgstr "Échec de la suppression de la confirmation."
 #. TRANS: Server exception thrown when an IRC waiting queue item could not be added to the database.
 msgid "Database error inserting IRC waiting queue item."
 msgstr ""
+"Erreur de base de données lors de l'insertion d'un élément de file d'attente "
+"IRC."
diff --git a/plugins/Irc/locale/gl/LC_MESSAGES/Irc.po b/plugins/Irc/locale/gl/LC_MESSAGES/Irc.po
new file mode 100644
index 0000000000..b160215150
--- /dev/null
+++ b/plugins/Irc/locale/gl/LC_MESSAGES/Irc.po
@@ -0,0 +1,86 @@
+# Translation of StatusNet - Irc to Galician (galego)
+# Exported from translatewiki.net
+#
+# Author: Toliño
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Irc\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:55+0000\n"
+"Language-Team: Galician <https://translatewiki.net/wiki/Portal:gl>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:50:23+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: gl\n"
+"X-Message-Group: #out-statusnet-plugin-irc\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Service name for IRC.
+msgid "IRC"
+msgstr "IRC"
+
+#. TRANS: Body text for e-mail confirmation message for IRC.
+#. TRANS: %1$s is a user nickname, %2$s is the StatusNet sitename,
+#. TRANS: %3$s is the plugin display name ("IRC"), %4$s is the confirm address URL.
+#, php-format
+msgid ""
+"User \"%1$s\" on %2$s has said that your %3$s screenname belongs to them. If "
+"that's true, you can confirm by clicking on this URL: %4$s . (If you cannot "
+"click it, copy-and-paste it into the address bar of your browser). If that "
+"user is not you, or if you did not request this confirmation, just ignore "
+"this message."
+msgstr ""
+"O usuario \"%1$s\" de %2$s dixo que o pseudónimo %3$s perténcelle a el ou "
+"ela. Se é certo, pódeo confirmar premendo neste enderezo URL: %4$s. (Se non "
+"pode premer nel, copie e pegue o enderezo na barra de enderezos do "
+"navegador.) Se ese usuario non é vostede ou se non solicitou esta "
+"confirmación, ignore esta mensaxe."
+
+#. TRANS: Exception thrown when initialising the IRC plugin fails because of an incorrect configuration.
+msgid "You must specify a host."
+msgstr "Cómpre especificar un provedor de hospedaxe."
+
+#. TRANS: Exception thrown when initialising the IRC plugin fails because of an incorrect configuration.
+msgid "You must specify a username."
+msgstr "Cómpre especificar un nome de usuario."
+
+#. TRANS: Exception thrown when initialising the IRC plugin fails because of an incorrect configuration.
+msgid "You must specify a \"real name\"."
+msgstr "Cómpre especificar un nome real."
+
+#. TRANS: Exception thrown when initialising the IRC plugin fails because of an incorrect configuration.
+msgid "You must specify a nickname."
+msgstr "Cómpre especificar un alcume."
+
+#. TRANS: Plugin description.
+msgid ""
+"The IRC plugin allows users to send and receive notices over an IRC network."
+msgstr ""
+"O complemento IRC permite aos usuarios enviar e recibir mensaxes desde a "
+"rede de IRC."
+
+#. TRANS: Exception thrown when an IRC attempts count could not be updated.
+#. TRANS: %d is the object ID for which the count could not be updated.
+#, php-format
+msgid "Could not increment attempts count for %d."
+msgstr "Non se puido incrementar o número de intentos de %d."
+
+#. TRANS: Message given when using an unregistered IRC nickname.
+msgid "Your nickname is not registered so IRC connectivity cannot be enabled."
+msgstr ""
+"O seu alcume non está rexistrado, de modo que non se pode activar a "
+"conectividade IRC."
+
+#. TRANS: Server error thrown on database error when deleting IRC nickname confirmation.
+msgid "Could not delete confirmation."
+msgstr "Non se puido borrar a confirmación."
+
+#. TRANS: Server exception thrown when an IRC waiting queue item could not be added to the database.
+msgid "Database error inserting IRC waiting queue item."
+msgstr "Erro na base de datos ao inserir un elemento na cola de espera de IRC."
diff --git a/plugins/Irc/locale/ia/LC_MESSAGES/Irc.po b/plugins/Irc/locale/ia/LC_MESSAGES/Irc.po
index d40c6b45aa..2e4de9dbaa 100644
--- a/plugins/Irc/locale/ia/LC_MESSAGES/Irc.po
+++ b/plugins/Irc/locale/ia/LC_MESSAGES/Irc.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Irc to Interlingua (Interlingua)
+# Translation of StatusNet - Irc to Interlingua (interlingua)
 # Exported from translatewiki.net
 #
 # Author: McDutchie
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Irc\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:48+0000\n"
-"Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:55+0000\n"
+"Language-Team: Interlingua <https://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:27:55+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:23+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-irc\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/Irc/locale/it/LC_MESSAGES/Irc.po b/plugins/Irc/locale/it/LC_MESSAGES/Irc.po
new file mode 100644
index 0000000000..2f04a1538e
--- /dev/null
+++ b/plugins/Irc/locale/it/LC_MESSAGES/Irc.po
@@ -0,0 +1,85 @@
+# Translation of StatusNet - Irc to Italian (italiano)
+# Exported from translatewiki.net
+#
+# Author: GreenFox
+# Author: Ximo17
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Irc\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:55+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:50:23+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Service name for IRC.
+msgid "IRC"
+msgstr "IRC"
+
+#. TRANS: Body text for e-mail confirmation message for IRC.
+#. TRANS: %1$s is a user nickname, %2$s is the StatusNet sitename,
+#. TRANS: %3$s is the plugin display name ("IRC"), %4$s is the confirm address URL.
+#, php-format
+msgid ""
+"User \"%1$s\" on %2$s has said that your %3$s screenname belongs to them. If "
+"that's true, you can confirm by clicking on this URL: %4$s . (If you cannot "
+"click it, copy-and-paste it into the address bar of your browser). If that "
+"user is not you, or if you did not request this confirmation, just ignore "
+"this message."
+msgstr ""
+"L'utente \"%1$s\" su %2$s ha detto che il tuo nome visualizzato %3$s gli "
+"appartiene. Se è vero, puoi confermare cliccando su questa URL: %4$s . (Se "
+"non riesci a cliccare, copia e incolla la URL nella barra degli indirizzi "
+"del tuo browser). Se quest'utente non sei tu, o se non hai richiesto tu "
+"questa conferma, ignora semplicemente questo messaggio."
+
+#. TRANS: Exception thrown when initialising the IRC plugin fails because of an incorrect configuration.
+msgid "You must specify a host."
+msgstr "È necessario specificare un host."
+
+#. TRANS: Exception thrown when initialising the IRC plugin fails because of an incorrect configuration.
+msgid "You must specify a username."
+msgstr "È necessario specificare un nome utente."
+
+#. TRANS: Exception thrown when initialising the IRC plugin fails because of an incorrect configuration.
+msgid "You must specify a \"real name\"."
+msgstr "È necessario specificare un \"nome reale\"."
+
+#. TRANS: Exception thrown when initialising the IRC plugin fails because of an incorrect configuration.
+msgid "You must specify a nickname."
+msgstr "È necessario specificare un nickname."
+
+#. TRANS: Plugin description.
+msgid ""
+"The IRC plugin allows users to send and receive notices over an IRC network."
+msgstr ""
+"Il plugin per IRC consente agli utenti di inviare e ricevere le notizie "
+"tramite la rete IRC."
+
+#. TRANS: Exception thrown when an IRC attempts count could not be updated.
+#. TRANS: %d is the object ID for which the count could not be updated.
+#, php-format
+msgid "Could not increment attempts count for %d."
+msgstr "Impossibile incrementare il conteggio dei tentativi per %d."
+
+#. TRANS: Message given when using an unregistered IRC nickname.
+msgid "Your nickname is not registered so IRC connectivity cannot be enabled."
+msgstr ""
+"Il tuo nickname non è registrato di conseguenza la connettività IRC non "
+"potrà essere attivata."
+
+#. TRANS: Server error thrown on database error when deleting IRC nickname confirmation.
+msgid "Could not delete confirmation."
+msgstr "Impossibile eliminare la conferma."
+
+#. TRANS: Server exception thrown when an IRC waiting queue item could not be added to the database.
+msgid "Database error inserting IRC waiting queue item."
+msgstr ""
+"Errore nel database nell'inserimento dell'oggetto della coda d'attesa su IRC."
diff --git a/plugins/Irc/locale/ja/LC_MESSAGES/Irc.po b/plugins/Irc/locale/ja/LC_MESSAGES/Irc.po
new file mode 100644
index 0000000000..643790039d
--- /dev/null
+++ b/plugins/Irc/locale/ja/LC_MESSAGES/Irc.po
@@ -0,0 +1,74 @@
+# Translation of StatusNet - Irc to Japanese (日本語)
+# Exported from translatewiki.net
+#
+# Author: Shirayuki
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Irc\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:55+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:50:23+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#. TRANS: Service name for IRC.
+msgid "IRC"
+msgstr "IRC"
+
+#. TRANS: Body text for e-mail confirmation message for IRC.
+#. TRANS: %1$s is a user nickname, %2$s is the StatusNet sitename,
+#. TRANS: %3$s is the plugin display name ("IRC"), %4$s is the confirm address URL.
+#, php-format
+msgid ""
+"User \"%1$s\" on %2$s has said that your %3$s screenname belongs to them. If "
+"that's true, you can confirm by clicking on this URL: %4$s . (If you cannot "
+"click it, copy-and-paste it into the address bar of your browser). If that "
+"user is not you, or if you did not request this confirmation, just ignore "
+"this message."
+msgstr ""
+
+#. TRANS: Exception thrown when initialising the IRC plugin fails because of an incorrect configuration.
+msgid "You must specify a host."
+msgstr "ホストを指定������。"
+
+#. TRANS: Exception thrown when initialising the IRC plugin fails because of an incorrect configuration.
+msgid "You must specify a username."
+msgstr "ユーザー�を指定������。"
+
+#. TRANS: Exception thrown when initialising the IRC plugin fails because of an incorrect configuration.
+msgid "You must specify a \"real name\"."
+msgstr "「本��を指定������。"
+
+#. TRANS: Exception thrown when initialising the IRC plugin fails because of an incorrect configuration.
+msgid "You must specify a nickname."
+msgstr "ニック�ームを指定������。"
+
+#. TRANS: Plugin description.
+msgid ""
+"The IRC plugin allows users to send and receive notices over an IRC network."
+msgstr ""
+
+#. TRANS: Exception thrown when an IRC attempts count could not be updated.
+#. TRANS: %d is the object ID for which the count could not be updated.
+#, php-format
+msgid "Could not increment attempts count for %d."
+msgstr ""
+
+#. TRANS: Message given when using an unregistered IRC nickname.
+msgid "Your nickname is not registered so IRC connectivity cannot be enabled."
+msgstr ""
+
+#. TRANS: Server error thrown on database error when deleting IRC nickname confirmation.
+msgid "Could not delete confirmation."
+msgstr ""
+
+#. TRANS: Server exception thrown when an IRC waiting queue item could not be added to the database.
+msgid "Database error inserting IRC waiting queue item."
+msgstr ""
diff --git a/plugins/Irc/locale/mk/LC_MESSAGES/Irc.po b/plugins/Irc/locale/mk/LC_MESSAGES/Irc.po
index 15b248cbb3..8aa8bedcf8 100644
--- a/plugins/Irc/locale/mk/LC_MESSAGES/Irc.po
+++ b/plugins/Irc/locale/mk/LC_MESSAGES/Irc.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Irc to Macedonian (Македон�ки)
+# Translation of StatusNet - Irc to Macedonian (македон�ки)
 # Exported from translatewiki.net
 #
 # Author: Bjankuloski06
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Irc\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:48+0000\n"
-"Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:55+0000\n"
+"Language-Team: Macedonian <https://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:27:55+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:23+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-irc\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
diff --git a/plugins/Irc/locale/nl/LC_MESSAGES/Irc.po b/plugins/Irc/locale/nl/LC_MESSAGES/Irc.po
index 37d8320682..8736972e32 100644
--- a/plugins/Irc/locale/nl/LC_MESSAGES/Irc.po
+++ b/plugins/Irc/locale/nl/LC_MESSAGES/Irc.po
@@ -10,14 +10,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Irc\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:48+0000\n"
-"Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:55+0000\n"
+"Language-Team: Dutch <https://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:27:55+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:23+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-irc\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/Irc/locale/sv/LC_MESSAGES/Irc.po b/plugins/Irc/locale/sv/LC_MESSAGES/Irc.po
index 9d69e6c057..1d47845d92 100644
--- a/plugins/Irc/locale/sv/LC_MESSAGES/Irc.po
+++ b/plugins/Irc/locale/sv/LC_MESSAGES/Irc.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Irc to Swedish (Svenska)
+# Translation of StatusNet - Irc to Swedish (svenska)
 # Exported from translatewiki.net
 #
 # Author: Lokal Profil
@@ -10,14 +10,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Irc\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:48+0000\n"
-"Language-Team: Swedish <http://translatewiki.net/wiki/Portal:sv>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:55+0000\n"
+"Language-Team: Swedish <https://translatewiki.net/wiki/Portal:sv>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:27:55+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:23+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: sv\n"
 "X-Message-Group: #out-statusnet-plugin-irc\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/Irc/locale/tl/LC_MESSAGES/Irc.po b/plugins/Irc/locale/tl/LC_MESSAGES/Irc.po
index 365fa8c506..45a8208d01 100644
--- a/plugins/Irc/locale/tl/LC_MESSAGES/Irc.po
+++ b/plugins/Irc/locale/tl/LC_MESSAGES/Irc.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Irc\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:49+0000\n"
-"Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:55+0000\n"
+"Language-Team: Tagalog <https://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:27:55+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:23+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-irc\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/Irc/locale/tr/LC_MESSAGES/Irc.po b/plugins/Irc/locale/tr/LC_MESSAGES/Irc.po
new file mode 100644
index 0000000000..9b9026cb54
--- /dev/null
+++ b/plugins/Irc/locale/tr/LC_MESSAGES/Irc.po
@@ -0,0 +1,77 @@
+# Translation of StatusNet - Irc to Turkish (Türkçe)
+# Exported from translatewiki.net
+#
+# Author: Emperyan
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Irc\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:56+0000\n"
+"Language-Team: Turkish <https://translatewiki.net/wiki/Portal:tr>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:50:23+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: tr\n"
+"X-Message-Group: #out-statusnet-plugin-irc\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#. TRANS: Service name for IRC.
+msgid "IRC"
+msgstr "IRC"
+
+#. TRANS: Body text for e-mail confirmation message for IRC.
+#. TRANS: %1$s is a user nickname, %2$s is the StatusNet sitename,
+#. TRANS: %3$s is the plugin display name ("IRC"), %4$s is the confirm address URL.
+#, php-format
+msgid ""
+"User \"%1$s\" on %2$s has said that your %3$s screenname belongs to them. If "
+"that's true, you can confirm by clicking on this URL: %4$s . (If you cannot "
+"click it, copy-and-paste it into the address bar of your browser). If that "
+"user is not you, or if you did not request this confirmation, just ignore "
+"this message."
+msgstr ""
+
+#. TRANS: Exception thrown when initialising the IRC plugin fails because of an incorrect configuration.
+msgid "You must specify a host."
+msgstr "Bir ana bilgisayar belirtmeniz gerekir."
+
+#. TRANS: Exception thrown when initialising the IRC plugin fails because of an incorrect configuration.
+msgid "You must specify a username."
+msgstr "Bir kullanıcı adı belirtmelisiniz."
+
+#. TRANS: Exception thrown when initialising the IRC plugin fails because of an incorrect configuration.
+msgid "You must specify a \"real name\"."
+msgstr "\"Gerçek adınızı\" belirtmelisiniz."
+
+#. TRANS: Exception thrown when initialising the IRC plugin fails because of an incorrect configuration.
+msgid "You must specify a nickname."
+msgstr "Bir takma ad belirtmelisiniz."
+
+#. TRANS: Plugin description.
+msgid ""
+"The IRC plugin allows users to send and receive notices over an IRC network."
+msgstr ""
+
+#. TRANS: Exception thrown when an IRC attempts count could not be updated.
+#. TRANS: %d is the object ID for which the count could not be updated.
+#, php-format
+msgid "Could not increment attempts count for %d."
+msgstr ""
+
+#. TRANS: Message given when using an unregistered IRC nickname.
+msgid "Your nickname is not registered so IRC connectivity cannot be enabled."
+msgstr ""
+
+#. TRANS: Server error thrown on database error when deleting IRC nickname confirmation.
+msgid "Could not delete confirmation."
+msgstr "Onay silinemedi."
+
+#. TRANS: Server exception thrown when an IRC waiting queue item could not be added to the database.
+msgid "Database error inserting IRC waiting queue item."
+msgstr ""
diff --git a/plugins/Irc/locale/uk/LC_MESSAGES/Irc.po b/plugins/Irc/locale/uk/LC_MESSAGES/Irc.po
index a219679771..77f19689b7 100644
--- a/plugins/Irc/locale/uk/LC_MESSAGES/Irc.po
+++ b/plugins/Irc/locale/uk/LC_MESSAGES/Irc.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Irc to Ukrainian (Україн�ька)
+# Translation of StatusNet - Irc to Ukrainian (україн�ька)
 # Exported from translatewiki.net
 #
 # Author: Boogie
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Irc\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:49+0000\n"
-"Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:56+0000\n"
+"Language-Team: Ukrainian <https://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:27:55+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:23+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-irc\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
diff --git a/plugins/LdapAuthentication/locale/LdapAuthentication.pot b/plugins/LdapAuthentication/locale/LdapAuthentication.pot
index 6f9a18c99c..1e528233ee 100644
--- a/plugins/LdapAuthentication/locale/LdapAuthentication.pot
+++ b/plugins/LdapAuthentication/locale/LdapAuthentication.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
+"POT-Creation-Date: 2012-06-30 11:07+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"
diff --git a/plugins/LdapAuthentication/locale/de/LC_MESSAGES/LdapAuthentication.po b/plugins/LdapAuthentication/locale/de/LC_MESSAGES/LdapAuthentication.po
index 1f8efa2eb3..9934cd5e24 100644
--- a/plugins/LdapAuthentication/locale/de/LC_MESSAGES/LdapAuthentication.po
+++ b/plugins/LdapAuthentication/locale/de/LC_MESSAGES/LdapAuthentication.po
@@ -10,14 +10,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LdapAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:49+0000\n"
-"Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:56+0000\n"
+"Language-Team: German <https://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:24+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-ldapauthentication\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/LdapAuthentication/locale/es/LC_MESSAGES/LdapAuthentication.po b/plugins/LdapAuthentication/locale/es/LC_MESSAGES/LdapAuthentication.po
index 655af8dc2d..298bf3c836 100644
--- a/plugins/LdapAuthentication/locale/es/LC_MESSAGES/LdapAuthentication.po
+++ b/plugins/LdapAuthentication/locale/es/LC_MESSAGES/LdapAuthentication.po
@@ -1,6 +1,7 @@
-# Translation of StatusNet - LdapAuthentication to Spanish (Español)
+# Translation of StatusNet - LdapAuthentication to Spanish (español)
 # Exported from translatewiki.net
 #
+# Author: Armando-Martin
 # Author: Translationista
 # --
 # This file is distributed under the same license as the StatusNet package.
@@ -9,31 +10,35 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LdapAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-04-27 12:36+0000\n"
-"PO-Revision-Date: 2011-04-27 12:37:26+0000\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:56+0000\n"
 "Language-Team: Spanish <http://translatewiki.net/wiki/Portal:es>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-24 15:25:06+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87008); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:24+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-plugin-ldapauthentication\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANS: Exception thrown when initialising the LDAP Auth plugin fails because of an incorrect configuration.
 msgid "You must specify a nickname attribute."
-msgstr ""
+msgstr "Debe especificar un atributo de pseudónimo (nickname)."
 
 #. TRANS: Exception thrown when initialising the LDAP Auth plugin fails because of an incorrect configuration.
 msgid ""
 "If password_changeable is set, the password attribute and password_encoding "
 "must also be specified."
 msgstr ""
+"Si \"password_changeable\" está definido, debe especificar el atributo de "
+"contraseña (password) y de \"password_encoding\"."
 
 #. TRANS: Instructions for LDAP authentication.
 msgid "Do you have an LDAP account? Use your standard username and password."
 msgstr ""
+"¿Tiene una cuenta LDAP? Utilice su nombre de usuario estándar y su "
+"contraseña."
 
 #. TRANS: Plugin description.
 msgid ""
diff --git a/plugins/LdapAuthentication/locale/eu/LC_MESSAGES/LdapAuthentication.po b/plugins/LdapAuthentication/locale/eu/LC_MESSAGES/LdapAuthentication.po
new file mode 100644
index 0000000000..1916992cc5
--- /dev/null
+++ b/plugins/LdapAuthentication/locale/eu/LC_MESSAGES/LdapAuthentication.po
@@ -0,0 +1,44 @@
+# Translation of StatusNet - LdapAuthentication to Basque (euskara)
+# Exported from translatewiki.net
+#
+# Author: Artsuaga
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - LdapAuthentication\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:56+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:50:24+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Exception thrown when initialising the LDAP Auth plugin fails because of an incorrect configuration.
+msgid "You must specify a nickname attribute."
+msgstr "Ezizenaren ezaugarri bat gehitu behar duzu."
+
+#. TRANS: Exception thrown when initialising the LDAP Auth plugin fails because of an incorrect configuration.
+msgid ""
+"If password_changeable is set, the password attribute and password_encoding "
+"must also be specified."
+msgstr ""
+"\"password_changeable\" definiturik badago, pasahitzaren (password) eta "
+"\"password_encoding\"-en ezaugarria zehaztu."
+
+#. TRANS: Instructions for LDAP authentication.
+msgid "Do you have an LDAP account? Use your standard username and password."
+msgstr ""
+"Baduzu LDAP konturik? Erabili zure erabiltzaile eta pasahitz estandarra."
+
+#. TRANS: Plugin description.
+msgid ""
+"The LDAP Authentication plugin allows for StatusNet to handle authentication "
+"through LDAP."
+msgstr ""
+"LDAP autentifikazio pluginak StatusNeti autentikazioa LDAP bidez kudeatzen "
+"uzten dio."
diff --git a/plugins/LdapAuthentication/locale/fr/LC_MESSAGES/LdapAuthentication.po b/plugins/LdapAuthentication/locale/fr/LC_MESSAGES/LdapAuthentication.po
index 5ff4e68977..14cb80a949 100644
--- a/plugins/LdapAuthentication/locale/fr/LC_MESSAGES/LdapAuthentication.po
+++ b/plugins/LdapAuthentication/locale/fr/LC_MESSAGES/LdapAuthentication.po
@@ -1,7 +1,8 @@
-# Translation of StatusNet - LdapAuthentication to French (Français)
+# Translation of StatusNet - LdapAuthentication to French (français)
 # Exported from translatewiki.net
 #
 # Author: Crochet.david
+# Author: Hashar
 # Author: McDutchie
 # --
 # This file is distributed under the same license as the StatusNet package.
@@ -10,21 +11,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LdapAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:49+0000\n"
-"Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:56+0000\n"
+"Language-Team: French <https://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:24+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-ldapauthentication\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. TRANS: Exception thrown when initialising the LDAP Auth plugin fails because of an incorrect configuration.
 msgid "You must specify a nickname attribute."
-msgstr ""
+msgstr "Vous devez spécifier l'attribut pseudonyme"
 
 #. TRANS: Exception thrown when initialising the LDAP Auth plugin fails because of an incorrect configuration.
 msgid ""
diff --git a/plugins/LdapAuthentication/locale/gl/LC_MESSAGES/LdapAuthentication.po b/plugins/LdapAuthentication/locale/gl/LC_MESSAGES/LdapAuthentication.po
new file mode 100644
index 0000000000..2e3f09b2f2
--- /dev/null
+++ b/plugins/LdapAuthentication/locale/gl/LC_MESSAGES/LdapAuthentication.po
@@ -0,0 +1,47 @@
+# Translation of StatusNet - LdapAuthentication to Galician (galego)
+# Exported from translatewiki.net
+#
+# Author: Toliño
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - LdapAuthentication\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:56+0000\n"
+"Language-Team: Galician <https://translatewiki.net/wiki/Portal:gl>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:50:24+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: gl\n"
+"X-Message-Group: #out-statusnet-plugin-ldapauthentication\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Exception thrown when initialising the LDAP Auth plugin fails because of an incorrect configuration.
+msgid "You must specify a nickname attribute."
+msgstr "Cómpre especificar o atributo do alcume."
+
+#. TRANS: Exception thrown when initialising the LDAP Auth plugin fails because of an incorrect configuration.
+msgid ""
+"If password_changeable is set, the password attribute and password_encoding "
+"must also be specified."
+msgstr ""
+"Se \"password_changeable\" está definido, cómpre especificar o atributo do "
+"contrasinal e \"password_encoding\"."
+
+#. TRANS: Instructions for LDAP authentication.
+msgid "Do you have an LDAP account? Use your standard username and password."
+msgstr ""
+"Ten unha conta LDAP? Use o seu nome de usuario e o seu contrasinal estándar."
+
+#. TRANS: Plugin description.
+msgid ""
+"The LDAP Authentication plugin allows for StatusNet to handle authentication "
+"through LDAP."
+msgstr ""
+"O complemento de autenticación LDAP permite a StatusNet manexar a "
+"autenticación a través do LDAP."
diff --git a/plugins/LdapAuthentication/locale/ia/LC_MESSAGES/LdapAuthentication.po b/plugins/LdapAuthentication/locale/ia/LC_MESSAGES/LdapAuthentication.po
index 4fcfc9537f..5bc566c680 100644
--- a/plugins/LdapAuthentication/locale/ia/LC_MESSAGES/LdapAuthentication.po
+++ b/plugins/LdapAuthentication/locale/ia/LC_MESSAGES/LdapAuthentication.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - LdapAuthentication to Interlingua (Interlingua)
+# Translation of StatusNet - LdapAuthentication to Interlingua (interlingua)
 # Exported from translatewiki.net
 #
 # Author: McDutchie
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LdapAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:49+0000\n"
-"Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:56+0000\n"
+"Language-Team: Interlingua <https://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:24+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-ldapauthentication\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/LdapAuthentication/locale/it/LC_MESSAGES/LdapAuthentication.po b/plugins/LdapAuthentication/locale/it/LC_MESSAGES/LdapAuthentication.po
new file mode 100644
index 0000000000..43fb2b4925
--- /dev/null
+++ b/plugins/LdapAuthentication/locale/it/LC_MESSAGES/LdapAuthentication.po
@@ -0,0 +1,45 @@
+# Translation of StatusNet - LdapAuthentication to Italian (italiano)
+# Exported from translatewiki.net
+#
+# Author: GreenFox
+# Author: Ximo17
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - LdapAuthentication\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:56+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:50:24+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Exception thrown when initialising the LDAP Auth plugin fails because of an incorrect configuration.
+msgid "You must specify a nickname attribute."
+msgstr "Dovete specificare l'attributo soprannome"
+
+#. TRANS: Exception thrown when initialising the LDAP Auth plugin fails because of an incorrect configuration.
+msgid ""
+"If password_changeable is set, the password attribute and password_encoding "
+"must also be specified."
+msgstr ""
+"Se password_changeable è definito, anche l'attributo password e "
+"password_encoding deve essere specificato."
+
+#. TRANS: Instructions for LDAP authentication.
+msgid "Do you have an LDAP account? Use your standard username and password."
+msgstr ""
+"Hai un account LDAP? Utilizza il tuo username standard e la tua password."
+
+#. TRANS: Plugin description.
+msgid ""
+"The LDAP Authentication plugin allows for StatusNet to handle authentication "
+"through LDAP."
+msgstr ""
+"L'estensione LDAP Authentication permette a StatusNet di gestire "
+"l'autenticazione attraverso LDAP."
diff --git a/plugins/LdapAuthentication/locale/mk/LC_MESSAGES/LdapAuthentication.po b/plugins/LdapAuthentication/locale/mk/LC_MESSAGES/LdapAuthentication.po
index 5f93405fec..3e4a601b3d 100644
--- a/plugins/LdapAuthentication/locale/mk/LC_MESSAGES/LdapAuthentication.po
+++ b/plugins/LdapAuthentication/locale/mk/LC_MESSAGES/LdapAuthentication.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - LdapAuthentication to Macedonian (Македон�ки)
+# Translation of StatusNet - LdapAuthentication to Macedonian (македон�ки)
 # Exported from translatewiki.net
 #
 # Author: Bjankuloski06
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LdapAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:49+0000\n"
-"Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:56+0000\n"
+"Language-Team: Macedonian <https://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:24+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-ldapauthentication\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
diff --git a/plugins/LdapAuthentication/locale/nl/LC_MESSAGES/LdapAuthentication.po b/plugins/LdapAuthentication/locale/nl/LC_MESSAGES/LdapAuthentication.po
index 3db03166ba..e2e42bd761 100644
--- a/plugins/LdapAuthentication/locale/nl/LC_MESSAGES/LdapAuthentication.po
+++ b/plugins/LdapAuthentication/locale/nl/LC_MESSAGES/LdapAuthentication.po
@@ -10,14 +10,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LdapAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:49+0000\n"
-"Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:56+0000\n"
+"Language-Team: Dutch <https://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:24+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-ldapauthentication\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/LdapAuthentication/locale/tl/LC_MESSAGES/LdapAuthentication.po b/plugins/LdapAuthentication/locale/tl/LC_MESSAGES/LdapAuthentication.po
index f048c61988..d321411381 100644
--- a/plugins/LdapAuthentication/locale/tl/LC_MESSAGES/LdapAuthentication.po
+++ b/plugins/LdapAuthentication/locale/tl/LC_MESSAGES/LdapAuthentication.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LdapAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:50+0000\n"
-"Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:57+0000\n"
+"Language-Team: Tagalog <https://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:24+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-ldapauthentication\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/LdapAuthentication/locale/uk/LC_MESSAGES/LdapAuthentication.po b/plugins/LdapAuthentication/locale/uk/LC_MESSAGES/LdapAuthentication.po
index 075cab06da..483532b675 100644
--- a/plugins/LdapAuthentication/locale/uk/LC_MESSAGES/LdapAuthentication.po
+++ b/plugins/LdapAuthentication/locale/uk/LC_MESSAGES/LdapAuthentication.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - LdapAuthentication to Ukrainian (Україн�ька)
+# Translation of StatusNet - LdapAuthentication to Ukrainian (україн�ька)
 # Exported from translatewiki.net
 #
 # Author: Boogie
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LdapAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:50+0000\n"
-"Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:57+0000\n"
+"Language-Team: Ukrainian <https://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:24+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-ldapauthentication\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
diff --git a/plugins/LdapAuthorization/locale/LdapAuthorization.pot b/plugins/LdapAuthorization/locale/LdapAuthorization.pot
index 650e13b606..ccb6a8bf72 100644
--- a/plugins/LdapAuthorization/locale/LdapAuthorization.pot
+++ b/plugins/LdapAuthorization/locale/LdapAuthorization.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
+"POT-Creation-Date: 2012-06-30 11:07+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"
diff --git a/plugins/LdapAuthorization/locale/de/LC_MESSAGES/LdapAuthorization.po b/plugins/LdapAuthorization/locale/de/LC_MESSAGES/LdapAuthorization.po
index 109a94bfd5..3991455daf 100644
--- a/plugins/LdapAuthorization/locale/de/LC_MESSAGES/LdapAuthorization.po
+++ b/plugins/LdapAuthorization/locale/de/LC_MESSAGES/LdapAuthorization.po
@@ -10,14 +10,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LdapAuthorization\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:50+0000\n"
-"Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:57+0000\n"
+"Language-Team: German <https://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:04+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:25+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-ldapauthorization\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/LdapAuthorization/locale/es/LC_MESSAGES/LdapAuthorization.po b/plugins/LdapAuthorization/locale/es/LC_MESSAGES/LdapAuthorization.po
index 1e1b29114b..dd241602a5 100644
--- a/plugins/LdapAuthorization/locale/es/LC_MESSAGES/LdapAuthorization.po
+++ b/plugins/LdapAuthorization/locale/es/LC_MESSAGES/LdapAuthorization.po
@@ -1,6 +1,7 @@
-# Translation of StatusNet - LdapAuthorization to Spanish (Español)
+# Translation of StatusNet - LdapAuthorization to Spanish (español)
 # Exported from translatewiki.net
 #
+# Author: Armando-Martin
 # Author: Translationista
 # --
 # This file is distributed under the same license as the StatusNet package.
@@ -9,14 +10,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LdapAuthorization\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-04-27 12:36+0000\n"
-"PO-Revision-Date: 2011-04-27 12:37:28+0000\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:57+0000\n"
 "Language-Team: Spanish <http://translatewiki.net/wiki/Portal:es>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:08:11+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87008); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:25+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-plugin-ldapauthorization\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -26,10 +27,12 @@ msgid ""
 "provider_name must be set. Use the provider_name from the LDAP "
 "Authentication plugin."
 msgstr ""
+"Debe definir el atributo provider_name. Utilice provider_name desde el "
+"complemento (plugin) de autenticación LDAP."
 
 #. TRANS: Exception thrown when initialising the LDAP Auth plugin fails because of an incorrect configuration.
 msgid "uniqueMember_attribute must be set."
-msgstr ""
+msgstr "Debe definir el atributo uniqueMember_attribute."
 
 #. TRANS: Plugin description.
 msgid ""
diff --git a/plugins/LdapAuthorization/locale/eu/LC_MESSAGES/LdapAuthorization.po b/plugins/LdapAuthorization/locale/eu/LC_MESSAGES/LdapAuthorization.po
new file mode 100644
index 0000000000..6711fb2d7c
--- /dev/null
+++ b/plugins/LdapAuthorization/locale/eu/LC_MESSAGES/LdapAuthorization.po
@@ -0,0 +1,38 @@
+# Translation of StatusNet - LdapAuthorization to Basque (euskara)
+# Exported from translatewiki.net
+#
+# Author: Artsuaga
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - LdapAuthorization\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:57+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:50:25+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Exception thrown when initialising the LDAP Auth plugin fails because of an incorrect configuration.
+msgid ""
+"provider_name must be set. Use the provider_name from the LDAP "
+"Authentication plugin."
+msgstr ""
+"provider_name definitu behar duzu. Erabili LDAP autentifikazio plugineko "
+"provider_name."
+
+#. TRANS: Exception thrown when initialising the LDAP Auth plugin fails because of an incorrect configuration.
+msgid "uniqueMember_attribute must be set."
+msgstr "uniqueMember_attribute definitu behar duzu."
+
+#. TRANS: Plugin description.
+msgid ""
+"The LDAP Authorization plugin allows for StatusNet to handle authorization "
+"through LDAP."
+msgstr ""
+"LDAP baimen pluginak StatusNeti baimenak LDAP bidez kudeatzen uzten dio."
diff --git a/plugins/LdapAuthorization/locale/fr/LC_MESSAGES/LdapAuthorization.po b/plugins/LdapAuthorization/locale/fr/LC_MESSAGES/LdapAuthorization.po
index f6fb9a3bd5..aecb4fc125 100644
--- a/plugins/LdapAuthorization/locale/fr/LC_MESSAGES/LdapAuthorization.po
+++ b/plugins/LdapAuthorization/locale/fr/LC_MESSAGES/LdapAuthorization.po
@@ -1,6 +1,7 @@
-# Translation of StatusNet - LdapAuthorization to French (Français)
+# Translation of StatusNet - LdapAuthorization to French (français)
 # Exported from translatewiki.net
 #
+# Author: Hashar
 # Author: Peter17
 # --
 # This file is distributed under the same license as the StatusNet package.
@@ -9,14 +10,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LdapAuthorization\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-04-27 12:36+0000\n"
-"PO-Revision-Date: 2011-04-27 12:37:28+0000\n"
-"Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:57+0000\n"
+"Language-Team: French <https://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:08:11+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87008); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:25+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-ldapauthorization\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
@@ -26,10 +27,12 @@ msgid ""
 "provider_name must be set. Use the provider_name from the LDAP "
 "Authentication plugin."
 msgstr ""
+"provider_name doit être défini. Utilisez l'attribut provider_name provenant "
+"du plugin d'authentification LDAP."
 
 #. TRANS: Exception thrown when initialising the LDAP Auth plugin fails because of an incorrect configuration.
 msgid "uniqueMember_attribute must be set."
-msgstr ""
+msgstr "uniqueMember_attribute doit être défini, vérifiez votre configuration."
 
 #. TRANS: Plugin description.
 msgid ""
diff --git a/plugins/LdapAuthorization/locale/gl/LC_MESSAGES/LdapAuthorization.po b/plugins/LdapAuthorization/locale/gl/LC_MESSAGES/LdapAuthorization.po
new file mode 100644
index 0000000000..aa0bfb3cb5
--- /dev/null
+++ b/plugins/LdapAuthorization/locale/gl/LC_MESSAGES/LdapAuthorization.po
@@ -0,0 +1,42 @@
+# Translation of StatusNet - LdapAuthorization to Galician (galego)
+# Exported from translatewiki.net
+#
+# Author: Toliño
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - LdapAuthorization\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:57+0000\n"
+"Language-Team: Galician <https://translatewiki.net/wiki/Portal:gl>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:50:25+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: gl\n"
+"X-Message-Group: #out-statusnet-plugin-ldapauthorization\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Exception thrown when initialising the LDAP Auth plugin fails because of an incorrect configuration.
+msgid ""
+"provider_name must be set. Use the provider_name from the LDAP "
+"Authentication plugin."
+msgstr ""
+"Cómpre definir \"provider_name\". Use o atributo \"provider_name\" do "
+"complemento de autenticación LDAP."
+
+#. TRANS: Exception thrown when initialising the LDAP Auth plugin fails because of an incorrect configuration.
+msgid "uniqueMember_attribute must be set."
+msgstr "Cómpre definir \"uniqueMember_attribute\"."
+
+#. TRANS: Plugin description.
+msgid ""
+"The LDAP Authorization plugin allows for StatusNet to handle authorization "
+"through LDAP."
+msgstr ""
+"O complemento de autenticación LDAP permite a StatusNet manexar a "
+"autorización a través do LDAP."
diff --git a/plugins/LdapAuthorization/locale/ia/LC_MESSAGES/LdapAuthorization.po b/plugins/LdapAuthorization/locale/ia/LC_MESSAGES/LdapAuthorization.po
index 902be2b156..4976ee65e0 100644
--- a/plugins/LdapAuthorization/locale/ia/LC_MESSAGES/LdapAuthorization.po
+++ b/plugins/LdapAuthorization/locale/ia/LC_MESSAGES/LdapAuthorization.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - LdapAuthorization to Interlingua (Interlingua)
+# Translation of StatusNet - LdapAuthorization to Interlingua (interlingua)
 # Exported from translatewiki.net
 #
 # Author: McDutchie
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LdapAuthorization\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:50+0000\n"
-"Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:57+0000\n"
+"Language-Team: Interlingua <https://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:04+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:25+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-ldapauthorization\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/LdapAuthorization/locale/it/LC_MESSAGES/LdapAuthorization.po b/plugins/LdapAuthorization/locale/it/LC_MESSAGES/LdapAuthorization.po
new file mode 100644
index 0000000000..f381e9ee86
--- /dev/null
+++ b/plugins/LdapAuthorization/locale/it/LC_MESSAGES/LdapAuthorization.po
@@ -0,0 +1,39 @@
+# Translation of StatusNet - LdapAuthorization to Italian (italiano)
+# Exported from translatewiki.net
+#
+# Author: GreenFox
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - LdapAuthorization\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:57+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:50:25+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Exception thrown when initialising the LDAP Auth plugin fails because of an incorrect configuration.
+msgid ""
+"provider_name must be set. Use the provider_name from the LDAP "
+"Authentication plugin."
+msgstr ""
+"provider_name deve essere definito. Utilizzate l'attributo provider_name "
+"proveniente dall'estensione LDAP Authentication"
+
+#. TRANS: Exception thrown when initialising the LDAP Auth plugin fails because of an incorrect configuration.
+msgid "uniqueMember_attribute must be set."
+msgstr "uniqueMember_attribute deve essere definito."
+
+#. TRANS: Plugin description.
+msgid ""
+"The LDAP Authorization plugin allows for StatusNet to handle authorization "
+"through LDAP."
+msgstr ""
+"L'estensione LDAP Authentication permette a StatusNet di gestire "
+"l'autenticazione attraverso LDAP."
diff --git a/plugins/LdapAuthorization/locale/mk/LC_MESSAGES/LdapAuthorization.po b/plugins/LdapAuthorization/locale/mk/LC_MESSAGES/LdapAuthorization.po
index eb7ae6f2a2..6445264102 100644
--- a/plugins/LdapAuthorization/locale/mk/LC_MESSAGES/LdapAuthorization.po
+++ b/plugins/LdapAuthorization/locale/mk/LC_MESSAGES/LdapAuthorization.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - LdapAuthorization to Macedonian (Македон�ки)
+# Translation of StatusNet - LdapAuthorization to Macedonian (македон�ки)
 # Exported from translatewiki.net
 #
 # Author: Bjankuloski06
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LdapAuthorization\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:50+0000\n"
-"Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:57+0000\n"
+"Language-Team: Macedonian <https://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:04+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:25+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-ldapauthorization\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
diff --git a/plugins/LdapAuthorization/locale/nl/LC_MESSAGES/LdapAuthorization.po b/plugins/LdapAuthorization/locale/nl/LC_MESSAGES/LdapAuthorization.po
index e85dd9dad5..807b794743 100644
--- a/plugins/LdapAuthorization/locale/nl/LC_MESSAGES/LdapAuthorization.po
+++ b/plugins/LdapAuthorization/locale/nl/LC_MESSAGES/LdapAuthorization.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LdapAuthorization\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:50+0000\n"
-"Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:58+0000\n"
+"Language-Team: Dutch <https://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:04+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:25+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-ldapauthorization\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/LdapAuthorization/locale/tl/LC_MESSAGES/LdapAuthorization.po b/plugins/LdapAuthorization/locale/tl/LC_MESSAGES/LdapAuthorization.po
index c99e1652e2..dd008af8da 100644
--- a/plugins/LdapAuthorization/locale/tl/LC_MESSAGES/LdapAuthorization.po
+++ b/plugins/LdapAuthorization/locale/tl/LC_MESSAGES/LdapAuthorization.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LdapAuthorization\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:50+0000\n"
-"Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:58+0000\n"
+"Language-Team: Tagalog <https://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:04+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:25+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-ldapauthorization\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/LdapAuthorization/locale/uk/LC_MESSAGES/LdapAuthorization.po b/plugins/LdapAuthorization/locale/uk/LC_MESSAGES/LdapAuthorization.po
index c0ffc1fcb9..68a2553e87 100644
--- a/plugins/LdapAuthorization/locale/uk/LC_MESSAGES/LdapAuthorization.po
+++ b/plugins/LdapAuthorization/locale/uk/LC_MESSAGES/LdapAuthorization.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - LdapAuthorization to Ukrainian (Україн�ька)
+# Translation of StatusNet - LdapAuthorization to Ukrainian (україн�ька)
 # Exported from translatewiki.net
 #
 # Author: Boogie
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LdapAuthorization\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:50+0000\n"
-"Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:58+0000\n"
+"Language-Team: Ukrainian <https://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:04+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:25+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-ldapauthorization\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
diff --git a/plugins/LdapCommon/locale/LdapCommon.pot b/plugins/LdapCommon/locale/LdapCommon.pot
index 4361c819d9..a658f43e09 100644
--- a/plugins/LdapCommon/locale/LdapCommon.pot
+++ b/plugins/LdapCommon/locale/LdapCommon.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
+"POT-Creation-Date: 2012-06-30 11:07+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"
diff --git a/plugins/LdapCommon/locale/ca/LC_MESSAGES/LdapCommon.po b/plugins/LdapCommon/locale/ca/LC_MESSAGES/LdapCommon.po
new file mode 100644
index 0000000000..30b87f7270
--- /dev/null
+++ b/plugins/LdapCommon/locale/ca/LC_MESSAGES/LdapCommon.po
@@ -0,0 +1,46 @@
+# Translation of StatusNet - LdapCommon to Catalan (català)
+# Exported from translatewiki.net
+#
+# Author: Toniher
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - LdapCommon\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:58+0000\n"
+"Language-Team: Catalan <https://translatewiki.net/wiki/Portal:ca>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:50:26+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: ca\n"
+"X-Message-Group: #out-statusnet-plugin-ldapcommon\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Exception thrown when initialising the LDAP Common plugin fails because of an incorrect configuration.
+msgid "A host must be specified."
+msgstr "Cal especificar un servidor central."
+
+#. TRANS: Exception thrown when initialising the LDAP Common plugin fails because of an incorrect configuration.
+msgid "\"basedn\" must be specified."
+msgstr "Cal especificar «basedn»."
+
+#. TRANS: Exception thrown when initialising the LDAP Common plugin fails because of an incorrect configuration.
+msgid "The username attribute must be set."
+msgstr ""
+
+#. TRANS: Exception thrown in the LDAP Common plugin when LDAP server is not available.
+#. TRANS: %s is the error message.
+#, php-format
+msgid "Could not connect to LDAP server: %s"
+msgstr "No s'ha pogut connectar amb el servidor LDAP: %s"
+
+#. TRANS: Exception thrown in the LDAP Common plugin when LDAP server is not available.
+#. TRANS: %s is the error message.
+#, php-format
+msgid "Could not connect to LDAP server: %s."
+msgstr "No s'ha pogut connectar amb el servidor LDAP: %s."
diff --git a/plugins/LdapCommon/locale/de/LC_MESSAGES/LdapCommon.po b/plugins/LdapCommon/locale/de/LC_MESSAGES/LdapCommon.po
new file mode 100644
index 0000000000..b7d9abc20f
--- /dev/null
+++ b/plugins/LdapCommon/locale/de/LC_MESSAGES/LdapCommon.po
@@ -0,0 +1,47 @@
+# Translation of StatusNet - LdapCommon to German (Deutsch)
+# Exported from translatewiki.net
+#
+# Author: DaSch
+# Author: Inkowik
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - LdapCommon\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:58+0000\n"
+"Language-Team: German <https://translatewiki.net/wiki/Portal:de>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:50:26+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: de\n"
+"X-Message-Group: #out-statusnet-plugin-ldapcommon\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Exception thrown when initialising the LDAP Common plugin fails because of an incorrect configuration.
+msgid "A host must be specified."
+msgstr "Ein Host muss angegeben werden."
+
+#. TRANS: Exception thrown when initialising the LDAP Common plugin fails because of an incorrect configuration.
+msgid "\"basedn\" must be specified."
+msgstr "\"Basedn\" muss angegeben werden."
+
+#. TRANS: Exception thrown when initialising the LDAP Common plugin fails because of an incorrect configuration.
+msgid "The username attribute must be set."
+msgstr "Das Benutzernamens-Attribut muss festgelegt werden."
+
+#. TRANS: Exception thrown in the LDAP Common plugin when LDAP server is not available.
+#. TRANS: %s is the error message.
+#, php-format
+msgid "Could not connect to LDAP server: %s"
+msgstr "Konnte keine Verbindung zum LDAP-Server herstellen: %s"
+
+#. TRANS: Exception thrown in the LDAP Common plugin when LDAP server is not available.
+#. TRANS: %s is the error message.
+#, php-format
+msgid "Could not connect to LDAP server: %s."
+msgstr "Konnte keine Verbindung zum LDAP-Server herstellen: %s."
diff --git a/plugins/LdapCommon/locale/es/LC_MESSAGES/LdapCommon.po b/plugins/LdapCommon/locale/es/LC_MESSAGES/LdapCommon.po
new file mode 100644
index 0000000000..50219adc48
--- /dev/null
+++ b/plugins/LdapCommon/locale/es/LC_MESSAGES/LdapCommon.po
@@ -0,0 +1,43 @@
+# Translation of StatusNet - LdapCommon to Spanish (español)
+# Exported from translatewiki.net
+#
+# Author: Armando-Martin
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - LdapCommon\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:58+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:50:26+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Exception thrown when initialising the LDAP Common plugin fails because of an incorrect configuration.
+msgid "A host must be specified."
+msgstr "Debe especificarse un servidor (host)."
+
+#. TRANS: Exception thrown when initialising the LDAP Common plugin fails because of an incorrect configuration.
+msgid "\"basedn\" must be specified."
+msgstr "Debe especificarse \"basedn\"."
+
+#. TRANS: Exception thrown when initialising the LDAP Common plugin fails because of an incorrect configuration.
+msgid "The username attribute must be set."
+msgstr "Debe establecer el atributo de nombre de usuario (username)."
+
+#. TRANS: Exception thrown in the LDAP Common plugin when LDAP server is not available.
+#. TRANS: %s is the error message.
+#, php-format
+msgid "Could not connect to LDAP server: %s"
+msgstr "No se pudo conectar con el servidor LDAP: %s"
+
+#. TRANS: Exception thrown in the LDAP Common plugin when LDAP server is not available.
+#. TRANS: %s is the error message.
+#, php-format
+msgid "Could not connect to LDAP server: %s."
+msgstr "No se pudo conectar al servidor LDAP:  %s."
diff --git a/plugins/LdapCommon/locale/eu/LC_MESSAGES/LdapCommon.po b/plugins/LdapCommon/locale/eu/LC_MESSAGES/LdapCommon.po
new file mode 100644
index 0000000000..e4eed33b4d
--- /dev/null
+++ b/plugins/LdapCommon/locale/eu/LC_MESSAGES/LdapCommon.po
@@ -0,0 +1,43 @@
+# Translation of StatusNet - LdapCommon to Basque (euskara)
+# Exported from translatewiki.net
+#
+# Author: Artsuaga
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - LdapCommon\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:58+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:50:26+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Exception thrown when initialising the LDAP Common plugin fails because of an incorrect configuration.
+msgid "A host must be specified."
+msgstr "Host bat definitu behar duzu."
+
+#. TRANS: Exception thrown when initialising the LDAP Common plugin fails because of an incorrect configuration.
+msgid "\"basedn\" must be specified."
+msgstr "\"basedn\" definitu behar duzu."
+
+#. TRANS: Exception thrown when initialising the LDAP Common plugin fails because of an incorrect configuration.
+msgid "The username attribute must be set."
+msgstr "Erabiltzaile atributua definitu behar duzu."
+
+#. TRANS: Exception thrown in the LDAP Common plugin when LDAP server is not available.
+#. TRANS: %s is the error message.
+#, php-format
+msgid "Could not connect to LDAP server: %s"
+msgstr "Ezin izan da LDAP zerbitzarira konektatu: %s"
+
+#. TRANS: Exception thrown in the LDAP Common plugin when LDAP server is not available.
+#. TRANS: %s is the error message.
+#, php-format
+msgid "Could not connect to LDAP server: %s."
+msgstr "Ezin izan da LDAP zerbitzarira konektatu: %s"
diff --git a/plugins/LdapCommon/locale/fr/LC_MESSAGES/LdapCommon.po b/plugins/LdapCommon/locale/fr/LC_MESSAGES/LdapCommon.po
new file mode 100644
index 0000000000..21c7408294
--- /dev/null
+++ b/plugins/LdapCommon/locale/fr/LC_MESSAGES/LdapCommon.po
@@ -0,0 +1,47 @@
+# Translation of StatusNet - LdapCommon to French (français)
+# Exported from translatewiki.net
+#
+# Author: Crochet.david
+# Author: Hashar
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - LdapCommon\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:58+0000\n"
+"Language-Team: French <https://translatewiki.net/wiki/Portal:fr>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:50:26+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: fr\n"
+"X-Message-Group: #out-statusnet-plugin-ldapcommon\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#. TRANS: Exception thrown when initialising the LDAP Common plugin fails because of an incorrect configuration.
+msgid "A host must be specified."
+msgstr "Un hôte LDAP doit être indiqué."
+
+#. TRANS: Exception thrown when initialising the LDAP Common plugin fails because of an incorrect configuration.
+msgid "\"basedn\" must be specified."
+msgstr "« basedn » doit être spécifié."
+
+#. TRANS: Exception thrown when initialising the LDAP Common plugin fails because of an incorrect configuration.
+msgid "The username attribute must be set."
+msgstr "L'attribut « username » doit être défini."
+
+#. TRANS: Exception thrown in the LDAP Common plugin when LDAP server is not available.
+#. TRANS: %s is the error message.
+#, php-format
+msgid "Could not connect to LDAP server: %s"
+msgstr "Impossible de se connecter au serveur LDAP : %s"
+
+#. TRANS: Exception thrown in the LDAP Common plugin when LDAP server is not available.
+#. TRANS: %s is the error message.
+#, php-format
+msgid "Could not connect to LDAP server: %s."
+msgstr "Impossible de se connecter au serveur LDAP : %s."
diff --git a/plugins/LdapCommon/locale/gl/LC_MESSAGES/LdapCommon.po b/plugins/LdapCommon/locale/gl/LC_MESSAGES/LdapCommon.po
new file mode 100644
index 0000000000..4c7fea46fb
--- /dev/null
+++ b/plugins/LdapCommon/locale/gl/LC_MESSAGES/LdapCommon.po
@@ -0,0 +1,46 @@
+# Translation of StatusNet - LdapCommon to Galician (galego)
+# Exported from translatewiki.net
+#
+# Author: Toliño
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - LdapCommon\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:58+0000\n"
+"Language-Team: Galician <https://translatewiki.net/wiki/Portal:gl>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:50:26+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: gl\n"
+"X-Message-Group: #out-statusnet-plugin-ldapcommon\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Exception thrown when initialising the LDAP Common plugin fails because of an incorrect configuration.
+msgid "A host must be specified."
+msgstr "Cómpre especificar un provedor de hospedaxe."
+
+#. TRANS: Exception thrown when initialising the LDAP Common plugin fails because of an incorrect configuration.
+msgid "\"basedn\" must be specified."
+msgstr "Cómpre especificar \"basedn\"."
+
+#. TRANS: Exception thrown when initialising the LDAP Common plugin fails because of an incorrect configuration.
+msgid "The username attribute must be set."
+msgstr "Cómpre definir o atributo \"username\"."
+
+#. TRANS: Exception thrown in the LDAP Common plugin when LDAP server is not available.
+#. TRANS: %s is the error message.
+#, php-format
+msgid "Could not connect to LDAP server: %s"
+msgstr "Non se puido conectar co servidor LDAP: %s"
+
+#. TRANS: Exception thrown in the LDAP Common plugin when LDAP server is not available.
+#. TRANS: %s is the error message.
+#, php-format
+msgid "Could not connect to LDAP server: %s."
+msgstr "Non se puido conectar co servidor LDAP: %s."
diff --git a/plugins/LdapCommon/locale/ia/LC_MESSAGES/LdapCommon.po b/plugins/LdapCommon/locale/ia/LC_MESSAGES/LdapCommon.po
new file mode 100644
index 0000000000..c877577c0d
--- /dev/null
+++ b/plugins/LdapCommon/locale/ia/LC_MESSAGES/LdapCommon.po
@@ -0,0 +1,46 @@
+# Translation of StatusNet - LdapCommon to Interlingua (interlingua)
+# Exported from translatewiki.net
+#
+# Author: McDutchie
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - LdapCommon\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:58+0000\n"
+"Language-Team: Interlingua <https://translatewiki.net/wiki/Portal:ia>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:50:26+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: ia\n"
+"X-Message-Group: #out-statusnet-plugin-ldapcommon\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Exception thrown when initialising the LDAP Common plugin fails because of an incorrect configuration.
+msgid "A host must be specified."
+msgstr "Un host debe esser specificate."
+
+#. TRANS: Exception thrown when initialising the LDAP Common plugin fails because of an incorrect configuration.
+msgid "\"basedn\" must be specified."
+msgstr "\"basedn\" debe esser specificate."
+
+#. TRANS: Exception thrown when initialising the LDAP Common plugin fails because of an incorrect configuration.
+msgid "The username attribute must be set."
+msgstr "Le attributo \"username\" debe esser definite."
+
+#. TRANS: Exception thrown in the LDAP Common plugin when LDAP server is not available.
+#. TRANS: %s is the error message.
+#, php-format
+msgid "Could not connect to LDAP server: %s"
+msgstr "Non poteva connecter al servitor LDAP: %s"
+
+#. TRANS: Exception thrown in the LDAP Common plugin when LDAP server is not available.
+#. TRANS: %s is the error message.
+#, php-format
+msgid "Could not connect to LDAP server: %s."
+msgstr "Non poteva connecter al servitor LDAP: %s."
diff --git a/plugins/LdapCommon/locale/it/LC_MESSAGES/LdapCommon.po b/plugins/LdapCommon/locale/it/LC_MESSAGES/LdapCommon.po
new file mode 100644
index 0000000000..645bee999f
--- /dev/null
+++ b/plugins/LdapCommon/locale/it/LC_MESSAGES/LdapCommon.po
@@ -0,0 +1,43 @@
+# Translation of StatusNet - LdapCommon to Italian (italiano)
+# Exported from translatewiki.net
+#
+# Author: GreenFox
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - LdapCommon\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:58+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:50:26+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Exception thrown when initialising the LDAP Common plugin fails because of an incorrect configuration.
+msgid "A host must be specified."
+msgstr "Un host deve essere specificato."
+
+#. TRANS: Exception thrown when initialising the LDAP Common plugin fails because of an incorrect configuration.
+msgid "\"basedn\" must be specified."
+msgstr "\"basedn\" deve essere specificato."
+
+#. TRANS: Exception thrown when initialising the LDAP Common plugin fails because of an incorrect configuration.
+msgid "The username attribute must be set."
+msgstr "L'attributo \"username\" deve essere impostato."
+
+#. TRANS: Exception thrown in the LDAP Common plugin when LDAP server is not available.
+#. TRANS: %s is the error message.
+#, php-format
+msgid "Could not connect to LDAP server: %s"
+msgstr "Impossibile connettersi al server LDAP: %s"
+
+#. TRANS: Exception thrown in the LDAP Common plugin when LDAP server is not available.
+#. TRANS: %s is the error message.
+#, php-format
+msgid "Could not connect to LDAP server: %s."
+msgstr "Impossibile connettersi al server LDAP: %s"
diff --git a/plugins/LdapCommon/locale/mk/LC_MESSAGES/LdapCommon.po b/plugins/LdapCommon/locale/mk/LC_MESSAGES/LdapCommon.po
new file mode 100644
index 0000000000..d223446dea
--- /dev/null
+++ b/plugins/LdapCommon/locale/mk/LC_MESSAGES/LdapCommon.po
@@ -0,0 +1,46 @@
+# Translation of StatusNet - LdapCommon to Macedonian (македон�ки)
+# Exported from translatewiki.net
+#
+# Author: Bjankuloski06
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - LdapCommon\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:59+0000\n"
+"Language-Team: Macedonian <https://translatewiki.net/wiki/Portal:mk>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:50:26+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: mk\n"
+"X-Message-Group: #out-statusnet-plugin-ldapcommon\n"
+"Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
+
+#. TRANS: Exception thrown when initialising the LDAP Common plugin fails because of an incorrect configuration.
+msgid "A host must be specified."
+msgstr "Мора да наведете домаќин."
+
+#. TRANS: Exception thrown when initialising the LDAP Common plugin fails because of an incorrect configuration.
+msgid "\"basedn\" must be specified."
+msgstr "Мора да наведете „basedn“"
+
+#. TRANS: Exception thrown when initialising the LDAP Common plugin fails because of an incorrect configuration.
+msgid "The username attribute must be set."
+msgstr "Мора да �е назначи атрибутот за кори�ничко име."
+
+#. TRANS: Exception thrown in the LDAP Common plugin when LDAP server is not available.
+#. TRANS: %s is the error message.
+#, php-format
+msgid "Could not connect to LDAP server: %s"
+msgstr "�е можам да �е поврзам �о оп�лужувачот на LDAP: %s"
+
+#. TRANS: Exception thrown in the LDAP Common plugin when LDAP server is not available.
+#. TRANS: %s is the error message.
+#, php-format
+msgid "Could not connect to LDAP server: %s."
+msgstr "�е можам да �е поврзам �о оп�лужувачот на LDAP: %s"
diff --git a/plugins/LdapCommon/locale/nl/LC_MESSAGES/LdapCommon.po b/plugins/LdapCommon/locale/nl/LC_MESSAGES/LdapCommon.po
new file mode 100644
index 0000000000..c601222a0e
--- /dev/null
+++ b/plugins/LdapCommon/locale/nl/LC_MESSAGES/LdapCommon.po
@@ -0,0 +1,47 @@
+# Translation of StatusNet - LdapCommon to Dutch (Nederlands)
+# Exported from translatewiki.net
+#
+# Author: Siebrand
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - LdapCommon\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:59+0000\n"
+"Language-Team: Dutch <https://translatewiki.net/wiki/Portal:nl>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:50:26+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: nl\n"
+"X-Message-Group: #out-statusnet-plugin-ldapcommon\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Exception thrown when initialising the LDAP Common plugin fails because of an incorrect configuration.
+msgid "A host must be specified."
+msgstr "Er moet een host opgegeven worden."
+
+#. TRANS: Exception thrown when initialising the LDAP Common plugin fails because of an incorrect configuration.
+msgid "\"basedn\" must be specified."
+msgstr "\"basedn\" moet opgegeven worden."
+
+#. TRANS: Exception thrown when initialising the LDAP Common plugin fails because of an incorrect configuration.
+msgid "The username attribute must be set."
+msgstr "Het attribuut \"username\" moet ingesteld zijn."
+
+#. TRANS: Exception thrown in the LDAP Common plugin when LDAP server is not available.
+#. TRANS: %s is the error message.
+#, php-format
+msgid "Could not connect to LDAP server: %s"
+msgstr "Het wat niet mogelijk een verbinding te krijgen met de LDAP-server: %s"
+
+#. TRANS: Exception thrown in the LDAP Common plugin when LDAP server is not available.
+#. TRANS: %s is the error message.
+#, php-format
+msgid "Could not connect to LDAP server: %s."
+msgstr ""
+"Het wat niet mogelijk een verbinding te krijgen met de LDAP-server: %s."
diff --git a/plugins/LdapCommon/locale/tl/LC_MESSAGES/LdapCommon.po b/plugins/LdapCommon/locale/tl/LC_MESSAGES/LdapCommon.po
new file mode 100644
index 0000000000..2a1c57aa29
--- /dev/null
+++ b/plugins/LdapCommon/locale/tl/LC_MESSAGES/LdapCommon.po
@@ -0,0 +1,46 @@
+# Translation of StatusNet - LdapCommon to Tagalog (Tagalog)
+# Exported from translatewiki.net
+#
+# Author: AnakngAraw
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - LdapCommon\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:59+0000\n"
+"Language-Team: Tagalog <https://translatewiki.net/wiki/Portal:tl>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:50:26+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: tl\n"
+"X-Message-Group: #out-statusnet-plugin-ldapcommon\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Exception thrown when initialising the LDAP Common plugin fails because of an incorrect configuration.
+msgid "A host must be specified."
+msgstr "Dapat tukuyin ang isang tagapagpasinaya."
+
+#. TRANS: Exception thrown when initialising the LDAP Common plugin fails because of an incorrect configuration.
+msgid "\"basedn\" must be specified."
+msgstr "Dapat tukuyin ang isang \"basedn\"."
+
+#. TRANS: Exception thrown when initialising the LDAP Common plugin fails because of an incorrect configuration.
+msgid "The username attribute must be set."
+msgstr "Dapat itakda ang isang katangian ng pangalan ng tagagamit."
+
+#. TRANS: Exception thrown in the LDAP Common plugin when LDAP server is not available.
+#. TRANS: %s is the error message.
+#, php-format
+msgid "Could not connect to LDAP server: %s"
+msgstr "Hindi makaugnay sa tagapaghain ng LDAP: %s"
+
+#. TRANS: Exception thrown in the LDAP Common plugin when LDAP server is not available.
+#. TRANS: %s is the error message.
+#, php-format
+msgid "Could not connect to LDAP server: %s."
+msgstr "Hindi makaugnay sa tagapaghain ng LDAP: %s."
diff --git a/plugins/LdapCommon/locale/uk/LC_MESSAGES/LdapCommon.po b/plugins/LdapCommon/locale/uk/LC_MESSAGES/LdapCommon.po
new file mode 100644
index 0000000000..6a4a90dec7
--- /dev/null
+++ b/plugins/LdapCommon/locale/uk/LC_MESSAGES/LdapCommon.po
@@ -0,0 +1,47 @@
+# Translation of StatusNet - LdapCommon to Ukrainian (україн�ька)
+# Exported from translatewiki.net
+#
+# Author: Boogie
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - LdapCommon\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:59+0000\n"
+"Language-Team: Ukrainian <https://translatewiki.net/wiki/Portal:uk>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:50:26+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: uk\n"
+"X-Message-Group: #out-statusnet-plugin-ldapcommon\n"
+"Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
+"2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
+
+#. TRANS: Exception thrown when initialising the LDAP Common plugin fails because of an incorrect configuration.
+msgid "A host must be specified."
+msgstr "Хо�т має бути зазначений."
+
+#. TRANS: Exception thrown when initialising the LDAP Common plugin fails because of an incorrect configuration.
+msgid "\"basedn\" must be specified."
+msgstr "«basedn» має бути зазначений."
+
+#. TRANS: Exception thrown when initialising the LDAP Common plugin fails because of an incorrect configuration.
+msgid "The username attribute must be set."
+msgstr "�еобхідно в�тановити атрибут імені кори�тувача."
+
+#. TRANS: Exception thrown in the LDAP Common plugin when LDAP server is not available.
+#. TRANS: %s is the error message.
+#, php-format
+msgid "Could not connect to LDAP server: %s"
+msgstr "�е вдаєть�� підключити�� до �ервера LDAP: %s"
+
+#. TRANS: Exception thrown in the LDAP Common plugin when LDAP server is not available.
+#. TRANS: %s is the error message.
+#, php-format
+msgid "Could not connect to LDAP server: %s."
+msgstr "�е вдаєть�� підключити�� до �ервера LDAP: %s."
diff --git a/plugins/LilUrl/locale/LilUrl.pot b/plugins/LilUrl/locale/LilUrl.pot
index 225866b93c..f03883e550 100644
--- a/plugins/LilUrl/locale/LilUrl.pot
+++ b/plugins/LilUrl/locale/LilUrl.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
+"POT-Creation-Date: 2012-06-30 11:07+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"
diff --git a/plugins/LilUrl/locale/ca/LC_MESSAGES/LilUrl.po b/plugins/LilUrl/locale/ca/LC_MESSAGES/LilUrl.po
index e9381aad83..6d10be2b72 100644
--- a/plugins/LilUrl/locale/ca/LC_MESSAGES/LilUrl.po
+++ b/plugins/LilUrl/locale/ca/LC_MESSAGES/LilUrl.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - LilUrl to Catalan (Català)
+# Translation of StatusNet - LilUrl to Catalan (català)
 # Exported from translatewiki.net
 #
 # Author: Toniher
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LilUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:51+0000\n"
-"Language-Team: Catalan <http://translatewiki.net/wiki/Portal:ca>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:59+0000\n"
+"Language-Team: Catalan <https://translatewiki.net/wiki/Portal:ca>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:06+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:26+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ca\n"
 "X-Message-Group: #out-statusnet-plugin-lilurl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -30,3 +30,4 @@ msgstr "S'ha d'especificar un URL de servei (serviceUrl)"
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr ""
+"Fa servir el servei d'escurçament d'URL <a href=\"http://%1$s/\">%1$s</a>."
diff --git a/plugins/LilUrl/locale/de/LC_MESSAGES/LilUrl.po b/plugins/LilUrl/locale/de/LC_MESSAGES/LilUrl.po
index d0d51da11a..30bf3af527 100644
--- a/plugins/LilUrl/locale/de/LC_MESSAGES/LilUrl.po
+++ b/plugins/LilUrl/locale/de/LC_MESSAGES/LilUrl.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LilUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:51+0000\n"
-"Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:59+0000\n"
+"Language-Team: German <https://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:06+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:26+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-lilurl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/LilUrl/locale/es/LC_MESSAGES/LilUrl.po b/plugins/LilUrl/locale/es/LC_MESSAGES/LilUrl.po
new file mode 100644
index 0000000000..0551608423
--- /dev/null
+++ b/plugins/LilUrl/locale/es/LC_MESSAGES/LilUrl.po
@@ -0,0 +1,31 @@
+# Translation of StatusNet - LilUrl to Spanish (español)
+# Exported from translatewiki.net
+#
+# Author: Armando-Martin
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - LilUrl\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:59+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:50:26+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Exception thrown when URL shortening plugin was configured incorrectly.
+msgid "A serviceUrl must be specified."
+msgstr "Debe especificarse un serviceUrl."
+
+#. TRANS: Plugin description.
+#. TRANS: %1$s is the service URL.
+#, php-format
+msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
+msgstr ""
+"Utilice el servicio de acortamiento de direcciones URL <a href=\"http://%1$s/"
+"\">%1$s</a>."
diff --git a/plugins/LilUrl/locale/eu/LC_MESSAGES/LilUrl.po b/plugins/LilUrl/locale/eu/LC_MESSAGES/LilUrl.po
new file mode 100644
index 0000000000..306b82dd97
--- /dev/null
+++ b/plugins/LilUrl/locale/eu/LC_MESSAGES/LilUrl.po
@@ -0,0 +1,32 @@
+# Translation of StatusNet - LilUrl to Basque (euskara)
+# Exported from translatewiki.net
+#
+# Author: Artsuaga
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - LilUrl\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:59+0000\n"
+"Language-Team: Basque <https://translatewiki.net/wiki/Portal:eu>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:50:26+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: eu\n"
+"X-Message-Group: #out-statusnet-plugin-lilurl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Exception thrown when URL shortening plugin was configured incorrectly.
+msgid "A serviceUrl must be specified."
+msgstr "serviceUrl bat zehaztu bhear da."
+
+#. TRANS: Plugin description.
+#. TRANS: %1$s is the service URL.
+#, php-format
+msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
+msgstr "<a href=\"http://%1$s/\">%1$s</a> URL-laburtze zerbitzua erabiliz."
diff --git a/plugins/LilUrl/locale/fr/LC_MESSAGES/LilUrl.po b/plugins/LilUrl/locale/fr/LC_MESSAGES/LilUrl.po
index 0ec192c246..63a54ce75d 100644
--- a/plugins/LilUrl/locale/fr/LC_MESSAGES/LilUrl.po
+++ b/plugins/LilUrl/locale/fr/LC_MESSAGES/LilUrl.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - LilUrl to French (Français)
+# Translation of StatusNet - LilUrl to French (français)
 # Exported from translatewiki.net
 #
 # Author: Peter17
@@ -10,14 +10,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LilUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:51+0000\n"
-"Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:59+0000\n"
+"Language-Team: French <https://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:06+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:26+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-lilurl\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
diff --git a/plugins/LilUrl/locale/gl/LC_MESSAGES/LilUrl.po b/plugins/LilUrl/locale/gl/LC_MESSAGES/LilUrl.po
new file mode 100644
index 0000000000..8beb37f61d
--- /dev/null
+++ b/plugins/LilUrl/locale/gl/LC_MESSAGES/LilUrl.po
@@ -0,0 +1,34 @@
+# Translation of StatusNet - LilUrl to Galician (galego)
+# Exported from translatewiki.net
+#
+# Author: Toliño
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - LilUrl\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:59+0000\n"
+"Language-Team: Galician <https://translatewiki.net/wiki/Portal:gl>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:50:26+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: gl\n"
+"X-Message-Group: #out-statusnet-plugin-lilurl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Exception thrown when URL shortening plugin was configured incorrectly.
+msgid "A serviceUrl must be specified."
+msgstr "Cómpre especificar un serviceUrl."
+
+#. TRANS: Plugin description.
+#. TRANS: %1$s is the service URL.
+#, php-format
+msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
+msgstr ""
+"Emprega o servizo de abreviación de enderezos URL <a href=\"http://%1$s/\">%1"
+"$s</a>."
diff --git a/plugins/LilUrl/locale/he/LC_MESSAGES/LilUrl.po b/plugins/LilUrl/locale/he/LC_MESSAGES/LilUrl.po
index 8680c995ec..b864f2f4f0 100644
--- a/plugins/LilUrl/locale/he/LC_MESSAGES/LilUrl.po
+++ b/plugins/LilUrl/locale/he/LC_MESSAGES/LilUrl.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LilUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:51+0000\n"
-"Language-Team: Hebrew <http://translatewiki.net/wiki/Portal:he>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:08:59+0000\n"
+"Language-Team: Hebrew <https://translatewiki.net/wiki/Portal:he>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:06+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:26+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: he\n"
 "X-Message-Group: #out-statusnet-plugin-lilurl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/LilUrl/locale/ia/LC_MESSAGES/LilUrl.po b/plugins/LilUrl/locale/ia/LC_MESSAGES/LilUrl.po
index 20b9633ac7..47304c0ddf 100644
--- a/plugins/LilUrl/locale/ia/LC_MESSAGES/LilUrl.po
+++ b/plugins/LilUrl/locale/ia/LC_MESSAGES/LilUrl.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - LilUrl to Interlingua (Interlingua)
+# Translation of StatusNet - LilUrl to Interlingua (interlingua)
 # Exported from translatewiki.net
 #
 # Author: McDutchie
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LilUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:51+0000\n"
-"Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:00+0000\n"
+"Language-Team: Interlingua <https://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:06+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:26+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-lilurl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/LilUrl/locale/id/LC_MESSAGES/LilUrl.po b/plugins/LilUrl/locale/id/LC_MESSAGES/LilUrl.po
index 50e2a7e1c7..37d29f6fc7 100644
--- a/plugins/LilUrl/locale/id/LC_MESSAGES/LilUrl.po
+++ b/plugins/LilUrl/locale/id/LC_MESSAGES/LilUrl.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LilUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:51+0000\n"
-"Language-Team: Indonesian <http://translatewiki.net/wiki/Portal:id>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:00+0000\n"
+"Language-Team: Indonesian <https://translatewiki.net/wiki/Portal:id>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:06+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:26+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: id\n"
 "X-Message-Group: #out-statusnet-plugin-lilurl\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
diff --git a/plugins/LilUrl/locale/it/LC_MESSAGES/LilUrl.po b/plugins/LilUrl/locale/it/LC_MESSAGES/LilUrl.po
new file mode 100644
index 0000000000..8a9a45d31d
--- /dev/null
+++ b/plugins/LilUrl/locale/it/LC_MESSAGES/LilUrl.po
@@ -0,0 +1,30 @@
+# Translation of StatusNet - LilUrl to Italian (italiano)
+# Exported from translatewiki.net
+#
+# Author: GreenFox
+# Author: Ximo17
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - LilUrl\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:00+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:50:26+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Exception thrown when URL shortening plugin was configured incorrectly.
+msgid "A serviceUrl must be specified."
+msgstr "E' necessario specificare un serviceUrl."
+
+#. TRANS: Plugin description.
+#. TRANS: %1$s is the service URL.
+#, php-format
+msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
+msgstr "Usa il servizio URL-breve <a href=\"http://%1$s/\">%1$s</a>."
diff --git a/plugins/LilUrl/locale/ja/LC_MESSAGES/LilUrl.po b/plugins/LilUrl/locale/ja/LC_MESSAGES/LilUrl.po
index 46f823c93d..0556b5a073 100644
--- a/plugins/LilUrl/locale/ja/LC_MESSAGES/LilUrl.po
+++ b/plugins/LilUrl/locale/ja/LC_MESSAGES/LilUrl.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LilUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:51+0000\n"
-"Language-Team: Japanese <http://translatewiki.net/wiki/Portal:ja>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:00+0000\n"
+"Language-Team: Japanese <https://translatewiki.net/wiki/Portal:ja>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:06+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:26+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ja\n"
 "X-Message-Group: #out-statusnet-plugin-lilurl\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
diff --git a/plugins/LilUrl/locale/mk/LC_MESSAGES/LilUrl.po b/plugins/LilUrl/locale/mk/LC_MESSAGES/LilUrl.po
index 8d038ede5a..348be0e96a 100644
--- a/plugins/LilUrl/locale/mk/LC_MESSAGES/LilUrl.po
+++ b/plugins/LilUrl/locale/mk/LC_MESSAGES/LilUrl.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - LilUrl to Macedonian (Македон�ки)
+# Translation of StatusNet - LilUrl to Macedonian (македон�ки)
 # Exported from translatewiki.net
 #
 # Author: Bjankuloski06
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LilUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:51+0000\n"
-"Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:00+0000\n"
+"Language-Team: Macedonian <https://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:06+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:26+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-lilurl\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
diff --git a/plugins/LilUrl/locale/nb/LC_MESSAGES/LilUrl.po b/plugins/LilUrl/locale/nb/LC_MESSAGES/LilUrl.po
index b8dd7dfbd3..d4deabc377 100644
--- a/plugins/LilUrl/locale/nb/LC_MESSAGES/LilUrl.po
+++ b/plugins/LilUrl/locale/nb/LC_MESSAGES/LilUrl.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - LilUrl to Norwegian (bokmål)‬ (‪Norsk (bokmål)‬)
+# Translation of StatusNet - LilUrl to Norwegian Bokmål (‪norsk (bokmål)‬)
 # Exported from translatewiki.net
 #
 # Author: Nghtwlkr
@@ -9,15 +9,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LilUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:51+0000\n"
-"Language-Team: Norwegian (bokmål)‬ <http://translatewiki.net/wiki/Portal:no>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:00+0000\n"
+"Language-Team: Norwegian Bokmål <https://translatewiki.net/wiki/Portal:nb>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:06+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
-"X-Language-Code: no\n"
+"X-POT-Import-Date: 2011-06-05 21:50:26+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: nb\n"
 "X-Message-Group: #out-statusnet-plugin-lilurl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
diff --git a/plugins/LilUrl/locale/nl/LC_MESSAGES/LilUrl.po b/plugins/LilUrl/locale/nl/LC_MESSAGES/LilUrl.po
index ec102afb44..c5d4c96c64 100644
--- a/plugins/LilUrl/locale/nl/LC_MESSAGES/LilUrl.po
+++ b/plugins/LilUrl/locale/nl/LC_MESSAGES/LilUrl.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LilUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:51+0000\n"
-"Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:00+0000\n"
+"Language-Team: Dutch <https://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:06+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:26+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-lilurl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/LilUrl/locale/ru/LC_MESSAGES/LilUrl.po b/plugins/LilUrl/locale/ru/LC_MESSAGES/LilUrl.po
index 8fe24dd06a..3ccdfbfb68 100644
--- a/plugins/LilUrl/locale/ru/LC_MESSAGES/LilUrl.po
+++ b/plugins/LilUrl/locale/ru/LC_MESSAGES/LilUrl.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - LilUrl to Russian (Ру��кий)
+# Translation of StatusNet - LilUrl to Russian (ру��кий)
 # Exported from translatewiki.net
 #
 # Author: Eleferen
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LilUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:52+0000\n"
-"Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:00+0000\n"
+"Language-Team: Russian <https://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:06+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:26+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-lilurl\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
diff --git a/plugins/LilUrl/locale/sv/LC_MESSAGES/LilUrl.po b/plugins/LilUrl/locale/sv/LC_MESSAGES/LilUrl.po
index 63c4ddb640..9721c59d95 100644
--- a/plugins/LilUrl/locale/sv/LC_MESSAGES/LilUrl.po
+++ b/plugins/LilUrl/locale/sv/LC_MESSAGES/LilUrl.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - LilUrl to Swedish (Svenska)
+# Translation of StatusNet - LilUrl to Swedish (svenska)
 # Exported from translatewiki.net
 #
 # Author: Lokal Profil
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LilUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:52+0000\n"
-"Language-Team: Swedish <http://translatewiki.net/wiki/Portal:sv>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:00+0000\n"
+"Language-Team: Swedish <https://translatewiki.net/wiki/Portal:sv>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:06+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:26+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: sv\n"
 "X-Message-Group: #out-statusnet-plugin-lilurl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/LilUrl/locale/tl/LC_MESSAGES/LilUrl.po b/plugins/LilUrl/locale/tl/LC_MESSAGES/LilUrl.po
index dee3f84290..6a47cd1555 100644
--- a/plugins/LilUrl/locale/tl/LC_MESSAGES/LilUrl.po
+++ b/plugins/LilUrl/locale/tl/LC_MESSAGES/LilUrl.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LilUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:52+0000\n"
-"Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:01+0000\n"
+"Language-Team: Tagalog <https://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:06+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:26+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-lilurl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/LilUrl/locale/uk/LC_MESSAGES/LilUrl.po b/plugins/LilUrl/locale/uk/LC_MESSAGES/LilUrl.po
index de938e5ccc..528cbdb8cc 100644
--- a/plugins/LilUrl/locale/uk/LC_MESSAGES/LilUrl.po
+++ b/plugins/LilUrl/locale/uk/LC_MESSAGES/LilUrl.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - LilUrl to Ukrainian (Україн�ька)
+# Translation of StatusNet - LilUrl to Ukrainian (україн�ька)
 # Exported from translatewiki.net
 #
 # Author: Boogie
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LilUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:52+0000\n"
-"Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:01+0000\n"
+"Language-Team: Ukrainian <https://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:06+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:26+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-lilurl\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
diff --git a/plugins/LilUrl/locale/zh_CN/LC_MESSAGES/LilUrl.po b/plugins/LilUrl/locale/zh_CN/LC_MESSAGES/LilUrl.po
index 20737ade7b..b515076bef 100644
--- a/plugins/LilUrl/locale/zh_CN/LC_MESSAGES/LilUrl.po
+++ b/plugins/LilUrl/locale/zh_CN/LC_MESSAGES/LilUrl.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - LilUrl to Simplified Chinese (‪中文(简体)‬)
+# Translation of StatusNet - LilUrl to Simplified Chinese (‪中文（简体）‬)
 # Exported from translatewiki.net
 #
 # Author: ZhengYiFeng
@@ -9,15 +9,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LilUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:52+0000\n"
-"Language-Team: Simplified Chinese <http://translatewiki.net/wiki/Portal:zh-"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:01+0000\n"
+"Language-Team: Simplified Chinese <https://translatewiki.net/wiki/Portal:zh-"
 "hans>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:06+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:26+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: #out-statusnet-plugin-lilurl\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
diff --git a/plugins/LinkPreview/linkpreview.js b/plugins/LinkPreview/linkpreview.js
index 132c4c8d77..e6e98bdb4d 100644
--- a/plugins/LinkPreview/linkpreview.js
+++ b/plugins/LinkPreview/linkpreview.js
@@ -7,7 +7,7 @@
      * Quickie wrapper around ooembed JSON lookup
      */
     var oEmbed = {
-        api: 'http://oohembed.com/oohembed',
+        api: 'https://noembed.com/embed',
         width: 100,
         height: 75,
         cache: {},
diff --git a/plugins/LinkPreview/linkpreview.min.js b/plugins/LinkPreview/linkpreview.min.js
index ea28f6bfee..99af83913e 100644
--- a/plugins/LinkPreview/linkpreview.min.js
+++ b/plugins/LinkPreview/linkpreview.min.js
@@ -1 +1 @@
-(function(){var b={api:"http://oohembed.com/oohembed",width:100,height:75,cache:{},callbacks:{},lookup:function(d,e){if(typeof b.cache[d]=="object"){e(b.cache[d])}else{if(typeof b.callbacks[d]=="undefined"){b.callbacks[d]=[e];b.rawLookup(d,function(h){b.cache[d]=h;var g=b.callbacks[d];b.callbacks[d]=undefined;for(var f=0;f<g.length;f++){g[f](h)}})}else{b.callbacks[d].push(e)}}},rawLookup:function(d,f){var e={url:d,format:"json",maxwidth:b.width,maxheight:b.height,token:$("#token").val()};$.ajax({url:b.api,data:e,dataType:"json",success:function(g,h){f(g)},error:function(h,i,g){f(null)}})}};SN.Init.LinkPreview=function(d){if(d.api){b.api=d.api}if(d.width){b.width=d.width}if(d.height){b.height=d.height}};var c=SN.U.Counter;SN.U.Counter=function(d){var e=d.data("LinkPreview");if(e){e.previewLinks(d.find(".notice_data-text:first").val())}return c(d)};var a=SN.Init.NoticeFormSetup;SN.Init.NoticeFormSetup=function(d){a(d);d.bind("reset",function(){e.clear()});var e={links:[],state:[],refresh:[],findLinks:function(i){var g=/(?:^| )(https?:\/\/.+?\/.+?)(?= |$)/mg;var f=[];var h;while((h=g.exec(i))!==null){f.push(h[1])}return f},ensureArea:function(){if(d.find(".link-preview").length<1){d.append('<div class="notice-status link-preview thumbnails"></div>')}},prepLinkPreview:function(g){var h="link-preview-"+g;var f=e.links[g];e.refresh[g]=false;e.markLoading(g);b.lookup(f,function(l){var i=null;var j=100;if(l&&typeof l.thumbnail_url=="string"){i=l.thumbnail_url;if(typeof l.thumbnail_width!=="undefined"){if(l.thumbnail_width<j){j=l.thumbnail_width}}}else{if(l&&l.type=="photo"&&typeof l.url=="string"){i=l.url;if(typeof l.width!=="undefined"){if(l.width<j){j=l.width}}}}if(i){e.ensureArea();var k=$('<span class="inline-attachment"><a><img/></a></span>');k.find("a").attr("href",f).attr("target","_blank").last().find("img").attr("src",i).attr("width",j).attr("title",l.title||l.url||f);d.find("."+h).empty().append(k)}else{e.clearLink(g)}if(e.refresh[g]){e.prepLinkPreview(g)}else{e.markDone(g)}})},previewLinks:function(j){var h;var f=e.links;var g=e.findLinks(j);e.links=g;for(h=0;h<f.length&&h<g.length;h++){if(g[h]!=f[h]){if(e.state[h]=="loading"){e.refresh[h]=true}else{e.prepLinkPreview(h)}}}if(g.length>f.length){for(h=f.length;h<g.length;h++){e.addPreviewArea(h);e.prepLinkPreview(h)}}else{if(f.length>g.length){for(h=g.length;h<f.length;h++){e.clearLink(h)}}}if(g.length==0){e.clear()}},addPreviewArea:function(f){e.ensureArea();var g="link-preview-"+f;if(d.find("."+g).length<1){d.find(".link-preview").append('<span class="'+g+'"></span>')}},clearLink:function(f){var g="link-preview-"+f;d.find("."+g).html("")},markLoading:function(f){e.state[f]="loading";var g="link-preview-"+f;d.find("."+g).attr("style","opacity: 0.5")},markDone:function(f){e.state[f]="done";var g="link-preview-"+f;d.find("."+g).removeAttr("style")},clear:function(){e.links=[];d.find(".link-preview").remove()}};d.data("LinkPreview",e)}})();
\ No newline at end of file
+(function(){var b={api:"https://noembed.com/embed",width:100,height:75,cache:{},callbacks:{},lookup:function(d,e){if(typeof b.cache[d]=="object"){e(b.cache[d])}else{if(typeof b.callbacks[d]=="undefined"){b.callbacks[d]=[e];b.rawLookup(d,function(h){b.cache[d]=h;var g=b.callbacks[d];b.callbacks[d]=undefined;for(var f=0;f<g.length;f++){g[f](h)}})}else{b.callbacks[d].push(e)}}},rawLookup:function(d,f){var e={url:d,format:"json",maxwidth:b.width,maxheight:b.height,token:$("#token").val()};$.ajax({url:b.api,data:e,dataType:"json",success:function(g,h){f(g)},error:function(h,i,g){f(null)}})}};SN.Init.LinkPreview=function(d){if(d.api){b.api=d.api}if(d.width){b.width=d.width}if(d.height){b.height=d.height}};var c=SN.U.Counter;SN.U.Counter=function(d){var e=d.data("LinkPreview");if(e){e.previewLinks(d.find(".notice_data-text:first").val())}return c(d)};var a=SN.Init.NoticeFormSetup;SN.Init.NoticeFormSetup=function(d){a(d);d.bind("reset",function(){e.clear()});var e={links:[],state:[],refresh:[],findLinks:function(i){var g=/(?:^| )(https?:\/\/.+?\/.+?)(?= |$)/mg;var f=[];var h;while((h=g.exec(i))!==null){f.push(h[1])}return f},ensureArea:function(){if(d.find(".link-preview").length<1){d.append('<div class="notice-status link-preview thumbnails"></div>')}},prepLinkPreview:function(g){var h="link-preview-"+g;var f=e.links[g];e.refresh[g]=false;e.markLoading(g);b.lookup(f,function(l){var i=null;var j=100;if(l&&typeof l.thumbnail_url=="string"){i=l.thumbnail_url;if(typeof l.thumbnail_width!=="undefined"){if(l.thumbnail_width<j){j=l.thumbnail_width}}}else{if(l&&l.type=="photo"&&typeof l.url=="string"){i=l.url;if(typeof l.width!=="undefined"){if(l.width<j){j=l.width}}}}if(i){e.ensureArea();var k=$('<span class="inline-attachment"><a><img/></a></span>');k.find("a").attr("href",f).attr("target","_blank").last().find("img").attr("src",i).attr("width",j).attr("title",l.title||l.url||f);d.find("."+h).empty().append(k)}else{e.clearLink(g)}if(e.refresh[g]){e.prepLinkPreview(g)}else{e.markDone(g)}})},previewLinks:function(j){var h;var f=e.links;var g=e.findLinks(j);e.links=g;for(h=0;h<f.length&&h<g.length;h++){if(g[h]!=f[h]){if(e.state[h]=="loading"){e.refresh[h]=true}else{e.prepLinkPreview(h)}}}if(g.length>f.length){for(h=f.length;h<g.length;h++){e.addPreviewArea(h);e.prepLinkPreview(h)}}else{if(f.length>g.length){for(h=g.length;h<f.length;h++){e.clearLink(h)}}}if(g.length==0){e.clear()}},addPreviewArea:function(f){e.ensureArea();var g="link-preview-"+f;if(d.find("."+g).length<1){d.find(".link-preview").append('<span class="'+g+'"></span>')}},clearLink:function(f){var g="link-preview-"+f;d.find("."+g).html("")},markLoading:function(f){e.state[f]="loading";var g="link-preview-"+f;d.find("."+g).attr("style","opacity: 0.5")},markDone:function(f){e.state[f]="done";var g="link-preview-"+f;d.find("."+g).removeAttr("style")},clear:function(){e.links=[];d.find(".link-preview").remove()}};d.data("LinkPreview",e)}})();
\ No newline at end of file
diff --git a/plugins/LinkPreview/locale/LinkPreview.pot b/plugins/LinkPreview/locale/LinkPreview.pot
index 5f969bf627..bc0ba83569 100644
--- a/plugins/LinkPreview/locale/LinkPreview.pot
+++ b/plugins/LinkPreview/locale/LinkPreview.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
+"POT-Creation-Date: 2012-06-30 11:07+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"
diff --git a/plugins/LinkPreview/locale/ca/LC_MESSAGES/LinkPreview.po b/plugins/LinkPreview/locale/ca/LC_MESSAGES/LinkPreview.po
new file mode 100644
index 0000000000..9c05f0ed06
--- /dev/null
+++ b/plugins/LinkPreview/locale/ca/LC_MESSAGES/LinkPreview.po
@@ -0,0 +1,40 @@
+# Translation of StatusNet - LinkPreview to Catalan (català)
+# Exported from translatewiki.net
+#
+# Author: Toniher
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - LinkPreview\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:03+0000\n"
+"Language-Team: Catalan <https://translatewiki.net/wiki/Portal:ca>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:50:28+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: ca\n"
+"X-Message-Group: #out-statusnet-plugin-linkpreview\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin description.
+msgid "UI extension for previewing thumbnails from links."
+msgstr ""
+
+#. TRANS: Client error displayed when the session token does not match or is not given.
+msgid "There was a problem with your session token. Try again, please."
+msgstr ""
+"S'ha produït un problema amb el vostre testimoni de sessió. Torneu-ho a "
+"provar."
+
+#. TRANS: Client exception thrown when requesting a different format than JSON.
+msgid "Invalid format; only JSON supported."
+msgstr ""
+
+#. TRANS: Client exception thrown when not providing a valid URL.
+msgid "Invalid URL."
+msgstr "URL invàlid."
diff --git a/plugins/LinkPreview/locale/de/LC_MESSAGES/LinkPreview.po b/plugins/LinkPreview/locale/de/LC_MESSAGES/LinkPreview.po
index bb167479a8..acccbd0004 100644
--- a/plugins/LinkPreview/locale/de/LC_MESSAGES/LinkPreview.po
+++ b/plugins/LinkPreview/locale/de/LC_MESSAGES/LinkPreview.po
@@ -11,14 +11,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LinkPreview\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:54+0000\n"
-"Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:03+0000\n"
+"Language-Team: German <https://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:11+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:28+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-linkpreview\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/LinkPreview/locale/es/LC_MESSAGES/LinkPreview.po b/plugins/LinkPreview/locale/es/LC_MESSAGES/LinkPreview.po
new file mode 100644
index 0000000000..9dd0e0c767
--- /dev/null
+++ b/plugins/LinkPreview/locale/es/LC_MESSAGES/LinkPreview.po
@@ -0,0 +1,39 @@
+# Translation of StatusNet - LinkPreview to Spanish (español)
+# Exported from translatewiki.net
+#
+# Author: Armando-Martin
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - LinkPreview\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:03+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:50:28+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin description.
+msgid "UI extension for previewing thumbnails from links."
+msgstr ""
+"Extensión de interfaz de usuario para la previsualización de miniaturas "
+"desde los enlaces."
+
+#. TRANS: Client error displayed when the session token does not match or is not given.
+msgid "There was a problem with your session token. Try again, please."
+msgstr ""
+"Hubo un problema con su clave (token) de sesión. Inténtelo de nuevo, por "
+"favor."
+
+#. TRANS: Client exception thrown when requesting a different format than JSON.
+msgid "Invalid format; only JSON supported."
+msgstr "Formato no válido; sólo JSON es compatible."
+
+#. TRANS: Client exception thrown when not providing a valid URL.
+msgid "Invalid URL."
+msgstr "La dirección URL no es válida"
diff --git a/plugins/LinkPreview/locale/eu/LC_MESSAGES/LinkPreview.po b/plugins/LinkPreview/locale/eu/LC_MESSAGES/LinkPreview.po
new file mode 100644
index 0000000000..3bf8cc6341
--- /dev/null
+++ b/plugins/LinkPreview/locale/eu/LC_MESSAGES/LinkPreview.po
@@ -0,0 +1,35 @@
+# Translation of StatusNet - LinkPreview to Basque (euskara)
+# Exported from translatewiki.net
+#
+# Author: Artsuaga
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - LinkPreview\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:03+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:50:28+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin description.
+msgid "UI extension for previewing thumbnails from links."
+msgstr "UI luzapena esteken thumbnailak aurreikusteko."
+
+#. TRANS: Client error displayed when the session token does not match or is not given.
+msgid "There was a problem with your session token. Try again, please."
+msgstr "Zure saio tokenarekin arazo bat egon da. Saiatu berriro, mesedez."
+
+#. TRANS: Client exception thrown when requesting a different format than JSON.
+msgid "Invalid format; only JSON supported."
+msgstr "Formatu okerrea; JSON soilik onartzen da."
+
+#. TRANS: Client exception thrown when not providing a valid URL.
+msgid "Invalid URL."
+msgstr "URL baliogabea"
diff --git a/plugins/LinkPreview/locale/fr/LC_MESSAGES/LinkPreview.po b/plugins/LinkPreview/locale/fr/LC_MESSAGES/LinkPreview.po
index da2c98170e..848b638ab3 100644
--- a/plugins/LinkPreview/locale/fr/LC_MESSAGES/LinkPreview.po
+++ b/plugins/LinkPreview/locale/fr/LC_MESSAGES/LinkPreview.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - LinkPreview to French (Français)
+# Translation of StatusNet - LinkPreview to French (français)
 # Exported from translatewiki.net
 #
 # Author: Crochet.david
@@ -11,14 +11,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LinkPreview\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:54+0000\n"
-"Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:03+0000\n"
+"Language-Team: French <https://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:11+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:28+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-linkpreview\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
diff --git a/plugins/LinkPreview/locale/gl/LC_MESSAGES/LinkPreview.po b/plugins/LinkPreview/locale/gl/LC_MESSAGES/LinkPreview.po
new file mode 100644
index 0000000000..24575a5491
--- /dev/null
+++ b/plugins/LinkPreview/locale/gl/LC_MESSAGES/LinkPreview.po
@@ -0,0 +1,40 @@
+# Translation of StatusNet - LinkPreview to Galician (galego)
+# Exported from translatewiki.net
+#
+# Author: Toliño
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - LinkPreview\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:03+0000\n"
+"Language-Team: Galician <https://translatewiki.net/wiki/Portal:gl>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:50:28+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: gl\n"
+"X-Message-Group: #out-statusnet-plugin-linkpreview\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin description.
+msgid "UI extension for previewing thumbnails from links."
+msgstr ""
+"Extensión de interface de usuario para ollar unha vista previa das "
+"miniaturas desde as ligazóns."
+
+#. TRANS: Client error displayed when the session token does not match or is not given.
+msgid "There was a problem with your session token. Try again, please."
+msgstr "Houbo un erro co seu pase. Inténteo de novo."
+
+#. TRANS: Client exception thrown when requesting a different format than JSON.
+msgid "Invalid format; only JSON supported."
+msgstr "Formato inválido; unicamente está soportado JSON."
+
+#. TRANS: Client exception thrown when not providing a valid URL.
+msgid "Invalid URL."
+msgstr "Enderezo URL inválido."
diff --git a/plugins/LinkPreview/locale/ia/LC_MESSAGES/LinkPreview.po b/plugins/LinkPreview/locale/ia/LC_MESSAGES/LinkPreview.po
index aac2a20253..f82738b071 100644
--- a/plugins/LinkPreview/locale/ia/LC_MESSAGES/LinkPreview.po
+++ b/plugins/LinkPreview/locale/ia/LC_MESSAGES/LinkPreview.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - LinkPreview to Interlingua (Interlingua)
+# Translation of StatusNet - LinkPreview to Interlingua (interlingua)
 # Exported from translatewiki.net
 #
 # Author: McDutchie
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LinkPreview\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:54+0000\n"
-"Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:03+0000\n"
+"Language-Team: Interlingua <https://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:11+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:28+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-linkpreview\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/LinkPreview/locale/it/LC_MESSAGES/LinkPreview.po b/plugins/LinkPreview/locale/it/LC_MESSAGES/LinkPreview.po
new file mode 100644
index 0000000000..e4e3d2067c
--- /dev/null
+++ b/plugins/LinkPreview/locale/it/LC_MESSAGES/LinkPreview.po
@@ -0,0 +1,39 @@
+# Translation of StatusNet - LinkPreview to Italian (italiano)
+# Exported from translatewiki.net
+#
+# Author: GreenFox
+# Author: Ximo17
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - LinkPreview\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:03+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:50:28+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin description.
+msgid "UI extension for previewing thumbnails from links."
+msgstr ""
+"Estensione dell'interfaccia utente per l'anteprima delle miniature "
+"provenienti dai link."
+
+#. TRANS: Client error displayed when the session token does not match or is not given.
+msgid "There was a problem with your session token. Try again, please."
+msgstr ""
+"Si è verificato un problema con il tuo token di sessione. Prova di nuovo."
+
+#. TRANS: Client exception thrown when requesting a different format than JSON.
+msgid "Invalid format; only JSON supported."
+msgstr "Formato non valido; soltanto JSON è supportato."
+
+#. TRANS: Client exception thrown when not providing a valid URL.
+msgid "Invalid URL."
+msgstr "URL non corretto"
diff --git a/plugins/LinkPreview/locale/mk/LC_MESSAGES/LinkPreview.po b/plugins/LinkPreview/locale/mk/LC_MESSAGES/LinkPreview.po
index 3955c1f4aa..e27381a6f4 100644
--- a/plugins/LinkPreview/locale/mk/LC_MESSAGES/LinkPreview.po
+++ b/plugins/LinkPreview/locale/mk/LC_MESSAGES/LinkPreview.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - LinkPreview to Macedonian (Македон�ки)
+# Translation of StatusNet - LinkPreview to Macedonian (македон�ки)
 # Exported from translatewiki.net
 #
 # Author: Bjankuloski06
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LinkPreview\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:54+0000\n"
-"Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:03+0000\n"
+"Language-Team: Macedonian <https://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:11+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:28+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-linkpreview\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
diff --git a/plugins/LinkPreview/locale/nl/LC_MESSAGES/LinkPreview.po b/plugins/LinkPreview/locale/nl/LC_MESSAGES/LinkPreview.po
index 336cf5cdfa..840f1817dd 100644
--- a/plugins/LinkPreview/locale/nl/LC_MESSAGES/LinkPreview.po
+++ b/plugins/LinkPreview/locale/nl/LC_MESSAGES/LinkPreview.po
@@ -10,14 +10,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LinkPreview\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:54+0000\n"
-"Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:03+0000\n"
+"Language-Team: Dutch <https://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:11+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:28+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-linkpreview\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/LinkPreview/locale/sv/LC_MESSAGES/LinkPreview.po b/plugins/LinkPreview/locale/sv/LC_MESSAGES/LinkPreview.po
index 17c7bb8475..af9dd89f49 100644
--- a/plugins/LinkPreview/locale/sv/LC_MESSAGES/LinkPreview.po
+++ b/plugins/LinkPreview/locale/sv/LC_MESSAGES/LinkPreview.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - LinkPreview to Swedish (Svenska)
+# Translation of StatusNet - LinkPreview to Swedish (svenska)
 # Exported from translatewiki.net
 #
 # Author: Lokal Profil
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LinkPreview\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:54+0000\n"
-"Language-Team: Swedish <http://translatewiki.net/wiki/Portal:sv>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:04+0000\n"
+"Language-Team: Swedish <https://translatewiki.net/wiki/Portal:sv>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:11+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:28+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: sv\n"
 "X-Message-Group: #out-statusnet-plugin-linkpreview\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/LinkPreview/locale/tl/LC_MESSAGES/LinkPreview.po b/plugins/LinkPreview/locale/tl/LC_MESSAGES/LinkPreview.po
index b31b8002b0..828621ddc5 100644
--- a/plugins/LinkPreview/locale/tl/LC_MESSAGES/LinkPreview.po
+++ b/plugins/LinkPreview/locale/tl/LC_MESSAGES/LinkPreview.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LinkPreview\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:54+0000\n"
-"Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:04+0000\n"
+"Language-Team: Tagalog <https://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:11+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:28+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-linkpreview\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/LinkPreview/locale/uk/LC_MESSAGES/LinkPreview.po b/plugins/LinkPreview/locale/uk/LC_MESSAGES/LinkPreview.po
index 19f3286cb3..2db81b7dd2 100644
--- a/plugins/LinkPreview/locale/uk/LC_MESSAGES/LinkPreview.po
+++ b/plugins/LinkPreview/locale/uk/LC_MESSAGES/LinkPreview.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - LinkPreview to Ukrainian (Україн�ька)
+# Translation of StatusNet - LinkPreview to Ukrainian (україн�ька)
 # Exported from translatewiki.net
 #
 # Author: Boogie
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LinkPreview\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:54+0000\n"
-"Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:04+0000\n"
+"Language-Team: Ukrainian <https://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:11+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:28+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-linkpreview\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
diff --git a/plugins/LinkPreview/oembedproxyaction.php b/plugins/LinkPreview/oembedproxyaction.php
index fd2f46f5fc..7e54aca570 100644
--- a/plugins/LinkPreview/oembedproxyaction.php
+++ b/plugins/LinkPreview/oembedproxyaction.php
@@ -35,7 +35,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
  *
  * This class provides an interface for our JS-side code to pull info on
  * links from other sites, using either native oEmbed, our own custom
- * handlers, or the oohEmbed.com offsite proxy service as configured.
+ * handlers, or the noembed.com offsite proxy service as configured.
  *
  * @category  oEmbed
  * @package   StatusNet
diff --git a/plugins/Linkback/locale/Linkback.pot b/plugins/Linkback/locale/Linkback.pot
index a3c8987199..158e75d3c9 100644
--- a/plugins/Linkback/locale/Linkback.pot
+++ b/plugins/Linkback/locale/Linkback.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
+"POT-Creation-Date: 2012-06-30 11:07+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"
diff --git a/plugins/Linkback/locale/ar/LC_MESSAGES/Linkback.po b/plugins/Linkback/locale/ar/LC_MESSAGES/Linkback.po
new file mode 100644
index 0000000000..3b3108937a
--- /dev/null
+++ b/plugins/Linkback/locale/ar/LC_MESSAGES/Linkback.po
@@ -0,0 +1,38 @@
+# Translation of StatusNet - Linkback to Arabic (العربية)
+# Exported from translatewiki.net
+#
+# Author: OsamaK
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Linkback\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:01+0000\n"
+"Language-Team: Arabic <https://translatewiki.net/wiki/Portal:ar>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:50:27+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: ar\n"
+"X-Message-Group: #out-statusnet-plugin-linkback\n"
+"Plural-Forms: nplurals=6; plural=(n == 0) ? 0 : ( (n == 1) ? 1 : ( (n == "
+"2) ? 2 : ( (n%100 >= 3 && n%100 <= 10) ? 3 : ( (n%100 >= 11 && n%100 <= "
+"99) ? 4 : 5 ) ) ) );\n"
+
+#. TRANS: Trackback title.
+#. TRANS: %1$s is a profile nickname, %2$s is a timestamp.
+#, php-format
+msgid "%1$s's status on %2$s"
+msgstr "حالة %1$s �ي %2$s"
+
+#. TRANS: Plugin description.
+msgid ""
+"Notify blog authors when their posts have been linked in microblog notices "
+"using <a href=\"http://www.hixie.ch/specs/pingback/pingback\">Pingback</a> "
+"or <a href=\"http://www.movabletype.org/docs/mttrackback.html\">Trackback</"
+"a> protocols."
+msgstr ""
diff --git a/plugins/Linkback/locale/ca/LC_MESSAGES/Linkback.po b/plugins/Linkback/locale/ca/LC_MESSAGES/Linkback.po
index 95b04d053e..8aeaeeb754 100644
--- a/plugins/Linkback/locale/ca/LC_MESSAGES/Linkback.po
+++ b/plugins/Linkback/locale/ca/LC_MESSAGES/Linkback.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Linkback to Catalan (Català)
+# Translation of StatusNet - Linkback to Catalan (català)
 # Exported from translatewiki.net
 #
 # Author: Toniher
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Linkback\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:52+0000\n"
-"Language-Team: Catalan <http://translatewiki.net/wiki/Portal:ca>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:01+0000\n"
+"Language-Team: Catalan <https://translatewiki.net/wiki/Portal:ca>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:08+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:27+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ca\n"
 "X-Message-Group: #out-statusnet-plugin-linkback\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/Linkback/locale/de/LC_MESSAGES/Linkback.po b/plugins/Linkback/locale/de/LC_MESSAGES/Linkback.po
index 55d2ab3661..1495d1eb3c 100644
--- a/plugins/Linkback/locale/de/LC_MESSAGES/Linkback.po
+++ b/plugins/Linkback/locale/de/LC_MESSAGES/Linkback.po
@@ -10,14 +10,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Linkback\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:52+0000\n"
-"Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:01+0000\n"
+"Language-Team: German <https://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:08+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:27+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-linkback\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/Linkback/locale/es/LC_MESSAGES/Linkback.po b/plugins/Linkback/locale/es/LC_MESSAGES/Linkback.po
index cdc011fcbc..de5f571dde 100644
--- a/plugins/Linkback/locale/es/LC_MESSAGES/Linkback.po
+++ b/plugins/Linkback/locale/es/LC_MESSAGES/Linkback.po
@@ -1,6 +1,7 @@
-# Translation of StatusNet - Linkback to Spanish (Español)
+# Translation of StatusNet - Linkback to Spanish (español)
 # Exported from translatewiki.net
 #
+# Author: Armando-Martin
 # Author: Translationista
 # --
 # This file is distributed under the same license as the StatusNet package.
@@ -9,14 +10,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Linkback\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:52+0000\n"
-"Language-Team: Spanish <http://translatewiki.net/wiki/Portal:es>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:01+0000\n"
+"Language-Team: Spanish <https://translatewiki.net/wiki/Portal:es>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:08+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:27+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-plugin-linkback\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -25,7 +26,7 @@ msgstr ""
 #. TRANS: %1$s is a profile nickname, %2$s is a timestamp.
 #, php-format
 msgid "%1$s's status on %2$s"
-msgstr ""
+msgstr "Estado de %1$s en %2$s"
 
 #. TRANS: Plugin description.
 msgid ""
diff --git a/plugins/Linkback/locale/eu/LC_MESSAGES/Linkback.po b/plugins/Linkback/locale/eu/LC_MESSAGES/Linkback.po
new file mode 100644
index 0000000000..4e5ba7ab71
--- /dev/null
+++ b/plugins/Linkback/locale/eu/LC_MESSAGES/Linkback.po
@@ -0,0 +1,37 @@
+# Translation of StatusNet - Linkback to Basque (euskara)
+# Exported from translatewiki.net
+#
+# Author: Artsuaga
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Linkback\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:01+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:50:27+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Trackback title.
+#. TRANS: %1$s is a profile nickname, %2$s is a timestamp.
+#, php-format
+msgid "%1$s's status on %2$s"
+msgstr "%1$s(r)en status-a, %2$s"
+
+#. TRANS: Plugin description.
+msgid ""
+"Notify blog authors when their posts have been linked in microblog notices "
+"using <a href=\"http://www.hixie.ch/specs/pingback/pingback\">Pingback</a> "
+"or <a href=\"http://www.movabletype.org/docs/mttrackback.html\">Trackback</"
+"a> protocols."
+msgstr ""
+"Blogetako sarrera bat estekatzen denean jakinarazi bertako egileari <a href="
+"\"http://www.hixie.ch/specs/pingback/pingback\">Pingback</a>  edo <a href="
+"\"http://www.movabletype.org/docs/mttrackback.html\">Trackback</a> "
+"protokoloak erabiliz."
diff --git a/plugins/Linkback/locale/fi/LC_MESSAGES/Linkback.po b/plugins/Linkback/locale/fi/LC_MESSAGES/Linkback.po
index b6d08ba0f0..1d707e16e1 100644
--- a/plugins/Linkback/locale/fi/LC_MESSAGES/Linkback.po
+++ b/plugins/Linkback/locale/fi/LC_MESSAGES/Linkback.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Linkback to Finnish (Suomi)
+# Translation of StatusNet - Linkback to Finnish (suomi)
 # Exported from translatewiki.net
 #
 # Author: Nike
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Linkback\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:52+0000\n"
-"Language-Team: Finnish <http://translatewiki.net/wiki/Portal:fi>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:01+0000\n"
+"Language-Team: Finnish <https://translatewiki.net/wiki/Portal:fi>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:08+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:27+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: fi\n"
 "X-Message-Group: #out-statusnet-plugin-linkback\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/Linkback/locale/fr/LC_MESSAGES/Linkback.po b/plugins/Linkback/locale/fr/LC_MESSAGES/Linkback.po
index ede6edb737..155c8c38e7 100644
--- a/plugins/Linkback/locale/fr/LC_MESSAGES/Linkback.po
+++ b/plugins/Linkback/locale/fr/LC_MESSAGES/Linkback.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Linkback to French (Français)
+# Translation of StatusNet - Linkback to French (français)
 # Exported from translatewiki.net
 #
 # Author: Od1n
@@ -10,14 +10,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Linkback\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:52+0000\n"
-"Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:02+0000\n"
+"Language-Team: French <https://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:08+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:27+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-linkback\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
diff --git a/plugins/Linkback/locale/gl/LC_MESSAGES/Linkback.po b/plugins/Linkback/locale/gl/LC_MESSAGES/Linkback.po
new file mode 100644
index 0000000000..8973333770
--- /dev/null
+++ b/plugins/Linkback/locale/gl/LC_MESSAGES/Linkback.po
@@ -0,0 +1,40 @@
+# Translation of StatusNet - Linkback to Galician (galego)
+# Exported from translatewiki.net
+#
+# Author: Toliño
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Linkback\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:02+0000\n"
+"Language-Team: Galician <https://translatewiki.net/wiki/Portal:gl>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:50:27+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: gl\n"
+"X-Message-Group: #out-statusnet-plugin-linkback\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Trackback title.
+#. TRANS: %1$s is a profile nickname, %2$s is a timestamp.
+#, php-format
+msgid "%1$s's status on %2$s"
+msgstr "Estado de %1$s en %2$s"
+
+#. TRANS: Plugin description.
+msgid ""
+"Notify blog authors when their posts have been linked in microblog notices "
+"using <a href=\"http://www.hixie.ch/specs/pingback/pingback\">Pingback</a> "
+"or <a href=\"http://www.movabletype.org/docs/mttrackback.html\">Trackback</"
+"a> protocols."
+msgstr ""
+"Notificar aos autores de blogues cando as súas entradas foron ligadas nas "
+"notas de microblogues mediante os protocolos <a href=\"http://www.hixie.ch/"
+"specs/pingback/pingback\">Pingback</a> ou <a href=\"http://www.movabletype."
+"org/docs/mttrackback.html\">Trackback</a>."
diff --git a/plugins/Linkback/locale/he/LC_MESSAGES/Linkback.po b/plugins/Linkback/locale/he/LC_MESSAGES/Linkback.po
index d9261f9e49..3e2729b870 100644
--- a/plugins/Linkback/locale/he/LC_MESSAGES/Linkback.po
+++ b/plugins/Linkback/locale/he/LC_MESSAGES/Linkback.po
@@ -1,6 +1,7 @@
 # Translation of StatusNet - Linkback to Hebrew (עברית)
 # Exported from translatewiki.net
 #
+# Author: Amire80
 # Author: YaronSh
 # --
 # This file is distributed under the same license as the StatusNet package.
@@ -9,14 +10,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Linkback\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:53+0000\n"
-"Language-Team: Hebrew <http://translatewiki.net/wiki/Portal:he>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:02+0000\n"
+"Language-Team: Hebrew <https://translatewiki.net/wiki/Portal:he>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:08+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:27+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: he\n"
 "X-Message-Group: #out-statusnet-plugin-linkback\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -25,7 +26,7 @@ msgstr ""
 #. TRANS: %1$s is a profile nickname, %2$s is a timestamp.
 #, php-format
 msgid "%1$s's status on %2$s"
-msgstr ""
+msgstr "המצב של %1$s ב־%2$s"
 
 #. TRANS: Plugin description.
 msgid ""
@@ -34,7 +35,7 @@ msgid ""
 "or <a href=\"http://www.movabletype.org/docs/mttrackback.html\">Trackback</"
 "a> protocols."
 msgstr ""
-"הודעה לכותבי בלוגי� מתי נוסף קישור לרישומי� שלה� בהודעות מיקרובלוגי� ב�מצעות "
-"הפרוטוקולי�<a href=\"http://www.hixie.ch/specs/pingback/pingback\">Pingback</"
-"a> �ו <a href=\"http://www.movabletype.org/docs/mttrackback.html"
+"הודעה לכותבי בלוגי� מתי נוסף קישור לרשומות שלה� בעדכוני מיקרובלוג ב�מצעות "
+"הפרוטוקולי� <a href=\"http://www.hixie.ch/specs/pingback/pingback"
+"\">Pingback</a> �ו <a href=\"http://www.movabletype.org/docs/mttrackback.html"
 "\">Trackback</a>."
diff --git a/plugins/Linkback/locale/ia/LC_MESSAGES/Linkback.po b/plugins/Linkback/locale/ia/LC_MESSAGES/Linkback.po
index 2140f7b88a..1bc7cef7e7 100644
--- a/plugins/Linkback/locale/ia/LC_MESSAGES/Linkback.po
+++ b/plugins/Linkback/locale/ia/LC_MESSAGES/Linkback.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Linkback to Interlingua (Interlingua)
+# Translation of StatusNet - Linkback to Interlingua (interlingua)
 # Exported from translatewiki.net
 #
 # Author: McDutchie
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Linkback\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:53+0000\n"
-"Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:02+0000\n"
+"Language-Team: Interlingua <https://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:08+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:27+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-linkback\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/Linkback/locale/id/LC_MESSAGES/Linkback.po b/plugins/Linkback/locale/id/LC_MESSAGES/Linkback.po
index 65a511af3d..894cfa6f62 100644
--- a/plugins/Linkback/locale/id/LC_MESSAGES/Linkback.po
+++ b/plugins/Linkback/locale/id/LC_MESSAGES/Linkback.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Linkback\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:53+0000\n"
-"Language-Team: Indonesian <http://translatewiki.net/wiki/Portal:id>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:02+0000\n"
+"Language-Team: Indonesian <https://translatewiki.net/wiki/Portal:id>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:08+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:27+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: id\n"
 "X-Message-Group: #out-statusnet-plugin-linkback\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
diff --git a/plugins/Linkback/locale/it/LC_MESSAGES/Linkback.po b/plugins/Linkback/locale/it/LC_MESSAGES/Linkback.po
new file mode 100644
index 0000000000..2a8fd767b5
--- /dev/null
+++ b/plugins/Linkback/locale/it/LC_MESSAGES/Linkback.po
@@ -0,0 +1,37 @@
+# Translation of StatusNet - Linkback to Italian (italiano)
+# Exported from translatewiki.net
+#
+# Author: GreenFox
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Linkback\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:02+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:50:27+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Trackback title.
+#. TRANS: %1$s is a profile nickname, %2$s is a timestamp.
+#, php-format
+msgid "%1$s's status on %2$s"
+msgstr "Stato di %1$s su %2$s"
+
+#. TRANS: Plugin description.
+msgid ""
+"Notify blog authors when their posts have been linked in microblog notices "
+"using <a href=\"http://www.hixie.ch/specs/pingback/pingback\">Pingback</a> "
+"or <a href=\"http://www.movabletype.org/docs/mttrackback.html\">Trackback</"
+"a> protocols."
+msgstr ""
+"Avvertite gli autori di blog quando i loro post sono stati linkati in "
+"comunicazioni di tipo microblog attraverso protocolli  <a href=\"http://www."
+"hixie.ch/specs/pingback/pingback\">Pingback</a> o <a href=\"http://www."
+"movabletype.org/docs/mttrackback.html\">Trackback</a>."
diff --git a/plugins/Linkback/locale/mk/LC_MESSAGES/Linkback.po b/plugins/Linkback/locale/mk/LC_MESSAGES/Linkback.po
index 685025efb4..7b82d607ae 100644
--- a/plugins/Linkback/locale/mk/LC_MESSAGES/Linkback.po
+++ b/plugins/Linkback/locale/mk/LC_MESSAGES/Linkback.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Linkback to Macedonian (Македон�ки)
+# Translation of StatusNet - Linkback to Macedonian (македон�ки)
 # Exported from translatewiki.net
 #
 # Author: Bjankuloski06
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Linkback\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:53+0000\n"
-"Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:02+0000\n"
+"Language-Team: Macedonian <https://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:08+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:27+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-linkback\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
diff --git a/plugins/Linkback/locale/nb/LC_MESSAGES/Linkback.po b/plugins/Linkback/locale/nb/LC_MESSAGES/Linkback.po
index f6b143711c..dcfd6a76f2 100644
--- a/plugins/Linkback/locale/nb/LC_MESSAGES/Linkback.po
+++ b/plugins/Linkback/locale/nb/LC_MESSAGES/Linkback.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Linkback to Norwegian (bokmål)‬ (‪Norsk (bokmål)‬)
+# Translation of StatusNet - Linkback to Norwegian Bokmål (‪norsk (bokmål)‬)
 # Exported from translatewiki.net
 #
 # Author: Nghtwlkr
@@ -9,15 +9,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Linkback\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:53+0000\n"
-"Language-Team: Norwegian (bokmål)‬ <http://translatewiki.net/wiki/Portal:no>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:02+0000\n"
+"Language-Team: Norwegian Bokmål <https://translatewiki.net/wiki/Portal:nb>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:08+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
-"X-Language-Code: no\n"
+"X-POT-Import-Date: 2011-06-05 21:50:27+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: nb\n"
 "X-Message-Group: #out-statusnet-plugin-linkback\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
diff --git a/plugins/Linkback/locale/nl/LC_MESSAGES/Linkback.po b/plugins/Linkback/locale/nl/LC_MESSAGES/Linkback.po
index b8b14efabc..8d9d2d7368 100644
--- a/plugins/Linkback/locale/nl/LC_MESSAGES/Linkback.po
+++ b/plugins/Linkback/locale/nl/LC_MESSAGES/Linkback.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Linkback\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:53+0000\n"
-"Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:02+0000\n"
+"Language-Team: Dutch <https://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:08+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:27+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-linkback\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/Linkback/locale/pt/LC_MESSAGES/Linkback.po b/plugins/Linkback/locale/pt/LC_MESSAGES/Linkback.po
index 6cf8d8e75d..9f5e172a76 100644
--- a/plugins/Linkback/locale/pt/LC_MESSAGES/Linkback.po
+++ b/plugins/Linkback/locale/pt/LC_MESSAGES/Linkback.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Linkback to Portuguese (Português)
+# Translation of StatusNet - Linkback to Portuguese (português)
 # Exported from translatewiki.net
 #
 # Author: SandroHc
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Linkback\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:53+0000\n"
-"Language-Team: Portuguese <http://translatewiki.net/wiki/Portal:pt>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:02+0000\n"
+"Language-Team: Portuguese <https://translatewiki.net/wiki/Portal:pt>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:08+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:27+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: pt\n"
 "X-Message-Group: #out-statusnet-plugin-linkback\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/Linkback/locale/ru/LC_MESSAGES/Linkback.po b/plugins/Linkback/locale/ru/LC_MESSAGES/Linkback.po
index 94a551376a..56fe73a3be 100644
--- a/plugins/Linkback/locale/ru/LC_MESSAGES/Linkback.po
+++ b/plugins/Linkback/locale/ru/LC_MESSAGES/Linkback.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Linkback to Russian (Ру��кий)
+# Translation of StatusNet - Linkback to Russian (ру��кий)
 # Exported from translatewiki.net
 #
 # Author: �лек�андр Сигачёв
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Linkback\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:53+0000\n"
-"Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:02+0000\n"
+"Language-Team: Russian <https://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:08+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:27+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-linkback\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
diff --git a/plugins/Linkback/locale/tl/LC_MESSAGES/Linkback.po b/plugins/Linkback/locale/tl/LC_MESSAGES/Linkback.po
index a27c4fbb25..38e969c155 100644
--- a/plugins/Linkback/locale/tl/LC_MESSAGES/Linkback.po
+++ b/plugins/Linkback/locale/tl/LC_MESSAGES/Linkback.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Linkback\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:53+0000\n"
-"Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:02+0000\n"
+"Language-Team: Tagalog <https://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:08+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:27+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-linkback\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/Linkback/locale/uk/LC_MESSAGES/Linkback.po b/plugins/Linkback/locale/uk/LC_MESSAGES/Linkback.po
index 6be85718fa..dd6e6207b8 100644
--- a/plugins/Linkback/locale/uk/LC_MESSAGES/Linkback.po
+++ b/plugins/Linkback/locale/uk/LC_MESSAGES/Linkback.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Linkback to Ukrainian (Україн�ька)
+# Translation of StatusNet - Linkback to Ukrainian (україн�ька)
 # Exported from translatewiki.net
 #
 # Author: Boogie
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Linkback\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:53+0000\n"
-"Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:03+0000\n"
+"Language-Team: Ukrainian <https://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:08+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:27+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-linkback\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
diff --git a/plugins/Linkback/locale/zh_CN/LC_MESSAGES/Linkback.po b/plugins/Linkback/locale/zh_CN/LC_MESSAGES/Linkback.po
index 040eba3728..d1bcc38e63 100644
--- a/plugins/Linkback/locale/zh_CN/LC_MESSAGES/Linkback.po
+++ b/plugins/Linkback/locale/zh_CN/LC_MESSAGES/Linkback.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Linkback to Simplified Chinese (‪中文(简体)‬)
+# Translation of StatusNet - Linkback to Simplified Chinese (‪中文（简体）‬)
 # Exported from translatewiki.net
 #
 # Author: ZhengYiFeng
@@ -9,15 +9,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Linkback\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:53+0000\n"
-"Language-Team: Simplified Chinese <http://translatewiki.net/wiki/Portal:zh-"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:03+0000\n"
+"Language-Team: Simplified Chinese <https://translatewiki.net/wiki/Portal:zh-"
 "hans>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:08+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:27+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: #out-statusnet-plugin-linkback\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
diff --git a/plugins/LogFilter/locale/LogFilter.pot b/plugins/LogFilter/locale/LogFilter.pot
index d5047cacb2..9c3194f257 100644
--- a/plugins/LogFilter/locale/LogFilter.pot
+++ b/plugins/LogFilter/locale/LogFilter.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
+"POT-Creation-Date: 2012-06-30 11:07+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"
diff --git a/plugins/LogFilter/locale/de/LC_MESSAGES/LogFilter.po b/plugins/LogFilter/locale/de/LC_MESSAGES/LogFilter.po
index cffdc2b7b2..15743cc57d 100644
--- a/plugins/LogFilter/locale/de/LC_MESSAGES/LogFilter.po
+++ b/plugins/LogFilter/locale/de/LC_MESSAGES/LogFilter.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LogFilter\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:55+0000\n"
-"Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:04+0000\n"
+"Language-Team: German <https://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-11 13:16:22+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:29+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-logfilter\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/LogFilter/locale/es/LC_MESSAGES/LogFilter.po b/plugins/LogFilter/locale/es/LC_MESSAGES/LogFilter.po
new file mode 100644
index 0000000000..6300e7aa3b
--- /dev/null
+++ b/plugins/LogFilter/locale/es/LC_MESSAGES/LogFilter.po
@@ -0,0 +1,25 @@
+# Translation of StatusNet - LogFilter to Spanish (español)
+# Exported from translatewiki.net
+#
+# Author: Armando-Martin
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - LogFilter\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:04+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:50:29+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin description.
+msgid "Provides server-side setting to filter log output by type or keyword."
+msgstr ""
+"Proporciona la configuración de servidor para filtrar el registro de salida "
+"por tipo o palabra clave."
diff --git a/plugins/LogFilter/locale/eu/LC_MESSAGES/LogFilter.po b/plugins/LogFilter/locale/eu/LC_MESSAGES/LogFilter.po
new file mode 100644
index 0000000000..9c3073561d
--- /dev/null
+++ b/plugins/LogFilter/locale/eu/LC_MESSAGES/LogFilter.po
@@ -0,0 +1,25 @@
+# Translation of StatusNet - LogFilter to Basque (euskara)
+# Exported from translatewiki.net
+#
+# Author: Artsuaga
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - LogFilter\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:04+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:50:29+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin description.
+msgid "Provides server-side setting to filter log output by type or keyword."
+msgstr ""
+"Zerbitzari aukerak ezartzen ditu, moeta edo gako hitz bidez erregistroaren "
+"irteera iragazteko."
diff --git a/plugins/LogFilter/locale/fi/LC_MESSAGES/LogFilter.po b/plugins/LogFilter/locale/fi/LC_MESSAGES/LogFilter.po
index 01000164b0..07e5f657f8 100644
--- a/plugins/LogFilter/locale/fi/LC_MESSAGES/LogFilter.po
+++ b/plugins/LogFilter/locale/fi/LC_MESSAGES/LogFilter.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - LogFilter to Finnish (Suomi)
+# Translation of StatusNet - LogFilter to Finnish (suomi)
 # Exported from translatewiki.net
 #
 # Author: Nike
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LogFilter\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:55+0000\n"
-"Language-Team: Finnish <http://translatewiki.net/wiki/Portal:fi>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:04+0000\n"
+"Language-Team: Finnish <https://translatewiki.net/wiki/Portal:fi>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-11 13:16:22+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:29+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: fi\n"
 "X-Message-Group: #out-statusnet-plugin-logfilter\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/LogFilter/locale/fr/LC_MESSAGES/LogFilter.po b/plugins/LogFilter/locale/fr/LC_MESSAGES/LogFilter.po
index 5114e50bce..2355e8772b 100644
--- a/plugins/LogFilter/locale/fr/LC_MESSAGES/LogFilter.po
+++ b/plugins/LogFilter/locale/fr/LC_MESSAGES/LogFilter.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - LogFilter to French (Français)
+# Translation of StatusNet - LogFilter to French (français)
 # Exported from translatewiki.net
 #
 # Author: Peter17
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LogFilter\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:55+0000\n"
-"Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:04+0000\n"
+"Language-Team: French <https://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-11 13:16:22+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:29+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-logfilter\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
diff --git a/plugins/LogFilter/locale/gl/LC_MESSAGES/LogFilter.po b/plugins/LogFilter/locale/gl/LC_MESSAGES/LogFilter.po
new file mode 100644
index 0000000000..e34f1968a1
--- /dev/null
+++ b/plugins/LogFilter/locale/gl/LC_MESSAGES/LogFilter.po
@@ -0,0 +1,28 @@
+# Translation of StatusNet - LogFilter to Galician (galego)
+# Exported from translatewiki.net
+#
+# Author: Toliño
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - LogFilter\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:04+0000\n"
+"Language-Team: Galician <https://translatewiki.net/wiki/Portal:gl>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:50:29+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: gl\n"
+"X-Message-Group: #out-statusnet-plugin-logfilter\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin description.
+msgid "Provides server-side setting to filter log output by type or keyword."
+msgstr ""
+"Proporciona unha configuración do servidor para filtrar a saída do rexistro "
+"por tipo ou palabra clave."
diff --git a/plugins/LogFilter/locale/he/LC_MESSAGES/LogFilter.po b/plugins/LogFilter/locale/he/LC_MESSAGES/LogFilter.po
index b0d3246152..5f14652dcb 100644
--- a/plugins/LogFilter/locale/he/LC_MESSAGES/LogFilter.po
+++ b/plugins/LogFilter/locale/he/LC_MESSAGES/LogFilter.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LogFilter\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:55+0000\n"
-"Language-Team: Hebrew <http://translatewiki.net/wiki/Portal:he>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:04+0000\n"
+"Language-Team: Hebrew <https://translatewiki.net/wiki/Portal:he>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-11 13:16:22+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:29+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: he\n"
 "X-Message-Group: #out-statusnet-plugin-logfilter\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/LogFilter/locale/ia/LC_MESSAGES/LogFilter.po b/plugins/LogFilter/locale/ia/LC_MESSAGES/LogFilter.po
index 0366903744..7b4617ed3e 100644
--- a/plugins/LogFilter/locale/ia/LC_MESSAGES/LogFilter.po
+++ b/plugins/LogFilter/locale/ia/LC_MESSAGES/LogFilter.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - LogFilter to Interlingua (Interlingua)
+# Translation of StatusNet - LogFilter to Interlingua (interlingua)
 # Exported from translatewiki.net
 #
 # Author: McDutchie
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LogFilter\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:55+0000\n"
-"Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:04+0000\n"
+"Language-Team: Interlingua <https://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-11 13:16:22+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:29+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-logfilter\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/LogFilter/locale/it/LC_MESSAGES/LogFilter.po b/plugins/LogFilter/locale/it/LC_MESSAGES/LogFilter.po
new file mode 100644
index 0000000000..53702fdac7
--- /dev/null
+++ b/plugins/LogFilter/locale/it/LC_MESSAGES/LogFilter.po
@@ -0,0 +1,25 @@
+# Translation of StatusNet - LogFilter to Italian (italiano)
+# Exported from translatewiki.net
+#
+# Author: GreenFox
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - LogFilter\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:04+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:50:29+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin description.
+msgid "Provides server-side setting to filter log output by type or keyword."
+msgstr ""
+"Fornisce un impostazione da parte del server per filtrare il log di output "
+"per tipo o per parola chiave."
diff --git a/plugins/LogFilter/locale/mk/LC_MESSAGES/LogFilter.po b/plugins/LogFilter/locale/mk/LC_MESSAGES/LogFilter.po
index 0a14f261d8..879b0ef1ec 100644
--- a/plugins/LogFilter/locale/mk/LC_MESSAGES/LogFilter.po
+++ b/plugins/LogFilter/locale/mk/LC_MESSAGES/LogFilter.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - LogFilter to Macedonian (Македон�ки)
+# Translation of StatusNet - LogFilter to Macedonian (македон�ки)
 # Exported from translatewiki.net
 #
 # Author: Bjankuloski06
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LogFilter\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:55+0000\n"
-"Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:05+0000\n"
+"Language-Team: Macedonian <https://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-11 13:16:22+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:29+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-logfilter\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
diff --git a/plugins/LogFilter/locale/nl/LC_MESSAGES/LogFilter.po b/plugins/LogFilter/locale/nl/LC_MESSAGES/LogFilter.po
index 03d6e9be3e..fb475f0654 100644
--- a/plugins/LogFilter/locale/nl/LC_MESSAGES/LogFilter.po
+++ b/plugins/LogFilter/locale/nl/LC_MESSAGES/LogFilter.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LogFilter\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:55+0000\n"
-"Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:05+0000\n"
+"Language-Team: Dutch <https://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-11 13:16:22+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:29+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-logfilter\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/LogFilter/locale/pt/LC_MESSAGES/LogFilter.po b/plugins/LogFilter/locale/pt/LC_MESSAGES/LogFilter.po
index 0327b65005..f4f2d6daa7 100644
--- a/plugins/LogFilter/locale/pt/LC_MESSAGES/LogFilter.po
+++ b/plugins/LogFilter/locale/pt/LC_MESSAGES/LogFilter.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - LogFilter to Portuguese (Português)
+# Translation of StatusNet - LogFilter to Portuguese (português)
 # Exported from translatewiki.net
 #
 # Author: Hamilton Abreu
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LogFilter\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:55+0000\n"
-"Language-Team: Portuguese <http://translatewiki.net/wiki/Portal:pt>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:05+0000\n"
+"Language-Team: Portuguese <https://translatewiki.net/wiki/Portal:pt>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-11 13:16:22+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:29+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: pt\n"
 "X-Message-Group: #out-statusnet-plugin-logfilter\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/LogFilter/locale/ru/LC_MESSAGES/LogFilter.po b/plugins/LogFilter/locale/ru/LC_MESSAGES/LogFilter.po
index 0435371c25..d12f89ec53 100644
--- a/plugins/LogFilter/locale/ru/LC_MESSAGES/LogFilter.po
+++ b/plugins/LogFilter/locale/ru/LC_MESSAGES/LogFilter.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - LogFilter to Russian (Ру��кий)
+# Translation of StatusNet - LogFilter to Russian (ру��кий)
 # Exported from translatewiki.net
 #
 # Author: Lockal
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LogFilter\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:55+0000\n"
-"Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:05+0000\n"
+"Language-Team: Russian <https://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-11 13:16:22+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:29+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-logfilter\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
diff --git a/plugins/LogFilter/locale/tl/LC_MESSAGES/LogFilter.po b/plugins/LogFilter/locale/tl/LC_MESSAGES/LogFilter.po
index 681161b928..16793ee6d4 100644
--- a/plugins/LogFilter/locale/tl/LC_MESSAGES/LogFilter.po
+++ b/plugins/LogFilter/locale/tl/LC_MESSAGES/LogFilter.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LogFilter\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:56+0000\n"
-"Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:05+0000\n"
+"Language-Team: Tagalog <https://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-11 13:16:22+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:29+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-logfilter\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/LogFilter/locale/uk/LC_MESSAGES/LogFilter.po b/plugins/LogFilter/locale/uk/LC_MESSAGES/LogFilter.po
index f2c6f806c7..9d1abb6c62 100644
--- a/plugins/LogFilter/locale/uk/LC_MESSAGES/LogFilter.po
+++ b/plugins/LogFilter/locale/uk/LC_MESSAGES/LogFilter.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - LogFilter to Ukrainian (Україн�ька)
+# Translation of StatusNet - LogFilter to Ukrainian (україн�ька)
 # Exported from translatewiki.net
 #
 # Author: Boogie
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LogFilter\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:56+0000\n"
-"Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:05+0000\n"
+"Language-Team: Ukrainian <https://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-11 13:16:22+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:29+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-logfilter\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
diff --git a/plugins/LogFilter/locale/zh_CN/LC_MESSAGES/LogFilter.po b/plugins/LogFilter/locale/zh_CN/LC_MESSAGES/LogFilter.po
index 364309f52f..e26968fcfe 100644
--- a/plugins/LogFilter/locale/zh_CN/LC_MESSAGES/LogFilter.po
+++ b/plugins/LogFilter/locale/zh_CN/LC_MESSAGES/LogFilter.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - LogFilter to Simplified Chinese (‪中文(简体)‬)
+# Translation of StatusNet - LogFilter to Simplified Chinese (‪中文（简体）‬)
 # Exported from translatewiki.net
 #
 # Author: Hydra
@@ -9,15 +9,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LogFilter\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:56+0000\n"
-"Language-Team: Simplified Chinese <http://translatewiki.net/wiki/Portal:zh-"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:05+0000\n"
+"Language-Team: Simplified Chinese <https://translatewiki.net/wiki/Portal:zh-"
 "hans>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-11 13:16:22+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:29+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: #out-statusnet-plugin-logfilter\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
diff --git a/plugins/Mapstraction/locale/Mapstraction.pot b/plugins/Mapstraction/locale/Mapstraction.pot
index 9bc9734985..37396d5851 100644
--- a/plugins/Mapstraction/locale/Mapstraction.pot
+++ b/plugins/Mapstraction/locale/Mapstraction.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
+"POT-Creation-Date: 2012-06-30 11:07+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"
diff --git a/plugins/Mapstraction/locale/br/LC_MESSAGES/Mapstraction.po b/plugins/Mapstraction/locale/br/LC_MESSAGES/Mapstraction.po
index 47421fbfeb..234372ea88 100644
--- a/plugins/Mapstraction/locale/br/LC_MESSAGES/Mapstraction.po
+++ b/plugins/Mapstraction/locale/br/LC_MESSAGES/Mapstraction.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Mapstraction to Breton (Brezhoneg)
+# Translation of StatusNet - Mapstraction to Breton (brezhoneg)
 # Exported from translatewiki.net
 #
 # Author: Y-M D
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Mapstraction\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:57+0000\n"
-"Language-Team: Breton <http://translatewiki.net/wiki/Portal:br>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:05+0000\n"
+"Language-Team: Breton <https://translatewiki.net/wiki/Portal:br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:16+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:30+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-mapstraction\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
diff --git a/plugins/Mapstraction/locale/ca/LC_MESSAGES/Mapstraction.po b/plugins/Mapstraction/locale/ca/LC_MESSAGES/Mapstraction.po
index 1a024075c9..61a4e2e5bb 100644
--- a/plugins/Mapstraction/locale/ca/LC_MESSAGES/Mapstraction.po
+++ b/plugins/Mapstraction/locale/ca/LC_MESSAGES/Mapstraction.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Mapstraction to Catalan (Català)
+# Translation of StatusNet - Mapstraction to Catalan (català)
 # Exported from translatewiki.net
 #
 # Author: Toniher
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Mapstraction\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:57+0000\n"
-"Language-Team: Catalan <http://translatewiki.net/wiki/Portal:ca>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:05+0000\n"
+"Language-Team: Catalan <https://translatewiki.net/wiki/Portal:ca>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:16+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:30+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ca\n"
 "X-Message-Group: #out-statusnet-plugin-mapstraction\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -39,13 +39,13 @@ msgstr ""
 #. TRANS: %s is a user nickname.
 #, php-format
 msgid "%s friends map"
-msgstr ""
+msgstr "Mapa d'amics de %s"
 
 #. TRANS: Page title.
 #. TRANS: %1$s is a user nickname, %2$d is a page number.
 #, php-format
 msgid "%1$s friends map, page %2$d"
-msgstr ""
+msgstr "Mapa d'amics de %1$s, pàgina %2$d"
 
 #. TRANS: Client error displayed when referring to a non-existing user.
 msgid "No such user."
diff --git a/plugins/Mapstraction/locale/de/LC_MESSAGES/Mapstraction.po b/plugins/Mapstraction/locale/de/LC_MESSAGES/Mapstraction.po
index 9a61515445..862d0adec0 100644
--- a/plugins/Mapstraction/locale/de/LC_MESSAGES/Mapstraction.po
+++ b/plugins/Mapstraction/locale/de/LC_MESSAGES/Mapstraction.po
@@ -11,14 +11,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Mapstraction\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:57+0000\n"
-"Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:05+0000\n"
+"Language-Team: German <https://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:16+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:30+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-mapstraction\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/Mapstraction/locale/es/LC_MESSAGES/Mapstraction.po b/plugins/Mapstraction/locale/es/LC_MESSAGES/Mapstraction.po
index 26c996a5cf..b12608377c 100644
--- a/plugins/Mapstraction/locale/es/LC_MESSAGES/Mapstraction.po
+++ b/plugins/Mapstraction/locale/es/LC_MESSAGES/Mapstraction.po
@@ -1,6 +1,7 @@
-# Translation of StatusNet - Mapstraction to Spanish (Español)
-# Expored from translatewiki.net
+# Translation of StatusNet - Mapstraction to Spanish (español)
+# Exported from translatewiki.net
 #
+# Author: Armando-Martin
 # Author: Locos epraix
 # Author: Peter17
 # --
@@ -10,56 +11,56 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Mapstraction\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:14+0000\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:05+0000\n"
 "Language-Team: Spanish <http://translatewiki.net/wiki/Portal:es>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2010-11-30 20:40:37+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:30+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-plugin-mapstraction\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: MapstractionPlugin.php:187
+#. TRANS: Header for Map widget that displays a map with geodata for notices.
 msgid "Map"
 msgstr "Mapa"
 
 #. TRANS: Clickable item to allow opening the map in full size.
-#: MapstractionPlugin.php:199
 msgid "Full size"
-msgstr ""
+msgstr "Tamaño completo"
 
-#: MapstractionPlugin.php:211
+#. TRANS: Plugin description.
 msgid ""
 "Show maps of users' and friends' notices with <a href=\"http://www."
 "mapstraction.com/\">Mapstraction</a>."
 msgstr ""
-
-#: map.php:72
-msgid "No such user."
-msgstr ""
-
-#: map.php:79
-msgid "User has no profile."
-msgstr "Usuario no tiene perfil."
+"Mostrar mapas de las notas de los usuarios y amigos con <a href=\"http://www."
+"mapstraction.com/\">Mapstraction</a>."
 
 #. TRANS: Page title.
 #. TRANS: %s is a user nickname.
-#: allmap.php:69
 #, php-format
 msgid "%s friends map"
-msgstr ""
+msgstr "Mapa de los amigos de %s"
 
 #. TRANS: Page title.
 #. TRANS: %1$s is a user nickname, %2$d is a page number.
-#: allmap.php:75
 #, php-format
 msgid "%1$s friends map, page %2$d"
-msgstr ""
+msgstr "Mapa de los amigos de %1$s, página %2$d"
 
-#: usermap.php:68
+#. TRANS: Client error displayed when referring to a non-existing user.
+msgid "No such user."
+msgstr "No existe ese usuario."
+
+#. TRANS: Error message displayed when referring to a user without a profile.
+msgid "User has no profile."
+msgstr "Usuario no tiene perfil."
+
+#. TRANS: Title for map widget.
+#. TRANS: %s is a user name.
 #, php-format
-msgid "%s map, page %d"
-msgstr ""
+msgid "%s map"
+msgstr "Mapa de %s"
diff --git a/plugins/Mapstraction/locale/eu/LC_MESSAGES/Mapstraction.po b/plugins/Mapstraction/locale/eu/LC_MESSAGES/Mapstraction.po
new file mode 100644
index 0000000000..e3d8f92c11
--- /dev/null
+++ b/plugins/Mapstraction/locale/eu/LC_MESSAGES/Mapstraction.po
@@ -0,0 +1,61 @@
+# Translation of StatusNet - Mapstraction to Basque (euskara)
+# Exported from translatewiki.net
+#
+# Author: Artsuaga
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Mapstraction\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:05+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:50:30+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Header for Map widget that displays a map with geodata for notices.
+msgid "Map"
+msgstr "Mapa"
+
+#. TRANS: Clickable item to allow opening the map in full size.
+msgid "Full size"
+msgstr "Tamaina osoa"
+
+#. TRANS: Plugin description.
+msgid ""
+"Show maps of users' and friends' notices with <a href=\"http://www."
+"mapstraction.com/\">Mapstraction</a>."
+msgstr ""
+"Erakutsi erabiltzaile eta lagunen ohar mapak <a href=\"http://www."
+"mapstraction.com/\">Mapstraction</a> bidez."
+
+#. TRANS: Page title.
+#. TRANS: %s is a user nickname.
+#, php-format
+msgid "%s friends map"
+msgstr "%s(r)en lagun mapa."
+
+#. TRANS: Page title.
+#. TRANS: %1$s is a user nickname, %2$d is a page number.
+#, php-format
+msgid "%1$s friends map, page %2$d"
+msgstr "%1$s(r)en lagun mapa., %2$d. orria"
+
+#. TRANS: Client error displayed when referring to a non-existing user.
+msgid "No such user."
+msgstr "Erabiltzaile hori ez dago."
+
+#. TRANS: Error message displayed when referring to a user without a profile.
+msgid "User has no profile."
+msgstr "Erabiltzaileak ez du profilik."
+
+#. TRANS: Title for map widget.
+#. TRANS: %s is a user name.
+#, php-format
+msgid "%s map"
+msgstr "%s(r)en mapa"
diff --git a/plugins/Mapstraction/locale/fi/LC_MESSAGES/Mapstraction.po b/plugins/Mapstraction/locale/fi/LC_MESSAGES/Mapstraction.po
index 2eaa5827f7..d4888d6dea 100644
--- a/plugins/Mapstraction/locale/fi/LC_MESSAGES/Mapstraction.po
+++ b/plugins/Mapstraction/locale/fi/LC_MESSAGES/Mapstraction.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Mapstraction to Finnish (Suomi)
+# Translation of StatusNet - Mapstraction to Finnish (suomi)
 # Exported from translatewiki.net
 #
 # Author: Nike
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Mapstraction\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:57+0000\n"
-"Language-Team: Finnish <http://translatewiki.net/wiki/Portal:fi>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:06+0000\n"
+"Language-Team: Finnish <https://translatewiki.net/wiki/Portal:fi>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:16+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:30+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: fi\n"
 "X-Message-Group: #out-statusnet-plugin-mapstraction\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/Mapstraction/locale/fr/LC_MESSAGES/Mapstraction.po b/plugins/Mapstraction/locale/fr/LC_MESSAGES/Mapstraction.po
index 2d758ec6c7..ffceb1bfe9 100644
--- a/plugins/Mapstraction/locale/fr/LC_MESSAGES/Mapstraction.po
+++ b/plugins/Mapstraction/locale/fr/LC_MESSAGES/Mapstraction.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Mapstraction to French (Français)
+# Translation of StatusNet - Mapstraction to French (français)
 # Exported from translatewiki.net
 #
 # Author: Crochet.david
@@ -11,14 +11,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Mapstraction\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:57+0000\n"
-"Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:06+0000\n"
+"Language-Team: French <https://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:16+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:30+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-mapstraction\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
diff --git a/plugins/Mapstraction/locale/fur/LC_MESSAGES/Mapstraction.po b/plugins/Mapstraction/locale/fur/LC_MESSAGES/Mapstraction.po
index c66a094e02..e75b6314b6 100644
--- a/plugins/Mapstraction/locale/fur/LC_MESSAGES/Mapstraction.po
+++ b/plugins/Mapstraction/locale/fur/LC_MESSAGES/Mapstraction.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Mapstraction to Friulian (Furlan)
+# Translation of StatusNet - Mapstraction to Friulian (furlan)
 # Exported from translatewiki.net
 #
 # Author: Klenje
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Mapstraction\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:57+0000\n"
-"Language-Team: Friulian <http://translatewiki.net/wiki/Portal:fur>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:06+0000\n"
+"Language-Team: Friulian <https://translatewiki.net/wiki/Portal:fur>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:16+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:30+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: fur\n"
 "X-Message-Group: #out-statusnet-plugin-mapstraction\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/Mapstraction/locale/gl/LC_MESSAGES/Mapstraction.po b/plugins/Mapstraction/locale/gl/LC_MESSAGES/Mapstraction.po
index 1b45083ac8..cba3cc657e 100644
--- a/plugins/Mapstraction/locale/gl/LC_MESSAGES/Mapstraction.po
+++ b/plugins/Mapstraction/locale/gl/LC_MESSAGES/Mapstraction.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Mapstraction to Galician (Galego)
+# Translation of StatusNet - Mapstraction to Galician (galego)
 # Exported from translatewiki.net
 #
 # Author: Toliño
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Mapstraction\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:57+0000\n"
-"Language-Team: Galician <http://translatewiki.net/wiki/Portal:gl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:06+0000\n"
+"Language-Team: Galician <https://translatewiki.net/wiki/Portal:gl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:16+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:30+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: gl\n"
 "X-Message-Group: #out-statusnet-plugin-mapstraction\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -34,18 +34,20 @@ msgid ""
 "Show maps of users' and friends' notices with <a href=\"http://www."
 "mapstraction.com/\">Mapstraction</a>."
 msgstr ""
+"Mostra mapas das notas dos usuarios e amigos con <a href=\"http://www."
+"mapstraction.com/\">Mapstraction</a>."
 
 #. TRANS: Page title.
 #. TRANS: %s is a user nickname.
 #, php-format
 msgid "%s friends map"
-msgstr ""
+msgstr "Mapa dos amigos de %s"
 
 #. TRANS: Page title.
 #. TRANS: %1$s is a user nickname, %2$d is a page number.
 #, php-format
 msgid "%1$s friends map, page %2$d"
-msgstr ""
+msgstr "Mapa dos amigos de %1$s, páxina %2$d"
 
 #. TRANS: Client error displayed when referring to a non-existing user.
 msgid "No such user."
@@ -59,4 +61,4 @@ msgstr "O usuario non ten perfil."
 #. TRANS: %s is a user name.
 #, php-format
 msgid "%s map"
-msgstr ""
+msgstr "Mapa de %s"
diff --git a/plugins/Mapstraction/locale/hu/LC_MESSAGES/Mapstraction.po b/plugins/Mapstraction/locale/hu/LC_MESSAGES/Mapstraction.po
index 0d20924c7e..7c2140580c 100644
--- a/plugins/Mapstraction/locale/hu/LC_MESSAGES/Mapstraction.po
+++ b/plugins/Mapstraction/locale/hu/LC_MESSAGES/Mapstraction.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Mapstraction to Hungarian (Magyar)
+# Translation of StatusNet - Mapstraction to Hungarian (magyar)
 # Exported from translatewiki.net
 #
 # Author: Dani
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Mapstraction\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:57+0000\n"
-"Language-Team: Hungarian <http://translatewiki.net/wiki/Portal:hu>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:06+0000\n"
+"Language-Team: Hungarian <https://translatewiki.net/wiki/Portal:hu>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:16+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:30+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: hu\n"
 "X-Message-Group: #out-statusnet-plugin-mapstraction\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/Mapstraction/locale/ia/LC_MESSAGES/Mapstraction.po b/plugins/Mapstraction/locale/ia/LC_MESSAGES/Mapstraction.po
index c7cd529493..aae7c47230 100644
--- a/plugins/Mapstraction/locale/ia/LC_MESSAGES/Mapstraction.po
+++ b/plugins/Mapstraction/locale/ia/LC_MESSAGES/Mapstraction.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Mapstraction to Interlingua (Interlingua)
+# Translation of StatusNet - Mapstraction to Interlingua (interlingua)
 # Exported from translatewiki.net
 #
 # Author: McDutchie
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Mapstraction\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:57+0000\n"
-"Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:06+0000\n"
+"Language-Team: Interlingua <https://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:16+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:30+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-mapstraction\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/Mapstraction/locale/it/LC_MESSAGES/Mapstraction.po b/plugins/Mapstraction/locale/it/LC_MESSAGES/Mapstraction.po
new file mode 100644
index 0000000000..e9d0af4c75
--- /dev/null
+++ b/plugins/Mapstraction/locale/it/LC_MESSAGES/Mapstraction.po
@@ -0,0 +1,62 @@
+# Translation of StatusNet - Mapstraction to Italian (italiano)
+# Exported from translatewiki.net
+#
+# Author: GreenFox
+# Author: Od1n
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Mapstraction\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:06+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:50:30+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Header for Map widget that displays a map with geodata for notices.
+msgid "Map"
+msgstr "Mappa"
+
+#. TRANS: Clickable item to allow opening the map in full size.
+msgid "Full size"
+msgstr "Dimensione massima"
+
+#. TRANS: Plugin description.
+msgid ""
+"Show maps of users' and friends' notices with <a href=\"http://www."
+"mapstraction.com/\">Mapstraction</a>."
+msgstr ""
+"Mostra la mappa degli utenti e le comunicazioni degli amici con <a href="
+"\"http://www.mapstraction.com/\">Mapstraction</a>."
+
+#. TRANS: Page title.
+#. TRANS: %s is a user nickname.
+#, php-format
+msgid "%s friends map"
+msgstr "Mappa degli amici di %s"
+
+#. TRANS: Page title.
+#. TRANS: %1$s is a user nickname, %2$d is a page number.
+#, php-format
+msgid "%1$s friends map, page %2$d"
+msgstr "Mappa degli amici di %1$s, pagina %2$d"
+
+#. TRANS: Client error displayed when referring to a non-existing user.
+msgid "No such user."
+msgstr "Utente inesistente."
+
+#. TRANS: Error message displayed when referring to a user without a profile.
+msgid "User has no profile."
+msgstr "L'utente non ha un profilo."
+
+#. TRANS: Title for map widget.
+#. TRANS: %s is a user name.
+#, php-format
+msgid "%s map"
+msgstr "Mappa di %s"
diff --git a/plugins/Mapstraction/locale/lb/LC_MESSAGES/Mapstraction.po b/plugins/Mapstraction/locale/lb/LC_MESSAGES/Mapstraction.po
index 55ae77d98b..ea9cab0b11 100644
--- a/plugins/Mapstraction/locale/lb/LC_MESSAGES/Mapstraction.po
+++ b/plugins/Mapstraction/locale/lb/LC_MESSAGES/Mapstraction.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Mapstraction\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:57+0000\n"
-"Language-Team: Luxembourgish <http://translatewiki.net/wiki/Portal:lb>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:06+0000\n"
+"Language-Team: Luxembourgish <https://translatewiki.net/wiki/Portal:lb>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:16+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:30+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: lb\n"
 "X-Message-Group: #out-statusnet-plugin-mapstraction\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -59,4 +59,4 @@ msgstr "Benotzer huet kee Profil."
 #. TRANS: %s is a user name.
 #, php-format
 msgid "%s map"
-msgstr ""
+msgstr "%s Kaart"
diff --git a/plugins/Mapstraction/locale/mk/LC_MESSAGES/Mapstraction.po b/plugins/Mapstraction/locale/mk/LC_MESSAGES/Mapstraction.po
index 1cfbfdfc2f..47c7d5e140 100644
--- a/plugins/Mapstraction/locale/mk/LC_MESSAGES/Mapstraction.po
+++ b/plugins/Mapstraction/locale/mk/LC_MESSAGES/Mapstraction.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Mapstraction to Macedonian (Македон�ки)
+# Translation of StatusNet - Mapstraction to Macedonian (македон�ки)
 # Exported from translatewiki.net
 #
 # Author: Bjankuloski06
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Mapstraction\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:57+0000\n"
-"Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:06+0000\n"
+"Language-Team: Macedonian <https://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:16+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:30+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-mapstraction\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
diff --git a/plugins/Mapstraction/locale/nb/LC_MESSAGES/Mapstraction.po b/plugins/Mapstraction/locale/nb/LC_MESSAGES/Mapstraction.po
index ad8c5cda05..062e51abfb 100644
--- a/plugins/Mapstraction/locale/nb/LC_MESSAGES/Mapstraction.po
+++ b/plugins/Mapstraction/locale/nb/LC_MESSAGES/Mapstraction.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Mapstraction to Norwegian (bokmål)‬ (‪Norsk (bokmål)‬)
+# Translation of StatusNet - Mapstraction to Norwegian Bokmål (‪norsk (bokmål)‬)
 # Exported from translatewiki.net
 #
 # Author: Nghtwlkr
@@ -9,15 +9,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Mapstraction\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:58+0000\n"
-"Language-Team: Norwegian (bokmål)‬ <http://translatewiki.net/wiki/Portal:no>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:06+0000\n"
+"Language-Team: Norwegian Bokmål <https://translatewiki.net/wiki/Portal:nb>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:16+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
-"X-Language-Code: no\n"
+"X-POT-Import-Date: 2011-06-05 21:50:30+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: nb\n"
 "X-Message-Group: #out-statusnet-plugin-mapstraction\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
@@ -59,6 +59,6 @@ msgstr "Bruker har ingen profil."
 
 #. TRANS: Title for map widget.
 #. TRANS: %s is a user name.
-#, fuzzy, php-format
+#, php-format
 msgid "%s map"
-msgstr "%s vennekart"
+msgstr "Kart for %s"
diff --git a/plugins/Mapstraction/locale/nl/LC_MESSAGES/Mapstraction.po b/plugins/Mapstraction/locale/nl/LC_MESSAGES/Mapstraction.po
index 752cbe7603..e1da3bfbda 100644
--- a/plugins/Mapstraction/locale/nl/LC_MESSAGES/Mapstraction.po
+++ b/plugins/Mapstraction/locale/nl/LC_MESSAGES/Mapstraction.po
@@ -10,14 +10,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Mapstraction\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:57+0000\n"
-"Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:06+0000\n"
+"Language-Team: Dutch <https://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:16+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:30+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-mapstraction\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/Mapstraction/locale/ru/LC_MESSAGES/Mapstraction.po b/plugins/Mapstraction/locale/ru/LC_MESSAGES/Mapstraction.po
index 48993d563d..3ab3e3a6a1 100644
--- a/plugins/Mapstraction/locale/ru/LC_MESSAGES/Mapstraction.po
+++ b/plugins/Mapstraction/locale/ru/LC_MESSAGES/Mapstraction.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Mapstraction to Russian (Ру��кий)
+# Translation of StatusNet - Mapstraction to Russian (ру��кий)
 # Exported from translatewiki.net
 #
 # Author: Eleferen
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Mapstraction\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:58+0000\n"
-"Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:07+0000\n"
+"Language-Team: Russian <https://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:16+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:30+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-mapstraction\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
diff --git a/plugins/Mapstraction/locale/sv/LC_MESSAGES/Mapstraction.po b/plugins/Mapstraction/locale/sv/LC_MESSAGES/Mapstraction.po
index 19d0e0e929..4a254b269e 100644
--- a/plugins/Mapstraction/locale/sv/LC_MESSAGES/Mapstraction.po
+++ b/plugins/Mapstraction/locale/sv/LC_MESSAGES/Mapstraction.po
@@ -1,7 +1,8 @@
-# Translation of StatusNet - Mapstraction to Swedish (Svenska)
+# Translation of StatusNet - Mapstraction to Swedish (svenska)
 # Exported from translatewiki.net
 #
 # Author: Jamminjohn
+# Author: WikiPhoenix
 # --
 # This file is distributed under the same license as the StatusNet package.
 #
@@ -9,14 +10,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Mapstraction\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:58+0000\n"
-"Language-Team: Swedish <http://translatewiki.net/wiki/Portal:sv>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:07+0000\n"
+"Language-Team: Swedish <https://translatewiki.net/wiki/Portal:sv>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:16+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:30+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: sv\n"
 "X-Message-Group: #out-statusnet-plugin-mapstraction\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -59,6 +60,6 @@ msgstr "Användaren har ingen profil."
 
 #. TRANS: Title for map widget.
 #. TRANS: %s is a user name.
-#, fuzzy, php-format
+#, php-format
 msgid "%s map"
-msgstr "%s vänkarta"
+msgstr "%s karta"
diff --git a/plugins/Mapstraction/locale/ta/LC_MESSAGES/Mapstraction.po b/plugins/Mapstraction/locale/ta/LC_MESSAGES/Mapstraction.po
index dd95a48faa..c32ac2b65e 100644
--- a/plugins/Mapstraction/locale/ta/LC_MESSAGES/Mapstraction.po
+++ b/plugins/Mapstraction/locale/ta/LC_MESSAGES/Mapstraction.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Mapstraction\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:58+0000\n"
-"Language-Team: Tamil <http://translatewiki.net/wiki/Portal:ta>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:07+0000\n"
+"Language-Team: Tamil <https://translatewiki.net/wiki/Portal:ta>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:16+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:30+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ta\n"
 "X-Message-Group: #out-statusnet-plugin-mapstraction\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/Mapstraction/locale/te/LC_MESSAGES/Mapstraction.po b/plugins/Mapstraction/locale/te/LC_MESSAGES/Mapstraction.po
index e1bfe3a740..c9235fbeae 100644
--- a/plugins/Mapstraction/locale/te/LC_MESSAGES/Mapstraction.po
+++ b/plugins/Mapstraction/locale/te/LC_MESSAGES/Mapstraction.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Mapstraction\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:58+0000\n"
-"Language-Team: Telugu <http://translatewiki.net/wiki/Portal:te>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:07+0000\n"
+"Language-Team: Telugu <https://translatewiki.net/wiki/Portal:te>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:16+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:30+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: te\n"
 "X-Message-Group: #out-statusnet-plugin-mapstraction\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/Mapstraction/locale/tl/LC_MESSAGES/Mapstraction.po b/plugins/Mapstraction/locale/tl/LC_MESSAGES/Mapstraction.po
index b4bbf9fd2c..e37711c96a 100644
--- a/plugins/Mapstraction/locale/tl/LC_MESSAGES/Mapstraction.po
+++ b/plugins/Mapstraction/locale/tl/LC_MESSAGES/Mapstraction.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Mapstraction\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:58+0000\n"
-"Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:07+0000\n"
+"Language-Team: Tagalog <https://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:16+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:30+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-mapstraction\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/Mapstraction/locale/uk/LC_MESSAGES/Mapstraction.po b/plugins/Mapstraction/locale/uk/LC_MESSAGES/Mapstraction.po
index 47394483a3..fa7e53b3ff 100644
--- a/plugins/Mapstraction/locale/uk/LC_MESSAGES/Mapstraction.po
+++ b/plugins/Mapstraction/locale/uk/LC_MESSAGES/Mapstraction.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Mapstraction to Ukrainian (Україн�ька)
+# Translation of StatusNet - Mapstraction to Ukrainian (україн�ька)
 # Exported from translatewiki.net
 #
 # Author: Boogie
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Mapstraction\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:58+0000\n"
-"Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:07+0000\n"
+"Language-Team: Ukrainian <https://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:16+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:30+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-mapstraction\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
diff --git a/plugins/Mapstraction/locale/zh_CN/LC_MESSAGES/Mapstraction.po b/plugins/Mapstraction/locale/zh_CN/LC_MESSAGES/Mapstraction.po
index 2b91f86503..dcd1959b5f 100644
--- a/plugins/Mapstraction/locale/zh_CN/LC_MESSAGES/Mapstraction.po
+++ b/plugins/Mapstraction/locale/zh_CN/LC_MESSAGES/Mapstraction.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Mapstraction to Simplified Chinese (‪中文(简体)‬)
+# Translation of StatusNet - Mapstraction to Simplified Chinese (‪中文（简体）‬)
 # Exported from translatewiki.net
 #
 # Author: ZhengYiFeng
@@ -9,15 +9,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Mapstraction\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:58+0000\n"
-"Language-Team: Simplified Chinese <http://translatewiki.net/wiki/Portal:zh-"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:07+0000\n"
+"Language-Team: Simplified Chinese <https://translatewiki.net/wiki/Portal:zh-"
 "hans>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:16+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:30+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: #out-statusnet-plugin-mapstraction\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
diff --git a/plugins/Mapstraction/map.php b/plugins/Mapstraction/map.php
index 2ccf1642d7..856e00e159 100644
--- a/plugins/Mapstraction/map.php
+++ b/plugins/Mapstraction/map.php
@@ -22,7 +22,7 @@
  * @category  Mapstraction
  * @package   StatusNet
  * @author    Evan Prodromou <evan@status.net>
- * @copyright 2009 StatusNet, Inc.
+ * @copyright 2009-2011 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
  */
@@ -42,7 +42,7 @@ if (!defined('STATUSNET')) {
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
-class MapAction extends OwnerDesignAction
+class MapAction extends Action
 {
     var $profile = null;
     var $page    = null;
diff --git a/plugins/Memcache/locale/Memcache.pot b/plugins/Memcache/locale/Memcache.pot
index a99c25f15c..4129b96a4f 100644
--- a/plugins/Memcache/locale/Memcache.pot
+++ b/plugins/Memcache/locale/Memcache.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
+"POT-Creation-Date: 2012-06-30 11:07+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"
diff --git a/plugins/Memcache/locale/de/LC_MESSAGES/Memcache.po b/plugins/Memcache/locale/de/LC_MESSAGES/Memcache.po
index 7cef9be19f..145eefe931 100644
--- a/plugins/Memcache/locale/de/LC_MESSAGES/Memcache.po
+++ b/plugins/Memcache/locale/de/LC_MESSAGES/Memcache.po
@@ -10,14 +10,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Memcache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:58+0000\n"
-"Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:07+0000\n"
+"Language-Team: German <https://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:08:15+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:31+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-memcache\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/Memcache/locale/es/LC_MESSAGES/Memcache.po b/plugins/Memcache/locale/es/LC_MESSAGES/Memcache.po
index ca3a4b8112..e52dbb290f 100644
--- a/plugins/Memcache/locale/es/LC_MESSAGES/Memcache.po
+++ b/plugins/Memcache/locale/es/LC_MESSAGES/Memcache.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Memcache to Spanish (Español)
+# Translation of StatusNet - Memcache to Spanish (español)
 # Exported from translatewiki.net
 #
 # Author: Translationista
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Memcache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:59+0000\n"
-"Language-Team: Spanish <http://translatewiki.net/wiki/Portal:es>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:07+0000\n"
+"Language-Team: Spanish <https://translatewiki.net/wiki/Portal:es>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:08:15+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:31+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-plugin-memcache\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/Memcache/locale/eu/LC_MESSAGES/Memcache.po b/plugins/Memcache/locale/eu/LC_MESSAGES/Memcache.po
new file mode 100644
index 0000000000..ea70435d46
--- /dev/null
+++ b/plugins/Memcache/locale/eu/LC_MESSAGES/Memcache.po
@@ -0,0 +1,26 @@
+# Translation of StatusNet - Memcache to Basque (euskara)
+# Exported from translatewiki.net
+#
+# Author: Artsuaga
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Memcache\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:07+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:50:31+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin description.
+msgid ""
+"Use <a href=\"http://memcached.org/\">Memcached</a> to cache query results."
+msgstr ""
+"Erabili <a href=\"http://memcached.org/\">Memcached</a> kontsulta emaitzak "
+"katxeratzeko."
diff --git a/plugins/Memcache/locale/fi/LC_MESSAGES/Memcache.po b/plugins/Memcache/locale/fi/LC_MESSAGES/Memcache.po
index fb61f5d3c3..0cb8f552c5 100644
--- a/plugins/Memcache/locale/fi/LC_MESSAGES/Memcache.po
+++ b/plugins/Memcache/locale/fi/LC_MESSAGES/Memcache.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Memcache to Finnish (Suomi)
+# Translation of StatusNet - Memcache to Finnish (suomi)
 # Exported from translatewiki.net
 #
 # Author: Nike
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Memcache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:59+0000\n"
-"Language-Team: Finnish <http://translatewiki.net/wiki/Portal:fi>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:07+0000\n"
+"Language-Team: Finnish <https://translatewiki.net/wiki/Portal:fi>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:08:15+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:31+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: fi\n"
 "X-Message-Group: #out-statusnet-plugin-memcache\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/Memcache/locale/fr/LC_MESSAGES/Memcache.po b/plugins/Memcache/locale/fr/LC_MESSAGES/Memcache.po
index 254b77556f..0da80a4748 100644
--- a/plugins/Memcache/locale/fr/LC_MESSAGES/Memcache.po
+++ b/plugins/Memcache/locale/fr/LC_MESSAGES/Memcache.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Memcache to French (Français)
+# Translation of StatusNet - Memcache to French (français)
 # Exported from translatewiki.net
 #
 # Author: Verdy p
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Memcache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:59+0000\n"
-"Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:08+0000\n"
+"Language-Team: French <https://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:08:15+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:31+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-memcache\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
diff --git a/plugins/Memcache/locale/gl/LC_MESSAGES/Memcache.po b/plugins/Memcache/locale/gl/LC_MESSAGES/Memcache.po
new file mode 100644
index 0000000000..bb658f764b
--- /dev/null
+++ b/plugins/Memcache/locale/gl/LC_MESSAGES/Memcache.po
@@ -0,0 +1,29 @@
+# Translation of StatusNet - Memcache to Galician (galego)
+# Exported from translatewiki.net
+#
+# Author: Toliño
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Memcache\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:08+0000\n"
+"Language-Team: Galician <https://translatewiki.net/wiki/Portal:gl>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:50:31+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: gl\n"
+"X-Message-Group: #out-statusnet-plugin-memcache\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin description.
+msgid ""
+"Use <a href=\"http://memcached.org/\">Memcached</a> to cache query results."
+msgstr ""
+"Usar <a href=\"http://memcached.org/\">Memcached</a> para incluír na memoria "
+"caché os resultados da pescuda."
diff --git a/plugins/Memcache/locale/he/LC_MESSAGES/Memcache.po b/plugins/Memcache/locale/he/LC_MESSAGES/Memcache.po
index 2fc99c2794..d7ecac4efe 100644
--- a/plugins/Memcache/locale/he/LC_MESSAGES/Memcache.po
+++ b/plugins/Memcache/locale/he/LC_MESSAGES/Memcache.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Memcache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:59+0000\n"
-"Language-Team: Hebrew <http://translatewiki.net/wiki/Portal:he>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:08+0000\n"
+"Language-Team: Hebrew <https://translatewiki.net/wiki/Portal:he>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:08:15+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:31+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: he\n"
 "X-Message-Group: #out-statusnet-plugin-memcache\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/Memcache/locale/ia/LC_MESSAGES/Memcache.po b/plugins/Memcache/locale/ia/LC_MESSAGES/Memcache.po
index 663dc65910..a98e19738c 100644
--- a/plugins/Memcache/locale/ia/LC_MESSAGES/Memcache.po
+++ b/plugins/Memcache/locale/ia/LC_MESSAGES/Memcache.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Memcache to Interlingua (Interlingua)
+# Translation of StatusNet - Memcache to Interlingua (interlingua)
 # Exported from translatewiki.net
 #
 # Author: McDutchie
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Memcache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:59+0000\n"
-"Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:08+0000\n"
+"Language-Team: Interlingua <https://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:08:15+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:31+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-memcache\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/Memcache/locale/it/LC_MESSAGES/Memcache.po b/plugins/Memcache/locale/it/LC_MESSAGES/Memcache.po
new file mode 100644
index 0000000000..f8053b7188
--- /dev/null
+++ b/plugins/Memcache/locale/it/LC_MESSAGES/Memcache.po
@@ -0,0 +1,26 @@
+# Translation of StatusNet - Memcache to Italian (italiano)
+# Exported from translatewiki.net
+#
+# Author: GreenFox
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Memcache\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:08+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:50:31+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin description.
+msgid ""
+"Use <a href=\"http://memcached.org/\">Memcached</a> to cache query results."
+msgstr ""
+"Utilizzare <a href=\"http://memcached.org/\">Memcached</a> per aggiungere "
+"alla cache il risultati delle ricerche."
diff --git a/plugins/Memcache/locale/mk/LC_MESSAGES/Memcache.po b/plugins/Memcache/locale/mk/LC_MESSAGES/Memcache.po
index 8616a477cf..da14bbe09d 100644
--- a/plugins/Memcache/locale/mk/LC_MESSAGES/Memcache.po
+++ b/plugins/Memcache/locale/mk/LC_MESSAGES/Memcache.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Memcache to Macedonian (Македон�ки)
+# Translation of StatusNet - Memcache to Macedonian (македон�ки)
 # Exported from translatewiki.net
 #
 # Author: Bjankuloski06
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Memcache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:59+0000\n"
-"Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:08+0000\n"
+"Language-Team: Macedonian <https://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:08:15+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:31+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-memcache\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
diff --git a/plugins/Memcache/locale/nb/LC_MESSAGES/Memcache.po b/plugins/Memcache/locale/nb/LC_MESSAGES/Memcache.po
index c3b4b6277e..61e6d2c47f 100644
--- a/plugins/Memcache/locale/nb/LC_MESSAGES/Memcache.po
+++ b/plugins/Memcache/locale/nb/LC_MESSAGES/Memcache.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Memcache to Norwegian (bokmål)‬ (‪Norsk (bokmål)‬)
+# Translation of StatusNet - Memcache to Norwegian Bokmål (‪norsk (bokmål)‬)
 # Exported from translatewiki.net
 #
 # Author: Nghtwlkr
@@ -9,15 +9,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Memcache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:59+0000\n"
-"Language-Team: Norwegian (bokmål)‬ <http://translatewiki.net/wiki/Portal:no>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:08+0000\n"
+"Language-Team: Norwegian Bokmål <https://translatewiki.net/wiki/Portal:nb>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:08:15+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
-"X-Language-Code: no\n"
+"X-POT-Import-Date: 2011-06-05 21:50:31+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: nb\n"
 "X-Message-Group: #out-statusnet-plugin-memcache\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
diff --git a/plugins/Memcache/locale/nl/LC_MESSAGES/Memcache.po b/plugins/Memcache/locale/nl/LC_MESSAGES/Memcache.po
index 5c6d653805..1daa07082a 100644
--- a/plugins/Memcache/locale/nl/LC_MESSAGES/Memcache.po
+++ b/plugins/Memcache/locale/nl/LC_MESSAGES/Memcache.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Memcache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:59+0000\n"
-"Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:08+0000\n"
+"Language-Team: Dutch <https://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:08:15+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:31+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-memcache\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/Memcache/locale/pt/LC_MESSAGES/Memcache.po b/plugins/Memcache/locale/pt/LC_MESSAGES/Memcache.po
index 6e3a90c8c3..57101dae63 100644
--- a/plugins/Memcache/locale/pt/LC_MESSAGES/Memcache.po
+++ b/plugins/Memcache/locale/pt/LC_MESSAGES/Memcache.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Memcache to Portuguese (Português)
+# Translation of StatusNet - Memcache to Portuguese (português)
 # Exported from translatewiki.net
 #
 # Author: GTNS
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Memcache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:59+0000\n"
-"Language-Team: Portuguese <http://translatewiki.net/wiki/Portal:pt>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:08+0000\n"
+"Language-Team: Portuguese <https://translatewiki.net/wiki/Portal:pt>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:08:15+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:31+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: pt\n"
 "X-Message-Group: #out-statusnet-plugin-memcache\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/Memcache/locale/pt_BR/LC_MESSAGES/Memcache.po b/plugins/Memcache/locale/pt_BR/LC_MESSAGES/Memcache.po
index f9312c3d71..69350c3b63 100644
--- a/plugins/Memcache/locale/pt_BR/LC_MESSAGES/Memcache.po
+++ b/plugins/Memcache/locale/pt_BR/LC_MESSAGES/Memcache.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Memcache to Brazilian Portuguese (Português do Brasil)
+# Translation of StatusNet - Memcache to Brazilian Portuguese (português do Brasil)
 # Exported from translatewiki.net
 #
 # Author: Giro720
@@ -9,15 +9,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Memcache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:49:59+0000\n"
-"Language-Team: Brazilian Portuguese <http://translatewiki.net/wiki/Portal:pt-"
-"br>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:08+0000\n"
+"Language-Team: Brazilian Portuguese <https://translatewiki.net/wiki/Portal:"
+"pt-br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:08:15+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:31+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: pt-br\n"
 "X-Message-Group: #out-statusnet-plugin-memcache\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
diff --git a/plugins/Memcache/locale/ru/LC_MESSAGES/Memcache.po b/plugins/Memcache/locale/ru/LC_MESSAGES/Memcache.po
index b8e9f13fc9..8df61f4462 100644
--- a/plugins/Memcache/locale/ru/LC_MESSAGES/Memcache.po
+++ b/plugins/Memcache/locale/ru/LC_MESSAGES/Memcache.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Memcache to Russian (Ру��кий)
+# Translation of StatusNet - Memcache to Russian (ру��кий)
 # Exported from translatewiki.net
 #
 # Author: Lockal
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Memcache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:00+0000\n"
-"Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:08+0000\n"
+"Language-Team: Russian <https://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:08:15+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:31+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-memcache\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
diff --git a/plugins/Memcache/locale/sv/LC_MESSAGES/Memcache.po b/plugins/Memcache/locale/sv/LC_MESSAGES/Memcache.po
new file mode 100644
index 0000000000..2ba2d71afc
--- /dev/null
+++ b/plugins/Memcache/locale/sv/LC_MESSAGES/Memcache.po
@@ -0,0 +1,29 @@
+# Translation of StatusNet - Memcache to Swedish (svenska)
+# Exported from translatewiki.net
+#
+# Author: WikiPhoenix
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Memcache\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:08+0000\n"
+"Language-Team: Swedish <https://translatewiki.net/wiki/Portal:sv>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:50:31+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: sv\n"
+"X-Message-Group: #out-statusnet-plugin-memcache\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin description.
+msgid ""
+"Use <a href=\"http://memcached.org/\">Memcached</a> to cache query results."
+msgstr ""
+"Använd <a href=\"http://memcached.org/\">Memcached</a> för att lagra "
+"sökresultat."
diff --git a/plugins/Memcache/locale/tl/LC_MESSAGES/Memcache.po b/plugins/Memcache/locale/tl/LC_MESSAGES/Memcache.po
index baa920520f..4894674e23 100644
--- a/plugins/Memcache/locale/tl/LC_MESSAGES/Memcache.po
+++ b/plugins/Memcache/locale/tl/LC_MESSAGES/Memcache.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Memcache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:00+0000\n"
-"Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:08+0000\n"
+"Language-Team: Tagalog <https://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:08:15+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:31+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-memcache\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/Memcache/locale/uk/LC_MESSAGES/Memcache.po b/plugins/Memcache/locale/uk/LC_MESSAGES/Memcache.po
index cd342826d3..73cb21e1cd 100644
--- a/plugins/Memcache/locale/uk/LC_MESSAGES/Memcache.po
+++ b/plugins/Memcache/locale/uk/LC_MESSAGES/Memcache.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Memcache to Ukrainian (Україн�ька)
+# Translation of StatusNet - Memcache to Ukrainian (україн�ька)
 # Exported from translatewiki.net
 #
 # Author: Boogie
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Memcache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:00+0000\n"
-"Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:08+0000\n"
+"Language-Team: Ukrainian <https://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:08:15+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:31+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-memcache\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
diff --git a/plugins/Memcache/locale/zh_CN/LC_MESSAGES/Memcache.po b/plugins/Memcache/locale/zh_CN/LC_MESSAGES/Memcache.po
index c475db7297..97b5da9bdb 100644
--- a/plugins/Memcache/locale/zh_CN/LC_MESSAGES/Memcache.po
+++ b/plugins/Memcache/locale/zh_CN/LC_MESSAGES/Memcache.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Memcache to Simplified Chinese (‪中文(简体)‬)
+# Translation of StatusNet - Memcache to Simplified Chinese (‪中文（简体）‬)
 # Exported from translatewiki.net
 #
 # Author: ZhengYiFeng
@@ -9,15 +9,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Memcache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:00+0000\n"
-"Language-Team: Simplified Chinese <http://translatewiki.net/wiki/Portal:zh-"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:09+0000\n"
+"Language-Team: Simplified Chinese <https://translatewiki.net/wiki/Portal:zh-"
 "hans>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:08:15+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:31+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: #out-statusnet-plugin-memcache\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
diff --git a/plugins/Memcached/locale/Memcached.pot b/plugins/Memcached/locale/Memcached.pot
index 6f024e7213..77d8577e96 100644
--- a/plugins/Memcached/locale/Memcached.pot
+++ b/plugins/Memcached/locale/Memcached.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
+"POT-Creation-Date: 2012-06-30 11:07+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"
diff --git a/plugins/Memcached/locale/de/LC_MESSAGES/Memcached.po b/plugins/Memcached/locale/de/LC_MESSAGES/Memcached.po
index 9ae40d6986..b085ad564a 100644
--- a/plugins/Memcached/locale/de/LC_MESSAGES/Memcached.po
+++ b/plugins/Memcached/locale/de/LC_MESSAGES/Memcached.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Memcached\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:00+0000\n"
-"Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:09+0000\n"
+"Language-Team: German <https://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:08:16+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:33+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-memcached\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/Memcached/locale/es/LC_MESSAGES/Memcached.po b/plugins/Memcached/locale/es/LC_MESSAGES/Memcached.po
index 0c1946a9b2..5c82fe7306 100644
--- a/plugins/Memcached/locale/es/LC_MESSAGES/Memcached.po
+++ b/plugins/Memcached/locale/es/LC_MESSAGES/Memcached.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Memcached to Spanish (Español)
+# Translation of StatusNet - Memcached to Spanish (español)
 # Exported from translatewiki.net
 #
 # Author: Translationista
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Memcached\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:00+0000\n"
-"Language-Team: Spanish <http://translatewiki.net/wiki/Portal:es>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:09+0000\n"
+"Language-Team: Spanish <https://translatewiki.net/wiki/Portal:es>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:08:16+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:33+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-plugin-memcached\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/Memcached/locale/eu/LC_MESSAGES/Memcached.po b/plugins/Memcached/locale/eu/LC_MESSAGES/Memcached.po
new file mode 100644
index 0000000000..ff2915819a
--- /dev/null
+++ b/plugins/Memcached/locale/eu/LC_MESSAGES/Memcached.po
@@ -0,0 +1,26 @@
+# Translation of StatusNet - Memcached to Basque (euskara)
+# Exported from translatewiki.net
+#
+# Author: Artsuaga
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Memcached\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:09+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:50:33+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin description.
+msgid ""
+"Use <a href=\"http://memcached.org/\">Memcached</a> to cache query results."
+msgstr ""
+"Erabili <a href=\"http://memcached.org/\">Memcached</a> kontsulta emaitzak "
+"katxeratzeko."
diff --git a/plugins/Memcached/locale/fi/LC_MESSAGES/Memcached.po b/plugins/Memcached/locale/fi/LC_MESSAGES/Memcached.po
index 50e6915779..69991de8d2 100644
--- a/plugins/Memcached/locale/fi/LC_MESSAGES/Memcached.po
+++ b/plugins/Memcached/locale/fi/LC_MESSAGES/Memcached.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Memcached to Finnish (Suomi)
+# Translation of StatusNet - Memcached to Finnish (suomi)
 # Exported from translatewiki.net
 #
 # Author: Nike
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Memcached\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:00+0000\n"
-"Language-Team: Finnish <http://translatewiki.net/wiki/Portal:fi>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:09+0000\n"
+"Language-Team: Finnish <https://translatewiki.net/wiki/Portal:fi>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:08:16+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:33+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: fi\n"
 "X-Message-Group: #out-statusnet-plugin-memcached\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/Memcached/locale/fr/LC_MESSAGES/Memcached.po b/plugins/Memcached/locale/fr/LC_MESSAGES/Memcached.po
index 782366185e..1c759a7c98 100644
--- a/plugins/Memcached/locale/fr/LC_MESSAGES/Memcached.po
+++ b/plugins/Memcached/locale/fr/LC_MESSAGES/Memcached.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Memcached to French (Français)
+# Translation of StatusNet - Memcached to French (français)
 # Exported from translatewiki.net
 #
 # Author: Verdy p
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Memcached\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:00+0000\n"
-"Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:09+0000\n"
+"Language-Team: French <https://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:08:16+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:33+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-memcached\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
diff --git a/plugins/Memcached/locale/gl/LC_MESSAGES/Memcached.po b/plugins/Memcached/locale/gl/LC_MESSAGES/Memcached.po
new file mode 100644
index 0000000000..db98c78866
--- /dev/null
+++ b/plugins/Memcached/locale/gl/LC_MESSAGES/Memcached.po
@@ -0,0 +1,29 @@
+# Translation of StatusNet - Memcached to Galician (galego)
+# Exported from translatewiki.net
+#
+# Author: Toliño
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Memcached\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:09+0000\n"
+"Language-Team: Galician <https://translatewiki.net/wiki/Portal:gl>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:50:33+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: gl\n"
+"X-Message-Group: #out-statusnet-plugin-memcached\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin description.
+msgid ""
+"Use <a href=\"http://memcached.org/\">Memcached</a> to cache query results."
+msgstr ""
+"Usar <a href=\"http://memcached.org/\">Memcached</a> para incluír na memoria "
+"caché os resultados da pescuda."
diff --git a/plugins/Memcached/locale/he/LC_MESSAGES/Memcached.po b/plugins/Memcached/locale/he/LC_MESSAGES/Memcached.po
index 517ea98024..a4a77b6ec1 100644
--- a/plugins/Memcached/locale/he/LC_MESSAGES/Memcached.po
+++ b/plugins/Memcached/locale/he/LC_MESSAGES/Memcached.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Memcached\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:01+0000\n"
-"Language-Team: Hebrew <http://translatewiki.net/wiki/Portal:he>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:09+0000\n"
+"Language-Team: Hebrew <https://translatewiki.net/wiki/Portal:he>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:08:16+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:33+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: he\n"
 "X-Message-Group: #out-statusnet-plugin-memcached\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/Memcached/locale/ia/LC_MESSAGES/Memcached.po b/plugins/Memcached/locale/ia/LC_MESSAGES/Memcached.po
index 400ae16255..75bc6cc26b 100644
--- a/plugins/Memcached/locale/ia/LC_MESSAGES/Memcached.po
+++ b/plugins/Memcached/locale/ia/LC_MESSAGES/Memcached.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Memcached to Interlingua (Interlingua)
+# Translation of StatusNet - Memcached to Interlingua (interlingua)
 # Exported from translatewiki.net
 #
 # Author: McDutchie
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Memcached\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:01+0000\n"
-"Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:09+0000\n"
+"Language-Team: Interlingua <https://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:08:16+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:33+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-memcached\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/Memcached/locale/id/LC_MESSAGES/Memcached.po b/plugins/Memcached/locale/id/LC_MESSAGES/Memcached.po
index 1e26f4caaa..46b150bdc5 100644
--- a/plugins/Memcached/locale/id/LC_MESSAGES/Memcached.po
+++ b/plugins/Memcached/locale/id/LC_MESSAGES/Memcached.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Memcached\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:01+0000\n"
-"Language-Team: Indonesian <http://translatewiki.net/wiki/Portal:id>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:09+0000\n"
+"Language-Team: Indonesian <https://translatewiki.net/wiki/Portal:id>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:08:16+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:33+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: id\n"
 "X-Message-Group: #out-statusnet-plugin-memcached\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
diff --git a/plugins/Memcached/locale/it/LC_MESSAGES/Memcached.po b/plugins/Memcached/locale/it/LC_MESSAGES/Memcached.po
new file mode 100644
index 0000000000..8e2d470422
--- /dev/null
+++ b/plugins/Memcached/locale/it/LC_MESSAGES/Memcached.po
@@ -0,0 +1,26 @@
+# Translation of StatusNet - Memcached to Italian (italiano)
+# Exported from translatewiki.net
+#
+# Author: GreenFox
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Memcached\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:09+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:50:33+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin description.
+msgid ""
+"Use <a href=\"http://memcached.org/\">Memcached</a> to cache query results."
+msgstr ""
+"Utilizzare <a href=\"http://memcached.org/\">Memcached</a> per aggiungere "
+"alla cache i risultati delle ricerche."
diff --git a/plugins/Memcached/locale/ja/LC_MESSAGES/Memcached.po b/plugins/Memcached/locale/ja/LC_MESSAGES/Memcached.po
index 862c8895a2..11747fa99f 100644
--- a/plugins/Memcached/locale/ja/LC_MESSAGES/Memcached.po
+++ b/plugins/Memcached/locale/ja/LC_MESSAGES/Memcached.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Memcached\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:01+0000\n"
-"Language-Team: Japanese <http://translatewiki.net/wiki/Portal:ja>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:10+0000\n"
+"Language-Team: Japanese <https://translatewiki.net/wiki/Portal:ja>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:08:16+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:33+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ja\n"
 "X-Message-Group: #out-statusnet-plugin-memcached\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
diff --git a/plugins/Memcached/locale/mk/LC_MESSAGES/Memcached.po b/plugins/Memcached/locale/mk/LC_MESSAGES/Memcached.po
index 4f5dee8183..fdc899edd0 100644
--- a/plugins/Memcached/locale/mk/LC_MESSAGES/Memcached.po
+++ b/plugins/Memcached/locale/mk/LC_MESSAGES/Memcached.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Memcached to Macedonian (Македон�ки)
+# Translation of StatusNet - Memcached to Macedonian (македон�ки)
 # Exported from translatewiki.net
 #
 # Author: Bjankuloski06
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Memcached\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:01+0000\n"
-"Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:10+0000\n"
+"Language-Team: Macedonian <https://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:08:16+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:33+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-memcached\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
diff --git a/plugins/Memcached/locale/nb/LC_MESSAGES/Memcached.po b/plugins/Memcached/locale/nb/LC_MESSAGES/Memcached.po
index 66fad07d2a..1d692bd0df 100644
--- a/plugins/Memcached/locale/nb/LC_MESSAGES/Memcached.po
+++ b/plugins/Memcached/locale/nb/LC_MESSAGES/Memcached.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Memcached to Norwegian (bokmål)‬ (‪Norsk (bokmål)‬)
+# Translation of StatusNet - Memcached to Norwegian Bokmål (‪norsk (bokmål)‬)
 # Exported from translatewiki.net
 #
 # Author: Nghtwlkr
@@ -9,15 +9,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Memcached\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:01+0000\n"
-"Language-Team: Norwegian (bokmål)‬ <http://translatewiki.net/wiki/Portal:no>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:10+0000\n"
+"Language-Team: Norwegian Bokmål <https://translatewiki.net/wiki/Portal:nb>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:08:16+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
-"X-Language-Code: no\n"
+"X-POT-Import-Date: 2011-06-05 21:50:33+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: nb\n"
 "X-Message-Group: #out-statusnet-plugin-memcached\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
diff --git a/plugins/Memcached/locale/nl/LC_MESSAGES/Memcached.po b/plugins/Memcached/locale/nl/LC_MESSAGES/Memcached.po
index 3448fd38c0..81d6b01c52 100644
--- a/plugins/Memcached/locale/nl/LC_MESSAGES/Memcached.po
+++ b/plugins/Memcached/locale/nl/LC_MESSAGES/Memcached.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Memcached\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:01+0000\n"
-"Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:10+0000\n"
+"Language-Team: Dutch <https://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:08:16+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:33+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-memcached\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/Memcached/locale/pt/LC_MESSAGES/Memcached.po b/plugins/Memcached/locale/pt/LC_MESSAGES/Memcached.po
index 2e44acbd21..8a5f436318 100644
--- a/plugins/Memcached/locale/pt/LC_MESSAGES/Memcached.po
+++ b/plugins/Memcached/locale/pt/LC_MESSAGES/Memcached.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Memcached to Portuguese (Português)
+# Translation of StatusNet - Memcached to Portuguese (português)
 # Exported from translatewiki.net
 #
 # Author: GTNS
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Memcached\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:01+0000\n"
-"Language-Team: Portuguese <http://translatewiki.net/wiki/Portal:pt>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:10+0000\n"
+"Language-Team: Portuguese <https://translatewiki.net/wiki/Portal:pt>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:08:16+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:33+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: pt\n"
 "X-Message-Group: #out-statusnet-plugin-memcached\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/Memcached/locale/ru/LC_MESSAGES/Memcached.po b/plugins/Memcached/locale/ru/LC_MESSAGES/Memcached.po
index 32b20f5ce9..3336133c2d 100644
--- a/plugins/Memcached/locale/ru/LC_MESSAGES/Memcached.po
+++ b/plugins/Memcached/locale/ru/LC_MESSAGES/Memcached.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Memcached to Russian (Ру��кий)
+# Translation of StatusNet - Memcached to Russian (ру��кий)
 # Exported from translatewiki.net
 #
 # Author: Lockal
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Memcached\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:02+0000\n"
-"Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:10+0000\n"
+"Language-Team: Russian <https://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:08:16+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:33+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-memcached\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
diff --git a/plugins/Memcached/locale/sv/LC_MESSAGES/Memcached.po b/plugins/Memcached/locale/sv/LC_MESSAGES/Memcached.po
new file mode 100644
index 0000000000..536f36bb4c
--- /dev/null
+++ b/plugins/Memcached/locale/sv/LC_MESSAGES/Memcached.po
@@ -0,0 +1,29 @@
+# Translation of StatusNet - Memcached to Swedish (svenska)
+# Exported from translatewiki.net
+#
+# Author: WikiPhoenix
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Memcached\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:10+0000\n"
+"Language-Team: Swedish <https://translatewiki.net/wiki/Portal:sv>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:50:33+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: sv\n"
+"X-Message-Group: #out-statusnet-plugin-memcached\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin description.
+msgid ""
+"Use <a href=\"http://memcached.org/\">Memcached</a> to cache query results."
+msgstr ""
+"Använd <a href=\"http://memcached.org/\">Memcached</a> för att lagra "
+"sökresultat."
diff --git a/plugins/Memcached/locale/tl/LC_MESSAGES/Memcached.po b/plugins/Memcached/locale/tl/LC_MESSAGES/Memcached.po
index 448910e1f6..4c2b75a2b4 100644
--- a/plugins/Memcached/locale/tl/LC_MESSAGES/Memcached.po
+++ b/plugins/Memcached/locale/tl/LC_MESSAGES/Memcached.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Memcached\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:02+0000\n"
-"Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:10+0000\n"
+"Language-Team: Tagalog <https://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:08:16+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:33+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-memcached\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/Memcached/locale/uk/LC_MESSAGES/Memcached.po b/plugins/Memcached/locale/uk/LC_MESSAGES/Memcached.po
index 8184feed0f..de4f397dbb 100644
--- a/plugins/Memcached/locale/uk/LC_MESSAGES/Memcached.po
+++ b/plugins/Memcached/locale/uk/LC_MESSAGES/Memcached.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Memcached to Ukrainian (Україн�ька)
+# Translation of StatusNet - Memcached to Ukrainian (україн�ька)
 # Exported from translatewiki.net
 #
 # Author: Boogie
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Memcached\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:02+0000\n"
-"Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:10+0000\n"
+"Language-Team: Ukrainian <https://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:08:16+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:33+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-memcached\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
diff --git a/plugins/Memcached/locale/zh_CN/LC_MESSAGES/Memcached.po b/plugins/Memcached/locale/zh_CN/LC_MESSAGES/Memcached.po
index 792a63345a..9cbf238811 100644
--- a/plugins/Memcached/locale/zh_CN/LC_MESSAGES/Memcached.po
+++ b/plugins/Memcached/locale/zh_CN/LC_MESSAGES/Memcached.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Memcached to Simplified Chinese (‪中文(简体)‬)
+# Translation of StatusNet - Memcached to Simplified Chinese (‪中文（简体）‬)
 # Exported from translatewiki.net
 #
 # Author: ZhengYiFeng
@@ -9,15 +9,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Memcached\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:02+0000\n"
-"Language-Team: Simplified Chinese <http://translatewiki.net/wiki/Portal:zh-"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:10+0000\n"
+"Language-Team: Simplified Chinese <https://translatewiki.net/wiki/Portal:zh-"
 "hans>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:08:16+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:50:33+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: #out-statusnet-plugin-memcached\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
diff --git a/plugins/Meteor/MeteorPlugin.php b/plugins/Meteor/MeteorPlugin.php
index ec44eef17b..1cff453d61 100644
--- a/plugins/Meteor/MeteorPlugin.php
+++ b/plugins/Meteor/MeteorPlugin.php
@@ -2,7 +2,7 @@
 /**
  * StatusNet, the distributed open-source microblogging tool
  *
- * Plugin to do "real time" updates using Comet/Bayeux
+ * Plugin to do "real time" updates using Meteor
  *
  * PHP version 5
  *
@@ -49,10 +49,11 @@ class MeteorPlugin extends RealtimePlugin
     public $controlport   = null;
     public $controlserver = null;
     public $channelbase   = null;
+    public $protocol      = null;
     public $persistent    = true;
     protected $_socket    = null;
 
-    function __construct($webserver=null, $webport=4670, $controlport=4671, $controlserver=null, $channelbase='')
+    function __construct($webserver=null, $webport=4670, $controlport=4671, $controlserver=null, $channelbase='', $protocol='http')
     {
         global $config;
 
@@ -61,7 +62,8 @@ class MeteorPlugin extends RealtimePlugin
         $this->controlport   = $controlport;
         $this->controlserver = (empty($controlserver)) ? $webserver : $controlserver;
         $this->channelbase   = $channelbase;
-
+		$this->protocol      = $protocol;
+		
         parent::__construct();
     }
 
@@ -74,7 +76,8 @@ class MeteorPlugin extends RealtimePlugin
                           'webport',
                           'controlport',
                           'controlserver',
-                          'channelbase');
+                          'channelbase',
+                          'protocol');
         foreach ($settings as $name) {
             $val = common_config('meteor', $name);
             if ($val !== false) {
@@ -88,7 +91,11 @@ class MeteorPlugin extends RealtimePlugin
     function _getScripts()
     {
         $scripts = parent::_getScripts();
-        $scripts[] = 'http://'.$this->webserver.(($this->webport == 80) ? '':':'.$this->webport).'/meteor.js';
+        if ($this->protocol == 'https') {
+        	$scripts[] = 'https://'.$this->webserver.(($this->webport == 443) ? '':':'.$this->webport).'/meteor.js';
+        } else {
+        	$scripts[] = 'http://'.$this->webserver.(($this->webport == 80) ? '':':'.$this->webport).'/meteor.js';
+        }
         $scripts[] = $this->path('meteorupdater.min.js');
         return $scripts;
     }
@@ -96,7 +103,11 @@ class MeteorPlugin extends RealtimePlugin
     function _updateInitialize($timeline, $user_id)
     {
         $script = parent::_updateInitialize($timeline, $user_id);
-        return $script." MeteorUpdater.init(\"$this->webserver\", $this->webport, \"{$timeline}\");";
+        $ours = sprintf("MeteorUpdater.init(%s, %s, %s);",
+        				json_encode($this->webserver),
+        				json_encode($this->webport),
+        				json_encode($timeline));
+        return $script." ".$ours;
     }
 
     function _connect()
@@ -156,7 +167,7 @@ class MeteorPlugin extends RealtimePlugin
                             'homepage' => 'http://status.net/wiki/Plugin:Meteor',
                             'rawdescription' =>
                             // TRANS: Plugin description.
-                            _m('Plugin to do "real time" updates using Comet/Bayeux.'));
+                            _m('Plugin to do "real time" updates using Meteor.'));
         return true;
     }
 }
diff --git a/plugins/Meteor/locale/Meteor.pot b/plugins/Meteor/locale/Meteor.pot
index 34f2677728..77fe085966 100644
--- a/plugins/Meteor/locale/Meteor.pot
+++ b/plugins/Meteor/locale/Meteor.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
+"POT-Creation-Date: 2012-06-30 11:07+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,18 +17,18 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. TRANS: Exception. %1$s is the control server, %2$s is the control port.
-#: MeteorPlugin.php:115
+#: MeteorPlugin.php:126
 #, php-format
 msgid "Could not connect to %1$s on %2$s."
 msgstr ""
 
 #. TRANS: Exception. %s is the Meteor message that could not be added.
-#: MeteorPlugin.php:128
+#: MeteorPlugin.php:139
 #, php-format
 msgid "Error adding meteor message \"%s\"."
 msgstr ""
 
 #. TRANS: Plugin description.
-#: MeteorPlugin.php:159
-msgid "Plugin to do \"real time\" updates using Comet/Bayeux."
+#: MeteorPlugin.php:170
+msgid "Plugin to do \"real time\" updates using Meteor."
 msgstr ""
diff --git a/plugins/Meteor/locale/de/LC_MESSAGES/Meteor.po b/plugins/Meteor/locale/de/LC_MESSAGES/Meteor.po
index 9855dca351..577a9b3fdf 100644
--- a/plugins/Meteor/locale/de/LC_MESSAGES/Meteor.po
+++ b/plugins/Meteor/locale/de/LC_MESSAGES/Meteor.po
@@ -1,6 +1,7 @@
 # Translation of StatusNet - Meteor to German (Deutsch)
 # Exported from translatewiki.net
 #
+# Author: ChrisiPK
 # Author: MF-Warburg
 # Author: The Evil IP address
 # --
@@ -10,14 +11,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Meteor\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:03+0000\n"
-"Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:10+0000\n"
+"Language-Team: German <https://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:22+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-12-03 13:48:54+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-meteor\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -33,5 +34,5 @@ msgid "Error adding meteor message \"%s\"."
 msgstr "Fehler beim Hinzufügen der Meteor-Nachricht „%s“."
 
 #. TRANS: Plugin description.
-msgid "Plugin to do \"real time\" updates using Comet/Bayeux."
-msgstr "Plugin für Echtzeit-Aktualisierungen mit Comet/Bayeux."
+msgid "Plugin to do \"real time\" updates using Meteor."
+msgstr "Plugin für Echtzeit-Aktualisierungen mit Meteor."
diff --git a/plugins/Meteor/locale/es/LC_MESSAGES/Meteor.po b/plugins/Meteor/locale/es/LC_MESSAGES/Meteor.po
new file mode 100644
index 0000000000..e7f79825be
--- /dev/null
+++ b/plugins/Meteor/locale/es/LC_MESSAGES/Meteor.po
@@ -0,0 +1,35 @@
+# Translation of StatusNet - Meteor to Spanish (español)
+# Exported from translatewiki.net
+#
+# Author: Armando-Martin
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Meteor\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:10+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-12-03 13:48:54+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Exception. %1$s is the control server, %2$s is the control port.
+#, php-format
+msgid "Could not connect to %1$s on %2$s."
+msgstr "No se pudo conectar a  %1$s  en  %2$s ."
+
+#. TRANS: Exception. %s is the Meteor message that could not be added.
+#, php-format
+msgid "Error adding meteor message \"%s\"."
+msgstr "Error al agregar un mensaje de Meteor \"%s\"."
+
+#. TRANS: Plugin description.
+msgid "Plugin to do \"real time\" updates using Meteor."
+msgstr ""
+"Complemento (plugin) para hacer actualizaciones en \"tiempo real\" mediante "
+"Meteor."
diff --git a/plugins/Meteor/locale/eu/LC_MESSAGES/Meteor.po b/plugins/Meteor/locale/eu/LC_MESSAGES/Meteor.po
new file mode 100644
index 0000000000..d84a303c53
--- /dev/null
+++ b/plugins/Meteor/locale/eu/LC_MESSAGES/Meteor.po
@@ -0,0 +1,33 @@
+# Translation of StatusNet - Meteor to Basque (euskara)
+# Exported from translatewiki.net
+#
+# Author: Artsuaga
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Meteor\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:11+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-12-03 13:48:54+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Exception. %1$s is the control server, %2$s is the control port.
+#, php-format
+msgid "Could not connect to %1$s on %2$s."
+msgstr "Ezin izan da %1$s(e)ra konektatu %2$s(e)n."
+
+#. TRANS: Exception. %s is the Meteor message that could not be added.
+#, php-format
+msgid "Error adding meteor message \"%s\"."
+msgstr "\"%s\" meteor mezua gehitzen akatsa."
+
+#. TRANS: Plugin description.
+msgid "Plugin to do \"real time\" updates using Meteor."
+msgstr "Meteor erabiliz \"denbora errealean\" eguneraketak egiteko plugina."
diff --git a/plugins/Meteor/locale/fr/LC_MESSAGES/Meteor.po b/plugins/Meteor/locale/fr/LC_MESSAGES/Meteor.po
index 0f62f8184b..e9ed8c38fd 100644
--- a/plugins/Meteor/locale/fr/LC_MESSAGES/Meteor.po
+++ b/plugins/Meteor/locale/fr/LC_MESSAGES/Meteor.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Meteor to French (Français)
+# Translation of StatusNet - Meteor to French (français)
 # Exported from translatewiki.net
 #
 # Author: Crochet.david
@@ -10,14 +10,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Meteor\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:03+0000\n"
-"Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:11+0000\n"
+"Language-Team: French <https://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:22+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-12-03 13:48:54+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-meteor\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
@@ -33,7 +33,7 @@ msgid "Error adding meteor message \"%s\"."
 msgstr "Erreur lors de l’ajout d’un message meteor « %s »."
 
 #. TRANS: Plugin description.
-msgid "Plugin to do \"real time\" updates using Comet/Bayeux."
+msgid "Plugin to do \"real time\" updates using Meteor."
 msgstr ""
-"Extension pour réaliser des mises à jour « en temps réel » en utilisant Comet/"
-"Bayeux."
+"Extension pour réaliser des mises à jour « en temps réel » en utilisant "
+"Meteor."
diff --git a/plugins/Meteor/locale/gl/LC_MESSAGES/Meteor.po b/plugins/Meteor/locale/gl/LC_MESSAGES/Meteor.po
new file mode 100644
index 0000000000..bbd4d72a63
--- /dev/null
+++ b/plugins/Meteor/locale/gl/LC_MESSAGES/Meteor.po
@@ -0,0 +1,37 @@
+# Translation of StatusNet - Meteor to Galician (galego)
+# Exported from translatewiki.net
+#
+# Author: Toliño
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Meteor\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:11+0000\n"
+"Language-Team: Galician <https://translatewiki.net/wiki/Portal:gl>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-12-03 13:48:54+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: gl\n"
+"X-Message-Group: #out-statusnet-plugin-meteor\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Exception. %1$s is the control server, %2$s is the control port.
+#, php-format
+msgid "Could not connect to %1$s on %2$s."
+msgstr "Non se puido conectar a %1$s en %2$s."
+
+#. TRANS: Exception. %s is the Meteor message that could not be added.
+#, php-format
+msgid "Error adding meteor message \"%s\"."
+msgstr "Erro ao engadir unha mensaxe de Meteor \"%s\"."
+
+#. TRANS: Plugin description.
+msgid "Plugin to do \"real time\" updates using Meteor."
+msgstr ""
+"Complemento para facer actualizacións \"en tempo real\" mediante Meteor."
diff --git a/plugins/Meteor/locale/ia/LC_MESSAGES/Meteor.po b/plugins/Meteor/locale/ia/LC_MESSAGES/Meteor.po
index 2937074fd2..f0e88b7356 100644
--- a/plugins/Meteor/locale/ia/LC_MESSAGES/Meteor.po
+++ b/plugins/Meteor/locale/ia/LC_MESSAGES/Meteor.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Meteor to Interlingua (Interlingua)
+# Translation of StatusNet - Meteor to Interlingua (interlingua)
 # Exported from translatewiki.net
 #
 # Author: McDutchie
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Meteor\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:03+0000\n"
-"Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:11+0000\n"
+"Language-Team: Interlingua <https://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:22+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-12-03 13:48:54+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-meteor\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -32,5 +32,5 @@ msgid "Error adding meteor message \"%s\"."
 msgstr "Error durante le addition del message Meteor \"%s\"."
 
 #. TRANS: Plugin description.
-msgid "Plugin to do \"real time\" updates using Comet/Bayeux."
-msgstr "Plug-in pro facer actualisationes \"in directo\" usante Comet/Bayeux."
+msgid "Plugin to do \"real time\" updates using Meteor."
+msgstr "Plug-in pro facer actualisationes \"in directo\" usante Meteor."
diff --git a/plugins/Meteor/locale/it/LC_MESSAGES/Meteor.po b/plugins/Meteor/locale/it/LC_MESSAGES/Meteor.po
new file mode 100644
index 0000000000..d2b6857dc7
--- /dev/null
+++ b/plugins/Meteor/locale/it/LC_MESSAGES/Meteor.po
@@ -0,0 +1,35 @@
+# Translation of StatusNet - Meteor to Italian (italiano)
+# Exported from translatewiki.net
+#
+# Author: GreenFox
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Meteor\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:11+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-12-03 13:48:54+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Exception. %1$s is the control server, %2$s is the control port.
+#, php-format
+msgid "Could not connect to %1$s on %2$s."
+msgstr "Impossibile connettersi a %1$s sulla porta %2$s."
+
+#. TRANS: Exception. %s is the Meteor message that could not be added.
+#, php-format
+msgid "Error adding meteor message \"%s\"."
+msgstr "Errore durante l'aggiunta di un messaggio meteor \"%s\"."
+
+#. TRANS: Plugin description.
+msgid "Plugin to do \"real time\" updates using Meteor."
+msgstr ""
+"Estensione per utilizzare degli aggiornamenti in tempo reale attraverso "
+"l'utilizzo di Meteor"
diff --git a/plugins/Meteor/locale/mk/LC_MESSAGES/Meteor.po b/plugins/Meteor/locale/mk/LC_MESSAGES/Meteor.po
index 58216fc189..09b826c5a2 100644
--- a/plugins/Meteor/locale/mk/LC_MESSAGES/Meteor.po
+++ b/plugins/Meteor/locale/mk/LC_MESSAGES/Meteor.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Meteor to Macedonian (Македон�ки)
+# Translation of StatusNet - Meteor to Macedonian (македон�ки)
 # Exported from translatewiki.net
 #
 # Author: Bjankuloski06
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Meteor\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:03+0000\n"
-"Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:11+0000\n"
+"Language-Team: Macedonian <https://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:22+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-12-03 13:48:54+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-meteor\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
@@ -32,5 +32,5 @@ msgid "Error adding meteor message \"%s\"."
 msgstr "Грешка при додавање на Meteor-овата порака „%s“."
 
 #. TRANS: Plugin description.
-msgid "Plugin to do \"real time\" updates using Comet/Bayeux."
-msgstr "Приклучок за вршење на поднови „во живо“ �о Comet/Bayeux."
+msgid "Plugin to do \"real time\" updates using Meteor."
+msgstr "Приклучок за вршење на поднови „во живо“ кори�тејќи Meteor."
diff --git a/plugins/Meteor/locale/nb/LC_MESSAGES/Meteor.po b/plugins/Meteor/locale/nb/LC_MESSAGES/Meteor.po
index 94838479d9..a0baaba263 100644
--- a/plugins/Meteor/locale/nb/LC_MESSAGES/Meteor.po
+++ b/plugins/Meteor/locale/nb/LC_MESSAGES/Meteor.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Meteor to Norwegian (bokmål)‬ (‪Norsk (bokmål)‬)
+# Translation of StatusNet - Meteor to Norwegian Bokmål (‪norsk (bokmål)‬)
 # Exported from translatewiki.net
 #
 # Author: Nghtwlkr
@@ -9,28 +9,28 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Meteor\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-04-27 12:36+0000\n"
-"PO-Revision-Date: 2011-04-27 12:37:40+0000\n"
-"Language-Team: Norwegian (bokmål)‬ <http://translatewiki.net/wiki/Portal:no>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:11+0000\n"
+"Language-Team: Norwegian Bokmål <https://translatewiki.net/wiki/Portal:nb>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:08:18+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87008); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
-"X-Language-Code: no\n"
+"X-POT-Import-Date: 2011-12-03 13:48:54+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: nb\n"
 "X-Message-Group: #out-statusnet-plugin-meteor\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANS: Exception. %1$s is the control server, %2$s is the control port.
-#, fuzzy, php-format
+#, php-format
 msgid "Could not connect to %1$s on %2$s."
 msgstr "Kunne ikke koble til %1$s på %2$s."
 
 #. TRANS: Exception. %s is the Meteor message that could not be added.
-#, fuzzy, php-format
+#, php-format
 msgid "Error adding meteor message \"%s\"."
-msgstr "Mislyktes å legge til meteormelding «%s»"
+msgstr "Mislyktes å legge til meteormelding «%s»."
 
 #. TRANS: Plugin description.
-msgid "Plugin to do \"real time\" updates using Comet/Bayeux."
-msgstr "Utvidelse for å gjøre «sanntids»-oppdateringer med Comet/Bayeux."
+msgid "Plugin to do \"real time\" updates using Meteor."
+msgstr "Utvidelse for å gjøre «sanntids»-oppdateringer med Meteor."
diff --git a/plugins/Meteor/locale/nl/LC_MESSAGES/Meteor.po b/plugins/Meteor/locale/nl/LC_MESSAGES/Meteor.po
index 7b6102b7ce..960be96c0a 100644
--- a/plugins/Meteor/locale/nl/LC_MESSAGES/Meteor.po
+++ b/plugins/Meteor/locale/nl/LC_MESSAGES/Meteor.po
@@ -1,6 +1,7 @@
 # Translation of StatusNet - Meteor to Dutch (Nederlands)
 # Exported from translatewiki.net
 #
+# Author: SPQRobin
 # Author: Siebrand
 # --
 # This file is distributed under the same license as the StatusNet package.
@@ -9,14 +10,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Meteor\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:03+0000\n"
-"Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:11+0000\n"
+"Language-Team: Dutch <https://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:22+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-12-03 13:48:54+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-meteor\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -32,5 +33,5 @@ msgid "Error adding meteor message \"%s\"."
 msgstr "Fout bij het toevoegen van meteorbericht \"%s\"."
 
 #. TRANS: Plugin description.
-msgid "Plugin to do \"real time\" updates using Comet/Bayeux."
-msgstr "Plug-in voor het maken van \"real time\" updates via Comet/Bayeux."
+msgid "Plugin to do \"real time\" updates using Meteor."
+msgstr "Plug-in voor het maken van \"real time\"-updates via Meteor."
diff --git a/plugins/Meteor/locale/tl/LC_MESSAGES/Meteor.po b/plugins/Meteor/locale/tl/LC_MESSAGES/Meteor.po
index 3e604b92d5..60156f97d3 100644
--- a/plugins/Meteor/locale/tl/LC_MESSAGES/Meteor.po
+++ b/plugins/Meteor/locale/tl/LC_MESSAGES/Meteor.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Meteor\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:03+0000\n"
-"Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:11+0000\n"
+"Language-Team: Tagalog <https://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:22+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-12-03 13:48:54+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-meteor\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -32,7 +32,7 @@ msgid "Error adding meteor message \"%s\"."
 msgstr "Kamalian sa pagdaragdag ng mensahe ng meteor na \"%s\"."
 
 #. TRANS: Plugin description.
-msgid "Plugin to do \"real time\" updates using Comet/Bayeux."
+msgid "Plugin to do \"real time\" updates using Meteor."
 msgstr ""
 "Pamasak upang makagawa ng mga pagsasapanahong nasa \"tunay na panahon\" na "
-"gimagamitan ng Comet/Bayeux."
+"ginagamitan ng Meteor."
diff --git a/plugins/Meteor/locale/uk/LC_MESSAGES/Meteor.po b/plugins/Meteor/locale/uk/LC_MESSAGES/Meteor.po
index 3c0b5acdaf..20762e1eb7 100644
--- a/plugins/Meteor/locale/uk/LC_MESSAGES/Meteor.po
+++ b/plugins/Meteor/locale/uk/LC_MESSAGES/Meteor.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Meteor to Ukrainian (Україн�ька)
+# Translation of StatusNet - Meteor to Ukrainian (україн�ька)
 # Exported from translatewiki.net
 #
 # Author: Boogie
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Meteor\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:03+0000\n"
-"Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:11+0000\n"
+"Language-Team: Ukrainian <https://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:22+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-12-03 13:48:54+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-meteor\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
@@ -33,7 +33,8 @@ msgid "Error adding meteor message \"%s\"."
 msgstr "Помилка при додаванні швидкого повідомленн� «%s»."
 
 #. TRANS: Plugin description.
-msgid "Plugin to do \"real time\" updates using Comet/Bayeux."
+#, fuzzy
+msgid "Plugin to do \"real time\" updates using Meteor."
 msgstr ""
 "Додаток дл� оновленн� �трічки повідомлень у «реальному ча�і» викори�товуючи "
 "Comet/Bayeux."
diff --git a/plugins/Minify/locale/Minify.pot b/plugins/Minify/locale/Minify.pot
index 27b51edff8..b32b900eaf 100644
--- a/plugins/Minify/locale/Minify.pot
+++ b/plugins/Minify/locale/Minify.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
+"POT-Creation-Date: 2012-06-30 11:07+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"
diff --git a/plugins/Minify/locale/de/LC_MESSAGES/Minify.po b/plugins/Minify/locale/de/LC_MESSAGES/Minify.po
index 4767c84498..cd6438b8c1 100644
--- a/plugins/Minify/locale/de/LC_MESSAGES/Minify.po
+++ b/plugins/Minify/locale/de/LC_MESSAGES/Minify.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Minify\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:04+0000\n"
-"Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:11+0000\n"
+"Language-Team: German <https://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:08:19+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:03+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-minify\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/Minify/locale/es/LC_MESSAGES/Minify.po b/plugins/Minify/locale/es/LC_MESSAGES/Minify.po
new file mode 100644
index 0000000000..83b8c21ca7
--- /dev/null
+++ b/plugins/Minify/locale/es/LC_MESSAGES/Minify.po
@@ -0,0 +1,39 @@
+# Translation of StatusNet - Minify to Spanish (español)
+# Exported from translatewiki.net
+#
+# Author: Armando-Martin
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Minify\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:11+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:51:03+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin description.
+msgid ""
+"The Minify plugin minifies StatusNet's CSS and JavaScript, removing "
+"whitespace and comments."
+msgstr ""
+"El complemento (plugin) Minify minimiza los archivos CSS y JavaScript de "
+"StatusNet, quitando espacios en blanco y comentarios."
+
+#. TRANS: Client error displayed when not providing a valid path in parameter "f".
+msgid "The parameter \"f\" is not a valid path."
+msgstr "El parámetro \"f\" no es una ruta válida."
+
+#. TRANS: Client error displayed when not providing parameter "f".
+msgid "The parameter \"f\" is required but missing."
+msgstr "El parámetro \"f\" es necesario, pero no existe."
+
+#. TRANS: Client error displayed when trying to minify an unsupported file type.
+msgid "File type not supported."
+msgstr "Tipo de archivo no soportado."
diff --git a/plugins/Minify/locale/eu/LC_MESSAGES/Minify.po b/plugins/Minify/locale/eu/LC_MESSAGES/Minify.po
new file mode 100644
index 0000000000..1cd6d547db
--- /dev/null
+++ b/plugins/Minify/locale/eu/LC_MESSAGES/Minify.po
@@ -0,0 +1,39 @@
+# Translation of StatusNet - Minify to Basque (euskara)
+# Exported from translatewiki.net
+#
+# Author: Artsuaga
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Minify\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:12+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:51:03+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin description.
+msgid ""
+"The Minify plugin minifies StatusNet's CSS and JavaScript, removing "
+"whitespace and comments."
+msgstr ""
+"Minify pluginak StatusNeten CSS eta Javascripta sinplifikatzen ditu, "
+"iruzikin eta zuriuneak ezabatuz."
+
+#. TRANS: Client error displayed when not providing a valid path in parameter "f".
+msgid "The parameter \"f\" is not a valid path."
+msgstr "\"f\" parametroa ez da baliozko bide bat."
+
+#. TRANS: Client error displayed when not providing parameter "f".
+msgid "The parameter \"f\" is required but missing."
+msgstr "Beharrezkoa den \"f\" parametroa falta da."
+
+#. TRANS: Client error displayed when trying to minify an unsupported file type.
+msgid "File type not supported."
+msgstr "Fitxategi moeta ez da onartzen."
diff --git a/plugins/Minify/locale/fr/LC_MESSAGES/Minify.po b/plugins/Minify/locale/fr/LC_MESSAGES/Minify.po
index 769beec9eb..e936d0b063 100644
--- a/plugins/Minify/locale/fr/LC_MESSAGES/Minify.po
+++ b/plugins/Minify/locale/fr/LC_MESSAGES/Minify.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Minify to French (Français)
+# Translation of StatusNet - Minify to French (français)
 # Exported from translatewiki.net
 #
 # Author: Verdy p
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Minify\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:04+0000\n"
-"Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:12+0000\n"
+"Language-Team: French <https://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:08:19+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:03+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-minify\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
diff --git a/plugins/Minify/locale/gl/LC_MESSAGES/Minify.po b/plugins/Minify/locale/gl/LC_MESSAGES/Minify.po
new file mode 100644
index 0000000000..d0a5014aa9
--- /dev/null
+++ b/plugins/Minify/locale/gl/LC_MESSAGES/Minify.po
@@ -0,0 +1,42 @@
+# Translation of StatusNet - Minify to Galician (galego)
+# Exported from translatewiki.net
+#
+# Author: Toliño
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Minify\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:12+0000\n"
+"Language-Team: Galician <https://translatewiki.net/wiki/Portal:gl>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:51:03+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: gl\n"
+"X-Message-Group: #out-statusnet-plugin-minify\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin description.
+msgid ""
+"The Minify plugin minifies StatusNet's CSS and JavaScript, removing "
+"whitespace and comments."
+msgstr ""
+"O complemento Minify minimiza o CSS e o JavaScript de StatusNet, eliminando "
+"os espazos en branco e os comentarios."
+
+#. TRANS: Client error displayed when not providing a valid path in parameter "f".
+msgid "The parameter \"f\" is not a valid path."
+msgstr "O parámetro \"f\" non é unha ruta válida."
+
+#. TRANS: Client error displayed when not providing parameter "f".
+msgid "The parameter \"f\" is required but missing."
+msgstr "O parámetro \"f\" é necesario, pero falta."
+
+#. TRANS: Client error displayed when trying to minify an unsupported file type.
+msgid "File type not supported."
+msgstr "Tipo de ficheiro non soportado."
diff --git a/plugins/Minify/locale/ia/LC_MESSAGES/Minify.po b/plugins/Minify/locale/ia/LC_MESSAGES/Minify.po
index e3c172a7dc..4224db6752 100644
--- a/plugins/Minify/locale/ia/LC_MESSAGES/Minify.po
+++ b/plugins/Minify/locale/ia/LC_MESSAGES/Minify.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Minify to Interlingua (Interlingua)
+# Translation of StatusNet - Minify to Interlingua (interlingua)
 # Exported from translatewiki.net
 #
 # Author: McDutchie
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Minify\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:04+0000\n"
-"Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:12+0000\n"
+"Language-Team: Interlingua <https://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:08:19+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:03+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-minify\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/Minify/locale/it/LC_MESSAGES/Minify.po b/plugins/Minify/locale/it/LC_MESSAGES/Minify.po
new file mode 100644
index 0000000000..d5495ef941
--- /dev/null
+++ b/plugins/Minify/locale/it/LC_MESSAGES/Minify.po
@@ -0,0 +1,39 @@
+# Translation of StatusNet - Minify to Italian (italiano)
+# Exported from translatewiki.net
+#
+# Author: GreenFox
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Minify\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:12+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:51:03+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin description.
+msgid ""
+"The Minify plugin minifies StatusNet's CSS and JavaScript, removing "
+"whitespace and comments."
+msgstr ""
+"L'estensione Minify minimizza il CSS e gli JavaScript utilizzati da "
+"StatusNet, rimuovendo spazi bianchi e commenti."
+
+#. TRANS: Client error displayed when not providing a valid path in parameter "f".
+msgid "The parameter \"f\" is not a valid path."
+msgstr "Il parametro \"f\" non contiene un percorso valido."
+
+#. TRANS: Client error displayed when not providing parameter "f".
+msgid "The parameter \"f\" is required but missing."
+msgstr "Il parametro \"f\" è richiesto ma è mancante."
+
+#. TRANS: Client error displayed when trying to minify an unsupported file type.
+msgid "File type not supported."
+msgstr "Tipo di file non supportato."
diff --git a/plugins/Minify/locale/mk/LC_MESSAGES/Minify.po b/plugins/Minify/locale/mk/LC_MESSAGES/Minify.po
index 2818545fe9..12f3dfcc42 100644
--- a/plugins/Minify/locale/mk/LC_MESSAGES/Minify.po
+++ b/plugins/Minify/locale/mk/LC_MESSAGES/Minify.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Minify to Macedonian (Македон�ки)
+# Translation of StatusNet - Minify to Macedonian (македон�ки)
 # Exported from translatewiki.net
 #
 # Author: Bjankuloski06
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Minify\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:04+0000\n"
-"Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:12+0000\n"
+"Language-Team: Macedonian <https://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:08:19+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:03+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-minify\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
diff --git a/plugins/Minify/locale/nb/LC_MESSAGES/Minify.po b/plugins/Minify/locale/nb/LC_MESSAGES/Minify.po
index 858a12bd44..aa24ff2d7e 100644
--- a/plugins/Minify/locale/nb/LC_MESSAGES/Minify.po
+++ b/plugins/Minify/locale/nb/LC_MESSAGES/Minify.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Minify to Norwegian (bokmål)‬ (‪Norsk (bokmål)‬)
+# Translation of StatusNet - Minify to Norwegian Bokmål (‪norsk (bokmål)‬)
 # Exported from translatewiki.net
 #
 # Author: Nghtwlkr
@@ -9,15 +9,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Minify\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:05+0000\n"
-"Language-Team: Norwegian (bokmål)‬ <http://translatewiki.net/wiki/Portal:no>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:12+0000\n"
+"Language-Team: Norwegian Bokmål <https://translatewiki.net/wiki/Portal:nb>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:08:19+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
-"X-Language-Code: no\n"
+"X-POT-Import-Date: 2011-06-05 21:51:03+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: nb\n"
 "X-Message-Group: #out-statusnet-plugin-minify\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
diff --git a/plugins/Minify/locale/nl/LC_MESSAGES/Minify.po b/plugins/Minify/locale/nl/LC_MESSAGES/Minify.po
index 2ef481a9dc..a20d71ba35 100644
--- a/plugins/Minify/locale/nl/LC_MESSAGES/Minify.po
+++ b/plugins/Minify/locale/nl/LC_MESSAGES/Minify.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Minify\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:04+0000\n"
-"Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:12+0000\n"
+"Language-Team: Dutch <https://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:08:19+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:03+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-minify\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/Minify/locale/ru/LC_MESSAGES/Minify.po b/plugins/Minify/locale/ru/LC_MESSAGES/Minify.po
index beaaa21fb5..3f35dd2b40 100644
--- a/plugins/Minify/locale/ru/LC_MESSAGES/Minify.po
+++ b/plugins/Minify/locale/ru/LC_MESSAGES/Minify.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Minify to Russian (Ру��кий)
+# Translation of StatusNet - Minify to Russian (ру��кий)
 # Exported from translatewiki.net
 #
 # Author: Eleferen
@@ -10,14 +10,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Minify\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:05+0000\n"
-"Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:12+0000\n"
+"Language-Team: Russian <https://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:08:19+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:03+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-minify\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
diff --git a/plugins/Minify/locale/sv/LC_MESSAGES/Minify.po b/plugins/Minify/locale/sv/LC_MESSAGES/Minify.po
index 04beace8b3..eb48a6dd11 100644
--- a/plugins/Minify/locale/sv/LC_MESSAGES/Minify.po
+++ b/plugins/Minify/locale/sv/LC_MESSAGES/Minify.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Minify to Swedish (Svenska)
+# Translation of StatusNet - Minify to Swedish (svenska)
 # Exported from translatewiki.net
 #
 # Author: Lokal Profil
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Minify\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:05+0000\n"
-"Language-Team: Swedish <http://translatewiki.net/wiki/Portal:sv>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:12+0000\n"
+"Language-Team: Swedish <https://translatewiki.net/wiki/Portal:sv>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:08:19+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:03+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: sv\n"
 "X-Message-Group: #out-statusnet-plugin-minify\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/Minify/locale/tl/LC_MESSAGES/Minify.po b/plugins/Minify/locale/tl/LC_MESSAGES/Minify.po
index a8ed6d4fed..1f46fb32b6 100644
--- a/plugins/Minify/locale/tl/LC_MESSAGES/Minify.po
+++ b/plugins/Minify/locale/tl/LC_MESSAGES/Minify.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Minify\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:05+0000\n"
-"Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:13+0000\n"
+"Language-Team: Tagalog <https://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:08:19+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:03+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-minify\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/Minify/locale/uk/LC_MESSAGES/Minify.po b/plugins/Minify/locale/uk/LC_MESSAGES/Minify.po
index 37594cbdc2..e4f2477b27 100644
--- a/plugins/Minify/locale/uk/LC_MESSAGES/Minify.po
+++ b/plugins/Minify/locale/uk/LC_MESSAGES/Minify.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Minify to Ukrainian (Україн�ька)
+# Translation of StatusNet - Minify to Ukrainian (україн�ька)
 # Exported from translatewiki.net
 #
 # Author: Boogie
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Minify\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:05+0000\n"
-"Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:13+0000\n"
+"Language-Team: Ukrainian <https://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:08:19+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:03+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-minify\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
diff --git a/plugins/Minify/locale/zh_CN/LC_MESSAGES/Minify.po b/plugins/Minify/locale/zh_CN/LC_MESSAGES/Minify.po
index 5d03ac6d1b..f970d074e1 100644
--- a/plugins/Minify/locale/zh_CN/LC_MESSAGES/Minify.po
+++ b/plugins/Minify/locale/zh_CN/LC_MESSAGES/Minify.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Minify to Simplified Chinese (‪中文(简体)‬)
+# Translation of StatusNet - Minify to Simplified Chinese (‪中文（简体）‬)
 # Exported from translatewiki.net
 #
 # Author: ZhengYiFeng
@@ -9,15 +9,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Minify\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:05+0000\n"
-"Language-Team: Simplified Chinese <http://translatewiki.net/wiki/Portal:zh-"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:13+0000\n"
+"Language-Team: Simplified Chinese <https://translatewiki.net/wiki/Portal:zh-"
 "hans>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:08:19+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:03+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: #out-statusnet-plugin-minify\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
diff --git a/plugins/MobileProfile/MobileProfilePlugin.php b/plugins/MobileProfile/MobileProfilePlugin.php
index 796bd3b529..76d285ba27 100644
--- a/plugins/MobileProfile/MobileProfilePlugin.php
+++ b/plugins/MobileProfile/MobileProfilePlugin.php
@@ -49,6 +49,7 @@ class MobileProfilePlugin extends WAP20Plugin
 {
     public $DTD            = null;
     public $serveMobile    = false;
+    public $reallyMobile   = false;
     public $mobileFeatures = array();
 
     function __construct($DTD='http://www.wapforum.org/DTD/xhtml-mobile10.dtd')
@@ -110,6 +111,7 @@ class MobileProfilePlugin extends WAP20Plugin
                     'ipod',
                     'j2me',
                     'lg',
+                    'maemo',
                     'midp-',
                     'mobile',
                     'mot',
@@ -160,6 +162,7 @@ class MobileProfilePlugin extends WAP20Plugin
                         $this->setMobileFeatures($httpuseragent);
 
                         $this->serveMobile = true;
+                        $this->reallyMobile = true;
                         break;
                     }
                 }
@@ -201,21 +204,28 @@ class MobileProfilePlugin extends WAP20Plugin
 
         header('Content-Type: '.$type);
 
-        $action->extraHeaders();
-        if (preg_match("/.*\/.*xml/", $type)) {
-            // Required for XML documents
-            $action->xw->startDocument('1.0', 'UTF-8');
-        }
-        $action->xw->writeDTD('html',
-                        '-//WAPFORUM//DTD XHTML Mobile 1.0//EN',
-                        $this->DTD);
+        if ($this->reallyMobile) {
 
-        $language = $action->getLanguage();
+           $action->extraHeaders();
+           if (preg_match("/.*\/.*xml/", $type)) {
+               // Required for XML documents
+               $action->xw->startDocument('1.0', 'UTF-8');
+           }
+           $action->xw->writeDTD('html',
+                           '-//WAPFORUM//DTD XHTML Mobile 1.0//EN',
+                           $this->DTD);
 
-        $action->elementStart('html', array('xmlns' => 'http://www.w3.org/1999/xhtml',
+            $language = $action->getLanguage();
+
+            $action->elementStart('html', array('xmlns' => 'http://www.w3.org/1999/xhtml',
                                             'xml:lang' => $language));
 
-        return false;
+            return false;
+
+        } else {
+        return true;
+        }
+
     }
 
     function setMobileFeatures($useragent)
@@ -242,16 +252,14 @@ class MobileProfilePlugin extends WAP20Plugin
 
         $action->primaryCssLink();
 
+        $action->cssLink($this->path('mp-screen.css'),null,'screen');
         if (file_exists(Theme::file('css/mp-screen.css'))) {
             $action->cssLink('css/mp-screen.css', null, 'screen');
-        } else {
-            $action->cssLink($this->path('mp-screen.css'),null,'screen');
         }
 
+        $action->cssLink($this->path('mp-handheld.css'),null,'handheld');
         if (file_exists(Theme::file('css/mp-handheld.css'))) {
             $action->cssLink('css/mp-handheld.css', null, 'handheld');
-        } else {
-            $action->cssLink($this->path('mp-handheld.css'),null,'handheld');
         }
 
         // Allow other plugins to load their styles.
@@ -286,8 +294,16 @@ class MobileProfilePlugin extends WAP20Plugin
     function _showLogo($action)
     {
         $action->elementStart('address', 'vcard');
+        if (common_config('singleuser', 'enabled')) {
+            $user = User::singleUser();
+            $url = common_local_url('showstream', array('nickname' => $user->nickname));
+        } else {
+            $url = common_local_url('public');
+        }
+
         $action->elementStart('a', array('class' => 'url home bookmark',
-                                       'href' => common_local_url('public')));
+                                         'href' => $url));
+
         if (common_config('site', 'mobilelogo') ||
             file_exists(Theme::file('logo.png')) ||
             file_exists(Theme::file('mobilelogo.png'))) {
@@ -341,6 +357,16 @@ class MobileProfilePlugin extends WAP20Plugin
                 });
             });'
         );
+
+        if ($this->serveMobile) {
+            $action->inlineScript('
+                $(function() {
+        	        $(".checkbox-wrapper").unbind("click");
+                });'
+            );
+        }
+
+
     }
 
 
diff --git a/plugins/MobileProfile/locale/MobileProfile.pot b/plugins/MobileProfile/locale/MobileProfile.pot
index 1c0308bfa2..4419f3d800 100644
--- a/plugins/MobileProfile/locale/MobileProfile.pot
+++ b/plugins/MobileProfile/locale/MobileProfile.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
+"POT-Creation-Date: 2012-06-30 11:07+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,80 +17,21 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. TRANS: Client exception thrown when requesting a not supported media type.
-#: MobileProfilePlugin.php:197
+#: MobileProfilePlugin.php:200
 msgid "This page is not available in a media type you accept."
 msgstr ""
 
-#. TRANS: Menu item in mobile profile to go to start page of site.
-#: MobileProfilePlugin.php:315
-msgid "Home"
-msgstr ""
-
-#. TRANS: Menu item in mobile profile to go to user account settings.
-#: MobileProfilePlugin.php:318
-msgid "Account"
-msgstr ""
-
-#. TRANS: Menu item in mobile profile to connect to other services.
-#: MobileProfilePlugin.php:321
-msgid "Connect"
-msgstr ""
-
-#. TRANS: Menu item in mobile profile to manage site settings.
-#: MobileProfilePlugin.php:325
-msgid "Admin"
-msgstr ""
-
-#: MobileProfilePlugin.php:326
-msgid "Change site configuration"
-msgstr ""
-
-#. TRANS: Menu item in mobile profile to invite other people.
-#: MobileProfilePlugin.php:331
-msgid "Invite"
-msgstr ""
-
-#. TRANS: Menu item in mobile profile log the current user off.
-#: MobileProfilePlugin.php:335
-msgid "Logout"
-msgstr ""
-
-#. TRANS: Menu item in mobile profile to register with the site.
-#: MobileProfilePlugin.php:340
-msgid "Register"
-msgstr ""
-
-#. TRANS: Menu item in mobile profile to log in.
-#: MobileProfilePlugin.php:344
-msgid "Login"
-msgstr ""
-
-#. TRANS: Menu item in mobile profile to search the site.
-#: MobileProfilePlugin.php:349
-msgid "Search"
-msgstr ""
-
-#. TRANS: Field label in mobile profile to attach a file to a status.
-#: MobileProfilePlugin.php:377
-msgid "Attach"
-msgstr ""
-
-#. TRANS: Field title in mobile profile to attach a file to a status.
-#: MobileProfilePlugin.php:382
-msgid "Attach a file."
-msgstr ""
-
 #. TRANS: Link to switch site layout from mobile to desktop mode. Appears at very bottom of page.
-#: MobileProfilePlugin.php:423
+#: MobileProfilePlugin.php:377
 msgid "Switch to desktop site layout."
 msgstr ""
 
 #. TRANS: Link to switch site layout from desktop to mobile mode. Appears at very bottom of page.
-#: MobileProfilePlugin.php:427
+#: MobileProfilePlugin.php:381
 msgid "Switch to mobile site layout."
 msgstr ""
 
 #. TRANS: Plugin description.
-#: MobileProfilePlugin.php:465
+#: MobileProfilePlugin.php:419
 msgid "XHTML MobileProfile output for supporting user agents."
 msgstr ""
diff --git a/plugins/MobileProfile/locale/ar/LC_MESSAGES/MobileProfile.po b/plugins/MobileProfile/locale/ar/LC_MESSAGES/MobileProfile.po
deleted file mode 100644
index ce83cae748..0000000000
--- a/plugins/MobileProfile/locale/ar/LC_MESSAGES/MobileProfile.po
+++ /dev/null
@@ -1,88 +0,0 @@
-# Translation of StatusNet - MobileProfile to Arabic (العربية)
-# Exported from translatewiki.net
-#
-# Author: OsamaK
-# --
-# This file is distributed under the same license as the StatusNet package.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: StatusNet - MobileProfile\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:06+0000\n"
-"Language-Team: Arabic <http://translatewiki.net/wiki/Portal:ar>\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:27+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
-"X-Language-Code: ar\n"
-"X-Message-Group: #out-statusnet-plugin-mobileprofile\n"
-"Plural-Forms: nplurals=6; plural=(n == 0) ? 0 : ( (n == 1) ? 1 : ( (n == "
-"2) ? 2 : ( (n%100 >= 3 && n%100 <= 10) ? 3 : ( (n%100 >= 11 && n%100 <= "
-"99) ? 4 : 5 ) ) ) );\n"
-
-#. TRANS: Client exception thrown when requesting a not supported media type.
-msgid "This page is not available in a media type you accept."
-msgstr ""
-
-#. TRANS: Menu item in mobile profile to go to start page of site.
-msgid "Home"
-msgstr "الرئيسية"
-
-#. TRANS: Menu item in mobile profile to go to user account settings.
-msgid "Account"
-msgstr "الحساب"
-
-#. TRANS: Menu item in mobile profile to connect to other services.
-msgid "Connect"
-msgstr "اربط"
-
-#. TRANS: Menu item in mobile profile to manage site settings.
-msgid "Admin"
-msgstr "إدارة"
-
-msgid "Change site configuration"
-msgstr "غيّر ضبط الموقع"
-
-#. TRANS: Menu item in mobile profile to invite other people.
-msgid "Invite"
-msgstr "أدع"
-
-#. TRANS: Menu item in mobile profile log the current user off.
-msgid "Logout"
-msgstr "اخرج"
-
-#. TRANS: Menu item in mobile profile to register with the site.
-msgid "Register"
-msgstr "سجل"
-
-#. TRANS: Menu item in mobile profile to log in.
-msgid "Login"
-msgstr "ل�ج"
-
-#. TRANS: Menu item in mobile profile to search the site.
-msgid "Search"
-msgstr "ابحث"
-
-#. TRANS: Field label in mobile profile to attach a file to a status.
-msgid "Attach"
-msgstr "أر�ق"
-
-#. TRANS: Field title in mobile profile to attach a file to a status.
-#, fuzzy
-msgid "Attach a file."
-msgstr "أر�ق مل�ًا"
-
-#. TRANS: Link to switch site layout from mobile to desktop mode. Appears at very bottom of page.
-msgid "Switch to desktop site layout."
-msgstr ""
-
-#. TRANS: Link to switch site layout from desktop to mobile mode. Appears at very bottom of page.
-msgid "Switch to mobile site layout."
-msgstr ""
-
-#. TRANS: Plugin description.
-msgid "XHTML MobileProfile output for supporting user agents."
-msgstr ""
diff --git a/plugins/MobileProfile/locale/br/LC_MESSAGES/MobileProfile.po b/plugins/MobileProfile/locale/br/LC_MESSAGES/MobileProfile.po
deleted file mode 100644
index 37decb60b8..0000000000
--- a/plugins/MobileProfile/locale/br/LC_MESSAGES/MobileProfile.po
+++ /dev/null
@@ -1,86 +0,0 @@
-# Translation of StatusNet - MobileProfile to Breton (Brezhoneg)
-# Exported from translatewiki.net
-#
-# Author: Gwendal
-# --
-# This file is distributed under the same license as the StatusNet package.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: StatusNet - MobileProfile\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:06+0000\n"
-"Language-Team: Breton <http://translatewiki.net/wiki/Portal:br>\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:27+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
-"X-Language-Code: br\n"
-"X-Message-Group: #out-statusnet-plugin-mobileprofile\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-
-#. TRANS: Client exception thrown when requesting a not supported media type.
-msgid "This page is not available in a media type you accept."
-msgstr ""
-
-#. TRANS: Menu item in mobile profile to go to start page of site.
-msgid "Home"
-msgstr "Degemer"
-
-#. TRANS: Menu item in mobile profile to go to user account settings.
-msgid "Account"
-msgstr "Kont"
-
-#. TRANS: Menu item in mobile profile to connect to other services.
-msgid "Connect"
-msgstr "Kevreañ"
-
-#. TRANS: Menu item in mobile profile to manage site settings.
-msgid "Admin"
-msgstr "Merour"
-
-msgid "Change site configuration"
-msgstr "Kemmañ arventennoù al lec'hienn"
-
-#. TRANS: Menu item in mobile profile to invite other people.
-msgid "Invite"
-msgstr "Pediñ"
-
-#. TRANS: Menu item in mobile profile log the current user off.
-msgid "Logout"
-msgstr "Digevreañ"
-
-#. TRANS: Menu item in mobile profile to register with the site.
-msgid "Register"
-msgstr "Marilhañ"
-
-#. TRANS: Menu item in mobile profile to log in.
-msgid "Login"
-msgstr "Kevreañ"
-
-#. TRANS: Menu item in mobile profile to search the site.
-msgid "Search"
-msgstr "Klask"
-
-#. TRANS: Field label in mobile profile to attach a file to a status.
-msgid "Attach"
-msgstr "Stagañ"
-
-#. TRANS: Field title in mobile profile to attach a file to a status.
-#, fuzzy
-msgid "Attach a file."
-msgstr "Stagañ ur restr"
-
-#. TRANS: Link to switch site layout from mobile to desktop mode. Appears at very bottom of page.
-msgid "Switch to desktop site layout."
-msgstr ""
-
-#. TRANS: Link to switch site layout from desktop to mobile mode. Appears at very bottom of page.
-msgid "Switch to mobile site layout."
-msgstr ""
-
-#. TRANS: Plugin description.
-msgid "XHTML MobileProfile output for supporting user agents."
-msgstr ""
diff --git a/plugins/MobileProfile/locale/ca/LC_MESSAGES/MobileProfile.po b/plugins/MobileProfile/locale/ca/LC_MESSAGES/MobileProfile.po
index 2c0d3b9825..105017ab3d 100644
--- a/plugins/MobileProfile/locale/ca/LC_MESSAGES/MobileProfile.po
+++ b/plugins/MobileProfile/locale/ca/LC_MESSAGES/MobileProfile.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - MobileProfile to Catalan (Català)
+# Translation of StatusNet - MobileProfile to Catalan (català)
 # Exported from translatewiki.net
 #
 # Author: Toniher
@@ -9,68 +9,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - MobileProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:07+0000\n"
-"Language-Team: Catalan <http://translatewiki.net/wiki/Portal:ca>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:13+0000\n"
+"Language-Team: Catalan <https://translatewiki.net/wiki/Portal:ca>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:27+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2012-01-02 10:11:36+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ca\n"
 "X-Message-Group: #out-statusnet-plugin-mobileprofile\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANS: Client exception thrown when requesting a not supported media type.
 msgid "This page is not available in a media type you accept."
-msgstr ""
-
-#. TRANS: Menu item in mobile profile to go to start page of site.
-msgid "Home"
-msgstr "Inici"
-
-#. TRANS: Menu item in mobile profile to go to user account settings.
-msgid "Account"
-msgstr "Compte"
-
-#. TRANS: Menu item in mobile profile to connect to other services.
-msgid "Connect"
-msgstr "Connecta"
-
-#. TRANS: Menu item in mobile profile to manage site settings.
-msgid "Admin"
-msgstr "Administració"
-
-msgid "Change site configuration"
-msgstr "Canvia la configuració del lloc"
-
-#. TRANS: Menu item in mobile profile to invite other people.
-msgid "Invite"
-msgstr "Convida"
-
-#. TRANS: Menu item in mobile profile log the current user off.
-msgid "Logout"
-msgstr "Finalitza la sessió"
-
-#. TRANS: Menu item in mobile profile to register with the site.
-msgid "Register"
-msgstr "Registre"
-
-#. TRANS: Menu item in mobile profile to log in.
-msgid "Login"
-msgstr "Inicia la sessió"
-
-#. TRANS: Menu item in mobile profile to search the site.
-msgid "Search"
-msgstr "Cerca"
-
-#. TRANS: Field label in mobile profile to attach a file to a status.
-msgid "Attach"
-msgstr "Adjunta"
-
-#. TRANS: Field title in mobile profile to attach a file to a status.
-msgid "Attach a file."
-msgstr "Adjunta un fitxer."
+msgstr "La pàgina no està disponible en un tipus de suport que accepteu."
 
 #. TRANS: Link to switch site layout from mobile to desktop mode. Appears at very bottom of page.
 msgid "Switch to desktop site layout."
@@ -83,3 +36,4 @@ msgstr "Canvia a lloc web en mode mòbil."
 #. TRANS: Plugin description.
 msgid "XHTML MobileProfile output for supporting user agents."
 msgstr ""
+"Sortida en XHTML MobileProfile per als agents d'usuari que ho accepten."
diff --git a/plugins/MobileProfile/locale/ce/LC_MESSAGES/MobileProfile.po b/plugins/MobileProfile/locale/ce/LC_MESSAGES/MobileProfile.po
index a5c72f7f00..1ff971ed00 100644
--- a/plugins/MobileProfile/locale/ce/LC_MESSAGES/MobileProfile.po
+++ b/plugins/MobileProfile/locale/ce/LC_MESSAGES/MobileProfile.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - MobileProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:07+0000\n"
-"Language-Team: Chechen <http://translatewiki.net/wiki/Portal:ce>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:13+0000\n"
+"Language-Team: Chechen <https://translatewiki.net/wiki/Portal:ce>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:27+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2012-01-02 10:11:36+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ce\n"
 "X-Message-Group: #out-statusnet-plugin-mobileprofile\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -25,54 +25,6 @@ msgstr ""
 msgid "This page is not available in a media type you accept."
 msgstr "�гlо �хьа ца гойту ишта тайпнара чун, ахьа лелош йолу."
 
-#. TRANS: Menu item in mobile profile to go to start page of site.
-msgid "Home"
-msgstr "Цlехьа"
-
-#. TRANS: Menu item in mobile profile to go to user account settings.
-msgid "Account"
-msgstr "Дlавазвалар"
-
-#. TRANS: Menu item in mobile profile to connect to other services.
-msgid "Connect"
-msgstr "Зlе та�ар"
-
-#. TRANS: Menu item in mobile profile to manage site settings.
-msgid "Admin"
-msgstr "�даманкуьйгалхо"
-
-msgid "Change site configuration"
-msgstr ""
-
-#. TRANS: Menu item in mobile profile to invite other people.
-msgid "Invite"
-msgstr "Схьакхайкха"
-
-#. TRANS: Menu item in mobile profile log the current user off.
-msgid "Logout"
-msgstr "�ра валар"
-
-#. TRANS: Menu item in mobile profile to register with the site.
-msgid "Register"
-msgstr "Дlавазвалар"
-
-#. TRANS: Menu item in mobile profile to log in.
-msgid "Login"
-msgstr "Вовзийта хьой"
-
-#. TRANS: Menu item in mobile profile to search the site.
-msgid "Search"
-msgstr "Лаха"
-
-#. TRANS: Field label in mobile profile to attach a file to a status.
-msgid "Attach"
-msgstr "Тlечlагlде"
-
-#. TRANS: Field title in mobile profile to attach a file to a status.
-#, fuzzy
-msgid "Attach a file."
-msgstr "Тlечlагlйе хlума"
-
 #. TRANS: Link to switch site layout from mobile to desktop mode. Appears at very bottom of page.
 msgid "Switch to desktop site layout."
 msgstr ""
diff --git a/plugins/MobileProfile/locale/de/LC_MESSAGES/MobileProfile.po b/plugins/MobileProfile/locale/de/LC_MESSAGES/MobileProfile.po
index 51f4f47e1e..a11676cb6c 100644
--- a/plugins/MobileProfile/locale/de/LC_MESSAGES/MobileProfile.po
+++ b/plugins/MobileProfile/locale/de/LC_MESSAGES/MobileProfile.po
@@ -11,14 +11,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - MobileProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:07+0000\n"
-"Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:13+0000\n"
+"Language-Team: German <https://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:27+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2012-01-02 10:11:36+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-mobileprofile\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -27,53 +27,6 @@ msgstr ""
 msgid "This page is not available in a media type you accept."
 msgstr "Diese Seite liegt in keinem von Ihnen akzeptierten Medientyp vor."
 
-#. TRANS: Menu item in mobile profile to go to start page of site.
-msgid "Home"
-msgstr "Startseite"
-
-#. TRANS: Menu item in mobile profile to go to user account settings.
-msgid "Account"
-msgstr "Konto"
-
-#. TRANS: Menu item in mobile profile to connect to other services.
-msgid "Connect"
-msgstr "Verbinden"
-
-#. TRANS: Menu item in mobile profile to manage site settings.
-msgid "Admin"
-msgstr "Administration"
-
-msgid "Change site configuration"
-msgstr "Seitenkonfiguration ändern"
-
-#. TRANS: Menu item in mobile profile to invite other people.
-msgid "Invite"
-msgstr "Einladen"
-
-#. TRANS: Menu item in mobile profile log the current user off.
-msgid "Logout"
-msgstr "Abmelden"
-
-#. TRANS: Menu item in mobile profile to register with the site.
-msgid "Register"
-msgstr "Registrieren"
-
-#. TRANS: Menu item in mobile profile to log in.
-msgid "Login"
-msgstr "Anmelden"
-
-#. TRANS: Menu item in mobile profile to search the site.
-msgid "Search"
-msgstr "Suche"
-
-#. TRANS: Field label in mobile profile to attach a file to a status.
-msgid "Attach"
-msgstr "Anhängen"
-
-#. TRANS: Field title in mobile profile to attach a file to a status.
-msgid "Attach a file."
-msgstr "Datei anhängen."
-
 #. TRANS: Link to switch site layout from mobile to desktop mode. Appears at very bottom of page.
 msgid "Switch to desktop site layout."
 msgstr "Wechsle zur Desktopdarstellung."
diff --git a/plugins/MobileProfile/locale/es/LC_MESSAGES/MobileProfile.po b/plugins/MobileProfile/locale/es/LC_MESSAGES/MobileProfile.po
index 0d1a74b8f4..9be1466f47 100644
--- a/plugins/MobileProfile/locale/es/LC_MESSAGES/MobileProfile.po
+++ b/plugins/MobileProfile/locale/es/LC_MESSAGES/MobileProfile.po
@@ -1,8 +1,8 @@
-# Translation of StatusNet - MobileProfile to Spanish (Español)
+# Translation of StatusNet - MobileProfile to Spanish (español)
 # Exported from translatewiki.net
 #
-# Author: Locos epraix
-# Author: Od1n
+# Author: Armando-Martin
+# Author: Fitoschido
 # --
 # This file is distributed under the same license as the StatusNet package.
 #
@@ -10,77 +10,30 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - MobileProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:07+0000\n"
-"Language-Team: Spanish <http://translatewiki.net/wiki/Portal:es>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:13+0000\n"
+"Language-Team: Spanish <https://translatewiki.net/wiki/Portal:es>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:27+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2012-01-02 10:11:36+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-plugin-mobileprofile\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANS: Client exception thrown when requesting a not supported media type.
 msgid "This page is not available in a media type you accept."
-msgstr ""
-
-#. TRANS: Menu item in mobile profile to go to start page of site.
-msgid "Home"
-msgstr ""
-
-#. TRANS: Menu item in mobile profile to go to user account settings.
-msgid "Account"
-msgstr "Cuenta"
-
-#. TRANS: Menu item in mobile profile to connect to other services.
-msgid "Connect"
-msgstr "Conectar"
-
-#. TRANS: Menu item in mobile profile to manage site settings.
-msgid "Admin"
-msgstr ""
-
-msgid "Change site configuration"
-msgstr ""
-
-#. TRANS: Menu item in mobile profile to invite other people.
-msgid "Invite"
-msgstr "Invitar"
-
-#. TRANS: Menu item in mobile profile log the current user off.
-msgid "Logout"
-msgstr "Cerrar sesión"
-
-#. TRANS: Menu item in mobile profile to register with the site.
-msgid "Register"
-msgstr ""
-
-#. TRANS: Menu item in mobile profile to log in.
-msgid "Login"
-msgstr "Iniciar sesión"
-
-#. TRANS: Menu item in mobile profile to search the site.
-msgid "Search"
-msgstr "Buscar"
-
-#. TRANS: Field label in mobile profile to attach a file to a status.
-msgid "Attach"
-msgstr ""
-
-#. TRANS: Field title in mobile profile to attach a file to a status.
-msgid "Attach a file."
-msgstr ""
+msgstr "Esta página no está disponible en el tipo de medio que aceptas."
 
 #. TRANS: Link to switch site layout from mobile to desktop mode. Appears at very bottom of page.
 msgid "Switch to desktop site layout."
-msgstr ""
+msgstr "Cambiar al formato de escritorio del sitio."
 
 #. TRANS: Link to switch site layout from desktop to mobile mode. Appears at very bottom of page.
 msgid "Switch to mobile site layout."
-msgstr ""
+msgstr "Cambiar al formato para móviles del sitio."
 
 #. TRANS: Plugin description.
 msgid "XHTML MobileProfile output for supporting user agents."
-msgstr ""
+msgstr "Salida XHTML MobileProfile para apoyar a los agentes de usuario."
diff --git a/plugins/MobileProfile/locale/eu/LC_MESSAGES/MobileProfile.po b/plugins/MobileProfile/locale/eu/LC_MESSAGES/MobileProfile.po
new file mode 100644
index 0000000000..bd465a1198
--- /dev/null
+++ b/plugins/MobileProfile/locale/eu/LC_MESSAGES/MobileProfile.po
@@ -0,0 +1,38 @@
+# Translation of StatusNet - MobileProfile to Basque (euskara)
+# Exported from translatewiki.net
+#
+# Author: Artsuaga
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - MobileProfile\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:13+0000\n"
+"Language-Team: Basque <https://translatewiki.net/wiki/Portal:eu>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2012-01-02 10:11:36+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: eu\n"
+"X-Message-Group: #out-statusnet-plugin-mobileprofile\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Client exception thrown when requesting a not supported media type.
+msgid "This page is not available in a media type you accept."
+msgstr "Orri hau ez dago eskuragarri darabilzun gailu mota bidez."
+
+#. TRANS: Link to switch site layout from mobile to desktop mode. Appears at very bottom of page.
+msgid "Switch to desktop site layout."
+msgstr "Aldatu mahaigain gune modura."
+
+#. TRANS: Link to switch site layout from desktop to mobile mode. Appears at very bottom of page.
+msgid "Switch to mobile site layout."
+msgstr "Aldatu mugikor gune modura."
+
+#. TRANS: Plugin description.
+msgid "XHTML MobileProfile output for supporting user agents."
+msgstr "XHTML MobileProfile irteera erabiltzaile agenteei sostengua emateko."
diff --git a/plugins/MobileProfile/locale/fr/LC_MESSAGES/MobileProfile.po b/plugins/MobileProfile/locale/fr/LC_MESSAGES/MobileProfile.po
index 2cfa7df0e9..f5243ee80d 100644
--- a/plugins/MobileProfile/locale/fr/LC_MESSAGES/MobileProfile.po
+++ b/plugins/MobileProfile/locale/fr/LC_MESSAGES/MobileProfile.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - MobileProfile to French (Français)
+# Translation of StatusNet - MobileProfile to French (français)
 # Exported from translatewiki.net
 #
 # Author: Crochet.david
@@ -11,14 +11,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - MobileProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:07+0000\n"
-"Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:13+0000\n"
+"Language-Team: French <https://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:27+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2012-01-02 10:11:36+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-mobileprofile\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
@@ -28,53 +28,6 @@ msgid "This page is not available in a media type you accept."
 msgstr ""
 "Cette page n’est pas disponible dans un des types de média que vous acceptez."
 
-#. TRANS: Menu item in mobile profile to go to start page of site.
-msgid "Home"
-msgstr "Accueil"
-
-#. TRANS: Menu item in mobile profile to go to user account settings.
-msgid "Account"
-msgstr "Compte"
-
-#. TRANS: Menu item in mobile profile to connect to other services.
-msgid "Connect"
-msgstr "Connexion"
-
-#. TRANS: Menu item in mobile profile to manage site settings.
-msgid "Admin"
-msgstr "Administrateur"
-
-msgid "Change site configuration"
-msgstr "Modifier la configuration du site"
-
-#. TRANS: Menu item in mobile profile to invite other people.
-msgid "Invite"
-msgstr "Inviter"
-
-#. TRANS: Menu item in mobile profile log the current user off.
-msgid "Logout"
-msgstr "Déconnexion"
-
-#. TRANS: Menu item in mobile profile to register with the site.
-msgid "Register"
-msgstr "S’inscrire"
-
-#. TRANS: Menu item in mobile profile to log in.
-msgid "Login"
-msgstr "Connexion"
-
-#. TRANS: Menu item in mobile profile to search the site.
-msgid "Search"
-msgstr "Rechercher"
-
-#. TRANS: Field label in mobile profile to attach a file to a status.
-msgid "Attach"
-msgstr "Joindre"
-
-#. TRANS: Field title in mobile profile to attach a file to a status.
-msgid "Attach a file."
-msgstr "Joindre un fichier."
-
 #. TRANS: Link to switch site layout from mobile to desktop mode. Appears at very bottom of page.
 msgid "Switch to desktop site layout."
 msgstr "Passer à la disposition du site de bureau."
diff --git a/plugins/MobileProfile/locale/fur/LC_MESSAGES/MobileProfile.po b/plugins/MobileProfile/locale/fur/LC_MESSAGES/MobileProfile.po
index 7bfe6b036d..b52c1dbd35 100644
--- a/plugins/MobileProfile/locale/fur/LC_MESSAGES/MobileProfile.po
+++ b/plugins/MobileProfile/locale/fur/LC_MESSAGES/MobileProfile.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - MobileProfile to Friulian (Furlan)
+# Translation of StatusNet - MobileProfile to Friulian (furlan)
 # Exported from translatewiki.net
 #
 # Author: Klenje
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - MobileProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:07+0000\n"
-"Language-Team: Friulian <http://translatewiki.net/wiki/Portal:fur>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:13+0000\n"
+"Language-Team: Friulian <https://translatewiki.net/wiki/Portal:fur>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:27+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2012-01-02 10:11:36+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: fur\n"
 "X-Message-Group: #out-statusnet-plugin-mobileprofile\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -26,53 +26,6 @@ msgid "This page is not available in a media type you accept."
 msgstr ""
 "Cheste pagjine no je disponibil intun gjenar multimediâl che tu acetis."
 
-#. TRANS: Menu item in mobile profile to go to start page of site.
-msgid "Home"
-msgstr "Inizi"
-
-#. TRANS: Menu item in mobile profile to go to user account settings.
-msgid "Account"
-msgstr "Identitât"
-
-#. TRANS: Menu item in mobile profile to connect to other services.
-msgid "Connect"
-msgstr "Conetiti"
-
-#. TRANS: Menu item in mobile profile to manage site settings.
-msgid "Admin"
-msgstr "Aministradôr"
-
-msgid "Change site configuration"
-msgstr "Cambie configurazion dal sît"
-
-#. TRANS: Menu item in mobile profile to invite other people.
-msgid "Invite"
-msgstr "Invide"
-
-#. TRANS: Menu item in mobile profile log the current user off.
-msgid "Logout"
-msgstr "Jes"
-
-#. TRANS: Menu item in mobile profile to register with the site.
-msgid "Register"
-msgstr "Regjistriti"
-
-#. TRANS: Menu item in mobile profile to log in.
-msgid "Login"
-msgstr "Jentre"
-
-#. TRANS: Menu item in mobile profile to search the site.
-msgid "Search"
-msgstr "Cîr"
-
-#. TRANS: Field label in mobile profile to attach a file to a status.
-msgid "Attach"
-msgstr "Aleghe"
-
-#. TRANS: Field title in mobile profile to attach a file to a status.
-msgid "Attach a file."
-msgstr "Aleghe un file."
-
 #. TRANS: Link to switch site layout from mobile to desktop mode. Appears at very bottom of page.
 msgid "Switch to desktop site layout."
 msgstr "Passe al sît web in version desktop"
diff --git a/plugins/MobileProfile/locale/gl/LC_MESSAGES/MobileProfile.po b/plugins/MobileProfile/locale/gl/LC_MESSAGES/MobileProfile.po
index 25fd3c53d9..cd9ff7b60b 100644
--- a/plugins/MobileProfile/locale/gl/LC_MESSAGES/MobileProfile.po
+++ b/plugins/MobileProfile/locale/gl/LC_MESSAGES/MobileProfile.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - MobileProfile to Galician (Galego)
+# Translation of StatusNet - MobileProfile to Galician (galego)
 # Exported from translatewiki.net
 #
 # Author: Toliño
@@ -9,78 +9,30 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - MobileProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:07+0000\n"
-"Language-Team: Galician <http://translatewiki.net/wiki/Portal:gl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:13+0000\n"
+"Language-Team: Galician <https://translatewiki.net/wiki/Portal:gl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:27+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2012-01-02 10:11:36+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: gl\n"
 "X-Message-Group: #out-statusnet-plugin-mobileprofile\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANS: Client exception thrown when requesting a not supported media type.
 msgid "This page is not available in a media type you accept."
-msgstr ""
-
-#. TRANS: Menu item in mobile profile to go to start page of site.
-msgid "Home"
-msgstr "Inicio"
-
-#. TRANS: Menu item in mobile profile to go to user account settings.
-msgid "Account"
-msgstr "Conta"
-
-#. TRANS: Menu item in mobile profile to connect to other services.
-msgid "Connect"
-msgstr "Conectar"
-
-#. TRANS: Menu item in mobile profile to manage site settings.
-msgid "Admin"
-msgstr "Administrador"
-
-msgid "Change site configuration"
-msgstr "Cambiar a configuración do sitio"
-
-#. TRANS: Menu item in mobile profile to invite other people.
-msgid "Invite"
-msgstr "Convidar"
-
-#. TRANS: Menu item in mobile profile log the current user off.
-msgid "Logout"
-msgstr "Saír"
-
-#. TRANS: Menu item in mobile profile to register with the site.
-msgid "Register"
-msgstr "Rexistrarse"
-
-#. TRANS: Menu item in mobile profile to log in.
-msgid "Login"
-msgstr "Rexistro"
-
-#. TRANS: Menu item in mobile profile to search the site.
-msgid "Search"
-msgstr "Procurar"
-
-#. TRANS: Field label in mobile profile to attach a file to a status.
-msgid "Attach"
-msgstr "Anexar"
-
-#. TRANS: Field title in mobile profile to attach a file to a status.
-#, fuzzy
-msgid "Attach a file."
-msgstr "Anexar un ficheiro"
+msgstr "Esta páxina non está dispoñible nun formato axeitado para vostede."
 
 #. TRANS: Link to switch site layout from mobile to desktop mode. Appears at very bottom of page.
 msgid "Switch to desktop site layout."
-msgstr ""
+msgstr "Cambiar ao esquema do sitio de escritorio."
 
 #. TRANS: Link to switch site layout from desktop to mobile mode. Appears at very bottom of page.
 msgid "Switch to mobile site layout."
-msgstr ""
+msgstr "Cambiar ao esquema do sitio de móbil."
 
 #. TRANS: Plugin description.
 msgid "XHTML MobileProfile output for supporting user agents."
-msgstr ""
+msgstr "Saída XHTML MobileProfile para os navegadores compatibles."
diff --git a/plugins/MobileProfile/locale/hu/LC_MESSAGES/MobileProfile.po b/plugins/MobileProfile/locale/hu/LC_MESSAGES/MobileProfile.po
deleted file mode 100644
index a5df0aedf1..0000000000
--- a/plugins/MobileProfile/locale/hu/LC_MESSAGES/MobileProfile.po
+++ /dev/null
@@ -1,86 +0,0 @@
-# Translation of StatusNet - MobileProfile to Hungarian (Magyar)
-# Exported from translatewiki.net
-#
-# Author: Dani
-# --
-# This file is distributed under the same license as the StatusNet package.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: StatusNet - MobileProfile\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:08+0000\n"
-"Language-Team: Hungarian <http://translatewiki.net/wiki/Portal:hu>\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:27+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
-"X-Language-Code: hu\n"
-"X-Message-Group: #out-statusnet-plugin-mobileprofile\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#. TRANS: Client exception thrown when requesting a not supported media type.
-msgid "This page is not available in a media type you accept."
-msgstr ""
-
-#. TRANS: Menu item in mobile profile to go to start page of site.
-msgid "Home"
-msgstr ""
-
-#. TRANS: Menu item in mobile profile to go to user account settings.
-msgid "Account"
-msgstr ""
-
-#. TRANS: Menu item in mobile profile to connect to other services.
-msgid "Connect"
-msgstr ""
-
-#. TRANS: Menu item in mobile profile to manage site settings.
-msgid "Admin"
-msgstr ""
-
-msgid "Change site configuration"
-msgstr ""
-
-#. TRANS: Menu item in mobile profile to invite other people.
-msgid "Invite"
-msgstr "Meghívás"
-
-#. TRANS: Menu item in mobile profile log the current user off.
-msgid "Logout"
-msgstr "Kijelentkezés"
-
-#. TRANS: Menu item in mobile profile to register with the site.
-msgid "Register"
-msgstr "Regisztráció"
-
-#. TRANS: Menu item in mobile profile to log in.
-msgid "Login"
-msgstr "Bejelentkezés"
-
-#. TRANS: Menu item in mobile profile to search the site.
-msgid "Search"
-msgstr "Keresés"
-
-#. TRANS: Field label in mobile profile to attach a file to a status.
-msgid "Attach"
-msgstr "Csatolás"
-
-#. TRANS: Field title in mobile profile to attach a file to a status.
-#, fuzzy
-msgid "Attach a file."
-msgstr "Fájl csatolása"
-
-#. TRANS: Link to switch site layout from mobile to desktop mode. Appears at very bottom of page.
-msgid "Switch to desktop site layout."
-msgstr ""
-
-#. TRANS: Link to switch site layout from desktop to mobile mode. Appears at very bottom of page.
-msgid "Switch to mobile site layout."
-msgstr ""
-
-#. TRANS: Plugin description.
-msgid "XHTML MobileProfile output for supporting user agents."
-msgstr ""
diff --git a/plugins/MobileProfile/locale/ia/LC_MESSAGES/MobileProfile.po b/plugins/MobileProfile/locale/ia/LC_MESSAGES/MobileProfile.po
index e953be16d8..1744c0e44d 100644
--- a/plugins/MobileProfile/locale/ia/LC_MESSAGES/MobileProfile.po
+++ b/plugins/MobileProfile/locale/ia/LC_MESSAGES/MobileProfile.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - MobileProfile to Interlingua (Interlingua)
+# Translation of StatusNet - MobileProfile to Interlingua (interlingua)
 # Exported from translatewiki.net
 #
 # Author: McDutchie
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - MobileProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:08+0000\n"
-"Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:14+0000\n"
+"Language-Team: Interlingua <https://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:27+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2012-01-02 10:11:36+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-mobileprofile\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -25,53 +25,6 @@ msgstr ""
 msgid "This page is not available in a media type you accept."
 msgstr "Iste pagina non es disponibile in un formato que tu accepta."
 
-#. TRANS: Menu item in mobile profile to go to start page of site.
-msgid "Home"
-msgstr "Initio"
-
-#. TRANS: Menu item in mobile profile to go to user account settings.
-msgid "Account"
-msgstr "Conto"
-
-#. TRANS: Menu item in mobile profile to connect to other services.
-msgid "Connect"
-msgstr "Connecter"
-
-#. TRANS: Menu item in mobile profile to manage site settings.
-msgid "Admin"
-msgstr "Admin"
-
-msgid "Change site configuration"
-msgstr "Modificar le configuration del sito"
-
-#. TRANS: Menu item in mobile profile to invite other people.
-msgid "Invite"
-msgstr "Invitar"
-
-#. TRANS: Menu item in mobile profile log the current user off.
-msgid "Logout"
-msgstr "Clauder session"
-
-#. TRANS: Menu item in mobile profile to register with the site.
-msgid "Register"
-msgstr "Crear conto"
-
-#. TRANS: Menu item in mobile profile to log in.
-msgid "Login"
-msgstr "Aperir session"
-
-#. TRANS: Menu item in mobile profile to search the site.
-msgid "Search"
-msgstr "Cercar"
-
-#. TRANS: Field label in mobile profile to attach a file to a status.
-msgid "Attach"
-msgstr "Annexar"
-
-#. TRANS: Field title in mobile profile to attach a file to a status.
-msgid "Attach a file."
-msgstr "Annexar un file."
-
 #. TRANS: Link to switch site layout from mobile to desktop mode. Appears at very bottom of page.
 msgid "Switch to desktop site layout."
 msgstr "Cambiar al disposition de sito a scriptorio."
diff --git a/plugins/MobileProfile/locale/it/LC_MESSAGES/MobileProfile.po b/plugins/MobileProfile/locale/it/LC_MESSAGES/MobileProfile.po
new file mode 100644
index 0000000000..61934e01f4
--- /dev/null
+++ b/plugins/MobileProfile/locale/it/LC_MESSAGES/MobileProfile.po
@@ -0,0 +1,35 @@
+# Translation of StatusNet - MobileProfile to Italian (italiano)
+# Exported from translatewiki.net
+#
+# Author: GreenFox
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - MobileProfile\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:14+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2012-01-02 10:11:36+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Client exception thrown when requesting a not supported media type.
+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"
+
+#. TRANS: Link to switch site layout from mobile to desktop mode. Appears at very bottom of page.
+msgid "Switch to desktop site layout."
+msgstr "Passa alla modalità di visualizzazione di tipo desktop."
+
+#. TRANS: Link to switch site layout from desktop to mobile mode. Appears at very bottom of page.
+msgid "Switch to mobile site layout."
+msgstr "Passa alla modalità di visualizzazione di tipo dispositivo mobile."
+
+#. TRANS: Plugin description.
+msgid "XHTML MobileProfile output for supporting user agents."
+msgstr "Output in XHTML MobileProfile per i visualizzatori compatibili."
diff --git a/plugins/MobileProfile/locale/mk/LC_MESSAGES/MobileProfile.po b/plugins/MobileProfile/locale/mk/LC_MESSAGES/MobileProfile.po
index d524fc9e66..c8867e8fbd 100644
--- a/plugins/MobileProfile/locale/mk/LC_MESSAGES/MobileProfile.po
+++ b/plugins/MobileProfile/locale/mk/LC_MESSAGES/MobileProfile.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - MobileProfile to Macedonian (Македон�ки)
+# Translation of StatusNet - MobileProfile to Macedonian (македон�ки)
 # Exported from translatewiki.net
 #
 # Author: Bjankuloski06
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - MobileProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:08+0000\n"
-"Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:14+0000\n"
+"Language-Team: Macedonian <https://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:27+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2012-01-02 10:11:36+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-mobileprofile\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
@@ -25,60 +25,13 @@ msgstr ""
 msgid "This page is not available in a media type you accept."
 msgstr "Страницава не е до�тапна во форматот кој Вие го прифаќате."
 
-#. TRANS: Menu item in mobile profile to go to start page of site.
-msgid "Home"
-msgstr "Почетна"
-
-#. TRANS: Menu item in mobile profile to go to user account settings.
-msgid "Account"
-msgstr "Сметка"
-
-#. TRANS: Menu item in mobile profile to connect to other services.
-msgid "Connect"
-msgstr "Поврзи �е"
-
-#. TRANS: Menu item in mobile profile to manage site settings.
-msgid "Admin"
-msgstr "�дмини�тратор"
-
-msgid "Change site configuration"
-msgstr "Промена на по�тавките на мрежното ме�то"
-
-#. TRANS: Menu item in mobile profile to invite other people.
-msgid "Invite"
-msgstr "Покани"
-
-#. TRANS: Menu item in mobile profile log the current user off.
-msgid "Logout"
-msgstr "Одјава"
-
-#. TRANS: Menu item in mobile profile to register with the site.
-msgid "Register"
-msgstr "Реги�трација"
-
-#. TRANS: Menu item in mobile profile to log in.
-msgid "Login"
-msgstr "�ајава"
-
-#. TRANS: Menu item in mobile profile to search the site.
-msgid "Search"
-msgstr "Пребарај"
-
-#. TRANS: Field label in mobile profile to attach a file to a status.
-msgid "Attach"
-msgstr "Приложи"
-
-#. TRANS: Field title in mobile profile to attach a file to a status.
-msgid "Attach a file."
-msgstr "Приложи податотека"
-
 #. TRANS: Link to switch site layout from mobile to desktop mode. Appears at very bottom of page.
 msgid "Switch to desktop site layout."
 msgstr "Префрли ме на �толен ра�поред."
 
 #. TRANS: Link to switch site layout from desktop to mobile mode. Appears at very bottom of page.
 msgid "Switch to mobile site layout."
-msgstr "Префрли ме на мобилен ра�поред."
+msgstr "Верзија за мобилен уред."
 
 #. TRANS: Plugin description.
 msgid "XHTML MobileProfile output for supporting user agents."
diff --git a/plugins/MobileProfile/locale/nb/LC_MESSAGES/MobileProfile.po b/plugins/MobileProfile/locale/nb/LC_MESSAGES/MobileProfile.po
index c22f4697c7..614ca88301 100644
--- a/plugins/MobileProfile/locale/nb/LC_MESSAGES/MobileProfile.po
+++ b/plugins/MobileProfile/locale/nb/LC_MESSAGES/MobileProfile.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - MobileProfile to Norwegian (bokmål)‬ (‪Norsk (bokmål)‬)
+# Translation of StatusNet - MobileProfile to Norwegian Bokmål (‪norsk (bokmål)‬)
 # Exported from translatewiki.net
 #
 # Author: Nghtwlkr
@@ -9,15 +9,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - MobileProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:08+0000\n"
-"Language-Team: Norwegian (bokmål)‬ <http://translatewiki.net/wiki/Portal:no>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:14+0000\n"
+"Language-Team: Norwegian Bokmål <https://translatewiki.net/wiki/Portal:nb>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:27+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
-"X-Language-Code: no\n"
+"X-POT-Import-Date: 2012-01-02 10:11:36+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: nb\n"
 "X-Message-Group: #out-statusnet-plugin-mobileprofile\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
@@ -25,54 +25,6 @@ msgstr ""
 msgid "This page is not available in a media type you accept."
 msgstr "Denne siden er ikke tilgjengelig i en mediatype du aksepterer."
 
-#. TRANS: Menu item in mobile profile to go to start page of site.
-msgid "Home"
-msgstr "Hjem"
-
-#. TRANS: Menu item in mobile profile to go to user account settings.
-msgid "Account"
-msgstr "Konto"
-
-#. TRANS: Menu item in mobile profile to connect to other services.
-msgid "Connect"
-msgstr "Koble til"
-
-#. TRANS: Menu item in mobile profile to manage site settings.
-msgid "Admin"
-msgstr "Admin"
-
-msgid "Change site configuration"
-msgstr "Endre nettstedskonfigurasjon"
-
-#. TRANS: Menu item in mobile profile to invite other people.
-msgid "Invite"
-msgstr "Inviter"
-
-#. TRANS: Menu item in mobile profile log the current user off.
-msgid "Logout"
-msgstr "Logg ut"
-
-#. TRANS: Menu item in mobile profile to register with the site.
-msgid "Register"
-msgstr "Registrer"
-
-#. TRANS: Menu item in mobile profile to log in.
-msgid "Login"
-msgstr "Logg inn"
-
-#. TRANS: Menu item in mobile profile to search the site.
-msgid "Search"
-msgstr "Søk"
-
-#. TRANS: Field label in mobile profile to attach a file to a status.
-msgid "Attach"
-msgstr "Legg ved"
-
-#. TRANS: Field title in mobile profile to attach a file to a status.
-#, fuzzy
-msgid "Attach a file."
-msgstr "Legg ved en fil"
-
 #. TRANS: Link to switch site layout from mobile to desktop mode. Appears at very bottom of page.
 msgid "Switch to desktop site layout."
 msgstr ""
diff --git a/plugins/MobileProfile/locale/nl/LC_MESSAGES/MobileProfile.po b/plugins/MobileProfile/locale/nl/LC_MESSAGES/MobileProfile.po
index 94152bdf3e..6ca39941ab 100644
--- a/plugins/MobileProfile/locale/nl/LC_MESSAGES/MobileProfile.po
+++ b/plugins/MobileProfile/locale/nl/LC_MESSAGES/MobileProfile.po
@@ -11,14 +11,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - MobileProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:08+0000\n"
-"Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:14+0000\n"
+"Language-Team: Dutch <https://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:27+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2012-01-02 10:11:36+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-mobileprofile\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -27,53 +27,6 @@ msgstr ""
 msgid "This page is not available in a media type you accept."
 msgstr "Deze pagina is niet beschikbaar in een mediumtype dat u accepteert."
 
-#. TRANS: Menu item in mobile profile to go to start page of site.
-msgid "Home"
-msgstr "Hoofdmenu"
-
-#. TRANS: Menu item in mobile profile to go to user account settings.
-msgid "Account"
-msgstr "Gebruiker"
-
-#. TRANS: Menu item in mobile profile to connect to other services.
-msgid "Connect"
-msgstr "Koppelen"
-
-#. TRANS: Menu item in mobile profile to manage site settings.
-msgid "Admin"
-msgstr "Beheer"
-
-msgid "Change site configuration"
-msgstr "Websiteinstellingen wijzigen"
-
-#. TRANS: Menu item in mobile profile to invite other people.
-msgid "Invite"
-msgstr "Uitnodigen"
-
-#. TRANS: Menu item in mobile profile log the current user off.
-msgid "Logout"
-msgstr "Afmelden"
-
-#. TRANS: Menu item in mobile profile to register with the site.
-msgid "Register"
-msgstr "Registreren"
-
-#. TRANS: Menu item in mobile profile to log in.
-msgid "Login"
-msgstr "Aanmelden"
-
-#. TRANS: Menu item in mobile profile to search the site.
-msgid "Search"
-msgstr "Zoeken"
-
-#. TRANS: Field label in mobile profile to attach a file to a status.
-msgid "Attach"
-msgstr "Toevoegen"
-
-#. TRANS: Field title in mobile profile to attach a file to a status.
-msgid "Attach a file."
-msgstr "Bestand toevoegen."
-
 #. TRANS: Link to switch site layout from mobile to desktop mode. Appears at very bottom of page.
 msgid "Switch to desktop site layout."
 msgstr "Omschakelen naar de vormgeving van de desktopsite."
diff --git a/plugins/MobileProfile/locale/ps/LC_MESSAGES/MobileProfile.po b/plugins/MobileProfile/locale/ps/LC_MESSAGES/MobileProfile.po
deleted file mode 100644
index 156c2d47f9..0000000000
--- a/plugins/MobileProfile/locale/ps/LC_MESSAGES/MobileProfile.po
+++ /dev/null
@@ -1,85 +0,0 @@
-# Translation of StatusNet - MobileProfile to Pashto (پښتو)
-# Exported from translatewiki.net
-#
-# Author: Ahmed-Najib-Biabani-Ibrahimkhel
-# --
-# This file is distributed under the same license as the StatusNet package.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: StatusNet - MobileProfile\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:08+0000\n"
-"Language-Team: Pashto <http://translatewiki.net/wiki/Portal:ps>\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:27+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
-"X-Language-Code: ps\n"
-"X-Message-Group: #out-statusnet-plugin-mobileprofile\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#. TRANS: Client exception thrown when requesting a not supported media type.
-msgid "This page is not available in a media type you accept."
-msgstr ""
-
-#. TRANS: Menu item in mobile profile to go to start page of site.
-msgid "Home"
-msgstr "کور"
-
-#. TRANS: Menu item in mobile profile to go to user account settings.
-msgid "Account"
-msgstr "ګڼون"
-
-#. TRANS: Menu item in mobile profile to connect to other services.
-msgid "Connect"
-msgstr ""
-
-#. TRANS: Menu item in mobile profile to manage site settings.
-msgid "Admin"
-msgstr "پازوال"
-
-msgid "Change site configuration"
-msgstr ""
-
-#. TRANS: Menu item in mobile profile to invite other people.
-msgid "Invite"
-msgstr "بلل"
-
-#. TRANS: Menu item in mobile profile log the current user off.
-msgid "Logout"
-msgstr "وتل"
-
-#. TRANS: Menu item in mobile profile to register with the site.
-msgid "Register"
-msgstr "نومليکل"
-
-#. TRANS: Menu item in mobile profile to log in.
-msgid "Login"
-msgstr "ننوتل"
-
-#. TRANS: Menu item in mobile profile to search the site.
-msgid "Search"
-msgstr "پلټل"
-
-#. TRANS: Field label in mobile profile to attach a file to a status.
-msgid "Attach"
-msgstr ""
-
-#. TRANS: Field title in mobile profile to attach a file to a status.
-msgid "Attach a file."
-msgstr ""
-
-#. TRANS: Link to switch site layout from mobile to desktop mode. Appears at very bottom of page.
-msgid "Switch to desktop site layout."
-msgstr ""
-
-#. TRANS: Link to switch site layout from desktop to mobile mode. Appears at very bottom of page.
-msgid "Switch to mobile site layout."
-msgstr ""
-
-#. TRANS: Plugin description.
-msgid "XHTML MobileProfile output for supporting user agents."
-msgstr ""
diff --git a/plugins/MobileProfile/locale/ru/LC_MESSAGES/MobileProfile.po b/plugins/MobileProfile/locale/ru/LC_MESSAGES/MobileProfile.po
index cf592a19ab..208293bccc 100644
--- a/plugins/MobileProfile/locale/ru/LC_MESSAGES/MobileProfile.po
+++ b/plugins/MobileProfile/locale/ru/LC_MESSAGES/MobileProfile.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - MobileProfile to Russian (Ру��кий)
+# Translation of StatusNet - MobileProfile to Russian (ру��кий)
 # Exported from translatewiki.net
 #
 # Author: Eleferen
@@ -11,14 +11,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - MobileProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:08+0000\n"
-"Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:14+0000\n"
+"Language-Team: Russian <https://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:27+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2012-01-02 10:11:36+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-mobileprofile\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
@@ -28,54 +28,6 @@ msgstr ""
 msgid "This page is not available in a media type you accept."
 msgstr "Страница недо�тупна дл� того типа, который вы задей�твовали."
 
-#. TRANS: Menu item in mobile profile to go to start page of site.
-msgid "Home"
-msgstr "Домой"
-
-#. TRANS: Menu item in mobile profile to go to user account settings.
-msgid "Account"
-msgstr "�ккаунт"
-
-#. TRANS: Menu item in mobile profile to connect to other services.
-msgid "Connect"
-msgstr "Подключить��"
-
-#. TRANS: Menu item in mobile profile to manage site settings.
-msgid "Admin"
-msgstr "�дмини�тратор"
-
-msgid "Change site configuration"
-msgstr "Изменить конфигурацию �айта"
-
-#. TRANS: Menu item in mobile profile to invite other people.
-msgid "Invite"
-msgstr "Пригла�ить"
-
-#. TRANS: Menu item in mobile profile log the current user off.
-msgid "Logout"
-msgstr "Выйти"
-
-#. TRANS: Menu item in mobile profile to register with the site.
-msgid "Register"
-msgstr "Реги�траци�"
-
-#. TRANS: Menu item in mobile profile to log in.
-msgid "Login"
-msgstr "Пред�тавить��"
-
-#. TRANS: Menu item in mobile profile to search the site.
-msgid "Search"
-msgstr "Пои�к"
-
-#. TRANS: Field label in mobile profile to attach a file to a status.
-msgid "Attach"
-msgstr "Прикрепить"
-
-#. TRANS: Field title in mobile profile to attach a file to a status.
-#, fuzzy
-msgid "Attach a file."
-msgstr "Прикрепить файл"
-
 #. TRANS: Link to switch site layout from mobile to desktop mode. Appears at very bottom of page.
 msgid "Switch to desktop site layout."
 msgstr "Переключить на вер�ию дл� пер�онального компьютера."
diff --git a/plugins/MobileProfile/locale/sv/LC_MESSAGES/MobileProfile.po b/plugins/MobileProfile/locale/sv/LC_MESSAGES/MobileProfile.po
index 518b2c1703..2089c170a3 100644
--- a/plugins/MobileProfile/locale/sv/LC_MESSAGES/MobileProfile.po
+++ b/plugins/MobileProfile/locale/sv/LC_MESSAGES/MobileProfile.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - MobileProfile to Swedish (Svenska)
+# Translation of StatusNet - MobileProfile to Swedish (svenska)
 # Exported from translatewiki.net
 #
 # Author: Jamminjohn
@@ -10,14 +10,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - MobileProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:08+0000\n"
-"Language-Team: Swedish <http://translatewiki.net/wiki/Portal:sv>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:14+0000\n"
+"Language-Team: Swedish <https://translatewiki.net/wiki/Portal:sv>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:27+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2012-01-02 10:11:36+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: sv\n"
 "X-Message-Group: #out-statusnet-plugin-mobileprofile\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -26,53 +26,6 @@ msgstr ""
 msgid "This page is not available in a media type you accept."
 msgstr "Denna sida är inte tillgänglig i en medietyp du accepterat."
 
-#. TRANS: Menu item in mobile profile to go to start page of site.
-msgid "Home"
-msgstr "Hem"
-
-#. TRANS: Menu item in mobile profile to go to user account settings.
-msgid "Account"
-msgstr "Konto"
-
-#. TRANS: Menu item in mobile profile to connect to other services.
-msgid "Connect"
-msgstr "Anslut"
-
-#. TRANS: Menu item in mobile profile to manage site settings.
-msgid "Admin"
-msgstr "Admin"
-
-msgid "Change site configuration"
-msgstr "Ändra webbplatskonfiguration"
-
-#. TRANS: Menu item in mobile profile to invite other people.
-msgid "Invite"
-msgstr "Bjud in"
-
-#. TRANS: Menu item in mobile profile log the current user off.
-msgid "Logout"
-msgstr "Logga ut"
-
-#. TRANS: Menu item in mobile profile to register with the site.
-msgid "Register"
-msgstr "Registrera"
-
-#. TRANS: Menu item in mobile profile to log in.
-msgid "Login"
-msgstr "Logga in"
-
-#. TRANS: Menu item in mobile profile to search the site.
-msgid "Search"
-msgstr "Sök"
-
-#. TRANS: Field label in mobile profile to attach a file to a status.
-msgid "Attach"
-msgstr "Bifoga"
-
-#. TRANS: Field title in mobile profile to attach a file to a status.
-msgid "Attach a file."
-msgstr "Bifoga en fil."
-
 #. TRANS: Link to switch site layout from mobile to desktop mode. Appears at very bottom of page.
 msgid "Switch to desktop site layout."
 msgstr "Växla till stationär webbplatslayout."
diff --git a/plugins/MobileProfile/locale/ta/LC_MESSAGES/MobileProfile.po b/plugins/MobileProfile/locale/ta/LC_MESSAGES/MobileProfile.po
deleted file mode 100644
index 623fbb0ae7..0000000000
--- a/plugins/MobileProfile/locale/ta/LC_MESSAGES/MobileProfile.po
+++ /dev/null
@@ -1,86 +0,0 @@
-# Translation of StatusNet - MobileProfile to Tamil (தமிழ�)
-# Exported from translatewiki.net
-#
-# Author: TRYPPN
-# --
-# This file is distributed under the same license as the StatusNet package.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: StatusNet - MobileProfile\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:08+0000\n"
-"Language-Team: Tamil <http://translatewiki.net/wiki/Portal:ta>\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:27+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
-"X-Language-Code: ta\n"
-"X-Message-Group: #out-statusnet-plugin-mobileprofile\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#. TRANS: Client exception thrown when requesting a not supported media type.
-msgid "This page is not available in a media type you accept."
-msgstr ""
-
-#. TRANS: Menu item in mobile profile to go to start page of site.
-msgid "Home"
-msgstr ""
-
-#. TRANS: Menu item in mobile profile to go to user account settings.
-msgid "Account"
-msgstr "கணக�க�"
-
-#. TRANS: Menu item in mobile profile to connect to other services.
-msgid "Connect"
-msgstr "இணை"
-
-#. TRANS: Menu item in mobile profile to manage site settings.
-msgid "Admin"
-msgstr ""
-
-msgid "Change site configuration"
-msgstr ""
-
-#. TRANS: Menu item in mobile profile to invite other people.
-msgid "Invite"
-msgstr ""
-
-#. TRANS: Menu item in mobile profile log the current user off.
-msgid "Logout"
-msgstr "விட�பதிகை"
-
-#. TRANS: Menu item in mobile profile to register with the site.
-msgid "Register"
-msgstr "பதிவ� செய�"
-
-#. TRANS: Menu item in mobile profile to log in.
-msgid "Login"
-msgstr "ப�க�பதிகை"
-
-#. TRANS: Menu item in mobile profile to search the site.
-msgid "Search"
-msgstr "தேட�க"
-
-#. TRANS: Field label in mobile profile to attach a file to a status.
-msgid "Attach"
-msgstr "இணை"
-
-#. TRANS: Field title in mobile profile to attach a file to a status.
-#, fuzzy
-msgid "Attach a file."
-msgstr "ஒர� கோப�பை இணைக�கவ�ம�"
-
-#. TRANS: Link to switch site layout from mobile to desktop mode. Appears at very bottom of page.
-msgid "Switch to desktop site layout."
-msgstr ""
-
-#. TRANS: Link to switch site layout from desktop to mobile mode. Appears at very bottom of page.
-msgid "Switch to mobile site layout."
-msgstr ""
-
-#. TRANS: Plugin description.
-msgid "XHTML MobileProfile output for supporting user agents."
-msgstr ""
diff --git a/plugins/MobileProfile/locale/te/LC_MESSAGES/MobileProfile.po b/plugins/MobileProfile/locale/te/LC_MESSAGES/MobileProfile.po
deleted file mode 100644
index 16917ac47d..0000000000
--- a/plugins/MobileProfile/locale/te/LC_MESSAGES/MobileProfile.po
+++ /dev/null
@@ -1,86 +0,0 @@
-# Translation of StatusNet - MobileProfile to Telugu (తెల�గ�)
-# Exported from translatewiki.net
-#
-# Author: Veeven
-# --
-# This file is distributed under the same license as the StatusNet package.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: StatusNet - MobileProfile\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:09+0000\n"
-"Language-Team: Telugu <http://translatewiki.net/wiki/Portal:te>\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:27+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
-"X-Language-Code: te\n"
-"X-Message-Group: #out-statusnet-plugin-mobileprofile\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#. TRANS: Client exception thrown when requesting a not supported media type.
-msgid "This page is not available in a media type you accept."
-msgstr ""
-
-#. TRANS: Menu item in mobile profile to go to start page of site.
-msgid "Home"
-msgstr "మ�ంగిలి"
-
-#. TRANS: Menu item in mobile profile to go to user account settings.
-msgid "Account"
-msgstr "ఖాతా"
-
-#. TRANS: Menu item in mobile profile to connect to other services.
-msgid "Connect"
-msgstr ""
-
-#. TRANS: Menu item in mobile profile to manage site settings.
-msgid "Admin"
-msgstr ""
-
-msgid "Change site configuration"
-msgstr ""
-
-#. TRANS: Menu item in mobile profile to invite other people.
-msgid "Invite"
-msgstr "ఆహ�వానించ�"
-
-#. TRANS: Menu item in mobile profile log the current user off.
-msgid "Logout"
-msgstr "నిష�క�రమించండి"
-
-#. TRANS: Menu item in mobile profile to register with the site.
-msgid "Register"
-msgstr "నమోదవ�వండి"
-
-#. TRANS: Menu item in mobile profile to log in.
-msgid "Login"
-msgstr "ప�రవేశించండి"
-
-#. TRANS: Menu item in mobile profile to search the site.
-msgid "Search"
-msgstr "వెత�క�"
-
-#. TRANS: Field label in mobile profile to attach a file to a status.
-msgid "Attach"
-msgstr "జోడించ�"
-
-#. TRANS: Field title in mobile profile to attach a file to a status.
-#, fuzzy
-msgid "Attach a file."
-msgstr "ఒక దస�త�రాన�ని జోడించండి"
-
-#. TRANS: Link to switch site layout from mobile to desktop mode. Appears at very bottom of page.
-msgid "Switch to desktop site layout."
-msgstr ""
-
-#. TRANS: Link to switch site layout from desktop to mobile mode. Appears at very bottom of page.
-msgid "Switch to mobile site layout."
-msgstr ""
-
-#. TRANS: Plugin description.
-msgid "XHTML MobileProfile output for supporting user agents."
-msgstr ""
diff --git a/plugins/MobileProfile/locale/tl/LC_MESSAGES/MobileProfile.po b/plugins/MobileProfile/locale/tl/LC_MESSAGES/MobileProfile.po
index a74698613a..fa29b844b6 100644
--- a/plugins/MobileProfile/locale/tl/LC_MESSAGES/MobileProfile.po
+++ b/plugins/MobileProfile/locale/tl/LC_MESSAGES/MobileProfile.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - MobileProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:09+0000\n"
-"Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:14+0000\n"
+"Language-Team: Tagalog <https://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:27+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2012-01-02 10:11:36+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-mobileprofile\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -25,53 +25,6 @@ msgstr ""
 msgid "This page is not available in a media type you accept."
 msgstr "Ang pahinang ito ay hindi makukuha sa uri ng midya na tinanggap mo."
 
-#. TRANS: Menu item in mobile profile to go to start page of site.
-msgid "Home"
-msgstr "Tahanan"
-
-#. TRANS: Menu item in mobile profile to go to user account settings.
-msgid "Account"
-msgstr "Akawnt"
-
-#. TRANS: Menu item in mobile profile to connect to other services.
-msgid "Connect"
-msgstr "Umugnay"
-
-#. TRANS: Menu item in mobile profile to manage site settings.
-msgid "Admin"
-msgstr "Tagapangasiwa"
-
-msgid "Change site configuration"
-msgstr "Baguhin ang pagkakaayos ng sityo"
-
-#. TRANS: Menu item in mobile profile to invite other people.
-msgid "Invite"
-msgstr "Anyayahan"
-
-#. TRANS: Menu item in mobile profile log the current user off.
-msgid "Logout"
-msgstr "Umalis sa pagkakalagda"
-
-#. TRANS: Menu item in mobile profile to register with the site.
-msgid "Register"
-msgstr "Magpatala"
-
-#. TRANS: Menu item in mobile profile to log in.
-msgid "Login"
-msgstr "Lumagda"
-
-#. TRANS: Menu item in mobile profile to search the site.
-msgid "Search"
-msgstr "Humanap"
-
-#. TRANS: Field label in mobile profile to attach a file to a status.
-msgid "Attach"
-msgstr "Ilakip"
-
-#. TRANS: Field title in mobile profile to attach a file to a status.
-msgid "Attach a file."
-msgstr "Maglakip ng isang talaksan."
-
 #. TRANS: Link to switch site layout from mobile to desktop mode. Appears at very bottom of page.
 msgid "Switch to desktop site layout."
 msgstr "Lumipat sa kalatagan ng sityong pang-ibabaw ng mesa."
diff --git a/plugins/MobileProfile/locale/uk/LC_MESSAGES/MobileProfile.po b/plugins/MobileProfile/locale/uk/LC_MESSAGES/MobileProfile.po
index a0ca2ee681..d2e1003fbd 100644
--- a/plugins/MobileProfile/locale/uk/LC_MESSAGES/MobileProfile.po
+++ b/plugins/MobileProfile/locale/uk/LC_MESSAGES/MobileProfile.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - MobileProfile to Ukrainian (Україн�ька)
+# Translation of StatusNet - MobileProfile to Ukrainian (україн�ька)
 # Exported from translatewiki.net
 #
 # Author: Boogie
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - MobileProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:09+0000\n"
-"Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:14+0000\n"
+"Language-Team: Ukrainian <https://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:27+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2012-01-02 10:11:36+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-mobileprofile\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
@@ -26,53 +26,6 @@ msgstr ""
 msgid "This page is not available in a media type you accept."
 msgstr "Ц� �торінка не до�тупна дл� того типу медіа, з �ким ви погодили�ь."
 
-#. TRANS: Menu item in mobile profile to go to start page of site.
-msgid "Home"
-msgstr "Головна"
-
-#. TRANS: Menu item in mobile profile to go to user account settings.
-msgid "Account"
-msgstr "�каунт"
-
-#. TRANS: Menu item in mobile profile to connect to other services.
-msgid "Connect"
-msgstr "З’єднанн�"
-
-#. TRANS: Menu item in mobile profile to manage site settings.
-msgid "Admin"
-msgstr "�дмін"
-
-msgid "Change site configuration"
-msgstr "Змінити конфігурацію �айту"
-
-#. TRANS: Menu item in mobile profile to invite other people.
-msgid "Invite"
-msgstr "Запро�ити"
-
-#. TRANS: Menu item in mobile profile log the current user off.
-msgid "Logout"
-msgstr "Вийти"
-
-#. TRANS: Menu item in mobile profile to register with the site.
-msgid "Register"
-msgstr "Реє�траці�"
-
-#. TRANS: Menu item in mobile profile to log in.
-msgid "Login"
-msgstr "Увійти"
-
-#. TRANS: Menu item in mobile profile to search the site.
-msgid "Search"
-msgstr "Пошук"
-
-#. TRANS: Field label in mobile profile to attach a file to a status.
-msgid "Attach"
-msgstr "Вкла�ти"
-
-#. TRANS: Field title in mobile profile to attach a file to a status.
-msgid "Attach a file."
-msgstr "Вкла�ти файл."
-
 #. TRANS: Link to switch site layout from mobile to desktop mode. Appears at very bottom of page.
 msgid "Switch to desktop site layout."
 msgstr "Перемкнути вигл�д �айту на варіант дл� робочого �толу."
diff --git a/plugins/MobileProfile/locale/zh_CN/LC_MESSAGES/MobileProfile.po b/plugins/MobileProfile/locale/zh_CN/LC_MESSAGES/MobileProfile.po
index 11be986e4b..789077b0d2 100644
--- a/plugins/MobileProfile/locale/zh_CN/LC_MESSAGES/MobileProfile.po
+++ b/plugins/MobileProfile/locale/zh_CN/LC_MESSAGES/MobileProfile.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - MobileProfile to Simplified Chinese (‪中文(简体)‬)
+# Translation of StatusNet - MobileProfile to Simplified Chinese (‪中文（简体）‬)
 # Exported from translatewiki.net
 #
 # Author: Hydra
@@ -10,15 +10,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - MobileProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:09+0000\n"
-"Language-Team: Simplified Chinese <http://translatewiki.net/wiki/Portal:zh-"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:14+0000\n"
+"Language-Team: Simplified Chinese <https://translatewiki.net/wiki/Portal:zh-"
 "hans>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:27+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2012-01-02 10:11:36+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: #out-statusnet-plugin-mobileprofile\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
@@ -27,54 +27,6 @@ msgstr ""
 msgid "This page is not available in a media type you accept."
 msgstr "此页�在您接�的媒体类型中�用。"
 
-#. TRANS: Menu item in mobile profile to go to start page of site.
-msgid "Home"
-msgstr "首页"
-
-#. TRANS: Menu item in mobile profile to go to user account settings.
-msgid "Account"
-msgstr "账�"
-
-#. TRANS: Menu item in mobile profile to connect to other services.
-msgid "Connect"
-msgstr "关�"
-
-#. TRANS: Menu item in mobile profile to manage site settings.
-msgid "Admin"
-msgstr "管�"
-
-msgid "Change site configuration"
-msgstr "更改网站�置"
-
-#. TRANS: Menu item in mobile profile to invite other people.
-msgid "Invite"
-msgstr "邀请"
-
-#. TRANS: Menu item in mobile profile log the current user off.
-msgid "Logout"
-msgstr "登出"
-
-#. TRANS: Menu item in mobile profile to register with the site.
-msgid "Register"
-msgstr "注册"
-
-#. TRANS: Menu item in mobile profile to log in.
-msgid "Login"
-msgstr "登录"
-
-#. TRANS: Menu item in mobile profile to search the site.
-msgid "Search"
-msgstr "�索"
-
-#. TRANS: Field label in mobile profile to attach a file to a status.
-msgid "Attach"
-msgstr "附件"
-
-#. TRANS: Field title in mobile profile to attach a file to a status.
-#, fuzzy
-msgid "Attach a file."
-msgstr "添加一个文件附件"
-
 #. TRANS: Link to switch site layout from mobile to desktop mode. Appears at very bottom of page.
 msgid "Switch to desktop site layout."
 msgstr ""
diff --git a/plugins/MobileProfile/mp-screen.css b/plugins/MobileProfile/mp-screen.css
index d82486182a..78086af210 100644
--- a/plugins/MobileProfile/mp-screen.css
+++ b/plugins/MobileProfile/mp-screen.css
@@ -1,288 +1,357 @@
-/** theme: mobile profile screen
- *
- * @package   StatusNet
- * @author    Sarven Capadisli <csarven@status.net>
- * @copyright 2009-2010 StatusNet, Inc.
- * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://status.net/
- */
-
 #wrap {
-min-width:0;
-max-width:100%;
+    margin: 0;
+    padding: 0;
+    min-width:0;
+    max-width:100%;
+    width: auto;
+    border: none;
 }
 
 #header {
-margin:0;
-padding:0.7em 2%;
-width:96%;
+    width: 100%;
 }
 
 address {
-margin:1em 0 0 0;
-float:left;
-width:100%;
+    margin: 1px 0 0;
+    height: 24px;
 }
-address .vcard .photo {
-margin-right:0;
+
+address img {
+    float: left;
+    background: #fff;
+    padding: 2px 2px 2px 6px;
 }
 
 address img + .fn {
-display:block;
-margin-top:1em;
-float:left;
+    display:block;
+    margin-top: 8px;
+    clear: left;
+    float: left;
+    color: #000;
+    margin-left: 6px;
 }
 
-.vcard .photo {
-margin-right:7px;
+#site_nav_global_primary {
+    width: 100%;
+    padding: 2px 0;
+    height: auto;
+    left:0;
 }
 
+#site_nav_global_primary li {
+    margin-right: 4px;
+}
+
+#site_nav_global_primary li:last-child {
+    margin-right: 0px;
+}
+
+#site_nav_global_primary a {
+    padding: 2px 4px;
+}
+
+#core {
+    width: 100%;
+    border-left: none;
+    border-right: none;
+}
+
+#aside_primary_wrapper {
+    background: none;
+}    
+
+#content_wrapper {  
+    right: 0px;
+    border: none;
+}  
+
+#site_nav_local_views_wrapper {  
+    right: 0px;
+    border: none;
+}  
+
+#navtoggle {
+    float: right;
+    padding: 2px 6px;
+    text-decoration: none;
+}
+
+#site_nav_local_views {
+    margin-bottom: 0px;
+    padding: 10px 0px 10px 6px;
+    left: 0px;
+    width: 100%;
+    display: none;
+}
+
+#site_nav_local_views h3 {
+    font-size: 1em;
+    margin-bottom: 0px;
+}
+
+#site_nav_local_views li {
+    margin: 0 6px 0 0;
+    clear: left;
+}
+
+#site_nav_local_views li li {
+    float: left;
+    clear: none;
+    margin: 0 10px 6px 0;
+}
+
+#login #site_nav_local_views, #register #site_nav_local_views, #openidlogin #site_nav_local_views {
+    display: block;
+    margin-top: 25px;
+}
+
+#login #navtoggle, #register #navtoggle, #openidlogin #navtoggle {
+    display: none;
+}
+
+#login #site_nav_local_views li, #register #site_nav_local_views li, #openidlogin #site_nav_local_views li {
+    float: left;
+    clear: none;
+    margin: 0 10px 6px 0;
+}
+
+#content {
+    width: 96%;
+    padding: 10px 2%;
+    min-height: auto;
+    left: 0px;
+}
+
+#content h1 {
+    clear: left;
+}
+
+#footer {
+    width: auto;
+    padding: 10px 4px 4px 4px;
+}
+
+.input_forms { 
+    width: 102%;
+    left: -2%;
+    padding-left: 2%;
+}
+
+#input_form_nav li a {
+    margin-right: 6px;
+}
+
+.input_form {
+    clear: left;
+    width: 100%;
+    padding-bottom: 0px;
+}
+
+#input_form_status, #input_form_direct {
+    padding-bottom: 40px;
+}
+
+.form_notice_placeholder .placeholder {
+    width: 290px;
+    margin-bottom: 20px;
+}
+
+.form_notice {
+    float: left;
+    width: 300px;
+    padding: 4px 0px;
+}
+
+#form_notice-direct.form_notice {
+    padding-top: 0px;
+}
+
+.form_notice textarea, #form_notice-direct.form_notice textarea {
+    width: 292px;
+    height: 36px;
+    padding: 4px 4px 16px 4px;
+    font-size: 1em;
+}
+
+.form_notice .count {
+    position: absolute;
+    top: 46px;
+    left: 278px;
+}
+
+#form_notice-direct.form_notice .count {
+    top: 76px;
+    left: 278px;
+}
+
+.form_notice .error,
+.form_notice .success,
+.form_notice .notice-status {
+    width: 285px; 
+}
+
+
+/*input type=file no good in
+iPhone/iPod Touch, Android, Opera Mini Simulator
+*/
+
+.form_notice .notice_data-attach, .form_notice .notice_data-geo_wrap label, .form_notice .notice_data-geo_wrap input {
+    display:none;
+}
+
+.checkbox-wrapper {
+    margin-left: 0px;
+    clear: left;
+    float: left;
+    width: 200px;
+    z-index: 2;
+}
+
+.form_notice .checkbox-wrapper {
+    margin-left: 0px;
+}
+
+.checkbox-wrapper label.checkbox {
+    display: none !important;
+}
+
+.checkbox-wrapper #notice_private {
+    display: inline;
+    margin-top: 10px;
+    margin-left: 20px;
+}
+
+.form_notice .checkbox-wrapper #notice_private {
+    margin-left: 0px;
+}
+
+.checkbox-wrapper:before {
+    content: "Send privately?";
+}
+
+.input_form .form_settings fieldset fieldset {
+    width: 300px;
+}
+
+.input_form .form_settings label {
+    display: inline;
+}
+
+label[for=blog-entry-content] {
+    display: none !important;
+}
+
+.input_form .form_settings li input {
+    width: 292px;
+}
+
+.input_form .form_settings li textarea {
+    width: 292px;
+}
+
+.bookmarkform-thumbnail {
+    display: none;
+}
+
+.input_form .form_settings .submit {
+    margin: 10px 0;
+    clear: left;
+    float: left;
+}
+
+.form_notice input.submit {
+    margin-top: -45px;
+    width: 80px;
+}
+
+#form_notice-direct.form_notice #notice_action-submit {
+    top: 148px;
+}
+
+.threaded-replies {
+    width: 80%;
+}
+
+#content .notice .threaded-replies .notice {
+    width: 95%;
+}
+
+.threaded-replies .placeholder {
+    margin: 10px;
+    width: 92%;
+}
+
+.threaded-replies .form_notice {
+    margin-bottom: 10px;
+}
+
+.threaded-replies .form_notice textarea {
+    width: 220px;
+}
+
+.threaded-replies .form_notice .count {
+    left: 215px;
+    top: 55px;
+}
+
+.threaded-replies .form_notice #notice_action-submit {
+    position: relative;
+    top: 0;
+    bottom: 0px;
+    left: 0;
+    margin-top: 10px;
+}
+
+.threaded-replies .form_notice .error,
+.threaded-replies .form_notice .success,
+.threaded-replies .form_notice .notice-status {
+    width: 210px; 
+}
 
 .form_settings fieldset {
-margin-bottom:7px;
+    margin-bottom: 7px;
 }
 
 .form_settings label {
-width:auto;
-display:block;
-float:none;
+    width: auto;
+    display: block;
+    text-align: left;
 }
+
 .form_settings .form_data li {
-margin-bottom:7px;
+    margin-bottom: 10px;
 }
 
 .form_settings .form_data textarea,
 .form_settings .form_data select, 
 .form_settings .form_data input {
-margin-left:0;
-display:block;
+    margin-left: 0;
 }
+
 .form_settings .form_data textarea {
-width:96.41%;
+    width: 98%;
 }
 
 .form_settings .form_data label {
-float:none;
+    float: none;
 }
 
 .form_settings .form_data p.form_guide {
-width:auto;
-margin-left:0;
+    margin-left: 0;
 }
 
-#site_nav_global_primary {
-margin:0;
-width:100%;
-list-style-type:none;
-position:absolute;
-top:0;
-left:0;
-}
-#site_nav_global_primary li {
-margin-left:0;
-margin-right:4%;
-float:left;
-font-size:0.9em;
+.form_settings input.checkbox, .form_settings input.radio {
+    left: 0px;
 }
 
-#form_notice {
-width:100%;
+.form_settings label.checkbox, .form_settings label.radio {
+    left: -10px;
 }
 
-#form_notice textarea {
-width:60%;
-height:20px;
+.notice .addressees:before {
+    content: '\003E';
 }
 
-.form_notice .count {
-position:absolute;
-bottom:2px;
-right:40%;
-z-index:9;
+.user_in .notice div.entry-content {
+  max-width: 150px;
 }
-
-/*input type=file no good in
-iPhone/iPod Touch, Android, Opera Mini Simulator
-*/
-.form_notice .count + label,
-#form_notice label[for="notice_data-attach"] {
-display:none;
-}
-#form_notice input.notice_data-attach {
-position:static;
-clear:both;
-width:65%;
-height:auto;
-display:block;
-z-index:9;
-padding:0;
-margin:0;
-background:none;
-opacity:1;
-}
-
-#form_notice .submit {
-width:20%;
-right:2%;
-text-align:center;
-}
-
-
-#site_nav_local_views li {
-margin-left:0;
-margin-right:0;
-}
-#site_nav_local_views li:first-child {
-margin-left:0;
-}
-#site_nav_local_views a {
-padding:1px 3px;
-display:block;
-font-size:0.9em;
-}
-#site_nav_local_views .current a {
-text-shadow:none;
-}
-#site_nav_local_views li {
--moz-box-shadow:none;
--webkit-box-shadow:none;
-box-shadow:none;
-}
-
-
-#content {
-width:96.41%;
-min-height:auto;
-}
-#content, 
-#site_nav_local_views a, 
-#aside_primary {
-border:0;
-}
-
-.instructions p, 
-.instructions ul {
-margin-bottom:4px;
-}
-
-h1 {
-margin-bottom:0;
-}
-
-.notice,
-.profile {
-padding-top:4px;
-padding-bottom:4px;
-min-height:65px;
-}
-#content .notice .entry-title {
-float:left;
-width:100%;
-margin-left:0;
-}
-#content .notice .author .photo {
-position:static;
-float:left;
-}
-#content .notice div.entry-content {
-margin-left:0;
-width:75%;
-max-width:100%;
-min-width:0;
-}
-.notice-options {
-width:43px;
-margin-right:1%;
-}
-
-.notice-options form.processing {
-background-image:none;
-}
-#wrap .notice-options form.processing input.submit {
-background-position:0 47%;
-}
-
-.notice .notice-options a,
-.notice .notice-options input {
-box-shadow:none;
--moz-box-shadow:none;
--webkit-box-shadow:none;
-}
-.notice .notice-options a,
-.notice .notice-options form {
-margin:-4px 0 0 0;
-}
-.notice .notice-options .form_repeat,
-.notice .notice-options .notice_delete {
-margin-top:11px;
-}
-.notice .notice-options .form_favor,
-.notice .notice-options .form_disfavor,
-.notice .notice-options .form_repeat {
-margin-right:11px;
-}
-
-.notice .notice-options .notice_delete {
-float:left;
-}
-
-.entity_profile {
-width:auto;
-}
-
-.entity_actions {
-margin-right:0;
-margin-left:0;
-clear:both;
-float:none;
-width:100%;
-max-width:9999px;
-}
-
-.entity_profile {
-margin-bottom:7px;
-min-height:0;
-}
-
-.entity_profile .entity_fn, 
-.entity_profile .entity_nickname, 
-.entity_profile .entity_location, 
-.entity_profile .entity_url, 
-.entity_profile .entity_note, 
-.entity_profile .entity_tags, 
-.entity_profile .entity_aliases {
-line-height:1.4;
-margin-left:0;
-}
-
-.entity_profile .entity_depiction {
-margin-bottom:1%;
-margin-right:7px;
-}
-
-.entity_actions {
-margin-bottom:1%;
-float:left;
-width:100%;
-}
-
-.entity_actions li {
-float:left;
-margin-right:1.5%;
-margin-bottom:0;
-height:29px;
-width:40%;
-}
-
-.user_in .entity_actions .entity_subscribe {
-margin-bottom:47px;
-width:auto;
-height:auto;
-margin-right:5%;
-}
-
-#footer {
-width:96%;
-padding:2%;
-}
-
diff --git a/plugins/ModHelper/ModHelperPlugin.php b/plugins/ModHelper/ModHelperPlugin.php
index c2757bbeae..bed0d8d49e 100644
--- a/plugins/ModHelper/ModHelperPlugin.php
+++ b/plugins/ModHelper/ModHelperPlugin.php
@@ -27,6 +27,8 @@ if (!defined('STATUSNET')) {
  */
 class ModHelperPlugin extends Plugin
 {
+    static $rights = array(Right::SILENCEUSER, Right::TRAINSPAM, Right::REVIEWSPAM);
+
     function onPluginVersion(&$versions)
     {
         $versions[] = array('name' => 'ModHelper',
@@ -42,7 +44,7 @@ class ModHelperPlugin extends Plugin
 
     function onUserRightsCheck($profile, $right, &$result)
     {
-        if ($right == Right::SILENCEUSER) {
+        if (in_array($right, self::$rights)) {
             // Hrm.... really we should confirm that the *other* user isn't privleged. :)
             if ($profile->hasRole('modhelper')) {
                 $result = true;
diff --git a/plugins/ModHelper/locale/ModHelper.pot b/plugins/ModHelper/locale/ModHelper.pot
index 4684b0f47d..137afb81d9 100644
--- a/plugins/ModHelper/locale/ModHelper.pot
+++ b/plugins/ModHelper/locale/ModHelper.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
+"POT-Creation-Date: 2012-06-30 11:07+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,7 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. TRANS: Plugin description.
-#: ModHelperPlugin.php:38
+#: ModHelperPlugin.php:40
 msgid ""
 "Lets users who have been manually marked as \"modhelper\"s silence accounts."
 msgstr ""
diff --git a/plugins/ModHelper/locale/de/LC_MESSAGES/ModHelper.po b/plugins/ModHelper/locale/de/LC_MESSAGES/ModHelper.po
index 42331463e4..5768c3a102 100644
--- a/plugins/ModHelper/locale/de/LC_MESSAGES/ModHelper.po
+++ b/plugins/ModHelper/locale/de/LC_MESSAGES/ModHelper.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ModHelper\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:09+0000\n"
-"Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:14+0000\n"
+"Language-Team: German <https://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-11 13:16:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:05+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-modhelper\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/ModHelper/locale/es/LC_MESSAGES/ModHelper.po b/plugins/ModHelper/locale/es/LC_MESSAGES/ModHelper.po
index ea36dfa46a..2384949d5f 100644
--- a/plugins/ModHelper/locale/es/LC_MESSAGES/ModHelper.po
+++ b/plugins/ModHelper/locale/es/LC_MESSAGES/ModHelper.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - ModHelper to Spanish (Español)
+# Translation of StatusNet - ModHelper to Spanish (español)
 # Exported from translatewiki.net
 #
 # Author: Locos epraix
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ModHelper\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:09+0000\n"
-"Language-Team: Spanish <http://translatewiki.net/wiki/Portal:es>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:15+0000\n"
+"Language-Team: Spanish <https://translatewiki.net/wiki/Portal:es>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-11 13:16:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:05+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-plugin-modhelper\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/ModHelper/locale/eu/LC_MESSAGES/ModHelper.po b/plugins/ModHelper/locale/eu/LC_MESSAGES/ModHelper.po
new file mode 100644
index 0000000000..58a6ff5b15
--- /dev/null
+++ b/plugins/ModHelper/locale/eu/LC_MESSAGES/ModHelper.po
@@ -0,0 +1,26 @@
+# Translation of StatusNet - ModHelper to Basque (euskara)
+# Exported from translatewiki.net
+#
+# Author: Artsuaga
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - ModHelper\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:15+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:51:05+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin description.
+msgid ""
+"Lets users who have been manually marked as \"modhelper\"s silence accounts."
+msgstr ""
+"Kontuak isilarazten uzten die \"modhelper\" gisa markatu diren "
+"erabiltzaileei."
diff --git a/plugins/ModHelper/locale/fr/LC_MESSAGES/ModHelper.po b/plugins/ModHelper/locale/fr/LC_MESSAGES/ModHelper.po
index 3e5a79654c..9badefe772 100644
--- a/plugins/ModHelper/locale/fr/LC_MESSAGES/ModHelper.po
+++ b/plugins/ModHelper/locale/fr/LC_MESSAGES/ModHelper.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - ModHelper to French (Français)
+# Translation of StatusNet - ModHelper to French (français)
 # Exported from translatewiki.net
 #
 # Author: Peter17
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ModHelper\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:10+0000\n"
-"Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:15+0000\n"
+"Language-Team: French <https://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-11 13:16:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:05+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-modhelper\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
diff --git a/plugins/ModHelper/locale/gl/LC_MESSAGES/ModHelper.po b/plugins/ModHelper/locale/gl/LC_MESSAGES/ModHelper.po
new file mode 100644
index 0000000000..5859b57b91
--- /dev/null
+++ b/plugins/ModHelper/locale/gl/LC_MESSAGES/ModHelper.po
@@ -0,0 +1,29 @@
+# Translation of StatusNet - ModHelper to Galician (galego)
+# Exported from translatewiki.net
+#
+# Author: Toliño
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - ModHelper\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:15+0000\n"
+"Language-Team: Galician <https://translatewiki.net/wiki/Portal:gl>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:51:05+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: gl\n"
+"X-Message-Group: #out-statusnet-plugin-modhelper\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin description.
+msgid ""
+"Lets users who have been manually marked as \"modhelper\"s silence accounts."
+msgstr ""
+"Permite silenciar contas aos usuarios que foron marcados manualmente como "
+"\"modhelper\"."
diff --git a/plugins/ModHelper/locale/he/LC_MESSAGES/ModHelper.po b/plugins/ModHelper/locale/he/LC_MESSAGES/ModHelper.po
index c8de5b8fe7..53b8f14fb8 100644
--- a/plugins/ModHelper/locale/he/LC_MESSAGES/ModHelper.po
+++ b/plugins/ModHelper/locale/he/LC_MESSAGES/ModHelper.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ModHelper\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:10+0000\n"
-"Language-Team: Hebrew <http://translatewiki.net/wiki/Portal:he>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:15+0000\n"
+"Language-Team: Hebrew <https://translatewiki.net/wiki/Portal:he>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-11 13:16:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:05+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: he\n"
 "X-Message-Group: #out-statusnet-plugin-modhelper\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/ModHelper/locale/ia/LC_MESSAGES/ModHelper.po b/plugins/ModHelper/locale/ia/LC_MESSAGES/ModHelper.po
index 2b7b8c89c2..9eb98ccfe3 100644
--- a/plugins/ModHelper/locale/ia/LC_MESSAGES/ModHelper.po
+++ b/plugins/ModHelper/locale/ia/LC_MESSAGES/ModHelper.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - ModHelper to Interlingua (Interlingua)
+# Translation of StatusNet - ModHelper to Interlingua (interlingua)
 # Exported from translatewiki.net
 #
 # Author: McDutchie
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ModHelper\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:10+0000\n"
-"Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:15+0000\n"
+"Language-Team: Interlingua <https://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-11 13:16:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:05+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-modhelper\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/ModHelper/locale/it/LC_MESSAGES/ModHelper.po b/plugins/ModHelper/locale/it/LC_MESSAGES/ModHelper.po
new file mode 100644
index 0000000000..bf620ee742
--- /dev/null
+++ b/plugins/ModHelper/locale/it/LC_MESSAGES/ModHelper.po
@@ -0,0 +1,26 @@
+# Translation of StatusNet - ModHelper to Italian (italiano)
+# Exported from translatewiki.net
+#
+# Author: GreenFox
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - ModHelper\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:15+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:51:05+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin description.
+msgid ""
+"Lets users who have been manually marked as \"modhelper\"s silence accounts."
+msgstr ""
+"Permette agli utenti che sono stati indicati manualmente come \"modhelper\" "
+"di ridurre al silenzio degli account."
diff --git a/plugins/ModHelper/locale/mk/LC_MESSAGES/ModHelper.po b/plugins/ModHelper/locale/mk/LC_MESSAGES/ModHelper.po
index b2f36ae2b9..aad89f75f7 100644
--- a/plugins/ModHelper/locale/mk/LC_MESSAGES/ModHelper.po
+++ b/plugins/ModHelper/locale/mk/LC_MESSAGES/ModHelper.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - ModHelper to Macedonian (Македон�ки)
+# Translation of StatusNet - ModHelper to Macedonian (македон�ки)
 # Exported from translatewiki.net
 #
 # Author: Bjankuloski06
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ModHelper\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:10+0000\n"
-"Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:15+0000\n"
+"Language-Team: Macedonian <https://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-11 13:16:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:05+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-modhelper\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
diff --git a/plugins/ModHelper/locale/nl/LC_MESSAGES/ModHelper.po b/plugins/ModHelper/locale/nl/LC_MESSAGES/ModHelper.po
index b329d81899..db7ed7aad1 100644
--- a/plugins/ModHelper/locale/nl/LC_MESSAGES/ModHelper.po
+++ b/plugins/ModHelper/locale/nl/LC_MESSAGES/ModHelper.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ModHelper\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:10+0000\n"
-"Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:15+0000\n"
+"Language-Team: Dutch <https://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-11 13:16:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:05+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-modhelper\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/ModHelper/locale/pt/LC_MESSAGES/ModHelper.po b/plugins/ModHelper/locale/pt/LC_MESSAGES/ModHelper.po
index 011de6e98d..17b80ddf81 100644
--- a/plugins/ModHelper/locale/pt/LC_MESSAGES/ModHelper.po
+++ b/plugins/ModHelper/locale/pt/LC_MESSAGES/ModHelper.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - ModHelper to Portuguese (Português)
+# Translation of StatusNet - ModHelper to Portuguese (português)
 # Exported from translatewiki.net
 #
 # Author: SandroHc
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ModHelper\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:10+0000\n"
-"Language-Team: Portuguese <http://translatewiki.net/wiki/Portal:pt>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:15+0000\n"
+"Language-Team: Portuguese <https://translatewiki.net/wiki/Portal:pt>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-11 13:16:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:05+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: pt\n"
 "X-Message-Group: #out-statusnet-plugin-modhelper\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/ModHelper/locale/ru/LC_MESSAGES/ModHelper.po b/plugins/ModHelper/locale/ru/LC_MESSAGES/ModHelper.po
index cb0252eb40..d323574b86 100644
--- a/plugins/ModHelper/locale/ru/LC_MESSAGES/ModHelper.po
+++ b/plugins/ModHelper/locale/ru/LC_MESSAGES/ModHelper.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - ModHelper to Russian (Ру��кий)
+# Translation of StatusNet - ModHelper to Russian (ру��кий)
 # Exported from translatewiki.net
 #
 # Author: Lockal
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ModHelper\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:10+0000\n"
-"Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:15+0000\n"
+"Language-Team: Russian <https://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-11 13:16:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:05+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-modhelper\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
diff --git a/plugins/ModHelper/locale/tl/LC_MESSAGES/ModHelper.po b/plugins/ModHelper/locale/tl/LC_MESSAGES/ModHelper.po
index 98623a8748..a38e3377db 100644
--- a/plugins/ModHelper/locale/tl/LC_MESSAGES/ModHelper.po
+++ b/plugins/ModHelper/locale/tl/LC_MESSAGES/ModHelper.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ModHelper\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:10+0000\n"
-"Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:15+0000\n"
+"Language-Team: Tagalog <https://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-11 13:16:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:05+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-modhelper\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/ModHelper/locale/uk/LC_MESSAGES/ModHelper.po b/plugins/ModHelper/locale/uk/LC_MESSAGES/ModHelper.po
index 55c98f5a79..adecc2ad12 100644
--- a/plugins/ModHelper/locale/uk/LC_MESSAGES/ModHelper.po
+++ b/plugins/ModHelper/locale/uk/LC_MESSAGES/ModHelper.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - ModHelper to Ukrainian (Україн�ька)
+# Translation of StatusNet - ModHelper to Ukrainian (україн�ька)
 # Exported from translatewiki.net
 #
 # Author: Boogie
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ModHelper\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:10+0000\n"
-"Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:16+0000\n"
+"Language-Team: Ukrainian <https://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-11 13:16:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:05+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-modhelper\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
diff --git a/plugins/ModLog/ModLog.php b/plugins/ModLog/ModLog.php
new file mode 100644
index 0000000000..b2c6546838
--- /dev/null
+++ b/plugins/ModLog/ModLog.php
@@ -0,0 +1,123 @@
+<?php
+/**
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2012, StatusNet, Inc.
+ *
+ * ModLog.php -- data object to store moderation logs
+ * 
+ * PHP version 5
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Moderation
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2012 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    exit(1);
+}
+
+/**
+ * Class comment here
+ *
+ * @category Category here
+ * @package  StatusNet
+ * @author   Evan Prodromou <evan@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
+ * @link     http://status.net/
+ *
+ * @see      DB_DataObject
+ */
+
+class ModLog extends Managed_DataObject
+{
+    public $__table = 'mod_log'; // table name
+
+    public $id;           // UUID
+    public $profile_id;   // profile id
+    public $moderator_id; // profile id
+    public $role;         // the role
+    public $grant;        // 1 = grant, 0 = revoke
+    public $created;      // datetime
+
+    /**
+     * Get an instance by key
+     *
+     * @param string $k Key to use to lookup (usually 'user_id' for this class)
+     * @param mixed  $v Value to lookup
+     *
+     * @return TagSub object found, or null for no hits
+     *
+     */
+    function staticGet($k, $v=null)
+    {
+        return Managed_DataObject::staticGet('ModLog', $k, $v);
+    }
+
+    /**
+     * Get an instance by compound key
+     *
+     * @param array $kv array of key-value mappings
+     *
+     * @return TagSub object found, or null for no hits
+     *
+     */
+    function pkeyGet($kv)
+    {
+        return Managed_DataObject::pkeyGet('ModLog', $kv);
+    }
+
+    /**
+     * The One True Thingy that must be defined and declared.
+     */
+    public static function schemaDef()
+    {
+        return array('description' => 'Log of moderation events',
+                     'fields' => array(
+                                       'id' => array('type' => 'varchar',
+                                                     'length' => 36,
+                                                     'not null' => true,
+                                                     'description' => 'unique event ID'),
+                                       'profile_id' => array('type' => 'int',
+                                                             'not null' => true,
+                                                             'description' => 'profile getting the role'),
+                                       'moderator_id' => array('type' => 'int',
+                                                               'description' => 'profile granting or revoking the role'),
+                                       'role' => array('type' => 'varchar',
+                                                       'length' => 32,
+                                                       'not null' => true,
+                                                       'description' => 'role granted or revoked'),
+                                       'is_grant' => array('type' => 'int',
+                                                           'size' => 'tiny',
+                                                           'default' => 1,
+                                                           'description' => 'Was this a grant or revocation of a role'),
+                                       'created' => array('type' => 'datetime',
+                                                          'not null' => true,
+                                                          'description' => 'date this record was created')
+                                       ),
+                     'primary key' => array('id'),
+                     'foreign keys' => array(
+                                             'mod_log_profile_id_fkey' => array('profile', array('profile_id' => 'id')),
+                                             'mod_log_moderator_id_fkey' => array('user', array('user_id' => 'id'))
+                                             ),
+                     'indexes' => array(
+                                        'mod_log_profile_id_created_idx' => array('profile_id', 'created'),
+                                        ),
+                     );
+    }
+}
diff --git a/plugins/ModLog/ModLogPlugin.php b/plugins/ModLog/ModLogPlugin.php
new file mode 100644
index 0000000000..459df63e82
--- /dev/null
+++ b/plugins/ModLog/ModLogPlugin.php
@@ -0,0 +1,218 @@
+<?php
+/**
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2012, StatusNet, Inc.
+ *
+ * ModLogPlugin.php
+ *
+ * PHP version 5
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Moderation
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2012 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    // This check helps protect against security problems;
+    // your code file can't be executed directly from the web.
+    exit(1);
+}
+
+/**
+ * Moderation logging
+ *
+ * Shows a history of moderation for this user in the sidebar
+ *
+ * @category  Moderation
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2012 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+
+class ModLogPlugin extends Plugin
+{
+    const VIEWMODLOG = 'ModLogPlugin::VIEWMODLOG';
+
+    /**
+     * Database schema setup
+     *
+     * We keep a moderation log table
+     *
+     * @see Schema
+     * @see ColumnDef
+     *
+     * @return boolean hook value; true means continue processing, false means stop.
+     */
+
+    function onCheckSchema()
+    {
+        $schema = Schema::get();
+
+        $schema->ensureTable('mod_log', ModLog::schemaDef());
+
+        return true;
+    }
+
+    /**
+     * Load related modules when needed
+     *
+     * @param string $cls Name of the class to be loaded
+     *
+     * @return boolean hook value; true means continue processing, false means stop.
+     */
+
+    function onAutoload($cls)
+    {
+        $dir = dirname(__FILE__);
+
+        switch ($cls)
+        {
+        case 'ModLog':
+            include_once $dir . '/'.$cls.'.php';
+            return false;
+        default:
+            return true;
+        }
+    }
+
+    function onEndGrantRole($profile, $role)
+    {
+        $modlog = new ModLog();
+
+        $modlog->id         = UUID::gen();
+        $modlog->profile_id = $profile->id;
+
+        $cur = common_current_user();
+        
+        if (!empty($cur)) {
+            $modlog->moderator_id = $cur->id;
+        }
+
+        $modlog->role     = $role;
+        $modlog->is_grant = 1;
+        $modlog->created  = common_sql_now();
+
+        $modlog->insert();
+
+        return true;
+    }
+
+    function onEndRevokeRole($profile, $role)
+    {
+        $modlog = new ModLog();
+
+        $modlog->id = UUID::gen();
+
+        $modlog->profile_id = $profile->id;
+
+        $cur = common_current_user();
+        
+        if (!empty($cur)) {
+            $modlog->moderator_id = $cur->id;
+        }
+
+        $modlog->role     = $role;
+        $modlog->is_grant = 0;
+        $modlog->created  = common_sql_now();
+
+        $modlog->insert();
+
+        return true;
+    }
+
+    function onEndShowSections($action)
+    {
+        if ($action->arg('action') != 'showstream') {
+            return true;
+        }
+
+        $cur = common_current_user();
+
+        if (empty($cur) || !$cur->hasRight(self::VIEWMODLOG)) {
+            return true;
+        }
+
+        $profile = $action->profile;
+
+        $ml = new ModLog();
+
+        $ml->profile_id = $profile->id;
+        $ml->orderBy("created");
+
+        $cnt = $ml->find();
+
+        if ($cnt > 0) {
+
+            $action->elementStart('div', array('id' => 'entity_mod_log',
+                                               'class' => 'section'));
+
+            $action->element('h2', null, _('Moderation'));
+
+            $action->elementStart('table');
+
+            while ($ml->fetch()) {
+                $action->elementStart('tr');
+                $action->element('td', null, strftime('%y-%m-%d', strtotime($ml->created)));
+                $action->element('td', null, sprintf(($ml->is_grant) ? _('+%s') : _('-%s'), $ml->role));
+                $action->elementStart('td');
+                if ($ml->moderator_id) {
+                    $mod = Profile::staticGet('id', $ml->moderator_id);
+                    if (empty($mod)) {
+                        $action->text(_('[unknown]'));
+                    } else {
+                        $action->element('a', array('href' => $mod->profileurl,
+                                                    'title' => $mod->fullname),
+                                         $mod->nickname);
+                    }
+                } else {
+                    $action->text(_('[unknown]'));
+                }
+                $action->elementEnd('td');
+                $action->elementEnd('tr');
+            }
+
+            $action->elementEnd('table');
+
+            $action->elementEnd('div');
+        }
+    }
+
+    function onUserRightsCheck($profile, $right, &$result) {
+        switch ($right) {
+        case self::VIEWMODLOG:
+            $result = ($profile->hasRole(Profile_role::MODERATOR) || $profile->hasRole('modhelper'));
+            return false;
+        default:
+            return true;
+        }
+    }
+
+    function onPluginVersion(&$versions)
+    {
+        $versions[] = array('name' => 'ModLog',
+                            'version' => STATUSNET_VERSION,
+                            'author' => 'Evan Prodromou',
+                            'homepage' => 'http://status.net/wiki/Plugin:ModLog',
+                            'description' =>
+                            _m('Show the moderation history for a profile in the sidebar'));
+        return true;
+    }
+}
diff --git a/plugins/ModPlus/locale/ModPlus.pot b/plugins/ModPlus/locale/ModPlus.pot
index 0238d7ebfd..86f73a2598 100644
--- a/plugins/ModPlus/locale/ModPlus.pot
+++ b/plugins/ModPlus/locale/ModPlus.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
+"POT-Creation-Date: 2012-06-30 11:07+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"
diff --git a/plugins/ModPlus/locale/ca/LC_MESSAGES/ModPlus.po b/plugins/ModPlus/locale/ca/LC_MESSAGES/ModPlus.po
new file mode 100644
index 0000000000..3eb947d383
--- /dev/null
+++ b/plugins/ModPlus/locale/ca/LC_MESSAGES/ModPlus.po
@@ -0,0 +1,57 @@
+# Translation of StatusNet - ModPlus to Catalan (català)
+# Exported from translatewiki.net
+#
+# Author: Toniher
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - ModPlus\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:16+0000\n"
+"Language-Team: Catalan <https://translatewiki.net/wiki/Portal:ca>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2012-01-02 10:11:36+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: ca\n"
+"X-Message-Group: #out-statusnet-plugin-modplus\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Error message displayed when referring to a user without a profile.
+msgid "User has no profile."
+msgstr "L'usuari no té perfil."
+
+#. TRANS: Remote profile action page title.
+#. TRANS: %1$s is a username, %2$s is a hostname.
+#, php-format
+msgid "%1$s on %2$s"
+msgstr "%1$s a %2$s"
+
+#. TRANS: Message on remote profile page.
+#. TRANS: This message contains Markdown links in the form [description](link).
+#. TRANS: %1$s is a profile nickname, %2$s is a hostname, %3$s is a URL.
+#, php-format
+msgid ""
+"This remote profile is registered on another site; see [%1$s's original "
+"profile page on %2$s](%3$s)."
+msgstr ""
+"Aquest perfil remot està registrat en un altre lloc; vegeu [la pàgina del "
+"perfil de %1$s original a %2$s](%3$s)."
+
+#. TRANS: Message on blocked remote profile page.
+msgid ""
+"Site moderators have silenced this profile, which prevents delivery of new "
+"messages to any users on this site."
+msgstr ""
+
+#. TRANS: Plugin description.
+msgid "UI extension for profile moderation actions."
+msgstr ""
+
+#. TRANS: Label for access to remote profile options.
+msgid "Remote profile options..."
+msgstr "Opcions de perfil remot..."
diff --git a/plugins/ModPlus/locale/de/LC_MESSAGES/ModPlus.po b/plugins/ModPlus/locale/de/LC_MESSAGES/ModPlus.po
index 132ceb592c..2567ab2567 100644
--- a/plugins/ModPlus/locale/de/LC_MESSAGES/ModPlus.po
+++ b/plugins/ModPlus/locale/de/LC_MESSAGES/ModPlus.po
@@ -11,14 +11,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ModPlus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:11+0000\n"
-"Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:16+0000\n"
+"Language-Team: German <https://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:31+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2012-01-02 10:11:36+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-modplus\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/ModPlus/locale/es/LC_MESSAGES/ModPlus.po b/plugins/ModPlus/locale/es/LC_MESSAGES/ModPlus.po
new file mode 100644
index 0000000000..678d613b0f
--- /dev/null
+++ b/plugins/ModPlus/locale/es/LC_MESSAGES/ModPlus.po
@@ -0,0 +1,58 @@
+# Translation of StatusNet - ModPlus to Spanish (español)
+# Exported from translatewiki.net
+#
+# Author: Armando-Martin
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - ModPlus\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:16+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2012-01-02 10:11:36+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Error message displayed when referring to a user without a profile.
+msgid "User has no profile."
+msgstr "El usuario no tiene ningún perfil."
+
+#. TRANS: Remote profile action page title.
+#. TRANS: %1$s is a username, %2$s is a hostname.
+#, php-format
+msgid "%1$s on %2$s"
+msgstr "%1$s en %2$s"
+
+#. TRANS: Message on remote profile page.
+#. TRANS: This message contains Markdown links in the form [description](link).
+#. TRANS: %1$s is a profile nickname, %2$s is a hostname, %3$s is a URL.
+#, php-format
+msgid ""
+"This remote profile is registered on another site; see [%1$s's original "
+"profile page on %2$s](%3$s)."
+msgstr ""
+"Este perfil remoto está registrado en otro sitio; Consulte [la página del "
+"perfil original de %1$s en  %2$s](%3$s)."
+
+#. TRANS: Message on blocked remote profile page.
+msgid ""
+"Site moderators have silenced this profile, which prevents delivery of new "
+"messages to any users on this site."
+msgstr ""
+"Los moderadores del sitio han silenciado este perfil, lo que impide el envío "
+"de nuevos mensajes a los usuarios de este sitio."
+
+#. TRANS: Plugin description.
+msgid "UI extension for profile moderation actions."
+msgstr ""
+"Extensión de interfaz de usuario para las acciones de moderación de los "
+"perfiles."
+
+#. TRANS: Label for access to remote profile options.
+msgid "Remote profile options..."
+msgstr "Opciones de perfil remoto..."
diff --git a/plugins/ModPlus/locale/eu/LC_MESSAGES/ModPlus.po b/plugins/ModPlus/locale/eu/LC_MESSAGES/ModPlus.po
new file mode 100644
index 0000000000..a63c36f36a
--- /dev/null
+++ b/plugins/ModPlus/locale/eu/LC_MESSAGES/ModPlus.po
@@ -0,0 +1,56 @@
+# Translation of StatusNet - ModPlus to Basque (euskara)
+# Exported from translatewiki.net
+#
+# Author: Artsuaga
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - ModPlus\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:16+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2012-01-02 10:11:36+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Error message displayed when referring to a user without a profile.
+msgid "User has no profile."
+msgstr "Erabiltzaileak ez du profilik."
+
+#. TRANS: Remote profile action page title.
+#. TRANS: %1$s is a username, %2$s is a hostname.
+#, php-format
+msgid "%1$s on %2$s"
+msgstr "%2$s(e)ko %1$s"
+
+#. TRANS: Message on remote profile page.
+#. TRANS: This message contains Markdown links in the form [description](link).
+#. TRANS: %1$s is a profile nickname, %2$s is a hostname, %3$s is a URL.
+#, php-format
+msgid ""
+"This remote profile is registered on another site; see [%1$s's original "
+"profile page on %2$s](%3$s)."
+msgstr ""
+"Urruneko profil hau beste gune batean erregistraturik dago; ikusi [%1$s(r)en "
+"berezko profil orria %2$s(e)n](%3$s)."
+
+#. TRANS: Message on blocked remote profile page.
+msgid ""
+"Site moderators have silenced this profile, which prevents delivery of new "
+"messages to any users on this site."
+msgstr ""
+"Guneko moderatzaileek profil hau isilarazi dute, gune hontako edozein "
+"erabiltzaileri mezu berriak bidaltzea galeraziz."
+
+#. TRANS: Plugin description.
+msgid "UI extension for profile moderation actions."
+msgstr "UI luzapena profil moderazio ekintzetarako."
+
+#. TRANS: Label for access to remote profile options.
+msgid "Remote profile options..."
+msgstr "Urruneko profil aukerak..."
diff --git a/plugins/ModPlus/locale/fr/LC_MESSAGES/ModPlus.po b/plugins/ModPlus/locale/fr/LC_MESSAGES/ModPlus.po
index a3e589dc69..c4b163b51d 100644
--- a/plugins/ModPlus/locale/fr/LC_MESSAGES/ModPlus.po
+++ b/plugins/ModPlus/locale/fr/LC_MESSAGES/ModPlus.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - ModPlus to French (Français)
+# Translation of StatusNet - ModPlus to French (français)
 # Exported from translatewiki.net
 #
 # Author: Crochet.david
@@ -12,14 +12,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ModPlus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:11+0000\n"
-"Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:16+0000\n"
+"Language-Team: French <https://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:31+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2012-01-02 10:11:36+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-modplus\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
@@ -61,4 +61,4 @@ msgstr ""
 
 #. TRANS: Label for access to remote profile options.
 msgid "Remote profile options..."
-msgstr "Options de profil distantes..."
+msgstr "Options de profil distant..."
diff --git a/plugins/ModPlus/locale/gl/LC_MESSAGES/ModPlus.po b/plugins/ModPlus/locale/gl/LC_MESSAGES/ModPlus.po
new file mode 100644
index 0000000000..27dbe64cd1
--- /dev/null
+++ b/plugins/ModPlus/locale/gl/LC_MESSAGES/ModPlus.po
@@ -0,0 +1,60 @@
+# Translation of StatusNet - ModPlus to Galician (galego)
+# Exported from translatewiki.net
+#
+# Author: Toliño
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - ModPlus\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:16+0000\n"
+"Language-Team: Galician <https://translatewiki.net/wiki/Portal:gl>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2012-01-02 10:11:36+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: gl\n"
+"X-Message-Group: #out-statusnet-plugin-modplus\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Error message displayed when referring to a user without a profile.
+msgid "User has no profile."
+msgstr "O usuario non ten perfil."
+
+#. TRANS: Remote profile action page title.
+#. TRANS: %1$s is a username, %2$s is a hostname.
+#, php-format
+msgid "%1$s on %2$s"
+msgstr "%1$s en %2$s"
+
+#. TRANS: Message on remote profile page.
+#. TRANS: This message contains Markdown links in the form [description](link).
+#. TRANS: %1$s is a profile nickname, %2$s is a hostname, %3$s is a URL.
+#, php-format
+msgid ""
+"This remote profile is registered on another site; see [%1$s's original "
+"profile page on %2$s](%3$s)."
+msgstr ""
+"Este perfil remoto está rexistrado noutro sitio; bote unha ollada ao [perfil "
+"orixinal de %1$s en %2$s](%3$s)."
+
+#. TRANS: Message on blocked remote profile page.
+msgid ""
+"Site moderators have silenced this profile, which prevents delivery of new "
+"messages to any users on this site."
+msgstr ""
+"Os moderadores do sitio silenciaron este perfil, o que impide o envío de "
+"novas mensaxes a calquera usuario neste sitio."
+
+#. TRANS: Plugin description.
+msgid "UI extension for profile moderation actions."
+msgstr ""
+"Extensións de interface de usuario para as accións de moderación dos perfís."
+
+#. TRANS: Label for access to remote profile options.
+msgid "Remote profile options..."
+msgstr "Opcións de perfil remoto..."
diff --git a/plugins/ModPlus/locale/ia/LC_MESSAGES/ModPlus.po b/plugins/ModPlus/locale/ia/LC_MESSAGES/ModPlus.po
index 6da0766024..0fbd10c3cf 100644
--- a/plugins/ModPlus/locale/ia/LC_MESSAGES/ModPlus.po
+++ b/plugins/ModPlus/locale/ia/LC_MESSAGES/ModPlus.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - ModPlus to Interlingua (Interlingua)
+# Translation of StatusNet - ModPlus to Interlingua (interlingua)
 # Exported from translatewiki.net
 #
 # Author: McDutchie
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ModPlus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:11+0000\n"
-"Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:16+0000\n"
+"Language-Team: Interlingua <https://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:31+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2012-01-02 10:11:36+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-modplus\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/ModPlus/locale/it/LC_MESSAGES/ModPlus.po b/plugins/ModPlus/locale/it/LC_MESSAGES/ModPlus.po
new file mode 100644
index 0000000000..1fcf170c90
--- /dev/null
+++ b/plugins/ModPlus/locale/it/LC_MESSAGES/ModPlus.po
@@ -0,0 +1,59 @@
+# Translation of StatusNet - ModPlus to Italian (italiano)
+# Exported from translatewiki.net
+#
+# Author: GreenFox
+# Author: Ximo17
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - ModPlus\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:16+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2012-01-02 10:11:36+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Error message displayed when referring to a user without a profile.
+msgid "User has no profile."
+msgstr "L'utente non ha un profilo."
+
+#. TRANS: Remote profile action page title.
+#. TRANS: %1$s is a username, %2$s is a hostname.
+#, php-format
+msgid "%1$s on %2$s"
+msgstr "%1$s su %2$s"
+
+#. TRANS: Message on remote profile page.
+#. TRANS: This message contains Markdown links in the form [description](link).
+#. TRANS: %1$s is a profile nickname, %2$s is a hostname, %3$s is a URL.
+#, php-format
+msgid ""
+"This remote profile is registered on another site; see [%1$s's original "
+"profile page on %2$s](%3$s)."
+msgstr ""
+"Questo profilo remoto è registrato su un altro sito, visualizza [la pagina "
+"del profilo originale di %1$s su %2$s] (%3$s)."
+
+#. TRANS: Message on blocked remote profile page.
+msgid ""
+"Site moderators have silenced this profile, which prevents delivery of new "
+"messages to any users on this site."
+msgstr ""
+"I moderatori del sito hanno ridotto al silenzio questo profilo, questo "
+"impedisce la spedizione di nuovi messaggi verso gli utilizzatori di questo "
+"sito."
+
+#. TRANS: Plugin description.
+msgid "UI extension for profile moderation actions."
+msgstr ""
+"Estensione dell'interfaccia utente per le azioni di moderazione del profilo."
+
+#. TRANS: Label for access to remote profile options.
+msgid "Remote profile options..."
+msgstr "Opzioni di profilo remoto..."
diff --git a/plugins/ModPlus/locale/mk/LC_MESSAGES/ModPlus.po b/plugins/ModPlus/locale/mk/LC_MESSAGES/ModPlus.po
index d9fae5b742..fbd8f94c8a 100644
--- a/plugins/ModPlus/locale/mk/LC_MESSAGES/ModPlus.po
+++ b/plugins/ModPlus/locale/mk/LC_MESSAGES/ModPlus.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - ModPlus to Macedonian (Македон�ки)
+# Translation of StatusNet - ModPlus to Macedonian (македон�ки)
 # Exported from translatewiki.net
 #
 # Author: Bjankuloski06
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ModPlus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:11+0000\n"
-"Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:16+0000\n"
+"Language-Team: Macedonian <https://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:31+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2012-01-02 10:11:36+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-modplus\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
diff --git a/plugins/ModPlus/locale/nl/LC_MESSAGES/ModPlus.po b/plugins/ModPlus/locale/nl/LC_MESSAGES/ModPlus.po
index 483c8ac05b..15ace43ab9 100644
--- a/plugins/ModPlus/locale/nl/LC_MESSAGES/ModPlus.po
+++ b/plugins/ModPlus/locale/nl/LC_MESSAGES/ModPlus.po
@@ -10,14 +10,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ModPlus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:12+0000\n"
-"Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:16+0000\n"
+"Language-Team: Dutch <https://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:31+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2012-01-02 10:11:36+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-modplus\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/ModPlus/locale/tl/LC_MESSAGES/ModPlus.po b/plugins/ModPlus/locale/tl/LC_MESSAGES/ModPlus.po
index da61dcb4ba..e839830d46 100644
--- a/plugins/ModPlus/locale/tl/LC_MESSAGES/ModPlus.po
+++ b/plugins/ModPlus/locale/tl/LC_MESSAGES/ModPlus.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ModPlus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:12+0000\n"
-"Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:17+0000\n"
+"Language-Team: Tagalog <https://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:31+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2012-01-02 10:11:36+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-modplus\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/ModPlus/locale/uk/LC_MESSAGES/ModPlus.po b/plugins/ModPlus/locale/uk/LC_MESSAGES/ModPlus.po
index 9e42174083..abc97a82dc 100644
--- a/plugins/ModPlus/locale/uk/LC_MESSAGES/ModPlus.po
+++ b/plugins/ModPlus/locale/uk/LC_MESSAGES/ModPlus.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - ModPlus to Ukrainian (Україн�ька)
+# Translation of StatusNet - ModPlus to Ukrainian (україн�ька)
 # Exported from translatewiki.net
 #
 # Author: Boogie
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ModPlus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:12+0000\n"
-"Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:17+0000\n"
+"Language-Team: Ukrainian <https://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:31+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2012-01-02 10:11:36+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-modplus\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
diff --git a/plugins/ModPlus/remoteprofileaction.php b/plugins/ModPlus/remoteprofileaction.php
index 8e2fcad284..1d7a84d9f3 100644
--- a/plugins/ModPlus/remoteprofileaction.php
+++ b/plugins/ModPlus/remoteprofileaction.php
@@ -8,7 +8,7 @@ class RemoteProfileAction extends ShowstreamAction
 {
     function prepare($args)
     {
-        OwnerDesignAction::prepare($args); // skip the ProfileAction code and replace it...
+        Action::prepare($args); // skip the ProfileAction code and replace it...
 
         $id = $this->arg('id');
         $this->user = false;
@@ -31,6 +31,15 @@ class RemoteProfileAction extends ShowstreamAction
         $this->tag = $this->trimmed('tag');
         $this->page = ($this->arg('page')) ? ($this->arg('page')+0) : 1;
         common_set_returnto($this->selfUrl());
+
+        $p = Profile::current();
+        if (empty($this->tag)) {
+            $stream = new ProfileNoticeStream($this->profile, $p);
+        } else {
+            $stream = new TaggedProfileNoticeStream($this->profile, $this->tag, $p);
+        }
+        $this->notice = $stream->getNotices(($this->page-1)*NOTICES_PER_PAGE, NOTICES_PER_PAGE + 1);
+
         return true;
     }
 
@@ -71,6 +80,25 @@ class RemoteProfileAction extends ShowstreamAction
             // TRANS: Message on blocked remote profile page.
             $markdown = _m('Site moderators have silenced this profile, which prevents delivery of new messages to any users on this site.');
             $this->raw(common_markup_to_html($markdown));
+        }else{
+
+            $pnl = null;
+            if (Event::handle('ShowStreamNoticeList', array($this->notice, $this, &$pnl))) {
+                $pnl = new ProfileNoticeList($this->notice, $this);
+            }
+            $cnt = $pnl->show();
+            if (0 == $cnt) {
+                $this->showEmptyListMessage();
+            }
+
+            $args = array('id' => $this->profile->id);
+            if (!empty($this->tag))
+            {
+                $args['tag'] = $this->tag;
+            }
+            $this->pagination($this->page>1, $cnt>NOTICES_PER_PAGE, $this->page,
+                              'remoteprofile', $args);
+
         }
     }
 
@@ -90,14 +118,12 @@ class RemoteProfileAction extends ShowstreamAction
 
     function showLocalNav()
     {
-        $nav = new PublicGroupNav($this);
-        $nav->show();
+        // skip
     }
 
     function showSections()
     {
-        ProfileAction::showSections();
-        // skip tag cloud
+        // skip
     }
 
     function showStatistics()
diff --git a/plugins/Mollom/locale/Mollom.pot b/plugins/Mollom/locale/Mollom.pot
index e50f48a682..207094c41e 100644
--- a/plugins/Mollom/locale/Mollom.pot
+++ b/plugins/Mollom/locale/Mollom.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
+"POT-Creation-Date: 2012-06-30 11:07+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"
diff --git a/plugins/Mollom/locale/ca/LC_MESSAGES/Mollom.po b/plugins/Mollom/locale/ca/LC_MESSAGES/Mollom.po
index 3210212bd6..46cd32e0a5 100644
--- a/plugins/Mollom/locale/ca/LC_MESSAGES/Mollom.po
+++ b/plugins/Mollom/locale/ca/LC_MESSAGES/Mollom.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Mollom to Catalan (Català)
+# Translation of StatusNet - Mollom to Catalan (català)
 # Exported from translatewiki.net
 #
 # Author: Toniher
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Mollom\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:12+0000\n"
-"Language-Team: Catalan <http://translatewiki.net/wiki/Portal:ca>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:17+0000\n"
+"Language-Team: Catalan <https://translatewiki.net/wiki/Portal:ca>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:35+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:07+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ca\n"
 "X-Message-Group: #out-statusnet-plugin-mollom\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/Mollom/locale/de/LC_MESSAGES/Mollom.po b/plugins/Mollom/locale/de/LC_MESSAGES/Mollom.po
index 5088e93608..0148001220 100644
--- a/plugins/Mollom/locale/de/LC_MESSAGES/Mollom.po
+++ b/plugins/Mollom/locale/de/LC_MESSAGES/Mollom.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Mollom\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:12+0000\n"
-"Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:17+0000\n"
+"Language-Team: German <https://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:35+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:07+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-mollom\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/Mollom/locale/es/LC_MESSAGES/Mollom.po b/plugins/Mollom/locale/es/LC_MESSAGES/Mollom.po
new file mode 100644
index 0000000000..d6cd80f1f8
--- /dev/null
+++ b/plugins/Mollom/locale/es/LC_MESSAGES/Mollom.po
@@ -0,0 +1,23 @@
+# Translation of StatusNet - Mollom to Spanish (español)
+# Exported from translatewiki.net
+#
+# Author: Armando-Martin
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Mollom\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:17+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:51:07+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Client exception thrown when notice content triggers the spam filter.
+msgid "Spam Detected."
+msgstr "Spam detectado."
diff --git a/plugins/Mollom/locale/eu/LC_MESSAGES/Mollom.po b/plugins/Mollom/locale/eu/LC_MESSAGES/Mollom.po
new file mode 100644
index 0000000000..7ef77efa4c
--- /dev/null
+++ b/plugins/Mollom/locale/eu/LC_MESSAGES/Mollom.po
@@ -0,0 +1,23 @@
+# Translation of StatusNet - Mollom to Basque (euskara)
+# Exported from translatewiki.net
+#
+# Author: Artsuaga
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Mollom\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:17+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:51:07+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Client exception thrown when notice content triggers the spam filter.
+msgid "Spam Detected."
+msgstr "Spam Antzeman da."
diff --git a/plugins/Mollom/locale/fr/LC_MESSAGES/Mollom.po b/plugins/Mollom/locale/fr/LC_MESSAGES/Mollom.po
index 1fd8f6f774..f400d3b314 100644
--- a/plugins/Mollom/locale/fr/LC_MESSAGES/Mollom.po
+++ b/plugins/Mollom/locale/fr/LC_MESSAGES/Mollom.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Mollom to French (Français)
+# Translation of StatusNet - Mollom to French (français)
 # Exported from translatewiki.net
 #
 # Author: Iketsi
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Mollom\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:12+0000\n"
-"Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:17+0000\n"
+"Language-Team: French <https://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:35+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:07+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-mollom\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
diff --git a/plugins/Mollom/locale/gl/LC_MESSAGES/Mollom.po b/plugins/Mollom/locale/gl/LC_MESSAGES/Mollom.po
new file mode 100644
index 0000000000..ca2889e643
--- /dev/null
+++ b/plugins/Mollom/locale/gl/LC_MESSAGES/Mollom.po
@@ -0,0 +1,26 @@
+# Translation of StatusNet - Mollom to Galician (galego)
+# Exported from translatewiki.net
+#
+# Author: Toliño
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Mollom\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:17+0000\n"
+"Language-Team: Galician <https://translatewiki.net/wiki/Portal:gl>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:51:07+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: gl\n"
+"X-Message-Group: #out-statusnet-plugin-mollom\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Client exception thrown when notice content triggers the spam filter.
+msgid "Spam Detected."
+msgstr "Spam detectado."
diff --git a/plugins/Mollom/locale/he/LC_MESSAGES/Mollom.po b/plugins/Mollom/locale/he/LC_MESSAGES/Mollom.po
new file mode 100644
index 0000000000..bca4594549
--- /dev/null
+++ b/plugins/Mollom/locale/he/LC_MESSAGES/Mollom.po
@@ -0,0 +1,26 @@
+# Translation of StatusNet - Mollom to Hebrew (עברית)
+# Exported from translatewiki.net
+#
+# Author: Amire80
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Mollom\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:17+0000\n"
+"Language-Team: Hebrew <https://translatewiki.net/wiki/Portal:he>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:51:07+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: he\n"
+"X-Message-Group: #out-statusnet-plugin-mollom\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Client exception thrown when notice content triggers the spam filter.
+msgid "Spam Detected."
+msgstr "זוהה זבל."
diff --git a/plugins/Mollom/locale/ia/LC_MESSAGES/Mollom.po b/plugins/Mollom/locale/ia/LC_MESSAGES/Mollom.po
index 230c5f9d0b..3b2f0a2f47 100644
--- a/plugins/Mollom/locale/ia/LC_MESSAGES/Mollom.po
+++ b/plugins/Mollom/locale/ia/LC_MESSAGES/Mollom.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Mollom to Interlingua (Interlingua)
+# Translation of StatusNet - Mollom to Interlingua (interlingua)
 # Exported from translatewiki.net
 #
 # Author: McDutchie
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Mollom\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:13+0000\n"
-"Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:17+0000\n"
+"Language-Team: Interlingua <https://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:35+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:07+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-mollom\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/Mollom/locale/it/LC_MESSAGES/Mollom.po b/plugins/Mollom/locale/it/LC_MESSAGES/Mollom.po
new file mode 100644
index 0000000000..1165829056
--- /dev/null
+++ b/plugins/Mollom/locale/it/LC_MESSAGES/Mollom.po
@@ -0,0 +1,23 @@
+# Translation of StatusNet - Mollom to Italian (italiano)
+# Exported from translatewiki.net
+#
+# Author: GreenFox
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Mollom\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:17+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:51:07+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Client exception thrown when notice content triggers the spam filter.
+msgid "Spam Detected."
+msgstr "Identificato come Spam."
diff --git a/plugins/Mollom/locale/ja/LC_MESSAGES/Mollom.po b/plugins/Mollom/locale/ja/LC_MESSAGES/Mollom.po
new file mode 100644
index 0000000000..a7678a1578
--- /dev/null
+++ b/plugins/Mollom/locale/ja/LC_MESSAGES/Mollom.po
@@ -0,0 +1,23 @@
+# Translation of StatusNet - Mollom to Japanese (日本語)
+# Exported from translatewiki.net
+#
+# Author: Shirayuki
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Mollom\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:17+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:51:07+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#. TRANS: Client exception thrown when notice content triggers the spam filter.
+msgid "Spam Detected."
+msgstr "迷惑メールを検出����。"
diff --git a/plugins/Mollom/locale/mk/LC_MESSAGES/Mollom.po b/plugins/Mollom/locale/mk/LC_MESSAGES/Mollom.po
index fd9671580d..a5fabef4c9 100644
--- a/plugins/Mollom/locale/mk/LC_MESSAGES/Mollom.po
+++ b/plugins/Mollom/locale/mk/LC_MESSAGES/Mollom.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Mollom to Macedonian (Македон�ки)
+# Translation of StatusNet - Mollom to Macedonian (македон�ки)
 # Exported from translatewiki.net
 #
 # Author: Bjankuloski06
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Mollom\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:13+0000\n"
-"Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:18+0000\n"
+"Language-Team: Macedonian <https://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:35+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:07+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-mollom\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
diff --git a/plugins/Mollom/locale/nl/LC_MESSAGES/Mollom.po b/plugins/Mollom/locale/nl/LC_MESSAGES/Mollom.po
index 100ef77ce1..8df6a80cd4 100644
--- a/plugins/Mollom/locale/nl/LC_MESSAGES/Mollom.po
+++ b/plugins/Mollom/locale/nl/LC_MESSAGES/Mollom.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Mollom\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:13+0000\n"
-"Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:18+0000\n"
+"Language-Team: Dutch <https://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:35+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:07+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-mollom\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/Mollom/locale/sv/LC_MESSAGES/Mollom.po b/plugins/Mollom/locale/sv/LC_MESSAGES/Mollom.po
new file mode 100644
index 0000000000..77c98aeab0
--- /dev/null
+++ b/plugins/Mollom/locale/sv/LC_MESSAGES/Mollom.po
@@ -0,0 +1,26 @@
+# Translation of StatusNet - Mollom to Swedish (svenska)
+# Exported from translatewiki.net
+#
+# Author: WikiPhoenix
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Mollom\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:18+0000\n"
+"Language-Team: Swedish <https://translatewiki.net/wiki/Portal:sv>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:51:07+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: sv\n"
+"X-Message-Group: #out-statusnet-plugin-mollom\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Client exception thrown when notice content triggers the spam filter.
+msgid "Spam Detected."
+msgstr "Spam upptäcktes."
diff --git a/plugins/Mollom/locale/tl/LC_MESSAGES/Mollom.po b/plugins/Mollom/locale/tl/LC_MESSAGES/Mollom.po
index d720b8b46a..69beb5c782 100644
--- a/plugins/Mollom/locale/tl/LC_MESSAGES/Mollom.po
+++ b/plugins/Mollom/locale/tl/LC_MESSAGES/Mollom.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Mollom\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:13+0000\n"
-"Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:18+0000\n"
+"Language-Team: Tagalog <https://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:35+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:07+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-mollom\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/Mollom/locale/uk/LC_MESSAGES/Mollom.po b/plugins/Mollom/locale/uk/LC_MESSAGES/Mollom.po
index c73dee4eff..9b3d596c59 100644
--- a/plugins/Mollom/locale/uk/LC_MESSAGES/Mollom.po
+++ b/plugins/Mollom/locale/uk/LC_MESSAGES/Mollom.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Mollom to Ukrainian (Україн�ька)
+# Translation of StatusNet - Mollom to Ukrainian (україн�ька)
 # Exported from translatewiki.net
 #
 # Author: Boogie
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Mollom\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:13+0000\n"
-"Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:18+0000\n"
+"Language-Team: Ukrainian <https://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:35+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:07+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-mollom\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
diff --git a/plugins/Msn/extlib/phpmsnclass/msn.class.php b/plugins/Msn/extlib/phpmsnclass/msn.class.php
index 3d10c25b2c..5675eb5c2f 100644
--- a/plugins/Msn/extlib/phpmsnclass/msn.class.php
+++ b/plugins/Msn/extlib/phpmsnclass/msn.class.php
@@ -2973,7 +2973,7 @@ X-OIM-Sequence-Num: 1
         // <wsse:BinarySecurityToken Id="Compact1">t=tick&p=</wsse:BinarySecurityToken>
         // <wst:BinarySecret>binary secret</wst:BinarySecret>
         // RST2: messenger.msn.com
-        // <wsse:BinarySecurityToken Id="PPToken2">t=tick</wsse:BinarySecurityToken>
+        // <wsse:BinarySecurityToken Id="Compact2">t=tick</wsse:BinarySecurityToken>
         // RST3: contacts.msn.com
         // <wsse:BinarySecurityToken Id="Compact3">t=tick&p=</wsse:BinarySecurityToken>
         // RST4: messengersecure.live.com
@@ -2985,7 +2985,7 @@ X-OIM-Sequence-Num: 1
         preg_match("#".
             "<wsse\:BinarySecurityToken Id=\"Compact1\">(.*)</wsse\:BinarySecurityToken>(.*)".
             "<wst\:BinarySecret>(.*)</wst\:BinarySecret>(.*)".
-            "<wsse\:BinarySecurityToken Id=\"PPToken2\">(.*)</wsse\:BinarySecurityToken>(.*)".
+            "<wsse\:BinarySecurityToken Id=\"Compact2\">(.*)</wsse\:BinarySecurityToken>(.*)".
             "<wsse\:BinarySecurityToken Id=\"Compact3\">(.*)</wsse\:BinarySecurityToken>(.*)".
             "<wsse\:BinarySecurityToken Id=\"Compact4\">(.*)</wsse\:BinarySecurityToken>(.*)".
             "<wsse\:BinarySecurityToken Id=\"Compact5\">(.*)</wsse\:BinarySecurityToken>(.*)".
diff --git a/plugins/Msn/locale/Msn.pot b/plugins/Msn/locale/Msn.pot
index 1fe8609710..08f37d374f 100644
--- a/plugins/Msn/locale/Msn.pot
+++ b/plugins/Msn/locale/Msn.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
+"POT-Creation-Date: 2012-06-30 11:07+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"
diff --git a/plugins/Msn/locale/ar/LC_MESSAGES/Msn.po b/plugins/Msn/locale/ar/LC_MESSAGES/Msn.po
new file mode 100644
index 0000000000..1b94253755
--- /dev/null
+++ b/plugins/Msn/locale/ar/LC_MESSAGES/Msn.po
@@ -0,0 +1,54 @@
+# Translation of StatusNet - Msn to Arabic (العربية)
+# Exported from translatewiki.net
+#
+# Author: Imksa
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Msn\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:18+0000\n"
+"Language-Team: Arabic <https://translatewiki.net/wiki/Portal:ar>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-12-03 13:48:56+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: ar\n"
+"X-Message-Group: #out-statusnet-plugin-msn\n"
+"Plural-Forms: nplurals=6; plural=(n == 0) ? 0 : ( (n == 1) ? 1 : ( (n == "
+"2) ? 2 : ( (n%100 >= 3 && n%100 <= 10) ? 3 : ( (n%100 >= 11 && n%100 <= "
+"99) ? 4 : 5 ) ) ) );\n"
+
+#. TRANS: MSN bot status message.
+msgid "Send me a message to post a notice"
+msgstr "أرسل لي رسالة لأرسل إشعارًا"
+
+#. TRANS: Server exception thrown when a message to be sent through MSN cannot be added to the database queue.
+msgid "Database error inserting queue item."
+msgstr "خطأ �ي قاعدة بيانات إدراج بند قائمة الانتظار."
+
+#. TRANS: Display name of the MSN instant messaging service.
+msgid "MSN"
+msgstr ""
+
+#. TRANS: Exception thrown when configuration for the MSN plugin is incomplete.
+msgid "Must specify a user."
+msgstr "يجب تحديد مستخدم."
+
+#. TRANS: Exception thrown when configuration for the MSN plugin is incomplete.
+msgid "Must specify a password."
+msgstr "يجب تحديد كلمة مرور."
+
+#. TRANS: Exception thrown when configuration for the MSN plugin is incomplete.
+msgid "Must specify a nickname."
+msgstr "يجب تحديد اسم مستعار."
+
+#. TRANS: Plugin description.
+msgid ""
+"The MSN plugin allows users to send and receive notices over the MSN network."
+msgstr ""
+"البرنامج المساعد MSN يسمح للمستخدمين بإرسال وتلقى إشعارات عبر شبكة MSN."
diff --git a/plugins/Msn/locale/ca/LC_MESSAGES/Msn.po b/plugins/Msn/locale/ca/LC_MESSAGES/Msn.po
new file mode 100644
index 0000000000..65c84278db
--- /dev/null
+++ b/plugins/Msn/locale/ca/LC_MESSAGES/Msn.po
@@ -0,0 +1,51 @@
+# Translation of StatusNet - Msn to Catalan (català)
+# Exported from translatewiki.net
+#
+# Author: Toniher
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Msn\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:18+0000\n"
+"Language-Team: Catalan <https://translatewiki.net/wiki/Portal:ca>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-12-03 13:48:56+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: ca\n"
+"X-Message-Group: #out-statusnet-plugin-msn\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: MSN bot status message.
+msgid "Send me a message to post a notice"
+msgstr "Envia'm un missatge per publicar un avís"
+
+#. TRANS: Server exception thrown when a message to be sent through MSN cannot be added to the database queue.
+msgid "Database error inserting queue item."
+msgstr ""
+
+#. TRANS: Display name of the MSN instant messaging service.
+msgid "MSN"
+msgstr "MSN"
+
+#. TRANS: Exception thrown when configuration for the MSN plugin is incomplete.
+msgid "Must specify a user."
+msgstr "Cal especificar un usuari."
+
+#. TRANS: Exception thrown when configuration for the MSN plugin is incomplete.
+msgid "Must specify a password."
+msgstr "Cal especificar una contrasenya."
+
+#. TRANS: Exception thrown when configuration for the MSN plugin is incomplete.
+msgid "Must specify a nickname."
+msgstr "Cal especificar un sobrenom."
+
+#. TRANS: Plugin description.
+msgid ""
+"The MSN plugin allows users to send and receive notices over the MSN network."
+msgstr ""
diff --git a/plugins/Msn/locale/de/LC_MESSAGES/Msn.po b/plugins/Msn/locale/de/LC_MESSAGES/Msn.po
index b98ce2e17b..703dcbf924 100644
--- a/plugins/Msn/locale/de/LC_MESSAGES/Msn.po
+++ b/plugins/Msn/locale/de/LC_MESSAGES/Msn.po
@@ -10,14 +10,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Msn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:14+0000\n"
-"Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:18+0000\n"
+"Language-Team: German <https://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:37+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-12-03 13:48:56+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-msn\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/Msn/locale/es/LC_MESSAGES/Msn.po b/plugins/Msn/locale/es/LC_MESSAGES/Msn.po
index 168ac299af..b71dcfb57a 100644
--- a/plugins/Msn/locale/es/LC_MESSAGES/Msn.po
+++ b/plugins/Msn/locale/es/LC_MESSAGES/Msn.po
@@ -1,6 +1,7 @@
-# Translation of StatusNet - Msn to Spanish (Español)
+# Translation of StatusNet - Msn to Spanish (español)
 # Exported from translatewiki.net
 #
+# Author: Armando-Martin
 # Author: Od1n
 # --
 # This file is distributed under the same license as the StatusNet package.
@@ -9,25 +10,25 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Msn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-04-27 12:36+0000\n"
-"PO-Revision-Date: 2011-04-27 12:37:46+0000\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:18+0000\n"
 "Language-Team: Spanish <http://translatewiki.net/wiki/Portal:es>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-26 16:22:40+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87008); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-12-03 13:48:56+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-plugin-msn\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANS: MSN bot status message.
 msgid "Send me a message to post a notice"
-msgstr ""
+msgstr "Envíeme un mensaje para publicar una nota"
 
 #. TRANS: Server exception thrown when a message to be sent through MSN cannot be added to the database queue.
 msgid "Database error inserting queue item."
-msgstr ""
+msgstr "Error en la base de datos al insertar un elemento en la cola."
 
 #. TRANS: Display name of the MSN instant messaging service.
 msgid "MSN"
@@ -35,17 +36,19 @@ msgstr "MSN"
 
 #. TRANS: Exception thrown when configuration for the MSN plugin is incomplete.
 msgid "Must specify a user."
-msgstr ""
+msgstr "Debe especificar un usuario."
 
 #. TRANS: Exception thrown when configuration for the MSN plugin is incomplete.
 msgid "Must specify a password."
-msgstr ""
+msgstr "Debe especificar una contraseña."
 
 #. TRANS: Exception thrown when configuration for the MSN plugin is incomplete.
 msgid "Must specify a nickname."
-msgstr ""
+msgstr "Debe especificar un alias."
 
 #. TRANS: Plugin description.
 msgid ""
 "The MSN plugin allows users to send and receive notices over the MSN network."
 msgstr ""
+"El complemento (plugin) MSN permite a los usuarios enviar y recibir mensajes "
+"mediante una red MSN."
diff --git a/plugins/Msn/locale/eu/LC_MESSAGES/Msn.po b/plugins/Msn/locale/eu/LC_MESSAGES/Msn.po
new file mode 100644
index 0000000000..602f67f752
--- /dev/null
+++ b/plugins/Msn/locale/eu/LC_MESSAGES/Msn.po
@@ -0,0 +1,53 @@
+# Translation of StatusNet - Msn to Basque (euskara)
+# Exported from translatewiki.net
+#
+# Author: Artsuaga
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Msn\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:18+0000\n"
+"Language-Team: Basque <https://translatewiki.net/wiki/Portal:eu>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-12-03 13:48:56+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: eu\n"
+"X-Message-Group: #out-statusnet-plugin-msn\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: MSN bot status message.
+msgid "Send me a message to post a notice"
+msgstr "Bidalidazu mezu bat ohar bat argitaratzeko"
+
+#. TRANS: Server exception thrown when a message to be sent through MSN cannot be added to the database queue.
+msgid "Database error inserting queue item."
+msgstr "Datubase akatsa zerrendako puntua txertatzerakoan."
+
+#. TRANS: Display name of the MSN instant messaging service.
+msgid "MSN"
+msgstr "MSN"
+
+#. TRANS: Exception thrown when configuration for the MSN plugin is incomplete.
+msgid "Must specify a user."
+msgstr "Erabiltzaile bat zehaztu."
+
+#. TRANS: Exception thrown when configuration for the MSN plugin is incomplete.
+msgid "Must specify a password."
+msgstr "Pasahitz bat zehaztu."
+
+#. TRANS: Exception thrown when configuration for the MSN plugin is incomplete.
+msgid "Must specify a nickname."
+msgstr "Goitizen bat zehaztu."
+
+#. TRANS: Plugin description.
+msgid ""
+"The MSN plugin allows users to send and receive notices over the MSN network."
+msgstr ""
+"MSN pluginak erabiltzaileei MSN sare bidez oharrak bidali eta jasotzen uzten "
+"du."
diff --git a/plugins/Msn/locale/fr/LC_MESSAGES/Msn.po b/plugins/Msn/locale/fr/LC_MESSAGES/Msn.po
index 5796e9acf7..9c39c8a137 100644
--- a/plugins/Msn/locale/fr/LC_MESSAGES/Msn.po
+++ b/plugins/Msn/locale/fr/LC_MESSAGES/Msn.po
@@ -1,7 +1,9 @@
-# Translation of StatusNet - Msn to French (Français)
+# Translation of StatusNet - Msn to French (français)
 # Exported from translatewiki.net
 #
+# Author: Gomoko
 # Author: Hashar
+# Author: Od1n
 # --
 # This file is distributed under the same license as the StatusNet package.
 #
@@ -9,25 +11,25 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Msn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-04-27 12:36+0000\n"
-"PO-Revision-Date: 2011-04-27 12:37:46+0000\n"
-"Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:18+0000\n"
+"Language-Team: French <https://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-26 16:22:40+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87008); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-12-03 13:48:56+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-msn\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. TRANS: MSN bot status message.
 msgid "Send me a message to post a notice"
-msgstr ""
+msgstr "M’envoyer un message pour publier un avis."
 
 #. TRANS: Server exception thrown when a message to be sent through MSN cannot be added to the database queue.
 msgid "Database error inserting queue item."
-msgstr ""
+msgstr "Erreur de base de données lors de l'insertion d'un élément de file."
 
 #. TRANS: Display name of the MSN instant messaging service.
 msgid "MSN"
@@ -35,15 +37,15 @@ msgstr "MSN"
 
 #. TRANS: Exception thrown when configuration for the MSN plugin is incomplete.
 msgid "Must specify a user."
-msgstr ""
+msgstr "Il faut spécifier un utilisateur."
 
 #. TRANS: Exception thrown when configuration for the MSN plugin is incomplete.
 msgid "Must specify a password."
-msgstr ""
+msgstr "Il faut spécifier un mot de passe."
 
 #. TRANS: Exception thrown when configuration for the MSN plugin is incomplete.
 msgid "Must specify a nickname."
-msgstr ""
+msgstr "Il faut indiquer un pseudonyme."
 
 #. TRANS: Plugin description.
 msgid ""
diff --git a/plugins/Msn/locale/gl/LC_MESSAGES/Msn.po b/plugins/Msn/locale/gl/LC_MESSAGES/Msn.po
new file mode 100644
index 0000000000..0fbe7c2a55
--- /dev/null
+++ b/plugins/Msn/locale/gl/LC_MESSAGES/Msn.po
@@ -0,0 +1,53 @@
+# Translation of StatusNet - Msn to Galician (galego)
+# Exported from translatewiki.net
+#
+# Author: Toliño
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Msn\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:18+0000\n"
+"Language-Team: Galician <https://translatewiki.net/wiki/Portal:gl>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-12-03 13:48:56+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: gl\n"
+"X-Message-Group: #out-statusnet-plugin-msn\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: MSN bot status message.
+msgid "Send me a message to post a notice"
+msgstr "Envíame unha mensaxe para publicar unha nota"
+
+#. TRANS: Server exception thrown when a message to be sent through MSN cannot be added to the database queue.
+msgid "Database error inserting queue item."
+msgstr "Erro na base de datos ao inserir un elemento na cola."
+
+#. TRANS: Display name of the MSN instant messaging service.
+msgid "MSN"
+msgstr "MSN"
+
+#. TRANS: Exception thrown when configuration for the MSN plugin is incomplete.
+msgid "Must specify a user."
+msgstr "Cómpre especificar un usuario."
+
+#. TRANS: Exception thrown when configuration for the MSN plugin is incomplete.
+msgid "Must specify a password."
+msgstr "Cómpre especificar un contrasinal."
+
+#. TRANS: Exception thrown when configuration for the MSN plugin is incomplete.
+msgid "Must specify a nickname."
+msgstr "Cómpre especificar un alcume."
+
+#. TRANS: Plugin description.
+msgid ""
+"The MSN plugin allows users to send and receive notices over the MSN network."
+msgstr ""
+"O complemento MSN permite aos usuarios enviar e recibir mensaxes desde a "
+"rede de MSN."
diff --git a/plugins/Msn/locale/ia/LC_MESSAGES/Msn.po b/plugins/Msn/locale/ia/LC_MESSAGES/Msn.po
index e0b07d0a35..8a32e3dc3f 100644
--- a/plugins/Msn/locale/ia/LC_MESSAGES/Msn.po
+++ b/plugins/Msn/locale/ia/LC_MESSAGES/Msn.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Msn to Interlingua (Interlingua)
+# Translation of StatusNet - Msn to Interlingua (interlingua)
 # Exported from translatewiki.net
 #
 # Author: McDutchie
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Msn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:14+0000\n"
-"Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:19+0000\n"
+"Language-Team: Interlingua <https://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:37+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-12-03 13:48:56+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-msn\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/Msn/locale/it/LC_MESSAGES/Msn.po b/plugins/Msn/locale/it/LC_MESSAGES/Msn.po
new file mode 100644
index 0000000000..84b33666f6
--- /dev/null
+++ b/plugins/Msn/locale/it/LC_MESSAGES/Msn.po
@@ -0,0 +1,51 @@
+# Translation of StatusNet - Msn to Italian (italiano)
+# Exported from translatewiki.net
+#
+# Author: GreenFox
+# Author: Od1n
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Msn\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:19+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-12-03 13:48:56+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: MSN bot status message.
+msgid "Send me a message to post a notice"
+msgstr "Mandami un messaggio per pubblicare una comunicazione."
+
+#. TRANS: Server exception thrown when a message to be sent through MSN cannot be added to the database queue.
+msgid "Database error inserting queue item."
+msgstr "Errore nel database inserendo l'elemento in coda."
+
+#. TRANS: Display name of the MSN instant messaging service.
+msgid "MSN"
+msgstr "MSN"
+
+#. TRANS: Exception thrown when configuration for the MSN plugin is incomplete.
+msgid "Must specify a user."
+msgstr "Devi specificare un utente."
+
+#. TRANS: Exception thrown when configuration for the MSN plugin is incomplete.
+msgid "Must specify a password."
+msgstr "Devi specificare una password."
+
+#. TRANS: Exception thrown when configuration for the MSN plugin is incomplete.
+msgid "Must specify a nickname."
+msgstr "È necessario specificare un soprannome."
+
+#. TRANS: Plugin description.
+msgid ""
+"The MSN plugin allows users to send and receive notices over the MSN network."
+msgstr ""
+"Il plugin per MSN consente agli utenti di inviare e ricevere notizie tramite "
+"la rete MSN."
diff --git a/plugins/Msn/locale/mk/LC_MESSAGES/Msn.po b/plugins/Msn/locale/mk/LC_MESSAGES/Msn.po
index f93b3d85a4..d1faf2383c 100644
--- a/plugins/Msn/locale/mk/LC_MESSAGES/Msn.po
+++ b/plugins/Msn/locale/mk/LC_MESSAGES/Msn.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Msn to Macedonian (Македон�ки)
+# Translation of StatusNet - Msn to Macedonian (македон�ки)
 # Exported from translatewiki.net
 #
 # Author: Bjankuloski06
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Msn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:14+0000\n"
-"Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:19+0000\n"
+"Language-Team: Macedonian <https://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:37+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-12-03 13:48:56+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-msn\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
diff --git a/plugins/Msn/locale/nl/LC_MESSAGES/Msn.po b/plugins/Msn/locale/nl/LC_MESSAGES/Msn.po
index a8a6770746..76e66ef6e3 100644
--- a/plugins/Msn/locale/nl/LC_MESSAGES/Msn.po
+++ b/plugins/Msn/locale/nl/LC_MESSAGES/Msn.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Msn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:14+0000\n"
-"Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:19+0000\n"
+"Language-Team: Dutch <https://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:37+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-12-03 13:48:56+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-msn\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/Msn/locale/sv/LC_MESSAGES/Msn.po b/plugins/Msn/locale/sv/LC_MESSAGES/Msn.po
index ea85b0375b..3151a5ad88 100644
--- a/plugins/Msn/locale/sv/LC_MESSAGES/Msn.po
+++ b/plugins/Msn/locale/sv/LC_MESSAGES/Msn.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Msn to Swedish (Svenska)
+# Translation of StatusNet - Msn to Swedish (svenska)
 # Exported from translatewiki.net
 #
 # Author: Lokal Profil
@@ -10,14 +10,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Msn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:14+0000\n"
-"Language-Team: Swedish <http://translatewiki.net/wiki/Portal:sv>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:19+0000\n"
+"Language-Team: Swedish <https://translatewiki.net/wiki/Portal:sv>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:37+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-12-03 13:48:56+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: sv\n"
 "X-Message-Group: #out-statusnet-plugin-msn\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/Msn/locale/tl/LC_MESSAGES/Msn.po b/plugins/Msn/locale/tl/LC_MESSAGES/Msn.po
index 19db4b0c20..09070c74e1 100644
--- a/plugins/Msn/locale/tl/LC_MESSAGES/Msn.po
+++ b/plugins/Msn/locale/tl/LC_MESSAGES/Msn.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Msn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:14+0000\n"
-"Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:19+0000\n"
+"Language-Team: Tagalog <https://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:37+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-12-03 13:48:56+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-msn\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/Msn/locale/uk/LC_MESSAGES/Msn.po b/plugins/Msn/locale/uk/LC_MESSAGES/Msn.po
index bfd3d82cba..0126127bdc 100644
--- a/plugins/Msn/locale/uk/LC_MESSAGES/Msn.po
+++ b/plugins/Msn/locale/uk/LC_MESSAGES/Msn.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Msn to Ukrainian (Україн�ька)
+# Translation of StatusNet - Msn to Ukrainian (україн�ька)
 # Exported from translatewiki.net
 #
 # Author: Boogie
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Msn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:14+0000\n"
-"Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:19+0000\n"
+"Language-Team: Ukrainian <https://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:37+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-12-03 13:48:56+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-msn\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
diff --git a/plugins/NoticeTitle/locale/NoticeTitle.pot b/plugins/NoticeTitle/locale/NoticeTitle.pot
index 02ef793f0c..1677584a65 100644
--- a/plugins/NoticeTitle/locale/NoticeTitle.pot
+++ b/plugins/NoticeTitle/locale/NoticeTitle.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
+"POT-Creation-Date: 2012-06-30 11:07+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"
diff --git a/plugins/NoticeTitle/locale/ar/LC_MESSAGES/NoticeTitle.po b/plugins/NoticeTitle/locale/ar/LC_MESSAGES/NoticeTitle.po
index f03d82dcb2..fbc552316d 100644
--- a/plugins/NoticeTitle/locale/ar/LC_MESSAGES/NoticeTitle.po
+++ b/plugins/NoticeTitle/locale/ar/LC_MESSAGES/NoticeTitle.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - NoticeTitle\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:15+0000\n"
-"Language-Team: Arabic <http://translatewiki.net/wiki/Portal:ar>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:19+0000\n"
+"Language-Team: Arabic <https://translatewiki.net/wiki/Portal:ar>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:46+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:09+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ar\n"
 "X-Message-Group: #out-statusnet-plugin-noticetitle\n"
 "Plural-Forms: nplurals=6; plural=(n == 0) ? 0 : ( (n == 1) ? 1 : ( (n == "
diff --git a/plugins/NoticeTitle/locale/br/LC_MESSAGES/NoticeTitle.po b/plugins/NoticeTitle/locale/br/LC_MESSAGES/NoticeTitle.po
index 5e1606e306..b1c6c4743f 100644
--- a/plugins/NoticeTitle/locale/br/LC_MESSAGES/NoticeTitle.po
+++ b/plugins/NoticeTitle/locale/br/LC_MESSAGES/NoticeTitle.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - NoticeTitle to Breton (Brezhoneg)
+# Translation of StatusNet - NoticeTitle to Breton (brezhoneg)
 # Exported from translatewiki.net
 #
 # Author: Fulup
@@ -10,14 +10,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - NoticeTitle\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:15+0000\n"
-"Language-Team: Breton <http://translatewiki.net/wiki/Portal:br>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:19+0000\n"
+"Language-Team: Breton <https://translatewiki.net/wiki/Portal:br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:46+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:09+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-noticetitle\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
diff --git a/plugins/NoticeTitle/locale/ca/LC_MESSAGES/NoticeTitle.po b/plugins/NoticeTitle/locale/ca/LC_MESSAGES/NoticeTitle.po
index e5bbfc2cd9..c487eec545 100644
--- a/plugins/NoticeTitle/locale/ca/LC_MESSAGES/NoticeTitle.po
+++ b/plugins/NoticeTitle/locale/ca/LC_MESSAGES/NoticeTitle.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - NoticeTitle to Catalan (Català)
+# Translation of StatusNet - NoticeTitle to Catalan (català)
 # Exported from translatewiki.net
 #
 # Author: Toniher
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - NoticeTitle\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:15+0000\n"
-"Language-Team: Catalan <http://translatewiki.net/wiki/Portal:ca>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:19+0000\n"
+"Language-Team: Catalan <https://translatewiki.net/wiki/Portal:ca>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:46+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:09+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ca\n"
 "X-Message-Group: #out-statusnet-plugin-noticetitle\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -36,4 +36,4 @@ msgstr[1] ""
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
 #, php-format
 msgid "%1$s - %2$s"
-msgstr ""
+msgstr "%1$s - %2$s"
diff --git a/plugins/NoticeTitle/locale/de/LC_MESSAGES/NoticeTitle.po b/plugins/NoticeTitle/locale/de/LC_MESSAGES/NoticeTitle.po
index c6d999d157..6ce23dc5bc 100644
--- a/plugins/NoticeTitle/locale/de/LC_MESSAGES/NoticeTitle.po
+++ b/plugins/NoticeTitle/locale/de/LC_MESSAGES/NoticeTitle.po
@@ -1,6 +1,7 @@
 # Translation of StatusNet - NoticeTitle to German (Deutsch)
 # Exported from translatewiki.net
 #
+# Author: ChrisiPK
 # Author: The Evil IP address
 # --
 # This file is distributed under the same license as the StatusNet package.
@@ -9,14 +10,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - NoticeTitle\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:15+0000\n"
-"Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:19+0000\n"
+"Language-Team: German <https://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:46+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:09+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-noticetitle\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -30,8 +31,8 @@ msgstr "Fügt Nachrichten optionale Titel hinzu."
 #, php-format
 msgid "The notice title is too long (maximum %d character)."
 msgid_plural "The notice title is too long (maximum %d characters)."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Der Nachrichtentitel ist zu lang (maximal %d Zeichen)."
+msgstr[1] "Der Nachrichtentitel ist zu lang (maximal %d Zeichen)."
 
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
 #, php-format
diff --git a/plugins/NoticeTitle/locale/es/LC_MESSAGES/NoticeTitle.po b/plugins/NoticeTitle/locale/es/LC_MESSAGES/NoticeTitle.po
new file mode 100644
index 0000000000..7631ec524a
--- /dev/null
+++ b/plugins/NoticeTitle/locale/es/LC_MESSAGES/NoticeTitle.po
@@ -0,0 +1,38 @@
+# Translation of StatusNet - NoticeTitle to Spanish (español)
+# Exported from translatewiki.net
+#
+# Author: Armando-Martin
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - NoticeTitle\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:19+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:51:09+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin description.
+msgid "Adds optional titles to notices."
+msgstr "Agrega títulos opcionales a las notas."
+
+#. TRANS: Exception thrown when a notice title is too long.
+#. TRANS: %d is the maximum number of characters allowed in a title (used for plural).
+#, php-format
+msgid "The notice title is too long (maximum %d character)."
+msgid_plural "The notice title is too long (maximum %d characters)."
+msgstr[0] ""
+"El título de la nota es demasiado largo (el máximo  es %d  carácter). "
+msgstr[1] ""
+"El título del aviso es demasiado largo (el máximo son  %d  caracteres)."
+
+#. TRANS: Page title. %1$s is the title, %2$s is the site name.
+#, php-format
+msgid "%1$s - %2$s"
+msgstr "%1$s - %2$s"
diff --git a/plugins/NoticeTitle/locale/eu/LC_MESSAGES/NoticeTitle.po b/plugins/NoticeTitle/locale/eu/LC_MESSAGES/NoticeTitle.po
new file mode 100644
index 0000000000..e63c38b0e7
--- /dev/null
+++ b/plugins/NoticeTitle/locale/eu/LC_MESSAGES/NoticeTitle.po
@@ -0,0 +1,39 @@
+# Translation of StatusNet - NoticeTitle to Basque (euskara)
+# Exported from translatewiki.net
+#
+# Author: Artsuaga
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - NoticeTitle\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:20+0000\n"
+"Language-Team: Basque <https://translatewiki.net/wiki/Portal:eu>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:51:09+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: eu\n"
+"X-Message-Group: #out-statusnet-plugin-noticetitle\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin description.
+msgid "Adds optional titles to notices."
+msgstr "Oharrei tituluak gehitzen uzten du."
+
+#. TRANS: Exception thrown when a notice title is too long.
+#. TRANS: %d is the maximum number of characters allowed in a title (used for plural).
+#, php-format
+msgid "The notice title is too long (maximum %d character)."
+msgid_plural "The notice title is too long (maximum %d characters)."
+msgstr[0] "Oharraren titulua luzeegia da (gehienez ere karaktere %d)."
+msgstr[1] "Oharraren titulua luzeegia da (gehienez ere %d karaktere."
+
+#. TRANS: Page title. %1$s is the title, %2$s is the site name.
+#, php-format
+msgid "%1$s - %2$s"
+msgstr "%1$s - %2$s"
diff --git a/plugins/NoticeTitle/locale/fr/LC_MESSAGES/NoticeTitle.po b/plugins/NoticeTitle/locale/fr/LC_MESSAGES/NoticeTitle.po
index debe65689b..678a047b86 100644
--- a/plugins/NoticeTitle/locale/fr/LC_MESSAGES/NoticeTitle.po
+++ b/plugins/NoticeTitle/locale/fr/LC_MESSAGES/NoticeTitle.po
@@ -1,6 +1,7 @@
-# Translation of StatusNet - NoticeTitle to French (Français)
+# Translation of StatusNet - NoticeTitle to French (français)
 # Exported from translatewiki.net
 #
+# Author: Crochet.david
 # Author: Verdy p
 # --
 # This file is distributed under the same license as the StatusNet package.
@@ -9,14 +10,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - NoticeTitle\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:15+0000\n"
-"Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:20+0000\n"
+"Language-Team: French <https://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:46+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:09+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-noticetitle\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
@@ -31,7 +32,9 @@ msgstr "Ajoute des titres optionnels aux avis."
 msgid "The notice title is too long (maximum %d character)."
 msgid_plural "The notice title is too long (maximum %d characters)."
 msgstr[0] ""
+"Le titre de la description est trop longue (limitée à %d caractère maximum)."
 msgstr[1] ""
+"Le titre de la description est trop longue (limitée à %d caractères maximum)."
 
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
 #, php-format
diff --git a/plugins/NoticeTitle/locale/gl/LC_MESSAGES/NoticeTitle.po b/plugins/NoticeTitle/locale/gl/LC_MESSAGES/NoticeTitle.po
new file mode 100644
index 0000000000..94df29b210
--- /dev/null
+++ b/plugins/NoticeTitle/locale/gl/LC_MESSAGES/NoticeTitle.po
@@ -0,0 +1,39 @@
+# Translation of StatusNet - NoticeTitle to Galician (galego)
+# Exported from translatewiki.net
+#
+# Author: Toliño
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - NoticeTitle\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:20+0000\n"
+"Language-Team: Galician <https://translatewiki.net/wiki/Portal:gl>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:51:09+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: gl\n"
+"X-Message-Group: #out-statusnet-plugin-noticetitle\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin description.
+msgid "Adds optional titles to notices."
+msgstr "Engade títulos opcionais ás notas."
+
+#. TRANS: Exception thrown when a notice title is too long.
+#. TRANS: %d is the maximum number of characters allowed in a title (used for plural).
+#, php-format
+msgid "The notice title is too long (maximum %d character)."
+msgid_plural "The notice title is too long (maximum %d characters)."
+msgstr[0] "O título da nota é longo de máis (o máximo é %d carácter)."
+msgstr[1] "O título da nota é longo de máis (o máximo son %d caracteres)."
+
+#. TRANS: Page title. %1$s is the title, %2$s is the site name.
+#, php-format
+msgid "%1$s - %2$s"
+msgstr "%1$s - %2$s"
diff --git a/plugins/NoticeTitle/locale/he/LC_MESSAGES/NoticeTitle.po b/plugins/NoticeTitle/locale/he/LC_MESSAGES/NoticeTitle.po
index 617d71c451..e0d4e58f70 100644
--- a/plugins/NoticeTitle/locale/he/LC_MESSAGES/NoticeTitle.po
+++ b/plugins/NoticeTitle/locale/he/LC_MESSAGES/NoticeTitle.po
@@ -1,6 +1,7 @@
 # Translation of StatusNet - NoticeTitle to Hebrew (עברית)
 # Exported from translatewiki.net
 #
+# Author: Amire80
 # Author: YaronSh
 # --
 # This file is distributed under the same license as the StatusNet package.
@@ -9,29 +10,29 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - NoticeTitle\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:15+0000\n"
-"Language-Team: Hebrew <http://translatewiki.net/wiki/Portal:he>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:20+0000\n"
+"Language-Team: Hebrew <https://translatewiki.net/wiki/Portal:he>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:46+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:09+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: he\n"
 "X-Message-Group: #out-statusnet-plugin-noticetitle\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANS: Plugin description.
 msgid "Adds optional titles to notices."
-msgstr "הוספת כותרת (ל� הכרחית) להתרעות."
+msgstr "הוספת כותרת (ל� הכרחית) לעדכוני�."
 
 #. TRANS: Exception thrown when a notice title is too long.
 #. TRANS: %d is the maximum number of characters allowed in a title (used for plural).
 #, php-format
 msgid "The notice title is too long (maximum %d character)."
 msgid_plural "The notice title is too long (maximum %d characters)."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "כותרת העדכון �רוכה מדי (�פשר לכתוב תו �חד לכל היותר)."
+msgstr[1] "כותרת העדכון �רוכה מדי (�פשר לכתוב %d תווי� לכל היותר)."
 
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
 #, php-format
diff --git a/plugins/NoticeTitle/locale/ia/LC_MESSAGES/NoticeTitle.po b/plugins/NoticeTitle/locale/ia/LC_MESSAGES/NoticeTitle.po
index bde32ab89b..412681776b 100644
--- a/plugins/NoticeTitle/locale/ia/LC_MESSAGES/NoticeTitle.po
+++ b/plugins/NoticeTitle/locale/ia/LC_MESSAGES/NoticeTitle.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - NoticeTitle to Interlingua (Interlingua)
+# Translation of StatusNet - NoticeTitle to Interlingua (interlingua)
 # Exported from translatewiki.net
 #
 # Author: McDutchie
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - NoticeTitle\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:15+0000\n"
-"Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:20+0000\n"
+"Language-Team: Interlingua <https://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:46+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:09+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-noticetitle\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -30,8 +30,8 @@ msgstr "Adde optional titulos a notas."
 #, php-format
 msgid "The notice title is too long (maximum %d character)."
 msgid_plural "The notice title is too long (maximum %d characters)."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Le titulo del nota es troppo longe (maximo %d character)."
+msgstr[1] "Le titulo del nota es troppo longe (maximo %d characteres)."
 
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
 #, php-format
diff --git a/plugins/NoticeTitle/locale/it/LC_MESSAGES/NoticeTitle.po b/plugins/NoticeTitle/locale/it/LC_MESSAGES/NoticeTitle.po
new file mode 100644
index 0000000000..48715e0eec
--- /dev/null
+++ b/plugins/NoticeTitle/locale/it/LC_MESSAGES/NoticeTitle.po
@@ -0,0 +1,37 @@
+# Translation of StatusNet - NoticeTitle to Italian (italiano)
+# Exported from translatewiki.net
+#
+# Author: GreenFox
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - NoticeTitle\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:20+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:51:09+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin description.
+msgid "Adds optional titles to notices."
+msgstr "Aggiunge titoli opzionali alle comunicazioni."
+
+#. TRANS: Exception thrown when a notice title is too long.
+#. TRANS: %d is the maximum number of characters allowed in a title (used for plural).
+#, php-format
+msgid "The notice title is too long (maximum %d character)."
+msgid_plural "The notice title is too long (maximum %d characters)."
+msgstr[0] "Il titolo della descrizione è troppo lungo (massimo %d caratteri)."
+msgstr[1] ""
+"I titoli della descrizione sono troppo lunghi (massimo %d caratteri)."
+
+#. TRANS: Page title. %1$s is the title, %2$s is the site name.
+#, php-format
+msgid "%1$s - %2$s"
+msgstr "%1$s - %2$s"
diff --git a/plugins/NoticeTitle/locale/mk/LC_MESSAGES/NoticeTitle.po b/plugins/NoticeTitle/locale/mk/LC_MESSAGES/NoticeTitle.po
index 62e31a0038..21c1f39db2 100644
--- a/plugins/NoticeTitle/locale/mk/LC_MESSAGES/NoticeTitle.po
+++ b/plugins/NoticeTitle/locale/mk/LC_MESSAGES/NoticeTitle.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - NoticeTitle to Macedonian (Македон�ки)
+# Translation of StatusNet - NoticeTitle to Macedonian (македон�ки)
 # Exported from translatewiki.net
 #
 # Author: Bjankuloski06
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - NoticeTitle\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:15+0000\n"
-"Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:20+0000\n"
+"Language-Team: Macedonian <https://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:46+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:09+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-noticetitle\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
@@ -30,8 +30,8 @@ msgstr "Додава на�лови на забелешките (по избор
 #, php-format
 msgid "The notice title is too long (maximum %d character)."
 msgid_plural "The notice title is too long (maximum %d characters)."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "�а�ловот на забелешката е предолг (мак�. %d знак)."
+msgstr[1] "�а�ловот на забелешката е предолг (мал�. %d знаци)."
 
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
 #, php-format
diff --git a/plugins/NoticeTitle/locale/nb/LC_MESSAGES/NoticeTitle.po b/plugins/NoticeTitle/locale/nb/LC_MESSAGES/NoticeTitle.po
index 0b30f9c26c..1e6ebdaeb4 100644
--- a/plugins/NoticeTitle/locale/nb/LC_MESSAGES/NoticeTitle.po
+++ b/plugins/NoticeTitle/locale/nb/LC_MESSAGES/NoticeTitle.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - NoticeTitle to Norwegian (bokmål)‬ (‪Norsk (bokmål)‬)
+# Translation of StatusNet - NoticeTitle to Norwegian Bokmål (‪norsk (bokmål)‬)
 # Exported from translatewiki.net
 #
 # Author: Nghtwlkr
@@ -9,15 +9,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - NoticeTitle\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:16+0000\n"
-"Language-Team: Norwegian (bokmål)‬ <http://translatewiki.net/wiki/Portal:no>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:20+0000\n"
+"Language-Team: Norwegian Bokmål <https://translatewiki.net/wiki/Portal:nb>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:46+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
-"X-Language-Code: no\n"
+"X-POT-Import-Date: 2011-06-05 21:51:09+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: nb\n"
 "X-Message-Group: #out-statusnet-plugin-noticetitle\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
diff --git a/plugins/NoticeTitle/locale/ne/LC_MESSAGES/NoticeTitle.po b/plugins/NoticeTitle/locale/ne/LC_MESSAGES/NoticeTitle.po
index a683d53a71..fd9e103fdc 100644
--- a/plugins/NoticeTitle/locale/ne/LC_MESSAGES/NoticeTitle.po
+++ b/plugins/NoticeTitle/locale/ne/LC_MESSAGES/NoticeTitle.po
@@ -10,14 +10,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - NoticeTitle\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:16+0000\n"
-"Language-Team: Nepali <http://translatewiki.net/wiki/Portal:ne>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:20+0000\n"
+"Language-Team: Nepali <https://translatewiki.net/wiki/Portal:ne>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:46+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:09+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ne\n"
 "X-Message-Group: #out-statusnet-plugin-noticetitle\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/NoticeTitle/locale/nl/LC_MESSAGES/NoticeTitle.po b/plugins/NoticeTitle/locale/nl/LC_MESSAGES/NoticeTitle.po
index b89abd1676..5c8d311cae 100644
--- a/plugins/NoticeTitle/locale/nl/LC_MESSAGES/NoticeTitle.po
+++ b/plugins/NoticeTitle/locale/nl/LC_MESSAGES/NoticeTitle.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - NoticeTitle\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:16+0000\n"
-"Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:20+0000\n"
+"Language-Team: Dutch <https://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:46+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:09+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-noticetitle\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -30,8 +30,8 @@ msgstr "Voegt optioneel titels toe aan mededelingen."
 #, php-format
 msgid "The notice title is too long (maximum %d character)."
 msgid_plural "The notice title is too long (maximum %d characters)."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "De mededelingstitel is te lang (maximaal %d teken)."
+msgstr[1] "De mededelingstitel is te lang (maximaal %d tekens)."
 
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
 #, php-format
diff --git a/plugins/NoticeTitle/locale/ru/LC_MESSAGES/NoticeTitle.po b/plugins/NoticeTitle/locale/ru/LC_MESSAGES/NoticeTitle.po
index 133e2e5b31..4cb54a8cb0 100644
--- a/plugins/NoticeTitle/locale/ru/LC_MESSAGES/NoticeTitle.po
+++ b/plugins/NoticeTitle/locale/ru/LC_MESSAGES/NoticeTitle.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - NoticeTitle to Russian (Ру��кий)
+# Translation of StatusNet - NoticeTitle to Russian (ру��кий)
 # Exported from translatewiki.net
 #
 # Author: �лек�андр Сигачёв
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - NoticeTitle\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:16+0000\n"
-"Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:20+0000\n"
+"Language-Team: Russian <https://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:46+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:09+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-noticetitle\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
diff --git a/plugins/NoticeTitle/locale/sv/LC_MESSAGES/NoticeTitle.po b/plugins/NoticeTitle/locale/sv/LC_MESSAGES/NoticeTitle.po
index 6fbd298823..a70505a0f9 100644
--- a/plugins/NoticeTitle/locale/sv/LC_MESSAGES/NoticeTitle.po
+++ b/plugins/NoticeTitle/locale/sv/LC_MESSAGES/NoticeTitle.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - NoticeTitle to Swedish (Svenska)
+# Translation of StatusNet - NoticeTitle to Swedish (svenska)
 # Exported from translatewiki.net
 #
 # Author: Jamminjohn
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - NoticeTitle\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:16+0000\n"
-"Language-Team: Swedish <http://translatewiki.net/wiki/Portal:sv>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:20+0000\n"
+"Language-Team: Swedish <https://translatewiki.net/wiki/Portal:sv>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:46+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:09+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: sv\n"
 "X-Message-Group: #out-statusnet-plugin-noticetitle\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/NoticeTitle/locale/tl/LC_MESSAGES/NoticeTitle.po b/plugins/NoticeTitle/locale/tl/LC_MESSAGES/NoticeTitle.po
index 6ed6fa80e4..aae7e6f4e9 100644
--- a/plugins/NoticeTitle/locale/tl/LC_MESSAGES/NoticeTitle.po
+++ b/plugins/NoticeTitle/locale/tl/LC_MESSAGES/NoticeTitle.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - NoticeTitle\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:16+0000\n"
-"Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:21+0000\n"
+"Language-Team: Tagalog <https://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:46+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:09+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-noticetitle\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -30,8 +30,9 @@ msgstr "Nagdaragdag ng maaaring wala na mga pamagat sa mga pabatid."
 #, php-format
 msgid "The notice title is too long (maximum %d character)."
 msgid_plural "The notice title is too long (maximum %d characters)."
-msgstr[0] ""
+msgstr[0] "Napakahaba ng pamagat ng pabatid (pinakamataas na ang %d panitik)."
 msgstr[1] ""
+"Napakahaba ng pamagat ng pabatid (pinakamataas na ang %d mga panitik)."
 
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
 #, php-format
diff --git a/plugins/NoticeTitle/locale/uk/LC_MESSAGES/NoticeTitle.po b/plugins/NoticeTitle/locale/uk/LC_MESSAGES/NoticeTitle.po
index 220b5c3a94..d15d486509 100644
--- a/plugins/NoticeTitle/locale/uk/LC_MESSAGES/NoticeTitle.po
+++ b/plugins/NoticeTitle/locale/uk/LC_MESSAGES/NoticeTitle.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - NoticeTitle to Ukrainian (Україн�ька)
+# Translation of StatusNet - NoticeTitle to Ukrainian (україн�ька)
 # Exported from translatewiki.net
 #
 # Author: Boogie
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - NoticeTitle\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:17+0000\n"
-"Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:21+0000\n"
+"Language-Team: Ukrainian <https://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:46+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:09+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-noticetitle\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
@@ -31,9 +31,9 @@ msgstr "Додавати до повідомлень необов’�зкові
 #, php-format
 msgid "The notice title is too long (maximum %d character)."
 msgid_plural "The notice title is too long (maximum %d characters)."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "Заголовок допи�у надто довгий (мак�имум — %d знак)."
+msgstr[1] "Заголовок допи�у надто довгий (мак�имум — %d знаків)."
+msgstr[2] "Заголовок допи�у надто довгий (мак�имум — %d знак)."
 
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
 #, php-format
diff --git a/plugins/OMB/OMBPlugin.php b/plugins/OMB/OMBPlugin.php
new file mode 100644
index 0000000000..de0088cc8e
--- /dev/null
+++ b/plugins/OMB/OMBPlugin.php
@@ -0,0 +1,413 @@
+<?php
+/**
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2011, StatusNet, Inc.
+ *
+ * OpenMicroBlogging plugin - add OpenMicroBloggin 0.1 support to
+ * StatusNet.
+ *
+ * Note: the OpenMicroBlogging protocol has been deprecated in favor of OStatus.
+ * This plugin is provided for backwards compatibility and experimentation.
+ *
+ * Please see the README and the OStatus plugin.
+ *
+ * PHP version 5
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Sample
+ * @package   StatusNet
+ * @author    Zach Copley
+ * @copyright 2011 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+
+set_include_path(get_include_path() . PATH_SEPARATOR . dirname(__FILE__) . '/extlib/');
+
+if (!defined('STATUSNET')) {
+    // This check helps protect against security problems;
+    // your code file can't be executed directly from the web.
+    exit(1);
+}
+
+/**
+ * OMB plugin main class
+ *
+ * @category  Integration
+ * @package   StatusNet
+ * @author    Zach Copley <zach@status.net>
+ * @copyright 2011 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+class OMBPlugin extends Plugin
+{
+    /**
+     * Load related modules when needed
+     *
+     * @param string $cls Name of the class to be loaded
+     *
+     * @return boolean hook value; true means continue processing, false means stop.
+     */
+    function onAutoload($cls)
+    {
+        $dir = dirname(__FILE__);
+
+        switch ($cls)
+        {
+        case 'Requesttokenaction':
+        case 'Accesstokenaction':
+        case 'Userauthorizationaction':
+        case 'Postnoticeaction':
+        case 'Updateprofileaction':
+        case 'Finishremotesubscribeaction':
+        case 'Remotesubscribeaction':
+        case 'XrdsAction':
+            include_once $dir . '/action/' . strtolower(mb_substr($cls, 0, -6)) . '.php';
+            return false;
+            break;
+        case 'OmbQueueHandler':
+        case 'ProfileQueueHandler':
+            include_once $dir . '/lib/' . strtolower($cls) . '.php';
+            return false;
+        case 'OMBOAuthDataStore':
+            include_once $dir . '/lib/omboauthstore.php';
+        default:
+            return true;
+        }
+    }
+
+    /**
+     * Map URLs to actions
+     *
+     * @param Net_URL_Mapper $m path-to-action mapper
+     *
+     * @return boolean hook value; true means continue processing, false means stop.
+     */
+    function onRouterInitialized($m)
+    {
+        $bare = array(
+            'requesttoken',
+            'accesstoken',
+            'userauthorization',
+            'postnotice',
+            'updateprofile',
+            'finishremotesubscribe'
+        );
+
+        foreach ($bare as $action) {
+            $m->connect(
+                'index.php?action=' . $action, array('action' => $action)
+            );
+        }
+
+        // exceptional
+
+        $m->connect('main/remote', array('action' => 'remotesubscribe'));
+        $m->connect(
+            'main/remote?nickname=:nickname',
+            array('action' => 'remotesubscribe'),
+            array('nickname' => '[A-Za-z0-9_-]+')
+        );
+
+        $m->connect(
+            'xrds',
+            array('action' => 'xrds', 'nickname' => $nickname)
+        );
+
+        return true;
+    }
+
+    /**
+     * Put saved notices into the queue for OMB distribution
+     *
+     * @param Notice $notice     the notice to broadcast
+     * @param array  $transports queuehandler's list of transports
+     * @return boolean true if queing was successful
+     */
+    function onStartEnqueueNotice($notice, &$transports)
+    {
+        if ($notice->isLocal()) {
+            if ($notice->inScope(null)) {
+                array_unshift($transports, 'omb');
+                common_log(
+                    LOG_INFO, "Notice {$notice->id} queued for OMB processing"
+                );
+            } else {
+                // Note: We don't do privacy-controlled OMB updates.
+                common_log(
+                    LOG_NOTICE,
+                    "Not queueing notice {$notice->id} for OMB because of "
+                    . "privacy; scope = {$notice->scope}",
+                    __FILE__
+                );
+            }
+        } else {
+            common_log(
+                LOG_NOTICE,
+                "Not queueing notice {$notice->id} for OMB because it's not "
+                . "local.",
+                __FILE__
+            );
+        }
+
+        return true;
+    }
+
+    /**
+     * Set up queue handlers for outgoing OMB pushes
+     *
+     * @param QueueManager $qm
+     * @return boolean hook return
+     */
+    function onEndInitializeQueueManager(QueueManager $qm)
+    {
+        // Prepare outgoing distributions after notice save.
+        $qm->connect('omb', 'OmbQueueHandler');
+        $qm->connect('profile', 'ProfileQueueHandler');
+
+        return true;
+    }
+
+    /**
+     * Return OMB remote profile, if any
+     *
+     * @param Profile $profile
+     * @param string  $uri
+     * @return boolen false if there's a remote profile
+     */
+    function onStartGetProfileUri($profile, &$uri)
+    {
+        $remote = Remote_profile::staticGet('id', $this->id);
+        if (!empty($remote)) {
+            $uri = $remote->uri;
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * We can't initiate subscriptions for a remote OMB profile; don't show
+     * subscribe button
+     *
+     * @param type $action
+     */
+    function onStartShowProfileListSubscribeButton($action)
+    {
+        $remote = Remote_profile::staticGet('id', $action->profile->id);
+        if (empty($remote)) {
+            false;
+        }
+        return true;
+    }
+
+    /**
+     * Check for illegal subscription attempts
+     *
+     * @param User    $user     subscriber
+     * @param Profile $other    subscribee
+     * @return hook return value
+     */
+    function onStartSubscribe($profile, $other)
+    {
+        // OMB 0.1 doesn't have a mechanism for local-server-
+        // originated subscription.
+
+        $omb01 = Remote_profile::staticGet('id', $other_id);
+
+        if (!empty($omb01)) {
+            throw new ClientException(
+                // TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
+                _m('You cannot subscribe to an OMB 0.1 '
+                    . 'remote profile with this action.'
+                )
+            );
+            return false;
+        }
+    }
+
+    /**
+     * Throw an error if someone tries to tag a remote profile
+     *
+     * @param Profile $tagger_profile   profile of the tagger
+     * @param Profile $tagged_profile   profile of the taggee
+     * @param string $tag
+     *
+     * @return true
+     */
+    function onStartTagProfile($tagger_profile, $tagged_profile, $tag)
+    {
+        // OMB 0.1 doesn't have a mechanism for local-server-
+        // originated tag.
+
+        $omb01 = Remote_profile::staticGet('id', $tagged_profile->id);
+
+        if (!empty($omb01)) {
+            $this->clientError(
+                // TRANS: Client error displayed when trying to add an OMB 0.1 remote profile to a list.
+                _m('You cannot list an OMB 0.1 '
+                   .'remote profile with this action.')
+            );
+        }
+        return false;
+    }
+
+    /**
+     * Check to make sure we're not tryng to untag an OMB profile
+     *
+     * // XXX: Should this ever happen?
+     *
+     * @param Profile_tag $ptag the profile tag
+     */
+    function onUntagProfile($ptag)
+    {
+        // OMB 0.1 doesn't have a mechanism for local-server-
+        // originated tag.
+
+        $omb01 = Remote_profile::staticGet('id', $ptag->tagged);
+
+        if (!empty($omb01)) {
+            $this->clientError(
+                // TRANS: Client error displayed when trying to (un)list an OMB 0.1 remote profile.
+                _m('You cannot (un)list an OMB 0.1 '
+                    . 'remote profile with this action.')
+            );
+            return false;
+        }
+    }
+
+    /**
+     * Remove old OMB subscription tokens
+     *
+     * @param User    $user     subscriber
+     * @param Profile $other    subscribee
+     * @return hook return value
+     */
+    function onEndUnsubscribe($profile, $other)
+    {
+        $sub = Subscription::pkeyGet(
+            array('subscriber' => $subscriber->id, 'subscribed' => $other->id)
+        );
+
+        if (!empty($sub->token)) {
+
+            $token = new Token();
+
+            $token->tok    = $sub->token;
+
+            if ($token->find(true)) {
+
+                $result = $token->delete();
+
+                if (!$result) {
+                    common_log_db_error($token, 'DELETE', __FILE__);
+                    throw new Exception(
+                        // TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
+                        _m('Could not delete subscription OMB token.')
+                    );
+                }
+            } else {
+                common_log(
+                    LOG_ERR,
+                    "Couldn't find credentials with token {$token->tok}",
+                    __FILE__
+                );
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * Search for an OMB remote profile by URI
+     *
+     * @param string  $uri      remote profile URI
+     * @param Profile $profile  the profile to set
+     * @return boolean hook value
+     */
+    function onStartGetProfileFromURI($uri, &$profile)
+    {
+        $remote_profile = Remote_profile::staticGet('uri', $uri);
+        if (!empty($remote_profile)) {
+            $profile = Profile::staticGet('id', $remote_profile->profile_id);
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Return OMB remote profiles as well as regular profiles
+     * in helper
+     *
+     * @param type $profile
+     * @param type $uri
+     */
+    function onStartCommonProfileURI($profile, &$uri)
+    {
+        $remote = Remote_profile::staticGet($profile->id);
+        if ($remote) {
+            $uri = $remote->uri;
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * Broadcast a profile over OMB
+     *
+     * @param Profile $profile to broadcast
+     * @return false
+     */
+    function onBroadcastProfile($profile) {
+        $qm = QueueManager::get();
+        $qm->enqueue($profile, "profile");
+        return true;
+    }
+
+    function onStartProfileRemoteSubscribe($out, $profile)
+    {
+        $out->elementStart('li', 'entity_subscribe');
+        $url = common_local_url('remotesubscribe',
+                                array('nickname' => $this->profile->nickname));
+        $out->element('a', array('href' => $url,
+                                  'class' => 'entity_remote_subscribe'),
+                       // TRANS: Link text for link that will subscribe to a remote profile.
+                       _m('BUTTON','Subscribe'));
+        $out->elementEnd('li');
+
+        return false;
+    }
+
+    /**
+     * Plugin version info
+     *
+     * @param array $versions
+     * @return boolean hook value
+     */
+    function onPluginVersion(&$versions)
+    {
+        $versions[] = array(
+            'name'           => 'OpenMicroBlogging',
+            'version'        => STATUSNET_VERSION,
+            'author'         => 'Zach Copley',
+            'homepage'       => 'http://status.net/wiki/Plugin:Sample',
+            // TRANS: Plugin description.
+            'rawdescription' => _m('A sample plugin to show basics of development for new hackers.')
+        );
+
+        return true;
+    }
+}
diff --git a/plugins/OMB/README b/plugins/OMB/README
new file mode 100644
index 0000000000..f296e38ff6
--- /dev/null
+++ b/plugins/OMB/README
@@ -0,0 +1,30 @@
+OMB (OpenMicroBlogging) plugin
+==============================
+
+This plugin encapsulates OpenMicroBlogging 0.1 functionality. OMB was the
+original federation protocol for StatusNet, but has been deprecated
+in favor of OStatus (see the OStatus plugin). This plugin is provided for
+backward-compatibility with older sites, and for posterity.
+
+External libraries
+------------------
+
+This is provided with the plugin, but you may wish to use a newer version of
+the library, if and when it becomes available.
+
+- libomb. a library for implementing OpenMicroBlogging 0.1
+  http://gitorious.org/libomb
+
+
+Installation
+------------
+
+[TODO]
+
+Offline Processing
+------------------
+
+Note: once you have a sizable number of users, sending OMB messages whenever
+someone posts a message can really slow down your site; it may cause posting
+to timeout. You may wish to enable queuing and handle OMB communication
+offline. See the "queues and daemons" section of the main StatusNet README.
diff --git a/actions/accesstoken.php b/plugins/OMB/actions/accesstoken.php
similarity index 91%
rename from actions/accesstoken.php
rename to plugins/OMB/actions/accesstoken.php
index bfb771b0b3..cd7a2f4588 100644
--- a/actions/accesstoken.php
+++ b/plugins/OMB/actions/accesstoken.php
@@ -12,7 +12,7 @@
  * @link     http://status.net/
  *
  * StatusNet - the distributed open-source microblogging tool
- * Copyright (C) 2008, 2009, StatusNet, Inc.
+ * Copyright (C) 2008-2011, StatusNet, Inc.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -32,8 +32,8 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
-require_once INSTALLDIR.'/extlib/libomb/service_provider.php';
-require_once INSTALLDIR.'/lib/omb.php';
+require_once dirname(__FILE__) . '/../extlib/libomb/service_provider.php';
+require_once dirname(__FILE__) . '/../lib/omb.php';
 
 /**
  * Access token class
diff --git a/actions/finishremotesubscribe.php b/plugins/OMB/actions/finishremotesubscribe.php
similarity index 97%
rename from actions/finishremotesubscribe.php
rename to plugins/OMB/actions/finishremotesubscribe.php
index 59725af27f..fb98dbda6d 100644
--- a/actions/finishremotesubscribe.php
+++ b/plugins/OMB/actions/finishremotesubscribe.php
@@ -12,7 +12,7 @@
  * @link     http://status.net/
  *
  * StatusNet - the distributed open-source microblogging tool
- * Copyright (C) 2008, 2009, StatusNet, Inc.
+ * Copyright (C) 2008-2011, StatusNet, Inc.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -30,8 +30,8 @@
 
 if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
-require_once INSTALLDIR.'/extlib/libomb/service_consumer.php';
-require_once INSTALLDIR.'/lib/omb.php';
+require_once dirname(__FILE__) . '/../extlib/libomb/service_consumer.php';
+require_once dirname(__FILE__) . '/../lib/omb.php';
 
 /**
  * Handler for remote subscription finish callback
diff --git a/actions/postnotice.php b/plugins/OMB/actions/postnotice.php
similarity index 95%
rename from actions/postnotice.php
rename to plugins/OMB/actions/postnotice.php
index 43c764aa63..c2128f7172 100644
--- a/actions/postnotice.php
+++ b/plugins/OMB/actions/postnotice.php
@@ -12,7 +12,7 @@
  * @link     http://status.net/
  *
  * StatusNet - the distributed open-source microblogging tool
- * Copyright (C) 2008, 2009, StatusNet, Inc.
+ * Copyright (C) 2008-2011, StatusNet, Inc.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -30,8 +30,8 @@
 
 if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
-require_once INSTALLDIR.'/lib/omb.php';
-require_once INSTALLDIR.'/extlib/libomb/service_provider.php';
+require_once dirname(__FILE__) . '/../lib/omb.php';
+require_once dirname(__FILE__) . '/../extlib/libomb/service_provider.php';
 
 /**
  * Handler for postnotice action
diff --git a/actions/remotesubscribe.php b/plugins/OMB/actions/remotesubscribe.php
similarity index 97%
rename from actions/remotesubscribe.php
rename to plugins/OMB/actions/remotesubscribe.php
index 16945122f4..aafbaf5216 100644
--- a/actions/remotesubscribe.php
+++ b/plugins/OMB/actions/remotesubscribe.php
@@ -12,7 +12,7 @@
  * @link     http://status.net/
  *
  * StatusNet - the distributed open-source microblogging tool
- * Copyright (C) 2008, 2009, StatusNet, Inc.
+ * Copyright (C) 2008-2011 StatusNet, Inc.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -30,9 +30,9 @@
 
 if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
-require_once INSTALLDIR.'/lib/omb.php';
-require_once INSTALLDIR.'/extlib/libomb/service_consumer.php';
-require_once INSTALLDIR.'/extlib/libomb/profile.php';
+require_once dirname(__FILE__) . '/../lib/omb.php';
+require_once dirname(__FILE__) . '/../extlib/libomb/service_consumer.php';
+require_once dirname(__FILE__) . '/../extlib/libomb/profile.php';
 
 /**
  * Handler for remote subscription
diff --git a/actions/requesttoken.php b/plugins/OMB/actions/requesttoken.php
similarity index 92%
rename from actions/requesttoken.php
rename to plugins/OMB/actions/requesttoken.php
index 3c8cea03c0..57e8118456 100644
--- a/actions/requesttoken.php
+++ b/plugins/OMB/actions/requesttoken.php
@@ -12,7 +12,7 @@
  * @link     http://status.net/
  *
  * StatusNet - the distributed open-source microblogging tool
- * Copyright (C) 2008, 2009, StatusNet, Inc.
+ * Copyright (C) 2008-2011, StatusNet, Inc.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -32,8 +32,8 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
-require_once INSTALLDIR.'/lib/omb.php';
-require_once INSTALLDIR.'/extlib/libomb/service_provider.php';
+require_once dirname(__FILE__) . '/../lib/omb.php';
+require_once dirname(__FILE__) . '/../extlib/libomb/service_provider.php';
 
 /**
  * Request token action class.
diff --git a/actions/updateprofile.php b/plugins/OMB/actions/updateprofile.php
similarity index 94%
rename from actions/updateprofile.php
rename to plugins/OMB/actions/updateprofile.php
index e5c0803495..29d334b302 100644
--- a/actions/updateprofile.php
+++ b/plugins/OMB/actions/updateprofile.php
@@ -12,7 +12,7 @@
  * @link     http://status.net/
  *
  * StatusNet - the distributed open-source microblogging tool
- * Copyright (C) 2008, 2009, StatusNet, Inc.
+ * Copyright (C) 2008-2011, StatusNet, Inc.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -30,8 +30,8 @@
 
 if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
-require_once INSTALLDIR.'/lib/omb.php';
-require_once INSTALLDIR.'/extlib/libomb/service_provider.php';
+require_once dirname(__FILE__) . '/../lib/omb.php';
+require_once dirname(__FILE__) . '/../extlib/libomb/service_provider.php';
 
 /**
  * Handle an updateprofile action
diff --git a/actions/userauthorization.php b/plugins/OMB/actions/userauthorization.php
similarity index 98%
rename from actions/userauthorization.php
rename to plugins/OMB/actions/userauthorization.php
index 0cb55715f9..642a8dc326 100644
--- a/actions/userauthorization.php
+++ b/plugins/OMB/actions/userauthorization.php
@@ -12,7 +12,7 @@
  * @link     http://status.net/
  *
  * StatusNet - the distributed open-source microblogging tool
- * Copyright (C) 2008, 2009, StatusNet, Inc.
+ * Copyright (C) 2008-2011, StatusNet, Inc.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -30,9 +30,9 @@
 
 if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
-require_once INSTALLDIR.'/lib/omb.php';
-require_once INSTALLDIR.'/extlib/libomb/service_provider.php';
-require_once INSTALLDIR.'/extlib/libomb/profile.php';
+require_once dirname(__FILE__) . '/../lib/omb.php';
+require_once dirname(__FILE__) . '/../extlib/libomb/service_provider.php';
+require_once dirname(__FILE__) . '/../extlib/libomb/profile.php';
 define('TIMESTAMP_THRESHOLD', 300);
 
 // @todo FIXME: Missing documentation.
diff --git a/actions/xrds.php b/plugins/OMB/actions/xrds.php
similarity index 94%
rename from actions/xrds.php
rename to plugins/OMB/actions/xrds.php
index 818cd1032c..5e6758eded 100644
--- a/actions/xrds.php
+++ b/plugins/OMB/actions/xrds.php
@@ -12,7 +12,7 @@
  * @link     http://status.net/
  *
  * StatusNet - the distributed open-source microblogging tool
- * Copyright (C) 2008, 2009, StatusNet, Inc.
+ * Copyright (C) 2008-2011, StatusNet, Inc.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -32,10 +32,10 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
-require_once INSTALLDIR.'/lib/omb.php';
-require_once INSTALLDIR.'/extlib/libomb/service_provider.php';
-require_once INSTALLDIR.'/extlib/libomb/xrds_mapper.php';
-require_once INSTALLDIR.'/lib/xrdsoutputter.php';
+require_once dirname(__FILE__) . '/../lib/omb.php';
+require_once dirname(__FILE__) . '/../extlib/libomb/service_provider.php';
+require_once dirname(__FILE__) . '/../extlib/libomb/xrds_mapper.php';
+require_once dirname(__FILE__) . '/../lib/xrdsoutputter.php';
 
 /**
  * XRDS for OpenMicroBlogging
diff --git a/extlib/libomb/base_url_xrds_mapper.php b/plugins/OMB/extlib/libomb/base_url_xrds_mapper.php
similarity index 100%
rename from extlib/libomb/base_url_xrds_mapper.php
rename to plugins/OMB/extlib/libomb/base_url_xrds_mapper.php
diff --git a/extlib/libomb/constants.php b/plugins/OMB/extlib/libomb/constants.php
similarity index 100%
rename from extlib/libomb/constants.php
rename to plugins/OMB/extlib/libomb/constants.php
diff --git a/extlib/libomb/datastore.php b/plugins/OMB/extlib/libomb/datastore.php
similarity index 100%
rename from extlib/libomb/datastore.php
rename to plugins/OMB/extlib/libomb/datastore.php
diff --git a/extlib/libomb/helper.php b/plugins/OMB/extlib/libomb/helper.php
similarity index 100%
rename from extlib/libomb/helper.php
rename to plugins/OMB/extlib/libomb/helper.php
diff --git a/extlib/libomb/invalidparameterexception.php b/plugins/OMB/extlib/libomb/invalidparameterexception.php
similarity index 100%
rename from extlib/libomb/invalidparameterexception.php
rename to plugins/OMB/extlib/libomb/invalidparameterexception.php
diff --git a/extlib/libomb/invalidyadisexception.php b/plugins/OMB/extlib/libomb/invalidyadisexception.php
similarity index 100%
rename from extlib/libomb/invalidyadisexception.php
rename to plugins/OMB/extlib/libomb/invalidyadisexception.php
diff --git a/extlib/libomb/notice.php b/plugins/OMB/extlib/libomb/notice.php
similarity index 100%
rename from extlib/libomb/notice.php
rename to plugins/OMB/extlib/libomb/notice.php
diff --git a/extlib/libomb/omb_yadis_xrds.php b/plugins/OMB/extlib/libomb/omb_yadis_xrds.php
similarity index 100%
rename from extlib/libomb/omb_yadis_xrds.php
rename to plugins/OMB/extlib/libomb/omb_yadis_xrds.php
diff --git a/extlib/libomb/plain_xrds_writer.php b/plugins/OMB/extlib/libomb/plain_xrds_writer.php
similarity index 100%
rename from extlib/libomb/plain_xrds_writer.php
rename to plugins/OMB/extlib/libomb/plain_xrds_writer.php
diff --git a/extlib/libomb/profile.php b/plugins/OMB/extlib/libomb/profile.php
similarity index 100%
rename from extlib/libomb/profile.php
rename to plugins/OMB/extlib/libomb/profile.php
diff --git a/extlib/libomb/remoteserviceexception.php b/plugins/OMB/extlib/libomb/remoteserviceexception.php
similarity index 100%
rename from extlib/libomb/remoteserviceexception.php
rename to plugins/OMB/extlib/libomb/remoteserviceexception.php
diff --git a/extlib/libomb/service_consumer.php b/plugins/OMB/extlib/libomb/service_consumer.php
similarity index 100%
rename from extlib/libomb/service_consumer.php
rename to plugins/OMB/extlib/libomb/service_consumer.php
diff --git a/extlib/libomb/service_provider.php b/plugins/OMB/extlib/libomb/service_provider.php
similarity index 100%
rename from extlib/libomb/service_provider.php
rename to plugins/OMB/extlib/libomb/service_provider.php
diff --git a/extlib/libomb/unsupportedserviceexception.php b/plugins/OMB/extlib/libomb/unsupportedserviceexception.php
similarity index 100%
rename from extlib/libomb/unsupportedserviceexception.php
rename to plugins/OMB/extlib/libomb/unsupportedserviceexception.php
diff --git a/extlib/libomb/xrds_mapper.php b/plugins/OMB/extlib/libomb/xrds_mapper.php
similarity index 100%
rename from extlib/libomb/xrds_mapper.php
rename to plugins/OMB/extlib/libomb/xrds_mapper.php
diff --git a/extlib/libomb/xrds_writer.php b/plugins/OMB/extlib/libomb/xrds_writer.php
similarity index 100%
rename from extlib/libomb/xrds_writer.php
rename to plugins/OMB/extlib/libomb/xrds_writer.php
diff --git a/lib/omb.php b/plugins/OMB/lib/omb.php
similarity index 94%
rename from lib/omb.php
rename to plugins/OMB/lib/omb.php
index db60fa0ef2..0804b65c36 100644
--- a/lib/omb.php
+++ b/plugins/OMB/lib/omb.php
@@ -1,7 +1,7 @@
 <?php
 /*
  * StatusNet - the distributed open-source microblogging tool
- * Copyright (C) 2008, 2009, StatusNet, Inc.
+ * Copyright (C) 2008-2011, StatusNet, Inc.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -19,13 +19,14 @@
 
 if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
-require_once INSTALLDIR.'/lib/oauthstore.php';
-require_once 'OAuth.php';
-require_once 'libomb/constants.php';
-require_once 'libomb/service_consumer.php';
-require_once 'libomb/notice.php';
-require_once 'libomb/profile.php';
-require_once 'Auth/Yadis/Yadis.php';
+$dir = dirname(__FILE__);
+
+require_once $dir . '/omboauthstore.php';
+require_once $dir . '/../extlib/libomb/constants.php';
+require_once $dir . '/../extlib/libomb/service_consumer.php';
+require_once $dir . '/../extlib/libomb/notice.php';
+require_once $dir . '/../extlib/libomb/profile.php';
+require_once INSTALLDIR . '/extlib/Auth/Yadis/Yadis.php';
 
 function omb_oauth_consumer()
 {
@@ -48,7 +49,7 @@ function omb_oauth_datastore()
 {
     static $store = null;
     if (is_null($store)) {
-        $store = new StatusNetOAuthDataStore();
+        $store = new OMBOAuthDataStore();
     }
     return $store;
 }
@@ -64,7 +65,6 @@ function omb_hmac_sha1()
 
 function omb_broadcast_notice($notice)
 {
-
     try {
         $omb_notice = notice_to_omb_notice($notice);
     } catch (Exception $e) {
@@ -233,4 +233,4 @@ function notice_to_omb_notice($notice)
 
     return $omb_notice;
 }
-?>
+
diff --git a/lib/oauthstore.php b/plugins/OMB/lib/omboauthstore.php
similarity index 97%
rename from lib/oauthstore.php
rename to plugins/OMB/lib/omboauthstore.php
index 570343b82d..c29eeb7696 100644
--- a/lib/oauthstore.php
+++ b/plugins/OMB/lib/omboauthstore.php
@@ -1,7 +1,7 @@
 <?php
 /*
  * StatusNet - the distributed open-source microblogging tool
- * Copyright (C) 2008, 2009, StatusNet, Inc.
+ * Copyright (C) 2008-2011 StatusNet, Inc.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -19,10 +19,10 @@
 
 if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
-require_once 'libomb/datastore.php';
+require_once dirname(__FILE__) . '/../extlib/libomb/datastore.php';
 
 // @todo FIXME: Class documentation missing.
-class StatusNetOAuthDataStore extends OAuthDataStore
+class OMBOAuthDataStore extends OAuthDataStore
 {
     // We keep a record of who's contacted us
     function lookup_consumer($consumer_key)
@@ -55,17 +55,6 @@ class StatusNetOAuthDataStore extends OAuthDataStore
         }
     }
 
-    function getTokenByKey($token_key)
-    {
-        $t = new Token();
-        $t->tok = $token_key;
-        if ($t->find(true)) {
-            return $t;
-        } else {
-            return null;
-        }
-    }
-
     // http://oauth.net/core/1.0/#nonce
     // "The Consumer SHALL then generate a Nonce value that is unique for
     // all requests with that timestamp."
@@ -234,7 +223,7 @@ class StatusNetOAuthDataStore extends OAuthDataStore
         $profile = Profile::staticGet('id', $remote->id);
         if (!$profile) throw new Exception('No profile for remote user');
 
-        require_once INSTALLDIR.'/lib/omb.php';
+        require_once dirname(__FILE__) . '/omb.php';
         return profile_to_omb_profile($identifier_uri, $profile);
     }
 
@@ -376,7 +365,7 @@ class StatusNetOAuthDataStore extends OAuthDataStore
         $notice = Notice::saveNew($author->id,
                                   $omb_notice->getContent(),
                                   'omb',
-                                  array('is_local' => Notice::REMOTE_OMB,
+                                  array('is_local' => Notice::REMOTE,
                                         'uri' => $omb_notice->getIdentifierURI()));
 
     }
diff --git a/lib/ombqueuehandler.php b/plugins/OMB/lib/ombqueuehandler.php
similarity index 93%
rename from lib/ombqueuehandler.php
rename to plugins/OMB/lib/ombqueuehandler.php
index 1921c2bacd..bc70edb095 100644
--- a/lib/ombqueuehandler.php
+++ b/plugins/OMB/lib/ombqueuehandler.php
@@ -1,7 +1,7 @@
 <?php
 /*
  * StatusNet - the distributed open-source microblogging tool
- * Copyright (C) 2008, 2009, StatusNet, Inc.
+ * Copyright (C) 2008-2011, StatusNet, Inc.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -42,7 +42,7 @@ class OmbQueueHandler extends QueueHandler
             common_log(LOG_DEBUG, 'Ignoring remote notice ' . $notice->id);
             return true;
         } else {
-            require_once(INSTALLDIR.'/lib/omb.php');
+            require_once(dirname(__FILE__) . '/omb.php');
             omb_broadcast_notice($notice);
             return true;
         }
diff --git a/lib/profilequeuehandler.php b/plugins/OMB/lib/profilequeuehandler.php
similarity index 93%
rename from lib/profilequeuehandler.php
rename to plugins/OMB/lib/profilequeuehandler.php
index 6ce93229b2..5c67b0bfbe 100644
--- a/lib/profilequeuehandler.php
+++ b/plugins/OMB/lib/profilequeuehandler.php
@@ -1,7 +1,7 @@
 <?php
 /*
  * StatusNet - the distributed open-source microblogging tool
- * Copyright (C) 2010, StatusNet, Inc.
+ * Copyright (C) 2010-2011, StatusNet, Inc.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -38,7 +38,7 @@ class ProfileQueueHandler extends QueueHandler
         }
 
         if (Event::handle('StartBroadcastProfile', array($profile))) {
-            require_once(INSTALLDIR.'/lib/omb.php');
+            require_once(dirname(__FILE__) . '/omb.php');
             try {
                 omb_broadcast_profile($profile);
             } catch (Exception $e) {
diff --git a/plugins/OMB/locale/OMB.pot b/plugins/OMB/locale/OMB.pot
new file mode 100644
index 0000000000..ca260238ec
--- /dev/null
+++ b/plugins/OMB/locale/OMB.pot
@@ -0,0 +1,61 @@
+# 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: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. TRANS: Button text on page for remote subscribe.
+#. TRANS: Link text for link that will subscribe to a remote profile.
+#: actions/remotesubscribe.php:147 OMBPlugin.php:388
+msgctxt "BUTTON"
+msgid "Subscribe"
+msgstr ""
+
+#. TRANS: Button text on Authorise Subscription page.
+#: actions/userauthorization.php:202
+msgctxt "BUTTON"
+msgid "Accept"
+msgstr ""
+
+#. TRANS: Button text on Authorise Subscription page.
+#: actions/userauthorization.php:207
+msgctxt "BUTTON"
+msgid "Reject"
+msgstr ""
+
+#. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
+#: OMBPlugin.php:233
+msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
+msgstr ""
+
+#. TRANS: Client error displayed when trying to add an OMB 0.1 remote profile to a list.
+#: OMBPlugin.php:260
+msgid "You cannot list an OMB 0.1 remote profile with this action."
+msgstr ""
+
+#. TRANS: Client error displayed when trying to (un)list an OMB 0.1 remote profile.
+#: OMBPlugin.php:284
+msgid "You cannot (un)list an OMB 0.1 remote profile with this action."
+msgstr ""
+
+#. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
+#: OMBPlugin.php:318
+msgid "Could not delete subscription OMB token."
+msgstr ""
+
+#. TRANS: Plugin description.
+#: OMBPlugin.php:408
+msgid "A sample plugin to show basics of development for new hackers."
+msgstr ""
diff --git a/plugins/OMB/locale/br/LC_MESSAGES/OMB.po b/plugins/OMB/locale/br/LC_MESSAGES/OMB.po
new file mode 100644
index 0000000000..26cbec56ed
--- /dev/null
+++ b/plugins/OMB/locale/br/LC_MESSAGES/OMB.po
@@ -0,0 +1,58 @@
+# Translation of StatusNet - OMB to Breton (brezhoneg)
+# Exported from translatewiki.net
+#
+# Author: Y-M D
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - OMB\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:22+0000\n"
+"Language-Team: Breton <https://translatewiki.net/wiki/Portal:br>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2012-01-02 10:11:37+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: br\n"
+"X-Message-Group: #out-statusnet-plugin-omb\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#. TRANS: Button text on page for remote subscribe.
+#. TRANS: Link text for link that will subscribe to a remote profile.
+msgctxt "BUTTON"
+msgid "Subscribe"
+msgstr "Koumanantiñ"
+
+#. TRANS: Button text on Authorise Subscription page.
+msgctxt "BUTTON"
+msgid "Accept"
+msgstr "Asantiñ"
+
+#. TRANS: Button text on Authorise Subscription page.
+msgctxt "BUTTON"
+msgid "Reject"
+msgstr "Disteurel"
+
+#. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
+msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
+msgstr ""
+
+#. TRANS: Client error displayed when trying to add an OMB 0.1 remote profile to a list.
+msgid "You cannot list an OMB 0.1 remote profile with this action."
+msgstr ""
+
+#. TRANS: Client error displayed when trying to (un)list an OMB 0.1 remote profile.
+msgid "You cannot (un)list an OMB 0.1 remote profile with this action."
+msgstr ""
+
+#. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
+msgid "Could not delete subscription OMB token."
+msgstr ""
+
+#. TRANS: Plugin description.
+msgid "A sample plugin to show basics of development for new hackers."
+msgstr ""
diff --git a/plugins/OMB/locale/ca/LC_MESSAGES/OMB.po b/plugins/OMB/locale/ca/LC_MESSAGES/OMB.po
new file mode 100644
index 0000000000..81f4a9b858
--- /dev/null
+++ b/plugins/OMB/locale/ca/LC_MESSAGES/OMB.po
@@ -0,0 +1,58 @@
+# Translation of StatusNet - OMB to Catalan (català)
+# Exported from translatewiki.net
+#
+# Author: Toniher
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - OMB\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:22+0000\n"
+"Language-Team: Catalan <https://translatewiki.net/wiki/Portal:ca>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2012-01-02 10:11:37+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: ca\n"
+"X-Message-Group: #out-statusnet-plugin-omb\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Button text on page for remote subscribe.
+#. TRANS: Link text for link that will subscribe to a remote profile.
+msgctxt "BUTTON"
+msgid "Subscribe"
+msgstr "Subscriu"
+
+#. TRANS: Button text on Authorise Subscription page.
+msgctxt "BUTTON"
+msgid "Accept"
+msgstr "Accepta"
+
+#. TRANS: Button text on Authorise Subscription page.
+msgctxt "BUTTON"
+msgid "Reject"
+msgstr "Rebutja"
+
+#. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
+msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
+msgstr ""
+
+#. TRANS: Client error displayed when trying to add an OMB 0.1 remote profile to a list.
+msgid "You cannot list an OMB 0.1 remote profile with this action."
+msgstr ""
+
+#. TRANS: Client error displayed when trying to (un)list an OMB 0.1 remote profile.
+msgid "You cannot (un)list an OMB 0.1 remote profile with this action."
+msgstr ""
+
+#. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
+msgid "Could not delete subscription OMB token."
+msgstr ""
+
+#. TRANS: Plugin description.
+msgid "A sample plugin to show basics of development for new hackers."
+msgstr ""
diff --git a/plugins/OMB/locale/de/LC_MESSAGES/OMB.po b/plugins/OMB/locale/de/LC_MESSAGES/OMB.po
new file mode 100644
index 0000000000..2dd3c16b29
--- /dev/null
+++ b/plugins/OMB/locale/de/LC_MESSAGES/OMB.po
@@ -0,0 +1,61 @@
+# Translation of StatusNet - OMB to German (Deutsch)
+# Exported from translatewiki.net
+#
+# Author: Alphakilo
+# Author: Marcel083
+# Author: PtM
+# Author: Tiin
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - OMB\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:22+0000\n"
+"Language-Team: German <https://translatewiki.net/wiki/Portal:de>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2012-01-02 10:11:37+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: de\n"
+"X-Message-Group: #out-statusnet-plugin-omb\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Button text on page for remote subscribe.
+#. TRANS: Link text for link that will subscribe to a remote profile.
+msgctxt "BUTTON"
+msgid "Subscribe"
+msgstr "Abonnieren"
+
+#. TRANS: Button text on Authorise Subscription page.
+msgctxt "BUTTON"
+msgid "Accept"
+msgstr "Annehmen"
+
+#. TRANS: Button text on Authorise Subscription page.
+msgctxt "BUTTON"
+msgid "Reject"
+msgstr "Ablehnen"
+
+#. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
+msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
+msgstr "Sie können mit dieser Aktion kein OMB0.1 Profil abonnieren."
+
+#. TRANS: Client error displayed when trying to add an OMB 0.1 remote profile to a list.
+msgid "You cannot list an OMB 0.1 remote profile with this action."
+msgstr "Du kannst mit dieser Aktion kein OMB-0.1-Profil auflisten."
+
+#. TRANS: Client error displayed when trying to (un)list an OMB 0.1 remote profile.
+msgid "You cannot (un)list an OMB 0.1 remote profile with this action."
+msgstr "Du kannst mit dieser Aktion kein OMB-0.1-Profil (ab)listen."
+
+#. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
+msgid "Could not delete subscription OMB token."
+msgstr "Konnte Abonnement-OMB-Token nicht löschen."
+
+#. TRANS: Plugin description.
+msgid "A sample plugin to show basics of development for new hackers."
+msgstr "Ein Beispiel-Plugin Grundlagen der Entwicklung neuen Hacker zu zeigen."
diff --git a/plugins/OMB/locale/es/LC_MESSAGES/OMB.po b/plugins/OMB/locale/es/LC_MESSAGES/OMB.po
new file mode 100644
index 0000000000..5d8e828139
--- /dev/null
+++ b/plugins/OMB/locale/es/LC_MESSAGES/OMB.po
@@ -0,0 +1,57 @@
+# Translation of StatusNet - OMB to Spanish (español)
+# Exported from translatewiki.net
+#
+# Author: Armando-Martin
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - OMB\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:22+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2012-01-02 10:11:37+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Button text on page for remote subscribe.
+#. TRANS: Link text for link that will subscribe to a remote profile.
+msgctxt "BUTTON"
+msgid "Subscribe"
+msgstr "Suscribirse"
+
+#. TRANS: Button text on Authorise Subscription page.
+msgctxt "BUTTON"
+msgid "Accept"
+msgstr "Aceptar"
+
+#. TRANS: Button text on Authorise Subscription page.
+msgctxt "BUTTON"
+msgid "Reject"
+msgstr "Rechazar"
+
+#. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
+msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
+msgstr "No es posible suscribirse a un perfil remoto OMB 0.1 con esta acción."
+
+#. TRANS: Client error displayed when trying to add an OMB 0.1 remote profile to a list.
+msgid "You cannot list an OMB 0.1 remote profile with this action."
+msgstr "No puede listar un perfil remoto OMB 0.1 con esta acción."
+
+#. TRANS: Client error displayed when trying to (un)list an OMB 0.1 remote profile.
+msgid "You cannot (un)list an OMB 0.1 remote profile with this action."
+msgstr "No puede (des)listar un perfil remoto OMB 0.1 con esta acción."
+
+#. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
+msgid "Could not delete subscription OMB token."
+msgstr "No se pudo eliminar el token de suscripción OMB."
+
+#. TRANS: Plugin description.
+msgid "A sample plugin to show basics of development for new hackers."
+msgstr ""
+"Un complemento (plugin) de ejemplo para mostrar los principios básicos de "
+"desarrollo a los nuevos programadores."
diff --git a/plugins/OMB/locale/eu/LC_MESSAGES/OMB.po b/plugins/OMB/locale/eu/LC_MESSAGES/OMB.po
new file mode 100644
index 0000000000..64b40617b5
--- /dev/null
+++ b/plugins/OMB/locale/eu/LC_MESSAGES/OMB.po
@@ -0,0 +1,60 @@
+# Translation of StatusNet - OMB to Basque (euskara)
+# Exported from translatewiki.net
+#
+# Author: An13sa
+# Author: Artsuaga
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - OMB\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:22+0000\n"
+"Language-Team: Basque <https://translatewiki.net/wiki/Portal:eu>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2012-01-02 10:11:37+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: eu\n"
+"X-Message-Group: #out-statusnet-plugin-omb\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Button text on page for remote subscribe.
+#. TRANS: Link text for link that will subscribe to a remote profile.
+msgctxt "BUTTON"
+msgid "Subscribe"
+msgstr "Harpidetu"
+
+#. TRANS: Button text on Authorise Subscription page.
+msgctxt "BUTTON"
+msgid "Accept"
+msgstr "Onartu"
+
+#. TRANS: Button text on Authorise Subscription page.
+msgctxt "BUTTON"
+msgid "Reject"
+msgstr "Baztertu"
+
+#. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
+msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
+msgstr "Ezin zaitezke OMB 0.1 hurruneko profilera harpidetu ekintza honekin."
+
+#. TRANS: Client error displayed when trying to add an OMB 0.1 remote profile to a list.
+msgid "You cannot list an OMB 0.1 remote profile with this action."
+msgstr "Ezin duzu OMB 0.1 hurruneko profil bat zerrendatu ekintza honekin."
+
+#. TRANS: Client error displayed when trying to (un)list an OMB 0.1 remote profile.
+msgid "You cannot (un)list an OMB 0.1 remote profile with this action."
+msgstr ""
+"Ezin duzu OMB 0.1 hurruneko profil bat (des)zerrendatu ekintza honekin."
+
+#. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
+msgid "Could not delete subscription OMB token."
+msgstr "OMB token harpidetza ezin da ezabatu."
+
+#. TRANS: Plugin description.
+msgid "A sample plugin to show basics of development for new hackers."
+msgstr "Frogako plugin bat, hacker berriei garapen oinarriak erakusteko."
diff --git a/plugins/OMB/locale/fr/LC_MESSAGES/OMB.po b/plugins/OMB/locale/fr/LC_MESSAGES/OMB.po
new file mode 100644
index 0000000000..b7f9e272bb
--- /dev/null
+++ b/plugins/OMB/locale/fr/LC_MESSAGES/OMB.po
@@ -0,0 +1,62 @@
+# Translation of StatusNet - OMB to French (français)
+# Exported from translatewiki.net
+#
+# Author: Gomoko
+# Author: Od1n
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - OMB\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:22+0000\n"
+"Language-Team: French <https://translatewiki.net/wiki/Portal:fr>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2012-01-02 10:11:37+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: fr\n"
+"X-Message-Group: #out-statusnet-plugin-omb\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#. TRANS: Button text on page for remote subscribe.
+#. TRANS: Link text for link that will subscribe to a remote profile.
+msgctxt "BUTTON"
+msgid "Subscribe"
+msgstr "S’abonner"
+
+#. TRANS: Button text on Authorise Subscription page.
+msgctxt "BUTTON"
+msgid "Accept"
+msgstr "Accepter"
+
+#. TRANS: Button text on Authorise Subscription page.
+msgctxt "BUTTON"
+msgid "Reject"
+msgstr "Rejeter"
+
+#. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
+msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
+msgstr "Impossible de s'abonner à un profil distant OMB 0.1 avec cette action."
+
+#. TRANS: Client error displayed when trying to add an OMB 0.1 remote profile to a list.
+msgid "You cannot list an OMB 0.1 remote profile with this action."
+msgstr "Impossible de lister un profil distant OMB 0.1 avec cette action."
+
+#. TRANS: Client error displayed when trying to (un)list an OMB 0.1 remote profile.
+msgid "You cannot (un)list an OMB 0.1 remote profile with this action."
+msgstr ""
+"Impossible de (ne plus) lister un profil distant OMB 0.1 avec cette action."
+
+#. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
+msgid "Could not delete subscription OMB token."
+msgstr "Impossible de supprimer le jeton d'abonnement OMB."
+
+#. TRANS: Plugin description.
+msgid "A sample plugin to show basics of development for new hackers."
+msgstr ""
+"Un exemple de plugin pour montrer les bases de développement pour les "
+"nouveaux codeurs."
diff --git a/plugins/OMB/locale/gl/LC_MESSAGES/OMB.po b/plugins/OMB/locale/gl/LC_MESSAGES/OMB.po
new file mode 100644
index 0000000000..3da5fc9ace
--- /dev/null
+++ b/plugins/OMB/locale/gl/LC_MESSAGES/OMB.po
@@ -0,0 +1,60 @@
+# Translation of StatusNet - OMB to Galician (galego)
+# Exported from translatewiki.net
+#
+# Author: Toliño
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - OMB\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:22+0000\n"
+"Language-Team: Galician <https://translatewiki.net/wiki/Portal:gl>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2012-01-02 10:11:37+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: gl\n"
+"X-Message-Group: #out-statusnet-plugin-omb\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Button text on page for remote subscribe.
+#. TRANS: Link text for link that will subscribe to a remote profile.
+msgctxt "BUTTON"
+msgid "Subscribe"
+msgstr "Subscribirse"
+
+#. TRANS: Button text on Authorise Subscription page.
+msgctxt "BUTTON"
+msgid "Accept"
+msgstr "Aceptar"
+
+#. TRANS: Button text on Authorise Subscription page.
+msgctxt "BUTTON"
+msgid "Reject"
+msgstr "Rexeitar"
+
+#. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
+msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
+msgstr "Non se pode subscribir a un perfil remoto OMB 0.1 con esta acción."
+
+#. TRANS: Client error displayed when trying to add an OMB 0.1 remote profile to a list.
+msgid "You cannot list an OMB 0.1 remote profile with this action."
+msgstr "Non pode listar un perfil remoto OMB 0.1 con esta acción."
+
+#. TRANS: Client error displayed when trying to (un)list an OMB 0.1 remote profile.
+msgid "You cannot (un)list an OMB 0.1 remote profile with this action."
+msgstr "Non pode (des)listar un perfil remoto OMB 0.1 con esta acción."
+
+#. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
+msgid "Could not delete subscription OMB token."
+msgstr "Non se puido borrar o pase de subscrición OMB."
+
+#. TRANS: Plugin description.
+msgid "A sample plugin to show basics of development for new hackers."
+msgstr ""
+"Un complemento de exemplo para mostrar os principios básicos de "
+"desenvolvemento aos novos programadores."
diff --git a/plugins/OMB/locale/ia/LC_MESSAGES/OMB.po b/plugins/OMB/locale/ia/LC_MESSAGES/OMB.po
new file mode 100644
index 0000000000..f4bead31e6
--- /dev/null
+++ b/plugins/OMB/locale/ia/LC_MESSAGES/OMB.po
@@ -0,0 +1,60 @@
+# Translation of StatusNet - OMB to Interlingua (interlingua)
+# Exported from translatewiki.net
+#
+# Author: McDutchie
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - OMB\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:22+0000\n"
+"Language-Team: Interlingua <https://translatewiki.net/wiki/Portal:ia>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2012-01-02 10:11:37+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: ia\n"
+"X-Message-Group: #out-statusnet-plugin-omb\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Button text on page for remote subscribe.
+#. TRANS: Link text for link that will subscribe to a remote profile.
+msgctxt "BUTTON"
+msgid "Subscribe"
+msgstr "Subscriber"
+
+#. TRANS: Button text on Authorise Subscription page.
+msgctxt "BUTTON"
+msgid "Accept"
+msgstr "Acceptar"
+
+#. TRANS: Button text on Authorise Subscription page.
+msgctxt "BUTTON"
+msgid "Reject"
+msgstr "Rejectar"
+
+#. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
+msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
+msgstr "Tu non pote subscriber te a un profilo remote OMB 0.1 con iste action."
+
+#. TRANS: Client error displayed when trying to add an OMB 0.1 remote profile to a list.
+msgid "You cannot list an OMB 0.1 remote profile with this action."
+msgstr "Tu non pote listar un profilo remote OMB 0.1 con iste action."
+
+#. TRANS: Client error displayed when trying to (un)list an OMB 0.1 remote profile.
+msgid "You cannot (un)list an OMB 0.1 remote profile with this action."
+msgstr "Tu non pote (dis)listar un profilo remote OMB 0.1 con iste action."
+
+#. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
+msgid "Could not delete subscription OMB token."
+msgstr "Non poteva deler le indicio OMB del subscription."
+
+#. TRANS: Plugin description.
+msgid "A sample plugin to show basics of development for new hackers."
+msgstr ""
+"Un plug-in de exemplo pro demonstrar le principios de disveloppamento pro "
+"nove programmatores."
diff --git a/plugins/OMB/locale/it/LC_MESSAGES/OMB.po b/plugins/OMB/locale/it/LC_MESSAGES/OMB.po
new file mode 100644
index 0000000000..17b5d8a563
--- /dev/null
+++ b/plugins/OMB/locale/it/LC_MESSAGES/OMB.po
@@ -0,0 +1,63 @@
+# Translation of StatusNet - OMB to Italian (italiano)
+# Exported from translatewiki.net
+#
+# Author: GreenFox
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - OMB\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:22+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2012-01-02 10:11:37+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Button text on page for remote subscribe.
+#. TRANS: Link text for link that will subscribe to a remote profile.
+msgctxt "BUTTON"
+msgid "Subscribe"
+msgstr "Iscriviti"
+
+#. TRANS: Button text on Authorise Subscription page.
+msgctxt "BUTTON"
+msgid "Accept"
+msgstr "Accetta"
+
+#. TRANS: Button text on Authorise Subscription page.
+msgctxt "BUTTON"
+msgid "Reject"
+msgstr "Rifiuta"
+
+#. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
+msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
+msgstr ""
+"Non è possibile iscriversi ad un profilo remoto di tipo OMB 0.1 con questa "
+"azione."
+
+#. TRANS: Client error displayed when trying to add an OMB 0.1 remote profile to a list.
+msgid "You cannot list an OMB 0.1 remote profile with this action."
+msgstr ""
+"Non è possibile aggiungere alla lista un profilo remoto di tipo OMB 0.1 con "
+"questa azione."
+
+#. TRANS: Client error displayed when trying to (un)list an OMB 0.1 remote profile.
+msgid "You cannot (un)list an OMB 0.1 remote profile with this action."
+msgstr ""
+"Non è possibile rimuovere dalla lista un profilo remoto di tipo OMB 0.1 con "
+"questa azione."
+
+#. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
+msgid "Could not delete subscription OMB token."
+msgstr "Impossibile cancellare il token di iscrizione OMB dal server."
+
+#. TRANS: Plugin description.
+msgid "A sample plugin to show basics of development for new hackers."
+msgstr ""
+"Un esempio di estensione per mostrare i fondamentali di sviluppo per i nuovi "
+"programmatori"
diff --git a/plugins/OMB/locale/mk/LC_MESSAGES/OMB.po b/plugins/OMB/locale/mk/LC_MESSAGES/OMB.po
new file mode 100644
index 0000000000..2c28bc9f5a
--- /dev/null
+++ b/plugins/OMB/locale/mk/LC_MESSAGES/OMB.po
@@ -0,0 +1,62 @@
+# Translation of StatusNet - OMB to Macedonian (македон�ки)
+# Exported from translatewiki.net
+#
+# Author: Bjankuloski06
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - OMB\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:22+0000\n"
+"Language-Team: Macedonian <https://translatewiki.net/wiki/Portal:mk>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2012-01-02 10:11:37+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: mk\n"
+"X-Message-Group: #out-statusnet-plugin-omb\n"
+"Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
+
+#. TRANS: Button text on page for remote subscribe.
+#. TRANS: Link text for link that will subscribe to a remote profile.
+msgctxt "BUTTON"
+msgid "Subscribe"
+msgstr "Претплати �е"
+
+#. TRANS: Button text on Authorise Subscription page.
+msgctxt "BUTTON"
+msgid "Accept"
+msgstr "Прифати"
+
+#. TRANS: Button text on Authorise Subscription page.
+msgctxt "BUTTON"
+msgid "Reject"
+msgstr "Одбиј"
+
+#. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
+msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
+msgstr ""
+"�е можете да �е претплатите на далечин�ки профил OMB 0.1 �о ова деј�тво."
+
+#. TRANS: Client error displayed when trying to add an OMB 0.1 remote profile to a list.
+msgid "You cannot list an OMB 0.1 remote profile with this action."
+msgstr "�е можете да наведете далечин�ки профил OMB 0.1 �о ова деј�тво."
+
+#. TRANS: Client error displayed when trying to (un)list an OMB 0.1 remote profile.
+msgid "You cannot (un)list an OMB 0.1 remote profile with this action."
+msgstr ""
+"�е можете да наведете/от�траните од �пи�ок далечин�ки профил OMB 0.1 �о ова "
+"деј�тво."
+
+#. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
+msgid "Could not delete subscription OMB token."
+msgstr "�е можам да го избришам OMB-жетонот за претплата."
+
+#. TRANS: Plugin description.
+msgid "A sample plugin to show basics of development for new hackers."
+msgstr ""
+"Приклучок-пример за о�новите на развојното програмирање за нови хакери."
diff --git a/plugins/OMB/locale/nl/LC_MESSAGES/OMB.po b/plugins/OMB/locale/nl/LC_MESSAGES/OMB.po
new file mode 100644
index 0000000000..14338dedd2
--- /dev/null
+++ b/plugins/OMB/locale/nl/LC_MESSAGES/OMB.po
@@ -0,0 +1,67 @@
+# Translation of StatusNet - OMB to Dutch (Nederlands)
+# Exported from translatewiki.net
+#
+# Author: SPQRobin
+# Author: Siebrand
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - OMB\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:23+0000\n"
+"Language-Team: Dutch <https://translatewiki.net/wiki/Portal:nl>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2012-01-02 10:11:37+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: nl\n"
+"X-Message-Group: #out-statusnet-plugin-omb\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Button text on page for remote subscribe.
+#. TRANS: Link text for link that will subscribe to a remote profile.
+msgctxt "BUTTON"
+msgid "Subscribe"
+msgstr "Abonneren"
+
+#. TRANS: Button text on Authorise Subscription page.
+msgctxt "BUTTON"
+msgid "Accept"
+msgstr "Aanvaarden"
+
+#. TRANS: Button text on Authorise Subscription page.
+msgctxt "BUTTON"
+msgid "Reject"
+msgstr "Weigeren"
+
+#. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
+msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
+msgstr ""
+"U kunt via deze handeling niet abonneren op een extern OMB 1.0-profiel."
+
+#. TRANS: Client error displayed when trying to add an OMB 0.1 remote profile to a list.
+msgid "You cannot list an OMB 0.1 remote profile with this action."
+msgstr ""
+"U kunt een extern OMB 1.0-profiel niet opnemen in een lijst via deze "
+"handeling."
+
+#. TRANS: Client error displayed when trying to (un)list an OMB 0.1 remote profile.
+msgid "You cannot (un)list an OMB 0.1 remote profile with this action."
+msgstr ""
+"U kunt een extern OMB 1.0-profiel niet opnemen in of verwijderen uit een "
+"lijst via deze handeling."
+
+#. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
+msgid "Could not delete subscription OMB token."
+msgstr ""
+"Het was niet mogelijk om het OMB-token voor het abonnement te verwijderen."
+
+#. TRANS: Plugin description.
+msgid "A sample plugin to show basics of development for new hackers."
+msgstr ""
+"Een voorbeeldplug-in om de basisprogrammeertechnieken te demonstreren aan "
+"nieuwe ontwikkelaars."
diff --git a/plugins/OMB/locale/te/LC_MESSAGES/OMB.po b/plugins/OMB/locale/te/LC_MESSAGES/OMB.po
new file mode 100644
index 0000000000..e4b785222f
--- /dev/null
+++ b/plugins/OMB/locale/te/LC_MESSAGES/OMB.po
@@ -0,0 +1,55 @@
+# Translation of StatusNet - OMB to Telugu (తెల�గ�)
+# Exported from translatewiki.net
+#
+# Author: Veeven
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - OMB\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:23+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2012-01-02 10:11:37+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Button text on page for remote subscribe.
+#. TRANS: Link text for link that will subscribe to a remote profile.
+msgctxt "BUTTON"
+msgid "Subscribe"
+msgstr "చందాచేర�"
+
+#. TRANS: Button text on Authorise Subscription page.
+msgctxt "BUTTON"
+msgid "Accept"
+msgstr "అంగీకరించ�"
+
+#. TRANS: Button text on Authorise Subscription page.
+msgctxt "BUTTON"
+msgid "Reject"
+msgstr "తిరస�కరించ�"
+
+#. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
+msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
+msgstr ""
+
+#. TRANS: Client error displayed when trying to add an OMB 0.1 remote profile to a list.
+msgid "You cannot list an OMB 0.1 remote profile with this action."
+msgstr ""
+
+#. TRANS: Client error displayed when trying to (un)list an OMB 0.1 remote profile.
+msgid "You cannot (un)list an OMB 0.1 remote profile with this action."
+msgstr ""
+
+#. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
+msgid "Could not delete subscription OMB token."
+msgstr ""
+
+#. TRANS: Plugin description.
+msgid "A sample plugin to show basics of development for new hackers."
+msgstr ""
diff --git a/plugins/OMB/locale/tl/LC_MESSAGES/OMB.po b/plugins/OMB/locale/tl/LC_MESSAGES/OMB.po
new file mode 100644
index 0000000000..99f881c73f
--- /dev/null
+++ b/plugins/OMB/locale/tl/LC_MESSAGES/OMB.po
@@ -0,0 +1,63 @@
+# Translation of StatusNet - OMB to Tagalog (Tagalog)
+# Exported from translatewiki.net
+#
+# Author: AnakngAraw
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - OMB\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:23+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2012-01-02 10:11:37+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Button text on page for remote subscribe.
+#. TRANS: Link text for link that will subscribe to a remote profile.
+msgctxt "BUTTON"
+msgid "Subscribe"
+msgstr "Tumanggap ng sipi"
+
+#. TRANS: Button text on Authorise Subscription page.
+msgctxt "BUTTON"
+msgid "Accept"
+msgstr "Tanggapin"
+
+#. TRANS: Button text on Authorise Subscription page.
+msgctxt "BUTTON"
+msgid "Reject"
+msgstr "Tanggihan"
+
+#. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
+msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
+msgstr ""
+"Hindi ka makasisipi sa isang malayong balangkas ng 0.1 na OMB sa pamamagitan "
+"ng galaw na ito."
+
+#. TRANS: Client error displayed when trying to add an OMB 0.1 remote profile to a list.
+msgid "You cannot list an OMB 0.1 remote profile with this action."
+msgstr ""
+"Hindi mo maililista ang isang 0.1 na malayong balangkas ng OMB sa "
+"pamamagitan ng galaw na ito."
+
+#. TRANS: Client error displayed when trying to (un)list an OMB 0.1 remote profile.
+msgid "You cannot (un)list an OMB 0.1 remote profile with this action."
+msgstr ""
+"(Hindi) mo maililista ang isang 0.1 na malayong balangkas ng OMB sa "
+"pamamagitan ng galaw na ito."
+
+#. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
+msgid "Could not delete subscription OMB token."
+msgstr "Hindi mabura ang panghalip na pagsipi ng OMB."
+
+#. TRANS: Plugin description.
+msgid "A sample plugin to show basics of development for new hackers."
+msgstr ""
+"Isang payak na pampasak upang maipakita ang mga saligan ng kaunlaran para sa "
+"bagong mga mangunguha."
diff --git a/plugins/OStatus/OStatusPlugin.php b/plugins/OStatus/OStatusPlugin.php
index 1a02cdc8d3..43b90cfbf7 100644
--- a/plugins/OStatus/OStatusPlugin.php
+++ b/plugins/OStatus/OStatusPlugin.php
@@ -54,19 +54,19 @@ class OStatusPlugin extends Plugin
         // Discovery actions
         $m->connect('main/ownerxrd',
                     array('action' => 'ownerxrd'));
-        $m->connect('main/ostatus',
-                    array('action' => 'ostatusinit'));
         $m->connect('main/ostatustag',
                     array('action' => 'ostatustag'));
         $m->connect('main/ostatustag?nickname=:nickname',
                     array('action' => 'ostatustag'), array('nickname' => '[A-Za-z0-9_-]+'));
-        $m->connect('main/ostatus?nickname=:nickname',
+        $m->connect('main/ostatus/nickname/:nickname',
                   array('action' => 'ostatusinit'), array('nickname' => '[A-Za-z0-9_-]+'));
-        $m->connect('main/ostatus?group=:group',
+        $m->connect('main/ostatus/group/:group',
                   array('action' => 'ostatusinit'), array('group' => '[A-Za-z0-9_-]+'));
-        $m->connect('main/ostatus?peopletag=:peopletag&tagger=:tagger',
+        $m->connect('main/ostatus/peopletag/:peopletag/tagger/:tagger',
                   array('action' => 'ostatusinit'), array('tagger' => '[A-Za-z0-9_-]+',
                                                           'peopletag' => '[A-Za-z0-9_-]+'));
+        $m->connect('main/ostatus',
+                    array('action' => 'ostatusinit'));
 
         // Remote subscription actions
         $m->connect('main/ostatussub',
@@ -125,11 +125,18 @@ class OStatusPlugin extends Plugin
      */
     function onStartEnqueueNotice($notice, &$transports)
     {
-        // FIXME: we don't do privacy-controlled OStatus updates yet.
-        // once that happens, finer grain of control here.
-        if ($notice->isLocal() && $notice->inScope(null)) {
-            // put our transport first, in case there's any conflict (like OMB)
-            array_unshift($transports, 'ostatus');
+        if ($notice->isLocal()) {
+        	 if ($notice->inScope(null)) {	
+            	// put our transport first, in case there's any conflict (like OMB)
+            	array_unshift($transports, 'ostatus');
+		        $this->log(LOG_INFO, "Notice {$notice->id} queued for OStatus processing");
+        	 } else {
+		        // FIXME: we don't do privacy-controlled OStatus updates yet.
+		        // once that happens, finer grain of control here.
+		        $this->log(LOG_NOTICE, "Not queueing notice {$notice->id} for OStatus because of privacy; scope = {$notice->scope}");
+        	 }
+        } else {
+        	$this->log(LOG_NOTICE, "Not queueing notice {$notice->id} for OStatus because it's not local.");
         }
         return true;
     }
@@ -239,16 +246,16 @@ class OStatusPlugin extends Plugin
         $cur = common_current_user();
 
         if (empty($cur)) {
-            $output->elementStart('li', 'entity_subscribe');
-            $profile = $peopletag->getTagger();
+            $widget->out->elementStart('li', 'entity_subscribe');
+
             $url = common_local_url('ostatusinit',
                                     array('group' => $group->nickname));
             $widget->out->element('a', array('href' => $url,
-                                        'class' => 'entity_remote_subscribe'),
+                                             'class' => 'entity_remote_subscribe'),
                                 // TRANS: Link to subscribe to a remote entity.
                                 _m('Subscribe'));
 
-            $output->elementEnd('li');
+            $widget->out->elementEnd('li');
             return false;
         }
 
@@ -286,7 +293,7 @@ class OStatusPlugin extends Plugin
 
         $action->elementStart('fieldset');
         // TRANS: Fieldset legend.
-        $action->element('legend', null, _m('Tag remote profile'));
+        $action->element('legend', null, _m('List remote profile'));
         $action->hidden('token', common_session_token());
 
         $user = common_current_user();
@@ -343,8 +350,7 @@ class OStatusPlugin extends Plugin
      */
     function onStartProfileCompletionSearch($action, $profile, $search_engine) {
         if ($action->field == 'uri') {
-            $user = new User();
-            $profile->joinAdd($user);
+            $profile->joinAdd(array('id', 'user:id'));
             $profile->whereAdd('uri LIKE "%' . $profile->escape($q) . '%"');
             $profile->query();
 
@@ -746,11 +752,11 @@ class OStatusPlugin extends Plugin
      * deny the join.
      *
      * @param User_group $group
-     * @param User $user
+     * @param Profile    $profile
      *
      * @return mixed hook return value
      */
-    function onStartJoinGroup($group, $user)
+    function onStartJoinGroup($group, $profile)
     {
         $oprofile = Ostatus_profile::staticGet('group_id', $group->id);
         if ($oprofile) {
@@ -762,15 +768,13 @@ class OStatusPlugin extends Plugin
             // NOTE: we don't use Group_member::asActivity() since that record
             // has not yet been created.
 
-            $member = Profile::staticGet($user->id);
-
             $act = new Activity();
             $act->id = TagURI::mint('join:%d:%d:%s',
-                                    $member->id,
+                                    $profile->id,
                                     $group->id,
                                     common_date_iso8601(time()));
 
-            $act->actor = ActivityObject::fromProfile($member);
+            $act->actor = ActivityObject::fromProfile($profile);
             $act->verb = ActivityVerb::JOIN;
             $act->object = $oprofile->asActivityObject();
 
@@ -780,10 +784,10 @@ class OStatusPlugin extends Plugin
             // TRANS: Success message for subscribe to group attempt through OStatus.
             // TRANS: %1$s is the member name, %2$s is the subscribed group's name.
             $act->content = sprintf(_m('%1$s has joined group %2$s.'),
-                                    $member->getBestName(),
+                                    $profile->getBestName(),
                                     $oprofile->getBestName());
 
-            if ($oprofile->notifyActivity($act, $member)) {
+            if ($oprofile->notifyActivity($act, $profile)) {
                 return true;
             } else {
                 $oprofile->garbageCollect();
@@ -803,18 +807,18 @@ class OStatusPlugin extends Plugin
      * it'll be left with a stray membership record.
      *
      * @param User_group $group
-     * @param Profile $user
+     * @param Profile $profile
      *
      * @return mixed hook return value
      */
-    function onEndLeaveGroup($group, $user)
+    function onEndLeaveGroup($group, $profile)
     {
         $oprofile = Ostatus_profile::staticGet('group_id', $group->id);
         if ($oprofile) {
             // Drop the PuSH subscription if there are no other subscribers.
             $oprofile->garbageCollect();
 
-            $member = Profile::staticGet($user->id);
+            $member = $profile;
 
             $act = new Activity();
             $act->id = TagURI::mint('leave:%d:%d:%s',
@@ -876,7 +880,7 @@ class OStatusPlugin extends Plugin
             // TRANS: Title for following a remote list.
             $act->title = _m('TITLE','Follow list');
             // TRANS: Success message for remote list follow through OStatus.
-            // TRANS: %1$s is the subscriber name, %2$s is the list, %3$s is the tagger's name.
+            // TRANS: %1$s is the subscriber name, %2$s is the list, %3$s is the lister's name.
             $act->content = sprintf(_m('%1$s is now following people listed in %2$s by %3$s.'),
                                     $sub->getBestName(),
                                     $oprofile->getBestName(),
@@ -926,7 +930,7 @@ class OStatusPlugin extends Plugin
             // TRANS: Title for unfollowing a remote list.
             $act->title = _m('Unfollow list');
             // TRANS: Success message for remote list unfollow through OStatus.
-            // TRANS: %1$s is the subscriber name, %2$s is the list, %3$s is the tagger's name.
+            // TRANS: %1$s is the subscriber name, %2$s is the list, %3$s is the lister's name.
             $act->content = sprintf(_m('%1$s stopped following the list %2$s by %3$s.'),
                                     $sub->getBestName(),
                                     $oprofile->getBestName(),
@@ -1277,8 +1281,8 @@ class OStatusPlugin extends Plugin
                                         array('nickname' => $profileUser->nickname));
                 $output->element('a', array('href' => $url,
                                             'class' => 'entity_remote_tag'),
-                                  // TRANS: Link text for a user to tag an OStatus user.
-                                 _m('Tag'));
+                                  // TRANS: Link text for a user to list an OStatus user.
+                                 _m('List'));
                 $output->elementEnd('li');
             }
         }
diff --git a/plugins/OStatus/actions/ostatusgroup.php b/plugins/OStatus/actions/ostatusgroup.php
index e2c4121c3f..41e933498b 100644
--- a/plugins/OStatus/actions/ostatusgroup.php
+++ b/plugins/OStatus/actions/ostatusgroup.php
@@ -146,10 +146,14 @@ class OStatusGroupAction extends OStatusSubAction
         try {
             $user->joinGroup($group);
         } catch (Exception $e) {
+            common_log(LOG_ERR, "Exception on remote group join: " . $e->getMessage());
+            common_log(LOG_ERR, $e->getTraceAsString());
             // TRANS: OStatus remote group subscription dialog error.
             $this->showForm(_m('Remote group join failed!'));
             return;
         }
+
+        $this->success();
     }
 
     /**
diff --git a/plugins/OStatus/actions/ostatusinit.php b/plugins/OStatus/actions/ostatusinit.php
index 78c559e579..1c862aa997 100644
--- a/plugins/OStatus/actions/ostatusinit.php
+++ b/plugins/OStatus/actions/ostatusinit.php
@@ -105,7 +105,7 @@ class OStatusInitAction extends Action
             // TRANS: Button text to join a group.
             $submit = _m('BUTTON','Join');
         } else if ($this->peopletag && $this->tagger) {
-            // TRANS: Form legend. %1$s is a list, %2$s is a tagger's name.
+            // TRANS: Form legend. %1$s is a list, %2$s is a lister's name.
             $header = sprintf(_m('Subscribe to list %1$s by %2$s'), $this->peopletag, $this->tagger);
             // TRANS: Button text to subscribe to a list.
             $submit = _m('BUTTON','Subscribe');
diff --git a/plugins/OStatus/actions/ostatussub.php b/plugins/OStatus/actions/ostatussub.php
index 00f9c81faa..2c2bce0fe6 100644
--- a/plugins/OStatus/actions/ostatussub.php
+++ b/plugins/OStatus/actions/ostatussub.php
@@ -90,7 +90,7 @@ class OStatusSubAction extends Action
     {
         $ok = $this->preview();
         if (!$ok) {
-            // @fixme maybe provide a cancel button or link back?
+            // @todo FIXME maybe provide a cancel button or link back?
             return;
         }
 
@@ -135,6 +135,7 @@ class OStatusSubAction extends Action
         $cur = common_current_user();
         if ($cur->isSubscribed($profile)) {
             $this->element('div', array('class' => 'error'),
+                           // TRANS: Extra paragraph in remote profile view when already subscribed.
                            _m('You are already subscribed to this user.'));
             $ok = false;
         } else {
@@ -238,19 +239,19 @@ class OStatusSubAction extends Action
         } catch (FeedSubBadURLException $e) {
                 // TRANS: Error message in OStatus plugin. Do not translate the domain names example.com
                 // TRANS: and example.net, as these are official standard domain names for use in examples.
-            $this->error = _m("Sorry, we could not reach that address. Please make sure that the OStatus address is like nickname@example.com or http://example.net/nickname.");
+            $this->error = _m('Sorry, we could not reach that address. Please make sure that the OStatus address is like nickname@example.com or http://example.net/nickname.');
             common_debug('Invalid URL or could not reach server.', __FILE__);
         } catch (FeedSubBadResponseException $e) {
             // TRANS: Error text.
-            $this->error = _m("Sorry, we could not reach that feed. Please try that OStatus address again later.");
+            $this->error = _m('Sorry, we could not reach that feed. Please try that OStatus address again later.');
             common_debug('Cannot read feed; server returned error.', __FILE__);
         } catch (FeedSubEmptyException $e) {
             // TRANS: Error text.
-            $this->error = _m("Sorry, we could not reach that feed. Please try that OStatus address again later.");
+            $this->error = _m('Sorry, we could not reach that feed. Please try that OStatus address again later.');
             common_debug('Cannot read feed; server returned an empty page.', __FILE__);
         } catch (FeedSubBadHTMLException $e) {
             // TRANS: Error text.
-            $this->error = _m("Sorry, we could not reach that feed. Please try that OStatus address again later.");
+            $this->error = _m('Sorry, we could not reach that feed. Please try that OStatus address again later.');
             common_debug('Bad HTML, could not find feed link.', __FILE__);
         } catch (FeedSubNoFeedException $e) {
             // TRANS: Error text.
diff --git a/plugins/OStatus/actions/ostatustag.php b/plugins/OStatus/actions/ostatustag.php
index 1df74d9079..b94dec12eb 100644
--- a/plugins/OStatus/actions/ostatustag.php
+++ b/plugins/OStatus/actions/ostatustag.php
@@ -36,8 +36,8 @@ class OStatusTagAction extends OStatusInitAction
         parent::prepare($args);
 
         if (common_logged_in()) {
-            // TRANS: Client error displayed when trying to tag a local object as if it is remote.
-            $this->clientError(_m('You can use the local tagging!'));
+            // TRANS: Client error displayed when trying to list a local object as if it is remote.
+            $this->clientError(_m('You can use the local list functionality!'));
             return false;
         }
 
@@ -51,9 +51,9 @@ class OStatusTagAction extends OStatusInitAction
 
     function showContent()
     {
-        // TRANS: Header for tagging a remote object. %s is a remote object's name.
-        $header = sprintf(_m('Tag %s'), $this->nickname);
-        // TRANS: Button text to tag a remote object.
+        // TRANS: Header for listing a remote object. %s is a remote object's name.
+        $header = sprintf(_m('List %s'), $this->nickname);
+        // TRANS: Button text to list a remote object.
         $submit = _m('BUTTON','Go');
         $this->elementStart('form', array('id' => 'form_ostatus_connect',
                                           'method' => 'post',
@@ -68,7 +68,7 @@ class OStatusTagAction extends OStatusInitAction
         // TRANS: Field label.
         $this->input('nickname', _m('User nickname'), $this->nickname,
                      // TRANS: Field title.
-                     _m('Nickname of the user you want to tag.'));
+                     _m('Nickname of the user you want to list.'));
         $this->elementEnd('li');
         $this->elementStart('li', array('id' => 'ostatus_profile'));
         // TRANS: Field label.
diff --git a/plugins/OStatus/actions/usersalmon.php b/plugins/OStatus/actions/usersalmon.php
index 483de9e507..bc91b31559 100644
--- a/plugins/OStatus/actions/usersalmon.php
+++ b/plugins/OStatus/actions/usersalmon.php
@@ -201,12 +201,12 @@ class UsersalmonAction extends SalmonAction
 
             if (empty($tagged)) {
                 // TRANS: Client exception.
-                throw new ClientException(_m('Unidentified profile being tagged.'));
+                throw new ClientException(_m('Unidentified profile being listed.'));
             }
 
             if ($tagged->id !== $this->user->id) {
                 // TRANS: Client exception.
-                throw new ClientException(_m('This user is not the one being tagged.'));
+                throw new ClientException(_m('This user is not the one being listed.'));
             }
 
             // save the list
@@ -217,7 +217,7 @@ class UsersalmonAction extends SalmonAction
             $result = Profile_tag::setTag($ptag->tagger, $tagged->id, $ptag->tag);
             if (!$result) {
                 // TRANS: Client exception.
-                throw new ClientException(_m('The tag could not be saved.'));
+                throw new ClientException(_m('The listing could not be saved.'));
             }
         }
     }
@@ -235,12 +235,12 @@ class UsersalmonAction extends SalmonAction
 
             if (empty($tagged)) {
                 // TRANS: Client exception.
-                throw new ClientException(_m('Unidentified profile being untagged.'));
+                throw new ClientException(_m('Unidentified profile being unlisted.'));
             }
 
             if ($tagged->id !== $this->user->id) {
                 // TRANS: Client exception.
-                throw new ClientException(_m('This user is not the one being untagged.'));
+                throw new ClientException(_m('This user is not the one being unlisted.'));
             }
 
             // save the list
@@ -252,7 +252,7 @@ class UsersalmonAction extends SalmonAction
 
             if (!$result) {
                 // TRANS: Client exception.
-                throw new ClientException(_m('The tag could not be deleted.'));
+                throw new ClientException(_m('The listing could not be deleted.'));
             }
         }
     }
diff --git a/plugins/OStatus/classes/Ostatus_profile.php b/plugins/OStatus/classes/Ostatus_profile.php
index 0a748f79b8..661b7fe3f7 100644
--- a/plugins/OStatus/classes/Ostatus_profile.php
+++ b/plugins/OStatus/classes/Ostatus_profile.php
@@ -25,7 +25,6 @@ if (!defined('STATUSNET')) {
  * @package OStatusPlugin
  * @maintainer Brion Vibber <brion@status.net>
  */
-
 class Ostatus_profile extends Managed_DataObject
 {
     public $__table = 'ostatus_profile';
@@ -141,7 +140,7 @@ class Ostatus_profile extends Managed_DataObject
      *
      * Assumes that 'activity' namespace has been previously defined.
      *
-     * @fixme replace with wrappers on asActivityObject when it's got everything.
+     * @todo FIXME: Replace with wrappers on asActivityObject when it's got everything.
      *
      * @param string $element one of 'actor', 'subject', 'object', 'target'
      * @return string
@@ -301,7 +300,7 @@ class Ostatus_profile extends Managed_DataObject
                                $actor->getURI(),
                                common_date_iso8601(time()));
 
-            // @fixme consolidate all these NS settings somewhere
+            // @todo FIXME: Consolidate all these NS settings somewhere.
             $attributes = array('xmlns' => Activity::ATOM,
                                 'xmlns:activity' => 'http://activitystrea.ms/spec/1.0/',
                                 'xmlns:thr' => 'http://purl.org/syndication/thread/1.0',
@@ -414,7 +413,7 @@ class Ostatus_profile extends Managed_DataObject
 
         if ($feed->localName == 'feed' && $feed->namespaceURI == Activity::ATOM) {
             $this->processAtomFeed($feed, $source);
-        } else if ($feed->localName == 'rss') { // @fixme check namespace
+        } else if ($feed->localName == 'rss') { // @todo FIXME: Check namespace.
             $this->processRssFeed($feed, $source);
         } else {
             // TRANS: Exception.
@@ -463,35 +462,244 @@ class Ostatus_profile extends Managed_DataObject
      * @param DOMElement $entry
      * @param DOMElement $feed for context
      * @param string $source identifier ("push" or "salmon")
+     *
+     * @return Notice Notice representing the new (or existing) activity
      */
     public function processEntry($entry, $feed, $source)
     {
         $activity = new Activity($entry, $feed);
+        return $this->processActivity($activity, $source);
+    }
 
-        if (Event::handle('StartHandleFeedEntryWithProfile', array($activity, $this)) &&
+    public function processActivity($activity, $source)
+    {
+        $notice = null;
+
+        // The "WithProfile" events were added later.
+
+        if (Event::handle('StartHandleFeedEntryWithProfile', array($activity, $this, &$notice)) &&
             Event::handle('StartHandleFeedEntry', array($activity))) {
-            // @todo process all activity objects
-            switch ($activity->objects[0]->type) {
-            case ActivityObject::ARTICLE:
-            case ActivityObject::BLOGENTRY:
-            case ActivityObject::NOTE:
-            case ActivityObject::STATUS:
-            case ActivityObject::COMMENT:
-            case null:
-                if ($activity->verb == ActivityVerb::POST) {
-                    $this->processPost($activity, $source);
-                } else {
-                    common_log(LOG_INFO, "Ignoring activity with unrecognized verb $activity->verb");
+
+            switch ($activity->verb) {
+            case ActivityVerb::POST:
+                // @todo process all activity objects
+                switch ($activity->objects[0]->type) {
+                case ActivityObject::ARTICLE:
+                case ActivityObject::BLOGENTRY:
+                case ActivityObject::NOTE:
+                case ActivityObject::STATUS:
+                case ActivityObject::COMMENT:
+                case null:
+                    $notice = $this->processPost($activity, $source);
+                    break;
+                default:
+                    // TRANS: Client exception.
+                    throw new ClientException(_m('Cannot handle that kind of post.'));
                 }
                 break;
+            case ActivityVerb::SHARE:
+                $notice = $this->processShare($activity, $source);
+                break;
             default:
-                // TRANS: Client exception.
-                throw new ClientException(_m('Cannot handle that kind of post.'));
+                common_log(LOG_INFO, "Ignoring activity with unrecognized verb $activity->verb");
             }
 
             Event::handle('EndHandleFeedEntry', array($activity));
-            Event::handle('EndHandleFeedEntryWithProfile', array($activity, $this));
+            Event::handle('EndHandleFeedEntryWithProfile', array($activity, $this, $notice));
         }
+
+        return $notice;
+    }
+
+    public function processShare($activity, $method)
+    {
+        $notice = null;
+
+        $oprofile = $this->checkAuthorship($activity);
+
+        if (empty($oprofile)) {
+            common_log(LOG_INFO, "No author matched share activity");
+            return null;
+        }
+
+        if (count($activity->objects) != 1) {
+            // TRANS: Client exception thrown when trying to share multiple activities at once.
+            throw new ClientException(_m('Can only handle share activities with exactly one object.'));
+        }
+
+        $shared = $activity->objects[0];
+
+        if (!($shared instanceof Activity)) {
+            // TRANS: Client exception thrown when trying to share a non-activity object.
+            throw new ClientException(_m('Can only handle shared activities.'));
+        }
+
+        $other = Ostatus_profile::ensureActivityObjectProfile($shared->actor);
+
+        // Save the item (or check for a dupe)
+
+        $sharedNotice = $other->processActivity($shared, $method);
+
+        if (empty($sharedNotice)) {
+            $sharedId = ($shared->id) ? $shared->id : $shared->objects[0]->id;
+            // TRANS: Client exception thrown when saving an activity share fails.
+            // TRANS: %s is a share ID.
+            throw new ClientException(sprintf(_m('Failed to save activity %s.'),
+                                              $sharedId));
+        }
+
+        // The id URI will be used as a unique identifier for for the notice,
+        // protecting against duplicate saves. It isn't required to be a URL;
+        // tag: URIs for instance are found in Google Buzz feeds.
+
+        $sourceUri = $activity->id;
+
+        $dupe = Notice::staticGet('uri', $sourceUri);
+        if ($dupe) {
+            common_log(LOG_INFO, "OStatus: ignoring duplicate post: $sourceUri");
+            return $dupe;
+        }
+
+        // We'll also want to save a web link to the original notice, if provided.
+
+        $sourceUrl = null;
+        if ($activity->link) {
+            $sourceUrl = $activity->link;
+        } else if ($activity->link) {
+            $sourceUrl = $activity->link;
+        } else if (preg_match('!^https?://!', $activity->id)) {
+            $sourceUrl = $activity->id;
+        }
+
+        // Use summary as fallback for content
+
+        if (!empty($activity->content)) {
+            $sourceContent = $activity->content;
+        } else if (!empty($activity->summary)) {
+            $sourceContent = $activity->summary;
+        } else if (!empty($activity->title)) {
+            $sourceContent = $activity->title;
+        } else {
+            // @todo FIXME: Fetch from $sourceUrl?
+            // TRANS: Client exception. %s is a source URI.
+            throw new ClientException(sprintf(_m('No content for notice %s.'),$sourceUri));
+        }
+
+        // Get (safe!) HTML and text versions of the content
+
+        $rendered = $this->purify($sourceContent);
+        $content = html_entity_decode(strip_tags($rendered), ENT_QUOTES, 'UTF-8');
+
+        $shortened = common_shorten_links($content);
+
+        // If it's too long, try using the summary, and make the
+        // HTML an attachment.
+
+        $attachment = null;
+
+        if (Notice::contentTooLong($shortened)) {
+            $attachment = $this->saveHTMLFile($activity->title, $rendered);
+            $summary = html_entity_decode(strip_tags($activity->summary), ENT_QUOTES, 'UTF-8');
+            if (empty($summary)) {
+                $summary = $content;
+            }
+            $shortSummary = common_shorten_links($summary);
+            if (Notice::contentTooLong($shortSummary)) {
+                $url = common_shorten_url($sourceUrl);
+                $shortSummary = substr($shortSummary,
+                                       0,
+                                       Notice::maxContent() - (mb_strlen($url) + 2));
+                $content = $shortSummary . ' ' . $url;
+
+                // We mark up the attachment link specially for the HTML output
+                // so we can fold-out the full version inline.
+
+                // @todo FIXME i18n: This tooltip will be saved with the site's default language
+                // TRANS: Shown when a notice is longer than supported and/or when attachments are present. At runtime
+                // TRANS: this will usually be replaced with localised text from StatusNet core messages.
+                $showMoreText = _m('Show more');
+                $attachUrl = common_local_url('attachment',
+                                              array('attachment' => $attachment->id));
+                $rendered = common_render_text($shortSummary) .
+                            '<a href="' . htmlspecialchars($attachUrl) .'"'.
+                            ' class="attachment more"' .
+                            ' title="'. htmlspecialchars($showMoreText) . '">' .
+                            '&#8230;' .
+                            '</a>';
+            }
+        }
+
+        $options = array('is_local' => Notice::REMOTE,
+                         'url' => $sourceUrl,
+                         'uri' => $sourceUri,
+                         'rendered' => $rendered,
+                         'replies' => array(),
+                         'groups' => array(),
+                         'peopletags' => array(),
+                         'tags' => array(),
+                         'urls' => array(),
+                         'repeat_of' => $sharedNotice->id,
+                         'scope' => $sharedNotice->scope);
+
+        // Check for optional attributes...
+
+        if (!empty($activity->time)) {
+            $options['created'] = common_sql_date($activity->time);
+        }
+
+        if ($activity->context) {
+            // Any individual or group attn: targets?
+            $replies = $activity->context->attention;
+            $options['groups'] = $this->filterReplies($oprofile, $replies);
+            $options['replies'] = $replies;
+
+            // Maintain direct reply associations
+            // @todo FIXME: What about conversation ID?
+            if (!empty($activity->context->replyToID)) {
+                $orig = Notice::staticGet('uri',
+                                          $activity->context->replyToID);
+                if (!empty($orig)) {
+                    $options['reply_to'] = $orig->id;
+                }
+            }
+
+            $location = $activity->context->location;
+            if ($location) {
+                $options['lat'] = $location->lat;
+                $options['lon'] = $location->lon;
+                if ($location->location_id) {
+                    $options['location_ns'] = $location->location_ns;
+                    $options['location_id'] = $location->location_id;
+                }
+            }
+        }
+
+        if ($this->isPeopletag()) {
+            $options['peopletags'][] = $this->localPeopletag();
+        }
+
+        // Atom categories <-> hashtags
+        foreach ($activity->categories as $cat) {
+            if ($cat->term) {
+                $term = common_canonical_tag($cat->term);
+                if ($term) {
+                    $options['tags'][] = $term;
+                }
+            }
+        }
+
+        // Atom enclosures -> attachment URLs
+        foreach ($activity->enclosures as $href) {
+            // @todo FIXME: Save these locally or....?
+            $options['urls'][] = $href;
+        }
+
+        $notice = Notice::saveNew($oprofile->profile_id,
+                                  $content,
+                                  'ostatus',
+                                  $options);
+
+        return $notice;
     }
 
     /**
@@ -499,14 +707,16 @@ class Ostatus_profile extends Managed_DataObject
      * @param Activity $activity
      * @param string $method 'push' or 'salmon'
      * @return mixed saved Notice or false
-     * @fixme break up this function, it's getting nasty long
+     * @todo FIXME: Break up this function, it's getting nasty long
      */
     public function processPost($activity, $method)
     {
+        $notice = null;
+
         $oprofile = $this->checkAuthorship($activity);
 
         if (empty($oprofile)) {
-            return false;
+            return null;
         }
 
         // It's not always an ActivityObject::NOTE, but... let's just say it is.
@@ -520,7 +730,7 @@ class Ostatus_profile extends Managed_DataObject
         $dupe = Notice::staticGet('uri', $sourceUri);
         if ($dupe) {
             common_log(LOG_INFO, "OStatus: ignoring duplicate post: $sourceUri");
-            return false;
+            return $dupe;
         }
 
         // We'll also want to save a web link to the original notice, if provided.
@@ -542,7 +752,7 @@ class Ostatus_profile extends Managed_DataObject
         } else if (!empty($note->title)) {
             $sourceContent = $note->title;
         } else {
-            // @fixme fetch from $sourceUrl?
+            // @todo FIXME: Fetch from $sourceUrl?
             // TRANS: Client exception. %s is a source URI.
             throw new ClientException(sprintf(_m('No content for notice %s.'),$sourceUri));
         }
@@ -591,7 +801,7 @@ class Ostatus_profile extends Managed_DataObject
             }
         }
 
-        $options = array('is_local' => Notice::REMOTE_OMB,
+        $options = array('is_local' => Notice::REMOTE,
                         'url' => $sourceUrl,
                         'uri' => $sourceUri,
                         'rendered' => $rendered,
@@ -614,7 +824,7 @@ class Ostatus_profile extends Managed_DataObject
             $options['replies'] = $replies;
 
             // Maintain direct reply associations
-            // @fixme what about conversation ID?
+            // @todo FIXME: What about conversation ID?
             if (!empty($activity->context->replyToID)) {
                 $orig = Notice::staticGet('uri',
                                           $activity->context->replyToID);
@@ -650,7 +860,7 @@ class Ostatus_profile extends Managed_DataObject
 
         // Atom enclosures -> attachment URLs
         foreach ($activity->enclosures as $href) {
-            // @fixme save these locally or....?
+            // @todo FIXME: Save these locally or....?
             $options['urls'][] = $href;
         }
 
@@ -699,7 +909,7 @@ class Ostatus_profile extends Managed_DataObject
             // Is the recipient a local user?
             $user = User::staticGet('uri', $recipient);
             if ($user) {
-                // @fixme sender verification, spam etc?
+                // @todo FIXME: Sender verification, spam etc?
                 $replies[] = $recipient;
                 continue;
             }
@@ -728,7 +938,7 @@ class Ostatus_profile extends Managed_DataObject
                 $oprofile = Ostatus_profile::ensureProfileURI($recipient);
                 if ($oprofile->isGroup()) {
                     // Deliver to local members of this remote group.
-                    // @fixme sender verification?
+                    // @todo FIXME: Sender verification?
                     $groups[] = $oprofile->group_id;
                 } else {
                     // may be canonicalized or something
@@ -921,7 +1131,7 @@ class Ostatus_profile extends Managed_DataObject
      *
      * @param DOMElement $feedEl root element of a loaded Atom feed
      * @param array $hints additional discovery information passed from higher levels
-     * @fixme should this be marked public?
+     * @todo FIXME: Should this be marked public?
      * @return Ostatus_profile
      * @throws Exception
      */
@@ -947,7 +1157,7 @@ class Ostatus_profile extends Managed_DataObject
      *
      * @param DOMElement $feedEl root element of a loaded RSS feed
      * @param array $hints additional discovery information passed from higher levels
-     * @fixme should this be marked public?
+     * @todo FIXME: Should this be marked public?
      * @return Ostatus_profile
      * @throws Exception
      */
@@ -973,7 +1183,7 @@ class Ostatus_profile extends Managed_DataObject
             }
         }
 
-        // @fixme we should check whether this feed has elements
+        // @todo FIXME: We should check whether this feed has elements
         // with different <author> or <dc:creator> elements, and... I dunno.
         // Do something about that.
 
@@ -1011,7 +1221,7 @@ class Ostatus_profile extends Managed_DataObject
                 $this->uri));
         }
 
-        // @fixme this should be better encapsulated
+        // @todo FIXME: This should be better encapsulated
         // ripped from oauthstore.php (for old OMB client)
         $temp_filename = tempnam(sys_get_temp_dir(), 'listener_avatar');
         try {
@@ -1025,7 +1235,7 @@ class Ostatus_profile extends Managed_DataObject
             } else {
                 $id = $this->profile_id;
             }
-            // @fixme should we be using different ids?
+            // @todo FIXME: Should we be using different ids?
             $imagefile = new ImageFile($id, $temp_filename);
             $filename = Avatar::filename($id,
                                          image_type_to_extension($imagefile->type),
@@ -1036,7 +1246,7 @@ class Ostatus_profile extends Managed_DataObject
             unlink($temp_filename);
             throw $e;
         }
-        // @fixme hardcoded chmod is lame, but seems to be necessary to
+        // @todo FIXME: Hardcoded chmod is lame, but seems to be necessary to
         // keep from accidentally saving images from command-line (queues)
         // that can't be read from web server, which causes hard-to-notice
         // problems later on:
@@ -1044,7 +1254,11 @@ class Ostatus_profile extends Managed_DataObject
         // http://status.net/open-source/issues/2663
         chmod(Avatar::path($filename), 0644);
 
-        $self->setOriginal($filename);
+        $profile = $this->localProfile();
+
+        if (!empty($profile)) {
+            $profile->setOriginal($filename);
+        }
 
         $orig = clone($this);
         $this->avatar = $url;
@@ -1214,7 +1428,7 @@ class Ostatus_profile extends Managed_DataObject
     }
 
     /**
-     * @fixme validate stuff somewhere
+     * @todo FIXME: Validate stuff somewhere.
      */
 
     /**
@@ -1307,7 +1521,7 @@ class Ostatus_profile extends Managed_DataObject
 
             $oprofile->profile_id = $profile->insert();
             if (!$oprofile->profile_id) {
-            // TRANS: Server exception.
+                // TRANS: Server exception.
                 throw new ServerException(_m('Cannot save local profile.'));
             }
         } else if ($object->type == ActivityObject::GROUP) {
@@ -1440,7 +1654,7 @@ class Ostatus_profile extends Managed_DataObject
             }
         }
 
-        // @fixme tags/categories
+        // @todo FIXME: tags/categories
         // @todo tags from categories
 
         if ($profile->id) {
@@ -1675,7 +1889,7 @@ class Ostatus_profile extends Managed_DataObject
             $xrd = $disco->lookup($addr);
         } catch (Exception $e) {
             // Save negative cache entry so we don't waste time looking it up again.
-            // @fixme distinguish temporary failures?
+            // @todo FIXME: Distinguish temporary failures?
             self::cacheSet(sprintf('ostatus_profile:webfinger:%s', $addr), null);
             // TRANS: Exception.
             throw new Exception(_m('Not a valid webfinger address.'));
@@ -1718,14 +1932,14 @@ class Ostatus_profile extends Managed_DataObject
                 return $oprofile;
             } catch (OStatusShadowException $e) {
                 // We've ended up with a remote reference to a local user or group.
-                // @fixme ideally we should be able to say who it was so we can
+                // @todo FIXME: Ideally we should be able to say who it was so we can
                 // go back and refer to it the regular way
                 throw $e;
             } catch (Exception $e) {
                 common_log(LOG_WARNING, "Failed creating profile from profile URL '$profileUrl': " . $e->getMessage());
                 // keep looking
                 //
-                // @fixme this means an error discovering from profile page
+                // @todo FIXME: This means an error discovering from profile page
                 // may give us a corrupt entry using the webfinger URI, which
                 // will obscure the correct page-keyed profile later on.
             }
diff --git a/plugins/OStatus/lib/discoveryhints.php b/plugins/OStatus/lib/discoveryhints.php
index a98f4a6d67..0a86a1bf04 100644
--- a/plugins/OStatus/lib/discoveryhints.php
+++ b/plugins/OStatus/lib/discoveryhints.php
@@ -34,7 +34,9 @@ class DiscoveryHints {
                 $hints['salmon'] = $link['href'];
                 break;
             case Discovery::UPDATESFROM:
-                $hints['feedurl'] = $link['href'];
+                if (empty($link['type']) || $link['type'] == 'application/atom+xml') {
+                    $hints['feedurl'] = $link['href'];
+                }
                 break;
             case Discovery::HCARD:
                 $hints['hcardurl'] = $link['href'];
diff --git a/plugins/OStatus/lib/ostatusqueuehandler.php b/plugins/OStatus/lib/ostatusqueuehandler.php
index d7dc921ad6..f5284057e3 100644
--- a/plugins/OStatus/lib/ostatusqueuehandler.php
+++ b/plugins/OStatus/lib/ostatusqueuehandler.php
@@ -51,7 +51,14 @@ class OStatusQueueHandler extends QueueHandler
         assert($notice instanceof Notice);
 
         $this->notice = $notice;
-        $this->user = User::staticGet($notice->profile_id);
+        $this->user = User::staticGet('id', $notice->profile_id);
+
+        try {
+            $profile = $this->notice->getProfile();
+        } catch (Exception $e) {
+            common_log(LOG_ERR, "Can't get profile for notice; skipping: " . $e->getMessage());
+            return true;
+        }
 
         $this->pushUser();
 
@@ -63,6 +70,13 @@ class OStatusQueueHandler extends QueueHandler
                 $this->pushGroup($group->id);
             }
         }
+        
+        foreach ($notice->getReplies() as $profile_id) {
+            $oprofile = Ostatus_profile::staticGet('profile_id', $profile_id);
+            if ($oprofile) {
+                $this->pingReply($oprofile);
+            }
+        }
 
         if (!empty($this->notice->reply_to)) {
             $replyTo = Notice::staticGet('id', $this->notice->reply_to);
diff --git a/plugins/OStatus/lib/salmonaction.php b/plugins/OStatus/lib/salmonaction.php
index 327dd791e3..7cb4ac2fce 100644
--- a/plugins/OStatus/lib/salmonaction.php
+++ b/plugins/OStatus/lib/salmonaction.php
@@ -181,13 +181,13 @@ class SalmonAction extends Action
     function handleTag()
     {
         // TRANS: Client exception.
-        throw new ClientException(_m('This target does not understand tag events.'));
+        throw new ClientException(_m('This target does not understand list events.'));
     }
 
     function handleUntag()
     {
         // TRANS: Client exception.
-        throw new ClientException(_m('This target does not understand untag events.'));
+        throw new ClientException(_m('This target does not understand unlist events.'));
     }
 
     /**
diff --git a/plugins/OStatus/lib/xrdaction.php b/plugins/OStatus/lib/xrdaction.php
index 1ac4d40a50..2ba158a3e6 100644
--- a/plugins/OStatus/lib/xrdaction.php
+++ b/plugins/OStatus/lib/xrdaction.php
@@ -77,11 +77,6 @@ class XrdAction extends Action
                                                                'format' => 'atom')),
                               'type' => 'application/atom+xml');
 
-        // hCard
-        $xrd->links[] = array('rel' => Discovery::HCARD,
-                              'type' => 'text/html',
-                              'href' => common_local_url('hcard', array('nickname' => $nick)));
-
         // XFN
         $xrd->links[] = array('rel' => 'http://gmpg.org/xfn/11',
                               'type' => 'text/html',
diff --git a/plugins/OStatus/locale/OStatus.pot b/plugins/OStatus/locale/OStatus.pot
index a2d5af90ef..266d2db258 100644
--- a/plugins/OStatus/locale/OStatus.pot
+++ b/plugins/OStatus/locale/OStatus.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,165 +16,166 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: tests/gettext-speedtest.php:57
+#. TRANS: String in the gettext speed test script. Unimportant.
+#: tests/gettext-speedtest.php:58
 msgid "Feeds"
 msgstr ""
 
 #. TRANS: Link to subscribe to a remote entity.
 #. TRANS: Link text for a user to subscribe to an OStatus user.
-#: OStatusPlugin.php:249 OStatusPlugin.php:270 OStatusPlugin.php:1270
+#: OStatusPlugin.php:256 OStatusPlugin.php:277 OStatusPlugin.php:1276
 msgid "Subscribe"
 msgstr ""
 
 #. TRANS: Fieldset legend.
-#: OStatusPlugin.php:289
-msgid "Tag remote profile"
+#: OStatusPlugin.php:296
+msgid "List remote profile"
 msgstr ""
 
 #. TRANS: Field label.
-#: OStatusPlugin.php:298
+#: OStatusPlugin.php:305
 msgctxt "LABEL"
 msgid "Remote profile"
 msgstr ""
 
 #. TRANS: Field title.
 #. TRANS: Tooltip for field label "Subscribe to".
-#: OStatusPlugin.php:300 actions/ostatussub.php:71
+#: OStatusPlugin.php:307 actions/ostatussub.php:71
 msgid ""
 "OStatus user's address, like nickname@example.com or http://example.net/"
 "nickname."
 msgstr ""
 
 #. TRANS: Button text to fetch remote profile.
-#: OStatusPlugin.php:304
+#: OStatusPlugin.php:311
 msgctxt "BUTTON"
 msgid "Fetch"
 msgstr ""
 
 #. TRANS: Exception in OStatus when invalid URI was entered.
-#: OStatusPlugin.php:322 OStatusPlugin.php:358
+#: OStatusPlugin.php:329 OStatusPlugin.php:365
 msgid "Invalid URI."
 msgstr ""
 
-#. TRANS: Error message in OStatus plugin.
-#. TRANS: Error text.
-#: OStatusPlugin.php:331 OStatusPlugin.php:364 actions/ostatussub.php:232
-#: actions/ostatussub.php:239 actions/ostatussub.php:264
+#. TRANS: Error message in OStatus plugin. Do not translate the domain names example.com
+#. TRANS: and example.net, as these are official standard domain names for use in examples.
+#: OStatusPlugin.php:339 OStatusPlugin.php:372 actions/ostatussub.php:234
+#: actions/ostatussub.php:242 actions/ostatussub.php:268
 msgid ""
 "Sorry, we could not reach that address. Please make sure that the OStatus "
 "address is like nickname@example.com or http://example.net/nickname."
 msgstr ""
 
 #. TRANS: Title. %s is a domain name.
-#: OStatusPlugin.php:579
+#: OStatusPlugin.php:587
 #, php-format
 msgid "Sent from %s via OStatus"
 msgstr ""
 
 #. TRANS: Exception thrown when setup of remote subscription fails.
-#: OStatusPlugin.php:651
+#: OStatusPlugin.php:659
 msgid "Could not set up remote subscription."
 msgstr ""
 
 #. TRANS: Title for unfollowing a remote profile.
-#: OStatusPlugin.php:726
+#: OStatusPlugin.php:734
 msgctxt "TITLE"
 msgid "Unfollow"
 msgstr ""
 
 #. TRANS: Success message for unsubscribe from user attempt through OStatus.
 #. TRANS: %1$s is the unsubscriber's name, %2$s is the unsubscribed user's name.
-#: OStatusPlugin.php:729
+#: OStatusPlugin.php:737
 #, php-format
 msgid "%1$s stopped following %2$s."
 msgstr ""
 
 #. TRANS: Exception thrown when setup of remote group membership fails.
-#: OStatusPlugin.php:757
+#: OStatusPlugin.php:765
 msgid "Could not set up remote group membership."
 msgstr ""
 
 #. TRANS: Title for joining a remote groep.
-#: OStatusPlugin.php:777
+#: OStatusPlugin.php:783
 msgctxt "TITLE"
 msgid "Join"
 msgstr ""
 
 #. TRANS: Success message for subscribe to group attempt through OStatus.
 #. TRANS: %1$s is the member name, %2$s is the subscribed group's name.
-#: OStatusPlugin.php:780
+#: OStatusPlugin.php:786
 #, php-format
 msgid "%1$s has joined group %2$s."
 msgstr ""
 
 #. TRANS: Exception thrown when joining a remote group fails.
-#: OStatusPlugin.php:789
+#: OStatusPlugin.php:795
 msgid "Failed joining remote group."
 msgstr ""
 
 #. TRANS: Title for leaving a remote group.
-#: OStatusPlugin.php:829
+#: OStatusPlugin.php:835
 msgctxt "TITLE"
 msgid "Leave"
 msgstr ""
 
 #. TRANS: Success message for unsubscribe from group attempt through OStatus.
 #. TRANS: %1$s is the member name, %2$s is the unsubscribed group's name.
-#: OStatusPlugin.php:832
+#: OStatusPlugin.php:838
 #, php-format
 msgid "%1$s has left group %2$s."
 msgstr ""
 
 #. TRANS: Exception thrown when setup of remote list subscription fails.
-#: OStatusPlugin.php:857
+#: OStatusPlugin.php:863
 msgid "Could not set up remote list subscription."
 msgstr ""
 
 #. TRANS: Title for following a remote list.
-#: OStatusPlugin.php:875
+#: OStatusPlugin.php:881
 msgctxt "TITLE"
 msgid "Follow list"
 msgstr ""
 
 #. TRANS: Success message for remote list follow through OStatus.
-#. TRANS: %1$s is the subscriber name, %2$s is the list, %3$s is the tagger's name.
-#: OStatusPlugin.php:878
+#. TRANS: %1$s is the subscriber name, %2$s is the list, %3$s is the lister's name.
+#: OStatusPlugin.php:884
 #, php-format
 msgid "%1$s is now following people listed in %2$s by %3$s."
 msgstr ""
 
 #. TRANS: Exception thrown when subscription to remote list fails.
-#: OStatusPlugin.php:888
+#: OStatusPlugin.php:894
 msgid "Failed subscribing to remote list."
 msgstr ""
 
 #. TRANS: Title for unfollowing a remote list.
-#: OStatusPlugin.php:925
+#: OStatusPlugin.php:931
 msgid "Unfollow list"
 msgstr ""
 
 #. TRANS: Success message for remote list unfollow through OStatus.
-#. TRANS: %1$s is the subscriber name, %2$s is the list, %3$s is the tagger's name.
-#: OStatusPlugin.php:928
+#. TRANS: %1$s is the subscriber name, %2$s is the list, %3$s is the lister's name.
+#: OStatusPlugin.php:934
 #, php-format
 msgid "%1$s stopped following the list %2$s by %3$s."
 msgstr ""
 
 #. TRANS: Title for listing a remote profile.
-#: OStatusPlugin.php:1005
+#: OStatusPlugin.php:1011
 msgctxt "TITLE"
 msgid "List"
 msgstr ""
 
 #. TRANS: Success message for remote list addition through OStatus.
 #. TRANS: %1$s is the list creator's name, %2$s is the added list member, %3$s is the list name.
-#: OStatusPlugin.php:1008
+#: OStatusPlugin.php:1014
 #, php-format
 msgid "%1$s listed %2$s in the list %3$s."
 msgstr ""
 
 #. TRANS: Exception thrown when subscribing to a remote list fails.
-#: OStatusPlugin.php:1022
+#: OStatusPlugin.php:1028
 #, php-format
 msgid ""
 "Could not complete subscription to remote profile's feed. List %s could not "
@@ -182,54 +183,54 @@ msgid ""
 msgstr ""
 
 #. TRANS: Title for unlisting a remote profile.
-#: OStatusPlugin.php:1062
+#: OStatusPlugin.php:1068
 msgctxt "TITLE"
 msgid "Unlist"
 msgstr ""
 
 #. TRANS: Success message for remote list removal through OStatus.
 #. TRANS: %1$s is the list creator's name, %2$s is the removed list member, %3$s is the list name.
-#: OStatusPlugin.php:1065
+#: OStatusPlugin.php:1071
 #, php-format
 msgid "%1$s removed %2$s from the list %3$s."
 msgstr ""
 
 #. TRANS: Title for unliking a remote notice.
-#: OStatusPlugin.php:1113
+#: OStatusPlugin.php:1119
 msgid "Unlike"
 msgstr ""
 
 #. TRANS: Success message for remove a favorite notice through OStatus.
 #. TRANS: %1$s is the unfavoring user's name, %2$s is URI to the no longer favored notice.
-#: OStatusPlugin.php:1116
+#: OStatusPlugin.php:1122
 #, php-format
 msgid "%1$s no longer likes %2$s."
 msgstr ""
 
 #. TRANS: Link text for link to remote subscribe.
-#: OStatusPlugin.php:1192
+#: OStatusPlugin.php:1198
 msgid "Remote"
 msgstr ""
 
 #. TRANS: Title for activity.
-#: OStatusPlugin.php:1232
+#: OStatusPlugin.php:1238
 msgid "Profile update"
 msgstr ""
 
 #. TRANS: Ping text for remote profile update through OStatus.
 #. TRANS: %s is user that updated their profile.
-#: OStatusPlugin.php:1235
+#: OStatusPlugin.php:1241
 #, php-format
 msgid "%s has updated their profile page."
 msgstr ""
 
-#. TRANS: Link text for a user to tag an OStatus user.
-#: OStatusPlugin.php:1279
-msgid "Tag"
+#. TRANS: Link text for a user to list an OStatus user.
+#: OStatusPlugin.php:1285
+msgid "List"
 msgstr ""
 
 #. TRANS: Plugin description.
-#: OStatusPlugin.php:1294
+#: OStatusPlugin.php:1300
 msgid ""
 "Follow people across social networks that implement <a href=\"http://ostatus."
 "org/\">OStatus</a>."
@@ -297,18 +298,18 @@ msgstr ""
 msgid "Invalid URL passed for %1$s: \"%2$s\""
 msgstr ""
 
-#. TRANS: Client error displayed when trying to tag a local object as if it is remote.
+#. TRANS: Client error displayed when trying to list a local object as if it is remote.
 #: actions/ostatustag.php:40
-msgid "You can use the local tagging!"
+msgid "You can use the local list functionality!"
 msgstr ""
 
-#. TRANS: Header for tagging a remote object. %s is a remote object's name.
+#. TRANS: Header for listing a remote object. %s is a remote object's name.
 #: actions/ostatustag.php:55
 #, php-format
-msgid "Tag %s"
+msgid "List %s"
 msgstr ""
 
-#. TRANS: Button text to tag a remote object.
+#. TRANS: Button text to list a remote object.
 #: actions/ostatustag.php:57
 msgctxt "BUTTON"
 msgid "Go"
@@ -321,7 +322,7 @@ msgstr ""
 
 #. TRANS: Field title.
 #: actions/ostatustag.php:71
-msgid "Nickname of the user you want to tag."
+msgid "Nickname of the user you want to list."
 msgstr ""
 
 #. TRANS: Field label.
@@ -331,7 +332,7 @@ msgstr ""
 
 #. TRANS: Field title.
 #: actions/ostatustag.php:77
-msgid "Your account id (i.e. user@identi.ca)."
+msgid "Your account id (for example user@identi.ca)."
 msgstr ""
 
 #. TRANS: Client error displayed when remote profile could not be looked up.
@@ -400,7 +401,7 @@ msgstr ""
 
 #. TRANS: Button text.
 #. TRANS: Button text to continue joining a remote list.
-#: actions/ostatussub.php:75 actions/ostatusgroup.php:86
+#: actions/ostatussub.php:75 actions/ostatusgroup.php:87
 #: actions/ostatuspeopletag.php:82
 msgctxt "BUTTON"
 msgid "Continue"
@@ -428,14 +429,15 @@ msgstr ""
 msgid "Subscribe to this user"
 msgstr ""
 
-#: actions/ostatussub.php:138
+#. TRANS: Extra paragraph in remote profile view when already subscribed.
+#: actions/ostatussub.php:139
 msgid "You are already subscribed to this user."
 msgstr ""
 
 #. TRANS: Error text.
-#: actions/ostatussub.php:243 actions/ostatussub.php:247
-#: actions/ostatussub.php:251 actions/ostatussub.php:255
-#: actions/ostatussub.php:259
+#: actions/ostatussub.php:246 actions/ostatussub.php:250
+#: actions/ostatussub.php:254 actions/ostatussub.php:258
+#: actions/ostatussub.php:262
 msgid ""
 "Sorry, we could not reach that feed. Please try that OStatus address again "
 "later."
@@ -443,32 +445,32 @@ msgstr ""
 
 #. TRANS: OStatus remote subscription dialog error.
 #. TRANS: OStatus remote group subscription dialog error.
-#: actions/ostatussub.php:296 actions/ostatuspeopletag.php:144
+#: actions/ostatussub.php:300 actions/ostatuspeopletag.php:144
 msgid "Already subscribed!"
 msgstr ""
 
 #. TRANS: OStatus remote subscription dialog error.
-#: actions/ostatussub.php:301
+#: actions/ostatussub.php:305
 msgid "Remote subscription failed!"
 msgstr ""
 
 #. TRANS: Client error displayed when the session token does not match or is not given.
-#: actions/ostatussub.php:349 actions/ostatusinit.php:69
+#: actions/ostatussub.php:353 actions/ostatusinit.php:69
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 
 #. TRANS: Form title.
-#: actions/ostatussub.php:377
+#: actions/ostatussub.php:381
 msgid "Subscribe to user"
 msgstr ""
 
 #. TRANS: Page title for OStatus remote subscription form.
-#: actions/ostatussub.php:397
+#: actions/ostatussub.php:401
 msgid "Confirm"
 msgstr ""
 
 #. TRANS: Instructions.
-#: actions/ostatussub.php:409
+#: actions/ostatussub.php:413
 msgid ""
 "You can subscribe to users from other supported sites. Paste their address "
 "or profile URI below:"
@@ -479,33 +481,34 @@ msgstr ""
 msgid "Join group"
 msgstr ""
 
-#. TRANS: Tooltip for field label "Join group".
-#: actions/ostatusgroup.php:81
+#. TRANS: Tooltip for field label "Join group". Do not translate the "example.net"
+#. TRANS: domain name in the URL, as it is an official standard domain name for examples.
+#: actions/ostatusgroup.php:82
 msgid "OStatus group's address, like http://example.net/group/nickname."
 msgstr ""
 
 #. TRANS: Error text displayed when trying to join a remote group the user is already a member of.
-#: actions/ostatusgroup.php:106
+#: actions/ostatusgroup.php:107
 msgid "You are already a member of this group."
 msgstr ""
 
 #. TRANS: OStatus remote group subscription dialog error.
-#: actions/ostatusgroup.php:141
+#: actions/ostatusgroup.php:142
 msgid "Already a member!"
 msgstr ""
 
 #. TRANS: OStatus remote group subscription dialog error.
-#: actions/ostatusgroup.php:149
+#: actions/ostatusgroup.php:150
 msgid "Remote group join failed!"
 msgstr ""
 
 #. TRANS: Page title for OStatus remote group join form
-#: actions/ostatusgroup.php:162
+#: actions/ostatusgroup.php:163
 msgid "Confirm joining remote group"
 msgstr ""
 
 #. TRANS: Form instructions.
-#: actions/ostatusgroup.php:173
+#: actions/ostatusgroup.php:174
 msgid ""
 "You can subscribe to groups from other supported sites. Paste the group's "
 "profile URI below:"
@@ -521,7 +524,7 @@ msgstr ""
 
 #. TRANS: Client exception thrown when an undefied activity is performed.
 #. TRANS: Client exception.
-#: actions/usersalmon.php:73 classes/Ostatus_profile.php:489
+#: actions/usersalmon.php:73 classes/Ostatus_profile.php:497
 msgid "Cannot handle that kind of post."
 msgstr ""
 
@@ -567,32 +570,32 @@ msgstr ""
 
 #. TRANS: Client exception.
 #: actions/usersalmon.php:204
-msgid "Unidentified profile being tagged."
+msgid "Unidentified profile being listed."
 msgstr ""
 
 #. TRANS: Client exception.
 #: actions/usersalmon.php:209
-msgid "This user is not the one being tagged."
+msgid "This user is not the one being listed."
 msgstr ""
 
 #. TRANS: Client exception.
 #: actions/usersalmon.php:220
-msgid "The tag could not be saved."
+msgid "The listing could not be saved."
 msgstr ""
 
 #. TRANS: Client exception.
 #: actions/usersalmon.php:238
-msgid "Unidentified profile being untagged."
+msgid "Unidentified profile being unlisted."
 msgstr ""
 
 #. TRANS: Client exception.
 #: actions/usersalmon.php:243
-msgid "This user is not the one being untagged."
+msgid "This user is not the one being unlisted."
 msgstr ""
 
 #. TRANS: Client exception.
 #: actions/usersalmon.php:255
-msgid "The tag could not be deleted."
+msgid "The listing could not be deleted."
 msgstr ""
 
 #. TRANS: Client exception.
@@ -752,7 +755,7 @@ msgctxt "BUTTON"
 msgid "Join"
 msgstr ""
 
-#. TRANS: Form legend. %1$s is a list, %2$s is a tagger's name.
+#. TRANS: Form legend. %1$s is a list, %2$s is a lister's name.
 #: actions/ostatusinit.php:108
 #, php-format
 msgid "Subscribe to list %1$s by %2$s"
@@ -806,6 +809,42 @@ msgstr ""
 msgid "OStatus Connect"
 msgstr ""
 
+#. TRANS: Server exception. %s is a URL.
+#: scripts/update_ostatus_profiles.php:56 classes/Ostatus_profile.php:1209
+#, php-format
+msgid "Invalid avatar URL %s."
+msgstr ""
+
+#. TRANS: Server exception. %s is a URI.
+#: scripts/update_ostatus_profiles.php:67 classes/Ostatus_profile.php:1220
+#, php-format
+msgid "Tried to update avatar for unsaved remote profile %s."
+msgstr ""
+
+#. TRANS: Server exception. %s is a URL.
+#: scripts/update_ostatus_profiles.php:77 classes/Ostatus_profile.php:1230
+#, php-format
+msgid "Unable to fetch avatar from %s."
+msgstr ""
+
+#. TRANS: Exception. %s is a URL.
+#: scripts/update_ostatus_profiles.php:187 classes/Ostatus_profile.php:1047
+#, php-format
+msgid "Could not find a feed URL for profile page %s."
+msgstr ""
+
+#. TRANS: Exception.
+#: scripts/update_ostatus_profiles.php:212 classes/Ostatus_profile.php:1868
+#: classes/Ostatus_profile.php:1895
+msgid "Not a valid webfinger address."
+msgstr ""
+
+#. TRANS: Exception. %s is a webfinger address.
+#: scripts/update_ostatus_profiles.php:264 classes/Ostatus_profile.php:2000
+#, php-format
+msgid "Could not find a valid profile for \"%s\"."
+msgstr ""
+
 #. TRANS: Server exception.
 #: classes/FeedSub.php:253
 msgid "Attempting to start PuSH subscription for feed with no hub."
@@ -817,165 +856,147 @@ msgid "Attempting to end PuSH subscription for feed with no hub."
 msgstr ""
 
 #. TRANS: Server exception. %s is a URI
-#: classes/Ostatus_profile.php:174 classes/Ostatus_profile.php:192
+#: classes/Ostatus_profile.php:173 classes/Ostatus_profile.php:191
 #, php-format
 msgid "Invalid ostatus_profile state: Two or more IDs set for %s."
 msgstr ""
 
 #. TRANS: Server exception. %s is a URI
-#: classes/Ostatus_profile.php:177 classes/Ostatus_profile.php:195
+#: classes/Ostatus_profile.php:176 classes/Ostatus_profile.php:194
 #, php-format
 msgid "Invalid ostatus_profile state: All IDs empty for %s."
 msgstr ""
 
 #. TRANS: Server exception.
 #. TRANS: %1$s is the method name the exception occured in, %2$s is the actor type.
-#: classes/Ostatus_profile.php:292
+#: classes/Ostatus_profile.php:291
 #, php-format
 msgid "Invalid actor passed to %1$s: %2$s."
 msgstr ""
 
 #. TRANS: Server exception.
-#: classes/Ostatus_profile.php:388
+#: classes/Ostatus_profile.php:387
 msgid ""
 "Invalid type passed to Ostatus_profile::notify. It must be XML string or "
 "Activity entry."
 msgstr ""
 
 #. TRANS: Exception.
-#: classes/Ostatus_profile.php:421
+#: classes/Ostatus_profile.php:420
 msgid "Unknown feed format."
 msgstr ""
 
 #. TRANS: Exception.
-#: classes/Ostatus_profile.php:445
+#: classes/Ostatus_profile.php:444
 msgid "RSS feed without a channel."
 msgstr ""
 
-#. TRANS: Client exception. %s is a source URI.
+#. TRANS: Client exception thrown when trying to share multiple activities at once.
+#: classes/Ostatus_profile.php:527
+msgid "Can only handle share activities with exactly one object."
+msgstr ""
+
+#. TRANS: Client exception thrown when trying to share a non-activity object.
+#: classes/Ostatus_profile.php:534
+msgid "Can only handle shared activities."
+msgstr ""
+
+#. TRANS: Client exception thrown when saving an activity share fails.
+#. TRANS: %s is a share ID.
 #: classes/Ostatus_profile.php:547
 #, php-format
+msgid "Failed to save activity %s."
+msgstr ""
+
+#. TRANS: Client exception. %s is a source URI.
+#: classes/Ostatus_profile.php:585 classes/Ostatus_profile.php:757
+#, php-format
 msgid "No content for notice %s."
 msgstr ""
 
 #. TRANS: Shown when a notice is longer than supported and/or when attachments are present. At runtime
 #. TRANS: this will usually be replaced with localised text from StatusNet core messages.
-#: classes/Ostatus_profile.php:582
+#: classes/Ostatus_profile.php:620 classes/Ostatus_profile.php:792
 msgid "Show more"
 msgstr ""
 
 #. TRANS: Exception. %s is a profile URL.
-#: classes/Ostatus_profile.php:779
+#: classes/Ostatus_profile.php:989
 #, php-format
 msgid "Could not reach profile page %s."
 msgstr ""
 
-#. TRANS: Exception. %s is a URL.
-#: classes/Ostatus_profile.php:837
-#, php-format
-msgid "Could not find a feed URL for profile page %s."
-msgstr ""
-
 #. TRANS: Feed sub exception.
-#: classes/Ostatus_profile.php:935
+#: classes/Ostatus_profile.php:1145
 msgid "Cannot find enough profile information to make a feed."
 msgstr ""
 
-#. TRANS: Server exception. %s is a URL.
-#: classes/Ostatus_profile.php:999
-#, php-format
-msgid "Invalid avatar URL %s."
-msgstr ""
-
-#. TRANS: Server exception. %s is a URI.
-#: classes/Ostatus_profile.php:1010
-#, php-format
-msgid "Tried to update avatar for unsaved remote profile %s."
-msgstr ""
-
-#. TRANS: Server exception. %s is a URL.
-#: classes/Ostatus_profile.php:1020
-#, php-format
-msgid "Unable to fetch avatar from %s."
-msgstr ""
-
 #. TRANS: Server exception.
-#: classes/Ostatus_profile.php:1213
+#: classes/Ostatus_profile.php:1427
 msgid "No author ID URI found."
 msgstr ""
 
 #. TRANS: Exception.
-#: classes/Ostatus_profile.php:1239
+#: classes/Ostatus_profile.php:1453
 msgid "No profile URI."
 msgstr ""
 
 #. TRANS: Exception.
-#: classes/Ostatus_profile.php:1245
+#: classes/Ostatus_profile.php:1459
 msgid "Local user cannot be referenced as remote."
 msgstr ""
 
 #. TRANS: Exception.
-#: classes/Ostatus_profile.php:1250
+#: classes/Ostatus_profile.php:1464
 msgid "Local group cannot be referenced as remote."
 msgstr ""
 
 #. TRANS: Exception.
-#: classes/Ostatus_profile.php:1258
+#: classes/Ostatus_profile.php:1472
 msgid "Local list cannot be referenced as remote."
 msgstr ""
 
 #. TRANS: Server exception.
-#: classes/Ostatus_profile.php:1311 classes/Ostatus_profile.php:1322
+#: classes/Ostatus_profile.php:1525 classes/Ostatus_profile.php:1536
 msgid "Cannot save local profile."
 msgstr ""
 
 #. TRANS: Server exception.
-#: classes/Ostatus_profile.php:1333
+#: classes/Ostatus_profile.php:1547
 msgid "Cannot save local list."
 msgstr ""
 
 #. TRANS: Server exception.
-#: classes/Ostatus_profile.php:1341
+#: classes/Ostatus_profile.php:1555
 msgid "Cannot save OStatus profile."
 msgstr ""
 
-#. TRANS: Exception.
-#: classes/Ostatus_profile.php:1654 classes/Ostatus_profile.php:1681
-msgid "Not a valid webfinger address."
-msgstr ""
-
 #. TRANS: Exception. %s is a webfinger address.
-#: classes/Ostatus_profile.php:1759
+#: classes/Ostatus_profile.php:1973
 #, php-format
 msgid "Could not save profile for \"%s\"."
 msgstr ""
 
 #. TRANS: Exception. %s is a webfinger address.
-#: classes/Ostatus_profile.php:1778
+#: classes/Ostatus_profile.php:1992
 #, php-format
 msgid "Could not save OStatus profile for \"%s\"."
 msgstr ""
 
-#. TRANS: Exception. %s is a webfinger address.
-#: classes/Ostatus_profile.php:1786
-#, php-format
-msgid "Could not find a valid profile for \"%s\"."
-msgstr ""
-
 #. TRANS: Server exception.
-#: classes/Ostatus_profile.php:1829
+#: classes/Ostatus_profile.php:2043
 msgid "Could not store HTML content of long post as file."
 msgstr ""
 
 #. TRANS: Server exception.
 #. TRANS: %1$s is a protocol, %2$s is a URI.
-#: classes/Ostatus_profile.php:1861
+#: classes/Ostatus_profile.php:2075
 #, php-format
 msgid "Unrecognized URI protocol for profile: %1$s (%2$s)."
 msgstr ""
 
 #. TRANS: Server exception. %s is a URI.
-#: classes/Ostatus_profile.php:1868
+#: classes/Ostatus_profile.php:2082
 #, php-format
 msgid "No URI protocol for profile: %s."
 msgstr ""
@@ -1069,12 +1090,12 @@ msgstr ""
 
 #. TRANS: Client exception.
 #: lib/salmonaction.php:184
-msgid "This target does not understand tag events."
+msgid "This target does not understand list events."
 msgstr ""
 
 #. TRANS: Client exception.
 #: lib/salmonaction.php:190
-msgid "This target does not understand untag events."
+msgid "This target does not understand unlist events."
 msgstr ""
 
 #. TRANS: Exception.
diff --git a/plugins/OStatus/locale/ca/LC_MESSAGES/OStatus.po b/plugins/OStatus/locale/ca/LC_MESSAGES/OStatus.po
new file mode 100644
index 0000000000..536481e4f7
--- /dev/null
+++ b/plugins/OStatus/locale/ca/LC_MESSAGES/OStatus.po
@@ -0,0 +1,941 @@
+# Translation of StatusNet - OStatus to Catalan (català)
+# Exported from translatewiki.net
+#
+# Author: Gemmaa
+# Author: Toliño
+# Author: Toniher
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - OStatus\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:31+0000\n"
+"Language-Team: Catalan <https://translatewiki.net/wiki/Portal:ca>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-12-03 13:49:04+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: ca\n"
+"X-Message-Group: #out-statusnet-plugin-ostatus\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: String in the gettext speed test script. Unimportant.
+msgid "Feeds"
+msgstr "Canals"
+
+#. TRANS: Link to subscribe to a remote entity.
+#. TRANS: Link text for a user to subscribe to an OStatus user.
+msgid "Subscribe"
+msgstr "Subscriu"
+
+#. TRANS: Fieldset legend.
+msgid "List remote profile"
+msgstr "Llista els perfils remots"
+
+#. TRANS: Field label.
+msgctxt "LABEL"
+msgid "Remote profile"
+msgstr "Perfil remot"
+
+#. TRANS: Field title.
+#. TRANS: Tooltip for field label "Subscribe to".
+msgid ""
+"OStatus user's address, like nickname@example.com or http://example.net/"
+"nickname."
+msgstr ""
+"L'adreça d'usuari d'OStatus, com ara sobrenom@example.com o http://example."
+"net/sobrenom."
+
+#. TRANS: Button text to fetch remote profile.
+msgctxt "BUTTON"
+msgid "Fetch"
+msgstr "Recupera"
+
+#. TRANS: Exception in OStatus when invalid URI was entered.
+msgid "Invalid URI."
+msgstr "URL no vàlid."
+
+#. TRANS: Error message in OStatus plugin. Do not translate the domain names example.com
+#. TRANS: and example.net, as these are official standard domain names for use in examples.
+msgid ""
+"Sorry, we could not reach that address. Please make sure that the OStatus "
+"address is like nickname@example.com or http://example.net/nickname."
+msgstr ""
+"No s'ha pogut aconseguir l'adreça. Assegureu-vos que l'adreça OStatus és com "
+"sobrenom@example.com o http://example.net/sobrenom."
+
+#. TRANS: Title. %s is a domain name.
+#, php-format
+msgid "Sent from %s via OStatus"
+msgstr "Enviat de %s a través d'OStatus"
+
+#. TRANS: Exception thrown when setup of remote subscription fails.
+msgid "Could not set up remote subscription."
+msgstr "No s'ha pogut establir la subscripció remota."
+
+#. TRANS: Title for unfollowing a remote profile.
+msgctxt "TITLE"
+msgid "Unfollow"
+msgstr "Deixa de seguir"
+
+#. TRANS: Success message for unsubscribe from user attempt through OStatus.
+#. TRANS: %1$s is the unsubscriber's name, %2$s is the unsubscribed user's name.
+#, php-format
+msgid "%1$s stopped following %2$s."
+msgstr "%1$s ha deixat de seguir %2$s."
+
+#. TRANS: Exception thrown when setup of remote group membership fails.
+msgid "Could not set up remote group membership."
+msgstr "No s'ha pogut definir la pertanyença al grup remot."
+
+#. TRANS: Title for joining a remote groep.
+msgctxt "TITLE"
+msgid "Join"
+msgstr "Uneix"
+
+#. TRANS: Success message for subscribe to group attempt through OStatus.
+#. TRANS: %1$s is the member name, %2$s is the subscribed group's name.
+#, php-format
+msgid "%1$s has joined group %2$s."
+msgstr "%1$s s'ha unit al grup %2$s."
+
+#. TRANS: Exception thrown when joining a remote group fails.
+msgid "Failed joining remote group."
+msgstr "No s'ha pogut unir al grup remot."
+
+#. TRANS: Title for leaving a remote group.
+msgctxt "TITLE"
+msgid "Leave"
+msgstr "Deixa"
+
+#. TRANS: Success message for unsubscribe from group attempt through OStatus.
+#. TRANS: %1$s is the member name, %2$s is the unsubscribed group's name.
+#, php-format
+msgid "%1$s has left group %2$s."
+msgstr "%1$s ha deixat el grup %2$s."
+
+#. TRANS: Exception thrown when setup of remote list subscription fails.
+msgid "Could not set up remote list subscription."
+msgstr "No s'ha pogut definir la subscripció a la llista remota."
+
+#. TRANS: Title for following a remote list.
+msgctxt "TITLE"
+msgid "Follow list"
+msgstr "Segueix la llista"
+
+#. TRANS: Success message for remote list follow through OStatus.
+#. TRANS: %1$s is the subscriber name, %2$s is the list, %3$s is the lister's name.
+#, php-format
+msgid "%1$s is now following people listed in %2$s by %3$s."
+msgstr "%1$s està seguint ara gent llistada a %2$s per %3$s."
+
+#. TRANS: Exception thrown when subscription to remote list fails.
+msgid "Failed subscribing to remote list."
+msgstr "No s'ha pogut subscriu a la llista remota."
+
+#. TRANS: Title for unfollowing a remote list.
+msgid "Unfollow list"
+msgstr "Deixa de seguir la llista"
+
+#. TRANS: Success message for remote list unfollow through OStatus.
+#. TRANS: %1$s is the subscriber name, %2$s is the list, %3$s is the lister's name.
+#, php-format
+msgid "%1$s stopped following the list %2$s by %3$s."
+msgstr "%1$s ha deixat de seguir la llista %2$s per %3$s."
+
+#. TRANS: Title for listing a remote profile.
+msgctxt "TITLE"
+msgid "List"
+msgstr "Llista"
+
+#. TRANS: Success message for remote list addition through OStatus.
+#. TRANS: %1$s is the list creator's name, %2$s is the added list member, %3$s is the list name.
+#, php-format
+msgid "%1$s listed %2$s in the list %3$s."
+msgstr "%1$s ha llista %2$s a la llista %3$s."
+
+#. TRANS: Exception thrown when subscribing to a remote list fails.
+#, php-format
+msgid ""
+"Could not complete subscription to remote profile's feed. List %s could not "
+"be saved."
+msgstr ""
+"No s'ha pogut completar la subscripció a l'alimentació del perfil remot. "
+"Llista de  %s  no pot desar."
+
+#. TRANS: Title for unlisting a remote profile.
+msgctxt "TITLE"
+msgid "Unlist"
+msgstr "Sense llistar"
+
+#. TRANS: Success message for remote list removal through OStatus.
+#. TRANS: %1$s is the list creator's name, %2$s is the removed list member, %3$s is the list name.
+#, php-format
+msgid "%1$s removed %2$s from the list %3$s."
+msgstr "%1$stret  %2$s  de la llista  %3$s ."
+
+#. TRANS: Title for unliking a remote notice.
+msgid "Unlike"
+msgstr "Desagrada"
+
+#. TRANS: Success message for remove a favorite notice through OStatus.
+#. TRANS: %1$s is the unfavoring user's name, %2$s is URI to the no longer favored notice.
+#, php-format
+msgid "%1$s no longer likes %2$s."
+msgstr "%1$sja no li agrada  %2$s ."
+
+#. TRANS: Link text for link to remote subscribe.
+msgid "Remote"
+msgstr "Remot"
+
+#. TRANS: Title for activity.
+msgid "Profile update"
+msgstr "Actualització del perfil"
+
+#. TRANS: Ping text for remote profile update through OStatus.
+#. TRANS: %s is user that updated their profile.
+#, php-format
+msgid "%s has updated their profile page."
+msgstr "%sha actualitzat la seva pàgina de perfil."
+
+#. TRANS: Link text for a user to list an OStatus user.
+msgid "List"
+msgstr "Llista"
+
+#. TRANS: Plugin description.
+msgid ""
+"Follow people across social networks that implement <a href=\"http://ostatus."
+"org/\">OStatus</a>."
+msgstr ""
+"Seguir les persones a través de xarxes socials que implementen <a href="
+"\"http://ostatus.org/\">OStatus</a>."
+
+#. TRANS: Client exception.
+msgid "Publishing outside feeds not supported."
+msgstr "Publicació fora no alimenta el suport."
+
+#. TRANS: Client exception. %s is a mode.
+#, php-format
+msgid "Unrecognized mode \"%s\"."
+msgstr "No es reconeix el mode \" %s \"."
+
+#. TRANS: Client exception. %s is a topic.
+#, php-format
+msgid ""
+"Unsupported hub.topic %s this hub only serves local user and group Atom "
+"feeds."
+msgstr ""
+"Sense suport hub.topic  %s  aquest grup i Centre únic usuari local de "
+"serveix menjars d'Àtom."
+
+#. TRANS: Client exception. %s is sync or async.
+#, php-format
+msgid "Invalid hub.verify \"%s\". It must be sync or async."
+msgstr "Hub.verify no és vàlida \" %s \". Ha de ser sync o asíncrona."
+
+#. TRANS: Client exception. %s is the invalid lease value.
+#, php-format
+msgid "Invalid hub.lease \"%s\". It must be empty or positive integer."
+msgstr "Hub.lease no és vàlida \" %s \". Ha de ser un enter positiu o buit."
+
+#. TRANS: Client exception. %s is the invalid hub secret.
+#, php-format
+msgid "Invalid hub.secret \"%s\". It must be under 200 bytes."
+msgstr "Hub.secret no és vàlida \" %s \". Ha de ser de menys de 200 bytes."
+
+#. TRANS: Client exception. %s is a feed URL.
+#, php-format
+msgid "Invalid hub.topic \"%s\". User does not exist."
+msgstr "Hub.topic no és vàlida \" %s \". L'usuari no existeix."
+
+#. TRANS: Client exception. %s is a feed URL.
+#, php-format
+msgid "Invalid hub.topic \"%s\". Group does not exist."
+msgstr "Hub.topic no és vàlida \" %s \". Grup no existeix."
+
+#. TRANS: Client exception. %s is a feed URL.
+#, php-format
+msgid "Invalid hub.topic %s; list does not exist."
+msgstr "Hub.topic no és vàlid  %s ; la llista no existeix."
+
+#. TRANS: Client exception.
+#. TRANS: %1$s is this argument to the method this exception occurs in, %2$s is a URL.
+#, php-format
+msgid "Invalid URL passed for %1$s: \"%2$s\""
+msgstr "Adreça URL no vàlida passat per  %1$s : \" %2$s \""
+
+#. TRANS: Client error displayed when trying to list a local object as if it is remote.
+msgid "You can use the local list functionality!"
+msgstr "Vostè pot utilitzar les funcions de la llista local!"
+
+#. TRANS: Header for listing a remote object. %s is a remote object's name.
+#, php-format
+msgid "List %s"
+msgstr "Llista %s"
+
+#. TRANS: Button text to list a remote object.
+msgctxt "BUTTON"
+msgid "Go"
+msgstr "Vés-hi"
+
+#. TRANS: Field label.
+msgid "User nickname"
+msgstr "Nom d'usuari"
+
+#. TRANS: Field title.
+msgid "Nickname of the user you want to list."
+msgstr "Nom d'usuari de l'usuari que vol a la llista."
+
+#. TRANS: Field label.
+msgid "Profile Account"
+msgstr "Compte del perfil"
+
+#. TRANS: Field title.
+msgid "Your account id (for example user@identi.ca)."
+msgstr "El seu compte id (per exemple user@identi.ca)."
+
+#. TRANS: Client error displayed when remote profile could not be looked up.
+#. TRANS: Client error.
+msgid "Could not look up OStatus account profile."
+msgstr "No podia veure el perfil de compte de OStatus."
+
+#. TRANS: Client error displayed when remote profile address could not be confirmed.
+#. TRANS: Client error.
+msgid "Could not confirm remote profile address."
+msgstr "No s'ha pogut confirmar adreça remota perfil."
+
+#. TRANS: Title for an OStatus list.
+msgid "OStatus list"
+msgstr "Llista OStatus"
+
+#. TRANS: Server exception thrown when referring to a non-existing or empty feed.
+msgid "Empty or invalid feed id."
+msgstr "Id no vàlida"
+
+#. TRANS: Server exception. %s is a feed ID.
+#, php-format
+msgid "Unknown PuSH feed id %s"
+msgstr "PuSH desconegut de connexió id%s"
+
+#. TRANS: Client exception. %s is an invalid feed name.
+#, php-format
+msgid "Bad hub.topic feed \"%s\"."
+msgstr "Bad hub.topic de connexió \" %s \"."
+
+#. TRANS: Client exception. %1$s the invalid token, %2$s is the topic for which the invalid token was given.
+#, php-format
+msgid "Bad hub.verify_token %1$s for %2$s."
+msgstr "Bad hub.verify_token  %1$s  per a  %2$s ."
+
+#. TRANS: Client exception. %s is an invalid topic.
+#, php-format
+msgid "Unexpected subscribe request for %s."
+msgstr "Inesperat subscriure's sol. licitud de  %s ."
+
+#. TRANS: Client exception. %s is an invalid topic.
+#, php-format
+msgid "Unexpected unsubscribe request for %s."
+msgstr "Inesperat subscriure's sol. licitud de  %s ."
+
+#. TRANS: Client error displayed when referring to a non-existing user.
+#. TRANS: Client error.
+msgid "No such user."
+msgstr "No existeix l'usuari."
+
+#. TRANS: Field label for a field that takes an OStatus user address.
+msgid "Subscribe to"
+msgstr "Subscriviu-vos a"
+
+#. TRANS: Button text.
+#. TRANS: Button text to continue joining a remote list.
+msgctxt "BUTTON"
+msgid "Continue"
+msgstr "Continua"
+
+#. TRANS: Button text.
+msgid "Join"
+msgstr "Uneix"
+
+#. TRANS: Tooltip for button "Join".
+msgctxt "BUTTON"
+msgid "Join this group"
+msgstr "Uniu-vos al grup"
+
+#. TRANS: Button text.
+msgctxt "BUTTON"
+msgid "Confirm"
+msgstr "Confirma"
+
+#. TRANS: Tooltip for button "Confirm".
+msgid "Subscribe to this user"
+msgstr "Subscriviu-vos a l'usuari"
+
+#. TRANS: Extra paragraph in remote profile view when already subscribed.
+msgid "You are already subscribed to this user."
+msgstr "Ja esteu subscrit a aquest usuari."
+
+#. TRANS: Error text.
+msgid ""
+"Sorry, we could not reach that feed. Please try that OStatus address again "
+"later."
+msgstr ""
+"No hem pogut recuperar el canal. Torneu a provar l'adreça d'OStatus més "
+"endavant."
+
+#. TRANS: OStatus remote subscription dialog error.
+#. TRANS: OStatus remote group subscription dialog error.
+msgid "Already subscribed!"
+msgstr "Ja hi esteu subscrit!"
+
+#. TRANS: OStatus remote subscription dialog error.
+msgid "Remote subscription failed!"
+msgstr "La subscripció remota ha fallat!"
+
+#. TRANS: Client error displayed when the session token does not match or is not given.
+msgid "There was a problem with your session token. Try again, please."
+msgstr ""
+"Sembla que hi ha hagut un problema amb la teva sessió. Prova-ho de nou, si "
+"us plau."
+
+#. TRANS: Form title.
+msgid "Subscribe to user"
+msgstr "Subscriu a l'usuari"
+
+#. TRANS: Page title for OStatus remote subscription form.
+msgid "Confirm"
+msgstr "Confirma"
+
+#. TRANS: Instructions.
+msgid ""
+"You can subscribe to users from other supported sites. Paste their address "
+"or profile URI below:"
+msgstr ""
+"Vostè pot subscriure's als usuaris d'altres llocs de què es dóna suport. "
+"Enganxar la seva adreça o perfil URI sota:"
+
+#. TRANS: Field label.
+msgid "Join group"
+msgstr "Uneix-te al grup"
+
+#. TRANS: Tooltip for field label "Join group". Do not translate the "example.net"
+#. TRANS: domain name in the URL, as it is an official standard domain name for examples.
+msgid "OStatus group's address, like http://example.net/group/nickname."
+msgstr "Adreça del grup OStatus, com http://example.net/group/nickname."
+
+#. TRANS: Error text displayed when trying to join a remote group the user is already a member of.
+msgid "You are already a member of this group."
+msgstr "Ja sou membre del grup."
+
+#. TRANS: OStatus remote group subscription dialog error.
+msgid "Already a member!"
+msgstr "Ja ets un membre!"
+
+#. TRANS: OStatus remote group subscription dialog error.
+msgid "Remote group join failed!"
+msgstr "No s'ha pogut unir al grup remot."
+
+#. TRANS: Page title for OStatus remote group join form
+msgid "Confirm joining remote group"
+msgstr "Confirma la unió al grup remot"
+
+#. TRANS: Form instructions.
+msgid ""
+"You can subscribe to groups from other supported sites. Paste the group's "
+"profile URI below:"
+msgstr ""
+"Vostè pot subscriure's als grups d'altres llocs de què es dóna suport. "
+"Enganxa el perfil del grup URI sota:"
+
+#. TRANS: Client error displayed trying to perform an action without providing an ID.
+#. TRANS: Client error.
+#. TRANS: Client error displayed trying to perform an action without providing an ID.
+msgid "No ID."
+msgstr "Sense ID."
+
+#. TRANS: Client exception thrown when an undefied activity is performed.
+#. TRANS: Client exception.
+msgid "Cannot handle that kind of post."
+msgstr "No pot manejar aquest tipus de missatge."
+
+#. TRANS: Client exception.
+msgid "In reply to unknown notice."
+msgstr "En resposta a avís desconegut."
+
+#. TRANS: Client exception.
+msgid "In reply to a notice not by this user and not mentioning this user."
+msgstr "En resposta a un avís no per l'usuari i no esmentar aquest usuari."
+
+#. TRANS: Client exception.
+msgid "To the attention of user(s), not including this one."
+msgstr "A l'atenció dels usuaris, no incloent-hi aquest."
+
+#. TRANS: Client exception.
+msgid "Not to anyone in reply to anything."
+msgstr "No a qualsevol en resposta de qualsevol cosa."
+
+#. TRANS: Client exception.
+msgid "This is already a favorite."
+msgstr "Ja és un preferit."
+
+#. TRANS: Client exception.
+msgid "Could not save new favorite."
+msgstr "No s'ha pogut desar un preferit nou."
+
+#. TRANS: Client exception.
+msgid "Notice was not favorited!"
+msgstr "L'avís no està marcat com preferit!"
+
+#. TRANS: Client exception.
+msgid "Not a person object."
+msgstr "No és un objecte de persona."
+
+#. TRANS: Client exception.
+msgid "Unidentified profile being listed."
+msgstr "Perfil no identificat llistat."
+
+#. TRANS: Client exception.
+msgid "This user is not the one being listed."
+msgstr "Aquest usuari no és el que està llistat."
+
+#. TRANS: Client exception.
+msgid "The listing could not be saved."
+msgstr "No s'ha pogut desar el llistat."
+
+#. TRANS: Client exception.
+msgid "Unidentified profile being unlisted."
+msgstr "Perfil no identificat  al llistat."
+
+#. TRANS: Client exception.
+msgid "This user is not the one being unlisted."
+msgstr "Aquest usuari no està al llistat."
+
+#. TRANS: Client exception.
+msgid "The listing could not be deleted."
+msgstr "No es pot eliminar el llistat."
+
+#. TRANS: Client exception.
+msgid "Cannot favorite/unfavorite without an object."
+msgstr "No pot tindre favorits/no favorits sense un objecte."
+
+#. TRANS: Client exception.
+msgid "Cannot handle that kind of object for liking/faving."
+msgstr "No pot manejar aquest tipus d'objecte per a gust/faving."
+
+#. TRANS: Client exception. %s is an object ID.
+#, php-format
+msgid "Notice with ID %s unknown."
+msgstr "Avís amb ID %s desconegut."
+
+#. TRANS: Client exception. %1$s is a notice ID, %2$s is a user ID.
+#, php-format
+msgid "Notice with ID %1$s not posted by %2$s."
+msgstr "Avís amb ID %1$s no publicat per %2$s."
+
+#. TRANS: Field label.
+msgid "Subscribe to list"
+msgstr "Subscriu a la llista"
+
+#. TRANS: Field title.
+msgid "Address of the OStatus list, like http://example.net/user/all/tag."
+msgstr "Adreça de la llista de OStatus, com http://example.net/user/all/tag."
+
+#. TRANS: Error text displayed when trying to subscribe to a list already a subscriber to.
+msgid "You are already subscribed to this list."
+msgstr "Ja esteu subscrit a aquesta llista."
+
+#. TRANS: Page title for OStatus remote list subscription form
+msgid "Confirm subscription to remote list"
+msgstr "Confirma la subscripció a la llista remota"
+
+#. TRANS: Instructions for OStatus list subscription form.
+msgid ""
+"You can subscribe to lists from other supported sites. Paste the list's URI "
+"below:"
+msgstr ""
+"Vostè pot subscriure's als grups d'altres llocs de què es dóna suport. "
+"Enganxa el perfil del grup URI sota:"
+
+#. TRANS: Client error.
+msgid "No such group."
+msgstr "No existeix el grup."
+
+#. TRANS: Client error.
+msgid "Cannot accept remote posts for a remote group."
+msgstr "No es poden acceptar avisos remots d'un grup remot."
+
+#. TRANS: Client error.
+msgid "Cannot read profile to set up group membership."
+msgstr "No es pot llegir el perfil per cancel·lar-ne la pertinència."
+
+#. TRANS: Client error.
+#. TRANS: Client error displayed when trying to have a group join another group.
+msgid "Groups cannot join groups."
+msgstr "Els grups no poden unir-se a grups."
+
+#. TRANS: Client error displayed when trying to join a group the user is blocked from by a group admin.
+msgid "You have been blocked from that group by the admin."
+msgstr "L'administrador us ha blocat del grup."
+
+#. TRANS: Server error. %1$s is a profile URI, %2$s is a group nickname.
+#, php-format
+msgid "Could not join remote user %1$s to group %2$s."
+msgstr "No s'ha pogut afegir l'usuari %1$s al grup %2$s."
+
+#. TRANS: Client error displayed when group membership cannot be cancelled
+#. TRANS: because the remote profile could not be read.
+msgid "Cannot read profile to cancel group membership."
+msgstr "No es pot llegir el perfil per cancel·lar-ne la pertinència."
+
+#. TRANS: Server error. %1$s is a profile URI, %2$s is a group nickname.
+#, php-format
+msgid "Could not remove remote user %1$s from group %2$s."
+msgstr "No es pot eliminar l'usuari remot %1$s de la llista %2$s."
+
+#. TRANS: Client error displayed when referring to a non-existing list.
+#. TRANS: Client error.
+msgid "No such list."
+msgstr "No existeix la llista."
+
+#. TRANS: Client error displayed when trying to send a message to a remote list.
+msgid "Cannot accept remote posts for a remote list."
+msgstr "No es poden acceptar avisos remots d'un grup remot."
+
+#. TRANS: Client error displayed when referring to a non-existing remote list.
+msgid "Cannot read profile to set up list subscription."
+msgstr ""
+"No es pot llegir el perfil per posar cap amunt de subscripció a la llista."
+
+#. TRANS: Client error displayed when trying to subscribe a group to a list.
+#. TRANS: Client error displayed when trying to unsubscribe a group from a list.
+msgid "Groups cannot subscribe to lists."
+msgstr "Els grups no es poden subscriure a les llistes."
+
+#. TRANS: Server error displayed when subscribing a remote user to a list fails.
+#. TRANS: %1$s is a profile URI, %2$s is a list name.
+#, php-format
+msgid "Could not subscribe remote user %1$s to list %2$s."
+msgstr "No es pot subscriure a l'usuari remot %1$s de la llista %2$s."
+
+#. TRANS: Client error displayed when trying to unsubscribe from non-existing list.
+msgid "Cannot read profile to cancel list subscription."
+msgstr ""
+"No es pot llegir el perfil per posar cap amunt de subscripció a la llista."
+
+#. TRANS: Client error displayed when trying to unsubscribe a remote user from a list fails.
+#. TRANS: %1$s is a profile URL, %2$s is a list name.
+#, php-format
+msgid "Could not unsubscribe remote user %1$s from list %2$s."
+msgstr "No es pot subscriure a l'usuari remot %1$s de la llista %2$s."
+
+#. TRANS: Client error.
+msgid "You can use the local subscription!"
+msgstr "Podeu fer servir la subscripció local!"
+
+#. TRANS: Form title.
+msgctxt "TITLE"
+msgid "Subscribe to user"
+msgstr "Subscriu a l'usuari"
+
+#. TRANS: Form legend. %s is a group name.
+#, php-format
+msgid "Join group %s"
+msgstr "Uneix al grup %s"
+
+#. TRANS: Button text to join a group.
+msgctxt "BUTTON"
+msgid "Join"
+msgstr "Inici de sessió"
+
+#. TRANS: Form legend. %1$s is a list, %2$s is a lister's name.
+#, php-format
+msgid "Subscribe to list %1$s by %2$s"
+msgstr "Subscriu a la llista %1$s per %2$s"
+
+#. TRANS: Button text to subscribe to a list.
+#. TRANS: Button text to subscribe to a profile.
+msgctxt "BUTTON"
+msgid "Subscribe"
+msgstr "Subscriu"
+
+#. TRANS: Form legend. %s is a nickname.
+#, php-format
+msgid "Subscribe to %s"
+msgstr "Subscriu a %s"
+
+#. TRANS: Field label.
+msgid "Group nickname"
+msgstr "Sobrenom del grup"
+
+#. TRANS: Field title.
+msgid "Nickname of the group you want to join."
+msgstr "Sobrenom del grup a què voleu unir-vos."
+
+#. TRANS: Field title.
+msgid "Nickname of the user you want to follow."
+msgstr "Sobrenom de l'usuari que voleu seguir."
+
+#. TRANS: Tooltip for field label "Profile Account".
+msgid "Your account ID (e.g. user@identi.ca)."
+msgstr "El vostre ID de compte (p. ex. usuari@identi.ca)."
+
+#. TRANS: Client error.
+msgid "Must provide a remote profile."
+msgstr "Cal proporcionar un perfil remot."
+
+#. TRANS: Client error.
+msgid "No local user or group nickname provided."
+msgstr "Cap usuari local o grup sobrenom proporcionat."
+
+#. TRANS: Page title.
+msgid "OStatus Connect"
+msgstr "Connecta amb OStatus"
+
+#. TRANS: Server exception. %s is a URL.
+#, php-format
+msgid "Invalid avatar URL %s."
+msgstr "URL de l'avatar %s no vàlid."
+
+#. TRANS: Server exception. %s is a URI.
+#, php-format
+msgid "Tried to update avatar for unsaved remote profile %s."
+msgstr "S'ha provat d'actualitzar l'avatar no desat del perfil remot %s."
+
+#. TRANS: Server exception. %s is a URL.
+#, php-format
+msgid "Unable to fetch avatar from %s."
+msgstr "No s'ha pogut aconseguir l'avatar de %s."
+
+#. TRANS: Exception. %s is a URL.
+#, php-format
+msgid "Could not find a feed URL for profile page %s."
+msgstr "No es pot trobar un URL del canal de la pàgina del perfil %s."
+
+#. TRANS: Exception.
+msgid "Not a valid webfinger address."
+msgstr "No és una adreça de webfinger vàlida."
+
+#. TRANS: Exception. %s is a webfinger address.
+#, php-format
+msgid "Could not find a valid profile for \"%s\"."
+msgstr "No s'ha pogut trobar un perfil de «%s» vàlid."
+
+#. TRANS: Server exception.
+msgid "Attempting to start PuSH subscription for feed with no hub."
+msgstr ""
+"S'està intentant iniciar la subscripció d'empenta per a menjar amb cap hub."
+
+#. TRANS: Server exception.
+msgid "Attempting to end PuSH subscription for feed with no hub."
+msgstr ""
+"S'està intentant iniciar la subscripció d'empenta per a menjar amb cap hub."
+
+#. TRANS: Server exception. %s is a URI
+#, php-format
+msgid "Invalid ostatus_profile state: Two or more IDs set for %s."
+msgstr ""
+"Estat de ostatus_profile no és vàlida: identificadors de dos o més definir "
+"per a  %s ."
+
+#. TRANS: Server exception. %s is a URI
+#, php-format
+msgid "Invalid ostatus_profile state: All IDs empty for %s."
+msgstr "Estat de ostatus_profile no és vàlida: els IDs buit per  %s ."
+
+#. TRANS: Server exception.
+#. TRANS: %1$s is the method name the exception occured in, %2$s is the actor type.
+#, php-format
+msgid "Invalid actor passed to %1$s: %2$s."
+msgstr "Actor no és vàlid, ha passat a  %1$s :  %2$s ."
+
+#. TRANS: Server exception.
+msgid ""
+"Invalid type passed to Ostatus_profile::notify. It must be XML string or "
+"Activity entry."
+msgstr ""
+"Tipus no vàlid passat a Ostatus_profile::notify. Ha de ser XML corda o "
+"entrada de l'activitat."
+
+#. TRANS: Exception.
+msgid "Unknown feed format."
+msgstr "Format de canal desconegut."
+
+#. TRANS: Exception.
+msgid "RSS feed without a channel."
+msgstr "Canal RSS sense un canal."
+
+#. TRANS: Client exception thrown when trying to share multiple activities at once.
+msgid "Can only handle share activities with exactly one object."
+msgstr "Només pot manejar compartir activitats amb exactament amb un objecte."
+
+#. TRANS: Client exception thrown when trying to share a non-activity object.
+msgid "Can only handle shared activities."
+msgstr "Només es poden gestionar les activitats compartides."
+
+#. TRANS: Client exception thrown when saving an activity share fails.
+#. TRANS: %s is a share ID.
+#, php-format
+msgid "Failed to save activity %s."
+msgstr "No s'ha pogut desar l'activitat %s."
+
+#. TRANS: Client exception. %s is a source URI.
+#, php-format
+msgid "No content for notice %s."
+msgstr "No hi ha contingut a l'avís %s."
+
+#. TRANS: Shown when a notice is longer than supported and/or when attachments are present. At runtime
+#. TRANS: this will usually be replaced with localised text from StatusNet core messages.
+msgid "Show more"
+msgstr "Mostra'n més"
+
+#. TRANS: Exception. %s is a profile URL.
+#, php-format
+msgid "Could not reach profile page %s."
+msgstr "No es pot arribar a la pàgina del perfil %s."
+
+#. TRANS: Feed sub exception.
+msgid "Cannot find enough profile information to make a feed."
+msgstr ""
+"No s'ha pogut trobar suficient informació al perfil per generar un canal."
+
+#. TRANS: Server exception.
+msgid "No author ID URI found."
+msgstr "No s'ha trobat cap autor ID URI."
+
+#. TRANS: Exception.
+msgid "No profile URI."
+msgstr "No hi ha cap URI del perfil."
+
+#. TRANS: Exception.
+msgid "Local user cannot be referenced as remote."
+msgstr "L'usuari local no pot fer referència tan remota."
+
+#. TRANS: Exception.
+msgid "Local group cannot be referenced as remote."
+msgstr "L'usuari local no pot fer referència tan remota."
+
+#. TRANS: Exception.
+msgid "Local list cannot be referenced as remote."
+msgstr "L'usuari local no pot fer referència tan remota."
+
+#. TRANS: Server exception.
+msgid "Cannot save local profile."
+msgstr "No es pot desar el perfil local."
+
+#. TRANS: Server exception.
+msgid "Cannot save local list."
+msgstr "No es pot desar la llista local."
+
+#. TRANS: Server exception.
+msgid "Cannot save OStatus profile."
+msgstr "No es pot desar el perfil local."
+
+#. TRANS: Exception. %s is a webfinger address.
+#, php-format
+msgid "Could not save profile for \"%s\"."
+msgstr "No s'ha pogut desar el perfil de «%s»."
+
+#. TRANS: Exception. %s is a webfinger address.
+#, php-format
+msgid "Could not save OStatus profile for \"%s\"."
+msgstr "No es pot desar el perfil de \"%s\"."
+
+#. TRANS: Server exception.
+msgid "Could not store HTML content of long post as file."
+msgstr "No podria emmagatzemar contingut HTML de correu llarg com a fitxer."
+
+#. TRANS: Server exception.
+#. TRANS: %1$s is a protocol, %2$s is a URI.
+#, php-format
+msgid "Unrecognized URI protocol for profile: %1$s (%2$s)."
+msgstr "No reconegut protocol URI per al perfil:  %1$s  ( %2$s )."
+
+#. TRANS: Server exception. %s is a URI.
+#, php-format
+msgid "No URI protocol for profile: %s."
+msgstr "Cap protocol URI per al perfil:  %s ."
+
+#. TRANS: Client exception. %s is a HTTP status code.
+#, php-format
+msgid "Hub subscriber verification returned HTTP %s."
+msgstr "Verificació de subscriptor Centre va tornar de HTTP  %s ."
+
+#. TRANS: Exception. %1$s is a response status code, %2$s is the body of the response.
+#, php-format
+msgid "Callback returned status: %1$s. Body: %2$s"
+msgstr "Trucada d'avís va tornar a l'estat:  %1$s . Cos:%2$s"
+
+#. TRANS: Exception.
+msgid "Unable to locate signer public key."
+msgstr "No es pot localitzar la clau pública signant."
+
+#. TRANS: Exception.
+msgid "Salmon invalid actor for signing."
+msgstr "Salmó actor no és vàlid per a la signatura."
+
+#. TRANS: Client error. POST is a HTTP command. It should not be translated.
+msgid "This method requires a POST."
+msgstr "Aquest mètode requereix POST."
+
+#. TRANS: Client error. Do not translate "application/magic-envelope+xml".
+msgid "Salmon requires \"application/magic-envelope+xml\"."
+msgstr "Salmó requereix \"aplicació/magic-sobres + xml\"."
+
+#. TRANS: Client error.
+msgid "Salmon signature verification failed."
+msgstr "Ha fallat la verificació de la signatura de salmó."
+
+#. TRANS: Client error.
+msgid "Salmon post must be an Atom entry."
+msgstr "L'enviament Atom ha de ser una entrada Atom."
+
+#. TRANS: Client exception.
+msgid "Unrecognized activity type."
+msgstr "Tipus d'activitat no reconegut."
+
+#. TRANS: Client exception.
+msgid "This target does not understand posts."
+msgstr "Aquest objectiu no entén llocs."
+
+#. TRANS: Client exception.
+msgid "This target does not understand follows."
+msgstr "Aquest objectiu no entén llocs."
+
+#. TRANS: Client exception.
+msgid "This target does not understand unfollows."
+msgstr "Aquest objectiu no entén llocs."
+
+#. TRANS: Client exception.
+msgid "This target does not understand favorites."
+msgstr "Aquest objectiu no entén llocs."
+
+#. TRANS: Client exception.
+msgid "This target does not understand unfavorites."
+msgstr "Aquest objectiu no entén llocs."
+
+#. TRANS: Client exception.
+msgid "This target does not understand share events."
+msgstr "Aquest objectiu no entén llocs."
+
+#. TRANS: Client exception.
+msgid "This target does not understand joins."
+msgstr "Aquest objectiu no entén llocs."
+
+#. TRANS: Client exception.
+msgid "This target does not understand leave events."
+msgstr "Aquest objectiu no entén permís esdeveniments."
+
+#. TRANS: Client exception.
+msgid "This target does not understand list events."
+msgstr "Aquest objectiu no entén permís esdeveniments."
+
+#. TRANS: Client exception.
+msgid "This target does not understand unlist events."
+msgstr "Aquest objectiu no entén permís esdeveniments."
+
+#. TRANS: Exception.
+msgid "Received a salmon slap from unidentified actor."
+msgstr "Va rebre una bufetada salmó de l'actor no identificada."
diff --git a/plugins/OStatus/locale/de/LC_MESSAGES/OStatus.po b/plugins/OStatus/locale/de/LC_MESSAGES/OStatus.po
index ac8a58dd64..b524dcdf17 100644
--- a/plugins/OStatus/locale/de/LC_MESSAGES/OStatus.po
+++ b/plugins/OStatus/locale/de/LC_MESSAGES/OStatus.po
@@ -1,9 +1,15 @@
 # Translation of StatusNet - OStatus to German (Deutsch)
 # Exported from translatewiki.net
 #
+# Author: Alphakilo
 # Author: Fujnky
+# Author: George Animal
 # Author: Giftpflanze
+# Author: Kghbln
 # Author: Michael
+# Author: PtM
+# Author: Quedel
+# Author: Tiin
 # --
 # This file is distributed under the same license as the StatusNet package.
 #
@@ -11,18 +17,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OStatus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:43+0000\n"
-"Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:31+0000\n"
+"Language-Team: German <https://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:48+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-12-03 13:49:04+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-ostatus\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: String in the gettext speed test script. Unimportant.
 msgid "Feeds"
 msgstr "Feeds"
 
@@ -32,25 +39,22 @@ msgid "Subscribe"
 msgstr "Abonnieren"
 
 #. TRANS: Fieldset legend.
-#, fuzzy
-msgid "Tag remote profile"
-msgstr "Du musst ein Remoteprofil angeben."
+msgid "List remote profile"
+msgstr "Entferntes Profil auflisten"
 
 #. TRANS: Field label.
-#, fuzzy
 msgctxt "LABEL"
 msgid "Remote profile"
-msgstr "Beitritt in Remote-Gruppe fehlgeschlagen!"
+msgstr "Entferntes Profil"
 
 #. TRANS: Field title.
 #. TRANS: Tooltip for field label "Subscribe to".
-#, fuzzy
 msgid ""
 "OStatus user's address, like nickname@example.com or http://example.net/"
 "nickname."
 msgstr ""
-"Adresse des OStatus-Benutzers, wie nickname@example.com oder http://example."
-"net/nickname"
+"Adresse des OStatus-Benutzers, etwa nickname@example.com oder http://example."
+"net/nickname."
 
 #. TRANS: Button text to fetch remote profile.
 msgctxt "BUTTON"
@@ -58,12 +62,11 @@ msgid "Fetch"
 msgstr "Holen"
 
 #. TRANS: Exception in OStatus when invalid URI was entered.
-#, fuzzy
 msgid "Invalid URI."
-msgstr "Ungültiger Avatar-URL %s."
+msgstr "Ungültiger URI."
 
-#. TRANS: Error message in OStatus plugin.
-#. TRANS: Error text.
+#. TRANS: Error message in OStatus plugin. Do not translate the domain names example.com
+#. TRANS: and example.net, as these are official standard domain names for use in examples.
 msgid ""
 "Sorry, we could not reach that address. Please make sure that the OStatus "
 "address is like nickname@example.com or http://example.net/nickname."
@@ -82,7 +85,6 @@ msgid "Could not set up remote subscription."
 msgstr "Konnte Remote-Abonnement nicht einrichten."
 
 #. TRANS: Title for unfollowing a remote profile.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Unfollow"
 msgstr "Nicht mehr beachten"
@@ -98,7 +100,6 @@ msgid "Could not set up remote group membership."
 msgstr "Konnte Remotegruppenmitgliedschaft nicht einrichten."
 
 #. TRANS: Title for joining a remote groep.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Join"
 msgstr "Beitreten"
@@ -114,7 +115,6 @@ msgid "Failed joining remote group."
 msgstr "Fehler beim Beitreten der Remotegruppe."
 
 #. TRANS: Title for leaving a remote group.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Leave"
 msgstr "Verlassen"
@@ -126,9 +126,8 @@ msgid "%1$s has left group %2$s."
 msgstr "%1$s hat die Gruppe %2$s verlassen"
 
 #. TRANS: Exception thrown when setup of remote list subscription fails.
-#, fuzzy
 msgid "Could not set up remote list subscription."
-msgstr "Konnte Remote-Abonnement nicht einrichten."
+msgstr "Konnte entferntes Listen-Abonnement nicht einrichten."
 
 #. TRANS: Title for following a remote list.
 msgctxt "TITLE"
@@ -136,68 +135,65 @@ msgid "Follow list"
 msgstr "Der Liste folgen"
 
 #. TRANS: Success message for remote list follow through OStatus.
-#. TRANS: %1$s is the subscriber name, %2$s is the list, %3$s is the tagger's name.
-#, fuzzy, php-format
+#. TRANS: %1$s is the subscriber name, %2$s is the list, %3$s is the lister's name.
+#, php-format
 msgid "%1$s is now following people listed in %2$s by %3$s."
-msgstr "%1$s folgt %2$s nicht mehr."
+msgstr "%1$s folgt in %3$ss Liste %2$s gelisteten Personen nicht mehr."
 
 #. TRANS: Exception thrown when subscription to remote list fails.
-#, fuzzy
 msgid "Failed subscribing to remote list."
 msgstr "Fehler beim Beitreten der Remotegruppe."
 
 #. TRANS: Title for unfollowing a remote list.
-#, fuzzy
 msgid "Unfollow list"
-msgstr "Nicht mehr beachten"
+msgstr "Liste nicht länger verfolgen"
 
 #. TRANS: Success message for remote list unfollow through OStatus.
-#. TRANS: %1$s is the subscriber name, %2$s is the list, %3$s is the tagger's name.
-#, fuzzy, php-format
+#. TRANS: %1$s is the subscriber name, %2$s is the list, %3$s is the lister's name.
+#, php-format
 msgid "%1$s stopped following the list %2$s by %3$s."
-msgstr "%1$s folgt %2$s nicht mehr."
+msgstr "%1$s folgt %2$s von %3$s nicht länger."
 
 #. TRANS: Title for listing a remote profile.
 msgctxt "TITLE"
 msgid "List"
-msgstr ""
+msgstr "Liste"
 
 #. TRANS: Success message for remote list addition through OStatus.
 #. TRANS: %1$s is the list creator's name, %2$s is the added list member, %3$s is the list name.
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s listed %2$s in the list %3$s."
-msgstr "%1$s folgt %2$s nicht mehr."
+msgstr "%1$s folgt %2$s der Liste %3$s nicht länger."
 
 #. TRANS: Exception thrown when subscribing to a remote list fails.
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "Could not complete subscription to remote profile's feed. List %s could not "
 "be saved."
 msgstr ""
-"Konnte Abonnement für den Feed des entfernt liegenden Profils nicht "
-"vollenden. Tag %s konnte nicht gespeichert werden."
+"Konnte Abonnement für den Feed des Remoteprofils nicht vollenden. Tag %s "
+"konnte nicht gespeichert werden."
 
 #. TRANS: Title for unlisting a remote profile.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Unlist"
-msgstr "Nicht mehr beachten"
+msgstr "Ablisten"
 
 #. TRANS: Success message for remote list removal through OStatus.
 #. TRANS: %1$s is the list creator's name, %2$s is the removed list member, %3$s is the list name.
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s removed %2$s from the list %3$s."
-msgstr "%1$s folgt %2$s nicht mehr."
+msgstr "%1$s entfernte %2$s aus der Liste %3$s."
 
 #. TRANS: Title for unliking a remote notice.
 msgid "Unlike"
-msgstr ""
+msgstr "Mags nicht"
 
 #. TRANS: Success message for remove a favorite notice through OStatus.
 #. TRANS: %1$s is the unfavoring user's name, %2$s is URI to the no longer favored notice.
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s no longer likes %2$s."
-msgstr "%1$s folgt %2$s nicht mehr."
+msgstr "%1$s mag %2$s nicht mehr."
 
 #. TRANS: Link text for link to remote subscribe.
 msgid "Remote"
@@ -213,9 +209,9 @@ msgstr "Profil aktualisieren"
 msgid "%s has updated their profile page."
 msgstr "%s hat die Profil-Seite aktualisiert."
 
-#. TRANS: Link text for a user to tag an OStatus user.
-msgid "Tag"
-msgstr "Tag"
+#. TRANS: Link text for a user to list an OStatus user.
+msgid "List"
+msgstr "Liste"
 
 #. TRANS: Plugin description.
 msgid ""
@@ -260,19 +256,19 @@ msgid "Invalid hub.secret \"%s\". It must be under 200 bytes."
 msgstr "Ungültiges hub.secret „%s“. Es muss kleiner als 200 Bytes sein."
 
 #. TRANS: Client exception. %s is a feed URL.
-#, fuzzy, php-format
+#, php-format
 msgid "Invalid hub.topic \"%s\". User does not exist."
 msgstr "Ungültiges hub.topic „%s“. Benutzer existiert nicht."
 
 #. TRANS: Client exception. %s is a feed URL.
-#, fuzzy, php-format
+#, php-format
 msgid "Invalid hub.topic \"%s\". Group does not exist."
 msgstr "Ungültiges hub.topic „%s“. Gruppe existiert nicht."
 
 #. TRANS: Client exception. %s is a feed URL.
-#, fuzzy, php-format
+#, php-format
 msgid "Invalid hub.topic %s; list does not exist."
-msgstr "Ungültiges hub.topic „%s“. Gruppe existiert nicht."
+msgstr "Ungültiges hub.topic „%s“; Liste existiert nicht."
 
 #. TRANS: Client exception.
 #. TRANS: %1$s is this argument to the method this exception occurs in, %2$s is a URL.
@@ -280,18 +276,16 @@ msgstr "Ungültiges hub.topic „%s“. Gruppe existiert nicht."
 msgid "Invalid URL passed for %1$s: \"%2$s\""
 msgstr "Ungültiger URL für %1$s übergeben: „%2$s“"
 
-#. TRANS: Client error displayed when trying to tag a local object as if it is remote.
-#, fuzzy
-msgid "You can use the local tagging!"
-msgstr "Du kannst ein lokales Abonnement erstellen!"
+#. TRANS: Client error displayed when trying to list a local object as if it is remote.
+msgid "You can use the local list functionality!"
+msgstr "Du kannst die Lokale-Listen-Funktionalität nutzen!"
 
-#. TRANS: Header for tagging a remote object. %s is a remote object's name.
+#. TRANS: Header for listing a remote object. %s is a remote object's name.
 #, php-format
-msgid "Tag %s"
-msgstr "Tag %s"
+msgid "List %s"
+msgstr "Liste %s"
 
-#. TRANS: Button text to tag a remote object.
-#, fuzzy
+#. TRANS: Button text to list a remote object.
 msgctxt "BUTTON"
 msgid "Go"
 msgstr "Ausführen"
@@ -301,35 +295,30 @@ msgid "User nickname"
 msgstr "Benutzername"
 
 #. TRANS: Field title.
-#, fuzzy
-msgid "Nickname of the user you want to tag."
-msgstr "Name des Benutzers, dem du folgen möchtest"
+msgid "Nickname of the user you want to list."
+msgstr "Name des Benutzers, dem du folgen möchtest."
 
 #. TRANS: Field label.
 msgid "Profile Account"
 msgstr "Profil-Konto"
 
 #. TRANS: Field title.
-#, fuzzy
-msgid "Your account id (i.e. user@identi.ca)."
+msgid "Your account id (for example user@identi.ca)."
 msgstr "Deine Konto-ID (z.B. user@identi.ca)."
 
 #. TRANS: Client error displayed when remote profile could not be looked up.
 #. TRANS: Client error.
-#, fuzzy
 msgid "Could not look up OStatus account profile."
-msgstr "Konnte OStatus-Konto-Profil nicht nachschauen."
+msgstr "Konnte OStatus-Konto-Profil nicht einsehen."
 
 #. TRANS: Client error displayed when remote profile address could not be confirmed.
 #. TRANS: Client error.
-#, fuzzy
 msgid "Could not confirm remote profile address."
 msgstr "Konnte Remoteprofiladresse nicht bestätigen."
 
 #. TRANS: Title for an OStatus list.
-#, fuzzy
 msgid "OStatus list"
-msgstr "OStatus-Verbindung"
+msgstr "OStatus-Liste"
 
 #. TRANS: Server exception thrown when referring to a non-existing or empty feed.
 msgid "Empty or invalid feed id."
@@ -393,6 +382,7 @@ msgstr "Bestätigen"
 msgid "Subscribe to this user"
 msgstr "Abonniere diesen Benutzer"
 
+#. TRANS: Extra paragraph in remote profile view when already subscribed.
 msgid "You are already subscribed to this user."
 msgstr "Du hast diesen Benutzer bereits abonniert:"
 
@@ -437,7 +427,8 @@ msgstr ""
 msgid "Join group"
 msgstr "Gruppe beitreten"
 
-#. TRANS: Tooltip for field label "Join group".
+#. TRANS: Tooltip for field label "Join group". Do not translate the "example.net"
+#. TRANS: domain name in the URL, as it is an official standard domain name for examples.
 msgid "OStatus group's address, like http://example.net/group/nickname."
 msgstr ""
 "OStatus-Adresse der Gruppe. Beispiel: http://example.net/group/nickname."
@@ -474,7 +465,6 @@ msgstr "Keine ID"
 
 #. TRANS: Client exception thrown when an undefied activity is performed.
 #. TRANS: Client exception.
-#, fuzzy
 msgid "Cannot handle that kind of post."
 msgstr "Kann diese Art von Post nicht verarbeiten."
 
@@ -490,16 +480,15 @@ msgstr ""
 
 #. TRANS: Client exception.
 msgid "To the attention of user(s), not including this one."
-msgstr ""
+msgstr "Zur Aufmerksamkeit der Benutzer, diesen ausgeschlossen."
 
 #. TRANS: Client exception.
 msgid "Not to anyone in reply to anything."
-msgstr ""
+msgstr "An niemanden als Antwort auf irgendetwas."
 
 #. TRANS: Client exception.
-#, fuzzy
 msgid "This is already a favorite."
-msgstr "Dieses Ziel versteht keine Favoriten."
+msgstr "Dies ist bereits ein Favorit."
 
 #. TRANS: Client exception.
 msgid "Could not save new favorite."
@@ -511,41 +500,39 @@ msgstr "Notiz wurde nicht favorisiert!"
 
 #. TRANS: Client exception.
 msgid "Not a person object."
-msgstr ""
+msgstr "Kein Personen-Objekt."
 
 #. TRANS: Client exception.
-msgid "Unidentified profile being tagged."
-msgstr ""
+msgid "Unidentified profile being listed."
+msgstr "Unidentifiziertes Profil wird gelistet."
 
 #. TRANS: Client exception.
-msgid "This user is not the one being tagged."
-msgstr ""
+msgid "This user is not the one being listed."
+msgstr "Dieser Benutzer ist nicht der Aufgelistete."
 
 #. TRANS: Client exception.
-msgid "The tag could not be saved."
-msgstr ""
+msgid "The listing could not be saved."
+msgstr "Das Objekt konnte nicht gespeichert werden."
 
 #. TRANS: Client exception.
-msgid "Unidentified profile being untagged."
-msgstr ""
+msgid "Unidentified profile being unlisted."
+msgstr "Unidentifiziertes Profil wird abgelistet."
 
 #. TRANS: Client exception.
-msgid "This user is not the one being untagged."
-msgstr ""
+msgid "This user is not the one being unlisted."
+msgstr "Dieser Benutzer ist nicht der Abgelistete."
 
 #. TRANS: Client exception.
-msgid "The tag could not be deleted."
-msgstr ""
+msgid "The listing could not be deleted."
+msgstr "Das Listen konnte nicht gelöscht werden."
 
 #. TRANS: Client exception.
-#, fuzzy
 msgid "Cannot favorite/unfavorite without an object."
 msgstr "Kann nicht ohne Objekt (ent)favorisieren."
 
 #. TRANS: Client exception.
-#, fuzzy
 msgid "Cannot handle that kind of object for liking/faving."
-msgstr "Kann diese Art von Objekt nicht für mögen/favorisieren verarbeiten."
+msgstr "Kann diese Art von Objekt nicht zum Mögen/Favorisieren verarbeiten."
 
 #. TRANS: Client exception. %s is an object ID.
 #, php-format
@@ -558,54 +545,45 @@ msgid "Notice with ID %1$s not posted by %2$s."
 msgstr "Nachricht mit ID %1$s wurde nicht von %2$s geschrieben."
 
 #. TRANS: Field label.
-#, fuzzy
 msgid "Subscribe to list"
-msgstr "Abonniere %s"
+msgstr "Liste abonnieren"
 
 #. TRANS: Field title.
-#, fuzzy
 msgid "Address of the OStatus list, like http://example.net/user/all/tag."
-msgstr ""
-"OStatus-Adresse der Gruppe. Beispiel: http://example.net/group/nickname."
+msgstr "Adresse der OStatus-Liste, etwa http://example.net/user/all/tag."
 
 #. TRANS: Error text displayed when trying to subscribe to a list already a subscriber to.
-#, fuzzy
 msgid "You are already subscribed to this list."
-msgstr "Du hast diesen Benutzer bereits abonniert:"
+msgstr "Du hast diese Liste bereits abonniert."
 
 #. TRANS: Page title for OStatus remote list subscription form
-#, fuzzy
 msgid "Confirm subscription to remote list"
-msgstr "Bestätige das Beitreten einer Remotegruppe"
+msgstr "Das Abonnement einer entfernten Liste bestätigen"
 
 #. TRANS: Instructions for OStatus list subscription form.
-#, fuzzy
 msgid ""
 "You can subscribe to lists from other supported sites. Paste the list's URI "
 "below:"
 msgstr ""
-"Du kannst Gruppen von anderen unterstützten Websites abonnieren. Füge die "
-"URI der Gruppe unten ein:"
+"Du kannst Listen von anderen unterstützten Websites abonnieren. Füge die URI "
+"der Liste unten ein:"
 
 #. TRANS: Client error.
 msgid "No such group."
 msgstr "Keine derartige Gruppe."
 
 #. TRANS: Client error.
-#, fuzzy
 msgid "Cannot accept remote posts for a remote group."
 msgstr "Kann Remoteposts für Remotegruppen nicht akzeptieren."
 
 #. TRANS: Client error.
-#, fuzzy
 msgid "Cannot read profile to set up group membership."
-msgstr "Kann Profil nicht lesen, um die Gruppenmitgliedschaft einzurichten."
+msgstr "Kann Profil nicht lesen um die Gruppenmitgliedschaft einzurichten."
 
 #. TRANS: Client error.
 #. TRANS: Client error displayed when trying to have a group join another group.
-#, fuzzy
 msgid "Groups cannot join groups."
-msgstr "Gruppen können Remotegruppen nicht beitreten."
+msgstr "Gruppen können Gruppen nicht beitreten."
 
 #. TRANS: Client error displayed when trying to join a group the user is blocked from by a group admin.
 msgid "You have been blocked from that group by the admin."
@@ -618,7 +596,6 @@ msgstr "Konnte Remotebenutzer %1$s nicht der Gruppe %2$s hinzufügen."
 
 #. TRANS: Client error displayed when group membership cannot be cancelled
 #. TRANS: because the remote profile could not be read.
-#, fuzzy
 msgid "Cannot read profile to cancel group membership."
 msgstr "Kann Profil nicht lesen, um die Gruppenmitgliedschaft zu kündigen."
 
@@ -629,52 +606,46 @@ msgstr "Konnte Remotebenutzer %1$s nicht aus der Gruppe %2$s entfernen."
 
 #. TRANS: Client error displayed when referring to a non-existing list.
 #. TRANS: Client error.
-#, fuzzy
 msgid "No such list."
-msgstr "Unbekannter Benutzer."
+msgstr "Liste nicht gefunden."
 
 #. TRANS: Client error displayed when trying to send a message to a remote list.
-#, fuzzy
 msgid "Cannot accept remote posts for a remote list."
-msgstr "Kann Remoteposts für Remotegruppen nicht akzeptieren."
+msgstr "Kann Remoteposts für Remotelisten nicht akzeptieren."
 
 #. TRANS: Client error displayed when referring to a non-existing remote list.
-#, fuzzy
 msgid "Cannot read profile to set up list subscription."
-msgstr "Kann Profil nicht lesen, um die Gruppenmitgliedschaft einzurichten."
+msgstr "Kann Profil nicht lesen, um das Listenabonnement einzurichten."
 
 #. TRANS: Client error displayed when trying to subscribe a group to a list.
 #. TRANS: Client error displayed when trying to unsubscribe a group from a list.
-#, fuzzy
 msgid "Groups cannot subscribe to lists."
-msgstr "Gruppen können Remotegruppen nicht beitreten."
+msgstr "Gruppen können Listen nicht abonnieren."
 
 #. TRANS: Server error displayed when subscribing a remote user to a list fails.
 #. TRANS: %1$s is a profile URI, %2$s is a list name.
-#, fuzzy, php-format
+#, php-format
 msgid "Could not subscribe remote user %1$s to list %2$s."
-msgstr "Konnte Remotebenutzer %1$s nicht der Gruppe %2$s hinzufügen."
+msgstr "Konnte Remotebenutzer %1$s nicht zur Liste %2$s einschreiben."
 
 #. TRANS: Client error displayed when trying to unsubscribe from non-existing list.
-#, fuzzy
 msgid "Cannot read profile to cancel list subscription."
-msgstr "Kann Profil nicht lesen, um die Gruppenmitgliedschaft zu kündigen."
+msgstr "Kann Profil nicht lesen, um das Listenabonnement zu kündigen."
 
 #. TRANS: Client error displayed when trying to unsubscribe a remote user from a list fails.
 #. TRANS: %1$s is a profile URL, %2$s is a list name.
-#, fuzzy, php-format
+#, php-format
 msgid "Could not unsubscribe remote user %1$s from list %2$s."
-msgstr "Konnte Remotebenutzer %1$s nicht der Gruppe %2$s hinzufügen."
+msgstr "Konnte Remotebenutzer %1$s nicht aus der Liste %2$s austragen."
 
 #. TRANS: Client error.
 msgid "You can use the local subscription!"
 msgstr "Du kannst ein lokales Abonnement erstellen!"
 
 #. TRANS: Form title.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Subscribe to user"
-msgstr "Abonniere diesen Benutzer"
+msgstr "Benutzer abonnieren"
 
 #. TRANS: Form legend. %s is a group name.
 #, php-format
@@ -686,10 +657,10 @@ msgctxt "BUTTON"
 msgid "Join"
 msgstr "Beitreten"
 
-#. TRANS: Form legend. %1$s is a list, %2$s is a tagger's name.
-#, fuzzy, php-format
+#. TRANS: Form legend. %1$s is a list, %2$s is a lister's name.
+#, php-format
 msgid "Subscribe to list %1$s by %2$s"
-msgstr "Abonniere %s"
+msgstr "Abonnement der Liste %1$s von %2$s"
 
 #. TRANS: Button text to subscribe to a list.
 #. TRANS: Button text to subscribe to a profile.
@@ -715,9 +686,8 @@ msgid "Nickname of the user you want to follow."
 msgstr "Name des Benutzers, dem du folgen möchtest"
 
 #. TRANS: Tooltip for field label "Profile Account".
-#, fuzzy
 msgid "Your account ID (e.g. user@identi.ca)."
-msgstr "Deine Konto-ID (z.B. user@identi.ca)."
+msgstr "Deine Account-ID (z.B. user@identi.ca)."
 
 #. TRANS: Client error.
 msgid "Must provide a remote profile."
@@ -731,6 +701,37 @@ msgstr "Kein lokaler Benutzer- oder Gruppenname angegeben."
 msgid "OStatus Connect"
 msgstr "OStatus-Verbindung"
 
+#. TRANS: Server exception. %s is a URL.
+#, php-format
+msgid "Invalid avatar URL %s."
+msgstr "Ungültiger Avatar-URL %s."
+
+#. TRANS: Server exception. %s is a URI.
+#, php-format
+msgid "Tried to update avatar for unsaved remote profile %s."
+msgstr ""
+"Versuchte den Avatar für ein ungespeichertes Remoteprofil %s zu "
+"aktualisieren."
+
+#. TRANS: Server exception. %s is a URL.
+#, php-format
+msgid "Unable to fetch avatar from %s."
+msgstr "Kann den Avatar von %s nicht abrufen."
+
+#. TRANS: Exception. %s is a URL.
+#, php-format
+msgid "Could not find a feed URL for profile page %s."
+msgstr "Konnte keinen Feed-URL für die Profilseite %s finden."
+
+#. TRANS: Exception.
+msgid "Not a valid webfinger address."
+msgstr "Ungültige Webfinger-Adresse."
+
+#. TRANS: Exception. %s is a webfinger address.
+#, php-format
+msgid "Could not find a valid profile for \"%s\"."
+msgstr "Konnte kein gültiges Profil für „%s“ finden."
+
 #. TRANS: Server exception.
 msgid "Attempting to start PuSH subscription for feed with no hub."
 msgstr ""
@@ -742,18 +743,14 @@ msgstr ""
 "Es wird versucht, ein PuSH-Abonnemont für einen Feed ohne Hub zu beenden."
 
 #. TRANS: Server exception. %s is a URI
-#, fuzzy, php-format
+#, php-format
 msgid "Invalid ostatus_profile state: Two or more IDs set for %s."
-msgstr ""
-"Ungültiger ostatus_profile-Zustand: Sowohl Gruppen- als auch Profil-ID für %"
-"s gesetzt."
+msgstr "Ungültiger ostatus_profile-Zustand: Mehrere IDs für %s gesetzt."
 
 #. TRANS: Server exception. %s is a URI
-#, fuzzy, php-format
+#, php-format
 msgid "Invalid ostatus_profile state: All IDs empty for %s."
-msgstr ""
-"Ungültiger ostatus_profile-Zustand: Sowohl Gruppen- als auch Profil-ID für %"
-"s sind leer."
+msgstr "Ungültiger ostatus_profile-Zustand: Alle IDs für %s sind leer."
 
 #. TRANS: Server exception.
 #. TRANS: %1$s is the method name the exception occured in, %2$s is the actor type.
@@ -777,6 +774,20 @@ msgstr "Unbekanntes Feed-Format."
 msgid "RSS feed without a channel."
 msgstr "RSS-Feed ohne einen Kanal."
 
+#. TRANS: Client exception thrown when trying to share multiple activities at once.
+msgid "Can only handle share activities with exactly one object."
+msgstr "Kann nur Teilen-Aktivitäten mit genau einem Objekt verarbeiten."
+
+#. TRANS: Client exception thrown when trying to share a non-activity object.
+msgid "Can only handle shared activities."
+msgstr "Kann nur Teilen von Aktivitäten bearbeiten."
+
+#. TRANS: Client exception thrown when saving an activity share fails.
+#. TRANS: %s is a share ID.
+#, php-format
+msgid "Failed to save activity %s."
+msgstr "Speichern der Aktivität %s gescheitert."
+
 #. TRANS: Client exception. %s is a source URI.
 #, php-format
 msgid "No content for notice %s."
@@ -792,91 +803,52 @@ msgstr "Mehr anzeigen"
 msgid "Could not reach profile page %s."
 msgstr "Konnte Profilseite %s nicht erreichen."
 
-#. TRANS: Exception. %s is a URL.
-#, php-format
-msgid "Could not find a feed URL for profile page %s."
-msgstr "Konnte keinen Feed-URL für die Profilseite %s finden."
-
 #. TRANS: Feed sub exception.
-#, fuzzy
 msgid "Cannot find enough profile information to make a feed."
 msgstr ""
 "Kann nicht genug Profilinformationen finden, um einen Feed zu erstellen."
 
-#. TRANS: Server exception. %s is a URL.
-#, php-format
-msgid "Invalid avatar URL %s."
-msgstr "Ungültiger Avatar-URL %s."
-
-#. TRANS: Server exception. %s is a URI.
-#, php-format
-msgid "Tried to update avatar for unsaved remote profile %s."
-msgstr ""
-"Versuchte den Avatar für ein ungespeichertes Remoteprofil %s zu "
-"aktualisieren."
-
-#. TRANS: Server exception. %s is a URL.
-#, php-format
-msgid "Unable to fetch avatar from %s."
-msgstr "Kann den Avatar von %s nicht abrufen."
-
 #. TRANS: Server exception.
 msgid "No author ID URI found."
 msgstr "Keine Autoren-ID-URI gefunden."
 
 #. TRANS: Exception.
-#, fuzzy
 msgid "No profile URI."
-msgstr "Beitritt in Remote-Gruppe fehlgeschlagen!"
+msgstr "Kein Profil-URI."
 
 #. TRANS: Exception.
-#, fuzzy
 msgid "Local user cannot be referenced as remote."
-msgstr "Lokaler Benutzer kann nicht als remote verwiesen werden."
+msgstr "Lokaler Benutzer kann nicht als entfernt referenziert werden."
 
 #. TRANS: Exception.
-#, fuzzy
 msgid "Local group cannot be referenced as remote."
-msgstr "Lokale Gruppe kann nicht als remote verwiesen werden."
+msgstr "Lokale Gruppe kann nicht als entfernt referenziert werden."
 
 #. TRANS: Exception.
-#, fuzzy
 msgid "Local list cannot be referenced as remote."
-msgstr "Lokaler Benutzer kann nicht als remote verwiesen werden."
+msgstr "Lokale Liste kann nicht als entfernt referenziert werden."
 
 #. TRANS: Server exception.
-#, fuzzy
 msgid "Cannot save local profile."
 msgstr "Lokales Profil kann nicht gespeichert werden."
 
 #. TRANS: Server exception.
-#, fuzzy
 msgid "Cannot save local list."
-msgstr "Lokales Profil kann nicht gespeichert werden."
+msgstr "Lokale Liste kann nicht gespeichert werden."
 
 #. TRANS: Server exception.
-#, fuzzy
 msgid "Cannot save OStatus profile."
 msgstr "OStatus-Profil kann nicht gespeichert werden."
 
-#. TRANS: Exception.
-msgid "Not a valid webfinger address."
-msgstr "Ungültige Webfinger-Adresse."
-
 #. TRANS: Exception. %s is a webfinger address.
-#, fuzzy, php-format
+#, php-format
 msgid "Could not save profile for \"%s\"."
 msgstr "Profil für „%s“ konnte nicht gespeichert werden."
 
 #. TRANS: Exception. %s is a webfinger address.
-#, fuzzy, php-format
+#, php-format
 msgid "Could not save OStatus profile for \"%s\"."
-msgstr "Ostatus_profile für „%s“ konnte nicht gespeichert werden."
-
-#. TRANS: Exception. %s is a webfinger address.
-#, fuzzy, php-format
-msgid "Could not find a valid profile for \"%s\"."
-msgstr "Es konnte kein gültiges Profil für „%s“ gefunden werden."
+msgstr "Ostatus-Profil für „%s“ konnte nicht gespeichert werden."
 
 #. TRANS: Server exception.
 msgid "Could not store HTML content of long post as file."
@@ -934,84 +906,45 @@ msgid "Unrecognized activity type."
 msgstr "Unbekannter Aktivitätstyp."
 
 #. TRANS: Client exception.
-#, fuzzy
 msgid "This target does not understand posts."
 msgstr "Dieses Ziel versteht keine Posts."
 
 #. TRANS: Client exception.
-#, fuzzy
 msgid "This target does not understand follows."
 msgstr "Dieses Ziel versteht keine Follows."
 
 #. TRANS: Client exception.
-#, fuzzy
 msgid "This target does not understand unfollows."
 msgstr "Dieses Ziel versteht keine Unfollows."
 
 #. TRANS: Client exception.
-#, fuzzy
 msgid "This target does not understand favorites."
 msgstr "Dieses Ziel versteht keine Favoriten."
 
 #. TRANS: Client exception.
-#, fuzzy
 msgid "This target does not understand unfavorites."
 msgstr "Dieses Ziel versteht keine Unfavorites."
 
 #. TRANS: Client exception.
-#, fuzzy
 msgid "This target does not understand share events."
 msgstr "Dieses Ziel versteht das Teilen von Events nicht."
 
 #. TRANS: Client exception.
-#, fuzzy
 msgid "This target does not understand joins."
 msgstr "Dieses Ziel versteht keine Joins."
 
 #. TRANS: Client exception.
-#, fuzzy
 msgid "This target does not understand leave events."
 msgstr "Dieses Ziel versteht das Verlassen von Events nicht."
 
 #. TRANS: Client exception.
-#, fuzzy
-msgid "This target does not understand tag events."
-msgstr "Dieses Ziel versteht das Teilen von Events nicht."
+msgid "This target does not understand list events."
+msgstr "Dieses Ziel versteht keine Listen-Ereignisse."
 
 #. TRANS: Client exception.
-#, fuzzy
-msgid "This target does not understand untag events."
-msgstr "Dieses Ziel versteht das Teilen von Events nicht."
+msgid "This target does not understand unlist events."
+msgstr "Dieses Ziel versteht keine Ablisten-Ereignisse."
 
 #. TRANS: Exception.
 msgid "Received a salmon slap from unidentified actor."
 msgstr "Einen Salmon-Slap von einem unidentifizierten Aktor empfangen."
-
-#~ msgctxt "TITLE"
-#~ msgid "Tag"
-#~ msgstr "Tag"
-
-#~ msgctxt "TITLE"
-#~ msgid "Untag"
-#~ msgstr "Enttaggen"
-
-#~ msgid "Disfavor"
-#~ msgstr "Aus den Favoriten entfernen"
-
-#~ msgid "%1$s marked notice %2$s as no longer a favorite."
-#~ msgstr "%1$s markierte Nachricht %2$s nicht mehr als Favorit."
-
-#~ msgid ""
-#~ "OStatus user's address, like nickname@example.com or http://example.net/"
-#~ "nickname"
-#~ msgstr ""
-#~ "Adresse des OStatus-Benutzers, wie nickname@example.com oder http://"
-#~ "example.net/nickname"
-
-#, fuzzy
-#~ msgid "Continue"
-#~ msgstr "Weiter"
-
-#, fuzzy
-#~ msgid "Could not remove remote user %1$s from list %2$s."
-#~ msgstr "Konnte Remotebenutzer %1$s nicht aus der Gruppe %2$s entfernen."
diff --git a/plugins/OStatus/locale/es/LC_MESSAGES/OStatus.po b/plugins/OStatus/locale/es/LC_MESSAGES/OStatus.po
new file mode 100644
index 0000000000..6629e1450e
--- /dev/null
+++ b/plugins/OStatus/locale/es/LC_MESSAGES/OStatus.po
@@ -0,0 +1,963 @@
+# Translation of StatusNet - OStatus to Spanish (español)
+# Exported from translatewiki.net
+#
+# Author: Armando-Martin
+# Author: Peter17
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - OStatus\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:31+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-12-03 13:49:04+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: String in the gettext speed test script. Unimportant.
+msgid "Feeds"
+msgstr "Fuentes web (feeds)"
+
+#. TRANS: Link to subscribe to a remote entity.
+#. TRANS: Link text for a user to subscribe to an OStatus user.
+msgid "Subscribe"
+msgstr "Suscribir"
+
+#. TRANS: Fieldset legend.
+msgid "List remote profile"
+msgstr "Listar un perfil remoto"
+
+#. TRANS: Field label.
+msgctxt "LABEL"
+msgid "Remote profile"
+msgstr "Perfil remoto"
+
+#. TRANS: Field title.
+#. TRANS: Tooltip for field label "Subscribe to".
+msgid ""
+"OStatus user's address, like nickname@example.com or http://example.net/"
+"nickname."
+msgstr ""
+"Dirección del usuario de OStatus, como nickname@example.com o http://example."
+"net/nickname."
+
+#. TRANS: Button text to fetch remote profile.
+msgctxt "BUTTON"
+msgid "Fetch"
+msgstr "Mostrar"
+
+#. TRANS: Exception in OStatus when invalid URI was entered.
+msgid "Invalid URI."
+msgstr "La dirección URI no es válida"
+
+#. TRANS: Error message in OStatus plugin. Do not translate the domain names example.com
+#. TRANS: and example.net, as these are official standard domain names for use in examples.
+msgid ""
+"Sorry, we could not reach that address. Please make sure that the OStatus "
+"address is like nickname@example.com or http://example.net/nickname."
+msgstr ""
+"Lo sentimos, no pudimos llegar a esa dirección. Por favor, asegúrese de que "
+"la dirección de OStatus es del tipo nickname@example.com o http://example."
+"net/nickname."
+
+#. TRANS: Title. %s is a domain name.
+#, php-format
+msgid "Sent from %s via OStatus"
+msgstr "Enviado desde %s a través de OStatus"
+
+#. TRANS: Exception thrown when setup of remote subscription fails.
+msgid "Could not set up remote subscription."
+msgstr "No se pudo configurar la suscripción remota."
+
+#. TRANS: Title for unfollowing a remote profile.
+msgctxt "TITLE"
+msgid "Unfollow"
+msgstr "Dejar de seguir"
+
+#. TRANS: Success message for unsubscribe from user attempt through OStatus.
+#. TRANS: %1$s is the unsubscriber's name, %2$s is the unsubscribed user's name.
+#, php-format
+msgid "%1$s stopped following %2$s."
+msgstr "%1$s dejó de seguir a %2$s."
+
+#. TRANS: Exception thrown when setup of remote group membership fails.
+msgid "Could not set up remote group membership."
+msgstr "No se pudo establecer la pertenencia al grupo remoto."
+
+#. TRANS: Title for joining a remote groep.
+msgctxt "TITLE"
+msgid "Join"
+msgstr "Unirse"
+
+#. TRANS: Success message for subscribe to group attempt through OStatus.
+#. TRANS: %1$s is the member name, %2$s is the subscribed group's name.
+#, php-format
+msgid "%1$s has joined group %2$s."
+msgstr "%1$s se ha unido al grupo %2$s."
+
+#. TRANS: Exception thrown when joining a remote group fails.
+msgid "Failed joining remote group."
+msgstr "No pudo unirse a grupo remoto."
+
+#. TRANS: Title for leaving a remote group.
+msgctxt "TITLE"
+msgid "Leave"
+msgstr "Dejar"
+
+#. TRANS: Success message for unsubscribe from group attempt through OStatus.
+#. TRANS: %1$s is the member name, %2$s is the unsubscribed group's name.
+#, php-format
+msgid "%1$s has left group %2$s."
+msgstr "%1$s ha dejado el grupo %2$s."
+
+#. TRANS: Exception thrown when setup of remote list subscription fails.
+msgid "Could not set up remote list subscription."
+msgstr "No se pudo configurar la suscripción a lista remota."
+
+#. TRANS: Title for following a remote list.
+msgctxt "TITLE"
+msgid "Follow list"
+msgstr "Seguir la lista"
+
+#. TRANS: Success message for remote list follow through OStatus.
+#. TRANS: %1$s is the subscriber name, %2$s is the list, %3$s is the lister's name.
+#, php-format
+msgid "%1$s is now following people listed in %2$s by %3$s."
+msgstr "%1$s está siguiendo a personas de la lista %2$s de %3$s."
+
+#. TRANS: Exception thrown when subscription to remote list fails.
+msgid "Failed subscribing to remote list."
+msgstr "Error al suscribirse a la lista remota."
+
+#. TRANS: Title for unfollowing a remote list.
+msgid "Unfollow list"
+msgstr "Dejar de seguir la lista"
+
+#. TRANS: Success message for remote list unfollow through OStatus.
+#. TRANS: %1$s is the subscriber name, %2$s is the list, %3$s is the lister's name.
+#, php-format
+msgid "%1$s stopped following the list %2$s by %3$s."
+msgstr "%1$s ha dejado de seguir la lista %2$s de %3$s."
+
+#. TRANS: Title for listing a remote profile.
+msgctxt "TITLE"
+msgid "List"
+msgstr "Lista"
+
+#. TRANS: Success message for remote list addition through OStatus.
+#. TRANS: %1$s is the list creator's name, %2$s is the added list member, %3$s is the list name.
+#, php-format
+msgid "%1$s listed %2$s in the list %3$s."
+msgstr "%1$s ha incluido a %2$s en la lista %3$s."
+
+#. TRANS: Exception thrown when subscribing to a remote list fails.
+#, php-format
+msgid ""
+"Could not complete subscription to remote profile's feed. List %s could not "
+"be saved."
+msgstr ""
+"No se pudo completar la suscripción a la fuente web (feed) del perfil "
+"remoto. La lista %s no se pudo guardar."
+
+#. TRANS: Title for unlisting a remote profile.
+msgctxt "TITLE"
+msgid "Unlist"
+msgstr "Retirar de la lista"
+
+#. TRANS: Success message for remote list removal through OStatus.
+#. TRANS: %1$s is the list creator's name, %2$s is the removed list member, %3$s is the list name.
+#, php-format
+msgid "%1$s removed %2$s from the list %3$s."
+msgstr "%1$s ha eliminado a %2$s de la lista %3$s."
+
+#. TRANS: Title for unliking a remote notice.
+msgid "Unlike"
+msgstr "Dejar de gustar"
+
+#. TRANS: Success message for remove a favorite notice through OStatus.
+#. TRANS: %1$s is the unfavoring user's name, %2$s is URI to the no longer favored notice.
+#, php-format
+msgid "%1$s no longer likes %2$s."
+msgstr "A %1$s ya no le gusta %2$s."
+
+#. TRANS: Link text for link to remote subscribe.
+msgid "Remote"
+msgstr "Remoto"
+
+#. TRANS: Title for activity.
+msgid "Profile update"
+msgstr "Actualización de perfil"
+
+#. TRANS: Ping text for remote profile update through OStatus.
+#. TRANS: %s is user that updated their profile.
+#, php-format
+msgid "%s has updated their profile page."
+msgstr "%s ha actualizado su perfil."
+
+#. TRANS: Link text for a user to list an OStatus user.
+msgid "List"
+msgstr "Lista"
+
+#. TRANS: Plugin description.
+msgid ""
+"Follow people across social networks that implement <a href=\"http://ostatus."
+"org/\">OStatus</a>."
+msgstr ""
+"Seguir a personas a través de las redes sociales que integren <a href="
+"\"http://ostatus.org/\">OStatus</a>."
+
+#. TRANS: Client exception.
+msgid "Publishing outside feeds not supported."
+msgstr "No está soportada la publicación fuera de las fuentes web (feeds)."
+
+#. TRANS: Client exception. %s is a mode.
+#, php-format
+msgid "Unrecognized mode \"%s\"."
+msgstr "Modo no reconocido \"%s\"."
+
+#. TRANS: Client exception. %s is a topic.
+#, php-format
+msgid ""
+"Unsupported hub.topic %s this hub only serves local user and group Atom "
+"feeds."
+msgstr ""
+"No se admite %s como tema del concentrador (hub.topic).  Este concentrador "
+"sólo sirve a usuarios locales y al grupo de fuentes web Atom."
+
+#. TRANS: Client exception. %s is sync or async.
+#, php-format
+msgid "Invalid hub.verify \"%s\". It must be sync or async."
+msgstr ""
+"Verificación del concentrador (Hub.verify) no válido \"%s\". Debe ser \"sync"
+"\" o \"async\"."
+
+#. TRANS: Client exception. %s is the invalid lease value.
+#, php-format
+msgid "Invalid hub.lease \"%s\". It must be empty or positive integer."
+msgstr ""
+"Parámetro Hub.lease no válido \"%s\". Debe ser un entero positivo o estar "
+"vacío."
+
+#. TRANS: Client exception. %s is the invalid hub secret.
+#, php-format
+msgid "Invalid hub.secret \"%s\". It must be under 200 bytes."
+msgstr "Parámetro hub.secret no válido \"%s\". Debe tener menos de 200 bytes."
+
+#. TRANS: Client exception. %s is a feed URL.
+#, php-format
+msgid "Invalid hub.topic \"%s\". User does not exist."
+msgstr "Parámetro hub.topic no válido \"%s\". El usuario no existe."
+
+#. TRANS: Client exception. %s is a feed URL.
+#, php-format
+msgid "Invalid hub.topic \"%s\". Group does not exist."
+msgstr "Parámetro hub.topic no válido \"%s\". El grupo no existe."
+
+#. TRANS: Client exception. %s is a feed URL.
+#, php-format
+msgid "Invalid hub.topic %s; list does not exist."
+msgstr "Parámetro hub.topic no válido \"%s\". La lista no existe."
+
+#. TRANS: Client exception.
+#. TRANS: %1$s is this argument to the method this exception occurs in, %2$s is a URL.
+#, php-format
+msgid "Invalid URL passed for %1$s: \"%2$s\""
+msgstr "Dirección URL no válida pasasa a %1$s : \"%2$s\""
+
+#. TRANS: Client error displayed when trying to list a local object as if it is remote.
+msgid "You can use the local list functionality!"
+msgstr "¡Puede utilizar la funcionalidad de la lista local!"
+
+#. TRANS: Header for listing a remote object. %s is a remote object's name.
+#, php-format
+msgid "List %s"
+msgstr "Listar %s"
+
+#. TRANS: Button text to list a remote object.
+msgctxt "BUTTON"
+msgid "Go"
+msgstr "Ir"
+
+#. TRANS: Field label.
+msgid "User nickname"
+msgstr "Alias de usuario"
+
+#. TRANS: Field title.
+msgid "Nickname of the user you want to list."
+msgstr "Alias del usuario que desea que aparezca en la lista."
+
+#. TRANS: Field label.
+msgid "Profile Account"
+msgstr "Cuenta de perfil"
+
+#. TRANS: Field title.
+msgid "Your account id (for example user@identi.ca)."
+msgstr "Identificador de su cuenta (por ejemplo user@identi.ca)."
+
+#. TRANS: Client error displayed when remote profile could not be looked up.
+#. TRANS: Client error.
+msgid "Could not look up OStatus account profile."
+msgstr "No pudo consultar el perfil de cuenta de OStatus."
+
+#. TRANS: Client error displayed when remote profile address could not be confirmed.
+#. TRANS: Client error.
+msgid "Could not confirm remote profile address."
+msgstr "No se pudo confirmar la dirección de perfil remoto."
+
+#. TRANS: Title for an OStatus list.
+msgid "OStatus list"
+msgstr "Lista de OStatus"
+
+#. TRANS: Server exception thrown when referring to a non-existing or empty feed.
+msgid "Empty or invalid feed id."
+msgstr "Identificador de fuente web (feed) vacío o no válido."
+
+#. TRANS: Server exception. %s is a feed ID.
+#, php-format
+msgid "Unknown PuSH feed id %s"
+msgstr "Identificador de fuente web PuSH desconocido %s"
+
+#. TRANS: Client exception. %s is an invalid feed name.
+#, php-format
+msgid "Bad hub.topic feed \"%s\"."
+msgstr "Fuente web (feed) hub.topic incorrecto: \"%s\"."
+
+#. TRANS: Client exception. %1$s the invalid token, %2$s is the topic for which the invalid token was given.
+#, php-format
+msgid "Bad hub.verify_token %1$s for %2$s."
+msgstr "Clave hub.verify_token incorrecta %1$s para %2$s."
+
+#. TRANS: Client exception. %s is an invalid topic.
+#, php-format
+msgid "Unexpected subscribe request for %s."
+msgstr "Solicitud de suscripción inesperada para %s inválido."
+
+#. TRANS: Client exception. %s is an invalid topic.
+#, php-format
+msgid "Unexpected unsubscribe request for %s."
+msgstr "Solicitud de cancelación de suscripción inesperada para %s inválido."
+
+#. TRANS: Client error displayed when referring to a non-existing user.
+#. TRANS: Client error.
+msgid "No such user."
+msgstr "No existe ese usuario."
+
+#. TRANS: Field label for a field that takes an OStatus user address.
+msgid "Subscribe to"
+msgstr "Suscribirse a"
+
+#. TRANS: Button text.
+#. TRANS: Button text to continue joining a remote list.
+msgctxt "BUTTON"
+msgid "Continue"
+msgstr "Continuar"
+
+#. TRANS: Button text.
+msgid "Join"
+msgstr "Unirse"
+
+#. TRANS: Tooltip for button "Join".
+msgctxt "BUTTON"
+msgid "Join this group"
+msgstr "Unirse a este grupo"
+
+#. TRANS: Button text.
+msgctxt "BUTTON"
+msgid "Confirm"
+msgstr "Confirmar"
+
+#. TRANS: Tooltip for button "Confirm".
+msgid "Subscribe to this user"
+msgstr "Suscribirse a este usuario"
+
+#. TRANS: Extra paragraph in remote profile view when already subscribed.
+msgid "You are already subscribed to this user."
+msgstr "Ya estás suscrito a este usuario."
+
+#. TRANS: Error text.
+msgid ""
+"Sorry, we could not reach that feed. Please try that OStatus address again "
+"later."
+msgstr ""
+"Lo sentimos, no pudimos alcanzar esa fuente web (feed). Intente más tarde "
+"acceder de nuevo a esa dirección de OStatus."
+
+#. TRANS: OStatus remote subscription dialog error.
+#. TRANS: OStatus remote group subscription dialog error.
+msgid "Already subscribed!"
+msgstr "¡Ya está suscrito!"
+
+#. TRANS: OStatus remote subscription dialog error.
+msgid "Remote subscription failed!"
+msgstr "¡Error de suscripción remota!"
+
+#. TRANS: Client error displayed when the session token does not match or is not given.
+msgid "There was a problem with your session token. Try again, please."
+msgstr ""
+"Hubo un problema con su clave (token) de sesión. Inténtelo de nuevo, por "
+"favor."
+
+#. TRANS: Form title.
+msgid "Subscribe to user"
+msgstr "Suscribirse al usuario"
+
+#. TRANS: Page title for OStatus remote subscription form.
+msgid "Confirm"
+msgstr "Confirmar"
+
+#. TRANS: Instructions.
+msgid ""
+"You can subscribe to users from other supported sites. Paste their address "
+"or profile URI below:"
+msgstr ""
+"Puede suscribirse a usuarios de otros sitios compatibles. Pegue su dirección "
+"o perfil URI a continuación:"
+
+#. TRANS: Field label.
+msgid "Join group"
+msgstr "Unirse a grupo"
+
+#. TRANS: Tooltip for field label "Join group". Do not translate the "example.net"
+#. TRANS: domain name in the URL, as it is an official standard domain name for examples.
+msgid "OStatus group's address, like http://example.net/group/nickname."
+msgstr ""
+"Dirección del grupo de OStatus, como http://example.net/group/nickname."
+
+#. TRANS: Error text displayed when trying to join a remote group the user is already a member of.
+msgid "You are already a member of this group."
+msgstr "Usted ya es miembro de este grupo."
+
+#. TRANS: OStatus remote group subscription dialog error.
+msgid "Already a member!"
+msgstr "¡Ya es miembro!"
+
+#. TRANS: OStatus remote group subscription dialog error.
+msgid "Remote group join failed!"
+msgstr "¡Error al unirse a grupo remoto!"
+
+#. TRANS: Page title for OStatus remote group join form
+msgid "Confirm joining remote group"
+msgstr "Confirmar la unión a grupo remoto"
+
+#. TRANS: Form instructions.
+msgid ""
+"You can subscribe to groups from other supported sites. Paste the group's "
+"profile URI below:"
+msgstr ""
+"Puede suscribirse a grupos de otros sitios compatibles. Pegue a continuación "
+"la dirección URI del perfil del grupo:"
+
+#. TRANS: Client error displayed trying to perform an action without providing an ID.
+#. TRANS: Client error.
+#. TRANS: Client error displayed trying to perform an action without providing an ID.
+msgid "No ID."
+msgstr "Sin identificador."
+
+#. TRANS: Client exception thrown when an undefied activity is performed.
+#. TRANS: Client exception.
+msgid "Cannot handle that kind of post."
+msgstr "No se puede manejar ese tipo de publicación (post)."
+
+#. TRANS: Client exception.
+msgid "In reply to unknown notice."
+msgstr "En respuesta a un aviso desconocido."
+
+#. TRANS: Client exception.
+msgid "In reply to a notice not by this user and not mentioning this user."
+msgstr ""
+"En respuesta a un anuncio que no es de este usuario y tampoco lo menciona."
+
+#. TRANS: Client exception.
+msgid "To the attention of user(s), not including this one."
+msgstr "A la atención del (de los) usuario(s), sin inclur a éste."
+
+#. TRANS: Client exception.
+msgid "Not to anyone in reply to anything."
+msgstr "A nadie en respuesta a nada."
+
+#. TRANS: Client exception.
+msgid "This is already a favorite."
+msgstr "Esto ya es favorito."
+
+#. TRANS: Client exception.
+msgid "Could not save new favorite."
+msgstr "No se pudo guardar el nuevo favorito."
+
+#. TRANS: Client exception.
+msgid "Notice was not favorited!"
+msgstr "¡La nota no se ha añadido a los favoritos!"
+
+#. TRANS: Client exception.
+msgid "Not a person object."
+msgstr "No es un objeto personal."
+
+#. TRANS: Client exception.
+msgid "Unidentified profile being listed."
+msgstr "Se ha listado un perfil no identificado."
+
+#. TRANS: Client exception.
+msgid "This user is not the one being listed."
+msgstr "Este usuario no es el que ha sido listado."
+
+#. TRANS: Client exception.
+msgid "The listing could not be saved."
+msgstr "No se pudo guardar la lista."
+
+#. TRANS: Client exception.
+msgid "Unidentified profile being unlisted."
+msgstr "Se ha retirado de la lista un perfil no identificado."
+
+#. TRANS: Client exception.
+msgid "This user is not the one being unlisted."
+msgstr "Este usuario no es el que ha sido retirado de la lista."
+
+#. TRANS: Client exception.
+msgid "The listing could not be deleted."
+msgstr "No se pudo borrar la lista."
+
+#. TRANS: Client exception.
+msgid "Cannot favorite/unfavorite without an object."
+msgstr "No se puede añadir a, o quitar de la lista de favoritos sin un objeto."
+
+#. TRANS: Client exception.
+msgid "Cannot handle that kind of object for liking/faving."
+msgstr ""
+"No se puede manejar ese tipo de objeto para las opciones \"Me gusta\" o "
+"\"Añadir a favoritos\"."
+
+#. TRANS: Client exception. %s is an object ID.
+#, php-format
+msgid "Notice with ID %s unknown."
+msgstr "Aviso con identificador ID %s desconocido."
+
+#. TRANS: Client exception. %1$s is a notice ID, %2$s is a user ID.
+#, php-format
+msgid "Notice with ID %1$s not posted by %2$s."
+msgstr "Aviso con identificador ID %1$s no publicado por %2$s ."
+
+#. TRANS: Field label.
+msgid "Subscribe to list"
+msgstr "Suscribirse a la lista"
+
+#. TRANS: Field title.
+msgid "Address of the OStatus list, like http://example.net/user/all/tag."
+msgstr ""
+"Dirección de la lista de OStatus, como http://example.net/user/all/tag."
+
+#. TRANS: Error text displayed when trying to subscribe to a list already a subscriber to.
+msgid "You are already subscribed to this list."
+msgstr "Ya estás suscrito a esta lista."
+
+#. TRANS: Page title for OStatus remote list subscription form
+msgid "Confirm subscription to remote list"
+msgstr "Confirmar la suscripción a la lista remota"
+
+#. TRANS: Instructions for OStatus list subscription form.
+msgid ""
+"You can subscribe to lists from other supported sites. Paste the list's URI "
+"below:"
+msgstr ""
+"Puede suscribirse a las listas de otros sitios compatibles. Pegue a "
+"continuación la dirección URI de la lista:"
+
+#. TRANS: Client error.
+msgid "No such group."
+msgstr "No existe ese grupo."
+
+#. TRANS: Client error.
+msgid "Cannot accept remote posts for a remote group."
+msgstr "No se pueden aceptar entradas (post) remotas para un grupo remoto."
+
+#. TRANS: Client error.
+msgid "Cannot read profile to set up group membership."
+msgstr "No se puede leer el perfil para definir la pertenencia a grupos."
+
+#. TRANS: Client error.
+#. TRANS: Client error displayed when trying to have a group join another group.
+msgid "Groups cannot join groups."
+msgstr "Los grupos no pueden unirse a grupos."
+
+#. TRANS: Client error displayed when trying to join a group the user is blocked from by a group admin.
+msgid "You have been blocked from that group by the admin."
+msgstr "Has sido bloqueado en ese grupo por el administrador."
+
+#. TRANS: Server error. %1$s is a profile URI, %2$s is a group nickname.
+#, php-format
+msgid "Could not join remote user %1$s to group %2$s."
+msgstr "No se pudo unir el usuario remoto %1$s al grupo %2$s."
+
+#. TRANS: Client error displayed when group membership cannot be cancelled
+#. TRANS: because the remote profile could not be read.
+msgid "Cannot read profile to cancel group membership."
+msgstr "No se puede leer el perfil para cancelar la pertenencia al grupo."
+
+#. TRANS: Server error. %1$s is a profile URI, %2$s is a group nickname.
+#, php-format
+msgid "Could not remove remote user %1$s from group %2$s."
+msgstr "No se pudo quitar el usuario remoto %1$s del grupo %2$s ."
+
+#. TRANS: Client error displayed when referring to a non-existing list.
+#. TRANS: Client error.
+msgid "No such list."
+msgstr "No existe tal lista."
+
+#. TRANS: Client error displayed when trying to send a message to a remote list.
+msgid "Cannot accept remote posts for a remote list."
+msgstr "No se pueden aceptar entradas (post) remotas para una lista remota."
+
+#. TRANS: Client error displayed when referring to a non-existing remote list.
+msgid "Cannot read profile to set up list subscription."
+msgstr "No se puede leer el perfil para configurar la suscripción a la lista."
+
+#. TRANS: Client error displayed when trying to subscribe a group to a list.
+#. TRANS: Client error displayed when trying to unsubscribe a group from a list.
+msgid "Groups cannot subscribe to lists."
+msgstr "Los grupos no pueden suscribirse a listas."
+
+#. TRANS: Server error displayed when subscribing a remote user to a list fails.
+#. TRANS: %1$s is a profile URI, %2$s is a list name.
+#, php-format
+msgid "Could not subscribe remote user %1$s to list %2$s."
+msgstr "No se pudo suscribir el usuario remoto %1$s a la lista %2$s."
+
+#. TRANS: Client error displayed when trying to unsubscribe from non-existing list.
+msgid "Cannot read profile to cancel list subscription."
+msgstr "No se puede leer el perfil para cancelar la suscripción a la lista."
+
+#. TRANS: Client error displayed when trying to unsubscribe a remote user from a list fails.
+#. TRANS: %1$s is a profile URL, %2$s is a list name.
+#, php-format
+msgid "Could not unsubscribe remote user %1$s from list %2$s."
+msgstr ""
+"No puede cancelar la suscripción del usuario remoto %1$s de la lista %2$s."
+
+#. TRANS: Client error.
+msgid "You can use the local subscription!"
+msgstr "¡Puede utilizar la suscripción local!"
+
+#. TRANS: Form title.
+msgctxt "TITLE"
+msgid "Subscribe to user"
+msgstr "Suscribirse al usuario"
+
+#. TRANS: Form legend. %s is a group name.
+#, php-format
+msgid "Join group %s"
+msgstr "Unirse al grupo %s"
+
+#. TRANS: Button text to join a group.
+msgctxt "BUTTON"
+msgid "Join"
+msgstr "Unirse"
+
+#. TRANS: Form legend. %1$s is a list, %2$s is a lister's name.
+#, php-format
+msgid "Subscribe to list %1$s by %2$s"
+msgstr "Suscribirse a la lista %1$s de %2$s"
+
+#. TRANS: Button text to subscribe to a list.
+#. TRANS: Button text to subscribe to a profile.
+msgctxt "BUTTON"
+msgid "Subscribe"
+msgstr "Suscribirse"
+
+#. TRANS: Form legend. %s is a nickname.
+#, php-format
+msgid "Subscribe to %s"
+msgstr "Suscribirse a %s"
+
+#. TRANS: Field label.
+msgid "Group nickname"
+msgstr "Alias de grupo"
+
+#. TRANS: Field title.
+msgid "Nickname of the group you want to join."
+msgstr "Alias del grupo al que desea unirse."
+
+#. TRANS: Field title.
+msgid "Nickname of the user you want to follow."
+msgstr "Alias del usuario al que desea seguir."
+
+#. TRANS: Tooltip for field label "Profile Account".
+msgid "Your account ID (e.g. user@identi.ca)."
+msgstr "Identificador de su cuenta (por ejemplo, user@identi.ca)."
+
+#. TRANS: Client error.
+msgid "Must provide a remote profile."
+msgstr "Debe proporcionar un perfil remoto."
+
+#. TRANS: Client error.
+msgid "No local user or group nickname provided."
+msgstr "No se ha proporcionado ningún usuario local o alias de grupo."
+
+#. TRANS: Page title.
+msgid "OStatus Connect"
+msgstr "Conexión a OStatus"
+
+#. TRANS: Server exception. %s is a URL.
+#, php-format
+msgid "Invalid avatar URL %s."
+msgstr "La dirección URL del avatar, %s, es incorrecta."
+
+#. TRANS: Server exception. %s is a URI.
+#, php-format
+msgid "Tried to update avatar for unsaved remote profile %s."
+msgstr ""
+"Intentó actualizar el avatar asociado al perfil remoto no guardado  %s ."
+
+#. TRANS: Server exception. %s is a URL.
+#, php-format
+msgid "Unable to fetch avatar from %s."
+msgstr "No se pudo recuperar el avatar desde %s."
+
+#. TRANS: Exception. %s is a URL.
+#, php-format
+msgid "Could not find a feed URL for profile page %s."
+msgstr ""
+"No se pudo encontrar la dirección URL de la fuente web (feed) para la página "
+"de perfil %s."
+
+#. TRANS: Exception.
+msgid "Not a valid webfinger address."
+msgstr "No es una dirección webfinger válida."
+
+#. TRANS: Exception. %s is a webfinger address.
+#, php-format
+msgid "Could not find a valid profile for \"%s\"."
+msgstr "No se pudo encontrar un perfil válido para \"%s\"."
+
+#. TRANS: Server exception.
+msgid "Attempting to start PuSH subscription for feed with no hub."
+msgstr ""
+"Intentando iniciar suscripción PuSH para fuente web (feed) sin concentrador "
+"(hub)."
+
+#. TRANS: Server exception.
+msgid "Attempting to end PuSH subscription for feed with no hub."
+msgstr ""
+"Intentando poner fin a la suscripción PuSH para fuente web (feed) sin "
+"concentrador (hub)."
+
+#. TRANS: Server exception. %s is a URI
+#, php-format
+msgid "Invalid ostatus_profile state: Two or more IDs set for %s."
+msgstr ""
+"Estado de ostatus_profile no válido: hay dos o más identificadores "
+"establecidos para  %s ."
+
+#. TRANS: Server exception. %s is a URI
+#, php-format
+msgid "Invalid ostatus_profile state: All IDs empty for %s."
+msgstr ""
+"Estado de ostatus_profile no válido: Todos los identificadores ID de %s "
+"están vacíos."
+
+#. TRANS: Server exception.
+#. TRANS: %1$s is the method name the exception occured in, %2$s is the actor type.
+#, php-format
+msgid "Invalid actor passed to %1$s: %2$s."
+msgstr "Actor no válido pasado a %1$s : %2$s ."
+
+#. TRANS: Server exception.
+msgid ""
+"Invalid type passed to Ostatus_profile::notify. It must be XML string or "
+"Activity entry."
+msgstr ""
+"Tipo no válido pasado a Ostatus_profile::notify. Debe ser una cadena XML o "
+"una entrada de actividad."
+
+#. TRANS: Exception.
+msgid "Unknown feed format."
+msgstr "Formato de fuente web (feed) desconocido"
+
+#. TRANS: Exception.
+msgid "RSS feed without a channel."
+msgstr "Fuente web RSS sin canal."
+
+#. TRANS: Client exception thrown when trying to share multiple activities at once.
+msgid "Can only handle share activities with exactly one object."
+msgstr ""
+"Sólo puede controlar la compartición de actividades con exactamente un "
+"objeto."
+
+#. TRANS: Client exception thrown when trying to share a non-activity object.
+msgid "Can only handle shared activities."
+msgstr "Sólo es posible gestionar actividades compartidas."
+
+#. TRANS: Client exception thrown when saving an activity share fails.
+#. TRANS: %s is a share ID.
+#, php-format
+msgid "Failed to save activity %s."
+msgstr "Error al guardar la actividad %s."
+
+#. TRANS: Client exception. %s is a source URI.
+#, php-format
+msgid "No content for notice %s."
+msgstr "No hay contenido para el aviso %s."
+
+#. TRANS: Shown when a notice is longer than supported and/or when attachments are present. At runtime
+#. TRANS: this will usually be replaced with localised text from StatusNet core messages.
+msgid "Show more"
+msgstr "Mostrar más"
+
+#. TRANS: Exception. %s is a profile URL.
+#, php-format
+msgid "Could not reach profile page %s."
+msgstr "No se pudo llegar a la página de perfil %s ."
+
+#. TRANS: Feed sub exception.
+msgid "Cannot find enough profile information to make a feed."
+msgstr ""
+"No se pudo encontrar suficiente información de perfil para generar una "
+"fuente web (feed)."
+
+#. TRANS: Server exception.
+msgid "No author ID URI found."
+msgstr "No se ha encontrado ninguna dirección URI de identificador de usuario."
+
+#. TRANS: Exception.
+msgid "No profile URI."
+msgstr "No hay dirección URI de perfil."
+
+#. TRANS: Exception.
+msgid "Local user cannot be referenced as remote."
+msgstr "No se puede hacer referencia a un usuario local como remoto ."
+
+#. TRANS: Exception.
+msgid "Local group cannot be referenced as remote."
+msgstr "No se puede referenciar un grupo local como remoto."
+
+#. TRANS: Exception.
+msgid "Local list cannot be referenced as remote."
+msgstr "No se puede hacer referencia a una lista local como remota."
+
+#. TRANS: Server exception.
+msgid "Cannot save local profile."
+msgstr "No se pudo guardar el perfil local."
+
+#. TRANS: Server exception.
+msgid "Cannot save local list."
+msgstr "No se puede guardar la lista local."
+
+#. TRANS: Server exception.
+msgid "Cannot save OStatus profile."
+msgstr "No se puede guardar el perfil de OStatus."
+
+#. TRANS: Exception. %s is a webfinger address.
+#, php-format
+msgid "Could not save profile for \"%s\"."
+msgstr "No se pudo guardar el perfil de \"%s\"."
+
+#. TRANS: Exception. %s is a webfinger address.
+#, php-format
+msgid "Could not save OStatus profile for \"%s\"."
+msgstr "No se pudo guardar el perfil OStatus de \"%s\"."
+
+#. TRANS: Server exception.
+msgid "Could not store HTML content of long post as file."
+msgstr ""
+"No se pudo almacenar como archivo el contenido HTML de una entrada (post) "
+"extensa."
+
+#. TRANS: Server exception.
+#. TRANS: %1$s is a protocol, %2$s is a URI.
+#, php-format
+msgid "Unrecognized URI protocol for profile: %1$s (%2$s)."
+msgstr "No reconocido el protocolo URI para el perfil: %1$s (%2$s)."
+
+#. TRANS: Server exception. %s is a URI.
+#, php-format
+msgid "No URI protocol for profile: %s."
+msgstr "No existe protocolo URI para el perfil: %s ."
+
+#. TRANS: Client exception. %s is a HTTP status code.
+#, php-format
+msgid "Hub subscriber verification returned HTTP %s."
+msgstr ""
+"La verificación de suscripción del concentrador (hub) ha devuelto el código "
+"HTTP %s."
+
+#. TRANS: Exception. %1$s is a response status code, %2$s is the body of the response.
+#, php-format
+msgid "Callback returned status: %1$s. Body: %2$s"
+msgstr "La llamada de retorno ha devuelto el estado: %1$s. Cuerpo: %2$s"
+
+#. TRANS: Exception.
+msgid "Unable to locate signer public key."
+msgstr "No se ha podido localizar la clave pública del firmante."
+
+#. TRANS: Exception.
+msgid "Salmon invalid actor for signing."
+msgstr "El actor del protocolo Salmon no es válido para la firma."
+
+#. TRANS: Client error. POST is a HTTP command. It should not be translated.
+msgid "This method requires a POST."
+msgstr "Este método requiere un comando POST."
+
+#. TRANS: Client error. Do not translate "application/magic-envelope+xml".
+msgid "Salmon requires \"application/magic-envelope+xml\"."
+msgstr "El protocolo Salmon requiere \"application/magic-envelope+xml\"."
+
+#. TRANS: Client error.
+msgid "Salmon signature verification failed."
+msgstr "Error de verificación de firma del protocolo Salmon."
+
+#. TRANS: Client error.
+msgid "Salmon post must be an Atom entry."
+msgstr "La publicación del protocolo Salmon debe ser una entrada Atom."
+
+#. TRANS: Client exception.
+msgid "Unrecognized activity type."
+msgstr "Tipo de actividad no reconocido."
+
+#. TRANS: Client exception.
+msgid "This target does not understand posts."
+msgstr "Este objetivo no entiende las entradas (post)."
+
+#. TRANS: Client exception.
+msgid "This target does not understand follows."
+msgstr "Este objetivo no entiende los seguimientos."
+
+#. TRANS: Client exception.
+msgid "This target does not understand unfollows."
+msgstr "Este objetivo no entiende la indicación de fin de seguimiento."
+
+#. TRANS: Client exception.
+msgid "This target does not understand favorites."
+msgstr "Este objetivo no entiende los favoritos."
+
+#. TRANS: Client exception.
+msgid "This target does not understand unfavorites."
+msgstr "Este objetivo no entiende la indicación de eliminar los favoritos."
+
+#. TRANS: Client exception.
+msgid "This target does not understand share events."
+msgstr "Este objetivo no entiende la indicación de compartir eventos."
+
+#. TRANS: Client exception.
+msgid "This target does not understand joins."
+msgstr "Este objetivo no entiende las uniones."
+
+#. TRANS: Client exception.
+msgid "This target does not understand leave events."
+msgstr "Este objetivo no entiende la indicación de dejar los eventos."
+
+#. TRANS: Client exception.
+msgid "This target does not understand list events."
+msgstr "Este objetivo no entiende la indicación de listar los eventos."
+
+#. TRANS: Client exception.
+msgid "This target does not understand unlist events."
+msgstr ""
+"Este objetivo no entiende la indicación de retirar los eventos de la lista."
+
+#. TRANS: Exception.
+msgid "Received a salmon slap from unidentified actor."
+msgstr ""
+"Se ha recibido una respuesta slap de protocolo Salmon procedente de un actor "
+"no identificado."
diff --git a/plugins/OStatus/locale/eu/LC_MESSAGES/OStatus.po b/plugins/OStatus/locale/eu/LC_MESSAGES/OStatus.po
new file mode 100644
index 0000000000..33690e4a1e
--- /dev/null
+++ b/plugins/OStatus/locale/eu/LC_MESSAGES/OStatus.po
@@ -0,0 +1,915 @@
+# Translation of StatusNet - OStatus to Basque (euskara)
+# Exported from translatewiki.net
+#
+# Author: Artsuaga
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - OStatus\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:32+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-12-03 13:49:04+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: String in the gettext speed test script. Unimportant.
+msgid "Feeds"
+msgstr "Jarioak"
+
+#. TRANS: Link to subscribe to a remote entity.
+#. TRANS: Link text for a user to subscribe to an OStatus user.
+msgid "Subscribe"
+msgstr "Harpidetu"
+
+#. TRANS: Fieldset legend.
+msgid "List remote profile"
+msgstr "Zerrendatu urruneko profila"
+
+#. TRANS: Field label.
+msgctxt "LABEL"
+msgid "Remote profile"
+msgstr "Urruneko profila"
+
+#. TRANS: Field title.
+#. TRANS: Tooltip for field label "Subscribe to".
+msgid ""
+"OStatus user's address, like nickname@example.com or http://example.net/"
+"nickname."
+msgstr ""
+"OStatus erabiltzailearen helbidea, nicka@eredua.com edo http://eredua.com/"
+"nicka bezelako zerbait."
+
+#. TRANS: Button text to fetch remote profile.
+msgctxt "BUTTON"
+msgid "Fetch"
+msgstr "Lortu"
+
+#. TRANS: Exception in OStatus when invalid URI was entered.
+msgid "Invalid URI."
+msgstr "URI baliogabea."
+
+#. TRANS: Error message in OStatus plugin. Do not translate the domain names example.com
+#. TRANS: and example.net, as these are official standard domain names for use in examples.
+msgid ""
+"Sorry, we could not reach that address. Please make sure that the OStatus "
+"address is like nickname@example.com or http://example.net/nickname."
+msgstr ""
+"Barka, ezin izan dugu helbide hori lortu. Mesedez egon ziur helbidea "
+"nicka@eredua.com edo http://eredua.com/nicka bezelako dela."
+
+#. TRANS: Title. %s is a domain name.
+#, php-format
+msgid "Sent from %s via OStatus"
+msgstr "%s(e)tik OStatus bidez bidalia"
+
+#. TRANS: Exception thrown when setup of remote subscription fails.
+msgid "Could not set up remote subscription."
+msgstr ""
+
+#. TRANS: Title for unfollowing a remote profile.
+msgctxt "TITLE"
+msgid "Unfollow"
+msgstr "Utzi zerrenda"
+
+#. TRANS: Success message for unsubscribe from user attempt through OStatus.
+#. TRANS: %1$s is the unsubscriber's name, %2$s is the unsubscribed user's name.
+#, php-format
+msgid "%1$s stopped following %2$s."
+msgstr "%1$s(e)k %2$s jarraitzeari utzi dio."
+
+#. TRANS: Exception thrown when setup of remote group membership fails.
+msgid "Could not set up remote group membership."
+msgstr ""
+
+#. TRANS: Title for joining a remote groep.
+msgctxt "TITLE"
+msgid "Join"
+msgstr "Elkartu"
+
+#. TRANS: Success message for subscribe to group attempt through OStatus.
+#. TRANS: %1$s is the member name, %2$s is the subscribed group's name.
+#, php-format
+msgid "%1$s has joined group %2$s."
+msgstr "%1$s %2$s taldera batu da."
+
+#. TRANS: Exception thrown when joining a remote group fails.
+msgid "Failed joining remote group."
+msgstr "Akatsa urruneko taldearekin elkartzean."
+
+#. TRANS: Title for leaving a remote group.
+msgctxt "TITLE"
+msgid "Leave"
+msgstr "Utzi"
+
+#. TRANS: Success message for unsubscribe from group attempt through OStatus.
+#. TRANS: %1$s is the member name, %2$s is the unsubscribed group's name.
+#, php-format
+msgid "%1$s has left group %2$s."
+msgstr "%1$s(e)k %2$s taldea utzi du."
+
+#. TRANS: Exception thrown when setup of remote list subscription fails.
+msgid "Could not set up remote list subscription."
+msgstr ""
+
+#. TRANS: Title for following a remote list.
+msgctxt "TITLE"
+msgid "Follow list"
+msgstr "Jarraitu zerrenda"
+
+#. TRANS: Success message for remote list follow through OStatus.
+#. TRANS: %1$s is the subscriber name, %2$s is the list, %3$s is the lister's name.
+#, php-format
+msgid "%1$s is now following people listed in %2$s by %3$s."
+msgstr ""
+
+#. TRANS: Exception thrown when subscription to remote list fails.
+msgid "Failed subscribing to remote list."
+msgstr ""
+
+#. TRANS: Title for unfollowing a remote list.
+msgid "Unfollow list"
+msgstr "Utzi zerrenda"
+
+#. TRANS: Success message for remote list unfollow through OStatus.
+#. TRANS: %1$s is the subscriber name, %2$s is the list, %3$s is the lister's name.
+#, php-format
+msgid "%1$s stopped following the list %2$s by %3$s."
+msgstr "%1$s(e)k %3$s(e)ko %2$s zerrenda jarraitzeari utzi dio ."
+
+#. TRANS: Title for listing a remote profile.
+msgctxt "TITLE"
+msgid "List"
+msgstr "Zerrenda"
+
+#. TRANS: Success message for remote list addition through OStatus.
+#. TRANS: %1$s is the list creator's name, %2$s is the added list member, %3$s is the list name.
+#, php-format
+msgid "%1$s listed %2$s in the list %3$s."
+msgstr "%1$s(e)k %2$s zerrendatu du %3$s zerrendan."
+
+#. TRANS: Exception thrown when subscribing to a remote list fails.
+#, php-format
+msgid ""
+"Could not complete subscription to remote profile's feed. List %s could not "
+"be saved."
+msgstr ""
+
+#. TRANS: Title for unlisting a remote profile.
+msgctxt "TITLE"
+msgid "Unlist"
+msgstr ""
+
+#. TRANS: Success message for remote list removal through OStatus.
+#. TRANS: %1$s is the list creator's name, %2$s is the removed list member, %3$s is the list name.
+#, php-format
+msgid "%1$s removed %2$s from the list %3$s."
+msgstr "%1$s(e)k %2$s ezabatu du %3$s zerrendatik."
+
+#. TRANS: Title for unliking a remote notice.
+msgid "Unlike"
+msgstr ""
+
+#. TRANS: Success message for remove a favorite notice through OStatus.
+#. TRANS: %1$s is the unfavoring user's name, %2$s is URI to the no longer favored notice.
+#, php-format
+msgid "%1$s no longer likes %2$s."
+msgstr "%1$s(e)k ez du jada %2$s atsegin."
+
+#. TRANS: Link text for link to remote subscribe.
+msgid "Remote"
+msgstr "Urrunekoa"
+
+#. TRANS: Title for activity.
+msgid "Profile update"
+msgstr "Profil eguneraketa"
+
+#. TRANS: Ping text for remote profile update through OStatus.
+#. TRANS: %s is user that updated their profile.
+#, php-format
+msgid "%s has updated their profile page."
+msgstr ""
+
+#. TRANS: Link text for a user to list an OStatus user.
+msgid "List"
+msgstr "Zerrenda"
+
+#. TRANS: Plugin description.
+msgid ""
+"Follow people across social networks that implement <a href=\"http://ostatus."
+"org/\">OStatus</a>."
+msgstr ""
+
+#. TRANS: Client exception.
+msgid "Publishing outside feeds not supported."
+msgstr ""
+
+#. TRANS: Client exception. %s is a mode.
+#, php-format
+msgid "Unrecognized mode \"%s\"."
+msgstr "\"%s\" modu ezezaguna."
+
+#. TRANS: Client exception. %s is a topic.
+#, php-format
+msgid ""
+"Unsupported hub.topic %s this hub only serves local user and group Atom "
+"feeds."
+msgstr ""
+
+#. TRANS: Client exception. %s is sync or async.
+#, php-format
+msgid "Invalid hub.verify \"%s\". It must be sync or async."
+msgstr ""
+
+#. TRANS: Client exception. %s is the invalid lease value.
+#, php-format
+msgid "Invalid hub.lease \"%s\". It must be empty or positive integer."
+msgstr ""
+
+#. TRANS: Client exception. %s is the invalid hub secret.
+#, php-format
+msgid "Invalid hub.secret \"%s\". It must be under 200 bytes."
+msgstr ""
+
+#. TRANS: Client exception. %s is a feed URL.
+#, php-format
+msgid "Invalid hub.topic \"%s\". User does not exist."
+msgstr ""
+
+#. TRANS: Client exception. %s is a feed URL.
+#, php-format
+msgid "Invalid hub.topic \"%s\". Group does not exist."
+msgstr ""
+
+#. TRANS: Client exception. %s is a feed URL.
+#, php-format
+msgid "Invalid hub.topic %s; list does not exist."
+msgstr ""
+
+#. TRANS: Client exception.
+#. TRANS: %1$s is this argument to the method this exception occurs in, %2$s is a URL.
+#, php-format
+msgid "Invalid URL passed for %1$s: \"%2$s\""
+msgstr "%1$s helbidera pasako da URL helbide baliogabea: \"%2$s\""
+
+#. TRANS: Client error displayed when trying to list a local object as if it is remote.
+msgid "You can use the local list functionality!"
+msgstr ""
+
+#. TRANS: Header for listing a remote object. %s is a remote object's name.
+#, php-format
+msgid "List %s"
+msgstr "Zerrendatu %s"
+
+#. TRANS: Button text to list a remote object.
+msgctxt "BUTTON"
+msgid "Go"
+msgstr "Joan"
+
+#. TRANS: Field label.
+msgid "User nickname"
+msgstr "Erabiltzaile goitizena"
+
+#. TRANS: Field title.
+msgid "Nickname of the user you want to list."
+msgstr "Jarraitu nahi duzun erabiltzailearen goitizena."
+
+#. TRANS: Field label.
+msgid "Profile Account"
+msgstr "Profilaren Kontua"
+
+#. TRANS: Field title.
+msgid "Your account id (for example user@identi.ca)."
+msgstr ""
+
+#. TRANS: Client error displayed when remote profile could not be looked up.
+#. TRANS: Client error.
+msgid "Could not look up OStatus account profile."
+msgstr ""
+
+#. TRANS: Client error displayed when remote profile address could not be confirmed.
+#. TRANS: Client error.
+msgid "Could not confirm remote profile address."
+msgstr ""
+
+#. TRANS: Title for an OStatus list.
+msgid "OStatus list"
+msgstr "OStatus zerrenda"
+
+#. TRANS: Server exception thrown when referring to a non-existing or empty feed.
+msgid "Empty or invalid feed id."
+msgstr ""
+
+#. TRANS: Server exception. %s is a feed ID.
+#, php-format
+msgid "Unknown PuSH feed id %s"
+msgstr "%s PuSH jario id  ezezaguna"
+
+#. TRANS: Client exception. %s is an invalid feed name.
+#, php-format
+msgid "Bad hub.topic feed \"%s\"."
+msgstr ""
+
+#. TRANS: Client exception. %1$s the invalid token, %2$s is the topic for which the invalid token was given.
+#, php-format
+msgid "Bad hub.verify_token %1$s for %2$s."
+msgstr ""
+
+#. TRANS: Client exception. %s is an invalid topic.
+#, php-format
+msgid "Unexpected subscribe request for %s."
+msgstr "Espero ez zen harpidetza eskaria: %s"
+
+#. TRANS: Client exception. %s is an invalid topic.
+#, php-format
+msgid "Unexpected unsubscribe request for %s."
+msgstr "Espero ez zen harpidetza etetze eskaria: %s"
+
+#. TRANS: Client error displayed when referring to a non-existing user.
+#. TRANS: Client error.
+msgid "No such user."
+msgstr "Erabiltzaile hori ez dago."
+
+#. TRANS: Field label for a field that takes an OStatus user address.
+msgid "Subscribe to"
+msgstr "Harpidetu honi"
+
+#. TRANS: Button text.
+#. TRANS: Button text to continue joining a remote list.
+msgctxt "BUTTON"
+msgid "Continue"
+msgstr "Jarraitu"
+
+#. TRANS: Button text.
+msgid "Join"
+msgstr "Batu"
+
+#. TRANS: Tooltip for button "Join".
+msgctxt "BUTTON"
+msgid "Join this group"
+msgstr "Batu talde hontara."
+
+#. TRANS: Button text.
+msgctxt "BUTTON"
+msgid "Confirm"
+msgstr "Baieztatu"
+
+#. TRANS: Tooltip for button "Confirm".
+msgid "Subscribe to this user"
+msgstr "Harpidetu erabiltzaile honetara"
+
+#. TRANS: Extra paragraph in remote profile view when already subscribed.
+msgid "You are already subscribed to this user."
+msgstr "Jadanik erabiltzaile horren harpideduna zara."
+
+#. TRANS: Error text.
+msgid ""
+"Sorry, we could not reach that feed. Please try that OStatus address again "
+"later."
+msgstr ""
+
+#. TRANS: OStatus remote subscription dialog error.
+#. TRANS: OStatus remote group subscription dialog error.
+msgid "Already subscribed!"
+msgstr "Dagoeneko harpidetua!"
+
+#. TRANS: OStatus remote subscription dialog error.
+msgid "Remote subscription failed!"
+msgstr "Urruneko harpidetza egitean akatsa!"
+
+#. TRANS: Client error displayed when the session token does not match or is not given.
+msgid "There was a problem with your session token. Try again, please."
+msgstr "Arazoa egon da zure saio-tokenarekin. Saiatu berriro, mesedez."
+
+#. TRANS: Form title.
+msgid "Subscribe to user"
+msgstr "Erabiltzailera harpidetu"
+
+#. TRANS: Page title for OStatus remote subscription form.
+msgid "Confirm"
+msgstr "Baieztatu"
+
+#. TRANS: Instructions.
+msgid ""
+"You can subscribe to users from other supported sites. Paste their address "
+"or profile URI below:"
+msgstr ""
+
+#. TRANS: Field label.
+msgid "Join group"
+msgstr "Batu taldera"
+
+#. TRANS: Tooltip for field label "Join group". Do not translate the "example.net"
+#. TRANS: domain name in the URL, as it is an official standard domain name for examples.
+msgid "OStatus group's address, like http://example.net/group/nickname."
+msgstr ""
+"OStatus taldearen helbidea, http://eredua.com/taldea/nicka bezelako zerbait."
+
+#. TRANS: Error text displayed when trying to join a remote group the user is already a member of.
+msgid "You are already a member of this group."
+msgstr "Dagoeneko talde hontako kidea zara."
+
+#. TRANS: OStatus remote group subscription dialog error.
+msgid "Already a member!"
+msgstr "Dagoeneko kidea zara!"
+
+#. TRANS: OStatus remote group subscription dialog error.
+msgid "Remote group join failed!"
+msgstr "Urruneko taldera batzean akatsa!"
+
+#. TRANS: Page title for OStatus remote group join form
+msgid "Confirm joining remote group"
+msgstr "Baieztatu urruneko taldera batzea"
+
+#. TRANS: Form instructions.
+msgid ""
+"You can subscribe to groups from other supported sites. Paste the group's "
+"profile URI below:"
+msgstr ""
+
+#. TRANS: Client error displayed trying to perform an action without providing an ID.
+#. TRANS: Client error.
+#. TRANS: Client error displayed trying to perform an action without providing an ID.
+msgid "No ID."
+msgstr "IDrik ez."
+
+#. TRANS: Client exception thrown when an undefied activity is performed.
+#. TRANS: Client exception.
+msgid "Cannot handle that kind of post."
+msgstr ""
+
+#. TRANS: Client exception.
+msgid "In reply to unknown notice."
+msgstr "Ohar ezezagun bati erantzunez."
+
+#. TRANS: Client exception.
+msgid "In reply to a notice not by this user and not mentioning this user."
+msgstr ""
+
+#. TRANS: Client exception.
+msgid "To the attention of user(s), not including this one."
+msgstr ""
+
+#. TRANS: Client exception.
+msgid "Not to anyone in reply to anything."
+msgstr ""
+
+#. TRANS: Client exception.
+msgid "This is already a favorite."
+msgstr "Gogokoa da dagoeneko."
+
+#. TRANS: Client exception.
+msgid "Could not save new favorite."
+msgstr "Ezin izan da gogoko berria gehitu."
+
+#. TRANS: Client exception.
+msgid "Notice was not favorited!"
+msgstr "Oharra ez da gogokoetara gehitu!"
+
+#. TRANS: Client exception.
+msgid "Not a person object."
+msgstr "Ez da pertsona objetua."
+
+#. TRANS: Client exception.
+msgid "Unidentified profile being listed."
+msgstr ""
+
+#. TRANS: Client exception.
+msgid "This user is not the one being listed."
+msgstr ""
+
+#. TRANS: Client exception.
+msgid "The listing could not be saved."
+msgstr ""
+
+#. TRANS: Client exception.
+msgid "Unidentified profile being unlisted."
+msgstr ""
+
+#. TRANS: Client exception.
+msgid "This user is not the one being unlisted."
+msgstr ""
+
+#. TRANS: Client exception.
+msgid "The listing could not be deleted."
+msgstr ""
+
+#. TRANS: Client exception.
+msgid "Cannot favorite/unfavorite without an object."
+msgstr ""
+
+#. TRANS: Client exception.
+msgid "Cannot handle that kind of object for liking/faving."
+msgstr ""
+
+#. TRANS: Client exception. %s is an object ID.
+#, php-format
+msgid "Notice with ID %s unknown."
+msgstr "Ez da %s ID-a duen oharrik ezagutzen."
+
+#. TRANS: Client exception. %1$s is a notice ID, %2$s is a user ID.
+#, fuzzy, php-format
+msgid "Notice with ID %1$s not posted by %2$s."
+msgstr "%2$s(e)k ez du %s ID-a duen oharrik argitaratu."
+
+#. TRANS: Field label.
+msgid "Subscribe to list"
+msgstr "Harpidetu zerrendara"
+
+#. TRANS: Field title.
+msgid "Address of the OStatus list, like http://example.net/user/all/tag."
+msgstr ""
+
+#. TRANS: Error text displayed when trying to subscribe to a list already a subscriber to.
+msgid "You are already subscribed to this list."
+msgstr "Harpidetuta zaude zerrenda hontara dagoeneko."
+
+#. TRANS: Page title for OStatus remote list subscription form
+msgid "Confirm subscription to remote list"
+msgstr ""
+
+#. TRANS: Instructions for OStatus list subscription form.
+msgid ""
+"You can subscribe to lists from other supported sites. Paste the list's URI "
+"below:"
+msgstr ""
+
+#. TRANS: Client error.
+msgid "No such group."
+msgstr "Talde hori ez dago."
+
+#. TRANS: Client error.
+msgid "Cannot accept remote posts for a remote group."
+msgstr ""
+
+#. TRANS: Client error.
+msgid "Cannot read profile to set up group membership."
+msgstr ""
+
+#. TRANS: Client error.
+#. TRANS: Client error displayed when trying to have a group join another group.
+msgid "Groups cannot join groups."
+msgstr "Taldeak ezin dira beste taldeetara harpidetu."
+
+#. TRANS: Client error displayed when trying to join a group the user is blocked from by a group admin.
+msgid "You have been blocked from that group by the admin."
+msgstr "Administratzaileak talde horretan blokeatu egin zaitu."
+
+#. TRANS: Server error. %1$s is a profile URI, %2$s is a group nickname.
+#, php-format
+msgid "Could not join remote user %1$s to group %2$s."
+msgstr "Ezin izan da %1$s erabiltzailea %2$s taldeara batu."
+
+#. TRANS: Client error displayed when group membership cannot be cancelled
+#. TRANS: because the remote profile could not be read.
+msgid "Cannot read profile to cancel group membership."
+msgstr ""
+
+#. TRANS: Server error. %1$s is a profile URI, %2$s is a group nickname.
+#, php-format
+msgid "Could not remove remote user %1$s from group %2$s."
+msgstr "Ezin izan da %1$s urruneko erabiltzailea %2$s taldetik ezabatu."
+
+#. TRANS: Client error displayed when referring to a non-existing list.
+#. TRANS: Client error.
+msgid "No such list."
+msgstr "Zerrenda hori ez dago."
+
+#. TRANS: Client error displayed when trying to send a message to a remote list.
+msgid "Cannot accept remote posts for a remote list."
+msgstr ""
+
+#. TRANS: Client error displayed when referring to a non-existing remote list.
+msgid "Cannot read profile to set up list subscription."
+msgstr ""
+
+#. TRANS: Client error displayed when trying to subscribe a group to a list.
+#. TRANS: Client error displayed when trying to unsubscribe a group from a list.
+msgid "Groups cannot subscribe to lists."
+msgstr "Taldeak ezin dira zerrendetara harpidetu."
+
+#. TRANS: Server error displayed when subscribing a remote user to a list fails.
+#. TRANS: %1$s is a profile URI, %2$s is a list name.
+#, php-format
+msgid "Could not subscribe remote user %1$s to list %2$s."
+msgstr "Ezin izan da %1$s urruneko erabiltzailea %2$s zerrendara batu."
+
+#. TRANS: Client error displayed when trying to unsubscribe from non-existing list.
+msgid "Cannot read profile to cancel list subscription."
+msgstr ""
+
+#. TRANS: Client error displayed when trying to unsubscribe a remote user from a list fails.
+#. TRANS: %1$s is a profile URL, %2$s is a list name.
+#, php-format
+msgid "Could not unsubscribe remote user %1$s from list %2$s."
+msgstr ""
+"Ezin izan zaio %1$s urruneko erabiltzaileari %2$s zerrendako harpidetza eten."
+
+#. TRANS: Client error.
+msgid "You can use the local subscription!"
+msgstr "Harpidetza lokala erabil dezakezu!"
+
+#. TRANS: Form title.
+msgctxt "TITLE"
+msgid "Subscribe to user"
+msgstr "Erabiltzailera harpidetu"
+
+#. TRANS: Form legend. %s is a group name.
+#, php-format
+msgid "Join group %s"
+msgstr "%s taldera batu"
+
+#. TRANS: Button text to join a group.
+msgctxt "BUTTON"
+msgid "Join"
+msgstr "Batu"
+
+#. TRANS: Form legend. %1$s is a list, %2$s is a lister's name.
+#, php-format
+msgid "Subscribe to list %1$s by %2$s"
+msgstr "%2$s(r)en %1$s zerrendara harpidetu."
+
+#. TRANS: Button text to subscribe to a list.
+#. TRANS: Button text to subscribe to a profile.
+msgctxt "BUTTON"
+msgid "Subscribe"
+msgstr "Harpidetu"
+
+#. TRANS: Form legend. %s is a nickname.
+#, php-format
+msgid "Subscribe to %s"
+msgstr "%s(r)en kontura harpidetuta."
+
+#. TRANS: Field label.
+msgid "Group nickname"
+msgstr "Talde ezizena"
+
+#. TRANS: Field title.
+msgid "Nickname of the group you want to join."
+msgstr "Batu nahi duzun taldearen ezizena."
+
+#. TRANS: Field title.
+msgid "Nickname of the user you want to follow."
+msgstr "Jarraitu nahi duzun erabiltzailearen goitizena."
+
+#. TRANS: Tooltip for field label "Profile Account".
+msgid "Your account ID (e.g. user@identi.ca)."
+msgstr "Zure ID kontua (adz. erabiltzailea@identi.ca)."
+
+#. TRANS: Client error.
+msgid "Must provide a remote profile."
+msgstr "Urruneko profil bat gehitu behar duzu."
+
+#. TRANS: Client error.
+msgid "No local user or group nickname provided."
+msgstr "Ez da erabiltzaile edo talde goitizen lokalik eman."
+
+#. TRANS: Page title.
+msgid "OStatus Connect"
+msgstr "OStatus Koneksioa"
+
+#. TRANS: Server exception. %s is a URL.
+#, php-format
+msgid "Invalid avatar URL %s."
+msgstr "%s abatar URL okerra."
+
+#. TRANS: Server exception. %s is a URI.
+#, php-format
+msgid "Tried to update avatar for unsaved remote profile %s."
+msgstr "%s urruneko profilaren abatarraren eguneratze saioa."
+
+#. TRANS: Server exception. %s is a URL.
+#, php-format
+msgid "Unable to fetch avatar from %s."
+msgstr "Ezin izan da abatarra lortu %s helbidetik."
+
+#. TRANS: Exception. %s is a URL.
+#, php-format
+msgid "Could not find a feed URL for profile page %s."
+msgstr "Ezin izan da URL jario bat aurkitu %s profil orrian."
+
+#. TRANS: Exception.
+msgid "Not a valid webfinger address."
+msgstr "Webfinger helbide okerra."
+
+#. TRANS: Exception. %s is a webfinger address.
+#, php-format
+msgid "Could not find a valid profile for \"%s\"."
+msgstr "\"%s\"-rentzako ezin izan da baliozko profila aurkitu."
+
+#. TRANS: Server exception.
+msgid "Attempting to start PuSH subscription for feed with no hub."
+msgstr "PuSH harpidetzari hasera eman nahiean Hub gabeko jarioarentzat."
+
+#. TRANS: Server exception.
+msgid "Attempting to end PuSH subscription for feed with no hub."
+msgstr "PuSH harpidetzari amaiera eman nahiean Hub gabeko jarioarentzat."
+
+#. TRANS: Server exception. %s is a URI
+#, php-format
+msgid "Invalid ostatus_profile state: Two or more IDs set for %s."
+msgstr ""
+
+#. TRANS: Server exception. %s is a URI
+#, php-format
+msgid "Invalid ostatus_profile state: All IDs empty for %s."
+msgstr ""
+
+#. TRANS: Server exception.
+#. TRANS: %1$s is the method name the exception occured in, %2$s is the actor type.
+#, php-format
+msgid "Invalid actor passed to %1$s: %2$s."
+msgstr "Aktore baliogabea %1$s metodora pasa da: %2$s."
+
+#. TRANS: Server exception.
+msgid ""
+"Invalid type passed to Ostatus_profile::notify. It must be XML string or "
+"Activity entry."
+msgstr ""
+
+#. TRANS: Exception.
+msgid "Unknown feed format."
+msgstr "Jario formatu ezezaguna"
+
+#. TRANS: Exception.
+msgid "RSS feed without a channel."
+msgstr "Kanalik gabeko RSS jarioa."
+
+#. TRANS: Client exception thrown when trying to share multiple activities at once.
+msgid "Can only handle share activities with exactly one object."
+msgstr ""
+
+#. TRANS: Client exception thrown when trying to share a non-activity object.
+msgid "Can only handle shared activities."
+msgstr "Partekatutako ekintzak soilik kudeatu daitezke."
+
+#. TRANS: Client exception thrown when saving an activity share fails.
+#. TRANS: %s is a share ID.
+#, php-format
+msgid "Failed to save activity %s."
+msgstr "%s ekintza gordetzean akatsa."
+
+#. TRANS: Client exception. %s is a source URI.
+#, php-format
+msgid "No content for notice %s."
+msgstr "%s oharrak ez du edukirik."
+
+#. TRANS: Shown when a notice is longer than supported and/or when attachments are present. At runtime
+#. TRANS: this will usually be replaced with localised text from StatusNet core messages.
+msgid "Show more"
+msgstr "Erakutsi gehiago"
+
+#. TRANS: Exception. %s is a profile URL.
+#, php-format
+msgid "Could not reach profile page %s."
+msgstr "Ezin izan da %s profil orria sortu."
+
+#. TRANS: Feed sub exception.
+msgid "Cannot find enough profile information to make a feed."
+msgstr ""
+
+#. TRANS: Server exception.
+msgid "No author ID URI found."
+msgstr "Ez da egile ID URIrik topatu."
+
+#. TRANS: Exception.
+msgid "No profile URI."
+msgstr "Profil URIrik ez."
+
+#. TRANS: Exception.
+msgid "Local user cannot be referenced as remote."
+msgstr ""
+
+#. TRANS: Exception.
+msgid "Local group cannot be referenced as remote."
+msgstr ""
+
+#. TRANS: Exception.
+msgid "Local list cannot be referenced as remote."
+msgstr ""
+
+#. TRANS: Server exception.
+msgid "Cannot save local profile."
+msgstr "Ezin izan da profil lokala gorde."
+
+#. TRANS: Server exception.
+msgid "Cannot save local list."
+msgstr "Ezin da zerrenda lokala gorde."
+
+#. TRANS: Server exception.
+msgid "Cannot save OStatus profile."
+msgstr "Ezin izan da OStatus profila gorde."
+
+#. TRANS: Exception. %s is a webfinger address.
+#, php-format
+msgid "Could not save profile for \"%s\"."
+msgstr "\"%s(r)en\" profila ezin izan da gorde."
+
+#. TRANS: Exception. %s is a webfinger address.
+#, php-format
+msgid "Could not save OStatus profile for \"%s\"."
+msgstr "\"%s(r)en\" OStatus profila ezin izan da gorde."
+
+#. TRANS: Server exception.
+msgid "Could not store HTML content of long post as file."
+msgstr ""
+
+#. TRANS: Server exception.
+#. TRANS: %1$s is a protocol, %2$s is a URI.
+#, php-format
+msgid "Unrecognized URI protocol for profile: %1$s (%2$s)."
+msgstr "Profilarentzako URI protokolo ezezaguna: %1$s (%2$s)."
+
+#. TRANS: Server exception. %s is a URI.
+#, php-format
+msgid "No URI protocol for profile: %s."
+msgstr "Ez dago URI protokolorik profilarentzako: %s."
+
+#. TRANS: Client exception. %s is a HTTP status code.
+#, php-format
+msgid "Hub subscriber verification returned HTTP %s."
+msgstr ""
+
+#. TRANS: Exception. %1$s is a response status code, %2$s is the body of the response.
+#, php-format
+msgid "Callback returned status: %1$s. Body: %2$s"
+msgstr ""
+
+#. TRANS: Exception.
+msgid "Unable to locate signer public key."
+msgstr ""
+
+#. TRANS: Exception.
+msgid "Salmon invalid actor for signing."
+msgstr ""
+
+#. TRANS: Client error. POST is a HTTP command. It should not be translated.
+msgid "This method requires a POST."
+msgstr "Metodo honek POST behar du."
+
+#. TRANS: Client error. Do not translate "application/magic-envelope+xml".
+msgid "Salmon requires \"application/magic-envelope+xml\"."
+msgstr ""
+
+#. TRANS: Client error.
+msgid "Salmon signature verification failed."
+msgstr ""
+
+#. TRANS: Client error.
+msgid "Salmon post must be an Atom entry."
+msgstr ""
+"Salmon protokoloaren argitaratzeak Atom sarrera bat izan behar du.La "
+"publicación del protocolo Salmon debe ser una entrada Atom."
+
+#. TRANS: Client exception.
+msgid "Unrecognized activity type."
+msgstr "Ekitza mota ezezaguna."
+
+#. TRANS: Client exception.
+msgid "This target does not understand posts."
+msgstr ""
+
+#. TRANS: Client exception.
+msgid "This target does not understand follows."
+msgstr ""
+
+#. TRANS: Client exception.
+msgid "This target does not understand unfollows."
+msgstr ""
+
+#. TRANS: Client exception.
+msgid "This target does not understand favorites."
+msgstr ""
+
+#. TRANS: Client exception.
+msgid "This target does not understand unfavorites."
+msgstr ""
+
+#. TRANS: Client exception.
+msgid "This target does not understand share events."
+msgstr ""
+
+#. TRANS: Client exception.
+msgid "This target does not understand joins."
+msgstr ""
+
+#. TRANS: Client exception.
+msgid "This target does not understand leave events."
+msgstr ""
+
+#. TRANS: Client exception.
+msgid "This target does not understand list events."
+msgstr ""
+
+#. TRANS: Client exception.
+msgid "This target does not understand unlist events."
+msgstr ""
+
+#. TRANS: Exception.
+msgid "Received a salmon slap from unidentified actor."
+msgstr ""
diff --git a/plugins/OStatus/locale/fr/LC_MESSAGES/OStatus.po b/plugins/OStatus/locale/fr/LC_MESSAGES/OStatus.po
index 50f1503b18..f48fce4e42 100644
--- a/plugins/OStatus/locale/fr/LC_MESSAGES/OStatus.po
+++ b/plugins/OStatus/locale/fr/LC_MESSAGES/OStatus.po
@@ -1,9 +1,14 @@
-# Translation of StatusNet - OStatus to French (Français)
+# Translation of StatusNet - OStatus to French (français)
 # Exported from translatewiki.net
 #
 # Author: Brunoperel
+# Author: Davidtsm
+# Author: Gomoko
 # Author: IAlex
+# Author: JojoBoulix
+# Author: Od1n
 # Author: Peter17
+# Author: Valeryan 24
 # Author: Verdy p
 # --
 # This file is distributed under the same license as the StatusNet package.
@@ -12,18 +17,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OStatus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:43+0000\n"
-"Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:32+0000\n"
+"Language-Team: French <https://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:48+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-12-03 13:49:04+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-ostatus\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#. TRANS: String in the gettext speed test script. Unimportant.
 msgid "Feeds"
 msgstr "Flux d’informations"
 
@@ -33,9 +39,8 @@ msgid "Subscribe"
 msgstr "S'abonner"
 
 #. TRANS: Fieldset legend.
-#, fuzzy
-msgid "Tag remote profile"
-msgstr "Vous devez fournir un profil distant."
+msgid "List remote profile"
+msgstr "Lister le profil distant."
 
 #. TRANS: Field label.
 msgctxt "LABEL"
@@ -60,8 +65,8 @@ msgstr "Lister"
 msgid "Invalid URI."
 msgstr "URI invalide."
 
-#. TRANS: Error message in OStatus plugin.
-#. TRANS: Error text.
+#. TRANS: Error message in OStatus plugin. Do not translate the domain names example.com
+#. TRANS: and example.net, as these are official standard domain names for use in examples.
 msgid ""
 "Sorry, we could not reach that address. Please make sure that the OStatus "
 "address is like nickname@example.com or http://example.net/nickname."
@@ -130,10 +135,10 @@ msgid "Follow list"
 msgstr "Suivre la liste"
 
 #. TRANS: Success message for remote list follow through OStatus.
-#. TRANS: %1$s is the subscriber name, %2$s is the list, %3$s is the tagger's name.
-#, fuzzy, php-format
+#. TRANS: %1$s is the subscriber name, %2$s is the list, %3$s is the lister's name.
+#, php-format
 msgid "%1$s is now following people listed in %2$s by %3$s."
-msgstr "%1$s a cessé de suivre %2$s par %3$s."
+msgstr "%1$s suit maintenant les personnes listées dans %2$s par %3$s."
 
 #. TRANS: Exception thrown when subscription to remote list fails.
 msgid "Failed subscribing to remote list."
@@ -144,7 +149,7 @@ msgid "Unfollow list"
 msgstr "Ne plus suivre la liste"
 
 #. TRANS: Success message for remote list unfollow through OStatus.
-#. TRANS: %1$s is the subscriber name, %2$s is the list, %3$s is the tagger's name.
+#. TRANS: %1$s is the subscriber name, %2$s is the list, %3$s is the lister's name.
 #, php-format
 msgid "%1$s stopped following the list %2$s by %3$s."
 msgstr "%1$s a cessé de suivre %2$s par %3$s."
@@ -152,44 +157,43 @@ msgstr "%1$s a cessé de suivre %2$s par %3$s."
 #. TRANS: Title for listing a remote profile.
 msgctxt "TITLE"
 msgid "List"
-msgstr ""
+msgstr "Liste"
 
 #. TRANS: Success message for remote list addition through OStatus.
 #. TRANS: %1$s is the list creator's name, %2$s is the added list member, %3$s is the list name.
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s listed %2$s in the list %3$s."
-msgstr "%1$s a cessé de suivre %2$s."
+msgstr "%1$s a listé %2$s dans la liste %3$s."
 
 #. TRANS: Exception thrown when subscribing to a remote list fails.
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "Could not complete subscription to remote profile's feed. List %s could not "
 "be saved."
 msgstr ""
-"Impossible de compléter l'adhésion à un flux de profil distant. La balise %s "
+"Impossible de compléter l'adhésion au flux d'un profil distant. La liste %s "
 "n'a pas pu être sauvegardée."
 
 #. TRANS: Title for unlisting a remote profile.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Unlist"
-msgstr "Ne plus suivre la liste"
+msgstr "Ne plus lister"
 
 #. TRANS: Success message for remote list removal through OStatus.
 #. TRANS: %1$s is the list creator's name, %2$s is the removed list member, %3$s is the list name.
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s removed %2$s from the list %3$s."
-msgstr "%1$s a cessé de suivre %2$s."
+msgstr "%1$s a supprimé %2$s de la liste %3$s."
 
 #. TRANS: Title for unliking a remote notice.
 msgid "Unlike"
-msgstr ""
+msgstr "Ne plus aimer"
 
 #. TRANS: Success message for remove a favorite notice through OStatus.
 #. TRANS: %1$s is the unfavoring user's name, %2$s is URI to the no longer favored notice.
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s no longer likes %2$s."
-msgstr "%1$s a cessé de suivre %2$s."
+msgstr "%1$s n'aime plus %2$s."
 
 #. TRANS: Link text for link to remote subscribe.
 msgid "Remote"
@@ -205,9 +209,9 @@ msgstr "Mise à jour du profil"
 msgid "%s has updated their profile page."
 msgstr "%s a mis à jour sa page de profil."
 
-#. TRANS: Link text for a user to tag an OStatus user.
-msgid "Tag"
-msgstr ""
+#. TRANS: Link text for a user to list an OStatus user.
+msgid "List"
+msgstr "Liste"
 
 #. TRANS: Plugin description.
 msgid ""
@@ -257,20 +261,19 @@ msgstr ""
 "octets."
 
 #. TRANS: Client exception. %s is a feed URL.
-#, fuzzy, php-format
+#, php-format
 msgid "Invalid hub.topic \"%s\". User does not exist."
-msgstr ""
-"Le sujet de concentrateur « %s » est invalide. L’utilisateur n’existe pas."
+msgstr "hub.topic \"%s\" non valide. L'utilisateur n'existe pas."
 
 #. TRANS: Client exception. %s is a feed URL.
-#, fuzzy, php-format
+#, php-format
 msgid "Invalid hub.topic \"%s\". Group does not exist."
-msgstr "Le sujet de concentrateur « %s » est invalide. Le groupe n’existe pas."
+msgstr "hub.topic \"%s\" non valide. Le groupe n’existe pas."
 
 #. TRANS: Client exception. %s is a feed URL.
-#, fuzzy, php-format
+#, php-format
 msgid "Invalid hub.topic %s; list does not exist."
-msgstr "Le sujet de concentrateur « %s » est invalide. Le groupe n’existe pas."
+msgstr "hub.topic %s non valide; la liste n’existe pas."
 
 #. TRANS: Client exception.
 #. TRANS: %1$s is this argument to the method this exception occurs in, %2$s is a URL.
@@ -278,38 +281,35 @@ msgstr "Le sujet de concentrateur « %s » est invalide. Le groupe n’existe pa
 msgid "Invalid URL passed for %1$s: \"%2$s\""
 msgstr "URL invalide passée à la méthode « %1$s » : « %2$s »"
 
-#. TRANS: Client error displayed when trying to tag a local object as if it is remote.
-#, fuzzy
-msgid "You can use the local tagging!"
-msgstr "Vous pouvez utiliser l’abonnement local !"
+#. TRANS: Client error displayed when trying to list a local object as if it is remote.
+msgid "You can use the local list functionality!"
+msgstr "Vous pouvez utiliser la fonctionnalité de liste locale!"
 
-#. TRANS: Header for tagging a remote object. %s is a remote object's name.
+#. TRANS: Header for listing a remote object. %s is a remote object's name.
 #, php-format
-msgid "Tag %s"
-msgstr ""
+msgid "List %s"
+msgstr "Liste %s"
 
-#. TRANS: Button text to tag a remote object.
+#. TRANS: Button text to list a remote object.
 msgctxt "BUTTON"
 msgid "Go"
-msgstr ""
+msgstr "Aller"
 
 #. TRANS: Field label.
 msgid "User nickname"
 msgstr "Pseudonyme de l’utilisateur"
 
 #. TRANS: Field title.
-#, fuzzy
-msgid "Nickname of the user you want to tag."
-msgstr "Pseudonyme de l’utilisateur que vous voulez marquer."
+msgid "Nickname of the user you want to list."
+msgstr "Pseudonyme de l’utilisateur que vous voulez lister."
 
 #. TRANS: Field label.
 msgid "Profile Account"
 msgstr "Compte de profil"
 
 #. TRANS: Field title.
-#, fuzzy
-msgid "Your account id (i.e. user@identi.ca)."
-msgstr "Votre identifiant de compte (utilisateur@identi.ca, par exemple)."
+msgid "Your account id (for example user@identi.ca)."
+msgstr "Votre identifiant (utilisateur@identi.ca, par exemple)."
 
 #. TRANS: Client error displayed when remote profile could not be looked up.
 #. TRANS: Client error.
@@ -389,6 +389,7 @@ msgstr "Confirmer"
 msgid "Subscribe to this user"
 msgstr "S’abonner à cet utilisateur"
 
+#. TRANS: Extra paragraph in remote profile view when already subscribed.
 msgid "You are already subscribed to this user."
 msgstr "Vous êtes déjà abonné à cet utilisateur."
 
@@ -407,7 +408,7 @@ msgstr "Déjà abonné !"
 
 #. TRANS: OStatus remote subscription dialog error.
 msgid "Remote subscription failed!"
-msgstr "Ĺ’abonnement distant a échoué !"
+msgstr "L’abonnement distant a échoué !"
 
 #. TRANS: Client error displayed when the session token does not match or is not given.
 msgid "There was a problem with your session token. Try again, please."
@@ -435,7 +436,8 @@ msgstr ""
 msgid "Join group"
 msgstr "Rejoindre le groupe"
 
-#. TRANS: Tooltip for field label "Join group".
+#. TRANS: Tooltip for field label "Join group". Do not translate the "example.net"
+#. TRANS: domain name in the URL, as it is an official standard domain name for examples.
 msgid "OStatus group's address, like http://example.net/group/nickname."
 msgstr ""
 "Une adresse de groupe OStatus telle que « http://example.net/group/pseudonyme "
@@ -488,11 +490,11 @@ msgstr ""
 
 #. TRANS: Client exception.
 msgid "To the attention of user(s), not including this one."
-msgstr ""
+msgstr "À l'attention de(s) l'utilisateur(s), non compris celui-ci."
 
 #. TRANS: Client exception.
 msgid "Not to anyone in reply to anything."
-msgstr ""
+msgstr "Pas à quiconque en réponse à quelque chose."
 
 #. TRANS: Client exception.
 msgid "This is already a favorite."
@@ -504,45 +506,43 @@ msgstr "Impossible de sauvegarder le nouveau favori."
 
 #. TRANS: Client exception.
 msgid "Notice was not favorited!"
-msgstr ""
+msgstr "L'avis n'a pas été mis en favori!"
 
 #. TRANS: Client exception.
 msgid "Not a person object."
-msgstr ""
+msgstr "Pas un objet personne."
 
 #. TRANS: Client exception.
-msgid "Unidentified profile being tagged."
-msgstr ""
+msgid "Unidentified profile being listed."
+msgstr "Profil non identifié listé."
 
 #. TRANS: Client exception.
-msgid "This user is not the one being tagged."
-msgstr ""
+msgid "This user is not the one being listed."
+msgstr "Cet utilisateur n'est pas celui listé."
 
 #. TRANS: Client exception.
-msgid "The tag could not be saved."
-msgstr ""
+msgid "The listing could not be saved."
+msgstr "La liste n'a pas pu être sauvée."
 
 #. TRANS: Client exception.
-msgid "Unidentified profile being untagged."
-msgstr ""
+msgid "Unidentified profile being unlisted."
+msgstr "Profil non identifié retiré de la liste."
 
 #. TRANS: Client exception.
-msgid "This user is not the one being untagged."
-msgstr ""
+msgid "This user is not the one being unlisted."
+msgstr "Cet utilisateur n'est pas celui retiré de la liste."
 
 #. TRANS: Client exception.
-msgid "The tag could not be deleted."
-msgstr ""
+msgid "The listing could not be deleted."
+msgstr "La liste n'a pas pu être supprimée."
 
 #. TRANS: Client exception.
 msgid "Cannot favorite/unfavorite without an object."
 msgstr "Impossible de mettre en favoris ou retirer des favoris sans un objet."
 
 #. TRANS: Client exception.
-#, fuzzy
 msgid "Cannot handle that kind of object for liking/faving."
-msgstr ""
-"Impossible de gérer ce genre d’objet parmi les sujets appréciés ou favoris."
+msgstr "Impossible de gérer ce genre d’objet dans les aimés/favoris."
 
 #. TRANS: Client exception. %s is an object ID.
 #, php-format
@@ -559,10 +559,9 @@ msgid "Subscribe to list"
 msgstr "S'abonner à la liste"
 
 #. TRANS: Field title.
-#, fuzzy
 msgid "Address of the OStatus list, like http://example.net/user/all/tag."
 msgstr ""
-"Une adresse de groupe OStatus, par exemple http://example.net/user/all/tag"
+"Adresse de la liste OStatus, par exemple http://example.net/user/all/tag."
 
 #. TRANS: Error text displayed when trying to subscribe to a list already a subscriber to.
 msgid "You are already subscribed to this list."
@@ -573,13 +572,12 @@ msgid "Confirm subscription to remote list"
 msgstr "Confirmer l’adhésion au groupe distant"
 
 #. TRANS: Instructions for OStatus list subscription form.
-#, fuzzy
 msgid ""
 "You can subscribe to lists from other supported sites. Paste the list's URI "
 "below:"
 msgstr ""
-"Vous pouvez souscrire aux groupes d’autres sites supportés. Collez l’adresse "
-"URI du profil du groupe ci-dessous :"
+"Vous pouvez vous abonner aux listes des autres sites supportés. Collez l’URI "
+"de la liste ci-dessous:"
 
 #. TRANS: Client error.
 msgid "No such group."
@@ -630,10 +628,9 @@ msgstr ""
 "Impossible d’accepter des envois distants de messages pour une liste distant."
 
 #. TRANS: Client error displayed when referring to a non-existing remote list.
-#, fuzzy
 msgid "Cannot read profile to set up list subscription."
 msgstr ""
-"Impossible de lire le profil pour mettre en place l’adhésion à un groupe."
+"Impossible de lire le profil pour mettre en place l'abonnement à une liste."
 
 #. TRANS: Client error displayed when trying to subscribe a group to a list.
 #. TRANS: Client error displayed when trying to unsubscribe a group from a list.
@@ -647,15 +644,14 @@ msgid "Could not subscribe remote user %1$s to list %2$s."
 msgstr "Impossible d’inscrire l’utilisateur distant %1$s à la liste %2$s."
 
 #. TRANS: Client error displayed when trying to unsubscribe from non-existing list.
-#, fuzzy
 msgid "Cannot read profile to cancel list subscription."
-msgstr "Impossible de lire le profil pour annuler l’adhésion à une liste."
+msgstr "Ne peut pas lire le profile afin d'annuler l'inscription à la liste."
 
 #. TRANS: Client error displayed when trying to unsubscribe a remote user from a list fails.
 #. TRANS: %1$s is a profile URL, %2$s is a list name.
-#, fuzzy, php-format
+#, php-format
 msgid "Could not unsubscribe remote user %1$s from list %2$s."
-msgstr "Impossible d’inscrire l’utilisateur distant %1$s à la liste %2$s."
+msgstr "Impossible de désinscrire l’utilisateur distant %1$s de la liste %2$s."
 
 #. TRANS: Client error.
 msgid "You can use the local subscription!"
@@ -676,7 +672,7 @@ msgctxt "BUTTON"
 msgid "Join"
 msgstr "Rejoindre"
 
-#. TRANS: Form legend. %1$s is a list, %2$s is a tagger's name.
+#. TRANS: Form legend. %1$s is a list, %2$s is a lister's name.
 #, php-format
 msgid "Subscribe to list %1$s by %2$s"
 msgstr "S’abonner à la liste %1$s par %2$s"
@@ -720,6 +716,39 @@ msgstr "Aucun utilisateur local ou pseudonyme de groupe fourni."
 msgid "OStatus Connect"
 msgstr "Connexion OStatus"
 
+#. TRANS: Server exception. %s is a URL.
+#, php-format
+msgid "Invalid avatar URL %s."
+msgstr "Adresse URL d’avatar « %s » invalide."
+
+#. TRANS: Server exception. %s is a URI.
+#, php-format
+msgid "Tried to update avatar for unsaved remote profile %s."
+msgstr ""
+"Tente de mettre à jour l’avatar associé au profil distant non sauvegardé « %s "
+"»."
+
+#. TRANS: Server exception. %s is a URL.
+#, php-format
+msgid "Unable to fetch avatar from %s."
+msgstr "Impossible de récupérer l’avatar depuis « %s »."
+
+#. TRANS: Exception. %s is a URL.
+#, php-format
+msgid "Could not find a feed URL for profile page %s."
+msgstr ""
+"Impossible de trouver une adresse URL de flux d’information pour la page de "
+"profil « %s »."
+
+#. TRANS: Exception.
+msgid "Not a valid webfinger address."
+msgstr "Ce n’est pas une adresse « webfinger » valide."
+
+#. TRANS: Exception. %s is a webfinger address.
+#, php-format
+msgid "Could not find a valid profile for \"%s\"."
+msgstr "Impossible de trouver un profil valide pour \"%s\"."
+
 #. TRANS: Server exception.
 msgid "Attempting to start PuSH subscription for feed with no hub."
 msgstr ""
@@ -733,16 +762,16 @@ msgstr ""
 "concentrateur."
 
 #. TRANS: Server exception. %s is a URI
-#, fuzzy, php-format
+#, php-format
 msgid "Invalid ostatus_profile state: Two or more IDs set for %s."
 msgstr ""
-"État invalide du profil OStatus : deux identifiants ou + ont été définis "
-"pour %s."
+"État ostatus_profile non valide: Deux ensembles d'identifiants ou plus ont "
+"été définis pour %s."
 
 #. TRANS: Server exception. %s is a URI
-#, fuzzy, php-format
+#, php-format
 msgid "Invalid ostatus_profile state: All IDs empty for %s."
-msgstr "État invalide du profil OStatus : aucun identifiant renseigné pour %s."
+msgstr "ostatus_profile invalide : aucun identifiant renseigné pour %s."
 
 #. TRANS: Server exception.
 #. TRANS: %1$s is the method name the exception occured in, %2$s is the actor type.
@@ -766,6 +795,22 @@ msgstr "Format de flux d’information inconnu."
 msgid "RSS feed without a channel."
 msgstr "Flux RSS sans canal."
 
+#. TRANS: Client exception thrown when trying to share multiple activities at once.
+msgid "Can only handle share activities with exactly one object."
+msgstr ""
+"Peut seulement gérer le partage des activités avec exactement un unique "
+"objet."
+
+#. TRANS: Client exception thrown when trying to share a non-activity object.
+msgid "Can only handle shared activities."
+msgstr "Peut seulement gérer les activités partagées."
+
+#. TRANS: Client exception thrown when saving an activity share fails.
+#. TRANS: %s is a share ID.
+#, php-format
+msgid "Failed to save activity %s."
+msgstr "Échec à l'enregistrement de l'activité %s."
+
 #. TRANS: Client exception. %s is a source URI.
 #, php-format
 msgid "No content for notice %s."
@@ -781,39 +826,15 @@ msgstr "Voir davantage"
 msgid "Could not reach profile page %s."
 msgstr "Impossible d’atteindre la page de profil « %s »."
 
-#. TRANS: Exception. %s is a URL.
-#, php-format
-msgid "Could not find a feed URL for profile page %s."
-msgstr ""
-"Impossible de trouver une adresse URL de flux d’information pour la page de "
-"profil « %s »."
-
 #. TRANS: Feed sub exception.
 msgid "Cannot find enough profile information to make a feed."
 msgstr ""
 "Impossible de trouver assez d’informations de profil pour créer un flux "
 "d’information."
 
-#. TRANS: Server exception. %s is a URL.
-#, php-format
-msgid "Invalid avatar URL %s."
-msgstr "Adresse URL d’avatar « %s » invalide."
-
-#. TRANS: Server exception. %s is a URI.
-#, php-format
-msgid "Tried to update avatar for unsaved remote profile %s."
-msgstr ""
-"Tente de mettre à jour l’avatar associé au profil distant non sauvegardé « %s "
-"»."
-
-#. TRANS: Server exception. %s is a URL.
-#, php-format
-msgid "Unable to fetch avatar from %s."
-msgstr "Impossible de récupérer l’avatar depuis « %s »."
-
 #. TRANS: Server exception.
 msgid "No author ID URI found."
-msgstr ""
+msgstr "Aucune ID d'auteur de l'URI trouvé."
 
 #. TRANS: Exception.
 msgid "No profile URI."
@@ -843,10 +864,6 @@ msgstr "Impossible de sauvegarder la liste locale."
 msgid "Cannot save OStatus profile."
 msgstr "Impossible de sauvegarder le profil OStatus."
 
-#. TRANS: Exception.
-msgid "Not a valid webfinger address."
-msgstr "Ce n’est pas une adresse « webfinger » valide."
-
 #. TRANS: Exception. %s is a webfinger address.
 #, php-format
 msgid "Could not save profile for \"%s\"."
@@ -857,11 +874,6 @@ msgstr "Impossible de sauvegarder le profil pour \"%s\"."
 msgid "Could not save OStatus profile for \"%s\"."
 msgstr "Impossible d’enregistrer le profil OStatus pour \"%s\"."
 
-#. TRANS: Exception. %s is a webfinger address.
-#, php-format
-msgid "Could not find a valid profile for \"%s\"."
-msgstr "Impossible de trouver un profil valide pour \"%s\"."
-
 #. TRANS: Server exception.
 msgid "Could not store HTML content of long post as file."
 msgstr ""
@@ -923,9 +935,8 @@ msgid "This target does not understand posts."
 msgstr "Cette cible ne reconnaît pas les publications."
 
 #. TRANS: Client exception.
-#, fuzzy
 msgid "This target does not understand follows."
-msgstr "Cette cible ne reconnaît pas les indications de début de suivi."
+msgstr "Cette cible ne reconnaît pas les suivis."
 
 #. TRANS: Client exception.
 msgid "This target does not understand unfollows."
@@ -952,38 +963,13 @@ msgid "This target does not understand leave events."
 msgstr "Cette cible ne reconnaît pas les indications de retrait d’événement."
 
 #. TRANS: Client exception.
-#, fuzzy
-msgid "This target does not understand tag events."
-msgstr "Cette cible ne reconnaît pas les évènements partagés."
+msgid "This target does not understand list events."
+msgstr "Cette cible ne reconnaît pas les évènements de liste."
 
 #. TRANS: Client exception.
-#, fuzzy
-msgid "This target does not understand untag events."
-msgstr "Cette cible ne reconnaît pas les évènements partagés."
+msgid "This target does not understand unlist events."
+msgstr "Cette cible ne reconnaît pas les évènements de retirer des listes."
 
 #. TRANS: Exception.
 msgid "Received a salmon slap from unidentified actor."
 msgstr "Réception d’une giffle Salmon d’un acteur non identifié."
-
-#~ msgctxt "TITLE"
-#~ msgid "Tag"
-#~ msgstr "Marquer"
-
-#~ msgid "Disfavor"
-#~ msgstr "Retirer des favoris"
-
-#~ msgid "%1$s marked notice %2$s as no longer a favorite."
-#~ msgstr "%1$s a retiré l’avis %2$s de ses favoris."
-
-#~ msgid ""
-#~ "OStatus user's address, like nickname@example.com or http://example.net/"
-#~ "nickname"
-#~ msgstr ""
-#~ "Adresse d’un utilisateur OStatus ou de sa page de profil, telle que "
-#~ "pseudonyme@example.com ou http://example.net/pseudonyme"
-
-#~ msgid "Continue"
-#~ msgstr "Continuer"
-
-#~ msgid "Could not remove remote user %1$s from list %2$s."
-#~ msgstr "Impossible de retirer l’utilisateur distant %1$s de la liste %2$s."
diff --git a/plugins/OStatus/locale/gl/LC_MESSAGES/OStatus.po b/plugins/OStatus/locale/gl/LC_MESSAGES/OStatus.po
index bf492b90e3..8def4d8975 100644
--- a/plugins/OStatus/locale/gl/LC_MESSAGES/OStatus.po
+++ b/plugins/OStatus/locale/gl/LC_MESSAGES/OStatus.po
@@ -1,5 +1,5 @@
-# Translation of StatusNet - OStatus to Galician (Galego)
-# Expored from translatewiki.net
+# Translation of StatusNet - OStatus to Galician (galego)
+# Exported from translatewiki.net
 #
 # Author: Toliño
 # --
@@ -9,748 +9,945 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OStatus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:33:50+0000\n"
-"Language-Team: Galician <http://translatewiki.net/wiki/Portal:gl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:32+0000\n"
+"Language-Team: Galician <https://translatewiki.net/wiki/Portal:gl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:06+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-12-03 13:49:04+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: gl\n"
 "X-Message-Group: #out-statusnet-plugin-ostatus\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#. TRANS: Link description for link to subscribe to a remote user.
+#. TRANS: String in the gettext speed test script. Unimportant.
+msgid "Feeds"
+msgstr "Fontes de novas"
+
+#. TRANS: Link to subscribe to a remote entity.
 #. TRANS: Link text for a user to subscribe to an OStatus user.
-#: OStatusPlugin.php:223 OStatusPlugin.php:933
 msgid "Subscribe"
 msgstr "Subscribirse"
 
-#. TRANS: Link description for link to join a remote group.
-#: OStatusPlugin.php:242 OStatusPlugin.php:651 actions/ostatussub.php:109
-msgid "Join"
-msgstr "Unirse"
+#. TRANS: Fieldset legend.
+msgid "List remote profile"
+msgstr "Listar un perfil remoto"
 
-#. TRANSLATE: %s is a domain.
-#: OStatusPlugin.php:455
+#. TRANS: Field label.
+msgctxt "LABEL"
+msgid "Remote profile"
+msgstr "Perfil remoto"
+
+#. TRANS: Field title.
+#. TRANS: Tooltip for field label "Subscribe to".
+msgid ""
+"OStatus user's address, like nickname@example.com or http://example.net/"
+"nickname."
+msgstr ""
+"Enderezo dun usuario do OStatus, por exemplo alcume@example.com ou http://"
+"example.net/alcume."
+
+#. TRANS: Button text to fetch remote profile.
+msgctxt "BUTTON"
+msgid "Fetch"
+msgstr "Mostrar"
+
+#. TRANS: Exception in OStatus when invalid URI was entered.
+msgid "Invalid URI."
+msgstr "Enderezo URI inválido."
+
+#. TRANS: Error message in OStatus plugin. Do not translate the domain names example.com
+#. TRANS: and example.net, as these are official standard domain names for use in examples.
+msgid ""
+"Sorry, we could not reach that address. Please make sure that the OStatus "
+"address is like nickname@example.com or http://example.net/nickname."
+msgstr ""
+"Sentímolo, non atopamos ese enderezo. Asegúrese de que o enderezo do OStatus "
+"é da forma alcume@example.com ou http://example.net/alcume."
+
+#. TRANS: Title. %s is a domain name.
 #, php-format
 msgid "Sent from %s via OStatus"
-msgstr ""
+msgstr "Enviado desde %s a través do OStatus"
 
-#. TRANS: Exception.
-#: OStatusPlugin.php:527
+#. TRANS: Exception thrown when setup of remote subscription fails.
 msgid "Could not set up remote subscription."
-msgstr ""
+msgstr "Non se puido configurar a subscrición remota."
 
-#: OStatusPlugin.php:601
+#. TRANS: Title for unfollowing a remote profile.
+msgctxt "TITLE"
 msgid "Unfollow"
-msgstr ""
+msgstr "Deixar de seguir"
 
 #. TRANS: Success message for unsubscribe from user attempt through OStatus.
 #. TRANS: %1$s is the unsubscriber's name, %2$s is the unsubscribed user's name.
-#: OStatusPlugin.php:604
 #, php-format
 msgid "%1$s stopped following %2$s."
-msgstr ""
+msgstr "%1$s deixou seguir a %2$s."
 
-#: OStatusPlugin.php:632
+#. TRANS: Exception thrown when setup of remote group membership fails.
 msgid "Could not set up remote group membership."
-msgstr ""
+msgstr "Non se puido establecer a pertenza ao grupo remoto."
+
+#. TRANS: Title for joining a remote groep.
+msgctxt "TITLE"
+msgid "Join"
+msgstr "Unirse"
 
 #. TRANS: Success message for subscribe to group attempt through OStatus.
 #. TRANS: %1$s is the member name, %2$s is the subscribed group's name.
-#: OStatusPlugin.php:654
 #, php-format
 msgid "%1$s has joined group %2$s."
-msgstr ""
+msgstr "%1$s uniuse ao grupo %2$s."
 
-#. TRANS: Exception.
-#: OStatusPlugin.php:663
+#. TRANS: Exception thrown when joining a remote group fails.
 msgid "Failed joining remote group."
-msgstr ""
+msgstr "Erro ao unirse ao grupo remoto."
 
-#: OStatusPlugin.php:703
+#. TRANS: Title for leaving a remote group.
+msgctxt "TITLE"
 msgid "Leave"
 msgstr "Deixar"
 
 #. TRANS: Success message for unsubscribe from group attempt through OStatus.
 #. TRANS: %1$s is the member name, %2$s is the unsubscribed group's name.
-#: OStatusPlugin.php:706
 #, php-format
 msgid "%1$s has left group %2$s."
-msgstr ""
+msgstr "%1$s deixou o grupo %2$s."
 
-#: OStatusPlugin.php:781
-msgid "Disfavor"
+#. TRANS: Exception thrown when setup of remote list subscription fails.
+msgid "Could not set up remote list subscription."
+msgstr "Non se puido configurar a subscrición á lista remota."
+
+#. TRANS: Title for following a remote list.
+msgctxt "TITLE"
+msgid "Follow list"
+msgstr "Seguir a lista"
+
+#. TRANS: Success message for remote list follow through OStatus.
+#. TRANS: %1$s is the subscriber name, %2$s is the list, %3$s is the lister's name.
+#, php-format
+msgid "%1$s is now following people listed in %2$s by %3$s."
+msgstr "%1$s está a seguir a xente da lista %2$s de %3$s."
+
+#. TRANS: Exception thrown when subscription to remote list fails.
+msgid "Failed subscribing to remote list."
+msgstr "Erro ao subscribirse á lista remota."
+
+#. TRANS: Title for unfollowing a remote list.
+msgid "Unfollow list"
+msgstr "Non seguir a lista"
+
+#. TRANS: Success message for remote list unfollow through OStatus.
+#. TRANS: %1$s is the subscriber name, %2$s is the list, %3$s is the lister's name.
+#, php-format
+msgid "%1$s stopped following the list %2$s by %3$s."
+msgstr "%1$s deixou de seguir a lista %2$s de %3$s."
+
+#. TRANS: Title for listing a remote profile.
+msgctxt "TITLE"
+msgid "List"
+msgstr "Listar"
+
+#. TRANS: Success message for remote list addition through OStatus.
+#. TRANS: %1$s is the list creator's name, %2$s is the added list member, %3$s is the list name.
+#, php-format
+msgid "%1$s listed %2$s in the list %3$s."
+msgstr "%1$s incluíu a %2$s na lista %3$s."
+
+#. TRANS: Exception thrown when subscribing to a remote list fails.
+#, php-format
+msgid ""
+"Could not complete subscription to remote profile's feed. List %s could not "
+"be saved."
 msgstr ""
+"Non se puido completar a subscrición á fonte de novas do perfil remoto. A "
+"lista %s non se pode gardar."
+
+#. TRANS: Title for unlisting a remote profile.
+msgctxt "TITLE"
+msgid "Unlist"
+msgstr "Retirar da lista"
+
+#. TRANS: Success message for remote list removal through OStatus.
+#. TRANS: %1$s is the list creator's name, %2$s is the removed list member, %3$s is the list name.
+#, php-format
+msgid "%1$s removed %2$s from the list %3$s."
+msgstr "%1$s eliminou a %2$s na lista %3$s."
+
+#. TRANS: Title for unliking a remote notice.
+msgid "Unlike"
+msgstr "Deixar de gustar"
 
 #. TRANS: Success message for remove a favorite notice through OStatus.
 #. TRANS: %1$s is the unfavoring user's name, %2$s is URI to the no longer favored notice.
-#: OStatusPlugin.php:784
 #, php-format
-msgid "%1$s marked notice %2$s as no longer a favorite."
-msgstr ""
+msgid "%1$s no longer likes %2$s."
+msgstr "%1$s xa non gusta de %2$s."
 
 #. TRANS: Link text for link to remote subscribe.
-#: OStatusPlugin.php:860
 msgid "Remote"
-msgstr ""
+msgstr "Remoto"
 
 #. TRANS: Title for activity.
-#: OStatusPlugin.php:900
 msgid "Profile update"
 msgstr "Actualización do perfil"
 
 #. TRANS: Ping text for remote profile update through OStatus.
 #. TRANS: %s is user that updated their profile.
-#: OStatusPlugin.php:903
 #, php-format
 msgid "%s has updated their profile page."
-msgstr ""
+msgstr "%s actualizou o seu perfil."
+
+#. TRANS: Link text for a user to list an OStatus user.
+msgid "List"
+msgstr "Listar"
 
 #. TRANS: Plugin description.
-#: OStatusPlugin.php:948
 msgid ""
 "Follow people across social networks that implement <a href=\"http://ostatus."
 "org/\">OStatus</a>."
 msgstr ""
-
-#: classes/FeedSub.php:252
-msgid "Attempting to start PuSH subscription for feed with no hub."
-msgstr ""
-
-#: classes/FeedSub.php:282
-msgid "Attempting to end PuSH subscription for feed with no hub."
-msgstr ""
-
-#. TRANS: Server exception. %s is a URI.
-#: classes/Ostatus_profile.php:192
-#, php-format
-msgid "Invalid ostatus_profile state: both group and profile IDs set for %s."
-msgstr ""
-
-#. TRANS: Server exception. %s is a URI.
-#: classes/Ostatus_profile.php:195
-#, php-format
-msgid "Invalid ostatus_profile state: both group and profile IDs empty for %s."
-msgstr ""
-
-#. TRANS: Server exception.
-#. TRANS: %1$s is the method name the exception occured in, %2$s is the actor type.
-#: classes/Ostatus_profile.php:285
-#, php-format
-msgid "Invalid actor passed to %1$s: %2$s."
-msgstr ""
-
-#. TRANS: Server exception.
-#: classes/Ostatus_profile.php:378
-msgid ""
-"Invalid type passed to Ostatus_profile::notify. It must be XML string or "
-"Activity entry."
-msgstr ""
-
-#. TRANS: Exception.
-#: classes/Ostatus_profile.php:409
-msgid "Unknown feed format."
-msgstr ""
-
-#. TRANS: Exception.
-#: classes/Ostatus_profile.php:433
-msgid "RSS feed without a channel."
-msgstr ""
+"Seguir xente a través das redes sociais que integren o <a href=\"http://"
+"ostatus.org/\">OStatus</a>."
 
 #. TRANS: Client exception.
-#: classes/Ostatus_profile.php:479
-msgid "Can't handle that kind of post."
-msgstr ""
-
-#. TRANS: Client exception. %s is a source URI.
-#: classes/Ostatus_profile.php:537
-#, php-format
-msgid "No content for notice %s."
-msgstr ""
-
-#. TRANS: Shown when a notice is longer than supported and/or when attachments are present. At runtime
-#. TRANS: this will usually be replaced with localised text from StatusNet core messages.
-#: classes/Ostatus_profile.php:572
-msgid "Show more"
-msgstr "Mostrar máis"
-
-#. TRANS: Exception. %s is a profile URL.
-#: classes/Ostatus_profile.php:765
-#, php-format
-msgid "Could not reach profile page %s."
-msgstr ""
-
-#. TRANS: Exception. %s is a URL.
-#: classes/Ostatus_profile.php:823
-#, php-format
-msgid "Could not find a feed URL for profile page %s."
-msgstr ""
-
-#. TRANS: Feed sub exception.
-#: classes/Ostatus_profile.php:922
-msgid "Can't find enough profile information to make a feed."
-msgstr ""
-
-#. TRANS: Server exception. %s is a URL.
-#: classes/Ostatus_profile.php:986
-#, php-format
-msgid "Invalid avatar URL %s."
-msgstr ""
-
-#. TRANS: Server exception. %s is a URI.
-#: classes/Ostatus_profile.php:997
-#, php-format
-msgid "Tried to update avatar for unsaved remote profile %s."
-msgstr ""
-
-#. TRANS: Server exception. %s is a URL.
-#: classes/Ostatus_profile.php:1007
-#, php-format
-msgid "Unable to fetch avatar from %s."
-msgstr ""
-
-#. TRANS: Exception.
-#: classes/Ostatus_profile.php:1233
-msgid "Local user can't be referenced as remote."
-msgstr ""
-
-#. TRANS: Exception.
-#: classes/Ostatus_profile.php:1238
-msgid "Local group can't be referenced as remote."
-msgstr ""
-
-#. TRANS: Server exception.
-#: classes/Ostatus_profile.php:1290 classes/Ostatus_profile.php:1301
-msgid "Can't save local profile."
-msgstr ""
-
-#. TRANS: Server exception.
-#: classes/Ostatus_profile.php:1309
-msgid "Can't save OStatus profile."
-msgstr ""
-
-#. TRANS: Exception.
-#: classes/Ostatus_profile.php:1573 classes/Ostatus_profile.php:1601
-msgid "Not a valid webfinger address."
-msgstr ""
-
-#. TRANS: Exception. %s is a webfinger address.
-#: classes/Ostatus_profile.php:1683
-#, php-format
-msgid "Couldn't save profile for \"%s\"."
-msgstr ""
-
-#. TRANS: Exception. %s is a webfinger address.
-#: classes/Ostatus_profile.php:1702
-#, php-format
-msgid "Couldn't save ostatus_profile for \"%s\"."
-msgstr ""
-
-#. TRANS: Exception. %s is a webfinger address.
-#: classes/Ostatus_profile.php:1710
-#, php-format
-msgid "Couldn't find a valid profile for \"%s\"."
-msgstr ""
-
-#. TRANS: Server exception.
-#: classes/Ostatus_profile.php:1753
-msgid "Could not store HTML content of long post as file."
-msgstr ""
-
-#. TRANS: Client exception. %s is a HTTP status code.
-#: classes/HubSub.php:212
-#, php-format
-msgid "Hub subscriber verification returned HTTP %s."
-msgstr ""
-
-#. TRANS: Exception. %1$s is a response status code, %2$s is the body of the response.
-#: classes/HubSub.php:359
-#, php-format
-msgid "Callback returned status: %1$s. Body: %2$s"
-msgstr ""
-
-#. TRANS: Client error. POST is a HTTP command. It should not be translated.
-#: lib/salmonaction.php:43
-msgid "This method requires a POST."
-msgstr ""
-
-#. TRANS: Client error. Do not translate "application/magic-envelope+xml"
-#: lib/salmonaction.php:48
-msgid "Salmon requires \"application/magic-envelope+xml\"."
-msgstr ""
-
-#. TRANS: Client error.
-#: lib/salmonaction.php:58
-msgid "Salmon signature verification failed."
-msgstr ""
-
-#. TRANS: Client error.
-#: lib/salmonaction.php:70
-msgid "Salmon post must be an Atom entry."
-msgstr ""
-
-#. TRANS: Client exception.
-#: lib/salmonaction.php:120
-msgid "Unrecognized activity type."
-msgstr ""
-
-#. TRANS: Client exception.
-#: lib/salmonaction.php:130
-msgid "This target doesn't understand posts."
-msgstr ""
-
-#. TRANS: Client exception.
-#: lib/salmonaction.php:136
-msgid "This target doesn't understand follows."
-msgstr ""
-
-#. TRANS: Client exception.
-#: lib/salmonaction.php:142
-msgid "This target doesn't understand unfollows."
-msgstr ""
-
-#. TRANS: Client exception.
-#: lib/salmonaction.php:148
-msgid "This target doesn't understand favorites."
-msgstr ""
-
-#. TRANS: Client exception.
-#: lib/salmonaction.php:154
-msgid "This target doesn't understand unfavorites."
-msgstr ""
-
-#. TRANS: Client exception.
-#: lib/salmonaction.php:160
-msgid "This target doesn't understand share events."
-msgstr ""
-
-#. TRANS: Client exception.
-#: lib/salmonaction.php:166
-msgid "This target doesn't understand joins."
-msgstr ""
-
-#. TRANS: Client exception.
-#: lib/salmonaction.php:172
-msgid "This target doesn't understand leave events."
-msgstr ""
-
-#. TRANS: Exception.
-#: lib/salmonaction.php:200
-msgid "Received a salmon slap from unidentified actor."
-msgstr ""
-
-#. TRANS: Exception.
-#: lib/discovery.php:110
-#, php-format
-msgid "Unable to find services for %s."
-msgstr ""
-
-#. TRANS: Exception.
-#: lib/magicenvelope.php:80
-msgid "Unable to locate signer public key."
-msgstr ""
-
-#. TRANS: Exception.
-#: lib/salmon.php:93
-msgid "Salmon invalid actor for signing."
-msgstr ""
-
-#: tests/gettext-speedtest.php:57
-msgid "Feeds"
-msgstr "Fontes de novas"
-
-#. TRANS: Client exception.
-#: actions/pushhub.php:70
 msgid "Publishing outside feeds not supported."
-msgstr ""
+msgstr "Non está soportada a publicación fóra das fontes de novas."
 
 #. TRANS: Client exception. %s is a mode.
-#: actions/pushhub.php:73
 #, php-format
 msgid "Unrecognized mode \"%s\"."
-msgstr ""
+msgstr "Non se recoñece o modo \"%s\"."
 
 #. TRANS: Client exception. %s is a topic.
-#: actions/pushhub.php:93
 #, php-format
 msgid ""
 "Unsupported hub.topic %s this hub only serves local user and group Atom "
 "feeds."
 msgstr ""
+"Non se soporta o hub.topic %s. Este centro de actividade serve unicamente "
+"aos usuarios locais e ás fontes de novas Atom."
 
-#. TRANS: Client exception.
-#: actions/pushhub.php:99
+#. TRANS: Client exception. %s is sync or async.
 #, php-format
 msgid "Invalid hub.verify \"%s\". It must be sync or async."
 msgstr ""
+"Verificación hub.verify inválida: \"%s\". Debe ser \"sync\" ou \"async\"."
 
-#. TRANS: Client exception.
-#: actions/pushhub.php:105
+#. TRANS: Client exception. %s is the invalid lease value.
 #, php-format
 msgid "Invalid hub.lease \"%s\". It must be empty or positive integer."
 msgstr ""
+"Arrendamento hub.lease inválido: \"%s\". Debe estar baleiro ou ser un "
+"enteiro positivo."
 
-#. TRANS: Client exception.
-#: actions/pushhub.php:113
+#. TRANS: Client exception. %s is the invalid hub secret.
 #, php-format
 msgid "Invalid hub.secret \"%s\". It must be under 200 bytes."
 msgstr ""
+"Frase secreta hub.secret inválida: \"%s\". Debe ser menos de 200 bytes."
 
-#. TRANS: Client exception.
-#: actions/pushhub.php:165
+#. TRANS: Client exception. %s is a feed URL.
 #, php-format
-msgid "Invalid hub.topic \"%s\". User doesn't exist."
-msgstr ""
+msgid "Invalid hub.topic \"%s\". User does not exist."
+msgstr "Tema hub.topic inválido: \"%s\". O usuario non existe."
 
-#. TRANS: Client exception.
-#: actions/pushhub.php:174
+#. TRANS: Client exception. %s is a feed URL.
 #, php-format
-msgid "Invalid hub.topic \"%s\". Group doesn't exist."
-msgstr ""
+msgid "Invalid hub.topic \"%s\". Group does not exist."
+msgstr "Tema hub.topic inválido: \"%s\". O grupo non existe."
+
+#. TRANS: Client exception. %s is a feed URL.
+#, php-format
+msgid "Invalid hub.topic %s; list does not exist."
+msgstr "Tema hub.topic inválido: \"%s\". A lista non existe."
 
 #. TRANS: Client exception.
 #. TRANS: %1$s is this argument to the method this exception occurs in, %2$s is a URL.
-#: actions/pushhub.php:199
 #, php-format
 msgid "Invalid URL passed for %1$s: \"%2$s\""
-msgstr ""
+msgstr "Pasóuselle un enderezo URL inválido a %1$s: \"%2$s\""
 
-#: actions/ownerxrd.php:39 actions/usersalmon.php:43
-msgid "No such user."
-msgstr ""
+#. TRANS: Client error displayed when trying to list a local object as if it is remote.
+msgid "You can use the local list functionality!"
+msgstr "Pode empregar a funcionalidade de lista local!"
 
-#. TRANS: Client error.
-#: actions/usersalmon.php:37 actions/groupsalmon.php:40
-msgid "No ID."
-msgstr ""
-
-#. TRANS: Client exception.
-#: actions/usersalmon.php:83
-msgid "In reply to unknown notice."
-msgstr ""
-
-#. TRANS: Client exception.
-#: actions/usersalmon.php:88
-msgid "In reply to a notice not by this user and not mentioning this user."
-msgstr ""
-
-#. TRANS: Client exception.
-#: actions/usersalmon.php:165
-msgid "Could not save new favorite."
-msgstr ""
-
-#. TRANS: Client exception.
-#: actions/usersalmon.php:197
-msgid "Can't favorite/unfavorite without an object."
-msgstr ""
-
-#. TRANS: Client exception.
-#: actions/usersalmon.php:209
-msgid "Can't handle that kind of object for liking/faving."
-msgstr ""
-
-#. TRANS: Client exception. %s is an object ID.
-#: actions/usersalmon.php:216
+#. TRANS: Header for listing a remote object. %s is a remote object's name.
 #, php-format
-msgid "Notice with ID %s unknown."
-msgstr ""
+msgid "List %s"
+msgstr "Listar %s"
 
-#. TRANS: Client exception. %1$s is a notice ID, %2$s is a user ID.
-#: actions/usersalmon.php:221
-#, php-format
-msgid "Notice with ID %1$s not posted by %2$s."
-msgstr ""
+#. TRANS: Button text to list a remote object.
+msgctxt "BUTTON"
+msgid "Go"
+msgstr "Ir"
 
 #. TRANS: Field label.
-#: actions/ostatusgroup.php:78
-msgid "Join group"
-msgstr "Unirse ao grupo"
+msgid "User nickname"
+msgstr "Alcume do usuario"
 
-#. TRANS: Tooltip for field label "Join group".
-#: actions/ostatusgroup.php:81
-msgid "OStatus group's address, like http://example.net/group/nickname."
-msgstr ""
+#. TRANS: Field title.
+msgid "Nickname of the user you want to list."
+msgstr "Alcume do usuario ao que quere listar."
 
-#. TRANS: Button text.
-#: actions/ostatusgroup.php:86 actions/ostatussub.php:75
-msgctxt "BUTTON"
-msgid "Continue"
-msgstr ""
+#. TRANS: Field label.
+msgid "Profile Account"
+msgstr "Conta de perfil"
 
-#: actions/ostatusgroup.php:105
-msgid "You are already a member of this group."
-msgstr ""
-
-#. TRANS: OStatus remote group subscription dialog error.
-#: actions/ostatusgroup.php:140
-msgid "Already a member!"
-msgstr ""
-
-#. TRANS: OStatus remote group subscription dialog error.
-#: actions/ostatusgroup.php:151
-msgid "Remote group join failed!"
-msgstr ""
-
-#. TRANS: OStatus remote group subscription dialog error.
-#: actions/ostatusgroup.php:155
-msgid "Remote group join aborted!"
-msgstr ""
-
-#. TRANS: Page title for OStatus remote group join form
-#: actions/ostatusgroup.php:167
-msgid "Confirm joining remote group"
-msgstr ""
-
-#. TRANS: Instructions.
-#: actions/ostatusgroup.php:178
-msgid ""
-"You can subscribe to groups from other supported sites. Paste the group's "
-"profile URI below:"
-msgstr ""
+#. TRANS: Field title.
+msgid "Your account id (for example user@identi.ca)."
+msgstr "O ID da súa conta (por exemplo, usuario@identi.ca)."
 
+#. TRANS: Client error displayed when remote profile could not be looked up.
 #. TRANS: Client error.
-#: actions/groupsalmon.php:47
-msgid "No such group."
-msgstr ""
+msgid "Could not look up OStatus account profile."
+msgstr "Non pode consultar o perfil da conta do OStatus."
 
+#. TRANS: Client error displayed when remote profile address could not be confirmed.
 #. TRANS: Client error.
-#: actions/groupsalmon.php:56
-msgid "Can't accept remote posts for a remote group."
-msgstr ""
+msgid "Could not confirm remote profile address."
+msgstr "Non se puido confirmar o enderezo do perfil remoto."
 
-#. TRANS: Client error.
-#: actions/groupsalmon.php:130
-msgid "Can't read profile to set up group membership."
-msgstr ""
+#. TRANS: Title for an OStatus list.
+msgid "OStatus list"
+msgstr "Lista de OStatus"
 
-#. TRANS: Client error.
-#: actions/groupsalmon.php:134 actions/groupsalmon.php:177
-msgid "Groups can't join groups."
-msgstr ""
+#. TRANS: Server exception thrown when referring to a non-existing or empty feed.
+msgid "Empty or invalid feed id."
+msgstr "O ID da fonte de novas é inválido ou está baleiro."
 
-#: actions/groupsalmon.php:147
-msgid "You have been blocked from that group by the admin."
-msgstr ""
-
-#. TRANS: Server error. %1$s is a profile URI, %2$s is a group nickname.
-#: actions/groupsalmon.php:162
+#. TRANS: Server exception. %s is a feed ID.
 #, php-format
-msgid "Could not join remote user %1$s to group %2$s."
-msgstr ""
+msgid "Unknown PuSH feed id %s"
+msgstr "Descoñécese o ID da fonte de novas %s"
 
-#: actions/groupsalmon.php:174
-msgid "Can't read profile to cancel group membership."
-msgstr ""
-
-#. TRANS: Server error. %1$s is a profile URI, %2$s is a group nickname.
-#: actions/groupsalmon.php:191
+#. TRANS: Client exception. %s is an invalid feed name.
 #, php-format
-msgid "Could not remove remote user %1$s from group %2$s."
-msgstr ""
+msgid "Bad hub.topic feed \"%s\"."
+msgstr "Fonte de novas hub.topic incorrecta: \"%s\"."
+
+#. TRANS: Client exception. %1$s the invalid token, %2$s is the topic for which the invalid token was given.
+#, php-format
+msgid "Bad hub.verify_token %1$s for %2$s."
+msgstr "Pase hub.verify_token incorrecto %1$s para %2$s."
+
+#. TRANS: Client exception. %s is an invalid topic.
+#, php-format
+msgid "Unexpected subscribe request for %s."
+msgstr "Solicitude de subscrición inesperada para %s."
+
+#. TRANS: Client exception. %s is an invalid topic.
+#, php-format
+msgid "Unexpected unsubscribe request for %s."
+msgstr "Solicitude de cancelación da subscrición inesperada para %s."
+
+#. TRANS: Client error displayed when referring to a non-existing user.
+#. TRANS: Client error.
+msgid "No such user."
+msgstr "Non existe tal usuario."
 
 #. TRANS: Field label for a field that takes an OStatus user address.
-#: actions/ostatussub.php:68
 msgid "Subscribe to"
 msgstr "Subscribirse a"
 
-#. TRANS: Tooltip for field label "Subscribe to".
-#: actions/ostatussub.php:71
-msgid ""
-"OStatus user's address, like nickname@example.com or http://example.net/"
-"nickname"
-msgstr ""
+#. TRANS: Button text.
+#. TRANS: Button text to continue joining a remote list.
+msgctxt "BUTTON"
+msgid "Continue"
+msgstr "Continuar"
 
 #. TRANS: Button text.
+msgid "Join"
+msgstr "Unirse"
+
 #. TRANS: Tooltip for button "Join".
-#: actions/ostatussub.php:112
 msgctxt "BUTTON"
 msgid "Join this group"
 msgstr "Unirse a este grupo"
 
 #. TRANS: Button text.
-#: actions/ostatussub.php:115
 msgctxt "BUTTON"
 msgid "Confirm"
 msgstr "Confirmar"
 
 #. TRANS: Tooltip for button "Confirm".
-#: actions/ostatussub.php:117
 msgid "Subscribe to this user"
 msgstr "Subscribirse a este usuario"
 
-#: actions/ostatussub.php:138
+#. TRANS: Extra paragraph in remote profile view when already subscribed.
 msgid "You are already subscribed to this user."
 msgstr "Xa está subscrito a este usuario."
 
-#: actions/ostatussub.php:167
-msgid "Photo"
-msgstr "Foto"
-
-#: actions/ostatussub.php:178
-msgid "Nickname"
-msgstr "Alcume"
-
-#: actions/ostatussub.php:199
-msgid "Location"
-msgstr "Localización"
-
-#: actions/ostatussub.php:208
-msgid "URL"
-msgstr "URL"
-
-#: actions/ostatussub.php:220
-msgid "Note"
-msgstr "Nota"
-
 #. TRANS: Error text.
-#: actions/ostatussub.php:256 actions/ostatussub.php:263
-#: actions/ostatussub.php:288
-msgid ""
-"Sorry, we could not reach that address. Please make sure that the OStatus "
-"address is like nickname@example.com or http://example.net/nickname."
-msgstr ""
-
-#. TRANS: Error text.
-#: actions/ostatussub.php:267 actions/ostatussub.php:271
-#: actions/ostatussub.php:275 actions/ostatussub.php:279
-#: actions/ostatussub.php:283
 msgid ""
 "Sorry, we could not reach that feed. Please try that OStatus address again "
 "later."
 msgstr ""
+"Sentímolo, non atopamos esa fonte de novas. Inténteo de novo con ese "
+"enderezo máis tarde."
 
 #. TRANS: OStatus remote subscription dialog error.
-#: actions/ostatussub.php:317
+#. TRANS: OStatus remote group subscription dialog error.
 msgid "Already subscribed!"
 msgstr "Xa está subscrito!"
 
 #. TRANS: OStatus remote subscription dialog error.
-#: actions/ostatussub.php:322
 msgid "Remote subscription failed!"
-msgstr ""
+msgstr "Erro na subscrición remota!"
 
-#: actions/ostatussub.php:369 actions/ostatusinit.php:64
+#. TRANS: Client error displayed when the session token does not match or is not given.
 msgid "There was a problem with your session token. Try again, please."
 msgstr "Houbo un erro co seu pase. Inténteo de novo."
 
 #. TRANS: Form title.
-#: actions/ostatussub.php:397 actions/ostatusinit.php:83
 msgid "Subscribe to user"
 msgstr "Subscribirse ao usuario"
 
-#. TRANS: Page title for OStatus remote subscription form
-#: actions/ostatussub.php:417
+#. TRANS: Page title for OStatus remote subscription form.
 msgid "Confirm"
 msgstr "Confirmar"
 
 #. TRANS: Instructions.
-#: actions/ostatussub.php:429
 msgid ""
 "You can subscribe to users from other supported sites. Paste their address "
 "or profile URI below:"
 msgstr ""
+"Pode subscribirse a usuarios doutros sitios soportados. Pegue o seu enderezo "
+"ou o URI do seu perfil a continuación:"
+
+#. TRANS: Field label.
+msgid "Join group"
+msgstr "Unirse ao grupo"
+
+#. TRANS: Tooltip for field label "Join group". Do not translate the "example.net"
+#. TRANS: domain name in the URL, as it is an official standard domain name for examples.
+msgid "OStatus group's address, like http://example.net/group/nickname."
+msgstr "Un enderezo de grupo do OStatus, como http://example.net/group/alcume."
+
+#. TRANS: Error text displayed when trying to join a remote group the user is already a member of.
+msgid "You are already a member of this group."
+msgstr "Xa forma parte dese grupo."
+
+#. TRANS: OStatus remote group subscription dialog error.
+msgid "Already a member!"
+msgstr "Xa é membro!"
+
+#. TRANS: OStatus remote group subscription dialog error.
+msgid "Remote group join failed!"
+msgstr "Erro ao unirse ao grupo remoto!"
+
+#. TRANS: Page title for OStatus remote group join form
+msgid "Confirm joining remote group"
+msgstr "Confirmar a unión ao grupo remoto"
+
+#. TRANS: Form instructions.
+msgid ""
+"You can subscribe to groups from other supported sites. Paste the group's "
+"profile URI below:"
+msgstr ""
+"Pode subscribirse a grupos doutros sitios soportados. Pegue o URI do perfil "
+"do grupo a continuación:"
+
+#. TRANS: Client error displayed trying to perform an action without providing an ID.
+#. TRANS: Client error.
+#. TRANS: Client error displayed trying to perform an action without providing an ID.
+msgid "No ID."
+msgstr "Sen ID."
+
+#. TRANS: Client exception thrown when an undefied activity is performed.
+#. TRANS: Client exception.
+msgid "Cannot handle that kind of post."
+msgstr "Non se pode manexar ese tipo de publicación."
+
+#. TRANS: Client exception.
+msgid "In reply to unknown notice."
+msgstr "En resposta a unha nota descoñecida."
+
+#. TRANS: Client exception.
+msgid "In reply to a notice not by this user and not mentioning this user."
+msgstr ""
+"En resposta a unha nota que non é deste usuario e que tampouco o menciona."
+
+#. TRANS: Client exception.
+msgid "To the attention of user(s), not including this one."
+msgstr "� atención do(s) usuario(s), sen incluír este."
+
+#. TRANS: Client exception.
+msgid "Not to anyone in reply to anything."
+msgstr "A ninguén en resposta a nada."
+
+#. TRANS: Client exception.
+msgid "This is already a favorite."
+msgstr "Xa é dos favoritos."
+
+#. TRANS: Client exception.
+msgid "Could not save new favorite."
+msgstr "Non se puido gardar o novo favorito."
+
+#. TRANS: Client exception.
+msgid "Notice was not favorited!"
+msgstr "A nota non se engadiu aos favoritos!"
+
+#. TRANS: Client exception.
+msgid "Not a person object."
+msgstr "Non é un obxecto persoal."
+
+#. TRANS: Client exception.
+msgid "Unidentified profile being listed."
+msgstr "Hai listado un perfil non identificado."
+
+#. TRANS: Client exception.
+msgid "This user is not the one being listed."
+msgstr "Este non é o usuario que está listado."
+
+#. TRANS: Client exception.
+msgid "The listing could not be saved."
+msgstr "Non se pode gardar a lista."
+
+#. TRANS: Client exception.
+msgid "Unidentified profile being unlisted."
+msgstr "Hai retirado da lista un perfil non identificado."
+
+#. TRANS: Client exception.
+msgid "This user is not the one being unlisted."
+msgstr "Este non é o usuario que está retirado da lista."
+
+#. TRANS: Client exception.
+msgid "The listing could not be deleted."
+msgstr "Non se pode borrar a lista."
+
+#. TRANS: Client exception.
+msgid "Cannot favorite/unfavorite without an object."
+msgstr "Non se pode engadir ou eliminar dos favoritos sen un obxecto."
+
+#. TRANS: Client exception.
+msgid "Cannot handle that kind of object for liking/faving."
+msgstr ""
+"Non se pode manexar ese tipo de obxecto para gustar ou engadir aos favoritos."
+
+#. TRANS: Client exception. %s is an object ID.
+#, php-format
+msgid "Notice with ID %s unknown."
+msgstr "Descoñécese a nota co ID %s."
+
+#. TRANS: Client exception. %1$s is a notice ID, %2$s is a user ID.
+#, php-format
+msgid "Notice with ID %1$s not posted by %2$s."
+msgstr "A nota co ID %1$s non foi publicada por %2$s"
+
+#. TRANS: Field label.
+msgid "Subscribe to list"
+msgstr "Subscribirse á lista"
+
+#. TRANS: Field title.
+msgid "Address of the OStatus list, like http://example.net/user/all/tag."
+msgstr ""
+"Enderezo da lista do OStatus, como http://example.net/user/all/etiqueta."
+
+#. TRANS: Error text displayed when trying to subscribe to a list already a subscriber to.
+msgid "You are already subscribed to this list."
+msgstr "Xa está subscrito a esta lista."
+
+#. TRANS: Page title for OStatus remote list subscription form
+msgid "Confirm subscription to remote list"
+msgstr "Confirmar a subscrición á lista remota"
+
+#. TRANS: Instructions for OStatus list subscription form.
+msgid ""
+"You can subscribe to lists from other supported sites. Paste the list's URI "
+"below:"
+msgstr ""
+"Pode subscribirse a listas doutros sitios soportados. Pegue o URI da lista a "
+"continuación:"
+
+#. TRANS: Client error.
+msgid "No such group."
+msgstr "Non existe tal grupo."
+
+#. TRANS: Client error.
+msgid "Cannot accept remote posts for a remote group."
+msgstr "Non se poden aceptar publicacións remotas para un grupo remoto."
+
+#. TRANS: Client error.
+msgid "Cannot read profile to set up group membership."
+msgstr "Non se pode ler o perfil para configurar a pertenza ao grupo."
+
+#. TRANS: Client error.
+#. TRANS: Client error displayed when trying to have a group join another group.
+msgid "Groups cannot join groups."
+msgstr "Os grupos non se poden unir aos grupos."
+
+#. TRANS: Client error displayed when trying to join a group the user is blocked from by a group admin.
+msgid "You have been blocked from that group by the admin."
+msgstr "O administrador bloqueouno nese grupo."
+
+#. TRANS: Server error. %1$s is a profile URI, %2$s is a group nickname.
+#, php-format
+msgid "Could not join remote user %1$s to group %2$s."
+msgstr "O usuario remoto %1$s non se puido engadir ao grupo %2$s."
+
+#. TRANS: Client error displayed when group membership cannot be cancelled
+#. TRANS: because the remote profile could not be read.
+msgid "Cannot read profile to cancel group membership."
+msgstr "Non se pode ler o perfil para cancelar a pertenza ao grupo."
+
+#. TRANS: Server error. %1$s is a profile URI, %2$s is a group nickname.
+#, php-format
+msgid "Could not remove remote user %1$s from group %2$s."
+msgstr "O usuario remoto %1$s non se puido eliminar do grupo %2$s."
+
+#. TRANS: Client error displayed when referring to a non-existing list.
+#. TRANS: Client error.
+msgid "No such list."
+msgstr "Non existe tal lista."
+
+#. TRANS: Client error displayed when trying to send a message to a remote list.
+msgid "Cannot accept remote posts for a remote list."
+msgstr "Non se poden aceptar publicacións remotas para unha lista remota."
+
+#. TRANS: Client error displayed when referring to a non-existing remote list.
+msgid "Cannot read profile to set up list subscription."
+msgstr "Non se pode ler o perfil para configurar a subscrición á lista."
+
+#. TRANS: Client error displayed when trying to subscribe a group to a list.
+#. TRANS: Client error displayed when trying to unsubscribe a group from a list.
+msgid "Groups cannot subscribe to lists."
+msgstr "Os grupos non se poden subscribir ás listas."
+
+#. TRANS: Server error displayed when subscribing a remote user to a list fails.
+#. TRANS: %1$s is a profile URI, %2$s is a list name.
+#, php-format
+msgid "Could not subscribe remote user %1$s to list %2$s."
+msgstr "O usuario remoto %1$s non se puido subscribir á lista %2$s."
+
+#. TRANS: Client error displayed when trying to unsubscribe from non-existing list.
+msgid "Cannot read profile to cancel list subscription."
+msgstr "Non se pode ler o perfil para cancelar a subscrición á lista."
+
+#. TRANS: Client error displayed when trying to unsubscribe a remote user from a list fails.
+#. TRANS: %1$s is a profile URL, %2$s is a list name.
+#, php-format
+msgid "Could not unsubscribe remote user %1$s from list %2$s."
+msgstr "O usuario remoto %1$s non puido cancelar a subscrición á lista %2$s."
 
 #. TRANS: Client error.
-#: actions/ostatusinit.php:42
 msgid "You can use the local subscription!"
 msgstr "Pode usar a subscrición local!"
 
-#. TRANS: Form legend.
-#: actions/ostatusinit.php:98
+#. TRANS: Form title.
+msgctxt "TITLE"
+msgid "Subscribe to user"
+msgstr "Subscribirse ao usuario"
+
+#. TRANS: Form legend. %s is a group name.
 #, php-format
 msgid "Join group %s"
 msgstr "Unirse ao grupo \"%s\""
 
-#. TRANS: Button text.
-#: actions/ostatusinit.php:100
+#. TRANS: Button text to join a group.
 msgctxt "BUTTON"
 msgid "Join"
 msgstr "Unirse"
 
-#. TRANS: Form legend.
-#: actions/ostatusinit.php:103
+#. TRANS: Form legend. %1$s is a list, %2$s is a lister's name.
 #, php-format
-msgid "Subscribe to %s"
-msgstr "Subscribirse a %s"
+msgid "Subscribe to list %1$s by %2$s"
+msgstr "Subscribirse á lista %1$s de %2$s"
 
-#. TRANS: Button text.
-#: actions/ostatusinit.php:105
+#. TRANS: Button text to subscribe to a list.
+#. TRANS: Button text to subscribe to a profile.
 msgctxt "BUTTON"
 msgid "Subscribe"
 msgstr "Subscribirse"
 
-#. TRANS: Field label.
-#: actions/ostatusinit.php:118
-msgid "User nickname"
-msgstr "Alcume do usuario"
+#. TRANS: Form legend. %s is a nickname.
+#, php-format
+msgid "Subscribe to %s"
+msgstr "Subscribirse a %s"
 
-#: actions/ostatusinit.php:119
+#. TRANS: Field label.
+msgid "Group nickname"
+msgstr "Alcume do grupo"
+
+#. TRANS: Field title.
+msgid "Nickname of the group you want to join."
+msgstr "Alcume do grupo ao que se quere unir."
+
+#. TRANS: Field title.
 msgid "Nickname of the user you want to follow."
 msgstr "Alcume do usuario ao que quere seguir."
 
-#. TRANS: Field label.
-#: actions/ostatusinit.php:124
-msgid "Profile Account"
-msgstr "Conta de perfil"
-
 #. TRANS: Tooltip for field label "Profile Account".
-#: actions/ostatusinit.php:126
-msgid "Your account id (e.g. user@identi.ca)."
-msgstr ""
+msgid "Your account ID (e.g. user@identi.ca)."
+msgstr "O ID da súa conta (por exemplo, usuario@identi.ca)."
 
 #. TRANS: Client error.
-#: actions/ostatusinit.php:148
 msgid "Must provide a remote profile."
-msgstr ""
+msgstr "Cómpre especificar un perfil remoto."
 
 #. TRANS: Client error.
-#: actions/ostatusinit.php:160
-msgid "Couldn't look up OStatus account profile."
-msgstr ""
-
-#. TRANS: Client error.
-#: actions/ostatusinit.php:173
-msgid "Couldn't confirm remote profile address."
-msgstr ""
+msgid "No local user or group nickname provided."
+msgstr "Non se proporcionou ningún usuario local ou alcume de grupo."
 
 #. TRANS: Page title.
-#: actions/ostatusinit.php:218
 msgid "OStatus Connect"
-msgstr ""
+msgstr "Conexión OStatus"
 
-#: actions/pushcallback.php:50
-msgid "Empty or invalid feed id."
-msgstr ""
-
-#. TRANS: Server exception. %s is a feed ID.
-#: actions/pushcallback.php:56
+#. TRANS: Server exception. %s is a URL.
 #, php-format
-msgid "Unknown PuSH feed id %s"
-msgstr ""
+msgid "Invalid avatar URL %s."
+msgstr "O enderezo URL do avatar, %s, é incorrecto."
 
-#. TRANS: Client exception. %s is an invalid feed name.
-#: actions/pushcallback.php:96
+#. TRANS: Server exception. %s is a URI.
 #, php-format
-msgid "Bad hub.topic feed \"%s\"."
+msgid "Tried to update avatar for unsaved remote profile %s."
 msgstr ""
+"Intentouse actualizar o avatar asociado ao perfil remoto non gardado %s."
 
-#. TRANS: Client exception. %1$s the invalid token, %2$s is the topic for which the invalid token was given.
-#: actions/pushcallback.php:101
+#. TRANS: Server exception. %s is a URL.
 #, php-format
-msgid "Bad hub.verify_token %1$s for %2$s."
-msgstr ""
+msgid "Unable to fetch avatar from %s."
+msgstr "Non se puido recuperar o avatar desde %s."
 
-#. TRANS: Client exception. %s is an invalid topic.
-#: actions/pushcallback.php:108
+#. TRANS: Exception. %s is a URL.
 #, php-format
-msgid "Unexpected subscribe request for %s."
+msgid "Could not find a feed URL for profile page %s."
 msgstr ""
+"Non se puido atopar un enderezo URL de fonte de novas para a páxina de "
+"perfil %s."
 
-#. TRANS: Client exception. %s is an invalid topic.
-#: actions/pushcallback.php:113
+#. TRANS: Exception.
+msgid "Not a valid webfinger address."
+msgstr "O enderezo de webfinger é incorrecto."
+
+#. TRANS: Exception. %s is a webfinger address.
 #, php-format
-msgid "Unexpected unsubscribe request for %s."
+msgid "Could not find a valid profile for \"%s\"."
+msgstr "Non se puido gardar un perfil válido para \"%s\"."
+
+#. TRANS: Server exception.
+msgid "Attempting to start PuSH subscription for feed with no hub."
 msgstr ""
+"Intentando iniciar a subscrición PuSH para a fonte de novas sen centro de "
+"actividade."
+
+#. TRANS: Server exception.
+msgid "Attempting to end PuSH subscription for feed with no hub."
+msgstr ""
+"Intentando rematar a subscrición PuSH para a fonte de novas sen centro de "
+"actividade."
+
+#. TRANS: Server exception. %s is a URI
+#, php-format
+msgid "Invalid ostatus_profile state: Two or more IDs set for %s."
+msgstr ""
+"Estado ostatus_profile inválido: Hai definidos dous ou máis identificadores "
+"para %s."
+
+#. TRANS: Server exception. %s is a URI
+#, php-format
+msgid "Invalid ostatus_profile state: All IDs empty for %s."
+msgstr ""
+"Estado ostatus_profile inválido: Todos os identificadores están baleiros "
+"para %s."
+
+#. TRANS: Server exception.
+#. TRANS: %1$s is the method name the exception occured in, %2$s is the actor type.
+#, php-format
+msgid "Invalid actor passed to %1$s: %2$s."
+msgstr "Pasóuselle un tipo de actor inválido ao método %1$s: %2$s."
+
+#. TRANS: Server exception.
+msgid ""
+"Invalid type passed to Ostatus_profile::notify. It must be XML string or "
+"Activity entry."
+msgstr ""
+"Pasóuselle un tipo inválido ao método Ostatus_profile::notify. Debera ser "
+"unha cadea XML ou unha entrada de actividade."
+
+#. TRANS: Exception.
+msgid "Unknown feed format."
+msgstr "Formato de fonte de novas descoñecido."
+
+#. TRANS: Exception.
+msgid "RSS feed without a channel."
+msgstr "Fonte de novas RSS sen canle."
+
+#. TRANS: Client exception thrown when trying to share multiple activities at once.
+msgid "Can only handle share activities with exactly one object."
+msgstr "Pode manexar unicamente actividades con exactamente un obxecto."
+
+#. TRANS: Client exception thrown when trying to share a non-activity object.
+msgid "Can only handle shared activities."
+msgstr "Só pode manexar actividades compartidas."
+
+#. TRANS: Client exception thrown when saving an activity share fails.
+#. TRANS: %s is a share ID.
+#, php-format
+msgid "Failed to save activity %s."
+msgstr "Erro ao gardar a actividade %s."
+
+#. TRANS: Client exception. %s is a source URI.
+#, php-format
+msgid "No content for notice %s."
+msgstr "A nota %s non ten ningún contido."
+
+#. TRANS: Shown when a notice is longer than supported and/or when attachments are present. At runtime
+#. TRANS: this will usually be replaced with localised text from StatusNet core messages.
+msgid "Show more"
+msgstr "Mostrar máis"
+
+#. TRANS: Exception. %s is a profile URL.
+#, php-format
+msgid "Could not reach profile page %s."
+msgstr "Non se puido atopar a páxina de perfil %s."
+
+#. TRANS: Feed sub exception.
+msgid "Cannot find enough profile information to make a feed."
+msgstr ""
+"Non abonda a información de perfil atopada para xerar unha fonte de novas."
+
+#. TRANS: Server exception.
+msgid "No author ID URI found."
+msgstr "Non se atopou ningún URI de identificador de usuario."
+
+#. TRANS: Exception.
+msgid "No profile URI."
+msgstr "Ningún URI de perfil."
+
+#. TRANS: Exception.
+msgid "Local user cannot be referenced as remote."
+msgstr "O usuario local non se pode referenciar como remoto."
+
+#. TRANS: Exception.
+msgid "Local group cannot be referenced as remote."
+msgstr "O grupo local non se pode referenciar como remoto."
+
+#. TRANS: Exception.
+msgid "Local list cannot be referenced as remote."
+msgstr "A lista local non se pode referenciar como remota."
+
+#. TRANS: Server exception.
+msgid "Cannot save local profile."
+msgstr "Non se pode gardar o perfil local."
+
+#. TRANS: Server exception.
+msgid "Cannot save local list."
+msgstr "Non se pode gardar a lista local."
+
+#. TRANS: Server exception.
+msgid "Cannot save OStatus profile."
+msgstr "Non se pode gardar o perfil do OStatus."
+
+#. TRANS: Exception. %s is a webfinger address.
+#, php-format
+msgid "Could not save profile for \"%s\"."
+msgstr "Non se puido gardar o perfil de \"%s\"."
+
+#. TRANS: Exception. %s is a webfinger address.
+#, php-format
+msgid "Could not save OStatus profile for \"%s\"."
+msgstr "Non se puido gardar o perfil do OStatus para \"%s\"."
+
+#. TRANS: Server exception.
+msgid "Could not store HTML content of long post as file."
+msgstr "Non se puido almacenar como ficheiro o contido HTML da mensaxe longa."
+
+#. TRANS: Server exception.
+#. TRANS: %1$s is a protocol, %2$s is a URI.
+#, php-format
+msgid "Unrecognized URI protocol for profile: %1$s (%2$s)."
+msgstr "Protocolo URI non recoñecido para o perfil: %1$s (%2$s)."
+
+#. TRANS: Server exception. %s is a URI.
+#, php-format
+msgid "No URI protocol for profile: %s."
+msgstr "Non se atopou o protocolo URI para o perfil: %s."
+
+#. TRANS: Client exception. %s is a HTTP status code.
+#, php-format
+msgid "Hub subscriber verification returned HTTP %s."
+msgstr ""
+"A verificación de subscrición ao centro de actividade devolveu o código de "
+"estado HTTP %s."
+
+#. TRANS: Exception. %1$s is a response status code, %2$s is the body of the response.
+#, php-format
+msgid "Callback returned status: %1$s. Body: %2$s"
+msgstr "A chamada de retorno devolveu o seguinte estado: %1$s. Corpo: %2$s"
+
+#. TRANS: Exception.
+msgid "Unable to locate signer public key."
+msgstr "Non se puido atopar a clave pública do asinante."
+
+#. TRANS: Exception.
+msgid "Salmon invalid actor for signing."
+msgstr "O actor do protocolo Salmon é inválido para asinar."
+
+#. TRANS: Client error. POST is a HTTP command. It should not be translated.
+msgid "This method requires a POST."
+msgstr "Este método require un comando HTTP POST."
+
+#. TRANS: Client error. Do not translate "application/magic-envelope+xml".
+msgid "Salmon requires \"application/magic-envelope+xml\"."
+msgstr "O protocolo Salmon necesita \"application/magic-envelope+xml\"."
+
+#. TRANS: Client error.
+msgid "Salmon signature verification failed."
+msgstr "Erro na verificación de sinatura do protocolo Salmon."
+
+#. TRANS: Client error.
+msgid "Salmon post must be an Atom entry."
+msgstr "A publicación do protocolo Salmon debe ser unha entrada de Atom."
+
+#. TRANS: Client exception.
+msgid "Unrecognized activity type."
+msgstr "Non se recoñece o tipo de actividade."
+
+#. TRANS: Client exception.
+msgid "This target does not understand posts."
+msgstr "Este obxectivo non entende as publicacións."
+
+#. TRANS: Client exception.
+msgid "This target does not understand follows."
+msgstr "Este obxectivo non entende os seguimentos."
+
+#. TRANS: Client exception.
+msgid "This target does not understand unfollows."
+msgstr "Este obxectivo non entende a indicación de rematar o seguimento."
+
+#. TRANS: Client exception.
+msgid "This target does not understand favorites."
+msgstr "Este obxectivo non entende os favoritos."
+
+#. TRANS: Client exception.
+msgid "This target does not understand unfavorites."
+msgstr "Este obxectivo non entende a indicación de eliminar os favoritos."
+
+#. TRANS: Client exception.
+msgid "This target does not understand share events."
+msgstr "Este obxectivo non entende a indicación de compartir os eventos."
+
+#. TRANS: Client exception.
+msgid "This target does not understand joins."
+msgstr "Este obxectivo non entende as unións."
+
+#. TRANS: Client exception.
+msgid "This target does not understand leave events."
+msgstr "Este obxectivo non entende a indicación de deixar os eventos."
+
+#. TRANS: Client exception.
+msgid "This target does not understand list events."
+msgstr "Este obxectivo non entende a indicación de listar os eventos."
+
+#. TRANS: Client exception.
+msgid "This target does not understand unlist events."
+msgstr ""
+"Este obxectivo non entende a indicación de retirar da lista os eventos."
+
+#. TRANS: Exception.
+msgid "Received a salmon slap from unidentified actor."
+msgstr ""
+"Recibiuse unha labazada do protocolo Salmon desde un actor non identificado."
diff --git a/plugins/OStatus/locale/ia/LC_MESSAGES/OStatus.po b/plugins/OStatus/locale/ia/LC_MESSAGES/OStatus.po
index fd1e78937f..13e07d7b0b 100644
--- a/plugins/OStatus/locale/ia/LC_MESSAGES/OStatus.po
+++ b/plugins/OStatus/locale/ia/LC_MESSAGES/OStatus.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - OStatus to Interlingua (Interlingua)
+# Translation of StatusNet - OStatus to Interlingua (interlingua)
 # Exported from translatewiki.net
 #
 # Author: McDutchie
@@ -9,18 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OStatus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:43+0000\n"
-"Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:33+0000\n"
+"Language-Team: Interlingua <https://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:48+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-12-03 13:49:04+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-ostatus\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: String in the gettext speed test script. Unimportant.
 msgid "Feeds"
 msgstr "Syndicationes"
 
@@ -30,8 +31,8 @@ msgid "Subscribe"
 msgstr "Subscriber"
 
 #. TRANS: Fieldset legend.
-msgid "Tag remote profile"
-msgstr "Etiquettar profilo remote"
+msgid "List remote profile"
+msgstr "Listar profilo remote"
 
 #. TRANS: Field label.
 msgctxt "LABEL"
@@ -56,8 +57,8 @@ msgstr "Obtener"
 msgid "Invalid URI."
 msgstr "URI invalide."
 
-#. TRANS: Error message in OStatus plugin.
-#. TRANS: Error text.
+#. TRANS: Error message in OStatus plugin. Do not translate the domain names example.com
+#. TRANS: and example.net, as these are official standard domain names for use in examples.
 msgid ""
 "Sorry, we could not reach that address. Please make sure that the OStatus "
 "address is like nickname@example.com or http://example.net/nickname."
@@ -126,10 +127,10 @@ msgid "Follow list"
 msgstr "Sequer lista"
 
 #. TRANS: Success message for remote list follow through OStatus.
-#. TRANS: %1$s is the subscriber name, %2$s is the list, %3$s is the tagger's name.
-#, fuzzy, php-format
+#. TRANS: %1$s is the subscriber name, %2$s is the list, %3$s is the lister's name.
+#, php-format
 msgid "%1$s is now following people listed in %2$s by %3$s."
-msgstr "%1$s cessava de sequer le lista \"%2$s\" de %3$s."
+msgstr "%1$s seque ora le personas listate in \"%2$s\" de %3$s."
 
 #. TRANS: Exception thrown when subscription to remote list fails.
 msgid "Failed subscribing to remote list."
@@ -140,7 +141,7 @@ msgid "Unfollow list"
 msgstr "Non plus sequer lista"
 
 #. TRANS: Success message for remote list unfollow through OStatus.
-#. TRANS: %1$s is the subscriber name, %2$s is the list, %3$s is the tagger's name.
+#. TRANS: %1$s is the subscriber name, %2$s is the list, %3$s is the lister's name.
 #, php-format
 msgid "%1$s stopped following the list %2$s by %3$s."
 msgstr "%1$s cessava de sequer le lista \"%2$s\" de %3$s."
@@ -148,7 +149,7 @@ msgstr "%1$s cessava de sequer le lista \"%2$s\" de %3$s."
 #. TRANS: Title for listing a remote profile.
 msgctxt "TITLE"
 msgid "List"
-msgstr ""
+msgstr "Listar"
 
 #. TRANS: Success message for remote list addition through OStatus.
 #. TRANS: %1$s is the list creator's name, %2$s is the added list member, %3$s is the list name.
@@ -157,35 +158,34 @@ msgid "%1$s listed %2$s in the list %3$s."
 msgstr "%1$s listava %2$s in le lista \"%3$s\"."
 
 #. TRANS: Exception thrown when subscribing to a remote list fails.
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "Could not complete subscription to remote profile's feed. List %s could not "
 "be saved."
 msgstr ""
 "Non poteva completar le subscription al syndication del profilo remote. Le "
-"etiquetta %s non poteva esser salveguardate."
+"lista %s non poteva esser salveguardate."
 
 #. TRANS: Title for unlisting a remote profile.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Unlist"
-msgstr "Non plus sequer lista"
+msgstr "Remover del lista"
 
 #. TRANS: Success message for remote list removal through OStatus.
 #. TRANS: %1$s is the list creator's name, %2$s is the removed list member, %3$s is the list name.
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s removed %2$s from the list %3$s."
-msgstr "%1$s listava %2$s in le lista \"%3$s\"."
+msgstr "%1$s ha removite %2$s del lista %3$s."
 
 #. TRANS: Title for unliking a remote notice.
 msgid "Unlike"
-msgstr ""
+msgstr "Non plus amar"
 
 #. TRANS: Success message for remove a favorite notice through OStatus.
 #. TRANS: %1$s is the unfavoring user's name, %2$s is URI to the no longer favored notice.
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s no longer likes %2$s."
-msgstr "%1$s cessava de sequer %2$s."
+msgstr "%1$s non plus ama %2$s."
 
 #. TRANS: Link text for link to remote subscribe.
 msgid "Remote"
@@ -201,9 +201,9 @@ msgstr "Actualisation de profilo"
 msgid "%s has updated their profile page."
 msgstr "%s ha actualisate su pagina de profilo."
 
-#. TRANS: Link text for a user to tag an OStatus user.
-msgid "Tag"
-msgstr "Etiquettar"
+#. TRANS: Link text for a user to list an OStatus user.
+msgid "List"
+msgstr "Listar"
 
 #. TRANS: Plugin description.
 msgid ""
@@ -268,37 +268,34 @@ msgstr "Invalide hub.topic \"%s\". Lista non existe."
 msgid "Invalid URL passed for %1$s: \"%2$s\""
 msgstr "Invalide URL passate pro %1$s: \"%2$s\""
 
-#. TRANS: Client error displayed when trying to tag a local object as if it is remote.
-msgid "You can use the local tagging!"
-msgstr "Tu pote usar le etiquettas local!"
+#. TRANS: Client error displayed when trying to list a local object as if it is remote.
+msgid "You can use the local list functionality!"
+msgstr "Tu pote usar le functionalitate de lista local!"
 
-#. TRANS: Header for tagging a remote object. %s is a remote object's name.
+#. TRANS: Header for listing a remote object. %s is a remote object's name.
 #, php-format
-msgid "Tag %s"
-msgstr "Etiquetta %s"
+msgid "List %s"
+msgstr "Listar %s"
 
-#. TRANS: Button text to tag a remote object.
-#, fuzzy
+#. TRANS: Button text to list a remote object.
 msgctxt "BUTTON"
 msgid "Go"
-msgstr "Ir"
+msgstr "Va"
 
 #. TRANS: Field label.
 msgid "User nickname"
 msgstr "Pseudonymo del usator"
 
 #. TRANS: Field title.
-#, fuzzy
-msgid "Nickname of the user you want to tag."
-msgstr "Le pseudonymo del usator que tu vole etiquettar."
+msgid "Nickname of the user you want to list."
+msgstr "Le pseudonymo del usator que tu vole listar."
 
 #. TRANS: Field label.
 msgid "Profile Account"
 msgstr "Conto de profilo"
 
 #. TRANS: Field title.
-#, fuzzy
-msgid "Your account id (i.e. user@identi.ca)."
+msgid "Your account id (for example user@identi.ca)."
 msgstr "Le ID de tu conto (p.ex. usator@identi.ca)."
 
 #. TRANS: Client error displayed when remote profile could not be looked up.
@@ -377,6 +374,7 @@ msgstr "Confirmar"
 msgid "Subscribe to this user"
 msgstr "Subscriber a iste usator"
 
+#. TRANS: Extra paragraph in remote profile view when already subscribed.
 msgid "You are already subscribed to this user."
 msgstr "Tu es ja subscribite a iste usator."
 
@@ -421,7 +419,8 @@ msgstr ""
 msgid "Join group"
 msgstr "Adherer al gruppo"
 
-#. TRANS: Tooltip for field label "Join group".
+#. TRANS: Tooltip for field label "Join group". Do not translate the "example.net"
+#. TRANS: domain name in the URL, as it is an official standard domain name for examples.
 msgid "OStatus group's address, like http://example.net/group/nickname."
 msgstr ""
 "Un adresse de gruppo OStatus, como http://example.net/group/pseudonymo."
@@ -473,11 +472,11 @@ msgstr ""
 
 #. TRANS: Client exception.
 msgid "To the attention of user(s), not including this one."
-msgstr ""
+msgstr "Adressate a usator(es), non includente iste."
 
 #. TRANS: Client exception.
 msgid "Not to anyone in reply to anything."
-msgstr ""
+msgstr "Non ha un destinatario e non es un responsa."
 
 #. TRANS: Client exception.
 msgid "This is already a favorite."
@@ -493,31 +492,31 @@ msgstr "Le nota non ha essite addite al favorites!"
 
 #. TRANS: Client exception.
 msgid "Not a person object."
-msgstr ""
+msgstr "Non es un objecto de persona."
 
 #. TRANS: Client exception.
-msgid "Unidentified profile being tagged."
-msgstr ""
+msgid "Unidentified profile being listed."
+msgstr "Listage de un profilo non identificate."
 
 #. TRANS: Client exception.
-msgid "This user is not the one being tagged."
-msgstr ""
+msgid "This user is not the one being listed."
+msgstr "Iste non es le usator que es listate."
 
 #. TRANS: Client exception.
-msgid "The tag could not be saved."
-msgstr ""
+msgid "The listing could not be saved."
+msgstr "Le lista non poteva esser salveguardate."
 
 #. TRANS: Client exception.
-msgid "Unidentified profile being untagged."
-msgstr ""
+msgid "Unidentified profile being unlisted."
+msgstr "Dislistage de un profilo non identificate."
 
 #. TRANS: Client exception.
-msgid "This user is not the one being untagged."
-msgstr ""
+msgid "This user is not the one being unlisted."
+msgstr "Iste non es le usator que es dislistate."
 
 #. TRANS: Client exception.
-msgid "The tag could not be deleted."
-msgstr ""
+msgid "The listing could not be deleted."
+msgstr "Le entrata non poteva esser removite del lista."
 
 #. TRANS: Client exception.
 msgid "Cannot favorite/unfavorite without an object."
@@ -542,10 +541,9 @@ msgid "Subscribe to list"
 msgstr "Subscriber al lista"
 
 #. TRANS: Field title.
-#, fuzzy
 msgid "Address of the OStatus list, like http://example.net/user/all/tag."
 msgstr ""
-"Adresse del lista de OStatus, como http://example.net/usator/all/etiquetta"
+"Adresse del lista de OStatus, como http://example.net/usator/all/etiquetta."
 
 #. TRANS: Error text displayed when trying to subscribe to a list already a subscriber to.
 msgid "You are already subscribed to this list."
@@ -556,13 +554,12 @@ msgid "Confirm subscription to remote list"
 msgstr "Confirmar subscription al lista remote"
 
 #. TRANS: Instructions for OStatus list subscription form.
-#, fuzzy
 msgid ""
 "You can subscribe to lists from other supported sites. Paste the list's URI "
 "below:"
 msgstr ""
 "Tu pote subscriber a listas de altere sitos supportate. Colla le URI del "
-"listas hic infra:"
+"lista hic infra:"
 
 #. TRANS: Client error.
 msgid "No such group."
@@ -610,10 +607,8 @@ msgid "Cannot accept remote posts for a remote list."
 msgstr "Non pote acceptar messages remote pro un lista remote."
 
 #. TRANS: Client error displayed when referring to a non-existing remote list.
-#, fuzzy
 msgid "Cannot read profile to set up list subscription."
-msgstr ""
-"Non pote leger profilo pro establir subscription al etiquetta de profilo."
+msgstr "Non pote leger profilo pro establir subscription al lista."
 
 #. TRANS: Client error displayed when trying to subscribe a group to a list.
 #. TRANS: Client error displayed when trying to unsubscribe a group from a list.
@@ -627,15 +622,15 @@ msgid "Could not subscribe remote user %1$s to list %2$s."
 msgstr "Non poteva subscriber le usator remote %1$s al lista %2$s."
 
 #. TRANS: Client error displayed when trying to unsubscribe from non-existing list.
-#, fuzzy
 msgid "Cannot read profile to cancel list subscription."
-msgstr "Non pote leger profilo pro cancellar membrato del lista."
+msgstr "Non pote leger profilo pro cancellar subscription al lista."
 
 #. TRANS: Client error displayed when trying to unsubscribe a remote user from a list fails.
 #. TRANS: %1$s is a profile URL, %2$s is a list name.
-#, fuzzy, php-format
+#, php-format
 msgid "Could not unsubscribe remote user %1$s from list %2$s."
-msgstr "Non poteva subscriber le usator remote %1$s al lista %2$s."
+msgstr ""
+"Non poteva cancellar le subscription del usator remote %1$s al lista %2$s."
 
 #. TRANS: Client error.
 msgid "You can use the local subscription!"
@@ -656,7 +651,7 @@ msgctxt "BUTTON"
 msgid "Join"
 msgstr "Adherer"
 
-#. TRANS: Form legend. %1$s is a list, %2$s is a tagger's name.
+#. TRANS: Form legend. %1$s is a list, %2$s is a lister's name.
 #, php-format
 msgid "Subscribe to list %1$s by %2$s"
 msgstr "Subscriber al lista \"%1$s\" de %2$s"
@@ -700,6 +695,35 @@ msgstr "Nulle pseudonymo local de usator o de gruppo fornite."
 msgid "OStatus Connect"
 msgstr "Connexion OStatus"
 
+#. TRANS: Server exception. %s is a URL.
+#, php-format
+msgid "Invalid avatar URL %s."
+msgstr "URL de avatar %s invalide."
+
+#. TRANS: Server exception. %s is a URI.
+#, php-format
+msgid "Tried to update avatar for unsaved remote profile %s."
+msgstr "Tentava actualisar avatar pro profilo remote non salveguardate %s."
+
+#. TRANS: Server exception. %s is a URL.
+#, php-format
+msgid "Unable to fetch avatar from %s."
+msgstr "Incapace de obtener avatar ab %s."
+
+#. TRANS: Exception. %s is a URL.
+#, php-format
+msgid "Could not find a feed URL for profile page %s."
+msgstr "Non poteva trovar un URL de syndication pro pagina de profilo %s."
+
+#. TRANS: Exception.
+msgid "Not a valid webfinger address."
+msgstr "Adresse webfinger invalide."
+
+#. TRANS: Exception. %s is a webfinger address.
+#, php-format
+msgid "Could not find a valid profile for \"%s\"."
+msgstr "Non poteva trovar un profilo valide pro \"%s\"."
+
 #. TRANS: Server exception.
 msgid "Attempting to start PuSH subscription for feed with no hub."
 msgstr "Tentativa de comenciar subscription PuSH pro syndication sin centro."
@@ -709,12 +733,12 @@ msgid "Attempting to end PuSH subscription for feed with no hub."
 msgstr "Tentativa de terminar subscription PuSH pro syndication sin centro."
 
 #. TRANS: Server exception. %s is a URI
-#, fuzzy, php-format
+#, php-format
 msgid "Invalid ostatus_profile state: Two or more IDs set for %s."
 msgstr "Stato ostatus_profile invalide: duo o plus IDs definite pro %s."
 
 #. TRANS: Server exception. %s is a URI
-#, fuzzy, php-format
+#, php-format
 msgid "Invalid ostatus_profile state: All IDs empty for %s."
 msgstr "Stato ostatus_profile invalide: tote le IDs es vacue pro %s."
 
@@ -740,6 +764,20 @@ msgstr "Formato de syndication incognite."
 msgid "RSS feed without a channel."
 msgstr "Syndication RSS sin canal."
 
+#. TRANS: Client exception thrown when trying to share multiple activities at once.
+msgid "Can only handle share activities with exactly one object."
+msgstr "Pote solmente manear activitates de divulgation con un sol objecto."
+
+#. TRANS: Client exception thrown when trying to share a non-activity object.
+msgid "Can only handle shared activities."
+msgstr "Pote solmente manear activitates divulgate."
+
+#. TRANS: Client exception thrown when saving an activity share fails.
+#. TRANS: %s is a share ID.
+#, php-format
+msgid "Failed to save activity %s."
+msgstr "Falleva de salveguardar le activitate %s."
+
 #. TRANS: Client exception. %s is a source URI.
 #, php-format
 msgid "No content for notice %s."
@@ -755,31 +793,11 @@ msgstr "Monstrar plus"
 msgid "Could not reach profile page %s."
 msgstr "Non poteva attinger pagina de profilo %s."
 
-#. TRANS: Exception. %s is a URL.
-#, php-format
-msgid "Could not find a feed URL for profile page %s."
-msgstr "Non poteva trovar un URL de syndication pro pagina de profilo %s."
-
 #. TRANS: Feed sub exception.
 msgid "Cannot find enough profile information to make a feed."
 msgstr ""
 "Non pote trovar satis de information de profilo pro facer un syndication."
 
-#. TRANS: Server exception. %s is a URL.
-#, php-format
-msgid "Invalid avatar URL %s."
-msgstr "URL de avatar %s invalide."
-
-#. TRANS: Server exception. %s is a URI.
-#, php-format
-msgid "Tried to update avatar for unsaved remote profile %s."
-msgstr "Tentava actualisar avatar pro profilo remote non salveguardate %s."
-
-#. TRANS: Server exception. %s is a URL.
-#, php-format
-msgid "Unable to fetch avatar from %s."
-msgstr "Incapace de obtener avatar ab %s."
-
 #. TRANS: Server exception.
 msgid "No author ID URI found."
 msgstr "Nulle URI de ID de autor trovate."
@@ -812,10 +830,6 @@ msgstr "Non pote salveguardar lista local."
 msgid "Cannot save OStatus profile."
 msgstr "Non pote salveguardar profilo OStatus."
 
-#. TRANS: Exception.
-msgid "Not a valid webfinger address."
-msgstr "Adresse webfinger invalide."
-
 #. TRANS: Exception. %s is a webfinger address.
 #, php-format
 msgid "Could not save profile for \"%s\"."
@@ -826,11 +840,6 @@ msgstr "Non poteva salveguardar profilo pro \"%s\"."
 msgid "Could not save OStatus profile for \"%s\"."
 msgstr "Non poteva salveguardar le profilo de OStatus pro \"%s\"."
 
-#. TRANS: Exception. %s is a webfinger address.
-#, php-format
-msgid "Could not find a valid profile for \"%s\"."
-msgstr "Non poteva trovar un profilo valide pro \"%s\"."
-
 #. TRANS: Server exception.
 msgid "Could not store HTML content of long post as file."
 msgstr "Non poteva immagazinar contento HTML de longe message como file."
@@ -918,40 +927,13 @@ msgid "This target does not understand leave events."
 msgstr "Iste destination non comprende eventos de quitar."
 
 #. TRANS: Client exception.
-msgid "This target does not understand tag events."
-msgstr "Iste destination non comprende eventos de etiquettage."
+msgid "This target does not understand list events."
+msgstr "Iste destination non comprende eventos de listage."
 
 #. TRANS: Client exception.
-msgid "This target does not understand untag events."
-msgstr "Iste destination non comprende eventos de disetiquettage."
+msgid "This target does not understand unlist events."
+msgstr "Iste destination non comprende eventos de dislistage."
 
 #. TRANS: Exception.
 msgid "Received a salmon slap from unidentified actor."
 msgstr "Recipeva un claffo de salmon de un actor non identificate."
-
-#~ msgctxt "TITLE"
-#~ msgid "Tag"
-#~ msgstr "Etiquetta"
-
-#~ msgctxt "TITLE"
-#~ msgid "Untag"
-#~ msgstr "Disetiquettar"
-
-#~ msgid "Disfavor"
-#~ msgstr "Disfavorir"
-
-#~ msgid "%1$s marked notice %2$s as no longer a favorite."
-#~ msgstr "%1$s marcava le nota %2$s como non plus favorite."
-
-#~ msgid ""
-#~ "OStatus user's address, like nickname@example.com or http://example.net/"
-#~ "nickname"
-#~ msgstr ""
-#~ "Le adresse de un usator OStatus, como pseudonymo@example.com o http://"
-#~ "example.net/pseudonymo"
-
-#~ msgid "Continue"
-#~ msgstr "Continuar"
-
-#~ msgid "Could not remove remote user %1$s from list %2$s."
-#~ msgstr "Non poteva remover le usator remote %1$s del lista %2$s."
diff --git a/plugins/OStatus/locale/ko/LC_MESSAGES/OStatus.po b/plugins/OStatus/locale/ko/LC_MESSAGES/OStatus.po
index 4ab3748e16..4d6eae15da 100644
--- a/plugins/OStatus/locale/ko/LC_MESSAGES/OStatus.po
+++ b/plugins/OStatus/locale/ko/LC_MESSAGES/OStatus.po
@@ -9,18 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OStatus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:44+0000\n"
-"Language-Team: Korean <http://translatewiki.net/wiki/Portal:ko>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:33+0000\n"
+"Language-Team: Korean <https://translatewiki.net/wiki/Portal:ko>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:48+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-12-03 13:49:04+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ko\n"
 "X-Message-Group: #out-statusnet-plugin-ostatus\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#. TRANS: String in the gettext speed test script. Unimportant.
 msgid "Feeds"
 msgstr "피드"
 
@@ -30,7 +31,8 @@ msgid "Subscribe"
 msgstr "구�"
 
 #. TRANS: Fieldset legend.
-msgid "Tag remote profile"
+#, fuzzy
+msgid "List remote profile"
 msgstr "�격 프로필 태그"
 
 #. TRANS: Field label.
@@ -56,8 +58,8 @@ msgstr "가져오기"
 msgid "Invalid URI."
 msgstr "잘못� URI입니다."
 
-#. TRANS: Error message in OStatus plugin.
-#. TRANS: Error text.
+#. TRANS: Error message in OStatus plugin. Do not translate the domain names example.com
+#. TRANS: and example.net, as these are official standard domain names for use in examples.
 msgid ""
 "Sorry, we could not reach that address. Please make sure that the OStatus "
 "address is like nickname@example.com or http://example.net/nickname."
@@ -125,7 +127,7 @@ msgid "Follow list"
 msgstr "리스트 팔로우"
 
 #. TRANS: Success message for remote list follow through OStatus.
-#. TRANS: %1$s is the subscriber name, %2$s is the list, %3$s is the tagger's name.
+#. TRANS: %1$s is the subscriber name, %2$s is the list, %3$s is the lister's name.
 #, fuzzy, php-format
 msgid "%1$s is now following people listed in %2$s by %3$s."
 msgstr "%1$s님� %3$s� %2$s 리스트 팔로우를 중단했습니다."
@@ -139,7 +141,7 @@ msgid "Unfollow list"
 msgstr "리스트 팔로우 취소"
 
 #. TRANS: Success message for remote list unfollow through OStatus.
-#. TRANS: %1$s is the subscriber name, %2$s is the list, %3$s is the tagger's name.
+#. TRANS: %1$s is the subscriber name, %2$s is the list, %3$s is the lister's name.
 #, php-format
 msgid "%1$s stopped following the list %2$s by %3$s."
 msgstr "%1$s님� %3$s� %2$s 리스트 팔로우를 중단했습니다."
@@ -199,9 +201,9 @@ msgstr "프로필 업��트"
 msgid "%s has updated their profile page."
 msgstr "%s님� 프로필 페�지를 업��트했습니다."
 
-#. TRANS: Link text for a user to tag an OStatus user.
-msgid "Tag"
-msgstr "태그"
+#. TRANS: Link text for a user to list an OStatus user.
+msgid "List"
+msgstr ""
 
 #. TRANS: Plugin description.
 msgid ""
@@ -265,16 +267,17 @@ msgstr "잘못� hub.topic \"%s\". 리스트가 없습니다."
 msgid "Invalid URL passed for %1$s: \"%2$s\""
 msgstr "잘못� URL� %1$s� 넘겼습니다: \"%2$s\""
 
-#. TRANS: Client error displayed when trying to tag a local object as if it is remote.
-msgid "You can use the local tagging!"
-msgstr "로컬 태깅� 사용할 수 있습니다!"
+#. TRANS: Client error displayed when trying to list a local object as if it is remote.
+#, fuzzy
+msgid "You can use the local list functionality!"
+msgstr "로컬 구�� 사용할 수 없습니다!"
 
-#. TRANS: Header for tagging a remote object. %s is a remote object's name.
+#. TRANS: Header for listing a remote object. %s is a remote object's name.
 #, php-format
-msgid "Tag %s"
-msgstr "태그 %s"
+msgid "List %s"
+msgstr ""
 
-#. TRANS: Button text to tag a remote object.
+#. TRANS: Button text to list a remote object.
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Go"
@@ -286,7 +289,7 @@ msgstr "사용� �름"
 
 #. TRANS: Field title.
 #, fuzzy
-msgid "Nickname of the user you want to tag."
+msgid "Nickname of the user you want to list."
 msgstr "태그를 추가하려는 사용�� �름"
 
 #. TRANS: Field label.
@@ -295,7 +298,7 @@ msgstr "프로필 계정"
 
 #. TRANS: Field title.
 #, fuzzy
-msgid "Your account id (i.e. user@identi.ca)."
+msgid "Your account id (for example user@identi.ca)."
 msgstr "내 계정 아�디 (예: user@identi.ca)"
 
 #. TRANS: Client error displayed when remote profile could not be looked up.
@@ -374,6 +377,7 @@ msgstr "확�"
 msgid "Subscribe to this user"
 msgstr "� 사용�를 구�"
 
+#. TRANS: Extra paragraph in remote profile view when already subscribed.
 msgid "You are already subscribed to this user."
 msgstr "�미 � 사용�� 구�했습니다."
 
@@ -417,7 +421,8 @@ msgstr ""
 msgid "Join group"
 msgstr "그룹 가입"
 
-#. TRANS: Tooltip for field label "Join group".
+#. TRANS: Tooltip for field label "Join group". Do not translate the "example.net"
+#. TRANS: domain name in the URL, as it is an official standard domain name for examples.
 msgid "OStatus group's address, like http://example.net/group/nickname."
 msgstr "OStatus 그룹� 주소. http://example.net/group/nickname 형�."
 
@@ -489,27 +494,27 @@ msgid "Not a person object."
 msgstr ""
 
 #. TRANS: Client exception.
-msgid "Unidentified profile being tagged."
+msgid "Unidentified profile being listed."
 msgstr ""
 
 #. TRANS: Client exception.
-msgid "This user is not the one being tagged."
+msgid "This user is not the one being listed."
 msgstr ""
 
 #. TRANS: Client exception.
-msgid "The tag could not be saved."
+msgid "The listing could not be saved."
 msgstr ""
 
 #. TRANS: Client exception.
-msgid "Unidentified profile being untagged."
+msgid "Unidentified profile being unlisted."
 msgstr ""
 
 #. TRANS: Client exception.
-msgid "This user is not the one being untagged."
+msgid "This user is not the one being unlisted."
 msgstr ""
 
 #. TRANS: Client exception.
-msgid "The tag could not be deleted."
+msgid "The listing could not be deleted."
 msgstr ""
 
 #. TRANS: Client exception.
@@ -647,7 +652,7 @@ msgctxt "BUTTON"
 msgid "Join"
 msgstr "가입"
 
-#. TRANS: Form legend. %1$s is a list, %2$s is a tagger's name.
+#. TRANS: Form legend. %1$s is a list, %2$s is a lister's name.
 #, php-format
 msgid "Subscribe to list %1$s by %2$s"
 msgstr "%2$s� %1$s 리스트� 구�"
@@ -691,6 +696,35 @@ msgstr "입력한 로컬 사용�나 그룹 �름� 없습니다."
 msgid "OStatus Connect"
 msgstr "OStatus ì—°ê²°"
 
+#. TRANS: Server exception. %s is a URL.
+#, php-format
+msgid "Invalid avatar URL %s."
+msgstr "잘못� 아바타 URL %s."
+
+#. TRANS: Server exception. %s is a URI.
+#, php-format
+msgid "Tried to update avatar for unsaved remote profile %s."
+msgstr "저장하지 않� %s �격 프로필� 대해 아바타 업��트를 시�했습니다."
+
+#. TRANS: Server exception. %s is a URL.
+#, php-format
+msgid "Unable to fetch avatar from %s."
+msgstr "%s�서 아바타를 가져올 수 없습니다."
+
+#. TRANS: Exception. %s is a URL.
+#, php-format
+msgid "Could not find a feed URL for profile page %s."
+msgstr "프로필 페�지 %s� 대한 피드 URL� 찾� 수 없습니다."
+
+#. TRANS: Exception.
+msgid "Not a valid webfinger address."
+msgstr "올바른 webfinger 주소가 아닙니다."
+
+#. TRANS: Exception. %s is a webfinger address.
+#, php-format
+msgid "Could not find a valid profile for \"%s\"."
+msgstr "\"%s\"� 대한 올바른 프로필� 찾� 수 없습니다."
+
 #. TRANS: Server exception.
 msgid "Attempting to start PuSH subscription for feed with no hub."
 msgstr "hub가 없는 피드� 대해 PuSH 구� 시작� 시�했습니다."
@@ -733,6 +767,20 @@ msgstr "피드 형�� 알 수 없습니다."
 msgid "RSS feed without a channel."
 msgstr "채�� 하나� 없는 RSS 피드입니다."
 
+#. TRANS: Client exception thrown when trying to share multiple activities at once.
+msgid "Can only handle share activities with exactly one object."
+msgstr ""
+
+#. TRANS: Client exception thrown when trying to share a non-activity object.
+msgid "Can only handle shared activities."
+msgstr ""
+
+#. TRANS: Client exception thrown when saving an activity share fails.
+#. TRANS: %s is a share ID.
+#, php-format
+msgid "Failed to save activity %s."
+msgstr ""
+
 #. TRANS: Client exception. %s is a source URI.
 #, php-format
 msgid "No content for notice %s."
@@ -748,30 +796,10 @@ msgstr "�세히 보기"
 msgid "Could not reach profile page %s."
 msgstr "%s 프로필 페�지� 연결할 수 없습니다."
 
-#. TRANS: Exception. %s is a URL.
-#, php-format
-msgid "Could not find a feed URL for profile page %s."
-msgstr "프로필 페�지 %s� 대한 피드 URL� 찾� 수 없습니다."
-
 #. TRANS: Feed sub exception.
 msgid "Cannot find enough profile information to make a feed."
 msgstr "피드를 만들 프로필 정보를 찾� 수 없습니다."
 
-#. TRANS: Server exception. %s is a URL.
-#, php-format
-msgid "Invalid avatar URL %s."
-msgstr "잘못� 아바타 URL %s."
-
-#. TRANS: Server exception. %s is a URI.
-#, php-format
-msgid "Tried to update avatar for unsaved remote profile %s."
-msgstr "저장하지 않� %s �격 프로필� 대해 아바타 업��트를 시�했습니다."
-
-#. TRANS: Server exception. %s is a URL.
-#, php-format
-msgid "Unable to fetch avatar from %s."
-msgstr "%s�서 아바타를 가져올 수 없습니다."
-
 #. TRANS: Server exception.
 msgid "No author ID URI found."
 msgstr "author ID URI가 없습니다."
@@ -804,10 +832,6 @@ msgstr "로컬 리스트를 저장할 수 없습니다."
 msgid "Cannot save OStatus profile."
 msgstr "OStatus 프로필� 저장할 수 없습니다."
 
-#. TRANS: Exception.
-msgid "Not a valid webfinger address."
-msgstr "올바른 webfinger 주소가 아닙니다."
-
 #. TRANS: Exception. %s is a webfinger address.
 #, php-format
 msgid "Could not save profile for \"%s\"."
@@ -818,11 +842,6 @@ msgstr "\"%s\"� 대한 프로필� 저장할 수 없습니다."
 msgid "Could not save OStatus profile for \"%s\"."
 msgstr "\"%s\"� 대한 OStatus 프로필� 저장할 수 없습니다."
 
-#. TRANS: Exception. %s is a webfinger address.
-#, php-format
-msgid "Could not find a valid profile for \"%s\"."
-msgstr "\"%s\"� 대한 올바른 프로필� 찾� 수 없습니다."
-
 #. TRANS: Server exception.
 msgid "Could not store HTML content of long post as file."
 msgstr "긴 글� HTML 내용� 파�로 저장할 수 없습니다."
@@ -909,40 +928,15 @@ msgid "This target does not understand leave events."
 msgstr "� 대�� 행사 떠나기를 ��하지 못합니다."
 
 #. TRANS: Client exception.
-msgid "This target does not understand tag events."
+#, fuzzy
+msgid "This target does not understand list events."
 msgstr "� 대�� �벤트 태그를 ��하지 못합니다."
 
 #. TRANS: Client exception.
-msgid "This target does not understand untag events."
+#, fuzzy
+msgid "This target does not understand unlist events."
 msgstr "� 대�� �벤트 태그 취소를 ��하지 못합니다."
 
 #. TRANS: Exception.
 msgid "Received a salmon slap from unidentified actor."
 msgstr "알지 못하는 actor�서 salmon slap� 받았습니다."
-
-#~ msgctxt "TITLE"
-#~ msgid "Tag"
-#~ msgstr "태그"
-
-#~ msgctxt "TITLE"
-#~ msgid "Untag"
-#~ msgstr "태그 해제"
-
-#~ msgid "Disfavor"
-#~ msgstr "좋아함 취소"
-
-#~ msgid "%1$s marked notice %2$s as no longer a favorite."
-#~ msgstr "%1$s님� 표시한 %2$s 글� �제 좋아하는 글� 아닙니다."
-
-#~ msgid ""
-#~ "OStatus user's address, like nickname@example.com or http://example.net/"
-#~ "nickname"
-#~ msgstr ""
-#~ "OStatus 사용�� 주소. nickname@example.com �는 http://example.net/"
-#~ "nickname 형�"
-
-#~ msgid "Continue"
-#~ msgstr "계�"
-
-#~ msgid "Could not remove remote user %1$s from list %2$s."
-#~ msgstr "%2$s 리스트�서 %1$s �격 사용�를 제거할 수 없습니다."
diff --git a/plugins/OStatus/locale/mk/LC_MESSAGES/OStatus.po b/plugins/OStatus/locale/mk/LC_MESSAGES/OStatus.po
index 8673649d71..dbe3e0d969 100644
--- a/plugins/OStatus/locale/mk/LC_MESSAGES/OStatus.po
+++ b/plugins/OStatus/locale/mk/LC_MESSAGES/OStatus.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - OStatus to Macedonian (Македон�ки)
+# Translation of StatusNet - OStatus to Macedonian (македон�ки)
 # Exported from translatewiki.net
 #
 # Author: Bjankuloski06
@@ -9,18 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OStatus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:44+0000\n"
-"Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:33+0000\n"
+"Language-Team: Macedonian <https://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:48+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-12-03 13:49:04+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-ostatus\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
 
+#. TRANS: String in the gettext speed test script. Unimportant.
 msgid "Feeds"
 msgstr "Канали"
 
@@ -30,8 +31,8 @@ msgid "Subscribe"
 msgstr "Претплати �е"
 
 #. TRANS: Fieldset legend.
-msgid "Tag remote profile"
-msgstr "Означи далечин�ки профил"
+msgid "List remote profile"
+msgstr "Заведи далечин�ки профил"
 
 #. TRANS: Field label.
 msgctxt "LABEL"
@@ -56,8 +57,8 @@ msgstr "Преземи"
 msgid "Invalid URI."
 msgstr "�еважечка URI."
 
-#. TRANS: Error message in OStatus plugin.
-#. TRANS: Error text.
+#. TRANS: Error message in OStatus plugin. Do not translate the domain names example.com
+#. TRANS: and example.net, as these are official standard domain names for use in examples.
 msgid ""
 "Sorry, we could not reach that address. Please make sure that the OStatus "
 "address is like nickname@example.com or http://example.net/nickname."
@@ -125,10 +126,10 @@ msgid "Follow list"
 msgstr "Спи�ок на �ледења"
 
 #. TRANS: Success message for remote list follow through OStatus.
-#. TRANS: %1$s is the subscriber name, %2$s is the list, %3$s is the tagger's name.
-#, fuzzy, php-format
+#. TRANS: %1$s is the subscriber name, %2$s is the list, %3$s is the lister's name.
+#, php-format
 msgid "%1$s is now following people listed in %2$s by %3$s."
-msgstr "%1$s пре�тана да го �леди �пи�окот %2$s од %3$s."
+msgstr "%1$s �ега �леди луѓе на �пи�окот %2$s од %3$s."
 
 #. TRANS: Exception thrown when subscription to remote list fails.
 msgid "Failed subscribing to remote list."
@@ -139,7 +140,7 @@ msgid "Unfollow list"
 msgstr "Пре�тани �о �ледење на �пи�окот"
 
 #. TRANS: Success message for remote list unfollow through OStatus.
-#. TRANS: %1$s is the subscriber name, %2$s is the list, %3$s is the tagger's name.
+#. TRANS: %1$s is the subscriber name, %2$s is the list, %3$s is the lister's name.
 #, php-format
 msgid "%1$s stopped following the list %2$s by %3$s."
 msgstr "%1$s пре�тана да го �леди �пи�окот %2$s од %3$s."
@@ -147,7 +148,7 @@ msgstr "%1$s пре�тана да го �леди �пи�окот %2$s од %3
 #. TRANS: Title for listing a remote profile.
 msgctxt "TITLE"
 msgid "List"
-msgstr ""
+msgstr "�аведи"
 
 #. TRANS: Success message for remote list addition through OStatus.
 #. TRANS: %1$s is the list creator's name, %2$s is the added list member, %3$s is the list name.
@@ -156,35 +157,34 @@ msgid "%1$s listed %2$s in the list %3$s."
 msgstr "%1$s го/ја наведе %2$s во �пи�окот %3$s."
 
 #. TRANS: Exception thrown when subscribing to a remote list fails.
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "Could not complete subscription to remote profile's feed. List %s could not "
 "be saved."
 msgstr ""
 "�е можев да ја довршам претплатата на каналот на далечин�киот профил. �е "
-"можев да ја зачувам ознаката %s."
+"можев да го зачувам �пи�окот %s."
 
 #. TRANS: Title for unlisting a remote profile.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Unlist"
-msgstr "Пре�тани �о �ледење на �пи�окот"
+msgstr "От�трани"
 
 #. TRANS: Success message for remote list removal through OStatus.
 #. TRANS: %1$s is the list creator's name, %2$s is the removed list member, %3$s is the list name.
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s removed %2$s from the list %3$s."
-msgstr "%1$s го/ја наведе %2$s во �пи�окот %3$s."
+msgstr "%1$s го/ја от�трани %2$s од �пи�окот %3$s."
 
 #. TRANS: Title for unliking a remote notice.
 msgid "Unlike"
-msgstr ""
+msgstr "Одбенди�ај"
 
 #. TRANS: Success message for remove a favorite notice through OStatus.
 #. TRANS: %1$s is the unfavoring user's name, %2$s is URI to the no longer favored notice.
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s no longer likes %2$s."
-msgstr "%1$s пре�тана да го/ја �леди %2$s."
+msgstr "%1$s повеќе не ја бенди�ува забелешката %2$s."
 
 #. TRANS: Link text for link to remote subscribe.
 msgid "Remote"
@@ -200,9 +200,9 @@ msgstr "Поднова на профил"
 msgid "%s has updated their profile page."
 msgstr "%s ја поднови �војата профилна �траница."
 
-#. TRANS: Link text for a user to tag an OStatus user.
-msgid "Tag"
-msgstr "Означи"
+#. TRANS: Link text for a user to list an OStatus user.
+msgid "List"
+msgstr "Заведи"
 
 #. TRANS: Plugin description.
 msgid ""
@@ -266,17 +266,16 @@ msgstr "�еважечки hub.topic %s. Спи�окот не по�тои."
 msgid "Invalid URL passed for %1$s: \"%2$s\""
 msgstr "Добив неважечка URL-адре�а за %1$s: „%2$s“"
 
-#. TRANS: Client error displayed when trying to tag a local object as if it is remote.
-msgid "You can use the local tagging!"
-msgstr "Можете да го кори�тите локалното означување!"
+#. TRANS: Client error displayed when trying to list a local object as if it is remote.
+msgid "You can use the local list functionality!"
+msgstr "Можете да ја кори�тите можно�та за локално заведување!"
 
-#. TRANS: Header for tagging a remote object. %s is a remote object's name.
+#. TRANS: Header for listing a remote object. %s is a remote object's name.
 #, php-format
-msgid "Tag %s"
-msgstr "Означи го/ја %s"
+msgid "List %s"
+msgstr "Заведи %s"
 
-#. TRANS: Button text to tag a remote object.
-#, fuzzy
+#. TRANS: Button text to list a remote object.
 msgctxt "BUTTON"
 msgid "Go"
 msgstr "Оди"
@@ -286,18 +285,16 @@ msgid "User nickname"
 msgstr "Прекар на кори�никот"
 
 #. TRANS: Field title.
-#, fuzzy
-msgid "Nickname of the user you want to tag."
-msgstr "Прекарот на кори�никот што �акате да го означите."
+msgid "Nickname of the user you want to list."
+msgstr "Прекарот на кори�никот што �акате да го заведете."
 
 #. TRANS: Field label.
 msgid "Profile Account"
 msgstr "Профилна �метка"
 
 #. TRANS: Field title.
-#, fuzzy
-msgid "Your account id (i.e. user@identi.ca)."
-msgstr "Вашата назнака (ID) на �метката (на пр. korisnik@identi.ca)"
+msgid "Your account id (for example user@identi.ca)."
+msgstr "Вашата назнака (ID) на �метката (на пр. korisnik@identi.ca)."
 
 #. TRANS: Client error displayed when remote profile could not be looked up.
 #. TRANS: Client error.
@@ -375,6 +372,7 @@ msgstr "Потврди"
 msgid "Subscribe to this user"
 msgstr "Претплати �е на кори�ников"
 
+#. TRANS: Extra paragraph in remote profile view when already subscribed.
 msgid "You are already subscribed to this user."
 msgstr "Веќе �те претплатени на овој кори�ник."
 
@@ -419,7 +417,8 @@ msgstr ""
 msgid "Join group"
 msgstr "Зачлени �е во групата"
 
-#. TRANS: Tooltip for field label "Join group".
+#. TRANS: Tooltip for field label "Join group". Do not translate the "example.net"
+#. TRANS: domain name in the URL, as it is an official standard domain name for examples.
 msgid "OStatus group's address, like http://example.net/group/nickname."
 msgstr ""
 "�дре�а на групата на OStatus, како на пр. http://primer.net/group/prekar."
@@ -470,11 +469,11 @@ msgstr ""
 
 #. TRANS: Client exception.
 msgid "To the attention of user(s), not including this one."
-msgstr ""
+msgstr "Се обраќа вниманието на кори�ник/ци, не вклучувајќи го овој."
 
 #. TRANS: Client exception.
 msgid "Not to anyone in reply to anything."
-msgstr ""
+msgstr "Ова не е одговар никому за ништо."
 
 #. TRANS: Client exception.
 msgid "This is already a favorite."
@@ -490,31 +489,31 @@ msgstr "Забелешката не е бенди�ана!"
 
 #. TRANS: Client exception.
 msgid "Not a person object."
-msgstr ""
+msgstr "Објектот не е лице."
 
 #. TRANS: Client exception.
-msgid "Unidentified profile being tagged."
-msgstr ""
+msgid "Unidentified profile being listed."
+msgstr "Се заведува непрепознаен профил."
 
 #. TRANS: Client exception.
-msgid "This user is not the one being tagged."
-msgstr ""
+msgid "This user is not the one being listed."
+msgstr "Ова не е кори�никот што �е заведува."
 
 #. TRANS: Client exception.
-msgid "The tag could not be saved."
-msgstr ""
+msgid "The listing could not be saved."
+msgstr "�е можев да го зачувам заведеното."
 
 #. TRANS: Client exception.
-msgid "Unidentified profile being untagged."
-msgstr ""
+msgid "Unidentified profile being unlisted."
+msgstr "Се от�транува непрепознаен профил од заведените."
 
 #. TRANS: Client exception.
-msgid "This user is not the one being untagged."
-msgstr ""
+msgid "This user is not the one being unlisted."
+msgstr "Ова не е кори�никот што �е от�транува од заведените."
 
 #. TRANS: Client exception.
-msgid "The tag could not be deleted."
-msgstr ""
+msgid "The listing could not be deleted."
+msgstr "�е можев да го избришам заведеното."
 
 #. TRANS: Client exception.
 msgid "Cannot favorite/unfavorite without an object."
@@ -539,10 +538,10 @@ msgid "Subscribe to list"
 msgstr "Претплати �е на �пи�окот"
 
 #. TRANS: Field title.
-#, fuzzy
 msgid "Address of the OStatus list, like http://example.net/user/all/tag."
 msgstr ""
-"�дре�а на �пи�окот од OStatus, како на пр. http://example.net/user/all/tag"
+"�дре�а на �пи�окот од OStatus, како на пр. http://primer.net/korisnik/site/"
+"oznaka."
 
 #. TRANS: Error text displayed when trying to subscribe to a list already a subscriber to.
 msgid "You are already subscribed to this list."
@@ -553,7 +552,6 @@ msgid "Confirm subscription to remote list"
 msgstr "Потврди претплата на далечин�киот �пи�ок"
 
 #. TRANS: Instructions for OStatus list subscription form.
-#, fuzzy
 msgid ""
 "You can subscribe to lists from other supported sites. Paste the list's URI "
 "below:"
@@ -608,11 +606,10 @@ msgid "Cannot accept remote posts for a remote list."
 msgstr "�е можам да прифаќам далечин�ки објави за далечин�ки �пи�ок."
 
 #. TRANS: Client error displayed when referring to a non-existing remote list.
-#, fuzzy
 msgid "Cannot read profile to set up list subscription."
 msgstr ""
-"�е можев да го прочитам профилот за да ја по�тавам претплатата на профилната "
-"ознака."
+"�е можев да го прочитам профилот за да ја во�по�тавам претплатата на "
+"�пи�окот."
 
 #. TRANS: Client error displayed when trying to subscribe a group to a list.
 #. TRANS: Client error displayed when trying to unsubscribe a group from a list.
@@ -626,13 +623,13 @@ msgid "Could not subscribe remote user %1$s to list %2$s."
 msgstr "�е можев да го претплатам далечин�киот кори�ник %1$s на �пи�окот %2$s."
 
 #. TRANS: Client error displayed when trying to unsubscribe from non-existing list.
-#, fuzzy
 msgid "Cannot read profile to cancel list subscription."
-msgstr "�е можам да го прочитам профилот за откажам член�тво во �пи�окот."
+msgstr ""
+"�е можам да го прочитам профилот за да го откажам член�тво во �пи�окот."
 
 #. TRANS: Client error displayed when trying to unsubscribe a remote user from a list fails.
 #. TRANS: %1$s is a profile URL, %2$s is a list name.
-#, fuzzy, php-format
+#, php-format
 msgid "Could not unsubscribe remote user %1$s from list %2$s."
 msgstr "�е можев да го претплатам далечин�киот кори�ник %1$s на �пи�окот %2$s."
 
@@ -655,7 +652,7 @@ msgctxt "BUTTON"
 msgid "Join"
 msgstr "Зачлени �е"
 
-#. TRANS: Form legend. %1$s is a list, %2$s is a tagger's name.
+#. TRANS: Form legend. %1$s is a list, %2$s is a lister's name.
 #, php-format
 msgid "Subscribe to list %1$s by %2$s"
 msgstr "Претплати �е на �пи�окот %1$s од %2$s"
@@ -699,6 +696,36 @@ msgstr "�ема наведено прекар на локален кори�н
 msgid "OStatus Connect"
 msgstr "OStatus - Поврзување"
 
+#. TRANS: Server exception. %s is a URL.
+#, php-format
+msgid "Invalid avatar URL %s."
+msgstr "�еважечка URL-адре�а за аватарот: %s."
+
+#. TRANS: Server exception. %s is a URI.
+#, php-format
+msgid "Tried to update avatar for unsaved remote profile %s."
+msgstr ""
+"Се обидов да го подновам аватарот за незачуваниот далечин�ки профил %s."
+
+#. TRANS: Server exception. %s is a URL.
+#, php-format
+msgid "Unable to fetch avatar from %s."
+msgstr "�е можам да го добијам аватарот од %s."
+
+#. TRANS: Exception. %s is a URL.
+#, php-format
+msgid "Could not find a feed URL for profile page %s."
+msgstr "�е можев да пронајдам канал�ка URL-адре�а за профилната �траница %s."
+
+#. TRANS: Exception.
+msgid "Not a valid webfinger address."
+msgstr "Ова не е важечка Webfinger-адре�а"
+
+#. TRANS: Exception. %s is a webfinger address.
+#, php-format
+msgid "Could not find a valid profile for \"%s\"."
+msgstr "�е можев да пронајдам важечки профил за „%s“."
+
 #. TRANS: Server exception.
 msgid "Attempting to start PuSH subscription for feed with no hub."
 msgstr "Се обидов да ја започнам PuSH-претплатата за канал без �редиште."
@@ -709,17 +736,17 @@ msgstr ""
 "Се обидувам да �тавам крај на PuSH-претплатата за емитување без �редиште."
 
 #. TRANS: Server exception. %s is a URI
-#, fuzzy, php-format
+#, php-format
 msgid "Invalid ostatus_profile state: Two or more IDs set for %s."
 msgstr ""
-"�еважечка �о�тојба на ostatus_profile: зададени �е две или повеќе назнаки "
+"�еважечка �о�тојба на ostatus_profile: Зададени �е две или повеќе назнаки "
 "(ID) за %s."
 
 #. TRANS: Server exception. %s is a URI
-#, fuzzy, php-format
+#, php-format
 msgid "Invalid ostatus_profile state: All IDs empty for %s."
 msgstr ""
-"�еважечка �о�тојба на ostatus_profile: �ите назнаки (ID) за %s �е празни."
+"�еважечка �о�тојба на ostatus_profile: Сите назнаки (ID) за %s �е празни."
 
 #. TRANS: Server exception.
 #. TRANS: %1$s is the method name the exception occured in, %2$s is the actor type.
@@ -743,6 +770,20 @@ msgstr "�епознат формат на канал�ко емитување."
 msgid "RSS feed without a channel."
 msgstr "RSS-емитување без канал."
 
+#. TRANS: Client exception thrown when trying to share multiple activities at once.
+msgid "Can only handle share activities with exactly one object."
+msgstr "Може да работи �амо �о активно�ти за �поделување �о точно еден објект."
+
+#. TRANS: Client exception thrown when trying to share a non-activity object.
+msgid "Can only handle shared activities."
+msgstr "Може да работи �амо за активно�ти за �поделување."
+
+#. TRANS: Client exception thrown when saving an activity share fails.
+#. TRANS: %s is a share ID.
+#, php-format
+msgid "Failed to save activity %s."
+msgstr "�е можев да ја зачувам активно�та %s."
+
 #. TRANS: Client exception. %s is a source URI.
 #, php-format
 msgid "No content for notice %s."
@@ -758,31 +799,10 @@ msgstr "Повеќе"
 msgid "Could not reach profile page %s."
 msgstr "�е можев да ја добијам профилната �траница %s."
 
-#. TRANS: Exception. %s is a URL.
-#, php-format
-msgid "Could not find a feed URL for profile page %s."
-msgstr "�е можев да пронајдам канал�ка URL-адре�а за профилната �траница %s."
-
 #. TRANS: Feed sub exception.
 msgid "Cannot find enough profile information to make a feed."
 msgstr "�е можев да најдам доволно профилни податоци за да направам канал."
 
-#. TRANS: Server exception. %s is a URL.
-#, php-format
-msgid "Invalid avatar URL %s."
-msgstr "�еважечка URL-адре�а за аватарот: %s."
-
-#. TRANS: Server exception. %s is a URI.
-#, php-format
-msgid "Tried to update avatar for unsaved remote profile %s."
-msgstr ""
-"Се обидов да го подновам аватарот за незачуваниот далечин�ки профил %s."
-
-#. TRANS: Server exception. %s is a URL.
-#, php-format
-msgid "Unable to fetch avatar from %s."
-msgstr "�е можам да го добијам аватарот од %s."
-
 #. TRANS: Server exception.
 msgid "No author ID URI found."
 msgstr "�е пронајдов URI за автор�ката ознака."
@@ -815,10 +835,6 @@ msgstr "�е можам да го зачувам локалниот �пи�ок
 msgid "Cannot save OStatus profile."
 msgstr "�е можам да го зачувам профилот од OStatus."
 
-#. TRANS: Exception.
-msgid "Not a valid webfinger address."
-msgstr "Ова не е важечка Webfinger-адре�а"
-
 #. TRANS: Exception. %s is a webfinger address.
 #, php-format
 msgid "Could not save profile for \"%s\"."
@@ -829,11 +845,6 @@ msgstr "�е можам да го зачувам профилот за „%s“.
 msgid "Could not save OStatus profile for \"%s\"."
 msgstr "�е можам да го зачувам профилот на OStatus за „%s“."
 
-#. TRANS: Exception. %s is a webfinger address.
-#, php-format
-msgid "Could not find a valid profile for \"%s\"."
-msgstr "�е можев да пронајдам важечки профил за „%s“."
-
 #. TRANS: Server exception.
 msgid "Could not store HTML content of long post as file."
 msgstr ""
@@ -921,41 +932,13 @@ msgid "This target does not understand leave events."
 msgstr "Оваа цел не разбира напуштање на на�тани."
 
 #. TRANS: Client exception.
-msgid "This target does not understand tag events."
-msgstr "Оваа цел не разбира означување на на�тани."
+msgid "This target does not understand list events."
+msgstr "Оваа цел не разбира заведување на на�тани."
 
 #. TRANS: Client exception.
-msgid "This target does not understand untag events."
-msgstr "Оваа цел не разбира от�транување на ознаки на на�тани."
+msgid "This target does not understand unlist events."
+msgstr "Оваа цел не разбира от�транување на заведени на�тани."
 
 #. TRANS: Exception.
 msgid "Received a salmon slap from unidentified actor."
 msgstr "Примив Salmon-шамар од непознат уче�ник."
-
-#~ msgctxt "TITLE"
-#~ msgid "Tag"
-#~ msgstr "Означи"
-
-#~ msgctxt "TITLE"
-#~ msgid "Untag"
-#~ msgstr "Тргни ознака"
-
-#~ msgid "Disfavor"
-#~ msgstr "Откажи бенди�ана"
-
-#~ msgid "%1$s marked notice %2$s as no longer a favorite."
-#~ msgstr "%1$s повеќе не ја бенди�ува забелешката %2$s."
-
-#~ msgid ""
-#~ "OStatus user's address, like nickname@example.com or http://example.net/"
-#~ "nickname"
-#~ msgstr ""
-#~ "�дре�а на кори�никот на OStatus, како на пр. prekar@primer.com or http://"
-#~ "primer.net/prekar"
-
-#~ msgid "Continue"
-#~ msgstr "Продолжи"
-
-#~ msgid "Could not remove remote user %1$s from list %2$s."
-#~ msgstr ""
-#~ "�е можев да го от�транам далечин�киот кори�ник %1$s од �пи�окот %2$s."
diff --git a/plugins/OStatus/locale/nl/LC_MESSAGES/OStatus.po b/plugins/OStatus/locale/nl/LC_MESSAGES/OStatus.po
index 1058b6eb77..9100419daa 100644
--- a/plugins/OStatus/locale/nl/LC_MESSAGES/OStatus.po
+++ b/plugins/OStatus/locale/nl/LC_MESSAGES/OStatus.po
@@ -10,18 +10,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OStatus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:44+0000\n"
-"Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:34+0000\n"
+"Language-Team: Dutch <https://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:48+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-12-03 13:49:04+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-ostatus\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: String in the gettext speed test script. Unimportant.
 msgid "Feeds"
 msgstr "Feeds"
 
@@ -31,7 +32,7 @@ msgid "Subscribe"
 msgstr "Abonneren"
 
 #. TRANS: Fieldset legend.
-msgid "Tag remote profile"
+msgid "List remote profile"
 msgstr "Extern profiel in lijst opnemen"
 
 #. TRANS: Field label.
@@ -57,8 +58,8 @@ msgstr "Ophalen"
 msgid "Invalid URI."
 msgstr "Ongeldige URI."
 
-#. TRANS: Error message in OStatus plugin.
-#. TRANS: Error text.
+#. TRANS: Error message in OStatus plugin. Do not translate the domain names example.com
+#. TRANS: and example.net, as these are official standard domain names for use in examples.
 msgid ""
 "Sorry, we could not reach that address. Please make sure that the OStatus "
 "address is like nickname@example.com or http://example.net/nickname."
@@ -126,10 +127,10 @@ msgid "Follow list"
 msgstr "Op lijst abonneren"
 
 #. TRANS: Success message for remote list follow through OStatus.
-#. TRANS: %1$s is the subscriber name, %2$s is the list, %3$s is the tagger's name.
-#, fuzzy, php-format
+#. TRANS: %1$s is the subscriber name, %2$s is the list, %3$s is the lister's name.
+#, php-format
 msgid "%1$s is now following people listed in %2$s by %3$s."
-msgstr "%1$s volgt niet langer de lijst %2$s van %3$s."
+msgstr "%1$s volgt niet langer de mensen in de lijst %2$s van %3$s."
 
 #. TRANS: Exception thrown when subscription to remote list fails.
 msgid "Failed subscribing to remote list."
@@ -140,7 +141,7 @@ msgid "Unfollow list"
 msgstr "Lijst niet langer volgen"
 
 #. TRANS: Success message for remote list unfollow through OStatus.
-#. TRANS: %1$s is the subscriber name, %2$s is the list, %3$s is the tagger's name.
+#. TRANS: %1$s is the subscriber name, %2$s is the list, %3$s is the lister's name.
 #, php-format
 msgid "%1$s stopped following the list %2$s by %3$s."
 msgstr "%1$s volgt niet langer de lijst %2$s van %3$s."
@@ -148,7 +149,7 @@ msgstr "%1$s volgt niet langer de lijst %2$s van %3$s."
 #. TRANS: Title for listing a remote profile.
 msgctxt "TITLE"
 msgid "List"
-msgstr ""
+msgstr "Opnemen in lijst"
 
 #. TRANS: Success message for remote list addition through OStatus.
 #. TRANS: %1$s is the list creator's name, %2$s is the added list member, %3$s is the list name.
@@ -157,35 +158,34 @@ msgid "%1$s listed %2$s in the list %3$s."
 msgstr "%1$s heeft %2$s in de lijst %3$s geplaatst."
 
 #. TRANS: Exception thrown when subscribing to a remote list fails.
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "Could not complete subscription to remote profile's feed. List %s could not "
 "be saved."
 msgstr ""
-"Het was niet mogelijk te abonneren op de feed van het externe profiel. Het "
-"label %s kon niet opgeslagen worden."
+"Het was niet mogelijk te abonneren op de feed van het externe profiel. De "
+"lijst %s kon niet opgeslagen worden."
 
 #. TRANS: Title for unlisting a remote profile.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Unlist"
-msgstr "Lijst niet langer volgen"
+msgstr "Verwijderen uit lijst"
 
 #. TRANS: Success message for remote list removal through OStatus.
 #. TRANS: %1$s is the list creator's name, %2$s is the removed list member, %3$s is the list name.
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s removed %2$s from the list %3$s."
-msgstr "%1$s heeft %2$s in de lijst %3$s geplaatst."
+msgstr "%1$s heeft %2$s uit de lijst %3$s verwijderd."
 
 #. TRANS: Title for unliking a remote notice.
 msgid "Unlike"
-msgstr ""
+msgstr "Niet langer leuk"
 
 #. TRANS: Success message for remove a favorite notice through OStatus.
 #. TRANS: %1$s is the unfavoring user's name, %2$s is URI to the no longer favored notice.
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s no longer likes %2$s."
-msgstr "%1$s volgt %2$s niet langer."
+msgstr "%1$s vindt %2$s niet langer leuk."
 
 #. TRANS: Link text for link to remote subscribe.
 msgid "Remote"
@@ -201,9 +201,9 @@ msgstr "Profielupdate"
 msgid "%s has updated their profile page."
 msgstr "Het profiel van %s is bijgewerkt."
 
-#. TRANS: Link text for a user to tag an OStatus user.
-msgid "Tag"
-msgstr "Label"
+#. TRANS: Link text for a user to list an OStatus user.
+msgid "List"
+msgstr "Opnemen in lijst"
 
 #. TRANS: Plugin description.
 msgid ""
@@ -271,17 +271,16 @@ msgstr "Ongeldig hub.topic \"%s\". De lijst bestaat niet."
 msgid "Invalid URL passed for %1$s: \"%2$s\""
 msgstr "Er is een ongeldige URL doorgegeven voor %1$s: \"%2$s\""
 
-#. TRANS: Client error displayed when trying to tag a local object as if it is remote.
-msgid "You can use the local tagging!"
-msgstr "U kunt de lokale labels gebruiken!"
+#. TRANS: Client error displayed when trying to list a local object as if it is remote.
+msgid "You can use the local list functionality!"
+msgstr "U kunt het lokale lijstabonnement gebruiken!"
 
-#. TRANS: Header for tagging a remote object. %s is a remote object's name.
+#. TRANS: Header for listing a remote object. %s is a remote object's name.
 #, php-format
-msgid "Tag %s"
-msgstr "Labelen als %s"
+msgid "List %s"
+msgstr "%s opnemen in de lijst"
 
-#. TRANS: Button text to tag a remote object.
-#, fuzzy
+#. TRANS: Button text to list a remote object.
 msgctxt "BUTTON"
 msgid "Go"
 msgstr "OK"
@@ -291,18 +290,16 @@ msgid "User nickname"
 msgstr "Gebruikersnaam"
 
 #. TRANS: Field title.
-#, fuzzy
-msgid "Nickname of the user you want to tag."
-msgstr "Naam van de gebruiker die u wilt labelen."
+msgid "Nickname of the user you want to list."
+msgstr "De naam van de gebruiker die u wilt opnemen in de lijst."
 
 #. TRANS: Field label.
 msgid "Profile Account"
 msgstr "Gebruikersprofiel"
 
 #. TRANS: Field title.
-#, fuzzy
-msgid "Your account id (i.e. user@identi.ca)."
-msgstr "Uw gebruikers-ID (bv. gebruiker@identi.ca)"
+msgid "Your account id (for example user@identi.ca)."
+msgstr "Uw gebruikers-ID (bijvoorbeeld \"gebruiker@identi.ca\")."
 
 #. TRANS: Client error displayed when remote profile could not be looked up.
 #. TRANS: Client error.
@@ -380,6 +377,7 @@ msgstr "Bevestigen"
 msgid "Subscribe to this user"
 msgstr "Op deze gebruiker abonneren"
 
+#. TRANS: Extra paragraph in remote profile view when already subscribed.
 msgid "You are already subscribed to this user."
 msgstr "U bent al geabonneerd op deze gebruiker."
 
@@ -425,7 +423,8 @@ msgstr ""
 msgid "Join group"
 msgstr "Lid worden van groep"
 
-#. TRANS: Tooltip for field label "Join group".
+#. TRANS: Tooltip for field label "Join group". Do not translate the "example.net"
+#. TRANS: domain name in the URL, as it is an official standard domain name for examples.
 msgid "OStatus group's address, like http://example.net/group/nickname."
 msgstr ""
 "Het adres voor de OStatusgroep. Bijvoorbeeld; http://example.net/group/"
@@ -478,11 +477,11 @@ msgstr ""
 
 #. TRANS: Client exception.
 msgid "To the attention of user(s), not including this one."
-msgstr ""
+msgstr "Gericht aan gebruiker(s), deze uitgezonderd."
 
 #. TRANS: Client exception.
 msgid "Not to anyone in reply to anything."
-msgstr ""
+msgstr "Niet aan iemand als antwoord op iets."
 
 #. TRANS: Client exception.
 msgid "This is already a favorite."
@@ -498,31 +497,31 @@ msgstr "De mededeling is niet op de favorietenlijst geplaatst!"
 
 #. TRANS: Client exception.
 msgid "Not a person object."
-msgstr ""
+msgstr "Geen persoonsobject."
 
 #. TRANS: Client exception.
-msgid "Unidentified profile being tagged."
-msgstr ""
+msgid "Unidentified profile being listed."
+msgstr "Er wordt een niet-geïdentificeerd profiel in de lijst opgenomen."
 
 #. TRANS: Client exception.
-msgid "This user is not the one being tagged."
-msgstr ""
+msgid "This user is not the one being listed."
+msgstr "Dit is niet de gebruiker die aan de lijst wordt toegevoegd."
 
 #. TRANS: Client exception.
-msgid "The tag could not be saved."
-msgstr ""
+msgid "The listing could not be saved."
+msgstr "Het object kon niet aan de lijst toegevoegd worden."
 
 #. TRANS: Client exception.
-msgid "Unidentified profile being untagged."
-msgstr ""
+msgid "Unidentified profile being unlisted."
+msgstr "Er wordt een niet-geïdentificeerd profiel verwijderd uit de lijst."
 
 #. TRANS: Client exception.
-msgid "This user is not the one being untagged."
-msgstr ""
+msgid "This user is not the one being unlisted."
+msgstr "Dit is niet de gebruiker die verwijderd wordt uit de lijst."
 
 #. TRANS: Client exception.
-msgid "The tag could not be deleted."
-msgstr ""
+msgid "The listing could not be deleted."
+msgstr "Het object kon niet verwijderd worden uit de lijst."
 
 #. TRANS: Client exception.
 msgid "Cannot favorite/unfavorite without an object."
@@ -549,7 +548,6 @@ msgid "Subscribe to list"
 msgstr "Abonneren op lijst"
 
 #. TRANS: Field title.
-#, fuzzy
 msgid "Address of the OStatus list, like http://example.net/user/all/tag."
 msgstr ""
 "Het adres voor de OStatus-lijst, bijvoorbeeld http://example.net/user/all/"
@@ -564,7 +562,6 @@ msgid "Confirm subscription to remote list"
 msgstr "Abonnement op externe lijst bevestigen"
 
 #. TRANS: Instructions for OStatus list subscription form.
-#, fuzzy
 msgid ""
 "You can subscribe to lists from other supported sites. Paste the list's URI "
 "below:"
@@ -623,10 +620,8 @@ msgstr ""
 "geaccepteerd."
 
 #. TRANS: Client error displayed when referring to a non-existing remote list.
-#, fuzzy
 msgid "Cannot read profile to set up list subscription."
-msgstr ""
-"Het profiel om te abonneren op een persoonslabel kon niet gelezen worden."
+msgstr "Het profiel om te abonneren op een lijst kon niet gelezen worden."
 
 #. TRANS: Client error displayed when trying to subscribe a group to a list.
 #. TRANS: Client error displayed when trying to unsubscribe a group from a list.
@@ -642,18 +637,18 @@ msgstr ""
 "2$s."
 
 #. TRANS: Client error displayed when trying to unsubscribe from non-existing list.
-#, fuzzy
 msgid "Cannot read profile to cancel list subscription."
 msgstr ""
-"Het profiel om het lijstlidmaatschap te annuleren kon niet gelezen worden."
+"Het profiel om het abonnement op een lijst op te zeggen kon niet gelezen "
+"worden."
 
 #. TRANS: Client error displayed when trying to unsubscribe a remote user from a list fails.
 #. TRANS: %1$s is a profile URL, %2$s is a list name.
-#, fuzzy, php-format
+#, php-format
 msgid "Could not unsubscribe remote user %1$s from list %2$s."
 msgstr ""
-"Het was niet mogelijk om de externe gebruiker %1$s te abonneren op de lijst %"
-"2$s."
+"Het was niet mogelijk om het abonnement op de lijst %2$s voor de de externe "
+"gebruiker %1$s op te zeggen."
 
 #. TRANS: Client error.
 msgid "You can use the local subscription!"
@@ -674,7 +669,7 @@ msgctxt "BUTTON"
 msgid "Join"
 msgstr "Toetreden"
 
-#. TRANS: Form legend. %1$s is a list, %2$s is a tagger's name.
+#. TRANS: Form legend. %1$s is a list, %2$s is a lister's name.
 #, php-format
 msgid "Subscribe to list %1$s by %2$s"
 msgstr "Abonneren op de lijst %1$s van %2$s"
@@ -718,6 +713,37 @@ msgstr "Er is geen lokale gebruikers- of groepsnaam opgegeven."
 msgid "OStatus Connect"
 msgstr "OStatuskoppeling"
 
+#. TRANS: Server exception. %s is a URL.
+#, php-format
+msgid "Invalid avatar URL %s."
+msgstr "Ongeldige avatar-URL %s."
+
+#. TRANS: Server exception. %s is a URI.
+#, php-format
+msgid "Tried to update avatar for unsaved remote profile %s."
+msgstr ""
+"Er is geprobeerd om een avatar bij te werken voor het niet opgeslagen "
+"externe profiel %s."
+
+#. TRANS: Server exception. %s is a URL.
+#, php-format
+msgid "Unable to fetch avatar from %s."
+msgstr "Het was niet mogelijk om de avatar op te halen van %s."
+
+#. TRANS: Exception. %s is a URL.
+#, php-format
+msgid "Could not find a feed URL for profile page %s."
+msgstr "Het was niet mogelijk de feed-URL voor de profielpagina %s te vinden."
+
+#. TRANS: Exception.
+msgid "Not a valid webfinger address."
+msgstr "Geen geldig webfingeradres."
+
+#. TRANS: Exception. %s is a webfinger address.
+#, php-format
+msgid "Could not find a valid profile for \"%s\"."
+msgstr "Er is geen geldig profiel voor \"%s\" gevonden."
+
 #. TRANS: Server exception.
 msgid "Attempting to start PuSH subscription for feed with no hub."
 msgstr ""
@@ -729,13 +755,14 @@ msgstr ""
 "Aan het proberen een PuSH-abonnement te verwijderen voor een feed zonder hub."
 
 #. TRANS: Server exception. %s is a URI
-#, fuzzy, php-format
+#, php-format
 msgid "Invalid ostatus_profile state: Two or more IDs set for %s."
 msgstr ""
-"Ongeldige OStatus-profielstatus: er zijn twee of meer ID's ingesteld voor %s."
+"Ongeldige ostatus_profile-status: er zijn twee of meer ID's ingesteld voor %"
+"s."
 
 #. TRANS: Server exception. %s is a URI
-#, fuzzy, php-format
+#, php-format
 msgid "Invalid ostatus_profile state: All IDs empty for %s."
 msgstr "Ongeldige ostatus_profile status: alle ID's zijn leeg voor %s."
 
@@ -761,6 +788,20 @@ msgstr "Onbekend feedformaat"
 msgid "RSS feed without a channel."
 msgstr "RSS-feed zonder kanaal."
 
+#. TRANS: Client exception thrown when trying to share multiple activities at once.
+msgid "Can only handle share activities with exactly one object."
+msgstr "Kan slechts delen van activiteiten aan met precies een objects."
+
+#. TRANS: Client exception thrown when trying to share a non-activity object.
+msgid "Can only handle shared activities."
+msgstr "Het is alleen mogelijk gedeelde activiteiten af te handelen."
+
+#. TRANS: Client exception thrown when saving an activity share fails.
+#. TRANS: %s is a share ID.
+#, php-format
+msgid "Failed to save activity %s."
+msgstr "Het opslaan van de activiteit %s is mislukt."
+
 #. TRANS: Client exception. %s is a source URI.
 #, php-format
 msgid "No content for notice %s."
@@ -776,33 +817,12 @@ msgstr "Meer weergeven"
 msgid "Could not reach profile page %s."
 msgstr "Het was niet mogelijk de profielpagina %s te bereiken."
 
-#. TRANS: Exception. %s is a URL.
-#, php-format
-msgid "Could not find a feed URL for profile page %s."
-msgstr "Het was niet mogelijk de feed-URL voor de profielpagina %s te vinden."
-
 #. TRANS: Feed sub exception.
 msgid "Cannot find enough profile information to make a feed."
 msgstr ""
 "Het was niet mogelijk voldoende profielgegevens te vinden om een feed te "
 "maken."
 
-#. TRANS: Server exception. %s is a URL.
-#, php-format
-msgid "Invalid avatar URL %s."
-msgstr "Ongeldige avatar-URL %s."
-
-#. TRANS: Server exception. %s is a URI.
-#, php-format
-msgid "Tried to update avatar for unsaved remote profile %s."
-msgstr ""
-"Geprobeerd om een avatar bij te werken voor het niet opgeslagen profiel %s."
-
-#. TRANS: Server exception. %s is a URL.
-#, php-format
-msgid "Unable to fetch avatar from %s."
-msgstr "Het was niet mogelijk de avatar op te halen van %s."
-
 #. TRANS: Server exception.
 msgid "No author ID URI found."
 msgstr "Er is geen URI voor het auteurs-ID gevonden."
@@ -839,10 +859,6 @@ msgstr "Het was niet mogelijk de lokale lijst op te slaan."
 msgid "Cannot save OStatus profile."
 msgstr "Het was niet mogelijk het Ostatusprofiel op te slaan."
 
-#. TRANS: Exception.
-msgid "Not a valid webfinger address."
-msgstr "Geen geldig webfingeradres."
-
 #. TRANS: Exception. %s is a webfinger address.
 #, php-format
 msgid "Could not save profile for \"%s\"."
@@ -853,11 +869,6 @@ msgstr "Het was niet mogelijk het profiel voor \"%s\" op te slaan."
 msgid "Could not save OStatus profile for \"%s\"."
 msgstr "Het was niet mogelijk het OStatus-profiel voor \"%s\" op te slaan."
 
-#. TRANS: Exception. %s is a webfinger address.
-#, php-format
-msgid "Could not find a valid profile for \"%s\"."
-msgstr "Er is geen geldig profiel voor \"%s\" gevonden."
-
 #. TRANS: Server exception.
 msgid "Could not store HTML content of long post as file."
 msgstr ""
@@ -947,42 +958,15 @@ msgid "This target does not understand leave events."
 msgstr "Deze bestemming begrijpt uitschrijven van evenementen niet."
 
 #. TRANS: Client exception.
-msgid "This target does not understand tag events."
-msgstr "Deze bestemming begrijpt evenementen labelen niet."
+msgid "This target does not understand list events."
+msgstr ""
+"Deze bestemming begrijpt gebeurtenissen over toevoegen aan lijsten niet."
 
 #. TRANS: Client exception.
-msgid "This target does not understand untag events."
-msgstr "Deze bestemming begrijpt evenementen ontlabelen niet."
+msgid "This target does not understand unlist events."
+msgstr ""
+"Deze bestemming begrijpt gebeurtenissen over verwijderen uit lijsten niet."
 
 #. TRANS: Exception.
 msgid "Received a salmon slap from unidentified actor."
 msgstr "Er is een Salmonslap ontvangen van een niet-geïdentificeerde actor."
-
-#~ msgctxt "TITLE"
-#~ msgid "Tag"
-#~ msgstr "Label"
-
-#~ msgctxt "TITLE"
-#~ msgid "Untag"
-#~ msgstr "Label verwijderen"
-
-#~ msgid "Disfavor"
-#~ msgstr "Uit favorieten verwijderen"
-
-#~ msgid "%1$s marked notice %2$s as no longer a favorite."
-#~ msgstr "%1$s heeft de mededeling %2$s als favoriet verwijderd."
-
-#~ msgid ""
-#~ "OStatus user's address, like nickname@example.com or http://example.net/"
-#~ "nickname"
-#~ msgstr ""
-#~ "Het OStatusadres van de gebruiker. Bijvoorbeeld nickname@example.com of "
-#~ "http://example.net/nickname"
-
-#~ msgid "Continue"
-#~ msgstr "Doorgaan"
-
-#~ msgid "Could not remove remote user %1$s from list %2$s."
-#~ msgstr ""
-#~ "!Het was niet mogelijk de externe gebruiker %1$s uit de lijst %2$s te "
-#~ "verwijderen."
diff --git a/plugins/OStatus/locale/tl/LC_MESSAGES/OStatus.po b/plugins/OStatus/locale/tl/LC_MESSAGES/OStatus.po
index eacadcc541..ac0f665ea8 100644
--- a/plugins/OStatus/locale/tl/LC_MESSAGES/OStatus.po
+++ b/plugins/OStatus/locale/tl/LC_MESSAGES/OStatus.po
@@ -9,18 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OStatus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:44+0000\n"
-"Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:34+0000\n"
+"Language-Team: Tagalog <https://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:48+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-12-03 13:49:04+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-ostatus\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: String in the gettext speed test script. Unimportant.
 msgid "Feeds"
 msgstr "Mga pasubo"
 
@@ -30,8 +31,8 @@ msgid "Subscribe"
 msgstr "Pumayag na tumanggap ng sipi"
 
 #. TRANS: Fieldset legend.
-msgid "Tag remote profile"
-msgstr "Tatakan ang malayong balangkas"
+msgid "List remote profile"
+msgstr "Ilista ang malayong balangkas"
 
 #. TRANS: Field label.
 msgctxt "LABEL"
@@ -56,8 +57,8 @@ msgstr "Salukin"
 msgid "Invalid URI."
 msgstr "Hindi katanggap-tanggap na URI."
 
-#. TRANS: Error message in OStatus plugin.
-#. TRANS: Error text.
+#. TRANS: Error message in OStatus plugin. Do not translate the domain names example.com
+#. TRANS: and example.net, as these are official standard domain names for use in examples.
 msgid ""
 "Sorry, we could not reach that address. Please make sure that the OStatus "
 "address is like nickname@example.com or http://example.net/nickname."
@@ -126,10 +127,11 @@ msgid "Follow list"
 msgstr "Sundan ang talaan"
 
 #. TRANS: Success message for remote list follow through OStatus.
-#. TRANS: %1$s is the subscriber name, %2$s is the list, %3$s is the tagger's name.
-#, fuzzy, php-format
+#. TRANS: %1$s is the subscriber name, %2$s is the list, %3$s is the lister's name.
+#, php-format
 msgid "%1$s is now following people listed in %2$s by %3$s."
-msgstr "Tumigil si %1$s sa pagsunod sa talaang %2$s ni %3$s."
+msgstr ""
+"Sinusundan na ngayon ni %1$s ang mga taong nakatala sa loob ng %2$s ni %3$s."
 
 #. TRANS: Exception thrown when subscription to remote list fails.
 msgid "Failed subscribing to remote list."
@@ -140,7 +142,7 @@ msgid "Unfollow list"
 msgstr "Huwag sundan ang talaan"
 
 #. TRANS: Success message for remote list unfollow through OStatus.
-#. TRANS: %1$s is the subscriber name, %2$s is the list, %3$s is the tagger's name.
+#. TRANS: %1$s is the subscriber name, %2$s is the list, %3$s is the lister's name.
 #, php-format
 msgid "%1$s stopped following the list %2$s by %3$s."
 msgstr "Tumigil si %1$s sa pagsunod sa talaang %2$s ni %3$s."
@@ -148,7 +150,7 @@ msgstr "Tumigil si %1$s sa pagsunod sa talaang %2$s ni %3$s."
 #. TRANS: Title for listing a remote profile.
 msgctxt "TITLE"
 msgid "List"
-msgstr ""
+msgstr "Itala"
 
 #. TRANS: Success message for remote list addition through OStatus.
 #. TRANS: %1$s is the list creator's name, %2$s is the added list member, %3$s is the list name.
@@ -157,35 +159,34 @@ msgid "%1$s listed %2$s in the list %3$s."
 msgstr "Itinala ni %1$s si %2$s sa loob ng talaang %3$s."
 
 #. TRANS: Exception thrown when subscribing to a remote list fails.
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "Could not complete subscription to remote profile's feed. List %s could not "
 "be saved."
 msgstr ""
-"Hindi mabuo ang pagpapasipi sa pasubo ng malayong balangkas. Hindi masasagip "
-"ang tatak na %s."
+"Hindi mabuo ang pagpapasipi sa pagpapasipi ng malayong balangkas. Hindi "
+"masasagip ang talaang %s."
 
 #. TRANS: Title for unlisting a remote profile.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Unlist"
-msgstr "Huwag sundan ang talaan"
+msgstr "Huwag itala"
 
 #. TRANS: Success message for remote list removal through OStatus.
 #. TRANS: %1$s is the list creator's name, %2$s is the removed list member, %3$s is the list name.
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s removed %2$s from the list %3$s."
-msgstr "Itinala ni %1$s si %2$s sa loob ng talaang %3$s."
+msgstr "Tinanggal ni %1$s ang %2$s mula sa talaang %3$s."
 
 #. TRANS: Title for unliking a remote notice.
 msgid "Unlike"
-msgstr ""
+msgstr "Huwag gustuhin"
 
 #. TRANS: Success message for remove a favorite notice through OStatus.
 #. TRANS: %1$s is the unfavoring user's name, %2$s is URI to the no longer favored notice.
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s no longer likes %2$s."
-msgstr "Tumigil si %1$s sa pagsunod kay %2$s."
+msgstr "Hindi na gusto ni %1$s ang %2$s."
 
 #. TRANS: Link text for link to remote subscribe.
 msgid "Remote"
@@ -201,9 +202,9 @@ msgstr "Pagsasapanahon ng balangkas"
 msgid "%s has updated their profile page."
 msgstr "Si %s ay nagsapanahon ng kanilang pahina ng balangkas."
 
-#. TRANS: Link text for a user to tag an OStatus user.
-msgid "Tag"
-msgstr "Tatakan"
+#. TRANS: Link text for a user to list an OStatus user.
+msgid "List"
+msgstr "Ilista"
 
 #. TRANS: Plugin description.
 msgid ""
@@ -275,38 +276,35 @@ msgstr "Hindi katanggap-tanggap na hub.topic na %s; hindi umiiral ang talaan."
 msgid "Invalid URL passed for %1$s: \"%2$s\""
 msgstr "Hindi katanggap-tanggap na URL ang ipinasa para sa %1$s: \"%2$s\""
 
-#. TRANS: Client error displayed when trying to tag a local object as if it is remote.
-msgid "You can use the local tagging!"
-msgstr "Maaari mong gamitin ang katutubong pagtatatak!"
+#. TRANS: Client error displayed when trying to list a local object as if it is remote.
+msgid "You can use the local list functionality!"
+msgstr "Maaari mong gamitin ang katungkulan ng katutubong listahan!"
 
-#. TRANS: Header for tagging a remote object. %s is a remote object's name.
+#. TRANS: Header for listing a remote object. %s is a remote object's name.
 #, php-format
-msgid "Tag %s"
-msgstr "Tatakan si %s"
+msgid "List %s"
+msgstr "Ilista ang %s"
 
-#. TRANS: Button text to tag a remote object.
-#, fuzzy
+#. TRANS: Button text to list a remote object.
 msgctxt "BUTTON"
 msgid "Go"
-msgstr "Pumunta"
+msgstr "Gawin"
 
 #. TRANS: Field label.
 msgid "User nickname"
 msgstr "Palayaw ng tagagamit"
 
 #. TRANS: Field title.
-#, fuzzy
-msgid "Nickname of the user you want to tag."
-msgstr "Palayaw ng tagagamit na nais mong tatakan."
+msgid "Nickname of the user you want to list."
+msgstr "Palayaw ng tagagamit na nais mong ilista."
 
 #. TRANS: Field label.
 msgid "Profile Account"
 msgstr "Akawnt ng Balangkas"
 
 #. TRANS: Field title.
-#, fuzzy
-msgid "Your account id (i.e. user@identi.ca)."
-msgstr "ID ng akawnt mo (katulad ng user@identi.ca)."
+msgid "Your account id (for example user@identi.ca)."
+msgstr "Ang ID mo ng akawnt (halimbawa na ang user@identi.ca)."
 
 #. TRANS: Client error displayed when remote profile could not be looked up.
 #. TRANS: Client error.
@@ -384,6 +382,7 @@ msgstr "Tiyakin"
 msgid "Subscribe to this user"
 msgstr "Magpasipi sa tagagamit na ito"
 
+#. TRANS: Extra paragraph in remote profile view when already subscribed.
 msgid "You are already subscribed to this user."
 msgstr "Tumatanggap ka na ng sipi mula sa tagagamit na ito."
 
@@ -429,7 +428,8 @@ msgstr ""
 msgid "Join group"
 msgstr "Sumali sa pangkat"
 
-#. TRANS: Tooltip for field label "Join group".
+#. TRANS: Tooltip for field label "Join group". Do not translate the "example.net"
+#. TRANS: domain name in the URL, as it is an official standard domain name for examples.
 msgid "OStatus group's address, like http://example.net/group/nickname."
 msgstr ""
 "Tirahan ng pangkat ng OStatus, katulad ng http://example.net/group/nickname."
@@ -481,11 +481,11 @@ msgstr ""
 
 #. TRANS: Client exception.
 msgid "To the attention of user(s), not including this one."
-msgstr ""
+msgstr "Para sa pagpansin ng (mga) tagagamit, hindi kasama ang isang ito."
 
 #. TRANS: Client exception.
 msgid "Not to anyone in reply to anything."
-msgstr ""
+msgstr "Hindi para sa sinuman bilang pagtugon sa anumang bagay."
 
 #. TRANS: Client exception.
 msgid "This is already a favorite."
@@ -501,31 +501,31 @@ msgstr "Hindi kinagiliwan ang pabatid!"
 
 #. TRANS: Client exception.
 msgid "Not a person object."
-msgstr ""
+msgstr "Hindi isang bagay ng tao."
 
 #. TRANS: Client exception.
-msgid "Unidentified profile being tagged."
-msgstr ""
+msgid "Unidentified profile being listed."
+msgstr "Inililistang balangkas na hindi pa nakikilala."
 
 #. TRANS: Client exception.
-msgid "This user is not the one being tagged."
-msgstr ""
+msgid "This user is not the one being listed."
+msgstr "Hindi ito ang tagagamit na inililista."
 
 #. TRANS: Client exception.
-msgid "The tag could not be saved."
-msgstr ""
+msgid "The listing could not be saved."
+msgstr "Hindi masasagip ang listahan."
 
 #. TRANS: Client exception.
-msgid "Unidentified profile being untagged."
-msgstr ""
+msgid "Unidentified profile being unlisted."
+msgstr "Inaalis sa lista na balangkas na hindi pa nakikilala."
 
 #. TRANS: Client exception.
-msgid "This user is not the one being untagged."
-msgstr ""
+msgid "This user is not the one being unlisted."
+msgstr "Hindi ito ang tagagamit na inaalis mula sa listahan."
 
 #. TRANS: Client exception.
-msgid "The tag could not be deleted."
-msgstr ""
+msgid "The listing could not be deleted."
+msgstr "Hindi mabura ang listahan."
 
 #. TRANS: Client exception.
 msgid "Cannot favorite/unfavorite without an object."
@@ -551,11 +551,9 @@ msgid "Subscribe to list"
 msgstr "Tumanggap ng sipi mula sa talaan"
 
 #. TRANS: Field title.
-#, fuzzy
 msgid "Address of the OStatus list, like http://example.net/user/all/tag."
 msgstr ""
-"Tirahan ng tatak ng talaan ng OStatus, katulad ng http://example.net/user/"
-"all/tag"
+"Tirahan ng talaan ng OStatus, katulad ng http://example.net/user/all/tag."
 
 #. TRANS: Error text displayed when trying to subscribe to a list already a subscriber to.
 msgid "You are already subscribed to this list."
@@ -566,13 +564,12 @@ msgid "Confirm subscription to remote list"
 msgstr "Tiyakin ang pagpapasipi sa malayong talaan"
 
 #. TRANS: Instructions for OStatus list subscription form.
-#, fuzzy
 msgid ""
 "You can subscribe to lists from other supported sites. Paste the list's URI "
 "below:"
 msgstr ""
 "Maaari kang magpasipi sa mga talaan mula sa iba pang mga sityong "
-"tinatangkilik.  Idikit ang tirahan o URI ng balangkas ng talaang nasa ibaba:"
+"tinatangkilik.  Idikit ang URI ng mga talaan sa ibaba:"
 
 #. TRANS: Client error.
 msgid "No such group."
@@ -624,10 +621,8 @@ msgstr ""
 "Hindi matanggap ang malalayong mga paskil para sa isang malayong talaan."
 
 #. TRANS: Client error displayed when referring to a non-existing remote list.
-#, fuzzy
 msgid "Cannot read profile to set up list subscription."
-msgstr ""
-"Hindi mabasa ang balangkas upang maihanda ang tatak ng pagsapi sa pangkat."
+msgstr "Hindi mabasa ang balangkas upang maihanda ang talaan ng pagpapasipi."
 
 #. TRANS: Client error displayed when trying to subscribe a group to a list.
 #. TRANS: Client error displayed when trying to unsubscribe a group from a list.
@@ -641,15 +636,17 @@ msgid "Could not subscribe remote user %1$s to list %2$s."
 msgstr "Hindi mapasipian ang malayong tagagamit na si %1$s sa talaang %2$s."
 
 #. TRANS: Client error displayed when trying to unsubscribe from non-existing list.
-#, fuzzy
 msgid "Cannot read profile to cancel list subscription."
-msgstr "Hindi mabasa ang balangkas upang huwag ituloy ang kasapian sa talaan."
+msgstr ""
+"Hindi mabasa ang balangkas upang huwat maituloy ang talaan ng pagpapasipi."
 
 #. TRANS: Client error displayed when trying to unsubscribe a remote user from a list fails.
 #. TRANS: %1$s is a profile URL, %2$s is a list name.
-#, fuzzy, php-format
+#, php-format
 msgid "Could not unsubscribe remote user %1$s from list %2$s."
-msgstr "Hindi mapasipian ang malayong tagagamit na si %1$s sa talaang %2$s."
+msgstr ""
+"Hindi matanggap sa pagpapasipi ang malayong tagagamit na si %1$s mula sa "
+"talaang %2$s."
 
 #. TRANS: Client error.
 msgid "You can use the local subscription!"
@@ -670,7 +667,7 @@ msgctxt "BUTTON"
 msgid "Join"
 msgstr "Sumali"
 
-#. TRANS: Form legend. %1$s is a list, %2$s is a tagger's name.
+#. TRANS: Form legend. %1$s is a list, %2$s is a lister's name.
 #, php-format
 msgid "Subscribe to list %1$s by %2$s"
 msgstr "Magpasipi sa talaang %1$s ni %2$s"
@@ -714,6 +711,39 @@ msgstr "Walang ibinigay na palayaw ng katutubong tagagamit o pangkat."
 msgid "OStatus Connect"
 msgstr "Ugnay sa OStatus"
 
+#. TRANS: Server exception. %s is a URL.
+#, php-format
+msgid "Invalid avatar URL %s."
+msgstr "Hindi katanggap-tanggap na URL ng abatar ang %s."
+
+#. TRANS: Server exception. %s is a URI.
+#, php-format
+msgid "Tried to update avatar for unsaved remote profile %s."
+msgstr ""
+"Sinubok na isapanahon ang huwaran para sa hindi nasagip na malayong "
+"balangkas na %s."
+
+#. TRANS: Server exception. %s is a URL.
+#, php-format
+msgid "Unable to fetch avatar from %s."
+msgstr "Hindi nagawang damputin ang huwaran mula sa %s."
+
+#. TRANS: Exception. %s is a URL.
+#, php-format
+msgid "Could not find a feed URL for profile page %s."
+msgstr ""
+"Hindi makahanap ng isang URL ng pasubo para sa pahina ng balangkas na %s."
+
+#. TRANS: Exception.
+msgid "Not a valid webfinger address."
+msgstr "Hindi isang katanggap-tanggap na tirahan ng daliri ng web."
+
+#. TRANS: Exception. %s is a webfinger address.
+#, php-format
+msgid "Could not find a valid profile for \"%s\"."
+msgstr ""
+"Hindi makahanap ng isang katanggap-tanggap na balangkas para sa \"%s\"."
+
 #. TRANS: Server exception.
 msgid "Attempting to start PuSH subscription for feed with no hub."
 msgstr ""
@@ -727,18 +757,18 @@ msgstr ""
 "sindirit."
 
 #. TRANS: Server exception. %s is a URI
-#, fuzzy, php-format
+#, php-format
 msgid "Invalid ostatus_profile state: Two or more IDs set for %s."
 msgstr ""
-"Hindi katanggap-tanggap na katayuan ng ostatus_profile: dalawa o mahigit "
-"pang mga ID ang nakatakda para sa %s."
+"Hindi katanggap-tanggap na katayuan ng ostatus_profile: Dalawa o mahigit "
+"pang mga ID na nakatakda para sa %s."
 
 #. TRANS: Server exception. %s is a URI
-#, fuzzy, php-format
+#, php-format
 msgid "Invalid ostatus_profile state: All IDs empty for %s."
 msgstr ""
-"Hindi katanggap-tanggap na katayuan ng ostatus_profile: lahat ng mga ID ay "
-"walang laman ang mga ID ng para sa %s."
+"Hindi katanggap-tanggap na katayuan ng ostatus_profile: Lahat ng mga ID ay "
+"walang laman para sa %s."
 
 #. TRANS: Server exception.
 #. TRANS: %1$s is the method name the exception occured in, %2$s is the actor type.
@@ -762,6 +792,22 @@ msgstr "Hindi nalalamang anyo ng pasubo."
 msgid "RSS feed without a channel."
 msgstr "Pasubong RSS na walang libuyan."
 
+#. TRANS: Client exception thrown when trying to share multiple activities at once.
+msgid "Can only handle share activities with exactly one object."
+msgstr ""
+"Makapanghahawak lamang ng mga gawaing pinagsasaluhan na mayroong isang bagay "
+"lang talaga."
+
+#. TRANS: Client exception thrown when trying to share a non-activity object.
+msgid "Can only handle shared activities."
+msgstr "Makapanghahawak lamang ng mga gawaing pinagsasaluhan."
+
+#. TRANS: Client exception thrown when saving an activity share fails.
+#. TRANS: %s is a share ID.
+#, php-format
+msgid "Failed to save activity %s."
+msgstr "Nabigo sa pagsagip ng gawaing %s."
+
 #. TRANS: Client exception. %s is a source URI.
 #, php-format
 msgid "No content for notice %s."
@@ -777,35 +823,12 @@ msgstr "Magpakita ng marami pa"
 msgid "Could not reach profile page %s."
 msgstr "Hindi maabot ang pahina ng balangkas na %s."
 
-#. TRANS: Exception. %s is a URL.
-#, php-format
-msgid "Could not find a feed URL for profile page %s."
-msgstr ""
-"Hindi makahanap ng isang URL ng pasubo para sa pahina ng balangkas na %s."
-
 #. TRANS: Feed sub exception.
 msgid "Cannot find enough profile information to make a feed."
 msgstr ""
 "Hindi makahanap ng sapat na kabatiran ng balangkas upang makagawa ng isang "
 "pasubo."
 
-#. TRANS: Server exception. %s is a URL.
-#, php-format
-msgid "Invalid avatar URL %s."
-msgstr "Hindi katanggap-tanggap na URL ng abatar ang %s."
-
-#. TRANS: Server exception. %s is a URI.
-#, php-format
-msgid "Tried to update avatar for unsaved remote profile %s."
-msgstr ""
-"Sinubok na isapanahon ang huwaran para sa hindi nasagip na malayong "
-"balangkas na %s."
-
-#. TRANS: Server exception. %s is a URL.
-#, php-format
-msgid "Unable to fetch avatar from %s."
-msgstr "Hindi nagawang damputin ang huwaran mula sa %s."
-
 #. TRANS: Server exception.
 msgid "No author ID URI found."
 msgstr "Walang natagpuang URI ng ID ng may-akda."
@@ -838,10 +861,6 @@ msgstr "Hindi masagip ang katutubong talaan."
 msgid "Cannot save OStatus profile."
 msgstr "Hindi masagip ang balangkas ng OStatus."
 
-#. TRANS: Exception.
-msgid "Not a valid webfinger address."
-msgstr "Hindi isang katanggap-tanggap na tirahan ng daliri ng web."
-
 #. TRANS: Exception. %s is a webfinger address.
 #, php-format
 msgid "Could not save profile for \"%s\"."
@@ -852,12 +871,6 @@ msgstr "Hindi masagip ang balangkas para sa \"%s\"."
 msgid "Could not save OStatus profile for \"%s\"."
 msgstr "Hindi masagip ang balangkas ng Ostatus para sa \"%s\"."
 
-#. TRANS: Exception. %s is a webfinger address.
-#, php-format
-msgid "Could not find a valid profile for \"%s\"."
-msgstr ""
-"Hindi makahanap ng isang katanggap-tanggap na balangkas para sa \"%s\"."
-
 #. TRANS: Server exception.
 msgid "Could not store HTML content of long post as file."
 msgstr ""
@@ -948,46 +961,16 @@ msgstr ""
 "Ang pinupukol na ito ay hindi nakakaunawa ng mga kaganapan ng paglisan."
 
 #. TRANS: Client exception.
-msgid "This target does not understand tag events."
+msgid "This target does not understand list events."
 msgstr ""
-"Ang pinupukol na ito ay hindi nakakaunawa ng mga kaganapan ng pagtatatak."
+"Ang pinupukol na ito ay hindi nakakaunawa ng mga kaganapan ng paglilista."
 
 #. TRANS: Client exception.
-msgid "This target does not understand untag events."
+msgid "This target does not understand unlist events."
 msgstr ""
-"Ang pinupukol na ito ay hindi nakakaunawa ng mga kaganapan ng hindi "
-"pagtatatak."
+"Ang pinupukol na ito ay hindi nakakaunawa ng mga kaganapan ng pagtatanggal "
+"mula sa listahan."
 
 #. TRANS: Exception.
 msgid "Received a salmon slap from unidentified actor."
 msgstr "Tumanggap ng isang sampal ng salmon mula sa hindi nakikilalang aktor."
-
-#~ msgctxt "TITLE"
-#~ msgid "Tag"
-#~ msgstr "Tatak"
-
-#~ msgctxt "TITLE"
-#~ msgid "Untag"
-#~ msgstr "Huwag tatakan"
-
-#~ msgid "Disfavor"
-#~ msgstr "Ayawan"
-
-#~ msgid "%1$s marked notice %2$s as no longer a favorite."
-#~ msgstr ""
-#~ "Minarkahan ni %1$s ang pabatid na %2$s bilang hindi na isang "
-#~ "kinagigiliwan."
-
-#~ msgid ""
-#~ "OStatus user's address, like nickname@example.com or http://example.net/"
-#~ "nickname"
-#~ msgstr ""
-#~ "Tirahan ng tagagamit ng OStatus, katulad ng nickname@example.com o http://"
-#~ "example.net/nickname"
-
-#~ msgid "Continue"
-#~ msgstr "Ipagpatuloy"
-
-#~ msgid "Could not remove remote user %1$s from list %2$s."
-#~ msgstr ""
-#~ "Hindi matanggal ang malayong tagagamit na si %1$s mula sa talaang %2$s."
diff --git a/plugins/OStatus/locale/uk/LC_MESSAGES/OStatus.po b/plugins/OStatus/locale/uk/LC_MESSAGES/OStatus.po
index 1f9a7f023b..5384c431e4 100644
--- a/plugins/OStatus/locale/uk/LC_MESSAGES/OStatus.po
+++ b/plugins/OStatus/locale/uk/LC_MESSAGES/OStatus.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - OStatus to Ukrainian (Україн�ька)
+# Translation of StatusNet - OStatus to Ukrainian (україн�ька)
 # Exported from translatewiki.net
 #
 # Author: Boogie
@@ -9,19 +9,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OStatus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:45+0000\n"
-"Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:34+0000\n"
+"Language-Team: Ukrainian <https://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:48+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-12-03 13:49:04+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-ostatus\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
+#. TRANS: String in the gettext speed test script. Unimportant.
 msgid "Feeds"
 msgstr "Веб-�трічки"
 
@@ -31,7 +32,8 @@ msgid "Subscribe"
 msgstr "Підпи�ати�ь"
 
 #. TRANS: Fieldset legend.
-msgid "Tag remote profile"
+#, fuzzy
+msgid "List remote profile"
 msgstr "Позначити віддалений профіль."
 
 #. TRANS: Field label.
@@ -57,8 +59,8 @@ msgstr "Виве�ти"
 msgid "Invalid URI."
 msgstr "�еправильний URI."
 
-#. TRANS: Error message in OStatus plugin.
-#. TRANS: Error text.
+#. TRANS: Error message in OStatus plugin. Do not translate the domain names example.com
+#. TRANS: and example.net, as these are official standard domain names for use in examples.
 msgid ""
 "Sorry, we could not reach that address. Please make sure that the OStatus "
 "address is like nickname@example.com or http://example.net/nickname."
@@ -127,10 +129,10 @@ msgid "Follow list"
 msgstr "Слідкувати за �пи�ком"
 
 #. TRANS: Success message for remote list follow through OStatus.
-#. TRANS: %1$s is the subscriber name, %2$s is the list, %3$s is the tagger's name.
-#, fuzzy, php-format
+#. TRANS: %1$s is the subscriber name, %2$s is the list, %3$s is the lister's name.
+#, php-format
 msgid "%1$s is now following people listed in %2$s by %3$s."
-msgstr "%1$s припинив �лідкувати за �пи�ком %2$s кори�тувача %3$s."
+msgstr "%1$s тепер від�лідковує допи�и людей у �пи�ку %2$s кори�тувача %3$s."
 
 #. TRANS: Exception thrown when subscription to remote list fails.
 msgid "Failed subscribing to remote list."
@@ -141,7 +143,7 @@ msgid "Unfollow list"
 msgstr "�е �тежити за �пи�ком"
 
 #. TRANS: Success message for remote list unfollow through OStatus.
-#. TRANS: %1$s is the subscriber name, %2$s is the list, %3$s is the tagger's name.
+#. TRANS: %1$s is the subscriber name, %2$s is the list, %3$s is the lister's name.
 #, php-format
 msgid "%1$s stopped following the list %2$s by %3$s."
 msgstr "%1$s припинив �лідкувати за �пи�ком %2$s кори�тувача %3$s."
@@ -149,7 +151,7 @@ msgstr "%1$s припинив �лідкувати за �пи�ком %2$s ко
 #. TRANS: Title for listing a remote profile.
 msgctxt "TITLE"
 msgid "List"
-msgstr ""
+msgstr "Спи�ок"
 
 #. TRANS: Success message for remote list addition through OStatus.
 #. TRANS: %1$s is the list creator's name, %2$s is the added list member, %3$s is the list name.
@@ -158,35 +160,34 @@ msgid "%1$s listed %2$s in the list %3$s."
 msgstr "%1$s включив %2$s до �пи�ку %3$s."
 
 #. TRANS: Exception thrown when subscribing to a remote list fails.
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "Could not complete subscription to remote profile's feed. List %s could not "
 "be saved."
 msgstr ""
-"�е вдаєть�� завершити підпи�ку до каналу віддаленого профілю. Теґ %s "
+"�е вдаєть�� завершити підпи�ку до каналу віддаленого профілю. Спи�ок %s "
 "зберегти не вдало��."
 
 #. TRANS: Title for unlisting a remote profile.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Unlist"
-msgstr "�е �тежити за �пи�ком"
+msgstr "Вилучити зі �пи�ку"
 
 #. TRANS: Success message for remote list removal through OStatus.
 #. TRANS: %1$s is the list creator's name, %2$s is the removed list member, %3$s is the list name.
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s removed %2$s from the list %3$s."
-msgstr "%1$s включив %2$s до �пи�ку %3$s."
+msgstr "%1$s вилучив %2$s зі �пи�ку %3$s."
 
 #. TRANS: Title for unliking a remote notice.
 msgid "Unlike"
-msgstr ""
+msgstr "Вилучити зі �пи�ку обраних"
 
 #. TRANS: Success message for remove a favorite notice through OStatus.
 #. TRANS: %1$s is the unfavoring user's name, %2$s is URI to the no longer favored notice.
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s no longer likes %2$s."
-msgstr "%1$s припинив читати ваші допи�и %2$s."
+msgstr "%1$s вилучив допи� %2$s зі �вого �пи�ку обраних допи�ів."
 
 #. TRANS: Link text for link to remote subscribe.
 msgid "Remote"
@@ -202,9 +203,10 @@ msgstr "Оновленн� профілю"
 msgid "%s has updated their profile page."
 msgstr "%s оновив �торінку �вого профілю."
 
-#. TRANS: Link text for a user to tag an OStatus user.
-msgid "Tag"
-msgstr "Теґ"
+#. TRANS: Link text for a user to list an OStatus user.
+#, fuzzy
+msgid "List"
+msgstr "Спи�ок"
 
 #. TRANS: Plugin description.
 msgid ""
@@ -270,17 +272,17 @@ msgstr "�евірний hub.topic «%s». Спи�ок не і�нує."
 msgid "Invalid URL passed for %1$s: \"%2$s\""
 msgstr "Дл� %1$s передано невірний URL: «%2$s»"
 
-#. TRANS: Client error displayed when trying to tag a local object as if it is remote.
-msgid "You can use the local tagging!"
-msgstr "Ви можете кори�тувати�ь локальними теґами!"
-
-#. TRANS: Header for tagging a remote object. %s is a remote object's name.
-#, php-format
-msgid "Tag %s"
-msgstr "Теґ %s"
-
-#. TRANS: Button text to tag a remote object.
+#. TRANS: Client error displayed when trying to list a local object as if it is remote.
 #, fuzzy
+msgid "You can use the local list functionality!"
+msgstr "Ви можете кори�тувати�ь локальними підпи�ками!"
+
+#. TRANS: Header for listing a remote object. %s is a remote object's name.
+#, fuzzy, php-format
+msgid "List %s"
+msgstr "Спи�ок"
+
+#. TRANS: Button text to list a remote object.
 msgctxt "BUTTON"
 msgid "Go"
 msgstr "Перейти"
@@ -291,7 +293,7 @@ msgstr "Ім’� кори�тувача"
 
 #. TRANS: Field title.
 #, fuzzy
-msgid "Nickname of the user you want to tag."
+msgid "Nickname of the user you want to list."
 msgstr "Ім’� кори�тувача, �кого ви хотіли б позначити теґом."
 
 #. TRANS: Field label.
@@ -299,9 +301,8 @@ msgid "Profile Account"
 msgstr "Профіль акаунту"
 
 #. TRANS: Field title.
-#, fuzzy
-msgid "Your account id (i.e. user@identi.ca)."
-msgstr "Ідентифікатор вашого акаунту (що�ь на зразок user@identi.ca)"
+msgid "Your account id (for example user@identi.ca)."
+msgstr "Ідентифікатор вашого акаунту (що�ь на зразок user@identi.ca)."
 
 #. TRANS: Client error displayed when remote profile could not be looked up.
 #. TRANS: Client error.
@@ -379,6 +380,7 @@ msgstr "Підтвердити"
 msgid "Subscribe to this user"
 msgstr "Підпи�ати�ь до цього кори�тувача"
 
+#. TRANS: Extra paragraph in remote profile view when already subscribed.
 msgid "You are already subscribed to this user."
 msgstr "Ви вже підпи�ані до цього кори�тувача."
 
@@ -423,7 +425,8 @@ msgstr ""
 msgid "Join group"
 msgstr "Долучити�� до �пільноти"
 
-#. TRANS: Tooltip for field label "Join group".
+#. TRANS: Tooltip for field label "Join group". Do not translate the "example.net"
+#. TRANS: domain name in the URL, as it is an official standard domain name for examples.
 msgid "OStatus group's address, like http://example.net/group/nickname."
 msgstr ""
 "�дре�а �пільноти згідно протоколу OStatus, наприклад http://example.net/"
@@ -476,11 +479,11 @@ msgstr ""
 
 #. TRANS: Client exception.
 msgid "To the attention of user(s), not including this one."
-msgstr ""
+msgstr "До уваги кори�тувача(ів), не включаючи це."
 
 #. TRANS: Client exception.
 msgid "Not to anyone in reply to anything."
-msgstr ""
+msgstr "�і дл� кого у відповідь на що�ь."
 
 #. TRANS: Client exception.
 msgid "This is already a favorite."
@@ -496,31 +499,37 @@ msgstr "Допи� не було додано до �пи�ку обраних!"
 
 #. TRANS: Client exception.
 msgid "Not a person object."
-msgstr ""
+msgstr "�е пер�ональний об’єкт."
 
 #. TRANS: Client exception.
-msgid "Unidentified profile being tagged."
-msgstr ""
+#, fuzzy
+msgid "Unidentified profile being listed."
+msgstr "До невідомого профілю за�то�овано теґи."
 
 #. TRANS: Client exception.
-msgid "This user is not the one being tagged."
-msgstr ""
+#, fuzzy
+msgid "This user is not the one being listed."
+msgstr "Цей кори�тувач не є тим, до �кого за�то�овано теґи."
 
 #. TRANS: Client exception.
-msgid "The tag could not be saved."
-msgstr ""
+#, fuzzy
+msgid "The listing could not be saved."
+msgstr "Хмарка теґів не може бути збереженою."
 
 #. TRANS: Client exception.
-msgid "Unidentified profile being untagged."
-msgstr ""
+#, fuzzy
+msgid "Unidentified profile being unlisted."
+msgstr "З невідомого профілю зн�то в�і теґи."
 
 #. TRANS: Client exception.
-msgid "This user is not the one being untagged."
-msgstr ""
+#, fuzzy
+msgid "This user is not the one being unlisted."
+msgstr "Цей кори�тувач не є тим, з профілю �кого зн�то теґи."
 
 #. TRANS: Client exception.
-msgid "The tag could not be deleted."
-msgstr ""
+#, fuzzy
+msgid "The listing could not be deleted."
+msgstr "Хмарка теґів не може бути видаленою."
 
 #. TRANS: Client exception.
 msgid "Cannot favorite/unfavorite without an object."
@@ -549,9 +558,8 @@ msgid "Subscribe to list"
 msgstr "Підпи�ати�� до �пи�ку"
 
 #. TRANS: Field title.
-#, fuzzy
 msgid "Address of the OStatus list, like http://example.net/user/all/tag."
-msgstr "�дре�а �пи�ку OStatus, наприклад: http://example.net/user/all/tag"
+msgstr "�дре�а �пи�ку OStatus, наприклад, http://example.net/user/all/tag."
 
 #. TRANS: Error text displayed when trying to subscribe to a list already a subscriber to.
 msgid "You are already subscribed to this list."
@@ -562,7 +570,6 @@ msgid "Confirm subscription to remote list"
 msgstr "Підтвердженн� підпи�ки до віддаленого �пи�ку"
 
 #. TRANS: Instructions for OStatus list subscription form.
-#, fuzzy
 msgid ""
 "You can subscribe to lists from other supported sites. Paste the list's URI "
 "below:"
@@ -619,9 +626,8 @@ msgid "Cannot accept remote posts for a remote list."
 msgstr "�е можу узгодити віддалену пере�илку допи�ів дл� віддаленого �пи�ку."
 
 #. TRANS: Client error displayed when referring to a non-existing remote list.
-#, fuzzy
 msgid "Cannot read profile to set up list subscription."
-msgstr "�е можу прочитати профіль, аби налаштувати підпи�ку до теґу."
+msgstr "�е можу прочитати профіль, аби налаштувати підпи�ку до �пи�ку."
 
 #. TRANS: Client error displayed when trying to subscribe a group to a list.
 #. TRANS: Client error displayed when trying to unsubscribe a group from a list.
@@ -635,16 +641,15 @@ msgid "Could not subscribe remote user %1$s to list %2$s."
 msgstr "�е можу підпи�ати віддаленого кори�тувача %1$s до �пи�ку %2$s."
 
 #. TRANS: Client error displayed when trying to unsubscribe from non-existing list.
-#, fuzzy
 msgid "Cannot read profile to cancel list subscription."
 msgstr ""
-"�е вдаєть�� прочитати профіль кори�тувача, щоб виключити його зі �пи�ку."
+"�е вдаєть�� прочитати профіль кори�тувача, щоб �ка�увати підпи�ку до �пи�ку."
 
 #. TRANS: Client error displayed when trying to unsubscribe a remote user from a list fails.
 #. TRANS: %1$s is a profile URL, %2$s is a list name.
-#, fuzzy, php-format
+#, php-format
 msgid "Could not unsubscribe remote user %1$s from list %2$s."
-msgstr "�е можу підпи�ати віддаленого кори�тувача %1$s до �пи�ку %2$s."
+msgstr "�е можу відпи�ати віддаленого кори�тувача %1$s від �пи�ку %2$s."
 
 #. TRANS: Client error.
 msgid "You can use the local subscription!"
@@ -665,7 +670,7 @@ msgctxt "BUTTON"
 msgid "Join"
 msgstr "Приєднати��"
 
-#. TRANS: Form legend. %1$s is a list, %2$s is a tagger's name.
+#. TRANS: Form legend. %1$s is a list, %2$s is a lister's name.
 #, php-format
 msgid "Subscribe to list %1$s by %2$s"
 msgstr "Підпи�ати�� до �пи�ку %1$s кори�тувача %2$s"
@@ -709,6 +714,35 @@ msgstr "�е зазначено п�евдоніму ані локального
 msgid "OStatus Connect"
 msgstr "З’єднанн� OStatus"
 
+#. TRANS: Server exception. %s is a URL.
+#, php-format
+msgid "Invalid avatar URL %s."
+msgstr "�евірна URL-адре�а аватари %s."
+
+#. TRANS: Server exception. %s is a URI.
+#, php-format
+msgid "Tried to update avatar for unsaved remote profile %s."
+msgstr "�амагаю�� оновити аватару дл� не збереженого віддаленого профілю %s."
+
+#. TRANS: Server exception. %s is a URL.
+#, php-format
+msgid "Unable to fetch avatar from %s."
+msgstr "�еможливо завантажити аватару з %s."
+
+#. TRANS: Exception. %s is a URL.
+#, php-format
+msgid "Could not find a feed URL for profile page %s."
+msgstr "�е вдало�� знайти URL веб-�трічки дл� �торінки профілю %s."
+
+#. TRANS: Exception.
+msgid "Not a valid webfinger address."
+msgstr "Це недій�на адре�а дл� протоколу WebFinger."
+
+#. TRANS: Exception. %s is a webfinger address.
+#, php-format
+msgid "Could not find a valid profile for \"%s\"."
+msgstr "�е можу знайти відповідний й профіль дл� «%s»."
+
 #. TRANS: Server exception.
 msgid "Attempting to start PuSH subscription for feed with no hub."
 msgstr ""
@@ -721,14 +755,14 @@ msgstr ""
 "вузла."
 
 #. TRANS: Server exception. %s is a URI
-#, fuzzy, php-format
+#, php-format
 msgid "Invalid ostatus_profile state: Two or more IDs set for %s."
 msgstr ""
 "�евірний �тан параметру ostatus_profile: два або більше ідентифікатори "
 "в�тановлено дл� %s."
 
 #. TRANS: Server exception. %s is a URI
-#, fuzzy, php-format
+#, php-format
 msgid "Invalid ostatus_profile state: All IDs empty for %s."
 msgstr ""
 "�евірний �тан параметру ostatus_profile: в�і ідентифікатори порожні дл� %s."
@@ -755,6 +789,20 @@ msgstr "�евідомий формат веб-�трічки."
 msgid "RSS feed without a channel."
 msgstr "RSS-�трічка не має каналу."
 
+#. TRANS: Client exception thrown when trying to share multiple activities at once.
+msgid "Can only handle share activities with exactly one object."
+msgstr ""
+
+#. TRANS: Client exception thrown when trying to share a non-activity object.
+msgid "Can only handle shared activities."
+msgstr ""
+
+#. TRANS: Client exception thrown when saving an activity share fails.
+#. TRANS: %s is a share ID.
+#, php-format
+msgid "Failed to save activity %s."
+msgstr ""
+
 #. TRANS: Client exception. %s is a source URI.
 #, php-format
 msgid "No content for notice %s."
@@ -770,31 +818,11 @@ msgstr "Розгорнути"
 msgid "Could not reach profile page %s."
 msgstr "�е вдало�� до��гти �торінки профілю %s."
 
-#. TRANS: Exception. %s is a URL.
-#, php-format
-msgid "Could not find a feed URL for profile page %s."
-msgstr "�е вдало�� знайти URL веб-�трічки дл� �торінки профілю %s."
-
 #. TRANS: Feed sub exception.
 msgid "Cannot find enough profile information to make a feed."
 msgstr ""
 "�е можу знайти до�татньо інформації про профіль, аби �формувати веб-�трічку."
 
-#. TRANS: Server exception. %s is a URL.
-#, php-format
-msgid "Invalid avatar URL %s."
-msgstr "�евірна URL-адре�а аватари %s."
-
-#. TRANS: Server exception. %s is a URI.
-#, php-format
-msgid "Tried to update avatar for unsaved remote profile %s."
-msgstr "�амагаю�� оновити аватару дл� не збереженого віддаленого профілю %s."
-
-#. TRANS: Server exception. %s is a URL.
-#, php-format
-msgid "Unable to fetch avatar from %s."
-msgstr "�еможливо завантажити аватару з %s."
-
 #. TRANS: Server exception.
 msgid "No author ID URI found."
 msgstr "�е знайдено URI ідентифікатора автора."
@@ -827,10 +855,6 @@ msgstr "�е вдаєть�� зберегти мі�цевий �пи�ок."
 msgid "Cannot save OStatus profile."
 msgstr "�е вдаєть�� зберегти профіль OStatus."
 
-#. TRANS: Exception.
-msgid "Not a valid webfinger address."
-msgstr "Це недій�на адре�а дл� протоколу WebFinger."
-
 #. TRANS: Exception. %s is a webfinger address.
 #, php-format
 msgid "Could not save profile for \"%s\"."
@@ -841,11 +865,6 @@ msgstr "�е можу зберегти профіль дл� «%s»."
 msgid "Could not save OStatus profile for \"%s\"."
 msgstr "�е можу зберегти профіль OStatus дл� «%s»."
 
-#. TRANS: Exception. %s is a webfinger address.
-#, php-format
-msgid "Could not find a valid profile for \"%s\"."
-msgstr "�е можу знайти відповідний й профіль дл� «%s»."
-
 #. TRANS: Server exception.
 msgid "Could not store HTML content of long post as file."
 msgstr "�е можу зберегти HTML мі�ткого допи�у у �ко�ті файлу."
@@ -932,40 +951,15 @@ msgid "This target does not understand leave events."
 msgstr "Ціль не розуміє, що таке «залишати подію»."
 
 #. TRANS: Client exception.
-msgid "This target does not understand tag events."
+#, fuzzy
+msgid "This target does not understand list events."
 msgstr "!Ціль не розуміє, що таке «позначити подію»."
 
 #. TRANS: Client exception.
-msgid "This target does not understand untag events."
+#, fuzzy
+msgid "This target does not understand unlist events."
 msgstr "Ціль не розуміє, що таке «зн�ти теґ з події»."
 
 #. TRANS: Exception.
 msgid "Received a salmon slap from unidentified actor."
 msgstr "Отримано л�па�а від невизначеного уча�ника за протоколом Salmon."
-
-#~ msgctxt "TITLE"
-#~ msgid "Tag"
-#~ msgstr "Теґ"
-
-#~ msgctxt "TITLE"
-#~ msgid "Untag"
-#~ msgstr "Зн�ти теґ"
-
-#~ msgid "Disfavor"
-#~ msgstr "�е обраний"
-
-#~ msgid "%1$s marked notice %2$s as no longer a favorite."
-#~ msgstr "%1$s позначив допи� %2$s, �к такий, що більше не є обраним."
-
-#~ msgid ""
-#~ "OStatus user's address, like nickname@example.com or http://example.net/"
-#~ "nickname"
-#~ msgstr ""
-#~ "�дре�а кори�тувача згідно протоколу OStatus, що�ь на зразок "
-#~ "nickname@example.com або http://example.net/nickname"
-
-#~ msgid "Continue"
-#~ msgstr "Продовжити"
-
-#~ msgid "Could not remove remote user %1$s from list %2$s."
-#~ msgstr "�е вдало�ь виклю�ити віддаленого кори�тувача %1$s зі �пи�ку %2$s."
diff --git a/plugins/OStatus/scripts/gcfeeds.php b/plugins/OStatus/scripts/gcfeeds.php
new file mode 100644
index 0000000000..59656aff9b
--- /dev/null
+++ b/plugins/OStatus/scripts/gcfeeds.php
@@ -0,0 +1,41 @@
+#!/usr/bin/env php
+<?php
+/*
+ * StatusNet - a distributed open-source microblogging tool
+ * Copyright (C) 2010, StatusNet, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+define('INSTALLDIR', realpath(dirname(__FILE__) . '/../../..'));
+
+$helptext = <<<END_OF_HELP
+gcfeeds.php [options]
+Clean up feeds that no longer have subscribers.
+
+END_OF_HELP;
+
+require_once INSTALLDIR.'/scripts/commandline.inc';
+
+$feedsub = new FeedSub();
+
+while ($feedsub->fetch()) {
+    print $feedsub->uri . "(" . $feedsub->sub_state . ")";
+    $result = $feedsub->garbageCollect();
+    if ($result) {
+        print " INACTIVE\n";
+    } else {
+        print " ACTIVE\n";
+    }
+}
diff --git a/plugins/OStatus/scripts/update_ostatus_profiles.php b/plugins/OStatus/scripts/update_ostatus_profiles.php
new file mode 100644
index 0000000000..f0bc3e12dc
--- /dev/null
+++ b/plugins/OStatus/scripts/update_ostatus_profiles.php
@@ -0,0 +1,327 @@
+#!/usr/bin/env php
+<?php
+/*
+ * StatusNet - a distributed open-source microblogging tool
+ * Copyright (C) 2011, StatusNet, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+define('INSTALLDIR', realpath(dirname(__FILE__) . '/../../..'));
+
+$shortoptions = 'u:a';
+$longoptions = array('uri=', 'all');
+
+$helptext = <<<UPDATE_OSTATUS_PROFILES
+update_ostatus_profiles.php [options]
+Refetch / update OStatus profile info and avatars. Useful if you
+do something like accidentally delete your avatars directory when
+you have no backup.
+
+    -u --uri OStatus profile URI to update
+    -a --all update all
+
+
+UPDATE_OSTATUS_PROFILES;
+
+require_once INSTALLDIR . '/scripts/commandline.inc';
+
+/*
+ * Hacky class to remove some checks and get public access to
+ * protected mentods
+ */
+class LooseOstatusProfile extends Ostatus_profile
+{
+    /**
+     * Download and update given avatar image
+     *
+     * @param string $url
+     * @throws Exception in various failure cases
+     */
+    public function updateAvatar($url)
+    {
+        if (!common_valid_http_url($url)) {
+            // TRANS: Server exception. %s is a URL.
+            throw new ServerException(sprintf(_m('Invalid avatar URL %s.'), $url));
+        }
+
+        if ($this->isGroup()) {
+            $self = $this->localGroup();
+        } else {
+            $self = $this->localProfile();
+        }
+        if (!$self) {
+            throw new ServerException(sprintf(
+                // TRANS: Server exception. %s is a URI.
+                _m('Tried to update avatar for unsaved remote profile %s.'),
+                $this->uri));
+        }
+
+        // @fixme this should be better encapsulated
+        // ripped from oauthstore.php (for old OMB client)
+        $temp_filename = tempnam(sys_get_temp_dir(), 'listener_avatar');
+        try {
+            if (!copy($url, $temp_filename)) {
+                // TRANS: Server exception. %s is a URL.
+                throw new ServerException(sprintf(_m('Unable to fetch avatar from %s.'), $url));
+            }
+
+            if ($this->isGroup()) {
+                $id = $this->group_id;
+            } else {
+                $id = $this->profile_id;
+            }
+            // @fixme should we be using different ids?
+            $imagefile = new ImageFile($id, $temp_filename);
+            $filename = Avatar::filename($id,
+                                         image_type_to_extension($imagefile->type),
+                                         null,
+                                         common_timestamp());
+            rename($temp_filename, Avatar::path($filename));
+        } catch (Exception $e) {
+            unlink($temp_filename);
+            throw $e;
+        }
+        // @fixme hardcoded chmod is lame, but seems to be necessary to
+        // keep from accidentally saving images from command-line (queues)
+        // that can't be read from web server, which causes hard-to-notice
+        // problems later on:
+        //
+        // http://status.net/open-source/issues/2663
+        chmod(Avatar::path($filename), 0644);
+
+        $self->setOriginal($filename);
+
+        $orig = clone($this);
+        $this->avatar = $url;
+        $this->update($orig);
+    }
+
+    /**
+     * Look up and if necessary create an Ostatus_profile for the remote entity
+     * with the given profile page URL. This should never return null -- you
+     * will either get an object or an exception will be thrown.
+     *
+     * @param string $profile_url
+     * @return Ostatus_profile
+     * @throws Exception on various error conditions
+     * @throws OStatusShadowException if this reference would obscure a local user/group
+     */
+    public static function updateProfileURL($profile_url, $hints=array())
+    {
+        $oprofile = null;
+
+        $hints['profileurl'] = $profile_url;
+
+        // Fetch the URL
+        // XXX: HTTP caching
+
+        $client = new HTTPClient();
+        $client->setHeader('Accept', 'text/html,application/xhtml+xml');
+        $response = $client->get($profile_url);
+
+        if (!$response->isOk()) {
+            // TRANS: Exception. %s is a profile URL.
+            throw new Exception(sprintf(_('Could not reach profile page %s.'),$profile_url));
+        }
+
+        // Check if we have a non-canonical URL
+
+        $finalUrl = $response->getUrl();
+
+        if ($finalUrl != $profile_url) {
+            $hints['profileurl'] = $finalUrl;
+        }
+
+        // Try to get some hCard data
+
+        $body = $response->getBody();
+
+        $hcardHints = DiscoveryHints::hcardHints($body, $finalUrl);
+
+        if (!empty($hcardHints)) {
+            $hints = array_merge($hints, $hcardHints);
+        }
+
+        // Check if they've got an LRDD header
+
+        $lrdd = LinkHeader::getLink($response, 'lrdd', 'application/xrd+xml');
+
+        if (!empty($lrdd)) {
+
+            $xrd = Discovery::fetchXrd($lrdd);
+            $xrdHints = DiscoveryHints::fromXRD($xrd);
+
+            $hints = array_merge($hints, $xrdHints);
+        }
+
+        // If discovery found a feedurl (probably from LRDD), use it.
+
+        if (array_key_exists('feedurl', $hints)) {
+            return self::ensureFeedURL($hints['feedurl'], $hints);
+        }
+
+        // Get the feed URL from HTML
+
+        $discover = new FeedDiscovery();
+
+        $feedurl = $discover->discoverFromHTML($finalUrl, $body);
+
+        if (!empty($feedurl)) {
+            $hints['feedurl'] = $feedurl;
+            return self::ensureFeedURL($feedurl, $hints);
+        }
+
+        // TRANS: Exception. %s is a URL.
+        throw new Exception(sprintf(_m('Could not find a feed URL for profile page %s.'),$finalUrl));
+    }
+
+    /**
+     * Look up, and if necessary create, an Ostatus_profile for the remote
+     * entity with the given webfinger address.
+     * This should never return null -- you will either get an object or
+     * an exception will be thrown.
+     *
+     * @param string $addr webfinger address
+     * @return Ostatus_profile
+     * @throws Exception on error conditions
+     * @throws OStatusShadowException if this reference would obscure a local user/group
+     */
+    public static function updateWebfinger($addr)
+    {
+        $disco = new Discovery();
+
+        try {
+            $xrd = $disco->lookup($addr);
+        } catch (Exception $e) {
+            // Save negative cache entry so we don't waste time looking it up again.
+            // @fixme distinguish temporary failures?
+            self::cacheSet(sprintf('ostatus_profile:webfinger:%s', $addr), null);
+            // TRANS: Exception.
+            throw new Exception(_m('Not a valid webfinger address.'));
+        }
+
+        $hints = array('webfinger' => $addr);
+
+        $dhints = DiscoveryHints::fromXRD($xrd);
+
+        $hints = array_merge($hints, $dhints);
+
+        // If there's an Hcard, let's grab its info
+        if (array_key_exists('hcard', $hints)) {
+            if (!array_key_exists('profileurl', $hints) ||
+                $hints['hcard'] != $hints['profileurl']) {
+                $hcardHints = DiscoveryHints::fromHcardUrl($hints['hcard']);
+                $hints = array_merge($hcardHints, $hints);
+            }
+        }
+
+        // If we got a feed URL, try that
+        if (array_key_exists('feedurl', $hints)) {
+            try {
+                common_log(LOG_INFO, "Discovery on acct:$addr with feed URL " . $hints['feedurl']);
+                $oprofile = self::ensureFeedURL($hints['feedurl'], $hints);
+                self::cacheSet(sprintf('ostatus_profile:webfinger:%s', $addr), $oprofile->uri);
+                return $oprofile;
+            } catch (Exception $e) {
+                common_log(LOG_WARNING, "Failed creating profile from feed URL '$feedUrl': " . $e->getMessage());
+                // keep looking
+            }
+        }
+
+        // If we got a profile page, try that!
+        if (array_key_exists('profileurl', $hints)) {
+            try {
+                common_log(LOG_INFO, "Discovery on acct:$addr with profile URL $profileUrl");
+                $oprofile = self::ensureProfileURL($hints['profileurl'], $hints);
+                self::cacheSet(sprintf('ostatus_profile:webfinger:%s', $addr), $oprofile->uri);
+                return $oprofile;
+            } catch (OStatusShadowException $e) {
+                // We've ended up with a remote reference to a local user or group.
+                // @fixme ideally we should be able to say who it was so we can
+                // go back and refer to it the regular way
+                throw $e;
+            } catch (Exception $e) {
+                common_log(LOG_WARNING, "Failed creating profile from profile URL '$profileUrl': " . $e->getMessage());
+                // keep looking
+                //
+                // @fixme this means an error discovering from profile page
+                // may give us a corrupt entry using the webfinger URI, which
+                // will obscure the correct page-keyed profile later on.
+            }
+        }
+        throw new Exception(sprintf(_m('Could not find a valid profile for "%s".'),$addr));
+    }
+}
+
+function pullOstatusProfile($uri) {
+
+    $oprofile = null;
+
+    if (Validate::email($uri)) {
+        $oprofile = LooseOstatusProfile::updateWebfinger($uri);
+    } else if (Validate::uri($uri)) {
+        $oprofile = LooseOstatusProfile::updateProfileURL($uri);
+    } else {
+        print "Sorry, we could not reach the address: $uri\n";
+        return false;
+    }
+
+   return $oprofile;
+}
+
+$quiet = have_option('q', 'quiet');
+
+$lop = new LooseOstatusProfile();
+
+if (have_option('u', 'uri')) {
+    $lop->uri = get_option_value('u', 'uri');
+} else if (!have_option('a', 'all')) {
+    show_help();
+    exit(1);
+}
+
+$cnt = $lop->find();
+
+if (!empty($cnt)) {
+    if (!$quiet) { echo "Found {$cnt} OStatus profiles:\n"; }
+} else {
+    if (have_option('u', 'uri')) {
+        if (!$quiet) { echo "Couldn't find an existing OStatus profile with that URI.\n"; }
+    } else {
+        if (!$quiet) { echo "Couldn't find any existing OStatus profiles.\n"; }
+    }
+    exit(0);
+}
+
+while($lop->fetch()) {
+    if (!$quiet) { echo "Updating OStatus profile '{$lop->uri}' ... "; }
+    try {
+        $oprofile = pullOstatusProfile($lop->uri);
+
+        if (!empty($oprofile)) {
+            $orig = clone($lop);
+            $lop->avatar = $oprofile->avatar;
+            $lop->update($orig);
+            $lop->updateAvatar($oprofile->avatar);
+            if (!$quiet) { print "Done.\n"; }
+        }
+    } catch (Exception $e) {
+        if (!$quiet) { print $e->getMessage() . "\n"; }
+        common_log(LOG_WARN, $e->getMessage(), __FILE__);
+        // continue on error
+    }
+}
+
+if (!$quiet) { echo "OK.\n"; }
diff --git a/plugins/OStatus/tests/gettext-speedtest.php b/plugins/OStatus/tests/gettext-speedtest.php
index 8bbdf5e899..01b678ab38 100644
--- a/plugins/OStatus/tests/gettext-speedtest.php
+++ b/plugins/OStatus/tests/gettext-speedtest.php
@@ -54,6 +54,7 @@ $delta["_dgettext"] = array((microtime(true) - $start) / $times, $result);
 
 $start = microtime(true);
 for($i = 0; $i < $times; $i++) {
+    // TRANS: String in the gettext speed test script. Unimportant.
     $result = _m("Feeds");
 }
 $delta["_m"] = array((microtime(true) - $start) / $times, $result);
diff --git a/plugins/OStatus/theme/base/css/ostatus.css b/plugins/OStatus/theme/base/css/ostatus.css
index c2d724158f..f8d708d81f 100644
--- a/plugins/OStatus/theme/base/css/ostatus.css
+++ b/plugins/OStatus/theme/base/css/ostatus.css
@@ -1,74 +1,39 @@
-/** theme: base for OStatus
- *
- * @package   StatusNet
- * @author    Sarven Capadisli <csarven@status.net>
- * @copyright 2010 StatusNet, Inc.
- * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://status.net/
- */
-
-#form_ostatus_connect.dialogbox,
-#form_ostatus_sub.dialogbox {
-width:70%;
-background-image:none;
-}
-#form_ostatus_sub.dialogbox {
-width:65%;
-}
 #form_ostatus_connect.dialogbox .form_data label,
 #form_ostatus_sub.dialogbox .form_data label {
-width:34%;
+    display: block;
+    width: 100%;
+    text-align: left;
 }
+
 #form_ostatus_connect.dialogbox .form_data input,
 #form_ostatus_sub.dialogbox .form_data input {
-width:57%;
+    width: 90%;
+    padding: 4px;
+    margin: 0;
+    background-color: #fff !important;
+    border: 1px solid #888;
 }
+
 #form_ostatus_connect.dialogbox .form_data .form_guide,
 #form_ostatus_sub.dialogbox .form_data .form_guide {
-margin-left:36%;
+    margin-left: 0;
+    background-color: #fff !important;
 }
 
 #form_ostatus_connect.dialogbox #ostatus_nickname,
 #form_ostatus_sub.dialogbox #ostatus_nickname {
-display:none;
+    display: none;
 }
 
-#form_ostatus_connect.dialogbox .submit_dialogbox,
-#form_ostatus_sub.dialogbox .submit_dialogbox {
-min-width:96px;
+#form_ostatus_connect.dialogbox input.submit_dialogbox,
+#form_ostatus_sub.dialogbox input.submit_dialogbox {
+    padding: 4px;
 }
 
-#entity_remote_subscribe {
-padding:0;
-float:right;
-position:relative;
+.entity_remote_tag {
+    background-position: 5px -257px;
 }
 
-.section .entity_actions {
-margin-bottom:0;
-margin-right:7px;
-}
-
-#entity_remote_subscribe .dialogbox {
-width:405px;
-}
-
-.aside #entity_subscriptions .more,
-.aside #entity_groups .more {
-float:left;
-}
-
-.section #entity_remote_subscribe {
-border:0;
-}
-
-.section .entity_remote_subscribe {
-color:#002FA7;
-box-shadow:none;
--moz-box-shadow:none;
--webkit-box-shadow:none;
-background-color:transparent;
-background-position:0 -1183px;
-padding:0 0 0 23px;
-border:0;
+.section .entity_remote_tag {
+    background-position: 5px -257px;
 }
diff --git a/plugins/OfflineBackup/OfflineBackupPlugin.php b/plugins/OfflineBackup/OfflineBackupPlugin.php
new file mode 100644
index 0000000000..a7bede2875
--- /dev/null
+++ b/plugins/OfflineBackup/OfflineBackupPlugin.php
@@ -0,0 +1,101 @@
+<?php
+/**
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2011, StatusNet, Inc.
+ *
+ * Offline backup
+ * 
+ * PHP version 5
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Backup
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2011 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    // This check helps protect against security problems;
+    // your code file can't be executed directly from the web.
+    exit(1);
+}
+
+/**
+ * Offline backup
+ *
+ * Instead of a big 
+ *
+ * @category  General
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2011 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+
+class OfflineBackupPlugin extends Plugin
+{
+    function onAutoload($cls)
+    {
+        $dir = dirname(__FILE__);
+
+        switch ($cls)
+        {
+        case 'OfflinebackupAction':
+            include_once $dir . '/' . strtolower(mb_substr($cls, 0, -6)) . '.php';
+            return false;
+        case 'OfflineBackupQueueHandler':
+            include_once $dir . '/'.strtolower($cls).'.php';
+            return false;
+        default:
+            return true;
+        }
+    }
+
+    function onRouterInitialized($m)
+    {
+        $m->connect('main/backupaccount',
+                    array('action' => 'offlinebackup'));
+        return true;
+    }
+
+    /**
+     * Add our queue handler to the queue manager
+     *
+     * @param QueueManager $qm current queue manager
+     *
+     * @return boolean hook value
+     */
+
+    function onEndInitializeQueueManager($qm)
+    {
+        $qm->connect('backoff', 'OfflineBackupQueueHandler');
+        return true;
+    }
+
+    function onPluginVersion(&$versions)
+    {
+        $versions[] = array('name' => 'OfflineBackup',
+                            'version' => STATUSNET_VERSION,
+                            'author' => 'Evan Prodromou',
+                            'homepage' => 'http://status.net/wiki/Plugin:OfflineBackup',
+                            'rawdescription' =>
+                          // TRANS: Plugin description.
+                            _m('Backup user data in offline queue and email when ready.'));
+        return true;
+    }
+}
diff --git a/plugins/OfflineBackup/locale/OfflineBackup.pot b/plugins/OfflineBackup/locale/OfflineBackup.pot
new file mode 100644
index 0000000000..99457c03d8
--- /dev/null
+++ b/plugins/OfflineBackup/locale/OfflineBackup.pot
@@ -0,0 +1,32 @@
+# 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: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: offlinebackupqueuehandler.php:105
+#, php-format
+msgctxt ""
+"The backup file you requested is ready for download.\n"
+"\n"
+"%s\n"
+"Thanks for your time,\n"
+msgid "%s\n"
+msgstr ""
+
+#. TRANS: Plugin description.
+#: OfflineBackupPlugin.php:98
+msgid "Backup user data in offline queue and email when ready."
+msgstr ""
diff --git a/plugins/OfflineBackup/locale/de/LC_MESSAGES/OfflineBackup.po b/plugins/OfflineBackup/locale/de/LC_MESSAGES/OfflineBackup.po
new file mode 100644
index 0000000000..577560047b
--- /dev/null
+++ b/plugins/OfflineBackup/locale/de/LC_MESSAGES/OfflineBackup.po
@@ -0,0 +1,32 @@
+# Translation of StatusNet - OfflineBackup to German (Deutsch)
+# Exported from translatewiki.net
+#
+# Author: PtM
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - OfflineBackup\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:21+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2012-06-18 00:06:35+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#, php-format
+msgctxt ""
+"The backup file you requested is ready for download.\n"
+"\n"
+"%s\n"
+"Thanks for your time,\n"
+msgid "%s\n"
+msgstr "%s\n"
+
+#. TRANS: Plugin description.
+msgid "Backup user data in offline queue and email when ready."
+msgstr "Speichere Nutzerdaten in einer Offline-Queue und maile, wenn bereit."
diff --git a/plugins/OfflineBackup/locale/es/LC_MESSAGES/OfflineBackup.po b/plugins/OfflineBackup/locale/es/LC_MESSAGES/OfflineBackup.po
new file mode 100644
index 0000000000..68827c8a95
--- /dev/null
+++ b/plugins/OfflineBackup/locale/es/LC_MESSAGES/OfflineBackup.po
@@ -0,0 +1,34 @@
+# Translation of StatusNet - OfflineBackup to Spanish (español)
+# Exported from translatewiki.net
+#
+# Author: Armando-Martin
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - OfflineBackup\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:21+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2012-06-18 00:06:35+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#, php-format
+msgctxt ""
+"The backup file you requested is ready for download.\n"
+"\n"
+"%s\n"
+"Thanks for your time,\n"
+msgid "%s\n"
+msgstr "%s\n"
+
+#. TRANS: Plugin description.
+msgid "Backup user data in offline queue and email when ready."
+msgstr ""
+"Guardar los datos de usuario en la cola sin conexión y enviarlos por correo "
+"electrónico cuando estén listos."
diff --git a/plugins/OfflineBackup/locale/fr/LC_MESSAGES/OfflineBackup.po b/plugins/OfflineBackup/locale/fr/LC_MESSAGES/OfflineBackup.po
new file mode 100644
index 0000000000..710e0ba030
--- /dev/null
+++ b/plugins/OfflineBackup/locale/fr/LC_MESSAGES/OfflineBackup.po
@@ -0,0 +1,34 @@
+# Translation of StatusNet - OfflineBackup to French (français)
+# Exported from translatewiki.net
+#
+# Author: Gomoko
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - OfflineBackup\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:21+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2012-06-18 00:06:35+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#, php-format
+msgctxt ""
+"The backup file you requested is ready for download.\n"
+"\n"
+"%s\n"
+"Thanks for your time,\n"
+msgid "%s\n"
+msgstr "%s\n"
+
+#. TRANS: Plugin description.
+msgid "Backup user data in offline queue and email when ready."
+msgstr ""
+"Sauvegarder les données utilisateur dans une file hors connexion et "
+"l'envoyer par courrier électronique quand elles sont prêtes."
diff --git a/plugins/OfflineBackup/locale/gl/LC_MESSAGES/OfflineBackup.po b/plugins/OfflineBackup/locale/gl/LC_MESSAGES/OfflineBackup.po
new file mode 100644
index 0000000000..fdd96db2c2
--- /dev/null
+++ b/plugins/OfflineBackup/locale/gl/LC_MESSAGES/OfflineBackup.po
@@ -0,0 +1,34 @@
+# Translation of StatusNet - OfflineBackup to Galician (galego)
+# Exported from translatewiki.net
+#
+# Author: Toliño
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - OfflineBackup\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:21+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2012-06-18 00:06:35+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#, php-format
+msgctxt ""
+"The backup file you requested is ready for download.\n"
+"\n"
+"%s\n"
+"Thanks for your time,\n"
+msgid "%s\n"
+msgstr "%s\n"
+
+#. TRANS: Plugin description.
+msgid "Backup user data in offline queue and email when ready."
+msgstr ""
+"Gardar os datos de usuario na cola sen conexión e envialos por correo "
+"electrónico cando estean listos."
diff --git a/plugins/OfflineBackup/locale/ia/LC_MESSAGES/OfflineBackup.po b/plugins/OfflineBackup/locale/ia/LC_MESSAGES/OfflineBackup.po
new file mode 100644
index 0000000000..ffb284f77e
--- /dev/null
+++ b/plugins/OfflineBackup/locale/ia/LC_MESSAGES/OfflineBackup.po
@@ -0,0 +1,34 @@
+# Translation of StatusNet - OfflineBackup to Interlingua (interlingua)
+# Exported from translatewiki.net
+#
+# Author: McDutchie
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - OfflineBackup\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:21+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2012-06-18 00:06:35+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#, php-format
+msgctxt ""
+"The backup file you requested is ready for download.\n"
+"\n"
+"%s\n"
+"Thanks for your time,\n"
+msgid "%s\n"
+msgstr "%s\n"
+
+#. TRANS: Plugin description.
+msgid "Backup user data in offline queue and email when ready."
+msgstr ""
+"Copiar le datos del usator in le cauda foras de linea e inviar le copia per "
+"e-mail quando es preste."
diff --git a/plugins/OfflineBackup/locale/it/LC_MESSAGES/OfflineBackup.po b/plugins/OfflineBackup/locale/it/LC_MESSAGES/OfflineBackup.po
new file mode 100644
index 0000000000..d9f4c3ce4b
--- /dev/null
+++ b/plugins/OfflineBackup/locale/it/LC_MESSAGES/OfflineBackup.po
@@ -0,0 +1,35 @@
+# Translation of StatusNet - OfflineBackup to Italian (italiano)
+# Exported from translatewiki.net
+#
+# Author: GreenFox
+# Author: Ximo17
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - OfflineBackup\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:21+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2012-06-18 00:06:35+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#, php-format
+msgctxt ""
+"The backup file you requested is ready for download.\n"
+"\n"
+"%s\n"
+"Thanks for your time,\n"
+msgid "%s\n"
+msgstr "%s\n"
+
+#. TRANS: Plugin description.
+msgid "Backup user data in offline queue and email when ready."
+msgstr ""
+"Creare una copia di backup dei dati dell'utente in modalità non in linea e "
+"spedirli tramite e-mail quando sono pronti."
diff --git a/plugins/OfflineBackup/locale/mk/LC_MESSAGES/OfflineBackup.po b/plugins/OfflineBackup/locale/mk/LC_MESSAGES/OfflineBackup.po
new file mode 100644
index 0000000000..4ca009ec74
--- /dev/null
+++ b/plugins/OfflineBackup/locale/mk/LC_MESSAGES/OfflineBackup.po
@@ -0,0 +1,34 @@
+# Translation of StatusNet - OfflineBackup to Macedonian (македон�ки)
+# Exported from translatewiki.net
+#
+# Author: Bjankuloski06
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - OfflineBackup\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:21+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2012-06-18 00:06:35+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
+
+#, php-format
+msgctxt ""
+"The backup file you requested is ready for download.\n"
+"\n"
+"%s\n"
+"Thanks for your time,\n"
+msgid "%s\n"
+msgstr "%s\n"
+
+#. TRANS: Plugin description.
+msgid "Backup user data in offline queue and email when ready."
+msgstr ""
+"Ги �тава кори�ничките податоци во резерва (вонмрежна редица), а кога ќе "
+"заврши, и�праќа е-пошта."
diff --git a/plugins/OfflineBackup/locale/nl/LC_MESSAGES/OfflineBackup.po b/plugins/OfflineBackup/locale/nl/LC_MESSAGES/OfflineBackup.po
new file mode 100644
index 0000000000..0be40621c8
--- /dev/null
+++ b/plugins/OfflineBackup/locale/nl/LC_MESSAGES/OfflineBackup.po
@@ -0,0 +1,32 @@
+# Translation of StatusNet - OfflineBackup to Dutch (Nederlands)
+# Exported from translatewiki.net
+#
+# Author: Siebrand
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - OfflineBackup\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:21+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2012-06-18 00:06:35+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#, php-format
+msgctxt ""
+"The backup file you requested is ready for download.\n"
+"\n"
+"%s\n"
+"Thanks for your time,\n"
+msgid "%s\n"
+msgstr "%s\n"
+
+#. TRANS: Plugin description.
+msgid "Backup user data in offline queue and email when ready."
+msgstr "Gebruikersgegevens offline back-uppen en e-mailen als afgerond."
diff --git a/plugins/OfflineBackup/locale/tl/LC_MESSAGES/OfflineBackup.po b/plugins/OfflineBackup/locale/tl/LC_MESSAGES/OfflineBackup.po
new file mode 100644
index 0000000000..d2ef19a4f0
--- /dev/null
+++ b/plugins/OfflineBackup/locale/tl/LC_MESSAGES/OfflineBackup.po
@@ -0,0 +1,34 @@
+# Translation of StatusNet - OfflineBackup to Tagalog (Tagalog)
+# Exported from translatewiki.net
+#
+# Author: AnakngAraw
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - OfflineBackup\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:21+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2012-06-18 00:06:35+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#, php-format
+msgctxt ""
+"The backup file you requested is ready for download.\n"
+"\n"
+"%s\n"
+"Thanks for your time,\n"
+msgid "%s\n"
+msgstr "%s\n"
+
+#. TRANS: Plugin description.
+msgid "Backup user data in offline queue and email when ready."
+msgstr ""
+"Gawan ng pansalong kopya ang dato ng tagagamit sa loob ng pilang hindi "
+"nakakunekta sa Internet at ipadala ang e-liham kapag nakahanda na."
diff --git a/plugins/OfflineBackup/offlinebackup.php b/plugins/OfflineBackup/offlinebackup.php
new file mode 100644
index 0000000000..a9c64ca49a
--- /dev/null
+++ b/plugins/OfflineBackup/offlinebackup.php
@@ -0,0 +1,87 @@
+<?php
+/**
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2011, StatusNet, Inc.
+ *
+ * Initiate an offline backup
+ * 
+ * PHP version 5
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Offline backup
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2011 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    // This check helps protect against security problems;
+    // your code file can't be executed directly from the web.
+    exit(1);
+}
+
+/**
+ * Action to initiate an offline backup
+ *
+ * @category  Offline backup
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2011 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+
+class OfflinebackupAction extends BackupaccountAction
+{
+    /**
+     * Handler method
+     *
+     * @param array $argarray is ignored since it's now passed in in prepare()
+     *
+     * @return void
+     */
+
+    function handle($argarray=null)
+    {
+        if ($this->isPost()) {
+            $this->queueBackup();
+        } else {
+            $this->showPage();
+        }
+        return;
+    }
+
+    function queueBackup()
+    {
+        $cur = common_current_user();
+
+        $qm = QueueManager::get();
+
+        $qm->enqueue($cur->id, 'backoff');
+
+        $this->showPage();
+    }
+
+    function showContent()
+    {
+        if ($this->isPost()) {
+            $this->text(_('Backup queued. You will get a notification by email when your backup is ready to download.'));
+        } else {
+            parent::showContent();
+        }
+    }
+}
diff --git a/plugins/OfflineBackup/offlinebackupqueuehandler.php b/plugins/OfflineBackup/offlinebackupqueuehandler.php
new file mode 100644
index 0000000000..2de6c9a667
--- /dev/null
+++ b/plugins/OfflineBackup/offlinebackupqueuehandler.php
@@ -0,0 +1,327 @@
+<?php
+/**
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2011, StatusNet, Inc.
+ *
+ * Offline backup queue handler
+ * 
+ * PHP version 5
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Offline backup
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2011 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    // This check helps protect against security problems;
+    // your code file can't be executed directly from the web.
+    exit(1);
+}
+
+/**
+ * Offline backup queue handler
+ *
+ * @category  General
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2011 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+
+class OfflineBackupQueueHandler extends QueueHandler
+{
+    function transport()
+    {
+        return 'backoff';
+    }
+
+    function handle($object)
+    {
+        $userId = $object;
+
+        $user = User::staticGet($userId);
+
+        common_log(LOG_INFO, "Making backup file for user ".$user->nickname);
+
+        $fileName = $this->makeBackupFile($user);
+
+        common_log(LOG_INFO, "Notifying user ".$user->nickname . " of their new backup file.");
+
+        $this->notifyBackupFile($user, $fileName);
+
+        return true;
+    }
+
+    function makeBackupFile($user)
+    {
+        // XXX: this is pretty lose-y;  try another way
+
+        $tmpdir = sys_get_temp_dir() . '/offline-backup/' . $user->nickname . '/' . common_date_iso8601(common_sql_now());
+
+        common_log(LOG_INFO, 'Writing backup data to ' . $tmpdir . ' for ' . $user->nickname);
+
+        mkdir($tmpdir, 0700, true);
+
+        $this->dumpNotices($user, $tmpdir);
+        $this->dumpFaves($user, $tmpdir);
+        $this->dumpSubscriptions($user, $tmpdir);
+        $this->dumpSubscribers($user, $tmpdir);
+        $this->dumpGroups($user, $tmpdir);
+
+        $fileName = File::filename($user->getProfile(), "backup", "application/atom+xml");
+        $fullPath = File::path($fileName);
+
+        $this->makeActivityFeed($user, $tmpdir, $fullPath);
+
+        $this->delTree($tmpdir);
+
+        return $fileName;
+    }
+
+    function notifyBackupFile($user, $fileName)
+    {
+        $fileUrl = File::url($fileName);
+
+        $body = sprintf(_m("The backup file you requested is ready for download.\n\n".
+                           "%s\n".
+                           "Thanks for your time,\n",
+                           "%s\n"),
+                        $fileUrl,
+                        common_config('site', 'name'));
+
+        $headers = _mail_prepare_headers('offlinebackup', $user->nickname, $user->nickname);
+
+        mail_to_user($user, _('Backup file ready for download'), $body, $headers);
+    }
+
+    function dumpNotices($user, $dir)
+    {
+        common_log(LOG_INFO, 'dumping notices by ' . $user->nickname . ' to directory ' . $dir);
+
+        $profile = $user->getProfile();
+
+        $stream = new ProfileNoticeStream($profile, $profile);
+
+        $page = 1;
+
+        do {
+
+            $notice = $stream->getNotices(($page-1)*NOTICES_PER_PAGE, NOTICES_PER_PAGE + 1);
+
+            while ($notice->fetch()) {
+                try {
+                    $fname = $dir . '/'. common_date_iso8601($notice->created) . '-notice-' . $notice->id . '.atom'; 
+                    $data  = $notice->asAtomEntry(false, false, false, null);
+                    common_log(LOG_INFO, 'dumping notice ' . $notice->id . ' to file ' . $fname);
+                    file_put_contents($fname, $data);
+                    $data  = null;
+                } catch (Exception $e) {
+                    common_log(LOG_ERR, "Error backing up notice " . $notice->id . ": " . $e->getMessage());
+                    continue;
+                }
+            }
+
+            $page++;
+
+        } while ($notice->N > NOTICES_PER_PAGE);
+    }
+
+    function dumpFaves($user, $dir)
+    {
+        common_log(LOG_INFO, 'dumping faves by ' . $user->nickname . ' to directory ' . $dir);
+        
+        $page = 1;
+
+        do {
+            $fave = Fave::byProfile($user->id, ($page-1)*NOTICES_PER_PAGE, NOTICES_PER_PAGE + 1);
+
+            while ($fave->fetch()) {
+                try {
+                    $fname = $dir . '/'. common_date_iso8601($fave->modified) . '-fave-' . $fave->notice_id . '.atom'; 
+                    $act   = $fave->asActivity();
+                    $data  = $act->asString(false, false, false);
+                    common_log(LOG_INFO, 'dumping fave of ' . $fave->notice_id . ' to file ' . $fname);
+                    file_put_contents($fname, $data);
+                    $data  = null;
+                } catch (Exception $e) {
+                    common_log(LOG_ERR, "Error backing up fave of " . $fave->notice_id . ": " . $e->getMessage());
+                    continue;
+                }
+            }
+            
+            $page++;
+
+        } while ($fave->N > NOTICES_PER_PAGE);
+    }
+
+    function dumpSubscriptions($user, $dir)
+    {
+        common_log(LOG_INFO, 'dumping subscriptions by ' . $user->nickname . ' to directory ' . $dir);
+        
+        $page = 1;
+
+        do {
+            $sub = Subscription::bySubscriber($user->id, ($page-1)*PROFILES_PER_PAGE, PROFILES_PER_PAGE + 1);
+
+            while ($sub->fetch()) {
+                try {
+                    if ($sub->subscribed == $user->id) {
+                        continue;
+                    }
+                    $fname = $dir . '/'. common_date_iso8601($sub->created) . '-subscription-' . $sub->subscribed . '.atom'; 
+                    $act   = $sub->asActivity();
+                    $data  = $act->asString(false, false, false);
+                    common_log(LOG_INFO, 'dumping sub of ' . $sub->subscribed . ' to file ' . $fname);
+                    file_put_contents($fname, $data);
+                    $data  = null;
+                } catch (Exception $e) {
+                    common_log(LOG_ERR, "Error backing up subscription to " . $sub->subscribed . ": " . $e->getMessage());
+                    continue;
+                }
+            }
+
+            $page++;
+
+        } while ($sub->N > PROFILES_PER_PAGE);
+    }
+
+    function dumpSubscribers($user, $dir)
+    {
+        common_log(LOG_INFO, 'dumping subscribers to ' . $user->nickname . ' to directory ' . $dir);
+        
+        $page = 1;
+
+        do {
+            $sub = Subscription::bySubscribed($user->id, ($page-1)*PROFILES_PER_PAGE, PROFILES_PER_PAGE + 1);
+
+            while ($sub->fetch()) {
+                try {
+                    if ($sub->subscriber == $user->id) {
+                        continue;
+                    }
+                    $fname = $dir . '/'. common_date_iso8601($sub->created) . '-subscriber-' . $sub->subscriber . '.atom'; 
+                    $act   = $sub->asActivity();
+                    $data  = $act->asString(false, true, false);
+                    common_log(LOG_INFO, 'dumping sub by ' . $sub->subscriber . ' to file ' . $fname);
+                    file_put_contents($fname, $data);
+                    $data  = null;
+                } catch (Exception $e) {
+                    common_log(LOG_ERR, "Error backing up subscription from " . $sub->subscriber . ": " . $e->getMessage());
+                    continue;
+                }
+            }
+
+            $page++;
+
+        } while ($sub->N > PROFILES_PER_PAGE);
+    }
+
+    function dumpGroups($user, $dir)
+    {
+        common_log(LOG_INFO, 'dumping memberships of ' . $user->nickname . ' to directory ' . $dir);
+        
+        $page = 1;
+
+        do {
+
+            $mem = Group_member::byMember($user->id, ($page-1)*GROUPS_PER_PAGE, GROUPS_PER_PAGE + 1);
+
+            while ($mem->fetch()) {
+                try {
+                    $fname = $dir . '/'. common_date_iso8601($mem->created) . '-membership-' . $mem->group_id . '.atom'; 
+                    $act   = $mem->asActivity();
+                    $data  = $act->asString(false, false, false);
+                    common_log(LOG_INFO, 'dumping membership in ' . $mem->group_id . ' to file ' . $fname);
+                    file_put_contents($fname, $data);
+                    $data  = null;
+                } catch (Exception $e) {
+                    common_log(LOG_ERR, "Error backing up membership in " . $mem->group_id . ": " . $e->getMessage());
+                    continue;
+                }
+            }
+
+            $page++;
+
+        } while ($mem->N > GROUPS_PER_PAGE);
+    }
+
+    function makeActivityFeed($user, $tmpdir, $fullPath)
+    {
+        $handle = fopen($fullPath, 'c');
+
+        $this->writeFeedHeader($user, $handle);
+
+        $objects = scandir($tmpdir);
+
+        rsort($objects);
+
+        foreach ($objects as $object) {
+            $objFull = $tmpdir . '/' . $object;
+            if (!is_dir($objFull)) {
+                $entry = file_get_contents($objFull);
+                fwrite($handle, $entry);
+                $entry = null;
+            }
+        }
+
+        $this->writeFeedFooter($user, $handle);
+        fclose($handle);
+    }
+
+    function writeFeedHeader($user, $handle)
+    {
+        fwrite($handle, '<?xml version="1.0" encoding="UTF-8"?>');
+        fwrite($handle, "\n");
+        fwrite($handle, '<feed xml:lang="en-US" xmlns="http://www.w3.org/2005/Atom" xmlns:thr="http://purl.org/syndication/thread/1.0" xmlns:georss="http://www.georss.org/georss" xmlns:activity="http://activitystrea.ms/spec/1.0/" xmlns:media="http://purl.org/syndication/atommedia" xmlns:poco="http://portablecontacts.net/spec/1.0" xmlns:ostatus="http://ostatus.org/schema/1.0" xmlns:statusnet="http://status.net/schema/api/1/">');
+        fwrite($handle, "\n");
+
+        $profile = $user->getProfile();
+
+        $author = ActivityObject::fromProfile($profile);
+
+        $xs = new XMLStringer();
+        $author->outputTo($xs, 'author');
+        fwrite($handle, $xs->getString());
+        fwrite($handle, "\n");
+    }
+
+    function writeFeedFooter($user, $handle)
+    {
+        fwrite($handle, '</feed>');
+    }
+
+    function delTree($dir)
+    {
+        if (is_dir($dir)) {
+            $objects = scandir($dir);
+            foreach ($objects as $object) {
+                if ($object != "." && $object != "..") {
+                    if (filetype($dir."/".$object) == "dir") {
+                        $this->delTree($dir."/".$object);
+                    } else {
+                        unlink($dir."/".$object);
+                    }
+                }
+            }
+            reset($objects);
+            rmdir($dir);
+        }
+    }
+}
diff --git a/plugins/OpenExternalLinkTarget/locale/OpenExternalLinkTarget.pot b/plugins/OpenExternalLinkTarget/locale/OpenExternalLinkTarget.pot
index 86dd43122d..01e6fa8824 100644
--- a/plugins/OpenExternalLinkTarget/locale/OpenExternalLinkTarget.pot
+++ b/plugins/OpenExternalLinkTarget/locale/OpenExternalLinkTarget.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
+"POT-Creation-Date: 2012-06-30 11:07+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"
diff --git a/plugins/OpenExternalLinkTarget/locale/ar/LC_MESSAGES/OpenExternalLinkTarget.po b/plugins/OpenExternalLinkTarget/locale/ar/LC_MESSAGES/OpenExternalLinkTarget.po
index b482df561d..bcc206572e 100644
--- a/plugins/OpenExternalLinkTarget/locale/ar/LC_MESSAGES/OpenExternalLinkTarget.po
+++ b/plugins/OpenExternalLinkTarget/locale/ar/LC_MESSAGES/OpenExternalLinkTarget.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OpenExternalLinkTarget\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:17+0000\n"
-"Language-Team: Arabic <http://translatewiki.net/wiki/Portal:ar>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:23+0000\n"
+"Language-Team: Arabic <https://translatewiki.net/wiki/Portal:ar>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:47+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:10+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ar\n"
 "X-Message-Group: #out-statusnet-plugin-openexternallinktarget\n"
 "Plural-Forms: nplurals=6; plural=(n == 0) ? 0 : ( (n == 1) ? 1 : ( (n == "
diff --git a/plugins/OpenExternalLinkTarget/locale/ca/LC_MESSAGES/OpenExternalLinkTarget.po b/plugins/OpenExternalLinkTarget/locale/ca/LC_MESSAGES/OpenExternalLinkTarget.po
index cd0b956ce7..8d70a7a20d 100644
--- a/plugins/OpenExternalLinkTarget/locale/ca/LC_MESSAGES/OpenExternalLinkTarget.po
+++ b/plugins/OpenExternalLinkTarget/locale/ca/LC_MESSAGES/OpenExternalLinkTarget.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - OpenExternalLinkTarget to Catalan (Català)
+# Translation of StatusNet - OpenExternalLinkTarget to Catalan (català)
 # Exported from translatewiki.net
 #
 # Author: Toniher
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OpenExternalLinkTarget\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:17+0000\n"
-"Language-Team: Catalan <http://translatewiki.net/wiki/Portal:ca>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:23+0000\n"
+"Language-Team: Catalan <https://translatewiki.net/wiki/Portal:ca>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:47+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:10+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ca\n"
 "X-Message-Group: #out-statusnet-plugin-openexternallinktarget\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/OpenExternalLinkTarget/locale/de/LC_MESSAGES/OpenExternalLinkTarget.po b/plugins/OpenExternalLinkTarget/locale/de/LC_MESSAGES/OpenExternalLinkTarget.po
index 84195b7dce..fe7b6032b1 100644
--- a/plugins/OpenExternalLinkTarget/locale/de/LC_MESSAGES/OpenExternalLinkTarget.po
+++ b/plugins/OpenExternalLinkTarget/locale/de/LC_MESSAGES/OpenExternalLinkTarget.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OpenExternalLinkTarget\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:17+0000\n"
-"Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:23+0000\n"
+"Language-Team: German <https://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:47+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:10+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-openexternallinktarget\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/OpenExternalLinkTarget/locale/es/LC_MESSAGES/OpenExternalLinkTarget.po b/plugins/OpenExternalLinkTarget/locale/es/LC_MESSAGES/OpenExternalLinkTarget.po
index 71838cf8fc..5ebdcde26c 100644
--- a/plugins/OpenExternalLinkTarget/locale/es/LC_MESSAGES/OpenExternalLinkTarget.po
+++ b/plugins/OpenExternalLinkTarget/locale/es/LC_MESSAGES/OpenExternalLinkTarget.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - OpenExternalLinkTarget to Spanish (Español)
+# Translation of StatusNet - OpenExternalLinkTarget to Spanish (español)
 # Exported from translatewiki.net
 #
 # Author: Locos epraix
@@ -10,14 +10,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OpenExternalLinkTarget\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:17+0000\n"
-"Language-Team: Spanish <http://translatewiki.net/wiki/Portal:es>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:23+0000\n"
+"Language-Team: Spanish <https://translatewiki.net/wiki/Portal:es>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:47+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:10+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-plugin-openexternallinktarget\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/OpenExternalLinkTarget/locale/eu/LC_MESSAGES/OpenExternalLinkTarget.po b/plugins/OpenExternalLinkTarget/locale/eu/LC_MESSAGES/OpenExternalLinkTarget.po
new file mode 100644
index 0000000000..f1f8dfc579
--- /dev/null
+++ b/plugins/OpenExternalLinkTarget/locale/eu/LC_MESSAGES/OpenExternalLinkTarget.po
@@ -0,0 +1,25 @@
+# Translation of StatusNet - OpenExternalLinkTarget to Basque (euskara)
+# Exported from translatewiki.net
+#
+# Author: Artsuaga
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - OpenExternalLinkTarget\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:23+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:51:10+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin description.
+msgid "Opens external links (i.e. with rel=external) on a new window or tab."
+msgstr ""
+"Kanpo loturak (adz. rel=external dutenak) leiho edo fitxa berri batean "
+"irekitzen ditu."
diff --git a/plugins/OpenExternalLinkTarget/locale/fr/LC_MESSAGES/OpenExternalLinkTarget.po b/plugins/OpenExternalLinkTarget/locale/fr/LC_MESSAGES/OpenExternalLinkTarget.po
index dbd4462a51..56e8a90450 100644
--- a/plugins/OpenExternalLinkTarget/locale/fr/LC_MESSAGES/OpenExternalLinkTarget.po
+++ b/plugins/OpenExternalLinkTarget/locale/fr/LC_MESSAGES/OpenExternalLinkTarget.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - OpenExternalLinkTarget to French (Français)
+# Translation of StatusNet - OpenExternalLinkTarget to French (français)
 # Exported from translatewiki.net
 #
 # Author: Peter17
@@ -10,14 +10,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OpenExternalLinkTarget\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:18+0000\n"
-"Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:23+0000\n"
+"Language-Team: French <https://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:47+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:10+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-openexternallinktarget\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
diff --git a/plugins/OpenExternalLinkTarget/locale/gl/LC_MESSAGES/OpenExternalLinkTarget.po b/plugins/OpenExternalLinkTarget/locale/gl/LC_MESSAGES/OpenExternalLinkTarget.po
new file mode 100644
index 0000000000..40abfd65f8
--- /dev/null
+++ b/plugins/OpenExternalLinkTarget/locale/gl/LC_MESSAGES/OpenExternalLinkTarget.po
@@ -0,0 +1,28 @@
+# Translation of StatusNet - OpenExternalLinkTarget to Galician (galego)
+# Exported from translatewiki.net
+#
+# Author: Toliño
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - OpenExternalLinkTarget\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:23+0000\n"
+"Language-Team: Galician <https://translatewiki.net/wiki/Portal:gl>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:51:10+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: gl\n"
+"X-Message-Group: #out-statusnet-plugin-openexternallinktarget\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin description.
+msgid "Opens external links (i.e. with rel=external) on a new window or tab."
+msgstr ""
+"Abre ligazóns externas (por exemplo, con rel=external) nunha nova fiestra ou "
+"lapela."
diff --git a/plugins/OpenExternalLinkTarget/locale/he/LC_MESSAGES/OpenExternalLinkTarget.po b/plugins/OpenExternalLinkTarget/locale/he/LC_MESSAGES/OpenExternalLinkTarget.po
index 96bfb1b47a..00b62fa6b2 100644
--- a/plugins/OpenExternalLinkTarget/locale/he/LC_MESSAGES/OpenExternalLinkTarget.po
+++ b/plugins/OpenExternalLinkTarget/locale/he/LC_MESSAGES/OpenExternalLinkTarget.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OpenExternalLinkTarget\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:18+0000\n"
-"Language-Team: Hebrew <http://translatewiki.net/wiki/Portal:he>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:23+0000\n"
+"Language-Team: Hebrew <https://translatewiki.net/wiki/Portal:he>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:47+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:10+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: he\n"
 "X-Message-Group: #out-statusnet-plugin-openexternallinktarget\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/OpenExternalLinkTarget/locale/ia/LC_MESSAGES/OpenExternalLinkTarget.po b/plugins/OpenExternalLinkTarget/locale/ia/LC_MESSAGES/OpenExternalLinkTarget.po
index bc3fbd30a9..31a8f18b1d 100644
--- a/plugins/OpenExternalLinkTarget/locale/ia/LC_MESSAGES/OpenExternalLinkTarget.po
+++ b/plugins/OpenExternalLinkTarget/locale/ia/LC_MESSAGES/OpenExternalLinkTarget.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - OpenExternalLinkTarget to Interlingua (Interlingua)
+# Translation of StatusNet - OpenExternalLinkTarget to Interlingua (interlingua)
 # Exported from translatewiki.net
 #
 # Author: McDutchie
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OpenExternalLinkTarget\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:18+0000\n"
-"Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:23+0000\n"
+"Language-Team: Interlingua <https://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:47+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:10+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-openexternallinktarget\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/OpenExternalLinkTarget/locale/it/LC_MESSAGES/OpenExternalLinkTarget.po b/plugins/OpenExternalLinkTarget/locale/it/LC_MESSAGES/OpenExternalLinkTarget.po
new file mode 100644
index 0000000000..42ca0746dc
--- /dev/null
+++ b/plugins/OpenExternalLinkTarget/locale/it/LC_MESSAGES/OpenExternalLinkTarget.po
@@ -0,0 +1,23 @@
+# Translation of StatusNet - OpenExternalLinkTarget to Italian (italiano)
+# Exported from translatewiki.net
+#
+# Author: GreenFox
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - OpenExternalLinkTarget\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:24+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:51:10+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin description.
+msgid "Opens external links (i.e. with rel=external) on a new window or tab."
+msgstr "Apre i link esterni (ad esempio con rel=external) in una nuova scheda."
diff --git a/plugins/OpenExternalLinkTarget/locale/ja/LC_MESSAGES/OpenExternalLinkTarget.po b/plugins/OpenExternalLinkTarget/locale/ja/LC_MESSAGES/OpenExternalLinkTarget.po
new file mode 100644
index 0000000000..bfee0948d5
--- /dev/null
+++ b/plugins/OpenExternalLinkTarget/locale/ja/LC_MESSAGES/OpenExternalLinkTarget.po
@@ -0,0 +1,24 @@
+# Translation of StatusNet - OpenExternalLinkTarget to Japanese (日本語)
+# Exported from translatewiki.net
+#
+# Author: Shirayuki
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - OpenExternalLinkTarget\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:24+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:51:10+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#. TRANS: Plugin description.
+msgid "Opens external links (i.e. with rel=external) on a new window or tab."
+msgstr ""
+"新�ウィンドウ���タブ�（rel=external ��る）外部リンクを開���。"
diff --git a/plugins/OpenExternalLinkTarget/locale/mk/LC_MESSAGES/OpenExternalLinkTarget.po b/plugins/OpenExternalLinkTarget/locale/mk/LC_MESSAGES/OpenExternalLinkTarget.po
index 6282e11994..44d69543a3 100644
--- a/plugins/OpenExternalLinkTarget/locale/mk/LC_MESSAGES/OpenExternalLinkTarget.po
+++ b/plugins/OpenExternalLinkTarget/locale/mk/LC_MESSAGES/OpenExternalLinkTarget.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - OpenExternalLinkTarget to Macedonian (Македон�ки)
+# Translation of StatusNet - OpenExternalLinkTarget to Macedonian (македон�ки)
 # Exported from translatewiki.net
 #
 # Author: Bjankuloski06
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OpenExternalLinkTarget\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:18+0000\n"
-"Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:24+0000\n"
+"Language-Team: Macedonian <https://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:47+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:10+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-openexternallinktarget\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
diff --git a/plugins/OpenExternalLinkTarget/locale/nb/LC_MESSAGES/OpenExternalLinkTarget.po b/plugins/OpenExternalLinkTarget/locale/nb/LC_MESSAGES/OpenExternalLinkTarget.po
index 26856fd027..0c014ea1f9 100644
--- a/plugins/OpenExternalLinkTarget/locale/nb/LC_MESSAGES/OpenExternalLinkTarget.po
+++ b/plugins/OpenExternalLinkTarget/locale/nb/LC_MESSAGES/OpenExternalLinkTarget.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - OpenExternalLinkTarget to Norwegian (bokmål)‬ (‪Norsk (bokmål)‬)
+# Translation of StatusNet - OpenExternalLinkTarget to Norwegian Bokmål (‪norsk (bokmål)‬)
 # Exported from translatewiki.net
 #
 # Author: Nghtwlkr
@@ -9,15 +9,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OpenExternalLinkTarget\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:18+0000\n"
-"Language-Team: Norwegian (bokmål)‬ <http://translatewiki.net/wiki/Portal:no>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:24+0000\n"
+"Language-Team: Norwegian Bokmål <https://translatewiki.net/wiki/Portal:nb>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:47+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
-"X-Language-Code: no\n"
+"X-POT-Import-Date: 2011-06-05 21:51:10+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: nb\n"
 "X-Message-Group: #out-statusnet-plugin-openexternallinktarget\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
diff --git a/plugins/OpenExternalLinkTarget/locale/nl/LC_MESSAGES/OpenExternalLinkTarget.po b/plugins/OpenExternalLinkTarget/locale/nl/LC_MESSAGES/OpenExternalLinkTarget.po
index ad7e1b11b0..1f3e5f3e32 100644
--- a/plugins/OpenExternalLinkTarget/locale/nl/LC_MESSAGES/OpenExternalLinkTarget.po
+++ b/plugins/OpenExternalLinkTarget/locale/nl/LC_MESSAGES/OpenExternalLinkTarget.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OpenExternalLinkTarget\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:18+0000\n"
-"Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:24+0000\n"
+"Language-Team: Dutch <https://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:47+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:10+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-openexternallinktarget\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/OpenExternalLinkTarget/locale/pt/LC_MESSAGES/OpenExternalLinkTarget.po b/plugins/OpenExternalLinkTarget/locale/pt/LC_MESSAGES/OpenExternalLinkTarget.po
index 8fe73cbb03..5dca073670 100644
--- a/plugins/OpenExternalLinkTarget/locale/pt/LC_MESSAGES/OpenExternalLinkTarget.po
+++ b/plugins/OpenExternalLinkTarget/locale/pt/LC_MESSAGES/OpenExternalLinkTarget.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - OpenExternalLinkTarget to Portuguese (Português)
+# Translation of StatusNet - OpenExternalLinkTarget to Portuguese (português)
 # Exported from translatewiki.net
 #
 # Author: Waldir
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OpenExternalLinkTarget\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:18+0000\n"
-"Language-Team: Portuguese <http://translatewiki.net/wiki/Portal:pt>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:24+0000\n"
+"Language-Team: Portuguese <https://translatewiki.net/wiki/Portal:pt>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:47+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:10+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: pt\n"
 "X-Message-Group: #out-statusnet-plugin-openexternallinktarget\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/OpenExternalLinkTarget/locale/ru/LC_MESSAGES/OpenExternalLinkTarget.po b/plugins/OpenExternalLinkTarget/locale/ru/LC_MESSAGES/OpenExternalLinkTarget.po
index 70252ebae9..2b11f8a649 100644
--- a/plugins/OpenExternalLinkTarget/locale/ru/LC_MESSAGES/OpenExternalLinkTarget.po
+++ b/plugins/OpenExternalLinkTarget/locale/ru/LC_MESSAGES/OpenExternalLinkTarget.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - OpenExternalLinkTarget to Russian (Ру��кий)
+# Translation of StatusNet - OpenExternalLinkTarget to Russian (ру��кий)
 # Exported from translatewiki.net
 #
 # Author: Eleferen
@@ -10,14 +10,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OpenExternalLinkTarget\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:18+0000\n"
-"Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:24+0000\n"
+"Language-Team: Russian <https://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:47+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:10+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-openexternallinktarget\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
diff --git a/plugins/OpenExternalLinkTarget/locale/tl/LC_MESSAGES/OpenExternalLinkTarget.po b/plugins/OpenExternalLinkTarget/locale/tl/LC_MESSAGES/OpenExternalLinkTarget.po
index aee0d0b4d5..00626cd6c6 100644
--- a/plugins/OpenExternalLinkTarget/locale/tl/LC_MESSAGES/OpenExternalLinkTarget.po
+++ b/plugins/OpenExternalLinkTarget/locale/tl/LC_MESSAGES/OpenExternalLinkTarget.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OpenExternalLinkTarget\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:18+0000\n"
-"Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:24+0000\n"
+"Language-Team: Tagalog <https://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:47+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:10+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-openexternallinktarget\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/OpenExternalLinkTarget/locale/uk/LC_MESSAGES/OpenExternalLinkTarget.po b/plugins/OpenExternalLinkTarget/locale/uk/LC_MESSAGES/OpenExternalLinkTarget.po
index a6a806db43..0362e529f2 100644
--- a/plugins/OpenExternalLinkTarget/locale/uk/LC_MESSAGES/OpenExternalLinkTarget.po
+++ b/plugins/OpenExternalLinkTarget/locale/uk/LC_MESSAGES/OpenExternalLinkTarget.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - OpenExternalLinkTarget to Ukrainian (Україн�ька)
+# Translation of StatusNet - OpenExternalLinkTarget to Ukrainian (україн�ька)
 # Exported from translatewiki.net
 #
 # Author: Boogie
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OpenExternalLinkTarget\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:18+0000\n"
-"Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:24+0000\n"
+"Language-Team: Ukrainian <https://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:47+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:10+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-openexternallinktarget\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
diff --git a/plugins/OpenExternalLinkTarget/locale/zh_CN/LC_MESSAGES/OpenExternalLinkTarget.po b/plugins/OpenExternalLinkTarget/locale/zh_CN/LC_MESSAGES/OpenExternalLinkTarget.po
index 1e9b3c96a1..ee273a9d72 100644
--- a/plugins/OpenExternalLinkTarget/locale/zh_CN/LC_MESSAGES/OpenExternalLinkTarget.po
+++ b/plugins/OpenExternalLinkTarget/locale/zh_CN/LC_MESSAGES/OpenExternalLinkTarget.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - OpenExternalLinkTarget to Simplified Chinese (‪中文(简体)‬)
+# Translation of StatusNet - OpenExternalLinkTarget to Simplified Chinese (‪中文（简体）‬)
 # Exported from translatewiki.net
 #
 # Author: Hydra
@@ -10,15 +10,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OpenExternalLinkTarget\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:19+0000\n"
-"Language-Team: Simplified Chinese <http://translatewiki.net/wiki/Portal:zh-"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:24+0000\n"
+"Language-Team: Simplified Chinese <https://translatewiki.net/wiki/Portal:zh-"
 "hans>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:47+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:10+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: #out-statusnet-plugin-openexternallinktarget\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
diff --git a/plugins/OpenID/OpenIDPlugin.php b/plugins/OpenID/OpenIDPlugin.php
index 758c97b5f9..3d8dab8213 100644
--- a/plugins/OpenID/OpenIDPlugin.php
+++ b/plugins/OpenID/OpenIDPlugin.php
@@ -20,7 +20,7 @@
  * @category  Plugin
  * @package   StatusNet
  * @author    Evan Prodromou <evan@status.net>
- * @author   Craig Andrews <candrews@integralblue.com>
+ * @author    Craig Andrews <candrews@integralblue.com>
  * @copyright 2009-2010 StatusNet, Inc.
  * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
@@ -135,7 +135,8 @@ class OpenIDPlugin extends Plugin
                     common_redirect(common_local_url('openidsettings'));
                     exit(0);
                 } else if ($action == 'recoverpassword') {
-                    throw new ClientException('Unavailable action.');
+                    // TRANS: Client exception thrown when an action is not available.
+                    throw new ClientException(_m('Unavailable action.'));
                 }
             }
         }
@@ -361,10 +362,9 @@ class OpenIDPlugin extends Plugin
             require_once dirname(__FILE__) . '/' . strtolower(mb_substr($cls, 0, -6)) . '.php';
             return false;
         case 'User_openid':
-            require_once dirname(__FILE__) . '/User_openid.php';
-            return false;
+        case 'User_openid_prefs':
         case 'User_openid_trustroot':
-            require_once dirname(__FILE__) . '/User_openid_trustroot.php';
+            require_once dirname(__FILE__) . '/' . $cls . '.php';
             return false;
         case 'Auth_OpenID_TeamsExtension':
         case 'Auth_OpenID_TeamsRequest':
@@ -478,18 +478,24 @@ class OpenIDPlugin extends Plugin
         {
         case 'register':
             if (common_logged_in()) {
-                $instr = '(Have an [OpenID](http://openid.net/)? ' .
-                  '[Add an OpenID to your account](%%action.openidsettings%%)!';
+                // TRANS: Page notice for logged in users to try and get them to add an OpenID account to their StatusNet account.
+                // TRANS: This message contains Markdown links in the form (description)[link].
+                $instr = _m('(Have an [OpenID](http://openid.net/)? ' .
+                  '[Add an OpenID to your account](%%action.openidsettings%%)!');
             } else {
-                $instr = '(Have an [OpenID](http://openid.net/)? ' .
+                // TRANS: Page notice for anonymous users to try and get them to register with an OpenID account.
+                // TRANS: This message contains Markdown links in the form (description)[link].
+                $instr = _m('(Have an [OpenID](http://openid.net/)? ' .
                   'Try our [OpenID registration]'.
-                  '(%%action.openidlogin%%)!)';
+                  '(%%action.openidlogin%%)!)');
             }
             break;
         case 'login':
-            $instr = '(Have an [OpenID](http://openid.net/)? ' .
+            // TRANS: Page notice on the login page to try and get them to log on with an OpenID account.
+            // TRANS: This message contains Markdown links in the form (description)[link].
+            $instr = _m('(Have an [OpenID](http://openid.net/)? ' .
               'Try our [OpenID login]'.
-              '(%%action.openidlogin%%)!)';
+              '(%%action.openidlogin%%)!)');
             break;
         default:
             return true;
@@ -529,15 +535,12 @@ class OpenIDPlugin extends Plugin
      *
      * @return boolean hook value
      */
-    function onEndLoadDoc($title, &$output)
-    {
-        if ($title == 'help') {
-            // TRANS: Item on help page. This message contains Markdown links in the form [description](link).
-            $menuitem = _m('* [OpenID](%%doc.openid%%) - What OpenID is and how to use it with this service.');
-
-            $output .= common_markup_to_html($menuitem);
-        }
-
+    function onEndDocsMenu(&$items) {
+        $items[] = array('doc', 
+                         array('title' => 'openid'),
+                         _m('MENU', 'OpenID'),
+                         _('Logging in with OpenID'),
+                         'nav_doc_openid');
         return true;
     }
 
@@ -569,6 +572,35 @@ class OpenIDPlugin extends Plugin
                                    new ColumnDef('created', 'datetime',
                                                  null, false),
                                    new ColumnDef('modified', 'timestamp')));
+
+        $schema->ensureTable('user_openid_prefs', User_openid_prefs::schemaDef());
+
+        /* These are used by JanRain OpenID library */
+
+        $schema->ensureTable('oid_associations',
+                             array(
+                                 'fields' => array(
+                                     'server_url' => array('type' => 'blob', 'not null' => true),
+                                     'handle' => array('type' => 'varchar', 'length' => 255, 'not null' => true, 'default' => ''), // character set latin1,
+                                     'secret' => array('type' => 'blob'),
+                                     'issued' => array('type' => 'int'),
+                                     'lifetime' => array('type' => 'int'),
+                                     'assoc_type' => array('type' => 'varchar', 'length' => 64),
+                                 ),
+                                 'primary key' => array(array('server_url', 255), 'handle'),
+                             ));
+        $schema->ensureTable('oid_nonces',
+                             array(
+                                 'fields' => array(
+                                     'server_url' => array('type' => 'varchar', 'length' => 2047),
+                                     'timestamp' => array('type' => 'int'),
+                                     'salt' => array('type' => 'char', 'length' => 40),
+                                 ),
+                                 'unique keys' => array(
+                                     'oid_nonces_server_url_timestamp_salt_key' => array(array('server_url', 255), 'timestamp', 'salt'),
+                                 ),
+                             ));
+
         return true;
     }
 
@@ -783,4 +815,35 @@ class OpenIDPlugin extends Plugin
 
         return true;
     }
+
+    /**
+     * Add links in the user's profile block to their OpenID URLs.
+     *
+     * @param Profile $profile The profile being shown
+     * @param Array   &$links  Writeable array of arrays (href, text, image).
+     *
+     * @return boolean hook value (true)
+     */
+    
+    function onOtherAccountProfiles($profile, &$links)
+    {
+        $prefs = User_openid_prefs::staticGet('user_id', $profile->id);
+
+        if (empty($prefs) || !$prefs->hide_profile_link) {
+
+            $oid = new User_openid();
+
+            $oid->user_id = $profile->id;
+
+            if ($oid->find()) {
+                while ($oid->fetch()) {
+                    $links[] = array('href' => $oid->display,
+                                     'text' => _('OpenID'),
+                                     'image' => $this->path("icons/openid-16x16.gif"));
+                }
+            }
+        }
+
+        return true;
+    }
 }
diff --git a/plugins/OpenID/User_openid.php b/plugins/OpenID/User_openid.php
index a9c96fa4bd..03a0b0ccd9 100644
--- a/plugins/OpenID/User_openid.php
+++ b/plugins/OpenID/User_openid.php
@@ -63,7 +63,7 @@ class User_openid extends Memcached_DataObject
         return array(false, false, false);
     }
 
-    Static function hasOpenID($user_id)
+    static function hasOpenID($user_id)
     {
         $oid = new User_openid();
 
diff --git a/plugins/OpenID/User_openid_prefs.php b/plugins/OpenID/User_openid_prefs.php
new file mode 100644
index 0000000000..74a21f685e
--- /dev/null
+++ b/plugins/OpenID/User_openid_prefs.php
@@ -0,0 +1,100 @@
+<?php
+/**
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2012, StatusNet, Inc.
+ *
+ * User_openid_prefs.php
+ * 
+ * PHP version 5
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  OpenID
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2012 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    exit(1);
+}
+
+/**
+ * Store preferences for OpenID use in StatusNet
+ *
+ * @category OpenID
+ * @package  StatusNet
+ * @author   Evan Prodromou <evan@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
+ * @link     http://status.net/
+ *
+ * @see      DB_DataObject
+ */
+
+class User_openid_prefs extends Managed_DataObject
+{
+    public $__table = 'user_openid_prefs'; // table name
+
+    public $user_id;            // The User with the prefs
+    public $hide_profile_link;  // Hide the link on the profile block?
+    public $created;            // datetime
+    public $modified;           // datetime
+
+    /**
+     * Get an instance by key
+     *
+     * This is a utility method to get a single instance with a given key value.
+     *
+     * @param string $k Key to use to lookup (usually 'user_id' for this class)
+     * @param mixed  $v Value to lookup
+     *
+     * @return TagSub object found, or null for no hits
+     *
+     */
+    function staticGet($k, $v=null)
+    {
+        return Managed_DataObject::staticGet('User_openid_prefs', $k, $v);
+    }
+
+    /**
+     * The One True Thingy that must be defined and declared.
+     */
+
+    public static function schemaDef()
+    {
+        return array(
+                     'description' => 'Per-user preferences for OpenID display',
+                     'fields' => array('user_id' => array('type' => 'integer',
+                                                          'not null' => true,
+                                                          'description' => 'User whose prefs we are saving'),
+                                       'hide_profile_link' => array('type' => 'int',
+                                                                    'not null' => true,
+                                                                    'default' => 0,
+                                                                    'description' => 'Whether to hide profile links from profile block'),
+                                       'created' => array('type' => 'datetime',
+                                                          'not null' => true,
+                                                          'description' => 'date this record was created'),
+                                       'modified' => array('type' => 'datetime',
+                                                           'not null' => true,
+                                                           'description' => 'date this record was modified'),
+                                       ),
+                     'primary key' => array('user_id'),
+                     'foreign keys' => array('user_openid_prefs_user_id_fkey' => array('user', array('user_id' => 'id')),
+                                             ),
+                     'indexes' => array(),
+                     );
+    }
+}
diff --git a/plugins/OpenID/icons/openid-16x16.gif b/plugins/OpenID/icons/openid-16x16.gif
new file mode 100644
index 0000000000..e2d8377db0
Binary files /dev/null and b/plugins/OpenID/icons/openid-16x16.gif differ
diff --git a/plugins/OpenID/locale/OpenID.pot b/plugins/OpenID/locale/OpenID.pot
index f55bbbc0e4..ffc4831868 100644
--- a/plugins/OpenID/locale/OpenID.pot
+++ b/plugins/OpenID/locale/OpenID.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
+"POT-Creation-Date: 2012-06-30 11:07+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"
@@ -37,7 +37,7 @@ msgstr ""
 
 #. TRANS: Button text to continue OpenID identity verification.
 #. TRANS: button label for OAuth authorization page when needing OpenID authentication first.
-#: openidtrust.php:136 OpenIDPlugin.php:664
+#: openidtrust.php:136 OpenIDPlugin.php:695
 msgctxt "BUTTON"
 msgid "Continue"
 msgstr ""
@@ -48,38 +48,43 @@ msgctxt "BUTTON"
 msgid "Cancel"
 msgstr ""
 
+#. TRANS: Client exception thrown when an action is not available.
+#: OpenIDPlugin.php:139
+msgid "Unavailable action."
+msgstr ""
+
 #. TRANS: Tooltip for main menu option "Login"
-#: OpenIDPlugin.php:218
+#: OpenIDPlugin.php:219
 msgctxt "TOOLTIP"
 msgid "Login to the site."
 msgstr ""
 
 #. TRANS: Main menu option when not logged in to log in
-#: OpenIDPlugin.php:221
+#: OpenIDPlugin.php:222
 msgctxt "MENU"
 msgid "Login"
 msgstr ""
 
 #. TRANS: Tooltip for main menu option "Help"
-#: OpenIDPlugin.php:226
+#: OpenIDPlugin.php:227
 msgctxt "TOOLTIP"
 msgid "Help me!"
 msgstr ""
 
 #. TRANS: Main menu option for help on the StatusNet site
-#: OpenIDPlugin.php:229
+#: OpenIDPlugin.php:230
 msgctxt "MENU"
 msgid "Help"
 msgstr ""
 
 #. TRANS: Tooltip for main menu option "Search"
-#: OpenIDPlugin.php:235
+#: OpenIDPlugin.php:236
 msgctxt "TOOLTIP"
 msgid "Search for people or text."
 msgstr ""
 
 #. TRANS: Main menu option when logged in or when the StatusNet instance is not private
-#: OpenIDPlugin.php:238
+#: OpenIDPlugin.php:239
 msgctxt "MENU"
 msgid "Search"
 msgstr ""
@@ -87,70 +92,90 @@ msgstr ""
 #. TRANS: OpenID plugin menu item on site logon page.
 #. TRANS: OpenID plugin menu item on user settings page.
 #. TRANS: OpenID configuration menu item.
-#: OpenIDPlugin.php:295 OpenIDPlugin.php:331 OpenIDPlugin.php:606
+#: OpenIDPlugin.php:296 OpenIDPlugin.php:332 OpenIDPlugin.php:542
+#: OpenIDPlugin.php:637
 msgctxt "MENU"
 msgid "OpenID"
 msgstr ""
 
 #. TRANS: OpenID plugin tooltip for logon menu item.
-#: OpenIDPlugin.php:297
+#: OpenIDPlugin.php:298
 msgid "Login or register with OpenID."
 msgstr ""
 
 #. TRANS: OpenID plugin tooltip for user settings menu item.
-#: OpenIDPlugin.php:333
+#: OpenIDPlugin.php:334
 msgid "Add or remove OpenIDs."
 msgstr ""
 
-#. TRANS: Item on help page. This message contains Markdown links in the form [description](link).
-#: OpenIDPlugin.php:536
+#. TRANS: Page notice for logged in users to try and get them to add an OpenID account to their StatusNet account.
+#. TRANS: This message contains Markdown links in the form (description)[link].
+#: OpenIDPlugin.php:484
 #, php-format
 msgid ""
-"* [OpenID](%%doc.openid%%) - What OpenID is and how to use it with this "
-"service."
+"(Have an [OpenID](http://openid.net/)? [Add an OpenID to your account](%%"
+"action.openidsettings%%)!"
+msgstr ""
+
+#. TRANS: Page notice for anonymous users to try and get them to register with an OpenID account.
+#. TRANS: This message contains Markdown links in the form (description)[link].
+#: OpenIDPlugin.php:489
+#, php-format
+msgid ""
+"(Have an [OpenID](http://openid.net/)? Try our [OpenID registration](%%"
+"action.openidlogin%%)!)"
+msgstr ""
+
+#. TRANS: Page notice on the login page to try and get them to log on with an OpenID account.
+#. TRANS: This message contains Markdown links in the form (description)[link].
+#: OpenIDPlugin.php:497
+#, php-format
+msgid ""
+"(Have an [OpenID](http://openid.net/)? Try our [OpenID login](%%action."
+"openidlogin%%)!)"
 msgstr ""
 
 #. TRANS: Tooltip for OpenID configuration menu item.
-#: OpenIDPlugin.php:608
+#: OpenIDPlugin.php:639
 msgid "OpenID configuration."
 msgstr ""
 
 #. TRANS: Plugin description.
-#: OpenIDPlugin.php:654
+#: OpenIDPlugin.php:685
 msgid "Use <a href=\"http://openid.net/\">OpenID</a> to login to the site."
 msgstr ""
 
 #. TRANS: OpenID plugin logon form legend.
-#: OpenIDPlugin.php:681 openidlogin.php:132
+#: OpenIDPlugin.php:712 openidlogin.php:132
 msgctxt "LEGEND"
 msgid "OpenID login"
 msgstr ""
 
 #. TRANS: Field label.
-#: OpenIDPlugin.php:689
+#: OpenIDPlugin.php:720
 msgid "OpenID provider"
 msgstr ""
 
 #. TRANS: Form guide.
-#: OpenIDPlugin.php:698 openidlogin.php:148
+#: OpenIDPlugin.php:729 openidlogin.php:149
 msgid "Enter your username."
 msgstr ""
 
 #. TRANS: Form guide.
-#: OpenIDPlugin.php:700 openidlogin.php:150
+#: OpenIDPlugin.php:731 openidlogin.php:151
 msgid "You will be sent to the provider's site for authentication."
 msgstr ""
 
 #. TRANS: OpenID plugin logon form field label.
 #. TRANS: Field label.
 #. TRANS: OpenID plugin logon form field label.
-#: OpenIDPlugin.php:704 openidsettings.php:110 openidlogin.php:154
+#: OpenIDPlugin.php:735 openidsettings.php:110 openidlogin.php:155
 msgid "OpenID URL"
 msgstr ""
 
 #. TRANS: OpenID plugin logon form field instructions.
 #. TRANS: OpenID plugin logon form field title.
-#: OpenIDPlugin.php:707 openidlogin.php:157
+#: OpenIDPlugin.php:738 openidlogin.php:158
 msgid "Your OpenID URL."
 msgstr ""
 
@@ -659,23 +684,24 @@ msgctxt "TITLE"
 msgid "OpenID Login"
 msgstr ""
 
-#: openidlogin.php:139
+#. TRANS: Field label.
+#: openidlogin.php:140
 msgctxt "LABEL"
 msgid "OpenID provider"
 msgstr ""
 
 #. TRANS: OpenID plugin logon form checkbox label for setting to put the OpenID information in a cookie.
-#: openidlogin.php:162
+#: openidlogin.php:163
 msgid "Remember me"
 msgstr ""
 
 #. TRANS: OpenID plugin logon form field title.
-#: openidlogin.php:164
+#: openidlogin.php:165
 msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
 
 #. TRANS: OpenID plugin logon form button label to start logon with the data provided in the logon form.
-#: openidlogin.php:169
+#: openidlogin.php:170
 msgctxt "BUTTON"
 msgid "Login"
 msgstr ""
diff --git a/plugins/OpenID/locale/ar/LC_MESSAGES/OpenID.po b/plugins/OpenID/locale/ar/LC_MESSAGES/OpenID.po
index df21273584..e273faaedd 100644
--- a/plugins/OpenID/locale/ar/LC_MESSAGES/OpenID.po
+++ b/plugins/OpenID/locale/ar/LC_MESSAGES/OpenID.po
@@ -1,6 +1,7 @@
 # Translation of StatusNet - OpenID to Arabic (العربية)
 # Exported from translatewiki.net
 #
+# Author: Majid Al-Dharrab
 # Author: OsamaK
 # --
 # This file is distributed under the same license as the StatusNet package.
@@ -9,14 +10,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OpenID\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:26+0000\n"
-"Language-Team: Arabic <http://translatewiki.net/wiki/Portal:ar>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:24+0000\n"
+"Language-Team: Arabic <https://translatewiki.net/wiki/Portal:ar>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:47+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-10-10 14:11:22+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ar\n"
 "X-Message-Group: #out-statusnet-plugin-openid\n"
 "Plural-Forms: nplurals=6; plural=(n == 0) ? 0 : ( (n == 1) ? 1 : ( (n == "
@@ -30,16 +31,15 @@ msgstr "التحقق من الهوية الم�توحة"
 #. TRANS: Client error when visiting page directly.
 msgid ""
 "This page should only be reached during OpenID processing, not directly."
-msgstr ""
-"يجب أن يتم الوصول إلى هذه الص�حة أثناء معالجة الهوية الم�توحة وليس مباشرة."
+msgstr "يجب الوصول إلى هذه الص�حة أثناء معالجة الهوية الم�توحة وليس مباشرة."
 
 #. TRANS: Page notice. %s is a trustroot name.
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "%s has asked to verify your identity. Click Continue to verify your identity "
 "and login without creating a new password."
 msgstr ""
-"طلب %s التحقق من هويتك. انقر استمر لتؤكد هويتك وتدخل دون إنشاء كلمة سر."
+"طلب %s التحقق من هويتك. انقر استمر لتؤكد هويتك وتدخل دون إنشاء كلمة سر جديدة."
 
 #. TRANS: Button text to continue OpenID identity verification.
 #. TRANS: button label for OAuth authorization page when needing OpenID authentication first.
@@ -48,16 +48,18 @@ msgid "Continue"
 msgstr "استمر"
 
 #. TRANS: Button text to cancel OpenID identity verification.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Cancel"
 msgstr "ألغ�"
 
+#. TRANS: Client exception thrown when an action is not available.
+msgid "Unavailable action."
+msgstr ""
+
 #. TRANS: Tooltip for main menu option "Login"
-#, fuzzy
 msgctxt "TOOLTIP"
 msgid "Login to the site."
-msgstr "ل�ج �ي الموقع"
+msgstr "ل�ج إلى الموقع."
 
 #. TRANS: Main menu option when not logged in to log in
 msgctxt "MENU"
@@ -75,10 +77,9 @@ msgid "Help"
 msgstr "مساعدة"
 
 #. TRANS: Tooltip for main menu option "Search"
-#, fuzzy
 msgctxt "TOOLTIP"
 msgid "Search for people or text."
-msgstr "ابحث عن أشخاص أو نصوص"
+msgstr "ابحث عن أشخاص أو نصوص."
 
 #. TRANS: Main menu option when logged in or when the StatusNet instance is not private
 msgctxt "MENU"
@@ -93,36 +94,55 @@ msgid "OpenID"
 msgstr "هوية م�توحة"
 
 #. TRANS: OpenID plugin tooltip for logon menu item.
-#, fuzzy
 msgid "Login or register with OpenID."
-msgstr "ل�ج أو سجّل بهوية م�توحة"
+msgstr "ل�ج أو سجّل بهوية م�توحة."
 
 #. TRANS: OpenID plugin tooltip for user settings menu item.
-#, fuzzy
 msgid "Add or remove OpenIDs."
-msgstr "أض� أو احذ� هويات م�توحة"
+msgstr "أض� أو احذ� هويات م�توحة."
 
-#. TRANS: Item on help page. This message contains Markdown links in the form [description](link).
+#. TRANS: Page notice for logged in users to try and get them to add an OpenID account to their StatusNet account.
+#. TRANS: This message contains Markdown links in the form (description)[link].
 #, php-format
 msgid ""
-"* [OpenID](%%doc.openid%%) - What OpenID is and how to use it with this "
-"service."
+"(Have an [OpenID](http://openid.net/)? [Add an OpenID to your account](%%"
+"action.openidsettings%%)!"
 msgstr ""
+"(ألديك [هوية م�توحة](http://openid.net/)؟ [أض� هوية م�توحة إلى حسابك](%%"
+"action.openidsettings%%)!"
+
+#. TRANS: Page notice for anonymous users to try and get them to register with an OpenID account.
+#. TRANS: This message contains Markdown links in the form (description)[link].
+#, php-format
+msgid ""
+"(Have an [OpenID](http://openid.net/)? Try our [OpenID registration](%%"
+"action.openidlogin%%)!)"
+msgstr ""
+"(ألديك [هوية م�توحة](http://openid.net/)؟ جرب [التسجيل بالهوية الم�توحة](%%"
+"action.openidlogin%%)!)"
+
+#. TRANS: Page notice on the login page to try and get them to log on with an OpenID account.
+#. TRANS: This message contains Markdown links in the form (description)[link].
+#, php-format
+msgid ""
+"(Have an [OpenID](http://openid.net/)? Try our [OpenID login](%%action."
+"openidlogin%%)!)"
+msgstr ""
+"(ألديك [هوية م�توحة](http://openid.net/)؟ جرب [الولوج بالهوية الم�توحة](%%"
+"action.openidlogin%%)!)"
 
 #. TRANS: Tooltip for OpenID configuration menu item.
-#, fuzzy
 msgid "OpenID configuration."
-msgstr "ضبط الهوية الم�توحة"
+msgstr "ضبط الهوية الم�توحة."
 
 #. TRANS: Plugin description.
 msgid "Use <a href=\"http://openid.net/\">OpenID</a> to login to the site."
-msgstr "استخدم <a href=\"http://openid.net/\">هوية م�توحة</a> للدخول للموقع."
+msgstr "استخدام <a href=\"http://openid.net/\">هوية م�توحة</a> للدخول للموقع."
 
 #. TRANS: OpenID plugin logon form legend.
-#, fuzzy
 msgctxt "LEGEND"
 msgid "OpenID login"
-msgstr "الدخول بهوية م�توحة"
+msgstr "ولوج الهوية الم�توحة"
 
 #. TRANS: Field label.
 msgid "OpenID provider"
@@ -144,9 +164,8 @@ msgstr "مسار الهوية الم�توحة"
 
 #. TRANS: OpenID plugin logon form field instructions.
 #. TRANS: OpenID plugin logon form field title.
-#, fuzzy
 msgid "Your OpenID URL."
-msgstr "مسار هويتك الم�توحة"
+msgstr "مسار هويتك الم�توحة."
 
 #. TRANS: Client error message trying to log on with OpenID while already logged on.
 msgid "Already logged in."
@@ -158,7 +177,6 @@ msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 
 #. TRANS: Message given if user does not agree with the site's license.
-#, fuzzy
 msgid "You cannot register if you do not agree to the license."
 msgstr "لا يمكن أن تسجل ما لم توا�ق على الرخصة."
 
@@ -176,7 +194,6 @@ msgid ""
 msgstr ""
 
 #. TRANS: Title
-#, fuzzy
 msgctxt "TITLE"
 msgid "OpenID Account Setup"
 msgstr "إعداد حساب هوية م�توحة"
@@ -195,7 +212,7 @@ msgstr "الاسم المستعار الجديد"
 
 #. TRANS: Field title.
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
-msgstr ""
+msgstr "1-64 حر�ًا إنجليزيًا أو رقمًا، بدون نقاط أو مسا�ات."
 
 #. TRANS: Field label.
 msgid "Email"
@@ -212,6 +229,8 @@ msgid ""
 "My text and files are available under %s except this private data: password, "
 "email address, IM address, and phone number."
 msgstr ""
+"تخضع نصوصي ومل�اتي ل%s إلا البيانات الخاصة التالية: كلمة السر وعنوان البريد "
+"الإلكتروني وعنوان المراسلة ال�ورية ورقم الهات�."
 
 #. TRANS: Button label in form in which to create a new user on the site for an OpenID.
 msgctxt "BUTTON"
@@ -249,13 +268,12 @@ msgstr "ألغي استيثاق الهوية الم�توحة"
 #. TRANS: OpenID authentication failed; display the error message. %s is the error message.
 #. TRANS: OpenID authentication failed; display the error message.
 #. TRANS: %s is the error message.
-#, fuzzy, php-format
+#, php-format
 msgid "OpenID authentication failed: %s."
-msgstr "�شل استيثاق الهوية الم�توحة: %s"
+msgstr "�شل استيثاق الهوية الم�توحة: %s."
 
 #. TRANS: Message displayed when OpenID authentication is aborted.
 #. TRANS: OpenID authentication error.
-#, fuzzy
 msgid ""
 "OpenID authentication aborted: You are not allowed to login to this site."
 msgstr "أجهض استيثاق الهوية الم�توحة: لا يسمح لك بدخول هذا الموقع."
@@ -304,15 +322,15 @@ msgstr "ليست هوية م�توحة صحيحة."
 
 #. TRANS: OpenID plugin server error. Given when the OpenID authentication request fails.
 #. TRANS: %s is the failure message.
-#, fuzzy, php-format
+#, php-format
 msgid "OpenID failure: %s."
-msgstr "�شلت الهوية الم�توحة: %s"
+msgstr "�شلت الهوية الم�توحة: %s."
 
 #. TRANS: OpenID plugin server error. Given when the OpenID authentication request cannot be redirected.
 #. TRANS: %s is the failure message.
-#, fuzzy, php-format
+#, php-format
 msgid "Could not redirect to server: %s."
-msgstr "تغذر التحويل للخادوم: %s"
+msgstr "تعذر التحويل للخادوم: %s."
 
 #. TRANS: OpenID plugin user instructions.
 msgid ""
@@ -349,7 +367,6 @@ msgid ""
 msgstr "إذا لم ت�حوّل إلى مزود الولوج خلال ثوان� قليلة، حاول نقر الزر أدناه."
 
 #. TRANS: Title for OpenID bridge administration page.
-#, fuzzy
 msgctxt "TITLE"
 msgid "OpenID Settings"
 msgstr "إعدادات الهوية الم�توحة"
@@ -359,17 +376,14 @@ msgid "OpenID settings"
 msgstr "إعدادات الهوية الم�توحة"
 
 #. TRANS: Client error displayed when OpenID provider URL is too long.
-#, fuzzy
 msgid "Invalid provider URL. Maximum length is 255 characters."
 msgstr "مسار المزود غير صالح. أقصى طول 255 حر�."
 
 #. TRANS: Client error displayed when Launchpad team name is too long.
-#, fuzzy
 msgid "Invalid team name. Maximum length is 255 characters."
 msgstr "اسم �ريق غير صالح. أقصى طول 255 حر�."
 
 #. TRANS: Fieldset legend.
-#, fuzzy
 msgctxt "LEGEND"
 msgid "Trusted provider"
 msgstr "مزود موثوق"
@@ -410,7 +424,6 @@ msgid "Only allow logins from users in the given team (Launchpad extension)."
 msgstr ""
 
 #. TRANS: Fieldset legend.
-#, fuzzy
 msgctxt "LEGEND"
 msgid "Options"
 msgstr "خيارات"
@@ -426,15 +439,13 @@ msgid ""
 msgstr ""
 
 #. TRANS: Button text to save OpenID settings.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "اح�ظ"
 
 #. TRANS: Button title to save OpenID settings.
-#, fuzzy
 msgid "Save OpenID settings."
-msgstr "إعدادات الهوية الم�توحة"
+msgstr "إعدادات الهوية الم�توحة."
 
 #. TRANS: Error message displayed when trying to perform an action that requires a logged in user.
 msgid "Not logged in."
@@ -453,16 +464,14 @@ msgid "Error connecting user."
 msgstr ""
 
 #. TRANS: Message in case the user or the user profile cannot be saved in StatusNet.
-#, fuzzy
 msgid "Error updating profile."
-msgstr "خطأ أثناء ح�ظ المل�."
+msgstr "خطأ أثناء تحديث المل� الشخصي."
 
 #. TRANS: Title after getting the status of the OpenID authorisation request.
 msgid "OpenID Login"
 msgstr "ولوج الهوية الم�توحة"
 
 #. TRANS: Title of OpenID settings page for a user.
-#, fuzzy
 msgctxt "TITLE"
 msgid "OpenID settings"
 msgstr "إعدادات الهوية الم�توحة"
@@ -478,10 +487,9 @@ msgstr ""
 "المستخدم. أدر هوياتك الم�توحة هنا."
 
 #. TRANS: Fieldset legend.
-#, fuzzy
 msgctxt "LEGEND"
 msgid "Add OpenID"
-msgstr "أض� هوية م�توحة"
+msgstr "إضا�ة هوية م�توحة"
 
 #. TRANS: Form guide.
 msgid ""
@@ -491,16 +499,14 @@ msgstr ""
 "إذا أردت إضا�ة هوية م�توحة إلى حسابك، أدخلها إلى الصندوق أدناه وانقر \"أض�\"."
 
 #. TRANS: Button text for adding an OpenID URL.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Add"
 msgstr "أض�"
 
 #. TRANS: Header on OpenID settings page.
-#, fuzzy
 msgctxt "HEADER"
 msgid "Remove OpenID"
-msgstr "أزل الهوية الم�توحة"
+msgstr "إزالة هوية م�توحة"
 
 #. TRANS: Form guide.
 msgid ""
@@ -518,7 +524,6 @@ msgstr "يمكنك إزالة هوية م�توحة من حسابك بن�ر ا
 
 #. TRANS: Button text to remove an OpenID.
 #. TRANS: Button text to remove an OpenID trustroot.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "أزل"
@@ -536,7 +541,6 @@ msgstr ""
 "القائمة لمنعه من الوصول إلى هويتك الم�توحة."
 
 #. TRANS: Form validation error if no OpenID providers can be added.
-#, fuzzy
 msgid "Cannot add new providers."
 msgstr "تعذرت إضا�ة مزودين جدد."
 
@@ -554,7 +558,7 @@ msgstr ""
 
 #. TRANS: Form validation error for a non-existing OpenID.
 msgid "No such OpenID."
-msgstr "لا هوية م�توحة كهذه."
+msgstr "الهوية الم�توحة المقصودة غير موجودة."
 
 #. TRANS: Form validation error if OpenID is connected to another user.
 msgid "That OpenID does not belong to you."
@@ -591,15 +595,14 @@ msgid "Login with an [OpenID](%%doc.openid%%) account."
 msgstr "ل�ج بحساب [هوية م�توحة](%%doc.openid%%)"
 
 #. TRANS: OpenID plugin message. Title.
-#, fuzzy
 msgctxt "TITLE"
 msgid "OpenID Login"
 msgstr "ولوج الهوية الم�توحة"
 
-#, fuzzy
+#. TRANS: Field label.
 msgctxt "LABEL"
 msgid "OpenID provider"
-msgstr "مزود هوية م�توحة"
+msgstr "مزود الهوية الم�توحة"
 
 #. TRANS: OpenID plugin logon form checkbox label for setting to put the OpenID information in a cookie.
 msgid "Remember me"
@@ -613,9 +616,3 @@ msgstr "ل�ج تلقائيًا �ي المستقبل؛ هذا الخيار لي
 msgctxt "BUTTON"
 msgid "Login"
 msgstr "ل�ج"
-
-#~ msgid "Continue"
-#~ msgstr "استمر"
-
-#~ msgid "OpenID"
-#~ msgstr "الهوية الم�توحة"
diff --git a/plugins/OpenID/locale/ca/LC_MESSAGES/OpenID.po b/plugins/OpenID/locale/ca/LC_MESSAGES/OpenID.po
index 1b48ef38c0..1d8da991a3 100644
--- a/plugins/OpenID/locale/ca/LC_MESSAGES/OpenID.po
+++ b/plugins/OpenID/locale/ca/LC_MESSAGES/OpenID.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - OpenID to Catalan (Català)
+# Translation of StatusNet - OpenID to Catalan (català)
 # Exported from translatewiki.net
 #
 # Author: Toniher
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OpenID\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:27+0000\n"
-"Language-Team: Catalan <http://translatewiki.net/wiki/Portal:ca>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:25+0000\n"
+"Language-Team: Catalan <https://translatewiki.net/wiki/Portal:ca>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:47+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-10-10 14:11:22+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ca\n"
 "X-Message-Group: #out-statusnet-plugin-openid\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -33,12 +33,12 @@ msgstr ""
 "l'OpenID, no directament."
 
 #. TRANS: Page notice. %s is a trustroot name.
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "%s has asked to verify your identity. Click Continue to verify your identity "
 "and login without creating a new password."
 msgstr ""
-"%s  us ha demanat verificar la identitat. Feu clic a Continuar per verificar "
+"%s  us ha demanat verificar la identitat. Feu clic a Continua per verificar "
 "la vostra identitat i iniciar una sessió sense crear cap contrasenya nova."
 
 #. TRANS: Button text to continue OpenID identity verification.
@@ -48,16 +48,18 @@ msgid "Continue"
 msgstr "Continua"
 
 #. TRANS: Button text to cancel OpenID identity verification.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Cancel"
 msgstr "Cancel·la"
 
+#. TRANS: Client exception thrown when an action is not available.
+msgid "Unavailable action."
+msgstr "Acció no disponible."
+
 #. TRANS: Tooltip for main menu option "Login"
-#, fuzzy
 msgctxt "TOOLTIP"
 msgid "Login to the site."
-msgstr "Inicia una sessió al lloc"
+msgstr "Inicia una sessió al lloc."
 
 #. TRANS: Main menu option when not logged in to log in
 msgctxt "MENU"
@@ -75,10 +77,9 @@ msgid "Help"
 msgstr "Ajuda"
 
 #. TRANS: Tooltip for main menu option "Search"
-#, fuzzy
 msgctxt "TOOLTIP"
 msgid "Search for people or text."
-msgstr "Cerca gent o un text"
+msgstr "Cerca gent o un text."
 
 #. TRANS: Main menu option when logged in or when the StatusNet instance is not private
 msgctxt "MENU"
@@ -93,26 +94,46 @@ msgid "OpenID"
 msgstr "OpenID"
 
 #. TRANS: OpenID plugin tooltip for logon menu item.
-#, fuzzy
 msgid "Login or register with OpenID."
-msgstr "Inici de sessió o registre amb OpenID"
+msgstr "Inici de sessió o registre amb OpenID."
 
 #. TRANS: OpenID plugin tooltip for user settings menu item.
-#, fuzzy
 msgid "Add or remove OpenIDs."
-msgstr "Afegeix o suprimeix connexions OpenID"
+msgstr "Afegeix o elimina connexions OpenID."
 
-#. TRANS: Item on help page. This message contains Markdown links in the form [description](link).
+#. TRANS: Page notice for logged in users to try and get them to add an OpenID account to their StatusNet account.
+#. TRANS: This message contains Markdown links in the form (description)[link].
 #, php-format
 msgid ""
-"* [OpenID](%%doc.openid%%) - What OpenID is and how to use it with this "
-"service."
+"(Have an [OpenID](http://openid.net/)? [Add an OpenID to your account](%%"
+"action.openidsettings%%)!"
 msgstr ""
+"(Teniu un [OpenID](http://openid.net/)? [Afegeix una connexió OpenID al "
+"vostre compte](%%action.openidsettings%%)!"
+
+#. TRANS: Page notice for anonymous users to try and get them to register with an OpenID account.
+#. TRANS: This message contains Markdown links in the form (description)[link].
+#, php-format
+msgid ""
+"(Have an [OpenID](http://openid.net/)? Try our [OpenID registration](%%"
+"action.openidlogin%%)!)"
+msgstr ""
+"(Teniu un [OpenID](http://openid.net/)? Proveu el nostre [registre OpenID](%%"
+"action.openidlogin%%)!)"
+
+#. TRANS: Page notice on the login page to try and get them to log on with an OpenID account.
+#. TRANS: This message contains Markdown links in the form (description)[link].
+#, php-format
+msgid ""
+"(Have an [OpenID](http://openid.net/)? Try our [OpenID login](%%action."
+"openidlogin%%)!)"
+msgstr ""
+"(Teniu un [OpenID](http://openid.net/)? Proveu el nostre [inici de sessió "
+"amb OpenID](%%action.openidlogin%%)!)"
 
 #. TRANS: Tooltip for OpenID configuration menu item.
-#, fuzzy
 msgid "OpenID configuration."
-msgstr "Configuració de l'OpenID"
+msgstr "Configuració de l'OpenID."
 
 #. TRANS: Plugin description.
 msgid "Use <a href=\"http://openid.net/\">OpenID</a> to login to the site."
@@ -120,7 +141,6 @@ msgstr ""
 "Fa servir <a href=\"http://openid.net/\">OpenID</a> per connectar-se al lloc."
 
 #. TRANS: OpenID plugin logon form legend.
-#, fuzzy
 msgctxt "LEGEND"
 msgid "OpenID login"
 msgstr "Inici de sessió amb OpenID"
@@ -145,9 +165,8 @@ msgstr "URL de la connexió OpenID"
 
 #. TRANS: OpenID plugin logon form field instructions.
 #. TRANS: OpenID plugin logon form field title.
-#, fuzzy
 msgid "Your OpenID URL."
-msgstr "L'URL del vostre OpenID"
+msgstr "L'URL del vostre OpenID."
 
 #. TRANS: Client error message trying to log on with OpenID while already logged on.
 msgid "Already logged in."
@@ -160,7 +179,6 @@ msgstr ""
 "S'ha produït un problema amb el vostre testimoni de sessió. Proveu-ho de nou."
 
 #. TRANS: Message given if user does not agree with the site's license.
-#, fuzzy
 msgid "You cannot register if you do not agree to the license."
 msgstr "No podeu registrar-vos-hi si no accepteu la llicència."
 
@@ -170,7 +188,7 @@ msgstr "S'ha produït un error desconegut."
 
 #. TRANS: Instructions given after a first successful logon using OpenID.
 #. TRANS: %s is the site name.
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "This is the first time you have logged into %s so we must connect your "
 "OpenID to a local account. You can either create a new account, or connect "
@@ -181,7 +199,6 @@ msgstr ""
 "connectar-vos-hi amb un compte ja existent si en teniu un."
 
 #. TRANS: Title
-#, fuzzy
 msgctxt "TITLE"
 msgid "OpenID Account Setup"
 msgstr "Configuració del compte OpenID"
@@ -200,7 +217,7 @@ msgstr "Nou sobrenom"
 
 #. TRANS: Field title.
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
-msgstr ""
+msgstr "1-64 lletres en minúscules o nombres, sense puntuacions o espais."
 
 #. TRANS: Field label.
 msgid "Email"
@@ -219,6 +236,9 @@ msgid ""
 "My text and files are available under %s except this private data: password, "
 "email address, IM address, and phone number."
 msgstr ""
+"El meu text i fitxers estan disponibles sota %s excepte pel que fa aquestes "
+"dades privades: contrasenya, adreça electrònica, adreça de MI i número de "
+"telèfon."
 
 #. TRANS: Button label in form in which to create a new user on the site for an OpenID.
 msgctxt "BUTTON"
@@ -257,17 +277,16 @@ msgstr "S'ha cancel·lat l'autenticació OpenID."
 #. TRANS: OpenID authentication failed; display the error message. %s is the error message.
 #. TRANS: OpenID authentication failed; display the error message.
 #. TRANS: %s is the error message.
-#, fuzzy, php-format
+#, php-format
 msgid "OpenID authentication failed: %s."
-msgstr "Ha fallat l'autenticació OpenID: %s"
+msgstr "Ha fallat l'autenticació OpenID: %s."
 
 #. TRANS: Message displayed when OpenID authentication is aborted.
 #. TRANS: OpenID authentication error.
-#, fuzzy
 msgid ""
 "OpenID authentication aborted: You are not allowed to login to this site."
 msgstr ""
-"S'ha interromput l'autenticació OpenD: no teniu permisos per iniciar una "
+"S'ha interromput l'autenticació OpenID: no teniu permisos per iniciar una "
 "sessió en aquest lloc."
 
 #. TRANS: OpenID plugin message. No new user registration is allowed on the site.
@@ -315,15 +334,15 @@ msgstr "No és un OpenID vàlid."
 
 #. TRANS: OpenID plugin server error. Given when the OpenID authentication request fails.
 #. TRANS: %s is the failure message.
-#, fuzzy, php-format
+#, php-format
 msgid "OpenID failure: %s."
-msgstr "Fallada de l'OpenID: %s"
+msgstr "Fallada de l'OpenID: %s."
 
 #. TRANS: OpenID plugin server error. Given when the OpenID authentication request cannot be redirected.
 #. TRANS: %s is the failure message.
-#, fuzzy, php-format
+#, php-format
 msgid "Could not redirect to server: %s."
-msgstr "No es pot redirigir al servidor: %s"
+msgstr "No s'ha pogut redirigir al servidor: %s."
 
 #. TRANS: OpenID plugin user instructions.
 msgid ""
@@ -363,7 +382,6 @@ msgstr ""
 "proveu de prémer el botó de sota."
 
 #. TRANS: Title for OpenID bridge administration page.
-#, fuzzy
 msgctxt "TITLE"
 msgid "OpenID Settings"
 msgstr "Paràmetres de l'OpenID"
@@ -381,7 +399,6 @@ msgid "Invalid team name. Maximum length is 255 characters."
 msgstr ""
 
 #. TRANS: Fieldset legend.
-#, fuzzy
 msgctxt "LEGEND"
 msgid "Trusted provider"
 msgstr "Proveïdor de confiança"
@@ -426,7 +443,6 @@ msgstr ""
 "Només permet sessions d'usuari d'un equip donat (extensió del Launchpad)."
 
 #. TRANS: Fieldset legend.
-#, fuzzy
 msgctxt "LEGEND"
 msgid "Options"
 msgstr "Opcions"
@@ -442,7 +458,6 @@ msgid ""
 msgstr ""
 
 #. TRANS: Button text to save OpenID settings.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Desa"
@@ -468,16 +483,14 @@ msgid "Error connecting user."
 msgstr "S'ha produït un error en connectar l'usuari"
 
 #. TRANS: Message in case the user or the user profile cannot be saved in StatusNet.
-#, fuzzy
 msgid "Error updating profile."
-msgstr "S'ha produït un error en actualitzar el perfil"
+msgstr "S'ha produït un error en actualitzar el perfil."
 
 #. TRANS: Title after getting the status of the OpenID authorisation request.
 msgid "OpenID Login"
 msgstr "Inici de sessió amb OpenID"
 
 #. TRANS: Title of OpenID settings page for a user.
-#, fuzzy
 msgctxt "TITLE"
 msgid "OpenID settings"
 msgstr "Paràmetres de l'OpenID"
@@ -494,7 +507,6 @@ msgstr ""
 "des d'aquí."
 
 #. TRANS: Fieldset legend.
-#, fuzzy
 msgctxt "LEGEND"
 msgid "Add OpenID"
 msgstr "Afegeix una connexió OpenID"
@@ -508,16 +520,14 @@ msgstr ""
 "caixa a continuació i feu clic a «Afegeix»."
 
 #. TRANS: Button text for adding an OpenID URL.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Add"
 msgstr "Afegeix"
 
 #. TRANS: Header on OpenID settings page.
-#, fuzzy
 msgctxt "HEADER"
 msgid "Remove OpenID"
-msgstr "Suprimeix la connexió OpenID"
+msgstr "Elinina la connexió OpenID"
 
 #. TRANS: Form guide.
 msgid ""
@@ -537,10 +547,9 @@ msgstr ""
 
 #. TRANS: Button text to remove an OpenID.
 #. TRANS: Button text to remove an OpenID trustroot.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Remove"
-msgstr "Suprimeix"
+msgstr "Elimina"
 
 #. TRANS: Fieldset legend.
 msgid "OpenID Trusted Sites"
@@ -553,7 +562,6 @@ msgid ""
 msgstr ""
 
 #. TRANS: Form validation error if no OpenID providers can be added.
-#, fuzzy
 msgid "Cannot add new providers."
 msgstr "No es poden afegir proveïdors nous."
 
@@ -608,12 +616,11 @@ msgid "Login with an [OpenID](%%doc.openid%%) account."
 msgstr "Inicia una sessió amb un compte [OpenID](%%doc.openid%%)."
 
 #. TRANS: OpenID plugin message. Title.
-#, fuzzy
 msgctxt "TITLE"
 msgid "OpenID Login"
 msgstr "Inici de sessió amb OpenID"
 
-#, fuzzy
+#. TRANS: Field label.
 msgctxt "LABEL"
 msgid "OpenID provider"
 msgstr "Proveïdor d'OpenID"
@@ -632,9 +639,3 @@ msgstr ""
 msgctxt "BUTTON"
 msgid "Login"
 msgstr "Inicia una sessió"
-
-#~ msgid "Continue"
-#~ msgstr "Continua"
-
-#~ msgid "OpenID"
-#~ msgstr "OpenID"
diff --git a/plugins/OpenID/locale/de/LC_MESSAGES/OpenID.po b/plugins/OpenID/locale/de/LC_MESSAGES/OpenID.po
index db4308840a..fc66574e3f 100644
--- a/plugins/OpenID/locale/de/LC_MESSAGES/OpenID.po
+++ b/plugins/OpenID/locale/de/LC_MESSAGES/OpenID.po
@@ -2,10 +2,14 @@
 # Exported from translatewiki.net
 #
 # Author: Apmon
+# Author: DaSch
 # Author: Fujnky
 # Author: Giftpflanze
+# Author: Inkowik
 # Author: MF-Warburg
 # Author: The Evil IP address
+# Author: Tiin
+# Author: Xqt
 # --
 # This file is distributed under the same license as the StatusNet package.
 #
@@ -13,14 +17,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OpenID\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:27+0000\n"
-"Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:25+0000\n"
+"Language-Team: German <https://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:47+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-10-10 14:11:22+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-openid\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -37,7 +41,7 @@ msgstr ""
 "nicht direkt."
 
 #. TRANS: Page notice. %s is a trustroot name.
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "%s has asked to verify your identity. Click Continue to verify your identity "
 "and login without creating a new password."
@@ -53,13 +57,15 @@ msgid "Continue"
 msgstr "Weiter"
 
 #. TRANS: Button text to cancel OpenID identity verification.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Cancel"
 msgstr "Abbrechen"
 
+#. TRANS: Client exception thrown when an action is not available.
+msgid "Unavailable action."
+msgstr "Aktion nicht verfügbar."
+
 #. TRANS: Tooltip for main menu option "Login"
-#, fuzzy
 msgctxt "TOOLTIP"
 msgid "Login to the site."
 msgstr "Auf der Seite anmelden"
@@ -80,10 +86,9 @@ msgid "Help"
 msgstr "Hilfe"
 
 #. TRANS: Tooltip for main menu option "Search"
-#, fuzzy
 msgctxt "TOOLTIP"
 msgid "Search for people or text."
-msgstr "Suche nach Leuten oder Text"
+msgstr "Suche nach Personen oder Text"
 
 #. TRANS: Main menu option when logged in or when the StatusNet instance is not private
 msgctxt "MENU"
@@ -98,26 +103,46 @@ msgid "OpenID"
 msgstr "OpenID"
 
 #. TRANS: OpenID plugin tooltip for logon menu item.
-#, fuzzy
 msgid "Login or register with OpenID."
-msgstr "Anmelden oder Registrieren per OpenID"
+msgstr "Anmelden oder Registrieren mit OpenID"
 
 #. TRANS: OpenID plugin tooltip for user settings menu item.
-#, fuzzy
 msgid "Add or remove OpenIDs."
-msgstr "Hinzufügen oder Entfernen von OpenIDs"
+msgstr "Hinzufügen oder Entfernen von OpenIDs."
 
-#. TRANS: Item on help page. This message contains Markdown links in the form [description](link).
+#. TRANS: Page notice for logged in users to try and get them to add an OpenID account to their StatusNet account.
+#. TRANS: This message contains Markdown links in the form (description)[link].
 #, php-format
 msgid ""
-"* [OpenID](%%doc.openid%%) - What OpenID is and how to use it with this "
-"service."
+"(Have an [OpenID](http://openid.net/)? [Add an OpenID to your account](%%"
+"action.openidsettings%%)!"
 msgstr ""
+"(Besitzt du eine [OpenID](http://openid.net/)? [Füge eine OpenID zu deinem "
+"Account hinzu](%%action.openidsettings%%)!"
+
+#. TRANS: Page notice for anonymous users to try and get them to register with an OpenID account.
+#. TRANS: This message contains Markdown links in the form (description)[link].
+#, php-format
+msgid ""
+"(Have an [OpenID](http://openid.net/)? Try our [OpenID registration](%%"
+"action.openidlogin%%)!)"
+msgstr ""
+"(Besitzt du eine [OpenID](http://openid.net/)? Teste unsere [OpenID-"
+"Registrierung](%%action.openidlogin%%)!)"
+
+#. TRANS: Page notice on the login page to try and get them to log on with an OpenID account.
+#. TRANS: This message contains Markdown links in the form (description)[link].
+#, php-format
+msgid ""
+"(Have an [OpenID](http://openid.net/)? Try our [OpenID login](%%action."
+"openidlogin%%)!)"
+msgstr ""
+"(Besitzt du eine [OpenID](http://openid.net/)? Teste unsere [OpenID-"
+"Anmeldung](%%action.openidlogin%%)!)"
 
 #. TRANS: Tooltip for OpenID configuration menu item.
-#, fuzzy
 msgid "OpenID configuration."
-msgstr "OpenId-Konfiguration"
+msgstr "OpenID-Konfiguration."
 
 #. TRANS: Plugin description.
 msgid "Use <a href=\"http://openid.net/\">OpenID</a> to login to the site."
@@ -126,7 +151,6 @@ msgstr ""
 "der Seite"
 
 #. TRANS: OpenID plugin logon form legend.
-#, fuzzy
 msgctxt "LEGEND"
 msgid "OpenID login"
 msgstr "OpenID-Benutzername"
@@ -153,9 +177,8 @@ msgstr "OpenID-URL"
 
 #. TRANS: OpenID plugin logon form field instructions.
 #. TRANS: OpenID plugin logon form field title.
-#, fuzzy
 msgid "Your OpenID URL."
-msgstr "Ihre OpenID URL"
+msgstr "Deine OpenID-URL"
 
 #. TRANS: Client error message trying to log on with OpenID while already logged on.
 msgid "Already logged in."
@@ -167,7 +190,6 @@ msgid "There was a problem with your session token. Try again, please."
 msgstr "Es gab ein Problem mit deinem Sitzungstoken. Bitte versuche es erneut."
 
 #. TRANS: Message given if user does not agree with the site's license.
-#, fuzzy
 msgid "You cannot register if you do not agree to the license."
 msgstr ""
 "Du kannst dich nicht registrieren, wenn du die Lizenz nicht akzeptierst."
@@ -178,7 +200,7 @@ msgstr "Ein unbekannter Fehler ist aufgetreten."
 
 #. TRANS: Instructions given after a first successful logon using OpenID.
 #. TRANS: %s is the site name.
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "This is the first time you have logged into %s so we must connect your "
 "OpenID to a local account. You can either create a new account, or connect "
@@ -187,10 +209,9 @@ msgstr ""
 "Dies ist das erste Mal, dass du dich auf %s anmeldest, sodass wir deine "
 "OpenID mit einem lokalen Benutzerkonto verbinden müssen. Du kannst entweder "
 "ein neues Benutzerkonto erstellen oder dich mit deinem existierendem "
-"Benutzerkonto verbinden."
+"Benutzerkonto verbinden, wenn du eines hast."
 
 #. TRANS: Title
-#, fuzzy
 msgctxt "TITLE"
 msgid "OpenID Account Setup"
 msgstr "OpenID Konto-Setup"
@@ -268,17 +289,16 @@ msgstr "OpenID-Authentifizierung abgebrochen."
 #. TRANS: OpenID authentication failed; display the error message. %s is the error message.
 #. TRANS: OpenID authentication failed; display the error message.
 #. TRANS: %s is the error message.
-#, fuzzy, php-format
+#, php-format
 msgid "OpenID authentication failed: %s."
-msgstr "OpenID-Authentifizierung gescheitert: %s"
+msgstr "OpenID-Authentifizierung ist gescheitert: %s"
 
 #. TRANS: Message displayed when OpenID authentication is aborted.
 #. TRANS: OpenID authentication error.
-#, fuzzy
 msgid ""
 "OpenID authentication aborted: You are not allowed to login to this site."
 msgstr ""
-"OpenID-Authentifizierung abgebrochen: du darfst dich nicht auf dieser Seite "
+"OpenID-Authentifizierung abgebrochen: Du darfst dich nicht auf dieser Seite "
 "anmelden."
 
 #. TRANS: OpenID plugin message. No new user registration is allowed on the site.
@@ -326,15 +346,15 @@ msgstr "Keine gültige OpenID."
 
 #. TRANS: OpenID plugin server error. Given when the OpenID authentication request fails.
 #. TRANS: %s is the failure message.
-#, fuzzy, php-format
+#, php-format
 msgid "OpenID failure: %s."
-msgstr "OpenId-Fehler: %s"
+msgstr "OpenID-Fehler: %s."
 
 #. TRANS: OpenID plugin server error. Given when the OpenID authentication request cannot be redirected.
 #. TRANS: %s is the failure message.
-#, fuzzy, php-format
+#, php-format
 msgid "Could not redirect to server: %s."
-msgstr "Konnte keine Verbindung zum Server erstellen: %s"
+msgstr "Konnte keine Verbindung zum Server erstellen: %s."
 
 #. TRANS: OpenID plugin user instructions.
 msgid ""
@@ -374,7 +394,6 @@ msgstr ""
 "wirst, versuche den Button unten zu klicken."
 
 #. TRANS: Title for OpenID bridge administration page.
-#, fuzzy
 msgctxt "TITLE"
 msgid "OpenID Settings"
 msgstr "OpenID-Einstellungen"
@@ -384,17 +403,14 @@ msgid "OpenID settings"
 msgstr "OpenID-Einstellungen"
 
 #. TRANS: Client error displayed when OpenID provider URL is too long.
-#, fuzzy
 msgid "Invalid provider URL. Maximum length is 255 characters."
 msgstr "Ungültige Provider-URL. Maximale Länge beträgt 255 Zeichen."
 
 #. TRANS: Client error displayed when Launchpad team name is too long.
-#, fuzzy
 msgid "Invalid team name. Maximum length is 255 characters."
-msgstr "Ungültiger Teamnamen. Maximale Länge beträgt 255 Zeichen."
+msgstr "Ungültiger Teamname. Maximale Länge beträgt 255 Zeichen."
 
 #. TRANS: Fieldset legend.
-#, fuzzy
 msgctxt "LEGEND"
 msgid "Trusted provider"
 msgstr "Vertrauenswürdiger Provider"
@@ -445,7 +461,6 @@ msgstr ""
 "(Launchpad-Erweiterung)."
 
 #. TRANS: Fieldset legend.
-#, fuzzy
 msgctxt "LEGEND"
 msgid "Options"
 msgstr "Optionen"
@@ -463,7 +478,6 @@ msgstr ""
 "Passwort-Authentifizierung aller Benutzer!"
 
 #. TRANS: Button text to save OpenID settings.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Speichern"
@@ -489,16 +503,14 @@ msgid "Error connecting user."
 msgstr "Fehler beim Verbinden des Benutzers."
 
 #. TRANS: Message in case the user or the user profile cannot be saved in StatusNet.
-#, fuzzy
 msgid "Error updating profile."
-msgstr "Fehler beim Aktualisieren des Profils"
+msgstr "Fehler beim Aktualisieren des Profils."
 
 #. TRANS: Title after getting the status of the OpenID authorisation request.
 msgid "OpenID Login"
 msgstr "OpenID-Anmeldung"
 
 #. TRANS: Title of OpenID settings page for a user.
-#, fuzzy
 msgctxt "TITLE"
 msgid "OpenID settings"
 msgstr "OpenID-Einstellungen"
@@ -514,7 +526,6 @@ msgstr ""
 "Benutzerkonto anzumelden. Verwalte deine verknüpften OpenIDs von hier aus."
 
 #. TRANS: Fieldset legend.
-#, fuzzy
 msgctxt "LEGEND"
 msgid "Add OpenID"
 msgstr "OpenID hinzufügen"
@@ -528,13 +539,11 @@ msgstr ""
 "nachfolgenden Feld ein und klicke auf „Hinzufügen“."
 
 #. TRANS: Button text for adding an OpenID URL.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Add"
 msgstr "Hinzufügen"
 
 #. TRANS: Header on OpenID settings page.
-#, fuzzy
 msgctxt "HEADER"
 msgid "Remove OpenID"
 msgstr "Entfernen der OpenID"
@@ -557,7 +566,6 @@ msgstr ""
 
 #. TRANS: Button text to remove an OpenID.
 #. TRANS: Button text to remove an OpenID trustroot.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "Entfernen"
@@ -576,9 +584,8 @@ msgstr ""
 "den Zugriff auf deine OpenID zu verweigern."
 
 #. TRANS: Form validation error if no OpenID providers can be added.
-#, fuzzy
 msgid "Cannot add new providers."
-msgstr "Kann keine neuen Provider hinzufügen"
+msgstr "Kann keine neuen Provider hinzufügen."
 
 #. TRANS: Unexpected form validation error.
 msgid "Something weird happened."
@@ -589,9 +596,8 @@ msgid "No such OpenID trustroot."
 msgstr "Keine solche OpenID trustroot."
 
 #. TRANS: Success message after removing trustroots.
-#, fuzzy
 msgid "Trustroots removed."
-msgstr "Trustroots entfernt"
+msgstr "Trustroots entfernt."
 
 #. TRANS: Form validation error for a non-existing OpenID.
 msgid "No such OpenID."
@@ -632,12 +638,11 @@ msgid "Login with an [OpenID](%%doc.openid%%) account."
 msgstr "Mit einem [OpenID](%%doc.openid%%)-Benutzerkonto anmelden."
 
 #. TRANS: OpenID plugin message. Title.
-#, fuzzy
 msgctxt "TITLE"
 msgid "OpenID Login"
 msgstr "OpenID-Anmeldung"
 
-#, fuzzy
+#. TRANS: Field label.
 msgctxt "LABEL"
 msgid "OpenID provider"
 msgstr "OpenID-Provider"
@@ -654,9 +659,3 @@ msgstr "Automatisch anmelden; nicht bei gemeinsam genutzten PCs einsetzen!"
 msgctxt "BUTTON"
 msgid "Login"
 msgstr "Anmelden"
-
-#~ msgid "Continue"
-#~ msgstr "Weiter"
-
-#~ msgid "OpenID"
-#~ msgstr "OpenID"
diff --git a/plugins/OpenID/locale/es/LC_MESSAGES/OpenID.po b/plugins/OpenID/locale/es/LC_MESSAGES/OpenID.po
new file mode 100644
index 0000000000..364ce8c178
--- /dev/null
+++ b/plugins/OpenID/locale/es/LC_MESSAGES/OpenID.po
@@ -0,0 +1,660 @@
+# Translation of StatusNet - OpenID to Spanish (español)
+# Exported from translatewiki.net
+#
+# Author: Armando-Martin
+# Author: Danke7
+# Author: Od1n
+# Author: Peter17
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - OpenID\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:25+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-10-10 14:11:22+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Title for identity verification page.
+msgid "OpenID Identity Verification"
+msgstr "Verificación de identidad OpenID"
+
+#. TRANS: Client error when visiting page directly.
+msgid ""
+"This page should only be reached during OpenID processing, not directly."
+msgstr ""
+"A esta página debería llegarse unicamente durante el proceso de verificación "
+"OpenID, no directamente."
+
+#. TRANS: Page notice. %s is a trustroot name.
+#, php-format
+msgid ""
+"%s has asked to verify your identity. Click Continue to verify your identity "
+"and login without creating a new password."
+msgstr ""
+"%s ha pedido verificar su identidad. Haga clic en Continuar para verificar "
+"su identidad e inicie sesión sin crear una nueva contraseña."
+
+#. TRANS: Button text to continue OpenID identity verification.
+#. TRANS: button label for OAuth authorization page when needing OpenID authentication first.
+msgctxt "BUTTON"
+msgid "Continue"
+msgstr "Continuar"
+
+#. TRANS: Button text to cancel OpenID identity verification.
+msgctxt "BUTTON"
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. TRANS: Client exception thrown when an action is not available.
+msgid "Unavailable action."
+msgstr "Acción no disponible."
+
+#. TRANS: Tooltip for main menu option "Login"
+msgctxt "TOOLTIP"
+msgid "Login to the site."
+msgstr "Iniciar sesión en el sitio"
+
+#. TRANS: Main menu option when not logged in to log in
+msgctxt "MENU"
+msgid "Login"
+msgstr "Iniciar sesión"
+
+#. TRANS: Tooltip for main menu option "Help"
+msgctxt "TOOLTIP"
+msgid "Help me!"
+msgstr "¡Ayúdame!"
+
+#. TRANS: Main menu option for help on the StatusNet site
+msgctxt "MENU"
+msgid "Help"
+msgstr "Ayuda"
+
+#. TRANS: Tooltip for main menu option "Search"
+msgctxt "TOOLTIP"
+msgid "Search for people or text."
+msgstr "Buscar personas o texto."
+
+#. TRANS: Main menu option when logged in or when the StatusNet instance is not private
+msgctxt "MENU"
+msgid "Search"
+msgstr "Buscar"
+
+#. TRANS: OpenID plugin menu item on site logon page.
+#. TRANS: OpenID plugin menu item on user settings page.
+#. TRANS: OpenID configuration menu item.
+msgctxt "MENU"
+msgid "OpenID"
+msgstr "OpenID"
+
+#. TRANS: OpenID plugin tooltip for logon menu item.
+msgid "Login or register with OpenID."
+msgstr "Inicie sesión o regístrese con OpenID."
+
+#. TRANS: OpenID plugin tooltip for user settings menu item.
+msgid "Add or remove OpenIDs."
+msgstr "Añadir o eliminar identificadores OpenID."
+
+#. TRANS: Page notice for logged in users to try and get them to add an OpenID account to their StatusNet account.
+#. TRANS: This message contains Markdown links in the form (description)[link].
+#, php-format
+msgid ""
+"(Have an [OpenID](http://openid.net/)? [Add an OpenID to your account](%%"
+"action.openidsettings%%)!"
+msgstr ""
+"(¿Tiene un identificador [OpenID](http://openid.net/)? ¡[Añada un OpenID a "
+"su cuenta](%%action.openidsettings%%)!"
+
+#. TRANS: Page notice for anonymous users to try and get them to register with an OpenID account.
+#. TRANS: This message contains Markdown links in the form (description)[link].
+#, php-format
+msgid ""
+"(Have an [OpenID](http://openid.net/)? Try our [OpenID registration](%%"
+"action.openidlogin%%)!)"
+msgstr ""
+"(¿Tiene un identificador [OpenID](http://openid.net/)? ¡[Pruebe nuestro "
+"[registro de OpenID](%%action.openidlogin%%)!)"
+
+#. TRANS: Page notice on the login page to try and get them to log on with an OpenID account.
+#. TRANS: This message contains Markdown links in the form (description)[link].
+#, php-format
+msgid ""
+"(Have an [OpenID](http://openid.net/)? Try our [OpenID login](%%action."
+"openidlogin%%)!)"
+msgstr ""
+"(¿Tiene un identificador [OpenID](http://openid.net/)? ¡[Pruebe nuestro "
+"[inicio de sesión de OpenID](%%action.openidlogin%%)!)"
+
+#. TRANS: Tooltip for OpenID configuration menu item.
+msgid "OpenID configuration."
+msgstr "Configuración de OpenID."
+
+#. TRANS: Plugin description.
+msgid "Use <a href=\"http://openid.net/\">OpenID</a> to login to the site."
+msgstr ""
+"Utilice <a href=\"http://openid.net/\">OpenID</a> para iniciar sesión en el "
+"sitio."
+
+#. TRANS: OpenID plugin logon form legend.
+msgctxt "LEGEND"
+msgid "OpenID login"
+msgstr "Inicio de sesión con OpenID"
+
+#. TRANS: Field label.
+msgid "OpenID provider"
+msgstr "Proveedor del identificador OpenID"
+
+#. TRANS: Form guide.
+msgid "Enter your username."
+msgstr "Introduzca su nombre de usuario."
+
+#. TRANS: Form guide.
+msgid "You will be sent to the provider's site for authentication."
+msgstr "Se le enviará al sitio del proveedor para autenticación."
+
+#. TRANS: OpenID plugin logon form field label.
+#. TRANS: Field label.
+#. TRANS: OpenID plugin logon form field label.
+msgid "OpenID URL"
+msgstr "Dirección URL del identificador OpenID"
+
+#. TRANS: OpenID plugin logon form field instructions.
+#. TRANS: OpenID plugin logon form field title.
+msgid "Your OpenID URL."
+msgstr "Su dirección URL del identificador OpenID"
+
+#. TRANS: Client error message trying to log on with OpenID while already logged on.
+msgid "Already logged in."
+msgstr "Ya ha iniciado sesión."
+
+#. TRANS: Message given when there is a problem with the user's session token.
+#. TRANS: Client error displayed when the session token does not match or is not given.
+msgid "There was a problem with your session token. Try again, please."
+msgstr ""
+"Hubo un problema con su clave (token) de sesión. Inténtelo de nuevo, por "
+"favor."
+
+#. TRANS: Message given if user does not agree with the site's license.
+msgid "You cannot register if you do not agree to the license."
+msgstr "No se puede registrar si no está de acuerdo con la licencia."
+
+#. TRANS: Messag given on an unknown error.
+msgid "An unknown error has occured."
+msgstr "Ha ocurrido un error desconocido."
+
+#. TRANS: Instructions given after a first successful logon using OpenID.
+#. TRANS: %s is the site name.
+#, php-format
+msgid ""
+"This is the first time you have logged into %s so we must connect your "
+"OpenID to a local account. You can either create a new account, or connect "
+"with your existing account, if you have one."
+msgstr ""
+"Esta es la primera vez que ha iniciado sesión en %s por lo que debemos "
+"conectar su identificador OpenID a una cuenta local. Puede crear una nueva "
+"cuenta o conectarse con una cuenta existente si ya tiene una."
+
+#. TRANS: Title
+msgctxt "TITLE"
+msgid "OpenID Account Setup"
+msgstr "Configuración de la cuenta de OpenID"
+
+#. TRANS: Fieldset legend.
+msgid "Create new account"
+msgstr "Crear nueva cuenta"
+
+#. TRANS: Form guide.
+msgid "Create a new user with this nickname."
+msgstr "Crear un nuevo usuario con este alias."
+
+#. TRANS: Field label.
+msgid "New nickname"
+msgstr "Nuevo alias"
+
+#. TRANS: Field title.
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
+msgstr ""
+"De 1 a 64 letras en minúscula o números, sin signos de puntuación ni "
+"espacios."
+
+#. TRANS: Field label.
+msgid "Email"
+msgstr "Correo electrónico"
+
+#. TRANS: Field title.
+msgid "Used only for updates, announcements, and password recovery."
+msgstr ""
+"Sólo se usa para actualizaciones, anuncios y recuperación de contraseñas"
+
+#. TRANS: OpenID plugin link text.
+#. TRANS: %s is a link to a license with the license name as link text.
+#, php-format
+msgid ""
+"My text and files are available under %s except this private data: password, "
+"email address, IM address, and phone number."
+msgstr ""
+"Mi texto y archivos están disponibles bajo %s con excepción de esta "
+"información privada: contraseña, dirección de correo electrónico, dirección "
+"de mensajería instantánea y número de teléfono."
+
+#. TRANS: Button label in form in which to create a new user on the site for an OpenID.
+msgctxt "BUTTON"
+msgid "Create"
+msgstr "Crear"
+
+#. TRANS: Used as form legend for form in which to connect an OpenID to an existing user on the site.
+msgid "Connect existing account"
+msgstr "Conectar a una cuenta existente"
+
+#. TRANS: User instructions for form in which to connect an OpenID to an existing user on the site.
+msgid ""
+"If you already have an account, login with your username and password to "
+"connect it to your OpenID."
+msgstr ""
+"Si ya tiene una cuenta, inicie sesión con su nombre de usuario y contraseña "
+"para conectarse a su identificador OpenID."
+
+#. TRANS: Field label in form in which to connect an OpenID to an existing user on the site.
+msgid "Existing nickname"
+msgstr "Alias existente"
+
+#. TRANS: Field label in form in which to connect an OpenID to an existing user on the site.
+msgid "Password"
+msgstr "Contraseña"
+
+#. TRANS: Button text in form in which to connect an OpenID to an existing user on the site.
+msgctxt "BUTTON"
+msgid "Connect"
+msgstr "Conectar"
+
+#. TRANS: Status message in case the response from the OpenID provider is that the logon attempt was cancelled.
+msgid "OpenID authentication cancelled."
+msgstr "La autenticación con OpenID se ha cancelado."
+
+#. TRANS: OpenID authentication failed; display the error message. %s is the error message.
+#. TRANS: OpenID authentication failed; display the error message.
+#. TRANS: %s is the error message.
+#, php-format
+msgid "OpenID authentication failed: %s."
+msgstr "Error de autenticación OpenID: %s."
+
+#. TRANS: Message displayed when OpenID authentication is aborted.
+#. TRANS: OpenID authentication error.
+msgid ""
+"OpenID authentication aborted: You are not allowed to login to this site."
+msgstr "Autenticación OpenID anulada: no puede iniciar sesión en este sitio."
+
+#. TRANS: OpenID plugin message. No new user registration is allowed on the site.
+#. TRANS: OpenID plugin message. No new user registration is allowed on the site without an invitation code, and none was provided.
+msgid "Registration not allowed."
+msgstr "Registro de usuario no permitido."
+
+#. TRANS: OpenID plugin message. No new user registration is allowed on the site without an invitation code, and the one provided was not valid.
+msgid "Not a valid invitation code."
+msgstr "No es un código de invitación válido."
+
+#. TRANS: OpenID plugin message. The entered new user name is blacklisted.
+msgid "Nickname not allowed."
+msgstr "Alias no permitido."
+
+#. TRANS: OpenID plugin message. The entered new user name is already used.
+msgid "Nickname already in use. Try another one."
+msgstr "El alias ya existe. Pruebe con otro."
+
+#. TRANS: OpenID plugin server error. A stored OpenID cannot be retrieved.
+#. TRANS: OpenID plugin server error. A stored OpenID cannot be found.
+msgid "Stored OpenID not found."
+msgstr "El identificador OpenID almacenado no se ha encontrado."
+
+#. TRANS: OpenID plugin server error.
+msgid "Creating new account for OpenID that already has a user."
+msgstr "Creando una nueva cuenta de OpenID que ya tiene un usuario."
+
+#. TRANS: OpenID plugin message.
+msgid "Invalid username or password."
+msgstr "Nombre de usuario o contraseña incorrectos."
+
+#. TRANS: OpenID plugin server error. The user or user profile could not be saved.
+msgid "Error connecting user to OpenID."
+msgstr "Error al conectar el usuario a OpenID."
+
+#. TRANS: OpenID plugin server error.
+msgid "Cannot instantiate OpenID consumer object."
+msgstr "No se puede crear una instancia de objeto de consumo de OpenID."
+
+#. TRANS: OpenID plugin message. Given when an OpenID is not valid.
+msgid "Not a valid OpenID."
+msgstr "No es un identificador OpenID válido."
+
+#. TRANS: OpenID plugin server error. Given when the OpenID authentication request fails.
+#. TRANS: %s is the failure message.
+#, php-format
+msgid "OpenID failure: %s."
+msgstr "Error de OpenID: %s."
+
+#. TRANS: OpenID plugin server error. Given when the OpenID authentication request cannot be redirected.
+#. TRANS: %s is the failure message.
+#, php-format
+msgid "Could not redirect to server: %s."
+msgstr "No se puede redirigir al servidor: %s."
+
+#. TRANS: OpenID plugin user instructions.
+msgid ""
+"This form should automatically submit itself. If not, click the submit "
+"button to go to your OpenID provider."
+msgstr ""
+"Este formulario debería enviarse automáticamente. Si no es así, haga clic en "
+"el botón Enviar para ir a su proveedor de OpenID."
+
+#. TRANS: OpenID plugin server error.
+msgid "Error saving the profile."
+msgstr "Error al guardar el perfil."
+
+#. TRANS: OpenID plugin server error.
+msgid "Error saving the user."
+msgstr "Error al guardar el usuario."
+
+#. TRANS: OpenID plugin client exception (403).
+msgid "Unauthorized URL used for OpenID login."
+msgstr ""
+"Se ha empleado una dirección URL no autorizada para inicio de sesión de "
+"OpenID."
+
+#. TRANS: Title
+msgid "OpenID Login Submission"
+msgstr "Envío de registro de identificador OpenID"
+
+#. TRANS: OpenID plugin message used while requesting authorization user's OpenID login provider.
+msgid "Requesting authorization from your login provider..."
+msgstr "Solicitando autorización de su proveedor de inicio de sesión..."
+
+#. TRANS: OpenID plugin message. User instruction while requesting authorization user's OpenID login provider.
+msgid ""
+"If you are not redirected to your login provider in a few seconds, try "
+"pushing the button below."
+msgstr ""
+"Si no es redirigido al proveedor de inicio de sesión en pocos segundos, "
+"inténtelo presionando el botón de abajo."
+
+#. TRANS: Title for OpenID bridge administration page.
+msgctxt "TITLE"
+msgid "OpenID Settings"
+msgstr "Configuración de OpenID"
+
+#. TRANS: Page instructions.
+msgid "OpenID settings"
+msgstr "Configuración de OpenID"
+
+#. TRANS: Client error displayed when OpenID provider URL is too long.
+msgid "Invalid provider URL. Maximum length is 255 characters."
+msgstr ""
+"La dirección URL del proveedor no es válida. La longitud máxima es de 255 "
+"caracteres."
+
+#. TRANS: Client error displayed when Launchpad team name is too long.
+msgid "Invalid team name. Maximum length is 255 characters."
+msgstr "Nombre de equipo incorrecto. La longitud máxima es de 255 caracteres."
+
+#. TRANS: Fieldset legend.
+msgctxt "LEGEND"
+msgid "Trusted provider"
+msgstr "Proveedor de confianza"
+
+#. TRANS: Form guide.
+msgid ""
+"By default, users are allowed to authenticate with any OpenID provider. If "
+"you are using your own OpenID service for shared sign-in, you can restrict "
+"access to only your own users here."
+msgstr ""
+"De forma predeterminada, los usuarios pueden autenticarse con cualquier "
+"proveedor de OpenID. Si está utilizando su propio servicio de OpenID para "
+"inicio de sesión compartida, puede restringir aquí el acceso solo para sus "
+"propios usuarios."
+
+#. TRANS: Field label.
+msgid "Provider URL"
+msgstr "Dirección URL del proveedor"
+
+#. TRANS: Field title.
+msgid ""
+"All OpenID logins will be sent to this URL; other providers may not be used."
+msgstr ""
+"Todos los inicios de sesión con OpenID se enviarán a esta dirección URL; no "
+"podrán utilizarse otros proveedores."
+
+#. TRANS: Checkbox label.
+msgid "Append a username to base URL"
+msgstr "Añada un nombre de usuario a la dirección URL base"
+
+#. TRANS: Checkbox title.
+msgid ""
+"Login form will show the base URL and prompt for a username to add at the "
+"end. Use when OpenID provider URL should be the profile page for individual "
+"users."
+msgstr ""
+"El formulario de inicio de sesión mostrará la dirección URL base y "
+"solicitará un nombre de usuario para agregar al final. Utilícelo cuando la "
+"dirección URL del proveedor de OpenID deba ser la página de perfil para los "
+"usuarios individuales."
+
+#. TRANS: Field label.
+msgid "Required team"
+msgstr "Es necesario un equipo"
+
+#. TRANS: Field title.
+msgid "Only allow logins from users in the given team (Launchpad extension)."
+msgstr ""
+"Sólo permite el inicio de sesión de los usuarios del equipo dado (extensión "
+"Launchpad)."
+
+#. TRANS: Fieldset legend.
+msgctxt "LEGEND"
+msgid "Options"
+msgstr "Opciones"
+
+#. TRANS: Checkbox label.
+msgid "Enable OpenID-only mode"
+msgstr "Activar el modo de sólo OpenID"
+
+#. TRANS: Checkbox title.
+msgid ""
+"Require all users to login via OpenID. Warning: disables password "
+"authentication for all users!"
+msgstr ""
+"Obligar a todos los usuarios a iniciar sesión a través de OpenID. "
+"Advertencia: ¡deshabilita la autenticación mediante contraseña para todos "
+"los usuarios!"
+
+#. TRANS: Button text to save OpenID settings.
+msgctxt "BUTTON"
+msgid "Save"
+msgstr "Guardar"
+
+#. TRANS: Button title to save OpenID settings.
+msgid "Save OpenID settings."
+msgstr "Guardar configuración de OpenID."
+
+#. TRANS: Error message displayed when trying to perform an action that requires a logged in user.
+msgid "Not logged in."
+msgstr "No ha iniciado sesión."
+
+#. TRANS: Message in case a user tries to add an OpenID that is already connected to them.
+msgid "You already have this OpenID!"
+msgstr "¡Ya tiene este identificador OpenID!"
+
+#. TRANS: Message in case a user tries to add an OpenID that is already used by another user.
+msgid "Someone else already has this OpenID."
+msgstr "Alguien ya tiene este identificador OpenID."
+
+#. TRANS: Message in case the OpenID object cannot be connected to the user.
+msgid "Error connecting user."
+msgstr "Error al conectar al usuario."
+
+#. TRANS: Message in case the user or the user profile cannot be saved in StatusNet.
+msgid "Error updating profile."
+msgstr "Error al actualizar el perfil."
+
+#. TRANS: Title after getting the status of the OpenID authorisation request.
+msgid "OpenID Login"
+msgstr "Inicio de sesión con OpenID"
+
+#. TRANS: Title of OpenID settings page for a user.
+msgctxt "TITLE"
+msgid "OpenID settings"
+msgstr "Configuración de OpenID"
+
+#. TRANS: Form instructions for OpenID settings.
+#. TRANS: This message contains Markdown links in the form [description](link).
+#, 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%%) permite iniciar sesión en muchos sitios con la "
+"misma cuenta de usuario. Gestione su identificador OpenID asociado desde "
+"aquí."
+
+#. TRANS: Fieldset legend.
+msgctxt "LEGEND"
+msgid "Add OpenID"
+msgstr "Añadir identificador OpenID"
+
+#. TRANS: Form guide.
+msgid ""
+"If you want to add an OpenID to your account, enter it in the box below and "
+"click \"Add\"."
+msgstr ""
+"Si desea agregar un identificador OpenID a su cuenta, introdúzcalo en el "
+"cuadro a continuación y haga clic en \"Agregar\"."
+
+#. TRANS: Button text for adding an OpenID URL.
+msgctxt "BUTTON"
+msgid "Add"
+msgstr "Agregar"
+
+#. TRANS: Header on OpenID settings page.
+msgctxt "HEADER"
+msgid "Remove OpenID"
+msgstr "Eliminar identificador OpenID"
+
+#. TRANS: Form guide.
+msgid ""
+"Removing your only OpenID would make it impossible to log in! If you need to "
+"remove it, add another OpenID first."
+msgstr ""
+"¡Al eliminar su único identificador OpenID será imposible iniciar sesión! Si "
+"necesita eliminarlo, agregue otro identificador OpenID primero."
+
+#. TRANS: Form guide.
+msgid ""
+"You can remove an OpenID from your account by clicking the button marked "
+"\"Remove\"."
+msgstr ""
+"Puede eliminar su identificador OpenID de su cuenta haciendo clic en el "
+"botón \"Eliminar\"."
+
+#. TRANS: Button text to remove an OpenID.
+#. TRANS: Button text to remove an OpenID trustroot.
+msgctxt "BUTTON"
+msgid "Remove"
+msgstr "Eliminar"
+
+#. TRANS: Fieldset legend.
+msgid "OpenID Trusted Sites"
+msgstr "Sitios de confianza de OpenID"
+
+#. TRANS: Form guide.
+msgid ""
+"The following sites are allowed to access your identity and log you in. You "
+"can remove a site from this list to deny it access to your OpenID."
+msgstr ""
+"Los siguientes sitios pueden tener acceso a su identidad e iniciar su "
+"sesión. Puede eliminar un sitio de esta lista para denegar el acceso a su "
+"identificador OpenID."
+
+#. TRANS: Form validation error if no OpenID providers can be added.
+msgid "Cannot add new providers."
+msgstr "No se puede agregar nuevos proveedores."
+
+#. TRANS: Unexpected form validation error.
+msgid "Something weird happened."
+msgstr "Ocurrió algo extraño."
+
+#. TRANS: Form validation error when trying to remove a non-existing trustroot.
+msgid "No such OpenID trustroot."
+msgstr "No existe esa raíz de confianza de OpenID."
+
+#. TRANS: Success message after removing trustroots.
+msgid "Trustroots removed."
+msgstr "Raíces fiables eliminadas."
+
+#. TRANS: Form validation error for a non-existing OpenID.
+msgid "No such OpenID."
+msgstr "No existe ese identificador OpenID."
+
+#. TRANS: Form validation error if OpenID is connected to another user.
+msgid "That OpenID does not belong to you."
+msgstr "Ese identificador OpenID no le pertenece."
+
+#. TRANS: Success message after removing an OpenID.
+msgid "OpenID removed."
+msgstr "Identificador OpenID eliminado."
+
+#. TRANS: OpenID plugin client error given trying to add an unauthorised OpenID to a user (403).
+#. TRANS: %s is a request identity.
+#, php-format
+msgid "You are not authorized to use the identity %s."
+msgstr "No está autorizado a utilizar la identidad %s."
+
+#. TRANS: OpenID plugin client error given when not getting a response for a given OpenID provider (500).
+msgid "Just an OpenID provider. Nothing to see here, move along..."
+msgstr ""
+"Sólo para proveedores de OpenID. No tiene nada que ver aquí, siga su "
+"camino..."
+
+#. TRANS: OpenID plugin message. Rememberme logins have to reauthenticate before changing any profile settings.
+#. TRANS: "OpenID" is the display text for a link with URL "(%%doc.openid%%)".
+#, php-format
+msgid ""
+"For security reasons, please re-login with your [OpenID](%%doc.openid%%) "
+"before changing your settings."
+msgstr ""
+"Por razones de seguridad, por favor, vuelva a iniciar sesión con su "
+"identificador [OpenID] (%%doc.openid%%) antes de cambiar su configuración."
+
+#. TRANS: OpenID plugin message.
+#. TRANS: "OpenID" is the display text for a link with URL "(%%doc.openid%%)".
+#, php-format
+msgid "Login with an [OpenID](%%doc.openid%%) account."
+msgstr "Inicie sesión con una cuenta [OpenID] (%%doc.openid%%)."
+
+#. TRANS: OpenID plugin message. Title.
+msgctxt "TITLE"
+msgid "OpenID Login"
+msgstr "Inicio de sesión con OpenID"
+
+#. TRANS: Field label.
+msgctxt "LABEL"
+msgid "OpenID provider"
+msgstr "Proveedor del identificador OpenID"
+
+#. TRANS: OpenID plugin logon form checkbox label for setting to put the OpenID information in a cookie.
+msgid "Remember me"
+msgstr "Recordarme"
+
+#. TRANS: OpenID plugin logon form field title.
+msgid "Automatically login in the future; not for shared computers!"
+msgstr ""
+"Iniciar sesión automáticamente en el futuro. ¡No usar en ordenadores "
+"compartidos!"
+
+#. TRANS: OpenID plugin logon form button label to start logon with the data provided in the logon form.
+msgctxt "BUTTON"
+msgid "Login"
+msgstr "Iniciar sesión"
diff --git a/plugins/OpenID/locale/eu/LC_MESSAGES/OpenID.po b/plugins/OpenID/locale/eu/LC_MESSAGES/OpenID.po
new file mode 100644
index 0000000000..c379f69bc0
--- /dev/null
+++ b/plugins/OpenID/locale/eu/LC_MESSAGES/OpenID.po
@@ -0,0 +1,645 @@
+# Translation of StatusNet - OpenID to Basque (euskara)
+# Exported from translatewiki.net
+#
+# Author: Artsuaga
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - OpenID\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:25+0000\n"
+"Language-Team: Basque <https://translatewiki.net/wiki/Portal:eu>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-10-10 14:11:22+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: eu\n"
+"X-Message-Group: #out-statusnet-plugin-openid\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Title for identity verification page.
+msgid "OpenID Identity Verification"
+msgstr "OpenID Identitate Egiaztapena"
+
+#. TRANS: Client error when visiting page directly.
+msgid ""
+"This page should only be reached during OpenID processing, not directly."
+msgstr "Orri hontara OpenID prozesu bidez iritsi beharko zenuke, ez zuenean."
+
+#. TRANS: Page notice. %s is a trustroot name.
+#, php-format
+msgid ""
+"%s has asked to verify your identity. Click Continue to verify your identity "
+"and login without creating a new password."
+msgstr ""
+"%s(e)k zure nortasubna egiaztatu nahi du. Klikatu Jarraitu zure nortasuna "
+"egiaztatzeko eta pasahitzik gabe saioa hasteko."
+
+#. TRANS: Button text to continue OpenID identity verification.
+#. TRANS: button label for OAuth authorization page when needing OpenID authentication first.
+msgctxt "BUTTON"
+msgid "Continue"
+msgstr "Jarraitu"
+
+#. TRANS: Button text to cancel OpenID identity verification.
+msgctxt "BUTTON"
+msgid "Cancel"
+msgstr "Utzi"
+
+#. TRANS: Client exception thrown when an action is not available.
+msgid "Unavailable action."
+msgstr "Ekintza erabilezina."
+
+#. TRANS: Tooltip for main menu option "Login"
+msgctxt "TOOLTIP"
+msgid "Login to the site."
+msgstr "Saioa hasi gunean."
+
+#. TRANS: Main menu option when not logged in to log in
+msgctxt "MENU"
+msgid "Login"
+msgstr "Saioa hasi"
+
+#. TRANS: Tooltip for main menu option "Help"
+msgctxt "TOOLTIP"
+msgid "Help me!"
+msgstr "Lagundu!"
+
+#. TRANS: Main menu option for help on the StatusNet site
+msgctxt "MENU"
+msgid "Help"
+msgstr "Laguntza"
+
+#. TRANS: Tooltip for main menu option "Search"
+msgctxt "TOOLTIP"
+msgid "Search for people or text."
+msgstr "Bilatu jendea edo testua."
+
+#. TRANS: Main menu option when logged in or when the StatusNet instance is not private
+msgctxt "MENU"
+msgid "Search"
+msgstr "Bilatu"
+
+#. TRANS: OpenID plugin menu item on site logon page.
+#. TRANS: OpenID plugin menu item on user settings page.
+#. TRANS: OpenID configuration menu item.
+msgctxt "MENU"
+msgid "OpenID"
+msgstr "OpenID"
+
+#. TRANS: OpenID plugin tooltip for logon menu item.
+msgid "Login or register with OpenID."
+msgstr "Saioa hasi edo izen eman OpenIDekin."
+
+#. TRANS: OpenID plugin tooltip for user settings menu item.
+msgid "Add or remove OpenIDs."
+msgstr "Gehitu edo ezabatu OpenIDak."
+
+#. TRANS: Page notice for logged in users to try and get them to add an OpenID account to their StatusNet account.
+#. TRANS: This message contains Markdown links in the form (description)[link].
+#, php-format
+msgid ""
+"(Have an [OpenID](http://openid.net/)? [Add an OpenID to your account](%%"
+"action.openidsettings%%)!"
+msgstr ""
+"(Baduzu [OpenIDrik](http://openid.net/)? [Gehitu OpenID bat zure kontuari](%%"
+"action.openidsettings%%)!"
+
+#. TRANS: Page notice for anonymous users to try and get them to register with an OpenID account.
+#. TRANS: This message contains Markdown links in the form (description)[link].
+#, php-format
+msgid ""
+"(Have an [OpenID](http://openid.net/)? Try our [OpenID registration](%%"
+"action.openidlogin%%)!)"
+msgstr ""
+"(Baduzu [OpenIDrik](http://openid.net/)? Saiatu gure [OpenID erregistroa](%%"
+"action.openidlogin%%)!)"
+
+#. TRANS: Page notice on the login page to try and get them to log on with an OpenID account.
+#. TRANS: This message contains Markdown links in the form (description)[link].
+#, php-format
+msgid ""
+"(Have an [OpenID](http://openid.net/)? Try our [OpenID login](%%action."
+"openidlogin%%)!)"
+msgstr ""
+"(Baduzu [OpenIDrik](http://openid.net/)? Saiatu gure [OpenID saio hasera](%%"
+"action.openidlogin%%)!)"
+
+#. TRANS: Tooltip for OpenID configuration menu item.
+msgid "OpenID configuration."
+msgstr "OpenID konfigurazioa."
+
+#. TRANS: Plugin description.
+msgid "Use <a href=\"http://openid.net/\">OpenID</a> to login to the site."
+msgstr ""
+"Erabili <a href=\"http://openid.net/\">OpenID</a> gunean saioa hasteko."
+
+#. TRANS: OpenID plugin logon form legend.
+msgctxt "LEGEND"
+msgid "OpenID login"
+msgstr "OpenID saio hasera"
+
+#. TRANS: Field label.
+msgid "OpenID provider"
+msgstr "OpenID hornitzailea"
+
+#. TRANS: Form guide.
+msgid "Enter your username."
+msgstr "Sartu zure erabiltzailea."
+
+#. TRANS: Form guide.
+msgid "You will be sent to the provider's site for authentication."
+msgstr "Hornitzailearen gunera bideratua izango zara autentifikatzeko."
+
+#. TRANS: OpenID plugin logon form field label.
+#. TRANS: Field label.
+#. TRANS: OpenID plugin logon form field label.
+msgid "OpenID URL"
+msgstr "OpenID URLa"
+
+#. TRANS: OpenID plugin logon form field instructions.
+#. TRANS: OpenID plugin logon form field title.
+msgid "Your OpenID URL."
+msgstr "Zure OpenID URLa."
+
+#. TRANS: Client error message trying to log on with OpenID while already logged on.
+msgid "Already logged in."
+msgstr "Dagoeneko saioa hasita."
+
+#. TRANS: Message given when there is a problem with the user's session token.
+#. TRANS: Client error displayed when the session token does not match or is not given.
+msgid "There was a problem with your session token. Try again, please."
+msgstr "Zure saio tokenarekin arazo bat egon da. Saiatu berriro, mesedez."
+
+#. TRANS: Message given if user does not agree with the site's license.
+msgid "You cannot register if you do not agree to the license."
+msgstr "Ezin duzu izenik eman ez bazaude lizentziarekin ados."
+
+#. TRANS: Messag given on an unknown error.
+msgid "An unknown error has occured."
+msgstr "Akats ezezaguna."
+
+#. TRANS: Instructions given after a first successful logon using OpenID.
+#. TRANS: %s is the site name.
+#, php-format
+msgid ""
+"This is the first time you have 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 ""
+"Hau da lehenbiziko aldia %s(e)n saioa hasten duzuna, zure OpenID kontua "
+"kontu lokal batekin batuko dugu. Kontu berri bat sor dezakezu baita ere, edo "
+"dagoeneko bat baldin baduzu horrekin konektatu zaitezke."
+
+#. TRANS: Title
+msgctxt "TITLE"
+msgid "OpenID Account Setup"
+msgstr "OpenID Kontu Instalazioa"
+
+#. TRANS: Fieldset legend.
+msgid "Create new account"
+msgstr "Kontu berria sortu"
+
+#. TRANS: Form guide.
+msgid "Create a new user with this nickname."
+msgstr "Sortu erabiltzaile berri bat goitizen honekin."
+
+#. TRANS: Field label.
+msgid "New nickname"
+msgstr "Goitizen berria"
+
+#. TRANS: Field title.
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
+msgstr "1etik 64ra letra xehea edo zenbaki, ez untuazio edo espaziorik gabe."
+
+#. TRANS: Field label.
+msgid "Email"
+msgstr "Eposta"
+
+#. TRANS: Field title.
+msgid "Used only for updates, announcements, and password recovery."
+msgstr ""
+"Eguneraketarako, jakinarazpen eta pasahitz berreskurapenerako soilik "
+"erabilia."
+
+#. TRANS: OpenID plugin link text.
+#. TRANS: %s is a link to a license with the license name as link text.
+#, php-format
+msgid ""
+"My text and files are available under %s except this private data: password, "
+"email address, IM address, and phone number."
+msgstr ""
+"Nere testu eta fitxategiak %s lizentziapean daude, pasahitza, eposta "
+"helbidea, IM helbidea eta telefono zenbakia ezik."
+
+#. TRANS: Button label in form in which to create a new user on the site for an OpenID.
+msgctxt "BUTTON"
+msgid "Create"
+msgstr "Sortu"
+
+#. TRANS: Used as form legend for form in which to connect an OpenID to an existing user on the site.
+msgid "Connect existing account"
+msgstr "Konektatu sorturiko kontuarekin"
+
+#. TRANS: User instructions for form in which to connect an OpenID to an existing user on the site.
+msgid ""
+"If you already have an account, login with your username and password to "
+"connect it to your OpenID."
+msgstr ""
+"Dagoeneko kontu bat baduzu, hasi saioa zure erabiltzaile eta pasahitzarekin "
+"zure OpenIDra konektatzeko."
+
+#. TRANS: Field label in form in which to connect an OpenID to an existing user on the site.
+msgid "Existing nickname"
+msgstr "Goitizena existitzen da"
+
+#. TRANS: Field label in form in which to connect an OpenID to an existing user on the site.
+msgid "Password"
+msgstr "Pasahitza"
+
+#. TRANS: Button text in form in which to connect an OpenID to an existing user on the site.
+msgctxt "BUTTON"
+msgid "Connect"
+msgstr "Konektatu"
+
+#. TRANS: Status message in case the response from the OpenID provider is that the logon attempt was cancelled.
+msgid "OpenID authentication cancelled."
+msgstr "Open autentifikazioa bertan behera utzita."
+
+#. TRANS: OpenID authentication failed; display the error message. %s is the error message.
+#. TRANS: OpenID authentication failed; display the error message.
+#. TRANS: %s is the error message.
+#, php-format
+msgid "OpenID authentication failed: %s."
+msgstr "OpenID autentifikazio akatsa: %s"
+
+#. TRANS: Message displayed when OpenID authentication is aborted.
+#. TRANS: OpenID authentication error.
+msgid ""
+"OpenID authentication aborted: You are not allowed to login to this site."
+msgstr ""
+"OpenID autentifikazioa abortatua: Ez zaude baimenduta gune hontan sartzeko."
+
+#. TRANS: OpenID plugin message. No new user registration is allowed on the site.
+#. TRANS: OpenID plugin message. No new user registration is allowed on the site without an invitation code, and none was provided.
+msgid "Registration not allowed."
+msgstr "Ezin da izen eman."
+
+#. TRANS: OpenID plugin message. No new user registration is allowed on the site without an invitation code, and the one provided was not valid.
+msgid "Not a valid invitation code."
+msgstr "Gonbidapen kodea ez da baliozkoa."
+
+#. TRANS: OpenID plugin message. The entered new user name is blacklisted.
+msgid "Nickname not allowed."
+msgstr "Goitizen hori ez da onartzen."
+
+#. TRANS: OpenID plugin message. The entered new user name is already used.
+msgid "Nickname already in use. Try another one."
+msgstr "Goitizen hori erabilzen ari da dagoeneko. Saiatu beste batekin."
+
+#. TRANS: OpenID plugin server error. A stored OpenID cannot be retrieved.
+#. TRANS: OpenID plugin server error. A stored OpenID cannot be found.
+msgid "Stored OpenID not found."
+msgstr "Gordetako OpenIDa ez da aurkitu."
+
+#. TRANS: OpenID plugin server error.
+msgid "Creating new account for OpenID that already has a user."
+msgstr ""
+"Dagoeneko erabiltzaile bat duen OpenIDarentzat kontu berri bat sortzen."
+
+#. TRANS: OpenID plugin message.
+msgid "Invalid username or password."
+msgstr "Erabiltzaile edo pasahitz baliogabea."
+
+#. TRANS: OpenID plugin server error. The user or user profile could not be saved.
+msgid "Error connecting user to OpenID."
+msgstr "Akatsa erabiltzailea OpenIDra konektatzean."
+
+#. TRANS: OpenID plugin server error.
+msgid "Cannot instantiate OpenID consumer object."
+msgstr "OpenID kontsumitzaile objetua ezin habiarazi."
+
+#. TRANS: OpenID plugin message. Given when an OpenID is not valid.
+msgid "Not a valid OpenID."
+msgstr "OpenID baliogabea."
+
+#. TRANS: OpenID plugin server error. Given when the OpenID authentication request fails.
+#. TRANS: %s is the failure message.
+#, php-format
+msgid "OpenID failure: %s."
+msgstr "OpenID akatsa: %s."
+
+#. TRANS: OpenID plugin server error. Given when the OpenID authentication request cannot be redirected.
+#. TRANS: %s is the failure message.
+#, php-format
+msgid "Could not redirect to server: %s."
+msgstr "Ezin izan da zerbitzarira bideratu: %s."
+
+#. TRANS: OpenID plugin user instructions.
+msgid ""
+"This form should automatically submit itself. If not, click the submit "
+"button to go to your OpenID provider."
+msgstr ""
+"Inprimaki hau automatikoki bidaliko da. Ez bada horrela, klikatu bidalketa "
+"botoia zure OpenID hornitzailera bideratzeko."
+
+#. TRANS: OpenID plugin server error.
+msgid "Error saving the profile."
+msgstr "Akatsa profila gordetzean."
+
+#. TRANS: OpenID plugin server error.
+msgid "Error saving the user."
+msgstr "Akatsa erabiltzailea gordetzean."
+
+#. TRANS: OpenID plugin client exception (403).
+msgid "Unauthorized URL used for OpenID login."
+msgstr "OpenID saio haseran erabilitako URL baimenik gabea."
+
+#. TRANS: Title
+msgid "OpenID Login Submission"
+msgstr "OpenID Saio Hasera Bidalketa"
+
+#. TRANS: OpenID plugin message used while requesting authorization user's OpenID login provider.
+msgid "Requesting authorization from your login provider..."
+msgstr "Zure hornitzaileari baimena eskatzen..."
+
+#. TRANS: OpenID plugin message. User instruction while requesting authorization user's OpenID login provider.
+msgid ""
+"If you are not redirected to your login provider in a few seconds, try "
+"pushing the button below."
+msgstr ""
+"Segundu gutxi batzutan ez bazara zure hornitzailera berbideratua izaten, "
+"saiatu azpiko botoia sakatuz."
+
+#. TRANS: Title for OpenID bridge administration page.
+msgctxt "TITLE"
+msgid "OpenID Settings"
+msgstr "OpenID Aukerak"
+
+#. TRANS: Page instructions.
+msgid "OpenID settings"
+msgstr "OpenID aukerak"
+
+#. TRANS: Client error displayed when OpenID provider URL is too long.
+msgid "Invalid provider URL. Maximum length is 255 characters."
+msgstr "Hornitzailearen URL baliogabea. 255 karaktera gehienez."
+
+#. TRANS: Client error displayed when Launchpad team name is too long.
+msgid "Invalid team name. Maximum length is 255 characters."
+msgstr "Talde izen baliogabea. 255 karaktere gehienez."
+
+#. TRANS: Fieldset legend.
+msgctxt "LEGEND"
+msgid "Trusted provider"
+msgstr "Hornitzaile fidagarria"
+
+#. TRANS: Form guide.
+msgid ""
+"By default, users are allowed to authenticate with any OpenID provider. If "
+"you are using your own OpenID service for shared sign-in, you can restrict "
+"access to only your own users here."
+msgstr ""
+"Berez, erabiltzaileek edozein OpenID hornitzailerekin autentifikatu "
+"daitezke. Zure OpenID zerbitzu propioa badarabilzu banatutako saio "
+"haseretarako, hemen zure erabiltzaileei soilik mugatu diezaiekezu sarbidea."
+
+#. TRANS: Field label.
+msgid "Provider URL"
+msgstr "Hornitzailearen URLa"
+
+#. TRANS: Field title.
+msgid ""
+"All OpenID logins will be sent to this URL; other providers may not be used."
+msgstr ""
+"OpenID saio hasera guztiak URL hontara bidaliko dira; beste hornitzaileak ez "
+"lirateke erabili behar."
+
+#. TRANS: Checkbox label.
+msgid "Append a username to base URL"
+msgstr "Gehitu erabiltzaile bat oinarrizko URLari."
+
+#. TRANS: Checkbox title.
+msgid ""
+"Login form will show the base URL and prompt for a username to add at the "
+"end. Use when OpenID provider URL should be the profile page for individual "
+"users."
+msgstr ""
+"Saio hasera inprimakiak oinarrizko URLa erakutsiko du eta ondoren "
+"erabiltzaile bat gehitzea eskatuko. Erabili OpenID hornitzailearen URLa, "
+"erabiltzaile bakoitzaren profil orria izan behar duenean."
+
+#. TRANS: Field label.
+msgid "Required team"
+msgstr "Derrigorrezko taldea"
+
+#. TRANS: Field title.
+msgid "Only allow logins from users in the given team (Launchpad extension)."
+msgstr ""
+"Emandako taldeko erabiltzaileen saio haserak soilik onartzen dira (Launchpad "
+"luzapena)."
+
+#. TRANS: Fieldset legend.
+msgctxt "LEGEND"
+msgid "Options"
+msgstr "Aukerak"
+
+#. TRANS: Checkbox label.
+msgid "Enable OpenID-only mode"
+msgstr "Gaitu OpenID-soil modua"
+
+#. TRANS: Checkbox title.
+msgid ""
+"Require all users to login via OpenID. Warning: disables password "
+"authentication for all users!"
+msgstr ""
+"Behartu erabiltzaile guztiak OpenID bidez saioa hastera. Kontuz: pasahitz "
+"autentifikazioa ezgaitzen du erabiltzaile guztientzako."
+
+#. TRANS: Button text to save OpenID settings.
+msgctxt "BUTTON"
+msgid "Save"
+msgstr "Gorde"
+
+#. TRANS: Button title to save OpenID settings.
+msgid "Save OpenID settings."
+msgstr "Gorde OpenID aukerak."
+
+#. TRANS: Error message displayed when trying to perform an action that requires a logged in user.
+msgid "Not logged in."
+msgstr "Saio hasi gabe."
+
+#. TRANS: Message in case a user tries to add an OpenID that is already connected to them.
+msgid "You already have this OpenID!"
+msgstr "Dagoeneko baduzu OpenID hau!"
+
+#. TRANS: Message in case a user tries to add an OpenID that is already used by another user.
+msgid "Someone else already has this OpenID."
+msgstr "Beste norbaitek badu OpenID hau dagoeneko."
+
+#. TRANS: Message in case the OpenID object cannot be connected to the user.
+msgid "Error connecting user."
+msgstr "Akatsa erabitzailea konektatzen."
+
+#. TRANS: Message in case the user or the user profile cannot be saved in StatusNet.
+msgid "Error updating profile."
+msgstr "Akatsa profila eguneratzen."
+
+#. TRANS: Title after getting the status of the OpenID authorisation request.
+msgid "OpenID Login"
+msgstr "OpenID Saio Hasera"
+
+#. TRANS: Title of OpenID settings page for a user.
+msgctxt "TITLE"
+msgid "OpenID settings"
+msgstr "OpenID aukerak"
+
+#. TRANS: Form instructions for OpenID settings.
+#. TRANS: This message contains Markdown links in the form [description](link).
+#, 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%%) bidez gune ezberdinetan saioa hasi ahalko duzu "
+"erabiltzaile kontu berarekin. Kudeatu zure OpenIDak hemendik."
+
+#. TRANS: Fieldset legend.
+msgctxt "LEGEND"
+msgid "Add OpenID"
+msgstr "Gehitu OpenIDa"
+
+#. TRANS: Form guide.
+msgid ""
+"If you want to add an OpenID to your account, enter it in the box below and "
+"click \"Add\"."
+msgstr ""
+"Zure kontuari OpenID bat gehitu nahi badiozu, sartu azpiko kutxan eta "
+"klikatu \"Gehitu\"."
+
+#. TRANS: Button text for adding an OpenID URL.
+msgctxt "BUTTON"
+msgid "Add"
+msgstr "Gehitu"
+
+#. TRANS: Header on OpenID settings page.
+msgctxt "HEADER"
+msgid "Remove OpenID"
+msgstr "Ezabatu OpenIDa"
+
+#. TRANS: Form guide.
+msgid ""
+"Removing your only OpenID would make it impossible to log in! If you need to "
+"remove it, add another OpenID first."
+msgstr ""
+"Zure OpenID bakarra ezabatzen baduzu beharbada ezingo duzu saiorik hasi! "
+"Ezabatu nahi baduzu, gehitu berri bat aurretik."
+
+#. TRANS: Form guide.
+msgid ""
+"You can remove an OpenID from your account by clicking the button marked "
+"\"Remove\"."
+msgstr ""
+"OpenID bat ezabatu dezakezu zure kontutik \"Ezabatu\" botoian klik eginez."
+
+#. TRANS: Button text to remove an OpenID.
+#. TRANS: Button text to remove an OpenID trustroot.
+msgctxt "BUTTON"
+msgid "Remove"
+msgstr "Ezabatu"
+
+#. TRANS: Fieldset legend.
+msgid "OpenID Trusted Sites"
+msgstr "OpenID Gune Fidagarriak"
+
+#. TRANS: Form guide.
+msgid ""
+"The following sites are allowed to access your identity and log you in. You "
+"can remove a site from this list to deny it access to your OpenID."
+msgstr ""
+"Ondorengo guneek baimena dute zure nortasuna atzitu eta zuk saioa hasi ahal "
+"izateko. Guneak zerrendatik ezabatu ditzakezu zure OpenIDaren atzipena "
+"ukatzeko."
+
+#. TRANS: Form validation error if no OpenID providers can be added.
+msgid "Cannot add new providers."
+msgstr "Ezin izan da hornitzaile berririk gehitu."
+
+#. TRANS: Unexpected form validation error.
+msgid "Something weird happened."
+msgstr "Zerbait arraroa gertatu da."
+
+#. TRANS: Form validation error when trying to remove a non-existing trustroot.
+msgid "No such OpenID trustroot."
+msgstr "Ez da OpenID konfidantza erro hori existitzen."
+
+#. TRANS: Success message after removing trustroots.
+msgid "Trustroots removed."
+msgstr "Ezabatutako erro fidagarriak."
+
+#. TRANS: Form validation error for a non-existing OpenID.
+msgid "No such OpenID."
+msgstr "Ez dago OpenID hori."
+
+#. TRANS: Form validation error if OpenID is connected to another user.
+msgid "That OpenID does not belong to you."
+msgstr "OpenID hori ez dagokizu zuri."
+
+#. TRANS: Success message after removing an OpenID.
+msgid "OpenID removed."
+msgstr "OpenID ezabatua."
+
+#. TRANS: OpenID plugin client error given trying to add an unauthorised OpenID to a user (403).
+#. TRANS: %s is a request identity.
+#, php-format
+msgid "You are not authorized to use the identity %s."
+msgstr "Ez zaude baimendua %s nortasuna erabiltzeko."
+
+#. TRANS: OpenID plugin client error given when not getting a response for a given OpenID provider (500).
+msgid "Just an OpenID provider. Nothing to see here, move along..."
+msgstr ""
+"OpenID hornitzaileentzat soilik. Ez dago ezer ikusteko hemen, jarritu "
+"aurrera..."
+
+#. TRANS: OpenID plugin message. Rememberme logins have to reauthenticate before changing any profile settings.
+#. TRANS: "OpenID" is the display text for a link with URL "(%%doc.openid%%)".
+#, php-format
+msgid ""
+"For security reasons, please re-login with your [OpenID](%%doc.openid%%) "
+"before changing your settings."
+msgstr ""
+"Segurtasun arrazoiengatik, saioa ber-hasi zure [OpenIDarekin](%%doc.openid%"
+"%) zure aukerak aldatu aurretik."
+
+#. TRANS: OpenID plugin message.
+#. TRANS: "OpenID" is the display text for a link with URL "(%%doc.openid%%)".
+#, php-format
+msgid "Login with an [OpenID](%%doc.openid%%) account."
+msgstr "Saioa hasi [OpenID](%%doc.openid%%) kontu batekin."
+
+#. TRANS: OpenID plugin message. Title.
+msgctxt "TITLE"
+msgid "OpenID Login"
+msgstr "OpenID Saio Hasera"
+
+#. TRANS: Field label.
+msgctxt "LABEL"
+msgid "OpenID provider"
+msgstr "OpenID hornitzailea"
+
+#. TRANS: OpenID plugin logon form checkbox label for setting to put the OpenID information in a cookie.
+msgid "Remember me"
+msgstr "Saioa gogoratu"
+
+#. TRANS: OpenID plugin logon form field title.
+msgid "Automatically login in the future; not for shared computers!"
+msgstr ""
+"Automatikoki hasi saioa hurrengoan; partekatutako orgenagailuetan ez erabili!"
+
+#. TRANS: OpenID plugin logon form button label to start logon with the data provided in the logon form.
+msgctxt "BUTTON"
+msgid "Login"
+msgstr "Saioa hasi"
diff --git a/plugins/OpenID/locale/fr/LC_MESSAGES/OpenID.po b/plugins/OpenID/locale/fr/LC_MESSAGES/OpenID.po
index d7599993d0..32c90cfdc5 100644
--- a/plugins/OpenID/locale/fr/LC_MESSAGES/OpenID.po
+++ b/plugins/OpenID/locale/fr/LC_MESSAGES/OpenID.po
@@ -1,9 +1,13 @@
-# Translation of StatusNet - OpenID to French (Français)
+# Translation of StatusNet - OpenID to French (français)
 # Exported from translatewiki.net
 #
 # Author: Crochet.david
+# Author: Gomoko
+# Author: JojoBoulix
+# Author: Lucky
 # Author: Od1n
 # Author: Peter17
+# Author: Valeryan 24
 # Author: Verdy p
 # --
 # This file is distributed under the same license as the StatusNet package.
@@ -12,14 +16,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OpenID\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:27+0000\n"
-"Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:26+0000\n"
+"Language-Team: French <https://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:47+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-10-10 14:11:22+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-openid\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
@@ -36,14 +40,13 @@ msgstr ""
 "directement."
 
 #. TRANS: Page notice. %s is a trustroot name.
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "%s has asked to verify your identity. Click Continue to verify your identity "
 "and login without creating a new password."
 msgstr ""
-"%s a demandé la vérification de votre identité. Veuillez cliquer sur « "
-"Continuer » pour vérifier votre identité et connectez-vous sans créer un "
-"nouveau mot de passe."
+"%s a demandé de vérifier de votre identité. Cliquer sur Continuer pour "
+"vérifier votre identité et connectez-vous sans créer un nouveau mot de passe."
 
 #. TRANS: Button text to continue OpenID identity verification.
 #. TRANS: button label for OAuth authorization page when needing OpenID authentication first.
@@ -52,13 +55,15 @@ msgid "Continue"
 msgstr "Continuer"
 
 #. TRANS: Button text to cancel OpenID identity verification.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Cancel"
 msgstr "Annuler"
 
+#. TRANS: Client exception thrown when an action is not available.
+msgid "Unavailable action."
+msgstr "Action non disponible."
+
 #. TRANS: Tooltip for main menu option "Login"
-#, fuzzy
 msgctxt "TOOLTIP"
 msgid "Login to the site."
 msgstr "Connexion au site"
@@ -79,7 +84,6 @@ msgid "Help"
 msgstr "Aide"
 
 #. TRANS: Tooltip for main menu option "Search"
-#, fuzzy
 msgctxt "TOOLTIP"
 msgid "Search for people or text."
 msgstr "Rechercher des personnes ou du texte"
@@ -97,24 +101,44 @@ msgid "OpenID"
 msgstr "OpenID"
 
 #. TRANS: OpenID plugin tooltip for logon menu item.
-#, fuzzy
 msgid "Login or register with OpenID."
-msgstr "Se connecter ou s’inscrire avec OpenID"
+msgstr "Se connecter ou s’inscrire avec OpenID."
 
 #. TRANS: OpenID plugin tooltip for user settings menu item.
-#, fuzzy
 msgid "Add or remove OpenIDs."
-msgstr "Ajouter ou retirer des identifiants OpenID"
+msgstr "Ajouter ou retirer des identifiants OpenID."
 
-#. TRANS: Item on help page. This message contains Markdown links in the form [description](link).
+#. TRANS: Page notice for logged in users to try and get them to add an OpenID account to their StatusNet account.
+#. TRANS: This message contains Markdown links in the form (description)[link].
 #, php-format
 msgid ""
-"* [OpenID](%%doc.openid%%) - What OpenID is and how to use it with this "
-"service."
+"(Have an [OpenID](http://openid.net/)? [Add an OpenID to your account](%%"
+"action.openidsettings%%)!"
 msgstr ""
+"(Avez-vous un [OpenID](http://openid.net/)? [Ajouter un OpenID à votre "
+"compte](%%action.openidsettings%%)!"
+
+#. TRANS: Page notice for anonymous users to try and get them to register with an OpenID account.
+#. TRANS: This message contains Markdown links in the form (description)[link].
+#, php-format
+msgid ""
+"(Have an [OpenID](http://openid.net/)? Try our [OpenID registration](%%"
+"action.openidlogin%%)!)"
+msgstr ""
+"(Ave-vous un [OpenID](http://openid.net/)? Essayez votre [inscription OpenID]"
+"(%%action.openidlogin%%)!)"
+
+#. TRANS: Page notice on the login page to try and get them to log on with an OpenID account.
+#. TRANS: This message contains Markdown links in the form (description)[link].
+#, php-format
+msgid ""
+"(Have an [OpenID](http://openid.net/)? Try our [OpenID login](%%action."
+"openidlogin%%)!)"
+msgstr ""
+"(Avez-vous un [OpenID](http://openid.net/)? Essayez votre [identifiant "
+"OpenID](%%action.openidlogin%%)!)"
 
 #. TRANS: Tooltip for OpenID configuration menu item.
-#, fuzzy
 msgid "OpenID configuration."
 msgstr "Configuration d’OpenID"
 
@@ -124,7 +148,6 @@ msgstr ""
 "Utiliser <a href=\"http://openid.net/\">OpenID</a> pour se connecter au site."
 
 #. TRANS: OpenID plugin logon form legend.
-#, fuzzy
 msgctxt "LEGEND"
 msgid "OpenID login"
 msgstr "Connexion OpenID"
@@ -149,7 +172,6 @@ msgstr "Adresse URL OpenID"
 
 #. TRANS: OpenID plugin logon form field instructions.
 #. TRANS: OpenID plugin logon form field title.
-#, fuzzy
 msgid "Your OpenID URL."
 msgstr "Votre URL OpenID"
 
@@ -165,7 +187,6 @@ msgstr ""
 "nouveau."
 
 #. TRANS: Message given if user does not agree with the site's license.
-#, fuzzy
 msgid "You cannot register if you do not agree to the license."
 msgstr "Vous ne pouvez pas vous inscrire si vous n’acceptez pas la licence."
 
@@ -175,19 +196,18 @@ msgstr "Une erreur inconnue s’est produite."
 
 #. TRANS: Instructions given after a first successful logon using OpenID.
 #. TRANS: %s is the site name.
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "This is the first time you have logged into %s so we must connect your "
 "OpenID to a local account. You can either create a new account, or connect "
 "with your existing account, if you have one."
 msgstr ""
-"C’est la première fois que vous êtes connecté à %s via OpenID, il nous faut "
-"donc lier votre compte OpenID à un compte local. Vous pouvez soit créer un "
-"nouveau compte, soit vous connecter avec votre compte local existant si vous "
-"en avez un."
+"C’est la première fois que vous vous connectez à %s, il nous faut donc lier "
+"votre compte OpenID à un compte local. Vous pouvez soit créer un nouveau "
+"compte, soit vous connecter avec votre compte local existant, si vous en "
+"avez un."
 
 #. TRANS: Title
-#, fuzzy
 msgctxt "TITLE"
 msgid "OpenID Account Setup"
 msgstr "Configuration du compte OpenID"
@@ -266,17 +286,16 @@ msgstr "Authentification OpenID annulée."
 #. TRANS: OpenID authentication failed; display the error message. %s is the error message.
 #. TRANS: OpenID authentication failed; display the error message.
 #. TRANS: %s is the error message.
-#, fuzzy, php-format
+#, php-format
 msgid "OpenID authentication failed: %s."
-msgstr "L’authentification OpenID a échoué : %s"
+msgstr "L’authentification OpenID a échoué : %s."
 
 #. TRANS: Message displayed when OpenID authentication is aborted.
 #. TRANS: OpenID authentication error.
-#, fuzzy
 msgid ""
 "OpenID authentication aborted: You are not allowed to login to this site."
 msgstr ""
-"L’authentification OpenID a été abandonnée : vous n'êtes pas autorisé à vous "
+"L’authentification OpenID a été abandonnée: Vous n'êtes pas autorisé à vous "
 "connecter à ce site."
 
 #. TRANS: OpenID plugin message. No new user registration is allowed on the site.
@@ -323,15 +342,15 @@ msgstr "Ce n’est pas un identifiant OpenID valide."
 
 #. TRANS: OpenID plugin server error. Given when the OpenID authentication request fails.
 #. TRANS: %s is the failure message.
-#, fuzzy, php-format
+#, php-format
 msgid "OpenID failure: %s."
-msgstr "Échec d’OpenID : %s"
+msgstr "Échec OpenID: %s."
 
 #. TRANS: OpenID plugin server error. Given when the OpenID authentication request cannot be redirected.
 #. TRANS: %s is the failure message.
-#, fuzzy, php-format
+#, php-format
 msgid "Could not redirect to server: %s."
-msgstr "Impossible de rediriger vers le serveur : %s"
+msgstr "Impossible de rediriger vers le serveur: %s."
 
 #. TRANS: OpenID plugin user instructions.
 msgid ""
@@ -371,29 +390,23 @@ msgstr ""
 "quelques secondes, essayez en cliquant le bouton ci-dessous."
 
 #. TRANS: Title for OpenID bridge administration page.
-#, fuzzy
 msgctxt "TITLE"
 msgid "OpenID Settings"
 msgstr "Paramètres OpenID"
 
 #. TRANS: Page instructions.
 msgid "OpenID settings"
-msgstr "Paramètres OpenID"
+msgstr "paramètres OpenID"
 
 #. TRANS: Client error displayed when OpenID provider URL is too long.
-#, fuzzy
 msgid "Invalid provider URL. Maximum length is 255 characters."
-msgstr ""
-"Adresse URL du fournisseur invalide. La taille maximale est de 255 "
-"caractères."
+msgstr "URL du fournisseur invalide. La taille maximale est de 255 caractères."
 
 #. TRANS: Client error displayed when Launchpad team name is too long.
-#, fuzzy
 msgid "Invalid team name. Maximum length is 255 characters."
 msgstr "Nom d’équipe invalide. La taille maximale est de 255 caractères."
 
 #. TRANS: Fieldset legend.
-#, fuzzy
 msgctxt "LEGEND"
 msgid "Trusted provider"
 msgstr "Fournisseur de confiance"
@@ -446,7 +459,6 @@ msgstr ""
 "donnée (extension Launchpad)."
 
 #. TRANS: Fieldset legend.
-#, fuzzy
 msgctxt "LEGEND"
 msgid "Options"
 msgstr "Options"
@@ -465,7 +477,6 @@ msgstr ""
 "utilisateurs !"
 
 #. TRANS: Button text to save OpenID settings.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Enregistrer"
@@ -491,16 +502,14 @@ msgid "Error connecting user."
 msgstr "Erreur lors de la connexion de l’utilisateur à OpenID."
 
 #. TRANS: Message in case the user or the user profile cannot be saved in StatusNet.
-#, fuzzy
 msgid "Error updating profile."
-msgstr "Erreur lors de la mise à jour du profil utilisateur"
+msgstr "Erreur de mise à jour du profil."
 
 #. TRANS: Title after getting the status of the OpenID authorisation request.
 msgid "OpenID Login"
 msgstr "Connexion OpenID"
 
 #. TRANS: Title of OpenID settings page for a user.
-#, fuzzy
 msgctxt "TITLE"
 msgid "OpenID settings"
 msgstr "Paramètres OpenID"
@@ -517,7 +526,6 @@ msgstr ""
 "OpenID associés à votre compte ici."
 
 #. TRANS: Fieldset legend.
-#, fuzzy
 msgctxt "LEGEND"
 msgid "Add OpenID"
 msgstr "Ajouter OpenID"
@@ -531,13 +539,11 @@ msgstr ""
 "case ci-dessous et cliquez sur « Ajouter »."
 
 #. TRANS: Button text for adding an OpenID URL.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Add"
 msgstr "Ajouter"
 
 #. TRANS: Header on OpenID settings page.
-#, fuzzy
 msgctxt "HEADER"
 msgid "Remove OpenID"
 msgstr "Retirer OpenID"
@@ -561,10 +567,9 @@ msgstr ""
 
 #. TRANS: Button text to remove an OpenID.
 #. TRANS: Button text to remove an OpenID trustroot.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Remove"
-msgstr "Enlever"
+msgstr "Supprimer"
 
 #. TRANS: Fieldset legend.
 msgid "OpenID Trusted Sites"
@@ -580,7 +585,6 @@ msgstr ""
 "d’accéder à votre compte OpenID."
 
 #. TRANS: Form validation error if no OpenID providers can be added.
-#, fuzzy
 msgid "Cannot add new providers."
 msgstr "Impossible d’ajouter de nouveaux fournisseurs."
 
@@ -593,9 +597,8 @@ msgid "No such OpenID trustroot."
 msgstr "Racine de confiance OpenID inexistante."
 
 #. TRANS: Success message after removing trustroots.
-#, fuzzy
 msgid "Trustroots removed."
-msgstr "Racines de confiance retirées"
+msgstr "Certificats racine retirés"
 
 #. TRANS: Form validation error for a non-existing OpenID.
 msgid "No such OpenID."
@@ -636,12 +639,11 @@ msgid "Login with an [OpenID](%%doc.openid%%) account."
 msgstr "Connexion avec un compte [OpenID](%%doc.openid%%)."
 
 #. TRANS: OpenID plugin message. Title.
-#, fuzzy
 msgctxt "TITLE"
 msgid "OpenID Login"
 msgstr "Connexion OpenID"
 
-#, fuzzy
+#. TRANS: Field label.
 msgctxt "LABEL"
 msgid "OpenID provider"
 msgstr "Fournisseur OpenID"
@@ -660,9 +662,3 @@ msgstr ""
 msgctxt "BUTTON"
 msgid "Login"
 msgstr "Connexion"
-
-#~ msgid "Continue"
-#~ msgstr "Continuer"
-
-#~ msgid "OpenID"
-#~ msgstr "OpenID"
diff --git a/plugins/OpenID/locale/gl/LC_MESSAGES/OpenID.po b/plugins/OpenID/locale/gl/LC_MESSAGES/OpenID.po
index 9a424d50b5..c8089e7521 100644
--- a/plugins/OpenID/locale/gl/LC_MESSAGES/OpenID.po
+++ b/plugins/OpenID/locale/gl/LC_MESSAGES/OpenID.po
@@ -1,5 +1,5 @@
-# Translation of StatusNet - OpenID to Galician (Galego)
-# Expored from translatewiki.net
+# Translation of StatusNet - OpenID to Galician (galego)
+# Exported from translatewiki.net
 #
 # Author: Toliño
 # --
@@ -9,275 +9,79 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OpenID\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:29+0000\n"
-"Language-Team: Galician <http://translatewiki.net/wiki/Portal:gl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:26+0000\n"
+"Language-Team: Galician <https://translatewiki.net/wiki/Portal:gl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2010-11-30 20:43:49+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-10-10 14:11:22+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: gl\n"
 "X-Message-Group: #out-statusnet-plugin-openid\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: openidsettings.php:58 openidadminpanel.php:65
-msgid "OpenID settings"
-msgstr ""
+#. TRANS: Title for identity verification page.
+msgid "OpenID Identity Verification"
+msgstr "Verificación de identidade OpenID"
 
-#: openidsettings.php:69
+#. TRANS: Client error when visiting page directly.
+msgid ""
+"This page should only be reached during OpenID processing, not directly."
+msgstr ""
+"A esta páxina debería chegarse unicamente durante o proceso do OpenID, non "
+"directamente."
+
+#. TRANS: Page notice. %s is a trustroot name.
 #, php-format
 msgid ""
-"[OpenID](%%doc.openid%%) lets you log into many sites with the same user "
-"account. Manage your associated OpenIDs from here."
+"%s has asked to verify your identity. Click Continue to verify your identity "
+"and login without creating a new password."
 msgstr ""
+"%s pediu que a súa identidade fose verificada. Prema en \"Continuar\" para "
+"comprobar a súa identidade e inicie sesión sen crear un contrasinal novo."
 
-#: openidsettings.php:100
-msgid "Add OpenID"
-msgstr ""
+#. TRANS: Button text to continue OpenID identity verification.
+#. TRANS: button label for OAuth authorization page when needing OpenID authentication first.
+msgctxt "BUTTON"
+msgid "Continue"
+msgstr "Continuar"
 
-#: openidsettings.php:103
-msgid ""
-"If you want to add an OpenID to your account, enter it in the box below and "
-"click \"Add\"."
-msgstr ""
+#. TRANS: Button text to cancel OpenID identity verification.
+msgctxt "BUTTON"
+msgid "Cancel"
+msgstr "Cancelar"
 
-#. TRANS: OpenID plugin logon form field label.
-#: openidsettings.php:108 OpenIDPlugin.php:681 openidlogin.php:161
-msgid "OpenID URL"
-msgstr ""
-
-#: openidsettings.php:118
-msgid "Add"
-msgstr "Engadir"
-
-#: openidsettings.php:130
-msgid "Remove OpenID"
-msgstr ""
-
-#: openidsettings.php:135
-msgid ""
-"Removing your only OpenID would make it impossible to log in! If you need to "
-"remove it, add another OpenID first."
-msgstr ""
-
-#: openidsettings.php:150
-msgid ""
-"You can remove an OpenID from your account by clicking the button marked "
-"\"Remove\"."
-msgstr ""
-
-#: openidsettings.php:173 openidsettings.php:214
-msgid "Remove"
-msgstr "Eliminar"
-
-#: openidsettings.php:187
-msgid "OpenID Trusted Sites"
-msgstr ""
-
-#: openidsettings.php:190
-msgid ""
-"The following sites are allowed to access your identity and log you in. You "
-"can remove a site from this list to deny it access to your OpenID."
-msgstr ""
-
-#. TRANS: Message given when there is a problem with the user's session token.
-#: openidsettings.php:232 finishopenidlogin.php:42 openidlogin.php:51
-msgid "There was a problem with your session token. Try again, please."
-msgstr ""
-
-#: openidsettings.php:239
-msgid "Can't add new providers."
-msgstr ""
-
-#: openidsettings.php:252
-msgid "Something weird happened."
-msgstr ""
-
-#: openidsettings.php:276
-msgid "No such OpenID trustroot."
-msgstr ""
-
-#: openidsettings.php:280
-msgid "Trustroots removed"
-msgstr ""
-
-#: openidsettings.php:303
-msgid "No such OpenID."
-msgstr ""
-
-#: openidsettings.php:308
-msgid "That OpenID does not belong to you."
-msgstr ""
-
-#: openidsettings.php:312
-msgid "OpenID removed."
-msgstr ""
-
-#: openidadminpanel.php:54
-msgid "OpenID"
-msgstr "OpenID"
-
-#: openidadminpanel.php:147
-msgid "Invalid provider URL. Max length is 255 characters."
-msgstr ""
-
-#: openidadminpanel.php:153
-msgid "Invalid team name. Max length is 255 characters."
-msgstr ""
-
-#: openidadminpanel.php:210
-msgid "Trusted provider"
-msgstr ""
-
-#: openidadminpanel.php:212
-msgid ""
-"By default, users are allowed to authenticate with any OpenID provider. If "
-"you are using your own OpenID service for shared sign-in, you can restrict "
-"access to only your own users here."
-msgstr ""
-
-#: openidadminpanel.php:220
-msgid "Provider URL"
-msgstr ""
-
-#: openidadminpanel.php:221
-msgid ""
-"All OpenID logins will be sent to this URL; other providers may not be used."
-msgstr ""
-
-#: openidadminpanel.php:228
-msgid "Append a username to base URL"
-msgstr ""
-
-#: openidadminpanel.php:230
-msgid ""
-"Login form will show the base URL and prompt for a username to add at the "
-"end. Use when OpenID provider URL should be the profile page for individual "
-"users."
-msgstr ""
-
-#: openidadminpanel.php:238
-msgid "Required team"
-msgstr ""
-
-#: openidadminpanel.php:239
-msgid "Only allow logins from users in the given team (Launchpad extension)."
-msgstr ""
-
-#: openidadminpanel.php:251
-msgid "Options"
-msgstr "Opcións"
-
-#: openidadminpanel.php:258
-msgid "Enable OpenID-only mode"
-msgstr ""
-
-#: openidadminpanel.php:260
-msgid ""
-"Require all users to login via OpenID. Warning: disables password "
-"authentication for all users!"
-msgstr ""
-
-#: openidadminpanel.php:278
-msgid "Save OpenID settings"
-msgstr ""
-
-#. TRANS: OpenID plugin server error.
-#: openid.php:138
-msgid "Cannot instantiate OpenID consumer object."
-msgstr ""
-
-#. TRANS: OpenID plugin message. Given when an OpenID is not valid.
-#: openid.php:150
-msgid "Not a valid OpenID."
-msgstr ""
-
-#. TRANS: OpenID plugin server error. Given when the OpenID authentication request fails.
-#. TRANS: %s is the failure message.
-#: openid.php:155
-#, php-format
-msgid "OpenID failure: %s"
-msgstr ""
-
-#. TRANS: OpenID plugin server error. Given when the OpenID authentication request cannot be redirected.
-#. TRANS: %s is the failure message.
-#: openid.php:205
-#, php-format
-msgid "Could not redirect to server: %s"
-msgstr ""
-
-#. TRANS: OpenID plugin user instructions.
-#: openid.php:244
-msgid ""
-"This form should automatically submit itself. If not, click the submit "
-"button to go to your OpenID provider."
-msgstr ""
-
-#. TRANS: OpenID plugin server error.
-#: openid.php:280
-msgid "Error saving the profile."
-msgstr ""
-
-#. TRANS: OpenID plugin server error.
-#: openid.php:292
-msgid "Error saving the user."
-msgstr ""
-
-#. TRANS: OpenID plugin client exception (403).
-#: openid.php:322
-msgid "Unauthorized URL used for OpenID login."
-msgstr ""
-
-#. TRANS: Title
-#: openid.php:370
-msgid "OpenID Login Submission"
-msgstr ""
-
-#. TRANS: OpenID plugin message used while requesting authorization user's OpenID login provider.
-#: openid.php:381
-msgid "Requesting authorization from your login provider..."
-msgstr ""
-
-#. TRANS: OpenID plugin message. User instruction while requesting authorization user's OpenID login provider.
-#: openid.php:385
-msgid ""
-"If you are not redirected to your login provider in a few seconds, try "
-"pushing the button below."
-msgstr ""
+#. TRANS: Client exception thrown when an action is not available.
+msgid "Unavailable action."
+msgstr "Acción non dispoñible."
 
 #. TRANS: Tooltip for main menu option "Login"
-#: OpenIDPlugin.php:218
 msgctxt "TOOLTIP"
-msgid "Login to the site"
-msgstr "Identificarse no sitio"
+msgid "Login to the site."
+msgstr "Identificarse no sitio."
 
 #. TRANS: Main menu option when not logged in to log in
-#: OpenIDPlugin.php:221
 msgctxt "MENU"
 msgid "Login"
 msgstr "Rexistro"
 
 #. TRANS: Tooltip for main menu option "Help"
-#: OpenIDPlugin.php:226
 msgctxt "TOOLTIP"
 msgid "Help me!"
 msgstr "Axuda!"
 
 #. TRANS: Main menu option for help on the StatusNet site
-#: OpenIDPlugin.php:229
 msgctxt "MENU"
 msgid "Help"
 msgstr "Axuda"
 
 #. TRANS: Tooltip for main menu option "Search"
-#: OpenIDPlugin.php:235
 msgctxt "TOOLTIP"
-msgid "Search for people or text"
-msgstr "Buscar persoas ou palabras"
+msgid "Search for people or text."
+msgstr "Buscar persoas ou palabras."
 
 #. TRANS: Main menu option when logged in or when the StatusNet instance is not private
-#: OpenIDPlugin.php:238
 msgctxt "MENU"
 msgid "Search"
 msgstr "Procurar"
@@ -285,298 +89,563 @@ msgstr "Procurar"
 #. TRANS: OpenID plugin menu item on site logon page.
 #. TRANS: OpenID plugin menu item on user settings page.
 #. TRANS: OpenID configuration menu item.
-#: OpenIDPlugin.php:295 OpenIDPlugin.php:331 OpenIDPlugin.php:605
 msgctxt "MENU"
 msgid "OpenID"
 msgstr "OpenID"
 
 #. TRANS: OpenID plugin tooltip for logon menu item.
-#: OpenIDPlugin.php:297
-msgid "Login or register with OpenID"
-msgstr ""
+msgid "Login or register with OpenID."
+msgstr "Iniciar sesión ou rexistrarse co OpenID."
 
 #. TRANS: OpenID plugin tooltip for user settings menu item.
-#: OpenIDPlugin.php:333
-msgid "Add or remove OpenIDs"
+msgid "Add or remove OpenIDs."
+msgstr "Engadir ou eliminar identificadores OpenID."
+
+#. TRANS: Page notice for logged in users to try and get them to add an OpenID account to their StatusNet account.
+#. TRANS: This message contains Markdown links in the form (description)[link].
+#, php-format
+msgid ""
+"(Have an [OpenID](http://openid.net/)? [Add an OpenID to your account](%%"
+"action.openidsettings%%)!"
 msgstr ""
+"(Ten un [OpenID](http://openid.net/)? [Engada un OpenID á súa conta](%%"
+"action.openidsettings%%)!"
+
+#. TRANS: Page notice for anonymous users to try and get them to register with an OpenID account.
+#. TRANS: This message contains Markdown links in the form (description)[link].
+#, php-format
+msgid ""
+"(Have an [OpenID](http://openid.net/)? Try our [OpenID registration](%%"
+"action.openidlogin%%)!)"
+msgstr ""
+"(Ten un [OpenID](http://openid.net/)? [Probe o noso [rexistro de OpenID](%%"
+"action.openidlogin%%)!)"
+
+#. TRANS: Page notice on the login page to try and get them to log on with an OpenID account.
+#. TRANS: This message contains Markdown links in the form (description)[link].
+#, php-format
+msgid ""
+"(Have an [OpenID](http://openid.net/)? Try our [OpenID login](%%action."
+"openidlogin%%)!)"
+msgstr ""
+"(Ten un [OpenID](http://openid.net/)? [Probe o noso [inicio de sesión de "
+"OpenID](%%action.openidlogin%%)!)"
 
 #. TRANS: Tooltip for OpenID configuration menu item.
-#: OpenIDPlugin.php:607
-msgid "OpenID configuration"
-msgstr "Configuración do OpenID"
+msgid "OpenID configuration."
+msgstr "Configuración do OpenID."
 
-#. TRANS: OpenID plugin description.
-#: OpenIDPlugin.php:631
+#. TRANS: Plugin description.
 msgid "Use <a href=\"http://openid.net/\">OpenID</a> to login to the site."
 msgstr ""
-
-#. TRANS: button label for OAuth authorization page when needing OpenID authentication first.
-#: OpenIDPlugin.php:641
-msgctxt "BUTTON"
-msgid "Continue"
-msgstr ""
+"Utilizar o <a href=\"http://openid.net/\">OpenID</a> para acceder ao sitio."
 
 #. TRANS: OpenID plugin logon form legend.
-#: OpenIDPlugin.php:658 openidlogin.php:140
+msgctxt "LEGEND"
 msgid "OpenID login"
-msgstr ""
+msgstr "Rexistro do OpenID"
 
 #. TRANS: Field label.
-#: OpenIDPlugin.php:666 openidlogin.php:148
 msgid "OpenID provider"
-msgstr ""
+msgstr "Provedor do OpenID"
 
 #. TRANS: Form guide.
-#: OpenIDPlugin.php:675 openidlogin.php:156
 msgid "Enter your username."
-msgstr ""
+msgstr "Insira o seu nome de usuario."
 
 #. TRANS: Form guide.
-#: OpenIDPlugin.php:677 openidlogin.php:157
 msgid "You will be sent to the provider's site for authentication."
-msgstr ""
+msgstr "Irá ata o sitio do provedor para a autenticación."
+
+#. TRANS: OpenID plugin logon form field label.
+#. TRANS: Field label.
+#. TRANS: OpenID plugin logon form field label.
+msgid "OpenID URL"
+msgstr "Enderezo URL do OpenID"
 
 #. TRANS: OpenID plugin logon form field instructions.
-#: OpenIDPlugin.php:684 openidlogin.php:164
-msgid "Your OpenID URL"
-msgstr ""
-
-#. TRANS: OpenID plugin client error given trying to add an unauthorised OpenID to a user (403).
-#: openidserver.php:116
-#, php-format
-msgid "You are not authorized to use the identity %s."
-msgstr ""
-
-#. TRANS: OpenID plugin client error given when not getting a response for a given OpenID provider (500).
-#: openidserver.php:137
-msgid "Just an OpenID provider. Nothing to see here, move along..."
-msgstr ""
+#. TRANS: OpenID plugin logon form field title.
+msgid "Your OpenID URL."
+msgstr "O URL do seu OpenID."
 
 #. TRANS: Client error message trying to log on with OpenID while already logged on.
-#: finishopenidlogin.php:37 openidlogin.php:33
 msgid "Already logged in."
 msgstr "Xa se identificou."
 
+#. TRANS: Message given when there is a problem with the user's session token.
+#. TRANS: Client error displayed when the session token does not match or is not given.
+msgid "There was a problem with your session token. Try again, please."
+msgstr "Houbo un erro co seu pase. Inténteo de novo."
+
 #. TRANS: Message given if user does not agree with the site's license.
-#: finishopenidlogin.php:48
-msgid "You can't register if you don't agree to the license."
-msgstr ""
+msgid "You cannot register if you do not agree to the license."
+msgstr "Non pode rexistrarse se non acepta a licenza."
 
 #. TRANS: Messag given on an unknown error.
-#: finishopenidlogin.php:57
 msgid "An unknown error has occured."
-msgstr ""
+msgstr "Houbo un erro descoñecido."
 
 #. TRANS: Instructions given after a first successful logon using OpenID.
 #. TRANS: %s is the site name.
-#: finishopenidlogin.php:73
 #, 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."
+"This is the first time you have 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 accede ao sistema de %s, de modo que debemos "
+"conectar o seu OpenID cunha conta local. Pode crear unha nova conta local ou "
+"ben conectar con outra conta local existente."
 
 #. TRANS: Title
-#: finishopenidlogin.php:80
+msgctxt "TITLE"
 msgid "OpenID Account Setup"
-msgstr ""
+msgstr "Configuración da conta do OpenID"
 
-#: finishopenidlogin.php:117
+#. TRANS: Fieldset legend.
 msgid "Create new account"
 msgstr "Crear unha conta nova"
 
-#: finishopenidlogin.php:119
+#. TRANS: Form guide.
 msgid "Create a new user with this nickname."
 msgstr "Crear un novo usuario con este alcume."
 
-#: finishopenidlogin.php:122
+#. TRANS: Field label.
 msgid "New nickname"
 msgstr "Novo alcume"
 
-#: finishopenidlogin.php:124
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
+#. TRANS: Field title.
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr ""
 "Entre 1 e 64 letras minúsculas ou números, sen signos de puntuación, "
-"espazos, tiles ou eñes"
+"espazos, tiles ou eñes."
+
+#. TRANS: Field label.
+msgid "Email"
+msgstr "Correo electrónico"
+
+#. TRANS: Field title.
+msgid "Used only for updates, announcements, and password recovery."
+msgstr ""
+"Só se utiliza para actualizacións, anuncios e recuperación de contrasinais."
+
+#. TRANS: OpenID plugin link text.
+#. TRANS: %s is a link to a license with the license name as link text.
+#, php-format
+msgid ""
+"My text and files are available under %s except this private data: password, "
+"email address, IM address, and phone number."
+msgstr ""
+"Os meus textos e ficheiros están dispoñibles baixo %s, salvo os seguintes "
+"datos privados: contrasinais, enderezos de correo electrónico e mensaxería "
+"instantánea e números de teléfono."
 
 #. TRANS: Button label in form in which to create a new user on the site for an OpenID.
-#: finishopenidlogin.php:149
 msgctxt "BUTTON"
 msgid "Create"
 msgstr "Crear"
 
 #. TRANS: Used as form legend for form in which to connect an OpenID to an existing user on the site.
-#: finishopenidlogin.php:163
 msgid "Connect existing account"
-msgstr ""
+msgstr "Conectar cunha conta existente"
 
 #. TRANS: User instructions for form in which to connect an OpenID to an existing user on the site.
-#: finishopenidlogin.php:166
 msgid ""
 "If you already have an account, login with your username and password to "
 "connect it to your OpenID."
 msgstr ""
+"Se xa ten unha conta, acceda ao sistema co seu nome de usuario e contrasinal "
+"para conectala coa do OpenID."
 
 #. TRANS: Field label in form in which to connect an OpenID to an existing user on the site.
-#: finishopenidlogin.php:170
 msgid "Existing nickname"
-msgstr ""
+msgstr "Alcume existente"
 
 #. TRANS: Field label in form in which to connect an OpenID to an existing user on the site.
-#: finishopenidlogin.php:174
 msgid "Password"
 msgstr "Contrasinal"
 
-#. TRANS: Button label in form in which to connect an OpenID to an existing user on the site.
-#: finishopenidlogin.php:178
+#. TRANS: Button text in form in which to connect an OpenID to an existing user on the site.
 msgctxt "BUTTON"
 msgid "Connect"
-msgstr "Conectarse"
+msgstr "Conectar"
 
 #. TRANS: Status message in case the response from the OpenID provider is that the logon attempt was cancelled.
-#: finishopenidlogin.php:191 finishaddopenid.php:90
 msgid "OpenID authentication cancelled."
-msgstr ""
+msgstr "Cancelouse a autenticación do OpenID."
 
 #. TRANS: OpenID authentication failed; display the error message. %s is the error message.
 #. TRANS: OpenID authentication failed; display the error message.
 #. TRANS: %s is the error message.
-#: finishopenidlogin.php:195 finishaddopenid.php:95
 #, php-format
-msgid "OpenID authentication failed: %s"
-msgstr ""
+msgid "OpenID authentication failed: %s."
+msgstr "Fallou a autenticación do OpenID: %s."
 
-#: finishopenidlogin.php:215 finishaddopenid.php:111
+#. TRANS: Message displayed when OpenID authentication is aborted.
+#. TRANS: OpenID authentication error.
 msgid ""
-"OpenID authentication aborted: you are not allowed to login to this site."
+"OpenID authentication aborted: You are not allowed to login to this site."
 msgstr ""
+"Interrumpiuse a autenticación do OpenID: Non ten permiso para iniciar sesión "
+"neste sitio."
 
 #. TRANS: OpenID plugin message. No new user registration is allowed on the site.
 #. TRANS: OpenID plugin message. No new user registration is allowed on the site without an invitation code, and none was provided.
-#: finishopenidlogin.php:267 finishopenidlogin.php:277
 msgid "Registration not allowed."
-msgstr ""
+msgstr "Non se permite o rexistro."
 
 #. TRANS: OpenID plugin message. No new user registration is allowed on the site without an invitation code, and the one provided was not valid.
-#: finishopenidlogin.php:285
 msgid "Not a valid invitation code."
-msgstr ""
+msgstr "O código da invitación é incorrecto."
 
 #. TRANS: OpenID plugin message. The entered new user name is blacklisted.
-#: finishopenidlogin.php:299
 msgid "Nickname not allowed."
-msgstr ""
+msgstr "Alcume non permitido."
 
 #. TRANS: OpenID plugin message. The entered new user name is already used.
-#: finishopenidlogin.php:305
 msgid "Nickname already in use. Try another one."
-msgstr ""
+msgstr "Ese alcume xa está en uso. Probe con outro."
 
 #. TRANS: OpenID plugin server error. A stored OpenID cannot be retrieved.
 #. TRANS: OpenID plugin server error. A stored OpenID cannot be found.
-#: finishopenidlogin.php:313 finishopenidlogin.php:400
 msgid "Stored OpenID not found."
-msgstr ""
+msgstr "Non se atopou o OpenID almacenado."
 
 #. TRANS: OpenID plugin server error.
-#: finishopenidlogin.php:323
 msgid "Creating new account for OpenID that already has a user."
-msgstr ""
+msgstr "Crear unha nova conta para o OpenID que xa ten un usuario."
 
 #. TRANS: OpenID plugin message.
-#: finishopenidlogin.php:388
 msgid "Invalid username or password."
 msgstr "O nome de usuario ou contrasinal non son correctos."
 
 #. TRANS: OpenID plugin server error. The user or user profile could not be saved.
-#: finishopenidlogin.php:408
 msgid "Error connecting user to OpenID."
+msgstr "Erro ao conectar o usuario co OpenID."
+
+#. TRANS: OpenID plugin server error.
+msgid "Cannot instantiate OpenID consumer object."
+msgstr "Non se pode crear unha instancia co obxecto do consumidor do OpenID."
+
+#. TRANS: OpenID plugin message. Given when an OpenID is not valid.
+msgid "Not a valid OpenID."
+msgstr "Non é un OpenID válido."
+
+#. TRANS: OpenID plugin server error. Given when the OpenID authentication request fails.
+#. TRANS: %s is the failure message.
+#, php-format
+msgid "OpenID failure: %s."
+msgstr "Erro no OpenID: %s."
+
+#. TRANS: OpenID plugin server error. Given when the OpenID authentication request cannot be redirected.
+#. TRANS: %s is the failure message.
+#, php-format
+msgid "Could not redirect to server: %s."
+msgstr "Non se pode redirixir cara ao servidor: %s."
+
+#. TRANS: OpenID plugin user instructions.
+msgid ""
+"This form should automatically submit itself. If not, click the submit "
+"button to go to your OpenID provider."
 msgstr ""
+"Este formulario debería enviarse só automaticamente. Se non é así, prema no "
+"botón de envío para ir ao seu provedor de OpenID."
+
+#. TRANS: OpenID plugin server error.
+msgid "Error saving the profile."
+msgstr "Houbo un erro ao gardar o perfil."
+
+#. TRANS: OpenID plugin server error.
+msgid "Error saving the user."
+msgstr "Houbo un erro ao gardar o usuario."
+
+#. TRANS: OpenID plugin client exception (403).
+msgid "Unauthorized URL used for OpenID login."
+msgstr ""
+"Empregouse un enderezo URL non autorizado para acceder mediante o OpenID."
+
+#. TRANS: Title
+msgid "OpenID Login Submission"
+msgstr "Envío do rexistro do OpenID"
+
+#. TRANS: OpenID plugin message used while requesting authorization user's OpenID login provider.
+msgid "Requesting authorization from your login provider..."
+msgstr "Solicitando a autorización do provedor de acceso..."
+
+#. TRANS: OpenID plugin message. User instruction while requesting authorization user's OpenID login provider.
+msgid ""
+"If you are not redirected to your login provider in a few seconds, try "
+"pushing the button below."
+msgstr ""
+"Se non é redirixido ao provedor de acceso nuns segundos, probe premendo no "
+"botón inferior."
+
+#. TRANS: Title for OpenID bridge administration page.
+msgctxt "TITLE"
+msgid "OpenID Settings"
+msgstr "Configuración do OpenID"
+
+#. TRANS: Page instructions.
+msgid "OpenID settings"
+msgstr "Configuración do OpenID"
+
+#. TRANS: Client error displayed when OpenID provider URL is too long.
+msgid "Invalid provider URL. Maximum length is 255 characters."
+msgstr ""
+"Enderezo URL do provedor incorrecto. A extensión máxima é de 255 caracteres."
+
+#. TRANS: Client error displayed when Launchpad team name is too long.
+msgid "Invalid team name. Maximum length is 255 characters."
+msgstr "Nome de equipo incorrecto. A extensión máxima é de 255 caracteres."
+
+#. TRANS: Fieldset legend.
+msgctxt "LEGEND"
+msgid "Trusted provider"
+msgstr "Provedor de confianza"
+
+#. TRANS: Form guide.
+msgid ""
+"By default, users are allowed to authenticate with any OpenID provider. If "
+"you are using your own OpenID service for shared sign-in, you can restrict "
+"access to only your own users here."
+msgstr ""
+"Por defecto, os usuarios poden autenticarse con calquera provedor de OpenID. "
+"Se usa o seu propio servizo de OpenID para un acceso compartido, pode "
+"restrinxir o acceso unicamente aos seus usuarios."
+
+#. TRANS: Field label.
+msgid "Provider URL"
+msgstr "URL do provedor"
+
+#. TRANS: Field title.
+msgid ""
+"All OpenID logins will be sent to this URL; other providers may not be used."
+msgstr ""
+"Todos os rexistros de OpenID enviaranse a este enderezo URL; non se poden "
+"usar outros provedores."
+
+#. TRANS: Checkbox label.
+msgid "Append a username to base URL"
+msgstr "Engadir un nome de usuario ao enderezo URL base"
+
+#. TRANS: Checkbox title.
+msgid ""
+"Login form will show the base URL and prompt for a username to add at the "
+"end. Use when OpenID provider URL should be the profile page for individual "
+"users."
+msgstr ""
+"O formulario de rexistro ha mostrar o enderezo URL base e pedirá un nome de "
+"usuario que engadir ao final. Utilice esta opción cando o enderezo URL do "
+"provedor de OpenID deba ser a páxina de perfil para os usuarios individuais."
+
+#. TRANS: Field label.
+msgid "Required team"
+msgstr "Equipo solicitado"
+
+#. TRANS: Field title.
+msgid "Only allow logins from users in the given team (Launchpad extension)."
+msgstr ""
+"Permitir unicamente o rexistro de usuarios pertencentes ao equipo "
+"especificado (extensión Launchpad)."
+
+#. TRANS: Fieldset legend.
+msgctxt "LEGEND"
+msgid "Options"
+msgstr "Opcións"
+
+#. TRANS: Checkbox label.
+msgid "Enable OpenID-only mode"
+msgstr "Activar o modo de OpenID só"
+
+#. TRANS: Checkbox title.
+msgid ""
+"Require all users to login via OpenID. Warning: disables password "
+"authentication for all users!"
+msgstr ""
+"Obrigar a todos os usuarios a acceder mediante o OpenID. Aviso: Desactiva a "
+"autenticación por contrasinal para todos os usuarios!"
+
+#. TRANS: Button text to save OpenID settings.
+msgctxt "BUTTON"
+msgid "Save"
+msgstr "Gardar"
+
+#. TRANS: Button title to save OpenID settings.
+msgid "Save OpenID settings."
+msgstr "Gardar a configuración do OpenID."
+
+#. TRANS: Error message displayed when trying to perform an action that requires a logged in user.
+msgid "Not logged in."
+msgstr "Non iniciou sesión."
+
+#. TRANS: Message in case a user tries to add an OpenID that is already connected to them.
+msgid "You already have this OpenID!"
+msgstr "Xa ten ese OpenID!"
+
+#. TRANS: Message in case a user tries to add an OpenID that is already used by another user.
+msgid "Someone else already has this OpenID."
+msgstr "Outra persoa ten ese OpenID."
+
+#. TRANS: Message in case the OpenID object cannot be connected to the user.
+msgid "Error connecting user."
+msgstr "Houbo un erro ao conectar co usuario."
+
+#. TRANS: Message in case the user or the user profile cannot be saved in StatusNet.
+msgid "Error updating profile."
+msgstr "Houbo un erro ao actualizar o perfil."
+
+#. TRANS: Title after getting the status of the OpenID authorisation request.
+msgid "OpenID Login"
+msgstr "Rexistro do OpenID"
+
+#. TRANS: Title of OpenID settings page for a user.
+msgctxt "TITLE"
+msgid "OpenID settings"
+msgstr "Configuración do OpenID"
+
+#. TRANS: Form instructions for OpenID settings.
+#. TRANS: This message contains Markdown links in the form [description](link).
+#, php-format
+msgid ""
+"[OpenID](%%doc.openid%%) lets you log into many sites with the same user "
+"account. Manage your associated OpenIDs from here."
+msgstr ""
+"O [OpenID](%%doc.openid%%) permite iniciar sesión en moitos sitios coa mesma "
+"conta de usuario. Xestione as conexións OpenID asociadas desde aquí."
+
+#. TRANS: Fieldset legend.
+msgctxt "LEGEND"
+msgid "Add OpenID"
+msgstr "Engadir o OpenID"
+
+#. TRANS: Form guide.
+msgid ""
+"If you want to add an OpenID to your account, enter it in the box below and "
+"click \"Add\"."
+msgstr ""
+"Se quere engadir un OpenID á súa conta, insíraa na caixa inferior e prema en "
+"\"Engadir\"."
+
+#. TRANS: Button text for adding an OpenID URL.
+msgctxt "BUTTON"
+msgid "Add"
+msgstr "Engadir"
+
+#. TRANS: Header on OpenID settings page.
+msgctxt "HEADER"
+msgid "Remove OpenID"
+msgstr "Eliminar o OpenID"
+
+#. TRANS: Form guide.
+msgid ""
+"Removing your only OpenID would make it impossible to log in! If you need to "
+"remove it, add another OpenID first."
+msgstr ""
+"Ao eliminar o seu único OpenID non poderá acceder ao sistema! Se necesita "
+"eliminalo, engada outro OpenID primeiro."
+
+#. TRANS: Form guide.
+msgid ""
+"You can remove an OpenID from your account by clicking the button marked "
+"\"Remove\"."
+msgstr ""
+"Pode eliminar un OpenID desde a súa conta premendo no botón \"Eliminar\"."
+
+#. TRANS: Button text to remove an OpenID.
+#. TRANS: Button text to remove an OpenID trustroot.
+msgctxt "BUTTON"
+msgid "Remove"
+msgstr "Eliminar"
+
+#. TRANS: Fieldset legend.
+msgid "OpenID Trusted Sites"
+msgstr "Sitios de confianza do OpenID"
+
+#. TRANS: Form guide.
+msgid ""
+"The following sites are allowed to access your identity and log you in. You "
+"can remove a site from this list to deny it access to your OpenID."
+msgstr ""
+"Os seguintes sitios teñen permitido acceder á súa identidade e iniciarlle a "
+"sesión. Pode eliminar un sitio da lista para impedirlle o acceso ao seu "
+"OpenID."
+
+#. TRANS: Form validation error if no OpenID providers can be added.
+msgid "Cannot add new providers."
+msgstr "Non se poden engadir novos provedores."
+
+#. TRANS: Unexpected form validation error.
+msgid "Something weird happened."
+msgstr "Ocorreu algo estraño."
+
+#. TRANS: Form validation error when trying to remove a non-existing trustroot.
+msgid "No such OpenID trustroot."
+msgstr "Non existe esa raíz fiable do OpenID."
+
+#. TRANS: Success message after removing trustroots.
+msgid "Trustroots removed."
+msgstr "Raíces fiables eliminadas."
+
+#. TRANS: Form validation error for a non-existing OpenID.
+msgid "No such OpenID."
+msgstr "Non existe ese OpenID."
+
+#. TRANS: Form validation error if OpenID is connected to another user.
+msgid "That OpenID does not belong to you."
+msgstr "Ese OpenID non lle pertence."
+
+#. TRANS: Success message after removing an OpenID.
+msgid "OpenID removed."
+msgstr "OpenID eliminado."
+
+#. TRANS: OpenID plugin client error given trying to add an unauthorised OpenID to a user (403).
+#. TRANS: %s is a request identity.
+#, php-format
+msgid "You are not authorized to use the identity %s."
+msgstr "Non ten permiso para usar a identidade %s."
+
+#. TRANS: OpenID plugin client error given when not getting a response for a given OpenID provider (500).
+msgid "Just an OpenID provider. Nothing to see here, move along..."
+msgstr ""
+"Unicamente un provedor de OpenID. Nada que ver aquí, siga o seu camiño..."
 
 #. TRANS: OpenID plugin message. Rememberme logins have to reauthenticate before changing any profile settings.
 #. TRANS: "OpenID" is the display text for a link with URL "(%%doc.openid%%)".
-#: openidlogin.php:82
 #, php-format
 msgid ""
 "For security reasons, please re-login with your [OpenID](%%doc.openid%%) "
 "before changing your settings."
 msgstr ""
+"Por razóns de seguridade, volva iniciar sesión co seu [OpenID](%%doc.openid%"
+"%) antes de cambiar a súa configuración."
 
 #. TRANS: OpenID plugin message.
 #. TRANS: "OpenID" is the display text for a link with URL "(%%doc.openid%%)".
-#: openidlogin.php:88
 #, php-format
 msgid "Login with an [OpenID](%%doc.openid%%) account."
-msgstr ""
+msgstr "Acceda cunha conta do [OpenID](%%doc.openid%%)."
 
 #. TRANS: OpenID plugin message. Title.
-#. TRANS: Title after getting the status of the OpenID authorisation request.
-#: openidlogin.php:122 finishaddopenid.php:187
+msgctxt "TITLE"
 msgid "OpenID Login"
-msgstr ""
+msgstr "Rexistro do OpenID"
+
+#. TRANS: Field label.
+msgctxt "LABEL"
+msgid "OpenID provider"
+msgstr "Provedor do OpenID"
 
 #. TRANS: OpenID plugin logon form checkbox label for setting to put the OpenID information in a cookie.
-#: openidlogin.php:169
 msgid "Remember me"
 msgstr "Lembrádeme"
 
-#. TRANS: OpenID plugin logon form field instructions.
-#: openidlogin.php:171
+#. TRANS: OpenID plugin logon form field title.
 msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
+"Identificarse automaticamente no futuro. Non se aconsella en computadores "
+"compartidos!"
 
 #. TRANS: OpenID plugin logon form button label to start logon with the data provided in the logon form.
-#: openidlogin.php:176
 msgctxt "BUTTON"
 msgid "Login"
 msgstr "Acceder ao sistema"
-
-#: openidtrust.php:52
-msgid "OpenID Identity Verification"
-msgstr ""
-
-#: openidtrust.php:70
-msgid ""
-"This page should only be reached during OpenID processing, not directly."
-msgstr ""
-
-#: openidtrust.php:118
-#, php-format
-msgid ""
-"%s  has asked to verify your identity. Click Continue to verify your "
-"identity and login without creating a new password."
-msgstr ""
-
-#: openidtrust.php:136
-msgid "Continue"
-msgstr "Continuar"
-
-#: openidtrust.php:137
-msgid "Cancel"
-msgstr "Cancelar"
-
-#. TRANS: Client error message
-#: finishaddopenid.php:68
-msgid "Not logged in."
-msgstr "Non iniciou sesión."
-
-#. TRANS: message in case a user tries to add an OpenID that is already connected to them.
-#: finishaddopenid.php:122
-msgid "You already have this OpenID!"
-msgstr ""
-
-#. TRANS: message in case a user tries to add an OpenID that is already used by another user.
-#: finishaddopenid.php:125
-msgid "Someone else already has this OpenID."
-msgstr ""
-
-#. TRANS: message in case the OpenID object cannot be connected to the user.
-#: finishaddopenid.php:138
-msgid "Error connecting user."
-msgstr ""
-
-#. TRANS: message in case the user or the user profile cannot be saved in StatusNet.
-#: finishaddopenid.php:145
-msgid "Error updating profile"
-msgstr ""
diff --git a/plugins/OpenID/locale/ia/LC_MESSAGES/OpenID.po b/plugins/OpenID/locale/ia/LC_MESSAGES/OpenID.po
index 32603e724e..838558ec7c 100644
--- a/plugins/OpenID/locale/ia/LC_MESSAGES/OpenID.po
+++ b/plugins/OpenID/locale/ia/LC_MESSAGES/OpenID.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - OpenID to Interlingua (Interlingua)
+# Translation of StatusNet - OpenID to Interlingua (interlingua)
 # Exported from translatewiki.net
 #
 # Author: McDutchie
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OpenID\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:27+0000\n"
-"Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:26+0000\n"
+"Language-Team: Interlingua <https://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:47+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-10-10 14:11:22+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-openid\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -33,12 +33,12 @@ msgstr ""
 "OpenID, non directemente."
 
 #. TRANS: Page notice. %s is a trustroot name.
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "%s has asked to verify your identity. Click Continue to verify your identity "
 "and login without creating a new password."
 msgstr ""
-"%s  ha demandate de verificar tu identitate. Clicca super Continuar pro "
+"%s ha demandate de verificar tu identitate. Clicca super Continuar pro "
 "verificar tu identitate e aperir session sin crear un nove contrasigno."
 
 #. TRANS: Button text to continue OpenID identity verification.
@@ -48,16 +48,18 @@ msgid "Continue"
 msgstr "Continuar"
 
 #. TRANS: Button text to cancel OpenID identity verification.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Cancel"
 msgstr "Cancellar"
 
+#. TRANS: Client exception thrown when an action is not available.
+msgid "Unavailable action."
+msgstr "Action indisponibile."
+
 #. TRANS: Tooltip for main menu option "Login"
-#, fuzzy
 msgctxt "TOOLTIP"
 msgid "Login to the site."
-msgstr "Authenticar te a iste sito"
+msgstr "Authenticar te a iste sito."
 
 #. TRANS: Main menu option when not logged in to log in
 msgctxt "MENU"
@@ -75,10 +77,9 @@ msgid "Help"
 msgstr "Adjuta"
 
 #. TRANS: Tooltip for main menu option "Search"
-#, fuzzy
 msgctxt "TOOLTIP"
 msgid "Search for people or text."
-msgstr "Cercar personas o texto"
+msgstr "Cercar personas o texto."
 
 #. TRANS: Main menu option when logged in or when the StatusNet instance is not private
 msgctxt "MENU"
@@ -93,26 +94,46 @@ msgid "OpenID"
 msgstr "OpenID"
 
 #. TRANS: OpenID plugin tooltip for logon menu item.
-#, fuzzy
 msgid "Login or register with OpenID."
-msgstr "Aperir session o crear conto via OpenID"
+msgstr "Aperir session o crear conto via OpenID."
 
 #. TRANS: OpenID plugin tooltip for user settings menu item.
-#, fuzzy
 msgid "Add or remove OpenIDs."
-msgstr "Adder o remover OpenIDs"
+msgstr "Adder o remover OpenIDs."
 
-#. TRANS: Item on help page. This message contains Markdown links in the form [description](link).
+#. TRANS: Page notice for logged in users to try and get them to add an OpenID account to their StatusNet account.
+#. TRANS: This message contains Markdown links in the form (description)[link].
 #, php-format
 msgid ""
-"* [OpenID](%%doc.openid%%) - What OpenID is and how to use it with this "
-"service."
+"(Have an [OpenID](http://openid.net/)? [Add an OpenID to your account](%%"
+"action.openidsettings%%)!"
 msgstr ""
+"(Possede un [OpenID](http://openid.net/)? [Adde un OpenID a tu conto](%%"
+"action.openidsettings%%)!"
+
+#. TRANS: Page notice for anonymous users to try and get them to register with an OpenID account.
+#. TRANS: This message contains Markdown links in the form (description)[link].
+#, php-format
+msgid ""
+"(Have an [OpenID](http://openid.net/)? Try our [OpenID registration](%%"
+"action.openidlogin%%)!)"
+msgstr ""
+"(Possede un [OpenID](http://openid.net/)? Proba nostre [registration per "
+"OpenID](%%action.openidlogin%%)!)"
+
+#. TRANS: Page notice on the login page to try and get them to log on with an OpenID account.
+#. TRANS: This message contains Markdown links in the form (description)[link].
+#, php-format
+msgid ""
+"(Have an [OpenID](http://openid.net/)? Try our [OpenID login](%%action."
+"openidlogin%%)!)"
+msgstr ""
+"(Possede un [OpenID](http://openid.net/)? Tenta [aperir session per OpenID](%"
+"%action.openidlogin%%)!)"
 
 #. TRANS: Tooltip for OpenID configuration menu item.
-#, fuzzy
 msgid "OpenID configuration."
-msgstr "Configuration de OpenID"
+msgstr "Configuration de OpenID."
 
 #. TRANS: Plugin description.
 msgid "Use <a href=\"http://openid.net/\">OpenID</a> to login to the site."
@@ -120,7 +141,6 @@ msgstr ""
 "Usar <a href=\"http://openid.net/\">OpenID</a> pro aperir session al sito."
 
 #. TRANS: OpenID plugin logon form legend.
-#, fuzzy
 msgctxt "LEGEND"
 msgid "OpenID login"
 msgstr "Apertura de session via OpenID"
@@ -145,9 +165,8 @@ msgstr "URL OpenID"
 
 #. TRANS: OpenID plugin logon form field instructions.
 #. TRANS: OpenID plugin logon form field title.
-#, fuzzy
 msgid "Your OpenID URL."
-msgstr "Tu URL de OpenID"
+msgstr "Tu URL de OpenID."
 
 #. TRANS: Client error message trying to log on with OpenID while already logged on.
 msgid "Already logged in."
@@ -159,7 +178,6 @@ msgid "There was a problem with your session token. Try again, please."
 msgstr "Occurreva un problema con le indicio de tu session. Per favor reproba."
 
 #. TRANS: Message given if user does not agree with the site's license.
-#, fuzzy
 msgid "You cannot register if you do not agree to the license."
 msgstr "Tu non pote crear un conto si tu non accepta le licentia."
 
@@ -169,7 +187,7 @@ msgstr "Un error incognite ha occurrite."
 
 #. TRANS: Instructions given after a first successful logon using OpenID.
 #. TRANS: %s is the site name.
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "This is the first time you have logged into %s so we must connect your "
 "OpenID to a local account. You can either create a new account, or connect "
@@ -180,7 +198,6 @@ msgstr ""
 "connecter con tu conto existente, si tu ha un."
 
 #. TRANS: Title
-#, fuzzy
 msgctxt "TITLE"
 msgid "OpenID Account Setup"
 msgstr "Configuration de conto OpenID"
@@ -259,13 +276,12 @@ msgstr "Authentication OpenID cancellate."
 #. TRANS: OpenID authentication failed; display the error message. %s is the error message.
 #. TRANS: OpenID authentication failed; display the error message.
 #. TRANS: %s is the error message.
-#, fuzzy, php-format
+#, php-format
 msgid "OpenID authentication failed: %s."
-msgstr "Le authentication OpenID ha fallite: %s"
+msgstr "Le authentication OpenID ha fallite: %s."
 
 #. TRANS: Message displayed when OpenID authentication is aborted.
 #. TRANS: OpenID authentication error.
-#, fuzzy
 msgid ""
 "OpenID authentication aborted: You are not allowed to login to this site."
 msgstr ""
@@ -316,15 +332,15 @@ msgstr "Non es un OpenID valide."
 
 #. TRANS: OpenID plugin server error. Given when the OpenID authentication request fails.
 #. TRANS: %s is the failure message.
-#, fuzzy, php-format
+#, php-format
 msgid "OpenID failure: %s."
-msgstr "Fallimento de OpenID: %s"
+msgstr "Fallimento de OpenID: %s."
 
 #. TRANS: OpenID plugin server error. Given when the OpenID authentication request cannot be redirected.
 #. TRANS: %s is the failure message.
-#, fuzzy, php-format
+#, php-format
 msgid "Could not redirect to server: %s."
-msgstr "Non poteva rediriger al servitor: %s"
+msgstr "Non poteva rediriger al servitor: %s."
 
 #. TRANS: OpenID plugin user instructions.
 msgid ""
@@ -364,7 +380,6 @@ msgstr ""
 "tenta pulsar le button hic infra."
 
 #. TRANS: Title for OpenID bridge administration page.
-#, fuzzy
 msgctxt "TITLE"
 msgid "OpenID Settings"
 msgstr "Configuration OpenID"
@@ -374,17 +389,14 @@ msgid "OpenID settings"
 msgstr "Configuration OpenID"
 
 #. TRANS: Client error displayed when OpenID provider URL is too long.
-#, fuzzy
 msgid "Invalid provider URL. Maximum length is 255 characters."
-msgstr "URL de fornitor invalide. Longitude maximal es 255 characteres."
+msgstr "URL de fornitor invalide. Longitude maxime es 255 characteres."
 
 #. TRANS: Client error displayed when Launchpad team name is too long.
-#, fuzzy
 msgid "Invalid team name. Maximum length is 255 characters."
-msgstr "Nomine de equipa invalide. Longitude maximal es 255 characteres."
+msgstr "Nomine de equipa invalide. Longitude maxime es 255 characteres."
 
 #. TRANS: Fieldset legend.
-#, fuzzy
 msgctxt "LEGEND"
 msgid "Trusted provider"
 msgstr "Fornitor de confidentia"
@@ -436,7 +448,6 @@ msgstr ""
 "specificate (extension de Launchpad)."
 
 #. TRANS: Fieldset legend.
-#, fuzzy
 msgctxt "LEGEND"
 msgid "Options"
 msgstr "Optiones"
@@ -454,7 +465,6 @@ msgstr ""
 "authentication per contrasigno pro tote le usatores!"
 
 #. TRANS: Button text to save OpenID settings.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Salveguardar"
@@ -480,16 +490,14 @@ msgid "Error connecting user."
 msgstr "Error durante le connexion del usator."
 
 #. TRANS: Message in case the user or the user profile cannot be saved in StatusNet.
-#, fuzzy
 msgid "Error updating profile."
-msgstr "Error durante le actualisation del profilo"
+msgstr "Error durante le actualisation del profilo."
 
 #. TRANS: Title after getting the status of the OpenID authorisation request.
 msgid "OpenID Login"
 msgstr "Apertura de session via OpenID"
 
 #. TRANS: Title of OpenID settings page for a user.
-#, fuzzy
 msgctxt "TITLE"
 msgid "OpenID settings"
 msgstr "Configuration OpenID"
@@ -505,7 +513,6 @@ msgstr ""
 "conto de usator. Tu pote gerer hic tu OpenIDs associate."
 
 #. TRANS: Fieldset legend.
-#, fuzzy
 msgctxt "LEGEND"
 msgid "Add OpenID"
 msgstr "Adder OpenID"
@@ -519,13 +526,11 @@ msgstr ""
 "clicca \"Adder\"."
 
 #. TRANS: Button text for adding an OpenID URL.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Add"
 msgstr "Adder"
 
 #. TRANS: Header on OpenID settings page.
-#, fuzzy
 msgctxt "HEADER"
 msgid "Remove OpenID"
 msgstr "Remover OpenID"
@@ -547,7 +552,6 @@ msgstr ""
 
 #. TRANS: Button text to remove an OpenID.
 #. TRANS: Button text to remove an OpenID trustroot.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "Remover"
@@ -566,7 +570,6 @@ msgstr ""
 "accesso a tu OpenID."
 
 #. TRANS: Form validation error if no OpenID providers can be added.
-#, fuzzy
 msgid "Cannot add new providers."
 msgstr "Non pote adder nove fornitores."
 
@@ -579,9 +582,8 @@ msgid "No such OpenID trustroot."
 msgstr "Iste \"trustroot\" de OpenID non existe."
 
 #. TRANS: Success message after removing trustroots.
-#, fuzzy
 msgid "Trustroots removed."
-msgstr "\"Trustroots\" removite"
+msgstr "\"Trustroots\" removite."
 
 #. TRANS: Form validation error for a non-existing OpenID.
 msgid "No such OpenID."
@@ -623,12 +625,11 @@ msgid "Login with an [OpenID](%%doc.openid%%) account."
 msgstr "Aperir session con un conto [OpenID](%%doc.openid%%)."
 
 #. TRANS: OpenID plugin message. Title.
-#, fuzzy
 msgctxt "TITLE"
 msgid "OpenID Login"
 msgstr "Apertura de session via OpenID"
 
-#, fuzzy
+#. TRANS: Field label.
 msgctxt "LABEL"
 msgid "OpenID provider"
 msgstr "Fornitor de OpenID"
@@ -647,9 +648,3 @@ msgstr ""
 msgctxt "BUTTON"
 msgid "Login"
 msgstr "Aperir session"
-
-#~ msgid "Continue"
-#~ msgstr "Continuar"
-
-#~ msgid "OpenID"
-#~ msgstr "OpenID"
diff --git a/plugins/OpenID/locale/it/LC_MESSAGES/OpenID.po b/plugins/OpenID/locale/it/LC_MESSAGES/OpenID.po
new file mode 100644
index 0000000000..c60c3a00b0
--- /dev/null
+++ b/plugins/OpenID/locale/it/LC_MESSAGES/OpenID.po
@@ -0,0 +1,649 @@
+# Translation of StatusNet - OpenID to Italian (italiano)
+# Exported from translatewiki.net
+#
+# Author: GreenFox
+# Author: Od1n
+# Author: Ximo17
+# Author: 1009
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - OpenID\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:26+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-10-10 14:11:22+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Title for identity verification page.
+msgid "OpenID Identity Verification"
+msgstr "Verifica dell'identità OpenID"
+
+#. TRANS: Client error when visiting page directly.
+msgid ""
+"This page should only be reached during OpenID processing, not directly."
+msgstr ""
+"Questa pagina dovrebbe essere visualizzata soltanto durante la procedura "
+"OpenID, non direttamente."
+
+#. TRANS: Page notice. %s is a trustroot name.
+#, php-format
+msgid ""
+"%s has asked to verify your identity. Click Continue to verify your identity "
+"and login without creating a new password."
+msgstr ""
+"%s ha richiesto di verificare la vostra identità. Cliccate su Continua per "
+"verificare la vostra identità ed accedere senza creare una nuova password."
+
+#. TRANS: Button text to continue OpenID identity verification.
+#. TRANS: button label for OAuth authorization page when needing OpenID authentication first.
+msgctxt "BUTTON"
+msgid "Continue"
+msgstr "Continua"
+
+#. TRANS: Button text to cancel OpenID identity verification.
+msgctxt "BUTTON"
+msgid "Cancel"
+msgstr "Annulla"
+
+#. TRANS: Client exception thrown when an action is not available.
+msgid "Unavailable action."
+msgstr "Azione non disponibile."
+
+#. TRANS: Tooltip for main menu option "Login"
+msgctxt "TOOLTIP"
+msgid "Login to the site."
+msgstr "Accedi al sito."
+
+#. TRANS: Main menu option when not logged in to log in
+msgctxt "MENU"
+msgid "Login"
+msgstr "Accedi"
+
+#. TRANS: Tooltip for main menu option "Help"
+msgctxt "TOOLTIP"
+msgid "Help me!"
+msgstr "Aiuto!"
+
+#. TRANS: Main menu option for help on the StatusNet site
+msgctxt "MENU"
+msgid "Help"
+msgstr "Aiuto"
+
+#. TRANS: Tooltip for main menu option "Search"
+msgctxt "TOOLTIP"
+msgid "Search for people or text."
+msgstr "Cerca delle persone o del testo."
+
+#. TRANS: Main menu option when logged in or when the StatusNet instance is not private
+msgctxt "MENU"
+msgid "Search"
+msgstr "Ricerca"
+
+#. TRANS: OpenID plugin menu item on site logon page.
+#. TRANS: OpenID plugin menu item on user settings page.
+#. TRANS: OpenID configuration menu item.
+msgctxt "MENU"
+msgid "OpenID"
+msgstr "OpenID"
+
+#. TRANS: OpenID plugin tooltip for logon menu item.
+msgid "Login or register with OpenID."
+msgstr "Accedi o registrati con OpenID"
+
+#. TRANS: OpenID plugin tooltip for user settings menu item.
+msgid "Add or remove OpenIDs."
+msgstr "Aggiungi o rimuovi OpenID."
+
+#. TRANS: Page notice for logged in users to try and get them to add an OpenID account to their StatusNet account.
+#. TRANS: This message contains Markdown links in the form (description)[link].
+#, php-format
+msgid ""
+"(Have an [OpenID](http://openid.net/)? [Add an OpenID to your account](%%"
+"action.openidsettings%%)!"
+msgstr ""
+"Possiedi un [OpenID] (http://openid.net/)? [Aggiungi un OpenID al tuo "
+"account](%%action.openidsettings%%)!"
+
+#. TRANS: Page notice for anonymous users to try and get them to register with an OpenID account.
+#. TRANS: This message contains Markdown links in the form (description)[link].
+#, php-format
+msgid ""
+"(Have an [OpenID](http://openid.net/)? Try our [OpenID registration](%%"
+"action.openidlogin%%)!)"
+msgstr ""
+"(Possiedi un [OpenID](http://openid.net/)? Prova la nostra [registrazione "
+"OpenID](%%action.openidlogin%%)!)"
+
+#. TRANS: Page notice on the login page to try and get them to log on with an OpenID account.
+#. TRANS: This message contains Markdown links in the form (description)[link].
+#, php-format
+msgid ""
+"(Have an [OpenID](http://openid.net/)? Try our [OpenID login](%%action."
+"openidlogin%%)!)"
+msgstr ""
+"(Possiedi un [OpenID](http://openid.net/)? Prova il nostro [accesso OpenID](%"
+"%action.openidlogin%%)!)"
+
+#. TRANS: Tooltip for OpenID configuration menu item.
+msgid "OpenID configuration."
+msgstr "Configurazione OpenID."
+
+#. TRANS: Plugin description.
+msgid "Use <a href=\"http://openid.net/\">OpenID</a> to login to the site."
+msgstr ""
+"Utilizzate <a href=\"http://openid.net/\">OpenID</a>per accedere al sito."
+
+#. TRANS: OpenID plugin logon form legend.
+msgctxt "LEGEND"
+msgid "OpenID login"
+msgstr "Accesso OpenID"
+
+#. TRANS: Field label.
+msgid "OpenID provider"
+msgstr "Provider OpenID"
+
+#. TRANS: Form guide.
+msgid "Enter your username."
+msgstr "Inserisci il tuo nome utente."
+
+#. TRANS: Form guide.
+msgid "You will be sent to the provider's site for authentication."
+msgstr "Sarete indirizzati al sito del provider per l'autenticazione."
+
+#. TRANS: OpenID plugin logon form field label.
+#. TRANS: Field label.
+#. TRANS: OpenID plugin logon form field label.
+msgid "OpenID URL"
+msgstr "URL OpenID"
+
+#. TRANS: OpenID plugin logon form field instructions.
+#. TRANS: OpenID plugin logon form field title.
+msgid "Your OpenID URL."
+msgstr "Il tuo URL OpenID"
+
+#. TRANS: Client error message trying to log on with OpenID while already logged on.
+msgid "Already logged in."
+msgstr "Accesso già effettuato."
+
+#. TRANS: Message given when there is a problem with the user's session token.
+#. TRANS: Client error displayed when the session token does not match or is not given.
+msgid "There was a problem with your session token. Try again, please."
+msgstr ""
+"Si è verificato un problema con il tuo token di sessione. Prova di nuovo."
+
+#. TRANS: Message given if user does not agree with the site's license.
+msgid "You cannot register if you do not agree to the license."
+msgstr "Non puoi registrarti se non accetti la licenza."
+
+#. TRANS: Messag given on an unknown error.
+msgid "An unknown error has occured."
+msgstr "Si è verificato un errore sconosciuto."
+
+#. TRANS: Instructions given after a first successful logon using OpenID.
+#. TRANS: %s is the site name.
+#, php-format
+msgid ""
+"This is the first time you have 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 ""
+"Questo è il tuo primo accesso a %s perciò dovremo connettere il tuo account "
+"OpenID ad un account locale. Puoi inoltre creare un nuovo account locale, o "
+"connetterti tramite un account locale già esistente."
+
+#. TRANS: Title
+msgctxt "TITLE"
+msgid "OpenID Account Setup"
+msgstr "Configurazione dell'account OpenID"
+
+#. TRANS: Fieldset legend.
+msgid "Create new account"
+msgstr "Crea nuovo account"
+
+#. TRANS: Form guide.
+msgid "Create a new user with this nickname."
+msgstr "Crea un nuovo utente con questo nickname."
+
+#. TRANS: Field label.
+msgid "New nickname"
+msgstr "Nuovo nickname"
+
+#. TRANS: Field title.
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
+msgstr "1-64 lettere minuscole o numeri, senza punteggiatura o spazi."
+
+#. TRANS: Field label.
+msgid "Email"
+msgstr "Email"
+
+#. TRANS: Field title.
+msgid "Used only for updates, announcements, and password recovery."
+msgstr "Usata solo per aggiornamenti, annunci e recupero password."
+
+#. TRANS: OpenID plugin link text.
+#. TRANS: %s is a link to a license with the license name as link text.
+#, php-format
+msgid ""
+"My text and files are available under %s except this private data: password, "
+"email address, IM address, and phone number."
+msgstr ""
+"I miei testi e file sono disponibili nei termini di %s a eccezione di questi "
+"dati personali: password, indirizzo email, indirizzo messaggistica "
+"istantanea e numero di telefono."
+
+#. TRANS: Button label in form in which to create a new user on the site for an OpenID.
+msgctxt "BUTTON"
+msgid "Create"
+msgstr "Crea"
+
+#. TRANS: Used as form legend for form in which to connect an OpenID to an existing user on the site.
+msgid "Connect existing account"
+msgstr "Connettere un account esistente"
+
+#. TRANS: User instructions for form in which to connect an OpenID to an existing user on the site.
+msgid ""
+"If you already have an account, login with your username and password to "
+"connect it to your OpenID."
+msgstr ""
+"Se hai già un account, effettua l'accesso con lo username e la password "
+"corrispondenti per collegarlo al tuo OpenID."
+
+#. TRANS: Field label in form in which to connect an OpenID to an existing user on the site.
+msgid "Existing nickname"
+msgstr "Nickname esistente"
+
+#. TRANS: Field label in form in which to connect an OpenID to an existing user on the site.
+msgid "Password"
+msgstr "Password"
+
+#. TRANS: Button text in form in which to connect an OpenID to an existing user on the site.
+msgctxt "BUTTON"
+msgid "Connect"
+msgstr "Collega"
+
+#. TRANS: Status message in case the response from the OpenID provider is that the logon attempt was cancelled.
+msgid "OpenID authentication cancelled."
+msgstr "Autenticazione OpenID annullata."
+
+#. TRANS: OpenID authentication failed; display the error message. %s is the error message.
+#. TRANS: OpenID authentication failed; display the error message.
+#. TRANS: %s is the error message.
+#, php-format
+msgid "OpenID authentication failed: %s."
+msgstr "L'autenticazione tramite OpenID è fallita: %s."
+
+#. TRANS: Message displayed when OpenID authentication is aborted.
+#. TRANS: OpenID authentication error.
+msgid ""
+"OpenID authentication aborted: You are not allowed to login to this site."
+msgstr ""
+"Autenticazione tramite OpenID conclusa: Non siete autorizzati ad accedere a "
+"questo sito."
+
+#. TRANS: OpenID plugin message. No new user registration is allowed on the site.
+#. TRANS: OpenID plugin message. No new user registration is allowed on the site without an invitation code, and none was provided.
+msgid "Registration not allowed."
+msgstr "Registrazione non consentita."
+
+#. TRANS: OpenID plugin message. No new user registration is allowed on the site without an invitation code, and the one provided was not valid.
+msgid "Not a valid invitation code."
+msgstr "Il codice di invito non è valido."
+
+#. TRANS: OpenID plugin message. The entered new user name is blacklisted.
+msgid "Nickname not allowed."
+msgstr "Nickname non consentito."
+
+#. TRANS: OpenID plugin message. The entered new user name is already used.
+msgid "Nickname already in use. Try another one."
+msgstr "Soprannome già in uso. Prova con un altro."
+
+#. TRANS: OpenID plugin server error. A stored OpenID cannot be retrieved.
+#. TRANS: OpenID plugin server error. A stored OpenID cannot be found.
+msgid "Stored OpenID not found."
+msgstr "OpenID memorizzato non trovato."
+
+#. TRANS: OpenID plugin server error.
+msgid "Creating new account for OpenID that already has a user."
+msgstr "Creazione di un nuovo account per un OpenID che ha già un utente."
+
+#. TRANS: OpenID plugin message.
+msgid "Invalid username or password."
+msgstr "Nome utente o password non validi."
+
+#. TRANS: OpenID plugin server error. The user or user profile could not be saved.
+msgid "Error connecting user to OpenID."
+msgstr "Errore durante la connessione dell'utente a OpenID."
+
+#. TRANS: OpenID plugin server error.
+msgid "Cannot instantiate OpenID consumer object."
+msgstr "Impossibile istanziare l'oggetto OpenID cliente."
+
+#. TRANS: OpenID plugin message. Given when an OpenID is not valid.
+msgid "Not a valid OpenID."
+msgstr "Non è un codice OpenID valido."
+
+#. TRANS: OpenID plugin server error. Given when the OpenID authentication request fails.
+#. TRANS: %s is the failure message.
+#, php-format
+msgid "OpenID failure: %s."
+msgstr "Autenticazione OpenID non riuscita: %s."
+
+#. TRANS: OpenID plugin server error. Given when the OpenID authentication request cannot be redirected.
+#. TRANS: %s is the failure message.
+#, php-format
+msgid "Could not redirect to server: %s."
+msgstr "Impossibile reindirizzare verso il server: %s."
+
+#. TRANS: OpenID plugin user instructions.
+msgid ""
+"This form should automatically submit itself. If not, click the submit "
+"button to go to your OpenID provider."
+msgstr ""
+"Questo formulario dovrebbe essere inviato automaticamente. In caso "
+"contrario, clicca sul pulsante \"Invia\" per accedere al tuo provider OpenID"
+
+#. TRANS: OpenID plugin server error.
+msgid "Error saving the profile."
+msgstr "Errore nel salvataggio del profilo."
+
+#. TRANS: OpenID plugin server error.
+msgid "Error saving the user."
+msgstr "Errore nel salvataggio dell'utente."
+
+#. TRANS: OpenID plugin client exception (403).
+msgid "Unauthorized URL used for OpenID login."
+msgstr "Indirizzo URL non autorizzato per l'accesso tramite OpenID"
+
+#. TRANS: Title
+msgid "OpenID Login Submission"
+msgstr "Invio richiesta di accesso tramite OpenID"
+
+#. TRANS: OpenID plugin message used while requesting authorization user's OpenID login provider.
+msgid "Requesting authorization from your login provider..."
+msgstr "Richiesta di autorizzazione dal vostro provider d'accesso..."
+
+#. TRANS: OpenID plugin message. User instruction while requesting authorization user's OpenID login provider.
+msgid ""
+"If you are not redirected to your login provider in a few seconds, try "
+"pushing the button below."
+msgstr ""
+"Se non siete reindirizzati al vostro provider d'accesso entro pochi secondi, "
+"provate a cliccare sul pulsante sottostante."
+
+#. TRANS: Title for OpenID bridge administration page.
+msgctxt "TITLE"
+msgid "OpenID Settings"
+msgstr "Impostazioni OpenID."
+
+#. TRANS: Page instructions.
+msgid "OpenID settings"
+msgstr "Impostazioni OpenID."
+
+#. TRANS: Client error displayed when OpenID provider URL is too long.
+msgid "Invalid provider URL. Maximum length is 255 characters."
+msgstr ""
+"Indirizzo URL del provider non valido. La lunghezza massima è di 255 "
+"caratteri."
+
+#. TRANS: Client error displayed when Launchpad team name is too long.
+msgid "Invalid team name. Maximum length is 255 characters."
+msgstr "Nome di squadra non valido. La lunghezza massima è di 255 caratteri."
+
+#. TRANS: Fieldset legend.
+msgctxt "LEGEND"
+msgid "Trusted provider"
+msgstr "Provider di fiducia"
+
+#. TRANS: Form guide.
+msgid ""
+"By default, users are allowed to authenticate with any OpenID provider. If "
+"you are using your own OpenID service for shared sign-in, you can restrict "
+"access to only your own users here."
+msgstr ""
+"Per impostazione predefinita, gli utenti possono autenticarsi con un "
+"qualsiasi provider OpenID. Se state utilizzando un servizio OpenID personale "
+"per la condivisione delle iscrizioni,\n"
+"potete limitare l'accesso solo alle vostre utenze qui."
+
+#. TRANS: Field label.
+msgid "Provider URL"
+msgstr "URL Provider"
+
+#. TRANS: Field title.
+msgid ""
+"All OpenID logins will be sent to this URL; other providers may not be used."
+msgstr ""
+"Tutti gli accessi OpenID saranno inoltrati a questo URL; altri fornitori non "
+"possono essere utilizzati."
+
+#. TRANS: Checkbox label.
+msgid "Append a username to base URL"
+msgstr "Aggiungere un nome utente all' URL di base"
+
+#. TRANS: Checkbox title.
+msgid ""
+"Login form will show the base URL and prompt for a username to add at the "
+"end. Use when OpenID provider URL should be the profile page for individual "
+"users."
+msgstr ""
+"Il form di accesso mostrerà l'indirizzo URL e chiederà un nome utente da "
+"aggiungere alla fine. Questa opzione è da utilizzarsi se l'URL del provider "
+"OpenID dovrà essere la pagina di profilo per utenti individuali."
+
+#. TRANS: Field label.
+msgid "Required team"
+msgstr "Squadra richiesta"
+
+#. TRANS: Field title.
+msgid "Only allow logins from users in the given team (Launchpad extension)."
+msgstr ""
+"Consente solo l'accesso da utenti provenienti dalle squadre indicate "
+"(estensione Launchpad)."
+
+#. TRANS: Fieldset legend.
+msgctxt "LEGEND"
+msgid "Options"
+msgstr "Opzioni"
+
+#. TRANS: Checkbox label.
+msgid "Enable OpenID-only mode"
+msgstr "Abilita la modalità solo OpenID"
+
+#. TRANS: Checkbox title.
+msgid ""
+"Require all users to login via OpenID. Warning: disables password "
+"authentication for all users!"
+msgstr ""
+"Si richiede a tutti gli utenti di effettuare il login tramite OpenID. "
+"Attenzione: la password di autenticazione è disabilita!"
+
+#. TRANS: Button text to save OpenID settings.
+msgctxt "BUTTON"
+msgid "Save"
+msgstr "Salva"
+
+#. TRANS: Button title to save OpenID settings.
+msgid "Save OpenID settings."
+msgstr "Salva le impostazioni di OpenID."
+
+#. TRANS: Error message displayed when trying to perform an action that requires a logged in user.
+msgid "Not logged in."
+msgstr "Accesso non effettuato."
+
+#. TRANS: Message in case a user tries to add an OpenID that is already connected to them.
+msgid "You already have this OpenID!"
+msgstr "Avete già questo OpenID!"
+
+#. TRANS: Message in case a user tries to add an OpenID that is already used by another user.
+msgid "Someone else already has this OpenID."
+msgstr "Qualcun altro possiede già questo OpenID."
+
+#. TRANS: Message in case the OpenID object cannot be connected to the user.
+msgid "Error connecting user."
+msgstr "Errore durante la connessione dell'utente."
+
+#. TRANS: Message in case the user or the user profile cannot be saved in StatusNet.
+msgid "Error updating profile."
+msgstr "Errore durante l'aggiornamento del profilo."
+
+#. TRANS: Title after getting the status of the OpenID authorisation request.
+msgid "OpenID Login"
+msgstr "Accesso OpenID"
+
+#. TRANS: Title of OpenID settings page for a user.
+msgctxt "TITLE"
+msgid "OpenID settings"
+msgstr "Impostazioni OpenID."
+
+#. TRANS: Form instructions for OpenID settings.
+#. TRANS: This message contains Markdown links in the form [description](link).
+#, 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%%) permette di accedere a molti siti con lo stesso "
+"account utente. Gestisci i tuoi OpenID associati da qui."
+
+#. TRANS: Fieldset legend.
+msgctxt "LEGEND"
+msgid "Add OpenID"
+msgstr "Aggiungi OpenID"
+
+#. TRANS: Form guide.
+msgid ""
+"If you want to add an OpenID to your account, enter it in the box below and "
+"click \"Add\"."
+msgstr ""
+"Se desiderate aggiungere un OpenID al vostro account, inseritelo nella "
+"casella sottostante e cliccate su \"Aggiungi\"."
+
+#. TRANS: Button text for adding an OpenID URL.
+msgctxt "BUTTON"
+msgid "Add"
+msgstr "Aggiungi"
+
+#. TRANS: Header on OpenID settings page.
+msgctxt "HEADER"
+msgid "Remove OpenID"
+msgstr "Rimuovi OpenID"
+
+#. TRANS: Form guide.
+msgid ""
+"Removing your only OpenID would make it impossible to log in! If you need to "
+"remove it, add another OpenID first."
+msgstr ""
+"Rimuovendo il vostro unico OpenID non potrete più effettuare l'accesso! Se "
+"dovete rimuoverlo, prima aggiungete un altro OpenID."
+
+#. TRANS: Form guide.
+msgid ""
+"You can remove an OpenID from your account by clicking the button marked "
+"\"Remove\"."
+msgstr ""
+"Potete rimuovere un OpenID dal vostro account cliccando sul pulsante con la "
+"scritta \"Rimuovi\"."
+
+#. TRANS: Button text to remove an OpenID.
+#. TRANS: Button text to remove an OpenID trustroot.
+msgctxt "BUTTON"
+msgid "Remove"
+msgstr "Rimuovi"
+
+#. TRANS: Fieldset legend.
+msgid "OpenID Trusted Sites"
+msgstr "Siti OpenID Attendibili"
+
+#. TRANS: Form guide.
+msgid ""
+"The following sites are allowed to access your identity and log you in. You "
+"can remove a site from this list to deny it access to your OpenID."
+msgstr ""
+"I seguenti siti sono autorizzati ad accedere alla tua identità ed effettuare "
+"l'accesso. Puoi rimuovere un sito da questa lista per negargli l'accesso al "
+"tuo OpenID."
+
+#. TRANS: Form validation error if no OpenID providers can be added.
+msgid "Cannot add new providers."
+msgstr "Impossibile aggiungere dei nuovi provider."
+
+#. TRANS: Unexpected form validation error.
+msgid "Something weird happened."
+msgstr "E' successo qualcosa di buffo."
+
+#. TRANS: Form validation error when trying to remove a non-existing trustroot.
+msgid "No such OpenID trustroot."
+msgstr "OpenID di fiducia inesistente."
+
+#. TRANS: Success message after removing trustroots.
+msgid "Trustroots removed."
+msgstr "Origini verificate rimosse."
+
+#. TRANS: Form validation error for a non-existing OpenID.
+msgid "No such OpenID."
+msgstr "OpenID inesistente."
+
+#. TRANS: Form validation error if OpenID is connected to another user.
+msgid "That OpenID does not belong to you."
+msgstr "Questo OpenID non vi appartiene."
+
+#. TRANS: Success message after removing an OpenID.
+msgid "OpenID removed."
+msgstr "OpenID rimosso."
+
+#. TRANS: OpenID plugin client error given trying to add an unauthorised OpenID to a user (403).
+#. TRANS: %s is a request identity.
+#, php-format
+msgid "You are not authorized to use the identity %s."
+msgstr "Non siete autorizzati ad utilizzare l'identità %s."
+
+#. TRANS: OpenID plugin client error given when not getting a response for a given OpenID provider (500).
+msgid "Just an OpenID provider. Nothing to see here, move along..."
+msgstr ""
+"E' solo un provider OpenID. Non c'è niente da vedere qui, proseguite..."
+
+#. TRANS: OpenID plugin message. Rememberme logins have to reauthenticate before changing any profile settings.
+#. TRANS: "OpenID" is the display text for a link with URL "(%%doc.openid%%)".
+#, php-format
+msgid ""
+"For security reasons, please re-login with your [OpenID](%%doc.openid%%) "
+"before changing your settings."
+msgstr ""
+"Per ragioni di sicurezza, per favore effettuate nuovamente l'accesso con il "
+"vostro [OpenID] (%%doc.openid%%) prima di modificare le vostre impostazioni."
+
+#. TRANS: OpenID plugin message.
+#. TRANS: "OpenID" is the display text for a link with URL "(%%doc.openid%%)".
+#, php-format
+msgid "Login with an [OpenID](%%doc.openid%%) account."
+msgstr "Accesso con un account [OpenID](%%doc.openid%%)."
+
+#. TRANS: OpenID plugin message. Title.
+msgctxt "TITLE"
+msgid "OpenID Login"
+msgstr "Accesso OpenID"
+
+#. TRANS: Field label.
+msgctxt "LABEL"
+msgid "OpenID provider"
+msgstr "Provider OpenID"
+
+#. TRANS: OpenID plugin logon form checkbox label for setting to put the OpenID information in a cookie.
+msgid "Remember me"
+msgstr "Ricordati di me"
+
+#. TRANS: OpenID plugin logon form field title.
+msgid "Automatically login in the future; not for shared computers!"
+msgstr "Accedi automaticamente in futuro; non per computer condivisi!"
+
+#. TRANS: OpenID plugin logon form button label to start logon with the data provided in the logon form.
+msgctxt "BUTTON"
+msgid "Login"
+msgstr "Accedi"
diff --git a/plugins/OpenID/locale/ko/LC_MESSAGES/OpenID.po b/plugins/OpenID/locale/ko/LC_MESSAGES/OpenID.po
index 8070377dd3..3ee3658da4 100644
--- a/plugins/OpenID/locale/ko/LC_MESSAGES/OpenID.po
+++ b/plugins/OpenID/locale/ko/LC_MESSAGES/OpenID.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OpenID\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:27+0000\n"
-"Language-Team: Korean <http://translatewiki.net/wiki/Portal:ko>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:26+0000\n"
+"Language-Team: Korean <https://translatewiki.net/wiki/Portal:ko>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:47+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-10-10 14:11:22+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ko\n"
 "X-Message-Group: #out-statusnet-plugin-openid\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
@@ -52,6 +52,10 @@ msgctxt "BUTTON"
 msgid "Cancel"
 msgstr "취소"
 
+#. TRANS: Client exception thrown when an action is not available.
+msgid "Unavailable action."
+msgstr ""
+
 #. TRANS: Tooltip for main menu option "Login"
 #, fuzzy
 msgctxt "TOOLTIP"
@@ -101,11 +105,28 @@ msgstr "오픈아�디로 로그� �는 가입"
 msgid "Add or remove OpenIDs."
 msgstr "오픈아�디 추가 �는 제거"
 
-#. TRANS: Item on help page. This message contains Markdown links in the form [description](link).
+#. TRANS: Page notice for logged in users to try and get them to add an OpenID account to their StatusNet account.
+#. TRANS: This message contains Markdown links in the form (description)[link].
 #, php-format
 msgid ""
-"* [OpenID](%%doc.openid%%) - What OpenID is and how to use it with this "
-"service."
+"(Have an [OpenID](http://openid.net/)? [Add an OpenID to your account](%%"
+"action.openidsettings%%)!"
+msgstr ""
+
+#. TRANS: Page notice for anonymous users to try and get them to register with an OpenID account.
+#. TRANS: This message contains Markdown links in the form (description)[link].
+#, php-format
+msgid ""
+"(Have an [OpenID](http://openid.net/)? Try our [OpenID registration](%%"
+"action.openidlogin%%)!)"
+msgstr ""
+
+#. TRANS: Page notice on the login page to try and get them to log on with an OpenID account.
+#. TRANS: This message contains Markdown links in the form (description)[link].
+#, php-format
+msgid ""
+"(Have an [OpenID](http://openid.net/)? Try our [OpenID login](%%action."
+"openidlogin%%)!)"
 msgstr ""
 
 #. TRANS: Tooltip for OpenID configuration menu item.
@@ -615,6 +636,7 @@ msgctxt "TITLE"
 msgid "OpenID Login"
 msgstr "오픈아�디 로그�"
 
+#. TRANS: Field label.
 #, fuzzy
 msgctxt "LABEL"
 msgid "OpenID provider"
@@ -632,9 +654,3 @@ msgstr "앞으로는 ��으로 로그�합니다. 공용 컴퓨터�서는
 msgctxt "BUTTON"
 msgid "Login"
 msgstr "로그�"
-
-#~ msgid "Continue"
-#~ msgstr "계�"
-
-#~ msgid "OpenID"
-#~ msgstr "오픈아�디"
diff --git a/plugins/OpenID/locale/mk/LC_MESSAGES/OpenID.po b/plugins/OpenID/locale/mk/LC_MESSAGES/OpenID.po
index 67e268be09..e9049bf604 100644
--- a/plugins/OpenID/locale/mk/LC_MESSAGES/OpenID.po
+++ b/plugins/OpenID/locale/mk/LC_MESSAGES/OpenID.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - OpenID to Macedonian (Македон�ки)
+# Translation of StatusNet - OpenID to Macedonian (македон�ки)
 # Exported from translatewiki.net
 #
 # Author: Bjankuloski06
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OpenID\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:27+0000\n"
-"Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:27+0000\n"
+"Language-Team: Macedonian <https://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:47+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-10-10 14:11:22+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-openid\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
@@ -33,12 +33,12 @@ msgstr ""
 "не директно."
 
 #. TRANS: Page notice. %s is a trustroot name.
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "%s has asked to verify your identity. Click Continue to verify your identity "
 "and login without creating a new password."
 msgstr ""
-"%s  побара да го потврдите Вашиот идентитет. Кликнете на „Продолжи“ за да "
+"%s побара да го потврдите Вашиот идентитет. Кликнете на „Продолжи“ за да "
 "потврдите и да �е најавите без да треба да �тавате нова лозинка."
 
 #. TRANS: Button text to continue OpenID identity verification.
@@ -48,13 +48,15 @@ msgid "Continue"
 msgstr "Продолжи"
 
 #. TRANS: Button text to cancel OpenID identity verification.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Cancel"
 msgstr "Откажи"
 
+#. TRANS: Client exception thrown when an action is not available.
+msgid "Unavailable action."
+msgstr "Деј�твото е недо�тапно."
+
 #. TRANS: Tooltip for main menu option "Login"
-#, fuzzy
 msgctxt "TOOLTIP"
 msgid "Login to the site."
 msgstr "�ајава на мреж. ме�то"
@@ -75,10 +77,9 @@ msgid "Help"
 msgstr "Помош"
 
 #. TRANS: Tooltip for main menu option "Search"
-#, fuzzy
 msgctxt "TOOLTIP"
 msgid "Search for people or text."
-msgstr "Пребарување на луѓе или тек�т"
+msgstr "Пребарување на луѓе или тек�т."
 
 #. TRANS: Main menu option when logged in or when the StatusNet instance is not private
 msgctxt "MENU"
@@ -93,33 +94,52 @@ msgid "OpenID"
 msgstr "OpenID"
 
 #. TRANS: OpenID plugin tooltip for logon menu item.
-#, fuzzy
 msgid "Login or register with OpenID."
-msgstr "�ајава или реги�трација �о OpenID"
+msgstr "�ајава или реги�трација �о OpenID."
 
 #. TRANS: OpenID plugin tooltip for user settings menu item.
-#, fuzzy
 msgid "Add or remove OpenIDs."
-msgstr "Додај или от�трани OpenID-ја"
+msgstr "Додај или от�трани OpenID-ја."
 
-#. TRANS: Item on help page. This message contains Markdown links in the form [description](link).
+#. TRANS: Page notice for logged in users to try and get them to add an OpenID account to their StatusNet account.
+#. TRANS: This message contains Markdown links in the form (description)[link].
 #, php-format
 msgid ""
-"* [OpenID](%%doc.openid%%) - What OpenID is and how to use it with this "
-"service."
+"(Have an [OpenID](http://openid.net/)? [Add an OpenID to your account](%%"
+"action.openidsettings%%)!"
 msgstr ""
+"(Имате [OpenID](http://openid.net/)? [Додајте � OpenID на �метката](%%action."
+"openidsettings%%)!"
+
+#. TRANS: Page notice for anonymous users to try and get them to register with an OpenID account.
+#. TRANS: This message contains Markdown links in the form (description)[link].
+#, php-format
+msgid ""
+"(Have an [OpenID](http://openid.net/)? Try our [OpenID registration](%%"
+"action.openidlogin%%)!)"
+msgstr ""
+"(Имате [OpenID](http://openid.net/)? Ви предлагаме да �е [реги�трирате �о "
+"OpenID](%%action.openidlogin%%)!)"
+
+#. TRANS: Page notice on the login page to try and get them to log on with an OpenID account.
+#. TRANS: This message contains Markdown links in the form (description)[link].
+#, php-format
+msgid ""
+"(Have an [OpenID](http://openid.net/)? Try our [OpenID login](%%action."
+"openidlogin%%)!)"
+msgstr ""
+"(Имате [OpenID](http://openid.net/)? Ви предлагаме да �е [најавите �о OpenID]"
+"(%%action.openidlogin%%)!)"
 
 #. TRANS: Tooltip for OpenID configuration menu item.
-#, fuzzy
 msgid "OpenID configuration."
-msgstr "По�тавки за OpenID"
+msgstr "По�тавки за OpenID."
 
 #. TRANS: Plugin description.
 msgid "Use <a href=\"http://openid.net/\">OpenID</a> to login to the site."
 msgstr "Кори�тете <a href=\"http://openid.net/\">OpenID</a> за најава."
 
 #. TRANS: OpenID plugin logon form legend.
-#, fuzzy
 msgctxt "LEGEND"
 msgid "OpenID login"
 msgstr "�ајава �о OpenID"
@@ -144,9 +164,8 @@ msgstr "URL на OpenID"
 
 #. TRANS: OpenID plugin logon form field instructions.
 #. TRANS: OpenID plugin logon form field title.
-#, fuzzy
 msgid "Your OpenID URL."
-msgstr "URL-адре�а на Вашиот OpenID"
+msgstr "URL-адре�а на Вашиот OpenID."
 
 #. TRANS: Client error message trying to log on with OpenID while already logged on.
 msgid "Already logged in."
@@ -158,7 +177,6 @@ msgid "There was a problem with your session token. Try again, please."
 msgstr "Се појави проблем �о жетонот на Вашата �е�ија. Обидете �е подоцна."
 
 #. TRANS: Message given if user does not agree with the site's license.
-#, fuzzy
 msgid "You cannot register if you do not agree to the license."
 msgstr "�е можете да �е реги�трирате ако не �е �огла�увате �о лиценцата."
 
@@ -168,7 +186,7 @@ msgstr "Се појави непозната грешка."
 
 #. TRANS: Instructions given after a first successful logon using OpenID.
 #. TRANS: %s is the site name.
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "This is the first time you have logged into %s so we must connect your "
 "OpenID to a local account. You can either create a new account, or connect "
@@ -179,10 +197,9 @@ msgstr ""
 "�е поврзете �о Вашата по�тоечка �метка (ако ја имате)."
 
 #. TRANS: Title
-#, fuzzy
 msgctxt "TITLE"
 msgid "OpenID Account Setup"
-msgstr "По�тавување на OpenID-�метка"
+msgstr "Во�по�тавување на OpenID-�метка"
 
 #. TRANS: Fieldset legend.
 msgid "Create new account"
@@ -255,17 +272,16 @@ msgstr "Потврдувањето на OpenID е откажано."
 #. TRANS: OpenID authentication failed; display the error message. %s is the error message.
 #. TRANS: OpenID authentication failed; display the error message.
 #. TRANS: %s is the error message.
-#, fuzzy, php-format
+#, php-format
 msgid "OpenID authentication failed: %s."
-msgstr "Потврдувањето на OpenID не у�пеа: %s"
+msgstr "Заверката на OpenID не у�пеа: %s"
 
 #. TRANS: Message displayed when OpenID authentication is aborted.
 #. TRANS: OpenID authentication error.
-#, fuzzy
 msgid ""
 "OpenID authentication aborted: You are not allowed to login to this site."
 msgstr ""
-"Потврдата за OpenID е откажана: не Ви е дозволено да �е најавите на ова "
+"Заверката на OpenID е откажана: �е Ви е дозволено да �е најавувате на ова "
 "мреж. ме�то."
 
 #. TRANS: OpenID plugin message. No new user registration is allowed on the site.
@@ -312,15 +328,15 @@ msgstr "Ова не е важечки OpenID."
 
 #. TRANS: OpenID plugin server error. Given when the OpenID authentication request fails.
 #. TRANS: %s is the failure message.
-#, fuzzy, php-format
+#, php-format
 msgid "OpenID failure: %s."
-msgstr "OpenID не у�пеа: %s"
+msgstr "OpenID не у�пеа: %s."
 
 #. TRANS: OpenID plugin server error. Given when the OpenID authentication request cannot be redirected.
 #. TRANS: %s is the failure message.
-#, fuzzy, php-format
+#, php-format
 msgid "Could not redirect to server: %s."
-msgstr "�е можев да прена�очам кон оп�лужувачот: %s"
+msgstr "�е можев да прена�очам кон оп�лужувачот: %s."
 
 #. TRANS: OpenID plugin user instructions.
 msgid ""
@@ -359,7 +375,6 @@ msgstr ""
 "тогаш при�ти�нете го копчето подолу."
 
 #. TRANS: Title for OpenID bridge administration page.
-#, fuzzy
 msgctxt "TITLE"
 msgid "OpenID Settings"
 msgstr "�агодувања за OpenID"
@@ -369,17 +384,14 @@ msgid "OpenID settings"
 msgstr "�агодувања за OpenID"
 
 #. TRANS: Client error displayed when OpenID provider URL is too long.
-#, fuzzy
 msgid "Invalid provider URL. Maximum length is 255 characters."
-msgstr "�еважечка URL-адре�а за у�лужителот. Дозволени �е највеќе 255 знаци."
+msgstr "�еважечка URL-адре�а за у�лужникот. Дозволени �е највеќе 255 знаци."
 
 #. TRANS: Client error displayed when Launchpad team name is too long.
-#, fuzzy
 msgid "Invalid team name. Maximum length is 255 characters."
 msgstr "�еважечко екипно име. Дозволени �е највеќе 255 знаци."
 
 #. TRANS: Fieldset legend.
-#, fuzzy
 msgctxt "LEGEND"
 msgid "Trusted provider"
 msgstr "У�лужник од доверба"
@@ -429,10 +441,9 @@ msgstr ""
 "Дозволувај �амо најави на кори�ници од дадената екипа (додаток „Launchpad“)."
 
 #. TRANS: Fieldset legend.
-#, fuzzy
 msgctxt "LEGEND"
 msgid "Options"
-msgstr "�агодувања"
+msgstr "По�тавки"
 
 #. TRANS: Checkbox label.
 msgid "Enable OpenID-only mode"
@@ -447,7 +458,6 @@ msgstr ""
 "ја оневозможува потврдата на лозинка за �ите кори�ници!"
 
 #. TRANS: Button text to save OpenID settings.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Зачувај"
@@ -473,16 +483,14 @@ msgid "Error connecting user."
 msgstr "Грешка при поврзувањето на кори�никот."
 
 #. TRANS: Message in case the user or the user profile cannot be saved in StatusNet.
-#, fuzzy
 msgid "Error updating profile."
-msgstr "Грешка при подновувањето на профилот"
+msgstr "Грешка при подновувањето на профилот."
 
 #. TRANS: Title after getting the status of the OpenID authorisation request.
 msgid "OpenID Login"
-msgstr "OpenID-�ајава"
+msgstr "�ајава на OpenID"
 
 #. TRANS: Title of OpenID settings page for a user.
-#, fuzzy
 msgctxt "TITLE"
 msgid "OpenID settings"
 msgstr "�агодувања за OpenID"
@@ -499,7 +507,6 @@ msgstr ""
 "OpenID-ја."
 
 #. TRANS: Fieldset legend.
-#, fuzzy
 msgctxt "LEGEND"
 msgid "Add OpenID"
 msgstr "Додај OpenID"
@@ -513,13 +520,11 @@ msgstr ""
 "полето подолу и кликнете на „Додај“."
 
 #. TRANS: Button text for adding an OpenID URL.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Add"
 msgstr "Додај"
 
 #. TRANS: Header on OpenID settings page.
-#, fuzzy
 msgctxt "HEADER"
 msgid "Remove OpenID"
 msgstr "От�трани OpenID"
@@ -540,7 +545,6 @@ msgstr "От�транувањето на OpenID од �метката �е вр
 
 #. TRANS: Button text to remove an OpenID.
 #. TRANS: Button text to remove an OpenID trustroot.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "От�трани"
@@ -559,9 +563,8 @@ msgstr ""
 "OpenID, тогаш от�транете го од �пи�оков."
 
 #. TRANS: Form validation error if no OpenID providers can be added.
-#, fuzzy
 msgid "Cannot add new providers."
-msgstr "�е можам да додадам нови у�лужители."
+msgstr "�е можам да додадам нови у�лужници."
 
 #. TRANS: Unexpected form validation error.
 msgid "Something weird happened."
@@ -572,9 +575,8 @@ msgid "No such OpenID trustroot."
 msgstr "�ема таков довербен извор (trustroot) за OpenID"
 
 #. TRANS: Success message after removing trustroots.
-#, fuzzy
 msgid "Trustroots removed."
-msgstr "Довербените извори (trustroots) �е от�транети"
+msgstr "Довербените извори (trustroots) �е от�транети."
 
 #. TRANS: Form validation error for a non-existing OpenID.
 msgid "No such OpenID."
@@ -616,15 +618,14 @@ msgid "Login with an [OpenID](%%doc.openid%%) account."
 msgstr "�ајава �о �метка на [OpenID](%%doc.openid%%)."
 
 #. TRANS: OpenID plugin message. Title.
-#, fuzzy
 msgctxt "TITLE"
 msgid "OpenID Login"
-msgstr "OpenID-�ајава"
+msgstr "OpenID - �ајава"
 
-#, fuzzy
+#. TRANS: Field label.
 msgctxt "LABEL"
 msgid "OpenID provider"
-msgstr "У�лужител за OpenID"
+msgstr "У�лужник за OpenID"
 
 #. TRANS: OpenID plugin logon form checkbox label for setting to put the OpenID information in a cookie.
 msgid "Remember me"
@@ -633,15 +634,9 @@ msgstr "Запомни ме"
 #. TRANS: OpenID plugin logon form field title.
 msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
-"От�ега врши автомат�ка најава. �е треба да �е кори�ти за јавни �метачи!"
+"От�ега врши автомат�ка најава (не треба да �е кори�ти на јавни �метачи!)"
 
 #. TRANS: OpenID plugin logon form button label to start logon with the data provided in the logon form.
 msgctxt "BUTTON"
 msgid "Login"
 msgstr "�ајава"
-
-#~ msgid "Continue"
-#~ msgstr "Продолжи"
-
-#~ msgid "OpenID"
-#~ msgstr "OpenID"
diff --git a/plugins/OpenID/locale/nl/LC_MESSAGES/OpenID.po b/plugins/OpenID/locale/nl/LC_MESSAGES/OpenID.po
index 0af9911121..7916925d8c 100644
--- a/plugins/OpenID/locale/nl/LC_MESSAGES/OpenID.po
+++ b/plugins/OpenID/locale/nl/LC_MESSAGES/OpenID.po
@@ -10,17 +10,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OpenID\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:27+0000\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:27+0000\n"
 "Last-Translator: Siebrand Mazeland <s.mazeland@xs4all.nl>\n"
-"Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
+"Language-Team: Dutch <https://translatewiki.net/wiki/Portal:nl>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-04-27 13:28:47+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-10-10 14:11:22+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-openid\n"
 
@@ -36,32 +36,34 @@ msgstr ""
 "OpenID, en niet direct."
 
 #. TRANS: Page notice. %s is a trustroot name.
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "%s has asked to verify your identity. Click Continue to verify your identity "
 "and login without creating a new password."
 msgstr ""
 "%s heeft gevraagd uw identiteit te bevestigen. Klik op \"Doorgaan\" om uw "
-"indentiteit te controleren en aan te melden zonder een wachtwoord te hoeven "
+"identiteit te controleren en aan te melden zonder een wachtwoord te hoeven "
 "invoeren."
 
 #. TRANS: Button text to continue OpenID identity verification.
 #. TRANS: button label for OAuth authorization page when needing OpenID authentication first.
 msgctxt "BUTTON"
 msgid "Continue"
-msgstr "Continue"
+msgstr "Doorgaan"
 
 #. TRANS: Button text to cancel OpenID identity verification.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Cancel"
 msgstr "Annuleren"
 
+#. TRANS: Client exception thrown when an action is not available.
+msgid "Unavailable action."
+msgstr "Handeling niet beschikbaar."
+
 #. TRANS: Tooltip for main menu option "Login"
-#, fuzzy
 msgctxt "TOOLTIP"
 msgid "Login to the site."
-msgstr "Aanmelden bij de site"
+msgstr "Bij de site aanmelden."
 
 #. TRANS: Main menu option when not logged in to log in
 msgctxt "MENU"
@@ -79,10 +81,9 @@ msgid "Help"
 msgstr "Hulp"
 
 #. TRANS: Tooltip for main menu option "Search"
-#, fuzzy
 msgctxt "TOOLTIP"
 msgid "Search for people or text."
-msgstr "Zoeken naar mensen of tekst"
+msgstr "Zoeken naar mensen of tekst."
 
 #. TRANS: Main menu option when logged in or when the StatusNet instance is not private
 msgctxt "MENU"
@@ -97,26 +98,46 @@ msgid "OpenID"
 msgstr "OpenID"
 
 #. TRANS: OpenID plugin tooltip for logon menu item.
-#, fuzzy
 msgid "Login or register with OpenID."
-msgstr "Aanmelden of registreren met OpenID"
+msgstr "Aanmelden of registreren met OpenID."
 
 #. TRANS: OpenID plugin tooltip for user settings menu item.
-#, fuzzy
 msgid "Add or remove OpenIDs."
-msgstr "OpenID's toevoegen of verwijderen"
+msgstr "OpenID's toevoegen of verwijderen."
 
-#. TRANS: Item on help page. This message contains Markdown links in the form [description](link).
+#. TRANS: Page notice for logged in users to try and get them to add an OpenID account to their StatusNet account.
+#. TRANS: This message contains Markdown links in the form (description)[link].
 #, php-format
 msgid ""
-"* [OpenID](%%doc.openid%%) - What OpenID is and how to use it with this "
-"service."
+"(Have an [OpenID](http://openid.net/)? [Add an OpenID to your account](%%"
+"action.openidsettings%%)!"
 msgstr ""
+"(Hebt u een [OpenID](http://openid.net/)? [Voeg een OpenID toe aan uw "
+"gebruiker](%%action.openidsettings%%)!"
+
+#. TRANS: Page notice for anonymous users to try and get them to register with an OpenID account.
+#. TRANS: This message contains Markdown links in the form (description)[link].
+#, php-format
+msgid ""
+"(Have an [OpenID](http://openid.net/)? Try our [OpenID registration](%%"
+"action.openidlogin%%)!)"
+msgstr ""
+"(Hebt u een [OpenID](http://openid.net/)? Gebruik onze [OpenID-registratie](%"
+"%action.openidlogin%%)!)"
+
+#. TRANS: Page notice on the login page to try and get them to log on with an OpenID account.
+#. TRANS: This message contains Markdown links in the form (description)[link].
+#, php-format
+msgid ""
+"(Have an [OpenID](http://openid.net/)? Try our [OpenID login](%%action."
+"openidlogin%%)!)"
+msgstr ""
+"(Hebt u een[OpenID](http://openid.net/)? [Meld u aan via OpenID](%%action."
+"openidlogin%%)!)"
 
 #. TRANS: Tooltip for OpenID configuration menu item.
-#, fuzzy
 msgid "OpenID configuration."
-msgstr "OpenID-instellingen"
+msgstr "OpenID-instellingen."
 
 #. TRANS: Plugin description.
 msgid "Use <a href=\"http://openid.net/\">OpenID</a> to login to the site."
@@ -125,7 +146,6 @@ msgstr ""
 "site."
 
 #. TRANS: OpenID plugin logon form legend.
-#, fuzzy
 msgctxt "LEGEND"
 msgid "OpenID login"
 msgstr "Aanmelden via OpenID"
@@ -150,9 +170,8 @@ msgstr "OpenID-URL"
 
 #. TRANS: OpenID plugin logon form field instructions.
 #. TRANS: OpenID plugin logon form field title.
-#, fuzzy
 msgid "Your OpenID URL."
-msgstr "Uw OpenID-URL"
+msgstr "Uw OpenID-URL."
 
 #. TRANS: Client error message trying to log on with OpenID while already logged on.
 msgid "Already logged in."
@@ -166,9 +185,8 @@ msgstr ""
 "alstublieft."
 
 #. TRANS: Message given if user does not agree with the site's license.
-#, fuzzy
 msgid "You cannot register if you do not agree to the license."
-msgstr "U kunt niet registreren als u niet akkoord gaat met de licentie."
+msgstr "U kunt zich niet registreren als u niet akkoord gaat met de licentie."
 
 #. TRANS: Messag given on an unknown error.
 msgid "An unknown error has occured."
@@ -176,18 +194,17 @@ msgstr "Er is een onbekende fout opgetreden."
 
 #. TRANS: Instructions given after a first successful logon using OpenID.
 #. TRANS: %s is the site name.
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "This is the first time you have logged into %s so we must connect your "
 "OpenID to a local account. You can either create a new account, or connect "
 "with your existing account, if you have one."
 msgstr ""
-"Dit is de eerste keer dat u aameldt bij %s en uw OpenID moet gekoppeld "
+"Dit is de eerste keer dat u aanmeldt bij %s en uw OpenID moet gekoppeld "
 "worden aan uw lokale gebruiker. U kunt een nieuwe gebruiker aanmaken of "
 "koppelen met uw bestaande gebruiker als u die al hebt."
 
 #. TRANS: Title
-#, fuzzy
 msgctxt "TITLE"
 msgid "OpenID Account Setup"
 msgstr "Instellingen OpenID"
@@ -263,13 +280,12 @@ msgstr "De authenticatie via OpenID is afgebroken."
 #. TRANS: OpenID authentication failed; display the error message. %s is the error message.
 #. TRANS: OpenID authentication failed; display the error message.
 #. TRANS: %s is the error message.
-#, fuzzy, php-format
+#, php-format
 msgid "OpenID authentication failed: %s."
-msgstr "De authenticatie via OpenID is mislukt: %s"
+msgstr "De authenticatie via OpenID is mislukt: %s."
 
 #. TRANS: Message displayed when OpenID authentication is aborted.
 #. TRANS: OpenID authentication error.
-#, fuzzy
 msgid ""
 "OpenID authentication aborted: You are not allowed to login to this site."
 msgstr ""
@@ -278,7 +294,7 @@ msgstr ""
 #. TRANS: OpenID plugin message. No new user registration is allowed on the site.
 #. TRANS: OpenID plugin message. No new user registration is allowed on the site without an invitation code, and none was provided.
 msgid "Registration not allowed."
-msgstr "Registreren is niet mogelijk."
+msgstr "Registratie is niet toegestaan."
 
 #. TRANS: OpenID plugin message. No new user registration is allowed on the site without an invitation code, and the one provided was not valid.
 msgid "Not a valid invitation code."
@@ -299,7 +315,9 @@ msgstr "Het opgeslagen OpenID is niet aangetroffen."
 
 #. TRANS: OpenID plugin server error.
 msgid "Creating new account for OpenID that already has a user."
-msgstr "Poging tot aanmaken van een OpenID-account dat al een gebruiker heeft."
+msgstr ""
+"Poging tot aanmaken van een gebruiker voor een OpenID dat al een gebruiker "
+"heeft."
 
 #. TRANS: OpenID plugin message.
 msgid "Invalid username or password."
@@ -319,15 +337,15 @@ msgstr "Geen geldige OpenID."
 
 #. TRANS: OpenID plugin server error. Given when the OpenID authentication request fails.
 #. TRANS: %s is the failure message.
-#, fuzzy, php-format
+#, php-format
 msgid "OpenID failure: %s."
-msgstr "OpenID-fout: %s"
+msgstr "OpenID-fout: %s."
 
 #. TRANS: OpenID plugin server error. Given when the OpenID authentication request cannot be redirected.
 #. TRANS: %s is the failure message.
-#, fuzzy, php-format
+#, php-format
 msgid "Could not redirect to server: %s."
-msgstr "Het was niet mogelijk door te verwijzen naar de server: %s"
+msgstr "Het was niet mogelijk door te verwijzen naar de server: %s."
 
 #. TRANS: OpenID plugin user instructions.
 msgid ""
@@ -366,7 +384,6 @@ msgstr ""
 "aanmeldprovider, klik dan op de onderstaande knop."
 
 #. TRANS: Title for OpenID bridge administration page.
-#, fuzzy
 msgctxt "TITLE"
 msgid "OpenID Settings"
 msgstr "OpenID-instellingen"
@@ -376,17 +393,14 @@ msgid "OpenID settings"
 msgstr "OpenID-instellingen"
 
 #. TRANS: Client error displayed when OpenID provider URL is too long.
-#, fuzzy
 msgid "Invalid provider URL. Maximum length is 255 characters."
 msgstr "De URL voor de provider is ongeldig. De maximale lengte is 255 tekens."
 
 #. TRANS: Client error displayed when Launchpad team name is too long.
-#, fuzzy
 msgid "Invalid team name. Maximum length is 255 characters."
 msgstr "De teamnaam is ongeldig. De maximale lengte is 255 tekens."
 
 #. TRANS: Fieldset legend.
-#, fuzzy
 msgctxt "LEGEND"
 msgid "Trusted provider"
 msgstr "Vertrouwde provider"
@@ -437,7 +451,6 @@ msgstr ""
 "Launchpad)."
 
 #. TRANS: Fieldset legend.
-#, fuzzy
 msgctxt "LEGEND"
 msgid "Options"
 msgstr "Opties"
@@ -456,7 +469,6 @@ msgstr ""
 "aanmelden!"
 
 #. TRANS: Button text to save OpenID settings.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Opslaan"
@@ -482,16 +494,14 @@ msgid "Error connecting user."
 msgstr "Fout bij het verbinden met de gebruiker."
 
 #. TRANS: Message in case the user or the user profile cannot be saved in StatusNet.
-#, fuzzy
 msgid "Error updating profile."
-msgstr "Fout bij het bijwerken van het profiel."
+msgstr "Fout tijdens het bijwerken van het profiel."
 
 #. TRANS: Title after getting the status of the OpenID authorisation request.
 msgid "OpenID Login"
 msgstr "Aanmelden via OpenID"
 
 #. TRANS: Title of OpenID settings page for a user.
-#, fuzzy
 msgctxt "TITLE"
 msgid "OpenID settings"
 msgstr "OpenID-instellingen"
@@ -507,7 +517,6 @@ msgstr ""
 "gebruiker. U kunt hier uw gekoppelde OpenID's beheren."
 
 #. TRANS: Fieldset legend.
-#, fuzzy
 msgctxt "LEGEND"
 msgid "Add OpenID"
 msgstr "OpenID toevoegen"
@@ -521,13 +530,11 @@ msgstr ""
 "en klik op \"Toevoegen\"."
 
 #. TRANS: Button text for adding an OpenID URL.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Add"
 msgstr "Toevoegen"
 
 #. TRANS: Header on OpenID settings page.
-#, fuzzy
 msgctxt "HEADER"
 msgid "Remove OpenID"
 msgstr "OpenID verwijderen"
@@ -550,7 +557,6 @@ msgstr ""
 
 #. TRANS: Button text to remove an OpenID.
 #. TRANS: Button text to remove an OpenID trustroot.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "Verwijderen"
@@ -569,7 +575,6 @@ msgstr ""
 "heeft tot uw OpenID."
 
 #. TRANS: Form validation error if no OpenID providers can be added.
-#, fuzzy
 msgid "Cannot add new providers."
 msgstr "Het niet is mogelijk nieuwe providers toe te voegen."
 
@@ -582,9 +587,8 @@ msgid "No such OpenID trustroot."
 msgstr "Die OpenID trustroot bestaat niet."
 
 #. TRANS: Success message after removing trustroots.
-#, fuzzy
 msgid "Trustroots removed."
-msgstr "De trustroots zijn verwijderd"
+msgstr "De trustroots zijn verwijderd."
 
 #. TRANS: Form validation error for a non-existing OpenID.
 msgid "No such OpenID."
@@ -625,12 +629,11 @@ msgid "Login with an [OpenID](%%doc.openid%%) account."
 msgstr "Aanmelden met een [OpenID](%%doc.openid%%)-gebruiker."
 
 #. TRANS: OpenID plugin message. Title.
-#, fuzzy
 msgctxt "TITLE"
 msgid "OpenID Login"
 msgstr "Aanmelden via OpenID"
 
-#, fuzzy
+#. TRANS: Field label.
 msgctxt "LABEL"
 msgid "OpenID provider"
 msgstr "OpenID-provider"
@@ -648,9 +651,3 @@ msgstr ""
 msgctxt "BUTTON"
 msgid "Login"
 msgstr "Aanmelden"
-
-#~ msgid "Continue"
-#~ msgstr "Doorgaan"
-
-#~ msgid "OpenID"
-#~ msgstr "OpenID"
diff --git a/plugins/OpenID/locale/sv/LC_MESSAGES/OpenID.po b/plugins/OpenID/locale/sv/LC_MESSAGES/OpenID.po
index 323ae83f6f..63abccedc0 100644
--- a/plugins/OpenID/locale/sv/LC_MESSAGES/OpenID.po
+++ b/plugins/OpenID/locale/sv/LC_MESSAGES/OpenID.po
@@ -1,8 +1,9 @@
-# Translation of StatusNet - OpenID to Swedish (Svenska)
+# Translation of StatusNet - OpenID to Swedish (svenska)
 # Exported from translatewiki.net
 #
 # Author: Jamminjohn
 # Author: Lokal Profil
+# Author: WikiPhoenix
 # --
 # This file is distributed under the same license as the StatusNet package.
 #
@@ -10,14 +11,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OpenID\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:28+0000\n"
-"Language-Team: Swedish <http://translatewiki.net/wiki/Portal:sv>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:27+0000\n"
+"Language-Team: Swedish <https://translatewiki.net/wiki/Portal:sv>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:47+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-10-10 14:11:22+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: sv\n"
 "X-Message-Group: #out-statusnet-plugin-openid\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -37,6 +38,9 @@ msgid ""
 "%s has asked to verify your identity. Click Continue to verify your identity "
 "and login without creating a new password."
 msgstr ""
+"%s har begärt att verifiera din identitet. Klicka på Fortsätt för att "
+"verifiera din identitet och inloggningsuppgifter utan att skapa ett nytt "
+"lösenord."
 
 #. TRANS: Button text to continue OpenID identity verification.
 #. TRANS: button label for OAuth authorization page when needing OpenID authentication first.
@@ -45,16 +49,18 @@ msgid "Continue"
 msgstr "Fortsätt"
 
 #. TRANS: Button text to cancel OpenID identity verification.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Cancel"
 msgstr "Avbryt"
 
+#. TRANS: Client exception thrown when an action is not available.
+msgid "Unavailable action."
+msgstr "Otillgänglig handling."
+
 #. TRANS: Tooltip for main menu option "Login"
-#, fuzzy
 msgctxt "TOOLTIP"
 msgid "Login to the site."
-msgstr "Logga in på webbplatsen"
+msgstr "Logga in på webbplatsen."
 
 #. TRANS: Main menu option when not logged in to log in
 msgctxt "MENU"
@@ -72,10 +78,9 @@ msgid "Help"
 msgstr "Hjälp"
 
 #. TRANS: Tooltip for main menu option "Search"
-#, fuzzy
 msgctxt "TOOLTIP"
 msgid "Search for people or text."
-msgstr "Sök efter personer eller text"
+msgstr "Sök efter personer eller text."
 
 #. TRANS: Main menu option when logged in or when the StatusNet instance is not private
 msgctxt "MENU"
@@ -90,26 +95,40 @@ msgid "OpenID"
 msgstr "OpenID"
 
 #. TRANS: OpenID plugin tooltip for logon menu item.
-#, fuzzy
 msgid "Login or register with OpenID."
-msgstr "Logga in eller registrera med OpenID"
+msgstr "Logga in eller registrera med OpenID."
 
 #. TRANS: OpenID plugin tooltip for user settings menu item.
-#, fuzzy
 msgid "Add or remove OpenIDs."
-msgstr "Lägg till eller ta bort OpenID:n"
+msgstr "Lägg till eller ta bort OpenID:n."
 
-#. TRANS: Item on help page. This message contains Markdown links in the form [description](link).
+#. TRANS: Page notice for logged in users to try and get them to add an OpenID account to their StatusNet account.
+#. TRANS: This message contains Markdown links in the form (description)[link].
 #, php-format
 msgid ""
-"* [OpenID](%%doc.openid%%) - What OpenID is and how to use it with this "
-"service."
+"(Have an [OpenID](http://openid.net/)? [Add an OpenID to your account](%%"
+"action.openidsettings%%)!"
+msgstr ""
+
+#. TRANS: Page notice for anonymous users to try and get them to register with an OpenID account.
+#. TRANS: This message contains Markdown links in the form (description)[link].
+#, php-format
+msgid ""
+"(Have an [OpenID](http://openid.net/)? Try our [OpenID registration](%%"
+"action.openidlogin%%)!)"
+msgstr ""
+
+#. TRANS: Page notice on the login page to try and get them to log on with an OpenID account.
+#. TRANS: This message contains Markdown links in the form (description)[link].
+#, php-format
+msgid ""
+"(Have an [OpenID](http://openid.net/)? Try our [OpenID login](%%action."
+"openidlogin%%)!)"
 msgstr ""
 
 #. TRANS: Tooltip for OpenID configuration menu item.
-#, fuzzy
 msgid "OpenID configuration."
-msgstr "Konfiguration för OpenID"
+msgstr "OpenID-konfiguration."
 
 #. TRANS: Plugin description.
 msgid "Use <a href=\"http://openid.net/\">OpenID</a> to login to the site."
@@ -118,14 +137,13 @@ msgstr ""
 "webbplatsen."
 
 #. TRANS: OpenID plugin logon form legend.
-#, fuzzy
 msgctxt "LEGEND"
 msgid "OpenID login"
 msgstr "OpenID-inloggning"
 
 #. TRANS: Field label.
 msgid "OpenID provider"
-msgstr ""
+msgstr "OpenID-leverantör"
 
 #. TRANS: Form guide.
 msgid "Enter your username."
@@ -143,9 +161,8 @@ msgstr "OpenID-adress"
 
 #. TRANS: OpenID plugin logon form field instructions.
 #. TRANS: OpenID plugin logon form field title.
-#, fuzzy
 msgid "Your OpenID URL."
-msgstr "Din OpenID-adress"
+msgstr "Din OpenID-adress."
 
 #. TRANS: Client error message trying to log on with OpenID while already logged on.
 msgid "Already logged in."
@@ -157,7 +174,6 @@ msgid "There was a problem with your session token. Try again, please."
 msgstr "Det uppstod ett problem med din sessionstoken. Försök igen."
 
 #. TRANS: Message given if user does not agree with the site's license.
-#, fuzzy
 msgid "You cannot register if you do not agree to the license."
 msgstr "Du kan inte registrera dig om du inte accepterar licensen."
 
@@ -269,7 +285,7 @@ msgstr "Inte en giltig inbjudningskod."
 
 #. TRANS: OpenID plugin message. The entered new user name is blacklisted.
 msgid "Nickname not allowed."
-msgstr ""
+msgstr "Smeknamn ​​tillåts inte."
 
 #. TRANS: OpenID plugin message. The entered new user name is already used.
 msgid "Nickname already in use. Try another one."
@@ -298,7 +314,7 @@ msgstr ""
 
 #. TRANS: OpenID plugin message. Given when an OpenID is not valid.
 msgid "Not a valid OpenID."
-msgstr ""
+msgstr "Inte ett giltigt OpenID."
 
 #. TRANS: OpenID plugin server error. Given when the OpenID authentication request fails.
 #. TRANS: %s is the failure message.
@@ -345,14 +361,13 @@ msgid ""
 msgstr ""
 
 #. TRANS: Title for OpenID bridge administration page.
-#, fuzzy
 msgctxt "TITLE"
 msgid "OpenID Settings"
-msgstr "OpenID-inloggning"
+msgstr "OpenID-inställningar"
 
 #. TRANS: Page instructions.
 msgid "OpenID settings"
-msgstr ""
+msgstr "OpenID-inställningar"
 
 #. TRANS: Client error displayed when OpenID provider URL is too long.
 msgid "Invalid provider URL. Maximum length is 255 characters."
@@ -405,7 +420,7 @@ msgstr ""
 #. TRANS: Fieldset legend.
 msgctxt "LEGEND"
 msgid "Options"
-msgstr ""
+msgstr "Alternativ"
 
 #. TRANS: Checkbox label.
 msgid "Enable OpenID-only mode"
@@ -420,23 +435,23 @@ msgstr ""
 #. TRANS: Button text to save OpenID settings.
 msgctxt "BUTTON"
 msgid "Save"
-msgstr ""
+msgstr "Spara"
 
 #. TRANS: Button title to save OpenID settings.
 msgid "Save OpenID settings."
-msgstr ""
+msgstr "Spara OpenID-inställningar."
 
 #. TRANS: Error message displayed when trying to perform an action that requires a logged in user.
 msgid "Not logged in."
-msgstr ""
+msgstr "Inte inloggad."
 
 #. TRANS: Message in case a user tries to add an OpenID that is already connected to them.
 msgid "You already have this OpenID!"
-msgstr ""
+msgstr "Du har redan detta OpenID!"
 
 #. TRANS: Message in case a user tries to add an OpenID that is already used by another user.
 msgid "Someone else already has this OpenID."
-msgstr ""
+msgstr "NÃ¥gon annan har redan detta OpenID."
 
 #. TRANS: Message in case the OpenID object cannot be connected to the user.
 msgid "Error connecting user."
@@ -448,13 +463,12 @@ msgstr ""
 
 #. TRANS: Title after getting the status of the OpenID authorisation request.
 msgid "OpenID Login"
-msgstr ""
+msgstr "OpenID-inloggning"
 
 #. TRANS: Title of OpenID settings page for a user.
-#, fuzzy
 msgctxt "TITLE"
 msgid "OpenID settings"
-msgstr "OpenID-inloggning"
+msgstr "OpenID-inställningar"
 
 #. TRANS: Form instructions for OpenID settings.
 #. TRANS: This message contains Markdown links in the form [description](link).
@@ -465,10 +479,9 @@ msgid ""
 msgstr ""
 
 #. TRANS: Fieldset legend.
-#, fuzzy
 msgctxt "LEGEND"
 msgid "Add OpenID"
-msgstr "OpenID"
+msgstr "Lägg till OpenID"
 
 #. TRANS: Form guide.
 msgid ""
@@ -477,13 +490,11 @@ msgid ""
 msgstr ""
 
 #. TRANS: Button text for adding an OpenID URL.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Add"
 msgstr "Lägg till"
 
 #. TRANS: Header on OpenID settings page.
-#, fuzzy
 msgctxt "HEADER"
 msgid "Remove OpenID"
 msgstr "Ta bort OpenID"
@@ -502,7 +513,6 @@ msgstr ""
 
 #. TRANS: Button text to remove an OpenID.
 #. TRANS: Button text to remove an OpenID trustroot.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "Ta bort"
@@ -567,18 +577,17 @@ msgstr ""
 #. TRANS: "OpenID" is the display text for a link with URL "(%%doc.openid%%)".
 #, php-format
 msgid "Login with an [OpenID](%%doc.openid%%) account."
-msgstr ""
+msgstr "Logga in med ett [OpenID](%%doc.openid%%)-konto."
 
 #. TRANS: OpenID plugin message. Title.
-#, fuzzy
 msgctxt "TITLE"
 msgid "OpenID Login"
 msgstr "OpenID-inloggning"
 
-#, fuzzy
+#. TRANS: Field label.
 msgctxt "LABEL"
 msgid "OpenID provider"
-msgstr "OpenID borttaget."
+msgstr "OpenID-leverantör"
 
 #. TRANS: OpenID plugin logon form checkbox label for setting to put the OpenID information in a cookie.
 msgid "Remember me"
@@ -592,6 +601,3 @@ msgstr "Logga in automatiskt i framtiden, inte för datorer som delas!"
 msgctxt "BUTTON"
 msgid "Login"
 msgstr "Logga in"
-
-#~ msgid "Continue"
-#~ msgstr "Fortsätt"
diff --git a/plugins/OpenID/locale/tl/LC_MESSAGES/OpenID.po b/plugins/OpenID/locale/tl/LC_MESSAGES/OpenID.po
index d1a6a27fa1..51c845902b 100644
--- a/plugins/OpenID/locale/tl/LC_MESSAGES/OpenID.po
+++ b/plugins/OpenID/locale/tl/LC_MESSAGES/OpenID.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OpenID\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:28+0000\n"
-"Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:27+0000\n"
+"Language-Team: Tagalog <https://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:47+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-10-10 14:11:22+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-openid\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -33,14 +33,13 @@ msgstr ""
 "hindi tuwiran."
 
 #. TRANS: Page notice. %s is a trustroot name.
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "%s has asked to verify your identity. Click Continue to verify your identity "
 "and login without creating a new password."
 msgstr ""
-"Hiniling ng/ni %s na patunayan ang iyong katauhan. Pindutin ang Magpatuloy "
-"upang tiyakin ang iyong katauhan at lumagdang hindi lumilikha ng isang "
-"bagong hudyat."
+"Hiniling ni %s na patunayan ang katauhan mo. Pindutin ang Magpatuloy upang "
+"tiyakin ang katauhan mo at lumagdang hindi lumilikha ng isang bagong hudyat."
 
 #. TRANS: Button text to continue OpenID identity verification.
 #. TRANS: button label for OAuth authorization page when needing OpenID authentication first.
@@ -49,16 +48,18 @@ msgid "Continue"
 msgstr "Ipagpatuloy"
 
 #. TRANS: Button text to cancel OpenID identity verification.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Cancel"
 msgstr "Huwag ituloy"
 
+#. TRANS: Client exception thrown when an action is not available.
+msgid "Unavailable action."
+msgstr "Galaw na hindi makuha."
+
 #. TRANS: Tooltip for main menu option "Login"
-#, fuzzy
 msgctxt "TOOLTIP"
 msgid "Login to the site."
-msgstr "Lumagda sa sityo"
+msgstr "Lumagdang papasok sa sityo."
 
 #. TRANS: Main menu option when not logged in to log in
 msgctxt "MENU"
@@ -76,10 +77,9 @@ msgid "Help"
 msgstr "Saklolo"
 
 #. TRANS: Tooltip for main menu option "Search"
-#, fuzzy
 msgctxt "TOOLTIP"
 msgid "Search for people or text."
-msgstr "Maghanap ng mga tao o teksto"
+msgstr "Maghanap ng mga tao o teksto."
 
 #. TRANS: Main menu option when logged in or when the StatusNet instance is not private
 msgctxt "MENU"
@@ -94,26 +94,46 @@ msgid "OpenID"
 msgstr "OpenID"
 
 #. TRANS: OpenID plugin tooltip for logon menu item.
-#, fuzzy
 msgid "Login or register with OpenID."
-msgstr "Lumagda o magpatala na may OpenID"
+msgstr "Lumagda o magpatala na may OpenID."
 
 #. TRANS: OpenID plugin tooltip for user settings menu item.
-#, fuzzy
 msgid "Add or remove OpenIDs."
-msgstr "Idagdag o alisin ang mga OpenID"
+msgstr "Idagdag o alisin ang mga OpenID."
 
-#. TRANS: Item on help page. This message contains Markdown links in the form [description](link).
+#. TRANS: Page notice for logged in users to try and get them to add an OpenID account to their StatusNet account.
+#. TRANS: This message contains Markdown links in the form (description)[link].
 #, php-format
 msgid ""
-"* [OpenID](%%doc.openid%%) - What OpenID is and how to use it with this "
-"service."
+"(Have an [OpenID](http://openid.net/)? [Add an OpenID to your account](%%"
+"action.openidsettings%%)!"
 msgstr ""
+"(Mayroong kang [OpenID](http://openid.net/)? [Magdagdag ng isang OpenID sa "
+"akawnt mo](%%action.openidsettings%%)!"
+
+#. TRANS: Page notice for anonymous users to try and get them to register with an OpenID account.
+#. TRANS: This message contains Markdown links in the form (description)[link].
+#, php-format
+msgid ""
+"(Have an [OpenID](http://openid.net/)? Try our [OpenID registration](%%"
+"action.openidlogin%%)!)"
+msgstr ""
+"(Mayroon kang [OpenID](http://openid.net/)? Subukan ang aming [rehistasyon "
+"ng OpenID](%%action.openidlogin%%)!)"
+
+#. TRANS: Page notice on the login page to try and get them to log on with an OpenID account.
+#. TRANS: This message contains Markdown links in the form (description)[link].
+#, php-format
+msgid ""
+"(Have an [OpenID](http://openid.net/)? Try our [OpenID login](%%action."
+"openidlogin%%)!)"
+msgstr ""
+"(Mayroon kang [OpenID](http://openid.net/)? Subukan ang aming [paglagda ng "
+"OpenID](%%action.openidlogin%%)!)"
 
 #. TRANS: Tooltip for OpenID configuration menu item.
-#, fuzzy
 msgid "OpenID configuration."
-msgstr "Pagkakaayos ng OpenID"
+msgstr "Pagkakaayos ng OpenID."
 
 #. TRANS: Plugin description.
 msgid "Use <a href=\"http://openid.net/\">OpenID</a> to login to the site."
@@ -121,10 +141,9 @@ msgstr ""
 "Gamitin ang <a href=\"http://openid.net/\">OpenID</a> upang lumagda sa sityo."
 
 #. TRANS: OpenID plugin logon form legend.
-#, fuzzy
 msgctxt "LEGEND"
 msgid "OpenID login"
-msgstr "Panglagdang OpenID"
+msgstr "Panglagda sa OpenID"
 
 #. TRANS: Field label.
 msgid "OpenID provider"
@@ -146,9 +165,8 @@ msgstr "URL ng OpenID"
 
 #. TRANS: OpenID plugin logon form field instructions.
 #. TRANS: OpenID plugin logon form field title.
-#, fuzzy
 msgid "Your OpenID URL."
-msgstr "Ang iyong URL ng OpenID"
+msgstr "Ang iyong URL ng OpenID."
 
 #. TRANS: Client error message trying to log on with OpenID while already logged on.
 msgid "Already logged in."
@@ -160,9 +178,8 @@ msgid "There was a problem with your session token. Try again, please."
 msgstr "May suliranin sa iyong token na pangsesyon.  Paki subukan uli."
 
 #. TRANS: Message given if user does not agree with the site's license.
-#, fuzzy
 msgid "You cannot register if you do not agree to the license."
-msgstr "Hindi ka makakapagpatala kung hindi ka sasang-ayon sa lisensiya."
+msgstr "Hindi ka makakapagpatala kung hindi ka sumasang-ayon sa lisensiya."
 
 #. TRANS: Messag given on an unknown error.
 msgid "An unknown error has occured."
@@ -170,7 +187,7 @@ msgstr "Naganap ang isang hindi nalalamang kamalian."
 
 #. TRANS: Instructions given after a first successful logon using OpenID.
 #. TRANS: %s is the site name.
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "This is the first time you have logged into %s so we must connect your "
 "OpenID to a local account. You can either create a new account, or connect "
@@ -179,10 +196,9 @@ msgstr ""
 "Ito ang iyong unang pagkakataon ng paglagda sa %s kaya't kailangan naming "
 "umugnay sa iyong OpenID papunta sa isang katutubong akawnt.  Maaari kang "
 "lumikha ng isang bagong akawnt, o umugnay sa pamamagitan ng umiiral mong "
-"akawnt, kung mayroon ka."
+"akawnt, kung mayroon ka nang isa."
 
 #. TRANS: Title
-#, fuzzy
 msgctxt "TITLE"
 msgid "OpenID Account Setup"
 msgstr "Pagkakaayos ng Akawnt na OpenID"
@@ -263,18 +279,17 @@ msgstr "Kinansela ang pagpapatunay ng OpenID."
 #. TRANS: OpenID authentication failed; display the error message. %s is the error message.
 #. TRANS: OpenID authentication failed; display the error message.
 #. TRANS: %s is the error message.
-#, fuzzy, php-format
+#, php-format
 msgid "OpenID authentication failed: %s."
-msgstr "Nabigo ang pagpapatunay ng OpenID: %s"
+msgstr "Nabigo ang pagpapatunay ng OpenID: %s."
 
 #. TRANS: Message displayed when OpenID authentication is aborted.
 #. TRANS: OpenID authentication error.
-#, fuzzy
 msgid ""
 "OpenID authentication aborted: You are not allowed to login to this site."
 msgstr ""
-"Hindi itinuloy ang pagpapatunay ng OpenID: hindi ka pinahintulutang lumagda "
-"sa sityong ito."
+"Iniurong ang pagpapatunay ng OpenID: Hindi ka pinahihintulutang lumagda sa "
+"sityong ito."
 
 #. TRANS: OpenID plugin message. No new user registration is allowed on the site.
 #. TRANS: OpenID plugin message. No new user registration is allowed on the site without an invitation code, and none was provided.
@@ -321,15 +336,15 @@ msgstr "Hindi isang tanggap na OpenID."
 
 #. TRANS: OpenID plugin server error. Given when the OpenID authentication request fails.
 #. TRANS: %s is the failure message.
-#, fuzzy, php-format
+#, php-format
 msgid "OpenID failure: %s."
-msgstr "Kabiguan ng OpenID: %s"
+msgstr "Kabiguan ng OpenID: %s."
 
 #. TRANS: OpenID plugin server error. Given when the OpenID authentication request cannot be redirected.
 #. TRANS: %s is the failure message.
-#, fuzzy, php-format
+#, php-format
 msgid "Could not redirect to server: %s."
-msgstr "Hindi mabago upang papuntahin sa tagapaghain: %s"
+msgstr "Hindi mabago upang mapapunta sa tagapaghain: %s"
 
 #. TRANS: OpenID plugin user instructions.
 msgid ""
@@ -370,34 +385,30 @@ msgstr ""
 "ng ilang mga segundo, subukang pindutin ang pindutang nasa ibaba."
 
 #. TRANS: Title for OpenID bridge administration page.
-#, fuzzy
 msgctxt "TITLE"
 msgid "OpenID Settings"
-msgstr "Mga katakdaan ng OpenID"
+msgstr "Mga Katakdaan ng OpenID"
 
 #. TRANS: Page instructions.
 msgid "OpenID settings"
 msgstr "Mga katakdaan ng OpenID"
 
 #. TRANS: Client error displayed when OpenID provider URL is too long.
-#, fuzzy
 msgid "Invalid provider URL. Maximum length is 255 characters."
 msgstr ""
-"Hindi tanggap na URL ng tagapagbigay. Ang pinakamataas na haba ay 255 mga "
-"panitik."
+"Hindi katanggap-tanggap na URL ng tagapagbigay. Ang pinakamataas na haba ay "
+"255 mga panitik."
 
 #. TRANS: Client error displayed when Launchpad team name is too long.
-#, fuzzy
 msgid "Invalid team name. Maximum length is 255 characters."
 msgstr ""
-"Hindi tanggap na pangalan ng pangkat. Pinakamataas na haba ay 255 mga "
-"panitik."
+"Hindi katanggap-tanggap na pangalan ng pangkat. Ang pinakamataas na haba ay "
+"255 mga panitik."
 
 #. TRANS: Fieldset legend.
-#, fuzzy
 msgctxt "LEGEND"
 msgid "Trusted provider"
-msgstr "Pinagkakatiwalaang tagapagbigay"
+msgstr "Pinagkakatiwalaang tagapagbigay."
 
 #. TRANS: Form guide.
 msgid ""
@@ -447,10 +458,9 @@ msgstr ""
 "ibinigay na pangkat (karugtong ng Launchpad)."
 
 #. TRANS: Fieldset legend.
-#, fuzzy
 msgctxt "LEGEND"
 msgid "Options"
-msgstr "Mga pagpipilian"
+msgstr "Mga mapagpipilian"
 
 #. TRANS: Checkbox label.
 msgid "Enable OpenID-only mode"
@@ -466,7 +476,6 @@ msgstr ""
 "ng mga tagagamit!"
 
 #. TRANS: Button text to save OpenID settings.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Sagipin"
@@ -492,19 +501,17 @@ msgid "Error connecting user."
 msgstr "Kamalian sa pag-ugnay ng tagagamit."
 
 #. TRANS: Message in case the user or the user profile cannot be saved in StatusNet.
-#, fuzzy
 msgid "Error updating profile."
-msgstr "Kamalian sa pagsasapanahon ng balangkas"
+msgstr "Kamalian sa pagsasapanahon ng balangkas."
 
 #. TRANS: Title after getting the status of the OpenID authorisation request.
 msgid "OpenID Login"
 msgstr "Panglagdang OpenID"
 
 #. TRANS: Title of OpenID settings page for a user.
-#, fuzzy
 msgctxt "TITLE"
 msgid "OpenID settings"
-msgstr "Mga katakdaan ng OpenID"
+msgstr "Mga katakdaan ng OpenID."
 
 #. TRANS: Form instructions for OpenID settings.
 #. TRANS: This message contains Markdown links in the form [description](link).
@@ -518,7 +525,6 @@ msgstr ""
 "mga OpenID mula rito."
 
 #. TRANS: Fieldset legend.
-#, fuzzy
 msgctxt "LEGEND"
 msgid "Add OpenID"
 msgstr "Idagdag ang OpenID"
@@ -532,13 +538,11 @@ msgstr ""
 "nasa ibaba at pindutin ang \"Idagdag\"."
 
 #. TRANS: Button text for adding an OpenID URL.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Add"
 msgstr "Idagdag"
 
 #. TRANS: Header on OpenID settings page.
-#, fuzzy
 msgctxt "HEADER"
 msgid "Remove OpenID"
 msgstr "Tanggalin ang OpenID"
@@ -561,7 +565,6 @@ msgstr ""
 
 #. TRANS: Button text to remove an OpenID.
 #. TRANS: Button text to remove an OpenID trustroot.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "Tanggalin"
@@ -580,9 +583,8 @@ msgstr ""
 "ito upang tanggihan ang pagpunta nito sa iyong OpenID."
 
 #. TRANS: Form validation error if no OpenID providers can be added.
-#, fuzzy
 msgid "Cannot add new providers."
-msgstr "Hindi makapagdaragdag ng bagong mga tagapagbigay."
+msgstr "Hindi maidaragdag ang bagong mga tagapagbigay."
 
 #. TRANS: Unexpected form validation error.
 msgid "Something weird happened."
@@ -593,9 +595,8 @@ msgid "No such OpenID trustroot."
 msgstr "Walng ganyang pinagkakatiwalaang ugat ng OpenID."
 
 #. TRANS: Success message after removing trustroots.
-#, fuzzy
 msgid "Trustroots removed."
-msgstr "Tinanggal ang mga pinagkakatiwalaang ugat"
+msgstr "Tinanggal ang mga pinagkakatiwalaang ugat."
 
 #. TRANS: Form validation error for a non-existing OpenID.
 msgid "No such OpenID."
@@ -637,12 +638,11 @@ msgid "Login with an [OpenID](%%doc.openid%%) account."
 msgstr "Lumagda sa pamamagitan ng isang akawnt ng [OpenID](%%doc.openid%%)."
 
 #. TRANS: OpenID plugin message. Title.
-#, fuzzy
 msgctxt "TITLE"
 msgid "OpenID Login"
-msgstr "Panglagdang OpenID"
+msgstr "Panglagda sa OpenID"
 
-#, fuzzy
+#. TRANS: Field label.
 msgctxt "LABEL"
 msgid "OpenID provider"
 msgstr "Tagapagbigay ng OpenID"
@@ -660,9 +660,3 @@ msgstr ""
 msgctxt "BUTTON"
 msgid "Login"
 msgstr "Lumagda"
-
-#~ msgid "Continue"
-#~ msgstr "Magpatuloy"
-
-#~ msgid "OpenID"
-#~ msgstr "OpenID"
diff --git a/plugins/OpenID/locale/uk/LC_MESSAGES/OpenID.po b/plugins/OpenID/locale/uk/LC_MESSAGES/OpenID.po
index 06d292e0fc..4d1fd39531 100644
--- a/plugins/OpenID/locale/uk/LC_MESSAGES/OpenID.po
+++ b/plugins/OpenID/locale/uk/LC_MESSAGES/OpenID.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - OpenID to Ukrainian (Україн�ька)
+# Translation of StatusNet - OpenID to Ukrainian (україн�ька)
 # Exported from translatewiki.net
 #
 # Author: Boogie
@@ -10,14 +10,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OpenID\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:28+0000\n"
-"Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:27+0000\n"
+"Language-Team: Ukrainian <https://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:47+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-10-10 14:11:22+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-openid\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
@@ -34,13 +34,13 @@ msgstr ""
 "Ви потрапл�єте на цю �торінку лише при обробці запитів OpenID, не напр�му."
 
 #. TRANS: Page notice. %s is a trustroot name.
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "%s has asked to verify your identity. Click Continue to verify your identity "
 "and login without creating a new password."
 msgstr ""
-"%s запрошує ва� пройти перевірку на ідентичні�ть. �ати�ніть «Продовжити», щоб "
-"перевірити вашу о�обу та увійти, не �творюючи нового паролю."
+"%s звернув�� з проханн�м до ва� пройти перевірку на ідентичні�ть. �ати�ніть "
+"«Продовжити», щоб перевірити вашу о�обу та увійти, не �творюючи нового паролю."
 
 #. TRANS: Button text to continue OpenID identity verification.
 #. TRANS: button label for OAuth authorization page when needing OpenID authentication first.
@@ -49,16 +49,18 @@ msgid "Continue"
 msgstr "Продовжити"
 
 #. TRANS: Button text to cancel OpenID identity verification.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Cancel"
 msgstr "Ска�увати"
 
+#. TRANS: Client exception thrown when an action is not available.
+msgid "Unavailable action."
+msgstr ""
+
 #. TRANS: Tooltip for main menu option "Login"
-#, fuzzy
 msgctxt "TOOLTIP"
 msgid "Login to the site."
-msgstr "Вхід на �айт"
+msgstr "Увійти на �айт."
 
 #. TRANS: Main menu option when not logged in to log in
 msgctxt "MENU"
@@ -76,10 +78,9 @@ msgid "Help"
 msgstr "Довідка"
 
 #. TRANS: Tooltip for main menu option "Search"
-#, fuzzy
 msgctxt "TOOLTIP"
 msgid "Search for people or text."
-msgstr "Пошук людей або тек�тів"
+msgstr "Пошук людей або тек�тів."
 
 #. TRANS: Main menu option when logged in or when the StatusNet instance is not private
 msgctxt "MENU"
@@ -94,26 +95,40 @@ msgid "OpenID"
 msgstr "OpenID"
 
 #. TRANS: OpenID plugin tooltip for logon menu item.
-#, fuzzy
 msgid "Login or register with OpenID."
-msgstr "Увійти або зареє�трувати�� за допомогою OpenID"
+msgstr "Увійти або зареє�трувати�� за допомогою OpenID."
 
 #. TRANS: OpenID plugin tooltip for user settings menu item.
-#, fuzzy
 msgid "Add or remove OpenIDs."
-msgstr "Додати або видалити OpenID"
+msgstr "Додати або видалити OpenID."
 
-#. TRANS: Item on help page. This message contains Markdown links in the form [description](link).
+#. TRANS: Page notice for logged in users to try and get them to add an OpenID account to their StatusNet account.
+#. TRANS: This message contains Markdown links in the form (description)[link].
 #, php-format
 msgid ""
-"* [OpenID](%%doc.openid%%) - What OpenID is and how to use it with this "
-"service."
+"(Have an [OpenID](http://openid.net/)? [Add an OpenID to your account](%%"
+"action.openidsettings%%)!"
+msgstr ""
+
+#. TRANS: Page notice for anonymous users to try and get them to register with an OpenID account.
+#. TRANS: This message contains Markdown links in the form (description)[link].
+#, php-format
+msgid ""
+"(Have an [OpenID](http://openid.net/)? Try our [OpenID registration](%%"
+"action.openidlogin%%)!)"
+msgstr ""
+
+#. TRANS: Page notice on the login page to try and get them to log on with an OpenID account.
+#. TRANS: This message contains Markdown links in the form (description)[link].
+#, php-format
+msgid ""
+"(Have an [OpenID](http://openid.net/)? Try our [OpenID login](%%action."
+"openidlogin%%)!)"
 msgstr ""
 
 #. TRANS: Tooltip for OpenID configuration menu item.
-#, fuzzy
 msgid "OpenID configuration."
-msgstr "Конфігураці� OpenID"
+msgstr "Конфігураці� OpenID."
 
 #. TRANS: Plugin description.
 msgid "Use <a href=\"http://openid.net/\">OpenID</a> to login to the site."
@@ -121,7 +136,6 @@ msgstr ""
 "Викори�танн� <a href=\"http://openid.net/\">OpenID</a> дл� входу на �айт."
 
 #. TRANS: OpenID plugin logon form legend.
-#, fuzzy
 msgctxt "LEGEND"
 msgid "OpenID login"
 msgstr "Вхід з OpenID"
@@ -146,9 +160,8 @@ msgstr "URL-адре�а OpenID"
 
 #. TRANS: OpenID plugin logon form field instructions.
 #. TRANS: OpenID plugin logon form field title.
-#, fuzzy
 msgid "Your OpenID URL."
-msgstr "URL вашого OpenID"
+msgstr "URL вашого OpenID."
 
 #. TRANS: Client error message trying to log on with OpenID while already logged on.
 msgid "Already logged in."
@@ -161,9 +174,8 @@ msgstr ""
 "Виникли певні проблеми з токеном поточної �е�ії. Спробуйте знов, будь ла�ка."
 
 #. TRANS: Message given if user does not agree with the site's license.
-#, fuzzy
 msgid "You cannot register if you do not agree to the license."
-msgstr "Ви не зможете зареє�трувати��, �кщо не погодите�ь з умовами ліцензії."
+msgstr "Ви не можете зареє�трувати�ь, �кщо не погодите�� з умовами ліцензії."
 
 #. TRANS: Messag given on an unknown error.
 msgid "An unknown error has occured."
@@ -171,7 +183,7 @@ msgstr "Виникла �ка�ь незрозуміла помилка."
 
 #. TRANS: Instructions given after a first successful logon using OpenID.
 #. TRANS: %s is the site name.
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "This is the first time you have logged into %s so we must connect your "
 "OpenID to a local account. You can either create a new account, or connect "
@@ -182,10 +194,9 @@ msgstr ""
 "викори�тати такий, що вже і�нує."
 
 #. TRANS: Title
-#, fuzzy
 msgctxt "TITLE"
 msgid "OpenID Account Setup"
-msgstr "Створенн� акаунту OpenID"
+msgstr "�алаштуванн� акаунту OpenID"
 
 #. TRANS: Fieldset legend.
 msgid "Create new account"
@@ -260,13 +271,12 @@ msgstr "�втентифікацію за OpenID �ка�овано."
 #. TRANS: OpenID authentication failed; display the error message. %s is the error message.
 #. TRANS: OpenID authentication failed; display the error message.
 #. TRANS: %s is the error message.
-#, fuzzy, php-format
+#, php-format
 msgid "OpenID authentication failed: %s."
-msgstr "�втентифікувати�ь за OpenID не вдало��: %s"
+msgstr "�втентифікаці� за OpenID не вдала��: %s"
 
 #. TRANS: Message displayed when OpenID authentication is aborted.
 #. TRANS: OpenID authentication error.
-#, fuzzy
 msgid ""
 "OpenID authentication aborted: You are not allowed to login to this site."
 msgstr "�втентифікацію за OpenID перервано: ви не можете увійти на цей �айт."
@@ -315,15 +325,15 @@ msgstr "Це недій�ний OpenID."
 
 #. TRANS: OpenID plugin server error. Given when the OpenID authentication request fails.
 #. TRANS: %s is the failure message.
-#, fuzzy, php-format
+#, php-format
 msgid "OpenID failure: %s."
-msgstr "�еу�піх OpenID: %s"
+msgstr "�евдача OpenID: %s."
 
 #. TRANS: OpenID plugin server error. Given when the OpenID authentication request cannot be redirected.
 #. TRANS: %s is the failure message.
-#, fuzzy, php-format
+#, php-format
 msgid "Could not redirect to server: %s."
-msgstr "�е можу переадре�увати на �ервер: %s"
+msgstr "�е можу переадре�увати на �ервер: %s."
 
 #. TRANS: OpenID plugin user instructions.
 msgid ""
@@ -362,7 +372,6 @@ msgstr ""
 "OpenID-провайдера, про�то нати�ніть кнопку внизу."
 
 #. TRANS: Title for OpenID bridge administration page.
-#, fuzzy
 msgctxt "TITLE"
 msgid "OpenID Settings"
 msgstr "�алаштуванн� OpenID"
@@ -372,17 +381,14 @@ msgid "OpenID settings"
 msgstr "�алаштуванн� OpenID"
 
 #. TRANS: Client error displayed when OpenID provider URL is too long.
-#, fuzzy
 msgid "Invalid provider URL. Maximum length is 255 characters."
 msgstr "�евірний URL OpenID-провайдера. Мак�имальна довжина — 255 �имволів."
 
 #. TRANS: Client error displayed when Launchpad team name is too long.
-#, fuzzy
 msgid "Invalid team name. Maximum length is 255 characters."
 msgstr "�евірна назва �пільноти. Мак�имальна довжина — 255 �имволів."
 
 #. TRANS: Fieldset legend.
-#, fuzzy
 msgctxt "LEGEND"
 msgid "Trusted provider"
 msgstr "Довірений OpenID-провайдер"
@@ -434,7 +440,6 @@ msgstr ""
 "Launchpad)."
 
 #. TRANS: Fieldset legend.
-#, fuzzy
 msgctxt "LEGEND"
 msgid "Options"
 msgstr "Параметри"
@@ -452,7 +457,6 @@ msgstr ""
 "опці� вимикає автентифікацію за паролем дл� в�іх кори�тувачів!"
 
 #. TRANS: Button text to save OpenID settings.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Зберегти"
@@ -478,16 +482,14 @@ msgid "Error connecting user."
 msgstr "Помилка при підключенні кори�тувача."
 
 #. TRANS: Message in case the user or the user profile cannot be saved in StatusNet.
-#, fuzzy
 msgid "Error updating profile."
-msgstr "Помилка при оновленні профілю"
+msgstr "Помилка при оновленні профілю."
 
 #. TRANS: Title after getting the status of the OpenID authorisation request.
 msgid "OpenID Login"
 msgstr "Вхід з OpenID"
 
 #. TRANS: Title of OpenID settings page for a user.
-#, fuzzy
 msgctxt "TITLE"
 msgid "OpenID settings"
 msgstr "�алаштуванн� OpenID"
@@ -504,7 +506,6 @@ msgstr ""
 "акаунти."
 
 #. TRANS: Fieldset legend.
-#, fuzzy
 msgctxt "LEGEND"
 msgid "Add OpenID"
 msgstr "Додати OpenID"
@@ -518,13 +519,11 @@ msgstr ""
 "нати�ніть «Додати»."
 
 #. TRANS: Button text for adding an OpenID URL.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Add"
 msgstr "Додати"
 
 #. TRANS: Header on OpenID settings page.
-#, fuzzy
 msgctxt "HEADER"
 msgid "Remove OpenID"
 msgstr "Видалити OpenID"
@@ -546,7 +545,6 @@ msgstr "Ви можете видалити ваш OpenID про�то нати�
 
 #. TRANS: Button text to remove an OpenID.
 #. TRANS: Button text to remove an OpenID trustroot.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "Видалити"
@@ -565,9 +563,8 @@ msgstr ""
 "на вхід."
 
 #. TRANS: Form validation error if no OpenID providers can be added.
-#, fuzzy
 msgid "Cannot add new providers."
-msgstr "�е вдаєть�� додати нового OpenID-провайдера."
+msgstr "�е вдаєть�� додати нових OpenID-провайдерів."
 
 #. TRANS: Unexpected form validation error.
 msgid "Something weird happened."
@@ -578,9 +575,8 @@ msgid "No such OpenID trustroot."
 msgstr "Серед довірених такого OpenID немає."
 
 #. TRANS: Success message after removing trustroots.
-#, fuzzy
 msgid "Trustroots removed."
-msgstr "Довірені OpenID видалено"
+msgstr "Довірені корені OpenID видалено."
 
 #. TRANS: Form validation error for a non-existing OpenID.
 msgid "No such OpenID."
@@ -623,12 +619,11 @@ msgid "Login with an [OpenID](%%doc.openid%%) account."
 msgstr "Увійти з [OpenID](%%doc.openid%%)."
 
 #. TRANS: OpenID plugin message. Title.
-#, fuzzy
 msgctxt "TITLE"
 msgid "OpenID Login"
 msgstr "Вхід з OpenID"
 
-#, fuzzy
+#. TRANS: Field label.
 msgctxt "LABEL"
 msgid "OpenID provider"
 msgstr "OpenID-провайдер"
@@ -647,9 +642,3 @@ msgstr ""
 msgctxt "BUTTON"
 msgid "Login"
 msgstr "Увійти"
-
-#~ msgid "Continue"
-#~ msgstr "Продовжити"
-
-#~ msgid "OpenID"
-#~ msgstr "OpenID"
diff --git a/plugins/OpenID/openidlogin.php b/plugins/OpenID/openidlogin.php
index 667e627cd3..86ebcae2e1 100644
--- a/plugins/OpenID/openidlogin.php
+++ b/plugins/OpenID/openidlogin.php
@@ -136,6 +136,7 @@ class OpenidloginAction extends Action
         $provider = common_config('openid', 'trusted_provider');
         $appendUsername = common_config('openid', 'append_username');
         if ($provider) {
+            // TRANS: Field label.
             $this->element('label', array(), _m('LABEL','OpenID provider'));
             $this->element('span', array(), $provider);
             if ($appendUsername) {
diff --git a/plugins/OpenID/openidsettings.php b/plugins/OpenID/openidsettings.php
index f1a62384b4..0dc4930ce1 100644
--- a/plugins/OpenID/openidsettings.php
+++ b/plugins/OpenID/openidsettings.php
@@ -222,6 +222,22 @@ class OpenidsettingsAction extends SettingsAction
                                       // TRANS: Button text to remove an OpenID trustroot.
                                       'value' => _m('BUTTON','Remove')));
         $this->elementEnd('fieldset');
+        
+        $prefs = User_openid_prefs::staticGet('user_id', $user->id);
+
+        $this->elementStart('fieldset');
+        $this->element('legend', null, _m('LEGEND','Preferences'));
+        $this->elementStart('ul', 'form_data');
+        $this->checkBox('hide_profile_link', "Hide OpenID links from my profile", !empty($prefs) && $prefs->hide_profile_link);
+        $this->element('input', array('type' => 'submit',
+                                      'id' => 'settings_openid_prefs_save',
+                                      'name' => 'save_prefs',
+                                      'class' => 'submit',
+                                      // TRANS: Button text to save OpenID prefs
+                                      'value' => _m('BUTTON','Save')));
+        $this->elementEnd('ul');
+        $this->elementEnd('fieldset');
+
         $this->elementEnd('form');
     }
 
@@ -258,6 +274,8 @@ class OpenidsettingsAction extends SettingsAction
             $this->removeOpenid();
         } else if($this->arg('remove_trustroots')) {
             $this->removeTrustroots();
+        } else if($this->arg('save_prefs')) {
+            $this->savePrefs();
         } else {
             // TRANS: Unexpected form validation error.
             $this->showForm(_m('Something weird happened.'));
@@ -326,4 +344,43 @@ class OpenidsettingsAction extends SettingsAction
         $this->showForm(_m('OpenID removed.'), true);
         return;
     }
+
+    /**
+     * Handles a request to save preferences
+     *
+     * Validates input and, if everything is OK, deletes the OpenID.
+     * Reloads the form with a success or error notification.
+     *
+     * @return void
+     */
+    function savePrefs()
+    {
+        $cur = common_current_user();
+
+        if (empty($cur)) {
+            throw new ClientException(_("Not logged in."));
+        }
+
+        $orig  = null;
+        $prefs = User_openid_prefs::staticGet('user_id', $cur->id);
+
+        if (empty($prefs)) {
+            $prefs          = new User_openid_prefs();
+            $prefs->user_id = $cur->id;
+            $prefs->created = common_sql_now();
+        } else {
+            $orig = clone($prefs);
+        }
+
+        $prefs->hide_profile_link = $this->boolean('hide_profile_link');
+
+        if (empty($orig)) {
+            $prefs->insert();
+        } else {
+            $prefs->update($orig);
+        }
+
+        $this->showForm(_m('OpenID preferences saved.'), true);
+        return;
+    }
 }
diff --git a/plugins/OpenX/locale/OpenX.pot b/plugins/OpenX/locale/OpenX.pot
index c7d585c681..78d1e949ff 100644
--- a/plugins/OpenX/locale/OpenX.pot
+++ b/plugins/OpenX/locale/OpenX.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
+"POT-Creation-Date: 2012-06-30 11:07+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"
diff --git a/plugins/OpenX/locale/br/LC_MESSAGES/OpenX.po b/plugins/OpenX/locale/br/LC_MESSAGES/OpenX.po
index 097c096456..fd0c882cd9 100644
--- a/plugins/OpenX/locale/br/LC_MESSAGES/OpenX.po
+++ b/plugins/OpenX/locale/br/LC_MESSAGES/OpenX.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - OpenX to Breton (Brezhoneg)
+# Translation of StatusNet - OpenX to Breton (brezhoneg)
 # Exported from translatewiki.net
 #
 # Author: Y-M D
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OpenX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:30+0000\n"
-"Language-Team: Breton <http://translatewiki.net/wiki/Portal:br>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:28+0000\n"
+"Language-Team: Breton <https://translatewiki.net/wiki/Portal:br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:48+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-12-03 13:48:56+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-openx\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
diff --git a/plugins/OpenX/locale/de/LC_MESSAGES/OpenX.po b/plugins/OpenX/locale/de/LC_MESSAGES/OpenX.po
index f427f22e28..986c214732 100644
--- a/plugins/OpenX/locale/de/LC_MESSAGES/OpenX.po
+++ b/plugins/OpenX/locale/de/LC_MESSAGES/OpenX.po
@@ -1,6 +1,7 @@
 # Translation of StatusNet - OpenX to German (Deutsch)
 # Exported from translatewiki.net
 #
+# Author: ChrisiPK
 # Author: Fujnky
 # Author: George Animal
 # Author: Giftpflanze
@@ -12,20 +13,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OpenX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:30+0000\n"
-"Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:28+0000\n"
+"Language-Team: German <https://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:48+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-12-03 13:48:56+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-openx\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANS: Menu item title.
-#, fuzzy
 msgid "OpenX configuration."
 msgstr "OpenX-Konfiguration"
 
@@ -92,6 +92,5 @@ msgid "Save"
 msgstr "Speichern"
 
 #. TRANS: Submit button title in OpenX admin panel.
-#, fuzzy
 msgid "Save OpenX settings."
-msgstr "OpenX-Einstellungen speichern"
+msgstr "OpenX-Einstellungen speichern."
diff --git a/plugins/OpenX/locale/es/LC_MESSAGES/OpenX.po b/plugins/OpenX/locale/es/LC_MESSAGES/OpenX.po
new file mode 100644
index 0000000000..cb9a888406
--- /dev/null
+++ b/plugins/OpenX/locale/es/LC_MESSAGES/OpenX.po
@@ -0,0 +1,91 @@
+# Translation of StatusNet - OpenX to Spanish (español)
+# Exported from translatewiki.net
+#
+# Author: Armando-Martin
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - OpenX\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:28+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-12-03 13:48:56+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Menu item title.
+msgid "OpenX configuration."
+msgstr "Configuración de OpenX."
+
+#. TRANS: Menu item for site administration
+msgid "OpenX"
+msgstr "OpenX"
+
+#. TRANS: Plugin description.
+msgid "Plugin for <a href=\"http://www.openx.org/\">OpenX Ad Server</a>."
+msgstr ""
+"Complemento (plugin) para <a href=\"http://www.openx.org/\">el servidor de "
+"anuncios de OpenX</a>."
+
+#. TRANS: Page title for OpenX admin panel.
+msgctxt "TITLE"
+msgid "OpenX"
+msgstr "OpenX"
+
+#. TRANS: Instructions for OpenX admin panel.
+msgid "OpenX settings for this StatusNet site"
+msgstr "Configuración de OpenX para este sitio de StatusNet"
+
+#. TRANS: Form label in OpenX admin panel.
+msgid "Ad script URL"
+msgstr "Dirección URL de secuencia de comandos (script) del anuncio"
+
+#. TRANS: Tooltip for form label in OpenX admin panel.
+msgid "Script URL"
+msgstr "Dirección URL de la secuencia de comandos (script)"
+
+#. TRANS: Form label in OpenX admin panel. Refers to advertisement format.
+msgid "Medium rectangle"
+msgstr "Rectángulo mediano"
+
+#. TRANS: Tooltip for form label in OpenX admin panel. Refers to advertisement format.
+msgid "Medium rectangle zone"
+msgstr "Zona rectangular mediana"
+
+#. TRANS: Form label in OpenX admin panel. Refers to advertisement format.
+msgid "Rectangle"
+msgstr "Rectángulo"
+
+#. TRANS: Tooltip for form label in OpenX admin panel. Refers to advertisement format.
+msgid "Rectangle zone"
+msgstr "Zona rectangular"
+
+#. TRANS: Form label in OpenX admin panel. Refers to advertisement format.
+msgid "Leaderboard"
+msgstr "Clasificación"
+
+#. TRANS: Tooltip for form label in OpenX admin panel. Refers to advertisement format.
+msgid "Leaderboard zone"
+msgstr "Zona con formato de Clasificación"
+
+#. TRANS: Form label in OpenX admin panel. Refers to advertisement format.
+msgid "Skyscraper"
+msgstr "Anuncio (banner) vertical"
+
+#. TRANS: Tooltip for form label in OpenX admin panel. Refers to advertisement format.
+msgid "Wide skyscraper zone"
+msgstr "Zona de formato vertical amplio"
+
+#. TRANS: Submit button text in OpenX admin panel.
+msgctxt "BUTTON"
+msgid "Save"
+msgstr "Guardar"
+
+#. TRANS: Submit button title in OpenX admin panel.
+msgid "Save OpenX settings."
+msgstr "Guardar configuración de OpenX."
diff --git a/plugins/OpenX/locale/eu/LC_MESSAGES/OpenX.po b/plugins/OpenX/locale/eu/LC_MESSAGES/OpenX.po
new file mode 100644
index 0000000000..b4f883ef61
--- /dev/null
+++ b/plugins/OpenX/locale/eu/LC_MESSAGES/OpenX.po
@@ -0,0 +1,91 @@
+# Translation of StatusNet - OpenX to Basque (euskara)
+# Exported from translatewiki.net
+#
+# Author: Artsuaga
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - OpenX\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:28+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-12-03 13:48:56+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Menu item title.
+msgid "OpenX configuration."
+msgstr "OpenX aukerak."
+
+#. TRANS: Menu item for site administration
+msgid "OpenX"
+msgstr "OpenX"
+
+#. TRANS: Plugin description.
+msgid "Plugin for <a href=\"http://www.openx.org/\">OpenX Ad Server</a>."
+msgstr ""
+"<a href=\"http://www.openx.org/\">OpenX Iragarki Zerbitzaria</a> erabiltzeko "
+"plugina."
+
+#. TRANS: Page title for OpenX admin panel.
+msgctxt "TITLE"
+msgid "OpenX"
+msgstr "OpenX"
+
+#. TRANS: Instructions for OpenX admin panel.
+msgid "OpenX settings for this StatusNet site"
+msgstr "OpenX aukerak StatusNet gune honentzako."
+
+#. TRANS: Form label in OpenX admin panel.
+msgid "Ad script URL"
+msgstr "Iragarkiaren eskriptaren URLa"
+
+#. TRANS: Tooltip for form label in OpenX admin panel.
+msgid "Script URL"
+msgstr "Eskriptaren URLa"
+
+#. TRANS: Form label in OpenX admin panel. Refers to advertisement format.
+msgid "Medium rectangle"
+msgstr "Laukizuzen ertaina"
+
+#. TRANS: Tooltip for form label in OpenX admin panel. Refers to advertisement format.
+msgid "Medium rectangle zone"
+msgstr "Laukizuzen ertainaren gunea"
+
+#. TRANS: Form label in OpenX admin panel. Refers to advertisement format.
+msgid "Rectangle"
+msgstr "Laukizuzena"
+
+#. TRANS: Tooltip for form label in OpenX admin panel. Refers to advertisement format.
+msgid "Rectangle zone"
+msgstr "Laukizuzenaren gunea"
+
+#. TRANS: Form label in OpenX admin panel. Refers to advertisement format.
+msgid "Leaderboard"
+msgstr "Sailkapena"
+
+#. TRANS: Tooltip for form label in OpenX admin panel. Refers to advertisement format.
+msgid "Leaderboard zone"
+msgstr "Sailkapen itxuraren gunea"
+
+#. TRANS: Form label in OpenX admin panel. Refers to advertisement format.
+msgid "Skyscraper"
+msgstr "Lauki bertikala"
+
+#. TRANS: Tooltip for form label in OpenX admin panel. Refers to advertisement format.
+msgid "Wide skyscraper zone"
+msgstr "Lauki bertikalaren gunea"
+
+#. TRANS: Submit button text in OpenX admin panel.
+msgctxt "BUTTON"
+msgid "Save"
+msgstr "Gorde"
+
+#. TRANS: Submit button title in OpenX admin panel.
+msgid "Save OpenX settings."
+msgstr "Gorde Open X aukerak."
diff --git a/plugins/OpenX/locale/fr/LC_MESSAGES/OpenX.po b/plugins/OpenX/locale/fr/LC_MESSAGES/OpenX.po
index 91aa9c1649..da28221451 100644
--- a/plugins/OpenX/locale/fr/LC_MESSAGES/OpenX.po
+++ b/plugins/OpenX/locale/fr/LC_MESSAGES/OpenX.po
@@ -1,6 +1,7 @@
-# Translation of StatusNet - OpenX to French (Français)
+# Translation of StatusNet - OpenX to French (français)
 # Exported from translatewiki.net
 #
+# Author: Crochet.david
 # Author: Verdy p
 # --
 # This file is distributed under the same license as the StatusNet package.
@@ -9,20 +10,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OpenX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:30+0000\n"
-"Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:28+0000\n"
+"Language-Team: French <https://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:48+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-12-03 13:48:56+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-openx\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. TRANS: Menu item title.
-#, fuzzy
 msgid "OpenX configuration."
 msgstr "Configuration d’OpenX"
 
@@ -91,6 +91,5 @@ msgid "Save"
 msgstr "Sauvegarder"
 
 #. TRANS: Submit button title in OpenX admin panel.
-#, fuzzy
 msgid "Save OpenX settings."
-msgstr "Sauvegarder les paramètres OpenX"
+msgstr "Sauvegarder les paramètres OpenX."
diff --git a/plugins/OpenX/locale/gl/LC_MESSAGES/OpenX.po b/plugins/OpenX/locale/gl/LC_MESSAGES/OpenX.po
new file mode 100644
index 0000000000..024f72379b
--- /dev/null
+++ b/plugins/OpenX/locale/gl/LC_MESSAGES/OpenX.po
@@ -0,0 +1,94 @@
+# Translation of StatusNet - OpenX to Galician (galego)
+# Exported from translatewiki.net
+#
+# Author: Toliño
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - OpenX\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:28+0000\n"
+"Language-Team: Galician <https://translatewiki.net/wiki/Portal:gl>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-12-03 13:48:56+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: gl\n"
+"X-Message-Group: #out-statusnet-plugin-openx\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Menu item title.
+msgid "OpenX configuration."
+msgstr "Configuración do OpenX."
+
+#. TRANS: Menu item for site administration
+msgid "OpenX"
+msgstr "OpenX"
+
+#. TRANS: Plugin description.
+msgid "Plugin for <a href=\"http://www.openx.org/\">OpenX Ad Server</a>."
+msgstr ""
+"Complemento para o <a href=\"http://www.openx.org/\">servidor de publicidade "
+"OpenX</a>."
+
+#. TRANS: Page title for OpenX admin panel.
+msgctxt "TITLE"
+msgid "OpenX"
+msgstr "OpenX"
+
+#. TRANS: Instructions for OpenX admin panel.
+msgid "OpenX settings for this StatusNet site"
+msgstr "Configuración de OpenX para este sitio StatusNet"
+
+#. TRANS: Form label in OpenX admin panel.
+msgid "Ad script URL"
+msgstr "Enderezo URL da escritura do anuncio"
+
+#. TRANS: Tooltip for form label in OpenX admin panel.
+msgid "Script URL"
+msgstr "Enderezo URL da escritura"
+
+#. TRANS: Form label in OpenX admin panel. Refers to advertisement format.
+msgid "Medium rectangle"
+msgstr "Rectángulo mediano"
+
+#. TRANS: Tooltip for form label in OpenX admin panel. Refers to advertisement format.
+msgid "Medium rectangle zone"
+msgstr "Zona rectangular mediana"
+
+#. TRANS: Form label in OpenX admin panel. Refers to advertisement format.
+msgid "Rectangle"
+msgstr "Rectángulo"
+
+#. TRANS: Tooltip for form label in OpenX admin panel. Refers to advertisement format.
+msgid "Rectangle zone"
+msgstr "Zona rectangular"
+
+#. TRANS: Form label in OpenX admin panel. Refers to advertisement format.
+msgid "Leaderboard"
+msgstr "Taboleiro de logros"
+
+#. TRANS: Tooltip for form label in OpenX admin panel. Refers to advertisement format.
+msgid "Leaderboard zone"
+msgstr "Zona do taboleiro de logros"
+
+#. TRANS: Form label in OpenX admin panel. Refers to advertisement format.
+msgid "Skyscraper"
+msgstr "Rañaceos"
+
+#. TRANS: Tooltip for form label in OpenX admin panel. Refers to advertisement format.
+msgid "Wide skyscraper zone"
+msgstr "Zona do rañaceos"
+
+#. TRANS: Submit button text in OpenX admin panel.
+msgctxt "BUTTON"
+msgid "Save"
+msgstr "Gardar"
+
+#. TRANS: Submit button title in OpenX admin panel.
+msgid "Save OpenX settings."
+msgstr "Gardar a configuración do OpenX."
diff --git a/plugins/OpenX/locale/ia/LC_MESSAGES/OpenX.po b/plugins/OpenX/locale/ia/LC_MESSAGES/OpenX.po
index 327831991c..f65ed89d66 100644
--- a/plugins/OpenX/locale/ia/LC_MESSAGES/OpenX.po
+++ b/plugins/OpenX/locale/ia/LC_MESSAGES/OpenX.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - OpenX to Interlingua (Interlingua)
+# Translation of StatusNet - OpenX to Interlingua (interlingua)
 # Exported from translatewiki.net
 #
 # Author: McDutchie
@@ -9,22 +9,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OpenX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:30+0000\n"
-"Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:28+0000\n"
+"Language-Team: Interlingua <https://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:48+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-12-03 13:48:56+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-openx\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANS: Menu item title.
-#, fuzzy
 msgid "OpenX configuration."
-msgstr "Configuration de OpenX"
+msgstr "Configuration de OpenX."
 
 #. TRANS: Menu item for site administration
 msgid "OpenX"
@@ -91,6 +90,5 @@ msgid "Save"
 msgstr "Salveguardar"
 
 #. TRANS: Submit button title in OpenX admin panel.
-#, fuzzy
 msgid "Save OpenX settings."
-msgstr "Salveguardar configurationes de OpenX"
+msgstr "Salveguardar configurationes de OpenX."
diff --git a/plugins/OpenX/locale/it/LC_MESSAGES/OpenX.po b/plugins/OpenX/locale/it/LC_MESSAGES/OpenX.po
new file mode 100644
index 0000000000..c21141f5cd
--- /dev/null
+++ b/plugins/OpenX/locale/it/LC_MESSAGES/OpenX.po
@@ -0,0 +1,91 @@
+# Translation of StatusNet - OpenX to Italian (italiano)
+# Exported from translatewiki.net
+#
+# Author: GreenFox
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - OpenX\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:29+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-12-03 13:48:56+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Menu item title.
+msgid "OpenX configuration."
+msgstr "Configurazione OpenX."
+
+#. TRANS: Menu item for site administration
+msgid "OpenX"
+msgstr "OpenX"
+
+#. TRANS: Plugin description.
+msgid "Plugin for <a href=\"http://www.openx.org/\">OpenX Ad Server</a>."
+msgstr ""
+"Plugin per il <a href=\"http://www.openx.org/\"> server pubblicitario OpenX</"
+"a>."
+
+#. TRANS: Page title for OpenX admin panel.
+msgctxt "TITLE"
+msgid "OpenX"
+msgstr "OpenX"
+
+#. TRANS: Instructions for OpenX admin panel.
+msgid "OpenX settings for this StatusNet site"
+msgstr "Impostazioni OpenX per questo sito StatusNet"
+
+#. TRANS: Form label in OpenX admin panel.
+msgid "Ad script URL"
+msgstr "URL script Ad"
+
+#. TRANS: Tooltip for form label in OpenX admin panel.
+msgid "Script URL"
+msgstr "Script URL"
+
+#. TRANS: Form label in OpenX admin panel. Refers to advertisement format.
+msgid "Medium rectangle"
+msgstr "Rettangolo medio"
+
+#. TRANS: Tooltip for form label in OpenX admin panel. Refers to advertisement format.
+msgid "Medium rectangle zone"
+msgstr "Zona rettangolo medio"
+
+#. TRANS: Form label in OpenX admin panel. Refers to advertisement format.
+msgid "Rectangle"
+msgstr "Rettangolo"
+
+#. TRANS: Tooltip for form label in OpenX admin panel. Refers to advertisement format.
+msgid "Rectangle zone"
+msgstr "Zona rettangolo"
+
+#. TRANS: Form label in OpenX admin panel. Refers to advertisement format.
+msgid "Leaderboard"
+msgstr "Classifica"
+
+#. TRANS: Tooltip for form label in OpenX admin panel. Refers to advertisement format.
+msgid "Leaderboard zone"
+msgstr "Zona della classifica"
+
+#. TRANS: Form label in OpenX admin panel. Refers to advertisement format.
+msgid "Skyscraper"
+msgstr "Banner verticale"
+
+#. TRANS: Tooltip for form label in OpenX admin panel. Refers to advertisement format.
+msgid "Wide skyscraper zone"
+msgstr "Zona banner verticale largo"
+
+#. TRANS: Submit button text in OpenX admin panel.
+msgctxt "BUTTON"
+msgid "Save"
+msgstr "Salva"
+
+#. TRANS: Submit button title in OpenX admin panel.
+msgid "Save OpenX settings."
+msgstr "Salva le impostazioni di OpenX."
diff --git a/plugins/OpenX/locale/mk/LC_MESSAGES/OpenX.po b/plugins/OpenX/locale/mk/LC_MESSAGES/OpenX.po
index d7fe509261..ea75865e17 100644
--- a/plugins/OpenX/locale/mk/LC_MESSAGES/OpenX.po
+++ b/plugins/OpenX/locale/mk/LC_MESSAGES/OpenX.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - OpenX to Macedonian (Македон�ки)
+# Translation of StatusNet - OpenX to Macedonian (македон�ки)
 # Exported from translatewiki.net
 #
 # Author: Bjankuloski06
@@ -9,22 +9,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OpenX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:30+0000\n"
-"Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:29+0000\n"
+"Language-Team: Macedonian <https://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:48+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-12-03 13:48:56+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-openx\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
 
 #. TRANS: Menu item title.
-#, fuzzy
 msgid "OpenX configuration."
-msgstr "По�тавки за OpenX"
+msgstr "По�тавки за OpenX."
 
 #. TRANS: Menu item for site administration
 msgid "OpenX"
@@ -91,6 +90,5 @@ msgid "Save"
 msgstr "Зачувај"
 
 #. TRANS: Submit button title in OpenX admin panel.
-#, fuzzy
 msgid "Save OpenX settings."
-msgstr "Зачувај по�тавки за"
+msgstr "Зачувај по�тавки за OpenX."
diff --git a/plugins/OpenX/locale/nl/LC_MESSAGES/OpenX.po b/plugins/OpenX/locale/nl/LC_MESSAGES/OpenX.po
index 128217c5dc..49c5a73540 100644
--- a/plugins/OpenX/locale/nl/LC_MESSAGES/OpenX.po
+++ b/plugins/OpenX/locale/nl/LC_MESSAGES/OpenX.po
@@ -9,22 +9,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OpenX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:30+0000\n"
-"Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:29+0000\n"
+"Language-Team: Dutch <https://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:48+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-12-03 13:48:56+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-openx\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANS: Menu item title.
-#, fuzzy
 msgid "OpenX configuration."
-msgstr "OpenX-instellingen"
+msgstr "OpenX-instellingen."
 
 #. TRANS: Menu item for site administration
 msgid "OpenX"
@@ -89,6 +88,5 @@ msgid "Save"
 msgstr "Opslaan"
 
 #. TRANS: Submit button title in OpenX admin panel.
-#, fuzzy
 msgid "Save OpenX settings."
-msgstr "OpenX-instellingen opslaan"
+msgstr "OpenX-instellingen opslaan."
diff --git a/plugins/OpenX/locale/tl/LC_MESSAGES/OpenX.po b/plugins/OpenX/locale/tl/LC_MESSAGES/OpenX.po
index cd543280e4..385fd50048 100644
--- a/plugins/OpenX/locale/tl/LC_MESSAGES/OpenX.po
+++ b/plugins/OpenX/locale/tl/LC_MESSAGES/OpenX.po
@@ -9,22 +9,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OpenX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:30+0000\n"
-"Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:29+0000\n"
+"Language-Team: Tagalog <https://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:48+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-12-03 13:48:56+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-openx\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANS: Menu item title.
-#, fuzzy
 msgid "OpenX configuration."
-msgstr "Pagkakaayos ng OpenX"
+msgstr "Pagkakaayos ng OpenX."
 
 #. TRANS: Menu item for site administration
 msgid "OpenX"
@@ -91,6 +90,5 @@ msgid "Save"
 msgstr "Sagipin"
 
 #. TRANS: Submit button title in OpenX admin panel.
-#, fuzzy
 msgid "Save OpenX settings."
-msgstr "Sagipin ang mga katakdaan ng OpenX"
+msgstr "Sagipin ang mga katakdaan ng OpenX."
diff --git a/plugins/OpenX/locale/uk/LC_MESSAGES/OpenX.po b/plugins/OpenX/locale/uk/LC_MESSAGES/OpenX.po
index db109a33bb..aa6f63ac66 100644
--- a/plugins/OpenX/locale/uk/LC_MESSAGES/OpenX.po
+++ b/plugins/OpenX/locale/uk/LC_MESSAGES/OpenX.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - OpenX to Ukrainian (Україн�ька)
+# Translation of StatusNet - OpenX to Ukrainian (україн�ька)
 # Exported from translatewiki.net
 #
 # Author: Boogie
@@ -9,23 +9,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OpenX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:30+0000\n"
-"Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:29+0000\n"
+"Language-Team: Ukrainian <https://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:48+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-12-03 13:48:56+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-openx\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
 #. TRANS: Menu item title.
-#, fuzzy
 msgid "OpenX configuration."
-msgstr "Конфігураці� OpenX"
+msgstr "Конфігураці� OpenX."
 
 #. TRANS: Menu item for site administration
 msgid "OpenX"
@@ -91,6 +90,5 @@ msgid "Save"
 msgstr "Зберегти"
 
 #. TRANS: Submit button title in OpenX admin panel.
-#, fuzzy
 msgid "Save OpenX settings."
-msgstr "Зберегти налаштуванн� OpenX"
+msgstr "Зберегти налаштуванн� OpenX."
diff --git a/plugins/Orbited/locale/Orbited.pot b/plugins/Orbited/locale/Orbited.pot
index e52e958052..1d3deddabc 100644
--- a/plugins/Orbited/locale/Orbited.pot
+++ b/plugins/Orbited/locale/Orbited.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
+"POT-Creation-Date: 2012-06-30 11:07+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"
diff --git a/plugins/Orbited/locale/de/LC_MESSAGES/Orbited.po b/plugins/Orbited/locale/de/LC_MESSAGES/Orbited.po
new file mode 100644
index 0000000000..c32dbf3b58
--- /dev/null
+++ b/plugins/Orbited/locale/de/LC_MESSAGES/Orbited.po
@@ -0,0 +1,30 @@
+# Translation of StatusNet - Orbited to German (Deutsch)
+# Exported from translatewiki.net
+#
+# Author: DaSch
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Orbited\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:29+0000\n"
+"Language-Team: German <https://translatewiki.net/wiki/Portal:de>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:51:13+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: de\n"
+"X-Message-Group: #out-statusnet-plugin-orbited\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Server exception thrown when no connection can be made to a queue server.
+msgid "Failed to connect to queue server."
+msgstr "Fehler beim Verbindungsaufbau zum Queue-Server."
+
+#. TRANS: Plugin description.
+msgid "Plugin to make updates using Orbited and STOMP."
+msgstr "Plugin zum veröffentlichen Statusupdates über Orbited und STOMP."
diff --git a/plugins/Orbited/locale/es/LC_MESSAGES/Orbited.po b/plugins/Orbited/locale/es/LC_MESSAGES/Orbited.po
new file mode 100644
index 0000000000..a048d4dc42
--- /dev/null
+++ b/plugins/Orbited/locale/es/LC_MESSAGES/Orbited.po
@@ -0,0 +1,28 @@
+# Translation of StatusNet - Orbited to Spanish (español)
+# Exported from translatewiki.net
+#
+# Author: Armando-Martin
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Orbited\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:30+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:51:13+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Server exception thrown when no connection can be made to a queue server.
+msgid "Failed to connect to queue server."
+msgstr "Error al conectar con el servidor de la cola de espera."
+
+#. TRANS: Plugin description.
+msgid "Plugin to make updates using Orbited and STOMP."
+msgstr ""
+"Complemento (plugin) para hacer actualizaciones mediante Orbited y STOMP."
diff --git a/plugins/Orbited/locale/eu/LC_MESSAGES/Orbited.po b/plugins/Orbited/locale/eu/LC_MESSAGES/Orbited.po
new file mode 100644
index 0000000000..c681d547fd
--- /dev/null
+++ b/plugins/Orbited/locale/eu/LC_MESSAGES/Orbited.po
@@ -0,0 +1,27 @@
+# Translation of StatusNet - Orbited to Basque (euskara)
+# Exported from translatewiki.net
+#
+# Author: Artsuaga
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Orbited\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:30+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:51:13+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Server exception thrown when no connection can be made to a queue server.
+msgid "Failed to connect to queue server."
+msgstr "Akatsa itxarote zerrendako zerbitzariarekin konektatzerakoan."
+
+#. TRANS: Plugin description.
+msgid "Plugin to make updates using Orbited and STOMP."
+msgstr "Orbited eta STOMP bidez eguneraketak egiteko plugna."
diff --git a/plugins/Orbited/locale/fr/LC_MESSAGES/Orbited.po b/plugins/Orbited/locale/fr/LC_MESSAGES/Orbited.po
new file mode 100644
index 0000000000..05f3fe9cd1
--- /dev/null
+++ b/plugins/Orbited/locale/fr/LC_MESSAGES/Orbited.po
@@ -0,0 +1,30 @@
+# Translation of StatusNet - Orbited to French (français)
+# Exported from translatewiki.net
+#
+# Author: Crochet.david
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Orbited\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:30+0000\n"
+"Language-Team: French <https://translatewiki.net/wiki/Portal:fr>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:51:13+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: fr\n"
+"X-Message-Group: #out-statusnet-plugin-orbited\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#. TRANS: Server exception thrown when no connection can be made to a queue server.
+msgid "Failed to connect to queue server."
+msgstr "Impossible de se connecter au serveur de la file d’attente."
+
+#. TRANS: Plugin description.
+msgid "Plugin to make updates using Orbited and STOMP."
+msgstr "Plugin pour faire les mises à jour en utilisant Orbited et STOMP."
diff --git a/plugins/Orbited/locale/gl/LC_MESSAGES/Orbited.po b/plugins/Orbited/locale/gl/LC_MESSAGES/Orbited.po
new file mode 100644
index 0000000000..187c7438f1
--- /dev/null
+++ b/plugins/Orbited/locale/gl/LC_MESSAGES/Orbited.po
@@ -0,0 +1,30 @@
+# Translation of StatusNet - Orbited to Galician (galego)
+# Exported from translatewiki.net
+#
+# Author: Toliño
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Orbited\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:30+0000\n"
+"Language-Team: Galician <https://translatewiki.net/wiki/Portal:gl>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:51:13+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: gl\n"
+"X-Message-Group: #out-statusnet-plugin-orbited\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Server exception thrown when no connection can be made to a queue server.
+msgid "Failed to connect to queue server."
+msgstr "Erro ao conectar co servidor da cola de espera."
+
+#. TRANS: Plugin description.
+msgid "Plugin to make updates using Orbited and STOMP."
+msgstr "Complemento para realizar actualizacións mediante Orbited e STOMP."
diff --git a/plugins/Orbited/locale/ia/LC_MESSAGES/Orbited.po b/plugins/Orbited/locale/ia/LC_MESSAGES/Orbited.po
new file mode 100644
index 0000000000..227c2a3c4c
--- /dev/null
+++ b/plugins/Orbited/locale/ia/LC_MESSAGES/Orbited.po
@@ -0,0 +1,30 @@
+# Translation of StatusNet - Orbited to Interlingua (interlingua)
+# Exported from translatewiki.net
+#
+# Author: McDutchie
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Orbited\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:30+0000\n"
+"Language-Team: Interlingua <https://translatewiki.net/wiki/Portal:ia>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:51:13+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: ia\n"
+"X-Message-Group: #out-statusnet-plugin-orbited\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Server exception thrown when no connection can be made to a queue server.
+msgid "Failed to connect to queue server."
+msgstr "Le connexion al servitor de caudas falleva."
+
+#. TRANS: Plugin description.
+msgid "Plugin to make updates using Orbited and STOMP."
+msgstr "Plug-in pro facer actualisationes usante Orbited e STOMP."
diff --git a/plugins/Orbited/locale/it/LC_MESSAGES/Orbited.po b/plugins/Orbited/locale/it/LC_MESSAGES/Orbited.po
new file mode 100644
index 0000000000..4521e80328
--- /dev/null
+++ b/plugins/Orbited/locale/it/LC_MESSAGES/Orbited.po
@@ -0,0 +1,28 @@
+# Translation of StatusNet - Orbited to Italian (italiano)
+# Exported from translatewiki.net
+#
+# Author: GreenFox
+# Author: Ximo17
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Orbited\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:30+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:51:13+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Server exception thrown when no connection can be made to a queue server.
+msgid "Failed to connect to queue server."
+msgstr "Impossibile connettersi al server di coda."
+
+#. TRANS: Plugin description.
+msgid "Plugin to make updates using Orbited and STOMP."
+msgstr "Plugin per fare aggiornamenti utilizzando Orbited e STOMP."
diff --git a/plugins/Orbited/locale/mk/LC_MESSAGES/Orbited.po b/plugins/Orbited/locale/mk/LC_MESSAGES/Orbited.po
new file mode 100644
index 0000000000..3edb3453b1
--- /dev/null
+++ b/plugins/Orbited/locale/mk/LC_MESSAGES/Orbited.po
@@ -0,0 +1,30 @@
+# Translation of StatusNet - Orbited to Macedonian (македон�ки)
+# Exported from translatewiki.net
+#
+# Author: Bjankuloski06
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Orbited\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:30+0000\n"
+"Language-Team: Macedonian <https://translatewiki.net/wiki/Portal:mk>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:51:13+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: mk\n"
+"X-Message-Group: #out-statusnet-plugin-orbited\n"
+"Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
+
+#. TRANS: Server exception thrown when no connection can be made to a queue server.
+msgid "Failed to connect to queue server."
+msgstr "�е у�пеав да �е поврзам �о оп�лужувачот за редица."
+
+#. TRANS: Plugin description.
+msgid "Plugin to make updates using Orbited and STOMP."
+msgstr "Приклучок за вршење на поднови кори�тејќи Orbited и STOMP."
diff --git a/plugins/Orbited/locale/nl/LC_MESSAGES/Orbited.po b/plugins/Orbited/locale/nl/LC_MESSAGES/Orbited.po
new file mode 100644
index 0000000000..9086e1bcb9
--- /dev/null
+++ b/plugins/Orbited/locale/nl/LC_MESSAGES/Orbited.po
@@ -0,0 +1,30 @@
+# Translation of StatusNet - Orbited to Dutch (Nederlands)
+# Exported from translatewiki.net
+#
+# Author: Siebrand
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Orbited\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:30+0000\n"
+"Language-Team: Dutch <https://translatewiki.net/wiki/Portal:nl>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:51:13+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: nl\n"
+"X-Message-Group: #out-statusnet-plugin-orbited\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Server exception thrown when no connection can be made to a queue server.
+msgid "Failed to connect to queue server."
+msgstr "Het opzetten van een verbinding met de queueserver is mislukt."
+
+#. TRANS: Plugin description.
+msgid "Plugin to make updates using Orbited and STOMP."
+msgstr "Plugin om updates te maken via Orbited en STOMP."
diff --git a/plugins/Orbited/locale/tl/LC_MESSAGES/Orbited.po b/plugins/Orbited/locale/tl/LC_MESSAGES/Orbited.po
new file mode 100644
index 0000000000..6393883fc2
--- /dev/null
+++ b/plugins/Orbited/locale/tl/LC_MESSAGES/Orbited.po
@@ -0,0 +1,32 @@
+# Translation of StatusNet - Orbited to Tagalog (Tagalog)
+# Exported from translatewiki.net
+#
+# Author: AnakngAraw
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Orbited\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:30+0000\n"
+"Language-Team: Tagalog <https://translatewiki.net/wiki/Portal:tl>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:51:13+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: tl\n"
+"X-Message-Group: #out-statusnet-plugin-orbited\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Server exception thrown when no connection can be made to a queue server.
+msgid "Failed to connect to queue server."
+msgstr "Nabigong umugnay sa tagapaghain ng pila."
+
+#. TRANS: Plugin description.
+msgid "Plugin to make updates using Orbited and STOMP."
+msgstr ""
+"Pampasak upang makagawa ng mga pagsasapanahon sa pamamagitan ng Orbited at "
+"STOMP."
diff --git a/plugins/Orbited/locale/uk/LC_MESSAGES/Orbited.po b/plugins/Orbited/locale/uk/LC_MESSAGES/Orbited.po
new file mode 100644
index 0000000000..de14ee4db8
--- /dev/null
+++ b/plugins/Orbited/locale/uk/LC_MESSAGES/Orbited.po
@@ -0,0 +1,31 @@
+# Translation of StatusNet - Orbited to Ukrainian (україн�ька)
+# Exported from translatewiki.net
+#
+# Author: Boogie
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Orbited\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:31+0000\n"
+"Language-Team: Ukrainian <https://translatewiki.net/wiki/Portal:uk>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:51:13+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: uk\n"
+"X-Message-Group: #out-statusnet-plugin-orbited\n"
+"Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
+"2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
+
+#. TRANS: Server exception thrown when no connection can be made to a queue server.
+msgid "Failed to connect to queue server."
+msgstr "�е вдало�� підключити�� до �ервера у черзі."
+
+#. TRANS: Plugin description.
+msgid "Plugin to make updates using Orbited and STOMP."
+msgstr "Додаток, �кий дозвол�є над�илати допи�и за допомогою Orbited і STOMP."
diff --git a/plugins/PiwikAnalytics/locale/PiwikAnalytics.pot b/plugins/PiwikAnalytics/locale/PiwikAnalytics.pot
index 643425d0d6..4bd76be314 100644
--- a/plugins/PiwikAnalytics/locale/PiwikAnalytics.pot
+++ b/plugins/PiwikAnalytics/locale/PiwikAnalytics.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
+"POT-Creation-Date: 2012-06-30 11:07+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"
diff --git a/plugins/PiwikAnalytics/locale/de/LC_MESSAGES/PiwikAnalytics.po b/plugins/PiwikAnalytics/locale/de/LC_MESSAGES/PiwikAnalytics.po
index 1bc459eaf3..538b3476af 100644
--- a/plugins/PiwikAnalytics/locale/de/LC_MESSAGES/PiwikAnalytics.po
+++ b/plugins/PiwikAnalytics/locale/de/LC_MESSAGES/PiwikAnalytics.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PiwikAnalytics\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:45+0000\n"
-"Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:35+0000\n"
+"Language-Team: German <https://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-24 15:25:25+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:14+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-piwikanalytics\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/PiwikAnalytics/locale/es/LC_MESSAGES/PiwikAnalytics.po b/plugins/PiwikAnalytics/locale/es/LC_MESSAGES/PiwikAnalytics.po
index 7ab2ce392b..17700604f4 100644
--- a/plugins/PiwikAnalytics/locale/es/LC_MESSAGES/PiwikAnalytics.po
+++ b/plugins/PiwikAnalytics/locale/es/LC_MESSAGES/PiwikAnalytics.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - PiwikAnalytics to Spanish (Español)
+# Translation of StatusNet - PiwikAnalytics to Spanish (español)
 # Exported from translatewiki.net
 #
 # Author: Translationista
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PiwikAnalytics\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:45+0000\n"
-"Language-Team: Spanish <http://translatewiki.net/wiki/Portal:es>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:35+0000\n"
+"Language-Team: Spanish <https://translatewiki.net/wiki/Portal:es>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-24 15:25:25+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:14+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-plugin-piwikanalytics\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/PiwikAnalytics/locale/fr/LC_MESSAGES/PiwikAnalytics.po b/plugins/PiwikAnalytics/locale/fr/LC_MESSAGES/PiwikAnalytics.po
index bb503ee204..3d0257d95f 100644
--- a/plugins/PiwikAnalytics/locale/fr/LC_MESSAGES/PiwikAnalytics.po
+++ b/plugins/PiwikAnalytics/locale/fr/LC_MESSAGES/PiwikAnalytics.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - PiwikAnalytics to French (Français)
+# Translation of StatusNet - PiwikAnalytics to French (français)
 # Exported from translatewiki.net
 #
 # Author: Verdy p
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PiwikAnalytics\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:45+0000\n"
-"Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:35+0000\n"
+"Language-Team: French <https://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-24 15:25:25+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:14+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-piwikanalytics\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
diff --git a/plugins/PiwikAnalytics/locale/gl/LC_MESSAGES/PiwikAnalytics.po b/plugins/PiwikAnalytics/locale/gl/LC_MESSAGES/PiwikAnalytics.po
new file mode 100644
index 0000000000..e622996b79
--- /dev/null
+++ b/plugins/PiwikAnalytics/locale/gl/LC_MESSAGES/PiwikAnalytics.po
@@ -0,0 +1,30 @@
+# Translation of StatusNet - PiwikAnalytics to Galician (galego)
+# Exported from translatewiki.net
+#
+# Author: Toliño
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - PiwikAnalytics\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:35+0000\n"
+"Language-Team: Galician <https://translatewiki.net/wiki/Portal:gl>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:51:14+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: gl\n"
+"X-Message-Group: #out-statusnet-plugin-piwikanalytics\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin description.
+msgid ""
+"Use <a href=\"http://piwik.org/\">Piwik</a> Open Source web analytics "
+"software."
+msgstr ""
+"Usar o software de análise web de código aberto <a href=\"http://piwik.org/"
+"\">Piwik</a>."
diff --git a/plugins/PiwikAnalytics/locale/he/LC_MESSAGES/PiwikAnalytics.po b/plugins/PiwikAnalytics/locale/he/LC_MESSAGES/PiwikAnalytics.po
index 2ab49c6a4c..53d2740536 100644
--- a/plugins/PiwikAnalytics/locale/he/LC_MESSAGES/PiwikAnalytics.po
+++ b/plugins/PiwikAnalytics/locale/he/LC_MESSAGES/PiwikAnalytics.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PiwikAnalytics\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:45+0000\n"
-"Language-Team: Hebrew <http://translatewiki.net/wiki/Portal:he>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:35+0000\n"
+"Language-Team: Hebrew <https://translatewiki.net/wiki/Portal:he>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-24 15:25:25+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:14+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: he\n"
 "X-Message-Group: #out-statusnet-plugin-piwikanalytics\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/PiwikAnalytics/locale/ia/LC_MESSAGES/PiwikAnalytics.po b/plugins/PiwikAnalytics/locale/ia/LC_MESSAGES/PiwikAnalytics.po
index 3232043ba3..935706abff 100644
--- a/plugins/PiwikAnalytics/locale/ia/LC_MESSAGES/PiwikAnalytics.po
+++ b/plugins/PiwikAnalytics/locale/ia/LC_MESSAGES/PiwikAnalytics.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - PiwikAnalytics to Interlingua (Interlingua)
+# Translation of StatusNet - PiwikAnalytics to Interlingua (interlingua)
 # Exported from translatewiki.net
 #
 # Author: McDutchie
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PiwikAnalytics\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:45+0000\n"
-"Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:35+0000\n"
+"Language-Team: Interlingua <https://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-24 15:25:25+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:14+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-piwikanalytics\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/PiwikAnalytics/locale/id/LC_MESSAGES/PiwikAnalytics.po b/plugins/PiwikAnalytics/locale/id/LC_MESSAGES/PiwikAnalytics.po
index 18488630f6..6b210a7b68 100644
--- a/plugins/PiwikAnalytics/locale/id/LC_MESSAGES/PiwikAnalytics.po
+++ b/plugins/PiwikAnalytics/locale/id/LC_MESSAGES/PiwikAnalytics.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PiwikAnalytics\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:45+0000\n"
-"Language-Team: Indonesian <http://translatewiki.net/wiki/Portal:id>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:35+0000\n"
+"Language-Team: Indonesian <https://translatewiki.net/wiki/Portal:id>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-24 15:25:25+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:14+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: id\n"
 "X-Message-Group: #out-statusnet-plugin-piwikanalytics\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
diff --git a/plugins/PiwikAnalytics/locale/it/LC_MESSAGES/PiwikAnalytics.po b/plugins/PiwikAnalytics/locale/it/LC_MESSAGES/PiwikAnalytics.po
new file mode 100644
index 0000000000..9798f9090d
--- /dev/null
+++ b/plugins/PiwikAnalytics/locale/it/LC_MESSAGES/PiwikAnalytics.po
@@ -0,0 +1,27 @@
+# Translation of StatusNet - PiwikAnalytics to Italian (italiano)
+# Exported from translatewiki.net
+#
+# Author: GreenFox
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - PiwikAnalytics\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:35+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:51:14+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin description.
+msgid ""
+"Use <a href=\"http://piwik.org/\">Piwik</a> Open Source web analytics "
+"software."
+msgstr ""
+"Utilizza il software Open Source <a href=\"http://piwik.org/\">Piwik</a> per "
+"l'analisi del web."
diff --git a/plugins/PiwikAnalytics/locale/ja/LC_MESSAGES/PiwikAnalytics.po b/plugins/PiwikAnalytics/locale/ja/LC_MESSAGES/PiwikAnalytics.po
new file mode 100644
index 0000000000..46df818928
--- /dev/null
+++ b/plugins/PiwikAnalytics/locale/ja/LC_MESSAGES/PiwikAnalytics.po
@@ -0,0 +1,27 @@
+# Translation of StatusNet - PiwikAnalytics to Japanese (日本語)
+# Exported from translatewiki.net
+#
+# Author: Shirayuki
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - PiwikAnalytics\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:35+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:51:14+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#. TRANS: Plugin description.
+msgid ""
+"Use <a href=\"http://piwik.org/\">Piwik</a> Open Source web analytics "
+"software."
+msgstr ""
+"<a href=\"http://piwik.org/\">Piwik</a> オープン ソース ウェブ解�ソフトウェ"
+"アを使用���。"
diff --git a/plugins/PiwikAnalytics/locale/mk/LC_MESSAGES/PiwikAnalytics.po b/plugins/PiwikAnalytics/locale/mk/LC_MESSAGES/PiwikAnalytics.po
index 47755f8c79..5e3f8306e7 100644
--- a/plugins/PiwikAnalytics/locale/mk/LC_MESSAGES/PiwikAnalytics.po
+++ b/plugins/PiwikAnalytics/locale/mk/LC_MESSAGES/PiwikAnalytics.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - PiwikAnalytics to Macedonian (Македон�ки)
+# Translation of StatusNet - PiwikAnalytics to Macedonian (македон�ки)
 # Exported from translatewiki.net
 #
 # Author: Bjankuloski06
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PiwikAnalytics\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:45+0000\n"
-"Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:35+0000\n"
+"Language-Team: Macedonian <https://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-24 15:25:25+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:14+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-piwikanalytics\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
diff --git a/plugins/PiwikAnalytics/locale/nb/LC_MESSAGES/PiwikAnalytics.po b/plugins/PiwikAnalytics/locale/nb/LC_MESSAGES/PiwikAnalytics.po
index 82e7fb17e8..d8e0a64dd5 100644
--- a/plugins/PiwikAnalytics/locale/nb/LC_MESSAGES/PiwikAnalytics.po
+++ b/plugins/PiwikAnalytics/locale/nb/LC_MESSAGES/PiwikAnalytics.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - PiwikAnalytics to Norwegian (bokmål)‬ (‪Norsk (bokmål)‬)
+# Translation of StatusNet - PiwikAnalytics to Norwegian Bokmål (‪norsk (bokmål)‬)
 # Exported from translatewiki.net
 #
 # Author: Nghtwlkr
@@ -9,15 +9,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PiwikAnalytics\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:46+0000\n"
-"Language-Team: Norwegian (bokmål)‬ <http://translatewiki.net/wiki/Portal:no>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:36+0000\n"
+"Language-Team: Norwegian Bokmål <https://translatewiki.net/wiki/Portal:nb>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-24 15:25:25+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
-"X-Language-Code: no\n"
+"X-POT-Import-Date: 2011-06-05 21:51:14+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: nb\n"
 "X-Message-Group: #out-statusnet-plugin-piwikanalytics\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
diff --git a/plugins/PiwikAnalytics/locale/nl/LC_MESSAGES/PiwikAnalytics.po b/plugins/PiwikAnalytics/locale/nl/LC_MESSAGES/PiwikAnalytics.po
index 208fe42f28..ff2f12f8aa 100644
--- a/plugins/PiwikAnalytics/locale/nl/LC_MESSAGES/PiwikAnalytics.po
+++ b/plugins/PiwikAnalytics/locale/nl/LC_MESSAGES/PiwikAnalytics.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PiwikAnalytics\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:46+0000\n"
-"Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:36+0000\n"
+"Language-Team: Dutch <https://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-24 15:25:25+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:14+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-piwikanalytics\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/PiwikAnalytics/locale/pt/LC_MESSAGES/PiwikAnalytics.po b/plugins/PiwikAnalytics/locale/pt/LC_MESSAGES/PiwikAnalytics.po
index 1c4568ad8d..022e360d36 100644
--- a/plugins/PiwikAnalytics/locale/pt/LC_MESSAGES/PiwikAnalytics.po
+++ b/plugins/PiwikAnalytics/locale/pt/LC_MESSAGES/PiwikAnalytics.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - PiwikAnalytics to Portuguese (Português)
+# Translation of StatusNet - PiwikAnalytics to Portuguese (português)
 # Exported from translatewiki.net
 #
 # Author: Waldir
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PiwikAnalytics\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:46+0000\n"
-"Language-Team: Portuguese <http://translatewiki.net/wiki/Portal:pt>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:36+0000\n"
+"Language-Team: Portuguese <https://translatewiki.net/wiki/Portal:pt>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-24 15:25:25+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:14+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: pt\n"
 "X-Message-Group: #out-statusnet-plugin-piwikanalytics\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/PiwikAnalytics/locale/pt_BR/LC_MESSAGES/PiwikAnalytics.po b/plugins/PiwikAnalytics/locale/pt_BR/LC_MESSAGES/PiwikAnalytics.po
index 904df3cdca..c10c2461b1 100644
--- a/plugins/PiwikAnalytics/locale/pt_BR/LC_MESSAGES/PiwikAnalytics.po
+++ b/plugins/PiwikAnalytics/locale/pt_BR/LC_MESSAGES/PiwikAnalytics.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - PiwikAnalytics to Brazilian Portuguese (Português do Brasil)
+# Translation of StatusNet - PiwikAnalytics to Brazilian Portuguese (português do Brasil)
 # Exported from translatewiki.net
 #
 # Author: Giro720
@@ -9,15 +9,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PiwikAnalytics\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:46+0000\n"
-"Language-Team: Brazilian Portuguese <http://translatewiki.net/wiki/Portal:pt-"
-"br>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:36+0000\n"
+"Language-Team: Brazilian Portuguese <https://translatewiki.net/wiki/Portal:"
+"pt-br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-24 15:25:25+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:14+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: pt-br\n"
 "X-Message-Group: #out-statusnet-plugin-piwikanalytics\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
diff --git a/plugins/PiwikAnalytics/locale/ru/LC_MESSAGES/PiwikAnalytics.po b/plugins/PiwikAnalytics/locale/ru/LC_MESSAGES/PiwikAnalytics.po
index cc314d5019..c4f4b1a3f0 100644
--- a/plugins/PiwikAnalytics/locale/ru/LC_MESSAGES/PiwikAnalytics.po
+++ b/plugins/PiwikAnalytics/locale/ru/LC_MESSAGES/PiwikAnalytics.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - PiwikAnalytics to Russian (Ру��кий)
+# Translation of StatusNet - PiwikAnalytics to Russian (ру��кий)
 # Exported from translatewiki.net
 #
 # Author: Eleferen
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PiwikAnalytics\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:46+0000\n"
-"Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:36+0000\n"
+"Language-Team: Russian <https://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-24 15:25:25+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:14+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-piwikanalytics\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
diff --git a/plugins/PiwikAnalytics/locale/tl/LC_MESSAGES/PiwikAnalytics.po b/plugins/PiwikAnalytics/locale/tl/LC_MESSAGES/PiwikAnalytics.po
index eea821551b..1f237d82c5 100644
--- a/plugins/PiwikAnalytics/locale/tl/LC_MESSAGES/PiwikAnalytics.po
+++ b/plugins/PiwikAnalytics/locale/tl/LC_MESSAGES/PiwikAnalytics.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PiwikAnalytics\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:46+0000\n"
-"Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:36+0000\n"
+"Language-Team: Tagalog <https://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-24 15:25:25+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:14+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-piwikanalytics\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/PiwikAnalytics/locale/uk/LC_MESSAGES/PiwikAnalytics.po b/plugins/PiwikAnalytics/locale/uk/LC_MESSAGES/PiwikAnalytics.po
index 89e46ea786..b1b1dfcf1a 100644
--- a/plugins/PiwikAnalytics/locale/uk/LC_MESSAGES/PiwikAnalytics.po
+++ b/plugins/PiwikAnalytics/locale/uk/LC_MESSAGES/PiwikAnalytics.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - PiwikAnalytics to Ukrainian (Україн�ька)
+# Translation of StatusNet - PiwikAnalytics to Ukrainian (україн�ька)
 # Exported from translatewiki.net
 #
 # Author: Boogie
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PiwikAnalytics\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:46+0000\n"
-"Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:36+0000\n"
+"Language-Team: Ukrainian <https://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-24 15:25:25+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:14+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-piwikanalytics\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
diff --git a/plugins/Poll/Poll.php b/plugins/Poll/Poll.php
index 0c274341b2..399d492406 100644
--- a/plugins/Poll/Poll.php
+++ b/plugins/Poll/Poll.php
@@ -160,15 +160,9 @@ class Poll extends Managed_DataObject
      */
     function getResponse(Profile $profile)
     {
-        $pr = new Poll_response();
-        $pr->poll_id = $this->id;
-        $pr->profile_id = $profile->id;
-        $pr->find();
-        if ($pr->fetch()) {
-            return $pr;
-        } else {
-            return null;
-        }
+    	$pr = Poll_response::pkeyGet(array('poll_id' => $this->id,
+    									   'profile_id' => $profile->id));
+    	return $pr;
     }
 
     function countResponses()
diff --git a/plugins/Poll/PollPlugin.php b/plugins/Poll/PollPlugin.php
index 1246f6c2f8..1fadcf108c 100644
--- a/plugins/Poll/PollPlugin.php
+++ b/plugins/Poll/PollPlugin.php
@@ -64,6 +64,7 @@ class PollPlugin extends MicroAppPlugin
         $schema = Schema::get();
         $schema->ensureTable('poll', Poll::schemaDef());
         $schema->ensureTable('poll_response', Poll_response::schemaDef());
+        $schema->ensureTable('user_poll_prefs', User_poll_prefs::schemaDef());
         return true;
     }
 
@@ -96,10 +97,12 @@ class PollPlugin extends MicroAppPlugin
         case 'ShowpollAction':
         case 'NewpollAction':
         case 'RespondpollAction':
+        case 'PollsettingsAction':
             include_once $dir . '/' . strtolower(mb_substr($cls, 0, -6)) . '.php';
             return false;
         case 'Poll':
         case 'Poll_response':
+        case 'User_poll_prefs':
             include_once $dir.'/'.$cls.'.php';
             return false;
         case 'NewPollForm':
@@ -136,6 +139,9 @@ class PollPlugin extends MicroAppPlugin
                     array('action' => 'respondpoll'),
                     array('id' => '[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}'));
 
+        $m->connect('settings/poll',
+                    array('action' => 'pollsettings'));
+
         return true;
     }
 
@@ -491,4 +497,43 @@ class PollPlugin extends MicroAppPlugin
         }
         return true;
     }
+
+    // Hide poll responses for @chuck
+
+    function onEndNoticeWhoGets($notice, &$ni) {
+        if ($notice->object_type == self::POLL_RESPONSE_OBJECT) {
+            foreach ($ni as $id => $source) {
+                $user = User::staticGet('id', $id);
+                if (!empty($user)) {
+                    $pollPrefs = User_poll_prefs::staticGet('user_id', $user->id);
+                    if (!empty($pollPrefs) && ($pollPrefs->hide_responses)) {
+                        unset($ni[$id]);
+                    }
+                }
+            }
+        }
+        return true;
+    }
+
+    /**
+     * Menu item for personal subscriptions/groups area
+     *
+     * @param Action $action action being executed
+     *
+     * @return boolean hook return
+     */
+
+    function onEndAccountSettingsNav($action)
+    {
+        $action_name = $action->trimmed('action');
+
+        $action->menuItem(common_local_url('pollsettings'),
+                          // TRANS: Poll plugin menu item on user settings page.
+                          _m('MENU', 'Polls'),
+                          // TRANS: Poll plugin tooltip for user settings menu item.
+                          _m('Configure poll behavior'),
+                          $action_name === 'pollsettings');
+
+        return true;
+    }
 }
diff --git a/plugins/Poll/Poll_response.php b/plugins/Poll/Poll_response.php
index a4ea999933..2518ac2beb 100644
--- a/plugins/Poll/Poll_response.php
+++ b/plugins/Poll/Poll_response.php
@@ -46,6 +46,7 @@ class Poll_response extends Managed_DataObject
 {
     public $__table = 'poll_response'; // table name
     public $id;          // char(36) primary key not null -> UUID
+    public $uri;          // varchar(255)
     public $poll_id;     // char(36) -> poll.id UUID
     public $profile_id;  // int -> profile.id
     public $selection;   // int -> choice #
@@ -200,12 +201,10 @@ class Poll_response extends Managed_DataObject
         $rendered = sprintf(_m('voted for "%s"'), $link);
 
         $tags    = array();
-        $replies = array();
 
         $options = array_merge(array('urls' => array(),
                                      'rendered' => $rendered,
                                      'tags' => $tags,
-                                     'replies' => $replies,
                                      'reply_to' => $poll->getNotice()->id,
                                      'object_type' => PollPlugin::POLL_RESPONSE_OBJECT),
                                $options);
diff --git a/plugins/Poll/User_poll_prefs.php b/plugins/Poll/User_poll_prefs.php
new file mode 100644
index 0000000000..338e811948
--- /dev/null
+++ b/plugins/Poll/User_poll_prefs.php
@@ -0,0 +1,85 @@
+<?php
+/**
+ * Data class to record user prefs for polls
+ *
+ * PHP version 5
+ *
+ * @category PollPlugin
+ * @package  StatusNet
+ * @author   Evan Prodromou <evan@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
+ * @link     http://status.net/
+ *
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2012, StatusNet, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.     See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+if (!defined('STATUSNET')) {
+    exit(1);
+}
+
+/**
+ * For storing the poll prefs
+ *
+ * @category PollPlugin
+ * @package  StatusNet
+ * @author   Brion Vibber <brion@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
+ * @link     http://status.net/
+ *
+ * @see      DB_DataObject
+ */
+class User_poll_prefs extends Managed_DataObject
+{
+    public $__table = 'user_poll_prefs'; // table name
+    public $user_id;          // int id
+    public $hide_responses;   // boolean
+    public $created;          // datetime
+    public $modified;         // datetime
+
+    /**
+     * Get an instance by key
+     *
+     * This is a utility method to get a single instance with a given key value.
+     *
+     * @param string $k Key to use to lookup (usually 'user_id' for this class)
+     * @param mixed  $v Value to lookup
+     *
+     * @return User_greeting_count object found, or null for no hits
+     *
+     */
+    function staticGet($k, $v=null)
+    {
+        return Memcached_DataObject::staticGet('User_poll_prefs', $k, $v);
+    }
+
+    /**
+     * The One True Thingy that must be defined and declared.
+     */
+    public static function schemaDef()
+    {
+        return array(
+            'description' => 'Record of user preferences for polls',
+            'fields' => array(
+                'user_id' => array('type' => 'int', 'not null' => true, 'description' => 'user id'),
+                'hide_responses' => array('type' => 'int', 'size' => 'tiny', 'default' => 0, 'description' => 'Hide all poll responses'),
+                'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
+                'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
+            ),
+            'primary key' => array('user_id')
+        );
+    }
+}
diff --git a/plugins/Poll/locale/Poll.pot b/plugins/Poll/locale/Poll.pot
index 21a2319e3f..cfc523a722 100644
--- a/plugins/Poll/locale/Poll.pot
+++ b/plugins/Poll/locale/Poll.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
+"POT-Creation-Date: 2012-06-30 11:07+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"
@@ -91,7 +91,7 @@ msgstr ""
 
 #. TRANS: Client exception thrown when responding to a poll with an invalid option.
 #. TRANS: Client exception thrown responding to a poll with an invalid answer.
-#: Poll_response.php:166 respondpoll.php:102
+#: Poll_response.php:167 respondpoll.php:102
 msgid "Invalid poll selection."
 msgstr ""
 
@@ -99,7 +99,7 @@ msgstr ""
 #. TRANS: %s is the chosen option in the poll.
 #. TRANS: Rendered version of the notice content voting for a poll.
 #. TRANS: %s a link to the poll with the chosen option as link description.
-#: Poll_response.php:195 Poll_response.php:200
+#: Poll_response.php:196 Poll_response.php:201
 #, php-format
 msgid "voted for \"%s\""
 msgstr ""
@@ -112,14 +112,14 @@ msgstr ""
 
 #. TRANS: Notice content creating a poll.
 #. TRANS: %1$s is the poll question, %2$s is a link to the poll.
-#: Poll.php:240
+#: Poll.php:234
 #, php-format
 msgid "Poll: %1$s %2$s"
 msgstr ""
 
 #. TRANS: Rendered version of the notice content creating a poll.
 #. TRANS: %s is a link to the poll with the question as link description.
-#: Poll.php:246
+#: Poll.php:240
 #, php-format
 msgid "Poll: %s"
 msgstr ""
diff --git a/plugins/Poll/locale/ar/LC_MESSAGES/Poll.po b/plugins/Poll/locale/ar/LC_MESSAGES/Poll.po
new file mode 100644
index 0000000000..a2ef4cd26a
--- /dev/null
+++ b/plugins/Poll/locale/ar/LC_MESSAGES/Poll.po
@@ -0,0 +1,150 @@
+# Translation of StatusNet - Poll to Arabic (العربية)
+# Exported from translatewiki.net
+#
+# Author: OsamaK
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Poll\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:36+0000\n"
+"Language-Team: Arabic <https://translatewiki.net/wiki/Portal:ar>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:51:15+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: ar\n"
+"X-Message-Group: #out-statusnet-plugin-poll\n"
+"Plural-Forms: nplurals=6; plural=(n == 0) ? 0 : ( (n == 1) ? 1 : ( (n == "
+"2) ? 2 : ( (n%100 >= 3 && n%100 <= 10) ? 3 : ( (n%100 >= 11 && n%100 <= "
+"99) ? 4 : 5 ) ) ) );\n"
+
+#. TRANS: Client exception thrown trying to view a non-existing poll.
+msgid "No such poll."
+msgstr ""
+
+#. TRANS: Client exception thrown trying to view a non-existing poll notice.
+msgid "No such poll notice."
+msgstr ""
+
+#. TRANS: Page title for a poll.
+#. TRANS: %1$s is the nickname of the user that created the poll, %2$s is the poll question.
+#, php-format
+msgid "%1$s's poll: %2$s"
+msgstr "استطلاع %1$s: %2$s"
+
+#. TRANS: Field label on the page to create a poll.
+msgid "Question"
+msgstr "السؤال"
+
+#. TRANS: Field title on the page to create a poll.
+msgid "What question are people answering?"
+msgstr "ما السؤال الذي سيجيبه الناس؟"
+
+#. TRANS: Field label for an answer option on the page to create a poll.
+#. TRANS: %d is the option number.
+#, php-format
+msgid "Option %d"
+msgstr "الخيار %d"
+
+#. TRANS: Button text for saving a new poll.
+msgctxt "BUTTON"
+msgid "Save"
+msgstr "اح�ظ"
+
+#. TRANS: Plugin description.
+msgid "Simple extension for supporting basic polls."
+msgstr ""
+
+#. TRANS: Exception thrown trying to respond to a poll without a poll reference.
+msgid "Invalid poll response: No poll reference."
+msgstr ""
+
+#. TRANS: Exception thrown trying to respond to a non-existing poll.
+msgid "Invalid poll response: Poll is unknown."
+msgstr ""
+
+#. TRANS: Exception thrown when performing an unexpected action on a poll.
+#. TRANS: %s is the unexpected object type.
+#, php-format
+msgid "Unexpected type for poll plugin: %s."
+msgstr ""
+
+#. TRANS: Error text displayed if no poll data could be found.
+msgid "Poll data is missing"
+msgstr ""
+
+#. TRANS: Application title.
+msgctxt "APPTITLE"
+msgid "Poll"
+msgstr "استطلاع"
+
+#. TRANS: Client exception thrown when responding to a poll with an invalid option.
+#. TRANS: Client exception thrown responding to a poll with an invalid answer.
+msgid "Invalid poll selection."
+msgstr ""
+
+#. TRANS: Notice content voting for a poll.
+#. TRANS: %s is the chosen option in the poll.
+#. TRANS: Rendered version of the notice content voting for a poll.
+#. TRANS: %s a link to the poll with the chosen option as link description.
+#, php-format
+msgid "voted for \"%s\""
+msgstr "صوت ل\"%s\""
+
+#. TRANS: Button text for submitting a poll response.
+msgctxt "BUTTON"
+msgid "Submit"
+msgstr "أرسل"
+
+#. TRANS: Notice content creating a poll.
+#. TRANS: %1$s is the poll question, %2$s is a link to the poll.
+#, php-format
+msgid "Poll: %1$s %2$s"
+msgstr "استطلاع: %1$s %2$s"
+
+#. TRANS: Rendered version of the notice content creating a poll.
+#. TRANS: %s is a link to the poll with the question as link description.
+#, php-format
+msgid "Poll: %s"
+msgstr "استطلاع: %s"
+
+#. TRANS: Title for poll page.
+msgid "New poll"
+msgstr "استطلاع جديد"
+
+#. TRANS: Client exception thrown trying to create a poll while not logged in.
+msgid "You must be logged in to post a poll."
+msgstr ""
+
+#. TRANS: Client exception thrown trying to create a poll without a question.
+msgid "Poll must have a question."
+msgstr ""
+
+#. TRANS: Client exception thrown trying to create a poll with fewer than two options.
+msgid "Poll must have at least two options."
+msgstr ""
+
+#. TRANS: Page title after sending a notice.
+msgid "Notice posted"
+msgstr "أ�رسل الإشعار"
+
+#. TRANS: Page title for poll response.
+msgid "Poll response"
+msgstr ""
+
+#. TRANS: Client exception thrown trying to respond to a poll while not logged in.
+msgid "You must be logged in to respond to a poll."
+msgstr ""
+
+#. TRANS: Client exception thrown trying to respond to a non-existing poll.
+msgid "Invalid or missing poll."
+msgstr ""
+
+#. TRANS: Page title after sending a poll response.
+msgid "Poll results"
+msgstr "نتائج الاستطلاع"
diff --git a/plugins/Poll/locale/ca/LC_MESSAGES/Poll.po b/plugins/Poll/locale/ca/LC_MESSAGES/Poll.po
new file mode 100644
index 0000000000..7cdb4025ca
--- /dev/null
+++ b/plugins/Poll/locale/ca/LC_MESSAGES/Poll.po
@@ -0,0 +1,148 @@
+# Translation of StatusNet - Poll to Catalan (català)
+# Exported from translatewiki.net
+#
+# Author: Toniher
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Poll\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:36+0000\n"
+"Language-Team: Catalan <https://translatewiki.net/wiki/Portal:ca>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:51:15+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: ca\n"
+"X-Message-Group: #out-statusnet-plugin-poll\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Client exception thrown trying to view a non-existing poll.
+msgid "No such poll."
+msgstr "No existeix l'enquesta."
+
+#. TRANS: Client exception thrown trying to view a non-existing poll notice.
+msgid "No such poll notice."
+msgstr "No existeix l'avís d'enquesta."
+
+#. TRANS: Page title for a poll.
+#. TRANS: %1$s is the nickname of the user that created the poll, %2$s is the poll question.
+#, php-format
+msgid "%1$s's poll: %2$s"
+msgstr "Enquesta de %1$s: %2$s"
+
+#. TRANS: Field label on the page to create a poll.
+msgid "Question"
+msgstr "Pregunta"
+
+#. TRANS: Field title on the page to create a poll.
+msgid "What question are people answering?"
+msgstr "Quina pregunta està responent la gent?"
+
+#. TRANS: Field label for an answer option on the page to create a poll.
+#. TRANS: %d is the option number.
+#, php-format
+msgid "Option %d"
+msgstr "Opció %d"
+
+#. TRANS: Button text for saving a new poll.
+msgctxt "BUTTON"
+msgid "Save"
+msgstr "Desa"
+
+#. TRANS: Plugin description.
+msgid "Simple extension for supporting basic polls."
+msgstr "Extensió simple per habilitar enquestes molt bàsiques."
+
+#. TRANS: Exception thrown trying to respond to a poll without a poll reference.
+msgid "Invalid poll response: No poll reference."
+msgstr "Resposta d'enquesta no vàlida: no hi ha referència a l'enquesta."
+
+#. TRANS: Exception thrown trying to respond to a non-existing poll.
+msgid "Invalid poll response: Poll is unknown."
+msgstr "Resposta d'enquesta no vàlida: l'enquesta és desconeguda."
+
+#. TRANS: Exception thrown when performing an unexpected action on a poll.
+#. TRANS: %s is the unexpected object type.
+#, php-format
+msgid "Unexpected type for poll plugin: %s."
+msgstr "Tipus no esperat per al connector d'enquestes: %s."
+
+#. TRANS: Error text displayed if no poll data could be found.
+msgid "Poll data is missing"
+msgstr "Manquen dades de l'enquesta"
+
+#. TRANS: Application title.
+msgctxt "APPTITLE"
+msgid "Poll"
+msgstr "Enquesta"
+
+#. TRANS: Client exception thrown when responding to a poll with an invalid option.
+#. TRANS: Client exception thrown responding to a poll with an invalid answer.
+msgid "Invalid poll selection."
+msgstr "Selecció d'enquesta no vàlida."
+
+#. TRANS: Notice content voting for a poll.
+#. TRANS: %s is the chosen option in the poll.
+#. TRANS: Rendered version of the notice content voting for a poll.
+#. TRANS: %s a link to the poll with the chosen option as link description.
+#, php-format
+msgid "voted for \"%s\""
+msgstr "ha votat '%s'"
+
+#. TRANS: Button text for submitting a poll response.
+msgctxt "BUTTON"
+msgid "Submit"
+msgstr "Tramet"
+
+#. TRANS: Notice content creating a poll.
+#. TRANS: %1$s is the poll question, %2$s is a link to the poll.
+#, php-format
+msgid "Poll: %1$s %2$s"
+msgstr "Enquesta: %1$s %2$s"
+
+#. TRANS: Rendered version of the notice content creating a poll.
+#. TRANS: %s is a link to the poll with the question as link description.
+#, php-format
+msgid "Poll: %s"
+msgstr "Enquesta: %s"
+
+#. TRANS: Title for poll page.
+msgid "New poll"
+msgstr "Enquesta nova"
+
+#. TRANS: Client exception thrown trying to create a poll while not logged in.
+msgid "You must be logged in to post a poll."
+msgstr "Cal que hàgiu iniciat una sessió per publicar una enquesta."
+
+#. TRANS: Client exception thrown trying to create a poll without a question.
+msgid "Poll must have a question."
+msgstr "L'enquesta cal que tingui una pregunta."
+
+#. TRANS: Client exception thrown trying to create a poll with fewer than two options.
+msgid "Poll must have at least two options."
+msgstr "L'enquesta cal que tingui, com a mínim, dues opcions."
+
+#. TRANS: Page title after sending a notice.
+msgid "Notice posted"
+msgstr "S'ha publicat l'avís"
+
+#. TRANS: Page title for poll response.
+msgid "Poll response"
+msgstr "Resposta de l'enquesta"
+
+#. TRANS: Client exception thrown trying to respond to a poll while not logged in.
+msgid "You must be logged in to respond to a poll."
+msgstr "Cal que hàgiu iniciat una sessió per respondre a una enquesta."
+
+#. TRANS: Client exception thrown trying to respond to a non-existing poll.
+msgid "Invalid or missing poll."
+msgstr "L'enquesta no és vàlida o bé no hi és."
+
+#. TRANS: Page title after sending a poll response.
+msgid "Poll results"
+msgstr "Resultats de l'enquesta"
diff --git a/plugins/Poll/locale/de/LC_MESSAGES/Poll.po b/plugins/Poll/locale/de/LC_MESSAGES/Poll.po
index 03c1b5d0b1..9cbb4a9539 100644
--- a/plugins/Poll/locale/de/LC_MESSAGES/Poll.po
+++ b/plugins/Poll/locale/de/LC_MESSAGES/Poll.po
@@ -1,6 +1,7 @@
 # Translation of StatusNet - Poll to German (Deutsch)
 # Exported from translatewiki.net
 #
+# Author: ChrisiPK
 # Author: Giftpflanze
 # --
 # This file is distributed under the same license as the StatusNet package.
@@ -9,14 +10,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Poll\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:48+0000\n"
-"Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:36+0000\n"
+"Language-Team: German <https://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:49+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:15+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-poll\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -59,12 +60,10 @@ msgid "Simple extension for supporting basic polls."
 msgstr "Einfache Erweiterung für die Unterstützung von einfachen Abstimmungen."
 
 #. TRANS: Exception thrown trying to respond to a poll without a poll reference.
-#, fuzzy
 msgid "Invalid poll response: No poll reference."
 msgstr "Ungültige Abstimmungsantwort: keine Abstimmungsreferenz."
 
 #. TRANS: Exception thrown trying to respond to a non-existing poll.
-#, fuzzy
 msgid "Invalid poll response: Poll is unknown."
 msgstr "Ungültige Abstimmungsantwort: Abstimmung unbekannt."
 
diff --git a/plugins/Poll/locale/es/LC_MESSAGES/Poll.po b/plugins/Poll/locale/es/LC_MESSAGES/Poll.po
new file mode 100644
index 0000000000..885f76b6d6
--- /dev/null
+++ b/plugins/Poll/locale/es/LC_MESSAGES/Poll.po
@@ -0,0 +1,145 @@
+# Translation of StatusNet - Poll to Spanish (español)
+# Exported from translatewiki.net
+#
+# Author: Armando-Martin
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Poll\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:37+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:51:15+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Client exception thrown trying to view a non-existing poll.
+msgid "No such poll."
+msgstr "No existe tal encuesta."
+
+#. TRANS: Client exception thrown trying to view a non-existing poll notice.
+msgid "No such poll notice."
+msgstr "No existe esa nota de encuesta."
+
+#. TRANS: Page title for a poll.
+#. TRANS: %1$s is the nickname of the user that created the poll, %2$s is the poll question.
+#, php-format
+msgid "%1$s's poll: %2$s"
+msgstr "Encuesta de %1$s: %2$s"
+
+#. TRANS: Field label on the page to create a poll.
+msgid "Question"
+msgstr "Pregunta"
+
+#. TRANS: Field title on the page to create a poll.
+msgid "What question are people answering?"
+msgstr "¿A qué pregunta está respondiendo la gente?"
+
+#. TRANS: Field label for an answer option on the page to create a poll.
+#. TRANS: %d is the option number.
+#, php-format
+msgid "Option %d"
+msgstr "Opción %d"
+
+#. TRANS: Button text for saving a new poll.
+msgctxt "BUTTON"
+msgid "Save"
+msgstr "Guardar"
+
+#. TRANS: Plugin description.
+msgid "Simple extension for supporting basic polls."
+msgstr "Extensión simple para dar soporte a encuestas básicas."
+
+#. TRANS: Exception thrown trying to respond to a poll without a poll reference.
+msgid "Invalid poll response: No poll reference."
+msgstr "Respuesta de encuesta no válida: no hay referencia de la encuesta."
+
+#. TRANS: Exception thrown trying to respond to a non-existing poll.
+msgid "Invalid poll response: Poll is unknown."
+msgstr "Respuesta de encuesta no válida: Encuesta desconocida."
+
+#. TRANS: Exception thrown when performing an unexpected action on a poll.
+#. TRANS: %s is the unexpected object type.
+#, php-format
+msgid "Unexpected type for poll plugin: %s."
+msgstr "Tipo inesperado para el complemento (plugin) de la encuesta: %s."
+
+#. TRANS: Error text displayed if no poll data could be found.
+msgid "Poll data is missing"
+msgstr "Faltan datos de la encuesta"
+
+#. TRANS: Application title.
+msgctxt "APPTITLE"
+msgid "Poll"
+msgstr "Encuesta"
+
+#. TRANS: Client exception thrown when responding to a poll with an invalid option.
+#. TRANS: Client exception thrown responding to a poll with an invalid answer.
+msgid "Invalid poll selection."
+msgstr "Selección de encuesta no válida."
+
+#. TRANS: Notice content voting for a poll.
+#. TRANS: %s is the chosen option in the poll.
+#. TRANS: Rendered version of the notice content voting for a poll.
+#. TRANS: %s a link to the poll with the chosen option as link description.
+#, php-format
+msgid "voted for \"%s\""
+msgstr "ha votado a favor de \"%s\""
+
+#. TRANS: Button text for submitting a poll response.
+msgctxt "BUTTON"
+msgid "Submit"
+msgstr "Enviar"
+
+#. TRANS: Notice content creating a poll.
+#. TRANS: %1$s is the poll question, %2$s is a link to the poll.
+#, php-format
+msgid "Poll: %1$s %2$s"
+msgstr "Encuesta: %1$s %2$s"
+
+#. TRANS: Rendered version of the notice content creating a poll.
+#. TRANS: %s is a link to the poll with the question as link description.
+#, php-format
+msgid "Poll: %s"
+msgstr "Encuesta: %s"
+
+#. TRANS: Title for poll page.
+msgid "New poll"
+msgstr "Nueva encuesta"
+
+#. TRANS: Client exception thrown trying to create a poll while not logged in.
+msgid "You must be logged in to post a poll."
+msgstr "Debe iniciar sesión para publicar una encuesta."
+
+#. TRANS: Client exception thrown trying to create a poll without a question.
+msgid "Poll must have a question."
+msgstr "La encuesta debe tener una pregunta."
+
+#. TRANS: Client exception thrown trying to create a poll with fewer than two options.
+msgid "Poll must have at least two options."
+msgstr "La encuesta debe tener al menos dos opciones."
+
+#. TRANS: Page title after sending a notice.
+msgid "Notice posted"
+msgstr "Aviso publicado"
+
+#. TRANS: Page title for poll response.
+msgid "Poll response"
+msgstr "Respuesta a encuesta"
+
+#. TRANS: Client exception thrown trying to respond to a poll while not logged in.
+msgid "You must be logged in to respond to a poll."
+msgstr "Debe iniciar sesión para responder a una encuesta."
+
+#. TRANS: Client exception thrown trying to respond to a non-existing poll.
+msgid "Invalid or missing poll."
+msgstr "Falta encuesta o no es válida."
+
+#. TRANS: Page title after sending a poll response.
+msgid "Poll results"
+msgstr "Resultados de la encuesta"
diff --git a/plugins/Poll/locale/eu/LC_MESSAGES/Poll.po b/plugins/Poll/locale/eu/LC_MESSAGES/Poll.po
new file mode 100644
index 0000000000..2aa59baad6
--- /dev/null
+++ b/plugins/Poll/locale/eu/LC_MESSAGES/Poll.po
@@ -0,0 +1,148 @@
+# Translation of StatusNet - Poll to Basque (euskara)
+# Exported from translatewiki.net
+#
+# Author: Artsuaga
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Poll\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:37+0000\n"
+"Language-Team: Basque <https://translatewiki.net/wiki/Portal:eu>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:51:15+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: eu\n"
+"X-Message-Group: #out-statusnet-plugin-poll\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Client exception thrown trying to view a non-existing poll.
+msgid "No such poll."
+msgstr "Ez dago inkesta hori."
+
+#. TRANS: Client exception thrown trying to view a non-existing poll notice.
+msgid "No such poll notice."
+msgstr "Ez dago inkesta ohar hori."
+
+#. TRANS: Page title for a poll.
+#. TRANS: %1$s is the nickname of the user that created the poll, %2$s is the poll question.
+#, php-format
+msgid "%1$s's poll: %2$s"
+msgstr "%1$s(e)n inkesta: %2$s"
+
+#. TRANS: Field label on the page to create a poll.
+msgid "Question"
+msgstr "Galdera"
+
+#. TRANS: Field title on the page to create a poll.
+msgid "What question are people answering?"
+msgstr "Zein galdera ari da jendea erantzuten?"
+
+#. TRANS: Field label for an answer option on the page to create a poll.
+#. TRANS: %d is the option number.
+#, php-format
+msgid "Option %d"
+msgstr "%d aukera"
+
+#. TRANS: Button text for saving a new poll.
+msgctxt "BUTTON"
+msgid "Save"
+msgstr "Gorde"
+
+#. TRANS: Plugin description.
+msgid "Simple extension for supporting basic polls."
+msgstr "Oinarrizko inkestak egiteko luzapen sinplea."
+
+#. TRANS: Exception thrown trying to respond to a poll without a poll reference.
+msgid "Invalid poll response: No poll reference."
+msgstr "Inkesta erantzun baliogabea: Erreferentziako inkestarik ez."
+
+#. TRANS: Exception thrown trying to respond to a non-existing poll.
+msgid "Invalid poll response: Poll is unknown."
+msgstr "Inkesta erantzun baliogabea: Inkesta ezezaguna."
+
+#. TRANS: Exception thrown when performing an unexpected action on a poll.
+#. TRANS: %s is the unexpected object type.
+#, php-format
+msgid "Unexpected type for poll plugin: %s."
+msgstr "Inkesta pluginerako espero ez zen mota: %s"
+
+#. TRANS: Error text displayed if no poll data could be found.
+msgid "Poll data is missing"
+msgstr "Inkesta data galdu da"
+
+#. TRANS: Application title.
+msgctxt "APPTITLE"
+msgid "Poll"
+msgstr "Inkesta"
+
+#. TRANS: Client exception thrown when responding to a poll with an invalid option.
+#. TRANS: Client exception thrown responding to a poll with an invalid answer.
+msgid "Invalid poll selection."
+msgstr "Inkesta aukera okerra."
+
+#. TRANS: Notice content voting for a poll.
+#. TRANS: %s is the chosen option in the poll.
+#. TRANS: Rendered version of the notice content voting for a poll.
+#. TRANS: %s a link to the poll with the chosen option as link description.
+#, php-format
+msgid "voted for \"%s\""
+msgstr "\"%s\" botatu dut"
+
+#. TRANS: Button text for submitting a poll response.
+msgctxt "BUTTON"
+msgid "Submit"
+msgstr "Bidali"
+
+#. TRANS: Notice content creating a poll.
+#. TRANS: %1$s is the poll question, %2$s is a link to the poll.
+#, php-format
+msgid "Poll: %1$s %2$s"
+msgstr "Inkesta: %1$s %2$s"
+
+#. TRANS: Rendered version of the notice content creating a poll.
+#. TRANS: %s is a link to the poll with the question as link description.
+#, php-format
+msgid "Poll: %s"
+msgstr "Inkesta: %s"
+
+#. TRANS: Title for poll page.
+msgid "New poll"
+msgstr "Inkesta berria"
+
+#. TRANS: Client exception thrown trying to create a poll while not logged in.
+msgid "You must be logged in to post a poll."
+msgstr "Saioa hasi behar duzu inkesta bat egiteko."
+
+#. TRANS: Client exception thrown trying to create a poll without a question.
+msgid "Poll must have a question."
+msgstr "Inkestak galdera bat behar du."
+
+#. TRANS: Client exception thrown trying to create a poll with fewer than two options.
+msgid "Poll must have at least two options."
+msgstr "Inkestak gutxienez bi aukera behar ditu."
+
+#. TRANS: Page title after sending a notice.
+msgid "Notice posted"
+msgstr "Oharra bidalita"
+
+#. TRANS: Page title for poll response.
+msgid "Poll response"
+msgstr "Inkestaren erantzuna"
+
+#. TRANS: Client exception thrown trying to respond to a poll while not logged in.
+msgid "You must be logged in to respond to a poll."
+msgstr "Saioa hasi behar duzu inkesta bati erantzuteko."
+
+#. TRANS: Client exception thrown trying to respond to a non-existing poll.
+msgid "Invalid or missing poll."
+msgstr "Baliogabeko edo inkesta galdua."
+
+#. TRANS: Page title after sending a poll response.
+msgid "Poll results"
+msgstr "Inkestaren emaitzak"
diff --git a/plugins/Poll/locale/fr/LC_MESSAGES/Poll.po b/plugins/Poll/locale/fr/LC_MESSAGES/Poll.po
index a2bd5c8461..6debf3bf90 100644
--- a/plugins/Poll/locale/fr/LC_MESSAGES/Poll.po
+++ b/plugins/Poll/locale/fr/LC_MESSAGES/Poll.po
@@ -1,9 +1,12 @@
-# Translation of StatusNet - Poll to French (Français)
+# Translation of StatusNet - Poll to French (français)
 # Exported from translatewiki.net
 #
 # Author: Brunoperel
+# Author: Crochet.david
+# Author: Gomoko
 # Author: Iketsi
 # Author: Od1n
+# Author: Valeryan 24
 # --
 # This file is distributed under the same license as the StatusNet package.
 #
@@ -11,14 +14,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Poll\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:48+0000\n"
-"Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:37+0000\n"
+"Language-Team: French <https://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:49+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:15+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-poll\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
@@ -29,7 +32,7 @@ msgstr "Sondage non trouvé."
 
 #. TRANS: Client exception thrown trying to view a non-existing poll notice.
 msgid "No such poll notice."
-msgstr ""
+msgstr "Aucun avis de sondage."
 
 #. TRANS: Page title for a poll.
 #. TRANS: %1$s is the nickname of the user that created the poll, %2$s is the poll question.
@@ -43,7 +46,7 @@ msgstr "Question"
 
 #. TRANS: Field title on the page to create a poll.
 msgid "What question are people answering?"
-msgstr "A quelle question répondent les gens?"
+msgstr "À quelle question répondent les gens ?"
 
 #. TRANS: Field label for an answer option on the page to create a poll.
 #. TRANS: %d is the option number.
@@ -61,12 +64,10 @@ msgid "Simple extension for supporting basic polls."
 msgstr "Extension simple supportant les sondages basiques."
 
 #. TRANS: Exception thrown trying to respond to a poll without a poll reference.
-#, fuzzy
 msgid "Invalid poll response: No poll reference."
 msgstr "Réponse au sondage invalide : aucune référence de sondage."
 
 #. TRANS: Exception thrown trying to respond to a non-existing poll.
-#, fuzzy
 msgid "Invalid poll response: Poll is unknown."
 msgstr "Réponse au sondage invalide : sondage inconnu."
 
@@ -96,7 +97,7 @@ msgstr "Sélection de sondage invalide."
 #. TRANS: %s a link to the poll with the chosen option as link description.
 #, php-format
 msgid "voted for \"%s\""
-msgstr "ont voté pour \"%s\""
+msgstr "a voté pour \"%s\""
 
 #. TRANS: Button text for submitting a poll response.
 msgctxt "BUTTON"
diff --git a/plugins/Poll/locale/fur/LC_MESSAGES/Poll.po b/plugins/Poll/locale/fur/LC_MESSAGES/Poll.po
new file mode 100644
index 0000000000..a16fcac0b9
--- /dev/null
+++ b/plugins/Poll/locale/fur/LC_MESSAGES/Poll.po
@@ -0,0 +1,148 @@
+# Translation of StatusNet - Poll to Friulian (furlan)
+# Exported from translatewiki.net
+#
+# Author: Klenje
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Poll\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:37+0000\n"
+"Language-Team: Friulian <https://translatewiki.net/wiki/Portal:fur>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:51:15+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: fur\n"
+"X-Message-Group: #out-statusnet-plugin-poll\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Client exception thrown trying to view a non-existing poll.
+msgid "No such poll."
+msgstr "Il scandai nol esist."
+
+#. TRANS: Client exception thrown trying to view a non-existing poll notice.
+msgid "No such poll notice."
+msgstr "L'avîs dal scandai nol esist."
+
+#. TRANS: Page title for a poll.
+#. TRANS: %1$s is the nickname of the user that created the poll, %2$s is the poll question.
+#, php-format
+msgid "%1$s's poll: %2$s"
+msgstr "Scandai di %1$s: %2$s"
+
+#. TRANS: Field label on the page to create a poll.
+msgid "Question"
+msgstr "Domande"
+
+#. TRANS: Field title on the page to create a poll.
+msgid "What question are people answering?"
+msgstr "A ce domande aie di rispuindi la int?"
+
+#. TRANS: Field label for an answer option on the page to create a poll.
+#. TRANS: %d is the option number.
+#, php-format
+msgid "Option %d"
+msgstr "Opzion %d"
+
+#. TRANS: Button text for saving a new poll.
+msgctxt "BUTTON"
+msgid "Save"
+msgstr "Salve"
+
+#. TRANS: Plugin description.
+msgid "Simple extension for supporting basic polls."
+msgstr "Estension semplice par ufrî scandais di base."
+
+#. TRANS: Exception thrown trying to respond to a poll without a poll reference.
+msgid "Invalid poll response: No poll reference."
+msgstr "Rispueste al scandai no valide: nissun riferiment al scandai."
+
+#. TRANS: Exception thrown trying to respond to a non-existing poll.
+msgid "Invalid poll response: Poll is unknown."
+msgstr "Rispueste al scandai no valide: il scandai al è scognossût."
+
+#. TRANS: Exception thrown when performing an unexpected action on a poll.
+#. TRANS: %s is the unexpected object type.
+#, php-format
+msgid "Unexpected type for poll plugin: %s."
+msgstr "Gjenar no spietât pal plugin pai scandais: %s"
+
+#. TRANS: Error text displayed if no poll data could be found.
+msgid "Poll data is missing"
+msgstr "Mancjin i dâts dal scandai"
+
+#. TRANS: Application title.
+msgctxt "APPTITLE"
+msgid "Poll"
+msgstr "Scandai"
+
+#. TRANS: Client exception thrown when responding to a poll with an invalid option.
+#. TRANS: Client exception thrown responding to a poll with an invalid answer.
+msgid "Invalid poll selection."
+msgstr "Sielte tal scandai no valide."
+
+#. TRANS: Notice content voting for a poll.
+#. TRANS: %s is the chosen option in the poll.
+#. TRANS: Rendered version of the notice content voting for a poll.
+#. TRANS: %s a link to the poll with the chosen option as link description.
+#, php-format
+msgid "voted for \"%s\""
+msgstr "al à votât par \"%s\""
+
+#. TRANS: Button text for submitting a poll response.
+msgctxt "BUTTON"
+msgid "Submit"
+msgstr "Trasmet"
+
+#. TRANS: Notice content creating a poll.
+#. TRANS: %1$s is the poll question, %2$s is a link to the poll.
+#, php-format
+msgid "Poll: %1$s %2$s"
+msgstr "Scandai: %1$s %2$s"
+
+#. TRANS: Rendered version of the notice content creating a poll.
+#. TRANS: %s is a link to the poll with the question as link description.
+#, php-format
+msgid "Poll: %s"
+msgstr "Scandai: %s"
+
+#. TRANS: Title for poll page.
+msgid "New poll"
+msgstr "Gnûf scandai"
+
+#. TRANS: Client exception thrown trying to create a poll while not logged in.
+msgid "You must be logged in to post a poll."
+msgstr "Tu scugnis jessi jentrât par publicâ un scandai."
+
+#. TRANS: Client exception thrown trying to create a poll without a question.
+msgid "Poll must have a question."
+msgstr "Il scandai al à di vê une domande."
+
+#. TRANS: Client exception thrown trying to create a poll with fewer than two options.
+msgid "Poll must have at least two options."
+msgstr "Il scandai al à di vê al mancul dôs opzions."
+
+#. TRANS: Page title after sending a notice.
+msgid "Notice posted"
+msgstr "L'avîs al è stât publicât"
+
+#. TRANS: Page title for poll response.
+msgid "Poll response"
+msgstr "Rispueste al scandai"
+
+#. TRANS: Client exception thrown trying to respond to a poll while not logged in.
+msgid "You must be logged in to respond to a poll."
+msgstr "Tu scugnis jessi jentrât par rispuindi a un scandai."
+
+#. TRANS: Client exception thrown trying to respond to a non-existing poll.
+msgid "Invalid or missing poll."
+msgstr "Scandai no valit o mancjant."
+
+#. TRANS: Page title after sending a poll response.
+msgid "Poll results"
+msgstr "Risultâts dal scandai"
diff --git a/plugins/Poll/locale/gl/LC_MESSAGES/Poll.po b/plugins/Poll/locale/gl/LC_MESSAGES/Poll.po
new file mode 100644
index 0000000000..832d42d6ee
--- /dev/null
+++ b/plugins/Poll/locale/gl/LC_MESSAGES/Poll.po
@@ -0,0 +1,148 @@
+# Translation of StatusNet - Poll to Galician (galego)
+# Exported from translatewiki.net
+#
+# Author: Toliño
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Poll\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:37+0000\n"
+"Language-Team: Galician <https://translatewiki.net/wiki/Portal:gl>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:51:15+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: gl\n"
+"X-Message-Group: #out-statusnet-plugin-poll\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Client exception thrown trying to view a non-existing poll.
+msgid "No such poll."
+msgstr "Non existe esa enquisa."
+
+#. TRANS: Client exception thrown trying to view a non-existing poll notice.
+msgid "No such poll notice."
+msgstr "Non existe esa nota de enquisa."
+
+#. TRANS: Page title for a poll.
+#. TRANS: %1$s is the nickname of the user that created the poll, %2$s is the poll question.
+#, php-format
+msgid "%1$s's poll: %2$s"
+msgstr "Enquisa de %1$s: %2$s"
+
+#. TRANS: Field label on the page to create a poll.
+msgid "Question"
+msgstr "Pregunta"
+
+#. TRANS: Field title on the page to create a poll.
+msgid "What question are people answering?"
+msgstr "A que pregunta está respondendo a xente?"
+
+#. TRANS: Field label for an answer option on the page to create a poll.
+#. TRANS: %d is the option number.
+#, php-format
+msgid "Option %d"
+msgstr "Opción %d"
+
+#. TRANS: Button text for saving a new poll.
+msgctxt "BUTTON"
+msgid "Save"
+msgstr "Gardar"
+
+#. TRANS: Plugin description.
+msgid "Simple extension for supporting basic polls."
+msgstr "Extensión simple para soportar enquisas básicas."
+
+#. TRANS: Exception thrown trying to respond to a poll without a poll reference.
+msgid "Invalid poll response: No poll reference."
+msgstr "Resposta á enquisa inválida: Sen referencia á enquisa."
+
+#. TRANS: Exception thrown trying to respond to a non-existing poll.
+msgid "Invalid poll response: Poll is unknown."
+msgstr "Resposta á enquisa inválida: Descoñécese a enquisa."
+
+#. TRANS: Exception thrown when performing an unexpected action on a poll.
+#. TRANS: %s is the unexpected object type.
+#, php-format
+msgid "Unexpected type for poll plugin: %s."
+msgstr "Tipo inesperado para o complemento da enquisa: %s."
+
+#. TRANS: Error text displayed if no poll data could be found.
+msgid "Poll data is missing"
+msgstr "Faltan os datos da enquisa"
+
+#. TRANS: Application title.
+msgctxt "APPTITLE"
+msgid "Poll"
+msgstr "Enquisa"
+
+#. TRANS: Client exception thrown when responding to a poll with an invalid option.
+#. TRANS: Client exception thrown responding to a poll with an invalid answer.
+msgid "Invalid poll selection."
+msgstr "Selección de enquisa inválido."
+
+#. TRANS: Notice content voting for a poll.
+#. TRANS: %s is the chosen option in the poll.
+#. TRANS: Rendered version of the notice content voting for a poll.
+#. TRANS: %s a link to the poll with the chosen option as link description.
+#, php-format
+msgid "voted for \"%s\""
+msgstr "votou \"%s\""
+
+#. TRANS: Button text for submitting a poll response.
+msgctxt "BUTTON"
+msgid "Submit"
+msgstr "Enviar"
+
+#. TRANS: Notice content creating a poll.
+#. TRANS: %1$s is the poll question, %2$s is a link to the poll.
+#, php-format
+msgid "Poll: %1$s %2$s"
+msgstr "Enquisa: %1$s %2$s"
+
+#. TRANS: Rendered version of the notice content creating a poll.
+#. TRANS: %s is a link to the poll with the question as link description.
+#, php-format
+msgid "Poll: %s"
+msgstr "Enquisa: %s"
+
+#. TRANS: Title for poll page.
+msgid "New poll"
+msgstr "Nova enquisa"
+
+#. TRANS: Client exception thrown trying to create a poll while not logged in.
+msgid "You must be logged in to post a poll."
+msgstr "Ten que estar identificado para publicar unha enquisa."
+
+#. TRANS: Client exception thrown trying to create a poll without a question.
+msgid "Poll must have a question."
+msgstr "A enquisa debe ter unha pregunta."
+
+#. TRANS: Client exception thrown trying to create a poll with fewer than two options.
+msgid "Poll must have at least two options."
+msgstr "A enquisa debe ter, polo menos, dúas opcións."
+
+#. TRANS: Page title after sending a notice.
+msgid "Notice posted"
+msgstr "Publicouse a nota"
+
+#. TRANS: Page title for poll response.
+msgid "Poll response"
+msgstr "Resposta á enquisa"
+
+#. TRANS: Client exception thrown trying to respond to a poll while not logged in.
+msgid "You must be logged in to respond to a poll."
+msgstr "Ten que estar identificado para responder unha enquisa."
+
+#. TRANS: Client exception thrown trying to respond to a non-existing poll.
+msgid "Invalid or missing poll."
+msgstr "Falta a enquisa ou esta é inválida."
+
+#. TRANS: Page title after sending a poll response.
+msgid "Poll results"
+msgstr "Resultados da enquisa"
diff --git a/plugins/Poll/locale/ia/LC_MESSAGES/Poll.po b/plugins/Poll/locale/ia/LC_MESSAGES/Poll.po
index 9371ef1962..ef75f1faec 100644
--- a/plugins/Poll/locale/ia/LC_MESSAGES/Poll.po
+++ b/plugins/Poll/locale/ia/LC_MESSAGES/Poll.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Poll to Interlingua (Interlingua)
+# Translation of StatusNet - Poll to Interlingua (interlingua)
 # Exported from translatewiki.net
 #
 # Author: McDutchie
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Poll\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:48+0000\n"
-"Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:37+0000\n"
+"Language-Team: Interlingua <https://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:49+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:15+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-poll\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -59,12 +59,10 @@ msgid "Simple extension for supporting basic polls."
 msgstr "Extension simple pro supportar sondages basic."
 
 #. TRANS: Exception thrown trying to respond to a poll without a poll reference.
-#, fuzzy
 msgid "Invalid poll response: No poll reference."
 msgstr "Responsa invalide a sondage: sin referentia a un sondage."
 
 #. TRANS: Exception thrown trying to respond to a non-existing poll.
-#, fuzzy
 msgid "Invalid poll response: Poll is unknown."
 msgstr "Responsa invalide a sondage: le sondage es incognite."
 
diff --git a/plugins/Poll/locale/ja/LC_MESSAGES/Poll.po b/plugins/Poll/locale/ja/LC_MESSAGES/Poll.po
new file mode 100644
index 0000000000..1507b99d93
--- /dev/null
+++ b/plugins/Poll/locale/ja/LC_MESSAGES/Poll.po
@@ -0,0 +1,148 @@
+# Translation of StatusNet - Poll to Japanese (日本語)
+# Exported from translatewiki.net
+#
+# Author: Miwa ka
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Poll\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:37+0000\n"
+"Language-Team: Japanese <https://translatewiki.net/wiki/Portal:ja>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:51:15+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: ja\n"
+"X-Message-Group: #out-statusnet-plugin-poll\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#. TRANS: Client exception thrown trying to view a non-existing poll.
+msgid "No such poll."
+msgstr "��よ��投票��り��ん"
+
+#. TRANS: Client exception thrown trying to view a non-existing poll notice.
+msgid "No such poll notice."
+msgstr "��よ��投票���や���り��ん"
+
+#. TRANS: Page title for a poll.
+#. TRANS: %1$s is the nickname of the user that created the poll, %2$s is the poll question.
+#, php-format
+msgid "%1$s's poll: %2$s"
+msgstr "%1$s �投票: %2$s"
+
+#. TRANS: Field label on the page to create a poll.
+msgid "Question"
+msgstr "質�"
+
+#. TRANS: Field title on the page to create a poll.
+msgid "What question are people answering?"
+msgstr "�ん�質��人々�回答��もら����?"
+
+#. TRANS: Field label for an answer option on the page to create a poll.
+#. TRANS: %d is the option number.
+#, php-format
+msgid "Option %d"
+msgstr "�択肢 %d"
+
+#. TRANS: Button text for saving a new poll.
+msgctxt "BUTTON"
+msgid "Save"
+msgstr "�存"
+
+#. TRANS: Plugin description.
+msgid "Simple extension for supporting basic polls."
+msgstr "基本的�投票をサ�ート�る����シンプル�拡張機能"
+
+#. TRANS: Exception thrown trying to respond to a poll without a poll reference.
+msgid "Invalid poll response: No poll reference."
+msgstr "無効�投票��応: 投票���照��り��ん"
+
+#. TRANS: Exception thrown trying to respond to a non-existing poll.
+msgid "Invalid poll response: Poll is unknown."
+msgstr "無効�投票���応: 投票��明��"
+
+#. TRANS: Exception thrown when performing an unexpected action on a poll.
+#. TRANS: %s is the unexpected object type.
+#, php-format
+msgid "Unexpected type for poll plugin: %s."
+msgstr "投票プラグイン�予期���タイプ��: %s"
+
+#. TRANS: Error text displayed if no poll data could be found.
+msgid "Poll data is missing"
+msgstr "投票データ��り��ん"
+
+#. TRANS: Application title.
+msgctxt "APPTITLE"
+msgid "Poll"
+msgstr "投票"
+
+#. TRANS: Client exception thrown when responding to a poll with an invalid option.
+#. TRANS: Client exception thrown responding to a poll with an invalid answer.
+msgid "Invalid poll selection."
+msgstr "無効�投票��択"
+
+#. TRANS: Notice content voting for a poll.
+#. TRANS: %s is the chosen option in the poll.
+#. TRANS: Rendered version of the notice content voting for a poll.
+#. TRANS: %s a link to the poll with the chosen option as link description.
+#, php-format
+msgid "voted for \"%s\""
+msgstr "\"%s\" �投票"
+
+#. TRANS: Button text for submitting a poll response.
+msgctxt "BUTTON"
+msgid "Submit"
+msgstr "�信"
+
+#. TRANS: Notice content creating a poll.
+#. TRANS: %1$s is the poll question, %2$s is a link to the poll.
+#, php-format
+msgid "Poll: %1$s %2$s"
+msgstr "投票: %1$s %2$s"
+
+#. TRANS: Rendered version of the notice content creating a poll.
+#. TRANS: %s is a link to the poll with the question as link description.
+#, php-format
+msgid "Poll: %s"
+msgstr "投票: %s"
+
+#. TRANS: Title for poll page.
+msgid "New poll"
+msgstr "新��投票"
+
+#. TRANS: Client exception thrown trying to create a poll while not logged in.
+msgid "You must be logged in to post a poll."
+msgstr "投票�る����ログイン�る必���り��"
+
+#. TRANS: Client exception thrown trying to create a poll without a question.
+msgid "Poll must have a question."
+msgstr "投票�質�文�必���"
+
+#. TRANS: Client exception thrown trying to create a poll with fewer than two options.
+msgid "Poll must have at least two options."
+msgstr "投票�最低二���択肢�必���"
+
+#. TRANS: Page title after sending a notice.
+msgid "Notice posted"
+msgstr "��や�を投稿����"
+
+#. TRANS: Page title for poll response.
+msgid "Poll response"
+msgstr "質���応"
+
+#. TRANS: Client exception thrown trying to respond to a poll while not logged in.
+msgid "You must be logged in to respond to a poll."
+msgstr "投票�応答�る����ログイン�る必���り��"
+
+#. TRANS: Client exception thrown trying to respond to a non-existing poll.
+msgid "Invalid or missing poll."
+msgstr "無効���正����投票��"
+
+#. TRANS: Page title after sending a poll response.
+msgid "Poll results"
+msgstr "投票�果"
diff --git a/plugins/Poll/locale/mk/LC_MESSAGES/Poll.po b/plugins/Poll/locale/mk/LC_MESSAGES/Poll.po
index 9056fbb97e..75a67b2a11 100644
--- a/plugins/Poll/locale/mk/LC_MESSAGES/Poll.po
+++ b/plugins/Poll/locale/mk/LC_MESSAGES/Poll.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Poll to Macedonian (Македон�ки)
+# Translation of StatusNet - Poll to Macedonian (македон�ки)
 # Exported from translatewiki.net
 #
 # Author: Bjankuloski06
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Poll\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:48+0000\n"
-"Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:37+0000\n"
+"Language-Team: Macedonian <https://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:49+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:15+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-poll\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
@@ -59,14 +59,12 @@ msgid "Simple extension for supporting basic polls."
 msgstr "Про�т додаток за поддршка на едно�тавни анкети."
 
 #. TRANS: Exception thrown trying to respond to a poll without a poll reference.
-#, fuzzy
 msgid "Invalid poll response: No poll reference."
-msgstr "�еважечки одговор во анкетата: нема назнака на анкетата."
+msgstr "�еважечки одговор во анкетата: �ема назнака на анкетата."
 
 #. TRANS: Exception thrown trying to respond to a non-existing poll.
-#, fuzzy
 msgid "Invalid poll response: Poll is unknown."
-msgstr "�еважечки одговор во анкетата: анкетата е непозната."
+msgstr "�еважечки одговор во анкетата: �нкетата е непозната."
 
 #. TRANS: Exception thrown when performing an unexpected action on a poll.
 #. TRANS: %s is the unexpected object type.
diff --git a/plugins/Poll/locale/nl/LC_MESSAGES/Poll.po b/plugins/Poll/locale/nl/LC_MESSAGES/Poll.po
index e90b975d0e..5838ca2428 100644
--- a/plugins/Poll/locale/nl/LC_MESSAGES/Poll.po
+++ b/plugins/Poll/locale/nl/LC_MESSAGES/Poll.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Poll\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:49+0000\n"
-"Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:37+0000\n"
+"Language-Team: Dutch <https://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:49+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:15+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-poll\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -59,12 +59,10 @@ msgid "Simple extension for supporting basic polls."
 msgstr "Eenvoudige plug-in voor peilingen."
 
 #. TRANS: Exception thrown trying to respond to a poll without a poll reference.
-#, fuzzy
 msgid "Invalid poll response: No poll reference."
 msgstr "Ongeldig antwoord op peiling: heeft geen verwijzing naar een peiling."
 
 #. TRANS: Exception thrown trying to respond to a non-existing poll.
-#, fuzzy
 msgid "Invalid poll response: Poll is unknown."
 msgstr "Ongeldig antwoord op peiling: de peiling bestaat niet."
 
diff --git a/plugins/Poll/locale/tl/LC_MESSAGES/Poll.po b/plugins/Poll/locale/tl/LC_MESSAGES/Poll.po
index 71afbe199b..e1a105ca76 100644
--- a/plugins/Poll/locale/tl/LC_MESSAGES/Poll.po
+++ b/plugins/Poll/locale/tl/LC_MESSAGES/Poll.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Poll\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:49+0000\n"
-"Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:38+0000\n"
+"Language-Team: Tagalog <https://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:49+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:15+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-poll\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -59,15 +59,13 @@ msgid "Simple extension for supporting basic polls."
 msgstr "Payak na dugtong para sa pagtangkilik ng payak na mga botohan."
 
 #. TRANS: Exception thrown trying to respond to a poll without a poll reference.
-#, fuzzy
 msgid "Invalid poll response: No poll reference."
 msgstr ""
-"Hindi katanggap-tanggap na tugon sa botohan: walang sanggunian ng botohan"
+"Hindi katanggap-tanggap na pagtugon sa botohan: Walang sanggunian ng botohan."
 
 #. TRANS: Exception thrown trying to respond to a non-existing poll.
-#, fuzzy
 msgid "Invalid poll response: Poll is unknown."
-msgstr "Hindi katanggap-tanggap na tugon: hindi nalalaman ang botohan."
+msgstr "Hindi katanggap-tanggap na pagtugon: Hindi nalalamang botohan."
 
 #. TRANS: Exception thrown when performing an unexpected action on a poll.
 #. TRANS: %s is the unexpected object type.
diff --git a/plugins/Poll/locale/uk/LC_MESSAGES/Poll.po b/plugins/Poll/locale/uk/LC_MESSAGES/Poll.po
index c5c570c551..7865247e96 100644
--- a/plugins/Poll/locale/uk/LC_MESSAGES/Poll.po
+++ b/plugins/Poll/locale/uk/LC_MESSAGES/Poll.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Poll to Ukrainian (Україн�ька)
+# Translation of StatusNet - Poll to Ukrainian (україн�ька)
 # Exported from translatewiki.net
 #
 # Author: Boogie
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Poll\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:49+0000\n"
-"Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:38+0000\n"
+"Language-Team: Ukrainian <https://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:49+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:15+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-poll\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
@@ -60,12 +60,10 @@ msgid "Simple extension for supporting basic polls."
 msgstr "Про�тий додаток дл� підтримки проведенн� опитувань."
 
 #. TRANS: Exception thrown trying to respond to a poll without a poll reference.
-#, fuzzy
 msgid "Invalid poll response: No poll reference."
 msgstr "�евірна відповідь: від�утнє по�иланн� на опитуванн�."
 
 #. TRANS: Exception thrown trying to respond to a non-existing poll.
-#, fuzzy
 msgid "Invalid poll response: Poll is unknown."
 msgstr "�еправильна відповідь на опитуванн�: невідоме опитуванн�."
 
diff --git a/plugins/Poll/pollsettings.php b/plugins/Poll/pollsettings.php
new file mode 100644
index 0000000000..c3128895cf
--- /dev/null
+++ b/plugins/Poll/pollsettings.php
@@ -0,0 +1,198 @@
+<?php
+/**
+ * Form to set your personal poll settings
+ *
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Plugins
+ * @package   StatusNet
+ * @author    Brion Vibber <brion@status.net>
+ * @copyright 2012 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET') && !defined('LACONICA')) {
+    exit(1);
+}
+
+class PollSettingsAction extends SettingsAction
+{
+    /**
+     * Title of the page
+     *
+     * @return string Page title
+     */
+    function title()
+    {
+        // TRANS: Page title.
+        return _m('Poll settings');
+    }
+
+    /**
+     * Instructions for use
+     *
+     * @return string Instructions for use
+     */
+
+    function getInstructions()
+    {
+        // TRANS: Page instructions.
+        return _m('Set your poll preferences');
+    }
+
+    /**
+     * Show the form for Poll
+     *
+     * @return void
+     */
+    function showContent()
+    {
+        $user = common_current_user();
+
+        $prefs = User_poll_prefs::staticGet('user_id', $user->id);
+
+        $form = new PollPrefsForm($this, $prefs);
+
+        $form->show();
+    }
+
+    /**
+     * Handler method
+     *
+     * @param array $argarray is ignored since it's now passed in in prepare()
+     *
+     * @return void
+     */
+
+    function handlePost()
+    {
+        $user = common_current_user();
+
+        $upp = User_poll_prefs::staticGet('user_id', $user->id);
+        $orig = null;
+
+        if (!empty($upp)) {
+            $orig = clone($upp);
+        } else {
+            $upp = new User_poll_prefs();
+            $upp->user_id = $user->id;
+            $upp->created = common_sql_now();
+        }
+
+        $upp->hide_responses = $this->boolean('hide_responses');
+        $upp->modified       = common_sql_now();
+
+        if (!empty($orig)) {
+            $upp->update($orig);
+        } else {
+            $upp->insert();
+        }
+
+        // TRANS: Confirmation shown when user profile settings are saved.
+        $this->showForm(_('Settings saved.'), true);
+
+        return;
+    }
+}
+
+class PollPrefsForm extends Form
+{
+    var $prefs;
+
+    function __construct($out, $prefs)
+    {
+        parent::__construct($out);
+        $this->prefs = $prefs;
+    }
+
+    /**
+     * Visible or invisible data elements
+     *
+     * Display the form fields that make up the data of the form.
+     * Sub-classes should overload this to show their data.
+     *
+     * @return void
+     */
+
+    function formData()
+    {
+        $this->elementStart('fieldset');
+        $this->elementStart('ul', 'form_data');
+        $this->elementStart('li');
+        $this->checkbox('hide_responses',
+                        _('Do not deliver poll responses to my home timeline'),
+                        (!empty($this->prefs) && $this->prefs->hide_responses));
+        $this->elementEnd('li');
+        $this->elementEnd('ul');
+        $this->elementEnd('fieldset');
+    }
+
+    /**
+     * Buttons for form actions
+     *
+     * Submit and cancel buttons (or whatever)
+     * Sub-classes should overload this to show their own buttons.
+     *
+     * @return void
+     */
+
+    function formActions()
+    {
+        $this->submit('submit', _('Save'));
+    }
+
+    /**
+     * ID of the form
+     *
+     * Should be unique on the page. Sub-classes should overload this
+     * to show their own IDs.
+     *
+     * @return int ID of the form
+     */
+
+    function id()
+    {
+        return 'form_poll_prefs';
+    }
+
+    /**
+     * Action of the form.
+     *
+     * URL to post to. Should be overloaded by subclasses to give
+     * somewhere to post to.
+     *
+     * @return string URL to post to
+     */
+
+    function action()
+    {
+        return common_local_url('pollsettings');
+    }
+
+    /**
+     * Class of the form. May include space-separated list of multiple classes.
+     *
+     * @return string the form's class
+     */
+
+    function formClass()
+    {
+        return 'form_settings';
+    }
+}
diff --git a/plugins/PostDebug/locale/PostDebug.pot b/plugins/PostDebug/locale/PostDebug.pot
index fec93e8e76..398a4a6fcf 100644
--- a/plugins/PostDebug/locale/PostDebug.pot
+++ b/plugins/PostDebug/locale/PostDebug.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
+"POT-Creation-Date: 2012-06-30 11:07+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"
diff --git a/plugins/PostDebug/locale/de/LC_MESSAGES/PostDebug.po b/plugins/PostDebug/locale/de/LC_MESSAGES/PostDebug.po
index a9d0a03b4f..73b490df09 100644
--- a/plugins/PostDebug/locale/de/LC_MESSAGES/PostDebug.po
+++ b/plugins/PostDebug/locale/de/LC_MESSAGES/PostDebug.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PostDebug\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:49+0000\n"
-"Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:38+0000\n"
+"Language-Team: German <https://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:08:30+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:20+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-postdebug\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/PostDebug/locale/es/LC_MESSAGES/PostDebug.po b/plugins/PostDebug/locale/es/LC_MESSAGES/PostDebug.po
index 43bfc404e2..5907552d63 100644
--- a/plugins/PostDebug/locale/es/LC_MESSAGES/PostDebug.po
+++ b/plugins/PostDebug/locale/es/LC_MESSAGES/PostDebug.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - PostDebug to Spanish (Español)
+# Translation of StatusNet - PostDebug to Spanish (español)
 # Exported from translatewiki.net
 #
 # Author: Translationista
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PostDebug\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:49+0000\n"
-"Language-Team: Spanish <http://translatewiki.net/wiki/Portal:es>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:38+0000\n"
+"Language-Team: Spanish <https://translatewiki.net/wiki/Portal:es>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:08:30+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:20+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-plugin-postdebug\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/PostDebug/locale/fi/LC_MESSAGES/PostDebug.po b/plugins/PostDebug/locale/fi/LC_MESSAGES/PostDebug.po
index 86a7224ac6..9cd0a5b1d7 100644
--- a/plugins/PostDebug/locale/fi/LC_MESSAGES/PostDebug.po
+++ b/plugins/PostDebug/locale/fi/LC_MESSAGES/PostDebug.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - PostDebug to Finnish (Suomi)
+# Translation of StatusNet - PostDebug to Finnish (suomi)
 # Exported from translatewiki.net
 #
 # Author: Nike
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PostDebug\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:49+0000\n"
-"Language-Team: Finnish <http://translatewiki.net/wiki/Portal:fi>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:38+0000\n"
+"Language-Team: Finnish <https://translatewiki.net/wiki/Portal:fi>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:08:30+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:20+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: fi\n"
 "X-Message-Group: #out-statusnet-plugin-postdebug\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/PostDebug/locale/fr/LC_MESSAGES/PostDebug.po b/plugins/PostDebug/locale/fr/LC_MESSAGES/PostDebug.po
index 3f50cced16..def4b42043 100644
--- a/plugins/PostDebug/locale/fr/LC_MESSAGES/PostDebug.po
+++ b/plugins/PostDebug/locale/fr/LC_MESSAGES/PostDebug.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - PostDebug to French (Français)
+# Translation of StatusNet - PostDebug to French (français)
 # Exported from translatewiki.net
 #
 # Author: Peter17
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PostDebug\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:49+0000\n"
-"Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:38+0000\n"
+"Language-Team: French <https://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:08:30+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:20+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-postdebug\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
diff --git a/plugins/PostDebug/locale/gl/LC_MESSAGES/PostDebug.po b/plugins/PostDebug/locale/gl/LC_MESSAGES/PostDebug.po
new file mode 100644
index 0000000000..5096c830f2
--- /dev/null
+++ b/plugins/PostDebug/locale/gl/LC_MESSAGES/PostDebug.po
@@ -0,0 +1,27 @@
+# Translation of StatusNet - PostDebug to Galician (galego)
+# Exported from translatewiki.net
+#
+# Author: Toliño
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - PostDebug\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:38+0000\n"
+"Language-Team: Galician <https://translatewiki.net/wiki/Portal:gl>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:51:20+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: gl\n"
+"X-Message-Group: #out-statusnet-plugin-postdebug\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin description.
+msgid "Debugging tool to record request details on POST."
+msgstr ""
+"Ferramenta de depuración para rexistrar os detalles de solicitudes en POST."
diff --git a/plugins/PostDebug/locale/he/LC_MESSAGES/PostDebug.po b/plugins/PostDebug/locale/he/LC_MESSAGES/PostDebug.po
index 53d6409c8c..89f2936bea 100644
--- a/plugins/PostDebug/locale/he/LC_MESSAGES/PostDebug.po
+++ b/plugins/PostDebug/locale/he/LC_MESSAGES/PostDebug.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PostDebug\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:49+0000\n"
-"Language-Team: Hebrew <http://translatewiki.net/wiki/Portal:he>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:38+0000\n"
+"Language-Team: Hebrew <https://translatewiki.net/wiki/Portal:he>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:08:30+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:20+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: he\n"
 "X-Message-Group: #out-statusnet-plugin-postdebug\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/PostDebug/locale/ia/LC_MESSAGES/PostDebug.po b/plugins/PostDebug/locale/ia/LC_MESSAGES/PostDebug.po
index 3cfbf74eba..27a57cffe2 100644
--- a/plugins/PostDebug/locale/ia/LC_MESSAGES/PostDebug.po
+++ b/plugins/PostDebug/locale/ia/LC_MESSAGES/PostDebug.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - PostDebug to Interlingua (Interlingua)
+# Translation of StatusNet - PostDebug to Interlingua (interlingua)
 # Exported from translatewiki.net
 #
 # Author: McDutchie
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PostDebug\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:50+0000\n"
-"Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:38+0000\n"
+"Language-Team: Interlingua <https://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:08:30+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:20+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-postdebug\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/PostDebug/locale/id/LC_MESSAGES/PostDebug.po b/plugins/PostDebug/locale/id/LC_MESSAGES/PostDebug.po
index 43a0e48a8a..8786b9b2a9 100644
--- a/plugins/PostDebug/locale/id/LC_MESSAGES/PostDebug.po
+++ b/plugins/PostDebug/locale/id/LC_MESSAGES/PostDebug.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PostDebug\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:50+0000\n"
-"Language-Team: Indonesian <http://translatewiki.net/wiki/Portal:id>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:38+0000\n"
+"Language-Team: Indonesian <https://translatewiki.net/wiki/Portal:id>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:08:30+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:20+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: id\n"
 "X-Message-Group: #out-statusnet-plugin-postdebug\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
diff --git a/plugins/PostDebug/locale/it/LC_MESSAGES/PostDebug.po b/plugins/PostDebug/locale/it/LC_MESSAGES/PostDebug.po
new file mode 100644
index 0000000000..ad9a7c34d5
--- /dev/null
+++ b/plugins/PostDebug/locale/it/LC_MESSAGES/PostDebug.po
@@ -0,0 +1,23 @@
+# Translation of StatusNet - PostDebug to Italian (italiano)
+# Exported from translatewiki.net
+#
+# Author: GreenFox
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - PostDebug\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:38+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:51:20+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin description.
+msgid "Debugging tool to record request details on POST."
+msgstr "Strumento di debug per richiesta registrazione dettagli sul POST."
diff --git a/plugins/PostDebug/locale/ja/LC_MESSAGES/PostDebug.po b/plugins/PostDebug/locale/ja/LC_MESSAGES/PostDebug.po
index ff6c6869f6..e6a7ee6af0 100644
--- a/plugins/PostDebug/locale/ja/LC_MESSAGES/PostDebug.po
+++ b/plugins/PostDebug/locale/ja/LC_MESSAGES/PostDebug.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PostDebug\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:50+0000\n"
-"Language-Team: Japanese <http://translatewiki.net/wiki/Portal:ja>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:38+0000\n"
+"Language-Team: Japanese <https://translatewiki.net/wiki/Portal:ja>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:08:30+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:20+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ja\n"
 "X-Message-Group: #out-statusnet-plugin-postdebug\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
diff --git a/plugins/PostDebug/locale/mk/LC_MESSAGES/PostDebug.po b/plugins/PostDebug/locale/mk/LC_MESSAGES/PostDebug.po
index 783a613dc5..a161bfbb6c 100644
--- a/plugins/PostDebug/locale/mk/LC_MESSAGES/PostDebug.po
+++ b/plugins/PostDebug/locale/mk/LC_MESSAGES/PostDebug.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - PostDebug to Macedonian (Македон�ки)
+# Translation of StatusNet - PostDebug to Macedonian (македон�ки)
 # Exported from translatewiki.net
 #
 # Author: Bjankuloski06
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PostDebug\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:50+0000\n"
-"Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:39+0000\n"
+"Language-Team: Macedonian <https://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:08:30+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:20+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-postdebug\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
diff --git a/plugins/PostDebug/locale/nb/LC_MESSAGES/PostDebug.po b/plugins/PostDebug/locale/nb/LC_MESSAGES/PostDebug.po
index a0a64f82cf..b1ec72a024 100644
--- a/plugins/PostDebug/locale/nb/LC_MESSAGES/PostDebug.po
+++ b/plugins/PostDebug/locale/nb/LC_MESSAGES/PostDebug.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - PostDebug to Norwegian (bokmål)‬ (‪Norsk (bokmål)‬)
+# Translation of StatusNet - PostDebug to Norwegian Bokmål (‪norsk (bokmål)‬)
 # Exported from translatewiki.net
 #
 # Author: Nghtwlkr
@@ -9,15 +9,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PostDebug\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:50+0000\n"
-"Language-Team: Norwegian (bokmål)‬ <http://translatewiki.net/wiki/Portal:no>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:39+0000\n"
+"Language-Team: Norwegian Bokmål <https://translatewiki.net/wiki/Portal:nb>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:08:30+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
-"X-Language-Code: no\n"
+"X-POT-Import-Date: 2011-06-05 21:51:20+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: nb\n"
 "X-Message-Group: #out-statusnet-plugin-postdebug\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
diff --git a/plugins/PostDebug/locale/nl/LC_MESSAGES/PostDebug.po b/plugins/PostDebug/locale/nl/LC_MESSAGES/PostDebug.po
index a127daddad..065731e295 100644
--- a/plugins/PostDebug/locale/nl/LC_MESSAGES/PostDebug.po
+++ b/plugins/PostDebug/locale/nl/LC_MESSAGES/PostDebug.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PostDebug\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:50+0000\n"
-"Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:39+0000\n"
+"Language-Team: Dutch <https://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:08:30+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:20+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-postdebug\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/PostDebug/locale/pt/LC_MESSAGES/PostDebug.po b/plugins/PostDebug/locale/pt/LC_MESSAGES/PostDebug.po
index ffeff96946..0a2b31b6ae 100644
--- a/plugins/PostDebug/locale/pt/LC_MESSAGES/PostDebug.po
+++ b/plugins/PostDebug/locale/pt/LC_MESSAGES/PostDebug.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - PostDebug to Portuguese (Português)
+# Translation of StatusNet - PostDebug to Portuguese (português)
 # Exported from translatewiki.net
 #
 # Author: Waldir
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PostDebug\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:50+0000\n"
-"Language-Team: Portuguese <http://translatewiki.net/wiki/Portal:pt>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:39+0000\n"
+"Language-Team: Portuguese <https://translatewiki.net/wiki/Portal:pt>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:08:30+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:20+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: pt\n"
 "X-Message-Group: #out-statusnet-plugin-postdebug\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/PostDebug/locale/pt_BR/LC_MESSAGES/PostDebug.po b/plugins/PostDebug/locale/pt_BR/LC_MESSAGES/PostDebug.po
index 1997e284ec..50b3b4dca2 100644
--- a/plugins/PostDebug/locale/pt_BR/LC_MESSAGES/PostDebug.po
+++ b/plugins/PostDebug/locale/pt_BR/LC_MESSAGES/PostDebug.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - PostDebug to Brazilian Portuguese (Português do Brasil)
+# Translation of StatusNet - PostDebug to Brazilian Portuguese (português do Brasil)
 # Exported from translatewiki.net
 #
 # Author: Giro720
@@ -9,15 +9,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PostDebug\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:50+0000\n"
-"Language-Team: Brazilian Portuguese <http://translatewiki.net/wiki/Portal:pt-"
-"br>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:39+0000\n"
+"Language-Team: Brazilian Portuguese <https://translatewiki.net/wiki/Portal:"
+"pt-br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:08:30+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:20+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: pt-br\n"
 "X-Message-Group: #out-statusnet-plugin-postdebug\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
diff --git a/plugins/PostDebug/locale/ru/LC_MESSAGES/PostDebug.po b/plugins/PostDebug/locale/ru/LC_MESSAGES/PostDebug.po
index 536636e7fa..0df253c3c2 100644
--- a/plugins/PostDebug/locale/ru/LC_MESSAGES/PostDebug.po
+++ b/plugins/PostDebug/locale/ru/LC_MESSAGES/PostDebug.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - PostDebug to Russian (Ру��кий)
+# Translation of StatusNet - PostDebug to Russian (ру��кий)
 # Exported from translatewiki.net
 #
 # Author: Lockal
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PostDebug\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:50+0000\n"
-"Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:39+0000\n"
+"Language-Team: Russian <https://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:08:30+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:20+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-postdebug\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
diff --git a/plugins/PostDebug/locale/tl/LC_MESSAGES/PostDebug.po b/plugins/PostDebug/locale/tl/LC_MESSAGES/PostDebug.po
index 284863d2bb..d1980c6e8f 100644
--- a/plugins/PostDebug/locale/tl/LC_MESSAGES/PostDebug.po
+++ b/plugins/PostDebug/locale/tl/LC_MESSAGES/PostDebug.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PostDebug\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:50+0000\n"
-"Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:39+0000\n"
+"Language-Team: Tagalog <https://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:08:30+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:20+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-postdebug\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/PostDebug/locale/uk/LC_MESSAGES/PostDebug.po b/plugins/PostDebug/locale/uk/LC_MESSAGES/PostDebug.po
index 6fb565e671..c5826cca55 100644
--- a/plugins/PostDebug/locale/uk/LC_MESSAGES/PostDebug.po
+++ b/plugins/PostDebug/locale/uk/LC_MESSAGES/PostDebug.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - PostDebug to Ukrainian (Україн�ька)
+# Translation of StatusNet - PostDebug to Ukrainian (україн�ька)
 # Exported from translatewiki.net
 #
 # Author: Boogie
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PostDebug\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:50+0000\n"
-"Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:39+0000\n"
+"Language-Team: Ukrainian <https://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:08:30+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:20+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-postdebug\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
diff --git a/plugins/PoweredByStatusNet/locale/PoweredByStatusNet.pot b/plugins/PoweredByStatusNet/locale/PoweredByStatusNet.pot
index 04aa1813c4..69b4c51551 100644
--- a/plugins/PoweredByStatusNet/locale/PoweredByStatusNet.pot
+++ b/plugins/PoweredByStatusNet/locale/PoweredByStatusNet.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
+"POT-Creation-Date: 2012-06-30 11:07+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"
diff --git a/plugins/PoweredByStatusNet/locale/af/LC_MESSAGES/PoweredByStatusNet.po b/plugins/PoweredByStatusNet/locale/af/LC_MESSAGES/PoweredByStatusNet.po
new file mode 100644
index 0000000000..ad1507c75e
--- /dev/null
+++ b/plugins/PoweredByStatusNet/locale/af/LC_MESSAGES/PoweredByStatusNet.po
@@ -0,0 +1,32 @@
+# Translation of StatusNet - PoweredByStatusNet to Afrikaans (Afrikaans)
+# Exported from translatewiki.net
+#
+# Author: Naudefj
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - PoweredByStatusNet\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:39+0000\n"
+"Language-Team: Afrikaans <https://translatewiki.net/wiki/Portal:af>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-18 16:19:26+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: af\n"
+"X-Message-Group: #out-statusnet-plugin-poweredbystatusnet\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Text output after site name.
+msgid "powered by <a href=\"http://status.net/\">StatusNet</a>"
+msgstr "aangedryf deur <a href=\"http://status.net/\">StatusNet</a>"
+
+#. TRANS: Plugin description.
+msgid ""
+"Outputs \"powered by <a href=\"http://status.net/\">StatusNet</a>\" after "
+"site name."
+msgstr ""
diff --git a/plugins/PoweredByStatusNet/locale/br/LC_MESSAGES/PoweredByStatusNet.po b/plugins/PoweredByStatusNet/locale/br/LC_MESSAGES/PoweredByStatusNet.po
index d876620cf9..0271d5af42 100644
--- a/plugins/PoweredByStatusNet/locale/br/LC_MESSAGES/PoweredByStatusNet.po
+++ b/plugins/PoweredByStatusNet/locale/br/LC_MESSAGES/PoweredByStatusNet.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - PoweredByStatusNet to Breton (Brezhoneg)
+# Translation of StatusNet - PoweredByStatusNet to Breton (brezhoneg)
 # Exported from translatewiki.net
 #
 # Author: Y-M D
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PoweredByStatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:51+0000\n"
-"Language-Team: Breton <http://translatewiki.net/wiki/Portal:br>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:39+0000\n"
+"Language-Team: Breton <https://translatewiki.net/wiki/Portal:br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-16 23:18:51+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-18 16:19:26+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-poweredbystatusnet\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
@@ -35,9 +35,3 @@ msgid ""
 msgstr ""
 "Diskwel \"enlusket gant <a href=\"http://status.net/\">StatusNet</a>\" goude "
 "anv al lec'hienn."
-
-#~ msgid "powered by %s"
-#~ msgstr "enlusket gant %s"
-
-#~ msgid "StatusNet"
-#~ msgstr "StatusNet"
diff --git a/plugins/PoweredByStatusNet/locale/ca/LC_MESSAGES/PoweredByStatusNet.po b/plugins/PoweredByStatusNet/locale/ca/LC_MESSAGES/PoweredByStatusNet.po
index 12e27ee172..db18b32858 100644
--- a/plugins/PoweredByStatusNet/locale/ca/LC_MESSAGES/PoweredByStatusNet.po
+++ b/plugins/PoweredByStatusNet/locale/ca/LC_MESSAGES/PoweredByStatusNet.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - PoweredByStatusNet to Catalan (Català)
+# Translation of StatusNet - PoweredByStatusNet to Catalan (català)
 # Exported from translatewiki.net
 #
 # Author: Toniher
@@ -9,24 +9,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PoweredByStatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:51+0000\n"
-"Language-Team: Catalan <http://translatewiki.net/wiki/Portal:ca>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:40+0000\n"
+"Language-Team: Catalan <https://translatewiki.net/wiki/Portal:ca>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-16 23:18:51+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-18 16:19:26+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ca\n"
 "X-Message-Group: #out-statusnet-plugin-poweredbystatusnet\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANS: Text output after site name.
-#, fuzzy
 msgid "powered by <a href=\"http://status.net/\">StatusNet</a>"
-msgstr ""
-"Les sortides «funciona amb <a href=\"http://status.net/\">StatusNet</a>» "
-"després del lloc del nom."
+msgstr "funciona amb <a href=\"http://status.net/\">StatusNet</a>"
 
 #. TRANS: Plugin description.
 msgid ""
@@ -35,9 +32,3 @@ msgid ""
 msgstr ""
 "Les sortides «funciona amb <a href=\"http://status.net/\">StatusNet</a>» "
 "després del lloc del nom."
-
-#~ msgid "powered by %s"
-#~ msgstr "funciona amb %s"
-
-#~ msgid "StatusNet"
-#~ msgstr "StatusNet"
diff --git a/plugins/PoweredByStatusNet/locale/de/LC_MESSAGES/PoweredByStatusNet.po b/plugins/PoweredByStatusNet/locale/de/LC_MESSAGES/PoweredByStatusNet.po
index 540be8ac04..c33ec2496d 100644
--- a/plugins/PoweredByStatusNet/locale/de/LC_MESSAGES/PoweredByStatusNet.po
+++ b/plugins/PoweredByStatusNet/locale/de/LC_MESSAGES/PoweredByStatusNet.po
@@ -1,6 +1,7 @@
 # Translation of StatusNet - PoweredByStatusNet to German (Deutsch)
 # Exported from translatewiki.net
 #
+# Author: DaSch
 # Author: The Evil IP address
 # --
 # This file is distributed under the same license as the StatusNet package.
@@ -9,24 +10,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PoweredByStatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:51+0000\n"
-"Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:40+0000\n"
+"Language-Team: German <https://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-16 23:18:51+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-18 16:19:26+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-poweredbystatusnet\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANS: Text output after site name.
-#, fuzzy
 msgid "powered by <a href=\"http://status.net/\">StatusNet</a>"
-msgstr ""
-"Fügt „bereitgestellt von <a href=\"http://status.net/\">StatusNet</a>“ "
-"hinter dem Seitennamen ein."
+msgstr "bereitgestellt von <a href=\"http://status.net/\">StatusNet</a>"
 
 #. TRANS: Plugin description.
 msgid ""
@@ -35,9 +33,3 @@ msgid ""
 msgstr ""
 "Fügt „bereitgestellt von <a href=\"http://status.net/\">StatusNet</a>“ "
 "hinter dem Seitennamen ein."
-
-#~ msgid "powered by %s"
-#~ msgstr "bereitgestellt von %s"
-
-#~ msgid "StatusNet"
-#~ msgstr "StatusNet"
diff --git a/plugins/PoweredByStatusNet/locale/es/LC_MESSAGES/PoweredByStatusNet.po b/plugins/PoweredByStatusNet/locale/es/LC_MESSAGES/PoweredByStatusNet.po
index c3e5b09b56..abdfc9d83f 100644
--- a/plugins/PoweredByStatusNet/locale/es/LC_MESSAGES/PoweredByStatusNet.po
+++ b/plugins/PoweredByStatusNet/locale/es/LC_MESSAGES/PoweredByStatusNet.po
@@ -1,6 +1,7 @@
-# Translation of StatusNet - PoweredByStatusNet to Spanish (Español)
-# Expored from translatewiki.net
+# Translation of StatusNet - PoweredByStatusNet to Spanish (español)
+# Exported from translatewiki.net
 #
+# Author: Armando-Martin
 # Author: Peter17
 # --
 # This file is distributed under the same license as the StatusNet package.
@@ -9,30 +10,26 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PoweredByStatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:47+0000\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:40+0000\n"
 "Language-Team: Spanish <http://translatewiki.net/wiki/Portal:es>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2010-11-30 20:43:51+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-18 16:19:26+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-plugin-poweredbystatusnet\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#. TRANS: %s is a URL to status.net with "StatusNet" (localised) as link text.
-#: PoweredByStatusNetPlugin.php:51
-#, php-format
-msgid "powered by %s"
-msgstr ""
+#. TRANS: Text output after site name.
+msgid "powered by <a href=\"http://status.net/\">StatusNet</a>"
+msgstr "Desarrollado por <a href=\"http://status.net/\">StatusNet</a>"
 
-#: PoweredByStatusNetPlugin.php:53
-msgid "StatusNet"
-msgstr "StatusNet"
-
-#: PoweredByStatusNetPlugin.php:66
+#. TRANS: Plugin description.
 msgid ""
 "Outputs \"powered by <a href=\"http://status.net/\">StatusNet</a>\" after "
 "site name."
 msgstr ""
+"Añade la frase \"desarrollado por <a href=\"http://status.net/\">StatusNet</"
+"a>\" tras el nombre del sitio."
diff --git a/plugins/PoweredByStatusNet/locale/eu/LC_MESSAGES/PoweredByStatusNet.po b/plugins/PoweredByStatusNet/locale/eu/LC_MESSAGES/PoweredByStatusNet.po
new file mode 100644
index 0000000000..8afd5a7168
--- /dev/null
+++ b/plugins/PoweredByStatusNet/locale/eu/LC_MESSAGES/PoweredByStatusNet.po
@@ -0,0 +1,34 @@
+# Translation of StatusNet - PoweredByStatusNet to Basque (euskara)
+# Exported from translatewiki.net
+#
+# Author: Artsuaga
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - PoweredByStatusNet\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:40+0000\n"
+"Language-Team: Basque <https://translatewiki.net/wiki/Portal:eu>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-18 16:19:26+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: eu\n"
+"X-Message-Group: #out-statusnet-plugin-poweredbystatusnet\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Text output after site name.
+msgid "powered by <a href=\"http://status.net/\">StatusNet</a>"
+msgstr "<a href=\"http://status.net/\">StatusNet</a>ekin dabil"
+
+#. TRANS: Plugin description.
+msgid ""
+"Outputs \"powered by <a href=\"http://status.net/\">StatusNet</a>\" after "
+"site name."
+msgstr ""
+"Gunearen izenaren ondoren \"<a href=\"http://status.net/\">StatusNet</a>ekin "
+"dabil\" esaldia jartzen du."
diff --git a/plugins/PoweredByStatusNet/locale/fr/LC_MESSAGES/PoweredByStatusNet.po b/plugins/PoweredByStatusNet/locale/fr/LC_MESSAGES/PoweredByStatusNet.po
index 374a87c94b..3912803f12 100644
--- a/plugins/PoweredByStatusNet/locale/fr/LC_MESSAGES/PoweredByStatusNet.po
+++ b/plugins/PoweredByStatusNet/locale/fr/LC_MESSAGES/PoweredByStatusNet.po
@@ -1,6 +1,7 @@
-# Translation of StatusNet - PoweredByStatusNet to French (Français)
+# Translation of StatusNet - PoweredByStatusNet to French (français)
 # Exported from translatewiki.net
 #
+# Author: Crochet.david
 # Author: Peter17
 # Author: Verdy p
 # --
@@ -10,24 +11,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PoweredByStatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:51+0000\n"
-"Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:40+0000\n"
+"Language-Team: French <https://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-16 23:18:51+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-18 16:19:26+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-poweredbystatusnet\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. TRANS: Text output after site name.
-#, fuzzy
 msgid "powered by <a href=\"http://status.net/\">StatusNet</a>"
-msgstr ""
-"Affiche « propulsé par <a href=\"http://status.net/\">StatusNet</a> » après "
-"le nom du site."
+msgstr "propulsé par <a href=\"http://status.net/\">StatusNet</a>"
 
 #. TRANS: Plugin description.
 msgid ""
@@ -36,9 +34,3 @@ msgid ""
 msgstr ""
 "Affiche « propulsé par <a href=\"http://status.net/\">StatusNet</a> » après "
 "le nom du site."
-
-#~ msgid "powered by %s"
-#~ msgstr "propulsé par %s"
-
-#~ msgid "StatusNet"
-#~ msgstr "StatusNet"
diff --git a/plugins/PoweredByStatusNet/locale/gl/LC_MESSAGES/PoweredByStatusNet.po b/plugins/PoweredByStatusNet/locale/gl/LC_MESSAGES/PoweredByStatusNet.po
index 65e7616151..a5741c1f2e 100644
--- a/plugins/PoweredByStatusNet/locale/gl/LC_MESSAGES/PoweredByStatusNet.po
+++ b/plugins/PoweredByStatusNet/locale/gl/LC_MESSAGES/PoweredByStatusNet.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - PoweredByStatusNet to Galician (Galego)
+# Translation of StatusNet - PoweredByStatusNet to Galician (galego)
 # Exported from translatewiki.net
 #
 # Author: Toliño
@@ -9,24 +9,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PoweredByStatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:51+0000\n"
-"Language-Team: Galician <http://translatewiki.net/wiki/Portal:gl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:40+0000\n"
+"Language-Team: Galician <https://translatewiki.net/wiki/Portal:gl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-16 23:18:51+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-18 16:19:26+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: gl\n"
 "X-Message-Group: #out-statusnet-plugin-poweredbystatusnet\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANS: Text output after site name.
-#, fuzzy
 msgid "powered by <a href=\"http://status.net/\">StatusNet</a>"
-msgstr ""
-"Produce un \"desenvolvido por <a href=\"http://status.net/\">StatusNet</a>\" "
-"despois do nome do sitio."
+msgstr "desenvolvido por <a href=\"http://status.net/\">StatusNet</a>"
 
 #. TRANS: Plugin description.
 msgid ""
@@ -35,9 +32,3 @@ msgid ""
 msgstr ""
 "Produce un \"desenvolvido por <a href=\"http://status.net/\">StatusNet</a>\" "
 "despois do nome do sitio."
-
-#~ msgid "powered by %s"
-#~ msgstr "desenvolvido por %s"
-
-#~ msgid "StatusNet"
-#~ msgstr "StatusNet"
diff --git a/plugins/PoweredByStatusNet/locale/he/LC_MESSAGES/PoweredByStatusNet.po b/plugins/PoweredByStatusNet/locale/he/LC_MESSAGES/PoweredByStatusNet.po
new file mode 100644
index 0000000000..54263e530d
--- /dev/null
+++ b/plugins/PoweredByStatusNet/locale/he/LC_MESSAGES/PoweredByStatusNet.po
@@ -0,0 +1,33 @@
+# Translation of StatusNet - PoweredByStatusNet to Hebrew (עברית)
+# Exported from translatewiki.net
+#
+# Author: Amire80
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - PoweredByStatusNet\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:40+0000\n"
+"Language-Team: Hebrew <https://translatewiki.net/wiki/Portal:he>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-18 16:19:26+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: he\n"
+"X-Message-Group: #out-statusnet-plugin-poweredbystatusnet\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Text output after site name.
+msgid "powered by <a href=\"http://status.net/\">StatusNet</a>"
+msgstr "עובד על <a href=\"http://status.net/\">סטטוסנט</a>"
+
+#. TRANS: Plugin description.
+msgid ""
+"Outputs \"powered by <a href=\"http://status.net/\">StatusNet</a>\" after "
+"site name."
+msgstr ""
+"רוש� \"עובד על <a href=\"http://status.net/\">סטטוסנט</a>\" �חרי ש� ה�תר."
diff --git a/plugins/PoweredByStatusNet/locale/ia/LC_MESSAGES/PoweredByStatusNet.po b/plugins/PoweredByStatusNet/locale/ia/LC_MESSAGES/PoweredByStatusNet.po
index 69b1f0314a..68eb0bf825 100644
--- a/plugins/PoweredByStatusNet/locale/ia/LC_MESSAGES/PoweredByStatusNet.po
+++ b/plugins/PoweredByStatusNet/locale/ia/LC_MESSAGES/PoweredByStatusNet.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - PoweredByStatusNet to Interlingua (Interlingua)
+# Translation of StatusNet - PoweredByStatusNet to Interlingua (interlingua)
 # Exported from translatewiki.net
 #
 # Author: McDutchie
@@ -9,24 +9,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PoweredByStatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:51+0000\n"
-"Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:40+0000\n"
+"Language-Team: Interlingua <https://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-16 23:18:51+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-18 16:19:26+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-poweredbystatusnet\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANS: Text output after site name.
-#, fuzzy
 msgid "powered by <a href=\"http://status.net/\">StatusNet</a>"
-msgstr ""
-"Affixa \"actionate per <a href=\"http://status.net/\">StatusNet</a>\" post "
-"le nomine del sito."
+msgstr "actionate per <a href=\"http://status.net/\">StatusNet</a>"
 
 #. TRANS: Plugin description.
 msgid ""
@@ -35,9 +32,3 @@ msgid ""
 msgstr ""
 "Affixa \"actionate per <a href=\"http://status.net/\">StatusNet</a>\" post "
 "le nomine del sito."
-
-#~ msgid "powered by %s"
-#~ msgstr "actionate per %s"
-
-#~ msgid "StatusNet"
-#~ msgstr "StatusNet"
diff --git a/plugins/PoweredByStatusNet/locale/mk/LC_MESSAGES/PoweredByStatusNet.po b/plugins/PoweredByStatusNet/locale/mk/LC_MESSAGES/PoweredByStatusNet.po
index 6ecd67c7ba..862389a0f5 100644
--- a/plugins/PoweredByStatusNet/locale/mk/LC_MESSAGES/PoweredByStatusNet.po
+++ b/plugins/PoweredByStatusNet/locale/mk/LC_MESSAGES/PoweredByStatusNet.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - PoweredByStatusNet to Macedonian (Македон�ки)
+# Translation of StatusNet - PoweredByStatusNet to Macedonian (македон�ки)
 # Exported from translatewiki.net
 #
 # Author: Bjankuloski06
@@ -9,24 +9,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PoweredByStatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:51+0000\n"
-"Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:40+0000\n"
+"Language-Team: Macedonian <https://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-16 23:18:51+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-18 16:19:26+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-poweredbystatusnet\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
 
 #. TRANS: Text output after site name.
-#, fuzzy
 msgid "powered by <a href=\"http://status.net/\">StatusNet</a>"
-msgstr ""
-"Дава „�о поддршка од <a href=\"http://status.net/\">StatusNet</a>“ по името "
-"на мреж. ме�то."
+msgstr "�о поддршка од <a href=\"http://status.net/\">StatusNet</a>"
 
 #. TRANS: Plugin description.
 msgid ""
@@ -35,9 +32,3 @@ msgid ""
 msgstr ""
 "Дава „�о поддршка од <a href=\"http://status.net/\">StatusNet</a>“ по името "
 "на мреж. ме�то."
-
-#~ msgid "powered by %s"
-#~ msgstr "овозможено од %s"
-
-#~ msgid "StatusNet"
-#~ msgstr "StatusNet"
diff --git a/plugins/PoweredByStatusNet/locale/nl/LC_MESSAGES/PoweredByStatusNet.po b/plugins/PoweredByStatusNet/locale/nl/LC_MESSAGES/PoweredByStatusNet.po
index 5ab4f21278..57eb1be9de 100644
--- a/plugins/PoweredByStatusNet/locale/nl/LC_MESSAGES/PoweredByStatusNet.po
+++ b/plugins/PoweredByStatusNet/locale/nl/LC_MESSAGES/PoweredByStatusNet.po
@@ -9,24 +9,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PoweredByStatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:51+0000\n"
-"Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:40+0000\n"
+"Language-Team: Dutch <https://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-16 23:18:51+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-18 16:19:26+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-poweredbystatusnet\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANS: Text output after site name.
-#, fuzzy
 msgid "powered by <a href=\"http://status.net/\">StatusNet</a>"
-msgstr ""
-"Voegt de tekst \"Powered by <a href=\"http://status.net/\">StatusNet</a>\" "
-"toe na de sitenaam."
+msgstr "powered by <a href=\"http://status.net/\">StatusNet</a>"
 
 #. TRANS: Plugin description.
 msgid ""
@@ -35,9 +32,3 @@ msgid ""
 msgstr ""
 "Voegt de tekst \"Powered by <a href=\"http://status.net/\">StatusNet</a>\" "
 "toe na de sitenaam."
-
-#~ msgid "powered by %s"
-#~ msgstr "Powered by %s"
-
-#~ msgid "StatusNet"
-#~ msgstr "StatusNet"
diff --git a/plugins/PoweredByStatusNet/locale/pt/LC_MESSAGES/PoweredByStatusNet.po b/plugins/PoweredByStatusNet/locale/pt/LC_MESSAGES/PoweredByStatusNet.po
index d05c0dc4a1..6f67d14758 100644
--- a/plugins/PoweredByStatusNet/locale/pt/LC_MESSAGES/PoweredByStatusNet.po
+++ b/plugins/PoweredByStatusNet/locale/pt/LC_MESSAGES/PoweredByStatusNet.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - PoweredByStatusNet to Portuguese (Português)
+# Translation of StatusNet - PoweredByStatusNet to Portuguese (português)
 # Exported from translatewiki.net
 #
 # Author: Waldir
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PoweredByStatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:51+0000\n"
-"Language-Team: Portuguese <http://translatewiki.net/wiki/Portal:pt>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:40+0000\n"
+"Language-Team: Portuguese <https://translatewiki.net/wiki/Portal:pt>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-16 23:18:51+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-18 16:19:26+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: pt\n"
 "X-Message-Group: #out-statusnet-plugin-poweredbystatusnet\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -35,9 +35,3 @@ msgid ""
 msgstr ""
 "Produz o texto \"potenciado por <a href=\"http://status.net/\">StatusNet</a>"
 "\" a seguir ao nome do site."
-
-#~ msgid "powered by %s"
-#~ msgstr "Potenciado por %s"
-
-#~ msgid "StatusNet"
-#~ msgstr "StatusNet"
diff --git a/plugins/PoweredByStatusNet/locale/ru/LC_MESSAGES/PoweredByStatusNet.po b/plugins/PoweredByStatusNet/locale/ru/LC_MESSAGES/PoweredByStatusNet.po
index e8877b6993..89fd3bcdcd 100644
--- a/plugins/PoweredByStatusNet/locale/ru/LC_MESSAGES/PoweredByStatusNet.po
+++ b/plugins/PoweredByStatusNet/locale/ru/LC_MESSAGES/PoweredByStatusNet.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - PoweredByStatusNet to Russian (Ру��кий)
+# Translation of StatusNet - PoweredByStatusNet to Russian (ру��кий)
 # Exported from translatewiki.net
 #
 # Author: MaxSem
@@ -10,14 +10,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PoweredByStatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:52+0000\n"
-"Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:41+0000\n"
+"Language-Team: Russian <https://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-16 23:18:51+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-18 16:19:26+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-poweredbystatusnet\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
@@ -37,9 +37,3 @@ msgid ""
 msgstr ""
 "Выводит «при поддержке <a href=\"http://status.net/\">StatusNet</a>» по�ле "
 "названи� �айта."
-
-#~ msgid "powered by %s"
-#~ msgstr "при поддержке %s"
-
-#~ msgid "StatusNet"
-#~ msgstr "StatusNet"
diff --git a/plugins/PoweredByStatusNet/locale/sv/LC_MESSAGES/PoweredByStatusNet.po b/plugins/PoweredByStatusNet/locale/sv/LC_MESSAGES/PoweredByStatusNet.po
index 2d5a20a4f7..f6b2704def 100644
--- a/plugins/PoweredByStatusNet/locale/sv/LC_MESSAGES/PoweredByStatusNet.po
+++ b/plugins/PoweredByStatusNet/locale/sv/LC_MESSAGES/PoweredByStatusNet.po
@@ -1,7 +1,8 @@
-# Translation of StatusNet - PoweredByStatusNet to Swedish (Svenska)
+# Translation of StatusNet - PoweredByStatusNet to Swedish (svenska)
 # Exported from translatewiki.net
 #
 # Author: Jamminjohn
+# Author: WikiPhoenix
 # --
 # This file is distributed under the same license as the StatusNet package.
 #
@@ -9,24 +10,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PoweredByStatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:52+0000\n"
-"Language-Team: Swedish <http://translatewiki.net/wiki/Portal:sv>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:41+0000\n"
+"Language-Team: Swedish <https://translatewiki.net/wiki/Portal:sv>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-16 23:18:51+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-18 16:19:26+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: sv\n"
 "X-Message-Group: #out-statusnet-plugin-poweredbystatusnet\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANS: Text output after site name.
-#, fuzzy
 msgid "powered by <a href=\"http://status.net/\">StatusNet</a>"
-msgstr ""
-"Skriver ut \"drivs av <a href=\"http://status.net/\">StatusNet</a>\" efter "
-"namnet på webbplatsen."
+msgstr "drivs av <a href=\"http://status.net/\">StatusNet</a>"
 
 #. TRANS: Plugin description.
 msgid ""
@@ -35,9 +33,3 @@ msgid ""
 msgstr ""
 "Skriver ut \"drivs av <a href=\"http://status.net/\">StatusNet</a>\" efter "
 "namnet på webbplatsen."
-
-#~ msgid "powered by %s"
-#~ msgstr "drivs av %s"
-
-#~ msgid "StatusNet"
-#~ msgstr "StatusNet"
diff --git a/plugins/PoweredByStatusNet/locale/tl/LC_MESSAGES/PoweredByStatusNet.po b/plugins/PoweredByStatusNet/locale/tl/LC_MESSAGES/PoweredByStatusNet.po
index 627bca65c1..9b4079514f 100644
--- a/plugins/PoweredByStatusNet/locale/tl/LC_MESSAGES/PoweredByStatusNet.po
+++ b/plugins/PoweredByStatusNet/locale/tl/LC_MESSAGES/PoweredByStatusNet.po
@@ -9,24 +9,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PoweredByStatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:52+0000\n"
-"Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:41+0000\n"
+"Language-Team: Tagalog <https://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-16 23:18:51+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-18 16:19:26+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-poweredbystatusnet\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANS: Text output after site name.
-#, fuzzy
 msgid "powered by <a href=\"http://status.net/\">StatusNet</a>"
-msgstr ""
-"Ang mga paglalabas ay \"pinapatakbo ng <a href=\"http://status.net/"
-"\">StatusNet</a>\" pagkaraan ng  pangalan ng sityo."
+msgstr "binibigyang lakas ng <a href=\"http://status.net/\">StatusNet</a>\""
 
 #. TRANS: Plugin description.
 msgid ""
@@ -35,9 +32,3 @@ msgid ""
 msgstr ""
 "Ang mga paglalabas ay \"pinapatakbo ng <a href=\"http://status.net/"
 "\">StatusNet</a>\" pagkaraan ng  pangalan ng sityo."
-
-#~ msgid "powered by %s"
-#~ msgstr "pinapatakbo ng %s"
-
-#~ msgid "StatusNet"
-#~ msgstr "StatusNet"
diff --git a/plugins/PoweredByStatusNet/locale/uk/LC_MESSAGES/PoweredByStatusNet.po b/plugins/PoweredByStatusNet/locale/uk/LC_MESSAGES/PoweredByStatusNet.po
index 7ffe8eceb0..7b24d496e9 100644
--- a/plugins/PoweredByStatusNet/locale/uk/LC_MESSAGES/PoweredByStatusNet.po
+++ b/plugins/PoweredByStatusNet/locale/uk/LC_MESSAGES/PoweredByStatusNet.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - PoweredByStatusNet to Ukrainian (Україн�ька)
+# Translation of StatusNet - PoweredByStatusNet to Ukrainian (україн�ька)
 # Exported from translatewiki.net
 #
 # Author: Boogie
@@ -9,25 +9,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PoweredByStatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:52+0000\n"
-"Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:41+0000\n"
+"Language-Team: Ukrainian <https://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-16 23:18:51+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-18 16:19:26+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-poweredbystatusnet\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
 #. TRANS: Text output after site name.
-#, fuzzy
 msgid "powered by <a href=\"http://status.net/\">StatusNet</a>"
-msgstr ""
-"Даний додаток виводить припи� «працює на <a href=\"http://status.net/"
-"\">StatusNet</a>» пі�л� назви �айту."
+msgstr "працює на <a href=\"http://status.net/\">StatusNet</a>"
 
 #. TRANS: Plugin description.
 msgid ""
@@ -36,9 +33,3 @@ msgid ""
 msgstr ""
 "Даний додаток виводить припи� «працює на <a href=\"http://status.net/"
 "\">StatusNet</a>» пі�л� назви �айту."
-
-#~ msgid "powered by %s"
-#~ msgstr "працює на %s"
-
-#~ msgid "StatusNet"
-#~ msgstr "StatusNet"
diff --git a/plugins/PtitUrl/PtitUrlPlugin.php b/plugins/PtitUrl/PtitUrlPlugin.php
index 25a463c0be..cac5baf8b7 100644
--- a/plugins/PtitUrl/PtitUrlPlugin.php
+++ b/plugins/PtitUrl/PtitUrlPlugin.php
@@ -38,7 +38,8 @@ class PtitUrlPlugin extends UrlShortenerPlugin
     function onInitializePlugin(){
         parent::onInitializePlugin();
         if(!isset($this->serviceUrl)){
-            throw new Exception("must specify a serviceUrl");
+            // TRANS: Exception thrown when URL shortening plugin was configured incorrectly.
+            throw new Exception(_m('You must specify a serviceUrl for ptit URL shortening.'));
         }
     }
 
@@ -63,10 +64,10 @@ class PtitUrlPlugin extends UrlShortenerPlugin
                             'author' => 'Craig Andrews',
                             'homepage' => 'http://status.net/wiki/Plugin:PtitUrl',
                             'rawdescription' =>
+                            // TRANS: Plugin description. %1$s is the URL shortening service base URL (for example "bit.ly").
                             sprintf(_m('Uses <a href="http://%1$s/">%1$s</a> URL-shortener service.'),
                                     $this->shortenerName));
 
         return true;
     }
 }
-
diff --git a/plugins/PtitUrl/locale/PtitUrl.pot b/plugins/PtitUrl/locale/PtitUrl.pot
index 10f845c34e..47f5994aff 100644
--- a/plugins/PtitUrl/locale/PtitUrl.pot
+++ b/plugins/PtitUrl/locale/PtitUrl.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,7 +16,13 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: PtitUrlPlugin.php:66
+#. TRANS: Exception thrown when URL shortening plugin was configured incorrectly.
+#: PtitUrlPlugin.php:42
+msgid "You must specify a serviceUrl for ptit URL shortening."
+msgstr ""
+
+#. TRANS: Plugin description. %1$s is the URL shortening service base URL (for example "bit.ly").
+#: PtitUrlPlugin.php:68
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr ""
diff --git a/plugins/PtitUrl/locale/br/LC_MESSAGES/PtitUrl.po b/plugins/PtitUrl/locale/br/LC_MESSAGES/PtitUrl.po
index 5392710dfb..a6b5aa8f46 100644
--- a/plugins/PtitUrl/locale/br/LC_MESSAGES/PtitUrl.po
+++ b/plugins/PtitUrl/locale/br/LC_MESSAGES/PtitUrl.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - PtitUrl to Breton (Brezhoneg)
+# Translation of StatusNet - PtitUrl to Breton (brezhoneg)
 # Exported from translatewiki.net
 #
 # Author: Fulup
@@ -9,18 +9,23 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PtitUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:52+0000\n"
-"Language-Team: Breton <http://translatewiki.net/wiki/Portal:br>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:41+0000\n"
+"Language-Team: Breton <https://translatewiki.net/wiki/Portal:br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:08:31+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-18 16:19:27+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-ptiturl\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#. TRANS: Exception thrown when URL shortening plugin was configured incorrectly.
+msgid "You must specify a serviceUrl for ptit URL shortening."
+msgstr ""
+
+#. TRANS: Plugin description. %1$s is the URL shortening service base URL (for example "bit.ly").
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr ""
diff --git a/plugins/PtitUrl/locale/ca/LC_MESSAGES/PtitUrl.po b/plugins/PtitUrl/locale/ca/LC_MESSAGES/PtitUrl.po
new file mode 100644
index 0000000000..5748f006a0
--- /dev/null
+++ b/plugins/PtitUrl/locale/ca/LC_MESSAGES/PtitUrl.po
@@ -0,0 +1,32 @@
+# Translation of StatusNet - PtitUrl to Catalan (català)
+# Exported from translatewiki.net
+#
+# Author: Toniher
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - PtitUrl\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:41+0000\n"
+"Language-Team: Catalan <https://translatewiki.net/wiki/Portal:ca>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-18 16:19:27+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: ca\n"
+"X-Message-Group: #out-statusnet-plugin-ptiturl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Exception thrown when URL shortening plugin was configured incorrectly.
+msgid "You must specify a serviceUrl for ptit URL shortening."
+msgstr ""
+
+#. TRANS: Plugin description. %1$s is the URL shortening service base URL (for example "bit.ly").
+#, php-format
+msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
+msgstr ""
+"Utilitza el servei d'escurçament d'URL <a href=\"http://%1$s/\">%1$s</a>."
diff --git a/plugins/PtitUrl/locale/de/LC_MESSAGES/PtitUrl.po b/plugins/PtitUrl/locale/de/LC_MESSAGES/PtitUrl.po
index 5dc9f8d896..c57af4eca1 100644
--- a/plugins/PtitUrl/locale/de/LC_MESSAGES/PtitUrl.po
+++ b/plugins/PtitUrl/locale/de/LC_MESSAGES/PtitUrl.po
@@ -1,6 +1,7 @@
 # Translation of StatusNet - PtitUrl to German (Deutsch)
 # Exported from translatewiki.net
 #
+# Author: ChrisiPK
 # Author: The Evil IP address
 # --
 # This file is distributed under the same license as the StatusNet package.
@@ -9,18 +10,23 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PtitUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:52+0000\n"
-"Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:41+0000\n"
+"Language-Team: German <https://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:08:31+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-18 16:19:27+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-ptiturl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Exception thrown when URL shortening plugin was configured incorrectly.
+msgid "You must specify a serviceUrl for ptit URL shortening."
+msgstr "Du musst eine „serviceUrl“ zur ptit-URL-Kürzung angeben."
+
+#. TRANS: Plugin description. %1$s is the URL shortening service base URL (for example "bit.ly").
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr "Benutzung des <a href=\"http://%1$s/\">%1$s</a>-URL-Kürzungsdienstes."
diff --git a/plugins/PtitUrl/locale/es/LC_MESSAGES/PtitUrl.po b/plugins/PtitUrl/locale/es/LC_MESSAGES/PtitUrl.po
index 63501602f7..66a5013286 100644
--- a/plugins/PtitUrl/locale/es/LC_MESSAGES/PtitUrl.po
+++ b/plugins/PtitUrl/locale/es/LC_MESSAGES/PtitUrl.po
@@ -1,6 +1,7 @@
-# Translation of StatusNet - PtitUrl to Spanish (Español)
+# Translation of StatusNet - PtitUrl to Spanish (español)
 # Exported from translatewiki.net
 #
+# Author: Armando-Martin
 # Author: Translationista
 # --
 # This file is distributed under the same license as the StatusNet package.
@@ -9,18 +10,25 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PtitUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:52+0000\n"
-"Language-Team: Spanish <http://translatewiki.net/wiki/Portal:es>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:41+0000\n"
+"Language-Team: Spanish <https://translatewiki.net/wiki/Portal:es>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:08:31+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-18 16:19:27+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-plugin-ptiturl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Exception thrown when URL shortening plugin was configured incorrectly.
+msgid "You must specify a serviceUrl for ptit URL shortening."
+msgstr ""
+"Debe especificar un \"serviceUrl\" para el servicio \"ptit\" de acortamiento "
+"de direcciones URL."
+
+#. TRANS: Plugin description. %1$s is the URL shortening service base URL (for example "bit.ly").
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr ""
diff --git a/plugins/PtitUrl/locale/eu/LC_MESSAGES/PtitUrl.po b/plugins/PtitUrl/locale/eu/LC_MESSAGES/PtitUrl.po
new file mode 100644
index 0000000000..4ff7d529f4
--- /dev/null
+++ b/plugins/PtitUrl/locale/eu/LC_MESSAGES/PtitUrl.po
@@ -0,0 +1,28 @@
+# Translation of StatusNet - PtitUrl to Basque (euskara)
+# Exported from translatewiki.net
+#
+# Author: Artsuaga
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - PtitUrl\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:41+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-18 16:19:27+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Exception thrown when URL shortening plugin was configured incorrectly.
+msgid "You must specify a serviceUrl for ptit URL shortening."
+msgstr "Url zerbitzu bat zehaztu beharko zenuke ptit URL laburketetarako."
+
+#. TRANS: Plugin description. %1$s is the URL shortening service base URL (for example "bit.ly").
+#, php-format
+msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
+msgstr "<a href=\"http://%1$s/\">%1$s</a> URL-laburtze zerbitzua erabiliz."
diff --git a/plugins/PtitUrl/locale/fr/LC_MESSAGES/PtitUrl.po b/plugins/PtitUrl/locale/fr/LC_MESSAGES/PtitUrl.po
index 65153a1734..eb6fc04ebf 100644
--- a/plugins/PtitUrl/locale/fr/LC_MESSAGES/PtitUrl.po
+++ b/plugins/PtitUrl/locale/fr/LC_MESSAGES/PtitUrl.po
@@ -1,6 +1,7 @@
-# Translation of StatusNet - PtitUrl to French (Français)
+# Translation of StatusNet - PtitUrl to French (français)
 # Exported from translatewiki.net
 #
+# Author: Hashar
 # Author: Peter17
 # --
 # This file is distributed under the same license as the StatusNet package.
@@ -9,18 +10,23 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PtitUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:52+0000\n"
-"Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:41+0000\n"
+"Language-Team: French <https://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:08:31+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-18 16:19:27+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-ptiturl\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#. TRANS: Exception thrown when URL shortening plugin was configured incorrectly.
+msgid "You must specify a serviceUrl for ptit URL shortening."
+msgstr "Vous devez indiquer une URL de service pour ptit."
+
+#. TRANS: Plugin description. %1$s is the URL shortening service base URL (for example "bit.ly").
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr ""
diff --git a/plugins/PtitUrl/locale/gl/LC_MESSAGES/PtitUrl.po b/plugins/PtitUrl/locale/gl/LC_MESSAGES/PtitUrl.po
index daf797480e..0496243ce9 100644
--- a/plugins/PtitUrl/locale/gl/LC_MESSAGES/PtitUrl.po
+++ b/plugins/PtitUrl/locale/gl/LC_MESSAGES/PtitUrl.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - PtitUrl to Galician (Galego)
+# Translation of StatusNet - PtitUrl to Galician (galego)
 # Exported from translatewiki.net
 #
 # Author: Toliño
@@ -9,18 +9,25 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PtitUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:52+0000\n"
-"Language-Team: Galician <http://translatewiki.net/wiki/Portal:gl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:41+0000\n"
+"Language-Team: Galician <https://translatewiki.net/wiki/Portal:gl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:08:31+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-18 16:19:27+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: gl\n"
 "X-Message-Group: #out-statusnet-plugin-ptiturl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Exception thrown when URL shortening plugin was configured incorrectly.
+msgid "You must specify a serviceUrl for ptit URL shortening."
+msgstr ""
+"Debe especificar un serviceUrl para o servizo de abreviación de enderezos "
+"URL ptit."
+
+#. TRANS: Plugin description. %1$s is the URL shortening service base URL (for example "bit.ly").
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr ""
diff --git a/plugins/PtitUrl/locale/he/LC_MESSAGES/PtitUrl.po b/plugins/PtitUrl/locale/he/LC_MESSAGES/PtitUrl.po
index 6c1855fa5d..9fb29a3d93 100644
--- a/plugins/PtitUrl/locale/he/LC_MESSAGES/PtitUrl.po
+++ b/plugins/PtitUrl/locale/he/LC_MESSAGES/PtitUrl.po
@@ -1,6 +1,7 @@
 # Translation of StatusNet - PtitUrl to Hebrew (עברית)
 # Exported from translatewiki.net
 #
+# Author: Amire80
 # Author: YaronSh
 # --
 # This file is distributed under the same license as the StatusNet package.
@@ -9,18 +10,23 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PtitUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:53+0000\n"
-"Language-Team: Hebrew <http://translatewiki.net/wiki/Portal:he>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:42+0000\n"
+"Language-Team: Hebrew <https://translatewiki.net/wiki/Portal:he>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:08:31+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-18 16:19:27+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: he\n"
 "X-Message-Group: #out-statusnet-plugin-ptiturl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Exception thrown when URL shortening plugin was configured incorrectly.
+msgid "You must specify a serviceUrl for ptit URL shortening."
+msgstr "יש להזין serviceUrl ב�מצעות קיצור ב�מצעות ptit URL."
+
+#. TRANS: Plugin description. %1$s is the URL shortening service base URL (for example "bit.ly").
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr "שימוש בשירות קיצור הכתובות <a href=\"http://%1$s/\">%1$s</a>."
diff --git a/plugins/PtitUrl/locale/ia/LC_MESSAGES/PtitUrl.po b/plugins/PtitUrl/locale/ia/LC_MESSAGES/PtitUrl.po
index 6a2bf6954d..de3533da7b 100644
--- a/plugins/PtitUrl/locale/ia/LC_MESSAGES/PtitUrl.po
+++ b/plugins/PtitUrl/locale/ia/LC_MESSAGES/PtitUrl.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - PtitUrl to Interlingua (Interlingua)
+# Translation of StatusNet - PtitUrl to Interlingua (interlingua)
 # Exported from translatewiki.net
 #
 # Author: McDutchie
@@ -9,18 +9,25 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PtitUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:53+0000\n"
-"Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:42+0000\n"
+"Language-Team: Interlingua <https://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:08:31+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-18 16:19:27+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-ptiturl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Exception thrown when URL shortening plugin was configured incorrectly.
+msgid "You must specify a serviceUrl for ptit URL shortening."
+msgstr ""
+"Es necessari specificar un \"serviceUrl\" pro poter accurtar adresses URL "
+"con ptit."
+
+#. TRANS: Plugin description. %1$s is the URL shortening service base URL (for example "bit.ly").
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr ""
diff --git a/plugins/PtitUrl/locale/ja/LC_MESSAGES/PtitUrl.po b/plugins/PtitUrl/locale/ja/LC_MESSAGES/PtitUrl.po
index 384eb69a8a..7fc5720387 100644
--- a/plugins/PtitUrl/locale/ja/LC_MESSAGES/PtitUrl.po
+++ b/plugins/PtitUrl/locale/ja/LC_MESSAGES/PtitUrl.po
@@ -9,18 +9,23 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PtitUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:53+0000\n"
-"Language-Team: Japanese <http://translatewiki.net/wiki/Portal:ja>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:42+0000\n"
+"Language-Team: Japanese <https://translatewiki.net/wiki/Portal:ja>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:08:31+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-18 16:19:27+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ja\n"
 "X-Message-Group: #out-statusnet-plugin-ptiturl\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#. TRANS: Exception thrown when URL shortening plugin was configured incorrectly.
+msgid "You must specify a serviceUrl for ptit URL shortening."
+msgstr ""
+
+#. TRANS: Plugin description. %1$s is the URL shortening service base URL (for example "bit.ly").
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr "<a href=\"http://%1$s/\">%1$s</a>をURL短縮サービス���利用�る。"
diff --git a/plugins/PtitUrl/locale/mk/LC_MESSAGES/PtitUrl.po b/plugins/PtitUrl/locale/mk/LC_MESSAGES/PtitUrl.po
index 38479b147e..4c815503fd 100644
--- a/plugins/PtitUrl/locale/mk/LC_MESSAGES/PtitUrl.po
+++ b/plugins/PtitUrl/locale/mk/LC_MESSAGES/PtitUrl.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - PtitUrl to Macedonian (Македон�ки)
+# Translation of StatusNet - PtitUrl to Macedonian (македон�ки)
 # Exported from translatewiki.net
 #
 # Author: Bjankuloski06
@@ -9,18 +9,23 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PtitUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:53+0000\n"
-"Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:42+0000\n"
+"Language-Team: Macedonian <https://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:08:31+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-18 16:19:27+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-ptiturl\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
 
+#. TRANS: Exception thrown when URL shortening plugin was configured incorrectly.
+msgid "You must specify a serviceUrl for ptit URL shortening."
+msgstr "Мора да наведете serviceUrl за �кратување на URL-адре�и �о ptit."
+
+#. TRANS: Plugin description. %1$s is the URL shortening service base URL (for example "bit.ly").
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr ""
diff --git a/plugins/PtitUrl/locale/nb/LC_MESSAGES/PtitUrl.po b/plugins/PtitUrl/locale/nb/LC_MESSAGES/PtitUrl.po
index 93e46418a3..b1ecfcd4da 100644
--- a/plugins/PtitUrl/locale/nb/LC_MESSAGES/PtitUrl.po
+++ b/plugins/PtitUrl/locale/nb/LC_MESSAGES/PtitUrl.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - PtitUrl to Norwegian (bokmål)‬ (‪Norsk (bokmål)‬)
+# Translation of StatusNet - PtitUrl to Norwegian Bokmål (‪norsk (bokmål)‬)
 # Exported from translatewiki.net
 #
 # Author: Nghtwlkr
@@ -9,18 +9,23 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PtitUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:53+0000\n"
-"Language-Team: Norwegian (bokmål)‬ <http://translatewiki.net/wiki/Portal:no>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:42+0000\n"
+"Language-Team: Norwegian Bokmål <https://translatewiki.net/wiki/Portal:nb>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:08:31+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
-"X-Language-Code: no\n"
+"X-POT-Import-Date: 2011-06-18 16:19:27+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: nb\n"
 "X-Message-Group: #out-statusnet-plugin-ptiturl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Exception thrown when URL shortening plugin was configured incorrectly.
+msgid "You must specify a serviceUrl for ptit URL shortening."
+msgstr ""
+
+#. TRANS: Plugin description. %1$s is the URL shortening service base URL (for example "bit.ly").
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr "Bruker URL-forkortertjenesten <a href=\"http://%1$s/\">%1$s</a>."
diff --git a/plugins/PtitUrl/locale/nl/LC_MESSAGES/PtitUrl.po b/plugins/PtitUrl/locale/nl/LC_MESSAGES/PtitUrl.po
index 53ce2f81f6..024105a56c 100644
--- a/plugins/PtitUrl/locale/nl/LC_MESSAGES/PtitUrl.po
+++ b/plugins/PtitUrl/locale/nl/LC_MESSAGES/PtitUrl.po
@@ -9,18 +9,23 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PtitUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:53+0000\n"
-"Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:42+0000\n"
+"Language-Team: Dutch <https://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:08:31+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-18 16:19:27+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-ptiturl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Exception thrown when URL shortening plugin was configured incorrectly.
+msgid "You must specify a serviceUrl for ptit URL shortening."
+msgstr "U moet een serviceUrl opgeven om URL's in te korten via ptit."
+
+#. TRANS: Plugin description. %1$s is the URL shortening service base URL (for example "bit.ly").
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr ""
diff --git a/plugins/PtitUrl/locale/pt/LC_MESSAGES/PtitUrl.po b/plugins/PtitUrl/locale/pt/LC_MESSAGES/PtitUrl.po
index 398b106fbf..5274e23586 100644
--- a/plugins/PtitUrl/locale/pt/LC_MESSAGES/PtitUrl.po
+++ b/plugins/PtitUrl/locale/pt/LC_MESSAGES/PtitUrl.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - PtitUrl to Portuguese (Português)
+# Translation of StatusNet - PtitUrl to Portuguese (português)
 # Exported from translatewiki.net
 #
 # Author: GTNS
@@ -9,18 +9,23 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PtitUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:53+0000\n"
-"Language-Team: Portuguese <http://translatewiki.net/wiki/Portal:pt>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:42+0000\n"
+"Language-Team: Portuguese <https://translatewiki.net/wiki/Portal:pt>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:08:31+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-18 16:19:27+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: pt\n"
 "X-Message-Group: #out-statusnet-plugin-ptiturl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Exception thrown when URL shortening plugin was configured incorrectly.
+msgid "You must specify a serviceUrl for ptit URL shortening."
+msgstr ""
+
+#. TRANS: Plugin description. %1$s is the URL shortening service base URL (for example "bit.ly").
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr "Usa o serviço de abreviação de URLs <a href=\"http://%1$s/\">%1$s</a>."
diff --git a/plugins/PtitUrl/locale/pt_BR/LC_MESSAGES/PtitUrl.po b/plugins/PtitUrl/locale/pt_BR/LC_MESSAGES/PtitUrl.po
index 03cd045c78..93671c311b 100644
--- a/plugins/PtitUrl/locale/pt_BR/LC_MESSAGES/PtitUrl.po
+++ b/plugins/PtitUrl/locale/pt_BR/LC_MESSAGES/PtitUrl.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - PtitUrl to Brazilian Portuguese (Português do Brasil)
+# Translation of StatusNet - PtitUrl to Brazilian Portuguese (português do Brasil)
 # Exported from translatewiki.net
 #
 # Author: Giro720
@@ -9,19 +9,24 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PtitUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:53+0000\n"
-"Language-Team: Brazilian Portuguese <http://translatewiki.net/wiki/Portal:pt-"
-"br>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:42+0000\n"
+"Language-Team: Brazilian Portuguese <https://translatewiki.net/wiki/Portal:"
+"pt-br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:08:31+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-18 16:19:27+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: pt-br\n"
 "X-Message-Group: #out-statusnet-plugin-ptiturl\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#. TRANS: Exception thrown when URL shortening plugin was configured incorrectly.
+msgid "You must specify a serviceUrl for ptit URL shortening."
+msgstr ""
+
+#. TRANS: Plugin description. %1$s is the URL shortening service base URL (for example "bit.ly").
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr ""
diff --git a/plugins/PtitUrl/locale/ru/LC_MESSAGES/PtitUrl.po b/plugins/PtitUrl/locale/ru/LC_MESSAGES/PtitUrl.po
index 73ebfb235f..d236740f6f 100644
--- a/plugins/PtitUrl/locale/ru/LC_MESSAGES/PtitUrl.po
+++ b/plugins/PtitUrl/locale/ru/LC_MESSAGES/PtitUrl.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - PtitUrl to Russian (Ру��кий)
+# Translation of StatusNet - PtitUrl to Russian (ру��кий)
 # Exported from translatewiki.net
 #
 # Author: Eleferen
@@ -9,19 +9,24 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PtitUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:53+0000\n"
-"Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:42+0000\n"
+"Language-Team: Russian <https://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:08:31+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-18 16:19:27+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-ptiturl\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
+#. TRANS: Exception thrown when URL shortening plugin was configured incorrectly.
+msgid "You must specify a serviceUrl for ptit URL shortening."
+msgstr ""
+
+#. TRANS: Plugin description. %1$s is the URL shortening service base URL (for example "bit.ly").
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr "И�пользование �лужбы �окращени� URL <a href=\"http://%1$s/\">%1$s</a>."
diff --git a/plugins/PtitUrl/locale/tl/LC_MESSAGES/PtitUrl.po b/plugins/PtitUrl/locale/tl/LC_MESSAGES/PtitUrl.po
index 8e51597d88..935d1b0d59 100644
--- a/plugins/PtitUrl/locale/tl/LC_MESSAGES/PtitUrl.po
+++ b/plugins/PtitUrl/locale/tl/LC_MESSAGES/PtitUrl.po
@@ -9,18 +9,25 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PtitUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:54+0000\n"
-"Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:42+0000\n"
+"Language-Team: Tagalog <https://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:08:31+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-18 16:19:27+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-ptiturl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Exception thrown when URL shortening plugin was configured incorrectly.
+msgid "You must specify a serviceUrl for ptit URL shortening."
+msgstr ""
+"Dapat kang tumukoy ng isang URL ng palingkuran para sa pagpapaikli ng URL na "
+"ptit."
+
+#. TRANS: Plugin description. %1$s is the URL shortening service base URL (for example "bit.ly").
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr ""
diff --git a/plugins/PtitUrl/locale/uk/LC_MESSAGES/PtitUrl.po b/plugins/PtitUrl/locale/uk/LC_MESSAGES/PtitUrl.po
index 8c7fa3c9a6..4086020b29 100644
--- a/plugins/PtitUrl/locale/uk/LC_MESSAGES/PtitUrl.po
+++ b/plugins/PtitUrl/locale/uk/LC_MESSAGES/PtitUrl.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - PtitUrl to Ukrainian (Україн�ька)
+# Translation of StatusNet - PtitUrl to Ukrainian (україн�ька)
 # Exported from translatewiki.net
 #
 # Author: Boogie
@@ -9,19 +9,24 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PtitUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:54+0000\n"
-"Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:43+0000\n"
+"Language-Team: Ukrainian <https://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:08:31+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-18 16:19:27+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-ptiturl\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
+#. TRANS: Exception thrown when URL shortening plugin was configured incorrectly.
+msgid "You must specify a serviceUrl for ptit URL shortening."
+msgstr "Ви повинні зазначити URL-адре�у �ерві�у �короченн� по�илань."
+
+#. TRANS: Plugin description. %1$s is the URL shortening service base URL (for example "bit.ly").
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr ""
diff --git a/plugins/QnA/QnAPlugin.php b/plugins/QnA/QnAPlugin.php
index f638179270..4908e93dd0 100644
--- a/plugins/QnA/QnAPlugin.php
+++ b/plugins/QnA/QnAPlugin.php
@@ -175,7 +175,7 @@ class QnAPlugin extends MicroAppPlugin
 
     function appTitle() {
         // TRANS: Application title.
-        return _m('Question');
+        return _m('TITLE','Question');
     }
 
     function tag() {
@@ -202,12 +202,14 @@ class QnAPlugin extends MicroAppPlugin
     function saveNoticeFromActivity($activity, $actor, $options=array())
     {
         if (count($activity->objects) != 1) {
+            // TRANS: Exception thrown when there are too many activity objects.
             throw new Exception(_m('Too many activity objects.'));
         }
 
         $questionObj = $activity->objects[0];
 
         if ($questionObj->type != QnA_Question::OBJECT_TYPE) {
+            // TRANS: Exception thrown when an incorrect object type is encountered.
             throw new Exception(_m('Wrong type for object.'));
         }
 
@@ -226,12 +228,14 @@ class QnAPlugin extends MicroAppPlugin
             $question = QnA_Question::staticGet('uri', $questionObj->id);
             if (empty($question)) {
                 // FIXME: save the question
+                // TRANS: Exception thrown when answering a non-existing question.
                 throw new Exception(_m('Answer to unknown question.'));
             }
             $notice = QnA_Answer::saveNew($actor, $question, $options);
             break;
         default:
-            throw new Exception(_m('Unknown object type received by QnA Plugin.'));
+            // TRANS: Exception thrown when an object type is encountered that cannot be handled.
+            throw new Exception(_m('Unknown object type.'));
         }
 
         return $notice;
@@ -260,12 +264,14 @@ class QnAPlugin extends MicroAppPlugin
         }
 
         if (empty($question)) {
+            // TRANS: Exception thrown when an object type is encountered that cannot be handled.
             throw new Exception(_m('Unknown object type.'));
         }
 
         $notice = $question->getNotice();
 
         if (empty($notice)) {
+            // TRANS: Exception thrown when requesting a non-existing question notice.
             throw new Exception(_m('Unknown question notice.'));
         }
 
@@ -387,6 +393,7 @@ class QnAPlugin extends MicroAppPlugin
             $form->show();
 
         } else {
+            // TRANS: Error message displayed when question data is not present.
             $out->text(_m('Question data is missing.'));
         }
         $out->elementEnd('div');
@@ -395,7 +402,6 @@ class QnAPlugin extends MicroAppPlugin
         $out->elementStart('div', array('class' => 'entry-content'));
     }
 
-
     /**
      * Output the HTML for this kind of object in a list
      *
@@ -403,7 +409,7 @@ class QnAPlugin extends MicroAppPlugin
      *
      * @return boolean hook value
      *
-     * @fixme WARNING WARNING WARNING this closes a 'div' that is implicitly opened in BookmarkPlugin's showNotice implementation
+     * @todo FIXME: WARNING WARNING WARNING this closes a 'div' that is implicitly opened in BookmarkPlugin's showNotice implementation
      */
     function onStartShowNoticeItem($nli)
     {
@@ -427,12 +433,10 @@ class QnAPlugin extends MicroAppPlugin
         $nli->showNoticeOptions();
 
         if ($notice->object_type == QnA_Question::OBJECT_TYPE) {
-
             $user = common_current_user();
             $question = QnA_Question::getByNotice($notice);
 
             if (!empty($user)) {
-
                 $profile = $user->getProfile();
                 $answer = $question->getAnswer($profile);
 
@@ -447,6 +451,8 @@ class QnAPlugin extends MicroAppPlugin
                         'input',
                         array(
                             'class' => 'placeholder',
+                            // TRANS: Placeholder value for a possible answer to a question
+                            // TRANS: by the logged in user.
                             'value' => _m('Your answer...')
                         )
                     );
@@ -459,7 +465,6 @@ class QnAPlugin extends MicroAppPlugin
         return false;
     }
 
-
     function showNoticeAnswer($notice, $out)
     {
         $user = common_current_user();
@@ -476,12 +481,13 @@ class QnAPlugin extends MicroAppPlugin
             $form = new QnashowanswerForm($out, $answer);
             $form->show();
         } else {
+            // TRANS: Error message displayed when answer data is not present.
             $out->text(_m('Answer data is missing.'));
         }
 
         $out->elementEnd('div');
 
-        // @fixme
+        // @todo FIXME
         $out->elementStart('div', array('class' => 'entry-content'));
     }
 
@@ -492,14 +498,15 @@ class QnAPlugin extends MicroAppPlugin
         if (Notice::contentTooLong($content)) {
             common_debug("content too long");
             $max = Notice::maxContent();
+            // TRANS: Link description for link to full notice text if it is longer than
+            // TRANS: what will be dispplayed.
+            $ellipsis = _m('…');
             $short = mb_substr($content, 0, $max - 1);
-            $short .= sprintf(
-                // TRANS: Link to full notice text if it is longer than what will be dispplayed.
-                // TRANS: %s a notice URI.
-                _m('<a href="%s" rel="more" title="%s">…</a>'),
-                $notice->uri,
-                _m('more...')
-            );
+            $short .= sprintf('<a href="%1$s" rel="more" title="%2$s">%3$s</a>',
+                              $notice->uri,
+                              // TRANS: Title for link that is an ellipsis in English.
+                              _m('more...'),
+                              $ellipsis);
         } else {
             $short = $content;
         }
@@ -513,7 +520,6 @@ class QnAPlugin extends MicroAppPlugin
      * @param HTMLOutputter $out
      * @return Widget
      */
-
     function entryForm($out)
     {
         return new QnanewquestionForm($out);
@@ -524,7 +530,6 @@ class QnAPlugin extends MicroAppPlugin
      *
      * @param Notice $notice
      */
-
     function deleteRelated($notice)
     {
         switch ($notice->object_type) {
diff --git a/plugins/QnA/actions/qnaclosequestion.php b/plugins/QnA/actions/qnaclosequestion.php
index a8607faa9f..1ef5063a02 100644
--- a/plugins/QnA/actions/qnaclosequestion.php
+++ b/plugins/QnA/actions/qnaclosequestion.php
@@ -80,8 +80,8 @@ class QnaclosequestionAction extends Action
         $this->user = common_current_user();
 
         if (empty($this->user)) {
-            // TRANS: Client exception thrown trying to close a question when not logged in
             throw new ClientException(
+                // TRANS: Client exception thrown trying to close a question when not logged in
                 _m("You must be logged in to close a question."),
                 403
             );
@@ -128,13 +128,12 @@ class QnaclosequestionAction extends Action
      */
     function closeQuestion()
     {
-
         $user = common_current_user();
 
         try {
-
             if ($user->id != $this->question->profile_id) {
-                throw new Exception(_m('You didn\'t ask this question.'));
+                // TRANS: Exception thrown trying to close another user's question.
+                throw new Exception(_m('You did not ask this question.'));
             }
 
             $orig = clone($this->question);
diff --git a/plugins/QnA/actions/qnanewanswer.php b/plugins/QnA/actions/qnanewanswer.php
index dbab6c5eef..e565b3e93a 100644
--- a/plugins/QnA/actions/qnanewanswer.php
+++ b/plugins/QnA/actions/qnanewanswer.php
@@ -80,8 +80,8 @@ class QnanewanswerAction extends Action
         $this->user = common_current_user();
 
         if (empty($this->user)) {
-            // TRANS: Client exception thrown trying to answer a question while not logged in.
             throw new ClientException(
+                // TRANS: Client exception thrown trying to answer a question while not logged in.
                 _m("You must be logged in to answer to a question."),
                 403
             );
@@ -96,8 +96,8 @@ class QnanewanswerAction extends Action
         $this->question = QnA_Question::staticGet('id', $id);
 
         if (empty($this->question)) {
-            // TRANS: Client exception thrown trying to respond to a non-existing question.
             throw new ClientException(
+                // TRANS: Client exception thrown trying to respond to a non-existing question.
                 _m('Invalid or missing question.'),
                 404
             );
@@ -162,7 +162,6 @@ class QnanewanswerAction extends Action
 
             $this->elementStart('body');
 
-
             $nli = new NoticeAnswerListItem($notice, $this, $this->question, $answer);
             $nli->show();
 
@@ -278,7 +277,6 @@ class QnanewanswerAction extends Action
         $this->msg = $msg;
         $this->showPage();
     }
-
 }
 
 class NoticeAnswerListItem extends NoticeListItem
@@ -344,10 +342,10 @@ class NoticeAnswerListItem extends NoticeListItem
             $form = new QnashowanswerForm($this->out, $this->answer);
             $form->show();
         } else {
+            // TRANS: Error message displayed when an answer has no content.
             $out->text(_m('Answer data is missing.'));
         }
 
         $this->out->elementEnd('p');
     }
-
-}
\ No newline at end of file
+}
diff --git a/plugins/QnA/actions/qnanewquestion.php b/plugins/QnA/actions/qnanewquestion.php
index 48542ab06e..d6584b8f44 100644
--- a/plugins/QnA/actions/qnanewquestion.php
+++ b/plugins/QnA/actions/qnanewquestion.php
@@ -76,8 +76,8 @@ class QnanewquestionAction extends Action
         $this->user = common_current_user();
 
         if (empty($this->user)) {
-            // TRANS: Client exception thrown trying to create a Question while not logged in.
             throw new ClientException(
+                // TRANS: Client exception thrown trying to create a Question while not logged in.
                 _m('You must be logged in to post a question.'),
                 403
             );
@@ -240,5 +240,4 @@ class NoticeQuestionListItem extends NoticeListItem
         $this->out->element('ul', 'notices threaded-replies xoxo');
         parent::showEnd();
     }
-
-}
\ No newline at end of file
+}
diff --git a/plugins/QnA/actions/qnareviseanswer.php b/plugins/QnA/actions/qnareviseanswer.php
index 993543c995..ce4bdea56a 100644
--- a/plugins/QnA/actions/qnareviseanswer.php
+++ b/plugins/QnA/actions/qnareviseanswer.php
@@ -79,8 +79,8 @@ class QnareviseanswerAction extends Action
         $this->user = common_current_user();
 
         if (empty($this->user)) {
-            // TRANS: Client exception thrown trying to answer a question while not logged in.
             throw new ClientException(
+                // TRANS: Client exception thrown trying to answer a question while not logged in.
                 _m("You must be logged in to answer to a question."),
                 403
             );
@@ -92,8 +92,8 @@ class QnareviseanswerAction extends Action
         $this->question = $this->answer->getQuestion();
 
         if (empty($this->answer) || empty($this->question)) {
-            // TRANS: Client exception thrown trying to respond to a non-existing question.
             throw new ClientException(
+                // TRANS: Client exception thrown trying to respond to a non-existing question.
                 _m('Invalid or missing answer.'),
                 404
             );
@@ -243,7 +243,8 @@ class QnareviseanswerAction extends Action
         $this->xw->startDocument('1.0', 'UTF-8');
         $this->elementStart('html');
         $this->elementStart('head');
-        $this->element('title', null, _m('Answer'));
+        // TRANS: Form title for sending an answer.
+        $this->element('title', null, _m('TITLE','Answer'));
         $this->elementEnd('head');
         $this->elementStart('body');
         $form = new QnareviseanswerForm($this->answer, $this);
diff --git a/plugins/QnA/actions/qnashowanswer.php b/plugins/QnA/actions/qnashowanswer.php
index 24296a5af6..85b39d0053 100644
--- a/plugins/QnA/actions/qnashowanswer.php
+++ b/plugins/QnA/actions/qnashowanswer.php
@@ -57,38 +57,42 @@ class QnashowanswerAction extends ShownoticeAction
      */
     function prepare($argarray)
     {
-        OwnerDesignAction::prepare($argarray);
+        Action::prepare($argarray);
 
         $this->id = $this->trimmed('id');
 
         $this->answer = QnA_Answer::staticGet('id', $this->id);
 
         if (empty($this->answer)) {
+            // TRANS: Client exception thrown when requesting a non-existing answer.
             throw new ClientException(_m('No such answer.'), 404);
         }
 
         $this->question = $this->answer->getQuestion();
 
         if (empty($this->question)) {
+            // TRANS: Client exception thrown when requesting an answer that has no connected question.
             throw new ClientException(_m('No question for this answer.'), 404);
         }
 
         $this->notice = Notice::staticGet('uri', $this->answer->uri);
 
         if (empty($this->notice)) {
-            // Did we used to have it, and it got deleted?
+            // TRANS: Did we used to have it, and it got deleted?
             throw new ClientException(_m('No such answer.'), 404);
         }
 
         $this->user = User::staticGet('id', $this->answer->profile_id);
 
         if (empty($this->user)) {
+            // TRANS: Client exception thrown when requesting answer data for a non-existing user.
             throw new ClientException(_m('No such user.'), 404);
         }
 
         $this->profile = $this->user->getProfile();
 
         if (empty($this->profile)) {
+            // TRANS: Client exception thrown when requesting answer data for a user without a profile.
             throw new ServerException(_m('User without a profile.'));
         }
 
diff --git a/plugins/QnA/actions/qnashowquestion.php b/plugins/QnA/actions/qnashowquestion.php
index c30464bbf6..ca2cb74ba1 100644
--- a/plugins/QnA/actions/qnashowquestion.php
+++ b/plugins/QnA/actions/qnashowquestion.php
@@ -57,7 +57,7 @@ class QnashowquestionAction extends ShownoticeAction
      */
     function prepare($argarray)
     {
-        OwnerDesignAction::prepare($argarray);
+        Action::prepare($argarray);
 
         $this->id = $this->trimmed('id');
 
@@ -115,13 +115,7 @@ class QnashowquestionAction extends ShownoticeAction
         }
 
         if (count($answerIds) > 0) {
-            $notice = new Notice();
-            $notice->query(
-                sprintf(
-                    'SELECT notice.* FROM notice WHERE notice.id IN (%s)',
-                    implode(',', $answerIds)
-                )
-            );
+            $notice = Notice::multiGet('id', $answerIds);
 
             $nli = new NoticeList($notice, $this);
             $nli->show();
@@ -151,9 +145,9 @@ class QnashowquestionAction extends ShownoticeAction
      */
     function title()
     {
-        // TRANS: Page title for a question.
-        // TRANS: %1$s is the nickname of the user who asked the question, %2$s is the question.
         return sprintf(
+            // TRANS: Page title for a question.
+            // TRANS: %1$s is the nickname of the user who asked the question, %2$s is the question.
             _m('%1$s\'s question: %2$s'),
             $this->user->nickname,
             $this->question->title
@@ -168,7 +162,6 @@ class QnashowquestionAction extends ShownoticeAction
         return Action::lastModified();
     }
 
-
     /**
      * @fixme combine the notice time with question update time
      */
diff --git a/plugins/QnA/actions/qnavote.php b/plugins/QnA/actions/qnavote.php
index 8098cb87d0..715f81e831 100644
--- a/plugins/QnA/actions/qnavote.php
+++ b/plugins/QnA/actions/qnavote.php
@@ -3,7 +3,7 @@
  * StatusNet - the distributed open-source microblogging tool
  * Copyright (C) 2011, StatusNet, Inc.
  *
- * Vote on a questino or answer
+ * Vote on a question or answer
  *
  * PHP version 5
  *
@@ -81,7 +81,7 @@ class Qnavote extends Action
 
         if (empty($this->user)) {
             // TRANS: Client exception thrown trying to answer a question while not logged in.
-            throw new ClientException(_m("You must be logged in to answer to a question."),
+            throw new ClientException(_m('You must be logged in to answer to a question.'),
                                       403);
         }
 
@@ -146,7 +146,7 @@ class Qnavote extends Action
             $this->xw->startDocument('1.0', 'UTF-8');
             $this->elementStart('html');
             $this->elementStart('head');
-            // TRANS: Page title after sending an answer.
+            // TRANS: Page title after sending in a vote for a question or answer.
             $this->element('title', null, _m('Answers'));
             $this->elementEnd('head');
             $this->elementStart('body');
diff --git a/plugins/QnA/classes/QnA_Answer.php b/plugins/QnA/classes/QnA_Answer.php
index 1a415f4af4..7f92e47c61 100644
--- a/plugins/QnA/classes/QnA_Answer.php
+++ b/plugins/QnA/classes/QnA_Answer.php
@@ -174,7 +174,9 @@ class QnA_Answer extends Managed_DataObject
     {
         $question = QnA_Question::staticGet('id', $this->question_id);
         if (empty($question)) {
-            throw new Exception("No question with ID {$this->question_id}");
+            // TRANS: Exception thown when getting a question with a non-existing ID.
+            // TRANS: %s is the non-existing question ID.
+            throw new Exception(sprintf(_m('No question with ID %s'),$this->question_id));
         }
         return $question;
     }
@@ -183,7 +185,9 @@ class QnA_Answer extends Managed_DataObject
     {
         $profile = Profile::staticGet('id', $this->profile_id);
         if (empty($profile)) {
-            throw new Exception("No profile with ID {$this->profile_id}");
+            // TRANS: Exception thown when getting a profile with a non-existing ID.
+            // TRANS: %s is the non-existing profile ID.
+            throw new Exception(sprintf(_m('No profile with ID %s'),$this->profile_id));
         }
         return $profile;
     }
@@ -226,7 +230,9 @@ class QnA_Answer extends Managed_DataObject
             $out->elementstart('span', 'answer-revisions');
             $out->text(
                 htmlspecialchars(
-                    sprintf(_m('%s revisions'), $answer->revisions)
+                    // Notification of how often an answer was revised.
+                    // TRANS: %s is the number of answer revisions.
+                    sprintf(_m('%s revision','%s revisions',$answer->revisions), $answer->revisions)
                 )
             );
             $out->elementEnd('span');
@@ -239,14 +245,14 @@ class QnA_Answer extends Managed_DataObject
 
     static function toString($profile, $question, $answer)
     {
+        // @todo FIXME: unused variable?
         $notice = $question->getNotice();
 
-        $fmt = _m(
-            '%1$s answered the question "%2$s": %3$s'
-        );
-
         return sprintf(
-            $fmt,
+            // TRANS: Text for a question that was answered.
+            // TRANS: %1$s is the user that answered, %2$s is the question title,
+            // TRANS: %2$s is the answer content.
+            _m('%1$s answered the question "%2$s": %3$s'),
             htmlspecialchars($profile->getBestName()),
             htmlspecialchars($question->title),
             htmlspecialchars($answer->content)
@@ -285,6 +291,8 @@ class QnA_Answer extends Managed_DataObject
         $answer->insert();
 
         $content  = sprintf(
+            // TRANS: Text for a question that was answered.
+            // TRANS: %s is the question title.
             _m('answered "%s"'),
             $question->title
         );
diff --git a/plugins/QnA/classes/QnA_Question.php b/plugins/QnA/classes/QnA_Question.php
index e2430087c0..820656870b 100644
--- a/plugins/QnA/classes/QnA_Question.php
+++ b/plugins/QnA/classes/QnA_Question.php
@@ -42,7 +42,6 @@ if (!defined('STATUSNET')) {
  *
  * @see      DB_DataObject
  */
-
 class QnA_Question extends Managed_DataObject
 {
     const OBJECT_TYPE = 'http://activityschema.org/object/question';
@@ -150,7 +149,9 @@ class QnA_Question extends Managed_DataObject
     {
         $profile = Profile::staticGet('id', $this->profile_id);
         if (empty($profile)) {
-            throw new Exception("No profile with ID {$this->profile_id}");
+            // TRANS: Exception trown when getting a profile for a non-existing ID.
+            // TRANS: %s is the provided profile ID.
+            throw new Exception(sprintf(_m('No profile with ID %s'),$this->profile_id));
         }
         return $profile;
     }
@@ -235,12 +236,15 @@ class QnA_Question extends Managed_DataObject
 
         if (!empty($cnt)) {
             $out->elementStart('span', 'answer-count');
-            $out->text(sprintf(_m('%s answers'), $cnt));
+            // TRANS: Number of given answers to a question.
+            // TRANS: %s is the number of given answers.
+            $out->text(sprintf(_m('%s answer','%s answers',$cnt), $cnt));
             $out->elementEnd('span');
         }
 
         if (!empty($question->closed)) {
             $out->elementStart('span', 'question-closed');
+            // TRANS: Notification that a question cannot be answered anymore because it is closed.
             $out->text(_m('This question is closed.'));
             $out->elementEnd('span');
         }
@@ -298,7 +302,6 @@ class QnA_Question extends Managed_DataObject
             $uriLen    = mb_strlen($q->uri);
             $targetLen = $max - ($uriLen + 15);
             $title = mb_substr($q->title, 0, $targetLen) . '…';
-
         }
 
         $content = $title . ' ' . $q->uri;
diff --git a/plugins/QnA/css/qna.css b/plugins/QnA/css/qna.css
index 1b89b6c2bb..dd56d8ccf0 100644
--- a/plugins/QnA/css/qna.css
+++ b/plugins/QnA/css/qna.css
@@ -1,5 +1,78 @@
-/* Why doesn't this work? */
-input.answer-placeholder {
-    margin-left: 0;
-    width: 95%;
+.question .answer-count, .qna-full-question .answer-count {
+    display: block;
+    clear: left;
+}
+
+.question .answer-count:before, .qna-full-question .answer-count:before {
+    content: '(';
+}
+
+.question .answer-count:after, .qna-full-question .answer-count:after {
+    content: ')';
+}
+
+.question .notice-answer {
+    margin-left: 10px;
+    padding-bottom: 10px;
+}
+
+ul.qna-dummy {
+    clear: left;
+    float: left;
+    list-style-type: none;
+    width: 458px;
+    margin-left: 59px;
+    padding-right: 2px;
+    border-left: 3px solid #ECECF2;
+    background: #fafafa;
+    font-size: 1em;
+}
+
+ul.qna-dummy + ul.threaded-replies li.notice:first-child, li.notice-answer + li.notice {
+    border-top: 2px dotted #eee;
+    margin-top: -10px;
+    padding-top: 10px;
+}
+
+.qna-dummy-placeholder input {
+    margin: 10px 0px 10px 10px;
+    width: 426px;
+    color: #888;
+    border: 1px solid #A6A6A6;
+    padding: 4px 4px 4px 6px;
+}
+
+.question fieldset, .qna-full-question fieldset {
+    margin: 0px;
+}
+
+.question fieldset legend, .qna-full-question fieldset legend, .answer fieldset legend {
+    display: none;
+}
+
+.question label[for=qna-answer], .qna-full-question label[for=qna-answer] {
+    display: none;
+}
+
+.question #qna-answer, .qna-full-question #qna-answer {
+    width: 426px;
+    height: 54px;
+    padding: 6px 5px;
+    font-size: 1.2em;
+    margin-top: 10px;
+    margin-bottom: 10px;
+    border: 1px solid #A6A6A6;
+}
+
+.qna-full-question textarea {
+    width: 508px;
+}
+
+.question p.best:before, .answer p.best:before {
+    content: '[Best] ';
+}
+
+.question .question-closed {
+    display: block;
+    font-style: italic;
 }
diff --git a/plugins/QnA/lib/qnanewanswerform.php b/plugins/QnA/lib/qnanewanswerform.php
index 97c1fca5e3..c0ae220ff1 100644
--- a/plugins/QnA/lib/qnanewanswerform.php
+++ b/plugins/QnA/lib/qnanewanswerform.php
@@ -110,6 +110,7 @@ class QnanewanswerForm extends Form
         }
 
         $out->hidden('qna-question-id', $id, 'id');
+        // TRANS: Field label.
         $out->textarea('qna-answer', _m('Enter your answer'), null, null, 'answer');
     }
 
@@ -124,4 +125,3 @@ class QnanewanswerForm extends Form
         $this->out->submit('qna-answer-submit', _m('BUTTON', 'Answer'), 'submit', 'submit');
     }
 }
-
diff --git a/plugins/QnA/lib/qnanewquestionform.php b/plugins/QnA/lib/qnanewquestionform.php
index cbd4e1bc68..a1a2a94483 100644
--- a/plugins/QnA/lib/qnanewquestionform.php
+++ b/plugins/QnA/lib/qnanewquestionform.php
@@ -106,18 +106,22 @@ class QnanewquestionForm extends Form
         $this->li();
         $this->out->input(
             'qna-question-title',
-            _m('Title'),
+            // TRANS: Field label for a new question.
+            _m('LABEL','Title'),
             $this->title,
-            _m('Title of your question'),
+            // TRANS: Field title for a new question.
+            _m('The title of your question.'),
             'title'
         );
         $this->unli();
         $this->li();
         $this->out->textarea(
             'qna-question-description',
-            _m('Description'),
+            // TRANS: Field label for question details.
+            _m('LABEL','Description'),
             $this->description,
-            _m('Your question in detail'),
+            // TRANS: Field title for question details.
+            _m('Your question in detail.'),
             'description'
         );
         $this->unli();
diff --git a/plugins/QnA/lib/qnareviseanswerform.php b/plugins/QnA/lib/qnareviseanswerform.php
index 280dd74cd9..bf20895e7f 100644
--- a/plugins/QnA/lib/qnareviseanswerform.php
+++ b/plugins/QnA/lib/qnareviseanswerform.php
@@ -115,7 +115,7 @@ class QnareviseanswerForm extends Form
      */
     function formActions()
     {
-        // TRANS: Button text for submitting a poll response.
+        // TRANS: Button text for submitting a revised answer.
         $this->out->submit('submit', _m('BUTTON', 'Submit'));
     }
 }
diff --git a/plugins/QnA/lib/qnashowanswerform.php b/plugins/QnA/lib/qnashowanswerform.php
index fcefb5d0ed..8ca573c1c1 100644
--- a/plugins/QnA/lib/qnashowanswerform.php
+++ b/plugins/QnA/lib/qnashowanswerform.php
@@ -146,19 +146,19 @@ class QnashowanswerForm extends Form
                 if (empty($this->answer->best)) {
                     $this->out->submit(
                         'qna-best-answer',
-                        // TRANS: Button text for marking an answer as "best"
+                        // TRANS: Button text for marking an answer as "best".
                         _m('BUTTON', 'Best'),
                         'submit',
                         'best',
-                        // TRANS: Title for button text marking an answer as "best"
-                        _m('Mark as best answer')
+                        // TRANS: Title for button text marking an answer as "best".
+                        _m('Mark this answer as the best answer.')
                     );
 
                 }
             }
 
             /*
-             * @fixme: Revise is disabled until we figure out the
+             * @todo FIXME: Revise is disabled until we figure out the
              *         Ostatus bits This comment is just a reminder
              *         that the UI for this works.
              */
@@ -166,12 +166,12 @@ class QnashowanswerForm extends Form
             if ($user->id == $this->answer->profile_id) {
                 $this->out->submit(
                     'revise',
-                    // TRANS: Button text for revising an answer
+                    // TRANS: Button text for revising an answer.
                     _m('BUTTON', 'Revise'),
                     'submit',
                     null,
-                    // TRANS: Title for button text for revising an answer
-                    _m('Revise your answer')
+                    // TRANS: Title for button text for revising an answer.
+                    _m('Revise your answer.')
                 );
             }
              */
diff --git a/plugins/QnA/lib/qnashowquestionform.php b/plugins/QnA/lib/qnashowquestionform.php
index 07fd5a68db..0ac1c82377 100644
--- a/plugins/QnA/lib/qnashowquestionform.php
+++ b/plugins/QnA/lib/qnashowquestionform.php
@@ -103,7 +103,7 @@ class QnashowquestionForm extends Form
     function formLegend()
     {
         // TRANS: Form legend for revising the answer.
-        $this->out->element('legend', null, _m('Question'));
+        $this->out->element('legend', null, _m('LEGEND','Question'));
     }
 
     /**
@@ -114,7 +114,7 @@ class QnashowquestionForm extends Form
     function formData()
     {
         $this->out->hidden(
-            'qna-quesiton-id',
+            'qna-question-id',
             'question-' . $this->question->id,
             'id'
         );
@@ -147,12 +147,12 @@ class QnashowquestionForm extends Form
             if ($user->id == $this->question->profile_id) {
              $this->out->submit(
                 'qna-question-close',
-                // TRANS: Button text for closing a question
+                // TRANS: Button text for closing a question.
                 _m('BUTTON', 'Close'),
                 'submit',
                 'submit',
-                // TRANS: Title for button text for closing a question
-                _m('Close the question')
+                // TRANS: Title for button text for closing a question.
+                _m('Close the question to no one can answer it anymore.')
              );
             }
         }
diff --git a/plugins/QnA/lib/qnavoteform.php b/plugins/QnA/lib/qnavoteform.php
index f6976c8834..ac13ea4805 100644
--- a/plugins/QnA/lib/qnavoteform.php
+++ b/plugins/QnA/lib/qnavoteform.php
@@ -118,4 +118,3 @@ class QnavoteForm extends Form
         $this->out->submit('submit', _m('BUTTON', 'Submit'));
     }
 }
-
diff --git a/plugins/QnA/locale/QnA.pot b/plugins/QnA/locale/QnA.pot
index e709b43e58..93181d223e 100644
--- a/plugins/QnA/locale/QnA.pot
+++ b/plugins/QnA/locale/QnA.pot
@@ -8,19 +8,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
+"POT-Creation-Date: 2012-06-30 11:07+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"
+"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
 #. TRANS: Title for Question page.
 #: actions/qnanewquestion.php:62
 msgid "New question"
 msgstr ""
 
+#. TRANS: Client exception thrown trying to create a Question while not logged in.
 #: actions/qnanewquestion.php:81
 msgid "You must be logged in to post a question."
 msgstr ""
@@ -35,27 +37,32 @@ msgstr ""
 msgid "Question posted"
 msgstr ""
 
-#: actions/qnashowanswer.php:67 actions/qnashowanswer.php:80
+#. TRANS: Client exception thrown when requesting a non-existing answer.
+#. TRANS: Did we used to have it, and it got deleted?
+#: actions/qnashowanswer.php:68 actions/qnashowanswer.php:82
 msgid "No such answer."
 msgstr ""
 
-#: actions/qnashowanswer.php:73
+#. TRANS: Client exception thrown when requesting an answer that has no connected question.
+#: actions/qnashowanswer.php:75
 msgid "No question for this answer."
 msgstr ""
 
+#. TRANS: Client exception thrown when requesting answer data for a non-existing user.
 #. TRANS: Client exception thrown trying to view a question of a non-existing user.
-#: actions/qnashowanswer.php:86 actions/qnashowquestion.php:83
+#: actions/qnashowanswer.php:89 actions/qnashowquestion.php:83
 msgid "No such user."
 msgstr ""
 
+#. TRANS: Client exception thrown when requesting answer data for a user without a profile.
 #. TRANS: Server exception thrown trying to view a question for a user for which the profile could not be loaded.
-#: actions/qnashowanswer.php:92 actions/qnashowquestion.php:90
+#: actions/qnashowanswer.php:96 actions/qnashowquestion.php:90
 msgid "User without a profile."
 msgstr ""
 
 #. TRANS: Page title.
 #. TRANS: %1$s is the user who answered a question, %2$s is the question.
-#: actions/qnashowanswer.php:114
+#: actions/qnashowanswer.php:118
 #, php-format
 msgid "%1$s's answer to \"%2$s\""
 msgstr ""
@@ -71,6 +78,7 @@ msgstr ""
 msgid "You must be logged in to answer to a question."
 msgstr ""
 
+#. TRANS: Client exception thrown trying to respond to a non-existing question.
 #: actions/qnareviseanswer.php:97
 msgid "Invalid or missing answer."
 msgstr ""
@@ -79,8 +87,14 @@ msgstr ""
 #. TRANS: Page title for and answer to a question.
 #. TRANS: Form legend for showing the answer.
 #: actions/qnareviseanswer.php:163 actions/qnareviseanswer.php:207
-#: actions/qnareviseanswer.php:246 actions/qnanewanswer.php:63
-#: actions/qnavote.php:63 lib/qnashowanswerform.php:113
+#: actions/qnanewanswer.php:63 actions/qnavote.php:63
+#: lib/qnashowanswerform.php:113
+msgid "Answer"
+msgstr ""
+
+#. TRANS: Form title for sending an answer.
+#: actions/qnareviseanswer.php:247
+msgctxt "TITLE"
 msgid "Answer"
 msgstr ""
 
@@ -94,6 +108,8 @@ msgstr ""
 msgid "No such question notice."
 msgstr ""
 
+#. TRANS: Page title for a question.
+#. TRANS: %1$s is the nickname of the user who asked the question, %2$s is the question.
 #: actions/qnashowquestion.php:157
 #, php-format
 msgid "%1$s's question: %2$s"
@@ -104,6 +120,7 @@ msgstr ""
 msgid "Close question"
 msgstr ""
 
+#. TRANS: Client exception thrown trying to close a question when not logged in
 #: actions/qnaclosequestion.php:85
 msgid "You must be logged in to close a question."
 msgstr ""
@@ -114,28 +131,32 @@ msgstr ""
 msgid "Invalid or missing question."
 msgstr ""
 
-#: actions/qnaclosequestion.php:137
-msgid "You didn't ask this question."
+#. TRANS: Exception thrown trying to close another user's question.
+#: actions/qnaclosequestion.php:136
+msgid "You did not ask this question."
 msgstr ""
 
 #. TRANS: Page title after sending an answer.
-#: actions/qnaclosequestion.php:156 actions/qnanewanswer.php:160
+#. TRANS: Page title after sending in a vote for a question or answer.
+#: actions/qnaclosequestion.php:155 actions/qnanewanswer.php:160
 #: actions/qnavote.php:150
 msgid "Answers"
 msgstr ""
 
 #. TRANS: Page title after an AJAX error occurs on the post answer page.
-#: actions/qnanewanswer.php:227
+#: actions/qnanewanswer.php:226
 msgid "Ajax Error"
 msgstr ""
 
 #. TRANS: Title for form to send answer to a question.
-#: actions/qnanewanswer.php:250
+#: actions/qnanewanswer.php:249
 msgctxt "TITLE"
 msgid "Your answer"
 msgstr ""
 
-#: actions/qnanewanswer.php:347 QnAPlugin.php:479
+#. TRANS: Error message displayed when an answer has no content.
+#. TRANS: Error message displayed when answer data is not present.
+#: actions/qnanewanswer.php:346 QnAPlugin.php:485
 msgid "Answer data is missing."
 msgstr ""
 
@@ -145,150 +166,197 @@ msgid "Question and Answers micro-app."
 msgstr ""
 
 #. TRANS: Application title.
-#. TRANS: Form legend for revising the answer.
-#: QnAPlugin.php:178 lib/qnashowquestionform.php:106
+#: QnAPlugin.php:178
+msgctxt "TITLE"
 msgid "Question"
 msgstr ""
 
-#: QnAPlugin.php:205
+#. TRANS: Exception thrown when there are too many activity objects.
+#: QnAPlugin.php:206
 msgid "Too many activity objects."
 msgstr ""
 
-#: QnAPlugin.php:211
+#. TRANS: Exception thrown when an incorrect object type is encountered.
+#: QnAPlugin.php:213
 msgid "Wrong type for object."
 msgstr ""
 
-#: QnAPlugin.php:229
+#. TRANS: Exception thrown when answering a non-existing question.
+#: QnAPlugin.php:232
 msgid "Answer to unknown question."
 msgstr ""
 
-#: QnAPlugin.php:234
-msgid "Unknown object type received by QnA Plugin."
-msgstr ""
-
-#: QnAPlugin.php:263
+#. TRANS: Exception thrown when an object type is encountered that cannot be handled.
+#: QnAPlugin.php:238 QnAPlugin.php:268
 msgid "Unknown object type."
 msgstr ""
 
-#: QnAPlugin.php:269
+#. TRANS: Exception thrown when requesting a non-existing question notice.
+#: QnAPlugin.php:275
 msgid "Unknown question notice."
 msgstr ""
 
 #. TRANS: Exception thrown when performing an unexpected action on a question.
 #. TRANS: %s is the unpexpected object type.
-#: QnAPlugin.php:365
+#: QnAPlugin.php:371
 #, php-format
 msgid "Unexpected type for QnA plugin: %s."
 msgstr ""
 
-#: QnAPlugin.php:390
+#. TRANS: Error message displayed when question data is not present.
+#: QnAPlugin.php:397
 msgid "Question data is missing."
 msgstr ""
 
-#: QnAPlugin.php:450
+#. TRANS: Placeholder value for a possible answer to a question
+#. TRANS: by the logged in user.
+#: QnAPlugin.php:456
 msgid "Your answer..."
 msgstr ""
 
-#. TRANS: Link to full notice text if it is longer than what will be dispplayed.
-#. TRANS: %s a notice URI.
-#: QnAPlugin.php:499
-#, php-format
-msgid "<a href=\"%s\" rel=\"more\" title=\"%s\">…</a>"
+#. TRANS: Link description for link to full notice text if it is longer than
+#. TRANS: what will be dispplayed.
+#: QnAPlugin.php:503
+msgid "…"
 msgstr ""
 
-#: QnAPlugin.php:501
+#. TRANS: Title for link that is an ellipsis in English.
+#: QnAPlugin.php:508
 msgid "more..."
 msgstr ""
 
-#: classes/QnA_Answer.php:229
+#. TRANS: Exception thown when getting a question with a non-existing ID.
+#. TRANS: %s is the non-existing question ID.
+#: classes/QnA_Answer.php:179
 #, php-format
-msgid "%s revisions"
+msgid "No question with ID %s"
 msgstr ""
 
-#: classes/QnA_Answer.php:245
+#. TRANS: Exception thown when getting a profile with a non-existing ID.
+#. TRANS: %s is the non-existing profile ID.
+#. TRANS: Exception trown when getting a profile for a non-existing ID.
+#. TRANS: %s is the provided profile ID.
+#: classes/QnA_Answer.php:190 classes/QnA_Question.php:154
+#, php-format
+msgid "No profile with ID %s"
+msgstr ""
+
+#. TRANS: %s is the number of answer revisions.
+#: classes/QnA_Answer.php:235
+#, php-format
+msgid "%s revision"
+msgid_plural "%s revisions"
+msgstr[0] ""
+msgstr[1] ""
+
+#. TRANS: Text for a question that was answered.
+#. TRANS: %1$s is the user that answered, %2$s is the question title,
+#. TRANS: %2$s is the answer content.
+#: classes/QnA_Answer.php:255
 #, php-format
 msgid "%1$s answered the question \"%2$s\": %3$s"
 msgstr ""
 
+#. TRANS: Text for a question that was answered.
+#. TRANS: %s is the question title.
 #. TRANS: Rendered version of the notice content answering a question.
 #. TRANS: %s a link to the question with question title as the link content.
-#: classes/QnA_Answer.php:288 classes/QnA_Answer.php:295
+#: classes/QnA_Answer.php:296 classes/QnA_Answer.php:303
 #, php-format
 msgid "answered \"%s\""
 msgstr ""
 
-#: classes/QnA_Question.php:238
+#. TRANS: Number of given answers to a question.
+#. TRANS: %s is the number of given answers.
+#: classes/QnA_Question.php:241
 #, php-format
-msgid "%s answers"
-msgstr ""
+msgid "%s answer"
+msgid_plural "%s answers"
+msgstr[0] ""
+msgstr[1] ""
 
-#: classes/QnA_Question.php:244
+#. TRANS: Notification that a question cannot be answered anymore because it is closed.
+#: classes/QnA_Question.php:248
 msgid "This question is closed."
 msgstr ""
 
 #. TRANS: Rendered version of the notice content creating a question.
 #. TRANS: %s a link to the question as link description.
-#: classes/QnA_Question.php:309
+#: classes/QnA_Question.php:312
 #, php-format
 msgid "Question: %s"
 msgstr ""
 
+#. TRANS: Button text for submitting a revised answer.
 #. TRANS: Button text for submitting a poll response.
 #: lib/qnareviseanswerform.php:119 lib/qnavoteform.php:118
 msgctxt "BUTTON"
 msgid "Submit"
 msgstr ""
 
-#: lib/qnanewanswerform.php:113
+#. TRANS: Field label.
+#: lib/qnanewanswerform.php:114
 msgid "Enter your answer"
 msgstr ""
 
 #. TRANS: Button text for submitting a poll response.
-#: lib/qnanewanswerform.php:124
+#: lib/qnanewanswerform.php:125
 msgctxt "BUTTON"
 msgid "Answer"
 msgstr ""
 
-#: lib/qnanewquestionform.php:109
+#. TRANS: Field label for a new question.
+#: lib/qnanewquestionform.php:110
+msgctxt "LABEL"
 msgid "Title"
 msgstr ""
 
-#: lib/qnanewquestionform.php:111
-msgid "Title of your question"
+#. TRANS: Field title for a new question.
+#: lib/qnanewquestionform.php:113
+msgid "The title of your question."
 msgstr ""
 
-#: lib/qnanewquestionform.php:118
+#. TRANS: Field label for question details.
+#: lib/qnanewquestionform.php:121
+msgctxt "LABEL"
 msgid "Description"
 msgstr ""
 
-#: lib/qnanewquestionform.php:120
-msgid "Your question in detail"
+#. TRANS: Field title for question details.
+#: lib/qnanewquestionform.php:124
+msgid "Your question in detail."
 msgstr ""
 
 #. TRANS: Button text for saving a new question.
-#: lib/qnanewquestionform.php:143
+#: lib/qnanewquestionform.php:147
 msgctxt "BUTTON"
 msgid "Save"
 msgstr ""
 
-#. TRANS: Button text for closing a question
+#. TRANS: Form legend for revising the answer.
+#: lib/qnashowquestionform.php:106
+msgctxt "LEGEND"
+msgid "Question"
+msgstr ""
+
+#. TRANS: Button text for closing a question.
 #: lib/qnashowquestionform.php:151
 msgctxt "BUTTON"
 msgid "Close"
 msgstr ""
 
-#. TRANS: Title for button text for closing a question
+#. TRANS: Title for button text for closing a question.
 #: lib/qnashowquestionform.php:155
-msgid "Close the question"
+msgid "Close the question to no one can answer it anymore."
 msgstr ""
 
-#. TRANS: Button text for marking an answer as "best"
+#. TRANS: Button text for marking an answer as "best".
 #: lib/qnashowanswerform.php:150
 msgctxt "BUTTON"
 msgid "Best"
 msgstr ""
 
-#. TRANS: Title for button text marking an answer as "best"
+#. TRANS: Title for button text marking an answer as "best".
 #: lib/qnashowanswerform.php:154
-msgid "Mark as best answer"
+msgid "Mark this answer as the best answer."
 msgstr ""
diff --git a/plugins/QnA/locale/ar/LC_MESSAGES/QnA.po b/plugins/QnA/locale/ar/LC_MESSAGES/QnA.po
new file mode 100644
index 0000000000..fd7c776fa6
--- /dev/null
+++ b/plugins/QnA/locale/ar/LC_MESSAGES/QnA.po
@@ -0,0 +1,313 @@
+# Translation of StatusNet - QnA to Arabic (العربية)
+# Exported from translatewiki.net
+#
+# Author: OsamaK
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - QnA\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:43+0000\n"
+"Language-Team: Arabic <https://translatewiki.net/wiki/Portal:ar>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2012-01-02 10:10:59+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: ar\n"
+"X-Message-Group: #out-statusnet-plugin-qna\n"
+"Plural-Forms: nplurals=6; plural=(n == 0) ? 0 : ( (n == 1) ? 1 : ( (n == "
+"2) ? 2 : ( (n%100 >= 3 && n%100 <= 10) ? 3 : ( (n%100 >= 11 && n%100 <= "
+"99) ? 4 : 5 ) ) ) );\n"
+
+#. TRANS: Title for Question page.
+msgid "New question"
+msgstr "سؤال جديد"
+
+#. TRANS: Client exception thrown trying to create a Question while not logged in.
+msgid "You must be logged in to post a question."
+msgstr "يجب أن تلج لتنشر سؤالا."
+
+#. TRANS: Client exception thrown trying to create a question without a title.
+msgid "Question must have a title."
+msgstr "يجب أن يكون للسؤال عنوان."
+
+#. TRANS: Page title after sending a notice.
+msgid "Question posted"
+msgstr "ن�شر السؤال"
+
+#. TRANS: Client exception thrown when requesting a non-existing answer.
+#. TRANS: Did we used to have it, and it got deleted?
+msgid "No such answer."
+msgstr ""
+
+#. TRANS: Client exception thrown when requesting an answer that has no connected question.
+msgid "No question for this answer."
+msgstr ""
+
+#. TRANS: Client exception thrown when requesting answer data for a non-existing user.
+#. TRANS: Client exception thrown trying to view a question of a non-existing user.
+msgid "No such user."
+msgstr ""
+
+#. TRANS: Client exception thrown when requesting answer data for a user without a profile.
+#. TRANS: Server exception thrown trying to view a question for a user for which the profile could not be loaded.
+msgid "User without a profile."
+msgstr ""
+
+#. TRANS: Page title.
+#. TRANS: %1$s is the user who answered a question, %2$s is the question.
+#, php-format
+msgid "%1$s's answer to \"%2$s\""
+msgstr "إجابة %1$s ل\"%2$s\""
+
+#. TRANS: Page title for revising a question
+msgid "Revise answer"
+msgstr "راجع الإجابة"
+
+#. TRANS: Client exception thrown trying to answer a question while not logged in.
+msgid "You must be logged in to answer to a question."
+msgstr "يجب أن تلج لتجيب سؤالا."
+
+#. TRANS: Client exception thrown trying to respond to a non-existing question.
+msgid "Invalid or missing answer."
+msgstr ""
+
+#. TRANS: Page title after sending an answer.
+#. TRANS: Page title for and answer to a question.
+#. TRANS: Form legend for showing the answer.
+msgid "Answer"
+msgstr "إجابة"
+
+#. TRANS: Form title for sending an answer.
+msgctxt "TITLE"
+msgid "Answer"
+msgstr "أجب"
+
+#. TRANS: Client exception thrown trying to view a non-existing question.
+msgid "No such question."
+msgstr ""
+
+#. TRANS: Client exception thrown trying to view a non-existing question notice.
+msgid "No such question notice."
+msgstr ""
+
+#. TRANS: Page title for a question.
+#. TRANS: %1$s is the nickname of the user who asked the question, %2$s is the question.
+#, php-format
+msgid "%1$s's question: %2$s"
+msgstr "سؤال %1$s: %2$s"
+
+#. TRANS: Page title for close a question
+msgid "Close question"
+msgstr "أغلق السؤال"
+
+#. TRANS: Client exception thrown trying to close a question when not logged in
+msgid "You must be logged in to close a question."
+msgstr ""
+
+#. TRANS: Client exception thrown trying to respond to a non-existing question.
+msgid "Invalid or missing question."
+msgstr ""
+
+#. TRANS: Exception thrown trying to close another user's question.
+msgid "You did not ask this question."
+msgstr ""
+
+#. TRANS: Page title after sending an answer.
+#. TRANS: Page title after sending in a vote for a question or answer.
+msgid "Answers"
+msgstr "الإجابات"
+
+#. TRANS: Page title after an AJAX error occurs on the post answer page.
+msgid "Ajax Error"
+msgstr "خطأ أجاكس"
+
+#. TRANS: Title for form to send answer to a question.
+msgctxt "TITLE"
+msgid "Your answer"
+msgstr "إجابتك"
+
+#. TRANS: Error message displayed when an answer has no content.
+#. TRANS: Error message displayed when answer data is not present.
+msgid "Answer data is missing."
+msgstr ""
+
+#. TRANS: Plugin description.
+msgid "Question and Answers micro-app."
+msgstr ""
+
+#. TRANS: Application title.
+msgctxt "TITLE"
+msgid "Question"
+msgstr "سؤال"
+
+#. TRANS: Exception thrown when there are too many activity objects.
+msgid "Too many activity objects."
+msgstr ""
+
+#. TRANS: Exception thrown when an incorrect object type is encountered.
+msgid "Wrong type for object."
+msgstr ""
+
+#. TRANS: Exception thrown when answering a non-existing question.
+msgid "Answer to unknown question."
+msgstr ""
+
+#. TRANS: Exception thrown when an object type is encountered that cannot be handled.
+msgid "Unknown object type."
+msgstr ""
+
+#. TRANS: Exception thrown when requesting a non-existing question notice.
+msgid "Unknown question notice."
+msgstr ""
+
+#. TRANS: Exception thrown when performing an unexpected action on a question.
+#. TRANS: %s is the unpexpected object type.
+#, php-format
+msgid "Unexpected type for QnA plugin: %s."
+msgstr ""
+
+#. TRANS: Error message displayed when question data is not present.
+msgid "Question data is missing."
+msgstr ""
+
+#. TRANS: Placeholder value for a possible answer to a question
+#. TRANS: by the logged in user.
+msgid "Your answer..."
+msgstr "إجابتك..."
+
+#. TRANS: Link description for link to full notice text if it is longer than
+#. TRANS: what will be dispplayed.
+msgid "…"
+msgstr "…"
+
+#. TRANS: Title for link that is an ellipsis in English.
+msgid "more..."
+msgstr "مزيد..."
+
+#. TRANS: Exception thown when getting a question with a non-existing ID.
+#. TRANS: %s is the non-existing question ID.
+#, php-format
+msgid "No question with ID %s"
+msgstr ""
+
+#. TRANS: Exception thown when getting a profile with a non-existing ID.
+#. TRANS: %s is the non-existing profile ID.
+#. TRANS: Exception trown when getting a profile for a non-existing ID.
+#. TRANS: %s is the provided profile ID.
+#, php-format
+msgid "No profile with ID %s"
+msgstr ""
+
+#. TRANS: %s is the number of answer revisions.
+#, php-format
+msgid "%s revision"
+msgid_plural "%s revisions"
+msgstr[0] ""
+msgstr[1] "مراجعة واحدة"
+msgstr[2] "مراجعتين"
+msgstr[3] "%s مراجعات"
+msgstr[4] "%s مراجعة"
+msgstr[5] ""
+
+#. TRANS: Text for a question that was answered.
+#. TRANS: %1$s is the user that answered, %2$s is the question title,
+#. TRANS: %2$s is the answer content.
+#, php-format
+msgid "%1$s answered the question \"%2$s\": %3$s"
+msgstr ""
+
+#. TRANS: Text for a question that was answered.
+#. TRANS: %s is the question title.
+#. TRANS: Rendered version of the notice content answering a question.
+#. TRANS: %s a link to the question with question title as the link content.
+#, php-format
+msgid "answered \"%s\""
+msgstr "أجاب \"%s\""
+
+#. TRANS: Number of given answers to a question.
+#. TRANS: %s is the number of given answers.
+#, php-format
+msgid "%s answer"
+msgid_plural "%s answers"
+msgstr[0] "لا توجد إجابات"
+msgstr[1] "جواب واحد"
+msgstr[2] "جوابان"
+msgstr[3] "%s إجابات"
+msgstr[4] "%s إجابة"
+msgstr[5] ""
+
+#. TRANS: Notification that a question cannot be answered anymore because it is closed.
+msgid "This question is closed."
+msgstr "هذا السؤال مغلق."
+
+#. TRANS: Rendered version of the notice content creating a question.
+#. TRANS: %s a link to the question as link description.
+#, php-format
+msgid "Question: %s"
+msgstr "سؤال: %s"
+
+#. TRANS: Button text for submitting a revised answer.
+#. TRANS: Button text for submitting a poll response.
+msgctxt "BUTTON"
+msgid "Submit"
+msgstr "أرسل"
+
+#. TRANS: Field label.
+msgid "Enter your answer"
+msgstr "أدخل إجابتك"
+
+#. TRANS: Button text for submitting a poll response.
+msgctxt "BUTTON"
+msgid "Answer"
+msgstr "أجب"
+
+#. TRANS: Field label for a new question.
+msgctxt "LABEL"
+msgid "Title"
+msgstr "العنوان"
+
+#. TRANS: Field title for a new question.
+msgid "The title of your question."
+msgstr "عنوان سؤالك."
+
+#. TRANS: Field label for question details.
+msgctxt "LABEL"
+msgid "Description"
+msgstr "الوص�"
+
+#. TRANS: Field title for question details.
+msgid "Your question in detail."
+msgstr "سؤالك بالت�صيل."
+
+#. TRANS: Button text for saving a new question.
+msgctxt "BUTTON"
+msgid "Save"
+msgstr "اح�ظ"
+
+#. TRANS: Form legend for revising the answer.
+msgctxt "LEGEND"
+msgid "Question"
+msgstr "سؤال"
+
+#. TRANS: Button text for closing a question.
+msgctxt "BUTTON"
+msgid "Close"
+msgstr "أغلق"
+
+#. TRANS: Title for button text for closing a question.
+msgid "Close the question to no one can answer it anymore."
+msgstr ""
+
+#. TRANS: Button text for marking an answer as "best".
+msgctxt "BUTTON"
+msgid "Best"
+msgstr "الأ�ضل"
+
+#. TRANS: Title for button text marking an answer as "best".
+msgid "Mark this answer as the best answer."
+msgstr "علّم هذه الإجابة أ�ضل إجابة."
diff --git a/plugins/QnA/locale/br/LC_MESSAGES/QnA.po b/plugins/QnA/locale/br/LC_MESSAGES/QnA.po
new file mode 100644
index 0000000000..103aa10181
--- /dev/null
+++ b/plugins/QnA/locale/br/LC_MESSAGES/QnA.po
@@ -0,0 +1,303 @@
+# Translation of StatusNet - QnA to Breton (brezhoneg)
+# Exported from translatewiki.net
+#
+# Author: Y-M D
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - QnA\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:43+0000\n"
+"Language-Team: Breton <https://translatewiki.net/wiki/Portal:br>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2012-01-02 10:10:59+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: br\n"
+"X-Message-Group: #out-statusnet-plugin-qna\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#. TRANS: Title for Question page.
+msgid "New question"
+msgstr "Goulenn nevez"
+
+#. TRANS: Client exception thrown trying to create a Question while not logged in.
+msgid "You must be logged in to post a question."
+msgstr ""
+
+#. TRANS: Client exception thrown trying to create a question without a title.
+msgid "Question must have a title."
+msgstr ""
+
+#. TRANS: Page title after sending a notice.
+msgid "Question posted"
+msgstr ""
+
+#. TRANS: Client exception thrown when requesting a non-existing answer.
+#. TRANS: Did we used to have it, and it got deleted?
+msgid "No such answer."
+msgstr ""
+
+#. TRANS: Client exception thrown when requesting an answer that has no connected question.
+msgid "No question for this answer."
+msgstr ""
+
+#. TRANS: Client exception thrown when requesting answer data for a non-existing user.
+#. TRANS: Client exception thrown trying to view a question of a non-existing user.
+msgid "No such user."
+msgstr "N'eus ket eus an implijer-se."
+
+#. TRANS: Client exception thrown when requesting answer data for a user without a profile.
+#. TRANS: Server exception thrown trying to view a question for a user for which the profile could not be loaded.
+msgid "User without a profile."
+msgstr ""
+
+#. TRANS: Page title.
+#. TRANS: %1$s is the user who answered a question, %2$s is the question.
+#, php-format
+msgid "%1$s's answer to \"%2$s\""
+msgstr ""
+
+#. TRANS: Page title for revising a question
+msgid "Revise answer"
+msgstr ""
+
+#. TRANS: Client exception thrown trying to answer a question while not logged in.
+msgid "You must be logged in to answer to a question."
+msgstr ""
+
+#. TRANS: Client exception thrown trying to respond to a non-existing question.
+msgid "Invalid or missing answer."
+msgstr ""
+
+#. TRANS: Page title after sending an answer.
+#. TRANS: Page title for and answer to a question.
+#. TRANS: Form legend for showing the answer.
+msgid "Answer"
+msgstr "Respont"
+
+#. TRANS: Form title for sending an answer.
+msgctxt "TITLE"
+msgid "Answer"
+msgstr "Respont"
+
+#. TRANS: Client exception thrown trying to view a non-existing question.
+msgid "No such question."
+msgstr ""
+
+#. TRANS: Client exception thrown trying to view a non-existing question notice.
+msgid "No such question notice."
+msgstr ""
+
+#. TRANS: Page title for a question.
+#. TRANS: %1$s is the nickname of the user who asked the question, %2$s is the question.
+#, php-format
+msgid "%1$s's question: %2$s"
+msgstr ""
+
+#. TRANS: Page title for close a question
+msgid "Close question"
+msgstr "Serriñ ar goulenn"
+
+#. TRANS: Client exception thrown trying to close a question when not logged in
+msgid "You must be logged in to close a question."
+msgstr ""
+
+#. TRANS: Client exception thrown trying to respond to a non-existing question.
+msgid "Invalid or missing question."
+msgstr ""
+
+#. TRANS: Exception thrown trying to close another user's question.
+msgid "You did not ask this question."
+msgstr ""
+
+#. TRANS: Page title after sending an answer.
+#. TRANS: Page title after sending in a vote for a question or answer.
+msgid "Answers"
+msgstr "Respontoù"
+
+#. TRANS: Page title after an AJAX error occurs on the post answer page.
+msgid "Ajax Error"
+msgstr "Fazi Ajax"
+
+#. TRANS: Title for form to send answer to a question.
+msgctxt "TITLE"
+msgid "Your answer"
+msgstr "Ho respont"
+
+#. TRANS: Error message displayed when an answer has no content.
+#. TRANS: Error message displayed when answer data is not present.
+msgid "Answer data is missing."
+msgstr ""
+
+#. TRANS: Plugin description.
+msgid "Question and Answers micro-app."
+msgstr ""
+
+#. TRANS: Application title.
+msgctxt "TITLE"
+msgid "Question"
+msgstr "Goulenn"
+
+#. TRANS: Exception thrown when there are too many activity objects.
+msgid "Too many activity objects."
+msgstr ""
+
+#. TRANS: Exception thrown when an incorrect object type is encountered.
+msgid "Wrong type for object."
+msgstr ""
+
+#. TRANS: Exception thrown when answering a non-existing question.
+msgid "Answer to unknown question."
+msgstr ""
+
+#. TRANS: Exception thrown when an object type is encountered that cannot be handled.
+msgid "Unknown object type."
+msgstr ""
+
+#. TRANS: Exception thrown when requesting a non-existing question notice.
+msgid "Unknown question notice."
+msgstr ""
+
+#. TRANS: Exception thrown when performing an unexpected action on a question.
+#. TRANS: %s is the unpexpected object type.
+#, php-format
+msgid "Unexpected type for QnA plugin: %s."
+msgstr ""
+
+#. TRANS: Error message displayed when question data is not present.
+msgid "Question data is missing."
+msgstr ""
+
+#. TRANS: Placeholder value for a possible answer to a question
+#. TRANS: by the logged in user.
+msgid "Your answer..."
+msgstr "Ho respont..."
+
+#. TRANS: Link description for link to full notice text if it is longer than
+#. TRANS: what will be dispplayed.
+msgid "…"
+msgstr "…"
+
+#. TRANS: Title for link that is an ellipsis in English.
+msgid "more..."
+msgstr "muioc'h..."
+
+#. TRANS: Exception thown when getting a question with a non-existing ID.
+#. TRANS: %s is the non-existing question ID.
+#, php-format
+msgid "No question with ID %s"
+msgstr ""
+
+#. TRANS: Exception thown when getting a profile with a non-existing ID.
+#. TRANS: %s is the non-existing profile ID.
+#. TRANS: Exception trown when getting a profile for a non-existing ID.
+#. TRANS: %s is the provided profile ID.
+#, php-format
+msgid "No profile with ID %s"
+msgstr ""
+
+#. TRANS: %s is the number of answer revisions.
+#, php-format
+msgid "%s revision"
+msgid_plural "%s revisions"
+msgstr[0] ""
+msgstr[1] ""
+
+#. TRANS: Text for a question that was answered.
+#. TRANS: %1$s is the user that answered, %2$s is the question title,
+#. TRANS: %2$s is the answer content.
+#, php-format
+msgid "%1$s answered the question \"%2$s\": %3$s"
+msgstr ""
+
+#. TRANS: Text for a question that was answered.
+#. TRANS: %s is the question title.
+#. TRANS: Rendered version of the notice content answering a question.
+#. TRANS: %s a link to the question with question title as the link content.
+#, php-format
+msgid "answered \"%s\""
+msgstr ""
+
+#. TRANS: Number of given answers to a question.
+#. TRANS: %s is the number of given answers.
+#, php-format
+msgid "%s answer"
+msgid_plural "%s answers"
+msgstr[0] ""
+msgstr[1] ""
+
+#. TRANS: Notification that a question cannot be answered anymore because it is closed.
+msgid "This question is closed."
+msgstr ""
+
+#. TRANS: Rendered version of the notice content creating a question.
+#. TRANS: %s a link to the question as link description.
+#, php-format
+msgid "Question: %s"
+msgstr "Goulenn : %s"
+
+#. TRANS: Button text for submitting a revised answer.
+#. TRANS: Button text for submitting a poll response.
+msgctxt "BUTTON"
+msgid "Submit"
+msgstr "Kas"
+
+#. TRANS: Field label.
+msgid "Enter your answer"
+msgstr ""
+
+#. TRANS: Button text for submitting a poll response.
+msgctxt "BUTTON"
+msgid "Answer"
+msgstr "Respont"
+
+#. TRANS: Field label for a new question.
+msgctxt "LABEL"
+msgid "Title"
+msgstr "Titl"
+
+#. TRANS: Field title for a new question.
+msgid "The title of your question."
+msgstr ""
+
+#. TRANS: Field label for question details.
+msgctxt "LABEL"
+msgid "Description"
+msgstr "Deskrivadur"
+
+#. TRANS: Field title for question details.
+msgid "Your question in detail."
+msgstr ""
+
+#. TRANS: Button text for saving a new question.
+msgctxt "BUTTON"
+msgid "Save"
+msgstr "Enrollañ"
+
+#. TRANS: Form legend for revising the answer.
+msgctxt "LEGEND"
+msgid "Question"
+msgstr "Goulenn"
+
+#. TRANS: Button text for closing a question.
+msgctxt "BUTTON"
+msgid "Close"
+msgstr "Serriñ"
+
+#. TRANS: Title for button text for closing a question.
+msgid "Close the question to no one can answer it anymore."
+msgstr ""
+
+#. TRANS: Button text for marking an answer as "best".
+msgctxt "BUTTON"
+msgid "Best"
+msgstr "Gwellañ"
+
+#. TRANS: Title for button text marking an answer as "best".
+msgid "Mark this answer as the best answer."
+msgstr ""
diff --git a/plugins/QnA/locale/ca/LC_MESSAGES/QnA.po b/plugins/QnA/locale/ca/LC_MESSAGES/QnA.po
new file mode 100644
index 0000000000..5584b60ab5
--- /dev/null
+++ b/plugins/QnA/locale/ca/LC_MESSAGES/QnA.po
@@ -0,0 +1,303 @@
+# Translation of StatusNet - QnA to Catalan (català)
+# Exported from translatewiki.net
+#
+# Author: Toniher
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - QnA\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:43+0000\n"
+"Language-Team: Catalan <https://translatewiki.net/wiki/Portal:ca>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2012-01-02 10:10:59+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: ca\n"
+"X-Message-Group: #out-statusnet-plugin-qna\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Title for Question page.
+msgid "New question"
+msgstr "Pregunta nova"
+
+#. TRANS: Client exception thrown trying to create a Question while not logged in.
+msgid "You must be logged in to post a question."
+msgstr "Heu d'iniciar una sessió per publicar una pregunta."
+
+#. TRANS: Client exception thrown trying to create a question without a title.
+msgid "Question must have a title."
+msgstr "La pregunta ha de tenir un títol."
+
+#. TRANS: Page title after sending a notice.
+msgid "Question posted"
+msgstr "S'ha publicat la pregunta"
+
+#. TRANS: Client exception thrown when requesting a non-existing answer.
+#. TRANS: Did we used to have it, and it got deleted?
+msgid "No such answer."
+msgstr "No existeix la resposta."
+
+#. TRANS: Client exception thrown when requesting an answer that has no connected question.
+msgid "No question for this answer."
+msgstr "No hi ha cap pregunta per a aquesta resposta."
+
+#. TRANS: Client exception thrown when requesting answer data for a non-existing user.
+#. TRANS: Client exception thrown trying to view a question of a non-existing user.
+msgid "No such user."
+msgstr "No existeix l'usuari."
+
+#. TRANS: Client exception thrown when requesting answer data for a user without a profile.
+#. TRANS: Server exception thrown trying to view a question for a user for which the profile could not be loaded.
+msgid "User without a profile."
+msgstr "Usuari sense perfil."
+
+#. TRANS: Page title.
+#. TRANS: %1$s is the user who answered a question, %2$s is the question.
+#, php-format
+msgid "%1$s's answer to \"%2$s\""
+msgstr "Resposta de %1$s a «%2$s»"
+
+#. TRANS: Page title for revising a question
+msgid "Revise answer"
+msgstr "Revisa la resposta"
+
+#. TRANS: Client exception thrown trying to answer a question while not logged in.
+msgid "You must be logged in to answer to a question."
+msgstr "Heu d'haver iniciat una sessió per respondre una pregunta."
+
+#. TRANS: Client exception thrown trying to respond to a non-existing question.
+msgid "Invalid or missing answer."
+msgstr "Manca una resposta o bé no és vàlida."
+
+#. TRANS: Page title after sending an answer.
+#. TRANS: Page title for and answer to a question.
+#. TRANS: Form legend for showing the answer.
+msgid "Answer"
+msgstr "Resposta"
+
+#. TRANS: Form title for sending an answer.
+msgctxt "TITLE"
+msgid "Answer"
+msgstr "Resposta"
+
+#. TRANS: Client exception thrown trying to view a non-existing question.
+msgid "No such question."
+msgstr "No existeix la pregunta."
+
+#. TRANS: Client exception thrown trying to view a non-existing question notice.
+msgid "No such question notice."
+msgstr "No existeix l'avís de la resposta."
+
+#. TRANS: Page title for a question.
+#. TRANS: %1$s is the nickname of the user who asked the question, %2$s is the question.
+#, php-format
+msgid "%1$s's question: %2$s"
+msgstr "Pregunta de %1$s: %2$s"
+
+#. TRANS: Page title for close a question
+msgid "Close question"
+msgstr "Tanca la pregunta"
+
+#. TRANS: Client exception thrown trying to close a question when not logged in
+msgid "You must be logged in to close a question."
+msgstr "Cal haver iniciat una sessió per tancar una pregunta."
+
+#. TRANS: Client exception thrown trying to respond to a non-existing question.
+msgid "Invalid or missing question."
+msgstr "La pregunta no és vàlida o no hi és."
+
+#. TRANS: Exception thrown trying to close another user's question.
+msgid "You did not ask this question."
+msgstr "No heu respost la pregunta."
+
+#. TRANS: Page title after sending an answer.
+#. TRANS: Page title after sending in a vote for a question or answer.
+msgid "Answers"
+msgstr "Respostes"
+
+#. TRANS: Page title after an AJAX error occurs on the post answer page.
+msgid "Ajax Error"
+msgstr "Error d'Ajax"
+
+#. TRANS: Title for form to send answer to a question.
+msgctxt "TITLE"
+msgid "Your answer"
+msgstr "La vostra resposta"
+
+#. TRANS: Error message displayed when an answer has no content.
+#. TRANS: Error message displayed when answer data is not present.
+msgid "Answer data is missing."
+msgstr "Manquen les dades de la resposta."
+
+#. TRANS: Plugin description.
+msgid "Question and Answers micro-app."
+msgstr "Microaplicació de preguntes i respostes."
+
+#. TRANS: Application title.
+msgctxt "TITLE"
+msgid "Question"
+msgstr "Pregunta"
+
+#. TRANS: Exception thrown when there are too many activity objects.
+msgid "Too many activity objects."
+msgstr "Masses objectes d'activitat."
+
+#. TRANS: Exception thrown when an incorrect object type is encountered.
+msgid "Wrong type for object."
+msgstr "Tipus d'objecte incorrecte."
+
+#. TRANS: Exception thrown when answering a non-existing question.
+msgid "Answer to unknown question."
+msgstr "Resposta a una pregunta desconeguda."
+
+#. TRANS: Exception thrown when an object type is encountered that cannot be handled.
+msgid "Unknown object type."
+msgstr "Tipus d'objecte desconegut."
+
+#. TRANS: Exception thrown when requesting a non-existing question notice.
+msgid "Unknown question notice."
+msgstr "Avís de pregunta desconegut."
+
+#. TRANS: Exception thrown when performing an unexpected action on a question.
+#. TRANS: %s is the unpexpected object type.
+#, php-format
+msgid "Unexpected type for QnA plugin: %s."
+msgstr "Tipus no esperat per al connector QnA: %s."
+
+#. TRANS: Error message displayed when question data is not present.
+msgid "Question data is missing."
+msgstr "Les dades de la pregunta no hi són."
+
+#. TRANS: Placeholder value for a possible answer to a question
+#. TRANS: by the logged in user.
+msgid "Your answer..."
+msgstr "La vostra resposta..."
+
+#. TRANS: Link description for link to full notice text if it is longer than
+#. TRANS: what will be dispplayed.
+msgid "…"
+msgstr "…"
+
+#. TRANS: Title for link that is an ellipsis in English.
+msgid "more..."
+msgstr "més..."
+
+#. TRANS: Exception thown when getting a question with a non-existing ID.
+#. TRANS: %s is the non-existing question ID.
+#, php-format
+msgid "No question with ID %s"
+msgstr "No hi ha cap pregunta amb ID %s"
+
+#. TRANS: Exception thown when getting a profile with a non-existing ID.
+#. TRANS: %s is the non-existing profile ID.
+#. TRANS: Exception trown when getting a profile for a non-existing ID.
+#. TRANS: %s is the provided profile ID.
+#, php-format
+msgid "No profile with ID %s"
+msgstr "No hi ha cap perfil amb ID %s"
+
+#. TRANS: %s is the number of answer revisions.
+#, php-format
+msgid "%s revision"
+msgid_plural "%s revisions"
+msgstr[0] "%s revisió"
+msgstr[1] "%s revisions"
+
+#. TRANS: Text for a question that was answered.
+#. TRANS: %1$s is the user that answered, %2$s is the question title,
+#. TRANS: %2$s is the answer content.
+#, php-format
+msgid "%1$s answered the question \"%2$s\": %3$s"
+msgstr "%1$s ha respost la pregunta «%2$s»: %3$s"
+
+#. TRANS: Text for a question that was answered.
+#. TRANS: %s is the question title.
+#. TRANS: Rendered version of the notice content answering a question.
+#. TRANS: %s a link to the question with question title as the link content.
+#, php-format
+msgid "answered \"%s\""
+msgstr "ha respost «%s»"
+
+#. TRANS: Number of given answers to a question.
+#. TRANS: %s is the number of given answers.
+#, php-format
+msgid "%s answer"
+msgid_plural "%s answers"
+msgstr[0] "%s resposta"
+msgstr[1] "%s respostes"
+
+#. TRANS: Notification that a question cannot be answered anymore because it is closed.
+msgid "This question is closed."
+msgstr "Aquesta pregunta està tancada."
+
+#. TRANS: Rendered version of the notice content creating a question.
+#. TRANS: %s a link to the question as link description.
+#, php-format
+msgid "Question: %s"
+msgstr "Pregunta: %s"
+
+#. TRANS: Button text for submitting a revised answer.
+#. TRANS: Button text for submitting a poll response.
+msgctxt "BUTTON"
+msgid "Submit"
+msgstr "Envia"
+
+#. TRANS: Field label.
+msgid "Enter your answer"
+msgstr "Introduïu la vostra resposta"
+
+#. TRANS: Button text for submitting a poll response.
+msgctxt "BUTTON"
+msgid "Answer"
+msgstr "Resposta"
+
+#. TRANS: Field label for a new question.
+msgctxt "LABEL"
+msgid "Title"
+msgstr "Títol"
+
+#. TRANS: Field title for a new question.
+msgid "The title of your question."
+msgstr "El títol de la vostra pregunta."
+
+#. TRANS: Field label for question details.
+msgctxt "LABEL"
+msgid "Description"
+msgstr "Descripció"
+
+#. TRANS: Field title for question details.
+msgid "Your question in detail."
+msgstr "La vostra pregunta en detall."
+
+#. TRANS: Button text for saving a new question.
+msgctxt "BUTTON"
+msgid "Save"
+msgstr "Desa"
+
+#. TRANS: Form legend for revising the answer.
+msgctxt "LEGEND"
+msgid "Question"
+msgstr "Pregunta"
+
+#. TRANS: Button text for closing a question.
+msgctxt "BUTTON"
+msgid "Close"
+msgstr "Tanca"
+
+#. TRANS: Title for button text for closing a question.
+msgid "Close the question to no one can answer it anymore."
+msgstr "Tanca la pregunta per tal que ningú pugui respondre-la més."
+
+#. TRANS: Button text for marking an answer as "best".
+msgctxt "BUTTON"
+msgid "Best"
+msgstr "Millor"
+
+#. TRANS: Title for button text marking an answer as "best".
+msgid "Mark this answer as the best answer."
+msgstr "Marca aquesta resposta com a millor resposta."
diff --git a/plugins/QnA/locale/de/LC_MESSAGES/QnA.po b/plugins/QnA/locale/de/LC_MESSAGES/QnA.po
index 811d032354..b6407b5c80 100644
--- a/plugins/QnA/locale/de/LC_MESSAGES/QnA.po
+++ b/plugins/QnA/locale/de/LC_MESSAGES/QnA.po
@@ -2,6 +2,8 @@
 # Exported from translatewiki.net
 #
 # Author: Giftpflanze
+# Author: Inkowik
+# Author: Tiin
 # --
 # This file is distributed under the same license as the StatusNet package.
 #
@@ -9,14 +11,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - QnA\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:58+0000\n"
-"Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:43+0000\n"
+"Language-Team: German <https://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:49+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2012-01-02 10:10:59+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-qna\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -25,6 +27,7 @@ msgstr ""
 msgid "New question"
 msgstr "Neue Frage"
 
+#. TRANS: Client exception thrown trying to create a Question while not logged in.
 msgid "You must be logged in to post a question."
 msgstr "Du musst angemeldet sein, um eine Frage zu stellen."
 
@@ -36,16 +39,21 @@ msgstr "Frage muss einen Titel haben."
 msgid "Question posted"
 msgstr "Frage gestellt"
 
+#. TRANS: Client exception thrown when requesting a non-existing answer.
+#. TRANS: Did we used to have it, and it got deleted?
 msgid "No such answer."
 msgstr "Keine solche Antwort."
 
+#. TRANS: Client exception thrown when requesting an answer that has no connected question.
 msgid "No question for this answer."
 msgstr "Keine Frage für diese Antwort."
 
+#. TRANS: Client exception thrown when requesting answer data for a non-existing user.
 #. TRANS: Client exception thrown trying to view a question of a non-existing user.
 msgid "No such user."
 msgstr "Kein solcher Benutzer."
 
+#. TRANS: Client exception thrown when requesting answer data for a user without a profile.
 #. TRANS: Server exception thrown trying to view a question for a user for which the profile could not be loaded.
 msgid "User without a profile."
 msgstr "Benutzer ohne Profil."
@@ -64,6 +72,7 @@ msgstr "Antwort ändern"
 msgid "You must be logged in to answer to a question."
 msgstr "Du musst angemeldet sein, um eine Frage zu beantworten."
 
+#. TRANS: Client exception thrown trying to respond to a non-existing question.
 msgid "Invalid or missing answer."
 msgstr "Ungültige oder fehlende Antwort."
 
@@ -73,6 +82,11 @@ msgstr "Ungültige oder fehlende Antwort."
 msgid "Answer"
 msgstr "Antwort"
 
+#. TRANS: Form title for sending an answer.
+msgctxt "TITLE"
+msgid "Answer"
+msgstr "Antwort"
+
 #. TRANS: Client exception thrown trying to view a non-existing question.
 msgid "No such question."
 msgstr "Keine solche Frage."
@@ -81,6 +95,8 @@ msgstr "Keine solche Frage."
 msgid "No such question notice."
 msgstr "Keine solche Fragenotiz."
 
+#. TRANS: Page title for a question.
+#. TRANS: %1$s is the nickname of the user who asked the question, %2$s is the question.
 #, php-format
 msgid "%1$s's question: %2$s"
 msgstr "%1$ss Frage: %2$s"
@@ -89,6 +105,7 @@ msgstr "%1$ss Frage: %2$s"
 msgid "Close question"
 msgstr "Frage schließen"
 
+#. TRANS: Client exception thrown trying to close a question when not logged in
 msgid "You must be logged in to close a question."
 msgstr "Du musst angemeldet sein, um eine Frage zu schließen."
 
@@ -96,10 +113,12 @@ msgstr "Du musst angemeldet sein, um eine Frage zu schließen."
 msgid "Invalid or missing question."
 msgstr "Ungültige oder fehlende Frage."
 
-msgid "You didn't ask this question."
+#. TRANS: Exception thrown trying to close another user's question.
+msgid "You did not ask this question."
 msgstr "Du hast diese Frage nicht gestellt."
 
 #. TRANS: Page title after sending an answer.
+#. TRANS: Page title after sending in a vote for a question or answer.
 msgid "Answers"
 msgstr "Antworten"
 
@@ -112,6 +131,8 @@ msgctxt "TITLE"
 msgid "Your answer"
 msgstr "Deine Antwort"
 
+#. TRANS: Error message displayed when an answer has no content.
+#. TRANS: Error message displayed when answer data is not present.
 msgid "Answer data is missing."
 msgstr "Antwortdaten fehlen."
 
@@ -120,25 +141,27 @@ msgid "Question and Answers micro-app."
 msgstr "Minianwendung für Fragen und Antworten."
 
 #. TRANS: Application title.
-#. TRANS: Form legend for revising the answer.
+msgctxt "TITLE"
 msgid "Question"
 msgstr "Frage"
 
+#. TRANS: Exception thrown when there are too many activity objects.
 msgid "Too many activity objects."
 msgstr "Zu viele Aktivitätsobjekte."
 
+#. TRANS: Exception thrown when an incorrect object type is encountered.
 msgid "Wrong type for object."
 msgstr "Falscher Objekttyp."
 
+#. TRANS: Exception thrown when answering a non-existing question.
 msgid "Answer to unknown question."
 msgstr "Antwort auf unbekannte Frage."
 
-msgid "Unknown object type received by QnA Plugin."
-msgstr "Unbekannter Objekttyp von QnA-Plugin empfangen."
-
+#. TRANS: Exception thrown when an object type is encountered that cannot be handled.
 msgid "Unknown object type."
 msgstr "Unbekannter Objekttyp."
 
+#. TRANS: Exception thrown when requesting a non-existing question notice.
 msgid "Unknown question notice."
 msgstr "Unbekannte Fragenotiz."
 
@@ -148,39 +171,69 @@ msgstr "Unbekannte Fragenotiz."
 msgid "Unexpected type for QnA plugin: %s."
 msgstr "Unerwarteter Typ für QnA-Plugin: %s."
 
+#. TRANS: Error message displayed when question data is not present.
 msgid "Question data is missing."
 msgstr "Fragedaten fehlen."
 
+#. TRANS: Placeholder value for a possible answer to a question
+#. TRANS: by the logged in user.
 msgid "Your answer..."
 msgstr "Deine Antwort …"
 
-#. TRANS: Link to full notice text if it is longer than what will be dispplayed.
-#. TRANS: %s a notice URI.
-#, php-format
-msgid "<a href=\"%s\" rel=\"more\" title=\"%s\">…</a>"
-msgstr "<a href=\"%s\" rel=\"more\" title=\"%s\">…</a>"
+#. TRANS: Link description for link to full notice text if it is longer than
+#. TRANS: what will be dispplayed.
+msgid "…"
+msgstr "…"
 
+#. TRANS: Title for link that is an ellipsis in English.
 msgid "more..."
 msgstr "mehr …"
 
+#. TRANS: Exception thown when getting a question with a non-existing ID.
+#. TRANS: %s is the non-existing question ID.
 #, php-format
-msgid "%s revisions"
-msgstr "%s Versionen"
+msgid "No question with ID %s"
+msgstr "Keine Frage mit der ID %s"
 
+#. TRANS: Exception thown when getting a profile with a non-existing ID.
+#. TRANS: %s is the non-existing profile ID.
+#. TRANS: Exception trown when getting a profile for a non-existing ID.
+#. TRANS: %s is the provided profile ID.
+#, php-format
+msgid "No profile with ID %s"
+msgstr "Kein Profil mit der ID %s."
+
+#. TRANS: %s is the number of answer revisions.
+#, php-format
+msgid "%s revision"
+msgid_plural "%s revisions"
+msgstr[0] "%s Version"
+msgstr[1] "%s Versionen"
+
+#. TRANS: Text for a question that was answered.
+#. TRANS: %1$s is the user that answered, %2$s is the question title,
+#. TRANS: %2$s is the answer content.
 #, php-format
 msgid "%1$s answered the question \"%2$s\": %3$s"
 msgstr "%1$s antwortete auf Frage „%2$s“ mit %3$s"
 
+#. TRANS: Text for a question that was answered.
+#. TRANS: %s is the question title.
 #. TRANS: Rendered version of the notice content answering a question.
 #. TRANS: %s a link to the question with question title as the link content.
 #, php-format
 msgid "answered \"%s\""
 msgstr "antwortete „%s>“"
 
+#. TRANS: Number of given answers to a question.
+#. TRANS: %s is the number of given answers.
 #, php-format
-msgid "%s answers"
-msgstr "%s antwortet"
+msgid "%s answer"
+msgid_plural "%s answers"
+msgstr[0] "%s Antwort"
+msgstr[1] "%s Antworten"
 
+#. TRANS: Notification that a question cannot be answered anymore because it is closed.
 msgid "This question is closed."
 msgstr "Diese Frage ist geschlossen."
 
@@ -190,11 +243,13 @@ msgstr "Diese Frage ist geschlossen."
 msgid "Question: %s"
 msgstr "Fragen: %s"
 
+#. TRANS: Button text for submitting a revised answer.
 #. TRANS: Button text for submitting a poll response.
 msgctxt "BUTTON"
 msgid "Submit"
 msgstr "Abschicken"
 
+#. TRANS: Field label.
 msgid "Enter your answer"
 msgstr "Frage eingeben"
 
@@ -203,37 +258,48 @@ msgctxt "BUTTON"
 msgid "Answer"
 msgstr "Antwort"
 
+#. TRANS: Field label for a new question.
+msgctxt "LABEL"
 msgid "Title"
 msgstr "Titel"
 
-msgid "Title of your question"
-msgstr "Titel deiner Frage"
+#. TRANS: Field title for a new question.
+msgid "The title of your question."
+msgstr "Der Titel deiner Frage."
 
+#. TRANS: Field label for question details.
+msgctxt "LABEL"
 msgid "Description"
 msgstr "Beschreibung"
 
-msgid "Your question in detail"
-msgstr "Deine Frage im Detail"
+#. TRANS: Field title for question details.
+msgid "Your question in detail."
+msgstr "Deine Frage im Detail."
 
 #. TRANS: Button text for saving a new question.
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Speichern"
 
-#. TRANS: Button text for closing a question
+#. TRANS: Form legend for revising the answer.
+msgctxt "LEGEND"
+msgid "Question"
+msgstr "Frage"
+
+#. TRANS: Button text for closing a question.
 msgctxt "BUTTON"
 msgid "Close"
 msgstr "Schließen"
 
-#. TRANS: Title for button text for closing a question
-msgid "Close the question"
-msgstr "Frage schließen"
+#. TRANS: Title for button text for closing a question.
+msgid "Close the question to no one can answer it anymore."
+msgstr "Die Frage schließen, sodass niemand mehr antworten kann."
 
-#. TRANS: Button text for marking an answer as "best"
+#. TRANS: Button text for marking an answer as "best".
 msgctxt "BUTTON"
 msgid "Best"
 msgstr "Beste Antwort"
 
-#. TRANS: Title for button text marking an answer as "best"
-msgid "Mark as best answer"
-msgstr "Als beste Antwort markieren"
+#. TRANS: Title for button text marking an answer as "best".
+msgid "Mark this answer as the best answer."
+msgstr "Diese Antwort als die beste Antwort markieren."
diff --git a/plugins/QnA/locale/es/LC_MESSAGES/QnA.po b/plugins/QnA/locale/es/LC_MESSAGES/QnA.po
new file mode 100644
index 0000000000..6326088d69
--- /dev/null
+++ b/plugins/QnA/locale/es/LC_MESSAGES/QnA.po
@@ -0,0 +1,302 @@
+# Translation of StatusNet - QnA to Spanish (español)
+# Exported from translatewiki.net
+#
+# Author: Armando-Martin
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - QnA\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:43+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2012-01-02 10:10:59+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Title for Question page.
+msgid "New question"
+msgstr "Nueva pregunta"
+
+#. TRANS: Client exception thrown trying to create a Question while not logged in.
+msgid "You must be logged in to post a question."
+msgstr "Debe iniciar sesión para publicar una pregunta."
+
+#. TRANS: Client exception thrown trying to create a question without a title.
+msgid "Question must have a title."
+msgstr "La pregunta debe tener un título."
+
+#. TRANS: Page title after sending a notice.
+msgid "Question posted"
+msgstr "Pregunta publicada"
+
+#. TRANS: Client exception thrown when requesting a non-existing answer.
+#. TRANS: Did we used to have it, and it got deleted?
+msgid "No such answer."
+msgstr "No hay tal respuesta."
+
+#. TRANS: Client exception thrown when requesting an answer that has no connected question.
+msgid "No question for this answer."
+msgstr "No hay pregunta para esta respuesta."
+
+#. TRANS: Client exception thrown when requesting answer data for a non-existing user.
+#. TRANS: Client exception thrown trying to view a question of a non-existing user.
+msgid "No such user."
+msgstr "No existe ese usuario."
+
+#. TRANS: Client exception thrown when requesting answer data for a user without a profile.
+#. TRANS: Server exception thrown trying to view a question for a user for which the profile could not be loaded.
+msgid "User without a profile."
+msgstr "Usuario sin perfil."
+
+#. TRANS: Page title.
+#. TRANS: %1$s is the user who answered a question, %2$s is the question.
+#, php-format
+msgid "%1$s's answer to \"%2$s\""
+msgstr "Respuesta de %1$s a \"%2$s\""
+
+#. TRANS: Page title for revising a question
+msgid "Revise answer"
+msgstr "Revisar la respuesta"
+
+#. TRANS: Client exception thrown trying to answer a question while not logged in.
+msgid "You must be logged in to answer to a question."
+msgstr "Debe iniciar sesión para responder a una pregunta."
+
+#. TRANS: Client exception thrown trying to respond to a non-existing question.
+msgid "Invalid or missing answer."
+msgstr "Falta la respuesta o no es válida."
+
+#. TRANS: Page title after sending an answer.
+#. TRANS: Page title for and answer to a question.
+#. TRANS: Form legend for showing the answer.
+msgid "Answer"
+msgstr "Respuesta"
+
+#. TRANS: Form title for sending an answer.
+msgctxt "TITLE"
+msgid "Answer"
+msgstr "Respuesta"
+
+#. TRANS: Client exception thrown trying to view a non-existing question.
+msgid "No such question."
+msgstr "No existe esa pregunta."
+
+#. TRANS: Client exception thrown trying to view a non-existing question notice.
+msgid "No such question notice."
+msgstr "No existe la nota de esa pregunta."
+
+#. TRANS: Page title for a question.
+#. TRANS: %1$s is the nickname of the user who asked the question, %2$s is the question.
+#, php-format
+msgid "%1$s's question: %2$s"
+msgstr "Pregunta de %1$s: %2$s"
+
+#. TRANS: Page title for close a question
+msgid "Close question"
+msgstr "Cerrar la pregunta"
+
+#. TRANS: Client exception thrown trying to close a question when not logged in
+msgid "You must be logged in to close a question."
+msgstr "Debe iniciar sesión para cerrar una pregunta."
+
+#. TRANS: Client exception thrown trying to respond to a non-existing question.
+msgid "Invalid or missing question."
+msgstr "Falta la pregunta o no es válida."
+
+#. TRANS: Exception thrown trying to close another user's question.
+msgid "You did not ask this question."
+msgstr "Usted no formuló esta pregunta."
+
+#. TRANS: Page title after sending an answer.
+#. TRANS: Page title after sending in a vote for a question or answer.
+msgid "Answers"
+msgstr "Respuestas"
+
+#. TRANS: Page title after an AJAX error occurs on the post answer page.
+msgid "Ajax Error"
+msgstr "Error de AJAX"
+
+#. TRANS: Title for form to send answer to a question.
+msgctxt "TITLE"
+msgid "Your answer"
+msgstr "Su respuesta"
+
+#. TRANS: Error message displayed when an answer has no content.
+#. TRANS: Error message displayed when answer data is not present.
+msgid "Answer data is missing."
+msgstr "Faltan los datos de la respuesta."
+
+#. TRANS: Plugin description.
+msgid "Question and Answers micro-app."
+msgstr "Microaplicación de preguntas y respuestas."
+
+#. TRANS: Application title.
+msgctxt "TITLE"
+msgid "Question"
+msgstr "Pregunta"
+
+#. TRANS: Exception thrown when there are too many activity objects.
+msgid "Too many activity objects."
+msgstr "Demasiados objetos de actividad."
+
+#. TRANS: Exception thrown when an incorrect object type is encountered.
+msgid "Wrong type for object."
+msgstr "Tipo de objeto erróneo"
+
+#. TRANS: Exception thrown when answering a non-existing question.
+msgid "Answer to unknown question."
+msgstr "Respuesta a pregunta desconocida."
+
+#. TRANS: Exception thrown when an object type is encountered that cannot be handled.
+msgid "Unknown object type."
+msgstr "Tipo de objeto desconocido."
+
+#. TRANS: Exception thrown when requesting a non-existing question notice.
+msgid "Unknown question notice."
+msgstr "Nota de pregunta desconocida."
+
+#. TRANS: Exception thrown when performing an unexpected action on a question.
+#. TRANS: %s is the unpexpected object type.
+#, php-format
+msgid "Unexpected type for QnA plugin: %s."
+msgstr ""
+"Tipo inesperado para el complemento (plugin) de la aplicación de preguntas y "
+"respuestas: %s."
+
+#. TRANS: Error message displayed when question data is not present.
+msgid "Question data is missing."
+msgstr "Faltan los datos de la pregunta."
+
+#. TRANS: Placeholder value for a possible answer to a question
+#. TRANS: by the logged in user.
+msgid "Your answer..."
+msgstr "Su respuesta..."
+
+#. TRANS: Link description for link to full notice text if it is longer than
+#. TRANS: what will be dispplayed.
+msgid "…"
+msgstr "…"
+
+#. TRANS: Title for link that is an ellipsis in English.
+msgid "more..."
+msgstr "más..."
+
+#. TRANS: Exception thown when getting a question with a non-existing ID.
+#. TRANS: %s is the non-existing question ID.
+#, php-format
+msgid "No question with ID %s"
+msgstr "No hay ninguna pregunta con el identificador ID %s"
+
+#. TRANS: Exception thown when getting a profile with a non-existing ID.
+#. TRANS: %s is the non-existing profile ID.
+#. TRANS: Exception trown when getting a profile for a non-existing ID.
+#. TRANS: %s is the provided profile ID.
+#, php-format
+msgid "No profile with ID %s"
+msgstr "No hay ningún perfil con el identificador ID %s"
+
+#. TRANS: %s is the number of answer revisions.
+#, php-format
+msgid "%s revision"
+msgid_plural "%s revisions"
+msgstr[0] "%s revisión"
+msgstr[1] "%s revisiones"
+
+#. TRANS: Text for a question that was answered.
+#. TRANS: %1$s is the user that answered, %2$s is the question title,
+#. TRANS: %2$s is the answer content.
+#, php-format
+msgid "%1$s answered the question \"%2$s\": %3$s"
+msgstr "%1$s ha respondido a la pregunta \"%2$s\": %3$s"
+
+#. TRANS: Text for a question that was answered.
+#. TRANS: %s is the question title.
+#. TRANS: Rendered version of the notice content answering a question.
+#. TRANS: %s a link to the question with question title as the link content.
+#, php-format
+msgid "answered \"%s\""
+msgstr "\"%s\" respondida"
+
+#. TRANS: Number of given answers to a question.
+#. TRANS: %s is the number of given answers.
+#, php-format
+msgid "%s answer"
+msgid_plural "%s answers"
+msgstr[0] "%s respuesta"
+msgstr[1] "%s respuestas"
+
+#. TRANS: Notification that a question cannot be answered anymore because it is closed.
+msgid "This question is closed."
+msgstr "Esta pregunta está cerrada."
+
+#. TRANS: Rendered version of the notice content creating a question.
+#. TRANS: %s a link to the question as link description.
+#, php-format
+msgid "Question: %s"
+msgstr "Pregunta: %s"
+
+#. TRANS: Button text for submitting a revised answer.
+#. TRANS: Button text for submitting a poll response.
+msgctxt "BUTTON"
+msgid "Submit"
+msgstr "Enviar"
+
+#. TRANS: Field label.
+msgid "Enter your answer"
+msgstr "Escriba su respuesta"
+
+#. TRANS: Button text for submitting a poll response.
+msgctxt "BUTTON"
+msgid "Answer"
+msgstr "Respuesta"
+
+#. TRANS: Field label for a new question.
+msgctxt "LABEL"
+msgid "Title"
+msgstr "Título"
+
+#. TRANS: Field title for a new question.
+msgid "The title of your question."
+msgstr "El título de su pregunta."
+
+#. TRANS: Field label for question details.
+msgctxt "LABEL"
+msgid "Description"
+msgstr "Descripción"
+
+#. TRANS: Field title for question details.
+msgid "Your question in detail."
+msgstr "Detalles de su pregunta."
+
+#. TRANS: Button text for saving a new question.
+msgctxt "BUTTON"
+msgid "Save"
+msgstr "Guardar"
+
+#. TRANS: Form legend for revising the answer.
+msgctxt "LEGEND"
+msgid "Question"
+msgstr "Pregunta"
+
+#. TRANS: Button text for closing a question.
+msgctxt "BUTTON"
+msgid "Close"
+msgstr "Cerrar"
+
+#. TRANS: Title for button text for closing a question.
+msgid "Close the question to no one can answer it anymore."
+msgstr "Cerrar la pregunta para que nadie puede responder ya."
+
+#. TRANS: Button text for marking an answer as "best".
+msgctxt "BUTTON"
+msgid "Best"
+msgstr "Mejor"
+
+#. TRANS: Title for button text marking an answer as "best".
+msgid "Mark this answer as the best answer."
+msgstr "Marcar esta respuesta como la mejor respuesta."
diff --git a/plugins/QnA/locale/eu/LC_MESSAGES/QnA.po b/plugins/QnA/locale/eu/LC_MESSAGES/QnA.po
new file mode 100644
index 0000000000..a82322b858
--- /dev/null
+++ b/plugins/QnA/locale/eu/LC_MESSAGES/QnA.po
@@ -0,0 +1,303 @@
+# Translation of StatusNet - QnA to Basque (euskara)
+# Exported from translatewiki.net
+#
+# Author: Artsuaga
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - QnA\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:43+0000\n"
+"Language-Team: Basque <https://translatewiki.net/wiki/Portal:eu>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2012-01-02 10:10:59+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: eu\n"
+"X-Message-Group: #out-statusnet-plugin-qna\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Title for Question page.
+msgid "New question"
+msgstr "Galdera berria"
+
+#. TRANS: Client exception thrown trying to create a Question while not logged in.
+msgid "You must be logged in to post a question."
+msgstr "Galdera bat bidaltzeko saioa hasi behar duzu."
+
+#. TRANS: Client exception thrown trying to create a question without a title.
+msgid "Question must have a title."
+msgstr "Galderak titulu bat izan behar du."
+
+#. TRANS: Page title after sending a notice.
+msgid "Question posted"
+msgstr "Galdera bidali da"
+
+#. TRANS: Client exception thrown when requesting a non-existing answer.
+#. TRANS: Did we used to have it, and it got deleted?
+msgid "No such answer."
+msgstr "Ez dago erantzun hori."
+
+#. TRANS: Client exception thrown when requesting an answer that has no connected question.
+msgid "No question for this answer."
+msgstr "Ez dago erantzunik galdera honentzat."
+
+#. TRANS: Client exception thrown when requesting answer data for a non-existing user.
+#. TRANS: Client exception thrown trying to view a question of a non-existing user.
+msgid "No such user."
+msgstr "Ez dago erabiltzaile hori."
+
+#. TRANS: Client exception thrown when requesting answer data for a user without a profile.
+#. TRANS: Server exception thrown trying to view a question for a user for which the profile could not be loaded.
+msgid "User without a profile."
+msgstr "Profilik gabeko erabiltzailea."
+
+#. TRANS: Page title.
+#. TRANS: %1$s is the user who answered a question, %2$s is the question.
+#, php-format
+msgid "%1$s's answer to \"%2$s\""
+msgstr "%1$s(r)en erantzuna \"%2$s\" galderari."
+
+#. TRANS: Page title for revising a question
+msgid "Revise answer"
+msgstr "Erantzunta berraztertu."
+
+#. TRANS: Client exception thrown trying to answer a question while not logged in.
+msgid "You must be logged in to answer to a question."
+msgstr "Saioa hasi behar duzu galdera bati erantzuteko."
+
+#. TRANS: Client exception thrown trying to respond to a non-existing question.
+msgid "Invalid or missing answer."
+msgstr "Erantzun baliogabe edo okerra."
+
+#. TRANS: Page title after sending an answer.
+#. TRANS: Page title for and answer to a question.
+#. TRANS: Form legend for showing the answer.
+msgid "Answer"
+msgstr "Erantzun"
+
+#. TRANS: Form title for sending an answer.
+msgctxt "TITLE"
+msgid "Answer"
+msgstr "Erantzun"
+
+#. TRANS: Client exception thrown trying to view a non-existing question.
+msgid "No such question."
+msgstr "Ez dago galdera hori."
+
+#. TRANS: Client exception thrown trying to view a non-existing question notice.
+msgid "No such question notice."
+msgstr "Ez dago galdera ohar hori."
+
+#. TRANS: Page title for a question.
+#. TRANS: %1$s is the nickname of the user who asked the question, %2$s is the question.
+#, php-format
+msgid "%1$s's question: %2$s"
+msgstr "%1$s(r)en galdera: %2$s"
+
+#. TRANS: Page title for close a question
+msgid "Close question"
+msgstr "Itxi galdera"
+
+#. TRANS: Client exception thrown trying to close a question when not logged in
+msgid "You must be logged in to close a question."
+msgstr "Saioa hasi behar duzu galdera bat isteko."
+
+#. TRANS: Client exception thrown trying to respond to a non-existing question.
+msgid "Invalid or missing question."
+msgstr "Galdera baliogabea edo galdutakoa."
+
+#. TRANS: Exception thrown trying to close another user's question.
+msgid "You did not ask this question."
+msgstr "Galdera hau ez zenuen zuk egin."
+
+#. TRANS: Page title after sending an answer.
+#. TRANS: Page title after sending in a vote for a question or answer.
+msgid "Answers"
+msgstr "Erantzunak"
+
+#. TRANS: Page title after an AJAX error occurs on the post answer page.
+msgid "Ajax Error"
+msgstr "Ajax Akatsa"
+
+#. TRANS: Title for form to send answer to a question.
+msgctxt "TITLE"
+msgid "Your answer"
+msgstr "Zure erantzuna"
+
+#. TRANS: Error message displayed when an answer has no content.
+#. TRANS: Error message displayed when answer data is not present.
+msgid "Answer data is missing."
+msgstr "Erantzun datuak galdu dira."
+
+#. TRANS: Plugin description.
+msgid "Question and Answers micro-app."
+msgstr "Galdera-erantzunen mikro-aplikazioa."
+
+#. TRANS: Application title.
+msgctxt "TITLE"
+msgid "Question"
+msgstr "Galdera"
+
+#. TRANS: Exception thrown when there are too many activity objects.
+msgid "Too many activity objects."
+msgstr "Jarduera objetu gehiegi."
+
+#. TRANS: Exception thrown when an incorrect object type is encountered.
+msgid "Wrong type for object."
+msgstr "Moeta okerra objetuarentzat."
+
+#. TRANS: Exception thrown when answering a non-existing question.
+msgid "Answer to unknown question."
+msgstr "Galdera hori ez zen existitzen."
+
+#. TRANS: Exception thrown when an object type is encountered that cannot be handled.
+msgid "Unknown object type."
+msgstr "Objetu moeta ezezaguna."
+
+#. TRANS: Exception thrown when requesting a non-existing question notice.
+msgid "Unknown question notice."
+msgstr "Galdera ohar ezezaguna."
+
+#. TRANS: Exception thrown when performing an unexpected action on a question.
+#. TRANS: %s is the unpexpected object type.
+#, php-format
+msgid "Unexpected type for QnA plugin: %s."
+msgstr "QnA pluginarentzat espero ez zen moeta: %s."
+
+#. TRANS: Error message displayed when question data is not present.
+msgid "Question data is missing."
+msgstr "Galdera datuak galdu dira."
+
+#. TRANS: Placeholder value for a possible answer to a question
+#. TRANS: by the logged in user.
+msgid "Your answer..."
+msgstr "Zure erantzuna..."
+
+#. TRANS: Link description for link to full notice text if it is longer than
+#. TRANS: what will be dispplayed.
+msgid "…"
+msgstr "…"
+
+#. TRANS: Title for link that is an ellipsis in English.
+msgid "more..."
+msgstr "gehiago..."
+
+#. TRANS: Exception thown when getting a question with a non-existing ID.
+#. TRANS: %s is the non-existing question ID.
+#, php-format
+msgid "No question with ID %s"
+msgstr "Ez dago %s IDarekin galderarik"
+
+#. TRANS: Exception thown when getting a profile with a non-existing ID.
+#. TRANS: %s is the non-existing profile ID.
+#. TRANS: Exception trown when getting a profile for a non-existing ID.
+#. TRANS: %s is the provided profile ID.
+#, php-format
+msgid "No profile with ID %s"
+msgstr "Ez dago %s IDarekin profilik"
+
+#. TRANS: %s is the number of answer revisions.
+#, php-format
+msgid "%s revision"
+msgid_plural "%s revisions"
+msgstr[0] "zuzenketa %s"
+msgstr[1] "%s zuzenketa"
+
+#. TRANS: Text for a question that was answered.
+#. TRANS: %1$s is the user that answered, %2$s is the question title,
+#. TRANS: %2$s is the answer content.
+#, php-format
+msgid "%1$s answered the question \"%2$s\": %3$s"
+msgstr "%1$s(e)k \"%2$s\" galderari erantzun dio: %3$s"
+
+#. TRANS: Text for a question that was answered.
+#. TRANS: %s is the question title.
+#. TRANS: Rendered version of the notice content answering a question.
+#. TRANS: %s a link to the question with question title as the link content.
+#, php-format
+msgid "answered \"%s\""
+msgstr "\"%s\" galderari erantzuna:"
+
+#. TRANS: Number of given answers to a question.
+#. TRANS: %s is the number of given answers.
+#, php-format
+msgid "%s answer"
+msgid_plural "%s answers"
+msgstr[0] "erantzun %s"
+msgstr[1] "%s erantzun"
+
+#. TRANS: Notification that a question cannot be answered anymore because it is closed.
+msgid "This question is closed."
+msgstr "Galdera hau itxita dago."
+
+#. TRANS: Rendered version of the notice content creating a question.
+#. TRANS: %s a link to the question as link description.
+#, php-format
+msgid "Question: %s"
+msgstr "Galdera: %s"
+
+#. TRANS: Button text for submitting a revised answer.
+#. TRANS: Button text for submitting a poll response.
+msgctxt "BUTTON"
+msgid "Submit"
+msgstr "Bidali"
+
+#. TRANS: Field label.
+msgid "Enter your answer"
+msgstr "Sartu zure erantzuna"
+
+#. TRANS: Button text for submitting a poll response.
+msgctxt "BUTTON"
+msgid "Answer"
+msgstr "Erantzun"
+
+#. TRANS: Field label for a new question.
+msgctxt "LABEL"
+msgid "Title"
+msgstr "Titulua"
+
+#. TRANS: Field title for a new question.
+msgid "The title of your question."
+msgstr "Zure galderaren titulua."
+
+#. TRANS: Field label for question details.
+msgctxt "LABEL"
+msgid "Description"
+msgstr "Deskribapena"
+
+#. TRANS: Field title for question details.
+msgid "Your question in detail."
+msgstr "Zure galdera zehatz-mehatz"
+
+#. TRANS: Button text for saving a new question.
+msgctxt "BUTTON"
+msgid "Save"
+msgstr "Gorde"
+
+#. TRANS: Form legend for revising the answer.
+msgctxt "LEGEND"
+msgid "Question"
+msgstr "Galdera"
+
+#. TRANS: Button text for closing a question.
+msgctxt "BUTTON"
+msgid "Close"
+msgstr "Itxi"
+
+#. TRANS: Title for button text for closing a question.
+msgid "Close the question to no one can answer it anymore."
+msgstr "Itxi galdera erantzun gehiagorik ez jasotzeko."
+
+#. TRANS: Button text for marking an answer as "best".
+msgctxt "BUTTON"
+msgid "Best"
+msgstr "Egokiena"
+
+#. TRANS: Title for button text marking an answer as "best".
+msgid "Mark this answer as the best answer."
+msgstr "Markatu erantzun hau egokiena gisa."
diff --git a/plugins/QnA/locale/fr/LC_MESSAGES/QnA.po b/plugins/QnA/locale/fr/LC_MESSAGES/QnA.po
index ec3d2976eb..e79acb1d35 100644
--- a/plugins/QnA/locale/fr/LC_MESSAGES/QnA.po
+++ b/plugins/QnA/locale/fr/LC_MESSAGES/QnA.po
@@ -1,8 +1,10 @@
-# Translation of StatusNet - QnA to French (Français)
+# Translation of StatusNet - QnA to French (français)
 # Exported from translatewiki.net
 #
 # Author: Brunoperel
+# Author: Gomoko
 # Author: Iketsi
+# Author: JojoBoulix
 # Author: Od1n
 # --
 # This file is distributed under the same license as the StatusNet package.
@@ -11,14 +13,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - QnA\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:58+0000\n"
-"Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:44+0000\n"
+"Language-Team: French <https://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:49+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2012-01-02 10:10:59+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-qna\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
@@ -27,6 +29,7 @@ msgstr ""
 msgid "New question"
 msgstr "Nouvelle question"
 
+#. TRANS: Client exception thrown trying to create a Question while not logged in.
 msgid "You must be logged in to post a question."
 msgstr "Vous devez être connecté pour pouvoir poster une question."
 
@@ -38,16 +41,21 @@ msgstr "La question doit avoir un titre."
 msgid "Question posted"
 msgstr "Question publiée"
 
+#. TRANS: Client exception thrown when requesting a non-existing answer.
+#. TRANS: Did we used to have it, and it got deleted?
 msgid "No such answer."
 msgstr "Réponse non trouvée."
 
+#. TRANS: Client exception thrown when requesting an answer that has no connected question.
 msgid "No question for this answer."
 msgstr "Pas question pour cette réponse."
 
+#. TRANS: Client exception thrown when requesting answer data for a non-existing user.
 #. TRANS: Client exception thrown trying to view a question of a non-existing user.
 msgid "No such user."
 msgstr "Utilisateur inexistant."
 
+#. TRANS: Client exception thrown when requesting answer data for a user without a profile.
 #. TRANS: Server exception thrown trying to view a question for a user for which the profile could not be loaded.
 msgid "User without a profile."
 msgstr "Utilisateur sans profil."
@@ -66,6 +74,7 @@ msgstr "Réviser la réponse"
 msgid "You must be logged in to answer to a question."
 msgstr "Vous devez être connecté pour pouvoir répondre à une question."
 
+#. TRANS: Client exception thrown trying to respond to a non-existing question.
 msgid "Invalid or missing answer."
 msgstr "Réponse invalide ou manquante."
 
@@ -75,14 +84,21 @@ msgstr "Réponse invalide ou manquante."
 msgid "Answer"
 msgstr "Réponse"
 
+#. TRANS: Form title for sending an answer.
+msgctxt "TITLE"
+msgid "Answer"
+msgstr "Réponse"
+
 #. TRANS: Client exception thrown trying to view a non-existing question.
 msgid "No such question."
 msgstr "Aucune question semblable."
 
 #. TRANS: Client exception thrown trying to view a non-existing question notice.
 msgid "No such question notice."
-msgstr ""
+msgstr "Aucun avis de question."
 
+#. TRANS: Page title for a question.
+#. TRANS: %1$s is the nickname of the user who asked the question, %2$s is the question.
 #, php-format
 msgid "%1$s's question: %2$s"
 msgstr "Question de %1$s : %2$s"
@@ -91,6 +107,7 @@ msgstr "Question de %1$s : %2$s"
 msgid "Close question"
 msgstr "Fermer la question"
 
+#. TRANS: Client exception thrown trying to close a question when not logged in
 msgid "You must be logged in to close a question."
 msgstr "Vous devez être connecté pour pouvoir clore une question."
 
@@ -98,10 +115,12 @@ msgstr "Vous devez être connecté pour pouvoir clore une question."
 msgid "Invalid or missing question."
 msgstr "Question invalide ou manquante."
 
-msgid "You didn't ask this question."
-msgstr "Vous n'avez pas posé la question."
+#. TRANS: Exception thrown trying to close another user's question.
+msgid "You did not ask this question."
+msgstr "Vous n’avez pas posé cette question."
 
 #. TRANS: Page title after sending an answer.
+#. TRANS: Page title after sending in a vote for a question or answer.
 msgid "Answers"
 msgstr "Réponses"
 
@@ -114,6 +133,8 @@ msgctxt "TITLE"
 msgid "Your answer"
 msgstr "Votre réponse"
 
+#. TRANS: Error message displayed when an answer has no content.
+#. TRANS: Error message displayed when answer data is not present.
 msgid "Answer data is missing."
 msgstr "Les données de réponse sont manquantes."
 
@@ -122,27 +143,29 @@ msgid "Question and Answers micro-app."
 msgstr "Micro-application Question and Answers"
 
 #. TRANS: Application title.
-#. TRANS: Form legend for revising the answer.
+msgctxt "TITLE"
 msgid "Question"
 msgstr "Question"
 
+#. TRANS: Exception thrown when there are too many activity objects.
 msgid "Too many activity objects."
 msgstr "Les objets d'activité sont trop nombreux."
 
+#. TRANS: Exception thrown when an incorrect object type is encountered.
 msgid "Wrong type for object."
 msgstr "Mauvais type d'objet."
 
+#. TRANS: Exception thrown when answering a non-existing question.
 msgid "Answer to unknown question."
 msgstr "Réponse à une question inconnue."
 
-msgid "Unknown object type received by QnA Plugin."
-msgstr "Le type d'objet reçu par le plugin QnA est inconnu."
-
+#. TRANS: Exception thrown when an object type is encountered that cannot be handled.
 msgid "Unknown object type."
 msgstr "Type d'objet inconnu."
 
+#. TRANS: Exception thrown when requesting a non-existing question notice.
 msgid "Unknown question notice."
-msgstr ""
+msgstr "Avis de question inconnu."
 
 #. TRANS: Exception thrown when performing an unexpected action on a question.
 #. TRANS: %s is the unpexpected object type.
@@ -150,39 +173,69 @@ msgstr ""
 msgid "Unexpected type for QnA plugin: %s."
 msgstr "Type inconnu pour le plugin de QnA : %s"
 
+#. TRANS: Error message displayed when question data is not present.
 msgid "Question data is missing."
 msgstr "Les données de la question sont manquantes."
 
+#. TRANS: Placeholder value for a possible answer to a question
+#. TRANS: by the logged in user.
 msgid "Your answer..."
 msgstr "Votre réponse..."
 
-#. TRANS: Link to full notice text if it is longer than what will be dispplayed.
-#. TRANS: %s a notice URI.
-#, php-format
-msgid "<a href=\"%s\" rel=\"more\" title=\"%s\">…</a>"
-msgstr "<a href=\"%s\" rel=\"more\" title=\"%s\">…</a>"
+#. TRANS: Link description for link to full notice text if it is longer than
+#. TRANS: what will be dispplayed.
+msgid "…"
+msgstr "…"
 
+#. TRANS: Title for link that is an ellipsis in English.
 msgid "more..."
 msgstr "plus..."
 
+#. TRANS: Exception thown when getting a question with a non-existing ID.
+#. TRANS: %s is the non-existing question ID.
 #, php-format
-msgid "%s revisions"
-msgstr "%s révisions"
+msgid "No question with ID %s"
+msgstr "Pas de question avec l'ID %s."
 
+#. TRANS: Exception thown when getting a profile with a non-existing ID.
+#. TRANS: %s is the non-existing profile ID.
+#. TRANS: Exception trown when getting a profile for a non-existing ID.
+#. TRANS: %s is the provided profile ID.
+#, php-format
+msgid "No profile with ID %s"
+msgstr "Aucun profil avec l'ID %s"
+
+#. TRANS: %s is the number of answer revisions.
+#, php-format
+msgid "%s revision"
+msgid_plural "%s revisions"
+msgstr[0] "%s révision"
+msgstr[1] "%s révisions"
+
+#. TRANS: Text for a question that was answered.
+#. TRANS: %1$s is the user that answered, %2$s is the question title,
+#. TRANS: %2$s is the answer content.
 #, php-format
 msgid "%1$s answered the question \"%2$s\": %3$s"
 msgstr "%1$s a répondu à la question \"%2$s\" : %3$s"
 
+#. TRANS: Text for a question that was answered.
+#. TRANS: %s is the question title.
 #. TRANS: Rendered version of the notice content answering a question.
 #. TRANS: %s a link to the question with question title as the link content.
 #, php-format
 msgid "answered \"%s\""
 msgstr "répondu « %s »"
 
+#. TRANS: Number of given answers to a question.
+#. TRANS: %s is the number of given answers.
 #, php-format
-msgid "%s answers"
-msgstr "%s réponses"
+msgid "%s answer"
+msgid_plural "%s answers"
+msgstr[0] "%s réponse"
+msgstr[1] "%s réponses"
 
+#. TRANS: Notification that a question cannot be answered anymore because it is closed.
 msgid "This question is closed."
 msgstr "Cette question est fermée."
 
@@ -192,11 +245,13 @@ msgstr "Cette question est fermée."
 msgid "Question: %s"
 msgstr "Question : %s"
 
+#. TRANS: Button text for submitting a revised answer.
 #. TRANS: Button text for submitting a poll response.
 msgctxt "BUTTON"
 msgid "Submit"
 msgstr "Soumettre"
 
+#. TRANS: Field label.
 msgid "Enter your answer"
 msgstr "Entrez votre réponse."
 
@@ -205,37 +260,48 @@ msgctxt "BUTTON"
 msgid "Answer"
 msgstr "Réponse"
 
+#. TRANS: Field label for a new question.
+msgctxt "LABEL"
 msgid "Title"
 msgstr "Titre"
 
-msgid "Title of your question"
-msgstr "Titre de votre question"
+#. TRANS: Field title for a new question.
+msgid "The title of your question."
+msgstr "Le titre de votre question."
 
+#. TRANS: Field label for question details.
+msgctxt "LABEL"
 msgid "Description"
 msgstr "Description"
 
-msgid "Your question in detail"
-msgstr "Votre question en détail"
+#. TRANS: Field title for question details.
+msgid "Your question in detail."
+msgstr "Votre question en détail."
 
 #. TRANS: Button text for saving a new question.
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Enregistrer"
 
-#. TRANS: Button text for closing a question
+#. TRANS: Form legend for revising the answer.
+msgctxt "LEGEND"
+msgid "Question"
+msgstr "Question"
+
+#. TRANS: Button text for closing a question.
 msgctxt "BUTTON"
 msgid "Close"
 msgstr "Fermer"
 
-#. TRANS: Title for button text for closing a question
-msgid "Close the question"
-msgstr "Fermer la question"
+#. TRANS: Title for button text for closing a question.
+msgid "Close the question to no one can answer it anymore."
+msgstr "Clôturer la question pur que personne ne puisse plus y répondre."
 
-#. TRANS: Button text for marking an answer as "best"
+#. TRANS: Button text for marking an answer as "best".
 msgctxt "BUTTON"
 msgid "Best"
 msgstr "Meilleure"
 
-#. TRANS: Title for button text marking an answer as "best"
-msgid "Mark as best answer"
-msgstr "Marquer comme meilleure réponse"
+#. TRANS: Title for button text marking an answer as "best".
+msgid "Mark this answer as the best answer."
+msgstr "Marquer cette réponse comme la meilleure."
diff --git a/plugins/QnA/locale/gl/LC_MESSAGES/QnA.po b/plugins/QnA/locale/gl/LC_MESSAGES/QnA.po
new file mode 100644
index 0000000000..2a3b359ddb
--- /dev/null
+++ b/plugins/QnA/locale/gl/LC_MESSAGES/QnA.po
@@ -0,0 +1,305 @@
+# Translation of StatusNet - QnA to Galician (galego)
+# Exported from translatewiki.net
+#
+# Author: Toliño
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - QnA\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:44+0000\n"
+"Language-Team: Galician <https://translatewiki.net/wiki/Portal:gl>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2012-01-02 10:10:59+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: gl\n"
+"X-Message-Group: #out-statusnet-plugin-qna\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Title for Question page.
+msgid "New question"
+msgstr "Nova pregunta"
+
+#. TRANS: Client exception thrown trying to create a Question while not logged in.
+msgid "You must be logged in to post a question."
+msgstr "Ten que estar identificado para publicar unha pregunta."
+
+#. TRANS: Client exception thrown trying to create a question without a title.
+msgid "Question must have a title."
+msgstr "A pregunta debe ter un título."
+
+#. TRANS: Page title after sending a notice.
+msgid "Question posted"
+msgstr "Pregunta publicada"
+
+#. TRANS: Client exception thrown when requesting a non-existing answer.
+#. TRANS: Did we used to have it, and it got deleted?
+msgid "No such answer."
+msgstr "Non existe tal resposta."
+
+#. TRANS: Client exception thrown when requesting an answer that has no connected question.
+msgid "No question for this answer."
+msgstr "Non hai pregunta ningunha para esta resposta."
+
+#. TRANS: Client exception thrown when requesting answer data for a non-existing user.
+#. TRANS: Client exception thrown trying to view a question of a non-existing user.
+msgid "No such user."
+msgstr "Non existe tal usuario."
+
+#. TRANS: Client exception thrown when requesting answer data for a user without a profile.
+#. TRANS: Server exception thrown trying to view a question for a user for which the profile could not be loaded.
+msgid "User without a profile."
+msgstr "Usuario sen perfil."
+
+#. TRANS: Page title.
+#. TRANS: %1$s is the user who answered a question, %2$s is the question.
+#, php-format
+msgid "%1$s's answer to \"%2$s\""
+msgstr "Resposta de %1$s a \"%2$s\""
+
+#. TRANS: Page title for revising a question
+msgid "Revise answer"
+msgstr "Revisar a resposta"
+
+#. TRANS: Client exception thrown trying to answer a question while not logged in.
+msgid "You must be logged in to answer to a question."
+msgstr "Ten que estar identificado para responder unha pregunta."
+
+#. TRANS: Client exception thrown trying to respond to a non-existing question.
+msgid "Invalid or missing answer."
+msgstr "Falta a resposta ou esta é inválida."
+
+#. TRANS: Page title after sending an answer.
+#. TRANS: Page title for and answer to a question.
+#. TRANS: Form legend for showing the answer.
+msgid "Answer"
+msgstr "Resposta"
+
+#. TRANS: Form title for sending an answer.
+msgctxt "TITLE"
+msgid "Answer"
+msgstr "Resposta"
+
+#. TRANS: Client exception thrown trying to view a non-existing question.
+msgid "No such question."
+msgstr "Non existe esa pregunta."
+
+#. TRANS: Client exception thrown trying to view a non-existing question notice.
+msgid "No such question notice."
+msgstr "Non existe a nota desa pregunta."
+
+#. TRANS: Page title for a question.
+#. TRANS: %1$s is the nickname of the user who asked the question, %2$s is the question.
+#, php-format
+msgid "%1$s's question: %2$s"
+msgstr "Pregunta de %1$s: %2$s"
+
+#. TRANS: Page title for close a question
+msgid "Close question"
+msgstr "Pechar unha pregunta"
+
+#. TRANS: Client exception thrown trying to close a question when not logged in
+msgid "You must be logged in to close a question."
+msgstr "Ten que estar identificado para pechar unha pregunta."
+
+#. TRANS: Client exception thrown trying to respond to a non-existing question.
+msgid "Invalid or missing question."
+msgstr "Falta a pregunta ou esta é inválida."
+
+#. TRANS: Exception thrown trying to close another user's question.
+msgid "You did not ask this question."
+msgstr "Vostede non formulou esta pregunta."
+
+#. TRANS: Page title after sending an answer.
+#. TRANS: Page title after sending in a vote for a question or answer.
+msgid "Answers"
+msgstr "Respostas"
+
+#. TRANS: Page title after an AJAX error occurs on the post answer page.
+msgid "Ajax Error"
+msgstr "Houbo un erro de AJAX"
+
+#. TRANS: Title for form to send answer to a question.
+msgctxt "TITLE"
+msgid "Your answer"
+msgstr "A súa resposta"
+
+#. TRANS: Error message displayed when an answer has no content.
+#. TRANS: Error message displayed when answer data is not present.
+msgid "Answer data is missing."
+msgstr "Faltan os datos da resposta."
+
+#. TRANS: Plugin description.
+msgid "Question and Answers micro-app."
+msgstr "Microaplicación de preguntas e respostas."
+
+#. TRANS: Application title.
+msgctxt "TITLE"
+msgid "Question"
+msgstr "Pregunta"
+
+#. TRANS: Exception thrown when there are too many activity objects.
+msgid "Too many activity objects."
+msgstr "Demasiados obxectos de actividade."
+
+#. TRANS: Exception thrown when an incorrect object type is encountered.
+msgid "Wrong type for object."
+msgstr "Tipo incorrecto para o obxecto."
+
+#. TRANS: Exception thrown when answering a non-existing question.
+msgid "Answer to unknown question."
+msgstr "Resposta a unha pregunta descoñecida."
+
+#. TRANS: Exception thrown when an object type is encountered that cannot be handled.
+msgid "Unknown object type."
+msgstr "Tipo de obxecto descoñecido."
+
+#. TRANS: Exception thrown when requesting a non-existing question notice.
+msgid "Unknown question notice."
+msgstr "Nota de pregunta descoñecida."
+
+#. TRANS: Exception thrown when performing an unexpected action on a question.
+#. TRANS: %s is the unpexpected object type.
+#, php-format
+msgid "Unexpected type for QnA plugin: %s."
+msgstr ""
+"Tipo inesperado para o complemento da microaplicación de preguntas e "
+"respostas: %s."
+
+#. TRANS: Error message displayed when question data is not present.
+msgid "Question data is missing."
+msgstr "Faltan os datos da pregunta."
+
+#. TRANS: Placeholder value for a possible answer to a question
+#. TRANS: by the logged in user.
+msgid "Your answer..."
+msgstr "A súa resposta..."
+
+#. TRANS: Link description for link to full notice text if it is longer than
+#. TRANS: what will be dispplayed.
+msgid "…"
+msgstr "…"
+
+#. TRANS: Title for link that is an ellipsis in English.
+msgid "more..."
+msgstr "máis..."
+
+#. TRANS: Exception thown when getting a question with a non-existing ID.
+#. TRANS: %s is the non-existing question ID.
+#, php-format
+msgid "No question with ID %s"
+msgstr "Non hai ningunha pregunta co ID %s"
+
+#. TRANS: Exception thown when getting a profile with a non-existing ID.
+#. TRANS: %s is the non-existing profile ID.
+#. TRANS: Exception trown when getting a profile for a non-existing ID.
+#. TRANS: %s is the provided profile ID.
+#, php-format
+msgid "No profile with ID %s"
+msgstr "Non hai ningún perfil co ID %s"
+
+#. TRANS: %s is the number of answer revisions.
+#, php-format
+msgid "%s revision"
+msgid_plural "%s revisions"
+msgstr[0] "%s revisión"
+msgstr[1] "%s revisións"
+
+#. TRANS: Text for a question that was answered.
+#. TRANS: %1$s is the user that answered, %2$s is the question title,
+#. TRANS: %2$s is the answer content.
+#, php-format
+msgid "%1$s answered the question \"%2$s\": %3$s"
+msgstr "%1$s respondeu a pregunta \"%2$s\": %3$s"
+
+#. TRANS: Text for a question that was answered.
+#. TRANS: %s is the question title.
+#. TRANS: Rendered version of the notice content answering a question.
+#. TRANS: %s a link to the question with question title as the link content.
+#, php-format
+msgid "answered \"%s\""
+msgstr "respondeu \"%s\""
+
+#. TRANS: Number of given answers to a question.
+#. TRANS: %s is the number of given answers.
+#, php-format
+msgid "%s answer"
+msgid_plural "%s answers"
+msgstr[0] "%s resposta"
+msgstr[1] "%s respostas"
+
+#. TRANS: Notification that a question cannot be answered anymore because it is closed.
+msgid "This question is closed."
+msgstr "Esta pregunta está pechada."
+
+#. TRANS: Rendered version of the notice content creating a question.
+#. TRANS: %s a link to the question as link description.
+#, php-format
+msgid "Question: %s"
+msgstr "Pregunta: %s"
+
+#. TRANS: Button text for submitting a revised answer.
+#. TRANS: Button text for submitting a poll response.
+msgctxt "BUTTON"
+msgid "Submit"
+msgstr "Enviar"
+
+#. TRANS: Field label.
+msgid "Enter your answer"
+msgstr "Insira a súa resposta"
+
+#. TRANS: Button text for submitting a poll response.
+msgctxt "BUTTON"
+msgid "Answer"
+msgstr "Responder"
+
+#. TRANS: Field label for a new question.
+msgctxt "LABEL"
+msgid "Title"
+msgstr "Título"
+
+#. TRANS: Field title for a new question.
+msgid "The title of your question."
+msgstr "O título da súa pregunta."
+
+#. TRANS: Field label for question details.
+msgctxt "LABEL"
+msgid "Description"
+msgstr "Descrición"
+
+#. TRANS: Field title for question details.
+msgid "Your question in detail."
+msgstr "Os detalles da súa pregunta."
+
+#. TRANS: Button text for saving a new question.
+msgctxt "BUTTON"
+msgid "Save"
+msgstr "Gardar"
+
+#. TRANS: Form legend for revising the answer.
+msgctxt "LEGEND"
+msgid "Question"
+msgstr "Pregunta"
+
+#. TRANS: Button text for closing a question.
+msgctxt "BUTTON"
+msgid "Close"
+msgstr "Pechar"
+
+#. TRANS: Title for button text for closing a question.
+msgid "Close the question to no one can answer it anymore."
+msgstr "Pechar a pregunta de xeito que ninguén poida enviar máis respostas."
+
+#. TRANS: Button text for marking an answer as "best".
+msgctxt "BUTTON"
+msgid "Best"
+msgstr "Mellor"
+
+#. TRANS: Title for button text marking an answer as "best".
+msgid "Mark this answer as the best answer."
+msgstr "Marcar esta resposta como a mellor."
diff --git a/plugins/QnA/locale/ia/LC_MESSAGES/QnA.po b/plugins/QnA/locale/ia/LC_MESSAGES/QnA.po
index a28d18e0cf..a7c1b74780 100644
--- a/plugins/QnA/locale/ia/LC_MESSAGES/QnA.po
+++ b/plugins/QnA/locale/ia/LC_MESSAGES/QnA.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - QnA to Interlingua (Interlingua)
+# Translation of StatusNet - QnA to Interlingua (interlingua)
 # Exported from translatewiki.net
 #
 # Author: McDutchie
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - QnA\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:58+0000\n"
-"Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:44+0000\n"
+"Language-Team: Interlingua <https://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:49+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2012-01-02 10:10:59+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-qna\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -25,6 +25,7 @@ msgstr ""
 msgid "New question"
 msgstr "Nove question"
 
+#. TRANS: Client exception thrown trying to create a Question while not logged in.
 msgid "You must be logged in to post a question."
 msgstr "Tu debe aperir un session pro poner un question."
 
@@ -36,16 +37,21 @@ msgstr "Le question debe haber un titulo."
 msgid "Question posted"
 msgstr "Question ponite"
 
+#. TRANS: Client exception thrown when requesting a non-existing answer.
+#. TRANS: Did we used to have it, and it got deleted?
 msgid "No such answer."
 msgstr "Iste responsa non existe."
 
+#. TRANS: Client exception thrown when requesting an answer that has no connected question.
 msgid "No question for this answer."
 msgstr "Il non ha un question pro iste responsa."
 
+#. TRANS: Client exception thrown when requesting answer data for a non-existing user.
 #. TRANS: Client exception thrown trying to view a question of a non-existing user.
 msgid "No such user."
 msgstr "Iste usator non existe."
 
+#. TRANS: Client exception thrown when requesting answer data for a user without a profile.
 #. TRANS: Server exception thrown trying to view a question for a user for which the profile could not be loaded.
 msgid "User without a profile."
 msgstr "Usator sin profilo."
@@ -64,6 +70,7 @@ msgstr "Revider responsa"
 msgid "You must be logged in to answer to a question."
 msgstr "Tu debe aperir un session pro responder a un question."
 
+#. TRANS: Client exception thrown trying to respond to a non-existing question.
 msgid "Invalid or missing answer."
 msgstr "Responsa invalide o mancante."
 
@@ -73,6 +80,11 @@ msgstr "Responsa invalide o mancante."
 msgid "Answer"
 msgstr "Responsa"
 
+#. TRANS: Form title for sending an answer.
+msgctxt "TITLE"
+msgid "Answer"
+msgstr "Responsa"
+
 #. TRANS: Client exception thrown trying to view a non-existing question.
 msgid "No such question."
 msgstr "Iste question non existe."
@@ -81,6 +93,8 @@ msgstr "Iste question non existe."
 msgid "No such question notice."
 msgstr "Iste nota de question non existe."
 
+#. TRANS: Page title for a question.
+#. TRANS: %1$s is the nickname of the user who asked the question, %2$s is the question.
 #, php-format
 msgid "%1$s's question: %2$s"
 msgstr "Question de %1$s: %2$s"
@@ -89,6 +103,7 @@ msgstr "Question de %1$s: %2$s"
 msgid "Close question"
 msgstr "Clauder question"
 
+#. TRANS: Client exception thrown trying to close a question when not logged in
 msgid "You must be logged in to close a question."
 msgstr "Tu debe aperir un session pro clauder un question."
 
@@ -96,10 +111,12 @@ msgstr "Tu debe aperir un session pro clauder un question."
 msgid "Invalid or missing question."
 msgstr "Question invalide o mancante."
 
-msgid "You didn't ask this question."
+#. TRANS: Exception thrown trying to close another user's question.
+msgid "You did not ask this question."
 msgstr "Non es tu qui poneva iste question."
 
 #. TRANS: Page title after sending an answer.
+#. TRANS: Page title after sending in a vote for a question or answer.
 msgid "Answers"
 msgstr "Responsas"
 
@@ -112,6 +129,8 @@ msgctxt "TITLE"
 msgid "Your answer"
 msgstr "Tu responsa"
 
+#. TRANS: Error message displayed when an answer has no content.
+#. TRANS: Error message displayed when answer data is not present.
 msgid "Answer data is missing."
 msgstr "Le datos del responsa manca."
 
@@ -120,25 +139,27 @@ msgid "Question and Answers micro-app."
 msgstr "Microapplication pro questiones e responsas."
 
 #. TRANS: Application title.
-#. TRANS: Form legend for revising the answer.
+msgctxt "TITLE"
 msgid "Question"
 msgstr "Question"
 
+#. TRANS: Exception thrown when there are too many activity objects.
 msgid "Too many activity objects."
 msgstr "Troppo de objectos de activitate."
 
+#. TRANS: Exception thrown when an incorrect object type is encountered.
 msgid "Wrong type for object."
 msgstr "Typo errate pro iste objecto."
 
+#. TRANS: Exception thrown when answering a non-existing question.
 msgid "Answer to unknown question."
 msgstr "Responsa a un question incognite."
 
-msgid "Unknown object type received by QnA Plugin."
-msgstr "Typo de objecto incognite recipite per le plug-in Q&R."
-
+#. TRANS: Exception thrown when an object type is encountered that cannot be handled.
 msgid "Unknown object type."
 msgstr "Typo de objecto incognite."
 
+#. TRANS: Exception thrown when requesting a non-existing question notice.
 msgid "Unknown question notice."
 msgstr "Nota de question incognite."
 
@@ -148,39 +169,69 @@ msgstr "Nota de question incognite."
 msgid "Unexpected type for QnA plugin: %s."
 msgstr "Typo inexpectate pro plug-in Q&R: %s."
 
+#. TRANS: Error message displayed when question data is not present.
 msgid "Question data is missing."
 msgstr "Le datos del question manca."
 
+#. TRANS: Placeholder value for a possible answer to a question
+#. TRANS: by the logged in user.
 msgid "Your answer..."
 msgstr "Tu responsa..."
 
-#. TRANS: Link to full notice text if it is longer than what will be dispplayed.
-#. TRANS: %s a notice URI.
-#, php-format
-msgid "<a href=\"%s\" rel=\"more\" title=\"%s\">…</a>"
-msgstr "<a href=\"%s\" rel=\"more\" title=\"%s\">…</a>"
+#. TRANS: Link description for link to full notice text if it is longer than
+#. TRANS: what will be dispplayed.
+msgid "…"
+msgstr "…"
 
+#. TRANS: Title for link that is an ellipsis in English.
 msgid "more..."
 msgstr "plus..."
 
+#. TRANS: Exception thown when getting a question with a non-existing ID.
+#. TRANS: %s is the non-existing question ID.
 #, php-format
-msgid "%s revisions"
-msgstr "%s versiones"
+msgid "No question with ID %s"
+msgstr "Il non ha un question con le ID %s"
 
+#. TRANS: Exception thown when getting a profile with a non-existing ID.
+#. TRANS: %s is the non-existing profile ID.
+#. TRANS: Exception trown when getting a profile for a non-existing ID.
+#. TRANS: %s is the provided profile ID.
+#, php-format
+msgid "No profile with ID %s"
+msgstr "Non existe un profilo con le ID %s"
+
+#. TRANS: %s is the number of answer revisions.
+#, php-format
+msgid "%s revision"
+msgid_plural "%s revisions"
+msgstr[0] "%s version"
+msgstr[1] "%s versiones"
+
+#. TRANS: Text for a question that was answered.
+#. TRANS: %1$s is the user that answered, %2$s is the question title,
+#. TRANS: %2$s is the answer content.
 #, php-format
 msgid "%1$s answered the question \"%2$s\": %3$s"
 msgstr "%1$s respondeva al question \"%2$s\": %3$s"
 
+#. TRANS: Text for a question that was answered.
+#. TRANS: %s is the question title.
 #. TRANS: Rendered version of the notice content answering a question.
 #. TRANS: %s a link to the question with question title as the link content.
 #, php-format
 msgid "answered \"%s\""
 msgstr "respondeva a \"%s\""
 
+#. TRANS: Number of given answers to a question.
+#. TRANS: %s is the number of given answers.
 #, php-format
-msgid "%s answers"
-msgstr "%s responsas"
+msgid "%s answer"
+msgid_plural "%s answers"
+msgstr[0] "%s responsa"
+msgstr[1] "%s responsas"
 
+#. TRANS: Notification that a question cannot be answered anymore because it is closed.
 msgid "This question is closed."
 msgstr "Iste question es claudite."
 
@@ -190,11 +241,13 @@ msgstr "Iste question es claudite."
 msgid "Question: %s"
 msgstr "Question: %s"
 
+#. TRANS: Button text for submitting a revised answer.
 #. TRANS: Button text for submitting a poll response.
 msgctxt "BUTTON"
 msgid "Submit"
 msgstr "Submitter"
 
+#. TRANS: Field label.
 msgid "Enter your answer"
 msgstr "Entra tu responsa"
 
@@ -203,37 +256,48 @@ msgctxt "BUTTON"
 msgid "Answer"
 msgstr "Responsa"
 
+#. TRANS: Field label for a new question.
+msgctxt "LABEL"
 msgid "Title"
 msgstr "Titulo"
 
-msgid "Title of your question"
-msgstr "Titulo de tu question"
+#. TRANS: Field title for a new question.
+msgid "The title of your question."
+msgstr "Le titulo de tu question."
 
+#. TRANS: Field label for question details.
+msgctxt "LABEL"
 msgid "Description"
 msgstr "Description"
 
-msgid "Your question in detail"
-msgstr "Tu question in detalio"
+#. TRANS: Field title for question details.
+msgid "Your question in detail."
+msgstr "Le detalios de tu question."
 
 #. TRANS: Button text for saving a new question.
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Salveguardar"
 
-#. TRANS: Button text for closing a question
+#. TRANS: Form legend for revising the answer.
+msgctxt "LEGEND"
+msgid "Question"
+msgstr "Question"
+
+#. TRANS: Button text for closing a question.
 msgctxt "BUTTON"
 msgid "Close"
 msgstr "Clauder"
 
-#. TRANS: Title for button text for closing a question
-msgid "Close the question"
-msgstr "Clauder le question"
+#. TRANS: Title for button text for closing a question.
+msgid "Close the question to no one can answer it anymore."
+msgstr "Clauder le question de sorta que nemo pote responder plus."
 
-#. TRANS: Button text for marking an answer as "best"
+#. TRANS: Button text for marking an answer as "best".
 msgctxt "BUTTON"
 msgid "Best"
 msgstr "Optime"
 
-#. TRANS: Title for button text marking an answer as "best"
-msgid "Mark as best answer"
-msgstr "Marcar como le melior responsa"
+#. TRANS: Title for button text marking an answer as "best".
+msgid "Mark this answer as the best answer."
+msgstr "Marcar iste responsa como le melior responsa."
diff --git a/plugins/QnA/locale/ja/LC_MESSAGES/QnA.po b/plugins/QnA/locale/ja/LC_MESSAGES/QnA.po
new file mode 100644
index 0000000000..9fe1fbc014
--- /dev/null
+++ b/plugins/QnA/locale/ja/LC_MESSAGES/QnA.po
@@ -0,0 +1,302 @@
+# Translation of StatusNet - QnA to Japanese (日本語)
+# Exported from translatewiki.net
+#
+# Author: Miwa ka
+# Author: Shirayuki
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - QnA\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:44+0000\n"
+"Language-Team: Japanese <https://translatewiki.net/wiki/Portal:ja>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2012-01-02 10:10:59+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: ja\n"
+"X-Message-Group: #out-statusnet-plugin-qna\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#. TRANS: Title for Question page.
+msgid "New question"
+msgstr "新��質�"
+
+#. TRANS: Client exception thrown trying to create a Question while not logged in.
+msgid "You must be logged in to post a question."
+msgstr "質�を投稿�る��ログイン�る必���り��"
+
+#. TRANS: Client exception thrown trying to create a question without a title.
+msgid "Question must have a title."
+msgstr "質��タイトル�必���"
+
+#. TRANS: Page title after sending a notice.
+msgid "Question posted"
+msgstr "質��投稿"
+
+#. TRANS: Client exception thrown when requesting a non-existing answer.
+#. TRANS: Did we used to have it, and it got deleted?
+msgid "No such answer."
+msgstr "��よ��回答��り��ん"
+
+#. TRANS: Client exception thrown when requesting an answer that has no connected question.
+msgid "No question for this answer."
+msgstr "��回答�質���り��ん"
+
+#. TRANS: Client exception thrown when requesting answer data for a non-existing user.
+#. TRANS: Client exception thrown trying to view a question of a non-existing user.
+msgid "No such user."
+msgstr "��よ��ユーザー����ん"
+
+#. TRANS: Client exception thrown when requesting answer data for a user without a profile.
+#. TRANS: Server exception thrown trying to view a question for a user for which the profile could not be loaded.
+msgid "User without a profile."
+msgstr "プロファイル���ユーザー��"
+
+#. TRANS: Page title.
+#. TRANS: %1$s is the user who answered a question, %2$s is the question.
+#, php-format
+msgid "%1$s's answer to \"%2$s\""
+msgstr "\"%2$s\" �対�る %1$s �回答"
+
+#. TRANS: Page title for revising a question
+msgid "Revise answer"
+msgstr "回答を修正"
+
+#. TRANS: Client exception thrown trying to answer a question while not logged in.
+msgid "You must be logged in to answer to a question."
+msgstr "質��回答�る��ログイン�る必���り��"
+
+#. TRANS: Client exception thrown trying to respond to a non-existing question.
+msgid "Invalid or missing answer."
+msgstr "無効���正����回答��"
+
+#. TRANS: Page title after sending an answer.
+#. TRANS: Page title for and answer to a question.
+#. TRANS: Form legend for showing the answer.
+msgid "Answer"
+msgstr "回答"
+
+#. TRANS: Form title for sending an answer.
+msgctxt "TITLE"
+msgid "Answer"
+msgstr "回答"
+
+#. TRANS: Client exception thrown trying to view a non-existing question.
+msgid "No such question."
+msgstr "��よ��質���り��ん"
+
+#. TRANS: Client exception thrown trying to view a non-existing question notice.
+msgid "No such question notice."
+msgstr "��よ��質����や���り��ん"
+
+#. TRANS: Page title for a question.
+#. TRANS: %1$s is the nickname of the user who asked the question, %2$s is the question.
+#, php-format
+msgid "%1$s's question: %2$s"
+msgstr "%1$s �質�: %2$s"
+
+#. TRANS: Page title for close a question
+msgid "Close question"
+msgstr "質�をクローズ"
+
+#. TRANS: Client exception thrown trying to close a question when not logged in
+msgid "You must be logged in to close a question."
+msgstr "質�をクローズ�る��ログイン�る必���り��"
+
+#. TRANS: Client exception thrown trying to respond to a non-existing question.
+msgid "Invalid or missing question."
+msgstr "無効���正����質���"
+
+#. TRANS: Exception thrown trying to close another user's question.
+msgid "You did not ask this question."
+msgstr "������質�を�����ん"
+
+#. TRANS: Page title after sending an answer.
+#. TRANS: Page title after sending in a vote for a question or answer.
+msgid "Answers"
+msgstr "回答"
+
+#. TRANS: Page title after an AJAX error occurs on the post answer page.
+msgid "Ajax Error"
+msgstr "Ajax エラー"
+
+#. TRANS: Title for form to send answer to a question.
+msgctxt "TITLE"
+msgid "Your answer"
+msgstr "����回答"
+
+#. TRANS: Error message displayed when an answer has no content.
+#. TRANS: Error message displayed when answer data is not present.
+msgid "Answer data is missing."
+msgstr "回答データ�正���り��ん"
+
+#. TRANS: Plugin description.
+msgid "Question and Answers micro-app."
+msgstr "質��回答�マイクロアプリケーション"
+
+#. TRANS: Application title.
+msgctxt "TITLE"
+msgid "Question"
+msgstr "質�"
+
+#. TRANS: Exception thrown when there are too many activity objects.
+msgid "Too many activity objects."
+msgstr ""
+
+#. TRANS: Exception thrown when an incorrect object type is encountered.
+msgid "Wrong type for object."
+msgstr "オブジェクト�型�間������"
+
+#. TRANS: Exception thrown when answering a non-existing question.
+msgid "Answer to unknown question."
+msgstr "�明�質��対�る回答��"
+
+#. TRANS: Exception thrown when an object type is encountered that cannot be handled.
+msgid "Unknown object type."
+msgstr "�明�オブジェクト�型"
+
+#. TRANS: Exception thrown when requesting a non-existing question notice.
+msgid "Unknown question notice."
+msgstr "�明�質����や�"
+
+#. TRANS: Exception thrown when performing an unexpected action on a question.
+#. TRANS: %s is the unpexpected object type.
+#, php-format
+msgid "Unexpected type for QnA plugin: %s."
+msgstr "QnA プラグイン�予期���型: %s"
+
+#. TRANS: Error message displayed when question data is not present.
+msgid "Question data is missing."
+msgstr "質�データ��り��ん"
+
+#. TRANS: Placeholder value for a possible answer to a question
+#. TRANS: by the logged in user.
+msgid "Your answer..."
+msgstr "����回答..."
+
+#. TRANS: Link description for link to full notice text if it is longer than
+#. TRANS: what will be dispplayed.
+msgid "…"
+msgstr "…"
+
+#. TRANS: Title for link that is an ellipsis in English.
+msgid "more..."
+msgstr "も��..."
+
+#. TRANS: Exception thown when getting a question with a non-existing ID.
+#. TRANS: %s is the non-existing question ID.
+#, php-format
+msgid "No question with ID %s"
+msgstr "ID %s �質���り��ん"
+
+#. TRANS: Exception thown when getting a profile with a non-existing ID.
+#. TRANS: %s is the non-existing profile ID.
+#. TRANS: Exception trown when getting a profile for a non-existing ID.
+#. TRANS: %s is the provided profile ID.
+#, php-format
+msgid "No profile with ID %s"
+msgstr "ID �プロファイル��り��ん: %s"
+
+#. TRANS: %s is the number of answer revisions.
+#, php-format
+msgid "%s revision"
+msgid_plural "%s revisions"
+msgstr[0] ""
+
+#. TRANS: Text for a question that was answered.
+#. TRANS: %1$s is the user that answered, %2$s is the question title,
+#. TRANS: %2$s is the answer content.
+#, php-format
+msgid "%1$s answered the question \"%2$s\": %3$s"
+msgstr "質� \"%2$s\" �対�る %1$s �回答: %3$s"
+
+#. TRANS: Text for a question that was answered.
+#. TRANS: %s is the question title.
+#. TRANS: Rendered version of the notice content answering a question.
+#. TRANS: %s a link to the question with question title as the link content.
+#, php-format
+msgid "answered \"%s\""
+msgstr "回答 \"%s\""
+
+#. TRANS: Number of given answers to a question.
+#. TRANS: %s is the number of given answers.
+#, php-format
+msgid "%s answer"
+msgid_plural "%s answers"
+msgstr[0] ""
+
+#. TRANS: Notification that a question cannot be answered anymore because it is closed.
+msgid "This question is closed."
+msgstr "��質��クローズ����"
+
+#. TRANS: Rendered version of the notice content creating a question.
+#. TRANS: %s a link to the question as link description.
+#, php-format
+msgid "Question: %s"
+msgstr "質�: %s"
+
+#. TRANS: Button text for submitting a revised answer.
+#. TRANS: Button text for submitting a poll response.
+msgctxt "BUTTON"
+msgid "Submit"
+msgstr "�信"
+
+#. TRANS: Field label.
+msgid "Enter your answer"
+msgstr "回答を入力������"
+
+#. TRANS: Button text for submitting a poll response.
+msgctxt "BUTTON"
+msgid "Answer"
+msgstr "回答"
+
+#. TRANS: Field label for a new question.
+msgctxt "LABEL"
+msgid "Title"
+msgstr "タイトル"
+
+#. TRANS: Field title for a new question.
+msgid "The title of your question."
+msgstr "質��タイトル"
+
+#. TRANS: Field label for question details.
+msgctxt "LABEL"
+msgid "Description"
+msgstr "説明"
+
+#. TRANS: Field title for question details.
+msgid "Your question in detail."
+msgstr "質��詳細"
+
+#. TRANS: Button text for saving a new question.
+msgctxt "BUTTON"
+msgid "Save"
+msgstr "�存"
+
+#. TRANS: Form legend for revising the answer.
+msgctxt "LEGEND"
+msgid "Question"
+msgstr "質�"
+
+#. TRANS: Button text for closing a question.
+msgctxt "BUTTON"
+msgid "Close"
+msgstr "クローズ"
+
+#. TRANS: Title for button text for closing a question.
+msgid "Close the question to no one can answer it anymore."
+msgstr "も�回答����よ��質�をクローズ�る。"
+
+#. TRANS: Button text for marking an answer as "best".
+msgctxt "BUTTON"
+msgid "Best"
+msgstr "ベスト"
+
+#. TRANS: Title for button text marking an answer as "best".
+msgid "Mark this answer as the best answer."
+msgstr "ベスト�回答�マーク�る"
diff --git a/plugins/QnA/locale/mk/LC_MESSAGES/QnA.po b/plugins/QnA/locale/mk/LC_MESSAGES/QnA.po
index ffbb863a82..7f916d81ce 100644
--- a/plugins/QnA/locale/mk/LC_MESSAGES/QnA.po
+++ b/plugins/QnA/locale/mk/LC_MESSAGES/QnA.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - QnA to Macedonian (Македон�ки)
+# Translation of StatusNet - QnA to Macedonian (македон�ки)
 # Exported from translatewiki.net
 #
 # Author: Bjankuloski06
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - QnA\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:58+0000\n"
-"Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:44+0000\n"
+"Language-Team: Macedonian <https://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:49+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2012-01-02 10:10:59+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-qna\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
@@ -25,6 +25,7 @@ msgstr ""
 msgid "New question"
 msgstr "�ово прашање"
 
+#. TRANS: Client exception thrown trying to create a Question while not logged in.
 msgid "You must be logged in to post a question."
 msgstr "Мора да �те најавени за да по�тавувате прашања."
 
@@ -36,16 +37,21 @@ msgstr "Прашањето мора да има на�лов."
 msgid "Question posted"
 msgstr "Прашањето е по�тавено"
 
+#. TRANS: Client exception thrown when requesting a non-existing answer.
+#. TRANS: Did we used to have it, and it got deleted?
 msgid "No such answer."
 msgstr "�ема таков одговор."
 
+#. TRANS: Client exception thrown when requesting an answer that has no connected question.
 msgid "No question for this answer."
 msgstr "�ема прашање за овој одговор."
 
+#. TRANS: Client exception thrown when requesting answer data for a non-existing user.
 #. TRANS: Client exception thrown trying to view a question of a non-existing user.
 msgid "No such user."
 msgstr "�ема таков кори�ник."
 
+#. TRANS: Client exception thrown when requesting answer data for a user without a profile.
 #. TRANS: Server exception thrown trying to view a question for a user for which the profile could not be loaded.
 msgid "User without a profile."
 msgstr "Кори�никот е без профил."
@@ -64,6 +70,7 @@ msgstr "Прегледајте го одговорот"
 msgid "You must be logged in to answer to a question."
 msgstr "Мора да �те најавени за да одговарате на прашања."
 
+#. TRANS: Client exception thrown trying to respond to a non-existing question.
 msgid "Invalid or missing answer."
 msgstr "�еважечки или непо�тоечки одговор."
 
@@ -73,6 +80,11 @@ msgstr "�еважечки или непо�тоечки одговор."
 msgid "Answer"
 msgstr "Одговор"
 
+#. TRANS: Form title for sending an answer.
+msgctxt "TITLE"
+msgid "Answer"
+msgstr "Одговор"
+
 #. TRANS: Client exception thrown trying to view a non-existing question.
 msgid "No such question."
 msgstr "�ема такво прашање."
@@ -81,6 +93,8 @@ msgstr "�ема такво прашање."
 msgid "No such question notice."
 msgstr "�ема таква забелешка �о прашање."
 
+#. TRANS: Page title for a question.
+#. TRANS: %1$s is the nickname of the user who asked the question, %2$s is the question.
 #, php-format
 msgid "%1$s's question: %2$s"
 msgstr "Прашање на %1$s: %2$s"
@@ -89,6 +103,7 @@ msgstr "Прашање на %1$s: %2$s"
 msgid "Close question"
 msgstr "Затворете го прашањето"
 
+#. TRANS: Client exception thrown trying to close a question when not logged in
 msgid "You must be logged in to close a question."
 msgstr "Мора да �те најавени за да затворате прашања."
 
@@ -96,10 +111,12 @@ msgstr "Мора да �те најавени за да затворате пр
 msgid "Invalid or missing question."
 msgstr "�еважечко или непо�тоечко прашање."
 
-msgid "You didn't ask this question."
-msgstr "Вие не го по�тавивте ова прашање."
+#. TRANS: Exception thrown trying to close another user's question.
+msgid "You did not ask this question."
+msgstr "Ова прашање не го по�тавивте Вие."
 
 #. TRANS: Page title after sending an answer.
+#. TRANS: Page title after sending in a vote for a question or answer.
 msgid "Answers"
 msgstr "Одговори"
 
@@ -112,6 +129,8 @@ msgctxt "TITLE"
 msgid "Your answer"
 msgstr "Вашиот одговор"
 
+#. TRANS: Error message displayed when an answer has no content.
+#. TRANS: Error message displayed when answer data is not present.
 msgid "Answer data is missing."
 msgstr "Податоците за одговор недо�та�уваат."
 
@@ -120,25 +139,27 @@ msgid "Question and Answers micro-app."
 msgstr "Приложен микропрограм за прашања и одговори."
 
 #. TRANS: Application title.
-#. TRANS: Form legend for revising the answer.
+msgctxt "TITLE"
 msgid "Question"
 msgstr "Прашање"
 
+#. TRANS: Exception thrown when there are too many activity objects.
 msgid "Too many activity objects."
 msgstr "Премногу објекти на активно�т."
 
+#. TRANS: Exception thrown when an incorrect object type is encountered.
 msgid "Wrong type for object."
 msgstr "Погрешен тип на објект."
 
+#. TRANS: Exception thrown when answering a non-existing question.
 msgid "Answer to unknown question."
 msgstr "Одговор на непознато прашање."
 
-msgid "Unknown object type received by QnA Plugin."
-msgstr "Од приклучокот QnA Plugin добив објект од непознат тип."
-
+#. TRANS: Exception thrown when an object type is encountered that cannot be handled.
 msgid "Unknown object type."
 msgstr "�епознат тип на објект."
 
+#. TRANS: Exception thrown when requesting a non-existing question notice.
 msgid "Unknown question notice."
 msgstr "�епозната забелешка �о прашање."
 
@@ -148,39 +169,69 @@ msgstr "�епозната забелешка �о прашање."
 msgid "Unexpected type for QnA plugin: %s."
 msgstr "�еочекуван тип на приклучок за прашања и одговори: %s."
 
+#. TRANS: Error message displayed when question data is not present.
 msgid "Question data is missing."
 msgstr "Прашалните податоци недо�та�уваат."
 
+#. TRANS: Placeholder value for a possible answer to a question
+#. TRANS: by the logged in user.
 msgid "Your answer..."
 msgstr "Вашиот одговор..."
 
-#. TRANS: Link to full notice text if it is longer than what will be dispplayed.
-#. TRANS: %s a notice URI.
-#, php-format
-msgid "<a href=\"%s\" rel=\"more\" title=\"%s\">…</a>"
-msgstr "<a href=\"%s\" rel=\"more\" title=\"%s\">…</a>"
+#. TRANS: Link description for link to full notice text if it is longer than
+#. TRANS: what will be dispplayed.
+msgid "…"
+msgstr "…"
 
+#. TRANS: Title for link that is an ellipsis in English.
 msgid "more..."
 msgstr "!повеќе..."
 
+#. TRANS: Exception thown when getting a question with a non-existing ID.
+#. TRANS: %s is the non-existing question ID.
 #, php-format
-msgid "%s revisions"
-msgstr "%s ревизии"
+msgid "No question with ID %s"
+msgstr "�ема прашање �о назнаката %s"
 
+#. TRANS: Exception thown when getting a profile with a non-existing ID.
+#. TRANS: %s is the non-existing profile ID.
+#. TRANS: Exception trown when getting a profile for a non-existing ID.
+#. TRANS: %s is the provided profile ID.
+#, php-format
+msgid "No profile with ID %s"
+msgstr "�ема профил �о назнака %s"
+
+#. TRANS: %s is the number of answer revisions.
+#, php-format
+msgid "%s revision"
+msgid_plural "%s revisions"
+msgstr[0] "%s ревизија"
+msgstr[1] "%s ревизии"
+
+#. TRANS: Text for a question that was answered.
+#. TRANS: %1$s is the user that answered, %2$s is the question title,
+#. TRANS: %2$s is the answer content.
 #, php-format
 msgid "%1$s answered the question \"%2$s\": %3$s"
 msgstr "%1$s одговори на прашањето „%2$s“: %3$s"
 
+#. TRANS: Text for a question that was answered.
+#. TRANS: %s is the question title.
 #. TRANS: Rendered version of the notice content answering a question.
 #. TRANS: %s a link to the question with question title as the link content.
 #, php-format
 msgid "answered \"%s\""
 msgstr "одговори на „%s“"
 
+#. TRANS: Number of given answers to a question.
+#. TRANS: %s is the number of given answers.
 #, php-format
-msgid "%s answers"
-msgstr "%s одговори"
+msgid "%s answer"
+msgid_plural "%s answers"
+msgstr[0] "%s одговор"
+msgstr[1] "%s одговори"
 
+#. TRANS: Notification that a question cannot be answered anymore because it is closed.
 msgid "This question is closed."
 msgstr "Ова прашање е затворено."
 
@@ -190,11 +241,13 @@ msgstr "Ова прашање е затворено."
 msgid "Question: %s"
 msgstr "Прашање: %s"
 
+#. TRANS: Button text for submitting a revised answer.
 #. TRANS: Button text for submitting a poll response.
 msgctxt "BUTTON"
 msgid "Submit"
 msgstr "Подне�и"
 
+#. TRANS: Field label.
 msgid "Enter your answer"
 msgstr "Вне�ете го Вашиот одговор"
 
@@ -203,37 +256,48 @@ msgctxt "BUTTON"
 msgid "Answer"
 msgstr "Одговори"
 
+#. TRANS: Field label for a new question.
+msgctxt "LABEL"
 msgid "Title"
 msgstr "�а�лов"
 
-msgid "Title of your question"
-msgstr "�а�лов на прашањето"
+#. TRANS: Field title for a new question.
+msgid "The title of your question."
+msgstr "�а�лов на Вашето прашање."
 
+#. TRANS: Field label for question details.
+msgctxt "LABEL"
 msgid "Description"
 msgstr "Опи�"
 
-msgid "Your question in detail"
-msgstr "Вашето прашање поподробно"
+#. TRANS: Field title for question details.
+msgid "Your question in detail."
+msgstr "Вашето прашање поподробно."
 
 #. TRANS: Button text for saving a new question.
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Зачувај"
 
-#. TRANS: Button text for closing a question
+#. TRANS: Form legend for revising the answer.
+msgctxt "LEGEND"
+msgid "Question"
+msgstr "Прашање"
+
+#. TRANS: Button text for closing a question.
 msgctxt "BUTTON"
 msgid "Close"
 msgstr "Затвори"
 
-#. TRANS: Title for button text for closing a question
-msgid "Close the question"
-msgstr "Затвори го прашањето"
+#. TRANS: Title for button text for closing a question.
+msgid "Close the question to no one can answer it anymore."
+msgstr "Затвори го прашањето за да не може повеќе да �е одговара."
 
-#. TRANS: Button text for marking an answer as "best"
+#. TRANS: Button text for marking an answer as "best".
 msgctxt "BUTTON"
 msgid "Best"
 msgstr "�ајдобар"
 
-#. TRANS: Title for button text marking an answer as "best"
-msgid "Mark as best answer"
-msgstr "Означи како најдобар одговор"
+#. TRANS: Title for button text marking an answer as "best".
+msgid "Mark this answer as the best answer."
+msgstr "Означи го како најдобар одговор."
diff --git a/plugins/QnA/locale/nl/LC_MESSAGES/QnA.po b/plugins/QnA/locale/nl/LC_MESSAGES/QnA.po
index 136c610a25..d83d7723ff 100644
--- a/plugins/QnA/locale/nl/LC_MESSAGES/QnA.po
+++ b/plugins/QnA/locale/nl/LC_MESSAGES/QnA.po
@@ -10,14 +10,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - QnA\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:58+0000\n"
-"Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:44+0000\n"
+"Language-Team: Dutch <https://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:49+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2012-01-02 10:10:59+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-qna\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -26,6 +26,7 @@ msgstr ""
 msgid "New question"
 msgstr "Nieuwe vraag"
 
+#. TRANS: Client exception thrown trying to create a Question while not logged in.
 msgid "You must be logged in to post a question."
 msgstr ""
 "U moet aangemeld zijn om een vraag te kunnen stellen te kunnen stellen."
@@ -38,16 +39,21 @@ msgstr "U moet de vraag een naam geven."
 msgid "Question posted"
 msgstr "De vraag is gesteld"
 
+#. TRANS: Client exception thrown when requesting a non-existing answer.
+#. TRANS: Did we used to have it, and it got deleted?
 msgid "No such answer."
 msgstr "Dat antwoord bestaat niet."
 
+#. TRANS: Client exception thrown when requesting an answer that has no connected question.
 msgid "No question for this answer."
 msgstr "Er is geen vraag voor dit antwoord."
 
+#. TRANS: Client exception thrown when requesting answer data for a non-existing user.
 #. TRANS: Client exception thrown trying to view a question of a non-existing user.
 msgid "No such user."
 msgstr "Deze gebruiker bestaat niet."
 
+#. TRANS: Client exception thrown when requesting answer data for a user without a profile.
 #. TRANS: Server exception thrown trying to view a question for a user for which the profile could not be loaded.
 msgid "User without a profile."
 msgstr "Gebruiker zonder profiel."
@@ -66,6 +72,7 @@ msgstr "Antwoord herzien"
 msgid "You must be logged in to answer to a question."
 msgstr "U moet aangemeld zijn om een vraag te kunnen beantwoorden."
 
+#. TRANS: Client exception thrown trying to respond to a non-existing question.
 msgid "Invalid or missing answer."
 msgstr "Ongeldig of ontbrekend antwoord."
 
@@ -75,6 +82,11 @@ msgstr "Ongeldig of ontbrekend antwoord."
 msgid "Answer"
 msgstr "Antwoorden"
 
+#. TRANS: Form title for sending an answer.
+msgctxt "TITLE"
+msgid "Answer"
+msgstr "Antwoorden"
+
 #. TRANS: Client exception thrown trying to view a non-existing question.
 msgid "No such question."
 msgstr "De vraag bestaat niet."
@@ -83,6 +95,8 @@ msgstr "De vraag bestaat niet."
 msgid "No such question notice."
 msgstr "De vraagmededeling bestaat niet."
 
+#. TRANS: Page title for a question.
+#. TRANS: %1$s is the nickname of the user who asked the question, %2$s is the question.
 #, php-format
 msgid "%1$s's question: %2$s"
 msgstr "Vraag van %1$s: %2$s"
@@ -91,6 +105,7 @@ msgstr "Vraag van %1$s: %2$s"
 msgid "Close question"
 msgstr "Vraag sluiten"
 
+#. TRANS: Client exception thrown trying to close a question when not logged in
 msgid "You must be logged in to close a question."
 msgstr ""
 "U moet aangemeld zijn om een vraag te kunnen stellen te kunnen sluiten."
@@ -99,10 +114,12 @@ msgstr ""
 msgid "Invalid or missing question."
 msgstr "Ongeldige of ontbrekende vraag."
 
-msgid "You didn't ask this question."
+#. TRANS: Exception thrown trying to close another user's question.
+msgid "You did not ask this question."
 msgstr "U hebt deze vraag niet gesteld."
 
 #. TRANS: Page title after sending an answer.
+#. TRANS: Page title after sending in a vote for a question or answer.
 msgid "Answers"
 msgstr "Antwoorden"
 
@@ -115,6 +132,8 @@ msgctxt "TITLE"
 msgid "Your answer"
 msgstr "Uw antwoord"
 
+#. TRANS: Error message displayed when an answer has no content.
+#. TRANS: Error message displayed when answer data is not present.
 msgid "Answer data is missing."
 msgstr "De vraaggegevens ontbreken."
 
@@ -123,25 +142,27 @@ msgid "Question and Answers micro-app."
 msgstr "Microapplicatie voor vragen en antwoorden."
 
 #. TRANS: Application title.
-#. TRANS: Form legend for revising the answer.
+msgctxt "TITLE"
 msgid "Question"
 msgstr "Vraag"
 
+#. TRANS: Exception thrown when there are too many activity objects.
 msgid "Too many activity objects."
 msgstr "Er zijn te veel activiteitenobjecten opgegeven."
 
+#. TRANS: Exception thrown when an incorrect object type is encountered.
 msgid "Wrong type for object."
 msgstr "Het object heeft een onjuist type."
 
+#. TRANS: Exception thrown when answering a non-existing question.
 msgid "Answer to unknown question."
 msgstr "Antwoord op een onbekende vraag."
 
-msgid "Unknown object type received by QnA Plugin."
-msgstr "Onbekend objecttype ontvangen door QnA-plug-in."
-
+#. TRANS: Exception thrown when an object type is encountered that cannot be handled.
 msgid "Unknown object type."
 msgstr "Onbekend objecttype."
 
+#. TRANS: Exception thrown when requesting a non-existing question notice.
 msgid "Unknown question notice."
 msgstr "De vraagmededeling bestaat niet."
 
@@ -151,39 +172,69 @@ msgstr "De vraagmededeling bestaat niet."
 msgid "Unexpected type for QnA plugin: %s."
 msgstr "Onverwacht type voor plug-in Vraag en Antwoord: %s."
 
+#. TRANS: Error message displayed when question data is not present.
 msgid "Question data is missing."
 msgstr "De vraaggegevens ontbreken."
 
+#. TRANS: Placeholder value for a possible answer to a question
+#. TRANS: by the logged in user.
 msgid "Your answer..."
 msgstr "Uw antwoord..."
 
-#. TRANS: Link to full notice text if it is longer than what will be dispplayed.
-#. TRANS: %s a notice URI.
-#, php-format
-msgid "<a href=\"%s\" rel=\"more\" title=\"%s\">…</a>"
-msgstr "<a href=\"%s\" rel=\"more\" title=\"%s\">…</a>"
+#. TRANS: Link description for link to full notice text if it is longer than
+#. TRANS: what will be dispplayed.
+msgid "…"
+msgstr "…"
 
+#. TRANS: Title for link that is an ellipsis in English.
 msgid "more..."
 msgstr "meer..."
 
+#. TRANS: Exception thown when getting a question with a non-existing ID.
+#. TRANS: %s is the non-existing question ID.
 #, php-format
-msgid "%s revisions"
-msgstr "%s versies"
+msgid "No question with ID %s"
+msgstr "Er is geen vraag met het ID %s."
 
+#. TRANS: Exception thown when getting a profile with a non-existing ID.
+#. TRANS: %s is the non-existing profile ID.
+#. TRANS: Exception trown when getting a profile for a non-existing ID.
+#. TRANS: %s is the provided profile ID.
+#, php-format
+msgid "No profile with ID %s"
+msgstr "Er is geen profiel met het ID %s"
+
+#. TRANS: %s is the number of answer revisions.
+#, php-format
+msgid "%s revision"
+msgid_plural "%s revisions"
+msgstr[0] "%s versie"
+msgstr[1] "%s versies"
+
+#. TRANS: Text for a question that was answered.
+#. TRANS: %1$s is the user that answered, %2$s is the question title,
+#. TRANS: %2$s is the answer content.
 #, php-format
 msgid "%1$s answered the question \"%2$s\": %3$s"
 msgstr "%1$s heeft de vraag \"%2$s\" beantwoord: %3$s"
 
+#. TRANS: Text for a question that was answered.
+#. TRANS: %s is the question title.
 #. TRANS: Rendered version of the notice content answering a question.
 #. TRANS: %s a link to the question with question title as the link content.
 #, php-format
 msgid "answered \"%s\""
 msgstr "heeft geantwoord op \"%s\""
 
+#. TRANS: Number of given answers to a question.
+#. TRANS: %s is the number of given answers.
 #, php-format
-msgid "%s answers"
-msgstr "%s antwoorden"
+msgid "%s answer"
+msgid_plural "%s answers"
+msgstr[0] "%s antwoord"
+msgstr[1] "%s antwoorden"
 
+#. TRANS: Notification that a question cannot be answered anymore because it is closed.
 msgid "This question is closed."
 msgstr "Deze vraag is gesloten."
 
@@ -193,11 +244,13 @@ msgstr "Deze vraag is gesloten."
 msgid "Question: %s"
 msgstr "Vraag: %s"
 
+#. TRANS: Button text for submitting a revised answer.
 #. TRANS: Button text for submitting a poll response.
 msgctxt "BUTTON"
 msgid "Submit"
 msgstr "Opslaan"
 
+#. TRANS: Field label.
 msgid "Enter your answer"
 msgstr "Geef uw antwoord"
 
@@ -206,37 +259,48 @@ msgctxt "BUTTON"
 msgid "Answer"
 msgstr "Beantwoorden"
 
+#. TRANS: Field label for a new question.
+msgctxt "LABEL"
 msgid "Title"
 msgstr "Naam"
 
-msgid "Title of your question"
-msgstr "Naam van uw vraag"
+#. TRANS: Field title for a new question.
+msgid "The title of your question."
+msgstr "De naam van uw vraag."
 
+#. TRANS: Field label for question details.
+msgctxt "LABEL"
 msgid "Description"
 msgstr "Beschrijving"
 
-msgid "Your question in detail"
-msgstr "Details van uw vraag"
+#. TRANS: Field title for question details.
+msgid "Your question in detail."
+msgstr "De details van uw vraag"
 
 #. TRANS: Button text for saving a new question.
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Opslaan"
 
-#. TRANS: Button text for closing a question
+#. TRANS: Form legend for revising the answer.
+msgctxt "LEGEND"
+msgid "Question"
+msgstr "Vraag"
+
+#. TRANS: Button text for closing a question.
 msgctxt "BUTTON"
 msgid "Close"
 msgstr "Sluiten"
 
-#. TRANS: Title for button text for closing a question
-msgid "Close the question"
-msgstr "Vraag sluiten"
+#. TRANS: Title for button text for closing a question.
+msgid "Close the question to no one can answer it anymore."
+msgstr "De vraag sluiten zodat niemand meer kan antwoorden."
 
-#. TRANS: Button text for marking an answer as "best"
+#. TRANS: Button text for marking an answer as "best".
 msgctxt "BUTTON"
 msgid "Best"
 msgstr "Beste"
 
-#. TRANS: Title for button text marking an answer as "best"
-msgid "Mark as best answer"
-msgstr "Als beste antwoord markeren"
+#. TRANS: Title for button text marking an answer as "best".
+msgid "Mark this answer as the best answer."
+msgstr "Dit antwoord als het beste antwoord markeren."
diff --git a/plugins/QnA/locale/pl/LC_MESSAGES/QnA.po b/plugins/QnA/locale/pl/LC_MESSAGES/QnA.po
new file mode 100644
index 0000000000..f9f81092d9
--- /dev/null
+++ b/plugins/QnA/locale/pl/LC_MESSAGES/QnA.po
@@ -0,0 +1,306 @@
+# Translation of StatusNet - QnA to Polish (polski)
+# Exported from translatewiki.net
+#
+# Author: Woytecr
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - QnA\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:45+0000\n"
+"Language-Team: Polish <https://translatewiki.net/wiki/Portal:pl>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2012-01-02 10:10:59+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: pl\n"
+"X-Message-Group: #out-statusnet-plugin-qna\n"
+"Plural-Forms: nplurals=3; plural=(n == 1) ? 0 : ( (n%10 >= 2 && n%10 <= 4 && "
+"(n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
+
+#. TRANS: Title for Question page.
+msgid "New question"
+msgstr ""
+
+#. TRANS: Client exception thrown trying to create a Question while not logged in.
+msgid "You must be logged in to post a question."
+msgstr ""
+
+#. TRANS: Client exception thrown trying to create a question without a title.
+msgid "Question must have a title."
+msgstr ""
+
+#. TRANS: Page title after sending a notice.
+msgid "Question posted"
+msgstr ""
+
+#. TRANS: Client exception thrown when requesting a non-existing answer.
+#. TRANS: Did we used to have it, and it got deleted?
+msgid "No such answer."
+msgstr ""
+
+#. TRANS: Client exception thrown when requesting an answer that has no connected question.
+msgid "No question for this answer."
+msgstr ""
+
+#. TRANS: Client exception thrown when requesting answer data for a non-existing user.
+#. TRANS: Client exception thrown trying to view a question of a non-existing user.
+msgid "No such user."
+msgstr ""
+
+#. TRANS: Client exception thrown when requesting answer data for a user without a profile.
+#. TRANS: Server exception thrown trying to view a question for a user for which the profile could not be loaded.
+msgid "User without a profile."
+msgstr ""
+
+#. TRANS: Page title.
+#. TRANS: %1$s is the user who answered a question, %2$s is the question.
+#, php-format
+msgid "%1$s's answer to \"%2$s\""
+msgstr ""
+
+#. TRANS: Page title for revising a question
+msgid "Revise answer"
+msgstr ""
+
+#. TRANS: Client exception thrown trying to answer a question while not logged in.
+msgid "You must be logged in to answer to a question."
+msgstr ""
+
+#. TRANS: Client exception thrown trying to respond to a non-existing question.
+msgid "Invalid or missing answer."
+msgstr ""
+
+#. TRANS: Page title after sending an answer.
+#. TRANS: Page title for and answer to a question.
+#. TRANS: Form legend for showing the answer.
+msgid "Answer"
+msgstr "Odpowiedź"
+
+#. TRANS: Form title for sending an answer.
+msgctxt "TITLE"
+msgid "Answer"
+msgstr "Odpowiedź"
+
+#. TRANS: Client exception thrown trying to view a non-existing question.
+msgid "No such question."
+msgstr ""
+
+#. TRANS: Client exception thrown trying to view a non-existing question notice.
+msgid "No such question notice."
+msgstr ""
+
+#. TRANS: Page title for a question.
+#. TRANS: %1$s is the nickname of the user who asked the question, %2$s is the question.
+#, php-format
+msgid "%1$s's question: %2$s"
+msgstr ""
+
+#. TRANS: Page title for close a question
+msgid "Close question"
+msgstr "Zamknij pytanie"
+
+#. TRANS: Client exception thrown trying to close a question when not logged in
+msgid "You must be logged in to close a question."
+msgstr ""
+
+#. TRANS: Client exception thrown trying to respond to a non-existing question.
+msgid "Invalid or missing question."
+msgstr ""
+
+#. TRANS: Exception thrown trying to close another user's question.
+msgid "You did not ask this question."
+msgstr ""
+
+#. TRANS: Page title after sending an answer.
+#. TRANS: Page title after sending in a vote for a question or answer.
+msgid "Answers"
+msgstr "Odpowiedzi"
+
+#. TRANS: Page title after an AJAX error occurs on the post answer page.
+msgid "Ajax Error"
+msgstr ""
+
+#. TRANS: Title for form to send answer to a question.
+msgctxt "TITLE"
+msgid "Your answer"
+msgstr "Twoja odpowiedź"
+
+#. TRANS: Error message displayed when an answer has no content.
+#. TRANS: Error message displayed when answer data is not present.
+msgid "Answer data is missing."
+msgstr ""
+
+#. TRANS: Plugin description.
+msgid "Question and Answers micro-app."
+msgstr ""
+
+#. TRANS: Application title.
+msgctxt "TITLE"
+msgid "Question"
+msgstr "Pytanie"
+
+#. TRANS: Exception thrown when there are too many activity objects.
+msgid "Too many activity objects."
+msgstr ""
+
+#. TRANS: Exception thrown when an incorrect object type is encountered.
+msgid "Wrong type for object."
+msgstr ""
+
+#. TRANS: Exception thrown when answering a non-existing question.
+msgid "Answer to unknown question."
+msgstr ""
+
+#. TRANS: Exception thrown when an object type is encountered that cannot be handled.
+msgid "Unknown object type."
+msgstr ""
+
+#. TRANS: Exception thrown when requesting a non-existing question notice.
+msgid "Unknown question notice."
+msgstr ""
+
+#. TRANS: Exception thrown when performing an unexpected action on a question.
+#. TRANS: %s is the unpexpected object type.
+#, php-format
+msgid "Unexpected type for QnA plugin: %s."
+msgstr ""
+
+#. TRANS: Error message displayed when question data is not present.
+msgid "Question data is missing."
+msgstr ""
+
+#. TRANS: Placeholder value for a possible answer to a question
+#. TRANS: by the logged in user.
+msgid "Your answer..."
+msgstr "Twoja odpowiedź..."
+
+#. TRANS: Link description for link to full notice text if it is longer than
+#. TRANS: what will be dispplayed.
+msgid "…"
+msgstr "…"
+
+#. TRANS: Title for link that is an ellipsis in English.
+msgid "more..."
+msgstr "więcej..."
+
+#. TRANS: Exception thown when getting a question with a non-existing ID.
+#. TRANS: %s is the non-existing question ID.
+#, php-format
+msgid "No question with ID %s"
+msgstr ""
+
+#. TRANS: Exception thown when getting a profile with a non-existing ID.
+#. TRANS: %s is the non-existing profile ID.
+#. TRANS: Exception trown when getting a profile for a non-existing ID.
+#. TRANS: %s is the provided profile ID.
+#, php-format
+msgid "No profile with ID %s"
+msgstr ""
+
+#. TRANS: %s is the number of answer revisions.
+#, php-format
+msgid "%s revision"
+msgid_plural "%s revisions"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#. TRANS: Text for a question that was answered.
+#. TRANS: %1$s is the user that answered, %2$s is the question title,
+#. TRANS: %2$s is the answer content.
+#, php-format
+msgid "%1$s answered the question \"%2$s\": %3$s"
+msgstr ""
+
+#. TRANS: Text for a question that was answered.
+#. TRANS: %s is the question title.
+#. TRANS: Rendered version of the notice content answering a question.
+#. TRANS: %s a link to the question with question title as the link content.
+#, php-format
+msgid "answered \"%s\""
+msgstr ""
+
+#. TRANS: Number of given answers to a question.
+#. TRANS: %s is the number of given answers.
+#, php-format
+msgid "%s answer"
+msgid_plural "%s answers"
+msgstr[0] "%s odpowiedź"
+msgstr[1] "%s odpowiedzi"
+msgstr[2] ""
+
+#. TRANS: Notification that a question cannot be answered anymore because it is closed.
+msgid "This question is closed."
+msgstr "To pytanie jest zamknięte."
+
+#. TRANS: Rendered version of the notice content creating a question.
+#. TRANS: %s a link to the question as link description.
+#, php-format
+msgid "Question: %s"
+msgstr "Pytanie: %s"
+
+#. TRANS: Button text for submitting a revised answer.
+#. TRANS: Button text for submitting a poll response.
+msgctxt "BUTTON"
+msgid "Submit"
+msgstr "Wyślij"
+
+#. TRANS: Field label.
+msgid "Enter your answer"
+msgstr "Wprowadź swoją odpowiedź"
+
+#. TRANS: Button text for submitting a poll response.
+msgctxt "BUTTON"
+msgid "Answer"
+msgstr "Odpowiedź"
+
+#. TRANS: Field label for a new question.
+msgctxt "LABEL"
+msgid "Title"
+msgstr "Tytuł"
+
+#. TRANS: Field title for a new question.
+msgid "The title of your question."
+msgstr ""
+
+#. TRANS: Field label for question details.
+msgctxt "LABEL"
+msgid "Description"
+msgstr "Opis"
+
+#. TRANS: Field title for question details.
+msgid "Your question in detail."
+msgstr ""
+
+#. TRANS: Button text for saving a new question.
+msgctxt "BUTTON"
+msgid "Save"
+msgstr "Zapisz"
+
+#. TRANS: Form legend for revising the answer.
+msgctxt "LEGEND"
+msgid "Question"
+msgstr "Pytanie"
+
+#. TRANS: Button text for closing a question.
+msgctxt "BUTTON"
+msgid "Close"
+msgstr "Zamknij"
+
+#. TRANS: Title for button text for closing a question.
+msgid "Close the question to no one can answer it anymore."
+msgstr ""
+
+#. TRANS: Button text for marking an answer as "best".
+msgctxt "BUTTON"
+msgid "Best"
+msgstr "Najlepszy"
+
+#. TRANS: Title for button text marking an answer as "best".
+msgid "Mark this answer as the best answer."
+msgstr ""
diff --git a/plugins/QnA/locale/tl/LC_MESSAGES/QnA.po b/plugins/QnA/locale/tl/LC_MESSAGES/QnA.po
index d6e50f847e..0c6f05574f 100644
--- a/plugins/QnA/locale/tl/LC_MESSAGES/QnA.po
+++ b/plugins/QnA/locale/tl/LC_MESSAGES/QnA.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - QnA\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:58+0000\n"
-"Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:45+0000\n"
+"Language-Team: Tagalog <https://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:49+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2012-01-02 10:10:59+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-qna\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -25,6 +25,7 @@ msgstr ""
 msgid "New question"
 msgstr "Bagong tanong"
 
+#. TRANS: Client exception thrown trying to create a Question while not logged in.
 msgid "You must be logged in to post a question."
 msgstr "Dapat na nakalagda ka upang makapagpaskil ng isang tanong."
 
@@ -36,16 +37,21 @@ msgstr "Dapat na may isang pamagat ang katanungan."
 msgid "Question posted"
 msgstr "Naipaskil ang tanong"
 
+#. TRANS: Client exception thrown when requesting a non-existing answer.
+#. TRANS: Did we used to have it, and it got deleted?
 msgid "No such answer."
 msgstr "Walang ganyang sagot."
 
+#. TRANS: Client exception thrown when requesting an answer that has no connected question.
 msgid "No question for this answer."
 msgstr "Walang katanungan para sa kasagutang ito."
 
+#. TRANS: Client exception thrown when requesting answer data for a non-existing user.
 #. TRANS: Client exception thrown trying to view a question of a non-existing user.
 msgid "No such user."
 msgstr "Walang ganyang tagagamit."
 
+#. TRANS: Client exception thrown when requesting answer data for a user without a profile.
 #. TRANS: Server exception thrown trying to view a question for a user for which the profile could not be loaded.
 msgid "User without a profile."
 msgstr "Tagagamit na walang balangkas."
@@ -64,6 +70,7 @@ msgstr "Baguhin ang sagot"
 msgid "You must be logged in to answer to a question."
 msgstr "Dapat na nakalagda ka upang makasagot ng isang tanong."
 
+#. TRANS: Client exception thrown trying to respond to a non-existing question.
 msgid "Invalid or missing answer."
 msgstr "Hindi katanggap-tanggap o nawawalang kasagutan."
 
@@ -73,6 +80,11 @@ msgstr "Hindi katanggap-tanggap o nawawalang kasagutan."
 msgid "Answer"
 msgstr "Kasagutan"
 
+#. TRANS: Form title for sending an answer.
+msgctxt "TITLE"
+msgid "Answer"
+msgstr "Sagot"
+
 #. TRANS: Client exception thrown trying to view a non-existing question.
 msgid "No such question."
 msgstr "Walang ganyang tanong."
@@ -81,6 +93,8 @@ msgstr "Walang ganyang tanong."
 msgid "No such question notice."
 msgstr "Walang ganyang pabatid ng tanong."
 
+#. TRANS: Page title for a question.
+#. TRANS: %1$s is the nickname of the user who asked the question, %2$s is the question.
 #, php-format
 msgid "%1$s's question: %2$s"
 msgstr "Katanungan ni %1$s: %2$s"
@@ -89,6 +103,7 @@ msgstr "Katanungan ni %1$s: %2$s"
 msgid "Close question"
 msgstr "Isara ang katanungan"
 
+#. TRANS: Client exception thrown trying to close a question when not logged in
 msgid "You must be logged in to close a question."
 msgstr "Dapat na nakalagda ka upang makapagsara ng isang tanong."
 
@@ -96,10 +111,12 @@ msgstr "Dapat na nakalagda ka upang makapagsara ng isang tanong."
 msgid "Invalid or missing question."
 msgstr "Hindi katanggap-tanggap o nawawalang katanungan."
 
-msgid "You didn't ask this question."
-msgstr "Hindi ka nagtanong ng tanong na ito."
+#. TRANS: Exception thrown trying to close another user's question.
+msgid "You did not ask this question."
+msgstr "Hindi mo itinanong ang tanong na ito."
 
 #. TRANS: Page title after sending an answer.
+#. TRANS: Page title after sending in a vote for a question or answer.
 msgid "Answers"
 msgstr "Mga kasagutan"
 
@@ -112,6 +129,8 @@ msgctxt "TITLE"
 msgid "Your answer"
 msgstr "Ang sagot mo"
 
+#. TRANS: Error message displayed when an answer has no content.
+#. TRANS: Error message displayed when answer data is not present.
 msgid "Answer data is missing."
 msgstr "Nawawala ang dato ng kasagutan."
 
@@ -120,25 +139,27 @@ msgid "Question and Answers micro-app."
 msgstr "Mikro-aplikasyon ng Tanong at mga Sagot."
 
 #. TRANS: Application title.
-#. TRANS: Form legend for revising the answer.
+msgctxt "TITLE"
 msgid "Question"
-msgstr "Katanungan"
+msgstr "Tanong"
 
+#. TRANS: Exception thrown when there are too many activity objects.
 msgid "Too many activity objects."
 msgstr "Masyadong maraming mga bagay ng gawain."
 
+#. TRANS: Exception thrown when an incorrect object type is encountered.
 msgid "Wrong type for object."
 msgstr "Maling uri para sa bagay."
 
+#. TRANS: Exception thrown when answering a non-existing question.
 msgid "Answer to unknown question."
 msgstr "Sagot sa hindi nalalamang katanungan."
 
-msgid "Unknown object type received by QnA Plugin."
-msgstr "Hindi nalalamang uri ng bagay ang natanggap ng Pampasak ng QnA."
-
+#. TRANS: Exception thrown when an object type is encountered that cannot be handled.
 msgid "Unknown object type."
 msgstr "Hindi nalalamang uri ng bagay."
 
+#. TRANS: Exception thrown when requesting a non-existing question notice.
 msgid "Unknown question notice."
 msgstr "Hindi nalalamang pabatid ng katanungan."
 
@@ -148,39 +169,69 @@ msgstr "Hindi nalalamang pabatid ng katanungan."
 msgid "Unexpected type for QnA plugin: %s."
 msgstr "Hindi inaasahang uri para sa pampasak na QnA: %s."
 
+#. TRANS: Error message displayed when question data is not present.
 msgid "Question data is missing."
 msgstr "Nawawala ang dato ng tanong."
 
+#. TRANS: Placeholder value for a possible answer to a question
+#. TRANS: by the logged in user.
 msgid "Your answer..."
 msgstr "Ang sagot mo..."
 
-#. TRANS: Link to full notice text if it is longer than what will be dispplayed.
-#. TRANS: %s a notice URI.
-#, php-format
-msgid "<a href=\"%s\" rel=\"more\" title=\"%s\">…</a>"
-msgstr "<a href=\"%s\" rel=\"more\" title=\"%s\">…</a>"
+#. TRANS: Link description for link to full notice text if it is longer than
+#. TRANS: what will be dispplayed.
+msgid "…"
+msgstr "…"
 
+#. TRANS: Title for link that is an ellipsis in English.
 msgid "more..."
 msgstr "marami pa..."
 
+#. TRANS: Exception thown when getting a question with a non-existing ID.
+#. TRANS: %s is the non-existing question ID.
 #, php-format
-msgid "%s revisions"
-msgstr "%s mga pagbabago"
+msgid "No question with ID %s"
+msgstr "Walang tanong na may ID na %s."
 
+#. TRANS: Exception thown when getting a profile with a non-existing ID.
+#. TRANS: %s is the non-existing profile ID.
+#. TRANS: Exception trown when getting a profile for a non-existing ID.
+#. TRANS: %s is the provided profile ID.
+#, php-format
+msgid "No profile with ID %s"
+msgstr "Walang balangkas na may ID na %s"
+
+#. TRANS: %s is the number of answer revisions.
+#, php-format
+msgid "%s revision"
+msgid_plural "%s revisions"
+msgstr[0] "%s rebisyon"
+msgstr[1] "%s mga rebisyon"
+
+#. TRANS: Text for a question that was answered.
+#. TRANS: %1$s is the user that answered, %2$s is the question title,
+#. TRANS: %2$s is the answer content.
 #, php-format
 msgid "%1$s answered the question \"%2$s\": %3$s"
 msgstr "Si %1$s ay sumagot sa tanong na \"%2$s\": %3$s"
 
+#. TRANS: Text for a question that was answered.
+#. TRANS: %s is the question title.
 #. TRANS: Rendered version of the notice content answering a question.
 #. TRANS: %s a link to the question with question title as the link content.
 #, php-format
 msgid "answered \"%s\""
 msgstr "sumagot sa \"%s\""
 
+#. TRANS: Number of given answers to a question.
+#. TRANS: %s is the number of given answers.
 #, php-format
-msgid "%s answers"
-msgstr "%s mga kasagutan"
+msgid "%s answer"
+msgid_plural "%s answers"
+msgstr[0] "%s sagot"
+msgstr[1] "%s mga sagot"
 
+#. TRANS: Notification that a question cannot be answered anymore because it is closed.
 msgid "This question is closed."
 msgstr "Nakasara na ang katanungang ito."
 
@@ -190,11 +241,13 @@ msgstr "Nakasara na ang katanungang ito."
 msgid "Question: %s"
 msgstr "Tanong: %s"
 
+#. TRANS: Button text for submitting a revised answer.
 #. TRANS: Button text for submitting a poll response.
 msgctxt "BUTTON"
 msgid "Submit"
 msgstr "Ipasa"
 
+#. TRANS: Field label.
 msgid "Enter your answer"
 msgstr "Ipasok ang sagot mo"
 
@@ -203,37 +256,48 @@ msgctxt "BUTTON"
 msgid "Answer"
 msgstr "Kasagutan"
 
+#. TRANS: Field label for a new question.
+msgctxt "LABEL"
 msgid "Title"
 msgstr "Pamagat"
 
-msgid "Title of your question"
-msgstr "Pamagat ng katanungan mo"
+#. TRANS: Field title for a new question.
+msgid "The title of your question."
+msgstr "Ang pamagat ng tanong mo."
 
+#. TRANS: Field label for question details.
+msgctxt "LABEL"
 msgid "Description"
 msgstr "Paglalarawan"
 
-msgid "Your question in detail"
-msgstr "Nakadetalyeng katanungan mo"
+#. TRANS: Field title for question details.
+msgid "Your question in detail."
+msgstr "Nakadetalyeng tanong mo."
 
 #. TRANS: Button text for saving a new question.
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Sagipin"
 
-#. TRANS: Button text for closing a question
+#. TRANS: Form legend for revising the answer.
+msgctxt "LEGEND"
+msgid "Question"
+msgstr "Tanong"
+
+#. TRANS: Button text for closing a question.
 msgctxt "BUTTON"
 msgid "Close"
 msgstr "Isara"
 
-#. TRANS: Title for button text for closing a question
-msgid "Close the question"
-msgstr "Isara na ang katanungan"
+#. TRANS: Title for button text for closing a question.
+msgid "Close the question to no one can answer it anymore."
+msgstr "Isara ang tanong upang wala nang makakasagot rito."
 
-#. TRANS: Button text for marking an answer as "best"
+#. TRANS: Button text for marking an answer as "best".
 msgctxt "BUTTON"
 msgid "Best"
 msgstr "Pinakamahusay"
 
-#. TRANS: Title for button text marking an answer as "best"
-msgid "Mark as best answer"
-msgstr "Markahan bilang pinakamahusay na kasagutan"
+#. TRANS: Title for button text marking an answer as "best".
+msgid "Mark this answer as the best answer."
+msgstr "Markahan ang sagot na ito bilang pinakamahusay na sagot."
diff --git a/plugins/QnA/locale/uk/LC_MESSAGES/QnA.po b/plugins/QnA/locale/uk/LC_MESSAGES/QnA.po
index 3b85a1e201..a04fcc44d7 100644
--- a/plugins/QnA/locale/uk/LC_MESSAGES/QnA.po
+++ b/plugins/QnA/locale/uk/LC_MESSAGES/QnA.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - QnA to Ukrainian (Україн�ька)
+# Translation of StatusNet - QnA to Ukrainian (україн�ька)
 # Exported from translatewiki.net
 #
 # Author: Boogie
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - QnA\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:58+0000\n"
-"Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:45+0000\n"
+"Language-Team: Ukrainian <https://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:28:49+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2012-01-02 10:10:59+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-qna\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
@@ -26,6 +26,7 @@ msgstr ""
 msgid "New question"
 msgstr "�ове запитанн�"
 
+#. TRANS: Client exception thrown trying to create a Question while not logged in.
 msgid "You must be logged in to post a question."
 msgstr "Ви маєте �початку увійти, аби мати змогу по�тавити запитанн�."
 
@@ -37,16 +38,21 @@ msgstr "Запитанн� повинно мати заголовок."
 msgid "Question posted"
 msgstr "Запитанн� по�тавлено"
 
+#. TRANS: Client exception thrown when requesting a non-existing answer.
+#. TRANS: Did we used to have it, and it got deleted?
 msgid "No such answer."
 msgstr "�емає такої відповіді."
 
+#. TRANS: Client exception thrown when requesting an answer that has no connected question.
 msgid "No question for this answer."
 msgstr "Дл� цієї відповіді немає відповідного запитанн�."
 
+#. TRANS: Client exception thrown when requesting answer data for a non-existing user.
 #. TRANS: Client exception thrown trying to view a question of a non-existing user.
 msgid "No such user."
 msgstr "Такого кори�тувача немає."
 
+#. TRANS: Client exception thrown when requesting answer data for a user without a profile.
 #. TRANS: Server exception thrown trying to view a question for a user for which the profile could not be loaded.
 msgid "User without a profile."
 msgstr "Кори�тувач без профілю."
@@ -65,6 +71,7 @@ msgstr "Перегл�нути відповідь"
 msgid "You must be logged in to answer to a question."
 msgstr "Ви маєте �початку увійти, аби мати змогу відпові�ти на запитанн�."
 
+#. TRANS: Client exception thrown trying to respond to a non-existing question.
 msgid "Invalid or missing answer."
 msgstr "�еправильна або від�утн� відповідь."
 
@@ -74,6 +81,11 @@ msgstr "�еправильна або від�утн� відповідь."
 msgid "Answer"
 msgstr "Відповідь"
 
+#. TRANS: Form title for sending an answer.
+msgctxt "TITLE"
+msgid "Answer"
+msgstr "Відповідь"
+
 #. TRANS: Client exception thrown trying to view a non-existing question.
 msgid "No such question."
 msgstr "�емає такого запитанн�."
@@ -82,6 +94,8 @@ msgstr "�емає такого запитанн�."
 msgid "No such question notice."
 msgstr "�емає такого допи�у із запитанн�м."
 
+#. TRANS: Page title for a question.
+#. TRANS: %1$s is the nickname of the user who asked the question, %2$s is the question.
 #, php-format
 msgid "%1$s's question: %2$s"
 msgstr "%1$s має запитанн�: %2$s"
@@ -90,6 +104,7 @@ msgstr "%1$s має запитанн�: %2$s"
 msgid "Close question"
 msgstr "Закрити питанн�."
 
+#. TRANS: Client exception thrown trying to close a question when not logged in
 msgid "You must be logged in to close a question."
 msgstr "Ви маєте �початку увійти, аби мати змогу закрити питанн�."
 
@@ -97,10 +112,12 @@ msgstr "Ви маєте �початку увійти, аби мати змог
 msgid "Invalid or missing question."
 msgstr "�еправильне або від�утнє запитанн�."
 
-msgid "You didn't ask this question."
+#. TRANS: Exception thrown trying to close another user's question.
+msgid "You did not ask this question."
 msgstr "Ви не �тавили цього запитанн�."
 
 #. TRANS: Page title after sending an answer.
+#. TRANS: Page title after sending in a vote for a question or answer.
 msgid "Answers"
 msgstr "Відповіді"
 
@@ -113,6 +130,8 @@ msgctxt "TITLE"
 msgid "Your answer"
 msgstr "Ваша відповідь."
 
+#. TRANS: Error message displayed when an answer has no content.
+#. TRANS: Error message displayed when answer data is not present.
 msgid "Answer data is missing."
 msgstr "Дані відповіді від�утні."
 
@@ -121,25 +140,27 @@ msgid "Question and Answers micro-app."
 msgstr "Додаток дл� запитань і відповідей."
 
 #. TRANS: Application title.
-#. TRANS: Form legend for revising the answer.
+msgctxt "TITLE"
 msgid "Question"
 msgstr "Запитанн�"
 
+#. TRANS: Exception thrown when there are too many activity objects.
 msgid "Too many activity objects."
 msgstr "Занадто багато об’єктів ді�льно�ті."
 
+#. TRANS: Exception thrown when an incorrect object type is encountered.
 msgid "Wrong type for object."
 msgstr "�еправильний тип дл� об’єкта."
 
+#. TRANS: Exception thrown when answering a non-existing question.
 msgid "Answer to unknown question."
 msgstr "Відповідь на невідоме запитанн�."
 
-msgid "Unknown object type received by QnA Plugin."
-msgstr "�евідомий об'єкт типу отримано додатком запитань і відповідей."
-
+#. TRANS: Exception thrown when an object type is encountered that cannot be handled.
 msgid "Unknown object type."
 msgstr "�евідомий тип об’єкта."
 
+#. TRANS: Exception thrown when requesting a non-existing question notice.
 msgid "Unknown question notice."
 msgstr "�евідомий допи� із запитанн�м."
 
@@ -149,39 +170,71 @@ msgstr "�евідомий допи� із запитанн�м."
 msgid "Unexpected type for QnA plugin: %s."
 msgstr "�е�подіваний тип дл� додатку QnA: %s ."
 
+#. TRANS: Error message displayed when question data is not present.
 msgid "Question data is missing."
 msgstr "Дані запитанн� від�утні."
 
+#. TRANS: Placeholder value for a possible answer to a question
+#. TRANS: by the logged in user.
 msgid "Your answer..."
 msgstr "Ваша відповідь..."
 
-#. TRANS: Link to full notice text if it is longer than what will be dispplayed.
-#. TRANS: %s a notice URI.
-#, php-format
-msgid "<a href=\"%s\" rel=\"more\" title=\"%s\">…</a>"
-msgstr "<a href=\"%s\" rel=\"more\" title=\"%s\">…</a>"
+#. TRANS: Link description for link to full notice text if it is longer than
+#. TRANS: what will be dispplayed.
+msgid "…"
+msgstr "…"
 
+#. TRANS: Title for link that is an ellipsis in English.
 msgid "more..."
 msgstr "ще..."
 
+#. TRANS: Exception thown when getting a question with a non-existing ID.
+#. TRANS: %s is the non-existing question ID.
 #, php-format
-msgid "%s revisions"
-msgstr "%s редагуванн�"
+msgid "No question with ID %s"
+msgstr "�емає запитанн� з ідентифікатором %s"
 
+#. TRANS: Exception thown when getting a profile with a non-existing ID.
+#. TRANS: %s is the non-existing profile ID.
+#. TRANS: Exception trown when getting a profile for a non-existing ID.
+#. TRANS: %s is the provided profile ID.
+#, php-format
+msgid "No profile with ID %s"
+msgstr "�емає профілю з ідентифікатором %s"
+
+#. TRANS: %s is the number of answer revisions.
+#, php-format
+msgid "%s revision"
+msgid_plural "%s revisions"
+msgstr[0] "%s перегл�д"
+msgstr[1] "%s перегл�дів"
+msgstr[2] "%s перегл�д"
+
+#. TRANS: Text for a question that was answered.
+#. TRANS: %1$s is the user that answered, %2$s is the question title,
+#. TRANS: %2$s is the answer content.
 #, php-format
 msgid "%1$s answered the question \"%2$s\": %3$s"
 msgstr "%1$s відповів на запитанн� «%2$s»: %3$s"
 
+#. TRANS: Text for a question that was answered.
+#. TRANS: %s is the question title.
 #. TRANS: Rendered version of the notice content answering a question.
 #. TRANS: %s a link to the question with question title as the link content.
 #, php-format
 msgid "answered \"%s\""
 msgstr "відповіли на «%s»"
 
+#. TRANS: Number of given answers to a question.
+#. TRANS: %s is the number of given answers.
 #, php-format
-msgid "%s answers"
-msgstr "%s відповіді"
+msgid "%s answer"
+msgid_plural "%s answers"
+msgstr[0] "%s відповід"
+msgstr[1] "%s відповідей"
+msgstr[2] "%s відповіді"
 
+#. TRANS: Notification that a question cannot be answered anymore because it is closed.
 msgid "This question is closed."
 msgstr "Це питанн� закрито."
 
@@ -191,11 +244,13 @@ msgstr "Це питанн� закрито."
 msgid "Question: %s"
 msgstr "Запитанн�: %s"
 
+#. TRANS: Button text for submitting a revised answer.
 #. TRANS: Button text for submitting a poll response.
 msgctxt "BUTTON"
 msgid "Submit"
 msgstr "�аді�лати"
 
+#. TRANS: Field label.
 msgid "Enter your answer"
 msgstr "Введіть вашу відповідь"
 
@@ -204,37 +259,48 @@ msgctxt "BUTTON"
 msgid "Answer"
 msgstr "Відповідь"
 
+#. TRANS: Field label for a new question.
+msgctxt "LABEL"
 msgid "Title"
 msgstr "Заголовок"
 
-msgid "Title of your question"
-msgstr "Заголовок дл� вашого запитанн�"
+#. TRANS: Field title for a new question.
+msgid "The title of your question."
+msgstr "Заголовок дл� вашого запитанн�."
 
+#. TRANS: Field label for question details.
+msgctxt "LABEL"
 msgid "Description"
 msgstr "Опи�"
 
-msgid "Your question in detail"
-msgstr "Ваше запитанн� детальніше"
+#. TRANS: Field title for question details.
+msgid "Your question in detail."
+msgstr "Ваше запитанн� детальніше."
 
 #. TRANS: Button text for saving a new question.
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Зберегти"
 
-#. TRANS: Button text for closing a question
+#. TRANS: Form legend for revising the answer.
+msgctxt "LEGEND"
+msgid "Question"
+msgstr "Запитанн�"
+
+#. TRANS: Button text for closing a question.
 msgctxt "BUTTON"
 msgid "Close"
 msgstr "Закрити"
 
-#. TRANS: Title for button text for closing a question
-msgid "Close the question"
-msgstr "Закрити питанн�."
+#. TRANS: Title for button text for closing a question.
+msgid "Close the question to no one can answer it anymore."
+msgstr "Закрити питанн�, щоб ніхто не більше не міг на нього відпові�ти."
 
-#. TRANS: Button text for marking an answer as "best"
+#. TRANS: Button text for marking an answer as "best".
 msgctxt "BUTTON"
 msgid "Best"
 msgstr "Краще"
 
-#. TRANS: Title for button text marking an answer as "best"
-msgid "Mark as best answer"
-msgstr "Позначити �к кращу відповідь"
+#. TRANS: Title for button text marking an answer as "best".
+msgid "Mark this answer as the best answer."
+msgstr "Позначити цю відповідь �к найкращу."
diff --git a/plugins/RSSCloud/LoggingAggregator.php b/plugins/RSSCloud/LoggingAggregator.php
index 26fde9c3e2..824fa9ee9c 100644
--- a/plugins/RSSCloud/LoggingAggregator.php
+++ b/plugins/RSSCloud/LoggingAggregator.php
@@ -44,7 +44,7 @@ if (!defined('STATUSNET')) {
  * @author   Zach Copley <zach@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
- **/
+ */
 class LoggingAggregatorAction extends Action
 {
     var $challenge = null;
@@ -82,25 +82,25 @@ class LoggingAggregatorAction extends Action
         parent::handle($args);
 
         if (empty($this->url)) {
+            // TRANS: Form validation error displayed when a URL parameter is missing.
             $this->showError(_m('A URL parameter is required.'));
             return;
         }
 
         if (!empty($this->challenge)) {
-
             // must be a GET
             if ($_SERVER['REQUEST_METHOD'] != 'GET') {
+                // TRANS: Form validation error displayed when HTTP GET is not used.
                 $this->showError(_m('This resource requires an HTTP GET.'));
                 return;
             }
 
             header('Content-Type: text/xml');
             echo $this->challenge;
-
         } else {
-
             // must be a POST
             if ($_SERVER['REQUEST_METHOD'] != 'POST') {
+                // TRANS: Form validation error displayed when HTTP POST is not used.
                 $this->showError(_m('This resource requires an HTTP POST.'));
                 return;
             }
diff --git a/plugins/RSSCloud/README b/plugins/RSSCloud/README
index 1237e3e0e2..545e26c0d1 100644
--- a/plugins/RSSCloud/README
+++ b/plugins/RSSCloud/README
@@ -1,11 +1,10 @@
-This plugin enables RSSCloud (http://rsscloud.org/) publishing and
-subscription handling for RSS 2.0 profile feeds (i.e:
-http://SITE/PATH/api/statuses/user_timeline/USERNAME.rss). When the
-plugin is enabled, StatusNet acts as both the publisher and hub ('writer' and
-'cloud' in RSSCloud parlance), but only for local StatusNet feeds. It's
-not possible to use it as a general purpose hub -- for instance you can't
-subscribe and get updates to a Wordpress feed from StatusNet using this
-plugin.
+This plugin enables RSSCloud (http://rsscloud.org/) publishing and subscription
+handling for RSS 2.0 profile feeds (i.e:
+http://SITE/PATH/api/statuses/user_timeline/USERNAME.rss). When the plugin is
+enabled, StatusNet acts as both the publisher and hub ('writer' and 'cloud' in
+RSSCloud parlance), but only for local StatusNet feeds. It's not possible to use
+it as a general purpose hub -- for instance you can't subscribe and get updates
+to a Wordpress feed from StatusNet using this plugin.
 
 To use the plugin, add the following to your config.php:
 
@@ -17,29 +16,28 @@ that looks like this:
     <cloud domain="SITE" port="80" path="/main/rsscloud/request_notify"
     registerProcedure="" protocol="http-post"/>
 
-Aggregators may subscribe by sending a proper REST RSSCloud subscription
-request (the optional 'domain' parameter with challenge is supported).
-Subscribing aggregators will be notified ('pinged') when users they have
-subscribed to post new notices. Currently, REST is the only protocol
-supported for notifications.
+Aggregators may subscribe by sending a proper REST RSSCloud subscription request
+(the optional 'domain' parameter with challenge is supported). Subscribing
+aggregators will be notified ('pinged') when users they have subscribed to post
+new notices. Currently, REST is the only protocol supported for notifications.
 
 Deamon
 ------
 
-There's also a daemon for offline processing of queued notices with
-RSSCloud destinations, which will start automatically if/when you run
+There's also a daemon for offline processing of queued notices with RSSCloud
+destinations, which will start automatically if/when you run
 scripts/startdaemons.sh.
 
 Notes
 -----
 
-- Again, only RSS 2.0 profile feeds may be subscribed to, and they have
-  to be the ones with user names in them, like:
+- Again, only RSS 2.0 profile feeds may be subscribed to, and they have to be
+  the ones with user names in them, like:
       http://SITE/PATH/api/statuses/user_timeline/USERNAME.rss
-- Subscriptions are deleted after three notification failures in a row
-  (not sure this is optimal).
-- The plugin includes a dummy LoggingAggregator class that can be used
-  for end-to-end testing.  You probably don't want to mess with it.
+- Subscriptions are deleted after three notification failures in a row (not sure
+  this is optimal).
+- The plugin includes a dummy LoggingAggregator class that can be used for
+  end-to-end testing.  You probably don't want to mess with it.
 
 TODO
 ----
diff --git a/plugins/RSSCloud/RSSCloudNotifier.php b/plugins/RSSCloud/RSSCloudNotifier.php
index 1f0eab47e8..6efe419770 100644
--- a/plugins/RSSCloud/RSSCloudNotifier.php
+++ b/plugins/RSSCloud/RSSCloudNotifier.php
@@ -40,7 +40,7 @@ if (!defined('STATUSNET')) {
  * @author   Zach Copley <zach@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
- **/
+ */
 class RSSCloudNotifier
 {
     const MAX_FAILURES = 3;
@@ -76,7 +76,6 @@ class RSSCloudNotifier
         $body   = $response->getBody();
 
         if ($status >= 200 && $status < 300) {
-
             // NOTE: the spec says that the body must contain the string
             // challenge.  It doesn't say that the body must contain the
             // challenge string ONLY, although that seems to be the way
@@ -113,7 +112,6 @@ class RSSCloudNotifier
      */
     function postUpdate($endpoint, $feed)
     {
-
         $headers  = array();
         $postdata = array('url' => $feed);
 
@@ -210,9 +208,7 @@ class RSSCloudNotifier
                 common_log_db_error($cloudSub, 'DELETE', __FILE__);
                 common_log(LOG_ERR, 'Could not delete RSSCloud subscription.');
             }
-
         } else {
-
             common_debug('Updating failure count on RSSCloud subscription. ' .
                          $failCnt);
 
diff --git a/plugins/RSSCloud/RSSCloudPlugin.php b/plugins/RSSCloud/RSSCloudPlugin.php
index 7d9c39a67d..144e0ca57d 100644
--- a/plugins/RSSCloud/RSSCloudPlugin.php
+++ b/plugins/RSSCloud/RSSCloudPlugin.php
@@ -41,8 +41,7 @@ define('RSSCLOUDPLUGIN_VERSION', '0.1');
  * @author   Zach Copley <zach@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
- **/
-
+ */
 class RSSCloudPlugin extends Plugin
 {
     /**
@@ -61,7 +60,6 @@ class RSSCloudPlugin extends Plugin
      *
      * @return void
      */
-
     function onInitializePlugin()
     {
         $this->domain   = common_config('rsscloud', 'domain');
@@ -104,7 +102,6 @@ class RSSCloudPlugin extends Plugin
      *
      * @return boolean hook return
      */
-
     function onRouterInitialized($m)
     {
         $m->connect('/main/rsscloud/request_notify',
@@ -127,7 +124,6 @@ class RSSCloudPlugin extends Plugin
      * @return boolean hook return
      *
      */
-
     function onAutoload($cls)
     {
         switch ($cls)
@@ -159,7 +155,6 @@ class RSSCloudPlugin extends Plugin
      *
      * @return void
      */
-
     function onStartApiRss($action)
     {
         if (get_class($action) == 'ApiTimelineUserAction') {
@@ -242,11 +237,11 @@ class RSSCloudPlugin extends Plugin
                             'author' => 'Zach Copley',
                             'homepage' => 'http://status.net/wiki/Plugin:RSSCloud',
                             'rawdescription' =>
+                            // TRANS: Plugin description.
                             _m('The RSSCloud plugin enables your StatusNet instance to publish ' .
                                'real-time updates for profile RSS feeds using the ' .
                                '<a href="http://rsscloud.org/">RSSCloud protocol</a>.'));
 
         return true;
     }
-
 }
diff --git a/plugins/RSSCloud/RSSCloudRequestNotify.php b/plugins/RSSCloud/RSSCloudRequestNotify.php
index e9c0eab5f8..b7954884dd 100644
--- a/plugins/RSSCloud/RSSCloudRequestNotify.php
+++ b/plugins/RSSCloud/RSSCloudRequestNotify.php
@@ -40,7 +40,7 @@ if (!defined('STATUSNET')) {
  * @author   Zach Copley <zach@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
- **/
+ */
 class RSSCloudRequestNotifyAction extends Action
 {
     /**
@@ -87,6 +87,7 @@ class RSSCloudRequestNotifyAction extends Action
         parent::handle($args);
 
         if ($_SERVER['REQUEST_METHOD'] != 'POST') {
+            // TRANS: Form validation error displayed when POST is not used.
             $this->showResult(false, _m('Request must be POST.'));
             return;
         }
@@ -104,7 +105,8 @@ class RSSCloudRequestNotifyAction extends Action
         if (empty($this->protocol)) {
             $missing[] = 'protocol';
         } else if (strtolower($this->protocol) != 'http-post') {
-            $msg = _m('Only http-post notifications are supported at this time.');
+            // TRANS: Form validation error displayed when HTTP POST is not used.
+            $msg = _m('Only HTTP POST notifications are supported at this time.');
             $this->showResult(false, $msg);
             return;
         }
@@ -114,14 +116,18 @@ class RSSCloudRequestNotifyAction extends Action
         }
 
         if (!empty($missing)) {
-            // TRANS: %s is a comma separated list of parameters.
-            $msg = sprintf(_m('The following parameters were missing from the request body: %s.'),implode(', ', $missing));
+            // TRANS: List separator.
+            $separator = _m('SEPARATOR',', ');
+            // TRANS: Form validation error displayed when a request body is missing expected parameters.
+            // TRANS: %s is a list of parameters separated by a list separator (default: ", ").
+            $msg = sprintf(_m('The following parameters were missing from the request body: %s.'),implode($separator, $missing));
             $this->showResult(false, $msg);
             return;
         }
 
         if (empty($this->feeds)) {
-            $msg = _m('You must provide at least one valid profile feed url ' .
+            // TRANS: Form validation error displayed when not providing any valid profile feed URLs.
+            $msg = _m('You must provide at least one valid profile feed URL ' .
               '(url1, url2, url3 ... urlN).');
             $this->showResult(false, $msg);
             return;
@@ -131,21 +137,21 @@ class RSSCloudRequestNotifyAction extends Action
         // We only return one success or failure no matter how
         // many feeds the subscriber is trying to subscribe to
         foreach ($this->feeds as $feed) {
-
             if (!$this->validateFeed($feed)) {
-
                 $nh = $this->getNotifyUrl();
                 common_log(LOG_WARNING,
                            "RSSCloud plugin - $nh tried to subscribe to invalid feed: $feed");
 
+                // TRANS: Form validation error displayed when not providing a valid feed URL.
                 $msg = _m('Feed subscription failed: Not a valid feed.');
                 $this->showResult(false, $msg);
                 return;
             }
 
             if (!$this->testNotificationHandler($feed)) {
-                $msg = _m('Feed subscription failed - ' .
-                'notification handler doesn\'t respond correctly.');
+                // TRANS: Form validation error displayed when feed subscription failed.
+                $msg = _m('Feed subscription failed: ' .
+                'Notification handler does not respond correctly.');
                 $this->showResult(false, $msg);
                 return;
             }
@@ -158,6 +164,7 @@ class RSSCloudRequestNotifyAction extends Action
         // XXX: What to do about deleting stale subscriptions?
         // 25 hours seems harsh. WordPress doesn't ever remove
         // subscriptions.
+        // TRANS: Success message after subscribing to one or more feeds.
         $msg = _m('Thanks for the subscription. ' .
           'When the feed(s) update(s), you will be notified.');
 
@@ -222,7 +229,6 @@ class RSSCloudRequestNotifyAction extends Action
                        'RSSCloud plugin - Testing notification handler with challenge: ' .
                        $notifyUrl);
             return $notifier->challenge($notifyUrl, $feed);
-
         } else {
             common_log(LOG_INFO, 'RSSCloud plugin - Testing notification handler: ' .
                        $notifyUrl);
@@ -291,7 +297,6 @@ class RSSCloudRequestNotifyAction extends Action
             common_log(LOG_INFO, "RSSCloud plugin - $notifyUrl refreshed subscription" .
                          " to user $user->nickname (id: $user->id).");
         } else {
-
             $sub = new RSSCloudSubscription();
 
             $sub->subscribed = $user->id;
diff --git a/plugins/RSSCloud/locale/RSSCloud.pot b/plugins/RSSCloud/locale/RSSCloud.pot
index 473ae99c4c..b14d3f1b6a 100644
--- a/plugins/RSSCloud/locale/RSSCloud.pot
+++ b/plugins/RSSCloud/locale/RSSCloud.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,54 +16,71 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: LoggingAggregator.php:85
+#. TRANS: Form validation error displayed when a URL parameter is missing.
+#: LoggingAggregator.php:86
 msgid "A URL parameter is required."
 msgstr ""
 
-#: LoggingAggregator.php:93
+#. TRANS: Form validation error displayed when HTTP GET is not used.
+#: LoggingAggregator.php:94
 msgid "This resource requires an HTTP GET."
 msgstr ""
 
+#. TRANS: Form validation error displayed when HTTP POST is not used.
 #: LoggingAggregator.php:104
 msgid "This resource requires an HTTP POST."
 msgstr ""
 
-#: RSSCloudRequestNotify.php:90
+#. TRANS: Form validation error displayed when POST is not used.
+#: RSSCloudRequestNotify.php:91
 msgid "Request must be POST."
 msgstr ""
 
-#: RSSCloudRequestNotify.php:107
-msgid "Only http-post notifications are supported at this time."
+#. TRANS: Form validation error displayed when HTTP POST is not used.
+#: RSSCloudRequestNotify.php:109
+msgid "Only HTTP POST notifications are supported at this time."
 msgstr ""
 
-#. TRANS: %s is a comma separated list of parameters.
-#: RSSCloudRequestNotify.php:118
+#. TRANS: List separator.
+#: RSSCloudRequestNotify.php:120
+msgctxt "SEPARATOR"
+msgid ", "
+msgstr ""
+
+#. TRANS: Form validation error displayed when a request body is missing expected parameters.
+#. TRANS: %s is a list of parameters separated by a list separator (default: ", ").
+#: RSSCloudRequestNotify.php:123
 #, php-format
 msgid "The following parameters were missing from the request body: %s."
 msgstr ""
 
-#: RSSCloudRequestNotify.php:124
+#. TRANS: Form validation error displayed when not providing any valid profile feed URLs.
+#: RSSCloudRequestNotify.php:130
 msgid ""
-"You must provide at least one valid profile feed url (url1, url2, url3 ... "
+"You must provide at least one valid profile feed URL (url1, url2, url3 ... "
 "urlN)."
 msgstr ""
 
-#: RSSCloudRequestNotify.php:141
+#. TRANS: Form validation error displayed when not providing a valid feed URL.
+#: RSSCloudRequestNotify.php:146
 msgid "Feed subscription failed: Not a valid feed."
 msgstr ""
 
-#: RSSCloudRequestNotify.php:147
+#. TRANS: Form validation error displayed when feed subscription failed.
+#: RSSCloudRequestNotify.php:153
 msgid ""
-"Feed subscription failed - notification handler doesn't respond correctly."
+"Feed subscription failed: Notification handler does not respond correctly."
 msgstr ""
 
-#: RSSCloudRequestNotify.php:161
+#. TRANS: Success message after subscribing to one or more feeds.
+#: RSSCloudRequestNotify.php:168
 msgid ""
 "Thanks for the subscription. When the feed(s) update(s), you will be "
 "notified."
 msgstr ""
 
-#: RSSCloudPlugin.php:245
+#. TRANS: Plugin description.
+#: RSSCloudPlugin.php:241
 msgid ""
 "The RSSCloud plugin enables your StatusNet instance to publish real-time "
 "updates for profile RSS feeds using the <a href=\"http://rsscloud.org/"
diff --git a/plugins/RSSCloud/locale/de/LC_MESSAGES/RSSCloud.po b/plugins/RSSCloud/locale/de/LC_MESSAGES/RSSCloud.po
index b461e9f0c3..71920eefa8 100644
--- a/plugins/RSSCloud/locale/de/LC_MESSAGES/RSSCloud.po
+++ b/plugins/RSSCloud/locale/de/LC_MESSAGES/RSSCloud.po
@@ -1,6 +1,7 @@
 # Translation of StatusNet - RSSCloud to German (Deutsch)
 # Exported from translatewiki.net
 #
+# Author: ChrisiPK
 # Author: David Güdel
 # Author: Fujnky
 # Author: Giftpflanze
@@ -12,54 +13,69 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - RSSCloud\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:09+0000\n"
-"Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:52+0000\n"
+"Language-Team: German <https://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:19+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-08-16 06:59:35+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-rsscloud\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Form validation error displayed when a URL parameter is missing.
 msgid "A URL parameter is required."
 msgstr "Ein URL-Parameter ist erforderlich."
 
+#. TRANS: Form validation error displayed when HTTP GET is not used.
 msgid "This resource requires an HTTP GET."
 msgstr "Diese Ressource erfordert eine HTTP-GET-Anfrage."
 
+#. TRANS: Form validation error displayed when HTTP POST is not used.
 msgid "This resource requires an HTTP POST."
 msgstr "Diese Ressource erfordert eine HTTP-POST-Anfrage."
 
+#. TRANS: Form validation error displayed when POST is not used.
 msgid "Request must be POST."
 msgstr "Anfrage muss ein POST sein."
 
-msgid "Only http-post notifications are supported at this time."
+#. TRANS: Form validation error displayed when HTTP POST is not used.
+msgid "Only HTTP POST notifications are supported at this time."
 msgstr "Nur HTTP-POST-Benachrichtigungen werden im Moment unterstützt."
 
-#. TRANS: %s is a comma separated list of parameters.
+#. TRANS: List separator.
+msgctxt "SEPARATOR"
+msgid ", "
+msgstr ", "
+
+#. TRANS: Form validation error displayed when a request body is missing expected parameters.
+#. TRANS: %s is a list of parameters separated by a list separator (default: ", ").
 #, php-format
 msgid "The following parameters were missing from the request body: %s."
 msgstr "Die folgenden Parameter fehlten aus den Anforderungshauptteil: %s."
 
+#. TRANS: Form validation error displayed when not providing any valid profile feed URLs.
 msgid ""
-"You must provide at least one valid profile feed url (url1, url2, url3 ... "
+"You must provide at least one valid profile feed URL (url1, url2, url3 ... "
 "urlN)."
 msgstr ""
 "Du musst mindestens eine gültige Profil-Feed-URL angeben (url1, url2, url3 … "
 "urlN)."
 
+#. TRANS: Form validation error displayed when not providing a valid feed URL.
 msgid "Feed subscription failed: Not a valid feed."
 msgstr "Feed-Abonnement fehlgeschlagen: Ungültiger Feed."
 
+#. TRANS: Form validation error displayed when feed subscription failed.
 msgid ""
-"Feed subscription failed - notification handler doesn't respond correctly."
+"Feed subscription failed: Notification handler does not respond correctly."
 msgstr ""
-"Feed-Abonnement fehlgeschlagen - Benachrichtigungs-Handler reagiert nicht "
+"Feed-Abonnement fehlgeschlagen: Benachrichtigungs-Handler reagiert nicht "
 "richtig."
 
+#. TRANS: Success message after subscribing to one or more feeds.
 msgid ""
 "Thanks for the subscription. When the feed(s) update(s), you will be "
 "notified."
@@ -67,6 +83,7 @@ msgstr ""
 "Vielen Dank für das Abonnement. Du wirst benachrichtigt, wenn der Feed "
 "aktualisiert wird."
 
+#. TRANS: Plugin description.
 msgid ""
 "The RSSCloud plugin enables your StatusNet instance to publish real-time "
 "updates for profile RSS feeds using the <a href=\"http://rsscloud.org/"
diff --git a/plugins/RSSCloud/locale/es/LC_MESSAGES/RSSCloud.po b/plugins/RSSCloud/locale/es/LC_MESSAGES/RSSCloud.po
new file mode 100644
index 0000000000..ce8bb0b4d4
--- /dev/null
+++ b/plugins/RSSCloud/locale/es/LC_MESSAGES/RSSCloud.po
@@ -0,0 +1,89 @@
+# Translation of StatusNet - RSSCloud to Spanish (español)
+# Exported from translatewiki.net
+#
+# Author: Armando-Martin
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - RSSCloud\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:53+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-08-16 06:59:35+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Form validation error displayed when a URL parameter is missing.
+msgid "A URL parameter is required."
+msgstr "Se requiere un parámetro de dirección URL."
+
+#. TRANS: Form validation error displayed when HTTP GET is not used.
+msgid "This resource requires an HTTP GET."
+msgstr "Este recurso requiere una solicitud HTTP GET."
+
+#. TRANS: Form validation error displayed when HTTP POST is not used.
+msgid "This resource requires an HTTP POST."
+msgstr "Este recurso necesita una solicitud HTTP POST."
+
+#. TRANS: Form validation error displayed when POST is not used.
+msgid "Request must be POST."
+msgstr "La solicitud debe ser POST."
+
+#. TRANS: Form validation error displayed when HTTP POST is not used.
+msgid "Only HTTP POST notifications are supported at this time."
+msgstr ""
+"En este momento son compatibles solamente las notificaciones de HTTP POST."
+
+#. TRANS: List separator.
+msgctxt "SEPARATOR"
+msgid ", "
+msgstr ", "
+
+#. TRANS: Form validation error displayed when a request body is missing expected parameters.
+#. TRANS: %s is a list of parameters separated by a list separator (default: ", ").
+#, php-format
+msgid "The following parameters were missing from the request body: %s."
+msgstr "Faltan los siguientes parámetros en el cuerpo de la solicitud:  %s ."
+
+#. TRANS: Form validation error displayed when not providing any valid profile feed URLs.
+msgid ""
+"You must provide at least one valid profile feed URL (url1, url2, url3 ... "
+"urlN)."
+msgstr ""
+"Debe proporcionar al menos una dirección URL de canal web (feed), de perfil "
+"válido, (url1, url2, url3... urlN)."
+
+#. TRANS: Form validation error displayed when not providing a valid feed URL.
+msgid "Feed subscription failed: Not a valid feed."
+msgstr ""
+"Error en la suscripción al canal web (feed): No es un canal web válido."
+
+#. TRANS: Form validation error displayed when feed subscription failed.
+msgid ""
+"Feed subscription failed: Notification handler does not respond correctly."
+msgstr ""
+"Error en la suscripción al canal web (feed): el controlador de "
+"notificaciones no responde correctamente."
+
+#. TRANS: Success message after subscribing to one or more feeds.
+msgid ""
+"Thanks for the subscription. When the feed(s) update(s), you will be "
+"notified."
+msgstr ""
+"Gracias por la suscripción. Cuando se actualice el canal web (feed), se le "
+"notificará."
+
+#. TRANS: Plugin description.
+msgid ""
+"The RSSCloud plugin enables your StatusNet instance to publish real-time "
+"updates for profile RSS feeds using the <a href=\"http://rsscloud.org/"
+"\">RSSCloud protocol</a>."
+msgstr ""
+"El complemento (plugin) RSSCloud permite a su instancia StatusNet publicar "
+"actualizaciones en tiempo real para canales RSS de perfil mediante el <a "
+"href=\"http://rsscloud.org/\">protocolo RSSCloud</a>."
diff --git a/plugins/RSSCloud/locale/eu/LC_MESSAGES/RSSCloud.po b/plugins/RSSCloud/locale/eu/LC_MESSAGES/RSSCloud.po
new file mode 100644
index 0000000000..9d915af03f
--- /dev/null
+++ b/plugins/RSSCloud/locale/eu/LC_MESSAGES/RSSCloud.po
@@ -0,0 +1,78 @@
+# Translation of StatusNet - RSSCloud to Basque (euskara)
+# Exported from translatewiki.net
+#
+# Author: Artsuaga
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - RSSCloud\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:53+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-08-16 06:59:35+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Form validation error displayed when a URL parameter is missing.
+msgid "A URL parameter is required."
+msgstr "URL parametroa ezinbestekoa da."
+
+#. TRANS: Form validation error displayed when HTTP GET is not used.
+msgid "This resource requires an HTTP GET."
+msgstr "Baliabide honek HTTP GET bat behar du."
+
+#. TRANS: Form validation error displayed when HTTP POST is not used.
+msgid "This resource requires an HTTP POST."
+msgstr "Metodo honek POST bat behar du."
+
+#. TRANS: Form validation error displayed when POST is not used.
+msgid "Request must be POST."
+msgstr "Eskariak POST izan behar du."
+
+#. TRANS: Form validation error displayed when HTTP POST is not used.
+msgid "Only HTTP POST notifications are supported at this time."
+msgstr ""
+
+#. TRANS: List separator.
+msgctxt "SEPARATOR"
+msgid ", "
+msgstr ", "
+
+#. TRANS: Form validation error displayed when a request body is missing expected parameters.
+#. TRANS: %s is a list of parameters separated by a list separator (default: ", ").
+#, php-format
+msgid "The following parameters were missing from the request body: %s."
+msgstr ""
+
+#. TRANS: Form validation error displayed when not providing any valid profile feed URLs.
+msgid ""
+"You must provide at least one valid profile feed URL (url1, url2, url3 ... "
+"urlN)."
+msgstr ""
+
+#. TRANS: Form validation error displayed when not providing a valid feed URL.
+msgid "Feed subscription failed: Not a valid feed."
+msgstr ""
+
+#. TRANS: Form validation error displayed when feed subscription failed.
+msgid ""
+"Feed subscription failed: Notification handler does not respond correctly."
+msgstr ""
+
+#. TRANS: Success message after subscribing to one or more feeds.
+msgid ""
+"Thanks for the subscription. When the feed(s) update(s), you will be "
+"notified."
+msgstr ""
+
+#. TRANS: Plugin description.
+msgid ""
+"The RSSCloud plugin enables your StatusNet instance to publish real-time "
+"updates for profile RSS feeds using the <a href=\"http://rsscloud.org/"
+"\">RSSCloud protocol</a>."
+msgstr ""
diff --git a/plugins/RSSCloud/locale/fr/LC_MESSAGES/RSSCloud.po b/plugins/RSSCloud/locale/fr/LC_MESSAGES/RSSCloud.po
index 9157307e42..7ebca96218 100644
--- a/plugins/RSSCloud/locale/fr/LC_MESSAGES/RSSCloud.po
+++ b/plugins/RSSCloud/locale/fr/LC_MESSAGES/RSSCloud.po
@@ -1,7 +1,10 @@
-# Translation of StatusNet - RSSCloud to French (Français)
+# Translation of StatusNet - RSSCloud to French (français)
 # Exported from translatewiki.net
 #
+# Author: Crochet.david
+# Author: Gomoko
 # Author: Od1n
+# Author: Valeryan 24
 # Author: Verdy p
 # --
 # This file is distributed under the same license as the StatusNet package.
@@ -10,58 +13,71 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - RSSCloud\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:09+0000\n"
-"Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:53+0000\n"
+"Language-Team: French <https://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:19+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-08-16 06:59:35+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-rsscloud\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#. TRANS: Form validation error displayed when a URL parameter is missing.
 msgid "A URL parameter is required."
 msgstr "Un paramètre d’URL est requis."
 
+#. TRANS: Form validation error displayed when HTTP GET is not used.
 msgid "This resource requires an HTTP GET."
 msgstr "Cette ressource nécessite une requête HTTP GET."
 
+#. TRANS: Form validation error displayed when HTTP POST is not used.
 msgid "This resource requires an HTTP POST."
 msgstr "Cette ressource nécessite une requête HTTP POST."
 
+#. TRANS: Form validation error displayed when POST is not used.
 msgid "Request must be POST."
 msgstr "La requête HTTP au nuage RSS doit être de type POST."
 
-msgid "Only http-post notifications are supported at this time."
-msgstr ""
-"Seules les notifications HTTP-POST sont prises en charge en ce moment sur le "
-"nuage RSS."
+#. TRANS: Form validation error displayed when HTTP POST is not used.
+msgid "Only HTTP POST notifications are supported at this time."
+msgstr "Seuls les notifications HTTP POST sont pris en charge en ce moment."
 
-#. TRANS: %s is a comma separated list of parameters.
+#. TRANS: List separator.
+msgctxt "SEPARATOR"
+msgid ", "
+msgstr ", "
+
+#. TRANS: Form validation error displayed when a request body is missing expected parameters.
+#. TRANS: %s is a list of parameters separated by a list separator (default: ", ").
 #, php-format
 msgid "The following parameters were missing from the request body: %s."
 msgstr ""
 "Les paramètres suivants étaient absents du corps de la requête au nuage "
 "RSS : %s."
 
+#. TRANS: Form validation error displayed when not providing any valid profile feed URLs.
 msgid ""
-"You must provide at least one valid profile feed url (url1, url2, url3 ... "
+"You must provide at least one valid profile feed URL (url1, url2, url3 ... "
 "urlN)."
 msgstr ""
-"Vous devez fournir au moins une adresse URL de flux de profil valide (url1, "
-"url2, url3 ... urlN)."
+"Vous devez fournir au moins une URL de flux de profil valide (url1, url2, "
+"url3 ... urlN)."
 
+#. TRANS: Form validation error displayed when not providing a valid feed URL.
 msgid "Feed subscription failed: Not a valid feed."
 msgstr "L’abonnement au flux a échoué : ce n’est pas un flux RSS valide."
 
+#. TRANS: Form validation error displayed when feed subscription failed.
 msgid ""
-"Feed subscription failed - notification handler doesn't respond correctly."
+"Feed subscription failed: Notification handler does not respond correctly."
 msgstr ""
 "L’abonnement au flux RSS a échoué : le gestionnaire de notifications ne "
 "répond pas correctement."
 
+#. TRANS: Success message after subscribing to one or more feeds.
 msgid ""
 "Thanks for the subscription. When the feed(s) update(s), you will be "
 "notified."
@@ -69,6 +85,7 @@ msgstr ""
 "Merci pour l’abonnement. Vous serez informé lors des mises à jour de ce(s) "
 "flux."
 
+#. TRANS: Plugin description.
 msgid ""
 "The RSSCloud plugin enables your StatusNet instance to publish real-time "
 "updates for profile RSS feeds using the <a href=\"http://rsscloud.org/"
diff --git a/plugins/RSSCloud/locale/gl/LC_MESSAGES/RSSCloud.po b/plugins/RSSCloud/locale/gl/LC_MESSAGES/RSSCloud.po
new file mode 100644
index 0000000000..54cd26cb5c
--- /dev/null
+++ b/plugins/RSSCloud/locale/gl/LC_MESSAGES/RSSCloud.po
@@ -0,0 +1,91 @@
+# Translation of StatusNet - RSSCloud to Galician (galego)
+# Exported from translatewiki.net
+#
+# Author: Toliño
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - RSSCloud\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:53+0000\n"
+"Language-Team: Galician <https://translatewiki.net/wiki/Portal:gl>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-08-16 06:59:35+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: gl\n"
+"X-Message-Group: #out-statusnet-plugin-rsscloud\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Form validation error displayed when a URL parameter is missing.
+msgid "A URL parameter is required."
+msgstr "Cómpre un parámetro de enderezo URL."
+
+#. TRANS: Form validation error displayed when HTTP GET is not used.
+msgid "This resource requires an HTTP GET."
+msgstr "Este recurso necesita unha solicitude HTTP GET."
+
+#. TRANS: Form validation error displayed when HTTP POST is not used.
+msgid "This resource requires an HTTP POST."
+msgstr "Este recurso necesita unha solicitude HTTP POST."
+
+#. TRANS: Form validation error displayed when POST is not used.
+msgid "Request must be POST."
+msgstr "A solicitude debe ser POST."
+
+#. TRANS: Form validation error displayed when HTTP POST is not used.
+msgid "Only HTTP POST notifications are supported at this time."
+msgstr "Nestes intres, unicamente as notificacións HTTP POST están soportadas."
+
+#. TRANS: List separator.
+msgctxt "SEPARATOR"
+msgid ", "
+msgstr ", "
+
+#. TRANS: Form validation error displayed when a request body is missing expected parameters.
+#. TRANS: %s is a list of parameters separated by a list separator (default: ", ").
+#, php-format
+msgid "The following parameters were missing from the request body: %s."
+msgstr "Faltan os seguintes parámetros no corpo da solicitude: %s."
+
+#. TRANS: Form validation error displayed when not providing any valid profile feed URLs.
+msgid ""
+"You must provide at least one valid profile feed URL (url1, url2, url3 ... "
+"urlN)."
+msgstr ""
+"Debe proporcionar, polo menos, un enderezo URL de fonte de novas de perfil "
+"válido (url1, url2, url3, ..., urlN)."
+
+#. TRANS: Form validation error displayed when not providing a valid feed URL.
+msgid "Feed subscription failed: Not a valid feed."
+msgstr ""
+"Erro na subscrición á fonte de novas: Non é unha fonte de novas válida."
+
+#. TRANS: Form validation error displayed when feed subscription failed.
+msgid ""
+"Feed subscription failed: Notification handler does not respond correctly."
+msgstr ""
+"Erro na subscrición á fonte de novas: O xestor de notificacións non responde "
+"correctamente."
+
+#. TRANS: Success message after subscribing to one or more feeds.
+msgid ""
+"Thanks for the subscription. When the feed(s) update(s), you will be "
+"notified."
+msgstr ""
+"Grazas pola subcrición. Cando o(s) filtro(s) se actualice(n), recibirá unha "
+"notificación."
+
+#. TRANS: Plugin description.
+msgid ""
+"The RSSCloud plugin enables your StatusNet instance to publish real-time "
+"updates for profile RSS feeds using the <a href=\"http://rsscloud.org/"
+"\">RSSCloud protocol</a>."
+msgstr ""
+"O complemento RSSCloud activa a súa instancia StatusNet para publicar "
+"actualizacións en tempo real para as fontes de novas RSS dos perfís mediante "
+"o <a href=\"http://rsscloud.org/\">protocolo RSSCloud</a>."
diff --git a/plugins/RSSCloud/locale/ia/LC_MESSAGES/RSSCloud.po b/plugins/RSSCloud/locale/ia/LC_MESSAGES/RSSCloud.po
index a3d7182ce3..b87cd9e4d4 100644
--- a/plugins/RSSCloud/locale/ia/LC_MESSAGES/RSSCloud.po
+++ b/plugins/RSSCloud/locale/ia/LC_MESSAGES/RSSCloud.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - RSSCloud to Interlingua (Interlingua)
+# Translation of StatusNet - RSSCloud to Interlingua (interlingua)
 # Exported from translatewiki.net
 #
 # Author: McDutchie
@@ -9,54 +9,69 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - RSSCloud\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:09+0000\n"
-"Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:53+0000\n"
+"Language-Team: Interlingua <https://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:19+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-08-16 06:59:35+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-rsscloud\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Form validation error displayed when a URL parameter is missing.
 msgid "A URL parameter is required."
 msgstr "Un parametro de URL es obligatori."
 
+#. TRANS: Form validation error displayed when HTTP GET is not used.
 msgid "This resource requires an HTTP GET."
 msgstr "Iste ressource require un HTTP GET."
 
+#. TRANS: Form validation error displayed when HTTP POST is not used.
 msgid "This resource requires an HTTP POST."
 msgstr "Iste ressource require un HTTP POST."
 
+#. TRANS: Form validation error displayed when POST is not used.
 msgid "Request must be POST."
 msgstr "Requesta debe esser POST."
 
-msgid "Only http-post notifications are supported at this time."
-msgstr "Solmente le notificationes http-post es presentemente supportate."
+#. TRANS: Form validation error displayed when HTTP POST is not used.
+msgid "Only HTTP POST notifications are supported at this time."
+msgstr "Solmente le notificationes HTTP POST es presentemente supportate."
 
-#. TRANS: %s is a comma separated list of parameters.
+#. TRANS: List separator.
+msgctxt "SEPARATOR"
+msgid ", "
+msgstr ", "
+
+#. TRANS: Form validation error displayed when a request body is missing expected parameters.
+#. TRANS: %s is a list of parameters separated by a list separator (default: ", ").
 #, php-format
 msgid "The following parameters were missing from the request body: %s."
 msgstr "Le sequente parametros mancava del corpore del requesta: %s."
 
+#. TRANS: Form validation error displayed when not providing any valid profile feed URLs.
 msgid ""
-"You must provide at least one valid profile feed url (url1, url2, url3 ... "
+"You must provide at least one valid profile feed URL (url1, url2, url3 ... "
 "urlN)."
 msgstr ""
 "Tu debe fornir al minus un URL de syndication de profilo valide (url1, url2, "
 "url3 ... urlN)."
 
+#. TRANS: Form validation error displayed when not providing a valid feed URL.
 msgid "Feed subscription failed: Not a valid feed."
 msgstr "Le subscription al syndication ha fallite: Non un syndication valide."
 
+#. TRANS: Form validation error displayed when feed subscription failed.
 msgid ""
-"Feed subscription failed - notification handler doesn't respond correctly."
+"Feed subscription failed: Notification handler does not respond correctly."
 msgstr ""
-"Le subscription al syndication ha fallite - le gestor de notification non "
+"Le subscription al syndication ha fallite: le gestor de notification non "
 "responde correctemente."
 
+#. TRANS: Success message after subscribing to one or more feeds.
 msgid ""
 "Thanks for the subscription. When the feed(s) update(s), you will be "
 "notified."
@@ -64,6 +79,7 @@ msgstr ""
 "Gratias pro le subscription. Quando le syndication(es) se actualisa, tu "
 "recipera notification."
 
+#. TRANS: Plugin description.
 msgid ""
 "The RSSCloud plugin enables your StatusNet instance to publish real-time "
 "updates for profile RSS feeds using the <a href=\"http://rsscloud.org/"
diff --git a/plugins/RSSCloud/locale/mk/LC_MESSAGES/RSSCloud.po b/plugins/RSSCloud/locale/mk/LC_MESSAGES/RSSCloud.po
index 5b330cdd80..76b6e045d2 100644
--- a/plugins/RSSCloud/locale/mk/LC_MESSAGES/RSSCloud.po
+++ b/plugins/RSSCloud/locale/mk/LC_MESSAGES/RSSCloud.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - RSSCloud to Macedonian (Македон�ки)
+# Translation of StatusNet - RSSCloud to Macedonian (македон�ки)
 # Exported from translatewiki.net
 #
 # Author: Bjankuloski06
@@ -9,54 +9,69 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - RSSCloud\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:10+0000\n"
-"Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:53+0000\n"
+"Language-Team: Macedonian <https://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:19+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-08-16 06:59:35+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-rsscloud\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
 
+#. TRANS: Form validation error displayed when a URL parameter is missing.
 msgid "A URL parameter is required."
 msgstr "Се бара параметар за URL."
 
+#. TRANS: Form validation error displayed when HTTP GET is not used.
 msgid "This resource requires an HTTP GET."
 msgstr "Овој ре�ур� бара HTTP GET."
 
+#. TRANS: Form validation error displayed when HTTP POST is not used.
 msgid "This resource requires an HTTP POST."
 msgstr "Овој ре�ур� бара HTTP POST."
 
+#. TRANS: Form validation error displayed when POST is not used.
 msgid "Request must be POST."
 msgstr "Барањето мора да биде POST."
 
-msgid "Only http-post notifications are supported at this time."
-msgstr "Моментално �е поддржани �амо изве�тувања од типот http-post."
+#. TRANS: Form validation error displayed when HTTP POST is not used.
+msgid "Only HTTP POST notifications are supported at this time."
+msgstr "Моментално �е поддржани �амо изве�тувања од типот HTTP POST."
 
-#. TRANS: %s is a comma separated list of parameters.
+#. TRANS: List separator.
+msgctxt "SEPARATOR"
+msgid ", "
+msgstr ", "
+
+#. TRANS: Form validation error displayed when a request body is missing expected parameters.
+#. TRANS: %s is a list of parameters separated by a list separator (default: ", ").
 #, php-format
 msgid "The following parameters were missing from the request body: %s."
 msgstr "Следниве параметри недо�та�уваа од �одржината на барањето: %s."
 
+#. TRANS: Form validation error displayed when not providing any valid profile feed URLs.
 msgid ""
-"You must provide at least one valid profile feed url (url1, url2, url3 ... "
+"You must provide at least one valid profile feed URL (url1, url2, url3 ... "
 "urlN)."
 msgstr ""
 "Мора да наведете барем едеа важечка URL-адре�а за профилен канал (url1, "
 "url2, url3 ... urlN)."
 
+#. TRANS: Form validation error displayed when not providing a valid feed URL.
 msgid "Feed subscription failed: Not a valid feed."
 msgstr "Претплаќањето на каналот не у�пеа: �е е важечки канал."
 
+#. TRANS: Form validation error displayed when feed subscription failed.
 msgid ""
-"Feed subscription failed - notification handler doesn't respond correctly."
+"Feed subscription failed: Notification handler does not respond correctly."
 msgstr ""
-"Претплаќањето на каналот не у�пеа - ракувачот �о изве�тувања не одговара "
+"!Претплаќањето на каналот не у�пеа: ракувачот �о изве�тувања не одговара "
 "правилно."
 
+#. TRANS: Success message after subscribing to one or more feeds.
 msgid ""
 "Thanks for the subscription. When the feed(s) update(s), you will be "
 "notified."
@@ -64,6 +79,7 @@ msgstr ""
 "Ви благодариме шт о�е претплативте. Ќе бидете изве�тени за �ите подновувања "
 "на каналот/ите."
 
+#. TRANS: Plugin description.
 msgid ""
 "The RSSCloud plugin enables your StatusNet instance to publish real-time "
 "updates for profile RSS feeds using the <a href=\"http://rsscloud.org/"
diff --git a/plugins/RSSCloud/locale/nl/LC_MESSAGES/RSSCloud.po b/plugins/RSSCloud/locale/nl/LC_MESSAGES/RSSCloud.po
index 0ab139d1d1..7756221e44 100644
--- a/plugins/RSSCloud/locale/nl/LC_MESSAGES/RSSCloud.po
+++ b/plugins/RSSCloud/locale/nl/LC_MESSAGES/RSSCloud.po
@@ -9,54 +9,69 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - RSSCloud\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:10+0000\n"
-"Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:53+0000\n"
+"Language-Team: Dutch <https://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:19+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-08-16 06:59:35+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-rsscloud\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Form validation error displayed when a URL parameter is missing.
 msgid "A URL parameter is required."
 msgstr "Er is een URL-parameter vereist."
 
+#. TRANS: Form validation error displayed when HTTP GET is not used.
 msgid "This resource requires an HTTP GET."
 msgstr "Deze bron heeft een HTTP GET nodig."
 
+#. TRANS: Form validation error displayed when HTTP POST is not used.
 msgid "This resource requires an HTTP POST."
 msgstr "Deze bron heeft een HTTP POST nodig."
 
+#. TRANS: Form validation error displayed when POST is not used.
 msgid "Request must be POST."
 msgstr "Het verzoek moet POST zijn."
 
-msgid "Only http-post notifications are supported at this time."
-msgstr "Op dit moment worden alle mededelingen via HTTP POST ondersteund."
+#. TRANS: Form validation error displayed when HTTP POST is not used.
+msgid "Only HTTP POST notifications are supported at this time."
+msgstr "Op dit moment worden alleen mededelingen via HTTP POST ondersteund."
 
-#. TRANS: %s is a comma separated list of parameters.
+#. TRANS: List separator.
+msgctxt "SEPARATOR"
+msgid ", "
+msgstr ", "
+
+#. TRANS: Form validation error displayed when a request body is missing expected parameters.
+#. TRANS: %s is a list of parameters separated by a list separator (default: ", ").
 #, php-format
 msgid "The following parameters were missing from the request body: %s."
 msgstr "De volgende parameters missen in de verzoekinhoud: %s."
 
+#. TRANS: Form validation error displayed when not providing any valid profile feed URLs.
 msgid ""
-"You must provide at least one valid profile feed url (url1, url2, url3 ... "
+"You must provide at least one valid profile feed URL (url1, url2, url3 ... "
 "urlN)."
 msgstr ""
-"U moet tenminste een geldige URL voor een profielfeed opgeven ( url1, url2, "
+"U moet tenminste één geldige URL voor een profielfeed opgeven ( url1, url2, "
 "url3, ..., urlN)."
 
+#. TRANS: Form validation error displayed when not providing a valid feed URL.
 msgid "Feed subscription failed: Not a valid feed."
 msgstr "Abonneren op de feed is mislukt: geen geldige feed."
 
+#. TRANS: Form validation error displayed when feed subscription failed.
 msgid ""
-"Feed subscription failed - notification handler doesn't respond correctly."
+"Feed subscription failed: Notification handler does not respond correctly."
 msgstr ""
 "Abonneren op de feed is mislukt: het verwerkingsproces heeft niet juist "
 "geantwoord."
 
+#. TRANS: Success message after subscribing to one or more feeds.
 msgid ""
 "Thanks for the subscription. When the feed(s) update(s), you will be "
 "notified."
@@ -64,6 +79,7 @@ msgstr ""
 "Dank u wel voor het abonneren. Als de feed of feeds bijgewerkt worden, wordt "
 "u op de hoogte gesteld."
 
+#. TRANS: Plugin description.
 msgid ""
 "The RSSCloud plugin enables your StatusNet instance to publish real-time "
 "updates for profile RSS feeds using the <a href=\"http://rsscloud.org/"
diff --git a/plugins/RSSCloud/locale/tl/LC_MESSAGES/RSSCloud.po b/plugins/RSSCloud/locale/tl/LC_MESSAGES/RSSCloud.po
index 29be46c548..4b799e3a56 100644
--- a/plugins/RSSCloud/locale/tl/LC_MESSAGES/RSSCloud.po
+++ b/plugins/RSSCloud/locale/tl/LC_MESSAGES/RSSCloud.po
@@ -9,54 +9,70 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - RSSCloud\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:10+0000\n"
-"Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:53+0000\n"
+"Language-Team: Tagalog <https://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:19+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-08-16 06:59:35+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-rsscloud\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Form validation error displayed when a URL parameter is missing.
 msgid "A URL parameter is required."
 msgstr "Kailangan ang isang parametro ng URL."
 
+#. TRANS: Form validation error displayed when HTTP GET is not used.
 msgid "This resource requires an HTTP GET."
 msgstr "Ang pinagkunang ito ay nangangailangan ng HTTP GET."
 
+#. TRANS: Form validation error displayed when HTTP POST is not used.
 msgid "This resource requires an HTTP POST."
 msgstr "Ang pinagkukunang ito ay nangangailangan ng HTTP POST."
 
+#. TRANS: Form validation error displayed when POST is not used.
 msgid "Request must be POST."
 msgstr "Ang hiling ay dapat na POST."
 
-msgid "Only http-post notifications are supported at this time."
-msgstr "Tanging mga pabatid na http-post lang ang tinatangkilik sa ngayon."
+#. TRANS: Form validation error displayed when HTTP POST is not used.
+msgid "Only HTTP POST notifications are supported at this time."
+msgstr ""
+"Tanging mga pabatid na HTTP POST lamang ang tinatangkilik sa panahong ito."
 
-#. TRANS: %s is a comma separated list of parameters.
+#. TRANS: List separator.
+msgctxt "SEPARATOR"
+msgid ", "
+msgstr ", "
+
+#. TRANS: Form validation error displayed when a request body is missing expected parameters.
+#. TRANS: %s is a list of parameters separated by a list separator (default: ", ").
 #, php-format
 msgid "The following parameters were missing from the request body: %s."
 msgstr "Nawawala ang sumusunod na mga parametro mula sa katawan ng hiling: %s."
 
+#. TRANS: Form validation error displayed when not providing any valid profile feed URLs.
 msgid ""
-"You must provide at least one valid profile feed url (url1, url2, url3 ... "
+"You must provide at least one valid profile feed URL (url1, url2, url3 ... "
 "urlN)."
 msgstr ""
-"Dapat kang magbigay ng kahit na isang url ng pakain ng tanggap na talaksan "
-"(url1, url2, url3 ... urlN)."
+"Dapat kang magbigay ng kahit na isang katanggap-tanggap na URL ng pakain ng "
+"balangkas (url1, url2, url3 ... urlN)."
 
+#. TRANS: Form validation error displayed when not providing a valid feed URL.
 msgid "Feed subscription failed: Not a valid feed."
 msgstr "Nabigo ang pagtanggap ng pakain: Hindi isang tanggap na pakain."
 
+#. TRANS: Form validation error displayed when feed subscription failed.
 msgid ""
-"Feed subscription failed - notification handler doesn't respond correctly."
+"Feed subscription failed: Notification handler does not respond correctly."
 msgstr ""
-"Nabigo ang pagtanggap ng pakain - hindi tama ang pagtugon ng tagapaghawak ng "
+"Nabigo ang pagpapasipi ng pakain: Hindi tama ang pagtugon ng tagapaghawak ng "
 "pabatid."
 
+#. TRANS: Success message after subscribing to one or more feeds.
 msgid ""
 "Thanks for the subscription. When the feed(s) update(s), you will be "
 "notified."
@@ -64,6 +80,7 @@ msgstr ""
 "Salamat sa pagtatanggap.  Kapag nagsapanahon ang (mga) pakain, pababatiran "
 "ka."
 
+#. TRANS: Plugin description.
 msgid ""
 "The RSSCloud plugin enables your StatusNet instance to publish real-time "
 "updates for profile RSS feeds using the <a href=\"http://rsscloud.org/"
diff --git a/plugins/RSSCloud/locale/uk/LC_MESSAGES/RSSCloud.po b/plugins/RSSCloud/locale/uk/LC_MESSAGES/RSSCloud.po
index 96e688bbf4..9070d21099 100644
--- a/plugins/RSSCloud/locale/uk/LC_MESSAGES/RSSCloud.po
+++ b/plugins/RSSCloud/locale/uk/LC_MESSAGES/RSSCloud.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - RSSCloud to Ukrainian (Україн�ька)
+# Translation of StatusNet - RSSCloud to Ukrainian (україн�ька)
 # Exported from translatewiki.net
 #
 # Author: Boogie
@@ -9,61 +9,77 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - RSSCloud\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:10+0000\n"
-"Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:53+0000\n"
+"Language-Team: Ukrainian <https://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:19+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-08-16 06:59:35+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-rsscloud\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
+#. TRANS: Form validation error displayed when a URL parameter is missing.
 msgid "A URL parameter is required."
 msgstr "Параметр URL-адре�и є обов’�зковим."
 
+#. TRANS: Form validation error displayed when HTTP GET is not used.
 msgid "This resource requires an HTTP GET."
 msgstr "Цей ре�ур� вимагає форми HTTP GET."
 
+#. TRANS: Form validation error displayed when HTTP POST is not used.
 msgid "This resource requires an HTTP POST."
 msgstr "Цей ре�ур� вимагає форми HTTP POST."
 
+#. TRANS: Form validation error displayed when POST is not used.
 msgid "Request must be POST."
 msgstr "Запит вимагає форми POST."
 
-msgid "Only http-post notifications are supported at this time."
+#. TRANS: Form validation error displayed when HTTP POST is not used.
+msgid "Only HTTP POST notifications are supported at this time."
 msgstr "�а даний момент підтримують�� лише �повіщенн� форми http-post."
 
-#. TRANS: %s is a comma separated list of parameters.
+#. TRANS: List separator.
+msgctxt "SEPARATOR"
+msgid ", "
+msgstr ", "
+
+#. TRANS: Form validation error displayed when a request body is missing expected parameters.
+#. TRANS: %s is a list of parameters separated by a list separator (default: ", ").
 #, php-format
 msgid "The following parameters were missing from the request body: %s."
 msgstr "У формі запиту від�утні на�тупні параметри: %s."
 
+#. TRANS: Form validation error displayed when not providing any valid profile feed URLs.
 msgid ""
-"You must provide at least one valid profile feed url (url1, url2, url3 ... "
+"You must provide at least one valid profile feed URL (url1, url2, url3 ... "
 "urlN)."
 msgstr ""
-"Ви повинні зазначити щонайменше один дій�ний профіль дл� URL-адре�и веб-"
-"�трічки (URL-адре�и через кому та пробіл)."
+"Ви повинні зазначити щонайменше одну дій�ну  URL-адре�у веб-�трічки (URL-"
+"адре�и через кому та пробіл)."
 
+#. TRANS: Form validation error displayed when not providing a valid feed URL.
 msgid "Feed subscription failed: Not a valid feed."
 msgstr "Підпи�ати�� до веб-�трічки не вдало��: ц� веб-�трічка не є дій�ною."
 
+#. TRANS: Form validation error displayed when feed subscription failed.
 msgid ""
-"Feed subscription failed - notification handler doesn't respond correctly."
+"Feed subscription failed: Notification handler does not respond correctly."
 msgstr ""
 "Підпи�ати�� до веб-�трічки не вдало��: обробник �повіщень відреагував "
 "неправильно."
 
+#. TRANS: Success message after subscribing to one or more feeds.
 msgid ""
 "Thanks for the subscription. When the feed(s) update(s), you will be "
 "notified."
 msgstr ""
 "Д�куємо за підпи�ку. Коли веб-�трічки оновл�ть��, ва� буде поінформовано."
 
+#. TRANS: Plugin description.
 msgid ""
 "The RSSCloud plugin enables your StatusNet instance to publish real-time "
 "updates for profile RSS feeds using the <a href=\"http://rsscloud.org/"
diff --git a/plugins/Realtime/RealtimePlugin.php b/plugins/Realtime/RealtimePlugin.php
index 709d65ac5d..0fa51ce861 100644
--- a/plugins/Realtime/RealtimePlugin.php
+++ b/plugins/Realtime/RealtimePlugin.php
@@ -51,7 +51,6 @@ class RealtimePlugin extends Plugin
      * When it's time to initialize the plugin, calculate and
      * pass the URLs we need.
      */
-
     function onInitializePlugin()
     {
         // FIXME: need to find a better way to pass this pattern in
@@ -60,9 +59,57 @@ class RealtimePlugin extends Plugin
         return true;
     }
 
+    function onCheckSchema()
+    {
+        $schema = Schema::get();
+        $schema->ensureTable('realtime_channel', Realtime_channel::schemaDef());
+        return true;
+    }
+
+    function onAutoload($cls)
+    {
+        $dir = dirname(__FILE__);
+
+        switch ($cls)
+        {
+        case 'KeepalivechannelAction':
+        case 'ClosechannelAction':
+            include_once $dir . '/' . strtolower(mb_substr($cls, 0, -6)) . '.php';
+            return false;
+        case 'Realtime_channel':
+            include_once $dir.'/'.$cls.'.php';
+            return false;
+        default:
+            return true;
+        }
+    }
+
+    /**
+     * Hook for RouterInitialized event.
+     *
+     * @param Net_URL_Mapper $m path-to-action mapper
+     * @return boolean hook return
+     */
+    function onRouterInitialized($m)
+    {
+        $m->connect('main/channel/:channelkey/keepalive',
+                    array('action' => 'keepalivechannel'),
+                    array('channelkey' => '[a-z0-9]{32}'));
+        $m->connect('main/channel/:channelkey/close',
+                    array('action' => 'closechannel'),
+                    array('channelkey' => '[a-z0-9]{32}'));
+        return true;
+    }
+
     function onEndShowScripts($action)
     {
-        $timeline = $this->_getTimeline($action);
+        $channel = $this->_getChannel($action);
+
+        if (empty($channel)) {
+            return true;
+        }
+
+        $timeline = $this->_pathToChannel(array($channel->channel_key));
 
         // If there's not a timeline on this page,
         // just return true
@@ -97,12 +144,14 @@ class RealtimePlugin extends Plugin
         }
         else {
             $pluginPath = common_path('plugins/Realtime/');
-            $realtimeUI = ' RealtimeUpdate.initActions("'.$url.'", "'.$timeline.'", "'. $pluginPath .'");';
+            $keepalive = common_local_url('keepalivechannel', array('channelkey' => $channel->channel_key));
+            $close = common_local_url('closechannel', array('channelkey' => $channel->channel_key));
+            $realtimeUI = ' RealtimeUpdate.initActions('.json_encode($url).', '.json_encode($timeline).', '.json_encode($pluginPath).', '.json_encode($keepalive).', '.json_encode($close).'); ';
         }
 
         $script = ' $(document).ready(function() { '.
           $realtimeUI.
-          $this->_updateInitialize($timeline, $user_id).
+            $this->_updateInitialize($timeline, $user_id).
           '}); ';
         $action->inlineScript($script);
 
@@ -123,17 +172,24 @@ class RealtimePlugin extends Plugin
 
         // Add to the author's timeline
 
+        try {
+            $profile = $notice->getProfile();
+        } catch (Exception $e) {
+            $this->log(LOG_ERR, $e->getMessage());
+            return true;
+        }
+
         $user = User::staticGet('id', $notice->profile_id);
 
         if (!empty($user)) {
-            $paths[] = array('showstream', $user->nickname);
+            $paths[] = array('showstream', $user->nickname, null);
         }
 
         // Add to the public timeline
 
         if ($notice->is_local == Notice::LOCAL_PUBLIC ||
-            ($notice->is_local == Notice::REMOTE_OMB && !common_config('public', 'localonly'))) {
-            $paths[] = array('public');
+            ($notice->is_local == Notice::REMOTE && !common_config('public', 'localonly'))) {
+            $paths[] = array('public', null, null);
         }
 
         // Add to the tags timeline
@@ -142,7 +198,7 @@ class RealtimePlugin extends Plugin
 
         if (!empty($tags)) {
             foreach ($tags as $tag) {
-                $paths[] = array('tag', $tag);
+                $paths[] = array('tag', $tag, null);
             }
         }
 
@@ -153,7 +209,7 @@ class RealtimePlugin extends Plugin
 
         foreach (array_keys($ni) as $user_id) {
             $user = User::staticGet('id', $user_id);
-            $paths[] = array('all', $user->nickname);
+            $paths[] = array('all', $user->nickname, null);
         }
 
         // Add to the replies timeline
@@ -165,7 +221,7 @@ class RealtimePlugin extends Plugin
             while ($reply->fetch()) {
                 $user = User::staticGet('id', $reply->profile_id);
                 if (!empty($user)) {
-                    $paths[] = array('replies', $user->nickname);
+                    $paths[] = array('replies', $user->nickname, null);
                 }
             }
         }
@@ -179,7 +235,7 @@ class RealtimePlugin extends Plugin
         if ($gi->find()) {
             while ($gi->fetch()) {
                 $ug = User_group::staticGet('id', $gi->group_id);
-                $paths[] = array('showgroup', $ug->nickname);
+                $paths[] = array('showgroup', $ug->nickname, null);
             }
         }
 
@@ -189,9 +245,40 @@ class RealtimePlugin extends Plugin
 
             $this->_connect();
 
+            // XXX: We should probably fan-out here and do a
+            // new queue item for each path
+
             foreach ($paths as $path) {
-                $timeline = $this->_pathToChannel($path);
-                $this->_publish($timeline, $json);
+
+                list($action, $arg1, $arg2) = $path;
+
+                $channels = Realtime_channel::getAllChannels($action, $arg1, $arg2);
+                $this->log(LOG_INFO, sprintf(_("%d candidate channels for notice %d"),
+                                             count($channels), 
+                                             $notice->id));
+
+                foreach ($channels as $channel) {
+
+                    // XXX: We should probably fan-out here and do a
+                    // new queue item for each user/path combo
+
+                    if (is_null($channel->user_id)) {
+                        $profile = null;
+                    } else {
+                        $profile = Profile::staticGet('id', $channel->user_id);
+                    }
+                    if ($notice->inScope($profile)) {
+                        $this->log(LOG_INFO, 
+                                   sprintf(_("Delivering notice %d to channel (%s, %s, %s) for user '%s'"),
+                                           $notice->id,
+                                           $channel->action,
+                                           $channel->arg1,
+                                           $channel->arg2,
+                                           ($profile) ? ($profile->nickname) : "<public>"));
+                        $timeline = $this->_pathToChannel(array($channel->channel_key));
+                        $this->_publish($timeline, $json);
+                    }
+                }
             }
 
             $this->_disconnect();
@@ -217,9 +304,18 @@ class RealtimePlugin extends Plugin
         // root url from page output
 
         $action->elementStart('address');
+
+        if (common_config('singleuser', 'enabled')) {
+            $user = User::singleUser();
+            $url = common_local_url('showstream', array('nickname' => $user->nickname));
+        } else {
+            $url = common_local_url('public');
+        }
+
         $action->element('a', array('class' => 'url',
-                                  'href' => common_local_url('public')),
+                                    'href' => $url),
                          '');
+
         $action->elementEnd('address');
 
         $action->showContentBlock();
@@ -296,9 +392,8 @@ class RealtimePlugin extends Plugin
             $convurl = $conv->uri;
 
             if(empty($convurl)) {
-                $msg = sprintf(
-                    "Couldn't find Conversation ID %d to make 'in context'"
-                    . "link for Notice ID %d",
+                $msg = sprintf( "Could not find Conversation ID %d to make 'in context'"
+                    . "link for Notice ID %d.",
                     $notice->conversation,
                     $notice->id
                 );
@@ -370,21 +465,40 @@ class RealtimePlugin extends Plugin
         return '';
     }
 
+
     function _getTimeline($action)
     {
-        $path = null;
+        $channel = $this->_getChannel($action);
+        if (empty($channel)) {
+            return null;
+        }
+
+        return $this->_pathToChannel(array($channel->channel_key));
+    }
+
+    function _getChannel($action)
+    {
         $timeline = null;
+        $arg1     = null;
+        $arg2     = null;
 
         $action_name = $action->trimmed('action');
 
+        // FIXME: lists
+        // FIXME: search (!)
+        // FIXME: profile + tag
+
         switch ($action_name) {
          case 'public':
-            $path = array('public');
+            // no arguments
             break;
          case 'tag':
             $tag = $action->trimmed('tag');
             if (!empty($tag)) {
-                $path = array('tag', $tag);
+                $arg1 = $tag;
+            } else {
+                $this->log(LOG_NOTICE, "Unexpected 'tag' action without tag argument");
+                return null;
             }
             break;
          case 'showstream':
@@ -393,17 +507,31 @@ class RealtimePlugin extends Plugin
          case 'showgroup':
             $nickname = common_canonical_nickname($action->trimmed('nickname'));
             if (!empty($nickname)) {
-                $path = array($action_name, $nickname);
+                $arg1 = $nickname;
+            } else {
+                $this->log(LOG_NOTICE, "Unexpected $action_name action without nickname argument.");
+                return null;
             }
             break;
          default:
-            break;
+            return null;
         }
 
-        if (!empty($path)) {
-            $timeline = $this->_pathToChannel($path);
-        }
+        $user = common_current_user();
 
-        return $timeline;
+        $user_id = (!empty($user)) ? $user->id : null;
+
+        $channel = Realtime_channel::getChannel($user_id,
+                                                $action_name,
+                                                $arg1,
+                                                $arg2);
+
+        return $channel;
+    }
+
+    function onStartReadWriteTables(&$alwaysRW, &$rwdb)
+    {
+        $alwaysRW[] = 'realtime_channel';
+        return true;
     }
 }
diff --git a/plugins/Realtime/Realtime_channel.php b/plugins/Realtime/Realtime_channel.php
new file mode 100644
index 0000000000..1d2ca53912
--- /dev/null
+++ b/plugins/Realtime/Realtime_channel.php
@@ -0,0 +1,272 @@
+<?php
+/**
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2011, StatusNet, Inc.
+ *
+ * A channel for real-time browser data
+ *
+ * PHP version 5
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Realtime
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2011 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    exit(1);
+}
+
+/**
+ * A channel for real-time browser data
+ *
+ * For each user currently browsing the site, we want to know which page they're on
+ * so we can send real-time updates to their browser.
+ *
+ * @category Realtime
+ * @package  StatusNet
+ * @author   Evan Prodromou <evan@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
+ * @link     http://status.net/
+ *
+ * @see      DB_DataObject
+ */
+class Realtime_channel extends Managed_DataObject
+{
+    const TIMEOUT = 1800; // 30 minutes
+
+    public $__table = 'realtime_channel'; // table name
+
+    public $user_id;       // int -> user.id, can be null
+    public $action;        // string
+    public $arg1;          // argument
+    public $arg2;          // argument, usually null
+    public $channel_key;   // 128-bit shared secret key
+    public $audience;      // listener count
+    public $created;       // created date
+    public $modified;      // modified date
+
+    /**
+     * Get an instance by key
+     *
+     * This is a utility method to get a single instance with a given key value.
+     *
+     * @param string $k Key to use to lookup (usually 'user_id' for this class)
+     * @param mixed  $v Value to lookup
+     *
+     * @return Realtime_channel object found, or null for no hits
+     */
+    function staticGet($k, $v=null)
+    {
+        return Managed_DataObject::staticGet('Realtime_channel', $k, $v);
+    }
+
+    /**
+     * Get an instance by compound key
+     *
+     * @param array $kv array of key-value mappings
+     *
+     * @return Realtime_channel object found, or null for no hits
+     */
+    function pkeyGet($kv)
+    {
+        return Managed_DataObject::pkeyGet('Realtime_channel', $kv);
+    }
+
+    /**
+     * The One True Thingy that must be defined and declared.
+     */
+    public static function schemaDef()
+    {
+        return array(
+            'description' => 'A channel of realtime notice data',
+            'fields' => array(
+                'user_id' => array('type' => 'int',
+                                   'not null' => false,
+                                   'description' => 'user viewing page; can be null'),
+                'action' => array('type' => 'varchar',
+                                  'length' => 255,
+                                  'not null' => true,
+                                  'description' => 'page being viewed'),
+                'arg1' => array('type' => 'varchar',
+                                'length' => 255,
+                                'not null' => false,
+                                'description' => 'page argument, like username or tag'),
+                'arg2' => array('type' => 'varchar',
+                                'length' => 255,
+                                'not null' => false,
+                                'description' => 'second page argument, like tag for showstream'),
+                'channel_key' => array('type' => 'varchar',
+                               'length' => 32,
+                               'not null' => true,
+                               'description' => 'shared secret key for this channel'),
+                'audience' => array('type' => 'integer',
+                                    'not null' => true,
+                                    'default' => 0,
+                                    'description' => 'reference count'),
+                'created' => array('type' => 'datetime',
+                                   'not null' => true,
+                                   'description' => 'date this record was created'),
+                'modified' => array('type' => 'datetime',
+                                    'not null' => true,
+                                    'description' => 'date this record was modified'),
+            ),
+            'primary key' => array('channel_key'),
+            'unique keys' => array('realtime_channel_user_page_idx' => array('user_id', 'action', 'arg1', 'arg2')),
+            'foreign keys' => array(
+                'realtime_channel_user_id_fkey' => array('user', array('user_id' => 'id')),
+            ),
+            'indexes' => array(
+                'realtime_channel_modified_idx' => array('modified'),
+                'realtime_channel_page_idx' => array('action', 'arg1', 'arg2')
+            ),
+        );
+    }
+
+    static function saveNew($user_id, $action, $arg1, $arg2)
+    {
+        $channel = new Realtime_channel();
+
+        $channel->user_id = $user_id;
+        $channel->action  = $action;
+        $channel->arg1    = $arg1;
+        $channel->arg2    = $arg2;
+        $channel->audience  = 1;
+
+        $channel->channel_key = common_good_rand(16); // 128-bit key, 32 hex chars
+
+        $channel->created  = common_sql_now();
+        $channel->modified = $channel->created;
+
+        $channel->insert();
+
+        return $channel;
+    }
+
+    static function getChannel($user_id, $action, $arg1, $arg2)
+    {
+        $channel = self::fetchChannel($user_id, $action, $arg1, $arg2);
+
+        // Ignore (and delete!) old channels
+
+        if (!empty($channel)) {
+            $modTime = strtotime($channel->modified);
+            if ((time() - $modTime) > self::TIMEOUT) {
+                $channel->delete();
+                $channel = null;
+            }
+        }
+
+        if (empty($channel)) {
+            $channel = self::saveNew($user_id, $action, $arg1, $arg2);
+        }
+
+        return $channel;
+    }
+
+    static function getAllChannels($action, $arg1, $arg2)
+    {
+        $channel = new Realtime_channel();
+
+        $channel->action = $action;
+
+        if (is_null($arg1)) {
+            $channel->whereAdd('arg1 is null');
+        } else {
+            $channel->arg1 = $arg1;
+        }
+
+        if (is_null($arg2)) {
+            $channel->whereAdd('arg2 is null');
+        } else {
+            $channel->arg2 = $arg2;
+        }
+
+        $channel->whereAdd('modified > "' . common_sql_date(time() - self::TIMEOUT) . '"');
+
+        $channels = array();
+
+        if ($channel->find()) {
+            $channels = $channel->fetchAll();
+        }
+
+        return $channels;
+    }
+
+    static function fetchChannel($user_id, $action, $arg1, $arg2)
+    {
+        $channel = new Realtime_channel();
+
+        if (is_null($user_id)) {
+            $channel->whereAdd('user_id is null');
+        } else {
+            $channel->user_id = $user_id;
+        }
+
+        $channel->action = $action;
+
+        if (is_null($arg1)) {
+            $channel->whereAdd('arg1 is null');
+        } else {
+            $channel->arg1 = $arg1;
+        }
+
+        if (is_null($arg2)) {
+            $channel->whereAdd('arg2 is null');
+        } else {
+            $channel->arg2 = $arg2;
+        }
+
+        if ($channel->find(true)) {
+            $channel->increment();
+            return $channel;
+        } else {
+            return null;
+        }
+    }
+
+    function increment()
+    {
+        // XXX: race
+        $orig = clone($this);
+        $this->audience++;
+        $this->modified = common_sql_now();
+        $this->update($orig);
+    }
+
+    function touch()
+    {
+        // XXX: race
+        $orig = clone($this);
+        $this->modified = common_sql_now();
+        $this->update($orig);
+    }
+
+    function decrement()
+    {
+        // XXX: race
+        if ($this->audience == 1) {
+            $this->delete();
+        } else {
+            $orig = clone($this);
+            $this->audience--;
+            $this->modified = common_sql_now();
+            $this->update($orig);
+        }
+    }
+}
diff --git a/plugins/Realtime/cleanupchannels.php b/plugins/Realtime/cleanupchannels.php
new file mode 100644
index 0000000000..1c10bc69e8
--- /dev/null
+++ b/plugins/Realtime/cleanupchannels.php
@@ -0,0 +1,71 @@
+#!/usr/bin/env php
+<?php
+/*
+ * StatusNet - a distributed open-source microblogging tool
+ * Copyright (C) 2011, StatusNet, Inc.
+ *
+ * Script to print out current version of the software
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+define('INSTALLDIR', realpath(dirname(__FILE__) . '/../..'));
+
+$shortoptions = 'u';
+$longoptions = array('universe');
+
+$helptext = <<<END_OF_CLEANUPCHANNELS_HELP
+cleanupchannels.php [options]
+Garbage-collects old realtime channels
+
+-u --universe Do all sites
+
+END_OF_CLEANUPCHANNELS_HELP;
+
+require_once INSTALLDIR.'/scripts/commandline.inc';
+
+function cleanupChannels()
+{
+    $rc = new Realtime_channel();
+
+    $rc->selectAdd();
+    $rc->selectAdd('channel_key');
+
+    $rc->whereAdd('modified < "' . common_sql_date(time() - Realtime_channel::TIMEOUT) . '"');
+
+    if ($rc->find()) {
+        $keys = $rc->fetchAll();
+
+        foreach ($keys as $key) {
+            $rc = Realtime_channel::staticGet('channel_key', $key);
+            if (!empty($rc)) {
+                printfv("Deleting realtime channel '$key'\n");
+                $rc->delete();
+            }
+        }
+    }
+}
+
+if (have_option('u', 'universe')) {
+    $sn = new Status_network();
+    if ($sn->find()) {
+        while ($sn->fetch()) {
+            $server = $sn->getServerName();
+            StatusNet::init($server);
+            cleanupChannels();
+        }
+    }
+} else {
+    cleanupChannels();
+}
diff --git a/plugins/Realtime/closechannel.php b/plugins/Realtime/closechannel.php
new file mode 100644
index 0000000000..4c4e5de1cc
--- /dev/null
+++ b/plugins/Realtime/closechannel.php
@@ -0,0 +1,114 @@
+<?php
+/**
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2011, StatusNet, Inc.
+ *
+ * action to close a channel
+ *
+ * PHP version 5
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Realtime
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2011 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    // This check helps protect against security problems;
+    // your code file can't be executed directly from the web.
+    exit(1);
+}
+
+/**
+ * Action to close a channel
+ *
+ * @category  Realtime
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2011 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+class ClosechannelAction extends Action
+{
+    protected $channelKey = null;
+    protected $channel    = null;
+
+    /**
+     * For initializing members of the class.
+     *
+     * @param array $argarray misc. arguments
+     *
+     * @return boolean true
+     */
+    function prepare($argarray)
+    {
+        parent::prepare($argarray);
+
+        if (!$this->isPost()) {
+            // TRANS: Client exception. Do not translate POST.
+            throw new ClientException(_m('You have to POST it.'));
+        }
+
+        $this->channelKey = $this->trimmed('channelkey');
+
+        if (empty($this->channelKey)) {
+            // TRANS: Client exception thrown when the channel key argument is missing.
+            throw new ClientException(_m('No channel key argument.'));
+        }
+
+        $this->channel = Realtime_channel::staticGet('channel_key', $this->channelKey);
+
+        if (empty($this->channel)) {
+            // TRANS: Client exception thrown when referring to a non-existing channel.
+            throw new ClientException(_m('No such channel.'));
+        }
+
+        return true;
+    }
+
+    /**
+     * Handler method
+     *
+     * @param array $argarray is ignored since it's now passed in in prepare()
+     *
+     * @return void
+     */
+    function handle($argarray=null)
+    {
+        $this->channel->decrement();
+
+        header('HTTP/1.1 204 No Content');
+
+        return;
+    }
+
+    /**
+     * Return true if read only.
+     *
+     * MAY override
+     *
+     * @param array $args other arguments
+     *
+     * @return boolean is read only action?
+     */
+    function isReadOnly($args)
+    {
+        return false;
+    }
+}
diff --git a/plugins/Realtime/keepalivechannel.php b/plugins/Realtime/keepalivechannel.php
new file mode 100644
index 0000000000..7559927d6b
--- /dev/null
+++ b/plugins/Realtime/keepalivechannel.php
@@ -0,0 +1,114 @@
+<?php
+/**
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2011, StatusNet, Inc.
+ *
+ * action periodically pinged by a page to keep a channel alive
+ * 
+ * PHP version 5
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Realtime
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2011 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    // This check helps protect against security problems;
+    // your code file can't be executed directly from the web.
+    exit(1);
+}
+
+/**
+ * Action periodically pinged by a page to keep a channel alive
+ *
+ * @category  Realtime
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2011 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+class KeepalivechannelAction extends Action
+{
+    protected $channelKey = null;
+    protected $channel    = null;
+
+    /**
+     * For initializing members of the class.
+     *
+     * @param array $argarray misc. arguments
+     *
+     * @return boolean true
+     */
+    function prepare($argarray)
+    {
+        parent::prepare($argarray);
+
+        if (!$this->isPost()) {
+            // TRANS: Client exception. Do not translate POST.
+            throw new ClientException(_m('You have to POST it.'));
+        }
+
+        $this->channelKey = $this->trimmed('channelkey');
+
+        if (empty($this->channelKey)) {
+            // TRANS: Client exception thrown when the channel key argument is missing.
+            throw new ClientException(_m('No channel key argument.'));
+        }
+
+        $this->channel = Realtime_channel::staticGet('channel_key', $this->channelKey);
+
+        if (empty($this->channel)) {
+            // TRANS: Client exception thrown when referring to a non-existing channel.
+            throw new ClientException(_m('No such channel.'));
+        }
+
+        return true;
+    }
+
+    /**
+     * Handler method
+     *
+     * @param array $argarray is ignored since it's now passed in in prepare()
+     *
+     * @return void
+     */
+    function handle($argarray=null)
+    {
+        $this->channel->touch();
+
+        header('HTTP/1.1 204 No Content');
+
+        return;
+    }
+
+    /**
+     * Return true if read only.
+     *
+     * MAY override
+     *
+     * @param array $args other arguments
+     *
+     * @return boolean is read only action?
+     */
+    function isReadOnly($args)
+    {
+        return false;
+    }
+}
diff --git a/plugins/Realtime/locale/Realtime.pot b/plugins/Realtime/locale/Realtime.pot
index 41b7fa7c4c..9abee74135 100644
--- a/plugins/Realtime/locale/Realtime.pot
+++ b/plugins/Realtime/locale/Realtime.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,38 +16,53 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#. TRANS: Client exception. Do not translate POST.
+#: keepalivechannel.php:65 closechannel.php:65
+msgid "You have to POST it."
+msgstr ""
+
+#. TRANS: Client exception thrown when the channel key argument is missing.
+#: keepalivechannel.php:72 closechannel.php:72
+msgid "No channel key argument."
+msgstr ""
+
+#. TRANS: Client exception thrown when referring to a non-existing channel.
+#: keepalivechannel.php:79 closechannel.php:79
+msgid "No such channel."
+msgstr ""
+
 #. TRANS: Text label for realtime view "play" button, usually replaced by an icon.
-#: RealtimePlugin.php:336
+#: RealtimePlugin.php:421
 msgctxt "BUTTON"
 msgid "Play"
 msgstr ""
 
 #. TRANS: Tooltip for realtime view "play" button.
-#: RealtimePlugin.php:338
+#: RealtimePlugin.php:423
 msgctxt "TOOLTIP"
 msgid "Play"
 msgstr ""
 
 #. TRANS: Text label for realtime view "pause" button
-#: RealtimePlugin.php:340
+#: RealtimePlugin.php:425
 msgctxt "BUTTON"
 msgid "Pause"
 msgstr ""
 
 #. TRANS: Tooltip for realtime view "pause" button
-#: RealtimePlugin.php:342
+#: RealtimePlugin.php:427
 msgctxt "TOOLTIP"
 msgid "Pause"
 msgstr ""
 
 #. TRANS: Text label for realtime view "popup" button, usually replaced by an icon.
-#: RealtimePlugin.php:344
+#: RealtimePlugin.php:429
 msgctxt "BUTTON"
 msgid "Pop up"
 msgstr ""
 
 #. TRANS: Tooltip for realtime view "popup" button.
-#: RealtimePlugin.php:346
+#: RealtimePlugin.php:431
 msgctxt "TOOLTIP"
 msgid "Pop up in a window"
 msgstr ""
diff --git a/plugins/Realtime/locale/af/LC_MESSAGES/Realtime.po b/plugins/Realtime/locale/af/LC_MESSAGES/Realtime.po
index 99115c5ebe..e3c685dbb5 100644
--- a/plugins/Realtime/locale/af/LC_MESSAGES/Realtime.po
+++ b/plugins/Realtime/locale/af/LC_MESSAGES/Realtime.po
@@ -9,18 +9,30 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Realtime\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:59+0000\n"
-"Language-Team: Afrikaans <http://translatewiki.net/wiki/Portal:af>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:45+0000\n"
+"Language-Team: Afrikaans <https://translatewiki.net/wiki/Portal:af>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-09 19:00:58+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2012-01-02 10:10:45+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: af\n"
 "X-Message-Group: #out-statusnet-plugin-realtime\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Client exception. Do not translate POST.
+msgid "You have to POST it."
+msgstr ""
+
+#. TRANS: Client exception thrown when the channel key argument is missing.
+msgid "No channel key argument."
+msgstr ""
+
+#. TRANS: Client exception thrown when referring to a non-existing channel.
+msgid "No such channel."
+msgstr ""
+
 #. TRANS: Text label for realtime view "play" button, usually replaced by an icon.
 msgctxt "BUTTON"
 msgid "Play"
diff --git a/plugins/Realtime/locale/ar/LC_MESSAGES/Realtime.po b/plugins/Realtime/locale/ar/LC_MESSAGES/Realtime.po
index b72f236cb4..ee062d9769 100644
--- a/plugins/Realtime/locale/ar/LC_MESSAGES/Realtime.po
+++ b/plugins/Realtime/locale/ar/LC_MESSAGES/Realtime.po
@@ -9,20 +9,32 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Realtime\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:59+0000\n"
-"Language-Team: Arabic <http://translatewiki.net/wiki/Portal:ar>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:45+0000\n"
+"Language-Team: Arabic <https://translatewiki.net/wiki/Portal:ar>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-09 19:00:58+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2012-01-02 10:10:45+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ar\n"
 "X-Message-Group: #out-statusnet-plugin-realtime\n"
 "Plural-Forms: nplurals=6; plural=(n == 0) ? 0 : ( (n == 1) ? 1 : ( (n == "
 "2) ? 2 : ( (n%100 >= 3 && n%100 <= 10) ? 3 : ( (n%100 >= 11 && n%100 <= "
 "99) ? 4 : 5 ) ) ) );\n"
 
+#. TRANS: Client exception. Do not translate POST.
+msgid "You have to POST it."
+msgstr ""
+
+#. TRANS: Client exception thrown when the channel key argument is missing.
+msgid "No channel key argument."
+msgstr ""
+
+#. TRANS: Client exception thrown when referring to a non-existing channel.
+msgid "No such channel."
+msgstr ""
+
 #. TRANS: Text label for realtime view "play" button, usually replaced by an icon.
 msgctxt "BUTTON"
 msgid "Play"
diff --git a/plugins/Realtime/locale/br/LC_MESSAGES/Realtime.po b/plugins/Realtime/locale/br/LC_MESSAGES/Realtime.po
index f6569b37ee..3fb1b58382 100644
--- a/plugins/Realtime/locale/br/LC_MESSAGES/Realtime.po
+++ b/plugins/Realtime/locale/br/LC_MESSAGES/Realtime.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Realtime to Breton (Brezhoneg)
+# Translation of StatusNet - Realtime to Breton (brezhoneg)
 # Exported from translatewiki.net
 #
 # Author: Y-M D
@@ -9,18 +9,30 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Realtime\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:59+0000\n"
-"Language-Team: Breton <http://translatewiki.net/wiki/Portal:br>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:45+0000\n"
+"Language-Team: Breton <https://translatewiki.net/wiki/Portal:br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-09 19:00:58+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2012-01-02 10:10:45+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-realtime\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#. TRANS: Client exception. Do not translate POST.
+msgid "You have to POST it."
+msgstr ""
+
+#. TRANS: Client exception thrown when the channel key argument is missing.
+msgid "No channel key argument."
+msgstr ""
+
+#. TRANS: Client exception thrown when referring to a non-existing channel.
+msgid "No such channel."
+msgstr ""
+
 #. TRANS: Text label for realtime view "play" button, usually replaced by an icon.
 msgctxt "BUTTON"
 msgid "Play"
diff --git a/plugins/Realtime/locale/ca/LC_MESSAGES/Realtime.po b/plugins/Realtime/locale/ca/LC_MESSAGES/Realtime.po
index 938b173745..e55ef3b124 100644
--- a/plugins/Realtime/locale/ca/LC_MESSAGES/Realtime.po
+++ b/plugins/Realtime/locale/ca/LC_MESSAGES/Realtime.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Realtime to Catalan (Català)
+# Translation of StatusNet - Realtime to Catalan (català)
 # Exported from translatewiki.net
 #
 # Author: Toniher
@@ -9,18 +9,30 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Realtime\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:59+0000\n"
-"Language-Team: Catalan <http://translatewiki.net/wiki/Portal:ca>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:45+0000\n"
+"Language-Team: Catalan <https://translatewiki.net/wiki/Portal:ca>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-09 19:00:58+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2012-01-02 10:10:45+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ca\n"
 "X-Message-Group: #out-statusnet-plugin-realtime\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Client exception. Do not translate POST.
+msgid "You have to POST it."
+msgstr "Heu de publicar-ho."
+
+#. TRANS: Client exception thrown when the channel key argument is missing.
+msgid "No channel key argument."
+msgstr "No existeix l'argument de clau del canal."
+
+#. TRANS: Client exception thrown when referring to a non-existing channel.
+msgid "No such channel."
+msgstr "No existeix el canal."
+
 #. TRANS: Text label for realtime view "play" button, usually replaced by an icon.
 msgctxt "BUTTON"
 msgid "Play"
diff --git a/plugins/Realtime/locale/de/LC_MESSAGES/Realtime.po b/plugins/Realtime/locale/de/LC_MESSAGES/Realtime.po
index 240d6e7f2b..3adcece1be 100644
--- a/plugins/Realtime/locale/de/LC_MESSAGES/Realtime.po
+++ b/plugins/Realtime/locale/de/LC_MESSAGES/Realtime.po
@@ -1,6 +1,7 @@
 # Translation of StatusNet - Realtime to German (Deutsch)
 # Exported from translatewiki.net
 #
+# Author: ChrisiPK
 # Author: Fujnky
 # --
 # This file is distributed under the same license as the StatusNet package.
@@ -9,18 +10,30 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Realtime\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:50:59+0000\n"
-"Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:45+0000\n"
+"Language-Team: German <https://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-09 19:00:58+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2012-01-02 10:10:45+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-realtime\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Client exception. Do not translate POST.
+msgid "You have to POST it."
+msgstr "Du musst eine POST-Anfrage schicken."
+
+#. TRANS: Client exception thrown when the channel key argument is missing.
+msgid "No channel key argument."
+msgstr "Kein Kanalpasswort als Argument angegeben."
+
+#. TRANS: Client exception thrown when referring to a non-existing channel.
+msgid "No such channel."
+msgstr "Kanal existiert nicht."
+
 #. TRANS: Text label for realtime view "play" button, usually replaced by an icon.
 msgctxt "BUTTON"
 msgid "Play"
diff --git a/plugins/Realtime/locale/es/LC_MESSAGES/Realtime.po b/plugins/Realtime/locale/es/LC_MESSAGES/Realtime.po
new file mode 100644
index 0000000000..909ffec56a
--- /dev/null
+++ b/plugins/Realtime/locale/es/LC_MESSAGES/Realtime.po
@@ -0,0 +1,61 @@
+# Translation of StatusNet - Realtime to Spanish (español)
+# Exported from translatewiki.net
+#
+# Author: Armando-Martin
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Realtime\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:46+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2012-01-02 10:10:45+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Client exception. Do not translate POST.
+msgid "You have to POST it."
+msgstr "Tienes que PUBLICARLO."
+
+#. TRANS: Client exception thrown when the channel key argument is missing.
+msgid "No channel key argument."
+msgstr "Sin argumento para la clave de canal."
+
+#. TRANS: Client exception thrown when referring to a non-existing channel.
+msgid "No such channel."
+msgstr "No existe tal canal."
+
+#. TRANS: Text label for realtime view "play" button, usually replaced by an icon.
+msgctxt "BUTTON"
+msgid "Play"
+msgstr "Reproducir"
+
+#. TRANS: Tooltip for realtime view "play" button.
+msgctxt "TOOLTIP"
+msgid "Play"
+msgstr "Reproducir"
+
+#. TRANS: Text label for realtime view "pause" button
+msgctxt "BUTTON"
+msgid "Pause"
+msgstr "Pausa"
+
+#. TRANS: Tooltip for realtime view "pause" button
+msgctxt "TOOLTIP"
+msgid "Pause"
+msgstr "Pausa"
+
+#. TRANS: Text label for realtime view "popup" button, usually replaced by an icon.
+msgctxt "BUTTON"
+msgid "Pop up"
+msgstr "Ventana emergente"
+
+#. TRANS: Tooltip for realtime view "popup" button.
+msgctxt "TOOLTIP"
+msgid "Pop up in a window"
+msgstr "Mostrar en una ventana emergente"
diff --git a/plugins/Realtime/locale/eu/LC_MESSAGES/Realtime.po b/plugins/Realtime/locale/eu/LC_MESSAGES/Realtime.po
new file mode 100644
index 0000000000..b6a7c51985
--- /dev/null
+++ b/plugins/Realtime/locale/eu/LC_MESSAGES/Realtime.po
@@ -0,0 +1,61 @@
+# Translation of StatusNet - Realtime to Basque (euskara)
+# Exported from translatewiki.net
+#
+# Author: Artsuaga
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Realtime\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:46+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2012-01-02 10:10:45+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Client exception. Do not translate POST.
+msgid "You have to POST it."
+msgstr "POST bidez egin behar duzu."
+
+#. TRANS: Client exception thrown when the channel key argument is missing.
+msgid "No channel key argument."
+msgstr "Kanalerako gakoarentzako argudiorik ez."
+
+#. TRANS: Client exception thrown when referring to a non-existing channel.
+msgid "No such channel."
+msgstr "Kanal hori ez dago."
+
+#. TRANS: Text label for realtime view "play" button, usually replaced by an icon.
+msgctxt "BUTTON"
+msgid "Play"
+msgstr "Play"
+
+#. TRANS: Tooltip for realtime view "play" button.
+msgctxt "TOOLTIP"
+msgid "Play"
+msgstr ""
+
+#. TRANS: Text label for realtime view "pause" button
+msgctxt "BUTTON"
+msgid "Pause"
+msgstr "Pausatu"
+
+#. TRANS: Tooltip for realtime view "pause" button
+msgctxt "TOOLTIP"
+msgid "Pause"
+msgstr "Pausatu"
+
+#. TRANS: Text label for realtime view "popup" button, usually replaced by an icon.
+msgctxt "BUTTON"
+msgid "Pop up"
+msgstr "Pop up"
+
+#. TRANS: Tooltip for realtime view "popup" button.
+msgctxt "TOOLTIP"
+msgid "Pop up in a window"
+msgstr ""
diff --git a/plugins/Realtime/locale/fr/LC_MESSAGES/Realtime.po b/plugins/Realtime/locale/fr/LC_MESSAGES/Realtime.po
index da91f91292..ee6b1d3b49 100644
--- a/plugins/Realtime/locale/fr/LC_MESSAGES/Realtime.po
+++ b/plugins/Realtime/locale/fr/LC_MESSAGES/Realtime.po
@@ -1,7 +1,9 @@
-# Translation of StatusNet - Realtime to French (Français)
+# Translation of StatusNet - Realtime to French (français)
 # Exported from translatewiki.net
 #
+# Author: Gomoko
 # Author: Peter17
+# Author: Verdy p
 # --
 # This file is distributed under the same license as the StatusNet package.
 #
@@ -9,27 +11,39 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Realtime\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:00+0000\n"
-"Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:46+0000\n"
+"Language-Team: French <https://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-09 19:00:58+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2012-01-02 10:10:45+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-realtime\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#. TRANS: Client exception. Do not translate POST.
+msgid "You have to POST it."
+msgstr "Vous devez le PUBLIER."
+
+#. TRANS: Client exception thrown when the channel key argument is missing.
+msgid "No channel key argument."
+msgstr "Pas d'argument clé de canal."
+
+#. TRANS: Client exception thrown when referring to a non-existing channel.
+msgid "No such channel."
+msgstr "Canal inconnu."
+
 #. TRANS: Text label for realtime view "play" button, usually replaced by an icon.
 msgctxt "BUTTON"
 msgid "Play"
-msgstr "Jouer"
+msgstr "Lecture"
 
 #. TRANS: Tooltip for realtime view "play" button.
 msgctxt "TOOLTIP"
 msgid "Play"
-msgstr "Jouer"
+msgstr "Lecture"
 
 #. TRANS: Text label for realtime view "pause" button
 msgctxt "BUTTON"
diff --git a/plugins/Realtime/locale/gl/LC_MESSAGES/Realtime.po b/plugins/Realtime/locale/gl/LC_MESSAGES/Realtime.po
new file mode 100644
index 0000000000..2d114aa657
--- /dev/null
+++ b/plugins/Realtime/locale/gl/LC_MESSAGES/Realtime.po
@@ -0,0 +1,64 @@
+# Translation of StatusNet - Realtime to Galician (galego)
+# Exported from translatewiki.net
+#
+# Author: Toliño
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Realtime\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:46+0000\n"
+"Language-Team: Galician <https://translatewiki.net/wiki/Portal:gl>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2012-01-02 10:10:45+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: gl\n"
+"X-Message-Group: #out-statusnet-plugin-realtime\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Client exception. Do not translate POST.
+msgid "You have to POST it."
+msgstr "Ten que publicalo con POST."
+
+#. TRANS: Client exception thrown when the channel key argument is missing.
+msgid "No channel key argument."
+msgstr "Sen argumento para a clave de canle."
+
+#. TRANS: Client exception thrown when referring to a non-existing channel.
+msgid "No such channel."
+msgstr "Non hai tal canle."
+
+#. TRANS: Text label for realtime view "play" button, usually replaced by an icon.
+msgctxt "BUTTON"
+msgid "Play"
+msgstr "Reproducir"
+
+#. TRANS: Tooltip for realtime view "play" button.
+msgctxt "TOOLTIP"
+msgid "Play"
+msgstr "Reproducir"
+
+#. TRANS: Text label for realtime view "pause" button
+msgctxt "BUTTON"
+msgid "Pause"
+msgstr "Pausar"
+
+#. TRANS: Tooltip for realtime view "pause" button
+msgctxt "TOOLTIP"
+msgid "Pause"
+msgstr "Pausar"
+
+#. TRANS: Text label for realtime view "popup" button, usually replaced by an icon.
+msgctxt "BUTTON"
+msgid "Pop up"
+msgstr "Ventá emerxente"
+
+#. TRANS: Tooltip for realtime view "popup" button.
+msgctxt "TOOLTIP"
+msgid "Pop up in a window"
+msgstr "Mostrar nunha ventá emerxente"
diff --git a/plugins/Realtime/locale/ia/LC_MESSAGES/Realtime.po b/plugins/Realtime/locale/ia/LC_MESSAGES/Realtime.po
index 1c6b081c9c..e6aaa527fa 100644
--- a/plugins/Realtime/locale/ia/LC_MESSAGES/Realtime.po
+++ b/plugins/Realtime/locale/ia/LC_MESSAGES/Realtime.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Realtime to Interlingua (Interlingua)
+# Translation of StatusNet - Realtime to Interlingua (interlingua)
 # Exported from translatewiki.net
 #
 # Author: McDutchie
@@ -9,18 +9,30 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Realtime\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:00+0000\n"
-"Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:46+0000\n"
+"Language-Team: Interlingua <https://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-09 19:00:58+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2012-01-02 10:10:45+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-realtime\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Client exception. Do not translate POST.
+msgid "You have to POST it."
+msgstr "Es necessari inviar lo con POST."
+
+#. TRANS: Client exception thrown when the channel key argument is missing.
+msgid "No channel key argument."
+msgstr "Il non ha un parametro pro clave de canal."
+
+#. TRANS: Client exception thrown when referring to a non-existing channel.
+msgid "No such channel."
+msgstr "Iste canal non existe."
+
 #. TRANS: Text label for realtime view "play" button, usually replaced by an icon.
 msgctxt "BUTTON"
 msgid "Play"
diff --git a/plugins/Realtime/locale/ja/LC_MESSAGES/Realtime.po b/plugins/Realtime/locale/ja/LC_MESSAGES/Realtime.po
new file mode 100644
index 0000000000..744c7f6977
--- /dev/null
+++ b/plugins/Realtime/locale/ja/LC_MESSAGES/Realtime.po
@@ -0,0 +1,61 @@
+# Translation of StatusNet - Realtime to Japanese (日本語)
+# Exported from translatewiki.net
+#
+# Author: Shirayuki
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Realtime\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:46+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2012-01-02 10:10:45+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#. TRANS: Client exception. Do not translate POST.
+msgid "You have to POST it."
+msgstr ""
+
+#. TRANS: Client exception thrown when the channel key argument is missing.
+msgid "No channel key argument."
+msgstr ""
+
+#. TRANS: Client exception thrown when referring to a non-existing channel.
+msgid "No such channel."
+msgstr ""
+
+#. TRANS: Text label for realtime view "play" button, usually replaced by an icon.
+msgctxt "BUTTON"
+msgid "Play"
+msgstr "�生"
+
+#. TRANS: Tooltip for realtime view "play" button.
+msgctxt "TOOLTIP"
+msgid "Play"
+msgstr "�生"
+
+#. TRANS: Text label for realtime view "pause" button
+msgctxt "BUTTON"
+msgid "Pause"
+msgstr "一時�止"
+
+#. TRANS: Tooltip for realtime view "pause" button
+msgctxt "TOOLTIP"
+msgid "Pause"
+msgstr "一時�止"
+
+#. TRANS: Text label for realtime view "popup" button, usually replaced by an icon.
+msgctxt "BUTTON"
+msgid "Pop up"
+msgstr "�ップアップ"
+
+#. TRANS: Tooltip for realtime view "popup" button.
+msgctxt "TOOLTIP"
+msgid "Pop up in a window"
+msgstr ""
diff --git a/plugins/Realtime/locale/lv/LC_MESSAGES/Realtime.po b/plugins/Realtime/locale/lv/LC_MESSAGES/Realtime.po
index ba011be074..243603160d 100644
--- a/plugins/Realtime/locale/lv/LC_MESSAGES/Realtime.po
+++ b/plugins/Realtime/locale/lv/LC_MESSAGES/Realtime.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Realtime to Latvian (Latviešu)
+# Translation of StatusNet - Realtime to Latvian (latviešu)
 # Exported from translatewiki.net
 #
 # Author: GreenZeb
@@ -9,19 +9,31 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Realtime\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:00+0000\n"
-"Language-Team: Latvian <http://translatewiki.net/wiki/Portal:lv>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:46+0000\n"
+"Language-Team: Latvian <https://translatewiki.net/wiki/Portal:lv>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-09 19:00:58+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2012-01-02 10:10:45+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: lv\n"
 "X-Message-Group: #out-statusnet-plugin-realtime\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n != "
 "0) ? 1 : 2 );\n"
 
+#. TRANS: Client exception. Do not translate POST.
+msgid "You have to POST it."
+msgstr ""
+
+#. TRANS: Client exception thrown when the channel key argument is missing.
+msgid "No channel key argument."
+msgstr ""
+
+#. TRANS: Client exception thrown when referring to a non-existing channel.
+msgid "No such channel."
+msgstr ""
+
 #. TRANS: Text label for realtime view "play" button, usually replaced by an icon.
 msgctxt "BUTTON"
 msgid "Play"
diff --git a/plugins/Realtime/locale/mk/LC_MESSAGES/Realtime.po b/plugins/Realtime/locale/mk/LC_MESSAGES/Realtime.po
index 61c5c98235..283da3626d 100644
--- a/plugins/Realtime/locale/mk/LC_MESSAGES/Realtime.po
+++ b/plugins/Realtime/locale/mk/LC_MESSAGES/Realtime.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Realtime to Macedonian (Македон�ки)
+# Translation of StatusNet - Realtime to Macedonian (македон�ки)
 # Exported from translatewiki.net
 #
 # Author: Bjankuloski06
@@ -9,18 +9,30 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Realtime\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:00+0000\n"
-"Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:47+0000\n"
+"Language-Team: Macedonian <https://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-09 19:00:58+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2012-01-02 10:10:45+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-realtime\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
 
+#. TRANS: Client exception. Do not translate POST.
+msgid "You have to POST it."
+msgstr "Ќе мора да го објавите �о POST."
+
+#. TRANS: Client exception thrown when the channel key argument is missing.
+msgid "No channel key argument."
+msgstr "�ема аргумент за клучот на каналот."
+
+#. TRANS: Client exception thrown when referring to a non-existing channel.
+msgid "No such channel."
+msgstr "�ема таков канал."
+
 #. TRANS: Text label for realtime view "play" button, usually replaced by an icon.
 msgctxt "BUTTON"
 msgid "Play"
diff --git a/plugins/Realtime/locale/ne/LC_MESSAGES/Realtime.po b/plugins/Realtime/locale/ne/LC_MESSAGES/Realtime.po
index b689408bcc..ff96c8274b 100644
--- a/plugins/Realtime/locale/ne/LC_MESSAGES/Realtime.po
+++ b/plugins/Realtime/locale/ne/LC_MESSAGES/Realtime.po
@@ -10,18 +10,30 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Realtime\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:00+0000\n"
-"Language-Team: Nepali <http://translatewiki.net/wiki/Portal:ne>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:47+0000\n"
+"Language-Team: Nepali <https://translatewiki.net/wiki/Portal:ne>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-09 19:00:58+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2012-01-02 10:10:45+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ne\n"
 "X-Message-Group: #out-statusnet-plugin-realtime\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Client exception. Do not translate POST.
+msgid "You have to POST it."
+msgstr ""
+
+#. TRANS: Client exception thrown when the channel key argument is missing.
+msgid "No channel key argument."
+msgstr ""
+
+#. TRANS: Client exception thrown when referring to a non-existing channel.
+msgid "No such channel."
+msgstr ""
+
 #. TRANS: Text label for realtime view "play" button, usually replaced by an icon.
 msgctxt "BUTTON"
 msgid "Play"
diff --git a/plugins/Realtime/locale/nl/LC_MESSAGES/Realtime.po b/plugins/Realtime/locale/nl/LC_MESSAGES/Realtime.po
index 8631fdd920..41e76f23ab 100644
--- a/plugins/Realtime/locale/nl/LC_MESSAGES/Realtime.po
+++ b/plugins/Realtime/locale/nl/LC_MESSAGES/Realtime.po
@@ -9,18 +9,30 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Realtime\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:00+0000\n"
-"Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:47+0000\n"
+"Language-Team: Dutch <https://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-09 19:00:58+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2012-01-02 10:10:45+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-realtime\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Client exception. Do not translate POST.
+msgid "You have to POST it."
+msgstr "U moet het bericht POST-en."
+
+#. TRANS: Client exception thrown when the channel key argument is missing.
+msgid "No channel key argument."
+msgstr "Er is geen kanaalsleutel als argument opgegeven."
+
+#. TRANS: Client exception thrown when referring to a non-existing channel.
+msgid "No such channel."
+msgstr "Dat kanaal bestaat niet."
+
 #. TRANS: Text label for realtime view "play" button, usually replaced by an icon.
 msgctxt "BUTTON"
 msgid "Play"
diff --git a/plugins/Realtime/locale/pl/LC_MESSAGES/Realtime.po b/plugins/Realtime/locale/pl/LC_MESSAGES/Realtime.po
new file mode 100644
index 0000000000..2c8789db84
--- /dev/null
+++ b/plugins/Realtime/locale/pl/LC_MESSAGES/Realtime.po
@@ -0,0 +1,65 @@
+# Translation of StatusNet - Realtime to Polish (polski)
+# Exported from translatewiki.net
+#
+# Author: Woytecr
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Realtime\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:47+0000\n"
+"Language-Team: Polish <https://translatewiki.net/wiki/Portal:pl>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2012-01-02 10:10:45+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: pl\n"
+"X-Message-Group: #out-statusnet-plugin-realtime\n"
+"Plural-Forms: nplurals=3; plural=(n == 1) ? 0 : ( (n%10 >= 2 && n%10 <= 4 && "
+"(n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
+
+#. TRANS: Client exception. Do not translate POST.
+msgid "You have to POST it."
+msgstr ""
+
+#. TRANS: Client exception thrown when the channel key argument is missing.
+msgid "No channel key argument."
+msgstr ""
+
+#. TRANS: Client exception thrown when referring to a non-existing channel.
+msgid "No such channel."
+msgstr ""
+
+#. TRANS: Text label for realtime view "play" button, usually replaced by an icon.
+msgctxt "BUTTON"
+msgid "Play"
+msgstr "Odtwórz"
+
+#. TRANS: Tooltip for realtime view "play" button.
+msgctxt "TOOLTIP"
+msgid "Play"
+msgstr "Odtwórz"
+
+#. TRANS: Text label for realtime view "pause" button
+msgctxt "BUTTON"
+msgid "Pause"
+msgstr "Pauza"
+
+#. TRANS: Tooltip for realtime view "pause" button
+msgctxt "TOOLTIP"
+msgid "Pause"
+msgstr "Pauza"
+
+#. TRANS: Text label for realtime view "popup" button, usually replaced by an icon.
+msgctxt "BUTTON"
+msgid "Pop up"
+msgstr ""
+
+#. TRANS: Tooltip for realtime view "popup" button.
+msgctxt "TOOLTIP"
+msgid "Pop up in a window"
+msgstr ""
diff --git a/plugins/Realtime/locale/sv/LC_MESSAGES/Realtime.po b/plugins/Realtime/locale/sv/LC_MESSAGES/Realtime.po
index ed3bd15c78..7729ee9f7b 100644
--- a/plugins/Realtime/locale/sv/LC_MESSAGES/Realtime.po
+++ b/plugins/Realtime/locale/sv/LC_MESSAGES/Realtime.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Realtime to Swedish (Svenska)
+# Translation of StatusNet - Realtime to Swedish (svenska)
 # Exported from translatewiki.net
 #
 # Author: Lokal Profil
@@ -9,18 +9,30 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Realtime\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:00+0000\n"
-"Language-Team: Swedish <http://translatewiki.net/wiki/Portal:sv>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:47+0000\n"
+"Language-Team: Swedish <https://translatewiki.net/wiki/Portal:sv>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-09 19:00:58+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2012-01-02 10:10:45+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: sv\n"
 "X-Message-Group: #out-statusnet-plugin-realtime\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Client exception. Do not translate POST.
+msgid "You have to POST it."
+msgstr ""
+
+#. TRANS: Client exception thrown when the channel key argument is missing.
+msgid "No channel key argument."
+msgstr ""
+
+#. TRANS: Client exception thrown when referring to a non-existing channel.
+msgid "No such channel."
+msgstr ""
+
 #. TRANS: Text label for realtime view "play" button, usually replaced by an icon.
 msgctxt "BUTTON"
 msgid "Play"
diff --git a/plugins/Realtime/locale/tl/LC_MESSAGES/Realtime.po b/plugins/Realtime/locale/tl/LC_MESSAGES/Realtime.po
index 8d20d90aa4..d46d0163be 100644
--- a/plugins/Realtime/locale/tl/LC_MESSAGES/Realtime.po
+++ b/plugins/Realtime/locale/tl/LC_MESSAGES/Realtime.po
@@ -9,18 +9,30 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Realtime\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:00+0000\n"
-"Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:47+0000\n"
+"Language-Team: Tagalog <https://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-09 19:00:58+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2012-01-02 10:10:45+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-realtime\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Client exception. Do not translate POST.
+msgid "You have to POST it."
+msgstr "Kailangan mong IPASKIL iyan."
+
+#. TRANS: Client exception thrown when the channel key argument is missing.
+msgid "No channel key argument."
+msgstr "Walang susi sa katwiran ng kanal."
+
+#. TRANS: Client exception thrown when referring to a non-existing channel.
+msgid "No such channel."
+msgstr "Walang ganyang kanal."
+
 #. TRANS: Text label for realtime view "play" button, usually replaced by an icon.
 msgctxt "BUTTON"
 msgid "Play"
diff --git a/plugins/Realtime/locale/tr/LC_MESSAGES/Realtime.po b/plugins/Realtime/locale/tr/LC_MESSAGES/Realtime.po
index f1975e6cfd..7cc644ee5a 100644
--- a/plugins/Realtime/locale/tr/LC_MESSAGES/Realtime.po
+++ b/plugins/Realtime/locale/tr/LC_MESSAGES/Realtime.po
@@ -9,18 +9,30 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Realtime\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:00+0000\n"
-"Language-Team: Turkish <http://translatewiki.net/wiki/Portal:tr>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:47+0000\n"
+"Language-Team: Turkish <https://translatewiki.net/wiki/Portal:tr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-09 19:00:58+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2012-01-02 10:10:45+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: tr\n"
 "X-Message-Group: #out-statusnet-plugin-realtime\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#. TRANS: Client exception. Do not translate POST.
+msgid "You have to POST it."
+msgstr ""
+
+#. TRANS: Client exception thrown when the channel key argument is missing.
+msgid "No channel key argument."
+msgstr ""
+
+#. TRANS: Client exception thrown when referring to a non-existing channel.
+msgid "No such channel."
+msgstr ""
+
 #. TRANS: Text label for realtime view "play" button, usually replaced by an icon.
 msgctxt "BUTTON"
 msgid "Play"
diff --git a/plugins/Realtime/locale/uk/LC_MESSAGES/Realtime.po b/plugins/Realtime/locale/uk/LC_MESSAGES/Realtime.po
index a013696541..1d91e5cc45 100644
--- a/plugins/Realtime/locale/uk/LC_MESSAGES/Realtime.po
+++ b/plugins/Realtime/locale/uk/LC_MESSAGES/Realtime.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Realtime to Ukrainian (Україн�ька)
+# Translation of StatusNet - Realtime to Ukrainian (україн�ька)
 # Exported from translatewiki.net
 #
 # Author: Boogie
@@ -9,19 +9,31 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Realtime\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:00+0000\n"
-"Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:47+0000\n"
+"Language-Team: Ukrainian <https://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-09 19:00:58+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2012-01-02 10:10:45+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-realtime\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
+#. TRANS: Client exception. Do not translate POST.
+msgid "You have to POST it."
+msgstr ""
+
+#. TRANS: Client exception thrown when the channel key argument is missing.
+msgid "No channel key argument."
+msgstr ""
+
+#. TRANS: Client exception thrown when referring to a non-existing channel.
+msgid "No such channel."
+msgstr ""
+
 #. TRANS: Text label for realtime view "play" button, usually replaced by an icon.
 msgctxt "BUTTON"
 msgid "Play"
diff --git a/plugins/Realtime/realtimeupdate.js b/plugins/Realtime/realtimeupdate.js
index d9f5e7604f..e044f2f916 100644
--- a/plugins/Realtime/realtimeupdate.js
+++ b/plugins/Realtime/realtimeupdate.js
@@ -1,6 +1,6 @@
 /*
  * StatusNet - a distributed open-source microblogging tool
- * Copyright (C) 2008, StatusNet, Inc.
+ * Copyright (C) 2009-2011, StatusNet, Inc.
  *
  * Add a notice encoded as JSON into the current timeline
  *
@@ -21,7 +21,7 @@
  * @package   StatusNet
  * @author    Evan Prodromou <evan@status.net>
  * @author    Sarven Capadisli <csarven@status.net>
- * @copyright 2009 StatusNet, Inc.
+ * @copyright 2009-2011 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
  */
@@ -45,6 +45,8 @@
 RealtimeUpdate = {
      _userid: 0,
      _showurl: '',
+     _keepaliveurl: '',
+     _closeurl: '',
      _updatecounter: 0,
      _maxnotices: 50,
      _windowhasfocus: true,
@@ -390,11 +392,28 @@ RealtimeUpdate = {
       *
       * @access private
       */
-     initActions: function(url, timeline, path)
+    initActions: function(url, timeline, path, keepaliveurl, closeurl)
      {
         $('#notices_primary').prepend('<ul id="realtime_actions"><li id="realtime_playpause"></li><li id="realtime_timeline"></li></ul>');
 
         RealtimeUpdate._pluginPath = path;
+        RealtimeUpdate._keepaliveurl = keepaliveurl;
+        RealtimeUpdate._closeurl = closeurl;
+
+
+	 // On unload, let the server know we're no longer listening
+         $(window).unload(function() {
+            $.ajax({
+                type: 'POST',
+                url: RealtimeUpdate._closeurl});
+	 });
+
+	setInterval(function() {
+            $.ajax({
+                type: 'POST',
+                url: RealtimeUpdate._keepaliveurl});
+
+	}, 15 * 60 * 1000 ); // every 15 min; timeout in 30 min
 
         RealtimeUpdate.initPlayPause();
         RealtimeUpdate.initAddPopup(url, timeline, RealtimeUpdate._pluginPath);
diff --git a/plugins/Realtime/realtimeupdate.min.js b/plugins/Realtime/realtimeupdate.min.js
index a7453f3a16..ad3fb97a76 100644
--- a/plugins/Realtime/realtimeupdate.min.js
+++ b/plugins/Realtime/realtimeupdate.min.js
@@ -1 +1 @@
-RealtimeUpdate={_userid:0,_showurl:"",_updatecounter:0,_maxnotices:50,_windowhasfocus:true,_documenttitle:"",_paused:false,_queuedNotices:[],init:function(a,b){RealtimeUpdate._userid=a;RealtimeUpdate._showurl=b;RealtimeUpdate._documenttitle=document.title;$(window).bind("focus",function(){RealtimeUpdate._windowhasfocus=true;RealtimeUpdate._updatecounter=0;RealtimeUpdate.removeWindowCounter()});$(window).bind("blur",function(){$("#notices_primary .notice").removeClass("mark-top");$("#notices_primary .notice:first").addClass("mark-top");RealtimeUpdate._windowhasfocus=false;return false})},receive:function(a){if(RealtimeUpdate.isNoticeVisible(a.id)){return}if(RealtimeUpdate._paused===false){RealtimeUpdate.purgeLastNoticeItem();RealtimeUpdate.insertNoticeItem(a)}else{RealtimeUpdate._queuedNotices.push(a);RealtimeUpdate.updateQueuedCounter()}RealtimeUpdate.updateWindowCounter()},insertNoticeItem:function(a){if(RealtimeUpdate.isNoticeVisible(a.id)){return}RealtimeUpdate.makeNoticeItem(a,function(b){if(RealtimeUpdate.isNoticeVisible(a.id)){return}var c=$(b).attr("id");var d=$("#notices_primary .notices:first");var j=true;var e=d.hasClass("threaded-notices");if(e&&a.in_reply_to_status_id){var g=$("#notice-"+a.in_reply_to_status_id);if(g.length==0){}else{var h=g.closest(".notices");if(h.hasClass("threaded-replies")){g=h.closest(".notice")}d=g.find(".threaded-replies");if(d.length==0){d=$('<ul class="notices threaded-replies xoxo"></ul>');g.append(d);SN.U.NoticeInlineReplyPlaceholder(g)}j=false}}var i=$(b);if(j){d.prepend(i)}else{var f=d.find("li.notice-reply-placeholder");if(f.length>0){i.insertBefore(f)}else{i.appendTo(d)}}i.css({display:"none"}).fadeIn(1000);SN.U.NoticeReplyTo($("#"+c));SN.U.NoticeWithAttachment($("#"+c))})},isNoticeVisible:function(a){return($("#notice-"+a).length>0)},purgeLastNoticeItem:function(){if($("#notices_primary .notice").length>RealtimeUpdate._maxnotices){$("#notices_primary .notice:last").remove()}},updateWindowCounter:function(){if(RealtimeUpdate._windowhasfocus===false){RealtimeUpdate._updatecounter+=1;document.title="("+RealtimeUpdate._updatecounter+") "+RealtimeUpdate._documenttitle}},removeWindowCounter:function(){document.title=RealtimeUpdate._documenttitle},makeNoticeItem:function(b,c){var a=RealtimeUpdate._showurl.replace("0000000000",b.id);$.get(a,{ajax:1},function(f,h,g){var e=$("li.notice:first",f);if(e.length){var d=document._importNode(e[0],true);c(d)}})},makeFavoriteForm:function(c,b){var a;a='<form id="favor-'+c+'" class="form_favor" method="post" action="'+RealtimeUpdate._favorurl+'"><fieldset><legend>Favor this notice</legend><input name="token-'+c+'" type="hidden" id="token-'+c+'" value="'+b+'"/><input name="notice" type="hidden" id="notice-n'+c+'" value="'+c+'"/><input type="submit" id="favor-submit-'+c+'" name="favor-submit-'+c+'" class="submit" value="Favor" title="Favor this notice"/></fieldset></form>';return a},makeReplyLink:function(c,a){var b;b='<a class="notice_reply" href="'+RealtimeUpdate._replyurl+"?replyto="+a+'" title="Reply to this notice">Reply <span class="notice_id">'+c+"</span></a>";return b},makeRepeatForm:function(c,b){var a;a='<form id="repeat-'+c+'" class="form_repeat" method="post" action="'+RealtimeUpdate._repeaturl+'"><fieldset><legend>Repeat this notice?</legend><input name="token-'+c+'" type="hidden" id="token-'+c+'" value="'+b+'"/><input name="notice" type="hidden" id="notice-'+c+'" value="'+c+'"/><input type="submit" id="repeat-submit-'+c+'" name="repeat-submit-'+c+'" class="submit" value="Yes" title="Repeat this notice"/></fieldset></form>';return a},makeDeleteLink:function(c){var b,a;a=RealtimeUpdate._deleteurl.replace("0000000000",c);b='<a class="notice_delete" href="'+a+'" title="Delete this notice">Delete</a>';return b},initActions:function(a,b,c){$("#notices_primary").prepend('<ul id="realtime_actions"><li id="realtime_playpause"></li><li id="realtime_timeline"></li></ul>');RealtimeUpdate._pluginPath=c;RealtimeUpdate.initPlayPause();RealtimeUpdate.initAddPopup(a,b,RealtimeUpdate._pluginPath)},initPlayPause:function(){if(typeof(localStorage)=="undefined"){RealtimeUpdate.showPause()}else{if(localStorage.getItem("RealtimeUpdate_paused")==="true"){RealtimeUpdate.showPlay()}else{RealtimeUpdate.showPause()}}},showPause:function(){RealtimeUpdate.setPause(false);RealtimeUpdate.showQueuedNotices();RealtimeUpdate.addNoticesHover();$("#realtime_playpause").remove();$("#realtime_actions").prepend('<li id="realtime_playpause"><button id="realtime_pause" class="pause"></button></li>');$("#realtime_pause").text(SN.msg("realtime_pause")).attr("title",SN.msg("realtime_pause_tooltip")).bind("click",function(){RealtimeUpdate.removeNoticesHover();RealtimeUpdate.showPlay();return false})},showPlay:function(){RealtimeUpdate.setPause(true);$("#realtime_playpause").remove();$("#realtime_actions").prepend('<li id="realtime_playpause"><span id="queued_counter"></span> <button id="realtime_play" class="play"></button></li>');$("#realtime_play").text(SN.msg("realtime_play")).attr("title",SN.msg("realtime_play_tooltip")).bind("click",function(){RealtimeUpdate.showPause();return false})},setPause:function(a){RealtimeUpdate._paused=a;if(typeof(localStorage)!="undefined"){localStorage.setItem("RealtimeUpdate_paused",RealtimeUpdate._paused)}},showQueuedNotices:function(){$.each(RealtimeUpdate._queuedNotices,function(a,b){RealtimeUpdate.insertNoticeItem(b)});RealtimeUpdate._queuedNotices=[];RealtimeUpdate.removeQueuedCounter()},updateQueuedCounter:function(){$("#realtime_playpause #queued_counter").html("("+RealtimeUpdate._queuedNotices.length+")")},removeQueuedCounter:function(){$("#realtime_playpause #queued_counter").empty()},addNoticesHover:function(){$("#notices_primary .notices").hover(function(){if(RealtimeUpdate._paused===false){RealtimeUpdate.showPlay()}},function(){if(RealtimeUpdate._paused===true){RealtimeUpdate.showPause()}})},removeNoticesHover:function(){$("#notices_primary .notices").unbind()},initAddPopup:function(a,b,c){$("#realtime_timeline").append('<button id="realtime_popup"></button>');$("#realtime_popup").text(SN.msg("realtime_popup")).attr("title",SN.msg("realtime_popup_tooltip")).bind("click",function(){window.open(a,"","toolbar=no,resizable=yes,scrollbars=yes,status=no,menubar=no,personalbar=no,location=no,width=500,height=550");return false})},initPopupWindow:function(){$(".notices .entry-title a, .notices .entry-content a").bind("click",function(){window.open(this.href,"");return false});$("#showstream .entity_profile").css({width:"69%"})}};
\ No newline at end of file
+RealtimeUpdate={_userid:0,_showurl:"",_keepaliveurl:"",_closeurl:"",_updatecounter:0,_maxnotices:50,_windowhasfocus:true,_documenttitle:"",_paused:false,_queuedNotices:[],init:function(a,b){RealtimeUpdate._userid=a;RealtimeUpdate._showurl=b;RealtimeUpdate._documenttitle=document.title;$(window).bind("focus",function(){RealtimeUpdate._windowhasfocus=true;RealtimeUpdate._updatecounter=0;RealtimeUpdate.removeWindowCounter()});$(window).bind("blur",function(){$("#notices_primary .notice").removeClass("mark-top");$("#notices_primary .notice:first").addClass("mark-top");RealtimeUpdate._windowhasfocus=false;return false})},receive:function(a){if(RealtimeUpdate.isNoticeVisible(a.id)){return}if(RealtimeUpdate._paused===false){RealtimeUpdate.purgeLastNoticeItem();RealtimeUpdate.insertNoticeItem(a)}else{RealtimeUpdate._queuedNotices.push(a);RealtimeUpdate.updateQueuedCounter()}RealtimeUpdate.updateWindowCounter()},insertNoticeItem:function(a){if(RealtimeUpdate.isNoticeVisible(a.id)){return}RealtimeUpdate.makeNoticeItem(a,function(b){if(RealtimeUpdate.isNoticeVisible(a.id)){return}var c=$(b).attr("id");var d=$("#notices_primary .notices:first");var j=true;var e=d.hasClass("threaded-notices");if(e&&a.in_reply_to_status_id){var g=$("#notice-"+a.in_reply_to_status_id);if(g.length==0){}else{var h=g.closest(".notices");if(h.hasClass("threaded-replies")){g=h.closest(".notice")}d=g.find(".threaded-replies");if(d.length==0){d=$('<ul class="notices threaded-replies xoxo"></ul>');g.append(d);SN.U.NoticeInlineReplyPlaceholder(g)}j=false}}var i=$(b);if(j){d.prepend(i)}else{var f=d.find("li.notice-reply-placeholder");if(f.length>0){i.insertBefore(f)}else{i.appendTo(d)}}i.css({display:"none"}).fadeIn(1000);SN.U.NoticeReplyTo($("#"+c));SN.U.NoticeWithAttachment($("#"+c))})},isNoticeVisible:function(a){return($("#notice-"+a).length>0)},purgeLastNoticeItem:function(){if($("#notices_primary .notice").length>RealtimeUpdate._maxnotices){$("#notices_primary .notice:last").remove()}},updateWindowCounter:function(){if(RealtimeUpdate._windowhasfocus===false){RealtimeUpdate._updatecounter+=1;document.title="("+RealtimeUpdate._updatecounter+") "+RealtimeUpdate._documenttitle}},removeWindowCounter:function(){document.title=RealtimeUpdate._documenttitle},makeNoticeItem:function(b,c){var a=RealtimeUpdate._showurl.replace("0000000000",b.id);$.get(a,{ajax:1},function(f,h,g){var e=$("li.notice:first",f);if(e.length){var d=document._importNode(e[0],true);c(d)}})},makeFavoriteForm:function(c,b){var a;a='<form id="favor-'+c+'" class="form_favor" method="post" action="'+RealtimeUpdate._favorurl+'"><fieldset><legend>Favor this notice</legend><input name="token-'+c+'" type="hidden" id="token-'+c+'" value="'+b+'"/><input name="notice" type="hidden" id="notice-n'+c+'" value="'+c+'"/><input type="submit" id="favor-submit-'+c+'" name="favor-submit-'+c+'" class="submit" value="Favor" title="Favor this notice"/></fieldset></form>';return a},makeReplyLink:function(c,a){var b;b='<a class="notice_reply" href="'+RealtimeUpdate._replyurl+"?replyto="+a+'" title="Reply to this notice">Reply <span class="notice_id">'+c+"</span></a>";return b},makeRepeatForm:function(c,b){var a;a='<form id="repeat-'+c+'" class="form_repeat" method="post" action="'+RealtimeUpdate._repeaturl+'"><fieldset><legend>Repeat this notice?</legend><input name="token-'+c+'" type="hidden" id="token-'+c+'" value="'+b+'"/><input name="notice" type="hidden" id="notice-'+c+'" value="'+c+'"/><input type="submit" id="repeat-submit-'+c+'" name="repeat-submit-'+c+'" class="submit" value="Yes" title="Repeat this notice"/></fieldset></form>';return a},makeDeleteLink:function(c){var b,a;a=RealtimeUpdate._deleteurl.replace("0000000000",c);b='<a class="notice_delete" href="'+a+'" title="Delete this notice">Delete</a>';return b},initActions:function(a,c,d,b,e){$("#notices_primary").prepend('<ul id="realtime_actions"><li id="realtime_playpause"></li><li id="realtime_timeline"></li></ul>');RealtimeUpdate._pluginPath=d;RealtimeUpdate._keepaliveurl=b;RealtimeUpdate._closeurl=e;$(window).unload(function(){$.ajax({type:"POST",url:RealtimeUpdate._closeurl})});setInterval(function(){$.ajax({type:"POST",url:RealtimeUpdate._keepaliveurl})},15*60*1000);RealtimeUpdate.initPlayPause();RealtimeUpdate.initAddPopup(a,c,RealtimeUpdate._pluginPath)},initPlayPause:function(){if(typeof(localStorage)=="undefined"){RealtimeUpdate.showPause()}else{if(localStorage.getItem("RealtimeUpdate_paused")==="true"){RealtimeUpdate.showPlay()}else{RealtimeUpdate.showPause()}}},showPause:function(){RealtimeUpdate.setPause(false);RealtimeUpdate.showQueuedNotices();RealtimeUpdate.addNoticesHover();$("#realtime_playpause").remove();$("#realtime_actions").prepend('<li id="realtime_playpause"><button id="realtime_pause" class="pause"></button></li>');$("#realtime_pause").text(SN.msg("realtime_pause")).attr("title",SN.msg("realtime_pause_tooltip")).bind("click",function(){RealtimeUpdate.removeNoticesHover();RealtimeUpdate.showPlay();return false})},showPlay:function(){RealtimeUpdate.setPause(true);$("#realtime_playpause").remove();$("#realtime_actions").prepend('<li id="realtime_playpause"><span id="queued_counter"></span> <button id="realtime_play" class="play"></button></li>');$("#realtime_play").text(SN.msg("realtime_play")).attr("title",SN.msg("realtime_play_tooltip")).bind("click",function(){RealtimeUpdate.showPause();return false})},setPause:function(a){RealtimeUpdate._paused=a;if(typeof(localStorage)!="undefined"){localStorage.setItem("RealtimeUpdate_paused",RealtimeUpdate._paused)}},showQueuedNotices:function(){$.each(RealtimeUpdate._queuedNotices,function(a,b){RealtimeUpdate.insertNoticeItem(b)});RealtimeUpdate._queuedNotices=[];RealtimeUpdate.removeQueuedCounter()},updateQueuedCounter:function(){$("#realtime_playpause #queued_counter").html("("+RealtimeUpdate._queuedNotices.length+")")},removeQueuedCounter:function(){$("#realtime_playpause #queued_counter").empty()},addNoticesHover:function(){$("#notices_primary .notices").hover(function(){if(RealtimeUpdate._paused===false){RealtimeUpdate.showPlay()}},function(){if(RealtimeUpdate._paused===true){RealtimeUpdate.showPause()}})},removeNoticesHover:function(){$("#notices_primary .notices").unbind()},initAddPopup:function(a,b,c){$("#realtime_timeline").append('<button id="realtime_popup"></button>');$("#realtime_popup").text(SN.msg("realtime_popup")).attr("title",SN.msg("realtime_popup_tooltip")).bind("click",function(){window.open(a,"","toolbar=no,resizable=yes,scrollbars=yes,status=no,menubar=no,personalbar=no,location=no,width=500,height=550");return false})},initPopupWindow:function(){$(".notices .entry-title a, .notices .entry-content a").bind("click",function(){window.open(this.href,"");return false});$("#showstream .entity_profile").css({width:"69%"})}};
\ No newline at end of file
diff --git a/plugins/Recaptcha/RecaptchaPlugin.php b/plugins/Recaptcha/RecaptchaPlugin.php
index fbc0e0cac1..73a2dcc76a 100644
--- a/plugins/Recaptcha/RecaptchaPlugin.php
+++ b/plugins/Recaptcha/RecaptchaPlugin.php
@@ -54,6 +54,7 @@ class RecaptchaPlugin extends Plugin
     function onEndRegistrationFormData($action)
     {
         $action->elementStart('li');
+        // TRANS: Field label.
         $action->raw('<label for="recaptcha">'._m('Captcha').'</label>');
 
         // AJAX API will fill this div out.
@@ -93,9 +94,12 @@ class RecaptchaPlugin extends Plugin
 
         if (!$resp->is_valid) {
             if($this->display_errors) {
-                $action->showForm(sprintf(_m("(reCAPTCHA error: %s)", $resp->error)));
+                // TRANS: Error message displayed if there is in error communicating with the
+                // TRANS: reCAPTCHA server. %s is the error.
+                $action->showForm(sprintf(_m('(reCAPTCHA error: %s)', $resp->error)));
             }
-            $action->showForm(_m("Captcha does not match!"));
+            // TRANS: Error message displayed if a provided captcha response does not match.
+            $action->showForm(_m('Captcha does not match!'));
             return false;
         }
     }
@@ -107,6 +111,7 @@ class RecaptchaPlugin extends Plugin
                             'author' => 'Eric Helgeson',
                             'homepage' => 'http://status.net/wiki/Plugin:Recaptcha',
                             'rawdescription' =>
+                            // TRANS: Plugin description.
                             _m('Uses <a href="http://recaptcha.org/">Recaptcha</a> service to add a  '.
                                'captcha to the registration page.'));
         return true;
diff --git a/plugins/Recaptcha/locale/Recaptcha.pot b/plugins/Recaptcha/locale/Recaptcha.pot
index 94307316b1..4bebaf3b65 100644
--- a/plugins/Recaptcha/locale/Recaptcha.pot
+++ b/plugins/Recaptcha/locale/Recaptcha.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,15 +16,18 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: RecaptchaPlugin.php:57
+#. TRANS: Field label.
+#: RecaptchaPlugin.php:58
 msgid "Captcha"
 msgstr ""
 
-#: RecaptchaPlugin.php:98
+#. TRANS: Error message displayed if a provided captcha response does not match.
+#: RecaptchaPlugin.php:102
 msgid "Captcha does not match!"
 msgstr ""
 
-#: RecaptchaPlugin.php:110
+#. TRANS: Plugin description.
+#: RecaptchaPlugin.php:115
 msgid ""
 "Uses <a href=\"http://recaptcha.org/\">Recaptcha</a> service to add a  "
 "captcha to the registration page."
diff --git a/plugins/Recaptcha/locale/ca/LC_MESSAGES/Recaptcha.po b/plugins/Recaptcha/locale/ca/LC_MESSAGES/Recaptcha.po
index 3f32959598..b58605b7fd 100644
--- a/plugins/Recaptcha/locale/ca/LC_MESSAGES/Recaptcha.po
+++ b/plugins/Recaptcha/locale/ca/LC_MESSAGES/Recaptcha.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Recaptcha to Catalan (Català)
+# Translation of StatusNet - Recaptcha to Catalan (català)
 # Exported from translatewiki.net
 #
 # Author: Toniher
@@ -9,24 +9,27 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Recaptcha\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:01+0000\n"
-"Language-Team: Catalan <http://translatewiki.net/wiki/Portal:ca>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:47+0000\n"
+"Language-Team: Catalan <https://translatewiki.net/wiki/Portal:ca>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-16 23:18:53+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:24+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ca\n"
 "X-Message-Group: #out-statusnet-plugin-recaptcha\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Field label.
 msgid "Captcha"
 msgstr "Captcha"
 
+#. TRANS: Error message displayed if a provided captcha response does not match.
 msgid "Captcha does not match!"
 msgstr "El Captcha no coincideix!"
 
+#. TRANS: Plugin description.
 msgid ""
 "Uses <a href=\"http://recaptcha.org/\">Recaptcha</a> service to add a  "
 "captcha to the registration page."
diff --git a/plugins/Recaptcha/locale/de/LC_MESSAGES/Recaptcha.po b/plugins/Recaptcha/locale/de/LC_MESSAGES/Recaptcha.po
index 6f60e4843b..fc6e346408 100644
--- a/plugins/Recaptcha/locale/de/LC_MESSAGES/Recaptcha.po
+++ b/plugins/Recaptcha/locale/de/LC_MESSAGES/Recaptcha.po
@@ -10,24 +10,27 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Recaptcha\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:01+0000\n"
-"Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:47+0000\n"
+"Language-Team: German <https://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-16 23:18:53+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:24+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-recaptcha\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Field label.
 msgid "Captcha"
 msgstr "Captcha"
 
+#. TRANS: Error message displayed if a provided captcha response does not match.
 msgid "Captcha does not match!"
 msgstr "Captcha stimmt nicht mit Text überein!"
 
+#. TRANS: Plugin description.
 msgid ""
 "Uses <a href=\"http://recaptcha.org/\">Recaptcha</a> service to add a  "
 "captcha to the registration page."
diff --git a/plugins/Recaptcha/locale/es/LC_MESSAGES/Recaptcha.po b/plugins/Recaptcha/locale/es/LC_MESSAGES/Recaptcha.po
new file mode 100644
index 0000000000..f62215aab7
--- /dev/null
+++ b/plugins/Recaptcha/locale/es/LC_MESSAGES/Recaptcha.po
@@ -0,0 +1,35 @@
+# Translation of StatusNet - Recaptcha to Spanish (español)
+# Exported from translatewiki.net
+#
+# Author: Armando-Martin
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Recaptcha\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:48+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:51:24+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Field label.
+msgid "Captcha"
+msgstr "Verificador Captcha"
+
+#. TRANS: Error message displayed if a provided captcha response does not match.
+msgid "Captcha does not match!"
+msgstr "¡El código de verificación Captcha no coincide!"
+
+#. TRANS: Plugin description.
+msgid ""
+"Uses <a href=\"http://recaptcha.org/\">Recaptcha</a> service to add a  "
+"captcha to the registration page."
+msgstr ""
+"Use el servicio <a href=\"http://recaptcha.org/\">Recaptcha</a> para añadir "
+"un código de verificación Captcha a la página de registro."
diff --git a/plugins/Recaptcha/locale/fr/LC_MESSAGES/Recaptcha.po b/plugins/Recaptcha/locale/fr/LC_MESSAGES/Recaptcha.po
index 1f5a3607f5..f2e4f986ce 100644
--- a/plugins/Recaptcha/locale/fr/LC_MESSAGES/Recaptcha.po
+++ b/plugins/Recaptcha/locale/fr/LC_MESSAGES/Recaptcha.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Recaptcha to French (Français)
+# Translation of StatusNet - Recaptcha to French (français)
 # Exported from translatewiki.net
 #
 # Author: Peter17
@@ -10,24 +10,27 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Recaptcha\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:01+0000\n"
-"Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:48+0000\n"
+"Language-Team: French <https://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-16 23:18:53+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:24+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-recaptcha\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#. TRANS: Field label.
 msgid "Captcha"
 msgstr "Vérificateur anti-robot Captcha"
 
+#. TRANS: Error message displayed if a provided captcha response does not match.
 msgid "Captcha does not match!"
 msgstr "Le Captcha ne correspond pas !"
 
+#. TRANS: Plugin description.
 msgid ""
 "Uses <a href=\"http://recaptcha.org/\">Recaptcha</a> service to add a  "
 "captcha to the registration page."
diff --git a/plugins/Recaptcha/locale/fur/LC_MESSAGES/Recaptcha.po b/plugins/Recaptcha/locale/fur/LC_MESSAGES/Recaptcha.po
index 355d0c9696..1974962a83 100644
--- a/plugins/Recaptcha/locale/fur/LC_MESSAGES/Recaptcha.po
+++ b/plugins/Recaptcha/locale/fur/LC_MESSAGES/Recaptcha.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Recaptcha to Friulian (Furlan)
+# Translation of StatusNet - Recaptcha to Friulian (furlan)
 # Exported from translatewiki.net
 #
 # Author: Klenje
@@ -9,24 +9,27 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Recaptcha\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:01+0000\n"
-"Language-Team: Friulian <http://translatewiki.net/wiki/Portal:fur>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:48+0000\n"
+"Language-Team: Friulian <https://translatewiki.net/wiki/Portal:fur>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-16 23:18:53+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:24+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: fur\n"
 "X-Message-Group: #out-statusnet-plugin-recaptcha\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Field label.
 msgid "Captcha"
 msgstr "Captcha"
 
+#. TRANS: Error message displayed if a provided captcha response does not match.
 msgid "Captcha does not match!"
 msgstr "Il Captcha nol corispuint!"
 
+#. TRANS: Plugin description.
 msgid ""
 "Uses <a href=\"http://recaptcha.org/\">Recaptcha</a> service to add a  "
 "captcha to the registration page."
diff --git a/plugins/Recaptcha/locale/gl/LC_MESSAGES/Recaptcha.po b/plugins/Recaptcha/locale/gl/LC_MESSAGES/Recaptcha.po
new file mode 100644
index 0000000000..2f85db4ae5
--- /dev/null
+++ b/plugins/Recaptcha/locale/gl/LC_MESSAGES/Recaptcha.po
@@ -0,0 +1,38 @@
+# Translation of StatusNet - Recaptcha to Galician (galego)
+# Exported from translatewiki.net
+#
+# Author: Toliño
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Recaptcha\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:48+0000\n"
+"Language-Team: Galician <https://translatewiki.net/wiki/Portal:gl>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:51:24+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: gl\n"
+"X-Message-Group: #out-statusnet-plugin-recaptcha\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Field label.
+msgid "Captcha"
+msgstr "Captcha"
+
+#. TRANS: Error message displayed if a provided captcha response does not match.
+msgid "Captcha does not match!"
+msgstr "O captcha non coincide!"
+
+#. TRANS: Plugin description.
+msgid ""
+"Uses <a href=\"http://recaptcha.org/\">Recaptcha</a> service to add a  "
+"captcha to the registration page."
+msgstr ""
+"Usa o servizo <a href=\"http://recaptcha.org/\">Recaptcha</a> para engadir o "
+"captcha á páxina de rexistro."
diff --git a/plugins/Recaptcha/locale/ia/LC_MESSAGES/Recaptcha.po b/plugins/Recaptcha/locale/ia/LC_MESSAGES/Recaptcha.po
index ae5c950a44..9f42ea4891 100644
--- a/plugins/Recaptcha/locale/ia/LC_MESSAGES/Recaptcha.po
+++ b/plugins/Recaptcha/locale/ia/LC_MESSAGES/Recaptcha.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Recaptcha to Interlingua (Interlingua)
+# Translation of StatusNet - Recaptcha to Interlingua (interlingua)
 # Exported from translatewiki.net
 #
 # Author: McDutchie
@@ -9,24 +9,27 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Recaptcha\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:02+0000\n"
-"Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:48+0000\n"
+"Language-Team: Interlingua <https://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-16 23:18:53+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:24+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-recaptcha\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Field label.
 msgid "Captcha"
 msgstr "Captcha"
 
+#. TRANS: Error message displayed if a provided captcha response does not match.
 msgid "Captcha does not match!"
 msgstr "Captcha non corresponde!"
 
+#. TRANS: Plugin description.
 msgid ""
 "Uses <a href=\"http://recaptcha.org/\">Recaptcha</a> service to add a  "
 "captcha to the registration page."
diff --git a/plugins/Recaptcha/locale/mk/LC_MESSAGES/Recaptcha.po b/plugins/Recaptcha/locale/mk/LC_MESSAGES/Recaptcha.po
index 282296c921..a3c2256025 100644
--- a/plugins/Recaptcha/locale/mk/LC_MESSAGES/Recaptcha.po
+++ b/plugins/Recaptcha/locale/mk/LC_MESSAGES/Recaptcha.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Recaptcha to Macedonian (Македон�ки)
+# Translation of StatusNet - Recaptcha to Macedonian (македон�ки)
 # Exported from translatewiki.net
 #
 # Author: Bjankuloski06
@@ -9,24 +9,27 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Recaptcha\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:02+0000\n"
-"Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:48+0000\n"
+"Language-Team: Macedonian <https://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-16 23:18:53+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:24+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-recaptcha\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
 
+#. TRANS: Field label.
 msgid "Captcha"
 msgstr "Captcha"
 
+#. TRANS: Error message displayed if a provided captcha response does not match.
 msgid "Captcha does not match!"
 msgstr "Captcha не �е �овпаѓа!"
 
+#. TRANS: Plugin description.
 msgid ""
 "Uses <a href=\"http://recaptcha.org/\">Recaptcha</a> service to add a  "
 "captcha to the registration page."
diff --git a/plugins/Recaptcha/locale/nb/LC_MESSAGES/Recaptcha.po b/plugins/Recaptcha/locale/nb/LC_MESSAGES/Recaptcha.po
index 830e12c571..c7fb0f8da9 100644
--- a/plugins/Recaptcha/locale/nb/LC_MESSAGES/Recaptcha.po
+++ b/plugins/Recaptcha/locale/nb/LC_MESSAGES/Recaptcha.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Recaptcha to Norwegian (bokmål)‬ (‪Norsk (bokmål)‬)
+# Translation of StatusNet - Recaptcha to Norwegian Bokmål (‪norsk (bokmål)‬)
 # Exported from translatewiki.net
 #
 # Author: Nghtwlkr
@@ -9,24 +9,27 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Recaptcha\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:02+0000\n"
-"Language-Team: Norwegian (bokmål)‬ <http://translatewiki.net/wiki/Portal:no>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:48+0000\n"
+"Language-Team: Norwegian Bokmål <https://translatewiki.net/wiki/Portal:nb>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-16 23:18:53+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
-"X-Language-Code: no\n"
+"X-POT-Import-Date: 2011-06-05 21:51:24+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: nb\n"
 "X-Message-Group: #out-statusnet-plugin-recaptcha\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Field label.
 msgid "Captcha"
 msgstr "Captcha"
 
+#. TRANS: Error message displayed if a provided captcha response does not match.
 msgid "Captcha does not match!"
 msgstr "Captcha stemmer ikke."
 
+#. TRANS: Plugin description.
 msgid ""
 "Uses <a href=\"http://recaptcha.org/\">Recaptcha</a> service to add a  "
 "captcha to the registration page."
diff --git a/plugins/Recaptcha/locale/nl/LC_MESSAGES/Recaptcha.po b/plugins/Recaptcha/locale/nl/LC_MESSAGES/Recaptcha.po
index 4bdff1e62c..c30b9dc170 100644
--- a/plugins/Recaptcha/locale/nl/LC_MESSAGES/Recaptcha.po
+++ b/plugins/Recaptcha/locale/nl/LC_MESSAGES/Recaptcha.po
@@ -9,24 +9,27 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Recaptcha\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:02+0000\n"
-"Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:48+0000\n"
+"Language-Team: Dutch <https://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-16 23:18:53+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:24+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-recaptcha\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Field label.
 msgid "Captcha"
 msgstr "Captcha"
 
+#. TRANS: Error message displayed if a provided captcha response does not match.
 msgid "Captcha does not match!"
 msgstr "Captcha komt niet overeen!"
 
+#. TRANS: Plugin description.
 msgid ""
 "Uses <a href=\"http://recaptcha.org/\">Recaptcha</a> service to add a  "
 "captcha to the registration page."
diff --git a/plugins/Recaptcha/locale/pl/LC_MESSAGES/Recaptcha.po b/plugins/Recaptcha/locale/pl/LC_MESSAGES/Recaptcha.po
index 7aad4cff03..a5520e7026 100644
--- a/plugins/Recaptcha/locale/pl/LC_MESSAGES/Recaptcha.po
+++ b/plugins/Recaptcha/locale/pl/LC_MESSAGES/Recaptcha.po
@@ -1,7 +1,8 @@
-# Translation of StatusNet - Recaptcha to Polish (Polski)
-# Expored from translatewiki.net
+# Translation of StatusNet - Recaptcha to Polish (polski)
+# Exported from translatewiki.net
 #
 # Author: Raven
+# Author: Woytecr
 # --
 # This file is distributed under the same license as the StatusNet package.
 #
@@ -9,29 +10,31 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Recaptcha\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:49+0000\n"
-"Language-Team: Polish <http://translatewiki.net/wiki/Portal:pl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:48+0000\n"
+"Language-Team: Polish <https://translatewiki.net/wiki/Portal:pl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2010-11-30 20:43:51+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:24+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: pl\n"
 "X-Message-Group: #out-statusnet-plugin-recaptcha\n"
 "Plural-Forms: nplurals=3; plural=(n == 1) ? 0 : ( (n%10 >= 2 && n%10 <= 4 && "
 "(n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
-#: RecaptchaPlugin.php:64
+#. TRANS: Field label.
 msgid "Captcha"
 msgstr "Captcha"
 
-#: RecaptchaPlugin.php:105
+#. TRANS: Error message displayed if a provided captcha response does not match.
 msgid "Captcha does not match!"
-msgstr ""
+msgstr "Kod Captcha nie został przepisany prawidłowo!"
 
-#: RecaptchaPlugin.php:117
+#. TRANS: Plugin description.
 msgid ""
 "Uses <a href=\"http://recaptcha.org/\">Recaptcha</a> service to add a  "
 "captcha to the registration page."
 msgstr ""
+"Używa serwisu <a href=\"http://recaptcha.org/\">Recaptcha</a> aby umieścić "
+"kod captcha na stronÄ™ rejestracji."
diff --git a/plugins/Recaptcha/locale/pt/LC_MESSAGES/Recaptcha.po b/plugins/Recaptcha/locale/pt/LC_MESSAGES/Recaptcha.po
index 56da14943e..5bbcfe98e6 100644
--- a/plugins/Recaptcha/locale/pt/LC_MESSAGES/Recaptcha.po
+++ b/plugins/Recaptcha/locale/pt/LC_MESSAGES/Recaptcha.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Recaptcha to Portuguese (Português)
+# Translation of StatusNet - Recaptcha to Portuguese (português)
 # Exported from translatewiki.net
 #
 # Author: GTNS
@@ -9,24 +9,27 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Recaptcha\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:02+0000\n"
-"Language-Team: Portuguese <http://translatewiki.net/wiki/Portal:pt>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:48+0000\n"
+"Language-Team: Portuguese <https://translatewiki.net/wiki/Portal:pt>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-16 23:18:53+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:24+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: pt\n"
 "X-Message-Group: #out-statusnet-plugin-recaptcha\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Field label.
 msgid "Captcha"
 msgstr "Imagem de verificação"
 
+#. TRANS: Error message displayed if a provided captcha response does not match.
 msgid "Captcha does not match!"
 msgstr "A imagem de verificação não corresponde!"
 
+#. TRANS: Plugin description.
 msgid ""
 "Uses <a href=\"http://recaptcha.org/\">Recaptcha</a> service to add a  "
 "captcha to the registration page."
diff --git a/plugins/Recaptcha/locale/ru/LC_MESSAGES/Recaptcha.po b/plugins/Recaptcha/locale/ru/LC_MESSAGES/Recaptcha.po
index 59857e822a..fcb10a821e 100644
--- a/plugins/Recaptcha/locale/ru/LC_MESSAGES/Recaptcha.po
+++ b/plugins/Recaptcha/locale/ru/LC_MESSAGES/Recaptcha.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Recaptcha to Russian (Ру��кий)
+# Translation of StatusNet - Recaptcha to Russian (ру��кий)
 # Exported from translatewiki.net
 #
 # Author: Eleferen
@@ -10,25 +10,28 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Recaptcha\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:02+0000\n"
-"Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:48+0000\n"
+"Language-Team: Russian <https://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-16 23:18:53+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:24+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-recaptcha\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
+#. TRANS: Field label.
 msgid "Captcha"
 msgstr "Капча"
 
+#. TRANS: Error message displayed if a provided captcha response does not match.
 msgid "Captcha does not match!"
 msgstr "Код проверки не �овпадает!"
 
+#. TRANS: Plugin description.
 msgid ""
 "Uses <a href=\"http://recaptcha.org/\">Recaptcha</a> service to add a  "
 "captcha to the registration page."
diff --git a/plugins/Recaptcha/locale/sv/LC_MESSAGES/Recaptcha.po b/plugins/Recaptcha/locale/sv/LC_MESSAGES/Recaptcha.po
index 4d4bf5c266..64aaee3835 100644
--- a/plugins/Recaptcha/locale/sv/LC_MESSAGES/Recaptcha.po
+++ b/plugins/Recaptcha/locale/sv/LC_MESSAGES/Recaptcha.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Recaptcha to Swedish (Svenska)
+# Translation of StatusNet - Recaptcha to Swedish (svenska)
 # Exported from translatewiki.net
 #
 # Author: Jamminjohn
@@ -9,24 +9,27 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Recaptcha\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:02+0000\n"
-"Language-Team: Swedish <http://translatewiki.net/wiki/Portal:sv>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:49+0000\n"
+"Language-Team: Swedish <https://translatewiki.net/wiki/Portal:sv>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-16 23:18:53+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:24+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: sv\n"
 "X-Message-Group: #out-statusnet-plugin-recaptcha\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Field label.
 msgid "Captcha"
 msgstr "Captcha"
 
+#. TRANS: Error message displayed if a provided captcha response does not match.
 msgid "Captcha does not match!"
 msgstr "Captcha stämmer inte!"
 
+#. TRANS: Plugin description.
 msgid ""
 "Uses <a href=\"http://recaptcha.org/\">Recaptcha</a> service to add a  "
 "captcha to the registration page."
diff --git a/plugins/Recaptcha/locale/tl/LC_MESSAGES/Recaptcha.po b/plugins/Recaptcha/locale/tl/LC_MESSAGES/Recaptcha.po
index d3b23a69f3..84c33845d7 100644
--- a/plugins/Recaptcha/locale/tl/LC_MESSAGES/Recaptcha.po
+++ b/plugins/Recaptcha/locale/tl/LC_MESSAGES/Recaptcha.po
@@ -9,24 +9,27 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Recaptcha\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:02+0000\n"
-"Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:49+0000\n"
+"Language-Team: Tagalog <https://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-16 23:18:53+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:24+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-recaptcha\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Field label.
 msgid "Captcha"
 msgstr "Captcha"
 
+#. TRANS: Error message displayed if a provided captcha response does not match.
 msgid "Captcha does not match!"
 msgstr "Hindi tugma ang Captcha!"
 
+#. TRANS: Plugin description.
 msgid ""
 "Uses <a href=\"http://recaptcha.org/\">Recaptcha</a> service to add a  "
 "captcha to the registration page."
diff --git a/plugins/Recaptcha/locale/uk/LC_MESSAGES/Recaptcha.po b/plugins/Recaptcha/locale/uk/LC_MESSAGES/Recaptcha.po
index 8eccdd99d2..0c67de4e99 100644
--- a/plugins/Recaptcha/locale/uk/LC_MESSAGES/Recaptcha.po
+++ b/plugins/Recaptcha/locale/uk/LC_MESSAGES/Recaptcha.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Recaptcha to Ukrainian (Україн�ька)
+# Translation of StatusNet - Recaptcha to Ukrainian (україн�ька)
 # Exported from translatewiki.net
 #
 # Author: Boogie
@@ -9,25 +9,28 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Recaptcha\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:02+0000\n"
-"Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:49+0000\n"
+"Language-Team: Ukrainian <https://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-16 23:18:53+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:24+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-recaptcha\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
+#. TRANS: Field label.
 msgid "Captcha"
 msgstr "Captcha"
 
+#. TRANS: Error message displayed if a provided captcha response does not match.
 msgid "Captcha does not match!"
 msgstr "Коди перевірки не збігають��!"
 
+#. TRANS: Plugin description.
 msgid ""
 "Uses <a href=\"http://recaptcha.org/\">Recaptcha</a> service to add a  "
 "captcha to the registration page."
diff --git a/plugins/Recaptcha/recaptchalib.php b/plugins/Recaptcha/recaptchalib.php
index 897c50981a..4dc082b33d 100644
--- a/plugins/Recaptcha/recaptchalib.php
+++ b/plugins/Recaptcha/recaptchalib.php
@@ -1,5 +1,7 @@
 <?php
 /*
+ * @todo FIXME: Outdated URLs.
+ *
  * This is a PHP library that handles calling reCAPTCHA.
  *    - Documentation and latest version
  *          http://recaptcha.net/plugins/php/
@@ -272,6 +274,3 @@ function recaptcha_mailhide_html($pubkey, $privkey, $email) {
 		"' onclick=\"window.open('" . htmlentities ($url) . "', '', 'toolbar=0,scrollbars=0,location=0,statusbar=0,menubar=0,resizable=0,width=500,height=300'); return false;\" title=\"Reveal this e-mail address\">...</a>@" . htmlentities ($emailparts [1]);
 
 }
-
-
-?>
diff --git a/plugins/RegisterThrottle/RegisterThrottlePlugin.php b/plugins/RegisterThrottle/RegisterThrottlePlugin.php
index e3982427da..1e686bd62b 100644
--- a/plugins/RegisterThrottle/RegisterThrottlePlugin.php
+++ b/plugins/RegisterThrottle/RegisterThrottlePlugin.php
@@ -52,7 +52,6 @@ class RegisterThrottlePlugin extends Plugin
      *
      * Default is 3 registrations per hour, 5 per day, 10 per week.
      */
-
     public $regLimits = array(604800 => 10, // per week
                               86400 => 5, // per day
                               3600 => 3); // per hour
@@ -61,13 +60,11 @@ class RegisterThrottlePlugin extends Plugin
      * Disallow registration if a silenced user has registered from
      * this IP address.
      */
-
     public $silenced = true;
 
     /**
      * Whether we're enabled; prevents recursion.
      */
-
     static private $enabled = true;
 
     /**
@@ -77,13 +74,11 @@ class RegisterThrottlePlugin extends Plugin
      *
      * @return boolean hook value; true means continue processing, false means stop.
      */
-
     function onCheckSchema()
     {
         $schema = Schema::get();
 
         // For storing user-submitted flags on profiles
-
         $schema->ensureTable('registration_ip',
                              array(new ColumnDef('user_id', 'integer', null,
                                                  false, 'PRI'),
@@ -100,7 +95,6 @@ class RegisterThrottlePlugin extends Plugin
      *
      * @return boolean hook value; true means continue processing, false means stop.
      */
-
     function onAutoload($cls)
     {
         $dir = dirname(__FILE__);
@@ -124,13 +118,13 @@ class RegisterThrottlePlugin extends Plugin
      * @param Action $action Action that is being executed
      *
      * @return boolean hook value
-     *
      */
     function onStartRegistrationTry($action)
     {
         $ipaddress = $this->_getIpAddress();
 
         if (empty($ipaddress)) {
+            // TRANS: Server exception thrown when no IP address can be found for a registation attempt.
             throw new ServerException(_m('Cannot find IP address.'));
         }
 
@@ -146,7 +140,8 @@ class RegisterThrottlePlugin extends Plugin
                 $now     = time();
                 $this->debug("Comparing {$regtime} to {$now}");
                 if ($now - $regtime < $seconds) {
-                    throw new Exception(_m("Too many registrations. Take a break and try again later."));
+                    // TRANS: Exception thrown when too many user have registered from one IP address within a given time frame.
+                    throw new Exception(_m('Too many registrations. Take a break and try again later.'));
                 }
             }
         }
@@ -158,7 +153,8 @@ class RegisterThrottlePlugin extends Plugin
             foreach ($ids as $id) {
                 $profile = Profile::staticGet('id', $id);
                 if ($profile && $profile->isSilenced()) {
-                    throw new Exception(_m("A banned user has registered from this address."));
+                    // TRANS: Exception thrown when attempting to register from an IP address from which silenced users have registered.
+                    throw new Exception(_m('A banned user has registered from this address.'));
                 }
             }
         }
@@ -175,9 +171,7 @@ class RegisterThrottlePlugin extends Plugin
      * @param User $user new user
      *
      * @return boolean hook value
-     *
      */
-
     function onEndUserRegister($profile, $user)
     {
         $ipaddress = $this->_getIpAddress();
@@ -209,7 +203,6 @@ class RegisterThrottlePlugin extends Plugin
      *
      * @return boolean hook value
      */
-
     function onPluginVersion(&$versions)
     {
         $versions[] = array('name' => 'RegisterThrottle',
@@ -217,6 +210,7 @@ class RegisterThrottlePlugin extends Plugin
                             'author' => 'Evan Prodromou',
                             'homepage' => 'http://status.net/wiki/Plugin:RegisterThrottle',
                             'description' =>
+                            // TRANS: Plugin description.
                             _m('Throttles excessive registration from a single IP address.'));
         return true;
     }
@@ -226,10 +220,10 @@ class RegisterThrottlePlugin extends Plugin
      *
      * @return string IP address or null if not found.
      */
-
     private function _getIpAddress()
     {
         $keys = array('HTTP_X_FORWARDED_FOR',
+                      'HTTP_X_CLIENT',
                       'CLIENT-IP',
                       'REMOTE_ADDR');
 
@@ -250,7 +244,6 @@ class RegisterThrottlePlugin extends Plugin
      *
      * @return Registration_ip nth registration or null if not found.
      */
-
     private function _getNthReg($ipaddress, $n)
     {
         $reg = new Registration_ip();
@@ -276,7 +269,6 @@ class RegisterThrottlePlugin extends Plugin
      *
      * @return boolean hook value
      */
-
     function onEndGrantRole($profile, $role)
     {
         if (!self::$enabled) {
@@ -300,7 +292,6 @@ class RegisterThrottlePlugin extends Plugin
         $ids = Registration_ip::usersByIP($ri->ipaddress);
 
         foreach ($ids as $id) {
-
             if ($id == $profile->id) {
                 continue;
             }
diff --git a/plugins/RegisterThrottle/Registration_ip.php b/plugins/RegisterThrottle/Registration_ip.php
index 2486e36b46..f9fc4918d5 100644
--- a/plugins/RegisterThrottle/Registration_ip.php
+++ b/plugins/RegisterThrottle/Registration_ip.php
@@ -111,7 +111,6 @@ class Registration_ip extends Memcached_DataObject
      *
      * @return array magic three-false array that stops auto-incrementing.
      */
-
     function sequenceKey()
     {
         return array(false, false, false);
@@ -124,7 +123,6 @@ class Registration_ip extends Memcached_DataObject
      *
      * @return Array IDs of users who registered with this address.
      */
-
     static function usersByIP($ipaddress)
     {
         $ids = array();
diff --git a/plugins/RegisterThrottle/locale/RegisterThrottle.pot b/plugins/RegisterThrottle/locale/RegisterThrottle.pot
index 788646924d..b831f6bf6c 100644
--- a/plugins/RegisterThrottle/locale/RegisterThrottle.pot
+++ b/plugins/RegisterThrottle/locale/RegisterThrottle.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,18 +16,22 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: RegisterThrottlePlugin.php:134
+#. TRANS: Server exception thrown when no IP address can be found for a registation attempt.
+#: RegisterThrottlePlugin.php:128
 msgid "Cannot find IP address."
 msgstr ""
 
-#: RegisterThrottlePlugin.php:149
+#. TRANS: Exception thrown when too many user have registered from one IP address within a given time frame.
+#: RegisterThrottlePlugin.php:144
 msgid "Too many registrations. Take a break and try again later."
 msgstr ""
 
-#: RegisterThrottlePlugin.php:161
+#. TRANS: Exception thrown when attempting to register from an IP address from which silenced users have registered.
+#: RegisterThrottlePlugin.php:157
 msgid "A banned user has registered from this address."
 msgstr ""
 
-#: RegisterThrottlePlugin.php:220
+#. TRANS: Plugin description.
+#: RegisterThrottlePlugin.php:214
 msgid "Throttles excessive registration from a single IP address."
 msgstr ""
diff --git a/plugins/RegisterThrottle/locale/ca/LC_MESSAGES/RegisterThrottle.po b/plugins/RegisterThrottle/locale/ca/LC_MESSAGES/RegisterThrottle.po
new file mode 100644
index 0000000000..e38ff7ab88
--- /dev/null
+++ b/plugins/RegisterThrottle/locale/ca/LC_MESSAGES/RegisterThrottle.po
@@ -0,0 +1,38 @@
+# Translation of StatusNet - RegisterThrottle to Catalan (català)
+# Exported from translatewiki.net
+#
+# Author: Toniher
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - RegisterThrottle\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:49+0000\n"
+"Language-Team: Catalan <https://translatewiki.net/wiki/Portal:ca>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-12-03 13:49:00+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: ca\n"
+"X-Message-Group: #out-statusnet-plugin-registerthrottle\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Server exception thrown when no IP address can be found for a registation attempt.
+msgid "Cannot find IP address."
+msgstr "No es pot trobar l'adreça IP."
+
+#. TRANS: Exception thrown when too many user have registered from one IP address within a given time frame.
+msgid "Too many registrations. Take a break and try again later."
+msgstr "Massa registreu. Prengueu un respir i torneu-ho a provar més endavant."
+
+#. TRANS: Exception thrown when attempting to register from an IP address from which silenced users have registered.
+msgid "A banned user has registered from this address."
+msgstr ""
+
+#. TRANS: Plugin description.
+msgid "Throttles excessive registration from a single IP address."
+msgstr ""
diff --git a/plugins/RegisterThrottle/locale/de/LC_MESSAGES/RegisterThrottle.po b/plugins/RegisterThrottle/locale/de/LC_MESSAGES/RegisterThrottle.po
index 2a57f3eaa5..a1a38f8f62 100644
--- a/plugins/RegisterThrottle/locale/de/LC_MESSAGES/RegisterThrottle.po
+++ b/plugins/RegisterThrottle/locale/de/LC_MESSAGES/RegisterThrottle.po
@@ -1,6 +1,7 @@
 # Translation of StatusNet - RegisterThrottle to German (Deutsch)
 # Exported from translatewiki.net
 #
+# Author: LWChris
 # Author: The Evil IP address
 # --
 # This file is distributed under the same license as the StatusNet package.
@@ -9,27 +10,31 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - RegisterThrottle\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:03+0000\n"
-"Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:49+0000\n"
+"Language-Team: German <https://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-09 19:01:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-12-03 13:49:00+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-registerthrottle\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Server exception thrown when no IP address can be found for a registation attempt.
 msgid "Cannot find IP address."
-msgstr "Kann IP-Addresse nicht finden."
+msgstr "Kann IP-Adresse nicht finden."
 
+#. TRANS: Exception thrown when too many user have registered from one IP address within a given time frame.
 msgid "Too many registrations. Take a break and try again later."
 msgstr ""
 "Zu viele Registrierungen. Mach eine Pause and versuche es später noch einmal."
 
+#. TRANS: Exception thrown when attempting to register from an IP address from which silenced users have registered.
 msgid "A banned user has registered from this address."
 msgstr "Ein gesperrter Benutzer hat sich von dieser Adresse registriert."
 
+#. TRANS: Plugin description.
 msgid "Throttles excessive registration from a single IP address."
 msgstr "Drosselt exzessive Registrierungen einer einzelnen IP-Adresse."
diff --git a/plugins/RegisterThrottle/locale/es/LC_MESSAGES/RegisterThrottle.po b/plugins/RegisterThrottle/locale/es/LC_MESSAGES/RegisterThrottle.po
new file mode 100644
index 0000000000..25f765b104
--- /dev/null
+++ b/plugins/RegisterThrottle/locale/es/LC_MESSAGES/RegisterThrottle.po
@@ -0,0 +1,35 @@
+# Translation of StatusNet - RegisterThrottle to Spanish (español)
+# Exported from translatewiki.net
+#
+# Author: Armando-Martin
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - RegisterThrottle\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:49+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-12-03 13:49:00+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Server exception thrown when no IP address can be found for a registation attempt.
+msgid "Cannot find IP address."
+msgstr "No se pudo encontrar la dirección IP"
+
+#. TRANS: Exception thrown when too many user have registered from one IP address within a given time frame.
+msgid "Too many registrations. Take a break and try again later."
+msgstr "Demasiados registros. Haga una pausa e inténtelo más tarde."
+
+#. TRANS: Exception thrown when attempting to register from an IP address from which silenced users have registered.
+msgid "A banned user has registered from this address."
+msgstr "Un usuario bloqueado se ha registrado desde esta dirección."
+
+#. TRANS: Plugin description.
+msgid "Throttles excessive registration from a single IP address."
+msgstr "Evita la excesiva creación de cuentas desde una misma dirección IP."
diff --git a/plugins/RegisterThrottle/locale/fr/LC_MESSAGES/RegisterThrottle.po b/plugins/RegisterThrottle/locale/fr/LC_MESSAGES/RegisterThrottle.po
index 849fed7a9e..0bc99982c0 100644
--- a/plugins/RegisterThrottle/locale/fr/LC_MESSAGES/RegisterThrottle.po
+++ b/plugins/RegisterThrottle/locale/fr/LC_MESSAGES/RegisterThrottle.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - RegisterThrottle to French (Français)
+# Translation of StatusNet - RegisterThrottle to French (français)
 # Exported from translatewiki.net
 #
 # Author: Peter17
@@ -10,28 +10,32 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - RegisterThrottle\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:03+0000\n"
-"Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:49+0000\n"
+"Language-Team: French <https://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-09 19:01:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-12-03 13:49:00+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-registerthrottle\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#. TRANS: Server exception thrown when no IP address can be found for a registation attempt.
 msgid "Cannot find IP address."
 msgstr "Impossible de trouver l’adresse IP."
 
+#. TRANS: Exception thrown when too many user have registered from one IP address within a given time frame.
 msgid "Too many registrations. Take a break and try again later."
 msgstr ""
 "Inscriptions trop nombreuses. Faites une pause et essayez à nouveau plus "
 "tard."
 
+#. TRANS: Exception thrown when attempting to register from an IP address from which silenced users have registered.
 msgid "A banned user has registered from this address."
 msgstr "Un utilisateur banni s’est inscrit depuis cette adresse."
 
+#. TRANS: Plugin description.
 msgid "Throttles excessive registration from a single IP address."
 msgstr "Évite les inscriptions excessives depuis une même adresse IP."
diff --git a/plugins/RegisterThrottle/locale/gl/LC_MESSAGES/RegisterThrottle.po b/plugins/RegisterThrottle/locale/gl/LC_MESSAGES/RegisterThrottle.po
new file mode 100644
index 0000000000..d620f0e529
--- /dev/null
+++ b/plugins/RegisterThrottle/locale/gl/LC_MESSAGES/RegisterThrottle.po
@@ -0,0 +1,38 @@
+# Translation of StatusNet - RegisterThrottle to Galician (galego)
+# Exported from translatewiki.net
+#
+# Author: Toliño
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - RegisterThrottle\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:49+0000\n"
+"Language-Team: Galician <https://translatewiki.net/wiki/Portal:gl>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-12-03 13:49:00+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: gl\n"
+"X-Message-Group: #out-statusnet-plugin-registerthrottle\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Server exception thrown when no IP address can be found for a registation attempt.
+msgid "Cannot find IP address."
+msgstr "Non se pode atopar o enderezo IP."
+
+#. TRANS: Exception thrown when too many user have registered from one IP address within a given time frame.
+msgid "Too many registrations. Take a break and try again later."
+msgstr "Demasiados rexistros. Faga unha pausa e inténteo máis tarde."
+
+#. TRANS: Exception thrown when attempting to register from an IP address from which silenced users have registered.
+msgid "A banned user has registered from this address."
+msgstr "Un usuario bloqueado rexistrouse desde este enderezo."
+
+#. TRANS: Plugin description.
+msgid "Throttles excessive registration from a single IP address."
+msgstr "Evita a exceciva creación de contas desde un mesmo enderezo IP."
diff --git a/plugins/RegisterThrottle/locale/ia/LC_MESSAGES/RegisterThrottle.po b/plugins/RegisterThrottle/locale/ia/LC_MESSAGES/RegisterThrottle.po
index ce788d9be8..cfbba99218 100644
--- a/plugins/RegisterThrottle/locale/ia/LC_MESSAGES/RegisterThrottle.po
+++ b/plugins/RegisterThrottle/locale/ia/LC_MESSAGES/RegisterThrottle.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - RegisterThrottle to Interlingua (Interlingua)
+# Translation of StatusNet - RegisterThrottle to Interlingua (interlingua)
 # Exported from translatewiki.net
 #
 # Author: McDutchie
@@ -9,26 +9,30 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - RegisterThrottle\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:03+0000\n"
-"Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:49+0000\n"
+"Language-Team: Interlingua <https://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-09 19:01:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-12-03 13:49:00+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-registerthrottle\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Server exception thrown when no IP address can be found for a registation attempt.
 msgid "Cannot find IP address."
 msgstr "Non pote trovar adresse IP."
 
+#. TRANS: Exception thrown when too many user have registered from one IP address within a given time frame.
 msgid "Too many registrations. Take a break and try again later."
 msgstr "Troppo de registrationes. Face un pausa e reproba plus tarde."
 
+#. TRANS: Exception thrown when attempting to register from an IP address from which silenced users have registered.
 msgid "A banned user has registered from this address."
 msgstr "Un usator bannite se ha registrate ab iste adresse."
 
+#. TRANS: Plugin description.
 msgid "Throttles excessive registration from a single IP address."
 msgstr "Inhibi le creation de contos excessive ab un sol adresse IP."
diff --git a/plugins/RegisterThrottle/locale/mk/LC_MESSAGES/RegisterThrottle.po b/plugins/RegisterThrottle/locale/mk/LC_MESSAGES/RegisterThrottle.po
index 566f79a1f2..350923f41d 100644
--- a/plugins/RegisterThrottle/locale/mk/LC_MESSAGES/RegisterThrottle.po
+++ b/plugins/RegisterThrottle/locale/mk/LC_MESSAGES/RegisterThrottle.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - RegisterThrottle to Macedonian (Македон�ки)
+# Translation of StatusNet - RegisterThrottle to Macedonian (македон�ки)
 # Exported from translatewiki.net
 #
 # Author: Bjankuloski06
@@ -9,26 +9,30 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - RegisterThrottle\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:03+0000\n"
-"Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:49+0000\n"
+"Language-Team: Macedonian <https://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-09 19:01:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-12-03 13:49:00+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-registerthrottle\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
 
+#. TRANS: Server exception thrown when no IP address can be found for a registation attempt.
 msgid "Cannot find IP address."
 msgstr "�е можам да ја пронајдам IP-адре�ата."
 
+#. TRANS: Exception thrown when too many user have registered from one IP address within a given time frame.
 msgid "Too many registrations. Take a break and try again later."
 msgstr "Премногу реги�трации. �аправете пауза и обидете �е подоцна."
 
+#. TRANS: Exception thrown when attempting to register from an IP address from which silenced users have registered.
 msgid "A banned user has registered from this address."
 msgstr "Од оваа адре�а �е реги�трирал забранет кори�ник."
 
+#. TRANS: Plugin description.
 msgid "Throttles excessive registration from a single IP address."
 msgstr "И�ти�нува прекумерни реги�трации од една IP-адре�а."
diff --git a/plugins/RegisterThrottle/locale/nl/LC_MESSAGES/RegisterThrottle.po b/plugins/RegisterThrottle/locale/nl/LC_MESSAGES/RegisterThrottle.po
index e930f08d08..c5d00c0090 100644
--- a/plugins/RegisterThrottle/locale/nl/LC_MESSAGES/RegisterThrottle.po
+++ b/plugins/RegisterThrottle/locale/nl/LC_MESSAGES/RegisterThrottle.po
@@ -10,26 +10,30 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - RegisterThrottle\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:03+0000\n"
-"Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:50+0000\n"
+"Language-Team: Dutch <https://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-09 19:01:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-12-03 13:49:00+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-registerthrottle\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Server exception thrown when no IP address can be found for a registation attempt.
 msgid "Cannot find IP address."
 msgstr "Het IP-adres kon niet gevonden worden."
 
+#. TRANS: Exception thrown when too many user have registered from one IP address within a given time frame.
 msgid "Too many registrations. Take a break and try again later."
 msgstr "Te veel registraties. Wacht even en probeer het later opnieuw."
 
+#. TRANS: Exception thrown when attempting to register from an IP address from which silenced users have registered.
 msgid "A banned user has registered from this address."
 msgstr "Er is een geblokkeerde gebruiker die vanaf dit adres is geregistreerd."
 
+#. TRANS: Plugin description.
 msgid "Throttles excessive registration from a single IP address."
 msgstr "Beperkt excessieve aantallen registraties vanaf één IP-adres."
diff --git a/plugins/RegisterThrottle/locale/tl/LC_MESSAGES/RegisterThrottle.po b/plugins/RegisterThrottle/locale/tl/LC_MESSAGES/RegisterThrottle.po
index 7d21c171a2..0a2999c860 100644
--- a/plugins/RegisterThrottle/locale/tl/LC_MESSAGES/RegisterThrottle.po
+++ b/plugins/RegisterThrottle/locale/tl/LC_MESSAGES/RegisterThrottle.po
@@ -9,27 +9,31 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - RegisterThrottle\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:03+0000\n"
-"Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:50+0000\n"
+"Language-Team: Tagalog <https://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-09 19:01:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-12-03 13:49:00+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-registerthrottle\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Server exception thrown when no IP address can be found for a registation attempt.
 msgid "Cannot find IP address."
 msgstr "Hindi matagpuan ang tirahan ng IP."
 
+#. TRANS: Exception thrown when too many user have registered from one IP address within a given time frame.
 msgid "Too many registrations. Take a break and try again later."
 msgstr "Napakaraming mga pagpapatala. Magpahinga muna at subukan uli mamaya."
 
+#. TRANS: Exception thrown when attempting to register from an IP address from which silenced users have registered.
 msgid "A banned user has registered from this address."
 msgstr "Isang pinagbawalang tagagamit ang nagpatala mula sa ganitong tirahan."
 
+#. TRANS: Plugin description.
 msgid "Throttles excessive registration from a single IP address."
 msgstr ""
 "Naglilipat-lipat ng labis na pagpapatala mula sa isang nag-iisang tirahan ng "
diff --git a/plugins/RegisterThrottle/locale/uk/LC_MESSAGES/RegisterThrottle.po b/plugins/RegisterThrottle/locale/uk/LC_MESSAGES/RegisterThrottle.po
index 6c20047e69..21061a7387 100644
--- a/plugins/RegisterThrottle/locale/uk/LC_MESSAGES/RegisterThrottle.po
+++ b/plugins/RegisterThrottle/locale/uk/LC_MESSAGES/RegisterThrottle.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - RegisterThrottle to Ukrainian (Україн�ька)
+# Translation of StatusNet - RegisterThrottle to Ukrainian (україн�ька)
 # Exported from translatewiki.net
 #
 # Author: Boogie
@@ -10,27 +10,31 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - RegisterThrottle\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:04+0000\n"
-"Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:50+0000\n"
+"Language-Team: Ukrainian <https://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-09 19:01:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-12-03 13:49:00+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-registerthrottle\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
+#. TRANS: Server exception thrown when no IP address can be found for a registation attempt.
 msgid "Cannot find IP address."
 msgstr "�е вдаєть�� знайти IP-адре�у."
 
+#. TRANS: Exception thrown when too many user have registered from one IP address within a given time frame.
 msgid "Too many registrations. Take a break and try again later."
 msgstr "Забагато реє�трацій. Випийте поки що кави і повертайте�ь пізніше."
 
+#. TRANS: Exception thrown when attempting to register from an IP address from which silenced users have registered.
 msgid "A banned user has registered from this address."
 msgstr "Заблокований кори�тувач був зареє�трований з цієї адре�и."
 
+#. TRANS: Plugin description.
 msgid "Throttles excessive registration from a single IP address."
 msgstr "Цей додаток обмежує кількі�ть реє�трацій з певної IP-адре�и."
diff --git a/plugins/RequireValidatedEmail/README b/plugins/RequireValidatedEmail/README
index 84b1485b25..326e19c28a 100644
--- a/plugins/RequireValidatedEmail/README
+++ b/plugins/RequireValidatedEmail/README
@@ -25,9 +25,6 @@ For example, to trust WikiHow and Wikipedia users:
      ),
   ));
 
-
-
 Todo:
 * add a more visible indicator that validation is still outstanding
 * test with XMPP, API posting
-
diff --git a/plugins/RequireValidatedEmail/RequireValidatedEmailPlugin.php b/plugins/RequireValidatedEmail/RequireValidatedEmailPlugin.php
index fdb039afec..c14ace1f1e 100644
--- a/plugins/RequireValidatedEmail/RequireValidatedEmailPlugin.php
+++ b/plugins/RequireValidatedEmail/RequireValidatedEmailPlugin.php
@@ -50,14 +50,12 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
  */
-
 class RequireValidatedEmailPlugin extends Plugin
 {
     /**
      * Users created before this time will be grandfathered in
      * without the validation requirement.
      */
-
     public $grandfatherCutoff = null;
 
     /**
@@ -74,13 +72,11 @@ class RequireValidatedEmailPlugin extends Plugin
      *    ),
      * ));
      */
-
     public $trustedOpenIDs = array();
 
     /**
      * Whether or not to disallow login for unvalidated users.
      */
-
     public $disallowLogin = false;
 
     function onAutoload($cls)
@@ -112,13 +108,13 @@ class RequireValidatedEmailPlugin extends Plugin
      *
      * @return bool hook result code
      */
-
     function onStartNoticeSave($notice)
     {
         $user = User::staticGet('id', $notice->profile_id);
         if (!empty($user)) { // it's a remote notice
             if (!$this->validated($user)) {
-                $msg = _m("You must validate your email address before posting.");
+                // TRANS: Client exception thrown when trying to post notices before validating an e-mail address.
+                $msg = _m('You must validate your email address before posting.');
                 throw new ClientException($msg);
             }
         }
@@ -133,12 +129,12 @@ class RequireValidatedEmailPlugin extends Plugin
      *
      * @return bool hook result code
      */
-
     function onStartRegisterUser(&$user, &$profile)
     {
         $email = $user->email;
 
         if (empty($email)) {
+            // TRANS: Client exception thrown when trying to register without providing an e-mail address.
             throw new ClientException(_m('You must provide an email address to register.'));
         }
 
@@ -164,8 +160,7 @@ class RequireValidatedEmailPlugin extends Plugin
         // Give other plugins a chance to override, if they can validate
         // that somebody's ok despite a non-validated email.
 
-        // FIXME: This isn't how to do it! Use Start*/End* instead
-
+        // @todo FIXME: This isn't how to do it! Use Start*/End* instead
         Event::handle('RequireValidatedEmailPlugin_Override',
                       array($user, &$knownGood));
 
@@ -201,7 +196,6 @@ class RequireValidatedEmailPlugin extends Plugin
      *
      * @return bool true if user has a trusted OpenID.
      */
-
     function hasTrustedOpenID($user)
     {
         if ($this->trustedOpenIDs && class_exists('User_openid')) {
@@ -228,7 +222,6 @@ class RequireValidatedEmailPlugin extends Plugin
      *
      * @return boolean hook value
      */
-
     function onPluginVersion(&$versions)
     {
         $versions[] =
@@ -240,7 +233,9 @@ class RequireValidatedEmailPlugin extends Plugin
                 'homepage' =>
                 'http://status.net/wiki/Plugin:RequireValidatedEmail',
                 'rawdescription' =>
+                // TRANS: Plugin description.
                 _m('Disables posting without a validated email address.'));
+
         return true;
     }
 
@@ -251,7 +246,6 @@ class RequireValidatedEmailPlugin extends Plugin
      *
      * @return boolean hook value
      */
-
     function onStartShowNoticeForm($action)
     {
         $user = common_current_user();
diff --git a/plugins/RequireValidatedEmail/confirmfirstemail.php b/plugins/RequireValidatedEmail/confirmfirstemail.php
index 974a95a7cf..0b6843fa47 100644
--- a/plugins/RequireValidatedEmail/confirmfirstemail.php
+++ b/plugins/RequireValidatedEmail/confirmfirstemail.php
@@ -4,7 +4,7 @@
  * Copyright (C) 2011, StatusNet, Inc.
  *
  * Action for confirming first email registration
- * 
+ *
  * PHP version 5
  *
  * This program is free software: you can redistribute it and/or modify
@@ -44,7 +44,6 @@ if (!defined('STATUSNET')) {
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
  * @link      http://status.net/
  */
-
 class ConfirmfirstemailAction extends Action
 {
     public $confirm;
@@ -59,13 +58,13 @@ class ConfirmfirstemailAction extends Action
      *
      * @return boolean true
      */
-
     function prepare($argarray)
     {
         parent::prepare($argarray);
         $user = common_current_user();
 
         if (!empty($user)) {
+            // TRANS: Client exception thrown when trying to register while already logged in.
             throw new ClientException(_m('You are already logged in.'));
         }
 
@@ -74,6 +73,7 @@ class ConfirmfirstemailAction extends Action
         $this->confirm = Confirm_address::staticGet('code', $this->code);
 
         if (empty($this->confirm)) {
+            // TRANS: Client exception thrown when trying to register with a non-existing confirmation code.
             throw new ClientException(_m('Confirmation code not found.'));
             return;
         }
@@ -81,12 +81,15 @@ class ConfirmfirstemailAction extends Action
         $this->user = User::staticGet('id', $this->confirm->user_id);
 
         if (empty($this->user)) {
+            // TRANS: Client exception thrown when trying to register with a confirmation code that is not connected with a user.
             throw new ServerException(_m('No user for that confirmation code.'));
         }
 
         $type = $this->confirm->address_type;
 
         if ($type != 'email') {
+            // TRANS: Client exception thrown when trying to register with a invalid e-mail address.
+            // TRANS: %s is the invalid e-mail address.
             throw new ServerException(sprintf(_m('Unrecognized address type %s.'), $type));
         }
 
@@ -103,10 +106,12 @@ class ConfirmfirstemailAction extends Action
             $confirm  = $this->trimmed('confirm');
 
             if (strlen($password) < 6) {
+                // TRANS: Client exception thrown when trying to register with too short a password.
                 throw new ClientException(_m('Password too short.'));
                 return;
             } else if (0 != strcmp($password, $confirm)) {
-                throw new ClientException(_m("Passwords do not match."));
+                // TRANS: Client exception thrown when trying to register without providing the same password twice.
+                throw new ClientException(_m('Passwords do not match.'));
                 return;
             }
 
@@ -123,10 +128,9 @@ class ConfirmfirstemailAction extends Action
      *
      * @return void
      */
-
     function handle($argarray=null)
     {
-        $homepage = common_local_url('all', 
+        $homepage = common_local_url('all',
                                      array('nickname' => $this->user->nickname));
 
         if ($this->isPost()) {
@@ -162,6 +166,7 @@ class ConfirmfirstemailAction extends Action
     function showContent()
     {
         $this->element('p', 'instructions',
+                       // TRANS: Form instructions. %s is the nickname of the to be registered user.
                        sprintf(_m('You have confirmed the email address for your new user account %s. '.
                                  'Use the form below to set your new password.'),
                                $this->user->nickname));
@@ -172,6 +177,7 @@ class ConfirmfirstemailAction extends Action
 
     function title()
     {
+        // TRANS: Page title.
         return _m('Set a password');
     }
 }
@@ -188,7 +194,8 @@ class ConfirmFirstEmailForm extends Form
 
     function formLegend()
     {
-        return _m('Confirm email');
+        // TRANS: Form legend.
+        return _m('Confirm email address');
     }
 
     function action()
@@ -206,11 +213,15 @@ class ConfirmFirstEmailForm extends Form
     {
         $this->out->elementStart('ul', 'form_data');
         $this->out->elementStart('li');
+        // TRANS: Field label.
         $this->out->password('password', _m('New password'),
+                             // TRANS: Field title for password field.
                              _m('6 or more characters.'));
         $this->out->elementEnd('li');
         $this->out->elementStart('li');
-        $this->out->password('confirm', _m('Confirm'),
+        // TRANS: Field label for repeat password field.
+        $this->out->password('confirm', _m('LABEL','Confirm'),
+                             // TRANS: Field title for repeat password field.
                              _m('Same as password above.'));
         $this->out->elementEnd('li');
         $this->out->elementEnd('ul');
@@ -218,6 +229,7 @@ class ConfirmFirstEmailForm extends Form
 
     function formActions()
     {
-        $this->out->submit('save', _m('Save'));
+        // TRANS: Button text for completing registration by e-mail.
+        $this->out->submit('save', _m('BUTTON','Save'));
     }
 }
diff --git a/plugins/RequireValidatedEmail/locale/RequireValidatedEmail.pot b/plugins/RequireValidatedEmail/locale/RequireValidatedEmail.pot
index b443918e1a..24cab03bc8 100644
--- a/plugins/RequireValidatedEmail/locale/RequireValidatedEmail.pot
+++ b/plugins/RequireValidatedEmail/locale/RequireValidatedEmail.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,79 +16,99 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: RequireValidatedEmailPlugin.php:121
+#. TRANS: Client exception thrown when trying to post notices before validating an e-mail address.
+#: RequireValidatedEmailPlugin.php:117
 msgid "You must validate your email address before posting."
 msgstr ""
 
-#: RequireValidatedEmailPlugin.php:142
+#. TRANS: Client exception thrown when trying to register without providing an e-mail address.
+#: RequireValidatedEmailPlugin.php:138
 msgid "You must provide an email address to register."
 msgstr ""
 
-#: RequireValidatedEmailPlugin.php:243
+#. TRANS: Plugin description.
+#: RequireValidatedEmailPlugin.php:237
 msgid "Disables posting without a validated email address."
 msgstr ""
 
-#: confirmfirstemail.php:69
+#. TRANS: Client exception thrown when trying to register while already logged in.
+#: confirmfirstemail.php:68
 msgid "You are already logged in."
 msgstr ""
 
+#. TRANS: Client exception thrown when trying to register with a non-existing confirmation code.
 #: confirmfirstemail.php:77
 msgid "Confirmation code not found."
 msgstr ""
 
-#: confirmfirstemail.php:84
+#. TRANS: Client exception thrown when trying to register with a confirmation code that is not connected with a user.
+#: confirmfirstemail.php:85
 msgid "No user for that confirmation code."
 msgstr ""
 
-#: confirmfirstemail.php:90
+#. TRANS: Client exception thrown when trying to register with a invalid e-mail address.
+#. TRANS: %s is the invalid e-mail address.
+#: confirmfirstemail.php:93
 #, php-format
 msgid "Unrecognized address type %s."
 msgstr ""
 
 #. TRANS: Client error for an already confirmed email/jabber/sms address.
-#: confirmfirstemail.php:95
+#: confirmfirstemail.php:98
 msgid "That address has already been confirmed."
 msgstr ""
 
-#: confirmfirstemail.php:106
+#. TRANS: Client exception thrown when trying to register with too short a password.
+#: confirmfirstemail.php:110
 msgid "Password too short."
 msgstr ""
 
-#: confirmfirstemail.php:109
+#. TRANS: Client exception thrown when trying to register without providing the same password twice.
+#: confirmfirstemail.php:114
 msgid "Passwords do not match."
 msgstr ""
 
-#: confirmfirstemail.php:165
+#. TRANS: Form instructions. %s is the nickname of the to be registered user.
+#: confirmfirstemail.php:170
 #, php-format
 msgid ""
 "You have confirmed the email address for your new user account %s. Use the "
 "form below to set your new password."
 msgstr ""
 
-#: confirmfirstemail.php:175
+#. TRANS: Page title.
+#: confirmfirstemail.php:181
 msgid "Set a password"
 msgstr ""
 
-#: confirmfirstemail.php:191
-msgid "Confirm email"
+#. TRANS: Form legend.
+#: confirmfirstemail.php:198
+msgid "Confirm email address"
 msgstr ""
 
-#: confirmfirstemail.php:209
+#. TRANS: Field label.
+#: confirmfirstemail.php:217
 msgid "New password"
 msgstr ""
 
-#: confirmfirstemail.php:210
+#. TRANS: Field title for password field.
+#: confirmfirstemail.php:219
 msgid "6 or more characters."
 msgstr ""
 
-#: confirmfirstemail.php:213
+#. TRANS: Field label for repeat password field.
+#: confirmfirstemail.php:223
+msgctxt "LABEL"
 msgid "Confirm"
 msgstr ""
 
-#: confirmfirstemail.php:214
+#. TRANS: Field title for repeat password field.
+#: confirmfirstemail.php:225
 msgid "Same as password above."
 msgstr ""
 
-#: confirmfirstemail.php:221
+#. TRANS: Button text for completing registration by e-mail.
+#: confirmfirstemail.php:233
+msgctxt "BUTTON"
 msgid "Save"
 msgstr ""
diff --git a/plugins/RequireValidatedEmail/locale/ar/LC_MESSAGES/RequireValidatedEmail.po b/plugins/RequireValidatedEmail/locale/ar/LC_MESSAGES/RequireValidatedEmail.po
new file mode 100644
index 0000000000..fd111d3c8a
--- /dev/null
+++ b/plugins/RequireValidatedEmail/locale/ar/LC_MESSAGES/RequireValidatedEmail.po
@@ -0,0 +1,103 @@
+# Translation of StatusNet - RequireValidatedEmail to Arabic (العربية)
+# Exported from translatewiki.net
+#
+# Author: OsamaK
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - RequireValidatedEmail\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:50+0000\n"
+"Language-Team: Arabic <https://translatewiki.net/wiki/Portal:ar>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-18 16:19:28+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: ar\n"
+"X-Message-Group: #out-statusnet-plugin-requirevalidatedemail\n"
+"Plural-Forms: nplurals=6; plural=(n == 0) ? 0 : ( (n == 1) ? 1 : ( (n == "
+"2) ? 2 : ( (n%100 >= 3 && n%100 <= 10) ? 3 : ( (n%100 >= 11 && n%100 <= "
+"99) ? 4 : 5 ) ) ) );\n"
+
+#. TRANS: Client exception thrown when trying to post notices before validating an e-mail address.
+msgid "You must validate your email address before posting."
+msgstr ""
+
+#. TRANS: Client exception thrown when trying to register without providing an e-mail address.
+msgid "You must provide an email address to register."
+msgstr ""
+
+#. TRANS: Plugin description.
+msgid "Disables posting without a validated email address."
+msgstr ""
+
+#. TRANS: Client exception thrown when trying to register while already logged in.
+msgid "You are already logged in."
+msgstr ""
+
+#. TRANS: Client exception thrown when trying to register with a non-existing confirmation code.
+msgid "Confirmation code not found."
+msgstr ""
+
+#. TRANS: Client exception thrown when trying to register with a confirmation code that is not connected with a user.
+msgid "No user for that confirmation code."
+msgstr ""
+
+#. TRANS: Client exception thrown when trying to register with a invalid e-mail address.
+#. TRANS: %s is the invalid e-mail address.
+#, php-format
+msgid "Unrecognized address type %s."
+msgstr ""
+
+#. TRANS: Client error for an already confirmed email/jabber/sms address.
+msgid "That address has already been confirmed."
+msgstr ""
+
+#. TRANS: Client exception thrown when trying to register with too short a password.
+msgid "Password too short."
+msgstr "كلمة السر قصيرة جدا."
+
+#. TRANS: Client exception thrown when trying to register without providing the same password twice.
+msgid "Passwords do not match."
+msgstr "كلمتا السر غير متطابقتين."
+
+#. TRANS: Form instructions. %s is the nickname of the to be registered user.
+#, php-format
+msgid ""
+"You have confirmed the email address for your new user account %s. Use the "
+"form below to set your new password."
+msgstr ""
+
+#. TRANS: Page title.
+msgid "Set a password"
+msgstr "تعيين كلمة السر"
+
+#. TRANS: Form legend.
+msgid "Confirm email address"
+msgstr "تأكيد عنوان البريد الإلكتروني"
+
+#. TRANS: Field label.
+msgid "New password"
+msgstr "كلمة السر الجديدة"
+
+#. TRANS: Field title for password field.
+msgid "6 or more characters."
+msgstr "6 أحر� أو أكثر."
+
+#. TRANS: Field label for repeat password field.
+msgctxt "LABEL"
+msgid "Confirm"
+msgstr "أكّد"
+
+#. TRANS: Field title for repeat password field.
+msgid "Same as password above."
+msgstr "ن�س كلمة السر أعلاه."
+
+#. TRANS: Button text for completing registration by e-mail.
+msgctxt "BUTTON"
+msgid "Save"
+msgstr "اح�ظ"
diff --git a/plugins/RequireValidatedEmail/locale/br/LC_MESSAGES/RequireValidatedEmail.po b/plugins/RequireValidatedEmail/locale/br/LC_MESSAGES/RequireValidatedEmail.po
new file mode 100644
index 0000000000..f7bf93b449
--- /dev/null
+++ b/plugins/RequireValidatedEmail/locale/br/LC_MESSAGES/RequireValidatedEmail.po
@@ -0,0 +1,101 @@
+# Translation of StatusNet - RequireValidatedEmail to Breton (brezhoneg)
+# Exported from translatewiki.net
+#
+# Author: Y-M D
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - RequireValidatedEmail\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:50+0000\n"
+"Language-Team: Breton <https://translatewiki.net/wiki/Portal:br>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-18 16:19:28+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: br\n"
+"X-Message-Group: #out-statusnet-plugin-requirevalidatedemail\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#. TRANS: Client exception thrown when trying to post notices before validating an e-mail address.
+msgid "You must validate your email address before posting."
+msgstr ""
+
+#. TRANS: Client exception thrown when trying to register without providing an e-mail address.
+msgid "You must provide an email address to register."
+msgstr ""
+
+#. TRANS: Plugin description.
+msgid "Disables posting without a validated email address."
+msgstr ""
+
+#. TRANS: Client exception thrown when trying to register while already logged in.
+msgid "You are already logged in."
+msgstr ""
+
+#. TRANS: Client exception thrown when trying to register with a non-existing confirmation code.
+msgid "Confirmation code not found."
+msgstr ""
+
+#. TRANS: Client exception thrown when trying to register with a confirmation code that is not connected with a user.
+msgid "No user for that confirmation code."
+msgstr ""
+
+#. TRANS: Client exception thrown when trying to register with a invalid e-mail address.
+#. TRANS: %s is the invalid e-mail address.
+#, php-format
+msgid "Unrecognized address type %s."
+msgstr ""
+
+#. TRANS: Client error for an already confirmed email/jabber/sms address.
+msgid "That address has already been confirmed."
+msgstr ""
+
+#. TRANS: Client exception thrown when trying to register with too short a password.
+msgid "Password too short."
+msgstr "Ger-tremen re verr."
+
+#. TRANS: Client exception thrown when trying to register without providing the same password twice.
+msgid "Passwords do not match."
+msgstr ""
+
+#. TRANS: Form instructions. %s is the nickname of the to be registered user.
+#, php-format
+msgid ""
+"You have confirmed the email address for your new user account %s. Use the "
+"form below to set your new password."
+msgstr ""
+
+#. TRANS: Page title.
+msgid "Set a password"
+msgstr "Termeniñ ur ger-tremen"
+
+#. TRANS: Form legend.
+msgid "Confirm email address"
+msgstr "Kadarnaat ar chomlec'h postel"
+
+#. TRANS: Field label.
+msgid "New password"
+msgstr "Ger-tremen nevez"
+
+#. TRANS: Field title for password field.
+msgid "6 or more characters."
+msgstr "6 arouezenn pe muioc'h."
+
+#. TRANS: Field label for repeat password field.
+msgctxt "LABEL"
+msgid "Confirm"
+msgstr "Kadarnaat"
+
+#. TRANS: Field title for repeat password field.
+msgid "Same as password above."
+msgstr "Memestra eget ar ger-tremen a-us."
+
+#. TRANS: Button text for completing registration by e-mail.
+msgctxt "BUTTON"
+msgid "Save"
+msgstr "Enrollañ"
diff --git a/plugins/RequireValidatedEmail/locale/ca/LC_MESSAGES/RequireValidatedEmail.po b/plugins/RequireValidatedEmail/locale/ca/LC_MESSAGES/RequireValidatedEmail.po
index a5e90e6038..cab8c19b28 100644
--- a/plugins/RequireValidatedEmail/locale/ca/LC_MESSAGES/RequireValidatedEmail.po
+++ b/plugins/RequireValidatedEmail/locale/ca/LC_MESSAGES/RequireValidatedEmail.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - RequireValidatedEmail to Catalan (Català)
+# Translation of StatusNet - RequireValidatedEmail to Catalan (català)
 # Exported from translatewiki.net
 #
 # Author: Toniher
@@ -9,73 +9,95 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - RequireValidatedEmail\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:06+0000\n"
-"Language-Team: Catalan <http://translatewiki.net/wiki/Portal:ca>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:50+0000\n"
+"Language-Team: Catalan <https://translatewiki.net/wiki/Portal:ca>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:17+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-18 16:19:28+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ca\n"
 "X-Message-Group: #out-statusnet-plugin-requirevalidatedemail\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Client exception thrown when trying to post notices before validating an e-mail address.
 msgid "You must validate your email address before posting."
 msgstr ""
 
+#. TRANS: Client exception thrown when trying to register without providing an e-mail address.
 msgid "You must provide an email address to register."
 msgstr ""
 
+#. TRANS: Plugin description.
 msgid "Disables posting without a validated email address."
 msgstr ""
 
+#. TRANS: Client exception thrown when trying to register while already logged in.
 msgid "You are already logged in."
-msgstr ""
+msgstr "Ja heu iniciat una sessió."
 
+#. TRANS: Client exception thrown when trying to register with a non-existing confirmation code.
 msgid "Confirmation code not found."
-msgstr ""
+msgstr "No s'ha trobat el codi de confirmació."
 
+#. TRANS: Client exception thrown when trying to register with a confirmation code that is not connected with a user.
 msgid "No user for that confirmation code."
-msgstr ""
+msgstr "No hi ha cap usuari per a aquest codi de confirmació."
 
+#. TRANS: Client exception thrown when trying to register with a invalid e-mail address.
+#. TRANS: %s is the invalid e-mail address.
 #, php-format
 msgid "Unrecognized address type %s."
-msgstr ""
+msgstr "Tipus d'adreça no reconeguda %s."
 
 #. TRANS: Client error for an already confirmed email/jabber/sms address.
 msgid "That address has already been confirmed."
-msgstr ""
+msgstr "Ja s'ha confirmat l'adreça."
 
+#. TRANS: Client exception thrown when trying to register with too short a password.
 msgid "Password too short."
-msgstr ""
+msgstr "La contrasenya és massa curta."
 
+#. TRANS: Client exception thrown when trying to register without providing the same password twice.
 msgid "Passwords do not match."
-msgstr ""
+msgstr "Les contrasenyes no coincideixen."
 
+#. TRANS: Form instructions. %s is the nickname of the to be registered user.
 #, php-format
 msgid ""
 "You have confirmed the email address for your new user account %s. Use the "
 "form below to set your new password."
 msgstr ""
+"Heu confirmat l'adreça electrònica del vostre nou compte d'usuari %s. "
+"Utilitzeu el formulari a sota per definir una contrasenya nova."
 
+#. TRANS: Page title.
 msgid "Set a password"
 msgstr "Definiu una contrasenya"
 
-msgid "Confirm email"
+#. TRANS: Form legend.
+msgid "Confirm email address"
 msgstr "Confirmeu l'adreça electrònica"
 
+#. TRANS: Field label.
 msgid "New password"
 msgstr "Contrasenya nova"
 
+#. TRANS: Field title for password field.
 msgid "6 or more characters."
 msgstr "6 o més caràcters."
 
+#. TRANS: Field label for repeat password field.
+msgctxt "LABEL"
 msgid "Confirm"
 msgstr "Confirma"
 
+#. TRANS: Field title for repeat password field.
 msgid "Same as password above."
 msgstr "La mateixa que la contrasenya de dalt."
 
+#. TRANS: Button text for completing registration by e-mail.
+msgctxt "BUTTON"
 msgid "Save"
 msgstr "Desa"
diff --git a/plugins/RequireValidatedEmail/locale/de/LC_MESSAGES/RequireValidatedEmail.po b/plugins/RequireValidatedEmail/locale/de/LC_MESSAGES/RequireValidatedEmail.po
index 243da7cc8d..2f70656022 100644
--- a/plugins/RequireValidatedEmail/locale/de/LC_MESSAGES/RequireValidatedEmail.po
+++ b/plugins/RequireValidatedEmail/locale/de/LC_MESSAGES/RequireValidatedEmail.po
@@ -1,6 +1,7 @@
 # Translation of StatusNet - RequireValidatedEmail to German (Deutsch)
 # Exported from translatewiki.net
 #
+# Author: ChrisiPK
 # Author: Giftpflanze
 # Author: The Evil IP address
 # --
@@ -10,36 +11,44 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - RequireValidatedEmail\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:06+0000\n"
-"Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:50+0000\n"
+"Language-Team: German <https://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:17+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-18 16:19:28+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-requirevalidatedemail\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Client exception thrown when trying to post notices before validating an e-mail address.
 msgid "You must validate your email address before posting."
 msgstr "Du musst deine E-Mail-Adresse validieren, bevor du beitragen kannst."
 
+#. TRANS: Client exception thrown when trying to register without providing an e-mail address.
 msgid "You must provide an email address to register."
 msgstr "Du musst eine E-Mail-Adresse angeben, um dich zu registrieren."
 
+#. TRANS: Plugin description.
 msgid "Disables posting without a validated email address."
 msgstr "Deaktiviert Posten ohne gültige E-Mail-Adresse."
 
+#. TRANS: Client exception thrown when trying to register while already logged in.
 msgid "You are already logged in."
 msgstr "Du bist bereits angemeldet."
 
+#. TRANS: Client exception thrown when trying to register with a non-existing confirmation code.
 msgid "Confirmation code not found."
 msgstr "Bestätigungscode nicht gefunden."
 
+#. TRANS: Client exception thrown when trying to register with a confirmation code that is not connected with a user.
 msgid "No user for that confirmation code."
 msgstr "Kein Benutzer für diesen Bestätigungscode."
 
+#. TRANS: Client exception thrown when trying to register with a invalid e-mail address.
+#. TRANS: %s is the invalid e-mail address.
 #, php-format
 msgid "Unrecognized address type %s."
 msgstr "Unbekannter Adresstyp %s."
@@ -48,12 +57,15 @@ msgstr "Unbekannter Adresstyp %s."
 msgid "That address has already been confirmed."
 msgstr "Diese Adresse wurde bereits bestätigt."
 
+#. TRANS: Client exception thrown when trying to register with too short a password.
 msgid "Password too short."
 msgstr "Passwort ist zu kurz."
 
+#. TRANS: Client exception thrown when trying to register without providing the same password twice.
 msgid "Passwords do not match."
 msgstr "Passwörter stimmen nicht überein."
 
+#. TRANS: Form instructions. %s is the nickname of the to be registered user.
 #, php-format
 msgid ""
 "You have confirmed the email address for your new user account %s. Use the "
@@ -62,23 +74,32 @@ msgstr ""
 "Du hast die E-Mail-Adresse für dein neues Benutzerkonto %s bestätigt. Nutze "
 "das untenstehende Formular, um dein neues Passwort zu setzen."
 
+#. TRANS: Page title.
 msgid "Set a password"
 msgstr "Passwort setzen"
 
-msgid "Confirm email"
-msgstr "E-Mail bestätigen"
+#. TRANS: Form legend.
+msgid "Confirm email address"
+msgstr "E-Mail-Adresse bestätigen"
 
+#. TRANS: Field label.
 msgid "New password"
 msgstr "Neues Passwort"
 
+#. TRANS: Field title for password field.
 msgid "6 or more characters."
 msgstr "Mindestens 6 Zeichen."
 
+#. TRANS: Field label for repeat password field.
+msgctxt "LABEL"
 msgid "Confirm"
 msgstr "Bestätigen"
 
+#. TRANS: Field title for repeat password field.
 msgid "Same as password above."
 msgstr "Dasselbe Passwort wie oben."
 
+#. TRANS: Button text for completing registration by e-mail.
+msgctxt "BUTTON"
 msgid "Save"
 msgstr "Speichern"
diff --git a/plugins/RequireValidatedEmail/locale/es/LC_MESSAGES/RequireValidatedEmail.po b/plugins/RequireValidatedEmail/locale/es/LC_MESSAGES/RequireValidatedEmail.po
new file mode 100644
index 0000000000..e78ef6bc82
--- /dev/null
+++ b/plugins/RequireValidatedEmail/locale/es/LC_MESSAGES/RequireValidatedEmail.po
@@ -0,0 +1,104 @@
+# Translation of StatusNet - RequireValidatedEmail to Spanish (español)
+# Exported from translatewiki.net
+#
+# Author: Armando-Martin
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - RequireValidatedEmail\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:50+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-18 16:19:28+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Client exception thrown when trying to post notices before validating an e-mail address.
+msgid "You must validate your email address before posting."
+msgstr "Debe validar su dirección de correo electrónico antes de publicar."
+
+#. TRANS: Client exception thrown when trying to register without providing an e-mail address.
+msgid "You must provide an email address to register."
+msgstr ""
+"Debe proporcionar una dirección de correo electrónico para registrarse."
+
+#. TRANS: Plugin description.
+msgid "Disables posting without a validated email address."
+msgstr ""
+"Desactiva la publicación de mensajes sin una dirección de correo electrónico "
+"válida."
+
+#. TRANS: Client exception thrown when trying to register while already logged in.
+msgid "You are already logged in."
+msgstr "Ya has iniciado sesión."
+
+#. TRANS: Client exception thrown when trying to register with a non-existing confirmation code.
+msgid "Confirmation code not found."
+msgstr "No se ha encontrado el código de confirmación."
+
+#. TRANS: Client exception thrown when trying to register with a confirmation code that is not connected with a user.
+msgid "No user for that confirmation code."
+msgstr "Ningún usuario tiene ese código de confirmación."
+
+#. TRANS: Client exception thrown when trying to register with a invalid e-mail address.
+#. TRANS: %s is the invalid e-mail address.
+#, php-format
+msgid "Unrecognized address type %s."
+msgstr "No se reconoce el tipo de dirección %s."
+
+#. TRANS: Client error for an already confirmed email/jabber/sms address.
+msgid "That address has already been confirmed."
+msgstr "Esta dirección ya ha sido confirmada."
+
+#. TRANS: Client exception thrown when trying to register with too short a password.
+msgid "Password too short."
+msgstr "La contraseña es demasiado corta"
+
+#. TRANS: Client exception thrown when trying to register without providing the same password twice.
+msgid "Passwords do not match."
+msgstr "Las contraseñas no coinciden."
+
+#. TRANS: Form instructions. %s is the nickname of the to be registered user.
+#, php-format
+msgid ""
+"You have confirmed the email address for your new user account %s. Use the "
+"form below to set your new password."
+msgstr ""
+"Ha confirmado la dirección de correo electrónico para su nueva cuenta de "
+"usuario %s . Utilice el siguiente formulario para establecer su nueva "
+"contraseña."
+
+#. TRANS: Page title.
+msgid "Set a password"
+msgstr "Establecer una contraseña"
+
+#. TRANS: Form legend.
+msgid "Confirm email address"
+msgstr "Confirme la dirección de correo electrónico"
+
+#. TRANS: Field label.
+msgid "New password"
+msgstr "Nueva contraseña"
+
+#. TRANS: Field title for password field.
+msgid "6 or more characters."
+msgstr "6 o más caracteres."
+
+#. TRANS: Field label for repeat password field.
+msgctxt "LABEL"
+msgid "Confirm"
+msgstr "Confirmar"
+
+#. TRANS: Field title for repeat password field.
+msgid "Same as password above."
+msgstr "Igual a la contraseña anterior"
+
+#. TRANS: Button text for completing registration by e-mail.
+msgctxt "BUTTON"
+msgid "Save"
+msgstr "Guardar"
diff --git a/plugins/RequireValidatedEmail/locale/eu/LC_MESSAGES/RequireValidatedEmail.po b/plugins/RequireValidatedEmail/locale/eu/LC_MESSAGES/RequireValidatedEmail.po
new file mode 100644
index 0000000000..ff1b72e64f
--- /dev/null
+++ b/plugins/RequireValidatedEmail/locale/eu/LC_MESSAGES/RequireValidatedEmail.po
@@ -0,0 +1,98 @@
+# Translation of StatusNet - RequireValidatedEmail to Basque (euskara)
+# Exported from translatewiki.net
+#
+# Author: Artsuaga
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - RequireValidatedEmail\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:50+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-18 16:19:28+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Client exception thrown when trying to post notices before validating an e-mail address.
+msgid "You must validate your email address before posting."
+msgstr ""
+
+#. TRANS: Client exception thrown when trying to register without providing an e-mail address.
+msgid "You must provide an email address to register."
+msgstr ""
+
+#. TRANS: Plugin description.
+msgid "Disables posting without a validated email address."
+msgstr ""
+
+#. TRANS: Client exception thrown when trying to register while already logged in.
+msgid "You are already logged in."
+msgstr "Dagoeneko saioa hasi duzu."
+
+#. TRANS: Client exception thrown when trying to register with a non-existing confirmation code.
+msgid "Confirmation code not found."
+msgstr "Ez da baieztapen koderik aurkitu."
+
+#. TRANS: Client exception thrown when trying to register with a confirmation code that is not connected with a user.
+msgid "No user for that confirmation code."
+msgstr "Baieztapen-kode horrentzat ez dago erabiltzailerik."
+
+#. TRANS: Client exception thrown when trying to register with a invalid e-mail address.
+#. TRANS: %s is the invalid e-mail address.
+#, php-format
+msgid "Unrecognized address type %s."
+msgstr "%s helbide-mota ez da ezaguna."
+
+#. TRANS: Client error for an already confirmed email/jabber/sms address.
+msgid "That address has already been confirmed."
+msgstr "Helbide hori dagoeneko baieztatu da."
+
+#. TRANS: Client exception thrown when trying to register with too short a password.
+msgid "Password too short."
+msgstr "Pasahitz laburregia."
+
+#. TRANS: Client exception thrown when trying to register without providing the same password twice.
+msgid "Passwords do not match."
+msgstr "Pasahitzak ez datoz bat."
+
+#. TRANS: Form instructions. %s is the nickname of the to be registered user.
+#, php-format
+msgid ""
+"You have confirmed the email address for your new user account %s. Use the "
+"form below to set your new password."
+msgstr ""
+
+#. TRANS: Page title.
+msgid "Set a password"
+msgstr "Pasahitza bat zehaztu."
+
+#. TRANS: Form legend.
+msgid "Confirm email address"
+msgstr "Helbide elektronikoa baieztatu."
+
+#. TRANS: Field label.
+msgid "New password"
+msgstr "Pasahitz berria"
+
+#. TRANS: Field title for password field.
+msgid "6 or more characters."
+msgstr "6 karaktere edo gehiago."
+
+#. TRANS: Field label for repeat password field.
+msgctxt "LABEL"
+msgid "Confirm"
+msgstr "Baieztatu"
+
+#. TRANS: Field title for repeat password field.
+msgid "Same as password above."
+msgstr "Gohiko pasahitz berbera."
+
+#. TRANS: Button text for completing registration by e-mail.
+msgctxt "BUTTON"
+msgid "Save"
+msgstr "Gorde"
diff --git a/plugins/RequireValidatedEmail/locale/fr/LC_MESSAGES/RequireValidatedEmail.po b/plugins/RequireValidatedEmail/locale/fr/LC_MESSAGES/RequireValidatedEmail.po
index 65a1aa780d..f2516cb081 100644
--- a/plugins/RequireValidatedEmail/locale/fr/LC_MESSAGES/RequireValidatedEmail.po
+++ b/plugins/RequireValidatedEmail/locale/fr/LC_MESSAGES/RequireValidatedEmail.po
@@ -1,7 +1,8 @@
-# Translation of StatusNet - RequireValidatedEmail to French (Français)
+# Translation of StatusNet - RequireValidatedEmail to French (français)
 # Exported from translatewiki.net
 #
 # Author: Brunoperel
+# Author: Crochet.david
 # Author: Od1n
 # Author: Peter17
 # --
@@ -11,37 +12,45 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - RequireValidatedEmail\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:06+0000\n"
-"Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:50+0000\n"
+"Language-Team: French <https://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:17+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-18 16:19:28+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-requirevalidatedemail\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#. TRANS: Client exception thrown when trying to post notices before validating an e-mail address.
 msgid "You must validate your email address before posting."
 msgstr "Vous devez valider votre adresse électronique avant de poster."
 
+#. TRANS: Client exception thrown when trying to register without providing an e-mail address.
 msgid "You must provide an email address to register."
 msgstr "Vous devez fournir une adresse électronique avant de vous enregistrer."
 
+#. TRANS: Plugin description.
 msgid "Disables posting without a validated email address."
 msgstr ""
 "Désactive le postage pour ceux qui n’ont pas d’adresse électronique valide."
 
+#. TRANS: Client exception thrown when trying to register while already logged in.
 msgid "You are already logged in."
 msgstr "Votre session est déjà ouverte."
 
+#. TRANS: Client exception thrown when trying to register with a non-existing confirmation code.
 msgid "Confirmation code not found."
 msgstr "Code de confirmation non trouvé."
 
+#. TRANS: Client exception thrown when trying to register with a confirmation code that is not connected with a user.
 msgid "No user for that confirmation code."
 msgstr "Aucun utilisateur pour ce code de confirmation."
 
+#. TRANS: Client exception thrown when trying to register with a invalid e-mail address.
+#. TRANS: %s is the invalid e-mail address.
 #, php-format
 msgid "Unrecognized address type %s."
 msgstr "Type d’adresse non reconnu : %s"
@@ -50,12 +59,15 @@ msgstr "Type d’adresse non reconnu : %s"
 msgid "That address has already been confirmed."
 msgstr "Cette adresse a déjà été confirmée."
 
+#. TRANS: Client exception thrown when trying to register with too short a password.
 msgid "Password too short."
 msgstr "Mot de passe trop court."
 
+#. TRANS: Client exception thrown when trying to register without providing the same password twice.
 msgid "Passwords do not match."
 msgstr "Les mots de passe ne correspondent pas."
 
+#. TRANS: Form instructions. %s is the nickname of the to be registered user.
 #, php-format
 msgid ""
 "You have confirmed the email address for your new user account %s. Use the "
@@ -65,23 +77,32 @@ msgstr ""
 "s . Utilisez le formulaire ci-dessous pour définir votre nouveau mot de "
 "passe."
 
+#. TRANS: Page title.
 msgid "Set a password"
 msgstr "Définir un nouveau mot de passe"
 
-msgid "Confirm email"
-msgstr "Confirmer le courriel"
+#. TRANS: Form legend.
+msgid "Confirm email address"
+msgstr "Confirmer l’adresse de courriel"
 
+#. TRANS: Field label.
 msgid "New password"
 msgstr "Nouveau mot de passe"
 
+#. TRANS: Field title for password field.
 msgid "6 or more characters."
 msgstr "6 caractères ou plus."
 
+#. TRANS: Field label for repeat password field.
+msgctxt "LABEL"
 msgid "Confirm"
 msgstr "Confirmer"
 
+#. TRANS: Field title for repeat password field.
 msgid "Same as password above."
 msgstr "Identique au mot de passe ci-dessus."
 
+#. TRANS: Button text for completing registration by e-mail.
+msgctxt "BUTTON"
 msgid "Save"
-msgstr "Enregistrer"
+msgstr "Sauvegarder"
diff --git a/plugins/RequireValidatedEmail/locale/gl/LC_MESSAGES/RequireValidatedEmail.po b/plugins/RequireValidatedEmail/locale/gl/LC_MESSAGES/RequireValidatedEmail.po
new file mode 100644
index 0000000000..ea7e71bab6
--- /dev/null
+++ b/plugins/RequireValidatedEmail/locale/gl/LC_MESSAGES/RequireValidatedEmail.po
@@ -0,0 +1,105 @@
+# Translation of StatusNet - RequireValidatedEmail to Galician (galego)
+# Exported from translatewiki.net
+#
+# Author: Toliño
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - RequireValidatedEmail\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:51+0000\n"
+"Language-Team: Galician <https://translatewiki.net/wiki/Portal:gl>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-18 16:19:28+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: gl\n"
+"X-Message-Group: #out-statusnet-plugin-requirevalidatedemail\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Client exception thrown when trying to post notices before validating an e-mail address.
+msgid "You must validate your email address before posting."
+msgstr "Debe validar o enderezo de correo electrónico antes de publicar."
+
+#. TRANS: Client exception thrown when trying to register without providing an e-mail address.
+msgid "You must provide an email address to register."
+msgstr "Debe proporcionar un enderezo de correo electrónico para se rexistrar."
+
+#. TRANS: Plugin description.
+msgid "Disables posting without a validated email address."
+msgstr ""
+"Desactiva a publicación de mensaxes sen un enderezo de correo electrónico "
+"validado."
+
+#. TRANS: Client exception thrown when trying to register while already logged in.
+msgid "You are already logged in."
+msgstr "Xa está identificado."
+
+#. TRANS: Client exception thrown when trying to register with a non-existing confirmation code.
+msgid "Confirmation code not found."
+msgstr "Non se atopou o código de confirmación."
+
+#. TRANS: Client exception thrown when trying to register with a confirmation code that is not connected with a user.
+msgid "No user for that confirmation code."
+msgstr "Non hai usuario ningún para ese código de confirmación."
+
+#. TRANS: Client exception thrown when trying to register with a invalid e-mail address.
+#. TRANS: %s is the invalid e-mail address.
+#, php-format
+msgid "Unrecognized address type %s."
+msgstr "Non se recoñeceu o tipo de enderezo %s."
+
+#. TRANS: Client error for an already confirmed email/jabber/sms address.
+msgid "That address has already been confirmed."
+msgstr "Ese enderezo xa se confirmou."
+
+#. TRANS: Client exception thrown when trying to register with too short a password.
+msgid "Password too short."
+msgstr "O contrasinal é curto de máis."
+
+#. TRANS: Client exception thrown when trying to register without providing the same password twice.
+msgid "Passwords do not match."
+msgstr "Os contrasinais non coinciden."
+
+#. TRANS: Form instructions. %s is the nickname of the to be registered user.
+#, php-format
+msgid ""
+"You have confirmed the email address for your new user account %s. Use the "
+"form below to set your new password."
+msgstr ""
+"Confirmou o enderezo de correo electrónico da nova conta de usuario %s. "
+"Empregue o formulario inferior para definir o seu novo contrasinal."
+
+#. TRANS: Page title.
+msgid "Set a password"
+msgstr "Definir un contrasinal"
+
+#. TRANS: Form legend.
+msgid "Confirm email address"
+msgstr "Confirmar o enderezo de correo electrónico"
+
+#. TRANS: Field label.
+msgid "New password"
+msgstr "Novo contrasinal"
+
+#. TRANS: Field title for password field.
+msgid "6 or more characters."
+msgstr "Seis ou máis caracteres."
+
+#. TRANS: Field label for repeat password field.
+msgctxt "LABEL"
+msgid "Confirm"
+msgstr "Confirmar"
+
+#. TRANS: Field title for repeat password field.
+msgid "Same as password above."
+msgstr "Igual ao contrasinal anterior."
+
+#. TRANS: Button text for completing registration by e-mail.
+msgctxt "BUTTON"
+msgid "Save"
+msgstr "Gardar"
diff --git a/plugins/RequireValidatedEmail/locale/ia/LC_MESSAGES/RequireValidatedEmail.po b/plugins/RequireValidatedEmail/locale/ia/LC_MESSAGES/RequireValidatedEmail.po
index 5216b71c35..9d2d592be5 100644
--- a/plugins/RequireValidatedEmail/locale/ia/LC_MESSAGES/RequireValidatedEmail.po
+++ b/plugins/RequireValidatedEmail/locale/ia/LC_MESSAGES/RequireValidatedEmail.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - RequireValidatedEmail to Interlingua (Interlingua)
+# Translation of StatusNet - RequireValidatedEmail to Interlingua (interlingua)
 # Exported from translatewiki.net
 #
 # Author: McDutchie
@@ -9,36 +9,44 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - RequireValidatedEmail\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:06+0000\n"
-"Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:51+0000\n"
+"Language-Team: Interlingua <https://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:17+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-18 16:19:28+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-requirevalidatedemail\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Client exception thrown when trying to post notices before validating an e-mail address.
 msgid "You must validate your email address before posting."
 msgstr "Tu debe validar tu adresse de e-mail ante de publicar."
 
+#. TRANS: Client exception thrown when trying to register without providing an e-mail address.
 msgid "You must provide an email address to register."
 msgstr "Tu debe fornir un adresse de e-mail pro poter crear un conto."
 
+#. TRANS: Plugin description.
 msgid "Disables posting without a validated email address."
 msgstr "Disactiva le publication de messages sin adresse de e-mail validate."
 
+#. TRANS: Client exception thrown when trying to register while already logged in.
 msgid "You are already logged in."
 msgstr "Tu es jam authenticate."
 
+#. TRANS: Client exception thrown when trying to register with a non-existing confirmation code.
 msgid "Confirmation code not found."
 msgstr "Codice de confirmation non trovate."
 
+#. TRANS: Client exception thrown when trying to register with a confirmation code that is not connected with a user.
 msgid "No user for that confirmation code."
 msgstr "Il non ha un usator pro iste codice de confirmation."
 
+#. TRANS: Client exception thrown when trying to register with a invalid e-mail address.
+#. TRANS: %s is the invalid e-mail address.
 #, php-format
 msgid "Unrecognized address type %s."
 msgstr "Typo de adresse %s non recognoscite."
@@ -47,12 +55,15 @@ msgstr "Typo de adresse %s non recognoscite."
 msgid "That address has already been confirmed."
 msgstr "Iste adresse ha ja essite confirmate."
 
+#. TRANS: Client exception thrown when trying to register with too short a password.
 msgid "Password too short."
 msgstr "Contrasigno troppo curte."
 
+#. TRANS: Client exception thrown when trying to register without providing the same password twice.
 msgid "Passwords do not match."
 msgstr "Le contrasignos non corresponde."
 
+#. TRANS: Form instructions. %s is the nickname of the to be registered user.
 #, php-format
 msgid ""
 "You have confirmed the email address for your new user account %s. Use the "
@@ -61,23 +72,32 @@ msgstr ""
 "Tu ha confirmate le adresse de e-mail pro tu nove conto de usator %s. Usa le "
 "formulario sequente pro definir tu nove contrasigno."
 
+#. TRANS: Page title.
 msgid "Set a password"
 msgstr "Definir un contrasigno"
 
-msgid "Confirm email"
-msgstr "Confirmar e-mail"
+#. TRANS: Form legend.
+msgid "Confirm email address"
+msgstr "Confirmar adresse de e-mail"
 
+#. TRANS: Field label.
 msgid "New password"
 msgstr "Nove contrasigno"
 
+#. TRANS: Field title for password field.
 msgid "6 or more characters."
 msgstr "6 o plus characteres."
 
+#. TRANS: Field label for repeat password field.
+msgctxt "LABEL"
 msgid "Confirm"
 msgstr "Confirmar"
 
+#. TRANS: Field title for repeat password field.
 msgid "Same as password above."
 msgstr "Identic al contrasigno hic supra."
 
+#. TRANS: Button text for completing registration by e-mail.
+msgctxt "BUTTON"
 msgid "Save"
 msgstr "Salveguardar"
diff --git a/plugins/RequireValidatedEmail/locale/mk/LC_MESSAGES/RequireValidatedEmail.po b/plugins/RequireValidatedEmail/locale/mk/LC_MESSAGES/RequireValidatedEmail.po
index 66bdb463d1..9efdb41329 100644
--- a/plugins/RequireValidatedEmail/locale/mk/LC_MESSAGES/RequireValidatedEmail.po
+++ b/plugins/RequireValidatedEmail/locale/mk/LC_MESSAGES/RequireValidatedEmail.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - RequireValidatedEmail to Macedonian (Македон�ки)
+# Translation of StatusNet - RequireValidatedEmail to Macedonian (македон�ки)
 # Exported from translatewiki.net
 #
 # Author: Bjankuloski06
@@ -9,38 +9,46 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - RequireValidatedEmail\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:06+0000\n"
-"Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:51+0000\n"
+"Language-Team: Macedonian <https://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:17+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-18 16:19:28+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-requirevalidatedemail\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
 
+#. TRANS: Client exception thrown when trying to post notices before validating an e-mail address.
 msgid "You must validate your email address before posting."
 msgstr ""
 "Пред да почнете да објавувате ќе мора да ја потврдите Вашата е-поштен�ка "
 "адре�а."
 
+#. TRANS: Client exception thrown when trying to register without providing an e-mail address.
 msgid "You must provide an email address to register."
 msgstr "За да �е реги�трирате, ќе мора да наведете е-поштен�ка адре�а."
 
+#. TRANS: Plugin description.
 msgid "Disables posting without a validated email address."
 msgstr "Оневозможува објавување без потврдена е-пошта."
 
+#. TRANS: Client exception thrown when trying to register while already logged in.
 msgid "You are already logged in."
 msgstr "Веќе �те најавени."
 
+#. TRANS: Client exception thrown when trying to register with a non-existing confirmation code.
 msgid "Confirmation code not found."
 msgstr "Потврдниот код не е пронајден."
 
+#. TRANS: Client exception thrown when trying to register with a confirmation code that is not connected with a user.
 msgid "No user for that confirmation code."
 msgstr "�ема кори�ник за тој потврден код."
 
+#. TRANS: Client exception thrown when trying to register with a invalid e-mail address.
+#. TRANS: %s is the invalid e-mail address.
 #, php-format
 msgid "Unrecognized address type %s."
 msgstr "�епознат тип на адре�а %s."
@@ -49,12 +57,15 @@ msgstr "�епознат тип на адре�а %s."
 msgid "That address has already been confirmed."
 msgstr "Таа адре�а е веќе потврдена."
 
+#. TRANS: Client exception thrown when trying to register with too short a password.
 msgid "Password too short."
 msgstr "Лозинката е прекратка."
 
+#. TRANS: Client exception thrown when trying to register without providing the same password twice.
 msgid "Passwords do not match."
 msgstr "Лозинките не �е �овпаѓаат."
 
+#. TRANS: Form instructions. %s is the nickname of the to be registered user.
 #, php-format
 msgid ""
 "You have confirmed the email address for your new user account %s. Use the "
@@ -63,23 +74,32 @@ msgstr ""
 "Ја потврдивте е-поштата за Вашата нова кори�ничка �метка %s. Задајте нова "
 "лозинка во образецот подолу."
 
+#. TRANS: Page title.
 msgid "Set a password"
 msgstr "Задајте лозинка"
 
-msgid "Confirm email"
+#. TRANS: Form legend.
+msgid "Confirm email address"
 msgstr "Потврдете е-пошта"
 
+#. TRANS: Field label.
 msgid "New password"
 msgstr "�ова лозинка"
 
+#. TRANS: Field title for password field.
 msgid "6 or more characters."
 msgstr "барем 6 знаци."
 
+#. TRANS: Field label for repeat password field.
+msgctxt "LABEL"
 msgid "Confirm"
 msgstr "Потврди"
 
+#. TRANS: Field title for repeat password field.
 msgid "Same as password above."
 msgstr "И�то како лозинката погоре."
 
+#. TRANS: Button text for completing registration by e-mail.
+msgctxt "BUTTON"
 msgid "Save"
 msgstr "Зачувај"
diff --git a/plugins/RequireValidatedEmail/locale/nl/LC_MESSAGES/RequireValidatedEmail.po b/plugins/RequireValidatedEmail/locale/nl/LC_MESSAGES/RequireValidatedEmail.po
index a940a72f99..e941626016 100644
--- a/plugins/RequireValidatedEmail/locale/nl/LC_MESSAGES/RequireValidatedEmail.po
+++ b/plugins/RequireValidatedEmail/locale/nl/LC_MESSAGES/RequireValidatedEmail.po
@@ -9,36 +9,44 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - RequireValidatedEmail\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:06+0000\n"
-"Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:51+0000\n"
+"Language-Team: Dutch <https://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:17+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-18 16:19:28+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-requirevalidatedemail\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Client exception thrown when trying to post notices before validating an e-mail address.
 msgid "You must validate your email address before posting."
 msgstr "U moet uw e-mailadres bevestigen voordat u berichten kunt plaatsen."
 
+#. TRANS: Client exception thrown when trying to register without providing an e-mail address.
 msgid "You must provide an email address to register."
 msgstr "U moet een e-mailadres opgeven om te kunnen registreren."
 
+#. TRANS: Plugin description.
 msgid "Disables posting without a validated email address."
 msgstr "Schakelt berichten plaatsen zonder gevalideerd e-mailadres uit."
 
+#. TRANS: Client exception thrown when trying to register while already logged in.
 msgid "You are already logged in."
 msgstr "U bent al aangemeld."
 
+#. TRANS: Client exception thrown when trying to register with a non-existing confirmation code.
 msgid "Confirmation code not found."
 msgstr "De bevestigingscode is niet gevonden."
 
+#. TRANS: Client exception thrown when trying to register with a confirmation code that is not connected with a user.
 msgid "No user for that confirmation code."
 msgstr "Er is geen gebruiker voor die bevestigingscode."
 
+#. TRANS: Client exception thrown when trying to register with a invalid e-mail address.
+#. TRANS: %s is the invalid e-mail address.
 #, php-format
 msgid "Unrecognized address type %s."
 msgstr "Onbekend adrestype %s."
@@ -47,12 +55,15 @@ msgstr "Onbekend adrestype %s."
 msgid "That address has already been confirmed."
 msgstr "Dit adres is al bevestigd."
 
+#. TRANS: Client exception thrown when trying to register with too short a password.
 msgid "Password too short."
 msgstr "Het wachtwoord is te kort."
 
+#. TRANS: Client exception thrown when trying to register without providing the same password twice.
 msgid "Passwords do not match."
 msgstr "De wachtwoorden komen niet overeen."
 
+#. TRANS: Form instructions. %s is the nickname of the to be registered user.
 #, php-format
 msgid ""
 "You have confirmed the email address for your new user account %s. Use the "
@@ -61,23 +72,32 @@ msgstr ""
 "U hebt het e-mailadres bevestigd voor uw nieuwe gebruiker %s. Gebruik het "
 "formulier hieronder om uw nieuwe wachtwoord in te stellen."
 
+#. TRANS: Page title.
 msgid "Set a password"
 msgstr "Stel een wachtwoord in"
 
-msgid "Confirm email"
+#. TRANS: Form legend.
+msgid "Confirm email address"
 msgstr "E-mailadres bevestigen"
 
+#. TRANS: Field label.
 msgid "New password"
 msgstr "Nieuw wachtwoord"
 
+#. TRANS: Field title for password field.
 msgid "6 or more characters."
 msgstr "Zes of meer tekens."
 
+#. TRANS: Field label for repeat password field.
+msgctxt "LABEL"
 msgid "Confirm"
 msgstr "Bevestigen"
 
+#. TRANS: Field title for repeat password field.
 msgid "Same as password above."
 msgstr "Gelijk aan het wachtwoord hierboven."
 
+#. TRANS: Button text for completing registration by e-mail.
+msgctxt "BUTTON"
 msgid "Save"
 msgstr "Opslaan"
diff --git a/plugins/RequireValidatedEmail/locale/pl/LC_MESSAGES/RequireValidatedEmail.po b/plugins/RequireValidatedEmail/locale/pl/LC_MESSAGES/RequireValidatedEmail.po
new file mode 100644
index 0000000000..9e2cc5c97b
--- /dev/null
+++ b/plugins/RequireValidatedEmail/locale/pl/LC_MESSAGES/RequireValidatedEmail.po
@@ -0,0 +1,102 @@
+# Translation of StatusNet - RequireValidatedEmail to Polish (polski)
+# Exported from translatewiki.net
+#
+# Author: Woytecr
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - RequireValidatedEmail\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:51+0000\n"
+"Language-Team: Polish <https://translatewiki.net/wiki/Portal:pl>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-18 16:19:28+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: pl\n"
+"X-Message-Group: #out-statusnet-plugin-requirevalidatedemail\n"
+"Plural-Forms: nplurals=3; plural=(n == 1) ? 0 : ( (n%10 >= 2 && n%10 <= 4 && "
+"(n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
+
+#. TRANS: Client exception thrown when trying to post notices before validating an e-mail address.
+msgid "You must validate your email address before posting."
+msgstr ""
+
+#. TRANS: Client exception thrown when trying to register without providing an e-mail address.
+msgid "You must provide an email address to register."
+msgstr ""
+
+#. TRANS: Plugin description.
+msgid "Disables posting without a validated email address."
+msgstr ""
+
+#. TRANS: Client exception thrown when trying to register while already logged in.
+msgid "You are already logged in."
+msgstr "Jesteś już zalogowany"
+
+#. TRANS: Client exception thrown when trying to register with a non-existing confirmation code.
+msgid "Confirmation code not found."
+msgstr "Nie odnaleziono kodu potwierdzajÄ…cego."
+
+#. TRANS: Client exception thrown when trying to register with a confirmation code that is not connected with a user.
+msgid "No user for that confirmation code."
+msgstr ""
+
+#. TRANS: Client exception thrown when trying to register with a invalid e-mail address.
+#. TRANS: %s is the invalid e-mail address.
+#, php-format
+msgid "Unrecognized address type %s."
+msgstr ""
+
+#. TRANS: Client error for an already confirmed email/jabber/sms address.
+msgid "That address has already been confirmed."
+msgstr "Adres został już potwierdzony."
+
+#. TRANS: Client exception thrown when trying to register with too short a password.
+msgid "Password too short."
+msgstr "Hasło jest za krótkie."
+
+#. TRANS: Client exception thrown when trying to register without providing the same password twice.
+msgid "Passwords do not match."
+msgstr "Hasła nie pasują do siebie."
+
+#. TRANS: Form instructions. %s is the nickname of the to be registered user.
+#, php-format
+msgid ""
+"You have confirmed the email address for your new user account %s. Use the "
+"form below to set your new password."
+msgstr ""
+
+#. TRANS: Page title.
+msgid "Set a password"
+msgstr "Ustaw hasło"
+
+#. TRANS: Form legend.
+msgid "Confirm email address"
+msgstr "Potwierdź adres e-mail"
+
+#. TRANS: Field label.
+msgid "New password"
+msgstr "Nowe hasło"
+
+#. TRANS: Field title for password field.
+msgid "6 or more characters."
+msgstr "6 lub więcej znaków."
+
+#. TRANS: Field label for repeat password field.
+msgctxt "LABEL"
+msgid "Confirm"
+msgstr "Potwierdź"
+
+#. TRANS: Field title for repeat password field.
+msgid "Same as password above."
+msgstr ""
+
+#. TRANS: Button text for completing registration by e-mail.
+msgctxt "BUTTON"
+msgid "Save"
+msgstr "Zapisz"
diff --git a/plugins/RequireValidatedEmail/locale/tl/LC_MESSAGES/RequireValidatedEmail.po b/plugins/RequireValidatedEmail/locale/tl/LC_MESSAGES/RequireValidatedEmail.po
index 3167e37eaa..cd9318f0a6 100644
--- a/plugins/RequireValidatedEmail/locale/tl/LC_MESSAGES/RequireValidatedEmail.po
+++ b/plugins/RequireValidatedEmail/locale/tl/LC_MESSAGES/RequireValidatedEmail.po
@@ -9,38 +9,46 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - RequireValidatedEmail\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:07+0000\n"
-"Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:51+0000\n"
+"Language-Team: Tagalog <https://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:17+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-18 16:19:28+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-requirevalidatedemail\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Client exception thrown when trying to post notices before validating an e-mail address.
 msgid "You must validate your email address before posting."
 msgstr "Kailangan patunayan mo ang iyong tirahan ng e-liham bago magpaskil."
 
+#. TRANS: Client exception thrown when trying to register without providing an e-mail address.
 msgid "You must provide an email address to register."
 msgstr "Dapat kang magbigay ng isang tirahan ng e-liham upang makapagpatala."
 
+#. TRANS: Plugin description.
 msgid "Disables posting without a validated email address."
 msgstr ""
 "Hindi nagpapagana ng pagpapaskil na walang isang napatunayang tirahan ng e-"
 "liham."
 
+#. TRANS: Client exception thrown when trying to register while already logged in.
 msgid "You are already logged in."
 msgstr "Nakalagda ka na."
 
+#. TRANS: Client exception thrown when trying to register with a non-existing confirmation code.
 msgid "Confirmation code not found."
 msgstr "Hindi natagpuan ang kodigo ng pagtitiyak."
 
+#. TRANS: Client exception thrown when trying to register with a confirmation code that is not connected with a user.
 msgid "No user for that confirmation code."
 msgstr "Walang tagagamit para sa ganyang kodigo ng paniniyak."
 
+#. TRANS: Client exception thrown when trying to register with a invalid e-mail address.
+#. TRANS: %s is the invalid e-mail address.
 #, php-format
 msgid "Unrecognized address type %s."
 msgstr "Hindi nakikilalang uri ng tirahan na %s."
@@ -49,12 +57,15 @@ msgstr "Hindi nakikilalang uri ng tirahan na %s."
 msgid "That address has already been confirmed."
 msgstr "Natiyak na ang ganyang tirahan."
 
+#. TRANS: Client exception thrown when trying to register with too short a password.
 msgid "Password too short."
 msgstr "Napakaikli ng hudyat."
 
+#. TRANS: Client exception thrown when trying to register without providing the same password twice.
 msgid "Passwords do not match."
 msgstr "Hindi magkatugma ang mga hudyat."
 
+#. TRANS: Form instructions. %s is the nickname of the to be registered user.
 #, php-format
 msgid ""
 "You have confirmed the email address for your new user account %s. Use the "
@@ -64,23 +75,32 @@ msgstr ""
 "na %s.  Gamitin ang pormularyong nasa ibaba upang maitakda ang bago mong "
 "hudyat."
 
+#. TRANS: Page title.
 msgid "Set a password"
 msgstr "Magtakda ng isang hudyat"
 
-msgid "Confirm email"
-msgstr "Tiyakin ang e-liham"
+#. TRANS: Form legend.
+msgid "Confirm email address"
+msgstr "Patotohanan ang tirahan ng e-liham"
 
+#. TRANS: Field label.
 msgid "New password"
 msgstr "Bagong hudyat"
 
+#. TRANS: Field title for password field.
 msgid "6 or more characters."
 msgstr "6 o mahigit pang mga panitik."
 
+#. TRANS: Field label for repeat password field.
+msgctxt "LABEL"
 msgid "Confirm"
-msgstr "Pagtibayin"
+msgstr "Patunayan"
 
+#. TRANS: Field title for repeat password field.
 msgid "Same as password above."
 msgstr "Katulad ng hudyat na nasa itaas."
 
+#. TRANS: Button text for completing registration by e-mail.
+msgctxt "BUTTON"
 msgid "Save"
 msgstr "Sagipin"
diff --git a/plugins/RequireValidatedEmail/locale/uk/LC_MESSAGES/RequireValidatedEmail.po b/plugins/RequireValidatedEmail/locale/uk/LC_MESSAGES/RequireValidatedEmail.po
index b4126dc2d5..610d933b37 100644
--- a/plugins/RequireValidatedEmail/locale/uk/LC_MESSAGES/RequireValidatedEmail.po
+++ b/plugins/RequireValidatedEmail/locale/uk/LC_MESSAGES/RequireValidatedEmail.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - RequireValidatedEmail to Ukrainian (Україн�ька)
+# Translation of StatusNet - RequireValidatedEmail to Ukrainian (україн�ька)
 # Exported from translatewiki.net
 #
 # Author: Boogie
@@ -9,41 +9,49 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - RequireValidatedEmail\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:07+0000\n"
-"Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:51+0000\n"
+"Language-Team: Ukrainian <https://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:17+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-18 16:19:28+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-requirevalidatedemail\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
+#. TRANS: Client exception thrown when trying to post notices before validating an e-mail address.
 msgid "You must validate your email address before posting."
 msgstr ""
 "Ви повинні підтвердити �вою адре�у електронної пошти до того, �к почнете "
 "над�илати допи�и поштою."
 
+#. TRANS: Client exception thrown when trying to register without providing an e-mail address.
 msgid "You must provide an email address to register."
 msgstr "Ви повинні зазначити �вою адре�у електронної пошти дл� реє�трації."
 
+#. TRANS: Plugin description.
 msgid "Disables posting without a validated email address."
 msgstr ""
 "Заборон�є над�иланн� допи�ів, �кщо кори�тувач не має підтвердженої "
 "електронної адре�и."
 
+#. TRANS: Client exception thrown when trying to register while already logged in.
 msgid "You are already logged in."
 msgstr "Ви вже увійшли."
 
+#. TRANS: Client exception thrown when trying to register with a non-existing confirmation code.
 msgid "Confirmation code not found."
 msgstr "Код підтвердженн� не знайдено."
 
+#. TRANS: Client exception thrown when trying to register with a confirmation code that is not connected with a user.
 msgid "No user for that confirmation code."
 msgstr "�емає кори�тувача дл� цього коду підтвердженн�."
 
+#. TRANS: Client exception thrown when trying to register with a invalid e-mail address.
+#. TRANS: %s is the invalid e-mail address.
 #, php-format
 msgid "Unrecognized address type %s."
 msgstr "�евизначений тип адре�и %s."
@@ -52,12 +60,15 @@ msgstr "�евизначений тип адре�и %s."
 msgid "That address has already been confirmed."
 msgstr "Цю адре�у вже було підтверджено."
 
+#. TRANS: Client exception thrown when trying to register with too short a password.
 msgid "Password too short."
 msgstr "Пароль занадто короткий."
 
+#. TRANS: Client exception thrown when trying to register without providing the same password twice.
 msgid "Passwords do not match."
 msgstr "Паролі не збігають��."
 
+#. TRANS: Form instructions. %s is the nickname of the to be registered user.
 #, php-format
 msgid ""
 "You have confirmed the email address for your new user account %s. Use the "
@@ -66,23 +77,32 @@ msgstr ""
 "Ви підтвердили електронну адре�у дл� �вого нового акаунту %s. Скори�тайте�� "
 "формою нижче, щоб в�тановити новий пароль."
 
+#. TRANS: Page title.
 msgid "Set a password"
 msgstr "В�тановити пароль"
 
-msgid "Confirm email"
+#. TRANS: Form legend.
+msgid "Confirm email address"
 msgstr "Підтвердити адре�у електронної пошти"
 
+#. TRANS: Field label.
 msgid "New password"
 msgstr "�овий пароль"
 
+#. TRANS: Field title for password field.
 msgid "6 or more characters."
 msgstr "6 або більше знаків."
 
+#. TRANS: Field label for repeat password field.
+msgctxt "LABEL"
 msgid "Confirm"
 msgstr "Підтвердити"
 
+#. TRANS: Field title for repeat password field.
 msgid "Same as password above."
 msgstr "Такий �амо, �к і пароль вище."
 
+#. TRANS: Button text for completing registration by e-mail.
+msgctxt "BUTTON"
 msgid "Save"
 msgstr "Зберегти"
diff --git a/plugins/ReverseUsernameAuthentication/ReverseUsernameAuthenticationPlugin.php b/plugins/ReverseUsernameAuthentication/ReverseUsernameAuthenticationPlugin.php
index 8a05a77340..568c1c9584 100644
--- a/plugins/ReverseUsernameAuthentication/ReverseUsernameAuthenticationPlugin.php
+++ b/plugins/ReverseUsernameAuthentication/ReverseUsernameAuthenticationPlugin.php
@@ -64,6 +64,7 @@ class ReverseUsernameAuthenticationPlugin extends AuthenticationPlugin
                             'author' => 'Craig Andrews',
                             'homepage' => 'http://status.net/wiki/Plugin:ReverseUsernameAuthentication',
                             'rawdescription' =>
+                            // TRANS: Plugin description.
                             _m('The Reverse Username Authentication plugin allows for StatusNet to handle authentication by checking if the provided password is the same as the reverse of the username.'));
         return true;
     }
diff --git a/plugins/ReverseUsernameAuthentication/locale/ReverseUsernameAuthentication.pot b/plugins/ReverseUsernameAuthentication/locale/ReverseUsernameAuthentication.pot
index 01bca8eb80..6262951cb4 100644
--- a/plugins/ReverseUsernameAuthentication/locale/ReverseUsernameAuthentication.pot
+++ b/plugins/ReverseUsernameAuthentication/locale/ReverseUsernameAuthentication.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,7 +16,8 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ReverseUsernameAuthenticationPlugin.php:67
+#. TRANS: Plugin description.
+#: ReverseUsernameAuthenticationPlugin.php:68
 msgid ""
 "The Reverse Username Authentication plugin allows for StatusNet to handle "
 "authentication by checking if the provided password is the same as the "
diff --git a/plugins/ReverseUsernameAuthentication/locale/de/LC_MESSAGES/ReverseUsernameAuthentication.po b/plugins/ReverseUsernameAuthentication/locale/de/LC_MESSAGES/ReverseUsernameAuthentication.po
index 7557fca9fc..fdd60dcab3 100644
--- a/plugins/ReverseUsernameAuthentication/locale/de/LC_MESSAGES/ReverseUsernameAuthentication.po
+++ b/plugins/ReverseUsernameAuthentication/locale/de/LC_MESSAGES/ReverseUsernameAuthentication.po
@@ -9,18 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ReverseUsernameAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:07+0000\n"
-"Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:51+0000\n"
+"Language-Team: German <https://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:03+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:27+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-reverseusernameauthentication\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Plugin description.
 msgid ""
 "The Reverse Username Authentication plugin allows for StatusNet to handle "
 "authentication by checking if the provided password is the same as the "
diff --git a/plugins/ReverseUsernameAuthentication/locale/es/LC_MESSAGES/ReverseUsernameAuthentication.po b/plugins/ReverseUsernameAuthentication/locale/es/LC_MESSAGES/ReverseUsernameAuthentication.po
new file mode 100644
index 0000000000..c608bfbaa3
--- /dev/null
+++ b/plugins/ReverseUsernameAuthentication/locale/es/LC_MESSAGES/ReverseUsernameAuthentication.po
@@ -0,0 +1,29 @@
+# Translation of StatusNet - ReverseUsernameAuthentication to Spanish (español)
+# Exported from translatewiki.net
+#
+# Author: Armando-Martin
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - ReverseUsernameAuthentication\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:51+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:51:27+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin description.
+msgid ""
+"The Reverse Username Authentication plugin allows for StatusNet to handle "
+"authentication by checking if the provided password is the same as the "
+"reverse of the username."
+msgstr ""
+"El complemento (plugin) Reverse Username Authentication permite a StatusNet "
+"controlar la autenticación comprobando si  la contraseña proporcionada es la "
+"misma que el reverso del nombre de usuario."
diff --git a/plugins/ReverseUsernameAuthentication/locale/fr/LC_MESSAGES/ReverseUsernameAuthentication.po b/plugins/ReverseUsernameAuthentication/locale/fr/LC_MESSAGES/ReverseUsernameAuthentication.po
index 53eaa376ff..2875634839 100644
--- a/plugins/ReverseUsernameAuthentication/locale/fr/LC_MESSAGES/ReverseUsernameAuthentication.po
+++ b/plugins/ReverseUsernameAuthentication/locale/fr/LC_MESSAGES/ReverseUsernameAuthentication.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - ReverseUsernameAuthentication to French (Français)
+# Translation of StatusNet - ReverseUsernameAuthentication to French (français)
 # Exported from translatewiki.net
 #
 # Author: Peter17
@@ -9,18 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ReverseUsernameAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:07+0000\n"
-"Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:51+0000\n"
+"Language-Team: French <https://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:03+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:27+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-reverseusernameauthentication\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#. TRANS: Plugin description.
 msgid ""
 "The Reverse Username Authentication plugin allows for StatusNet to handle "
 "authentication by checking if the provided password is the same as the "
diff --git a/plugins/ReverseUsernameAuthentication/locale/gl/LC_MESSAGES/ReverseUsernameAuthentication.po b/plugins/ReverseUsernameAuthentication/locale/gl/LC_MESSAGES/ReverseUsernameAuthentication.po
new file mode 100644
index 0000000000..f7fe91b63f
--- /dev/null
+++ b/plugins/ReverseUsernameAuthentication/locale/gl/LC_MESSAGES/ReverseUsernameAuthentication.po
@@ -0,0 +1,32 @@
+# Translation of StatusNet - ReverseUsernameAuthentication to Galician (galego)
+# Exported from translatewiki.net
+#
+# Author: Toliño
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - ReverseUsernameAuthentication\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:51+0000\n"
+"Language-Team: Galician <https://translatewiki.net/wiki/Portal:gl>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:51:27+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: gl\n"
+"X-Message-Group: #out-statusnet-plugin-reverseusernameauthentication\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin description.
+msgid ""
+"The Reverse Username Authentication plugin allows for StatusNet to handle "
+"authentication by checking if the provided password is the same as the "
+"reverse of the username."
+msgstr ""
+"O complemento Reverse Username Authentication permite ao StatusNet manexar a "
+"autenticación comprobando se o contrasinal dado é o mesmo que o nome de "
+"usuario ao revés."
diff --git a/plugins/ReverseUsernameAuthentication/locale/he/LC_MESSAGES/ReverseUsernameAuthentication.po b/plugins/ReverseUsernameAuthentication/locale/he/LC_MESSAGES/ReverseUsernameAuthentication.po
index 246427a8f0..b3e5821850 100644
--- a/plugins/ReverseUsernameAuthentication/locale/he/LC_MESSAGES/ReverseUsernameAuthentication.po
+++ b/plugins/ReverseUsernameAuthentication/locale/he/LC_MESSAGES/ReverseUsernameAuthentication.po
@@ -9,18 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ReverseUsernameAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:07+0000\n"
-"Language-Team: Hebrew <http://translatewiki.net/wiki/Portal:he>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:52+0000\n"
+"Language-Team: Hebrew <https://translatewiki.net/wiki/Portal:he>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:03+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:27+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: he\n"
 "X-Message-Group: #out-statusnet-plugin-reverseusernameauthentication\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Plugin description.
 msgid ""
 "The Reverse Username Authentication plugin allows for StatusNet to handle "
 "authentication by checking if the provided password is the same as the "
diff --git a/plugins/ReverseUsernameAuthentication/locale/ia/LC_MESSAGES/ReverseUsernameAuthentication.po b/plugins/ReverseUsernameAuthentication/locale/ia/LC_MESSAGES/ReverseUsernameAuthentication.po
index e6d9dc3316..22521b96b5 100644
--- a/plugins/ReverseUsernameAuthentication/locale/ia/LC_MESSAGES/ReverseUsernameAuthentication.po
+++ b/plugins/ReverseUsernameAuthentication/locale/ia/LC_MESSAGES/ReverseUsernameAuthentication.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - ReverseUsernameAuthentication to Interlingua (Interlingua)
+# Translation of StatusNet - ReverseUsernameAuthentication to Interlingua (interlingua)
 # Exported from translatewiki.net
 #
 # Author: McDutchie
@@ -9,18 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ReverseUsernameAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:07+0000\n"
-"Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:52+0000\n"
+"Language-Team: Interlingua <https://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:03+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:27+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-reverseusernameauthentication\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Plugin description.
 msgid ""
 "The Reverse Username Authentication plugin allows for StatusNet to handle "
 "authentication by checking if the provided password is the same as the "
diff --git a/plugins/ReverseUsernameAuthentication/locale/id/LC_MESSAGES/ReverseUsernameAuthentication.po b/plugins/ReverseUsernameAuthentication/locale/id/LC_MESSAGES/ReverseUsernameAuthentication.po
index 016990b1d3..c0598c6494 100644
--- a/plugins/ReverseUsernameAuthentication/locale/id/LC_MESSAGES/ReverseUsernameAuthentication.po
+++ b/plugins/ReverseUsernameAuthentication/locale/id/LC_MESSAGES/ReverseUsernameAuthentication.po
@@ -9,18 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ReverseUsernameAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:07+0000\n"
-"Language-Team: Indonesian <http://translatewiki.net/wiki/Portal:id>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:52+0000\n"
+"Language-Team: Indonesian <https://translatewiki.net/wiki/Portal:id>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:03+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:27+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: id\n"
 "X-Message-Group: #out-statusnet-plugin-reverseusernameauthentication\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#. TRANS: Plugin description.
 msgid ""
 "The Reverse Username Authentication plugin allows for StatusNet to handle "
 "authentication by checking if the provided password is the same as the "
diff --git a/plugins/ReverseUsernameAuthentication/locale/ja/LC_MESSAGES/ReverseUsernameAuthentication.po b/plugins/ReverseUsernameAuthentication/locale/ja/LC_MESSAGES/ReverseUsernameAuthentication.po
index 5e709b722e..55d3a6a6a3 100644
--- a/plugins/ReverseUsernameAuthentication/locale/ja/LC_MESSAGES/ReverseUsernameAuthentication.po
+++ b/plugins/ReverseUsernameAuthentication/locale/ja/LC_MESSAGES/ReverseUsernameAuthentication.po
@@ -9,18 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ReverseUsernameAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:07+0000\n"
-"Language-Team: Japanese <http://translatewiki.net/wiki/Portal:ja>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:52+0000\n"
+"Language-Team: Japanese <https://translatewiki.net/wiki/Portal:ja>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:03+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:27+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ja\n"
 "X-Message-Group: #out-statusnet-plugin-reverseusernameauthentication\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#. TRANS: Plugin description.
 msgid ""
 "The Reverse Username Authentication plugin allows for StatusNet to handle "
 "authentication by checking if the provided password is the same as the "
diff --git a/plugins/ReverseUsernameAuthentication/locale/mk/LC_MESSAGES/ReverseUsernameAuthentication.po b/plugins/ReverseUsernameAuthentication/locale/mk/LC_MESSAGES/ReverseUsernameAuthentication.po
index 68744a45be..9e0f8b1a7d 100644
--- a/plugins/ReverseUsernameAuthentication/locale/mk/LC_MESSAGES/ReverseUsernameAuthentication.po
+++ b/plugins/ReverseUsernameAuthentication/locale/mk/LC_MESSAGES/ReverseUsernameAuthentication.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - ReverseUsernameAuthentication to Macedonian (Македон�ки)
+# Translation of StatusNet - ReverseUsernameAuthentication to Macedonian (македон�ки)
 # Exported from translatewiki.net
 #
 # Author: Bjankuloski06
@@ -9,18 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ReverseUsernameAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:07+0000\n"
-"Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:52+0000\n"
+"Language-Team: Macedonian <https://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:03+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:27+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-reverseusernameauthentication\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
 
+#. TRANS: Plugin description.
 msgid ""
 "The Reverse Username Authentication plugin allows for StatusNet to handle "
 "authentication by checking if the provided password is the same as the "
diff --git a/plugins/ReverseUsernameAuthentication/locale/nb/LC_MESSAGES/ReverseUsernameAuthentication.po b/plugins/ReverseUsernameAuthentication/locale/nb/LC_MESSAGES/ReverseUsernameAuthentication.po
index 3bcdc8fbfe..e341c7cef1 100644
--- a/plugins/ReverseUsernameAuthentication/locale/nb/LC_MESSAGES/ReverseUsernameAuthentication.po
+++ b/plugins/ReverseUsernameAuthentication/locale/nb/LC_MESSAGES/ReverseUsernameAuthentication.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - ReverseUsernameAuthentication to Norwegian (bokmål)‬ (‪Norsk (bokmål)‬)
+# Translation of StatusNet - ReverseUsernameAuthentication to Norwegian Bokmål (‪norsk (bokmål)‬)
 # Exported from translatewiki.net
 #
 # Author: Nghtwlkr
@@ -9,18 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ReverseUsernameAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:08+0000\n"
-"Language-Team: Norwegian (bokmål)‬ <http://translatewiki.net/wiki/Portal:no>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:52+0000\n"
+"Language-Team: Norwegian Bokmål <https://translatewiki.net/wiki/Portal:nb>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:03+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
-"X-Language-Code: no\n"
+"X-POT-Import-Date: 2011-06-05 21:51:27+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: nb\n"
 "X-Message-Group: #out-statusnet-plugin-reverseusernameauthentication\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Plugin description.
 msgid ""
 "The Reverse Username Authentication plugin allows for StatusNet to handle "
 "authentication by checking if the provided password is the same as the "
diff --git a/plugins/ReverseUsernameAuthentication/locale/nl/LC_MESSAGES/ReverseUsernameAuthentication.po b/plugins/ReverseUsernameAuthentication/locale/nl/LC_MESSAGES/ReverseUsernameAuthentication.po
index 87e2b030e6..ddee9ae3ea 100644
--- a/plugins/ReverseUsernameAuthentication/locale/nl/LC_MESSAGES/ReverseUsernameAuthentication.po
+++ b/plugins/ReverseUsernameAuthentication/locale/nl/LC_MESSAGES/ReverseUsernameAuthentication.po
@@ -9,18 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ReverseUsernameAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:08+0000\n"
-"Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:52+0000\n"
+"Language-Team: Dutch <https://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:03+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:27+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-reverseusernameauthentication\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Plugin description.
 msgid ""
 "The Reverse Username Authentication plugin allows for StatusNet to handle "
 "authentication by checking if the provided password is the same as the "
diff --git a/plugins/ReverseUsernameAuthentication/locale/ru/LC_MESSAGES/ReverseUsernameAuthentication.po b/plugins/ReverseUsernameAuthentication/locale/ru/LC_MESSAGES/ReverseUsernameAuthentication.po
index 8f58fbf265..e948719097 100644
--- a/plugins/ReverseUsernameAuthentication/locale/ru/LC_MESSAGES/ReverseUsernameAuthentication.po
+++ b/plugins/ReverseUsernameAuthentication/locale/ru/LC_MESSAGES/ReverseUsernameAuthentication.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - ReverseUsernameAuthentication to Russian (Ру��кий)
+# Translation of StatusNet - ReverseUsernameAuthentication to Russian (ру��кий)
 # Exported from translatewiki.net
 #
 # Author: �лек�андр Сигачёв
@@ -9,19 +9,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ReverseUsernameAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:08+0000\n"
-"Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:52+0000\n"
+"Language-Team: Russian <https://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:03+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:27+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-reverseusernameauthentication\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
+#. TRANS: Plugin description.
 msgid ""
 "The Reverse Username Authentication plugin allows for StatusNet to handle "
 "authentication by checking if the provided password is the same as the "
diff --git a/plugins/ReverseUsernameAuthentication/locale/tl/LC_MESSAGES/ReverseUsernameAuthentication.po b/plugins/ReverseUsernameAuthentication/locale/tl/LC_MESSAGES/ReverseUsernameAuthentication.po
index 23ba4b89be..3b51a6bd01 100644
--- a/plugins/ReverseUsernameAuthentication/locale/tl/LC_MESSAGES/ReverseUsernameAuthentication.po
+++ b/plugins/ReverseUsernameAuthentication/locale/tl/LC_MESSAGES/ReverseUsernameAuthentication.po
@@ -9,18 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ReverseUsernameAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:08+0000\n"
-"Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:52+0000\n"
+"Language-Team: Tagalog <https://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:03+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:27+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-reverseusernameauthentication\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Plugin description.
 msgid ""
 "The Reverse Username Authentication plugin allows for StatusNet to handle "
 "authentication by checking if the provided password is the same as the "
diff --git a/plugins/ReverseUsernameAuthentication/locale/uk/LC_MESSAGES/ReverseUsernameAuthentication.po b/plugins/ReverseUsernameAuthentication/locale/uk/LC_MESSAGES/ReverseUsernameAuthentication.po
index 01e09abccb..9389b11ecf 100644
--- a/plugins/ReverseUsernameAuthentication/locale/uk/LC_MESSAGES/ReverseUsernameAuthentication.po
+++ b/plugins/ReverseUsernameAuthentication/locale/uk/LC_MESSAGES/ReverseUsernameAuthentication.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - ReverseUsernameAuthentication to Ukrainian (Україн�ька)
+# Translation of StatusNet - ReverseUsernameAuthentication to Ukrainian (україн�ька)
 # Exported from translatewiki.net
 #
 # Author: Boogie
@@ -9,19 +9,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ReverseUsernameAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:08+0000\n"
-"Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:52+0000\n"
+"Language-Team: Ukrainian <https://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:03+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:27+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-reverseusernameauthentication\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
+#. TRANS: Plugin description.
 msgid ""
 "The Reverse Username Authentication plugin allows for StatusNet to handle "
 "authentication by checking if the provided password is the same as the "
diff --git a/plugins/SQLProfile/SQLProfilePlugin.php b/plugins/SQLProfile/SQLProfilePlugin.php
index c17646f042..20dfb88676 100644
--- a/plugins/SQLProfile/SQLProfilePlugin.php
+++ b/plugins/SQLProfile/SQLProfilePlugin.php
@@ -38,6 +38,7 @@ class SQLProfilePlugin extends Plugin
                             'author' => 'Brion Vibber',
                             'homepage' => 'http://status.net/wiki/Plugin:SQLProfile',
                             'rawdescription' =>
+                            // TRANS: Plugin description.
                             _m('Debug tool to watch for poorly indexed DB queries.'));
 
         return true;
diff --git a/plugins/SQLProfile/locale/SQLProfile.pot b/plugins/SQLProfile/locale/SQLProfile.pot
index 76e531b67b..de696b437a 100644
--- a/plugins/SQLProfile/locale/SQLProfile.pot
+++ b/plugins/SQLProfile/locale/SQLProfile.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,6 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: SQLProfilePlugin.php:41
+#. TRANS: Plugin description.
+#: SQLProfilePlugin.php:42
 msgid "Debug tool to watch for poorly indexed DB queries."
 msgstr ""
diff --git a/plugins/SQLProfile/locale/de/LC_MESSAGES/SQLProfile.po b/plugins/SQLProfile/locale/de/LC_MESSAGES/SQLProfile.po
index 6a7f4dd6b7..0f8bff164c 100644
--- a/plugins/SQLProfile/locale/de/LC_MESSAGES/SQLProfile.po
+++ b/plugins/SQLProfile/locale/de/LC_MESSAGES/SQLProfile.po
@@ -9,17 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SQLProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:24+0000\n"
-"Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:07+0000\n"
+"Language-Team: German <https://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-09 19:01:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:39+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-sqlprofile\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Plugin description.
 msgid "Debug tool to watch for poorly indexed DB queries."
 msgstr "Debug-Werkzeug zur Ãœberwachung von schlecht indexierten DB-Abfragen."
diff --git a/plugins/SQLProfile/locale/es/LC_MESSAGES/SQLProfile.po b/plugins/SQLProfile/locale/es/LC_MESSAGES/SQLProfile.po
new file mode 100644
index 0000000000..64b68717f4
--- /dev/null
+++ b/plugins/SQLProfile/locale/es/LC_MESSAGES/SQLProfile.po
@@ -0,0 +1,25 @@
+# Translation of StatusNet - SQLProfile to Spanish (español)
+# Exported from translatewiki.net
+#
+# Author: Armando-Martin
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - SQLProfile\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:07+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:51:39+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin description.
+msgid "Debug tool to watch for poorly indexed DB queries."
+msgstr ""
+"Herramienta de depuración de errores para peticiones a bases de datos mal "
+"indexadas."
diff --git a/plugins/SQLProfile/locale/fr/LC_MESSAGES/SQLProfile.po b/plugins/SQLProfile/locale/fr/LC_MESSAGES/SQLProfile.po
index fd4addb078..b221c62a22 100644
--- a/plugins/SQLProfile/locale/fr/LC_MESSAGES/SQLProfile.po
+++ b/plugins/SQLProfile/locale/fr/LC_MESSAGES/SQLProfile.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - SQLProfile to French (Français)
+# Translation of StatusNet - SQLProfile to French (français)
 # Exported from translatewiki.net
 #
 # Author: IAlex
@@ -9,18 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SQLProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:25+0000\n"
-"Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:07+0000\n"
+"Language-Team: French <https://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-09 19:01:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:39+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-sqlprofile\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#. TRANS: Plugin description.
 msgid "Debug tool to watch for poorly indexed DB queries."
 msgstr ""
 "Outil de débogage pour surveiller les requêtes de la base de données mal "
diff --git a/plugins/SQLProfile/locale/gl/LC_MESSAGES/SQLProfile.po b/plugins/SQLProfile/locale/gl/LC_MESSAGES/SQLProfile.po
new file mode 100644
index 0000000000..cda7c777c1
--- /dev/null
+++ b/plugins/SQLProfile/locale/gl/LC_MESSAGES/SQLProfile.po
@@ -0,0 +1,28 @@
+# Translation of StatusNet - SQLProfile to Galician (galego)
+# Exported from translatewiki.net
+#
+# Author: Toliño
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - SQLProfile\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:07+0000\n"
+"Language-Team: Galician <https://translatewiki.net/wiki/Portal:gl>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:51:39+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: gl\n"
+"X-Message-Group: #out-statusnet-plugin-sqlprofile\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin description.
+msgid "Debug tool to watch for poorly indexed DB queries."
+msgstr ""
+"Ferramenta de depuración para seguir as pescudas á base de datos mal "
+"indexadas."
diff --git a/plugins/SQLProfile/locale/he/LC_MESSAGES/SQLProfile.po b/plugins/SQLProfile/locale/he/LC_MESSAGES/SQLProfile.po
new file mode 100644
index 0000000000..d55fdcb061
--- /dev/null
+++ b/plugins/SQLProfile/locale/he/LC_MESSAGES/SQLProfile.po
@@ -0,0 +1,26 @@
+# Translation of StatusNet - SQLProfile to Hebrew (עברית)
+# Exported from translatewiki.net
+#
+# Author: Amire80
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - SQLProfile\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:07+0000\n"
+"Language-Team: Hebrew <https://translatewiki.net/wiki/Portal:he>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:51:39+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: he\n"
+"X-Message-Group: #out-statusnet-plugin-sqlprofile\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin description.
+msgid "Debug tool to watch for poorly indexed DB queries."
+msgstr "כלי ניפוי שגי�ות לגילוי ש�ילתות מסד נתוני� ש�ינן ממופתחות טוב."
diff --git a/plugins/SQLProfile/locale/ia/LC_MESSAGES/SQLProfile.po b/plugins/SQLProfile/locale/ia/LC_MESSAGES/SQLProfile.po
index 582e8e3ebe..e0624e89ae 100644
--- a/plugins/SQLProfile/locale/ia/LC_MESSAGES/SQLProfile.po
+++ b/plugins/SQLProfile/locale/ia/LC_MESSAGES/SQLProfile.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - SQLProfile to Interlingua (Interlingua)
+# Translation of StatusNet - SQLProfile to Interlingua (interlingua)
 # Exported from translatewiki.net
 #
 # Author: McDutchie
@@ -9,17 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SQLProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:25+0000\n"
-"Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:08+0000\n"
+"Language-Team: Interlingua <https://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-09 19:01:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:39+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-sqlprofile\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Plugin description.
 msgid "Debug tool to watch for poorly indexed DB queries."
 msgstr "Instrumento pro deteger le consultas mal indexate del base de datos."
diff --git a/plugins/SQLProfile/locale/ja/LC_MESSAGES/SQLProfile.po b/plugins/SQLProfile/locale/ja/LC_MESSAGES/SQLProfile.po
new file mode 100644
index 0000000000..b606466c3d
--- /dev/null
+++ b/plugins/SQLProfile/locale/ja/LC_MESSAGES/SQLProfile.po
@@ -0,0 +1,23 @@
+# Translation of StatusNet - SQLProfile to Japanese (日本語)
+# Exported from translatewiki.net
+#
+# Author: Shirayuki
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - SQLProfile\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:08+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:51:39+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#. TRANS: Plugin description.
+msgid "Debug tool to watch for poorly indexed DB queries."
+msgstr "�完全�インデックス�れ� DB クエリを監視�るデ�ッグ ツール��。"
diff --git a/plugins/SQLProfile/locale/mk/LC_MESSAGES/SQLProfile.po b/plugins/SQLProfile/locale/mk/LC_MESSAGES/SQLProfile.po
index cbb12a5700..06fb790a83 100644
--- a/plugins/SQLProfile/locale/mk/LC_MESSAGES/SQLProfile.po
+++ b/plugins/SQLProfile/locale/mk/LC_MESSAGES/SQLProfile.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - SQLProfile to Macedonian (Македон�ки)
+# Translation of StatusNet - SQLProfile to Macedonian (македон�ки)
 # Exported from translatewiki.net
 #
 # Author: Bjankuloski06
@@ -9,18 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SQLProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:25+0000\n"
-"Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:08+0000\n"
+"Language-Team: Macedonian <https://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-09 19:01:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:39+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-sqlprofile\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
 
+#. TRANS: Plugin description.
 msgid "Debug tool to watch for poorly indexed DB queries."
 msgstr ""
 "�латка за поправање грешки што пронаоѓа лошо индек�ирани барања до базата на "
diff --git a/plugins/SQLProfile/locale/nl/LC_MESSAGES/SQLProfile.po b/plugins/SQLProfile/locale/nl/LC_MESSAGES/SQLProfile.po
index 362de3265e..57ab016347 100644
--- a/plugins/SQLProfile/locale/nl/LC_MESSAGES/SQLProfile.po
+++ b/plugins/SQLProfile/locale/nl/LC_MESSAGES/SQLProfile.po
@@ -9,17 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SQLProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:25+0000\n"
-"Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:08+0000\n"
+"Language-Team: Dutch <https://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-09 19:01:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:39+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-sqlprofile\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Plugin description.
 msgid "Debug tool to watch for poorly indexed DB queries."
 msgstr "Debughulpmiddel om slecht geïndexeerde databasequery's te ontdekken."
diff --git a/plugins/SQLProfile/locale/pt/LC_MESSAGES/SQLProfile.po b/plugins/SQLProfile/locale/pt/LC_MESSAGES/SQLProfile.po
index c667687c92..2f475ca002 100644
--- a/plugins/SQLProfile/locale/pt/LC_MESSAGES/SQLProfile.po
+++ b/plugins/SQLProfile/locale/pt/LC_MESSAGES/SQLProfile.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - SQLProfile to Portuguese (Português)
+# Translation of StatusNet - SQLProfile to Portuguese (português)
 # Exported from translatewiki.net
 #
 # Author: Waldir
@@ -9,17 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SQLProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:25+0000\n"
-"Language-Team: Portuguese <http://translatewiki.net/wiki/Portal:pt>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:08+0000\n"
+"Language-Team: Portuguese <https://translatewiki.net/wiki/Portal:pt>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-09 19:01:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:39+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: pt\n"
 "X-Message-Group: #out-statusnet-plugin-sqlprofile\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Plugin description.
 msgid "Debug tool to watch for poorly indexed DB queries."
 msgstr "Ferramenta de depuração para vigiar consultas à BD mal indexadas."
diff --git a/plugins/SQLProfile/locale/ru/LC_MESSAGES/SQLProfile.po b/plugins/SQLProfile/locale/ru/LC_MESSAGES/SQLProfile.po
index 10d0ba4dd3..344d1ddc17 100644
--- a/plugins/SQLProfile/locale/ru/LC_MESSAGES/SQLProfile.po
+++ b/plugins/SQLProfile/locale/ru/LC_MESSAGES/SQLProfile.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - SQLProfile to Russian (Ру��кий)
+# Translation of StatusNet - SQLProfile to Russian (ру��кий)
 # Exported from translatewiki.net
 #
 # Author: �лек�андр Сигачёв
@@ -9,19 +9,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SQLProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:25+0000\n"
-"Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:08+0000\n"
+"Language-Team: Russian <https://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-09 19:01:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:39+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-sqlprofile\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
+#. TRANS: Plugin description.
 msgid "Debug tool to watch for poorly indexed DB queries."
 msgstr ""
 "Отладочный ин�трумент дл� наблюдени� плохо индек�ированных запро�ов к БД."
diff --git a/plugins/SQLProfile/locale/tl/LC_MESSAGES/SQLProfile.po b/plugins/SQLProfile/locale/tl/LC_MESSAGES/SQLProfile.po
index 479d726368..a01042360c 100644
--- a/plugins/SQLProfile/locale/tl/LC_MESSAGES/SQLProfile.po
+++ b/plugins/SQLProfile/locale/tl/LC_MESSAGES/SQLProfile.po
@@ -9,18 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SQLProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:25+0000\n"
-"Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:08+0000\n"
+"Language-Team: Tagalog <https://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-09 19:01:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:39+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-sqlprofile\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Plugin description.
 msgid "Debug tool to watch for poorly indexed DB queries."
 msgstr ""
 "Kasangkapang pangtanggal ng sira upang makapagtanod ng mga pagtatanong sa "
diff --git a/plugins/SQLProfile/locale/uk/LC_MESSAGES/SQLProfile.po b/plugins/SQLProfile/locale/uk/LC_MESSAGES/SQLProfile.po
index 0c36c75704..f2a3cceb24 100644
--- a/plugins/SQLProfile/locale/uk/LC_MESSAGES/SQLProfile.po
+++ b/plugins/SQLProfile/locale/uk/LC_MESSAGES/SQLProfile.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - SQLProfile to Ukrainian (Україн�ька)
+# Translation of StatusNet - SQLProfile to Ukrainian (україн�ька)
 # Exported from translatewiki.net
 #
 # Author: Boogie
@@ -9,19 +9,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SQLProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:25+0000\n"
-"Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:08+0000\n"
+"Language-Team: Ukrainian <https://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-09 19:01:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:39+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-sqlprofile\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
+#. TRANS: Plugin description.
 msgid "Debug tool to watch for poorly indexed DB queries."
 msgstr ""
 "Ін�трумент правки дл� �по�тереженн� за погано індек�ованими запитами до бази "
diff --git a/plugins/SQLStats/locale/SQLStats.pot b/plugins/SQLStats/locale/SQLStats.pot
index c25b51bfef..182893ca5a 100644
--- a/plugins/SQLStats/locale/SQLStats.pot
+++ b/plugins/SQLStats/locale/SQLStats.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
+"POT-Creation-Date: 2012-06-30 11:07+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"
diff --git a/plugins/SQLStats/locale/de/LC_MESSAGES/SQLStats.po b/plugins/SQLStats/locale/de/LC_MESSAGES/SQLStats.po
index 4572420fc7..c035ec9d3f 100644
--- a/plugins/SQLStats/locale/de/LC_MESSAGES/SQLStats.po
+++ b/plugins/SQLStats/locale/de/LC_MESSAGES/SQLStats.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SQLStats\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:26+0000\n"
-"Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:09+0000\n"
+"Language-Team: German <https://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:21+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:39+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-sqlstats\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/SQLStats/locale/es/LC_MESSAGES/SQLStats.po b/plugins/SQLStats/locale/es/LC_MESSAGES/SQLStats.po
new file mode 100644
index 0000000000..42d41719b4
--- /dev/null
+++ b/plugins/SQLStats/locale/es/LC_MESSAGES/SQLStats.po
@@ -0,0 +1,25 @@
+# Translation of StatusNet - SQLStats to Spanish (español)
+# Exported from translatewiki.net
+#
+# Author: Armando-Martin
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - SQLStats\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:09+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:51:39+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin decription.
+msgid "Debug tool to watch for poorly indexed DB queries."
+msgstr ""
+"Herramienta de depuración de errores para vigilar peticiones a bases de "
+"datos mal indexadas."
diff --git a/plugins/SQLStats/locale/fr/LC_MESSAGES/SQLStats.po b/plugins/SQLStats/locale/fr/LC_MESSAGES/SQLStats.po
index 1271441edb..af3718060d 100644
--- a/plugins/SQLStats/locale/fr/LC_MESSAGES/SQLStats.po
+++ b/plugins/SQLStats/locale/fr/LC_MESSAGES/SQLStats.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - SQLStats to French (Français)
+# Translation of StatusNet - SQLStats to French (français)
 # Exported from translatewiki.net
 #
 # Author: Od1n
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SQLStats\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:26+0000\n"
-"Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:09+0000\n"
+"Language-Team: French <https://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:21+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:39+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-sqlstats\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
diff --git a/plugins/SQLStats/locale/gl/LC_MESSAGES/SQLStats.po b/plugins/SQLStats/locale/gl/LC_MESSAGES/SQLStats.po
new file mode 100644
index 0000000000..29016a6097
--- /dev/null
+++ b/plugins/SQLStats/locale/gl/LC_MESSAGES/SQLStats.po
@@ -0,0 +1,28 @@
+# Translation of StatusNet - SQLStats to Galician (galego)
+# Exported from translatewiki.net
+#
+# Author: Toliño
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - SQLStats\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:09+0000\n"
+"Language-Team: Galician <https://translatewiki.net/wiki/Portal:gl>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:51:39+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: gl\n"
+"X-Message-Group: #out-statusnet-plugin-sqlstats\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin decription.
+msgid "Debug tool to watch for poorly indexed DB queries."
+msgstr ""
+"Ferramenta de depuración para seguir as pescudas á base de datos mal "
+"indexadas."
diff --git a/plugins/SQLStats/locale/he/LC_MESSAGES/SQLStats.po b/plugins/SQLStats/locale/he/LC_MESSAGES/SQLStats.po
new file mode 100644
index 0000000000..a46e1bb606
--- /dev/null
+++ b/plugins/SQLStats/locale/he/LC_MESSAGES/SQLStats.po
@@ -0,0 +1,26 @@
+# Translation of StatusNet - SQLStats to Hebrew (עברית)
+# Exported from translatewiki.net
+#
+# Author: Amire80
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - SQLStats\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:09+0000\n"
+"Language-Team: Hebrew <https://translatewiki.net/wiki/Portal:he>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:51:39+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: he\n"
+"X-Message-Group: #out-statusnet-plugin-sqlstats\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin decription.
+msgid "Debug tool to watch for poorly indexed DB queries."
+msgstr "כלי ניפוי שגי�ות לגילוי ש�ילתות מסד נתוני� ש�ינן ממופתחות טוב."
diff --git a/plugins/SQLStats/locale/ia/LC_MESSAGES/SQLStats.po b/plugins/SQLStats/locale/ia/LC_MESSAGES/SQLStats.po
index 58b2dee891..581d731c4e 100644
--- a/plugins/SQLStats/locale/ia/LC_MESSAGES/SQLStats.po
+++ b/plugins/SQLStats/locale/ia/LC_MESSAGES/SQLStats.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - SQLStats to Interlingua (Interlingua)
+# Translation of StatusNet - SQLStats to Interlingua (interlingua)
 # Exported from translatewiki.net
 #
 # Author: McDutchie
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SQLStats\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:26+0000\n"
-"Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:09+0000\n"
+"Language-Team: Interlingua <https://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:21+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:39+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-sqlstats\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/SQLStats/locale/ja/LC_MESSAGES/SQLStats.po b/plugins/SQLStats/locale/ja/LC_MESSAGES/SQLStats.po
new file mode 100644
index 0000000000..bb4c118244
--- /dev/null
+++ b/plugins/SQLStats/locale/ja/LC_MESSAGES/SQLStats.po
@@ -0,0 +1,23 @@
+# Translation of StatusNet - SQLStats to Japanese (日本語)
+# Exported from translatewiki.net
+#
+# Author: Shirayuki
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - SQLStats\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:09+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:51:39+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#. TRANS: Plugin decription.
+msgid "Debug tool to watch for poorly indexed DB queries."
+msgstr "�完全�インデックス�れ� DB クエリを監視�るデ�ッグ ツール��。"
diff --git a/plugins/SQLStats/locale/ksh/LC_MESSAGES/SQLStats.po b/plugins/SQLStats/locale/ksh/LC_MESSAGES/SQLStats.po
new file mode 100644
index 0000000000..b408dd817e
--- /dev/null
+++ b/plugins/SQLStats/locale/ksh/LC_MESSAGES/SQLStats.po
@@ -0,0 +1,28 @@
+# Translation of StatusNet - SQLStats to Colognian (Ripoarisch)
+# Exported from translatewiki.net
+#
+# Author: Purodha
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - SQLStats\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:09+0000\n"
+"Language-Team: Colognian <https://translatewiki.net/wiki/Portal:ksh>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:51:39+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: ksh\n"
+"X-Message-Group: #out-statusnet-plugin-sqlstats\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin decription.
+msgid "Debug tool to watch for poorly indexed DB queries."
+msgstr ""
+"E Wärkzüsch, öm düüre Aanfroore aan de Daatebangk met schlääsch opjesaz "
+"Schlößelle ze fenge."
diff --git a/plugins/SQLStats/locale/mk/LC_MESSAGES/SQLStats.po b/plugins/SQLStats/locale/mk/LC_MESSAGES/SQLStats.po
index 9ed0cf44bd..418e0c9c52 100644
--- a/plugins/SQLStats/locale/mk/LC_MESSAGES/SQLStats.po
+++ b/plugins/SQLStats/locale/mk/LC_MESSAGES/SQLStats.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - SQLStats to Macedonian (Македон�ки)
+# Translation of StatusNet - SQLStats to Macedonian (македон�ки)
 # Exported from translatewiki.net
 #
 # Author: Bjankuloski06
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SQLStats\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:26+0000\n"
-"Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:09+0000\n"
+"Language-Team: Macedonian <https://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:21+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:39+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-sqlstats\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
diff --git a/plugins/SQLStats/locale/nl/LC_MESSAGES/SQLStats.po b/plugins/SQLStats/locale/nl/LC_MESSAGES/SQLStats.po
index c36d3bdfdd..1ae8bc0322 100644
--- a/plugins/SQLStats/locale/nl/LC_MESSAGES/SQLStats.po
+++ b/plugins/SQLStats/locale/nl/LC_MESSAGES/SQLStats.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SQLStats\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:26+0000\n"
-"Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:10+0000\n"
+"Language-Team: Dutch <https://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:21+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:39+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-sqlstats\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/SQLStats/locale/tl/LC_MESSAGES/SQLStats.po b/plugins/SQLStats/locale/tl/LC_MESSAGES/SQLStats.po
index ccccf59a9e..0532ebc2d2 100644
--- a/plugins/SQLStats/locale/tl/LC_MESSAGES/SQLStats.po
+++ b/plugins/SQLStats/locale/tl/LC_MESSAGES/SQLStats.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SQLStats\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:26+0000\n"
-"Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:10+0000\n"
+"Language-Team: Tagalog <https://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:21+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:39+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-sqlstats\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/SQLStats/locale/uk/LC_MESSAGES/SQLStats.po b/plugins/SQLStats/locale/uk/LC_MESSAGES/SQLStats.po
index 0a17c80303..35ad98ba0d 100644
--- a/plugins/SQLStats/locale/uk/LC_MESSAGES/SQLStats.po
+++ b/plugins/SQLStats/locale/uk/LC_MESSAGES/SQLStats.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - SQLStats to Ukrainian (Україн�ька)
+# Translation of StatusNet - SQLStats to Ukrainian (україн�ька)
 # Exported from translatewiki.net
 #
 # Author: Boogie
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SQLStats\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:26+0000\n"
-"Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:10+0000\n"
+"Language-Team: Ukrainian <https://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:21+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:39+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-sqlstats\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
diff --git a/plugins/Sample/SamplePlugin.php b/plugins/Sample/SamplePlugin.php
index a0d1140f37..5c34d10bd1 100644
--- a/plugins/Sample/SamplePlugin.php
+++ b/plugins/Sample/SamplePlugin.php
@@ -265,9 +265,11 @@ class SamplePlugin extends Plugin
     {
         // common_local_url() gets the correct URL for the action name
         // we provide
-
         $action->menuItem(common_local_url('hello'),
-                          _m('Hello'), _m('A warm greeting'), false, 'nav_hello');
+                          // TRANS: Menu item in sample plugin.
+                          _m('Hello'),
+                          // TRANS: Menu item title in sample plugin.
+                          _m('A warm greeting'), false, 'nav_hello');
         return true;
     }
 
@@ -278,6 +280,7 @@ class SamplePlugin extends Plugin
                             'author' => 'Brion Vibber, Evan Prodromou',
                             'homepage' => 'http://status.net/wiki/Plugin:Sample',
                             'rawdescription' =>
+                          // TRANS: Plugin description.
                             _m('A sample plugin to show basics of development for new hackers.'));
         return true;
     }
diff --git a/plugins/Sample/User_greeting_count.php b/plugins/Sample/User_greeting_count.php
index 38d68c91ed..8128343d81 100644
--- a/plugins/Sample/User_greeting_count.php
+++ b/plugins/Sample/User_greeting_count.php
@@ -52,7 +52,6 @@ require_once INSTALLDIR . '/classes/Memcached_DataObject.php';
  *
  * @see      DB_DataObject
  */
-
 class User_greeting_count extends Memcached_DataObject
 {
     public $__table = 'user_greeting_count'; // table name
@@ -68,7 +67,6 @@ class User_greeting_count extends Memcached_DataObject
      * @param mixed  $v Value to lookup
      *
      * @return User_greeting_count object found, or null for no hits
-     *
      */
     function staticGet($k, $v=null)
     {
@@ -150,7 +148,6 @@ class User_greeting_count extends Memcached_DataObject
         $gc = User_greeting_count::staticGet('user_id', $user_id);
 
         if (empty($gc)) {
-
             $gc = new User_greeting_count();
 
             $gc->user_id        = $user_id;
@@ -161,7 +158,7 @@ class User_greeting_count extends Memcached_DataObject
             if (!$result) {
                 // TRANS: Exception thrown when the user greeting count could not be saved in the database.
                 // TRANS: %d is a user ID (number).
-                throw Exception(sprintf(_m("Could not save new greeting count for %d."),
+                throw Exception(sprintf(_m('Could not save new greeting count for %d.'),
                                         $user_id));
             }
         } else {
@@ -174,7 +171,7 @@ class User_greeting_count extends Memcached_DataObject
             if (!$result) {
                 // TRANS: Exception thrown when the user greeting count could not be saved in the database.
                 // TRANS: %d is a user ID (number).
-                throw Exception(sprintf(_m("Could not increment greeting count for %d."),
+                throw Exception(sprintf(_m('Could not increment greeting count for %d.'),
                                         $user_id));
             }
         }
diff --git a/plugins/Sample/hello.php b/plugins/Sample/hello.php
index a793ac6de2..da5682b332 100644
--- a/plugins/Sample/hello.php
+++ b/plugins/Sample/hello.php
@@ -108,8 +108,10 @@ class HelloAction extends Action
     function title()
     {
         if (empty($this->user)) {
+            // TRANS: Page title for sample plugin.
             return _m('Hello');
         } else {
+            // TRANS: Page title for sample plugin. %s is a user nickname.
             return sprintf(_m('Hello, %s!'), $this->user->nickname);
         }
     }
@@ -130,11 +132,15 @@ class HelloAction extends Action
     {
         if (empty($this->user)) {
             $this->element('p', array('class' => 'greeting'),
+                           // TRANS: Message in sample plugin.
                            _m('Hello, stranger!'));
         } else {
             $this->element('p', array('class' => 'greeting'),
+                           // TRANS: Message in sample plugin. %s is a user nickname.
                            sprintf(_m('Hello, %s'), $this->user->nickname));
             $this->element('p', array('class' => 'greeting_count'),
+                           // TRANS: Message in sample plugin.
+                           // TRANS: %d is the number of times a user is greeted.
                            sprintf(_m('I have greeted you %d time.',
                                       'I have greeted you %d times.',
                                       $this->gc->greeting_count),
diff --git a/plugins/Sample/locale/Sample.pot b/plugins/Sample/locale/Sample.pot
index bd1f3c8dca..a8bf64240a 100644
--- a/plugins/Sample/locale/Sample.pot
+++ b/plugins/Sample/locale/Sample.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
+"POT-Creation-Date: 2012-06-30 11:07+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,49 +17,58 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: hello.php:111 SamplePlugin.php:270
+#. TRANS: Page title for sample plugin.
+#. TRANS: Menu item in sample plugin.
+#: hello.php:112 SamplePlugin.php:270
 msgid "Hello"
 msgstr ""
 
-#: hello.php:113
+#. TRANS: Page title for sample plugin. %s is a user nickname.
+#: hello.php:115
 #, php-format
 msgid "Hello, %s!"
 msgstr ""
 
-#: hello.php:133
+#. TRANS: Message in sample plugin.
+#: hello.php:136
 msgid "Hello, stranger!"
 msgstr ""
 
-#: hello.php:136
+#. TRANS: Message in sample plugin. %s is a user nickname.
+#: hello.php:140
 #, php-format
 msgid "Hello, %s"
 msgstr ""
 
-#: hello.php:138
+#. TRANS: Message in sample plugin.
+#. TRANS: %d is the number of times a user is greeted.
+#: hello.php:144
 #, php-format
 msgid "I have greeted you %d time."
 msgid_plural "I have greeted you %d times."
 msgstr[0] ""
 msgstr[1] ""
 
-#: SamplePlugin.php:270
+#. TRANS: Menu item title in sample plugin.
+#: SamplePlugin.php:272
 msgid "A warm greeting"
 msgstr ""
 
-#: SamplePlugin.php:281
+#. TRANS: Plugin description.
+#: SamplePlugin.php:284
 msgid "A sample plugin to show basics of development for new hackers."
 msgstr ""
 
 #. TRANS: Exception thrown when the user greeting count could not be saved in the database.
 #. TRANS: %d is a user ID (number).
-#: User_greeting_count.php:164
+#: User_greeting_count.php:161
 #, php-format
 msgid "Could not save new greeting count for %d."
 msgstr ""
 
 #. TRANS: Exception thrown when the user greeting count could not be saved in the database.
 #. TRANS: %d is a user ID (number).
-#: User_greeting_count.php:177
+#: User_greeting_count.php:174
 #, php-format
 msgid "Could not increment greeting count for %d."
 msgstr ""
diff --git a/plugins/Sample/locale/af/LC_MESSAGES/Sample.po b/plugins/Sample/locale/af/LC_MESSAGES/Sample.po
new file mode 100644
index 0000000000..ef26e04ded
--- /dev/null
+++ b/plugins/Sample/locale/af/LC_MESSAGES/Sample.po
@@ -0,0 +1,69 @@
+# Translation of StatusNet - Sample to Afrikaans (Afrikaans)
+# Exported from translatewiki.net
+#
+# Author: Naudefj
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Sample\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:53+0000\n"
+"Language-Team: Afrikaans <https://translatewiki.net/wiki/Portal:af>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-12-03 13:49:08+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: af\n"
+"X-Message-Group: #out-statusnet-plugin-sample\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Page title for sample plugin.
+#. TRANS: Menu item in sample plugin.
+msgid "Hello"
+msgstr "Hallo"
+
+#. TRANS: Page title for sample plugin. %s is a user nickname.
+#, php-format
+msgid "Hello, %s!"
+msgstr "Hallo, %s!"
+
+#. TRANS: Message in sample plugin.
+msgid "Hello, stranger!"
+msgstr "Hallo vreemdeling!"
+
+#. TRANS: Message in sample plugin. %s is a user nickname.
+#, php-format
+msgid "Hello, %s"
+msgstr "Hallo, %s"
+
+#. TRANS: Message in sample plugin.
+#. TRANS: %d is the number of times a user is greeted.
+#, php-format
+msgid "I have greeted you %d time."
+msgid_plural "I have greeted you %d times."
+msgstr[0] ""
+msgstr[1] ""
+
+#. TRANS: Menu item title in sample plugin.
+msgid "A warm greeting"
+msgstr ""
+
+#. TRANS: Plugin description.
+msgid "A sample plugin to show basics of development for new hackers."
+msgstr ""
+
+#. TRANS: Exception thrown when the user greeting count could not be saved in the database.
+#. TRANS: %d is a user ID (number).
+#, php-format
+msgid "Could not save new greeting count for %d."
+msgstr ""
+
+#. TRANS: Exception thrown when the user greeting count could not be saved in the database.
+#. TRANS: %d is a user ID (number).
+#, php-format
+msgid "Could not increment greeting count for %d."
+msgstr ""
diff --git a/plugins/Sample/locale/ar/LC_MESSAGES/Sample.po b/plugins/Sample/locale/ar/LC_MESSAGES/Sample.po
index f2b9883855..9853aeb58e 100644
--- a/plugins/Sample/locale/ar/LC_MESSAGES/Sample.po
+++ b/plugins/Sample/locale/ar/LC_MESSAGES/Sample.po
@@ -9,34 +9,41 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Sample\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:11+0000\n"
-"Language-Team: Arabic <http://translatewiki.net/wiki/Portal:ar>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:54+0000\n"
+"Language-Team: Arabic <https://translatewiki.net/wiki/Portal:ar>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:20+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-12-03 13:49:08+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ar\n"
 "X-Message-Group: #out-statusnet-plugin-sample\n"
 "Plural-Forms: nplurals=6; plural=(n == 0) ? 0 : ( (n == 1) ? 1 : ( (n == "
 "2) ? 2 : ( (n%100 >= 3 && n%100 <= 10) ? 3 : ( (n%100 >= 11 && n%100 <= "
 "99) ? 4 : 5 ) ) ) );\n"
 
+#. TRANS: Page title for sample plugin.
+#. TRANS: Menu item in sample plugin.
 msgid "Hello"
 msgstr "مرحبا"
 
+#. TRANS: Page title for sample plugin. %s is a user nickname.
 #, php-format
 msgid "Hello, %s!"
 msgstr "مرحبا يا %s!"
 
+#. TRANS: Message in sample plugin.
 msgid "Hello, stranger!"
 msgstr "مرحبا أيها الغريب!"
 
+#. TRANS: Message in sample plugin. %s is a user nickname.
 #, php-format
 msgid "Hello, %s"
 msgstr "مرحبا يا %s"
 
+#. TRANS: Message in sample plugin.
+#. TRANS: %d is the number of times a user is greeted.
 #, php-format
 msgid "I have greeted you %d time."
 msgid_plural "I have greeted you %d times."
@@ -47,9 +54,11 @@ msgstr[3] ""
 msgstr[4] ""
 msgstr[5] ""
 
+#. TRANS: Menu item title in sample plugin.
 msgid "A warm greeting"
 msgstr "تحية حارة"
 
+#. TRANS: Plugin description.
 msgid "A sample plugin to show basics of development for new hackers."
 msgstr ""
 
diff --git a/plugins/Sample/locale/br/LC_MESSAGES/Sample.po b/plugins/Sample/locale/br/LC_MESSAGES/Sample.po
index 1d74d9e3bd..69f213c2c3 100644
--- a/plugins/Sample/locale/br/LC_MESSAGES/Sample.po
+++ b/plugins/Sample/locale/br/LC_MESSAGES/Sample.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Sample to Breton (Brezhoneg)
+# Translation of StatusNet - Sample to Breton (brezhoneg)
 # Exported from translatewiki.net
 #
 # Author: Y-M D
@@ -9,41 +9,50 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Sample\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:11+0000\n"
-"Language-Team: Breton <http://translatewiki.net/wiki/Portal:br>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:54+0000\n"
+"Language-Team: Breton <https://translatewiki.net/wiki/Portal:br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:20+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-12-03 13:49:08+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-sample\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#. TRANS: Page title for sample plugin.
+#. TRANS: Menu item in sample plugin.
 msgid "Hello"
 msgstr "Demat"
 
+#. TRANS: Page title for sample plugin. %s is a user nickname.
 #, php-format
 msgid "Hello, %s!"
 msgstr "Demat, %s !"
 
+#. TRANS: Message in sample plugin.
 msgid "Hello, stranger!"
 msgstr "Demat, estrañjour!"
 
+#. TRANS: Message in sample plugin. %s is a user nickname.
 #, php-format
 msgid "Hello, %s"
 msgstr "Demat, %s"
 
+#. TRANS: Message in sample plugin.
+#. TRANS: %d is the number of times a user is greeted.
 #, php-format
 msgid "I have greeted you %d time."
 msgid_plural "I have greeted you %d times."
 msgstr[0] "ur"
 msgstr[1] "%d"
 
+#. TRANS: Menu item title in sample plugin.
 msgid "A warm greeting"
 msgstr "Un degemer tomm"
 
+#. TRANS: Plugin description.
 msgid "A sample plugin to show basics of development for new hackers."
 msgstr ""
 "Ur skouer a lugant evit diskouez an diazezoù diorren evit ar c'hoderien "
diff --git a/plugins/Sample/locale/ca/LC_MESSAGES/Sample.po b/plugins/Sample/locale/ca/LC_MESSAGES/Sample.po
index 92848f4a18..f577c06194 100644
--- a/plugins/Sample/locale/ca/LC_MESSAGES/Sample.po
+++ b/plugins/Sample/locale/ca/LC_MESSAGES/Sample.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Sample to Catalan (Català)
+# Translation of StatusNet - Sample to Catalan (català)
 # Exported from translatewiki.net
 #
 # Author: Toniher
@@ -9,41 +9,50 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Sample\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:11+0000\n"
-"Language-Team: Catalan <http://translatewiki.net/wiki/Portal:ca>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:54+0000\n"
+"Language-Team: Catalan <https://translatewiki.net/wiki/Portal:ca>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:20+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-12-03 13:49:08+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ca\n"
 "X-Message-Group: #out-statusnet-plugin-sample\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Page title for sample plugin.
+#. TRANS: Menu item in sample plugin.
 msgid "Hello"
 msgstr "Hola"
 
+#. TRANS: Page title for sample plugin. %s is a user nickname.
 #, php-format
 msgid "Hello, %s!"
 msgstr "Hola, %s"
 
+#. TRANS: Message in sample plugin.
 msgid "Hello, stranger!"
 msgstr "Hola, foraster!"
 
+#. TRANS: Message in sample plugin. %s is a user nickname.
 #, php-format
 msgid "Hello, %s"
 msgstr "Hola, %s"
 
+#. TRANS: Message in sample plugin.
+#. TRANS: %d is the number of times a user is greeted.
 #, php-format
 msgid "I have greeted you %d time."
 msgid_plural "I have greeted you %d times."
 msgstr[0] "Us he saludat %d vegada."
 msgstr[1] "Us he saludat %d vegades."
 
+#. TRANS: Menu item title in sample plugin.
 msgid "A warm greeting"
 msgstr "Una salutació cordial"
 
+#. TRANS: Plugin description.
 msgid "A sample plugin to show basics of development for new hackers."
 msgstr ""
 
diff --git a/plugins/Sample/locale/de/LC_MESSAGES/Sample.po b/plugins/Sample/locale/de/LC_MESSAGES/Sample.po
index c3f081138d..ff5642da73 100644
--- a/plugins/Sample/locale/de/LC_MESSAGES/Sample.po
+++ b/plugins/Sample/locale/de/LC_MESSAGES/Sample.po
@@ -9,41 +9,50 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Sample\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:11+0000\n"
-"Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:54+0000\n"
+"Language-Team: German <https://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:20+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-12-03 13:49:08+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-sample\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Page title for sample plugin.
+#. TRANS: Menu item in sample plugin.
 msgid "Hello"
 msgstr "Hallo"
 
+#. TRANS: Page title for sample plugin. %s is a user nickname.
 #, php-format
 msgid "Hello, %s!"
 msgstr "Hallo %s!"
 
+#. TRANS: Message in sample plugin.
 msgid "Hello, stranger!"
 msgstr "Hallo Fremder!"
 
+#. TRANS: Message in sample plugin. %s is a user nickname.
 #, php-format
 msgid "Hello, %s"
 msgstr "Hallo %s"
 
+#. TRANS: Message in sample plugin.
+#. TRANS: %d is the number of times a user is greeted.
 #, php-format
 msgid "I have greeted you %d time."
 msgid_plural "I have greeted you %d times."
 msgstr[0] "Ich habe dich einmal begrüßt. "
 msgstr[1] "Ich habe dich %d-mal begrüßt. "
 
+#. TRANS: Menu item title in sample plugin.
 msgid "A warm greeting"
 msgstr "Ein herzlicher Gruß"
 
+#. TRANS: Plugin description.
 msgid "A sample plugin to show basics of development for new hackers."
 msgstr "Ein Beispiel-Plugin, um die Entwicklungsbasis neuen Hackern zu zeigen."
 
diff --git a/plugins/Sample/locale/es/LC_MESSAGES/Sample.po b/plugins/Sample/locale/es/LC_MESSAGES/Sample.po
new file mode 100644
index 0000000000..740e4c178a
--- /dev/null
+++ b/plugins/Sample/locale/es/LC_MESSAGES/Sample.po
@@ -0,0 +1,69 @@
+# Translation of StatusNet - Sample to Spanish (español)
+# Exported from translatewiki.net
+#
+# Author: Armando-Martin
+# Author: Peter17
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Sample\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:54+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-12-03 13:49:08+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Page title for sample plugin.
+#. TRANS: Menu item in sample plugin.
+msgid "Hello"
+msgstr "Hola"
+
+#. TRANS: Page title for sample plugin. %s is a user nickname.
+#, php-format
+msgid "Hello, %s!"
+msgstr "¡ Hola,  %s !"
+
+#. TRANS: Message in sample plugin.
+msgid "Hello, stranger!"
+msgstr "¡Hola, extraño!"
+
+#. TRANS: Message in sample plugin. %s is a user nickname.
+#, php-format
+msgid "Hello, %s"
+msgstr "Hola, %s"
+
+#. TRANS: Message in sample plugin.
+#. TRANS: %d is the number of times a user is greeted.
+#, php-format
+msgid "I have greeted you %d time."
+msgid_plural "I have greeted you %d times."
+msgstr[0] "%d vez."
+msgstr[1] "%d veces."
+
+#. TRANS: Menu item title in sample plugin.
+msgid "A warm greeting"
+msgstr "Un cordial saludo"
+
+#. TRANS: Plugin description.
+msgid "A sample plugin to show basics of development for new hackers."
+msgstr ""
+"Un complemento (plugin) de ejemplo para mostrar los principios básicos de "
+"desarrollo a los nuevos programadores."
+
+#. TRANS: Exception thrown when the user greeting count could not be saved in the database.
+#. TRANS: %d is a user ID (number).
+#, php-format
+msgid "Could not save new greeting count for %d."
+msgstr "No se pudo guardar el número de saludos enviados a %d."
+
+#. TRANS: Exception thrown when the user greeting count could not be saved in the database.
+#. TRANS: %d is a user ID (number).
+#, php-format
+msgid "Could not increment greeting count for %d."
+msgstr "No se pudo incrementar el número de saludos enviados a %d."
diff --git a/plugins/Sample/locale/eu/LC_MESSAGES/Sample.po b/plugins/Sample/locale/eu/LC_MESSAGES/Sample.po
new file mode 100644
index 0000000000..d341773671
--- /dev/null
+++ b/plugins/Sample/locale/eu/LC_MESSAGES/Sample.po
@@ -0,0 +1,66 @@
+# Translation of StatusNet - Sample to Basque (euskara)
+# Exported from translatewiki.net
+#
+# Author: Artsuaga
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Sample\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:54+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-12-03 13:49:08+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Page title for sample plugin.
+#. TRANS: Menu item in sample plugin.
+msgid "Hello"
+msgstr "Kaixo"
+
+#. TRANS: Page title for sample plugin. %s is a user nickname.
+#, php-format
+msgid "Hello, %s!"
+msgstr ""
+
+#. TRANS: Message in sample plugin.
+msgid "Hello, stranger!"
+msgstr ""
+
+#. TRANS: Message in sample plugin. %s is a user nickname.
+#, php-format
+msgid "Hello, %s"
+msgstr ""
+
+#. TRANS: Message in sample plugin.
+#. TRANS: %d is the number of times a user is greeted.
+#, fuzzy, php-format
+msgid "I have greeted you %d time."
+msgid_plural "I have greeted you %d times."
+msgstr[0] "Ekitaldi data/ordua"
+msgstr[1] ""
+
+#. TRANS: Menu item title in sample plugin.
+msgid "A warm greeting"
+msgstr ""
+
+#. TRANS: Plugin description.
+msgid "A sample plugin to show basics of development for new hackers."
+msgstr "Frogako plugin bat, hacker berriei garapen oinarriak erakusteko."
+
+#. TRANS: Exception thrown when the user greeting count could not be saved in the database.
+#. TRANS: %d is a user ID (number).
+#, php-format
+msgid "Could not save new greeting count for %d."
+msgstr "Ezin izan da %d(e)ri bidalitako agur kopurua gorde."
+
+#. TRANS: Exception thrown when the user greeting count could not be saved in the database.
+#. TRANS: %d is a user ID (number).
+#, php-format
+msgid "Could not increment greeting count for %d."
+msgstr "Ezin izan da gehitu %d(r)i bidalitako agur kopurua."
diff --git a/plugins/Sample/locale/fr/LC_MESSAGES/Sample.po b/plugins/Sample/locale/fr/LC_MESSAGES/Sample.po
index c6b032da73..e98eb3f8ca 100644
--- a/plugins/Sample/locale/fr/LC_MESSAGES/Sample.po
+++ b/plugins/Sample/locale/fr/LC_MESSAGES/Sample.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Sample to French (Français)
+# Translation of StatusNet - Sample to French (français)
 # Exported from translatewiki.net
 #
 # Author: Verdy p
@@ -9,41 +9,50 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Sample\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:11+0000\n"
-"Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:54+0000\n"
+"Language-Team: French <https://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:20+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-12-03 13:49:08+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-sample\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#. TRANS: Page title for sample plugin.
+#. TRANS: Menu item in sample plugin.
 msgid "Hello"
 msgstr "Bonjour"
 
+#. TRANS: Page title for sample plugin. %s is a user nickname.
 #, php-format
 msgid "Hello, %s!"
 msgstr "Bonjour, %s !"
 
+#. TRANS: Message in sample plugin.
 msgid "Hello, stranger!"
 msgstr "Bonjour, étranger !"
 
+#. TRANS: Message in sample plugin. %s is a user nickname.
 #, php-format
 msgid "Hello, %s"
 msgstr "Bonjour, %s"
 
+#. TRANS: Message in sample plugin.
+#. TRANS: %d is the number of times a user is greeted.
 #, php-format
 msgid "I have greeted you %d time."
 msgid_plural "I have greeted you %d times."
 msgstr[0] "une"
 msgstr[1] "%d"
 
+#. TRANS: Menu item title in sample plugin.
 msgid "A warm greeting"
 msgstr "Un accueil chaleureux"
 
+#. TRANS: Plugin description.
 msgid "A sample plugin to show basics of development for new hackers."
 msgstr ""
 "Un exemple de greffon pour montrer les bases de développement pour les "
diff --git a/plugins/Sample/locale/gl/LC_MESSAGES/Sample.po b/plugins/Sample/locale/gl/LC_MESSAGES/Sample.po
index 4e7b02053d..11f6e0940d 100644
--- a/plugins/Sample/locale/gl/LC_MESSAGES/Sample.po
+++ b/plugins/Sample/locale/gl/LC_MESSAGES/Sample.po
@@ -1,5 +1,5 @@
-# Translation of StatusNet - Sample to Galician (Galego)
-# Expored from translatewiki.net
+# Translation of StatusNet - Sample to Galician (galego)
+# Exported from translatewiki.net
 #
 # Author: Toliño
 # --
@@ -9,61 +9,63 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Sample\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:53+0000\n"
-"Language-Team: Galician <http://translatewiki.net/wiki/Portal:gl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:54+0000\n"
+"Language-Team: Galician <https://translatewiki.net/wiki/Portal:gl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2010-11-30 20:43:55+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-12-03 13:49:08+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: gl\n"
 "X-Message-Group: #out-statusnet-plugin-sample\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#. TRANS: Exception thrown when the user greeting count could not be saved in the database.
-#. TRANS: %d is a user ID (number).
-#: User_greeting_count.php:164
-#, php-format
-msgid "Could not save new greeting count for %d."
-msgstr ""
-
-#. TRANS: Exception thrown when the user greeting count could not be saved in the database.
-#. TRANS: %d is a user ID (number).
-#: User_greeting_count.php:177
-#, php-format
-msgid "Could not increment greeting count for %d."
-msgstr ""
-
-#: SamplePlugin.php:259 hello.php:111
+#. TRANS: Page title for sample plugin.
+#. TRANS: Menu item in sample plugin.
 msgid "Hello"
 msgstr "Ola"
 
-#: SamplePlugin.php:259
-msgid "A warm greeting"
-msgstr ""
-
-#: SamplePlugin.php:270
-msgid "A sample plugin to show basics of development for new hackers."
-msgstr ""
-
-#: hello.php:113
+#. TRANS: Page title for sample plugin. %s is a user nickname.
 #, php-format
 msgid "Hello, %s!"
-msgstr ""
+msgstr "Ola, %s!"
 
-#: hello.php:133
+#. TRANS: Message in sample plugin.
 msgid "Hello, stranger!"
-msgstr ""
+msgstr "Ola, estraño!"
 
-#: hello.php:136
+#. TRANS: Message in sample plugin. %s is a user nickname.
 #, php-format
 msgid "Hello, %s"
 msgstr "Ola, %s"
 
-#: hello.php:138
+#. TRANS: Message in sample plugin.
+#. TRANS: %d is the number of times a user is greeted.
 #, php-format
 msgid "I have greeted you %d time."
 msgid_plural "I have greeted you %d times."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Saudeino %d vez."
+msgstr[1] "Saudeino %d veces."
+
+#. TRANS: Menu item title in sample plugin.
+msgid "A warm greeting"
+msgstr "Un cordial saúdo"
+
+#. TRANS: Plugin description.
+msgid "A sample plugin to show basics of development for new hackers."
+msgstr ""
+"Un complemento de exemplo para mostrar os principios básicos de "
+"desenvolvemento aos novos programadores."
+
+#. TRANS: Exception thrown when the user greeting count could not be saved in the database.
+#. TRANS: %d is a user ID (number).
+#, php-format
+msgid "Could not save new greeting count for %d."
+msgstr "Non se puido gardar o número de saúdos enviados a %d."
+
+#. TRANS: Exception thrown when the user greeting count could not be saved in the database.
+#. TRANS: %d is a user ID (number).
+#, php-format
+msgid "Could not increment greeting count for %d."
+msgstr "Non se puido incrementar o número de saúdos enviados a %d."
diff --git a/plugins/Sample/locale/ia/LC_MESSAGES/Sample.po b/plugins/Sample/locale/ia/LC_MESSAGES/Sample.po
index c282f33fa3..3821a8bf78 100644
--- a/plugins/Sample/locale/ia/LC_MESSAGES/Sample.po
+++ b/plugins/Sample/locale/ia/LC_MESSAGES/Sample.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Sample to Interlingua (Interlingua)
+# Translation of StatusNet - Sample to Interlingua (interlingua)
 # Exported from translatewiki.net
 #
 # Author: McDutchie
@@ -9,41 +9,50 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Sample\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:11+0000\n"
-"Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:54+0000\n"
+"Language-Team: Interlingua <https://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:20+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-12-03 13:49:08+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-sample\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Page title for sample plugin.
+#. TRANS: Menu item in sample plugin.
 msgid "Hello"
 msgstr "Salute"
 
+#. TRANS: Page title for sample plugin. %s is a user nickname.
 #, php-format
 msgid "Hello, %s!"
 msgstr "Salute %s!"
 
+#. TRANS: Message in sample plugin.
 msgid "Hello, stranger!"
 msgstr "Salute estraniero!"
 
+#. TRANS: Message in sample plugin. %s is a user nickname.
 #, php-format
 msgid "Hello, %s"
 msgstr "Salute %s"
 
+#. TRANS: Message in sample plugin.
+#. TRANS: %d is the number of times a user is greeted.
 #, php-format
 msgid "I have greeted you %d time."
 msgid_plural "I have greeted you %d times."
 msgstr[0] "Io te ha salutate %d vice."
 msgstr[1] "Io te ha salutate %d vices."
 
+#. TRANS: Menu item title in sample plugin.
 msgid "A warm greeting"
 msgstr "Un calide salutation"
 
+#. TRANS: Plugin description.
 msgid "A sample plugin to show basics of development for new hackers."
 msgstr ""
 "Un plug-in de exemplo pro demonstrar le principios de disveloppamento pro "
diff --git a/plugins/Sample/locale/lb/LC_MESSAGES/Sample.po b/plugins/Sample/locale/lb/LC_MESSAGES/Sample.po
index 6f4bb899ec..825d20ca67 100644
--- a/plugins/Sample/locale/lb/LC_MESSAGES/Sample.po
+++ b/plugins/Sample/locale/lb/LC_MESSAGES/Sample.po
@@ -9,41 +9,50 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Sample\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:11+0000\n"
-"Language-Team: Luxembourgish <http://translatewiki.net/wiki/Portal:lb>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:55+0000\n"
+"Language-Team: Luxembourgish <https://translatewiki.net/wiki/Portal:lb>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:20+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-12-03 13:49:08+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: lb\n"
 "X-Message-Group: #out-statusnet-plugin-sample\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Page title for sample plugin.
+#. TRANS: Menu item in sample plugin.
 msgid "Hello"
 msgstr "Salut"
 
+#. TRANS: Page title for sample plugin. %s is a user nickname.
 #, php-format
 msgid "Hello, %s!"
 msgstr "Salut %s!"
 
+#. TRANS: Message in sample plugin.
 msgid "Hello, stranger!"
 msgstr ""
 
+#. TRANS: Message in sample plugin. %s is a user nickname.
 #, php-format
 msgid "Hello, %s"
 msgstr "Salut, %s"
 
+#. TRANS: Message in sample plugin.
+#. TRANS: %d is the number of times a user is greeted.
 #, php-format
 msgid "I have greeted you %d time."
 msgid_plural "I have greeted you %d times."
 msgstr[0] ""
 msgstr[1] ""
 
+#. TRANS: Menu item title in sample plugin.
 msgid "A warm greeting"
 msgstr "E schéine Bonjour"
 
+#. TRANS: Plugin description.
 msgid "A sample plugin to show basics of development for new hackers."
 msgstr ""
 
diff --git a/plugins/Sample/locale/mk/LC_MESSAGES/Sample.po b/plugins/Sample/locale/mk/LC_MESSAGES/Sample.po
index 67b58690af..72a8289670 100644
--- a/plugins/Sample/locale/mk/LC_MESSAGES/Sample.po
+++ b/plugins/Sample/locale/mk/LC_MESSAGES/Sample.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Sample to Macedonian (Македон�ки)
+# Translation of StatusNet - Sample to Macedonian (македон�ки)
 # Exported from translatewiki.net
 #
 # Author: Bjankuloski06
@@ -9,41 +9,50 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Sample\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:11+0000\n"
-"Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:55+0000\n"
+"Language-Team: Macedonian <https://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:20+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-12-03 13:49:08+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-sample\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
 
+#. TRANS: Page title for sample plugin.
+#. TRANS: Menu item in sample plugin.
 msgid "Hello"
 msgstr "Здраво"
 
+#. TRANS: Page title for sample plugin. %s is a user nickname.
 #, php-format
 msgid "Hello, %s!"
 msgstr "Здраво, %s!"
 
+#. TRANS: Message in sample plugin.
 msgid "Hello, stranger!"
 msgstr "Здрво, незнајнику!"
 
+#. TRANS: Message in sample plugin. %s is a user nickname.
 #, php-format
 msgid "Hello, %s"
 msgstr "Здраво, %s"
 
+#. TRANS: Message in sample plugin.
+#. TRANS: %d is the number of times a user is greeted.
 #, php-format
 msgid "I have greeted you %d time."
 msgid_plural "I have greeted you %d times."
 msgstr[0] "Ве поздравив еднаш."
 msgstr[1] "Ве поздравив %d пати."
 
+#. TRANS: Menu item title in sample plugin.
 msgid "A warm greeting"
 msgstr "Срдечен поздрав"
 
+#. TRANS: Plugin description.
 msgid "A sample plugin to show basics of development for new hackers."
 msgstr ""
 "Приклучок-пример за о�новите на развојното програмирање за нови хакери."
diff --git a/plugins/Sample/locale/nl/LC_MESSAGES/Sample.po b/plugins/Sample/locale/nl/LC_MESSAGES/Sample.po
index 14a7226d8e..8ae7489de0 100644
--- a/plugins/Sample/locale/nl/LC_MESSAGES/Sample.po
+++ b/plugins/Sample/locale/nl/LC_MESSAGES/Sample.po
@@ -1,6 +1,7 @@
 # Translation of StatusNet - Sample to Dutch (Nederlands)
 # Exported from translatewiki.net
 #
+# Author: SPQRobin
 # Author: Siebrand
 # --
 # This file is distributed under the same license as the StatusNet package.
@@ -9,44 +10,54 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Sample\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:12+0000\n"
-"Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:55+0000\n"
+"Language-Team: Dutch <https://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:20+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-12-03 13:49:08+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-sample\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Page title for sample plugin.
+#. TRANS: Menu item in sample plugin.
 msgid "Hello"
 msgstr "Hallo"
 
+#. TRANS: Page title for sample plugin. %s is a user nickname.
 #, php-format
 msgid "Hello, %s!"
 msgstr "Hallo, %s!"
 
+#. TRANS: Message in sample plugin.
 msgid "Hello, stranger!"
 msgstr "Hallo vreemdeling!"
 
+#. TRANS: Message in sample plugin. %s is a user nickname.
 #, php-format
 msgid "Hello, %s"
 msgstr "Hallo, %s"
 
+#. TRANS: Message in sample plugin.
+#. TRANS: %d is the number of times a user is greeted.
 #, php-format
 msgid "I have greeted you %d time."
 msgid_plural "I have greeted you %d times."
 msgstr[0] "Ik heb u voor de eerste keer gegroet."
 msgstr[1] "Ik heb u %d keer gegroet."
 
+#. TRANS: Menu item title in sample plugin.
 msgid "A warm greeting"
 msgstr "Een warme begroeting"
 
+#. TRANS: Plugin description.
 msgid "A sample plugin to show basics of development for new hackers."
 msgstr ""
-"Een voorbeeldplug-in als basis voor ontwikkelingen door nieuwe hackers."
+"Een voorbeeldplug-in om de basisprogrammeertechnieken te demonstreren aan "
+"nieuwe ontwikkelaars."
 
 #. TRANS: Exception thrown when the user greeting count could not be saved in the database.
 #. TRANS: %d is a user ID (number).
diff --git a/plugins/Sample/locale/pdc/LC_MESSAGES/Sample.po b/plugins/Sample/locale/pdc/LC_MESSAGES/Sample.po
new file mode 100644
index 0000000000..82d97b7c17
--- /dev/null
+++ b/plugins/Sample/locale/pdc/LC_MESSAGES/Sample.po
@@ -0,0 +1,69 @@
+# Translation of StatusNet - Sample to Deitsch (Deitsch)
+# Exported from translatewiki.net
+#
+# Author: Xqt
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Sample\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:55+0000\n"
+"Language-Team: Deitsch <https://translatewiki.net/wiki/Portal:pdc>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-12-03 13:49:08+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: pdc\n"
+"X-Message-Group: #out-statusnet-plugin-sample\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Page title for sample plugin.
+#. TRANS: Menu item in sample plugin.
+msgid "Hello"
+msgstr "Heiya"
+
+#. TRANS: Page title for sample plugin. %s is a user nickname.
+#, php-format
+msgid "Hello, %s!"
+msgstr "Heiya %s!"
+
+#. TRANS: Message in sample plugin.
+msgid "Hello, stranger!"
+msgstr "Heiya Fremmer!"
+
+#. TRANS: Message in sample plugin. %s is a user nickname.
+#, php-format
+msgid "Hello, %s"
+msgstr "Heiya %s"
+
+#. TRANS: Message in sample plugin.
+#. TRANS: %d is the number of times a user is greeted.
+#, php-format
+msgid "I have greeted you %d time."
+msgid_plural "I have greeted you %d times."
+msgstr[0] ""
+msgstr[1] ""
+
+#. TRANS: Menu item title in sample plugin.
+msgid "A warm greeting"
+msgstr ""
+
+#. TRANS: Plugin description.
+msgid "A sample plugin to show basics of development for new hackers."
+msgstr ""
+
+#. TRANS: Exception thrown when the user greeting count could not be saved in the database.
+#. TRANS: %d is a user ID (number).
+#, php-format
+msgid "Could not save new greeting count for %d."
+msgstr ""
+
+#. TRANS: Exception thrown when the user greeting count could not be saved in the database.
+#. TRANS: %d is a user ID (number).
+#, php-format
+msgid "Could not increment greeting count for %d."
+msgstr ""
diff --git a/plugins/Sample/locale/ru/LC_MESSAGES/Sample.po b/plugins/Sample/locale/ru/LC_MESSAGES/Sample.po
index 0d344dd775..355ccbfb64 100644
--- a/plugins/Sample/locale/ru/LC_MESSAGES/Sample.po
+++ b/plugins/Sample/locale/ru/LC_MESSAGES/Sample.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Sample to Russian (Ру��кий)
+# Translation of StatusNet - Sample to Russian (ру��кий)
 # Exported from translatewiki.net
 #
 # Author: Eleferen
@@ -10,33 +10,40 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Sample\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:12+0000\n"
-"Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:55+0000\n"
+"Language-Team: Russian <https://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:20+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-12-03 13:49:08+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-sample\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
+#. TRANS: Page title for sample plugin.
+#. TRANS: Menu item in sample plugin.
 msgid "Hello"
 msgstr "Привет"
 
+#. TRANS: Page title for sample plugin. %s is a user nickname.
 #, php-format
 msgid "Hello, %s!"
 msgstr "Здрав�твуйте, %s!"
 
+#. TRANS: Message in sample plugin.
 msgid "Hello, stranger!"
 msgstr "Привет, незнакомец!"
 
+#. TRANS: Message in sample plugin. %s is a user nickname.
 #, php-format
 msgid "Hello, %s"
 msgstr "Здрав�твуйте,%s"
 
+#. TRANS: Message in sample plugin.
+#. TRANS: %d is the number of times a user is greeted.
 #, php-format
 msgid "I have greeted you %d time."
 msgid_plural "I have greeted you %d times."
@@ -44,9 +51,11 @@ msgstr[0] "Я ва� поприве�т�твовал %d раз."
 msgstr[1] "Я ва� попривет�твовал %d раза."
 msgstr[2] "Я ва� поприве�т�твовал %d раз."
 
+#. TRANS: Menu item title in sample plugin.
 msgid "A warm greeting"
 msgstr ""
 
+#. TRANS: Plugin description.
 msgid "A sample plugin to show basics of development for new hackers."
 msgstr ""
 
diff --git a/plugins/Sample/locale/tl/LC_MESSAGES/Sample.po b/plugins/Sample/locale/tl/LC_MESSAGES/Sample.po
index acdda7e7f9..12b472d001 100644
--- a/plugins/Sample/locale/tl/LC_MESSAGES/Sample.po
+++ b/plugins/Sample/locale/tl/LC_MESSAGES/Sample.po
@@ -9,41 +9,50 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Sample\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:12+0000\n"
-"Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:55+0000\n"
+"Language-Team: Tagalog <https://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:20+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-12-03 13:49:08+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-sample\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Page title for sample plugin.
+#. TRANS: Menu item in sample plugin.
 msgid "Hello"
 msgstr "Kumusta"
 
+#. TRANS: Page title for sample plugin. %s is a user nickname.
 #, php-format
 msgid "Hello, %s!"
 msgstr "Kumusta, %s!"
 
+#. TRANS: Message in sample plugin.
 msgid "Hello, stranger!"
 msgstr "Kumusta, dayuhan!"
 
+#. TRANS: Message in sample plugin. %s is a user nickname.
 #, php-format
 msgid "Hello, %s"
 msgstr "Kumusta, %s"
 
+#. TRANS: Message in sample plugin.
+#. TRANS: %d is the number of times a user is greeted.
 #, php-format
 msgid "I have greeted you %d time."
 msgid_plural "I have greeted you %d times."
 msgstr[0] "Binati kita ng %d ulit."
 msgstr[1] "Binati kita ng %d mga ulit."
 
+#. TRANS: Menu item title in sample plugin.
 msgid "A warm greeting"
 msgstr "Isang mainit-init na pagbati"
 
+#. TRANS: Plugin description.
 msgid "A sample plugin to show basics of development for new hackers."
 msgstr ""
 "Isang halimbawang pampasak upang ipakita ang mga saligan ng kaunlaran para "
diff --git a/plugins/Sample/locale/uk/LC_MESSAGES/Sample.po b/plugins/Sample/locale/uk/LC_MESSAGES/Sample.po
index 23c1356ef7..4d8691fd7e 100644
--- a/plugins/Sample/locale/uk/LC_MESSAGES/Sample.po
+++ b/plugins/Sample/locale/uk/LC_MESSAGES/Sample.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Sample to Ukrainian (Україн�ька)
+# Translation of StatusNet - Sample to Ukrainian (україн�ька)
 # Exported from translatewiki.net
 #
 # Author: Boogie
@@ -9,33 +9,40 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Sample\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:12+0000\n"
-"Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:55+0000\n"
+"Language-Team: Ukrainian <https://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:20+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-12-03 13:49:08+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-sample\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
+#. TRANS: Page title for sample plugin.
+#. TRANS: Menu item in sample plugin.
 msgid "Hello"
 msgstr "Привіт"
 
+#. TRANS: Page title for sample plugin. %s is a user nickname.
 #, php-format
 msgid "Hello, %s!"
 msgstr "Привіт, %s!"
 
+#. TRANS: Message in sample plugin.
 msgid "Hello, stranger!"
 msgstr "Привіт, чужинцю!"
 
+#. TRANS: Message in sample plugin. %s is a user nickname.
 #, php-format
 msgid "Hello, %s"
 msgstr "Привіт, %s"
 
+#. TRANS: Message in sample plugin.
+#. TRANS: %d is the number of times a user is greeted.
 #, php-format
 msgid "I have greeted you %d time."
 msgid_plural "I have greeted you %d times."
@@ -43,9 +50,11 @@ msgstr[0] "Я привітав ва� %d раз."
 msgstr[1] "Я привітав ва� %d разів."
 msgstr[2] "Я привітав ва� %d разів."
 
+#. TRANS: Menu item title in sample plugin.
 msgid "A warm greeting"
 msgstr "Щирі вітанн�"
 
+#. TRANS: Plugin description.
 msgid "A sample plugin to show basics of development for new hackers."
 msgstr "Приклад додатку дл� демон�трації о�нов розробки новим гакерам."
 
diff --git a/plugins/Sample/locale/zh_CN/LC_MESSAGES/Sample.po b/plugins/Sample/locale/zh_CN/LC_MESSAGES/Sample.po
index 172059d8d2..1a26ab16de 100644
--- a/plugins/Sample/locale/zh_CN/LC_MESSAGES/Sample.po
+++ b/plugins/Sample/locale/zh_CN/LC_MESSAGES/Sample.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Sample to Simplified Chinese (‪中文(简体)‬)
+# Translation of StatusNet - Sample to Simplified Chinese (‪中文（简体）‬)
 # Exported from translatewiki.net
 #
 # Author: ZhengYiFeng
@@ -9,41 +9,50 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Sample\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:12+0000\n"
-"Language-Team: Simplified Chinese <http://translatewiki.net/wiki/Portal:zh-"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:55+0000\n"
+"Language-Team: Simplified Chinese <https://translatewiki.net/wiki/Portal:zh-"
 "hans>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:20+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-12-03 13:49:08+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: #out-statusnet-plugin-sample\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#. TRANS: Page title for sample plugin.
+#. TRANS: Menu item in sample plugin.
 msgid "Hello"
 msgstr "你好"
 
+#. TRANS: Page title for sample plugin. %s is a user nickname.
 #, php-format
 msgid "Hello, %s!"
 msgstr "你好，%s�"
 
+#. TRANS: Message in sample plugin.
 msgid "Hello, stranger!"
 msgstr "你好，陌生人�"
 
+#. TRANS: Message in sample plugin. %s is a user nickname.
 #, php-format
 msgid "Hello, %s"
 msgstr "你好，%s"
 
+#. TRANS: Message in sample plugin.
+#. TRANS: %d is the number of times a user is greeted.
 #, php-format
 msgid "I have greeted you %d time."
 msgid_plural "I have greeted you %d times."
 msgstr[0] ""
 
+#. TRANS: Menu item title in sample plugin.
 msgid "A warm greeting"
 msgstr "一个热情的问候"
 
+#. TRANS: Plugin description.
 msgid "A sample plugin to show basics of development for new hackers."
 msgstr "一个为新的 hackers 显示基础开�的示例�件。"
 
diff --git a/plugins/SearchSub/SearchSub.php b/plugins/SearchSub/SearchSub.php
index b903e88e2e..7e9a94caa9 100644
--- a/plugins/SearchSub/SearchSub.php
+++ b/plugins/SearchSub/SearchSub.php
@@ -147,18 +147,18 @@ class SearchSub extends Managed_DataObject
         $keypart = sprintf('searchsub:by_profile:%d', $profile->id);
         $searchstring = self::cacheGet($keypart);
         
-        if ($searchstring !== false && !empty($searchstring)) {
-            $searches = explode(',', $searchstring);
+        if ($searchstring !== false) {
+        	if (!empty($searchstring)) {
+            	$searches = explode(',', $searchstring);
+        	}
         } else {
             $searchsub = new SearchSub();
             $searchsub->profile_id = $profile->id;
+            $searchsub->selectAdd();
+            $searchsub->selectAdd('search');
 
             if ($searchsub->find()) {
-                while ($searchsub->fetch()) {
-                    if (!empty($searchsub->search)) {
-                        $searches[] = $searchsub->search;
-                    }
-                }
+                $searches = $searchsub->fetchAll('search');
             }
 
             self::cacheSet($keypart, implode(',', $searches));
diff --git a/plugins/SearchSub/SearchSubPlugin.php b/plugins/SearchSub/SearchSubPlugin.php
index de131c2b04..858474240e 100644
--- a/plugins/SearchSub/SearchSubPlugin.php
+++ b/plugins/SearchSub/SearchSubPlugin.php
@@ -108,7 +108,6 @@ class SearchSubPlugin extends Plugin
         $m->connect('search/:search/unsubscribe',
                     array('action' => 'searchunsub'),
                     array('search' => Router::REGEX_TAG));
-
         $m->connect(':nickname/search-subscriptions',
                     array('action' => 'searchsubs'),
                     array('nickname' => Nickname::DISPLAY_FMT));
@@ -181,7 +180,7 @@ class SearchSubPlugin extends Plugin
      * or Sphinx search backends.
      *
      * @param Notice $notice
-     * @param string $search 
+     * @param string $search
      * @return boolean
      */
     function matchSearch(Notice $notice, $search)
@@ -226,7 +225,6 @@ class SearchSubPlugin extends Plugin
      *
      * @return boolean hook return
      */
-
     function onEndSubGroupNav($widget)
     {
         $action = $widget->out;
@@ -296,11 +294,11 @@ class SearchSubPlugin extends Plugin
 
             if (!empty($searches) && count($searches) > 0) {
                 $searchSubMenu = new SearchSubMenu($menu->out, $user, $searches);
-                $menu->submenu(_m('Searches'), $searchSubMenu);
+                // TRANS: Sub menu for searches.
+                $menu->submenu(_m('MENU','Searches'), $searchSubMenu);
             }
         }
 
         return true;
     }
-
 }
diff --git a/plugins/SearchSub/locale/SearchSub.pot b/plugins/SearchSub/locale/SearchSub.pot
index 9fa45419fd..ac01fd7ce2 100644
--- a/plugins/SearchSub/locale/SearchSub.pot
+++ b/plugins/SearchSub/locale/SearchSub.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
+"POT-Creation-Date: 2012-06-30 11:07+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"
@@ -73,19 +73,22 @@ msgid "\"<a href=\"%1$s\">%2$s</a>\" since %3$s"
 msgstr ""
 
 #. TRANS: Error text shown a user tries to untrack a search query they're not subscribed to.
-#: searchsubuntrackcommand.php:21
+#. TRANS: %s is the keyword for the search.
+#: searchsubuntrackcommand.php:22
 #, php-format
 msgid "You are not tracking the search \"%s\"."
 msgstr ""
 
 #. TRANS: Message given having failed to cancel a search subscription by untrack command.
-#: searchsubuntrackcommand.php:29
+#. TRANS: %s is the keyword for the query.
+#: searchsubuntrackcommand.php:31
 #, php-format
 msgid "Could not end a search subscription for query \"%s\"."
 msgstr ""
 
 #. TRANS: Message given having removed a search subscription by untrack command.
-#: searchsubuntrackcommand.php:35
+#. TRANS: %s is the keyword for the search.
+#: searchsubuntrackcommand.php:38
 #, php-format
 msgid "You are no longer subscribed to the search \"%s\"."
 msgstr ""
@@ -116,15 +119,22 @@ msgstr ""
 msgid "Subscribed"
 msgstr ""
 
-#: searchunsubform.php:96 searchunsubform.php:107
+#. TRANS: Form legend.
+#: searchunsubform.php:90
 msgid "Unsubscribe from this search"
 msgstr ""
 
-#: searchunsubform.php:107
+#. TRANS: Button text for unsubscribing from a text search.
+#: searchunsubform.php:102
 msgctxt "BUTTON"
 msgid "Unsubscribe"
 msgstr ""
 
+#. TRANS: Button title for unsubscribing from a text search.
+#: searchunsubform.php:106
+msgid "Unsubscribe from this search."
+msgstr ""
+
 #. TRANS: Page title when search unsubscription succeeded.
 #: searchunsubaction.php:76
 msgid "Unsubscribed"
@@ -149,78 +159,90 @@ msgid "You are subscribed to the search \"%s\"."
 msgstr ""
 
 #. TRANS: Plugin description.
-#: SearchSubPlugin.php:133
+#: SearchSubPlugin.php:132
 msgid "Plugin to allow following all messages with a given search."
 msgstr ""
 
 #. TRANS: SearchSub plugin menu item on user settings page.
-#: SearchSubPlugin.php:237
+#. TRANS: Sub menu for searches.
+#: SearchSubPlugin.php:235 SearchSubPlugin.php:298
 msgctxt "MENU"
 msgid "Searches"
 msgstr ""
 
 #. TRANS: SearchSub plugin tooltip for user settings menu item.
-#: SearchSubPlugin.php:239
+#: SearchSubPlugin.php:237
 msgid "Configure search subscriptions"
 msgstr ""
 
 #. TRANS: Help message for IM/SMS command "track <word>"
-#: SearchSubPlugin.php:277
+#: SearchSubPlugin.php:275
 msgctxt "COMMANDHELP"
 msgid "Start following notices matching the given search query."
 msgstr ""
 
 #. TRANS: Help message for IM/SMS command "untrack <word>"
-#: SearchSubPlugin.php:279
+#: SearchSubPlugin.php:277
 msgctxt "COMMANDHELP"
 msgid "Stop following notices matching the given search query."
 msgstr ""
 
 #. TRANS: Help message for IM/SMS command "track off"
 #. TRANS: Help message for IM/SMS command "untrack all"
-#: SearchSubPlugin.php:281 SearchSubPlugin.php:283
+#: SearchSubPlugin.php:279 SearchSubPlugin.php:281
 msgctxt "COMMANDHELP"
 msgid "Disable all tracked search subscriptions."
 msgstr ""
 
 #. TRANS: Help message for IM/SMS command "tracks"
 #. TRANS: Help message for IM/SMS command "tracking"
-#: SearchSubPlugin.php:285 SearchSubPlugin.php:287
+#: SearchSubPlugin.php:283 SearchSubPlugin.php:285
 msgctxt "COMMANDHELP"
 msgid "List all your search subscriptions."
 msgstr ""
 
-#: SearchSubPlugin.php:299
-msgid "Searches"
-msgstr ""
-
 #. TRANS: Error text shown a user tries to disable all a search subscriptions with track off command, but has none.
 #: searchsubtrackingcommand.php:14 searchsubtrackoffcommand.php:14
 msgid "You are not tracking any searches."
 msgstr ""
 
-#. TRANS: Message given having disabled all search subscriptions with 'track off'.
+#. TRANS: Separator for list of tracked searches.
 #: searchsubtrackingcommand.php:24
-#, php-format
-msgid "You are tracking searches for: %s"
+msgctxt "SEPARATOR"
+msgid "\", \""
 msgstr ""
 
-#: searchsubform.php:116 searchsubform.php:140
+#. TRANS: Message given having disabled all search subscriptions with 'track off'.
+#. TRANS: %s is a list of searches. Separator default is '", "'.
+#: searchsubtrackingcommand.php:28
+#, php-format
+msgid "You are tracking searches for: \"%s\"."
+msgstr ""
+
+#. TRANS: Form legend.
+#: searchsubform.php:110
 msgid "Subscribe to this search"
 msgstr ""
 
-#: searchsubform.php:140
+#. TRANS: Button text for subscribing to a search.
+#: searchsubform.php:134
 msgctxt "BUTTON"
 msgid "Subscribe"
 msgstr ""
 
+#. TRANS: Button title for subscribing to a search.
+#: searchsubform.php:138
+msgid "Subscribe to this search."
+msgstr ""
+
 #. TRANS: Message given having failed to cancel one of the search subs with 'track off' command.
-#: searchsubtrackoffcommand.php:24
+#. TRANS: %s is the search for which the subscription removal failed.
+#: searchsubtrackoffcommand.php:25
 #, php-format
 msgid "Error disabling search subscription for query \"%s\"."
 msgstr ""
 
 #. TRANS: Message given having disabled all search subscriptions with 'track off'.
-#: searchsubtrackoffcommand.php:31
+#: searchsubtrackoffcommand.php:32
 msgid "Disabled all your search subscriptions."
 msgstr ""
diff --git a/plugins/SearchSub/locale/ca/LC_MESSAGES/SearchSub.po b/plugins/SearchSub/locale/ca/LC_MESSAGES/SearchSub.po
new file mode 100644
index 0000000000..5094271e7d
--- /dev/null
+++ b/plugins/SearchSub/locale/ca/LC_MESSAGES/SearchSub.po
@@ -0,0 +1,219 @@
+# Translation of StatusNet - SearchSub to Catalan (català)
+# Exported from translatewiki.net
+#
+# Author: Toniher
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - SearchSub\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:55+0000\n"
+"Language-Team: Catalan <https://translatewiki.net/wiki/Portal:ca>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-12-03 13:49:08+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: ca\n"
+"X-Message-Group: #out-statusnet-plugin-searchsub\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Header for subscriptions overview for a user (first page).
+#. TRANS: %s is a user nickname.
+#, php-format
+msgid "%s's search subscriptions"
+msgstr "Subscripcions de cerca de %s"
+
+#. TRANS: Header for subscriptions overview for a user (not first page).
+#. TRANS: %1$s is a user nickname, %2$d is the page number.
+#, php-format
+msgid "%1$s's search subscriptions, page %2$d"
+msgstr ""
+
+#. TRANS: Page notice for page with an overview of all search subscriptions
+#. TRANS: of the logged in user's own profile.
+msgid ""
+"You have subscribed to receive all notices on this site matching the "
+"following searches:"
+msgstr ""
+
+#. TRANS: Page notice for page with an overview of all subscriptions of a user other
+#. TRANS: than the logged in user. %s is the user nickname.
+#, php-format
+msgid ""
+"%s has subscribed to receive all notices on this site matching the following "
+"searches:"
+msgstr ""
+
+#. TRANS: Search subscription list text when the logged in user has no search subscriptions.
+msgid ""
+"You are not subscribed to any text searches right now. You can push the "
+"\"Subscribe\" button on any notice text search to automatically receive any "
+"public messages on this site that match that search, even if you are not "
+"subscribed to the poster."
+msgstr ""
+
+#. TRANS: Search subscription list text when looking at the subscriptions for a of a user other
+#. TRANS: than the logged in user that has no search subscriptions. %s is the user nickname.
+#. TRANS: Subscription list text when looking at the subscriptions for a of a user that has none
+#. TRANS: as an anonymous user. %s is the user nickname.
+#, php-format
+msgid "%s is not subscribed to any searches."
+msgstr ""
+
+#. TRANS: Search subscription list item. %1$s is a URL to a notice search,
+#. TRANS: %2$s are the search criteria, %3$s is a datestring.
+#, php-format
+msgid "\"<a href=\"%1$s\">%2$s</a>\" since %3$s"
+msgstr ""
+
+#. TRANS: Error text shown a user tries to untrack a search query they're not subscribed to.
+#. TRANS: %s is the keyword for the search.
+#, php-format
+msgid "You are not tracking the search \"%s\"."
+msgstr ""
+
+#. TRANS: Message given having failed to cancel a search subscription by untrack command.
+#. TRANS: %s is the keyword for the query.
+#, php-format
+msgid "Could not end a search subscription for query \"%s\"."
+msgstr ""
+
+#. TRANS: Message given having removed a search subscription by untrack command.
+#. TRANS: %s is the keyword for the search.
+#, php-format
+msgid "You are no longer subscribed to the search \"%s\"."
+msgstr ""
+
+#. TRANS: Client error displayed trying to perform any request method other than POST.
+#. TRANS: Do not translate POST.
+msgid "This action only accepts POST requests."
+msgstr ""
+
+#. TRANS: Client error displayed when the session token is not okay.
+msgid "There was a problem with your session token. Try again, please."
+msgstr ""
+
+#. TRANS: Error message displayed when trying to perform an action that requires a logged in user.
+msgid "Not logged in."
+msgstr "No s'ha iniciat una sessió."
+
+#. TRANS: Client error displayed trying to subscribe to a non-existing profile.
+msgid "No such profile."
+msgstr "No existeix el perfil."
+
+#. TRANS: Page title when search subscription succeeded.
+msgid "Subscribed"
+msgstr "Subscrit"
+
+#. TRANS: Form legend.
+msgid "Unsubscribe from this search"
+msgstr "Cancel·la la subscripció d'aquesta cerca"
+
+#. TRANS: Button text for unsubscribing from a text search.
+msgctxt "BUTTON"
+msgid "Unsubscribe"
+msgstr "Cancel·la la subscripció"
+
+#. TRANS: Button title for unsubscribing from a text search.
+msgid "Unsubscribe from this search."
+msgstr "Cancel·la la subscripció d'aquesta cerca."
+
+#. TRANS: Page title when search unsubscription succeeded.
+msgid "Unsubscribed"
+msgstr "S'ha cancel·lat la subscripció"
+
+#. TRANS: Error text shown a user tries to track a search query they're already subscribed to.
+#, php-format
+msgid "You are already tracking the search \"%s\"."
+msgstr "Ja esteu seguint la cerca «%s»."
+
+#. TRANS: Message given having failed to set up a search subscription by track command.
+#, php-format
+msgid "Could not start a search subscription for query \"%s\"."
+msgstr "No s'ha pogut iniciar una subscripció de cerca de la consulta «%s»."
+
+#. TRANS: Message given having added a search subscription by track command.
+#, php-format
+msgid "You are subscribed to the search \"%s\"."
+msgstr "Esteu subscrit a la cerca «%s»."
+
+#. TRANS: Plugin description.
+msgid "Plugin to allow following all messages with a given search."
+msgstr ""
+"Connector per permetre seguir tots els missatges d'una cerca determinada."
+
+#. TRANS: SearchSub plugin menu item on user settings page.
+#. TRANS: Sub menu for searches.
+msgctxt "MENU"
+msgid "Searches"
+msgstr "Cerques"
+
+#. TRANS: SearchSub plugin tooltip for user settings menu item.
+msgid "Configure search subscriptions"
+msgstr "Configura les subscripcions de cerca"
+
+#. TRANS: Help message for IM/SMS command "track <word>"
+msgctxt "COMMANDHELP"
+msgid "Start following notices matching the given search query."
+msgstr ""
+"Inicia el seguiment d'avisos que coincideixen amb el criteri de cerca donat."
+
+#. TRANS: Help message for IM/SMS command "untrack <word>"
+msgctxt "COMMANDHELP"
+msgid "Stop following notices matching the given search query."
+msgstr ""
+"Atura el seguiment d'avisos que coincideixen amb el criteri de cerca donat."
+
+#. TRANS: Help message for IM/SMS command "track off"
+#. TRANS: Help message for IM/SMS command "untrack all"
+msgctxt "COMMANDHELP"
+msgid "Disable all tracked search subscriptions."
+msgstr "Inhabilita totes les subscripcions de cerca en seguiment."
+
+#. TRANS: Help message for IM/SMS command "tracks"
+#. TRANS: Help message for IM/SMS command "tracking"
+msgctxt "COMMANDHELP"
+msgid "List all your search subscriptions."
+msgstr "Llista totes les vostres subscripcions de cerca."
+
+#. TRANS: Error text shown a user tries to disable all a search subscriptions with track off command, but has none.
+msgid "You are not tracking any searches."
+msgstr "No esteu seguint cap cerca."
+
+#. TRANS: Separator for list of tracked searches.
+msgctxt "SEPARATOR"
+msgid "\", \""
+msgstr "\", \""
+
+#. TRANS: Message given having disabled all search subscriptions with 'track off'.
+#. TRANS: %s is a list of searches. Separator default is '", "'.
+#, php-format
+msgid "You are tracking searches for: \"%s\"."
+msgstr "Esteu seguint les cerques de: «%s»."
+
+#. TRANS: Form legend.
+msgid "Subscribe to this search"
+msgstr "Subscriu a aquesta cerca"
+
+#. TRANS: Button text for subscribing to a search.
+msgctxt "BUTTON"
+msgid "Subscribe"
+msgstr "Subscriu"
+
+#. TRANS: Button title for subscribing to a search.
+msgid "Subscribe to this search."
+msgstr "Subscriviu-vos a la cerca."
+
+#. TRANS: Message given having failed to cancel one of the search subs with 'track off' command.
+#. TRANS: %s is the search for which the subscription removal failed.
+#, php-format
+msgid "Error disabling search subscription for query \"%s\"."
+msgstr ""
+
+#. TRANS: Message given having disabled all search subscriptions with 'track off'.
+msgid "Disabled all your search subscriptions."
+msgstr ""
diff --git a/plugins/SearchSub/locale/de/LC_MESSAGES/SearchSub.po b/plugins/SearchSub/locale/de/LC_MESSAGES/SearchSub.po
index b4b048e0ae..c5c640194e 100644
--- a/plugins/SearchSub/locale/de/LC_MESSAGES/SearchSub.po
+++ b/plugins/SearchSub/locale/de/LC_MESSAGES/SearchSub.po
@@ -1,6 +1,7 @@
 # Translation of StatusNet - SearchSub to German (Deutsch)
 # Exported from translatewiki.net
 #
+# Author: ChrisiPK
 # Author: Giftpflanze
 # --
 # This file is distributed under the same license as the StatusNet package.
@@ -9,14 +10,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SearchSub\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:15+0000\n"
-"Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:56+0000\n"
+"Language-Team: German <https://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:20+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-12-03 13:49:08+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-searchsub\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -79,16 +80,19 @@ msgid "\"<a href=\"%1$s\">%2$s</a>\" since %3$s"
 msgstr "„<a href=\"%1$s\">%2$s</a>“ seit %3$s"
 
 #. TRANS: Error text shown a user tries to untrack a search query they're not subscribed to.
+#. TRANS: %s is the keyword for the search.
 #, php-format
 msgid "You are not tracking the search \"%s\"."
 msgstr "Du verfolgst die Suche „%s“ nicht."
 
 #. TRANS: Message given having failed to cancel a search subscription by untrack command.
+#. TRANS: %s is the keyword for the query.
 #, php-format
 msgid "Could not end a search subscription for query \"%s\"."
 msgstr "Konnte Abonnement für Suche „%s“ nicht beenden."
 
 #. TRANS: Message given having removed a search subscription by untrack command.
+#. TRANS: %s is the keyword for the search.
 #, php-format
 msgid "You are no longer subscribed to the search \"%s\"."
 msgstr "Du verfolgst die Suche „%s“ nicht länger."
@@ -114,13 +118,19 @@ msgstr "Kein solches Profil."
 msgid "Subscribed"
 msgstr "Abonniert"
 
+#. TRANS: Form legend.
 msgid "Unsubscribe from this search"
 msgstr "Diese Suche nicht länger verfolgen"
 
+#. TRANS: Button text for unsubscribing from a text search.
 msgctxt "BUTTON"
 msgid "Unsubscribe"
 msgstr "Abbestellen"
 
+#. TRANS: Button title for unsubscribing from a text search.
+msgid "Unsubscribe from this search."
+msgstr "Diese Suche nicht länger verfolgen."
+
 #. TRANS: Page title when search unsubscription succeeded.
 msgid "Unsubscribed"
 msgstr "Abbestellt"
@@ -147,6 +157,7 @@ msgstr ""
 "übereinstimmen."
 
 #. TRANS: SearchSub plugin menu item on user settings page.
+#. TRANS: Sub menu for searches.
 msgctxt "MENU"
 msgid "Searches"
 msgstr "Suchen"
@@ -179,26 +190,36 @@ msgctxt "COMMANDHELP"
 msgid "List all your search subscriptions."
 msgstr "Alle Suchabonnements auflisten."
 
-msgid "Searches"
-msgstr "Suchen"
-
 #. TRANS: Error text shown a user tries to disable all a search subscriptions with track off command, but has none.
 msgid "You are not tracking any searches."
 msgstr "Du verfolgst keine Suchen."
 
-#. TRANS: Message given having disabled all search subscriptions with 'track off'.
-#, php-format
-msgid "You are tracking searches for: %s"
-msgstr "Du verfolgst Suchen für: %s"
+#. TRANS: Separator for list of tracked searches.
+msgctxt "SEPARATOR"
+msgid "\", \""
+msgstr "“, „"
 
+#. TRANS: Message given having disabled all search subscriptions with 'track off'.
+#. TRANS: %s is a list of searches. Separator default is '", "'.
+#, php-format
+msgid "You are tracking searches for: \"%s\"."
+msgstr "Du verfolgst Suchen für: „%s“."
+
+#. TRANS: Form legend.
 msgid "Subscribe to this search"
 msgstr "Diese Suche abonnieren"
 
+#. TRANS: Button text for subscribing to a search.
 msgctxt "BUTTON"
 msgid "Subscribe"
 msgstr "Abonnieren"
 
+#. TRANS: Button title for subscribing to a search.
+msgid "Subscribe to this search."
+msgstr "Diese Suche abonnieren."
+
 #. TRANS: Message given having failed to cancel one of the search subs with 'track off' command.
+#. TRANS: %s is the search for which the subscription removal failed.
 #, php-format
 msgid "Error disabling search subscription for query \"%s\"."
 msgstr "Fehler bei der Abbestellung der Suche „%s“."
diff --git a/plugins/SearchSub/locale/es/LC_MESSAGES/SearchSub.po b/plugins/SearchSub/locale/es/LC_MESSAGES/SearchSub.po
new file mode 100644
index 0000000000..9d54a502db
--- /dev/null
+++ b/plugins/SearchSub/locale/es/LC_MESSAGES/SearchSub.po
@@ -0,0 +1,230 @@
+# Translation of StatusNet - SearchSub to Spanish (español)
+# Exported from translatewiki.net
+#
+# Author: Armando-Martin
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - SearchSub\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:56+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-12-03 13:49:08+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Header for subscriptions overview for a user (first page).
+#. TRANS: %s is a user nickname.
+#, php-format
+msgid "%s's search subscriptions"
+msgstr "Subscripciones a búsquedas de %s"
+
+#. TRANS: Header for subscriptions overview for a user (not first page).
+#. TRANS: %1$s is a user nickname, %2$d is the page number.
+#, php-format
+msgid "%1$s's search subscriptions, page %2$d"
+msgstr "suscripciones a búsquedas de %1$s, página %2$d"
+
+#. TRANS: Page notice for page with an overview of all search subscriptions
+#. TRANS: of the logged in user's own profile.
+msgid ""
+"You have subscribed to receive all notices on this site matching the "
+"following searches:"
+msgstr ""
+"Se ha suscrito para recibir todos los avisos de este sitio que contengan las "
+"búsquedas siguientes:"
+
+#. TRANS: Page notice for page with an overview of all subscriptions of a user other
+#. TRANS: than the logged in user. %s is the user nickname.
+#, php-format
+msgid ""
+"%s has subscribed to receive all notices on this site matching the following "
+"searches:"
+msgstr ""
+"%s se ha suscrito para recibir todos los avisos de este sitio que contengan "
+"las búsquedas siguientes:"
+
+#. TRANS: Search subscription list text when the logged in user has no search subscriptions.
+msgid ""
+"You are not subscribed to any text searches right now. You can push the "
+"\"Subscribe\" button on any notice text search to automatically receive any "
+"public messages on this site that match that search, even if you are not "
+"subscribed to the poster."
+msgstr ""
+"No está suscrito ahora a ninguna búsqueda de texto. Puede pulsar el botón "
+"\"Suscribirse\" en cualquier aviso de búsqueda de texto para recibir "
+"automáticamente los mensajes públicos de este sitio que utilicen esa "
+"búsqueda, incluso si no está suscrito al autor."
+
+#. TRANS: Search subscription list text when looking at the subscriptions for a of a user other
+#. TRANS: than the logged in user that has no search subscriptions. %s is the user nickname.
+#. TRANS: Subscription list text when looking at the subscriptions for a of a user that has none
+#. TRANS: as an anonymous user. %s is the user nickname.
+#, php-format
+msgid "%s is not subscribed to any searches."
+msgstr "%s no está suscrito a ninguna búsqueda."
+
+#. TRANS: Search subscription list item. %1$s is a URL to a notice search,
+#. TRANS: %2$s are the search criteria, %3$s is a datestring.
+#, php-format
+msgid "\"<a href=\"%1$s\">%2$s</a>\" since %3$s"
+msgstr "\"<a href=\"%1$s\">%2$s</a>\" desde %3$s"
+
+#. TRANS: Error text shown a user tries to untrack a search query they're not subscribed to.
+#. TRANS: %s is the keyword for the search.
+#, php-format
+msgid "You are not tracking the search \"%s\"."
+msgstr "No está siguiendo la búsqueda \"%s\"."
+
+#. TRANS: Message given having failed to cancel a search subscription by untrack command.
+#. TRANS: %s is the keyword for the query.
+#, php-format
+msgid "Could not end a search subscription for query \"%s\"."
+msgstr ""
+"No se pudo finalizar una suscripción de búsqueda para la consulta \"%s\"."
+
+#. TRANS: Message given having removed a search subscription by untrack command.
+#. TRANS: %s is the keyword for the search.
+#, php-format
+msgid "You are no longer subscribed to the search \"%s\"."
+msgstr "Ya no está suscrito a la búsqueda \"%s\"."
+
+#. TRANS: Client error displayed trying to perform any request method other than POST.
+#. TRANS: Do not translate POST.
+msgid "This action only accepts POST requests."
+msgstr "Esta acción sólo acepta solicitudes POST."
+
+#. TRANS: Client error displayed when the session token is not okay.
+msgid "There was a problem with your session token. Try again, please."
+msgstr "Hubo un problema con su contraseña de sesión. Inténtelo de nuevo."
+
+#. TRANS: Error message displayed when trying to perform an action that requires a logged in user.
+msgid "Not logged in."
+msgstr "No ha iniciado sesión"
+
+#. TRANS: Client error displayed trying to subscribe to a non-existing profile.
+msgid "No such profile."
+msgstr "No existe tal perfil."
+
+#. TRANS: Page title when search subscription succeeded.
+msgid "Subscribed"
+msgstr "Suscrito"
+
+#. TRANS: Form legend.
+msgid "Unsubscribe from this search"
+msgstr "Cancelar la suscripción a esta búsqueda"
+
+#. TRANS: Button text for unsubscribing from a text search.
+msgctxt "BUTTON"
+msgid "Unsubscribe"
+msgstr "Cancelar la suscripción"
+
+#. TRANS: Button title for unsubscribing from a text search.
+msgid "Unsubscribe from this search."
+msgstr "Cancelar la suscripción a esta búsqueda."
+
+#. TRANS: Page title when search unsubscription succeeded.
+msgid "Unsubscribed"
+msgstr "Ha cancelado la suscripción"
+
+#. TRANS: Error text shown a user tries to track a search query they're already subscribed to.
+#, php-format
+msgid "You are already tracking the search \"%s\"."
+msgstr "Ya está siguiendo la búsqueda \"%s\"."
+
+#. TRANS: Message given having failed to set up a search subscription by track command.
+#, php-format
+msgid "Could not start a search subscription for query \"%s\"."
+msgstr ""
+"No se pudo iniciar una suscripción de búsqueda para la consulta \"%s\"."
+
+#. TRANS: Message given having added a search subscription by track command.
+#, php-format
+msgid "You are subscribed to the search \"%s\"."
+msgstr "Está suscrito a la búsqueda \"%s\"."
+
+#. TRANS: Plugin description.
+msgid "Plugin to allow following all messages with a given search."
+msgstr ""
+"Complemento (plugin) para permitir seguir todos los mensajes con una "
+"búsqueda determinada."
+
+#. TRANS: SearchSub plugin menu item on user settings page.
+#. TRANS: Sub menu for searches.
+msgctxt "MENU"
+msgid "Searches"
+msgstr "Búsquedas"
+
+#. TRANS: SearchSub plugin tooltip for user settings menu item.
+msgid "Configure search subscriptions"
+msgstr "Configurar las suscripciones de búsqueda"
+
+#. TRANS: Help message for IM/SMS command "track <word>"
+msgctxt "COMMANDHELP"
+msgid "Start following notices matching the given search query."
+msgstr ""
+"Empezar a seguir los avisos que coincidan con la consulta de búsqueda "
+"especificada."
+
+#. TRANS: Help message for IM/SMS command "untrack <word>"
+msgctxt "COMMANDHELP"
+msgid "Stop following notices matching the given search query."
+msgstr ""
+"Dejar de seguir los avisos que coincidan con la consulta de búsqueda "
+"especificada."
+
+#. TRANS: Help message for IM/SMS command "track off"
+#. TRANS: Help message for IM/SMS command "untrack all"
+msgctxt "COMMANDHELP"
+msgid "Disable all tracked search subscriptions."
+msgstr "Desactivar todas las suscripciones de búsqueda que estaba siguiendo."
+
+#. TRANS: Help message for IM/SMS command "tracks"
+#. TRANS: Help message for IM/SMS command "tracking"
+msgctxt "COMMANDHELP"
+msgid "List all your search subscriptions."
+msgstr "Enumerar todas sus suscripciones de búsqueda."
+
+#. TRANS: Error text shown a user tries to disable all a search subscriptions with track off command, but has none.
+msgid "You are not tracking any searches."
+msgstr "No está siguiendo ninguna búsqueda."
+
+#. TRANS: Separator for list of tracked searches.
+msgctxt "SEPARATOR"
+msgid "\", \""
+msgstr "\", \""
+
+#. TRANS: Message given having disabled all search subscriptions with 'track off'.
+#. TRANS: %s is a list of searches. Separator default is '", "'.
+#, php-format
+msgid "You are tracking searches for: \"%s\"."
+msgstr "Está siguiendo las búsquedas de: \"%s\"."
+
+#. TRANS: Form legend.
+msgid "Subscribe to this search"
+msgstr "Suscribirse a esta búsqueda"
+
+#. TRANS: Button text for subscribing to a search.
+msgctxt "BUTTON"
+msgid "Subscribe"
+msgstr "Suscribirse"
+
+#. TRANS: Button title for subscribing to a search.
+msgid "Subscribe to this search."
+msgstr "Suscribirse a esta búsqueda."
+
+#. TRANS: Message given having failed to cancel one of the search subs with 'track off' command.
+#. TRANS: %s is the search for which the subscription removal failed.
+#, php-format
+msgid "Error disabling search subscription for query \"%s\"."
+msgstr ""
+"Error al desactivar la suscripción de búsqueda para la consulta \"%s\"."
+
+#. TRANS: Message given having disabled all search subscriptions with 'track off'.
+msgid "Disabled all your search subscriptions."
+msgstr "Desactivar todas sus suscripciones de búsqueda."
diff --git a/plugins/SearchSub/locale/eu/LC_MESSAGES/SearchSub.po b/plugins/SearchSub/locale/eu/LC_MESSAGES/SearchSub.po
new file mode 100644
index 0000000000..8e631460bb
--- /dev/null
+++ b/plugins/SearchSub/locale/eu/LC_MESSAGES/SearchSub.po
@@ -0,0 +1,213 @@
+# Translation of StatusNet - SearchSub to Basque (euskara)
+# Exported from translatewiki.net
+#
+# Author: Artsuaga
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - SearchSub\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:56+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-12-03 13:49:08+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Header for subscriptions overview for a user (first page).
+#. TRANS: %s is a user nickname.
+#, php-format
+msgid "%s's search subscriptions"
+msgstr "%s(r)en bilaketa harpidetzak"
+
+#. TRANS: Header for subscriptions overview for a user (not first page).
+#. TRANS: %1$s is a user nickname, %2$d is the page number.
+#, fuzzy, php-format
+msgid "%1$s's search subscriptions, page %2$d"
+msgstr "%1$s(r)en bilaketa harpidetzak, %2$s. orria"
+
+#. TRANS: Page notice for page with an overview of all search subscriptions
+#. TRANS: of the logged in user's own profile.
+msgid ""
+"You have subscribed to receive all notices on this site matching the "
+"following searches:"
+msgstr ""
+
+#. TRANS: Page notice for page with an overview of all subscriptions of a user other
+#. TRANS: than the logged in user. %s is the user nickname.
+#, php-format
+msgid ""
+"%s has subscribed to receive all notices on this site matching the following "
+"searches:"
+msgstr ""
+
+#. TRANS: Search subscription list text when the logged in user has no search subscriptions.
+msgid ""
+"You are not subscribed to any text searches right now. You can push the "
+"\"Subscribe\" button on any notice text search to automatically receive any "
+"public messages on this site that match that search, even if you are not "
+"subscribed to the poster."
+msgstr ""
+
+#. TRANS: Search subscription list text when looking at the subscriptions for a of a user other
+#. TRANS: than the logged in user that has no search subscriptions. %s is the user nickname.
+#. TRANS: Subscription list text when looking at the subscriptions for a of a user that has none
+#. TRANS: as an anonymous user. %s is the user nickname.
+#, php-format
+msgid "%s is not subscribed to any searches."
+msgstr ""
+
+#. TRANS: Search subscription list item. %1$s is a URL to a notice search,
+#. TRANS: %2$s are the search criteria, %3$s is a datestring.
+#, php-format
+msgid "\"<a href=\"%1$s\">%2$s</a>\" since %3$s"
+msgstr "\"<a href=\"%1$s\">%2$s</a>\" %3$s(e)tik."
+
+#. TRANS: Error text shown a user tries to untrack a search query they're not subscribed to.
+#. TRANS: %s is the keyword for the search.
+#, php-format
+msgid "You are not tracking the search \"%s\"."
+msgstr "Ez zara \"%s\" bilaketa jarraitzen ari."
+
+#. TRANS: Message given having failed to cancel a search subscription by untrack command.
+#. TRANS: %s is the keyword for the query.
+#, php-format
+msgid "Could not end a search subscription for query \"%s\"."
+msgstr ""
+
+#. TRANS: Message given having removed a search subscription by untrack command.
+#. TRANS: %s is the keyword for the search.
+#, php-format
+msgid "You are no longer subscribed to the search \"%s\"."
+msgstr ""
+
+#. TRANS: Client error displayed trying to perform any request method other than POST.
+#. TRANS: Do not translate POST.
+msgid "This action only accepts POST requests."
+msgstr "Ekintza honek POST eskariak soilik onartzen ditu."
+
+#. TRANS: Client error displayed when the session token is not okay.
+msgid "There was a problem with your session token. Try again, please."
+msgstr "Arazoa egon da zure saio-tokenarekin. Saiatu berriro, mesedez."
+
+#. TRANS: Error message displayed when trying to perform an action that requires a logged in user.
+msgid "Not logged in."
+msgstr "Saioa hasi gabe."
+
+#. TRANS: Client error displayed trying to subscribe to a non-existing profile.
+msgid "No such profile."
+msgstr "Profil hori ez dago."
+
+#. TRANS: Page title when search subscription succeeded.
+msgid "Subscribed"
+msgstr "Harpidetua"
+
+#. TRANS: Form legend.
+msgid "Unsubscribe from this search"
+msgstr "Eten bilaketa honekiko harpidetza"
+
+#. TRANS: Button text for unsubscribing from a text search.
+msgctxt "BUTTON"
+msgid "Unsubscribe"
+msgstr "Harpidetza kendu"
+
+#. TRANS: Button title for unsubscribing from a text search.
+msgid "Unsubscribe from this search."
+msgstr "KEten bilaketa honekiko harpidetza"
+
+#. TRANS: Page title when search unsubscription succeeded.
+msgid "Unsubscribed"
+msgstr "Harpidetu gabea"
+
+#. TRANS: Error text shown a user tries to track a search query they're already subscribed to.
+#, php-format
+msgid "You are already tracking the search \"%s\"."
+msgstr "Dagoeneko \"%s\" bilaketa jarraitzen ari zara."
+
+#. TRANS: Message given having failed to set up a search subscription by track command.
+#, php-format
+msgid "Could not start a search subscription for query \"%s\"."
+msgstr ""
+
+#. TRANS: Message given having added a search subscription by track command.
+#, php-format
+msgid "You are subscribed to the search \"%s\"."
+msgstr "\"%s\" bilaketara harpideturik zaude."
+
+#. TRANS: Plugin description.
+msgid "Plugin to allow following all messages with a given search."
+msgstr ""
+
+#. TRANS: SearchSub plugin menu item on user settings page.
+#. TRANS: Sub menu for searches.
+msgctxt "MENU"
+msgid "Searches"
+msgstr ""
+
+#. TRANS: SearchSub plugin tooltip for user settings menu item.
+msgid "Configure search subscriptions"
+msgstr "Konfiguratu bilaketa harpidetzak"
+
+#. TRANS: Help message for IM/SMS command "track <word>"
+msgctxt "COMMANDHELP"
+msgid "Start following notices matching the given search query."
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "untrack <word>"
+msgctxt "COMMANDHELP"
+msgid "Stop following notices matching the given search query."
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "track off"
+#. TRANS: Help message for IM/SMS command "untrack all"
+msgctxt "COMMANDHELP"
+msgid "Disable all tracked search subscriptions."
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "tracks"
+#. TRANS: Help message for IM/SMS command "tracking"
+msgctxt "COMMANDHELP"
+msgid "List all your search subscriptions."
+msgstr ""
+
+#. TRANS: Error text shown a user tries to disable all a search subscriptions with track off command, but has none.
+msgid "You are not tracking any searches."
+msgstr "Ez zara bilaketarik jarraitzen ari."
+
+#. TRANS: Separator for list of tracked searches.
+msgctxt "SEPARATOR"
+msgid "\", \""
+msgstr ""
+
+#. TRANS: Message given having disabled all search subscriptions with 'track off'.
+#. TRANS: %s is a list of searches. Separator default is '", "'.
+#, php-format
+msgid "You are tracking searches for: \"%s\"."
+msgstr "Jarraitzen ari zaren bilaketak: \"%s\"."
+
+#. TRANS: Form legend.
+msgid "Subscribe to this search"
+msgstr "Harpidetu bilaketa honetara"
+
+#. TRANS: Button text for subscribing to a search.
+msgctxt "BUTTON"
+msgid "Subscribe"
+msgstr "Harpidetu"
+
+#. TRANS: Button title for subscribing to a search.
+msgid "Subscribe to this search."
+msgstr "Harpidetu bilaketa honetara"
+
+#. TRANS: Message given having failed to cancel one of the search subs with 'track off' command.
+#. TRANS: %s is the search for which the subscription removal failed.
+#, php-format
+msgid "Error disabling search subscription for query \"%s\"."
+msgstr ""
+
+#. TRANS: Message given having disabled all search subscriptions with 'track off'.
+msgid "Disabled all your search subscriptions."
+msgstr ""
diff --git a/plugins/SearchSub/locale/fr/LC_MESSAGES/SearchSub.po b/plugins/SearchSub/locale/fr/LC_MESSAGES/SearchSub.po
index 1abb6b766b..672e34a2d9 100644
--- a/plugins/SearchSub/locale/fr/LC_MESSAGES/SearchSub.po
+++ b/plugins/SearchSub/locale/fr/LC_MESSAGES/SearchSub.po
@@ -1,7 +1,8 @@
-# Translation of StatusNet - SearchSub to French (Français)
+# Translation of StatusNet - SearchSub to French (français)
 # Exported from translatewiki.net
 #
 # Author: Brunoperel
+# Author: Gomoko
 # Author: Iketsi
 # Author: Od1n
 # --
@@ -11,14 +12,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SearchSub\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:15+0000\n"
-"Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:56+0000\n"
+"Language-Team: French <https://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:20+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-12-03 13:49:08+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-searchsub\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
@@ -27,13 +28,13 @@ msgstr ""
 #. TRANS: %s is a user nickname.
 #, php-format
 msgid "%s's search subscriptions"
-msgstr ""
+msgstr "souscriptions aux recherches de %s"
 
 #. TRANS: Header for subscriptions overview for a user (not first page).
 #. TRANS: %1$s is a user nickname, %2$d is the page number.
 #, php-format
 msgid "%1$s's search subscriptions, page %2$d"
-msgstr ""
+msgstr "souscriptions aux recherches de %1$s, page %2$d"
 
 #. TRANS: Page notice for page with an overview of all search subscriptions
 #. TRANS: of the logged in user's own profile.
@@ -41,6 +42,8 @@ msgid ""
 "You have subscribed to receive all notices on this site matching the "
 "following searches:"
 msgstr ""
+"Vous vous êtes inscrit pour recevoir tous les avertissements de ce site "
+"correspondant aux recherches suivantes:"
 
 #. TRANS: Page notice for page with an overview of all subscriptions of a user other
 #. TRANS: than the logged in user. %s is the user nickname.
@@ -49,6 +52,8 @@ msgid ""
 "%s has subscribed to receive all notices on this site matching the following "
 "searches:"
 msgstr ""
+"%s s'est inscrit pour recevoir tous les avertissements de ce site "
+"correspondant aux recherches suivantes:"
 
 #. TRANS: Search subscription list text when the logged in user has no search subscriptions.
 msgid ""
@@ -57,6 +62,10 @@ msgid ""
 "public messages on this site that match that search, even if you are not "
 "subscribed to the poster."
 msgstr ""
+"Vous n'êtes désormais abonné à aucune des recherches de texte. Vous pouvez "
+"appuyer sur le bouton \"S'abonner\" sur n'importe quel avis de recherche de "
+"texte pour recevoir automatiquement les messages publics sur ce site qui "
+"correspondent à cette recherche, même si vous n'êtes pas abonné au publieur."
 
 #. TRANS: Search subscription list text when looking at the subscriptions for a of a user other
 #. TRANS: than the logged in user that has no search subscriptions. %s is the user nickname.
@@ -64,7 +73,7 @@ msgstr ""
 #. TRANS: as an anonymous user. %s is the user nickname.
 #, php-format
 msgid "%s is not subscribed to any searches."
-msgstr ""
+msgstr "%s n'est abonné à aucune recherche."
 
 #. TRANS: Search subscription list item. %1$s is a URL to a notice search,
 #. TRANS: %2$s are the search criteria, %3$s is a datestring.
@@ -73,17 +82,20 @@ msgid "\"<a href=\"%1$s\">%2$s</a>\" since %3$s"
 msgstr "\"<a href=\"%1$s\">%2$s</a>\" depuis le %3$s"
 
 #. TRANS: Error text shown a user tries to untrack a search query they're not subscribed to.
+#. TRANS: %s is the keyword for the search.
 #, php-format
 msgid "You are not tracking the search \"%s\"."
 msgstr "Vous ne surveillez pas la recherche \"%s\"."
 
 #. TRANS: Message given having failed to cancel a search subscription by untrack command.
+#. TRANS: %s is the keyword for the query.
 #, php-format
 msgid "Could not end a search subscription for query \"%s\"."
 msgstr ""
 "Impossible de mettre fin à un suivi de recherche pour la requête \"%s\"."
 
 #. TRANS: Message given having removed a search subscription by untrack command.
+#. TRANS: %s is the keyword for the search.
 #, php-format
 msgid "You are no longer subscribed to the search \"%s\"."
 msgstr "Vous ne surveillez plus la recherche \"%s\"."
@@ -110,16 +122,22 @@ msgstr "Profil non trouvé."
 msgid "Subscribed"
 msgstr "Abonné"
 
+#. TRANS: Form legend.
 msgid "Unsubscribe from this search"
 msgstr "Cesser la surveillance de cette recherche"
 
+#. TRANS: Button text for unsubscribing from a text search.
 msgctxt "BUTTON"
 msgid "Unsubscribe"
-msgstr ""
+msgstr "Se désabonner"
+
+#. TRANS: Button title for unsubscribing from a text search.
+msgid "Unsubscribe from this search."
+msgstr "Se désabonner de cette recherche."
 
 #. TRANS: Page title when search unsubscription succeeded.
 msgid "Unsubscribed"
-msgstr "désabonné"
+msgstr "Désabonné"
 
 #. TRANS: Error text shown a user tries to track a search query they're already subscribed to.
 #, php-format
@@ -130,6 +148,7 @@ msgstr "Vous surveillez déjà la recherche \"%s\"."
 #, php-format
 msgid "Could not start a search subscription for query \"%s\"."
 msgstr ""
+"Impossible de démarrer l'abonnement à une recherche pour la requête \"%s\"."
 
 #. TRANS: Message given having added a search subscription by track command.
 #, php-format
@@ -142,6 +161,7 @@ msgstr ""
 "Plugin pour permettre de suivre tous les messages pour une recherche donnée."
 
 #. TRANS: SearchSub plugin menu item on user settings page.
+#. TRANS: Sub menu for searches.
 msgctxt "MENU"
 msgid "Searches"
 msgstr "Recherches"
@@ -154,17 +174,21 @@ msgstr "Configurer les surveillances de recherche"
 msgctxt "COMMANDHELP"
 msgid "Start following notices matching the given search query."
 msgstr ""
+"Commencer le suivi des notifications correspondant à la requête de recherche "
+"fournie."
 
 #. TRANS: Help message for IM/SMS command "untrack <word>"
 msgctxt "COMMANDHELP"
 msgid "Stop following notices matching the given search query."
 msgstr ""
+"Arrêter le suivi des notifications correspondant à la requête de recherche "
+"fournie."
 
 #. TRANS: Help message for IM/SMS command "track off"
 #. TRANS: Help message for IM/SMS command "untrack all"
 msgctxt "COMMANDHELP"
 msgid "Disable all tracked search subscriptions."
-msgstr ""
+msgstr "Désactiver tous les abonnements aux recherches suivies."
 
 #. TRANS: Help message for IM/SMS command "tracks"
 #. TRANS: Help message for IM/SMS command "tracking"
@@ -172,26 +196,36 @@ msgctxt "COMMANDHELP"
 msgid "List all your search subscriptions."
 msgstr "Lister toutes vos surveillances de recherche."
 
-msgid "Searches"
-msgstr "Recherches"
-
 #. TRANS: Error text shown a user tries to disable all a search subscriptions with track off command, but has none.
 msgid "You are not tracking any searches."
 msgstr "Vous ne surveillez aucune recherche."
 
-#. TRANS: Message given having disabled all search subscriptions with 'track off'.
-#, php-format
-msgid "You are tracking searches for: %s"
-msgstr "Vous effectuez la surveillance des recherches pour: %s"
+#. TRANS: Separator for list of tracked searches.
+msgctxt "SEPARATOR"
+msgid "\", \""
+msgstr "\", \""
 
+#. TRANS: Message given having disabled all search subscriptions with 'track off'.
+#. TRANS: %s is a list of searches. Separator default is '", "'.
+#, php-format
+msgid "You are tracking searches for: \"%s\"."
+msgstr "Vous effectuez le suivi des recherches pour: \"%s\"."
+
+#. TRANS: Form legend.
 msgid "Subscribe to this search"
 msgstr "S’abonner à cette recherche"
 
+#. TRANS: Button text for subscribing to a search.
 msgctxt "BUTTON"
 msgid "Subscribe"
 msgstr "S’abonner"
 
+#. TRANS: Button title for subscribing to a search.
+msgid "Subscribe to this search."
+msgstr "S’abonner à cette recherche."
+
 #. TRANS: Message given having failed to cancel one of the search subs with 'track off' command.
+#. TRANS: %s is the search for which the subscription removal failed.
 #, php-format
 msgid "Error disabling search subscription for query \"%s\"."
 msgstr ""
diff --git a/plugins/SearchSub/locale/gl/LC_MESSAGES/SearchSub.po b/plugins/SearchSub/locale/gl/LC_MESSAGES/SearchSub.po
new file mode 100644
index 0000000000..6b97fabb23
--- /dev/null
+++ b/plugins/SearchSub/locale/gl/LC_MESSAGES/SearchSub.po
@@ -0,0 +1,226 @@
+# Translation of StatusNet - SearchSub to Galician (galego)
+# Exported from translatewiki.net
+#
+# Author: Toliño
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - SearchSub\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:56+0000\n"
+"Language-Team: Galician <https://translatewiki.net/wiki/Portal:gl>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-12-03 13:49:08+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: gl\n"
+"X-Message-Group: #out-statusnet-plugin-searchsub\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Header for subscriptions overview for a user (first page).
+#. TRANS: %s is a user nickname.
+#, php-format
+msgid "%s's search subscriptions"
+msgstr "Subscricións a procuras de %s"
+
+#. TRANS: Header for subscriptions overview for a user (not first page).
+#. TRANS: %1$s is a user nickname, %2$d is the page number.
+#, php-format
+msgid "%1$s's search subscriptions, page %2$d"
+msgstr "Subscricións a procuras de %1$s, páxina %2$d"
+
+#. TRANS: Page notice for page with an overview of all search subscriptions
+#. TRANS: of the logged in user's own profile.
+msgid ""
+"You have subscribed to receive all notices on this site matching the "
+"following searches:"
+msgstr ""
+"Subscribiuse para recibir todas as notas do sitio que conteñan as seguintes "
+"procuras:"
+
+#. TRANS: Page notice for page with an overview of all subscriptions of a user other
+#. TRANS: than the logged in user. %s is the user nickname.
+#, php-format
+msgid ""
+"%s has subscribed to receive all notices on this site matching the following "
+"searches:"
+msgstr ""
+"%s subscribiuse para recibir todas as notas do sitio que conteñan as "
+"seguintes procuras:"
+
+#. TRANS: Search subscription list text when the logged in user has no search subscriptions.
+msgid ""
+"You are not subscribed to any text searches right now. You can push the "
+"\"Subscribe\" button on any notice text search to automatically receive any "
+"public messages on this site that match that search, even if you are not "
+"subscribed to the poster."
+msgstr ""
+"Non está a seguir ningunha procura nestes intres. Pode premer no botón "
+"\"Subscribirse\" de calquera procura de texto para recibir automaticamente "
+"calquera mensaxe pública deste sitio que coincida coa procura, mesmo se non "
+"está subscrito ao autor."
+
+#. TRANS: Search subscription list text when looking at the subscriptions for a of a user other
+#. TRANS: than the logged in user that has no search subscriptions. %s is the user nickname.
+#. TRANS: Subscription list text when looking at the subscriptions for a of a user that has none
+#. TRANS: as an anonymous user. %s is the user nickname.
+#, php-format
+msgid "%s is not subscribed to any searches."
+msgstr "%s non está subscrito a ningunha procura."
+
+#. TRANS: Search subscription list item. %1$s is a URL to a notice search,
+#. TRANS: %2$s are the search criteria, %3$s is a datestring.
+#, php-format
+msgid "\"<a href=\"%1$s\">%2$s</a>\" since %3$s"
+msgstr "\"<a href=\"%1$s\">%2$s</a>\" desde %3$s"
+
+#. TRANS: Error text shown a user tries to untrack a search query they're not subscribed to.
+#. TRANS: %s is the keyword for the search.
+#, php-format
+msgid "You are not tracking the search \"%s\"."
+msgstr "Non está a seguir a procura \"%s\"."
+
+#. TRANS: Message given having failed to cancel a search subscription by untrack command.
+#. TRANS: %s is the keyword for the query.
+#, php-format
+msgid "Could not end a search subscription for query \"%s\"."
+msgstr "Non se puido rematar a subscrición á procura para a pescuda \"%s\"."
+
+#. TRANS: Message given having removed a search subscription by untrack command.
+#. TRANS: %s is the keyword for the search.
+#, php-format
+msgid "You are no longer subscribed to the search \"%s\"."
+msgstr "Xa non está subscrito á procura \"%s\"."
+
+#. TRANS: Client error displayed trying to perform any request method other than POST.
+#. TRANS: Do not translate POST.
+msgid "This action only accepts POST requests."
+msgstr "Esta acción só permite solicitudes POST."
+
+#. TRANS: Client error displayed when the session token is not okay.
+msgid "There was a problem with your session token. Try again, please."
+msgstr "Houbo un erro co seu pase. Inténteo de novo."
+
+#. TRANS: Error message displayed when trying to perform an action that requires a logged in user.
+msgid "Not logged in."
+msgstr "Non iniciou sesión."
+
+#. TRANS: Client error displayed trying to subscribe to a non-existing profile.
+msgid "No such profile."
+msgstr "Non existe ese perfil."
+
+#. TRANS: Page title when search subscription succeeded.
+msgid "Subscribed"
+msgstr "Subscrito"
+
+#. TRANS: Form legend.
+msgid "Unsubscribe from this search"
+msgstr "Cancelar a subscrición a esta procura"
+
+#. TRANS: Button text for unsubscribing from a text search.
+msgctxt "BUTTON"
+msgid "Unsubscribe"
+msgstr "Cancelar a subscrición"
+
+#. TRANS: Button title for unsubscribing from a text search.
+msgid "Unsubscribe from this search."
+msgstr "Cancelar a subscrición a esta procura."
+
+#. TRANS: Page title when search unsubscription succeeded.
+msgid "Unsubscribed"
+msgstr "Cancelouse a subscrición"
+
+#. TRANS: Error text shown a user tries to track a search query they're already subscribed to.
+#, php-format
+msgid "You are already tracking the search \"%s\"."
+msgstr "Xa está a seguir a procura \"%s\"."
+
+#. TRANS: Message given having failed to set up a search subscription by track command.
+#, php-format
+msgid "Could not start a search subscription for query \"%s\"."
+msgstr "Non se puido iniciar a subscrición á procura para a pescuda \"%s\"."
+
+#. TRANS: Message given having added a search subscription by track command.
+#, php-format
+msgid "You are subscribed to the search \"%s\"."
+msgstr "Está subscrito á procura \"%s\"."
+
+#. TRANS: Plugin description.
+msgid "Plugin to allow following all messages with a given search."
+msgstr ""
+"Complemento para permitir seguir todas as mensaxes cunha procura "
+"especificada."
+
+#. TRANS: SearchSub plugin menu item on user settings page.
+#. TRANS: Sub menu for searches.
+msgctxt "MENU"
+msgid "Searches"
+msgstr "Procuras"
+
+#. TRANS: SearchSub plugin tooltip for user settings menu item.
+msgid "Configure search subscriptions"
+msgstr "Configurar as subscricións ás procuras"
+
+#. TRANS: Help message for IM/SMS command "track <word>"
+msgctxt "COMMANDHELP"
+msgid "Start following notices matching the given search query."
+msgstr "Comezar a seguir as notas que coincidan coa pescuda especificada."
+
+#. TRANS: Help message for IM/SMS command "untrack <word>"
+msgctxt "COMMANDHELP"
+msgid "Stop following notices matching the given search query."
+msgstr "Deixar de seguir as notas que coincidan coa pescuda especificada."
+
+#. TRANS: Help message for IM/SMS command "track off"
+#. TRANS: Help message for IM/SMS command "untrack all"
+msgctxt "COMMANDHELP"
+msgid "Disable all tracked search subscriptions."
+msgstr "Desactivar todas as subscricións ás procuras que está a seguir."
+
+#. TRANS: Help message for IM/SMS command "tracks"
+#. TRANS: Help message for IM/SMS command "tracking"
+msgctxt "COMMANDHELP"
+msgid "List all your search subscriptions."
+msgstr "Listar todas as subscricións a procuras."
+
+#. TRANS: Error text shown a user tries to disable all a search subscriptions with track off command, but has none.
+msgid "You are not tracking any searches."
+msgstr "Non está a seguir a procura ningunha."
+
+#. TRANS: Separator for list of tracked searches.
+msgctxt "SEPARATOR"
+msgid "\", \""
+msgstr "\", \""
+
+#. TRANS: Message given having disabled all search subscriptions with 'track off'.
+#. TRANS: %s is a list of searches. Separator default is '", "'.
+#, php-format
+msgid "You are tracking searches for: \"%s\"."
+msgstr "Está a seguir as procuras de: \"%s\"."
+
+#. TRANS: Form legend.
+msgid "Subscribe to this search"
+msgstr "Subscribirse a esta procura"
+
+#. TRANS: Button text for subscribing to a search.
+msgctxt "BUTTON"
+msgid "Subscribe"
+msgstr "Subscribirse"
+
+#. TRANS: Button title for subscribing to a search.
+msgid "Subscribe to this search."
+msgstr "Subscribirse a esta procura."
+
+#. TRANS: Message given having failed to cancel one of the search subs with 'track off' command.
+#. TRANS: %s is the search for which the subscription removal failed.
+#, php-format
+msgid "Error disabling search subscription for query \"%s\"."
+msgstr "Erro ao desactivar a subscrición á procura da pescuda \"%s\"."
+
+#. TRANS: Message given having disabled all search subscriptions with 'track off'.
+msgid "Disabled all your search subscriptions."
+msgstr "Desactivar todas as subscricións a procuras."
diff --git a/plugins/SearchSub/locale/ia/LC_MESSAGES/SearchSub.po b/plugins/SearchSub/locale/ia/LC_MESSAGES/SearchSub.po
index ba4d5cee11..43f0b67806 100644
--- a/plugins/SearchSub/locale/ia/LC_MESSAGES/SearchSub.po
+++ b/plugins/SearchSub/locale/ia/LC_MESSAGES/SearchSub.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - SearchSub to Interlingua (Interlingua)
+# Translation of StatusNet - SearchSub to Interlingua (interlingua)
 # Exported from translatewiki.net
 #
 # Author: McDutchie
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SearchSub\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:15+0000\n"
-"Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:56+0000\n"
+"Language-Team: Interlingua <https://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:20+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-12-03 13:49:08+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-searchsub\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -79,16 +79,19 @@ msgid "\"<a href=\"%1$s\">%2$s</a>\" since %3$s"
 msgstr "\"<a href=\"%1$s\">%2$s</a>\" depost %3$s"
 
 #. TRANS: Error text shown a user tries to untrack a search query they're not subscribed to.
+#. TRANS: %s is the keyword for the search.
 #, php-format
 msgid "You are not tracking the search \"%s\"."
 msgstr "Tu non tracia le recerca \"%s\"."
 
 #. TRANS: Message given having failed to cancel a search subscription by untrack command.
+#. TRANS: %s is the keyword for the query.
 #, php-format
 msgid "Could not end a search subscription for query \"%s\"."
 msgstr "Non poteva terminar un subscription al recerca de \"%s\"."
 
 #. TRANS: Message given having removed a search subscription by untrack command.
+#. TRANS: %s is the keyword for the search.
 #, php-format
 msgid "You are no longer subscribed to the search \"%s\"."
 msgstr "Tu non es plus subscribite al recerca de \"%s\"."
@@ -114,13 +117,19 @@ msgstr "Profilo non existe."
 msgid "Subscribed"
 msgstr "Subscribite"
 
+#. TRANS: Form legend.
 msgid "Unsubscribe from this search"
 msgstr "Cancellar subscription a iste recerca"
 
+#. TRANS: Button text for unsubscribing from a text search.
 msgctxt "BUTTON"
 msgid "Unsubscribe"
 msgstr "Cancellar subscription"
 
+#. TRANS: Button title for unsubscribing from a text search.
+msgid "Unsubscribe from this search."
+msgstr "Cancellar subscription a iste recerca."
+
 #. TRANS: Page title when search unsubscription succeeded.
 msgid "Unsubscribed"
 msgstr "Subscription cancellate"
@@ -147,6 +156,7 @@ msgstr ""
 "specificate."
 
 #. TRANS: SearchSub plugin menu item on user settings page.
+#. TRANS: Sub menu for searches.
 msgctxt "MENU"
 msgid "Searches"
 msgstr "Recercas"
@@ -179,26 +189,36 @@ msgctxt "COMMANDHELP"
 msgid "List all your search subscriptions."
 msgstr "Listar tote tu subscriptiones de recerca."
 
-msgid "Searches"
-msgstr "Recercas"
-
 #. TRANS: Error text shown a user tries to disable all a search subscriptions with track off command, but has none.
 msgid "You are not tracking any searches."
 msgstr "Tu non tracia alcun recerca."
 
-#. TRANS: Message given having disabled all search subscriptions with 'track off'.
-#, php-format
-msgid "You are tracking searches for: %s"
-msgstr "Tu tracia recercas de: %s"
+#. TRANS: Separator for list of tracked searches.
+msgctxt "SEPARATOR"
+msgid "\", \""
+msgstr "\", \""
 
+#. TRANS: Message given having disabled all search subscriptions with 'track off'.
+#. TRANS: %s is a list of searches. Separator default is '", "'.
+#, php-format
+msgid "You are tracking searches for: \"%s\"."
+msgstr "Tu tracia le recercas de: \"%s\"."
+
+#. TRANS: Form legend.
 msgid "Subscribe to this search"
 msgstr "Subscriber a iste recerca"
 
+#. TRANS: Button text for subscribing to a search.
 msgctxt "BUTTON"
 msgid "Subscribe"
 msgstr "Subscriber"
 
+#. TRANS: Button title for subscribing to a search.
+msgid "Subscribe to this search."
+msgstr "Subscriber a iste recerca."
+
 #. TRANS: Message given having failed to cancel one of the search subs with 'track off' command.
+#. TRANS: %s is the search for which the subscription removal failed.
 #, php-format
 msgid "Error disabling search subscription for query \"%s\"."
 msgstr ""
diff --git a/plugins/SearchSub/locale/mk/LC_MESSAGES/SearchSub.po b/plugins/SearchSub/locale/mk/LC_MESSAGES/SearchSub.po
index bf492f7e58..dbd550ae18 100644
--- a/plugins/SearchSub/locale/mk/LC_MESSAGES/SearchSub.po
+++ b/plugins/SearchSub/locale/mk/LC_MESSAGES/SearchSub.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - SearchSub to Macedonian (Македон�ки)
+# Translation of StatusNet - SearchSub to Macedonian (македон�ки)
 # Exported from translatewiki.net
 #
 # Author: Bjankuloski06
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SearchSub\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:15+0000\n"
-"Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:56+0000\n"
+"Language-Team: Macedonian <https://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:20+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-12-03 13:49:08+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-searchsub\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
@@ -80,16 +80,19 @@ msgid "\"<a href=\"%1$s\">%2$s</a>\" since %3$s"
 msgstr "„<a href=\"%1$s\">%2$s</a>“ од %3$s"
 
 #. TRANS: Error text shown a user tries to untrack a search query they're not subscribed to.
+#. TRANS: %s is the keyword for the search.
 #, php-format
 msgid "You are not tracking the search \"%s\"."
 msgstr "�е го �ледите пребарувањето „%s“."
 
 #. TRANS: Message given having failed to cancel a search subscription by untrack command.
+#. TRANS: %s is the keyword for the query.
 #, php-format
 msgid "Could not end a search subscription for query \"%s\"."
 msgstr "�е можев да ја прекратам претплатата на барањето „%s“."
 
 #. TRANS: Message given having removed a search subscription by untrack command.
+#. TRANS: %s is the keyword for the search.
 #, php-format
 msgid "You are no longer subscribed to the search \"%s\"."
 msgstr "Повеќе не �те претплатени на пребарувањето „%s“."
@@ -115,13 +118,19 @@ msgstr "�ема таков профил."
 msgid "Subscribed"
 msgstr "Претплатено"
 
+#. TRANS: Form legend.
 msgid "Unsubscribe from this search"
 msgstr "Откажи претплата на ова пребарување"
 
+#. TRANS: Button text for unsubscribing from a text search.
 msgctxt "BUTTON"
 msgid "Unsubscribe"
 msgstr "Откажи претплата"
 
+#. TRANS: Button title for unsubscribing from a text search.
+msgid "Unsubscribe from this search."
+msgstr "Откажи претплата на ова пребарување."
+
 #. TRANS: Page title when search unsubscription succeeded.
 msgid "Unsubscribed"
 msgstr "Претплатата е откажана"
@@ -147,6 +156,7 @@ msgstr ""
 "Приклучок што овозможува �ледење на �ите пораки од изве�но пребарување."
 
 #. TRANS: SearchSub plugin menu item on user settings page.
+#. TRANS: Sub menu for searches.
 msgctxt "MENU"
 msgid "Searches"
 msgstr "Пребарувања"
@@ -177,26 +187,36 @@ msgctxt "COMMANDHELP"
 msgid "List all your search subscriptions."
 msgstr "Ги наведува �ите пребарувања на кои �те претплатени."
 
-msgid "Searches"
-msgstr "Пребарувања"
-
 #. TRANS: Error text shown a user tries to disable all a search subscriptions with track off command, but has none.
 msgid "You are not tracking any searches."
 msgstr "�е �ледите никакви пребарувања."
 
-#. TRANS: Message given having disabled all search subscriptions with 'track off'.
-#, php-format
-msgid "You are tracking searches for: %s"
-msgstr "Следите пребарувања на: %s"
+#. TRANS: Separator for list of tracked searches.
+msgctxt "SEPARATOR"
+msgid "\", \""
+msgstr "„, “"
 
+#. TRANS: Message given having disabled all search subscriptions with 'track off'.
+#. TRANS: %s is a list of searches. Separator default is '", "'.
+#, php-format
+msgid "You are tracking searches for: \"%s\"."
+msgstr "Ги �ледите пребарувањата на: „%s“."
+
+#. TRANS: Form legend.
 msgid "Subscribe to this search"
 msgstr "Претплати �е на пребарувањево"
 
+#. TRANS: Button text for subscribing to a search.
 msgctxt "BUTTON"
 msgid "Subscribe"
 msgstr "Претплати �е"
 
+#. TRANS: Button title for subscribing to a search.
+msgid "Subscribe to this search."
+msgstr "Претплати �е на пребарувањево."
+
 #. TRANS: Message given having failed to cancel one of the search subs with 'track off' command.
+#. TRANS: %s is the search for which the subscription removal failed.
 #, php-format
 msgid "Error disabling search subscription for query \"%s\"."
 msgstr "Грешка при оневозможувањето на претплатата за барањето „%s“."
diff --git a/plugins/SearchSub/locale/nl/LC_MESSAGES/SearchSub.po b/plugins/SearchSub/locale/nl/LC_MESSAGES/SearchSub.po
index 6272ab78b2..942c6555ad 100644
--- a/plugins/SearchSub/locale/nl/LC_MESSAGES/SearchSub.po
+++ b/plugins/SearchSub/locale/nl/LC_MESSAGES/SearchSub.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SearchSub\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:15+0000\n"
-"Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:56+0000\n"
+"Language-Team: Dutch <https://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:20+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-12-03 13:49:08+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-searchsub\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -79,16 +79,19 @@ msgid "\"<a href=\"%1$s\">%2$s</a>\" since %3$s"
 msgstr "<a href=\"%1$s\">%2$s</a>\" sinds %3$s"
 
 #. TRANS: Error text shown a user tries to untrack a search query they're not subscribed to.
+#. TRANS: %s is the keyword for the search.
 #, php-format
 msgid "You are not tracking the search \"%s\"."
 msgstr "U hebt geen abonnement op de zoekopdracht \"%s\"."
 
 #. TRANS: Message given having failed to cancel a search subscription by untrack command.
+#. TRANS: %s is the keyword for the query.
 #, php-format
 msgid "Could not end a search subscription for query \"%s\"."
 msgstr "Het opzeggen van het abonnement op de zoekopdracht \"%s\" is mislukt."
 
 #. TRANS: Message given having removed a search subscription by untrack command.
+#. TRANS: %s is the keyword for the search.
 #, php-format
 msgid "You are no longer subscribed to the search \"%s\"."
 msgstr "U hebt niet langer meer een abonnement op de zoekopdracht \"%s\"."
@@ -116,13 +119,19 @@ msgstr "Het profiel bestaat niet."
 msgid "Subscribed"
 msgstr "Geabonneerd"
 
+#. TRANS: Form legend.
 msgid "Unsubscribe from this search"
 msgstr "Abonnement op deze zoekopdracht opzeggen"
 
+#. TRANS: Button text for unsubscribing from a text search.
 msgctxt "BUTTON"
 msgid "Unsubscribe"
 msgstr "Uitschrijven"
 
+#. TRANS: Button title for unsubscribing from a text search.
+msgid "Unsubscribe from this search."
+msgstr "Het abonnement op deze zoekopdracht opzeggen."
+
 #. TRANS: Page title when search unsubscription succeeded.
 msgid "Unsubscribed"
 msgstr "Het abonnement is opgezegd"
@@ -148,6 +157,7 @@ msgid "Plugin to allow following all messages with a given search."
 msgstr "Plug-in om mededelingen via een zoekopdracht te volgen."
 
 #. TRANS: SearchSub plugin menu item on user settings page.
+#. TRANS: Sub menu for searches.
 msgctxt "MENU"
 msgid "Searches"
 msgstr "Zoekopdrachten"
@@ -178,26 +188,36 @@ msgctxt "COMMANDHELP"
 msgid "List all your search subscriptions."
 msgstr "Al uw abonnementen op zoekopdrachten beëindigen."
 
-msgid "Searches"
-msgstr "Zoekopdrachten"
-
 #. TRANS: Error text shown a user tries to disable all a search subscriptions with track off command, but has none.
 msgid "You are not tracking any searches."
 msgstr "U volgt geen zoekopdrachten."
 
-#. TRANS: Message given having disabled all search subscriptions with 'track off'.
-#, php-format
-msgid "You are tracking searches for: %s"
-msgstr "U volgt zoekopdrachten naar: %s."
+#. TRANS: Separator for list of tracked searches.
+msgctxt "SEPARATOR"
+msgid "\", \""
+msgstr "\", \""
 
+#. TRANS: Message given having disabled all search subscriptions with 'track off'.
+#. TRANS: %s is a list of searches. Separator default is '", "'.
+#, php-format
+msgid "You are tracking searches for: \"%s\"."
+msgstr "U volgt zoekopdrachten naar: \"%s\"."
+
+#. TRANS: Form legend.
 msgid "Subscribe to this search"
 msgstr "Deze zoekopdracht volgen"
 
+#. TRANS: Button text for subscribing to a search.
 msgctxt "BUTTON"
 msgid "Subscribe"
 msgstr "Abonneren"
 
+#. TRANS: Button title for subscribing to a search.
+msgid "Subscribe to this search."
+msgstr "Deze zoekopdracht volgen."
+
 #. TRANS: Message given having failed to cancel one of the search subs with 'track off' command.
+#. TRANS: %s is the search for which the subscription removal failed.
 #, php-format
 msgid "Error disabling search subscription for query \"%s\"."
 msgstr ""
diff --git a/plugins/SearchSub/locale/tl/LC_MESSAGES/SearchSub.po b/plugins/SearchSub/locale/tl/LC_MESSAGES/SearchSub.po
index 687fd5eab8..8123ad1d42 100644
--- a/plugins/SearchSub/locale/tl/LC_MESSAGES/SearchSub.po
+++ b/plugins/SearchSub/locale/tl/LC_MESSAGES/SearchSub.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SearchSub\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:16+0000\n"
-"Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:56+0000\n"
+"Language-Team: Tagalog <https://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:20+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-12-03 13:49:08+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-searchsub\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -80,11 +80,13 @@ msgid "\"<a href=\"%1$s\">%2$s</a>\" since %3$s"
 msgstr "\"<a href=\"%1$s\">%2$s</a>\" magmula noong %3$s"
 
 #. TRANS: Error text shown a user tries to untrack a search query they're not subscribed to.
+#. TRANS: %s is the keyword for the search.
 #, php-format
 msgid "You are not tracking the search \"%s\"."
 msgstr "Hindi mo sinusubaybayan ang paghahanap ng \"%s\"."
 
 #. TRANS: Message given having failed to cancel a search subscription by untrack command.
+#. TRANS: %s is the keyword for the query.
 #, php-format
 msgid "Could not end a search subscription for query \"%s\"."
 msgstr ""
@@ -92,6 +94,7 @@ msgstr ""
 "s\"."
 
 #. TRANS: Message given having removed a search subscription by untrack command.
+#. TRANS: %s is the keyword for the search.
 #, php-format
 msgid "You are no longer subscribed to the search \"%s\"."
 msgstr "Hindi ka na nagpapasipi sa paghahanap ng \"%s\"."
@@ -118,13 +121,19 @@ msgstr "Walang ganyang balangkas."
 msgid "Subscribed"
 msgstr "Nagpapasipi na"
 
+#. TRANS: Form legend.
 msgid "Unsubscribe from this search"
 msgstr "Huwag nang magpasipi mula sa paghahanap na ito"
 
+#. TRANS: Button text for unsubscribing from a text search.
 msgctxt "BUTTON"
 msgid "Unsubscribe"
 msgstr "Pahintuin na ang pagtanggap ng sipi"
 
+#. TRANS: Button title for unsubscribing from a text search.
+msgid "Unsubscribe from this search."
+msgstr "Huwag nang magpasipi magmula sa paghahanap na ito"
+
 #. TRANS: Page title when search unsubscription succeeded.
 msgid "Unsubscribed"
 msgstr "Hindi na nagpapasipi"
@@ -152,6 +161,7 @@ msgstr ""
 "ibinigay na paghahanap."
 
 #. TRANS: SearchSub plugin menu item on user settings page.
+#. TRANS: Sub menu for searches.
 msgctxt "MENU"
 msgid "Searches"
 msgstr "Mga paghahanap"
@@ -186,26 +196,36 @@ msgctxt "COMMANDHELP"
 msgid "List all your search subscriptions."
 msgstr "Itala ang lahat ng mga pagpapasipi mo ng paghahanap."
 
-msgid "Searches"
-msgstr "Mga paghahanap"
-
 #. TRANS: Error text shown a user tries to disable all a search subscriptions with track off command, but has none.
 msgid "You are not tracking any searches."
 msgstr "Hindi ka sumusubaybay ng anumang mga paghahanap."
 
-#. TRANS: Message given having disabled all search subscriptions with 'track off'.
-#, php-format
-msgid "You are tracking searches for: %s"
-msgstr "Sinusubaybayan mo ang mga paghahanap para sa: %s"
+#. TRANS: Separator for list of tracked searches.
+msgctxt "SEPARATOR"
+msgid "\", \""
+msgstr "\", \""
 
+#. TRANS: Message given having disabled all search subscriptions with 'track off'.
+#. TRANS: %s is a list of searches. Separator default is '", "'.
+#, php-format
+msgid "You are tracking searches for: \"%s\"."
+msgstr "Sinusubaybayan mo ang mga paghahanap para sa: \"%s\"."
+
+#. TRANS: Form legend.
 msgid "Subscribe to this search"
 msgstr "Magpasipi para sa paghahanap na ito"
 
+#. TRANS: Button text for subscribing to a search.
 msgctxt "BUTTON"
 msgid "Subscribe"
 msgstr "Pumayag na tumanggap ng sipi"
 
+#. TRANS: Button title for subscribing to a search.
+msgid "Subscribe to this search."
+msgstr "Magpasipi para sa paghahanap na ito."
+
 #. TRANS: Message given having failed to cancel one of the search subs with 'track off' command.
+#. TRANS: %s is the search for which the subscription removal failed.
 #, php-format
 msgid "Error disabling search subscription for query \"%s\"."
 msgstr ""
diff --git a/plugins/SearchSub/locale/uk/LC_MESSAGES/SearchSub.po b/plugins/SearchSub/locale/uk/LC_MESSAGES/SearchSub.po
index 5530bb1fee..3e0686c84e 100644
--- a/plugins/SearchSub/locale/uk/LC_MESSAGES/SearchSub.po
+++ b/plugins/SearchSub/locale/uk/LC_MESSAGES/SearchSub.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - SearchSub to Ukrainian (Україн�ька)
+# Translation of StatusNet - SearchSub to Ukrainian (україн�ька)
 # Exported from translatewiki.net
 #
 # Author: Boogie
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SearchSub\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:16+0000\n"
-"Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:57+0000\n"
+"Language-Team: Ukrainian <https://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:20+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-12-03 13:49:08+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-searchsub\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
@@ -81,16 +81,19 @@ msgid "\"<a href=\"%1$s\">%2$s</a>\" since %3$s"
 msgstr "«<a href=\"%1$s\">%2$s</a>» прот�гом %3$s"
 
 #. TRANS: Error text shown a user tries to untrack a search query they're not subscribed to.
+#. TRANS: %s is the keyword for the search.
 #, php-format
 msgid "You are not tracking the search \"%s\"."
 msgstr "Ви не від�тежує пошук «%s»."
 
 #. TRANS: Message given having failed to cancel a search subscription by untrack command.
+#. TRANS: %s is the keyword for the query.
 #, php-format
 msgid "Could not end a search subscription for query \"%s\"."
 msgstr "�еможливо закінчити пошукову підпи�ку за запитом «%s»."
 
 #. TRANS: Message given having removed a search subscription by untrack command.
+#. TRANS: %s is the keyword for the search.
 #, php-format
 msgid "You are no longer subscribed to the search \"%s\"."
 msgstr "Ви більше не підпи�ані на пошук «%s»."
@@ -116,13 +119,19 @@ msgstr "�емає такого профілю."
 msgid "Subscribed"
 msgstr "Підпи�ані"
 
+#. TRANS: Form legend.
 msgid "Unsubscribe from this search"
 msgstr "Відмовити�� від цього пошуку"
 
+#. TRANS: Button text for unsubscribing from a text search.
 msgctxt "BUTTON"
 msgid "Unsubscribe"
 msgstr "Відпи�ати�ь"
 
+#. TRANS: Button title for unsubscribing from a text search.
+msgid "Unsubscribe from this search."
+msgstr "Відпи�ати�� від цього пошуку."
+
 #. TRANS: Page title when search unsubscription succeeded.
 msgid "Unsubscribed"
 msgstr "Відпи�ано"
@@ -148,6 +157,7 @@ msgstr ""
 "Додаток, �кий дозвол�є від�лідковувати допи�и за певними параметрами пошуку."
 
 #. TRANS: SearchSub plugin menu item on user settings page.
+#. TRANS: Sub menu for searches.
 msgctxt "MENU"
 msgid "Searches"
 msgstr "Пошуки"
@@ -181,26 +191,36 @@ msgctxt "COMMANDHELP"
 msgid "List all your search subscriptions."
 msgstr "Спи�ок пошукових запитів, за �кими ви �лідкуєте."
 
-msgid "Searches"
-msgstr "Пошуки"
-
 #. TRANS: Error text shown a user tries to disable all a search subscriptions with track off command, but has none.
 msgid "You are not tracking any searches."
 msgstr "�е ви від�тежуєте жодні пошукові запити."
 
-#. TRANS: Message given having disabled all search subscriptions with 'track off'.
-#, php-format
-msgid "You are tracking searches for: %s"
-msgstr "Ви від�лідковуєте пошуки дл�: %s"
+#. TRANS: Separator for list of tracked searches.
+msgctxt "SEPARATOR"
+msgid "\", \""
+msgstr "«, »"
 
+#. TRANS: Message given having disabled all search subscriptions with 'track off'.
+#. TRANS: %s is a list of searches. Separator default is '", "'.
+#, php-format
+msgid "You are tracking searches for: \"%s\"."
+msgstr "Ви від�лідковуєте пошуки дл�: «%s»."
+
+#. TRANS: Form legend.
 msgid "Subscribe to this search"
 msgstr "Підпи�ати�� до даного пошуку"
 
+#. TRANS: Button text for subscribing to a search.
 msgctxt "BUTTON"
 msgid "Subscribe"
 msgstr "Підпи�ати�ь"
 
+#. TRANS: Button title for subscribing to a search.
+msgid "Subscribe to this search."
+msgstr "Підпи�ати�� до цього пошуку."
+
 #. TRANS: Message given having failed to cancel one of the search subs with 'track off' command.
+#. TRANS: %s is the search for which the subscription removal failed.
 #, php-format
 msgid "Error disabling search subscription for query \"%s\"."
 msgstr "Помилка при �ка�уванні пошукової підпи�ки «%s»."
diff --git a/plugins/SearchSub/searchsubform.php b/plugins/SearchSub/searchsubform.php
index 7b05377397..4d44910e67 100644
--- a/plugins/SearchSub/searchsubform.php
+++ b/plugins/SearchSub/searchsubform.php
@@ -46,13 +46,11 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
  *
  * @see      UnsubscribeForm
  */
-
 class SearchSubForm extends Form
 {
     /**
      * Name of search to subscribe to
      */
-
     var $search = '';
 
     /**
@@ -61,7 +59,6 @@ class SearchSubForm extends Form
      * @param HTMLOutputter $out     output channel
      * @param string        $search     name of search to subscribe to
      */
-
     function __construct($out=null, $search=null)
     {
         parent::__construct($out);
@@ -74,7 +71,6 @@ class SearchSubForm extends Form
      *
      * @return int ID of the form
      */
-
     function id()
     {
         return 'search-subscribe-' . $this->search;
@@ -86,7 +82,6 @@ class SearchSubForm extends Form
      *
      * @return string of the form class
      */
-
     function formClass()
     {
         // class to match existing styles...
@@ -99,13 +94,11 @@ class SearchSubForm extends Form
      *
      * @return string URL of the action
      */
-
     function action()
     {
         return common_local_url('searchsub', array('search' => $this->search));
     }
 
-
     /**
      * Legend of the Form
      *
@@ -113,6 +106,7 @@ class SearchSubForm extends Form
      */
     function formLegend()
     {
+        // TRANS: Form legend.
         $this->out->element('legend', null, _m('Subscribe to this search'));
     }
 
@@ -121,7 +115,6 @@ class SearchSubForm extends Form
      *
      * @return void
      */
-
     function formData()
     {
         $this->out->hidden('subscribeto-' . $this->search,
@@ -134,9 +127,14 @@ class SearchSubForm extends Form
      *
      * @return void
      */
-
     function formActions()
     {
-        $this->out->submit('submit', _m('BUTTON','Subscribe'), 'submit', null, _m('Subscribe to this search'));
+        $this->out->submit('submit',
+                           // TRANS: Button text for subscribing to a search.
+                           _m('BUTTON','Subscribe'),
+                           'submit',
+                           null,
+                           // TRANS: Button title for subscribing to a search.
+                           _m('Subscribe to this search.'));
     }
 }
diff --git a/plugins/SearchSub/searchsubmenu.php b/plugins/SearchSub/searchsubmenu.php
index 684f5c7db2..fa5b34942b 100644
--- a/plugins/SearchSub/searchsubmenu.php
+++ b/plugins/SearchSub/searchsubmenu.php
@@ -45,7 +45,7 @@ if (!defined('STATUSNET')) {
  * @link      http://status.net/
  */
 
-class SearchSubMenu extends Menu
+class SearchSubMenu extends MoreMenu
 {
     protected $user;
     protected $searches;
@@ -57,22 +57,54 @@ class SearchSubMenu extends Menu
         $this->searches = $searches;
     }
 
-    function show()
+    function tag()
     {
-        $this->out->elementStart('ul', array('class' => 'nav'));
+        return 'searchsubs';
+    }
 
+    function seeAllItem()
+    {
+        return array('searchsubs',
+                     array('nickname' => $this->user->nickname),
+                     _('See all'),
+                     _('See all searches you are following'));
+    }
+
+    function getItems()
+    {
+        $items = array();
+        
         foreach ($this->searches as $search) {
             if (!empty($search)) {
-                $this->out->menuItem(common_local_url('noticesearch',
-                                                      array('q' => $search)),
-                                     sprintf('"%s"', $search),
-                                     sprintf(_('Notices including %s'), $search),
-                                     $this->actionName == 'noticesearch' && $this->action->arg('q') == $search,
-                                     'nav_streams_search_'.$search);
+                $items[] = array('noticesearch',
+                                 array('q' => $search),
+                                 sprintf('"%s"', $search),
+                                 sprintf(_('Notices including %s'), $search));;
             }
         }
 
-        $this->out->elementEnd('ul');
+        return $items;
+    } 
+
+    function item($actionName, $args, $label, $description, $id=null, $cls=null)
+    {
+        if (empty($id)) {
+            $id = $this->menuItemID($actionName, $args);
+        }
+
+        if ($actionName == 'noticesearch') {
+            // Add 'q' as a search param, not part of the url path
+            $url = common_local_url($actionName, array(), $args);
+        } else {
+            $url = common_local_url($actionName, $args);
+        }
+
+        $this->out->menuItem($url,
+                             $label,
+                             $description,
+                             $this->isCurrent($actionName, $args),
+                             $id,
+                             $cls);
     }
-    
 }
+
diff --git a/plugins/SearchSub/searchsubtrackingcommand.php b/plugins/SearchSub/searchsubtrackingcommand.php
index 385a22b8ba..a404fd4ccf 100644
--- a/plugins/SearchSub/searchsubtrackingcommand.php
+++ b/plugins/SearchSub/searchsubtrackingcommand.php
@@ -20,8 +20,12 @@ class SearchSubTrackingCommand extends Command
             $list[] = $all->search;
         }
 
+        // TRANS: Separator for list of tracked searches.
+        $separator = _m('SEPARATOR','", "');
+
         // TRANS: Message given having disabled all search subscriptions with 'track off'.
-        $channel->output($cur, sprintf(_m('You are tracking searches for: %s'),
-                                       '"' . implode('", "', $list) . '"'));
+        // TRANS: %s is a list of searches. Separator default is '", "'.
+        $channel->output($cur, sprintf(_m('You are tracking searches for: "%s".'),
+                                       implode($separator, $list)));
     }
-}
\ No newline at end of file
+}
diff --git a/plugins/SearchSub/searchsubtrackoffcommand.php b/plugins/SearchSub/searchsubtrackoffcommand.php
index 1e5eb97ebc..4ab78a50a9 100644
--- a/plugins/SearchSub/searchsubtrackoffcommand.php
+++ b/plugins/SearchSub/searchsubtrackoffcommand.php
@@ -21,6 +21,7 @@ class SearchSubTrackoffCommand extends Command
                 SearchSub::cancel($profile, $all->search);
             } catch (Exception $e) {
                 // TRANS: Message given having failed to cancel one of the search subs with 'track off' command.
+                // TRANS: %s is the search for which the subscription removal failed.
                 $channel->error($cur, sprintf(_m('Error disabling search subscription for query "%s".'),
                                               $all->search));
                 return;
@@ -30,4 +31,4 @@ class SearchSubTrackoffCommand extends Command
         // TRANS: Message given having disabled all search subscriptions with 'track off'.
         $channel->output($cur, _m('Disabled all your search subscriptions.'));
     }
-}
\ No newline at end of file
+}
diff --git a/plugins/SearchSub/searchsubuntrackcommand.php b/plugins/SearchSub/searchsubuntrackcommand.php
index 9fb84cd130..fb3d78a14e 100644
--- a/plugins/SearchSub/searchsubuntrackcommand.php
+++ b/plugins/SearchSub/searchsubuntrackcommand.php
@@ -18,6 +18,7 @@ class SearchSubUntrackCommand extends Command
 
         if (!$searchsub) {
             // TRANS: Error text shown a user tries to untrack a search query they're not subscribed to.
+            // TRANS: %s is the keyword for the search.
             $channel->error($cur, sprintf(_m('You are not tracking the search "%s".'), $this->keyword));
             return;
         }
@@ -26,13 +27,15 @@ class SearchSubUntrackCommand extends Command
             SearchSub::cancel($cur->getProfile(), $this->keyword);
         } catch (Exception $e) {
             // TRANS: Message given having failed to cancel a search subscription by untrack command.
+            // TRANS: %s is the keyword for the query.
             $channel->error($cur, sprintf(_m('Could not end a search subscription for query "%s".'),
                                           $this->keyword));
             return;
         }
 
         // TRANS: Message given having removed a search subscription by untrack command.
+        // TRANS: %s is the keyword for the search.
         $channel->output($cur, sprintf(_m('You are no longer subscribed to the search "%s".'),
                                               $this->keyword));
     }
-}
\ No newline at end of file
+}
diff --git a/plugins/SearchSub/searchunsubform.php b/plugins/SearchSub/searchunsubform.php
index f90531f6aa..ae07f8dfa8 100644
--- a/plugins/SearchSub/searchunsubform.php
+++ b/plugins/SearchSub/searchunsubform.php
@@ -46,7 +46,6 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
  *
  * @see      UnsubscribeForm
  */
-
 class SearchUnsubForm extends SearchSubForm
 {
     /**
@@ -54,38 +53,32 @@ class SearchUnsubForm extends SearchSubForm
      *
      * @return int ID of the form
      */
-
     function id()
     {
         return 'search-unsubscribe-' . $this->search;
     }
 
-
     /**
      * class of the form
      *
      * @return string of the form class
      */
-
     function formClass()
     {
         // class to match existing styles...
         return 'form_user_unsubscribe ajax';
     }
 
-
     /**
      * Action of the form
      *
      * @return string URL of the action
      */
-
     function action()
     {
         return common_local_url('searchunsub', array('search' => $this->search));
     }
 
-
     /**
      * Legend of the Form
      *
@@ -93,6 +86,7 @@ class SearchUnsubForm extends SearchSubForm
      */
     function formLegend()
     {
+        // TRANS: Form legend.
         $this->out->element('legend', null, _m('Unsubscribe from this search'));
     }
 
@@ -101,9 +95,14 @@ class SearchUnsubForm extends SearchSubForm
      *
      * @return void
      */
-
     function formActions()
     {
-        $this->out->submit('submit', _m('BUTTON','Unsubscribe'), 'submit', null, _m('Unsubscribe from this search'));
+        $this->out->submit('submit',
+                           // TRANS: Button text for unsubscribing from a text search.
+                           _m('BUTTON','Unsubscribe'),
+                           'submit',
+                           null,
+                           // TRANS: Button title for unsubscribing from a text search.
+                           _m('Unsubscribe from this search.'));
     }
 }
diff --git a/plugins/ShareNotice/ShareNoticePlugin.php b/plugins/ShareNotice/ShareNoticePlugin.php
index 0cd248e213..08362f7932 100644
--- a/plugins/ShareNotice/ShareNoticePlugin.php
+++ b/plugins/ShareNotice/ShareNoticePlugin.php
@@ -102,15 +102,18 @@ abstract class GenericNoticeShareTarget extends NoticeShareTarget
 
     protected function statusText()
     {
-        // TRANS: Leave this message unchanged.
+        // TRANS: %s is notice content that is shared on Twitter, Facebook or another platform.
         $pattern = _m('"%s"');
         $url = $this->notice->bestUrl();
         $suffix = ' ' . $url;
         $room = $this->maxLength() - mb_strlen($suffix) - (mb_strlen($pattern) - mb_strlen('%s'));
 
         $content = $this->notice->content;
+        // TRANS: Truncation symbol.
+        $truncation_symbol = _m('…');
+        $truncation_symbol_length = mb_strlen($truncation_symbol);
         if (mb_strlen($content) > $room) {
-            $content = mb_substr($content, 0, $room - 1) . '…';
+            $content = mb_substr($content, 0, $room - $truncation_symbol_length) . $truncation_symbol;
         }
 
         return sprintf($pattern, $content) . $suffix;
diff --git a/plugins/ShareNotice/locale/ShareNotice.pot b/plugins/ShareNotice/locale/ShareNotice.pot
index bb3f26c5df..10dc79466c 100644
--- a/plugins/ShareNotice/locale/ShareNotice.pot
+++ b/plugins/ShareNotice/locale/ShareNotice.pot
@@ -8,40 +8,44 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#. TRANS: Leave this message unchanged.
 #. TRANS: %s is notice content that is shared on Twitter, Facebook or another platform.
-#: ShareNoticePlugin.php:106 ShareNoticePlugin.php:194
+#: ShareNoticePlugin.php:106 ShareNoticePlugin.php:197
 #, php-format
 msgid "\"%s\""
 msgstr ""
 
+#. TRANS: Truncation symbol.
+#: ShareNoticePlugin.php:113
+msgid "…"
+msgstr ""
+
 #. TRANS: Tooltip for image to share a notice on Twitter.
-#: ShareNoticePlugin.php:130
+#: ShareNoticePlugin.php:133
 msgid "Share on Twitter"
 msgstr ""
 
 #. TRANS: Tooltip for image to share a notice on another platform (other than Twitter or Facebook).
 #. TRANS: %s is a host name.
-#: ShareNoticePlugin.php:163
+#: ShareNoticePlugin.php:166
 #, php-format
 msgid "Share on %s"
 msgstr ""
 
 #. TRANS: Tooltip for image to share a notice on Facebook.
-#: ShareNoticePlugin.php:186
+#: ShareNoticePlugin.php:189
 msgid "Share on Facebook"
 msgstr ""
 
 #. TRANS: Plugin description.
-#: ShareNoticePlugin.php:219
+#: ShareNoticePlugin.php:222
 msgid ""
 "This plugin allows sharing of notices to Twitter, Facebook and other "
 "platforms."
diff --git a/plugins/ShareNotice/locale/ar/LC_MESSAGES/ShareNotice.po b/plugins/ShareNotice/locale/ar/LC_MESSAGES/ShareNotice.po
index 329837e67e..f1c482d954 100644
--- a/plugins/ShareNotice/locale/ar/LC_MESSAGES/ShareNotice.po
+++ b/plugins/ShareNotice/locale/ar/LC_MESSAGES/ShareNotice.po
@@ -9,26 +9,29 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ShareNotice\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:16+0000\n"
-"Language-Team: Arabic <http://translatewiki.net/wiki/Portal:ar>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:57+0000\n"
+"Language-Team: Arabic <https://translatewiki.net/wiki/Portal:ar>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-24 15:25:49+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-12-03 13:49:02+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ar\n"
 "X-Message-Group: #out-statusnet-plugin-sharenotice\n"
 "Plural-Forms: nplurals=6; plural=(n == 0) ? 0 : ( (n == 1) ? 1 : ( (n == "
 "2) ? 2 : ( (n%100 >= 3 && n%100 <= 10) ? 3 : ( (n%100 >= 11 && n%100 <= "
 "99) ? 4 : 5 ) ) ) );\n"
 
-#. TRANS: Leave this message unchanged.
 #. TRANS: %s is notice content that is shared on Twitter, Facebook or another platform.
 #, php-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
+#. TRANS: Truncation symbol.
+msgid "…"
+msgstr "..."
+
 #. TRANS: Tooltip for image to share a notice on Twitter.
 msgid "Share on Twitter"
 msgstr "تشارك على تويتر"
diff --git a/plugins/ShareNotice/locale/br/LC_MESSAGES/ShareNotice.po b/plugins/ShareNotice/locale/br/LC_MESSAGES/ShareNotice.po
index 8ee132b816..9583dfe4be 100644
--- a/plugins/ShareNotice/locale/br/LC_MESSAGES/ShareNotice.po
+++ b/plugins/ShareNotice/locale/br/LC_MESSAGES/ShareNotice.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - ShareNotice to Breton (Brezhoneg)
+# Translation of StatusNet - ShareNotice to Breton (brezhoneg)
 # Exported from translatewiki.net
 #
 # Author: Y-M D
@@ -9,24 +9,27 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ShareNotice\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:16+0000\n"
-"Language-Team: Breton <http://translatewiki.net/wiki/Portal:br>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:57+0000\n"
+"Language-Team: Breton <https://translatewiki.net/wiki/Portal:br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-24 15:25:49+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-12-03 13:49:02+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-sharenotice\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#. TRANS: Leave this message unchanged.
 #. TRANS: %s is notice content that is shared on Twitter, Facebook or another platform.
 #, php-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
+#. TRANS: Truncation symbol.
+msgid "…"
+msgstr "…"
+
 #. TRANS: Tooltip for image to share a notice on Twitter.
 msgid "Share on Twitter"
 msgstr "Rannañ war Twitter"
diff --git a/plugins/ShareNotice/locale/ca/LC_MESSAGES/ShareNotice.po b/plugins/ShareNotice/locale/ca/LC_MESSAGES/ShareNotice.po
index 2132f94878..851d46328f 100644
--- a/plugins/ShareNotice/locale/ca/LC_MESSAGES/ShareNotice.po
+++ b/plugins/ShareNotice/locale/ca/LC_MESSAGES/ShareNotice.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - ShareNotice to Catalan (Català)
+# Translation of StatusNet - ShareNotice to Catalan (català)
 # Exported from translatewiki.net
 #
 # Author: Toniher
@@ -9,24 +9,27 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ShareNotice\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:17+0000\n"
-"Language-Team: Catalan <http://translatewiki.net/wiki/Portal:ca>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:57+0000\n"
+"Language-Team: Catalan <https://translatewiki.net/wiki/Portal:ca>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-24 15:25:49+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-12-03 13:49:02+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ca\n"
 "X-Message-Group: #out-statusnet-plugin-sharenotice\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#. TRANS: Leave this message unchanged.
 #. TRANS: %s is notice content that is shared on Twitter, Facebook or another platform.
 #, php-format
 msgid "\"%s\""
 msgstr "«%s»"
 
+#. TRANS: Truncation symbol.
+msgid "…"
+msgstr ""
+
 #. TRANS: Tooltip for image to share a notice on Twitter.
 msgid "Share on Twitter"
 msgstr "Comparteix al Twitter"
diff --git a/plugins/ShareNotice/locale/de/LC_MESSAGES/ShareNotice.po b/plugins/ShareNotice/locale/de/LC_MESSAGES/ShareNotice.po
index 9780ce8c58..816bf7fdc3 100644
--- a/plugins/ShareNotice/locale/de/LC_MESSAGES/ShareNotice.po
+++ b/plugins/ShareNotice/locale/de/LC_MESSAGES/ShareNotice.po
@@ -1,6 +1,7 @@
 # Translation of StatusNet - ShareNotice to German (Deutsch)
 # Exported from translatewiki.net
 #
+# Author: ChrisiPK
 # Author: The Evil IP address
 # --
 # This file is distributed under the same license as the StatusNet package.
@@ -9,24 +10,27 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ShareNotice\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:17+0000\n"
-"Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:57+0000\n"
+"Language-Team: German <https://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-24 15:25:49+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-12-03 13:49:02+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-sharenotice\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#. TRANS: Leave this message unchanged.
 #. TRANS: %s is notice content that is shared on Twitter, Facebook or another platform.
 #, php-format
 msgid "\"%s\""
 msgstr "„%s“"
 
+#. TRANS: Truncation symbol.
+msgid "…"
+msgstr "…"
+
 #. TRANS: Tooltip for image to share a notice on Twitter.
 msgid "Share on Twitter"
 msgstr "Auf Twitter teilen"
diff --git a/plugins/ShareNotice/locale/es/LC_MESSAGES/ShareNotice.po b/plugins/ShareNotice/locale/es/LC_MESSAGES/ShareNotice.po
new file mode 100644
index 0000000000..74251e4cb3
--- /dev/null
+++ b/plugins/ShareNotice/locale/es/LC_MESSAGES/ShareNotice.po
@@ -0,0 +1,50 @@
+# Translation of StatusNet - ShareNotice to Spanish (español)
+# Exported from translatewiki.net
+#
+# Author: Armando-Martin
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - ShareNotice\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:57+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-12-03 13:49:02+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: %s is notice content that is shared on Twitter, Facebook or another platform.
+#, php-format
+msgid "\"%s\""
+msgstr "\"%s\""
+
+#. TRANS: Truncation symbol.
+msgid "…"
+msgstr "…"
+
+#. TRANS: Tooltip for image to share a notice on Twitter.
+msgid "Share on Twitter"
+msgstr "Compartir en Twitter"
+
+#. TRANS: Tooltip for image to share a notice on another platform (other than Twitter or Facebook).
+#. TRANS: %s is a host name.
+#, php-format
+msgid "Share on %s"
+msgstr "Compartir en %s"
+
+#. TRANS: Tooltip for image to share a notice on Facebook.
+msgid "Share on Facebook"
+msgstr "Compartir en Facebook"
+
+#. TRANS: Plugin description.
+msgid ""
+"This plugin allows sharing of notices to Twitter, Facebook and other "
+"platforms."
+msgstr ""
+"Este complemento (plugin) permite el intercambio de notificaciones de "
+"Twitter, Facebook y otras plataformas."
diff --git a/plugins/ShareNotice/locale/eu/LC_MESSAGES/ShareNotice.po b/plugins/ShareNotice/locale/eu/LC_MESSAGES/ShareNotice.po
new file mode 100644
index 0000000000..ab27c13f24
--- /dev/null
+++ b/plugins/ShareNotice/locale/eu/LC_MESSAGES/ShareNotice.po
@@ -0,0 +1,48 @@
+# Translation of StatusNet - ShareNotice to Basque (euskara)
+# Exported from translatewiki.net
+#
+# Author: Artsuaga
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - ShareNotice\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:57+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-12-03 13:49:02+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: %s is notice content that is shared on Twitter, Facebook or another platform.
+#, php-format
+msgid "\"%s\""
+msgstr ""
+
+#. TRANS: Truncation symbol.
+msgid "…"
+msgstr "…"
+
+#. TRANS: Tooltip for image to share a notice on Twitter.
+msgid "Share on Twitter"
+msgstr "Partekatu Twitterren"
+
+#. TRANS: Tooltip for image to share a notice on another platform (other than Twitter or Facebook).
+#. TRANS: %s is a host name.
+#, php-format
+msgid "Share on %s"
+msgstr "Partekatu %s(e)n"
+
+#. TRANS: Tooltip for image to share a notice on Facebook.
+msgid "Share on Facebook"
+msgstr "Partekatu Facebooken"
+
+#. TRANS: Plugin description.
+msgid ""
+"This plugin allows sharing of notices to Twitter, Facebook and other "
+"platforms."
+msgstr ""
diff --git a/plugins/ShareNotice/locale/fi/LC_MESSAGES/ShareNotice.po b/plugins/ShareNotice/locale/fi/LC_MESSAGES/ShareNotice.po
new file mode 100644
index 0000000000..d8c52808e5
--- /dev/null
+++ b/plugins/ShareNotice/locale/fi/LC_MESSAGES/ShareNotice.po
@@ -0,0 +1,51 @@
+# Translation of StatusNet - ShareNotice to Finnish (suomi)
+# Exported from translatewiki.net
+#
+# Author: Silvonen
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - ShareNotice\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:57+0000\n"
+"Language-Team: Finnish <https://translatewiki.net/wiki/Portal:fi>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-12-03 13:49:02+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: fi\n"
+"X-Message-Group: #out-statusnet-plugin-sharenotice\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: %s is notice content that is shared on Twitter, Facebook or another platform.
+#, php-format
+msgid "\"%s\""
+msgstr ""
+
+#. TRANS: Truncation symbol.
+msgid "…"
+msgstr ""
+
+#. TRANS: Tooltip for image to share a notice on Twitter.
+msgid "Share on Twitter"
+msgstr "Jaa Twitterissä"
+
+#. TRANS: Tooltip for image to share a notice on another platform (other than Twitter or Facebook).
+#. TRANS: %s is a host name.
+#, php-format
+msgid "Share on %s"
+msgstr "Jaa palvelussa %s"
+
+#. TRANS: Tooltip for image to share a notice on Facebook.
+msgid "Share on Facebook"
+msgstr "Jaa Facebookissa"
+
+#. TRANS: Plugin description.
+msgid ""
+"This plugin allows sharing of notices to Twitter, Facebook and other "
+"platforms."
+msgstr ""
diff --git a/plugins/ShareNotice/locale/fr/LC_MESSAGES/ShareNotice.po b/plugins/ShareNotice/locale/fr/LC_MESSAGES/ShareNotice.po
index e3efd5865c..4fabeb57b0 100644
--- a/plugins/ShareNotice/locale/fr/LC_MESSAGES/ShareNotice.po
+++ b/plugins/ShareNotice/locale/fr/LC_MESSAGES/ShareNotice.po
@@ -1,6 +1,7 @@
-# Translation of StatusNet - ShareNotice to French (Français)
+# Translation of StatusNet - ShareNotice to French (français)
 # Exported from translatewiki.net
 #
+# Author: Crochet.david
 # Author: Peter17
 # --
 # This file is distributed under the same license as the StatusNet package.
@@ -9,24 +10,27 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ShareNotice\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:17+0000\n"
-"Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:57+0000\n"
+"Language-Team: French <https://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-24 15:25:49+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-12-03 13:49:02+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-sharenotice\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#. TRANS: Leave this message unchanged.
 #. TRANS: %s is notice content that is shared on Twitter, Facebook or another platform.
 #, php-format
 msgid "\"%s\""
 msgstr "« %s »"
 
+#. TRANS: Truncation symbol.
+msgid "…"
+msgstr "…"
+
 #. TRANS: Tooltip for image to share a notice on Twitter.
 msgid "Share on Twitter"
 msgstr "Partager sur Twitter"
diff --git a/plugins/ShareNotice/locale/gl/LC_MESSAGES/ShareNotice.po b/plugins/ShareNotice/locale/gl/LC_MESSAGES/ShareNotice.po
new file mode 100644
index 0000000000..149aac0f81
--- /dev/null
+++ b/plugins/ShareNotice/locale/gl/LC_MESSAGES/ShareNotice.po
@@ -0,0 +1,53 @@
+# Translation of StatusNet - ShareNotice to Galician (galego)
+# Exported from translatewiki.net
+#
+# Author: Toliño
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - ShareNotice\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:57+0000\n"
+"Language-Team: Galician <https://translatewiki.net/wiki/Portal:gl>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-12-03 13:49:02+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: gl\n"
+"X-Message-Group: #out-statusnet-plugin-sharenotice\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: %s is notice content that is shared on Twitter, Facebook or another platform.
+#, php-format
+msgid "\"%s\""
+msgstr "\"%s\""
+
+#. TRANS: Truncation symbol.
+msgid "…"
+msgstr "…"
+
+#. TRANS: Tooltip for image to share a notice on Twitter.
+msgid "Share on Twitter"
+msgstr "Compartir no Twitter"
+
+#. TRANS: Tooltip for image to share a notice on another platform (other than Twitter or Facebook).
+#. TRANS: %s is a host name.
+#, php-format
+msgid "Share on %s"
+msgstr "Compartir en %s"
+
+#. TRANS: Tooltip for image to share a notice on Facebook.
+msgid "Share on Facebook"
+msgstr "Compartir no Facebook"
+
+#. TRANS: Plugin description.
+msgid ""
+"This plugin allows sharing of notices to Twitter, Facebook and other "
+"platforms."
+msgstr ""
+"Este complemento permite compartir notas no Twitter, Facebook e outras "
+"plataformas."
diff --git a/plugins/ShareNotice/locale/ia/LC_MESSAGES/ShareNotice.po b/plugins/ShareNotice/locale/ia/LC_MESSAGES/ShareNotice.po
index f448f013c4..3a0bbdda43 100644
--- a/plugins/ShareNotice/locale/ia/LC_MESSAGES/ShareNotice.po
+++ b/plugins/ShareNotice/locale/ia/LC_MESSAGES/ShareNotice.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - ShareNotice to Interlingua (Interlingua)
+# Translation of StatusNet - ShareNotice to Interlingua (interlingua)
 # Exported from translatewiki.net
 #
 # Author: McDutchie
@@ -9,42 +9,45 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ShareNotice\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:17+0000\n"
-"Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:58+0000\n"
+"Language-Team: Interlingua <https://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-24 15:25:49+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-12-03 13:49:02+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-sharenotice\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#. TRANS: Leave this message unchanged.
 #. TRANS: %s is notice content that is shared on Twitter, Facebook or another platform.
 #, php-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
+#. TRANS: Truncation symbol.
+msgid "…"
+msgstr "…"
+
 #. TRANS: Tooltip for image to share a notice on Twitter.
 msgid "Share on Twitter"
-msgstr "Condivider in Twitter"
+msgstr "Divider in Twitter"
 
 #. TRANS: Tooltip for image to share a notice on another platform (other than Twitter or Facebook).
 #. TRANS: %s is a host name.
 #, php-format
 msgid "Share on %s"
-msgstr "Condivider in %s"
+msgstr "Divider in %s"
 
 #. TRANS: Tooltip for image to share a notice on Facebook.
 msgid "Share on Facebook"
-msgstr "Condivider in Facebook"
+msgstr "Divider in Facebook"
 
 #. TRANS: Plugin description.
 msgid ""
 "This plugin allows sharing of notices to Twitter, Facebook and other "
 "platforms."
 msgstr ""
-"Iste plug-in permitte condivider notas in Twitter, Facebook e altere "
+"Iste plug-in permitte divider notas in Twitter, Facebook e altere "
 "platteformas."
diff --git a/plugins/ShareNotice/locale/mk/LC_MESSAGES/ShareNotice.po b/plugins/ShareNotice/locale/mk/LC_MESSAGES/ShareNotice.po
index 4f155c4873..eaad4120ba 100644
--- a/plugins/ShareNotice/locale/mk/LC_MESSAGES/ShareNotice.po
+++ b/plugins/ShareNotice/locale/mk/LC_MESSAGES/ShareNotice.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - ShareNotice to Macedonian (Македон�ки)
+# Translation of StatusNet - ShareNotice to Macedonian (македон�ки)
 # Exported from translatewiki.net
 #
 # Author: Bjankuloski06
@@ -9,24 +9,27 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ShareNotice\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:17+0000\n"
-"Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:58+0000\n"
+"Language-Team: Macedonian <https://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-24 15:25:49+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-12-03 13:49:02+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-sharenotice\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
 
-#. TRANS: Leave this message unchanged.
 #. TRANS: %s is notice content that is shared on Twitter, Facebook or another platform.
 #, php-format
 msgid "\"%s\""
 msgstr "„%s“"
 
+#. TRANS: Truncation symbol.
+msgid "…"
+msgstr "…"
+
 #. TRANS: Tooltip for image to share a notice on Twitter.
 msgid "Share on Twitter"
 msgstr "Сподели на Twitter"
diff --git a/plugins/ShareNotice/locale/nl/LC_MESSAGES/ShareNotice.po b/plugins/ShareNotice/locale/nl/LC_MESSAGES/ShareNotice.po
index c3163f7fdd..03637e0be0 100644
--- a/plugins/ShareNotice/locale/nl/LC_MESSAGES/ShareNotice.po
+++ b/plugins/ShareNotice/locale/nl/LC_MESSAGES/ShareNotice.po
@@ -10,24 +10,27 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ShareNotice\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:17+0000\n"
-"Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:58+0000\n"
+"Language-Team: Dutch <https://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-24 15:25:49+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-12-03 13:49:02+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-sharenotice\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#. TRANS: Leave this message unchanged.
 #. TRANS: %s is notice content that is shared on Twitter, Facebook or another platform.
 #, php-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
+#. TRANS: Truncation symbol.
+msgid "…"
+msgstr "…"
+
 #. TRANS: Tooltip for image to share a notice on Twitter.
 msgid "Share on Twitter"
 msgstr "Delen op Twitter"
diff --git a/plugins/ShareNotice/locale/pl/LC_MESSAGES/ShareNotice.po b/plugins/ShareNotice/locale/pl/LC_MESSAGES/ShareNotice.po
index 3e3390171d..040a68a687 100644
--- a/plugins/ShareNotice/locale/pl/LC_MESSAGES/ShareNotice.po
+++ b/plugins/ShareNotice/locale/pl/LC_MESSAGES/ShareNotice.po
@@ -1,7 +1,8 @@
-# Translation of StatusNet - ShareNotice to Polish (Polski)
-# Expored from translatewiki.net
+# Translation of StatusNet - ShareNotice to Polish (polski)
+# Exported from translatewiki.net
 #
 # Author: Raven
+# Author: Woytecr
 # --
 # This file is distributed under the same license as the StatusNet package.
 #
@@ -9,45 +10,43 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ShareNotice\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:54+0000\n"
-"Language-Team: Polish <http://translatewiki.net/wiki/Portal:pl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:58+0000\n"
+"Language-Team: Polish <https://translatewiki.net/wiki/Portal:pl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2010-11-30 20:43:55+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-12-03 13:49:02+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: pl\n"
 "X-Message-Group: #out-statusnet-plugin-sharenotice\n"
 "Plural-Forms: nplurals=3; plural=(n == 1) ? 0 : ( (n%10 >= 2 && n%10 <= 4 && "
 "(n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
-#. TRANS: Leave this message unchanged.
 #. TRANS: %s is notice content that is shared on Twitter, Facebook or another platform.
-#: ShareNoticePlugin.php:106 ShareNoticePlugin.php:194
 #, php-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
+#. TRANS: Truncation symbol.
+msgid "…"
+msgstr "…"
+
 #. TRANS: Tooltip for image to share a notice on Twitter.
-#: ShareNoticePlugin.php:130
 msgid "Share on Twitter"
 msgstr ""
 
 #. TRANS: Tooltip for image to share a notice on another platform (other than Twitter or Facebook).
 #. TRANS: %s is a host name.
-#: ShareNoticePlugin.php:163
 #, php-format
 msgid "Share on %s"
 msgstr ""
 
 #. TRANS: Tooltip for image to share a notice on Facebook.
-#: ShareNoticePlugin.php:186
 msgid "Share on Facebook"
-msgstr ""
+msgstr "Udostępnij na Facebooku"
 
 #. TRANS: Plugin description.
-#: ShareNoticePlugin.php:219
 msgid ""
 "This plugin allows sharing of notices to Twitter, Facebook and other "
 "platforms."
diff --git a/plugins/ShareNotice/locale/te/LC_MESSAGES/ShareNotice.po b/plugins/ShareNotice/locale/te/LC_MESSAGES/ShareNotice.po
index 998c2cc0c3..fc71cfd799 100644
--- a/plugins/ShareNotice/locale/te/LC_MESSAGES/ShareNotice.po
+++ b/plugins/ShareNotice/locale/te/LC_MESSAGES/ShareNotice.po
@@ -9,24 +9,27 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ShareNotice\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:17+0000\n"
-"Language-Team: Telugu <http://translatewiki.net/wiki/Portal:te>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:58+0000\n"
+"Language-Team: Telugu <https://translatewiki.net/wiki/Portal:te>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-24 15:25:49+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-12-03 13:49:02+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: te\n"
 "X-Message-Group: #out-statusnet-plugin-sharenotice\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#. TRANS: Leave this message unchanged.
 #. TRANS: %s is notice content that is shared on Twitter, Facebook or another platform.
 #, php-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
+#. TRANS: Truncation symbol.
+msgid "…"
+msgstr "…"
+
 #. TRANS: Tooltip for image to share a notice on Twitter.
 msgid "Share on Twitter"
 msgstr "ట�విట�టర�లో పంచ�కోండి"
diff --git a/plugins/ShareNotice/locale/tl/LC_MESSAGES/ShareNotice.po b/plugins/ShareNotice/locale/tl/LC_MESSAGES/ShareNotice.po
index 4c0b576f86..1858790d26 100644
--- a/plugins/ShareNotice/locale/tl/LC_MESSAGES/ShareNotice.po
+++ b/plugins/ShareNotice/locale/tl/LC_MESSAGES/ShareNotice.po
@@ -9,24 +9,27 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ShareNotice\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:17+0000\n"
-"Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:58+0000\n"
+"Language-Team: Tagalog <https://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-24 15:25:49+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-12-03 13:49:02+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-sharenotice\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#. TRANS: Leave this message unchanged.
 #. TRANS: %s is notice content that is shared on Twitter, Facebook or another platform.
 #, php-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
+#. TRANS: Truncation symbol.
+msgid "…"
+msgstr "…"
+
 #. TRANS: Tooltip for image to share a notice on Twitter.
 msgid "Share on Twitter"
 msgstr "Ibahagi sa Twitter"
diff --git a/plugins/ShareNotice/locale/tr/LC_MESSAGES/ShareNotice.po b/plugins/ShareNotice/locale/tr/LC_MESSAGES/ShareNotice.po
index 24c1d61fe1..3b0ef18d0f 100644
--- a/plugins/ShareNotice/locale/tr/LC_MESSAGES/ShareNotice.po
+++ b/plugins/ShareNotice/locale/tr/LC_MESSAGES/ShareNotice.po
@@ -9,24 +9,27 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ShareNotice\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:17+0000\n"
-"Language-Team: Turkish <http://translatewiki.net/wiki/Portal:tr>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:58+0000\n"
+"Language-Team: Turkish <https://translatewiki.net/wiki/Portal:tr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-24 15:25:49+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-12-03 13:49:02+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: tr\n"
 "X-Message-Group: #out-statusnet-plugin-sharenotice\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#. TRANS: Leave this message unchanged.
 #. TRANS: %s is notice content that is shared on Twitter, Facebook or another platform.
 #, php-format
 msgid "\"%s\""
 msgstr ""
 
+#. TRANS: Truncation symbol.
+msgid "…"
+msgstr ""
+
 #. TRANS: Tooltip for image to share a notice on Twitter.
 msgid "Share on Twitter"
 msgstr "Twitter'da PaylaÅŸ"
diff --git a/plugins/ShareNotice/locale/uk/LC_MESSAGES/ShareNotice.po b/plugins/ShareNotice/locale/uk/LC_MESSAGES/ShareNotice.po
index c5d2d3d86f..156be2cef7 100644
--- a/plugins/ShareNotice/locale/uk/LC_MESSAGES/ShareNotice.po
+++ b/plugins/ShareNotice/locale/uk/LC_MESSAGES/ShareNotice.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - ShareNotice to Ukrainian (Україн�ька)
+# Translation of StatusNet - ShareNotice to Ukrainian (україн�ька)
 # Exported from translatewiki.net
 #
 # Author: Boogie
@@ -9,25 +9,28 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ShareNotice\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:17+0000\n"
-"Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:58+0000\n"
+"Language-Team: Ukrainian <https://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-24 15:25:49+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-12-03 13:49:02+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-sharenotice\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
-#. TRANS: Leave this message unchanged.
 #. TRANS: %s is notice content that is shared on Twitter, Facebook or another platform.
 #, php-format
 msgid "\"%s\""
 msgstr "«%s»"
 
+#. TRANS: Truncation symbol.
+msgid "…"
+msgstr "…"
+
 #. TRANS: Tooltip for image to share a notice on Twitter.
 msgid "Share on Twitter"
 msgstr "Розмі�тити в Twitter"
diff --git a/plugins/SimpleUrl/SimpleUrlPlugin.php b/plugins/SimpleUrl/SimpleUrlPlugin.php
index 24250f4d07..acf0e91e61 100644
--- a/plugins/SimpleUrl/SimpleUrlPlugin.php
+++ b/plugins/SimpleUrl/SimpleUrlPlugin.php
@@ -38,7 +38,8 @@ class SimpleUrlPlugin extends UrlShortenerPlugin
     function onInitializePlugin(){
         parent::onInitializePlugin();
         if(!isset($this->serviceUrl)){
-            throw new Exception("must specify a serviceUrl");
+            // TRANS: Exception thrown when the SimpleUrl plugin has been configured incorrectly.
+            throw new Exception(_m('You must specify a serviceUrl.'));
         }
     }
 
@@ -53,10 +54,10 @@ class SimpleUrlPlugin extends UrlShortenerPlugin
                             'author' => 'Craig Andrews',
                             'homepage' => 'http://status.net/wiki/Plugin:SimpleUrl',
                             'rawdescription' =>
+                            // TRANS: Plugin description.
                             sprintf(_m('Uses <a href="http://%1$s/">%1$s</a> URL-shortener service.'),
                                     $this->shortenerName));
 
         return true;
     }
 }
-
diff --git a/plugins/SimpleUrl/locale/SimpleUrl.pot b/plugins/SimpleUrl/locale/SimpleUrl.pot
index 2bf1a96d31..5c79798179 100644
--- a/plugins/SimpleUrl/locale/SimpleUrl.pot
+++ b/plugins/SimpleUrl/locale/SimpleUrl.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,7 +16,13 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: SimpleUrlPlugin.php:56
+#. TRANS: Exception thrown when the SimpleUrl plugin has been configured incorrectly.
+#: SimpleUrlPlugin.php:42
+msgid "You must specify a serviceUrl."
+msgstr ""
+
+#. TRANS: Plugin description.
+#: SimpleUrlPlugin.php:58
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr ""
diff --git a/plugins/SimpleUrl/locale/br/LC_MESSAGES/SimpleUrl.po b/plugins/SimpleUrl/locale/br/LC_MESSAGES/SimpleUrl.po
index 2db437d648..3f2856a31b 100644
--- a/plugins/SimpleUrl/locale/br/LC_MESSAGES/SimpleUrl.po
+++ b/plugins/SimpleUrl/locale/br/LC_MESSAGES/SimpleUrl.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - SimpleUrl to Breton (Brezhoneg)
+# Translation of StatusNet - SimpleUrl to Breton (brezhoneg)
 # Exported from translatewiki.net
 #
 # Author: Fulup
@@ -9,18 +9,23 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SimpleUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:18+0000\n"
-"Language-Team: Breton <http://translatewiki.net/wiki/Portal:br>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:58+0000\n"
+"Language-Team: Breton <https://translatewiki.net/wiki/Portal:br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:09:56+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-19 11:23:23+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-simpleurl\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#. TRANS: Exception thrown when the SimpleUrl plugin has been configured incorrectly.
+msgid "You must specify a serviceUrl."
+msgstr ""
+
+#. TRANS: Plugin description.
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr ""
diff --git a/plugins/SimpleUrl/locale/de/LC_MESSAGES/SimpleUrl.po b/plugins/SimpleUrl/locale/de/LC_MESSAGES/SimpleUrl.po
index 25ead5bdf6..aa196a519b 100644
--- a/plugins/SimpleUrl/locale/de/LC_MESSAGES/SimpleUrl.po
+++ b/plugins/SimpleUrl/locale/de/LC_MESSAGES/SimpleUrl.po
@@ -1,6 +1,7 @@
 # Translation of StatusNet - SimpleUrl to German (Deutsch)
 # Exported from translatewiki.net
 #
+# Author: ChrisiPK
 # Author: The Evil IP address
 # --
 # This file is distributed under the same license as the StatusNet package.
@@ -9,18 +10,23 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SimpleUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:18+0000\n"
-"Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:58+0000\n"
+"Language-Team: German <https://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:09:56+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-19 11:23:23+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-simpleurl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Exception thrown when the SimpleUrl plugin has been configured incorrectly.
+msgid "You must specify a serviceUrl."
+msgstr "Du musst eine serviceUrl angeben."
+
+#. TRANS: Plugin description.
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr "Benutzung des <a href=\"http://%1$s/\">%1$s</a>-URL-Kürzungsdienstes."
diff --git a/plugins/SimpleUrl/locale/es/LC_MESSAGES/SimpleUrl.po b/plugins/SimpleUrl/locale/es/LC_MESSAGES/SimpleUrl.po
index 09c4e01177..3fbb7a5211 100644
--- a/plugins/SimpleUrl/locale/es/LC_MESSAGES/SimpleUrl.po
+++ b/plugins/SimpleUrl/locale/es/LC_MESSAGES/SimpleUrl.po
@@ -1,6 +1,7 @@
-# Translation of StatusNet - SimpleUrl to Spanish (Español)
+# Translation of StatusNet - SimpleUrl to Spanish (español)
 # Exported from translatewiki.net
 #
+# Author: Armando-Martin
 # Author: Translationista
 # --
 # This file is distributed under the same license as the StatusNet package.
@@ -9,18 +10,23 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SimpleUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:18+0000\n"
-"Language-Team: Spanish <http://translatewiki.net/wiki/Portal:es>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:58+0000\n"
+"Language-Team: Spanish <https://translatewiki.net/wiki/Portal:es>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:09:56+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-19 11:23:23+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-plugin-simpleurl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Exception thrown when the SimpleUrl plugin has been configured incorrectly.
+msgid "You must specify a serviceUrl."
+msgstr "Debe especificar un \"serviceUrl\"."
+
+#. TRANS: Plugin description.
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr ""
diff --git a/plugins/SimpleUrl/locale/eu/LC_MESSAGES/SimpleUrl.po b/plugins/SimpleUrl/locale/eu/LC_MESSAGES/SimpleUrl.po
new file mode 100644
index 0000000000..4a212e4b23
--- /dev/null
+++ b/plugins/SimpleUrl/locale/eu/LC_MESSAGES/SimpleUrl.po
@@ -0,0 +1,28 @@
+# Translation of StatusNet - SimpleUrl to Basque (euskara)
+# Exported from translatewiki.net
+#
+# Author: Artsuaga
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - SimpleUrl\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:59+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-19 11:23:23+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Exception thrown when the SimpleUrl plugin has been configured incorrectly.
+msgid "You must specify a serviceUrl."
+msgstr "Url zerbitzu bat adierazi behar duzu."
+
+#. TRANS: Plugin description.
+#, php-format
+msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
+msgstr "<a href=\"http://%1$s/\">%1$s</a> URL-laburtze zerbitzua erabiliz."
diff --git a/plugins/SimpleUrl/locale/fi/LC_MESSAGES/SimpleUrl.po b/plugins/SimpleUrl/locale/fi/LC_MESSAGES/SimpleUrl.po
index 86bd6ff089..ec82ae7e9b 100644
--- a/plugins/SimpleUrl/locale/fi/LC_MESSAGES/SimpleUrl.po
+++ b/plugins/SimpleUrl/locale/fi/LC_MESSAGES/SimpleUrl.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - SimpleUrl to Finnish (Suomi)
+# Translation of StatusNet - SimpleUrl to Finnish (suomi)
 # Exported from translatewiki.net
 #
 # Author: Nike
@@ -9,18 +9,23 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SimpleUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:18+0000\n"
-"Language-Team: Finnish <http://translatewiki.net/wiki/Portal:fi>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:59+0000\n"
+"Language-Team: Finnish <https://translatewiki.net/wiki/Portal:fi>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:09:56+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-19 11:23:23+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: fi\n"
 "X-Message-Group: #out-statusnet-plugin-simpleurl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Exception thrown when the SimpleUrl plugin has been configured incorrectly.
+msgid "You must specify a serviceUrl."
+msgstr ""
+
+#. TRANS: Plugin description.
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr "Käyttää <a href=\"http://%1$s/\">%1$s</a> URL-lyhennyspalvelua."
diff --git a/plugins/SimpleUrl/locale/fr/LC_MESSAGES/SimpleUrl.po b/plugins/SimpleUrl/locale/fr/LC_MESSAGES/SimpleUrl.po
index db352d31c2..fe59014a01 100644
--- a/plugins/SimpleUrl/locale/fr/LC_MESSAGES/SimpleUrl.po
+++ b/plugins/SimpleUrl/locale/fr/LC_MESSAGES/SimpleUrl.po
@@ -1,6 +1,7 @@
-# Translation of StatusNet - SimpleUrl to French (Français)
+# Translation of StatusNet - SimpleUrl to French (français)
 # Exported from translatewiki.net
 #
+# Author: Crochet.david
 # Author: Peter17
 # --
 # This file is distributed under the same license as the StatusNet package.
@@ -9,18 +10,23 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SimpleUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:18+0000\n"
-"Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:59+0000\n"
+"Language-Team: French <https://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:09:56+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-19 11:23:23+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-simpleurl\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#. TRANS: Exception thrown when the SimpleUrl plugin has been configured incorrectly.
+msgid "You must specify a serviceUrl."
+msgstr "Vous devez spécifier un serviceUrl."
+
+#. TRANS: Plugin description.
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr ""
diff --git a/plugins/SimpleUrl/locale/gl/LC_MESSAGES/SimpleUrl.po b/plugins/SimpleUrl/locale/gl/LC_MESSAGES/SimpleUrl.po
index f08885d3bf..700ccb3029 100644
--- a/plugins/SimpleUrl/locale/gl/LC_MESSAGES/SimpleUrl.po
+++ b/plugins/SimpleUrl/locale/gl/LC_MESSAGES/SimpleUrl.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - SimpleUrl to Galician (Galego)
+# Translation of StatusNet - SimpleUrl to Galician (galego)
 # Exported from translatewiki.net
 #
 # Author: Toliño
@@ -9,18 +9,23 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SimpleUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:18+0000\n"
-"Language-Team: Galician <http://translatewiki.net/wiki/Portal:gl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:59+0000\n"
+"Language-Team: Galician <https://translatewiki.net/wiki/Portal:gl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:09:56+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-19 11:23:23+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: gl\n"
 "X-Message-Group: #out-statusnet-plugin-simpleurl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Exception thrown when the SimpleUrl plugin has been configured incorrectly.
+msgid "You must specify a serviceUrl."
+msgstr "Cómpre especificar un serviceUrl."
+
+#. TRANS: Plugin description.
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr ""
diff --git a/plugins/SimpleUrl/locale/he/LC_MESSAGES/SimpleUrl.po b/plugins/SimpleUrl/locale/he/LC_MESSAGES/SimpleUrl.po
index be500a3029..3b2c1502cc 100644
--- a/plugins/SimpleUrl/locale/he/LC_MESSAGES/SimpleUrl.po
+++ b/plugins/SimpleUrl/locale/he/LC_MESSAGES/SimpleUrl.po
@@ -1,6 +1,7 @@
 # Translation of StatusNet - SimpleUrl to Hebrew (עברית)
 # Exported from translatewiki.net
 #
+# Author: Amire80
 # Author: YaronSh
 # --
 # This file is distributed under the same license as the StatusNet package.
@@ -9,18 +10,23 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SimpleUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:18+0000\n"
-"Language-Team: Hebrew <http://translatewiki.net/wiki/Portal:he>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:59+0000\n"
+"Language-Team: Hebrew <https://translatewiki.net/wiki/Portal:he>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:09:56+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-19 11:23:23+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: he\n"
 "X-Message-Group: #out-statusnet-plugin-simpleurl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Exception thrown when the SimpleUrl plugin has been configured incorrectly.
+msgid "You must specify a serviceUrl."
+msgstr "יש להזין serviceUrl."
+
+#. TRANS: Plugin description.
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr "שימוש בשירות קיצור הכתובות <a href=\"http://%1$s/\">%1$s</a>."
diff --git a/plugins/SimpleUrl/locale/ia/LC_MESSAGES/SimpleUrl.po b/plugins/SimpleUrl/locale/ia/LC_MESSAGES/SimpleUrl.po
index d4a3d91cff..918ecdb4f9 100644
--- a/plugins/SimpleUrl/locale/ia/LC_MESSAGES/SimpleUrl.po
+++ b/plugins/SimpleUrl/locale/ia/LC_MESSAGES/SimpleUrl.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - SimpleUrl to Interlingua (Interlingua)
+# Translation of StatusNet - SimpleUrl to Interlingua (interlingua)
 # Exported from translatewiki.net
 #
 # Author: McDutchie
@@ -9,18 +9,23 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SimpleUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:18+0000\n"
-"Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:09:59+0000\n"
+"Language-Team: Interlingua <https://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:09:56+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-19 11:23:23+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-simpleurl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Exception thrown when the SimpleUrl plugin has been configured incorrectly.
+msgid "You must specify a serviceUrl."
+msgstr "Es necessari specificar un \"serviceUrl\"."
+
+#. TRANS: Plugin description.
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr ""
diff --git a/plugins/SimpleUrl/locale/id/LC_MESSAGES/SimpleUrl.po b/plugins/SimpleUrl/locale/id/LC_MESSAGES/SimpleUrl.po
index e01b9e4a0d..e7bcf61acc 100644
--- a/plugins/SimpleUrl/locale/id/LC_MESSAGES/SimpleUrl.po
+++ b/plugins/SimpleUrl/locale/id/LC_MESSAGES/SimpleUrl.po
@@ -9,18 +9,23 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SimpleUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:18+0000\n"
-"Language-Team: Indonesian <http://translatewiki.net/wiki/Portal:id>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:00+0000\n"
+"Language-Team: Indonesian <https://translatewiki.net/wiki/Portal:id>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:09:56+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-19 11:23:23+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: id\n"
 "X-Message-Group: #out-statusnet-plugin-simpleurl\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#. TRANS: Exception thrown when the SimpleUrl plugin has been configured incorrectly.
+msgid "You must specify a serviceUrl."
+msgstr ""
+
+#. TRANS: Plugin description.
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr "Menggunakan layanan pemendek URL <a href=\"http://%1$s/\">%1$s</a>."
diff --git a/plugins/SimpleUrl/locale/ja/LC_MESSAGES/SimpleUrl.po b/plugins/SimpleUrl/locale/ja/LC_MESSAGES/SimpleUrl.po
index e5c241cddb..792b8d2550 100644
--- a/plugins/SimpleUrl/locale/ja/LC_MESSAGES/SimpleUrl.po
+++ b/plugins/SimpleUrl/locale/ja/LC_MESSAGES/SimpleUrl.po
@@ -9,18 +9,23 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SimpleUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:19+0000\n"
-"Language-Team: Japanese <http://translatewiki.net/wiki/Portal:ja>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:00+0000\n"
+"Language-Team: Japanese <https://translatewiki.net/wiki/Portal:ja>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:09:56+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-19 11:23:23+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ja\n"
 "X-Message-Group: #out-statusnet-plugin-simpleurl\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#. TRANS: Exception thrown when the SimpleUrl plugin has been configured incorrectly.
+msgid "You must specify a serviceUrl."
+msgstr ""
+
+#. TRANS: Plugin description.
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr "<a href=\"http://%1$s/\">%1$s</a>をURL短縮サービス���利用�る。"
diff --git a/plugins/SimpleUrl/locale/mk/LC_MESSAGES/SimpleUrl.po b/plugins/SimpleUrl/locale/mk/LC_MESSAGES/SimpleUrl.po
index 206fda65f6..b4334369ec 100644
--- a/plugins/SimpleUrl/locale/mk/LC_MESSAGES/SimpleUrl.po
+++ b/plugins/SimpleUrl/locale/mk/LC_MESSAGES/SimpleUrl.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - SimpleUrl to Macedonian (Македон�ки)
+# Translation of StatusNet - SimpleUrl to Macedonian (македон�ки)
 # Exported from translatewiki.net
 #
 # Author: Bjankuloski06
@@ -9,18 +9,23 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SimpleUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:19+0000\n"
-"Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:00+0000\n"
+"Language-Team: Macedonian <https://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:09:56+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-19 11:23:23+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-simpleurl\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
 
+#. TRANS: Exception thrown when the SimpleUrl plugin has been configured incorrectly.
+msgid "You must specify a serviceUrl."
+msgstr "Мора да наведете serviceUrl."
+
+#. TRANS: Plugin description.
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr ""
diff --git a/plugins/SimpleUrl/locale/nb/LC_MESSAGES/SimpleUrl.po b/plugins/SimpleUrl/locale/nb/LC_MESSAGES/SimpleUrl.po
index 408da96523..9ffe5c8a7b 100644
--- a/plugins/SimpleUrl/locale/nb/LC_MESSAGES/SimpleUrl.po
+++ b/plugins/SimpleUrl/locale/nb/LC_MESSAGES/SimpleUrl.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - SimpleUrl to Norwegian (bokmål)‬ (‪Norsk (bokmål)‬)
+# Translation of StatusNet - SimpleUrl to Norwegian Bokmål (‪norsk (bokmål)‬)
 # Exported from translatewiki.net
 #
 # Author: Nghtwlkr
@@ -9,18 +9,23 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SimpleUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:19+0000\n"
-"Language-Team: Norwegian (bokmål)‬ <http://translatewiki.net/wiki/Portal:no>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:00+0000\n"
+"Language-Team: Norwegian Bokmål <https://translatewiki.net/wiki/Portal:nb>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:09:56+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
-"X-Language-Code: no\n"
+"X-POT-Import-Date: 2011-06-19 11:23:23+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: nb\n"
 "X-Message-Group: #out-statusnet-plugin-simpleurl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Exception thrown when the SimpleUrl plugin has been configured incorrectly.
+msgid "You must specify a serviceUrl."
+msgstr ""
+
+#. TRANS: Plugin description.
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr "Bruker URL-forkortertjenesten <a href=\"http://%1$s/\">%1$s</a>."
diff --git a/plugins/SimpleUrl/locale/nl/LC_MESSAGES/SimpleUrl.po b/plugins/SimpleUrl/locale/nl/LC_MESSAGES/SimpleUrl.po
index 923c910a48..a1b2a4d812 100644
--- a/plugins/SimpleUrl/locale/nl/LC_MESSAGES/SimpleUrl.po
+++ b/plugins/SimpleUrl/locale/nl/LC_MESSAGES/SimpleUrl.po
@@ -9,18 +9,23 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SimpleUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:19+0000\n"
-"Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:00+0000\n"
+"Language-Team: Dutch <https://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:09:56+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-19 11:23:23+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-simpleurl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Exception thrown when the SimpleUrl plugin has been configured incorrectly.
+msgid "You must specify a serviceUrl."
+msgstr "U moet een serviceUrl opgeven."
+
+#. TRANS: Plugin description.
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr ""
diff --git a/plugins/SimpleUrl/locale/pt/LC_MESSAGES/SimpleUrl.po b/plugins/SimpleUrl/locale/pt/LC_MESSAGES/SimpleUrl.po
index 3ecaf79b48..4e6c0bf698 100644
--- a/plugins/SimpleUrl/locale/pt/LC_MESSAGES/SimpleUrl.po
+++ b/plugins/SimpleUrl/locale/pt/LC_MESSAGES/SimpleUrl.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - SimpleUrl to Portuguese (Português)
+# Translation of StatusNet - SimpleUrl to Portuguese (português)
 # Exported from translatewiki.net
 #
 # Author: Hamilton Abreu
@@ -9,18 +9,23 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SimpleUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:19+0000\n"
-"Language-Team: Portuguese <http://translatewiki.net/wiki/Portal:pt>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:00+0000\n"
+"Language-Team: Portuguese <https://translatewiki.net/wiki/Portal:pt>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:09:56+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-19 11:23:23+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: pt\n"
 "X-Message-Group: #out-statusnet-plugin-simpleurl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Exception thrown when the SimpleUrl plugin has been configured incorrectly.
+msgid "You must specify a serviceUrl."
+msgstr ""
+
+#. TRANS: Plugin description.
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr "Usa o serviço de abreviação de URLs <a href=\"http://%1$s/\">%1$s</a>."
diff --git a/plugins/SimpleUrl/locale/ru/LC_MESSAGES/SimpleUrl.po b/plugins/SimpleUrl/locale/ru/LC_MESSAGES/SimpleUrl.po
index df4f7ab3f8..8f255c183d 100644
--- a/plugins/SimpleUrl/locale/ru/LC_MESSAGES/SimpleUrl.po
+++ b/plugins/SimpleUrl/locale/ru/LC_MESSAGES/SimpleUrl.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - SimpleUrl to Russian (Ру��кий)
+# Translation of StatusNet - SimpleUrl to Russian (ру��кий)
 # Exported from translatewiki.net
 #
 # Author: Eleferen
@@ -9,19 +9,24 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SimpleUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:19+0000\n"
-"Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:00+0000\n"
+"Language-Team: Russian <https://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:09:56+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-19 11:23:23+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-simpleurl\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
+#. TRANS: Exception thrown when the SimpleUrl plugin has been configured incorrectly.
+msgid "You must specify a serviceUrl."
+msgstr ""
+
+#. TRANS: Plugin description.
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr "И�пользование �лужбы �окращени� URL <a href=\"http://%1$s/\">%1$s</a>."
diff --git a/plugins/SimpleUrl/locale/tl/LC_MESSAGES/SimpleUrl.po b/plugins/SimpleUrl/locale/tl/LC_MESSAGES/SimpleUrl.po
index e888e26a6e..662b9f8083 100644
--- a/plugins/SimpleUrl/locale/tl/LC_MESSAGES/SimpleUrl.po
+++ b/plugins/SimpleUrl/locale/tl/LC_MESSAGES/SimpleUrl.po
@@ -9,18 +9,23 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SimpleUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:19+0000\n"
-"Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:00+0000\n"
+"Language-Team: Tagalog <https://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:09:56+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-19 11:23:23+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-simpleurl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Exception thrown when the SimpleUrl plugin has been configured incorrectly.
+msgid "You must specify a serviceUrl."
+msgstr "Dapat kang tumukoy ng isang URL ng paglilingkod."
+
+#. TRANS: Plugin description.
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr ""
diff --git a/plugins/SimpleUrl/locale/uk/LC_MESSAGES/SimpleUrl.po b/plugins/SimpleUrl/locale/uk/LC_MESSAGES/SimpleUrl.po
index 85eede5aec..b8adcd169d 100644
--- a/plugins/SimpleUrl/locale/uk/LC_MESSAGES/SimpleUrl.po
+++ b/plugins/SimpleUrl/locale/uk/LC_MESSAGES/SimpleUrl.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - SimpleUrl to Ukrainian (Україн�ька)
+# Translation of StatusNet - SimpleUrl to Ukrainian (україн�ька)
 # Exported from translatewiki.net
 #
 # Author: Boogie
@@ -9,19 +9,24 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SimpleUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:19+0000\n"
-"Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:00+0000\n"
+"Language-Team: Ukrainian <https://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:09:56+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-19 11:23:23+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-simpleurl\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
+#. TRANS: Exception thrown when the SimpleUrl plugin has been configured incorrectly.
+msgid "You must specify a serviceUrl."
+msgstr ""
+
+#. TRANS: Plugin description.
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr ""
diff --git a/plugins/Sitemap/SitemapPlugin.php b/plugins/Sitemap/SitemapPlugin.php
index 36041cfc9a..29b822acd5 100644
--- a/plugins/Sitemap/SitemapPlugin.php
+++ b/plugins/Sitemap/SitemapPlugin.php
@@ -108,14 +108,14 @@ class SitemapPlugin extends Plugin
         $m->connect('sitemapindex.xml',
                     array('action' => 'sitemapindex'));
 
-        $m->connect('/notice-sitemap-:year-:month-:day-:index.xml',
+        $m->connect('notice-sitemap-:year-:month-:day-:index.xml',
                     array('action' => 'noticesitemap'),
                     array('year' => '[0-9]{4}',
                           'month' => '[01][0-9]',
                           'day' => '[0123][0-9]',
                           'index' => '[1-9][0-9]*'));
 
-        $m->connect('/user-sitemap-:year-:month-:day-:index.xml',
+        $m->connect('user-sitemap-:year-:month-:day-:index.xml',
                     array('action' => 'usersitemap'),
                     array('year' => '[0-9]{4}',
                           'month' => '[01][0-9]',
@@ -196,12 +196,6 @@ class SitemapPlugin extends Plugin
                                                  null, false),
                                    new ColumnDef('modified', 'timestamp')));
 
-        $userCreated = $schema->getColumnDef('user', 'created');
-
-        if (empty($userCreated) || $userCreated->key != 'MUL') {
-            $schema->createIndex('user', 'created');
-        }
-
         return true;
     }
 
diff --git a/plugins/Sitemap/locale/Sitemap.pot b/plugins/Sitemap/locale/Sitemap.pot
index ed6dd52b32..b90fa7d787 100644
--- a/plugins/Sitemap/locale/Sitemap.pot
+++ b/plugins/Sitemap/locale/Sitemap.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
+"POT-Creation-Date: 2012-06-30 11:07+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"
@@ -68,17 +68,17 @@ msgid "Save sitemap settings."
 msgstr ""
 
 #. TRANS: Menu item title/tooltip
-#: SitemapPlugin.php:211
+#: SitemapPlugin.php:205
 msgid "Sitemap configuration"
 msgstr ""
 
 #. TRANS: Menu item for site administration
-#: SitemapPlugin.php:213
+#: SitemapPlugin.php:207
 msgctxt "MENU"
 msgid "Sitemap"
 msgstr ""
 
 #. TRANS: Plugin description.
-#: SitemapPlugin.php:238
+#: SitemapPlugin.php:232
 msgid "This plugin allows creation of sitemaps for Bing, Yahoo! and Google."
 msgstr ""
diff --git a/plugins/Sitemap/locale/br/LC_MESSAGES/Sitemap.po b/plugins/Sitemap/locale/br/LC_MESSAGES/Sitemap.po
index cba192bd97..08d64f7da2 100644
--- a/plugins/Sitemap/locale/br/LC_MESSAGES/Sitemap.po
+++ b/plugins/Sitemap/locale/br/LC_MESSAGES/Sitemap.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Sitemap to Breton (Brezhoneg)
+# Translation of StatusNet - Sitemap to Breton (brezhoneg)
 # Exported from translatewiki.net
 #
 # Author: Fulup
@@ -10,14 +10,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Sitemap\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:21+0000\n"
-"Language-Team: Breton <http://translatewiki.net/wiki/Portal:br>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:01+0000\n"
+"Language-Team: Breton <https://translatewiki.net/wiki/Portal:br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:09:57+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:35+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-sitemap\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
diff --git a/plugins/Sitemap/locale/de/LC_MESSAGES/Sitemap.po b/plugins/Sitemap/locale/de/LC_MESSAGES/Sitemap.po
index a2723bed58..6211db386f 100644
--- a/plugins/Sitemap/locale/de/LC_MESSAGES/Sitemap.po
+++ b/plugins/Sitemap/locale/de/LC_MESSAGES/Sitemap.po
@@ -10,14 +10,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Sitemap\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:21+0000\n"
-"Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:01+0000\n"
+"Language-Team: German <https://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:09:57+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:35+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-sitemap\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/Sitemap/locale/diq/LC_MESSAGES/Sitemap.po b/plugins/Sitemap/locale/diq/LC_MESSAGES/Sitemap.po
new file mode 100644
index 0000000000..62122ae525
--- /dev/null
+++ b/plugins/Sitemap/locale/diq/LC_MESSAGES/Sitemap.po
@@ -0,0 +1,73 @@
+# Translation of StatusNet - Sitemap to Zazaki (Zazaki)
+# Exported from translatewiki.net
+#
+# Author: Erdemaslancan
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Sitemap\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:01+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:51:35+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Title for sitemap.
+msgid "Sitemap"
+msgstr "Pusulay sita"
+
+#. TRANS: Instructions for sitemap.
+msgid "Sitemap settings for this StatusNet site"
+msgstr ""
+
+#. TRANS: Field label.
+msgid "Google key"
+msgstr "Google kesa"
+
+#. TRANS: Title for field label.
+msgid "Google Webmaster Tools verification key."
+msgstr ""
+
+#. TRANS: Field label.
+msgid "Yahoo key"
+msgstr "Yahoo kesa"
+
+#. TRANS: Title for field label.
+msgid "Yahoo! Site Explorer verification key."
+msgstr ""
+
+#. TRANS: Field label.
+msgid "Bing key"
+msgstr "Bing kesa"
+
+#. TRANS: Title for field label.
+msgid "Bing Webmaster Tools verification key."
+msgstr ""
+
+#. TRANS: Submit button text to save sitemap settings.
+msgctxt "BUTTON"
+msgid "Save"
+msgstr "Star ke"
+
+#. TRANS: Submit button title to save sitemap settings.
+msgid "Save sitemap settings."
+msgstr ""
+
+#. TRANS: Menu item title/tooltip
+msgid "Sitemap configuration"
+msgstr ""
+
+#. TRANS: Menu item for site administration
+msgctxt "MENU"
+msgid "Sitemap"
+msgstr "Pusulay sita"
+
+#. TRANS: Plugin description.
+msgid "This plugin allows creation of sitemaps for Bing, Yahoo! and Google."
+msgstr ""
diff --git a/plugins/Sitemap/locale/es/LC_MESSAGES/Sitemap.po b/plugins/Sitemap/locale/es/LC_MESSAGES/Sitemap.po
new file mode 100644
index 0000000000..806164eea9
--- /dev/null
+++ b/plugins/Sitemap/locale/es/LC_MESSAGES/Sitemap.po
@@ -0,0 +1,75 @@
+# Translation of StatusNet - Sitemap to Spanish (español)
+# Exported from translatewiki.net
+#
+# Author: Armando-Martin
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Sitemap\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:01+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:51:35+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Title for sitemap.
+msgid "Sitemap"
+msgstr "Mapa del sitio"
+
+#. TRANS: Instructions for sitemap.
+msgid "Sitemap settings for this StatusNet site"
+msgstr "Configuración del mapa del sitio para este sitio de StatusNet"
+
+#. TRANS: Field label.
+msgid "Google key"
+msgstr "Clave Google"
+
+#. TRANS: Title for field label.
+msgid "Google Webmaster Tools verification key."
+msgstr "Clave de verificación de Google Webmaster Tools."
+
+#. TRANS: Field label.
+msgid "Yahoo key"
+msgstr "Clave Yahoo"
+
+#. TRANS: Title for field label.
+msgid "Yahoo! Site Explorer verification key."
+msgstr "Clave de verificación de Yahoo! Site Explorer."
+
+#. TRANS: Field label.
+msgid "Bing key"
+msgstr "Clave Bing"
+
+#. TRANS: Title for field label.
+msgid "Bing Webmaster Tools verification key."
+msgstr "Clave de verificación de Bing Webmaster Tools."
+
+#. TRANS: Submit button text to save sitemap settings.
+msgctxt "BUTTON"
+msgid "Save"
+msgstr "Guardar"
+
+#. TRANS: Submit button title to save sitemap settings.
+msgid "Save sitemap settings."
+msgstr "Guardar la configuración del mapa del sitio."
+
+#. TRANS: Menu item title/tooltip
+msgid "Sitemap configuration"
+msgstr "Configuración del mapa del sitio"
+
+#. TRANS: Menu item for site administration
+msgctxt "MENU"
+msgid "Sitemap"
+msgstr "Mapa del sitio"
+
+#. TRANS: Plugin description.
+msgid "This plugin allows creation of sitemaps for Bing, Yahoo! and Google."
+msgstr ""
+"Este complemento (plugin) permite la creación de mapas de sitios para Bing, "
+"Yahoo! y Google."
diff --git a/plugins/Sitemap/locale/eu/LC_MESSAGES/Sitemap.po b/plugins/Sitemap/locale/eu/LC_MESSAGES/Sitemap.po
new file mode 100644
index 0000000000..07e3e5ec96
--- /dev/null
+++ b/plugins/Sitemap/locale/eu/LC_MESSAGES/Sitemap.po
@@ -0,0 +1,73 @@
+# Translation of StatusNet - Sitemap to Basque (euskara)
+# Exported from translatewiki.net
+#
+# Author: Artsuaga
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Sitemap\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:01+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:51:35+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Title for sitemap.
+msgid "Sitemap"
+msgstr "Gunemapa"
+
+#. TRANS: Instructions for sitemap.
+msgid "Sitemap settings for this StatusNet site"
+msgstr "Saio-ezarpenak StatusNet gune honetarako"
+
+#. TRANS: Field label.
+msgid "Google key"
+msgstr "Google gakoa"
+
+#. TRANS: Title for field label.
+msgid "Google Webmaster Tools verification key."
+msgstr ""
+
+#. TRANS: Field label.
+msgid "Yahoo key"
+msgstr "Yahoo gakoa"
+
+#. TRANS: Title for field label.
+msgid "Yahoo! Site Explorer verification key."
+msgstr ""
+
+#. TRANS: Field label.
+msgid "Bing key"
+msgstr "Bing gakoa"
+
+#. TRANS: Title for field label.
+msgid "Bing Webmaster Tools verification key."
+msgstr ""
+
+#. TRANS: Submit button text to save sitemap settings.
+msgctxt "BUTTON"
+msgid "Save"
+msgstr "Gorde"
+
+#. TRANS: Submit button title to save sitemap settings.
+msgid "Save sitemap settings."
+msgstr "Gorde gunemapa aukerak."
+
+#. TRANS: Menu item title/tooltip
+msgid "Sitemap configuration"
+msgstr "Gunemapa konfigurazioa"
+
+#. TRANS: Menu item for site administration
+msgctxt "MENU"
+msgid "Sitemap"
+msgstr "Gunemapa"
+
+#. TRANS: Plugin description.
+msgid "This plugin allows creation of sitemaps for Bing, Yahoo! and Google."
+msgstr ""
diff --git a/plugins/Sitemap/locale/fr/LC_MESSAGES/Sitemap.po b/plugins/Sitemap/locale/fr/LC_MESSAGES/Sitemap.po
index b5e3764f12..8e85cee128 100644
--- a/plugins/Sitemap/locale/fr/LC_MESSAGES/Sitemap.po
+++ b/plugins/Sitemap/locale/fr/LC_MESSAGES/Sitemap.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Sitemap to French (Français)
+# Translation of StatusNet - Sitemap to French (français)
 # Exported from translatewiki.net
 #
 # Author: Peter17
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Sitemap\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:21+0000\n"
-"Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:01+0000\n"
+"Language-Team: French <https://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:09:57+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:35+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-sitemap\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
diff --git a/plugins/Sitemap/locale/gl/LC_MESSAGES/Sitemap.po b/plugins/Sitemap/locale/gl/LC_MESSAGES/Sitemap.po
new file mode 100644
index 0000000000..86e135df34
--- /dev/null
+++ b/plugins/Sitemap/locale/gl/LC_MESSAGES/Sitemap.po
@@ -0,0 +1,78 @@
+# Translation of StatusNet - Sitemap to Galician (galego)
+# Exported from translatewiki.net
+#
+# Author: Toliño
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Sitemap\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:02+0000\n"
+"Language-Team: Galician <https://translatewiki.net/wiki/Portal:gl>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:51:35+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: gl\n"
+"X-Message-Group: #out-statusnet-plugin-sitemap\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Title for sitemap.
+msgid "Sitemap"
+msgstr "Mapa do sitio"
+
+#. TRANS: Instructions for sitemap.
+msgid "Sitemap settings for this StatusNet site"
+msgstr "Configuración de mapa do sitio para este sitio StatusNet"
+
+#. TRANS: Field label.
+msgid "Google key"
+msgstr "Clave Google"
+
+#. TRANS: Title for field label.
+msgid "Google Webmaster Tools verification key."
+msgstr "Clave de verificación para as ferramentas de Google Webmaster."
+
+#. TRANS: Field label.
+msgid "Yahoo key"
+msgstr "Clave Yahoo"
+
+#. TRANS: Title for field label.
+msgid "Yahoo! Site Explorer verification key."
+msgstr "Clave de verificación para o explorador de sitios de Yahoo!"
+
+#. TRANS: Field label.
+msgid "Bing key"
+msgstr "Clave Bing"
+
+#. TRANS: Title for field label.
+msgid "Bing Webmaster Tools verification key."
+msgstr "Clave de verificación para as ferramentas de Bing Webmaster."
+
+#. TRANS: Submit button text to save sitemap settings.
+msgctxt "BUTTON"
+msgid "Save"
+msgstr "Gardar"
+
+#. TRANS: Submit button title to save sitemap settings.
+msgid "Save sitemap settings."
+msgstr "Gardar a configuración do mapa do sitio."
+
+#. TRANS: Menu item title/tooltip
+msgid "Sitemap configuration"
+msgstr "Configuración do mapa do sitio"
+
+#. TRANS: Menu item for site administration
+msgctxt "MENU"
+msgid "Sitemap"
+msgstr "Mapa do sitio"
+
+#. TRANS: Plugin description.
+msgid "This plugin allows creation of sitemaps for Bing, Yahoo! and Google."
+msgstr ""
+"Este complemento permite a creación de mapas do sitio para Bing, Yahoo! e "
+"Google."
diff --git a/plugins/Sitemap/locale/ia/LC_MESSAGES/Sitemap.po b/plugins/Sitemap/locale/ia/LC_MESSAGES/Sitemap.po
index bf855b15ab..223f208f6a 100644
--- a/plugins/Sitemap/locale/ia/LC_MESSAGES/Sitemap.po
+++ b/plugins/Sitemap/locale/ia/LC_MESSAGES/Sitemap.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Sitemap to Interlingua (Interlingua)
+# Translation of StatusNet - Sitemap to Interlingua (interlingua)
 # Exported from translatewiki.net
 #
 # Author: McDutchie
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Sitemap\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:21+0000\n"
-"Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:02+0000\n"
+"Language-Team: Interlingua <https://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:09:57+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:35+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-sitemap\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/Sitemap/locale/ja/LC_MESSAGES/Sitemap.po b/plugins/Sitemap/locale/ja/LC_MESSAGES/Sitemap.po
new file mode 100644
index 0000000000..12c76d4d3d
--- /dev/null
+++ b/plugins/Sitemap/locale/ja/LC_MESSAGES/Sitemap.po
@@ -0,0 +1,73 @@
+# Translation of StatusNet - Sitemap to Japanese (日本語)
+# Exported from translatewiki.net
+#
+# Author: Shirayuki
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Sitemap\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:02+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:51:35+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#. TRANS: Title for sitemap.
+msgid "Sitemap"
+msgstr "サイトマップ"
+
+#. TRANS: Instructions for sitemap.
+msgid "Sitemap settings for this StatusNet site"
+msgstr ""
+
+#. TRANS: Field label.
+msgid "Google key"
+msgstr "Google キー"
+
+#. TRANS: Title for field label.
+msgid "Google Webmaster Tools verification key."
+msgstr ""
+
+#. TRANS: Field label.
+msgid "Yahoo key"
+msgstr "Yahoo キー"
+
+#. TRANS: Title for field label.
+msgid "Yahoo! Site Explorer verification key."
+msgstr ""
+
+#. TRANS: Field label.
+msgid "Bing key"
+msgstr "Bing キー"
+
+#. TRANS: Title for field label.
+msgid "Bing Webmaster Tools verification key."
+msgstr ""
+
+#. TRANS: Submit button text to save sitemap settings.
+msgctxt "BUTTON"
+msgid "Save"
+msgstr "�存"
+
+#. TRANS: Submit button title to save sitemap settings.
+msgid "Save sitemap settings."
+msgstr ""
+
+#. TRANS: Menu item title/tooltip
+msgid "Sitemap configuration"
+msgstr ""
+
+#. TRANS: Menu item for site administration
+msgctxt "MENU"
+msgid "Sitemap"
+msgstr "サイトマップ"
+
+#. TRANS: Plugin description.
+msgid "This plugin allows creation of sitemaps for Bing, Yahoo! and Google."
+msgstr ""
diff --git a/plugins/Sitemap/locale/mk/LC_MESSAGES/Sitemap.po b/plugins/Sitemap/locale/mk/LC_MESSAGES/Sitemap.po
index 217765e31c..b05e53cf22 100644
--- a/plugins/Sitemap/locale/mk/LC_MESSAGES/Sitemap.po
+++ b/plugins/Sitemap/locale/mk/LC_MESSAGES/Sitemap.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Sitemap to Macedonian (Македон�ки)
+# Translation of StatusNet - Sitemap to Macedonian (македон�ки)
 # Exported from translatewiki.net
 #
 # Author: Bjankuloski06
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Sitemap\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:21+0000\n"
-"Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:02+0000\n"
+"Language-Team: Macedonian <https://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:09:57+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:35+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-sitemap\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
diff --git a/plugins/Sitemap/locale/nl/LC_MESSAGES/Sitemap.po b/plugins/Sitemap/locale/nl/LC_MESSAGES/Sitemap.po
index 7772a8591a..068c9074f4 100644
--- a/plugins/Sitemap/locale/nl/LC_MESSAGES/Sitemap.po
+++ b/plugins/Sitemap/locale/nl/LC_MESSAGES/Sitemap.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Sitemap\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:21+0000\n"
-"Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:02+0000\n"
+"Language-Team: Dutch <https://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:09:57+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:35+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-sitemap\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/Sitemap/locale/ru/LC_MESSAGES/Sitemap.po b/plugins/Sitemap/locale/ru/LC_MESSAGES/Sitemap.po
index 71879f46dc..8069cf7513 100644
--- a/plugins/Sitemap/locale/ru/LC_MESSAGES/Sitemap.po
+++ b/plugins/Sitemap/locale/ru/LC_MESSAGES/Sitemap.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Sitemap to Russian (Ру��кий)
+# Translation of StatusNet - Sitemap to Russian (ру��кий)
 # Exported from translatewiki.net
 #
 # Author: MaxSem
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Sitemap\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:21+0000\n"
-"Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:02+0000\n"
+"Language-Team: Russian <https://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:09:57+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:35+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-sitemap\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
diff --git a/plugins/Sitemap/locale/tl/LC_MESSAGES/Sitemap.po b/plugins/Sitemap/locale/tl/LC_MESSAGES/Sitemap.po
index 50e8ebaed4..4d0e5bc00e 100644
--- a/plugins/Sitemap/locale/tl/LC_MESSAGES/Sitemap.po
+++ b/plugins/Sitemap/locale/tl/LC_MESSAGES/Sitemap.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Sitemap\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:21+0000\n"
-"Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:02+0000\n"
+"Language-Team: Tagalog <https://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:09:57+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:35+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-sitemap\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/Sitemap/locale/uk/LC_MESSAGES/Sitemap.po b/plugins/Sitemap/locale/uk/LC_MESSAGES/Sitemap.po
index 0c01fa50c8..e83ee56a40 100644
--- a/plugins/Sitemap/locale/uk/LC_MESSAGES/Sitemap.po
+++ b/plugins/Sitemap/locale/uk/LC_MESSAGES/Sitemap.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Sitemap to Ukrainian (Україн�ька)
+# Translation of StatusNet - Sitemap to Ukrainian (україн�ька)
 # Exported from translatewiki.net
 #
 # Author: Boogie
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Sitemap\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:21+0000\n"
-"Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:03+0000\n"
+"Language-Team: Ukrainian <https://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:09:57+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:35+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-sitemap\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
diff --git a/plugins/SlicedFavorites/locale/SlicedFavorites.pot b/plugins/SlicedFavorites/locale/SlicedFavorites.pot
index ceb47ee345..c1cf49d66f 100644
--- a/plugins/SlicedFavorites/locale/SlicedFavorites.pot
+++ b/plugins/SlicedFavorites/locale/SlicedFavorites.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
+"POT-Creation-Date: 2012-06-30 11:07+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"
diff --git a/plugins/SlicedFavorites/locale/de/LC_MESSAGES/SlicedFavorites.po b/plugins/SlicedFavorites/locale/de/LC_MESSAGES/SlicedFavorites.po
index 5abf3c0bda..81bee18cc1 100644
--- a/plugins/SlicedFavorites/locale/de/LC_MESSAGES/SlicedFavorites.po
+++ b/plugins/SlicedFavorites/locale/de/LC_MESSAGES/SlicedFavorites.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SlicedFavorites\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:22+0000\n"
-"Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:03+0000\n"
+"Language-Team: German <https://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:09:58+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:36+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-slicedfavorites\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/SlicedFavorites/locale/es/LC_MESSAGES/SlicedFavorites.po b/plugins/SlicedFavorites/locale/es/LC_MESSAGES/SlicedFavorites.po
new file mode 100644
index 0000000000..270b472b9a
--- /dev/null
+++ b/plugins/SlicedFavorites/locale/es/LC_MESSAGES/SlicedFavorites.po
@@ -0,0 +1,28 @@
+# Translation of StatusNet - SlicedFavorites to Spanish (español)
+# Exported from translatewiki.net
+#
+# Author: Armando-Martin
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - SlicedFavorites\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:03+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:51:36+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin description.
+msgid "Shows timelines of popular notices for defined subsets of users."
+msgstr ""
+"Muestra listas de notas populares para subconjuntos definidos de usuarios."
+
+#. TRANS: Client exception.
+msgid "Unknown favorites slice."
+msgstr "Sección de favoritos desconocida"
diff --git a/plugins/SlicedFavorites/locale/eu/LC_MESSAGES/SlicedFavorites.po b/plugins/SlicedFavorites/locale/eu/LC_MESSAGES/SlicedFavorites.po
new file mode 100644
index 0000000000..59a3566cfa
--- /dev/null
+++ b/plugins/SlicedFavorites/locale/eu/LC_MESSAGES/SlicedFavorites.po
@@ -0,0 +1,27 @@
+# Translation of StatusNet - SlicedFavorites to Basque (euskara)
+# Exported from translatewiki.net
+#
+# Author: Artsuaga
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - SlicedFavorites\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:03+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:51:36+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin description.
+msgid "Shows timelines of popular notices for defined subsets of users."
+msgstr ""
+
+#. TRANS: Client exception.
+msgid "Unknown favorites slice."
+msgstr "Gogokoen atal ezezaguna."
diff --git a/plugins/SlicedFavorites/locale/fr/LC_MESSAGES/SlicedFavorites.po b/plugins/SlicedFavorites/locale/fr/LC_MESSAGES/SlicedFavorites.po
index 2dee64c2f7..df1dc113d7 100644
--- a/plugins/SlicedFavorites/locale/fr/LC_MESSAGES/SlicedFavorites.po
+++ b/plugins/SlicedFavorites/locale/fr/LC_MESSAGES/SlicedFavorites.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - SlicedFavorites to French (Français)
+# Translation of StatusNet - SlicedFavorites to French (français)
 # Exported from translatewiki.net
 #
 # Author: Peter17
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SlicedFavorites\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:22+0000\n"
-"Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:03+0000\n"
+"Language-Team: French <https://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:09:58+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:36+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-slicedfavorites\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
diff --git a/plugins/SlicedFavorites/locale/gl/LC_MESSAGES/SlicedFavorites.po b/plugins/SlicedFavorites/locale/gl/LC_MESSAGES/SlicedFavorites.po
new file mode 100644
index 0000000000..7fe986d249
--- /dev/null
+++ b/plugins/SlicedFavorites/locale/gl/LC_MESSAGES/SlicedFavorites.po
@@ -0,0 +1,31 @@
+# Translation of StatusNet - SlicedFavorites to Galician (galego)
+# Exported from translatewiki.net
+#
+# Author: Toliño
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - SlicedFavorites\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:03+0000\n"
+"Language-Team: Galician <https://translatewiki.net/wiki/Portal:gl>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:51:36+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: gl\n"
+"X-Message-Group: #out-statusnet-plugin-slicedfavorites\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin description.
+msgid "Shows timelines of popular notices for defined subsets of users."
+msgstr ""
+"Mostra listas de notas populares para os subconxuntos definidos de usuarios."
+
+#. TRANS: Client exception.
+msgid "Unknown favorites slice."
+msgstr "Anaco de favoritos descoñecido."
diff --git a/plugins/SlicedFavorites/locale/he/LC_MESSAGES/SlicedFavorites.po b/plugins/SlicedFavorites/locale/he/LC_MESSAGES/SlicedFavorites.po
index 2201c11c1a..7b07d6357d 100644
--- a/plugins/SlicedFavorites/locale/he/LC_MESSAGES/SlicedFavorites.po
+++ b/plugins/SlicedFavorites/locale/he/LC_MESSAGES/SlicedFavorites.po
@@ -1,6 +1,7 @@
 # Translation of StatusNet - SlicedFavorites to Hebrew (עברית)
 # Exported from translatewiki.net
 #
+# Author: Amire80
 # Author: YaronSh
 # --
 # This file is distributed under the same license as the StatusNet package.
@@ -9,21 +10,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SlicedFavorites\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:22+0000\n"
-"Language-Team: Hebrew <http://translatewiki.net/wiki/Portal:he>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:03+0000\n"
+"Language-Team: Hebrew <https://translatewiki.net/wiki/Portal:he>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:09:58+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:36+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: he\n"
 "X-Message-Group: #out-statusnet-plugin-slicedfavorites\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANS: Plugin description.
 msgid "Shows timelines of popular notices for defined subsets of users."
-msgstr "הצגת צירי זמן של התרעות נפוצות לקבוצות מסוימות של משתמשי�."
+msgstr "הצגת צירי זמן של עדכוני� פופולריי� לתת־קבוצות מסוימות של משתמשי�."
 
 #. TRANS: Client exception.
 msgid "Unknown favorites slice."
diff --git a/plugins/SlicedFavorites/locale/ia/LC_MESSAGES/SlicedFavorites.po b/plugins/SlicedFavorites/locale/ia/LC_MESSAGES/SlicedFavorites.po
index 828dc32514..e43529a4c4 100644
--- a/plugins/SlicedFavorites/locale/ia/LC_MESSAGES/SlicedFavorites.po
+++ b/plugins/SlicedFavorites/locale/ia/LC_MESSAGES/SlicedFavorites.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - SlicedFavorites to Interlingua (Interlingua)
+# Translation of StatusNet - SlicedFavorites to Interlingua (interlingua)
 # Exported from translatewiki.net
 #
 # Author: McDutchie
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SlicedFavorites\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:22+0000\n"
-"Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:03+0000\n"
+"Language-Team: Interlingua <https://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:09:58+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:36+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-slicedfavorites\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/SlicedFavorites/locale/id/LC_MESSAGES/SlicedFavorites.po b/plugins/SlicedFavorites/locale/id/LC_MESSAGES/SlicedFavorites.po
index d23764c33d..2e8ae13609 100644
--- a/plugins/SlicedFavorites/locale/id/LC_MESSAGES/SlicedFavorites.po
+++ b/plugins/SlicedFavorites/locale/id/LC_MESSAGES/SlicedFavorites.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SlicedFavorites\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:22+0000\n"
-"Language-Team: Indonesian <http://translatewiki.net/wiki/Portal:id>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:03+0000\n"
+"Language-Team: Indonesian <https://translatewiki.net/wiki/Portal:id>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:09:58+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:36+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: id\n"
 "X-Message-Group: #out-statusnet-plugin-slicedfavorites\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
diff --git a/plugins/SlicedFavorites/locale/mk/LC_MESSAGES/SlicedFavorites.po b/plugins/SlicedFavorites/locale/mk/LC_MESSAGES/SlicedFavorites.po
index a9976f721f..68f2e71b4b 100644
--- a/plugins/SlicedFavorites/locale/mk/LC_MESSAGES/SlicedFavorites.po
+++ b/plugins/SlicedFavorites/locale/mk/LC_MESSAGES/SlicedFavorites.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - SlicedFavorites to Macedonian (Македон�ки)
+# Translation of StatusNet - SlicedFavorites to Macedonian (македон�ки)
 # Exported from translatewiki.net
 #
 # Author: Bjankuloski06
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SlicedFavorites\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:23+0000\n"
-"Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:04+0000\n"
+"Language-Team: Macedonian <https://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:09:58+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:36+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-slicedfavorites\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
diff --git a/plugins/SlicedFavorites/locale/nl/LC_MESSAGES/SlicedFavorites.po b/plugins/SlicedFavorites/locale/nl/LC_MESSAGES/SlicedFavorites.po
index dccb0c11f5..f7a68df868 100644
--- a/plugins/SlicedFavorites/locale/nl/LC_MESSAGES/SlicedFavorites.po
+++ b/plugins/SlicedFavorites/locale/nl/LC_MESSAGES/SlicedFavorites.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SlicedFavorites\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:23+0000\n"
-"Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:04+0000\n"
+"Language-Team: Dutch <https://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:09:58+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:36+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-slicedfavorites\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/SlicedFavorites/locale/ru/LC_MESSAGES/SlicedFavorites.po b/plugins/SlicedFavorites/locale/ru/LC_MESSAGES/SlicedFavorites.po
index f43c2b9399..2534acdddb 100644
--- a/plugins/SlicedFavorites/locale/ru/LC_MESSAGES/SlicedFavorites.po
+++ b/plugins/SlicedFavorites/locale/ru/LC_MESSAGES/SlicedFavorites.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - SlicedFavorites to Russian (Ру��кий)
+# Translation of StatusNet - SlicedFavorites to Russian (ру��кий)
 # Exported from translatewiki.net
 #
 # Author: �лек�андр Сигачёв
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SlicedFavorites\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:23+0000\n"
-"Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:04+0000\n"
+"Language-Team: Russian <https://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:09:58+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:36+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-slicedfavorites\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
diff --git a/plugins/SlicedFavorites/locale/tl/LC_MESSAGES/SlicedFavorites.po b/plugins/SlicedFavorites/locale/tl/LC_MESSAGES/SlicedFavorites.po
index c4010f7555..14960c7491 100644
--- a/plugins/SlicedFavorites/locale/tl/LC_MESSAGES/SlicedFavorites.po
+++ b/plugins/SlicedFavorites/locale/tl/LC_MESSAGES/SlicedFavorites.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SlicedFavorites\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:23+0000\n"
-"Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:04+0000\n"
+"Language-Team: Tagalog <https://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:09:58+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:36+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-slicedfavorites\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/SlicedFavorites/locale/uk/LC_MESSAGES/SlicedFavorites.po b/plugins/SlicedFavorites/locale/uk/LC_MESSAGES/SlicedFavorites.po
index dd1f9b3f58..672515e950 100644
--- a/plugins/SlicedFavorites/locale/uk/LC_MESSAGES/SlicedFavorites.po
+++ b/plugins/SlicedFavorites/locale/uk/LC_MESSAGES/SlicedFavorites.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - SlicedFavorites to Ukrainian (Україн�ька)
+# Translation of StatusNet - SlicedFavorites to Ukrainian (україн�ька)
 # Exported from translatewiki.net
 #
 # Author: Boogie
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SlicedFavorites\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:23+0000\n"
-"Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:04+0000\n"
+"Language-Team: Ukrainian <https://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:09:58+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:36+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-slicedfavorites\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
diff --git a/plugins/SphinxSearch/locale/SphinxSearch.pot b/plugins/SphinxSearch/locale/SphinxSearch.pot
index 1db4ef417d..346eee59d6 100644
--- a/plugins/SphinxSearch/locale/SphinxSearch.pot
+++ b/plugins/SphinxSearch/locale/SphinxSearch.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
+"POT-Creation-Date: 2012-06-30 11:07+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,7 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. TRANS: Server exception thrown when a database name cannot be identified.
-#: sphinxsearch.php:126
+#: sphinxsearch.php:129
 msgid "Sphinx search could not identify database name."
 msgstr ""
 
diff --git a/plugins/SphinxSearch/locale/de/LC_MESSAGES/SphinxSearch.po b/plugins/SphinxSearch/locale/de/LC_MESSAGES/SphinxSearch.po
index 39d0a81c84..b0cd57c216 100644
--- a/plugins/SphinxSearch/locale/de/LC_MESSAGES/SphinxSearch.po
+++ b/plugins/SphinxSearch/locale/de/LC_MESSAGES/SphinxSearch.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SphinxSearch\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:23+0000\n"
-"Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:04+0000\n"
+"Language-Team: German <https://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:09:58+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:37+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-sphinxsearch\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/SphinxSearch/locale/es/LC_MESSAGES/SphinxSearch.po b/plugins/SphinxSearch/locale/es/LC_MESSAGES/SphinxSearch.po
new file mode 100644
index 0000000000..7301906379
--- /dev/null
+++ b/plugins/SphinxSearch/locale/es/LC_MESSAGES/SphinxSearch.po
@@ -0,0 +1,31 @@
+# Translation of StatusNet - SphinxSearch to Spanish (español)
+# Exported from translatewiki.net
+#
+# Author: Armando-Martin
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - SphinxSearch\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:04+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:51:37+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Server exception thrown when a database name cannot be identified.
+msgid "Sphinx search could not identify database name."
+msgstr "La búsqueda Sphinx nn pudo identificar el nombre de la base de datos."
+
+#. TRANS: Server exception.
+msgid "Sphinx PHP extension must be installed."
+msgstr "La extensión PHP Sphinx debe ser instalada."
+
+#. TRANS: Plugin description.
+msgid "Plugin for Sphinx search backend."
+msgstr "Complemento (plugin) para el motor de búsquedas Sphinx."
diff --git a/plugins/SphinxSearch/locale/fr/LC_MESSAGES/SphinxSearch.po b/plugins/SphinxSearch/locale/fr/LC_MESSAGES/SphinxSearch.po
index 483547f24e..89854bb5bd 100644
--- a/plugins/SphinxSearch/locale/fr/LC_MESSAGES/SphinxSearch.po
+++ b/plugins/SphinxSearch/locale/fr/LC_MESSAGES/SphinxSearch.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - SphinxSearch to French (Français)
+# Translation of StatusNet - SphinxSearch to French (français)
 # Exported from translatewiki.net
 #
 # Author: Peter17
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SphinxSearch\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:23+0000\n"
-"Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:04+0000\n"
+"Language-Team: French <https://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:09:58+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:37+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-sphinxsearch\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
diff --git a/plugins/SphinxSearch/locale/gl/LC_MESSAGES/SphinxSearch.po b/plugins/SphinxSearch/locale/gl/LC_MESSAGES/SphinxSearch.po
new file mode 100644
index 0000000000..25e93d9961
--- /dev/null
+++ b/plugins/SphinxSearch/locale/gl/LC_MESSAGES/SphinxSearch.po
@@ -0,0 +1,34 @@
+# Translation of StatusNet - SphinxSearch to Galician (galego)
+# Exported from translatewiki.net
+#
+# Author: Toliño
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - SphinxSearch\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:05+0000\n"
+"Language-Team: Galician <https://translatewiki.net/wiki/Portal:gl>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:51:37+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: gl\n"
+"X-Message-Group: #out-statusnet-plugin-sphinxsearch\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Server exception thrown when a database name cannot be identified.
+msgid "Sphinx search could not identify database name."
+msgstr "A procura Sphinx non puido identificar o nome da base de datos."
+
+#. TRANS: Server exception.
+msgid "Sphinx PHP extension must be installed."
+msgstr "Cómpre que a extensión PHP Sphinx estea instalada."
+
+#. TRANS: Plugin description.
+msgid "Plugin for Sphinx search backend."
+msgstr "Complemento para o motor de procuras Sphinx."
diff --git a/plugins/SphinxSearch/locale/ia/LC_MESSAGES/SphinxSearch.po b/plugins/SphinxSearch/locale/ia/LC_MESSAGES/SphinxSearch.po
index 469f43050e..b559581dbb 100644
--- a/plugins/SphinxSearch/locale/ia/LC_MESSAGES/SphinxSearch.po
+++ b/plugins/SphinxSearch/locale/ia/LC_MESSAGES/SphinxSearch.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - SphinxSearch to Interlingua (Interlingua)
+# Translation of StatusNet - SphinxSearch to Interlingua (interlingua)
 # Exported from translatewiki.net
 #
 # Author: McDutchie
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SphinxSearch\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:23+0000\n"
-"Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:05+0000\n"
+"Language-Team: Interlingua <https://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:09:58+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:37+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-sphinxsearch\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/SphinxSearch/locale/mk/LC_MESSAGES/SphinxSearch.po b/plugins/SphinxSearch/locale/mk/LC_MESSAGES/SphinxSearch.po
index 03f03e3b69..a2192867a1 100644
--- a/plugins/SphinxSearch/locale/mk/LC_MESSAGES/SphinxSearch.po
+++ b/plugins/SphinxSearch/locale/mk/LC_MESSAGES/SphinxSearch.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - SphinxSearch to Macedonian (Македон�ки)
+# Translation of StatusNet - SphinxSearch to Macedonian (македон�ки)
 # Exported from translatewiki.net
 #
 # Author: Bjankuloski06
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SphinxSearch\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:24+0000\n"
-"Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:05+0000\n"
+"Language-Team: Macedonian <https://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:09:58+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:37+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-sphinxsearch\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
diff --git a/plugins/SphinxSearch/locale/nl/LC_MESSAGES/SphinxSearch.po b/plugins/SphinxSearch/locale/nl/LC_MESSAGES/SphinxSearch.po
index dc258a20f6..c6c7a98fed 100644
--- a/plugins/SphinxSearch/locale/nl/LC_MESSAGES/SphinxSearch.po
+++ b/plugins/SphinxSearch/locale/nl/LC_MESSAGES/SphinxSearch.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SphinxSearch\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:24+0000\n"
-"Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:05+0000\n"
+"Language-Team: Dutch <https://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:09:58+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:37+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-sphinxsearch\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/SphinxSearch/locale/ru/LC_MESSAGES/SphinxSearch.po b/plugins/SphinxSearch/locale/ru/LC_MESSAGES/SphinxSearch.po
index e827080460..593b00fe0c 100644
--- a/plugins/SphinxSearch/locale/ru/LC_MESSAGES/SphinxSearch.po
+++ b/plugins/SphinxSearch/locale/ru/LC_MESSAGES/SphinxSearch.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - SphinxSearch to Russian (Ру��кий)
+# Translation of StatusNet - SphinxSearch to Russian (ру��кий)
 # Exported from translatewiki.net
 #
 # Author: MaxSem
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SphinxSearch\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:24+0000\n"
-"Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:05+0000\n"
+"Language-Team: Russian <https://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:09:58+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:37+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-sphinxsearch\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
diff --git a/plugins/SphinxSearch/locale/tl/LC_MESSAGES/SphinxSearch.po b/plugins/SphinxSearch/locale/tl/LC_MESSAGES/SphinxSearch.po
index b980b88ba4..b635462b1b 100644
--- a/plugins/SphinxSearch/locale/tl/LC_MESSAGES/SphinxSearch.po
+++ b/plugins/SphinxSearch/locale/tl/LC_MESSAGES/SphinxSearch.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SphinxSearch\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:24+0000\n"
-"Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:05+0000\n"
+"Language-Team: Tagalog <https://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:09:58+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:37+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-sphinxsearch\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
diff --git a/plugins/SphinxSearch/locale/uk/LC_MESSAGES/SphinxSearch.po b/plugins/SphinxSearch/locale/uk/LC_MESSAGES/SphinxSearch.po
index 5d869a1063..6c9e3c840c 100644
--- a/plugins/SphinxSearch/locale/uk/LC_MESSAGES/SphinxSearch.po
+++ b/plugins/SphinxSearch/locale/uk/LC_MESSAGES/SphinxSearch.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - SphinxSearch to Ukrainian (Україн�ька)
+# Translation of StatusNet - SphinxSearch to Ukrainian (україн�ька)
 # Exported from translatewiki.net
 #
 # Author: Boogie
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SphinxSearch\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:24+0000\n"
-"Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:05+0000\n"
+"Language-Team: Ukrainian <https://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:09:58+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:37+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-sphinxsearch\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
diff --git a/plugins/SphinxSearch/sphinxsearch.php b/plugins/SphinxSearch/sphinxsearch.php
index 46b5e3e28a..607ac76d27 100644
--- a/plugins/SphinxSearch/sphinxsearch.php
+++ b/plugins/SphinxSearch/sphinxsearch.php
@@ -65,6 +65,9 @@ class SphinxSearch extends SearchEngine
     function query($q)
     {
         $result = $this->sphinx->query($q, $this->remote_table());
+        if ($result === false) {
+            throw new ServerException($this->sphinx->getLastError());
+        }
         if (!isset($result['matches'])) return false;
         $id_set = join(', ', array_keys($result['matches']));
         $this->target->whereAdd("id in ($id_set)");
diff --git a/plugins/Spotify/SpotifyPlugin.php b/plugins/Spotify/SpotifyPlugin.php
index e7a5a53826..6d4e645629 100644
--- a/plugins/Spotify/SpotifyPlugin.php
+++ b/plugins/Spotify/SpotifyPlugin.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * StatusNet, the distributed open-source microblogging tool
-  *
+ *
  * Plugin to create pretty Spotify URLs
  *
  * PHP version 5
@@ -47,10 +47,8 @@ define('SPOTIFYPLUGIN_VERSION', '0.1');
  *
  * @see       Event
  */
-
 class SpotifyPlugin extends Plugin
 {
-
     function __construct()
     {
         parent::__construct();
@@ -74,8 +72,22 @@ class SpotifyPlugin extends Plugin
         return 'SpotifyPlugin/'.SPOTIFYPLUGIN_VERSION .
                ' StatusNet/' . STATUSNET_VERSION;
     }
+
+    function onPluginVersion(&$versions)
+    {
+        $versions[] = array('name' => 'Spotify',
+                            'version' => SPOTIFYPLUGIN_VERSION,
+                            'author' => 'Nick Holliday',
+                            'homepage' => 'http://status.net/wiki/Plugin:Spotify',
+                            'rawdescription' =>
+                            // TRANS: Plugin description.
+                            _m('Create pretty <a href="http://www.spotify.com">Spotify</a> URLs.'));
+
+        return true;
+    }
 }
 
+// @todo FIXME: This probably should not be global functions.
 function doSpotifyLookup($uri, $isArtist)
 {
     $request = HTTPClient::start();
diff --git a/plugins/Spotify/locale/Spotify.pot b/plugins/Spotify/locale/Spotify.pot
new file mode 100644
index 0000000000..067d910d5a
--- /dev/null
+++ b/plugins/Spotify/locale/Spotify.pot
@@ -0,0 +1,22 @@
+# 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: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. TRANS: Plugin description.
+#: SpotifyPlugin.php:84
+msgid "Create pretty <a href=\"http://www.spotify.com\">Spotify</a> URLs."
+msgstr ""
diff --git a/plugins/Spotify/locale/de/LC_MESSAGES/Spotify.po b/plugins/Spotify/locale/de/LC_MESSAGES/Spotify.po
new file mode 100644
index 0000000000..3db27433fd
--- /dev/null
+++ b/plugins/Spotify/locale/de/LC_MESSAGES/Spotify.po
@@ -0,0 +1,26 @@
+# Translation of StatusNet - Spotify to German (Deutsch)
+# Exported from translatewiki.net
+#
+# Author: ChrisiPK
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Spotify\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:06+0000\n"
+"Language-Team: German <https://translatewiki.net/wiki/Portal:de>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-19 11:23:27+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: de\n"
+"X-Message-Group: #out-statusnet-plugin-spotify\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin description.
+msgid "Create pretty <a href=\"http://www.spotify.com\">Spotify</a> URLs."
+msgstr "Schöne <a href=\"http://www.spotify.com\">Spotify</a>-URLs erstellen."
diff --git a/plugins/Spotify/locale/es/LC_MESSAGES/Spotify.po b/plugins/Spotify/locale/es/LC_MESSAGES/Spotify.po
new file mode 100644
index 0000000000..b57a11f2dd
--- /dev/null
+++ b/plugins/Spotify/locale/es/LC_MESSAGES/Spotify.po
@@ -0,0 +1,24 @@
+# Translation of StatusNet - Spotify to Spanish (español)
+# Exported from translatewiki.net
+#
+# Author: Armando-Martin
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Spotify\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:06+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-19 11:23:27+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin description.
+msgid "Create pretty <a href=\"http://www.spotify.com\">Spotify</a> URLs."
+msgstr ""
+"Crear direcciones URL para <a href=\"http://www.spotify.com\">Spotify</a>."
diff --git a/plugins/Spotify/locale/fr/LC_MESSAGES/Spotify.po b/plugins/Spotify/locale/fr/LC_MESSAGES/Spotify.po
new file mode 100644
index 0000000000..52f3ad52ec
--- /dev/null
+++ b/plugins/Spotify/locale/fr/LC_MESSAGES/Spotify.po
@@ -0,0 +1,23 @@
+# Translation of StatusNet - Spotify to French (français)
+# Exported from translatewiki.net
+#
+# Author: Gomoko
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Spotify\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:06+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-19 11:23:27+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#. TRANS: Plugin description.
+msgid "Create pretty <a href=\"http://www.spotify.com\">Spotify</a> URLs."
+msgstr "Créer de jolies URLs <a href=\"http://www.spotify.com\">Spotify</a>."
diff --git a/plugins/Spotify/locale/gl/LC_MESSAGES/Spotify.po b/plugins/Spotify/locale/gl/LC_MESSAGES/Spotify.po
new file mode 100644
index 0000000000..d9337709c0
--- /dev/null
+++ b/plugins/Spotify/locale/gl/LC_MESSAGES/Spotify.po
@@ -0,0 +1,27 @@
+# Translation of StatusNet - Spotify to Galician (galego)
+# Exported from translatewiki.net
+#
+# Author: Toliño
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Spotify\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:06+0000\n"
+"Language-Team: Galician <https://translatewiki.net/wiki/Portal:gl>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-19 11:23:27+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: gl\n"
+"X-Message-Group: #out-statusnet-plugin-spotify\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin description.
+msgid "Create pretty <a href=\"http://www.spotify.com\">Spotify</a> URLs."
+msgstr ""
+"Crear enderezos URL para <a href=\"http://www.spotify.com\">Spotify</a>."
diff --git a/plugins/Spotify/locale/he/LC_MESSAGES/Spotify.po b/plugins/Spotify/locale/he/LC_MESSAGES/Spotify.po
new file mode 100644
index 0000000000..28f1678eda
--- /dev/null
+++ b/plugins/Spotify/locale/he/LC_MESSAGES/Spotify.po
@@ -0,0 +1,26 @@
+# Translation of StatusNet - Spotify to Hebrew (עברית)
+# Exported from translatewiki.net
+#
+# Author: Amire80
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Spotify\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:06+0000\n"
+"Language-Team: Hebrew <https://translatewiki.net/wiki/Portal:he>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-19 11:23:27+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: he\n"
+"X-Message-Group: #out-statusnet-plugin-spotify\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin description.
+msgid "Create pretty <a href=\"http://www.spotify.com\">Spotify</a> URLs."
+msgstr "יצירת כתובות יפות ל־<a href=\"http://www.spotify.com\">Spotify</a>."
diff --git a/plugins/Spotify/locale/ia/LC_MESSAGES/Spotify.po b/plugins/Spotify/locale/ia/LC_MESSAGES/Spotify.po
new file mode 100644
index 0000000000..3185173912
--- /dev/null
+++ b/plugins/Spotify/locale/ia/LC_MESSAGES/Spotify.po
@@ -0,0 +1,26 @@
+# Translation of StatusNet - Spotify to Interlingua (interlingua)
+# Exported from translatewiki.net
+#
+# Author: McDutchie
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Spotify\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:06+0000\n"
+"Language-Team: Interlingua <https://translatewiki.net/wiki/Portal:ia>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-19 11:23:27+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: ia\n"
+"X-Message-Group: #out-statusnet-plugin-spotify\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin description.
+msgid "Create pretty <a href=\"http://www.spotify.com\">Spotify</a> URLs."
+msgstr "Crear belle URLs de <a href=\"http://www.spotify.com\">Spotify</a>."
diff --git a/plugins/Spotify/locale/mk/LC_MESSAGES/Spotify.po b/plugins/Spotify/locale/mk/LC_MESSAGES/Spotify.po
new file mode 100644
index 0000000000..b1c86f17d6
--- /dev/null
+++ b/plugins/Spotify/locale/mk/LC_MESSAGES/Spotify.po
@@ -0,0 +1,28 @@
+# Translation of StatusNet - Spotify to Macedonian (македон�ки)
+# Exported from translatewiki.net
+#
+# Author: Bjankuloski06
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Spotify\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:06+0000\n"
+"Language-Team: Macedonian <https://translatewiki.net/wiki/Portal:mk>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-19 11:23:27+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: mk\n"
+"X-Message-Group: #out-statusnet-plugin-spotify\n"
+"Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
+
+#. TRANS: Plugin description.
+msgid "Create pretty <a href=\"http://www.spotify.com\">Spotify</a> URLs."
+msgstr ""
+"Правете интере�ни и убави URL-адре�и �о <a href=\"http://www.spotify.com"
+"\">Spotify</a>."
diff --git a/plugins/Spotify/locale/nl/LC_MESSAGES/Spotify.po b/plugins/Spotify/locale/nl/LC_MESSAGES/Spotify.po
new file mode 100644
index 0000000000..be97552c5f
--- /dev/null
+++ b/plugins/Spotify/locale/nl/LC_MESSAGES/Spotify.po
@@ -0,0 +1,26 @@
+# Translation of StatusNet - Spotify to Dutch (Nederlands)
+# Exported from translatewiki.net
+#
+# Author: Siebrand
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Spotify\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:07+0000\n"
+"Language-Team: Dutch <https://translatewiki.net/wiki/Portal:nl>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-19 11:23:27+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: nl\n"
+"X-Message-Group: #out-statusnet-plugin-spotify\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin description.
+msgid "Create pretty <a href=\"http://www.spotify.com\">Spotify</a> URLs."
+msgstr "Maak mooie <a href=\"http://www.spotify.com\">Spotify-URL's</a>."
diff --git a/plugins/Spotify/locale/sv/LC_MESSAGES/Spotify.po b/plugins/Spotify/locale/sv/LC_MESSAGES/Spotify.po
new file mode 100644
index 0000000000..fa3b155b89
--- /dev/null
+++ b/plugins/Spotify/locale/sv/LC_MESSAGES/Spotify.po
@@ -0,0 +1,27 @@
+# Translation of StatusNet - Spotify to Swedish (svenska)
+# Exported from translatewiki.net
+#
+# Author: WikiPhoenix
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Spotify\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:07+0000\n"
+"Language-Team: Swedish <https://translatewiki.net/wiki/Portal:sv>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-19 11:23:27+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: sv\n"
+"X-Message-Group: #out-statusnet-plugin-spotify\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin description.
+msgid "Create pretty <a href=\"http://www.spotify.com\">Spotify</a> URLs."
+msgstr ""
+"Skapa vackra <a href=\"http://www.spotify.com\">Spotify</a>-webbadresser."
diff --git a/plugins/Spotify/locale/tl/LC_MESSAGES/Spotify.po b/plugins/Spotify/locale/tl/LC_MESSAGES/Spotify.po
new file mode 100644
index 0000000000..64c13c1fe4
--- /dev/null
+++ b/plugins/Spotify/locale/tl/LC_MESSAGES/Spotify.po
@@ -0,0 +1,25 @@
+# Translation of StatusNet - Spotify to Tagalog (Tagalog)
+# Exported from translatewiki.net
+#
+# Author: AnakngAraw
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Spotify\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:07+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-19 11:23:27+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin description.
+msgid "Create pretty <a href=\"http://www.spotify.com\">Spotify</a> URLs."
+msgstr ""
+"Lumikha ng marilag na mga URL ng <a href=\"http://www.spotify.com\">Spotify</"
+"a>."
diff --git a/plugins/StrictTransportSecurity/StrictTransportSecurityPlugin.php b/plugins/StrictTransportSecurity/StrictTransportSecurityPlugin.php
index 004a627929..d4376b8ab9 100644
--- a/plugins/StrictTransportSecurity/StrictTransportSecurityPlugin.php
+++ b/plugins/StrictTransportSecurity/StrictTransportSecurityPlugin.php
@@ -56,6 +56,7 @@ class StrictTransportSecurityPlugin extends Plugin
                             'author' => 'Craig Andrews',
                             'homepage' => 'http://status.net/wiki/Plugin:StrictTransportSecurity',
                             'rawdescription' =>
+                            // TRANS: Plugin description.
                             _m('The Strict Transport Security plugin implements the Strict Transport Security header, improving the security of HTTPS only sites.'));
         return true;
     }
diff --git a/plugins/StrictTransportSecurity/locale/StrictTransportSecurity.pot b/plugins/StrictTransportSecurity/locale/StrictTransportSecurity.pot
index 841336bc6c..6b3559ec63 100644
--- a/plugins/StrictTransportSecurity/locale/StrictTransportSecurity.pot
+++ b/plugins/StrictTransportSecurity/locale/StrictTransportSecurity.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,7 +16,8 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: StrictTransportSecurityPlugin.php:59
+#. TRANS: Plugin description.
+#: StrictTransportSecurityPlugin.php:60
 msgid ""
 "The Strict Transport Security plugin implements the Strict Transport "
 "Security header, improving the security of HTTPS only sites."
diff --git a/plugins/StrictTransportSecurity/locale/de/LC_MESSAGES/StrictTransportSecurity.po b/plugins/StrictTransportSecurity/locale/de/LC_MESSAGES/StrictTransportSecurity.po
index 54df3bffd8..90a9443ccc 100644
--- a/plugins/StrictTransportSecurity/locale/de/LC_MESSAGES/StrictTransportSecurity.po
+++ b/plugins/StrictTransportSecurity/locale/de/LC_MESSAGES/StrictTransportSecurity.po
@@ -9,18 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - StrictTransportSecurity\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:27+0000\n"
-"Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:10+0000\n"
+"Language-Team: German <https://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:21+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:41+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-stricttransportsecurity\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Plugin description.
 msgid ""
 "The Strict Transport Security plugin implements the Strict Transport "
 "Security header, improving the security of HTTPS only sites."
diff --git a/plugins/StrictTransportSecurity/locale/es/LC_MESSAGES/StrictTransportSecurity.po b/plugins/StrictTransportSecurity/locale/es/LC_MESSAGES/StrictTransportSecurity.po
new file mode 100644
index 0000000000..ecb02b40e1
--- /dev/null
+++ b/plugins/StrictTransportSecurity/locale/es/LC_MESSAGES/StrictTransportSecurity.po
@@ -0,0 +1,28 @@
+# Translation of StatusNet - StrictTransportSecurity to Spanish (español)
+# Exported from translatewiki.net
+#
+# Author: Armando-Martin
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - StrictTransportSecurity\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:10+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:51:41+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin description.
+msgid ""
+"The Strict Transport Security plugin implements the Strict Transport "
+"Security header, improving the security of HTTPS only sites."
+msgstr ""
+"El complemento (plugin) Strict Transport Security implementa la cabecera "
+"Strict Transport Security, que mejora la seguridad de los sitios disponibles "
+"unicamente en HTTPS."
diff --git a/plugins/StrictTransportSecurity/locale/fr/LC_MESSAGES/StrictTransportSecurity.po b/plugins/StrictTransportSecurity/locale/fr/LC_MESSAGES/StrictTransportSecurity.po
index 48b3f9b6c1..ae52d58df2 100644
--- a/plugins/StrictTransportSecurity/locale/fr/LC_MESSAGES/StrictTransportSecurity.po
+++ b/plugins/StrictTransportSecurity/locale/fr/LC_MESSAGES/StrictTransportSecurity.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - StrictTransportSecurity to French (Français)
+# Translation of StatusNet - StrictTransportSecurity to French (français)
 # Exported from translatewiki.net
 #
 # Author: Brunoperel
@@ -9,18 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - StrictTransportSecurity\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:27+0000\n"
-"Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:10+0000\n"
+"Language-Team: French <https://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:21+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:41+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-stricttransportsecurity\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#. TRANS: Plugin description.
 msgid ""
 "The Strict Transport Security plugin implements the Strict Transport "
 "Security header, improving the security of HTTPS only sites."
diff --git a/plugins/StrictTransportSecurity/locale/gl/LC_MESSAGES/StrictTransportSecurity.po b/plugins/StrictTransportSecurity/locale/gl/LC_MESSAGES/StrictTransportSecurity.po
new file mode 100644
index 0000000000..2ce758e78b
--- /dev/null
+++ b/plugins/StrictTransportSecurity/locale/gl/LC_MESSAGES/StrictTransportSecurity.po
@@ -0,0 +1,30 @@
+# Translation of StatusNet - StrictTransportSecurity to Galician (galego)
+# Exported from translatewiki.net
+#
+# Author: Toliño
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - StrictTransportSecurity\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:10+0000\n"
+"Language-Team: Galician <https://translatewiki.net/wiki/Portal:gl>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:51:41+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: gl\n"
+"X-Message-Group: #out-statusnet-plugin-stricttransportsecurity\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin description.
+msgid ""
+"The Strict Transport Security plugin implements the Strict Transport "
+"Security header, improving the security of HTTPS only sites."
+msgstr ""
+"O complemento Strict Transport Security inclúe a cabeceira Strict Transport "
+"Security, mellorando a seguridade dos sitios dispoñibles unicamente en HTTPS."
diff --git a/plugins/StrictTransportSecurity/locale/he/LC_MESSAGES/StrictTransportSecurity.po b/plugins/StrictTransportSecurity/locale/he/LC_MESSAGES/StrictTransportSecurity.po
new file mode 100644
index 0000000000..22833b951e
--- /dev/null
+++ b/plugins/StrictTransportSecurity/locale/he/LC_MESSAGES/StrictTransportSecurity.po
@@ -0,0 +1,30 @@
+# Translation of StatusNet - StrictTransportSecurity to Hebrew (עברית)
+# Exported from translatewiki.net
+#
+# Author: Amire80
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - StrictTransportSecurity\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:10+0000\n"
+"Language-Team: Hebrew <https://translatewiki.net/wiki/Portal:he>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:51:41+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: he\n"
+"X-Message-Group: #out-statusnet-plugin-stricttransportsecurity\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin description.
+msgid ""
+"The Strict Transport Security plugin implements the Strict Transport "
+"Security header, improving the security of HTTPS only sites."
+msgstr ""
+"תוסף �בטחת תעבורה הדוקה מייש� �ת הכותרת �בטחת תעבורה הדוקה (Strict Transport "
+"Security), שמשפת �ת ה�בטחה ב�תרי� שפועלי� רק ב־HTTPS."
diff --git a/plugins/StrictTransportSecurity/locale/ia/LC_MESSAGES/StrictTransportSecurity.po b/plugins/StrictTransportSecurity/locale/ia/LC_MESSAGES/StrictTransportSecurity.po
index a0feb79763..d0212f2118 100644
--- a/plugins/StrictTransportSecurity/locale/ia/LC_MESSAGES/StrictTransportSecurity.po
+++ b/plugins/StrictTransportSecurity/locale/ia/LC_MESSAGES/StrictTransportSecurity.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - StrictTransportSecurity to Interlingua (Interlingua)
+# Translation of StatusNet - StrictTransportSecurity to Interlingua (interlingua)
 # Exported from translatewiki.net
 #
 # Author: McDutchie
@@ -9,18 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - StrictTransportSecurity\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:27+0000\n"
-"Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:10+0000\n"
+"Language-Team: Interlingua <https://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:21+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:41+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-stricttransportsecurity\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Plugin description.
 msgid ""
 "The Strict Transport Security plugin implements the Strict Transport "
 "Security header, improving the security of HTTPS only sites."
diff --git a/plugins/StrictTransportSecurity/locale/mk/LC_MESSAGES/StrictTransportSecurity.po b/plugins/StrictTransportSecurity/locale/mk/LC_MESSAGES/StrictTransportSecurity.po
index e9f67df98f..c3d4a7951f 100644
--- a/plugins/StrictTransportSecurity/locale/mk/LC_MESSAGES/StrictTransportSecurity.po
+++ b/plugins/StrictTransportSecurity/locale/mk/LC_MESSAGES/StrictTransportSecurity.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - StrictTransportSecurity to Macedonian (Македон�ки)
+# Translation of StatusNet - StrictTransportSecurity to Macedonian (македон�ки)
 # Exported from translatewiki.net
 #
 # Author: Bjankuloski06
@@ -9,18 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - StrictTransportSecurity\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:27+0000\n"
-"Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:10+0000\n"
+"Language-Team: Macedonian <https://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:21+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:41+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-stricttransportsecurity\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
 
+#. TRANS: Plugin description.
 msgid ""
 "The Strict Transport Security plugin implements the Strict Transport "
 "Security header, improving the security of HTTPS only sites."
diff --git a/plugins/StrictTransportSecurity/locale/nl/LC_MESSAGES/StrictTransportSecurity.po b/plugins/StrictTransportSecurity/locale/nl/LC_MESSAGES/StrictTransportSecurity.po
index 997936c3eb..8b5e3e36fb 100644
--- a/plugins/StrictTransportSecurity/locale/nl/LC_MESSAGES/StrictTransportSecurity.po
+++ b/plugins/StrictTransportSecurity/locale/nl/LC_MESSAGES/StrictTransportSecurity.po
@@ -9,18 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - StrictTransportSecurity\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:27+0000\n"
-"Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:10+0000\n"
+"Language-Team: Dutch <https://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:21+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:41+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-stricttransportsecurity\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Plugin description.
 msgid ""
 "The Strict Transport Security plugin implements the Strict Transport "
 "Security header, improving the security of HTTPS only sites."
diff --git a/plugins/StrictTransportSecurity/locale/ru/LC_MESSAGES/StrictTransportSecurity.po b/plugins/StrictTransportSecurity/locale/ru/LC_MESSAGES/StrictTransportSecurity.po
index 8184bd47e6..fb758025fd 100644
--- a/plugins/StrictTransportSecurity/locale/ru/LC_MESSAGES/StrictTransportSecurity.po
+++ b/plugins/StrictTransportSecurity/locale/ru/LC_MESSAGES/StrictTransportSecurity.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - StrictTransportSecurity to Russian (Ру��кий)
+# Translation of StatusNet - StrictTransportSecurity to Russian (ру��кий)
 # Exported from translatewiki.net
 #
 # Author: �лек�андр Сигачёв
@@ -9,19 +9,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - StrictTransportSecurity\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:27+0000\n"
-"Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:11+0000\n"
+"Language-Team: Russian <https://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:21+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:41+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-stricttransportsecurity\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
+#. TRANS: Plugin description.
 msgid ""
 "The Strict Transport Security plugin implements the Strict Transport "
 "Security header, improving the security of HTTPS only sites."
diff --git a/plugins/StrictTransportSecurity/locale/tl/LC_MESSAGES/StrictTransportSecurity.po b/plugins/StrictTransportSecurity/locale/tl/LC_MESSAGES/StrictTransportSecurity.po
index 195dbc1a5a..f61be0f287 100644
--- a/plugins/StrictTransportSecurity/locale/tl/LC_MESSAGES/StrictTransportSecurity.po
+++ b/plugins/StrictTransportSecurity/locale/tl/LC_MESSAGES/StrictTransportSecurity.po
@@ -9,18 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - StrictTransportSecurity\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:27+0000\n"
-"Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:11+0000\n"
+"Language-Team: Tagalog <https://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:21+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:41+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-stricttransportsecurity\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Plugin description.
 msgid ""
 "The Strict Transport Security plugin implements the Strict Transport "
 "Security header, improving the security of HTTPS only sites."
diff --git a/plugins/StrictTransportSecurity/locale/uk/LC_MESSAGES/StrictTransportSecurity.po b/plugins/StrictTransportSecurity/locale/uk/LC_MESSAGES/StrictTransportSecurity.po
index 02acaa3cf7..bcae6000e4 100644
--- a/plugins/StrictTransportSecurity/locale/uk/LC_MESSAGES/StrictTransportSecurity.po
+++ b/plugins/StrictTransportSecurity/locale/uk/LC_MESSAGES/StrictTransportSecurity.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - StrictTransportSecurity to Ukrainian (Україн�ька)
+# Translation of StatusNet - StrictTransportSecurity to Ukrainian (україн�ька)
 # Exported from translatewiki.net
 #
 # Author: Boogie
@@ -9,19 +9,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - StrictTransportSecurity\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:27+0000\n"
-"Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:11+0000\n"
+"Language-Team: Ukrainian <https://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:21+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:51:41+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-stricttransportsecurity\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
+#. TRANS: Plugin description.
 msgid ""
 "The Strict Transport Security plugin implements the Strict Transport "
 "Security header, improving the security of HTTPS only sites."
diff --git a/plugins/SubMirror/SubMirrorPlugin.php b/plugins/SubMirror/SubMirrorPlugin.php
index a9cb2315b4..427153ab22 100644
--- a/plugins/SubMirror/SubMirrorPlugin.php
+++ b/plugins/SubMirror/SubMirrorPlugin.php
@@ -90,6 +90,7 @@ class SubMirrorPlugin extends Plugin
                             'author' => 'Brion Vibber',
                             'homepage' => 'http://status.net/wiki/Plugin:SubMirror',
                             'rawdescription' =>
+                            // TRANS: Plugin description.
                             _m('Pull feeds into your timeline!'));
 
         return true;
@@ -98,16 +99,16 @@ class SubMirrorPlugin extends Plugin
     /**
      * Menu item for personal subscriptions/groups area
      *
-     * @param Widget $widget Widget being executed
+     * @param Action $action action being executed
      *
      * @return boolean hook return
      */
-
-    function onEndSubGroupNav($widget)
+    function onEndAccountSettingsNav($action)
     {
-        $action = $widget->out;
         $action_name = $action->trimmed('action');
 
+        common_debug("ACTION NAME = " . $action_name);
+
         $action->menuItem(common_local_url('mirrorsettings'),
                           // TRANS: SubMirror plugin menu item on user settings page.
                           _m('MENU', 'Mirroring'),
@@ -156,6 +157,10 @@ class SubMirrorPlugin extends Plugin
      */
     function onOstatus_profileSubscriberCount($oprofile, &$count)
     {
+        if (empty($oprofile) || !($oprofile instanceof Ostatus_profile)) {
+            return true;
+        }
+
         if ($oprofile->profile_id) {
             $mirror = new SubMirror();
             $mirror->subscribed = $oprofile->profile_id;
@@ -165,6 +170,7 @@ class SubMirrorPlugin extends Plugin
                 }
             }
         }
+
         return true;
     }
 
@@ -183,6 +189,7 @@ class SubMirrorPlugin extends Plugin
             $mirror->subscriber = $profile->id;
             $entry = array(
                 'id' => 'mirrors',
+                // TRANS: Label in profile statistics section, followed by a count.
                 'label' => _m('Mirrored feeds'),
                 'link' => common_local_url('mirrorsettings'),
                 'value' => $mirror->count(),
diff --git a/plugins/SubMirror/actions/addmirror.php b/plugins/SubMirror/actions/addmirror.php
index 31805c1669..0031cf1bf4 100644
--- a/plugins/SubMirror/actions/addmirror.php
+++ b/plugins/SubMirror/actions/addmirror.php
@@ -76,7 +76,8 @@ class AddMirrorAction extends BaseMirrorAction
             $base = 'http://api.twitter.com/1/statuses/user_timeline.atom?screen_name=';
             return $base . urlencode($screenie);
         default:
-            throw new Exception('Internal form error: unrecognized feed provider.');
+            // TRANS: Exception thrown when a feed provider could not be recognised.
+            throw new Exception(_m('Internal form error: Unrecognized feed provider.'));
         }
     }
 
@@ -85,7 +86,8 @@ class AddMirrorAction extends BaseMirrorAction
         if ($this->oprofile->subscribe()) {
             SubMirror::saveMirror($this->user, $this->profile);
         } else {
-            $this->serverError(_m("Could not subscribe to feed."));
+            // TRANS: Exception thrown when a subscribing to a feed fails.
+            $this->serverError(_m('Could not subscribe to feed.'));
         }
     }
 }
diff --git a/plugins/SubMirror/actions/basemirror.php b/plugins/SubMirror/actions/basemirror.php
index 9a01e2ddb7..e3b67bb1d6 100644
--- a/plugins/SubMirror/actions/basemirror.php
+++ b/plugins/SubMirror/actions/basemirror.php
@@ -101,9 +101,10 @@ abstract class BaseMirrorAction extends Action
             $oprofile = Ostatus_profile::ensureFeedURL($url);
         }
         if ($oprofile->isGroup()) {
-            $this->clientError(_m("Cannot mirror a StatusNet group at this time."));
+            // TRANS: Client error displayed when trying to mirror a StatusNet group feed.
+            $this->clientError(_m('Cannot mirror a StatusNet group at this time.'));
         }
-        $this->oprofile = $oprofile; // @fixme ugly side effect :D
+        $this->oprofile = $oprofile; // @todo FIXME: ugly side effect :D
         return $oprofile->localProfile();
     }
 
@@ -115,6 +116,7 @@ abstract class BaseMirrorAction extends Action
     {
         // Only allow POST requests
         if ($_SERVER['REQUEST_METHOD'] != 'POST') {
+            // TRANS: Client error displayed when trying to use another method than POST.
             $this->clientError(_m('This action only accepts POST requests.'));
             return false;
         }
@@ -123,6 +125,7 @@ abstract class BaseMirrorAction extends Action
         $token = $this->trimmed('token');
 
         if (!$token || $token != common_session_token()) {
+            // TRANS: Client error displayed when the session token does not match or is not given.
             $this->clientError(_m('There was a problem with your session token.'.
                                  ' Try again, please.'));
             return false;
@@ -157,6 +160,7 @@ abstract class BaseMirrorAction extends Action
         if ($this->boolean('ajax')) {
             $this->startHTML('text/xml;charset=utf-8');
             $this->elementStart('head');
+            // TRANS: Page title for subscribed feed mirror.
             $this->element('title', null, _m('Subscribed'));
             $this->elementEnd('head');
             $this->elementStart('body');
diff --git a/plugins/SubMirror/actions/editmirror.php b/plugins/SubMirror/actions/editmirror.php
index 0f8b037325..557eb0aba4 100644
--- a/plugins/SubMirror/actions/editmirror.php
+++ b/plugins/SubMirror/actions/editmirror.php
@@ -47,7 +47,6 @@ if (!defined('STATUSNET')) {
  */
 class EditMirrorAction extends BaseMirrorAction
 {
-
     /**
      * Check pre-requisites and instantiate attributes
      *
@@ -65,7 +64,8 @@ class EditMirrorAction extends BaseMirrorAction
                                                  'subscribed' => $this->profile->id));
 
         if (!$this->mirror) {
-            $this->clientError(_m("Requested invalid profile to edit."));
+            // TRANS: Client error displayed when trying to edit an object that is not a feed mirror.
+            $this->clientError(_m('Requested invalid profile to edit.'));
         }
 
         $this->style = $this->validateStyle($this->trimmed('style'));
@@ -83,7 +83,8 @@ class EditMirrorAction extends BaseMirrorAction
         if (in_array($style, $allowed)) {
             return $style;
         } else {
-            $this->clientError(_m("Bad form data."));
+            // TRANS: Client error displayed when providing invalid input when editing a mirror.
+            $this->clientError(_m('Bad form data.'));
         }
     }
 
@@ -92,7 +93,7 @@ class EditMirrorAction extends BaseMirrorAction
         $mirror = SubMirror::getMirror($this->user, $this->profile);
         if (!$mirror) {
             // TRANS: Client error thrown when a mirror request is made and no result is retrieved.
-            $this->clientError(_m('Requested edit of missing mirror.'));
+            $this->clientError(_m('The mirror request failed, because no result was retrieved.'));
         }
 
         if ($this->delete) {
diff --git a/plugins/SubMirror/actions/mirrorsettings.php b/plugins/SubMirror/actions/mirrorsettings.php
index d6e1ed5d1b..000d7ecad0 100644
--- a/plugins/SubMirror/actions/mirrorsettings.php
+++ b/plugins/SubMirror/actions/mirrorsettings.php
@@ -38,7 +38,7 @@ class MirrorSettingsAction extends SettingsAction
      */
     function title()
     {
-        // TRANS: Title.
+        // TRANS: Page title.
         return _m('Feed mirror settings');
     }
 
@@ -50,7 +50,7 @@ class MirrorSettingsAction extends SettingsAction
 
     function getInstructions()
     {
-        // TRANS: Instructions.
+        // TRANS: Page instructions.
         return _m('You can mirror updates from many RSS and Atom feeds ' .
                   'into your StatusNet timeline!');
     }
@@ -129,6 +129,7 @@ class MirrorSettingsAction extends SettingsAction
             header('Content-Type: text/html;charset=utf-8');
             $this->elementStart('html');
             $this->elementStart('head');
+            // TRANS: Title for page with form to add a mirror feed provider on.
             $this->element('title', null, _m('Provider add'));
             $this->elementEnd('head');
             $this->elementStart('body');
@@ -152,10 +153,17 @@ class MirrorSettingsAction extends SettingsAction
     {
     }
 
+    /**
+     * Show the local navigation menu
+     *
+     * This is the same for all settings, so we show it here.
+     *
+     * @return void
+     */
     function showLocalNav()
     {
-        $nav = new SubGroupNav($this, common_current_user());
-        $nav->show();
+        $menu = new SettingsNav($this);
+        $menu->show();
     }
 
     function showScripts()
diff --git a/plugins/SubMirror/classes/SubMirror.php b/plugins/SubMirror/classes/SubMirror.php
index b39af918d5..b36677e58a 100644
--- a/plugins/SubMirror/classes/SubMirror.php
+++ b/plugins/SubMirror/classes/SubMirror.php
@@ -117,7 +117,7 @@ class SubMirror extends Memcached_DataObject
 
     function keyTypes()
     {
-        // @fixme keys
+        // @todo FIXME keys
         // need a sane key for reverse lookup too
         return array('subscriber' => 'K', 'subscribed' => 'K');
     }
@@ -157,7 +157,7 @@ class SubMirror extends Memcached_DataObject
     {
         $profile = Profile::staticGet('id', $this->subscriber);
         if (!$profile) {
-            common_log(LOG_ERROR, "SubMirror plugin skipping auto-repeat of notice $notice->id for missing user $profile->id");
+            common_log(LOG_ERR, "SubMirror plugin skipping auto-repeat of notice $notice->id for missing user $profile->id");
             return false;
         }
 
diff --git a/plugins/SubMirror/lib/addmirrorform.php b/plugins/SubMirror/lib/addmirrorform.php
index 17edbd5e96..949b716dea 100644
--- a/plugins/SubMirror/lib/addmirrorform.php
+++ b/plugins/SubMirror/lib/addmirrorform.php
@@ -57,11 +57,13 @@ class AddMirrorForm extends Form
         $this->li();
         $this->doInput('addmirror-feedurl',
                        'feedurl',
+                       // TRANS: Field label.
                        _m('Web page or feed URL:'),
                        $this->out->trimmed('feedurl'));
         $this->unli();
 
         $this->li();
+        // TRANS: Button text for adding a feed.
         $this->out->submit('addmirror-save', _m('BUTTON','Add feed'));
         $this->unli();
         $this->out->elementEnd('ul');
diff --git a/plugins/SubMirror/lib/addmirrorwizard.php b/plugins/SubMirror/lib/addmirrorwizard.php
index 920db0bc9c..512b2bfa4a 100644
--- a/plugins/SubMirror/lib/addmirrorwizard.php
+++ b/plugins/SubMirror/lib/addmirrorwizard.php
@@ -73,6 +73,7 @@ class AddMirrorWizard extends Widget
             // hopes, is getting timely updates.
             array(
                 'id' => 'twitter',
+                // TRANS: Name for possible feed provider.
                 'name' => _m('Twitter'),
             ),
             /*
@@ -106,6 +107,7 @@ class AddMirrorWizard extends Widget
              */
             array(
                 'id' => 'feed',
+                // TRANS: Name for possible feed provider.
                 'name' => _m('RSS or Atom feed'),
             ),
         );
@@ -116,6 +118,7 @@ class AddMirrorWizard extends Widget
         $out = $this->out;
 
         $out->elementStart('div', 'provider-list');
+        // TRANS: Heading for feed mirroring selection form.
         $out->element('h2', null, _m('Select a feed provider'));
         $out->elementStart('table');
         foreach ($providers as $provider) {
diff --git a/plugins/SubMirror/lib/addtwittermirrorform.php b/plugins/SubMirror/lib/addtwittermirrorform.php
index eb28aa038f..172d321de2 100644
--- a/plugins/SubMirror/lib/addtwittermirrorform.php
+++ b/plugins/SubMirror/lib/addtwittermirrorform.php
@@ -47,11 +47,13 @@ class AddTwitterMirrorForm extends AddMirrorForm
         $this->li();
         $this->doInput('addmirror-feedurl',
                        'screen_name',
+                       // TRANS: Field label.
                        _m('Twitter username:'),
                        $this->out->trimmed('screen_name'));
         $this->unli();
 
         $this->li();
+        // TRANS: Button text for adding a Twitter feed mirror.
         $this->out->submit('addmirror-save', _m('BUTTON','Add feed'));
         $this->unli();
         $this->out->elementEnd('ul');
diff --git a/plugins/SubMirror/lib/editmirrorform.php b/plugins/SubMirror/lib/editmirrorform.php
index c1f60f9c2c..c09aa4a7ad 100644
--- a/plugins/SubMirror/lib/editmirrorform.php
+++ b/plugins/SubMirror/lib/editmirrorform.php
@@ -80,20 +80,25 @@ class EditMirrorForm extends Form
         $this->out->elementStart('div');
         if ($feed) {
             // XXX: Why the hard coded space?
+            // TRANS: Field label (URL expectected).
             $this->out->text(_m('LABEL', 'Remote feed:') . ' ');
             //$this->out->element('a', array('href' => $feed), $feed);
             $this->out->element('input', array('value' => $feed, 'readonly' => 'readonly', 'style' => 'width: 100%'));
         } else {
+            // TRANS: Field label.
             $this->out->text(_m('LABEL', 'Local user'));
         }
         $this->out->elementEnd('div');
         $this->out->elementEnd('p');
 
         $this->out->elementStart('fieldset', array('style' => 'margin-top: 20px'));
-        $this->out->element('legend', false, _m("Mirroring style"));
+        // TRANS: Fieldset legend for feed mirror setting.
+        $this->out->element('legend', false, _m('Mirroring style'));
 
-        $styles = array('repeat' => _m("Repeat: reference the original user's post (sometimes shows as 'RT @blah')"),
-                        'copy' => _m("Repost the content under my account"));
+        // TRANS: Feed mirror style (radio button option).
+        $styles = array('repeat' => _m('Repeat: reference the original user\'s post (sometimes shows as "RT @blah")'),
+                        // TRANS: Feed mirror style (radio button option).
+                        'copy' => _m('Repost the content under my account'));
         foreach ($styles as $key => $label) {
             $this->out->elementStart('div');
             $attribs = array('type' => 'radio',
@@ -104,7 +109,7 @@ class EditMirrorForm extends Form
                 $attribs['checked'] = 'checked';
             }
             $this->out->element('input', $attribs);
-            $this->out->element('span', false, $label); // @fixme should be label, but the styles muck it up for now
+            $this->out->element('span', false, $label); // @todo FIXME: should be label, but the styles muck it up for now
             $this->out->elementEnd('div');
 
         }
@@ -112,9 +117,11 @@ class EditMirrorForm extends Form
 
 
         $this->out->elementStart('div');
-        $this->out->submit($this->id() . '-save', _m('Save'));
+        // TRANS: Button text to save feed mirror settings.
+        $this->out->submit($this->id() . '-save', _m('BUTTON','Save'));
         $this->out->element('input', array('type' => 'submit',
-                                           'value' => _m('Stop mirroring'),
+                                           // TRANS: Button text to stop mirroring a feed.
+                                           'value' => _m('BUTTON','Stop mirroring'),
                                            'name' => 'delete',
                                            'class' => 'submit'));
         $this->out->elementEnd('div');
diff --git a/plugins/SubMirror/locale/SubMirror.pot b/plugins/SubMirror/locale/SubMirror.pot
index 68e6753ea7..93a9810404 100644
--- a/plugins/SubMirror/locale/SubMirror.pot
+++ b/plugins/SubMirror/locale/SubMirror.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
+"POT-Creation-Date: 2012-06-30 11:07+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"
@@ -29,131 +29,162 @@ msgstr ""
 msgid "Invalid profile for mirroring."
 msgstr ""
 
-#: actions/basemirror.php:104
+#. TRANS: Client error displayed when trying to mirror a StatusNet group feed.
+#: actions/basemirror.php:105
 msgid "Cannot mirror a StatusNet group at this time."
 msgstr ""
 
-#: actions/basemirror.php:118
+#. TRANS: Client error displayed when trying to use another method than POST.
+#: actions/basemirror.php:120
 msgid "This action only accepts POST requests."
 msgstr ""
 
-#: actions/basemirror.php:126
+#. TRANS: Client error displayed when the session token does not match or is not given.
+#: actions/basemirror.php:129
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 
 #. TRANS: Error message displayed when trying to perform an action that requires a logged in user.
-#: actions/basemirror.php:137
+#: actions/basemirror.php:140
 msgid "Not logged in."
 msgstr ""
 
-#: actions/basemirror.php:160
+#. TRANS: Page title for subscribed feed mirror.
+#: actions/basemirror.php:164
 msgid "Subscribed"
 msgstr ""
 
+#. TRANS: Client error displayed when trying to edit an object that is not a feed mirror.
 #: actions/editmirror.php:68
 msgid "Requested invalid profile to edit."
 msgstr ""
 
-#: actions/editmirror.php:86
+#. TRANS: Client error displayed when providing invalid input when editing a mirror.
+#: actions/editmirror.php:87
 msgid "Bad form data."
 msgstr ""
 
 #. TRANS: Client error thrown when a mirror request is made and no result is retrieved.
-#: actions/editmirror.php:95
-msgid "Requested edit of missing mirror."
+#: actions/editmirror.php:96
+msgid "The mirror request failed, because no result was retrieved."
 msgstr ""
 
-#: actions/addmirror.php:88
+#. TRANS: Exception thrown when a feed provider could not be recognised.
+#: actions/addmirror.php:80
+msgid "Internal form error: Unrecognized feed provider."
+msgstr ""
+
+#. TRANS: Exception thrown when a subscribing to a feed fails.
+#: actions/addmirror.php:90
 msgid "Could not subscribe to feed."
 msgstr ""
 
-#. TRANS: Title.
+#. TRANS: Page title.
 #: actions/mirrorsettings.php:42
 msgid "Feed mirror settings"
 msgstr ""
 
-#. TRANS: Instructions.
+#. TRANS: Page instructions.
 #: actions/mirrorsettings.php:54
 msgid ""
 "You can mirror updates from many RSS and Atom feeds into your StatusNet "
 "timeline!"
 msgstr ""
 
-#: actions/mirrorsettings.php:132
+#. TRANS: Title for page with form to add a mirror feed provider on.
+#: actions/mirrorsettings.php:133
 msgid "Provider add"
 msgstr ""
 
-#: SubMirrorPlugin.php:93
+#. TRANS: Plugin description.
+#: SubMirrorPlugin.php:94
 msgid "Pull feeds into your timeline!"
 msgstr ""
 
 #. TRANS: SubMirror plugin menu item on user settings page.
-#: SubMirrorPlugin.php:113
+#: SubMirrorPlugin.php:114
 msgctxt "MENU"
 msgid "Mirroring"
 msgstr ""
 
 #. TRANS: SubMirror plugin tooltip for user settings menu item.
-#: SubMirrorPlugin.php:115
+#: SubMirrorPlugin.php:116
 msgid "Configure mirroring of posts from other feeds"
 msgstr ""
 
-#: SubMirrorPlugin.php:186
+#. TRANS: Label in profile statistics section, followed by a count.
+#: SubMirrorPlugin.php:193
 msgid "Mirrored feeds"
 msgstr ""
 
-#: lib/addmirrorform.php:60
+#. TRANS: Field label.
+#: lib/addmirrorform.php:61
 msgid "Web page or feed URL:"
 msgstr ""
 
-#: lib/addmirrorform.php:65 lib/addtwittermirrorform.php:55
+#. TRANS: Button text for adding a feed.
+#. TRANS: Button text for adding a Twitter feed mirror.
+#: lib/addmirrorform.php:67 lib/addtwittermirrorform.php:57
 msgctxt "BUTTON"
 msgid "Add feed"
 msgstr ""
 
-#: lib/addtwittermirrorform.php:50
+#. TRANS: Field label.
+#: lib/addtwittermirrorform.php:51
 msgid "Twitter username:"
 msgstr ""
 
-#: lib/editmirrorform.php:83
+#. TRANS: Field label (URL expectected).
+#: lib/editmirrorform.php:84
 msgctxt "LABEL"
 msgid "Remote feed:"
 msgstr ""
 
-#: lib/editmirrorform.php:87
+#. TRANS: Field label.
+#: lib/editmirrorform.php:89
 msgctxt "LABEL"
 msgid "Local user"
 msgstr ""
 
-#: lib/editmirrorform.php:93
+#. TRANS: Fieldset legend for feed mirror setting.
+#: lib/editmirrorform.php:96
 msgid "Mirroring style"
 msgstr ""
 
-#: lib/editmirrorform.php:95
+#. TRANS: Feed mirror style (radio button option).
+#: lib/editmirrorform.php:99
 msgid ""
-"Repeat: reference the original user's post (sometimes shows as 'RT @blah')"
+"Repeat: reference the original user's post (sometimes shows as \"RT @blah\")"
 msgstr ""
 
-#: lib/editmirrorform.php:96
+#. TRANS: Feed mirror style (radio button option).
+#: lib/editmirrorform.php:101
 msgid "Repost the content under my account"
 msgstr ""
 
-#: lib/editmirrorform.php:115
+#. TRANS: Button text to save feed mirror settings.
+#: lib/editmirrorform.php:121
+msgctxt "BUTTON"
 msgid "Save"
 msgstr ""
 
-#: lib/editmirrorform.php:117
+#. TRANS: Button text to stop mirroring a feed.
+#: lib/editmirrorform.php:124
+msgctxt "BUTTON"
 msgid "Stop mirroring"
 msgstr ""
 
-#: lib/addmirrorwizard.php:76
+#. TRANS: Name for possible feed provider.
+#: lib/addmirrorwizard.php:77
 msgid "Twitter"
 msgstr ""
 
-#: lib/addmirrorwizard.php:109
+#. TRANS: Name for possible feed provider.
+#: lib/addmirrorwizard.php:111
 msgid "RSS or Atom feed"
 msgstr ""
 
-#: lib/addmirrorwizard.php:119
+#. TRANS: Heading for feed mirroring selection form.
+#: lib/addmirrorwizard.php:122
 msgid "Select a feed provider"
 msgstr ""
diff --git a/plugins/SubMirror/locale/ca/LC_MESSAGES/SubMirror.po b/plugins/SubMirror/locale/ca/LC_MESSAGES/SubMirror.po
new file mode 100644
index 0000000000..0372223572
--- /dev/null
+++ b/plugins/SubMirror/locale/ca/LC_MESSAGES/SubMirror.po
@@ -0,0 +1,163 @@
+# Translation of StatusNet - SubMirror to Catalan (català)
+# Exported from translatewiki.net
+#
+# Author: Toniher
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - SubMirror\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:11+0000\n"
+"Language-Team: Catalan <https://translatewiki.net/wiki/Portal:ca>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-19 11:23:33+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: ca\n"
+"X-Message-Group: #out-statusnet-plugin-submirror\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Client error displayed when entering an invalid URL for a feed.
+#. TRANS: %s is the invalid feed URL.
+#, php-format
+msgid "Invalid feed URL: %s."
+msgstr "L'URL del canal no és vàlid: %s."
+
+#. TRANS: Error message returned to user when setting up feed mirroring,
+#. TRANS: but we were unable to resolve the given URL to a working feed.
+msgid "Invalid profile for mirroring."
+msgstr ""
+
+#. TRANS: Client error displayed when trying to mirror a StatusNet group feed.
+msgid "Cannot mirror a StatusNet group at this time."
+msgstr ""
+
+#. TRANS: Client error displayed when trying to use another method than POST.
+msgid "This action only accepts POST requests."
+msgstr ""
+
+#. TRANS: Client error displayed when the session token does not match or is not given.
+msgid "There was a problem with your session token. Try again, please."
+msgstr ""
+
+#. TRANS: Error message displayed when trying to perform an action that requires a logged in user.
+msgid "Not logged in."
+msgstr "No s'ha iniciat una sessió."
+
+#. TRANS: Page title for subscribed feed mirror.
+msgid "Subscribed"
+msgstr "Subscrit"
+
+#. TRANS: Client error displayed when trying to edit an object that is not a feed mirror.
+msgid "Requested invalid profile to edit."
+msgstr ""
+
+#. TRANS: Client error displayed when providing invalid input when editing a mirror.
+msgid "Bad form data."
+msgstr ""
+
+#. TRANS: Client error thrown when a mirror request is made and no result is retrieved.
+msgid "The mirror request failed, because no result was retrieved."
+msgstr ""
+
+#. TRANS: Exception thrown when a feed provider could not be recognised.
+msgid "Internal form error: Unrecognized feed provider."
+msgstr ""
+
+#. TRANS: Exception thrown when a subscribing to a feed fails.
+msgid "Could not subscribe to feed."
+msgstr "No s'ha pogut subscriure al canal."
+
+#. TRANS: Page title.
+msgid "Feed mirror settings"
+msgstr ""
+
+#. TRANS: Page instructions.
+msgid ""
+"You can mirror updates from many RSS and Atom feeds into your StatusNet "
+"timeline!"
+msgstr ""
+
+#. TRANS: Title for page with form to add a mirror feed provider on.
+msgid "Provider add"
+msgstr ""
+
+#. TRANS: Plugin description.
+msgid "Pull feeds into your timeline!"
+msgstr "Publica canals en la vostra línia temporal!"
+
+#. TRANS: SubMirror plugin menu item on user settings page.
+msgctxt "MENU"
+msgid "Mirroring"
+msgstr ""
+
+#. TRANS: SubMirror plugin tooltip for user settings menu item.
+msgid "Configure mirroring of posts from other feeds"
+msgstr ""
+
+#. TRANS: Label in profile statistics section, followed by a count.
+msgid "Mirrored feeds"
+msgstr ""
+
+#. TRANS: Field label.
+msgid "Web page or feed URL:"
+msgstr "Pàgina web o canal URL:"
+
+#. TRANS: Button text for adding a feed.
+#. TRANS: Button text for adding a Twitter feed mirror.
+msgctxt "BUTTON"
+msgid "Add feed"
+msgstr "Afegeix un canal"
+
+#. TRANS: Field label.
+msgid "Twitter username:"
+msgstr "Nom d'usuari al Twitter:"
+
+#. TRANS: Field label (URL expectected).
+msgctxt "LABEL"
+msgid "Remote feed:"
+msgstr "Canal remot:"
+
+#. TRANS: Field label.
+msgctxt "LABEL"
+msgid "Local user"
+msgstr "Usuari local"
+
+#. TRANS: Fieldset legend for feed mirror setting.
+msgid "Mirroring style"
+msgstr ""
+
+#. TRANS: Feed mirror style (radio button option).
+msgid ""
+"Repeat: reference the original user's post (sometimes shows as \"RT @blah\")"
+msgstr ""
+
+#. TRANS: Feed mirror style (radio button option).
+msgid "Repost the content under my account"
+msgstr ""
+
+#. TRANS: Button text to save feed mirror settings.
+msgctxt "BUTTON"
+msgid "Save"
+msgstr "Desa"
+
+#. TRANS: Button text to stop mirroring a feed.
+msgctxt "BUTTON"
+msgid "Stop mirroring"
+msgstr ""
+
+#. TRANS: Name for possible feed provider.
+msgid "Twitter"
+msgstr "Twitter"
+
+#. TRANS: Name for possible feed provider.
+msgid "RSS or Atom feed"
+msgstr "Canal RSS o Atom"
+
+#. TRANS: Heading for feed mirroring selection form.
+msgid "Select a feed provider"
+msgstr "Seleccioneu un proveïdor de canals"
diff --git a/plugins/SubMirror/locale/de/LC_MESSAGES/SubMirror.po b/plugins/SubMirror/locale/de/LC_MESSAGES/SubMirror.po
index e1a8b721c9..6fa79055cc 100644
--- a/plugins/SubMirror/locale/de/LC_MESSAGES/SubMirror.po
+++ b/plugins/SubMirror/locale/de/LC_MESSAGES/SubMirror.po
@@ -4,6 +4,7 @@
 # Author: Fujnky
 # Author: Giftpflanze
 # Author: MF-Warburg
+# Author: Tiin
 # --
 # This file is distributed under the same license as the StatusNet package.
 #
@@ -11,14 +12,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SubMirror\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:29+0000\n"
-"Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:11+0000\n"
+"Language-Team: German <https://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:22+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-19 11:23:33+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-submirror\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -34,12 +35,15 @@ msgstr "Ungültige Feed-URL: %s."
 msgid "Invalid profile for mirroring."
 msgstr "Ungültiges Profil für das Spiegeln."
 
+#. TRANS: Client error displayed when trying to mirror a StatusNet group feed.
 msgid "Cannot mirror a StatusNet group at this time."
 msgstr "Kann im Moment keine StatusNet-Gruppe spiegeln."
 
+#. TRANS: Client error displayed when trying to use another method than POST.
 msgid "This action only accepts POST requests."
 msgstr "Diese Aktion nimmt nur POST-Requests."
 
+#. TRANS: Client error displayed when the session token does not match or is not given.
 msgid "There was a problem with your session token. Try again, please."
 msgstr "Es gab ein Problem mit deinem Sitzungstoken. Bitte versuche es erneut."
 
@@ -47,27 +51,37 @@ msgstr "Es gab ein Problem mit deinem Sitzungstoken. Bitte versuche es erneut."
 msgid "Not logged in."
 msgstr "Nicht angemeldet."
 
+#. TRANS: Page title for subscribed feed mirror.
 msgid "Subscribed"
 msgstr "Abonniert"
 
+#. TRANS: Client error displayed when trying to edit an object that is not a feed mirror.
 msgid "Requested invalid profile to edit."
 msgstr "Ungültiges Profil zum Bearbeiten angefordert."
 
+#. TRANS: Client error displayed when providing invalid input when editing a mirror.
 msgid "Bad form data."
 msgstr "Ungültige Formulardaten."
 
 #. TRANS: Client error thrown when a mirror request is made and no result is retrieved.
-msgid "Requested edit of missing mirror."
-msgstr "Bearbeitung eines fehlenden Spiegels angefordert."
+msgid "The mirror request failed, because no result was retrieved."
+msgstr ""
+"Die Spiegel-Anforderung ist fehlgeschlagen, weil kein Ergebnis abgerufen "
+"wurde."
 
+#. TRANS: Exception thrown when a feed provider could not be recognised.
+msgid "Internal form error: Unrecognized feed provider."
+msgstr "Interner Formfehler: Unerkannter Feed-Provider."
+
+#. TRANS: Exception thrown when a subscribing to a feed fails.
 msgid "Could not subscribe to feed."
 msgstr "Konnte den Feed nicht abonnieren."
 
-#. TRANS: Title.
+#. TRANS: Page title.
 msgid "Feed mirror settings"
 msgstr "Feed-Spiegel-Einstellungen"
 
-#. TRANS: Instructions.
+#. TRANS: Page instructions.
 msgid ""
 "You can mirror updates from many RSS and Atom feeds into your StatusNet "
 "timeline!"
@@ -75,9 +89,11 @@ msgstr ""
 "Du kanst die Aktualisierungen von vielen RSS- und Atomfeeds in deine "
 "StatusNet-Zeitleiste integrieren!"
 
+#. TRANS: Title for page with form to add a mirror feed provider on.
 msgid "Provider add"
 msgstr "Provider hinzufügen"
 
+#. TRANS: Plugin description.
 msgid "Pull feeds into your timeline!"
 msgstr "Ziehe Feeds in deine Zeitleiste!"
 
@@ -90,50 +106,67 @@ msgstr "Spiegeln"
 msgid "Configure mirroring of posts from other feeds"
 msgstr "Konfiguration des Spiegelns von Posts von anderen Feeds"
 
+#. TRANS: Label in profile statistics section, followed by a count.
 msgid "Mirrored feeds"
 msgstr "Gespiegelte Feeds"
 
+#. TRANS: Field label.
 msgid "Web page or feed URL:"
 msgstr "Webseiten- oder Feed-URL:"
 
+#. TRANS: Button text for adding a feed.
+#. TRANS: Button text for adding a Twitter feed mirror.
 msgctxt "BUTTON"
 msgid "Add feed"
 msgstr "Feed hinzufügen"
 
+#. TRANS: Field label.
 msgid "Twitter username:"
 msgstr "Twitter-Benutzername:"
 
+#. TRANS: Field label (URL expectected).
 msgctxt "LABEL"
 msgid "Remote feed:"
 msgstr "Remote-Feed:"
 
+#. TRANS: Field label.
 msgctxt "LABEL"
 msgid "Local user"
 msgstr "Lokaler Benutzer"
 
+#. TRANS: Fieldset legend for feed mirror setting.
 msgid "Mirroring style"
 msgstr "Spiegelungs-Stil"
 
+#. TRANS: Feed mirror style (radio button option).
 msgid ""
-"Repeat: reference the original user's post (sometimes shows as 'RT @blah')"
+"Repeat: reference the original user's post (sometimes shows as \"RT @blah\")"
 msgstr ""
 "Wiederholen: Auf den Post des ursprünglichen Benutzers beziehen (manchmal "
 "als „RT @blah“ dargestellt)"
 
+#. TRANS: Feed mirror style (radio button option).
 msgid "Repost the content under my account"
 msgstr "Den Inhalt mit meinem Konto erneut posten"
 
+#. TRANS: Button text to save feed mirror settings.
+msgctxt "BUTTON"
 msgid "Save"
 msgstr "Speichern"
 
+#. TRANS: Button text to stop mirroring a feed.
+msgctxt "BUTTON"
 msgid "Stop mirroring"
 msgstr "Mit dem Spiegeln aufhören"
 
+#. TRANS: Name for possible feed provider.
 msgid "Twitter"
 msgstr "Twitter"
 
+#. TRANS: Name for possible feed provider.
 msgid "RSS or Atom feed"
 msgstr "RSS- oder Atomfeed"
 
+#. TRANS: Heading for feed mirroring selection form.
 msgid "Select a feed provider"
 msgstr "Wähle einen Feedprovider aus"
diff --git a/plugins/SubMirror/locale/es/LC_MESSAGES/SubMirror.po b/plugins/SubMirror/locale/es/LC_MESSAGES/SubMirror.po
new file mode 100644
index 0000000000..958ea7f1a1
--- /dev/null
+++ b/plugins/SubMirror/locale/es/LC_MESSAGES/SubMirror.po
@@ -0,0 +1,171 @@
+# Translation of StatusNet - SubMirror to Spanish (español)
+# Exported from translatewiki.net
+#
+# Author: Armando-Martin
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - SubMirror\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:11+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-19 11:23:33+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Client error displayed when entering an invalid URL for a feed.
+#. TRANS: %s is the invalid feed URL.
+#, php-format
+msgid "Invalid feed URL: %s."
+msgstr "Dirección URL de fuente web (feed) no válida: %s."
+
+#. TRANS: Error message returned to user when setting up feed mirroring,
+#. TRANS: but we were unable to resolve the given URL to a working feed.
+msgid "Invalid profile for mirroring."
+msgstr "Perfil inválido para hacer copia especular (mirroring)."
+
+#. TRANS: Client error displayed when trying to mirror a StatusNet group feed.
+msgid "Cannot mirror a StatusNet group at this time."
+msgstr ""
+"No se puede hacer copia especular (mirror) de un grupo de StatusNet en este "
+"momento."
+
+#. TRANS: Client error displayed when trying to use another method than POST.
+msgid "This action only accepts POST requests."
+msgstr "Esta acción sólo acepta solicitudes POST."
+
+#. TRANS: Client error displayed when the session token does not match or is not given.
+msgid "There was a problem with your session token. Try again, please."
+msgstr "Hubo un problema con su contraseña de sesión. Inténtelo de nuevo."
+
+#. TRANS: Error message displayed when trying to perform an action that requires a logged in user.
+msgid "Not logged in."
+msgstr "No ha iniciado sesión."
+
+#. TRANS: Page title for subscribed feed mirror.
+msgid "Subscribed"
+msgstr "Suscrito"
+
+#. TRANS: Client error displayed when trying to edit an object that is not a feed mirror.
+msgid "Requested invalid profile to edit."
+msgstr "El perfil que ha solicitado editar no es válido."
+
+#. TRANS: Client error displayed when providing invalid input when editing a mirror.
+msgid "Bad form data."
+msgstr "Datos de formulario incorrectos."
+
+#. TRANS: Client error thrown when a mirror request is made and no result is retrieved.
+msgid "The mirror request failed, because no result was retrieved."
+msgstr ""
+"Error en la solicitud de copia especular (mirror), porque no se obtuvo "
+"ningún resultado."
+
+#. TRANS: Exception thrown when a feed provider could not be recognised.
+msgid "Internal form error: Unrecognized feed provider."
+msgstr ""
+"Error interno en el formulario: Proveedor de fuente web (feed) no reconocido."
+
+#. TRANS: Exception thrown when a subscribing to a feed fails.
+msgid "Could not subscribe to feed."
+msgstr "No se pudo suscribir a la fuente web (feed)"
+
+#. TRANS: Page title.
+msgid "Feed mirror settings"
+msgstr "Configuración de copia especular (mirror) de fuente web (feed)"
+
+#. TRANS: Page instructions.
+msgid ""
+"You can mirror updates from many RSS and Atom feeds into your StatusNet "
+"timeline!"
+msgstr ""
+"¡Puede hacer copia especular (mirror) de las actualizaciones de muchas "
+"fuentes web RSS y Atom en su agenda de StatusNet!"
+
+#. TRANS: Title for page with form to add a mirror feed provider on.
+msgid "Provider add"
+msgstr "Agregar proveedor"
+
+#. TRANS: Plugin description.
+msgid "Pull feeds into your timeline!"
+msgstr "¡Importar fuentes web (feed) en su agenda!"
+
+#. TRANS: SubMirror plugin menu item on user settings page.
+msgctxt "MENU"
+msgid "Mirroring"
+msgstr "Copia especular (mirroring)"
+
+#. TRANS: SubMirror plugin tooltip for user settings menu item.
+msgid "Configure mirroring of posts from other feeds"
+msgstr ""
+"Configurar la copia especular (mirror) de entradas de otras fuentes web "
+"(feed)"
+
+#. TRANS: Label in profile statistics section, followed by a count.
+msgid "Mirrored feeds"
+msgstr "Se ha hecho copia especular de las fuentes web"
+
+#. TRANS: Field label.
+msgid "Web page or feed URL:"
+msgstr "Página web o dirección URL de la fuente web (feed):"
+
+#. TRANS: Button text for adding a feed.
+#. TRANS: Button text for adding a Twitter feed mirror.
+msgctxt "BUTTON"
+msgid "Add feed"
+msgstr "Añadir fuente web (feed)"
+
+#. TRANS: Field label.
+msgid "Twitter username:"
+msgstr "Nombre de usuario de Twitter:"
+
+#. TRANS: Field label (URL expectected).
+msgctxt "LABEL"
+msgid "Remote feed:"
+msgstr "Fuente web (feed) remota:"
+
+#. TRANS: Field label.
+msgctxt "LABEL"
+msgid "Local user"
+msgstr "Usuario local"
+
+#. TRANS: Fieldset legend for feed mirror setting.
+msgid "Mirroring style"
+msgstr "Estilo de copia especular (mirror)"
+
+#. TRANS: Feed mirror style (radio button option).
+msgid ""
+"Repeat: reference the original user's post (sometimes shows as \"RT @blah\")"
+msgstr ""
+"Repetir: Referenciar la entrada del usuario original (a veces se muestra "
+"como \"RT @blah\")"
+
+#. TRANS: Feed mirror style (radio button option).
+msgid "Repost the content under my account"
+msgstr "Volver a publicar el contenido bajo mi cuenta"
+
+#. TRANS: Button text to save feed mirror settings.
+msgctxt "BUTTON"
+msgid "Save"
+msgstr "Guardar"
+
+#. TRANS: Button text to stop mirroring a feed.
+msgctxt "BUTTON"
+msgid "Stop mirroring"
+msgstr "Detener copia especular (mirror)"
+
+#. TRANS: Name for possible feed provider.
+msgid "Twitter"
+msgstr "Twitter"
+
+#. TRANS: Name for possible feed provider.
+msgid "RSS or Atom feed"
+msgstr "Fuente web (feed) RSS o Atom"
+
+#. TRANS: Heading for feed mirroring selection form.
+msgid "Select a feed provider"
+msgstr "Seleccione un proveedor de fuente web (feed)"
diff --git a/plugins/SubMirror/locale/eu/LC_MESSAGES/SubMirror.po b/plugins/SubMirror/locale/eu/LC_MESSAGES/SubMirror.po
new file mode 100644
index 0000000000..02a6d95155
--- /dev/null
+++ b/plugins/SubMirror/locale/eu/LC_MESSAGES/SubMirror.po
@@ -0,0 +1,160 @@
+# Translation of StatusNet - SubMirror to Basque (euskara)
+# Exported from translatewiki.net
+#
+# Author: Artsuaga
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - SubMirror\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:11+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-19 11:23:33+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Client error displayed when entering an invalid URL for a feed.
+#. TRANS: %s is the invalid feed URL.
+#, php-format
+msgid "Invalid feed URL: %s."
+msgstr "Jario URL baliogabea: %s."
+
+#. TRANS: Error message returned to user when setting up feed mirroring,
+#. TRANS: but we were unable to resolve the given URL to a working feed.
+msgid "Invalid profile for mirroring."
+msgstr "Ispilu gisa erabiltzeko profil baliogabea."
+
+#. TRANS: Client error displayed when trying to mirror a StatusNet group feed.
+msgid "Cannot mirror a StatusNet group at this time."
+msgstr ""
+
+#. TRANS: Client error displayed when trying to use another method than POST.
+msgid "This action only accepts POST requests."
+msgstr "Ekintza honek POST eskariak soilik onartzen ditu."
+
+#. TRANS: Client error displayed when the session token does not match or is not given.
+msgid "There was a problem with your session token. Try again, please."
+msgstr "Arazoa egon da zure saio-tokenarekin. Saiatu berriro, mesedez."
+
+#. TRANS: Error message displayed when trying to perform an action that requires a logged in user.
+msgid "Not logged in."
+msgstr "Saioa hasi gabe."
+
+#. TRANS: Page title for subscribed feed mirror.
+msgid "Subscribed"
+msgstr "Harpidetua"
+
+#. TRANS: Client error displayed when trying to edit an object that is not a feed mirror.
+msgid "Requested invalid profile to edit."
+msgstr ""
+
+#. TRANS: Client error displayed when providing invalid input when editing a mirror.
+msgid "Bad form data."
+msgstr "Inprimaki data okerrak."
+
+#. TRANS: Client error thrown when a mirror request is made and no result is retrieved.
+msgid "The mirror request failed, because no result was retrieved."
+msgstr ""
+
+#. TRANS: Exception thrown when a feed provider could not be recognised.
+msgid "Internal form error: Unrecognized feed provider."
+msgstr ""
+
+#. TRANS: Exception thrown when a subscribing to a feed fails.
+msgid "Could not subscribe to feed."
+msgstr "Ezin izan da jariora harpidetu."
+
+#. TRANS: Page title.
+msgid "Feed mirror settings"
+msgstr "Jario ispilu aukerak"
+
+#. TRANS: Page instructions.
+msgid ""
+"You can mirror updates from many RSS and Atom feeds into your StatusNet "
+"timeline!"
+msgstr ""
+
+#. TRANS: Title for page with form to add a mirror feed provider on.
+msgid "Provider add"
+msgstr "Hornitzailea gehitu"
+
+#. TRANS: Plugin description.
+msgid "Pull feeds into your timeline!"
+msgstr ""
+
+#. TRANS: SubMirror plugin menu item on user settings page.
+msgctxt "MENU"
+msgid "Mirroring"
+msgstr ""
+
+#. TRANS: SubMirror plugin tooltip for user settings menu item.
+msgid "Configure mirroring of posts from other feeds"
+msgstr ""
+
+#. TRANS: Label in profile statistics section, followed by a count.
+msgid "Mirrored feeds"
+msgstr ""
+
+#. TRANS: Field label.
+msgid "Web page or feed URL:"
+msgstr ""
+
+#. TRANS: Button text for adding a feed.
+#. TRANS: Button text for adding a Twitter feed mirror.
+msgctxt "BUTTON"
+msgid "Add feed"
+msgstr "Gehitu jarioa"
+
+#. TRANS: Field label.
+msgid "Twitter username:"
+msgstr "Twitter erabiltzailea:"
+
+#. TRANS: Field label (URL expectected).
+msgctxt "LABEL"
+msgid "Remote feed:"
+msgstr "Urruneko jarioa:"
+
+#. TRANS: Field label.
+msgctxt "LABEL"
+msgid "Local user"
+msgstr "Erabiltzaile lokala"
+
+#. TRANS: Fieldset legend for feed mirror setting.
+msgid "Mirroring style"
+msgstr "Ispilu estiloa"
+
+#. TRANS: Feed mirror style (radio button option).
+msgid ""
+"Repeat: reference the original user's post (sometimes shows as \"RT @blah\")"
+msgstr ""
+
+#. TRANS: Feed mirror style (radio button option).
+msgid "Repost the content under my account"
+msgstr ""
+
+#. TRANS: Button text to save feed mirror settings.
+msgctxt "BUTTON"
+msgid "Save"
+msgstr "Gorde"
+
+#. TRANS: Button text to stop mirroring a feed.
+msgctxt "BUTTON"
+msgid "Stop mirroring"
+msgstr "Gelditu ispilua"
+
+#. TRANS: Name for possible feed provider.
+msgid "Twitter"
+msgstr "Twitter"
+
+#. TRANS: Name for possible feed provider.
+msgid "RSS or Atom feed"
+msgstr "RSS edo Atom jarioa"
+
+#. TRANS: Heading for feed mirroring selection form.
+msgid "Select a feed provider"
+msgstr "Aukeratu jario hornitzailea"
diff --git a/plugins/SubMirror/locale/fr/LC_MESSAGES/SubMirror.po b/plugins/SubMirror/locale/fr/LC_MESSAGES/SubMirror.po
index c879c08359..ca3e5564b6 100644
--- a/plugins/SubMirror/locale/fr/LC_MESSAGES/SubMirror.po
+++ b/plugins/SubMirror/locale/fr/LC_MESSAGES/SubMirror.po
@@ -1,6 +1,7 @@
-# Translation of StatusNet - SubMirror to French (Français)
+# Translation of StatusNet - SubMirror to French (français)
 # Exported from translatewiki.net
 #
+# Author: Gomoko
 # Author: IAlex
 # Author: Od1n
 # Author: Peter17
@@ -12,14 +13,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SubMirror\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:30+0000\n"
-"Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:11+0000\n"
+"Language-Team: French <https://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:22+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-19 11:23:33+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-submirror\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
@@ -35,12 +36,15 @@ msgstr "Adresse URL de flux invalide : %s."
 msgid "Invalid profile for mirroring."
 msgstr "Profil invalide pour la mise en miroir."
 
+#. TRANS: Client error displayed when trying to mirror a StatusNet group feed.
 msgid "Cannot mirror a StatusNet group at this time."
 msgstr "Impossible de mettre en miroir un groupe StatusNet actuellement."
 
+#. TRANS: Client error displayed when trying to use another method than POST.
 msgid "This action only accepts POST requests."
 msgstr "Cette action n’accepte que les requêtes de type POST."
 
+#. TRANS: Client error displayed when the session token does not match or is not given.
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 "Un problème est survenu avec votre jeton de session. Veuillez essayer à "
@@ -50,27 +54,35 @@ msgstr ""
 msgid "Not logged in."
 msgstr "Non connecté."
 
+#. TRANS: Page title for subscribed feed mirror.
 msgid "Subscribed"
 msgstr "Abonné"
 
+#. TRANS: Client error displayed when trying to edit an object that is not a feed mirror.
 msgid "Requested invalid profile to edit."
 msgstr "Profil invalide demandé à modifier."
 
+#. TRANS: Client error displayed when providing invalid input when editing a mirror.
 msgid "Bad form data."
 msgstr "Données de formulaire erronées."
 
 #. TRANS: Client error thrown when a mirror request is made and no result is retrieved.
-msgid "Requested edit of missing mirror."
-msgstr "Miroir inexistant demandé à modifier."
+msgid "The mirror request failed, because no result was retrieved."
+msgstr "Échec de la requête miroir, car aucun résultat n'a été récupéré."
 
+#. TRANS: Exception thrown when a feed provider could not be recognised.
+msgid "Internal form error: Unrecognized feed provider."
+msgstr "Erreur interne du formulaire: Fournisseur d'alimentation non reconnu."
+
+#. TRANS: Exception thrown when a subscribing to a feed fails.
 msgid "Could not subscribe to feed."
 msgstr "Impossible de vous abonner au flux."
 
-#. TRANS: Title.
+#. TRANS: Page title.
 msgid "Feed mirror settings"
 msgstr "Paramètres de miroir de flux"
 
-#. TRANS: Instructions.
+#. TRANS: Page instructions.
 msgid ""
 "You can mirror updates from many RSS and Atom feeds into your StatusNet "
 "timeline!"
@@ -78,9 +90,11 @@ msgstr ""
 "Vous pouvez mettre en miroir dans votre agenda StatusNet les mises à jour de "
 "nombreux flux RSS et Atom !"
 
+#. TRANS: Title for page with form to add a mirror feed provider on.
 msgid "Provider add"
 msgstr "Ajout de fournisseurs"
 
+#. TRANS: Plugin description.
 msgid "Pull feeds into your timeline!"
 msgstr "Importez des flux d’information dans votre agenda !"
 
@@ -93,50 +107,67 @@ msgstr "Mise en miroir"
 msgid "Configure mirroring of posts from other feeds"
 msgstr "Configurer la mise en miroir de messages provenant d’autres flux"
 
+#. TRANS: Label in profile statistics section, followed by a count.
 msgid "Mirrored feeds"
 msgstr "Flux en miroir"
 
+#. TRANS: Field label.
 msgid "Web page or feed URL:"
 msgstr "Adresse URL de la page Web ou du flux :"
 
+#. TRANS: Button text for adding a feed.
+#. TRANS: Button text for adding a Twitter feed mirror.
 msgctxt "BUTTON"
 msgid "Add feed"
 msgstr "Ajouter le flux"
 
+#. TRANS: Field label.
 msgid "Twitter username:"
 msgstr "Nom d’utilisateur Twitter :"
 
+#. TRANS: Field label (URL expectected).
 msgctxt "LABEL"
 msgid "Remote feed:"
 msgstr "Flux distant :"
 
+#. TRANS: Field label.
 msgctxt "LABEL"
 msgid "Local user"
 msgstr "Utilisateur local"
 
+#. TRANS: Fieldset legend for feed mirror setting.
 msgid "Mirroring style"
 msgstr "Style de mise en miroir"
 
+#. TRANS: Feed mirror style (radio button option).
 msgid ""
-"Repeat: reference the original user's post (sometimes shows as 'RT @blah')"
+"Repeat: reference the original user's post (sometimes shows as \"RT @blah\")"
 msgstr ""
-"Répéter : référence le message de l’auteur d’origine (montré parfois comme « "
-"RT @blabla »)"
+"Répétition: référence du message de l’utilisateur d’origine (affiché parfois "
+"sous la forme \"RT @blah\")"
 
+#. TRANS: Feed mirror style (radio button option).
 msgid "Repost the content under my account"
 msgstr "Reposter le contenu sous mon compte"
 
+#. TRANS: Button text to save feed mirror settings.
+msgctxt "BUTTON"
 msgid "Save"
-msgstr "Sauvegarder"
+msgstr "Enregistrer"
 
+#. TRANS: Button text to stop mirroring a feed.
+msgctxt "BUTTON"
 msgid "Stop mirroring"
 msgstr "Arrêter le miroir"
 
+#. TRANS: Name for possible feed provider.
 msgid "Twitter"
 msgstr "Twitter"
 
+#. TRANS: Name for possible feed provider.
 msgid "RSS or Atom feed"
 msgstr "Flux RSS ou Atom"
 
+#. TRANS: Heading for feed mirroring selection form.
 msgid "Select a feed provider"
 msgstr "Sélectionner un fournisseur de flux"
diff --git a/plugins/SubMirror/locale/gl/LC_MESSAGES/SubMirror.po b/plugins/SubMirror/locale/gl/LC_MESSAGES/SubMirror.po
new file mode 100644
index 0000000000..d2a56b27ac
--- /dev/null
+++ b/plugins/SubMirror/locale/gl/LC_MESSAGES/SubMirror.po
@@ -0,0 +1,168 @@
+# Translation of StatusNet - SubMirror to Galician (galego)
+# Exported from translatewiki.net
+#
+# Author: Toliño
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - SubMirror\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:11+0000\n"
+"Language-Team: Galician <https://translatewiki.net/wiki/Portal:gl>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-19 11:23:33+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: gl\n"
+"X-Message-Group: #out-statusnet-plugin-submirror\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Client error displayed when entering an invalid URL for a feed.
+#. TRANS: %s is the invalid feed URL.
+#, php-format
+msgid "Invalid feed URL: %s."
+msgstr "URL de fonte de novas non válido: %s."
+
+#. TRANS: Error message returned to user when setting up feed mirroring,
+#. TRANS: but we were unable to resolve the given URL to a working feed.
+msgid "Invalid profile for mirroring."
+msgstr "Perfil inválido para a republicación."
+
+#. TRANS: Client error displayed when trying to mirror a StatusNet group feed.
+msgid "Cannot mirror a StatusNet group at this time."
+msgstr "Non se pode republicar un grupo de StatusNet nestes intres."
+
+#. TRANS: Client error displayed when trying to use another method than POST.
+msgid "This action only accepts POST requests."
+msgstr "Esta acción só permite solicitudes POST."
+
+#. TRANS: Client error displayed when the session token does not match or is not given.
+msgid "There was a problem with your session token. Try again, please."
+msgstr "Houbo un erro co seu pase. Inténteo de novo."
+
+#. TRANS: Error message displayed when trying to perform an action that requires a logged in user.
+msgid "Not logged in."
+msgstr "Non iniciou sesión."
+
+#. TRANS: Page title for subscribed feed mirror.
+msgid "Subscribed"
+msgstr "Subscrito"
+
+#. TRANS: Client error displayed when trying to edit an object that is not a feed mirror.
+msgid "Requested invalid profile to edit."
+msgstr "O perfil que solicitou editar é inválido."
+
+#. TRANS: Client error displayed when providing invalid input when editing a mirror.
+msgid "Bad form data."
+msgstr "Datos de formulario incorrectos."
+
+#. TRANS: Client error thrown when a mirror request is made and no result is retrieved.
+msgid "The mirror request failed, because no result was retrieved."
+msgstr ""
+"A solicitude de republicación fallou porque non se obtivo ningún resultado."
+
+#. TRANS: Exception thrown when a feed provider could not be recognised.
+msgid "Internal form error: Unrecognized feed provider."
+msgstr "Erro interno no formulario: Provedor de fonte de novas non recoñecido."
+
+#. TRANS: Exception thrown when a subscribing to a feed fails.
+msgid "Could not subscribe to feed."
+msgstr "Non se puido subscribir á fonte de novas."
+
+#. TRANS: Page title.
+msgid "Feed mirror settings"
+msgstr "Configuración da republicación de fontes de novas"
+
+#. TRANS: Page instructions.
+msgid ""
+"You can mirror updates from many RSS and Atom feeds into your StatusNet "
+"timeline!"
+msgstr ""
+"Pode republicar as actualizacións de moitas fontes de novas RSS e Atom na "
+"súa liña do tempo de StatusNet!"
+
+#. TRANS: Title for page with form to add a mirror feed provider on.
+msgid "Provider add"
+msgstr "Adición dun provedor"
+
+#. TRANS: Plugin description.
+msgid "Pull feeds into your timeline!"
+msgstr "Importar as fontes de novas na súa liña do tempo!"
+
+#. TRANS: SubMirror plugin menu item on user settings page.
+msgctxt "MENU"
+msgid "Mirroring"
+msgstr "Republicación"
+
+#. TRANS: SubMirror plugin tooltip for user settings menu item.
+msgid "Configure mirroring of posts from other feeds"
+msgstr "Configurar a republicación de mensaxes doutras fontes de novas"
+
+#. TRANS: Label in profile statistics section, followed by a count.
+msgid "Mirrored feeds"
+msgstr "Fontes de novas republicadas"
+
+#. TRANS: Field label.
+msgid "Web page or feed URL:"
+msgstr "Enderezo URL da páxina web ou da fonte de novas:"
+
+#. TRANS: Button text for adding a feed.
+#. TRANS: Button text for adding a Twitter feed mirror.
+msgctxt "BUTTON"
+msgid "Add feed"
+msgstr "Engadir unha fonte de novas"
+
+#. TRANS: Field label.
+msgid "Twitter username:"
+msgstr "Nome de usuario do Twitter:"
+
+#. TRANS: Field label (URL expectected).
+msgctxt "LABEL"
+msgid "Remote feed:"
+msgstr "Fonte de novas remota:"
+
+#. TRANS: Field label.
+msgctxt "LABEL"
+msgid "Local user"
+msgstr "Usuario local"
+
+#. TRANS: Fieldset legend for feed mirror setting.
+msgid "Mirroring style"
+msgstr "Estilo de republicación"
+
+#. TRANS: Feed mirror style (radio button option).
+msgid ""
+"Repeat: reference the original user's post (sometimes shows as \"RT @blah\")"
+msgstr ""
+"Repetir: Referenciar a publicación do usuario orixinal (ás veces móstrase "
+"como \"RT @bla\")"
+
+#. TRANS: Feed mirror style (radio button option).
+msgid "Repost the content under my account"
+msgstr "Volver publicar o contido baixo a miña conta"
+
+#. TRANS: Button text to save feed mirror settings.
+msgctxt "BUTTON"
+msgid "Save"
+msgstr "Gardar"
+
+#. TRANS: Button text to stop mirroring a feed.
+msgctxt "BUTTON"
+msgid "Stop mirroring"
+msgstr "Deixar de republicar"
+
+#. TRANS: Name for possible feed provider.
+msgid "Twitter"
+msgstr "Twitter"
+
+#. TRANS: Name for possible feed provider.
+msgid "RSS or Atom feed"
+msgstr "Fonte de novas RSS ou Atom"
+
+#. TRANS: Heading for feed mirroring selection form.
+msgid "Select a feed provider"
+msgstr "Seleccione un provedor de fonte de novas"
diff --git a/plugins/SubMirror/locale/ia/LC_MESSAGES/SubMirror.po b/plugins/SubMirror/locale/ia/LC_MESSAGES/SubMirror.po
index 8f36d4a2b5..d65c17120f 100644
--- a/plugins/SubMirror/locale/ia/LC_MESSAGES/SubMirror.po
+++ b/plugins/SubMirror/locale/ia/LC_MESSAGES/SubMirror.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - SubMirror to Interlingua (Interlingua)
+# Translation of StatusNet - SubMirror to Interlingua (interlingua)
 # Exported from translatewiki.net
 #
 # Author: McDutchie
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SubMirror\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:30+0000\n"
-"Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:12+0000\n"
+"Language-Team: Interlingua <https://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:22+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-19 11:23:33+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-submirror\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -32,12 +32,15 @@ msgstr "URL de syndication invalide: %s."
 msgid "Invalid profile for mirroring."
 msgstr "Profilo invalide pro republication."
 
+#. TRANS: Client error displayed when trying to mirror a StatusNet group feed.
 msgid "Cannot mirror a StatusNet group at this time."
 msgstr "Al presente il es impossibile republicar un gruppo StatusNet."
 
+#. TRANS: Client error displayed when trying to use another method than POST.
 msgid "This action only accepts POST requests."
 msgstr "Iste action accepta solmente le requestas de typo POST."
 
+#. TRANS: Client error displayed when the session token does not match or is not given.
 msgid "There was a problem with your session token. Try again, please."
 msgstr "Occurreva un problema con le indicio de tu session. Per favor reproba."
 
@@ -45,27 +48,37 @@ msgstr "Occurreva un problema con le indicio de tu session. Per favor reproba."
 msgid "Not logged in."
 msgstr "Tu non ha aperite un session."
 
+#. TRANS: Page title for subscribed feed mirror.
 msgid "Subscribed"
 msgstr "Subscribite"
 
+#. TRANS: Client error displayed when trying to edit an object that is not a feed mirror.
 msgid "Requested invalid profile to edit."
 msgstr "Requestava un profilo invalide a modificar."
 
+#. TRANS: Client error displayed when providing invalid input when editing a mirror.
 msgid "Bad form data."
 msgstr "Mal datos de formulario."
 
 #. TRANS: Client error thrown when a mirror request is made and no result is retrieved.
-msgid "Requested edit of missing mirror."
-msgstr "Requestava le modification de un speculo mancante."
+msgid "The mirror request failed, because no result was retrieved."
+msgstr ""
+"Le requesta de reduplication ha fallite proque nulle requesta ha essite "
+"recipite."
 
+#. TRANS: Exception thrown when a feed provider could not be recognised.
+msgid "Internal form error: Unrecognized feed provider."
+msgstr "Error interne in formulario: Fornitor de syndication incognite."
+
+#. TRANS: Exception thrown when a subscribing to a feed fails.
 msgid "Could not subscribe to feed."
 msgstr "Non poteva subscriber al syndication."
 
-#. TRANS: Title.
+#. TRANS: Page title.
 msgid "Feed mirror settings"
 msgstr "Configuration de speculo de syndication"
 
-#. TRANS: Instructions.
+#. TRANS: Page instructions.
 msgid ""
 "You can mirror updates from many RSS and Atom feeds into your StatusNet "
 "timeline!"
@@ -73,9 +86,11 @@ msgstr ""
 "Tu pote republicar actualisationes de multe syndicationes RSS e Atom in tu "
 "chronologia de StatusNet!"
 
+#. TRANS: Title for page with form to add a mirror feed provider on.
 msgid "Provider add"
 msgstr "Addition de fornitor"
 
+#. TRANS: Plugin description.
 msgid "Pull feeds into your timeline!"
 msgstr "Importar syndicationes in tu chronologia!"
 
@@ -88,50 +103,67 @@ msgstr "Republication"
 msgid "Configure mirroring of posts from other feeds"
 msgstr "Configurar le republication de messages de altere syndicationes"
 
+#. TRANS: Label in profile statistics section, followed by a count.
 msgid "Mirrored feeds"
 msgstr "Speculos de syndicationes"
 
+#. TRANS: Field label.
 msgid "Web page or feed URL:"
 msgstr "URL de pagina web o syndication:"
 
+#. TRANS: Button text for adding a feed.
+#. TRANS: Button text for adding a Twitter feed mirror.
 msgctxt "BUTTON"
 msgid "Add feed"
 msgstr "Adder syndication"
 
+#. TRANS: Field label.
 msgid "Twitter username:"
 msgstr "Nomine de usator de Twitter:"
 
+#. TRANS: Field label (URL expectected).
 msgctxt "LABEL"
 msgid "Remote feed:"
 msgstr "Syndication remote:"
 
+#. TRANS: Field label.
 msgctxt "LABEL"
 msgid "Local user"
 msgstr "Usator local"
 
+#. TRANS: Fieldset legend for feed mirror setting.
 msgid "Mirroring style"
 msgstr "Stilo de republication"
 
+#. TRANS: Feed mirror style (radio button option).
 msgid ""
-"Repeat: reference the original user's post (sometimes shows as 'RT @blah')"
+"Repeat: reference the original user's post (sometimes shows as \"RT @blah\")"
 msgstr ""
-"Repeter: referer al message del usator original (monstrate a vices como 'RT "
-"@pseudonymo')"
+"Repeter: referer al message del usator original (monstrate a vices como \"RT "
+"@pseudonymo\")"
 
+#. TRANS: Feed mirror style (radio button option).
 msgid "Repost the content under my account"
 msgstr "Republicar le contento sub mi conto"
 
+#. TRANS: Button text to save feed mirror settings.
+msgctxt "BUTTON"
 msgid "Save"
 msgstr "Salveguardar"
 
+#. TRANS: Button text to stop mirroring a feed.
+msgctxt "BUTTON"
 msgid "Stop mirroring"
-msgstr "Cessar le republication"
+msgstr "Cessar le reduplication"
 
+#. TRANS: Name for possible feed provider.
 msgid "Twitter"
 msgstr "Twitter"
 
+#. TRANS: Name for possible feed provider.
 msgid "RSS or Atom feed"
 msgstr "Syndication RSS o Atom"
 
+#. TRANS: Heading for feed mirroring selection form.
 msgid "Select a feed provider"
 msgstr "Selige un fornitor de syndicationes"
diff --git a/plugins/SubMirror/locale/mk/LC_MESSAGES/SubMirror.po b/plugins/SubMirror/locale/mk/LC_MESSAGES/SubMirror.po
index 74f2987f3c..4b38bb3513 100644
--- a/plugins/SubMirror/locale/mk/LC_MESSAGES/SubMirror.po
+++ b/plugins/SubMirror/locale/mk/LC_MESSAGES/SubMirror.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - SubMirror to Macedonian (Македон�ки)
+# Translation of StatusNet - SubMirror to Macedonian (македон�ки)
 # Exported from translatewiki.net
 #
 # Author: Bjankuloski06
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SubMirror\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:30+0000\n"
-"Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:12+0000\n"
+"Language-Team: Macedonian <https://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:22+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-19 11:23:33+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-submirror\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
@@ -32,12 +32,15 @@ msgstr "�еважечка URL-адре�а за каналот: %s."
 msgid "Invalid profile for mirroring."
 msgstr "�еважечки профил за от�ликување."
 
+#. TRANS: Client error displayed when trying to mirror a StatusNet group feed.
 msgid "Cannot mirror a StatusNet group at this time."
 msgstr "Моментално не можам да от�ликам група од StatusNet."
 
+#. TRANS: Client error displayed when trying to use another method than POST.
 msgid "This action only accepts POST requests."
 msgstr "Оваа по�тапка прифаќа �амо POST-барања."
 
+#. TRANS: Client error displayed when the session token does not match or is not given.
 msgid "There was a problem with your session token. Try again, please."
 msgstr "Се појави проблем �о жетонот на Вашата �е�ија. Обидете �е подоцна."
 
@@ -45,27 +48,35 @@ msgstr "Се појави проблем �о жетонот на Вашата 
 msgid "Not logged in."
 msgstr "�е �те најавени."
 
+#. TRANS: Page title for subscribed feed mirror.
 msgid "Subscribed"
 msgstr "Претплатено"
 
+#. TRANS: Client error displayed when trying to edit an object that is not a feed mirror.
 msgid "Requested invalid profile to edit."
 msgstr "Побаран е неважечки профил за уредување."
 
+#. TRANS: Client error displayed when providing invalid input when editing a mirror.
 msgid "Bad form data."
 msgstr "�еи�правни податоци за образецот."
 
 #. TRANS: Client error thrown when a mirror request is made and no result is retrieved.
-msgid "Requested edit of missing mirror."
-msgstr "Побаравте уредување на от�ликување што недо�та�ува."
+msgid "The mirror request failed, because no result was retrieved."
+msgstr "Барањето за от�ликување не у�пеа бидејќи не добив никаков резултат."
 
+#. TRANS: Exception thrown when a feed provider could not be recognised.
+msgid "Internal form error: Unrecognized feed provider."
+msgstr "Грешка во внатрешниот образец: �епрепознаен извор за каналот."
+
+#. TRANS: Exception thrown when a subscribing to a feed fails.
 msgid "Could not subscribe to feed."
 msgstr "�е можев да Ве претплатам на каналот."
 
-#. TRANS: Title.
+#. TRANS: Page title.
 msgid "Feed mirror settings"
 msgstr "�агодувања на канал�кото от�ликување"
 
-#. TRANS: Instructions.
+#. TRANS: Page instructions.
 msgid ""
 "You can mirror updates from many RSS and Atom feeds into your StatusNet "
 "timeline!"
@@ -73,9 +84,11 @@ msgstr ""
 "Можете да от�ликувате поднови од многу RSS- и Atom-канали во Вашата "
 "хронологија на StatusNet!"
 
+#. TRANS: Title for page with form to add a mirror feed provider on.
 msgid "Provider add"
 msgstr "�дре�а на у�лужникот"
 
+#. TRANS: Plugin description.
 msgid "Pull feeds into your timeline!"
 msgstr "Повлекувајте канал�ки емитувања во Вашата хронологија!"
 
@@ -88,50 +101,67 @@ msgstr "От�ликување"
 msgid "Configure mirroring of posts from other feeds"
 msgstr "�агодување на от�ликувањето на објавите од други канали"
 
+#. TRANS: Label in profile statistics section, followed by a count.
 msgid "Mirrored feeds"
 msgstr "Огледални канали"
 
+#. TRANS: Field label.
 msgid "Web page or feed URL:"
 msgstr "Мреж. �траница или URL на каналот:"
 
+#. TRANS: Button text for adding a feed.
+#. TRANS: Button text for adding a Twitter feed mirror.
 msgctxt "BUTTON"
 msgid "Add feed"
 msgstr "Додај канал"
 
+#. TRANS: Field label.
 msgid "Twitter username:"
 msgstr "Кори�ничко име на Twitter:"
 
+#. TRANS: Field label (URL expectected).
 msgctxt "LABEL"
 msgid "Remote feed:"
 msgstr "Далечин�ки канал:"
 
+#. TRANS: Field label.
 msgctxt "LABEL"
 msgid "Local user"
 msgstr "Локален кори�ник"
 
+#. TRANS: Fieldset legend for feed mirror setting.
 msgid "Mirroring style"
 msgstr "Стил на от�ликување"
 
+#. TRANS: Feed mirror style (radio button option).
 msgid ""
-"Repeat: reference the original user's post (sometimes shows as 'RT @blah')"
+"Repeat: reference the original user's post (sometimes shows as \"RT @blah\")"
 msgstr ""
 "Повторување: наведете ја објавата на изворниот кори�ник (понекогаш �е "
-"прикажува како „RT @blah“)"
+"прикажува како „RT @бла“)"
 
+#. TRANS: Feed mirror style (radio button option).
 msgid "Repost the content under my account"
 msgstr "Објави ја �одржината под мојата �метка"
 
+#. TRANS: Button text to save feed mirror settings.
+msgctxt "BUTTON"
 msgid "Save"
 msgstr "Зачувај"
 
+#. TRANS: Button text to stop mirroring a feed.
+msgctxt "BUTTON"
 msgid "Stop mirroring"
 msgstr "Пре�тани �о от�ликување"
 
+#. TRANS: Name for possible feed provider.
 msgid "Twitter"
 msgstr "Twitter"
 
+#. TRANS: Name for possible feed provider.
 msgid "RSS or Atom feed"
 msgstr "RSS или Atom канал"
 
+#. TRANS: Heading for feed mirroring selection form.
 msgid "Select a feed provider"
 msgstr "Одберете емитувач"
diff --git a/plugins/SubMirror/locale/nl/LC_MESSAGES/SubMirror.po b/plugins/SubMirror/locale/nl/LC_MESSAGES/SubMirror.po
index e95d3ce79f..4003d8e5f4 100644
--- a/plugins/SubMirror/locale/nl/LC_MESSAGES/SubMirror.po
+++ b/plugins/SubMirror/locale/nl/LC_MESSAGES/SubMirror.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SubMirror\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:30+0000\n"
-"Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:12+0000\n"
+"Language-Team: Dutch <https://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:22+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-19 11:23:33+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-submirror\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -32,12 +32,15 @@ msgstr "Ongeldige URL voor feed: %s."
 msgid "Invalid profile for mirroring."
 msgstr "Ongeldig profiel om te spiegelen."
 
+#. TRANS: Client error displayed when trying to mirror a StatusNet group feed.
 msgid "Cannot mirror a StatusNet group at this time."
 msgstr "Het is niet mogelijk om een StatusNet-groep te spiegelen."
 
+#. TRANS: Client error displayed when trying to use another method than POST.
 msgid "This action only accepts POST requests."
 msgstr "Deze handeling accepteert alleen POST-verzoeken."
 
+#. TRANS: Client error displayed when the session token does not match or is not given.
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 "Er is een probleem ontstaan met uw sessie. Probeer het nog een keer, "
@@ -47,37 +50,47 @@ msgstr ""
 msgid "Not logged in."
 msgstr "Niet aangemeld."
 
+#. TRANS: Page title for subscribed feed mirror.
 msgid "Subscribed"
 msgstr "Geabonneerd"
 
+#. TRANS: Client error displayed when trying to edit an object that is not a feed mirror.
 msgid "Requested invalid profile to edit."
 msgstr "Er is een ongeldig profiel opgevraagd om te bewerken."
 
+#. TRANS: Client error displayed when providing invalid input when editing a mirror.
 msgid "Bad form data."
 msgstr "Onjuiste formuliergegevens."
 
 #. TRANS: Client error thrown when a mirror request is made and no result is retrieved.
-msgid "Requested edit of missing mirror."
-msgstr "Er is een missende spiegel opgevraagd om te bewerken."
+msgid "The mirror request failed, because no result was retrieved."
+msgstr "Het kopieerverzoek is mislukt omdat er geen resultaat is ontvangen."
 
+#. TRANS: Exception thrown when a feed provider could not be recognised.
+msgid "Internal form error: Unrecognized feed provider."
+msgstr "Interne formulierfout: onbekende feedprovider."
+
+#. TRANS: Exception thrown when a subscribing to a feed fails.
 msgid "Could not subscribe to feed."
 msgstr "Het abonneren op de feed is mislukt."
 
-#. TRANS: Title.
+#. TRANS: Page title.
 msgid "Feed mirror settings"
 msgstr "Instellingen voor spiegelfeed"
 
-#. TRANS: Instructions.
+#. TRANS: Page instructions.
 msgid ""
 "You can mirror updates from many RSS and Atom feeds into your StatusNet "
 "timeline!"
 msgstr ""
-"U kunt statusupdates vanuit veel RSS- en Atomfeeds spiegelen in uit "
+"U kunt statusupdates vanuit veel RSS- en Atomfeeds spiegelen in een "
 "StatusNet-tijdlijn."
 
+#. TRANS: Title for page with form to add a mirror feed provider on.
 msgid "Provider add"
 msgstr "Provider toevoegen"
 
+#. TRANS: Plugin description.
 msgid "Pull feeds into your timeline!"
 msgstr "Neem feeds op in uw tijdlijn!"
 
@@ -90,50 +103,67 @@ msgstr "Spiegelen"
 msgid "Configure mirroring of posts from other feeds"
 msgstr "Spiegelen instellen voor berichten van andere feeds"
 
+#. TRANS: Label in profile statistics section, followed by a count.
 msgid "Mirrored feeds"
 msgstr "Gespiegelde feeds"
 
+#. TRANS: Field label.
 msgid "Web page or feed URL:"
 msgstr "URL van webpagina of feed:"
 
+#. TRANS: Button text for adding a feed.
+#. TRANS: Button text for adding a Twitter feed mirror.
 msgctxt "BUTTON"
 msgid "Add feed"
 msgstr "Feed toevoegen"
 
+#. TRANS: Field label.
 msgid "Twitter username:"
 msgstr "Twitter-gebruikersnaam:"
 
+#. TRANS: Field label (URL expectected).
 msgctxt "LABEL"
 msgid "Remote feed:"
 msgstr "Bronfeed:"
 
+#. TRANS: Field label.
 msgctxt "LABEL"
 msgid "Local user"
 msgstr "Lokale gebruiker"
 
+#. TRANS: Fieldset legend for feed mirror setting.
 msgid "Mirroring style"
 msgstr "Spiegelstijl"
 
+#. TRANS: Feed mirror style (radio button option).
 msgid ""
-"Repeat: reference the original user's post (sometimes shows as 'RT @blah')"
+"Repeat: reference the original user's post (sometimes shows as \"RT @blah\")"
 msgstr ""
 "Herhalen: refereer aan het bericht van de originele gebruiker (wordt soms "
 "weergegeven als \"RT @blah ...\")"
 
+#. TRANS: Feed mirror style (radio button option).
 msgid "Repost the content under my account"
 msgstr "De inhoud herhalen alsof die van mij komt"
 
+#. TRANS: Button text to save feed mirror settings.
+msgctxt "BUTTON"
 msgid "Save"
 msgstr "Opslaan"
 
+#. TRANS: Button text to stop mirroring a feed.
+msgctxt "BUTTON"
 msgid "Stop mirroring"
 msgstr "Spiegelen beëindigen"
 
+#. TRANS: Name for possible feed provider.
 msgid "Twitter"
 msgstr "Twitter"
 
+#. TRANS: Name for possible feed provider.
 msgid "RSS or Atom feed"
 msgstr "RSS- of Atom-feed"
 
+#. TRANS: Heading for feed mirroring selection form.
 msgid "Select a feed provider"
 msgstr "Selecteer een feedprovider"
diff --git a/plugins/SubMirror/locale/tl/LC_MESSAGES/SubMirror.po b/plugins/SubMirror/locale/tl/LC_MESSAGES/SubMirror.po
index 99fe6f4b12..7980949453 100644
--- a/plugins/SubMirror/locale/tl/LC_MESSAGES/SubMirror.po
+++ b/plugins/SubMirror/locale/tl/LC_MESSAGES/SubMirror.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SubMirror\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:30+0000\n"
-"Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:12+0000\n"
+"Language-Team: Tagalog <https://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:22+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-19 11:23:33+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-submirror\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -32,12 +32,15 @@ msgstr "Hindi tanggap na URL ng pasubo: %s."
 msgid "Invalid profile for mirroring."
 msgstr "Hindi tanggap na balangkas para sa pagsasalamin."
 
+#. TRANS: Client error displayed when trying to mirror a StatusNet group feed.
 msgid "Cannot mirror a StatusNet group at this time."
 msgstr "Hindi maisalamin sa ngayon ang isang pangkat ng StatusNet."
 
+#. TRANS: Client error displayed when trying to use another method than POST.
 msgid "This action only accepts POST requests."
 msgstr "Ang galaw na ito ay tumatanggap lamang ng mga kahilingan ng PAGPASKIL."
 
+#. TRANS: Client error displayed when the session token does not match or is not given.
 msgid "There was a problem with your session token. Try again, please."
 msgstr "May isang suliranin sa iyong token ng sesyon. Pakisubukan uli."
 
@@ -45,27 +48,36 @@ msgstr "May isang suliranin sa iyong token ng sesyon. Pakisubukan uli."
 msgid "Not logged in."
 msgstr "Hindi nakalagda."
 
+#. TRANS: Page title for subscribed feed mirror.
 msgid "Subscribed"
 msgstr "Tumanggap ng sipi"
 
+#. TRANS: Client error displayed when trying to edit an object that is not a feed mirror.
 msgid "Requested invalid profile to edit."
 msgstr "Hiniling na pamamatnugutang hindi tanggap na balangkas."
 
+#. TRANS: Client error displayed when providing invalid input when editing a mirror.
 msgid "Bad form data."
 msgstr "Datong may masamang anyo."
 
 #. TRANS: Client error thrown when a mirror request is made and no result is retrieved.
-msgid "Requested edit of missing mirror."
-msgstr "Hiniling na pagpatnugot ng nawawalang salamin."
+msgid "The mirror request failed, because no result was retrieved."
+msgstr "Nabigo ang paghiling ng salamin, sapagkat walang nabawing resulta."
 
+#. TRANS: Exception thrown when a feed provider could not be recognised.
+msgid "Internal form error: Unrecognized feed provider."
+msgstr ""
+"Kamalian ng panloob na pormularyo: Hindi nakikilalang tagapagbigay ng pakain."
+
+#. TRANS: Exception thrown when a subscribing to a feed fails.
 msgid "Could not subscribe to feed."
 msgstr "Hindi magawang makatanggap ng pakain."
 
-#. TRANS: Title.
+#. TRANS: Page title.
 msgid "Feed mirror settings"
 msgstr "Mga katakdaan ng salamin ng pakain"
 
-#. TRANS: Instructions.
+#. TRANS: Page instructions.
 msgid ""
 "You can mirror updates from many RSS and Atom feeds into your StatusNet "
 "timeline!"
@@ -73,9 +85,11 @@ msgstr ""
 "Maisasalamin mo ang mga pagsasapanahon mula sa maraming mga pakain ng RSS at "
 "Atom sa iyong guhit ng panahon ng StatusNet!"
 
+#. TRANS: Title for page with form to add a mirror feed provider on.
 msgid "Provider add"
 msgstr "Dagdag ng tagapagbigay"
 
+#. TRANS: Plugin description.
 msgid "Pull feeds into your timeline!"
 msgstr "Hilahin ang mga pakain papasok sa iyong guhit ng panahon!"
 
@@ -88,50 +102,67 @@ msgstr "Sinasalamin"
 msgid "Configure mirroring of posts from other feeds"
 msgstr "Iayos ang pagsasalamin ng mga pagpapaskil mula sa ibang mga pakain"
 
+#. TRANS: Label in profile statistics section, followed by a count.
 msgid "Mirrored feeds"
 msgstr "Naisalaming mga pasubo"
 
+#. TRANS: Field label.
 msgid "Web page or feed URL:"
 msgstr "URL ng pahina sa web o pakain:"
 
+#. TRANS: Button text for adding a feed.
+#. TRANS: Button text for adding a Twitter feed mirror.
 msgctxt "BUTTON"
 msgid "Add feed"
 msgstr "Idagdag ang pakain"
 
+#. TRANS: Field label.
 msgid "Twitter username:"
 msgstr "Pangalan ng tagagamit sa Twitter:"
 
+#. TRANS: Field label (URL expectected).
 msgctxt "LABEL"
 msgid "Remote feed:"
 msgstr "Pakaing malayo:"
 
+#. TRANS: Field label.
 msgctxt "LABEL"
 msgid "Local user"
 msgstr "Katutubong tagagamit"
 
+#. TRANS: Fieldset legend for feed mirror setting.
 msgid "Mirroring style"
 msgstr "Estilo ng pagsasalamin"
 
+#. TRANS: Feed mirror style (radio button option).
 msgid ""
-"Repeat: reference the original user's post (sometimes shows as 'RT @blah')"
+"Repeat: reference the original user's post (sometimes shows as \"RT @blah\")"
 msgstr ""
-"Ulitin: sangguniin ang orihinal na pagpapaskil ng tagagamit (minsang "
-"ipinapakita bilang 'RT @blah')"
+"Ulitin: tukuyin ang orihinal na paskil ng tagagamit (minsang ipinapakita "
+"bilang \"RT @blah\")"
 
+#. TRANS: Feed mirror style (radio button option).
 msgid "Repost the content under my account"
 msgstr "Muling ipaskil ang nilalaman sa ilalim ng aking akawnt"
 
+#. TRANS: Button text to save feed mirror settings.
+msgctxt "BUTTON"
 msgid "Save"
 msgstr "Sagipin"
 
+#. TRANS: Button text to stop mirroring a feed.
+msgctxt "BUTTON"
 msgid "Stop mirroring"
-msgstr "Ihinto ang pagsasalamin"
+msgstr "Ihinto ang pagpapasalamin"
 
+#. TRANS: Name for possible feed provider.
 msgid "Twitter"
 msgstr "Twitter"
 
+#. TRANS: Name for possible feed provider.
 msgid "RSS or Atom feed"
 msgstr "RSS o pasubong Atom"
 
+#. TRANS: Heading for feed mirroring selection form.
 msgid "Select a feed provider"
 msgstr "Pumili ng isang tagapagbigay ng pasubo"
diff --git a/plugins/SubMirror/locale/uk/LC_MESSAGES/SubMirror.po b/plugins/SubMirror/locale/uk/LC_MESSAGES/SubMirror.po
index 1eb76faf2f..dec9cbff17 100644
--- a/plugins/SubMirror/locale/uk/LC_MESSAGES/SubMirror.po
+++ b/plugins/SubMirror/locale/uk/LC_MESSAGES/SubMirror.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - SubMirror to Ukrainian (Україн�ька)
+# Translation of StatusNet - SubMirror to Ukrainian (україн�ька)
 # Exported from translatewiki.net
 #
 # Author: Boogie
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SubMirror\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:30+0000\n"
-"Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:12+0000\n"
+"Language-Team: Ukrainian <https://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:22+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-19 11:23:33+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-submirror\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
@@ -33,12 +33,15 @@ msgstr "Помилкова URL-адре�а �трічки: %s."
 msgid "Invalid profile for mirroring."
 msgstr "Помилковий профіль дл� віддзеркаленн�."
 
+#. TRANS: Client error displayed when trying to mirror a StatusNet group feed.
 msgid "Cannot mirror a StatusNet group at this time."
 msgstr "�а даний момент не можу віддзеркалювати �пільноту на �айті StatusNet."
 
+#. TRANS: Client error displayed when trying to use another method than POST.
 msgid "This action only accepts POST requests."
 msgstr "Ц� ді� приймає запити лише за формою POST."
 
+#. TRANS: Client error displayed when the session token does not match or is not given.
 msgid "There was a problem with your session token. Try again, please."
 msgstr "Виникли певні проблеми з токеном �е�ії. Спробуйте знов, будь ла�ка."
 
@@ -46,27 +49,35 @@ msgstr "Виникли певні проблеми з токеном �е�ії.
 msgid "Not logged in."
 msgstr "Ви не увійшли до �и�теми."
 
+#. TRANS: Page title for subscribed feed mirror.
 msgid "Subscribed"
 msgstr "Підпи�ані"
 
+#. TRANS: Client error displayed when trying to edit an object that is not a feed mirror.
 msgid "Requested invalid profile to edit."
 msgstr "Було запитано невірний профіль дл� редагуванн�."
 
+#. TRANS: Client error displayed when providing invalid input when editing a mirror.
 msgid "Bad form data."
 msgstr "�евірні дані форми."
 
 #. TRANS: Client error thrown when a mirror request is made and no result is retrieved.
-msgid "Requested edit of missing mirror."
-msgstr "Запитано редагуванн� зниклого дзеркала."
+msgid "The mirror request failed, because no result was retrieved."
+msgstr ""
 
+#. TRANS: Exception thrown when a feed provider could not be recognised.
+msgid "Internal form error: Unrecognized feed provider."
+msgstr ""
+
+#. TRANS: Exception thrown when a subscribing to a feed fails.
 msgid "Could not subscribe to feed."
 msgstr "�е можу підпи�ати�� до веб-�трічки."
 
-#. TRANS: Title.
+#. TRANS: Page title.
 msgid "Feed mirror settings"
 msgstr "�алаштуванн� дзеркала веб-�трічки"
 
-#. TRANS: Instructions.
+#. TRANS: Page instructions.
 msgid ""
 "You can mirror updates from many RSS and Atom feeds into your StatusNet "
 "timeline!"
@@ -74,9 +85,11 @@ msgstr ""
 "Ви маєте можливі�ть віддзеркалювати оновленн� багатьох веб-�трічок формату "
 "RSS або Atom одразу до �трічки �воїх допи�ів на �айті StatusNet!"
 
+#. TRANS: Title for page with form to add a mirror feed provider on.
 msgid "Provider add"
 msgstr "Додати провайдера"
 
+#. TRANS: Plugin description.
 msgid "Pull feeds into your timeline!"
 msgstr "Ст�гуванн� веб-каналів до вашої �трічки повідомлень!"
 
@@ -89,50 +102,70 @@ msgstr "Дзеркала"
 msgid "Configure mirroring of posts from other feeds"
 msgstr "Конфігураці� віддзеркаленн� допи�ів з інших веб-�трічок"
 
+#. TRANS: Label in profile statistics section, followed by a count.
 msgid "Mirrored feeds"
 msgstr "Дзеркала"
 
+#. TRANS: Field label.
 msgid "Web page or feed URL:"
 msgstr "Веб-�торінка або ж URL-адре�а �трічки:"
 
+#. TRANS: Button text for adding a feed.
+#. TRANS: Button text for adding a Twitter feed mirror.
 msgctxt "BUTTON"
 msgid "Add feed"
 msgstr "Додати веб-�трічку"
 
+#. TRANS: Field label.
 msgid "Twitter username:"
 msgstr "Ім’� кори�тувача Twitter:"
 
+#. TRANS: Field label (URL expectected).
 msgctxt "LABEL"
 msgid "Remote feed:"
 msgstr "Віддалена веб-�трічка:"
 
+#. TRANS: Field label.
 msgctxt "LABEL"
 msgid "Local user"
 msgstr "Тутешній кори�тувач"
 
+#. TRANS: Fieldset legend for feed mirror setting.
 msgid "Mirroring style"
 msgstr "Форма віддзеркаленн�"
 
+#. TRANS: Feed mirror style (radio button option).
+#, fuzzy
 msgid ""
-"Repeat: reference the original user's post (sometimes shows as 'RT @blah')"
+"Repeat: reference the original user's post (sometimes shows as \"RT @blah\")"
 msgstr ""
 "Повторенн�: по�иланн� до оригінального допи�у кори�тувача (що�ь на зразок «RT "
 "@pupkin»)"
 
+#. TRANS: Feed mirror style (radio button option).
 msgid "Repost the content under my account"
 msgstr "Повторенн� змі�ту під моїм акаунтом"
 
+#. TRANS: Button text to save feed mirror settings.
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Save"
 msgstr "Зберегти"
 
+#. TRANS: Button text to stop mirroring a feed.
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Stop mirroring"
 msgstr "Зупинити віддзеркаленн�"
 
+#. TRANS: Name for possible feed provider.
 msgid "Twitter"
 msgstr "Twitter"
 
+#. TRANS: Name for possible feed provider.
 msgid "RSS or Atom feed"
 msgstr "Стрічка у форматі RSS або Atom"
 
+#. TRANS: Heading for feed mirroring selection form.
 msgid "Select a feed provider"
 msgstr "Виберіть канал по�тачальника"
diff --git a/plugins/SubscriptionThrottle/SubscriptionThrottlePlugin.php b/plugins/SubscriptionThrottle/SubscriptionThrottlePlugin.php
index e898ce9ae0..9e6fc9cab7 100644
--- a/plugins/SubscriptionThrottle/SubscriptionThrottlePlugin.php
+++ b/plugins/SubscriptionThrottle/SubscriptionThrottlePlugin.php
@@ -44,7 +44,6 @@ if (!defined('STATUSNET')) {
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
  * @link      http://status.net/
  */
-
 class SubscriptionThrottlePlugin extends Plugin
 {
     public $subLimits = array(86400 => 100,
@@ -61,7 +60,6 @@ class SubscriptionThrottlePlugin extends Plugin
      *
      * @return boolean hook value
      */
-
     function onStartSubscribe($user, $other)
     {
         foreach ($this->subLimits as $seconds => $limit) {
@@ -71,7 +69,8 @@ class SubscriptionThrottlePlugin extends Plugin
                 $subtime = strtotime($sub->created);
                 $now     = time();
                 if ($now - $subtime < $seconds) {
-                    throw new Exception(_m("Too many subscriptions. Take a break and try again later."));
+                    // TRANS: Exception thrown when subscribing too quickly.
+                    throw new Exception(_m('Too many subscriptions. Take a break and try again later.'));
                 }
             }
         }
@@ -82,22 +81,22 @@ class SubscriptionThrottlePlugin extends Plugin
     /**
      * Filter group joins to see if they're coming too fast.
      *
-     * @param Group $group The group being joined
-     * @param User  $user  The user joining
+     * @param Group   $group   The group being joined
+     * @param Profile $profile The profile joining
      *
      * @return boolean hook value
      */
-
-    function onStartJoinGroup($group, $user)
+    function onStartJoinGroup($group, $profile)
     {
         foreach ($this->groupLimits as $seconds => $limit) {
-            $mem = $this->_getNthMem($user, $limit);
+            $mem = $this->_getNthMem($profile, $limit);
             if (!empty($mem)) {
 
                 $jointime = strtotime($mem->created);
                 $now      = time();
                 if ($now - $jointime < $seconds) {
-                    throw new Exception(_m("Too many memberships. Take a break and try again later."));
+                    // TRANS: Exception thrown when joing groups too quickly.
+                    throw new Exception(_m('Too many memberships. Take a break and try again later.'));
                 }
             }
         }
@@ -113,7 +112,6 @@ class SubscriptionThrottlePlugin extends Plugin
      *
      * @return Subscription a subscription or null
      */
-
     private function _getNthSub($user, $n)
     {
         $sub = new Subscription();
@@ -132,17 +130,16 @@ class SubscriptionThrottlePlugin extends Plugin
     /**
      * Get the Nth most recent group membership for this user
      *
-     * @param User    $user The user to get memberships for
-     * @param integer $n    How far to count back
+     * @param Profile $profile The user to get memberships for
+     * @param integer $n       How far to count back
      *
      * @return Group_member a membership or null
      */
-
-    private function _getNthMem($user, $n)
+    private function _getNthMem($profile, $n)
     {
         $mem = new Group_member();
 
-        $mem->profile_id = $user->id;
+        $mem->profile_id = $profile->id;
         $mem->orderBy('created DESC');
         $mem->limit($n - 1, 1);
 
@@ -160,7 +157,6 @@ class SubscriptionThrottlePlugin extends Plugin
      *
      * @return boolean hook value
      */
-
     function onPluginVersion(&$versions)
     {
         $versions[] = array('name' => 'SubscriptionThrottle',
@@ -168,8 +164,8 @@ class SubscriptionThrottlePlugin extends Plugin
                             'author' => 'Evan Prodromou',
                             'homepage' => 'http://status.net/wiki/Plugin:SubscriptionThrottle',
                             'rawdescription' =>
+                            // TRANS: Plugin description.
                             _m('Configurable limits for subscriptions and group memberships.'));
         return true;
     }
 }
-
diff --git a/plugins/SubscriptionThrottle/locale/SubscriptionThrottle.pot b/plugins/SubscriptionThrottle/locale/SubscriptionThrottle.pot
index 935dbb2697..0d248115c0 100644
--- a/plugins/SubscriptionThrottle/locale/SubscriptionThrottle.pot
+++ b/plugins/SubscriptionThrottle/locale/SubscriptionThrottle.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,14 +16,17 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: SubscriptionThrottlePlugin.php:74
+#. TRANS: Exception thrown when subscribing too quickly.
+#: SubscriptionThrottlePlugin.php:73
 msgid "Too many subscriptions. Take a break and try again later."
 msgstr ""
 
-#: SubscriptionThrottlePlugin.php:100
+#. TRANS: Exception thrown when joing groups too quickly.
+#: SubscriptionThrottlePlugin.php:99
 msgid "Too many memberships. Take a break and try again later."
 msgstr ""
 
-#: SubscriptionThrottlePlugin.php:171
+#. TRANS: Plugin description.
+#: SubscriptionThrottlePlugin.php:168
 msgid "Configurable limits for subscriptions and group memberships."
 msgstr ""
diff --git a/plugins/SubscriptionThrottle/locale/ca/LC_MESSAGES/SubscriptionThrottle.po b/plugins/SubscriptionThrottle/locale/ca/LC_MESSAGES/SubscriptionThrottle.po
index 99b5430921..542f98dfac 100644
--- a/plugins/SubscriptionThrottle/locale/ca/LC_MESSAGES/SubscriptionThrottle.po
+++ b/plugins/SubscriptionThrottle/locale/ca/LC_MESSAGES/SubscriptionThrottle.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - SubscriptionThrottle to Catalan (Català)
+# Translation of StatusNet - SubscriptionThrottle to Catalan (català)
 # Exported from translatewiki.net
 #
 # Author: Toniher
@@ -9,23 +9,26 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SubscriptionThrottle\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:31+0000\n"
-"Language-Team: Catalan <http://translatewiki.net/wiki/Portal:ca>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:12+0000\n"
+"Language-Team: Catalan <https://translatewiki.net/wiki/Portal:ca>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:22+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-19 11:27:35+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ca\n"
 "X-Message-Group: #out-statusnet-plugin-subscriptionthrottle\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Exception thrown when subscribing too quickly.
 msgid "Too many subscriptions. Take a break and try again later."
 msgstr "Massa subscripcions. Prengueu alè i torneu-ho a provar més endavant."
 
+#. TRANS: Exception thrown when joing groups too quickly.
 msgid "Too many memberships. Take a break and try again later."
 msgstr "Masses pertinències. Prengueu alè i torneu-ho a provar més endavant."
 
+#. TRANS: Plugin description.
 msgid "Configurable limits for subscriptions and group memberships."
-msgstr ""
+msgstr "Configura els límits de subscripció i pertinència a grups."
diff --git a/plugins/SubscriptionThrottle/locale/de/LC_MESSAGES/SubscriptionThrottle.po b/plugins/SubscriptionThrottle/locale/de/LC_MESSAGES/SubscriptionThrottle.po
index c5a5c23833..3ced8154f2 100644
--- a/plugins/SubscriptionThrottle/locale/de/LC_MESSAGES/SubscriptionThrottle.po
+++ b/plugins/SubscriptionThrottle/locale/de/LC_MESSAGES/SubscriptionThrottle.po
@@ -10,26 +10,29 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SubscriptionThrottle\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:31+0000\n"
-"Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:12+0000\n"
+"Language-Team: German <https://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:22+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-19 11:27:35+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-subscriptionthrottle\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Exception thrown when subscribing too quickly.
 msgid "Too many subscriptions. Take a break and try again later."
 msgstr ""
 "Zu viele Abonnements. Mach eine Pause und versuche es später noch einmal."
 
+#. TRANS: Exception thrown when joing groups too quickly.
 msgid "Too many memberships. Take a break and try again later."
 msgstr ""
 "Zu viele Mitgliedschaften. Mach eine Pause und versuche es später noch "
 "einmal."
 
+#. TRANS: Plugin description.
 msgid "Configurable limits for subscriptions and group memberships."
 msgstr "Konfigurierbare Limits für Abonnements und Gruppenmitgliedschaften."
diff --git a/plugins/SubscriptionThrottle/locale/es/LC_MESSAGES/SubscriptionThrottle.po b/plugins/SubscriptionThrottle/locale/es/LC_MESSAGES/SubscriptionThrottle.po
index 758366a271..ad5c10e0a0 100644
--- a/plugins/SubscriptionThrottle/locale/es/LC_MESSAGES/SubscriptionThrottle.po
+++ b/plugins/SubscriptionThrottle/locale/es/LC_MESSAGES/SubscriptionThrottle.po
@@ -1,6 +1,7 @@
-# Translation of StatusNet - SubscriptionThrottle to Spanish (Español)
+# Translation of StatusNet - SubscriptionThrottle to Spanish (español)
 # Exported from translatewiki.net
 #
+# Author: Armando-Martin
 # Author: Translationista
 # --
 # This file is distributed under the same license as the StatusNet package.
@@ -9,24 +10,27 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SubscriptionThrottle\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-31 21:06+0000\n"
-"PO-Revision-Date: 2011-03-31 21:10:38+0000\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:12+0000\n"
 "Language-Team: Spanish <http://translatewiki.net/wiki/Portal:es>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:10:02+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r85082); Translate extension (2011-03-11)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-19 11:27:35+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-plugin-subscriptionthrottle\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Exception thrown when subscribing too quickly.
 msgid "Too many subscriptions. Take a break and try again later."
-msgstr ""
+msgstr "Demasiadas subscripciones. Haga una pausa e inténtelo más tarde."
 
+#. TRANS: Exception thrown when joing groups too quickly.
 msgid "Too many memberships. Take a break and try again later."
-msgstr ""
+msgstr "Demasiados miembros. Haga una pausa e inténtelo más tarde."
 
+#. TRANS: Plugin description.
 msgid "Configurable limits for subscriptions and group memberships."
 msgstr ""
 "Límites configurables para las suscripciones y adhesiones a los grupos."
diff --git a/plugins/SubscriptionThrottle/locale/fr/LC_MESSAGES/SubscriptionThrottle.po b/plugins/SubscriptionThrottle/locale/fr/LC_MESSAGES/SubscriptionThrottle.po
index c81eb1100c..9e2bd1868a 100644
--- a/plugins/SubscriptionThrottle/locale/fr/LC_MESSAGES/SubscriptionThrottle.po
+++ b/plugins/SubscriptionThrottle/locale/fr/LC_MESSAGES/SubscriptionThrottle.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - SubscriptionThrottle to French (Français)
+# Translation of StatusNet - SubscriptionThrottle to French (français)
 # Exported from translatewiki.net
 #
 # Author: Peter17
@@ -10,27 +10,30 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SubscriptionThrottle\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:31+0000\n"
-"Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:12+0000\n"
+"Language-Team: French <https://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:22+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-19 11:27:35+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-subscriptionthrottle\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#. TRANS: Exception thrown when subscribing too quickly.
 msgid "Too many subscriptions. Take a break and try again later."
 msgstr ""
 "Inscriptions trop nombreuses. Faites une pause et essayez à nouveau plus "
 "tard."
 
+#. TRANS: Exception thrown when joing groups too quickly.
 msgid "Too many memberships. Take a break and try again later."
 msgstr ""
 "Inscriptions trop nombreuses. Faites une pause et essayez à nouveau plus "
 "tard."
 
+#. TRANS: Plugin description.
 msgid "Configurable limits for subscriptions and group memberships."
 msgstr "Limites configurables pour les abonnements et adhésions aux groupes."
diff --git a/plugins/SubscriptionThrottle/locale/gl/LC_MESSAGES/SubscriptionThrottle.po b/plugins/SubscriptionThrottle/locale/gl/LC_MESSAGES/SubscriptionThrottle.po
new file mode 100644
index 0000000000..4ddbcfdc85
--- /dev/null
+++ b/plugins/SubscriptionThrottle/locale/gl/LC_MESSAGES/SubscriptionThrottle.po
@@ -0,0 +1,34 @@
+# Translation of StatusNet - SubscriptionThrottle to Galician (galego)
+# Exported from translatewiki.net
+#
+# Author: Toliño
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - SubscriptionThrottle\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:12+0000\n"
+"Language-Team: Galician <https://translatewiki.net/wiki/Portal:gl>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-19 11:27:35+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: gl\n"
+"X-Message-Group: #out-statusnet-plugin-subscriptionthrottle\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Exception thrown when subscribing too quickly.
+msgid "Too many subscriptions. Take a break and try again later."
+msgstr "Demasiadas subscricións. Faga unha pausa e inténteo máis tarde."
+
+#. TRANS: Exception thrown when joing groups too quickly.
+msgid "Too many memberships. Take a break and try again later."
+msgstr "Demasiados membros. Faga unha pausa e inténteo máis tarde."
+
+#. TRANS: Plugin description.
+msgid "Configurable limits for subscriptions and group memberships."
+msgstr "Límites configurables para as subscricións e os membros dos grupos."
diff --git a/plugins/SubscriptionThrottle/locale/he/LC_MESSAGES/SubscriptionThrottle.po b/plugins/SubscriptionThrottle/locale/he/LC_MESSAGES/SubscriptionThrottle.po
index 9eb4aca936..1ddff7c6c9 100644
--- a/plugins/SubscriptionThrottle/locale/he/LC_MESSAGES/SubscriptionThrottle.po
+++ b/plugins/SubscriptionThrottle/locale/he/LC_MESSAGES/SubscriptionThrottle.po
@@ -1,6 +1,7 @@
 # Translation of StatusNet - SubscriptionThrottle to Hebrew (עברית)
 # Exported from translatewiki.net
 #
+# Author: Amire80
 # Author: YaronSh
 # --
 # This file is distributed under the same license as the StatusNet package.
@@ -9,23 +10,26 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SubscriptionThrottle\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-31 21:06+0000\n"
-"PO-Revision-Date: 2011-03-31 21:10:38+0000\n"
-"Language-Team: Hebrew <http://translatewiki.net/wiki/Portal:he>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:13+0000\n"
+"Language-Team: Hebrew <https://translatewiki.net/wiki/Portal:he>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-18 20:10:02+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r85082); Translate extension (2011-03-11)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-19 11:27:35+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: he\n"
 "X-Message-Group: #out-statusnet-plugin-subscriptionthrottle\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Exception thrown when subscribing too quickly.
 msgid "Too many subscriptions. Take a break and try again later."
-msgstr ""
+msgstr "יותר מדי הרשמות. קח הפסקה ונסה מ�וחר יותר."
 
+#. TRANS: Exception thrown when joing groups too quickly.
 msgid "Too many memberships. Take a break and try again later."
-msgstr ""
+msgstr "יותר מדי חברויות. קח הפסקה ונסה מ�וחר יותר."
 
+#. TRANS: Plugin description.
 msgid "Configurable limits for subscriptions and group memberships."
 msgstr "הגבלות מינוי וחברות בקבוצות הניתנות להגדרה."
diff --git a/plugins/SubscriptionThrottle/locale/ia/LC_MESSAGES/SubscriptionThrottle.po b/plugins/SubscriptionThrottle/locale/ia/LC_MESSAGES/SubscriptionThrottle.po
index 1b9b843274..77b9b9524e 100644
--- a/plugins/SubscriptionThrottle/locale/ia/LC_MESSAGES/SubscriptionThrottle.po
+++ b/plugins/SubscriptionThrottle/locale/ia/LC_MESSAGES/SubscriptionThrottle.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - SubscriptionThrottle to Interlingua (Interlingua)
+# Translation of StatusNet - SubscriptionThrottle to Interlingua (interlingua)
 # Exported from translatewiki.net
 #
 # Author: McDutchie
@@ -9,23 +9,26 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SubscriptionThrottle\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:31+0000\n"
-"Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:13+0000\n"
+"Language-Team: Interlingua <https://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:22+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-19 11:27:35+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-subscriptionthrottle\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Exception thrown when subscribing too quickly.
 msgid "Too many subscriptions. Take a break and try again later."
 msgstr "Troppo de subscriptiones. Face un pausa e reproba plus tarde."
 
+#. TRANS: Exception thrown when joing groups too quickly.
 msgid "Too many memberships. Take a break and try again later."
 msgstr "Troppo de membratos. Face un pausa e reproba plus tarde."
 
+#. TRANS: Plugin description.
 msgid "Configurable limits for subscriptions and group memberships."
 msgstr "Limites configurabile pro subscriptiones e membrato de gruppos."
diff --git a/plugins/SubscriptionThrottle/locale/mk/LC_MESSAGES/SubscriptionThrottle.po b/plugins/SubscriptionThrottle/locale/mk/LC_MESSAGES/SubscriptionThrottle.po
index 041fd2524a..713a01584c 100644
--- a/plugins/SubscriptionThrottle/locale/mk/LC_MESSAGES/SubscriptionThrottle.po
+++ b/plugins/SubscriptionThrottle/locale/mk/LC_MESSAGES/SubscriptionThrottle.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - SubscriptionThrottle to Macedonian (Македон�ки)
+# Translation of StatusNet - SubscriptionThrottle to Macedonian (македон�ки)
 # Exported from translatewiki.net
 #
 # Author: Bjankuloski06
@@ -9,23 +9,26 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SubscriptionThrottle\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:31+0000\n"
-"Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:13+0000\n"
+"Language-Team: Macedonian <https://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:22+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-19 11:27:35+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-subscriptionthrottle\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
 
+#. TRANS: Exception thrown when subscribing too quickly.
 msgid "Too many subscriptions. Take a break and try again later."
 msgstr "Премногу претплати. �аправете пауза и обидете �е подоцна."
 
+#. TRANS: Exception thrown when joing groups too quickly.
 msgid "Too many memberships. Take a break and try again later."
 msgstr "Премногу член�тва. �аправете пауза и обидете �е подоцна."
 
+#. TRANS: Plugin description.
 msgid "Configurable limits for subscriptions and group memberships."
 msgstr "Прилагодливи ограничувања за претплата и член�тва во групи."
diff --git a/plugins/SubscriptionThrottle/locale/ms/LC_MESSAGES/SubscriptionThrottle.po b/plugins/SubscriptionThrottle/locale/ms/LC_MESSAGES/SubscriptionThrottle.po
index f3af33ab38..5349652b94 100644
--- a/plugins/SubscriptionThrottle/locale/ms/LC_MESSAGES/SubscriptionThrottle.po
+++ b/plugins/SubscriptionThrottle/locale/ms/LC_MESSAGES/SubscriptionThrottle.po
@@ -9,23 +9,26 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SubscriptionThrottle\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:31+0000\n"
-"Language-Team: Malay <http://translatewiki.net/wiki/Portal:ms>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:13+0000\n"
+"Language-Team: Malay <https://translatewiki.net/wiki/Portal:ms>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:22+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-19 11:27:35+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ms\n"
 "X-Message-Group: #out-statusnet-plugin-subscriptionthrottle\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#. TRANS: Exception thrown when subscribing too quickly.
 msgid "Too many subscriptions. Take a break and try again later."
 msgstr "Terlalu banyak langganan. Berehat seketika dan cuba lagi nanti."
 
+#. TRANS: Exception thrown when joing groups too quickly.
 msgid "Too many memberships. Take a break and try again later."
 msgstr "Terlalu banyak keahlian. Berehat seketika dan cuba lagi nanti."
 
+#. TRANS: Plugin description.
 msgid "Configurable limits for subscriptions and group memberships."
-msgstr ""
+msgstr "Had yang boleh dikonfigurasi untuk langganan dan keahlian kumpulan."
diff --git a/plugins/SubscriptionThrottle/locale/nl/LC_MESSAGES/SubscriptionThrottle.po b/plugins/SubscriptionThrottle/locale/nl/LC_MESSAGES/SubscriptionThrottle.po
index 31b332f750..dd06a168b7 100644
--- a/plugins/SubscriptionThrottle/locale/nl/LC_MESSAGES/SubscriptionThrottle.po
+++ b/plugins/SubscriptionThrottle/locale/nl/LC_MESSAGES/SubscriptionThrottle.po
@@ -9,23 +9,26 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SubscriptionThrottle\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:31+0000\n"
-"Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:13+0000\n"
+"Language-Team: Dutch <https://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:22+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-19 11:27:35+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-subscriptionthrottle\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Exception thrown when subscribing too quickly.
 msgid "Too many subscriptions. Take a break and try again later."
 msgstr "Te veel abonnementen. Wacht even en probeer het later opnieuw."
 
+#. TRANS: Exception thrown when joing groups too quickly.
 msgid "Too many memberships. Take a break and try again later."
 msgstr "Te veel lidmaatschappen. Wacht even en probeer het later opnieuw."
 
+#. TRANS: Plugin description.
 msgid "Configurable limits for subscriptions and group memberships."
 msgstr "In te stellen limieten voor abonnementen en groepslidmaatschappen."
diff --git a/plugins/SubscriptionThrottle/locale/tl/LC_MESSAGES/SubscriptionThrottle.po b/plugins/SubscriptionThrottle/locale/tl/LC_MESSAGES/SubscriptionThrottle.po
index 20ae9bf4ef..5695805343 100644
--- a/plugins/SubscriptionThrottle/locale/tl/LC_MESSAGES/SubscriptionThrottle.po
+++ b/plugins/SubscriptionThrottle/locale/tl/LC_MESSAGES/SubscriptionThrottle.po
@@ -9,24 +9,27 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SubscriptionThrottle\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:31+0000\n"
-"Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:13+0000\n"
+"Language-Team: Tagalog <https://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:22+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-19 11:27:35+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-subscriptionthrottle\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Exception thrown when subscribing too quickly.
 msgid "Too many subscriptions. Take a break and try again later."
 msgstr "Napakaraming mga pagpapasipi. Magpahinga muna at subukan uli mamaya."
 
+#. TRANS: Exception thrown when joing groups too quickly.
 msgid "Too many memberships. Take a break and try again later."
 msgstr "Napakaraming mga kasapian. Magpahinga muna at subukan uli mamaya."
 
+#. TRANS: Plugin description.
 msgid "Configurable limits for subscriptions and group memberships."
 msgstr ""
 "Maisasaayos na mga hangganan para sa mga pagtatanggap at mga kasapian sa "
diff --git a/plugins/SubscriptionThrottle/locale/uk/LC_MESSAGES/SubscriptionThrottle.po b/plugins/SubscriptionThrottle/locale/uk/LC_MESSAGES/SubscriptionThrottle.po
index 08a8618c7a..daa648f97f 100644
--- a/plugins/SubscriptionThrottle/locale/uk/LC_MESSAGES/SubscriptionThrottle.po
+++ b/plugins/SubscriptionThrottle/locale/uk/LC_MESSAGES/SubscriptionThrottle.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - SubscriptionThrottle to Ukrainian (Україн�ька)
+# Translation of StatusNet - SubscriptionThrottle to Ukrainian (україн�ька)
 # Exported from translatewiki.net
 #
 # Author: Boogie
@@ -9,27 +9,30 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SubscriptionThrottle\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:31+0000\n"
-"Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:13+0000\n"
+"Language-Team: Ukrainian <https://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:22+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-19 11:27:35+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-subscriptionthrottle\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
+#. TRANS: Exception thrown when subscribing too quickly.
 msgid "Too many subscriptions. Take a break and try again later."
 msgstr "Забагато підпи�ок. Випийте поки що кави і повертайте�ь пізніше."
 
+#. TRANS: Exception thrown when joing groups too quickly.
 msgid "Too many memberships. Take a break and try again later."
 msgstr ""
 "Забагато запитів щодо приєднанн� до �пільноти. Випийте поки що кави і "
 "повертайте�ь пізніше."
 
+#. TRANS: Plugin description.
 msgid "Configurable limits for subscriptions and group memberships."
 msgstr ""
 "З допомогою цього додатку можна обмежувати кількі�ть можливих підпи�ок дл� "
diff --git a/plugins/TabFocus/TabFocusPlugin.php b/plugins/TabFocus/TabFocusPlugin.php
index 1b1d1c2b0a..58f3d06b11 100644
--- a/plugins/TabFocus/TabFocusPlugin.php
+++ b/plugins/TabFocus/TabFocusPlugin.php
@@ -51,6 +51,7 @@ class TabFocusPlugin extends Plugin
                             'author' => 'Craig Andrews and Paul Irish',
                             'homepage' => 'http://status.net/wiki/Plugin:TabFocus',
                             'rawdescription' =>
+                            // TRANS: Plugin description.
                             _m('TabFocus changes the notice form behavior so that, while in the text area, pressing the tab key focuses the "Send" button, matching the behavior of Twitter.'));
         return true;
     }
diff --git a/plugins/TabFocus/locale/TabFocus.pot b/plugins/TabFocus/locale/TabFocus.pot
index 12bf251b23..0ba18a4e37 100644
--- a/plugins/TabFocus/locale/TabFocus.pot
+++ b/plugins/TabFocus/locale/TabFocus.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,7 +16,8 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: TabFocusPlugin.php:54
+#. TRANS: Plugin description.
+#: TabFocusPlugin.php:55
 msgid ""
 "TabFocus changes the notice form behavior so that, while in the text area, "
 "pressing the tab key focuses the \"Send\" button, matching the behavior of "
diff --git a/plugins/TabFocus/locale/br/LC_MESSAGES/TabFocus.po b/plugins/TabFocus/locale/br/LC_MESSAGES/TabFocus.po
index 47f2f60cc7..bb3979cba5 100644
--- a/plugins/TabFocus/locale/br/LC_MESSAGES/TabFocus.po
+++ b/plugins/TabFocus/locale/br/LC_MESSAGES/TabFocus.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - TabFocus to Breton (Brezhoneg)
+# Translation of StatusNet - TabFocus to Breton (brezhoneg)
 # Exported from translatewiki.net
 #
 # Author: Y-M D
@@ -9,18 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TabFocus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:32+0000\n"
-"Language-Team: Breton <http://translatewiki.net/wiki/Portal:br>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:13+0000\n"
+"Language-Team: Breton <https://translatewiki.net/wiki/Portal:br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-19 11:27:36+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-tabfocus\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#. TRANS: Plugin description.
 msgid ""
 "TabFocus changes the notice form behavior so that, while in the text area, "
 "pressing the tab key focuses the \"Send\" button, matching the behavior of "
diff --git a/plugins/TabFocus/locale/de/LC_MESSAGES/TabFocus.po b/plugins/TabFocus/locale/de/LC_MESSAGES/TabFocus.po
index 9504076af9..1965ffa230 100644
--- a/plugins/TabFocus/locale/de/LC_MESSAGES/TabFocus.po
+++ b/plugins/TabFocus/locale/de/LC_MESSAGES/TabFocus.po
@@ -9,18 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TabFocus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:32+0000\n"
-"Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:13+0000\n"
+"Language-Team: German <https://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-19 11:27:36+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-tabfocus\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Plugin description.
 msgid ""
 "TabFocus changes the notice form behavior so that, while in the text area, "
 "pressing the tab key focuses the \"Send\" button, matching the behavior of "
diff --git a/plugins/TabFocus/locale/es/LC_MESSAGES/TabFocus.po b/plugins/TabFocus/locale/es/LC_MESSAGES/TabFocus.po
index 114cfac12f..6e98556fe9 100644
--- a/plugins/TabFocus/locale/es/LC_MESSAGES/TabFocus.po
+++ b/plugins/TabFocus/locale/es/LC_MESSAGES/TabFocus.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - TabFocus to Spanish (Español)
+# Translation of StatusNet - TabFocus to Spanish (español)
 # Exported from translatewiki.net
 #
 # Author: Translationista
@@ -9,18 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TabFocus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:32+0000\n"
-"Language-Team: Spanish <http://translatewiki.net/wiki/Portal:es>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:13+0000\n"
+"Language-Team: Spanish <https://translatewiki.net/wiki/Portal:es>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-19 11:27:36+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-plugin-tabfocus\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Plugin description.
 msgid ""
 "TabFocus changes the notice form behavior so that, while in the text area, "
 "pressing the tab key focuses the \"Send\" button, matching the behavior of "
diff --git a/plugins/TabFocus/locale/fr/LC_MESSAGES/TabFocus.po b/plugins/TabFocus/locale/fr/LC_MESSAGES/TabFocus.po
index 08c00205ba..b009bd34a9 100644
--- a/plugins/TabFocus/locale/fr/LC_MESSAGES/TabFocus.po
+++ b/plugins/TabFocus/locale/fr/LC_MESSAGES/TabFocus.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - TabFocus to French (Français)
+# Translation of StatusNet - TabFocus to French (français)
 # Exported from translatewiki.net
 #
 # Author: Verdy p
@@ -9,18 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TabFocus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:32+0000\n"
-"Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:13+0000\n"
+"Language-Team: French <https://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-19 11:27:36+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-tabfocus\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#. TRANS: Plugin description.
 msgid ""
 "TabFocus changes the notice form behavior so that, while in the text area, "
 "pressing the tab key focuses the \"Send\" button, matching the behavior of "
diff --git a/plugins/TabFocus/locale/gl/LC_MESSAGES/TabFocus.po b/plugins/TabFocus/locale/gl/LC_MESSAGES/TabFocus.po
index 4086bb3b3c..2dff162d9f 100644
--- a/plugins/TabFocus/locale/gl/LC_MESSAGES/TabFocus.po
+++ b/plugins/TabFocus/locale/gl/LC_MESSAGES/TabFocus.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - TabFocus to Galician (Galego)
+# Translation of StatusNet - TabFocus to Galician (galego)
 # Exported from translatewiki.net
 #
 # Author: Toliño
@@ -9,18 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TabFocus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:32+0000\n"
-"Language-Team: Galician <http://translatewiki.net/wiki/Portal:gl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:14+0000\n"
+"Language-Team: Galician <https://translatewiki.net/wiki/Portal:gl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-19 11:27:36+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: gl\n"
 "X-Message-Group: #out-statusnet-plugin-tabfocus\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Plugin description.
 msgid ""
 "TabFocus changes the notice form behavior so that, while in the text area, "
 "pressing the tab key focuses the \"Send\" button, matching the behavior of "
diff --git a/plugins/TabFocus/locale/he/LC_MESSAGES/TabFocus.po b/plugins/TabFocus/locale/he/LC_MESSAGES/TabFocus.po
index ceb46cab07..82d1e1e576 100644
--- a/plugins/TabFocus/locale/he/LC_MESSAGES/TabFocus.po
+++ b/plugins/TabFocus/locale/he/LC_MESSAGES/TabFocus.po
@@ -1,6 +1,7 @@
 # Translation of StatusNet - TabFocus to Hebrew (עברית)
 # Exported from translatewiki.net
 #
+# Author: Amire80
 # Author: YaronSh
 # --
 # This file is distributed under the same license as the StatusNet package.
@@ -9,22 +10,23 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TabFocus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:32+0000\n"
-"Language-Team: Hebrew <http://translatewiki.net/wiki/Portal:he>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:14+0000\n"
+"Language-Team: Hebrew <https://translatewiki.net/wiki/Portal:he>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-19 11:27:36+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: he\n"
 "X-Message-Group: #out-statusnet-plugin-tabfocus\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Plugin description.
 msgid ""
 "TabFocus changes the notice form behavior so that, while in the text area, "
 "pressing the tab key focuses the \"Send\" button, matching the behavior of "
 "Twitter."
 msgstr ""
-"התוסף TabFocus משנה �ת צורת התנהגות ההתרעה כך שבכל זמן שישנה פעילות ב�זור "
+"התוסף TabFocus משנה �ת צורת התנהגות העדכון כך שבכל זמן שישנה פעילות ב�זור "
 "טקסט לחיצה על לחצן ה־tab מתמקדת על הלחצן \"שליחה\", בדומה להתנהגות ב־Twitter."
diff --git a/plugins/TabFocus/locale/ia/LC_MESSAGES/TabFocus.po b/plugins/TabFocus/locale/ia/LC_MESSAGES/TabFocus.po
index 4bb5282620..e60031ffc4 100644
--- a/plugins/TabFocus/locale/ia/LC_MESSAGES/TabFocus.po
+++ b/plugins/TabFocus/locale/ia/LC_MESSAGES/TabFocus.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - TabFocus to Interlingua (Interlingua)
+# Translation of StatusNet - TabFocus to Interlingua (interlingua)
 # Exported from translatewiki.net
 #
 # Author: McDutchie
@@ -9,18 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TabFocus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:32+0000\n"
-"Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:14+0000\n"
+"Language-Team: Interlingua <https://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-19 11:27:36+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-tabfocus\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Plugin description.
 msgid ""
 "TabFocus changes the notice form behavior so that, while in the text area, "
 "pressing the tab key focuses the \"Send\" button, matching the behavior of "
diff --git a/plugins/TabFocus/locale/id/LC_MESSAGES/TabFocus.po b/plugins/TabFocus/locale/id/LC_MESSAGES/TabFocus.po
index 6a143bc731..ddca3d0738 100644
--- a/plugins/TabFocus/locale/id/LC_MESSAGES/TabFocus.po
+++ b/plugins/TabFocus/locale/id/LC_MESSAGES/TabFocus.po
@@ -9,18 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TabFocus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:32+0000\n"
-"Language-Team: Indonesian <http://translatewiki.net/wiki/Portal:id>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:14+0000\n"
+"Language-Team: Indonesian <https://translatewiki.net/wiki/Portal:id>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-19 11:27:36+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: id\n"
 "X-Message-Group: #out-statusnet-plugin-tabfocus\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#. TRANS: Plugin description.
 msgid ""
 "TabFocus changes the notice form behavior so that, while in the text area, "
 "pressing the tab key focuses the \"Send\" button, matching the behavior of "
diff --git a/plugins/TabFocus/locale/mk/LC_MESSAGES/TabFocus.po b/plugins/TabFocus/locale/mk/LC_MESSAGES/TabFocus.po
index 978f08e109..bbfa38f51a 100644
--- a/plugins/TabFocus/locale/mk/LC_MESSAGES/TabFocus.po
+++ b/plugins/TabFocus/locale/mk/LC_MESSAGES/TabFocus.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - TabFocus to Macedonian (Македон�ки)
+# Translation of StatusNet - TabFocus to Macedonian (македон�ки)
 # Exported from translatewiki.net
 #
 # Author: Bjankuloski06
@@ -9,18 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TabFocus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:32+0000\n"
-"Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:14+0000\n"
+"Language-Team: Macedonian <https://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-19 11:27:36+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-tabfocus\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
 
+#. TRANS: Plugin description.
 msgid ""
 "TabFocus changes the notice form behavior so that, while in the text area, "
 "pressing the tab key focuses the \"Send\" button, matching the behavior of "
@@ -28,4 +29,4 @@ msgid ""
 msgstr ""
 "TabFocus го менува поведението на образецот за забелешки: �о при�ти�кање на "
 "копчето Tab во ме�тото за тек�т �е означува копчето „И�прати“, така "
-"по�итоветувајќи �е �о поведението на Twitter."
+"пои�товетувајќи �е �о поведението на Twitter."
diff --git a/plugins/TabFocus/locale/nb/LC_MESSAGES/TabFocus.po b/plugins/TabFocus/locale/nb/LC_MESSAGES/TabFocus.po
index 9e23332bf0..b71f8b404e 100644
--- a/plugins/TabFocus/locale/nb/LC_MESSAGES/TabFocus.po
+++ b/plugins/TabFocus/locale/nb/LC_MESSAGES/TabFocus.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - TabFocus to Norwegian (bokmål)‬ (‪Norsk (bokmål)‬)
+# Translation of StatusNet - TabFocus to Norwegian Bokmål (‪norsk (bokmål)‬)
 # Exported from translatewiki.net
 #
 # Author: Nghtwlkr
@@ -9,18 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TabFocus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:33+0000\n"
-"Language-Team: Norwegian (bokmål)‬ <http://translatewiki.net/wiki/Portal:no>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:14+0000\n"
+"Language-Team: Norwegian Bokmål <https://translatewiki.net/wiki/Portal:nb>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
-"X-Language-Code: no\n"
+"X-POT-Import-Date: 2011-06-19 11:27:36+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: nb\n"
 "X-Message-Group: #out-statusnet-plugin-tabfocus\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Plugin description.
 msgid ""
 "TabFocus changes the notice form behavior so that, while in the text area, "
 "pressing the tab key focuses the \"Send\" button, matching the behavior of "
diff --git a/plugins/TabFocus/locale/nl/LC_MESSAGES/TabFocus.po b/plugins/TabFocus/locale/nl/LC_MESSAGES/TabFocus.po
index caf437958f..c9eebf40fc 100644
--- a/plugins/TabFocus/locale/nl/LC_MESSAGES/TabFocus.po
+++ b/plugins/TabFocus/locale/nl/LC_MESSAGES/TabFocus.po
@@ -10,18 +10,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TabFocus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:32+0000\n"
-"Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:14+0000\n"
+"Language-Team: Dutch <https://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-19 11:27:36+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-tabfocus\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Plugin description.
 msgid ""
 "TabFocus changes the notice form behavior so that, while in the text area, "
 "pressing the tab key focuses the \"Send\" button, matching the behavior of "
diff --git a/plugins/TabFocus/locale/nn/LC_MESSAGES/TabFocus.po b/plugins/TabFocus/locale/nn/LC_MESSAGES/TabFocus.po
index 879941fb52..9f4bd760a4 100644
--- a/plugins/TabFocus/locale/nn/LC_MESSAGES/TabFocus.po
+++ b/plugins/TabFocus/locale/nn/LC_MESSAGES/TabFocus.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - TabFocus to Norwegian Nynorsk (‪Norsk (nynorsk)‬)
+# Translation of StatusNet - TabFocus to Norwegian Nynorsk (‪norsk (nynorsk)‬)
 # Exported from translatewiki.net
 #
 # Author: Sjurhamre
@@ -9,18 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TabFocus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:32+0000\n"
-"Language-Team: Norwegian Nynorsk <http://translatewiki.net/wiki/Portal:nn>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:14+0000\n"
+"Language-Team: Norwegian Nynorsk <https://translatewiki.net/wiki/Portal:nn>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-19 11:27:36+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: nn\n"
 "X-Message-Group: #out-statusnet-plugin-tabfocus\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Plugin description.
 msgid ""
 "TabFocus changes the notice form behavior so that, while in the text area, "
 "pressing the tab key focuses the \"Send\" button, matching the behavior of "
diff --git a/plugins/TabFocus/locale/ru/LC_MESSAGES/TabFocus.po b/plugins/TabFocus/locale/ru/LC_MESSAGES/TabFocus.po
index 7180fa9945..a33bae24b3 100644
--- a/plugins/TabFocus/locale/ru/LC_MESSAGES/TabFocus.po
+++ b/plugins/TabFocus/locale/ru/LC_MESSAGES/TabFocus.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - TabFocus to Russian (Ру��кий)
+# Translation of StatusNet - TabFocus to Russian (ру��кий)
 # Exported from translatewiki.net
 #
 # Author: �лек�андр Сигачёв
@@ -9,19 +9,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TabFocus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:33+0000\n"
-"Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:14+0000\n"
+"Language-Team: Russian <https://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-19 11:27:36+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-tabfocus\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
+#. TRANS: Plugin description.
 msgid ""
 "TabFocus changes the notice form behavior so that, while in the text area, "
 "pressing the tab key focuses the \"Send\" button, matching the behavior of "
diff --git a/plugins/TabFocus/locale/tl/LC_MESSAGES/TabFocus.po b/plugins/TabFocus/locale/tl/LC_MESSAGES/TabFocus.po
index 349f14b9e3..7a230069be 100644
--- a/plugins/TabFocus/locale/tl/LC_MESSAGES/TabFocus.po
+++ b/plugins/TabFocus/locale/tl/LC_MESSAGES/TabFocus.po
@@ -9,18 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TabFocus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:33+0000\n"
-"Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:14+0000\n"
+"Language-Team: Tagalog <https://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-19 11:27:36+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-tabfocus\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Plugin description.
 msgid ""
 "TabFocus changes the notice form behavior so that, while in the text area, "
 "pressing the tab key focuses the \"Send\" button, matching the behavior of "
diff --git a/plugins/TabFocus/locale/uk/LC_MESSAGES/TabFocus.po b/plugins/TabFocus/locale/uk/LC_MESSAGES/TabFocus.po
index b32e4dc229..34303da26a 100644
--- a/plugins/TabFocus/locale/uk/LC_MESSAGES/TabFocus.po
+++ b/plugins/TabFocus/locale/uk/LC_MESSAGES/TabFocus.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - TabFocus to Ukrainian (Україн�ька)
+# Translation of StatusNet - TabFocus to Ukrainian (україн�ька)
 # Exported from translatewiki.net
 #
 # Author: Boogie
@@ -9,19 +9,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TabFocus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:33+0000\n"
-"Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:15+0000\n"
+"Language-Team: Ukrainian <https://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-19 11:27:36+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-tabfocus\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
+#. TRANS: Plugin description.
 msgid ""
 "TabFocus changes the notice form behavior so that, while in the text area, "
 "pressing the tab key focuses the \"Send\" button, matching the behavior of "
diff --git a/plugins/TagSub/TagSub.php b/plugins/TagSub/TagSub.php
index 9662811bf9..c0c4c1ec86 100644
--- a/plugins/TagSub/TagSub.php
+++ b/plugins/TagSub/TagSub.php
@@ -42,7 +42,6 @@ if (!defined('STATUSNET')) {
  *
  * @see      DB_DataObject
  */
-
 class TagSub extends Managed_DataObject
 {
     public $__table = 'tagsub'; // table name
@@ -147,18 +146,18 @@ class TagSub extends Managed_DataObject
         $keypart = sprintf('tagsub:by_profile:%d', $profile->id);
         $tagstring = self::cacheGet($keypart);
         
-        if ($tagstring !== false && !empty($tagstring)) {
-            $tags = explode(',', $tagstring);
+        if ($tagstring !== false) { // cache hit
+        	if (!empty($tagstring)) {
+            	$tags = explode(',', $tagstring);
+        	}
         } else {
-            $tagsub = new TagSub();
+            $tagsub             = new TagSub();
             $tagsub->profile_id = $profile->id;
+            $tagsub->selectAdd();
+            $tagsub->selectAdd('tag');
 
             if ($tagsub->find()) {
-                while ($tagsub->fetch()) {
-                    if (!empty($tagsub->tag)) {
-                        $tags[] = $tagsub->tag;
-                    }
-                }
+				$tags = $tagsub->fetchAll('tag');
             }
 
             self::cacheSet($keypart, implode(',', $tags));
diff --git a/plugins/TagSub/TagSubPlugin.php b/plugins/TagSub/TagSubPlugin.php
index 59297a7fb3..b84b208006 100644
--- a/plugins/TagSub/TagSubPlugin.php
+++ b/plugins/TagSub/TagSubPlugin.php
@@ -192,7 +192,6 @@ class TagSubPlugin extends Plugin
      *
      * @return boolean hook return
      */
-
     function onEndSubGroupNav($widget)
     {
         $action = $widget->out;
@@ -218,11 +217,11 @@ class TagSubPlugin extends Plugin
 
             if (!empty($tags) && count($tags) > 0) {
                 $tagSubMenu = new TagSubMenu($menu->out, $user, $tags);
+                // TRANS: Menu item text for tags submenu.
                 $menu->submenu(_m('Tags'), $tagSubMenu);
             }
         }
 
         return true;
     }
-
 }
diff --git a/plugins/TagSub/locale/TagSub.pot b/plugins/TagSub/locale/TagSub.pot
index 561ad9f839..fa401a93e9 100644
--- a/plugins/TagSub/locale/TagSub.pot
+++ b/plugins/TagSub/locale/TagSub.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,44 +16,59 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: tagunsubform.php:96 tagunsubform.php:107
+#. TRANS: Form legend.
+#: tagunsubform.php:90
 msgid "Unsubscribe from this tag"
 msgstr ""
 
-#: tagunsubform.php:107
+#. TRANS: Submit button text to unsubscribe from a tag.
+#: tagunsubform.php:101
 msgctxt "BUTTON"
 msgid "Unsubscribe"
 msgstr ""
 
+#. TRANS: Submit button title to unsubscribe from a tag.
+#: tagunsubform.php:103
+msgid "Unsubscribe from this tag."
+msgstr ""
+
 #. TRANS: Plugin description.
 #: TagSubPlugin.php:129
 msgid "Plugin to allow following all messages with a given tag."
 msgstr ""
 
 #. TRANS: SubMirror plugin menu item on user settings page.
-#: TagSubPlugin.php:203
+#: TagSubPlugin.php:202
 msgctxt "MENU"
 msgid "Tags"
 msgstr ""
 
 #. TRANS: SubMirror plugin tooltip for user settings menu item.
-#: TagSubPlugin.php:205
+#: TagSubPlugin.php:204
 msgid "Configure tag subscriptions"
 msgstr ""
 
+#. TRANS: Menu item text for tags submenu.
 #: TagSubPlugin.php:221
 msgid "Tags"
 msgstr ""
 
-#: tagsubform.php:116 tagsubform.php:140
+#. TRANS: Form legend.
+#: tagsubform.php:108
 msgid "Subscribe to this tag"
 msgstr ""
 
-#: tagsubform.php:140
+#. TRANS: Submit button text to subscribe to a tag.
+#: tagsubform.php:131
 msgctxt "BUTTON"
 msgid "Subscribe"
 msgstr ""
 
+#. TRANS: Submit button title to subscribe to a tag.
+#: tagsubform.php:133
+msgid "Subscribe to this tag."
+msgstr ""
+
 #. TRANS: Page title when tag unsubscription succeeded.
 #: tagunsubaction.php:76
 msgid "Unsubscribed"
@@ -131,10 +146,12 @@ msgstr ""
 #. TRANS: as an anonymous user. %s is the user nickname.
 #: tagsubsaction.php:124 tagsubsaction.php:130
 #, php-format
-msgid "%s is not listening to any tags."
+msgid "%s is not following any tags."
 msgstr ""
 
-#: tagsubsaction.php:168
+#. TRANS: %1$s is a URL to a tag, %2$s is a tag,
+#. TRANS: %3$s a date string.
+#: tagsubsaction.php:170
 #, php-format
-msgid "#<a href=\"%s\">%s</a> since %s"
+msgid "#<a href=\"%1$s\">%2$s</a> since %3$s"
 msgstr ""
diff --git a/plugins/TagSub/locale/ar/LC_MESSAGES/TagSub.po b/plugins/TagSub/locale/ar/LC_MESSAGES/TagSub.po
new file mode 100644
index 0000000000..f953b6c527
--- /dev/null
+++ b/plugins/TagSub/locale/ar/LC_MESSAGES/TagSub.po
@@ -0,0 +1,141 @@
+# Translation of StatusNet - TagSub to Arabic (العربية)
+# Exported from translatewiki.net
+#
+# Author: OsamaK
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - TagSub\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:15+0000\n"
+"Language-Team: Arabic <https://translatewiki.net/wiki/Portal:ar>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-12-03 13:51:31+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: ar\n"
+"X-Message-Group: #out-statusnet-plugin-tagsub\n"
+"Plural-Forms: nplurals=6; plural=(n == 0) ? 0 : ( (n == 1) ? 1 : ( (n == "
+"2) ? 2 : ( (n%100 >= 3 && n%100 <= 10) ? 3 : ( (n%100 >= 11 && n%100 <= "
+"99) ? 4 : 5 ) ) ) );\n"
+
+#. TRANS: Form legend.
+msgid "Unsubscribe from this tag"
+msgstr ""
+
+#. TRANS: Submit button text to unsubscribe from a tag.
+msgctxt "BUTTON"
+msgid "Unsubscribe"
+msgstr "ألغ� الاشتراك"
+
+#. TRANS: Submit button title to unsubscribe from a tag.
+msgid "Unsubscribe from this tag."
+msgstr ""
+
+#. TRANS: Plugin description.
+msgid "Plugin to allow following all messages with a given tag."
+msgstr ""
+
+#. TRANS: SubMirror plugin menu item on user settings page.
+msgctxt "MENU"
+msgid "Tags"
+msgstr "الوسوم"
+
+#. TRANS: SubMirror plugin tooltip for user settings menu item.
+msgid "Configure tag subscriptions"
+msgstr ""
+
+#. TRANS: Menu item text for tags submenu.
+msgid "Tags"
+msgstr "الوسوم"
+
+#. TRANS: Form legend.
+msgid "Subscribe to this tag"
+msgstr "اشتراك بهذا الوسم"
+
+#. TRANS: Submit button text to subscribe to a tag.
+msgctxt "BUTTON"
+msgid "Subscribe"
+msgstr "اشترك"
+
+#. TRANS: Submit button title to subscribe to a tag.
+msgid "Subscribe to this tag."
+msgstr "اشترك بهذا الوسم."
+
+#. TRANS: Page title when tag unsubscription succeeded.
+msgid "Unsubscribed"
+msgstr "أ�لغيَ الاشتراك"
+
+#. TRANS: Client error displayed trying to perform any request method other than POST.
+#. TRANS: Do not translate POST.
+msgid "This action only accepts POST requests."
+msgstr ""
+
+#. TRANS: Client error displayed when the session token is not okay.
+msgid "There was a problem with your session token. Try again, please."
+msgstr ""
+
+#. TRANS: Error message displayed when trying to perform an action that requires a logged in user.
+msgid "Not logged in."
+msgstr "لست والجًا."
+
+#. TRANS: Client error displayed trying to subscribe to a non-existing profile.
+msgid "No such profile."
+msgstr ""
+
+#. TRANS: Page title when tag subscription succeeded.
+msgid "Subscribed"
+msgstr "م�شترك"
+
+#. TRANS: Header for subscriptions overview for a user (first page).
+#. TRANS: %s is a user nickname.
+#, php-format
+msgid "%s's tag subscriptions"
+msgstr ""
+
+#. TRANS: Header for subscriptions overview for a user (not first page).
+#. TRANS: %1$s is a user nickname, %2$d is the page number.
+#, php-format
+msgid "%1$s's tag subscriptions, page %2$d"
+msgstr ""
+
+#. TRANS: Page notice for page with an overview of all tag subscriptions
+#. TRANS: of the logged in user's own profile.
+msgid ""
+"You have subscribed to receive all notices on this site containing the "
+"following tags:"
+msgstr ""
+
+#. TRANS: Page notice for page with an overview of all subscriptions of a user other
+#. TRANS: than the logged in user. %s is the user nickname.
+#, php-format
+msgid ""
+"%s has subscribed to receive all notices on this site containing the "
+"following tags:"
+msgstr ""
+
+#. TRANS: Tag subscription list text when the logged in user has no tag subscriptions.
+msgid ""
+"You are not listening to any hash tags right now. You can push the "
+"\"Subscribe\" button on any hashtag page to automatically receive any public "
+"messages on this site that use that tag, even if you are not subscribed to "
+"the poster."
+msgstr ""
+
+#. TRANS: Tag subscription list text when looking at the subscriptions for a of a user other
+#. TRANS: than the logged in user that has no tag subscriptions. %s is the user nickname.
+#. TRANS: Subscription list text when looking at the subscriptions for a of a user that has none
+#. TRANS: as an anonymous user. %s is the user nickname.
+#, php-format
+msgid "%s is not following any tags."
+msgstr ""
+
+#. TRANS: %1$s is a URL to a tag, %2$s is a tag,
+#. TRANS: %3$s a date string.
+#, php-format
+msgid "#<a href=\"%1$s\">%2$s</a> since %3$s"
+msgstr ""
diff --git a/plugins/TagSub/locale/ca/LC_MESSAGES/TagSub.po b/plugins/TagSub/locale/ca/LC_MESSAGES/TagSub.po
index 0a1a2abca0..b7243f2821 100644
--- a/plugins/TagSub/locale/ca/LC_MESSAGES/TagSub.po
+++ b/plugins/TagSub/locale/ca/LC_MESSAGES/TagSub.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - TagSub to Catalan (Català)
+# Translation of StatusNet - TagSub to Catalan (català)
 # Exported from translatewiki.net
 #
 # Author: Toniher
@@ -9,25 +9,31 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TagSub\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:34+0000\n"
-"Language-Team: Catalan <http://translatewiki.net/wiki/Portal:ca>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:15+0000\n"
+"Language-Team: Catalan <https://translatewiki.net/wiki/Portal:ca>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-12-03 13:51:31+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ca\n"
 "X-Message-Group: #out-statusnet-plugin-tagsub\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Form legend.
 msgid "Unsubscribe from this tag"
 msgstr "Cancel·la la subscripció d'aquesta etiqueta"
 
+#. TRANS: Submit button text to unsubscribe from a tag.
 msgctxt "BUTTON"
 msgid "Unsubscribe"
 msgstr "Cancel·la la subscripció"
 
+#. TRANS: Submit button title to unsubscribe from a tag.
+msgid "Unsubscribe from this tag."
+msgstr "Deixa la subscripció d'aquesta etiqueta."
+
 #. TRANS: Plugin description.
 msgid "Plugin to allow following all messages with a given tag."
 msgstr ""
@@ -43,16 +49,23 @@ msgstr "Etiquetes"
 msgid "Configure tag subscriptions"
 msgstr "Configura les subscripcions d'etiquetes"
 
+#. TRANS: Menu item text for tags submenu.
 msgid "Tags"
 msgstr "Etiquetes"
 
+#. TRANS: Form legend.
 msgid "Subscribe to this tag"
 msgstr "Subscriu a aquesta etiqueta"
 
+#. TRANS: Submit button text to subscribe to a tag.
 msgctxt "BUTTON"
 msgid "Subscribe"
 msgstr "Subscriu"
 
+#. TRANS: Submit button title to subscribe to a tag.
+msgid "Subscribe to this tag."
+msgstr "Subscriu a aquesta etiqueta."
+
 #. TRANS: Page title when tag unsubscription succeeded.
 msgid "Unsubscribed"
 msgstr "Dessubscrit"
@@ -68,7 +81,7 @@ msgstr ""
 
 #. TRANS: Error message displayed when trying to perform an action that requires a logged in user.
 msgid "Not logged in."
-msgstr ""
+msgstr "No s'ha iniciat una sessió."
 
 #. TRANS: Client error displayed trying to subscribe to a non-existing profile.
 msgid "No such profile."
@@ -82,7 +95,7 @@ msgstr "Subscrit."
 #. TRANS: %s is a user nickname.
 #, php-format
 msgid "%s's tag subscriptions"
-msgstr ""
+msgstr "Subscripcions d'etiqueta de %s"
 
 #. TRANS: Header for subscriptions overview for a user (not first page).
 #. TRANS: %1$s is a user nickname, %2$d is the page number.
@@ -118,9 +131,11 @@ msgstr ""
 #. TRANS: Subscription list text when looking at the subscriptions for a of a user that has none
 #. TRANS: as an anonymous user. %s is the user nickname.
 #, php-format
-msgid "%s is not listening to any tags."
-msgstr ""
+msgid "%s is not following any tags."
+msgstr "%s no està seguint cap etiqueta."
 
+#. TRANS: %1$s is a URL to a tag, %2$s is a tag,
+#. TRANS: %3$s a date string.
 #, php-format
-msgid "#<a href=\"%s\">%s</a> since %s"
-msgstr ""
+msgid "#<a href=\"%1$s\">%2$s</a> since %3$s"
+msgstr "#<a href=\"%1$s\">%2$s</a> des de %3$s"
diff --git a/plugins/TagSub/locale/de/LC_MESSAGES/TagSub.po b/plugins/TagSub/locale/de/LC_MESSAGES/TagSub.po
index e5da7ac0ad..626a47b1b5 100644
--- a/plugins/TagSub/locale/de/LC_MESSAGES/TagSub.po
+++ b/plugins/TagSub/locale/de/LC_MESSAGES/TagSub.po
@@ -2,6 +2,7 @@
 # Exported from translatewiki.net
 #
 # Author: Giftpflanze
+# Author: Tiin
 # --
 # This file is distributed under the same license as the StatusNet package.
 #
@@ -9,25 +10,31 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TagSub\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:34+0000\n"
-"Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:15+0000\n"
+"Language-Team: German <https://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-12-03 13:51:31+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-tagsub\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Form legend.
 msgid "Unsubscribe from this tag"
 msgstr "Dieses Tag abbestellen"
 
+#. TRANS: Submit button text to unsubscribe from a tag.
 msgctxt "BUTTON"
 msgid "Unsubscribe"
 msgstr "Abbestellen"
 
+#. TRANS: Submit button title to unsubscribe from a tag.
+msgid "Unsubscribe from this tag."
+msgstr "Dieses Tag abbestellen."
+
 #. TRANS: Plugin description.
 msgid "Plugin to allow following all messages with a given tag."
 msgstr ""
@@ -42,16 +49,23 @@ msgstr "Tags"
 msgid "Configure tag subscriptions"
 msgstr "Tagabonnements konfigurieren"
 
+#. TRANS: Menu item text for tags submenu.
 msgid "Tags"
 msgstr "Tags"
 
+#. TRANS: Form legend.
 msgid "Subscribe to this tag"
 msgstr "Dieses Tag abonnieren"
 
+#. TRANS: Submit button text to subscribe to a tag.
 msgctxt "BUTTON"
 msgid "Subscribe"
 msgstr "Abonnieren"
 
+#. TRANS: Submit button title to subscribe to a tag.
+msgid "Subscribe to this tag."
+msgstr "Dieses Tag abonnieren."
+
 #. TRANS: Page title when tag unsubscription succeeded.
 msgid "Unsubscribed"
 msgstr "Abbestellt"
@@ -127,9 +141,11 @@ msgstr ""
 #. TRANS: Subscription list text when looking at the subscriptions for a of a user that has none
 #. TRANS: as an anonymous user. %s is the user nickname.
 #, php-format
-msgid "%s is not listening to any tags."
+msgid "%s is not following any tags."
 msgstr "%s verfolgt keine Tags."
 
+#. TRANS: %1$s is a URL to a tag, %2$s is a tag,
+#. TRANS: %3$s a date string.
 #, php-format
-msgid "#<a href=\"%s\">%s</a> since %s"
-msgstr "#<a href=\"%s\">%s</a> seit %s"
+msgid "#<a href=\"%1$s\">%2$s</a> since %3$s"
+msgstr "#<a href=\"%1$s\">%2$s</a> seit %3$s"
diff --git a/plugins/TagSub/locale/es/LC_MESSAGES/TagSub.po b/plugins/TagSub/locale/es/LC_MESSAGES/TagSub.po
new file mode 100644
index 0000000000..3bcf330d4a
--- /dev/null
+++ b/plugins/TagSub/locale/es/LC_MESSAGES/TagSub.po
@@ -0,0 +1,146 @@
+# Translation of StatusNet - TagSub to Spanish (español)
+# Exported from translatewiki.net
+#
+# Author: Armando-Martin
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - TagSub\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:15+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-12-03 13:51:31+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Form legend.
+msgid "Unsubscribe from this tag"
+msgstr "Cancelar la subscrición a esta etiqueta"
+
+#. TRANS: Submit button text to unsubscribe from a tag.
+msgctxt "BUTTON"
+msgid "Unsubscribe"
+msgstr "Cancelar la suscripción"
+
+#. TRANS: Submit button title to unsubscribe from a tag.
+msgid "Unsubscribe from this tag."
+msgstr "Cancelar la subscrición a esta etiqueta."
+
+#. TRANS: Plugin description.
+msgid "Plugin to allow following all messages with a given tag."
+msgstr ""
+"Complemento (plugin) para permitir seguir todos los mensajes con una "
+"etiqueta determinada."
+
+#. TRANS: SubMirror plugin menu item on user settings page.
+msgctxt "MENU"
+msgid "Tags"
+msgstr "Etiquetas"
+
+#. TRANS: SubMirror plugin tooltip for user settings menu item.
+msgid "Configure tag subscriptions"
+msgstr "Configurar las suscripciones a las etiquetas"
+
+#. TRANS: Menu item text for tags submenu.
+msgid "Tags"
+msgstr "Etiquetas"
+
+#. TRANS: Form legend.
+msgid "Subscribe to this tag"
+msgstr "Suscribirse a esta etiqueta"
+
+#. TRANS: Submit button text to subscribe to a tag.
+msgctxt "BUTTON"
+msgid "Subscribe"
+msgstr "Suscribirse"
+
+#. TRANS: Submit button title to subscribe to a tag.
+msgid "Subscribe to this tag."
+msgstr "Suscribirse a esta etiqueta."
+
+#. TRANS: Page title when tag unsubscription succeeded.
+msgid "Unsubscribed"
+msgstr "Ha cancelado la suscripción"
+
+#. TRANS: Client error displayed trying to perform any request method other than POST.
+#. TRANS: Do not translate POST.
+msgid "This action only accepts POST requests."
+msgstr "Esta acción sólo acepta solicitudes POST."
+
+#. TRANS: Client error displayed when the session token is not okay.
+msgid "There was a problem with your session token. Try again, please."
+msgstr "Hubo un problema con su contraseña de sesión. Inténtelo de nuevo."
+
+#. TRANS: Error message displayed when trying to perform an action that requires a logged in user.
+msgid "Not logged in."
+msgstr "No ha iniciado sesión"
+
+#. TRANS: Client error displayed trying to subscribe to a non-existing profile.
+msgid "No such profile."
+msgstr "No existe tal perfil."
+
+#. TRANS: Page title when tag subscription succeeded.
+msgid "Subscribed"
+msgstr "Suscrito"
+
+#. TRANS: Header for subscriptions overview for a user (first page).
+#. TRANS: %s is a user nickname.
+#, php-format
+msgid "%s's tag subscriptions"
+msgstr "suscripciones a las etiquetas de %ss"
+
+#. TRANS: Header for subscriptions overview for a user (not first page).
+#. TRANS: %1$s is a user nickname, %2$d is the page number.
+#, php-format
+msgid "%1$s's tag subscriptions, page %2$d"
+msgstr "suscripciones a las etiquetas de %1$s, página %2$d"
+
+#. TRANS: Page notice for page with an overview of all tag subscriptions
+#. TRANS: of the logged in user's own profile.
+msgid ""
+"You have subscribed to receive all notices on this site containing the "
+"following tags:"
+msgstr ""
+"Se ha suscrito para recibir todos los avisos de este sitio que contengan las "
+"etiquetas siguientes:"
+
+#. TRANS: Page notice for page with an overview of all subscriptions of a user other
+#. TRANS: than the logged in user. %s is the user nickname.
+#, php-format
+msgid ""
+"%s has subscribed to receive all notices on this site containing the "
+"following tags:"
+msgstr ""
+"%s se ha suscrito para recibir todos los avisos de este sitio que contengan "
+"las etiquetas siguientes:"
+
+#. TRANS: Tag subscription list text when the logged in user has no tag subscriptions.
+msgid ""
+"You are not listening to any hash tags right now. You can push the "
+"\"Subscribe\" button on any hashtag page to automatically receive any public "
+"messages on this site that use that tag, even if you are not subscribed to "
+"the poster."
+msgstr ""
+"No está siguiendo ahora ninguna etiqueta (hashtag). Puede pulsar el botón "
+"\"Suscribirse\" en cualquier página de hashtag para recibir automáticamente "
+"los mensajes públicos de este sitio que utilicen esa etiqueta, incluso si no "
+"está suscrito al autor."
+
+#. TRANS: Tag subscription list text when looking at the subscriptions for a of a user other
+#. TRANS: than the logged in user that has no tag subscriptions. %s is the user nickname.
+#. TRANS: Subscription list text when looking at the subscriptions for a of a user that has none
+#. TRANS: as an anonymous user. %s is the user nickname.
+#, php-format
+msgid "%s is not following any tags."
+msgstr "%s no está siguiendo ninguna etiqueta."
+
+#. TRANS: %1$s is a URL to a tag, %2$s is a tag,
+#. TRANS: %3$s a date string.
+#, php-format
+msgid "#<a href=\"%1$s\">%2$s</a> since %3$s"
+msgstr "#<a href=\"%1$s\">%2$s</a> desde %3$s"
diff --git a/plugins/TagSub/locale/eu/LC_MESSAGES/TagSub.po b/plugins/TagSub/locale/eu/LC_MESSAGES/TagSub.po
new file mode 100644
index 0000000000..07771dfb49
--- /dev/null
+++ b/plugins/TagSub/locale/eu/LC_MESSAGES/TagSub.po
@@ -0,0 +1,136 @@
+# Translation of StatusNet - TagSub to Basque (euskara)
+# Exported from translatewiki.net
+#
+# Author: Artsuaga
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - TagSub\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:15+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-12-03 13:51:31+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Form legend.
+msgid "Unsubscribe from this tag"
+msgstr "Etiketa hontara harpidetza kendu"
+
+#. TRANS: Submit button text to unsubscribe from a tag.
+msgctxt "BUTTON"
+msgid "Unsubscribe"
+msgstr "Harpidetza kendu"
+
+#. TRANS: Submit button title to unsubscribe from a tag.
+msgid "Unsubscribe from this tag."
+msgstr "Etiketa hontara harpidetza kendu."
+
+#. TRANS: Plugin description.
+msgid "Plugin to allow following all messages with a given tag."
+msgstr ""
+
+#. TRANS: SubMirror plugin menu item on user settings page.
+msgctxt "MENU"
+msgid "Tags"
+msgstr "Etiketak"
+
+#. TRANS: SubMirror plugin tooltip for user settings menu item.
+msgid "Configure tag subscriptions"
+msgstr "Konfiguratu etiketetara harpidetzak"
+
+#. TRANS: Menu item text for tags submenu.
+msgid "Tags"
+msgstr "Etiketak"
+
+#. TRANS: Form legend.
+msgid "Subscribe to this tag"
+msgstr "Harpidetu etiketa honetara"
+
+#. TRANS: Submit button text to subscribe to a tag.
+msgctxt "BUTTON"
+msgid "Subscribe"
+msgstr "Harpidetu"
+
+#. TRANS: Submit button title to subscribe to a tag.
+msgid "Subscribe to this tag."
+msgstr "Harpidetu etiketa honetara."
+
+#. TRANS: Page title when tag unsubscription succeeded.
+msgid "Unsubscribed"
+msgstr "Harpidetu gabea"
+
+#. TRANS: Client error displayed trying to perform any request method other than POST.
+#. TRANS: Do not translate POST.
+msgid "This action only accepts POST requests."
+msgstr "Ekintza honek POST eskariak soilik onartzen ditu."
+
+#. TRANS: Client error displayed when the session token is not okay.
+msgid "There was a problem with your session token. Try again, please."
+msgstr "Arazoa egon da zure saio-tokenarekin. Saiatu berriro, mesedez."
+
+#. TRANS: Error message displayed when trying to perform an action that requires a logged in user.
+msgid "Not logged in."
+msgstr "Saioa hasi gabe."
+
+#. TRANS: Client error displayed trying to subscribe to a non-existing profile.
+msgid "No such profile."
+msgstr "Profil hori ez dago."
+
+#. TRANS: Page title when tag subscription succeeded.
+msgid "Subscribed"
+msgstr "Harpidetua"
+
+#. TRANS: Header for subscriptions overview for a user (first page).
+#. TRANS: %s is a user nickname.
+#, php-format
+msgid "%s's tag subscriptions"
+msgstr "%s(r)en etiketa harpidetzak"
+
+#. TRANS: Header for subscriptions overview for a user (not first page).
+#. TRANS: %1$s is a user nickname, %2$d is the page number.
+#, fuzzy, php-format
+msgid "%1$s's tag subscriptions, page %2$d"
+msgstr "%1$s(r)en etiketa harpidetzak, 2$s. orria"
+
+#. TRANS: Page notice for page with an overview of all tag subscriptions
+#. TRANS: of the logged in user's own profile.
+msgid ""
+"You have subscribed to receive all notices on this site containing the "
+"following tags:"
+msgstr ""
+
+#. TRANS: Page notice for page with an overview of all subscriptions of a user other
+#. TRANS: than the logged in user. %s is the user nickname.
+#, php-format
+msgid ""
+"%s has subscribed to receive all notices on this site containing the "
+"following tags:"
+msgstr ""
+
+#. TRANS: Tag subscription list text when the logged in user has no tag subscriptions.
+msgid ""
+"You are not listening to any hash tags right now. You can push the "
+"\"Subscribe\" button on any hashtag page to automatically receive any public "
+"messages on this site that use that tag, even if you are not subscribed to "
+"the poster."
+msgstr ""
+
+#. TRANS: Tag subscription list text when looking at the subscriptions for a of a user other
+#. TRANS: than the logged in user that has no tag subscriptions. %s is the user nickname.
+#. TRANS: Subscription list text when looking at the subscriptions for a of a user that has none
+#. TRANS: as an anonymous user. %s is the user nickname.
+#, php-format
+msgid "%s is not following any tags."
+msgstr "%s ez da ari etiketarik jarraitzen."
+
+#. TRANS: %1$s is a URL to a tag, %2$s is a tag,
+#. TRANS: %3$s a date string.
+#, php-format
+msgid "#<a href=\"%1$s\">%2$s</a> since %3$s"
+msgstr "#<a href=\"%1$s\">%2$s</a> %3$s(e)tik"
diff --git a/plugins/TagSub/locale/fr/LC_MESSAGES/TagSub.po b/plugins/TagSub/locale/fr/LC_MESSAGES/TagSub.po
new file mode 100644
index 0000000000..a3cf26b6ba
--- /dev/null
+++ b/plugins/TagSub/locale/fr/LC_MESSAGES/TagSub.po
@@ -0,0 +1,148 @@
+# Translation of StatusNet - TagSub to French (français)
+# Exported from translatewiki.net
+#
+# Author: Brunoperel
+# Author: Gomoko
+# Author: Od1n
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - TagSub\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:15+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-12-03 13:51:31+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#. TRANS: Form legend.
+msgid "Unsubscribe from this tag"
+msgstr "Se désinscrire de cette balise"
+
+#. TRANS: Submit button text to unsubscribe from a tag.
+msgctxt "BUTTON"
+msgid "Unsubscribe"
+msgstr "Se désabonner"
+
+#. TRANS: Submit button title to unsubscribe from a tag.
+msgid "Unsubscribe from this tag."
+msgstr "Se désinscrire de cette balise."
+
+#. TRANS: Plugin description.
+msgid "Plugin to allow following all messages with a given tag."
+msgstr ""
+"Plugin pour permettre de suivre tous les messages avec une balise donnée."
+
+#. TRANS: SubMirror plugin menu item on user settings page.
+msgctxt "MENU"
+msgid "Tags"
+msgstr "Balises"
+
+#. TRANS: SubMirror plugin tooltip for user settings menu item.
+msgid "Configure tag subscriptions"
+msgstr "Configurer les inscriptions aux balises"
+
+#. TRANS: Menu item text for tags submenu.
+msgid "Tags"
+msgstr "Balises"
+
+#. TRANS: Form legend.
+msgid "Subscribe to this tag"
+msgstr "S'abonner à cette balise"
+
+#. TRANS: Submit button text to subscribe to a tag.
+msgctxt "BUTTON"
+msgid "Subscribe"
+msgstr "S’abonner"
+
+#. TRANS: Submit button title to subscribe to a tag.
+msgid "Subscribe to this tag."
+msgstr "S'abonner à cette balise."
+
+#. TRANS: Page title when tag unsubscription succeeded.
+msgid "Unsubscribed"
+msgstr "Désabonné"
+
+#. TRANS: Client error displayed trying to perform any request method other than POST.
+#. TRANS: Do not translate POST.
+msgid "This action only accepts POST requests."
+msgstr "Cette action n'accepte que les requêtes de type POST."
+
+#. TRANS: Client error displayed when the session token is not okay.
+msgid "There was a problem with your session token. Try again, please."
+msgstr ""
+"Un problème est survenu avec votre session. Merci d'essayer de nouveau."
+
+#. TRANS: Error message displayed when trying to perform an action that requires a logged in user.
+msgid "Not logged in."
+msgstr "Non connecté."
+
+#. TRANS: Client error displayed trying to subscribe to a non-existing profile.
+msgid "No such profile."
+msgstr "Profil non trouvé."
+
+#. TRANS: Page title when tag subscription succeeded.
+msgid "Subscribed"
+msgstr "Abonné"
+
+#. TRANS: Header for subscriptions overview for a user (first page).
+#. TRANS: %s is a user nickname.
+#, php-format
+msgid "%s's tag subscriptions"
+msgstr "inscriptions à la balise %s"
+
+#. TRANS: Header for subscriptions overview for a user (not first page).
+#. TRANS: %1$s is a user nickname, %2$d is the page number.
+#, php-format
+msgid "%1$s's tag subscriptions, page %2$d"
+msgstr "inscriptions à la balise %1$s, page %2$d"
+
+#. TRANS: Page notice for page with an overview of all tag subscriptions
+#. TRANS: of the logged in user's own profile.
+msgid ""
+"You have subscribed to receive all notices on this site containing the "
+"following tags:"
+msgstr ""
+"Vous vous êtes inscrit pour recevoir tous les avertissements de ce site "
+"correspondant aux balises suivantes:"
+
+#. TRANS: Page notice for page with an overview of all subscriptions of a user other
+#. TRANS: than the logged in user. %s is the user nickname.
+#, php-format
+msgid ""
+"%s has subscribed to receive all notices on this site containing the "
+"following tags:"
+msgstr ""
+"%s s'est inscrit pour recevoir tous les avertissements de ce site contenant "
+"les balises suivantes:"
+
+#. TRANS: Tag subscription list text when the logged in user has no tag subscriptions.
+msgid ""
+"You are not listening to any hash tags right now. You can push the "
+"\"Subscribe\" button on any hashtag page to automatically receive any public "
+"messages on this site that use that tag, even if you are not subscribed to "
+"the poster."
+msgstr ""
+"Vous n'êtes désormais plus à l'écoute des balises de hachage. Vous pouvez "
+"appuyez sur le bouton \"S'abonner\" sur n'importe quelle page de balise de "
+"hachage pour recevoir automatiquement tous les messages publics sur ce site "
+"qui utilisent cette balise, même si vous n'êtes pas abonné au publieur."
+
+#. TRANS: Tag subscription list text when looking at the subscriptions for a of a user other
+#. TRANS: than the logged in user that has no tag subscriptions. %s is the user nickname.
+#. TRANS: Subscription list text when looking at the subscriptions for a of a user that has none
+#. TRANS: as an anonymous user. %s is the user nickname.
+#, php-format
+msgid "%s is not following any tags."
+msgstr "%s ne suit aucune balise."
+
+#. TRANS: %1$s is a URL to a tag, %2$s is a tag,
+#. TRANS: %3$s a date string.
+#, php-format
+msgid "#<a href=\"%1$s\">%2$s</a> since %3$s"
+msgstr "#<a href=\"%1$s\">%2$s</a> depuis %3$s"
diff --git a/plugins/TagSub/locale/gl/LC_MESSAGES/TagSub.po b/plugins/TagSub/locale/gl/LC_MESSAGES/TagSub.po
new file mode 100644
index 0000000000..aeeb2fc0e6
--- /dev/null
+++ b/plugins/TagSub/locale/gl/LC_MESSAGES/TagSub.po
@@ -0,0 +1,149 @@
+# Translation of StatusNet - TagSub to Galician (galego)
+# Exported from translatewiki.net
+#
+# Author: Toliño
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - TagSub\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:15+0000\n"
+"Language-Team: Galician <https://translatewiki.net/wiki/Portal:gl>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-12-03 13:51:31+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: gl\n"
+"X-Message-Group: #out-statusnet-plugin-tagsub\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Form legend.
+msgid "Unsubscribe from this tag"
+msgstr "Cancelar a subscrición a esta etiqueta"
+
+#. TRANS: Submit button text to unsubscribe from a tag.
+msgctxt "BUTTON"
+msgid "Unsubscribe"
+msgstr "Cancelar a subscrición"
+
+#. TRANS: Submit button title to unsubscribe from a tag.
+msgid "Unsubscribe from this tag."
+msgstr "Cancelar a subscrición a esta etiqueta."
+
+#. TRANS: Plugin description.
+msgid "Plugin to allow following all messages with a given tag."
+msgstr ""
+"Complemento para permitir seguir todas as mensaxes cunha etiqueta "
+"especificada."
+
+#. TRANS: SubMirror plugin menu item on user settings page.
+msgctxt "MENU"
+msgid "Tags"
+msgstr "Etiquetas"
+
+#. TRANS: SubMirror plugin tooltip for user settings menu item.
+msgid "Configure tag subscriptions"
+msgstr "Configurar as subscricións ás etiquetas"
+
+#. TRANS: Menu item text for tags submenu.
+msgid "Tags"
+msgstr "Etiquetas"
+
+#. TRANS: Form legend.
+msgid "Subscribe to this tag"
+msgstr "Subscribirse a esta etiqueta"
+
+#. TRANS: Submit button text to subscribe to a tag.
+msgctxt "BUTTON"
+msgid "Subscribe"
+msgstr "Subscribirse"
+
+#. TRANS: Submit button title to subscribe to a tag.
+msgid "Subscribe to this tag."
+msgstr "Subscribirse a esta etiqueta."
+
+#. TRANS: Page title when tag unsubscription succeeded.
+msgid "Unsubscribed"
+msgstr "Cancelouse a subscrición"
+
+#. TRANS: Client error displayed trying to perform any request method other than POST.
+#. TRANS: Do not translate POST.
+msgid "This action only accepts POST requests."
+msgstr "Esta acción só permite solicitudes POST."
+
+#. TRANS: Client error displayed when the session token is not okay.
+msgid "There was a problem with your session token. Try again, please."
+msgstr "Houbo un erro co seu pase. Inténteo de novo."
+
+#. TRANS: Error message displayed when trying to perform an action that requires a logged in user.
+msgid "Not logged in."
+msgstr "Non iniciou sesión."
+
+#. TRANS: Client error displayed trying to subscribe to a non-existing profile.
+msgid "No such profile."
+msgstr "Non existe ese perfil."
+
+#. TRANS: Page title when tag subscription succeeded.
+msgid "Subscribed"
+msgstr "Subscrito"
+
+#. TRANS: Header for subscriptions overview for a user (first page).
+#. TRANS: %s is a user nickname.
+#, php-format
+msgid "%s's tag subscriptions"
+msgstr "Subscricións a etiquetas de %s"
+
+#. TRANS: Header for subscriptions overview for a user (not first page).
+#. TRANS: %1$s is a user nickname, %2$d is the page number.
+#, php-format
+msgid "%1$s's tag subscriptions, page %2$d"
+msgstr "Subscricións a etiquetas de %1$s, páxina %2$d"
+
+#. TRANS: Page notice for page with an overview of all tag subscriptions
+#. TRANS: of the logged in user's own profile.
+msgid ""
+"You have subscribed to receive all notices on this site containing the "
+"following tags:"
+msgstr ""
+"Subscribiuse para recibir todas as notas do sitio que conteñan as seguintes "
+"etiquetas:"
+
+#. TRANS: Page notice for page with an overview of all subscriptions of a user other
+#. TRANS: than the logged in user. %s is the user nickname.
+#, php-format
+msgid ""
+"%s has subscribed to receive all notices on this site containing the "
+"following tags:"
+msgstr ""
+"%s subscribiuse para recibir todas as notas do sitio que conteñan as "
+"seguintes etiquetas:"
+
+#. TRANS: Tag subscription list text when the logged in user has no tag subscriptions.
+msgid ""
+"You are not listening to any hash tags right now. You can push the "
+"\"Subscribe\" button on any hashtag page to automatically receive any public "
+"messages on this site that use that tag, even if you are not subscribed to "
+"the poster."
+msgstr ""
+"Non está a seguir ningunha etiqueta nestes intres. Pode premer no botón "
+"\"Subscribirse\" de calquera páxina dalgunha etiqueta para recibir "
+"automaticamente calquera mensaxe pública deste sitio que use esa etiqueta, "
+"mesmo se non está subscrito ao autor."
+
+#. TRANS: Tag subscription list text when looking at the subscriptions for a of a user other
+#. TRANS: than the logged in user that has no tag subscriptions. %s is the user nickname.
+#. TRANS: Subscription list text when looking at the subscriptions for a of a user that has none
+#. TRANS: as an anonymous user. %s is the user nickname.
+#, php-format
+msgid "%s is not following any tags."
+msgstr "%s non segue etiqueta ningunha."
+
+#. TRANS: %1$s is a URL to a tag, %2$s is a tag,
+#. TRANS: %3$s a date string.
+#, php-format
+msgid "#<a href=\"%1$s\">%2$s</a> since %3$s"
+msgstr "#<a href=\"%1$s\">%2$s</a> desde %3$s"
diff --git a/plugins/TagSub/locale/ia/LC_MESSAGES/TagSub.po b/plugins/TagSub/locale/ia/LC_MESSAGES/TagSub.po
index d21ad4a239..ca82002594 100644
--- a/plugins/TagSub/locale/ia/LC_MESSAGES/TagSub.po
+++ b/plugins/TagSub/locale/ia/LC_MESSAGES/TagSub.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - TagSub to Interlingua (Interlingua)
+# Translation of StatusNet - TagSub to Interlingua (interlingua)
 # Exported from translatewiki.net
 #
 # Author: McDutchie
@@ -9,25 +9,31 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TagSub\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:35+0000\n"
-"Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:15+0000\n"
+"Language-Team: Interlingua <https://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-12-03 13:51:31+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-tagsub\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Form legend.
 msgid "Unsubscribe from this tag"
 msgstr "Cancellar subscription a iste etiquetta"
 
+#. TRANS: Submit button text to unsubscribe from a tag.
 msgctxt "BUTTON"
 msgid "Unsubscribe"
 msgstr "Cancellar subscription"
 
+#. TRANS: Submit button title to unsubscribe from a tag.
+msgid "Unsubscribe from this tag."
+msgstr "Cancellar subscription a iste etiquetta."
+
 #. TRANS: Plugin description.
 msgid "Plugin to allow following all messages with a given tag."
 msgstr ""
@@ -43,16 +49,23 @@ msgstr "Etiquettas"
 msgid "Configure tag subscriptions"
 msgstr "Configurar subscriptiones a etiquettas"
 
+#. TRANS: Menu item text for tags submenu.
 msgid "Tags"
 msgstr "Etiquettas"
 
+#. TRANS: Form legend.
 msgid "Subscribe to this tag"
 msgstr "Subscriber a iste etiquetta"
 
+#. TRANS: Submit button text to subscribe to a tag.
 msgctxt "BUTTON"
 msgid "Subscribe"
 msgstr "Subscriber"
 
+#. TRANS: Submit button title to subscribe to a tag.
+msgid "Subscribe to this tag."
+msgstr "Subscriber a iste etiquetta."
+
 #. TRANS: Page title when tag unsubscription succeeded.
 msgid "Unsubscribed"
 msgstr "Subscription cancellate"
@@ -126,9 +139,11 @@ msgstr ""
 #. TRANS: Subscription list text when looking at the subscriptions for a of a user that has none
 #. TRANS: as an anonymous user. %s is the user nickname.
 #, php-format
-msgid "%s is not listening to any tags."
+msgid "%s is not following any tags."
 msgstr "%s non seque alcun etiquetta."
 
+#. TRANS: %1$s is a URL to a tag, %2$s is a tag,
+#. TRANS: %3$s a date string.
 #, php-format
-msgid "#<a href=\"%s\">%s</a> since %s"
-msgstr "#<a href=\"%s\">%s</a> depost %s"
+msgid "#<a href=\"%1$s\">%2$s</a> since %3$s"
+msgstr "#<a href=\"%1$s\">%2$s</a> depost %3$s"
diff --git a/plugins/TagSub/locale/mk/LC_MESSAGES/TagSub.po b/plugins/TagSub/locale/mk/LC_MESSAGES/TagSub.po
index 372e7001f8..0375f945f8 100644
--- a/plugins/TagSub/locale/mk/LC_MESSAGES/TagSub.po
+++ b/plugins/TagSub/locale/mk/LC_MESSAGES/TagSub.po
@@ -1,7 +1,8 @@
-# Translation of StatusNet - TagSub to Macedonian (Македон�ки)
+# Translation of StatusNet - TagSub to Macedonian (македон�ки)
 # Exported from translatewiki.net
 #
 # Author: Bjankuloski06
+# Author: Rancher
 # --
 # This file is distributed under the same license as the StatusNet package.
 #
@@ -9,25 +10,31 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TagSub\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:35+0000\n"
-"Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:16+0000\n"
+"Language-Team: Macedonian <https://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-12-03 13:51:31+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-tagsub\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
 
+#. TRANS: Form legend.
 msgid "Unsubscribe from this tag"
 msgstr "Отпиши �е од ознакава"
 
+#. TRANS: Submit button text to unsubscribe from a tag.
 msgctxt "BUTTON"
 msgid "Unsubscribe"
 msgstr "Откажи претплата"
 
+#. TRANS: Submit button title to unsubscribe from a tag.
+msgid "Unsubscribe from this tag."
+msgstr "Отпиши �е од ознакава."
+
 #. TRANS: Plugin description.
 msgid "Plugin to allow following all messages with a given tag."
 msgstr "Приклучок што овозможува да ги �ледите �ите пораки �о изве�на ознака."
@@ -41,16 +48,23 @@ msgstr "Ознаки"
 msgid "Configure tag subscriptions"
 msgstr "�агоди претплата на ознаки"
 
+#. TRANS: Menu item text for tags submenu.
 msgid "Tags"
 msgstr "Ознаки"
 
+#. TRANS: Form legend.
 msgid "Subscribe to this tag"
 msgstr "Претплати �е на ознакава"
 
+#. TRANS: Submit button text to subscribe to a tag.
 msgctxt "BUTTON"
 msgid "Subscribe"
 msgstr "Претплати �е"
 
+#. TRANS: Submit button title to subscribe to a tag.
+msgid "Subscribe to this tag."
+msgstr "Претплати �е на ознакава."
+
 #. TRANS: Page title when tag unsubscription succeeded.
 msgid "Unsubscribed"
 msgstr "Претплатено"
@@ -124,9 +138,11 @@ msgstr ""
 #. TRANS: Subscription list text when looking at the subscriptions for a of a user that has none
 #. TRANS: as an anonymous user. %s is the user nickname.
 #, php-format
-msgid "%s is not listening to any tags."
-msgstr "%s не �луша никакви ознаки."
+msgid "%s is not following any tags."
+msgstr "%s не �леди никакви ознаки."
 
+#. TRANS: %1$s is a URL to a tag, %2$s is a tag,
+#. TRANS: %3$s a date string.
 #, php-format
-msgid "#<a href=\"%s\">%s</a> since %s"
-msgstr "#<a href=\"%s\">%s</a> од %s"
+msgid "#<a href=\"%1$s\">%2$s</a> since %3$s"
+msgstr "#<a href=\"%1$s\">%2$s</a> од %3$s"
diff --git a/plugins/TagSub/locale/ms/LC_MESSAGES/TagSub.po b/plugins/TagSub/locale/ms/LC_MESSAGES/TagSub.po
index a62fee842c..d3ff313f95 100644
--- a/plugins/TagSub/locale/ms/LC_MESSAGES/TagSub.po
+++ b/plugins/TagSub/locale/ms/LC_MESSAGES/TagSub.po
@@ -9,25 +9,31 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TagSub\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:35+0000\n"
+"POT-Creation-Date: 2011-06-18 15:54+0000\n"
+"PO-Revision-Date: 2011-06-18 15:57:46+0000\n"
 "Language-Team: Malay <http://translatewiki.net/wiki/Portal:ms>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
+"X-POT-Import-Date: 2011-06-05 21:52:06+0000\n"
+"X-Generator: MediaWiki 1.19alpha (r90318); Translate extension (2011-06-02)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ms\n"
 "X-Message-Group: #out-statusnet-plugin-tagsub\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#. TRANS: Form legend.
 msgid "Unsubscribe from this tag"
 msgstr ""
 
+#. TRANS: Submit button text to unsubscribe from a tag.
 msgctxt "BUTTON"
 msgid "Unsubscribe"
 msgstr "Berhenti melanggan"
 
+#. TRANS: Submit button title to unsubscribe from a tag.
+msgid "Unsubscribe from this tag."
+msgstr ""
+
 #. TRANS: Plugin description.
 msgid "Plugin to allow following all messages with a given tag."
 msgstr ""
@@ -41,17 +47,24 @@ msgstr "Tag"
 msgid "Configure tag subscriptions"
 msgstr ""
 
+#. TRANS: Menu item text for tags submenu.
 #, fuzzy
 msgid "Tags"
 msgstr "Tag"
 
+#. TRANS: Form legend.
 msgid "Subscribe to this tag"
 msgstr ""
 
+#. TRANS: Submit button text to subscribe to a tag.
 msgctxt "BUTTON"
 msgid "Subscribe"
 msgstr ""
 
+#. TRANS: Submit button title to subscribe to a tag.
+msgid "Subscribe to this tag."
+msgstr ""
+
 #. TRANS: Page title when tag unsubscription succeeded.
 msgid "Unsubscribed"
 msgstr "Langganan dihentikan."
@@ -116,10 +129,12 @@ msgstr ""
 #. TRANS: than the logged in user that has no tag subscriptions. %s is the user nickname.
 #. TRANS: Subscription list text when looking at the subscriptions for a of a user that has none
 #. TRANS: as an anonymous user. %s is the user nickname.
-#, php-format
-msgid "%s is not listening to any tags."
+#, fuzzy, php-format
+msgid "%s is not following any tags."
 msgstr "%s tidak mendengari mana-mana tag pun."
 
-#, php-format
-msgid "#<a href=\"%s\">%s</a> since %s"
+#. TRANS: %1$s is a URL to a tag, %2$s is a tag,
+#. TRANS: %3$s a date string.
+#, fuzzy, php-format
+msgid "#<a href=\"%1$s\">%2$s</a> since %3$s"
 msgstr "#<a href=\"%s\">%s</a> sejak %s"
diff --git a/plugins/TagSub/locale/nl/LC_MESSAGES/TagSub.po b/plugins/TagSub/locale/nl/LC_MESSAGES/TagSub.po
index f6a790fdcd..d12f3db98b 100644
--- a/plugins/TagSub/locale/nl/LC_MESSAGES/TagSub.po
+++ b/plugins/TagSub/locale/nl/LC_MESSAGES/TagSub.po
@@ -9,25 +9,31 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TagSub\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:35+0000\n"
-"Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:16+0000\n"
+"Language-Team: Dutch <https://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-12-03 13:51:31+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-tagsub\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Form legend.
 msgid "Unsubscribe from this tag"
 msgstr "Abonnement op dit label beëindigen"
 
+#. TRANS: Submit button text to unsubscribe from a tag.
 msgctxt "BUTTON"
 msgid "Unsubscribe"
 msgstr "Uitschrijven"
 
+#. TRANS: Submit button title to unsubscribe from a tag.
+msgid "Unsubscribe from this tag."
+msgstr "Het abonnement op dit label beëindigen."
+
 #. TRANS: Plugin description.
 msgid "Plugin to allow following all messages with a given tag."
 msgstr ""
@@ -43,16 +49,23 @@ msgstr "Labels"
 msgid "Configure tag subscriptions"
 msgstr "Labelabonnementen instellen"
 
+#. TRANS: Menu item text for tags submenu.
 msgid "Tags"
 msgstr "Labels"
 
+#. TRANS: Form legend.
 msgid "Subscribe to this tag"
 msgstr "Op dit label abonneren"
 
+#. TRANS: Submit button text to subscribe to a tag.
 msgctxt "BUTTON"
 msgid "Subscribe"
 msgstr "Abonneren"
 
+#. TRANS: Submit button title to subscribe to a tag.
+msgid "Subscribe to this tag."
+msgstr "Op dit label abonneren."
+
 #. TRANS: Page title when tag unsubscription succeeded.
 msgid "Unsubscribed"
 msgstr "Het abonnement is opgezegd"
@@ -128,9 +141,11 @@ msgstr ""
 #. TRANS: Subscription list text when looking at the subscriptions for a of a user that has none
 #. TRANS: as an anonymous user. %s is the user nickname.
 #, php-format
-msgid "%s is not listening to any tags."
+msgid "%s is not following any tags."
 msgstr "%s heeft geen labelabonnementen."
 
+#. TRANS: %1$s is a URL to a tag, %2$s is a tag,
+#. TRANS: %3$s a date string.
 #, php-format
-msgid "#<a href=\"%s\">%s</a> since %s"
-msgstr "#<a href=\"%s\">%s</a> sinds %s"
+msgid "#<a href=\"%1$s\">%2$s</a> since %3$s"
+msgstr "#<a href=\"%1$s\">%2$s</a> sinds %3$s"
diff --git a/plugins/TagSub/locale/sr-ec/LC_MESSAGES/TagSub.po b/plugins/TagSub/locale/sr-ec/LC_MESSAGES/TagSub.po
index 4090e19dbe..c2b03dcfc0 100644
--- a/plugins/TagSub/locale/sr-ec/LC_MESSAGES/TagSub.po
+++ b/plugins/TagSub/locale/sr-ec/LC_MESSAGES/TagSub.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - TagSub to Serbian Cyrillic ekavian (‪Срп�ки (ћирилица)‬)
+# Translation of StatusNet - TagSub to Serbian (Cyrillic script) (‪�рп�ки (ћирилица)‬)
 # Exported from translatewiki.net
 #
 # Author: Rancher
@@ -9,26 +9,32 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TagSub\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:35+0000\n"
-"Language-Team: Serbian Cyrillic ekavian <http://translatewiki.net/wiki/"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:16+0000\n"
+"Language-Team: Serbian (Cyrillic script) <https://translatewiki.net/wiki/"
 "Portal:sr-ec>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-12-03 13:51:31+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: sr-ec\n"
 "X-Message-Group: #out-statusnet-plugin-tagsub\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Form legend.
 msgid "Unsubscribe from this tag"
 msgstr "Одјави ме � ове ознаке"
 
+#. TRANS: Submit button text to unsubscribe from a tag.
 msgctxt "BUTTON"
 msgid "Unsubscribe"
 msgstr "Одјави ме"
 
+#. TRANS: Submit button title to unsubscribe from a tag.
+msgid "Unsubscribe from this tag."
+msgstr "Одјави ме � ове ознаке"
+
 #. TRANS: Plugin description.
 msgid "Plugin to allow following all messages with a given tag."
 msgstr "Прикључак за праћење �вих порука � датом ознаком."
@@ -42,16 +48,23 @@ msgstr "Ознаке"
 msgid "Configure tag subscriptions"
 msgstr "Поде�и пријаве за ознаку"
 
+#. TRANS: Menu item text for tags submenu.
 msgid "Tags"
 msgstr "Ознаке"
 
+#. TRANS: Form legend.
 msgid "Subscribe to this tag"
 msgstr "Пријави ме на ову ознаку"
 
+#. TRANS: Submit button text to subscribe to a tag.
 msgctxt "BUTTON"
 msgid "Subscribe"
 msgstr "Пријави ме"
 
+#. TRANS: Submit button title to subscribe to a tag.
+msgid "Subscribe to this tag."
+msgstr "Пријави ме на ову ознаку"
+
 #. TRANS: Page title when tag unsubscription succeeded.
 msgid "Unsubscribed"
 msgstr "Одјави ме"
@@ -126,9 +139,11 @@ msgstr ""
 #. TRANS: Subscription list text when looking at the subscriptions for a of a user that has none
 #. TRANS: as an anonymous user. %s is the user nickname.
 #, php-format
-msgid "%s is not listening to any tags."
-msgstr "%s не �луша ниједну ознаку."
+msgid "%s is not following any tags."
+msgstr "%s не прати ниједну ознаку."
 
+#. TRANS: %1$s is a URL to a tag, %2$s is a tag,
+#. TRANS: %3$s a date string.
 #, php-format
-msgid "#<a href=\"%s\">%s</a> since %s"
-msgstr "#<a href=\"%s\">%s</a> од %s"
+msgid "#<a href=\"%1$s\">%2$s</a> since %3$s"
+msgstr "#<a href=\"%1$s\">%2$s</a> од %3$s"
diff --git a/plugins/TagSub/locale/te/LC_MESSAGES/TagSub.po b/plugins/TagSub/locale/te/LC_MESSAGES/TagSub.po
index 3b326d4ef4..2015c28688 100644
--- a/plugins/TagSub/locale/te/LC_MESSAGES/TagSub.po
+++ b/plugins/TagSub/locale/te/LC_MESSAGES/TagSub.po
@@ -9,25 +9,32 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TagSub\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:35+0000\n"
-"Language-Team: Telugu <http://translatewiki.net/wiki/Portal:te>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:16+0000\n"
+"Language-Team: Telugu <https://translatewiki.net/wiki/Portal:te>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-12-03 13:51:31+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: te\n"
 "X-Message-Group: #out-statusnet-plugin-tagsub\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Form legend.
 msgid "Unsubscribe from this tag"
 msgstr "ఈ ట�యాగ�కి చందావిరమించండి"
 
+#. TRANS: Submit button text to unsubscribe from a tag.
 msgctxt "BUTTON"
 msgid "Unsubscribe"
 msgstr "చందావిరమించ�"
 
+#. TRANS: Submit button title to unsubscribe from a tag.
+#, fuzzy
+msgid "Unsubscribe from this tag."
+msgstr "ఈ ట�యాగ�కి చందావిరమించండి"
+
 #. TRANS: Plugin description.
 msgid "Plugin to allow following all messages with a given tag."
 msgstr ""
@@ -41,16 +48,24 @@ msgstr "ట�యాగ�ల�"
 msgid "Configure tag subscriptions"
 msgstr ""
 
+#. TRANS: Menu item text for tags submenu.
 msgid "Tags"
 msgstr "ట�యాగ�ల�"
 
+#. TRANS: Form legend.
 msgid "Subscribe to this tag"
 msgstr "ఈ ఈట�యాగ�కి చందా చేరండి"
 
+#. TRANS: Submit button text to subscribe to a tag.
 msgctxt "BUTTON"
 msgid "Subscribe"
 msgstr "చందాచేర�"
 
+#. TRANS: Submit button title to subscribe to a tag.
+#, fuzzy
+msgid "Subscribe to this tag."
+msgstr "ఈ ఈట�యాగ�కి చందా చేరండి"
+
 #. TRANS: Page title when tag unsubscription succeeded.
 msgid "Unsubscribed"
 msgstr "చందావిరమించార�"
@@ -116,9 +131,11 @@ msgstr ""
 #. TRANS: Subscription list text when looking at the subscriptions for a of a user that has none
 #. TRANS: as an anonymous user. %s is the user nickname.
 #, php-format
-msgid "%s is not listening to any tags."
+msgid "%s is not following any tags."
 msgstr ""
 
-#, php-format
-msgid "#<a href=\"%s\">%s</a> since %s"
+#. TRANS: %1$s is a URL to a tag, %2$s is a tag,
+#. TRANS: %3$s a date string.
+#, fuzzy, php-format
+msgid "#<a href=\"%1$s\">%2$s</a> since %3$s"
 msgstr "#<a href=\"%s\">%s</a> %s న�ండి"
diff --git a/plugins/TagSub/locale/tl/LC_MESSAGES/TagSub.po b/plugins/TagSub/locale/tl/LC_MESSAGES/TagSub.po
index f963563b6e..0b3bc90c6d 100644
--- a/plugins/TagSub/locale/tl/LC_MESSAGES/TagSub.po
+++ b/plugins/TagSub/locale/tl/LC_MESSAGES/TagSub.po
@@ -9,25 +9,31 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TagSub\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:35+0000\n"
-"Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:16+0000\n"
+"Language-Team: Tagalog <https://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-12-03 13:51:31+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-tagsub\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Form legend.
 msgid "Unsubscribe from this tag"
 msgstr "Huwag nang magpasipi mula sa tatak na ito"
 
+#. TRANS: Submit button text to unsubscribe from a tag.
 msgctxt "BUTTON"
 msgid "Unsubscribe"
 msgstr "Pahintuin na ang pagtanggap ng sipi"
 
+#. TRANS: Submit button title to unsubscribe from a tag.
+msgid "Unsubscribe from this tag."
+msgstr "Huwag nang sumipi mula sa tatak na ito."
+
 #. TRANS: Plugin description.
 msgid "Plugin to allow following all messages with a given tag."
 msgstr ""
@@ -43,16 +49,23 @@ msgstr "Mga tatak"
 msgid "Configure tag subscriptions"
 msgstr "Isaayos ang mga pagpapasipi ng tatak"
 
+#. TRANS: Menu item text for tags submenu.
 msgid "Tags"
 msgstr "Mga tatak"
 
+#. TRANS: Form legend.
 msgid "Subscribe to this tag"
 msgstr "Magpasipi para sa tatak na ito"
 
+#. TRANS: Submit button text to subscribe to a tag.
 msgctxt "BUTTON"
 msgid "Subscribe"
 msgstr "Pumayag na tumanggap ng sipi"
 
+#. TRANS: Submit button title to subscribe to a tag.
+msgid "Subscribe to this tag."
+msgstr "Sumipi mula sa tatak na ito."
+
 #. TRANS: Page title when tag unsubscription succeeded.
 msgid "Unsubscribed"
 msgstr "Hindi na nagpapasipi"
@@ -128,9 +141,11 @@ msgstr ""
 #. TRANS: Subscription list text when looking at the subscriptions for a of a user that has none
 #. TRANS: as an anonymous user. %s is the user nickname.
 #, php-format
-msgid "%s is not listening to any tags."
-msgstr "Si %s ay hindi nakikinig sa anumang mga tatak."
+msgid "%s is not following any tags."
+msgstr "Hindi sinusundan ni %s ang anumang mga tatak."
 
+#. TRANS: %1$s is a URL to a tag, %2$s is a tag,
+#. TRANS: %3$s a date string.
 #, php-format
-msgid "#<a href=\"%s\">%s</a> since %s"
-msgstr "#<a href=\"%s\">%s</a> magmula noong %s"
+msgid "#<a href=\"%1$s\">%2$s</a> since %3$s"
+msgstr "#<a href=\"%1$s\">%2$s</a> magmula pa noong %3$s"
diff --git a/plugins/TagSub/locale/uk/LC_MESSAGES/TagSub.po b/plugins/TagSub/locale/uk/LC_MESSAGES/TagSub.po
index fd9e5d7a57..09223782a7 100644
--- a/plugins/TagSub/locale/uk/LC_MESSAGES/TagSub.po
+++ b/plugins/TagSub/locale/uk/LC_MESSAGES/TagSub.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - TagSub to Ukrainian (Україн�ька)
+# Translation of StatusNet - TagSub to Ukrainian (україн�ька)
 # Exported from translatewiki.net
 #
 # Author: Boogie
@@ -9,26 +9,33 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TagSub\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:35+0000\n"
-"Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:16+0000\n"
+"Language-Team: Ukrainian <https://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-12-03 13:51:31+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-tagsub\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
+#. TRANS: Form legend.
 msgid "Unsubscribe from this tag"
 msgstr "Відпи�ати�� від цього теґу"
 
+#. TRANS: Submit button text to unsubscribe from a tag.
 msgctxt "BUTTON"
 msgid "Unsubscribe"
 msgstr "Відпи�ати�ь"
 
+#. TRANS: Submit button title to unsubscribe from a tag.
+#, fuzzy
+msgid "Unsubscribe from this tag."
+msgstr "Відпи�ати�� від цього теґу"
+
 #. TRANS: Plugin description.
 msgid "Plugin to allow following all messages with a given tag."
 msgstr "Додаток, �кий дозвол�є від�лідковувати допи�и позначені певним теґом"
@@ -42,16 +49,24 @@ msgstr "Теґи"
 msgid "Configure tag subscriptions"
 msgstr "�алаштуванн� підпи�ок на теґи"
 
+#. TRANS: Menu item text for tags submenu.
 msgid "Tags"
 msgstr "Теґи"
 
+#. TRANS: Form legend.
 msgid "Subscribe to this tag"
 msgstr "Підпи�ати�� на цей теґ"
 
+#. TRANS: Submit button text to subscribe to a tag.
 msgctxt "BUTTON"
 msgid "Subscribe"
 msgstr "Підпи�ати�ь"
 
+#. TRANS: Submit button title to subscribe to a tag.
+#, fuzzy
+msgid "Subscribe to this tag."
+msgstr "Підпи�ати�� на цей теґ"
+
 #. TRANS: Page title when tag unsubscription succeeded.
 msgid "Unsubscribed"
 msgstr "Відпи�ано"
@@ -122,10 +137,12 @@ msgstr ""
 #. TRANS: than the logged in user that has no tag subscriptions. %s is the user nickname.
 #. TRANS: Subscription list text when looking at the subscriptions for a of a user that has none
 #. TRANS: as an anonymous user. %s is the user nickname.
-#, php-format
-msgid "%s is not listening to any tags."
+#, fuzzy, php-format
+msgid "%s is not following any tags."
 msgstr "%s не підпи�аний до жодних тегів"
 
-#, php-format
-msgid "#<a href=\"%s\">%s</a> since %s"
+#. TRANS: %1$s is a URL to a tag, %2$s is a tag,
+#. TRANS: %3$s a date string.
+#, fuzzy, php-format
+msgid "#<a href=\"%1$s\">%2$s</a> since %3$s"
 msgstr "#<a href=\"%s\">%s</a> прот�гом %s"
diff --git a/plugins/TagSub/tagsubform.php b/plugins/TagSub/tagsubform.php
index 169ccc4adb..22eed25801 100644
--- a/plugins/TagSub/tagsubform.php
+++ b/plugins/TagSub/tagsubform.php
@@ -46,13 +46,11 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
  *
  * @see      UnsubscribeForm
  */
-
 class TagSubForm extends Form
 {
     /**
      * Name of tag to subscribe to
      */
-
     var $tag = '';
 
     /**
@@ -61,7 +59,6 @@ class TagSubForm extends Form
      * @param HTMLOutputter $out     output channel
      * @param string        $tag     name of tag to subscribe to
      */
-
     function __construct($out=null, $tag=null)
     {
         parent::__construct($out);
@@ -74,38 +71,32 @@ class TagSubForm extends Form
      *
      * @return int ID of the form
      */
-
     function id()
     {
         return 'tag-subscribe-' . $this->tag;
     }
 
-
     /**
      * class of the form
      *
      * @return string of the form class
      */
-
     function formClass()
     {
         // class to match existing styles...
         return 'form_user_subscribe ajax';
     }
 
-
     /**
      * Action of the form
      *
      * @return string URL of the action
      */
-
     function action()
     {
         return common_local_url('tagsub', array('tag' => $this->tag));
     }
 
-
     /**
      * Legend of the Form
      *
@@ -113,6 +104,7 @@ class TagSubForm extends Form
      */
     function formLegend()
     {
+        // TRANS: Form legend.
         $this->out->element('legend', null, _m('Subscribe to this tag'));
     }
 
@@ -121,7 +113,6 @@ class TagSubForm extends Form
      *
      * @return void
      */
-
     function formData()
     {
         $this->out->hidden('subscribeto-' . $this->tag,
@@ -134,9 +125,11 @@ class TagSubForm extends Form
      *
      * @return void
      */
-
     function formActions()
     {
-        $this->out->submit('submit', _m('BUTTON','Subscribe'), 'submit', null, _m('Subscribe to this tag'));
+        // TRANS: Submit button text to subscribe to a tag.
+        $this->out->submit('submit', _m('BUTTON','Subscribe'),
+                           // TRANS: Submit button title to subscribe to a tag.
+                           'submit', null, _m('Subscribe to this tag.'));
     }
 }
diff --git a/plugins/TagSub/tagsubmenu.php b/plugins/TagSub/tagsubmenu.php
index e57a8a8a97..01fa372dd9 100644
--- a/plugins/TagSub/tagsubmenu.php
+++ b/plugins/TagSub/tagsubmenu.php
@@ -4,7 +4,7 @@
  * Copyright (C) 2011, StatusNet, Inc.
  *
  * Menu to show tags you're subscribed to
- * 
+ *
  * PHP version 5
  *
  * This program is free software: you can redistribute it and/or modify
@@ -44,8 +44,7 @@ if (!defined('STATUSNET')) {
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
  * @link      http://status.net/
  */
-
-class TagSubMenu extends Menu
+class TagSubMenu extends MoreMenu
 {
     protected $user;
     protected $tags;
@@ -57,22 +56,33 @@ class TagSubMenu extends Menu
         $this->tags = $tags;
     }
 
-    function show()
+    function getItems()
     {
-        $this->out->elementStart('ul', array('class' => 'nav'));
-
+        $items = array();
+        
         foreach ($this->tags as $tag) {
             if (!empty($tag)) {
-                $this->out->menuItem(common_local_url('tag',
-                                                      array('tag' => $tag)),
-                                     sprintf('#%s', $tag),
-                                     sprintf(_('Notices tagged with %s'), $tag),
-                                     $this->actionName == 'tag' && $this->action->arg('tag') == $tag,
-                                     'nav_streams_tag_'.$tag);
+                $items[] = array('tag',
+                                 array('tag' => $tag),
+                                 sprintf('#%s', $tag),
+                                 // TRANS: Menu item title. %s is a tag.
+                                 sprintf(_('Notices tagged with "%s".'), $tag));
             }
         }
 
-        $this->out->elementEnd('ul');
+        return $items;
+    }
+
+    function tag()
+    {
+        return 'tagsubs';
     }
     
+    function seeAllItem()
+    {
+        return array('tagsubs',
+                     array('nickname' => $this->user->nickname),
+                     _('See all'),
+                     _('See all tags you are following'));
+    }
 }
diff --git a/plugins/TagSub/tagsubsaction.php b/plugins/TagSub/tagsubsaction.php
index 21ddf5035f..be195250f6 100644
--- a/plugins/TagSub/tagsubsaction.php
+++ b/plugins/TagSub/tagsubsaction.php
@@ -116,18 +116,18 @@ class TagSubsAction extends GalleryAction
             if ($this->user->id === $current_user->id) {
                 // TRANS: Tag subscription list text when the logged in user has no tag subscriptions.
                 $message = _m('You are not listening to any hash tags right now. You can push the "Subscribe" button ' .
-                             'on any hashtag page to automatically receive any public messages on this site that use that ' .
-                             'tag, even if you are not subscribed to the poster.');
+                              'on any hashtag page to automatically receive any public messages on this site that use that ' .
+                              'tag, even if you are not subscribed to the poster.');
             } else {
                 // TRANS: Tag subscription list text when looking at the subscriptions for a of a user other
                 // TRANS: than the logged in user that has no tag subscriptions. %s is the user nickname.
-                $message = sprintf(_m('%s is not listening to any tags.'), $this->user->nickname);
+                $message = sprintf(_m('%s is not following any tags.'), $this->user->nickname);
             }
         }
         else {
             // TRANS: Subscription list text when looking at the subscriptions for a of a user that has none
             // TRANS: as an anonymous user. %s is the user nickname.
-            $message = sprintf(_m('%s is not listening to any tags.'), $this->user->nickname);
+            $message = sprintf(_m('%s is not following any tags.'), $this->user->nickname);
         }
 
         $this->elementStart('div', 'guide');
@@ -163,9 +163,11 @@ class TagSubscriptionsListItem extends SubscriptionListItem
         if (!empty($cur) && $cur->id == $this->owner->id) {
             $this->showOwnerControls();
         }
-        
+
         $url = common_local_url('tag', array('tag' => $tag));
-        $linkline = sprintf(_m('#<a href="%s">%s</a> since %s'),
+        // TRANS: %1$s is a URL to a tag, %2$s is a tag,
+        // TRANS: %3$s a date string.
+        $linkline = sprintf(_m('#<a href="%1$s">%2$s</a> since %3$s'),
                             htmlspecialchars($url),
                             htmlspecialchars($tag),
                             common_date_string($tagsub->created));
diff --git a/plugins/TagSub/tagunsubform.php b/plugins/TagSub/tagunsubform.php
index d26e99a3e5..6bec4b0ce1 100644
--- a/plugins/TagSub/tagunsubform.php
+++ b/plugins/TagSub/tagunsubform.php
@@ -46,7 +46,6 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
  *
  * @see      UnsubscribeForm
  */
-
 class TagUnsubForm extends TagSubForm
 {
     /**
@@ -54,38 +53,32 @@ class TagUnsubForm extends TagSubForm
      *
      * @return int ID of the form
      */
-
     function id()
     {
         return 'tag-unsubscribe-' . $this->tag;
     }
 
-
     /**
      * class of the form
      *
      * @return string of the form class
      */
-
     function formClass()
     {
         // class to match existing styles...
         return 'form_user_unsubscribe ajax';
     }
 
-
     /**
      * Action of the form
      *
      * @return string URL of the action
      */
-
     function action()
     {
         return common_local_url('tagunsub', array('tag' => $this->tag));
     }
 
-
     /**
      * Legend of the Form
      *
@@ -93,6 +86,7 @@ class TagUnsubForm extends TagSubForm
      */
     function formLegend()
     {
+        // TRANS: Form legend.
         $this->out->element('legend', null, _m('Unsubscribe from this tag'));
     }
 
@@ -101,9 +95,11 @@ class TagUnsubForm extends TagSubForm
      *
      * @return void
      */
-
     function formActions()
     {
-        $this->out->submit('submit', _m('BUTTON','Unsubscribe'), 'submit', null, _m('Unsubscribe from this tag'));
+        // TRANS: Submit button text to unsubscribe from a tag.
+        $this->out->submit('submit', _m('BUTTON','Unsubscribe'),
+                           // TRANS: Submit button title to unsubscribe from a tag.
+                           'submit', null, _m('Unsubscribe from this tag.'));
     }
 }
diff --git a/plugins/Template/TemplatePlugin.php b/plugins/Template/TemplatePlugin.php
deleted file mode 100644
index c013f9f4d1..0000000000
--- a/plugins/Template/TemplatePlugin.php
+++ /dev/null
@@ -1,357 +0,0 @@
-<?php
-/**
- * Plugin to render old skool templates
- *
- * Captures rendered parts from the output buffer, passes them through a template file: tpl/index.html
- * Adds an API method at index.php/template/update which lets you overwrite the template file
- * Requires username/password and a single POST parameter called "template"
- * The method is disabled unless the user is #1, the first user of the system
- *
- * @category  Plugin
- * @package   StatusNet
- * @author    Brian Hendrickson <brian@megapump.com>
- * @copyright 2009 Megapump, Inc.
- * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://megapump.com/
- */
-
-if (!defined('STATUSNET')) {
-    exit(1);
-}
-
-define('TEMPLATEPLUGIN_VERSION', '0.1');
-
-class TemplatePlugin extends Plugin {
-
-  var $blocks = array();
-
-  function __construct() {
-    parent::__construct();
-  }
-
-  // capture the RouterInitialized event
-  // and connect a new API method
-  // for updating the template
-  function onRouterInitialized( $m ) {
-    $m->connect( 'template/update', array(
-      'action'      => 'template',
-    ));
-  }
-
-  // <%styles%>
-  // <%scripts%>
-  // <%search%>
-  // <%feeds%>
-  // <%description%>
-  // <%head%>
-  function onStartShowHead( &$act ) {
-    $this->clear_xmlWriter($act);
-    $act->extraHead();
-    $this->blocks['head'] = $act->xw->flush();
-    $act->showStylesheets();
-    $this->blocks['styles'] = $act->xw->flush();
-    $act->showScripts();
-    $this->blocks['scripts'] = $act->xw->flush();
-    $act->showFeeds();
-    $this->blocks['feeds'] = $act->xw->flush();
-    $act->showOpenSearch();
-    $this->blocks['search'] = $act->xw->flush();
-    $act->showDescription();
-    $this->blocks['description'] = $act->xw->flush();
-    return false;
-  }
-
-  // <%bodytext%>
-  function onStartShowContentBlock( &$act ) {
-    $this->clear_xmlWriter($act);
-    return true;
-  }
-  function onEndShowContentBlock( &$act ) {
-    $this->blocks['bodytext'] = $act->xw->flush();
-  }
-
-  // <%localnav%>
-  function onStartShowLocalNavBlock( &$act ) {
-    $this->clear_xmlWriter($act);
-    return true;
-  }
-  function onEndShowLocalNavBlock( &$act ) {
-    $this->blocks['localnav'] = $act->xw->flush();
-  }
-
-  // <%export%>
-  function onStartShowExportData( &$act ) {
-    $this->clear_xmlWriter($act);
-    return true;
-  }
-  function onEndShowExportData( &$act ) {
-    $this->blocks['export'] = $act->xw->flush();
-  }
-
-  // <%subscriptions%>
-  // <%subscribers%>
-  // <%groups%>
-  // <%statistics%>
-  // <%cloud%>
-  // <%groupmembers%>
-  // <%groupstatistics%>
-  // <%groupcloud%>
-  // <%popular%>
-  // <%groupsbyposts%>
-  // <%featuredusers%>
-  // <%groupsbymembers%>
-  function onStartShowSections( &$act ) {
-    global $action;
-    $this->clear_xmlWriter($act);
-    switch ($action) {
-      case "showstream":
-        $act->showSubscriptions();
-        $this->blocks['subscriptions'] = $act->xw->flush();
-        $act->showSubscribers();
-        $this->blocks['subscribers'] = $act->xw->flush();
-        $act->showGroups();
-        $this->blocks['groups'] = $act->xw->flush();
-        $act->showStatistics();
-        $this->blocks['statistics'] = $act->xw->flush();
-        $cloud = new PersonalTagCloudSection($act, $act->user);
-        $cloud->show();
-        $this->blocks['cloud'] = $act->xw->flush();
-        break;
-      case "showgroup":
-        $act->showMembers();
-        $this->blocks['groupmembers'] = $act->xw->flush();
-        $act->showStatistics();
-        $this->blocks['groupstatistics'] = $act->xw->flush();
-        $cloud = new GroupTagCloudSection($act, $act->group);
-        $cloud->show();
-        $this->blocks['groupcloud'] = $act->xw->flush();
-        break;
-      case "public":
-        $pop = new PopularNoticeSection($act);
-        $pop->show();
-        $this->blocks['popular'] = $act->xw->flush();
-        $gbp = new GroupsByPostsSection($act);
-        $gbp->show();
-        $this->blocks['groupsbyposts'] = $act->xw->flush();
-        $feat = new FeaturedUsersSection($act);
-        $feat->show();
-        $this->blocks['featuredusers'] = $act->xw->flush();
-        break;
-      case "groups":
-        $gbp = new GroupsByPostsSection($act);
-        $gbp->show();
-        $this->blocks['groupsbyposts'] = $act->xw->flush();
-        $gbm = new GroupsByMembersSection($act);
-        $gbm->show();
-        $this->blocks['groupsbymembers'] = $act->xw->flush();
-        break;
-    }
-    return false;
-  }
-
-  // <%logo%>
-  // <%nav%>
-  // <%notice%>
-  // <%noticeform%>
-  function onStartShowHeader( &$act ) {
-    $this->clear_xmlWriter($act);
-    $act->showLogo();
-    $this->blocks['logo'] = $act->xw->flush();
-    $act->showPrimaryNav();
-    $this->blocks['nav'] = $act->xw->flush();
-    $act->showSiteNotice();
-    $this->blocks['notice'] = $act->xw->flush();
-    if (common_logged_in()) {
-        $act->showNoticeForm();
-    } else {
-        $act->showAnonymousMessage();
-    }
-    $this->blocks['noticeform'] = $act->xw->flush();
-    return false;
-  }
-
-  // <%secondarynav%>
-  // <%licenses%>
-  function onStartShowFooter( &$act ) {
-    $this->clear_xmlWriter($act);
-    $act->showSecondaryNav();
-    $this->blocks['secondarynav'] = $act->xw->flush();
-    $act->showLicenses();
-    $this->blocks['licenses'] = $act->xw->flush();
-    return false;
-  }
-
-  // capture the EndHTML event
-  // and include the template
-  function onEndEndHTML($act) {
-
-    global $action, $tags;
-
-    // set the action and title values
-    $vars = array(
-      'action'=>$action,
-      'title'=>$act->title(). " - ". common_config('site', 'name')
-    );
-
-    // use the PHP template
-    // unless statusnet config:
-    //   $config['template']['mode'] = 'html';
-    if (!(common_config('template', 'mode') == 'html')) {
-      $tpl_file = $this->templateFolder() . '/index.php';
-      $tags = array_merge($vars,$this->blocks);
-      include $tpl_file;
-      return;
-    }
-
-    $tpl_file = $this->templateFolder() . '/index.html';
-
-    // read the static template
-    $output = file_get_contents( $tpl_file );
-
-    $tags = array();
-
-    // get a list of the <%tags%> in the template
-    $pattern='/<%([a-z]+)%>/';
-
-    if ( 1 <= preg_match_all( $pattern, $output, $found ))
-      $tags[] = $found;
-
-    // for each found tag, set its value from the rendered blocks
-    foreach( $tags[0][1] as $pos=>$tag ) {
-      if (isset($this->blocks[$tag]))
-        $vars[$tag] = $this->blocks[$tag];
-
-      // didn't find a block for the tag
-      elseif (!isset($vars[$tag]))
-        $vars[$tag] = '';
-    }
-
-    // replace the tags in the template
-    foreach( $vars as $key=>$val )
-      $output = str_replace( '<%'.$key.'%>', $val, $output );
-
-    echo $output;
-
-    return true;
-
-  }
-  function templateFolder() {
-    return 'tpl';
-  }
-
-  // catching the StartShowHTML event to halt the rendering
-  function onStartShowHTML( &$act ) {
-    $this->clear_xmlWriter($act);
-    return true;
-  }
-
-  // clear the xmlWriter
-  function clear_xmlWriter( &$act ) {
-    $act->xw->openMemory();
-    $act->xw->setIndent(true);
-  }
-
-}
-
-/**
- * Action for updating the template remotely
- *
- * "template/update" -- a POST method that requires a single
- * parameter "template", containing the new template code
- *
- * @category Plugin
- * @package  StatusNet
- * @author   Brian Hendrickson <brian@megapump.com>
- * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://megapump.com/
- *
- */
-
-class TemplateAction extends Action
-{
-
-  function prepare($args) {
-    parent::prepare($args);
-    return true;
-  }
-
-  function handle($args) {
-
-    parent::handle($args);
-
-    if (!isset($_SERVER['PHP_AUTH_USER'])) {
-
-      // not authenticated, show login form
-      header('WWW-Authenticate: Basic realm="StatusNet API"');
-
-      // cancelled the browser login form
-      $this->clientError(_m('Authentication error!'), $code = 401);
-
-    } else {
-
-      $nick = $_SERVER['PHP_AUTH_USER'];
-      $pass = $_SERVER['PHP_AUTH_PW'];
-
-      // check username and password
-      $user = common_check_user($nick,$pass);
-
-      if ($user) {
-
-        // verify that user is admin
-        if (!($user->id == 1))
-          $this->clientError(_m('Only User #1 can update the template.'), $code = 401);
-
-        // open the old template
-        $tpl_file = $this->templateFolder() . '/index.html';
-        $fp = fopen( $tpl_file, 'w+' );
-
-        // overwrite with the new template
-        fwrite($fp, $this->arg('template'));
-        fclose($fp);
-
-        header('HTTP/1.1 200 OK');
-        header('Content-type: text/plain');
-        print "Template Updated!";
-
-      } else {
-
-        // bad username and password
-        $this->clientError(_m('Authentication error!'), $code = 401);
-
-      }
-
-    }
-  }
-    function onPluginVersion(&$versions)
-    {
-        $versions[] = array('name' => 'Template',
-                            'version' => TEMPLATEPLUGIN_VERSION,
-                            'author' => 'Brian Hendrickson',
-                            'homepage' => 'http://status.net/wiki/Plugin:Template',
-                            'rawdescription' =>
-                            _m('Use an HTML template for Web output.'));
-        return true;
-    }
-
-}
-
-/**
- * Function for retrieving a statusnet display section
- *
- * requires one parameter, the name of the section
- * section names are listed in the comments of the TemplatePlugin class
- *
- * @category Plugin
- * @package  StatusNet
- * @author   Brian Hendrickson <brian@megapump.com>
- * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://megapump.com/
- *
- */
-
-function section($tagname) {
-  global $tags;
-  if (isset($tags[$tagname]))
-    return $tags[$tagname];
-}
-
diff --git a/plugins/TightUrl/TightUrlPlugin.php b/plugins/TightUrl/TightUrlPlugin.php
index 8fd645945b..6d96f40bc5 100644
--- a/plugins/TightUrl/TightUrlPlugin.php
+++ b/plugins/TightUrl/TightUrlPlugin.php
@@ -38,7 +38,8 @@ class TightUrlPlugin extends UrlShortenerPlugin
     function onInitializePlugin(){
         parent::onInitializePlugin();
         if(!isset($this->serviceUrl)){
-            throw new Exception("must specify a serviceUrl");
+            // TRANS: Exception thrown when the TightUrl plugin has been configured incorrectly.
+            throw new Exception(_m('You must specify a serviceUrl.'));
         }
     }
 
@@ -63,6 +64,7 @@ class TightUrlPlugin extends UrlShortenerPlugin
                             'author' => 'Craig Andrews',
                             'homepage' => 'http://status.net/wiki/Plugin:TightUrl',
                             'rawdescription' =>
+                            // TRANS: Plugin description. %s is the shortener name.
                             sprintf(_m('Uses <a href="http://%1$s/">%1$s</a> URL-shortener service.'),
                                     $this->shortenerName));
         return true;
diff --git a/plugins/TightUrl/locale/TightUrl.pot b/plugins/TightUrl/locale/TightUrl.pot
index 94216d0199..e3d1c46bf5 100644
--- a/plugins/TightUrl/locale/TightUrl.pot
+++ b/plugins/TightUrl/locale/TightUrl.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,7 +16,13 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: TightUrlPlugin.php:66
+#. TRANS: Exception thrown when the TightUrl plugin has been configured incorrectly.
+#: TightUrlPlugin.php:42
+msgid "You must specify a serviceUrl."
+msgstr ""
+
+#. TRANS: Plugin description. %s is the shortener name.
+#: TightUrlPlugin.php:68
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr ""
diff --git a/plugins/TightUrl/locale/de/LC_MESSAGES/TightUrl.po b/plugins/TightUrl/locale/de/LC_MESSAGES/TightUrl.po
index 466820ea9c..054a2d7c2d 100644
--- a/plugins/TightUrl/locale/de/LC_MESSAGES/TightUrl.po
+++ b/plugins/TightUrl/locale/de/LC_MESSAGES/TightUrl.po
@@ -1,6 +1,7 @@
 # Translation of StatusNet - TightUrl to German (Deutsch)
 # Exported from translatewiki.net
 #
+# Author: ChrisiPK
 # Author: The Evil IP address
 # --
 # This file is distributed under the same license as the StatusNet package.
@@ -9,18 +10,23 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TightUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:35+0000\n"
-"Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:16+0000\n"
+"Language-Team: German <https://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-01 21:06:41+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-19 11:23:38+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-tighturl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Exception thrown when the TightUrl plugin has been configured incorrectly.
+msgid "You must specify a serviceUrl."
+msgstr "Du musst eine serviceUrl angeben."
+
+#. TRANS: Plugin description. %s is the shortener name.
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr "Benutzung des <a href=\"http://%1$s/\">%1$s</a>-URL-Kürzungsdienstes."
diff --git a/plugins/TightUrl/locale/es/LC_MESSAGES/TightUrl.po b/plugins/TightUrl/locale/es/LC_MESSAGES/TightUrl.po
index cb0afd8aec..2fa8c7f226 100644
--- a/plugins/TightUrl/locale/es/LC_MESSAGES/TightUrl.po
+++ b/plugins/TightUrl/locale/es/LC_MESSAGES/TightUrl.po
@@ -1,6 +1,7 @@
-# Translation of StatusNet - TightUrl to Spanish (Español)
+# Translation of StatusNet - TightUrl to Spanish (español)
 # Exported from translatewiki.net
 #
+# Author: Armando-Martin
 # Author: Translationista
 # --
 # This file is distributed under the same license as the StatusNet package.
@@ -9,18 +10,23 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TightUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:36+0000\n"
-"Language-Team: Spanish <http://translatewiki.net/wiki/Portal:es>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:16+0000\n"
+"Language-Team: Spanish <https://translatewiki.net/wiki/Portal:es>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-01 21:06:41+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-19 11:23:38+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-plugin-tighturl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Exception thrown when the TightUrl plugin has been configured incorrectly.
+msgid "You must specify a serviceUrl."
+msgstr "Debe especificar un \"serviceUrl\"."
+
+#. TRANS: Plugin description. %s is the shortener name.
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr ""
diff --git a/plugins/TightUrl/locale/eu/LC_MESSAGES/TightUrl.po b/plugins/TightUrl/locale/eu/LC_MESSAGES/TightUrl.po
new file mode 100644
index 0000000000..e9bf436d29
--- /dev/null
+++ b/plugins/TightUrl/locale/eu/LC_MESSAGES/TightUrl.po
@@ -0,0 +1,28 @@
+# Translation of StatusNet - TightUrl to Basque (euskara)
+# Exported from translatewiki.net
+#
+# Author: Artsuaga
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - TightUrl\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:16+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-19 11:23:38+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Exception thrown when the TightUrl plugin has been configured incorrectly.
+msgid "You must specify a serviceUrl."
+msgstr "Url zerbitzu bat adierazi behar duzu."
+
+#. TRANS: Plugin description. %s is the shortener name.
+#, php-format
+msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
+msgstr "<a href=\"http://%1$s/\">%1$s</a> URL-laburtze zerbitzua erabiliz."
diff --git a/plugins/TightUrl/locale/fr/LC_MESSAGES/TightUrl.po b/plugins/TightUrl/locale/fr/LC_MESSAGES/TightUrl.po
index 2a912859d9..60f9b35d76 100644
--- a/plugins/TightUrl/locale/fr/LC_MESSAGES/TightUrl.po
+++ b/plugins/TightUrl/locale/fr/LC_MESSAGES/TightUrl.po
@@ -1,6 +1,7 @@
-# Translation of StatusNet - TightUrl to French (Français)
+# Translation of StatusNet - TightUrl to French (français)
 # Exported from translatewiki.net
 #
+# Author: Crochet.david
 # Author: Peter17
 # --
 # This file is distributed under the same license as the StatusNet package.
@@ -9,18 +10,23 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TightUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:36+0000\n"
-"Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:17+0000\n"
+"Language-Team: French <https://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-01 21:06:41+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-19 11:23:38+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-tighturl\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#. TRANS: Exception thrown when the TightUrl plugin has been configured incorrectly.
+msgid "You must specify a serviceUrl."
+msgstr "Vous devez spécifier un serviceUrl."
+
+#. TRANS: Plugin description. %s is the shortener name.
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr ""
diff --git a/plugins/TightUrl/locale/gl/LC_MESSAGES/TightUrl.po b/plugins/TightUrl/locale/gl/LC_MESSAGES/TightUrl.po
index 9900622076..c05c6a9988 100644
--- a/plugins/TightUrl/locale/gl/LC_MESSAGES/TightUrl.po
+++ b/plugins/TightUrl/locale/gl/LC_MESSAGES/TightUrl.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - TightUrl to Galician (Galego)
+# Translation of StatusNet - TightUrl to Galician (galego)
 # Exported from translatewiki.net
 #
 # Author: Toliño
@@ -9,18 +9,23 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TightUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:36+0000\n"
-"Language-Team: Galician <http://translatewiki.net/wiki/Portal:gl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:17+0000\n"
+"Language-Team: Galician <https://translatewiki.net/wiki/Portal:gl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-01 21:06:41+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-19 11:23:38+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: gl\n"
 "X-Message-Group: #out-statusnet-plugin-tighturl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Exception thrown when the TightUrl plugin has been configured incorrectly.
+msgid "You must specify a serviceUrl."
+msgstr "Cómpre especificar un serviceUrl."
+
+#. TRANS: Plugin description. %s is the shortener name.
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr ""
diff --git a/plugins/TightUrl/locale/he/LC_MESSAGES/TightUrl.po b/plugins/TightUrl/locale/he/LC_MESSAGES/TightUrl.po
index c6f4393070..171a858fa0 100644
--- a/plugins/TightUrl/locale/he/LC_MESSAGES/TightUrl.po
+++ b/plugins/TightUrl/locale/he/LC_MESSAGES/TightUrl.po
@@ -1,6 +1,7 @@
 # Translation of StatusNet - TightUrl to Hebrew (עברית)
 # Exported from translatewiki.net
 #
+# Author: Amire80
 # Author: YaronSh
 # --
 # This file is distributed under the same license as the StatusNet package.
@@ -9,18 +10,23 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TightUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:36+0000\n"
-"Language-Team: Hebrew <http://translatewiki.net/wiki/Portal:he>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:17+0000\n"
+"Language-Team: Hebrew <https://translatewiki.net/wiki/Portal:he>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-01 21:06:41+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-19 11:23:38+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: he\n"
 "X-Message-Group: #out-statusnet-plugin-tighturl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Exception thrown when the TightUrl plugin has been configured incorrectly.
+msgid "You must specify a serviceUrl."
+msgstr "יש להזין serviceUrl."
+
+#. TRANS: Plugin description. %s is the shortener name.
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr "שימוש בשירות קיצור הכתובות <a href=\"http://%1$s/\">%1$s</a>."
diff --git a/plugins/TightUrl/locale/ia/LC_MESSAGES/TightUrl.po b/plugins/TightUrl/locale/ia/LC_MESSAGES/TightUrl.po
index 19df8eb5b5..2f8d325983 100644
--- a/plugins/TightUrl/locale/ia/LC_MESSAGES/TightUrl.po
+++ b/plugins/TightUrl/locale/ia/LC_MESSAGES/TightUrl.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - TightUrl to Interlingua (Interlingua)
+# Translation of StatusNet - TightUrl to Interlingua (interlingua)
 # Exported from translatewiki.net
 #
 # Author: McDutchie
@@ -9,18 +9,23 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TightUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:36+0000\n"
-"Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:17+0000\n"
+"Language-Team: Interlingua <https://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-01 21:06:41+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-19 11:23:38+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-tighturl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Exception thrown when the TightUrl plugin has been configured incorrectly.
+msgid "You must specify a serviceUrl."
+msgstr "Es necessari specificar un \"serviceUrl\"."
+
+#. TRANS: Plugin description. %s is the shortener name.
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr ""
diff --git a/plugins/TightUrl/locale/id/LC_MESSAGES/TightUrl.po b/plugins/TightUrl/locale/id/LC_MESSAGES/TightUrl.po
index de122375f3..c9313e5c38 100644
--- a/plugins/TightUrl/locale/id/LC_MESSAGES/TightUrl.po
+++ b/plugins/TightUrl/locale/id/LC_MESSAGES/TightUrl.po
@@ -9,18 +9,23 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TightUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:36+0000\n"
-"Language-Team: Indonesian <http://translatewiki.net/wiki/Portal:id>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:17+0000\n"
+"Language-Team: Indonesian <https://translatewiki.net/wiki/Portal:id>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-01 21:06:41+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-19 11:23:38+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: id\n"
 "X-Message-Group: #out-statusnet-plugin-tighturl\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#. TRANS: Exception thrown when the TightUrl plugin has been configured incorrectly.
+msgid "You must specify a serviceUrl."
+msgstr ""
+
+#. TRANS: Plugin description. %s is the shortener name.
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr "Menggunakan layanan pemendek URL <a href=\"http://%1$s/\">%1$s</a>."
diff --git a/plugins/TightUrl/locale/ja/LC_MESSAGES/TightUrl.po b/plugins/TightUrl/locale/ja/LC_MESSAGES/TightUrl.po
index cd89ada5d7..7a720834de 100644
--- a/plugins/TightUrl/locale/ja/LC_MESSAGES/TightUrl.po
+++ b/plugins/TightUrl/locale/ja/LC_MESSAGES/TightUrl.po
@@ -1,6 +1,7 @@
 # Translation of StatusNet - TightUrl to Japanese (日本語)
 # Exported from translatewiki.net
 #
+# Author: Shirayuki
 # Author: ��守歌
 # --
 # This file is distributed under the same license as the StatusNet package.
@@ -9,18 +10,23 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TightUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:36+0000\n"
-"Language-Team: Japanese <http://translatewiki.net/wiki/Portal:ja>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:17+0000\n"
+"Language-Team: Japanese <https://translatewiki.net/wiki/Portal:ja>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-01 21:06:41+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-19 11:23:38+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ja\n"
 "X-Message-Group: #out-statusnet-plugin-tighturl\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#. TRANS: Exception thrown when the TightUrl plugin has been configured incorrectly.
+msgid "You must specify a serviceUrl."
+msgstr "serviceUrl を指定�る必���り��。"
+
+#. TRANS: Plugin description. %s is the shortener name.
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
-msgstr "<a href=\"http://%1$s/\">%1$s</a>をURL短縮サービス���利用�る。"
+msgstr "<a href=\"http://%1$s/\">%1$s</a>をURL短縮サービス���使用�る。"
diff --git a/plugins/TightUrl/locale/mk/LC_MESSAGES/TightUrl.po b/plugins/TightUrl/locale/mk/LC_MESSAGES/TightUrl.po
index e469329fa1..f785bbecba 100644
--- a/plugins/TightUrl/locale/mk/LC_MESSAGES/TightUrl.po
+++ b/plugins/TightUrl/locale/mk/LC_MESSAGES/TightUrl.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - TightUrl to Macedonian (Македон�ки)
+# Translation of StatusNet - TightUrl to Macedonian (македон�ки)
 # Exported from translatewiki.net
 #
 # Author: Bjankuloski06
@@ -9,18 +9,23 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TightUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:36+0000\n"
-"Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:17+0000\n"
+"Language-Team: Macedonian <https://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-01 21:06:41+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-19 11:23:38+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-tighturl\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
 
+#. TRANS: Exception thrown when the TightUrl plugin has been configured incorrectly.
+msgid "You must specify a serviceUrl."
+msgstr "Мора да наведете serviceUrl."
+
+#. TRANS: Plugin description. %s is the shortener name.
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr ""
diff --git a/plugins/TightUrl/locale/ms/LC_MESSAGES/TightUrl.po b/plugins/TightUrl/locale/ms/LC_MESSAGES/TightUrl.po
index 94306753e8..8591d97076 100644
--- a/plugins/TightUrl/locale/ms/LC_MESSAGES/TightUrl.po
+++ b/plugins/TightUrl/locale/ms/LC_MESSAGES/TightUrl.po
@@ -9,18 +9,23 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TightUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:36+0000\n"
-"Language-Team: Malay <http://translatewiki.net/wiki/Portal:ms>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:17+0000\n"
+"Language-Team: Malay <https://translatewiki.net/wiki/Portal:ms>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-01 21:06:41+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-19 11:23:38+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ms\n"
 "X-Message-Group: #out-statusnet-plugin-tighturl\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#. TRANS: Exception thrown when the TightUrl plugin has been configured incorrectly.
+msgid "You must specify a serviceUrl."
+msgstr ""
+
+#. TRANS: Plugin description. %s is the shortener name.
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr "Menggunakan khidmat pemendekan URL <a href=\"http://%1$s/\">%1$s</a>."
diff --git a/plugins/TightUrl/locale/nb/LC_MESSAGES/TightUrl.po b/plugins/TightUrl/locale/nb/LC_MESSAGES/TightUrl.po
index 087108c009..a18fa31554 100644
--- a/plugins/TightUrl/locale/nb/LC_MESSAGES/TightUrl.po
+++ b/plugins/TightUrl/locale/nb/LC_MESSAGES/TightUrl.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - TightUrl to Norwegian (bokmål)‬ (‪Norsk (bokmål)‬)
+# Translation of StatusNet - TightUrl to Norwegian Bokmål (‪norsk (bokmål)‬)
 # Exported from translatewiki.net
 #
 # Author: Nghtwlkr
@@ -9,18 +9,23 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TightUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:36+0000\n"
-"Language-Team: Norwegian (bokmål)‬ <http://translatewiki.net/wiki/Portal:no>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:17+0000\n"
+"Language-Team: Norwegian Bokmål <https://translatewiki.net/wiki/Portal:nb>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-01 21:06:41+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
-"X-Language-Code: no\n"
+"X-POT-Import-Date: 2011-06-19 11:23:38+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: nb\n"
 "X-Message-Group: #out-statusnet-plugin-tighturl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Exception thrown when the TightUrl plugin has been configured incorrectly.
+msgid "You must specify a serviceUrl."
+msgstr ""
+
+#. TRANS: Plugin description. %s is the shortener name.
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr "Bruker URL-forkortertjenesten <a href=\"http://%1$s/\">%1$s</a>."
diff --git a/plugins/TightUrl/locale/nl/LC_MESSAGES/TightUrl.po b/plugins/TightUrl/locale/nl/LC_MESSAGES/TightUrl.po
index fdaf9cf2c1..9260a21778 100644
--- a/plugins/TightUrl/locale/nl/LC_MESSAGES/TightUrl.po
+++ b/plugins/TightUrl/locale/nl/LC_MESSAGES/TightUrl.po
@@ -9,18 +9,23 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TightUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:36+0000\n"
-"Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:17+0000\n"
+"Language-Team: Dutch <https://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-01 21:06:41+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-19 11:23:38+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-tighturl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Exception thrown when the TightUrl plugin has been configured incorrectly.
+msgid "You must specify a serviceUrl."
+msgstr "U moet een serviceUrl opgeven."
+
+#. TRANS: Plugin description. %s is the shortener name.
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr ""
diff --git a/plugins/TightUrl/locale/pt/LC_MESSAGES/TightUrl.po b/plugins/TightUrl/locale/pt/LC_MESSAGES/TightUrl.po
index 73a23db9e1..a4386f6bee 100644
--- a/plugins/TightUrl/locale/pt/LC_MESSAGES/TightUrl.po
+++ b/plugins/TightUrl/locale/pt/LC_MESSAGES/TightUrl.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - TightUrl to Portuguese (Português)
+# Translation of StatusNet - TightUrl to Portuguese (português)
 # Exported from translatewiki.net
 #
 # Author: Waldir
@@ -9,18 +9,23 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TightUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:36+0000\n"
-"Language-Team: Portuguese <http://translatewiki.net/wiki/Portal:pt>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:18+0000\n"
+"Language-Team: Portuguese <https://translatewiki.net/wiki/Portal:pt>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-01 21:06:41+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-19 11:23:38+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: pt\n"
 "X-Message-Group: #out-statusnet-plugin-tighturl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Exception thrown when the TightUrl plugin has been configured incorrectly.
+msgid "You must specify a serviceUrl."
+msgstr ""
+
+#. TRANS: Plugin description. %s is the shortener name.
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr "Usa o serviço de abreviação de URLs <a href=\"http://%1$s/\">%1$s</a>."
diff --git a/plugins/TightUrl/locale/pt_BR/LC_MESSAGES/TightUrl.po b/plugins/TightUrl/locale/pt_BR/LC_MESSAGES/TightUrl.po
index fca997b0de..06f690a599 100644
--- a/plugins/TightUrl/locale/pt_BR/LC_MESSAGES/TightUrl.po
+++ b/plugins/TightUrl/locale/pt_BR/LC_MESSAGES/TightUrl.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - TightUrl to Brazilian Portuguese (Português do Brasil)
+# Translation of StatusNet - TightUrl to Brazilian Portuguese (português do Brasil)
 # Exported from translatewiki.net
 #
 # Author: Giro720
@@ -9,19 +9,24 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TightUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:36+0000\n"
-"Language-Team: Brazilian Portuguese <http://translatewiki.net/wiki/Portal:pt-"
-"br>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:18+0000\n"
+"Language-Team: Brazilian Portuguese <https://translatewiki.net/wiki/Portal:"
+"pt-br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-01 21:06:41+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-19 11:23:38+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: pt-br\n"
 "X-Message-Group: #out-statusnet-plugin-tighturl\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#. TRANS: Exception thrown when the TightUrl plugin has been configured incorrectly.
+msgid "You must specify a serviceUrl."
+msgstr ""
+
+#. TRANS: Plugin description. %s is the shortener name.
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr ""
diff --git a/plugins/TightUrl/locale/ru/LC_MESSAGES/TightUrl.po b/plugins/TightUrl/locale/ru/LC_MESSAGES/TightUrl.po
index 0d189b9bc5..eb351c5191 100644
--- a/plugins/TightUrl/locale/ru/LC_MESSAGES/TightUrl.po
+++ b/plugins/TightUrl/locale/ru/LC_MESSAGES/TightUrl.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - TightUrl to Russian (Ру��кий)
+# Translation of StatusNet - TightUrl to Russian (ру��кий)
 # Exported from translatewiki.net
 #
 # Author: �лек�андр Сигачёв
@@ -9,19 +9,24 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TightUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:37+0000\n"
-"Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:18+0000\n"
+"Language-Team: Russian <https://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-01 21:06:41+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-19 11:23:38+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-tighturl\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
+#. TRANS: Exception thrown when the TightUrl plugin has been configured incorrectly.
+msgid "You must specify a serviceUrl."
+msgstr ""
+
+#. TRANS: Plugin description. %s is the shortener name.
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr "И�пользование �лужбы �окращени� URL <a href=\"http://%1$s/\">%1$s</a>."
diff --git a/plugins/TightUrl/locale/tl/LC_MESSAGES/TightUrl.po b/plugins/TightUrl/locale/tl/LC_MESSAGES/TightUrl.po
index 1ded9d06ab..7cdff4e6f6 100644
--- a/plugins/TightUrl/locale/tl/LC_MESSAGES/TightUrl.po
+++ b/plugins/TightUrl/locale/tl/LC_MESSAGES/TightUrl.po
@@ -9,18 +9,23 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TightUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:37+0000\n"
-"Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:18+0000\n"
+"Language-Team: Tagalog <https://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-01 21:06:41+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-19 11:23:38+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-tighturl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Exception thrown when the TightUrl plugin has been configured incorrectly.
+msgid "You must specify a serviceUrl."
+msgstr "Dapat kang tumukoy ng isang URL ng paglilingkod."
+
+#. TRANS: Plugin description. %s is the shortener name.
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr ""
diff --git a/plugins/TightUrl/locale/uk/LC_MESSAGES/TightUrl.po b/plugins/TightUrl/locale/uk/LC_MESSAGES/TightUrl.po
index 7b842af334..8942a3315f 100644
--- a/plugins/TightUrl/locale/uk/LC_MESSAGES/TightUrl.po
+++ b/plugins/TightUrl/locale/uk/LC_MESSAGES/TightUrl.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - TightUrl to Ukrainian (Україн�ька)
+# Translation of StatusNet - TightUrl to Ukrainian (україн�ька)
 # Exported from translatewiki.net
 #
 # Author: Boogie
@@ -9,19 +9,24 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TightUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:37+0000\n"
-"Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:18+0000\n"
+"Language-Team: Ukrainian <https://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-01 21:06:41+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-19 11:23:38+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-tighturl\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
+#. TRANS: Exception thrown when the TightUrl plugin has been configured incorrectly.
+msgid "You must specify a serviceUrl."
+msgstr ""
+
+#. TRANS: Plugin description. %s is the shortener name.
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
 msgstr ""
diff --git a/plugins/TinyMCE/TinyMCEPlugin.php b/plugins/TinyMCE/TinyMCEPlugin.php
index 4051ff59ee..a5e4a481b8 100644
--- a/plugins/TinyMCE/TinyMCEPlugin.php
+++ b/plugins/TinyMCE/TinyMCEPlugin.php
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * StatusNet - the distributed open-source microblogging tool
  * Copyright (C) 2010, StatusNet, Inc.
@@ -38,7 +37,7 @@ if (!defined('STATUSNET')) {
  * Use TinyMCE library to allow rich text editing in the browser
  *
  * Converts the notice form in browser to a rich-text editor.
- * 
+ *
  * FIXME: this plugin DOES NOT load its static files from the configured
  * plugin server if one exists. There are cross-server permissions errors
  * if you try to do that (something about window.tinymce).
@@ -84,6 +83,7 @@ class TinyMCEPlugin extends Plugin
             'author' => 'Evan Prodromou',
             'homepage' => 'http://status.net/wiki/Plugin:TinyMCE',
             'rawdescription' =>
+            // TRANS: Plugin description.
             _m('Use TinyMCE library to allow rich text editing in the browser.'));
         return true;
     }
diff --git a/plugins/TinyMCE/js/langs/en.js b/plugins/TinyMCE/js/langs/en.js
index ea4a1b0e14..8a80d46b1a 100644
--- a/plugins/TinyMCE/js/langs/en.js
+++ b/plugins/TinyMCE/js/langs/en.js
@@ -12,9 +12,54 @@ not_set:"-- Not set --",
 clipboard_msg:"Copy/Cut/Paste is not available in Mozilla and Firefox.\nDo you want more information about this issue?",
 clipboard_no_support:"Currently not supported by your browser, use keyboard shortcuts instead.",
 popup_blocked:"Sorry, but we have noticed that your popup-blocker has disabled a window that provides application functionality. You will need to disable popup blocking on this site in order to fully utilize this tool.",
-invalid_data:"Error: Invalid values entered, these are marked in red.",
+invalid_data:"{#field} is invalid",
+invalid_data_number:"{#field} must be a number",
+invalid_data_min:"{#field} must be a number greater than {#min}",
+invalid_data_size:"{#field} must be a number or percentage",
 more_colors:"More colors"
 },
+colors:{
+'000000':'Black',
+'993300':'Burnt orange',
+'333300':'Dark olive',
+'003300':'Dark green',
+'003366':'Dark azure',
+'000080':'Navy Blue',
+'333399':'Indigo',
+'333333':'Very dark gray',
+'800000':'Maroon',
+'FF6600':'Orange',
+'808000':'Olive',
+'008000':'Green',
+'008080':'Teal',
+'0000FF':'Blue',
+'666699':'Grayish blue',
+'808080':'Gray',
+'FF0000':'Red',
+'FF9900':'Amber',
+'99CC00':'Yellow green',
+'339966':'Sea green',
+'33CCCC':'Turquoise',
+'3366FF':'Royal blue',
+'800080':'Purple',
+'999999':'Medium gray',
+'FF00FF':'Magenta',
+'FFCC00':'Gold',
+'FFFF00':'Yellow',
+'00FF00':'Lime',
+'00FFFF':'Aqua',
+'00CCFF':'Sky blue',
+'993366':'Brown',
+'C0C0C0':'Silver',
+'FF99CC':'Pink',
+'FFCC99':'Peach',
+'FFFF99':'Light yellow',
+'CCFFCC':'Pale green',
+'CCFFFF':'Pale cyan',
+'99CCFF':'Light sky blue',
+'CC99FF':'Plum',
+'FFFFFF':'White'
+},
 contextmenu:{
 align:"Alignment",
 left:"Left",
@@ -151,7 +196,8 @@ langs:"Languages",
 wait:"Please wait...",
 sug:"Suggestions",
 no_sug:"No suggestions",
-no_mpell:"No misspellings found."
+no_mpell:"No misspellings found.",
+learn_word:"Learn word" 
 },
 pagebreak:{
 desc:"Insert page break."
@@ -167,4 +213,11 @@ upper_roman:"Upper roman",
 circle:"Circle",
 disc:"Disc",
 square:"Square"
-}}});
\ No newline at end of file
+},
+aria:{
+rich_text_area:"Rich Text Area"
+},
+wordcount:{
+words: 'Words: '
+}
+}});
\ No newline at end of file
diff --git a/plugins/TinyMCE/js/plugins/advhr/langs/en_dlg.js b/plugins/TinyMCE/js/plugins/advhr/langs/en_dlg.js
index 873bfd8d38..ad6a7b6988 100644
--- a/plugins/TinyMCE/js/plugins/advhr/langs/en_dlg.js
+++ b/plugins/TinyMCE/js/plugins/advhr/langs/en_dlg.js
@@ -1,5 +1,7 @@
 tinyMCE.addI18n('en.advhr_dlg',{
+normal:"Normal",
 width:"Width",
+widthunits:"Units",
 size:"Height",
 noshade:"No shadow"
 });
\ No newline at end of file
diff --git a/plugins/TinyMCE/js/plugins/advhr/rule.htm b/plugins/TinyMCE/js/plugins/advhr/rule.htm
index fc37b2aecd..843e1f8f0b 100644
--- a/plugins/TinyMCE/js/plugins/advhr/rule.htm
+++ b/plugins/TinyMCE/js/plugins/advhr/rule.htm
@@ -8,43 +8,44 @@
 	<script type="text/javascript" src="../../utils/form_utils.js"></script>
 	<link href="css/advhr.css" rel="stylesheet" type="text/css" />
 </head>
-<body>
+<body role="application">
 <form onsubmit="AdvHRDialog.update();return false;" action="#">
 	<div class="tabs">
 		<ul>
-			<li id="general_tab" class="current"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{#advhr.advhr_desc}</a></span></li>
+			<li id="general_tab" class="current" aria-controls="general_panel"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{#advhr.advhr_desc}</a></span></li>
 		</ul>
 	</div>
 
 	<div class="panel_wrapper">
 		<div id="general_panel" class="panel current">
-			<table border="0" cellpadding="4" cellspacing="0">
-                    <tr>
-                        <td><label for="width">{#advhr_dlg.width}</label></td>
-                        <td class="nowrap">
-                            <input id="width" name="width" type="text" value="" class="mceFocus" />
-                            <select name="width2" id="width2">
-                                <option value="">px</option>
-                                <option value="%">%</option>
-                            </select>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td><label for="size">{#advhr_dlg.size}</label></td>
-                        <td><select id="size" name="size">
-                            <option value="">Normal</option>
-                            <option value="1">1</option>
-                            <option value="2">2</option>
-                            <option value="3">3</option>
-                            <option value="4">4</option>
-                            <option value="5">5</option>
-                        </select></td>
-                    </tr>
-                    <tr>
-                        <td><label for="noshade">{#advhr_dlg.noshade}</label></td>
-                        <td><input type="checkbox" name="noshade" id="noshade" class="radio" /></td>
-                    </tr>
-            </table>
+			<table role="presentation" border="0" cellpadding="4" cellspacing="0">
+					<tr role="group" aria-labelledby="width_label">
+						<td><label id="width_label" for="width">{#advhr_dlg.width}</label></td>
+						<td class="nowrap">
+							<input id="width" name="width" type="text" value="" class="mceFocus" />
+							<span style="display:none;" id="width_unit_label">{#advhr_dlg.widthunits}</span>
+							<select name="width2" id="width2" aria-labelledby="width_unit_label">
+								<option value="">px</option>
+								<option value="%">%</option>
+							</select>
+						</td>
+					</tr>
+					<tr>
+						<td><label for="size">{#advhr_dlg.size}</label></td>
+						<td><select id="size" name="size">
+							<option value="">{#advhr_dlg.normal}</option>
+							<option value="1">1</option>
+							<option value="2">2</option>
+							<option value="3">3</option>
+							<option value="4">4</option>
+							<option value="5">5</option>
+						</select></td>
+					</tr>
+					<tr>
+						<td><label for="noshade">{#advhr_dlg.noshade}</label></td>
+						<td><input type="checkbox" name="noshade" id="noshade" class="radio" /></td>
+					</tr>
+			</table>
 		</div>
 	</div>
 
diff --git a/plugins/TinyMCE/js/plugins/advimage/image.htm b/plugins/TinyMCE/js/plugins/advimage/image.htm
index 79cff3f19f..ed16b3d4a9 100644
--- a/plugins/TinyMCE/js/plugins/advimage/image.htm
+++ b/plugins/TinyMCE/js/plugins/advimage/image.htm
@@ -10,13 +10,14 @@
 	<script type="text/javascript" src="js/image.js"></script>
 	<link href="css/advimage.css" rel="stylesheet" type="text/css" />
 </head>
-<body id="advimage" style="display: none">
-    <form onsubmit="ImageDialog.insert();return false;" action="#"> 
+<body id="advimage" style="display: none" role="application" aria-labelledby="app_title">
+	<span id="app_title" style="display:none">{#advimage_dlg.dialog_title}</span>
+	<form onsubmit="ImageDialog.insert();return false;" action="#"> 
 		<div class="tabs">
 			<ul>
-				<li id="general_tab" class="current"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{#advimage_dlg.tab_general}</a></span></li>
-				<li id="appearance_tab"><span><a href="javascript:mcTabs.displayTab('appearance_tab','appearance_panel');" onmousedown="return false;">{#advimage_dlg.tab_appearance}</a></span></li>
-				<li id="advanced_tab"><span><a href="javascript:mcTabs.displayTab('advanced_tab','advanced_panel');" onmousedown="return false;">{#advimage_dlg.tab_advanced}</a></span></li>
+				<li id="general_tab" class="current" aria-controls="general_panel"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{#advimage_dlg.tab_general}</a></span></li>
+				<li id="appearance_tab" aria-controls="appearance_panel"><span><a href="javascript:mcTabs.displayTab('appearance_tab','appearance_panel');" onmousedown="return false;">{#advimage_dlg.tab_appearance}</a></span></li>
+				<li id="advanced_tab" aria-controls="advanced_panel"><span><a href="javascript:mcTabs.displayTab('advanced_tab','advanced_panel');" onmousedown="return false;">{#advimage_dlg.tab_advanced}</a></span></li>
 			</ul>
 		</div>
 
@@ -25,15 +26,15 @@
 				<fieldset>
 						<legend>{#advimage_dlg.general}</legend>
 
-						<table class="properties">
+						<table role="presentation" class="properties">
 							<tr>
 								<td class="column1"><label id="srclabel" for="src">{#advimage_dlg.src}</label></td>
-								<td colspan="2"><table border="0" cellspacing="0" cellpadding="0">
+								<td colspan="2"><table role="presentation" border="0" cellspacing="0" cellpadding="0">
 									<tr> 
-									  <td><input name="src" type="text" id="src" value="" class="mceFocus" onchange="ImageDialog.showPreviewImage(this.value);" /></td> 
-									  <td id="srcbrowsercontainer">&nbsp;</td>
+										<td><input name="src" type="text" id="src" value="" class="mceFocus" onchange="ImageDialog.showPreviewImage(this.value);" aria-required="true" /></td> 
+										<td id="srcbrowsercontainer">&nbsp;</td>
 									</tr>
-								  </table></td>
+								</table></td>
 							</tr>
 							<tr>
 								<td><label for="src_list">{#advimage_dlg.image_list}</label></td>
@@ -60,7 +61,7 @@
 				<fieldset>
 					<legend>{#advimage_dlg.tab_appearance}</legend>
 
-					<table border="0" cellpadding="4" cellspacing="0">
+					<table role="presentation" border="0" cellpadding="4" cellspacing="0">
 						<tr> 
 							<td class="column1"><label id="alignlabel" for="align">{#advimage_dlg.align}</label></td> 
 							<td><select id="align" name="align" onchange="ImageDialog.updateStyle('align');ImageDialog.changeAppearance();"> 
@@ -86,17 +87,19 @@
 							</td>
 						</tr>
 
-						<tr>
+						<tr role="group" aria-labelledby="widthlabel">
 							<td class="column1"><label id="widthlabel" for="width">{#advimage_dlg.dimensions}</label></td>
 							<td class="nowrap">
-								<input name="width" type="text" id="width" value="" size="5" maxlength="5" class="size" onchange="ImageDialog.changeHeight();" /> x 
-								<input name="height" type="text" id="height" value="" size="5" maxlength="5" class="size" onchange="ImageDialog.changeWidth();" /> px
+								<span style="display:none" id="width_voiceLabel">{#advimage_dlg.width}</span>
+								<input name="width" type="text" id="width" value="" size="5" maxlength="5" class="size" onchange="ImageDialog.changeHeight();" aria-labelledby="width_voiceLabel" /> x 
+								<span style="display:none" id="height_voiceLabel">{#advimage_dlg.height}</span>
+								<input name="height" type="text" id="height" value="" size="5" maxlength="5" class="size" onchange="ImageDialog.changeWidth();" aria-labelledby="height_voiceLabel" /> px
 							</td>
 						</tr>
 
 						<tr>
 							<td>&nbsp;</td>
-							<td><table border="0" cellpadding="0" cellspacing="0">
+							<td><table role="presentation" border="0" cellpadding="0" cellspacing="0">
 									<tr>
 										<td><input id="constrain" type="checkbox" name="constrain" class="checkbox" /></td>
 										<td><label id="constrainlabel" for="constrain">{#advimage_dlg.constrain_proportions}</label></td>
@@ -142,18 +145,18 @@
 				<fieldset>
 					<legend>{#advimage_dlg.swap_image}</legend>
 
-					<input type="checkbox" id="onmousemovecheck" name="onmousemovecheck" class="checkbox" onclick="ImageDialog.setSwapImage(this.checked);" />
+					<input type="checkbox" id="onmousemovecheck" name="onmousemovecheck" class="checkbox" onclick="ImageDialog.setSwapImage(this.checked);" aria-controls="onmouseoversrc onmouseoutsrc" />
 					<label id="onmousemovechecklabel" for="onmousemovecheck">{#advimage_dlg.alt_image}</label>
 
-					<table border="0" cellpadding="4" cellspacing="0" width="100%">
+					<table role="presentation" border="0" cellpadding="4" cellspacing="0" width="100%">
 							<tr>
 								<td class="column1"><label id="onmouseoversrclabel" for="onmouseoversrc">{#advimage_dlg.mouseover}</label></td> 
-								<td><table border="0" cellspacing="0" cellpadding="0"> 
+								<td><table role="presentation" border="0" cellspacing="0" cellpadding="0"> 
 									<tr> 
-									  <td><input id="onmouseoversrc" name="onmouseoversrc" type="text" value="" /></td> 
-									  <td id="onmouseoversrccontainer">&nbsp;</td>
+										<td><input id="onmouseoversrc" name="onmouseoversrc" type="text" value="" /></td> 
+										<td id="onmouseoversrccontainer">&nbsp;</td>
 									</tr>
-								  </table></td>
+								</table></td>
 							</tr>
 							<tr>
 								<td><label for="over_list">{#advimage_dlg.image_list}</label></td>
@@ -161,12 +164,12 @@
 							</tr>
 							<tr> 
 								<td class="column1"><label id="onmouseoutsrclabel" for="onmouseoutsrc">{#advimage_dlg.mouseout}</label></td> 
-								<td class="column2"><table border="0" cellspacing="0" cellpadding="0"> 
+								<td class="column2"><table role="presentation" border="0" cellspacing="0" cellpadding="0"> 
 									<tr> 
-									  <td><input id="onmouseoutsrc" name="onmouseoutsrc" type="text" value="" /></td> 
-									  <td id="onmouseoutsrccontainer">&nbsp;</td>
+										<td><input id="onmouseoutsrc" name="onmouseoutsrc" type="text" value="" /></td> 
+										<td id="onmouseoutsrccontainer">&nbsp;</td>
 									</tr> 
-								  </table></td> 
+								</table></td> 
 							</tr>
 							<tr>
 								<td><label for="out_list">{#advimage_dlg.image_list}</label></td>
@@ -178,7 +181,7 @@
 				<fieldset>
 					<legend>{#advimage_dlg.misc}</legend>
 
-					<table border="0" cellpadding="4" cellspacing="0">
+					<table role="presentation" border="0" cellpadding="4" cellspacing="0">
 						<tr>
 							<td class="column1"><label id="idlabel" for="id">{#advimage_dlg.id}</label></td> 
 							<td><input id="id" name="id" type="text" value="" /></td> 
@@ -211,12 +214,12 @@
 
 						<tr>
 							<td class="column1"><label id="longdesclabel" for="longdesc">{#advimage_dlg.long_desc}</label></td>
-							<td><table border="0" cellspacing="0" cellpadding="0">
+							<td><table role="presentation" border="0" cellspacing="0" cellpadding="0">
 									<tr>
-									  <td><input id="longdesc" name="longdesc" type="text" value="" /></td>
-									  <td id="longdesccontainer">&nbsp;</td>
+										<td><input id="longdesc" name="longdesc" type="text" value="" /></td>
+										<td id="longdesccontainer">&nbsp;</td>
 									</tr>
-								</table></td> 
+							</table></td> 
 						</tr>
 					</table>
 				</fieldset>
@@ -227,6 +230,6 @@
 			<input type="submit" id="insert" name="insert" value="{#insert}" />
 			<input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />
 		</div>
-    </form>
+	</form>
 </body> 
 </html> 
diff --git a/plugins/TinyMCE/js/plugins/advimage/js/image.js b/plugins/TinyMCE/js/plugins/advimage/js/image.js
index 3bda86a2d3..f222486131 100644
--- a/plugins/TinyMCE/js/plugins/advimage/js/image.js
+++ b/plugins/TinyMCE/js/plugins/advimage/js/image.js
@@ -9,13 +9,13 @@ var ImageDialog = {
 	},
 
 	init : function(ed) {
-		var f = document.forms[0], nl = f.elements, ed = tinyMCEPopup.editor, dom = ed.dom, n = ed.selection.getNode();
+		var f = document.forms[0], nl = f.elements, ed = tinyMCEPopup.editor, dom = ed.dom, n = ed.selection.getNode(), fl = tinyMCEPopup.getParam('external_image_list', 'tinyMCEImageList');
 
 		tinyMCEPopup.resizeToInnerSize();
 		this.fillClassList('class_list');
-		this.fillFileList('src_list', 'tinyMCEImageList');
-		this.fillFileList('over_list', 'tinyMCEImageList');
-		this.fillFileList('out_list', 'tinyMCEImageList');
+		this.fillFileList('src_list', fl);
+		this.fillFileList('over_list', fl);
+		this.fillFileList('out_list', fl);
 		TinyMCE_EditableSelects.init();
 
 		if (n.nodeName == 'IMG') {
@@ -142,7 +142,7 @@ var ImageDialog = {
 		}
 
 		tinymce.extend(args, {
-			src : nl.src.value,
+			src : nl.src.value.replace(/ /g, '%20'),
 			width : nl.width.value,
 			height : nl.height.value,
 			alt : nl.alt.value,
@@ -177,6 +177,8 @@ var ImageDialog = {
 			ed.undoManager.add();
 		}
 
+		tinyMCEPopup.editor.execCommand('mceRepaint');
+		tinyMCEPopup.editor.focus();
 		tinyMCEPopup.close();
 	},
 
@@ -285,7 +287,7 @@ var ImageDialog = {
 	fillFileList : function(id, l) {
 		var dom = tinyMCEPopup.dom, lst = dom.get(id), v, cl;
 
-		l = window[l];
+		l = typeof(l) === 'function' ? l() : window[l];
 		lst.options.length = 0;
 
 		if (l && l.length > 0) {
@@ -359,7 +361,7 @@ var ImageDialog = {
 	},
 
 	updateStyle : function(ty) {
-		var dom = tinyMCEPopup.dom, st, v, f = document.forms[0], img = dom.create('img', {style : dom.get('style').value});
+		var dom = tinyMCEPopup.dom, b, bStyle, bColor, v, isIE = tinymce.isIE, f = document.forms[0], img = dom.create('img', {style : dom.get('style').value});
 
 		if (tinyMCEPopup.editor.settings.inline_styles) {
 			// Handle align
@@ -378,14 +380,27 @@ var ImageDialog = {
 
 			// Handle border
 			if (ty == 'border') {
+				b = img.style.border ? img.style.border.split(' ') : [];
+				bStyle = dom.getStyle(img, 'border-style');
+				bColor = dom.getStyle(img, 'border-color');
+
 				dom.setStyle(img, 'border', '');
 
 				v = f.border.value;
 				if (v || v == '0') {
 					if (v == '0')
-						img.style.border = '0';
-					else
-						img.style.border = v + 'px solid black';
+						img.style.border = isIE ? '0' : '0 none none';
+					else {
+						if (b.length == 3 && b[isIE ? 2 : 1])
+							bStyle = b[isIE ? 2 : 1];
+						else if (!bStyle || bStyle == 'none')
+							bStyle = 'solid';
+						if (b.length == 3 && b[isIE ? 0 : 2])
+							bColor = b[isIE ? 0 : 2];
+						else if (!bColor || bColor == 'none')
+							bColor = 'black';
+						img.style.border = v + 'px ' + bStyle + ' ' + bColor;
+					}
 				}
 			}
 
diff --git a/plugins/TinyMCE/js/plugins/advimage/langs/en_dlg.js b/plugins/TinyMCE/js/plugins/advimage/langs/en_dlg.js
index f493d196fa..d8f11e0303 100644
--- a/plugins/TinyMCE/js/plugins/advimage/langs/en_dlg.js
+++ b/plugins/TinyMCE/js/plugins/advimage/langs/en_dlg.js
@@ -28,6 +28,8 @@ alt:"Image description",
 list:"Image list",
 border:"Border",
 dimensions:"Dimensions",
+width:"Width",
+height:"Height",
 vspace:"Vertical space",
 hspace:"Horizontal space",
 align:"Alignment",
diff --git a/plugins/TinyMCE/js/plugins/advlink/js/advlink.js b/plugins/TinyMCE/js/plugins/advlink/js/advlink.js
index b78e82f76b..837c937c66 100644
--- a/plugins/TinyMCE/js/plugins/advlink/js/advlink.js
+++ b/plugins/TinyMCE/js/plugins/advlink/js/advlink.js
@@ -30,8 +30,6 @@ function init() {
 
 	document.getElementById('hrefbrowsercontainer').innerHTML = getBrowserHTML('hrefbrowser','href','file','advlink');
 	document.getElementById('popupurlbrowsercontainer').innerHTML = getBrowserHTML('popupurlbrowser','popupurl','file','advlink');
-	document.getElementById('linklisthrefcontainer').innerHTML = getLinkListHTML('linklisthref','href');
-	document.getElementById('anchorlistcontainer').innerHTML = getAnchorListHTML('anchorlist','href');
 	document.getElementById('targetlistcontainer').innerHTML = getTargetListHTML('targetlist','target');
 
 	// Link list
@@ -41,6 +39,13 @@ function init() {
 	else
 		document.getElementById("linklisthrefcontainer").innerHTML = html;
 
+	// Anchor list
+	html = getAnchorListHTML('anchorlist','href');
+	if (html == "")
+		document.getElementById("anchorlistrow").style.display = 'none';
+	else
+		document.getElementById("anchorlistcontainer").innerHTML = html;
+
 	// Resize some elements
 	if (isVisible('hrefbrowser'))
 		document.getElementById('href').style.width = '260px';
@@ -360,20 +365,22 @@ function setAttrib(elm, attrib, value) {
 }
 
 function getAnchorListHTML(id, target) {
-	var inst = tinyMCEPopup.editor;
-	var nodes = inst.dom.select('a.mceItemAnchor,img.mceItemAnchor'), name, i;
-	var html = "";
+	var ed = tinyMCEPopup.editor, nodes = ed.dom.select('a'), name, i, len, html = "";
 
-	html += '<select id="' + id + '" name="' + id + '" class="mceAnchorList" o2nfocus="tinyMCE.addSelectAccessibility(event, this, window);" onchange="this.form.' + target + '.value=';
-	html += 'this.options[this.selectedIndex].value;">';
-	html += '<option value="">---</option>';
-
-	for (i=0; i<nodes.length; i++) {
-		if ((name = inst.dom.getAttrib(nodes[i], "name")) != "")
+	for (i=0, len=nodes.length; i<len; i++) {
+		if ((name = ed.dom.getAttrib(nodes[i], "name")) != "")
 			html += '<option value="#' + name + '">' + name + '</option>';
 	}
 
-	html += '</select>';
+	if (html == "")
+		return "";
+
+	html = '<select id="' + id + '" name="' + id + '" class="mceAnchorList"'
+		+ ' onchange="this.form.' + target + '.value=this.options[this.selectedIndex].value"'
+		+ '>'
+		+ '<option value="">---</option>'
+		+ html
+		+ '</select>';
 
 	return html;
 }
@@ -389,7 +396,6 @@ function insertAction() {
 
 	// Remove element if there is no href
 	if (!document.forms[0].href.value) {
-		tinyMCEPopup.execCommand("mceBeginUndoLevel");
 		i = inst.selection.getBookmark();
 		inst.dom.remove(elm, 1);
 		inst.selection.moveToBookmark(i);
@@ -398,12 +404,10 @@ function insertAction() {
 		return;
 	}
 
-	tinyMCEPopup.execCommand("mceBeginUndoLevel");
-
 	// Create new anchor elements
 	if (elm == null) {
 		inst.getDoc().execCommand("unlink", false, null);
-		tinyMCEPopup.execCommand("CreateLink", false, "#mce_temp_url#", {skip_undo : 1});
+		tinyMCEPopup.execCommand("mceInsertLink", false, "#mce_temp_url#", {skip_undo : 1});
 
 		elementArray = tinymce.grep(inst.dom.select("a"), function(n) {return inst.dom.getAttrib(n, 'href') == '#mce_temp_url#';});
 		for (i=0; i<elementArray.length; i++)
@@ -425,7 +429,7 @@ function insertAction() {
 
 function setAllAttribs(elm) {
 	var formObj = document.forms[0];
-	var href = formObj.href.value;
+	var href = formObj.href.value.replace(/ /g, '%20');
 	var target = getSelectValue(formObj, 'targetlist');
 
 	setAttrib(elm, 'href', href);
diff --git a/plugins/TinyMCE/js/plugins/advlink/langs/en_dlg.js b/plugins/TinyMCE/js/plugins/advlink/langs/en_dlg.js
index c71ffbd0f1..19dff29363 100644
--- a/plugins/TinyMCE/js/plugins/advlink/langs/en_dlg.js
+++ b/plugins/TinyMCE/js/plugins/advlink/langs/en_dlg.js
@@ -3,8 +3,8 @@ title:"Insert/edit link",
 url:"Link URL",
 target:"Target",
 titlefield:"Title",
-is_email:"The URL you entered seems to be an email address, do you want to add the required mailto: prefix?",
-is_external:"The URL you entered seems to external link, do you want to add the required http:// prefix?",
+is_email:"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?",
+is_external:"The URL you entered seems to be an external link. Do you want to add the required http:// prefix?",
 list:"Link list",
 general_tab:"General",
 popup_tab:"Popup",
@@ -32,6 +32,8 @@ popup_location:"Show location bar",
 popup_resizable:"Make window resizable",
 popup_dependent:"Dependent (Mozilla/Firefox only)",
 popup_size:"Size",
+width:"Width",
+height:"Height",
 popup_position:"Position (X/Y)",
 id:"Id",
 style:"Style",
diff --git a/plugins/TinyMCE/js/plugins/advlink/link.htm b/plugins/TinyMCE/js/plugins/advlink/link.htm
index 876669c6b3..8ab7c2a95c 100644
--- a/plugins/TinyMCE/js/plugins/advlink/link.htm
+++ b/plugins/TinyMCE/js/plugins/advlink/link.htm
@@ -9,37 +9,38 @@
 	<script type="text/javascript" src="js/advlink.js"></script>
 	<link href="css/advlink.css" rel="stylesheet" type="text/css" />
 </head>
-<body id="advlink" style="display: none">
-    <form onsubmit="insertAction();return false;" action="#">
-		<div class="tabs">
+<body id="advlink" style="display: none" role="application" onload="javascript:mcTabs.displayTab('general_tab','general_panel', true);" aria-labelledby="app_label">
+	<span class="mceVoiceLabel" id="app_label" style="display:none;">{#advlink_dlg.title}</span>
+	<form onsubmit="insertAction();return false;" action="#">
+		<div class="tabs" role="presentation">
 			<ul>
-				<li id="general_tab" class="current"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{#advlink_dlg.general_tab}</a></span></li>
-				<li id="popup_tab"><span><a href="javascript:mcTabs.displayTab('popup_tab','popup_panel');" onmousedown="return false;">{#advlink_dlg.popup_tab}</a></span></li>
-				<li id="events_tab"><span><a href="javascript:mcTabs.displayTab('events_tab','events_panel');" onmousedown="return false;">{#advlink_dlg.events_tab}</a></span></li>
-				<li id="advanced_tab"><span><a href="javascript:mcTabs.displayTab('advanced_tab','advanced_panel');" onmousedown="return false;">{#advlink_dlg.advanced_tab}</a></span></li>
+				<li id="general_tab" class="current" aria-controls="general_panel" ><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{#advlink_dlg.general_tab}</a></span></li>
+				<li id="popup_tab" aria-controls="popup_panel" ><span><a href="javascript:mcTabs.displayTab('popup_tab','popup_panel');" onmousedown="return false;">{#advlink_dlg.popup_tab}</a></span></li>
+				<li id="events_tab" aria-controls="events_panel"><span><a href="javascript:mcTabs.displayTab('events_tab','events_panel');" onmousedown="return false;">{#advlink_dlg.events_tab}</a></span></li>
+				<li id="advanced_tab" aria-controls="advanced_panel"><span><a href="javascript:mcTabs.displayTab('advanced_tab','advanced_panel');" onmousedown="return false;">{#advlink_dlg.advanced_tab}</a></span></li>
 			</ul>
 		</div>
 
-		<div class="panel_wrapper">
+		<div class="panel_wrapper" role="presentation">
 			<div id="general_panel" class="panel current">
 				<fieldset>
 					<legend>{#advlink_dlg.general_props}</legend>
 
-					<table border="0" cellpadding="4" cellspacing="0">
+					<table border="0" cellpadding="4" cellspacing="0" role="presentation">
 						<tr>
-						  <td class="nowrap"><label id="hreflabel" for="href">{#advlink_dlg.url}</label></td>
-						  <td><table border="0" cellspacing="0" cellpadding="0">
-								<tr>
-								  <td><input id="href" name="href" type="text" class="mceFocus" value="" onchange="selectByValue(this.form,'linklisthref',this.value);" /></td>
-								  <td id="hrefbrowsercontainer">&nbsp;</td>
-								</tr>
-							  </table></td>
+							<td class="nowrap"><label id="hreflabel" for="href">{#advlink_dlg.url}</label></td>
+								<td><table border="0" cellspacing="0" cellpadding="0">
+							<tr>
+								<td><input id="href" name="href" type="text" class="mceFocus" value="" onchange="selectByValue(this.form,'linklisthref',this.value);" aria-required="true" /></td>
+								<td id="hrefbrowsercontainer">&nbsp;</td>
+							</tr>
+							</table></td>
 						</tr>
 						<tr id="linklisthrefrow">
 							<td class="column1"><label for="linklisthref">{#advlink_dlg.list}</label></td>
 							<td colspan="2" id="linklisthrefcontainer"><select id="linklisthref"><option value=""></option></select></td>
 						</tr>
-						<tr>
+						<tr id="anchorlistrow">
 							<td class="column1"><label for="anchorlist">{#advlink_dlg.anchor_names}</label></td>
 							<td colspan="2" id="anchorlistcontainer"><select id="anchorlist"><option value=""></option></select></td>
 						</tr>
@@ -70,7 +71,7 @@
 					<input type="checkbox" id="ispopup" name="ispopup" class="radio" onclick="setPopupControlsDisabled(!this.checked);buildOnClick();" />
 					<label id="ispopuplabel" for="ispopup">{#advlink_dlg.popup}</label>
 
-					<table border="0" cellpadding="0" cellspacing="4">
+					<table border="0" cellpadding="0" cellspacing="4" role="presentation" >
 						<tr>
 							<td class="nowrap"><label for="popupurl">{#advlink_dlg.popup_url}</label>&nbsp;</td>
 							<td>
@@ -86,18 +87,22 @@
 							<td class="nowrap"><label for="popupname">{#advlink_dlg.popup_name}</label>&nbsp;</td>
 							<td><input type="text" name="popupname" id="popupname" value="" onchange="buildOnClick();" /></td>
 						</tr>
-						<tr>
-							<td class="nowrap"><label>{#advlink_dlg.popup_size}</label>&nbsp;</td>
+						<tr role="group" aria-labelledby="popup_size_label">
+							<td class="nowrap"><label id="popup_size_label">{#advlink_dlg.popup_size}</label>&nbsp;</td>
 							<td class="nowrap">
-								<input type="text" id="popupwidth" name="popupwidth" value="" onchange="buildOnClick();" /> x
-								<input type="text" id="popupheight" name="popupheight" value="" onchange="buildOnClick();" /> px
+								<span style="display:none" id="width_voiceLabel">{#advlink_dlg.width}</span>
+								<input type="text" id="popupwidth" name="popupwidth" value="" onchange="buildOnClick();" aria-labelledby="width_voiceLabel" /> x
+								<span style="display:none" id="height_voiceLabel">{#advlink_dlg.height}</span>
+								<input type="text" id="popupheight" name="popupheight" value="" onchange="buildOnClick();" aria-labelledby="height_voiceLabel" /> px
 							</td>
 						</tr>
-						<tr>
-							<td class="nowrap" id="labelleft"><label>{#advlink_dlg.popup_position}</label>&nbsp;</td>
+						<tr role="group" aria-labelledby="popup_position_label center_hint">
+							<td class="nowrap" id="labelleft"><label id="popup_position_label">{#advlink_dlg.popup_position}</label>&nbsp;</td>
 							<td class="nowrap">
-								<input type="text" id="popupleft" name="popupleft" value="" onchange="buildOnClick();" /> /                                
-								<input type="text" id="popuptop" name="popuptop" value="" onchange="buildOnClick();" /> (c /c = center)
+								<span style="display:none" id="x_voiceLabel">X</span>
+								<input type="text" id="popupleft" name="popupleft" value="" onchange="buildOnClick();" aria-labelledby="x_voiceLabel" /> /                                
+								<span style="display:none" id="y_voiceLabel">Y</span>
+								<input type="text" id="popuptop" name="popuptop" value="" onchange="buildOnClick();" aria-labelledby="y_voiceLabel" /> <span id="center_hint">(c /c = center)</span>
 							</td>
 						</tr>
 					</table>
@@ -105,7 +110,7 @@
 					<fieldset>
 						<legend>{#advlink_dlg.popup_opts}</legend>
 
-						<table border="0" cellpadding="0" cellspacing="4">
+						<table border="0" cellpadding="0" cellspacing="4" role="presentation" >
 							<tr>
 								<td><input type="checkbox" id="popuplocation" name="popuplocation" class="checkbox" onchange="buildOnClick();" /></td>
 								<td class="nowrap"><label id="popuplocationlabel" for="popuplocation">{#advlink_dlg.popup_location}</label></td>
@@ -139,7 +144,7 @@
 			<fieldset>
 					<legend>{#advlink_dlg.advanced_props}</legend>
 
-					<table border="0" cellpadding="0" cellspacing="4">
+					<table border="0" cellpadding="0" cellspacing="4" role="presentation" >
 						<tr>
 							<td class="column1"><label id="idlabel" for="id">{#advlink_dlg.id}</label></td> 
 							<td><input id="id" name="id" type="text" value="" /></td> 
@@ -259,7 +264,7 @@
 			<fieldset>
 					<legend>{#advlink_dlg.event_props}</legend>
 
-					<table border="0" cellpadding="0" cellspacing="4">
+					<table border="0" cellpadding="0" cellspacing="4" role="presentation" >
 						<tr>
 							<td class="column1"><label for="onfocus">onfocus</label></td> 
 							<td><input id="onfocus" name="onfocus" type="text" value="" /></td> 
@@ -328,6 +333,6 @@
 			<input type="submit" id="insert" name="insert" value="{#insert}" />
 			<input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />
 		</div>
-    </form>
+	</form>
 </body>
 </html>
diff --git a/plugins/TinyMCE/js/plugins/advlist/editor_plugin.js b/plugins/TinyMCE/js/plugins/advlist/editor_plugin.js
index 02d16971a1..8895112b5f 100644
--- a/plugins/TinyMCE/js/plugins/advlist/editor_plugin.js
+++ b/plugins/TinyMCE/js/plugins/advlist/editor_plugin.js
@@ -1 +1 @@
-(function(){var a=tinymce.each;tinymce.create("tinymce.plugins.AdvListPlugin",{init:function(b,c){var d=this;d.editor=b;function e(g){var f=[];a(g.split(/,/),function(h){f.push({title:"advlist."+(h=="default"?"def":h.replace(/-/g,"_")),styles:{listStyleType:h=="default"?"":h}})});return f}d.numlist=b.getParam("advlist_number_styles")||e("default,lower-alpha,lower-greek,lower-roman,upper-alpha,upper-roman");d.bullist=b.getParam("advlist_bullet_styles")||e("default,circle,disc,square")},createControl:function(d,b){var f=this,e,h;if(d=="numlist"||d=="bullist"){if(f[d][0].title=="advlist.def"){h=f[d][0]}function c(i,k){var j=true;a(k.styles,function(m,l){if(f.editor.dom.getStyle(i,l)!=m){j=false;return false}});return j}function g(){var k,i=f.editor,l=i.dom,j=i.selection;k=l.getParent(j.getNode(),"ol,ul");if(!k||k.nodeName==(d=="bullist"?"OL":"UL")||c(k,h)){i.execCommand(d=="bullist"?"InsertUnorderedList":"InsertOrderedList")}if(h){k=l.getParent(j.getNode(),"ol,ul");if(k){l.setStyles(k,h.styles);k.removeAttribute("_mce_style")}}}e=b.createSplitButton(d,{title:"advanced."+d+"_desc","class":"mce_"+d,onclick:function(){g()}});e.onRenderMenu.add(function(i,j){j.onShowMenu.add(function(){var m=f.editor.dom,l=m.getParent(f.editor.selection.getNode(),"ol,ul"),k;if(l||h){k=f[d];a(j.items,function(n){var o=true;n.setSelected(0);if(l&&!n.isDisabled()){a(k,function(p){if(p.id==n.id){if(!c(l,p)){o=false;return false}}});if(o){n.setSelected(1)}}});if(!l){j.items[h.id].setSelected(1)}}});j.add({id:f.editor.dom.uniqueId(),title:"advlist.types","class":"mceMenuItemTitle"}).setDisabled(1);a(f[d],function(k){k.id=f.editor.dom.uniqueId();j.add({id:k.id,title:k.title,onclick:function(){h=k;g()}})})});return e}},getInfo:function(){return{longname:"Advanced lists",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/advlist",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("advlist",tinymce.plugins.AdvListPlugin)})();
\ No newline at end of file
+(function(){var a=tinymce.each;tinymce.create("tinymce.plugins.AdvListPlugin",{init:function(b,c){var d=this;d.editor=b;function e(g){var f=[];a(g.split(/,/),function(h){f.push({title:"advlist."+(h=="default"?"def":h.replace(/-/g,"_")),styles:{listStyleType:h=="default"?"":h}})});return f}d.numlist=b.getParam("advlist_number_styles")||e("default,lower-alpha,lower-greek,lower-roman,upper-alpha,upper-roman");d.bullist=b.getParam("advlist_bullet_styles")||e("default,circle,disc,square");if(tinymce.isIE&&/MSIE [2-7]/.test(navigator.userAgent)){d.isIE7=true}},createControl:function(d,b){var f=this,e,h;if(d=="numlist"||d=="bullist"){if(f[d][0].title=="advlist.def"){h=f[d][0]}function c(i,k){var j=true;a(k.styles,function(m,l){if(f.editor.dom.getStyle(i,l)!=m){j=false;return false}});return j}function g(){var k,i=f.editor,l=i.dom,j=i.selection;k=l.getParent(j.getNode(),"ol,ul");if(!k||k.nodeName==(d=="bullist"?"OL":"UL")||c(k,h)){i.execCommand(d=="bullist"?"InsertUnorderedList":"InsertOrderedList")}if(h){k=l.getParent(j.getNode(),"ol,ul");if(k){l.setStyles(k,h.styles);k.removeAttribute("data-mce-style")}}i.focus()}e=b.createSplitButton(d,{title:"advanced."+d+"_desc","class":"mce_"+d,onclick:function(){g()}});e.onRenderMenu.add(function(i,j){j.onShowMenu.add(function(){var m=f.editor.dom,l=m.getParent(f.editor.selection.getNode(),"ol,ul"),k;if(l||h){k=f[d];a(j.items,function(n){var o=true;n.setSelected(0);if(l&&!n.isDisabled()){a(k,function(p){if(p.id==n.id){if(!c(l,p)){o=false;return false}}});if(o){n.setSelected(1)}}});if(!l){j.items[h.id].setSelected(1)}}});j.add({id:f.editor.dom.uniqueId(),title:"advlist.types","class":"mceMenuItemTitle",titleItem:true}).setDisabled(1);a(f[d],function(k){if(f.isIE7&&k.styles.listStyleType=="lower-greek"){return}k.id=f.editor.dom.uniqueId();j.add({id:k.id,title:k.title,onclick:function(){h=k;g()}})})});return e}},getInfo:function(){return{longname:"Advanced lists",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/advlist",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("advlist",tinymce.plugins.AdvListPlugin)})();
\ No newline at end of file
diff --git a/plugins/TinyMCE/js/plugins/advlist/editor_plugin_src.js b/plugins/TinyMCE/js/plugins/advlist/editor_plugin_src.js
index a61887a922..13ef02ddd5 100644
--- a/plugins/TinyMCE/js/plugins/advlist/editor_plugin_src.js
+++ b/plugins/TinyMCE/js/plugins/advlist/editor_plugin_src.js
@@ -35,6 +35,9 @@
 			// Setup number formats from config or default
 			t.numlist = ed.getParam("advlist_number_styles") || buildFormats("default,lower-alpha,lower-greek,lower-roman,upper-alpha,upper-roman");
 			t.bullist = ed.getParam("advlist_bullet_styles") || buildFormats("default,circle,disc,square");
+
+			if (tinymce.isIE && /MSIE [2-7]/.test(navigator.userAgent))
+				t.isIE7 = true;
 		},
 
 		createControl: function(name, cm) {
@@ -72,12 +75,12 @@
 					// Append styles to new list element
 					if (format) {
 						list = dom.getParent(sel.getNode(), 'ol,ul');
-
 						if (list) {
 							dom.setStyles(list, format.styles);
-							list.removeAttribute('_mce_style');
+							list.removeAttribute('data-mce-style');
 						}
 					}
+					ed.focus();
 				};
 
 				btn = cm.createSplitButton(name, {
@@ -122,9 +125,13 @@
 						}
 					});
 
-					menu.add({id : t.editor.dom.uniqueId(), title : 'advlist.types', 'class' : 'mceMenuItemTitle'}).setDisabled(1);
+					menu.add({id : t.editor.dom.uniqueId(), title : 'advlist.types', 'class' : 'mceMenuItemTitle', titleItem: true}).setDisabled(1);
 
 					each(t[name], function(item) {
+						// IE<8 doesn't support lower-greek, skip it
+						if (t.isIE7 && item.styles.listStyleType == 'lower-greek')
+							return;
+
 						item.id = t.editor.dom.uniqueId();
 
 						menu.add({id : item.id, title : item.title, onclick : function() {
diff --git a/plugins/TinyMCE/js/plugins/autolink/editor_plugin.js b/plugins/TinyMCE/js/plugins/autolink/editor_plugin.js
new file mode 100644
index 0000000000..c0f683a856
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/autolink/editor_plugin.js
@@ -0,0 +1 @@
+(function(){tinymce.create("tinymce.plugins.AutolinkPlugin",{init:function(a,b){var c=this;if(tinyMCE.isIE){return}a.onKeyDown.add(function(d,f){if(f.keyCode==13){return c.handleEnter(d)}});a.onKeyPress.add(function(d,f){if(f.which==41){return c.handleEclipse(d)}});a.onKeyUp.add(function(d,f){if(f.keyCode==32){return c.handleSpacebar(d)}})},handleEclipse:function(a){this.parseCurrentLine(a,-1,"(",true)},handleSpacebar:function(a){this.parseCurrentLine(a,0,"",true)},handleEnter:function(a){this.parseCurrentLine(a,-1,"",false)},parseCurrentLine:function(i,d,b,g){var a,f,c,n,k,m,h,e,j;a=i.selection.getRng().cloneRange();if(a.startOffset<5){e=a.endContainer.previousSibling;if(e==null){if(a.endContainer.firstChild==null||a.endContainer.firstChild.nextSibling==null){return}e=a.endContainer.firstChild.nextSibling}j=e.length;a.setStart(e,j);a.setEnd(e,j);if(a.endOffset<5){return}f=a.endOffset;n=e}else{n=a.endContainer;if(n.nodeType!=3&&n.firstChild){while(n.nodeType!=3&&n.firstChild){n=n.firstChild}a.setStart(n,0);a.setEnd(n,n.nodeValue.length)}if(a.endOffset==1){f=2}else{f=a.endOffset-1-d}}c=f;do{a.setStart(n,f-2);a.setEnd(n,f-1);f-=1}while(a.toString()!=" "&&a.toString()!=""&&a.toString().charCodeAt(0)!=160&&(f-2)>=0&&a.toString()!=b);if(a.toString()==b||a.toString().charCodeAt(0)==160){a.setStart(n,f);a.setEnd(n,c);f+=1}else{if(a.startOffset==0){a.setStart(n,0);a.setEnd(n,c)}else{a.setStart(n,f);a.setEnd(n,c)}}m=a.toString();h=m.match(/^(https?:\/\/|ssh:\/\/|ftp:\/\/|file:\/|www\.)(.+)$/i);if(h){if(h[1]=="www."){h[1]="http://www."}k=i.selection.getBookmark();i.selection.setRng(a);tinyMCE.execCommand("mceInsertLink",false,h[1]+h[2]);i.selection.moveToBookmark(k);if(tinyMCE.isWebKit){i.selection.collapse(false);var l=Math.min(n.length,c+1);a.setStart(n,l);a.setEnd(n,l);i.selection.setRng(a)}}},getInfo:function(){return{longname:"Autolink",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/autolink",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("autolink",tinymce.plugins.AutolinkPlugin)})();
\ No newline at end of file
diff --git a/plugins/TinyMCE/js/plugins/autolink/editor_plugin_src.js b/plugins/TinyMCE/js/plugins/autolink/editor_plugin_src.js
new file mode 100644
index 0000000000..ddfe0494a9
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/autolink/editor_plugin_src.js
@@ -0,0 +1,172 @@
+/**
+ * editor_plugin_src.js
+ *
+ * Copyright 2011, Moxiecode Systems AB
+ * Released under LGPL License.
+ *
+ * License: http://tinymce.moxiecode.com/license
+ * Contributing: http://tinymce.moxiecode.com/contributing
+ */
+
+(function() {
+	tinymce.create('tinymce.plugins.AutolinkPlugin', {
+	/**
+	* Initializes the plugin, this will be executed after the plugin has been created.
+	* This call is done before the editor instance has finished it's initialization so use the onInit event
+	* of the editor instance to intercept that event.
+	*
+	* @param {tinymce.Editor} ed Editor instance that the plugin is initialized in.
+	* @param {string} url Absolute URL to where the plugin is located.
+	*/
+
+	init : function(ed, url) {
+		var t = this;
+
+		// Internet Explorer has built-in automatic linking
+		if (tinyMCE.isIE)
+			return;
+
+		// Add a key down handler
+		ed.onKeyDown.add(function(ed, e) {
+			if (e.keyCode == 13)
+				return t.handleEnter(ed);
+			});
+
+		ed.onKeyPress.add(function(ed, e) {
+			if (e.which == 41)
+				return t.handleEclipse(ed);
+		});
+
+		// Add a key up handler
+		ed.onKeyUp.add(function(ed, e) {
+			if (e.keyCode == 32)
+				return t.handleSpacebar(ed);
+			});
+	       },
+
+		handleEclipse : function(ed) {
+			this.parseCurrentLine(ed, -1, '(', true);
+		},
+
+		handleSpacebar : function(ed) {
+			 this.parseCurrentLine(ed, 0, '', true);
+		 },
+
+		handleEnter : function(ed) {
+			this.parseCurrentLine(ed, -1, '', false);
+		},
+
+		parseCurrentLine : function(ed, end_offset, delimiter, goback) {
+			var r, end, start, endContainer, bookmark, text, matches, prev, len;
+
+			// We need at least five characters to form a URL,
+			// hence, at minimum, five characters from the beginning of the line.
+			r = ed.selection.getRng().cloneRange();
+			if (r.startOffset < 5) {
+				// During testing, the caret is placed inbetween two text nodes. 
+				// The previous text node contains the URL.
+				prev = r.endContainer.previousSibling;
+				if (prev == null) {
+					if (r.endContainer.firstChild == null || r.endContainer.firstChild.nextSibling == null)
+						return;
+
+					prev = r.endContainer.firstChild.nextSibling;
+				}
+				len = prev.length;
+				r.setStart(prev, len);
+				r.setEnd(prev, len);
+
+				if (r.endOffset < 5)
+					return;
+
+				end = r.endOffset;
+				endContainer = prev;
+			} else {
+				endContainer = r.endContainer;
+
+				// Get a text node
+				if (endContainer.nodeType != 3 && endContainer.firstChild) {
+					while (endContainer.nodeType != 3 && endContainer.firstChild)
+						endContainer = endContainer.firstChild;
+
+					r.setStart(endContainer, 0);
+					r.setEnd(endContainer, endContainer.nodeValue.length);
+				}
+
+				if (r.endOffset == 1)
+					end = 2;
+				else
+					end = r.endOffset - 1 - end_offset;
+			}
+
+			start = end;
+
+			do
+			{
+				// Move the selection one character backwards.
+				r.setStart(endContainer, end - 2);
+				r.setEnd(endContainer, end - 1);
+				end -= 1;
+
+				// Loop until one of the following is found: a blank space, &nbsp;, delimeter, (end-2) >= 0
+			} while (r.toString() != ' ' && r.toString() != '' && r.toString().charCodeAt(0) != 160 && (end -2) >= 0 && r.toString() != delimiter);
+
+			if (r.toString() == delimiter || r.toString().charCodeAt(0) == 160) {
+				r.setStart(endContainer, end);
+				r.setEnd(endContainer, start);
+				end += 1;
+			} else if (r.startOffset == 0) {
+				r.setStart(endContainer, 0);
+				r.setEnd(endContainer, start);
+			}
+			else {
+				r.setStart(endContainer, end);
+				r.setEnd(endContainer, start);
+			}
+
+			text = r.toString();
+			matches = text.match(/^(https?:\/\/|ssh:\/\/|ftp:\/\/|file:\/|www\.)(.+)$/i);
+
+			if (matches) {
+				if (matches[1] == 'www.') {
+					matches[1] = 'http://www.';
+				}
+
+				bookmark = ed.selection.getBookmark();
+
+				ed.selection.setRng(r);
+				tinyMCE.execCommand('mceInsertLink',false, matches[1] + matches[2]);
+				ed.selection.moveToBookmark(bookmark);
+
+				// TODO: Determine if this is still needed.
+				if (tinyMCE.isWebKit) {
+					// move the caret to its original position
+					ed.selection.collapse(false);
+					var max = Math.min(endContainer.length, start + 1);
+					r.setStart(endContainer, max);
+					r.setEnd(endContainer, max);
+					ed.selection.setRng(r);
+				}
+			}
+		},
+
+		/**
+		* Returns information about the plugin as a name/value array.
+		* The current keys are longname, author, authorurl, infourl and version.
+		*
+		* @return {Object} Name/value array containing information about the plugin.
+		*/
+		getInfo : function() {
+			return {
+				longname : 'Autolink',
+				author : 'Moxiecode Systems AB',
+				authorurl : 'http://tinymce.moxiecode.com',
+				infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/autolink',
+				version : tinymce.majorVersion + "." + tinymce.minorVersion
+			};
+		}
+	});
+
+	// Register plugin
+	tinymce.PluginManager.add('autolink', tinymce.plugins.AutolinkPlugin);
+})();
diff --git a/plugins/TinyMCE/js/plugins/autoresize/editor_plugin.js b/plugins/TinyMCE/js/plugins/autoresize/editor_plugin.js
index 1676b154a8..6c4ff0d5df 100644
--- a/plugins/TinyMCE/js/plugins/autoresize/editor_plugin.js
+++ b/plugins/TinyMCE/js/plugins/autoresize/editor_plugin.js
@@ -1 +1 @@
-(function(){tinymce.create("tinymce.plugins.AutoResizePlugin",{init:function(a,c){var d=this;if(a.getParam("fullscreen_is_enabled")){return}function b(){var h=a.getDoc(),e=h.body,j=h.documentElement,g=tinymce.DOM,i=d.autoresize_min_height,f;f=tinymce.isIE?e.scrollHeight:j.offsetHeight;if(f>d.autoresize_min_height){i=f}g.setStyle(g.get(a.id+"_ifr"),"height",i+"px");if(d.throbbing){a.setProgressState(false);a.setProgressState(true)}}d.editor=a;d.autoresize_min_height=a.getElement().offsetHeight;a.onChange.add(b);a.onSetContent.add(b);a.onPaste.add(b);a.onKeyUp.add(b);a.onPostRender.add(b);if(a.getParam("autoresize_on_init",true)){a.onInit.add(function(f,e){f.setProgressState(true);d.throbbing=true;f.getBody().style.overflowY="hidden"});a.onLoadContent.add(function(f,e){b();setTimeout(function(){b();f.setProgressState(false);d.throbbing=false},1250)})}a.addCommand("mceAutoResize",b)},getInfo:function(){return{longname:"Auto Resize",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/autoresize",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("autoresize",tinymce.plugins.AutoResizePlugin)})();
\ No newline at end of file
+(function(){tinymce.create("tinymce.plugins.AutoResizePlugin",{init:function(a,c){var d=this,e=0;if(a.getParam("fullscreen_is_enabled")){return}function b(){var i=a.getDoc(),f=i.body,k=i.documentElement,h=tinymce.DOM,j=d.autoresize_min_height,g;g=tinymce.isIE?f.scrollHeight:i.body.offsetHeight;if(g>d.autoresize_min_height){j=g}if(d.autoresize_max_height&&g>d.autoresize_max_height){j=d.autoresize_max_height;a.getBody().style.overflowY="auto"}else{a.getBody().style.overflowY="hidden"}if(j!==e){h.setStyle(h.get(a.id+"_ifr"),"height",j+"px");e=j}if(d.throbbing){a.setProgressState(false);a.setProgressState(true)}}d.editor=a;d.autoresize_min_height=parseInt(a.getParam("autoresize_min_height",a.getElement().offsetHeight));d.autoresize_max_height=parseInt(a.getParam("autoresize_max_height",0));a.onInit.add(function(f){f.dom.setStyle(f.getBody(),"paddingBottom",f.getParam("autoresize_bottom_margin",50)+"px")});a.onChange.add(b);a.onSetContent.add(b);a.onPaste.add(b);a.onKeyUp.add(b);a.onPostRender.add(b);if(a.getParam("autoresize_on_init",true)){a.onInit.add(function(g,f){g.setProgressState(true);d.throbbing=true;g.getBody().style.overflowY="hidden"});a.onLoadContent.add(function(g,f){b();setTimeout(function(){b();g.setProgressState(false);d.throbbing=false},1250)})}a.addCommand("mceAutoResize",b)},getInfo:function(){return{longname:"Auto Resize",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/autoresize",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("autoresize",tinymce.plugins.AutoResizePlugin)})();
\ No newline at end of file
diff --git a/plugins/TinyMCE/js/plugins/autoresize/editor_plugin_src.js b/plugins/TinyMCE/js/plugins/autoresize/editor_plugin_src.js
index c260b7a24f..7d113419d9 100644
--- a/plugins/TinyMCE/js/plugins/autoresize/editor_plugin_src.js
+++ b/plugins/TinyMCE/js/plugins/autoresize/editor_plugin_src.js
@@ -26,7 +26,7 @@
 		 * @param {string} url Absolute URL to where the plugin is located.
 		 */
 		init : function(ed, url) {
-			var t = this;
+			var t = this, oldSize = 0;
 
 			if (ed.getParam('fullscreen_is_enabled'))
 				return;
@@ -38,14 +38,24 @@
 				var d = ed.getDoc(), b = d.body, de = d.documentElement, DOM = tinymce.DOM, resizeHeight = t.autoresize_min_height, myHeight;
 
 				// Get height differently depending on the browser used
-				myHeight = tinymce.isIE ? b.scrollHeight : de.offsetHeight;
+				myHeight = tinymce.isIE ? b.scrollHeight : d.body.offsetHeight;
 
 				// Don't make it smaller than the minimum height
 				if (myHeight > t.autoresize_min_height)
 					resizeHeight = myHeight;
 
+				// If a maximum height has been defined don't exceed this height
+				if (t.autoresize_max_height && myHeight > t.autoresize_max_height) {
+					resizeHeight = t.autoresize_max_height;
+					ed.getBody().style.overflowY = "auto";
+				} else
+					ed.getBody().style.overflowY = "hidden";
+
 				// Resize content element
-				DOM.setStyle(DOM.get(ed.id + '_ifr'), 'height', resizeHeight + 'px');
+				if (resizeHeight !== oldSize) {
+					DOM.setStyle(DOM.get(ed.id + '_ifr'), 'height', resizeHeight + 'px');
+					oldSize = resizeHeight;
+				}
 
 				// if we're throbbing, we'll re-throb to match the new size
 				if (t.throbbing) {
@@ -57,7 +67,15 @@
 			t.editor = ed;
 
 			// Define minimum height
-			t.autoresize_min_height = ed.getElement().offsetHeight;
+			t.autoresize_min_height = parseInt( ed.getParam('autoresize_min_height', ed.getElement().offsetHeight) );
+
+			// Define maximum height	
+			t.autoresize_max_height = parseInt( ed.getParam('autoresize_max_height', 0) );
+
+			// Add padding at the bottom for better UX
+			ed.onInit.add(function(ed){
+				ed.dom.setStyle(ed.getBody(), 'paddingBottom', ed.getParam('autoresize_bottom_margin', 50) + 'px');
+			});
 
 			// Add appropriate listeners for resizing content area
 			ed.onChange.add(resize);
@@ -116,4 +134,4 @@
 
 	// Register plugin
 	tinymce.PluginManager.add('autoresize', tinymce.plugins.AutoResizePlugin);
-})();
\ No newline at end of file
+})();
diff --git a/plugins/TinyMCE/js/plugins/autosave/editor_plugin.js b/plugins/TinyMCE/js/plugins/autosave/editor_plugin.js
index 6e485400b3..7f49107e65 100644
--- a/plugins/TinyMCE/js/plugins/autosave/editor_plugin.js
+++ b/plugins/TinyMCE/js/plugins/autosave/editor_plugin.js
@@ -1 +1 @@
-(function(e){var c="autosave",g="restoredraft",b=true,f,d,a=e.util.Dispatcher;e.create("tinymce.plugins.AutoSave",{init:function(i,j){var h=this,l=i.settings;h.editor=i;function k(n){var m={s:1000,m:60000};n=/^(\d+)([ms]?)$/.exec(""+n);return(n[2]?m[n[2]]:1)*parseInt(n)}e.each({ask_before_unload:b,interval:"30s",retention:"20m",minlength:50},function(n,m){m=c+"_"+m;if(l[m]===f){l[m]=n}});l.autosave_interval=k(l.autosave_interval);l.autosave_retention=k(l.autosave_retention);i.addButton(g,{title:c+".restore_content",onclick:function(){if(i.getContent({draft:true}).replace(/\s|&nbsp;|<\/?p[^>]*>|<br[^>]*>/gi,"").length>0){i.windowManager.confirm(c+".warning_message",function(m){if(m){h.restoreDraft()}})}else{h.restoreDraft()}}});i.onNodeChange.add(function(){var m=i.controlManager;if(m.get(g)){m.setDisabled(g,!h.hasDraft())}});i.onInit.add(function(){if(i.controlManager.get(g)){h.setupStorage(i);setInterval(function(){h.storeDraft();i.nodeChanged()},l.autosave_interval)}});h.onStoreDraft=new a(h);h.onRestoreDraft=new a(h);h.onRemoveDraft=new a(h);if(!d){window.onbeforeunload=e.plugins.AutoSave._beforeUnloadHandler;d=b}},getInfo:function(){return{longname:"Auto save",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/autosave",version:e.majorVersion+"."+e.minorVersion}},getExpDate:function(){return new Date(new Date().getTime()+this.editor.settings.autosave_retention).toUTCString()},setupStorage:function(i){var h=this,k=c+"_test",j="OK";h.key=c+i.id;e.each([function(){if(localStorage){localStorage.setItem(k,j);if(localStorage.getItem(k)===j){localStorage.removeItem(k);return localStorage}}},function(){if(sessionStorage){sessionStorage.setItem(k,j);if(sessionStorage.getItem(k)===j){sessionStorage.removeItem(k);return sessionStorage}}},function(){if(e.isIE){i.getElement().style.behavior="url('#default#userData')";return{autoExpires:b,setItem:function(l,n){var m=i.getElement();m.setAttribute(l,n);m.expires=h.getExpDate();m.save("TinyMCE")},getItem:function(l){var m=i.getElement();m.load("TinyMCE");return m.getAttribute(l)},removeItem:function(l){i.getElement().removeAttribute(l)}}}},],function(l){try{h.storage=l();if(h.storage){return false}}catch(m){}})},storeDraft:function(){var i=this,l=i.storage,j=i.editor,h,k;if(l){if(!l.getItem(i.key)&&!j.isDirty()){return}k=j.getContent({draft:true});if(k.length>j.settings.autosave_minlength){h=i.getExpDate();if(!i.storage.autoExpires){i.storage.setItem(i.key+"_expires",h)}i.storage.setItem(i.key,k);i.onStoreDraft.dispatch(i,{expires:h,content:k})}}},restoreDraft:function(){var h=this,i=h.storage;if(i){content=i.getItem(h.key);if(content){h.editor.setContent(content);h.onRestoreDraft.dispatch(h,{content:content})}}},hasDraft:function(){var h=this,k=h.storage,i,j;if(k){j=!!k.getItem(h.key);if(j){if(!h.storage.autoExpires){i=new Date(k.getItem(h.key+"_expires"));if(new Date().getTime()<i.getTime()){return b}h.removeDraft()}else{return b}}}return false},removeDraft:function(){var h=this,k=h.storage,i=h.key,j;if(k){j=k.getItem(i);k.removeItem(i);k.removeItem(i+"_expires");if(j){h.onRemoveDraft.dispatch(h,{content:j})}}},"static":{_beforeUnloadHandler:function(h){var i;e.each(tinyMCE.editors,function(j){if(j.plugins.autosave){j.plugins.autosave.storeDraft()}if(j.getParam("fullscreen_is_enabled")){return}if(!i&&j.isDirty()&&j.getParam("autosave_ask_before_unload")){i=j.getLang("autosave.unload_msg")}});return i}}});e.PluginManager.add("autosave",e.plugins.AutoSave)})(tinymce);
\ No newline at end of file
+(function(e){var c="autosave",g="restoredraft",b=true,f,d,a=e.util.Dispatcher;e.create("tinymce.plugins.AutoSave",{init:function(i,j){var h=this,l=i.settings;h.editor=i;function k(n){var m={s:1000,m:60000};n=/^(\d+)([ms]?)$/.exec(""+n);return(n[2]?m[n[2]]:1)*parseInt(n)}e.each({ask_before_unload:b,interval:"30s",retention:"20m",minlength:50},function(n,m){m=c+"_"+m;if(l[m]===f){l[m]=n}});l.autosave_interval=k(l.autosave_interval);l.autosave_retention=k(l.autosave_retention);i.addButton(g,{title:c+".restore_content",onclick:function(){if(i.getContent({draft:true}).replace(/\s|&nbsp;|<\/?p[^>]*>|<br[^>]*>/gi,"").length>0){i.windowManager.confirm(c+".warning_message",function(m){if(m){h.restoreDraft()}})}else{h.restoreDraft()}}});i.onNodeChange.add(function(){var m=i.controlManager;if(m.get(g)){m.setDisabled(g,!h.hasDraft())}});i.onInit.add(function(){if(i.controlManager.get(g)){h.setupStorage(i);setInterval(function(){h.storeDraft();i.nodeChanged()},l.autosave_interval)}});h.onStoreDraft=new a(h);h.onRestoreDraft=new a(h);h.onRemoveDraft=new a(h);if(!d){window.onbeforeunload=e.plugins.AutoSave._beforeUnloadHandler;d=b}},getInfo:function(){return{longname:"Auto save",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/autosave",version:e.majorVersion+"."+e.minorVersion}},getExpDate:function(){return new Date(new Date().getTime()+this.editor.settings.autosave_retention).toUTCString()},setupStorage:function(i){var h=this,k=c+"_test",j="OK";h.key=c+i.id;e.each([function(){if(localStorage){localStorage.setItem(k,j);if(localStorage.getItem(k)===j){localStorage.removeItem(k);return localStorage}}},function(){if(sessionStorage){sessionStorage.setItem(k,j);if(sessionStorage.getItem(k)===j){sessionStorage.removeItem(k);return sessionStorage}}},function(){if(e.isIE){i.getElement().style.behavior="url('#default#userData')";return{autoExpires:b,setItem:function(l,n){var m=i.getElement();m.setAttribute(l,n);m.expires=h.getExpDate();try{m.save("TinyMCE")}catch(o){}},getItem:function(l){var m=i.getElement();try{m.load("TinyMCE");return m.getAttribute(l)}catch(n){return null}},removeItem:function(l){i.getElement().removeAttribute(l)}}}},],function(l){try{h.storage=l();if(h.storage){return false}}catch(m){}})},storeDraft:function(){var i=this,l=i.storage,j=i.editor,h,k;if(l){if(!l.getItem(i.key)&&!j.isDirty()){return}k=j.getContent({draft:true});if(k.length>j.settings.autosave_minlength){h=i.getExpDate();if(!i.storage.autoExpires){i.storage.setItem(i.key+"_expires",h)}i.storage.setItem(i.key,k);i.onStoreDraft.dispatch(i,{expires:h,content:k})}}},restoreDraft:function(){var h=this,i=h.storage;if(i){content=i.getItem(h.key);if(content){h.editor.setContent(content);h.onRestoreDraft.dispatch(h,{content:content})}}},hasDraft:function(){var h=this,k=h.storage,i,j;if(k){j=!!k.getItem(h.key);if(j){if(!h.storage.autoExpires){i=new Date(k.getItem(h.key+"_expires"));if(new Date().getTime()<i.getTime()){return b}h.removeDraft()}else{return b}}}return false},removeDraft:function(){var h=this,k=h.storage,i=h.key,j;if(k){j=k.getItem(i);k.removeItem(i);k.removeItem(i+"_expires");if(j){h.onRemoveDraft.dispatch(h,{content:j})}}},"static":{_beforeUnloadHandler:function(h){var i;e.each(tinyMCE.editors,function(j){if(j.plugins.autosave){j.plugins.autosave.storeDraft()}if(j.getParam("fullscreen_is_enabled")){return}if(!i&&j.isDirty()&&j.getParam("autosave_ask_before_unload")){i=j.getLang("autosave.unload_msg")}});return i}}});e.PluginManager.add("autosave",e.plugins.AutoSave)})(tinymce);
\ No newline at end of file
diff --git a/plugins/TinyMCE/js/plugins/autosave/editor_plugin_src.js b/plugins/TinyMCE/js/plugins/autosave/editor_plugin_src.js
index 581e8f6d2c..061cf13519 100644
--- a/plugins/TinyMCE/js/plugins/autosave/editor_plugin_src.js
+++ b/plugins/TinyMCE/js/plugins/autosave/editor_plugin_src.js
@@ -257,15 +257,24 @@
 
 								userDataElement.setAttribute(key, value);
 								userDataElement.expires = self.getExpDate();
-								userDataElement.save("TinyMCE");
+
+								try {
+									userDataElement.save("TinyMCE");
+								} catch (e) {
+									// Ignore, saving might fail if "Userdata Persistence" is disabled in IE
+								}
 							},
 
 							getItem : function(key) {
 								var userDataElement = ed.getElement();
 
-								userDataElement.load("TinyMCE");
-
-								return userDataElement.getAttribute(key);
+								try {
+									userDataElement.load("TinyMCE");
+									return userDataElement.getAttribute(key);
+								} catch (e) {
+									// Ignore, loading might fail if "Userdata Persistence" is disabled in IE
+									return null;
+								}
 							},
 
 							removeItem : function(key) {
diff --git a/plugins/TinyMCE/js/plugins/bbcode/editor_plugin.js b/plugins/TinyMCE/js/plugins/bbcode/editor_plugin.js
index 930fdff0af..8f8821fd64 100644
--- a/plugins/TinyMCE/js/plugins/bbcode/editor_plugin.js
+++ b/plugins/TinyMCE/js/plugins/bbcode/editor_plugin.js
@@ -1 +1 @@
-(function(){tinymce.create("tinymce.plugins.BBCodePlugin",{init:function(a,b){var d=this,c=a.getParam("bbcode_dialect","punbb").toLowerCase();a.onBeforeSetContent.add(function(e,f){f.content=d["_"+c+"_bbcode2html"](f.content)});a.onPostProcess.add(function(e,f){if(f.set){f.content=d["_"+c+"_bbcode2html"](f.content)}if(f.get){f.content=d["_"+c+"_html2bbcode"](f.content)}})},getInfo:function(){return{longname:"BBCode Plugin",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/bbcode",version:tinymce.majorVersion+"."+tinymce.minorVersion}},_punbb_html2bbcode:function(a){a=tinymce.trim(a);function b(c,d){a=a.replace(c,d)}b(/<a.*?href=\"(.*?)\".*?>(.*?)<\/a>/gi,"[url=$1]$2[/url]");b(/<font.*?color=\"(.*?)\".*?class=\"codeStyle\".*?>(.*?)<\/font>/gi,"[code][color=$1]$2[/color][/code]");b(/<font.*?color=\"(.*?)\".*?class=\"quoteStyle\".*?>(.*?)<\/font>/gi,"[quote][color=$1]$2[/color][/quote]");b(/<font.*?class=\"codeStyle\".*?color=\"(.*?)\".*?>(.*?)<\/font>/gi,"[code][color=$1]$2[/color][/code]");b(/<font.*?class=\"quoteStyle\".*?color=\"(.*?)\".*?>(.*?)<\/font>/gi,"[quote][color=$1]$2[/color][/quote]");b(/<span style=\"color: ?(.*?);\">(.*?)<\/span>/gi,"[color=$1]$2[/color]");b(/<font.*?color=\"(.*?)\".*?>(.*?)<\/font>/gi,"[color=$1]$2[/color]");b(/<span style=\"font-size:(.*?);\">(.*?)<\/span>/gi,"[size=$1]$2[/size]");b(/<font>(.*?)<\/font>/gi,"$1");b(/<img.*?src=\"(.*?)\".*?\/>/gi,"[img]$1[/img]");b(/<span class=\"codeStyle\">(.*?)<\/span>/gi,"[code]$1[/code]");b(/<span class=\"quoteStyle\">(.*?)<\/span>/gi,"[quote]$1[/quote]");b(/<strong class=\"codeStyle\">(.*?)<\/strong>/gi,"[code][b]$1[/b][/code]");b(/<strong class=\"quoteStyle\">(.*?)<\/strong>/gi,"[quote][b]$1[/b][/quote]");b(/<em class=\"codeStyle\">(.*?)<\/em>/gi,"[code][i]$1[/i][/code]");b(/<em class=\"quoteStyle\">(.*?)<\/em>/gi,"[quote][i]$1[/i][/quote]");b(/<u class=\"codeStyle\">(.*?)<\/u>/gi,"[code][u]$1[/u][/code]");b(/<u class=\"quoteStyle\">(.*?)<\/u>/gi,"[quote][u]$1[/u][/quote]");b(/<\/(strong|b)>/gi,"[/b]");b(/<(strong|b)>/gi,"[b]");b(/<\/(em|i)>/gi,"[/i]");b(/<(em|i)>/gi,"[i]");b(/<\/u>/gi,"[/u]");b(/<span style=\"text-decoration: ?underline;\">(.*?)<\/span>/gi,"[u]$1[/u]");b(/<u>/gi,"[u]");b(/<blockquote[^>]*>/gi,"[quote]");b(/<\/blockquote>/gi,"[/quote]");b(/<br \/>/gi,"\n");b(/<br\/>/gi,"\n");b(/<br>/gi,"\n");b(/<p>/gi,"");b(/<\/p>/gi,"\n");b(/&nbsp;/gi," ");b(/&quot;/gi,'"');b(/&lt;/gi,"<");b(/&gt;/gi,">");b(/&amp;/gi,"&");return a},_punbb_bbcode2html:function(a){a=tinymce.trim(a);function b(c,d){a=a.replace(c,d)}b(/\n/gi,"<br />");b(/\[b\]/gi,"<strong>");b(/\[\/b\]/gi,"</strong>");b(/\[i\]/gi,"<em>");b(/\[\/i\]/gi,"</em>");b(/\[u\]/gi,"<u>");b(/\[\/u\]/gi,"</u>");b(/\[url=([^\]]+)\](.*?)\[\/url\]/gi,'<a href="$1">$2</a>');b(/\[url\](.*?)\[\/url\]/gi,'<a href="$1">$1</a>');b(/\[img\](.*?)\[\/img\]/gi,'<img src="$1" />');b(/\[color=(.*?)\](.*?)\[\/color\]/gi,'<font color="$1">$2</font>');b(/\[code\](.*?)\[\/code\]/gi,'<span class="codeStyle">$1</span>&nbsp;');b(/\[quote.*?\](.*?)\[\/quote\]/gi,'<span class="quoteStyle">$1</span>&nbsp;');return a}});tinymce.PluginManager.add("bbcode",tinymce.plugins.BBCodePlugin)})();
\ No newline at end of file
+(function(){tinymce.create("tinymce.plugins.BBCodePlugin",{init:function(a,b){var d=this,c=a.getParam("bbcode_dialect","punbb").toLowerCase();a.onBeforeSetContent.add(function(e,f){f.content=d["_"+c+"_bbcode2html"](f.content)});a.onPostProcess.add(function(e,f){if(f.set){f.content=d["_"+c+"_bbcode2html"](f.content)}if(f.get){f.content=d["_"+c+"_html2bbcode"](f.content)}})},getInfo:function(){return{longname:"BBCode Plugin",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/bbcode",version:tinymce.majorVersion+"."+tinymce.minorVersion}},_punbb_html2bbcode:function(a){a=tinymce.trim(a);function b(c,d){a=a.replace(c,d)}b(/<a.*?href=\"(.*?)\".*?>(.*?)<\/a>/gi,"[url=$1]$2[/url]");b(/<font.*?color=\"(.*?)\".*?class=\"codeStyle\".*?>(.*?)<\/font>/gi,"[code][color=$1]$2[/color][/code]");b(/<font.*?color=\"(.*?)\".*?class=\"quoteStyle\".*?>(.*?)<\/font>/gi,"[quote][color=$1]$2[/color][/quote]");b(/<font.*?class=\"codeStyle\".*?color=\"(.*?)\".*?>(.*?)<\/font>/gi,"[code][color=$1]$2[/color][/code]");b(/<font.*?class=\"quoteStyle\".*?color=\"(.*?)\".*?>(.*?)<\/font>/gi,"[quote][color=$1]$2[/color][/quote]");b(/<span style=\"color: ?(.*?);\">(.*?)<\/span>/gi,"[color=$1]$2[/color]");b(/<font.*?color=\"(.*?)\".*?>(.*?)<\/font>/gi,"[color=$1]$2[/color]");b(/<span style=\"font-size:(.*?);\">(.*?)<\/span>/gi,"[size=$1]$2[/size]");b(/<font>(.*?)<\/font>/gi,"$1");b(/<img.*?src=\"(.*?)\".*?\/>/gi,"[img]$1[/img]");b(/<span class=\"codeStyle\">(.*?)<\/span>/gi,"[code]$1[/code]");b(/<span class=\"quoteStyle\">(.*?)<\/span>/gi,"[quote]$1[/quote]");b(/<strong class=\"codeStyle\">(.*?)<\/strong>/gi,"[code][b]$1[/b][/code]");b(/<strong class=\"quoteStyle\">(.*?)<\/strong>/gi,"[quote][b]$1[/b][/quote]");b(/<em class=\"codeStyle\">(.*?)<\/em>/gi,"[code][i]$1[/i][/code]");b(/<em class=\"quoteStyle\">(.*?)<\/em>/gi,"[quote][i]$1[/i][/quote]");b(/<u class=\"codeStyle\">(.*?)<\/u>/gi,"[code][u]$1[/u][/code]");b(/<u class=\"quoteStyle\">(.*?)<\/u>/gi,"[quote][u]$1[/u][/quote]");b(/<\/(strong|b)>/gi,"[/b]");b(/<(strong|b)>/gi,"[b]");b(/<\/(em|i)>/gi,"[/i]");b(/<(em|i)>/gi,"[i]");b(/<\/u>/gi,"[/u]");b(/<span style=\"text-decoration: ?underline;\">(.*?)<\/span>/gi,"[u]$1[/u]");b(/<u>/gi,"[u]");b(/<blockquote[^>]*>/gi,"[quote]");b(/<\/blockquote>/gi,"[/quote]");b(/<br \/>/gi,"\n");b(/<br\/>/gi,"\n");b(/<br>/gi,"\n");b(/<p>/gi,"");b(/<\/p>/gi,"\n");b(/&nbsp;|\u00a0/gi," ");b(/&quot;/gi,'"');b(/&lt;/gi,"<");b(/&gt;/gi,">");b(/&amp;/gi,"&");return a},_punbb_bbcode2html:function(a){a=tinymce.trim(a);function b(c,d){a=a.replace(c,d)}b(/\n/gi,"<br />");b(/\[b\]/gi,"<strong>");b(/\[\/b\]/gi,"</strong>");b(/\[i\]/gi,"<em>");b(/\[\/i\]/gi,"</em>");b(/\[u\]/gi,"<u>");b(/\[\/u\]/gi,"</u>");b(/\[url=([^\]]+)\](.*?)\[\/url\]/gi,'<a href="$1">$2</a>');b(/\[url\](.*?)\[\/url\]/gi,'<a href="$1">$1</a>');b(/\[img\](.*?)\[\/img\]/gi,'<img src="$1" />');b(/\[color=(.*?)\](.*?)\[\/color\]/gi,'<font color="$1">$2</font>');b(/\[code\](.*?)\[\/code\]/gi,'<span class="codeStyle">$1</span>&nbsp;');b(/\[quote.*?\](.*?)\[\/quote\]/gi,'<span class="quoteStyle">$1</span>&nbsp;');return a}});tinymce.PluginManager.add("bbcode",tinymce.plugins.BBCodePlugin)})();
\ No newline at end of file
diff --git a/plugins/TinyMCE/js/plugins/bbcode/editor_plugin_src.js b/plugins/TinyMCE/js/plugins/bbcode/editor_plugin_src.js
index 5586637f33..4e7eb3377f 100644
--- a/plugins/TinyMCE/js/plugins/bbcode/editor_plugin_src.js
+++ b/plugins/TinyMCE/js/plugins/bbcode/editor_plugin_src.js
@@ -79,7 +79,7 @@
 			rep(/<br>/gi,"\n");
 			rep(/<p>/gi,"");
 			rep(/<\/p>/gi,"\n");
-			rep(/&nbsp;/gi," ");
+			rep(/&nbsp;|\u00a0/gi," ");
 			rep(/&quot;/gi,"\"");
 			rep(/&lt;/gi,"<");
 			rep(/&gt;/gi,">");
diff --git a/plugins/TinyMCE/js/plugins/contextmenu/editor_plugin.js b/plugins/TinyMCE/js/plugins/contextmenu/editor_plugin.js
index 9749e5164c..af7ae54453 100644
--- a/plugins/TinyMCE/js/plugins/contextmenu/editor_plugin.js
+++ b/plugins/TinyMCE/js/plugins/contextmenu/editor_plugin.js
@@ -1 +1 @@
-(function(){var a=tinymce.dom.Event,c=tinymce.each,b=tinymce.DOM;tinymce.create("tinymce.plugins.ContextMenu",{init:function(d){var f=this,g;f.editor=d;f.onContextMenu=new tinymce.util.Dispatcher(this);d.onContextMenu.add(function(h,i){if(!i.ctrlKey){if(g){h.selection.setRng(g)}f._getMenu(h).showMenu(i.clientX,i.clientY);a.add(h.getDoc(),"click",function(j){e(h,j)});a.cancel(i)}});d.onRemove.add(function(){if(f._menu){f._menu.removeAll()}});function e(h,i){g=null;if(i&&i.button==2){g=h.selection.getRng();return}if(f._menu){f._menu.removeAll();f._menu.destroy();a.remove(h.getDoc(),"click",e)}}d.onMouseDown.add(e);d.onKeyDown.add(e)},getInfo:function(){return{longname:"Contextmenu",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/contextmenu",version:tinymce.majorVersion+"."+tinymce.minorVersion}},_getMenu:function(h){var l=this,f=l._menu,i=h.selection,e=i.isCollapsed(),d=i.getNode()||h.getBody(),g,k,j;if(f){f.removeAll();f.destroy()}k=b.getPos(h.getContentAreaContainer());j=b.getPos(h.getContainer());f=h.controlManager.createDropMenu("contextmenu",{offset_x:k.x+h.getParam("contextmenu_offset_x",0),offset_y:k.y+h.getParam("contextmenu_offset_y",0),constrain:1});l._menu=f;f.add({title:"advanced.cut_desc",icon:"cut",cmd:"Cut"}).setDisabled(e);f.add({title:"advanced.copy_desc",icon:"copy",cmd:"Copy"}).setDisabled(e);f.add({title:"advanced.paste_desc",icon:"paste",cmd:"Paste"});if((d.nodeName=="A"&&!h.dom.getAttrib(d,"name"))||!e){f.addSeparator();f.add({title:"advanced.link_desc",icon:"link",cmd:h.plugins.advlink?"mceAdvLink":"mceLink",ui:true});f.add({title:"advanced.unlink_desc",icon:"unlink",cmd:"UnLink"})}f.addSeparator();f.add({title:"advanced.image_desc",icon:"image",cmd:h.plugins.advimage?"mceAdvImage":"mceImage",ui:true});f.addSeparator();g=f.addMenu({title:"contextmenu.align"});g.add({title:"contextmenu.left",icon:"justifyleft",cmd:"JustifyLeft"});g.add({title:"contextmenu.center",icon:"justifycenter",cmd:"JustifyCenter"});g.add({title:"contextmenu.right",icon:"justifyright",cmd:"JustifyRight"});g.add({title:"contextmenu.full",icon:"justifyfull",cmd:"JustifyFull"});l.onContextMenu.dispatch(l,f,d,e);return f}});tinymce.PluginManager.add("contextmenu",tinymce.plugins.ContextMenu)})();
\ No newline at end of file
+(function(){var a=tinymce.dom.Event,c=tinymce.each,b=tinymce.DOM;tinymce.create("tinymce.plugins.ContextMenu",{init:function(e){var h=this,f,d,i;h.editor=e;d=e.settings.contextmenu_never_use_native;h.onContextMenu=new tinymce.util.Dispatcher(this);f=e.onContextMenu.add(function(j,k){if((i!==0?i:k.ctrlKey)&&!d){return}a.cancel(k);if(k.target.nodeName=="IMG"){j.selection.select(k.target)}h._getMenu(j).showMenu(k.clientX||k.pageX,k.clientY||k.pageY);a.add(j.getDoc(),"click",function(l){g(j,l)});j.nodeChanged()});e.onRemove.add(function(){if(h._menu){h._menu.removeAll()}});function g(j,k){i=0;if(k&&k.button==2){i=k.ctrlKey;return}if(h._menu){h._menu.removeAll();h._menu.destroy();a.remove(j.getDoc(),"click",g)}}e.onMouseDown.add(g);e.onKeyDown.add(g);e.onKeyDown.add(function(j,k){if(k.shiftKey&&!k.ctrlKey&&!k.altKey&&k.keyCode===121){a.cancel(k);f(j,k)}})},getInfo:function(){return{longname:"Contextmenu",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/contextmenu",version:tinymce.majorVersion+"."+tinymce.minorVersion}},_getMenu:function(e){var g=this,d=g._menu,j=e.selection,f=j.isCollapsed(),h=j.getNode()||e.getBody(),i,k;if(d){d.removeAll();d.destroy()}k=b.getPos(e.getContentAreaContainer());d=e.controlManager.createDropMenu("contextmenu",{offset_x:k.x+e.getParam("contextmenu_offset_x",0),offset_y:k.y+e.getParam("contextmenu_offset_y",0),constrain:1,keyboard_focus:true});g._menu=d;d.add({title:"advanced.cut_desc",icon:"cut",cmd:"Cut"}).setDisabled(f);d.add({title:"advanced.copy_desc",icon:"copy",cmd:"Copy"}).setDisabled(f);d.add({title:"advanced.paste_desc",icon:"paste",cmd:"Paste"});if((h.nodeName=="A"&&!e.dom.getAttrib(h,"name"))||!f){d.addSeparator();d.add({title:"advanced.link_desc",icon:"link",cmd:e.plugins.advlink?"mceAdvLink":"mceLink",ui:true});d.add({title:"advanced.unlink_desc",icon:"unlink",cmd:"UnLink"})}d.addSeparator();d.add({title:"advanced.image_desc",icon:"image",cmd:e.plugins.advimage?"mceAdvImage":"mceImage",ui:true});d.addSeparator();i=d.addMenu({title:"contextmenu.align"});i.add({title:"contextmenu.left",icon:"justifyleft",cmd:"JustifyLeft"});i.add({title:"contextmenu.center",icon:"justifycenter",cmd:"JustifyCenter"});i.add({title:"contextmenu.right",icon:"justifyright",cmd:"JustifyRight"});i.add({title:"contextmenu.full",icon:"justifyfull",cmd:"JustifyFull"});g.onContextMenu.dispatch(g,d,h,f);return d}});tinymce.PluginManager.add("contextmenu",tinymce.plugins.ContextMenu)})();
\ No newline at end of file
diff --git a/plugins/TinyMCE/js/plugins/contextmenu/editor_plugin_src.js b/plugins/TinyMCE/js/plugins/contextmenu/editor_plugin_src.js
index 13813a64e4..956fbea998 100644
--- a/plugins/TinyMCE/js/plugins/contextmenu/editor_plugin_src.js
+++ b/plugins/TinyMCE/js/plugins/contextmenu/editor_plugin_src.js
@@ -27,10 +27,12 @@
 		 * @param {string} url Absolute URL to where the plugin is located.
 		 */
 		init : function(ed) {
-			var t = this, lastRng;
+			var t = this, showMenu, contextmenuNeverUseNative, realCtrlKey;
 
 			t.editor = ed;
 
+			contextmenuNeverUseNative = ed.settings.contextmenu_never_use_native;
+
 			/**
 			 * This event gets fired when the context menu is shown.
 			 *
@@ -40,18 +42,23 @@
 			 */
 			t.onContextMenu = new tinymce.util.Dispatcher(this);
 
-			ed.onContextMenu.add(function(ed, e) {
-				if (!e.ctrlKey) {
-					// Restore the last selection since it was removed
-					if (lastRng)
-						ed.selection.setRng(lastRng);
+			showMenu = ed.onContextMenu.add(function(ed, e) {
+				// Block TinyMCE menu on ctrlKey and work around Safari issue
+				if ((realCtrlKey !== 0 ? realCtrlKey : e.ctrlKey) && !contextmenuNeverUseNative)
+					return;
 
-					t._getMenu(ed).showMenu(e.clientX, e.clientY);
-					Event.add(ed.getDoc(), 'click', function(e) {
-						hide(ed, e);
-					});
-					Event.cancel(e);
-				}
+				Event.cancel(e);
+
+				// Select the image if it's clicked. WebKit would other wise expand the selection
+				if (e.target.nodeName == 'IMG')
+					ed.selection.select(e.target);
+
+				t._getMenu(ed).showMenu(e.clientX || e.pageX, e.clientY || e.pageY);
+				Event.add(ed.getDoc(), 'click', function(e) {
+					hide(ed, e);
+				});
+
+				ed.nodeChanged();
 			});
 
 			ed.onRemove.add(function() {
@@ -60,12 +67,12 @@
 			});
 
 			function hide(ed, e) {
-				lastRng = null;
+				realCtrlKey = 0;
 
 				// Since the contextmenu event moves
 				// the selection we need to store it away
 				if (e && e.button == 2) {
-					lastRng = ed.selection.getRng();
+					realCtrlKey = e.ctrlKey;
 					return;
 				}
 
@@ -78,6 +85,12 @@
 
 			ed.onMouseDown.add(hide);
 			ed.onKeyDown.add(hide);
+			ed.onKeyDown.add(function(ed, e) {
+				if (e.shiftKey && !e.ctrlKey && !e.altKey && e.keyCode === 121) {
+					Event.cancel(e);
+					showMenu(ed, e);
+				}
+			});
 		},
 
 		/**
@@ -98,20 +111,20 @@
 		},
 
 		_getMenu : function(ed) {
-			var t = this, m = t._menu, se = ed.selection, col = se.isCollapsed(), el = se.getNode() || ed.getBody(), am, p1, p2;
+			var t = this, m = t._menu, se = ed.selection, col = se.isCollapsed(), el = se.getNode() || ed.getBody(), am, p;
 
 			if (m) {
 				m.removeAll();
 				m.destroy();
 			}
 
-			p1 = DOM.getPos(ed.getContentAreaContainer());
-			p2 = DOM.getPos(ed.getContainer());
+			p = DOM.getPos(ed.getContentAreaContainer());
 
 			m = ed.controlManager.createDropMenu('contextmenu', {
-				offset_x : p1.x + ed.getParam('contextmenu_offset_x', 0),
-				offset_y : p1.y + ed.getParam('contextmenu_offset_y', 0),
-				constrain : 1
+				offset_x : p.x + ed.getParam('contextmenu_offset_x', 0),
+				offset_y : p.y + ed.getParam('contextmenu_offset_y', 0),
+				constrain : 1,
+				keyboard_focus: true
 			});
 
 			t._menu = m;
@@ -144,4 +157,4 @@
 
 	// Register plugin
 	tinymce.PluginManager.add('contextmenu', tinymce.plugins.ContextMenu);
-})();
\ No newline at end of file
+})();
diff --git a/plugins/TinyMCE/js/plugins/emotions/emotions.htm b/plugins/TinyMCE/js/plugins/emotions/emotions.htm
index 55a1d72fa7..2c91002e4e 100644
--- a/plugins/TinyMCE/js/plugins/emotions/emotions.htm
+++ b/plugins/TinyMCE/js/plugins/emotions/emotions.htm
@@ -5,36 +5,37 @@
 	<script type="text/javascript" src="../../tiny_mce_popup.js"></script>
 	<script type="text/javascript" src="js/emotions.js"></script>
 </head>
-<body style="display: none">
-	<div align="center">
-		<div class="title">{#emotions_dlg.title}:<br /><br /></div>
+<body style="display: none" role="application" aria-labelledby="app_title">
+<span style="display:none;" id="app_title">{#emotions_dlg.title}</span>
+<div align="center">
+	<div class="title">{#emotions_dlg.title}:<br /><br /></div>
 
-		<table border="0" cellspacing="0" cellpadding="4">
-		  <tr>
+	<table role="presentation" border="0" cellspacing="0" cellpadding="4">
+		<tr>
 			<td><a href="javascript:EmotionsDialog.insert('smiley-cool.gif','emotions_dlg.cool');"><img src="img/smiley-cool.gif" width="18" height="18" border="0" alt="{#emotions_dlg.cool}" title="{#emotions_dlg.cool}" /></a></td>
 			<td><a href="javascript:EmotionsDialog.insert('smiley-cry.gif','emotions_dlg.cry');"><img src="img/smiley-cry.gif" width="18" height="18" border="0" alt="{#emotions_dlg.cry}" title="{#emotions_dlg.cry}" /></a></td>
 			<td><a href="javascript:EmotionsDialog.insert('smiley-embarassed.gif','emotions_dlg.embarassed');"><img src="img/smiley-embarassed.gif" width="18" height="18" border="0" alt="{#emotions_dlg.embarassed}" title="{#emotions_dlg.embarassed}" /></a></td>
 			<td><a href="javascript:EmotionsDialog.insert('smiley-foot-in-mouth.gif','emotions_dlg.foot_in_mouth');"><img src="img/smiley-foot-in-mouth.gif" width="18" height="18" border="0" alt="{#emotions_dlg.foot_in_mouth}" title="{#emotions_dlg.foot_in_mouth}" /></a></td>
-		  </tr>
-		  <tr>
+		</tr>
+		<tr>
 			<td><a href="javascript:EmotionsDialog.insert('smiley-frown.gif','emotions_dlg.frown');"><img src="img/smiley-frown.gif" width="18" height="18" border="0" alt="{#emotions_dlg.frown}" title="{#emotions_dlg.frown}" /></a></td>
 			<td><a href="javascript:EmotionsDialog.insert('smiley-innocent.gif','emotions_dlg.innocent');"><img src="img/smiley-innocent.gif" width="18" height="18" border="0" alt="{#emotions_dlg.innocent}" title="{#emotions_dlg.innocent}" /></a></td>
 			<td><a href="javascript:EmotionsDialog.insert('smiley-kiss.gif','emotions_dlg.kiss');"><img src="img/smiley-kiss.gif" width="18" height="18" border="0" alt="{#emotions_dlg.kiss}" title="{#emotions_dlg.kiss}" /></a></td>
 			<td><a href="javascript:EmotionsDialog.insert('smiley-laughing.gif','emotions_dlg.laughing');"><img src="img/smiley-laughing.gif" width="18" height="18" border="0" alt="{#emotions_dlg.laughing}" title="{#emotions_dlg.laughing}" /></a></td>
-		  </tr>
-		  <tr>
+		</tr>
+		<tr>
 			<td><a href="javascript:EmotionsDialog.insert('smiley-money-mouth.gif','emotions_dlg.money_mouth');"><img src="img/smiley-money-mouth.gif" width="18" height="18" border="0" alt="{#emotions_dlg.money_mouth}" title="{#emotions_dlg.money_mouth}" /></a></td>
 			<td><a href="javascript:EmotionsDialog.insert('smiley-sealed.gif','emotions_dlg.sealed');"><img src="img/smiley-sealed.gif" width="18" height="18" border="0" alt="{#emotions_dlg.sealed}" title="{#emotions_dlg.sealed}" /></a></td>
 			<td><a href="javascript:EmotionsDialog.insert('smiley-smile.gif','emotions_dlg.smile');"><img src="img/smiley-smile.gif" width="18" height="18" border="0" alt="{#emotions_dlg.smile}" title="{#emotions_dlg.smile}" /></a></td>
 			<td><a href="javascript:EmotionsDialog.insert('smiley-surprised.gif','emotions_dlg.surprised');"><img src="img/smiley-surprised.gif" width="18" height="18" border="0" alt="{#emotions_dlg.surprised}" title="{#emotions_dlg.surprised}" /></a></td>
-		  </tr>
-		  <tr>
+		</tr>
+		<tr>
 			<td><a href="javascript:EmotionsDialog.insert('smiley-tongue-out.gif','emotions_dlg.tongue_out');"><img src="img/smiley-tongue-out.gif" width="18" height="18" border="0" alt="{#emotions_dlg.tongue-out}" title="{#emotions_dlg.tongue_out}" /></a></td>
 			<td><a href="javascript:EmotionsDialog.insert('smiley-undecided.gif','emotions_dlg.undecided');"><img src="img/smiley-undecided.gif" width="18" height="18" border="0" alt="{#emotions_dlg.undecided}" title="{#emotions_dlg.undecided}" /></a></td>
 			<td><a href="javascript:EmotionsDialog.insert('smiley-wink.gif','emotions_dlg.wink');"><img src="img/smiley-wink.gif" width="18" height="18" border="0" alt="{#emotions_dlg.wink}" title="{#emotions_dlg.wink}" /></a></td>
 			<td><a href="javascript:EmotionsDialog.insert('smiley-yell.gif','emotions_dlg.yell');"><img src="img/smiley-yell.gif" width="18" height="18" border="0" alt="{#emotions_dlg.yell}" title="{#emotions_dlg.yell}" /></a></td>
-		  </tr>
-		</table>
-	</div>
+		</tr>
+	</table>
+</div>
 </body>
 </html>
diff --git a/plugins/TinyMCE/js/plugins/emotions/img/smiley-foot-in-mouth.gif b/plugins/TinyMCE/js/plugins/emotions/img/smiley-foot-in-mouth.gif
index 16f68cc1e9..c7cf1011da 100644
Binary files a/plugins/TinyMCE/js/plugins/emotions/img/smiley-foot-in-mouth.gif and b/plugins/TinyMCE/js/plugins/emotions/img/smiley-foot-in-mouth.gif differ
diff --git a/plugins/TinyMCE/js/plugins/emotions/img/smiley-laughing.gif b/plugins/TinyMCE/js/plugins/emotions/img/smiley-laughing.gif
index 1606c119e7..82c5b182e6 100644
Binary files a/plugins/TinyMCE/js/plugins/emotions/img/smiley-laughing.gif and b/plugins/TinyMCE/js/plugins/emotions/img/smiley-laughing.gif differ
diff --git a/plugins/TinyMCE/js/plugins/emotions/img/smiley-sealed.gif b/plugins/TinyMCE/js/plugins/emotions/img/smiley-sealed.gif
index b33d3cca1e..fe66220c24 100644
Binary files a/plugins/TinyMCE/js/plugins/emotions/img/smiley-sealed.gif and b/plugins/TinyMCE/js/plugins/emotions/img/smiley-sealed.gif differ
diff --git a/plugins/TinyMCE/js/plugins/emotions/img/smiley-smile.gif b/plugins/TinyMCE/js/plugins/emotions/img/smiley-smile.gif
index e6a9e60d5d..fd27edfaaa 100644
Binary files a/plugins/TinyMCE/js/plugins/emotions/img/smiley-smile.gif and b/plugins/TinyMCE/js/plugins/emotions/img/smiley-smile.gif differ
diff --git a/plugins/TinyMCE/js/plugins/emotions/img/smiley-surprised.gif b/plugins/TinyMCE/js/plugins/emotions/img/smiley-surprised.gif
index cb99cdd913..0cc9bb71cc 100644
Binary files a/plugins/TinyMCE/js/plugins/emotions/img/smiley-surprised.gif and b/plugins/TinyMCE/js/plugins/emotions/img/smiley-surprised.gif differ
diff --git a/plugins/TinyMCE/js/plugins/emotions/img/smiley-wink.gif b/plugins/TinyMCE/js/plugins/emotions/img/smiley-wink.gif
index 9faf1aff8f..0631c7616e 100644
Binary files a/plugins/TinyMCE/js/plugins/emotions/img/smiley-wink.gif and b/plugins/TinyMCE/js/plugins/emotions/img/smiley-wink.gif differ
diff --git a/plugins/TinyMCE/js/plugins/example_dependency/editor_plugin.js b/plugins/TinyMCE/js/plugins/example_dependency/editor_plugin.js
new file mode 100644
index 0000000000..0a4551d380
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/example_dependency/editor_plugin.js
@@ -0,0 +1 @@
+(function(){tinymce.create("tinymce.plugins.ExampleDependencyPlugin",{init:function(a,b){},getInfo:function(){return{longname:"Example Dependency plugin",author:"Some author",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/example_dependency",version:"1.0"}}});tinymce.PluginManager.add("example_dependency",tinymce.plugins.ExampleDependencyPlugin,["example"])})();
\ No newline at end of file
diff --git a/plugins/TinyMCE/js/plugins/example_dependency/editor_plugin_src.js b/plugins/TinyMCE/js/plugins/example_dependency/editor_plugin_src.js
new file mode 100644
index 0000000000..e1c55e41bc
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/example_dependency/editor_plugin_src.js
@@ -0,0 +1,50 @@
+/**
+ * editor_plugin_src.js
+ *
+ * Copyright 2009, Moxiecode Systems AB
+ * Released under LGPL License.
+ *
+ * License: http://tinymce.moxiecode.com/license
+ * Contributing: http://tinymce.moxiecode.com/contributing
+ */
+
+(function() {
+
+	tinymce.create('tinymce.plugins.ExampleDependencyPlugin', {
+		/**
+		 * Initializes the plugin, this will be executed after the plugin has been created.
+		 * This call is done before the editor instance has finished it's initialization so use the onInit event
+		 * of the editor instance to intercept that event.
+		 *
+		 * @param {tinymce.Editor} ed Editor instance that the plugin is initialized in.
+		 * @param {string} url Absolute URL to where the plugin is located.
+		 */
+		init : function(ed, url) {
+		},
+
+
+		/**
+		 * Returns information about the plugin as a name/value array.
+		 * The current keys are longname, author, authorurl, infourl and version.
+		 *
+		 * @return {Object} Name/value array containing information about the plugin.
+		 */
+		getInfo : function() {
+			return {
+				longname : 'Example Dependency plugin',
+				author : 'Some author',
+				authorurl : 'http://tinymce.moxiecode.com',
+				infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/example_dependency',
+				version : "1.0"
+			};
+		}
+	});
+
+	/**
+	 * Register the plugin, specifying the list of the plugins that this plugin depends on.  They are specified in a list, with the list loaded in order.
+	 * plugins in this list will be initialised when this plugin is initialized. (before the init method is called).
+	 * plugins in a depends list should typically be specified using the short name).  If neccesary this can be done
+	 * with an object which has the url to the plugin and the shortname.
+	 */
+	tinymce.PluginManager.add('example_dependency', tinymce.plugins.ExampleDependencyPlugin, ['example']);
+})();
diff --git a/plugins/TinyMCE/js/plugins/fullpage/css/fullpage.css b/plugins/TinyMCE/js/plugins/fullpage/css/fullpage.css
index 7a3334f08d..2675cec155 100644
--- a/plugins/TinyMCE/js/plugins/fullpage/css/fullpage.css
+++ b/plugins/TinyMCE/js/plugins/fullpage/css/fullpage.css
@@ -35,53 +35,14 @@
 	width: 240px;
 }
 
-/* Head list classes */
-
-.headlistwrapper {
-	width: 100%;
-}
-
-.addbutton, .removebutton, .moveupbutton, .movedownbutton {
-	border-top: 1px solid;
-	border-left: 1px solid;
-	border-bottom: 1px solid;
-	border-right: 1px solid;
-	border-color: #F0F0EE;
-	cursor: default;
-	display: block;
-	width: 20px;
-	height: 20px;
-}
-
 #doctypes {
 	width: 200px;
 }
 
-.addbutton:hover, .removebutton:hover, .moveupbutton:hover, .movedownbutton:hover {
-	border: 1px solid #0A246A;
-	background-color: #B6BDD2;
-}
+/* Head list classes */
 
-.addbutton {
-	background-image: url('../images/add.gif');
-	float: left;
-	margin-right: 3px;
-}
-
-.removebutton {
-	background-image: url('../images/remove.gif');
-	float: left;
-}
-
-.moveupbutton {
-	background-image: url('../images/move_up.gif');
-	float: left;
-	margin-right: 3px;
-}
-
-.movedownbutton {
-	background-image: url('../images/move_down.gif');
-	float: left;
+.headlistwrapper {
+	width: 100%;
 }
 
 .selected {
diff --git a/plugins/TinyMCE/js/plugins/fullpage/editor_plugin.js b/plugins/TinyMCE/js/plugins/fullpage/editor_plugin.js
index aeaa669794..eb0ec33120 100644
--- a/plugins/TinyMCE/js/plugins/fullpage/editor_plugin.js
+++ b/plugins/TinyMCE/js/plugins/fullpage/editor_plugin.js
@@ -1 +1 @@
-(function(){tinymce.create("tinymce.plugins.FullPagePlugin",{init:function(a,b){var c=this;c.editor=a;a.addCommand("mceFullPageProperties",function(){a.windowManager.open({file:b+"/fullpage.htm",width:430+parseInt(a.getLang("fullpage.delta_width",0)),height:495+parseInt(a.getLang("fullpage.delta_height",0)),inline:1},{plugin_url:b,head_html:c.head})});a.addButton("fullpage",{title:"fullpage.desc",cmd:"mceFullPageProperties"});a.onBeforeSetContent.add(c._setContent,c);a.onSetContent.add(c._setBodyAttribs,c);a.onGetContent.add(c._getContent,c)},getInfo:function(){return{longname:"Fullpage",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/fullpage",version:tinymce.majorVersion+"."+tinymce.minorVersion}},_setBodyAttribs:function(d,a){var l,c,e,g,b,h,j,f=this.head.match(/body(.*?)>/i);if(f&&f[1]){l=f[1].match(/\s*(\w+\s*=\s*".*?"|\w+\s*=\s*'.*?'|\w+\s*=\s*\w+|\w+)\s*/g);if(l){for(c=0,e=l.length;c<e;c++){g=l[c].split("=");b=g[0].replace(/\s/,"");h=g[1];if(h){h=h.replace(/^\s+/,"").replace(/\s+$/,"");j=h.match(/^["'](.*)["']$/);if(j){h=j[1]}}else{h=b}d.dom.setAttrib(d.getBody(),"style",h)}}}},_createSerializer:function(){return new tinymce.dom.Serializer({dom:this.editor.dom,apply_source_formatting:true})},_setContent:function(d,b){var h=this,a,j,f=b.content,g,i="";if(b.format=="raw"&&h.head){return}if(b.source_view&&d.getParam("fullpage_hide_in_source_view")){return}f=f.replace(/<(\/?)BODY/gi,"<$1body");a=f.indexOf("<body");if(a!=-1){a=f.indexOf(">",a);h.head=f.substring(0,a+1);j=f.indexOf("</body",a);if(j==-1){j=f.indexOf("</body",j)}b.content=f.substring(a+1,j);h.foot=f.substring(j);function e(c){return c.replace(/<\/?[A-Z]+/g,function(k){return k.toLowerCase()})}h.head=e(h.head);h.foot=e(h.foot)}else{h.head="";if(d.getParam("fullpage_default_xml_pi")){h.head+='<?xml version="1.0" encoding="'+d.getParam("fullpage_default_encoding","ISO-8859-1")+'" ?>\n'}h.head+=d.getParam("fullpage_default_doctype",'<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">');h.head+="\n<html>\n<head>\n<title>"+d.getParam("fullpage_default_title","Untitled document")+"</title>\n";if(g=d.getParam("fullpage_default_encoding")){h.head+='<meta http-equiv="Content-Type" content="'+g+'" />\n'}if(g=d.getParam("fullpage_default_font_family")){i+="font-family: "+g+";"}if(g=d.getParam("fullpage_default_font_size")){i+="font-size: "+g+";"}if(g=d.getParam("fullpage_default_text_color")){i+="color: "+g+";"}h.head+="</head>\n<body"+(i?' style="'+i+'"':"")+">\n";h.foot="\n</body>\n</html>"}},_getContent:function(a,c){var b=this;if(!c.source_view||!a.getParam("fullpage_hide_in_source_view")){c.content=tinymce.trim(b.head)+"\n"+tinymce.trim(c.content)+"\n"+tinymce.trim(b.foot)}}});tinymce.PluginManager.add("fullpage",tinymce.plugins.FullPagePlugin)})();
\ No newline at end of file
+(function(){var b=tinymce.each,a=tinymce.html.Node;tinymce.create("tinymce.plugins.FullPagePlugin",{init:function(c,d){var e=this;e.editor=c;c.addCommand("mceFullPageProperties",function(){c.windowManager.open({file:d+"/fullpage.htm",width:430+parseInt(c.getLang("fullpage.delta_width",0)),height:495+parseInt(c.getLang("fullpage.delta_height",0)),inline:1},{plugin_url:d,data:e._htmlToData()})});c.addButton("fullpage",{title:"fullpage.desc",cmd:"mceFullPageProperties"});c.onBeforeSetContent.add(e._setContent,e);c.onGetContent.add(e._getContent,e)},getInfo:function(){return{longname:"Fullpage",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/fullpage",version:tinymce.majorVersion+"."+tinymce.minorVersion}},_htmlToData:function(){var f=this._parseHeader(),h={},c,i,g,e=this.editor;function d(l,j){var k=l.attr(j);return k||""}h.fontface=e.getParam("fullpage_default_fontface","");h.fontsize=e.getParam("fullpage_default_fontsize","");i=f.firstChild;if(i.type==7){h.xml_pi=true;g=/encoding="([^"]+)"/.exec(i.value);if(g){h.docencoding=g[1]}}i=f.getAll("#doctype")[0];if(i){h.doctype="<!DOCTYPE"+i.value+">"}i=f.getAll("title")[0];if(i&&i.firstChild){h.metatitle=i.firstChild.value}b(f.getAll("meta"),function(m){var k=m.attr("name"),j=m.attr("http-equiv"),l;if(k){h["meta"+k.toLowerCase()]=m.attr("content")}else{if(j=="Content-Type"){l=/charset\s*=\s*(.*)\s*/gi.exec(m.attr("content"));if(l){h.docencoding=l[1]}}}});i=f.getAll("html")[0];if(i){h.langcode=d(i,"lang")||d(i,"xml:lang")}i=f.getAll("link")[0];if(i&&i.attr("rel")=="stylesheet"){h.stylesheet=i.attr("href")}i=f.getAll("body")[0];if(i){h.langdir=d(i,"dir");h.style=d(i,"style");h.visited_color=d(i,"vlink");h.link_color=d(i,"link");h.active_color=d(i,"alink")}return h},_dataToHtml:function(g){var f,d,h,j,k,e=this.editor.dom;function c(n,l,m){n.attr(l,m?m:undefined)}function i(l){if(d.firstChild){d.insert(l,d.firstChild)}else{d.append(l)}}f=this._parseHeader();d=f.getAll("head")[0];if(!d){j=f.getAll("html")[0];d=new a("head",1);if(j.firstChild){j.insert(d,j.firstChild,true)}else{j.append(d)}}j=f.firstChild;if(g.xml_pi){k='version="1.0"';if(g.docencoding){k+=' encoding="'+g.docencoding+'"'}if(j.type!=7){j=new a("xml",7);f.insert(j,f.firstChild,true)}j.value=k}else{if(j&&j.type==7){j.remove()}}j=f.getAll("#doctype")[0];if(g.doctype){if(!j){j=new a("#doctype",10);if(g.xml_pi){f.insert(j,f.firstChild)}else{i(j)}}j.value=g.doctype.substring(9,g.doctype.length-1)}else{if(j){j.remove()}}j=f.getAll("title")[0];if(g.metatitle){if(!j){j=new a("title",1);j.append(new a("#text",3)).value=g.metatitle;i(j)}}if(g.docencoding){j=null;b(f.getAll("meta"),function(l){if(l.attr("http-equiv")=="Content-Type"){j=l}});if(!j){j=new a("meta",1);j.attr("http-equiv","Content-Type");j.shortEnded=true;i(j)}j.attr("content","text/html; charset="+g.docencoding)}b("keywords,description,author,copyright,robots".split(","),function(m){var l=f.getAll("meta"),n,p,o=g["meta"+m];for(n=0;n<l.length;n++){p=l[n];if(p.attr("name")==m){if(o){p.attr("content",o)}else{p.remove()}return}}if(o){j=new a("meta",1);j.attr("name",m);j.attr("content",o);j.shortEnded=true;i(j)}});j=f.getAll("link")[0];if(j&&j.attr("rel")=="stylesheet"){if(g.stylesheet){j.attr("href",g.stylesheet)}else{j.remove()}}else{if(g.stylesheet){j=new a("link",1);j.attr({rel:"stylesheet",text:"text/css",href:g.stylesheet});j.shortEnded=true;i(j)}}j=f.getAll("body")[0];if(j){c(j,"dir",g.langdir);c(j,"style",g.style);c(j,"vlink",g.visited_color);c(j,"link",g.link_color);c(j,"alink",g.active_color);e.setAttribs(this.editor.getBody(),{style:g.style,dir:g.dir,vLink:g.visited_color,link:g.link_color,aLink:g.active_color})}j=f.getAll("html")[0];if(j){c(j,"lang",g.langcode);c(j,"xml:lang",g.langcode)}h=new tinymce.html.Serializer({validate:false,indent:true,apply_source_formatting:true,indent_before:"head,html,body,meta,title,script,link,style",indent_after:"head,html,body,meta,title,script,link,style"}).serialize(f);this.head=h.substring(0,h.indexOf("</body>"))},_parseHeader:function(){return new tinymce.html.DomParser({validate:false,root_name:"#document"}).parse(this.head)},_setContent:function(g,d){var m=this,i,c,h=d.content,f,l="",e=m.editor.dom,j;function k(n){return n.replace(/<\/?[A-Z]+/g,function(o){return o.toLowerCase()})}if(d.format=="raw"&&m.head){return}if(d.source_view&&g.getParam("fullpage_hide_in_source_view")){return}h=h.replace(/<(\/?)BODY/gi,"<$1body");i=h.indexOf("<body");if(i!=-1){i=h.indexOf(">",i);m.head=k(h.substring(0,i+1));c=h.indexOf("</body",i);if(c==-1){c=h.length}d.content=h.substring(i+1,c);m.foot=k(h.substring(c))}else{m.head=this._getDefaultHeader();m.foot="\n</body>\n</html>"}f=m._parseHeader();b(f.getAll("style"),function(n){if(n.firstChild){l+=n.firstChild.value}});j=f.getAll("body")[0];if(j){e.setAttribs(m.editor.getBody(),{style:j.attr("style")||"",dir:j.attr("dir")||"",vLink:j.attr("vlink")||"",link:j.attr("link")||"",aLink:j.attr("alink")||""})}if(l){e.add(m.editor.getDoc().getElementsByTagName("head")[0],"style",{id:"fullpage_styles"},l)}else{e.remove("fullpage_styles")}},_getDefaultHeader:function(){var f="",c=this.editor,e,d="";if(c.getParam("fullpage_default_xml_pi")){f+='<?xml version="1.0" encoding="'+c.getParam("fullpage_default_encoding","ISO-8859-1")+'" ?>\n'}f+=c.getParam("fullpage_default_doctype",'<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">');f+="\n<html>\n<head>\n";if(e=c.getParam("fullpage_default_title")){f+="<title>"+e+"</title>\n"}if(e=c.getParam("fullpage_default_encoding")){f+='<meta http-equiv="Content-Type" content="text/html; charset='+e+'" />\n'}if(e=c.getParam("fullpage_default_font_family")){d+="font-family: "+e+";"}if(e=c.getParam("fullpage_default_font_size")){d+="font-size: "+e+";"}if(e=c.getParam("fullpage_default_text_color")){d+="color: "+e+";"}f+="</head>\n<body"+(d?' style="'+d+'"':"")+">\n";return f},_getContent:function(d,e){var c=this;if(!e.source_view||!d.getParam("fullpage_hide_in_source_view")){e.content=tinymce.trim(c.head)+"\n"+tinymce.trim(e.content)+"\n"+tinymce.trim(c.foot)}}});tinymce.PluginManager.add("fullpage",tinymce.plugins.FullPagePlugin)})();
\ No newline at end of file
diff --git a/plugins/TinyMCE/js/plugins/fullpage/editor_plugin_src.js b/plugins/TinyMCE/js/plugins/fullpage/editor_plugin_src.js
index a2c9df8987..5725b56152 100644
--- a/plugins/TinyMCE/js/plugins/fullpage/editor_plugin_src.js
+++ b/plugins/TinyMCE/js/plugins/fullpage/editor_plugin_src.js
@@ -9,6 +9,8 @@
  */
 
 (function() {
+	var each = tinymce.each, Node = tinymce.html.Node;
+
 	tinymce.create('tinymce.plugins.FullPagePlugin', {
 		init : function(ed, url) {
 			var t = this;
@@ -24,7 +26,7 @@
 					inline : 1
 				}, {
 					plugin_url : url,
-					head_html : t.head
+					data : t._htmlToData()
 				});
 			});
 
@@ -32,7 +34,6 @@
 			ed.addButton('fullpage', {title : 'fullpage.desc', cmd : 'mceFullPageProperties'});
 
 			ed.onBeforeSetContent.add(t._setContent, t);
-			ed.onSetContent.add(t._setBodyAttribs, t);
 			ed.onGetContent.add(t._getContent, t);
 		},
 
@@ -48,106 +49,351 @@
 
 		// Private plugin internal methods
 
-		_setBodyAttribs : function(ed, o) {
-			var bdattr, i, len, kv, k, v, t, attr = this.head.match(/body(.*?)>/i);
+		_htmlToData : function() {
+			var headerFragment = this._parseHeader(), data = {}, nodes, elm, matches, editor = this.editor;
 
-			if (attr && attr[1]) {
-				bdattr = attr[1].match(/\s*(\w+\s*=\s*".*?"|\w+\s*=\s*'.*?'|\w+\s*=\s*\w+|\w+)\s*/g);
+			function getAttr(elm, name) {
+				var value = elm.attr(name);
 
-				if (bdattr) {
-					for(i = 0, len = bdattr.length; i < len; i++) {
-						kv = bdattr[i].split('=');
-						k = kv[0].replace(/\s/,'');
-						v = kv[1];
+				return value || '';
+			};
 
-						if (v) {
-							v = v.replace(/^\s+/,'').replace(/\s+$/,'');
-							t = v.match(/^["'](.*)["']$/);
+			// Default some values
+			data.fontface = editor.getParam("fullpage_default_fontface", "");
+			data.fontsize = editor.getParam("fullpage_default_fontsize", "");
 
-							if (t)
-								v = t[1];
-						} else
-							v = k;
-
-						ed.dom.setAttrib(ed.getBody(), 'style', v);
-					}
-				}
+			// Parse XML PI
+			elm = headerFragment.firstChild;
+			if (elm.type == 7) {
+				data.xml_pi = true;
+				matches = /encoding="([^"]+)"/.exec(elm.value);
+				if (matches)
+					data.docencoding = matches[1];
 			}
+
+			// Parse doctype
+			elm = headerFragment.getAll('#doctype')[0];
+			if (elm)
+				data.doctype = '<!DOCTYPE' + elm.value + ">"; 
+
+			// Parse title element
+			elm = headerFragment.getAll('title')[0];
+			if (elm && elm.firstChild) {
+				data.metatitle = elm.firstChild.value;
+			}
+
+			// Parse meta elements
+			each(headerFragment.getAll('meta'), function(meta) {
+				var name = meta.attr('name'), httpEquiv = meta.attr('http-equiv'), matches;
+
+				if (name)
+					data['meta' + name.toLowerCase()] = meta.attr('content');
+				else if (httpEquiv == "Content-Type") {
+					matches = /charset\s*=\s*(.*)\s*/gi.exec(meta.attr('content'));
+
+					if (matches)
+						data.docencoding = matches[1];
+				}
+			});
+
+			// Parse html attribs
+			elm = headerFragment.getAll('html')[0];
+			if (elm)
+				data.langcode = getAttr(elm, 'lang') || getAttr(elm, 'xml:lang');
+	
+			// Parse stylesheet
+			elm = headerFragment.getAll('link')[0];
+			if (elm && elm.attr('rel') == 'stylesheet')
+				data.stylesheet = elm.attr('href');
+
+			// Parse body parts
+			elm = headerFragment.getAll('body')[0];
+			if (elm) {
+				data.langdir = getAttr(elm, 'dir');
+				data.style = getAttr(elm, 'style');
+				data.visited_color = getAttr(elm, 'vlink');
+				data.link_color = getAttr(elm, 'link');
+				data.active_color = getAttr(elm, 'alink');
+			}
+
+			return data;
 		},
 
-		_createSerializer : function() {
-			return new tinymce.dom.Serializer({
-				dom : this.editor.dom,
-				apply_source_formatting : true
+		_dataToHtml : function(data) {
+			var headerFragment, headElement, html, elm, value, dom = this.editor.dom;
+
+			function setAttr(elm, name, value) {
+				elm.attr(name, value ? value : undefined);
+			};
+
+			function addHeadNode(node) {
+				if (headElement.firstChild)
+					headElement.insert(node, headElement.firstChild);
+				else
+					headElement.append(node);
+			};
+
+			headerFragment = this._parseHeader();
+			headElement = headerFragment.getAll('head')[0];
+			if (!headElement) {
+				elm = headerFragment.getAll('html')[0];
+				headElement = new Node('head', 1);
+
+				if (elm.firstChild)
+					elm.insert(headElement, elm.firstChild, true);
+				else
+					elm.append(headElement);
+			}
+
+			// Add/update/remove XML-PI
+			elm = headerFragment.firstChild;
+			if (data.xml_pi) {
+				value = 'version="1.0"';
+
+				if (data.docencoding)
+					value += ' encoding="' + data.docencoding + '"';
+
+				if (elm.type != 7) {
+					elm = new Node('xml', 7);
+					headerFragment.insert(elm, headerFragment.firstChild, true);
+				}
+
+				elm.value = value;
+			} else if (elm && elm.type == 7)
+				elm.remove();
+
+			// Add/update/remove doctype
+			elm = headerFragment.getAll('#doctype')[0];
+			if (data.doctype) {
+				if (!elm) {
+					elm = new Node('#doctype', 10);
+
+					if (data.xml_pi)
+						headerFragment.insert(elm, headerFragment.firstChild);
+					else
+						addHeadNode(elm);
+				}
+
+				elm.value = data.doctype.substring(9, data.doctype.length - 1);
+			} else if (elm)
+				elm.remove();
+
+			// Add/update/remove title
+			elm = headerFragment.getAll('title')[0];
+			if (data.metatitle) {
+				if (!elm) {
+					elm = new Node('title', 1);
+					elm.append(new Node('#text', 3)).value = data.metatitle;
+					addHeadNode(elm);
+				}
+			}
+
+			// Add meta encoding
+			if (data.docencoding) {
+				elm = null;
+				each(headerFragment.getAll('meta'), function(meta) {
+					if (meta.attr('http-equiv') == 'Content-Type')
+						elm = meta;
+				});
+
+				if (!elm) {
+					elm = new Node('meta', 1);
+					elm.attr('http-equiv', 'Content-Type');
+					elm.shortEnded = true;
+					addHeadNode(elm);
+				}
+
+				elm.attr('content', 'text/html; charset=' + data.docencoding);
+			}
+
+			// Add/update/remove meta
+			each('keywords,description,author,copyright,robots'.split(','), function(name) {
+				var nodes = headerFragment.getAll('meta'), i, meta, value = data['meta' + name];
+
+				for (i = 0; i < nodes.length; i++) {
+					meta = nodes[i];
+
+					if (meta.attr('name') == name) {
+						if (value)
+							meta.attr('content', value);
+						else
+							meta.remove();
+
+						return;
+					}
+				}
+
+				if (value) {
+					elm = new Node('meta', 1);
+					elm.attr('name', name);
+					elm.attr('content', value);
+					elm.shortEnded = true;
+
+					addHeadNode(elm);
+				}
 			});
+
+			// Add/update/delete link
+			elm = headerFragment.getAll('link')[0];
+			if (elm && elm.attr('rel') == 'stylesheet') {
+				if (data.stylesheet)
+					elm.attr('href', data.stylesheet);
+				else
+					elm.remove();
+			} else if (data.stylesheet) {
+				elm = new Node('link', 1);
+				elm.attr({
+					rel : 'stylesheet',
+					text : 'text/css',
+					href : data.stylesheet
+				});
+				elm.shortEnded = true;
+
+				addHeadNode(elm);
+			}
+
+			// Update body attributes
+			elm = headerFragment.getAll('body')[0];
+			if (elm) {
+				setAttr(elm, 'dir', data.langdir);
+				setAttr(elm, 'style', data.style);
+				setAttr(elm, 'vlink', data.visited_color);
+				setAttr(elm, 'link', data.link_color);
+				setAttr(elm, 'alink', data.active_color);
+
+				// Update iframe body as well
+				dom.setAttribs(this.editor.getBody(), {
+					style : data.style,
+					dir : data.dir,
+					vLink : data.visited_color,
+					link : data.link_color,
+					aLink : data.active_color
+				});
+			}
+
+			// Set html attributes
+			elm = headerFragment.getAll('html')[0];
+			if (elm) {
+				setAttr(elm, 'lang', data.langcode);
+				setAttr(elm, 'xml:lang', data.langcode);
+			}
+
+			// Serialize header fragment and crop away body part
+			html = new tinymce.html.Serializer({
+				validate: false,
+				indent: true,
+				apply_source_formatting : true,
+				indent_before: 'head,html,body,meta,title,script,link,style',
+				indent_after: 'head,html,body,meta,title,script,link,style'
+			}).serialize(headerFragment);
+
+			this.head = html.substring(0, html.indexOf('</body>'));
+		},
+
+		_parseHeader : function() {
+			// Parse the contents with a DOM parser
+			return new tinymce.html.DomParser({
+				validate: false,
+				root_name: '#document'
+			}).parse(this.head);
 		},
 
 		_setContent : function(ed, o) {
-			var t = this, sp, ep, c = o.content, v, st = '';
+			var self = this, startPos, endPos, content = o.content, headerFragment, styles = '', dom = self.editor.dom, elm;
+
+			function low(s) {
+				return s.replace(/<\/?[A-Z]+/g, function(a) {
+					return a.toLowerCase();
+				})
+			};
 
 			// Ignore raw updated if we already have a head, this will fix issues with undo/redo keeping the head/foot separate
-			if (o.format == 'raw' && t.head)
+			if (o.format == 'raw' && self.head)
 				return;
 
 			if (o.source_view && ed.getParam('fullpage_hide_in_source_view'))
 				return;
 
 			// Parse out head, body and footer
-			c = c.replace(/<(\/?)BODY/gi, '<$1body');
-			sp = c.indexOf('<body');
+			content = content.replace(/<(\/?)BODY/gi, '<$1body');
+			startPos = content.indexOf('<body');
 
-			if (sp != -1) {
-				sp = c.indexOf('>', sp);
-				t.head = c.substring(0, sp + 1);
+			if (startPos != -1) {
+				startPos = content.indexOf('>', startPos);
+				self.head = low(content.substring(0, startPos + 1));
 
-				ep = c.indexOf('</body', sp);
-				if (ep == -1)
-					ep = c.indexOf('</body', ep);
+				endPos = content.indexOf('</body', startPos);
+				if (endPos == -1)
+					endPos = content.length;
 
-				o.content = c.substring(sp + 1, ep);
-				t.foot = c.substring(ep);
-
-				function low(s) {
-					return s.replace(/<\/?[A-Z]+/g, function(a) {
-						return a.toLowerCase();
-					})
-				};
-
-				t.head = low(t.head);
-				t.foot = low(t.foot);
+				o.content = content.substring(startPos + 1, endPos);
+				self.foot = low(content.substring(endPos));
 			} else {
-				t.head = '';
-				if (ed.getParam('fullpage_default_xml_pi'))
-					t.head += '<?xml version="1.0" encoding="' + ed.getParam('fullpage_default_encoding', 'ISO-8859-1') + '" ?>\n';
-
-				t.head += ed.getParam('fullpage_default_doctype', '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">');
-				t.head += '\n<html>\n<head>\n<title>' + ed.getParam('fullpage_default_title', 'Untitled document') + '</title>\n';
-
-				if (v = ed.getParam('fullpage_default_encoding'))
-					t.head += '<meta http-equiv="Content-Type" content="' + v + '" />\n';
-
-				if (v = ed.getParam('fullpage_default_font_family'))
-					st += 'font-family: ' + v + ';';
-
-				if (v = ed.getParam('fullpage_default_font_size'))
-					st += 'font-size: ' + v + ';';
-
-				if (v = ed.getParam('fullpage_default_text_color'))
-					st += 'color: ' + v + ';';
-
-				t.head += '</head>\n<body' + (st ? ' style="' + st + '"' : '') + '>\n';
-				t.foot = '\n</body>\n</html>';
+				self.head = this._getDefaultHeader();
+				self.foot = '\n</body>\n</html>';
 			}
+
+			// Parse header and update iframe
+			headerFragment = self._parseHeader();
+			each(headerFragment.getAll('style'), function(node) {
+				if (node.firstChild)
+					styles += node.firstChild.value;
+			});
+
+			elm = headerFragment.getAll('body')[0];
+			if (elm) {
+				dom.setAttribs(self.editor.getBody(), {
+					style : elm.attr('style') || '',
+					dir : elm.attr('dir') || '',
+					vLink : elm.attr('vlink') || '',
+					link : elm.attr('link') || '',
+					aLink : elm.attr('alink') || ''
+				});
+			}
+
+			if (styles)
+				dom.add(self.editor.getDoc().getElementsByTagName('head')[0], 'style', {id : 'fullpage_styles'}, styles);
+			else
+				dom.remove('fullpage_styles');
+		},
+
+		_getDefaultHeader : function() {
+			var header = '', editor = this.editor, value, styles = '';
+
+			if (editor.getParam('fullpage_default_xml_pi'))
+				header += '<?xml version="1.0" encoding="' + editor.getParam('fullpage_default_encoding', 'ISO-8859-1') + '" ?>\n';
+
+			header += editor.getParam('fullpage_default_doctype', '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">');
+			header += '\n<html>\n<head>\n';
+
+			if (value = editor.getParam('fullpage_default_title'))
+				header += '<title>' + value + '</title>\n';
+
+			if (value = editor.getParam('fullpage_default_encoding'))
+				header += '<meta http-equiv="Content-Type" content="text/html; charset=' + value + '" />\n';
+
+			if (value = editor.getParam('fullpage_default_font_family'))
+				styles += 'font-family: ' + value + ';';
+
+			if (value = editor.getParam('fullpage_default_font_size'))
+				styles += 'font-size: ' + value + ';';
+
+			if (value = editor.getParam('fullpage_default_text_color'))
+				styles += 'color: ' + value + ';';
+
+			header += '</head>\n<body' + (styles ? ' style="' + styles + '"' : '') + '>\n';
+
+			return header;
 		},
 
 		_getContent : function(ed, o) {
-			var t = this;
+			var self = this;
 
 			if (!o.source_view || !ed.getParam('fullpage_hide_in_source_view'))
-				o.content = tinymce.trim(t.head) + '\n' + tinymce.trim(o.content) + '\n' + tinymce.trim(t.foot);
+				o.content = tinymce.trim(self.head) + '\n' + tinymce.trim(o.content) + '\n' + tinymce.trim(self.foot);
 		}
 	});
 
 	// Register plugin
 	tinymce.PluginManager.add('fullpage', tinymce.plugins.FullPagePlugin);
-})();
\ No newline at end of file
+})();
diff --git a/plugins/TinyMCE/js/plugins/fullpage/fullpage.htm b/plugins/TinyMCE/js/plugins/fullpage/fullpage.htm
index c32afaf2d9..14ab8652ea 100644
--- a/plugins/TinyMCE/js/plugins/fullpage/fullpage.htm
+++ b/plugins/TinyMCE/js/plugins/fullpage/fullpage.htm
@@ -8,13 +8,12 @@
 	<script type="text/javascript" src="js/fullpage.js"></script>
 	<link href="css/fullpage.css" rel="stylesheet" type="text/css" />
 </head>
-<body id="advlink" style="display: none">
-    <form onsubmit="updateAction();return false;" name="fullpage" action="#">
+<body id="fullpage" style="display: none">
+<form onsubmit="FullPageDialog.update();return false;" name="fullpage" action="#">
 		<div class="tabs">
 			<ul>
 				<li id="meta_tab" class="current"><span><a href="javascript:mcTabs.displayTab('meta_tab','meta_panel');" onmousedown="return false;">{#fullpage_dlg.meta_tab}</a></span></li>
 				<li id="appearance_tab"><span><a href="javascript:mcTabs.displayTab('appearance_tab','appearance_panel');" onmousedown="return false;">{#fullpage_dlg.appearance_tab}</a></span></li>
-				<li id="advanced_tab"><span><a href="javascript:mcTabs.displayTab('advanced_tab','advanced_panel');" onmousedown="return false;">{#fullpage_dlg.advanced_tab}</a></span></li>
 			</ul>
 		</div>
 
@@ -72,9 +71,9 @@
 							</td> 
 						</tr>
 						<tr>
-							<td class="nowrap"><label for="doctypes">{#fullpage_dlg.doctypes}</label>&nbsp;</td>
+							<td class="nowrap"><label for="doctype">{#fullpage_dlg.doctypes}</label>&nbsp;</td>
 							<td>
-								<select id="doctypes" name="doctypes">
+								<select id="doctype" name="doctype">
 										<option value="">{#not_set}</option>
 								</select>
 							</td>
@@ -109,7 +108,7 @@
 						<tr>
 							<td class="column1"><label for="fontface">{#fullpage_dlg.fontface}</label></td> 
 							<td>
-								<select id="fontface" name="fontface" onchange="changedStyleField(this);">
+								<select id="fontface" name="fontface" onchange="FullPageDialog.changedStyleProp();">
 										<option value="">{#not_set}</option>
 								</select>
 							</td> 
@@ -118,7 +117,7 @@
 						<tr>
 							<td class="column1"><label for="fontsize">{#fullpage_dlg.fontsize}</label></td> 
 							<td>
-								<select id="fontsize" name="fontsize" onchange="changedStyleField(this);">
+								<select id="fontsize" name="fontsize" onchange="FullPageDialog.changedStyleProp();">
 										<option value="">{#not_set}</option>
 								</select>
 							</td>
@@ -129,7 +128,7 @@
 							<td>
 								<table border="0" cellpadding="0" cellspacing="0">
 									<tr>
-										<td><input id="textcolor" name="textcolor" type="text" value="" size="9" onchange="updateColor('textcolor_pick','textcolor');changedStyleField(this);" /></td>
+										<td><input id="textcolor" name="textcolor" type="text" value="" size="9" onchange="updateColor('textcolor_pick','textcolor');FullPageDialog.changedStyleProp();" /></td>
 										<td id="textcolor_pickcontainer">&nbsp;</td>
 									</tr>
 								</table>
@@ -147,7 +146,7 @@
 							<td>
 								<table border="0" cellpadding="0" cellspacing="0">
 									<tr>
-										<td><input id="bgimage" name="bgimage" type="text" value="" onchange="changedStyleField(this);" /></td>
+										<td><input id="bgimage" name="bgimage" type="text" value="" onchange="FullPageDialog.changedStyleProp();" /></td>
 										<td id="bgimage_pickcontainer">&nbsp;</td>
 									</tr>
 								</table>
@@ -158,7 +157,7 @@
 							<td>
 								<table border="0" cellpadding="0" cellspacing="0">
 									<tr>
-										<td><input id="bgcolor" name="bgcolor" type="text" value="" size="9" onchange="updateColor('bgcolor_pick','bgcolor');changedStyleField(this);" /></td>
+										<td><input id="bgcolor" name="bgcolor" type="text" value="" size="9" onchange="updateColor('bgcolor_pick','bgcolor');FullPageDialog.changedStyleProp();" /></td>
 										<td id="bgcolor_pickcontainer">&nbsp;</td>
 									</tr>
 								</table>
@@ -173,15 +172,15 @@
 					<table border="0" cellpadding="4" cellspacing="0">
 						<tr>
 							<td class="column1"><label for="leftmargin">{#fullpage_dlg.left_margin}</label></td> 
-							<td><input id="leftmargin" name="leftmargin" type="text" value="" onchange="changedStyleField(this);" /></td>
+							<td><input id="leftmargin" name="leftmargin" type="text" value="" onchange="FullPageDialog.changedStyleProp();" /></td>
 							<td class="column1"><label for="rightmargin">{#fullpage_dlg.right_margin}</label></td> 
-							<td><input id="rightmargin" name="rightmargin" type="text" value="" onchange="changedStyleField(this);" /></td>
+							<td><input id="rightmargin" name="rightmargin" type="text" value="" onchange="FullPageDialog.changedStyleProp();" /></td>
 						</tr>
 						<tr>
 							<td class="column1"><label for="topmargin">{#fullpage_dlg.top_margin}</label></td> 
-							<td><input id="topmargin" name="topmargin" type="text" value="" onchange="changedStyleField(this);" /></td>
+							<td><input id="topmargin" name="topmargin" type="text" value="" onchange="FullPageDialog.changedStyleProp();" /></td>
 							<td class="column1"><label for="bottommargin">{#fullpage_dlg.bottom_margin}</label></td> 
-							<td><input id="bottommargin" name="bottommargin" type="text" value="" onchange="changedStyleField(this);" /></td>
+							<td><input id="bottommargin" name="bottommargin" type="text" value="" onchange="FullPageDialog.changedStyleProp();" /></td>
 						</tr>
 					</table>
 				</fieldset>
@@ -195,7 +194,7 @@
 							<td>
 								<table border="0" cellpadding="0" cellspacing="0">
 									<tr>
-										<td><input id="link_color" name="link_color" type="text" value="" size="9" onchange="updateColor('link_color_pick','link_color');changedStyleField(this);" /></td>
+										<td><input id="link_color" name="link_color" type="text" value="" size="9" onchange="updateColor('link_color_pick','link_color');FullPageDialog.changedStyleProp();" /></td>
 										<td id="link_color_pickcontainer">&nbsp;</td>
 									</tr>
 								</table>
@@ -205,7 +204,7 @@
 							<td>
 								<table border="0" cellpadding="0" cellspacing="0">
 									<tr>
-										<td><input id="visited_color" name="visited_color" type="text" value="" size="9" onchange="updateColor('visited_color_pick','visited_color');changedStyleField(this);" /></td>
+										<td><input id="visited_color" name="visited_color" type="text" value="" size="9" onchange="updateColor('visited_color_pick','visited_color');FullPageDialog.changedStyleProp();" /></td>
 										<td id="visited_color_pickcontainer">&nbsp;</td>
 									</tr>
 								</table>
@@ -217,7 +216,7 @@
 							<td>
 								<table border="0" cellpadding="0" cellspacing="0">
 									<tr>
-										<td><input id="active_color" name="active_color" type="text" value="" size="9" onchange="updateColor('active_color_pick','active_color');changedStyleField(this);" /></td>
+										<td><input id="active_color" name="active_color" type="text" value="" size="9" onchange="updateColor('active_color_pick','active_color');FullPageDialog.changedStyleProp();" /></td>
 										<td id="active_color_pickcontainer">&nbsp;</td>
 									</tr>
 								</table>
@@ -225,16 +224,6 @@
 
 							<td>&nbsp;</td>
 							<td>&nbsp;</td>
-
-<!--							<td class="column1"><label for="hover_color">{#fullpage_dlg.hover_color}</label></td> 
-							<td>
-								<table border="0" cellpadding="0" cellspacing="0">
-									<tr>
-										<td><input id="hover_color" name="hover_color" type="text" value="" size="9" onchange="changedStyleField(this);" /></td>
-										<td id="hover_color_pickcontainer">&nbsp;</td>
-									</tr>
-								</table>
-							</td> -->
 						</tr>
 					</table>
 				</fieldset>
@@ -254,318 +243,17 @@
 						</tr>
 						<tr>
 							<td class="column1"><label for="style">{#fullpage_dlg.style}</label></td> 
-							<td><input id="style" name="style" type="text" value="" onchange="changedStyleField(this);" /></td>
+							<td><input id="style" name="style" type="text" value="" onchange="FullPageDialog.changedStyle();" /></td>
 						</tr>
 					</table>
 				</fieldset>
 			</div>
-
-			<div id="advanced_panel" class="panel">
-				<div id="addmenu">
-					<table border="0" cellpadding="0" cellspacing="0">
-						<tr><td><a href="javascript:addHeadElm('title');" onmousedown="return false;"><span>{#fullpage_dlg.add_title}</span></a></td></tr>
-						<tr><td><a href="javascript:addHeadElm('meta');" onmousedown="return false;"><span>{#fullpage_dlg.add_meta}</span></a></td></tr>
-						<tr><td><a href="javascript:addHeadElm('script');" onmousedown="return false;"><span>{#fullpage_dlg.add_script}</span></a></td></tr>
-						<tr><td><a href="javascript:addHeadElm('style');" onmousedown="return false;"><span>{#fullpage_dlg.add_style}</span></a></td></tr>
-						<tr><td><a href="javascript:addHeadElm('link');" onmousedown="return false;"><span>{#fullpage_dlg.add_link}</span></a></td></tr>
-						<tr><td><a href="javascript:addHeadElm('base');" onmousedown="return false;"><span>{#fullpage_dlg.add_base}</span></a></td></tr>
-						<tr><td><a href="javascript:addHeadElm('comment');" onmousedown="return false;"><span>{#fullpage_dlg.add_comment}</span></a></td></tr>
-					</table>
-				</div>
-
-				<fieldset>
-					<legend>{#fullpage_dlg.head_elements}</legend>
-
-					<div class="headlistwrapper">
-						<div class="toolbar">
-							<div style="float: left">
-								<a id="addbutton" href="javascript:showAddMenu();" onmousedown="return false;" class="addbutton" title="{#fullpage_dlg.add}"></a>
-								<a href="#" onmousedown="return false;" class="removebutton" title="{#fullpage_dlg.remove}"></a>
-							</div>
-							<div style="float: right">
-								<a href="#" onmousedown="return false;" class="moveupbutton" title="{#fullpage_dlg.moveup}"></a>
-								<a href="#" onmousedown="return false;" class="movedownbutton" title="{#fullpage_dlg.movedown}"></a>
-							</div>
-							<br style="clear: both" />
-						</div>
-						<select id="headlist" size="26" onchange="updateHeadElm(this.options[this.selectedIndex].value);">
-							<option value="title_0">&lt;title&gt;Some title bla bla bla&lt;/title&gt;</option>
-							<option value="meta_1">&lt;meta name="keywords"&gt;Some bla bla bla&lt;/meta&gt;</option>
-							<option value="meta_2">&lt;meta name="description"&gt;Some bla bla bla bla bla bla bla bla bla&lt;/meta&gt;</option>
-							<option value="script_3">&lt;script language=&quot;javascript&quot;&gt;...&lt;/script&gt;</option>
-							<option value="style_4">&lt;style&gt;...&lt;/style&gt;</option>
-							<option value="base_5">&lt;base href="." /&gt;</option>
-							<option value="comment_6">&lt;!-- ... --&gt;</option>
-							<option value="link_7">&lt;link href="." /&gt;</option>
-						</select>
-					</div>
-				</fieldset>
-
-				<fieldset id="meta_element">
-					<legend>{#fullpage_dlg.meta_element}</legend>
-
-					<table border="0" cellpadding="4" cellspacing="0">
-						<tr>
-							<td class="column1"><label for="element_meta_type">{#fullpage_dlg.type}</label></td> 
-							<td><select id="element_meta_type">
-										<option value="name">name</option>
-										<option value="http-equiv">http-equiv</option>
-								</select></td>
-						</tr>
-						<tr>
-							<td class="column1"><label for="element_meta_name">{#fullpage_dlg.name}</label></td> 
-							<td><input id="element_meta_name" name="element_meta_name" type="text" value="" /></td>
-						</tr>
-						<tr>
-							<td class="column1"><label for="element_meta_content">{#fullpage_dlg.content}</label></td> 
-							<td><input id="element_meta_content" name="element_meta_content" type="text" value="" /></td>
-						</tr>
-					</table>
-
-					<input type="button" id="meta_updateelement" class="updateElementButton" name="update" value="{#update}" onclick="updateElement();" />
-				</fieldset>
-
-				<fieldset id="title_element">
-					<legend>{#fullpage_dlg.title_element}</legend>
-
-					<table border="0" cellpadding="4" cellspacing="0">
-						<tr>
-							<td class="column1"><label for="element_title">{#fullpage_dlg.meta_title}</label></td> 
-							<td><input id="element_title" name="element_title" type="text" value="" /></td>
-						</tr>
-					</table>
-
-					<input type="button" id="title_updateelement" class="updateElementButton" name="update" value="{#update}" onclick="updateElement();" />
-				</fieldset>
-
-				<fieldset id="script_element">
-					<legend>{#fullpage_dlg.script_element}</legend>
-
-					<div class="tabs">
-						<ul>
-							<li id="script_props_tab" class="current"><span><a href="javascript:mcTabs.displayTab('script_props_tab','script_props_panel');" onmousedown="return false;">{#fullpage_dlg.properties}</a></span></li>
-							<li id="script_value_tab"><span><a href="javascript:mcTabs.displayTab('script_value_tab','script_value_panel');" onmousedown="return false;">{#fullpage_dlg.value}</a></span></li>
-						</ul>
-					</div>
-
-					<br style="clear: both" />
-
-					<div class="panel_wrapper">
-						<div id="script_props_panel" class="panel current">
-							<table border="0" cellpadding="4" cellspacing="0">
-								<tr>
-									<td class="column1"><label for="element_script_type">{#fullpage_dlg.type}</label></td> 
-									<td><select id="element_script_type">
-										<option value="text/javascript">text/javascript</option>
-										<option value="text/jscript">text/jscript</option>
-										<option value="text/vbscript">text/vbscript</option>
-										<option value="text/vbs">text/vbs</option>
-										<option value="text/ecmascript">text/ecmascript</option>
-										<option value="text/xml">text/xml</option>
-									</select></td>
-								</tr>
-								<tr>
-									<td class="column1"><label for="element_script_src">{#fullpage_dlg.src}</label></td> 
-									<td><table border="0" cellpadding="0" cellspacing="0">
-									<tr>
-										<td><input id="element_script_src" name="element_script_src" type="text" value="" /></td>
-										<td id="script_src_pickcontainer">&nbsp;</td>
-									</tr>
-								</table></td>
-								</tr>
-								<tr>
-									<td class="column1"><label for="element_script_charset">{#fullpage_dlg.charset}</label></td> 
-									<td><select id="element_script_charset"><option value="">{#not_set}</option></select></td>
-								</tr>
-								<tr>
-									<td class="column1"><label for="element_script_defer">{#fullpage_dlg.defer}</label></td> 
-									<td><input type="checkbox" id="element_script_defer" name="element_script_defer" class="checkbox" /></td>
-								</tr>
-							</table>
-						</div>
-
-						<div id="script_value_panel" class="panel">
-							<textarea id="element_script_value"></textarea>
-						</div>
-					</div>
-
-					<input type="button" id="script_updateelement" class="updateElementButton" name="update" value="{#update}" onclick="updateElement();" />
-				</fieldset>
-
-				<fieldset id="style_element">
-					<legend>{#fullpage_dlg.style_element}</legend>
-
-					<div class="tabs">
-						<ul>
-							<li id="style_props_tab" class="current"><span><a href="javascript:mcTabs.displayTab('style_props_tab','style_props_panel');" onmousedown="return false;">{#fullpage_dlg.properties}</a></span></li>
-							<li id="style_value_tab"><span><a href="javascript:mcTabs.displayTab('style_value_tab','style_value_panel');" onmousedown="return false;">{#fullpage_dlg.value}</a></span></li>
-						</ul>
-					</div>
-
-					<br style="clear: both" />
-
-					<div class="panel_wrapper">
-						<div id="style_props_panel" class="panel current">
-							<table border="0" cellpadding="4" cellspacing="0">
-								<tr>
-									<td class="column1"><label for="element_style_type">{#fullpage_dlg.type}</label></td> 
-									<td><select id="element_style_type">
-										<option value="text/css">text/css</option>
-									</select></td>
-								</tr>
-								<tr>
-									<td class="column1"><label for="element_style_media">{#fullpage_dlg.media}</label></td> 
-									<td><select id="element_style_media"></select></td>
-								</tr>
-							</table>
-						</div>
-
-						<div id="style_value_panel" class="panel">
-							<textarea id="element_style_value"></textarea>
-						</div>
-					</div>
-
-					<input type="button" id="style_updateelement" class="updateElementButton" name="update" value="{#update}" onclick="updateElement();" />
-				</fieldset>
-
-				<fieldset id="base_element">
-					<legend>{#fullpage_dlg.base_element}</legend>
-
-					<table border="0" cellpadding="4" cellspacing="0">
-						<tr>
-							<td class="column1"><label for="element_base_href">{#fullpage_dlg.href}</label></td> 
-							<td><input id="element_base_href" name="element_base_href" type="text" value="" /></td>
-						</tr>
-						<tr>
-							<td class="column1"><label for="element_base_target">{#fullpage_dlg.target}</label></td> 
-							<td><input id="element_base_target" name="element_base_target" type="text" value="" /></td>
-						</tr>
-					</table>
-
-					<input type="button" id="base_updateelement" class="updateElementButton" name="update" value="{#update}" onclick="updateElement();" />
-				</fieldset>
-
-				<fieldset id="link_element">
-					<legend>{#fullpage_dlg.link_element}</legend>
-
-					<div class="tabs">
-						<ul>
-							<li id="link_general_tab" class="current"><span><a href="javascript:mcTabs.displayTab('link_general_tab','link_general_panel');" onmousedown="return false;">{#fullpage_dlg.general_props}</a></span></li>
-							<li id="link_advanced_tab"><span><a href="javascript:mcTabs.displayTab('link_advanced_tab','link_advanced_panel');" onmousedown="return false;">{#fullpage_dlg.advanced_props}</a></span></li>
-						</ul>
-					</div>
-
-					<br style="clear: both" />
-
-					<div class="panel_wrapper">
-						<div id="link_general_panel" class="panel current">
-							<table border="0" cellpadding="4" cellspacing="0">
-								<tr>
-									<td class="column1"><label for="element_link_href">{#fullpage_dlg.href}</label></td> 
-									<td><table border="0" cellpadding="0" cellspacing="0">
-									<tr>
-										<td><input id="element_link_href" name="element_link_href" type="text" value="" /></td>
-										<td id="link_href_pickcontainer">&nbsp;</td>
-									</tr>
-								</table></td>
-								</tr>
-								<tr>
-									<td class="column1"><label for="element_link_title">{#fullpage_dlg.meta_title}</label></td> 
-									<td><input id="element_link_title" name="element_link_title" type="text" value="" /></td>
-								</tr>
-								<tr>
-									<td class="column1"><label for="element_link_type">{#fullpage_dlg.type}</label></td> 
-									<td><select id="element_link_type" name="element_link_type">
-										<option value="text/css">text/css</option>
-										<option value="text/javascript">text/javascript</option>
-									</select></td>
-								</tr>
-								<tr>
-									<td class="column1"><label for="element_link_media">{#fullpage_dlg.media}</label></td> 
-									<td><select id="element_link_media" name="element_link_media"></select></td>
-								</tr>
-								<tr>
-									<td><label for="element_style_rel">{#fullpage_dlg.rel}</label></td>
-									<td><select id="element_style_rel" name="element_style_rel"> 
-											<option value="">{#not_set}</option> 
-											<option value="stylesheet">Stylesheet</option>
-											<option value="alternate">Alternate</option>
-											<option value="designates">Designates</option>
-											<option value="start">Start</option>
-											<option value="next">Next</option>
-											<option value="prev">Prev</option>
-											<option value="contents">Contents</option>
-											<option value="index">Index</option>
-											<option value="glossary">Glossary</option>
-											<option value="copyright">Copyright</option>
-											<option value="chapter">Chapter</option>
-											<option value="subsection">Subsection</option>
-											<option value="appendix">Appendix</option>
-											<option value="help">Help</option>
-											<option value="bookmark">Bookmark</option>
-										</select> 
-									</td>
-								</tr>
-							</table>
-						</div>
-
-						<div id="link_advanced_panel" class="panel">
-							<table border="0" cellpadding="4" cellspacing="0">
-								<tr>
-									<td class="column1"><label for="element_link_charset">{#fullpage_dlg.charset}</label></td> 
-									<td><select id="element_link_charset"><option value="">{#not_set}</option></select></td>
-								</tr>
-								<tr>
-									<td class="column1"><label for="element_link_hreflang">{#fullpage_dlg.hreflang}</label></td> 
-									<td><input id="element_link_hreflang" name="element_link_hreflang" type="text" value="" /></td>
-								</tr>
-								<tr>
-									<td class="column1"><label for="element_link_target">{#fullpage_dlg.target}</label></td> 
-									<td><input id="element_link_target" name="element_link_target" type="text" value="" /></td>
-								</tr>
-								<tr>
-									<td><label for="element_style_rev">{#fullpage_dlg.rev}</label></td>
-									<td><select id="element_style_rev" name="element_style_rev"> 
-											<option value="">{#not_set}</option> 
-											<option value="alternate">Alternate</option> 
-											<option value="designates">Designates</option> 
-											<option value="stylesheet">Stylesheet</option> 
-											<option value="start">Start</option> 
-											<option value="next">Next</option> 
-											<option value="prev">Prev</option> 
-											<option value="contents">Contents</option> 
-											<option value="index">Index</option> 
-											<option value="glossary">Glossary</option> 
-											<option value="copyright">Copyright</option> 
-											<option value="chapter">Chapter</option> 
-											<option value="subsection">Subsection</option> 
-											<option value="appendix">Appendix</option> 
-											<option value="help">Help</option> 
-											<option value="bookmark">Bookmark</option> 
-										</select> 
-									</td>
-								</tr>
-							</table>
-						</div>
-					</div>
-
-					<input type="button" id="link_updateelement" class="updateElementButton" name="update" value="{#update}" onclick="updateElement();" />
-				</fieldset>
-
-				<fieldset id="comment_element">
-					<legend>{#fullpage_dlg.comment_element}</legend>
-
-					<textarea id="element_comment_value"></textarea>
-
-					<input type="button" id="comment_updateelement" class="updateElementButton" name="update" value="{#update}" onclick="updateElement();" />
-				</fieldset>
-			</div>
 		</div>
 
 		<div class="mceActionPanel">
 			<input type="submit" id="insert" name="update" value="{#update}" />
 			<input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />
 		</div>
-    </form>
+</form>
 </body>
 </html>
diff --git a/plugins/TinyMCE/js/plugins/fullpage/js/fullpage.js b/plugins/TinyMCE/js/plugins/fullpage/js/fullpage.js
index a1bb719a38..3f672ad3ba 100644
--- a/plugins/TinyMCE/js/plugins/fullpage/js/fullpage.js
+++ b/plugins/TinyMCE/js/plugins/fullpage/js/fullpage.js
@@ -8,464 +8,225 @@
  * Contributing: http://tinymce.moxiecode.com/contributing
  */
 
-tinyMCEPopup.requireLangPack();
+(function() {
+	tinyMCEPopup.requireLangPack();
 
-var doc;
+	var defaultDocTypes = 
+		'XHTML 1.0 Transitional=<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">,' +
+		'XHTML 1.0 Frameset=<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">,' +
+		'XHTML 1.0 Strict=<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">,' +
+		'XHTML 1.1=<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">,' +
+		'HTML 4.01 Transitional=<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">,' +
+		'HTML 4.01 Strict=<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">,' +
+		'HTML 4.01 Frameset=<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd">';
 
-var defaultDocTypes = 
-	'XHTML 1.0 Transitional=<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">,' +
-	'XHTML 1.0 Frameset=<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">,' +
-	'XHTML 1.0 Strict=<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">,' +
-	'XHTML 1.1=<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">,' +
-	'HTML 4.01 Transitional=<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">,' +
-	'HTML 4.01 Strict=<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">,' +
-	'HTML 4.01 Frameset=<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd">';
+	var defaultEncodings = 
+		'Western european (iso-8859-1)=iso-8859-1,' +
+		'Central European (iso-8859-2)=iso-8859-2,' +
+		'Unicode (UTF-8)=utf-8,' +
+		'Chinese traditional (Big5)=big5,' +
+		'Cyrillic (iso-8859-5)=iso-8859-5,' +
+		'Japanese (iso-2022-jp)=iso-2022-jp,' +
+		'Greek (iso-8859-7)=iso-8859-7,' +
+		'Korean (iso-2022-kr)=iso-2022-kr,' +
+		'ASCII (us-ascii)=us-ascii';
 
-var defaultEncodings = 
-	'Western european (iso-8859-1)=iso-8859-1,' +
-	'Central European (iso-8859-2)=iso-8859-2,' +
-	'Unicode (UTF-8)=utf-8,' +
-	'Chinese traditional (Big5)=big5,' +
-	'Cyrillic (iso-8859-5)=iso-8859-5,' +
-	'Japanese (iso-2022-jp)=iso-2022-jp,' +
-	'Greek (iso-8859-7)=iso-8859-7,' +
-	'Korean (iso-2022-kr)=iso-2022-kr,' +
-	'ASCII (us-ascii)=us-ascii';
+	var defaultFontNames = 'Arial=arial,helvetica,sans-serif;Courier New=courier new,courier,monospace;Georgia=georgia,times new roman,times,serif;Tahoma=tahoma,arial,helvetica,sans-serif;Times New Roman=times new roman,times,serif;Verdana=verdana,arial,helvetica,sans-serif;Impact=impact;WingDings=wingdings';
+	var defaultFontSizes = '10px,11px,12px,13px,14px,15px,16px';
 
-var defaultMediaTypes = 
-	'all=all,' +
-	'screen=screen,' +
-	'print=print,' +
-	'tty=tty,' +
-	'tv=tv,' +
-	'projection=projection,' +
-	'handheld=handheld,' +
-	'braille=braille,' +
-	'aural=aural';
+	function setVal(id, value) {
+		var elm = document.getElementById(id);
 
-var defaultFontNames = 'Arial=arial,helvetica,sans-serif;Courier New=courier new,courier,monospace;Georgia=georgia,times new roman,times,serif;Tahoma=tahoma,arial,helvetica,sans-serif;Times New Roman=times new roman,times,serif;Verdana=verdana,arial,helvetica,sans-serif;Impact=impact;WingDings=wingdings';
-var defaultFontSizes = '10px,11px,12px,13px,14px,15px,16px';
+		if (elm) {
+			value = value || '';
 
-function init() {
-	var f = document.forms['fullpage'], el = f.elements, e, i, p, doctypes, encodings, mediaTypes, fonts, ed = tinyMCEPopup.editor, dom = tinyMCEPopup.dom, style;
-
-	// Setup doctype select box
-	doctypes = ed.getParam("fullpage_doctypes", defaultDocTypes).split(',');
-	for (i=0; i<doctypes.length; i++) {
-		p = doctypes[i].split('=');
-
-		if (p.length > 1)
-			addSelectValue(f, 'doctypes', p[0], p[1]);
-	}
-
-	// Setup fonts select box
-	fonts = ed.getParam("fullpage_fonts", defaultFontNames).split(';');
-	for (i=0; i<fonts.length; i++) {
-		p = fonts[i].split('=');
-
-		if (p.length > 1)
-			addSelectValue(f, 'fontface', p[0], p[1]);
-	}
-
-	// Setup fontsize select box
-	fonts = ed.getParam("fullpage_fontsizes", defaultFontSizes).split(',');
-	for (i=0; i<fonts.length; i++)
-		addSelectValue(f, 'fontsize', fonts[i], fonts[i]);
-
-	// Setup mediatype select boxs
-	mediaTypes = ed.getParam("fullpage_media_types", defaultMediaTypes).split(',');
-	for (i=0; i<mediaTypes.length; i++) {
-		p = mediaTypes[i].split('=');
-
-		if (p.length > 1) {
-			addSelectValue(f, 'element_style_media', p[0], p[1]);
-			addSelectValue(f, 'element_link_media', p[0], p[1]);
-		}
-	}
-
-	// Setup encodings select box
-	encodings = ed.getParam("fullpage_encodings", defaultEncodings).split(',');
-	for (i=0; i<encodings.length; i++) {
-		p = encodings[i].split('=');
-
-		if (p.length > 1) {
-			addSelectValue(f, 'docencoding', p[0], p[1]);
-			addSelectValue(f, 'element_script_charset', p[0], p[1]);
-			addSelectValue(f, 'element_link_charset', p[0], p[1]);
-		}
-	}
-
-	document.getElementById('bgcolor_pickcontainer').innerHTML = getColorPickerHTML('bgcolor_pick','bgcolor');
-	document.getElementById('link_color_pickcontainer').innerHTML = getColorPickerHTML('link_color_pick','link_color');
-	//document.getElementById('hover_color_pickcontainer').innerHTML = getColorPickerHTML('hover_color_pick','hover_color');
-	document.getElementById('visited_color_pickcontainer').innerHTML = getColorPickerHTML('visited_color_pick','visited_color');
-	document.getElementById('active_color_pickcontainer').innerHTML = getColorPickerHTML('active_color_pick','active_color');
-	document.getElementById('textcolor_pickcontainer').innerHTML = getColorPickerHTML('textcolor_pick','textcolor');
-	document.getElementById('stylesheet_browsercontainer').innerHTML = getBrowserHTML('stylesheetbrowser','stylesheet','file','fullpage');
-	document.getElementById('link_href_pickcontainer').innerHTML = getBrowserHTML('link_href_browser','element_link_href','file','fullpage');
-	document.getElementById('script_src_pickcontainer').innerHTML = getBrowserHTML('script_src_browser','element_script_src','file','fullpage');
-	document.getElementById('bgimage_pickcontainer').innerHTML = getBrowserHTML('bgimage_browser','bgimage','image','fullpage');
-
-	// Resize some elements
-	if (isVisible('stylesheetbrowser'))
-		document.getElementById('stylesheet').style.width = '220px';
-
-	if (isVisible('link_href_browser'))
-		document.getElementById('element_link_href').style.width = '230px';
-
-	if (isVisible('bgimage_browser'))
-		document.getElementById('bgimage').style.width = '210px';
-
-	// Add iframe
-	dom.add(document.body, 'iframe', {id : 'documentIframe', src : 'javascript:""', style : {display : 'none'}});
-	doc = dom.get('documentIframe').contentWindow.document;
-	h = tinyMCEPopup.getWindowArg('head_html');
-
-	// Preprocess the HTML disable scripts and urls
-	h = h.replace(/<script>/gi, '<script type="text/javascript">');
-	h = h.replace(/type=([\"\'])?/gi, 'type=$1-mce-');
-	h = h.replace(/(src=|href=)/g, '_mce_$1');
-
-	// Write in the content in the iframe
-	doc.write(h + '</body></html>');
-	doc.close();
-
-	// Parse xml and doctype
-	xmlVer = getReItem(/<\?\s*?xml.*?version\s*?=\s*?"(.*?)".*?\?>/gi, h, 1);
-	xmlEnc = getReItem(/<\?\s*?xml.*?encoding\s*?=\s*?"(.*?)".*?\?>/gi, h, 1);
-	docType = getReItem(/<\!DOCTYPE.*?>/gi, h.replace(/\n/g, ''), 0).replace(/ +/g, ' ');
-	f.langcode.value = getReItem(/lang="(.*?)"/gi, h, 1);
-
-	// Parse title
-	if (e = doc.getElementsByTagName('title')[0])
-		el.metatitle.value = e.textContent || e.text;
-
-	// Parse meta
-	tinymce.each(doc.getElementsByTagName('meta'), function(n) {
-		var na = (n.getAttribute('name', 2) || '').toLowerCase(), va = n.getAttribute('content', 2), eq = n.getAttribute('httpEquiv', 2) || '';
-
-		e = el['meta' + na];
-
-		if (na == 'robots') {
-			selectByValue(f, 'metarobots', tinymce.trim(va), true, true);
-			return;
-		}
-
-		switch (eq.toLowerCase()) {
-			case "content-type":
-				tmp = getReItem(/charset\s*=\s*(.*)\s*/gi, va, 1);
-
-				// Override XML encoding
-				if (tmp != "")
-					xmlEnc = tmp;
-
-				return;
-		}
-
-		if (e)
-			e.value = va;
-	});
-
-	selectByValue(f, 'doctypes', docType, true, true);
-	selectByValue(f, 'docencoding', xmlEnc, true, true);
-	selectByValue(f, 'langdir', doc.body.getAttribute('dir', 2) || '', true, true);
-
-	if (xmlVer != '')
-		el.xml_pi.checked = true;
-
-	// Parse appearance
-
-	// Parse primary stylesheet
-	tinymce.each(doc.getElementsByTagName("link"), function(l) {
-		var m = l.getAttribute('media', 2) || '', t = l.getAttribute('type', 2) || '';
-
-		if (t == "-mce-text/css" && (m == "" || m == "screen" || m == "all") && (l.getAttribute('rel', 2) || '') == "stylesheet") {
-			f.stylesheet.value = l.getAttribute('_mce_href', 2) || '';
-			return false;
-		}
-	});
-
-	// Get from style elements
-	tinymce.each(doc.getElementsByTagName("style"), function(st) {
-		var tmp = parseStyleElement(st);
-
-		for (x=0; x<tmp.length; x++) {
-			if (tmp[x].rule.indexOf('a:visited') != -1 && tmp[x].data['color'])
-				f.visited_color.value = tmp[x].data['color'];
-
-			if (tmp[x].rule.indexOf('a:link') != -1 && tmp[x].data['color'])
-				f.link_color.value = tmp[x].data['color'];
-
-			if (tmp[x].rule.indexOf('a:active') != -1 && tmp[x].data['color'])
-				f.active_color.value = tmp[x].data['color'];
-		}
-	});
-
-	f.textcolor.value = tinyMCEPopup.dom.getAttrib(doc.body, "text");
-	f.active_color.value = tinyMCEPopup.dom.getAttrib(doc.body, "alink");
-	f.link_color.value = tinyMCEPopup.dom.getAttrib(doc.body, "link");
-	f.visited_color.value = tinyMCEPopup.dom.getAttrib(doc.body, "vlink");
-	f.bgcolor.value = tinyMCEPopup.dom.getAttrib(doc.body, "bgcolor");
-	f.bgimage.value = tinyMCEPopup.dom.getAttrib(doc.body, "background");
-
-	// Get from style info
-	style = tinyMCEPopup.dom.parseStyle(tinyMCEPopup.dom.getAttrib(doc.body, 'style'));
-
-	if (style['font-family'])
-		selectByValue(f, 'fontface', style['font-family'], true, true);
-	else
-		selectByValue(f, 'fontface', ed.getParam("fullpage_default_fontface", ""), true, true);
-
-	if (style['font-size'])
-		selectByValue(f, 'fontsize', style['font-size'], true, true);
-	else
-		selectByValue(f, 'fontsize', ed.getParam("fullpage_default_fontsize", ""), true, true);
-
-	if (style['color'])
-		f.textcolor.value = convertRGBToHex(style['color']);
-
-	if (style['background-image'])
-		f.bgimage.value = style['background-image'].replace(new RegExp("url\\('?([^']*)'?\\)", 'gi'), "$1");
-
-	if (style['background-color'])
-		f.bgcolor.value = style['background-color'];
-
-	if (style['margin']) {
-		tmp = style['margin'].replace(/[^0-9 ]/g, '');
-		tmp = tmp.split(/ +/);
-		f.topmargin.value = tmp.length > 0 ? tmp[0] : '';
-		f.rightmargin.value = tmp.length > 1 ? tmp[1] : tmp[0];
-		f.bottommargin.value = tmp.length > 2 ? tmp[2] : tmp[0];
-		f.leftmargin.value = tmp.length > 3 ? tmp[3] : tmp[0];
-	}
-
-	if (style['margin-left'])
-		f.leftmargin.value = style['margin-left'].replace(/[^0-9]/g, '');
-
-	if (style['margin-right'])
-		f.rightmargin.value = style['margin-right'].replace(/[^0-9]/g, '');
-
-	if (style['margin-top'])
-		f.topmargin.value = style['margin-top'].replace(/[^0-9]/g, '');
-
-	if (style['margin-bottom'])
-		f.bottommargin.value = style['margin-bottom'].replace(/[^0-9]/g, '');
-
-	f.style.value = tinyMCEPopup.dom.serializeStyle(style);
-
-	// Update colors
-	updateColor('textcolor_pick', 'textcolor');
-	updateColor('bgcolor_pick', 'bgcolor');
-	updateColor('visited_color_pick', 'visited_color');
-	updateColor('active_color_pick', 'active_color');
-	updateColor('link_color_pick', 'link_color');
-}
-
-function getReItem(r, s, i) {
-	var c = r.exec(s);
-
-	if (c && c.length > i)
-		return c[i];
-
-	return '';
-}
-
-function updateAction() {
-	var f = document.forms[0], nl, i, h, v, s, head, html, l, tmp, addlink = true, ser;
-
-	head = doc.getElementsByTagName('head')[0];
-
-	// Fix scripts without a type
-	nl = doc.getElementsByTagName('script');
-	for (i=0; i<nl.length; i++) {
-		if (tinyMCEPopup.dom.getAttrib(nl[i], '_mce_type') == '')
-			nl[i].setAttribute('_mce_type', 'text/javascript');
-	}
-
-	// Get primary stylesheet
-	nl = doc.getElementsByTagName("link");
-	for (i=0; i<nl.length; i++) {
-		l = nl[i];
-
-		tmp = tinyMCEPopup.dom.getAttrib(l, 'media');
-
-		if (tinyMCEPopup.dom.getAttrib(l, '_mce_type') == "text/css" && (tmp == "" || tmp == "screen" || tmp == "all") && tinyMCEPopup.dom.getAttrib(l, 'rel') == "stylesheet") {
-			addlink = false;
-
-			if (f.stylesheet.value == '')
-				l.parentNode.removeChild(l);
+			if (elm.nodeName == "SELECT")
+				selectByValue(document.forms[0], id, value);
+			else if (elm.type == "checkbox")
+				elm.checked = !!value;
 			else
-				l.setAttribute('_mce_href', f.stylesheet.value);
-
-			break;
+				elm.value = value;
 		}
-	}
+	};
 
-	// Add new link
-	if (f.stylesheet.value != '') {
-		l = doc.createElement('link');
+	function getVal(id) {
+		var elm = document.getElementById(id);
 
-		l.setAttribute('type', 'text/css');
-		l.setAttribute('_mce_href', f.stylesheet.value);
-		l.setAttribute('rel', 'stylesheet');
+		if (elm.nodeName == "SELECT")
+			return elm.options[elm.selectedIndex].value;
 
-		head.appendChild(l);
-	}
+		if (elm.type == "checkbox")
+			return elm.checked;
 
-	setMeta(head, 'keywords', f.metakeywords.value);
-	setMeta(head, 'description', f.metadescription.value);
-	setMeta(head, 'author', f.metaauthor.value);
-	setMeta(head, 'copyright', f.metacopyright.value);
-	setMeta(head, 'robots', getSelectValue(f, 'metarobots'));
-	setMeta(head, 'Content-Type', getSelectValue(f, 'docencoding'));
+		return elm.value;
+	};
 
-	doc.body.dir = getSelectValue(f, 'langdir');
-	doc.body.style.cssText = f.style.value;
+	window.FullPageDialog = {
+		changedStyle : function() {
+			var val, styles = tinyMCEPopup.editor.dom.parseStyle(getVal('style'));
 
-	doc.body.setAttribute('vLink', f.visited_color.value);
-	doc.body.setAttribute('link', f.link_color.value);
-	doc.body.setAttribute('text', f.textcolor.value);
-	doc.body.setAttribute('aLink', f.active_color.value);
+			setVal('fontface', styles['font-face']);
+			setVal('fontsize', styles['font-size']);
+			setVal('textcolor', styles['color']);
 
-	doc.body.style.fontFamily = getSelectValue(f, 'fontface');
-	doc.body.style.fontSize = getSelectValue(f, 'fontsize');
-	doc.body.style.backgroundColor = f.bgcolor.value;
-
-	if (f.leftmargin.value != '')
-		doc.body.style.marginLeft = f.leftmargin.value + 'px';
-
-	if (f.rightmargin.value != '')
-		doc.body.style.marginRight = f.rightmargin.value + 'px';
-
-	if (f.bottommargin.value != '')
-		doc.body.style.marginBottom = f.bottommargin.value + 'px';
-
-	if (f.topmargin.value != '')
-		doc.body.style.marginTop = f.topmargin.value + 'px';
-
-	html = doc.getElementsByTagName('html')[0];
-	html.setAttribute('lang', f.langcode.value);
-	html.setAttribute('xml:lang', f.langcode.value);
-
-	if (f.bgimage.value != '')
-		doc.body.style.backgroundImage = "url('" + f.bgimage.value + "')";
-	else
-		doc.body.style.backgroundImage = '';
-
-	ser = tinyMCEPopup.editor.plugins.fullpage._createSerializer();
-	ser.setRules('-title,meta[http-equiv|name|content],base[href|target],link[href|rel|type|title|media],style[type],script[type|language|src],html[lang|xml::lang|xmlns],body[style|dir|vlink|link|text|alink],head');
-
-	h = ser.serialize(doc.documentElement);
-	h = h.substring(0, h.lastIndexOf('</body>'));
-
-	if (h.indexOf('<title>') == -1)
-		h = h.replace(/<head.*?>/, '$&\n' + '<title>' + tinyMCEPopup.dom.encode(f.metatitle.value) + '</title>');
-	else
-		h = h.replace(/<title>(.*?)<\/title>/, '<title>' + tinyMCEPopup.dom.encode(f.metatitle.value) + '</title>');
-
-	if ((v = getSelectValue(f, 'doctypes')) != '')
-		h = v + '\n' + h;
-
-	if (f.xml_pi.checked) {
-		s = '<?xml version="1.0"';
-
-		if ((v = getSelectValue(f, 'docencoding')) != '')
-			s += ' encoding="' + v + '"';
-
-		s += '?>\n';
-		h = s + h;
-	}
-
-	h = h.replace(/type=\"\-mce\-/gi, 'type="');
-
-	tinyMCEPopup.editor.plugins.fullpage.head = h;
-	tinyMCEPopup.editor.plugins.fullpage._setBodyAttribs(tinyMCEPopup.editor, {});
-	tinyMCEPopup.close();
-}
-
-function changedStyleField(field) {
-}
-
-function setMeta(he, k, v) {
-	var nl, i, m;
-
-	nl = he.getElementsByTagName('meta');
-	for (i=0; i<nl.length; i++) {
-		if (k == 'Content-Type' && tinyMCEPopup.dom.getAttrib(nl[i], 'http-equiv') == k) {
-			if (v == '')
-				nl[i].parentNode.removeChild(nl[i]);
+			if (val = styles['background-image'])
+				setVal('bgimage', val.replace(new RegExp("url\\('?([^']*)'?\\)", 'gi'), "$1"));
 			else
-				nl[i].setAttribute('content', "text/html; charset=" + v);
+				setVal('bgimage', '');
 
-			return;
-		}
+			setVal('bgcolor', styles['background-color']);
 
-		if (tinyMCEPopup.dom.getAttrib(nl[i], 'name') == k) {
-			if (v == '')
-				nl[i].parentNode.removeChild(nl[i]);
+			// Reset margin form elements
+			setVal('topmargin', '');
+			setVal('rightmargin', '');
+			setVal('bottommargin', '');
+			setVal('leftmargin', '');
+
+			// Expand margin
+			if (val = styles['margin']) {
+				val = val.split(' ');
+				styles['margin-top'] = val[0] || '';
+				styles['margin-right'] = val[1] || val[0] || '';
+				styles['margin-bottom'] = val[2] || val[0] || '';
+				styles['margin-left'] = val[3] || val[0] || '';
+			}
+
+			if (val = styles['margin-top'])
+				setVal('topmargin', val.replace(/px/, ''));
+
+			if (val = styles['margin-right'])
+				setVal('rightmargin', val.replace(/px/, ''));
+
+			if (val = styles['margin-bottom'])
+				setVal('bottommargin', val.replace(/px/, ''));
+
+			if (val = styles['margin-left'])
+				setVal('leftmargin', val.replace(/px/, ''));
+
+			updateColor('bgcolor_pick', 'bgcolor');
+			updateColor('textcolor_pick', 'textcolor');
+		},
+
+		changedStyleProp : function() {
+			var val, dom = tinyMCEPopup.editor.dom, styles = dom.parseStyle(getVal('style'));
+	
+			styles['font-face'] = getVal('fontface');
+			styles['font-size'] = getVal('fontsize');
+			styles['color'] = getVal('textcolor');
+			styles['background-color'] = getVal('bgcolor');
+
+			if (val = getVal('bgimage'))
+				styles['background-image'] = "url('" + val + "')";
 			else
-				nl[i].setAttribute('content', v);
-			return;
+				styles['background-image'] = '';
+
+			delete styles['margin'];
+
+			if (val = getVal('topmargin'))
+				styles['margin-top'] = val + "px";
+			else
+				styles['margin-top'] = '';
+
+			if (val = getVal('rightmargin'))
+				styles['margin-right'] = val + "px";
+			else
+				styles['margin-right'] = '';
+
+			if (val = getVal('bottommargin'))
+				styles['margin-bottom'] = val + "px";
+			else
+				styles['margin-bottom'] = '';
+
+			if (val = getVal('leftmargin'))
+				styles['margin-left'] = val + "px";
+			else
+				styles['margin-left'] = '';
+
+			// Serialize, parse and reserialize this will compress redundant styles
+			setVal('style', dom.serializeStyle(dom.parseStyle(dom.serializeStyle(styles))));
+			this.changedStyle();
+		},
+		
+		update : function() {
+			var data = {};
+
+			tinymce.each(tinyMCEPopup.dom.select('select,input,textarea'), function(node) {
+				data[node.id] = getVal(node.id);
+			});
+
+			tinyMCEPopup.editor.plugins.fullpage._dataToHtml(data);
+			tinyMCEPopup.close();
 		}
-	}
+	};
+	
+	function init() {
+		var form = document.forms[0], i, item, list, editor = tinyMCEPopup.editor;
 
-	if (v == '')
-		return;
+		// Setup doctype select box
+		list = editor.getParam("fullpage_doctypes", defaultDocTypes).split(',');
+		for (i = 0; i < list.length; i++) {
+			item = list[i].split('=');
 
-	m = doc.createElement('meta');
+			if (item.length > 1)
+				addSelectValue(form, 'doctype', item[0], item[1]);
+		}
 
-	if (k == 'Content-Type')
-		m.httpEquiv = k;
-	else
-		m.setAttribute('name', k);
+		// Setup fonts select box
+		list = editor.getParam("fullpage_fonts", defaultFontNames).split(';');
+		for (i = 0; i < list.length; i++) {
+			item = list[i].split('=');
 
-	m.setAttribute('content', v);
-	he.appendChild(m);
-}
+			if (item.length > 1)
+				addSelectValue(form, 'fontface', item[0], item[1]);
+		}
 
-function parseStyleElement(e) {
-	var v = e.innerHTML;
-	var p, i, r;
+		// Setup fontsize select box
+		list = editor.getParam("fullpage_fontsizes", defaultFontSizes).split(',');
+		for (i = 0; i < list.length; i++)
+			addSelectValue(form, 'fontsize', list[i], list[i]);
 
-	v = v.replace(/<!--/gi, '');
-	v = v.replace(/-->/gi, '');
-	v = v.replace(/[\n\r]/gi, '');
-	v = v.replace(/\s+/gi, ' ');
+		// Setup encodings select box
+		list = editor.getParam("fullpage_encodings", defaultEncodings).split(',');
+		for (i = 0; i < list.length; i++) {
+			item = list[i].split('=');
 
-	r = [];
-	p = v.split(/{|}/);
+			if (item.length > 1)
+				addSelectValue(form, 'docencoding', item[0], item[1]);
+		}
 
-	for (i=0; i<p.length; i+=2) {
-		if (p[i] != "")
-			r[r.length] = {rule : tinymce.trim(p[i]), data : tinyMCEPopup.dom.parseStyle(p[i+1])};
-	}
+		// Setup color pickers
+		document.getElementById('bgcolor_pickcontainer').innerHTML = getColorPickerHTML('bgcolor_pick','bgcolor');
+		document.getElementById('link_color_pickcontainer').innerHTML = getColorPickerHTML('link_color_pick','link_color');
+		document.getElementById('visited_color_pickcontainer').innerHTML = getColorPickerHTML('visited_color_pick','visited_color');
+		document.getElementById('active_color_pickcontainer').innerHTML = getColorPickerHTML('active_color_pick','active_color');
+		document.getElementById('textcolor_pickcontainer').innerHTML = getColorPickerHTML('textcolor_pick','textcolor');
+		document.getElementById('stylesheet_browsercontainer').innerHTML = getBrowserHTML('stylesheetbrowser','stylesheet','file','fullpage');
+		document.getElementById('bgimage_pickcontainer').innerHTML = getBrowserHTML('bgimage_browser','bgimage','image','fullpage');
 
-	return r;
-}
+		// Resize some elements
+		if (isVisible('stylesheetbrowser'))
+			document.getElementById('stylesheet').style.width = '220px';
 
-function serializeStyleElement(d) {
-	var i, s, st;
+		if (isVisible('link_href_browser'))
+			document.getElementById('element_link_href').style.width = '230px';
 
-	s = '<!--\n';
+		if (isVisible('bgimage_browser'))
+			document.getElementById('bgimage').style.width = '210px';
 
-	for (i=0; i<d.length; i++) {
-		s += d[i].rule + ' {\n';
+		// Update form
+		tinymce.each(tinyMCEPopup.getWindowArg('data'), function(value, key) {
+			setVal(key, value);
+		});
 
-		st = tinyMCE.serializeStyle(d[i].data);
+		FullPageDialog.changedStyle();
 
-		if (st != '')
-			st += ';';
+		// Update colors
+		updateColor('textcolor_pick', 'textcolor');
+		updateColor('bgcolor_pick', 'bgcolor');
+		updateColor('visited_color_pick', 'visited_color');
+		updateColor('active_color_pick', 'active_color');
+		updateColor('link_color_pick', 'link_color');
+	};
 
-		s += st.replace(/;/g, ';\n');
-		s += '}\n';
-
-		if (i != d.length - 1)
-			s += '\n';
-	}
-
-	s += '\n-->';
-
-	return s;
-}
-
-tinyMCEPopup.onInit.add(init);
+	tinyMCEPopup.onInit.add(init);
+})();
diff --git a/plugins/TinyMCE/js/plugins/fullscreen/editor_plugin.js b/plugins/TinyMCE/js/plugins/fullscreen/editor_plugin.js
index 4437bd266c..6eae3ec84a 100644
--- a/plugins/TinyMCE/js/plugins/fullscreen/editor_plugin.js
+++ b/plugins/TinyMCE/js/plugins/fullscreen/editor_plugin.js
@@ -1 +1 @@
-(function(){var a=tinymce.DOM;tinymce.create("tinymce.plugins.FullScreenPlugin",{init:function(c,d){var e=this,f={},b;e.editor=c;c.addCommand("mceFullScreen",function(){var h,i=a.doc.documentElement;if(c.getParam("fullscreen_is_enabled")){if(c.getParam("fullscreen_new_window")){closeFullscreen()}else{a.win.setTimeout(function(){tinymce.dom.Event.remove(a.win,"resize",e.resizeFunc);tinyMCE.get(c.getParam("fullscreen_editor_id")).setContent(c.getContent({format:"raw"}),{format:"raw"});tinyMCE.remove(c);a.remove("mce_fullscreen_container");i.style.overflow=c.getParam("fullscreen_html_overflow");a.setStyle(a.doc.body,"overflow",c.getParam("fullscreen_overflow"));a.win.scrollTo(c.getParam("fullscreen_scrollx"),c.getParam("fullscreen_scrolly"));tinyMCE.settings=tinyMCE.oldSettings},10)}return}if(c.getParam("fullscreen_new_window")){h=a.win.open(d+"/fullscreen.htm","mceFullScreenPopup","fullscreen=yes,menubar=no,toolbar=no,scrollbars=no,resizable=yes,left=0,top=0,width="+screen.availWidth+",height="+screen.availHeight);try{h.resizeTo(screen.availWidth,screen.availHeight)}catch(g){}}else{tinyMCE.oldSettings=tinyMCE.settings;f.fullscreen_overflow=a.getStyle(a.doc.body,"overflow",1)||"auto";f.fullscreen_html_overflow=a.getStyle(i,"overflow",1);b=a.getViewPort();f.fullscreen_scrollx=b.x;f.fullscreen_scrolly=b.y;if(tinymce.isOpera&&f.fullscreen_overflow=="visible"){f.fullscreen_overflow="auto"}if(tinymce.isIE&&f.fullscreen_overflow=="scroll"){f.fullscreen_overflow="auto"}if(tinymce.isIE&&(f.fullscreen_html_overflow=="visible"||f.fullscreen_html_overflow=="scroll")){f.fullscreen_html_overflow="auto"}if(f.fullscreen_overflow=="0px"){f.fullscreen_overflow=""}a.setStyle(a.doc.body,"overflow","hidden");i.style.overflow="hidden";b=a.getViewPort();a.win.scrollTo(0,0);if(tinymce.isIE){b.h-=1}n=a.add(a.doc.body,"div",{id:"mce_fullscreen_container",style:"position:"+(tinymce.isIE6||(tinymce.isIE&&!a.boxModel)?"absolute":"fixed")+";top:0;left:0;width:"+b.w+"px;height:"+b.h+"px;z-index:200000;"});a.add(n,"div",{id:"mce_fullscreen"});tinymce.each(c.settings,function(j,k){f[k]=j});f.id="mce_fullscreen";f.width=n.clientWidth;f.height=n.clientHeight-15;f.fullscreen_is_enabled=true;f.fullscreen_editor_id=c.id;f.theme_advanced_resizing=false;f.save_onsavecallback=function(){c.setContent(tinyMCE.get(f.id).getContent({format:"raw"}),{format:"raw"});c.execCommand("mceSave")};tinymce.each(c.getParam("fullscreen_settings"),function(l,j){f[j]=l});if(f.theme_advanced_toolbar_location==="external"){f.theme_advanced_toolbar_location="top"}e.fullscreenEditor=new tinymce.Editor("mce_fullscreen",f);e.fullscreenEditor.onInit.add(function(){e.fullscreenEditor.setContent(c.getContent());e.fullscreenEditor.focus()});e.fullscreenEditor.render();e.fullscreenElement=new tinymce.dom.Element("mce_fullscreen_container");e.fullscreenElement.update();e.resizeFunc=tinymce.dom.Event.add(a.win,"resize",function(){var m=tinymce.DOM.getViewPort(),k=e.fullscreenEditor,j,l;j=k.dom.getSize(k.getContainer().firstChild);l=k.dom.getSize(k.getContainer().getElementsByTagName("iframe")[0]);k.theme.resizeTo(m.w-j.w+l.w,m.h-j.h+l.h)})}});c.addButton("fullscreen",{title:"fullscreen.desc",cmd:"mceFullScreen"});c.onNodeChange.add(function(h,g){g.setActive("fullscreen",h.getParam("fullscreen_is_enabled"))})},getInfo:function(){return{longname:"Fullscreen",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/fullscreen",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("fullscreen",tinymce.plugins.FullScreenPlugin)})();
\ No newline at end of file
+(function(){var a=tinymce.DOM;tinymce.create("tinymce.plugins.FullScreenPlugin",{init:function(d,e){var f=this,g={},c,b;f.editor=d;d.addCommand("mceFullScreen",function(){var i,j=a.doc.documentElement;if(d.getParam("fullscreen_is_enabled")){if(d.getParam("fullscreen_new_window")){closeFullscreen()}else{a.win.setTimeout(function(){tinymce.dom.Event.remove(a.win,"resize",f.resizeFunc);tinyMCE.get(d.getParam("fullscreen_editor_id")).setContent(d.getContent({format:"raw"}),{format:"raw"});tinyMCE.remove(d);a.remove("mce_fullscreen_container");j.style.overflow=d.getParam("fullscreen_html_overflow");a.setStyle(a.doc.body,"overflow",d.getParam("fullscreen_overflow"));a.win.scrollTo(d.getParam("fullscreen_scrollx"),d.getParam("fullscreen_scrolly"));tinyMCE.settings=tinyMCE.oldSettings},10)}return}if(d.getParam("fullscreen_new_window")){i=a.win.open(e+"/fullscreen.htm","mceFullScreenPopup","fullscreen=yes,menubar=no,toolbar=no,scrollbars=no,resizable=yes,left=0,top=0,width="+screen.availWidth+",height="+screen.availHeight);try{i.resizeTo(screen.availWidth,screen.availHeight)}catch(h){}}else{tinyMCE.oldSettings=tinyMCE.settings;g.fullscreen_overflow=a.getStyle(a.doc.body,"overflow",1)||"auto";g.fullscreen_html_overflow=a.getStyle(j,"overflow",1);c=a.getViewPort();g.fullscreen_scrollx=c.x;g.fullscreen_scrolly=c.y;if(tinymce.isOpera&&g.fullscreen_overflow=="visible"){g.fullscreen_overflow="auto"}if(tinymce.isIE&&g.fullscreen_overflow=="scroll"){g.fullscreen_overflow="auto"}if(tinymce.isIE&&(g.fullscreen_html_overflow=="visible"||g.fullscreen_html_overflow=="scroll")){g.fullscreen_html_overflow="auto"}if(g.fullscreen_overflow=="0px"){g.fullscreen_overflow=""}a.setStyle(a.doc.body,"overflow","hidden");j.style.overflow="hidden";c=a.getViewPort();a.win.scrollTo(0,0);if(tinymce.isIE){c.h-=1}if(tinymce.isIE6){b="absolute;top:"+c.y}else{b="fixed;top:0"}n=a.add(a.doc.body,"div",{id:"mce_fullscreen_container",style:"position:"+b+";left:0;width:"+c.w+"px;height:"+c.h+"px;z-index:200000;"});a.add(n,"div",{id:"mce_fullscreen"});tinymce.each(d.settings,function(k,l){g[l]=k});g.id="mce_fullscreen";g.width=n.clientWidth;g.height=n.clientHeight-15;g.fullscreen_is_enabled=true;g.fullscreen_editor_id=d.id;g.theme_advanced_resizing=false;g.save_onsavecallback=function(){d.setContent(tinyMCE.get(g.id).getContent({format:"raw"}),{format:"raw"});d.execCommand("mceSave")};tinymce.each(d.getParam("fullscreen_settings"),function(m,l){g[l]=m});if(g.theme_advanced_toolbar_location==="external"){g.theme_advanced_toolbar_location="top"}f.fullscreenEditor=new tinymce.Editor("mce_fullscreen",g);f.fullscreenEditor.onInit.add(function(){f.fullscreenEditor.setContent(d.getContent());f.fullscreenEditor.focus()});f.fullscreenEditor.render();f.fullscreenElement=new tinymce.dom.Element("mce_fullscreen_container");f.fullscreenElement.update();f.resizeFunc=tinymce.dom.Event.add(a.win,"resize",function(){var o=tinymce.DOM.getViewPort(),l=f.fullscreenEditor,k,m;k=l.dom.getSize(l.getContainer().firstChild);m=l.dom.getSize(l.getContainer().getElementsByTagName("iframe")[0]);l.theme.resizeTo(o.w-k.w+m.w,o.h-k.h+m.h)})}});d.addButton("fullscreen",{title:"fullscreen.desc",cmd:"mceFullScreen"});d.onNodeChange.add(function(i,h){h.setActive("fullscreen",i.getParam("fullscreen_is_enabled"))})},getInfo:function(){return{longname:"Fullscreen",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/fullscreen",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("fullscreen",tinymce.plugins.FullScreenPlugin)})();
\ No newline at end of file
diff --git a/plugins/TinyMCE/js/plugins/fullscreen/editor_plugin_src.js b/plugins/TinyMCE/js/plugins/fullscreen/editor_plugin_src.js
index 0efd9bbe57..3477c86c9b 100644
--- a/plugins/TinyMCE/js/plugins/fullscreen/editor_plugin_src.js
+++ b/plugins/TinyMCE/js/plugins/fullscreen/editor_plugin_src.js
@@ -13,7 +13,7 @@
 
 	tinymce.create('tinymce.plugins.FullScreenPlugin', {
 		init : function(ed, url) {
-			var t = this, s = {}, vp;
+			var t = this, s = {}, vp, posCss;
 
 			t.editor = ed;
 
@@ -78,7 +78,15 @@
 					if (tinymce.isIE)
 						vp.h -= 1;
 
-					n = DOM.add(DOM.doc.body, 'div', {id : 'mce_fullscreen_container', style : 'position:' + (tinymce.isIE6 || (tinymce.isIE && !DOM.boxModel) ? 'absolute' : 'fixed') + ';top:0;left:0;width:' + vp.w + 'px;height:' + vp.h + 'px;z-index:200000;'});
+					// Use fixed position if it exists
+					if (tinymce.isIE6)
+						posCss = 'absolute;top:' + vp.y;
+					else
+						posCss = 'fixed;top:0';
+
+					n = DOM.add(DOM.doc.body, 'div', {
+						id : 'mce_fullscreen_container', 
+						style : 'position:' + posCss + ';left:0;width:' + vp.w + 'px;height:' + vp.h + 'px;z-index:200000;'});
 					DOM.add(n, 'div', {id : 'mce_fullscreen'});
 
 					tinymce.each(ed.settings, function(v, n) {
diff --git a/plugins/TinyMCE/js/plugins/inlinepopups/editor_plugin.js b/plugins/TinyMCE/js/plugins/inlinepopups/editor_plugin.js
index 07ea477b7c..ef648174f0 100644
--- a/plugins/TinyMCE/js/plugins/inlinepopups/editor_plugin.js
+++ b/plugins/TinyMCE/js/plugins/inlinepopups/editor_plugin.js
@@ -1 +1 @@
-(function(){var d=tinymce.DOM,b=tinymce.dom.Element,a=tinymce.dom.Event,e=tinymce.each,c=tinymce.is;tinymce.create("tinymce.plugins.InlinePopups",{init:function(f,g){f.onBeforeRenderUI.add(function(){f.windowManager=new tinymce.InlineWindowManager(f);d.loadCSS(g+"/skins/"+(f.settings.inlinepopups_skin||"clearlooks2")+"/window.css")})},getInfo:function(){return{longname:"InlinePopups",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/inlinepopups",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.create("tinymce.InlineWindowManager:tinymce.WindowManager",{InlineWindowManager:function(f){var g=this;g.parent(f);g.zIndex=300000;g.count=0;g.windows={}},open:function(r,j){var y=this,i,k="",q=y.editor,g=0,s=0,h,m,n,o,l,v,x;r=r||{};j=j||{};if(!r.inline){return y.parent(r,j)}if(!r.type){y.bookmark=q.selection.getBookmark(1)}i=d.uniqueId();h=d.getViewPort();r.width=parseInt(r.width||320);r.height=parseInt(r.height||240)+(tinymce.isIE?8:0);r.min_width=parseInt(r.min_width||150);r.min_height=parseInt(r.min_height||100);r.max_width=parseInt(r.max_width||2000);r.max_height=parseInt(r.max_height||2000);r.left=r.left||Math.round(Math.max(h.x,h.x+(h.w/2)-(r.width/2)));r.top=r.top||Math.round(Math.max(h.y,h.y+(h.h/2)-(r.height/2)));r.movable=r.resizable=true;j.mce_width=r.width;j.mce_height=r.height;j.mce_inline=true;j.mce_window_id=i;j.mce_auto_focus=r.auto_focus;y.features=r;y.params=j;y.onOpen.dispatch(y,r,j);if(r.type){k+=" mceModal";if(r.type){k+=" mce"+r.type.substring(0,1).toUpperCase()+r.type.substring(1)}r.resizable=false}if(r.statusbar){k+=" mceStatusbar"}if(r.resizable){k+=" mceResizable"}if(r.minimizable){k+=" mceMinimizable"}if(r.maximizable){k+=" mceMaximizable"}if(r.movable){k+=" mceMovable"}y._addAll(d.doc.body,["div",{id:i,"class":q.settings.inlinepopups_skin||"clearlooks2",style:"width:100px;height:100px"},["div",{id:i+"_wrapper","class":"mceWrapper"+k},["div",{id:i+"_top","class":"mceTop"},["div",{"class":"mceLeft"}],["div",{"class":"mceCenter"}],["div",{"class":"mceRight"}],["span",{id:i+"_title"},r.title||""]],["div",{id:i+"_middle","class":"mceMiddle"},["div",{id:i+"_left","class":"mceLeft"}],["span",{id:i+"_content"}],["div",{id:i+"_right","class":"mceRight"}]],["div",{id:i+"_bottom","class":"mceBottom"},["div",{"class":"mceLeft"}],["div",{"class":"mceCenter"}],["div",{"class":"mceRight"}],["span",{id:i+"_status"},"Content"]],["a",{"class":"mceMove",tabindex:"-1",href:"javascript:;"}],["a",{"class":"mceMin",tabindex:"-1",href:"javascript:;",onmousedown:"return false;"}],["a",{"class":"mceMax",tabindex:"-1",href:"javascript:;",onmousedown:"return false;"}],["a",{"class":"mceMed",tabindex:"-1",href:"javascript:;",onmousedown:"return false;"}],["a",{"class":"mceClose",tabindex:"-1",href:"javascript:;",onmousedown:"return false;"}],["a",{id:i+"_resize_n","class":"mceResize mceResizeN",tabindex:"-1",href:"javascript:;"}],["a",{id:i+"_resize_s","class":"mceResize mceResizeS",tabindex:"-1",href:"javascript:;"}],["a",{id:i+"_resize_w","class":"mceResize mceResizeW",tabindex:"-1",href:"javascript:;"}],["a",{id:i+"_resize_e","class":"mceResize mceResizeE",tabindex:"-1",href:"javascript:;"}],["a",{id:i+"_resize_nw","class":"mceResize mceResizeNW",tabindex:"-1",href:"javascript:;"}],["a",{id:i+"_resize_ne","class":"mceResize mceResizeNE",tabindex:"-1",href:"javascript:;"}],["a",{id:i+"_resize_sw","class":"mceResize mceResizeSW",tabindex:"-1",href:"javascript:;"}],["a",{id:i+"_resize_se","class":"mceResize mceResizeSE",tabindex:"-1",href:"javascript:;"}]]]);d.setStyles(i,{top:-10000,left:-10000});if(tinymce.isGecko){d.setStyle(i,"overflow","auto")}if(!r.type){g+=d.get(i+"_left").clientWidth;g+=d.get(i+"_right").clientWidth;s+=d.get(i+"_top").clientHeight;s+=d.get(i+"_bottom").clientHeight}d.setStyles(i,{top:r.top,left:r.left,width:r.width+g,height:r.height+s});x=r.url||r.file;if(x){if(tinymce.relaxedDomain){x+=(x.indexOf("?")==-1?"?":"&")+"mce_rdomain="+tinymce.relaxedDomain}x=tinymce._addVer(x)}if(!r.type){d.add(i+"_content","iframe",{id:i+"_ifr",src:'javascript:""',frameBorder:0,style:"border:0;width:10px;height:10px"});d.setStyles(i+"_ifr",{width:r.width,height:r.height});d.setAttrib(i+"_ifr","src",x)}else{d.add(i+"_wrapper","a",{id:i+"_ok","class":"mceButton mceOk",href:"javascript:;",onmousedown:"return false;"},"Ok");if(r.type=="confirm"){d.add(i+"_wrapper","a",{"class":"mceButton mceCancel",href:"javascript:;",onmousedown:"return false;"},"Cancel")}d.add(i+"_middle","div",{"class":"mceIcon"});d.setHTML(i+"_content",r.content.replace("\n","<br />"))}n=a.add(i,"mousedown",function(t){var u=t.target,f,p;f=y.windows[i];y.focus(i);if(u.nodeName=="A"||u.nodeName=="a"){if(u.className=="mceMax"){f.oldPos=f.element.getXY();f.oldSize=f.element.getSize();p=d.getViewPort();p.w-=2;p.h-=2;f.element.moveTo(p.x,p.y);f.element.resizeTo(p.w,p.h);d.setStyles(i+"_ifr",{width:p.w-f.deltaWidth,height:p.h-f.deltaHeight});d.addClass(i+"_wrapper","mceMaximized")}else{if(u.className=="mceMed"){f.element.moveTo(f.oldPos.x,f.oldPos.y);f.element.resizeTo(f.oldSize.w,f.oldSize.h);f.iframeElement.resizeTo(f.oldSize.w-f.deltaWidth,f.oldSize.h-f.deltaHeight);d.removeClass(i+"_wrapper","mceMaximized")}else{if(u.className=="mceMove"){return y._startDrag(i,t,u.className)}else{if(d.hasClass(u,"mceResize")){return y._startDrag(i,t,u.className.substring(13))}}}}}});o=a.add(i,"click",function(f){var p=f.target;y.focus(i);if(p.nodeName=="A"||p.nodeName=="a"){switch(p.className){case"mceClose":y.close(null,i);return a.cancel(f);case"mceButton mceOk":case"mceButton mceCancel":r.button_func(p.className=="mceButton mceOk");return a.cancel(f)}}});v=y.windows[i]={id:i,mousedown_func:n,click_func:o,element:new b(i,{blocker:1,container:q.getContainer()}),iframeElement:new b(i+"_ifr"),features:r,deltaWidth:g,deltaHeight:s};v.iframeElement.on("focus",function(){y.focus(i)});if(y.count==0&&y.editor.getParam("dialog_type","modal")=="modal"){d.add(d.doc.body,"div",{id:"mceModalBlocker","class":(y.editor.settings.inlinepopups_skin||"clearlooks2")+"_modalBlocker",style:{zIndex:y.zIndex-1}});d.show("mceModalBlocker")}else{d.setStyle("mceModalBlocker","z-index",y.zIndex-1)}if(tinymce.isIE6||/Firefox\/2\./.test(navigator.userAgent)||(tinymce.isIE&&!d.boxModel)){d.setStyles("mceModalBlocker",{position:"absolute",left:h.x,top:h.y,width:h.w-2,height:h.h-2})}y.focus(i);y._fixIELayout(i,1);if(d.get(i+"_ok")){d.get(i+"_ok").focus()}y.count++;return v},focus:function(h){var g=this,f;if(f=g.windows[h]){f.zIndex=this.zIndex++;f.element.setStyle("zIndex",f.zIndex);f.element.update();h=h+"_wrapper";d.removeClass(g.lastId,"mceFocus");d.addClass(h,"mceFocus");g.lastId=h}},_addAll:function(k,h){var g,l,f=this,j=tinymce.DOM;if(c(h,"string")){k.appendChild(j.doc.createTextNode(h))}else{if(h.length){k=k.appendChild(j.create(h[0],h[1]));for(g=2;g<h.length;g++){f._addAll(k,h[g])}}}},_startDrag:function(v,G,E){var o=this,u,z,C=d.doc,f,l=o.windows[v],h=l.element,y=h.getXY(),x,q,F,g,A,s,r,j,i,m,k,n,B;g={x:0,y:0};A=d.getViewPort();A.w-=2;A.h-=2;j=G.screenX;i=G.screenY;m=k=n=B=0;u=a.add(C,"mouseup",function(p){a.remove(C,"mouseup",u);a.remove(C,"mousemove",z);if(f){f.remove()}h.moveBy(m,k);h.resizeBy(n,B);q=h.getSize();d.setStyles(v+"_ifr",{width:q.w-l.deltaWidth,height:q.h-l.deltaHeight});o._fixIELayout(v,1);return a.cancel(p)});if(E!="Move"){D()}function D(){if(f){return}o._fixIELayout(v,0);d.add(C.body,"div",{id:"mceEventBlocker","class":"mceEventBlocker "+(o.editor.settings.inlinepopups_skin||"clearlooks2"),style:{zIndex:o.zIndex+1}});if(tinymce.isIE6||(tinymce.isIE&&!d.boxModel)){d.setStyles("mceEventBlocker",{position:"absolute",left:A.x,top:A.y,width:A.w-2,height:A.h-2})}f=new b("mceEventBlocker");f.update();x=h.getXY();q=h.getSize();s=g.x+x.x-A.x;r=g.y+x.y-A.y;d.add(f.get(),"div",{id:"mcePlaceHolder","class":"mcePlaceHolder",style:{left:s,top:r,width:q.w,height:q.h}});F=new b("mcePlaceHolder")}z=a.add(C,"mousemove",function(w){var p,H,t;D();p=w.screenX-j;H=w.screenY-i;switch(E){case"ResizeW":m=p;n=0-p;break;case"ResizeE":n=p;break;case"ResizeN":case"ResizeNW":case"ResizeNE":if(E=="ResizeNW"){m=p;n=0-p}else{if(E=="ResizeNE"){n=p}}k=H;B=0-H;break;case"ResizeS":case"ResizeSW":case"ResizeSE":if(E=="ResizeSW"){m=p;n=0-p}else{if(E=="ResizeSE"){n=p}}B=H;break;case"mceMove":m=p;k=H;break}if(n<(t=l.features.min_width-q.w)){if(m!==0){m+=n-t}n=t}if(B<(t=l.features.min_height-q.h)){if(k!==0){k+=B-t}B=t}n=Math.min(n,l.features.max_width-q.w);B=Math.min(B,l.features.max_height-q.h);m=Math.max(m,A.x-(s+A.x));k=Math.max(k,A.y-(r+A.y));m=Math.min(m,(A.w+A.x)-(s+q.w+A.x));k=Math.min(k,(A.h+A.y)-(r+q.h+A.y));if(m+k!==0){if(s+m<0){m=0}if(r+k<0){k=0}F.moveTo(s+m,r+k)}if(n+B!==0){F.resizeTo(q.w+n,q.h+B)}return a.cancel(w)});return a.cancel(G)},resizeBy:function(g,h,i){var f=this.windows[i];if(f){f.element.resizeBy(g,h);f.iframeElement.resizeBy(g,h)}},close:function(j,l){var h=this,g,k=d.doc,f=0,i,l;l=h._findId(l||j);if(!h.windows[l]){h.parent(j);return}h.count--;if(h.count==0){d.remove("mceModalBlocker")}if(g=h.windows[l]){h.onClose.dispatch(h);a.remove(k,"mousedown",g.mousedownFunc);a.remove(k,"click",g.clickFunc);a.clear(l);a.clear(l+"_ifr");d.setAttrib(l+"_ifr","src",'javascript:""');g.element.remove();delete h.windows[l];e(h.windows,function(m){if(m.zIndex>f){i=m;f=m.zIndex}});if(i){h.focus(i.id)}}},setTitle:function(f,g){var h;f=this._findId(f);if(h=d.get(f+"_title")){h.innerHTML=d.encode(g)}},alert:function(g,f,j){var i=this,h;h=i.open({title:i,type:"alert",button_func:function(k){if(f){f.call(k||i,k)}i.close(null,h.id)},content:d.encode(i.editor.getLang(g,g)),inline:1,width:400,height:130})},confirm:function(g,f,j){var i=this,h;h=i.open({title:i,type:"confirm",button_func:function(k){if(f){f.call(k||i,k)}i.close(null,h.id)},content:d.encode(i.editor.getLang(g,g)),inline:1,width:400,height:130})},_findId:function(f){var g=this;if(typeof(f)=="string"){return f}e(g.windows,function(h){var i=d.get(h.id+"_ifr");if(i&&f==i.contentWindow){f=h.id;return false}});return f},_fixIELayout:function(i,h){var f,g;if(!tinymce.isIE6){return}e(["n","s","w","e","nw","ne","sw","se"],function(j){var k=d.get(i+"_resize_"+j);d.setStyles(k,{width:h?k.clientWidth:"",height:h?k.clientHeight:"",cursor:d.getStyle(k,"cursor",1)});d.setStyle(i+"_bottom","bottom","-1px");k=0});if(f=this.windows[i]){f.element.hide();f.element.show();e(d.select("div,a",i),function(k,j){if(k.currentStyle.backgroundImage!="none"){g=new Image();g.src=k.currentStyle.backgroundImage.replace(/url\(\"(.+)\"\)/,"$1")}});d.get(i).style.filter=""}}});tinymce.PluginManager.add("inlinepopups",tinymce.plugins.InlinePopups)})();
\ No newline at end of file
+(function(){var d=tinymce.DOM,b=tinymce.dom.Element,a=tinymce.dom.Event,e=tinymce.each,c=tinymce.is;tinymce.create("tinymce.plugins.InlinePopups",{init:function(f,g){f.onBeforeRenderUI.add(function(){f.windowManager=new tinymce.InlineWindowManager(f);d.loadCSS(g+"/skins/"+(f.settings.inlinepopups_skin||"clearlooks2")+"/window.css")})},getInfo:function(){return{longname:"InlinePopups",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/inlinepopups",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.create("tinymce.InlineWindowManager:tinymce.WindowManager",{InlineWindowManager:function(f){var g=this;g.parent(f);g.zIndex=300000;g.count=0;g.windows={}},open:function(s,j){var z=this,i,k="",r=z.editor,g=0,v=0,h,m,o,q,l,x,y,n;s=s||{};j=j||{};if(!s.inline){return z.parent(s,j)}n=z._frontWindow();if(n&&d.get(n.id+"_ifr")){n.focussedElement=d.get(n.id+"_ifr").contentWindow.document.activeElement}if(!s.type){z.bookmark=r.selection.getBookmark(1)}i=d.uniqueId();h=d.getViewPort();s.width=parseInt(s.width||320);s.height=parseInt(s.height||240)+(tinymce.isIE?8:0);s.min_width=parseInt(s.min_width||150);s.min_height=parseInt(s.min_height||100);s.max_width=parseInt(s.max_width||2000);s.max_height=parseInt(s.max_height||2000);s.left=s.left||Math.round(Math.max(h.x,h.x+(h.w/2)-(s.width/2)));s.top=s.top||Math.round(Math.max(h.y,h.y+(h.h/2)-(s.height/2)));s.movable=s.resizable=true;j.mce_width=s.width;j.mce_height=s.height;j.mce_inline=true;j.mce_window_id=i;j.mce_auto_focus=s.auto_focus;z.features=s;z.params=j;z.onOpen.dispatch(z,s,j);if(s.type){k+=" mceModal";if(s.type){k+=" mce"+s.type.substring(0,1).toUpperCase()+s.type.substring(1)}s.resizable=false}if(s.statusbar){k+=" mceStatusbar"}if(s.resizable){k+=" mceResizable"}if(s.minimizable){k+=" mceMinimizable"}if(s.maximizable){k+=" mceMaximizable"}if(s.movable){k+=" mceMovable"}z._addAll(d.doc.body,["div",{id:i,role:"dialog","aria-labelledby":s.type?i+"_content":i+"_title","class":(r.settings.inlinepopups_skin||"clearlooks2")+(tinymce.isIE&&window.getSelection?" ie9":""),style:"width:100px;height:100px"},["div",{id:i+"_wrapper","class":"mceWrapper"+k},["div",{id:i+"_top","class":"mceTop"},["div",{"class":"mceLeft"}],["div",{"class":"mceCenter"}],["div",{"class":"mceRight"}],["span",{id:i+"_title"},s.title||""]],["div",{id:i+"_middle","class":"mceMiddle"},["div",{id:i+"_left","class":"mceLeft",tabindex:"0"}],["span",{id:i+"_content"}],["div",{id:i+"_right","class":"mceRight",tabindex:"0"}]],["div",{id:i+"_bottom","class":"mceBottom"},["div",{"class":"mceLeft"}],["div",{"class":"mceCenter"}],["div",{"class":"mceRight"}],["span",{id:i+"_status"},"Content"]],["a",{"class":"mceMove",tabindex:"-1",href:"javascript:;"}],["a",{"class":"mceMin",tabindex:"-1",href:"javascript:;",onmousedown:"return false;"}],["a",{"class":"mceMax",tabindex:"-1",href:"javascript:;",onmousedown:"return false;"}],["a",{"class":"mceMed",tabindex:"-1",href:"javascript:;",onmousedown:"return false;"}],["a",{"class":"mceClose",tabindex:"-1",href:"javascript:;",onmousedown:"return false;"}],["a",{id:i+"_resize_n","class":"mceResize mceResizeN",tabindex:"-1",href:"javascript:;"}],["a",{id:i+"_resize_s","class":"mceResize mceResizeS",tabindex:"-1",href:"javascript:;"}],["a",{id:i+"_resize_w","class":"mceResize mceResizeW",tabindex:"-1",href:"javascript:;"}],["a",{id:i+"_resize_e","class":"mceResize mceResizeE",tabindex:"-1",href:"javascript:;"}],["a",{id:i+"_resize_nw","class":"mceResize mceResizeNW",tabindex:"-1",href:"javascript:;"}],["a",{id:i+"_resize_ne","class":"mceResize mceResizeNE",tabindex:"-1",href:"javascript:;"}],["a",{id:i+"_resize_sw","class":"mceResize mceResizeSW",tabindex:"-1",href:"javascript:;"}],["a",{id:i+"_resize_se","class":"mceResize mceResizeSE",tabindex:"-1",href:"javascript:;"}]]]);d.setStyles(i,{top:-10000,left:-10000});if(tinymce.isGecko){d.setStyle(i,"overflow","auto")}if(!s.type){g+=d.get(i+"_left").clientWidth;g+=d.get(i+"_right").clientWidth;v+=d.get(i+"_top").clientHeight;v+=d.get(i+"_bottom").clientHeight}d.setStyles(i,{top:s.top,left:s.left,width:s.width+g,height:s.height+v});y=s.url||s.file;if(y){if(tinymce.relaxedDomain){y+=(y.indexOf("?")==-1?"?":"&")+"mce_rdomain="+tinymce.relaxedDomain}y=tinymce._addVer(y)}if(!s.type){d.add(i+"_content","iframe",{id:i+"_ifr",src:'javascript:""',frameBorder:0,style:"border:0;width:10px;height:10px"});d.setStyles(i+"_ifr",{width:s.width,height:s.height});d.setAttrib(i+"_ifr","src",y)}else{d.add(i+"_wrapper","a",{id:i+"_ok","class":"mceButton mceOk",href:"javascript:;",onmousedown:"return false;"},"Ok");if(s.type=="confirm"){d.add(i+"_wrapper","a",{"class":"mceButton mceCancel",href:"javascript:;",onmousedown:"return false;"},"Cancel")}d.add(i+"_middle","div",{"class":"mceIcon"});d.setHTML(i+"_content",s.content.replace("\n","<br />"));a.add(i,"keyup",function(f){var p=27;if(f.keyCode===p){s.button_func(false);return a.cancel(f)}});a.add(i,"keydown",function(f){var t,p=9;if(f.keyCode===p){t=d.select("a.mceCancel",i+"_wrapper")[0];if(t&&t!==f.target){t.focus()}else{d.get(i+"_ok").focus()}return a.cancel(f)}})}o=a.add(i,"mousedown",function(t){var u=t.target,f,p;f=z.windows[i];z.focus(i);if(u.nodeName=="A"||u.nodeName=="a"){if(u.className=="mceMax"){f.oldPos=f.element.getXY();f.oldSize=f.element.getSize();p=d.getViewPort();p.w-=2;p.h-=2;f.element.moveTo(p.x,p.y);f.element.resizeTo(p.w,p.h);d.setStyles(i+"_ifr",{width:p.w-f.deltaWidth,height:p.h-f.deltaHeight});d.addClass(i+"_wrapper","mceMaximized")}else{if(u.className=="mceMed"){f.element.moveTo(f.oldPos.x,f.oldPos.y);f.element.resizeTo(f.oldSize.w,f.oldSize.h);f.iframeElement.resizeTo(f.oldSize.w-f.deltaWidth,f.oldSize.h-f.deltaHeight);d.removeClass(i+"_wrapper","mceMaximized")}else{if(u.className=="mceMove"){return z._startDrag(i,t,u.className)}else{if(d.hasClass(u,"mceResize")){return z._startDrag(i,t,u.className.substring(13))}}}}}});q=a.add(i,"click",function(f){var p=f.target;z.focus(i);if(p.nodeName=="A"||p.nodeName=="a"){switch(p.className){case"mceClose":z.close(null,i);return a.cancel(f);case"mceButton mceOk":case"mceButton mceCancel":s.button_func(p.className=="mceButton mceOk");return a.cancel(f)}}});a.add([i+"_left",i+"_right"],"focus",function(p){var t=d.get(i+"_ifr");if(t){var f=t.contentWindow.document.body;var u=d.select(":input:enabled,*[tabindex=0]",f);if(p.target.id===(i+"_left")){u[u.length-1].focus()}else{u[0].focus()}}else{d.get(i+"_ok").focus()}});x=z.windows[i]={id:i,mousedown_func:o,click_func:q,element:new b(i,{blocker:1,container:r.getContainer()}),iframeElement:new b(i+"_ifr"),features:s,deltaWidth:g,deltaHeight:v};x.iframeElement.on("focus",function(){z.focus(i)});if(z.count==0&&z.editor.getParam("dialog_type","modal")=="modal"){d.add(d.doc.body,"div",{id:"mceModalBlocker","class":(z.editor.settings.inlinepopups_skin||"clearlooks2")+"_modalBlocker",style:{zIndex:z.zIndex-1}});d.show("mceModalBlocker");d.setAttrib(d.doc.body,"aria-hidden","true")}else{d.setStyle("mceModalBlocker","z-index",z.zIndex-1)}if(tinymce.isIE6||/Firefox\/2\./.test(navigator.userAgent)||(tinymce.isIE&&!d.boxModel)){d.setStyles("mceModalBlocker",{position:"absolute",left:h.x,top:h.y,width:h.w-2,height:h.h-2})}d.setAttrib(i,"aria-hidden","false");z.focus(i);z._fixIELayout(i,1);if(d.get(i+"_ok")){d.get(i+"_ok").focus()}z.count++;return x},focus:function(h){var g=this,f;if(f=g.windows[h]){f.zIndex=this.zIndex++;f.element.setStyle("zIndex",f.zIndex);f.element.update();h=h+"_wrapper";d.removeClass(g.lastId,"mceFocus");d.addClass(h,"mceFocus");g.lastId=h;if(f.focussedElement){f.focussedElement.focus()}else{if(d.get(h+"_ok")){d.get(f.id+"_ok").focus()}else{if(d.get(f.id+"_ifr")){d.get(f.id+"_ifr").focus()}}}}},_addAll:function(k,h){var g,l,f=this,j=tinymce.DOM;if(c(h,"string")){k.appendChild(j.doc.createTextNode(h))}else{if(h.length){k=k.appendChild(j.create(h[0],h[1]));for(g=2;g<h.length;g++){f._addAll(k,h[g])}}}},_startDrag:function(v,G,E){var o=this,u,z,C=d.doc,f,l=o.windows[v],h=l.element,y=h.getXY(),x,q,F,g,A,s,r,j,i,m,k,n,B;g={x:0,y:0};A=d.getViewPort();A.w-=2;A.h-=2;j=G.screenX;i=G.screenY;m=k=n=B=0;u=a.add(C,"mouseup",function(p){a.remove(C,"mouseup",u);a.remove(C,"mousemove",z);if(f){f.remove()}h.moveBy(m,k);h.resizeBy(n,B);q=h.getSize();d.setStyles(v+"_ifr",{width:q.w-l.deltaWidth,height:q.h-l.deltaHeight});o._fixIELayout(v,1);return a.cancel(p)});if(E!="Move"){D()}function D(){if(f){return}o._fixIELayout(v,0);d.add(C.body,"div",{id:"mceEventBlocker","class":"mceEventBlocker "+(o.editor.settings.inlinepopups_skin||"clearlooks2"),style:{zIndex:o.zIndex+1}});if(tinymce.isIE6||(tinymce.isIE&&!d.boxModel)){d.setStyles("mceEventBlocker",{position:"absolute",left:A.x,top:A.y,width:A.w-2,height:A.h-2})}f=new b("mceEventBlocker");f.update();x=h.getXY();q=h.getSize();s=g.x+x.x-A.x;r=g.y+x.y-A.y;d.add(f.get(),"div",{id:"mcePlaceHolder","class":"mcePlaceHolder",style:{left:s,top:r,width:q.w,height:q.h}});F=new b("mcePlaceHolder")}z=a.add(C,"mousemove",function(w){var p,H,t;D();p=w.screenX-j;H=w.screenY-i;switch(E){case"ResizeW":m=p;n=0-p;break;case"ResizeE":n=p;break;case"ResizeN":case"ResizeNW":case"ResizeNE":if(E=="ResizeNW"){m=p;n=0-p}else{if(E=="ResizeNE"){n=p}}k=H;B=0-H;break;case"ResizeS":case"ResizeSW":case"ResizeSE":if(E=="ResizeSW"){m=p;n=0-p}else{if(E=="ResizeSE"){n=p}}B=H;break;case"mceMove":m=p;k=H;break}if(n<(t=l.features.min_width-q.w)){if(m!==0){m+=n-t}n=t}if(B<(t=l.features.min_height-q.h)){if(k!==0){k+=B-t}B=t}n=Math.min(n,l.features.max_width-q.w);B=Math.min(B,l.features.max_height-q.h);m=Math.max(m,A.x-(s+A.x));k=Math.max(k,A.y-(r+A.y));m=Math.min(m,(A.w+A.x)-(s+q.w+A.x));k=Math.min(k,(A.h+A.y)-(r+q.h+A.y));if(m+k!==0){if(s+m<0){m=0}if(r+k<0){k=0}F.moveTo(s+m,r+k)}if(n+B!==0){F.resizeTo(q.w+n,q.h+B)}return a.cancel(w)});return a.cancel(G)},resizeBy:function(g,h,i){var f=this.windows[i];if(f){f.element.resizeBy(g,h);f.iframeElement.resizeBy(g,h)}},close:function(i,k){var g=this,f,j=d.doc,h,k;k=g._findId(k||i);if(!g.windows[k]){g.parent(i);return}g.count--;if(g.count==0){d.remove("mceModalBlocker");d.setAttrib(d.doc.body,"aria-hidden","false");g.editor.focus()}if(f=g.windows[k]){g.onClose.dispatch(g);a.remove(j,"mousedown",f.mousedownFunc);a.remove(j,"click",f.clickFunc);a.clear(k);a.clear(k+"_ifr");d.setAttrib(k+"_ifr","src",'javascript:""');f.element.remove();delete g.windows[k];h=g._frontWindow();if(h){g.focus(h.id)}}},_frontWindow:function(){var g,f=0;e(this.windows,function(h){if(h.zIndex>f){g=h;f=h.zIndex}});return g},setTitle:function(f,g){var h;f=this._findId(f);if(h=d.get(f+"_title")){h.innerHTML=d.encode(g)}},alert:function(g,f,j){var i=this,h;h=i.open({title:i,type:"alert",button_func:function(k){if(f){f.call(k||i,k)}i.close(null,h.id)},content:d.encode(i.editor.getLang(g,g)),inline:1,width:400,height:130})},confirm:function(g,f,j){var i=this,h;h=i.open({title:i,type:"confirm",button_func:function(k){if(f){f.call(k||i,k)}i.close(null,h.id)},content:d.encode(i.editor.getLang(g,g)),inline:1,width:400,height:130})},_findId:function(f){var g=this;if(typeof(f)=="string"){return f}e(g.windows,function(h){var i=d.get(h.id+"_ifr");if(i&&f==i.contentWindow){f=h.id;return false}});return f},_fixIELayout:function(i,h){var f,g;if(!tinymce.isIE6){return}e(["n","s","w","e","nw","ne","sw","se"],function(j){var k=d.get(i+"_resize_"+j);d.setStyles(k,{width:h?k.clientWidth:"",height:h?k.clientHeight:"",cursor:d.getStyle(k,"cursor",1)});d.setStyle(i+"_bottom","bottom","-1px");k=0});if(f=this.windows[i]){f.element.hide();f.element.show();e(d.select("div,a",i),function(k,j){if(k.currentStyle.backgroundImage!="none"){g=new Image();g.src=k.currentStyle.backgroundImage.replace(/url\(\"(.+)\"\)/,"$1")}});d.get(i).style.filter=""}}});tinymce.PluginManager.add("inlinepopups",tinymce.plugins.InlinePopups)})();
\ No newline at end of file
diff --git a/plugins/TinyMCE/js/plugins/inlinepopups/editor_plugin_src.js b/plugins/TinyMCE/js/plugins/inlinepopups/editor_plugin_src.js
index e991683de4..ac6fb1cb98 100644
--- a/plugins/TinyMCE/js/plugins/inlinepopups/editor_plugin_src.js
+++ b/plugins/TinyMCE/js/plugins/inlinepopups/editor_plugin_src.js
@@ -42,7 +42,7 @@
 		},
 
 		open : function(f, p) {
-			var t = this, id, opt = '', ed = t.editor, dw = 0, dh = 0, vp, po, mdf, clf, we, w, u;
+			var t = this, id, opt = '', ed = t.editor, dw = 0, dh = 0, vp, po, mdf, clf, we, w, u, parentWindow;
 
 			f = f || {};
 			p = p || {};
@@ -51,6 +51,11 @@
 			if (!f.inline)
 				return t.parent(f, p);
 
+			parentWindow = t._frontWindow();
+			if (parentWindow && DOM.get(parentWindow.id + '_ifr')) {
+				parentWindow.focussedElement = DOM.get(parentWindow.id + '_ifr').contentWindow.document.activeElement;
+			}
+			
 			// Only store selection if the type is a normal window
 			if (!f.type)
 				t.bookmark = ed.selection.getBookmark(1);
@@ -107,7 +112,7 @@
 
 			// Create DOM objects
 			t._addAll(DOM.doc.body, 
-				['div', {id : id, 'class' : ed.settings.inlinepopups_skin || 'clearlooks2', style : 'width:100px;height:100px'}, 
+				['div', {id : id, role : 'dialog', 'aria-labelledby': f.type ? id + '_content' : id + '_title', 'class' : (ed.settings.inlinepopups_skin || 'clearlooks2') + (tinymce.isIE && window.getSelection ? ' ie9' : ''), style : 'width:100px;height:100px'}, 
 					['div', {id : id + '_wrapper', 'class' : 'mceWrapper' + opt},
 						['div', {id : id + '_top', 'class' : 'mceTop'}, 
 							['div', {'class' : 'mceLeft'}],
@@ -117,9 +122,9 @@
 						],
 
 						['div', {id : id + '_middle', 'class' : 'mceMiddle'}, 
-							['div', {id : id + '_left', 'class' : 'mceLeft'}],
+							['div', {id : id + '_left', 'class' : 'mceLeft', tabindex : '0'}],
 							['span', {id : id + '_content'}],
-							['div', {id : id + '_right', 'class' : 'mceRight'}]
+							['div', {id : id + '_right', 'class' : 'mceRight', tabindex : '0'}]
 						],
 
 						['div', {id : id + '_bottom', 'class' : 'mceBottom'},
@@ -183,6 +188,27 @@
 
 				DOM.add(id + '_middle', 'div', {'class' : 'mceIcon'});
 				DOM.setHTML(id + '_content', f.content.replace('\n', '<br />'));
+				
+				Event.add(id, 'keyup', function(evt) {
+					var VK_ESCAPE = 27;
+					if (evt.keyCode === VK_ESCAPE) {
+						f.button_func(false);
+						return Event.cancel(evt);
+					}
+				});
+
+				Event.add(id, 'keydown', function(evt) {
+					var cancelButton, VK_TAB = 9;
+					if (evt.keyCode === VK_TAB) {
+						cancelButton = DOM.select('a.mceCancel', id + '_wrapper')[0];
+						if (cancelButton && cancelButton !== evt.target) {
+							cancelButton.focus();
+						} else {
+							DOM.get(id + '_ok').focus();
+						}
+						return Event.cancel(evt);
+					}
+				});
 			}
 
 			// Register events
@@ -239,7 +265,23 @@
 					}
 				}
 			});
-
+			
+			// Make sure the tab order loops within the dialog.
+			Event.add([id + '_left', id + '_right'], 'focus', function(evt) {
+				var iframe = DOM.get(id + '_ifr');
+				if (iframe) {
+					var body = iframe.contentWindow.document.body;
+					var focusable = DOM.select(':input:enabled,*[tabindex=0]', body);
+					if (evt.target.id === (id + '_left')) {
+						focusable[focusable.length - 1].focus();
+					} else {
+						focusable[0].focus();
+					}
+				} else {
+					DOM.get(id + '_ok').focus();
+				}
+			});
+			
 			// Add window
 			w = t.windows[id] = {
 				id : id,
@@ -265,19 +307,20 @@
 				});
 
 				DOM.show('mceModalBlocker'); // Reduces flicker in IE
+				DOM.setAttrib(DOM.doc.body, 'aria-hidden', 'true');
 			} else
 				DOM.setStyle('mceModalBlocker', 'z-index', t.zIndex - 1);
 
 			if (tinymce.isIE6 || /Firefox\/2\./.test(navigator.userAgent) || (tinymce.isIE && !DOM.boxModel))
 				DOM.setStyles('mceModalBlocker', {position : 'absolute', left : vp.x, top : vp.y, width : vp.w - 2, height : vp.h - 2});
 
+			DOM.setAttrib(id, 'aria-hidden', 'false');
 			t.focus(id);
 			t._fixIELayout(id, 1);
 
 			// Focus ok button
 			if (DOM.get(id + '_ok'))
 				DOM.get(id + '_ok').focus();
-
 			t.count++;
 
 			return w;
@@ -295,6 +338,14 @@
 				DOM.removeClass(t.lastId, 'mceFocus');
 				DOM.addClass(id, 'mceFocus');
 				t.lastId = id;
+				
+				if (w.focussedElement) {
+					w.focussedElement.focus();
+				} else if (DOM.get(id + '_ok')) {
+					DOM.get(w.id + '_ok').focus();
+				} else if (DOM.get(w.id + '_ifr')) {
+					DOM.get(w.id + '_ifr').focus();
+				}
 			}
 		},
 
@@ -478,7 +529,7 @@
 		},
 
 		close : function(win, id) {
-			var t = this, w, d = DOM.doc, ix = 0, fw, id;
+			var t = this, w, d = DOM.doc, fw, id;
 
 			id = t._findId(id || win);
 
@@ -490,8 +541,11 @@
 
 			t.count--;
 
-			if (t.count == 0)
+			if (t.count == 0) {
 				DOM.remove('mceModalBlocker');
+				DOM.setAttrib(DOM.doc.body, 'aria-hidden', 'false');
+				t.editor.focus();
+			}
 
 			if (w = t.windows[id]) {
 				t.onClose.dispatch(t);
@@ -504,18 +558,25 @@
 				w.element.remove();
 				delete t.windows[id];
 
-				// Find front most window and focus that
-				each (t.windows, function(w) {
-					if (w.zIndex > ix) {
-						fw = w;
-						ix = w.zIndex;
-					}
-				});
+				fw = t._frontWindow();
 
 				if (fw)
 					t.focus(fw.id);
 			}
 		},
+		
+		// Find front most window
+		_frontWindow : function() {
+			var fw, ix = 0;
+			// Find front most window and focus that
+			each (this.windows, function(w) {
+				if (w.zIndex > ix) {
+					fw = w;
+					ix = w.zIndex;
+				}
+			});
+			return fw;
+		},
 
 		setTitle : function(w, ti) {
 			var e;
diff --git a/plugins/TinyMCE/js/plugins/inlinepopups/skins/clearlooks2/img/alert.gif b/plugins/TinyMCE/js/plugins/inlinepopups/skins/clearlooks2/img/alert.gif
index 94abd08763..219139857e 100644
Binary files a/plugins/TinyMCE/js/plugins/inlinepopups/skins/clearlooks2/img/alert.gif and b/plugins/TinyMCE/js/plugins/inlinepopups/skins/clearlooks2/img/alert.gif differ
diff --git a/plugins/TinyMCE/js/plugins/inlinepopups/skins/clearlooks2/img/button.gif b/plugins/TinyMCE/js/plugins/inlinepopups/skins/clearlooks2/img/button.gif
index e671094cb0..f957e49a3d 100644
Binary files a/plugins/TinyMCE/js/plugins/inlinepopups/skins/clearlooks2/img/button.gif and b/plugins/TinyMCE/js/plugins/inlinepopups/skins/clearlooks2/img/button.gif differ
diff --git a/plugins/TinyMCE/js/plugins/inlinepopups/skins/clearlooks2/img/confirm.gif b/plugins/TinyMCE/js/plugins/inlinepopups/skins/clearlooks2/img/confirm.gif
index 497307a85a..20acbbf7ae 100644
Binary files a/plugins/TinyMCE/js/plugins/inlinepopups/skins/clearlooks2/img/confirm.gif and b/plugins/TinyMCE/js/plugins/inlinepopups/skins/clearlooks2/img/confirm.gif differ
diff --git a/plugins/TinyMCE/js/plugins/inlinepopups/skins/clearlooks2/img/corners.gif b/plugins/TinyMCE/js/plugins/inlinepopups/skins/clearlooks2/img/corners.gif
index c894b2e835..d5de1cc236 100644
Binary files a/plugins/TinyMCE/js/plugins/inlinepopups/skins/clearlooks2/img/corners.gif and b/plugins/TinyMCE/js/plugins/inlinepopups/skins/clearlooks2/img/corners.gif differ
diff --git a/plugins/TinyMCE/js/plugins/inlinepopups/skins/clearlooks2/img/vertical.gif b/plugins/TinyMCE/js/plugins/inlinepopups/skins/clearlooks2/img/vertical.gif
index 43a735f22c..0b4cc3682a 100644
Binary files a/plugins/TinyMCE/js/plugins/inlinepopups/skins/clearlooks2/img/vertical.gif and b/plugins/TinyMCE/js/plugins/inlinepopups/skins/clearlooks2/img/vertical.gif differ
diff --git a/plugins/TinyMCE/js/plugins/inlinepopups/skins/clearlooks2/window.css b/plugins/TinyMCE/js/plugins/inlinepopups/skins/clearlooks2/window.css
index 5e6fd7d3cf..a50d4fc573 100644
--- a/plugins/TinyMCE/js/plugins/inlinepopups/skins/clearlooks2/window.css
+++ b/plugins/TinyMCE/js/plugins/inlinepopups/skins/clearlooks2/window.css
@@ -87,4 +87,4 @@
 .clearlooks2 .mceAlert .mceIcon {background:url(img/alert.gif)}
 .clearlooks2 .mceConfirm .mceOk {left:50%; top:auto; margin-left: -90px}
 .clearlooks2 .mceConfirm .mceCancel {left:50%; top:auto}
-.clearlooks2 .mceConfirm .mceIcon {background:url(img/confirm.gif)} 
\ No newline at end of file
+.clearlooks2 .mceConfirm .mceIcon {background:url(img/confirm.gif)}
diff --git a/plugins/TinyMCE/js/plugins/layer/editor_plugin.js b/plugins/TinyMCE/js/plugins/layer/editor_plugin.js
index f88a6dd28d..d610f7e9de 100644
--- a/plugins/TinyMCE/js/plugins/layer/editor_plugin.js
+++ b/plugins/TinyMCE/js/plugins/layer/editor_plugin.js
@@ -1 +1 @@
-(function(){tinymce.create("tinymce.plugins.Layer",{init:function(a,b){var c=this;c.editor=a;a.addCommand("mceInsertLayer",c._insertLayer,c);a.addCommand("mceMoveForward",function(){c._move(1)});a.addCommand("mceMoveBackward",function(){c._move(-1)});a.addCommand("mceMakeAbsolute",function(){c._toggleAbsolute()});a.addButton("moveforward",{title:"layer.forward_desc",cmd:"mceMoveForward"});a.addButton("movebackward",{title:"layer.backward_desc",cmd:"mceMoveBackward"});a.addButton("absolute",{title:"layer.absolute_desc",cmd:"mceMakeAbsolute"});a.addButton("insertlayer",{title:"layer.insertlayer_desc",cmd:"mceInsertLayer"});a.onInit.add(function(){if(tinymce.isIE){a.getDoc().execCommand("2D-Position",false,true)}});a.onNodeChange.add(c._nodeChange,c);a.onVisualAid.add(c._visualAid,c)},getInfo:function(){return{longname:"Layer",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/layer",version:tinymce.majorVersion+"."+tinymce.minorVersion}},_nodeChange:function(b,a,e){var c,d;c=this._getParentLayer(e);d=b.dom.getParent(e,"DIV,P,IMG");if(!d){a.setDisabled("absolute",1);a.setDisabled("moveforward",1);a.setDisabled("movebackward",1)}else{a.setDisabled("absolute",0);a.setDisabled("moveforward",!c);a.setDisabled("movebackward",!c);a.setActive("absolute",c&&c.style.position.toLowerCase()=="absolute")}},_visualAid:function(a,c,b){var d=a.dom;tinymce.each(d.select("div,p",c),function(f){if(/^(absolute|relative|static)$/i.test(f.style.position)){if(b){d.addClass(f,"mceItemVisualAid")}else{d.removeClass(f,"mceItemVisualAid")}}})},_move:function(h){var b=this.editor,f,g=[],e=this._getParentLayer(b.selection.getNode()),c=-1,j=-1,a;a=[];tinymce.walk(b.getBody(),function(d){if(d.nodeType==1&&/^(absolute|relative|static)$/i.test(d.style.position)){a.push(d)}},"childNodes");for(f=0;f<a.length;f++){g[f]=a[f].style.zIndex?parseInt(a[f].style.zIndex):0;if(c<0&&a[f]==e){c=f}}if(h<0){for(f=0;f<g.length;f++){if(g[f]<g[c]){j=f;break}}if(j>-1){a[c].style.zIndex=g[j];a[j].style.zIndex=g[c]}else{if(g[c]>0){a[c].style.zIndex=g[c]-1}}}else{for(f=0;f<g.length;f++){if(g[f]>g[c]){j=f;break}}if(j>-1){a[c].style.zIndex=g[j];a[j].style.zIndex=g[c]}else{a[c].style.zIndex=g[c]+1}}b.execCommand("mceRepaint")},_getParentLayer:function(a){return this.editor.dom.getParent(a,function(b){return b.nodeType==1&&/^(absolute|relative|static)$/i.test(b.style.position)})},_insertLayer:function(){var a=this.editor,b=a.dom.getPos(a.dom.getParent(a.selection.getNode(),"*"));a.dom.add(a.getBody(),"div",{style:{position:"absolute",left:b.x,top:(b.y>20?b.y:20),width:100,height:100},"class":"mceItemVisualAid"},a.selection.getContent()||a.getLang("layer.content"))},_toggleAbsolute:function(){var a=this.editor,b=this._getParentLayer(a.selection.getNode());if(!b){b=a.dom.getParent(a.selection.getNode(),"DIV,P,IMG")}if(b){if(b.style.position.toLowerCase()=="absolute"){a.dom.setStyles(b,{position:"",left:"",top:"",width:"",height:""});a.dom.removeClass(b,"mceItemVisualAid")}else{if(b.style.left==""){b.style.left=20+"px"}if(b.style.top==""){b.style.top=20+"px"}if(b.style.width==""){b.style.width=b.width?(b.width+"px"):"100px"}if(b.style.height==""){b.style.height=b.height?(b.height+"px"):"100px"}b.style.position="absolute";a.addVisual(a.getBody())}a.execCommand("mceRepaint");a.nodeChanged()}}});tinymce.PluginManager.add("layer",tinymce.plugins.Layer)})();
\ No newline at end of file
+(function(){tinymce.create("tinymce.plugins.Layer",{init:function(a,b){var c=this;c.editor=a;a.addCommand("mceInsertLayer",c._insertLayer,c);a.addCommand("mceMoveForward",function(){c._move(1)});a.addCommand("mceMoveBackward",function(){c._move(-1)});a.addCommand("mceMakeAbsolute",function(){c._toggleAbsolute()});a.addButton("moveforward",{title:"layer.forward_desc",cmd:"mceMoveForward"});a.addButton("movebackward",{title:"layer.backward_desc",cmd:"mceMoveBackward"});a.addButton("absolute",{title:"layer.absolute_desc",cmd:"mceMakeAbsolute"});a.addButton("insertlayer",{title:"layer.insertlayer_desc",cmd:"mceInsertLayer"});a.onInit.add(function(){if(tinymce.isIE){a.getDoc().execCommand("2D-Position",false,true)}});a.onNodeChange.add(c._nodeChange,c);a.onVisualAid.add(c._visualAid,c)},getInfo:function(){return{longname:"Layer",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/layer",version:tinymce.majorVersion+"."+tinymce.minorVersion}},_nodeChange:function(b,a,e){var c,d;c=this._getParentLayer(e);d=b.dom.getParent(e,"DIV,P,IMG");if(!d){a.setDisabled("absolute",1);a.setDisabled("moveforward",1);a.setDisabled("movebackward",1)}else{a.setDisabled("absolute",0);a.setDisabled("moveforward",!c);a.setDisabled("movebackward",!c);a.setActive("absolute",c&&c.style.position.toLowerCase()=="absolute")}},_visualAid:function(a,c,b){var d=a.dom;tinymce.each(d.select("div,p",c),function(f){if(/^(absolute|relative|static)$/i.test(f.style.position)){if(b){d.addClass(f,"mceItemVisualAid")}else{d.removeClass(f,"mceItemVisualAid")}}})},_move:function(h){var b=this.editor,f,g=[],e=this._getParentLayer(b.selection.getNode()),c=-1,j=-1,a;a=[];tinymce.walk(b.getBody(),function(d){if(d.nodeType==1&&/^(absolute|relative|static)$/i.test(d.style.position)){a.push(d)}},"childNodes");for(f=0;f<a.length;f++){g[f]=a[f].style.zIndex?parseInt(a[f].style.zIndex):0;if(c<0&&a[f]==e){c=f}}if(h<0){for(f=0;f<g.length;f++){if(g[f]<g[c]){j=f;break}}if(j>-1){a[c].style.zIndex=g[j];a[j].style.zIndex=g[c]}else{if(g[c]>0){a[c].style.zIndex=g[c]-1}}}else{for(f=0;f<g.length;f++){if(g[f]>g[c]){j=f;break}}if(j>-1){a[c].style.zIndex=g[j];a[j].style.zIndex=g[c]}else{a[c].style.zIndex=g[c]+1}}b.execCommand("mceRepaint")},_getParentLayer:function(a){return this.editor.dom.getParent(a,function(b){return b.nodeType==1&&/^(absolute|relative|static)$/i.test(b.style.position)})},_insertLayer:function(){var a=this.editor,b=a.dom.getPos(a.dom.getParent(a.selection.getNode(),"*"));a.dom.add(a.getBody(),"div",{style:{position:"absolute",left:b.x,top:(b.y>20?b.y:20),width:100,height:100},"class":"mceItemVisualAid"},a.selection.getContent()||a.getLang("layer.content"))},_toggleAbsolute:function(){var a=this.editor,b=this._getParentLayer(a.selection.getNode());if(!b){b=a.dom.getParent(a.selection.getNode(),"DIV,P,IMG")}if(b){if(b.style.position.toLowerCase()=="absolute"){a.dom.setStyles(b,{position:"",left:"",top:"",width:"",height:""});a.dom.removeClass(b,"mceItemVisualAid")}else{if(b.style.left==""){b.style.left=20+"px"}if(b.style.top==""){b.style.top=20+"px"}if(b.style.width==""){b.style.width=b.width?(b.width+"px"):"100px"}if(b.style.height==""){b.style.height=b.height?(b.height+"px"):"100px"}b.style.position="absolute";a.dom.setAttrib(b,"data-mce-style","");a.addVisual(a.getBody())}a.execCommand("mceRepaint");a.nodeChanged()}}});tinymce.PluginManager.add("layer",tinymce.plugins.Layer)})();
\ No newline at end of file
diff --git a/plugins/TinyMCE/js/plugins/layer/editor_plugin_src.js b/plugins/TinyMCE/js/plugins/layer/editor_plugin_src.js
index d5aa86548c..a8ac5a72fc 100644
--- a/plugins/TinyMCE/js/plugins/layer/editor_plugin_src.js
+++ b/plugins/TinyMCE/js/plugins/layer/editor_plugin_src.js
@@ -198,6 +198,8 @@
 						le.style.height = le.height ? (le.height + 'px') : '100px';
 
 					le.style.position = "absolute";
+
+					ed.dom.setAttrib(le, 'data-mce-style', '');
 					ed.addVisual(ed.getBody());
 				}
 
diff --git a/plugins/TinyMCE/js/plugins/legacyoutput/editor_plugin.js b/plugins/TinyMCE/js/plugins/legacyoutput/editor_plugin.js
index 29d43c5244..b3a4ce31c5 100644
--- a/plugins/TinyMCE/js/plugins/legacyoutput/editor_plugin.js
+++ b/plugins/TinyMCE/js/plugins/legacyoutput/editor_plugin.js
@@ -1 +1 @@
-(function(a){a.onAddEditor.addToTop(function(c,b){b.settings.inline_styles=false});a.create("tinymce.plugins.LegacyOutput",{init:function(b){b.onInit.add(function(){var c="p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li,table,img",e=a.explode(b.settings.font_size_style_values),d=b.serializer;b.formatter.register({alignleft:{selector:c,attributes:{align:"left"}},aligncenter:{selector:c,attributes:{align:"center"}},alignright:{selector:c,attributes:{align:"right"}},alignfull:{selector:c,attributes:{align:"full"}},bold:{inline:"b"},italic:{inline:"i"},underline:{inline:"u"},strikethrough:{inline:"strike"},fontname:{inline:"font",attributes:{face:"%value"}},fontsize:{inline:"font",attributes:{size:function(f){return a.inArray(e,f.value)+1}}},forecolor:{inline:"font",styles:{color:"%value"}},hilitecolor:{inline:"font",styles:{backgroundColor:"%value"}}});d._setup();a.each("b,i,u,strike".split(","),function(f){var g=d.rules[f];if(!g){d.addRules(f)}});if(!d.rules.font){d.addRules("font[face|size|color|style]")}a.each(c.split(","),function(f){var h=d.rules[f],g;if(h){a.each(h.attribs,function(j,i){if(i.name=="align"){g=true;return false}});if(!g){h.attribs.push({name:"align"})}}});b.onNodeChange.add(function(g,k){var j,f,h,i;f=g.dom.getParent(g.selection.getNode(),"font");if(f){h=f.face;i=f.size}if(j=k.get("fontselect")){j.select(function(l){return l==h})}if(j=k.get("fontsizeselect")){j.select(function(m){var l=a.inArray(e,m.fontSize);return l+1==i})}})})},getInfo:function(){return{longname:"LegacyOutput",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/legacyoutput",version:a.majorVersion+"."+a.minorVersion}}});a.PluginManager.add("legacyoutput",a.plugins.LegacyOutput)})(tinymce);
\ No newline at end of file
+(function(a){a.onAddEditor.addToTop(function(c,b){b.settings.inline_styles=false});a.create("tinymce.plugins.LegacyOutput",{init:function(b){b.onInit.add(function(){var c="p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li,table,img",e=a.explode(b.settings.font_size_style_values),d=b.schema;b.formatter.register({alignleft:{selector:c,attributes:{align:"left"}},aligncenter:{selector:c,attributes:{align:"center"}},alignright:{selector:c,attributes:{align:"right"}},alignfull:{selector:c,attributes:{align:"justify"}},bold:[{inline:"b",remove:"all"},{inline:"strong",remove:"all"},{inline:"span",styles:{fontWeight:"bold"}}],italic:[{inline:"i",remove:"all"},{inline:"em",remove:"all"},{inline:"span",styles:{fontStyle:"italic"}}],underline:[{inline:"u",remove:"all"},{inline:"span",styles:{textDecoration:"underline"},exact:true}],strikethrough:[{inline:"strike",remove:"all"},{inline:"span",styles:{textDecoration:"line-through"},exact:true}],fontname:{inline:"font",attributes:{face:"%value"}},fontsize:{inline:"font",attributes:{size:function(f){return a.inArray(e,f.value)+1}}},forecolor:{inline:"font",styles:{color:"%value"}},hilitecolor:{inline:"font",styles:{backgroundColor:"%value"}}});a.each("b,i,u,strike".split(","),function(f){d.addValidElements(f+"[*]")});if(!d.getElementRule("font")){d.addValidElements("font[face|size|color|style]")}a.each(c.split(","),function(f){var h=d.getElementRule(f),g;if(h){if(!h.attributes.align){h.attributes.align={};h.attributesOrder.push("align")}}});b.onNodeChange.add(function(g,k){var j,f,h,i;f=g.dom.getParent(g.selection.getNode(),"font");if(f){h=f.face;i=f.size}if(j=k.get("fontselect")){j.select(function(l){return l==h})}if(j=k.get("fontsizeselect")){j.select(function(m){var l=a.inArray(e,m.fontSize);return l+1==i})}})})},getInfo:function(){return{longname:"LegacyOutput",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/legacyoutput",version:a.majorVersion+"."+a.minorVersion}}});a.PluginManager.add("legacyoutput",a.plugins.LegacyOutput)})(tinymce);
\ No newline at end of file
diff --git a/plugins/TinyMCE/js/plugins/legacyoutput/editor_plugin_src.js b/plugins/TinyMCE/js/plugins/legacyoutput/editor_plugin_src.js
index e852da15ea..e627ec76e4 100644
--- a/plugins/TinyMCE/js/plugins/legacyoutput/editor_plugin_src.js
+++ b/plugins/TinyMCE/js/plugins/legacyoutput/editor_plugin_src.js
@@ -26,7 +26,7 @@
 			editor.onInit.add(function() {
 				var alignElements = 'p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li,table,img',
 					fontSizes = tinymce.explode(editor.settings.font_size_style_values),
-					serializer = editor.serializer;
+					schema = editor.schema;
 
 				// Override some internal formats to produce legacy elements and attributes
 				editor.formatter.register({
@@ -34,13 +34,27 @@
 					alignleft : {selector : alignElements, attributes : {align : 'left'}},
 					aligncenter : {selector : alignElements, attributes : {align : 'center'}},
 					alignright : {selector : alignElements, attributes : {align : 'right'}},
-					alignfull : {selector : alignElements, attributes : {align : 'full'}},
+					alignfull : {selector : alignElements, attributes : {align : 'justify'}},
 
-					// Change the basic formatting elements to use deprecated element types
-					bold : {inline : 'b'},
-					italic : {inline : 'i'},
-					underline : {inline : 'u'},
-					strikethrough : {inline : 'strike'},
+					// Change the basic formatting elements to use deprecated element types
+					bold : [
+						{inline : 'b', remove : 'all'},
+						{inline : 'strong', remove : 'all'},
+						{inline : 'span', styles : {fontWeight : 'bold'}}
+					],
+					italic : [
+						{inline : 'i', remove : 'all'},
+						{inline : 'em', remove : 'all'},
+						{inline : 'span', styles : {fontStyle : 'italic'}}
+					],
+					underline : [
+						{inline : 'u', remove : 'all'},
+						{inline : 'span', styles : {textDecoration : 'underline'}, exact : true}
+					],
+					strikethrough : [
+						{inline : 'strike', remove : 'all'},
+						{inline : 'span', styles : {textDecoration: 'line-through'}, exact : true}
+					],
 
 					// Change font size and font family to use the deprecated font element
 					fontname : {inline : 'font', attributes : {face : '%value'}},
@@ -58,35 +72,24 @@
 					hilitecolor : {inline : 'font', styles : {backgroundColor : '%value'}}
 				});
 
-				// Force parsing of the serializer rules
-				serializer._setup();
-
 				// Check that deprecated elements are allowed if not add them
 				tinymce.each('b,i,u,strike'.split(','), function(name) {
-					var rule = serializer.rules[name];
-
-					if (!rule)
-						serializer.addRules(name);
+					schema.addValidElements(name + '[*]');
 				});
 
 				// Add font element if it's missing
-				if (!serializer.rules["font"])
-					serializer.addRules("font[face|size|color|style]");
+				if (!schema.getElementRule("font"))
+					schema.addValidElements("font[face|size|color|style]");
 
 				// Add the missing and depreacted align attribute for the serialization engine
 				tinymce.each(alignElements.split(','), function(name) {
-					var rule = serializer.rules[name], found;
+					var rule = schema.getElementRule(name), found;
 
 					if (rule) {
-						tinymce.each(rule.attribs, function(name, attr) {
-							if (attr.name == 'align') {
-								found = true;
-								return false;
-							}
-						});
-
-						if (!found)
-							rule.attribs.push({name : 'align'});
+						if (!rule.attributes.align) {
+							rule.attributes.align = {};
+							rule.attributesOrder.push('align');
+						}
 					}
 				});
 
@@ -133,4 +136,4 @@
 
 	// Register plugin
 	tinymce.PluginManager.add('legacyoutput', tinymce.plugins.LegacyOutput);
-})(tinymce);
\ No newline at end of file
+})(tinymce);
diff --git a/plugins/TinyMCE/js/plugins/linkautodetect/changelog.txt b/plugins/TinyMCE/js/plugins/linkautodetect/changelog.txt
deleted file mode 100644
index ecab340ab2..0000000000
--- a/plugins/TinyMCE/js/plugins/linkautodetect/changelog.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-0.1     2009-04-15 - initial version
-0.11    2009-05-10 - Fix for email addresses with two periods in the domain
-                        were incorrectly converted to http links.  Fix submitted
-                        by Ralph Slooten.
-                     Fix for tinyMCE.isIE that needed to be tinymce.isIE.
-0.12    2009-06-23 - Fix for URLs that have an HTML anchor identifier in them, such as
-                     http://www.palmpre.org/forums/palm-pre/85-copy-and-paste.html#post457
-                     Previously, it would create a link to only
-                     http://www.palmpre.org/forums/palm-pre/85-copy-and-paste.html
\ No newline at end of file
diff --git a/plugins/TinyMCE/js/plugins/linkautodetect/editor_plugin.js b/plugins/TinyMCE/js/plugins/linkautodetect/editor_plugin.js
deleted file mode 100644
index 7e97a78e4a..0000000000
--- a/plugins/TinyMCE/js/plugins/linkautodetect/editor_plugin.js
+++ /dev/null
@@ -1,7 +0,0 @@
-
-(function(){tinymce.create('tinymce.plugins.LinkAutoDetect',{init:function(ed,url){var t=this;t.RE_email=/^[a-z0-9_\-]+(\.[_a-z0-9\-]+)*@([_a-z0-9\-]+\.)+([a-z]{2}|aero|arpa|biz|com|coop|edu|gov|info|int|jobs|mil|museum|name|nato|net|org|pro|travel)$/i;t.RE_url=/^((https?|ftp|news):\/\/)?([a-z]([a-z0-9\-]*\.)+([a-z]{2}|aero|arpa|biz|com|coop|edu|gov|info|int|jobs|mil|museum|name|nato|net|org|pro|travel)|(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5]))(\/[a-z0-9_\-\.~]+)*(\/([a-z0-9_\-\.]*)(\?[a-z0-9+_\-\.%=&amp;]*)?)?(#[a-z][a-z0-9_]*)?$/i;ed.onKeyPress.add(t.onKeyPress,t);ed.onKeyUp.add(t.onKeyUp,t);},getInfo:function(){return{longname:'Link Auto Detect',author:'Ubernote/Shane Tomlinson',authorurl:'http://www.ubernote.com',infourl:'http://www.ubernote.com',version:'0.2'};},onKeyPress:function(ed,ev,o){if(tinymce.isIE){return;}
-var s=ed.selection.getSel();var textNode=s.anchorNode;var createLink=function(searchfor,hlink,midStart){var leftText=textNode;var rightText=leftText.splitText(s.anchorOffset);var midText=leftText.splitText(midStart);var midEnd=midText.data.search(searchfor);if(midEnd!=-1){rightText=midText.splitText(midEnd);}
-var tag=ed.dom.create('a',{href:hlink},midText.data);var a=midText.parentNode.insertBefore(tag,rightText);s.collapse(rightText,0);ed.dom.remove(midText);};if((ev.which==13||ev.which==32)&&textNode.nodeType==3&&textNode.data.length>3&&textNode.data.indexOf('.')>=0&&!ed.dom.getParent(textNode,'a')){var midStart=textNode.data.substring(0,s.anchorOffset).search(/\S{4,}$/);if(midStart!=-1){var matchData=textNode.data.substring(0,s.anchorOffset).replace(/^.*?(\S*)$/,'$1');var matchURL=matchData.match(this.RE_url);var matchEmail=matchData.match(this.RE_email);if(matchEmail){createLink(/[^a-zA-Z0-9\.@_\-]/,'mailto:'+matchEmail[0],midStart);}
-else if(matchURL){createLink(/[^a-zA-Z0-9\._\-\/\&\?#=:@]/,(matchURL[1]?'':'http://')+matchURL[0],midStart);}}}},onKeyUp:function(ed,ev,o){if(tinymce.isIE){return;}
-var s=ed.selection.getSel();var textNode=s.anchorNode;var a=ed.dom.getParent(textNode,'a');if(!(ev.which&&(ev.which==13||ev.which==32))&&(ev.which||ev.keyCode==8||ev.keyCode==46)&&(textNode.nodeType==3)&&(a)){var matchEmail=s.anchorNode.data.match(this.RE_email);var matchURL=textNode.data.match(this.RE_url);if(matchEmail){ed.dom.setAttrib(a,'href','mailto:'+textNode.data);}
-if(matchURL){ed.dom.setAttrib(a,'href',(matchURL[1]?'':'http://')+matchURL[0]);}}}});tinymce.PluginManager.add('linkautodetect',tinymce.plugins.LinkAutoDetect);})();
\ No newline at end of file
diff --git a/plugins/TinyMCE/js/plugins/linkautodetect/editor_plugin_src.js b/plugins/TinyMCE/js/plugins/linkautodetect/editor_plugin_src.js
deleted file mode 100644
index d2693927c1..0000000000
--- a/plugins/TinyMCE/js/plugins/linkautodetect/editor_plugin_src.js
+++ /dev/null
@@ -1,141 +0,0 @@
-/**
- * $Id: editor_plugin_src.js 2009-05-10
- *
- * @author Ubernote/Shane Tomlinson
- * http://www.ubernote.com
- * set117@gmail.com
- *
- * Detect emails and urls as they are typed in Mozilla/Safari/Chrome and Opera
- * Borrowed from both Typo3 http://typo3.org/ and Xinha http://xinha.gogo.co.nz/
- * Heavily modified and cleaned up.
- * 
- * Original license info from Xinha at the bottom.
- */
-
-(function() {
-	tinymce.create('tinymce.plugins.LinkAutoDetect', {
-		init : function(ed, url) {
-			var t = this;
-			t.RE_email = /^[a-z0-9_\-]+(\.[_a-z0-9\-]+)*@([_a-z0-9\-]+\.)+([a-z]{2}|aero|arpa|biz|com|coop|edu|gov|info|int|jobs|mil|museum|name|nato|net|org|pro|travel)$/i;
-			t.RE_url   = /^((https?|ftp|news):\/\/)?([a-z]([a-z0-9\-]*\.)+([a-z]{2}|aero|arpa|biz|com|coop|edu|gov|info|int|jobs|mil|museum|name|nato|net|org|pro|travel)|(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5]))(\/[a-z0-9_\-\.~]+)*(\/([a-z0-9_\-\.]*)(\?[a-z0-9+_\-\.%=&amp;]*)?)?(#[a-z][a-z0-9_]*)?$/i;
-			ed.onKeyPress.add( t.onKeyPress, t );
-			ed.onKeyUp.add( t.onKeyUp, t );
-		},
-		
-		getInfo : function() {
-			return {
-				longname : 'Link Auto Detect',
-				author : 'Ubernote/Shane Tomlinson',
-				authorurl : 'http://www.ubernote.com',
-				infourl : 'http://www.ubernote.com',
-				version : '0.2'
-			};
-		},
-		
-		onKeyPress : function(ed, ev, o) {
-			if(tinymce.isIE) {   
-				// IE already does auto-detect, so no worries.
-				return;
-			} // end if
-			
-			var s = ed.selection.getSel();
-			var textNode = s.anchorNode;
-			
-			var createLink = function (searchfor, hlink, midStart) {
-				var leftText  = textNode;
-				var rightText = leftText.splitText(s.anchorOffset);
-				var midText   = leftText.splitText(midStart);
-				var midEnd = midText.data.search(searchfor);
-				if (midEnd != -1) {
-					rightText = midText.splitText(midEnd);
-				} // end if
-				var tag = ed.dom.create('a', { href: hlink }, midText.data);
-				var a = midText.parentNode.insertBefore(tag, rightText);
-				
-				// We are going to put the cursor into the first position after
-				//  the anchor and let the browser take care of inserting the space/enter.
-				s.collapse(rightText, 0);
-				ed.dom.remove(midText);
-			};
-			
-			// Space or Enter, see if the text just typed looks like a URL, or email address and link it accordingly
-			if((ev.which == 13 || ev.which == 32) 
-				&& textNode.nodeType == 3 && textNode.data.length > 3 
-				&& textNode.data.indexOf('.') >= 0 && !ed.dom.getParent(textNode, 'a')) {
-				var midStart = textNode.data.substring(0,s.anchorOffset).search(/\S{4,}$/);
-				if(midStart != -1) {
-					var matchData = textNode.data.substring(0,s.anchorOffset).replace(/^.*?(\S*)$/, '$1');
-					var matchURL = matchData.match(this.RE_url);
-					var matchEmail = matchData.match(this.RE_email);
-					if(matchEmail) {
-						createLink(/[^a-zA-Z0-9\.@_\-]/, 'mailto:' + matchEmail[0], midStart);
-					}
-					else if(matchURL) {
-						createLink( /[^a-zA-Z0-9\._\-\/\&\?#=:@]/, (matchURL[1] ? '' : 'http://') + matchURL[0], midStart);
-					}
-				} // end if
-			}
-		},
-		
-		onKeyUp : function(ed, ev, o) {
-			if(tinymce.isIE) {   
-				// IE already does auto-detect, so no worries.
-				return;
-			} // end if
-			
-			var s = ed.selection.getSel();
-			var textNode = s.anchorNode;
-				var a = ed.dom.getParent(textNode, 'a');
-				
-				if( ! (ev.which && ( ev.which == 13 || ev.which == 32)) 
-					&& (ev.which || ev.keyCode == 8 || ev.keyCode == 46)
-					&& (textNode.nodeType == 3) && (a)) {
-					// See if we might be changing a link
-					var matchEmail = s.anchorNode.data.match(this.RE_email);
-					var matchURL = textNode.data.match(this.RE_url);
-					if(matchEmail) {
-						ed.dom.setAttrib(a, 'href', 'mailto:' + textNode.data);
-					} // end if
-					if(matchURL) {
-						ed.dom.setAttrib(a, 'href', (matchURL[1] ? '' : 'http://') + matchURL[0]);
-					} // end if
-				} // end if
-			}
-	});
-
-	// Register plugin
-	tinymce.PluginManager.add('linkautodetect', tinymce.plugins.LinkAutoDetect);
-})();
-
-/*
-htmlArea License (based on BSD license)
-Copyright (c) 2002-2004, interactivetools.com, inc.
-Copyright (c) 2003-2004 dynarch.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:
-
-1) Redistributions of source code must retain the above copyright notice,
-   this list of conditions and the following disclaimer.
-
-2) 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.
-
-3) Neither the name of interactivetools.com, inc. nor the names of its
-   contributors may be used to endorse or promote products derived from this
-   software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
-*/
\ No newline at end of file
diff --git a/plugins/TinyMCE/js/plugins/lists/editor_plugin.js b/plugins/TinyMCE/js/plugins/lists/editor_plugin.js
new file mode 100644
index 0000000000..0fb8263eda
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/lists/editor_plugin.js
@@ -0,0 +1 @@
+(function(){var e=tinymce.each,r=tinymce.dom.Event,g;function p(t,s){while(t&&(t.nodeType===8||(t.nodeType===3&&/^[ \t\n\r]*$/.test(t.nodeValue)))){t=s(t)}return t}function b(s){return p(s,function(t){return t.previousSibling})}function i(s){return p(s,function(t){return t.nextSibling})}function d(s,u,t){return s.dom.getParent(u,function(v){return tinymce.inArray(t,v)!==-1})}function n(s){return s&&(s.tagName==="OL"||s.tagName==="UL")}function c(u,v){var t,w,s;t=b(u.lastChild);while(n(t)){w=t;t=b(w.previousSibling)}if(w){s=v.create("li",{style:"list-style-type: none;"});v.split(u,w);v.insertAfter(s,w);s.appendChild(w);s.appendChild(w);u=s.previousSibling}return u}function m(t,s,u){t=a(t,s,u);return o(t,s,u)}function a(u,s,v){var t=b(u.previousSibling);if(t){return h(t,u,s?t:false,v)}else{return u}}function o(u,t,v){var s=i(u.nextSibling);if(s){return h(u,s,t?s:false,v)}else{return u}}function h(u,s,t,v){if(l(u,s,!!t,v)){return f(u,s,t)}else{if(u&&u.tagName==="LI"&&n(s)){u.appendChild(s)}}return s}function l(u,t,s,v){if(!u||!t){return false}else{if(u.tagName==="LI"&&t.tagName==="LI"){return t.style.listStyleType==="none"||j(t)}else{if(n(u)){return(u.tagName===t.tagName&&(s||u.style.listStyleType===t.style.listStyleType))||q(t)}else{if(v&&u.tagName==="P"&&t.tagName==="P"){return true}else{return false}}}}}function q(t){var s=i(t.firstChild),u=b(t.lastChild);return s&&u&&n(t)&&s===u&&(n(s)||s.style.listStyleType==="none"||j(s))}function j(u){var t=i(u.firstChild),s=b(u.lastChild);return t&&s&&t===s&&n(t)}function f(w,v,s){var u=b(w.lastChild),t=i(v.firstChild);if(w.tagName==="P"){w.appendChild(w.ownerDocument.createElement("br"))}while(v.firstChild){w.appendChild(v.firstChild)}if(s){w.style.listStyleType=s.style.listStyleType}v.parentNode.removeChild(v);h(u,t,false);return w}function k(t,u){var s;if(!u.is(t,"li,ol,ul")){s=u.getParent(t,"li");if(s){t=s}}return t}tinymce.create("tinymce.plugins.Lists",{init:function(u,v){var s=false;function y(z){return z.keyCode===9&&(u.queryCommandState("InsertUnorderedList")||u.queryCommandState("InsertOrderedList"))}function w(z,B){var A=z.selection,C;if(B.keyCode===13){C=A.getStart();if(C.tagName=="BR"&&C.parentNode.tagName=="LI"){C=C.parentNode}s=A.isCollapsed()&&C&&C.tagName==="LI"&&(C.childNodes.length===0||(C.firstChild.nodeName=="BR"&&C.childNodes.length===1));return s}}function t(z,A){if(y(A)||w(z,A)){return r.cancel(A)}}function x(C,E){if(!tinymce.isGecko){return}var A=C.selection.getStart();if(E.keyCode!=8||A.tagName!=="IMG"){return}function B(K){var L=K.firstChild;var J=null;do{if(!L){break}if(L.tagName==="LI"){J=L}}while(L=L.nextSibling);return J}function I(K,J){while(K.childNodes.length>0){J.appendChild(K.childNodes[0])}}var F;if(A.parentNode.previousSibling.tagName==="UL"||A.parentNode.previousSibling.tagName==="OL"){F=A.parentNode.previousSibling}else{if(A.parentNode.previousSibling.previousSibling.tagName==="UL"||A.parentNode.previousSibling.previousSibling.tagName==="OL"){F=A.parentNode.previousSibling.previousSibling}else{return}}var H=B(F);var z=C.dom.createRng();z.setStart(H,1);z.setEnd(H,1);C.selection.setRng(z);C.selection.collapse(true);var D=C.selection.getBookmark();var G=A.parentNode.cloneNode(true);if(G.tagName==="P"||G.tagName==="DIV"){I(G,H)}else{H.appendChild(G)}A.parentNode.parentNode.removeChild(A.parentNode);C.selection.moveToBookmark(D)}this.ed=u;u.addCommand("Indent",this.indent,this);u.addCommand("Outdent",this.outdent,this);u.addCommand("InsertUnorderedList",function(){this.applyList("UL","OL")},this);u.addCommand("InsertOrderedList",function(){this.applyList("OL","UL")},this);u.onInit.add(function(){u.editorCommands.addCommands({outdent:function(){var A=u.selection,B=u.dom;function z(C){C=B.getParent(C,B.isBlock);return C&&(parseInt(u.dom.getStyle(C,"margin-left")||0,10)+parseInt(u.dom.getStyle(C,"padding-left")||0,10))>0}return z(A.getStart())||z(A.getEnd())||u.queryCommandState("InsertOrderedList")||u.queryCommandState("InsertUnorderedList")}},"state")});u.onKeyUp.add(function(A,B){var C,z;if(y(B)){A.execCommand(B.shiftKey?"Outdent":"Indent",true,null);return r.cancel(B)}else{if(s&&w(A,B)){if(A.queryCommandState("InsertOrderedList")){A.execCommand("InsertOrderedList")}else{A.execCommand("InsertUnorderedList")}C=A.selection.getStart();if(C&&C.tagName==="LI"){C=A.dom.getParent(C,"ol,ul").nextSibling;if(C&&C.tagName==="P"){if(!C.firstChild){C.appendChild(A.getDoc().createTextNode(""))}z=A.dom.createRng();z.setStart(C.firstChild,1);z.setEnd(C.firstChild,1);A.selection.setRng(z)}}return r.cancel(B)}}});u.onKeyPress.add(t);u.onKeyDown.add(t);u.onKeyDown.add(x)},applyList:function(y,v){var C=this,z=C.ed,I=z.dom,s=[],H=false,u=false,w=false,B,G=z.selection.getSelectedBlocks();function E(t){if(t&&t.tagName==="BR"){I.remove(t)}}function F(M){var N=I.create(y),t;function L(O){if(O.style.marginLeft||O.style.paddingLeft){C.adjustPaddingFunction(false)(O)}}if(M.tagName==="LI"){}else{if(M.tagName==="P"||M.tagName==="DIV"||M.tagName==="BODY"){K(M,function(P,O,Q){J(P,O,M.tagName==="BODY"?null:P.parentNode);t=P.parentNode;L(t);E(O)});if(M.tagName==="P"||G.length>1){I.split(t.parentNode.parentNode,t.parentNode)}m(t.parentNode,true);return}else{t=I.create("li");I.insertAfter(t,M);t.appendChild(M);L(M);M=t}}I.insertAfter(N,M);N.appendChild(M);m(N,true);s.push(M)}function J(Q,L,O){var t,P=Q,N,M;while(!I.isBlock(Q.parentNode)&&Q.parentNode!==I.getRoot()){Q=I.split(Q.parentNode,Q.previousSibling);Q=Q.nextSibling;P=Q}if(O){t=O.cloneNode(true);Q.parentNode.insertBefore(t,Q);while(t.firstChild){I.remove(t.firstChild)}t=I.rename(t,"li")}else{t=I.create("li");Q.parentNode.insertBefore(t,Q)}while(P&&P!=L){N=P.nextSibling;t.appendChild(P);P=N}if(t.childNodes.length===0){t.innerHTML='<br _mce_bogus="1" />'}F(t)}function K(Q,T){var N,R,O=3,L=1,t="br,ul,ol,p,div,h1,h2,h3,h4,h5,h6,table,blockquote,address,pre,form,center,dl";function P(X,U){var V=I.createRng(),W;g.keep=true;z.selection.moveToBookmark(g);g.keep=false;W=z.selection.getRng(true);if(!U){U=X.parentNode.lastChild}V.setStartBefore(X);V.setEndAfter(U);return !(V.compareBoundaryPoints(O,W)>0||V.compareBoundaryPoints(L,W)<=0)}function S(U){if(U.nextSibling){return U.nextSibling}if(!I.isBlock(U.parentNode)&&U.parentNode!==I.getRoot()){return S(U.parentNode)}}N=Q.firstChild;var M=false;e(I.select(t,Q),function(V){var U;if(V.hasAttribute&&V.hasAttribute("_mce_bogus")){return true}if(P(N,V)){I.addClass(V,"_mce_tagged_br");N=S(V)}});M=(N&&P(N,undefined));N=Q.firstChild;e(I.select(t,Q),function(V){var U=S(V);if(V.hasAttribute&&V.hasAttribute("_mce_bogus")){return true}if(I.hasClass(V,"_mce_tagged_br")){T(N,V,R);R=null}else{R=V}N=U});if(M){T(N,undefined,R)}}function D(t){K(t,function(M,L,N){J(M,L);E(L);E(N)})}function A(t){if(tinymce.inArray(s,t)!==-1){return}if(t.parentNode.tagName===v){I.split(t.parentNode,t);F(t);o(t.parentNode,false)}s.push(t)}function x(M){var O,N,L,t;if(tinymce.inArray(s,M)!==-1){return}M=c(M,I);while(I.is(M.parentNode,"ol,ul,li")){I.split(M.parentNode,M)}s.push(M);M=I.rename(M,"p");L=m(M,false,z.settings.force_br_newlines);if(L===M){O=M.firstChild;while(O){if(I.isBlock(O)){O=I.split(O.parentNode,O);t=true;N=O.nextSibling&&O.nextSibling.firstChild}else{N=O.nextSibling;if(t&&O.tagName==="BR"){I.remove(O)}t=false}O=N}}}e(G,function(t){t=k(t,I);if(t.tagName===v||(t.tagName==="LI"&&t.parentNode.tagName===v)){u=true}else{if(t.tagName===y||(t.tagName==="LI"&&t.parentNode.tagName===y)){H=true}else{w=true}}});if(w||u||G.length===0){B={LI:A,H1:F,H2:F,H3:F,H4:F,H5:F,H6:F,P:F,BODY:F,DIV:G.length>1?F:D,defaultAction:D}}else{B={defaultAction:x}}this.process(B)},indent:function(){var u=this.ed,w=u.dom,x=[];function s(z){var y=w.create("li",{style:"list-style-type: none;"});w.insertAfter(y,z);return y}function t(B){var y=s(B),D=w.getParent(B,"ol,ul"),C=D.tagName,E=w.getStyle(D,"list-style-type"),A={},z;if(E!==""){A.style="list-style-type: "+E+";"}z=w.create(C,A);y.appendChild(z);return z}function v(z){if(!d(u,z,x)){z=c(z,w);var y=t(z);y.appendChild(z);m(y.parentNode,false);m(y,false);x.push(z)}}this.process({LI:v,defaultAction:this.adjustPaddingFunction(true)})},outdent:function(){var v=this,u=v.ed,w=u.dom,s=[];function x(t){var z,y,A;if(!d(u,t,s)){if(w.getStyle(t,"margin-left")!==""||w.getStyle(t,"padding-left")!==""){return v.adjustPaddingFunction(false)(t)}A=w.getStyle(t,"text-align",true);if(A==="center"||A==="right"){w.setStyle(t,"text-align","left");return}t=c(t,w);z=t.parentNode;y=t.parentNode.parentNode;if(y.tagName==="P"){w.split(y,t.parentNode)}else{w.split(z,t);if(y.tagName==="LI"){w.split(y,t)}else{if(!w.is(y,"ol,ul")){w.rename(t,"p")}}}s.push(t)}}this.process({LI:x,defaultAction:this.adjustPaddingFunction(false)});e(s,m)},process:function(x){var B=this,v=B.ed.selection,y=B.ed.dom,A,s;function w(t){y.removeClass(t,"_mce_act_on");if(!t||t.nodeType!==1){return}t=k(t,y);var C=x[t.tagName];if(!C){C=x.defaultAction}C(t)}function u(t){B.splitSafeEach(t.childNodes,w)}function z(t,C){return C>=0&&t.hasChildNodes()&&C<t.childNodes.length&&t.childNodes[C].tagName==="BR"}A=v.getSelectedBlocks();if(A.length===0){A=[y.getRoot()]}s=v.getRng(true);if(!s.collapsed){if(z(s.endContainer,s.endOffset-1)){s.setEnd(s.endContainer,s.endOffset-1);v.setRng(s)}if(z(s.startContainer,s.startOffset)){s.setStart(s.startContainer,s.startOffset+1);v.setRng(s)}}g=v.getBookmark();x.OL=x.UL=u;B.splitSafeEach(A,w);v.moveToBookmark(g);g=null;B.ed.execCommand("mceRepaint")},splitSafeEach:function(t,s){if(tinymce.isGecko&&(/Firefox\/[12]\.[0-9]/.test(navigator.userAgent)||/Firefox\/3\.[0-4]/.test(navigator.userAgent))){this.classBasedEach(t,s)}else{e(t,s)}},classBasedEach:function(v,u){var w=this.ed.dom,s,t;e(v,function(x){w.addClass(x,"_mce_act_on")});s=w.select("._mce_act_on");while(s.length>0){t=s.shift();w.removeClass(t,"_mce_act_on");u(t);s=w.select("._mce_act_on")}},adjustPaddingFunction:function(u){var s,v,t=this.ed;s=t.settings.indentation;v=/[a-z%]+/i.exec(s);s=parseInt(s,10);return function(w){var y,x;y=parseInt(t.dom.getStyle(w,"margin-left")||0,10)+parseInt(t.dom.getStyle(w,"padding-left")||0,10);if(u){x=y+s}else{x=y-s}t.dom.setStyle(w,"padding-left","");t.dom.setStyle(w,"margin-left",x>0?x+v:"")}},getInfo:function(){return{longname:"Lists",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/lists",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("lists",tinymce.plugins.Lists)}());
\ No newline at end of file
diff --git a/plugins/TinyMCE/js/plugins/lists/editor_plugin_src.js b/plugins/TinyMCE/js/plugins/lists/editor_plugin_src.js
new file mode 100644
index 0000000000..3952cff40a
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/lists/editor_plugin_src.js
@@ -0,0 +1,688 @@
+/**
+ * editor_plugin_src.js
+ *
+ * Copyright 2011, Moxiecode Systems AB
+ * Released under LGPL License.
+ *
+ * License: http://tinymce.moxiecode.com/license
+ * Contributing: http://tinymce.moxiecode.com/contributing
+ */
+
+(function() {
+	var each = tinymce.each, Event = tinymce.dom.Event, bookmark;
+
+	// Skips text nodes that only contain whitespace since they aren't semantically important.
+	function skipWhitespaceNodes(e, next) {
+		while (e && (e.nodeType === 8 || (e.nodeType === 3 && /^[ \t\n\r]*$/.test(e.nodeValue)))) {
+			e = next(e);
+		}
+		return e;
+	}
+	
+	function skipWhitespaceNodesBackwards(e) {
+		return skipWhitespaceNodes(e, function(e) { return e.previousSibling; });
+	}
+	
+	function skipWhitespaceNodesForwards(e) {
+		return skipWhitespaceNodes(e, function(e) { return e.nextSibling; });
+	}
+	
+	function hasParentInList(ed, e, list) {
+		return ed.dom.getParent(e, function(p) {
+			return tinymce.inArray(list, p) !== -1;
+		});
+	}
+	
+	function isList(e) {
+		return e && (e.tagName === 'OL' || e.tagName === 'UL');
+	}
+	
+	function splitNestedLists(element, dom) {
+		var tmp, nested, wrapItem;
+		tmp = skipWhitespaceNodesBackwards(element.lastChild);
+		while (isList(tmp)) {
+			nested = tmp;
+			tmp = skipWhitespaceNodesBackwards(nested.previousSibling);
+		}
+		if (nested) {
+			wrapItem = dom.create('li', { style: 'list-style-type: none;'});
+			dom.split(element, nested);
+			dom.insertAfter(wrapItem, nested);
+			wrapItem.appendChild(nested);
+			wrapItem.appendChild(nested);
+			element = wrapItem.previousSibling;
+		}
+		return element;
+	}
+	
+	function attemptMergeWithAdjacent(e, allowDifferentListStyles, mergeParagraphs) {
+		e = attemptMergeWithPrevious(e, allowDifferentListStyles, mergeParagraphs);
+		return attemptMergeWithNext(e, allowDifferentListStyles, mergeParagraphs);
+	}
+	
+	function attemptMergeWithPrevious(e, allowDifferentListStyles, mergeParagraphs) {
+		var prev = skipWhitespaceNodesBackwards(e.previousSibling);
+		if (prev) {
+			return attemptMerge(prev, e, allowDifferentListStyles ? prev : false, mergeParagraphs);
+		} else {
+			return e;
+		}
+	}
+	
+	function attemptMergeWithNext(e, allowDifferentListStyles, mergeParagraphs) {
+		var next = skipWhitespaceNodesForwards(e.nextSibling);
+		if (next) {
+			return attemptMerge(e, next, allowDifferentListStyles ? next : false, mergeParagraphs);
+		} else {
+			return e;
+		}
+	}
+	
+	function attemptMerge(e1, e2, differentStylesMasterElement, mergeParagraphs) {
+		if (canMerge(e1, e2, !!differentStylesMasterElement, mergeParagraphs)) {
+			return merge(e1, e2, differentStylesMasterElement);
+		} else if (e1 && e1.tagName === 'LI' && isList(e2)) {
+			// Fix invalidly nested lists.
+			e1.appendChild(e2);
+		}
+		return e2;
+	}
+	
+	function canMerge(e1, e2, allowDifferentListStyles, mergeParagraphs) {
+		if (!e1 || !e2) {
+			return false;
+		} else if (e1.tagName === 'LI' && e2.tagName === 'LI') {
+			return e2.style.listStyleType === 'none' || containsOnlyAList(e2);
+		} else if (isList(e1)) {
+			return (e1.tagName === e2.tagName && (allowDifferentListStyles || e1.style.listStyleType === e2.style.listStyleType)) || isListForIndent(e2);
+		} else if (mergeParagraphs && e1.tagName === 'P' && e2.tagName === 'P') {
+			return true;
+		} else {
+			return false;
+		}
+	}
+	
+	function isListForIndent(e) {
+		var firstLI = skipWhitespaceNodesForwards(e.firstChild), lastLI = skipWhitespaceNodesBackwards(e.lastChild);
+		return firstLI && lastLI && isList(e) && firstLI === lastLI && (isList(firstLI) || firstLI.style.listStyleType === 'none'  || containsOnlyAList(firstLI));
+	}
+	
+	function containsOnlyAList(e) {
+		var firstChild = skipWhitespaceNodesForwards(e.firstChild), lastChild = skipWhitespaceNodesBackwards(e.lastChild);
+		return firstChild && lastChild && firstChild === lastChild && isList(firstChild);
+	}
+	
+	function merge(e1, e2, masterElement) {
+		var lastOriginal = skipWhitespaceNodesBackwards(e1.lastChild), firstNew = skipWhitespaceNodesForwards(e2.firstChild);
+		if (e1.tagName === 'P') {
+			e1.appendChild(e1.ownerDocument.createElement('br'));
+		}
+		while (e2.firstChild) {
+			e1.appendChild(e2.firstChild);
+		}
+		if (masterElement) {
+			e1.style.listStyleType = masterElement.style.listStyleType;
+		}
+		e2.parentNode.removeChild(e2);
+		attemptMerge(lastOriginal, firstNew, false);
+		return e1;
+	}
+	
+	function findItemToOperateOn(e, dom) {
+		var item;
+		if (!dom.is(e, 'li,ol,ul')) {
+			item = dom.getParent(e, 'li');
+			if (item) {
+				e = item;
+			}
+		}
+		return e;
+	}
+	
+	tinymce.create('tinymce.plugins.Lists', {
+		init: function(ed, url) {
+			var enterDownInEmptyList = false;
+
+			function isTriggerKey(e) {
+				return e.keyCode === 9 && (ed.queryCommandState('InsertUnorderedList') || ed.queryCommandState('InsertOrderedList'));
+			};
+
+			function isEnterInEmptyListItem(ed, e) {
+				var sel = ed.selection, n;
+				if (e.keyCode === 13) {
+					n = sel.getStart();
+
+					// Get start will return BR if the LI only contains a BR
+					if (n.tagName == 'BR' && n.parentNode.tagName == 'LI')
+						n = n.parentNode;
+
+					// Check for empty LI or a LI with just one BR since Gecko and WebKit uses BR elements to place the caret
+					enterDownInEmptyList = sel.isCollapsed() && n && n.tagName === 'LI' && (n.childNodes.length === 0 || (n.firstChild.nodeName == 'BR' && n.childNodes.length === 1));
+					return enterDownInEmptyList;
+				}
+			};
+
+			function cancelKeys(ed, e) {
+				if (isTriggerKey(e) || isEnterInEmptyListItem(ed, e)) {
+					return Event.cancel(e);
+				}
+			};
+
+			function imageJoiningListItem(ed, e) {
+				if (!tinymce.isGecko)
+					return;
+
+				var n = ed.selection.getStart();
+				if (e.keyCode != 8 || n.tagName !== 'IMG') 
+					return;
+
+				function lastLI(node) {
+					var child = node.firstChild;
+					var li = null;
+					do {
+						if (!child)
+							break;
+
+						if (child.tagName === 'LI')
+							li = child;
+					} while (child = child.nextSibling);
+
+					return li;
+				}
+
+				function addChildren(parentNode, destination) {
+					while (parentNode.childNodes.length > 0)
+						destination.appendChild(parentNode.childNodes[0]);
+				}
+
+				var ul;
+				if (n.parentNode.previousSibling.tagName === 'UL' || n.parentNode.previousSibling.tagName === 'OL')
+					ul = n.parentNode.previousSibling;
+				else if (n.parentNode.previousSibling.previousSibling.tagName === 'UL' || n.parentNode.previousSibling.previousSibling.tagName === 'OL')
+					ul = n.parentNode.previousSibling.previousSibling;
+				else
+					return;
+
+				var li = lastLI(ul);
+
+				// move the caret to the end of the list item
+				var rng = ed.dom.createRng();
+				rng.setStart(li, 1);
+				rng.setEnd(li, 1);
+				ed.selection.setRng(rng);
+				ed.selection.collapse(true);
+
+				// save a bookmark at the end of the list item
+				var bookmark = ed.selection.getBookmark();
+
+				// copy the image an its text to the list item
+				var clone = n.parentNode.cloneNode(true);
+				if (clone.tagName === 'P' || clone.tagName === 'DIV')
+					addChildren(clone, li);
+				else
+					li.appendChild(clone);
+					
+				// remove the old copy of the image
+				n.parentNode.parentNode.removeChild(n.parentNode);
+
+				// move the caret where we saved the bookmark
+				ed.selection.moveToBookmark(bookmark);
+			}
+
+			this.ed = ed;
+			ed.addCommand('Indent', this.indent, this);
+			ed.addCommand('Outdent', this.outdent, this);
+			ed.addCommand('InsertUnorderedList', function() {
+				this.applyList('UL', 'OL');
+			}, this);
+			ed.addCommand('InsertOrderedList', function() {
+				this.applyList('OL', 'UL');
+			}, this);
+			
+			ed.onInit.add(function() {
+				ed.editorCommands.addCommands({
+					'outdent': function() {
+						var sel = ed.selection, dom = ed.dom;
+						function hasStyleIndent(n) {
+							n = dom.getParent(n, dom.isBlock);
+							return n && (parseInt(ed.dom.getStyle(n, 'margin-left') || 0, 10) + parseInt(ed.dom.getStyle(n, 'padding-left') || 0, 10)) > 0;
+						}
+						return hasStyleIndent(sel.getStart()) || hasStyleIndent(sel.getEnd()) || ed.queryCommandState('InsertOrderedList') || ed.queryCommandState('InsertUnorderedList');
+					}
+				}, 'state');
+			});
+			
+			ed.onKeyUp.add(function(ed, e) {
+				var n, rng;
+				if (isTriggerKey(e)) {
+					ed.execCommand(e.shiftKey ? 'Outdent' : 'Indent', true, null);
+					return Event.cancel(e);
+				} else if (enterDownInEmptyList && isEnterInEmptyListItem(ed, e)) {
+					if (ed.queryCommandState('InsertOrderedList')) {
+						ed.execCommand('InsertOrderedList');
+					} else {
+						ed.execCommand('InsertUnorderedList');
+					}
+					n = ed.selection.getStart();
+					if (n && n.tagName === 'LI') {
+						// Fix the caret position on IE since it jumps back up to the previous list item.
+						n = ed.dom.getParent(n, 'ol,ul').nextSibling;
+						if (n && n.tagName === 'P') {
+							if (!n.firstChild) {
+								n.appendChild(ed.getDoc().createTextNode(''));
+							}
+							rng = ed.dom.createRng();
+							rng.setStart(n.firstChild, 1);
+							rng.setEnd(n.firstChild, 1);
+							ed.selection.setRng(rng);
+						}
+					}
+					return Event.cancel(e);
+				}
+			});
+			ed.onKeyPress.add(cancelKeys);
+			ed.onKeyDown.add(cancelKeys);
+			ed.onKeyDown.add(imageJoiningListItem);
+		},
+		
+		applyList: function(targetListType, oppositeListType) {
+			var t = this, ed = t.ed, dom = ed.dom, applied = [], hasSameType = false, hasOppositeType = false, hasNonList = false, actions,
+				selectedBlocks = ed.selection.getSelectedBlocks();
+			
+			function cleanupBr(e) {
+				if (e && e.tagName === 'BR') {
+					dom.remove(e);
+				}
+			}
+			
+			function makeList(element) {
+				var list = dom.create(targetListType), li;
+				function adjustIndentForNewList(element) {
+					// If there's a margin-left, outdent one level to account for the extra list margin.
+					if (element.style.marginLeft || element.style.paddingLeft) {
+						t.adjustPaddingFunction(false)(element);
+					}
+				}
+				
+				if (element.tagName === 'LI') {
+					// No change required.
+				} else if (element.tagName === 'P' || element.tagName === 'DIV' || element.tagName === 'BODY') {
+					processBrs(element, function(startSection, br, previousBR) {
+						doWrapList(startSection, br, element.tagName === 'BODY' ? null : startSection.parentNode);
+						li = startSection.parentNode;
+						adjustIndentForNewList(li);
+						cleanupBr(br);
+					});
+					if (element.tagName === 'P' || selectedBlocks.length > 1) {
+						dom.split(li.parentNode.parentNode, li.parentNode);
+					}
+					attemptMergeWithAdjacent(li.parentNode, true);
+					return;
+				} else {
+					// Put the list around the element.
+					li = dom.create('li');
+					dom.insertAfter(li, element);
+					li.appendChild(element);
+					adjustIndentForNewList(element);
+					element = li;
+				}
+				dom.insertAfter(list, element);
+				list.appendChild(element);
+				attemptMergeWithAdjacent(list, true);
+				applied.push(element);
+			}
+			
+			function doWrapList(start, end, template) {
+				var li, n = start, tmp, i;
+				while (!dom.isBlock(start.parentNode) && start.parentNode !== dom.getRoot()) {
+					start = dom.split(start.parentNode, start.previousSibling);
+					start = start.nextSibling;
+					n = start;
+				}
+				if (template) {
+					li = template.cloneNode(true);
+					start.parentNode.insertBefore(li, start);
+					while (li.firstChild) dom.remove(li.firstChild);
+					li = dom.rename(li, 'li');
+				} else {
+					li = dom.create('li');
+					start.parentNode.insertBefore(li, start);
+				}
+				while (n && n != end) {
+					tmp = n.nextSibling;
+					li.appendChild(n);
+					n = tmp;
+				}
+				if (li.childNodes.length === 0) {
+					li.innerHTML = '<br _mce_bogus="1" />';
+				}
+				makeList(li);
+			}
+			
+			function processBrs(element, callback) {
+				var startSection, previousBR, END_TO_START = 3, START_TO_END = 1,
+					breakElements = 'br,ul,ol,p,div,h1,h2,h3,h4,h5,h6,table,blockquote,address,pre,form,center,dl';
+				function isAnyPartSelected(start, end) {
+					var r = dom.createRng(), sel;
+					bookmark.keep = true;
+					ed.selection.moveToBookmark(bookmark);
+					bookmark.keep = false;
+					sel = ed.selection.getRng(true);
+					if (!end) {
+						end = start.parentNode.lastChild;
+					}
+					r.setStartBefore(start);
+					r.setEndAfter(end);
+					return !(r.compareBoundaryPoints(END_TO_START, sel) > 0 || r.compareBoundaryPoints(START_TO_END, sel) <= 0);
+				}
+				function nextLeaf(br) {
+					if (br.nextSibling)
+						return br.nextSibling;
+					if (!dom.isBlock(br.parentNode) && br.parentNode !== dom.getRoot())
+						return nextLeaf(br.parentNode);
+				}
+				// Split on BRs within the range and process those.
+				startSection = element.firstChild;
+				// First mark the BRs that have any part of the previous section selected.
+				var trailingContentSelected = false;
+				each(dom.select(breakElements, element), function(br) {
+					var b;
+					if (br.hasAttribute && br.hasAttribute('_mce_bogus')) {
+						return true; // Skip the bogus Brs that are put in to appease Firefox and Safari.
+					}
+					if (isAnyPartSelected(startSection, br)) {
+						dom.addClass(br, '_mce_tagged_br');
+						startSection = nextLeaf(br);
+					}
+				});
+				trailingContentSelected = (startSection && isAnyPartSelected(startSection, undefined));
+				startSection = element.firstChild;
+				each(dom.select(breakElements, element), function(br) {
+					// Got a section from start to br.
+					var tmp = nextLeaf(br);
+					if (br.hasAttribute && br.hasAttribute('_mce_bogus')) {
+						return true; // Skip the bogus Brs that are put in to appease Firefox and Safari.
+					}
+					if (dom.hasClass(br, '_mce_tagged_br')) {
+						callback(startSection, br, previousBR);
+						previousBR = null;
+					} else {
+						previousBR = br;
+					}
+					startSection = tmp;
+				});
+				if (trailingContentSelected) {
+					callback(startSection, undefined, previousBR);
+				}
+			}
+			
+			function wrapList(element) {
+				processBrs(element, function(startSection, br, previousBR) {
+					// Need to indent this part
+					doWrapList(startSection, br);
+					cleanupBr(br);
+					cleanupBr(previousBR);
+				});
+			}
+			
+			function changeList(element) {
+				if (tinymce.inArray(applied, element) !== -1) {
+					return;
+				}
+				if (element.parentNode.tagName === oppositeListType) {
+					dom.split(element.parentNode, element);
+					makeList(element);
+					attemptMergeWithNext(element.parentNode, false);
+				}
+				applied.push(element);
+			}
+			
+			function convertListItemToParagraph(element) {
+				var child, nextChild, mergedElement, splitLast;
+				if (tinymce.inArray(applied, element) !== -1) {
+					return;
+				}
+				element = splitNestedLists(element, dom);
+				while (dom.is(element.parentNode, 'ol,ul,li')) {
+					dom.split(element.parentNode, element);
+				}
+				// Push the original element we have from the selection, not the renamed one.
+				applied.push(element);
+				element = dom.rename(element, 'p');
+				mergedElement = attemptMergeWithAdjacent(element, false, ed.settings.force_br_newlines);
+				if (mergedElement === element) {
+					// Now split out any block elements that can't be contained within a P.
+					// Manually iterate to ensure we handle modifications correctly (doesn't work with tinymce.each)
+					child = element.firstChild;
+					while (child) {
+						if (dom.isBlock(child)) {
+							child = dom.split(child.parentNode, child);
+							splitLast = true;
+							nextChild = child.nextSibling && child.nextSibling.firstChild; 
+						} else {
+							nextChild = child.nextSibling;
+							if (splitLast && child.tagName === 'BR') {
+								dom.remove(child);
+							}
+							splitLast = false;
+						}
+						child = nextChild;
+					}
+				}
+			}
+			
+			each(selectedBlocks, function(e) {
+				e = findItemToOperateOn(e, dom);
+				if (e.tagName === oppositeListType || (e.tagName === 'LI' && e.parentNode.tagName === oppositeListType)) {
+					hasOppositeType = true;
+				} else if (e.tagName === targetListType || (e.tagName === 'LI' && e.parentNode.tagName === targetListType)) {
+					hasSameType = true;
+				} else {
+					hasNonList = true;
+				}
+			});
+
+			if (hasNonList || hasOppositeType || selectedBlocks.length === 0) {
+				actions = {
+					'LI': changeList,
+					'H1': makeList,
+					'H2': makeList,
+					'H3': makeList,
+					'H4': makeList,
+					'H5': makeList,
+					'H6': makeList,
+					'P': makeList,
+					'BODY': makeList,
+					'DIV': selectedBlocks.length > 1 ? makeList : wrapList,
+					defaultAction: wrapList
+				};
+			} else {
+				actions = {
+					defaultAction: convertListItemToParagraph
+				};
+			}
+			this.process(actions);
+		},
+		
+		indent: function() {
+			var ed = this.ed, dom = ed.dom, indented = [];
+			
+			function createWrapItem(element) {
+				var wrapItem = dom.create('li', { style: 'list-style-type: none;'});
+				dom.insertAfter(wrapItem, element);
+				return wrapItem;
+			}
+			
+			function createWrapList(element) {
+				var wrapItem = createWrapItem(element),
+					list = dom.getParent(element, 'ol,ul'),
+					listType = list.tagName,
+					listStyle = dom.getStyle(list, 'list-style-type'),
+					attrs = {},
+					wrapList;
+				if (listStyle !== '') {
+					attrs.style = 'list-style-type: ' + listStyle + ';';
+				}
+				wrapList = dom.create(listType, attrs);
+				wrapItem.appendChild(wrapList);
+				return wrapList;
+			}
+			
+			function indentLI(element) {
+				if (!hasParentInList(ed, element, indented)) {
+					element = splitNestedLists(element, dom);
+					var wrapList = createWrapList(element);
+					wrapList.appendChild(element);
+					attemptMergeWithAdjacent(wrapList.parentNode, false);
+					attemptMergeWithAdjacent(wrapList, false);
+					indented.push(element);
+				}
+			}
+			
+			this.process({
+				'LI': indentLI,
+				defaultAction: this.adjustPaddingFunction(true)
+			});
+			
+		},
+		
+		outdent: function() {
+			var t = this, ed = t.ed, dom = ed.dom, outdented = [];
+			
+			function outdentLI(element) {
+				var listElement, targetParent, align;
+				if (!hasParentInList(ed, element, outdented)) {
+					if (dom.getStyle(element, 'margin-left') !== '' || dom.getStyle(element, 'padding-left') !== '') {
+						return t.adjustPaddingFunction(false)(element);
+					}
+					align = dom.getStyle(element, 'text-align', true);
+					if (align === 'center' || align === 'right') {
+						dom.setStyle(element, 'text-align', 'left');
+						return;
+					}
+					element = splitNestedLists(element, dom);
+					listElement = element.parentNode;
+					targetParent = element.parentNode.parentNode;
+					if (targetParent.tagName === 'P') {
+						dom.split(targetParent, element.parentNode);
+					} else {
+						dom.split(listElement, element);
+						if (targetParent.tagName === 'LI') {
+							// Nested list, need to split the LI and go back out to the OL/UL element.
+							dom.split(targetParent, element);
+						} else if (!dom.is(targetParent, 'ol,ul')) {
+							dom.rename(element, 'p');
+						}
+					}
+					outdented.push(element);
+				}
+			}
+			
+			this.process({
+				'LI': outdentLI,
+				defaultAction: this.adjustPaddingFunction(false)
+			});
+			
+			each(outdented, attemptMergeWithAdjacent);
+		},
+		
+		process: function(actions) {
+			var t = this, sel = t.ed.selection, dom = t.ed.dom, selectedBlocks, r;
+			function processElement(element) {
+				dom.removeClass(element, '_mce_act_on');
+				if (!element || element.nodeType !== 1) {
+					return;
+				}
+				element = findItemToOperateOn(element, dom);
+				var action = actions[element.tagName];
+				if (!action) {
+					action = actions.defaultAction;
+				}
+				action(element);
+			}
+			function recurse(element) {
+				t.splitSafeEach(element.childNodes, processElement);
+			}
+			function brAtEdgeOfSelection(container, offset) {
+				return offset >= 0 && container.hasChildNodes() && offset < container.childNodes.length &&
+						container.childNodes[offset].tagName === 'BR';
+			}
+			selectedBlocks = sel.getSelectedBlocks();
+			if (selectedBlocks.length === 0) {
+				selectedBlocks = [ dom.getRoot() ];
+			}
+
+			r = sel.getRng(true);
+			if (!r.collapsed) {
+				if (brAtEdgeOfSelection(r.endContainer, r.endOffset - 1)) {
+					r.setEnd(r.endContainer, r.endOffset - 1);
+					sel.setRng(r);
+				}
+				if (brAtEdgeOfSelection(r.startContainer, r.startOffset)) {
+					r.setStart(r.startContainer, r.startOffset + 1);
+					sel.setRng(r);
+				}
+			}
+			bookmark = sel.getBookmark();
+			actions.OL = actions.UL = recurse;
+			t.splitSafeEach(selectedBlocks, processElement);
+			sel.moveToBookmark(bookmark);
+			bookmark = null;
+			// Avoids table or image handles being left behind in Firefox.
+			t.ed.execCommand('mceRepaint');
+		},
+		
+		splitSafeEach: function(elements, f) {
+			if (tinymce.isGecko && (/Firefox\/[12]\.[0-9]/.test(navigator.userAgent) ||
+					/Firefox\/3\.[0-4]/.test(navigator.userAgent))) {
+				this.classBasedEach(elements, f);
+			} else {
+				each(elements, f);
+			}
+		},
+		
+		classBasedEach: function(elements, f) {
+			var dom = this.ed.dom, nodes, element;
+			// Mark nodes
+			each(elements, function(element) {
+				dom.addClass(element, '_mce_act_on');
+			});
+			nodes = dom.select('._mce_act_on');
+			while (nodes.length > 0) {
+				element = nodes.shift();
+				dom.removeClass(element, '_mce_act_on');
+				f(element);
+				nodes = dom.select('._mce_act_on');
+			}
+		},
+		
+		adjustPaddingFunction: function(isIndent) {
+			var indentAmount, indentUnits, ed = this.ed;
+			indentAmount = ed.settings.indentation;
+			indentUnits = /[a-z%]+/i.exec(indentAmount);
+			indentAmount = parseInt(indentAmount, 10);
+			return function(element) {
+				var currentIndent, newIndentAmount;
+				currentIndent = parseInt(ed.dom.getStyle(element, 'margin-left') || 0, 10) + parseInt(ed.dom.getStyle(element, 'padding-left') || 0, 10);
+				if (isIndent) {
+					newIndentAmount = currentIndent + indentAmount;
+				} else {
+					newIndentAmount = currentIndent - indentAmount;
+				}
+				ed.dom.setStyle(element, 'padding-left', '');
+				ed.dom.setStyle(element, 'margin-left', newIndentAmount > 0 ? newIndentAmount + indentUnits : '');
+			};
+		},
+		
+		getInfo: function() {
+			return {
+				longname : 'Lists',
+				author : 'Moxiecode Systems AB',
+				authorurl : 'http://tinymce.moxiecode.com',
+				infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/lists',
+				version : tinymce.majorVersion + "." + tinymce.minorVersion
+			};
+		}
+	});
+	tinymce.PluginManager.add("lists", tinymce.plugins.Lists);
+}());
diff --git a/plugins/TinyMCE/js/plugins/media/css/content.css b/plugins/TinyMCE/js/plugins/media/css/content.css
deleted file mode 100644
index 1bf6a75869..0000000000
--- a/plugins/TinyMCE/js/plugins/media/css/content.css
+++ /dev/null
@@ -1,6 +0,0 @@
-.mceItemFlash, .mceItemShockWave, .mceItemQuickTime, .mceItemWindowsMedia, .mceItemRealMedia {border:1px dotted #cc0000; background-position:center; background-repeat:no-repeat; background-color:#ffffcc;}
-.mceItemShockWave {background-image: url(../img/shockwave.gif);}
-.mceItemFlash {background-image:url(../img/flash.gif);}
-.mceItemQuickTime {background-image:url(../img/quicktime.gif);}
-.mceItemWindowsMedia {background-image:url(../img/windowsmedia.gif);}
-.mceItemRealMedia {background-image:url(../img/realmedia.gif);}
diff --git a/plugins/TinyMCE/js/plugins/media/css/media.css b/plugins/TinyMCE/js/plugins/media/css/media.css
index 2d087944de..0c45c7ff6d 100644
--- a/plugins/TinyMCE/js/plugins/media/css/media.css
+++ b/plugins/TinyMCE/js/plugins/media/css/media.css
@@ -1,12 +1,12 @@
-#id, #name, #hspace, #vspace, #class_name, #align {	width: 100px }
+#id, #name, #hspace, #vspace, #class_name, #align { width: 100px }
 #hspace, #vspace { width: 50px }
 #flash_quality, #flash_align, #flash_scale, #flash_salign, #flash_wmode { width: 100px }
-#flash_base, #flash_flashvars { width: 240px }
+#flash_base, #flash_flashvars, #html5_altsource1, #html5_altsource2, #html5_poster { width: 240px }
 #width, #height { width: 40px }
 #src, #media_type { width: 250px }
 #class { width: 120px }
-#prev { margin: 0; border: 1px solid black; width: 380px; height: 230px; overflow: auto }
-.panel_wrapper div.current { height: 390px; overflow: auto }
+#prev { margin: 0; border: 1px solid black; width: 380px; height: 260px; overflow: auto }
+.panel_wrapper div.current { height: 420px; overflow: auto }
 #flash_options, #shockwave_options, #qt_options, #wmp_options, #rmp_options { display: none }
 .mceAddSelectValue { background-color: #DDDDDD }
 #qt_starttime, #qt_endtime, #qt_fov, #qt_href, #qt_moveid, #qt_moviename, #qt_node, #qt_pan, #qt_qtsrc, #qt_qtsrcchokespeed, #qt_target, #qt_tilt, #qt_urlsubstituten, #qt_volume { width: 70px }
@@ -14,3 +14,4 @@
 #rmp_console, #rmp_numloop, #rmp_controls, #rmp_scriptcallbacks { width: 70px }
 #shockwave_swvolume, #shockwave_swframe, #shockwave_swurl, #shockwave_swstretchvalign, #shockwave_swstretchhalign, #shockwave_swstretchstyle { width: 90px }
 #qt_qtsrc { width: 200px }
+iframe {border: 1px solid gray}
diff --git a/plugins/TinyMCE/js/plugins/media/editor_plugin.js b/plugins/TinyMCE/js/plugins/media/editor_plugin.js
index 4bbe367e36..edba2aff08 100644
--- a/plugins/TinyMCE/js/plugins/media/editor_plugin.js
+++ b/plugins/TinyMCE/js/plugins/media/editor_plugin.js
@@ -1 +1 @@
-(function(){var a=tinymce.each;tinymce.create("tinymce.plugins.MediaPlugin",{init:function(b,c){var e=this;e.editor=b;e.url=c;function f(g){return/^(mceItemFlash|mceItemShockWave|mceItemWindowsMedia|mceItemQuickTime|mceItemRealMedia)$/.test(g.className)}b.onPreInit.add(function(){b.serializer.addRules("param[name|value|_mce_value]")});b.addCommand("mceMedia",function(){b.windowManager.open({file:c+"/media.htm",width:430+parseInt(b.getLang("media.delta_width",0)),height:470+parseInt(b.getLang("media.delta_height",0)),inline:1},{plugin_url:c})});b.addButton("media",{title:"media.desc",cmd:"mceMedia"});b.onNodeChange.add(function(h,g,i){g.setActive("media",i.nodeName=="IMG"&&f(i))});b.onInit.add(function(){var g={mceItemFlash:"flash",mceItemShockWave:"shockwave",mceItemWindowsMedia:"windowsmedia",mceItemQuickTime:"quicktime",mceItemRealMedia:"realmedia"};b.selection.onSetContent.add(function(){e._spansToImgs(b.getBody())});b.selection.onBeforeSetContent.add(e._objectsToSpans,e);if(b.settings.content_css!==false){b.dom.loadCSS(c+"/css/content.css")}if(b.theme&&b.theme.onResolveName){b.theme.onResolveName.add(function(h,i){if(i.name=="img"){a(g,function(l,j){if(b.dom.hasClass(i.node,j)){i.name=l;i.title=b.dom.getAttrib(i.node,"title");return false}})}})}if(b&&b.plugins.contextmenu){b.plugins.contextmenu.onContextMenu.add(function(i,h,j){if(j.nodeName=="IMG"&&/mceItem(Flash|ShockWave|WindowsMedia|QuickTime|RealMedia)/.test(j.className)){h.add({title:"media.edit",icon:"media",cmd:"mceMedia"})}})}});b.onBeforeSetContent.add(e._objectsToSpans,e);b.onSetContent.add(function(){e._spansToImgs(b.getBody())});b.onPreProcess.add(function(g,i){var h=g.dom;if(i.set){e._spansToImgs(i.node);a(h.select("IMG",i.node),function(k){var j;if(f(k)){j=e._parse(k.title);h.setAttrib(k,"width",h.getAttrib(k,"width",j.width||100));h.setAttrib(k,"height",h.getAttrib(k,"height",j.height||100))}})}if(i.get){a(h.select("IMG",i.node),function(m){var l,j,k;if(g.getParam("media_use_script")){if(f(m)){m.className=m.className.replace(/mceItem/g,"mceTemp")}return}switch(m.className){case"mceItemFlash":l="d27cdb6e-ae6d-11cf-96b8-444553540000";j="http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0";k="application/x-shockwave-flash";break;case"mceItemShockWave":l="166b1bca-3f9c-11cf-8075-444553540000";j="http://download.macromedia.com/pub/shockwave/cabs/director/sw.cab#version=8,5,1,0";k="application/x-director";break;case"mceItemWindowsMedia":l=g.getParam("media_wmp6_compatible")?"05589fa1-c356-11ce-bf01-00aa0055595a":"6bf52a52-394a-11d3-b153-00c04f79faa6";j="http://activex.microsoft.com/activex/controls/mplayer/en/nsmp2inf.cab#Version=5,1,52,701";k="application/x-mplayer2";break;case"mceItemQuickTime":l="02bf25d5-8c17-4b23-bc80-d3488abddc6b";j="http://www.apple.com/qtactivex/qtplugin.cab#version=6,0,2,0";k="video/quicktime";break;case"mceItemRealMedia":l="cfcdaa03-8be4-11cf-b84b-0020afbbccfa";j="http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0";k="audio/x-pn-realaudio-plugin";break}if(l){h.replace(e._buildObj({classid:l,codebase:j,type:k},m),m)}})}});b.onPostProcess.add(function(g,h){h.content=h.content.replace(/_mce_value=/g,"value=")});function d(g,h){h=new RegExp(h+'="([^"]+)"',"g").exec(g);return h?b.dom.decode(h[1]):""}b.onPostProcess.add(function(g,h){if(g.getParam("media_use_script")){h.content=h.content.replace(/<img[^>]+>/g,function(j){var i=d(j,"class");if(/^(mceTempFlash|mceTempShockWave|mceTempWindowsMedia|mceTempQuickTime|mceTempRealMedia)$/.test(i)){at=e._parse(d(j,"title"));at.width=d(j,"width");at.height=d(j,"height");j='<script type="text/javascript">write'+i.substring(7)+"({"+e._serialize(at)+"});<\/script>"}return j})}})},getInfo:function(){return{longname:"Media",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/media",version:tinymce.majorVersion+"."+tinymce.minorVersion}},_objectsToSpans:function(b,e){var c=this,d=e.content;d=d.replace(/<script[^>]*>\s*write(Flash|ShockWave|WindowsMedia|QuickTime|RealMedia)\(\{([^\)]*)\}\);\s*<\/script>/gi,function(g,f,i){var h=c._parse(i);return'<img class="mceItem'+f+'" title="'+b.dom.encode(i)+'" src="'+c.url+'/img/trans.gif" width="'+h.width+'" height="'+h.height+'" />'});d=d.replace(/<object([^>]*)>/gi,'<span class="mceItemObject" $1>');d=d.replace(/<embed([^>]*)\/?>/gi,'<span class="mceItemEmbed" $1></span>');d=d.replace(/<embed([^>]*)>/gi,'<span class="mceItemEmbed" $1>');d=d.replace(/<\/(object)([^>]*)>/gi,"</span>");d=d.replace(/<\/embed>/gi,"");d=d.replace(/<param([^>]*)>/gi,function(g,f){return"<span "+f.replace(/value=/gi,"_mce_value=")+' class="mceItemParam"></span>'});d=d.replace(/\/ class=\"mceItemParam\"><\/span>/gi,'class="mceItemParam"></span>');e.content=d},_buildObj:function(g,h){var d,c=this.editor,f=c.dom,e=this._parse(h.title),b;b=c.getParam("media_strict",true)&&g.type=="application/x-shockwave-flash";e.width=g.width=f.getAttrib(h,"width")||100;e.height=g.height=f.getAttrib(h,"height")||100;if(e.src){e.src=c.convertURL(e.src,"src",h)}if(b){d=f.create("span",{id:e.id,_mce_name:"object",type:"application/x-shockwave-flash",data:e.src,style:f.getAttrib(h,"style"),width:g.width,height:g.height})}else{d=f.create("span",{id:e.id,_mce_name:"object",classid:"clsid:"+g.classid,style:f.getAttrib(h,"style"),codebase:g.codebase,width:g.width,height:g.height})}a(e,function(j,i){if(!/^(width|height|codebase|classid|id|_cx|_cy)$/.test(i)){if(g.type=="application/x-mplayer2"&&i=="src"&&!e.url){i="url"}if(j){f.add(d,"span",{_mce_name:"param",name:i,_mce_value:j})}}});if(!b){f.add(d,"span",tinymce.extend({_mce_name:"embed",type:g.type,style:f.getAttrib(h,"style")},e))}return d},_spansToImgs:function(e){var d=this,f=d.editor.dom,b,c;a(f.select("span",e),function(g){if(f.getAttrib(g,"class")=="mceItemObject"){c=f.getAttrib(g,"classid").toLowerCase().replace(/\s+/g,"");switch(c){case"clsid:d27cdb6e-ae6d-11cf-96b8-444553540000":f.replace(d._createImg("mceItemFlash",g),g);break;case"clsid:166b1bca-3f9c-11cf-8075-444553540000":f.replace(d._createImg("mceItemShockWave",g),g);break;case"clsid:6bf52a52-394a-11d3-b153-00c04f79faa6":case"clsid:22d6f312-b0f6-11d0-94ab-0080c74c7e95":case"clsid:05589fa1-c356-11ce-bf01-00aa0055595a":f.replace(d._createImg("mceItemWindowsMedia",g),g);break;case"clsid:02bf25d5-8c17-4b23-bc80-d3488abddc6b":f.replace(d._createImg("mceItemQuickTime",g),g);break;case"clsid:cfcdaa03-8be4-11cf-b84b-0020afbbccfa":f.replace(d._createImg("mceItemRealMedia",g),g);break;default:f.replace(d._createImg("mceItemFlash",g),g)}return}if(f.getAttrib(g,"class")=="mceItemEmbed"){switch(f.getAttrib(g,"type")){case"application/x-shockwave-flash":f.replace(d._createImg("mceItemFlash",g),g);break;case"application/x-director":f.replace(d._createImg("mceItemShockWave",g),g);break;case"application/x-mplayer2":f.replace(d._createImg("mceItemWindowsMedia",g),g);break;case"video/quicktime":f.replace(d._createImg("mceItemQuickTime",g),g);break;case"audio/x-pn-realaudio-plugin":f.replace(d._createImg("mceItemRealMedia",g),g);break;default:f.replace(d._createImg("mceItemFlash",g),g)}}})},_createImg:function(c,h){var b,g=this.editor.dom,f={},e="",d;d=["id","name","width","height","bgcolor","align","flashvars","src","wmode","allowfullscreen","quality","data"];b=g.create("img",{src:this.url+"/img/trans.gif",width:g.getAttrib(h,"width")||100,height:g.getAttrib(h,"height")||100,style:g.getAttrib(h,"style"),"class":c});a(d,function(i){var j=g.getAttrib(h,i);if(j){f[i]=j}});a(g.select("span",h),function(i){if(g.hasClass(i,"mceItemParam")){f[g.getAttrib(i,"name")]=g.getAttrib(i,"_mce_value")}});if(f.movie){f.src=f.movie;delete f.movie}if(!f.src){f.src=f.data;delete f.data}h=g.select(".mceItemEmbed",h)[0];if(h){a(d,function(i){var j=g.getAttrib(h,i);if(j&&!f[i]){f[i]=j}})}delete f.width;delete f.height;b.title=this._serialize(f);return b},_parse:function(b){return tinymce.util.JSON.parse("{"+b+"}")},_serialize:function(b){return tinymce.util.JSON.serialize(b).replace(/[{}]/g,"")}});tinymce.PluginManager.add("media",tinymce.plugins.MediaPlugin)})();
\ No newline at end of file
+(function(){var d=tinymce.explode("id,name,width,height,style,align,class,hspace,vspace,bgcolor,type"),h=tinymce.makeMap(d.join(",")),b=tinymce.html.Node,f,a,g=tinymce.util.JSON,e;f=[["Flash","d27cdb6e-ae6d-11cf-96b8-444553540000","application/x-shockwave-flash","http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0"],["ShockWave","166b1bca-3f9c-11cf-8075-444553540000","application/x-director","http://download.macromedia.com/pub/shockwave/cabs/director/sw.cab#version=8,5,1,0"],["WindowsMedia","6bf52a52-394a-11d3-b153-00c04f79faa6,22d6f312-b0f6-11d0-94ab-0080c74c7e95,05589fa1-c356-11ce-bf01-00aa0055595a","application/x-mplayer2","http://activex.microsoft.com/activex/controls/mplayer/en/nsmp2inf.cab#Version=5,1,52,701"],["QuickTime","02bf25d5-8c17-4b23-bc80-d3488abddc6b","video/quicktime","http://www.apple.com/qtactivex/qtplugin.cab#version=6,0,2,0"],["RealMedia","cfcdaa03-8be4-11cf-b84b-0020afbbccfa","audio/x-pn-realaudio-plugin","http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0"],["Java","8ad9c840-044e-11d1-b3e9-00805f499d93","application/x-java-applet","http://java.sun.com/products/plugin/autodl/jinstall-1_5_0-windows-i586.cab#Version=1,5,0,0"],["Silverlight","dfeaf541-f3e1-4c24-acac-99c30715084a","application/x-silverlight-2"],["Iframe"],["Video"]];function c(m){var l,j,k;if(m&&!m.splice){j=[];for(k=0;true;k++){if(m[k]){j[k]=m[k]}else{break}}return j}return m}tinymce.create("tinymce.plugins.MediaPlugin",{init:function(n,j){var r=this,l={},m,p,q,k;function o(i){return i&&i.nodeName==="IMG"&&n.dom.hasClass(i,"mceItemMedia")}r.editor=n;r.url=j;a="";for(m=0;m<f.length;m++){k=f[m][0];q={name:k,clsids:tinymce.explode(f[m][1]||""),mimes:tinymce.explode(f[m][2]||""),codebase:f[m][3]};for(p=0;p<q.clsids.length;p++){l["clsid:"+q.clsids[p]]=q}for(p=0;p<q.mimes.length;p++){l[q.mimes[p]]=q}l["mceItem"+k]=q;l[k.toLowerCase()]=q;a+=(a?"|":"")+k}tinymce.each(n.getParam("media_types","video=mp4,m4v,ogv,webm;silverlight=xap;flash=swf,flv;shockwave=dcr;quicktime=mov,qt,mpg,mp3,mpeg;shockwave=dcr;windowsmedia=avi,wmv,wm,asf,asx,wmx,wvx;realmedia=rm,ra,ram;java=jar").split(";"),function(v){var s,u,t;v=v.split(/=/);u=tinymce.explode(v[1].toLowerCase());for(s=0;s<u.length;s++){t=l[v[0].toLowerCase()];if(t){l[u[s]]=t}}});a=new RegExp("write("+a+")\\(([^)]+)\\)");r.lookup=l;n.onPreInit.add(function(){n.schema.addValidElements("object[id|style|width|height|classid|codebase|*],param[name|value],embed[id|style|width|height|type|src|*],video[*],audio[*],source[*]");n.parser.addNodeFilter("object,embed,video,audio,script,iframe",function(s){var t=s.length;while(t--){r.objectToImg(s[t])}});n.serializer.addNodeFilter("img",function(s,u,t){var v=s.length,w;while(v--){w=s[v];if((w.attr("class")||"").indexOf("mceItemMedia")!==-1){r.imgToObject(w,t)}}})});n.onInit.add(function(){if(n.theme&&n.theme.onResolveName){n.theme.onResolveName.add(function(i,s){if(s.name==="img"&&n.dom.hasClass(s.node,"mceItemMedia")){s.name="media"}})}if(n&&n.plugins.contextmenu){n.plugins.contextmenu.onContextMenu.add(function(s,t,i){if(i.nodeName==="IMG"&&i.className.indexOf("mceItemMedia")!==-1){t.add({title:"media.edit",icon:"media",cmd:"mceMedia"})}})}});n.addCommand("mceMedia",function(){var s,i;i=n.selection.getNode();if(o(i)){s=n.dom.getAttrib(i,"data-mce-json");if(s){s=g.parse(s);tinymce.each(d,function(t){var u=n.dom.getAttrib(i,t);if(u){s[t]=u}});s.type=r.getType(i.className).name.toLowerCase()}}if(!s){s={type:"flash",video:{sources:[]},params:{}}}n.windowManager.open({file:j+"/media.htm",width:430+parseInt(n.getLang("media.delta_width",0)),height:500+parseInt(n.getLang("media.delta_height",0)),inline:1},{plugin_url:j,data:s})});n.addButton("media",{title:"media.desc",cmd:"mceMedia"});n.onNodeChange.add(function(s,i,t){i.setActive("media",o(t))})},convertUrl:function(k,n){var j=this,m=j.editor,l=m.settings,o=l.url_converter,i=l.url_converter_scope||j;if(!k){return k}if(n){return m.documentBaseURI.toAbsolute(k)}return o.call(i,k,"src","object")},getInfo:function(){return{longname:"Media",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/media",version:tinymce.majorVersion+"."+tinymce.minorVersion}},dataToImg:function(m,k){var r=this,o=r.editor,p=o.documentBaseURI,j,q,n,l;m.params.src=r.convertUrl(m.params.src,k);q=m.video.attrs;if(q){q.src=r.convertUrl(q.src,k)}if(q){q.poster=r.convertUrl(q.poster,k)}j=c(m.video.sources);if(j){for(l=0;l<j.length;l++){j[l].src=r.convertUrl(j[l].src,k)}}n=r.editor.dom.create("img",{id:m.id,style:m.style,align:m.align,src:r.editor.theme.url+"/img/trans.gif","class":"mceItemMedia mceItem"+r.getType(m.type).name,"data-mce-json":g.serialize(m,"'")});n.width=m.width||"320";n.height=m.height||"240";return n},dataToHtml:function(i,j){return this.editor.serializer.serialize(this.dataToImg(i,j),{forced_root_block:"",force_absolute:j})},htmlToData:function(k){var j,i,l;l={type:"flash",video:{sources:[]},params:{}};j=this.editor.parser.parse(k);i=j.getAll("img")[0];if(i){l=g.parse(i.attr("data-mce-json"));l.type=this.getType(i.attr("class")).name.toLowerCase();tinymce.each(d,function(m){var n=i.attr(m);if(n){l[m]=n}})}return l},getType:function(m){var k,j,l;j=tinymce.explode(m," ");for(k=0;k<j.length;k++){l=this.lookup[j[k]];if(l){return l}}},imgToObject:function(x,n){var t=this,o=t.editor,A,E,j,s,F,w,D,u,k,C,r,p,y,B,m,v,l,z;function q(i,G){var K,J,L,I,H;H=o.getParam("flash_video_player_url",t.convertUrl(t.url+"/moxieplayer.swf"));if(H){K=o.documentBaseURI;D.params.src=H;if(o.getParam("flash_video_player_absvideourl",true)){i=K.toAbsolute(i||"",true);G=K.toAbsolute(G||"",true)}L="";J=o.getParam("flash_video_player_flashvars",{url:"$url",poster:"$poster"});tinymce.each(J,function(N,M){N=N.replace(/\$url/,i||"");N=N.replace(/\$poster/,G||"");if(N.length>0){L+=(L?"&":"")+M+"="+escape(N)}});if(L.length){D.params.flashvars=L}I=o.getParam("flash_video_player_params",{allowfullscreen:true,allowscriptaccess:true});tinymce.each(I,function(N,M){D.params[M]=""+N})}}D=x.attr("data-mce-json");if(!D){return}D=g.parse(D);p=this.getType(x.attr("class"));z=x.attr("data-mce-style");if(!z){z=x.attr("style");if(z){z=o.dom.serializeStyle(o.dom.parseStyle(z,"img"))}}if(p.name==="Iframe"){v=new b("iframe",1);tinymce.each(d,function(i){var G=x.attr(i);if(i=="class"&&G){G=G.replace(/mceItem.+ ?/g,"")}if(G&&G.length>0){v.attr(i,G)}});for(F in D.params){v.attr(F,D.params[F])}v.attr({style:z,src:D.params.src});x.replace(v);return}if(this.editor.settings.media_use_script){v=new b("script",1).attr("type","text/javascript");w=new b("#text",3);w.value="write"+p.name+"("+g.serialize(tinymce.extend(D.params,{width:x.attr("width"),height:x.attr("height")}))+");";v.append(w);x.replace(v);return}if(p.name==="Video"&&D.video.sources[0]){A=new b("video",1).attr(tinymce.extend({id:x.attr("id"),width:x.attr("width"),height:x.attr("height"),style:z},D.video.attrs));if(D.video.attrs){l=D.video.attrs.poster}k=D.video.sources=c(D.video.sources);for(y=0;y<k.length;y++){if(/\.mp4$/.test(k[y].src)){m=k[y].src}}if(!k[0].type){A.attr("src",k[0].src);k.splice(0,1)}for(y=0;y<k.length;y++){u=new b("source",1).attr(k[y]);u.shortEnded=true;A.append(u)}if(m){q(m,l);p=t.getType("flash")}else{D.params.src=""}}if(D.params.src){if(/\.flv$/i.test(D.params.src)){q(D.params.src,"")}if(n&&n.force_absolute){D.params.src=o.documentBaseURI.toAbsolute(D.params.src)}E=new b("object",1).attr({id:x.attr("id"),width:x.attr("width"),height:x.attr("height"),style:z});tinymce.each(d,function(i){if(D[i]&&i!="type"){E.attr(i,D[i])}});for(F in D.params){r=new b("param",1);r.shortEnded=true;w=D.params[F];if(F==="src"&&p.name==="WindowsMedia"){F="url"}r.attr({name:F,value:w});E.append(r)}if(this.editor.getParam("media_strict",true)){E.attr({data:D.params.src,type:p.mimes[0]})}else{E.attr({classid:"clsid:"+p.clsids[0],codebase:p.codebase});j=new b("embed",1);j.shortEnded=true;j.attr({id:x.attr("id"),width:x.attr("width"),height:x.attr("height"),style:z,type:p.mimes[0]});for(F in D.params){j.attr(F,D.params[F])}tinymce.each(d,function(i){if(D[i]&&i!="type"){j.attr(i,D[i])}});E.append(j)}if(D.object_html){w=new b("#text",3);w.raw=true;w.value=D.object_html;E.append(w)}if(A){A.append(E)}}if(A){if(D.video_html){w=new b("#text",3);w.raw=true;w.value=D.video_html;A.append(w)}}if(A||E){x.replace(A||E)}else{x.remove()}},objectToImg:function(y){var F,j,A,p,G,H,u,w,t,B,z,q,o,D,x,k,E,n,C=this.lookup,l,v,s=this.editor.settings.url_converter,m=this.editor.settings.url_converter_scope;function r(i){return new tinymce.html.Serializer({inner:true,validate:false}).serialize(i)}if(!y.parent){return}if(y.name==="script"){if(y.firstChild){l=a.exec(y.firstChild.value)}if(!l){return}n=l[1];E={video:{},params:g.parse(l[2])};w=E.params.width;t=E.params.height}E=E||{video:{},params:{}};G=new b("img",1);G.attr({src:this.editor.theme.url+"/img/trans.gif"});H=y.name;if(H==="video"){A=y;F=y.getAll("object")[0];j=y.getAll("embed")[0];w=A.attr("width");t=A.attr("height");u=A.attr("id");E.video={attrs:{},sources:[]};v=E.video.attrs;for(H in A.attributes.map){v[H]=A.attributes.map[H]}x=y.attr("src");if(x){E.video.sources.push({src:s.call(m,x,"src","video")})}k=A.getAll("source");for(z=0;z<k.length;z++){x=k[z].remove();E.video.sources.push({src:s.call(m,x.attr("src"),"src","source"),type:x.attr("type"),media:x.attr("media")})}if(v.poster){v.poster=s.call(m,v.poster,"poster","video")}}if(y.name==="object"){F=y;j=y.getAll("embed")[0]}if(y.name==="embed"){j=y}if(y.name==="iframe"){p=y;n="Iframe"}if(F){w=w||F.attr("width");t=t||F.attr("height");B=B||F.attr("style");u=u||F.attr("id");D=F.getAll("param");for(z=0;z<D.length;z++){o=D[z];H=o.remove().attr("name");if(!h[H]){E.params[H]=o.attr("value")}}E.params.src=E.params.src||F.attr("data")}if(j){w=w||j.attr("width");t=t||j.attr("height");B=B||j.attr("style");u=u||j.attr("id");for(H in j.attributes.map){if(!h[H]&&!E.params[H]){E.params[H]=j.attributes.map[H]}}}if(p){w=p.attr("width");t=p.attr("height");B=B||p.attr("style");u=p.attr("id");tinymce.each(d,function(i){G.attr(i,p.attr(i))});for(H in p.attributes.map){if(!h[H]&&!E.params[H]){E.params[H]=p.attributes.map[H]}}}if(E.params.movie){E.params.src=E.params.src||E.params.movie;delete E.params.movie}if(E.params.src){E.params.src=s.call(m,E.params.src,"src","object")}if(A){n=C.video.name}if(F&&!n){n=(C[(F.attr("clsid")||"").toLowerCase()]||C[(F.attr("type")||"").toLowerCase()]||{}).name}if(j&&!n){n=(C[(j.attr("type")||"").toLowerCase()]||{}).name}y.replace(G);if(j){j.remove()}if(F){q=r(F.remove());if(q){E.object_html=q}}if(A){q=r(A.remove());if(q){E.video_html=q}}G.attr({id:u,"class":"mceItemMedia mceItem"+(n||"Flash"),style:B,width:w||"320",height:t||"240","data-mce-json":g.serialize(E,"'")})}});tinymce.PluginManager.add("media",tinymce.plugins.MediaPlugin)})();
\ No newline at end of file
diff --git a/plugins/TinyMCE/js/plugins/media/editor_plugin_src.js b/plugins/TinyMCE/js/plugins/media/editor_plugin_src.js
index fc84e5b6c5..483db1da56 100644
--- a/plugins/TinyMCE/js/plugins/media/editor_plugin_src.js
+++ b/plugins/TinyMCE/js/plugins/media/editor_plugin_src.js
@@ -9,187 +9,208 @@
  */
 
 (function() {
-	var each = tinymce.each;
+	var rootAttributes = tinymce.explode('id,name,width,height,style,align,class,hspace,vspace,bgcolor,type'), excludedAttrs = tinymce.makeMap(rootAttributes.join(',')), Node = tinymce.html.Node,
+		mediaTypes, scriptRegExp, JSON = tinymce.util.JSON, mimeTypes;
+
+	// Media types supported by this plugin
+	mediaTypes = [
+		// Type, clsid:s, mime types, codebase
+		["Flash", "d27cdb6e-ae6d-11cf-96b8-444553540000", "application/x-shockwave-flash", "http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0"],
+		["ShockWave", "166b1bca-3f9c-11cf-8075-444553540000", "application/x-director", "http://download.macromedia.com/pub/shockwave/cabs/director/sw.cab#version=8,5,1,0"],
+		["WindowsMedia", "6bf52a52-394a-11d3-b153-00c04f79faa6,22d6f312-b0f6-11d0-94ab-0080c74c7e95,05589fa1-c356-11ce-bf01-00aa0055595a", "application/x-mplayer2", "http://activex.microsoft.com/activex/controls/mplayer/en/nsmp2inf.cab#Version=5,1,52,701"],
+		["QuickTime", "02bf25d5-8c17-4b23-bc80-d3488abddc6b", "video/quicktime", "http://www.apple.com/qtactivex/qtplugin.cab#version=6,0,2,0"],
+		["RealMedia", "cfcdaa03-8be4-11cf-b84b-0020afbbccfa", "audio/x-pn-realaudio-plugin", "http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0"],
+		["Java", "8ad9c840-044e-11d1-b3e9-00805f499d93", "application/x-java-applet", "http://java.sun.com/products/plugin/autodl/jinstall-1_5_0-windows-i586.cab#Version=1,5,0,0"],
+		["Silverlight", "dfeaf541-f3e1-4c24-acac-99c30715084a", "application/x-silverlight-2"],
+		["Iframe"],
+		["Video"]
+	];
+
+	function toArray(obj) {
+		var undef, out, i;
+
+		if (obj && !obj.splice) {
+			out = [];
+
+			for (i = 0; true; i++) {
+				if (obj[i])
+					out[i] = obj[i];
+				else
+					break;
+			}
+
+			return out;
+		}
+
+		return obj;
+	};
 
 	tinymce.create('tinymce.plugins.MediaPlugin', {
 		init : function(ed, url) {
-			var t = this;
-			
-			t.editor = ed;
-			t.url = url;
+			var self = this, lookup = {}, i, y, item, name;
 
-			function isMediaElm(n) {
-				return /^(mceItemFlash|mceItemShockWave|mceItemWindowsMedia|mceItemQuickTime|mceItemRealMedia)$/.test(n.className);
+			function isMediaImg(node) {
+				return node && node.nodeName === 'IMG' && ed.dom.hasClass(node, 'mceItemMedia');
 			};
 
+			self.editor = ed;
+			self.url = url;
+
+			// Parse media types into a lookup table
+			scriptRegExp = '';
+			for (i = 0; i < mediaTypes.length; i++) {
+				name = mediaTypes[i][0];
+
+				item = {
+					name : name,
+					clsids : tinymce.explode(mediaTypes[i][1] || ''),
+					mimes : tinymce.explode(mediaTypes[i][2] || ''),
+					codebase : mediaTypes[i][3]
+				};
+
+				for (y = 0; y < item.clsids.length; y++)
+					lookup['clsid:' + item.clsids[y]] = item;
+
+				for (y = 0; y < item.mimes.length; y++)
+					lookup[item.mimes[y]] = item;
+
+				lookup['mceItem' + name] = item;
+				lookup[name.toLowerCase()] = item;
+
+				scriptRegExp += (scriptRegExp ? '|' : '') + name;
+			}
+
+			// Handle the media_types setting
+			tinymce.each(ed.getParam("media_types",
+				"video=mp4,m4v,ogv,webm;" +
+				"silverlight=xap;" +
+				"flash=swf,flv;" +
+				"shockwave=dcr;" +
+				"quicktime=mov,qt,mpg,mp3,mpeg;" +
+				"shockwave=dcr;" +
+				"windowsmedia=avi,wmv,wm,asf,asx,wmx,wvx;" +
+				"realmedia=rm,ra,ram;" +
+				"java=jar"
+			).split(';'), function(item) {
+				var i, extensions, type;
+
+				item = item.split(/=/);
+				extensions = tinymce.explode(item[1].toLowerCase());
+				for (i = 0; i < extensions.length; i++) {
+					type = lookup[item[0].toLowerCase()];
+
+					if (type)
+						lookup[extensions[i]] = type;
+				}
+			});
+
+			scriptRegExp = new RegExp('write(' + scriptRegExp + ')\\(([^)]+)\\)');
+			self.lookup = lookup;
+
 			ed.onPreInit.add(function() {
-				// Force in _value parameter this extra parameter is required for older Opera versions
-				ed.serializer.addRules('param[name|value|_mce_value]');
+				// Allow video elements
+				ed.schema.addValidElements('object[id|style|width|height|classid|codebase|*],param[name|value],embed[id|style|width|height|type|src|*],video[*],audio[*],source[*]');
+
+				// Convert video elements to image placeholder
+				ed.parser.addNodeFilter('object,embed,video,audio,script,iframe', function(nodes) {
+					var i = nodes.length;
+
+					while (i--)
+						self.objectToImg(nodes[i]);
+				});
+
+				// Convert image placeholders to video elements
+				ed.serializer.addNodeFilter('img', function(nodes, name, args) {
+					var i = nodes.length, node;
+
+					while (i--) {
+						node = nodes[i];
+						if ((node.attr('class') || '').indexOf('mceItemMedia') !== -1)
+							self.imgToObject(node, args);
+					}
+				});
+			});
+
+			ed.onInit.add(function() {
+				// Display "media" instead of "img" in element path
+				if (ed.theme && ed.theme.onResolveName) {
+					ed.theme.onResolveName.add(function(theme, path_object) {
+						if (path_object.name === 'img' && ed.dom.hasClass(path_object.node, 'mceItemMedia'))
+							path_object.name = 'media';
+					});
+				}
+
+				// Add contect menu if it's loaded
+				if (ed && ed.plugins.contextmenu) {
+					ed.plugins.contextmenu.onContextMenu.add(function(plugin, menu, element) {
+						if (element.nodeName === 'IMG' && element.className.indexOf('mceItemMedia') !== -1)
+							menu.add({title : 'media.edit', icon : 'media', cmd : 'mceMedia'});
+					});
+				}
 			});
 
 			// Register commands
 			ed.addCommand('mceMedia', function() {
+				var data, img;
+
+				img = ed.selection.getNode();
+				if (isMediaImg(img)) {
+					data = ed.dom.getAttrib(img, 'data-mce-json');
+					if (data) {
+						data = JSON.parse(data);
+
+						// Add some extra properties to the data object
+						tinymce.each(rootAttributes, function(name) {
+							var value = ed.dom.getAttrib(img, name);
+
+							if (value)
+								data[name] = value;
+						});
+
+						data.type = self.getType(img.className).name.toLowerCase();
+					}
+				}
+
+				if (!data) {
+					data = {
+						type : 'flash',
+						video: {sources:[]},
+						params: {}
+					};
+				}
+
 				ed.windowManager.open({
 					file : url + '/media.htm',
 					width : 430 + parseInt(ed.getLang('media.delta_width', 0)),
-					height : 470 + parseInt(ed.getLang('media.delta_height', 0)),
+					height : 500 + parseInt(ed.getLang('media.delta_height', 0)),
 					inline : 1
 				}, {
-					plugin_url : url
+					plugin_url : url,
+					data : data
 				});
 			});
 
 			// Register buttons
 			ed.addButton('media', {title : 'media.desc', cmd : 'mceMedia'});
 
-			ed.onNodeChange.add(function(ed, cm, n) {
-				cm.setActive('media', n.nodeName == 'IMG' && isMediaElm(n));
+			// Update media selection status
+			ed.onNodeChange.add(function(ed, cm, node) {
+				cm.setActive('media', isMediaImg(node));
 			});
+		},
 
-			ed.onInit.add(function() {
-				var lo = {
-					mceItemFlash : 'flash',
-					mceItemShockWave : 'shockwave',
-					mceItemWindowsMedia : 'windowsmedia',
-					mceItemQuickTime : 'quicktime',
-					mceItemRealMedia : 'realmedia'
-				};
+		convertUrl : function(url, force_absolute) {
+			var self = this, editor = self.editor, settings = editor.settings,
+				urlConverter = settings.url_converter,
+				urlConverterScope = settings.url_converter_scope || self;
 
-				ed.selection.onSetContent.add(function() {
-					t._spansToImgs(ed.getBody());
-				});
+			if (!url)
+				return url;
 
-				ed.selection.onBeforeSetContent.add(t._objectsToSpans, t);
+			if (force_absolute)
+				return editor.documentBaseURI.toAbsolute(url);
 
-				if (ed.settings.content_css !== false)
-					ed.dom.loadCSS(url + "/css/content.css");
-
-				if (ed.theme && ed.theme.onResolveName) {
-					ed.theme.onResolveName.add(function(th, o) {
-						if (o.name == 'img') {
-							each(lo, function(v, k) {
-								if (ed.dom.hasClass(o.node, k)) {
-									o.name = v;
-									o.title = ed.dom.getAttrib(o.node, 'title');
-									return false;
-								}
-							});
-						}
-					});
-				}
-
-				if (ed && ed.plugins.contextmenu) {
-					ed.plugins.contextmenu.onContextMenu.add(function(th, m, e) {
-						if (e.nodeName == 'IMG' && /mceItem(Flash|ShockWave|WindowsMedia|QuickTime|RealMedia)/.test(e.className)) {
-							m.add({title : 'media.edit', icon : 'media', cmd : 'mceMedia'});
-						}
-					});
-				}
-			});
-
-			ed.onBeforeSetContent.add(t._objectsToSpans, t);
-
-			ed.onSetContent.add(function() {
-				t._spansToImgs(ed.getBody());
-			});
-
-			ed.onPreProcess.add(function(ed, o) {
-				var dom = ed.dom;
-
-				if (o.set) {
-					t._spansToImgs(o.node);
-
-					each(dom.select('IMG', o.node), function(n) {
-						var p;
-
-						if (isMediaElm(n)) {
-							p = t._parse(n.title);
-							dom.setAttrib(n, 'width', dom.getAttrib(n, 'width', p.width || 100));
-							dom.setAttrib(n, 'height', dom.getAttrib(n, 'height', p.height || 100));
-						}
-					});
-				}
-
-				if (o.get) {
-					each(dom.select('IMG', o.node), function(n) {
-						var ci, cb, mt;
-
-						if (ed.getParam('media_use_script')) {
-							if (isMediaElm(n))
-								n.className = n.className.replace(/mceItem/g, 'mceTemp');
-
-							return;
-						}
-
-						switch (n.className) {
-							case 'mceItemFlash':
-								ci = 'd27cdb6e-ae6d-11cf-96b8-444553540000';
-								cb = 'http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0';
-								mt = 'application/x-shockwave-flash';
-								break;
-
-							case 'mceItemShockWave':
-								ci = '166b1bca-3f9c-11cf-8075-444553540000';
-								cb = 'http://download.macromedia.com/pub/shockwave/cabs/director/sw.cab#version=8,5,1,0';
-								mt = 'application/x-director';
-								break;
-
-							case 'mceItemWindowsMedia':
-								ci = ed.getParam('media_wmp6_compatible') ? '05589fa1-c356-11ce-bf01-00aa0055595a' : '6bf52a52-394a-11d3-b153-00c04f79faa6';
-								cb = 'http://activex.microsoft.com/activex/controls/mplayer/en/nsmp2inf.cab#Version=5,1,52,701';
-								mt = 'application/x-mplayer2';
-								break;
-
-							case 'mceItemQuickTime':
-								ci = '02bf25d5-8c17-4b23-bc80-d3488abddc6b';
-								cb = 'http://www.apple.com/qtactivex/qtplugin.cab#version=6,0,2,0';
-								mt = 'video/quicktime';
-								break;
-
-							case 'mceItemRealMedia':
-								ci = 'cfcdaa03-8be4-11cf-b84b-0020afbbccfa';
-								cb = 'http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0';
-								mt = 'audio/x-pn-realaudio-plugin';
-								break;
-						}
-
-						if (ci) {
-							dom.replace(t._buildObj({
-								classid : ci,
-								codebase : cb,
-								type : mt
-							}, n), n);
-						}
-					});
-				}
-			});
-
-			ed.onPostProcess.add(function(ed, o) {
-				o.content = o.content.replace(/_mce_value=/g, 'value=');
-			});
-
-			function getAttr(s, n) {
-				n = new RegExp(n + '=\"([^\"]+)\"', 'g').exec(s);
-
-				return n ? ed.dom.decode(n[1]) : '';
-			};
-
-			ed.onPostProcess.add(function(ed, o) {
-				if (ed.getParam('media_use_script')) {
-					o.content = o.content.replace(/<img[^>]+>/g, function(im) {
-						var cl = getAttr(im, 'class');
-
-						if (/^(mceTempFlash|mceTempShockWave|mceTempWindowsMedia|mceTempQuickTime|mceTempRealMedia)$/.test(cl)) {
-							at = t._parse(getAttr(im, 'title'));
-							at.width = getAttr(im, 'width');
-							at.height = getAttr(im, 'height');
-							im = '<script type="text/javascript">write' + cl.substring(7) + '({' + t._serialize(at) + '});</script>';
-						}
-
-						return im;
-					});
-				}
-			});
+			return urlConverter.call(urlConverterScope, url, 'src', 'object');
 		},
 
 		getInfo : function() {
@@ -202,210 +223,552 @@
 			};
 		},
 
-		// Private methods
-		_objectsToSpans : function(ed, o) {
-			var t = this, h = o.content;
+		/**
+		 * Converts the JSON data object to an img node.
+		 */
+		dataToImg : function(data, force_absolute) {
+			var self = this, editor = self.editor, baseUri = editor.documentBaseURI, sources, attrs, img, i;
 
-			h = h.replace(/<script[^>]*>\s*write(Flash|ShockWave|WindowsMedia|QuickTime|RealMedia)\(\{([^\)]*)\}\);\s*<\/script>/gi, function(a, b, c) {
-				var o = t._parse(c);
+			data.params.src = self.convertUrl(data.params.src, force_absolute);
 
-				return '<img class="mceItem' + b + '" title="' + ed.dom.encode(c) + '" src="' + t.url + '/img/trans.gif" width="' + o.width + '" height="' + o.height + '" />'
+			attrs = data.video.attrs;
+			if (attrs)
+				attrs.src = self.convertUrl(attrs.src, force_absolute);
+
+			if (attrs)
+				attrs.poster = self.convertUrl(attrs.poster, force_absolute);
+
+			sources = toArray(data.video.sources);
+			if (sources) {
+				for (i = 0; i < sources.length; i++)
+					sources[i].src = self.convertUrl(sources[i].src, force_absolute);
+			}
+
+			img = self.editor.dom.create('img', {
+				id : data.id,
+				style : data.style,
+				align : data.align,
+				src : self.editor.theme.url + '/img/trans.gif',
+				'class' : 'mceItemMedia mceItem' + self.getType(data.type).name,
+				'data-mce-json' : JSON.serialize(data, "'")
 			});
 
-			h = h.replace(/<object([^>]*)>/gi, '<span class="mceItemObject" $1>');
-			h = h.replace(/<embed([^>]*)\/?>/gi, '<span class="mceItemEmbed" $1></span>');
-			h = h.replace(/<embed([^>]*)>/gi, '<span class="mceItemEmbed" $1>');
-			h = h.replace(/<\/(object)([^>]*)>/gi, '</span>');
-			h = h.replace(/<\/embed>/gi, '');
-			h = h.replace(/<param([^>]*)>/gi, function(a, b) {return '<span ' + b.replace(/value=/gi, '_mce_value=') + ' class="mceItemParam"></span>'});
-			h = h.replace(/\/ class=\"mceItemParam\"><\/span>/gi, 'class="mceItemParam"></span>');
+			img.width = data.width || "320";
+			img.height = data.height || "240";
 
-			o.content = h;
+			return img;
 		},
 
-		_buildObj : function(o, n) {
-			var ob, ed = this.editor, dom = ed.dom, p = this._parse(n.title), stc;
-			
-			stc = ed.getParam('media_strict', true) && o.type == 'application/x-shockwave-flash';
+		/**
+		 * Converts the JSON data object to a HTML string.
+		 */
+		dataToHtml : function(data, force_absolute) {
+			return this.editor.serializer.serialize(this.dataToImg(data, force_absolute), {forced_root_block : '', force_absolute : force_absolute});
+		},
 
-			p.width = o.width = dom.getAttrib(n, 'width') || 100;
-			p.height = o.height = dom.getAttrib(n, 'height') || 100;
+		/**
+		 * Converts the JSON data object to a HTML string.
+		 */
+		htmlToData : function(html) {
+			var fragment, img, data;
 
-			if (p.src)
-				p.src = ed.convertURL(p.src, 'src', n);
+			data = {
+				type : 'flash',
+				video: {sources:[]},
+				params: {}
+			};
 
-			if (stc) {
-				ob = dom.create('span', {
-					id : p.id,
-					_mce_name : 'object',
-					type : 'application/x-shockwave-flash',
-					data : p.src,
-					style : dom.getAttrib(n, 'style'),
-					width : o.width,
-					height : o.height
-				});
-			} else {
-				ob = dom.create('span', {
-					id : p.id,
-					_mce_name : 'object',
-					classid : "clsid:" + o.classid,
-					style : dom.getAttrib(n, 'style'),
-					codebase : o.codebase,
-					width : o.width,
-					height : o.height
+			fragment = this.editor.parser.parse(html);
+			img = fragment.getAll('img')[0];
+
+			if (img) {
+				data = JSON.parse(img.attr('data-mce-json'));
+				data.type = this.getType(img.attr('class')).name.toLowerCase();
+
+				// Add some extra properties to the data object
+				tinymce.each(rootAttributes, function(name) {
+					var value = img.attr(name);
+
+					if (value)
+						data[name] = value;
 				});
 			}
 
-			each (p, function(v, k) {
-				if (!/^(width|height|codebase|classid|id|_cx|_cy)$/.test(k)) {
-					// Use url instead of src in IE for Windows media
-					if (o.type == 'application/x-mplayer2' && k == 'src' && !p.url)
-						k = 'url';
-
-					if (v)
-						dom.add(ob, 'span', {_mce_name : 'param', name : k, '_mce_value' : v});
-				}
-			});
-
-			if (!stc)
-				dom.add(ob, 'span', tinymce.extend({_mce_name : 'embed', type : o.type, style : dom.getAttrib(n, 'style')}, p));
-
-			return ob;
+			return data;
 		},
 
-		_spansToImgs : function(p) {
-			var t = this, dom = t.editor.dom, im, ci;
+		/**
+		 * Get type item by extension, class, clsid or mime type.
+		 *
+		 * @method getType
+		 * @param {String} value Value to get type item by.
+		 * @return {Object} Type item object or undefined.
+		 */
+		getType : function(value) {
+			var i, values, typeItem;
 
-			each(dom.select('span', p), function(n) {
-				// Convert object into image
-				if (dom.getAttrib(n, 'class') == 'mceItemObject') {
-					ci = dom.getAttrib(n, "classid").toLowerCase().replace(/\s+/g, '');
+			// Find type by checking the classes
+			values = tinymce.explode(value, ' ');
+			for (i = 0; i < values.length; i++) {
+				typeItem = this.lookup[values[i]];
 
-					switch (ci) {
-						case 'clsid:d27cdb6e-ae6d-11cf-96b8-444553540000':
-							dom.replace(t._createImg('mceItemFlash', n), n);
-							break;
+				if (typeItem)
+					return typeItem;
+			}
+		},
 
-						case 'clsid:166b1bca-3f9c-11cf-8075-444553540000':
-							dom.replace(t._createImg('mceItemShockWave', n), n);
-							break;
+		/**
+		 * Converts a tinymce.html.Node image element to video/object/embed.
+		 */
+		imgToObject : function(node, args) {
+			var self = this, editor = self.editor, video, object, embed, iframe, name, value, data,
+				source, sources, params, param, typeItem, i, item, mp4Source, replacement,
+				posterSrc, style;
 
-						case 'clsid:6bf52a52-394a-11d3-b153-00c04f79faa6':
-						case 'clsid:22d6f312-b0f6-11d0-94ab-0080c74c7e95':
-						case 'clsid:05589fa1-c356-11ce-bf01-00aa0055595a':
-							dom.replace(t._createImg('mceItemWindowsMedia', n), n);
-							break;
+			// Adds the flash player
+			function addPlayer(video_src, poster_src) {
+				var baseUri, flashVars, flashVarsOutput, params, flashPlayer;
 
-						case 'clsid:02bf25d5-8c17-4b23-bc80-d3488abddc6b':
-							dom.replace(t._createImg('mceItemQuickTime', n), n);
-							break;
+				flashPlayer = editor.getParam('flash_video_player_url', self.convertUrl(self.url + '/moxieplayer.swf'));
+				if (flashPlayer) {
+					baseUri = editor.documentBaseURI;
+					data.params.src = flashPlayer;
 
-						case 'clsid:cfcdaa03-8be4-11cf-b84b-0020afbbccfa':
-							dom.replace(t._createImg('mceItemRealMedia', n), n);
-							break;
-
-						default:
-							dom.replace(t._createImg('mceItemFlash', n), n);
+					// Convert the movie url to absolute urls
+					if (editor.getParam('flash_video_player_absvideourl', true)) {
+						video_src = baseUri.toAbsolute(video_src || '', true);
+						poster_src = baseUri.toAbsolute(poster_src || '', true);
 					}
-					
+
+					// Generate flash vars
+					flashVarsOutput = '';
+					flashVars = editor.getParam('flash_video_player_flashvars', {url : '$url', poster : '$poster'});
+					tinymce.each(flashVars, function(value, name) {
+						// Replace $url and $poster variables in flashvars value
+						value = value.replace(/\$url/, video_src || '');
+						value = value.replace(/\$poster/, poster_src || '');
+
+						if (value.length > 0)
+							flashVarsOutput += (flashVarsOutput ? '&' : '') + name + '=' + escape(value);
+					});
+
+					if (flashVarsOutput.length)
+						data.params.flashvars = flashVarsOutput;
+
+					params = editor.getParam('flash_video_player_params', {
+						allowfullscreen: true,
+						allowscriptaccess: true
+					});
+
+					tinymce.each(params, function(value, name) {
+						data.params[name] = "" + value;
+					});
+				}
+			};
+
+			data = node.attr('data-mce-json');
+			if (!data)
+				return;
+
+			data = JSON.parse(data);
+			typeItem = this.getType(node.attr('class'));
+
+			style = node.attr('data-mce-style')
+			if (!style) {
+				style = node.attr('style');
+
+				if (style)
+					style = editor.dom.serializeStyle(editor.dom.parseStyle(style, 'img'));
+			}
+
+			// Handle iframe
+			if (typeItem.name === 'Iframe') {
+				replacement = new Node('iframe', 1);
+
+				tinymce.each(rootAttributes, function(name) {
+					var value = node.attr(name);
+
+					if (name == 'class' && value)
+						value = value.replace(/mceItem.+ ?/g, '');
+
+					if (value && value.length > 0)
+						replacement.attr(name, value);
+				});
+
+				for (name in data.params)
+					replacement.attr(name, data.params[name]);
+
+				replacement.attr({
+					style: style,
+					src: data.params.src
+				});
+
+				node.replace(replacement);
+
+				return;
+			}
+
+			// Handle scripts
+			if (this.editor.settings.media_use_script) {
+				replacement = new Node('script', 1).attr('type', 'text/javascript');
+
+				value = new Node('#text', 3);
+				value.value = 'write' + typeItem.name + '(' + JSON.serialize(tinymce.extend(data.params, {
+					width: node.attr('width'),
+					height: node.attr('height')
+				})) + ');';
+
+				replacement.append(value);
+				node.replace(replacement);
+
+				return;
+			}
+
+			// Add HTML5 video element
+			if (typeItem.name === 'Video' && data.video.sources[0]) {
+				// Create new object element
+				video = new Node('video', 1).attr(tinymce.extend({
+					id : node.attr('id'),
+					width: node.attr('width'),
+					height: node.attr('height'),
+					style : style
+				}, data.video.attrs));
+
+				// Get poster source and use that for flash fallback
+				if (data.video.attrs)
+					posterSrc = data.video.attrs.poster;
+
+				sources = data.video.sources = toArray(data.video.sources);
+				for (i = 0; i < sources.length; i++) {
+					if (/\.mp4$/.test(sources[i].src))
+						mp4Source = sources[i].src;
+				}
+
+				if (!sources[0].type) {
+					video.attr('src', sources[0].src);
+					sources.splice(0, 1);
+				}
+
+				for (i = 0; i < sources.length; i++) {
+					source = new Node('source', 1).attr(sources[i]);
+					source.shortEnded = true;
+					video.append(source);
+				}
+
+				// Create flash fallback for video if we have a mp4 source
+				if (mp4Source) {
+					addPlayer(mp4Source, posterSrc);
+					typeItem = self.getType('flash');
+				} else
+					data.params.src = '';
+			}
+
+			// Do we have a params src then we can generate object
+			if (data.params.src) {
+				// Is flv movie add player for it
+				if (/\.flv$/i.test(data.params.src))
+					addPlayer(data.params.src, '');
+
+				if (args && args.force_absolute)
+					data.params.src = editor.documentBaseURI.toAbsolute(data.params.src);
+
+				// Create new object element
+				object = new Node('object', 1).attr({
+					id : node.attr('id'),
+					width: node.attr('width'),
+					height: node.attr('height'),
+					style : style
+				});
+
+				tinymce.each(rootAttributes, function(name) {
+					if (data[name] && name != 'type')
+						object.attr(name, data[name]);
+				});
+
+				// Add params
+				for (name in data.params) {
+					param = new Node('param', 1);
+					param.shortEnded = true;
+					value = data.params[name];
+
+					// Windows media needs to use url instead of src for the media URL
+					if (name === 'src' && typeItem.name === 'WindowsMedia')
+						name = 'url';
+
+					param.attr({name: name, value: value});
+					object.append(param);
+				}
+
+				// Setup add type and classid if strict is disabled
+				if (this.editor.getParam('media_strict', true)) {
+					object.attr({
+						data: data.params.src,
+						type: typeItem.mimes[0]
+					});
+				} else {
+					object.attr({
+						classid: "clsid:" + typeItem.clsids[0],
+						codebase: typeItem.codebase
+					});
+
+					embed = new Node('embed', 1);
+					embed.shortEnded = true;
+					embed.attr({
+						id: node.attr('id'),
+						width: node.attr('width'),
+						height: node.attr('height'),
+						style : style,
+						type: typeItem.mimes[0]
+					});
+
+					for (name in data.params)
+						embed.attr(name, data.params[name]);
+
+					tinymce.each(rootAttributes, function(name) {
+						if (data[name] && name != 'type')
+							embed.attr(name, data[name]);
+					});
+
+					object.append(embed);
+				}
+
+				// Insert raw HTML
+				if (data.object_html) {
+					value = new Node('#text', 3);
+					value.raw = true;
+					value.value = data.object_html;
+					object.append(value);
+				}
+
+				// Append object to video element if it exists
+				if (video)
+					video.append(object);
+			}
+
+			if (video) {
+				// Insert raw HTML
+				if (data.video_html) {
+					value = new Node('#text', 3);
+					value.raw = true;
+					value.value = data.video_html;
+					video.append(value);
+				}
+			}
+
+			if (video || object)
+				node.replace(video || object);
+			else
+				node.remove();
+		},
+
+		/**
+		 * Converts a tinymce.html.Node video/object/embed to an img element.
+		 *
+		 * The video/object/embed will be converted into an image placeholder with a JSON data attribute like this:
+		 * <img class="mceItemMedia mceItemFlash" width="100" height="100" data-mce-json="{..}" />
+		 *
+		 * The JSON structure will be like this:
+		 * {'params':{'flashvars':'something','quality':'high','src':'someurl'}, 'video':{'sources':[{src: 'someurl', type: 'video/mp4'}]}}
+		 */
+		objectToImg : function(node) {
+			var object, embed, video, iframe, img, name, id, width, height, style, i, html,
+				param, params, source, sources, data, type, lookup = this.lookup,
+				matches, attrs, urlConverter = this.editor.settings.url_converter,
+				urlConverterScope = this.editor.settings.url_converter_scope;
+
+			function getInnerHTML(node) {
+				return new tinymce.html.Serializer({
+					inner: true,
+					validate: false
+				}).serialize(node);
+			};
+
+			// If node isn't in document
+			if (!node.parent)
+				return;
+
+			// Handle media scripts
+			if (node.name === 'script') {
+				if (node.firstChild)
+					matches = scriptRegExp.exec(node.firstChild.value);
+
+				if (!matches)
 					return;
+
+				type = matches[1];
+				data = {video : {}, params : JSON.parse(matches[2])};
+				width = data.params.width;
+				height = data.params.height;
+			}
+
+			// Setup data objects
+			data = data || {
+				video : {},
+				params : {}
+			};
+
+			// Setup new image object
+			img = new Node('img', 1);
+			img.attr({
+				src : this.editor.theme.url + '/img/trans.gif'
+			});
+
+			// Video element
+			name = node.name;
+			if (name === 'video') {
+				video = node;
+				object = node.getAll('object')[0];
+				embed = node.getAll('embed')[0];
+				width = video.attr('width');
+				height = video.attr('height');
+				id = video.attr('id');
+				data.video = {attrs : {}, sources : []};
+
+				// Get all video attributes
+				attrs = data.video.attrs;
+				for (name in video.attributes.map)
+					attrs[name] = video.attributes.map[name];
+
+				source = node.attr('src');
+				if (source)
+					data.video.sources.push({src : urlConverter.call(urlConverterScope, source, 'src', 'video')});
+
+				// Get all sources
+				sources = video.getAll("source");
+				for (i = 0; i < sources.length; i++) {
+					source = sources[i].remove();
+
+					data.video.sources.push({
+						src: urlConverter.call(urlConverterScope, source.attr('src'), 'src', 'source'),
+						type: source.attr('type'),
+						media: source.attr('media')
+					});
 				}
 
-				// Convert embed into image
-				if (dom.getAttrib(n, 'class') == 'mceItemEmbed') {
-					switch (dom.getAttrib(n, 'type')) {
-						case 'application/x-shockwave-flash':
-							dom.replace(t._createImg('mceItemFlash', n), n);
-							break;
+				// Convert the poster URL
+				if (attrs.poster)
+					attrs.poster = urlConverter.call(urlConverterScope, attrs.poster, 'poster', 'video');
+			}
 
-						case 'application/x-director':
-							dom.replace(t._createImg('mceItemShockWave', n), n);
-							break;
+			// Object element
+			if (node.name === 'object') {
+				object = node;
+				embed = node.getAll('embed')[0];
+			}
 
-						case 'application/x-mplayer2':
-							dom.replace(t._createImg('mceItemWindowsMedia', n), n);
-							break;
+			// Embed element
+			if (node.name === 'embed')
+				embed = node;
 
-						case 'video/quicktime':
-							dom.replace(t._createImg('mceItemQuickTime', n), n);
-							break;
+			// Iframe element
+			if (node.name === 'iframe') {
+				iframe = node;
+				type = 'Iframe';
+			}
 
-						case 'audio/x-pn-realaudio-plugin':
-							dom.replace(t._createImg('mceItemRealMedia', n), n);
-							break;
+			if (object) {
+				// Get width/height
+				width = width || object.attr('width');
+				height = height || object.attr('height');
+				style = style || object.attr('style');
+				id = id || object.attr('id');
 
-						default:
-							dom.replace(t._createImg('mceItemFlash', n), n);
-					}
-				}			
-			});
-		},
+				// Get all object params
+				params = object.getAll("param");
+				for (i = 0; i < params.length; i++) {
+					param = params[i];
+					name = param.remove().attr('name');
 
-		_createImg : function(cl, n) {
-			var im, dom = this.editor.dom, pa = {}, ti = '', args;
+					if (!excludedAttrs[name])
+						data.params[name] = param.attr('value');
+				}
 
-			args = ['id', 'name', 'width', 'height', 'bgcolor', 'align', 'flashvars', 'src', 'wmode', 'allowfullscreen', 'quality', 'data'];	
+				data.params.src = data.params.src || object.attr('data');
+			}
 
-			// Create image
-			im = dom.create('img', {
-				src : this.url + '/img/trans.gif',
-				width : dom.getAttrib(n, 'width') || 100,
-				height : dom.getAttrib(n, 'height') || 100,
-				style : dom.getAttrib(n, 'style'),
-				'class' : cl
-			});
+			if (embed) {
+				// Get width/height
+				width = width || embed.attr('width');
+				height = height || embed.attr('height');
+				style = style || embed.attr('style');
+				id = id || embed.attr('id');
 
-			// Setup base parameters
-			each(args, function(na) {
-				var v = dom.getAttrib(n, na);
+				// Get all embed attributes
+				for (name in embed.attributes.map) {
+					if (!excludedAttrs[name] && !data.params[name])
+						data.params[name] = embed.attributes.map[name];
+				}
+			}
 
-				if (v)
-					pa[na] = v;
-			});
+			if (iframe) {
+				// Get width/height
+				width = iframe.attr('width');
+				height = iframe.attr('height');
+				style = style || iframe.attr('style');
+				id = iframe.attr('id');
 
-			// Add optional parameters
-			each(dom.select('span', n), function(n) {
-				if (dom.hasClass(n, 'mceItemParam'))
-					pa[dom.getAttrib(n, 'name')] = dom.getAttrib(n, '_mce_value');
-			});
+				tinymce.each(rootAttributes, function(name) {
+					img.attr(name, iframe.attr(name));
+				});
+
+				// Get all iframe attributes
+				for (name in iframe.attributes.map) {
+					if (!excludedAttrs[name] && !data.params[name])
+						data.params[name] = iframe.attributes.map[name];
+				}
+			}
 
 			// Use src not movie
-			if (pa.movie) {
-				pa.src = pa.movie;
-				delete pa.movie;
+			if (data.params.movie) {
+				data.params.src = data.params.src || data.params.movie;
+				delete data.params.movie;
 			}
 
-			// No src try data
-			if (!pa.src) {
-				pa.src = pa.data;
-				delete pa.data;
+			// Convert the URL to relative/absolute depending on configuration
+			if (data.params.src)
+				data.params.src = urlConverter.call(urlConverterScope, data.params.src, 'src', 'object');
+
+			if (video)
+				type = lookup.video.name;
+
+			if (object && !type)
+				type = (lookup[(object.attr('clsid') || '').toLowerCase()] || lookup[(object.attr('type') || '').toLowerCase()] || {}).name;
+
+			if (embed && !type)
+				type = (lookup[(embed.attr('type') || '').toLowerCase()] || {}).name;
+
+			// Replace the video/object/embed element with a placeholder image containing the data
+			node.replace(img);
+
+			// Remove embed
+			if (embed)
+				embed.remove();
+
+			// Serialize the inner HTML of the object element
+			if (object) {
+				html = getInnerHTML(object.remove());
+
+				if (html)
+					data.object_html = html;
 			}
 
-			// Merge with embed args
-			n = dom.select('.mceItemEmbed', n)[0];
-			if (n) {
-				each(args, function(na) {
-					var v = dom.getAttrib(n, na);
+			// Serialize the inner HTML of the video element
+			if (video) {
+				html = getInnerHTML(video.remove());
 
-					if (v && !pa[na])
-						pa[na] = v;
-				});
+				if (html)
+					data.video_html = html;
 			}
 
-			delete pa.width;
-			delete pa.height;
-
-			im.title = this._serialize(pa);
-
-			return im;
-		},
-
-		_parse : function(s) {
-			return tinymce.util.JSON.parse('{' + s + '}');
-		},
-
-		_serialize : function(o) {
-			return tinymce.util.JSON.serialize(o).replace(/[{}]/g, '');
+			// Set width/height of placeholder
+			img.attr({
+				id : id,
+				'class' : 'mceItemMedia mceItem' + (type || 'Flash'),
+				style : style,
+				width : width || "320",
+				height : height || "240",
+				"data-mce-json" : JSON.serialize(data, "'")
+			});
 		}
 	});
 
diff --git a/plugins/TinyMCE/js/plugins/media/img/flash.gif b/plugins/TinyMCE/js/plugins/media/img/flash.gif
deleted file mode 100644
index cb192e6ced..0000000000
Binary files a/plugins/TinyMCE/js/plugins/media/img/flash.gif and /dev/null differ
diff --git a/plugins/TinyMCE/js/plugins/media/img/flv_player.swf b/plugins/TinyMCE/js/plugins/media/img/flv_player.swf
deleted file mode 100644
index 042c2ab969..0000000000
Binary files a/plugins/TinyMCE/js/plugins/media/img/flv_player.swf and /dev/null differ
diff --git a/plugins/TinyMCE/js/plugins/media/img/quicktime.gif b/plugins/TinyMCE/js/plugins/media/img/quicktime.gif
deleted file mode 100644
index 3b0499145b..0000000000
Binary files a/plugins/TinyMCE/js/plugins/media/img/quicktime.gif and /dev/null differ
diff --git a/plugins/TinyMCE/js/plugins/media/img/shockwave.gif b/plugins/TinyMCE/js/plugins/media/img/shockwave.gif
deleted file mode 100644
index 5f235dfc73..0000000000
Binary files a/plugins/TinyMCE/js/plugins/media/img/shockwave.gif and /dev/null differ
diff --git a/plugins/TinyMCE/js/plugins/media/js/media.js b/plugins/TinyMCE/js/plugins/media/js/media.js
index 86cfa98563..a8acdd12d1 100644
--- a/plugins/TinyMCE/js/plugins/media/js/media.js
+++ b/plugins/TinyMCE/js/plugins/media/js/media.js
@@ -1,630 +1,355 @@
-tinyMCEPopup.requireLangPack();
+(function() {
+	var url;
 
-var oldWidth, oldHeight, ed, url;
+	if (url = tinyMCEPopup.getParam("media_external_list_url"))
+		document.write('<script language="javascript" type="text/javascript" src="' + tinyMCEPopup.editor.documentBaseURI.toAbsolute(url) + '"></script>');
 
-if (url = tinyMCEPopup.getParam("media_external_list_url"))
-	document.write('<script language="javascript" type="text/javascript" src="' + tinyMCEPopup.editor.documentBaseURI.toAbsolute(url) + '"></script>');
+	function get(id) {
+		return document.getElementById(id);
+	}
 
-function init() {
-	var pl = "", f, val;
-	var type = "flash", fe, i;
+	function getVal(id) {
+		var elm = get(id);
 
-	ed = tinyMCEPopup.editor;
+		if (elm.nodeName == "SELECT")
+			return elm.options[elm.selectedIndex].value;
 
-	tinyMCEPopup.resizeToInnerSize();
-	f = document.forms[0]
+		if (elm.type == "checkbox")
+			return elm.checked;
 
-	fe = ed.selection.getNode();
-	if (/mceItem(Flash|ShockWave|WindowsMedia|QuickTime|RealMedia)/.test(ed.dom.getAttrib(fe, 'class'))) {
-		pl = fe.title;
+		return elm.value;
+	}
 
-		switch (ed.dom.getAttrib(fe, 'class')) {
-			case 'mceItemFlash':
-				type = 'flash';
-				break;
+	function setVal(id, value, name) {
+		if (typeof(value) != 'undefined') {
+			var elm = get(id);
 
-			case 'mceItemFlashVideo':
-				type = 'flv';
-				break;
-
-			case 'mceItemShockWave':
-				type = 'shockwave';
-				break;
-
-			case 'mceItemWindowsMedia':
-				type = 'wmp';
-				break;
-
-			case 'mceItemQuickTime':
-				type = 'qt';
-				break;
-
-			case 'mceItemRealMedia':
-				type = 'rmp';
-				break;
+			if (elm.nodeName == "SELECT")
+				selectByValue(document.forms[0], id, value);
+			else if (elm.type == "checkbox") {
+				if (typeof(value) == 'string') {
+					value = value.toLowerCase();
+					value = (!name && value === 'true') || (name && value === name.toLowerCase());
+				}
+				elm.checked = !!value;
+			} else
+				elm.value = value;
 		}
-
-		document.forms[0].insert.value = ed.getLang('update', 'Insert', true); 
 	}
 
-	document.getElementById('filebrowsercontainer').innerHTML = getBrowserHTML('filebrowser','src','media','media');
-	document.getElementById('qtsrcfilebrowsercontainer').innerHTML = getBrowserHTML('qtsrcfilebrowser','qt_qtsrc','media','media');
-	document.getElementById('bgcolor_pickcontainer').innerHTML = getColorPickerHTML('bgcolor_pick','bgcolor');
-
-	var html = getMediaListHTML('medialist','src','media','media');
-	if (html == "")
-		document.getElementById("linklistrow").style.display = 'none';
-	else
-		document.getElementById("linklistcontainer").innerHTML = html;
-
-	// Resize some elements
-	if (isVisible('filebrowser'))
-		document.getElementById('src').style.width = '230px';
-
-	// Setup form
-	if (pl != "") {
-		pl = tinyMCEPopup.editor.plugins.media._parse(pl);
-
-		switch (type) {
-			case "flash":
-				setBool(pl, 'flash', 'play');
-				setBool(pl, 'flash', 'loop');
-				setBool(pl, 'flash', 'menu');
-				setBool(pl, 'flash', 'swliveconnect');
-				setStr(pl, 'flash', 'quality');
-				setStr(pl, 'flash', 'scale');
-				setStr(pl, 'flash', 'salign');
-				setStr(pl, 'flash', 'wmode');
-				setStr(pl, 'flash', 'base');
-				setStr(pl, 'flash', 'flashvars');
-			break;
-
-			case "qt":
-				setBool(pl, 'qt', 'loop');
-				setBool(pl, 'qt', 'autoplay');
-				setBool(pl, 'qt', 'cache');
-				setBool(pl, 'qt', 'controller');
-				setBool(pl, 'qt', 'correction');
-				setBool(pl, 'qt', 'enablejavascript');
-				setBool(pl, 'qt', 'kioskmode');
-				setBool(pl, 'qt', 'autohref');
-				setBool(pl, 'qt', 'playeveryframe');
-				setBool(pl, 'qt', 'tarsetcache');
-				setStr(pl, 'qt', 'scale');
-				setStr(pl, 'qt', 'starttime');
-				setStr(pl, 'qt', 'endtime');
-				setStr(pl, 'qt', 'tarset');
-				setStr(pl, 'qt', 'qtsrcchokespeed');
-				setStr(pl, 'qt', 'volume');
-				setStr(pl, 'qt', 'qtsrc');
-			break;
-
-			case "shockwave":
-				setBool(pl, 'shockwave', 'sound');
-				setBool(pl, 'shockwave', 'progress');
-				setBool(pl, 'shockwave', 'autostart');
-				setBool(pl, 'shockwave', 'swliveconnect');
-				setStr(pl, 'shockwave', 'swvolume');
-				setStr(pl, 'shockwave', 'swstretchstyle');
-				setStr(pl, 'shockwave', 'swstretchhalign');
-				setStr(pl, 'shockwave', 'swstretchvalign');
-			break;
-
-			case "wmp":
-				setBool(pl, 'wmp', 'autostart');
-				setBool(pl, 'wmp', 'enabled');
-				setBool(pl, 'wmp', 'enablecontextmenu');
-				setBool(pl, 'wmp', 'fullscreen');
-				setBool(pl, 'wmp', 'invokeurls');
-				setBool(pl, 'wmp', 'mute');
-				setBool(pl, 'wmp', 'stretchtofit');
-				setBool(pl, 'wmp', 'windowlessvideo');
-				setStr(pl, 'wmp', 'balance');
-				setStr(pl, 'wmp', 'baseurl');
-				setStr(pl, 'wmp', 'captioningid');
-				setStr(pl, 'wmp', 'currentmarker');
-				setStr(pl, 'wmp', 'currentposition');
-				setStr(pl, 'wmp', 'defaultframe');
-				setStr(pl, 'wmp', 'playcount');
-				setStr(pl, 'wmp', 'rate');
-				setStr(pl, 'wmp', 'uimode');
-				setStr(pl, 'wmp', 'volume');
-			break;
-
-			case "rmp":
-				setBool(pl, 'rmp', 'autostart');
-				setBool(pl, 'rmp', 'loop');
-				setBool(pl, 'rmp', 'autogotourl');
-				setBool(pl, 'rmp', 'center');
-				setBool(pl, 'rmp', 'imagestatus');
-				setBool(pl, 'rmp', 'maintainaspect');
-				setBool(pl, 'rmp', 'nojava');
-				setBool(pl, 'rmp', 'prefetch');
-				setBool(pl, 'rmp', 'shuffle');
-				setStr(pl, 'rmp', 'console');
-				setStr(pl, 'rmp', 'controls');
-				setStr(pl, 'rmp', 'numloop');
-				setStr(pl, 'rmp', 'scriptcallbacks');
-			break;
-		}
-
-		setStr(pl, null, 'src');
-		setStr(pl, null, 'id');
-		setStr(pl, null, 'name');
-		setStr(pl, null, 'vspace');
-		setStr(pl, null, 'hspace');
-		setStr(pl, null, 'bgcolor');
-		setStr(pl, null, 'align');
-		setStr(pl, null, 'width');
-		setStr(pl, null, 'height');
-
-		if ((val = ed.dom.getAttrib(fe, "width")) != "")
-			pl.width = f.width.value = val;
-
-		if ((val = ed.dom.getAttrib(fe, "height")) != "")
-			pl.height = f.height.value = val;
-
-		oldWidth = pl.width ? parseInt(pl.width) : 0;
-		oldHeight = pl.height ? parseInt(pl.height) : 0;
-	} else
-		oldWidth = oldHeight = 0;
-
-	selectByValue(f, 'media_type', type);
-	changedType(type);
-	updateColor('bgcolor_pick', 'bgcolor');
-
-	TinyMCE_EditableSelects.init();
-	generatePreview();
-}
-
-function insertMedia() {
-	var fe, f = document.forms[0], h;
-
-	tinyMCEPopup.restoreSelection();
-
-	if (!AutoValidator.validate(f)) {
-		tinyMCEPopup.alert(ed.getLang('invalid_data'));
-		return false;
-	}
-
-	f.width.value = f.width.value == "" ? 100 : f.width.value;
-	f.height.value = f.height.value == "" ? 100 : f.height.value;
-
-	fe = ed.selection.getNode();
-	if (fe != null && /mceItem(Flash|ShockWave|WindowsMedia|QuickTime|RealMedia)/.test(ed.dom.getAttrib(fe, 'class'))) {
-		switch (f.media_type.options[f.media_type.selectedIndex].value) {
-			case "flash":
-				fe.className = "mceItemFlash";
-				break;
-
-			case "flv":
-				fe.className = "mceItemFlashVideo";
-				break;
-
-			case "shockwave":
-				fe.className = "mceItemShockWave";
-				break;
-
-			case "qt":
-				fe.className = "mceItemQuickTime";
-				break;
-
-			case "wmp":
-				fe.className = "mceItemWindowsMedia";
-				break;
-
-			case "rmp":
-				fe.className = "mceItemRealMedia";
-				break;
-		}
-
-		if (fe.width != f.width.value || fe.height != f.height.value)
-			ed.execCommand('mceRepaint');
-
-		fe.title = serializeParameters();
-		fe.width = f.width.value;
-		fe.height = f.height.value;
-		fe.style.width = f.width.value + (f.width.value.indexOf('%') == -1 ? 'px' : '');
-		fe.style.height = f.height.value + (f.height.value.indexOf('%') == -1 ? 'px' : '');
-		fe.align = f.align.options[f.align.selectedIndex].value;
-	} else {
-		h = '<img src="' + tinyMCEPopup.getWindowArg("plugin_url") + '/img/trans.gif"' ;
-
-		switch (f.media_type.options[f.media_type.selectedIndex].value) {
-			case "flash":
-				h += ' class="mceItemFlash"';
-				break;
-
-			case "flv":
-				h += ' class="mceItemFlashVideo"';
-				break;
-
-			case "shockwave":
-				h += ' class="mceItemShockWave"';
-				break;
-
-			case "qt":
-				h += ' class="mceItemQuickTime"';
-				break;
-
-			case "wmp":
-				h += ' class="mceItemWindowsMedia"';
-				break;
-
-			case "rmp":
-				h += ' class="mceItemRealMedia"';
-				break;
-		}
-
-		h += ' title="' + serializeParameters() + '"';
-		h += ' width="' + f.width.value + '"';
-		h += ' height="' + f.height.value + '"';
-		h += ' align="' + f.align.options[f.align.selectedIndex].value + '"';
-
-		h += ' />';
-
-		ed.execCommand('mceInsertContent', false, h);
-	}
-
-	tinyMCEPopup.close();
-}
-
-function updatePreview() {
-	var f = document.forms[0], type;
-
-	f.width.value = f.width.value || '320';
-	f.height.value = f.height.value || '240';
-
-	type = getType(f.src.value);
-	selectByValue(f, 'media_type', type);
-	changedType(type);
-	generatePreview();
-}
-
-function getMediaListHTML() {
-	if (typeof(tinyMCEMediaList) != "undefined" && tinyMCEMediaList.length > 0) {
-		var html = "";
-
-		html += '<select id="linklist" name="linklist" style="width: 250px" onchange="this.form.src.value=this.options[this.selectedIndex].value;updatePreview();">';
-		html += '<option value="">---</option>';
-
-		for (var i=0; i<tinyMCEMediaList.length; i++)
-			html += '<option value="' + tinyMCEMediaList[i][1] + '">' + tinyMCEMediaList[i][0] + '</option>';
-
-		html += '</select>';
-
-		return html;
-	}
-
-	return "";
-}
-
-function getType(v) {
-	var fo, i, c, el, x, f = document.forms[0];
-
-	fo = ed.getParam("media_types", "flash=swf;flv=flv;shockwave=dcr;qt=mov,qt,mpg,mp3,mp4,mpeg;shockwave=dcr;wmp=avi,wmv,wm,asf,asx,wmx,wvx;rmp=rm,ra,ram").split(';');
-
-	// YouTube
-	if (v.match(/watch\?v=(.+)(.*)/)) {
-		f.width.value = '425';
-		f.height.value = '350';
-		f.src.value = 'http://www.youtube.com/v/' + v.match(/v=(.*)(.*)/)[0].split('=')[1];
-		return 'flash';
-	}
-
-	// Google video
-	if (v.indexOf('http://video.google.com/videoplay?docid=') == 0) {
-		f.width.value = '425';
-		f.height.value = '326';
-		f.src.value = 'http://video.google.com/googleplayer.swf?docId=' + v.substring('http://video.google.com/videoplay?docid='.length) + '&hl=en';
-		return 'flash';
-	}
-
-	for (i=0; i<fo.length; i++) {
-		c = fo[i].split('=');
-
-		el = c[1].split(',');
-		for (x=0; x<el.length; x++)
-		if (v.indexOf('.' + el[x]) != -1)
-			return c[0];
-	}
-
-	return null;
-}
-
-function switchType(v) {
-	var t = getType(v), d = document, f = d.forms[0];
-
-	if (!t)
-		return;
-
-	selectByValue(d.forms[0], 'media_type', t);
-	changedType(t);
-
-	// Update qtsrc also
-	if (t == 'qt' && f.src.value.toLowerCase().indexOf('rtsp://') != -1) {
-		alert(ed.getLang("media_qt_stream_warn"));
-
-		if (f.qt_qtsrc.value == '')
-			f.qt_qtsrc.value = f.src.value;
-	}
-}
-
-function changedType(t) {
-	var d = document;
-
-	d.getElementById('flash_options').style.display = 'none';
-	d.getElementById('flv_options').style.display = 'none';
-	d.getElementById('qt_options').style.display = 'none';
-	d.getElementById('shockwave_options').style.display = 'none';
-	d.getElementById('wmp_options').style.display = 'none';
-	d.getElementById('rmp_options').style.display = 'none';
-
-	if (t)
-		d.getElementById(t + '_options').style.display = 'block';
-}
-
-function serializeParameters() {
-	var d = document, f = d.forms[0], s = '';
-
-	switch (f.media_type.options[f.media_type.selectedIndex].value) {
-		case "flash":
-			s += getBool('flash', 'play', true);
-			s += getBool('flash', 'loop', true);
-			s += getBool('flash', 'menu', true);
-			s += getBool('flash', 'swliveconnect', false);
-			s += getStr('flash', 'quality');
-			s += getStr('flash', 'scale');
-			s += getStr('flash', 'salign');
-			s += getStr('flash', 'wmode');
-			s += getStr('flash', 'base');
-			s += getStr('flash', 'flashvars');
-		break;
-
-		case "qt":
-			s += getBool('qt', 'loop', false);
-			s += getBool('qt', 'autoplay', true);
-			s += getBool('qt', 'cache', false);
-			s += getBool('qt', 'controller', true);
-			s += getBool('qt', 'correction', false, 'none', 'full');
-			s += getBool('qt', 'enablejavascript', false);
-			s += getBool('qt', 'kioskmode', false);
-			s += getBool('qt', 'autohref', false);
-			s += getBool('qt', 'playeveryframe', false);
-			s += getBool('qt', 'targetcache', false);
-			s += getStr('qt', 'scale');
-			s += getStr('qt', 'starttime');
-			s += getStr('qt', 'endtime');
-			s += getStr('qt', 'target');
-			s += getStr('qt', 'qtsrcchokespeed');
-			s += getStr('qt', 'volume');
-			s += getStr('qt', 'qtsrc');
-		break;
-
-		case "shockwave":
-			s += getBool('shockwave', 'sound');
-			s += getBool('shockwave', 'progress');
-			s += getBool('shockwave', 'autostart');
-			s += getBool('shockwave', 'swliveconnect');
-			s += getStr('shockwave', 'swvolume');
-			s += getStr('shockwave', 'swstretchstyle');
-			s += getStr('shockwave', 'swstretchhalign');
-			s += getStr('shockwave', 'swstretchvalign');
-		break;
-
-		case "wmp":
-			s += getBool('wmp', 'autostart', true);
-			s += getBool('wmp', 'enabled', false);
-			s += getBool('wmp', 'enablecontextmenu', true);
-			s += getBool('wmp', 'fullscreen', false);
-			s += getBool('wmp', 'invokeurls', true);
-			s += getBool('wmp', 'mute', false);
-			s += getBool('wmp', 'stretchtofit', false);
-			s += getBool('wmp', 'windowlessvideo', false);
-			s += getStr('wmp', 'balance');
-			s += getStr('wmp', 'baseurl');
-			s += getStr('wmp', 'captioningid');
-			s += getStr('wmp', 'currentmarker');
-			s += getStr('wmp', 'currentposition');
-			s += getStr('wmp', 'defaultframe');
-			s += getStr('wmp', 'playcount');
-			s += getStr('wmp', 'rate');
-			s += getStr('wmp', 'uimode');
-			s += getStr('wmp', 'volume');
-		break;
-
-		case "rmp":
-			s += getBool('rmp', 'autostart', false);
-			s += getBool('rmp', 'loop', false);
-			s += getBool('rmp', 'autogotourl', true);
-			s += getBool('rmp', 'center', false);
-			s += getBool('rmp', 'imagestatus', true);
-			s += getBool('rmp', 'maintainaspect', false);
-			s += getBool('rmp', 'nojava', false);
-			s += getBool('rmp', 'prefetch', false);
-			s += getBool('rmp', 'shuffle', false);
-			s += getStr('rmp', 'console');
-			s += getStr('rmp', 'controls');
-			s += getStr('rmp', 'numloop');
-			s += getStr('rmp', 'scriptcallbacks');
-		break;
-	}
-
-	s += getStr(null, 'id');
-	s += getStr(null, 'name');
-	s += getStr(null, 'src');
-	s += getStr(null, 'align');
-	s += getStr(null, 'bgcolor');
-	s += getInt(null, 'vspace');
-	s += getInt(null, 'hspace');
-	s += getStr(null, 'width');
-	s += getStr(null, 'height');
-
-	s = s.length > 0 ? s.substring(0, s.length - 1) : s;
-
-	return s;
-}
-
-function setBool(pl, p, n) {
-	if (typeof(pl[n]) == "undefined")
-		return;
-
-	document.forms[0].elements[p + "_" + n].checked = pl[n] != 'false';
-}
-
-function setStr(pl, p, n) {
-	var f = document.forms[0], e = f.elements[(p != null ? p + "_" : '') + n];
-
-	if (typeof(pl[n]) == "undefined")
-		return;
-
-	if (e.type == "text")
-		e.value = pl[n];
-	else
-		selectByValue(f, (p != null ? p + "_" : '') + n, pl[n]);
-}
-
-function getBool(p, n, d, tv, fv) {
-	var v = document.forms[0].elements[p + "_" + n].checked;
-
-	tv = typeof(tv) == 'undefined' ? 'true' : "'" + jsEncode(tv) + "'";
-	fv = typeof(fv) == 'undefined' ? 'false' : "'" + jsEncode(fv) + "'";
-
-	return (v == d) ? '' : n + (v ? ':' + tv + ',' : ":\'" + fv + "\',");
-}
-
-function getStr(p, n, d) {
-	var e = document.forms[0].elements[(p != null ? p + "_" : "") + n];
-	var v = e.type == "text" ? e.value : e.options[e.selectedIndex].value;
-
-	if (n == 'src')
-		v = tinyMCEPopup.editor.convertURL(v, 'src', null);
-
-	return ((n == d || v == '') ? '' : n + ":'" + jsEncode(v) + "',");
-}
-
-function getInt(p, n, d) {
-	var e = document.forms[0].elements[(p != null ? p + "_" : "") + n];
-	var v = e.type == "text" ? e.value : e.options[e.selectedIndex].value;
-
-	return ((n == d || v == '') ? '' : n + ":" + v.replace(/[^0-9]+/g, '') + ",");
-}
-
-function jsEncode(s) {
-	s = s.replace(new RegExp('\\\\', 'g'), '\\\\');
-	s = s.replace(new RegExp('"', 'g'), '\\"');
-	s = s.replace(new RegExp("'", 'g'), "\\'");
-
-	return s;
-}
-
-function generatePreview(c) {
-	var f = document.forms[0], p = document.getElementById('prev'), h = '', cls, pl, n, type, codebase, wp, hp, nw, nh;
-
-	p.innerHTML = '<!-- x --->';
-
-	nw = parseInt(f.width.value);
-	nh = parseInt(f.height.value);
-
-	if (f.width.value != "" && f.height.value != "") {
-		if (f.constrain.checked) {
-			if (c == 'width' && oldWidth != 0) {
-				wp = nw / oldWidth;
-				nh = Math.round(wp * nh);
-				f.height.value = nh;
-			} else if (c == 'height' && oldHeight != 0) {
-				hp = nh / oldHeight;
-				nw = Math.round(hp * nw);
-				f.width.value = nw;
+	window.Media = {
+		init : function() {
+			var html, editor;
+
+			this.editor = editor = tinyMCEPopup.editor;
+
+			// Setup file browsers and color pickers
+			get('filebrowsercontainer').innerHTML = getBrowserHTML('filebrowser','src','media','media');
+			get('qtsrcfilebrowsercontainer').innerHTML = getBrowserHTML('qtsrcfilebrowser','quicktime_qtsrc','media','media');
+			get('bgcolor_pickcontainer').innerHTML = getColorPickerHTML('bgcolor_pick','bgcolor');
+			get('video_altsource1_filebrowser').innerHTML = getBrowserHTML('filebrowser_altsource1','video_altsource1','media','media');
+			get('video_altsource2_filebrowser').innerHTML = getBrowserHTML('filebrowser_altsource2','video_altsource2','media','media');
+			get('video_poster_filebrowser').innerHTML = getBrowserHTML('filebrowser_poster','video_poster','media','image');
+
+			html = this.getMediaListHTML('medialist', 'src', 'media', 'media');
+			if (html == "")
+				get("linklistrow").style.display = 'none';
+			else
+				get("linklistcontainer").innerHTML = html;
+
+			if (isVisible('filebrowser'))
+				get('src').style.width = '230px';
+
+			if (isVisible('filebrowser_altsource1'))
+				get('video_altsource1').style.width = '220px';
+
+			if (isVisible('filebrowser_altsource2'))
+				get('video_altsource2').style.width = '220px';
+
+			if (isVisible('filebrowser_poster'))
+				get('video_poster').style.width = '220px';
+
+			this.data = tinyMCEPopup.getWindowArg('data');
+			this.dataToForm();
+			this.preview();
+		},
+
+		insert : function() {
+			var editor = tinyMCEPopup.editor;
+
+			this.formToData();
+			editor.execCommand('mceRepaint');
+			tinyMCEPopup.restoreSelection();
+			editor.selection.setNode(editor.plugins.media.dataToImg(this.data));
+			tinyMCEPopup.close();
+		},
+
+		preview : function() {
+			get('prev').innerHTML = this.editor.plugins.media.dataToHtml(this.data, true);
+		},
+
+		moveStates : function(to_form, field) {
+			var data = this.data, editor = this.editor, data = this.data,
+				mediaPlugin = editor.plugins.media, ext, src, typeInfo, defaultStates, src;
+
+			defaultStates = {
+				// QuickTime
+				quicktime_autoplay : true,
+				quicktime_controller : true,
+
+				// Flash
+				flash_play : true,
+				flash_loop : true,
+				flash_menu : true,
+
+				// WindowsMedia
+				windowsmedia_autostart : true,
+				windowsmedia_enablecontextmenu : true,
+				windowsmedia_invokeurls : true,
+
+				// RealMedia
+				realmedia_autogotourl : true,
+				realmedia_imagestatus : true
+			};
+
+			function parseQueryParams(str) {
+				var out = {};
+
+				if (str) {
+					tinymce.each(str.split('&'), function(item) {
+						var parts = item.split('=');
+
+						out[unescape(parts[0])] = unescape(parts[1]);
+					});
+				}
+
+				return out;
+			};
+
+			function setOptions(type, names) {
+				var i, name, formItemName, value, list;
+
+				if (type == data.type || type == 'global') {
+					names = tinymce.explode(names);
+					for (i = 0; i < names.length; i++) {
+						name = names[i];
+						formItemName = type == 'global' ? name : type + '_' + name;
+
+						if (type == 'global')
+							list = data;
+						else if (type == 'video') {
+							list = data.video.attrs;
+
+							if (!list && !to_form)
+								data.video.attrs = list = {};
+						} else
+							list = data.params;
+
+						if (list) {
+							if (to_form) {
+								setVal(formItemName, list[name], type == 'video' ? name : '');
+							} else {
+								delete list[name];
+
+								value = getVal(formItemName);
+								if (type == 'video' && value === true)
+									value = name;
+
+								if (defaultStates[formItemName]) {
+									if (value !== defaultStates[formItemName]) {
+										value = "" + value;
+										list[name] = value;
+									}
+								} else if (value) {
+									value = "" + value;
+									list[name] = value;
+								}
+							}
+						}
+					}
+				}
 			}
+
+			if (!to_form) {
+				data.type = get('media_type').options[get('media_type').selectedIndex].value;
+				data.width = getVal('width');
+				data.height = getVal('height');
+
+				// Switch type based on extension
+				src = getVal('src');
+				if (field == 'src') {
+					ext = src.replace(/^.*\.([^.]+)$/, '$1');
+					if (typeInfo = mediaPlugin.getType(ext))
+						data.type = typeInfo.name.toLowerCase();
+
+					setVal('media_type', data.type);
+				}
+
+				if (data.type == "video") {
+					if (!data.video.sources)
+						data.video.sources = [];
+
+					data.video.sources[0] = {src: getVal('src')};
+				}
+			}
+
+			// Hide all fieldsets and show the one active
+			get('video_options').style.display = 'none';
+			get('flash_options').style.display = 'none';
+			get('quicktime_options').style.display = 'none';
+			get('shockwave_options').style.display = 'none';
+			get('windowsmedia_options').style.display = 'none';
+			get('realmedia_options').style.display = 'none';
+
+			if (get(data.type + '_options'))
+				get(data.type + '_options').style.display = 'block';
+
+			setVal('media_type', data.type);
+
+			setOptions('flash', 'play,loop,menu,swliveconnect,quality,scale,salign,wmode,base,flashvars');
+			setOptions('quicktime', 'loop,autoplay,cache,controller,correction,enablejavascript,kioskmode,autohref,playeveryframe,targetcache,scale,starttime,endtime,target,qtsrcchokespeed,volume,qtsrc');
+			setOptions('shockwave', 'sound,progress,autostart,swliveconnect,swvolume,swstretchstyle,swstretchhalign,swstretchvalign');
+			setOptions('windowsmedia', 'autostart,enabled,enablecontextmenu,fullscreen,invokeurls,mute,stretchtofit,windowlessvideo,balance,baseurl,captioningid,currentmarker,currentposition,defaultframe,playcount,rate,uimode,volume');
+			setOptions('realmedia', 'autostart,loop,autogotourl,center,imagestatus,maintainaspect,nojava,prefetch,shuffle,console,controls,numloop,scriptcallbacks');
+			setOptions('video', 'poster,autoplay,loop,preload,controls');
+			setOptions('global', 'id,name,vspace,hspace,bgcolor,align,width,height');
+
+			if (to_form) {
+				if (data.type == 'video') {
+					if (data.video.sources[0])
+						setVal('src', data.video.sources[0].src);
+
+					src = data.video.sources[1];
+					if (src)
+						setVal('video_altsource1', src.src);
+
+					src = data.video.sources[2];
+					if (src)
+						setVal('video_altsource2', src.src);
+				} else {
+					// Check flash vars
+					if (data.type == 'flash') {
+						tinymce.each(editor.getParam('flash_video_player_flashvars', {url : '$url', poster : '$poster'}), function(value, name) {
+							if (value == '$url')
+								data.params.src = parseQueryParams(data.params.flashvars)[name] || data.params.src;
+						});
+					}
+
+					setVal('src', data.params.src);
+				}
+			} else {
+				src = getVal("src");
+	
+				// YouTube
+				if (src.match(/youtube.com(.+)v=([^&]+)/)) {
+					data.width = 425;
+					data.height = 350;
+					data.params.frameborder = '0';
+					data.type = 'iframe';
+					src = 'http://www.youtube.com/embed/' + src.match(/v=([^&]+)/)[1];
+					setVal('src', src);
+					setVal('media_type', data.type);
+				}
+
+				// Google video
+				if (src.match(/video.google.com(.+)docid=([^&]+)/)) {
+					data.width = 425;
+					data.height = 326;
+					data.type = 'flash';
+					src = 'http://video.google.com/googleplayer.swf?docId=' + src.match(/docid=([^&]+)/)[1] + '&hl=en';
+					setVal('src', src);
+					setVal('media_type', data.type);
+				}
+
+				if (data.type == 'video') {
+					if (!data.video.sources)
+						data.video.sources = [];
+
+					data.video.sources[0] = {src : src};
+
+					src = getVal("video_altsource1");
+					if (src)
+						data.video.sources[1] = {src : src};
+
+					src = getVal("video_altsource2");
+					if (src)
+						data.video.sources[2] = {src : src};
+				} else
+					data.params.src = src;
+
+				// Set default size
+				setVal('width', data.width || 320);
+				setVal('height', data.height || 240);
+			}
+		},
+
+		dataToForm : function() {
+			this.moveStates(true);
+		},
+
+		formToData : function(field) {
+			if (field == "width" || field == "height")
+				this.changeSize(field);
+
+			if (field == 'source') {
+				this.moveStates(false, field);
+				setVal('source', this.editor.plugins.media.dataToHtml(this.data));
+				this.panel = 'source';
+			} else {
+				if (this.panel == 'source') {
+					this.data = this.editor.plugins.media.htmlToData(getVal('source'));
+					this.dataToForm();
+					this.panel = '';
+				}
+
+				this.moveStates(false, field);
+				this.preview();
+			}
+		},
+
+		beforeResize : function() {
+			this.width = parseInt(getVal('width') || "320", 10);
+			this.height = parseInt(getVal('height') || "240", 10);
+		},
+
+		changeSize : function(type) {
+			var width, height, scale, size;
+
+			if (get('constrain').checked) {
+				width = parseInt(getVal('width') || "320", 10);
+				height = parseInt(getVal('height') || "240", 10);
+
+				if (type == 'width') {
+					this.height = Math.round((width / this.width) * height);
+					setVal('height', this.height);
+				} else {
+					this.width = Math.round((height / this.height) * width);
+					setVal('width', this.width);
+				}
+			}
+		},
+
+		getMediaListHTML : function() {
+			if (typeof(tinyMCEMediaList) != "undefined" && tinyMCEMediaList.length > 0) {
+				var html = "";
+
+				html += '<select id="linklist" name="linklist" style="width: 250px" onchange="this.form.src.value=this.options[this.selectedIndex].value;Media.formToData(\'src\');">';
+				html += '<option value="">---</option>';
+
+				for (var i=0; i<tinyMCEMediaList.length; i++)
+					html += '<option value="' + tinyMCEMediaList[i][1] + '">' + tinyMCEMediaList[i][0] + '</option>';
+
+				html += '</select>';
+
+				return html;
+			}
+
+			return "";
 		}
-	}
+	};
 
-	if (f.width.value != "")
-		oldWidth = nw;
-
-	if (f.height.value != "")
-		oldHeight = nh;
-
-	// After constrain
-	pl = serializeParameters();
-
-	switch (f.media_type.options[f.media_type.selectedIndex].value) {
-		case "flash":
-			cls = 'clsid:D27CDB6E-AE6D-11cf-96B8-444553540000';
-			codebase = 'http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0';
-			type = 'application/x-shockwave-flash';
-			break;
-
-		case "shockwave":
-			cls = 'clsid:166B1BCA-3F9C-11CF-8075-444553540000';
-			codebase = 'http://download.macromedia.com/pub/shockwave/cabs/director/sw.cab#version=8,5,1,0';
-			type = 'application/x-director';
-			break;
-
-		case "qt":
-			cls = 'clsid:02BF25D5-8C17-4B23-BC80-D3488ABDDC6B';
-			codebase = 'http://www.apple.com/qtactivex/qtplugin.cab#version=6,0,2,0';
-			type = 'video/quicktime';
-			break;
-
-		case "wmp":
-			cls = ed.getParam('media_wmp6_compatible') ? 'clsid:05589FA1-C356-11CE-BF01-00AA0055595A' : 'clsid:6BF52A52-394A-11D3-B153-00C04F79FAA6';
-			codebase = 'http://activex.microsoft.com/activex/controls/mplayer/en/nsmp2inf.cab#Version=5,1,52,701';
-			type = 'application/x-mplayer2';
-			break;
-
-		case "rmp":
-			cls = 'clsid:CFCDAA03-8BE4-11cf-B84B-0020AFBBCCFA';
-			codebase = 'http://activex.microsoft.com/activex/controls/mplayer/en/nsmp2inf.cab#Version=5,1,52,701';
-			type = 'audio/x-pn-realaudio-plugin';
-			break;
-	}
-
-	if (pl == '') {
-		p.innerHTML = '';
-		return;
-	}
-
-	pl = tinyMCEPopup.editor.plugins.media._parse(pl);
-
-	if (!pl.src) {
-		p.innerHTML = '';
-		return;
-	}
-
-	pl.src = tinyMCEPopup.editor.documentBaseURI.toAbsolute(pl.src);
-	pl.width = !pl.width ? 100 : pl.width;
-	pl.height = !pl.height ? 100 : pl.height;
-	pl.id = !pl.id ? 'obj' : pl.id;
-	pl.name = !pl.name ? 'eobj' : pl.name;
-	pl.align = !pl.align ? '' : pl.align;
-
-	// Avoid annoying warning about insecure items
-	if (!tinymce.isIE || document.location.protocol != 'https:') {
-		h += '<object classid="' + cls + '" codebase="' + codebase + '" width="' + pl.width + '" height="' + pl.height + '" id="' + pl.id + '" name="' + pl.name + '" align="' + pl.align + '">';
-
-		for (n in pl) {
-			h += '<param name="' + n + '" value="' + pl[n] + '">';
-
-			// Add extra url parameter if it's an absolute URL
-			if (n == 'src' && pl[n].indexOf('://') != -1)
-				h += '<param name="url" value="' + pl[n] + '" />';
-		}
-	}
-
-	h += '<embed type="' + type + '" ';
-
-	for (n in pl)
-		h += n + '="' + pl[n] + '" ';
-
-	h += '></embed>';
-
-	// Avoid annoying warning about insecure items
-	if (!tinymce.isIE || document.location.protocol != 'https:')
-		h += '</object>';
-
-	p.innerHTML = "<!-- x --->" + h;
-}
-
-tinyMCEPopup.onInit.add(init);
+	tinyMCEPopup.requireLangPack();
+	tinyMCEPopup.onInit.add(function() {
+		Media.init();
+	});
+})();
\ No newline at end of file
diff --git a/plugins/TinyMCE/js/plugins/media/langs/en_dlg.js b/plugins/TinyMCE/js/plugins/media/langs/en_dlg.js
index 6d0a996f7d..29d26a0d41 100644
--- a/plugins/TinyMCE/js/plugins/media/langs/en_dlg.js
+++ b/plugins/TinyMCE/js/plugins/media/langs/en_dlg.js
@@ -91,7 +91,6 @@ align_bottom_right:"Bottom right",
 flv_options:"Flash video options",
 flv_scalemode:"Scale mode",
 flv_buffer:"Buffer",
-flv_startimage:"Start image",
 flv_starttime:"Start time",
 flv_defaultvolume:"Default volumne",
 flv_hiddengui:"Hidden GUI",
@@ -99,5 +98,12 @@ flv_autostart:"Auto start",
 flv_loop:"Loop",
 flv_showscalemodes:"Show scale modes",
 flv_smoothvideo:"Smooth video",
-flv_jscallback:"JS Callback"
+flv_jscallback:"JS Callback",
+html5_video_options:"HTML5 Video Options",
+altsource1:"Alternative source 1",
+altsource2:"Alternative source 2",
+preload:"Preload",
+poster:"Poster",
+
+source:"Source"
 });
\ No newline at end of file
diff --git a/plugins/TinyMCE/js/plugins/media/media.htm b/plugins/TinyMCE/js/plugins/media/media.htm
index 73a903f7c3..807a537dc4 100644
--- a/plugins/TinyMCE/js/plugins/media/media.htm
+++ b/plugins/TinyMCE/js/plugins/media/media.htm
@@ -10,12 +10,13 @@
 	<script type="text/javascript" src="../../utils/editable_selects.js"></script>
 	<link href="css/media.css" rel="stylesheet" type="text/css" />
 </head>
-<body style="display: none">
-    <form onsubmit="insertMedia();return false;" action="#">
-		<div class="tabs">
+<body style="display: none" role="application">
+<form onsubmit="Media.insert();return false;" action="#">
+		<div class="tabs" role="presentation">
 			<ul>
-				<li id="general_tab" class="current"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');generatePreview();" onmousedown="return false;">{#media_dlg.general}</a></span></li>
-				<li id="advanced_tab"><span><a href="javascript:mcTabs.displayTab('advanced_tab','advanced_panel');" onmousedown="return false;">{#media_dlg.advanced}</a></span></li>
+				<li id="general_tab" class="current" aria-controls="general_panel"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');Media.formToData();" onmousedown="return false;">{#media_dlg.general}</a></span></li>
+				<li id="advanced_tab" aria-controls="advanced_panel"><span><a href="javascript:mcTabs.displayTab('advanced_tab','advanced_panel');Media.formToData();" onmousedown="return false;">{#media_dlg.advanced}</a></span></li>
+				<li id="source_tab" aria-controls="source_panel"><span><a href="javascript:mcTabs.displayTab('source_tab','source_panel');Media.formToData('source');" onmousedown="return false;">{#media_dlg.source}</a></span></li>
 			</ul>
 		</div>
 
@@ -24,28 +25,29 @@
 				<fieldset>
 					<legend>{#media_dlg.general}</legend>
 
-					<table border="0" cellpadding="4" cellspacing="0">
+					<table role="presentation" border="0" cellpadding="4" cellspacing="0">
 							<tr>
 								<td><label for="media_type">{#media_dlg.type}</label></td>
 								<td>
-									<select id="media_type" name="media_type" onchange="changedType(this.value);generatePreview();">
+									<select id="media_type" name="media_type" onchange="Media.formToData('type');">
+										<option value="video">HTML5 Video</option>
 										<option value="flash">Flash</option>
-										<!-- <option value="flv">Flash video (FLV)</option> -->
-										<option value="qt">Quicktime</option>
+										<option value="quicktime">QuickTime</option>
 										<option value="shockwave">Shockwave</option>
-										<option value="wmp">Windows Media</option>
-										<option value="rmp">Real Media</option>
+										<option value="windowsmedia">Windows Media</option>
+										<option value="realmedia">Real Media</option>
+										<option value="iframe">Iframe</option>
 									</select>
 								</td>
 							</tr>
 							<tr>
 							<td><label for="src">{#media_dlg.file}</label></td>
-							  <td>
-									<table border="0" cellspacing="0" cellpadding="0">
-									  <tr>
-										<td><input id="src" name="src" type="text" value="" class="mceFocus" onchange="switchType(this.value);generatePreview();" /></td>
+								<td>
+									<table role="presentation" border="0" cellspacing="0" cellpadding="0">
+									<tr>
+										<td><input id="src" name="src" type="text" value="" class="mceFocus" onchange="Media.formToData();" /></td>
 										<td id="filebrowsercontainer">&nbsp;</td>
-									  </tr>
+									</tr>
 									</table>
 								</td>
 							</tr>
@@ -56,10 +58,10 @@
 							<tr>
 								<td><label for="width">{#media_dlg.size}</label></td>
 								<td>
-									<table border="0" cellpadding="0" cellspacing="0">
+									<table role="presentation" border="0" cellpadding="0" cellspacing="0">
 										<tr>
-											<td><input type="text" id="width" name="width" value="" class="size" onchange="generatePreview('width');" /> x <input type="text" id="height" name="height" value="" class="size"  onchange="generatePreview('height');" /></td>
-											<td>&nbsp;&nbsp;<input id="constrain" type="checkbox" name="constrain" class="checkbox" /></td>
+											<td><input type="text" id="width" name="width" value="" class="size" onchange="Media.formToData('width');" onfocus="Media.beforeResize();" /> x <input type="text" id="height" name="height" value="" class="size" onfocus="Media.beforeResize();" onchange="Media.formToData('height');" /></td>
+											<td>&nbsp;&nbsp;<input id="constrain" type="checkbox" name="constrain" class="checkbox" checked="checked" /></td>
 											<td><label id="constrainlabel" for="constrain">{#media_dlg.constrain_proportions}</label></td>
 										</tr>
 									</table>
@@ -78,18 +80,18 @@
 				<fieldset>
 					<legend>{#media_dlg.advanced}</legend>
 
-					<table border="0" cellpadding="4" cellspacing="0" width="100%">
+					<table role="presentation" border="0" cellpadding="4" cellspacing="0" width="100%">
 						<tr>
 							<td><label for="id">{#media_dlg.id}</label></td>
-							<td><input type="text" id="id" name="id" onchange="generatePreview();" /></td>
+							<td><input type="text" id="id" name="id" onchange="Media.formToData();" /></td>
 							<td><label for="name">{#media_dlg.name}</label></td>
-							<td><input type="text" id="name" name="name" onchange="generatePreview();" /></td>
+							<td><input type="text" id="name" name="name" onchange="Media.formToData();" /></td>
 						</tr>
 
 						<tr>
 							<td><label for="align">{#media_dlg.align}</label></td>
 							<td>
-								<select id="align" name="align" onchange="generatePreview();">
+								<select id="align" name="align" onchange="Media.formToData();">
 									<option value="">{#not_set}</option> 
 									<option value="top">{#media_dlg.align_top}</option>
 									<option value="right">{#media_dlg.align_right}</option>
@@ -100,9 +102,9 @@
 
 							<td><label for="bgcolor">{#media_dlg.bgcolor}</label></td>
 							<td>
-								<table border="0" cellpadding="0" cellspacing="0">
+								<table role="presentation" border="0" cellpadding="0" cellspacing="0">
 									<tr>
-										<td><input id="bgcolor" name="bgcolor" type="text" value="" size="9" onchange="updateColor('bgcolor_pick','bgcolor');generatePreview();" /></td>
+										<td><input id="bgcolor" name="bgcolor" type="text" value="" size="9" onchange="updateColor('bgcolor_pick','bgcolor');Media.formToData();" /></td>
 										<td id="bgcolor_pickcontainer">&nbsp;</td>
 									</tr>
 								</table>
@@ -111,9 +113,91 @@
 
 						<tr>
 							<td><label for="vspace">{#media_dlg.vspace}</label></td>
-							<td><input type="text" id="vspace" name="vspace" class="number" onchange="generatePreview();" /></td>
+							<td><input type="text" id="vspace" name="vspace" class="number" onchange="Media.formToData();" /></td>
 							<td><label for="hspace">{#media_dlg.hspace}</label></td>
-							<td><input type="text" id="hspace" name="hspace" class="number" onchange="generatePreview();" /></td>
+							<td><input type="text" id="hspace" name="hspace" class="number" onchange="Media.formToData();" /></td>
+						</tr>
+					</table>
+				</fieldset>
+
+				<fieldset id="video_options">
+					<legend>{#media_dlg.html5_video_options}</legend>
+
+					<table role="presentation">
+						<tr>
+							<td><label for="video_altsource1">{#media_dlg.altsource1}</label></td>
+							<td>
+								<table role="presentation" border="0" cellspacing="0" cellpadding="0">
+									<tr>
+										<td><input type="text" id="video_altsource1" name="video_altsource1" onchange="Media.formToData();" style="width: 240px" /></td>
+										<td id="video_altsource1_filebrowser">&nbsp;</td>
+									</tr>
+								</table>
+							</td>
+						</tr>
+
+						<tr>
+							<td><label for="video_altsource2">{#media_dlg.altsource2}</label></td>
+							<td>
+								<table role="presentation" border="0" cellspacing="0" cellpadding="0">
+									<tr>
+										<td><input type="text" id="video_altsource2" name="video_altsource2" onchange="Media.formToData();" style="width: 240px" /></td>
+										<td id="video_altsource2_filebrowser">&nbsp;</td>
+									</tr>
+								</table>
+							</td>
+						</tr>
+
+						<tr>
+							<td><label for="video_poster">{#media_dlg.poster}</label></td>
+							<td>
+								<table role="presentation" border="0" cellspacing="0" cellpadding="0">
+									<tr>
+										<td><input type="text" id="video_poster" name="video_poster" onchange="Media.formToData();" style="width: 240px" /></td>
+										<td id="video_poster_filebrowser">&nbsp;</td>
+									</tr>
+								</table>
+							</td>
+						</tr>
+					</table>
+
+					<table role="presentation" border="0" cellpadding="4" cellspacing="0">
+						<tr>
+							<td>
+								<table role="presentation" border="0" cellpadding="0" cellspacing="0">
+									<tr>
+										<td><input type="checkbox" class="checkbox" id="video_autoplay" name="video_autoplay" onchange="Media.formToData();" /></td>
+										<td><label for="video_autoplay">{#media_dlg.play}</label></td>
+									</tr>
+								</table>
+							</td>
+
+							<td>
+								<table role="presentation" border="0" cellpadding="0" cellspacing="0">
+									<tr>
+										<td><input type="checkbox" class="checkbox" id="video_loop" name="video_loop" onchange="Media.formToData();" /></td>
+										<td><label for="video_loop">{#media_dlg.loop}</label></td>
+									</tr>
+								</table>
+							</td>
+
+							<td>
+								<table role="presentation" border="0" cellpadding="0" cellspacing="0">
+									<tr>
+										<td><input type="checkbox" class="checkbox" id="video_preload" name="video_preload" onchange="Media.formToData();" /></td>
+										<td><label for="video_preload">{#media_dlg.preload}</label></td>
+									</tr>
+								</table>
+							</td>
+
+							<td>
+								<table role="presentation" border="0" cellpadding="0" cellspacing="0">
+									<tr>
+										<td><input type="checkbox" class="checkbox" id="video_controls" name="video_controls" onchange="Media.formToData();" /></td>
+										<td><label for="video_controls">{#media_dlg.controls}</label></td>
+									</tr>
+								</table>
+							</td>
 						</tr>
 					</table>
 				</fieldset>
@@ -121,11 +205,11 @@
 				<fieldset id="flash_options">
 					<legend>{#media_dlg.flash_options}</legend>
 
-					<table border="0" cellpadding="4" cellspacing="0">
+					<table role="presentation" border="0" cellpadding="4" cellspacing="0">
 						<tr>
 							<td><label for="flash_quality">{#media_dlg.quality}</label></td>
 							<td>
-								<select id="flash_quality" name="flash_quality" onchange="generatePreview();">
+								<select id="flash_quality" name="flash_quality" onchange="Media.formToData();">
 									<option value="">{#not_set}</option> 
 									<option value="high">high</option>
 									<option value="low">low</option>
@@ -137,7 +221,7 @@
 
 							<td><label for="flash_scale">{#media_dlg.scale}</label></td>
 							<td>
-								<select id="flash_scale" name="flash_scale" onchange="generatePreview();">
+								<select id="flash_scale" name="flash_scale" onchange="Media.formToData();">
 									<option value="">{#not_set}</option> 
 									<option value="showall">showall</option>
 									<option value="noborder">noborder</option>
@@ -150,7 +234,7 @@
 						<tr>
 							<td><label for="flash_wmode">{#media_dlg.wmode}</label></td>
 							<td>
-								<select id="flash_wmode" name="flash_wmode" onchange="generatePreview();">
+								<select id="flash_wmode" name="flash_wmode" onchange="Media.formToData();">
 									<option value="">{#not_set}</option> 
 									<option value="window">window</option>
 									<option value="opaque">opaque</option>
@@ -160,7 +244,7 @@
 
 							<td><label for="flash_salign">{#media_dlg.salign}</label></td>
 							<td>
-								<select id="flash_salign" name="flash_salign" onchange="generatePreview();">
+								<select id="flash_salign" name="flash_salign" onchange="Media.formToData();">
 									<option value="">{#not_set}</option> 
 									<option value="l">{#media_dlg.align_left}</option>
 									<option value="t">{#media_dlg.align_top}</option>
@@ -176,18 +260,18 @@
 
 						<tr>
 							<td colspan="2">
-								<table border="0" cellpadding="0" cellspacing="0">
+								<table role="presentation" border="0" cellpadding="0" cellspacing="0">
 									<tr>
-										<td><input type="checkbox" class="checkbox" id="flash_play" name="flash_play" checked="checked" onchange="generatePreview();" /></td>
+										<td><input type="checkbox" class="checkbox" id="flash_play" name="flash_play" checked="checked" onchange="Media.formToData();" /></td>
 										<td><label for="flash_play">{#media_dlg.play}</label></td>
 									</tr>
 								</table>
 							</td>
 
 							<td colspan="2">
-								<table border="0" cellpadding="0" cellspacing="0">
+								<table role="presentation" border="0" cellpadding="0" cellspacing="0">
 									<tr>
-										<td><input type="checkbox" class="checkbox" id="flash_loop" name="flash_loop" checked="checked" onchange="generatePreview();" /></td>
+										<td><input type="checkbox" class="checkbox" id="flash_loop" name="flash_loop" checked="checked" onchange="Media.formToData();" /></td>
 										<td><label for="flash_loop">{#media_dlg.loop}</label></td>
 									</tr>
 								</table>
@@ -196,18 +280,18 @@
 
 						<tr>
 							<td colspan="2">
-								<table border="0" cellpadding="0" cellspacing="0">
+								<table role="presentation" border="0" cellpadding="0" cellspacing="0">
 									<tr>
-										<td><input type="checkbox" class="checkbox" id="flash_menu" name="flash_menu" checked="checked" onchange="generatePreview();" /></td>
+										<td><input type="checkbox" class="checkbox" id="flash_menu" name="flash_menu" checked="checked" onchange="Media.formToData();" /></td>
 										<td><label for="flash_menu">{#media_dlg.menu}</label></td>
 									</tr>
 								</table>
 							</td>
 
 							<td colspan="2">
-								<table border="0" cellpadding="0" cellspacing="0">
+								<table role="presentation" border="0" cellpadding="0" cellspacing="0">
 									<tr>
-										<td><input type="checkbox" class="checkbox" id="flash_swliveconnect" name="flash_swliveconnect" onchange="generatePreview();" /></td>
+										<td><input type="checkbox" class="checkbox" id="flash_swliveconnect" name="flash_swliveconnect" onchange="Media.formToData();" /></td>
 										<td><label for="flash_swliveconnect">{#media_dlg.liveconnect}</label></td>
 									</tr>
 								</table>
@@ -215,134 +299,38 @@
 						</tr>
 					</table>
 
-					<table>
+					<table role="presentation">
 						<tr>
 							<td><label for="flash_base">{#media_dlg.base}</label></td>
-							<td><input type="text" id="flash_base" name="flash_base" onchange="generatePreview();" /></td>
+							<td><input type="text" id="flash_base" name="flash_base" onchange="Media.formToData();" /></td>
 						</tr>
 
 						<tr>
 							<td><label for="flash_flashvars">{#media_dlg.flashvars}</label></td>
-							<td><input type="text" id="flash_flashvars" name="flash_flashvars" onchange="generatePreview();" /></td>
+							<td><input type="text" id="flash_flashvars" name="flash_flashvars" onchange="Media.formToData();" /></td>
 						</tr>
 					</table>
 				</fieldset>
 
-				<fieldset id="flv_options">
-					<legend>{#media_dlg.flv_options}</legend>
-
-					<table border="0" cellpadding="4" cellspacing="0">
-						<tr>
-							<td><label for="flv_scalemode">{#media_dlg.flv_scalemode}</label></td>
-							<td>
-								<select id="flv_scalemode" name="flv_scalemode" onchange="generatePreview();">
-									<option value="">{#not_set}</option> 
-									<option value="none">none</option>
-									<option value="double">double</option>
-									<option value="full">full</option>
-								</select>
-							</td>
-
-							<td><label for="flv_buffer">{#media_dlg.flv_buffer}</label></td>
-							<td><input type="text" id="flv_buffer" name="flv_buffer" onchange="generatePreview();" /></td>
-						</tr>
-
-						<tr>
-							<td><label for="flv_startimage">{#media_dlg.flv_startimage}</label></td>
-							<td><input type="text" id="flv_startimage" name="flv_startimage" onchange="generatePreview();" /></td>
-
-							<td><label for="flv_starttime">{#media_dlg.flv_starttime}</label></td>
-							<td><input type="text" id="flv_starttime" name="flv_starttime" onchange="generatePreview();" /></td>
-						</tr>
-
-						<tr>
-							<td><label for="flv_defaultvolume">{#media_dlg.flv_defaultvolume}</label></td>
-							<td><input type="text" id="flv_defaultvolume" name="flv_defaultvolume" onchange="generatePreview();" /></td>
-
-
-						</tr>
-
-						<tr>
-							<td colspan="2">
-								<table border="0" cellpadding="0" cellspacing="0">
-									<tr>
-										<td><input type="checkbox" class="checkbox" id="flv_hiddengui" name="flv_hiddengui" checked="checked" onchange="generatePreview();" /></td>
-										<td><label for="flv_hiddengui">{#media_dlg.flv_hiddengui}</label></td>
-									</tr>
-								</table>
-							</td>
-
-							<td colspan="2">
-								<table border="0" cellpadding="0" cellspacing="0">
-									<tr>
-										<td><input type="checkbox" class="checkbox" id="flv_autostart" name="flv_autostart" checked="checked" onchange="generatePreview();" /></td>
-										<td><label for="flv_autostart">{#media_dlg.flv_autostart}</label></td>
-									</tr>
-								</table>
-							</td>
-						</tr>
-
-						<tr>
-							<td colspan="2">
-								<table border="0" cellpadding="0" cellspacing="0">
-									<tr>
-										<td><input type="checkbox" class="checkbox" id="flv_loop" name="flv_loop" checked="checked" onchange="generatePreview();" /></td>
-										<td><label for="flv_loop">{#media_dlg.flv_loop}</label></td>
-									</tr>
-								</table>
-							</td>
-
-							<td colspan="2">
-								<table border="0" cellpadding="0" cellspacing="0">
-									<tr>
-										<td><input type="checkbox" class="checkbox" id="flv_showscalemodes" name="flv_showscalemodes" onchange="generatePreview();" /></td>
-										<td><label for="flv_showscalemodes">{#media_dlg.flv_showscalemodes}</label></td>
-									</tr>
-								</table>
-							</td>
-						</tr>
-
-						<tr>
-							<td colspan="2">
-								<table border="0" cellpadding="0" cellspacing="0">
-									<tr>
-										<td><input type="checkbox" class="checkbox" id="flv_smoothvideo" name="flash_flv_flv_smoothvideosmoothvideo" checked="checked" onchange="generatePreview();" /></td>
-										<td><label for="flv_smoothvideo">{#media_dlg.flv_smoothvideo}</label></td>
-									</tr>
-								</table>
-							</td>
-
-							<td colspan="2">
-								<table border="0" cellpadding="0" cellspacing="0">
-									<tr>
-										<td><input type="checkbox" class="checkbox" id="flv_jscallback" name="flv_jscallback" onchange="generatePreview();" /></td>
-										<td><label for="flv_jscallback">{#media_dlg.flv_jscallback}</label></td>
-									</tr>
-								</table>
-							</td>
-						</tr>
-					</table>
-				</fieldset>
-
-				<fieldset id="qt_options">
+				<fieldset id="quicktime_options">
 					<legend>{#media_dlg.qt_options}</legend>
 
-					<table border="0" cellpadding="4" cellspacing="0">
+					<table role="presentation" border="0" cellpadding="4" cellspacing="0">
 						<tr>
 							<td colspan="2">
-								<table border="0" cellpadding="0" cellspacing="0">
+								<table role="presentation" border="0" cellpadding="0" cellspacing="0">
 									<tr>
-										<td><input type="checkbox" class="checkbox" id="qt_loop" name="qt_loop" onchange="generatePreview();" /></td>
-										<td><label for="qt_loop">{#media_dlg.loop}</label></td>
+										<td><input type="checkbox" class="checkbox" id="quicktime_loop" name="quicktime_loop" onchange="Media.formToData();" /></td>
+										<td><label for="quicktime_loop">{#media_dlg.loop}</label></td>
 									</tr>
 								</table>
 							</td>
 
 							<td colspan="2">
-								<table border="0" cellpadding="0" cellspacing="0">
+								<table role="presentation" border="0" cellpadding="0" cellspacing="0">
 									<tr>
-										<td><input type="checkbox" class="checkbox" id="qt_autoplay" name="qt_autoplay" checked="checked" onchange="generatePreview();" /></td>
-										<td><label for="qt_autoplay">{#media_dlg.play}</label></td>
+										<td><input type="checkbox" class="checkbox" id="quicktime_autoplay" name="quicktime_autoplay" checked="checked" onchange="Media.formToData();" /></td>
+										<td><label for="quicktime_autoplay">{#media_dlg.play}</label></td>
 									</tr>
 								</table>
 							</td>
@@ -350,19 +338,19 @@
 
 						<tr>
 							<td colspan="2">
-								<table border="0" cellpadding="0" cellspacing="0">
+								<table role="presentation" border="0" cellpadding="0" cellspacing="0">
 									<tr>
-										<td><input type="checkbox" class="checkbox" id="qt_cache" name="qt_cache" onchange="generatePreview();" /></td>
-										<td><label for="qt_cache">{#media_dlg.cache}</label></td>
+										<td><input type="checkbox" class="checkbox" id="quicktime_cache" name="quicktime_cache" onchange="Media.formToData();" /></td>
+										<td><label for="quicktime_cache">{#media_dlg.cache}</label></td>
 									</tr>
 								</table>
 							</td>
 
 							<td colspan="2">
-								<table border="0" cellpadding="0" cellspacing="0">
+								<table role="presentation" border="0" cellpadding="0" cellspacing="0">
 									<tr>
-										<td><input type="checkbox" class="checkbox" id="qt_controller" name="qt_controller" checked="checked" onchange="generatePreview();" /></td>
-										<td><label for="qt_controller">{#media_dlg.controller}</label></td>
+										<td><input type="checkbox" class="checkbox" id="quicktime_controller" name="quicktime_controller" checked="checked" onchange="Media.formToData();" /></td>
+										<td><label for="quicktime_controller">{#media_dlg.controller}</label></td>
 									</tr>
 								</table>
 							</td>
@@ -370,19 +358,19 @@
 
 						<tr>
 							<td colspan="2">
-								<table border="0" cellpadding="0" cellspacing="0">
+								<table role="presentation" border="0" cellpadding="0" cellspacing="0">
 									<tr>
-										<td><input type="checkbox" class="checkbox" id="qt_correction" name="qt_correction" onchange="generatePreview();" /></td>
-										<td><label for="qt_correction">{#media_dlg.correction}</label></td>
+										<td><input type="checkbox" class="checkbox" id="quicktime_correction" name="quicktime_correction" onchange="Media.formToData();" /></td>
+										<td><label for="quicktime_correction">{#media_dlg.correction}</label></td>
 									</tr>
 								</table>
 							</td>
 
 							<td colspan="2">
-								<table border="0" cellpadding="0" cellspacing="0">
+								<table role="presentation" border="0" cellpadding="0" cellspacing="0">
 									<tr>
-										<td><input type="checkbox" class="checkbox" id="qt_enablejavascript" name="qt_enablejavascript" onchange="generatePreview();" /></td>
-										<td><label for="qt_enablejavascript">{#media_dlg.enablejavascript}</label></td>
+										<td><input type="checkbox" class="checkbox" id="quicktime_enablejavascript" name="quicktime_enablejavascript" onchange="Media.formToData();" /></td>
+										<td><label for="quicktime_enablejavascript">{#media_dlg.enablejavascript}</label></td>
 									</tr>
 								</table>
 							</td>
@@ -390,19 +378,19 @@
 
 						<tr>
 							<td colspan="2">
-								<table border="0" cellpadding="0" cellspacing="0">
+								<table role="presentation" border="0" cellpadding="0" cellspacing="0">
 									<tr>
-										<td><input type="checkbox" class="checkbox" id="qt_kioskmode" name="qt_kioskmode" onchange="generatePreview();" /></td>
-										<td><label for="qt_kioskmode">{#media_dlg.kioskmode}</label></td>
+										<td><input type="checkbox" class="checkbox" id="quicktime_kioskmode" name="quicktime_kioskmode" onchange="Media.formToData();" /></td>
+										<td><label for="quicktime_kioskmode">{#media_dlg.kioskmode}</label></td>
 									</tr>
 								</table>
 							</td>
 
 							<td colspan="2">
-								<table border="0" cellpadding="0" cellspacing="0">
+								<table role="presentation" border="0" cellpadding="0" cellspacing="0">
 									<tr>
-										<td><input type="checkbox" class="checkbox" id="qt_autohref" name="qt_autohref" onchange="generatePreview();" /></td>
-										<td><label for="qt_autohref">{#media_dlg.autohref}</label></td>
+										<td><input type="checkbox" class="checkbox" id="quicktime_autohref" name="quicktime_autohref" onchange="Media.formToData();" /></td>
+										<td><label for="quicktime_autohref">{#media_dlg.autohref}</label></td>
 									</tr>
 								</table>
 							</td>
@@ -410,27 +398,27 @@
 
 						<tr>
 							<td colspan="2">
-								<table border="0" cellpadding="0" cellspacing="0">
+								<table role="presentation" border="0" cellpadding="0" cellspacing="0">
 									<tr>
-										<td><input type="checkbox" class="checkbox" id="qt_playeveryframe" name="qt_playeveryframe" onchange="generatePreview();" /></td>
-										<td><label for="qt_playeveryframe">{#media_dlg.playeveryframe}</label></td>
+										<td><input type="checkbox" class="checkbox" id="quicktime_playeveryframe" name="quicktime_playeveryframe" onchange="Media.formToData();" /></td>
+										<td><label for="quicktime_playeveryframe">{#media_dlg.playeveryframe}</label></td>
 									</tr>
 								</table>
 							</td>
 
 							<td colspan="2">
-								<table border="0" cellpadding="0" cellspacing="0">
+								<table role="presentation" border="0" cellpadding="0" cellspacing="0">
 									<tr>
-										<td><input type="checkbox" class="checkbox" id="qt_targetcache" name="qt_targetcache" onchange="generatePreview();" /></td>
-										<td><label for="qt_targetcache">{#media_dlg.targetcache}</label></td>
+										<td><input type="checkbox" class="checkbox" id="quicktime_targetcache" name="quicktime_targetcache" onchange="Media.formToData();" /></td>
+										<td><label for="quicktime_targetcache">{#media_dlg.targetcache}</label></td>
 									</tr>
 								</table>
 							</td>
 						</tr>
 
 						<tr>
-							<td><label for="qt_scale">{#media_dlg.scale}</label></td>
-							<td><select id="qt_scale" name="qt_scale" class="mceEditableSelect" onchange="generatePreview();">
+							<td><label for="quicktime_scale">{#media_dlg.scale}</label></td>
+							<td><select id="quicktime_scale" name="quicktime_scale" class="mceEditableSelect" onchange="Media.formToData();">
 									<option value="">{#not_set}</option> 
 									<option value="tofit">tofit</option>
 									<option value="aspect">aspect</option>
@@ -441,62 +429,62 @@
 						</tr>
 
 						<tr>
-							<td><label for="qt_starttime">{#media_dlg.starttime}</label></td>
-							<td><input type="text" id="qt_starttime" name="qt_starttime" onchange="generatePreview();" /></td>
+							<td><label for="quicktime_starttime">{#media_dlg.starttime}</label></td>
+							<td><input type="text" id="quicktime_starttime" name="quicktime_starttime" onchange="Media.formToData();" /></td>
 
-							<td><label for="qt_endtime">{#media_dlg.endtime}</label></td>
-							<td><input type="text" id="qt_endtime" name="qt_endtime" onchange="generatePreview();" /></td>
+							<td><label for="quicktime_endtime">{#media_dlg.endtime}</label></td>
+							<td><input type="text" id="quicktime_endtime" name="quicktime_endtime" onchange="Media.formToData();" /></td>
 						</tr>
 
 						<tr>
-							<td><label for="qt_target">{#media_dlg.target}</label></td>
-							<td><input type="text" id="qt_target" name="qt_target" onchange="generatePreview();" /></td>
+							<td><label for="quicktime_target">{#media_dlg.target}</label></td>
+							<td><input type="text" id="quicktime_target" name="quicktime_target" onchange="Media.formToData();" /></td>
 
-							<td><label for="qt_href">{#media_dlg.href}</label></td>
-							<td><input type="text" id="qt_href" name="qt_href" onchange="generatePreview();" /></td>
+							<td><label for="quicktime_href">{#media_dlg.href}</label></td>
+							<td><input type="text" id="quicktime_href" name="quicktime_href" onchange="Media.formToData();" /></td>
 						</tr>
 
 						<tr>
-							<td><label for="qt_qtsrcchokespeed">{#media_dlg.qtsrcchokespeed}</label></td>
-							<td><input type="text" id="qt_qtsrcchokespeed" name="qt_qtsrcchokespeed" onchange="generatePreview();" /></td>
+							<td><label for="quicktime_qtsrcchokespeed">{#media_dlg.qtsrcchokespeed}</label></td>
+							<td><input type="text" id="quicktime_qtsrcchokespeed" name="quicktime_qtsrcchokespeed" onchange="Media.formToData();" /></td>
 
-							<td><label for="qt_volume">{#media_dlg.volume}</label></td>
-							<td><input type="text" id="qt_volume" name="qt_volume" onchange="generatePreview();" /></td>
+							<td><label for="quicktime_volume">{#media_dlg.volume}</label></td>
+							<td><input type="text" id="quicktime_volume" name="quicktime_volume" onchange="Media.formToData();" /></td>
 						</tr>
 
 						<tr>
-							<td><label for="qt_qtsrc">{#media_dlg.qtsrc}</label></td>
+							<td><label for="quicktime_qtsrc">{#media_dlg.qtsrc}</label></td>
 							<td colspan="4">
-							<table border="0" cellspacing="0" cellpadding="0">
-								  <tr>
-									<td><input type="text" id="qt_qtsrc" name="qt_qtsrc" onchange="generatePreview();" /></td>
-									<td id="qtsrcfilebrowsercontainer">&nbsp;</td>
-								  </tr>
-							</table>
+								<table role="presentation" border="0" cellspacing="0" cellpadding="0">
+									<tr>
+										<td><input type="text" id="quicktime_qtsrc" name="quicktime_qtsrc" onchange="Media.formToData();" /></td>
+										<td id="qtsrcfilebrowsercontainer">&nbsp;</td>
+									</tr>
+								</table>
 							</td>
 						</tr>
 					</table>
 				</fieldset>
 
-				<fieldset id="wmp_options">
+				<fieldset id="windowsmedia_options">
 					<legend>{#media_dlg.wmp_options}</legend>
 
-					<table border="0" cellpadding="4" cellspacing="0">
+					<table role="presentation" border="0" cellpadding="4" cellspacing="0">
 						<tr>
 							<td colspan="2">
-								<table border="0" cellpadding="0" cellspacing="0">
+								<table role="presentation" border="0" cellpadding="0" cellspacing="0">
 									<tr>
-										<td><input type="checkbox" class="checkbox" id="wmp_autostart" name="wmp_autostart" checked="checked" onchange="generatePreview();" /></td>
-										<td><label for="wmp_autostart">{#media_dlg.autostart}</label></td>
+										<td><input type="checkbox" class="checkbox" id="windowsmedia_autostart" name="windowsmedia_autostart" checked="checked" onchange="Media.formToData();" /></td>
+										<td><label for="windowsmedia_autostart">{#media_dlg.autostart}</label></td>
 									</tr>
 								</table>
 							</td>
 
 							<td colspan="2">
-								<table border="0" cellpadding="0" cellspacing="0">
+								<table role="presentation" border="0" cellpadding="0" cellspacing="0">
 									<tr>
-										<td><input type="checkbox" class="checkbox" id="wmp_enabled" name="wmp_enabled" onchange="generatePreview();" /></td>
-										<td><label for="wmp_enabled">{#media_dlg.enabled}</label></td>
+										<td><input type="checkbox" class="checkbox" id="windowsmedia_enabled" name="windowsmedia_enabled" onchange="Media.formToData();" /></td>
+										<td><label for="windowsmedia_enabled">{#media_dlg.enabled}</label></td>
 									</tr>
 								</table>
 							</td>
@@ -504,19 +492,19 @@
 
 						<tr>
 							<td colspan="2">
-								<table border="0" cellpadding="0" cellspacing="0">
+								<table role="presentation" border="0" cellpadding="0" cellspacing="0">
 									<tr>
-										<td><input type="checkbox" class="checkbox" id="wmp_enablecontextmenu" name="wmp_enablecontextmenu" checked="checked" onchange="generatePreview();" /></td>
-										<td><label for="wmp_enablecontextmenu">{#media_dlg.menu}</label></td>
+										<td><input type="checkbox" class="checkbox" id="windowsmedia_enablecontextmenu" name="windowsmedia_enablecontextmenu" checked="checked" onchange="Media.formToData();" /></td>
+										<td><label for="windowsmedia_enablecontextmenu">{#media_dlg.menu}</label></td>
 									</tr>
 								</table>
 							</td>
 
 							<td colspan="2">
-								<table border="0" cellpadding="0" cellspacing="0">
+								<table role="presentation" border="0" cellpadding="0" cellspacing="0">
 									<tr>
-										<td><input type="checkbox" class="checkbox" id="wmp_fullscreen" name="wmp_fullscreen" onchange="generatePreview();" /></td>
-										<td><label for="wmp_fullscreen">{#media_dlg.fullscreen}</label></td>
+										<td><input type="checkbox" class="checkbox" id="windowsmedia_fullscreen" name="windowsmedia_fullscreen" onchange="Media.formToData();" /></td>
+										<td><label for="windowsmedia_fullscreen">{#media_dlg.fullscreen}</label></td>
 									</tr>
 								</table>
 							</td>
@@ -524,19 +512,19 @@
 
 						<tr>
 							<td colspan="2">
-								<table border="0" cellpadding="0" cellspacing="0">
+								<table role="presentation" border="0" cellpadding="0" cellspacing="0">
 									<tr>
-										<td><input type="checkbox" class="checkbox" id="wmp_invokeurls" name="wmp_invokeurls" checked="checked" onchange="generatePreview();" /></td>
-										<td><label for="wmp_invokeurls">{#media_dlg.invokeurls}</label></td>
+										<td><input type="checkbox" class="checkbox" id="windowsmedia_invokeurls" name="windowsmedia_invokeurls" checked="checked" onchange="Media.formToData();" /></td>
+										<td><label for="windowsmedia_invokeurls">{#media_dlg.invokeurls}</label></td>
 									</tr>
 								</table>
 							</td>
 
 							<td colspan="2">
-								<table border="0" cellpadding="0" cellspacing="0">
+								<table role="presentation" border="0" cellpadding="0" cellspacing="0">
 									<tr>
-										<td><input type="checkbox" class="checkbox" id="wmp_mute" name="wmp_mute" onchange="generatePreview();" /></td>
-										<td><label for="wmp_mute">{#media_dlg.mute}</label></td>
+										<td><input type="checkbox" class="checkbox" id="windowsmedia_mute" name="windowsmedia_mute" onchange="Media.formToData();" /></td>
+										<td><label for="windowsmedia_mute">{#media_dlg.mute}</label></td>
 									</tr>
 								</table>
 							</td>
@@ -544,86 +532,86 @@
 
 						<tr>
 							<td colspan="2">
-								<table border="0" cellpadding="0" cellspacing="0">
+								<table role="presentation" border="0" cellpadding="0" cellspacing="0">
 									<tr>
-										<td><input type="checkbox" class="checkbox" id="wmp_stretchtofit" name="wmp_stretchtofit" onchange="generatePreview();" /></td>
-										<td><label for="wmp_stretchtofit">{#media_dlg.stretchtofit}</label></td>
+										<td><input type="checkbox" class="checkbox" id="windowsmedia_stretchtofit" name="windowsmedia_stretchtofit" onchange="Media.formToData();" /></td>
+										<td><label for="windowsmedia_stretchtofit">{#media_dlg.stretchtofit}</label></td>
 									</tr>
 								</table>
 							</td>
 
 							<td colspan="2">
-								<table border="0" cellpadding="0" cellspacing="0">
+								<table role="presentation" border="0" cellpadding="0" cellspacing="0">
 									<tr>
-										<td><input type="checkbox" class="checkbox" id="wmp_windowlessvideo" name="wmp_windowlessvideo" onchange="generatePreview();" /></td>
-										<td><label for="wmp_windowlessvideo">{#media_dlg.windowlessvideo}</label></td>
+										<td><input type="checkbox" class="checkbox" id="windowsmedia_windowlessvideo" name="windowsmedia_windowlessvideo" onchange="Media.formToData();" /></td>
+										<td><label for="windowsmedia_windowlessvideo">{#media_dlg.windowlessvideo}</label></td>
 									</tr>
 								</table>
 							</td>
 						</tr>
 
 						<tr>
-							<td><label for="wmp_balance">{#media_dlg.balance}</label></td>
-							<td><input type="text" id="wmp_balance" name="wmp_balance" onchange="generatePreview();" /></td>
+							<td><label for="windowsmedia_balance">{#media_dlg.balance}</label></td>
+							<td><input type="text" id="windowsmedia_balance" name="windowsmedia_balance" onchange="Media.formToData();" /></td>
 
-							<td><label for="wmp_baseurl">{#media_dlg.baseurl}</label></td>
-							<td><input type="text" id="wmp_baseurl" name="wmp_baseurl" onchange="generatePreview();" /></td>
+							<td><label for="windowsmedia_baseurl">{#media_dlg.baseurl}</label></td>
+							<td><input type="text" id="windowsmedia_baseurl" name="windowsmedia_baseurl" onchange="Media.formToData();" /></td>
 						</tr>
 
 						<tr>
-							<td><label for="wmp_captioningid">{#media_dlg.captioningid}</label></td>
-							<td><input type="text" id="wmp_captioningid" name="wmp_captioningid" onchange="generatePreview();" /></td>
+							<td><label for="windowsmedia_captioningid">{#media_dlg.captioningid}</label></td>
+							<td><input type="text" id="windowsmedia_captioningid" name="windowsmedia_captioningid" onchange="Media.formToData();" /></td>
 
-							<td><label for="wmp_currentmarker">{#media_dlg.currentmarker}</label></td>
-							<td><input type="text" id="wmp_currentmarker" name="wmp_currentmarker" onchange="generatePreview();" /></td>
+							<td><label for="windowsmedia_currentmarker">{#media_dlg.currentmarker}</label></td>
+							<td><input type="text" id="windowsmedia_currentmarker" name="windowsmedia_currentmarker" onchange="Media.formToData();" /></td>
 						</tr>
 
 						<tr>
-							<td><label for="wmp_currentposition">{#media_dlg.currentposition}</label></td>
-							<td><input type="text" id="wmp_currentposition" name="wmp_currentposition" onchange="generatePreview();" /></td>
+							<td><label for="windowsmedia_currentposition">{#media_dlg.currentposition}</label></td>
+							<td><input type="text" id="windowsmedia_currentposition" name="windowsmedia_currentposition" onchange="Media.formToData();" /></td>
 
-							<td><label for="wmp_defaultframe">{#media_dlg.defaultframe}</label></td>
-							<td><input type="text" id="wmp_defaultframe" name="wmp_defaultframe" onchange="generatePreview();" /></td>
+							<td><label for="windowsmedia_defaultframe">{#media_dlg.defaultframe}</label></td>
+							<td><input type="text" id="windowsmedia_defaultframe" name="windowsmedia_defaultframe" onchange="Media.formToData();" /></td>
 						</tr>
 
 						<tr>
-							<td><label for="wmp_playcount">{#media_dlg.playcount}</label></td>
-							<td><input type="text" id="wmp_playcount" name="wmp_playcount" onchange="generatePreview();" /></td>
+							<td><label for="windowsmedia_playcount">{#media_dlg.playcount}</label></td>
+							<td><input type="text" id="windowsmedia_playcount" name="windowsmedia_playcount" onchange="Media.formToData();" /></td>
 
-							<td><label for="wmp_rate">{#media_dlg.rate}</label></td>
-							<td><input type="text" id="wmp_rate" name="wmp_rate" onchange="generatePreview();" /></td>
+							<td><label for="windowsmedia_rate">{#media_dlg.rate}</label></td>
+							<td><input type="text" id="windowsmedia_rate" name="windowsmedia_rate" onchange="Media.formToData();" /></td>
 						</tr>
 
 						<tr>
-							<td><label for="wmp_uimode">{#media_dlg.uimode}</label></td>
-							<td><input type="text" id="wmp_uimode" name="wmp_uimode" onchange="generatePreview();" /></td>
+							<td><label for="windowsmedia_uimode">{#media_dlg.uimode}</label></td>
+							<td><input type="text" id="windowsmedia_uimode" name="windowsmedia_uimode" onchange="Media.formToData();" /></td>
 
-							<td><label for="wmp_volume">{#media_dlg.volume}</label></td>
-							<td><input type="text" id="wmp_volume" name="wmp_volume" onchange="generatePreview();" /></td>
+							<td><label for="windowsmedia_volume">{#media_dlg.volume}</label></td>
+							<td><input type="text" id="windowsmedia_volume" name="windowsmedia_volume" onchange="Media.formToData();" /></td>
 						</tr>
 
 					</table>
 				</fieldset>
 
-				<fieldset id="rmp_options">
+				<fieldset id="realmedia_options">
 					<legend>{#media_dlg.rmp_options}</legend>
 
-					<table border="0" cellpadding="4" cellspacing="0">
+					<table role="presentation" border="0" cellpadding="4" cellspacing="0">
 						<tr>
 							<td colspan="2">
-								<table border="0" cellpadding="0" cellspacing="0">
+								<table role="presentation" border="0" cellpadding="0" cellspacing="0">
 									<tr>
-										<td><input type="checkbox" class="checkbox" id="rmp_autostart" name="rmp_autostart" onchange="generatePreview();" /></td>
-										<td><label for="rmp_autostart">{#media_dlg.autostart}</label></td>
+										<td><input type="checkbox" class="checkbox" id="realmedia_autostart" name="realmedia_autostart" onchange="Media.formToData();" /></td>
+										<td><label for="realmedia_autostart">{#media_dlg.autostart}</label></td>
 									</tr>
 								</table>
 							</td>
 
 							<td colspan="2">
-								<table border="0" cellpadding="0" cellspacing="0">
+								<table role="presentation" border="0" cellpadding="0" cellspacing="0">
 									<tr>
-										<td><input type="checkbox" class="checkbox" id="rmp_loop" name="rmp_loop" onchange="generatePreview();" /></td>
-										<td><label for="rmp_loop">{#media_dlg.loop}</label></td>
+										<td><input type="checkbox" class="checkbox" id="realmedia_loop" name="realmedia_loop" onchange="Media.formToData();" /></td>
+										<td><label for="realmedia_loop">{#media_dlg.loop}</label></td>
 									</tr>
 								</table>
 							</td>
@@ -631,19 +619,19 @@
 
 						<tr>
 							<td colspan="2">
-								<table border="0" cellpadding="0" cellspacing="0">
+								<table role="presentation" border="0" cellpadding="0" cellspacing="0">
 									<tr>
-										<td><input type="checkbox" class="checkbox" id="rmp_autogotourl" name="rmp_autogotourl" checked="checked" onchange="generatePreview();" /></td>
-										<td><label for="rmp_autogotourl">{#media_dlg.autogotourl}</label></td>
+										<td><input type="checkbox" class="checkbox" id="realmedia_autogotourl" name="realmedia_autogotourl" checked="checked" onchange="Media.formToData();" /></td>
+										<td><label for="realmedia_autogotourl">{#media_dlg.autogotourl}</label></td>
 									</tr>
 								</table>
 							</td>
 
 							<td colspan="2">
-								<table border="0" cellpadding="0" cellspacing="0">
+								<table role="presentation" border="0" cellpadding="0" cellspacing="0">
 									<tr>
-										<td><input type="checkbox" class="checkbox" id="rmp_center" name="rmp_center" onchange="generatePreview();" /></td>
-										<td><label for="rmp_center">{#media_dlg.center}</label></td>
+										<td><input type="checkbox" class="checkbox" id="realmedia_center" name="realmedia_center" onchange="Media.formToData();" /></td>
+										<td><label for="realmedia_center">{#media_dlg.center}</label></td>
 									</tr>
 								</table>
 							</td>
@@ -651,19 +639,19 @@
 
 						<tr>
 							<td colspan="2">
-								<table border="0" cellpadding="0" cellspacing="0">
+								<table role="presentation" border="0" cellpadding="0" cellspacing="0">
 									<tr>
-										<td><input type="checkbox" class="checkbox" id="rmp_imagestatus" name="rmp_imagestatus" checked="checked" onchange="generatePreview();" /></td>
-										<td><label for="rmp_imagestatus">{#media_dlg.imagestatus}</label></td>
+										<td><input type="checkbox" class="checkbox" id="realmedia_imagestatus" name="realmedia_imagestatus" checked="checked" onchange="Media.formToData();" /></td>
+										<td><label for="realmedia_imagestatus">{#media_dlg.imagestatus}</label></td>
 									</tr>
 								</table>
 							</td>
 
 							<td colspan="2">
-								<table border="0" cellpadding="0" cellspacing="0">
+								<table role="presentation" border="0" cellpadding="0" cellspacing="0">
 									<tr>
-										<td><input type="checkbox" class="checkbox" id="rmp_maintainaspect" name="rmp_maintainaspect" onchange="generatePreview();" /></td>
-										<td><label for="rmp_maintainaspect">{#media_dlg.maintainaspect}</label></td>
+										<td><input type="checkbox" class="checkbox" id="realmedia_maintainaspect" name="realmedia_maintainaspect" onchange="Media.formToData();" /></td>
+										<td><label for="realmedia_maintainaspect">{#media_dlg.maintainaspect}</label></td>
 									</tr>
 								</table>
 							</td>
@@ -671,19 +659,19 @@
 
 						<tr>
 							<td colspan="2">
-								<table border="0" cellpadding="0" cellspacing="0">
+								<table role="presentation" border="0" cellpadding="0" cellspacing="0">
 									<tr>
-										<td><input type="checkbox" class="checkbox" id="rmp_nojava" name="rmp_nojava" onchange="generatePreview();" /></td>
-										<td><label for="rmp_nojava">{#media_dlg.nojava}</label></td>
+										<td><input type="checkbox" class="checkbox" id="realmedia_nojava" name="realmedia_nojava" onchange="Media.formToData();" /></td>
+										<td><label for="realmedia_nojava">{#media_dlg.nojava}</label></td>
 									</tr>
 								</table>
 							</td>
 
 							<td colspan="2">
-								<table border="0" cellpadding="0" cellspacing="0">
+								<table role="presentation" border="0" cellpadding="0" cellspacing="0">
 									<tr>
-										<td><input type="checkbox" class="checkbox" id="rmp_prefetch" name="rmp_prefetch" onchange="generatePreview();" /></td>
-										<td><label for="rmp_prefetch">{#media_dlg.prefetch}</label></td>
+										<td><input type="checkbox" class="checkbox" id="realmedia_prefetch" name="realmedia_prefetch" onchange="Media.formToData();" /></td>
+										<td><label for="realmedia_prefetch">{#media_dlg.prefetch}</label></td>
 									</tr>
 								</table>
 							</td>
@@ -691,10 +679,10 @@
 
 						<tr>
 							<td colspan="2">
-								<table border="0" cellpadding="0" cellspacing="0">
+								<table role="presentation" border="0" cellpadding="0" cellspacing="0">
 									<tr>
-										<td><input type="checkbox" class="checkbox" id="rmp_shuffle" name="rmp_shuffle" onchange="generatePreview();" /></td>
-										<td><label for="rmp_shuffle">{#media_dlg.shuffle}</label></td>
+										<td><input type="checkbox" class="checkbox" id="realmedia_shuffle" name="realmedia_shuffle" onchange="Media.formToData();" /></td>
+										<td><label for="realmedia_shuffle">{#media_dlg.shuffle}</label></td>
 									</tr>
 								</table>
 							</td>
@@ -705,19 +693,19 @@
 						</tr>
 
 						<tr>
-							<td><label for="rmp_console">{#media_dlg.console}</label></td>
-							<td><input type="text" id="rmp_console" name="rmp_console" onchange="generatePreview();" /></td>
+							<td><label for="realmedia_console">{#media_dlg.console}</label></td>
+							<td><input type="text" id="realmedia_console" name="realmedia_console" onchange="Media.formToData();" /></td>
 
-							<td><label for="rmp_controls">{#media_dlg.controls}</label></td>
-							<td><input type="text" id="rmp_controls" name="rmp_controls" onchange="generatePreview();" /></td>
+							<td><label for="realmedia_controls">{#media_dlg.controls}</label></td>
+							<td><input type="text" id="realmedia_controls" name="realmedia_controls" onchange="Media.formToData();" /></td>
 						</tr>
 
 						<tr>
-							<td><label for="rmp_numloop">{#media_dlg.numloop}</label></td>
-							<td><input type="text" id="rmp_numloop" name="rmp_numloop" onchange="generatePreview();" /></td>
+							<td><label for="realmedia_numloop">{#media_dlg.numloop}</label></td>
+							<td><input type="text" id="realmedia_numloop" name="realmedia_numloop" onchange="Media.formToData();" /></td>
 
-							<td><label for="rmp_scriptcallbacks">{#media_dlg.scriptcallbacks}</label></td>
-							<td><input type="text" id="rmp_scriptcallbacks" name="rmp_scriptcallbacks" onchange="generatePreview();" /></td>
+							<td><label for="realmedia_scriptcallbacks">{#media_dlg.scriptcallbacks}</label></td>
+							<td><input type="text" id="realmedia_scriptcallbacks" name="realmedia_scriptcallbacks" onchange="Media.formToData();" /></td>
 						</tr>
 					</table>
 				</fieldset>
@@ -725,11 +713,11 @@
 				<fieldset id="shockwave_options">
 					<legend>{#media_dlg.shockwave_options}</legend>
 
-					<table border="0" cellpadding="4" cellspacing="0">
+					<table role="presentation" border="0" cellpadding="4" cellspacing="0">
 						<tr>
 							<td><label for="shockwave_swstretchstyle">{#media_dlg.swstretchstyle}</label></td>
 							<td>
-								<select id="shockwave_swstretchstyle" name="shockwave_swstretchstyle" onchange="generatePreview();">
+								<select id="shockwave_swstretchstyle" name="shockwave_swstretchstyle" onchange="Media.formToData();">
 									<option value="none">{#not_set}</option>
 									<option value="meet">Meet</option>
 									<option value="fill">Fill</option>
@@ -738,13 +726,13 @@
 							</td>
 
 							<td><label for="shockwave_swvolume">{#media_dlg.volume}</label></td>
-							<td><input type="text" id="shockwave_swvolume" name="shockwave_swvolume" onchange="generatePreview();" /></td>
+							<td><input type="text" id="shockwave_swvolume" name="shockwave_swvolume" onchange="Media.formToData();" /></td>
 						</tr>
 
 						<tr>
 							<td><label for="shockwave_swstretchhalign">{#media_dlg.swstretchhalign}</label></td>
 							<td>
-								<select id="shockwave_swstretchhalign" name="shockwave_swstretchhalign" onchange="generatePreview();">
+								<select id="shockwave_swstretchhalign" name="shockwave_swstretchhalign" onchange="Media.formToData();">
 									<option value="none">{#not_set}</option>
 									<option value="left">{#media_dlg.align_left}</option>
 									<option value="center">{#media_dlg.align_center}</option>
@@ -754,7 +742,7 @@
 
 							<td><label for="shockwave_swstretchvalign">{#media_dlg.swstretchvalign}</label></td>
 							<td>
-								<select id="shockwave_swstretchvalign" name="shockwave_swstretchvalign" onchange="generatePreview();">
+								<select id="shockwave_swstretchvalign" name="shockwave_swstretchvalign" onchange="Media.formToData();">
 									<option value="none">{#not_set}</option>
 									<option value="meet">Meet</option>
 									<option value="fill">Fill</option>
@@ -765,18 +753,18 @@
 
 						<tr>
 							<td colspan="2">
-								<table border="0" cellpadding="0" cellspacing="0">
+								<table role="presentation" border="0" cellpadding="0" cellspacing="0">
 									<tr>
-										<td><input type="checkbox" class="checkbox" id="shockwave_autostart" name="shockwave_autostart" onchange="generatePreview();" checked="checked" /></td>
+										<td><input type="checkbox" class="checkbox" id="shockwave_autostart" name="shockwave_autostart" onchange="Media.formToData();" checked="checked" /></td>
 										<td><label for="shockwave_autostart">{#media_dlg.autostart}</label></td>
 									</tr>
 								</table>
 							</td>
 
 							<td colspan="2">
-								<table border="0" cellpadding="0" cellspacing="0">
+								<table role="presentation" border="0" cellpadding="0" cellspacing="0">
 									<tr>
-										<td><input type="checkbox" class="checkbox" id="shockwave_sound" name="shockwave_sound" onchange="generatePreview();" checked="checked" /></td>
+										<td><input type="checkbox" class="checkbox" id="shockwave_sound" name="shockwave_sound" onchange="Media.formToData();" checked="checked" /></td>
 										<td><label for="shockwave_sound">{#media_dlg.sound}</label></td>
 									</tr>
 								</table>
@@ -786,18 +774,18 @@
 
 						<tr>
 							<td colspan="2">
-								<table border="0" cellpadding="0" cellspacing="0">
+								<table role="presentation" border="0" cellpadding="0" cellspacing="0">
 									<tr>
-										<td><input type="checkbox" class="checkbox" id="shockwave_swliveconnect" name="shockwave_swliveconnect" onchange="generatePreview();" /></td>
+										<td><input type="checkbox" class="checkbox" id="shockwave_swliveconnect" name="shockwave_swliveconnect" onchange="Media.formToData();" /></td>
 										<td><label for="shockwave_swliveconnect">{#media_dlg.liveconnect}</label></td>
 									</tr>
 								</table>
 							</td>
 
 							<td colspan="2">
-								<table border="0" cellpadding="0" cellspacing="0">
+								<table role="presentation" border="0" cellpadding="0" cellspacing="0">
 									<tr>
-										<td><input type="checkbox" class="checkbox" id="shockwave_progress" name="shockwave_progress" onchange="generatePreview();" checked="checked" /></td>
+										<td><input type="checkbox" class="checkbox" id="shockwave_progress" name="shockwave_progress" onchange="Media.formToData();" checked="checked" /></td>
 										<td><label for="shockwave_progress">{#media_dlg.progress}</label></td>
 									</tr>
 								</table>
@@ -806,6 +794,13 @@
 					</table>
 				</fieldset>
 			</div>
+
+			<div id="source_panel" class="panel">
+				<fieldset>
+					<legend>{#media_dlg.source}</legend>
+					<textarea id="source" style="width: 100%; height: 390px"></textarea>
+				</fieldset>
+			</div>
 		</div>
 
 		<div class="mceActionPanel">
diff --git a/plugins/TinyMCE/js/plugins/media/moxieplayer.swf b/plugins/TinyMCE/js/plugins/media/moxieplayer.swf
new file mode 100644
index 0000000000..2a040358df
Binary files /dev/null and b/plugins/TinyMCE/js/plugins/media/moxieplayer.swf differ
diff --git a/plugins/TinyMCE/js/plugins/nonbreaking/editor_plugin.js b/plugins/TinyMCE/js/plugins/nonbreaking/editor_plugin.js
index eb40a6a39c..73947355f0 100644
--- a/plugins/TinyMCE/js/plugins/nonbreaking/editor_plugin.js
+++ b/plugins/TinyMCE/js/plugins/nonbreaking/editor_plugin.js
@@ -1 +1 @@
-(function(){tinymce.create("tinymce.plugins.Nonbreaking",{init:function(a,b){var c=this;c.editor=a;a.addCommand("mceNonBreaking",function(){a.execCommand("mceInsertContent",false,(a.plugins.visualchars&&a.plugins.visualchars.state)?'<span _mce_bogus="1" class="mceItemHidden mceItemNbsp">&nbsp;</span>':"&nbsp;")});a.addButton("nonbreaking",{title:"nonbreaking.nonbreaking_desc",cmd:"mceNonBreaking"});if(a.getParam("nonbreaking_force_tab")){a.onKeyDown.add(function(d,f){if(tinymce.isIE&&f.keyCode==9){d.execCommand("mceNonBreaking");d.execCommand("mceNonBreaking");d.execCommand("mceNonBreaking");tinymce.dom.Event.cancel(f)}})}},getInfo:function(){return{longname:"Nonbreaking space",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/nonbreaking",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("nonbreaking",tinymce.plugins.Nonbreaking)})();
\ No newline at end of file
+(function(){tinymce.create("tinymce.plugins.Nonbreaking",{init:function(a,b){var c=this;c.editor=a;a.addCommand("mceNonBreaking",function(){a.execCommand("mceInsertContent",false,(a.plugins.visualchars&&a.plugins.visualchars.state)?'<span data-mce-bogus="1" class="mceItemHidden mceItemNbsp">&nbsp;</span>':"&nbsp;")});a.addButton("nonbreaking",{title:"nonbreaking.nonbreaking_desc",cmd:"mceNonBreaking"});if(a.getParam("nonbreaking_force_tab")){a.onKeyDown.add(function(d,f){if(tinymce.isIE&&f.keyCode==9){d.execCommand("mceNonBreaking");d.execCommand("mceNonBreaking");d.execCommand("mceNonBreaking");tinymce.dom.Event.cancel(f)}})}},getInfo:function(){return{longname:"Nonbreaking space",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/nonbreaking",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("nonbreaking",tinymce.plugins.Nonbreaking)})();
\ No newline at end of file
diff --git a/plugins/TinyMCE/js/plugins/nonbreaking/editor_plugin_src.js b/plugins/TinyMCE/js/plugins/nonbreaking/editor_plugin_src.js
index ca83ee26e5..b3ea82ee03 100644
--- a/plugins/TinyMCE/js/plugins/nonbreaking/editor_plugin_src.js
+++ b/plugins/TinyMCE/js/plugins/nonbreaking/editor_plugin_src.js
@@ -17,7 +17,7 @@
 
 			// Register commands
 			ed.addCommand('mceNonBreaking', function() {
-				ed.execCommand('mceInsertContent', false, (ed.plugins.visualchars && ed.plugins.visualchars.state) ? '<span _mce_bogus="1" class="mceItemHidden mceItemNbsp">&nbsp;</span>' : '&nbsp;');
+				ed.execCommand('mceInsertContent', false, (ed.plugins.visualchars && ed.plugins.visualchars.state) ? '<span data-mce-bogus="1" class="mceItemHidden mceItemNbsp">&nbsp;</span>' : '&nbsp;');
 			});
 
 			// Register buttons
diff --git a/plugins/TinyMCE/js/plugins/noneditable/editor_plugin.js b/plugins/TinyMCE/js/plugins/noneditable/editor_plugin.js
index 9945cd8580..cc7de78466 100644
--- a/plugins/TinyMCE/js/plugins/noneditable/editor_plugin.js
+++ b/plugins/TinyMCE/js/plugins/noneditable/editor_plugin.js
@@ -1 +1 @@
-(function(){var a=tinymce.dom.Event;tinymce.create("tinymce.plugins.NonEditablePlugin",{init:function(d,e){var f=this,c,b;f.editor=d;c=d.getParam("noneditable_editable_class","mceEditable");b=d.getParam("noneditable_noneditable_class","mceNonEditable");d.onNodeChange.addToTop(function(h,g,k){var j,i;j=h.dom.getParent(h.selection.getStart(),function(l){return h.dom.hasClass(l,b)});i=h.dom.getParent(h.selection.getEnd(),function(l){return h.dom.hasClass(l,b)});if(j||i){f._setDisabled(1);return false}else{f._setDisabled(0)}})},getInfo:function(){return{longname:"Non editable elements",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/noneditable",version:tinymce.majorVersion+"."+tinymce.minorVersion}},_block:function(c,d){var b=d.keyCode;if((b>32&&b<41)||(b>111&&b<124)){return}return a.cancel(d)},_setDisabled:function(d){var c=this,b=c.editor;tinymce.each(b.controlManager.controls,function(e){e.setDisabled(d)});if(d!==c.disabled){if(d){b.onKeyDown.addToTop(c._block);b.onKeyPress.addToTop(c._block);b.onKeyUp.addToTop(c._block);b.onPaste.addToTop(c._block)}else{b.onKeyDown.remove(c._block);b.onKeyPress.remove(c._block);b.onKeyUp.remove(c._block);b.onPaste.remove(c._block)}c.disabled=d}}});tinymce.PluginManager.add("noneditable",tinymce.plugins.NonEditablePlugin)})();
\ No newline at end of file
+(function(){var a=tinymce.dom.Event;tinymce.create("tinymce.plugins.NonEditablePlugin",{init:function(d,e){var f=this,c,b;f.editor=d;c=d.getParam("noneditable_editable_class","mceEditable");b=d.getParam("noneditable_noneditable_class","mceNonEditable");d.onNodeChange.addToTop(function(h,g,k){var j,i;j=h.dom.getParent(h.selection.getStart(),function(l){return h.dom.hasClass(l,b)});i=h.dom.getParent(h.selection.getEnd(),function(l){return h.dom.hasClass(l,b)});if(j||i){f._setDisabled(1);return false}else{f._setDisabled(0)}})},getInfo:function(){return{longname:"Non editable elements",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/noneditable",version:tinymce.majorVersion+"."+tinymce.minorVersion}},_block:function(c,d){var b=d.keyCode;if((b>32&&b<41)||(b>111&&b<124)){return}return a.cancel(d)},_setDisabled:function(d){var c=this,b=c.editor;tinymce.each(b.controlManager.controls,function(e){e.setDisabled(d)});if(d!==c.disabled){if(d){b.onKeyDown.addToTop(c._block);b.onKeyPress.addToTop(c._block);b.onKeyUp.addToTop(c._block);b.onPaste.addToTop(c._block);b.onContextMenu.addToTop(c._block)}else{b.onKeyDown.remove(c._block);b.onKeyPress.remove(c._block);b.onKeyUp.remove(c._block);b.onPaste.remove(c._block);b.onContextMenu.remove(c._block)}c.disabled=d}}});tinymce.PluginManager.add("noneditable",tinymce.plugins.NonEditablePlugin)})();
\ No newline at end of file
diff --git a/plugins/TinyMCE/js/plugins/noneditable/editor_plugin_src.js b/plugins/TinyMCE/js/plugins/noneditable/editor_plugin_src.js
index 656c971b8c..b6cf15430b 100644
--- a/plugins/TinyMCE/js/plugins/noneditable/editor_plugin_src.js
+++ b/plugins/TinyMCE/js/plugins/noneditable/editor_plugin_src.js
@@ -73,11 +73,13 @@
 					ed.onKeyPress.addToTop(t._block);
 					ed.onKeyUp.addToTop(t._block);
 					ed.onPaste.addToTop(t._block);
+					ed.onContextMenu.addToTop(t._block);
 				} else {
 					ed.onKeyDown.remove(t._block);
 					ed.onKeyPress.remove(t._block);
 					ed.onKeyUp.remove(t._block);
 					ed.onPaste.remove(t._block);
+					ed.onContextMenu.remove(t._block);
 				}
 
 				t.disabled = s;
diff --git a/plugins/TinyMCE/js/plugins/pagebreak/css/content.css b/plugins/TinyMCE/js/plugins/pagebreak/css/content.css
deleted file mode 100644
index c949d58cc4..0000000000
--- a/plugins/TinyMCE/js/plugins/pagebreak/css/content.css
+++ /dev/null
@@ -1 +0,0 @@
-.mcePageBreak {display:block;border:0;width:100%;height:12px;border-top:1px dotted #ccc;margin-top:15px;background:#fff url(../img/pagebreak.gif) no-repeat center top;}
diff --git a/plugins/TinyMCE/js/plugins/pagebreak/editor_plugin.js b/plugins/TinyMCE/js/plugins/pagebreak/editor_plugin.js
index a212f69633..35085e8adc 100644
--- a/plugins/TinyMCE/js/plugins/pagebreak/editor_plugin.js
+++ b/plugins/TinyMCE/js/plugins/pagebreak/editor_plugin.js
@@ -1 +1 @@
-(function(){tinymce.create("tinymce.plugins.PageBreakPlugin",{init:function(b,d){var f='<img src="'+d+'/img/trans.gif" class="mcePageBreak mceItemNoResize" />',a="mcePageBreak",c=b.getParam("pagebreak_separator","<!-- pagebreak -->"),e;e=new RegExp(c.replace(/[\?\.\*\[\]\(\)\{\}\+\^\$\:]/g,function(g){return"\\"+g}),"g");b.addCommand("mcePageBreak",function(){b.execCommand("mceInsertContent",0,f)});b.addButton("pagebreak",{title:"pagebreak.desc",cmd:a});b.onInit.add(function(){if(b.settings.content_css!==false){b.dom.loadCSS(d+"/css/content.css")}if(b.theme.onResolveName){b.theme.onResolveName.add(function(g,h){if(h.node.nodeName=="IMG"&&b.dom.hasClass(h.node,a)){h.name="pagebreak"}})}});b.onClick.add(function(g,h){h=h.target;if(h.nodeName==="IMG"&&g.dom.hasClass(h,a)){g.selection.select(h)}});b.onNodeChange.add(function(h,g,i){g.setActive("pagebreak",i.nodeName==="IMG"&&h.dom.hasClass(i,a))});b.onBeforeSetContent.add(function(g,h){h.content=h.content.replace(e,f)});b.onPostProcess.add(function(g,h){if(h.get){h.content=h.content.replace(/<img[^>]+>/g,function(i){if(i.indexOf('class="mcePageBreak')!==-1){i=c}return i})}})},getInfo:function(){return{longname:"PageBreak",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/pagebreak",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("pagebreak",tinymce.plugins.PageBreakPlugin)})();
\ No newline at end of file
+(function(){tinymce.create("tinymce.plugins.PageBreakPlugin",{init:function(b,d){var f='<img src="'+b.theme.url+'/img/trans.gif" class="mcePageBreak mceItemNoResize" />',a="mcePageBreak",c=b.getParam("pagebreak_separator","<!-- pagebreak -->"),e;e=new RegExp(c.replace(/[\?\.\*\[\]\(\)\{\}\+\^\$\:]/g,function(g){return"\\"+g}),"g");b.addCommand("mcePageBreak",function(){b.execCommand("mceInsertContent",0,f)});b.addButton("pagebreak",{title:"pagebreak.desc",cmd:a});b.onInit.add(function(){if(b.theme.onResolveName){b.theme.onResolveName.add(function(g,h){if(h.node.nodeName=="IMG"&&b.dom.hasClass(h.node,a)){h.name="pagebreak"}})}});b.onClick.add(function(g,h){h=h.target;if(h.nodeName==="IMG"&&g.dom.hasClass(h,a)){g.selection.select(h)}});b.onNodeChange.add(function(h,g,i){g.setActive("pagebreak",i.nodeName==="IMG"&&h.dom.hasClass(i,a))});b.onBeforeSetContent.add(function(g,h){h.content=h.content.replace(e,f)});b.onPostProcess.add(function(g,h){if(h.get){h.content=h.content.replace(/<img[^>]+>/g,function(i){if(i.indexOf('class="mcePageBreak')!==-1){i=c}return i})}})},getInfo:function(){return{longname:"PageBreak",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/pagebreak",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("pagebreak",tinymce.plugins.PageBreakPlugin)})();
\ No newline at end of file
diff --git a/plugins/TinyMCE/js/plugins/pagebreak/editor_plugin_src.js b/plugins/TinyMCE/js/plugins/pagebreak/editor_plugin_src.js
index 4e1eb0a7aa..a094c19162 100644
--- a/plugins/TinyMCE/js/plugins/pagebreak/editor_plugin_src.js
+++ b/plugins/TinyMCE/js/plugins/pagebreak/editor_plugin_src.js
@@ -11,7 +11,7 @@
 (function() {
 	tinymce.create('tinymce.plugins.PageBreakPlugin', {
 		init : function(ed, url) {
-			var pb = '<img src="' + url + '/img/trans.gif" class="mcePageBreak mceItemNoResize" />', cls = 'mcePageBreak', sep = ed.getParam('pagebreak_separator', '<!-- pagebreak -->'), pbRE;
+			var pb = '<img src="' + ed.theme.url + '/img/trans.gif" class="mcePageBreak mceItemNoResize" />', cls = 'mcePageBreak', sep = ed.getParam('pagebreak_separator', '<!-- pagebreak -->'), pbRE;
 
 			pbRE = new RegExp(sep.replace(/[\?\.\*\[\]\(\)\{\}\+\^\$\:]/g, function(a) {return '\\' + a;}), 'g');
 
@@ -24,9 +24,6 @@
 			ed.addButton('pagebreak', {title : 'pagebreak.desc', cmd : cls});
 
 			ed.onInit.add(function() {
-				if (ed.settings.content_css !== false)
-					ed.dom.loadCSS(url + "/css/content.css");
-
 				if (ed.theme.onResolveName) {
 					ed.theme.onResolveName.add(function(th, o) {
 						if (o.node.nodeName == 'IMG' && ed.dom.hasClass(o.node, cls))
diff --git a/plugins/TinyMCE/js/plugins/pagebreak/img/trans.gif b/plugins/TinyMCE/js/plugins/pagebreak/img/trans.gif
deleted file mode 100644
index 388486517f..0000000000
Binary files a/plugins/TinyMCE/js/plugins/pagebreak/img/trans.gif and /dev/null differ
diff --git a/plugins/TinyMCE/js/plugins/paste/editor_plugin.js b/plugins/TinyMCE/js/plugins/paste/editor_plugin.js
index 3785ab2d09..22149cc6a3 100644
--- a/plugins/TinyMCE/js/plugins/paste/editor_plugin.js
+++ b/plugins/TinyMCE/js/plugins/paste/editor_plugin.js
@@ -1 +1 @@
-(function(){var c=tinymce.each,d=null,a={paste_auto_cleanup_on_paste:true,paste_block_drop:false,paste_retain_style_properties:"none",paste_strip_class_attributes:"mso",paste_remove_spans:false,paste_remove_styles:false,paste_remove_styles_if_webkit:true,paste_convert_middot_lists:true,paste_convert_headers_to_strong:false,paste_dialog_width:"450",paste_dialog_height:"400",paste_text_use_dialog:false,paste_text_sticky:false,paste_text_notifyalways:false,paste_text_linebreaktype:"p",paste_text_replacements:[[/\u2026/g,"..."],[/[\x93\x94\u201c\u201d]/g,'"'],[/[\x60\x91\x92\u2018\u2019]/g,"'"]]};function b(e,f){return e.getParam(f,a[f])}tinymce.create("tinymce.plugins.PastePlugin",{init:function(e,f){var g=this;g.editor=e;g.url=f;g.onPreProcess=new tinymce.util.Dispatcher(g);g.onPostProcess=new tinymce.util.Dispatcher(g);g.onPreProcess.add(g._preProcess);g.onPostProcess.add(g._postProcess);g.onPreProcess.add(function(j,k){e.execCallback("paste_preprocess",j,k)});g.onPostProcess.add(function(j,k){e.execCallback("paste_postprocess",j,k)});e.pasteAsPlainText=false;function i(l,j){var k=e.dom;g.onPreProcess.dispatch(g,l);l.node=k.create("div",0,l.content);g.onPostProcess.dispatch(g,l);l.content=e.serializer.serialize(l.node,{getInner:1});if((!j)&&(e.pasteAsPlainText)){g._insertPlainText(e,k,l.content);if(!b(e,"paste_text_sticky")){e.pasteAsPlainText=false;e.controlManager.setActive("pastetext",false)}}else{if(/<(p|h[1-6]|ul|ol)/.test(l.content)){g._insertBlockContent(e,k,l.content)}else{g._insert(l.content)}}}e.addCommand("mceInsertClipboardContent",function(j,k){i(k,true)});if(!b(e,"paste_text_use_dialog")){e.addCommand("mcePasteText",function(k,j){var l=tinymce.util.Cookie;e.pasteAsPlainText=!e.pasteAsPlainText;e.controlManager.setActive("pastetext",e.pasteAsPlainText);if((e.pasteAsPlainText)&&(!l.get("tinymcePasteText"))){if(b(e,"paste_text_sticky")){e.windowManager.alert(e.translate("paste.plaintext_mode_sticky"))}else{e.windowManager.alert(e.translate("paste.plaintext_mode_sticky"))}if(!b(e,"paste_text_notifyalways")){l.set("tinymcePasteText","1",new Date(new Date().getFullYear()+1,12,31))}}})}e.addButton("pastetext",{title:"paste.paste_text_desc",cmd:"mcePasteText"});e.addButton("selectall",{title:"paste.selectall_desc",cmd:"selectall"});function h(s){var m,q,k,l=e.selection,p=e.dom,r=e.getBody(),j;if(e.pasteAsPlainText&&(s.clipboardData||p.doc.dataTransfer)){s.preventDefault();i({content:(s.clipboardData||p.doc.dataTransfer).getData("Text")},true);return}if(p.get("_mcePaste")){return}m=p.add(r,"div",{id:"_mcePaste","class":"mcePaste"},'\uFEFF<br _mce_bogus="1">');if(r!=e.getDoc().body){j=p.getPos(e.selection.getStart(),r).y}else{j=r.scrollTop}p.setStyles(m,{position:"absolute",left:-10000,top:j,width:1,height:1,overflow:"hidden"});if(tinymce.isIE){k=p.doc.body.createTextRange();k.moveToElementText(m);k.execCommand("Paste");p.remove(m);if(m.innerHTML==="\uFEFF"){e.execCommand("mcePasteWord");s.preventDefault();return}i({content:m.innerHTML});return tinymce.dom.Event.cancel(s)}else{function o(n){n.preventDefault()}p.bind(e.getDoc(),"mousedown",o);p.bind(e.getDoc(),"keydown",o);q=e.selection.getRng();m=m.firstChild;k=e.getDoc().createRange();k.setStart(m,0);k.setEnd(m,1);l.setRng(k);window.setTimeout(function(){var t="",n=p.select("div.mcePaste");c(n,function(v){var u=v.firstChild;if(u&&u.nodeName=="DIV"&&u.style.marginTop&&u.style.backgroundColor){p.remove(u,1)}c(p.select("div.mcePaste",v),function(w){p.remove(w,1)});c(p.select("span.Apple-style-span",v),function(w){p.remove(w,1)});c(p.select("br[_mce_bogus]",v),function(w){p.remove(w)});t+=v.innerHTML});c(n,function(u){p.remove(u)});if(q){l.setRng(q)}i({content:t});p.unbind(e.getDoc(),"mousedown",o);p.unbind(e.getDoc(),"keydown",o)},0)}}if(b(e,"paste_auto_cleanup_on_paste")){if(tinymce.isOpera||/Firefox\/2/.test(navigator.userAgent)){e.onKeyDown.add(function(j,k){if(((tinymce.isMac?k.metaKey:k.ctrlKey)&&k.keyCode==86)||(k.shiftKey&&k.keyCode==45)){h(k)}})}else{e.onPaste.addToTop(function(j,k){return h(k)})}}if(b(e,"paste_block_drop")){e.onInit.add(function(){e.dom.bind(e.getBody(),["dragend","dragover","draggesture","dragdrop","drop","drag"],function(j){j.preventDefault();j.stopPropagation();return false})})}g._legacySupport()},getInfo:function(){return{longname:"Paste text/word",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/paste",version:tinymce.majorVersion+"."+tinymce.minorVersion}},_preProcess:function(i,f){var l=this.editor,k=f.content,q=tinymce.grep,p=tinymce.explode,g=tinymce.trim,m,j;function e(h){c(h,function(o){if(o.constructor==RegExp){k=k.replace(o,"")}else{k=k.replace(o[0],o[1])}})}if(/class="?Mso|style="[^"]*\bmso-|w:WordDocument/i.test(k)||f.wordContent){f.wordContent=true;e([/^\s*(&nbsp;)+/gi,/(&nbsp;|<br[^>]*>)+\s*$/gi]);if(b(l,"paste_convert_headers_to_strong")){k=k.replace(/<p [^>]*class="?MsoHeading"?[^>]*>(.*?)<\/p>/gi,"<p><strong>$1</strong></p>")}if(b(l,"paste_convert_middot_lists")){e([[/<!--\[if !supportLists\]-->/gi,"$&__MCE_ITEM__"],[/(<span[^>]+(?:mso-list:|:\s*symbol)[^>]+>)/gi,"$1__MCE_ITEM__"]])}e([/<!--[\s\S]+?-->/gi,/<(!|script[^>]*>.*?<\/script(?=[>\s])|\/?(\?xml(:\w+)?|img|meta|link|style|\w:\w+)(?=[\s\/>]))[^>]*>/gi,[/<(\/?)s>/gi,"<$1strike>"],[/&nbsp;/gi,"\u00a0"]]);do{m=k.length;k=k.replace(/(<[a-z][^>]*\s)(?:id|name|language|type|on\w+|\w+:\w+)=(?:"[^"]*"|\w+)\s?/gi,"$1")}while(m!=k.length);if(b(l,"paste_retain_style_properties").replace(/^none$/i,"").length==0){k=k.replace(/<\/?span[^>]*>/gi,"")}else{e([[/<span\s+style\s*=\s*"\s*mso-spacerun\s*:\s*yes\s*;?\s*"\s*>([\s\u00a0]*)<\/span>/gi,function(o,h){return(h.length>0)?h.replace(/./," ").slice(Math.floor(h.length/2)).split("").join("\u00a0"):""}],[/(<[a-z][^>]*)\sstyle="([^"]*)"/gi,function(u,h,t){var v=[],o=0,r=p(g(t).replace(/&quot;/gi,"'"),";");c(r,function(s){var w,y,z=p(s,":");function x(A){return A+((A!=="0")&&(/\d$/.test(A)))?"px":""}if(z.length==2){w=z[0].toLowerCase();y=z[1].toLowerCase();switch(w){case"mso-padding-alt":case"mso-padding-top-alt":case"mso-padding-right-alt":case"mso-padding-bottom-alt":case"mso-padding-left-alt":case"mso-margin-alt":case"mso-margin-top-alt":case"mso-margin-right-alt":case"mso-margin-bottom-alt":case"mso-margin-left-alt":case"mso-table-layout-alt":case"mso-height":case"mso-width":case"mso-vertical-align-alt":v[o++]=w.replace(/^mso-|-alt$/g,"")+":"+x(y);return;case"horiz-align":v[o++]="text-align:"+y;return;case"vert-align":v[o++]="vertical-align:"+y;return;case"font-color":case"mso-foreground":v[o++]="color:"+y;return;case"mso-background":case"mso-highlight":v[o++]="background:"+y;return;case"mso-default-height":v[o++]="min-height:"+x(y);return;case"mso-default-width":v[o++]="min-width:"+x(y);return;case"mso-padding-between-alt":v[o++]="border-collapse:separate;border-spacing:"+x(y);return;case"text-line-through":if((y=="single")||(y=="double")){v[o++]="text-decoration:line-through"}return;case"mso-zero-height":if(y=="yes"){v[o++]="display:none"}return}if(/^(mso|column|font-emph|lang|layout|line-break|list-image|nav|panose|punct|row|ruby|sep|size|src|tab-|table-border|text-(?!align|decor|indent|trans)|top-bar|version|vnd|word-break)/.test(w)){return}v[o++]=w+":"+z[1]}});if(o>0){return h+' style="'+v.join(";")+'"'}else{return h}}]])}}if(b(l,"paste_convert_headers_to_strong")){e([[/<h[1-6][^>]*>/gi,"<p><strong>"],[/<\/h[1-6][^>]*>/gi,"</strong></p>"]])}j=b(l,"paste_strip_class_attributes");if(j!=="none"){function n(r,o){if(j==="all"){return""}var h=q(p(o.replace(/^(["'])(.*)\1$/,"$2")," "),function(s){return(/^(?!mso)/i.test(s))});return h.length?' class="'+h.join(" ")+'"':""}k=k.replace(/ class="([^"]+)"/gi,n);k=k.replace(/ class=(\w+)/gi,n)}if(b(l,"paste_remove_spans")){k=k.replace(/<\/?span[^>]*>/gi,"")}f.content=k},_postProcess:function(h,j){var g=this,f=g.editor,i=f.dom,e;if(j.wordContent){c(i.select("a",j.node),function(k){if(!k.href||k.href.indexOf("#_Toc")!=-1){i.remove(k,1)}});if(b(f,"paste_convert_middot_lists")){g._convertLists(h,j)}e=b(f,"paste_retain_style_properties");if((tinymce.is(e,"string"))&&(e!=="all")&&(e!=="*")){e=tinymce.explode(e.replace(/^none$/i,""));c(i.select("*",j.node),function(n){var o={},l=0,m,p,k;if(e){for(m=0;m<e.length;m++){p=e[m];k=i.getStyle(n,p);if(k){o[p]=k;l++}}}i.setAttrib(n,"style","");if(e&&l>0){i.setStyles(n,o)}else{if(n.nodeName=="SPAN"&&!n.className){i.remove(n,true)}}})}}if(b(f,"paste_remove_styles")||(b(f,"paste_remove_styles_if_webkit")&&tinymce.isWebKit)){c(i.select("*[style]",j.node),function(k){k.removeAttribute("style");k.removeAttribute("_mce_style")})}else{if(tinymce.isWebKit){c(i.select("*",j.node),function(k){k.removeAttribute("_mce_style")})}}},_convertLists:function(h,f){var j=h.editor.dom,i,m,e=-1,g,n=[],l,k;c(j.select("p",f.node),function(u){var r,v="",t,s,o,q;for(r=u.firstChild;r&&r.nodeType==3;r=r.nextSibling){v+=r.nodeValue}v=u.innerHTML.replace(/<\/?\w+[^>]*>/gi,"").replace(/&nbsp;/g,"\u00a0");if(/^(__MCE_ITEM__)+[\u2022\u00b7\u00a7\u00d8o]\s*\u00a0*/.test(v)){t="ul"}if(/^__MCE_ITEM__\s*\w+\.\s*\u00a0{2,}/.test(v)){t="ol"}if(t){g=parseFloat(u.style.marginLeft||0);if(g>e){n.push(g)}if(!i||t!=l){i=j.create(t);j.insertAfter(i,u)}else{if(g>e){i=m.appendChild(j.create(t))}else{if(g<e){o=tinymce.inArray(n,g);q=j.getParents(i.parentNode,t);i=q[q.length-1-o]||i}}}c(j.select("span",u),function(w){var p=w.innerHTML.replace(/<\/?\w+[^>]*>/gi,"");if(t=="ul"&&/^[\u2022\u00b7\u00a7\u00d8o]/.test(p)){j.remove(w)}else{if(/^[\s\S]*\w+\.(&nbsp;|\u00a0)*\s*/.test(p)){j.remove(w)}}});s=u.innerHTML;if(t=="ul"){s=u.innerHTML.replace(/__MCE_ITEM__/g,"").replace(/^[\u2022\u00b7\u00a7\u00d8o]\s*(&nbsp;|\u00a0)+\s*/,"")}else{s=u.innerHTML.replace(/__MCE_ITEM__/g,"").replace(/^\s*\w+\.(&nbsp;|\u00a0)+\s*/,"")}m=i.appendChild(j.create("li",0,s));j.remove(u);e=g;l=t}else{i=e=0}});k=f.node.innerHTML;if(k.indexOf("__MCE_ITEM__")!=-1){f.node.innerHTML=k.replace(/__MCE_ITEM__/g,"")}},_insertBlockContent:function(l,h,m){var f,j,g=l.selection,q,n,e,o,i,k="mce_marker";function p(t){var s;if(tinymce.isIE){s=l.getDoc().body.createTextRange();s.moveToElementText(t);s.collapse(false);s.select()}else{g.select(t,1);g.collapse(false)}}this._insert('<span id="'+k+'"></span>',1);j=h.get(k);f=h.getParent(j,"p,h1,h2,h3,h4,h5,h6,ul,ol,th,td");if(f&&!/TD|TH/.test(f.nodeName)){j=h.split(f,j);c(h.create("div",0,m).childNodes,function(r){q=j.parentNode.insertBefore(r.cloneNode(true),j)});p(q)}else{h.setOuterHTML(j,m);g.select(l.getBody(),1);g.collapse(0)}while(n=h.get(k)){h.remove(n)}n=g.getStart();e=h.getViewPort(l.getWin());o=l.dom.getPos(n).y;i=n.clientHeight;if(o<e.y||o+i>e.y+e.h){l.getDoc().body.scrollTop=o<e.y?o:o-e.h+25}},_insert:function(g,e){var f=this.editor,i=f.selection.getRng();if(!f.selection.isCollapsed()&&i.startContainer!=i.endContainer){f.getDoc().execCommand("Delete",false,null)}f.execCommand(tinymce.isGecko?"insertHTML":"mceInsertContent",false,g,{skip_undo:e})},_insertPlainText:function(j,x,v){var t,u,l,k,r,e,p,f,n=j.getWin(),z=j.getDoc(),s=j.selection,m=tinymce.is,y=tinymce.inArray,g=b(j,"paste_text_linebreaktype"),o=b(j,"paste_text_replacements");function q(h){c(h,function(i){if(i.constructor==RegExp){v=v.replace(i,"")}else{v=v.replace(i[0],i[1])}})}if((typeof(v)==="string")&&(v.length>0)){if(!d){d=("34,quot,38,amp,39,apos,60,lt,62,gt,"+j.serializer.settings.entities).split(",")}if(/<(?:p|br|h[1-6]|ul|ol|dl|table|t[rdh]|div|blockquote|fieldset|pre|address|center)[^>]*>/i.test(v)){q([/[\n\r]+/g])}else{q([/\r+/g])}q([[/<\/(?:p|h[1-6]|ul|ol|dl|table|div|blockquote|fieldset|pre|address|center)>/gi,"\n\n"],[/<br[^>]*>|<\/tr>/gi,"\n"],[/<\/t[dh]>\s*<t[dh][^>]*>/gi,"\t"],/<[a-z!\/?][^>]*>/gi,[/&nbsp;/gi," "],[/&(#\d+|[a-z0-9]{1,10});/gi,function(i,h){if(h.charAt(0)==="#"){return String.fromCharCode(h.slice(1))}else{return((i=y(d,h))>0)?String.fromCharCode(d[i-1]):" "}}],[/(?:(?!\n)\s)*(\n+)(?:(?!\n)\s)*/gi,"$1"],[/\n{3,}/g,"\n\n"],/^\s+|\s+$/g]);v=x.encode(v);if(!s.isCollapsed()){z.execCommand("Delete",false,null)}if(m(o,"array")||(m(o,"array"))){q(o)}else{if(m(o,"string")){q(new RegExp(o,"gi"))}}if(g=="none"){q([[/\n+/g," "]])}else{if(g=="br"){q([[/\n/g,"<br />"]])}else{q([/^\s+|\s+$/g,[/\n\n/g,"</p><p>"],[/\n/g,"<br />"]])}}if((l=v.indexOf("</p><p>"))!=-1){k=v.lastIndexOf("</p><p>");r=s.getNode();e=[];do{if(r.nodeType==1){if(r.nodeName=="TD"||r.nodeName=="BODY"){break}e[e.length]=r}}while(r=r.parentNode);if(e.length>0){p=v.substring(0,l);f="";for(t=0,u=e.length;t<u;t++){p+="</"+e[t].nodeName.toLowerCase()+">";f+="<"+e[e.length-t-1].nodeName.toLowerCase()+">"}if(l==k){v=p+f+v.substring(l+7)}else{v=p+v.substring(l+4,k+4)+f+v.substring(k+7)}}}j.execCommand("mceInsertRawHTML",false,v+'<span id="_plain_text_marker">&nbsp;</span>');window.setTimeout(function(){var h=x.get("_plain_text_marker"),B,i,A,w;s.select(h,false);z.execCommand("Delete",false,null);h=null;B=s.getStart();i=x.getViewPort(n);A=x.getPos(B).y;w=B.clientHeight;if((A<i.y)||(A+w>i.y+i.h)){z.body.scrollTop=A<i.y?A:A-i.h+25}},0)}},_legacySupport:function(){var f=this,e=f.editor;e.addCommand("mcePasteWord",function(){e.windowManager.open({file:f.url+"/pasteword.htm",width:parseInt(b(e,"paste_dialog_width")),height:parseInt(b(e,"paste_dialog_height")),inline:1})});if(b(e,"paste_text_use_dialog")){e.addCommand("mcePasteText",function(){e.windowManager.open({file:f.url+"/pastetext.htm",width:parseInt(b(e,"paste_dialog_width")),height:parseInt(b(e,"paste_dialog_height")),inline:1})})}e.addButton("pasteword",{title:"paste.paste_word_desc",cmd:"mcePasteWord"})}});tinymce.PluginManager.add("paste",tinymce.plugins.PastePlugin)})();
\ No newline at end of file
+(function(){var c=tinymce.each,a={paste_auto_cleanup_on_paste:true,paste_enable_default_filters:true,paste_block_drop:false,paste_retain_style_properties:"none",paste_strip_class_attributes:"mso",paste_remove_spans:false,paste_remove_styles:false,paste_remove_styles_if_webkit:true,paste_convert_middot_lists:true,paste_convert_headers_to_strong:false,paste_dialog_width:"450",paste_dialog_height:"400",paste_text_use_dialog:false,paste_text_sticky:false,paste_text_sticky_default:false,paste_text_notifyalways:false,paste_text_linebreaktype:"p",paste_text_replacements:[[/\u2026/g,"..."],[/[\x93\x94\u201c\u201d]/g,'"'],[/[\x60\x91\x92\u2018\u2019]/g,"'"]]};function b(d,e){return d.getParam(e,a[e])}tinymce.create("tinymce.plugins.PastePlugin",{init:function(d,e){var f=this;f.editor=d;f.url=e;f.onPreProcess=new tinymce.util.Dispatcher(f);f.onPostProcess=new tinymce.util.Dispatcher(f);f.onPreProcess.add(f._preProcess);f.onPostProcess.add(f._postProcess);f.onPreProcess.add(function(i,j){d.execCallback("paste_preprocess",i,j)});f.onPostProcess.add(function(i,j){d.execCallback("paste_postprocess",i,j)});d.onKeyDown.addToTop(function(i,j){if(((tinymce.isMac?j.metaKey:j.ctrlKey)&&j.keyCode==86)||(j.shiftKey&&j.keyCode==45)){return false}});d.pasteAsPlainText=b(d,"paste_text_sticky_default");function h(l,j){var k=d.dom,i;f.onPreProcess.dispatch(f,l);l.node=k.create("div",0,l.content);if(tinymce.isGecko){i=d.selection.getRng(true);if(i.startContainer==i.endContainer&&i.startContainer.nodeType==3){if(l.node.childNodes.length===1&&/^(p|h[1-6]|pre)$/i.test(l.node.firstChild.nodeName)&&l.content.indexOf("__MCE_ITEM__")===-1){k.remove(l.node.firstChild,true)}}}f.onPostProcess.dispatch(f,l);l.content=d.serializer.serialize(l.node,{getInner:1,forced_root_block:""});if((!j)&&(d.pasteAsPlainText)){f._insertPlainText(d,k,l.content);if(!b(d,"paste_text_sticky")){d.pasteAsPlainText=false;d.controlManager.setActive("pastetext",false)}}else{f._insert(l.content)}}d.addCommand("mceInsertClipboardContent",function(i,j){h(j,true)});if(!b(d,"paste_text_use_dialog")){d.addCommand("mcePasteText",function(j,i){var k=tinymce.util.Cookie;d.pasteAsPlainText=!d.pasteAsPlainText;d.controlManager.setActive("pastetext",d.pasteAsPlainText);if((d.pasteAsPlainText)&&(!k.get("tinymcePasteText"))){if(b(d,"paste_text_sticky")){d.windowManager.alert(d.translate("paste.plaintext_mode_sticky"))}else{d.windowManager.alert(d.translate("paste.plaintext_mode_sticky"))}if(!b(d,"paste_text_notifyalways")){k.set("tinymcePasteText","1",new Date(new Date().getFullYear()+1,12,31))}}})}d.addButton("pastetext",{title:"paste.paste_text_desc",cmd:"mcePasteText"});d.addButton("selectall",{title:"paste.selectall_desc",cmd:"selectall"});function g(s){var l,p,j,t,k=d.selection,o=d.dom,q=d.getBody(),i,r;if(s.clipboardData||o.doc.dataTransfer){r=(s.clipboardData||o.doc.dataTransfer).getData("Text");if(d.pasteAsPlainText){s.preventDefault();h({content:r.replace(/\r?\n/g,"<br />")});return}}if(o.get("_mcePaste")){return}l=o.add(q,"div",{id:"_mcePaste","class":"mcePaste","data-mce-bogus":"1"},"\uFEFF\uFEFF");if(q!=d.getDoc().body){i=o.getPos(d.selection.getStart(),q).y}else{i=q.scrollTop+o.getViewPort(d.getWin()).y}o.setStyles(l,{position:"absolute",left:tinymce.isGecko?-40:0,top:i-25,width:1,height:1,overflow:"hidden"});if(tinymce.isIE){t=k.getRng();j=o.doc.body.createTextRange();j.moveToElementText(l);j.execCommand("Paste");o.remove(l);if(l.innerHTML==="\uFEFF\uFEFF"){d.execCommand("mcePasteWord");s.preventDefault();return}k.setRng(t);k.setContent("");setTimeout(function(){h({content:l.innerHTML})},0);return tinymce.dom.Event.cancel(s)}else{function m(n){n.preventDefault()}o.bind(d.getDoc(),"mousedown",m);o.bind(d.getDoc(),"keydown",m);p=d.selection.getRng();l=l.firstChild;j=d.getDoc().createRange();j.setStart(l,0);j.setEnd(l,2);k.setRng(j);window.setTimeout(function(){var u="",n;if(!o.select("div.mcePaste > div.mcePaste").length){n=o.select("div.mcePaste");c(n,function(w){var v=w.firstChild;if(v&&v.nodeName=="DIV"&&v.style.marginTop&&v.style.backgroundColor){o.remove(v,1)}c(o.select("span.Apple-style-span",w),function(x){o.remove(x,1)});c(o.select("br[data-mce-bogus]",w),function(x){o.remove(x)});if(w.parentNode.className!="mcePaste"){u+=w.innerHTML}})}else{u="<pre>"+o.encode(r).replace(/\r?\n/g,"<br />")+"</pre>"}c(o.select("div.mcePaste"),function(v){o.remove(v)});if(p){k.setRng(p)}h({content:u});o.unbind(d.getDoc(),"mousedown",m);o.unbind(d.getDoc(),"keydown",m)},0)}}if(b(d,"paste_auto_cleanup_on_paste")){if(tinymce.isOpera||/Firefox\/2/.test(navigator.userAgent)){d.onKeyDown.addToTop(function(i,j){if(((tinymce.isMac?j.metaKey:j.ctrlKey)&&j.keyCode==86)||(j.shiftKey&&j.keyCode==45)){g(j)}})}else{d.onPaste.addToTop(function(i,j){return g(j)})}}d.onInit.add(function(){d.controlManager.setActive("pastetext",d.pasteAsPlainText);if(b(d,"paste_block_drop")){d.dom.bind(d.getBody(),["dragend","dragover","draggesture","dragdrop","drop","drag"],function(i){i.preventDefault();i.stopPropagation();return false})}});f._legacySupport()},getInfo:function(){return{longname:"Paste text/word",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/paste",version:tinymce.majorVersion+"."+tinymce.minorVersion}},_preProcess:function(g,e){var k=this.editor,j=e.content,p=tinymce.grep,n=tinymce.explode,f=tinymce.trim,l,i;function d(h){c(h,function(o){if(o.constructor==RegExp){j=j.replace(o,"")}else{j=j.replace(o[0],o[1])}})}if(k.settings.paste_enable_default_filters==false){return}if(tinymce.isIE&&document.documentMode>=9){d([[/(?:<br>&nbsp;[\s\r\n]+|<br>)*(<\/?(h[1-6r]|p|div|address|pre|form|table|tbody|thead|tfoot|th|tr|td|li|ol|ul|caption|blockquote|center|dl|dt|dd|dir|fieldset)[^>]*>)(?:<br>&nbsp;[\s\r\n]+|<br>)*/g,"$1"]]);d([[/<br><br>/g,"<BR><BR>"],[/<br>/g," "],[/<BR><BR>/g,"<br>"],])}if(/class="?Mso|style="[^"]*\bmso-|w:WordDocument/i.test(j)||e.wordContent){e.wordContent=true;d([/^\s*(&nbsp;)+/gi,/(&nbsp;|<br[^>]*>)+\s*$/gi]);if(b(k,"paste_convert_headers_to_strong")){j=j.replace(/<p [^>]*class="?MsoHeading"?[^>]*>(.*?)<\/p>/gi,"<p><strong>$1</strong></p>")}if(b(k,"paste_convert_middot_lists")){d([[/<!--\[if !supportLists\]-->/gi,"$&__MCE_ITEM__"],[/(<span[^>]+(?:mso-list:|:\s*symbol)[^>]+>)/gi,"$1__MCE_ITEM__"],[/(<p[^>]+(?:MsoListParagraph)[^>]+>)/gi,"$1__MCE_ITEM__"]])}d([/<!--[\s\S]+?-->/gi,/<(!|script[^>]*>.*?<\/script(?=[>\s])|\/?(\?xml(:\w+)?|img|meta|link|style|\w:\w+)(?=[\s\/>]))[^>]*>/gi,[/<(\/?)s>/gi,"<$1strike>"],[/&nbsp;/gi,"\u00a0"]]);do{l=j.length;j=j.replace(/(<[a-z][^>]*\s)(?:id|name|language|type|on\w+|\w+:\w+)=(?:"[^"]*"|\w+)\s?/gi,"$1")}while(l!=j.length);if(b(k,"paste_retain_style_properties").replace(/^none$/i,"").length==0){j=j.replace(/<\/?span[^>]*>/gi,"")}else{d([[/<span\s+style\s*=\s*"\s*mso-spacerun\s*:\s*yes\s*;?\s*"\s*>([\s\u00a0]*)<\/span>/gi,function(o,h){return(h.length>0)?h.replace(/./," ").slice(Math.floor(h.length/2)).split("").join("\u00a0"):""}],[/(<[a-z][^>]*)\sstyle="([^"]*)"/gi,function(t,h,r){var u=[],o=0,q=n(f(r).replace(/&quot;/gi,"'"),";");c(q,function(s){var w,y,z=n(s,":");function x(A){return A+((A!=="0")&&(/\d$/.test(A)))?"px":""}if(z.length==2){w=z[0].toLowerCase();y=z[1].toLowerCase();switch(w){case"mso-padding-alt":case"mso-padding-top-alt":case"mso-padding-right-alt":case"mso-padding-bottom-alt":case"mso-padding-left-alt":case"mso-margin-alt":case"mso-margin-top-alt":case"mso-margin-right-alt":case"mso-margin-bottom-alt":case"mso-margin-left-alt":case"mso-table-layout-alt":case"mso-height":case"mso-width":case"mso-vertical-align-alt":u[o++]=w.replace(/^mso-|-alt$/g,"")+":"+x(y);return;case"horiz-align":u[o++]="text-align:"+y;return;case"vert-align":u[o++]="vertical-align:"+y;return;case"font-color":case"mso-foreground":u[o++]="color:"+y;return;case"mso-background":case"mso-highlight":u[o++]="background:"+y;return;case"mso-default-height":u[o++]="min-height:"+x(y);return;case"mso-default-width":u[o++]="min-width:"+x(y);return;case"mso-padding-between-alt":u[o++]="border-collapse:separate;border-spacing:"+x(y);return;case"text-line-through":if((y=="single")||(y=="double")){u[o++]="text-decoration:line-through"}return;case"mso-zero-height":if(y=="yes"){u[o++]="display:none"}return}if(/^(mso|column|font-emph|lang|layout|line-break|list-image|nav|panose|punct|row|ruby|sep|size|src|tab-|table-border|text-(?!align|decor|indent|trans)|top-bar|version|vnd|word-break)/.test(w)){return}u[o++]=w+":"+z[1]}});if(o>0){return h+' style="'+u.join(";")+'"'}else{return h}}]])}}if(b(k,"paste_convert_headers_to_strong")){d([[/<h[1-6][^>]*>/gi,"<p><strong>"],[/<\/h[1-6][^>]*>/gi,"</strong></p>"]])}d([[/Version:[\d.]+\nStartHTML:\d+\nEndHTML:\d+\nStartFragment:\d+\nEndFragment:\d+/gi,""]]);i=b(k,"paste_strip_class_attributes");if(i!=="none"){function m(q,o){if(i==="all"){return""}var h=p(n(o.replace(/^(["'])(.*)\1$/,"$2")," "),function(r){return(/^(?!mso)/i.test(r))});return h.length?' class="'+h.join(" ")+'"':""}j=j.replace(/ class="([^"]+)"/gi,m);j=j.replace(/ class=([\-\w]+)/gi,m)}if(b(k,"paste_remove_spans")){j=j.replace(/<\/?span[^>]*>/gi,"")}e.content=j},_postProcess:function(g,i){var f=this,e=f.editor,h=e.dom,d;if(e.settings.paste_enable_default_filters==false){return}if(i.wordContent){c(h.select("a",i.node),function(j){if(!j.href||j.href.indexOf("#_Toc")!=-1){h.remove(j,1)}});if(b(e,"paste_convert_middot_lists")){f._convertLists(g,i)}d=b(e,"paste_retain_style_properties");if((tinymce.is(d,"string"))&&(d!=="all")&&(d!=="*")){d=tinymce.explode(d.replace(/^none$/i,""));c(h.select("*",i.node),function(m){var n={},k=0,l,o,j;if(d){for(l=0;l<d.length;l++){o=d[l];j=h.getStyle(m,o);if(j){n[o]=j;k++}}}h.setAttrib(m,"style","");if(d&&k>0){h.setStyles(m,n)}else{if(m.nodeName=="SPAN"&&!m.className){h.remove(m,true)}}})}}if(b(e,"paste_remove_styles")||(b(e,"paste_remove_styles_if_webkit")&&tinymce.isWebKit)){c(h.select("*[style]",i.node),function(j){j.removeAttribute("style");j.removeAttribute("data-mce-style")})}else{if(tinymce.isWebKit){c(h.select("*",i.node),function(j){j.removeAttribute("data-mce-style")})}}},_convertLists:function(g,e){var i=g.editor.dom,h,l,d=-1,f,m=[],k,j;c(i.select("p",e.node),function(t){var q,u="",s,r,n,o;for(q=t.firstChild;q&&q.nodeType==3;q=q.nextSibling){u+=q.nodeValue}u=t.innerHTML.replace(/<\/?\w+[^>]*>/gi,"").replace(/&nbsp;/g,"\u00a0");if(/^(__MCE_ITEM__)+[\u2022\u00b7\u00a7\u00d8o\u25CF]\s*\u00a0*/.test(u)){s="ul"}if(/^__MCE_ITEM__\s*\w+\.\s*\u00a0+/.test(u)){s="ol"}if(s){f=parseFloat(t.style.marginLeft||0);if(f>d){m.push(f)}if(!h||s!=k){h=i.create(s);i.insertAfter(h,t)}else{if(f>d){h=l.appendChild(i.create(s))}else{if(f<d){n=tinymce.inArray(m,f);o=i.getParents(h.parentNode,s);h=o[o.length-1-n]||h}}}c(i.select("span",t),function(v){var p=v.innerHTML.replace(/<\/?\w+[^>]*>/gi,"");if(s=="ul"&&/^__MCE_ITEM__[\u2022\u00b7\u00a7\u00d8o\u25CF]/.test(p)){i.remove(v)}else{if(/^__MCE_ITEM__[\s\S]*\w+\.(&nbsp;|\u00a0)*\s*/.test(p)){i.remove(v)}}});r=t.innerHTML;if(s=="ul"){r=t.innerHTML.replace(/__MCE_ITEM__/g,"").replace(/^[\u2022\u00b7\u00a7\u00d8o\u25CF]\s*(&nbsp;|\u00a0)+\s*/,"")}else{r=t.innerHTML.replace(/__MCE_ITEM__/g,"").replace(/^\s*\w+\.(&nbsp;|\u00a0)+\s*/,"")}l=h.appendChild(i.create("li",0,r));i.remove(t);d=f;k=s}else{h=d=0}});j=e.node.innerHTML;if(j.indexOf("__MCE_ITEM__")!=-1){e.node.innerHTML=j.replace(/__MCE_ITEM__/g,"")}},_insert:function(f,d){var e=this.editor,g=e.selection.getRng();if(!e.selection.isCollapsed()&&g.startContainer!=g.endContainer){e.getDoc().execCommand("Delete",false,null)}e.execCommand("mceInsertContent",false,f,{skip_undo:d})},_insertPlainText:function(j,x,v){var t,u,l,k,r,e,p,f,n=j.getWin(),z=j.getDoc(),s=j.selection,m=tinymce.is,y=tinymce.inArray,g=b(j,"paste_text_linebreaktype"),o=b(j,"paste_text_replacements");function q(d){c(d,function(h){if(h.constructor==RegExp){v=v.replace(h,"")}else{v=v.replace(h[0],h[1])}})}if((typeof(v)==="string")&&(v.length>0)){if(/<(?:p|br|h[1-6]|ul|ol|dl|table|t[rdh]|div|blockquote|fieldset|pre|address|center)[^>]*>/i.test(v)){q([/[\n\r]+/g])}else{q([/\r+/g])}q([[/<\/(?:p|h[1-6]|ul|ol|dl|table|div|blockquote|fieldset|pre|address|center)>/gi,"\n\n"],[/<br[^>]*>|<\/tr>/gi,"\n"],[/<\/t[dh]>\s*<t[dh][^>]*>/gi,"\t"],/<[a-z!\/?][^>]*>/gi,[/&nbsp;/gi," "],[/(?:(?!\n)\s)*(\n+)(?:(?!\n)\s)*/gi,"$1"],[/\n{3,}/g,"\n\n"],/^\s+|\s+$/g]);v=x.decode(tinymce.html.Entities.encodeRaw(v));if(!s.isCollapsed()){z.execCommand("Delete",false,null)}if(m(o,"array")||(m(o,"array"))){q(o)}else{if(m(o,"string")){q(new RegExp(o,"gi"))}}if(g=="none"){q([[/\n+/g," "]])}else{if(g=="br"){q([[/\n/g,"<br />"]])}else{q([/^\s+|\s+$/g,[/\n\n/g,"</p><p>"],[/\n/g,"<br />"]])}}if((l=v.indexOf("</p><p>"))!=-1){k=v.lastIndexOf("</p><p>");r=s.getNode();e=[];do{if(r.nodeType==1){if(r.nodeName=="TD"||r.nodeName=="BODY"){break}e[e.length]=r}}while(r=r.parentNode);if(e.length>0){p=v.substring(0,l);f="";for(t=0,u=e.length;t<u;t++){p+="</"+e[t].nodeName.toLowerCase()+">";f+="<"+e[e.length-t-1].nodeName.toLowerCase()+">"}if(l==k){v=p+f+v.substring(l+7)}else{v=p+v.substring(l+4,k+4)+f+v.substring(k+7)}}}j.execCommand("mceInsertRawHTML",false,v+'<span id="_plain_text_marker">&nbsp;</span>');window.setTimeout(function(){var d=x.get("_plain_text_marker"),A,h,w,i;s.select(d,false);z.execCommand("Delete",false,null);d=null;A=s.getStart();h=x.getViewPort(n);w=x.getPos(A).y;i=A.clientHeight;if((w<h.y)||(w+i>h.y+h.h)){z.body.scrollTop=w<h.y?w:w-h.h+25}},0)}},_legacySupport:function(){var e=this,d=e.editor;d.addCommand("mcePasteWord",function(){d.windowManager.open({file:e.url+"/pasteword.htm",width:parseInt(b(d,"paste_dialog_width")),height:parseInt(b(d,"paste_dialog_height")),inline:1})});if(b(d,"paste_text_use_dialog")){d.addCommand("mcePasteText",function(){d.windowManager.open({file:e.url+"/pastetext.htm",width:parseInt(b(d,"paste_dialog_width")),height:parseInt(b(d,"paste_dialog_height")),inline:1})})}d.addButton("pasteword",{title:"paste.paste_word_desc",cmd:"mcePasteWord"})}});tinymce.PluginManager.add("paste",tinymce.plugins.PastePlugin)})();
\ No newline at end of file
diff --git a/plugins/TinyMCE/js/plugins/paste/editor_plugin_src.js b/plugins/TinyMCE/js/plugins/paste/editor_plugin_src.js
index ad9740f3fe..9f8d39f730 100644
--- a/plugins/TinyMCE/js/plugins/paste/editor_plugin_src.js
+++ b/plugins/TinyMCE/js/plugins/paste/editor_plugin_src.js
@@ -10,9 +10,9 @@
 
 (function() {
 	var each = tinymce.each,
-		entities = null,
 		defs = {
 			paste_auto_cleanup_on_paste : true,
+			paste_enable_default_filters : true,
 			paste_block_drop : false,
 			paste_retain_style_properties : "none",
 			paste_strip_class_attributes : "mso",
@@ -25,6 +25,7 @@
 			paste_dialog_height : "400",
 			paste_text_use_dialog : false,
 			paste_text_sticky : false,
+			paste_text_sticky_default : false,
 			paste_text_notifyalways : false,
 			paste_text_linebreaktype : "p",
 			paste_text_replacements : [
@@ -63,13 +64,19 @@
 				ed.execCallback('paste_postprocess', pl, o);
 			});
 
+			ed.onKeyDown.addToTop(function(ed, e) {
+				// Block ctrl+v from adding an undo level since the default logic in tinymce.Editor will add that
+				if (((tinymce.isMac ? e.metaKey : e.ctrlKey) && e.keyCode == 86) || (e.shiftKey && e.keyCode == 45))
+					return false; // Stop other listeners
+			});
+
 			// Initialize plain text flag
-			ed.pasteAsPlainText = false;
+			ed.pasteAsPlainText = getParam(ed, 'paste_text_sticky_default');
 
 			// This function executes the process handlers and inserts the contents
 			// force_rich overrides plain text mode set by user, important for pasting with execCommand
 			function process(o, force_rich) {
-				var dom = ed.dom;
+				var dom = ed.dom, rng;
 
 				// Execute pre process handlers
 				t.onPreProcess.dispatch(t, o);
@@ -77,11 +84,22 @@
 				// Create DOM structure
 				o.node = dom.create('div', 0, o.content);
 
+				// If pasting inside the same element and the contents is only one block
+				// remove the block and keep the text since Firefox will copy parts of pre and h1-h6 as a pre element
+				if (tinymce.isGecko) {
+					rng = ed.selection.getRng(true);
+					if (rng.startContainer == rng.endContainer && rng.startContainer.nodeType == 3) {
+						// Is only one block node and it doesn't contain word stuff
+						if (o.node.childNodes.length === 1 && /^(p|h[1-6]|pre)$/i.test(o.node.firstChild.nodeName) && o.content.indexOf('__MCE_ITEM__') === -1)
+							dom.remove(o.node.firstChild, true);
+					}
+				}
+
 				// Execute post process handlers
 				t.onPostProcess.dispatch(t, o);
 
 				// Serialize content
-				o.content = ed.serializer.serialize(o.node, {getInner : 1});
+				o.content = ed.serializer.serialize(o.node, {getInner : 1, forced_root_block : ''});
 
 				// Plain text option active?
 				if ((!force_rich) && (ed.pasteAsPlainText)) {
@@ -91,9 +109,6 @@
 						ed.pasteAsPlainText = false;
 						ed.controlManager.setActive("pastetext", false);
 					}
-				} else if (/<(p|h[1-6]|ul|ol)/.test(o.content)) {
-					// Handle insertion of contents containing block elements separately
-					t._insertBlockContent(ed, dom, o.content);
 				} else {
 					t._insert(o.content);
 				}
@@ -132,38 +147,46 @@
 			// hidden div and placing the caret inside it and after the browser paste
 			// is done it grabs that contents and processes that
 			function grabContent(e) {
-				var n, or, rng, sel = ed.selection, dom = ed.dom, body = ed.getBody(), posY;
+				var n, or, rng, oldRng, sel = ed.selection, dom = ed.dom, body = ed.getBody(), posY, textContent;
 
 				// Check if browser supports direct plaintext access
-				if (ed.pasteAsPlainText && (e.clipboardData || dom.doc.dataTransfer)) {
-					e.preventDefault();
-					process({content : (e.clipboardData || dom.doc.dataTransfer).getData('Text')}, true);
-					return;
+				if (e.clipboardData || dom.doc.dataTransfer) {
+					textContent = (e.clipboardData || dom.doc.dataTransfer).getData('Text');
+
+					if (ed.pasteAsPlainText) {
+						e.preventDefault();
+						process({content : textContent.replace(/\r?\n/g, '<br />')});
+						return;
+					}
 				}
 
 				if (dom.get('_mcePaste'))
 					return;
 
 				// Create container to paste into
-				n = dom.add(body, 'div', {id : '_mcePaste', 'class' : 'mcePaste'}, '\uFEFF<br _mce_bogus="1">');
+				n = dom.add(body, 'div', {id : '_mcePaste', 'class' : 'mcePaste', 'data-mce-bogus' : '1'}, '\uFEFF\uFEFF');
 
 				// If contentEditable mode we need to find out the position of the closest element
 				if (body != ed.getDoc().body)
 					posY = dom.getPos(ed.selection.getStart(), body).y;
 				else
-					posY = body.scrollTop;
+					posY = body.scrollTop + dom.getViewPort(ed.getWin()).y;
 
 				// Styles needs to be applied after the element is added to the document since WebKit will otherwise remove all styles
+				// If also needs to be in view on IE or the paste would fail
 				dom.setStyles(n, {
 					position : 'absolute',
-					left : -10000,
-					top : posY,
+					left : tinymce.isGecko ? -40 : 0, // Need to move it out of site on Gecko since it will othewise display a ghost resize rect for the div
+					top : posY - 25,
 					width : 1,
 					height : 1,
 					overflow : 'hidden'
 				});
 
 				if (tinymce.isIE) {
+					// Store away the old range
+					oldRng = sel.getRng();
+
 					// Select the container
 					rng = dom.doc.body.createTextRange();
 					rng.moveToElementText(n);
@@ -174,14 +197,23 @@
 
 					// Check if the contents was changed, if it wasn't then clipboard extraction failed probably due
 					// to IE security settings so we pass the junk though better than nothing right
-					if (n.innerHTML === '\uFEFF') {
+					if (n.innerHTML === '\uFEFF\uFEFF') {
 						ed.execCommand('mcePasteWord');
 						e.preventDefault();
 						return;
 					}
 
-					// Process contents
-					process({content : n.innerHTML});
+					// Restore the old range and clear the contents before pasting
+					sel.setRng(oldRng);
+					sel.setContent('');
+
+					// For some odd reason we need to detach the the mceInsertContent call from the paste event
+					// It's like IE has a reference to the parent element that you paste in and the selection gets messed up
+					// when it tries to restore the selection
+					setTimeout(function() {
+						// Process contents
+						process({content : n.innerHTML});
+					}, 0);
 
 					// Block the real paste event
 					return tinymce.dom.Event.cancel(e);
@@ -196,46 +228,51 @@
 
 					or = ed.selection.getRng();
 
-					// Move caret into hidden div
+					// Move select contents inside DIV
 					n = n.firstChild;
 					rng = ed.getDoc().createRange();
 					rng.setStart(n, 0);
-					rng.setEnd(n, 1);
+					rng.setEnd(n, 2);
 					sel.setRng(rng);
 
 					// Wait a while and grab the pasted contents
 					window.setTimeout(function() {
-						var h = '', nl = dom.select('div.mcePaste');
+						var h = '', nl;
 
-						// WebKit will split the div into multiple ones so this will loop through then all and join them to get the whole HTML string
-						each(nl, function(n) {
-							var child = n.firstChild;
+						// Paste divs duplicated in paste divs seems to happen when you paste plain text so lets first look for that broken behavior in WebKit
+						if (!dom.select('div.mcePaste > div.mcePaste').length) {
+							nl = dom.select('div.mcePaste');
 
-							// WebKit inserts a DIV container with lots of odd styles
-							if (child && child.nodeName == 'DIV' && child.style.marginTop && child.style.backgroundColor) {
-								dom.remove(child, 1);
-							}
+							// WebKit will split the div into multiple ones so this will loop through then all and join them to get the whole HTML string
+							each(nl, function(n) {
+								var child = n.firstChild;
 
-							// WebKit duplicates the divs so we need to remove them
-							each(dom.select('div.mcePaste', n), function(n) {
-								dom.remove(n, 1);
+								// WebKit inserts a DIV container with lots of odd styles
+								if (child && child.nodeName == 'DIV' && child.style.marginTop && child.style.backgroundColor) {
+									dom.remove(child, 1);
+								}
+
+								// Remove apply style spans
+								each(dom.select('span.Apple-style-span', n), function(n) {
+									dom.remove(n, 1);
+								});
+
+								// Remove bogus br elements
+								each(dom.select('br[data-mce-bogus]', n), function(n) {
+									dom.remove(n);
+								});
+
+								// WebKit will make a copy of the DIV for each line of plain text pasted and insert them into the DIV
+								if (n.parentNode.className != 'mcePaste')
+									h += n.innerHTML;
 							});
-
-							// Remove apply style spans
-							each(dom.select('span.Apple-style-span', n), function(n) {
-								dom.remove(n, 1);
-							});
-
-							// Remove bogus br elements
-							each(dom.select('br[_mce_bogus]', n), function(n) {
-								dom.remove(n);
-							});
-
-							h += n.innerHTML;
-						});
+						} else {
+							// Found WebKit weirdness so force the content into plain text mode
+							h = '<pre>' + dom.encode(textContent).replace(/\r?\n/g, '<br />') + '</pre>';
+						}
 
 						// Remove the nodes
-						each(nl, function(n) {
+						each(dom.select('div.mcePaste'), function(n) {
 							dom.remove(n);
 						});
 
@@ -256,7 +293,7 @@
 			if (getParam(ed, "paste_auto_cleanup_on_paste")) {
 				// Is it's Opera or older FF use key handler
 				if (tinymce.isOpera || /Firefox\/2/.test(navigator.userAgent)) {
-					ed.onKeyDown.add(function(ed, e) {
+					ed.onKeyDown.addToTop(function(ed, e) {
 						if (((tinymce.isMac ? e.metaKey : e.ctrlKey) && e.keyCode == 86) || (e.shiftKey && e.keyCode == 45))
 							grabContent(e);
 					});
@@ -268,17 +305,19 @@
 				}
 			}
 
-			// Block all drag/drop events
-			if (getParam(ed, "paste_block_drop")) {
-				ed.onInit.add(function() {
+			ed.onInit.add(function() {
+				ed.controlManager.setActive("pastetext", ed.pasteAsPlainText);
+
+				// Block all drag/drop events
+				if (getParam(ed, "paste_block_drop")) {
 					ed.dom.bind(ed.getBody(), ['dragend', 'dragover', 'draggesture', 'dragdrop', 'drop', 'drag'], function(e) {
 						e.preventDefault();
 						e.stopPropagation();
 
 						return false;
 					});
-				});
-			}
+				}
+			});
 
 			// Add legacy support
 			t._legacySupport();
@@ -295,8 +334,6 @@
 		},
 
 		_preProcess : function(pl, o) {
-			//console.log('Before preprocess:' + o.content);
-
 			var ed = this.editor,
 				h = o.content,
 				grep = tinymce.grep,
@@ -304,6 +341,8 @@
 				trim = tinymce.trim,
 				len, stripClass;
 
+			//console.log('Before preprocess:' + o.content);
+
 			function process(items) {
 				each(items, function(v) {
 					// Remove or replace
@@ -313,6 +352,23 @@
 						h = h.replace(v[0], v[1]);
 				});
 			}
+			
+			if (ed.settings.paste_enable_default_filters == false) {
+				return;
+			}
+
+			// IE9 adds BRs before/after block elements when contents is pasted from word or for example another browser
+			if (tinymce.isIE && document.documentMode >= 9) {
+				// IE9 adds BRs before/after block elements when contents is pasted from word or for example another browser
+				process([[/(?:<br>&nbsp;[\s\r\n]+|<br>)*(<\/?(h[1-6r]|p|div|address|pre|form|table|tbody|thead|tfoot|th|tr|td|li|ol|ul|caption|blockquote|center|dl|dt|dd|dir|fieldset)[^>]*>)(?:<br>&nbsp;[\s\r\n]+|<br>)*/g, '$1']]);
+
+				// IE9 also adds an extra BR element for each soft-linefeed and it also adds a BR for each word wrap break
+				process([
+					[/<br><br>/g, '<BR><BR>'], // Replace multiple BR elements with uppercase BR to keep them intact
+					[/<br>/g, ' '], // Replace single br elements with space since they are word wrap BR:s
+					[/<BR><BR>/g, '<br>'], // Replace back the double brs but into a single BR
+				]);
+			}
 
 			// Detect Word content and process it more aggressive
 			if (/class="?Mso|style="[^"]*\bmso-|w:WordDocument/i.test(h) || o.wordContent) {
@@ -332,7 +388,8 @@
 				if (getParam(ed, "paste_convert_middot_lists")) {
 					process([
 						[/<!--\[if !supportLists\]-->/gi, '$&__MCE_ITEM__'],					// Convert supportLists to a list item marker
-						[/(<span[^>]+(?:mso-list:|:\s*symbol)[^>]+>)/gi, '$1__MCE_ITEM__']		// Convert mso-list and symbol spans to item markers
+						[/(<span[^>]+(?:mso-list:|:\s*symbol)[^>]+>)/gi, '$1__MCE_ITEM__'],		// Convert mso-list and symbol spans to item markers
+						[/(<p[^>]+(?:MsoListParagraph)[^>]+>)/gi, '$1__MCE_ITEM__']				// Convert mso-list and symbol paragraphs to item markers (FF)
 					]);
 				}
 
@@ -484,6 +541,11 @@
 				]);
 			}
 
+			process([
+				// Copy paste from Java like Open Office will produce this junk on FF
+				[/Version:[\d.]+\nStartHTML:\d+\nEndHTML:\d+\nStartFragment:\d+\nEndFragment:\d+/gi, '']
+			]);
+
 			// Class attribute options are: leave all as-is ("none"), remove all ("all"), or remove only those starting with mso ("mso").
 			// Note:-  paste_strip_class_attributes: "none", verify_css_classes: true is also a good variation.
 			stripClass = getParam(ed, "paste_strip_class_attributes");
@@ -503,7 +565,7 @@
 				};
 
 				h = h.replace(/ class="([^"]+)"/gi, removeClasses);
-				h = h.replace(/ class=(\w+)/gi, removeClasses);
+				h = h.replace(/ class=([\-\w]+)/gi, removeClasses);
 			}
 
 			// Remove spans option
@@ -522,6 +584,10 @@
 		_postProcess : function(pl, o) {
 			var t = this, ed = t.editor, dom = ed.dom, styleProps;
 
+			if (ed.settings.paste_enable_default_filters == false) {
+				return;
+			}
+			
 			if (o.wordContent) {
 				// Remove named anchors or TOC links
 				each(dom.select('a', o.node), function(a) {
@@ -573,14 +639,14 @@
 			if (getParam(ed, "paste_remove_styles") || (getParam(ed, "paste_remove_styles_if_webkit") && tinymce.isWebKit)) {
 				each(dom.select('*[style]', o.node), function(el) {
 					el.removeAttribute('style');
-					el.removeAttribute('_mce_style');
+					el.removeAttribute('data-mce-style');
 				});
 			} else {
 				if (tinymce.isWebKit) {
 					// We need to compress the styles on WebKit since if you paste <img border="0" /> it will become <img border="0" style="... lots of junk ..." />
 					// Removing the mce_style that contains the real value will force the Serializer engine to compress the styles
 					each(dom.select('*', o.node), function(el) {
-						el.removeAttribute('_mce_style');
+						el.removeAttribute('data-mce-style');
 					});
 				}
 			}
@@ -603,11 +669,11 @@
 				val = p.innerHTML.replace(/<\/?\w+[^>]*>/gi, '').replace(/&nbsp;/g, '\u00a0');
 
 				// Detect unordered lists look for bullets
-				if (/^(__MCE_ITEM__)+[\u2022\u00b7\u00a7\u00d8o]\s*\u00a0*/.test(val))
+				if (/^(__MCE_ITEM__)+[\u2022\u00b7\u00a7\u00d8o\u25CF]\s*\u00a0*/.test(val))
 					type = 'ul';
 
 				// Detect ordered lists 1., a. or ixv.
-				if (/^__MCE_ITEM__\s*\w+\.\s*\u00a0{2,}/.test(val))
+				if (/^__MCE_ITEM__\s*\w+\.\s*\u00a0+/.test(val))
 					type = 'ol';
 
 				// Check if node value matches the list pattern: o&nbsp;&nbsp;
@@ -637,9 +703,9 @@
 						var html = span.innerHTML.replace(/<\/?\w+[^>]*>/gi, '');
 
 						// Remove span with the middot or the number
-						if (type == 'ul' && /^[\u2022\u00b7\u00a7\u00d8o]/.test(html))
+						if (type == 'ul' && /^__MCE_ITEM__[\u2022\u00b7\u00a7\u00d8o\u25CF]/.test(html))
 							dom.remove(span);
-						else if (/^[\s\S]*\w+\.(&nbsp;|\u00a0)*\s*/.test(html))
+						else if (/^__MCE_ITEM__[\s\S]*\w+\.(&nbsp;|\u00a0)*\s*/.test(html))
 							dom.remove(span);
 					});
 
@@ -647,7 +713,7 @@
 
 					// Remove middot/list items
 					if (type == 'ul')
-						html = p.innerHTML.replace(/__MCE_ITEM__/g, '').replace(/^[\u2022\u00b7\u00a7\u00d8o]\s*(&nbsp;|\u00a0)+\s*/, '');
+						html = p.innerHTML.replace(/__MCE_ITEM__/g, '').replace(/^[\u2022\u00b7\u00a7\u00d8o\u25CF]\s*(&nbsp;|\u00a0)+\s*/, '');
 					else
 						html = p.innerHTML.replace(/__MCE_ITEM__/g, '').replace(/^\s*\w+\.(&nbsp;|\u00a0)+\s*/, '');
 
@@ -667,65 +733,6 @@
 				o.node.innerHTML = html.replace(/__MCE_ITEM__/g, '');
 		},
 
-		/**
-		 * This method will split the current block parent and insert the contents inside the split position.
-		 * This logic can be improved so text nodes at the start/end remain in the start/end block elements
-		 */
-		_insertBlockContent : function(ed, dom, content) {
-			var parentBlock, marker, sel = ed.selection, last, elm, vp, y, elmHeight, markerId = 'mce_marker';
-
-			function select(n) {
-				var r;
-
-				if (tinymce.isIE) {
-					r = ed.getDoc().body.createTextRange();
-					r.moveToElementText(n);
-					r.collapse(false);
-					r.select();
-				} else {
-					sel.select(n, 1);
-					sel.collapse(false);
-				}
-			}
-
-			// Insert a marker for the caret position
-			this._insert('<span id="' + markerId + '"></span>', 1);
-			marker = dom.get(markerId);
-			parentBlock = dom.getParent(marker, 'p,h1,h2,h3,h4,h5,h6,ul,ol,th,td');
-
-			// If it's a parent block but not a table cell
-			if (parentBlock && !/TD|TH/.test(parentBlock.nodeName)) {
-				// Split parent block
-				marker = dom.split(parentBlock, marker);
-
-				// Insert nodes before the marker
-				each(dom.create('div', 0, content).childNodes, function(n) {
-					last = marker.parentNode.insertBefore(n.cloneNode(true), marker);
-				});
-
-				// Move caret after marker
-				select(last);
-			} else {
-				dom.setOuterHTML(marker, content);
-				sel.select(ed.getBody(), 1);
-				sel.collapse(0);
-			}
-
-			// Remove marker if it's left
-			while (elm = dom.get(markerId))
-				dom.remove(elm);
-
-			// Get element, position and height
-			elm = sel.getStart();
-			vp = dom.getViewPort(ed.getWin());
-			y = ed.dom.getPos(elm).y;
-			elmHeight = elm.clientHeight;
-
-			// Is element within viewport if not then scroll it into view
-			if (y < vp.y || y + elmHeight > vp.y + vp.h)
-				ed.getDoc().body.scrollTop = y < vp.y ? y : y - vp.h + 25;
-		},
-
 		/**
 		 * Inserts the specified contents at the caret position.
 		 */
@@ -736,8 +743,7 @@
 			if (!ed.selection.isCollapsed() && r.startContainer != r.endContainer)
 				ed.getDoc().execCommand('Delete', false, null);
 
-			// It's better to use the insertHTML method on Gecko since it will combine paragraphs correctly before inserting the contents
-			ed.execCommand(tinymce.isGecko ? 'insertHTML' : 'mceInsertContent', false, h, {skip_undo : skip_undo});
+			ed.execCommand('mceInsertContent', false, h, {skip_undo : skip_undo});
 		},
 
 		/**
@@ -769,9 +775,6 @@
 			};
 
 			if ((typeof(h) === "string") && (h.length > 0)) {
-				if (!entities)
-					entities = ("34,quot,38,amp,39,apos,60,lt,62,gt," + ed.serializer.settings.entities).split(",");
-
 				// If HTML content with line-breaking tags, then remove all cr/lf chars because only tags will break a line
 				if (/<(?:p|br|h[1-6]|ul|ol|dl|table|t[rdh]|div|blockquote|fieldset|pre|address|center)[^>]*>/i.test(h)) {
 					process([
@@ -790,26 +793,12 @@
 					[/<\/t[dh]>\s*<t[dh][^>]*>/gi, "\t"],		// Table cells get tabs betweem them
 					/<[a-z!\/?][^>]*>/gi,						// Delete all remaining tags
 					[/&nbsp;/gi, " "],							// Convert non-break spaces to regular spaces (remember, *plain text*)
-					[
-						// HTML entity
-						/&(#\d+|[a-z0-9]{1,10});/gi,
-
-						// Replace with actual character
-						function(e, s) {
-							if (s.charAt(0) === "#") {
-								return String.fromCharCode(s.slice(1));
-							}
-							else {
-								return ((e = inArray(entities, s)) > 0)? String.fromCharCode(entities[e-1]) : " ";
-							}
-						}
-					],
 					[/(?:(?!\n)\s)*(\n+)(?:(?!\n)\s)*/gi, "$1"],	// Cool little RegExp deletes whitespace around linebreak chars.
 					[/\n{3,}/g, "\n\n"],							// Max. 2 consecutive linebreaks
 					/^\s+|\s+$/g									// Trim the front & back
 				]);
 
-				h = dom.encode(h);
+				h = dom.decode(tinymce.html.Entities.encodeRaw(h));
 
 				// Delete any highlighted text before pasting
 				if (!sel.isCollapsed()) {
diff --git a/plugins/TinyMCE/js/plugins/searchreplace/editor_plugin.js b/plugins/TinyMCE/js/plugins/searchreplace/editor_plugin.js
index cd9c985b7a..165bc12df5 100644
--- a/plugins/TinyMCE/js/plugins/searchreplace/editor_plugin.js
+++ b/plugins/TinyMCE/js/plugins/searchreplace/editor_plugin.js
@@ -1 +1 @@
-(function(){tinymce.create("tinymce.plugins.SearchReplacePlugin",{init:function(a,c){function b(d){a.windowManager.open({file:c+"/searchreplace.htm",width:420+parseInt(a.getLang("searchreplace.delta_width",0)),height:170+parseInt(a.getLang("searchreplace.delta_height",0)),inline:1,auto_focus:0},{mode:d,search_string:a.selection.getContent({format:"text"}),plugin_url:c})}a.addCommand("mceSearch",function(){b("search")});a.addCommand("mceReplace",function(){b("replace")});a.addButton("search",{title:"searchreplace.search_desc",cmd:"mceSearch"});a.addButton("replace",{title:"searchreplace.replace_desc",cmd:"mceReplace"});a.addShortcut("ctrl+f","searchreplace.search_desc","mceSearch")},getInfo:function(){return{longname:"Search/Replace",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/searchreplace",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("searchreplace",tinymce.plugins.SearchReplacePlugin)})();
\ No newline at end of file
+(function(){tinymce.create("tinymce.plugins.SearchReplacePlugin",{init:function(a,c){function b(d){window.focus();a.windowManager.open({file:c+"/searchreplace.htm",width:420+parseInt(a.getLang("searchreplace.delta_width",0)),height:170+parseInt(a.getLang("searchreplace.delta_height",0)),inline:1,auto_focus:0},{mode:d,search_string:a.selection.getContent({format:"text"}),plugin_url:c})}a.addCommand("mceSearch",function(){b("search")});a.addCommand("mceReplace",function(){b("replace")});a.addButton("search",{title:"searchreplace.search_desc",cmd:"mceSearch"});a.addButton("replace",{title:"searchreplace.replace_desc",cmd:"mceReplace"});a.addShortcut("ctrl+f","searchreplace.search_desc","mceSearch")},getInfo:function(){return{longname:"Search/Replace",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/searchreplace",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("searchreplace",tinymce.plugins.SearchReplacePlugin)})();
\ No newline at end of file
diff --git a/plugins/TinyMCE/js/plugins/searchreplace/editor_plugin_src.js b/plugins/TinyMCE/js/plugins/searchreplace/editor_plugin_src.js
index 1433a06a4a..4c87e8fa79 100644
--- a/plugins/TinyMCE/js/plugins/searchreplace/editor_plugin_src.js
+++ b/plugins/TinyMCE/js/plugins/searchreplace/editor_plugin_src.js
@@ -12,6 +12,10 @@
 	tinymce.create('tinymce.plugins.SearchReplacePlugin', {
 		init : function(ed, url) {
 			function open(m) {
+				// Keep IE from writing out the f/r character to the editor
+				// instance while initializing a new dialog. See: #3131190
+				window.focus();
+
 				ed.windowManager.open({
 					file : url + '/searchreplace.htm',
 					width : 420 + parseInt(ed.getLang('searchreplace.delta_width', 0)),
diff --git a/plugins/TinyMCE/js/plugins/searchreplace/js/searchreplace.js b/plugins/TinyMCE/js/plugins/searchreplace/js/searchreplace.js
index c0a6243297..80284b9f3f 100644
--- a/plugins/TinyMCE/js/plugins/searchreplace/js/searchreplace.js
+++ b/plugins/TinyMCE/js/plugins/searchreplace/js/searchreplace.js
@@ -2,14 +2,18 @@ tinyMCEPopup.requireLangPack();
 
 var SearchReplaceDialog = {
 	init : function(ed) {
-		var f = document.forms[0], m = tinyMCEPopup.getWindowArg("mode");
+		var t = this, f = document.forms[0], m = tinyMCEPopup.getWindowArg("mode");
 
-		this.switchMode(m);
+		t.switchMode(m);
 
 		f[m + '_panel_searchstring'].value = tinyMCEPopup.getWindowArg("search_string");
 
 		// Focus input field
 		f[m + '_panel_searchstring'].focus();
+		
+		mcTabs.onChange.add(function(tab_id, panel_id) {
+			t.switchMode(tab_id.substring(0, tab_id.indexOf('_')));
+		});
 	},
 
 	switchMode : function(m) {
@@ -42,21 +46,23 @@ var SearchReplaceDialog = {
 		ca = f[m + '_panel_casesensitivebox'].checked;
 		rs = f['replace_panel_replacestring'].value;
 
+		if (tinymce.isIE) {
+			r = ed.getDoc().selection.createRange();
+		}
+
 		if (s == '')
 			return;
 
 		function fix() {
 			// Correct Firefox graphics glitches
+			// TODO: Verify if this is actually needed any more, maybe it was for very old FF versions? 
 			r = se.getRng().cloneRange();
 			ed.getDoc().execCommand('SelectAll', false, null);
 			se.setRng(r);
 		};
 
 		function replace() {
-			if (tinymce.isIE)
-				ed.selection.getRng().duplicate().pasteHTML(rs); // Needs to be duplicated due to selection bug in IE
-			else
-				ed.getDoc().execCommand('InsertHTML', false, rs);
+			ed.selection.setContent(rs); // Needs to be duplicated due to selection bug in IE
 		};
 
 		// IE flags
@@ -70,6 +76,9 @@ var SearchReplaceDialog = {
 				ed.selection.collapse(true);
 
 				if (tinymce.isIE) {
+					ed.focus();
+					r = ed.getDoc().selection.createRange();
+
 					while (r.findText(s, b ? -1 : 1, fl)) {
 						r.scrollIntoView();
 						r.select();
@@ -111,6 +120,9 @@ var SearchReplaceDialog = {
 			return;
 
 		if (tinymce.isIE) {
+			ed.focus();
+			r = ed.getDoc().selection.createRange();
+
 			if (r.findText(s, b ? -1 : 1, fl)) {
 				r.scrollIntoView();
 				r.select();
diff --git a/plugins/TinyMCE/js/plugins/searchreplace/searchreplace.htm b/plugins/TinyMCE/js/plugins/searchreplace/searchreplace.htm
index d0424cfc9b..5a22d8aa4d 100644
--- a/plugins/TinyMCE/js/plugins/searchreplace/searchreplace.htm
+++ b/plugins/TinyMCE/js/plugins/searchreplace/searchreplace.htm
@@ -8,27 +8,28 @@
 	<script type="text/javascript" src="js/searchreplace.js"></script>
 	<link rel="stylesheet" type="text/css" href="css/searchreplace.css" />
 </head>
-<body style="display:none;">
+<body style="display:none;" role="application" aria-labelledby="app_title">
+<span id="app_title" style="display:none">{#searchreplace_dlg.replace_title}</span>
 <form onsubmit="SearchReplaceDialog.searchNext('none');return false;" action="#">
 	<div class="tabs">
 		<ul>
-			<li id="search_tab"><span><a href="javascript:SearchReplaceDialog.switchMode('search');" onmousedown="return false;">{#searchreplace.search_desc}</a></span></li>
-			<li id="replace_tab"><span><a href="javascript:SearchReplaceDialog.switchMode('replace');" onmousedown="return false;">{#searchreplace_dlg.replace}</a></span></li>
+			<li id="search_tab" aria-controls="search_panel"><span><a href="javascript:SearchReplaceDialog.switchMode('search');" onmousedown="return false;">{#searchreplace.search_desc}</a></span></li>
+			<li id="replace_tab" aria-controls="replace_panel"><span><a href="javascript:SearchReplaceDialog.switchMode('replace');" onmousedown="return false;">{#searchreplace_dlg.replace}</a></span></li>
 		</ul>
 	</div>
 
 	<div class="panel_wrapper">
 		<div id="search_panel" class="panel">
-			<table border="0" cellspacing="0" cellpadding="2">
+			<table role="presentation" border="0" cellspacing="0" cellpadding="2">
 				<tr>
 					<td><label for="search_panel_searchstring">{#searchreplace_dlg.findwhat}</label></td>
-					<td><input type="text" id="search_panel_searchstring" name="search_panel_searchstring" style="width: 200px" /></td>
+					<td><input type="text" id="search_panel_searchstring" name="search_panel_searchstring" style="width: 200px" aria-required="true" /></td>
 				</tr>
 				<tr>
 					<td colspan="2">
-						<table border="0" cellspacing="0" cellpadding="0" class="direction">
-							<tr>
-								<td><label>{#searchreplace_dlg.direction}</label></td>
+						<table role="presentation" border="0" cellspacing="0" cellpadding="0" class="direction">
+							<tr role="group" aria-labelledby="search_panel_backwards_label">
+								<td><label id="search_panel_backwards_label">{#searchreplace_dlg.direction}</label></td>
 								<td><input id="search_panel_backwardsu" name="search_panel_backwards" class="radio" type="radio" /></td>
 								<td><label for="search_panel_backwardsu">{#searchreplace_dlg.up}</label></td>
 								<td><input id="search_panel_backwardsd" name="search_panel_backwards" class="radio" type="radio" checked="checked" /></td>
@@ -39,7 +40,7 @@
 				</tr>
 				<tr>
 					<td colspan="2">
-						<table border="0" cellspacing="0" cellpadding="0">
+						<table role="presentation" border="0" cellspacing="0" cellpadding="0">
 							<tr>
 								<td><input id="search_panel_casesensitivebox" name="search_panel_casesensitivebox" class="checkbox" type="checkbox" /></td>
 								<td><label for="search_panel_casesensitivebox">{#searchreplace_dlg.mcase}</label></td>
@@ -51,20 +52,20 @@
 		</div>
 
 		<div id="replace_panel" class="panel">
-			<table border="0" cellspacing="0" cellpadding="2">
+			<table role="presentation" border="0" cellspacing="0" cellpadding="2">
 				<tr>
 					<td><label for="replace_panel_searchstring">{#searchreplace_dlg.findwhat}</label></td>
-					<td><input type="text" id="replace_panel_searchstring" name="replace_panel_searchstring" style="width: 200px" /></td>
+					<td><input type="text" id="replace_panel_searchstring" name="replace_panel_searchstring" style="width: 200px" aria-required="true" /></td>
 				</tr>
 				<tr>
 					<td><label for="replace_panel_replacestring">{#searchreplace_dlg.replacewith}</label></td>
-					<td><input type="text" id="replace_panel_replacestring" name="replace_panel_replacestring" style="width: 200px" /></td>
+					<td><input type="text" id="replace_panel_replacestring" name="replace_panel_replacestring" style="width: 200px" aria-required="true" /></td>
 				</tr>
 				<tr>
 					<td colspan="2">
-						<table border="0" cellspacing="0" cellpadding="0" class="direction">
-							<tr>
-								<td><label>{#searchreplace_dlg.direction}</label></td>
+						<table role="presentation" border="0" cellspacing="0" cellpadding="0" class="direction">
+							<tr role="group" aria-labelledby="replace_panel_dir_label">
+								<td><label id="replace_panel_dir_label">{#searchreplace_dlg.direction}</label></td>
 								<td><input id="replace_panel_backwardsu" name="replace_panel_backwards" class="radio" type="radio" /></td>
 								<td><label for="replace_panel_backwardsu">{#searchreplace_dlg.up}</label></td>
 								<td><input id="replace_panel_backwardsd" name="replace_panel_backwards" class="radio" type="radio" checked="checked" /></td>
@@ -75,7 +76,7 @@
 				</tr>
 				<tr>
 					<td colspan="2">
-						<table border="0" cellspacing="0" cellpadding="0">
+						<table role="presentation" border="0" cellspacing="0" cellpadding="0">
 							<tr>
 								<td><input id="replace_panel_casesensitivebox" name="replace_panel_casesensitivebox" class="checkbox" type="checkbox" /></td>
 								<td><label for="replace_panel_casesensitivebox">{#searchreplace_dlg.mcase}</label></td>
diff --git a/plugins/TinyMCE/js/plugins/spellchecker/editor_plugin.js b/plugins/TinyMCE/js/plugins/spellchecker/editor_plugin.js
index a9ec3b9cf0..0c42739c6f 100644
--- a/plugins/TinyMCE/js/plugins/spellchecker/editor_plugin.js
+++ b/plugins/TinyMCE/js/plugins/spellchecker/editor_plugin.js
@@ -1 +1 @@
-(function(){var a=tinymce.util.JSONRequest,c=tinymce.each,b=tinymce.DOM;tinymce.create("tinymce.plugins.SpellcheckerPlugin",{getInfo:function(){return{longname:"Spellchecker",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/spellchecker",version:tinymce.majorVersion+"."+tinymce.minorVersion}},init:function(e,f){var g=this,d;g.url=f;g.editor=e;g.rpcUrl=e.getParam("spellchecker_rpc_url","{backend}");if(g.rpcUrl=="{backend}"){if(tinymce.isIE){return}g.hasSupport=true;e.onContextMenu.addToTop(function(h,i){if(g.active){return false}})}e.addCommand("mceSpellCheck",function(){if(g.rpcUrl=="{backend}"){g.editor.getBody().spellcheck=g.active=!g.active;return}if(!g.active){e.setProgressState(1);g._sendRPC("checkWords",[g.selectedLang,g._getWords()],function(h){if(h.length>0){g.active=1;g._markWords(h);e.setProgressState(0);e.nodeChanged()}else{e.setProgressState(0);if(e.getParam("spellchecker_report_no_misspellings",true)){e.windowManager.alert("spellchecker.no_mpell")}}})}else{g._done()}});e.onInit.add(function(){if(e.settings.content_css!==false){e.dom.loadCSS(f+"/css/content.css")}});e.onClick.add(g._showMenu,g);e.onContextMenu.add(g._showMenu,g);e.onBeforeGetContent.add(function(){if(g.active){g._removeWords()}});e.onNodeChange.add(function(i,h){h.setActive("spellchecker",g.active)});e.onSetContent.add(function(){g._done()});e.onBeforeGetContent.add(function(){g._done()});e.onBeforeExecCommand.add(function(h,i){if(i=="mceFullScreen"){g._done()}});g.languages={};c(e.getParam("spellchecker_languages","+English=en,Danish=da,Dutch=nl,Finnish=fi,French=fr,German=de,Italian=it,Polish=pl,Portuguese=pt,Spanish=es,Swedish=sv","hash"),function(i,h){if(h.indexOf("+")===0){h=h.substring(1);g.selectedLang=i}g.languages[h]=i})},createControl:function(h,d){var f=this,g,e=f.editor;if(h=="spellchecker"){if(f.rpcUrl=="{backend}"){if(f.hasSupport){g=d.createButton(h,{title:"spellchecker.desc",cmd:"mceSpellCheck",scope:f})}return g}g=d.createSplitButton(h,{title:"spellchecker.desc",cmd:"mceSpellCheck",scope:f});g.onRenderMenu.add(function(j,i){i.add({title:"spellchecker.langs","class":"mceMenuItemTitle"}).setDisabled(1);c(f.languages,function(n,m){var p={icon:1},l;p.onclick=function(){l.setSelected(1);f.selectedItem.setSelected(0);f.selectedItem=l;f.selectedLang=n};p.title=m;l=i.add(p);l.setSelected(n==f.selectedLang);if(n==f.selectedLang){f.selectedItem=l}})});return g}},_walk:function(i,g){var h=this.editor.getDoc(),e;if(h.createTreeWalker){e=h.createTreeWalker(i,NodeFilter.SHOW_TEXT,null,false);while((i=e.nextNode())!=null){g.call(this,i)}}else{tinymce.walk(i,g,"childNodes")}},_getSeparators:function(){var e="",d,f=this.editor.getParam("spellchecker_word_separator_chars",'\\s!"#$%&()*+,-./:;<=>?@[]^_{|}§©«®±¶·¸»¼½¾¿×÷¤\u201d\u201c');for(d=0;d<f.length;d++){e+="\\"+f.charAt(d)}return e},_getWords:function(){var e=this.editor,g=[],d="",f={},h=[];this._walk(e.getBody(),function(i){if(i.nodeType==3){d+=i.nodeValue+" "}});if(e.getParam("spellchecker_word_pattern")){h=d.match("("+e.getParam("spellchecker_word_pattern")+")","gi")}else{d=d.replace(new RegExp("([0-9]|["+this._getSeparators()+"])","g")," ");d=tinymce.trim(d.replace(/(\s+)/g," "));h=d.split(" ")}c(h,function(i){if(!f[i]){g.push(i);f[i]=1}});return g},_removeWords:function(e){var f=this.editor,h=f.dom,g=f.selection,d=g.getBookmark();c(h.select("span").reverse(),function(i){if(i&&(h.hasClass(i,"mceItemHiddenSpellWord")||h.hasClass(i,"mceItemHidden"))){if(!e||h.decode(i.innerHTML)==e){h.remove(i,1)}}});g.moveToBookmark(d)},_markWords:function(o){var i,h,g,f,e,n="",k=this.editor,p=this._getSeparators(),j=k.dom,d=[];var l=k.selection,m=l.getBookmark();c(o,function(q){n+=(n?"|":"")+q});i=new RegExp("(["+p+"])("+n+")(["+p+"])","g");h=new RegExp("^("+n+")","g");g=new RegExp("("+n+")(["+p+"]?)$","g");f=new RegExp("^("+n+")(["+p+"]?)$","g");e=new RegExp("("+n+")(["+p+"])","g");this._walk(this.editor.getBody(),function(q){if(q.nodeType==3){d.push(q)}});c(d,function(r){var q;if(r.nodeType==3){q=r.nodeValue;if(i.test(q)||h.test(q)||g.test(q)||f.test(q)){q=j.encode(q);q=q.replace(e,'<span class="mceItemHiddenSpellWord">$1</span>$2');q=q.replace(g,'<span class="mceItemHiddenSpellWord">$1</span>$2');j.replace(j.create("span",{"class":"mceItemHidden"},q),r)}}});l.moveToBookmark(m)},_showMenu:function(h,j){var i=this,h=i.editor,d=i._menu,l,k=h.dom,g=k.getViewPort(h.getWin()),f=j.target;j=0;if(!d){l=b.getPos(h.getContentAreaContainer());d=h.controlManager.createDropMenu("spellcheckermenu",{offset_x:l.x,offset_y:l.y,"class":"mceNoIcons"});i._menu=d}if(k.hasClass(f,"mceItemHiddenSpellWord")){d.removeAll();d.add({title:"spellchecker.wait","class":"mceMenuItemTitle"}).setDisabled(1);i._sendRPC("getSuggestions",[i.selectedLang,k.decode(f.innerHTML)],function(m){var e;d.removeAll();if(m.length>0){d.add({title:"spellchecker.sug","class":"mceMenuItemTitle"}).setDisabled(1);c(m,function(n){d.add({title:n,onclick:function(){k.replace(h.getDoc().createTextNode(n),f);i._checkDone()}})});d.addSeparator()}else{d.add({title:"spellchecker.no_sug","class":"mceMenuItemTitle"}).setDisabled(1)}e=i.editor.getParam("spellchecker_enable_ignore_rpc","");d.add({title:"spellchecker.ignore_word",onclick:function(){var n=f.innerHTML;k.remove(f,1);i._checkDone();if(e){h.setProgressState(1);i._sendRPC("ignoreWord",[i.selectedLang,n],function(o){h.setProgressState(0)})}}});d.add({title:"spellchecker.ignore_words",onclick:function(){var n=f.innerHTML;i._removeWords(k.decode(n));i._checkDone();if(e){h.setProgressState(1);i._sendRPC("ignoreWords",[i.selectedLang,n],function(o){h.setProgressState(0)})}}});if(i.editor.getParam("spellchecker_enable_learn_rpc")){d.add({title:"spellchecker.learn_word",onclick:function(){var n=f.innerHTML;k.remove(f,1);i._checkDone();h.setProgressState(1);i._sendRPC("learnWord",[i.selectedLang,n],function(o){h.setProgressState(0)})}})}d.update()});h.selection.select(f);l=k.getPos(f);d.showMenu(l.x,l.y+f.offsetHeight-g.y);return tinymce.dom.Event.cancel(j)}else{d.hideMenu()}},_checkDone:function(){var e=this,d=e.editor,g=d.dom,f;c(g.select("span"),function(h){if(h&&g.hasClass(h,"mceItemHiddenSpellWord")){f=true;return false}});if(!f){e._done()}},_done:function(){var d=this,e=d.active;if(d.active){d.active=0;d._removeWords();if(d._menu){d._menu.hideMenu()}if(e){d.editor.nodeChanged()}}},_sendRPC:function(e,g,d){var f=this;a.sendRPC({url:f.rpcUrl,method:e,params:g,success:d,error:function(i,h){f.editor.setProgressState(0);f.editor.windowManager.alert(i.errstr||("Error response: "+h.responseText))}})}});tinymce.PluginManager.add("spellchecker",tinymce.plugins.SpellcheckerPlugin)})();
\ No newline at end of file
+(function(){var a=tinymce.util.JSONRequest,c=tinymce.each,b=tinymce.DOM;tinymce.create("tinymce.plugins.SpellcheckerPlugin",{getInfo:function(){return{longname:"Spellchecker",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/spellchecker",version:tinymce.majorVersion+"."+tinymce.minorVersion}},init:function(e,f){var g=this,d;g.url=f;g.editor=e;g.rpcUrl=e.getParam("spellchecker_rpc_url","{backend}");if(g.rpcUrl=="{backend}"){if(tinymce.isIE){return}g.hasSupport=true;e.onContextMenu.addToTop(function(h,i){if(g.active){return false}})}e.addCommand("mceSpellCheck",function(){if(g.rpcUrl=="{backend}"){g.editor.getBody().spellcheck=g.active=!g.active;return}if(!g.active){e.setProgressState(1);g._sendRPC("checkWords",[g.selectedLang,g._getWords()],function(h){if(h.length>0){g.active=1;g._markWords(h);e.setProgressState(0);e.nodeChanged()}else{e.setProgressState(0);if(e.getParam("spellchecker_report_no_misspellings",true)){e.windowManager.alert("spellchecker.no_mpell")}}})}else{g._done()}});if(e.settings.content_css!==false){e.contentCSS.push(f+"/css/content.css")}e.onClick.add(g._showMenu,g);e.onContextMenu.add(g._showMenu,g);e.onBeforeGetContent.add(function(){if(g.active){g._removeWords()}});e.onNodeChange.add(function(i,h){h.setActive("spellchecker",g.active)});e.onSetContent.add(function(){g._done()});e.onBeforeGetContent.add(function(){g._done()});e.onBeforeExecCommand.add(function(h,i){if(i=="mceFullScreen"){g._done()}});g.languages={};c(e.getParam("spellchecker_languages","+English=en,Danish=da,Dutch=nl,Finnish=fi,French=fr,German=de,Italian=it,Polish=pl,Portuguese=pt,Spanish=es,Swedish=sv","hash"),function(i,h){if(h.indexOf("+")===0){h=h.substring(1);g.selectedLang=i}g.languages[h]=i})},createControl:function(h,d){var f=this,g,e=f.editor;if(h=="spellchecker"){if(f.rpcUrl=="{backend}"){if(f.hasSupport){g=d.createButton(h,{title:"spellchecker.desc",cmd:"mceSpellCheck",scope:f})}return g}g=d.createSplitButton(h,{title:"spellchecker.desc",cmd:"mceSpellCheck",scope:f});g.onRenderMenu.add(function(j,i){i.add({title:"spellchecker.langs","class":"mceMenuItemTitle"}).setDisabled(1);c(f.languages,function(n,m){var p={icon:1},l;p.onclick=function(){if(n==f.selectedLang){return}l.setSelected(1);f.selectedItem.setSelected(0);f.selectedItem=l;f.selectedLang=n};p.title=m;l=i.add(p);l.setSelected(n==f.selectedLang);if(n==f.selectedLang){f.selectedItem=l}})});return g}},_walk:function(i,g){var h=this.editor.getDoc(),e;if(h.createTreeWalker){e=h.createTreeWalker(i,NodeFilter.SHOW_TEXT,null,false);while((i=e.nextNode())!=null){g.call(this,i)}}else{tinymce.walk(i,g,"childNodes")}},_getSeparators:function(){var e="",d,f=this.editor.getParam("spellchecker_word_separator_chars",'\\s!"#$%&()*+,-./:;<=>?@[]^_{|}§©«®±¶·¸»¼½¾¿×÷¤\u201d\u201c');for(d=0;d<f.length;d++){e+="\\"+f.charAt(d)}return e},_getWords:function(){var e=this.editor,g=[],d="",f={},h=[];this._walk(e.getBody(),function(i){if(i.nodeType==3){d+=i.nodeValue+" "}});if(e.getParam("spellchecker_word_pattern")){h=d.match("("+e.getParam("spellchecker_word_pattern")+")","gi")}else{d=d.replace(new RegExp("([0-9]|["+this._getSeparators()+"])","g")," ");d=tinymce.trim(d.replace(/(\s+)/g," "));h=d.split(" ")}c(h,function(i){if(!f[i]){g.push(i);f[i]=1}});return g},_removeWords:function(e){var f=this.editor,h=f.dom,g=f.selection,d=g.getBookmark();c(h.select("span").reverse(),function(i){if(i&&(h.hasClass(i,"mceItemHiddenSpellWord")||h.hasClass(i,"mceItemHidden"))){if(!e||h.decode(i.innerHTML)==e){h.remove(i,1)}}});g.moveToBookmark(d)},_markWords:function(l){var g=this.editor,f=g.dom,j=g.getDoc(),h=g.selection,i=h.getBookmark(),d=[],k=l.join("|"),m=this._getSeparators(),e=new RegExp("(^|["+m+"])("+k+")(?=["+m+"]|$)","g");this._walk(g.getBody(),function(o){if(o.nodeType==3){d.push(o)}});c(d,function(t){var r,q,o,s,p=t.nodeValue;if(e.test(p)){p=f.encode(p);q=f.create("span",{"class":"mceItemHidden"});if(tinymce.isIE){p=p.replace(e,"$1<mcespell>$2</mcespell>");while((s=p.indexOf("<mcespell>"))!=-1){o=p.substring(0,s);if(o.length){r=j.createTextNode(f.decode(o));q.appendChild(r)}p=p.substring(s+10);s=p.indexOf("</mcespell>");o=p.substring(0,s);p=p.substring(s+11);q.appendChild(f.create("span",{"class":"mceItemHiddenSpellWord"},o))}if(p.length){r=j.createTextNode(f.decode(p));q.appendChild(r)}}else{q.innerHTML=p.replace(e,'$1<span class="mceItemHiddenSpellWord">$2</span>')}f.replace(q,t)}});h.moveToBookmark(i)},_showMenu:function(h,j){var i=this,h=i.editor,d=i._menu,l,k=h.dom,g=k.getViewPort(h.getWin()),f=j.target;j=0;if(!d){d=h.controlManager.createDropMenu("spellcheckermenu",{"class":"mceNoIcons"});i._menu=d}if(k.hasClass(f,"mceItemHiddenSpellWord")){d.removeAll();d.add({title:"spellchecker.wait","class":"mceMenuItemTitle"}).setDisabled(1);i._sendRPC("getSuggestions",[i.selectedLang,k.decode(f.innerHTML)],function(m){var e;d.removeAll();if(m.length>0){d.add({title:"spellchecker.sug","class":"mceMenuItemTitle"}).setDisabled(1);c(m,function(n){d.add({title:n,onclick:function(){k.replace(h.getDoc().createTextNode(n),f);i._checkDone()}})});d.addSeparator()}else{d.add({title:"spellchecker.no_sug","class":"mceMenuItemTitle"}).setDisabled(1)}e=i.editor.getParam("spellchecker_enable_ignore_rpc","");d.add({title:"spellchecker.ignore_word",onclick:function(){var n=f.innerHTML;k.remove(f,1);i._checkDone();if(e){h.setProgressState(1);i._sendRPC("ignoreWord",[i.selectedLang,n],function(o){h.setProgressState(0)})}}});d.add({title:"spellchecker.ignore_words",onclick:function(){var n=f.innerHTML;i._removeWords(k.decode(n));i._checkDone();if(e){h.setProgressState(1);i._sendRPC("ignoreWords",[i.selectedLang,n],function(o){h.setProgressState(0)})}}});if(i.editor.getParam("spellchecker_enable_learn_rpc")){d.add({title:"spellchecker.learn_word",onclick:function(){var n=f.innerHTML;k.remove(f,1);i._checkDone();h.setProgressState(1);i._sendRPC("learnWord",[i.selectedLang,n],function(o){h.setProgressState(0)})}})}d.update()});l=b.getPos(h.getContentAreaContainer());d.settings.offset_x=l.x;d.settings.offset_y=l.y;h.selection.select(f);l=k.getPos(f);d.showMenu(l.x,l.y+f.offsetHeight-g.y);return tinymce.dom.Event.cancel(j)}else{d.hideMenu()}},_checkDone:function(){var e=this,d=e.editor,g=d.dom,f;c(g.select("span"),function(h){if(h&&g.hasClass(h,"mceItemHiddenSpellWord")){f=true;return false}});if(!f){e._done()}},_done:function(){var d=this,e=d.active;if(d.active){d.active=0;d._removeWords();if(d._menu){d._menu.hideMenu()}if(e){d.editor.nodeChanged()}}},_sendRPC:function(e,g,d){var f=this;a.sendRPC({url:f.rpcUrl,method:e,params:g,success:d,error:function(i,h){f.editor.setProgressState(0);f.editor.windowManager.alert(i.errstr||("Error response: "+h.responseText))}})}});tinymce.PluginManager.add("spellchecker",tinymce.plugins.SpellcheckerPlugin)})();
\ No newline at end of file
diff --git a/plugins/TinyMCE/js/plugins/spellchecker/editor_plugin_src.js b/plugins/TinyMCE/js/plugins/spellchecker/editor_plugin_src.js
index d8680baf2c..ee4df887c9 100644
--- a/plugins/TinyMCE/js/plugins/spellchecker/editor_plugin_src.js
+++ b/plugins/TinyMCE/js/plugins/spellchecker/editor_plugin_src.js
@@ -70,10 +70,8 @@
 					t._done();
 			});
 
-			ed.onInit.add(function() {
-				if (ed.settings.content_css !== false)
-					ed.dom.loadCSS(url + '/css/content.css');
-			});
+			if (ed.settings.content_css !== false)
+				ed.contentCSS.push(url + '/css/content.css');
 
 			ed.onClick.add(t._showMenu, t);
 			ed.onContextMenu.add(t._showMenu, t);
@@ -132,6 +130,9 @@
 						var o = {icon : 1}, mi;
 
 						o.onclick = function() {
+							if (v == t.selectedLang) {
+								return;
+							}
 							mi.setSelected(1);
 							t.selectedItem.setSelected(0);
 							t.selectedItem = mi;
@@ -220,21 +221,11 @@
 		},
 
 		_markWords : function(wl) {
-			var r1, r2, r3, r4, r5, w = '', ed = this.editor, re = this._getSeparators(), dom = ed.dom, nl = [];
-			var se = ed.selection, b = se.getBookmark();
-
-			each(wl, function(v) {
-				w += (w ? '|' : '') + v;
-			});
-
-			r1 = new RegExp('([' + re + '])(' + w + ')([' + re + '])', 'g');
-			r2 = new RegExp('^(' + w + ')', 'g');
-			r3 = new RegExp('(' + w + ')([' + re + ']?)$', 'g');
-			r4 = new RegExp('^(' + w + ')([' + re + ']?)$', 'g');
-			r5 = new RegExp('(' + w + ')([' + re + '])', 'g');
+			var ed = this.editor, dom = ed.dom, doc = ed.getDoc(), se = ed.selection, b = se.getBookmark(), nl = [],
+				w = wl.join('|'), re = this._getSeparators(), rx = new RegExp('(^|[' + re + '])(' + w + ')(?=[' + re + ']|$)', 'g');
 
 			// Collect all text nodes
-			this._walk(this.editor.getBody(), function(n) {
+			this._walk(ed.getBody(), function(n) {
 				if (n.nodeType == 3) {
 					nl.push(n);
 				}
@@ -242,18 +233,49 @@
 
 			// Wrap incorrect words in spans
 			each(nl, function(n) {
-				var v;
+				var node, elem, txt, pos, v = n.nodeValue;
 
-				if (n.nodeType == 3) {
-					v = n.nodeValue;
+				if (rx.test(v)) {
+					// Encode the content
+					v = dom.encode(v);
+					// Create container element
+					elem = dom.create('span', {'class' : 'mceItemHidden'});
 
-					if (r1.test(v) || r2.test(v) || r3.test(v) || r4.test(v)) {
-						v = dom.encode(v);
-						v = v.replace(r5, '<span class="mceItemHiddenSpellWord">$1</span>$2');
-						v = v.replace(r3, '<span class="mceItemHiddenSpellWord">$1</span>$2');
-
-						dom.replace(dom.create('span', {'class' : 'mceItemHidden'}, v), n);
+					// Following code fixes IE issues by creating text nodes
+					// using DOM methods instead of innerHTML.
+					// Bug #3124: <PRE> elements content is broken after spellchecking.
+					// Bug #1408: Preceding whitespace characters are removed
+					// @TODO: I'm not sure that both are still issues on IE9.
+					if (tinymce.isIE) {
+						// Enclose mispelled words with temporal tag
+						v = v.replace(rx, '$1<mcespell>$2</mcespell>');
+						// Loop over the content finding mispelled words
+						while ((pos = v.indexOf('<mcespell>')) != -1) {
+							// Add text node for the content before the word
+							txt = v.substring(0, pos);
+							if (txt.length) {
+								node = doc.createTextNode(dom.decode(txt));
+								elem.appendChild(node);
+							}
+							v = v.substring(pos+10);
+							pos = v.indexOf('</mcespell>');
+							txt = v.substring(0, pos);
+							v = v.substring(pos+11);
+							// Add span element for the word
+							elem.appendChild(dom.create('span', {'class' : 'mceItemHiddenSpellWord'}, txt));
+						}
+						// Add text node for the rest of the content
+						if (v.length) {
+							node = doc.createTextNode(dom.decode(v));
+							elem.appendChild(node);
+						}
+					} else {
+						// Other browsers preserve whitespace characters on innerHTML usage
+						elem.innerHTML = v.replace(rx, '$1<span class="mceItemHiddenSpellWord">$2</span>');
 					}
+
+					// Finally, replace the node with the container
+					dom.replace(elem, n);
 				}
 			});
 
@@ -266,15 +288,7 @@
 			e = 0; // Fixes IE memory leak
 
 			if (!m) {
-				p1 = DOM.getPos(ed.getContentAreaContainer());
-				//p2 = DOM.getPos(ed.getContainer());
-
-				m = ed.controlManager.createDropMenu('spellcheckermenu', {
-					offset_x : p1.x,
-					offset_y : p1.y,
-					'class' : 'mceNoIcons'
-				});
-
+				m = ed.controlManager.createDropMenu('spellcheckermenu', {'class' : 'mceNoIcons'});
 				t._menu = m;
 			}
 
@@ -337,7 +351,6 @@
 						}
 					});
 
-
 					if (t.editor.getParam("spellchecker_enable_learn_rpc")) {
 						m.add({
 							title : 'spellchecker.learn_word',
@@ -358,6 +371,10 @@
 					m.update();
 				});
 
+				p1 = DOM.getPos(ed.getContentAreaContainer());
+				m.settings.offset_x = p1.x;
+				m.settings.offset_y = p1.y;
+
 				ed.selection.select(wordSpan);
 				p1 = dom.getPos(wordSpan);
 				m.showMenu(p1.x, p1.y + wordSpan.offsetHeight - vp.y);
diff --git a/plugins/TinyMCE/js/plugins/style/js/props.js b/plugins/TinyMCE/js/plugins/style/js/props.js
index a8dd93dec5..6800a9a9aa 100644
--- a/plugins/TinyMCE/js/plugins/style/js/props.js
+++ b/plugins/TinyMCE/js/plugins/style/js/props.js
@@ -177,11 +177,7 @@ function setupFormData() {
 
 	f.box_height.value = getNum(ce.style.height);
 	selectByValue(f, 'box_height_measurement', getMeasurement(ce.style.height));
-
-	if (tinymce.isGecko)
-		selectByValue(f, 'box_float', ce.style.cssFloat, true, true);
-	else
-		selectByValue(f, 'box_float', ce.style.styleFloat, true, true);
+	selectByValue(f, 'box_float', ce.style.cssFloat || ce.style.styleFloat, true, true);
 
 	selectByValue(f, 'box_clear', ce.style.clear, true, true);
 
@@ -376,7 +372,7 @@ function applyAction() {
 	generateCSS();
 
 	tinyMCEPopup.restoreSelection();
-	ed.dom.setAttrib(ed.selection.getNode(), 'style', tinyMCEPopup.editor.dom.serializeStyle(tinyMCEPopup.editor.dom.parseStyle(ce.style.cssText)));
+	ed.dom.setAttrib(ed.selection.getSelectedBlocks(), 'style', tinyMCEPopup.editor.dom.serializeStyle(tinyMCEPopup.editor.dom.parseStyle(ce.style.cssText)));
 }
 
 function updateAction() {
@@ -440,9 +436,7 @@ function generateCSS() {
 	ce.style.width = f.box_width.value + (isNum(f.box_width.value) ? f.box_width_measurement.value : "");
 	ce.style.height = f.box_height.value + (isNum(f.box_height.value) ? f.box_height_measurement.value : "");
 	ce.style.styleFloat = f.box_float.value;
-
-	if (tinymce.isGecko)
-		ce.style.cssFloat = f.box_float.value;
+	ce.style.cssFloat = f.box_float.value;
 
 	ce.style.clear = f.box_clear.value;
 
diff --git a/plugins/TinyMCE/js/plugins/style/langs/en_dlg.js b/plugins/TinyMCE/js/plugins/style/langs/en_dlg.js
index 5026313e2e..df0a173c77 100644
--- a/plugins/TinyMCE/js/plugins/style/langs/en_dlg.js
+++ b/plugins/TinyMCE/js/plugins/style/langs/en_dlg.js
@@ -59,5 +59,12 @@ visibility:"Visibility",
 zindex:"Z-index",
 overflow:"Overflow",
 placement:"Placement",
-clip:"Clip"
+clip:"Clip",
+text:"Text",
+background:"Background",
+block:"Block",
+box:"Box",
+border:"Border",
+list:"List",
+position:"Position"
 });
\ No newline at end of file
diff --git a/plugins/TinyMCE/js/plugins/style/props.htm b/plugins/TinyMCE/js/plugins/style/props.htm
index 549ed0408e..b5a3d15d9e 100644
--- a/plugins/TinyMCE/js/plugins/style/props.htm
+++ b/plugins/TinyMCE/js/plugins/style/props.htm
@@ -10,277 +10,317 @@
 	<link href="css/props.css" rel="stylesheet" type="text/css" />
 </head>
 
-<body id="styleprops" style="display: none">
+<body id="styleprops" style="display: none" role="application" aria-labelledby="app_title">
+<span id="app_title" style="display:none">{#style_dlg.title}</span>
 <form onsubmit="updateAction();return false;" action="#">
 <div class="tabs">
 	<ul>
-		<li id="text_tab" class="current"><span><a href="javascript:mcTabs.displayTab('text_tab','text_panel');" onMouseDown="return false;">{#style_dlg.text_tab}</a></span></li>
-		<li id="background_tab"><span><a href="javascript:mcTabs.displayTab('background_tab','background_panel');" onMouseDown="return false;">{#style_dlg.background_tab}</a></span></li>
-		<li id="block_tab"><span><a href="javascript:mcTabs.displayTab('block_tab','block_panel');" onMouseDown="return false;">{#style_dlg.block_tab}</a></span></li>
-		<li id="box_tab"><span><a href="javascript:mcTabs.displayTab('box_tab','box_panel');" onMouseDown="return false;">{#style_dlg.box_tab}</a></span></li>
-		<li id="border_tab"><span><a href="javascript:mcTabs.displayTab('border_tab','border_panel');" onMouseDown="return false;">{#style_dlg.border_tab}</a></span></li>
-		<li id="list_tab"><span><a href="javascript:mcTabs.displayTab('list_tab','list_panel');" onMouseDown="return false;">{#style_dlg.list_tab}</a></span></li>
-		<li id="positioning_tab"><span><a href="javascript:mcTabs.displayTab('positioning_tab','positioning_panel');" onMouseDown="return false;">{#style_dlg.positioning_tab}</a></span></li>
+		<li id="text_tab" class="current" aria-controls="text_panel"><span><a href="javascript:mcTabs.displayTab('text_tab','text_panel');" onMouseDown="return false;">{#style_dlg.text_tab}</a></span></li>
+		<li id="background_tab" aria-controls="background_panel"><span><a href="javascript:mcTabs.displayTab('background_tab','background_panel');" onMouseDown="return false;">{#style_dlg.background_tab}</a></span></li>
+		<li id="block_tab" aria-controls="block_panel"><span><a href="javascript:mcTabs.displayTab('block_tab','block_panel');" onMouseDown="return false;">{#style_dlg.block_tab}</a></span></li>
+		<li id="box_tab" aria-controls="box_panel"><span><a href="javascript:mcTabs.displayTab('box_tab','box_panel');" onMouseDown="return false;">{#style_dlg.box_tab}</a></span></li>
+		<li id="border_tab" aria-controls="border_panel"><span><a href="javascript:mcTabs.displayTab('border_tab','border_panel');" onMouseDown="return false;">{#style_dlg.border_tab}</a></span></li>
+		<li id="list_tab" aria-controls="list_panel"><span><a href="javascript:mcTabs.displayTab('list_tab','list_panel');" onMouseDown="return false;">{#style_dlg.list_tab}</a></span></li>
+		<li id="positioning_tab" aria-controls="positioning_panel"><span><a href="javascript:mcTabs.displayTab('positioning_tab','positioning_panel');" onMouseDown="return false;">{#style_dlg.positioning_tab}</a></span></li>
 	</ul>
 </div>
 
 <div class="panel_wrapper">
 <div id="text_panel" class="panel current">
-	<table border="0" width="100%">
-		<tr>
-			<td><label for="text_font">{#style_dlg.text_font}</label></td>
-			<td colspan="3">
-				<select id="text_font" name="text_font" class="mceEditableSelect mceFocus"></select>
-			</td>
-		</tr>
-		<tr>
-			<td><label for="text_size">{#style_dlg.text_size}</label></td>
-			<td>
-				<table border="0" cellspacing="0" cellpadding="0">
-					<tr>
-						<td><select id="text_size" name="text_size" class="mceEditableSelect"></select></td>
-						<td>&nbsp;</td>
-						<td><select id="text_size_measurement" name="text_size_measurement"></select></td>
-					</tr>
-				</table>
-			</td>
-			<td><label for="text_weight">{#style_dlg.text_weight}</label></td>
-			<td>
-				<select id="text_weight" name="text_weight"></select>
-			</td>
-		</tr>
-		<tr>
-			<td><label for="text_style">{#style_dlg.text_style}</label></td>
-			<td>
-				<select id="text_style" name="text_style" class="mceEditableSelect"></select>
-			</td>
-			<td><label for="text_variant">{#style_dlg.text_variant}</label></td>
-			<td>
-				<select id="text_variant" name="text_variant"></select>
-			</td>
-		</tr>
-		<tr>
-			<td><label for="text_lineheight">{#style_dlg.text_lineheight}</label></td>
-			<td>
-				<table border="0" cellspacing="0" cellpadding="0">
-					<tr>
-						<td>
-							<select id="text_lineheight" name="text_lineheight" class="mceEditableSelect"></select>
-						</td>
-						<td>&nbsp;</td>
-						<td><select id="text_lineheight_measurement" name="text_lineheight_measurement"></select></td>
-					</tr>
-				</table>
-			</td>
-			<td><label for="text_case">{#style_dlg.text_case}</label></td>
-			<td>
-				<select id="text_case" name="text_case"></select>
-			</td>
-		</tr>
-		<tr>
-			<td><label for="text_color">{#style_dlg.text_color}</label></td>
-			<td colspan="2">
-				<table border="0" cellpadding="0" cellspacing="0">
-					<tr>
-						<td><input id="text_color" name="text_color" type="text" value="" size="9" onChange="updateColor('text_color_pick','text_color');" /></td>
-						<td id="text_color_pickcontainer">&nbsp;</td>
-					</tr>
-				</table>
-			</td>
-		</tr>
-		<tr>
-			<td valign="top" style="vertical-align: top; padding-top: 3px;">{#style_dlg.text_decoration}</td>
-			<td colspan="2">
-				<table border="0" cellspacing="0" cellpadding="0">
-					<tr>
-						<td><input id="text_underline" name="text_underline" class="checkbox" type="checkbox" /></td>
-						<td><label for="text_underline">{#style_dlg.text_underline}</label></td>
-					</tr>
-					<tr>
-						<td><input id="text_overline" name="text_overline" class="checkbox" type="checkbox" /></td>
-						<td><label for="text_overline">{#style_dlg.text_overline}</label></td>
-					</tr>
-					<tr>
-						<td><input id="text_linethrough" name="text_linethrough" class="checkbox" type="checkbox" /></td>
-						<td><label for="text_linethrough">{#style_dlg.text_striketrough}</label></td>
-					</tr>
-					<tr>
-						<td><input id="text_blink" name="text_blink" class="checkbox" type="checkbox" /></td>
-						<td><label for="text_blink">{#style_dlg.text_blink}</label></td>
-					</tr>
-					<tr>
-						<td><input id="text_none" name="text_none" class="checkbox" type="checkbox" /></td>
-						<td><label for="text_none">{#style_dlg.text_none}</label></td>
-					</tr>
-				</table>
-			</td>
-		</tr>
-	</table>
+	<fieldset>
+		<legend>{#style_dlg.text}</legend>
+		<table role="presentation" border="0" width="100%">
+			<tr>
+				<td><label for="text_font">{#style_dlg.text_font}</label></td>
+				<td colspan="3">
+					<select id="text_font" name="text_font" class="mceEditableSelect mceFocus"></select>
+				</td>
+			</tr>
+			<tr>
+				<td><label for="text_size">{#style_dlg.text_size}</label></td>
+				<td>
+					<table role="presentation" border="0" cellspacing="0" cellpadding="0">
+						<tr>
+							<td><select id="text_size" name="text_size" class="mceEditableSelect"></select></td>
+							<td>&nbsp;</td>
+							<td>
+								<label id="text_size_measurement_label" for="text_size_measurement" style="display: none; visibility: hidden;">Text Size Measurement Unit</label>
+								<select id="text_size_measurement" name="text_size_measurement" aria-labelledby="text_size_measurement_label"></select>
+							</td>
+						</tr>
+					</table>
+				</td>
+				<td><label for="text_weight">{#style_dlg.text_weight}</label></td>
+				<td>
+					<select id="text_weight" name="text_weight"></select>
+				</td>
+			</tr>
+			<tr>
+				<td><label for="text_style">{#style_dlg.text_style}</label></td>
+				<td>
+					<select id="text_style" name="text_style" class="mceEditableSelect"></select>
+				</td>
+				<td><label for="text_variant">{#style_dlg.text_variant}</label></td>
+				<td>
+					<select id="text_variant" name="text_variant"></select>
+				</td>
+			</tr>
+			<tr>
+				<td><label for="text_lineheight">{#style_dlg.text_lineheight}</label></td>
+				<td>
+					<table role="presentation" border="0" cellspacing="0" cellpadding="0">
+						<tr>
+							<td>
+								<select id="text_lineheight" name="text_lineheight" class="mceEditableSelect"></select>
+							</td>
+							<td>&nbsp;</td>
+							<td>
+								<label id="text_lineheight_measurement_label" for="text_lineheight_measurement" style="display: none; visibility: hidden;">Line Height Measurement Unit</label>
+								<select id="text_lineheight_measurement" name="text_lineheight_measurement" aria-labelledby="text_lineheight_measurement_label"></select>
+							</td>
+						</tr>
+					</table>
+				</td>
+				<td><label for="text_case">{#style_dlg.text_case}</label></td>
+				<td>
+					<select id="text_case" name="text_case"></select>
+				</td>
+			</tr>
+			<tr>
+				<td><label for="text_color">{#style_dlg.text_color}</label></td>
+				<td colspan="2">
+					<table role="presentation" border="0" cellpadding="0" cellspacing="0">
+						<tr>
+							<td><input id="text_color" name="text_color" type="text" value="" size="9" onChange="updateColor('text_color_pick','text_color');" /></td>
+							<td id="text_color_pickcontainer">&nbsp;</td>
+						</tr>
+					</table>
+				</td>
+			</tr>
+			<tr>
+				<td valign="top" style="vertical-align: top; padding-top: 3px;">{#style_dlg.text_decoration}</td>
+				<td colspan="2">
+					<table role="presentation" border="0" cellspacing="0" cellpadding="0">
+						<tr>
+							<td><input id="text_underline" name="text_underline" class="checkbox" type="checkbox" /></td>
+							<td><label for="text_underline">{#style_dlg.text_underline}</label></td>
+						</tr>
+						<tr>
+							<td><input id="text_overline" name="text_overline" class="checkbox" type="checkbox" /></td>
+							<td><label for="text_overline">{#style_dlg.text_overline}</label></td>
+						</tr>
+						<tr>
+							<td><input id="text_linethrough" name="text_linethrough" class="checkbox" type="checkbox" /></td>
+							<td><label for="text_linethrough">{#style_dlg.text_striketrough}</label></td>
+						</tr>
+						<tr>
+							<td><input id="text_blink" name="text_blink" class="checkbox" type="checkbox" /></td>
+							<td><label for="text_blink">{#style_dlg.text_blink}</label></td>
+						</tr>
+						<tr>
+							<td><input id="text_none" name="text_none" class="checkbox" type="checkbox" /></td>
+							<td><label for="text_none">{#style_dlg.text_none}</label></td>
+						</tr>
+					</table>
+				</td>
+			</tr>
+		</table>
+	</fieldset>
 </div>
 
 <div id="background_panel" class="panel">
-	<table border="0">
-		<tr>
-			<td><label for="background_color">{#style_dlg.background_color}</label></td>
-			<td>
-				<table border="0" cellpadding="0" cellspacing="0">
-					<tr>
-						<td><input id="background_color" name="background_color" type="text" value="" size="9" onChange="updateColor('background_color_pick','background_color');" /></td>
-						<td id="background_color_pickcontainer">&nbsp;</td>
+	<fieldset>
+		<legend>{#style_dlg.background}</legend>
+		<table role="presentation" border="0">
+			<tr>
+				<td><label for="background_color">{#style_dlg.background_color}</label></td>
+				<td>
+					<table role="presentation" border="0" cellpadding="0" cellspacing="0">
+						<tr>
+							<td><input id="background_color" name="background_color" type="text" value="" size="9" onChange="updateColor('background_color_pick','background_color');" /></td>
+							<td id="background_color_pickcontainer">&nbsp;</td>
+						</tr>
+					</table>
+				</td>
+			</tr>
+
+			<tr>
+				<td><label for="background_image">{#style_dlg.background_image}</label></td>
+				<td><table role="presentation" border="0" cellspacing="0" cellpadding="0">
+					<tr> 
+						<td><input id="background_image" name="background_image" type="text" /></td> 
+						<td id="background_image_browser">&nbsp;</td>
 					</tr>
-				</table>
-			</td>
-		</tr>
+					</table>
+				</td>
+			</tr>
 
-		<tr>
-			<td><label for="background_image">{#style_dlg.background_image}</label></td>
-			<td><table border="0" cellspacing="0" cellpadding="0">
-				<tr> 
-				  <td><input id="background_image" name="background_image" type="text" /></td> 
-				  <td id="background_image_browser">&nbsp;</td>
-				</tr>
-				</table>
-			</td>
-		</tr>
+			<tr>
+				<td><label for="background_repeat">{#style_dlg.background_repeat}</label></td>
+				<td><select id="background_repeat" name="background_repeat" class="mceEditableSelect"></select></td>
+			</tr>
 
-		<tr>
-			<td><label for="background_repeat">{#style_dlg.background_repeat}</label></td>
-			<td><select id="background_repeat" name="background_repeat" class="mceEditableSelect"></select></td>
-		</tr>
+			<tr>
+				<td><label for="background_attachment">{#style_dlg.background_attachment}</label></td>
+				<td><select id="background_attachment" name="background_attachment" class="mceEditableSelect"></select></td>
+			</tr>
 
-		<tr>
-			<td><label for="background_attachment">{#style_dlg.background_attachment}</label></td>
-			<td><select id="background_attachment" name="background_attachment" class="mceEditableSelect"></select></td>
-		</tr>
+			<tr>
+				<td><label for="background_hpos">{#style_dlg.background_hpos}</label></td>
+				<td>
+					<table role="presentation" border="0" cellspacing="0" cellpadding="0">
+						<tr>
+							<td><select id="background_hpos" name="background_hpos" class="mceEditableSelect"></select></td>
+							<td>&nbsp;</td>
+							<td>
+								<label id="background_hpos_measurement_label" for="background_hpos_measurement" style="display: none; visibility: hidden;">Horizontal position measurement unit</label>
+								<select id="background_hpos_measurement" name="background_hpos_measurement" aria-labelledby="background_hpos_measurement_label"></select>
+							</td>
+						</tr>
+					</table>
+				</td>
+			</tr>
 
-		<tr>
-			<td><label for="background_hpos">{#style_dlg.background_hpos}</label></td>
-			<td>
-				<table border="0" cellspacing="0" cellpadding="0">
-					<tr>
-						<td><select id="background_hpos" name="background_hpos" class="mceEditableSelect"></select></td>
-						<td>&nbsp;</td>
-						<td><select id="background_hpos_measurement" name="background_hpos_measurement"></select></td>
-					</tr>
-				</table>
-			</td>
-		</tr>
+			<tr>
+				<td><label for="background_vpos">{#style_dlg.background_vpos}</label></td>
+				<td>
+					<table role="presentation" border="0" cellspacing="0" cellpadding="0">
+						<tr>
+							<td><select id="background_vpos" name="background_vpos" class="mceEditableSelect"></select></td>
+							<td>&nbsp;</td>
+							<td>
 
-		<tr>
-			<td><label for="background_vpos">{#style_dlg.background_vpos}</label></td>
-			<td>
-				<table border="0" cellspacing="0" cellpadding="0">
-					<tr>
-						<td><select id="background_vpos" name="background_vpos" class="mceEditableSelect"></select></td>
-						<td>&nbsp;</td>
-						<td><select id="background_vpos_measurement" name="background_vpos_measurement"></select></td>
-					</tr>
-				</table>
-			</td>
-		</tr>
-	</table>
+								<label id="background_vpos_measurement_label" for="background_vpos_measurement" style="display: none; visibility: hidden;">Vertical position measurement unit</label>
+								<select id="background_vpos_measurement" name="background_vpos_measurement" aria-labelledby="background_vpos_measurement_label">></select></td>
+						</tr>
+					</table>
+				</td>
+			</tr>
+		</table>
+	</fieldset>
 </div>
 
 <div id="block_panel" class="panel">
-	<table border="0">
-		<tr>
-			<td><label for="block_wordspacing">{#style_dlg.block_wordspacing}</label></td>
-			<td>
-				<table border="0" cellspacing="0" cellpadding="0">
-					<tr>
-						<td><select id="block_wordspacing" name="block_wordspacing" class="mceEditableSelect"></select></td>
-						<td>&nbsp;</td>
-						<td><select id="block_wordspacing_measurement" name="block_wordspacing_measurement"></select></td>
-					</tr>
-				</table>
-			</td>
-		</tr>
+	<fieldset>
+		<legend>{#style_dlg.block}</legend>
+		<table role="presentation" border="0">
+			<tr>
+				<td><label for="block_wordspacing">{#style_dlg.block_wordspacing}</label></td>
+				<td>
+					<table role="presentation" border="0" cellspacing="0" cellpadding="0">
+						<tr>
+							<td><select id="block_wordspacing" name="block_wordspacing" class="mceEditableSelect"></select></td>
+							<td>&nbsp;</td>
+							<td>
+								<label id="block_wordspacing_measurement_label" for="block_wordspacing_measurement" style="display: none; visibility: hidden;">Word spacing measurement unit</label>
+								<select id="block_wordspacing_measurement" name="block_wordspacing_measurement" aria-labelledby="block_wordspacing_measurement_label"></select>
+							</td>
+						</tr>
+					</table>
+				</td>
+			</tr>
 
-		<tr>
-			<td><label for="block_letterspacing">{#style_dlg.block_letterspacing}</label></td>
-			<td>
-				<table border="0" cellspacing="0" cellpadding="0">
-					<tr>
-						<td><select id="block_letterspacing" name="block_letterspacing" class="mceEditableSelect"></select></td>
-						<td>&nbsp;</td>
-						<td><select id="block_letterspacing_measurement" name="block_letterspacing_measurement"></select></td>
-					</tr>
-				</table>
-			</td>
-		</tr>
+			<tr>
+				<td><label for="block_letterspacing">{#style_dlg.block_letterspacing}</label></td>
+				<td>
+					<table role="presentation" border="0" cellspacing="0" cellpadding="0">
+						<tr>
+							<td><select id="block_letterspacing" name="block_letterspacing" class="mceEditableSelect"></select></td>
+							<td>&nbsp;</td>
+							<td>
+								<label id="block_letterspacing_measurement_label" for="block_letterspacing_measurement" style="display: none; visibility: hidden;">Letter spacing measurement unit</label>
+								<select id="block_letterspacing_measurement" name="block_letterspacing_measurement" aria-labelledby="block_letterspacing_measurement_label"></select>
+							</td>
+						</tr>
+					</table>
+				</td>
+			</tr>
 
-		<tr>
-			<td><label for="block_vertical_alignment">{#style_dlg.block_vertical_alignment}</label></td>
-			<td><select id="block_vertical_alignment" name="block_vertical_alignment" class="mceEditableSelect"></select></td>
-		</tr>
+			<tr>
+				<td><label for="block_vertical_alignment">{#style_dlg.block_vertical_alignment}</label></td>
+				<td><select id="block_vertical_alignment" name="block_vertical_alignment" class="mceEditableSelect"></select></td>
+			</tr>
 
-		<tr>
-			<td><label for="block_text_align">{#style_dlg.block_text_align}</label></td>
-			<td><select id="block_text_align" name="block_text_align" class="mceEditableSelect"></select></td>
-		</tr>
+			<tr>
+				<td><label for="block_text_align">{#style_dlg.block_text_align}</label></td>
+				<td><select id="block_text_align" name="block_text_align" class="mceEditableSelect"></select></td>
+			</tr>
 
-		<tr>
-			<td><label for="block_text_indent">{#style_dlg.block_text_indent}</label></td>
-			<td>
-				<table border="0" cellspacing="0" cellpadding="0">
-					<tr>
-						<td><input type="text" id="block_text_indent" name="block_text_indent" /></td>
-						<td>&nbsp;</td>
-						<td><select id="block_text_indent_measurement" name="block_text_indent_measurement"></select></td>
-					</tr>
-				</table>
-			</td>
-		</tr>
+			<tr>
+				<td><label for="block_text_indent">{#style_dlg.block_text_indent}</label></td>
+				<td>
+					<table role="presentation" border="0" cellspacing="0" cellpadding="0">
+						<tr>
+							<td><input type="text" id="block_text_indent" name="block_text_indent" /></td>
+							<td>&nbsp;</td>
+							<td>
+								<label id="block_text_indent_measurement_label" for="block_text_indent_measurement" style="display: none; visibility: hidden;">Text Indent Measurement Unit</label>
 
-		<tr>
-			<td><label for="block_whitespace">{#style_dlg.block_whitespace}</label></td>
-			<td><select id="block_whitespace" name="block_whitespace" class="mceEditableSelect"></select></td>
-		</tr>
+								<select id="block_text_indent_measurement" name="block_text_indent_measurement" aria-labelledby="block_text_indent_measurement_label"></select>
+							</td>
+						</tr>
+					</table>
+				</td>
+			</tr>
 
-		<tr>
-			<td><label for="block_display">{#style_dlg.block_display}</label></td>
-			<td><select id="block_display" name="block_display" class="mceEditableSelect"></select></td>
-		</tr>
-	</table>
+			<tr>
+				<td><label for="block_whitespace">{#style_dlg.block_whitespace}</label></td>
+				<td><select id="block_whitespace" name="block_whitespace" class="mceEditableSelect"></select></td>
+			</tr>
+
+			<tr>
+				<td><label for="block_display">{#style_dlg.block_display}</label></td>
+				<td><select id="block_display" name="block_display" class="mceEditableSelect"></select></td>
+			</tr>
+		</table>
+	</fieldset>
 </div>
 
 <div id="box_panel" class="panel">
-<table border="0">
-	<tr>
-		<td><label for="box_width">{#style_dlg.box_width}</label></td>
-		<td>
-			<table border="0" cellspacing="0" cellpadding="0">
-				<tr>
-					<td><input type="text" id="box_width" name="box_width" class="mceEditableSelect" onChange="synch('box_width','positioning_width');" /></td>
-					<td>&nbsp;</td>
-					<td><select id="box_width_measurement" name="box_width_measurement"></select></td>
-				</tr>
-			</table>
-		</td>
-		<td>&nbsp;&nbsp;&nbsp;<label for="box_float">{#style_dlg.box_float}</label></td>
-		<td><select id="box_float" name="box_float" class="mceEditableSelect"></select></td>
-	</tr>
+	<fieldset>
+		<legend>{#style_dlg.box}</legend>
+		<table role="presentation" border="0">
+			<tr>
+				<td><label for="box_width">{#style_dlg.box_width}</label></td>
+				<td>
+					<table role="presentation" border="0" cellspacing="0" cellpadding="0">
+						<tr>
+							<td><input type="text" id="box_width" name="box_width" class="mceEditableSelect" onChange="synch('box_width','positioning_width');" /></td>
+							<td>&nbsp;</td>
+							<td>
+								<label id="box_width_measurement_label" for="box_width_measurement" style="display: none; visibility: hidden;">Box Width Measurement Unit</label>
+								<select id="box_width_measurement" name="box_width_measurement" aria-labelledby="box_width_measurement_label"></select>
+							</td>
+						</tr>
+					</table>
+				</td>
+				<td>&nbsp;&nbsp;&nbsp;<label for="box_float">{#style_dlg.box_float}</label></td>
+				<td><select id="box_float" name="box_float" class="mceEditableSelect"></select></td>
+			</tr>
 
-	<tr>
-		<td><label for="box_height">{#style_dlg.box_height}</label></td>
-		<td>
-			<table border="0" cellspacing="0" cellpadding="0">
-				<tr>
-					<td><input type="text" id="box_height" name="box_height" class="mceEditableSelect" onChange="synch('box_height','positioning_height');" /></td>
-					<td>&nbsp;</td>
-					<td><select id="box_height_measurement" name="box_height_measurement"></select></td>
-				</tr>
-			</table>
-		</td>
-		<td>&nbsp;&nbsp;&nbsp;<label for="box_clear">{#style_dlg.box_clear}</label></td>
-		<td><select id="box_clear" name="box_clear" class="mceEditableSelect"></select></td>
-	</tr>
-</table>
+			<tr>
+				<td><label for="box_height">{#style_dlg.box_height}</label></td>
+				<td>
+					<table role="presentation" border="0" cellspacing="0" cellpadding="0">
+						<tr>
+							<td><input type="text" id="box_height" name="box_height" class="mceEditableSelect" onChange="synch('box_height','positioning_height');" /></td>
+							<td>&nbsp;</td>
+							<td>
+								<label id="box_height_measurement_label" for="box_height_measurement" style="display: none; visibility: hidden;">Box Height Measurement Unit</label>
+								<select id="box_height_measurement" name="box_height_measurement" aria-labelledby="box_height_measurement_label"></select>
+							</td>
+						</tr>
+					</table>
+				</td>
+				<td>&nbsp;&nbsp;&nbsp;<label for="box_clear">{#style_dlg.box_clear}</label></td>
+				<td><select id="box_clear" name="box_clear" class="mceEditableSelect"></select></td>
+			</tr>
+		</table>
 <div style="float: left; width: 49%">
 	<fieldset>
 		<legend>{#style_dlg.padding}</legend>
 
-		<table border="0">
+		<table role="presentation" border="0">
 			<tr>
 				<td>&nbsp;</td>
 				<td><input type="checkbox" id="box_padding_same" name="box_padding_same" class="checkbox" checked="checked" onClick="toggleSame(this,'box_padding');" /> <label for="box_padding_same">{#style_dlg.same}</label></td>
@@ -288,11 +328,14 @@
 			<tr>
 				<td><label for="box_padding_top">{#style_dlg.top}</label></td>
 				<td>
-					<table border="0" cellspacing="0" cellpadding="0">
+					<table role="presentation" border="0" cellspacing="0" cellpadding="0">
 						<tr>
 							<td><input type="text" id="box_padding_top" name="box_padding_top" class="mceEditableSelect" /></td>
 							<td>&nbsp;</td>
-							<td><select id="box_padding_top_measurement" name="box_padding_top_measurement"></select></td>
+							<td>
+								<label id="box_padding_top_measurement_label" for="box_padding_top_measurement" style="display: none; visibility: hidden;">Padding Top Measurement Unit</label>
+								<select id="box_padding_top_measurement" name="box_padding_top_measurement" aria-labelledby="box_padding_top_measurement_label"></select>
+							</td>
 						</tr>
 					</table>
 				</td>
@@ -300,11 +343,14 @@
 			<tr>
 				<td><label for="box_padding_right">{#style_dlg.right}</label></td>
 				<td>
-					<table border="0" cellspacing="0" cellpadding="0">
+					<table role="presentation" border="0" cellspacing="0" cellpadding="0">
 						<tr>
 							<td><input type="text" id="box_padding_right" name="box_padding_right" class="mceEditableSelect" disabled="disabled" /></td>
 							<td>&nbsp;</td>
-							<td><select id="box_padding_right_measurement" name="box_padding_right_measurement" disabled="disabled"></select></td>
+							<td>
+								<label id="box_padding_right_measurement_label" for="box_padding_right_measurement" style="display: none; visibility: hidden;">Padding Right Measurement Unit</label>
+								<select id="box_padding_right_measurement" name="box_padding_right_measurement" disabled="disabled" aria-labelledby="box_padding_right_measurement_label"></select>
+							</td>
 						</tr>
 					</table>
 				</td>
@@ -312,11 +358,14 @@
 			<tr>
 				<td><label for="box_padding_bottom">{#style_dlg.bottom}</label></td>
 				<td>
-					<table border="0" cellspacing="0" cellpadding="0">
+					<table role="presentation" border="0" cellspacing="0" cellpadding="0">
 						<tr>
 							<td><input type="text" id="box_padding_bottom" name="box_padding_bottom" class="mceEditableSelect" disabled="disabled" /></td>
 							<td>&nbsp;</td>
-							<td><select id="box_padding_bottom_measurement" name="box_padding_bottom_measurement" disabled="disabled"></select></td>
+							<td>
+								<label id="box_padding_bottom_measurement_label" for="box_padding_bottom_measurement" style="display: none; visibility: hidden;">Padding Bottom Measurement Unit</label>
+								<select id="box_padding_bottom_measurement" name="box_padding_bottom_measurement" disabled="disabled" aria-labelledby="box_padding_bottom_measurement_label"></select>
+							</td>
 						</tr>
 					</table>
 				</td>
@@ -324,11 +373,14 @@
 			<tr>
 				<td><label for="box_padding_left">{#style_dlg.left}</label></td>
 				<td>
-					<table border="0" cellspacing="0" cellpadding="0">
+					<table role="presentation" border="0" cellspacing="0" cellpadding="0">
 						<tr>
 							<td><input type="text" id="box_padding_left" name="box_padding_left" class="mceEditableSelect" disabled="disabled" /></td>
 							<td>&nbsp;</td>
-							<td><select id="box_padding_left_measurement" name="box_padding_left_measurement" disabled="disabled"></select></td>
+							<td>
+								<label id="box_padding_left_measurement_label" for="box_padding_left_measurement" style="display: none; visibility: hidden;">Padding Left Measurement Unit</label>
+								<select id="box_padding_left_measurement" name="box_padding_left_measurement" disabled="disabled" aria-labelledby="box_padding_left_measurement_label"></select>
+							</td>
 						</tr>
 					</table>
 				</td>
@@ -341,7 +393,7 @@
 	<fieldset>
 		<legend>{#style_dlg.margin}</legend>
 
-		<table border="0">
+		<table role="presentation" border="0">
 			<tr>
 				<td>&nbsp;</td>
 				<td><input type="checkbox" id="box_margin_same" name="box_margin_same" class="checkbox" checked="checked" onClick="toggleSame(this,'box_margin');" /> <label for="box_margin_same">{#style_dlg.same}</label></td>
@@ -349,11 +401,14 @@
 			<tr>
 				<td><label for="box_margin_top">{#style_dlg.top}</label></td>
 				<td>
-					<table border="0" cellspacing="0" cellpadding="0">
+					<table role="presentation" border="0" cellspacing="0" cellpadding="0">
 						<tr>
 							<td><input type="text" id="box_margin_top" name="box_margin_top" class="mceEditableSelect" /></td>
 							<td>&nbsp;</td>
-							<td><select id="box_margin_top_measurement" name="box_margin_top_measurement"></select></td>
+							<td>
+								<label id="box_margin_top_measurement_label" for="box_margin_top_measurement" style="display: none; visibility: hidden;">Margin Top Measurement Unit</label>
+								<select id="box_margin_top_measurement" name="box_margin_top_measurement" aria-labelledby="box_margin_top_measurement_label"></select>
+							</td>
 						</tr>
 					</table>
 				</td>
@@ -361,11 +416,14 @@
 			<tr>
 				<td><label for="box_margin_right">{#style_dlg.right}</label></td>
 				<td>
-					<table border="0" cellspacing="0" cellpadding="0">
+					<table role="presentation" border="0" cellspacing="0" cellpadding="0">
 						<tr>
 							<td><input type="text" id="box_margin_right" name="box_margin_right" class="mceEditableSelect" disabled="disabled" /></td>
 							<td>&nbsp;</td>
-							<td><select id="box_margin_right_measurement" name="box_margin_right_measurement" disabled="disabled"></select></td>
+							<td>
+								<label id="box_margin_right_measurement_label" for="box_margin_right_measurement" style="display: none; visibility: hidden;">Margin Right Measurement Unit</label>
+								<select id="box_margin_right_measurement" name="box_margin_right_measurement" disabled="disabled" aria-labelledby="box_margin_right_measurement_label"></select>
+							</td>
 						</tr>
 					</table>
 				</td>
@@ -373,11 +431,14 @@
 			<tr>
 				<td><label for="box_margin_bottom">{#style_dlg.bottom}</label></td>
 				<td>
-					<table border="0" cellspacing="0" cellpadding="0">
+					<table role="presentation" border="0" cellspacing="0" cellpadding="0">
 						<tr>
 							<td><input type="text" id="box_margin_bottom" name="box_margin_bottom" class="mceEditableSelect" disabled="disabled" /></td>
 							<td>&nbsp;</td>
-							<td><select id="box_margin_bottom_measurement" name="box_margin_bottom_measurement" disabled="disabled"></select></td>
+							<td>
+								<label id="box_margin_bottom_measurement_label" for="box_margin_bottom_measurement" style="display: none; visibility: hidden;">Margin Bottom Measurement Unit</label>
+								<select id="box_margin_bottom_measurement" name="box_margin_bottom_measurement" disabled="disabled" aria-labelledby="box_margin_bottom_measurement_label"></select>
+							</td>
 						</tr>
 					</table>
 				</td>
@@ -385,11 +446,14 @@
 			<tr>
 				<td><label for="box_margin_left">{#style_dlg.left}</label></td>
 				<td>
-					<table border="0" cellspacing="0" cellpadding="0">
+					<table role="presentation" border="0" cellspacing="0" cellpadding="0">
 						<tr>
 							<td><input type="text" id="box_margin_left" name="box_margin_left" class="mceEditableSelect" disabled="disabled" /></td>
 							<td>&nbsp;</td>
-							<td><select id="box_margin_left_measurement" name="box_margin_left_measurement" disabled="disabled"></select></td>
+							<td>
+								<label id="box_margin_left_measurement_label" for="box_margin_left_measurement" style="display: none; visibility: hidden;">Margin Left Measurement Unit</label>
+								<select id="box_margin_left_measurement" name="box_margin_left_measurement" disabled="disabled" aria-labelledby="box_margin_left_measurement_label"></select>
+							</td>
 						</tr>
 					</table>
 				</td>
@@ -401,131 +465,148 @@
 </div>
 
 <div id="border_panel" class="panel">
-<table border="0" cellspacing="0" cellpadding="0" width="100%">
-<tr>
-	<td class="tdelim">&nbsp;</td>
-	<td class="tdelim delim">&nbsp;</td>
-	<td class="tdelim">{#style_dlg.style}</td>
-	<td class="tdelim delim">&nbsp;</td>
-	<td class="tdelim">{#style_dlg.width}</td>
-	<td class="tdelim delim">&nbsp;</td>
-	<td class="tdelim">{#style_dlg.color}</td>
-</tr>
+	<fieldset>
+		<legend>{#style_dlg.border}</legend>	
+		<table role="presentation" border="0" cellspacing="0" cellpadding="0" width="100%">
+		<tr>
+			<td class="tdelim">&nbsp;</td>
+			<td class="tdelim delim">&nbsp;</td>
+			<td class="tdelim">{#style_dlg.style}</td>
+			<td class="tdelim delim">&nbsp;</td>
+			<td class="tdelim">{#style_dlg.width}</td>
+			<td class="tdelim delim">&nbsp;</td>
+			<td class="tdelim">{#style_dlg.color}</td>
+		</tr>
 
-<tr>
-	<td>&nbsp;</td>
-	<td class="delim">&nbsp;</td>
-	<td><input type="checkbox" id="border_style_same" name="border_style_same" class="checkbox" checked="checked" onClick="toggleSame(this,'border_style');" /> <label for="border_style_same">{#style_dlg.same}</label></td>
-	<td class="delim">&nbsp;</td>
-	<td><input type="checkbox" id="border_width_same" name="border_width_same" class="checkbox" checked="checked" onClick="toggleSame(this,'border_width');" /> <label for="border_width_same">{#style_dlg.same}</label></td>
-	<td class="delim">&nbsp;</td>
-	<td><input type="checkbox" id="border_color_same" name="border_color_same" class="checkbox" checked="checked" onClick="toggleSame(this,'border_color');" /> <label for="border_color_same">{#style_dlg.same}</label></td>
-</tr>
+		<tr>
+			<td>&nbsp;</td>
+			<td class="delim">&nbsp;</td>
+			<td><input type="checkbox" id="border_style_same" name="border_style_same" class="checkbox" checked="checked" onClick="toggleSame(this,'border_style');" /> <label for="border_style_same">{#style_dlg.same}</label></td>
+			<td class="delim">&nbsp;</td>
+			<td><input type="checkbox" id="border_width_same" name="border_width_same" class="checkbox" checked="checked" onClick="toggleSame(this,'border_width');" /> <label for="border_width_same">{#style_dlg.same}</label></td>
+			<td class="delim">&nbsp;</td>
+			<td><input type="checkbox" id="border_color_same" name="border_color_same" class="checkbox" checked="checked" onClick="toggleSame(this,'border_color');" /> <label for="border_color_same">{#style_dlg.same}</label></td>
+		</tr>
 
-<tr>
-	<td>{#style_dlg.top}</td>
-	<td class="delim">&nbsp;</td>
-	<td><select id="border_style_top" name="border_style_top" class="mceEditableSelect"></select></td>
-	<td class="delim">&nbsp;</td>
-	<td>
-		<table border="0" cellspacing="0" cellpadding="0">
-			<tr>
-				<td><select id="border_width_top" name="border_width_top" class="mceEditableSelect"></select></td>
-				<td>&nbsp;</td>
-				<td><select id="border_width_top_measurement" name="border_width_top_measurement"></select></td>
-			</tr>
-		</table>
-	</td>
-	<td class="delim">&nbsp;</td>
-	<td>
-		<table border="0" cellpadding="0" cellspacing="0">
-			<tr>
-				<td><input id="border_color_top" name="border_color_top" type="text" value="" size="9" onChange="updateColor('border_color_top_pick','border_color_top');" /></td>
-				<td id="border_color_top_pickcontainer">&nbsp;</td>
-			</tr>
-		</table>
-	</td>
-</tr>
+		<tr>
+			<td>{#style_dlg.top}</td>
+			<td class="delim">&nbsp;</td>
+			<td><select id="border_style_top" name="border_style_top" class="mceEditableSelect"></select></td>
+			<td class="delim">&nbsp;</td>
+			<td>
+				<table role="presentation" border="0" cellspacing="0" cellpadding="0">
+					<tr>
+						<td><select id="border_width_top" name="border_width_top" class="mceEditableSelect"></select></td>
+						<td>&nbsp;</td>
+						<td>
+							<label id="border_width_top_measurement_label" for="border_width_top_measurement" style="display: none; visibility: hidden;">Width top Measurement Unit</label>
+							<select id="border_width_top_measurement" name="border_width_top_measurement" aria-labelledby="border_width_top_measurement_label"></select>
+						</td>
+					</tr>
+				</table>
+			</td>
+			<td class="delim">&nbsp;</td>
+			<td>
+				<table role="presentation" border="0" cellpadding="0" cellspacing="0">
+					<tr>
+						<td><input id="border_color_top" name="border_color_top" type="text" value="" size="9" onChange="updateColor('border_color_top_pick','border_color_top');" /></td>
+						<td id="border_color_top_pickcontainer">&nbsp;</td>
+					</tr>
+				</table>
+			</td>
+		</tr>
 
-<tr>
-	<td>{#style_dlg.right}</td>
-	<td class="delim">&nbsp;</td>
-	<td><select id="border_style_right" name="border_style_right" class="mceEditableSelect" disabled="disabled"></select></td>
-	<td class="delim">&nbsp;</td>
-	<td>
-		<table border="0" cellspacing="0" cellpadding="0">
-			<tr>
-				<td><select id="border_width_right" name="border_width_right" class="mceEditableSelect" disabled="disabled"></select></td>
-				<td>&nbsp;</td>
-				<td><select id="border_width_right_measurement" name="border_width_right_measurement" disabled="disabled"></select></td>
-			</tr>
-		</table>
-	</td>
-	<td class="delim">&nbsp;</td>
-	<td>
-		<table border="0" cellpadding="0" cellspacing="0">
-			<tr>
-				<td><input id="border_color_right" name="border_color_right" type="text" value="" size="9" onChange="updateColor('border_color_right_pick','border_color_right');" disabled="disabled" /></td>
-				<td id="border_color_right_pickcontainer">&nbsp;</td>
-			</tr>
-		</table>
-	</td>
-</tr>
+		<tr>
+			<td>{#style_dlg.right}</td>
+			<td class="delim">&nbsp;</td>
+			<td><select id="border_style_right" name="border_style_right" class="mceEditableSelect" disabled="disabled"></select></td>
+			<td class="delim">&nbsp;</td>
+			<td>
+				<table role="presentation" border="0" cellspacing="0" cellpadding="0">
+					<tr>
+						<td><select id="border_width_right" name="border_width_right" class="mceEditableSelect" disabled="disabled"></select></td>
+						<td>&nbsp;</td>
+						<td>
+							<label id="border_width_right_measurement_label" for="border_width_right_measurement" style="display: none; visibility: hidden;">Width Right Measurement Unit</label>
+							<select id="border_width_right_measurement" name="border_width_right_measurement" disabled="disabled" aria-labelledby="border_width_right_measurement_label"></select>
+						</td>
+					</tr>
+				</table>
+			</td>
+			<td class="delim">&nbsp;</td>
+			<td>
+				<table role="presentation" border="0" cellpadding="0" cellspacing="0">
+					<tr>
+						<td><input id="border_color_right" name="border_color_right" type="text" value="" size="9" onChange="updateColor('border_color_right_pick','border_color_right');" disabled="disabled" /></td>
+						<td id="border_color_right_pickcontainer">&nbsp;</td>
+					</tr>
+				</table>
+			</td>
+		</tr>
 
-<tr>
-	<td>{#style_dlg.bottom}</td>
-	<td class="delim">&nbsp;</td>
-	<td><select id="border_style_bottom" name="border_style_bottom" class="mceEditableSelect" disabled="disabled"></select></td>
-	<td class="delim">&nbsp;</td>
-	<td>
-		<table border="0" cellspacing="0" cellpadding="0">
-			<tr>
-				<td><select id="border_width_bottom" name="border_width_bottom" class="mceEditableSelect" disabled="disabled"></select></td>
-				<td>&nbsp;</td>
-				<td><select id="border_width_bottom_measurement" name="border_width_bottom_measurement" disabled="disabled"></select></td>
-			</tr>
-		</table>
-	</td>
-	<td class="delim">&nbsp;</td>
-	<td>
-		<table border="0" cellpadding="0" cellspacing="0">
-			<tr>
-				<td><input id="border_color_bottom" name="border_color_bottom" type="text" value="" size="9" onChange="updateColor('border_color_bottom_pick','border_color_bottom');" disabled="disabled" /></td>
-				<td id="border_color_bottom_pickcontainer">&nbsp;</td>
-			</tr>
-		</table>
-	</td>
-</tr>
+		<tr>
+			<td>{#style_dlg.bottom}</td>
+			<td class="delim">&nbsp;</td>
+			<td><select id="border_style_bottom" name="border_style_bottom" class="mceEditableSelect" disabled="disabled"></select></td>
+			<td class="delim">&nbsp;</td>
+			<td>
+				<table role="presentation" border="0" cellspacing="0" cellpadding="0">
+					<tr>
+						<td><select id="border_width_bottom" name="border_width_bottom" class="mceEditableSelect" disabled="disabled"></select></td>
+						<td>&nbsp;</td>
+						<td>
+							<label id="border_width_bottom_measurement_label" for="border_width_bottom_measurement" style="display: none; visibility: hidden;">Width Bottom Measurement Unit</label>
+							<select id="border_width_bottom_measurement" name="border_width_bottom_measurement" disabled="disabled" aria-labelledby="border_width_bottom_measurement_label"></select>
+						</td>
+					</tr>
+				</table>
+			</td>
+			<td class="delim">&nbsp;</td>
+			<td>
+				<table role="presentation" border="0" cellpadding="0" cellspacing="0">
+					<tr>
+						<td><input id="border_color_bottom" name="border_color_bottom" type="text" value="" size="9" onChange="updateColor('border_color_bottom_pick','border_color_bottom');" disabled="disabled" /></td>
+						<td id="border_color_bottom_pickcontainer">&nbsp;</td>
+					</tr>
+				</table>
+			</td>
+		</tr>
 
-<tr>
-	<td>{#style_dlg.left}</td>
-	<td class="delim">&nbsp;</td>
-	<td><select id="border_style_left" name="border_style_left" class="mceEditableSelect" disabled="disabled"></select></td>
-	<td class="delim">&nbsp;</td>
-	<td>
-		<table border="0" cellspacing="0" cellpadding="0">
-			<tr>
-				<td><select id="border_width_left" name="border_width_left" class="mceEditableSelect" disabled="disabled"></select></td>
-				<td>&nbsp;</td>
-				<td><select id="border_width_left_measurement" name="border_width_left_measurement" disabled="disabled"></select></td>
-			</tr>
+		<tr>
+			<td>{#style_dlg.left}</td>
+			<td class="delim">&nbsp;</td>
+			<td><select id="border_style_left" name="border_style_left" class="mceEditableSelect" disabled="disabled"></select></td>
+			<td class="delim">&nbsp;</td>
+			<td>
+				<table role="presentation" border="0" cellspacing="0" cellpadding="0">
+					<tr>
+						<td><select id="border_width_left" name="border_width_left" class="mceEditableSelect" disabled="disabled"></select></td>
+						<td>&nbsp;</td>
+						<td>
+							<label id="border_width_left_measurement_label" for="border_width_left_measurement" style="display: none; visibility: hidden;">Width Left Measurement Unit</label>
+							<select id="border_width_left_measurement" name="border_width_left_measurement" disabled="disabled" aria-labelledby="border_width_left_measurement_label"></select>
+						</td>
+					</tr>
+				</table>
+			</td>
+			<td class="delim">&nbsp;</td>
+			<td>
+				<table role="presentation" border="0" cellpadding="0" cellspacing="0">
+					<tr>
+						<td><input id="border_color_left" name="border_color_left" type="text" value="" size="9" onChange="updateColor('border_color_left_pick','border_color_left');" disabled="disabled" /></td>
+						<td id="border_color_left_pickcontainer">&nbsp;</td>
+					</tr>
+				</table>
+			</td>
+		</tr>
 		</table>
-	</td>
-	<td class="delim">&nbsp;</td>
-	<td>
-		<table border="0" cellpadding="0" cellspacing="0">
-			<tr>
-				<td><input id="border_color_left" name="border_color_left" type="text" value="" size="9" onChange="updateColor('border_color_left_pick','border_color_left');" disabled="disabled" /></td>
-				<td id="border_color_left_pickcontainer">&nbsp;</td>
-			</tr>
-		</table>
-	</td>
-</tr>
-</table>
+	</fieldset>
 </div>
 
 <div id="list_panel" class="panel">
-	<table border="0">
+<fieldset>
+	<legend>{#style_dlg.list}</legend>
+	<table role="presentation" border="0">
 		<tr>
 			<td><label for="list_type">{#style_dlg.list_type}</label></td>
 			<td><select id="list_type" name="list_type" class="mceEditableSelect"></select></td>
@@ -541,10 +622,13 @@
 			<td><select id="list_position" name="list_position" class="mceEditableSelect"></select></td>
 		</tr>
 	</table>
+</fieldset>
 </div>
 
 <div id="positioning_panel" class="panel">
-<table border="0">
+<fieldset>
+	<legend>{#style_dlg.position}</legend>
+<table role="presentation" border="0">
 	<tr>
 		<td><label for="positioning_type">{#style_dlg.positioning_type}</label></td>
 		<td><select id="positioning_type" name="positioning_type" class="mceEditableSelect"></select></td>
@@ -555,11 +639,14 @@
 	<tr>
 		<td><label for="positioning_width">{#style_dlg.width}</label></td>
 		<td>
-			<table border="0" cellspacing="0" cellpadding="0">
+			<table role="presentation" border="0" cellspacing="0" cellpadding="0">
 				<tr>
 					<td><input type="text" id="positioning_width" name="positioning_width" onChange="synch('positioning_width','box_width');" /></td>
 					<td>&nbsp;</td>
-					<td><select id="positioning_width_measurement" name="positioning_width_measurement"></select></td>
+					<td>
+						<label id="positioning_width_measurement_label" for="positioning_width_measurement" style="display: none; visibility: hidden;">Positioning width Measurement Unit</label>
+						<select id="positioning_width_measurement" name="positioning_width_measurement" aria-labelledby="positioning_width_measurement_label"></select>
+					</td>
 				</tr>
 			</table>
 		</td>
@@ -570,11 +657,14 @@
 	<tr>
 		<td><label for="positioning_height">{#style_dlg.height}</label></td>
 		<td>
-			<table border="0" cellspacing="0" cellpadding="0">
+			<table role="presentation" border="0" cellspacing="0" cellpadding="0">
 				<tr>
 					<td><input type="text" id="positioning_height" name="positioning_height" onChange="synch('positioning_height','box_height');" /></td>
 					<td>&nbsp;</td>
-					<td><select id="positioning_height_measurement" name="positioning_height_measurement"></select></td>
+					<td>
+						<label id="positioning_height_measurement_label" for="positioning_height_measurement" style="display: none; visibility: hidden;">Positioning Height Measurement Unit</label>
+						<select id="positioning_height_measurement" name="positioning_height_measurement" aria-labelledby="positioning_height_measurement_label"></select>
+					</td>
 				</tr>
 			</table>
 		</td>
@@ -587,7 +677,7 @@
 	<fieldset>
 		<legend>{#style_dlg.placement}</legend>
 
-		<table border="0">
+		<table role="presentation" border="0">
 			<tr>
 				<td>&nbsp;</td>
 				<td><input type="checkbox" id="positioning_placement_same" name="positioning_placement_same" class="checkbox" checked="checked" onClick="toggleSame(this,'positioning_placement');" /> <label for="positioning_placement_same">{#style_dlg.same}</label></td>
@@ -595,11 +685,14 @@
 			<tr>
 				<td>{#style_dlg.top}</td>
 				<td>
-					<table border="0" cellspacing="0" cellpadding="0">
+					<table role="presentation" border="0" cellspacing="0" cellpadding="0">
 						<tr>
 							<td><input type="text" id="positioning_placement_top" name="positioning_placement_top" /></td>
 							<td>&nbsp;</td>
-							<td><select id="positioning_placement_top_measurement" name="positioning_placement_top_measurement"></select></td>
+							<td>
+								<label id="positioning_placement_top_measurement_label" for="positioning_placement_top_measurement" style="display: none; visibility: hidden;">Placement Top Measurement Unit</label>
+								<select id="positioning_placement_top_measurement" name="positioning_placement_top_measurement" aria-labelledby="positioning_placement_top_measurement_label"></select>
+							</td>
 						</tr>
 					</table>
 				</td>
@@ -607,11 +700,14 @@
 			<tr>
 				<td>{#style_dlg.right}</td>
 				<td>
-					<table border="0" cellspacing="0" cellpadding="0">
+					<table role="presentation" border="0" cellspacing="0" cellpadding="0">
 						<tr>
 							<td><input type="text" id="positioning_placement_right" name="positioning_placement_right" disabled="disabled" /></td>
 							<td>&nbsp;</td>
-							<td><select id="positioning_placement_right_measurement" name="positioning_placement_right_measurement" disabled="disabled"></select></td>
+							<td>
+								<label id="positioning_placement_right_measurement_label" for="positioning_placement_right_measurement" style="display: none; visibility: hidden;">Placement Right Measurement Unit</label>
+								<select id="positioning_placement_right_measurement" name="positioning_placement_right_measurement" disabled="disabled" aria-labelledby="positioning_placement_right_measurement_label"></select>
+							</td>
 						</tr>
 					</table>
 				</td>
@@ -619,11 +715,14 @@
 			<tr>
 				<td>{#style_dlg.bottom}</td>
 				<td>
-					<table border="0" cellspacing="0" cellpadding="0">
+					<table role="presentation" border="0" cellspacing="0" cellpadding="0">
 						<tr>
 							<td><input type="text" id="positioning_placement_bottom" name="positioning_placement_bottom" disabled="disabled" /></td>
 							<td>&nbsp;</td>
-							<td><select id="positioning_placement_bottom_measurement" name="positioning_placement_bottom_measurement" disabled="disabled"></select></td>
+							<td>
+								<label id="positioning_placement_bottom_measurement_label" for="positioning_placement_bottom_measurement" style="display: none; visibility: hidden;">Placement Bottom Measurement Unit</label>
+								<select id="positioning_placement_bottom_measurement" name="positioning_placement_bottom_measurement" disabled="disabled" aria-labelledby="positioning_placement_bottom_measurement_label"></select>
+							</td>
 						</tr>
 					</table>
 				</td>
@@ -631,11 +730,14 @@
 			<tr>
 				<td>{#style_dlg.left}</td>
 				<td>
-					<table border="0" cellspacing="0" cellpadding="0">
+					<table role="presentation" border="0" cellspacing="0" cellpadding="0">
 						<tr>
 							<td><input type="text" id="positioning_placement_left" name="positioning_placement_left" disabled="disabled" /></td>
 							<td>&nbsp;</td>
-							<td><select id="positioning_placement_left_measurement" name="positioning_placement_left_measurement" disabled="disabled"></select></td>
+							<td>
+								<label id="positioning_placement_left_measurement_label" for="positioning_placement_left_measurement" style="display: none; visibility: hidden;">Placement Left Measurement Unit</label>
+								<select id="positioning_placement_left_measurement" name="positioning_placement_left_measurement" disabled="disabled" aria-labelledby="positioning_placement_left_measurement_label"></select>
+							</td>
 						</tr>
 					</table>
 				</td>
@@ -648,7 +750,7 @@
 	<fieldset>
 		<legend>{#style_dlg.clip}</legend>
 
-		<table border="0">
+		<table role="presentation" border="0">
 			<tr>
 				<td>&nbsp;</td>
 				<td><input type="checkbox" id="positioning_clip_same" name="positioning_clip_same" class="checkbox" checked="checked" onClick="toggleSame(this,'positioning_clip');" /> <label for="positioning_clip_same">{#style_dlg.same}</label></td>
@@ -656,11 +758,14 @@
 			<tr>
 				<td>{#style_dlg.top}</td>
 				<td>
-					<table border="0" cellspacing="0" cellpadding="0">
+					<table role="presentation" border="0" cellspacing="0" cellpadding="0">
 						<tr>
 							<td><input type="text" id="positioning_clip_top" name="positioning_clip_top" /></td>
 							<td>&nbsp;</td>
-							<td><select id="positioning_clip_top_measurement" name="positioning_clip_top_measurement"></select></td>
+							<td>
+								<label id="positioning_clip_top_measurement_label" for="positioning_clip_top_measurement" style="display: none; visibility: hidden;">Clip Top Measurement Unit</label>
+								<select id="positioning_clip_top_measurement" name="positioning_clip_top_measurement" aria-labelledby="positioning_clip_top_measurement_label"></select>
+							</td>
 						</tr>
 					</table>
 				</td>
@@ -668,11 +773,14 @@
 			<tr>
 				<td>{#style_dlg.right}</td>
 				<td>
-					<table border="0" cellspacing="0" cellpadding="0">
+					<table role="presentation" border="0" cellspacing="0" cellpadding="0">
 						<tr>
 							<td><input type="text" id="positioning_clip_right" name="positioning_clip_right" disabled="disabled" /></td>
 							<td>&nbsp;</td>
-							<td><select id="positioning_clip_right_measurement" name="positioning_clip_right_measurement" disabled="disabled"></select></td>
+							<td>
+								<label id="positioning_clip_right_measurement_label" for="positioning_clip_right_measurement" style="display: none; visibility: hidden;">Clip Right Measurement Unit</label>
+								<select id="positioning_clip_right_measurement" name="positioning_clip_right_measurement" disabled="disabled" aria-labelledby="positioning_clip_right_measurement_label"></select>
+							</td>
 						</tr>
 					</table>
 				</td>
@@ -680,11 +788,14 @@
 			<tr>
 				<td>{#style_dlg.bottom}</td>
 				<td>
-					<table border="0" cellspacing="0" cellpadding="0">
+					<table role="presentation" border="0" cellspacing="0" cellpadding="0">
 						<tr>
 							<td><input type="text" id="positioning_clip_bottom" name="positioning_clip_bottom" disabled="disabled" /></td>
 							<td>&nbsp;</td>
-							<td><select id="positioning_clip_bottom_measurement" name="positioning_clip_bottom_measurement" disabled="disabled"></select></td>
+							<td>
+								<label id="positioning_clip_bottom_measurement_label" for="positioning_clip_bottom_measurement" style="display: none; visibility: hidden;">Clip Bottom Measurement Unit</label>
+								<select id="positioning_clip_bottom_measurement" name="positioning_clip_bottom_measurement" disabled="disabled" aria-labelledby="positioning_clip_bottom_measurement_label"></select>
+							</td>
 						</tr>
 					</table>
 				</td>
@@ -692,11 +803,14 @@
 			<tr>
 				<td>{#style_dlg.left}</td>
 				<td>
-					<table border="0" cellspacing="0" cellpadding="0">
+					<table role="presentation" border="0" cellspacing="0" cellpadding="0">
 						<tr>
 							<td><input type="text" id="positioning_clip_left" name="positioning_clip_left" disabled="disabled" /></td>
 							<td>&nbsp;</td>
-							<td><select id="positioning_clip_left_measurement" name="positioning_clip_left_measurement" disabled="disabled"></select></td>
+							<td>
+								<label id="positioning_clip_left_measurement_label" for="positioning_clip_left_measurement" style="display: none; visibility: hidden;">Clip Left Measurement Unit</label>
+								<select id="positioning_clip_left_measurement" name="positioning_clip_left_measurement" disabled="disabled" aria-labelledby="positioning_clip_left_measurement_label"></select>
+							</td>
 						</tr>
 					</table>
 				</td>
@@ -706,6 +820,7 @@
 </div>
 <br style="clear: both" />
 </div>
+</fieldset>
 </div>
 
 <div class="mceActionPanel">
diff --git a/plugins/TinyMCE/js/plugins/tabfocus/editor_plugin.js b/plugins/TinyMCE/js/plugins/tabfocus/editor_plugin.js
index 27d2440222..d18689ddb9 100644
--- a/plugins/TinyMCE/js/plugins/tabfocus/editor_plugin.js
+++ b/plugins/TinyMCE/js/plugins/tabfocus/editor_plugin.js
@@ -1 +1 @@
-(function(){var c=tinymce.DOM,a=tinymce.dom.Event,d=tinymce.each,b=tinymce.explode;tinymce.create("tinymce.plugins.TabFocusPlugin",{init:function(f,g){function e(i,j){if(j.keyCode===9){return a.cancel(j)}}function h(l,p){var j,m,o,n,k;function q(i){o=c.getParent(l.id,"form");n=o.elements;if(o){d(n,function(s,r){if(s.id==l.id){j=r;return false}});if(i>0){for(m=j+1;m<n.length;m++){if(n[m].type!="hidden"){return n[m]}}}else{for(m=j-1;m>=0;m--){if(n[m].type!="hidden"){return n[m]}}}}return null}if(p.keyCode===9){k=b(l.getParam("tab_focus",l.getParam("tabfocus_elements",":prev,:next")));if(k.length==1){k[1]=k[0];k[0]=":prev"}if(p.shiftKey){if(k[0]==":prev"){n=q(-1)}else{n=c.get(k[0])}}else{if(k[1]==":next"){n=q(1)}else{n=c.get(k[1])}}if(n){if(l=tinymce.get(n.id||n.name)){l.focus()}else{window.setTimeout(function(){window.focus();n.focus()},10)}return a.cancel(p)}}}f.onKeyUp.add(e);if(tinymce.isGecko){f.onKeyPress.add(h);f.onKeyDown.add(e)}else{f.onKeyDown.add(h)}f.onInit.add(function(){d(c.select("a:first,a:last",f.getContainer()),function(i){a.add(i,"focus",function(){f.focus()})})})},getInfo:function(){return{longname:"Tabfocus",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/tabfocus",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("tabfocus",tinymce.plugins.TabFocusPlugin)})();
\ No newline at end of file
+(function(){var c=tinymce.DOM,a=tinymce.dom.Event,d=tinymce.each,b=tinymce.explode;tinymce.create("tinymce.plugins.TabFocusPlugin",{init:function(f,g){function e(i,j){if(j.keyCode===9){return a.cancel(j)}}function h(l,p){var j,m,o,n,k;function q(r){n=c.select(":input:enabled,*[tabindex]");function i(s){return s.type!="hidden"&&s.tabIndex!="-1"&&!(n[m].style.display=="none")&&!(n[m].style.visibility=="hidden")}d(n,function(t,s){if(t.id==l.id){j=s;return false}});if(r>0){for(m=j+1;m<n.length;m++){if(i(n[m])){return n[m]}}}else{for(m=j-1;m>=0;m--){if(i(n[m])){return n[m]}}}return null}if(p.keyCode===9){k=b(l.getParam("tab_focus",l.getParam("tabfocus_elements",":prev,:next")));if(k.length==1){k[1]=k[0];k[0]=":prev"}if(p.shiftKey){if(k[0]==":prev"){n=q(-1)}else{n=c.get(k[0])}}else{if(k[1]==":next"){n=q(1)}else{n=c.get(k[1])}}if(n){if(n.id&&(l=tinymce.get(n.id||n.name))){l.focus()}else{window.setTimeout(function(){if(!tinymce.isWebKit){window.focus()}n.focus()},10)}return a.cancel(p)}}}f.onKeyUp.add(e);if(tinymce.isGecko){f.onKeyPress.add(h);f.onKeyDown.add(e)}else{f.onKeyDown.add(h)}},getInfo:function(){return{longname:"Tabfocus",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/tabfocus",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("tabfocus",tinymce.plugins.TabFocusPlugin)})();
\ No newline at end of file
diff --git a/plugins/TinyMCE/js/plugins/tabfocus/editor_plugin_src.js b/plugins/TinyMCE/js/plugins/tabfocus/editor_plugin_src.js
index c2be2f40a6..f4545e1670 100644
--- a/plugins/TinyMCE/js/plugins/tabfocus/editor_plugin_src.js
+++ b/plugins/TinyMCE/js/plugins/tabfocus/editor_plugin_src.js
@@ -22,27 +22,30 @@
 				var x, i, f, el, v;
 
 				function find(d) {
-					f = DOM.getParent(ed.id, 'form');
-					el = f.elements;
+					el = DOM.select(':input:enabled,*[tabindex]');
+					function canSelect(e) {
+						return e.type != 'hidden' && 
+						e.tabIndex != '-1' && 
+							!(el[i].style.display == "none") && 
+							!(el[i].style.visibility == "hidden");
+				    }
 
-					if (f) {
-						each(el, function(e, i) {
-							if (e.id == ed.id) {
-								x = i;
-								return false;
-							}
-						});
+					each(el, function(e, i) {
+						if (e.id == ed.id) {
+							x = i;
+							return false;
+						}
+					});
 
-						if (d > 0) {
-							for (i = x + 1; i < el.length; i++) {
-								if (el[i].type != 'hidden')
-									return el[i];
-							}
-						} else {
-							for (i = x - 1; i >= 0; i--) {
-								if (el[i].type != 'hidden')
-									return el[i];
-							}
+					if (d > 0) {
+						for (i = x + 1; i < el.length; i++) {
+							if (canSelect(el[i]))
+								return el[i];
+						}
+					} else {
+						for (i = x - 1; i >= 0; i--) {
+							if (canSelect(el[i]))
+								return el[i];
 						}
 					}
 
@@ -71,10 +74,14 @@
 					}
 
 					if (el) {
-						if (ed = tinymce.get(el.id || el.name))
+						if (el.id && (ed = tinymce.get(el.id || el.name)))
 							ed.focus();
 						else
-							window.setTimeout(function() {window.focus();el.focus();}, 10);
+							window.setTimeout(function() {
+								if (!tinymce.isWebKit)
+									window.focus();
+								el.focus();
+							}, 10);
 
 						return Event.cancel(e);
 					}
@@ -89,11 +96,6 @@
 			} else
 				ed.onKeyDown.add(tabHandler);
 
-			ed.onInit.add(function() {
-				each(DOM.select('a:first,a:last', ed.getContainer()), function(n) {
-					Event.add(n, 'focus', function() {ed.focus();});
-				});
-			});
 		},
 
 		getInfo : function() {
diff --git a/plugins/TinyMCE/js/plugins/table/cell.htm b/plugins/TinyMCE/js/plugins/table/cell.htm
index d243e1d833..a72a8d6973 100644
--- a/plugins/TinyMCE/js/plugins/table/cell.htm
+++ b/plugins/TinyMCE/js/plugins/table/cell.htm
@@ -5,16 +5,17 @@
 	<script type="text/javascript" src="../../tiny_mce_popup.js"></script>
 	<script type="text/javascript" src="../../utils/mctabs.js"></script>
 	<script type="text/javascript" src="../../utils/form_utils.js"></script>
+	<script type="text/javascript" src="../../utils/validate.js"></script>
 	<script type="text/javascript" src="../../utils/editable_selects.js"></script>
 	<script type="text/javascript" src="js/cell.js"></script>
 	<link href="css/cell.css" rel="stylesheet" type="text/css" />
 </head>
-<body id="tablecell" style="display: none">
+<body id="tablecell" style="display: none" role="application">
 	<form onsubmit="updateAction();return false;" action="#">
 		<div class="tabs">
 			<ul>
-				<li id="general_tab" class="current"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{#table_dlg.general_tab}</a></span></li>
-				<li id="advanced_tab"><span><a href="javascript:mcTabs.displayTab('advanced_tab','advanced_panel');" onmousedown="return false;">{#table_dlg.advanced_tab}</a></span></li>
+				<li id="general_tab" class="current" aria-controls="general_panel"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{#table_dlg.general_tab}</a></span></li>
+				<li id="advanced_tab" aria-controls="advanced_panel"><span><a href="javascript:mcTabs.displayTab('advanced_tab','advanced_panel');" onmousedown="return false;">{#table_dlg.advanced_tab}</a></span></li>
 			</ul>
 		</div>
 
@@ -23,7 +24,7 @@
 				<fieldset>
 					<legend>{#table_dlg.general_props}</legend>
 
-					<table border="0" cellpadding="4" cellspacing="0">
+					<table role="presentation" border="0" cellpadding="4" cellspacing="0">
 						<tr>
 							<td><label for="align">{#table_dlg.align}</label></td>
 							<td>
@@ -70,10 +71,10 @@
 
 						<tr>
 							<td><label for="width">{#table_dlg.width}</label></td>
-							<td><input id="width" name="width" type="text" value="" size="4" maxlength="4" onchange="changedSize();" /></td>
+							<td><input id="width" name="width" type="text" value="" size="7" maxlength="7" onchange="changedSize();" class="size" /></td>
 
 							<td><label for="height">{#table_dlg.height}</label></td>
-							<td><input id="height" name="height" type="text" value="" size="4" maxlength="4" onchange="changedSize();" /></td>
+							<td><input id="height" name="height" type="text" value="" size="7" maxlength="7" onchange="changedSize();" class="size" /></td>
 						</tr>
 
 						<tr id="styleSelectRow">
@@ -92,7 +93,7 @@
 				<fieldset>
 					<legend>{#table_dlg.advanced_props}</legend>
 
-					<table border="0" cellpadding="0" cellspacing="4">
+					<table role="presentation" border="0" cellpadding="0" cellspacing="4">
 						<tr>
 							<td class="column1"><label for="id">{#table_dlg.id}</label></td> 
 							<td><input id="id" name="id" type="text" value="" style="width: 200px" /></td> 
@@ -124,7 +125,7 @@
 						<tr>
 							<td class="column1"><label for="backgroundimage">{#table_dlg.bgimage}</label></td> 
 							<td>
-								<table border="0" cellpadding="0" cellspacing="0">
+								<table role="presentation" border="0" cellpadding="0" cellspacing="0">
 									<tr>
 										<td><input id="backgroundimage" name="backgroundimage" type="text" value="" style="width: 200px" onchange="changedBackgroundImage();" /></td>
 										<td id="backgroundimagebrowsercontainer">&nbsp;</td>
@@ -133,10 +134,10 @@
 							</td> 
 						</tr>
 
-						<tr>
-							<td class="column1"><label for="bordercolor">{#table_dlg.bordercolor}</label></td> 
+						<tr role="group" aria-labelledby="bordercolor_label">
+							<td class="column1"><label id="bordercolor_label" for="bordercolor">{#table_dlg.bordercolor}</label></td> 
 							<td>
-								<table border="0" cellpadding="0" cellspacing="0">
+								<table role="presentation" border="0" cellpadding="0" cellspacing="0">
 									<tr>
 										<td><input id="bordercolor" name="bordercolor" type="text" value="" size="9" onchange="updateColor('bordercolor_pick','bordercolor');changedColor();" /></td>
 										<td id="bordercolor_pickcontainer">&nbsp;</td>
@@ -145,10 +146,10 @@
 							</td> 
 						</tr>
 
-						<tr>
-							<td class="column1"><label for="bgcolor">{#table_dlg.bgcolor}</label></td> 
+						<tr role="group" aria-labelledby="bgcolor_label">
+							<td class="column1"><label id="bgcolor_label" for="bgcolor">{#table_dlg.bgcolor}</label></td> 
 							<td>
-								<table border="0" cellpadding="0" cellspacing="0">
+								<table role="presentation" border="0" cellpadding="0" cellspacing="0">
 									<tr>
 										<td><input id="bgcolor" name="bgcolor" type="text" value="" size="9" onchange="updateColor('bgcolor_pick','bgcolor');changedColor();" /></td>
 										<td id="bgcolor_pickcontainer">&nbsp;</td>
@@ -166,6 +167,7 @@
 				<select id="action" name="action">
 					<option value="cell">{#table_dlg.cell_cell}</option>
 					<option value="row">{#table_dlg.cell_row}</option>
+					<option value="col">{#table_dlg.cell_col}</option>
 					<option value="all">{#table_dlg.cell_all}</option>
 				</select>
 			</div>
diff --git a/plugins/TinyMCE/js/plugins/table/editor_plugin.js b/plugins/TinyMCE/js/plugins/table/editor_plugin.js
index 266d7d5371..f0100315b4 100644
--- a/plugins/TinyMCE/js/plugins/table/editor_plugin.js
+++ b/plugins/TinyMCE/js/plugins/table/editor_plugin.js
@@ -1 +1 @@
-(function(b){var c=b.each;function a(F,E,I){var e,J,B,n;r();n=E.getParent(I.getStart(),"th,td");if(n){J=D(n);B=G();n=v(J.x,J.y)}function w(L,K){L=L.cloneNode(K);L.removeAttribute("id");return L}function r(){var K=0;e=[];c(["thead","tbody","tfoot"],function(L){var M=E.select(L+" tr",F);c(M,function(N,O){O+=K;c(E.select("td,th",N),function(U,P){var Q,R,S,T;if(e[O]){while(e[O][P]){P++}}S=g(U,"rowspan");T=g(U,"colspan");for(R=O;R<O+S;R++){if(!e[R]){e[R]=[]}for(Q=P;Q<P+T;Q++){e[R][Q]={part:L,real:R==O&&Q==P,elm:U,rowspan:S,colspan:T}}}})});K+=M.length})}function v(K,M){var L;L=e[M];if(L){return L[K]}}function g(L,K){return parseInt(L.getAttribute(K)||1)}function h(K){return E.hasClass(K.elm,"mceSelected")||K==n}function j(){var K=[];c(F.rows,function(L){c(L.cells,function(M){if(E.hasClass(M,"mceSelected")||M==n.elm){K.push(L);return false}})});return K}function q(){var K=E.createRng();K.setStartAfter(F);K.setEndAfter(F);I.setRng(K);E.remove(F)}function d(K){var L;b.walk(K,function(N){var M;if(N.nodeType==3){c(E.getParents(N.parentNode,null,K).reverse(),function(O){O=w(O,false);if(!L){L=M=O}else{if(M){M.appendChild(O)}}M=O});if(M){M.innerHTML=b.isIE?"&nbsp;":'<br _mce_bogus="1" />'}return false}},"childNodes");K=w(K,false);K.rowSpan=K.colSpan=1;if(L){K.appendChild(L)}else{if(!b.isIE){K.innerHTML='<br _mce_bogus="1" />'}}return K}function p(){var K=E.createRng();c(E.select("tr",F),function(L){if(L.cells.length==0){E.remove(L)}});if(E.select("tr",F).length==0){K.setStartAfter(F);K.setEndAfter(F);I.setRng(K);E.remove(F);return}c(E.select("thead,tbody,tfoot",F),function(L){if(L.rows.length==0){E.remove(L)}});r();row=e[Math.min(e.length-1,J.y)];if(row){I.select(row[Math.min(row.length-1,J.x)].elm,true);I.collapse(true)}}function s(Q,O,S,P){var N,L,K,M,R;N=e[O][Q].elm.parentNode;for(K=1;K<=S;K++){N=E.getNext(N,"tr");if(N){for(L=Q;L>=0;L--){R=e[O+K][L].elm;if(R.parentNode==N){for(M=1;M<=P;M++){E.insertAfter(d(R),R)}break}}if(L==-1){for(M=1;M<=P;M++){N.insertBefore(d(N.cells[0]),N.cells[0])}}}}}function A(){c(e,function(K,L){c(K,function(N,M){var Q,P,R,O;if(h(N)){N=N.elm;Q=g(N,"colspan");P=g(N,"rowspan");if(Q>1||P>1){N.colSpan=N.rowSpan=1;for(O=0;O<Q-1;O++){E.insertAfter(d(N),N)}s(M,L,P-1,Q)}}})})}function o(S,P,V){var N,M,U,T,R,O,Q,K,S,L;if(S){pos=D(S);N=pos.x;M=pos.y;U=N+(P-1);T=M+(V-1)}else{N=J.x;M=J.y;U=B.x;T=B.y}Q=v(N,M);K=v(U,T);if(Q&&K&&Q.part==K.part){A();r();Q=v(N,M).elm;Q.colSpan=(U-N)+1;Q.rowSpan=(T-M)+1;for(O=M;O<=T;O++){for(R=N;R<=U;R++){S=e[O][R].elm;if(S!=Q){L=b.grep(S.childNodes);c(L,function(X,W){if(X.nodeName!="BR"||W!=L.length-1){Q.appendChild(X)}});E.remove(S)}}}p()}}function k(N){var K,P,M,O,Q,R,L,S;c(e,function(T,U){c(T,function(W,V){if(h(W)){W=W.elm;Q=W.parentNode;R=w(Q,false);K=U;if(N){return false}}});if(N){return !K}});for(O=0;O<e[0].length;O++){P=e[K][O].elm;if(P!=M){if(!N){rowSpan=g(P,"rowspan");if(rowSpan>1){P.rowSpan=rowSpan+1;continue}}else{if(K>0&&e[K-1][O]){S=e[K-1][O].elm;rowSpan=g(S,"rowspan");if(rowSpan>1){S.rowSpan=rowSpan+1;continue}}}L=d(P);L.colSpan=P.colSpan;R.appendChild(L);M=P}}if(R.hasChildNodes()){if(!N){E.insertAfter(R,Q)}else{Q.parentNode.insertBefore(R,Q)}}}function f(L){var M,K;c(e,function(N,O){c(N,function(Q,P){if(h(Q)){M=P;if(L){return false}}});if(L){return !M}});c(e,function(Q,R){var N=Q[M].elm,O,P;if(N!=K){P=g(N,"colspan");O=g(N,"rowspan");if(P==1){if(!L){E.insertAfter(d(N),N);s(M,R,O-1,P)}else{N.parentNode.insertBefore(d(N),N);s(M,R,O-1,P)}}else{N.colSpan++}K=N}})}function m(){var K=[];c(e,function(L,M){c(L,function(O,N){if(h(O)&&b.inArray(K,N)===-1){c(e,function(R){var P=R[N].elm,Q;Q=g(P,"colspan");if(Q>1){P.colSpan=Q-1}else{E.remove(P)}});K.push(N)}})});p()}function l(){var L;function K(O){var N,P,M;N=E.getNext(O,"tr");c(O.cells,function(Q){var R=g(Q,"rowspan");if(R>1){Q.rowSpan=R-1;P=D(Q);s(P.x,P.y,1,1)}});P=D(O.cells[0]);c(e[P.y],function(Q){var R;Q=Q.elm;if(Q!=M){R=g(Q,"rowspan");if(R<=1){E.remove(Q)}else{Q.rowSpan=R-1}M=Q}})}L=j();c(L.reverse(),function(M){K(M)});p()}function C(){var K=j();E.remove(K);p();return K}function H(){var K=j();c(K,function(M,L){K[L]=w(M,true)});return K}function z(M,L){var N=j(),K=N[L?0:N.length-1],O=K.cells.length;c(e,function(Q){var P;O=0;c(Q,function(S,R){if(S.real){O+=S.colspan}if(S.elm.parentNode==K){P=1}});if(P){return false}});if(!L){M.reverse()}c(M,function(R){var Q=R.cells.length,P;for(i=0;i<Q;i++){P=R.cells[i];P.colSpan=P.rowSpan=1}for(i=Q;i<O;i++){R.appendChild(d(R.cells[Q-1]))}for(i=O;i<Q;i++){E.remove(R.cells[i])}if(L){K.parentNode.insertBefore(R,K)}else{E.insertAfter(R,K)}})}function D(K){var L;c(e,function(M,N){c(M,function(P,O){if(P.elm==K){L={x:O,y:N};return false}});return !L});return L}function u(K){J=D(K)}function G(){var M,L,K;L=K=0;c(e,function(N,O){c(N,function(Q,P){var S,R;if(h(Q)){Q=e[O][P];if(P>L){L=P}if(O>K){K=O}if(Q.real){S=Q.colspan-1;R=Q.rowspan-1;if(S){if(P+S>L){L=P+S}}if(R){if(O+R>K){K=O+R}}}}})});return{x:L,y:K}}function t(Q){var N,M,S,R,L,K,O,P;B=D(Q);if(J&&B){N=Math.min(J.x,B.x);M=Math.min(J.y,B.y);S=Math.max(J.x,B.x);R=Math.max(J.y,B.y);L=S;K=R;for(y=M;y<=K;y++){Q=e[y][N];if(!Q.real){if(N-(Q.colspan-1)<N){N-=Q.colspan-1}}}for(x=N;x<=L;x++){Q=e[M][x];if(!Q.real){if(M-(Q.rowspan-1)<M){M-=Q.rowspan-1}}}for(y=M;y<=R;y++){for(x=N;x<=S;x++){Q=e[y][x];if(Q.real){O=Q.colspan-1;P=Q.rowspan-1;if(O){if(x+O>L){L=x+O}}if(P){if(y+P>K){K=y+P}}}}}E.removeClass(E.select("td.mceSelected,th.mceSelected"),"mceSelected");for(y=M;y<=K;y++){for(x=N;x<=L;x++){E.addClass(e[y][x].elm,"mceSelected")}}}}b.extend(this,{deleteTable:q,split:A,merge:o,insertRow:k,insertCol:f,deleteCols:m,deleteRows:l,cutRows:C,copyRows:H,pasteRows:z,getPos:D,setStartCell:u,setEndCell:t})}b.create("tinymce.plugins.TablePlugin",{init:function(e,f){var d,j;function h(m){var l=e.selection,k=e.dom.getParent(m||l.getNode(),"table");if(k){return new a(k,e.dom,l)}}function g(){e.getBody().style.webkitUserSelect="";e.dom.removeClass(e.dom.select("td.mceSelected,th.mceSelected"),"mceSelected")}c([["table","table.desc","mceInsertTable",true],["delete_table","table.del","mceTableDelete"],["delete_col","table.delete_col_desc","mceTableDeleteCol"],["delete_row","table.delete_row_desc","mceTableDeleteRow"],["col_after","table.col_after_desc","mceTableInsertColAfter"],["col_before","table.col_before_desc","mceTableInsertColBefore"],["row_after","table.row_after_desc","mceTableInsertRowAfter"],["row_before","table.row_before_desc","mceTableInsertRowBefore"],["row_props","table.row_desc","mceTableRowProps",true],["cell_props","table.cell_desc","mceTableCellProps",true],["split_cells","table.split_cells_desc","mceTableSplitCells",true],["merge_cells","table.merge_cells_desc","mceTableMergeCells",true]],function(k){e.addButton(k[0],{title:k[1],cmd:k[2],ui:k[3]})});if(!b.isIE){e.onClick.add(function(k,l){l=l.target;if(l.nodeName==="TABLE"){k.selection.select(l)}})}e.onNodeChange.add(function(l,k,o){var m;o=l.selection.getStart();m=l.dom.getParent(o,"td,th,caption");k.setActive("table",o.nodeName==="TABLE"||!!m);if(m&&m.nodeName==="CAPTION"){m=0}k.setDisabled("delete_table",!m);k.setDisabled("delete_col",!m);k.setDisabled("delete_table",!m);k.setDisabled("delete_row",!m);k.setDisabled("col_after",!m);k.setDisabled("col_before",!m);k.setDisabled("row_after",!m);k.setDisabled("row_before",!m);k.setDisabled("row_props",!m);k.setDisabled("cell_props",!m);k.setDisabled("split_cells",!m);k.setDisabled("merge_cells",!m)});e.onInit.add(function(l){var k,o,p=l.dom,m;d=l.windowManager;l.onMouseDown.add(function(q,r){if(r.button!=2){g();o=p.getParent(r.target,"td,th");k=p.getParent(o,"table")}});p.bind(l.getDoc(),"mouseover",function(t){var r,q,s=t.target;if(o&&(m||s!=o)&&(s.nodeName=="TD"||s.nodeName=="TH")){q=p.getParent(s,"table");if(q==k){if(!m){m=h(q);m.setStartCell(o);l.getBody().style.webkitUserSelect="none"}m.setEndCell(s)}r=l.selection.getSel();if(r.removeAllRanges){r.removeAllRanges()}else{r.empty()}t.preventDefault()}});l.onMouseUp.add(function(z,A){var r,t=z.selection,B,C=t.getSel(),q,u,s,w;if(o){if(m){z.getBody().style.webkitUserSelect=""}function v(D,F){var E=new b.dom.TreeWalker(D,D);do{if(D.nodeType==3&&b.trim(D.nodeValue).length!=0){if(F){r.setStart(D,0)}else{r.setEnd(D,D.nodeValue.length)}return}if(D.nodeName=="BR"){if(F){r.setStartBefore(D)}else{r.setEndBefore(D)}return}}while(D=(F?E.next():E.prev()))}B=p.select("td.mceSelected,th.mceSelected");if(B.length>0){r=p.createRng();u=B[0];w=B[B.length-1];v(u,1);q=new b.dom.TreeWalker(u,p.getParent(B[0],"table"));do{if(u.nodeName=="TD"||u.nodeName=="TH"){if(!p.hasClass(u,"mceSelected")){break}s=u}}while(u=q.next());v(s);t.setRng(r)}z.nodeChanged();o=m=k=null}});l.onKeyUp.add(function(q,r){g()});if(l&&l.plugins.contextmenu){l.plugins.contextmenu.onContextMenu.add(function(s,q,u){var v,t=l.selection,r=t.getNode()||l.getBody();if(l.dom.getParent(u,"td")||l.dom.getParent(u,"th")||l.dom.select("td.mceSelected,th.mceSelected").length){q.removeAll();if(r.nodeName=="A"&&!l.dom.getAttrib(r,"name")){q.add({title:"advanced.link_desc",icon:"link",cmd:l.plugins.advlink?"mceAdvLink":"mceLink",ui:true});q.add({title:"advanced.unlink_desc",icon:"unlink",cmd:"UnLink"});q.addSeparator()}if(r.nodeName=="IMG"&&r.className.indexOf("mceItem")==-1){q.add({title:"advanced.image_desc",icon:"image",cmd:l.plugins.advimage?"mceAdvImage":"mceImage",ui:true});q.addSeparator()}q.add({title:"table.desc",icon:"table",cmd:"mceInsertTable",value:{action:"insert"}});q.add({title:"table.props_desc",icon:"table_props",cmd:"mceInsertTable"});q.add({title:"table.del",icon:"delete_table",cmd:"mceTableDelete"});q.addSeparator();v=q.addMenu({title:"table.cell"});v.add({title:"table.cell_desc",icon:"cell_props",cmd:"mceTableCellProps"});v.add({title:"table.split_cells_desc",icon:"split_cells",cmd:"mceTableSplitCells"});v.add({title:"table.merge_cells_desc",icon:"merge_cells",cmd:"mceTableMergeCells"});v=q.addMenu({title:"table.row"});v.add({title:"table.row_desc",icon:"row_props",cmd:"mceTableRowProps"});v.add({title:"table.row_before_desc",icon:"row_before",cmd:"mceTableInsertRowBefore"});v.add({title:"table.row_after_desc",icon:"row_after",cmd:"mceTableInsertRowAfter"});v.add({title:"table.delete_row_desc",icon:"delete_row",cmd:"mceTableDeleteRow"});v.addSeparator();v.add({title:"table.cut_row_desc",icon:"cut",cmd:"mceTableCutRow"});v.add({title:"table.copy_row_desc",icon:"copy",cmd:"mceTableCopyRow"});v.add({title:"table.paste_row_before_desc",icon:"paste",cmd:"mceTablePasteRowBefore"}).setDisabled(!j);v.add({title:"table.paste_row_after_desc",icon:"paste",cmd:"mceTablePasteRowAfter"}).setDisabled(!j);v=q.addMenu({title:"table.col"});v.add({title:"table.col_before_desc",icon:"col_before",cmd:"mceTableInsertColBefore"});v.add({title:"table.col_after_desc",icon:"col_after",cmd:"mceTableInsertColAfter"});v.add({title:"table.delete_col_desc",icon:"delete_col",cmd:"mceTableDeleteCol"})}else{q.add({title:"table.desc",icon:"table",cmd:"mceInsertTable"})}})}if(!b.isIE){function n(){var q;for(q=l.getBody().lastChild;q&&q.nodeType==3&&!q.nodeValue.length;q=q.previousSibling){}if(q&&q.nodeName=="TABLE"){l.dom.add(l.getBody(),"p",null,'<br mce_bogus="1" />')}}if(b.isGecko){l.onKeyDown.add(function(r,t){var q,s,u=r.dom;if(t.keyCode==37||t.keyCode==38){q=r.selection.getRng();s=u.getParent(q.startContainer,"table");if(s&&r.getBody().firstChild==s){if(isAtStart(q,s)){q=u.createRng();q.setStartBefore(s);q.setEndBefore(s);r.selection.setRng(q);t.preventDefault()}}}})}l.onKeyUp.add(n);l.onSetContent.add(n);l.onVisualAid.add(n);l.onPreProcess.add(function(q,s){var r=s.node.lastChild;if(r&&r.childNodes.length==1&&r.firstChild.nodeName=="BR"){q.dom.remove(r)}});n()}});c({mceTableSplitCells:function(k){k.split()},mceTableMergeCells:function(l){var m,n,k;k=e.dom.getParent(e.selection.getNode(),"th,td");if(k){m=k.rowSpan;n=k.colSpan}if(!e.dom.select("td.mceSelected,th.mceSelected").length){d.open({url:f+"/merge_cells.htm",width:240+parseInt(e.getLang("table.merge_cells_delta_width",0)),height:110+parseInt(e.getLang("table.merge_cells_delta_height",0)),inline:1},{rows:m,cols:n,onaction:function(o){l.merge(k,o.cols,o.rows)},plugin_url:f})}else{l.merge()}},mceTableInsertRowBefore:function(k){k.insertRow(true)},mceTableInsertRowAfter:function(k){k.insertRow()},mceTableInsertColBefore:function(k){k.insertCol(true)},mceTableInsertColAfter:function(k){k.insertCol()},mceTableDeleteCol:function(k){k.deleteCols()},mceTableDeleteRow:function(k){k.deleteRows()},mceTableCutRow:function(k){j=k.cutRows()},mceTableCopyRow:function(k){j=k.copyRows()},mceTablePasteRowBefore:function(k){k.pasteRows(j,true)},mceTablePasteRowAfter:function(k){k.pasteRows(j)},mceTableDelete:function(k){k.deleteTable()}},function(l,k){e.addCommand(k,function(){var m=h();if(m){l(m);e.execCommand("mceRepaint");g()}})});c({mceInsertTable:function(k){d.open({url:f+"/table.htm",width:400+parseInt(e.getLang("table.table_delta_width",0)),height:320+parseInt(e.getLang("table.table_delta_height",0)),inline:1},{plugin_url:f,action:k?k.action:0})},mceTableRowProps:function(){d.open({url:f+"/row.htm",width:400+parseInt(e.getLang("table.rowprops_delta_width",0)),height:295+parseInt(e.getLang("table.rowprops_delta_height",0)),inline:1},{plugin_url:f})},mceTableCellProps:function(){d.open({url:f+"/cell.htm",width:400+parseInt(e.getLang("table.cellprops_delta_width",0)),height:295+parseInt(e.getLang("table.cellprops_delta_height",0)),inline:1},{plugin_url:f})}},function(l,k){e.addCommand(k,function(m,n){l(n)})})}});b.PluginManager.add("table",b.plugins.TablePlugin)})(tinymce);
\ No newline at end of file
+(function(c){var d=c.each;function b(f,g){var h=g.ownerDocument,e=h.createRange(),j;e.setStartBefore(g);e.setEnd(f.endContainer,f.endOffset);j=h.createElement("body");j.appendChild(e.cloneContents());return j.innerHTML.replace(/<(br|img|object|embed|input|textarea)[^>]*>/gi,"-").replace(/<[^>]+>/g,"").length==0}function a(H,G,K){var f,L,D,o;t();o=G.getParent(K.getStart(),"th,td");if(o){L=F(o);D=I();o=z(L.x,L.y)}function A(N,M){N=N.cloneNode(M);N.removeAttribute("id");return N}function t(){var M=0;f=[];d(["thead","tbody","tfoot"],function(N){var O=G.select("> "+N+" tr",H);d(O,function(P,Q){Q+=M;d(G.select("> td, > th",P),function(W,R){var S,T,U,V;if(f[Q]){while(f[Q][R]){R++}}U=h(W,"rowspan");V=h(W,"colspan");for(T=Q;T<Q+U;T++){if(!f[T]){f[T]=[]}for(S=R;S<R+V;S++){f[T][S]={part:N,real:T==Q&&S==R,elm:W,rowspan:U,colspan:V}}}})});M+=O.length})}function z(M,O){var N;N=f[O];if(N){return N[M]}}function h(N,M){return parseInt(N.getAttribute(M)||1)}function s(O,M,N){if(O){N=parseInt(N);if(N===1){O.removeAttribute(M,1)}else{O.setAttribute(M,N,1)}}}function j(M){return M&&(G.hasClass(M.elm,"mceSelected")||M==o)}function k(){var M=[];d(H.rows,function(N){d(N.cells,function(O){if(G.hasClass(O,"mceSelected")||O==o.elm){M.push(N);return false}})});return M}function r(){var M=G.createRng();M.setStartAfter(H);M.setEndAfter(H);K.setRng(M);G.remove(H)}function e(M){var N;c.walk(M,function(P){var O;if(P.nodeType==3){d(G.getParents(P.parentNode,null,M).reverse(),function(Q){Q=A(Q,false);if(!N){N=O=Q}else{if(O){O.appendChild(Q)}}O=Q});if(O){O.innerHTML=c.isIE?"&nbsp;":'<br data-mce-bogus="1" />'}return false}},"childNodes");M=A(M,false);s(M,"rowSpan",1);s(M,"colSpan",1);if(N){M.appendChild(N)}else{if(!c.isIE){M.innerHTML='<br data-mce-bogus="1" />'}}return M}function q(){var M=G.createRng();d(G.select("tr",H),function(N){if(N.cells.length==0){G.remove(N)}});if(G.select("tr",H).length==0){M.setStartAfter(H);M.setEndAfter(H);K.setRng(M);G.remove(H);return}d(G.select("thead,tbody,tfoot",H),function(N){if(N.rows.length==0){G.remove(N)}});t();row=f[Math.min(f.length-1,L.y)];if(row){K.select(row[Math.min(row.length-1,L.x)].elm,true);K.collapse(true)}}function u(S,Q,U,R){var P,N,M,O,T;P=f[Q][S].elm.parentNode;for(M=1;M<=U;M++){P=G.getNext(P,"tr");if(P){for(N=S;N>=0;N--){T=f[Q+M][N].elm;if(T.parentNode==P){for(O=1;O<=R;O++){G.insertAfter(e(T),T)}break}}if(N==-1){for(O=1;O<=R;O++){P.insertBefore(e(P.cells[0]),P.cells[0])}}}}}function C(){d(f,function(M,N){d(M,function(P,O){var S,R,T,Q;if(j(P)){P=P.elm;S=h(P,"colspan");R=h(P,"rowspan");if(S>1||R>1){s(P,"rowSpan",1);s(P,"colSpan",1);for(Q=0;Q<S-1;Q++){G.insertAfter(e(P),P)}u(O,N,R-1,S)}}})})}function p(V,S,Y){var P,O,X,W,U,R,T,M,V,N,Q;if(V){pos=F(V);P=pos.x;O=pos.y;X=P+(S-1);W=O+(Y-1)}else{P=L.x;O=L.y;X=D.x;W=D.y}T=z(P,O);M=z(X,W);if(T&&M&&T.part==M.part){C();t();T=z(P,O).elm;s(T,"colSpan",(X-P)+1);s(T,"rowSpan",(W-O)+1);for(R=O;R<=W;R++){for(U=P;U<=X;U++){if(!f[R]||!f[R][U]){continue}V=f[R][U].elm;if(V!=T){N=c.grep(V.childNodes);d(N,function(Z){T.appendChild(Z)});if(N.length){N=c.grep(T.childNodes);Q=0;d(N,function(Z){if(Z.nodeName=="BR"&&G.getAttrib(Z,"data-mce-bogus")&&Q++<N.length-1){T.removeChild(Z)}})}G.remove(V)}}}q()}}function l(Q){var M,S,P,R,T,U,N,V,O;d(f,function(W,X){d(W,function(Z,Y){if(j(Z)){Z=Z.elm;T=Z.parentNode;U=A(T,false);M=X;if(Q){return false}}});if(Q){return !M}});for(R=0;R<f[0].length;R++){if(!f[M][R]){continue}S=f[M][R].elm;if(S!=P){if(!Q){O=h(S,"rowspan");if(O>1){s(S,"rowSpan",O+1);continue}}else{if(M>0&&f[M-1][R]){V=f[M-1][R].elm;O=h(V,"rowSpan");if(O>1){s(V,"rowSpan",O+1);continue}}}N=e(S);s(N,"colSpan",S.colSpan);U.appendChild(N);P=S}}if(U.hasChildNodes()){if(!Q){G.insertAfter(U,T)}else{T.parentNode.insertBefore(U,T)}}}function g(N){var O,M;d(f,function(P,Q){d(P,function(S,R){if(j(S)){O=R;if(N){return false}}});if(N){return !O}});d(f,function(S,T){var P,Q,R;if(!S[O]){return}P=S[O].elm;if(P!=M){R=h(P,"colspan");Q=h(P,"rowspan");if(R==1){if(!N){G.insertAfter(e(P),P);u(O,T,Q-1,R)}else{P.parentNode.insertBefore(e(P),P);u(O,T,Q-1,R)}}else{s(P,"colSpan",P.colSpan+1)}M=P}})}function n(){var M=[];d(f,function(N,O){d(N,function(Q,P){if(j(Q)&&c.inArray(M,P)===-1){d(f,function(T){var R=T[P].elm,S;S=h(R,"colSpan");if(S>1){s(R,"colSpan",S-1)}else{G.remove(R)}});M.push(P)}})});q()}function m(){var N;function M(Q){var P,R,O;P=G.getNext(Q,"tr");d(Q.cells,function(S){var T=h(S,"rowSpan");if(T>1){s(S,"rowSpan",T-1);R=F(S);u(R.x,R.y,1,1)}});R=F(Q.cells[0]);d(f[R.y],function(S){var T;S=S.elm;if(S!=O){T=h(S,"rowSpan");if(T<=1){G.remove(S)}else{s(S,"rowSpan",T-1)}O=S}})}N=k();d(N.reverse(),function(O){M(O)});q()}function E(){var M=k();G.remove(M);q();return M}function J(){var M=k();d(M,function(O,N){M[N]=A(O,true)});return M}function B(O,N){var P=k(),M=P[N?0:P.length-1],Q=M.cells.length;d(f,function(S){var R;Q=0;d(S,function(U,T){if(U.real){Q+=U.colspan}if(U.elm.parentNode==M){R=1}});if(R){return false}});if(!N){O.reverse()}d(O,function(T){var S=T.cells.length,R;for(i=0;i<S;i++){R=T.cells[i];s(R,"colSpan",1);s(R,"rowSpan",1)}for(i=S;i<Q;i++){T.appendChild(e(T.cells[S-1]))}for(i=Q;i<S;i++){G.remove(T.cells[i])}if(N){M.parentNode.insertBefore(T,M)}else{G.insertAfter(T,M)}})}function F(M){var N;d(f,function(O,P){d(O,function(R,Q){if(R.elm==M){N={x:Q,y:P};return false}});return !N});return N}function w(M){L=F(M)}function I(){var O,N,M;N=M=0;d(f,function(P,Q){d(P,function(S,R){var U,T;if(j(S)){S=f[Q][R];if(R>N){N=R}if(Q>M){M=Q}if(S.real){U=S.colspan-1;T=S.rowspan-1;if(U){if(R+U>N){N=R+U}}if(T){if(Q+T>M){M=Q+T}}}}})});return{x:N,y:M}}function v(S){var P,O,U,T,N,M,Q,R;D=F(S);if(L&&D){P=Math.min(L.x,D.x);O=Math.min(L.y,D.y);U=Math.max(L.x,D.x);T=Math.max(L.y,D.y);N=U;M=T;for(y=O;y<=M;y++){S=f[y][P];if(!S.real){if(P-(S.colspan-1)<P){P-=S.colspan-1}}}for(x=P;x<=N;x++){S=f[O][x];if(!S.real){if(O-(S.rowspan-1)<O){O-=S.rowspan-1}}}for(y=O;y<=T;y++){for(x=P;x<=U;x++){S=f[y][x];if(S.real){Q=S.colspan-1;R=S.rowspan-1;if(Q){if(x+Q>N){N=x+Q}}if(R){if(y+R>M){M=y+R}}}}}G.removeClass(G.select("td.mceSelected,th.mceSelected"),"mceSelected");for(y=O;y<=M;y++){for(x=P;x<=N;x++){if(f[y][x]){G.addClass(f[y][x].elm,"mceSelected")}}}}}c.extend(this,{deleteTable:r,split:C,merge:p,insertRow:l,insertCol:g,deleteCols:n,deleteRows:m,cutRows:E,copyRows:J,pasteRows:B,getPos:F,setStartCell:w,setEndCell:v})}c.create("tinymce.plugins.TablePlugin",{init:function(f,g){var e,l,h=true;function k(o){var n=f.selection,m=f.dom.getParent(o||n.getNode(),"table");if(m){return new a(m,f.dom,n)}}function j(){f.getBody().style.webkitUserSelect="";if(h){f.dom.removeClass(f.dom.select("td.mceSelected,th.mceSelected"),"mceSelected");h=false}}d([["table","table.desc","mceInsertTable",true],["delete_table","table.del","mceTableDelete"],["delete_col","table.delete_col_desc","mceTableDeleteCol"],["delete_row","table.delete_row_desc","mceTableDeleteRow"],["col_after","table.col_after_desc","mceTableInsertColAfter"],["col_before","table.col_before_desc","mceTableInsertColBefore"],["row_after","table.row_after_desc","mceTableInsertRowAfter"],["row_before","table.row_before_desc","mceTableInsertRowBefore"],["row_props","table.row_desc","mceTableRowProps",true],["cell_props","table.cell_desc","mceTableCellProps",true],["split_cells","table.split_cells_desc","mceTableSplitCells",true],["merge_cells","table.merge_cells_desc","mceTableMergeCells",true]],function(m){f.addButton(m[0],{title:m[1],cmd:m[2],ui:m[3]})});if(!c.isIE){f.onClick.add(function(m,n){n=n.target;if(n.nodeName==="TABLE"){m.selection.select(n);m.nodeChanged()}})}f.onPreProcess.add(function(n,o){var m,p,q,s=n.dom,r;m=s.select("table",o.node);p=m.length;while(p--){q=m[p];s.setAttrib(q,"data-mce-style","");if((r=s.getAttrib(q,"width"))){s.setStyle(q,"width",r);s.setAttrib(q,"width","")}if((r=s.getAttrib(q,"height"))){s.setStyle(q,"height",r);s.setAttrib(q,"height","")}}});f.onNodeChange.add(function(o,m,r){var q;r=o.selection.getStart();q=o.dom.getParent(r,"td,th,caption");m.setActive("table",r.nodeName==="TABLE"||!!q);if(q&&q.nodeName==="CAPTION"){q=0}m.setDisabled("delete_table",!q);m.setDisabled("delete_col",!q);m.setDisabled("delete_table",!q);m.setDisabled("delete_row",!q);m.setDisabled("col_after",!q);m.setDisabled("col_before",!q);m.setDisabled("row_after",!q);m.setDisabled("row_before",!q);m.setDisabled("row_props",!q);m.setDisabled("cell_props",!q);m.setDisabled("split_cells",!q);m.setDisabled("merge_cells",!q)});f.onInit.add(function(n){var m,q,r=n.dom,o;e=n.windowManager;n.onMouseDown.add(function(s,t){if(t.button!=2){j();q=r.getParent(t.target,"td,th");m=r.getParent(q,"table")}});r.bind(n.getDoc(),"mouseover",function(w){var u,t,v=w.target;if(q&&(o||v!=q)&&(v.nodeName=="TD"||v.nodeName=="TH")){t=r.getParent(v,"table");if(t==m){if(!o){o=k(t);o.setStartCell(q);n.getBody().style.webkitUserSelect="none"}o.setEndCell(v);h=true}u=n.selection.getSel();try{if(u.removeAllRanges){u.removeAllRanges()}else{u.empty()}}catch(s){}w.preventDefault()}});n.onMouseUp.add(function(B,C){var t,v=B.selection,D,E=v.getSel(),s,w,u,A;if(q){if(o){B.getBody().style.webkitUserSelect=""}function z(F,H){var G=new c.dom.TreeWalker(F,F);do{if(F.nodeType==3&&c.trim(F.nodeValue).length!=0){if(H){t.setStart(F,0)}else{t.setEnd(F,F.nodeValue.length)}return}if(F.nodeName=="BR"){if(H){t.setStartBefore(F)}else{t.setEndBefore(F)}return}}while(F=(H?G.next():G.prev()))}D=r.select("td.mceSelected,th.mceSelected");if(D.length>0){t=r.createRng();w=D[0];A=D[D.length-1];t.setStart(w);t.setEnd(w);z(w,1);s=new c.dom.TreeWalker(w,r.getParent(D[0],"table"));do{if(w.nodeName=="TD"||w.nodeName=="TH"){if(!r.hasClass(w,"mceSelected")){break}u=w}}while(w=s.next());z(u);v.setRng(t)}B.nodeChanged();q=o=m=null}});n.onKeyUp.add(function(s,t){j()});if(n&&n.plugins.contextmenu){n.plugins.contextmenu.onContextMenu.add(function(u,s,w){var z,v=n.selection,t=v.getNode()||n.getBody();if(n.dom.getParent(w,"td")||n.dom.getParent(w,"th")||n.dom.select("td.mceSelected,th.mceSelected").length){s.removeAll();if(t.nodeName=="A"&&!n.dom.getAttrib(t,"name")){s.add({title:"advanced.link_desc",icon:"link",cmd:n.plugins.advlink?"mceAdvLink":"mceLink",ui:true});s.add({title:"advanced.unlink_desc",icon:"unlink",cmd:"UnLink"});s.addSeparator()}if(t.nodeName=="IMG"&&t.className.indexOf("mceItem")==-1){s.add({title:"advanced.image_desc",icon:"image",cmd:n.plugins.advimage?"mceAdvImage":"mceImage",ui:true});s.addSeparator()}s.add({title:"table.desc",icon:"table",cmd:"mceInsertTable",value:{action:"insert"}});s.add({title:"table.props_desc",icon:"table_props",cmd:"mceInsertTable"});s.add({title:"table.del",icon:"delete_table",cmd:"mceTableDelete"});s.addSeparator();z=s.addMenu({title:"table.cell"});z.add({title:"table.cell_desc",icon:"cell_props",cmd:"mceTableCellProps"});z.add({title:"table.split_cells_desc",icon:"split_cells",cmd:"mceTableSplitCells"});z.add({title:"table.merge_cells_desc",icon:"merge_cells",cmd:"mceTableMergeCells"});z=s.addMenu({title:"table.row"});z.add({title:"table.row_desc",icon:"row_props",cmd:"mceTableRowProps"});z.add({title:"table.row_before_desc",icon:"row_before",cmd:"mceTableInsertRowBefore"});z.add({title:"table.row_after_desc",icon:"row_after",cmd:"mceTableInsertRowAfter"});z.add({title:"table.delete_row_desc",icon:"delete_row",cmd:"mceTableDeleteRow"});z.addSeparator();z.add({title:"table.cut_row_desc",icon:"cut",cmd:"mceTableCutRow"});z.add({title:"table.copy_row_desc",icon:"copy",cmd:"mceTableCopyRow"});z.add({title:"table.paste_row_before_desc",icon:"paste",cmd:"mceTablePasteRowBefore"}).setDisabled(!l);z.add({title:"table.paste_row_after_desc",icon:"paste",cmd:"mceTablePasteRowAfter"}).setDisabled(!l);z=s.addMenu({title:"table.col"});z.add({title:"table.col_before_desc",icon:"col_before",cmd:"mceTableInsertColBefore"});z.add({title:"table.col_after_desc",icon:"col_after",cmd:"mceTableInsertColAfter"});z.add({title:"table.delete_col_desc",icon:"delete_col",cmd:"mceTableDeleteCol"})}else{s.add({title:"table.desc",icon:"table",cmd:"mceInsertTable"})}})}if(!c.isIE){function p(){var s;for(s=n.getBody().lastChild;s&&s.nodeType==3&&!s.nodeValue.length;s=s.previousSibling){}if(s&&s.nodeName=="TABLE"){n.dom.add(n.getBody(),"p",null,'<br mce_bogus="1" />')}}if(c.isGecko){n.onKeyDown.add(function(t,v){var s,u,w=t.dom;if(v.keyCode==37||v.keyCode==38){s=t.selection.getRng();u=w.getParent(s.startContainer,"table");if(u&&t.getBody().firstChild==u){if(b(s,u)){s=w.createRng();s.setStartBefore(u);s.setEndBefore(u);t.selection.setRng(s);v.preventDefault()}}}})}n.onKeyUp.add(p);n.onSetContent.add(p);n.onVisualAid.add(p);n.onPreProcess.add(function(s,u){var t=u.node.lastChild;if(t&&t.childNodes.length==1&&t.firstChild.nodeName=="BR"){s.dom.remove(t)}});p()}});d({mceTableSplitCells:function(m){m.split()},mceTableMergeCells:function(n){var o,p,m;m=f.dom.getParent(f.selection.getNode(),"th,td");if(m){o=m.rowSpan;p=m.colSpan}if(!f.dom.select("td.mceSelected,th.mceSelected").length){e.open({url:g+"/merge_cells.htm",width:240+parseInt(f.getLang("table.merge_cells_delta_width",0)),height:110+parseInt(f.getLang("table.merge_cells_delta_height",0)),inline:1},{rows:o,cols:p,onaction:function(q){n.merge(m,q.cols,q.rows)},plugin_url:g})}else{n.merge()}},mceTableInsertRowBefore:function(m){m.insertRow(true)},mceTableInsertRowAfter:function(m){m.insertRow()},mceTableInsertColBefore:function(m){m.insertCol(true)},mceTableInsertColAfter:function(m){m.insertCol()},mceTableDeleteCol:function(m){m.deleteCols()},mceTableDeleteRow:function(m){m.deleteRows()},mceTableCutRow:function(m){l=m.cutRows()},mceTableCopyRow:function(m){l=m.copyRows()},mceTablePasteRowBefore:function(m){m.pasteRows(l,true)},mceTablePasteRowAfter:function(m){m.pasteRows(l)},mceTableDelete:function(m){m.deleteTable()}},function(n,m){f.addCommand(m,function(){var o=k();if(o){n(o);f.execCommand("mceRepaint");j()}})});d({mceInsertTable:function(m){e.open({url:g+"/table.htm",width:400+parseInt(f.getLang("table.table_delta_width",0)),height:320+parseInt(f.getLang("table.table_delta_height",0)),inline:1},{plugin_url:g,action:m?m.action:0})},mceTableRowProps:function(){e.open({url:g+"/row.htm",width:400+parseInt(f.getLang("table.rowprops_delta_width",0)),height:295+parseInt(f.getLang("table.rowprops_delta_height",0)),inline:1},{plugin_url:g})},mceTableCellProps:function(){e.open({url:g+"/cell.htm",width:400+parseInt(f.getLang("table.cellprops_delta_width",0)),height:295+parseInt(f.getLang("table.cellprops_delta_height",0)),inline:1},{plugin_url:g})}},function(n,m){f.addCommand(m,function(o,p){n(p)})})}});c.PluginManager.add("table",c.plugins.TablePlugin)})(tinymce);
\ No newline at end of file
diff --git a/plugins/TinyMCE/js/plugins/table/editor_plugin_src.js b/plugins/TinyMCE/js/plugins/table/editor_plugin_src.js
index c2f307f045..5b9b53d8e6 100644
--- a/plugins/TinyMCE/js/plugins/table/editor_plugin_src.js
+++ b/plugins/TinyMCE/js/plugins/table/editor_plugin_src.js
@@ -11,6 +11,20 @@
 (function(tinymce) {
 	var each = tinymce.each;
 
+	// Checks if the selection/caret is at the start of the specified block element
+	function isAtStart(rng, par) {
+		var doc = par.ownerDocument, rng2 = doc.createRange(), elm;
+
+		rng2.setStartBefore(par);
+		rng2.setEnd(rng.endContainer, rng.endOffset);
+
+		elm = doc.createElement('body');
+		elm.appendChild(rng2.cloneContents());
+
+		// Check for text characters of other elements that should be treated as content
+		return elm.innerHTML.replace(/<(br|img|object|embed|input|textarea)[^>]*>/gi, '-').replace(/<[^>]+>/g, '').length == 0;
+	};
+
 	/**
 	 * Table Grid class.
 	 */
@@ -38,12 +52,12 @@
 			grid = [];
 
 			each(['thead', 'tbody', 'tfoot'], function(part) {
-				var rows = dom.select(part + ' tr', table);
+				var rows = dom.select('> ' + part + ' tr', table);
 
 				each(rows, function(tr, y) {
 					y += startY;
 
-					each(dom.select('td,th', tr), function(td, x) {
+					each(dom.select('> td, > th', tr), function(td, x) {
 						var x2, y2, rowspan, colspan;
 
 						// Skip over existing cells produced by rowspan
@@ -90,8 +104,19 @@
 			return parseInt(td.getAttribute(name) || 1);
 		};
 
+		function setSpanVal(td, name, val) {
+			if (td) {
+				val = parseInt(val);
+
+				if (val === 1)
+					td.removeAttribute(name, 1);
+				else
+					td.setAttribute(name, val, 1);
+			}
+		}
+
 		function isCellSelected(cell) {
-			return dom.hasClass(cell.elm, 'mceSelected') || cell == selectedCell;
+			return cell && (dom.hasClass(cell.elm, 'mceSelected') || cell == selectedCell);
 		};
 
 		function getSelectedRows() {
@@ -141,20 +166,21 @@
 
 					// Add something to the inner node
 					if (curNode)
-						curNode.innerHTML = tinymce.isIE ? '&nbsp;' : '<br _mce_bogus="1" />';
+						curNode.innerHTML = tinymce.isIE ? '&nbsp;' : '<br data-mce-bogus="1" />';
 
 					return false;
 				}
 			}, 'childNodes');
 
 			cell = cloneNode(cell, false);
-			cell.rowSpan = cell.colSpan = 1;
+			setSpanVal(cell, 'rowSpan', 1);
+			setSpanVal(cell, 'colSpan', 1);
 
 			if (formatNode) {
 				cell.appendChild(formatNode);
 			} else {
 				if (!tinymce.isIE)
-					cell.innerHTML = '<br _mce_bogus="1" />';
+					cell.innerHTML = '<br data-mce-bogus="1" />';
 			}
 
 			return cell;
@@ -236,7 +262,8 @@
 						rowSpan = getSpanVal(cell, 'rowspan');
 
 						if (colSpan > 1 || rowSpan > 1) {
-							cell.colSpan = cell.rowSpan = 1;
+							setSpanVal(cell, 'rowSpan', 1);
+							setSpanVal(cell, 'colSpan', 1);
 
 							// Insert cells right
 							for (i = 0; i < colSpan - 1; i++)
@@ -250,7 +277,7 @@
 		};
 
 		function merge(cell, cols, rows) {
-			var startX, startY, endX, endY, x, y, startCell, endCell, cell, children;
+			var startX, startY, endX, endY, x, y, startCell, endCell, cell, children, count;
 
 			// Use specified cell and cols/rows
 			if (cell) {
@@ -279,23 +306,34 @@
 
 				// Set row/col span to start cell
 				startCell = getCell(startX, startY).elm;
-				startCell.colSpan = (endX - startX) + 1;
-				startCell.rowSpan = (endY - startY) + 1;
+				setSpanVal(startCell, 'colSpan', (endX - startX) + 1);
+				setSpanVal(startCell, 'rowSpan', (endY - startY) + 1);
 
 				// Remove other cells and add it's contents to the start cell
 				for (y = startY; y <= endY; y++) {
 					for (x = startX; x <= endX; x++) {
+						if (!grid[y] || !grid[y][x])
+							continue;
+
 						cell = grid[y][x].elm;
 
 						if (cell != startCell) {
 							// Move children to startCell
 							children = tinymce.grep(cell.childNodes);
-							each(children, function(node, i) {
-								// Jump over last BR element
-								if (node.nodeName != 'BR' || i != children.length - 1)
-									startCell.appendChild(node);
+							each(children, function(node) {
+								startCell.appendChild(node);
 							});
 
+							// Remove bogus nodes if there is children in the target cell
+							if (children.length) {
+								children = tinymce.grep(startCell.childNodes);
+								count = 0;
+								each(children, function(node) {
+									if (node.nodeName == 'BR' && dom.getAttrib(node, 'data-mce-bogus') && count++ < children.length - 1)
+										startCell.removeChild(node);
+								});
+							}
+							
 							// Remove cell
 							dom.remove(cell);
 						}
@@ -308,7 +346,7 @@
 		};
 
 		function insertRow(before) {
-			var posY, cell, lastCell, x, rowElm, newRow, newCell, otherCell;
+			var posY, cell, lastCell, x, rowElm, newRow, newCell, otherCell, rowSpan;
 
 			// Find first/last row
 			each(grid, function(row, y) {
@@ -329,30 +367,35 @@
 			});
 
 			for (x = 0; x < grid[0].length; x++) {
+				// Cell not found could be because of an invalid table structure
+				if (!grid[posY][x])
+					continue;
+
 				cell = grid[posY][x].elm;
 
 				if (cell != lastCell) {
 					if (!before) {
 						rowSpan = getSpanVal(cell, 'rowspan');
 						if (rowSpan > 1) {
-							cell.rowSpan = rowSpan + 1;
+							setSpanVal(cell, 'rowSpan', rowSpan + 1);
 							continue;
 						}
 					} else {
 						// Check if cell above can be expanded
 						if (posY > 0 && grid[posY - 1][x]) {
 							otherCell = grid[posY - 1][x].elm;
-							rowSpan = getSpanVal(otherCell, 'rowspan');
+							rowSpan = getSpanVal(otherCell, 'rowSpan');
 							if (rowSpan > 1) {
-								otherCell.rowSpan = rowSpan + 1;
+								setSpanVal(otherCell, 'rowSpan', rowSpan + 1);
 								continue;
 							}
 						}
 					}
 
 					// Insert new cell into new row
-					newCell = cloneCell(cell)
-					newCell.colSpan = cell.colSpan;
+					newCell = cloneCell(cell);
+					setSpanVal(newCell, 'colSpan', cell.colSpan);
+
 					newRow.appendChild(newCell);
 
 					lastCell = cell;
@@ -386,8 +429,12 @@
 			});
 
 			each(grid, function(row, y) {
-				var cell = row[posX].elm, rowSpan, colSpan;
+				var cell, rowSpan, colSpan;
 
+				if (!row[posX])
+					return;
+
+				cell = row[posX].elm;
 				if (cell != lastCell) {
 					colSpan = getSpanVal(cell, 'colspan');
 					rowSpan = getSpanVal(cell, 'rowspan');
@@ -401,7 +448,7 @@
 							fillLeftDown(posX, y, rowSpan - 1, colSpan);
 						}
 					} else
-						cell.colSpan++;
+						setSpanVal(cell, 'colSpan', cell.colSpan + 1);
 
 					lastCell = cell;
 				}
@@ -418,10 +465,10 @@
 						each(grid, function(row) {
 							var cell = row[x].elm, colSpan;
 
-							colSpan = getSpanVal(cell, 'colspan');
+							colSpan = getSpanVal(cell, 'colSpan');
 
 							if (colSpan > 1)
-								cell.colSpan = colSpan - 1;
+								setSpanVal(cell, 'colSpan', colSpan - 1);
 							else
 								dom.remove(cell);
 						});
@@ -444,10 +491,10 @@
 
 				// Move down row spanned cells
 				each(tr.cells, function(cell) {
-					var rowSpan = getSpanVal(cell, 'rowspan');
+					var rowSpan = getSpanVal(cell, 'rowSpan');
 
 					if (rowSpan > 1) {
-						cell.rowSpan = rowSpan - 1;
+						setSpanVal(cell, 'rowSpan', rowSpan - 1);
 						pos = getPos(cell);
 						fillLeftDown(pos.x, pos.y, 1, 1);
 					}
@@ -461,12 +508,12 @@
 					cell = cell.elm;
 
 					if (cell != lastCell) {
-						rowSpan = getSpanVal(cell, 'rowspan');
+						rowSpan = getSpanVal(cell, 'rowSpan');
 
 						if (rowSpan <= 1)
 							dom.remove(cell);
 						else
-							cell.rowSpan = rowSpan - 1;
+							setSpanVal(cell, 'rowSpan', rowSpan - 1);
 
 						lastCell = cell;
 					}
@@ -534,7 +581,8 @@
 				// Remove col/rowspans
 				for (i = 0; i < cellCount; i++) {
 					cell = row.cells[i];
-					cell.colSpan = cell.rowSpan = 1;
+					setSpanVal(cell, 'colSpan', 1);
+					setSpanVal(cell, 'rowSpan', 1);
 				}
 
 				// Needs more cells
@@ -676,8 +724,10 @@
 
 				// Add new selection
 				for (y = startY; y <= maxY; y++) {
-					for (x = startX; x <= maxX; x++)
-						dom.addClass(grid[y][x].elm, 'mceSelected');
+					for (x = startX; x <= maxX; x++) {
+						if (grid[y][x])
+							dom.addClass(grid[y][x].elm, 'mceSelected');
+					}
 				}
 			}
 		};
@@ -702,7 +752,7 @@
 
 	tinymce.create('tinymce.plugins.TablePlugin', {
 		init : function(ed, url) {
-			var winMan, clipboardRows;
+			var winMan, clipboardRows, hasCellSelection = true; // Might be selected cells on reload
 
 			function createTableGrid(node) {
 				var selection = ed.selection, tblElm = ed.dom.getParent(node || selection.getNode(), 'table');
@@ -714,7 +764,11 @@
 			function cleanup() {
 				// Restore selection possibilities
 				ed.getBody().style.webkitUserSelect = '';
-				ed.dom.removeClass(ed.dom.select('td.mceSelected,th.mceSelected'), 'mceSelected');
+
+				if (hasCellSelection) {
+					ed.dom.removeClass(ed.dom.select('td.mceSelected,th.mceSelected'), 'mceSelected');
+					hasCellSelection = false;
+				}
 			};
 
 			// Register buttons
@@ -740,11 +794,34 @@
 				ed.onClick.add(function(ed, e) {
 					e = e.target;
 
-					if (e.nodeName === 'TABLE')
+					if (e.nodeName === 'TABLE') {
 						ed.selection.select(e);
+						ed.nodeChanged();
+					}
 				});
 			}
 
+			ed.onPreProcess.add(function(ed, args) {
+				var nodes, i, node, dom = ed.dom, value;
+
+				nodes = dom.select('table', args.node);
+				i = nodes.length;
+				while (i--) {
+					node = nodes[i];
+					dom.setAttrib(node, 'data-mce-style', '');
+
+					if ((value = dom.getAttrib(node, 'width'))) {
+						dom.setStyle(node, 'width', value);
+						dom.setAttrib(node, 'width', '');
+					}
+
+					if ((value = dom.getAttrib(node, 'height'))) {
+						dom.setStyle(node, 'height', value);
+						dom.setAttrib(node, 'height', '');
+					}
+				}
+			});
+
 			// Handle node change updates
 			ed.onNodeChange.add(function(ed, cm, n) {
 				var p;
@@ -800,15 +877,20 @@
 							}
 
 							tableGrid.setEndCell(target);
+							hasCellSelection = true;
 						}
 
 						// Remove current selection
 						sel = ed.selection.getSel();
 
-						if (sel.removeAllRanges)
-							sel.removeAllRanges();
-						else
-							sel.empty();
+						try {
+							if (sel.removeAllRanges)
+								sel.removeAllRanges();
+							else
+								sel.empty();
+						} catch (ex) {
+							// IE9 might throw errors here
+						}
 
 						e.preventDefault();
 					}
@@ -854,6 +936,8 @@
 							rng = dom.createRng();
 							node = selectedCells[0];
 							endNode = selectedCells[selectedCells.length - 1];
+							rng.setStart(node);
+							rng.setEnd(node);
 
 							setPoint(node, 1);
 							walker = new tinymce.dom.TreeWalker(node, dom.getParent(selectedCells[0], 'table'));
diff --git a/plugins/TinyMCE/js/plugins/table/js/cell.js b/plugins/TinyMCE/js/plugins/table/js/cell.js
index b5fc1fda3d..d6f3290599 100644
--- a/plugins/TinyMCE/js/plugins/table/js/cell.js
+++ b/plugins/TinyMCE/js/plugins/table/js/cell.js
@@ -63,6 +63,11 @@ function init() {
 function updateAction() {
 	var el, inst = ed, tdElm, trElm, tableElm, formObj = document.forms[0];
 
+	if (!AutoValidator.validate(formObj)) {
+		tinyMCEPopup.alert(AutoValidator.getErrorMessages(formObj).join('. ') + '.');
+		return false;
+	}
+
 	tinyMCEPopup.restoreSelection();
 	el = ed.selection.getStart();
 	tdElm = ed.dom.getParent(el, "td,th");
@@ -83,8 +88,6 @@ function updateAction() {
 		return;
 	}
 
-	ed.execCommand('mceBeginUndoLevel');
-
 	switch (getSelectValue(formObj, 'action')) {
 		case "cell":
 			var celltype = getSelectValue(formObj, 'celltype');
@@ -125,6 +128,36 @@ function updateAction() {
 
 			break;
 
+		case "col":
+			var curr, col = 0, cell = trElm.firstChild, rows = tableElm.getElementsByTagName("tr");
+
+			if (cell.nodeName != "TD" && cell.nodeName != "TH")
+				cell = nextCell(cell);
+
+			do {
+				if (cell == tdElm)
+					break;
+				col += cell.getAttribute("colspan");
+			} while ((cell = nextCell(cell)) != null);
+
+			for (var i=0; i<rows.length; i++) {
+				cell = rows[i].firstChild;
+
+				if (cell.nodeName != "TD" && cell.nodeName != "TH")
+					cell = nextCell(cell);
+
+				curr = 0;
+				do {
+					if (curr == col) {
+						cell = updateCell(cell, true);
+						break;
+					}
+					curr += cell.getAttribute("colspan");
+				} while ((cell = nextCell(cell)) != null);
+			}
+
+			break;
+
 		case "all":
 			var rows = tableElm.getElementsByTagName("tr");
 
@@ -166,15 +199,15 @@ function updateCell(td, skip_id) {
 	var dom = ed.dom;
 
 	if (!skip_id)
-		td.setAttribute('id', formObj.id.value);
+		dom.setAttrib(td, 'id', formObj.id.value);
 
-	td.setAttribute('align', formObj.align.value);
-	td.setAttribute('vAlign', formObj.valign.value);
-	td.setAttribute('lang', formObj.lang.value);
-	td.setAttribute('dir', getSelectValue(formObj, 'dir'));
-	td.setAttribute('style', ed.dom.serializeStyle(ed.dom.parseStyle(formObj.style.value)));
-	td.setAttribute('scope', formObj.scope.value);
-	ed.dom.setAttrib(td, 'class', getSelectValue(formObj, 'class'));
+	dom.setAttrib(td, 'align', formObj.align.value);
+	dom.setAttrib(td, 'vAlign', formObj.valign.value);
+	dom.setAttrib(td, 'lang', formObj.lang.value);
+	dom.setAttrib(td, 'dir', getSelectValue(formObj, 'dir'));
+	dom.setAttrib(td, 'style', ed.dom.serializeStyle(ed.dom.parseStyle(formObj.style.value)));
+	dom.setAttrib(td, 'scope', formObj.scope.value);
+	dom.setAttrib(td, 'class', getSelectValue(formObj, 'class'));
 
 	// Clear deprecated attributes
 	ed.dom.setAttrib(td, 'width', '');
diff --git a/plugins/TinyMCE/js/plugins/table/js/row.js b/plugins/TinyMCE/js/plugins/table/js/row.js
index 70d95b6729..a13d69592d 100644
--- a/plugins/TinyMCE/js/plugins/table/js/row.js
+++ b/plugins/TinyMCE/js/plugins/table/js/row.js
@@ -56,6 +56,11 @@ function updateAction() {
 	var inst = tinyMCEPopup.editor, dom = inst.dom, trElm, tableElm, formObj = document.forms[0];
 	var action = getSelectValue(formObj, 'action');
 
+	if (!AutoValidator.validate(formObj)) {
+		tinyMCEPopup.alert(AutoValidator.getErrorMessages(formObj).join('. ') + '.');
+		return false;
+	}
+
 	tinyMCEPopup.restoreSelection();
 	trElm = dom.getParent(inst.selection.getStart(), "tr");
 	tableElm = dom.getParent(inst.selection.getStart(), "table");
@@ -80,8 +85,6 @@ function updateAction() {
 		return;
 	}
 
-	inst.execCommand('mceBeginUndoLevel');
-
 	switch (action) {
 		case "row":
 			updateRow(trElm);
@@ -123,19 +126,19 @@ function updateRow(tr_elm, skip_id, skip_parent) {
 
 	// Update row element
 	if (!skip_id)
-		tr_elm.setAttribute('id', formObj.id.value);
+		dom.setAttrib(tr_elm, 'id', formObj.id.value);
 
-	tr_elm.setAttribute('align', getSelectValue(formObj, 'align'));
-	tr_elm.setAttribute('vAlign', getSelectValue(formObj, 'valign'));
-	tr_elm.setAttribute('lang', formObj.lang.value);
-	tr_elm.setAttribute('dir', getSelectValue(formObj, 'dir'));
-	tr_elm.setAttribute('style', dom.serializeStyle(dom.parseStyle(formObj.style.value)));
+	dom.setAttrib(tr_elm, 'align', getSelectValue(formObj, 'align'));
+	dom.setAttrib(tr_elm, 'vAlign', getSelectValue(formObj, 'valign'));
+	dom.setAttrib(tr_elm, 'lang', formObj.lang.value);
+	dom.setAttrib(tr_elm, 'dir', getSelectValue(formObj, 'dir'));
+	dom.setAttrib(tr_elm, 'style', dom.serializeStyle(dom.parseStyle(formObj.style.value)));
 	dom.setAttrib(tr_elm, 'class', getSelectValue(formObj, 'class'));
 
 	// Clear deprecated attributes
-	tr_elm.setAttribute('background', '');
-	tr_elm.setAttribute('bgColor', '');
-	tr_elm.setAttribute('height', '');
+	dom.setAttrib(tr_elm, 'background', '');
+	dom.setAttrib(tr_elm, 'bgColor', '');
+	dom.setAttrib(tr_elm, 'height', '');
 
 	// Set styles
 	tr_elm.style.height = getCSSSize(formObj.height.value);
@@ -163,13 +166,10 @@ function updateRow(tr_elm, skip_id, skip_parent) {
 		if (newParent == null) {
 			newParent = doc.createElement(dest);
 
-			if (dest == "thead") {
-				if (theTable.firstChild.nodeName == 'CAPTION')
-					inst.dom.insertAfter(newParent, theTable.firstChild);
-				else
-					theTable.insertBefore(newParent, theTable.firstChild);
-			} else
-				theTable.appendChild(newParent);
+			if (theTable.firstChild.nodeName == 'CAPTION')
+				inst.dom.insertAfter(newParent, theTable.firstChild);
+			else
+				theTable.insertBefore(newParent, theTable.firstChild);
 		}
 
 		// append the row to the new parent
diff --git a/plugins/TinyMCE/js/plugins/table/js/table.js b/plugins/TinyMCE/js/plugins/table/js/table.js
index d1b42c2af0..520d857fce 100644
--- a/plugins/TinyMCE/js/plugins/table/js/table.js
+++ b/plugins/TinyMCE/js/plugins/table/js/table.js
@@ -12,7 +12,7 @@ function insertTable() {
 	tinyMCEPopup.restoreSelection();
 
 	if (!AutoValidator.validate(formObj)) {
-		tinyMCEPopup.alert(inst.getLang('invalid_data'));
+		tinyMCEPopup.alert(AutoValidator.getErrorMessages(formObj).join('. ') + '.');
 		return false;
 	}
 
@@ -21,7 +21,7 @@ function insertTable() {
 	// Get form data
 	cols = formObj.elements['cols'].value;
 	rows = formObj.elements['rows'].value;
-	border = formObj.elements['border'].value != "" ? formObj.elements['border'].value  : 0;
+	border = formObj.elements['border'].value != "" ? formObj.elements['border'].value : 0;
 	cellpadding = formObj.elements['cellpadding'].value != "" ? formObj.elements['cellpadding'].value : "";
 	cellspacing = formObj.elements['cellspacing'].value != "" ? formObj.elements['cellspacing'].value : "";
 	align = getSelectValue(formObj, "align");
@@ -58,8 +58,6 @@ function insertTable() {
 
 	// Update table
 	if (action == "update") {
-		inst.execCommand('mceBeginUndoLevel');
-
 		dom.setAttrib(elm, 'cellPadding', cellpadding, true);
 		dom.setAttrib(elm, 'cellSpacing', cellspacing, true);
 		dom.setAttrib(elm, 'border', border);
@@ -82,7 +80,7 @@ function insertTable() {
 			capEl = elm.ownerDocument.createElement('caption');
 
 			if (!tinymce.isIE)
-				capEl.innerHTML = '<br _mce_bogus="1"/>';
+				capEl.innerHTML = '<br data-mce-bogus="1"/>';
 
 			elm.insertBefore(capEl, elm.firstChild);
 		}
@@ -151,7 +149,7 @@ function insertTable() {
 	html += makeAttrib('border', border);
 	html += makeAttrib('cellpadding', cellpadding);
 	html += makeAttrib('cellspacing', cellspacing);
-	html += makeAttrib('_mce_new', '1');
+	html += makeAttrib('data-mce-new', '1');
 
 	if (width && inst.settings.inline_styles) {
 		if (style)
@@ -187,7 +185,7 @@ function insertTable() {
 
 	if (caption) {
 		if (!tinymce.isIE)
-			html += '<caption><br _mce_bogus="1"/></caption>';
+			html += '<caption><br data-mce-bogus="1"/></caption>';
 		else
 			html += '<caption></caption>';
 	}
@@ -197,7 +195,7 @@ function insertTable() {
 
 		for (var x=0; x<cols; x++) {
 			if (!tinymce.isIE)
-				html += '<td><br _mce_bogus="1"/></td>';
+				html += '<td><br data-mce-bogus="1"/></td>';
 			else
 				html += '<td></td>';
 		}
@@ -207,8 +205,6 @@ function insertTable() {
 
 	html += "</table>";
 
-	inst.execCommand('mceBeginUndoLevel');
-
 	// Move table
 	if (inst.settings.fix_table_elements) {
 		var patt = '';
@@ -231,13 +227,18 @@ function insertTable() {
 	} else
 		inst.execCommand('mceInsertContent', false, html);
 
-	tinymce.each(dom.select('table[_mce_new]'), function(node) {
+	tinymce.each(dom.select('table[data-mce-new]'), function(node) {
 		var td = dom.select('td', node);
 
-		inst.selection.select(td[0], true);
-		inst.selection.collapse();
+		try {
+			// IE9 might fail to do this selection
+			inst.selection.select(td[0], true);
+			inst.selection.collapse();
+		} catch (ex) {
+			// Ignore
+		}
 
-		dom.setAttrib(node, '_mce_new', '');
+		dom.setAttrib(node, 'data-mce-new', '');
 	});
 
 	inst.addVisual();
@@ -279,7 +280,7 @@ function init() {
 
 	var cols = 2, rows = 2, border = tinyMCEPopup.getParam('table_default_border', '0'), cellpadding = tinyMCEPopup.getParam('table_default_cellpadding', ''), cellspacing = tinyMCEPopup.getParam('table_default_cellspacing', '');
 	var align = "", width = "", height = "", bordercolor = "", bgcolor = "", className = "";
-	var id = "", summary = "", style = "", dir = "", lang = "", background = "", bgcolor = "", bordercolor = "", rules, frame;
+	var id = "", summary = "", style = "", dir = "", lang = "", background = "", bgcolor = "", bordercolor = "", rules = "", frame = "";
 	var inst = tinyMCEPopup.editor, dom = inst.dom;
 	var formObj = document.forms[0];
 	var elm = dom.getParent(inst.selection.getNode(), "table");
diff --git a/plugins/TinyMCE/js/plugins/table/langs/en_dlg.js b/plugins/TinyMCE/js/plugins/table/langs/en_dlg.js
index 000332a35d..0816efb9c6 100644
--- a/plugins/TinyMCE/js/plugins/table/langs/en_dlg.js
+++ b/plugins/TinyMCE/js/plugins/table/langs/en_dlg.js
@@ -7,7 +7,7 @@ rowtype:"Row in table part",
 title:"Insert/Modify table",
 width:"Width",
 height:"Height",
-cols:"Cols",
+cols:"Columns",
 rows:"Rows",
 cellspacing:"Cellspacing",
 cellpadding:"Cellpadding",
@@ -39,6 +39,7 @@ td:"Data",
 th:"Header",
 cell_cell:"Update current cell",
 cell_row:"Update all cells in row",
+cell_col:"Update all cells in column",
 cell_all:"Update all cells in table",
 row_row:"Update current row",
 row_odd:"Update odd rows in table",
diff --git a/plugins/TinyMCE/js/plugins/table/merge_cells.htm b/plugins/TinyMCE/js/plugins/table/merge_cells.htm
index 9736ed8c03..d231090e79 100644
--- a/plugins/TinyMCE/js/plugins/table/merge_cells.htm
+++ b/plugins/TinyMCE/js/plugins/table/merge_cells.htm
@@ -7,20 +7,20 @@
 	<script type="text/javascript" src="../../utils/validate.js"></script>
 	<script type="text/javascript" src="js/merge_cells.js"></script>
 </head>
-<body style="margin: 8px">
+<body style="margin: 8px" role="application">
 <form onsubmit="MergeCellsDialog.merge();return false;" action="#">
 	<fieldset>
 		<legend>{#table_dlg.merge_cells_title}</legend>
-		  <table border="0" cellpadding="0" cellspacing="3" width="100%">
-			  <tr>
-				<td>{#table_dlg.cols}:</td>
-				<td align="right"><input type="text" name="numcols" value="" class="number min1 mceFocus" style="width: 30px" /></td>
-			  </tr>
-			  <tr>
-				<td>{#table_dlg.rows}:</td>
-				<td align="right"><input type="text" name="numrows" value="" class="number min1" style="width: 30px" /></td>
-			  </tr>
-		  </table>
+		<table role="presentation" border="0" cellpadding="0" cellspacing="3" width="100%">
+			<tr>
+				<td><label for="numcols">{#table_dlg.cols}</label>:</td>
+				<td align="right"><input type="text" id="numcols" name="numcols" value="" class="number min1 mceFocus" style="width: 30px" aria-required="true" /></td>
+			</tr>
+			<tr>
+				<td><label for="numrows">{#table_dlg.rows}</label>:</td>
+				<td align="right"><input type="text" id="numrows" name="numrows" value="" class="number min1" style="width: 30px" aria-required="true" /></td>
+			</tr>
+		</table>
 	</fieldset>
 
 	<div class="mceActionPanel">
diff --git a/plugins/TinyMCE/js/plugins/table/row.htm b/plugins/TinyMCE/js/plugins/table/row.htm
index 092e6c8270..1885401f6b 100644
--- a/plugins/TinyMCE/js/plugins/table/row.htm
+++ b/plugins/TinyMCE/js/plugins/table/row.htm
@@ -5,16 +5,17 @@
 	<script type="text/javascript" src="../../tiny_mce_popup.js"></script>
 	<script type="text/javascript" src="../../utils/mctabs.js"></script>
 	<script type="text/javascript" src="../../utils/form_utils.js"></script>
+	<script type="text/javascript" src="../../utils/validate.js"></script>
 	<script type="text/javascript" src="../../utils/editable_selects.js"></script>
 	<script type="text/javascript" src="js/row.js"></script>
 	<link href="css/row.css" rel="stylesheet" type="text/css" />
 </head>
-<body id="tablerow" style="display: none">
+<body id="tablerow" style="display: none" role="application">
 	<form onsubmit="updateAction();return false;" action="#">
 		<div class="tabs">
 			<ul>
-				<li id="general_tab" class="current"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{#table_dlg.general_tab}</a></span></li>
-				<li id="advanced_tab"><span><a href="javascript:mcTabs.displayTab('advanced_tab','advanced_panel');" onmousedown="return false;">{#table_dlg.advanced_tab}</a></span></li>
+				<li id="general_tab" class="current" aria-controls="general_panel"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{#table_dlg.general_tab}</a></span></li>
+				<li id="advanced_tab" aria-controls="advanced_panel"><span><a href="javascript:mcTabs.displayTab('advanced_tab','advanced_panel');" onmousedown="return false;">{#table_dlg.advanced_tab}</a></span></li>
 			</ul>
 		</div>
 
@@ -23,7 +24,7 @@
 				<fieldset>
 					<legend>{#table_dlg.general_props}</legend>
 
-					<table border="0" cellpadding="4" cellspacing="0">
+					<table role="presentation" border="0" cellpadding="4" cellspacing="0">
 						<tr>
 							<td><label for="rowtype">{#table_dlg.rowtype}</label></td>
 							<td class="col2">
@@ -70,7 +71,7 @@
 
 						<tr>
 							<td><label for="height">{#table_dlg.height}</label></td>
-							<td class="col2"><input name="height" type="text" id="height" value="" size="4" maxlength="4" onchange="changedSize();" /></td>
+							<td class="col2"><input name="height" type="text" id="height" value="" size="7" maxlength="7" onchange="changedSize();" class="size" /></td>
 						</tr>
 					</table>
 				</fieldset>
@@ -80,7 +81,7 @@
 				<fieldset>
 					<legend>{#table_dlg.advanced_props}</legend>
 
-					<table border="0" cellpadding="0" cellspacing="4">
+					<table role="presentation" border="0" cellpadding="0" cellspacing="4">
 						<tr>
 							<td class="column1"><label for="id">{#table_dlg.id}</label></td> 
 							<td><input id="id" name="id" type="text" value="" style="width: 200px" /></td> 
@@ -112,7 +113,7 @@
 						<tr>
 							<td class="column1"><label for="backgroundimage">{#table_dlg.bgimage}</label></td> 
 							<td>
-								<table border="0" cellpadding="0" cellspacing="0">
+								<table role="presentation" border="0" cellpadding="0" cellspacing="0">
 									<tr>
 										<td><input id="backgroundimage" name="backgroundimage" type="text" value="" style="width: 200px" onchange="changedBackgroundImage();" /></td>
 										<td id="backgroundimagebrowsercontainer">&nbsp;</td>
@@ -122,14 +123,16 @@
 						</tr>
 
 						<tr>
-							<td class="column1"><label for="bgcolor">{#table_dlg.bgcolor}</label></td> 
+							<td class="column1"><label for="bgcolor" id="bgcolor_label">{#table_dlg.bgcolor}</label></td> 
 							<td>
-								<table border="0" cellpadding="0" cellspacing="0">
+								<span role="group" aria-labelledby="bgcolor_label">
+								<table role="presentation" border="0" cellpadding="0" cellspacing="0">
 									<tr>
 										<td><input id="bgcolor" name="bgcolor" type="text" value="" size="9" onchange="updateColor('bgcolor_pick','bgcolor');changedColor();" /></td>
 										<td id="bgcolor_pickcontainer">&nbsp;</td>
 									</tr>
 								</table>
+								</span>
 							</td> 
 						</tr>
 					</table>
diff --git a/plugins/TinyMCE/js/plugins/table/table.htm b/plugins/TinyMCE/js/plugins/table/table.htm
index f269039228..09d3700f77 100644
--- a/plugins/TinyMCE/js/plugins/table/table.htm
+++ b/plugins/TinyMCE/js/plugins/table/table.htm
@@ -10,12 +10,13 @@
 	<script type="text/javascript" src="js/table.js"></script>
 	<link href="css/table.css" rel="stylesheet" type="text/css" />
 </head>
-<body id="table" style="display: none">
+<body id="table" style="display: none" role="application" aria-labelledby="app_title">
+	<span style="display:none;" id="app_title">{#table_dlg.title}</span>
 	<form onsubmit="insertTable();return false;" action="#">
 		<div class="tabs">
 			<ul>
-				<li id="general_tab" class="current"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{#table_dlg.general_tab}</a></span></li>
-				<li id="advanced_tab"><span><a href="javascript:mcTabs.displayTab('advanced_tab','advanced_panel');" onmousedown="return false;">{#table_dlg.advanced_tab}</a></span></li>
+				<li id="general_tab" aria-controls="general_panel" class="current"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{#table_dlg.general_tab}</a></span></li>
+				<li id="advanced_tab" aria-controls="advanced_panel"><span><a href="javascript:mcTabs.displayTab('advanced_tab','advanced_panel');" onmousedown="return false;">{#table_dlg.advanced_tab}</a></span></li>
 			</ul>
 		</div>
 
@@ -23,48 +24,48 @@
 			<div id="general_panel" class="panel current">
 				<fieldset>
 					<legend>{#table_dlg.general_props}</legend>
-					  <table border="0" cellpadding="4" cellspacing="0" width="100%">
-							  <tr>
-								<td><label id="colslabel" for="cols">{#table_dlg.cols}</label></td>
-								<td><input id="cols" name="cols" type="text" value="" size="3" maxlength="3" class="required number min1 mceFocus" /></td>
-								<td><label id="rowslabel" for="rows">{#table_dlg.rows}</label></td>
-								<td><input id="rows" name="rows" type="text" value="" size="3" maxlength="3" class="required number min1" /></td>
-							  </tr>
-							  <tr>
-								<td><label id="cellpaddinglabel" for="cellpadding">{#table_dlg.cellpadding}</label></td>
-								<td><input id="cellpadding" name="cellpadding" type="text" value="" size="3" maxlength="3" class="number" /></td>
-								<td><label id="cellspacinglabel" for="cellspacing">{#table_dlg.cellspacing}</label></td>
-								<td><input id="cellspacing" name="cellspacing" type="text" value="" size="3" maxlength="3" class="number" /></td>
-							  </tr>
-							  <tr>
-								<td><label id="alignlabel" for="align">{#table_dlg.align}</label></td>
-								<td><select id="align" name="align">
-									<option value="">{#not_set}</option>
-									<option value="center">{#table_dlg.align_middle}</option>
-									<option value="left">{#table_dlg.align_left}</option>
-									<option value="right">{#table_dlg.align_right}</option>
-								  </select></td>
-								<td><label id="borderlabel" for="border">{#table_dlg.border}</label></td>
-								<td><input id="border" name="border" type="text" value="" size="3" maxlength="3" onchange="changedBorder();" class="number" /></td>
-							  </tr>
-							  <tr id="width_row">
-								<td><label id="widthlabel" for="width">{#table_dlg.width}</label></td>
-								<td><input name="width" type="text" id="width" value="" size="4" maxlength="4" onchange="changedSize();" class="size" /></td>
-								<td><label id="heightlabel" for="height">{#table_dlg.height}</label></td>
-								<td><input name="height" type="text" id="height" value="" size="4" maxlength="4" onchange="changedSize();" class="size" /></td>
-							  </tr>
-							  <tr id="styleSelectRow">
-								<td><label id="classlabel" for="class">{#class_name}</label></td>
-								<td colspan="3">
-								 <select id="class" name="class" class="mceEditableSelect">
-									<option value="" selected="selected">{#not_set}</option>
-								 </select></td>
-							  </tr>
-							  <tr>
-								<td class="column1"><label for="caption">{#table_dlg.caption}</label></td> 
-								<td><input id="caption" name="caption" type="checkbox" class="checkbox" value="true" /></td> 
-							  </tr>
-							</table>
+					<table role="presentation" border="0" cellpadding="4" cellspacing="0" width="100%">
+						<tr>
+							<td><label id="colslabel" for="cols">{#table_dlg.cols}</label></td>
+							<td><input id="cols" name="cols" type="text" value="" size="3" maxlength="3" class="required number min1 mceFocus" aria-required="true" /></td>
+							<td><label id="rowslabel" for="rows">{#table_dlg.rows}</label></td>
+							<td><input id="rows" name="rows" type="text" value="" size="3" maxlength="3" class="required number min1" aria-required="true" /></td>
+						</tr>
+						<tr>
+							<td><label id="cellpaddinglabel" for="cellpadding">{#table_dlg.cellpadding}</label></td>
+							<td><input id="cellpadding" name="cellpadding" type="text" value="" size="3" maxlength="3" class="number" /></td>
+							<td><label id="cellspacinglabel" for="cellspacing">{#table_dlg.cellspacing}</label></td>
+							<td><input id="cellspacing" name="cellspacing" type="text" value="" size="3" maxlength="3" class="number" /></td>
+						</tr>
+						<tr>
+							<td><label id="alignlabel" for="align">{#table_dlg.align}</label></td>
+							<td><select id="align" name="align">
+								<option value="">{#not_set}</option>
+								<option value="center">{#table_dlg.align_middle}</option>
+								<option value="left">{#table_dlg.align_left}</option>
+								<option value="right">{#table_dlg.align_right}</option>
+							</select></td>
+							<td><label id="borderlabel" for="border">{#table_dlg.border}</label></td>
+							<td><input id="border" name="border" type="text" value="" size="3" maxlength="3" onchange="changedBorder();" class="number" /></td>
+						</tr>
+						<tr id="width_row">
+							<td><label id="widthlabel" for="width">{#table_dlg.width}</label></td>
+							<td><input name="width" type="text" id="width" value="" size="7" maxlength="7" onchange="changedSize();" class="size" /></td>
+							<td><label id="heightlabel" for="height">{#table_dlg.height}</label></td>
+							<td><input name="height" type="text" id="height" value="" size="7" maxlength="7" onchange="changedSize();" class="size" /></td>
+						</tr>
+						<tr id="styleSelectRow" >
+							<td><label id="classlabel" for="class">{#class_name}</label></td>
+							<td colspan="3" >
+							 <select id="class" name="class" class="mceEditableSelect">
+								<option value="" selected="selected">{#not_set}</option>
+							 </select></td>
+						</tr>
+						<tr>
+							<td class="column1" ><label for="caption">{#table_dlg.caption}</label></td> 
+							<td><input id="caption" name="caption" type="checkbox" class="checkbox" value="true" /></td> 
+						</tr>
+					</table>
 				</fieldset>
 			</div>
 
@@ -72,7 +73,7 @@
 				<fieldset>
 					<legend>{#table_dlg.advanced_props}</legend>
 
-					<table border="0" cellpadding="0" cellspacing="4">
+					<table role="presentation" border="0" cellpadding="0" cellspacing="4">
 						<tr>
 							<td class="column1"><label for="id">{#table_dlg.id}</label></td> 
 							<td><input id="id" name="id" type="text" value="" class="advfield" /></td> 
@@ -98,7 +99,7 @@
 						<tr>
 							<td class="column1"><label for="backgroundimage">{#table_dlg.bgimage}</label></td> 
 							<td>
-								<table border="0" cellpadding="0" cellspacing="0">
+								<table role="presentation" aria-labelledby="backgroundimage_label" border="0" cellpadding="0" cellspacing="0">
 									<tr>
 										<td><input id="backgroundimage" name="backgroundimage" type="text" value="" class="advfield" onchange="changedBackgroundImage();" /></td>
 										<td id="backgroundimagebrowsercontainer">&nbsp;</td>
@@ -150,10 +151,10 @@
 							</td> 
 						</tr>
 
-						<tr>
-							<td class="column1"><label for="bordercolor">{#table_dlg.bordercolor}</label></td> 
+						<tr role="group" aria-labelledby="bordercolor_label">
+							<td class="column1"><label id="bordercolor_label" for="bordercolor">{#table_dlg.bordercolor}</label></td> 
 							<td>
-								<table border="0" cellpadding="0" cellspacing="0">
+								<table role="presentation" border="0" cellpadding="0" cellspacing="0">
 									<tr>
 										<td><input id="bordercolor" name="bordercolor" type="text" value="" size="9" onchange="updateColor('bordercolor_pick','bordercolor');changedColor();" /></td>
 										<td id="bordercolor_pickcontainer">&nbsp;</td>
@@ -162,10 +163,10 @@
 							</td> 
 						</tr>
 
-						<tr>
-							<td class="column1"><label for="bgcolor">{#table_dlg.bgcolor}</label></td> 
+						<tr role="group" aria-labelledby="bgcolor_label">
+							<td class="column1"><label id="bgcolor_label" for="bgcolor">{#table_dlg.bgcolor}</label></td> 
 							<td>
-								<table border="0" cellpadding="0" cellspacing="0">
+								<table role="presentation" border="0" cellpadding="0" cellspacing="0">
 									<tr>
 										<td><input id="bgcolor" name="bgcolor" type="text" value="" size="9" onchange="updateColor('bgcolor_pick','bgcolor');changedColor();" /></td>
 										<td id="bgcolor_pickcontainer">&nbsp;</td>
diff --git a/plugins/TinyMCE/js/plugins/template/js/template.js b/plugins/TinyMCE/js/plugins/template/js/template.js
index 24045d7311..bc3045d244 100644
--- a/plugins/TinyMCE/js/plugins/template/js/template.js
+++ b/plugins/TinyMCE/js/plugins/template/js/template.js
@@ -42,7 +42,7 @@ var TemplateDialog = {
 
 		if (e) {
 			e.style.height = Math.abs(h) + 'px';
-			e.style.width  = Math.abs(w - 5) + 'px';
+			e.style.width = Math.abs(w - 5) + 'px';
 		}
 	},
 
diff --git a/plugins/TinyMCE/js/plugins/visualchars/editor_plugin.js b/plugins/TinyMCE/js/plugins/visualchars/editor_plugin.js
index 94719f93a1..1a148e8b4f 100644
--- a/plugins/TinyMCE/js/plugins/visualchars/editor_plugin.js
+++ b/plugins/TinyMCE/js/plugins/visualchars/editor_plugin.js
@@ -1 +1 @@
-(function(){tinymce.create("tinymce.plugins.VisualChars",{init:function(a,b){var c=this;c.editor=a;a.addCommand("mceVisualChars",c._toggleVisualChars,c);a.addButton("visualchars",{title:"visualchars.desc",cmd:"mceVisualChars"});a.onBeforeGetContent.add(function(d,e){if(c.state&&e.format!="raw"&&!e.draft){c.state=true;c._toggleVisualChars(false)}})},getInfo:function(){return{longname:"Visual characters",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/visualchars",version:tinymce.majorVersion+"."+tinymce.minorVersion}},_toggleVisualChars:function(m){var p=this,k=p.editor,a,g,j,n=k.getDoc(),o=k.getBody(),l,q=k.selection,e,c,f;p.state=!p.state;k.controlManager.setActive("visualchars",p.state);if(m){f=q.getBookmark()}if(p.state){a=[];tinymce.walk(o,function(b){if(b.nodeType==3&&b.nodeValue&&b.nodeValue.indexOf("\u00a0")!=-1){a.push(b)}},"childNodes");for(g=0;g<a.length;g++){l=a[g].nodeValue;l=l.replace(/(\u00a0)/g,'<span _mce_bogus="1" class="mceItemHidden mceItemNbsp">$1</span>');c=k.dom.create("div",null,l);while(node=c.lastChild){k.dom.insertAfter(node,a[g])}k.dom.remove(a[g])}}else{a=k.dom.select("span.mceItemNbsp",o);for(g=a.length-1;g>=0;g--){k.dom.remove(a[g],1)}}q.moveToBookmark(f)}});tinymce.PluginManager.add("visualchars",tinymce.plugins.VisualChars)})();
\ No newline at end of file
+(function(){tinymce.create("tinymce.plugins.VisualChars",{init:function(a,b){var c=this;c.editor=a;a.addCommand("mceVisualChars",c._toggleVisualChars,c);a.addButton("visualchars",{title:"visualchars.desc",cmd:"mceVisualChars"});a.onBeforeGetContent.add(function(d,e){if(c.state&&e.format!="raw"&&!e.draft){c.state=true;c._toggleVisualChars(false)}})},getInfo:function(){return{longname:"Visual characters",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/visualchars",version:tinymce.majorVersion+"."+tinymce.minorVersion}},_toggleVisualChars:function(m){var p=this,k=p.editor,a,g,j,n=k.getDoc(),o=k.getBody(),l,q=k.selection,e,c,f;p.state=!p.state;k.controlManager.setActive("visualchars",p.state);if(m){f=q.getBookmark()}if(p.state){a=[];tinymce.walk(o,function(b){if(b.nodeType==3&&b.nodeValue&&b.nodeValue.indexOf("\u00a0")!=-1){a.push(b)}},"childNodes");for(g=0;g<a.length;g++){l=a[g].nodeValue;l=l.replace(/(\u00a0)/g,'<span data-mce-bogus="1" class="mceItemHidden mceItemNbsp">$1</span>');c=k.dom.create("div",null,l);while(node=c.lastChild){k.dom.insertAfter(node,a[g])}k.dom.remove(a[g])}}else{a=k.dom.select("span.mceItemNbsp",o);for(g=a.length-1;g>=0;g--){k.dom.remove(a[g],1)}}q.moveToBookmark(f)}});tinymce.PluginManager.add("visualchars",tinymce.plugins.VisualChars)})();
\ No newline at end of file
diff --git a/plugins/TinyMCE/js/plugins/visualchars/editor_plugin_src.js b/plugins/TinyMCE/js/plugins/visualchars/editor_plugin_src.js
index 35856e26a0..df985905b6 100644
--- a/plugins/TinyMCE/js/plugins/visualchars/editor_plugin_src.js
+++ b/plugins/TinyMCE/js/plugins/visualchars/editor_plugin_src.js
@@ -59,7 +59,7 @@
 
 				for (i = 0; i < nl.length; i++) {
 					nv = nl[i].nodeValue;
-					nv = nv.replace(/(\u00a0)/g, '<span _mce_bogus="1" class="mceItemHidden mceItemNbsp">$1</span>');
+					nv = nv.replace(/(\u00a0)/g, '<span data-mce-bogus="1" class="mceItemHidden mceItemNbsp">$1</span>');
 
 					div = ed.dom.create('div', null, nv);
 					while (node = div.lastChild)
diff --git a/plugins/TinyMCE/js/plugins/wordcount/editor_plugin.js b/plugins/TinyMCE/js/plugins/wordcount/editor_plugin.js
index a099e6a8c5..e769d09f6d 100644
--- a/plugins/TinyMCE/js/plugins/wordcount/editor_plugin.js
+++ b/plugins/TinyMCE/js/plugins/wordcount/editor_plugin.js
@@ -1 +1 @@
-(function(){tinymce.create("tinymce.plugins.WordCount",{block:0,id:null,countre:null,cleanre:null,init:function(a,b){var c=this,d=0;c.countre=a.getParam("wordcount_countregex",/\S\s+/g);c.cleanre=a.getParam("wordcount_cleanregex",/[0-9.(),;:!?%#$¿'"_+=\\\/-]*/g);c.id=a.id+"-word-count";a.onPostRender.add(function(f,e){var g,h;h=f.getParam("wordcount_target_id");if(!h){g=tinymce.DOM.get(f.id+"_path_row");if(g){tinymce.DOM.add(g.parentNode,"div",{style:"float: right"},f.getLang("wordcount.words","Words: ")+'<span id="'+c.id+'">0</span>')}}else{tinymce.DOM.add(h,"span",{},'<span id="'+c.id+'">0</span>')}});a.onInit.add(function(e){e.selection.onSetContent.add(function(){c._count(e)});c._count(e)});a.onSetContent.add(function(e){c._count(e)});a.onKeyUp.add(function(f,g){if(g.keyCode==d){return}if(13==g.keyCode||8==d||46==d){c._count(f)}d=g.keyCode})},_count:function(b){var c=this,a=0;if(c.block){return}c.block=1;setTimeout(function(){var d=b.getContent({format:"raw"});if(d){d=d.replace(/<.[^<>]*?>/g," ").replace(/&nbsp;|&#160;/gi," ");d=d.replace(c.cleanre,"");d.replace(c.countre,function(){a++})}tinymce.DOM.setHTML(c.id,a.toString());setTimeout(function(){c.block=0},2000)},1)},getInfo:function(){return{longname:"Word Count plugin",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/wordcount",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("wordcount",tinymce.plugins.WordCount)})();
\ No newline at end of file
+(function(){tinymce.create("tinymce.plugins.WordCount",{block:0,id:null,countre:null,cleanre:null,init:function(a,b){var c=this,d=0;c.countre=a.getParam("wordcount_countregex",/[\w\u2019\'-]+/g);c.cleanre=a.getParam("wordcount_cleanregex",/[0-9.(),;:!?%#$?\'\"_+=\\\/-]*/g);c.id=a.id+"-word-count";a.onPostRender.add(function(f,e){var g,h;h=f.getParam("wordcount_target_id");if(!h){g=tinymce.DOM.get(f.id+"_path_row");if(g){tinymce.DOM.add(g.parentNode,"div",{style:"float: right"},f.getLang("wordcount.words","Words: ")+'<span id="'+c.id+'">0</span>')}}else{tinymce.DOM.add(h,"span",{},'<span id="'+c.id+'">0</span>')}});a.onInit.add(function(e){e.selection.onSetContent.add(function(){c._count(e)});c._count(e)});a.onSetContent.add(function(e){c._count(e)});a.onKeyUp.add(function(f,g){if(g.keyCode==d){return}if(13==g.keyCode||8==d||46==d){c._count(f)}d=g.keyCode})},_getCount:function(c){var a=0;var b=c.getContent({format:"raw"});if(b){b=b.replace(/\.\.\./g," ");b=b.replace(/<.[^<>]*?>/g," ").replace(/&nbsp;|&#160;/gi," ");b=b.replace(/(\w+)(&.+?;)+(\w+)/,"$1$3").replace(/&.+?;/g," ");b=b.replace(this.cleanre,"");var d=b.match(this.countre);if(d){a=d.length}}return a},_count:function(a){var b=this;if(b.block){return}b.block=1;setTimeout(function(){var c=b._getCount(a);tinymce.DOM.setHTML(b.id,c.toString());setTimeout(function(){b.block=0},2000)},1)},getInfo:function(){return{longname:"Word Count plugin",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/wordcount",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("wordcount",tinymce.plugins.WordCount)})();
\ No newline at end of file
diff --git a/plugins/TinyMCE/js/plugins/wordcount/editor_plugin_src.js b/plugins/TinyMCE/js/plugins/wordcount/editor_plugin_src.js
index 5cb92fa0f0..6c9a3ead27 100644
--- a/plugins/TinyMCE/js/plugins/wordcount/editor_plugin_src.js
+++ b/plugins/TinyMCE/js/plugins/wordcount/editor_plugin_src.js
@@ -9,7 +9,7 @@
  */
 
 (function() {
-    tinymce.create('tinymce.plugins.WordCount', {
+	tinymce.create('tinymce.plugins.WordCount', {
 		block : 0,
 		id : null,
 		countre : null,
@@ -18,8 +18,8 @@
 		init : function(ed, url) {
 			var t = this, last = 0;
 
-			t.countre = ed.getParam('wordcount_countregex', /\S\s+/g);
-			t.cleanre = ed.getParam('wordcount_cleanregex', /[0-9.(),;:!?%#$¿'"_+=\\\/-]*/g);
+			t.countre = ed.getParam('wordcount_countregex', /[\w\u2019\'-]+/g); // u2019 == &rsquo;
+			t.cleanre = ed.getParam('wordcount_cleanregex', /[0-9.(),;:!?%#$?\'\"_+=\\\/-]*/g);
 			t.id = ed.id + '-word-count';
 
 			ed.onPostRender.add(function(ed, cm) {
@@ -32,11 +32,12 @@
 
 					if (row)
 						tinymce.DOM.add(row.parentNode, 'div', {'style': 'float: right'}, ed.getLang('wordcount.words', 'Words: ') + '<span id="' + t.id + '">0</span>');
-				} else
+				} else {
 					tinymce.DOM.add(id, 'span', {}, '<span id="' + t.id + '">0</span>');
+				}
 			});
 
-            ed.onInit.add(function(ed) {
+			ed.onInit.add(function(ed) {
 				ed.selection.onSetContent.add(function() {
 					t._count(ed);
 				});
@@ -59,8 +60,29 @@
 			});
 		},
 
+		_getCount : function(ed) {
+			var tc = 0;
+			var tx = ed.getContent({ format: 'raw' });
+
+			if (tx) {
+					tx = tx.replace(/\.\.\./g, ' '); // convert ellipses to spaces
+					tx = tx.replace(/<.[^<>]*?>/g, ' ').replace(/&nbsp;|&#160;/gi, ' '); // remove html tags and space chars
+
+					// deal with html entities
+					tx = tx.replace(/(\w+)(&.+?;)+(\w+)/, "$1$3").replace(/&.+?;/g, ' ');
+					tx = tx.replace(this.cleanre, ''); // remove numbers and punctuation
+
+					var wordArray = tx.match(this.countre);
+					if (wordArray) {
+							tc = wordArray.length;
+					}
+			}
+
+			return tc;
+		},
+
 		_count : function(ed) {
-			var t = this, tc = 0;
+			var t = this;
 
 			// Keep multiple calls from happening at the same time
 			if (t.block)
@@ -69,21 +91,15 @@
 			t.block = 1;
 
 			setTimeout(function() {
-				var tx = ed.getContent({format : 'raw'});
+					var tc = t._getCount(ed);
 
-				if (tx) {
-					tx = tx.replace(/<.[^<>]*?>/g, ' ').replace(/&nbsp;|&#160;/gi, ' '); // remove html tags and space chars
-					tx = tx.replace(t.cleanre, ''); // remove numbers and punctuation
-					tx.replace(t.countre, function() {tc++;}); // count the words
-				}
+					tinymce.DOM.setHTML(t.id, tc.toString());
 
-				tinymce.DOM.setHTML(t.id, tc.toString());
-
-				setTimeout(function() {t.block = 0;}, 2000);
+					setTimeout(function() {t.block = 0;}, 2000);
 			}, 1);
 		},
 
-        getInfo: function() {
+		getInfo: function() {
 			return {
 				longname : 'Word Count plugin',
 				author : 'Moxiecode Systems AB',
@@ -91,8 +107,8 @@
 				infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/wordcount',
 				version : tinymce.majorVersion + "." + tinymce.minorVersion
 			};
-        }
-    });
+		}
+	});
 
-    tinymce.PluginManager.add('wordcount', tinymce.plugins.WordCount);
+	tinymce.PluginManager.add('wordcount', tinymce.plugins.WordCount);
 })();
diff --git a/plugins/TinyMCE/js/plugins/xhtmlxtras/abbr.htm b/plugins/TinyMCE/js/plugins/xhtmlxtras/abbr.htm
index 3aeac0deba..30a894f7c3 100644
--- a/plugins/TinyMCE/js/plugins/xhtmlxtras/abbr.htm
+++ b/plugins/TinyMCE/js/plugins/xhtmlxtras/abbr.htm
@@ -10,11 +10,12 @@
 	<script type="text/javascript" src="js/abbr.js"></script>
 	<link rel="stylesheet" type="text/css" href="css/popup.css" />
 </head>
-<body style="display: none">
+<body style="display: none" role="application" aria-labelledby="app_title">
+<span style="display:none;" id="app_title">{#xhtmlxtras_dlg.title_abbr_element}</span>
 <form onsubmit="insertAbbr();return false;" action="#">
 	<div class="tabs">
 		<ul>
-			<li id="general_tab" class="current"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{#xhtmlxtras_dlg.general_tab}</a></span></li>
+			<li id="general_tab" class="current" aria-controls="general_panel"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{#xhtmlxtras_dlg.general_tab}</a></span></li>
 			<!-- <li id="events_tab"><span><a href="javascript:mcTabs.displayTab('events_tab','events_panel');" onmousedown="return false;">{#xhtmlxtras_dlg.events_tab}</a></span></li> -->
 		</ul>
 	</div>
@@ -23,7 +24,7 @@
 		<div id="general_panel" class="panel current">
 			<fieldset>
 				<legend>{#xhtmlxtras_dlg.fieldset_attrib_tab}</legend>
-				<table border="0" cellpadding="0" cellspacing="4">
+				<table role="presentation" border="0" cellpadding="0" cellspacing="4">
 					<tr>
 						<td class="label"><label id="titlelabel" for="title">{#xhtmlxtras_dlg.attribute_label_title}</label>:</td> 
 						<td><input id="title" name="title" type="text" value="" class="field mceFocus" /></td> 
@@ -41,7 +42,7 @@
 						</td>
 					</tr>
 					<tr>
-						<td class="label"><label id="stylelabel" for="class">{#xhtmlxtras_dlg.attribute_label_style}</label>:</td> 
+						<td class="label"><label id="stylelabel" for="style">{#xhtmlxtras_dlg.attribute_label_style}</label>:</td> 
 						<td><input id="style" name="style" type="text" value="" class="field" /></td> 
 					</tr>
 					<tr>
@@ -67,7 +68,7 @@
 			<fieldset>
 				<legend>{#xhtmlxtras_dlg.fieldset_events_tab}</legend>
 
-				<table border="0" cellpadding="0" cellspacing="4">
+				<table role="presentation" border="0" cellpadding="0" cellspacing="4">
 					<tr>
 						<td class="label"><label for="onfocus">onfocus</label>:</td> 
 						<td><input id="onfocus" name="onfocus" type="text" value="" class="field" /></td> 
diff --git a/plugins/TinyMCE/js/plugins/xhtmlxtras/acronym.htm b/plugins/TinyMCE/js/plugins/xhtmlxtras/acronym.htm
index 31ee7b70f3..c109345928 100644
--- a/plugins/TinyMCE/js/plugins/xhtmlxtras/acronym.htm
+++ b/plugins/TinyMCE/js/plugins/xhtmlxtras/acronym.htm
@@ -10,11 +10,12 @@
 	<script type="text/javascript" src="js/acronym.js"></script>
 	<link rel="stylesheet" type="text/css" href="css/popup.css" />
 </head>
-<body style="display: none">
+<body style="display: none" role="application" aria-labelledby="app_title">
+<span style="display:none;" id="app_title">{#xhtmlxtras_dlg.title_acronym_element}</span>
 <form onsubmit="insertAcronym();return false;" action="#">
 	<div class="tabs">
 		<ul>
-			<li id="general_tab" class="current"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{#xhtmlxtras_dlg.general_tab}</a></span></li>
+			<li id="general_tab" class="current" aria-controls="general_panel"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{#xhtmlxtras_dlg.general_tab}</a></span></li>
 			<!-- <li id="events_tab"><span><a href="javascript:mcTabs.displayTab('events_tab','events_panel');" onmousedown="return false;">{#xhtmlxtras_dlg.events_tab}</a></span></li> -->
 		</ul>
 	</div>
@@ -23,7 +24,7 @@
 		<div id="general_panel" class="panel current">
 			<fieldset>
 				<legend>{#xhtmlxtras_dlg.fieldset_attrib_tab}</legend>
-				<table border="0" cellpadding="0" cellspacing="4">
+				<table role="presentation" border="0" cellpadding="0" cellspacing="4">
 					<tr>
 						<td class="label"><label id="titlelabel" for="title">{#xhtmlxtras_dlg.attribute_label_title}</label>:</td> 
 						<td><input id="title" name="title" type="text" value="" class="field mceFocus" /></td> 
@@ -41,7 +42,7 @@
 						</td>
 					</tr>
 					<tr>
-						<td class="label"><label id="stylelabel" for="class">{#xhtmlxtras_dlg.attribute_label_style}</label>:</td> 
+						<td class="label"><label id="stylelabel" for="style">{#xhtmlxtras_dlg.attribute_label_style}</label>:</td> 
 						<td><input id="style" name="style" type="text" value="" class="field" /></td> 
 					</tr>
 					<tr>
@@ -67,7 +68,7 @@
 			<fieldset>
 				<legend>{#xhtmlxtras_dlg.fieldset_events_tab}</legend>
 
-				<table border="0" cellpadding="0" cellspacing="4">
+				<table role="presentation" border="0" cellpadding="0" cellspacing="4">
 					<tr>
 						<td class="label"><label for="onfocus">onfocus</label>:</td> 
 						<td><input id="onfocus" name="onfocus" type="text" value="" class="field" /></td> 
diff --git a/plugins/TinyMCE/js/plugins/xhtmlxtras/attributes.htm b/plugins/TinyMCE/js/plugins/xhtmlxtras/attributes.htm
index 17054da3ed..e8d606a340 100644
--- a/plugins/TinyMCE/js/plugins/xhtmlxtras/attributes.htm
+++ b/plugins/TinyMCE/js/plugins/xhtmlxtras/attributes.htm
@@ -9,12 +9,13 @@
 	<script type="text/javascript" src="js/attributes.js"></script>
 	<link rel="stylesheet" type="text/css" href="css/attributes.css" />
 </head>
-<body style="display: none">
+<body style="display: none" role="application" aria-labelledby="app_title">
+<span style="display:none;" id="app_title">{#xhtmlxtras_dlg.attribs_title}</span>
 <form onsubmit="insertAction();return false;" action="#">
 	<div class="tabs">
 		<ul>
-			<li id="general_tab" class="current"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{#xhtmlxtras_dlg.attribute_attrib_tab}</a></span></li>
-			<li id="events_tab"><span><a href="javascript:mcTabs.displayTab('events_tab','events_panel');" onmousedown="return false;">{#xhtmlxtras_dlg.attribute_events_tab}</a></span></li>
+			<li id="general_tab" class="current" aria-controls="general_panel"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{#xhtmlxtras_dlg.attribute_attrib_tab}</a></span></li>
+			<li id="events_tab" aria-controls="events_panel"><span><a href="javascript:mcTabs.displayTab('events_tab','events_panel');" onmousedown="return false;">{#xhtmlxtras_dlg.attribute_events_tab}</a></span></li>
 		</ul>
 	</div>
 
@@ -22,7 +23,7 @@
 		<div id="general_panel" class="panel current">
 			<fieldset>
 				<legend>{#xhtmlxtras_dlg.attribute_attrib_tab}</legend>
-				<table border="0" cellpadding="0" cellspacing="4">
+				<table role="presentation" border="0" cellpadding="0" cellspacing="4">
 					<tr>
 						<td class="label"><label id="titlelabel" for="title">{#xhtmlxtras_dlg.attribute_label_title}</label>:</td> 
 						<td><input id="title" name="title" type="text" value="" class="mceFocus" /></td> 
@@ -75,7 +76,7 @@
 			<fieldset>
 				<legend>{#xhtmlxtras_dlg.attribute_events_tab}</legend>
 
-				<table border="0" cellpadding="0" cellspacing="4">
+				<table role="presentation" border="0" cellpadding="0" cellspacing="4">
 					<tr>
 						<td class="label"><label for="onfocus">onfocus</label>:</td> 
 						<td><input id="onfocus" name="onfocus" type="text" value="" /></td> 
diff --git a/plugins/TinyMCE/js/plugins/xhtmlxtras/cite.htm b/plugins/TinyMCE/js/plugins/xhtmlxtras/cite.htm
index d0a3e3a8e5..0ac6bdb667 100644
--- a/plugins/TinyMCE/js/plugins/xhtmlxtras/cite.htm
+++ b/plugins/TinyMCE/js/plugins/xhtmlxtras/cite.htm
@@ -10,11 +10,12 @@
 	<script type="text/javascript" src="js/cite.js"></script>
 	<link rel="stylesheet" type="text/css" href="css/popup.css" />
 </head>
-<body style="display: none">
+<body style="display: none" role="application" aria-labelledby="app_title">
+<span style="display:none;" id="app_title">{#xhtmlxtras_dlg.title_cite_element}</span>
 <form onsubmit="insertCite();return false;" action="#">
 	<div class="tabs">
 		<ul>
-			<li id="general_tab" class="current"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{#xhtmlxtras_dlg.general_tab}</a></span></li>
+			<li id="general_tab" class="current" aria-controls="general_panel"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{#xhtmlxtras_dlg.general_tab}</a></span></li>
 			<!-- <li id="events_tab"><span><a href="javascript:mcTabs.displayTab('events_tab','events_panel');" onmousedown="return false;">{#xhtmlxtras_dlg.events_tab}</a></span></li> -->
 		</ul>
 	</div>
@@ -23,7 +24,7 @@
 		<div id="general_panel" class="panel current">
 			<fieldset>
 				<legend>{#xhtmlxtras_dlg.fieldset_attrib_tab}</legend>
-				<table border="0" cellpadding="0" cellspacing="4">
+				<table role="presentation" border="0" cellpadding="0" cellspacing="4">
 					<tr>
 						<td class="label"><label id="titlelabel" for="title">{#xhtmlxtras_dlg.attribute_label_title}</label>:</td> 
 						<td><input id="title" name="title" type="text" value="" class="field mceFocus" /></td> 
@@ -67,7 +68,7 @@
 			<fieldset>
 				<legend>{#xhtmlxtras_dlg.fieldset_events_tab}</legend>
 
-				<table border="0" cellpadding="0" cellspacing="4">
+				<table role="presentation" border="0" cellpadding="0" cellspacing="4">
 					<tr>
 						<td class="label"><label for="onfocus">onfocus</label>:</td> 
 						<td><input id="onfocus" name="onfocus" type="text" value="" class="field" /></td> 
diff --git a/plugins/TinyMCE/js/plugins/xhtmlxtras/del.htm b/plugins/TinyMCE/js/plugins/xhtmlxtras/del.htm
index 8b07fa8429..5f667510f5 100644
--- a/plugins/TinyMCE/js/plugins/xhtmlxtras/del.htm
+++ b/plugins/TinyMCE/js/plugins/xhtmlxtras/del.htm
@@ -10,11 +10,12 @@
 	<script type="text/javascript" src="js/del.js"></script>
 	<link rel="stylesheet" type="text/css" href="css/popup.css" />
 </head>
-<body id="xhtmlxtrasins" style="display: none">
+<body id="xhtmlxtrasins" style="display: none" role="application" aria-labelledby="app_title">
+<span style="display:none;" id="app_title">{#xhtmlxtras_dlg.title_del_element}</span>
 <form onsubmit="insertDel();return false;" action="#">
 	<div class="tabs">
 		<ul>
-			<li id="general_tab" class="current"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{#xhtmlxtras_dlg.general_tab}</a></span></li>
+			<li id="general_tab" class="current" aria-controls="general_panel"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{#xhtmlxtras_dlg.general_tab}</a></span></li>
 			<!-- <li id="events_tab"><span><a href="javascript:mcTabs.displayTab('events_tab','events_panel');" onmousedown="return false;">{#xhtmlxtras_dlg.events_tab}</a></span></li> -->
 		</ul>
 	</div>
@@ -23,14 +24,14 @@
 		<div id="general_panel" class="panel current">
 			<fieldset>
 				<legend>{#xhtmlxtras_dlg.fieldset_general_tab}</legend>
-				<table border="0" cellpadding="0" cellspacing="4">
+				<table role="presentation" border="0" cellpadding="0" cellspacing="4">
 					<tr>
 						<td class="label"><label id="datetimelabel" for="datetime">{#xhtmlxtras_dlg.attribute_label_datetime}</label>:</td>
 						<td>
-							<table border="0" cellspacing="0" cellpadding="0">
+							<table role="presentation" border="0" cellspacing="0" cellpadding="0">
 								<tr> 
 									<td><input id="datetime" name="datetime" type="text" value="" maxlength="19" class="field mceFocus" /></td> 
-									<td><a href="javascript:insertDateTime('datetime');" onmousedown="return false;" class="browse"><span class="datetime" title="{#xhtmlxtras_dlg.insert_date}"></span></a></td>
+									<td><a href="javascript:insertDateTime('datetime');" onmousedown="return false;" class="browse" role="button" aria-labelledby="datetimelabel"><span class="datetime" title="{#xhtmlxtras_dlg.insert_date}"></span></a></td>
 								</tr>
 							</table>
 						</td>
@@ -43,7 +44,7 @@
 			</fieldset>
 			<fieldset>
 				<legend>{#xhtmlxtras_dlg.fieldset_attrib_tab}</legend>
-				<table border="0" cellpadding="0" cellspacing="4">
+				<table role="presentation" border="0" cellpadding="0" cellspacing="4">
 					<tr>
 						<td class="label"><label id="titlelabel" for="title">{#xhtmlxtras_dlg.attribute_label_title}</label>:</td> 
 						<td><input id="title" name="title" type="text" value="" class="field" /></td> 
@@ -61,7 +62,7 @@
 						</td>
 					</tr>
 					<tr>
-						<td class="label"><label id="stylelabel" for="class">{#xhtmlxtras_dlg.attribute_label_style}</label>:</td> 
+						<td class="label"><label id="stylelabel" for="style">{#xhtmlxtras_dlg.attribute_label_style}</label>:</td> 
 						<td><input id="style" name="style" type="text" value="" class="field" /></td> 
 					</tr>
 					<tr>
@@ -87,7 +88,7 @@
 			<fieldset>
 				<legend>{#xhtmlxtras_dlg.fieldset_events_tab}</legend>
 
-				<table border="0" cellpadding="0" cellspacing="4">
+				<table role="presentation" border="0" cellpadding="0" cellspacing="4">
 					<tr>
 						<td class="label"><label for="onfocus">onfocus</label>:</td> 
 						<td><input id="onfocus" name="onfocus" type="text" value="" class="field" /></td> 
diff --git a/plugins/TinyMCE/js/plugins/xhtmlxtras/editor_plugin.js b/plugins/TinyMCE/js/plugins/xhtmlxtras/editor_plugin.js
index a9393ad6db..9b98a5154b 100644
--- a/plugins/TinyMCE/js/plugins/xhtmlxtras/editor_plugin.js
+++ b/plugins/TinyMCE/js/plugins/xhtmlxtras/editor_plugin.js
@@ -1 +1 @@
-(function(){tinymce.create("tinymce.plugins.XHTMLXtrasPlugin",{init:function(a,b){a.addCommand("mceCite",function(){a.windowManager.open({file:b+"/cite.htm",width:350+parseInt(a.getLang("xhtmlxtras.cite_delta_width",0)),height:250+parseInt(a.getLang("xhtmlxtras.cite_delta_height",0)),inline:1},{plugin_url:b})});a.addCommand("mceAcronym",function(){a.windowManager.open({file:b+"/acronym.htm",width:350+parseInt(a.getLang("xhtmlxtras.acronym_delta_width",0)),height:250+parseInt(a.getLang("xhtmlxtras.acronym_delta_width",0)),inline:1},{plugin_url:b})});a.addCommand("mceAbbr",function(){a.windowManager.open({file:b+"/abbr.htm",width:350+parseInt(a.getLang("xhtmlxtras.abbr_delta_width",0)),height:250+parseInt(a.getLang("xhtmlxtras.abbr_delta_width",0)),inline:1},{plugin_url:b})});a.addCommand("mceDel",function(){a.windowManager.open({file:b+"/del.htm",width:340+parseInt(a.getLang("xhtmlxtras.del_delta_width",0)),height:310+parseInt(a.getLang("xhtmlxtras.del_delta_width",0)),inline:1},{plugin_url:b})});a.addCommand("mceIns",function(){a.windowManager.open({file:b+"/ins.htm",width:340+parseInt(a.getLang("xhtmlxtras.ins_delta_width",0)),height:310+parseInt(a.getLang("xhtmlxtras.ins_delta_width",0)),inline:1},{plugin_url:b})});a.addCommand("mceAttributes",function(){a.windowManager.open({file:b+"/attributes.htm",width:380,height:370,inline:1},{plugin_url:b})});a.addButton("cite",{title:"xhtmlxtras.cite_desc",cmd:"mceCite"});a.addButton("acronym",{title:"xhtmlxtras.acronym_desc",cmd:"mceAcronym"});a.addButton("abbr",{title:"xhtmlxtras.abbr_desc",cmd:"mceAbbr"});a.addButton("del",{title:"xhtmlxtras.del_desc",cmd:"mceDel"});a.addButton("ins",{title:"xhtmlxtras.ins_desc",cmd:"mceIns"});a.addButton("attribs",{title:"xhtmlxtras.attribs_desc",cmd:"mceAttributes"});a.onNodeChange.add(function(d,c,f,e){f=d.dom.getParent(f,"CITE,ACRONYM,ABBR,DEL,INS");c.setDisabled("cite",e);c.setDisabled("acronym",e);c.setDisabled("abbr",e);c.setDisabled("del",e);c.setDisabled("ins",e);c.setDisabled("attribs",f&&f.nodeName=="BODY");c.setActive("cite",0);c.setActive("acronym",0);c.setActive("abbr",0);c.setActive("del",0);c.setActive("ins",0);if(f){do{c.setDisabled(f.nodeName.toLowerCase(),0);c.setActive(f.nodeName.toLowerCase(),1)}while(f=f.parentNode)}});a.onPreInit.add(function(){a.dom.create("abbr")})},getInfo:function(){return{longname:"XHTML Xtras Plugin",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/xhtmlxtras",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("xhtmlxtras",tinymce.plugins.XHTMLXtrasPlugin)})();
\ No newline at end of file
+(function(){tinymce.create("tinymce.plugins.XHTMLXtrasPlugin",{init:function(a,b){a.addCommand("mceCite",function(){a.windowManager.open({file:b+"/cite.htm",width:350+parseInt(a.getLang("xhtmlxtras.cite_delta_width",0)),height:250+parseInt(a.getLang("xhtmlxtras.cite_delta_height",0)),inline:1},{plugin_url:b})});a.addCommand("mceAcronym",function(){a.windowManager.open({file:b+"/acronym.htm",width:350+parseInt(a.getLang("xhtmlxtras.acronym_delta_width",0)),height:250+parseInt(a.getLang("xhtmlxtras.acronym_delta_height",0)),inline:1},{plugin_url:b})});a.addCommand("mceAbbr",function(){a.windowManager.open({file:b+"/abbr.htm",width:350+parseInt(a.getLang("xhtmlxtras.abbr_delta_width",0)),height:250+parseInt(a.getLang("xhtmlxtras.abbr_delta_height",0)),inline:1},{plugin_url:b})});a.addCommand("mceDel",function(){a.windowManager.open({file:b+"/del.htm",width:340+parseInt(a.getLang("xhtmlxtras.del_delta_width",0)),height:310+parseInt(a.getLang("xhtmlxtras.del_delta_height",0)),inline:1},{plugin_url:b})});a.addCommand("mceIns",function(){a.windowManager.open({file:b+"/ins.htm",width:340+parseInt(a.getLang("xhtmlxtras.ins_delta_width",0)),height:310+parseInt(a.getLang("xhtmlxtras.ins_delta_height",0)),inline:1},{plugin_url:b})});a.addCommand("mceAttributes",function(){a.windowManager.open({file:b+"/attributes.htm",width:380+parseInt(a.getLang("xhtmlxtras.attr_delta_width",0)),height:370+parseInt(a.getLang("xhtmlxtras.attr_delta_height",0)),inline:1},{plugin_url:b})});a.addButton("cite",{title:"xhtmlxtras.cite_desc",cmd:"mceCite"});a.addButton("acronym",{title:"xhtmlxtras.acronym_desc",cmd:"mceAcronym"});a.addButton("abbr",{title:"xhtmlxtras.abbr_desc",cmd:"mceAbbr"});a.addButton("del",{title:"xhtmlxtras.del_desc",cmd:"mceDel"});a.addButton("ins",{title:"xhtmlxtras.ins_desc",cmd:"mceIns"});a.addButton("attribs",{title:"xhtmlxtras.attribs_desc",cmd:"mceAttributes"});a.onNodeChange.add(function(d,c,f,e){f=d.dom.getParent(f,"CITE,ACRONYM,ABBR,DEL,INS");c.setDisabled("cite",e);c.setDisabled("acronym",e);c.setDisabled("abbr",e);c.setDisabled("del",e);c.setDisabled("ins",e);c.setDisabled("attribs",f&&f.nodeName=="BODY");c.setActive("cite",0);c.setActive("acronym",0);c.setActive("abbr",0);c.setActive("del",0);c.setActive("ins",0);if(f){do{c.setDisabled(f.nodeName.toLowerCase(),0);c.setActive(f.nodeName.toLowerCase(),1)}while(f=f.parentNode)}});a.onPreInit.add(function(){a.dom.create("abbr")})},getInfo:function(){return{longname:"XHTML Xtras Plugin",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/xhtmlxtras",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("xhtmlxtras",tinymce.plugins.XHTMLXtrasPlugin)})();
\ No newline at end of file
diff --git a/plugins/TinyMCE/js/plugins/xhtmlxtras/editor_plugin_src.js b/plugins/TinyMCE/js/plugins/xhtmlxtras/editor_plugin_src.js
index 5f9d9bd50b..f24057211c 100644
--- a/plugins/TinyMCE/js/plugins/xhtmlxtras/editor_plugin_src.js
+++ b/plugins/TinyMCE/js/plugins/xhtmlxtras/editor_plugin_src.js
@@ -27,7 +27,7 @@
 				ed.windowManager.open({
 					file : url + '/acronym.htm',
 					width : 350 + parseInt(ed.getLang('xhtmlxtras.acronym_delta_width', 0)),
-					height : 250 + parseInt(ed.getLang('xhtmlxtras.acronym_delta_width', 0)),
+					height : 250 + parseInt(ed.getLang('xhtmlxtras.acronym_delta_height', 0)),
 					inline : 1
 				}, {
 					plugin_url : url
@@ -38,7 +38,7 @@
 				ed.windowManager.open({
 					file : url + '/abbr.htm',
 					width : 350 + parseInt(ed.getLang('xhtmlxtras.abbr_delta_width', 0)),
-					height : 250 + parseInt(ed.getLang('xhtmlxtras.abbr_delta_width', 0)),
+					height : 250 + parseInt(ed.getLang('xhtmlxtras.abbr_delta_height', 0)),
 					inline : 1
 				}, {
 					plugin_url : url
@@ -49,7 +49,7 @@
 				ed.windowManager.open({
 					file : url + '/del.htm',
 					width : 340 + parseInt(ed.getLang('xhtmlxtras.del_delta_width', 0)),
-					height : 310 + parseInt(ed.getLang('xhtmlxtras.del_delta_width', 0)),
+					height : 310 + parseInt(ed.getLang('xhtmlxtras.del_delta_height', 0)),
 					inline : 1
 				}, {
 					plugin_url : url
@@ -60,7 +60,7 @@
 				ed.windowManager.open({
 					file : url + '/ins.htm',
 					width : 340 + parseInt(ed.getLang('xhtmlxtras.ins_delta_width', 0)),
-					height : 310 + parseInt(ed.getLang('xhtmlxtras.ins_delta_width', 0)),
+					height : 310 + parseInt(ed.getLang('xhtmlxtras.ins_delta_height', 0)),
 					inline : 1
 				}, {
 					plugin_url : url
@@ -70,8 +70,8 @@
 			ed.addCommand('mceAttributes', function() {
 				ed.windowManager.open({
 					file : url + '/attributes.htm',
-					width : 380,
-					height : 370,
+					width : 380 + parseInt(ed.getLang('xhtmlxtras.attr_delta_width', 0)),
+					height : 370 + parseInt(ed.getLang('xhtmlxtras.attr_delta_height', 0)),
 					inline : 1
 				}, {
 					plugin_url : url
diff --git a/plugins/TinyMCE/js/plugins/xhtmlxtras/ins.htm b/plugins/TinyMCE/js/plugins/xhtmlxtras/ins.htm
index 6c5470cfcc..d001ac7c4d 100644
--- a/plugins/TinyMCE/js/plugins/xhtmlxtras/ins.htm
+++ b/plugins/TinyMCE/js/plugins/xhtmlxtras/ins.htm
@@ -10,11 +10,12 @@
 	<script type="text/javascript" src="js/ins.js"></script>
 	<link rel="stylesheet" type="text/css" href="css/popup.css" />
 </head>
-<body id="xhtmlxtrasins" style="display: none">
+<body id="xhtmlxtrasins" style="display: none" role="application" aria-labelledby="app_title">
+<span style="display:none;" id="app_title">{#xhtmlxtras_dlg.title_ins_element}</span>
 <form onsubmit="insertIns();return false;" action="#">
 	<div class="tabs">
 		<ul>
-			<li id="general_tab" class="current"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{#xhtmlxtras_dlg.general_tab}</a></span></li>
+			<li id="general_tab" class="current" aria-controls="general_panel"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{#xhtmlxtras_dlg.general_tab}</a></span></li>
 			<!-- <li id="events_tab"><span><a href="javascript:mcTabs.displayTab('events_tab','events_panel');" onmousedown="return false;">{#xhtmlxtras_dlg.events_tab}</a></span></li> -->
 		</ul>
 	</div>
@@ -23,19 +24,19 @@
 		<div id="general_panel" class="panel current">
 			<fieldset>
 				<legend>{#xhtmlxtras_dlg.fieldset_general_tab}</legend>
-				<table border="0" cellpadding="0" cellspacing="4">
+				<table role="presentation" border="0" cellpadding="0" cellspacing="4">
 					<tr>
 						<td class="label"><label id="datetimelabel" for="datetime">{#xhtmlxtras_dlg.attribute_label_datetime}</label>:</td> 
 						<td>
-							<table border="0" cellspacing="0" cellpadding="0">
+							<table role="presentation" border="0" cellspacing="0" cellpadding="0">
 								<tr> 
 									<td><input id="datetime" name="datetime" type="text" value="" maxlength="19" class="field mceFocus" /></td> 
-									<td><a href="javascript:insertDateTime('datetime');" onmousedown="return false;" class="browse"><span class="datetime" title="{#xhtmlxtras_dlg.insert_date}"></span></a></td>
+									<td ><a href="javascript:insertDateTime('datetime');" onmousedown="return false;" class="browse" role="button" aria-labelledby="datetimelabel"><span class="datetime" title="{#xhtmlxtras_dlg.insert_date}"></span></a></td>
 								</tr>
 							</table>
 						</td>
 					</tr>
-					<tr>
+					<tr >
 						<td class="label"><label id="citelabel" for="cite">{#xhtmlxtras_dlg.attribute_label_cite}</label>:</td> 
 						<td><input id="cite" name="cite" type="text" value="" class="field" /></td> 
 					</tr>
@@ -43,9 +44,9 @@
 			</fieldset>
 			<fieldset>
 				<legend>{#xhtmlxtras_dlg.fieldset_attrib_tab}</legend>
-				<table border="0" cellpadding="0" cellspacing="4">
+				<table role="presentation" border="0" cellpadding="0" cellspacing="4">
 					<tr>
-						<td class="label"><label id="titlelabel" for="title">{#xhtmlxtras_dlg.attribute_label_title}</label>:</td> 
+						<td  class="label"><label id="titlelabel" for="title">{#xhtmlxtras_dlg.attribute_label_title}</label>:</td> 
 						<td><input id="title" name="title" type="text" value="" class="field" /></td> 
 					</tr>
 					<tr>
@@ -61,7 +62,7 @@
 						</td>
 					</tr>
 					<tr>
-						<td class="label"><label id="stylelabel" for="class">{#xhtmlxtras_dlg.attribute_label_style}</label>:</td> 
+						<td class="label"><label id="stylelabel" for="style">{#xhtmlxtras_dlg.attribute_label_style}</label>:</td> 
 						<td><input id="style" name="style" type="text" value="" class="field" /></td> 
 					</tr>
 					<tr>
@@ -87,7 +88,7 @@
 			<fieldset>
 				<legend>{#xhtmlxtras_dlg.fieldset_events_tab}</legend>
 
-				<table border="0" cellpadding="0" cellspacing="4">
+				<table role="presentation" border="0" cellpadding="0" cellspacing="4">
 					<tr>
 						<td class="label"><label for="onfocus">onfocus</label>:</td> 
 						<td><input id="onfocus" name="onfocus" type="text" value="" class="field" /></td> 
diff --git a/plugins/TinyMCE/js/plugins/xhtmlxtras/js/attributes.js b/plugins/TinyMCE/js/plugins/xhtmlxtras/js/attributes.js
index d62a219e6b..9c99995adb 100644
--- a/plugins/TinyMCE/js/plugins/xhtmlxtras/js/attributes.js
+++ b/plugins/TinyMCE/js/plugins/xhtmlxtras/js/attributes.js
@@ -53,7 +53,6 @@ function insertAction() {
 	var inst = tinyMCEPopup.editor;
 	var elm = inst.selection.getNode();
 
-	tinyMCEPopup.execCommand("mceBeginUndoLevel");	
 	setAllAttribs(elm);
 	tinyMCEPopup.execCommand("mceEndUndoLevel");
 	tinyMCEPopup.close();
@@ -72,21 +71,7 @@ function setAttrib(elm, attrib, value) {
 			value = valueElm.value;
 	}
 
-	if (value != "") {
-		dom.setAttrib(elm, attrib.toLowerCase(), value);
-
-		if (attrib == "style")
-			attrib = "style.cssText";
-
-		if (attrib.substring(0, 2) == 'on')
-			value = 'return true;' + value;
-
-		if (attrib == "class")
-			attrib = "className";
-
-		elm[attrib]=value;
-	} else
-		elm.removeAttribute(attrib);
+	dom.setAttrib(elm, attrib.toLowerCase(), value);
 }
 
 function setAllAttribs(elm) {
diff --git a/plugins/TinyMCE/js/plugins/xhtmlxtras/js/del.js b/plugins/TinyMCE/js/plugins/xhtmlxtras/js/del.js
index 9e5d8c5717..1f957dc786 100644
--- a/plugins/TinyMCE/js/plugins/xhtmlxtras/js/del.js
+++ b/plugins/TinyMCE/js/plugins/xhtmlxtras/js/del.js
@@ -21,17 +21,17 @@ function setElementAttribs(elm) {
 	setAllCommonAttribs(elm);
 	setAttrib(elm, 'datetime');
 	setAttrib(elm, 'cite');
+	elm.removeAttribute('data-mce-new');
 }
 
 function insertDel() {
 	var elm = tinyMCEPopup.editor.dom.getParent(SXE.focusElement, 'DEL');
 
-	tinyMCEPopup.execCommand('mceBeginUndoLevel');
 	if (elm == null) {
 		var s = SXE.inst.selection.getContent();
 		if(s.length > 0) {
 			insertInlineElement('del');
-			var elementArray = tinymce.grep(SXE.inst.dom.select('del'), function(n) {return n.id == '#sxe_temp_del#';});
+			var elementArray = SXE.inst.dom.select('del[data-mce-new]');
 			for (var i=0; i<elementArray.length; i++) {
 				var elm = elementArray[i];
 				setElementAttribs(elm);
@@ -45,16 +45,6 @@ function insertDel() {
 	tinyMCEPopup.close();
 }
 
-function insertInlineElement(en) {
-	var ed = tinyMCEPopup.editor, dom = ed.dom;
-
-	ed.getDoc().execCommand('FontName', false, 'mceinline');
-	tinymce.each(dom.select(tinymce.isWebKit ? 'span' : 'font'), function(n) {
-		if (n.style.fontFamily == 'mceinline' || n.face == 'mceinline')
-			dom.replace(dom.create(en), n, 1);
-	});
-}
-
 function removeDel() {
 	SXE.removeElement('del');
 	tinyMCEPopup.close();
diff --git a/plugins/TinyMCE/js/plugins/xhtmlxtras/js/element_common.js b/plugins/TinyMCE/js/plugins/xhtmlxtras/js/element_common.js
index 5b494a5660..4e5d9c3bbd 100644
--- a/plugins/TinyMCE/js/plugins/xhtmlxtras/js/element_common.js
+++ b/plugins/TinyMCE/js/plugins/xhtmlxtras/js/element_common.js
@@ -154,7 +154,6 @@ SXE.initElementDialog = function(element_name) {
 SXE.insertElement = function(element_name) {
 	var elm = SXE.inst.dom.getParent(SXE.focusElement, element_name.toUpperCase()), h, tagName;
 
-	tinyMCEPopup.execCommand('mceBeginUndoLevel');
 	if (elm == null) {
 		var s = SXE.inst.selection.getContent();
 		if(s.length > 0) {
@@ -165,11 +164,11 @@ SXE.insertElement = function(element_name) {
 			for (var i=0; i<elementArray.length; i++) {
 				var elm = elementArray[i];
 
-				if (SXE.inst.dom.getAttrib(elm, '_mce_new')) {
+				if (SXE.inst.dom.getAttrib(elm, 'data-mce-new')) {
 					elm.id = '';
 					elm.setAttribute('id', '');
 					elm.removeAttribute('id');
-					elm.removeAttribute('_mce_new');
+					elm.removeAttribute('data-mce-new');
 
 					setAllCommonAttribs(elm);
 				}
@@ -186,7 +185,6 @@ SXE.removeElement = function(element_name){
 	element_name = element_name.toLowerCase();
 	elm = SXE.inst.dom.getParent(SXE.focusElement, element_name.toUpperCase());
 	if(elm && elm.nodeName.toUpperCase() == element_name.toUpperCase()){
-		tinyMCEPopup.execCommand('mceBeginUndoLevel');
 		tinyMCE.execCommand('mceRemoveNode', false, elm);
 		SXE.inst.nodeChanged();
 		tinyMCEPopup.execCommand('mceEndUndoLevel');
@@ -226,6 +224,6 @@ function insertInlineElement(en) {
 	ed.getDoc().execCommand('FontName', false, 'mceinline');
 	tinymce.each(dom.select('span,font'), function(n) {
 		if (n.style.fontFamily == 'mceinline' || n.face == 'mceinline')
-			dom.replace(dom.create(en, {_mce_new : 1}), n, 1);
+			dom.replace(dom.create(en, {'data-mce-new' : 1}), n, 1);
 	});
 }
diff --git a/plugins/TinyMCE/js/plugins/xhtmlxtras/js/ins.js b/plugins/TinyMCE/js/plugins/xhtmlxtras/js/ins.js
index 3774f0a184..c4addfb01d 100644
--- a/plugins/TinyMCE/js/plugins/xhtmlxtras/js/ins.js
+++ b/plugins/TinyMCE/js/plugins/xhtmlxtras/js/ins.js
@@ -21,16 +21,17 @@ function setElementAttribs(elm) {
 	setAllCommonAttribs(elm);
 	setAttrib(elm, 'datetime');
 	setAttrib(elm, 'cite');
+	elm.removeAttribute('data-mce-new');
 }
 
 function insertIns() {
 	var elm = tinyMCEPopup.editor.dom.getParent(SXE.focusElement, 'INS');
-	tinyMCEPopup.execCommand('mceBeginUndoLevel');
+
 	if (elm == null) {
 		var s = SXE.inst.selection.getContent();
 		if(s.length > 0) {
-			insertInlineElement('INS');
-			var elementArray = tinymce.grep(SXE.inst.dom.select('ins'), function(n) {return n.id == '#sxe_temp_ins#';});
+			insertInlineElement('ins');
+			var elementArray = SXE.inst.dom.select('ins[data-mce-new]');
 			for (var i=0; i<elementArray.length; i++) {
 				var elm = elementArray[i];
 				setElementAttribs(elm);
@@ -49,14 +50,4 @@ function removeIns() {
 	tinyMCEPopup.close();
 }
 
-function insertInlineElement(en) {
-	var ed = tinyMCEPopup.editor, dom = ed.dom;
-
-	ed.getDoc().execCommand('FontName', false, 'mceinline');
-	tinymce.each(dom.select(tinymce.isWebKit ? 'span' : 'font'), function(n) {
-		if (n.style.fontFamily == 'mceinline' || n.face == 'mceinline')
-			dom.replace(dom.create(en), n, 1);
-	});
-}
-
 tinyMCEPopup.onInit.add(init);
diff --git a/plugins/TinyMCE/js/themes/advanced/about.htm b/plugins/TinyMCE/js/themes/advanced/about.htm
index 267f837eb1..7a97cb7154 100644
--- a/plugins/TinyMCE/js/themes/advanced/about.htm
+++ b/plugins/TinyMCE/js/themes/advanced/about.htm
@@ -9,9 +9,9 @@
 <body id="about" style="display: none">
 		<div class="tabs">
 			<ul>
-				<li id="general_tab" class="current"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{#advanced_dlg.about_general}</a></span></li>
-				<li id="help_tab" style="display:none"><span><a href="javascript:mcTabs.displayTab('help_tab','help_panel');" onmousedown="return false;">{#advanced_dlg.about_help}</a></span></li>
-				<li id="plugins_tab"><span><a href="javascript:mcTabs.displayTab('plugins_tab','plugins_panel');" onmousedown="return false;">{#advanced_dlg.about_plugins}</a></span></li>
+				<li id="general_tab" class="current" aria-controls="general_panel"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{#advanced_dlg.about_general}</a></span></li>
+				<li id="help_tab" style="display:none" aria-hidden="true" aria-controls="help_panel"><span><a href="javascript:mcTabs.displayTab('help_tab','help_panel');" onmousedown="return false;">{#advanced_dlg.about_help}</a></span></li>
+				<li id="plugins_tab" aria-controls="plugins_panel"><span><a href="javascript:mcTabs.displayTab('plugins_tab','plugins_panel');" onmousedown="return false;">{#advanced_dlg.about_plugins}</a></span></li>
 			</ul>
 		</div>
 
@@ -26,8 +26,6 @@
 
 				<div id="buttoncontainer">
 					<a href="http://www.moxiecode.com" target="_blank"><img src="http://tinymce.moxiecode.com/images/gotmoxie.png" alt="Got Moxie?" border="0" /></a>
-					<a href="http://sourceforge.net/projects/tinymce/" target="_blank"><img src="http://sourceforge.net/sflogo.php?group_id=103281" alt="Hosted By Sourceforge" border="0" /></a>
-					<a href="http://www.freshmeat.net/projects/tinymce" target="_blank"><img src="http://tinymce.moxiecode.com/images/fm.gif" alt="Also on freshmeat" border="0" /></a>
 				</div>
 			</div>
 
diff --git a/plugins/TinyMCE/js/themes/advanced/anchor.htm b/plugins/TinyMCE/js/themes/advanced/anchor.htm
index 2bc63fcfdc..75c93b799b 100644
--- a/plugins/TinyMCE/js/themes/advanced/anchor.htm
+++ b/plugins/TinyMCE/js/themes/advanced/anchor.htm
@@ -5,15 +5,15 @@
 	<script type="text/javascript" src="../../tiny_mce_popup.js"></script>
 	<script type="text/javascript" src="js/anchor.js"></script>
 </head>
-<body style="display: none">
+<body style="display: none" role="application" aria-labelledby="app_title">
 <form onsubmit="AnchorDialog.update();return false;" action="#">
-	<table border="0" cellpadding="4" cellspacing="0">
+	<table border="0" cellpadding="4" cellspacing="0" role="presentation">
 		<tr>
-			<td colspan="2" class="title">{#advanced_dlg.anchor_title}</td>
+			<td colspan="2" class="title" id="app_title">{#advanced_dlg.anchor_title}</td>
 		</tr>
 		<tr>
-			<td class="nowrap">{#advanced_dlg.anchor_name}:</td>
-			<td><input name="anchorName" type="text" class="mceFocus" id="anchorName" value="" style="width: 200px" /></td>
+			<td class="nowrap"><label for="anchorName">{#advanced_dlg.anchor_name}:</label></td>
+			<td><input name="anchorName" type="text" class="mceFocus" id="anchorName" value="" style="width: 200px" aria-required="true" /></td>
 		</tr>
 	</table>
 
diff --git a/plugins/TinyMCE/js/themes/advanced/charmap.htm b/plugins/TinyMCE/js/themes/advanced/charmap.htm
index 3991b8141b..2c3b3f27bd 100644
--- a/plugins/TinyMCE/js/themes/advanced/charmap.htm
+++ b/plugins/TinyMCE/js/themes/advanced/charmap.htm
@@ -6,47 +6,46 @@
 	<script type="text/javascript" src="js/charmap.js"></script>
 </head>
 <body id="charmap" style="display:none">
-<table align="center" border="0" cellspacing="0" cellpadding="2">
-    <tr>
-        <td colspan="2" class="title">{#advanced_dlg.charmap_title}</td>
-    </tr>
-    <tr>
-        <td id="charmapView" rowspan="2" align="left" valign="top">
+<table align="center" border="0" cellspacing="0" cellpadding="2" role="presentation">
+	<tr>
+		<td colspan="2" class="title" ><label for="charmapView" id="charmap_label">{#advanced_dlg.charmap_title}</label></td>
+	</tr>
+	<tr>
+		<td id="charmapView" rowspan="2" align="left" valign="top">
 			<!-- Chars will be rendered here -->
-        </td>
-        <td width="100" align="center" valign="top">
-            <table border="0" cellpadding="0" cellspacing="0" width="100" style="height:100px">
-                <tr>
-                    <td id="codeV">&nbsp;</td>
-                </tr>
-                <tr>
-                    <td id="codeN">&nbsp;</td>
-                </tr>
-            </table>
-        </td>
-    </tr>
-    <tr>
-        <td valign="bottom" style="padding-bottom: 3px;">
-            <table width="100" align="center" border="0" cellpadding="2" cellspacing="0">
-                <tr>
-                    <td align="center" style="border-left: 1px solid #666699; border-top: 1px solid #666699; border-right: 1px solid #666699;">HTML-Code</td>
-                </tr>
-                <tr>
-                    <td style="font-size: 16px; font-weight: bold; border-left: 1px solid #666699; border-bottom: 1px solid #666699; border-right: 1px solid #666699;" id="codeA" align="center">&nbsp;</td>
-                </tr>
-                <tr>
-                    <td style="font-size: 1px;">&nbsp;</td>
-                </tr>
-                <tr>
-                    <td align="center" style="border-left: 1px solid #666699; border-top: 1px solid #666699; border-right: 1px solid #666699;">NUM-Code</td>
-                </tr>
-                <tr>
-                    <td style="font-size: 16px; font-weight: bold; border-left: 1px solid #666699; border-bottom: 1px solid #666699; border-right: 1px solid #666699;" id="codeB" align="center">&nbsp;</td>
-                </tr>
-            </table>
-        </td>
-    </tr>
+		</td>
+		<td width="100" align="center" valign="top">
+			<table border="0" cellpadding="0" cellspacing="0" width="100" style="height:100px" role="presentation">
+				<tr>
+					<td id="codeV">&nbsp;</td>
+				</tr>
+				<tr>
+					<td id="codeN">&nbsp;</td>
+				</tr>
+			</table>
+		</td>
+	</tr>
+	<tr>
+		<td valign="bottom" style="padding-bottom: 3px;">
+			<table width="100" align="center" border="0" cellpadding="2" cellspacing="0" role="presentation">
+				<tr>
+					<td align="center" style="border-left: 1px solid #666699; border-top: 1px solid #666699; border-right: 1px solid #666699;"><label for="codeA">HTML-Code</label></td>
+				</tr>
+				<tr>
+					<td style="font-size: 16px; font-weight: bold; border-left: 1px solid #666699; border-bottom: 1px solid #666699; border-right: 1px solid #666699;" id="codeA" align="center">&nbsp;</td>
+				</tr>
+				<tr>
+					<td style="font-size: 1px;">&nbsp;</td>
+				</tr>
+				<tr>
+					<td align="center" style="border-left: 1px solid #666699; border-top: 1px solid #666699; border-right: 1px solid #666699;"><label for="codeB">NUM-Code</label></td>
+				</tr>
+				<tr>
+					<td style="font-size: 16px; font-weight: bold; border-left: 1px solid #666699; border-bottom: 1px solid #666699; border-right: 1px solid #666699;" id="codeB" align="center">&nbsp;</td>
+				</tr>
+			</table>
+		</td>
+	</tr>
 </table>
-
 </body>
 </html>
diff --git a/plugins/TinyMCE/js/themes/advanced/color_picker.htm b/plugins/TinyMCE/js/themes/advanced/color_picker.htm
index 096e7550c3..ad1bb0f6cc 100644
--- a/plugins/TinyMCE/js/themes/advanced/color_picker.htm
+++ b/plugins/TinyMCE/js/themes/advanced/color_picker.htm
@@ -6,13 +6,14 @@
 	<script type="text/javascript" src="../../utils/mctabs.js"></script>
 	<script type="text/javascript" src="js/color_picker.js"></script>
 </head>
-<body id="colorpicker" style="display: none">
+<body id="colorpicker" style="display: none" role="application" aria-labelledby="app_label">
+	<span class="mceVoiceLabel" id="app_label" style="display:none;">{#advanced_dlg.colorpicker_title}</span>
 <form onsubmit="insertAction();return false" action="#">
 	<div class="tabs">
 		<ul>
-			<li id="picker_tab" class="current"><span><a href="javascript:mcTabs.displayTab('picker_tab','picker_panel');" onmousedown="return false;">{#advanced_dlg.colorpicker_picker_tab}</a></span></li>
-			<li id="rgb_tab"><span><a href="javascript:;" onclick="generateWebColors();mcTabs.displayTab('rgb_tab','rgb_panel');" onmousedown="return false;">{#advanced_dlg.colorpicker_palette_tab}</a></span></li>
-			<li id="named_tab"><span><a  href="javascript:;" onclick="generateNamedColors();javascript:mcTabs.displayTab('named_tab','named_panel');" onmousedown="return false;">{#advanced_dlg.colorpicker_named_tab}</a></span></li>
+			<li id="picker_tab" aria-controls="picker_panel" class="current"><span><a href="javascript:mcTabs.displayTab('picker_tab','picker_panel');" onmousedown="return false;">{#advanced_dlg.colorpicker_picker_tab}</a></span></li>
+			<li id="rgb_tab" aria-controls="rgb_panel"><span><a href="javascript:;" onclick="mcTabs.displayTab('rgb_tab','rgb_panel');" onmousedown="return false;">{#advanced_dlg.colorpicker_palette_tab}</a></span></li>
+			<li id="named_tab" aria-controls="named_panel"><span><a  href="javascript:;" onclick="javascript:mcTabs.displayTab('named_tab','named_panel');" onmousedown="return false;">{#advanced_dlg.colorpicker_named_tab}</a></span></li>
 		</ul>
 	</div>
 
@@ -34,7 +35,7 @@
 
 		<div id="rgb_panel" class="panel">
 			<fieldset>
-				<legend>{#advanced_dlg.colorpicker_palette_title}</legend>
+				<legend id="webcolors_title">{#advanced_dlg.colorpicker_palette_title}</legend>
 				<div id="webcolors">
 					<!-- Gets filled with web safe colors-->
 				</div>
@@ -44,9 +45,9 @@
 		</div>
 
 		<div id="named_panel" class="panel">
-			<fieldset>
-				<legend>{#advanced_dlg.colorpicker_named_title}</legend>
-				<div id="namedcolors">
+			<fieldset id="named_picker_label">
+				<legend id="named_title">{#advanced_dlg.colorpicker_named_title}</legend>
+				<div id="namedcolors" role="listbox" tabindex="0" aria-labelledby="named_picker_label">
 					<!-- Gets filled with named colors-->
 				</div>
 
@@ -65,7 +66,7 @@
 		<div id="preview"></div>
 
 		<div id="previewblock">
-			<label for="color">{#advanced_dlg.colorpicker_color}</label> <input id="color" type="text" size="8" maxlength="8" class="text mceFocus" />
+			<label for="color">{#advanced_dlg.colorpicker_color}</label> <input id="color" type="text" size="8" class="text mceFocus" aria-required="true" />
 		</div>
 	</div>
 </form>
diff --git a/plugins/TinyMCE/js/themes/advanced/editor_template.js b/plugins/TinyMCE/js/themes/advanced/editor_template.js
index 4c433127f9..57e7184a83 100644
--- a/plugins/TinyMCE/js/themes/advanced/editor_template.js
+++ b/plugins/TinyMCE/js/themes/advanced/editor_template.js
@@ -1 +1 @@
-(function(e){var d=e.DOM,b=e.dom.Event,h=e.extend,f=e.each,a=e.util.Cookie,g,c=e.explode;e.ThemeManager.requireLangPack("advanced");e.create("tinymce.themes.AdvancedTheme",{sizes:[8,10,12,14,18,24,36],controls:{bold:["bold_desc","Bold"],italic:["italic_desc","Italic"],underline:["underline_desc","Underline"],strikethrough:["striketrough_desc","Strikethrough"],justifyleft:["justifyleft_desc","JustifyLeft"],justifycenter:["justifycenter_desc","JustifyCenter"],justifyright:["justifyright_desc","JustifyRight"],justifyfull:["justifyfull_desc","JustifyFull"],bullist:["bullist_desc","InsertUnorderedList"],numlist:["numlist_desc","InsertOrderedList"],outdent:["outdent_desc","Outdent"],indent:["indent_desc","Indent"],cut:["cut_desc","Cut"],copy:["copy_desc","Copy"],paste:["paste_desc","Paste"],undo:["undo_desc","Undo"],redo:["redo_desc","Redo"],link:["link_desc","mceLink"],unlink:["unlink_desc","unlink"],image:["image_desc","mceImage"],cleanup:["cleanup_desc","mceCleanup"],help:["help_desc","mceHelp"],code:["code_desc","mceCodeEditor"],hr:["hr_desc","InsertHorizontalRule"],removeformat:["removeformat_desc","RemoveFormat"],sub:["sub_desc","subscript"],sup:["sup_desc","superscript"],forecolor:["forecolor_desc","ForeColor"],forecolorpicker:["forecolor_desc","mceForeColor"],backcolor:["backcolor_desc","HiliteColor"],backcolorpicker:["backcolor_desc","mceBackColor"],charmap:["charmap_desc","mceCharMap"],visualaid:["visualaid_desc","mceToggleVisualAid"],anchor:["anchor_desc","mceInsertAnchor"],newdocument:["newdocument_desc","mceNewDocument"],blockquote:["blockquote_desc","mceBlockQuote"]},stateControls:["bold","italic","underline","strikethrough","bullist","numlist","justifyleft","justifycenter","justifyright","justifyfull","sub","sup","blockquote"],init:function(j,k){var l=this,m,i,n;l.editor=j;l.url=k;l.onResolveName=new e.util.Dispatcher(this);l.settings=m=h({theme_advanced_path:true,theme_advanced_toolbar_location:"bottom",theme_advanced_buttons1:"bold,italic,underline,strikethrough,|,justifyleft,justifycenter,justifyright,justifyfull,|,styleselect,formatselect",theme_advanced_buttons2:"bullist,numlist,|,outdent,indent,|,undo,redo,|,link,unlink,anchor,image,cleanup,help,code",theme_advanced_buttons3:"hr,removeformat,visualaid,|,sub,sup,|,charmap",theme_advanced_blockformats:"p,address,pre,h1,h2,h3,h4,h5,h6",theme_advanced_toolbar_align:"center",theme_advanced_fonts:"Andale Mono=andale mono,times;Arial=arial,helvetica,sans-serif;Arial Black=arial black,avant garde;Book Antiqua=book antiqua,palatino;Comic Sans MS=comic sans ms,sans-serif;Courier New=courier new,courier;Georgia=georgia,palatino;Helvetica=helvetica;Impact=impact,chicago;Symbol=symbol;Tahoma=tahoma,arial,helvetica,sans-serif;Terminal=terminal,monaco;Times New Roman=times new roman,times;Trebuchet MS=trebuchet ms,geneva;Verdana=verdana,geneva;Webdings=webdings;Wingdings=wingdings,zapf dingbats",theme_advanced_more_colors:1,theme_advanced_row_height:23,theme_advanced_resize_horizontal:1,theme_advanced_resizing_use_cookie:1,theme_advanced_font_sizes:"1,2,3,4,5,6,7",readonly:j.settings.readonly},j.settings);if(!m.font_size_style_values){m.font_size_style_values="8pt,10pt,12pt,14pt,18pt,24pt,36pt"}if(e.is(m.theme_advanced_font_sizes,"string")){m.font_size_style_values=e.explode(m.font_size_style_values);m.font_size_classes=e.explode(m.font_size_classes||"");n={};j.settings.theme_advanced_font_sizes=m.theme_advanced_font_sizes;f(j.getParam("theme_advanced_font_sizes","","hash"),function(q,p){var o;if(p==q&&q>=1&&q<=7){p=q+" ("+l.sizes[q-1]+"pt)";o=m.font_size_classes[q-1];q=m.font_size_style_values[q-1]||(l.sizes[q-1]+"pt")}if(/^\s*\./.test(q)){o=q.replace(/\./g,"")}n[p]=o?{"class":o}:{fontSize:q}});m.theme_advanced_font_sizes=n}if((i=m.theme_advanced_path_location)&&i!="none"){m.theme_advanced_statusbar_location=m.theme_advanced_path_location}if(m.theme_advanced_statusbar_location=="none"){m.theme_advanced_statusbar_location=0}j.onInit.add(function(){if(!j.settings.readonly){j.onNodeChange.add(l._nodeChanged,l)}if(j.settings.content_css!==false){j.dom.loadCSS(j.baseURI.toAbsolute("themes/advanced/skins/"+j.settings.skin+"/content.css"))}});j.onSetProgressState.add(function(q,o,r){var s,t=q.id,p;if(o){l.progressTimer=setTimeout(function(){s=q.getContainer();s=s.insertBefore(d.create("DIV",{style:"position:relative"}),s.firstChild);p=d.get(q.id+"_tbl");d.add(s,"div",{id:t+"_blocker","class":"mceBlocker",style:{width:p.clientWidth+2,height:p.clientHeight+2}});d.add(s,"div",{id:t+"_progress","class":"mceProgress",style:{left:p.clientWidth/2,top:p.clientHeight/2}})},r||0)}else{d.remove(t+"_blocker");d.remove(t+"_progress");clearTimeout(l.progressTimer)}});d.loadCSS(m.editor_css?j.documentBaseURI.toAbsolute(m.editor_css):k+"/skins/"+j.settings.skin+"/ui.css");if(m.skin_variant){d.loadCSS(k+"/skins/"+j.settings.skin+"/ui_"+m.skin_variant+".css")}},createControl:function(l,i){var j,k;if(k=i.createControl(l)){return k}switch(l){case"styleselect":return this._createStyleSelect();case"formatselect":return this._createBlockFormats();case"fontselect":return this._createFontSelect();case"fontsizeselect":return this._createFontSizeSelect();case"forecolor":return this._createForeColorMenu();case"backcolor":return this._createBackColorMenu()}if((j=this.controls[l])){return i.createButton(l,{title:"advanced."+j[0],cmd:j[1],ui:j[2],value:j[3]})}},execCommand:function(k,j,l){var i=this["_"+k];if(i){i.call(this,j,l);return true}return false},_importClasses:function(k){var i=this.editor,j=i.controlManager.get("styleselect");if(j.getLength()==0){f(i.dom.getClasses(),function(n,l){var m="style_"+l;i.formatter.register(m,{inline:"span",attributes:{"class":n["class"]},selector:"*"});j.add(n["class"],m)})}},_createStyleSelect:function(m){var k=this,i=k.editor,j=i.controlManager,l;l=j.createListBox("styleselect",{title:"advanced.style_select",onselect:function(o){var p,n=[];f(l.items,function(q){n.push(q.value)});i.focus();i.undoManager.add();p=i.formatter.matchAll(n);if(!o||p[0]==o){i.formatter.remove(p[0])}else{i.formatter.apply(o)}i.undoManager.add();i.nodeChanged();return false}});i.onInit.add(function(){var o=0,n=i.getParam("style_formats");if(n){f(n,function(p){var q,r=0;f(p,function(){r++});if(r>1){q=p.name=p.name||"style_"+(o++);i.formatter.register(q,p);l.add(p.title,q)}else{l.add(p.title)}})}else{f(i.getParam("theme_advanced_styles","","hash"),function(r,q){var p;if(r){p="style_"+(o++);i.formatter.register(p,{inline:"span",classes:r,selector:"*"});l.add(k.editor.translate(q),p)}})}});if(l.getLength()==0){l.onPostRender.add(function(o,p){if(!l.NativeListBox){b.add(p.id+"_text","focus",k._importClasses,k);b.add(p.id+"_text","mousedown",k._importClasses,k);b.add(p.id+"_open","focus",k._importClasses,k);b.add(p.id+"_open","mousedown",k._importClasses,k)}else{b.add(p.id,"focus",k._importClasses,k)}})}return l},_createFontSelect:function(){var k,j=this,i=j.editor;k=i.controlManager.createListBox("fontselect",{title:"advanced.fontdefault",onselect:function(l){var m=k.items[k.selectedIndex];if(!l&&m){i.execCommand("FontName",false,m.value);return}i.execCommand("FontName",false,l);k.select(function(n){return l==n});return false}});if(k){f(i.getParam("theme_advanced_fonts",j.settings.theme_advanced_fonts,"hash"),function(m,l){k.add(i.translate(l),m,{style:m.indexOf("dings")==-1?"font-family:"+m:""})})}return k},_createFontSizeSelect:function(){var m=this,k=m.editor,n,l=0,j=[];n=k.controlManager.createListBox("fontsizeselect",{title:"advanced.font_size",onselect:function(i){var o=n.items[n.selectedIndex];if(!i&&o){o=o.value;if(o["class"]){k.formatter.toggle("fontsize_class",{value:o["class"]});k.undoManager.add();k.nodeChanged()}else{k.execCommand("FontSize",false,o.fontSize)}return}if(i["class"]){k.focus();k.undoManager.add();k.formatter.toggle("fontsize_class",{value:i["class"]});k.undoManager.add();k.nodeChanged()}else{k.execCommand("FontSize",false,i.fontSize)}n.select(function(p){return i==p});return false}});if(n){f(m.settings.theme_advanced_font_sizes,function(o,i){var p=o.fontSize;if(p>=1&&p<=7){p=m.sizes[parseInt(p)-1]+"pt"}n.add(i,o,{style:"font-size:"+p,"class":"mceFontSize"+(l++)+(" "+(o["class"]||""))})})}return n},_createBlockFormats:function(){var k,i={p:"advanced.paragraph",address:"advanced.address",pre:"advanced.pre",h1:"advanced.h1",h2:"advanced.h2",h3:"advanced.h3",h4:"advanced.h4",h5:"advanced.h5",h6:"advanced.h6",div:"advanced.div",blockquote:"advanced.blockquote",code:"advanced.code",dt:"advanced.dt",dd:"advanced.dd",samp:"advanced.samp"},j=this;k=j.editor.controlManager.createListBox("formatselect",{title:"advanced.block",cmd:"FormatBlock"});if(k){f(j.editor.getParam("theme_advanced_blockformats",j.settings.theme_advanced_blockformats,"hash"),function(m,l){k.add(j.editor.translate(l!=m?l:i[m]),m,{"class":"mce_formatPreview mce_"+m})})}return k},_createForeColorMenu:function(){var m,j=this,k=j.settings,l={},i;if(k.theme_advanced_more_colors){l.more_colors_func=function(){j._mceColorPicker(0,{color:m.value,func:function(n){m.setColor(n)}})}}if(i=k.theme_advanced_text_colors){l.colors=i}if(k.theme_advanced_default_foreground_color){l.default_color=k.theme_advanced_default_foreground_color}l.title="advanced.forecolor_desc";l.cmd="ForeColor";l.scope=this;m=j.editor.controlManager.createColorSplitButton("forecolor",l);return m},_createBackColorMenu:function(){var m,j=this,k=j.settings,l={},i;if(k.theme_advanced_more_colors){l.more_colors_func=function(){j._mceColorPicker(0,{color:m.value,func:function(n){m.setColor(n)}})}}if(i=k.theme_advanced_background_colors){l.colors=i}if(k.theme_advanced_default_background_color){l.default_color=k.theme_advanced_default_background_color}l.title="advanced.backcolor_desc";l.cmd="HiliteColor";l.scope=this;m=j.editor.controlManager.createColorSplitButton("backcolor",l);return m},renderUI:function(k){var m,l,q,v=this,r=v.editor,w=v.settings,u,j,i;m=j=d.create("span",{id:r.id+"_parent","class":"mceEditor "+r.settings.skin+"Skin"+(w.skin_variant?" "+r.settings.skin+"Skin"+v._ufirst(w.skin_variant):"")});if(!d.boxModel){m=d.add(m,"div",{"class":"mceOldBoxModel"})}m=u=d.add(m,"table",{id:r.id+"_tbl","class":"mceLayout",cellSpacing:0,cellPadding:0});m=q=d.add(m,"tbody");switch((w.theme_advanced_layout_manager||"").toLowerCase()){case"rowlayout":l=v._rowLayout(w,q,k);break;case"customlayout":l=r.execCallback("theme_advanced_custom_layout",w,q,k,j);break;default:l=v._simpleLayout(w,q,k,j)}m=k.targetNode;i=d.stdMode?u.getElementsByTagName("tr"):u.rows;d.addClass(i[0],"mceFirst");d.addClass(i[i.length-1],"mceLast");f(d.select("tr",q),function(o){d.addClass(o.firstChild,"mceFirst");d.addClass(o.childNodes[o.childNodes.length-1],"mceLast")});if(d.get(w.theme_advanced_toolbar_container)){d.get(w.theme_advanced_toolbar_container).appendChild(j)}else{d.insertAfter(j,m)}b.add(r.id+"_path_row","click",function(n){n=n.target;if(n.nodeName=="A"){v._sel(n.className.replace(/^.*mcePath_([0-9]+).*$/,"$1"));return b.cancel(n)}});if(!r.getParam("accessibility_focus")){b.add(d.add(j,"a",{href:"#"},"<!-- IE -->"),"focus",function(){tinyMCE.get(r.id).focus()})}if(w.theme_advanced_toolbar_location=="external"){k.deltaHeight=0}v.deltaHeight=k.deltaHeight;k.targetNode=null;return{iframeContainer:l,editorContainer:r.id+"_parent",sizeContainer:u,deltaHeight:k.deltaHeight}},getInfo:function(){return{longname:"Advanced theme",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",version:e.majorVersion+"."+e.minorVersion}},resizeBy:function(i,j){var k=d.get(this.editor.id+"_tbl");this.resizeTo(k.clientWidth+i,k.clientHeight+j)},resizeTo:function(i,l){var j=this.editor,k=this.settings,m=d.get(j.id+"_tbl"),n=d.get(j.id+"_ifr");i=Math.max(k.theme_advanced_resizing_min_width||100,i);l=Math.max(k.theme_advanced_resizing_min_height||100,l);i=Math.min(k.theme_advanced_resizing_max_width||65535,i);l=Math.min(k.theme_advanced_resizing_max_height||65535,l);d.setStyle(m,"height","");d.setStyle(n,"height",l);if(k.theme_advanced_resize_horizontal){d.setStyle(m,"width","");d.setStyle(n,"width",i);if(i<m.clientWidth){d.setStyle(n,"width",m.clientWidth)}}},destroy:function(){var i=this.editor.id;b.clear(i+"_resize");b.clear(i+"_path_row");b.clear(i+"_external_close")},_simpleLayout:function(y,r,k,i){var x=this,u=x.editor,v=y.theme_advanced_toolbar_location,m=y.theme_advanced_statusbar_location,l,j,q,w;if(y.readonly){l=d.add(r,"tr");l=j=d.add(l,"td",{"class":"mceIframeContainer"});return j}if(v=="top"){x._addToolbars(r,k)}if(v=="external"){l=w=d.create("div",{style:"position:relative"});l=d.add(l,"div",{id:u.id+"_external","class":"mceExternalToolbar"});d.add(l,"a",{id:u.id+"_external_close",href:"javascript:;","class":"mceExternalClose"});l=d.add(l,"table",{id:u.id+"_tblext",cellSpacing:0,cellPadding:0});q=d.add(l,"tbody");if(i.firstChild.className=="mceOldBoxModel"){i.firstChild.appendChild(w)}else{i.insertBefore(w,i.firstChild)}x._addToolbars(q,k);u.onMouseUp.add(function(){var o=d.get(u.id+"_external");d.show(o);d.hide(g);var n=b.add(u.id+"_external_close","click",function(){d.hide(u.id+"_external");b.remove(u.id+"_external_close","click",n)});d.show(o);d.setStyle(o,"top",0-d.getRect(u.id+"_tblext").h-1);d.hide(o);d.show(o);o.style.filter="";g=u.id+"_external";o=null})}if(m=="top"){x._addStatusBar(r,k)}if(!y.theme_advanced_toolbar_container){l=d.add(r,"tr");l=j=d.add(l,"td",{"class":"mceIframeContainer"})}if(v=="bottom"){x._addToolbars(r,k)}if(m=="bottom"){x._addStatusBar(r,k)}return j},_rowLayout:function(w,m,k){var v=this,p=v.editor,u,x,i=p.controlManager,l,j,r,q;u=w.theme_advanced_containers_default_class||"";x=w.theme_advanced_containers_default_align||"center";f(c(w.theme_advanced_containers||""),function(s,o){var n=w["theme_advanced_container_"+s]||"";switch(n.toLowerCase()){case"mceeditor":l=d.add(m,"tr");l=j=d.add(l,"td",{"class":"mceIframeContainer"});break;case"mceelementpath":v._addStatusBar(m,k);break;default:q=(w["theme_advanced_container_"+s+"_align"]||x).toLowerCase();q="mce"+v._ufirst(q);l=d.add(d.add(m,"tr"),"td",{"class":"mceToolbar "+(w["theme_advanced_container_"+s+"_class"]||u)+" "+q||x});r=i.createToolbar("toolbar"+o);v._addControls(n,r);d.setHTML(l,r.renderHTML());k.deltaHeight-=w.theme_advanced_row_height}});return j},_addControls:function(j,i){var k=this,l=k.settings,m,n=k.editor.controlManager;if(l.theme_advanced_disable&&!k._disabled){m={};f(c(l.theme_advanced_disable),function(o){m[o]=1});k._disabled=m}else{m=k._disabled}f(c(j),function(p){var o;if(m&&m[p]){return}if(p=="tablecontrols"){f(["table","|","row_props","cell_props","|","row_before","row_after","delete_row","|","col_before","col_after","delete_col","|","split_cells","merge_cells"],function(q){q=k.createControl(q,n);if(q){i.add(q)}});return}o=k.createControl(p,n);if(o){i.add(o)}})},_addToolbars:function(w,k){var z=this,p,m,r=z.editor,A=z.settings,y,j=r.controlManager,u,l,q=[],x;x=A.theme_advanced_toolbar_align.toLowerCase();x="mce"+z._ufirst(x);l=d.add(d.add(w,"tr"),"td",{"class":"mceToolbar "+x});if(!r.getParam("accessibility_focus")){q.push(d.createHTML("a",{href:"#",onfocus:"tinyMCE.get('"+r.id+"').focus();"},"<!-- IE -->"))}q.push(d.createHTML("a",{href:"#",accesskey:"q",title:r.getLang("advanced.toolbar_focus")},"<!-- IE -->"));for(p=1;(y=A["theme_advanced_buttons"+p]);p++){m=j.createToolbar("toolbar"+p,{"class":"mceToolbarRow"+p});if(A["theme_advanced_buttons"+p+"_add"]){y+=","+A["theme_advanced_buttons"+p+"_add"]}if(A["theme_advanced_buttons"+p+"_add_before"]){y=A["theme_advanced_buttons"+p+"_add_before"]+","+y}z._addControls(y,m);q.push(m.renderHTML());k.deltaHeight-=A.theme_advanced_row_height}q.push(d.createHTML("a",{href:"#",accesskey:"z",title:r.getLang("advanced.toolbar_focus"),onfocus:"tinyMCE.getInstanceById('"+r.id+"').focus();"},"<!-- IE -->"));d.setHTML(l,q.join(""))},_addStatusBar:function(m,j){var k,v=this,p=v.editor,w=v.settings,i,q,u,l;k=d.add(m,"tr");k=l=d.add(k,"td",{"class":"mceStatusbar"});k=d.add(k,"div",{id:p.id+"_path_row"},w.theme_advanced_path?p.translate("advanced.path")+": ":"&#160;");d.add(k,"a",{href:"#",accesskey:"x"});if(w.theme_advanced_resizing){d.add(l,"a",{id:p.id+"_resize",href:"javascript:;",onclick:"return false;","class":"mceResize"});if(w.theme_advanced_resizing_use_cookie){p.onPostRender.add(function(){var n=a.getHash("TinyMCE_"+p.id+"_size"),r=d.get(p.id+"_tbl");if(!n){return}v.resizeTo(n.cw,n.ch)})}p.onPostRender.add(function(){b.add(p.id+"_resize","mousedown",function(D){var t,r,s,o,C,z,A,F,n,E,x;function y(G){n=A+(G.screenX-C);E=F+(G.screenY-z);v.resizeTo(n,E)}function B(G){b.remove(d.doc,"mousemove",t);b.remove(p.getDoc(),"mousemove",r);b.remove(d.doc,"mouseup",s);b.remove(p.getDoc(),"mouseup",o);if(w.theme_advanced_resizing_use_cookie){a.setHash("TinyMCE_"+p.id+"_size",{cw:n,ch:E})}}D.preventDefault();C=D.screenX;z=D.screenY;x=d.get(v.editor.id+"_ifr");A=n=x.clientWidth;F=E=x.clientHeight;t=b.add(d.doc,"mousemove",y);r=b.add(p.getDoc(),"mousemove",y);s=b.add(d.doc,"mouseup",B);o=b.add(p.getDoc(),"mouseup",B)})})}j.deltaHeight-=21;k=m=null},_nodeChanged:function(r,z,l,x,j){var C=this,i,y=0,B,u,D=C.settings,A,k,w,m,q;e.each(C.stateControls,function(n){z.setActive(n,r.queryCommandState(C.controls[n][1]))});function o(p){var s,n=j.parents,t=p;if(typeof(p)=="string"){t=function(v){return v.nodeName==p}}for(s=0;s<n.length;s++){if(t(n[s])){return n[s]}}}z.setActive("visualaid",r.hasVisual);z.setDisabled("undo",!r.undoManager.hasUndo()&&!r.typing);z.setDisabled("redo",!r.undoManager.hasRedo());z.setDisabled("outdent",!r.queryCommandState("Outdent"));i=o("A");if(u=z.get("link")){if(!i||!i.name){u.setDisabled(!i&&x);u.setActive(!!i)}}if(u=z.get("unlink")){u.setDisabled(!i&&x);u.setActive(!!i&&!i.name)}if(u=z.get("anchor")){u.setActive(!!i&&i.name)}i=o("IMG");if(u=z.get("image")){u.setActive(!!i&&l.className.indexOf("mceItem")==-1)}if(u=z.get("styleselect")){C._importClasses();m=[];f(u.items,function(n){m.push(n.value)});q=r.formatter.matchAll(m);u.select(q[0])}if(u=z.get("formatselect")){i=o(d.isBlock);if(i){u.select(i.nodeName.toLowerCase())}}o(function(p){if(p.nodeName==="SPAN"){if(!A&&p.className){A=p.className}if(!k&&p.style.fontSize){k=p.style.fontSize}if(!w&&p.style.fontFamily){w=p.style.fontFamily.replace(/[\"\']+/g,"").replace(/^([^,]+).*/,"$1").toLowerCase()}}return false});if(u=z.get("fontselect")){u.select(function(n){return n.replace(/^([^,]+).*/,"$1").toLowerCase()==w})}if(u=z.get("fontsizeselect")){if(D.theme_advanced_runtime_fontsize&&!k&&!A){k=r.dom.getStyle(l,"fontSize",true)}u.select(function(n){if(n.fontSize&&n.fontSize===k){return true}if(n["class"]&&n["class"]===A){return true}})}if(D.theme_advanced_path&&D.theme_advanced_statusbar_location){i=d.get(r.id+"_path")||d.add(r.id+"_path_row","span",{id:r.id+"_path"});d.setHTML(i,"");o(function(E){var p=E.nodeName.toLowerCase(),s,v,t="";if(E.nodeType!=1||E.nodeName==="BR"||(d.hasClass(E,"mceItemHidden")||d.hasClass(E,"mceItemRemoved"))){return}if(B=d.getAttrib(E,"mce_name")){p=B}if(e.isIE&&E.scopeName!=="HTML"){p=E.scopeName+":"+p}p=p.replace(/mce\:/g,"");switch(p){case"b":p="strong";break;case"i":p="em";break;case"img":if(B=d.getAttrib(E,"src")){t+="src: "+B+" "}break;case"a":if(B=d.getAttrib(E,"name")){t+="name: "+B+" ";p+="#"+B}if(B=d.getAttrib(E,"href")){t+="href: "+B+" "}break;case"font":if(B=d.getAttrib(E,"face")){t+="font: "+B+" "}if(B=d.getAttrib(E,"size")){t+="size: "+B+" "}if(B=d.getAttrib(E,"color")){t+="color: "+B+" "}break;case"span":if(B=d.getAttrib(E,"style")){t+="style: "+B+" "}break}if(B=d.getAttrib(E,"id")){t+="id: "+B+" "}if(B=E.className){B=B.replace(/\b\s*(webkit|mce|Apple-)\w+\s*\b/g,"");if(B){t+="class: "+B+" ";if(d.isBlock(E)||p=="img"||p=="span"){p+="."+B}}}p=p.replace(/(html:)/g,"");p={name:p,node:E,title:t};C.onResolveName.dispatch(C,p);t=p.title;p=p.name;v=d.create("a",{href:"javascript:;",onmousedown:"return false;",title:t,"class":"mcePath_"+(y++)},p);if(i.hasChildNodes()){i.insertBefore(d.doc.createTextNode(" \u00bb "),i.firstChild);i.insertBefore(v,i.firstChild)}else{i.appendChild(v)}},r.getBody())}},_sel:function(i){this.editor.execCommand("mceSelectNodeDepth",false,i)},_mceInsertAnchor:function(k,j){var i=this.editor;i.windowManager.open({url:e.baseURL+"/themes/advanced/anchor.htm",width:320+parseInt(i.getLang("advanced.anchor_delta_width",0)),height:90+parseInt(i.getLang("advanced.anchor_delta_height",0)),inline:true},{theme_url:this.url})},_mceCharMap:function(){var i=this.editor;i.windowManager.open({url:e.baseURL+"/themes/advanced/charmap.htm",width:550+parseInt(i.getLang("advanced.charmap_delta_width",0)),height:250+parseInt(i.getLang("advanced.charmap_delta_height",0)),inline:true},{theme_url:this.url})},_mceHelp:function(){var i=this.editor;i.windowManager.open({url:e.baseURL+"/themes/advanced/about.htm",width:480,height:380,inline:true},{theme_url:this.url})},_mceColorPicker:function(k,j){var i=this.editor;j=j||{};i.windowManager.open({url:e.baseURL+"/themes/advanced/color_picker.htm",width:375+parseInt(i.getLang("advanced.colorpicker_delta_width",0)),height:250+parseInt(i.getLang("advanced.colorpicker_delta_height",0)),close_previous:false,inline:true},{input_color:j.color,func:j.func,theme_url:this.url})},_mceCodeEditor:function(j,k){var i=this.editor;i.windowManager.open({url:e.baseURL+"/themes/advanced/source_editor.htm",width:parseInt(i.getParam("theme_advanced_source_editor_width",720)),height:parseInt(i.getParam("theme_advanced_source_editor_height",580)),inline:true,resizable:true,maximizable:true},{theme_url:this.url})},_mceImage:function(j,k){var i=this.editor;if(i.dom.getAttrib(i.selection.getNode(),"class").indexOf("mceItem")!=-1){return}i.windowManager.open({url:e.baseURL+"/themes/advanced/image.htm",width:355+parseInt(i.getLang("advanced.image_delta_width",0)),height:275+parseInt(i.getLang("advanced.image_delta_height",0)),inline:true},{theme_url:this.url})},_mceLink:function(j,k){var i=this.editor;i.windowManager.open({url:e.baseURL+"/themes/advanced/link.htm",width:310+parseInt(i.getLang("advanced.link_delta_width",0)),height:200+parseInt(i.getLang("advanced.link_delta_height",0)),inline:true},{theme_url:this.url})},_mceNewDocument:function(){var i=this.editor;i.windowManager.confirm("advanced.newdocument",function(j){if(j){i.execCommand("mceSetContent",false,"")}})},_mceForeColor:function(){var i=this;this._mceColorPicker(0,{color:i.fgColor,func:function(j){i.fgColor=j;i.editor.execCommand("ForeColor",false,j)}})},_mceBackColor:function(){var i=this;this._mceColorPicker(0,{color:i.bgColor,func:function(j){i.bgColor=j;i.editor.execCommand("HiliteColor",false,j)}})},_ufirst:function(i){return i.substring(0,1).toUpperCase()+i.substring(1)}});e.ThemeManager.add("advanced",e.themes.AdvancedTheme)}(tinymce));
\ No newline at end of file
+(function(e){var d=e.DOM,b=e.dom.Event,h=e.extend,f=e.each,a=e.util.Cookie,g,c=e.explode;e.ThemeManager.requireLangPack("advanced");e.create("tinymce.themes.AdvancedTheme",{sizes:[8,10,12,14,18,24,36],controls:{bold:["bold_desc","Bold"],italic:["italic_desc","Italic"],underline:["underline_desc","Underline"],strikethrough:["striketrough_desc","Strikethrough"],justifyleft:["justifyleft_desc","JustifyLeft"],justifycenter:["justifycenter_desc","JustifyCenter"],justifyright:["justifyright_desc","JustifyRight"],justifyfull:["justifyfull_desc","JustifyFull"],bullist:["bullist_desc","InsertUnorderedList"],numlist:["numlist_desc","InsertOrderedList"],outdent:["outdent_desc","Outdent"],indent:["indent_desc","Indent"],cut:["cut_desc","Cut"],copy:["copy_desc","Copy"],paste:["paste_desc","Paste"],undo:["undo_desc","Undo"],redo:["redo_desc","Redo"],link:["link_desc","mceLink"],unlink:["unlink_desc","unlink"],image:["image_desc","mceImage"],cleanup:["cleanup_desc","mceCleanup"],help:["help_desc","mceHelp"],code:["code_desc","mceCodeEditor"],hr:["hr_desc","InsertHorizontalRule"],removeformat:["removeformat_desc","RemoveFormat"],sub:["sub_desc","subscript"],sup:["sup_desc","superscript"],forecolor:["forecolor_desc","ForeColor"],forecolorpicker:["forecolor_desc","mceForeColor"],backcolor:["backcolor_desc","HiliteColor"],backcolorpicker:["backcolor_desc","mceBackColor"],charmap:["charmap_desc","mceCharMap"],visualaid:["visualaid_desc","mceToggleVisualAid"],anchor:["anchor_desc","mceInsertAnchor"],newdocument:["newdocument_desc","mceNewDocument"],blockquote:["blockquote_desc","mceBlockQuote"]},stateControls:["bold","italic","underline","strikethrough","bullist","numlist","justifyleft","justifycenter","justifyright","justifyfull","sub","sup","blockquote"],init:function(j,k){var l=this,m,i,n;l.editor=j;l.url=k;l.onResolveName=new e.util.Dispatcher(this);j.forcedHighContrastMode=j.settings.detect_highcontrast&&l._isHighContrast();j.settings.skin=j.forcedHighContrastMode?"highcontrast":j.settings.skin;l.settings=m=h({theme_advanced_path:true,theme_advanced_toolbar_location:"bottom",theme_advanced_buttons1:"bold,italic,underline,strikethrough,|,justifyleft,justifycenter,justifyright,justifyfull,|,styleselect,formatselect",theme_advanced_buttons2:"bullist,numlist,|,outdent,indent,|,undo,redo,|,link,unlink,anchor,image,cleanup,help,code",theme_advanced_buttons3:"hr,removeformat,visualaid,|,sub,sup,|,charmap",theme_advanced_blockformats:"p,address,pre,h1,h2,h3,h4,h5,h6",theme_advanced_toolbar_align:"center",theme_advanced_fonts:"Andale Mono=andale mono,times;Arial=arial,helvetica,sans-serif;Arial Black=arial black,avant garde;Book Antiqua=book antiqua,palatino;Comic Sans MS=comic sans ms,sans-serif;Courier New=courier new,courier;Georgia=georgia,palatino;Helvetica=helvetica;Impact=impact,chicago;Symbol=symbol;Tahoma=tahoma,arial,helvetica,sans-serif;Terminal=terminal,monaco;Times New Roman=times new roman,times;Trebuchet MS=trebuchet ms,geneva;Verdana=verdana,geneva;Webdings=webdings;Wingdings=wingdings,zapf dingbats",theme_advanced_more_colors:1,theme_advanced_row_height:23,theme_advanced_resize_horizontal:1,theme_advanced_resizing_use_cookie:1,theme_advanced_font_sizes:"1,2,3,4,5,6,7",theme_advanced_font_selector:"span",theme_advanced_show_current_color:0,readonly:j.settings.readonly},j.settings);if(!m.font_size_style_values){m.font_size_style_values="8pt,10pt,12pt,14pt,18pt,24pt,36pt"}if(e.is(m.theme_advanced_font_sizes,"string")){m.font_size_style_values=e.explode(m.font_size_style_values);m.font_size_classes=e.explode(m.font_size_classes||"");n={};j.settings.theme_advanced_font_sizes=m.theme_advanced_font_sizes;f(j.getParam("theme_advanced_font_sizes","","hash"),function(q,p){var o;if(p==q&&q>=1&&q<=7){p=q+" ("+l.sizes[q-1]+"pt)";o=m.font_size_classes[q-1];q=m.font_size_style_values[q-1]||(l.sizes[q-1]+"pt")}if(/^\s*\./.test(q)){o=q.replace(/\./g,"")}n[p]=o?{"class":o}:{fontSize:q}});m.theme_advanced_font_sizes=n}if((i=m.theme_advanced_path_location)&&i!="none"){m.theme_advanced_statusbar_location=m.theme_advanced_path_location}if(m.theme_advanced_statusbar_location=="none"){m.theme_advanced_statusbar_location=0}if(j.settings.content_css!==false){j.contentCSS.push(j.baseURI.toAbsolute(k+"/skins/"+j.settings.skin+"/content.css"))}j.onInit.add(function(){if(!j.settings.readonly){j.onNodeChange.add(l._nodeChanged,l);j.onKeyUp.add(l._updateUndoStatus,l);j.onMouseUp.add(l._updateUndoStatus,l);j.dom.bind(j.dom.getRoot(),"dragend",function(){l._updateUndoStatus(j)})}});j.onSetProgressState.add(function(q,o,r){var s,t=q.id,p;if(o){l.progressTimer=setTimeout(function(){s=q.getContainer();s=s.insertBefore(d.create("DIV",{style:"position:relative"}),s.firstChild);p=d.get(q.id+"_tbl");d.add(s,"div",{id:t+"_blocker","class":"mceBlocker",style:{width:p.clientWidth+2,height:p.clientHeight+2}});d.add(s,"div",{id:t+"_progress","class":"mceProgress",style:{left:p.clientWidth/2,top:p.clientHeight/2}})},r||0)}else{d.remove(t+"_blocker");d.remove(t+"_progress");clearTimeout(l.progressTimer)}});d.loadCSS(m.editor_css?j.documentBaseURI.toAbsolute(m.editor_css):k+"/skins/"+j.settings.skin+"/ui.css");if(m.skin_variant){d.loadCSS(k+"/skins/"+j.settings.skin+"/ui_"+m.skin_variant+".css")}},_isHighContrast:function(){var i,j=d.add(d.getRoot(),"div",{style:"background-color: rgb(171,239,86);"});i=(d.getStyle(j,"background-color",true)+"").toLowerCase().replace(/ /g,"");d.remove(j);return i!="rgb(171,239,86)"&&i!="#abef56"},createControl:function(l,i){var j,k;if(k=i.createControl(l)){return k}switch(l){case"styleselect":return this._createStyleSelect();case"formatselect":return this._createBlockFormats();case"fontselect":return this._createFontSelect();case"fontsizeselect":return this._createFontSizeSelect();case"forecolor":return this._createForeColorMenu();case"backcolor":return this._createBackColorMenu()}if((j=this.controls[l])){return i.createButton(l,{title:"advanced."+j[0],cmd:j[1],ui:j[2],value:j[3]})}},execCommand:function(k,j,l){var i=this["_"+k];if(i){i.call(this,j,l);return true}return false},_importClasses:function(k){var i=this.editor,j=i.controlManager.get("styleselect");if(j.getLength()==0){f(i.dom.getClasses(),function(n,l){var m="style_"+l;i.formatter.register(m,{inline:"span",attributes:{"class":n["class"]},selector:"*"});j.add(n["class"],m)})}},_createStyleSelect:function(m){var k=this,i=k.editor,j=i.controlManager,l;l=j.createListBox("styleselect",{title:"advanced.style_select",onselect:function(o){var p,n=[];f(l.items,function(q){n.push(q.value)});i.focus();i.undoManager.add();p=i.formatter.matchAll(n);if(!o||p[0]==o){if(p[0]){i.formatter.remove(p[0])}}else{i.formatter.apply(o)}i.undoManager.add();i.nodeChanged();return false}});i.onInit.add(function(){var o=0,n=i.getParam("style_formats");if(n){f(n,function(p){var q,r=0;f(p,function(){r++});if(r>1){q=p.name=p.name||"style_"+(o++);i.formatter.register(q,p);l.add(p.title,q)}else{l.add(p.title)}})}else{f(i.getParam("theme_advanced_styles","","hash"),function(r,q){var p;if(r){p="style_"+(o++);i.formatter.register(p,{inline:"span",classes:r,selector:"*"});l.add(k.editor.translate(q),p)}})}});if(l.getLength()==0){l.onPostRender.add(function(o,p){if(!l.NativeListBox){b.add(p.id+"_text","focus",k._importClasses,k);b.add(p.id+"_text","mousedown",k._importClasses,k);b.add(p.id+"_open","focus",k._importClasses,k);b.add(p.id+"_open","mousedown",k._importClasses,k)}else{b.add(p.id,"focus",k._importClasses,k)}})}return l},_createFontSelect:function(){var k,j=this,i=j.editor;k=i.controlManager.createListBox("fontselect",{title:"advanced.fontdefault",onselect:function(l){var m=k.items[k.selectedIndex];if(!l&&m){i.execCommand("FontName",false,m.value);return}i.execCommand("FontName",false,l);k.select(function(n){return l==n});if(m&&m.value==l){k.select(null)}return false}});if(k){f(i.getParam("theme_advanced_fonts",j.settings.theme_advanced_fonts,"hash"),function(m,l){k.add(i.translate(l),m,{style:m.indexOf("dings")==-1?"font-family:"+m:""})})}return k},_createFontSizeSelect:function(){var m=this,k=m.editor,n,l=0,j=[];n=k.controlManager.createListBox("fontsizeselect",{title:"advanced.font_size",onselect:function(i){var o=n.items[n.selectedIndex];if(!i&&o){o=o.value;if(o["class"]){k.formatter.toggle("fontsize_class",{value:o["class"]});k.undoManager.add();k.nodeChanged()}else{k.execCommand("FontSize",false,o.fontSize)}return}if(i["class"]){k.focus();k.undoManager.add();k.formatter.toggle("fontsize_class",{value:i["class"]});k.undoManager.add();k.nodeChanged()}else{k.execCommand("FontSize",false,i.fontSize)}n.select(function(p){return i==p});if(o&&(o.value.fontSize==i.fontSize||o.value["class"]==i["class"])){n.select(null)}return false}});if(n){f(m.settings.theme_advanced_font_sizes,function(o,i){var p=o.fontSize;if(p>=1&&p<=7){p=m.sizes[parseInt(p)-1]+"pt"}n.add(i,o,{style:"font-size:"+p,"class":"mceFontSize"+(l++)+(" "+(o["class"]||""))})})}return n},_createBlockFormats:function(){var k,i={p:"advanced.paragraph",address:"advanced.address",pre:"advanced.pre",h1:"advanced.h1",h2:"advanced.h2",h3:"advanced.h3",h4:"advanced.h4",h5:"advanced.h5",h6:"advanced.h6",div:"advanced.div",blockquote:"advanced.blockquote",code:"advanced.code",dt:"advanced.dt",dd:"advanced.dd",samp:"advanced.samp"},j=this;k=j.editor.controlManager.createListBox("formatselect",{title:"advanced.block",onselect:function(l){j.editor.execCommand("FormatBlock",false,l);return false}});if(k){f(j.editor.getParam("theme_advanced_blockformats",j.settings.theme_advanced_blockformats,"hash"),function(m,l){k.add(j.editor.translate(l!=m?l:i[m]),m,{"class":"mce_formatPreview mce_"+m})})}return k},_createForeColorMenu:function(){var m,j=this,k=j.settings,l={},i;if(k.theme_advanced_more_colors){l.more_colors_func=function(){j._mceColorPicker(0,{color:m.value,func:function(n){m.setColor(n)}})}}if(i=k.theme_advanced_text_colors){l.colors=i}if(k.theme_advanced_default_foreground_color){l.default_color=k.theme_advanced_default_foreground_color}l.title="advanced.forecolor_desc";l.cmd="ForeColor";l.scope=this;m=j.editor.controlManager.createColorSplitButton("forecolor",l);return m},_createBackColorMenu:function(){var m,j=this,k=j.settings,l={},i;if(k.theme_advanced_more_colors){l.more_colors_func=function(){j._mceColorPicker(0,{color:m.value,func:function(n){m.setColor(n)}})}}if(i=k.theme_advanced_background_colors){l.colors=i}if(k.theme_advanced_default_background_color){l.default_color=k.theme_advanced_default_background_color}l.title="advanced.backcolor_desc";l.cmd="HiliteColor";l.scope=this;m=j.editor.controlManager.createColorSplitButton("backcolor",l);return m},renderUI:function(k){var m,l,q,v=this,r=v.editor,w=v.settings,u,j,i;if(r.settings){r.settings.aria_label=w.aria_label+r.getLang("advanced.help_shortcut")}m=j=d.create("span",{role:"application","aria-labelledby":r.id+"_voice",id:r.id+"_parent","class":"mceEditor "+r.settings.skin+"Skin"+(w.skin_variant?" "+r.settings.skin+"Skin"+v._ufirst(w.skin_variant):"")});d.add(m,"span",{"class":"mceVoiceLabel",style:"display:none;",id:r.id+"_voice"},w.aria_label);if(!d.boxModel){m=d.add(m,"div",{"class":"mceOldBoxModel"})}m=u=d.add(m,"table",{role:"presentation",id:r.id+"_tbl","class":"mceLayout",cellSpacing:0,cellPadding:0});m=q=d.add(m,"tbody");switch((w.theme_advanced_layout_manager||"").toLowerCase()){case"rowlayout":l=v._rowLayout(w,q,k);break;case"customlayout":l=r.execCallback("theme_advanced_custom_layout",w,q,k,j);break;default:l=v._simpleLayout(w,q,k,j)}m=k.targetNode;i=u.rows;d.addClass(i[0],"mceFirst");d.addClass(i[i.length-1],"mceLast");f(d.select("tr",q),function(o){d.addClass(o.firstChild,"mceFirst");d.addClass(o.childNodes[o.childNodes.length-1],"mceLast")});if(d.get(w.theme_advanced_toolbar_container)){d.get(w.theme_advanced_toolbar_container).appendChild(j)}else{d.insertAfter(j,m)}b.add(r.id+"_path_row","click",function(n){n=n.target;if(n.nodeName=="A"){v._sel(n.className.replace(/^.*mcePath_([0-9]+).*$/,"$1"));return b.cancel(n)}});if(!r.getParam("accessibility_focus")){b.add(d.add(j,"a",{href:"#"},"<!-- IE -->"),"focus",function(){tinyMCE.get(r.id).focus()})}if(w.theme_advanced_toolbar_location=="external"){k.deltaHeight=0}v.deltaHeight=k.deltaHeight;k.targetNode=null;r.onKeyDown.add(function(p,n){var s=121,o=122;if(n.altKey){if(n.keyCode===s){window.focus();v.toolbarGroup.focus();return b.cancel(n)}else{if(n.keyCode===o){d.get(p.id+"_path_row").focus();return b.cancel(n)}}}});r.addShortcut("alt+0","","mceShortcuts",v);return{iframeContainer:l,editorContainer:r.id+"_parent",sizeContainer:u,deltaHeight:k.deltaHeight}},getInfo:function(){return{longname:"Advanced theme",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",version:e.majorVersion+"."+e.minorVersion}},resizeBy:function(i,j){var k=d.get(this.editor.id+"_ifr");this.resizeTo(k.clientWidth+i,k.clientHeight+j)},resizeTo:function(i,m,k){var j=this.editor,l=this.settings,n=d.get(j.id+"_tbl"),o=d.get(j.id+"_ifr");i=Math.max(l.theme_advanced_resizing_min_width||100,i);m=Math.max(l.theme_advanced_resizing_min_height||100,m);i=Math.min(l.theme_advanced_resizing_max_width||65535,i);m=Math.min(l.theme_advanced_resizing_max_height||65535,m);d.setStyle(n,"height","");d.setStyle(o,"height",m);if(l.theme_advanced_resize_horizontal){d.setStyle(n,"width","");d.setStyle(o,"width",i);if(i<n.clientWidth){i=n.clientWidth;d.setStyle(o,"width",n.clientWidth)}}if(k&&l.theme_advanced_resizing_use_cookie){a.setHash("TinyMCE_"+j.id+"_size",{cw:i,ch:m})}},destroy:function(){var i=this.editor.id;b.clear(i+"_resize");b.clear(i+"_path_row");b.clear(i+"_external_close")},_simpleLayout:function(y,r,k,i){var x=this,u=x.editor,v=y.theme_advanced_toolbar_location,m=y.theme_advanced_statusbar_location,l,j,q,w;if(y.readonly){l=d.add(r,"tr");l=j=d.add(l,"td",{"class":"mceIframeContainer"});return j}if(v=="top"){x._addToolbars(r,k)}if(v=="external"){l=w=d.create("div",{style:"position:relative"});l=d.add(l,"div",{id:u.id+"_external","class":"mceExternalToolbar"});d.add(l,"a",{id:u.id+"_external_close",href:"javascript:;","class":"mceExternalClose"});l=d.add(l,"table",{id:u.id+"_tblext",cellSpacing:0,cellPadding:0});q=d.add(l,"tbody");if(i.firstChild.className=="mceOldBoxModel"){i.firstChild.appendChild(w)}else{i.insertBefore(w,i.firstChild)}x._addToolbars(q,k);u.onMouseUp.add(function(){var o=d.get(u.id+"_external");d.show(o);d.hide(g);var n=b.add(u.id+"_external_close","click",function(){d.hide(u.id+"_external");b.remove(u.id+"_external_close","click",n)});d.show(o);d.setStyle(o,"top",0-d.getRect(u.id+"_tblext").h-1);d.hide(o);d.show(o);o.style.filter="";g=u.id+"_external";o=null})}if(m=="top"){x._addStatusBar(r,k)}if(!y.theme_advanced_toolbar_container){l=d.add(r,"tr");l=j=d.add(l,"td",{"class":"mceIframeContainer"})}if(v=="bottom"){x._addToolbars(r,k)}if(m=="bottom"){x._addStatusBar(r,k)}return j},_rowLayout:function(w,m,k){var v=this,p=v.editor,u,x,i=p.controlManager,l,j,r,q;u=w.theme_advanced_containers_default_class||"";x=w.theme_advanced_containers_default_align||"center";f(c(w.theme_advanced_containers||""),function(s,o){var n=w["theme_advanced_container_"+s]||"";switch(s.toLowerCase()){case"mceeditor":l=d.add(m,"tr");l=j=d.add(l,"td",{"class":"mceIframeContainer"});break;case"mceelementpath":v._addStatusBar(m,k);break;default:q=(w["theme_advanced_container_"+s+"_align"]||x).toLowerCase();q="mce"+v._ufirst(q);l=d.add(d.add(m,"tr"),"td",{"class":"mceToolbar "+(w["theme_advanced_container_"+s+"_class"]||u)+" "+q||x});r=i.createToolbar("toolbar"+o);v._addControls(n,r);d.setHTML(l,r.renderHTML());k.deltaHeight-=w.theme_advanced_row_height}});return j},_addControls:function(j,i){var k=this,l=k.settings,m,n=k.editor.controlManager;if(l.theme_advanced_disable&&!k._disabled){m={};f(c(l.theme_advanced_disable),function(o){m[o]=1});k._disabled=m}else{m=k._disabled}f(c(j),function(p){var o;if(m&&m[p]){return}if(p=="tablecontrols"){f(["table","|","row_props","cell_props","|","row_before","row_after","delete_row","|","col_before","col_after","delete_col","|","split_cells","merge_cells"],function(q){q=k.createControl(q,n);if(q){i.add(q)}});return}o=k.createControl(p,n);if(o){i.add(o)}})},_addToolbars:function(x,k){var A=this,p,m,r=A.editor,B=A.settings,z,j=r.controlManager,u,l,q=[],y,w;w=j.createToolbarGroup("toolbargroup",{name:r.getLang("advanced.toolbar"),tab_focus_toolbar:r.getParam("theme_advanced_tab_focus_toolbar")});A.toolbarGroup=w;y=B.theme_advanced_toolbar_align.toLowerCase();y="mce"+A._ufirst(y);l=d.add(d.add(x,"tr",{role:"presentation"}),"td",{"class":"mceToolbar "+y,role:"presentation"});for(p=1;(z=B["theme_advanced_buttons"+p]);p++){m=j.createToolbar("toolbar"+p,{"class":"mceToolbarRow"+p});if(B["theme_advanced_buttons"+p+"_add"]){z+=","+B["theme_advanced_buttons"+p+"_add"]}if(B["theme_advanced_buttons"+p+"_add_before"]){z=B["theme_advanced_buttons"+p+"_add_before"]+","+z}A._addControls(z,m);w.add(m);k.deltaHeight-=B.theme_advanced_row_height}q.push(w.renderHTML());q.push(d.createHTML("a",{href:"#",accesskey:"z",title:r.getLang("advanced.toolbar_focus"),onfocus:"tinyMCE.getInstanceById('"+r.id+"').focus();"},"<!-- IE -->"));d.setHTML(l,q.join(""))},_addStatusBar:function(m,j){var k,v=this,p=v.editor,w=v.settings,i,q,u,l;k=d.add(m,"tr");k=l=d.add(k,"td",{"class":"mceStatusbar"});k=d.add(k,"div",{id:p.id+"_path_row",role:"group","aria-labelledby":p.id+"_path_voice"});if(w.theme_advanced_path){d.add(k,"span",{id:p.id+"_path_voice"},p.translate("advanced.path"));d.add(k,"span",{},": ")}else{d.add(k,"span",{},"&#160;")}if(w.theme_advanced_resizing){d.add(l,"a",{id:p.id+"_resize",href:"javascript:;",onclick:"return false;","class":"mceResize"});if(w.theme_advanced_resizing_use_cookie){p.onPostRender.add(function(){var n=a.getHash("TinyMCE_"+p.id+"_size"),r=d.get(p.id+"_tbl");if(!n){return}v.resizeTo(n.cw,n.ch)})}p.onPostRender.add(function(){b.add(p.id+"_resize","click",function(n){n.preventDefault()});b.add(p.id+"_resize","mousedown",function(D){var t,r,s,o,C,z,A,F,n,E,x;function y(G){G.preventDefault();n=A+(G.screenX-C);E=F+(G.screenY-z);v.resizeTo(n,E)}function B(G){b.remove(d.doc,"mousemove",t);b.remove(p.getDoc(),"mousemove",r);b.remove(d.doc,"mouseup",s);b.remove(p.getDoc(),"mouseup",o);n=A+(G.screenX-C);E=F+(G.screenY-z);v.resizeTo(n,E,true)}D.preventDefault();C=D.screenX;z=D.screenY;x=d.get(v.editor.id+"_ifr");A=n=x.clientWidth;F=E=x.clientHeight;t=b.add(d.doc,"mousemove",y);r=b.add(p.getDoc(),"mousemove",y);s=b.add(d.doc,"mouseup",B);o=b.add(p.getDoc(),"mouseup",B)})})}j.deltaHeight-=21;k=m=null},_updateUndoStatus:function(j){var i=j.controlManager,k=j.undoManager;i.setDisabled("undo",!k.hasUndo()&&!k.typing);i.setDisabled("redo",!k.hasRedo())},_nodeChanged:function(m,r,D,q,E){var y=this,C,F=0,x,G,z=y.settings,w,k,u,B,l,j,i;e.each(y.stateControls,function(n){r.setActive(n,m.queryCommandState(y.controls[n][1]))});function o(p){var s,n=E.parents,t=p;if(typeof(p)=="string"){t=function(v){return v.nodeName==p}}for(s=0;s<n.length;s++){if(t(n[s])){return n[s]}}}r.setActive("visualaid",m.hasVisual);y._updateUndoStatus(m);r.setDisabled("outdent",!m.queryCommandState("Outdent"));C=o("A");if(G=r.get("link")){if(!C||!C.name){G.setDisabled(!C&&q);G.setActive(!!C)}}if(G=r.get("unlink")){G.setDisabled(!C&&q);G.setActive(!!C&&!C.name)}if(G=r.get("anchor")){G.setActive(!q&&!!C&&C.name)}C=o("IMG");if(G=r.get("image")){G.setActive(!q&&!!C&&D.className.indexOf("mceItem")==-1)}if(G=r.get("styleselect")){y._importClasses();j=[];f(G.items,function(n){j.push(n.value)});i=m.formatter.matchAll(j);G.select(i[0])}if(G=r.get("formatselect")){C=o(d.isBlock);if(C){G.select(C.nodeName.toLowerCase())}}o(function(p){if(p.nodeName==="SPAN"){if(!w&&p.className){w=p.className}}if(m.dom.is(p,z.theme_advanced_font_selector)){if(!k&&p.style.fontSize){k=p.style.fontSize}if(!u&&p.style.fontFamily){u=p.style.fontFamily.replace(/[\"\']+/g,"").replace(/^([^,]+).*/,"$1").toLowerCase()}if(!B&&p.style.color){B=p.style.color}if(!l&&p.style.backgroundColor){l=p.style.backgroundColor}}return false});if(G=r.get("fontselect")){G.select(function(n){return n.replace(/^([^,]+).*/,"$1").toLowerCase()==u})}if(G=r.get("fontsizeselect")){if(z.theme_advanced_runtime_fontsize&&!k&&!w){k=m.dom.getStyle(D,"fontSize",true)}G.select(function(n){if(n.fontSize&&n.fontSize===k){return true}if(n["class"]&&n["class"]===w){return true}})}if(z.theme_advanced_show_current_color){function A(p,n){if(G=r.get(p)){if(!n){n=G.settings.default_color}if(n!==G.value){G.displayColor(n)}}}A("forecolor",B);A("backcolor",l)}if(z.theme_advanced_show_current_color){function A(p,n){if(G=r.get(p)){if(!n){n=G.settings.default_color}if(n!==G.value){G.displayColor(n)}}}A("forecolor",B);A("backcolor",l)}if(z.theme_advanced_path&&z.theme_advanced_statusbar_location){C=d.get(m.id+"_path")||d.add(m.id+"_path_row","span",{id:m.id+"_path"});if(y.statusKeyboardNavigation){y.statusKeyboardNavigation.destroy();y.statusKeyboardNavigation=null}d.setHTML(C,"");o(function(H){var p=H.nodeName.toLowerCase(),s,v,t="";if(H.nodeType!=1||p==="br"||H.getAttribute("data-mce-bogus")||d.hasClass(H,"mceItemHidden")||d.hasClass(H,"mceItemRemoved")){return}if(e.isIE&&H.scopeName!=="HTML"){p=H.scopeName+":"+p}p=p.replace(/mce\:/g,"");switch(p){case"b":p="strong";break;case"i":p="em";break;case"img":if(x=d.getAttrib(H,"src")){t+="src: "+x+" "}break;case"a":if(x=d.getAttrib(H,"name")){t+="name: "+x+" ";p+="#"+x}if(x=d.getAttrib(H,"href")){t+="href: "+x+" "}break;case"font":if(x=d.getAttrib(H,"face")){t+="font: "+x+" "}if(x=d.getAttrib(H,"size")){t+="size: "+x+" "}if(x=d.getAttrib(H,"color")){t+="color: "+x+" "}break;case"span":if(x=d.getAttrib(H,"style")){t+="style: "+x+" "}break}if(x=d.getAttrib(H,"id")){t+="id: "+x+" "}if(x=H.className){x=x.replace(/\b\s*(webkit|mce|Apple-)\w+\s*\b/g,"");if(x){t+="class: "+x+" ";if(d.isBlock(H)||p=="img"||p=="span"){p+="."+x}}}p=p.replace(/(html:)/g,"");p={name:p,node:H,title:t};y.onResolveName.dispatch(y,p);t=p.title;p=p.name;v=d.create("a",{href:"javascript:;",role:"button",onmousedown:"return false;",title:t,"class":"mcePath_"+(F++)},p);if(C.hasChildNodes()){C.insertBefore(d.create("span",{"aria-hidden":"true"},"\u00a0\u00bb "),C.firstChild);C.insertBefore(v,C.firstChild)}else{C.appendChild(v)}},m.getBody());if(d.select("a",C).length>0){y.statusKeyboardNavigation=new e.ui.KeyboardNavigation({root:m.id+"_path_row",items:d.select("a",C),excludeFromTabOrder:true,onCancel:function(){m.focus()}},d)}}},_sel:function(i){this.editor.execCommand("mceSelectNodeDepth",false,i)},_mceInsertAnchor:function(k,j){var i=this.editor;i.windowManager.open({url:this.url+"/anchor.htm",width:320+parseInt(i.getLang("advanced.anchor_delta_width",0)),height:90+parseInt(i.getLang("advanced.anchor_delta_height",0)),inline:true},{theme_url:this.url})},_mceCharMap:function(){var i=this.editor;i.windowManager.open({url:this.url+"/charmap.htm",width:550+parseInt(i.getLang("advanced.charmap_delta_width",0)),height:250+parseInt(i.getLang("advanced.charmap_delta_height",0)),inline:true},{theme_url:this.url})},_mceHelp:function(){var i=this.editor;i.windowManager.open({url:this.url+"/about.htm",width:480,height:380,inline:true},{theme_url:this.url})},_mceShortcuts:function(){var i=this.editor;i.windowManager.open({url:this.url+"/shortcuts.htm",width:480,height:380,inline:true},{theme_url:this.url})},_mceColorPicker:function(k,j){var i=this.editor;j=j||{};i.windowManager.open({url:this.url+"/color_picker.htm",width:375+parseInt(i.getLang("advanced.colorpicker_delta_width",0)),height:250+parseInt(i.getLang("advanced.colorpicker_delta_height",0)),close_previous:false,inline:true},{input_color:j.color,func:j.func,theme_url:this.url})},_mceCodeEditor:function(j,k){var i=this.editor;i.windowManager.open({url:this.url+"/source_editor.htm",width:parseInt(i.getParam("theme_advanced_source_editor_width",720)),height:parseInt(i.getParam("theme_advanced_source_editor_height",580)),inline:true,resizable:true,maximizable:true},{theme_url:this.url})},_mceImage:function(j,k){var i=this.editor;if(i.dom.getAttrib(i.selection.getNode(),"class").indexOf("mceItem")!=-1){return}i.windowManager.open({url:this.url+"/image.htm",width:355+parseInt(i.getLang("advanced.image_delta_width",0)),height:275+parseInt(i.getLang("advanced.image_delta_height",0)),inline:true},{theme_url:this.url})},_mceLink:function(j,k){var i=this.editor;i.windowManager.open({url:this.url+"/link.htm",width:310+parseInt(i.getLang("advanced.link_delta_width",0)),height:200+parseInt(i.getLang("advanced.link_delta_height",0)),inline:true},{theme_url:this.url})},_mceNewDocument:function(){var i=this.editor;i.windowManager.confirm("advanced.newdocument",function(j){if(j){i.execCommand("mceSetContent",false,"")}})},_mceForeColor:function(){var i=this;this._mceColorPicker(0,{color:i.fgColor,func:function(j){i.fgColor=j;i.editor.execCommand("ForeColor",false,j)}})},_mceBackColor:function(){var i=this;this._mceColorPicker(0,{color:i.bgColor,func:function(j){i.bgColor=j;i.editor.execCommand("HiliteColor",false,j)}})},_ufirst:function(i){return i.substring(0,1).toUpperCase()+i.substring(1)}});e.ThemeManager.add("advanced",e.themes.AdvancedTheme)}(tinymce));
\ No newline at end of file
diff --git a/plugins/TinyMCE/js/themes/advanced/editor_template_src.js b/plugins/TinyMCE/js/themes/advanced/editor_template_src.js
index e0d4dacc0c..d62f497e61 100644
--- a/plugins/TinyMCE/js/themes/advanced/editor_template_src.js
+++ b/plugins/TinyMCE/js/themes/advanced/editor_template_src.js
@@ -66,6 +66,9 @@
 			t.url = url;
 			t.onResolveName = new tinymce.util.Dispatcher(this);
 
+			ed.forcedHighContrastMode = ed.settings.detect_highcontrast && t._isHighContrast();
+			ed.settings.skin = ed.forcedHighContrastMode ? 'highcontrast' : ed.settings.skin;
+
 			// Default settings
 			t.settings = s = extend({
 				theme_advanced_path : true,
@@ -81,6 +84,8 @@
 				theme_advanced_resize_horizontal : 1,
 				theme_advanced_resizing_use_cookie : 1,
 				theme_advanced_font_sizes : "1,2,3,4,5,6,7",
+				theme_advanced_font_selector : "span",
+				theme_advanced_show_current_color: 0,
 				readonly : ed.settings.readonly
 			}, ed.settings);
 
@@ -119,13 +124,19 @@
 			if (s.theme_advanced_statusbar_location == 'none')
 				s.theme_advanced_statusbar_location = 0;
 
+			if (ed.settings.content_css !== false)
+				ed.contentCSS.push(ed.baseURI.toAbsolute(url + "/skins/" + ed.settings.skin + "/content.css"));
+
 			// Init editor
 			ed.onInit.add(function() {
-				if (!ed.settings.readonly)
+				if (!ed.settings.readonly) {
 					ed.onNodeChange.add(t._nodeChanged, t);
-
-				if (ed.settings.content_css !== false)
-					ed.dom.loadCSS(ed.baseURI.toAbsolute("themes/advanced/skins/" + ed.settings.skin + "/content.css"));
+					ed.onKeyUp.add(t._updateUndoStatus, t);
+					ed.onMouseUp.add(t._updateUndoStatus, t);
+					ed.dom.bind(ed.dom.getRoot(), 'dragend', function() {
+						t._updateUndoStatus(ed);
+					});
+				}
 			});
 
 			ed.onSetProgressState.add(function(ed, b, ti) {
@@ -153,6 +164,15 @@
 				DOM.loadCSS(url + "/skins/" + ed.settings.skin + "/ui_" + s.skin_variant + ".css");
 		},
 
+		_isHighContrast : function() {
+			var actualColor, div = DOM.add(DOM.getRoot(), 'div', {'style': 'background-color: rgb(171,239,86);'});
+
+			actualColor = (DOM.getStyle(div, 'background-color', true) + '').toLowerCase().replace(/ /g, '');
+			DOM.remove(div);
+
+			return actualColor != 'rgb(171,239,86)' && actualColor != '#abef56';
+		},
+
 		createControl : function(n, cf) {
 			var cd, c;
 
@@ -230,9 +250,10 @@
 
 					// Toggle off the current format
 					matches = ed.formatter.matchAll(formatNames);
-					if (!name || matches[0] == name)
-						ed.formatter.remove(matches[0]);
-					else
+					if (!name || matches[0] == name) {
+						if (matches[0]) 
+							ed.formatter.remove(matches[0]);
+					} else
 						ed.formatter.apply(name);
 
 					ed.undoManager.add();
@@ -314,6 +335,10 @@
 						return v == sv;
 					});
 
+					if (cur && cur.value == v) {
+						c.select(null);
+					}
+
 					return false; // No auto select
 				}
 			});
@@ -361,6 +386,10 @@
 					return v == sv;
 				});
 
+				if (cur && (cur.value.fontSize == v.fontSize || cur.value['class'] == v['class'])) {
+					c.select(null);
+				}
+
 				return false; // No auto select
 			}});
 
@@ -397,7 +426,11 @@
 				samp : 'advanced.samp'
 			}, t = this;
 
-			c = t.editor.controlManager.createListBox('formatselect', {title : 'advanced.block', cmd : 'FormatBlock'});
+			c = t.editor.controlManager.createListBox('formatselect', {title : 'advanced.block', onselect : function(v) {
+				t.editor.execCommand('FormatBlock', false, v);
+				return false;
+			}});
+
 			if (c) {
 				each(t.editor.getParam('theme_advanced_blockformats', t.settings.theme_advanced_blockformats, 'hash'), function(v, k) {
 					c.add(t.editor.translate(k != v ? k : fmts[v]), v, {'class' : 'mce_formatPreview mce_' + v});
@@ -468,12 +501,19 @@
 		renderUI : function(o) {
 			var n, ic, tb, t = this, ed = t.editor, s = t.settings, sc, p, nl;
 
-			n = p = DOM.create('span', {id : ed.id + '_parent', 'class' : 'mceEditor ' + ed.settings.skin + 'Skin' + (s.skin_variant ? ' ' + ed.settings.skin + 'Skin' + t._ufirst(s.skin_variant) : '')});
+			if (ed.settings) {
+				ed.settings.aria_label = s.aria_label + ed.getLang('advanced.help_shortcut');
+			}
+
+			// TODO: ACC Should have an aria-describedby attribute which is user-configurable to describe what this field is actually for.
+			// Maybe actually inherit it from the original textara?
+			n = p = DOM.create('span', {role : 'application', 'aria-labelledby' : ed.id + '_voice', id : ed.id + '_parent', 'class' : 'mceEditor ' + ed.settings.skin + 'Skin' + (s.skin_variant ? ' ' + ed.settings.skin + 'Skin' + t._ufirst(s.skin_variant) : '')});
+			DOM.add(n, 'span', {'class': 'mceVoiceLabel', 'style': 'display:none;', id: ed.id + '_voice'}, s.aria_label);
 
 			if (!DOM.boxModel)
 				n = DOM.add(n, 'div', {'class' : 'mceOldBoxModel'});
 
-			n = sc = DOM.add(n, 'table', {id : ed.id + '_tbl', 'class' : 'mceLayout', cellSpacing : 0, cellPadding : 0});
+			n = sc = DOM.add(n, 'table', {role : "presentation", id : ed.id + '_tbl', 'class' : 'mceLayout', cellSpacing : 0, cellPadding : 0});
 			n = tb = DOM.add(n, 'tbody');
 
 			switch ((s.theme_advanced_layout_manager || '').toLowerCase()) {
@@ -492,7 +532,7 @@
 			n = o.targetNode;
 
 			// Add classes to first and last TRs
-			nl = DOM.stdMode ? sc.getElementsByTagName('tr') : sc.rows; // Quick fix for IE 8
+			nl = sc.rows;
 			DOM.addClass(nl[0], 'mceFirst');
 			DOM.addClass(nl[nl.length - 1], 'mceLast');
 
@@ -548,6 +588,24 @@
 			t.deltaHeight = o.deltaHeight;
 			o.targetNode = null;
 
+			ed.onKeyDown.add(function(ed, evt) {
+				var DOM_VK_F10 = 121, DOM_VK_F11 = 122;
+
+				if (evt.altKey) {
+		 			if (evt.keyCode === DOM_VK_F10) {
+						window.focus();
+						t.toolbarGroup.focus();
+						return Event.cancel(evt);
+					} else if (evt.keyCode === DOM_VK_F11) {
+						DOM.get(ed.id + '_path_row').focus();
+						return Event.cancel(evt);
+					}
+				}
+			});
+
+			// alt+0 is the UK recommended shortcut for accessing the list of access controls.
+			ed.addShortcut('alt+0', '', 'mceShortcuts', t);
+
 			return {
 				iframeContainer : ic,
 				editorContainer : ed.id + '_parent',
@@ -566,12 +624,12 @@
 		},
 
 		resizeBy : function(dw, dh) {
-			var e = DOM.get(this.editor.id + '_tbl');
+			var e = DOM.get(this.editor.id + '_ifr');
 
 			this.resizeTo(e.clientWidth + dw, e.clientHeight + dh);
 		},
 
-		resizeTo : function(w, h) {
+		resizeTo : function(w, h, store) {
 			var ed = this.editor, s = this.settings, e = DOM.get(ed.id + '_tbl'), ifr = DOM.get(ed.id + '_ifr');
 
 			// Boundery fix box
@@ -589,8 +647,18 @@
 				DOM.setStyle(ifr, 'width', w);
 
 				// Make sure that the size is never smaller than the over all ui
-				if (w < e.clientWidth)
+				if (w < e.clientWidth) {
+					w = e.clientWidth;
 					DOM.setStyle(ifr, 'width', e.clientWidth);
+				}
+			}
+
+			// Store away the size
+			if (store && s.theme_advanced_resizing_use_cookie) {
+				Cookie.setHash("TinyMCE_" + ed.id + "_size", {
+					cw : w,
+					ch : h
+				});
 			}
 		},
 
@@ -685,7 +753,7 @@
 			each(explode(s.theme_advanced_containers || ''), function(c, i) {
 				var v = s['theme_advanced_container_' + c] || '';
 
-				switch (v.toLowerCase()) {
+				switch (c.toLowerCase()) {
 					case 'mceeditor':
 						n = DOM.add(tb, 'tr');
 						n = ic = DOM.add(n, 'td', {'class' : 'mceIframeContainer'});
@@ -753,17 +821,19 @@
 		},
 
 		_addToolbars : function(c, o) {
-			var t = this, i, tb, ed = t.editor, s = t.settings, v, cf = ed.controlManager, di, n, h = [], a;
+			var t = this, i, tb, ed = t.editor, s = t.settings, v, cf = ed.controlManager, di, n, h = [], a, toolbarGroup;
+
+			toolbarGroup = cf.createToolbarGroup('toolbargroup', {
+				'name': ed.getLang('advanced.toolbar'),
+				'tab_focus_toolbar':ed.getParam('theme_advanced_tab_focus_toolbar')
+			});
+
+			t.toolbarGroup = toolbarGroup;
 
 			a = s.theme_advanced_toolbar_align.toLowerCase();
 			a = 'mce' + t._ufirst(a);
 
-			n = DOM.add(DOM.add(c, 'tr'), 'td', {'class' : 'mceToolbar ' + a});
-
-			if (!ed.getParam('accessibility_focus'))
-				h.push(DOM.createHTML('a', {href : '#', onfocus : 'tinyMCE.get(\'' + ed.id + '\').focus();'}, '<!-- IE -->'));
-
-			h.push(DOM.createHTML('a', {href : '#', accesskey : 'q', title : ed.getLang("advanced.toolbar_focus")}, '<!-- IE -->'));
+			n = DOM.add(DOM.add(c, 'tr', {role: 'presentation'}), 'td', {'class' : 'mceToolbar ' + a, "role":"presentation"});
 
 			// Create toolbar and add the controls
 			for (i=1; (v = s['theme_advanced_buttons' + i]); i++) {
@@ -776,13 +846,11 @@
 					v = s['theme_advanced_buttons' + i + '_add_before'] + ',' + v;
 
 				t._addControls(v, tb);
-
-				//n.appendChild(n = tb.render());
-				h.push(tb.renderHTML());
+				toolbarGroup.add(tb);
 
 				o.deltaHeight -= s.theme_advanced_row_height;
 			}
-
+			h.push(toolbarGroup.renderHTML());
 			h.push(DOM.createHTML('a', {href : '#', accesskey : 'z', title : ed.getLang("advanced.toolbar_focus"), onfocus : 'tinyMCE.getInstanceById(\'' + ed.id + '\').focus();'}, '<!-- IE -->'));
 			DOM.setHTML(n, h.join(''));
 		},
@@ -791,9 +859,15 @@
 			var n, t = this, ed = t.editor, s = t.settings, r, mf, me, td;
 
 			n = DOM.add(tb, 'tr');
-			n = td = DOM.add(n, 'td', {'class' : 'mceStatusbar'});
-			n = DOM.add(n, 'div', {id : ed.id + '_path_row'}, s.theme_advanced_path ? ed.translate('advanced.path') + ': ' : '&#160;');
-			DOM.add(n, 'a', {href : '#', accesskey : 'x'});
+			n = td = DOM.add(n, 'td', {'class' : 'mceStatusbar'}); 
+			n = DOM.add(n, 'div', {id : ed.id + '_path_row', 'role': 'group', 'aria-labelledby': ed.id + '_path_voice'});
+			if (s.theme_advanced_path) {
+				DOM.add(n, 'span', {id: ed.id + '_path_voice'}, ed.translate('advanced.path'));
+				DOM.add(n, 'span', {}, ': ');
+			} else {
+				DOM.add(n, 'span', {}, '&#160;');
+			}
+			
 
 			if (s.theme_advanced_resizing) {
 				DOM.add(td, 'a', {id : ed.id + '_resize', href : 'javascript:;', onclick : "return false;", 'class' : 'mceResize'});
@@ -810,12 +884,18 @@
 				}
 
 				ed.onPostRender.add(function() {
+					Event.add(ed.id + '_resize', 'click', function(e) {
+						e.preventDefault();
+					});
+
 					Event.add(ed.id + '_resize', 'mousedown', function(e) {
 						var mouseMoveHandler1, mouseMoveHandler2,
 							mouseUpHandler1, mouseUpHandler2,
 							startX, startY, startWidth, startHeight, width, height, ifrElm;
 
 						function resizeOnMove(e) {
+							e.preventDefault();
+
 							width = startWidth + (e.screenX - startX);
 							height = startHeight + (e.screenY - startY);
 
@@ -829,13 +909,9 @@
 							Event.remove(DOM.doc, 'mouseup', mouseUpHandler1);
 							Event.remove(ed.getDoc(), 'mouseup', mouseUpHandler2);
 
-							// Store away the size
-							if (s.theme_advanced_resizing_use_cookie) {
-								Cookie.setHash("TinyMCE_" + ed.id + "_size", {
-									cw : width,
-									ch : height
-								});
-							}
+							width = startWidth + (e.screenX - startX);
+							height = startHeight + (e.screenY - startY);
+							t.resizeTo(width, height, true);
 						};
 
 						e.preventDefault();
@@ -860,8 +936,15 @@
 			n = tb = null;
 		},
 
+		_updateUndoStatus : function(ed) {
+			var cm = ed.controlManager, um = ed.undoManager;
+
+			cm.setDisabled('undo', !um.hasUndo() && !um.typing);
+			cm.setDisabled('redo', !um.hasRedo());
+		},
+
 		_nodeChanged : function(ed, cm, n, co, ob) {
-			var t = this, p, de = 0, v, c, s = t.settings, cl, fz, fn, formatNames, matches;
+			var t = this, p, de = 0, v, c, s = t.settings, cl, fz, fn, fc, bc, formatNames, matches;
 
 			tinymce.each(t.stateControls, function(c) {
 				cm.setActive(c, ed.queryCommandState(t.controls[c][1]));
@@ -883,8 +966,7 @@
 			};
 
 			cm.setActive('visualaid', ed.hasVisual);
-			cm.setDisabled('undo', !ed.undoManager.hasUndo() && !ed.typing);
-			cm.setDisabled('redo', !ed.undoManager.hasRedo());
+			t._updateUndoStatus(ed);
 			cm.setDisabled('outdent', !ed.queryCommandState('Outdent'));
 
 			p = getParent('A');
@@ -901,12 +983,12 @@
 			}
 
 			if (c = cm.get('anchor')) {
-				c.setActive(!!p && p.name);
+				c.setActive(!co && !!p && p.name);
 			}
 
 			p = getParent('IMG');
 			if (c = cm.get('image'))
-				c.setActive(!!p && n.className.indexOf('mceItem') == -1);
+				c.setActive(!co && !!p && n.className.indexOf('mceItem') == -1);
 
 			if (c = cm.get('styleselect')) {
 				t._importClasses();
@@ -932,12 +1014,20 @@
 				if (n.nodeName === 'SPAN') {
 					if (!cl && n.className)
 						cl = n.className;
+				}
 
+				if (ed.dom.is(n, s.theme_advanced_font_selector)) {
 					if (!fz && n.style.fontSize)
 						fz = n.style.fontSize;
 
 					if (!fn && n.style.fontFamily)
 						fn = n.style.fontFamily.replace(/[\"\']+/g, '').replace(/^([^,]+).*/, '$1').toLowerCase();
+					
+					if (!fc && n.style.color)
+						fc = n.style.color;
+
+					if (!bc && n.style.backgroundColor)
+						bc = n.style.backgroundColor;
 				}
 
 				return false;
@@ -963,24 +1053,52 @@
 						return true;
 				});
 			}
+			
+			if (s.theme_advanced_show_current_color) {
+				function updateColor(controlId, color) {
+					if (c = cm.get(controlId)) {
+						if (!color)
+							color = c.settings.default_color;
+						if (color !== c.value) {
+							c.displayColor(color);
+						}
+					}
+				}
+				updateColor('forecolor', fc);
+				updateColor('backcolor', bc);
+			}
+
+			if (s.theme_advanced_show_current_color) {
+				function updateColor(controlId, color) {
+					if (c = cm.get(controlId)) {
+						if (!color)
+							color = c.settings.default_color;
+						if (color !== c.value) {
+							c.displayColor(color);
+						}
+					}
+				};
+
+				updateColor('forecolor', fc);
+				updateColor('backcolor', bc);
+			}
 
 			if (s.theme_advanced_path && s.theme_advanced_statusbar_location) {
 				p = DOM.get(ed.id + '_path') || DOM.add(ed.id + '_path_row', 'span', {id : ed.id + '_path'});
+
+				if (t.statusKeyboardNavigation) {
+					t.statusKeyboardNavigation.destroy();
+					t.statusKeyboardNavigation = null;
+				}
+
 				DOM.setHTML(p, '');
 
 				getParent(function(n) {
 					var na = n.nodeName.toLowerCase(), u, pi, ti = '';
 
-					/*if (n.getAttribute('_mce_bogus'))
+					// Ignore non element and bogus/hidden elements
+					if (n.nodeType != 1 || na === 'br' || n.getAttribute('data-mce-bogus') || DOM.hasClass(n, 'mceItemHidden') || DOM.hasClass(n, 'mceItemRemoved'))
 						return;
-*/
-					// Ignore non element and hidden elements
-					if (n.nodeType != 1 || n.nodeName === 'BR' || (DOM.hasClass(n, 'mceItemHidden') || DOM.hasClass(n, 'mceItemRemoved')))
-						return;
-
-					// Fake name
-					if (v = DOM.getAttrib(n, 'mce_name'))
-						na = v;
 
 					// Handle prefix
 					if (tinymce.isIE && n.scopeName !== 'HTML')
@@ -1056,14 +1174,25 @@
 					na = na.name;
 
 					//u = "javascript:tinymce.EditorManager.get('" + ed.id + "').theme._sel('" + (de++) + "');";
-					pi = DOM.create('a', {'href' : "javascript:;", onmousedown : "return false;", title : ti, 'class' : 'mcePath_' + (de++)}, na);
+					pi = DOM.create('a', {'href' : "javascript:;", role: 'button', onmousedown : "return false;", title : ti, 'class' : 'mcePath_' + (de++)}, na);
 
 					if (p.hasChildNodes()) {
-						p.insertBefore(DOM.doc.createTextNode(' \u00bb '), p.firstChild);
+						p.insertBefore(DOM.create('span', {'aria-hidden': 'true'}, '\u00a0\u00bb '), p.firstChild);
 						p.insertBefore(pi, p.firstChild);
 					} else
 						p.appendChild(pi);
 				}, ed.getBody());
+
+				if (DOM.select('a', p).length > 0) {
+					t.statusKeyboardNavigation = new tinymce.ui.KeyboardNavigation({
+						root: ed.id + "_path_row",
+						items: DOM.select('a', p),
+						excludeFromTabOrder: true,
+						onCancel: function() {
+							ed.focus();
+						}
+					}, DOM);
+				}
 			}
 		},
 
@@ -1077,7 +1206,7 @@
 			var ed = this.editor;
 
 			ed.windowManager.open({
-				url : tinymce.baseURL + '/themes/advanced/anchor.htm',
+				url : this.url + '/anchor.htm',
 				width : 320 + parseInt(ed.getLang('advanced.anchor_delta_width', 0)),
 				height : 90 + parseInt(ed.getLang('advanced.anchor_delta_height', 0)),
 				inline : true
@@ -1090,7 +1219,7 @@
 			var ed = this.editor;
 
 			ed.windowManager.open({
-				url : tinymce.baseURL + '/themes/advanced/charmap.htm',
+				url : this.url + '/charmap.htm',
 				width : 550 + parseInt(ed.getLang('advanced.charmap_delta_width', 0)),
 				height : 250 + parseInt(ed.getLang('advanced.charmap_delta_height', 0)),
 				inline : true
@@ -1103,7 +1232,7 @@
 			var ed = this.editor;
 
 			ed.windowManager.open({
-				url : tinymce.baseURL + '/themes/advanced/about.htm',
+				url : this.url + '/about.htm',
 				width : 480,
 				height : 380,
 				inline : true
@@ -1112,13 +1241,25 @@
 			});
 		},
 
+		_mceShortcuts : function() {
+			var ed = this.editor;
+			ed.windowManager.open({
+				url: this.url + '/shortcuts.htm',
+				width: 480,
+				height: 380,
+				inline: true
+			}, {
+				theme_url: this.url
+			});
+		},
+
 		_mceColorPicker : function(u, v) {
 			var ed = this.editor;
 
 			v = v || {};
 
 			ed.windowManager.open({
-				url : tinymce.baseURL + '/themes/advanced/color_picker.htm',
+				url : this.url + '/color_picker.htm',
 				width : 375 + parseInt(ed.getLang('advanced.colorpicker_delta_width', 0)),
 				height : 250 + parseInt(ed.getLang('advanced.colorpicker_delta_height', 0)),
 				close_previous : false,
@@ -1134,7 +1275,7 @@
 			var ed = this.editor;
 
 			ed.windowManager.open({
-				url : tinymce.baseURL + '/themes/advanced/source_editor.htm',
+				url : this.url + '/source_editor.htm',
 				width : parseInt(ed.getParam("theme_advanced_source_editor_width", 720)),
 				height : parseInt(ed.getParam("theme_advanced_source_editor_height", 580)),
 				inline : true,
@@ -1153,7 +1294,7 @@
 				return;
 
 			ed.windowManager.open({
-				url : tinymce.baseURL + '/themes/advanced/image.htm',
+				url : this.url + '/image.htm',
 				width : 355 + parseInt(ed.getLang('advanced.image_delta_width', 0)),
 				height : 275 + parseInt(ed.getLang('advanced.image_delta_height', 0)),
 				inline : true
@@ -1166,7 +1307,7 @@
 			var ed = this.editor;
 
 			ed.windowManager.open({
-				url : tinymce.baseURL + '/themes/advanced/link.htm',
+				url : this.url + '/link.htm',
 				width : 310 + parseInt(ed.getLang('advanced.link_delta_width', 0)),
 				height : 200 + parseInt(ed.getLang('advanced.link_delta_height', 0)),
 				inline : true
@@ -1214,4 +1355,4 @@
 	});
 
 	tinymce.ThemeManager.add('advanced', tinymce.themes.AdvancedTheme);
-}(tinymce));
\ No newline at end of file
+}(tinymce));
diff --git a/plugins/TinyMCE/js/themes/advanced/image.htm b/plugins/TinyMCE/js/themes/advanced/image.htm
index f30d670641..b8ba729f6f 100644
--- a/plugins/TinyMCE/js/themes/advanced/image.htm
+++ b/plugins/TinyMCE/js/themes/advanced/image.htm
@@ -17,57 +17,57 @@
 
 	<div class="panel_wrapper">
 		<div id="general_panel" class="panel current">
-     <table border="0" cellpadding="4" cellspacing="0">
-          <tr>
-            <td class="nowrap"><label for="src">{#advanced_dlg.image_src}</label></td>
-            <td><table border="0" cellspacing="0" cellpadding="0">
-                <tr>
-                  <td><input id="src" name="src" type="text" class="mceFocus" value="" style="width: 200px" onchange="ImageDialog.getImageData();" /></td>
-                  <td id="srcbrowsercontainer">&nbsp;</td>
-                </tr>
-              </table></td>
-          </tr>
-		  <tr>
-			<td><label for="image_list">{#advanced_dlg.image_list}</label></td>
-			<td><select id="image_list" name="image_list" onchange="document.getElementById('src').value=this.options[this.selectedIndex].value;document.getElementById('alt').value=this.options[this.selectedIndex].text;"></select></td>
-		  </tr>
-          <tr>
-            <td class="nowrap"><label for="alt">{#advanced_dlg.image_alt}</label></td>
-            <td><input id="alt" name="alt" type="text" value="" style="width: 200px" /></td>
-          </tr>
-          <tr>
-            <td class="nowrap"><label for="align">{#advanced_dlg.image_align}</label></td>
-            <td><select id="align" name="align" onchange="ImageDialog.updateStyle();">
-                <option value="">{#not_set}</option>
-                <option value="baseline">{#advanced_dlg.image_align_baseline}</option>
-                <option value="top">{#advanced_dlg.image_align_top}</option>
-                <option value="middle">{#advanced_dlg.image_align_middle}</option>
-                <option value="bottom">{#advanced_dlg.image_align_bottom}</option>
-                <option value="text-top">{#advanced_dlg.image_align_texttop}</option>
-                <option value="text-bottom">{#advanced_dlg.image_align_textbottom}</option>
-                <option value="left">{#advanced_dlg.image_align_left}</option>
-                <option value="right">{#advanced_dlg.image_align_right}</option>
-              </select></td>
-          </tr>
-          <tr>
-            <td class="nowrap"><label for="width">{#advanced_dlg.image_dimensions}</label></td>
-            <td><input id="width" name="width" type="text" value="" size="3" maxlength="5" />
-              x
-              <input id="height" name="height" type="text" value="" size="3" maxlength="5" /></td>
-          </tr>
-          <tr>
-            <td class="nowrap"><label for="border">{#advanced_dlg.image_border}</label></td>
-            <td><input id="border" name="border" type="text" value="" size="3" maxlength="3" onchange="ImageDialog.updateStyle();" /></td>
-          </tr>
-          <tr>
-            <td class="nowrap"><label for="vspace">{#advanced_dlg.image_vspace}</label></td>
-            <td><input id="vspace" name="vspace" type="text" value="" size="3" maxlength="3" onchange="ImageDialog.updateStyle();" /></td>
-          </tr>
-          <tr>
-            <td class="nowrap"><label for="hspace">{#advanced_dlg.image_hspace}</label></td>
-            <td><input id="hspace" name="hspace" type="text" value="" size="3" maxlength="3" onchange="ImageDialog.updateStyle();" /></td>
-          </tr>
-        </table>
+			<table border="0" cellpadding="4" cellspacing="0">
+				<tr>
+					<td class="nowrap"><label for="src">{#advanced_dlg.image_src}</label></td>
+					<td><table border="0" cellspacing="0" cellpadding="0">
+						<tr>
+							<td><input id="src" name="src" type="text" class="mceFocus" value="" style="width: 200px" onchange="ImageDialog.getImageData();" /></td>
+							<td id="srcbrowsercontainer">&nbsp;</td>
+						</tr>
+					</table></td>
+				</tr>
+				<tr>
+					<td><label for="image_list">{#advanced_dlg.image_list}</label></td>
+					<td><select id="image_list" name="image_list" onchange="document.getElementById('src').value=this.options[this.selectedIndex].value;document.getElementById('alt').value=this.options[this.selectedIndex].text;"></select></td>
+				</tr>
+				<tr>
+					<td class="nowrap"><label for="alt">{#advanced_dlg.image_alt}</label></td>
+					<td><input id="alt" name="alt" type="text" value="" style="width: 200px" /></td>
+				</tr>
+				<tr>
+					<td class="nowrap"><label for="align">{#advanced_dlg.image_align}</label></td>
+					<td><select id="align" name="align" onchange="ImageDialog.updateStyle();">
+						<option value="">{#not_set}</option>
+						<option value="baseline">{#advanced_dlg.image_align_baseline}</option>
+						<option value="top">{#advanced_dlg.image_align_top}</option>
+						<option value="middle">{#advanced_dlg.image_align_middle}</option>
+						<option value="bottom">{#advanced_dlg.image_align_bottom}</option>
+						<option value="text-top">{#advanced_dlg.image_align_texttop}</option>
+						<option value="text-bottom">{#advanced_dlg.image_align_textbottom}</option>
+						<option value="left">{#advanced_dlg.image_align_left}</option>
+						<option value="right">{#advanced_dlg.image_align_right}</option>
+					</select></td>
+				</tr>
+				<tr>
+					<td class="nowrap"><label for="width">{#advanced_dlg.image_dimensions}</label></td>
+					<td><input id="width" name="width" type="text" value="" size="3" maxlength="5" />
+					 x 
+					<input id="height" name="height" type="text" value="" size="3" maxlength="5" /></td>
+				</tr>
+				<tr>
+				<td class="nowrap"><label for="border">{#advanced_dlg.image_border}</label></td>
+				<td><input id="border" name="border" type="text" value="" size="3" maxlength="3" onchange="ImageDialog.updateStyle();" /></td>
+				</tr>
+				<tr>
+					<td class="nowrap"><label for="vspace">{#advanced_dlg.image_vspace}</label></td>
+					<td><input id="vspace" name="vspace" type="text" value="" size="3" maxlength="3" onchange="ImageDialog.updateStyle();" /></td>
+				</tr>
+				<tr>
+					<td class="nowrap"><label for="hspace">{#advanced_dlg.image_hspace}</label></td>
+					<td><input id="hspace" name="hspace" type="text" value="" size="3" maxlength="3" onchange="ImageDialog.updateStyle();" /></td>
+				</tr>
+			</table>
 		</div>
 	</div>
 
diff --git a/plugins/TinyMCE/js/themes/advanced/img/colorpicker.jpg b/plugins/TinyMCE/js/themes/advanced/img/colorpicker.jpg
index b4c542d107..b1a377aba7 100644
Binary files a/plugins/TinyMCE/js/themes/advanced/img/colorpicker.jpg and b/plugins/TinyMCE/js/themes/advanced/img/colorpicker.jpg differ
diff --git a/plugins/TinyMCE/js/themes/advanced/img/flash.gif b/plugins/TinyMCE/js/themes/advanced/img/flash.gif
new file mode 100644
index 0000000000..dec3f7c702
Binary files /dev/null and b/plugins/TinyMCE/js/themes/advanced/img/flash.gif differ
diff --git a/plugins/TinyMCE/js/themes/advanced/img/icons.gif b/plugins/TinyMCE/js/themes/advanced/img/icons.gif
index e46de53330..641a9e3d31 100644
Binary files a/plugins/TinyMCE/js/themes/advanced/img/icons.gif and b/plugins/TinyMCE/js/themes/advanced/img/icons.gif differ
diff --git a/plugins/TinyMCE/js/themes/advanced/img/iframe.gif b/plugins/TinyMCE/js/themes/advanced/img/iframe.gif
new file mode 100644
index 0000000000..410c7ad084
Binary files /dev/null and b/plugins/TinyMCE/js/themes/advanced/img/iframe.gif differ
diff --git a/plugins/TinyMCE/js/plugins/pagebreak/img/pagebreak.gif b/plugins/TinyMCE/js/themes/advanced/img/pagebreak.gif
similarity index 100%
rename from plugins/TinyMCE/js/plugins/pagebreak/img/pagebreak.gif
rename to plugins/TinyMCE/js/themes/advanced/img/pagebreak.gif
diff --git a/plugins/TinyMCE/js/themes/advanced/img/quicktime.gif b/plugins/TinyMCE/js/themes/advanced/img/quicktime.gif
new file mode 100644
index 0000000000..8f10e7aa6b
Binary files /dev/null and b/plugins/TinyMCE/js/themes/advanced/img/quicktime.gif differ
diff --git a/plugins/TinyMCE/js/plugins/media/img/realmedia.gif b/plugins/TinyMCE/js/themes/advanced/img/realmedia.gif
similarity index 100%
rename from plugins/TinyMCE/js/plugins/media/img/realmedia.gif
rename to plugins/TinyMCE/js/themes/advanced/img/realmedia.gif
diff --git a/plugins/TinyMCE/js/themes/advanced/img/shockwave.gif b/plugins/TinyMCE/js/themes/advanced/img/shockwave.gif
new file mode 100644
index 0000000000..9314d04470
Binary files /dev/null and b/plugins/TinyMCE/js/themes/advanced/img/shockwave.gif differ
diff --git a/plugins/TinyMCE/js/plugins/media/img/trans.gif b/plugins/TinyMCE/js/themes/advanced/img/trans.gif
similarity index 100%
rename from plugins/TinyMCE/js/plugins/media/img/trans.gif
rename to plugins/TinyMCE/js/themes/advanced/img/trans.gif
diff --git a/plugins/TinyMCE/js/themes/advanced/img/video.gif b/plugins/TinyMCE/js/themes/advanced/img/video.gif
new file mode 100644
index 0000000000..3570104077
Binary files /dev/null and b/plugins/TinyMCE/js/themes/advanced/img/video.gif differ
diff --git a/plugins/TinyMCE/js/plugins/media/img/windowsmedia.gif b/plugins/TinyMCE/js/themes/advanced/img/windowsmedia.gif
similarity index 100%
rename from plugins/TinyMCE/js/plugins/media/img/windowsmedia.gif
rename to plugins/TinyMCE/js/themes/advanced/img/windowsmedia.gif
diff --git a/plugins/TinyMCE/js/themes/advanced/js/about.js b/plugins/TinyMCE/js/themes/advanced/js/about.js
index 5cee9ed863..5b35845761 100644
--- a/plugins/TinyMCE/js/themes/advanced/js/about.js
+++ b/plugins/TinyMCE/js/themes/advanced/js/about.js
@@ -66,6 +66,7 @@ function insertHelpIFrame() {
 		html = '<iframe width="100%" height="300" src="' + tinyMCEPopup.editor.baseURI.toAbsolute(tinyMCEPopup.getParam('docs_url')) + '"></iframe>';
 		document.getElementById('iframecontainer').innerHTML = html;
 		document.getElementById('help_tab').style.display = 'block';
+		document.getElementById('help_tab').setAttribute("aria-hidden", "false");
 	}
 }
 
diff --git a/plugins/TinyMCE/js/themes/advanced/js/anchor.js b/plugins/TinyMCE/js/themes/advanced/js/anchor.js
index 7fe7810558..e528e4f42f 100644
--- a/plugins/TinyMCE/js/themes/advanced/js/anchor.js
+++ b/plugins/TinyMCE/js/themes/advanced/js/anchor.js
@@ -19,6 +19,11 @@ var AnchorDialog = {
 	update : function() {
 		var ed = this.editor, elm, name = document.forms[0].anchorName.value;
 
+		if (!name || !/^[a-z][a-z0-9\-\_:\.]*$/i.test(name)) {
+			tinyMCEPopup.alert('advanced_dlg.anchor_invalid');
+			return;
+		}
+
 		tinyMCEPopup.restoreSelection();
 
 		if (this.action != 'update')
diff --git a/plugins/TinyMCE/js/themes/advanced/js/charmap.js b/plugins/TinyMCE/js/themes/advanced/js/charmap.js
index 8c5aea1721..1cead6dfe8 100644
--- a/plugins/TinyMCE/js/themes/advanced/js/charmap.js
+++ b/plugins/TinyMCE/js/themes/advanced/js/charmap.js
@@ -173,7 +173,7 @@ var charmap = [
 	['&yacute;',  '&#253;',  true, 'y - acute'],
 	['&thorn;',   '&#254;',  true, 'thorn'],
 	['&yuml;',    '&#255;',  true, 'y - diaeresis'],
-    ['&Alpha;',   '&#913;',  true, 'Alpha'],
+	['&Alpha;',   '&#913;',  true, 'Alpha'],
 	['&Beta;',    '&#914;',  true, 'Beta'],
 	['&Gamma;',   '&#915;',  true, 'Gamma'],
 	['&Delta;',   '&#916;',  true, 'Delta'],
@@ -258,8 +258,8 @@ var charmap = [
 	['&rfloor;',  '&#8971;', false,'right floor'],
 	['&lang;',    '&#9001;', false,'left-pointing angle bracket'],
 	['&rang;',    '&#9002;', false,'right-pointing angle bracket'],
-	['&loz;',     '&#9674;', true,'lozenge'],
-	['&spades;',  '&#9824;', false,'black spade suit'],
+	['&loz;',     '&#9674;', true, 'lozenge'],
+	['&spades;',  '&#9824;', true, 'black spade suit'],
 	['&clubs;',   '&#9827;', true, 'black club suit'],
 	['&hearts;',  '&#9829;', true, 'black heart suit'],
 	['&diams;',   '&#9830;', true, 'black diamond suit'],
@@ -275,19 +275,38 @@ var charmap = [
 
 tinyMCEPopup.onInit.add(function() {
 	tinyMCEPopup.dom.setHTML('charmapView', renderCharMapHTML());
+	addKeyboardNavigation();
 });
 
+function addKeyboardNavigation(){
+	var tableElm, cells, settings;
+
+	cells = tinyMCEPopup.dom.select(".charmaplink", "charmapgroup");
+
+	settings ={
+		root: "charmapgroup",
+		items: cells
+	};
+
+	tinyMCEPopup.editor.windowManager.createInstance('tinymce.ui.KeyboardNavigation', settings, tinyMCEPopup.dom);
+}
+
 function renderCharMapHTML() {
 	var charsPerRow = 20, tdWidth=20, tdHeight=20, i;
-	var html = '<table border="0" cellspacing="1" cellpadding="0" width="' + (tdWidth*charsPerRow) + '"><tr height="' + tdHeight + '">';
+	var html = '<div id="charmapgroup" aria-labelledby="charmap_label" tabindex="0" role="listbox">'+
+	'<table role="presentation" border="0" cellspacing="1" cellpadding="0" width="' + (tdWidth*charsPerRow) + 
+	'"><tr height="' + tdHeight + '">';
 	var cols=-1;
 
 	for (i=0; i<charmap.length; i++) {
+		var previewCharFn;
+
 		if (charmap[i][2]==true) {
 			cols++;
+			previewCharFn = 'previewChar(\'' + charmap[i][1].substring(1,charmap[i][1].length) + '\',\'' + charmap[i][0].substring(1,charmap[i][0].length) + '\',\'' + charmap[i][3] + '\');';
 			html += ''
 				+ '<td class="charmap">'
-				+ '<a onmouseover="previewChar(\'' + charmap[i][1].substring(1,charmap[i][1].length) + '\',\'' + charmap[i][0].substring(1,charmap[i][0].length) + '\',\'' + charmap[i][3] + '\');" onfocus="previewChar(\'' + charmap[i][1].substring(1,charmap[i][1].length) + '\',\'' + charmap[i][0].substring(1,charmap[i][0].length) + '\',\'' + charmap[i][3] + '\');" href="javascript:void(0)" onclick="insertChar(\'' + charmap[i][1].substring(2,charmap[i][1].length-1) + '\');" onclick="return false;" onmousedown="return false;" title="' + charmap[i][3] + '">'
+				+ '<a class="charmaplink" role="button" onmouseover="'+previewCharFn+'" onfocus="'+previewCharFn+'" href="javascript:void(0)" onclick="insertChar(\'' + charmap[i][1].substring(2,charmap[i][1].length-1) + '\');" onclick="return false;" onmousedown="return false;" title="' + charmap[i][3] + '">'
 				+ charmap[i][1]
 				+ '</a></td>';
 			if ((cols+1) % charsPerRow == 0)
@@ -301,7 +320,8 @@ function renderCharMapHTML() {
 			html += '<td width="' + tdWidth + '" height="' + tdHeight + '" class="charmap">&nbsp;</td>';
 	}
 
-	html += '</tr></table>';
+	html += '</tr></table></div>';
+	html = html.replace(/<tr height="20"><\/tr>/g, '');
 
 	return html;
 }
diff --git a/plugins/TinyMCE/js/themes/advanced/js/color_picker.js b/plugins/TinyMCE/js/themes/advanced/js/color_picker.js
index fd9700f222..7decac5b43 100644
--- a/plugins/TinyMCE/js/themes/advanced/js/color_picker.js
+++ b/plugins/TinyMCE/js/themes/advanced/js/color_picker.js
@@ -1,6 +1,6 @@
 tinyMCEPopup.requireLangPack();
 
-var detail = 50, strhex = "0123456789abcdef", i, isMouseDown = false, isMouseOver = false;
+var detail = 50, strhex = "0123456789ABCDEF", i, isMouseDown = false, isMouseOver = false;
 
 var colors = [
 	"#000000","#000033","#000066","#000099","#0000cc","#0000ff","#330000","#330033",
@@ -33,37 +33,41 @@ var colors = [
 ];
 
 var named = {
-	'#F0F8FF':'AliceBlue','#FAEBD7':'AntiqueWhite','#00FFFF':'Aqua','#7FFFD4':'Aquamarine','#F0FFFF':'Azure','#F5F5DC':'Beige',
-	'#FFE4C4':'Bisque','#000000':'Black','#FFEBCD':'BlanchedAlmond','#0000FF':'Blue','#8A2BE2':'BlueViolet','#A52A2A':'Brown',
-	'#DEB887':'BurlyWood','#5F9EA0':'CadetBlue','#7FFF00':'Chartreuse','#D2691E':'Chocolate','#FF7F50':'Coral','#6495ED':'CornflowerBlue',
-	'#FFF8DC':'Cornsilk','#DC143C':'Crimson','#00FFFF':'Cyan','#00008B':'DarkBlue','#008B8B':'DarkCyan','#B8860B':'DarkGoldenRod',
-	'#A9A9A9':'DarkGray','#A9A9A9':'DarkGrey','#006400':'DarkGreen','#BDB76B':'DarkKhaki','#8B008B':'DarkMagenta','#556B2F':'DarkOliveGreen',
-	'#FF8C00':'Darkorange','#9932CC':'DarkOrchid','#8B0000':'DarkRed','#E9967A':'DarkSalmon','#8FBC8F':'DarkSeaGreen','#483D8B':'DarkSlateBlue',
-	'#2F4F4F':'DarkSlateGray','#2F4F4F':'DarkSlateGrey','#00CED1':'DarkTurquoise','#9400D3':'DarkViolet','#FF1493':'DeepPink','#00BFFF':'DeepSkyBlue',
-	'#696969':'DimGray','#696969':'DimGrey','#1E90FF':'DodgerBlue','#B22222':'FireBrick','#FFFAF0':'FloralWhite','#228B22':'ForestGreen',
-	'#FF00FF':'Fuchsia','#DCDCDC':'Gainsboro','#F8F8FF':'GhostWhite','#FFD700':'Gold','#DAA520':'GoldenRod','#808080':'Gray','#808080':'Grey',
-	'#008000':'Green','#ADFF2F':'GreenYellow','#F0FFF0':'HoneyDew','#FF69B4':'HotPink','#CD5C5C':'IndianRed','#4B0082':'Indigo','#FFFFF0':'Ivory',
-	'#F0E68C':'Khaki','#E6E6FA':'Lavender','#FFF0F5':'LavenderBlush','#7CFC00':'LawnGreen','#FFFACD':'LemonChiffon','#ADD8E6':'LightBlue',
-	'#F08080':'LightCoral','#E0FFFF':'LightCyan','#FAFAD2':'LightGoldenRodYellow','#D3D3D3':'LightGray','#D3D3D3':'LightGrey','#90EE90':'LightGreen',
-	'#FFB6C1':'LightPink','#FFA07A':'LightSalmon','#20B2AA':'LightSeaGreen','#87CEFA':'LightSkyBlue','#778899':'LightSlateGray','#778899':'LightSlateGrey',
-	'#B0C4DE':'LightSteelBlue','#FFFFE0':'LightYellow','#00FF00':'Lime','#32CD32':'LimeGreen','#FAF0E6':'Linen','#FF00FF':'Magenta','#800000':'Maroon',
-	'#66CDAA':'MediumAquaMarine','#0000CD':'MediumBlue','#BA55D3':'MediumOrchid','#9370D8':'MediumPurple','#3CB371':'MediumSeaGreen','#7B68EE':'MediumSlateBlue',
-	'#00FA9A':'MediumSpringGreen','#48D1CC':'MediumTurquoise','#C71585':'MediumVioletRed','#191970':'MidnightBlue','#F5FFFA':'MintCream','#FFE4E1':'MistyRose','#FFE4B5':'Moccasin',
-	'#FFDEAD':'NavajoWhite','#000080':'Navy','#FDF5E6':'OldLace','#808000':'Olive','#6B8E23':'OliveDrab','#FFA500':'Orange','#FF4500':'OrangeRed','#DA70D6':'Orchid',
-	'#EEE8AA':'PaleGoldenRod','#98FB98':'PaleGreen','#AFEEEE':'PaleTurquoise','#D87093':'PaleVioletRed','#FFEFD5':'PapayaWhip','#FFDAB9':'PeachPuff',
-	'#CD853F':'Peru','#FFC0CB':'Pink','#DDA0DD':'Plum','#B0E0E6':'PowderBlue','#800080':'Purple','#FF0000':'Red','#BC8F8F':'RosyBrown','#4169E1':'RoyalBlue',
-	'#8B4513':'SaddleBrown','#FA8072':'Salmon','#F4A460':'SandyBrown','#2E8B57':'SeaGreen','#FFF5EE':'SeaShell','#A0522D':'Sienna','#C0C0C0':'Silver',
-	'#87CEEB':'SkyBlue','#6A5ACD':'SlateBlue','#708090':'SlateGray','#708090':'SlateGrey','#FFFAFA':'Snow','#00FF7F':'SpringGreen',
-	'#4682B4':'SteelBlue','#D2B48C':'Tan','#008080':'Teal','#D8BFD8':'Thistle','#FF6347':'Tomato','#40E0D0':'Turquoise','#EE82EE':'Violet',
-	'#F5DEB3':'Wheat','#FFFFFF':'White','#F5F5F5':'WhiteSmoke','#FFFF00':'Yellow','#9ACD32':'YellowGreen'
+	'#F0F8FF':'Alice Blue','#FAEBD7':'Antique White','#00FFFF':'Aqua','#7FFFD4':'Aquamarine','#F0FFFF':'Azure','#F5F5DC':'Beige',
+	'#FFE4C4':'Bisque','#000000':'Black','#FFEBCD':'Blanched Almond','#0000FF':'Blue','#8A2BE2':'Blue Violet','#A52A2A':'Brown',
+	'#DEB887':'Burly Wood','#5F9EA0':'Cadet Blue','#7FFF00':'Chartreuse','#D2691E':'Chocolate','#FF7F50':'Coral','#6495ED':'Cornflower Blue',
+	'#FFF8DC':'Cornsilk','#DC143C':'Crimson','#00FFFF':'Cyan','#00008B':'Dark Blue','#008B8B':'Dark Cyan','#B8860B':'Dark Golden Rod',
+	'#A9A9A9':'Dark Gray','#A9A9A9':'Dark Grey','#006400':'Dark Green','#BDB76B':'Dark Khaki','#8B008B':'Dark Magenta','#556B2F':'Dark Olive Green',
+	'#FF8C00':'Darkorange','#9932CC':'Dark Orchid','#8B0000':'Dark Red','#E9967A':'Dark Salmon','#8FBC8F':'Dark Sea Green','#483D8B':'Dark Slate Blue',
+	'#2F4F4F':'Dark Slate Gray','#2F4F4F':'Dark Slate Grey','#00CED1':'Dark Turquoise','#9400D3':'Dark Violet','#FF1493':'Deep Pink','#00BFFF':'Deep Sky Blue',
+	'#696969':'Dim Gray','#696969':'Dim Grey','#1E90FF':'Dodger Blue','#B22222':'Fire Brick','#FFFAF0':'Floral White','#228B22':'Forest Green',
+	'#FF00FF':'Fuchsia','#DCDCDC':'Gainsboro','#F8F8FF':'Ghost White','#FFD700':'Gold','#DAA520':'Golden Rod','#808080':'Gray','#808080':'Grey',
+	'#008000':'Green','#ADFF2F':'Green Yellow','#F0FFF0':'Honey Dew','#FF69B4':'Hot Pink','#CD5C5C':'Indian Red','#4B0082':'Indigo','#FFFFF0':'Ivory',
+	'#F0E68C':'Khaki','#E6E6FA':'Lavender','#FFF0F5':'Lavender Blush','#7CFC00':'Lawn Green','#FFFACD':'Lemon Chiffon','#ADD8E6':'Light Blue',
+	'#F08080':'Light Coral','#E0FFFF':'Light Cyan','#FAFAD2':'Light Golden Rod Yellow','#D3D3D3':'Light Gray','#D3D3D3':'Light Grey','#90EE90':'Light Green',
+	'#FFB6C1':'Light Pink','#FFA07A':'Light Salmon','#20B2AA':'Light Sea Green','#87CEFA':'Light Sky Blue','#778899':'Light Slate Gray','#778899':'Light Slate Grey',
+	'#B0C4DE':'Light Steel Blue','#FFFFE0':'Light Yellow','#00FF00':'Lime','#32CD32':'Lime Green','#FAF0E6':'Linen','#FF00FF':'Magenta','#800000':'Maroon',
+	'#66CDAA':'Medium Aqua Marine','#0000CD':'Medium Blue','#BA55D3':'Medium Orchid','#9370D8':'Medium Purple','#3CB371':'Medium Sea Green','#7B68EE':'Medium Slate Blue',
+	'#00FA9A':'Medium Spring Green','#48D1CC':'Medium Turquoise','#C71585':'Medium Violet Red','#191970':'Midnight Blue','#F5FFFA':'Mint Cream','#FFE4E1':'Misty Rose','#FFE4B5':'Moccasin',
+	'#FFDEAD':'Navajo White','#000080':'Navy','#FDF5E6':'Old Lace','#808000':'Olive','#6B8E23':'Olive Drab','#FFA500':'Orange','#FF4500':'Orange Red','#DA70D6':'Orchid',
+	'#EEE8AA':'Pale Golden Rod','#98FB98':'Pale Green','#AFEEEE':'Pale Turquoise','#D87093':'Pale Violet Red','#FFEFD5':'Papaya Whip','#FFDAB9':'Peach Puff',
+	'#CD853F':'Peru','#FFC0CB':'Pink','#DDA0DD':'Plum','#B0E0E6':'Powder Blue','#800080':'Purple','#FF0000':'Red','#BC8F8F':'Rosy Brown','#4169E1':'Royal Blue',
+	'#8B4513':'Saddle Brown','#FA8072':'Salmon','#F4A460':'Sandy Brown','#2E8B57':'Sea Green','#FFF5EE':'Sea Shell','#A0522D':'Sienna','#C0C0C0':'Silver',
+	'#87CEEB':'Sky Blue','#6A5ACD':'Slate Blue','#708090':'Slate Gray','#708090':'Slate Grey','#FFFAFA':'Snow','#00FF7F':'Spring Green',
+	'#4682B4':'Steel Blue','#D2B48C':'Tan','#008080':'Teal','#D8BFD8':'Thistle','#FF6347':'Tomato','#40E0D0':'Turquoise','#EE82EE':'Violet',
+	'#F5DEB3':'Wheat','#FFFFFF':'White','#F5F5F5':'White Smoke','#FFFF00':'Yellow','#9ACD32':'Yellow Green'
 };
 
+var namedLookup = {};
+
 function init() {
-	var inputColor = convertRGBToHex(tinyMCEPopup.getWindowArg('input_color'));
+	var inputColor = convertRGBToHex(tinyMCEPopup.getWindowArg('input_color')), key, value;
 
 	tinyMCEPopup.resizeToInnerSize();
 
 	generatePicker();
+	generateWebColors();
+	generateNamedColors();
 
 	if (inputColor) {
 		changeFinalColor(inputColor);
@@ -73,6 +77,45 @@ function init() {
 		if (col)
 			updateLight(col.r, col.g, col.b);
 	}
+	
+	for (key in named) {
+		value = named[key];
+		namedLookup[value.replace(/\s+/, '').toLowerCase()] = key.replace(/#/, '').toLowerCase();
+	}
+}
+
+function toHexColor(color) {
+	var matches, red, green, blue, toInt = parseInt;
+
+	function hex(value) {
+		value = parseInt(value).toString(16);
+
+		return value.length > 1 ? value : '0' + value; // Padd with leading zero
+	};
+
+	color = color.replace(/[\s#]+/g, '').toLowerCase();
+	color = namedLookup[color] || color;
+	matches = /^rgb\((\d{1,3}),(\d{1,3}),(\d{1,3})\)|([a-f0-9]{2})([a-f0-9]{2})([a-f0-9]{2})|([a-f0-9])([a-f0-9])([a-f0-9])$/.exec(color);
+
+	if (matches) {
+		if (matches[1]) {
+			red = toInt(matches[1]);
+			green = toInt(matches[2]);
+			blue = toInt(matches[3]);
+		} else if (matches[4]) {
+			red = toInt(matches[4], 16);
+			green = toInt(matches[5], 16);
+			blue = toInt(matches[6], 16);
+		} else if (matches[7]) {
+			red = toInt(matches[7] + matches[7], 16);
+			green = toInt(matches[8] + matches[8], 16);
+			blue = toInt(matches[9] + matches[9], 16);
+		}
+
+		return '#' + hex(red) + hex(green) + hex(blue);
+	}
+
+	return '';
 }
 
 function insertAction() {
@@ -81,7 +124,7 @@ function insertAction() {
 	tinyMCEPopup.restoreSelection();
 
 	if (f)
-		f(color);
+		f(toHexColor(color));
 
 	tinyMCEPopup.close();
 }
@@ -91,7 +134,7 @@ function showColor(color, name) {
 		document.getElementById("colorname").innerHTML = name;
 
 	document.getElementById("preview").style.backgroundColor = color;
-	document.getElementById("color").value = color.toLowerCase();
+	document.getElementById("color").value = color.toUpperCase();
 }
 
 function convertRGBToHex(col) {
@@ -153,23 +196,40 @@ function generateWebColors() {
 	if (el.className == 'generated')
 		return;
 
-	h += '<table border="0" cellspacing="1" cellpadding="0">'
+	// TODO: VoiceOver doesn't seem to support legend as a label referenced by labelledby.
+	h += '<div role="listbox" aria-labelledby="webcolors_title" tabindex="0"><table role="presentation" border="0" cellspacing="1" cellpadding="0">'
 		+ '<tr>';
 
 	for (i=0; i<colors.length; i++) {
 		h += '<td bgcolor="' + colors[i] + '" width="10" height="10">'
-			+ '<a href="javascript:insertAction();" onfocus="showColor(\'' + colors[i] +  '\');" onmouseover="showColor(\'' + colors[i] +  '\');" style="display:block;width:10px;height:10px;overflow:hidden;">'
-			+ '</a></td>';
+			+ '<a href="javascript:insertAction();" role="option" tabindex="-1" aria-labelledby="web_colors_' + i + '" onfocus="showColor(\'' + colors[i] + '\');" onmouseover="showColor(\'' + colors[i] + '\');" style="display:block;width:10px;height:10px;overflow:hidden;">';
+		if (tinyMCEPopup.editor.forcedHighContrastMode) {
+			h += '<canvas class="mceColorSwatch" height="10" width="10" data-color="' + colors[i] + '"></canvas>';
+		}
+		h += '<span class="mceVoiceLabel" style="display:none;" id="web_colors_' + i + '">' + colors[i].toUpperCase() + '</span>';
+		h += '</a></td>';
 		if ((i+1) % 18 == 0)
 			h += '</tr><tr>';
 	}
 
-	h += '</table>';
+	h += '</table></div>';
 
 	el.innerHTML = h;
 	el.className = 'generated';
+
+	paintCanvas(el);
+	enableKeyboardNavigation(el.firstChild);
 }
 
+function paintCanvas(el) {
+	tinyMCEPopup.getWin().tinymce.each(tinyMCEPopup.dom.select('canvas.mceColorSwatch', el), function(canvas) {
+		var context;
+		if (canvas.getContext && (context = canvas.getContext("2d"))) {
+			context.fillStyle = canvas.getAttribute('data-color');
+			context.fillRect(0, 0, 10, 10);
+		}
+	});
+}
 function generateNamedColors() {
 	var el = document.getElementById('namedcolors'), h = '', n, v, i = 0;
 
@@ -178,11 +238,27 @@ function generateNamedColors() {
 
 	for (n in named) {
 		v = named[n];
-		h += '<a href="javascript:insertAction();" onmouseover="showColor(\'' + n +  '\',\'' + v + '\');" style="background-color: ' + n + '"><!-- IE --></a>'
+		h += '<a href="javascript:insertAction();" role="option" tabindex="-1" aria-labelledby="named_colors_' + i + '" onfocus="showColor(\'' + n + '\',\'' + v + '\');" onmouseover="showColor(\'' + n + '\',\'' + v + '\');" style="background-color: ' + n + '">';
+		if (tinyMCEPopup.editor.forcedHighContrastMode) {
+			h += '<canvas class="mceColorSwatch" height="10" width="10" data-color="' + colors[i] + '"></canvas>';
+		}
+		h += '<span class="mceVoiceLabel" style="display:none;" id="named_colors_' + i + '">' + v + '</span>';
+		h += '</a>';
+		i++;
 	}
 
 	el.innerHTML = h;
 	el.className = 'generated';
+
+	paintCanvas(el);
+	enableKeyboardNavigation(el);
+}
+
+function enableKeyboardNavigation(el) {
+	tinyMCEPopup.editor.windowManager.createInstance('tinymce.ui.KeyboardNavigation', {
+		root: el,
+		items: tinyMCEPopup.dom.select('a', el)
+	}, tinyMCEPopup.dom);
 }
 
 function dechex(n) {
diff --git a/plugins/TinyMCE/js/themes/advanced/js/image.js b/plugins/TinyMCE/js/themes/advanced/js/image.js
index 6423d90809..2bccc97b92 100644
--- a/plugins/TinyMCE/js/themes/advanced/js/image.js
+++ b/plugins/TinyMCE/js/themes/advanced/js/image.js
@@ -18,7 +18,7 @@ var ImageDialog = {
 
 		e = ed.selection.getNode();
 
-		this.fillFileList('image_list', 'tinyMCEImageList');
+		this.fillFileList('image_list', tinyMCEPopup.getParam('external_image_list', 'tinyMCEImageList'));
 
 		if (e.nodeName == 'IMG') {
 			f.src.value = ed.dom.getAttrib(e, 'src');
@@ -39,7 +39,7 @@ var ImageDialog = {
 	fillFileList : function(id, l) {
 		var dom = tinyMCEPopup.dom, lst = dom.get(id), v, cl;
 
-		l = window[l];
+		l = typeof(l) === 'function' ? l() : window[l];
 
 		if (l && l.length > 0) {
 			lst.options[lst.options.length] = new Option('', '');
@@ -77,7 +77,7 @@ var ImageDialog = {
 			args.style = this.styleVal;
 
 		tinymce.extend(args, {
-			src : f.src.value,
+			src : f.src.value.replace(/ /g, '%20'),
 			alt : f.alt.value,
 			width : f.width.value,
 			height : f.height.value
@@ -87,6 +87,8 @@ var ImageDialog = {
 
 		if (el && el.nodeName == 'IMG') {
 			ed.dom.setAttribs(el, args);
+			tinyMCEPopup.editor.execCommand('mceRepaint');
+			tinyMCEPopup.editor.focus();
 		} else {
 			ed.execCommand('mceInsertContent', false, '<img id="__mce_tmp" />', {skip_undo : 1});
 			ed.dom.setAttribs('__mce_tmp', args);
diff --git a/plugins/TinyMCE/js/themes/advanced/js/link.js b/plugins/TinyMCE/js/themes/advanced/js/link.js
index f67a5bc828..53ff409e79 100644
--- a/plugins/TinyMCE/js/themes/advanced/js/link.js
+++ b/plugins/TinyMCE/js/themes/advanced/js/link.js
@@ -31,7 +31,7 @@ var LinkDialog = {
 	},
 
 	update : function() {
-		var f = document.forms[0], ed = tinyMCEPopup.editor, e, b;
+		var f = document.forms[0], ed = tinyMCEPopup.editor, e, b, href = f.href.value.replace(/ /g, '%20');
 
 		tinyMCEPopup.restoreSelection();
 		e = ed.dom.getParent(ed.selection.getNode(), 'A');
@@ -39,7 +39,6 @@ var LinkDialog = {
 		// Remove element if there is no href
 		if (!f.href.value) {
 			if (e) {
-				tinyMCEPopup.execCommand("mceBeginUndoLevel");
 				b = ed.selection.getBookmark();
 				ed.dom.remove(e, 1);
 				ed.selection.moveToBookmark(b);
@@ -49,19 +48,17 @@ var LinkDialog = {
 			}
 		}
 
-		tinyMCEPopup.execCommand("mceBeginUndoLevel");
-
 		// Create new anchor elements
 		if (e == null) {
 			ed.getDoc().execCommand("unlink", false, null);
-			tinyMCEPopup.execCommand("CreateLink", false, "#mce_temp_url#", {skip_undo : 1});
+			tinyMCEPopup.execCommand("mceInsertLink", false, "#mce_temp_url#", {skip_undo : 1});
 
 			tinymce.each(ed.dom.select("a"), function(n) {
 				if (ed.dom.getAttrib(n, 'href') == '#mce_temp_url#') {
 					e = n;
 
 					ed.dom.setAttribs(e, {
-						href : f.href.value,
+						href : href,
 						title : f.linktitle.value,
 						target : f.target_list ? getSelectValue(f, "target_list") : null,
 						'class' : f.class_list ? getSelectValue(f, "class_list") : null
@@ -70,7 +67,7 @@ var LinkDialog = {
 			});
 		} else {
 			ed.dom.setAttribs(e, {
-				href : f.href.value,
+				href : href,
 				title : f.linktitle.value,
 				target : f.target_list ? getSelectValue(f, "target_list") : null,
 				'class' : f.class_list ? getSelectValue(f, "class_list") : null
diff --git a/plugins/TinyMCE/js/themes/advanced/js/source_editor.js b/plugins/TinyMCE/js/themes/advanced/js/source_editor.js
index 279328614c..84546ad52e 100644
--- a/plugins/TinyMCE/js/themes/advanced/js/source_editor.js
+++ b/plugins/TinyMCE/js/themes/advanced/js/source_editor.js
@@ -44,19 +44,13 @@ function toggleWordWrap(elm) {
 		setWrap('off');
 }
 
-var wHeight=0, wWidth=0, owHeight=0, owWidth=0;
-
 function resizeInputs() {
-	var el = document.getElementById('htmlSource');
+	var vp = tinyMCEPopup.dom.getViewPort(window), el;
 
-	if (!tinymce.isIE) {
-		 wHeight = self.innerHeight - 65;
-		 wWidth = self.innerWidth - 16;
-	} else {
-		 wHeight = document.body.clientHeight - 70;
-		 wWidth = document.body.clientWidth - 16;
+	el = document.getElementById('htmlSource');
+
+	if (el) {
+		el.style.width = (vp.w - 20) + 'px';
+		el.style.height = (vp.h - 65) + 'px';
 	}
-
-	el.style.height = Math.abs(wHeight) + 'px';
-	el.style.width  = Math.abs(wWidth) + 'px';
 }
diff --git a/plugins/TinyMCE/js/themes/advanced/langs/en.js b/plugins/TinyMCE/js/themes/advanced/langs/en.js
index 69694b1f9f..fbf29893fe 100644
--- a/plugins/TinyMCE/js/themes/advanced/langs/en.js
+++ b/plugins/TinyMCE/js/themes/advanced/langs/en.js
@@ -58,5 +58,11 @@ clipboard_msg:"Copy/Cut/Paste is not available in Mozilla and Firefox.\r\nDo you
 path:"Path",
 newdocument:"Are you sure you want clear all contents?",
 toolbar_focus:"Jump to tool buttons - Alt+Q, Jump to editor - Alt-Z, Jump to element path - Alt-X",
-more_colors:"More colors"
-});
\ No newline at end of file
+more_colors:"More colors",
+
+// Accessibility Strings
+shortcuts_desc:'Accessibility Help',
+help_shortcut:'. Press ALT F10 for toolbar. Press ALT 0 for help.',
+rich_text_area:"Rich Text Area",
+toolbar:"Toolbar"
+});
diff --git a/plugins/TinyMCE/js/themes/advanced/langs/en_dlg.js b/plugins/TinyMCE/js/themes/advanced/langs/en_dlg.js
index 9d124d7db6..0a459beb5c 100644
--- a/plugins/TinyMCE/js/themes/advanced/langs/en_dlg.js
+++ b/plugins/TinyMCE/js/themes/advanced/langs/en_dlg.js
@@ -10,6 +10,7 @@ about_version:"Version",
 about_loaded:"Loaded plugins",
 anchor_title:"Insert/edit anchor",
 anchor_name:"Anchor name",
+anchor_invalid:"Please specify a valid anchor name.",
 code_title:"HTML Source Editor",
 code_wordwrap:"Word wrap",
 colorpicker_title:"Select a color",
@@ -45,7 +46,9 @@ link_target:"Target",
 link_target_same:"Open link in the same window",
 link_target_blank:"Open link in a new window",
 link_titlefield:"Title",
-link_is_email:"The URL you entered seems to be an email address, do you want to add the required mailto: prefix?",
-link_is_external:"The URL you entered seems to external link, do you want to add the required http:// prefix?",
-link_list:"Link list"
+link_is_email:"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?",
+link_is_external:"The URL you entered seems to be an external link. Do you want to add the required http:// prefix?",
+link_list:"Link list",
+accessibility_help:"Accessibility Help",
+accessibility_usage_title:"General Usage"
 });
\ No newline at end of file
diff --git a/plugins/TinyMCE/js/themes/advanced/link.htm b/plugins/TinyMCE/js/themes/advanced/link.htm
index 7565b9ae8b..5d9dea9b8c 100644
--- a/plugins/TinyMCE/js/themes/advanced/link.htm
+++ b/plugins/TinyMCE/js/themes/advanced/link.htm
@@ -18,34 +18,33 @@
 
 	<div class="panel_wrapper">
 		<div id="general_panel" class="panel current">
-
-		<table border="0" cellpadding="4" cellspacing="0">
-          <tr>
-            <td class="nowrap"><label for="href">{#advanced_dlg.link_url}</label></td>
-            <td><table border="0" cellspacing="0" cellpadding="0"> 
-				  <tr> 
-					<td><input id="href" name="href" type="text" class="mceFocus" value="" style="width: 200px" onchange="LinkDialog.checkPrefix(this);" /></td> 
-					<td id="hrefbrowsercontainer">&nbsp;</td>
-				  </tr> 
-				</table></td>
-          </tr>
-		  <tr>
-			<td><label for="link_list">{#advanced_dlg.link_list}</label></td>
-			<td><select id="link_list" name="link_list" onchange="document.getElementById('href').value=this.options[this.selectedIndex].value;"></select></td>
-		  </tr>
-		<tr>
-			<td><label id="targetlistlabel" for="targetlist">{#advanced_dlg.link_target}</label></td>
-			<td><select id="target_list" name="target_list"></select></td>
-		</tr>
-          <tr>
-            <td class="nowrap"><label for="linktitle">{#advanced_dlg.link_titlefield}</label></td>
-            <td><input id="linktitle" name="linktitle" type="text" value="" style="width: 200px" /></td>
-          </tr>
-			<tr>
-				<td><label for="class_list">{#class_name}</label></td>
-				<td><select id="class_list" name="class_list"></select></td>
-			</tr>
-        </table>
+			<table border="0" cellpadding="4" cellspacing="0">
+				<tr>
+					<td class="nowrap"><label for="href">{#advanced_dlg.link_url}</label></td>
+					<td><table border="0" cellspacing="0" cellpadding="0"> 
+						<tr> 
+							<td><input id="href" name="href" type="text" class="mceFocus" value="" style="width: 200px" onchange="LinkDialog.checkPrefix(this);" /></td> 
+							<td id="hrefbrowsercontainer">&nbsp;</td>
+						</tr> 
+					</table></td>
+				</tr>
+				<tr>
+					<td><label for="link_list">{#advanced_dlg.link_list}</label></td>
+					<td><select id="link_list" name="link_list" onchange="document.getElementById('href').value=this.options[this.selectedIndex].value;"></select></td>
+				</tr>
+				<tr>
+					<td><label id="targetlistlabel" for="targetlist">{#advanced_dlg.link_target}</label></td>
+					<td><select id="target_list" name="target_list"></select></td>
+				</tr>
+				<tr>
+					<td class="nowrap"><label for="linktitle">{#advanced_dlg.link_titlefield}</label></td>
+					<td><input id="linktitle" name="linktitle" type="text" value="" style="width: 200px" /></td>
+				</tr>
+				<tr>
+					<td><label for="class_list">{#class_name}</label></td>
+					<td><select id="class_list" name="class_list"></select></td>
+				</tr>
+			</table>
 		</div>
 	</div>
 
diff --git a/plugins/TinyMCE/js/themes/advanced/shortcuts.htm b/plugins/TinyMCE/js/themes/advanced/shortcuts.htm
new file mode 100644
index 0000000000..20ec2f5a34
--- /dev/null
+++ b/plugins/TinyMCE/js/themes/advanced/shortcuts.htm
@@ -0,0 +1,47 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+	<head>
+		<title>{#advanced_dlg.accessibility_help}</title>
+		<script type="text/javascript" src="../../tiny_mce_popup.js"></script>
+		<script type="text/javascript">tinyMCEPopup.requireLangPack();</script>
+	</head>
+	<body id="content">
+		<h1>{#advanced_dlg.accessibility_usage_title}</h1>
+		<h2>Toolbars</h2>
+		<p>Press ALT-F10 to move focus to the toolbars. Navigate through the buttons using the arrow keys.
+		Press enter to activate a button and return focus to the editor.
+		Press escape to return focus to the editor without performing any actions.</p>
+		
+		<h2>Status Bar</h2>
+		<p>To access the editor status bar, press ALT-F11. Use the left and right arrow keys to navigate between elements in the path.
+		Press enter or space to select an element. Press escape to return focus to the editor without changing the selection.</p>
+		
+		<h2>Context Menu</h2>
+		<p>Press shift-F10 to activate the context menu. Use the up and down arrow keys to move between menu items. To open sub-menus press the right arrow key.
+		To close submenus press the left arrow key.  Press escape to close the context menu.</p>
+		
+		<h1>Keyboard Shortcuts</h1>
+		<table>
+			<thead>
+				<tr>
+					<th>Keystroke</th>
+					<th>Function</th>
+				</tr>
+			</thead>
+			<tbody>
+				<tr>
+					<td>Control-B</td><td>Bold</td>
+				</tr>
+				<tr>
+					<td>Control-I</td><td>Italic</td>
+				</tr>
+				<tr>
+					<td>Control-Z</td><td>Undo</td>
+				</tr>
+				<tr>
+					<td>Control-Y</td><td>Redo</td>
+				</tr>
+			</tbody>
+		</table>
+	</body>
+</html>
diff --git a/plugins/TinyMCE/js/themes/advanced/skins/default/content.css b/plugins/TinyMCE/js/themes/advanced/skins/default/content.css
index 9fba0431da..569a3ae8c7 100644
--- a/plugins/TinyMCE/js/themes/advanced/skins/default/content.css
+++ b/plugins/TinyMCE/js/themes/advanced/skins/default/content.css
@@ -1,6 +1,7 @@
 body, td, pre {color:#000; font-family:Verdana, Arial, Helvetica, sans-serif; font-size:10px; margin:8px;}
 body {background:#FFF;}
 body.mceForceColors {background:#FFF; color:#000;}
+body.mceBrowserDefaults {background:transparent; color:inherit; font-size:inherit; font-family:inherit;}
 h1 {font-size: 2em}
 h2 {font-size: 1.5em}
 h3 {font-size: 1.17em}
@@ -8,7 +9,7 @@ h4 {font-size: 1em}
 h5 {font-size: .83em}
 h6 {font-size: .75em}
 .mceItemTable, .mceItemTable td, .mceItemTable th, .mceItemTable caption, .mceItemVisualAid {border: 1px dashed #BBB;}
-a.mceItemAnchor {display:inline-block; width:11px !important; height:11px  !important; background:url(img/items.gif) no-repeat 0 0;}
+a.mceItemAnchor {display:inline-block; -webkit-user-select:all; -webkit-user-modify:read-only; -moz-user-select:all; -moz-user-modify:read-only; width:11px !important; height:11px !important; background:url(img/items.gif) no-repeat center center}
 span.mceItemNbsp {background: #DDD}
 td.mceSelected, th.mceSelected {background-color:#3399ff !important}
 img {border:0;}
@@ -34,3 +35,13 @@ scrollbar-track-color:#F5F5F5;
 
 img:-moz-broken {-moz-force-broken-image-icon:1; width:24px; height:24px}
 font[face=mceinline] {font-family:inherit !important}
+
+.mceItemMedia {border:1px dotted #cc0000; background-position:center; background-repeat:no-repeat; background-color:#ffffcc}
+.mceItemShockWave {background-image:url(../../img/shockwave.gif)}
+.mceItemFlash {background-image:url(../../img/flash.gif)}
+.mceItemQuickTime {background-image:url(../../img/quicktime.gif)}
+.mceItemWindowsMedia {background-image:url(../../img/windowsmedia.gif)}
+.mceItemRealMedia {background-image:url(../../img/realmedia.gif)}
+.mceItemVideo {background-image:url(../../img/video.gif)}
+.mceItemIframe {background-image:url(../../img/iframe.gif)}
+.mcePageBreak {display:block;border:0;width:100%;height:12px;border-top:1px dotted #ccc;margin-top:15px;background:#fff url(../../img/pagebreak.gif) no-repeat center top;}
diff --git a/plugins/TinyMCE/js/themes/advanced/skins/default/img/buttons.png b/plugins/TinyMCE/js/themes/advanced/skins/default/img/buttons.png
index 7dd58418ba..1e53560e0a 100644
Binary files a/plugins/TinyMCE/js/themes/advanced/skins/default/img/buttons.png and b/plugins/TinyMCE/js/themes/advanced/skins/default/img/buttons.png differ
diff --git a/plugins/TinyMCE/js/themes/advanced/skins/default/img/items.gif b/plugins/TinyMCE/js/themes/advanced/skins/default/img/items.gif
index 2eafd7954e..d2f93671ca 100644
Binary files a/plugins/TinyMCE/js/themes/advanced/skins/default/img/items.gif and b/plugins/TinyMCE/js/themes/advanced/skins/default/img/items.gif differ
diff --git a/plugins/TinyMCE/js/themes/advanced/skins/default/img/tabs.gif b/plugins/TinyMCE/js/themes/advanced/skins/default/img/tabs.gif
index ce4be63558..06812cb410 100644
Binary files a/plugins/TinyMCE/js/themes/advanced/skins/default/img/tabs.gif and b/plugins/TinyMCE/js/themes/advanced/skins/default/img/tabs.gif differ
diff --git a/plugins/TinyMCE/js/themes/advanced/skins/default/ui.css b/plugins/TinyMCE/js/themes/advanced/skins/default/ui.css
index 0049c7b3d0..2b7c2a59a9 100644
--- a/plugins/TinyMCE/js/themes/advanced/skins/default/ui.css
+++ b/plugins/TinyMCE/js/themes/advanced/skins/default/ui.css
@@ -4,8 +4,8 @@
 .defaultSkin table td {vertical-align:middle}
 
 /* Containers */
-.defaultSkin table {direction:ltr; background:#F0F0EE}
-.defaultSkin iframe {display:block; background:#FFF}
+.defaultSkin table {direction:ltr;background:transparent}
+.defaultSkin iframe {display:block;}
 .defaultSkin .mceToolbar {height:26px}
 .defaultSkin .mceLeft {text-align:left}
 .defaultSkin .mceRight {text-align:right}
@@ -20,9 +20,9 @@
 .defaultSkin table.mceLayout tr.mceFirst td {border-top:1px solid #CCC}
 .defaultSkin table.mceLayout tr.mceLast td {border-bottom:1px solid #CCC}
 .defaultSkin table.mceToolbar, .defaultSkin tr.mceFirst .mceToolbar tr td, .defaultSkin tr.mceLast .mceToolbar tr td {border:0; margin:0; padding:0;}
-.defaultSkin td.mceToolbar {padding-top:1px; vertical-align:top}
+.defaultSkin td.mceToolbar {background:#F0F0EE; padding-top:1px; vertical-align:top}
 .defaultSkin .mceIframeContainer {border-top:1px solid #CCC; border-bottom:1px solid #CCC}
-.defaultSkin .mceStatusbar {font-family:'MS Sans Serif',sans-serif,Verdana,Arial; font-size:9pt; line-height:16px; overflow:visible; color:#000; display:block; height:20px}
+.defaultSkin .mceStatusbar {background:#F0F0EE; font-family:'MS Sans Serif',sans-serif,Verdana,Arial; font-size:9pt; line-height:16px; overflow:visible; color:#000; display:block; height:20px}
 .defaultSkin .mceStatusbar div {float:left; margin:2px}
 .defaultSkin .mceStatusbar a.mceResize {display:block; float:right; background:url(../../img/icons.gif) -800px 0; width:20px; height:20px; cursor:se-resize; outline:0}
 .defaultSkin .mceStatusbar a:hover {text-decoration:underline}
@@ -103,6 +103,7 @@
 .defaultSkin .mceNoIcons .mceMenuItemSelected a {background:url(img/menu_arrow.gif) no-repeat -6px center}
 .defaultSkin .mceMenu span.mceMenuLine {display:none}
 .defaultSkin .mceMenuItemSub a {background:url(img/menu_arrow.gif) no-repeat top right;}
+.defaultSkin .mceMenuItem td, .defaultSkin .mceMenuItem th {line-height: normal}
 
 /* Progress,Resize */
 .defaultSkin .mceBlocker {position:absolute; left:0; top:0; z-index:1000; opacity:0.5; -ms-filter:'alpha(opacity=50)'; filter:alpha(opacity=50); background:#FFF}
diff --git a/plugins/TinyMCE/js/themes/advanced/skins/highcontrast/content.css b/plugins/TinyMCE/js/themes/advanced/skins/highcontrast/content.css
new file mode 100644
index 0000000000..c2e30c7a2b
--- /dev/null
+++ b/plugins/TinyMCE/js/themes/advanced/skins/highcontrast/content.css
@@ -0,0 +1,23 @@
+body, td, pre { margin:8px;}
+body.mceForceColors {background:#FFF; color:#000;}
+h1 {font-size: 2em}
+h2 {font-size: 1.5em}
+h3 {font-size: 1.17em}
+h4 {font-size: 1em}
+h5 {font-size: .83em}
+h6 {font-size: .75em}
+.mceItemTable, .mceItemTable td, .mceItemTable th, .mceItemTable caption, .mceItemVisualAid {border: 1px dashed #BBB;}
+a.mceItemAnchor {display:inline-block; width:11px !important; height:11px  !important; background:url(../default/img/items.gif) no-repeat 0 0;}
+span.mceItemNbsp {background: #DDD}
+td.mceSelected, th.mceSelected {background-color:#3399ff !important}
+img {border:0;}
+table {cursor:default}
+table td, table th {cursor:text}
+ins {border-bottom:1px solid green; text-decoration: none; color:green}
+del {color:red; text-decoration:line-through}
+cite {border-bottom:1px dashed blue}
+acronym {border-bottom:1px dotted #CCC; cursor:help}
+abbr {border-bottom:1px dashed #CCC; cursor:help}
+
+img:-moz-broken {-moz-force-broken-image-icon:1; width:24px; height:24px}
+font[face=mceinline] {font-family:inherit !important}
diff --git a/plugins/TinyMCE/js/themes/advanced/skins/highcontrast/dialog.css b/plugins/TinyMCE/js/themes/advanced/skins/highcontrast/dialog.css
new file mode 100644
index 0000000000..b2ed097cd0
--- /dev/null
+++ b/plugins/TinyMCE/js/themes/advanced/skins/highcontrast/dialog.css
@@ -0,0 +1,105 @@
+/* Generic */
+body {
+font-family:Verdana, Arial, Helvetica, sans-serif; font-size:11px;
+background:#F0F0EE;
+color: black;
+padding:0;
+margin:8px 8px 0 8px;
+}
+
+html {background:#F0F0EE; color:#000;}
+td {font-family:Verdana, Arial, Helvetica, sans-serif; font-size:10px;}
+textarea {resize:none;outline:none;}
+a:link, a:visited {color:black;background-color:transparent;}
+a:hover {color:#2B6FB6;background-color:transparent;}
+.nowrap {white-space: nowrap}
+
+/* Forms */
+fieldset {margin:0; padding:4px; border:1px solid #919B9C; font-family:Verdana, Arial; font-size:10px;}
+legend {color:#2B6FB6; font-weight:bold;}
+label.msg {display:none;}
+label.invalid {color:#EE0000; display:inline;background-color:transparent;}
+input.invalid {border:1px solid #EE0000;background-color:transparent;}
+input {background:#FFF; border:1px solid #CCC;color:black;}
+input, select, textarea {font-family:Verdana, Arial, Helvetica, sans-serif; font-size:10px;}
+input, select, textarea {border:1px solid #808080;}
+input.radio {border:1px none #000000; background:transparent; vertical-align:middle;}
+input.checkbox {border:1px none #000000; background:transparent; vertical-align:middle;}
+.input_noborder {border:0;}
+
+/* Buttons */
+#insert, #cancel, input.button, .updateButton {
+font-weight:bold;
+width:94px; height:23px;
+cursor:pointer;
+padding-bottom:2px;
+float:left;
+}
+
+#cancel {float:right}
+
+/* Browse */
+a.pickcolor, a.browse {text-decoration:none}
+a.browse span {display:block; width:20px; height:18px; background:url(../../img/icons.gif) -860px 0; border:1px solid #FFF; margin-left:1px;}
+.mceOldBoxModel a.browse span {width:22px; height:20px;}
+a.browse:hover span {border:1px solid #0A246A; background-color:#B2BBD0;}
+a.browse span.disabled {border:1px solid white; opacity:0.3; -ms-filter:'alpha(opacity=30)'; filter:alpha(opacity=30)}
+a.browse:hover span.disabled {border:1px solid white; background-color:transparent;}
+a.pickcolor span {display:block; width:20px; height:16px; background:url(../../img/icons.gif) -840px 0; margin-left:2px;}
+.mceOldBoxModel a.pickcolor span {width:21px; height:17px;}
+a.pickcolor:hover span {background-color:#B2BBD0;}
+a.pickcolor:hover span.disabled {}
+
+/* Charmap */
+table.charmap {border:1px solid #AAA; text-align:center}
+td.charmap, #charmap a {width:18px; height:18px; color:#000; border:1px solid #AAA; text-align:center; font-size:12px; vertical-align:middle; line-height: 18px;}
+#charmap a {display:block; color:#000; text-decoration:none; border:0}
+#charmap a:hover {background:#CCC;color:#2B6FB6}
+#charmap #codeN {font-size:10px; font-family:Arial,Helvetica,sans-serif; text-align:center}
+#charmap #codeV {font-size:40px; height:80px; border:1px solid #AAA; text-align:center}
+
+/* Source */
+.wordWrapCode {vertical-align:middle; border:1px none #000000; background:transparent;}
+.mceActionPanel {margin-top:5px;}
+
+/* Tabs classes */
+.tabs {width:100%; height:18px; line-height:normal;}
+.tabs ul {margin:0; padding:0; list-style:none;}
+.tabs li {float:left; border: 1px solid black; border-bottom:0; margin:0 2px 0 0; padding:0 0 0 10px; line-height:17px; height:18px; display:block; cursor:pointer;}
+.tabs li.current {font-weight: bold; margin-right:2px;}
+.tabs span {float:left; display:block; padding:0px 10px 0 0;}
+.tabs a {text-decoration:none; font-family:Verdana, Arial; font-size:10px;}
+.tabs a:link, .tabs a:visited, .tabs a:hover {color:black;}
+
+/* Panels */
+.panel_wrapper div.panel {display:none;}
+.panel_wrapper div.current {display:block; width:100%; height:300px; overflow:visible;}
+.panel_wrapper {border:1px solid #919B9C; padding:10px; padding-top:5px; clear:both; background:white;}
+
+/* Columns */
+.column {float:left;}
+.properties {width:100%;}
+.properties .column1 {}
+.properties .column2 {text-align:left;}
+
+/* Titles */
+h1, h2, h3, h4 {color:#2B6FB6; margin:0; padding:0; padding-top:5px;}
+h3 {font-size:14px;}
+.title {font-size:12px; font-weight:bold; color:#2B6FB6;}
+
+/* Dialog specific */
+#link .panel_wrapper, #link div.current {height:125px;}
+#image .panel_wrapper, #image div.current {height:200px;}
+#plugintable thead {font-weight:bold; background:#DDD;}
+#plugintable, #about #plugintable td {border:1px solid #919B9C;}
+#plugintable {width:96%; margin-top:10px;}
+#pluginscontainer {height:290px; overflow:auto;}
+#colorpicker #preview {float:right; width:50px; height:14px;line-height:1px; border:1px solid black; margin-left:5px;}
+#colorpicker #colors {float:left; border:1px solid gray; cursor:crosshair;}
+#colorpicker #light {border:1px solid gray; margin-left:5px; float:left;width:15px; height:150px; cursor:crosshair;}
+#colorpicker #light div {overflow:hidden;}
+#colorpicker #previewblock {float:right; padding-left:10px; height:20px;}
+#colorpicker .panel_wrapper div.current {height:175px;}
+#colorpicker #namedcolors {width:150px;}
+#colorpicker #namedcolors a {display:block; float:left; width:10px; height:10px; margin:1px 1px 0 0; overflow:hidden;}
+#colorpicker #colornamecontainer {margin-top:5px;}
diff --git a/plugins/TinyMCE/js/themes/advanced/skins/highcontrast/ui.css b/plugins/TinyMCE/js/themes/advanced/skins/highcontrast/ui.css
new file mode 100644
index 0000000000..a2cfcc393c
--- /dev/null
+++ b/plugins/TinyMCE/js/themes/advanced/skins/highcontrast/ui.css
@@ -0,0 +1,102 @@
+/* Reset */
+.highcontrastSkin table, .highcontrastSkin tbody, .highcontrastSkin a, .highcontrastSkin img, .highcontrastSkin tr, .highcontrastSkin div, .highcontrastSkin td, .highcontrastSkin iframe, .highcontrastSkin span, .highcontrastSkin *, .highcontrastSkin .mceText {border:0; margin:0; padding:0; vertical-align:baseline; border-collapse:separate;}
+.highcontrastSkin a:hover, .highcontrastSkin a:link, .highcontrastSkin a:visited, .highcontrastSkin a:active {text-decoration:none; font-weight:normal; cursor:default;}
+.highcontrastSkin table td {vertical-align:middle}
+
+.highcontrastSkin .mceIconOnly {display: block !important;}
+
+/* External */
+.highcontrastSkin .mceExternalToolbar {position:absolute; border:1px solid; border-bottom:0; display:none; background-color: white;}
+.highcontrastSkin .mceExternalToolbar td.mceToolbar {padding-right:13px;}
+.highcontrastSkin .mceExternalClose {position:absolute; top:3px; right:3px; width:7px; height:7px;}
+
+/* Layout */
+.highcontrastSkin table.mceLayout {border: 1px solid;}
+.highcontrastSkin .mceIframeContainer {border-top:1px solid; border-bottom:1px solid}
+.highcontrastSkin .mceStatusbar a:hover {text-decoration:underline}
+.highcontrastSkin .mceStatusbar {display:block; line-height:1.5em; overflow:visible;}
+.highcontrastSkin .mceStatusbar div {float:left}
+.highcontrastSkin .mceStatusbar a.mceResize {display:block; float:right; width:20px; height:20px; cursor:se-resize; outline:0}
+
+.highcontrastSkin .mceToolbar td { display: inline-block; float: left;}
+.highcontrastSkin .mceToolbar tr { display: block;}
+.highcontrastSkin .mceToolbar table { display: block; }
+
+/* Button */
+
+.highcontrastSkin .mceButton { display:block; margin: 2px; padding: 5px 10px;border: 1px solid; border-radius: 3px; -moz-border-radius: 3px; -webkit-border-radius: 3px; -ms-border-radius: 3px; height: 2em;}
+.highcontrastSkin .mceButton .mceVoiceLabel { height: 100%; vertical-align: center; line-height: 2em}
+.highcontrastSkin .mceButtonDisabled .mceVoiceLabel { opacity:0.6; -ms-filter:'alpha(opacity=60)'; filter:alpha(opacity=60);}
+.highcontrastSkin .mceButtonActive, .highcontrastSkin .mceButton:focus, .highcontrastSkin .mceButton:active { border: 5px solid; padding: 1px 6px;-webkit-focus-ring-color:none;outline:none;}
+
+/* Separator */
+.highcontrastSkin .mceSeparator {display:block; width:16px; height:26px;}
+
+/* ListBox */
+.highcontrastSkin .mceListBox { display: block; margin:2px;-webkit-focus-ring-color:none;outline:none;}
+.highcontrastSkin .mceListBox .mceText {padding: 5px 6px;  line-height: 2em; width: 15ex; overflow: hidden;}
+.highcontrastSkin .mceListBoxDisabled .mceText { opacity:0.6; -ms-filter:'alpha(opacity=60)'; filter:alpha(opacity=60);}
+.highcontrastSkin .mceListBox a.mceText { padding: 5px 10px; display: block; height: 2em; line-height: 2em; border: 1px solid; border-right: 0; border-radius: 3px 0px 0px 3px; -moz-border-radius: 3px 0px 0px 3px; -webkit-border-radius: 3px 0px 0px 3px; -ms-border-radius: 3px 0px 0px 3px;}
+.highcontrastSkin .mceListBox a.mceOpen { padding: 5px 4px; display: block; height: 2em; line-height: 2em; border: 1px solid; border-left: 0; border-radius: 0px 3px 3px 0px; -moz-border-radius: 0px 3px 3px 0px; -webkit-border-radius: 0px 3px 3px 0px; -ms-border-radius: 0px 3px 3px 0px;}
+.highcontrastSkin .mceListBox:focus a.mceText, .highcontrastSkin .mceListBox:active a.mceText { border-width: 5px; padding: 1px 10px 1px 6px;}
+.highcontrastSkin .mceListBox:focus a.mceOpen, .highcontrastSkin .mceListBox:active a.mceOpen { border-width: 5px; padding: 1px 0px 1px 4px;}
+
+.highcontrastSkin .mceListBoxMenu {overflow-y:auto}
+
+/* SplitButton */
+.highcontrastSkin .mceSplitButtonDisabled .mceAction {opacity:0.3; -ms-filter:'alpha(opacity=30)'; filter:alpha(opacity=30)}
+
+.highcontrastSkin .mceSplitButton { border-collapse: collapse; margin: 2px; height: 2em; line-height: 2em;-webkit-focus-ring-color:none;outline:none;}
+.highcontrastSkin .mceSplitButton td { display: table-cell; float: none; margin: 0; padding: 0; height: 2em;}
+.highcontrastSkin .mceSplitButton tr { display: table-row; }
+.highcontrastSkin table.mceSplitButton  { display: table; }
+.highcontrastSkin .mceSplitButton a.mceAction { padding: 5px 10px; display: block; height: 2em; line-height: 2em; overflow: hidden; border: 1px solid; border-right: 0; border-radius: 3px 0px 0px 3px; -moz-border-radius: 3px 0px 0px 3px; -webkit-border-radius: 3px 0px 0px 3px; -ms-border-radius: 3px 0px 0px 3px;}
+.highcontrastSkin .mceSplitButton a.mceOpen { padding: 5px 4px;  display: block; height: 2em; line-height: 2em; border: 1px solid; border-radius: 0px 3px 3px 0px; -moz-border-radius: 0px 3px 3px 0px; -webkit-border-radius: 0px 3px 3px 0px; -ms-border-radius: 0px 3px 3px 0px;}
+.highcontrastSkin .mceSplitButton .mceVoiceLabel { height: 2em; vertical-align: center; line-height: 2em; } 
+.highcontrastSkin .mceSplitButton:focus a.mceAction, .highcontrastSkin .mceSplitButton:active a.mceAction { border-width: 5px; border-right-width: 1px; padding: 1px 10px 1px 6px;-webkit-focus-ring-color:none;outline:none;}
+.highcontrastSkin .mceSplitButton:focus a.mceOpen, .highcontrastSkin .mceSplitButton:active a.mceOpen { border-width: 5px; border-left-width: 1px; padding: 1px 0px 1px 4px;-webkit-focus-ring-color:none;outline:none;}
+
+/* Menu */
+.highcontrastSkin .mceNoIcons span.mceIcon {width:0;}
+.highcontrastSkin .mceMenu {position:absolute; left:0; top:0; z-index:1000; border:1px solid; }
+.highcontrastSkin .mceMenu table {background:white; color: black}
+.highcontrastSkin .mceNoIcons a .mceText {padding-left:10px}
+.highcontrastSkin .mceMenu a, .highcontrastSkin .mceMenu span, .highcontrastSkin .mceMenu {display:block;background:white; color: black}
+.highcontrastSkin .mceMenu td {height:2em}
+.highcontrastSkin .mceMenu a {position:relative;padding:3px 0 4px 0; display: block;}
+.highcontrastSkin .mceMenu .mceText {position:relative; display:block; cursor:default; margin:0; padding:0 25px 0 25px;}
+.highcontrastSkin .mceMenu pre.mceText {font-family:Monospace}
+.highcontrastSkin .mceMenu .mceIcon {position:absolute; top:0; left:0; width:26px;}
+.highcontrastSkin td.mceMenuItemSeparator {border-top:1px solid; height:1px}
+.highcontrastSkin .mceMenuItemTitle a {border:0; border-bottom:1px solid}
+.highcontrastSkin .mceMenuItemTitle span.mceText {font-weight:bold; padding-left:4px}
+.highcontrastSkin .mceNoIcons .mceMenuItemSelected span.mceText:before {content: "\2713\A0";}
+.highcontrastSkin .mceMenu span.mceMenuLine {display:none}
+.highcontrastSkin .mceMenuItemSub a .mceText:after {content: "\A0\25B8"}
+.highcontrastSkin .mceMenuItem td, .highcontrastSkin .mceMenuItem th {line-height: normal}
+
+/* ColorSplitButton */
+.highcontrastSkin div.mceColorSplitMenu table {background:#FFF; border:1px solid; color: #000}
+.highcontrastSkin .mceColorSplitMenu td {padding:2px}
+.highcontrastSkin .mceColorSplitMenu a {display:block; width:16px; height:16px; overflow:hidden; color:#000; margin: 0; padding: 0;}
+.highcontrastSkin .mceColorSplitMenu td.mceMoreColors {padding:1px 3px 1px 1px}
+.highcontrastSkin .mceColorSplitMenu a.mceMoreColors {width:100%; height:auto; text-align:center; font-family:Tahoma,Verdana,Arial,Helvetica; font-size:11px; line-height:20px; border:1px solid #FFF}
+.highcontrastSkin .mceColorSplitMenu a.mceMoreColors:hover {border:1px solid; background-color:#B6BDD2}
+.highcontrastSkin a.mceMoreColors:hover {border:1px solid #0A246A; color: #000;}
+.highcontrastSkin .mceColorPreview {display:none;}
+.highcontrastSkin .mce_forecolor span.mceAction, .highcontrastSkin .mce_backcolor span.mceAction {height:17px;overflow:hidden}
+
+/* Progress,Resize */
+.highcontrastSkin .mceBlocker {position:absolute; left:0; top:0; z-index:1000; opacity:0.5; -ms-filter:'alpha(opacity=30)'; filter:alpha(opacity=50); background:#FFF}
+.highcontrastSkin .mceProgress {position:absolute; left:0; top:0; z-index:1001; background:url(../default/img/progress.gif) no-repeat; width:32px; height:32px; margin:-16px 0 0 -16px}
+
+/* Formats */
+.highcontrastSkin .mce_p span.mceText {}
+.highcontrastSkin .mce_address span.mceText {font-style:italic}
+.highcontrastSkin .mce_pre span.mceText {font-family:monospace}
+.highcontrastSkin .mce_h1 span.mceText {font-weight:bolder; font-size: 2em}
+.highcontrastSkin .mce_h2 span.mceText {font-weight:bolder; font-size: 1.5em}
+.highcontrastSkin .mce_h3 span.mceText {font-weight:bolder; font-size: 1.17em}
+.highcontrastSkin .mce_h4 span.mceText {font-weight:bolder; font-size: 1em}
+.highcontrastSkin .mce_h5 span.mceText {font-weight:bolder; font-size: .83em}
+.highcontrastSkin .mce_h6 span.mceText {font-weight:bolder; font-size: .75em}
diff --git a/plugins/TinyMCE/js/themes/advanced/skins/o2k7/content.css b/plugins/TinyMCE/js/themes/advanced/skins/o2k7/content.css
index 3b833d9451..4ac4e4dfb3 100644
--- a/plugins/TinyMCE/js/themes/advanced/skins/o2k7/content.css
+++ b/plugins/TinyMCE/js/themes/advanced/skins/o2k7/content.css
@@ -34,3 +34,13 @@ scrollbar-track-color:#F5F5F5;
 
 img:-moz-broken {-moz-force-broken-image-icon:1; width:24px; height:24px}
 font[face=mceinline] {font-family:inherit !important}
+
+.mceItemMedia {border:1px dotted #cc0000; background-position:center; background-repeat:no-repeat; background-color:#ffffcc}
+.mceItemShockWave {background-image:url(../../img/shockwave.gif)}
+.mceItemFlash {background-image:url(../../img/flash.gif)}
+.mceItemQuickTime {background-image:url(../../img/quicktime.gif)}
+.mceItemWindowsMedia {background-image:url(../../img/windowsmedia.gif)}
+.mceItemRealMedia {background-image:url(../../img/realmedia.gif)}
+.mceItemVideo {background-image:url(../../img/video.gif)}
+.mceItemIframe {background-image:url(../../img/iframe.gif)}
+.mcePageBreak {display:block;border:0;width:100%;height:12px;border-top:1px dotted #ccc;margin-top:15px;background:#fff url(../../img/pagebreak.gif) no-repeat center top;}
diff --git a/plugins/TinyMCE/js/themes/advanced/skins/o2k7/dialog.css b/plugins/TinyMCE/js/themes/advanced/skins/o2k7/dialog.css
index e3af1396e4..ec08772248 100644
--- a/plugins/TinyMCE/js/themes/advanced/skins/o2k7/dialog.css
+++ b/plugins/TinyMCE/js/themes/advanced/skins/o2k7/dialog.css
@@ -114,3 +114,4 @@ h3 {font-size:14px;}
 #colorpicker #namedcolors {width:150px;}
 #colorpicker #namedcolors a {display:block; float:left; width:10px; height:10px; margin:1px 1px 0 0; overflow:hidden;}
 #colorpicker #colornamecontainer {margin-top:5px;}
+#colorpicker #picker_panel fieldset {margin:auto;width:325px;}
diff --git a/plugins/TinyMCE/js/themes/advanced/skins/o2k7/img/button_bg.png b/plugins/TinyMCE/js/themes/advanced/skins/o2k7/img/button_bg.png
index 12cfb419bb..13a5cb0309 100644
Binary files a/plugins/TinyMCE/js/themes/advanced/skins/o2k7/img/button_bg.png and b/plugins/TinyMCE/js/themes/advanced/skins/o2k7/img/button_bg.png differ
diff --git a/plugins/TinyMCE/js/themes/advanced/skins/o2k7/img/button_bg_black.png b/plugins/TinyMCE/js/themes/advanced/skins/o2k7/img/button_bg_black.png
index 8996c7493e..7fc57f2bc2 100644
Binary files a/plugins/TinyMCE/js/themes/advanced/skins/o2k7/img/button_bg_black.png and b/plugins/TinyMCE/js/themes/advanced/skins/o2k7/img/button_bg_black.png differ
diff --git a/plugins/TinyMCE/js/themes/advanced/skins/o2k7/img/button_bg_silver.png b/plugins/TinyMCE/js/themes/advanced/skins/o2k7/img/button_bg_silver.png
index bd5d2550c0..c0dcc6cac2 100644
Binary files a/plugins/TinyMCE/js/themes/advanced/skins/o2k7/img/button_bg_silver.png and b/plugins/TinyMCE/js/themes/advanced/skins/o2k7/img/button_bg_silver.png differ
diff --git a/plugins/TinyMCE/js/themes/advanced/skins/o2k7/ui.css b/plugins/TinyMCE/js/themes/advanced/skins/o2k7/ui.css
index a6253976af..29e35e5ef2 100644
--- a/plugins/TinyMCE/js/themes/advanced/skins/o2k7/ui.css
+++ b/plugins/TinyMCE/js/themes/advanced/skins/o2k7/ui.css
@@ -4,8 +4,8 @@
 .o2k7Skin table td {vertical-align:middle}
 
 /* Containers */
-.o2k7Skin table {background:#E5EFFD}
-.o2k7Skin iframe {display:block; background:#FFF}
+.o2k7Skin table {background:transparent}
+.o2k7Skin iframe {display:block;}
 .o2k7Skin .mceToolbar {height:26px}
 
 /* External */
@@ -19,7 +19,8 @@
 .o2k7Skin table.mceLayout tr.mceLast td {border-bottom:1px solid #ABC6DD}
 .o2k7Skin table.mceToolbar, .o2k7Skin tr.mceFirst .mceToolbar tr td, .o2k7Skin tr.mceLast .mceToolbar tr td {border:0; margin:0; padding:0}
 .o2k7Skin .mceIframeContainer {border-top:1px solid #ABC6DD; border-bottom:1px solid #ABC6DD}
-.o2k7Skin .mceStatusbar {display:block; font-family:'MS Sans Serif',sans-serif,Verdana,Arial; font-size:9pt; line-height:16px; overflow:visible; color:#000; height:20px}
+.o2k7Skin td.mceToolbar{background:#E5EFFD}
+.o2k7Skin .mceStatusbar {background:#E5EFFD; display:block; font-family:'MS Sans Serif',sans-serif,Verdana,Arial; font-size:9pt; line-height:16px; overflow:visible; color:#000; height:20px}
 .o2k7Skin .mceStatusbar div {float:left; padding:2px}
 .o2k7Skin .mceStatusbar a.mceResize {display:block; float:right; background:url(../../img/icons.gif) -800px 0; width:20px; height:20px; cursor:se-resize; outline:0}
 .o2k7Skin .mceStatusbar a:hover {text-decoration:underline}
@@ -50,7 +51,7 @@
 .o2k7Skin .mceSeparator {display:block; background:url(img/button_bg.png) -22px 0; width:5px; height:22px}
 
 /* ListBox */
-.o2k7Skin .mceListBox {margin-left:3px}
+.o2k7Skin .mceListBox  {display: inline-block; margin-left: 3px}
 .o2k7Skin .mceListBox, .o2k7Skin .mceListBox a {display:block}
 .o2k7Skin .mceListBox .mceText {padding-left:4px; text-align:left; width:70px; border:1px solid #b3c7e1; border-right:0; background:#eaf2fb; font-family:Tahoma,Verdana,Arial,Helvetica; font-size:11px; height:20px; line-height:20px; overflow:hidden}
 .o2k7Skin .mceListBox .mceOpen {width:14px; height:22px; background:url(img/button_bg.png) -66px 0}
@@ -62,7 +63,7 @@
 .o2k7Skin select.mceListBox {font-family:Tahoma,Verdana,Arial,Helvetica; font-size:12px; border:1px solid #b3c7e1; background:#FFF;}
 
 /* SplitButton */
-.o2k7Skin .mceSplitButton, .o2k7Skin .mceSplitButton a, .o2k7Skin .mceSplitButton span {display:block; height:22px}
+.o2k7Skin .mceSplitButton, .o2k7Skin .mceSplitButton a, .o2k7Skin .mceSplitButton span {display:block; height:22px; direction:ltr}
 .o2k7Skin .mceSplitButton {background:url(img/button_bg.png)}
 .o2k7Skin .mceSplitButton a.mceAction {width:22px}
 .o2k7Skin .mceSplitButton span.mceAction {width:22px; background-image:url(../../img/icons.gif)}
@@ -105,6 +106,7 @@
 .o2k7Skin .mceNoIcons .mceMenuItemSelected a {background:url(../default/img/menu_arrow.gif) no-repeat -6px center}
 .o2k7Skin .mceMenu span.mceMenuLine {display:none}
 .o2k7Skin .mceMenuItemSub a {background:url(../default/img/menu_arrow.gif) no-repeat top right;}
+.o2k7Skin .mceMenuItem td, .o2k7Skin .mceMenuItem th {line-height: normal}
 
 /* Progress,Resize */
 .o2k7Skin .mceBlocker {position:absolute; left:0; top:0; z-index:1000; opacity:0.5; -ms-filter:'alpha(opacity=30)'; filter:alpha(opacity=50); background:#FFF}
diff --git a/plugins/TinyMCE/js/themes/advanced/skins/o2k7/ui_black.css b/plugins/TinyMCE/js/themes/advanced/skins/o2k7/ui_black.css
index 153f0c38a6..50c9b76a2d 100644
--- a/plugins/TinyMCE/js/themes/advanced/skins/o2k7/ui_black.css
+++ b/plugins/TinyMCE/js/themes/advanced/skins/o2k7/ui_black.css
@@ -1,6 +1,6 @@
 /* Black */
 .o2k7SkinBlack .mceToolbar .mceToolbarStart span, .o2k7SkinBlack .mceToolbar .mceToolbarEnd span, .o2k7SkinBlack .mceButton, .o2k7SkinBlack .mceSplitButton, .o2k7SkinBlack .mceSeparator, .o2k7SkinBlack .mceSplitButton a.mceOpen, .o2k7SkinBlack .mceListBox a.mceOpen {background-image:url(img/button_bg_black.png)}
-.o2k7SkinBlack table, .o2k7SkinBlack .mceMenuItemTitle a, .o2k7SkinBlack .mceMenuItemTitle span.mceText, .o2k7SkinBlack .mceStatusbar div, .o2k7SkinBlack .mceStatusbar span, .o2k7SkinBlack .mceStatusbar a {background:#535353; color:#FFF}
+.o2k7SkinBlack td.mceToolbar, .o2k7SkinBlack td.mceStatusbar, .o2k7SkinBlack .mceMenuItemTitle a, .o2k7SkinBlack .mceMenuItemTitle span.mceText, .o2k7SkinBlack .mceStatusbar div, .o2k7SkinBlack .mceStatusbar span, .o2k7SkinBlack .mceStatusbar a {background:#535353; color:#FFF}
 .o2k7SkinBlack table.mceListBoxEnabled .mceText, o2k7SkinBlack .mceListBox .mceText {background:#FFF; border:1px solid #CBCFD4; border-bottom-color:#989FA9; border-right:0}
 .o2k7SkinBlack table.mceListBoxEnabled:hover .mceText, .o2k7SkinBlack .mceListBoxHover .mceText, .o2k7SkinBlack .mceListBoxSelected .mceText {background:#FFF; border:1px solid #FFBD69; border-right:0}
 .o2k7SkinBlack .mceExternalToolbar, .o2k7SkinBlack .mceListBox .mceText, .o2k7SkinBlack div.mceMenu, .o2k7SkinBlack table.mceLayout, .o2k7SkinBlack .mceMenuItemTitle a, .o2k7SkinBlack table.mceLayout tr.mceFirst td, .o2k7SkinBlack table.mceLayout, .o2k7SkinBlack .mceMenuItemTitle a, .o2k7SkinBlack table.mceLayout tr.mceLast td, .o2k7SkinBlack .mceIframeContainer {border-color: #535353;}
diff --git a/plugins/TinyMCE/js/themes/advanced/skins/o2k7/ui_silver.css b/plugins/TinyMCE/js/themes/advanced/skins/o2k7/ui_silver.css
index 7fe3b45e12..960a8e4755 100644
--- a/plugins/TinyMCE/js/themes/advanced/skins/o2k7/ui_silver.css
+++ b/plugins/TinyMCE/js/themes/advanced/skins/o2k7/ui_silver.css
@@ -1,5 +1,5 @@
 /* Silver */
 .o2k7SkinSilver .mceToolbar .mceToolbarStart span, .o2k7SkinSilver .mceButton, .o2k7SkinSilver .mceSplitButton, .o2k7SkinSilver .mceSeparator, .o2k7SkinSilver .mceSplitButton a.mceOpen, .o2k7SkinSilver .mceListBox a.mceOpen {background-image:url(img/button_bg_silver.png)}
-.o2k7SkinSilver table, .o2k7SkinSilver .mceMenuItemTitle a {background:#eee}
+.o2k7SkinSilver td.mceToolbar, .o2k7SkinSilver td.mceStatusbar, .o2k7SkinSilver .mceMenuItemTitle a {background:#eee}
 .o2k7SkinSilver .mceListBox .mceText {background:#FFF}
 .o2k7SkinSilver .mceExternalToolbar, .o2k7SkinSilver .mceListBox .mceText, .o2k7SkinSilver div.mceMenu, .o2k7SkinSilver table.mceLayout, .o2k7SkinSilver .mceMenuItemTitle a, .o2k7SkinSilver table.mceLayout tr.mceFirst td, .o2k7SkinSilver table.mceLayout, .o2k7SkinSilver .mceMenuItemTitle a, .o2k7SkinSilver table.mceLayout tr.mceLast td, .o2k7SkinSilver .mceIframeContainer {border-color: #bbb}
diff --git a/plugins/TinyMCE/js/themes/advanced/source_editor.htm b/plugins/TinyMCE/js/themes/advanced/source_editor.htm
index 5957bbd178..3c6d65808a 100644
--- a/plugins/TinyMCE/js/themes/advanced/source_editor.htm
+++ b/plugins/TinyMCE/js/themes/advanced/source_editor.htm
@@ -6,7 +6,7 @@
 </head>
 <body onresize="resizeInputs();" style="display:none; overflow:hidden;">
 	<form name="source" onsubmit="saveContent();return false;" action="#">
-		<div style="float: left" class="title">{#advanced_dlg.code_title}</div>
+		<div style="float: left" class="title"><label for="htmlSource">{#advanced_dlg.code_title}</label></div>
 
 		<div id="wrapline" style="float: right">
 			<input type="checkbox" name="wraped" id="wraped" onclick="toggleWordWrap(this);" class="wordWrapCode" /><label for="wraped">{#advanced_dlg.code_wordwrap}</label>
@@ -17,8 +17,8 @@
 		<textarea name="htmlSource" id="htmlSource" rows="15" cols="100" style="width: 100%; height: 100%; font-family: 'Courier New',Courier,monospace; font-size: 12px;" dir="ltr" wrap="off" class="mceFocus"></textarea>
 
 		<div class="mceActionPanel">
-			<input type="submit" name="insert" value="{#update}" id="insert" />
-			<input type="button" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" id="cancel" />
+			<input type="submit" role="button" name="insert" value="{#update}" id="insert" />
+			<input type="button" role="button" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" id="cancel" />
 		</div>
 	</form>
 </body>
diff --git a/plugins/TinyMCE/js/themes/simple/editor_template.js b/plugins/TinyMCE/js/themes/simple/editor_template.js
index ed89abc067..4b3209cc92 100644
--- a/plugins/TinyMCE/js/themes/simple/editor_template.js
+++ b/plugins/TinyMCE/js/themes/simple/editor_template.js
@@ -1 +1 @@
-(function(){var a=tinymce.DOM;tinymce.ThemeManager.requireLangPack("simple");tinymce.create("tinymce.themes.SimpleTheme",{init:function(c,d){var e=this,b=["Bold","Italic","Underline","Strikethrough","InsertUnorderedList","InsertOrderedList"],f=c.settings;e.editor=c;c.onInit.add(function(){c.onNodeChange.add(function(h,g){tinymce.each(b,function(i){g.get(i.toLowerCase()).setActive(h.queryCommandState(i))})});c.dom.loadCSS(d+"/skins/"+f.skin+"/content.css")});a.loadCSS((f.editor_css?c.documentBaseURI.toAbsolute(f.editor_css):"")||d+"/skins/"+f.skin+"/ui.css")},renderUI:function(h){var e=this,i=h.targetNode,b,c,d=e.editor,f=d.controlManager,g;i=a.insertAfter(a.create("span",{id:d.id+"_container","class":"mceEditor "+d.settings.skin+"SimpleSkin"}),i);i=g=a.add(i,"table",{cellPadding:0,cellSpacing:0,"class":"mceLayout"});i=c=a.add(i,"tbody");i=a.add(c,"tr");i=b=a.add(a.add(i,"td"),"div",{"class":"mceIframeContainer"});i=a.add(a.add(c,"tr",{"class":"last"}),"td",{"class":"mceToolbar mceLast",align:"center"});c=e.toolbar=f.createToolbar("tools1");c.add(f.createButton("bold",{title:"simple.bold_desc",cmd:"Bold"}));c.add(f.createButton("italic",{title:"simple.italic_desc",cmd:"Italic"}));c.add(f.createButton("underline",{title:"simple.underline_desc",cmd:"Underline"}));c.add(f.createButton("strikethrough",{title:"simple.striketrough_desc",cmd:"Strikethrough"}));c.add(f.createSeparator());c.add(f.createButton("undo",{title:"simple.undo_desc",cmd:"Undo"}));c.add(f.createButton("redo",{title:"simple.redo_desc",cmd:"Redo"}));c.add(f.createSeparator());c.add(f.createButton("cleanup",{title:"simple.cleanup_desc",cmd:"mceCleanup"}));c.add(f.createSeparator());c.add(f.createButton("insertunorderedlist",{title:"simple.bullist_desc",cmd:"InsertUnorderedList"}));c.add(f.createButton("insertorderedlist",{title:"simple.numlist_desc",cmd:"InsertOrderedList"}));c.renderTo(i);return{iframeContainer:b,editorContainer:d.id+"_container",sizeContainer:g,deltaHeight:-20}},getInfo:function(){return{longname:"Simple theme",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.ThemeManager.add("simple",tinymce.themes.SimpleTheme)})();
\ No newline at end of file
+(function(){var a=tinymce.DOM;tinymce.ThemeManager.requireLangPack("simple");tinymce.create("tinymce.themes.SimpleTheme",{init:function(c,d){var e=this,b=["Bold","Italic","Underline","Strikethrough","InsertUnorderedList","InsertOrderedList"],f=c.settings;e.editor=c;c.contentCSS.push(d+"/skins/"+f.skin+"/content.css");c.onInit.add(function(){c.onNodeChange.add(function(h,g){tinymce.each(b,function(i){g.get(i.toLowerCase()).setActive(h.queryCommandState(i))})})});a.loadCSS((f.editor_css?c.documentBaseURI.toAbsolute(f.editor_css):"")||d+"/skins/"+f.skin+"/ui.css")},renderUI:function(h){var e=this,i=h.targetNode,b,c,d=e.editor,f=d.controlManager,g;i=a.insertAfter(a.create("span",{id:d.id+"_container","class":"mceEditor "+d.settings.skin+"SimpleSkin"}),i);i=g=a.add(i,"table",{cellPadding:0,cellSpacing:0,"class":"mceLayout"});i=c=a.add(i,"tbody");i=a.add(c,"tr");i=b=a.add(a.add(i,"td"),"div",{"class":"mceIframeContainer"});i=a.add(a.add(c,"tr",{"class":"last"}),"td",{"class":"mceToolbar mceLast",align:"center"});c=e.toolbar=f.createToolbar("tools1");c.add(f.createButton("bold",{title:"simple.bold_desc",cmd:"Bold"}));c.add(f.createButton("italic",{title:"simple.italic_desc",cmd:"Italic"}));c.add(f.createButton("underline",{title:"simple.underline_desc",cmd:"Underline"}));c.add(f.createButton("strikethrough",{title:"simple.striketrough_desc",cmd:"Strikethrough"}));c.add(f.createSeparator());c.add(f.createButton("undo",{title:"simple.undo_desc",cmd:"Undo"}));c.add(f.createButton("redo",{title:"simple.redo_desc",cmd:"Redo"}));c.add(f.createSeparator());c.add(f.createButton("cleanup",{title:"simple.cleanup_desc",cmd:"mceCleanup"}));c.add(f.createSeparator());c.add(f.createButton("insertunorderedlist",{title:"simple.bullist_desc",cmd:"InsertUnorderedList"}));c.add(f.createButton("insertorderedlist",{title:"simple.numlist_desc",cmd:"InsertOrderedList"}));c.renderTo(i);return{iframeContainer:b,editorContainer:d.id+"_container",sizeContainer:g,deltaHeight:-20}},getInfo:function(){return{longname:"Simple theme",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.ThemeManager.add("simple",tinymce.themes.SimpleTheme)})();
\ No newline at end of file
diff --git a/plugins/TinyMCE/js/themes/simple/editor_template_src.js b/plugins/TinyMCE/js/themes/simple/editor_template_src.js
index 4b862d49d6..01ce87c58a 100644
--- a/plugins/TinyMCE/js/themes/simple/editor_template_src.js
+++ b/plugins/TinyMCE/js/themes/simple/editor_template_src.js
@@ -19,6 +19,7 @@
 			var t = this, states = ['Bold', 'Italic', 'Underline', 'Strikethrough', 'InsertUnorderedList', 'InsertOrderedList'], s = ed.settings;
 
 			t.editor = ed;
+			ed.contentCSS.push(url + "/skins/" + s.skin + "/content.css");
 
 			ed.onInit.add(function() {
 				ed.onNodeChange.add(function(ed, cm) {
@@ -26,8 +27,6 @@
 						cm.get(c.toLowerCase()).setActive(ed.queryCommandState(c));
 					});
 				});
-
-				ed.dom.loadCSS(url + "/skins/" + s.skin + "/content.css");
 			});
 
 			DOM.loadCSS((s.editor_css ? ed.documentBaseURI.toAbsolute(s.editor_css) : '') || url + "/skins/" + s.skin + "/ui.css");
diff --git a/plugins/TinyMCE/js/themes/simple/img/icons.gif b/plugins/TinyMCE/js/themes/simple/img/icons.gif
index 16af141ff0..6fcbcb5ded 100644
Binary files a/plugins/TinyMCE/js/themes/simple/img/icons.gif and b/plugins/TinyMCE/js/themes/simple/img/icons.gif differ
diff --git a/plugins/TinyMCE/js/tiny_mce.js b/plugins/TinyMCE/js/tiny_mce.js
index 782f7f40ba..6463ba05c1 100644
--- a/plugins/TinyMCE/js/tiny_mce.js
+++ b/plugins/TinyMCE/js/tiny_mce.js
@@ -1 +1 @@
-(function(c){var a=/^\s*|\s*$/g,d;var b={majorVersion:"3",minorVersion:"3.8",releaseDate:"2010-06-30",_init:function(){var r=this,o=document,m=navigator,f=m.userAgent,l,e,k,j,h,q;r.isOpera=c.opera&&opera.buildNumber;r.isWebKit=/WebKit/.test(f);r.isIE=!r.isWebKit&&!r.isOpera&&(/MSIE/gi).test(f)&&(/Explorer/gi).test(m.appName);r.isIE6=r.isIE&&/MSIE [56]/.test(f);r.isGecko=!r.isWebKit&&/Gecko/.test(f);r.isMac=f.indexOf("Mac")!=-1;r.isAir=/adobeair/i.test(f);r.isIDevice=/(iPad|iPhone)/.test(f);if(c.tinyMCEPreInit){r.suffix=tinyMCEPreInit.suffix;r.baseURL=tinyMCEPreInit.base;r.query=tinyMCEPreInit.query;return}r.suffix="";e=o.getElementsByTagName("base");for(l=0;l<e.length;l++){if(q=e[l].href){if(/^https?:\/\/[^\/]+$/.test(q)){q+="/"}j=q?q.match(/.*\//)[0]:""}}function g(i){if(i.src&&/tiny_mce(|_gzip|_jquery|_prototype)(_dev|_src)?.js/.test(i.src)){if(/_(src|dev)\.js/g.test(i.src)){r.suffix="_src"}if((h=i.src.indexOf("?"))!=-1){r.query=i.src.substring(h+1)}r.baseURL=i.src.substring(0,i.src.lastIndexOf("/"));if(j&&r.baseURL.indexOf("://")==-1&&r.baseURL.indexOf("/")!==0){r.baseURL=j+r.baseURL}return r.baseURL}return null}e=o.getElementsByTagName("script");for(l=0;l<e.length;l++){if(g(e[l])){return}}k=o.getElementsByTagName("head")[0];if(k){e=k.getElementsByTagName("script");for(l=0;l<e.length;l++){if(g(e[l])){return}}}return},is:function(f,e){if(!e){return f!==d}if(e=="array"&&(f.hasOwnProperty&&f instanceof Array)){return true}return typeof(f)==e},each:function(h,e,g){var i,f;if(!h){return 0}g=g||h;if(h.length!==d){for(i=0,f=h.length;i<f;i++){if(e.call(g,h[i],i,h)===false){return 0}}}else{for(i in h){if(h.hasOwnProperty(i)){if(e.call(g,h[i],i,h)===false){return 0}}}}return 1},trim:function(e){return(e?""+e:"").replace(a,"")},create:function(m,e){var l=this,f,h,i,j,g,k=0;m=/^((static) )?([\w.]+)(:([\w.]+))?/.exec(m);i=m[3].match(/(^|\.)(\w+)$/i)[2];h=l.createNS(m[3].replace(/\.\w+$/,""));if(h[i]){return}if(m[2]=="static"){h[i]=e;if(this.onCreate){this.onCreate(m[2],m[3],h[i])}return}if(!e[i]){e[i]=function(){};k=1}h[i]=e[i];l.extend(h[i].prototype,e);if(m[5]){f=l.resolve(m[5]).prototype;j=m[5].match(/\.(\w+)$/i)[1];g=h[i];if(k){h[i]=function(){return f[j].apply(this,arguments)}}else{h[i]=function(){this.parent=f[j];return g.apply(this,arguments)}}h[i].prototype[i]=h[i];l.each(f,function(o,p){h[i].prototype[p]=f[p]});l.each(e,function(o,p){if(f[p]){h[i].prototype[p]=function(){this.parent=f[p];return o.apply(this,arguments)}}else{if(p!=i){h[i].prototype[p]=o}}})}l.each(e["static"],function(o,p){h[i][p]=o});if(this.onCreate){this.onCreate(m[2],m[3],h[i].prototype)}},walk:function(h,g,i,e){e=e||this;if(h){if(i){h=h[i]}b.each(h,function(j,f){if(g.call(e,j,f,i)===false){return false}b.walk(j,g,i,e)})}},createNS:function(h,g){var f,e;g=g||c;h=h.split(".");for(f=0;f<h.length;f++){e=h[f];if(!g[e]){g[e]={}}g=g[e]}return g},resolve:function(h,g){var f,e;g=g||c;h=h.split(".");for(f=0,e=h.length;f<e;f++){g=g[h[f]];if(!g){break}}return g},addUnload:function(i,h){var g=this;i={func:i,scope:h||this};if(!g.unloads){function e(){var f=g.unloads,k,l;if(f){for(l in f){k=f[l];if(k&&k.func){k.func.call(k.scope,1)}}if(c.detachEvent){c.detachEvent("onbeforeunload",j);c.detachEvent("onunload",e)}else{if(c.removeEventListener){c.removeEventListener("unload",e,false)}}g.unloads=k=f=w=e=0;if(c.CollectGarbage){CollectGarbage()}}}function j(){var k=document;if(k.readyState=="interactive"){function f(){k.detachEvent("onstop",f);if(e){e()}k=0}if(k){k.attachEvent("onstop",f)}c.setTimeout(function(){if(k){k.detachEvent("onstop",f)}},0)}}if(c.attachEvent){c.attachEvent("onunload",e);c.attachEvent("onbeforeunload",j)}else{if(c.addEventListener){c.addEventListener("unload",e,false)}}g.unloads=[i]}else{g.unloads.push(i)}return i},removeUnload:function(h){var e=this.unloads,g=null;b.each(e,function(j,f){if(j&&j.func==h){e.splice(f,1);g=h;return false}});return g},explode:function(e,f){return e?b.map(e.split(f||","),b.trim):e},_addVer:function(f){var e;if(!this.query){return f}e=(f.indexOf("?")==-1?"?":"&")+this.query;if(f.indexOf("#")==-1){return f+e}return f.replace("#",e+"#")}};b._init();c.tinymce=c.tinyMCE=b})(window);(function(e,d){var c=d.is,b=/^(href|src|style)$/i,f;if(!e){return alert("Load jQuery first!")}d.$=e;d.adapter={patchEditor:function(j){var i=e.fn;function h(n,o){var m=this;if(o){m.removeAttr("_mce_style")}return i.css.apply(m,arguments)}function g(n,o){var m=this;if(b.test(n)){if(o!==f){m.each(function(p,q){j.dom.setAttrib(q,n,o)});return m}else{return m.attr("_mce_"+n)}}return i.attr.apply(m,arguments)}function k(m){return function(n){if(n){n=j.dom.processHTML(n)}return m.call(this,n)}}function l(m){if(m.css!==h){m.css=h;m.attr=g;m.html=k(i.html);m.append=k(i.append);m.prepend=k(i.prepend);m.after=k(i.after);m.before=k(i.before);m.replaceWith=k(i.replaceWith);m.tinymce=j;m.pushStack=function(){return l(i.pushStack.apply(this,arguments))}}return m}j.$=function(m,n){var o=j.getDoc();return l(e(m||o,o||n))}}};d.extend=e.extend;d.extend(d,{map:e.map,grep:function(g,h){return e.grep(g,h||function(){return 1})},inArray:function(g,h){return e.inArray(h,g||[])}});var a={"tinymce.dom.DOMUtils":{select:function(i,h){var g=this;return e.find(i,g.get(h)||g.get(g.settings.root_element)||g.doc,[])},is:function(h,g){return e(this.get(h)).is(g)}}};d.onCreate=function(g,i,h){d.extend(h,a[i])}})(window.jQuery,tinymce);tinymce.create("tinymce.util.Dispatcher",{scope:null,listeners:null,Dispatcher:function(a){this.scope=a||this;this.listeners=[]},add:function(a,b){this.listeners.push({cb:a,scope:b||this.scope});return a},addToTop:function(a,b){this.listeners.unshift({cb:a,scope:b||this.scope});return a},remove:function(a){var b=this.listeners,c=null;tinymce.each(b,function(e,d){if(a==e.cb){c=a;b.splice(d,1);return false}});return c},dispatch:function(){var f,d=arguments,e,b=this.listeners,g;for(e=0;e<b.length;e++){g=b[e];f=g.cb.apply(g.scope,d);if(f===false){break}}return f}});(function(){var a=tinymce.each;tinymce.create("tinymce.util.URI",{URI:function(e,g){var f=this,h,d,c;e=tinymce.trim(e);g=f.settings=g||{};if(/^(mailto|tel|news|javascript|about|data):/i.test(e)||/^\s*#/.test(e)){f.source=e;return}if(e.indexOf("/")===0&&e.indexOf("//")!==0){e=(g.base_uri?g.base_uri.protocol||"http":"http")+"://mce_host"+e}if(!/^\w*:?\/\//.test(e)){e=(g.base_uri.protocol||"http")+"://mce_host"+f.toAbsPath(g.base_uri.path,e)}e=e.replace(/@@/g,"(mce_at)");e=/^(?:(?![^:@]+:[^:@\/]*@)([^:\/?#.]+):)?(?:\/\/)?((?:(([^:@]*):?([^:@]*))?@)?([^:\/?#]*)(?::(\d*))?)(((\/(?:[^?#](?![^?#\/]*\.[^?#\/.]+(?:[?#]|$)))*\/?)?([^?#\/]*))(?:\?([^#]*))?(?:#(.*))?)/.exec(e);a(["source","protocol","authority","userInfo","user","password","host","port","relative","path","directory","file","query","anchor"],function(b,j){var k=e[j];if(k){k=k.replace(/\(mce_at\)/g,"@@")}f[b]=k});if(c=g.base_uri){if(!f.protocol){f.protocol=c.protocol}if(!f.userInfo){f.userInfo=c.userInfo}if(!f.port&&f.host=="mce_host"){f.port=c.port}if(!f.host||f.host=="mce_host"){f.host=c.host}f.source=""}},setPath:function(c){var b=this;c=/^(.*?)\/?(\w+)?$/.exec(c);b.path=c[0];b.directory=c[1];b.file=c[2];b.source="";b.getURI()},toRelative:function(b){var c=this,d;if(b==="./"){return b}b=new tinymce.util.URI(b,{base_uri:c});if((b.host!="mce_host"&&c.host!=b.host&&b.host)||c.port!=b.port||c.protocol!=b.protocol){return b.getURI()}d=c.toRelPath(c.path,b.path);if(b.query){d+="?"+b.query}if(b.anchor){d+="#"+b.anchor}return d},toAbsolute:function(b,c){var b=new tinymce.util.URI(b,{base_uri:this});return b.getURI(this.host==b.host&&this.protocol==b.protocol?c:0)},toRelPath:function(g,h){var c,f=0,d="",e,b;g=g.substring(0,g.lastIndexOf("/"));g=g.split("/");c=h.split("/");if(g.length>=c.length){for(e=0,b=g.length;e<b;e++){if(e>=c.length||g[e]!=c[e]){f=e+1;break}}}if(g.length<c.length){for(e=0,b=c.length;e<b;e++){if(e>=g.length||g[e]!=c[e]){f=e+1;break}}}if(f==1){return h}for(e=0,b=g.length-(f-1);e<b;e++){d+="../"}for(e=f-1,b=c.length;e<b;e++){if(e!=f-1){d+="/"+c[e]}else{d+=c[e]}}return d},toAbsPath:function(e,f){var c,b=0,h=[],d,g;d=/\/$/.test(f)?"/":"";e=e.split("/");f=f.split("/");a(e,function(i){if(i){h.push(i)}});e=h;for(c=f.length-1,h=[];c>=0;c--){if(f[c].length==0||f[c]=="."){continue}if(f[c]==".."){b++;continue}if(b>0){b--;continue}h.push(f[c])}c=e.length-b;if(c<=0){g=h.reverse().join("/")}else{g=e.slice(0,c).join("/")+"/"+h.reverse().join("/")}if(g.indexOf("/")!==0){g="/"+g}if(d&&g.lastIndexOf("/")!==g.length-1){g+=d}return g},getURI:function(d){var c,b=this;if(!b.source||d){c="";if(!d){if(b.protocol){c+=b.protocol+"://"}if(b.userInfo){c+=b.userInfo+"@"}if(b.host){c+=b.host}if(b.port){c+=":"+b.port}}if(b.path){c+=b.path}if(b.query){c+="?"+b.query}if(b.anchor){c+="#"+b.anchor}b.source=c}return b.source}})})();(function(){var a=tinymce.each;tinymce.create("static tinymce.util.Cookie",{getHash:function(d){var b=this.get(d),c;if(b){a(b.split("&"),function(e){e=e.split("=");c=c||{};c[unescape(e[0])]=unescape(e[1])})}return c},setHash:function(j,b,g,f,i,c){var h="";a(b,function(e,d){h+=(!h?"":"&")+escape(d)+"="+escape(e)});this.set(j,h,g,f,i,c)},get:function(i){var h=document.cookie,g,f=i+"=",d;if(!h){return}d=h.indexOf("; "+f);if(d==-1){d=h.indexOf(f);if(d!=0){return null}}else{d+=2}g=h.indexOf(";",d);if(g==-1){g=h.length}return unescape(h.substring(d+f.length,g))},set:function(i,b,g,f,h,c){document.cookie=i+"="+escape(b)+((g)?"; expires="+g.toGMTString():"")+((f)?"; path="+escape(f):"")+((h)?"; domain="+h:"")+((c)?"; secure":"")},remove:function(e,b){var c=new Date();c.setTime(c.getTime()-1000);this.set(e,"",c,b,c)}})})();tinymce.create("static tinymce.util.JSON",{serialize:function(e){var c,a,d=tinymce.util.JSON.serialize,b;if(e==null){return"null"}b=typeof e;if(b=="string"){a="\bb\tt\nn\ff\rr\"\"''\\\\";return'"'+e.replace(/([\u0080-\uFFFF\x00-\x1f\"])/g,function(g,f){c=a.indexOf(f);if(c+1){return"\\"+a.charAt(c+1)}g=f.charCodeAt().toString(16);return"\\u"+"0000".substring(g.length)+g})+'"'}if(b=="object"){if(e.hasOwnProperty&&e instanceof Array){for(c=0,a="[";c<e.length;c++){a+=(c>0?",":"")+d(e[c])}return a+"]"}a="{";for(c in e){a+=typeof e[c]!="function"?(a.length>1?',"':'"')+c+'":'+d(e[c]):""}return a+"}"}return""+e},parse:function(s){try{return eval("("+s+")")}catch(ex){}}});tinymce.create("static tinymce.util.XHR",{send:function(g){var a,e,b=window,h=0;g.scope=g.scope||this;g.success_scope=g.success_scope||g.scope;g.error_scope=g.error_scope||g.scope;g.async=g.async===false?false:true;g.data=g.data||"";function d(i){a=0;try{a=new ActiveXObject(i)}catch(c){}return a}a=b.XMLHttpRequest?new XMLHttpRequest():d("Microsoft.XMLHTTP")||d("Msxml2.XMLHTTP");if(a){if(a.overrideMimeType){a.overrideMimeType(g.content_type)}a.open(g.type||(g.data?"POST":"GET"),g.url,g.async);if(g.content_type){a.setRequestHeader("Content-Type",g.content_type)}a.setRequestHeader("X-Requested-With","XMLHttpRequest");a.send(g.data);function f(){if(!g.async||a.readyState==4||h++>10000){if(g.success&&h<10000&&a.status==200){g.success.call(g.success_scope,""+a.responseText,a,g)}else{if(g.error){g.error.call(g.error_scope,h>10000?"TIMED_OUT":"GENERAL",a,g)}}a=null}else{b.setTimeout(f,10)}}if(!g.async){return f()}e=b.setTimeout(f,10)}}});(function(){var c=tinymce.extend,b=tinymce.util.JSON,a=tinymce.util.XHR;tinymce.create("tinymce.util.JSONRequest",{JSONRequest:function(d){this.settings=c({},d);this.count=0},send:function(f){var e=f.error,d=f.success;f=c(this.settings,f);f.success=function(h,g){h=b.parse(h);if(typeof(h)=="undefined"){h={error:"JSON Parse error."}}if(h.error){e.call(f.error_scope||f.scope,h.error,g)}else{d.call(f.success_scope||f.scope,h.result)}};f.error=function(h,g){e.call(f.error_scope||f.scope,h,g)};f.data=b.serialize({id:f.id||"c"+(this.count++),method:f.method,params:f.params});f.content_type="application/json";a.send(f)},"static":{sendRPC:function(d){return new tinymce.util.JSONRequest().send(d)}}})}());(function(m){var k=m.each,j=m.is,i=m.isWebKit,d=m.isIE,a=/^(H[1-6R]|P|DIV|ADDRESS|PRE|FORM|T(ABLE|BODY|HEAD|FOOT|H|R|D)|LI|OL|UL|CAPTION|BLOCKQUOTE|CENTER|DL|DT|DD|DIR|FIELDSET|NOSCRIPT|MENU|ISINDEX|SAMP)$/,e=g("checked,compact,declare,defer,disabled,ismap,multiple,nohref,noresize,noshade,nowrap,readonly,selected"),f=g("src,href,style,coords,shape"),c={"&":"&amp;",'"':"&quot;","<":"&lt;",">":"&gt;"},n=/[<>&\"]/g,b=/^([a-z0-9],?)+$/i,h=/<(\w+)((?:\s+\w+(?:\s*=\s*(?:(?:"[^"]*")|(?:'[^']*')|[^>\s]+))?)*)(\s*\/?)>/g,l=/(\w+)(?:\s*=\s*(?:(?:"((?:\\.|[^"])*)")|(?:'((?:\\.|[^'])*)')|([^>\s]+)))?/g;function g(q){var p={},o;q=q.split(",");for(o=q.length;o>=0;o--){p[q[o]]=1}return p}m.create("tinymce.dom.DOMUtils",{doc:null,root:null,files:null,pixelStyles:/^(top|left|bottom|right|width|height|borderWidth)$/,props:{"for":"htmlFor","class":"className",className:"className",checked:"checked",disabled:"disabled",maxlength:"maxLength",readonly:"readOnly",selected:"selected",value:"value",id:"id",name:"name",type:"type"},DOMUtils:function(u,q){var p=this,o;p.doc=u;p.win=window;p.files={};p.cssFlicker=false;p.counter=0;p.boxModel=!m.isIE||u.compatMode=="CSS1Compat";p.stdMode=u.documentMode===8;p.settings=q=m.extend({keep_values:false,hex_colors:1,process_html:1},q);if(m.isIE6){try{u.execCommand("BackgroundImageCache",false,true)}catch(r){p.cssFlicker=true}}if(q.valid_styles){p._styles={};k(q.valid_styles,function(t,s){p._styles[s]=m.explode(t)})}m.addUnload(p.destroy,p)},getRoot:function(){var o=this,p=o.settings;return(p&&o.get(p.root_element))||o.doc.body},getViewPort:function(p){var q,o;p=!p?this.win:p;q=p.document;o=this.boxModel?q.documentElement:q.body;return{x:p.pageXOffset||o.scrollLeft,y:p.pageYOffset||o.scrollTop,w:p.innerWidth||o.clientWidth,h:p.innerHeight||o.clientHeight}},getRect:function(s){var r,o=this,q;s=o.get(s);r=o.getPos(s);q=o.getSize(s);return{x:r.x,y:r.y,w:q.w,h:q.h}},getSize:function(r){var p=this,o,q;r=p.get(r);o=p.getStyle(r,"width");q=p.getStyle(r,"height");if(o.indexOf("px")===-1){o=0}if(q.indexOf("px")===-1){q=0}return{w:parseInt(o)||r.offsetWidth||r.clientWidth,h:parseInt(q)||r.offsetHeight||r.clientHeight}},getParent:function(q,p,o){return this.getParents(q,p,o,false)},getParents:function(z,v,s,y){var q=this,p,u=q.settings,x=[];z=q.get(z);y=y===undefined;if(u.strict_root){s=s||q.getRoot()}if(j(v,"string")){p=v;if(v==="*"){v=function(o){return o.nodeType==1}}else{v=function(o){return q.is(o,p)}}}while(z){if(z==s||!z.nodeType||z.nodeType===9){break}if(!v||v(z)){if(y){x.push(z)}else{return z}}z=z.parentNode}return y?x:null},get:function(o){var p;if(o&&this.doc&&typeof(o)=="string"){p=o;o=this.doc.getElementById(o);if(o&&o.id!==p){return this.doc.getElementsByName(p)[1]}}return o},getNext:function(p,o){return this._findSib(p,o,"nextSibling")},getPrev:function(p,o){return this._findSib(p,o,"previousSibling")},add:function(s,v,o,r,u){var q=this;return this.run(s,function(y){var x,t;x=j(v,"string")?q.doc.createElement(v):v;q.setAttribs(x,o);if(r){if(r.nodeType){x.appendChild(r)}else{q.setHTML(x,r)}}return !u?y.appendChild(x):x})},create:function(q,o,p){return this.add(this.doc.createElement(q),q,o,p,1)},createHTML:function(v,p,s){var u="",r=this,q;u+="<"+v;for(q in p){if(p.hasOwnProperty(q)){u+=" "+q+'="'+r.encode(p[q])+'"'}}if(m.is(s)){return u+">"+s+"</"+v+">"}return u+" />"},remove:function(o,p){return this.run(o,function(r){var q,s;q=r.parentNode;if(!q){return null}if(p){while(s=r.firstChild){if(!m.isIE||s.nodeType!==3||s.nodeValue){q.insertBefore(s,r)}else{r.removeChild(s)}}}return q.removeChild(r)})},setStyle:function(r,o,p){var q=this;return q.run(r,function(v){var u,t;u=v.style;o=o.replace(/-(\D)/g,function(x,s){return s.toUpperCase()});if(q.pixelStyles.test(o)&&(m.is(p,"number")||/^[\-0-9\.]+$/.test(p))){p+="px"}switch(o){case"opacity":if(d){u.filter=p===""?"":"alpha(opacity="+(p*100)+")";if(!r.currentStyle||!r.currentStyle.hasLayout){u.display="inline-block"}}u[o]=u["-moz-opacity"]=u["-khtml-opacity"]=p||"";break;case"float":d?u.styleFloat=p:u.cssFloat=p;break;default:u[o]=p||""}if(q.settings.update_styles){q.setAttrib(v,"_mce_style")}})},getStyle:function(r,o,q){r=this.get(r);if(!r){return false}if(this.doc.defaultView&&q){o=o.replace(/[A-Z]/g,function(s){return"-"+s});try{return this.doc.defaultView.getComputedStyle(r,null).getPropertyValue(o)}catch(p){return null}}o=o.replace(/-(\D)/g,function(t,s){return s.toUpperCase()});if(o=="float"){o=d?"styleFloat":"cssFloat"}if(r.currentStyle&&q){return r.currentStyle[o]}return r.style[o]},setStyles:function(u,v){var q=this,r=q.settings,p;p=r.update_styles;r.update_styles=0;k(v,function(o,s){q.setStyle(u,s,o)});r.update_styles=p;if(r.update_styles){q.setAttrib(u,r.cssText)}},setAttrib:function(q,r,o){var p=this;if(!q||!r){return}if(p.settings.strict){r=r.toLowerCase()}return this.run(q,function(u){var t=p.settings;switch(r){case"style":if(!j(o,"string")){k(o,function(s,x){p.setStyle(u,x,s)});return}if(t.keep_values){if(o&&!p._isRes(o)){u.setAttribute("_mce_style",o,2)}else{u.removeAttribute("_mce_style",2)}}u.style.cssText=o;break;case"class":u.className=o||"";break;case"src":case"href":if(t.keep_values){if(t.url_converter){o=t.url_converter.call(t.url_converter_scope||p,o,r,u)}p.setAttrib(u,"_mce_"+r,o,2)}break;case"shape":u.setAttribute("_mce_style",o);break}if(j(o)&&o!==null&&o.length!==0){u.setAttribute(r,""+o,2)}else{u.removeAttribute(r,2)}})},setAttribs:function(q,r){var p=this;return this.run(q,function(o){k(r,function(s,t){p.setAttrib(o,t,s)})})},getAttrib:function(r,s,q){var o,p=this;r=p.get(r);if(!r||r.nodeType!==1){return false}if(!j(q)){q=""}if(/^(src|href|style|coords|shape)$/.test(s)){o=r.getAttribute("_mce_"+s);if(o){return o}}if(d&&p.props[s]){o=r[p.props[s]];o=o&&o.nodeValue?o.nodeValue:o}if(!o){o=r.getAttribute(s,2)}if(/^(checked|compact|declare|defer|disabled|ismap|multiple|nohref|noshade|nowrap|readonly|selected)$/.test(s)){if(r[p.props[s]]===true&&o===""){return s}return o?s:""}if(r.nodeName==="FORM"&&r.getAttributeNode(s)){return r.getAttributeNode(s).nodeValue}if(s==="style"){o=o||r.style.cssText;if(o){o=p.serializeStyle(p.parseStyle(o),r.nodeName);if(p.settings.keep_values&&!p._isRes(o)){r.setAttribute("_mce_style",o)}}}if(i&&s==="class"&&o){o=o.replace(/(apple|webkit)\-[a-z\-]+/gi,"")}if(d){switch(s){case"rowspan":case"colspan":if(o===1){o=""}break;case"size":if(o==="+0"||o===20||o===0){o=""}break;case"width":case"height":case"vspace":case"checked":case"disabled":case"readonly":if(o===0){o=""}break;case"hspace":if(o===-1){o=""}break;case"maxlength":case"tabindex":if(o===32768||o===2147483647||o==="32768"){o=""}break;case"multiple":case"compact":case"noshade":case"nowrap":if(o===65535){return s}return q;case"shape":o=o.toLowerCase();break;default:if(s.indexOf("on")===0&&o){o=(""+o).replace(/^function\s+\w+\(\)\s+\{\s+(.*)\s+\}$/,"$1")}}}return(o!==undefined&&o!==null&&o!=="")?""+o:q},getPos:function(A,s){var p=this,o=0,z=0,u,v=p.doc,q;A=p.get(A);s=s||v.body;if(A){if(d&&!p.stdMode){A=A.getBoundingClientRect();u=p.boxModel?v.documentElement:v.body;o=p.getStyle(p.select("html")[0],"borderWidth");o=(o=="medium"||p.boxModel&&!p.isIE6)&&2||o;return{x:A.left+u.scrollLeft-o,y:A.top+u.scrollTop-o}}q=A;while(q&&q!=s&&q.nodeType){o+=q.offsetLeft||0;z+=q.offsetTop||0;q=q.offsetParent}q=A.parentNode;while(q&&q!=s&&q.nodeType){o-=q.scrollLeft||0;z-=q.scrollTop||0;q=q.parentNode}}return{x:o,y:z}},parseStyle:function(r){var u=this,v=u.settings,x={};if(!r){return x}function p(D,A,C){var z,B,o,y;z=x[D+"-top"+A];if(!z){return}B=x[D+"-right"+A];if(z!=B){return}o=x[D+"-bottom"+A];if(B!=o){return}y=x[D+"-left"+A];if(o!=y){return}x[C]=y;delete x[D+"-top"+A];delete x[D+"-right"+A];delete x[D+"-bottom"+A];delete x[D+"-left"+A]}function q(y,s,o,A){var z;z=x[s];if(!z){return}z=x[o];if(!z){return}z=x[A];if(!z){return}x[y]=x[s]+" "+x[o]+" "+x[A];delete x[s];delete x[o];delete x[A]}r=r.replace(/&(#?[a-z0-9]+);/g,"&$1_MCE_SEMI_");k(r.split(";"),function(s){var o,t=[];if(s){s=s.replace(/_MCE_SEMI_/g,";");s=s.replace(/url\([^\)]+\)/g,function(y){t.push(y);return"url("+t.length+")"});s=s.split(":");o=m.trim(s[1]);o=o.replace(/url\(([^\)]+)\)/g,function(z,y){return t[parseInt(y)-1]});o=o.replace(/rgb\([^\)]+\)/g,function(y){return u.toHex(y)});if(v.url_converter){o=o.replace(/url\([\'\"]?([^\)\'\"]+)[\'\"]?\)/g,function(y,z){return"url("+v.url_converter.call(v.url_converter_scope||u,u.decode(z),"style",null)+")"})}x[m.trim(s[0]).toLowerCase()]=o}});p("border","","border");p("border","-width","border-width");p("border","-color","border-color");p("border","-style","border-style");p("padding","","padding");p("margin","","margin");q("border","border-width","border-style","border-color");if(d){if(x.border=="medium none"){x.border=""}}return x},serializeStyle:function(v,p){var q=this,r="";function u(s,o){if(o&&s){if(o.indexOf("-")===0){return}switch(o){case"font-weight":if(s==700){s="bold"}break;case"color":case"background-color":s=s.toLowerCase();break}r+=(r?" ":"")+o+": "+s+";"}}if(p&&q._styles){k(q._styles["*"],function(o){u(v[o],o)});k(q._styles[p.toLowerCase()],function(o){u(v[o],o)})}else{k(v,u)}return r},loadCSS:function(o){var q=this,r=q.doc,p;if(!o){o=""}p=q.select("head")[0];k(o.split(","),function(s){var t;if(q.files[s]){return}q.files[s]=true;t=q.create("link",{rel:"stylesheet",href:m._addVer(s)});if(d&&r.documentMode){t.onload=function(){r.recalc();t.onload=null}}p.appendChild(t)})},addClass:function(o,p){return this.run(o,function(q){var r;if(!p){return 0}if(this.hasClass(q,p)){return q.className}r=this.removeClass(q,p);return q.className=(r!=""?(r+" "):"")+p})},removeClass:function(q,r){var o=this,p;return o.run(q,function(t){var s;if(o.hasClass(t,r)){if(!p){p=new RegExp("(^|\\s+)"+r+"(\\s+|$)","g")}s=t.className.replace(p," ");s=m.trim(s!=" "?s:"");t.className=s;if(!s){t.removeAttribute("class");t.removeAttribute("className")}return s}return t.className})},hasClass:function(p,o){p=this.get(p);if(!p||!o){return false}return(" "+p.className+" ").indexOf(" "+o+" ")!==-1},show:function(o){return this.setStyle(o,"display","block")},hide:function(o){return this.setStyle(o,"display","none")},isHidden:function(o){o=this.get(o);return !o||o.style.display=="none"||this.getStyle(o,"display")=="none"},uniqueId:function(o){return(!o?"mce_":o)+(this.counter++)},setHTML:function(q,p){var o=this;return this.run(q,function(v){var r,t,s,z,u,r;p=o.processHTML(p);if(d){function y(){while(v.firstChild){v.firstChild.removeNode()}try{v.innerHTML="<br />"+p;v.removeChild(v.firstChild)}catch(x){r=o.create("div");r.innerHTML="<br />"+p;k(r.childNodes,function(B,A){if(A){v.appendChild(B)}})}}if(o.settings.fix_ie_paragraphs){p=p.replace(/<p><\/p>|<p([^>]+)><\/p>|<p[^\/+]\/>/gi,'<p$1 _mce_keep="true">&nbsp;</p>')}y();if(o.settings.fix_ie_paragraphs){s=v.getElementsByTagName("p");for(t=s.length-1,r=0;t>=0;t--){z=s[t];if(!z.hasChildNodes()){if(!z._mce_keep){r=1;break}z.removeAttribute("_mce_keep")}}}if(r){p=p.replace(/<p ([^>]+)>|<p>/ig,'<div $1 _mce_tmp="1">');p=p.replace(/<\/p>/gi,"</div>");y();if(o.settings.fix_ie_paragraphs){s=v.getElementsByTagName("DIV");for(t=s.length-1;t>=0;t--){z=s[t];if(z._mce_tmp){u=o.doc.createElement("p");z.cloneNode(false).outerHTML.replace(/([a-z0-9\-_]+)=/gi,function(A,x){var B;if(x!=="_mce_tmp"){B=z.getAttribute(x);if(!B&&x==="class"){B=z.className}u.setAttribute(x,B)}});for(r=0;r<z.childNodes.length;r++){u.appendChild(z.childNodes[r].cloneNode(true))}z.swapNode(u)}}}}}else{v.innerHTML=p}return p})},processHTML:function(r){var p=this,q=p.settings,v=[];if(!q.process_html){return r}if(d){r=r.replace(/&apos;/g,"&#39;");r=r.replace(/\s+(disabled|checked|readonly|selected)\s*=\s*[\"\']?(false|0)[\"\']?/gi,"")}r=r.replace(/<a( )([^>]+)\/>|<a\/>/gi,"<a$1$2></a>");if(q.keep_values){if(/<script|noscript|style/i.test(r)){function o(t){t=t.replace(/(<!--\[CDATA\[|\]\]-->)/g,"\n");t=t.replace(/^[\r\n]*|[\r\n]*$/g,"");t=t.replace(/^\s*(\/\/\s*<!--|\/\/\s*<!\[CDATA\[|<!--|<!\[CDATA\[)[\r\n]*/g,"");t=t.replace(/\s*(\/\/\s*\]\]>|\/\/\s*-->|\]\]>|-->|\]\]-->)\s*$/g,"");return t}r=r.replace(/<script([^>]+|)>([\s\S]*?)<\/script>/gi,function(s,x,t){if(!x){x=' type="text/javascript"'}x=x.replace(/src=\"([^\"]+)\"?/i,function(y,z){if(q.url_converter){z=p.encode(q.url_converter.call(q.url_converter_scope||p,p.decode(z),"src","script"))}return'_mce_src="'+z+'"'});if(m.trim(t)){v.push(o(t));t="<!--\nMCE_SCRIPT:"+(v.length-1)+"\n// -->"}return"<mce:script"+x+">"+t+"</mce:script>"});r=r.replace(/<style([^>]+|)>([\s\S]*?)<\/style>/gi,function(s,x,t){if(t){v.push(o(t));t="<!--\nMCE_SCRIPT:"+(v.length-1)+"\n-->"}return"<mce:style"+x+">"+t+"</mce:style><style "+x+' _mce_bogus="1">'+t+"</style>"});r=r.replace(/<noscript([^>]+|)>([\s\S]*?)<\/noscript>/g,function(s,x,t){return"<mce:noscript"+x+"><!--"+p.encode(t).replace(/--/g,"&#45;&#45;")+"--></mce:noscript>"})}r=r.replace(/<!\[CDATA\[([\s\S]+)\]\]>/g,"<!--[CDATA[$1]]-->");function u(s){return s.replace(h,function(y,z,x,t){return"<"+z+x.replace(l,function(B,A,E,D,C){var F;A=A.toLowerCase();E=E||D||C||"";if(e[A]){if(E==="false"||E==="0"){return}return A+'="'+A+'"'}if(f[A]&&x.indexOf("_mce_"+A)==-1){F=p.decode(E);if(q.url_converter&&(A=="src"||A=="href")){F=q.url_converter.call(q.url_converter_scope||p,F,A,z)}if(A=="style"){F=p.serializeStyle(p.parseStyle(F),A)}return A+'="'+E+'" _mce_'+A+'="'+p.encode(F)+'"'}return B})+t+">"})}r=u(r);r=r.replace(/MCE_SCRIPT:([0-9]+)/g,function(t,s){return v[s]})}return r},getOuterHTML:function(o){var p;o=this.get(o);if(!o){return null}if(o.outerHTML!==undefined){return o.outerHTML}p=(o.ownerDocument||this.doc).createElement("body");p.appendChild(o.cloneNode(true));return p.innerHTML},setOuterHTML:function(r,p,s){var o=this;function q(u,t,x){var y,v;v=x.createElement("body");v.innerHTML=t;y=v.lastChild;while(y){o.insertAfter(y.cloneNode(true),u);y=y.previousSibling}o.remove(u)}return this.run(r,function(u){u=o.get(u);if(u.nodeType==1){s=s||u.ownerDocument||o.doc;if(d){try{if(d&&u.nodeType==1){u.outerHTML=p}else{q(u,p,s)}}catch(t){q(u,p,s)}}else{q(u,p,s)}}})},decode:function(p){var q,r,o;if(/&[\w#]+;/.test(p)){q=this.doc.createElement("div");q.innerHTML=p;r=q.firstChild;o="";if(r){do{o+=r.nodeValue}while(r=r.nextSibling)}return o||p}return p},encode:function(o){return(""+o).replace(n,function(p){return c[p]})},insertAfter:function(o,p){p=this.get(p);return this.run(o,function(r){var q,s;q=p.parentNode;s=p.nextSibling;if(s){q.insertBefore(r,s)}else{q.appendChild(r)}return r})},isBlock:function(o){if(o.nodeType&&o.nodeType!==1){return false}o=o.nodeName||o;return a.test(o)},replace:function(s,r,p){var q=this;if(j(r,"array")){s=s.cloneNode(true)}return q.run(r,function(t){if(p){k(m.grep(t.childNodes),function(o){s.appendChild(o)})}return t.parentNode.replaceChild(s,t)})},rename:function(r,o){var q=this,p;if(r.nodeName!=o.toUpperCase()){p=q.create(o);k(q.getAttribs(r),function(s){q.setAttrib(p,s.nodeName,q.getAttrib(r,s.nodeName))});q.replace(p,r,1)}return p||r},findCommonAncestor:function(q,o){var r=q,p;while(r){p=o;while(p&&r!=p){p=p.parentNode}if(r==p){break}r=r.parentNode}if(!r&&q.ownerDocument){return q.ownerDocument.documentElement}return r},toHex:function(o){var q=/^\s*rgb\s*?\(\s*?([0-9]+)\s*?,\s*?([0-9]+)\s*?,\s*?([0-9]+)\s*?\)\s*$/i.exec(o);function p(r){r=parseInt(r).toString(16);return r.length>1?r:"0"+r}if(q){o="#"+p(q[1])+p(q[2])+p(q[3]);return o}return o},getClasses:function(){var s=this,o=[],r,u={},v=s.settings.class_filter,q;if(s.classes){return s.classes}function x(t){k(t.imports,function(y){x(y)});k(t.cssRules||t.rules,function(y){switch(y.type||1){case 1:if(y.selectorText){k(y.selectorText.split(","),function(z){z=z.replace(/^\s*|\s*$|^\s\./g,"");if(/\.mce/.test(z)||!/\.[\w\-]+$/.test(z)){return}q=z;z=z.replace(/.*\.([a-z0-9_\-]+).*/i,"$1");if(v&&!(z=v(z,q))){return}if(!u[z]){o.push({"class":z});u[z]=1}})}break;case 3:x(y.styleSheet);break}})}try{k(s.doc.styleSheets,x)}catch(p){}if(o.length>0){s.classes=o}return o},run:function(u,r,q){var p=this,v;if(p.doc&&typeof(u)==="string"){u=p.get(u)}if(!u){return false}q=q||this;if(!u.nodeType&&(u.length||u.length===0)){v=[];k(u,function(s,o){if(s){if(typeof(s)=="string"){s=p.doc.getElementById(s)}v.push(r.call(q,s,o))}});return v}return r.call(q,u)},getAttribs:function(q){var p;q=this.get(q);if(!q){return[]}if(d){p=[];if(q.nodeName=="OBJECT"){return q.attributes}if(q.nodeName==="OPTION"&&this.getAttrib(q,"selected")){p.push({specified:1,nodeName:"selected"})}q.cloneNode(false).outerHTML.replace(/<\/?[\w:\-]+ ?|=[\"][^\"]+\"|=\'[^\']+\'|=[\w\-]+|>/gi,"").replace(/[\w:\-]+/gi,function(o){p.push({specified:1,nodeName:o})});return p}return q.attributes},destroy:function(p){var o=this;if(o.events){o.events.destroy()}o.win=o.doc=o.root=o.events=null;if(!p){m.removeUnload(o.destroy)}},createRng:function(){var o=this.doc;return o.createRange?o.createRange():new m.dom.Range(this)},nodeIndex:function(s,t){var o=0,q,r,p;if(s){for(q=s.nodeType,s=s.previousSibling,r=s;s;s=s.previousSibling){p=s.nodeType;if(t&&p==3){if(p==q||!s.nodeValue.length){continue}}o++;q=p}}return o},split:function(u,s,y){var z=this,o=z.createRng(),v,q,x;function p(A){var t,r=A.childNodes;if(A.nodeType==1&&A.getAttribute("_mce_type")=="bookmark"){return}for(t=r.length-1;t>=0;t--){p(r[t])}if(A.nodeType!=9){if(A.nodeType==3&&A.nodeValue.length>0){return}if(A.nodeType==1){r=A.childNodes;if(r.length==1&&r[0]&&r[0].nodeType==1&&r[0].getAttribute("_mce_type")=="bookmark"){A.parentNode.insertBefore(r[0],A)}if(r.length||/^(br|hr|input|img)$/i.test(A.nodeName)){return}}z.remove(A)}return A}if(u&&s){o.setStart(u.parentNode,z.nodeIndex(u));o.setEnd(s.parentNode,z.nodeIndex(s));v=o.extractContents();o=z.createRng();o.setStart(s.parentNode,z.nodeIndex(s)+1);o.setEnd(u.parentNode,z.nodeIndex(u)+1);q=o.extractContents();x=u.parentNode;x.insertBefore(p(v),u);if(y){x.replaceChild(y,s)}else{x.insertBefore(s,u)}x.insertBefore(p(q),u);z.remove(u);return y||s}},bind:function(s,o,r,q){var p=this;if(!p.events){p.events=new m.dom.EventUtils()}return p.events.add(s,o,r,q||this)},unbind:function(r,o,q){var p=this;if(!p.events){p.events=new m.dom.EventUtils()}return p.events.remove(r,o,q)},_findSib:function(r,o,p){var q=this,s=o;if(r){if(j(s,"string")){s=function(t){return q.is(t,o)}}for(r=r[p];r;r=r[p]){if(s(r)){return r}}}return null},_isRes:function(o){return/^(top|left|bottom|right|width|height)/i.test(o)||/;\s*(top|left|bottom|right|width|height)/i.test(o)}});m.DOM=new m.dom.DOMUtils(document,{process_html:0})})(tinymce);(function(a){function b(c){var N=this,e=c.doc,S=0,E=1,j=2,D=true,R=false,U="startOffset",h="startContainer",P="endContainer",z="endOffset",k=tinymce.extend,n=c.nodeIndex;k(N,{startContainer:e,startOffset:0,endContainer:e,endOffset:0,collapsed:D,commonAncestorContainer:e,START_TO_START:0,START_TO_END:1,END_TO_END:2,END_TO_START:3,setStart:q,setEnd:s,setStartBefore:g,setStartAfter:I,setEndBefore:J,setEndAfter:u,collapse:A,selectNode:x,selectNodeContents:F,compareBoundaryPoints:v,deleteContents:p,extractContents:H,cloneContents:d,insertNode:C,surroundContents:M,cloneRange:K});function q(V,t){B(D,V,t)}function s(V,t){B(R,V,t)}function g(t){q(t.parentNode,n(t))}function I(t){q(t.parentNode,n(t)+1)}function J(t){s(t.parentNode,n(t))}function u(t){s(t.parentNode,n(t)+1)}function A(t){if(t){N[P]=N[h];N[z]=N[U]}else{N[h]=N[P];N[U]=N[z]}N.collapsed=D}function x(t){g(t);u(t)}function F(t){q(t,0);s(t,t.nodeType===1?t.childNodes.length:t.nodeValue.length)}function v(W,X){var Z=N[h],Y=N[U],V=N[P],t=N[z];if(W===0){return G(Z,Y,Z,Y)}if(W===1){return G(Z,Y,V,t)}if(W===2){return G(V,t,V,t)}if(W===3){return G(V,t,Z,Y)}}function p(){m(j)}function H(){return m(S)}function d(){return m(E)}function C(Y){var V=this[h],t=this[U],X,W;if((V.nodeType===3||V.nodeType===4)&&V.nodeValue){if(!t){V.parentNode.insertBefore(Y,V)}else{if(t>=V.nodeValue.length){c.insertAfter(Y,V)}else{X=V.splitText(t);V.parentNode.insertBefore(Y,X)}}}else{if(V.childNodes.length>0){W=V.childNodes[t]}if(W){V.insertBefore(Y,W)}else{V.appendChild(Y)}}}function M(V){var t=N.extractContents();N.insertNode(V);V.appendChild(t);N.selectNode(V)}function K(){return k(new b(c),{startContainer:N[h],startOffset:N[U],endContainer:N[P],endOffset:N[z],collapsed:N.collapsed,commonAncestorContainer:N.commonAncestorContainer})}function O(t,V){var W;if(t.nodeType==3){return t}if(V<0){return t}W=t.firstChild;while(W&&V>0){--V;W=W.nextSibling}if(W){return W}return t}function l(){return(N[h]==N[P]&&N[U]==N[z])}function G(X,Z,V,Y){var aa,W,t,ab,ad,ac;if(X==V){if(Z==Y){return 0}if(Z<Y){return -1}return 1}aa=V;while(aa&&aa.parentNode!=X){aa=aa.parentNode}if(aa){W=0;t=X.firstChild;while(t!=aa&&W<Z){W++;t=t.nextSibling}if(Z<=W){return -1}return 1}aa=X;while(aa&&aa.parentNode!=V){aa=aa.parentNode}if(aa){W=0;t=V.firstChild;while(t!=aa&&W<Y){W++;t=t.nextSibling}if(W<Y){return -1}return 1}ab=c.findCommonAncestor(X,V);ad=X;while(ad&&ad.parentNode!=ab){ad=ad.parentNode}if(!ad){ad=ab}ac=V;while(ac&&ac.parentNode!=ab){ac=ac.parentNode}if(!ac){ac=ab}if(ad==ac){return 0}t=ab.firstChild;while(t){if(t==ad){return -1}if(t==ac){return 1}t=t.nextSibling}}function B(V,Y,X){var t,W;if(V){N[h]=Y;N[U]=X}else{N[P]=Y;N[z]=X}t=N[P];while(t.parentNode){t=t.parentNode}W=N[h];while(W.parentNode){W=W.parentNode}if(W==t){if(G(N[h],N[U],N[P],N[z])>0){N.collapse(V)}}else{N.collapse(V)}N.collapsed=l();N.commonAncestorContainer=c.findCommonAncestor(N[h],N[P])}function m(ab){var aa,X=0,ad=0,V,Z,W,Y,t,ac;if(N[h]==N[P]){return f(ab)}for(aa=N[P],V=aa.parentNode;V;aa=V,V=V.parentNode){if(V==N[h]){return r(aa,ab)}++X}for(aa=N[h],V=aa.parentNode;V;aa=V,V=V.parentNode){if(V==N[P]){return T(aa,ab)}++ad}Z=ad-X;W=N[h];while(Z>0){W=W.parentNode;Z--}Y=N[P];while(Z<0){Y=Y.parentNode;Z++}for(t=W.parentNode,ac=Y.parentNode;t!=ac;t=t.parentNode,ac=ac.parentNode){W=t;Y=ac}return o(W,Y,ab)}function f(Z){var ab,Y,X,aa,t,W,V;if(Z!=j){ab=e.createDocumentFragment()}if(N[U]==N[z]){return ab}if(N[h].nodeType==3){Y=N[h].nodeValue;X=Y.substring(N[U],N[z]);if(Z!=E){N[h].deleteData(N[U],N[z]-N[U]);N.collapse(D)}if(Z==j){return}ab.appendChild(e.createTextNode(X));return ab}aa=O(N[h],N[U]);t=N[z]-N[U];while(t>0){W=aa.nextSibling;V=y(aa,Z);if(ab){ab.appendChild(V)}--t;aa=W}if(Z!=E){N.collapse(D)}return ab}function r(ab,Y){var aa,Z,V,t,X,W;if(Y!=j){aa=e.createDocumentFragment()}Z=i(ab,Y);if(aa){aa.appendChild(Z)}V=n(ab);t=V-N[U];if(t<=0){if(Y!=E){N.setEndBefore(ab);N.collapse(R)}return aa}Z=ab.previousSibling;while(t>0){X=Z.previousSibling;W=y(Z,Y);if(aa){aa.insertBefore(W,aa.firstChild)}--t;Z=X}if(Y!=E){N.setEndBefore(ab);N.collapse(R)}return aa}function T(Z,Y){var ab,V,aa,t,X,W;if(Y!=j){ab=e.createDocumentFragment()}aa=Q(Z,Y);if(ab){ab.appendChild(aa)}V=n(Z);++V;t=N[z]-V;aa=Z.nextSibling;while(t>0){X=aa.nextSibling;W=y(aa,Y);if(ab){ab.appendChild(W)}--t;aa=X}if(Y!=E){N.setStartAfter(Z);N.collapse(D)}return ab}function o(Z,t,ac){var W,ae,Y,aa,ab,V,ad,X;if(ac!=j){ae=e.createDocumentFragment()}W=Q(Z,ac);if(ae){ae.appendChild(W)}Y=Z.parentNode;aa=n(Z);ab=n(t);++aa;V=ab-aa;ad=Z.nextSibling;while(V>0){X=ad.nextSibling;W=y(ad,ac);if(ae){ae.appendChild(W)}ad=X;--V}W=i(t,ac);if(ae){ae.appendChild(W)}if(ac!=E){N.setStartAfter(Z);N.collapse(D)}return ae}function i(aa,ab){var W=O(N[P],N[z]-1),ac,Z,Y,t,V,X=W!=N[P];if(W==aa){return L(W,X,R,ab)}ac=W.parentNode;Z=L(ac,R,R,ab);while(ac){while(W){Y=W.previousSibling;t=L(W,X,R,ab);if(ab!=j){Z.insertBefore(t,Z.firstChild)}X=D;W=Y}if(ac==aa){return Z}W=ac.previousSibling;ac=ac.parentNode;V=L(ac,R,R,ab);if(ab!=j){V.appendChild(Z)}Z=V}}function Q(aa,ab){var X=O(N[h],N[U]),Y=X!=N[h],ac,Z,W,t,V;if(X==aa){return L(X,Y,D,ab)}ac=X.parentNode;Z=L(ac,R,D,ab);while(ac){while(X){W=X.nextSibling;t=L(X,Y,D,ab);if(ab!=j){Z.appendChild(t)}Y=D;X=W}if(ac==aa){return Z}X=ac.nextSibling;ac=ac.parentNode;V=L(ac,R,D,ab);if(ab!=j){V.appendChild(Z)}Z=V}}function L(t,Y,ab,ac){var X,W,Z,V,aa;if(Y){return y(t,ac)}if(t.nodeType==3){X=t.nodeValue;if(ab){V=N[U];W=X.substring(V);Z=X.substring(0,V)}else{V=N[z];W=X.substring(0,V);Z=X.substring(V)}if(ac!=E){t.nodeValue=Z}if(ac==j){return}aa=t.cloneNode(R);aa.nodeValue=W;return aa}if(ac==j){return}return t.cloneNode(R)}function y(V,t){if(t!=j){return t==E?V.cloneNode(D):V}V.parentNode.removeChild(V)}}a.Range=b})(tinymce.dom);(function(){function a(g){var i=this,j="\uFEFF",e,h,d=g.dom,c=true,f=false;function b(){var n=g.getRng(),k=d.createRng(),m,o;m=n.item?n.item(0):n.parentElement();if(m.ownerDocument!=d.doc){return k}if(n.item||!m.hasChildNodes()){k.setStart(m.parentNode,d.nodeIndex(m));k.setEnd(k.startContainer,k.startOffset+1);return k}o=g.isCollapsed();function l(s){var u,q,t,p,A=0,x,y,z,r,v;r=n.duplicate();r.collapse(s);u=d.create("a");z=r.parentElement();if(!z.hasChildNodes()){k[s?"setStart":"setEnd"](z,0);return}z.appendChild(u);r.moveToElementText(u);v=n.compareEndPoints(s?"StartToStart":"EndToEnd",r);if(v>0){k[s?"setStartAfter":"setEndAfter"](z);d.remove(u);return}p=tinymce.grep(z.childNodes);x=p.length-1;while(A<=x){y=Math.floor((A+x)/2);z.insertBefore(u,p[y]);r.moveToElementText(u);v=n.compareEndPoints(s?"StartToStart":"EndToEnd",r);if(v>0){A=y+1}else{if(v<0){x=y-1}else{found=true;break}}}q=v>0||y==0?u.nextSibling:u.previousSibling;if(q.nodeType==1){d.remove(u);t=d.nodeIndex(q);q=q.parentNode;if(!s||y>0){t++}}else{if(v>0||y==0){r.setEndPoint(s?"StartToStart":"EndToEnd",n);t=r.text.length}else{r.setEndPoint(s?"StartToStart":"EndToEnd",n);t=q.nodeValue.length-r.text.length}d.remove(u)}k[s?"setStart":"setEnd"](q,t)}l(true);if(!o){l()}return k}this.addRange=function(k){var p,n,m,r,u,s,t=g.dom.doc,o=t.body;function l(B){var x,A,v,z,y;v=d.create("a");x=B?m:u;A=B?r:s;z=p.duplicate();if(x==t){x=o;A=0}if(x.nodeType==3){x.parentNode.insertBefore(v,x);z.moveToElementText(v);z.moveStart("character",A);d.remove(v);p.setEndPoint(B?"StartToStart":"EndToEnd",z)}else{y=x.childNodes;if(y.length){if(A>=y.length){d.insertAfter(v,y[y.length-1])}else{x.insertBefore(v,y[A])}z.moveToElementText(v)}else{v=t.createTextNode(j);x.appendChild(v);z.moveToElementText(v.parentNode);z.collapse(c)}p.setEndPoint(B?"StartToStart":"EndToEnd",z);d.remove(v)}}this.destroy();m=k.startContainer;r=k.startOffset;u=k.endContainer;s=k.endOffset;p=o.createTextRange();if(m==u&&m.nodeType==1&&r==s-1){if(r==s-1){try{n=o.createControlRange();n.addElement(m.childNodes[r]);n.select();n.scrollIntoView();return}catch(q){}}}l(true);l();p.select();p.scrollIntoView()};this.getRangeAt=function(){if(!e||!tinymce.dom.RangeUtils.compareRanges(h,g.getRng())){e=b();h=g.getRng()}try{e.startContainer.nextSibling}catch(k){e=b();h=null}return e};this.destroy=function(){h=e=null};if(g.dom.boxModel){(function(){var q=d.doc,l=q.body,n,o;q.documentElement.unselectable=c;function p(r,u){var s=l.createTextRange();try{s.moveToPoint(r,u)}catch(t){s=null}return s}function m(s){var r;if(s.button){r=p(s.x,s.y);if(r){if(r.compareEndPoints("StartToStart",o)>0){r.setEndPoint("StartToStart",o)}else{r.setEndPoint("EndToEnd",o)}r.select()}}else{k()}}function k(){d.unbind(q,"mouseup",k);d.unbind(q,"mousemove",m);n=0}d.bind(q,"mousedown",function(r){if(r.target.nodeName==="HTML"){if(n){k()}n=1;o=p(r.x,r.y);if(o){d.bind(q,"mouseup",k);d.bind(q,"mousemove",m);o.select()}}})})()}}tinymce.dom.TridentSelection=a})();(function(d){var f=d.each,c=d.DOM,b=d.isIE,e=d.isWebKit,a;d.create("tinymce.dom.EventUtils",{EventUtils:function(){this.inits=[];this.events=[]},add:function(m,p,l,j){var g,h=this,i=h.events,k;if(p instanceof Array){k=[];f(p,function(o){k.push(h.add(m,o,l,j))});return k}if(m&&m.hasOwnProperty&&m instanceof Array){k=[];f(m,function(n){n=c.get(n);k.push(h.add(n,p,l,j))});return k}m=c.get(m);if(!m){return}g=function(n){if(h.disabled){return}n=n||window.event;if(n&&b){if(!n.target){n.target=n.srcElement}d.extend(n,h._stoppers)}if(!j){return l(n)}return l.call(j,n)};if(p=="unload"){d.unloads.unshift({func:g});return g}if(p=="init"){if(h.domLoaded){g()}else{h.inits.push(g)}return g}i.push({obj:m,name:p,func:l,cfunc:g,scope:j});h._add(m,p,g);return l},remove:function(l,m,k){var h=this,g=h.events,i=false,j;if(l&&l.hasOwnProperty&&l instanceof Array){j=[];f(l,function(n){n=c.get(n);j.push(h.remove(n,m,k))});return j}l=c.get(l);f(g,function(o,n){if(o.obj==l&&o.name==m&&(!k||(o.func==k||o.cfunc==k))){g.splice(n,1);h._remove(l,m,o.cfunc);i=true;return false}});return i},clear:function(l){var j=this,g=j.events,h,k;if(l){l=c.get(l);for(h=g.length-1;h>=0;h--){k=g[h];if(k.obj===l){j._remove(k.obj,k.name,k.cfunc);k.obj=k.cfunc=null;g.splice(h,1)}}}},cancel:function(g){if(!g){return false}this.stop(g);return this.prevent(g)},stop:function(g){if(g.stopPropagation){g.stopPropagation()}else{g.cancelBubble=true}return false},prevent:function(g){if(g.preventDefault){g.preventDefault()}else{g.returnValue=false}return false},destroy:function(){var g=this;f(g.events,function(j,h){g._remove(j.obj,j.name,j.cfunc);j.obj=j.cfunc=null});g.events=[];g=null},_add:function(h,i,g){if(h.attachEvent){h.attachEvent("on"+i,g)}else{if(h.addEventListener){h.addEventListener(i,g,false)}else{h["on"+i]=g}}},_remove:function(i,j,h){if(i){try{if(i.detachEvent){i.detachEvent("on"+j,h)}else{if(i.removeEventListener){i.removeEventListener(j,h,false)}else{i["on"+j]=null}}}catch(g){}}},_pageInit:function(h){var g=this;if(g.domLoaded){return}g.domLoaded=true;f(g.inits,function(i){i()});g.inits=[]},_wait:function(i){var g=this,h=i.document;if(i.tinyMCE_GZ&&tinyMCE_GZ.loaded){g.domLoaded=1;return}if(h.attachEvent){h.attachEvent("onreadystatechange",function(){if(h.readyState==="complete"){h.detachEvent("onreadystatechange",arguments.callee);g._pageInit(i)}});if(h.documentElement.doScroll&&i==i.top){(function(){if(g.domLoaded){return}try{h.documentElement.doScroll("left")}catch(j){setTimeout(arguments.callee,0);return}g._pageInit(i)})()}}else{if(h.addEventListener){g._add(i,"DOMContentLoaded",function(){g._pageInit(i)})}}g._add(i,"load",function(){g._pageInit(i)})},_stoppers:{preventDefault:function(){this.returnValue=false},stopPropagation:function(){this.cancelBubble=true}}});a=d.dom.Event=new d.dom.EventUtils();a._wait(window);d.addUnload(function(){a.destroy()})})(tinymce);(function(a){a.dom.Element=function(f,d){var b=this,e,c;b.settings=d=d||{};b.id=f;b.dom=e=d.dom||a.DOM;if(!a.isIE){c=e.get(b.id)}a.each(("getPos,getRect,getParent,add,setStyle,getStyle,setStyles,setAttrib,setAttribs,getAttrib,addClass,removeClass,hasClass,getOuterHTML,setOuterHTML,remove,show,hide,isHidden,setHTML,get").split(/,/),function(g){b[g]=function(){var h=[f],j;for(j=0;j<arguments.length;j++){h.push(arguments[j])}h=e[g].apply(e,h);b.update(g);return h}});a.extend(b,{on:function(i,h,g){return a.dom.Event.add(b.id,i,h,g)},getXY:function(){return{x:parseInt(b.getStyle("left")),y:parseInt(b.getStyle("top"))}},getSize:function(){var g=e.get(b.id);return{w:parseInt(b.getStyle("width")||g.clientWidth),h:parseInt(b.getStyle("height")||g.clientHeight)}},moveTo:function(g,h){b.setStyles({left:g,top:h})},moveBy:function(g,i){var h=b.getXY();b.moveTo(h.x+g,h.y+i)},resizeTo:function(g,i){b.setStyles({width:g,height:i})},resizeBy:function(g,j){var i=b.getSize();b.resizeTo(i.w+g,i.h+j)},update:function(h){var g;if(a.isIE6&&d.blocker){h=h||"";if(h.indexOf("get")===0||h.indexOf("has")===0||h.indexOf("is")===0){return}if(h=="remove"){e.remove(b.blocker);return}if(!b.blocker){b.blocker=e.uniqueId();g=e.add(d.container||e.getRoot(),"iframe",{id:b.blocker,style:"position:absolute;",frameBorder:0,src:'javascript:""'});e.setStyle(g,"opacity",0)}else{g=e.get(b.blocker)}e.setStyles(g,{left:b.getStyle("left",1),top:b.getStyle("top",1),width:b.getStyle("width",1),height:b.getStyle("height",1),display:b.getStyle("display",1),zIndex:parseInt(b.getStyle("zIndex",1)||0)-1})}}})}})(tinymce);(function(c){function e(f){return f.replace(/[\n\r]+/g,"")}var b=c.is,a=c.isIE,d=c.each;c.create("tinymce.dom.Selection",{Selection:function(i,h,g){var f=this;f.dom=i;f.win=h;f.serializer=g;d(["onBeforeSetContent","onBeforeGetContent","onSetContent","onGetContent"],function(j){f[j]=new c.util.Dispatcher(f)});if(!f.win.getSelection){f.tridentSel=new c.dom.TridentSelection(f)}c.addUnload(f.destroy,f)},getContent:function(g){var f=this,h=f.getRng(),l=f.dom.create("body"),j=f.getSel(),i,k,m;g=g||{};i=k="";g.get=true;g.format=g.format||"html";f.onBeforeGetContent.dispatch(f,g);if(g.format=="text"){return f.isCollapsed()?"":(h.text||(j.toString?j.toString():""))}if(h.cloneContents){m=h.cloneContents();if(m){l.appendChild(m)}}else{if(b(h.item)||b(h.htmlText)){l.innerHTML=h.item?h.item(0).outerHTML:h.htmlText}else{l.innerHTML=h.toString()}}if(/^\s/.test(l.innerHTML)){i=" "}if(/\s+$/.test(l.innerHTML)){k=" "}g.getInner=true;g.content=f.isCollapsed()?"":i+f.serializer.serialize(l,g)+k;f.onGetContent.dispatch(f,g);return g.content},setContent:function(i,g){var f=this,j=f.getRng(),l,k=f.win.document;g=g||{format:"html"};g.set=true;i=g.content=f.dom.processHTML(i);f.onBeforeSetContent.dispatch(f,g);i=g.content;if(j.insertNode){i+='<span id="__caret">_</span>';if(j.startContainer==k&&j.endContainer==k){k.body.innerHTML=i}else{j.deleteContents();if(k.body.childNodes.length==0){k.body.innerHTML=i}else{j.insertNode(j.createContextualFragment(i))}}l=f.dom.get("__caret");j=k.createRange();j.setStartBefore(l);j.setEndBefore(l);f.setRng(j);f.dom.remove("__caret")}else{if(j.item){k.execCommand("Delete",false,null);j=f.getRng()}j.pasteHTML(i)}f.onSetContent.dispatch(f,g)},getStart:function(){var g=this.getRng(),h,f,j,i;if(g.duplicate||g.item){if(g.item){return g.item(0)}j=g.duplicate();j.collapse(1);h=j.parentElement();f=i=g.parentElement();while(i=i.parentNode){if(i==h){h=f;break}}if(h&&h.nodeName=="BODY"){return h.firstChild||h}return h}else{h=g.startContainer;if(h.nodeType==1&&h.hasChildNodes()){h=h.childNodes[Math.min(h.childNodes.length-1,g.startOffset)]}if(h&&h.nodeType==3){return h.parentNode}return h}},getEnd:function(){var g=this,h=g.getRng(),i,f;if(h.duplicate||h.item){if(h.item){return h.item(0)}h=h.duplicate();h.collapse(0);i=h.parentElement();if(i&&i.nodeName=="BODY"){return i.lastChild||i}return i}else{i=h.endContainer;f=h.endOffset;if(i.nodeType==1&&i.hasChildNodes()){i=i.childNodes[f>0?f-1:f]}if(i&&i.nodeType==3){return i.parentNode}return i}},getBookmark:function(q,r){var u=this,m=u.dom,g,j,i,n,h,o,p,l="\uFEFF",s;function f(v,x){var t=0;d(m.select(v),function(z,y){if(z==x){t=y}});return t}if(q==2){function k(){var v=u.getRng(true),t=m.getRoot(),x={};function y(B,G){var A=B[G?"startContainer":"endContainer"],F=B[G?"startOffset":"endOffset"],z=[],C,E,D=0;if(A.nodeType==3){if(r){for(C=A.previousSibling;C&&C.nodeType==3;C=C.previousSibling){F+=C.nodeValue.length}}z.push(F)}else{E=A.childNodes;if(F>=E.length&&E.length){D=1;F=Math.max(0,E.length-1)}z.push(u.dom.nodeIndex(E[F],r)+D)}for(;A&&A!=t;A=A.parentNode){z.push(u.dom.nodeIndex(A,r))}return z}x.start=y(v,true);if(!u.isCollapsed()){x.end=y(v)}return x}return k()}if(q){return{rng:u.getRng()}}g=u.getRng();i=m.uniqueId();n=tinyMCE.activeEditor.selection.isCollapsed();s="overflow:hidden;line-height:0px";if(g.duplicate||g.item){if(!g.item){j=g.duplicate();g.collapse();g.pasteHTML('<span _mce_type="bookmark" id="'+i+'_start" style="'+s+'">'+l+"</span>");if(!n){j.collapse(false);j.pasteHTML('<span _mce_type="bookmark" id="'+i+'_end" style="'+s+'">'+l+"</span>")}}else{o=g.item(0);h=o.nodeName;return{name:h,index:f(h,o)}}}else{o=u.getNode();h=o.nodeName;if(h=="IMG"){return{name:h,index:f(h,o)}}j=g.cloneRange();if(!n){j.collapse(false);j.insertNode(m.create("span",{_mce_type:"bookmark",id:i+"_end",style:s},l))}g.collapse(true);g.insertNode(m.create("span",{_mce_type:"bookmark",id:i+"_start",style:s},l))}u.moveToBookmark({id:i,keep:1});return{id:i}},moveToBookmark:function(n){var r=this,l=r.dom,i,h,f,q,j,s,o,p;if(r.tridentSel){r.tridentSel.destroy()}if(n){if(n.start){f=l.createRng();q=l.getRoot();function g(z){var t=n[z?"start":"end"],v,x,y,u;if(t){for(x=q,v=t.length-1;v>=1;v--){u=x.childNodes;if(u.length){x=u[t[v]]}}if(z){f.setStart(x,t[0])}else{f.setEnd(x,t[0])}}}g(true);g();r.setRng(f)}else{if(n.id){function k(A){var u=l.get(n.id+"_"+A),z,t,x,y,v=n.keep;if(u){z=u.parentNode;if(A=="start"){if(!v){t=l.nodeIndex(u)}else{z=u.firstChild;t=1}j=s=z;o=p=t}else{if(!v){t=l.nodeIndex(u)}else{z=u.firstChild;t=1}s=z;p=t}if(!v){y=u.previousSibling;x=u.nextSibling;d(c.grep(u.childNodes),function(B){if(B.nodeType==3){B.nodeValue=B.nodeValue.replace(/\uFEFF/g,"")}});while(u=l.get(n.id+"_"+A)){l.remove(u,1)}if(y&&x&&y.nodeType==x.nodeType&&y.nodeType==3){t=y.nodeValue.length;y.appendData(x.nodeValue);l.remove(x);if(A=="start"){j=s=y;o=p=t}else{s=y;p=t}}}}}function m(t){if(!a&&l.isBlock(t)&&!t.innerHTML){t.innerHTML='<br _mce_bogus="1" />'}return t}k("start");k("end");f=l.createRng();f.setStart(m(j),o);f.setEnd(m(s),p);r.setRng(f)}else{if(n.name){r.select(l.select(n.name)[n.index])}else{if(n.rng){r.setRng(n.rng)}}}}}},select:function(k,j){var i=this,l=i.dom,g=l.createRng(),f;f=l.nodeIndex(k);g.setStart(k.parentNode,f);g.setEnd(k.parentNode,f+1);if(j){function h(m,o){var n=new c.dom.TreeWalker(m,m);do{if(m.nodeType==3&&c.trim(m.nodeValue).length!=0){if(o){g.setStart(m,0)}else{g.setEnd(m,m.nodeValue.length)}return}if(m.nodeName=="BR"){if(o){g.setStartBefore(m)}else{g.setEndBefore(m)}return}}while(m=(o?n.next():n.prev()))}h(k,1);h(k)}i.setRng(g);return k},isCollapsed:function(){var f=this,h=f.getRng(),g=f.getSel();if(!h||h.item){return false}if(h.compareEndPoints){return h.compareEndPoints("StartToEnd",h)===0}return !g||h.collapsed},collapse:function(f){var g=this,h=g.getRng(),i;if(h.item){i=h.item(0);h=this.win.document.body.createTextRange();h.moveToElementText(i)}h.collapse(!!f);g.setRng(h)},getSel:function(){var g=this,f=this.win;return f.getSelection?f.getSelection():f.document.selection},getRng:function(j){var g=this,h,i;if(j&&g.tridentSel){return g.tridentSel.getRangeAt(0)}try{if(h=g.getSel()){i=h.rangeCount>0?h.getRangeAt(0):(h.createRange?h.createRange():g.win.document.createRange())}}catch(f){}if(!i){i=g.win.document.createRange?g.win.document.createRange():g.win.document.body.createTextRange()}if(g.selectedRange&&g.explicitRange){if(i.compareBoundaryPoints(i.START_TO_START,g.selectedRange)===0&&i.compareBoundaryPoints(i.END_TO_END,g.selectedRange)===0){i=g.explicitRange}else{g.selectedRange=null;g.explicitRange=null}}return i},setRng:function(i){var h,g=this;if(!g.tridentSel){h=g.getSel();if(h){g.explicitRange=i;h.removeAllRanges();h.addRange(i);g.selectedRange=h.getRangeAt(0)}}else{if(i.cloneRange){g.tridentSel.addRange(i);return}try{i.select()}catch(f){}}},setNode:function(g){var f=this;f.setContent(f.dom.getOuterHTML(g));return g},getNode:function(){var g=this,f=g.getRng(),h=g.getSel(),i;if(f.setStart){if(!f){return g.dom.getRoot()}i=f.commonAncestorContainer;if(!f.collapsed){if(f.startContainer==f.endContainer){if(f.startOffset-f.endOffset<2){if(f.startContainer.hasChildNodes()){i=f.startContainer.childNodes[f.startOffset]}}}if(c.isWebKit&&h.anchorNode&&h.anchorNode.nodeType==1){return h.anchorNode.childNodes[h.anchorOffset]}}if(i&&i.nodeType==3){return i.parentNode}return i}return f.item?f.item(0):f.parentElement()},getSelectedBlocks:function(g,f){var i=this,j=i.dom,m,h,l,k=[];m=j.getParent(g||i.getStart(),j.isBlock);h=j.getParent(f||i.getEnd(),j.isBlock);if(m){k.push(m)}if(m&&h&&m!=h){l=m;while((l=l.nextSibling)&&l!=h){if(j.isBlock(l)){k.push(l)}}}if(h&&m!=h){k.push(h)}return k},destroy:function(g){var f=this;f.win=null;if(f.tridentSel){f.tridentSel.destroy()}if(!g){c.removeUnload(f.destroy)}}})})(tinymce);(function(a){a.create("tinymce.dom.XMLWriter",{node:null,XMLWriter:function(c){function b(){var e=document.implementation;if(!e||!e.createDocument){try{return new ActiveXObject("MSXML2.DOMDocument")}catch(d){}try{return new ActiveXObject("Microsoft.XmlDom")}catch(d){}}else{return e.createDocument("","",null)}}this.doc=b();this.valid=a.isOpera||a.isWebKit;this.reset()},reset:function(){var b=this,c=b.doc;if(c.firstChild){c.removeChild(c.firstChild)}b.node=c.appendChild(c.createElement("html"))},writeStartElement:function(c){var b=this;b.node=b.node.appendChild(b.doc.createElement(c))},writeAttribute:function(c,b){if(this.valid){b=b.replace(/>/g,"%MCGT%")}this.node.setAttribute(c,b)},writeEndElement:function(){this.node=this.node.parentNode},writeFullEndElement:function(){var b=this,c=b.node;c.appendChild(b.doc.createTextNode(""));b.node=c.parentNode},writeText:function(b){if(this.valid){b=b.replace(/>/g,"%MCGT%")}this.node.appendChild(this.doc.createTextNode(b))},writeCDATA:function(b){this.node.appendChild(this.doc.createCDATASection(b))},writeComment:function(b){if(a.isIE){b=b.replace(/^\-|\-$/g," ")}this.node.appendChild(this.doc.createComment(b.replace(/\-\-/g," ")))},getContent:function(){var b;b=this.doc.xml||new XMLSerializer().serializeToString(this.doc);b=b.replace(/<\?[^?]+\?>|<html>|<\/html>|<html\/>|<!DOCTYPE[^>]+>/g,"");b=b.replace(/ ?\/>/g," />");if(this.valid){b=b.replace(/\%MCGT%/g,"&gt;")}return b}})})(tinymce);(function(a){a.create("tinymce.dom.StringWriter",{str:null,tags:null,count:0,settings:null,indent:null,StringWriter:function(b){this.settings=a.extend({indent_char:" ",indentation:0},b);this.reset()},reset:function(){this.indent="";this.str="";this.tags=[];this.count=0},writeStartElement:function(b){this._writeAttributesEnd();this.writeRaw("<"+b);this.tags.push(b);this.inAttr=true;this.count++;this.elementCount=this.count},writeAttribute:function(d,b){var c=this;c.writeRaw(" "+c.encode(d)+'="'+c.encode(b)+'"')},writeEndElement:function(){var b;if(this.tags.length>0){b=this.tags.pop();if(this._writeAttributesEnd(1)){this.writeRaw("</"+b+">")}if(this.settings.indentation>0){this.writeRaw("\n")}}},writeFullEndElement:function(){if(this.tags.length>0){this._writeAttributesEnd();this.writeRaw("</"+this.tags.pop()+">");if(this.settings.indentation>0){this.writeRaw("\n")}}},writeText:function(b){this._writeAttributesEnd();this.writeRaw(this.encode(b));this.count++},writeCDATA:function(b){this._writeAttributesEnd();this.writeRaw("<![CDATA["+b+"]]>");this.count++},writeComment:function(b){this._writeAttributesEnd();this.writeRaw("<!-- "+b+"-->");this.count++},writeRaw:function(b){this.str+=b},encode:function(b){return b.replace(/[<>&"]/g,function(c){switch(c){case"<":return"&lt;";case">":return"&gt;";case"&":return"&amp;";case'"':return"&quot;"}return c})},getContent:function(){return this.str},_writeAttributesEnd:function(b){if(!this.inAttr){return}this.inAttr=false;if(b&&this.elementCount==this.count){this.writeRaw(" />");return false}this.writeRaw(">");return true}})})(tinymce);(function(e){var g=e.extend,f=e.each,b=e.util.Dispatcher,d=e.isIE,a=e.isGecko;function c(h){return h.replace(/([?+*])/g,".$1")}e.create("tinymce.dom.Serializer",{Serializer:function(j){var i=this;i.key=0;i.onPreProcess=new b(i);i.onPostProcess=new b(i);try{i.writer=new e.dom.XMLWriter()}catch(h){i.writer=new e.dom.StringWriter()}i.settings=j=g({dom:e.DOM,valid_nodes:0,node_filter:0,attr_filter:0,invalid_attrs:/^(_mce_|_moz_|sizset|sizcache)/,closed:/^(br|hr|input|meta|img|link|param|area)$/,entity_encoding:"named",entities:"160,nbsp,161,iexcl,162,cent,163,pound,164,curren,165,yen,166,brvbar,167,sect,168,uml,169,copy,170,ordf,171,laquo,172,not,173,shy,174,reg,175,macr,176,deg,177,plusmn,178,sup2,179,sup3,180,acute,181,micro,182,para,183,middot,184,cedil,185,sup1,186,ordm,187,raquo,188,frac14,189,frac12,190,frac34,191,iquest,192,Agrave,193,Aacute,194,Acirc,195,Atilde,196,Auml,197,Aring,198,AElig,199,Ccedil,200,Egrave,201,Eacute,202,Ecirc,203,Euml,204,Igrave,205,Iacute,206,Icirc,207,Iuml,208,ETH,209,Ntilde,210,Ograve,211,Oacute,212,Ocirc,213,Otilde,214,Ouml,215,times,216,Oslash,217,Ugrave,218,Uacute,219,Ucirc,220,Uuml,221,Yacute,222,THORN,223,szlig,224,agrave,225,aacute,226,acirc,227,atilde,228,auml,229,aring,230,aelig,231,ccedil,232,egrave,233,eacute,234,ecirc,235,euml,236,igrave,237,iacute,238,icirc,239,iuml,240,eth,241,ntilde,242,ograve,243,oacute,244,ocirc,245,otilde,246,ouml,247,divide,248,oslash,249,ugrave,250,uacute,251,ucirc,252,uuml,253,yacute,254,thorn,255,yuml,402,fnof,913,Alpha,914,Beta,915,Gamma,916,Delta,917,Epsilon,918,Zeta,919,Eta,920,Theta,921,Iota,922,Kappa,923,Lambda,924,Mu,925,Nu,926,Xi,927,Omicron,928,Pi,929,Rho,931,Sigma,932,Tau,933,Upsilon,934,Phi,935,Chi,936,Psi,937,Omega,945,alpha,946,beta,947,gamma,948,delta,949,epsilon,950,zeta,951,eta,952,theta,953,iota,954,kappa,955,lambda,956,mu,957,nu,958,xi,959,omicron,960,pi,961,rho,962,sigmaf,963,sigma,964,tau,965,upsilon,966,phi,967,chi,968,psi,969,omega,977,thetasym,978,upsih,982,piv,8226,bull,8230,hellip,8242,prime,8243,Prime,8254,oline,8260,frasl,8472,weierp,8465,image,8476,real,8482,trade,8501,alefsym,8592,larr,8593,uarr,8594,rarr,8595,darr,8596,harr,8629,crarr,8656,lArr,8657,uArr,8658,rArr,8659,dArr,8660,hArr,8704,forall,8706,part,8707,exist,8709,empty,8711,nabla,8712,isin,8713,notin,8715,ni,8719,prod,8721,sum,8722,minus,8727,lowast,8730,radic,8733,prop,8734,infin,8736,ang,8743,and,8744,or,8745,cap,8746,cup,8747,int,8756,there4,8764,sim,8773,cong,8776,asymp,8800,ne,8801,equiv,8804,le,8805,ge,8834,sub,8835,sup,8836,nsub,8838,sube,8839,supe,8853,oplus,8855,otimes,8869,perp,8901,sdot,8968,lceil,8969,rceil,8970,lfloor,8971,rfloor,9001,lang,9002,rang,9674,loz,9824,spades,9827,clubs,9829,hearts,9830,diams,338,OElig,339,oelig,352,Scaron,353,scaron,376,Yuml,710,circ,732,tilde,8194,ensp,8195,emsp,8201,thinsp,8204,zwnj,8205,zwj,8206,lrm,8207,rlm,8211,ndash,8212,mdash,8216,lsquo,8217,rsquo,8218,sbquo,8220,ldquo,8221,rdquo,8222,bdquo,8224,dagger,8225,Dagger,8240,permil,8249,lsaquo,8250,rsaquo,8364,euro",valid_elements:"*[*]",extended_valid_elements:0,invalid_elements:0,fix_table_elements:1,fix_list_elements:true,fix_content_duplication:true,convert_fonts_to_spans:false,font_size_classes:0,apply_source_formatting:0,indent_mode:"simple",indent_char:"\t",indent_levels:1,remove_linebreaks:1,remove_redundant_brs:1,element_format:"xhtml"},j);i.dom=j.dom;i.schema=j.schema;if(j.entity_encoding=="named"&&!j.entities){j.entity_encoding="raw"}if(j.remove_redundant_brs){i.onPostProcess.add(function(k,l){l.content=l.content.replace(/(<br \/>\s*)+<\/(p|h[1-6]|div|li)>/gi,function(n,m,o){if(/^<br \/>\s*<\//.test(n)){return"</"+o+">"}return n})})}if(j.element_format=="html"){i.onPostProcess.add(function(k,l){l.content=l.content.replace(/<([^>]+) \/>/g,"<$1>")})}if(j.fix_list_elements){i.onPreProcess.add(function(v,s){var l,z,y=["ol","ul"],u,t,q,k=/^(OL|UL)$/,A;function m(r,x){var o=x.split(","),p;while((r=r.previousSibling)!=null){for(p=0;p<o.length;p++){if(r.nodeName==o[p]){return r}}}return null}for(z=0;z<y.length;z++){l=i.dom.select(y[z],s.node);for(u=0;u<l.length;u++){t=l[u];q=t.parentNode;if(k.test(q.nodeName)){A=m(t,"LI");if(!A){A=i.dom.create("li");A.innerHTML="&nbsp;";A.appendChild(t);q.insertBefore(A,q.firstChild)}else{A.appendChild(t)}}}}})}if(j.fix_table_elements){i.onPreProcess.add(function(k,l){if(!e.isOpera||opera.buildNumber()>=1767){f(i.dom.select("p table",l.node).reverse(),function(p){var o=i.dom.getParent(p.parentNode,"table,p");if(o.nodeName!="TABLE"){try{i.dom.split(o,p)}catch(m){}}})}})}},setEntities:function(o){var n=this,j,m,h={},k;if(n.entityLookup){return}j=o.split(",");for(m=0;m<j.length;m+=2){k=j[m];if(k==34||k==38||k==60||k==62){continue}h[String.fromCharCode(j[m])]=j[m+1];k=parseInt(j[m]).toString(16)}n.entityLookup=h},setRules:function(i){var h=this;h._setup();h.rules={};h.wildRules=[];h.validElements={};return h.addRules(i)},addRules:function(i){var h=this,j;if(!i){return}h._setup();f(i.split(","),function(m){var q=m.split(/\[|\]/),l=q[0].split("/"),r,k,o,n=[];if(j){k=e.extend([],j.attribs)}if(q.length>1){f(q[1].split("|"),function(u){var p={},t;k=k||[];u=u.replace(/::/g,"~");u=/^([!\-])?([\w*.?~_\-]+|)([=:<])?(.+)?$/.exec(u);u[2]=u[2].replace(/~/g,":");if(u[1]=="!"){r=r||[];r.push(u[2])}if(u[1]=="-"){for(t=0;t<k.length;t++){if(k[t].name==u[2]){k.splice(t,1);return}}}switch(u[3]){case"=":p.defaultVal=u[4]||"";break;case":":p.forcedVal=u[4];break;case"<":p.validVals=u[4].split("?");break}if(/[*.?]/.test(u[2])){o=o||[];p.nameRE=new RegExp("^"+c(u[2])+"$");o.push(p)}else{p.name=u[2];k.push(p)}n.push(u[2])})}f(l,function(v,u){var y=v.charAt(0),t=1,p={};if(j){if(j.noEmpty){p.noEmpty=j.noEmpty}if(j.fullEnd){p.fullEnd=j.fullEnd}if(j.padd){p.padd=j.padd}}switch(y){case"-":p.noEmpty=true;break;case"+":p.fullEnd=true;break;case"#":p.padd=true;break;default:t=0}l[u]=v=v.substring(t);h.validElements[v]=1;if(/[*.?]/.test(l[0])){p.nameRE=new RegExp("^"+c(l[0])+"$");h.wildRules=h.wildRules||{};h.wildRules.push(p)}else{p.name=l[0];if(l[0]=="@"){j=p}h.rules[v]=p}p.attribs=k;if(r){p.requiredAttribs=r}if(o){v="";f(n,function(s){if(v){v+="|"}v+="("+c(s)+")"});p.validAttribsRE=new RegExp("^"+v.toLowerCase()+"$");p.wildAttribs=o}})});i="";f(h.validElements,function(m,l){if(i){i+="|"}if(l!="@"){i+=l}});h.validElementsRE=new RegExp("^("+c(i.toLowerCase())+")$")},findRule:function(m){var j=this,l=j.rules,h,k;j._setup();k=l[m];if(k){return k}l=j.wildRules;for(h=0;h<l.length;h++){if(l[h].nameRE.test(m)){return l[h]}}return null},findAttribRule:function(h,l){var j,k=h.wildAttribs;for(j=0;j<k.length;j++){if(k[j].nameRE.test(l)){return k[j]}}return null},serialize:function(r,q){var m,k=this,p,i,j,l;k._setup();q=q||{};q.format=q.format||"html";k.processObj=q;if(d){l=[];f(r.getElementsByTagName("option"),function(o){var h=k.dom.getAttrib(o,"selected");l.push(h?h:null)})}r=r.cloneNode(true);if(d){f(r.getElementsByTagName("option"),function(o,h){k.dom.setAttrib(o,"selected",l[h])})}j=r.ownerDocument.implementation;if(j.createHTMLDocument&&(e.isOpera&&opera.buildNumber()>=1767)){p=j.createHTMLDocument("");f(r.nodeName=="BODY"?r.childNodes:[r],function(h){p.body.appendChild(p.importNode(h,true))});if(r.nodeName!="BODY"){r=p.body.firstChild}else{r=p.body}i=k.dom.doc;k.dom.doc=p}k.key=""+(parseInt(k.key)+1);if(!q.no_events){q.node=r;k.onPreProcess.dispatch(k,q)}k.writer.reset();k._info=q;k._serializeNode(r,q.getInner);q.content=k.writer.getContent();if(i){k.dom.doc=i}if(!q.no_events){k.onPostProcess.dispatch(k,q)}k._postProcess(q);q.node=null;return e.trim(q.content)},_postProcess:function(n){var i=this,k=i.settings,j=n.content,m=[],l;if(n.format=="html"){l=i._protect({content:j,patterns:[{pattern:/(<script[^>]*>)(.*?)(<\/script>)/g},{pattern:/(<noscript[^>]*>)(.*?)(<\/noscript>)/g},{pattern:/(<style[^>]*>)(.*?)(<\/style>)/g},{pattern:/(<pre[^>]*>)(.*?)(<\/pre>)/g,encode:1},{pattern:/(<!--\[CDATA\[)(.*?)(\]\]-->)/g}]});j=l.content;if(k.entity_encoding!=="raw"){j=i._encode(j)}if(!n.set){j=j.replace(/<p>\s+<\/p>|<p([^>]+)>\s+<\/p>/g,k.entity_encoding=="numeric"?"<p$1>&#160;</p>":"<p$1>&nbsp;</p>");if(k.remove_linebreaks){j=j.replace(/\r?\n|\r/g," ");j=j.replace(/(<[^>]+>)\s+/g,"$1 ");j=j.replace(/\s+(<\/[^>]+>)/g," $1");j=j.replace(/<(p|h[1-6]|blockquote|hr|div|table|tbody|tr|td|body|head|html|title|meta|style|pre|script|link|object) ([^>]+)>\s+/g,"<$1 $2>");j=j.replace(/<(p|h[1-6]|blockquote|hr|div|table|tbody|tr|td|body|head|html|title|meta|style|pre|script|link|object)>\s+/g,"<$1>");j=j.replace(/\s+<\/(p|h[1-6]|blockquote|hr|div|table|tbody|tr|td|body|head|html|title|meta|style|pre|script|link|object)>/g,"</$1>")}if(k.apply_source_formatting&&k.indent_mode=="simple"){j=j.replace(/<(\/?)(ul|hr|table|meta|link|tbody|tr|object|body|head|html|map)(|[^>]+)>\s*/g,"\n<$1$2$3>\n");j=j.replace(/\s*<(p|h[1-6]|blockquote|div|title|style|pre|script|td|li|area)(|[^>]+)>/g,"\n<$1$2>");j=j.replace(/<\/(p|h[1-6]|blockquote|div|title|style|pre|script|td|li)>\s*/g,"</$1>\n");j=j.replace(/\n\n/g,"\n")}}j=i._unprotect(j,l);j=j.replace(/<!--\[CDATA\[([\s\S]+)\]\]-->/g,"<![CDATA[$1]]>");if(k.entity_encoding=="raw"){j=j.replace(/<p>&nbsp;<\/p>|<p([^>]+)>&nbsp;<\/p>/g,"<p$1>\u00a0</p>")}j=j.replace(/<noscript([^>]+|)>([\s\S]*?)<\/noscript>/g,function(h,p,o){return"<noscript"+p+">"+i.dom.decode(o.replace(/<!--|-->/g,""))+"</noscript>"})}n.content=j},_serializeNode:function(E,J){var A=this,B=A.settings,y=A.writer,q,j,u,G,F,I,C,h,z,k,r,D,p,m,H,o,x;if(!B.node_filter||B.node_filter(E)){switch(E.nodeType){case 1:if(E.hasAttribute?E.hasAttribute("_mce_bogus"):E.getAttribute("_mce_bogus")){return}p=H=false;q=E.hasChildNodes();k=E.getAttribute("_mce_name")||E.nodeName.toLowerCase();o=E.getAttribute("_mce_type");if(o){if(!A._info.cleanup){p=true;return}else{H=1}}if(d){x=E.scopeName;if(x&&x!=="HTML"&&x!=="html"){k=x+":"+k}}if(k.indexOf("mce:")===0){k=k.substring(4)}if(!H){if(!A.validElementsRE||!A.validElementsRE.test(k)||(A.invalidElementsRE&&A.invalidElementsRE.test(k))||J){p=true;break}}if(d){if(B.fix_content_duplication){if(E._mce_serialized==A.key){return}E._mce_serialized=A.key}if(k.charAt(0)=="/"){k=k.substring(1)}}else{if(a){if(E.nodeName==="BR"&&E.getAttribute("type")=="_moz"){return}}}if(B.validate_children){if(A.elementName&&!A.schema.isValid(A.elementName,k)){p=true;break}A.elementName=k}r=A.findRule(k);if(!r){p=true;break}k=r.name||k;m=B.closed.test(k);if((!q&&r.noEmpty)||(d&&!k)){p=true;break}if(r.requiredAttribs){I=r.requiredAttribs;for(G=I.length-1;G>=0;G--){if(this.dom.getAttrib(E,I[G])!==""){break}}if(G==-1){p=true;break}}y.writeStartElement(k);if(r.attribs){for(G=0,C=r.attribs,F=C.length;G<F;G++){I=C[G];z=A._getAttrib(E,I);if(z!==null){y.writeAttribute(I.name,z)}}}if(r.validAttribsRE){C=A.dom.getAttribs(E);for(G=C.length-1;G>-1;G--){h=C[G];if(h.specified){I=h.nodeName.toLowerCase();if(B.invalid_attrs.test(I)||!r.validAttribsRE.test(I)){continue}D=A.findAttribRule(r,I);z=A._getAttrib(E,D,I);if(z!==null){y.writeAttribute(I,z)}}}}if(o&&H){y.writeAttribute("_mce_type",o)}if(k==="script"&&e.trim(E.innerHTML)){y.writeText("// ");y.writeCDATA(E.innerHTML.replace(/<!--|-->|<\[CDATA\[|\]\]>/g,""));q=false;break}if(r.padd){if(q&&(u=E.firstChild)&&u.nodeType===1&&E.childNodes.length===1){if(u.hasAttribute?u.hasAttribute("_mce_bogus"):u.getAttribute("_mce_bogus")){y.writeText("\u00a0")}}else{if(!q){y.writeText("\u00a0")}}}break;case 3:if(B.validate_children&&A.elementName&&!A.schema.isValid(A.elementName,"#text")){return}return y.writeText(E.nodeValue);case 4:return y.writeCDATA(E.nodeValue);case 8:return y.writeComment(E.nodeValue)}}else{if(E.nodeType==1){q=E.hasChildNodes()}}if(q&&!m){u=E.firstChild;while(u){A._serializeNode(u);A.elementName=k;u=u.nextSibling}}if(!p){if(!m){y.writeFullEndElement()}else{y.writeEndElement()}}},_protect:function(j){var i=this;j.items=j.items||[];function h(l){return l.replace(/[\r\n\\]/g,function(m){if(m==="\n"){return"\\n"}else{if(m==="\\"){return"\\\\"}}return"\\r"})}function k(l){return l.replace(/\\[\\rn]/g,function(m){if(m==="\\n"){return"\n"}else{if(m==="\\\\"){return"\\"}}return"\r"})}f(j.patterns,function(l){j.content=k(h(j.content).replace(l.pattern,function(n,o,m,p){m=k(m);if(l.encode){m=i._encode(m)}j.items.push(m);return o+"<!--mce:"+(j.items.length-1)+"-->"+p}))});return j},_unprotect:function(i,j){i=i.replace(/\<!--mce:([0-9]+)--\>/g,function(k,h){return j.items[parseInt(h)]});j.items=[];return i},_encode:function(m){var j=this,k=j.settings,i;if(k.entity_encoding!=="raw"){if(k.entity_encoding.indexOf("named")!=-1){j.setEntities(k.entities);i=j.entityLookup;m=m.replace(/[\u007E-\uFFFF]/g,function(h){var l;if(l=i[h]){h="&"+l+";"}return h})}if(k.entity_encoding.indexOf("numeric")!=-1){m=m.replace(/[\u007E-\uFFFF]/g,function(h){return"&#"+h.charCodeAt(0)+";"})}}return m},_setup:function(){var h=this,i=this.settings;if(h.done){return}h.done=1;h.setRules(i.valid_elements);h.addRules(i.extended_valid_elements);if(i.invalid_elements){h.invalidElementsRE=new RegExp("^("+c(i.invalid_elements.replace(/,/g,"|").toLowerCase())+")$")}if(i.attrib_value_filter){h.attribValueFilter=i.attribValueFilter}},_getAttrib:function(m,j,h){var l,k;h=h||j.name;if(j.forcedVal&&(k=j.forcedVal)){if(k==="{$uid}"){return this.dom.uniqueId()}return k}k=this.dom.getAttrib(m,h);switch(h){case"rowspan":case"colspan":if(k=="1"){k=""}break}if(this.attribValueFilter){k=this.attribValueFilter(h,k,m)}if(j.validVals){for(l=j.validVals.length-1;l>=0;l--){if(k==j.validVals[l]){break}}if(l==-1){return null}}if(k===""&&typeof(j.defaultVal)!="undefined"){k=j.defaultVal;if(k==="{$uid}"){return this.dom.uniqueId()}return k}else{if(h=="class"&&this.processObj.get){k=k.replace(/\s?mceItem\w+\s?/g,"")}}if(k===""){return null}return k}})})(tinymce);(function(a){a.dom.ScriptLoader=function(h){var c=0,k=1,i=2,l={},j=[],f={},d=[],g=0,e;function b(m,u){var v=this,q=a.DOM,s,o,r,n;function p(){q.remove(n);if(s){s.onreadystatechange=s.onload=s=null}u()}n=q.uniqueId();if(a.isIE6){o=new a.util.URI(m);r=location;if(o.host==r.hostname&&o.port==r.port&&(o.protocol+":")==r.protocol){a.util.XHR.send({url:a._addVer(o.getURI()),success:function(x){var t=q.create("script",{type:"text/javascript"});t.text=x;document.getElementsByTagName("head")[0].appendChild(t);q.remove(t);p()}});return}}s=q.create("script",{id:n,type:"text/javascript",src:a._addVer(m)});s.onload=p;s.onreadystatechange=function(){var t=s.readyState;if(t=="complete"||t=="loaded"){p()}};(document.getElementsByTagName("head")[0]||document.body).appendChild(s)}this.isDone=function(m){return l[m]==i};this.markDone=function(m){l[m]=i};this.add=this.load=function(m,q,n){var o,p=l[m];if(p==e){j.push(m);l[m]=c}if(q){if(!f[m]){f[m]=[]}f[m].push({func:q,scope:n||this})}};this.loadQueue=function(n,m){this.loadScripts(j,n,m)};this.loadScripts=function(m,q,p){var o;function n(r){a.each(f[r],function(s){s.func.call(s.scope)});f[r]=e}d.push({func:q,scope:p||this});o=function(){var r=a.grep(m);m.length=0;a.each(r,function(s){if(l[s]==i){n(s);return}if(l[s]!=k){l[s]=k;g++;b(s,function(){l[s]=i;g--;n(s);o()})}});if(!g){a.each(d,function(s){s.func.call(s.scope)});d.length=0}};o()}};a.ScriptLoader=new a.dom.ScriptLoader()})(tinymce);tinymce.dom.TreeWalker=function(a,c){var b=a;function d(i,f,e,j){var h,g;if(i){if(!j&&i[f]){return i[f]}if(i!=c){h=i[e];if(h){return h}for(g=i.parentNode;g&&g!=c;g=g.parentNode){h=g[e];if(h){return h}}}}}this.current=function(){return b};this.next=function(e){return(b=d(b,"firstChild","nextSibling",e))};this.prev=function(e){return(b=d(b,"lastChild","lastSibling",e))}};(function(){var a={};function b(f,e){var d;function c(g){return g.replace(/[A-Z]+/g,function(h){return c(f[h])})}for(d in f){if(f.hasOwnProperty(d)){f[d]=c(f[d])}}c(e).replace(/#/g,"#text").replace(/(\w+)\[([^\]]+)\]/g,function(l,g,j){var h,k={};j=j.split(/\|/);for(h=j.length-1;h>=0;h--){k[j[h]]=1}a[g]=k})}b({Z:"#|H|K|N|O|P",Y:"#|X|form|R|Q",X:"p|T|div|U|W|isindex|fieldset|table",W:"pre|hr|blockquote|address|center|noframes",U:"ul|ol|dl|menu|dir",ZC:"#|p|Y|div|U|W|table|br|span|bdo|object|applet|img|map|K|N|Q",T:"h1|h2|h3|h4|h5|h6",ZB:"#|X|S|Q",S:"R|P",ZA:"#|a|G|J|M|O|P",R:"#|a|H|K|N|O",Q:"noscript|P",P:"ins|del|script",O:"input|select|textarea|label|button",N:"M|L",M:"em|strong|dfn|code|q|samp|kbd|var|cite|abbr|acronym",L:"sub|sup",K:"J|I",J:"tt|i|b|u|s|strike",I:"big|small|font|basefont",H:"G|F",G:"br|span|bdo",F:"object|applet|img|map|iframe"},"script[]style[]object[#|param|X|form|a|H|K|N|O|Q]param[]p[S]a[Z]br[]span[S]bdo[S]applet[#|param|X|form|a|H|K|N|O|Q]h1[S]img[]map[X|form|Q|area]h2[S]iframe[#|X|form|a|H|K|N|O|Q]h3[S]tt[S]i[S]b[S]u[S]s[S]strike[S]big[S]small[S]font[S]basefont[]em[S]strong[S]dfn[S]code[S]q[S]samp[S]kbd[S]var[S]cite[S]abbr[S]acronym[S]sub[S]sup[S]input[]select[optgroup|option]optgroup[option]option[]textarea[]label[S]button[#|p|T|div|U|W|table|G|object|applet|img|map|K|N|Q]h4[S]ins[#|X|form|a|H|K|N|O|Q]h5[S]del[#|X|form|a|H|K|N|O|Q]h6[S]div[#|X|form|a|H|K|N|O|Q]ul[li]li[#|X|form|a|H|K|N|O|Q]ol[li]dl[dt|dd]dt[S]dd[#|X|form|a|H|K|N|O|Q]menu[li]dir[li]pre[ZA]hr[]blockquote[#|X|form|a|H|K|N|O|Q]address[S|p]center[#|X|form|a|H|K|N|O|Q]noframes[#|X|form|a|H|K|N|O|Q]isindex[]fieldset[#|legend|X|form|a|H|K|N|O|Q]legend[S]table[caption|col|colgroup|thead|tfoot|tbody|tr]caption[S]col[]colgroup[col]thead[tr]tr[th|td]th[#|X|form|a|H|K|N|O|Q]form[#|X|a|H|K|N|O|Q]noscript[#|X|form|a|H|K|N|O|Q]td[#|X|form|a|H|K|N|O|Q]tfoot[tr]tbody[tr]area[]base[]body[#|X|form|a|H|K|N|O|Q]");tinymce.dom.Schema=function(){var c=this,d=a;c.isValid=function(f,e){var g=d[f];return !!(g&&(!e||g[e]))}}})();(function(a){a.dom.RangeUtils=function(c){var b="\uFEFF";this.walk=function(d,r){var h=d.startContainer,k=d.startOffset,s=d.endContainer,l=d.endOffset,i,f,n,g,q,p,e;e=c.select("td.mceSelected,th.mceSelected");if(e.length>0){a.each(e,function(t){r([t])});return}function o(v,u,t){var x=[];for(;v&&v!=t;v=v[u]){x.push(v)}return x}function m(u,t){do{if(u.parentNode==t){return u}u=u.parentNode}while(u)}function j(v,u,x){var t=x?"nextSibling":"previousSibling";for(g=v,q=g.parentNode;g&&g!=u;g=q){q=g.parentNode;p=o(g==v?g:g[t],t);if(p.length){if(!x){p.reverse()}r(p)}}}if(h.nodeType==1&&h.hasChildNodes()){h=h.childNodes[k]}if(s.nodeType==1&&s.hasChildNodes()){s=s.childNodes[Math.min(k==l?l:l-1,s.childNodes.length-1)]}i=c.findCommonAncestor(h,s);if(h==s){return r([h])}for(g=h;g;g=g.parentNode){if(g==s){return j(h,i,true)}if(g==i){break}}for(g=s;g;g=g.parentNode){if(g==h){return j(s,i)}if(g==i){break}}f=m(h,i)||h;n=m(s,i)||s;j(h,f,true);p=o(f==h?f:f.nextSibling,"nextSibling",n==s?n.nextSibling:n);if(p.length){r(p)}j(s,n)}};a.dom.RangeUtils.compareRanges=function(c,b){if(c&&b){if(c.item||c.duplicate){if(c.item&&b.item&&c.item(0)===b.item(0)){return true}if(c.isEqual&&b.isEqual&&b.isEqual(c)){return true}}else{return c.startContainer==b.startContainer&&c.startOffset==b.startOffset}}return false}})(tinymce);(function(c){var b=c.DOM,a=c.is;c.create("tinymce.ui.Control",{Control:function(e,d){this.id=e;this.settings=d=d||{};this.rendered=false;this.onRender=new c.util.Dispatcher(this);this.classPrefix="";this.scope=d.scope||this;this.disabled=0;this.active=0},setDisabled:function(d){var f;if(d!=this.disabled){f=b.get(this.id);if(f&&this.settings.unavailable_prefix){if(d){this.prevTitle=f.title;f.title=this.settings.unavailable_prefix+": "+f.title}else{f.title=this.prevTitle}}this.setState("Disabled",d);this.setState("Enabled",!d);this.disabled=d}},isDisabled:function(){return this.disabled},setActive:function(d){if(d!=this.active){this.setState("Active",d);this.active=d}},isActive:function(){return this.active},setState:function(f,d){var e=b.get(this.id);f=this.classPrefix+f;if(d){b.addClass(e,f)}else{b.removeClass(e,f)}},isRendered:function(){return this.rendered},renderHTML:function(){},renderTo:function(d){b.setHTML(d,this.renderHTML())},postRender:function(){var e=this,d;if(a(e.disabled)){d=e.disabled;e.disabled=-1;e.setDisabled(d)}if(a(e.active)){d=e.active;e.active=-1;e.setActive(d)}},remove:function(){b.remove(this.id);this.destroy()},destroy:function(){c.dom.Event.clear(this.id)}})})(tinymce);tinymce.create("tinymce.ui.Container:tinymce.ui.Control",{Container:function(b,a){this.parent(b,a);this.controls=[];this.lookup={}},add:function(a){this.lookup[a.id]=a;this.controls.push(a);return a},get:function(a){return this.lookup[a]}});tinymce.create("tinymce.ui.Separator:tinymce.ui.Control",{Separator:function(b,a){this.parent(b,a);this.classPrefix="mceSeparator"},renderHTML:function(){return tinymce.DOM.createHTML("span",{"class":this.classPrefix})}});(function(d){var c=d.is,b=d.DOM,e=d.each,a=d.walk;d.create("tinymce.ui.MenuItem:tinymce.ui.Control",{MenuItem:function(g,f){this.parent(g,f);this.classPrefix="mceMenuItem"},setSelected:function(f){this.setState("Selected",f);this.selected=f},isSelected:function(){return this.selected},postRender:function(){var f=this;f.parent();if(c(f.selected)){f.setSelected(f.selected)}}})})(tinymce);(function(d){var c=d.is,b=d.DOM,e=d.each,a=d.walk;d.create("tinymce.ui.Menu:tinymce.ui.MenuItem",{Menu:function(h,g){var f=this;f.parent(h,g);f.items={};f.collapsed=false;f.menuCount=0;f.onAddItem=new d.util.Dispatcher(this)},expand:function(g){var f=this;if(g){a(f,function(h){if(h.expand){h.expand()}},"items",f)}f.collapsed=false},collapse:function(g){var f=this;if(g){a(f,function(h){if(h.collapse){h.collapse()}},"items",f)}f.collapsed=true},isCollapsed:function(){return this.collapsed},add:function(f){if(!f.settings){f=new d.ui.MenuItem(f.id||b.uniqueId(),f)}this.onAddItem.dispatch(this,f);return this.items[f.id]=f},addSeparator:function(){return this.add({separator:true})},addMenu:function(f){if(!f.collapse){f=this.createMenu(f)}this.menuCount++;return this.add(f)},hasMenus:function(){return this.menuCount!==0},remove:function(f){delete this.items[f.id]},removeAll:function(){var f=this;a(f,function(g){if(g.removeAll){g.removeAll()}else{g.remove()}g.destroy()},"items",f);f.items={}},createMenu:function(g){var f=new d.ui.Menu(g.id||b.uniqueId(),g);f.onAddItem.add(this.onAddItem.dispatch,this.onAddItem);return f}})})(tinymce);(function(e){var d=e.is,c=e.DOM,f=e.each,a=e.dom.Event,b=e.dom.Element;e.create("tinymce.ui.DropMenu:tinymce.ui.Menu",{DropMenu:function(h,g){g=g||{};g.container=g.container||c.doc.body;g.offset_x=g.offset_x||0;g.offset_y=g.offset_y||0;g.vp_offset_x=g.vp_offset_x||0;g.vp_offset_y=g.vp_offset_y||0;if(d(g.icons)&&!g.icons){g["class"]+=" mceNoIcons"}this.parent(h,g);this.onShowMenu=new e.util.Dispatcher(this);this.onHideMenu=new e.util.Dispatcher(this);this.classPrefix="mceMenu"},createMenu:function(j){var h=this,i=h.settings,g;j.container=j.container||i.container;j.parent=h;j.constrain=j.constrain||i.constrain;j["class"]=j["class"]||i["class"];j.vp_offset_x=j.vp_offset_x||i.vp_offset_x;j.vp_offset_y=j.vp_offset_y||i.vp_offset_y;g=new e.ui.DropMenu(j.id||c.uniqueId(),j);g.onAddItem.add(h.onAddItem.dispatch,h.onAddItem);return g},update:function(){var i=this,j=i.settings,g=c.get("menu_"+i.id+"_tbl"),l=c.get("menu_"+i.id+"_co"),h,k;h=j.max_width?Math.min(g.clientWidth,j.max_width):g.clientWidth;k=j.max_height?Math.min(g.clientHeight,j.max_height):g.clientHeight;if(!c.boxModel){i.element.setStyles({width:h+2,height:k+2})}else{i.element.setStyles({width:h,height:k})}if(j.max_width){c.setStyle(l,"width",h)}if(j.max_height){c.setStyle(l,"height",k);if(g.clientHeight<j.max_height){c.setStyle(l,"overflow","hidden")}}},showMenu:function(p,n,r){var z=this,A=z.settings,o,g=c.getViewPort(),u,l,v,q,i=2,k,j,m=z.classPrefix;z.collapse(1);if(z.isMenuVisible){return}if(!z.rendered){o=c.add(z.settings.container,z.renderNode());f(z.items,function(h){h.postRender()});z.element=new b("menu_"+z.id,{blocker:1,container:A.container})}else{o=c.get("menu_"+z.id)}if(!e.isOpera){c.setStyles(o,{left:-65535,top:-65535})}c.show(o);z.update();p+=A.offset_x||0;n+=A.offset_y||0;g.w-=4;g.h-=4;if(A.constrain){u=o.clientWidth-i;l=o.clientHeight-i;v=g.x+g.w;q=g.y+g.h;if((p+A.vp_offset_x+u)>v){p=r?r-u:Math.max(0,(v-A.vp_offset_x)-u)}if((n+A.vp_offset_y+l)>q){n=Math.max(0,(q-A.vp_offset_y)-l)}}c.setStyles(o,{left:p,top:n});z.element.update();z.isMenuVisible=1;z.mouseClickFunc=a.add(o,"click",function(s){var h;s=s.target;if(s&&(s=c.getParent(s,"tr"))&&!c.hasClass(s,m+"ItemSub")){h=z.items[s.id];if(h.isDisabled()){return}k=z;while(k){if(k.hideMenu){k.hideMenu()}k=k.settings.parent}if(h.settings.onclick){h.settings.onclick(s)}return a.cancel(s)}});if(z.hasMenus()){z.mouseOverFunc=a.add(o,"mouseover",function(x){var h,t,s;x=x.target;if(x&&(x=c.getParent(x,"tr"))){h=z.items[x.id];if(z.lastMenu){z.lastMenu.collapse(1)}if(h.isDisabled()){return}if(x&&c.hasClass(x,m+"ItemSub")){t=c.getRect(x);h.showMenu((t.x+t.w-i),t.y-i,t.x);z.lastMenu=h;c.addClass(c.get(h.id).firstChild,m+"ItemActive")}}})}z.onShowMenu.dispatch(z);if(A.keyboard_focus){a.add(o,"keydown",z._keyHandler,z);c.select("a","menu_"+z.id)[0].focus();z._focusIdx=0}},hideMenu:function(j){var g=this,i=c.get("menu_"+g.id),h;if(!g.isMenuVisible){return}a.remove(i,"mouseover",g.mouseOverFunc);a.remove(i,"click",g.mouseClickFunc);a.remove(i,"keydown",g._keyHandler);c.hide(i);g.isMenuVisible=0;if(!j){g.collapse(1)}if(g.element){g.element.hide()}if(h=c.get(g.id)){c.removeClass(h.firstChild,g.classPrefix+"ItemActive")}g.onHideMenu.dispatch(g)},add:function(i){var g=this,h;i=g.parent(i);if(g.isRendered&&(h=c.get("menu_"+g.id))){g._add(c.select("tbody",h)[0],i)}return i},collapse:function(g){this.parent(g);this.hideMenu(1)},remove:function(g){c.remove(g.id);this.destroy();return this.parent(g)},destroy:function(){var g=this,h=c.get("menu_"+g.id);a.remove(h,"mouseover",g.mouseOverFunc);a.remove(h,"click",g.mouseClickFunc);if(g.element){g.element.remove()}c.remove(h)},renderNode:function(){var i=this,j=i.settings,l,h,k,g;g=c.create("div",{id:"menu_"+i.id,"class":j["class"],style:"position:absolute;left:0;top:0;z-index:200000"});k=c.add(g,"div",{id:"menu_"+i.id+"_co","class":i.classPrefix+(j["class"]?" "+j["class"]:"")});i.element=new b("menu_"+i.id,{blocker:1,container:j.container});if(j.menu_line){c.add(k,"span",{"class":i.classPrefix+"Line"})}l=c.add(k,"table",{id:"menu_"+i.id+"_tbl",border:0,cellPadding:0,cellSpacing:0});h=c.add(l,"tbody");f(i.items,function(m){i._add(h,m)});i.rendered=true;return g},_keyHandler:function(j){var i=this,h=j.keyCode;function g(m){var k=i._focusIdx+m,l=c.select("a","menu_"+i.id)[k];if(l){i._focusIdx=k;l.focus()}}switch(h){case 38:g(-1);return;case 40:g(1);return;case 13:return;case 27:return this.hideMenu()}},_add:function(j,h){var i,q=h.settings,p,l,k,m=this.classPrefix,g;if(q.separator){l=c.add(j,"tr",{id:h.id,"class":m+"ItemSeparator"});c.add(l,"td",{"class":m+"ItemSeparator"});if(i=l.previousSibling){c.addClass(i,"mceLast")}return}i=l=c.add(j,"tr",{id:h.id,"class":m+"Item "+m+"ItemEnabled"});i=k=c.add(i,"td");i=p=c.add(i,"a",{href:"javascript:;",onclick:"return false;",onmousedown:"return false;"});c.addClass(k,q["class"]);g=c.add(i,"span",{"class":"mceIcon"+(q.icon?" mce_"+q.icon:"")});if(q.icon_src){c.add(g,"img",{src:q.icon_src})}i=c.add(i,q.element||"span",{"class":"mceText",title:h.settings.title},h.settings.title);if(h.settings.style){c.setAttrib(i,"style",h.settings.style)}if(j.childNodes.length==1){c.addClass(l,"mceFirst")}if((i=l.previousSibling)&&c.hasClass(i,m+"ItemSeparator")){c.addClass(l,"mceFirst")}if(h.collapse){c.addClass(l,m+"ItemSub")}if(i=l.previousSibling){c.removeClass(i,"mceLast")}c.addClass(l,"mceLast")}})})(tinymce);(function(b){var a=b.DOM;b.create("tinymce.ui.Button:tinymce.ui.Control",{Button:function(d,c){this.parent(d,c);this.classPrefix="mceButton"},renderHTML:function(){var f=this.classPrefix,e=this.settings,d,c;c=a.encode(e.label||"");d='<a id="'+this.id+'" href="javascript:;" class="'+f+" "+f+"Enabled "+e["class"]+(c?" "+f+"Labeled":"")+'" onmousedown="return false;" onclick="return false;" title="'+a.encode(e.title)+'">';if(e.image){d+='<img class="mceIcon" src="'+e.image+'" />'+c+"</a>"}else{d+='<span class="mceIcon '+e["class"]+'"></span>'+(c?'<span class="'+f+'Label">'+c+"</span>":"")+"</a>"}return d},postRender:function(){var c=this,d=c.settings;b.dom.Event.add(c.id,"click",function(f){if(!c.isDisabled()){return d.onclick.call(d.scope,f)}})}})})(tinymce);(function(d){var c=d.DOM,b=d.dom.Event,e=d.each,a=d.util.Dispatcher;d.create("tinymce.ui.ListBox:tinymce.ui.Control",{ListBox:function(h,g){var f=this;f.parent(h,g);f.items=[];f.onChange=new a(f);f.onPostRender=new a(f);f.onAdd=new a(f);f.onRenderMenu=new d.util.Dispatcher(this);f.classPrefix="mceListBox"},select:function(h){var g=this,j,i;if(h==undefined){return g.selectByIndex(-1)}if(h&&h.call){i=h}else{i=function(f){return f==h}}if(h!=g.selectedValue){e(g.items,function(k,f){if(i(k.value)){j=1;g.selectByIndex(f);return false}});if(!j){g.selectByIndex(-1)}}},selectByIndex:function(f){var g=this,h,i;if(f!=g.selectedIndex){h=c.get(g.id+"_text");i=g.items[f];if(i){g.selectedValue=i.value;g.selectedIndex=f;c.setHTML(h,c.encode(i.title));c.removeClass(h,"mceTitle")}else{c.setHTML(h,c.encode(g.settings.title));c.addClass(h,"mceTitle");g.selectedValue=g.selectedIndex=null}h=0}},add:function(i,f,h){var g=this;h=h||{};h=d.extend(h,{title:i,value:f});g.items.push(h);g.onAdd.dispatch(g,h)},getLength:function(){return this.items.length},renderHTML:function(){var i="",f=this,g=f.settings,j=f.classPrefix;i='<table id="'+f.id+'" cellpadding="0" cellspacing="0" class="'+j+" "+j+"Enabled"+(g["class"]?(" "+g["class"]):"")+'"><tbody><tr>';i+="<td>"+c.createHTML("a",{id:f.id+"_text",href:"javascript:;","class":"mceText",onclick:"return false;",onmousedown:"return false;"},c.encode(f.settings.title))+"</td>";i+="<td>"+c.createHTML("a",{id:f.id+"_open",tabindex:-1,href:"javascript:;","class":"mceOpen",onclick:"return false;",onmousedown:"return false;"},"<span></span>")+"</td>";i+="</tr></tbody></table>";return i},showMenu:function(){var g=this,j,i,h=c.get(this.id),f;if(g.isDisabled()||g.items.length==0){return}if(g.menu&&g.menu.isMenuVisible){return g.hideMenu()}if(!g.isMenuRendered){g.renderMenu();g.isMenuRendered=true}j=c.getPos(this.settings.menu_container);i=c.getPos(h);f=g.menu;f.settings.offset_x=i.x;f.settings.offset_y=i.y;f.settings.keyboard_focus=!d.isOpera;if(g.oldID){f.items[g.oldID].setSelected(0)}e(g.items,function(k){if(k.value===g.selectedValue){f.items[k.id].setSelected(1);g.oldID=k.id}});f.showMenu(0,h.clientHeight);b.add(c.doc,"mousedown",g.hideMenu,g);c.addClass(g.id,g.classPrefix+"Selected")},hideMenu:function(g){var f=this;if(f.menu&&f.menu.isMenuVisible){if(g&&g.type=="mousedown"&&(g.target.id==f.id+"_text"||g.target.id==f.id+"_open")){return}if(!g||!c.getParent(g.target,".mceMenu")){c.removeClass(f.id,f.classPrefix+"Selected");b.remove(c.doc,"mousedown",f.hideMenu,f);f.menu.hideMenu()}}},renderMenu:function(){var g=this,f;f=g.settings.control_manager.createDropMenu(g.id+"_menu",{menu_line:1,"class":g.classPrefix+"Menu mceNoIcons",max_width:150,max_height:150});f.onHideMenu.add(g.hideMenu,g);f.add({title:g.settings.title,"class":"mceMenuItemTitle",onclick:function(){if(g.settings.onselect("")!==false){g.select("")}}});e(g.items,function(h){if(h.value===undefined){f.add({title:h.title,"class":"mceMenuItemTitle",onclick:function(){if(g.settings.onselect("")!==false){g.select("")}}})}else{h.id=c.uniqueId();h.onclick=function(){if(g.settings.onselect(h.value)!==false){g.select(h.value)}};f.add(h)}});g.onRenderMenu.dispatch(g,f);g.menu=f},postRender:function(){var f=this,g=f.classPrefix;b.add(f.id,"click",f.showMenu,f);b.add(f.id+"_text","focus",function(){if(!f._focused){f.keyDownHandler=b.add(f.id+"_text","keydown",function(k){var h=-1,i,j=k.keyCode;e(f.items,function(l,m){if(f.selectedValue==l.value){h=m}});if(j==38){i=f.items[h-1]}else{if(j==40){i=f.items[h+1]}else{if(j==13){i=f.selectedValue;f.selectedValue=null;f.settings.onselect(i);return b.cancel(k)}}}if(i){f.hideMenu();f.select(i.value)}})}f._focused=1});b.add(f.id+"_text","blur",function(){b.remove(f.id+"_text","keydown",f.keyDownHandler);f._focused=0});if(d.isIE6||!c.boxModel){b.add(f.id,"mouseover",function(){if(!c.hasClass(f.id,g+"Disabled")){c.addClass(f.id,g+"Hover")}});b.add(f.id,"mouseout",function(){if(!c.hasClass(f.id,g+"Disabled")){c.removeClass(f.id,g+"Hover")}})}f.onPostRender.dispatch(f,c.get(f.id))},destroy:function(){this.parent();b.clear(this.id+"_text");b.clear(this.id+"_open")}})})(tinymce);(function(d){var c=d.DOM,b=d.dom.Event,e=d.each,a=d.util.Dispatcher;d.create("tinymce.ui.NativeListBox:tinymce.ui.ListBox",{NativeListBox:function(g,f){this.parent(g,f);this.classPrefix="mceNativeListBox"},setDisabled:function(f){c.get(this.id).disabled=f},isDisabled:function(){return c.get(this.id).disabled},select:function(h){var g=this,j,i;if(h==undefined){return g.selectByIndex(-1)}if(h&&h.call){i=h}else{i=function(f){return f==h}}if(h!=g.selectedValue){e(g.items,function(k,f){if(i(k.value)){j=1;g.selectByIndex(f);return false}});if(!j){g.selectByIndex(-1)}}},selectByIndex:function(f){c.get(this.id).selectedIndex=f+1;this.selectedValue=this.items[f]?this.items[f].value:null},add:function(j,g,f){var i,h=this;f=f||{};f.value=g;if(h.isRendered()){c.add(c.get(this.id),"option",f,j)}i={title:j,value:g,attribs:f};h.items.push(i);h.onAdd.dispatch(h,i)},getLength:function(){return this.items.length},renderHTML:function(){var g,f=this;g=c.createHTML("option",{value:""},"-- "+f.settings.title+" --");e(f.items,function(h){g+=c.createHTML("option",{value:h.value},h.title)});g=c.createHTML("select",{id:f.id,"class":"mceNativeListBox"},g);return g},postRender:function(){var g=this,h;g.rendered=true;function f(j){var i=g.items[j.target.selectedIndex-1];if(i&&(i=i.value)){g.onChange.dispatch(g,i);if(g.settings.onselect){g.settings.onselect(i)}}}b.add(g.id,"change",f);b.add(g.id,"keydown",function(j){var i;b.remove(g.id,"change",h);i=b.add(g.id,"blur",function(){b.add(g.id,"change",f);b.remove(g.id,"blur",i)});if(j.keyCode==13||j.keyCode==32){f(j);return b.cancel(j)}});g.onPostRender.dispatch(g,c.get(g.id))}})})(tinymce);(function(c){var b=c.DOM,a=c.dom.Event,d=c.each;c.create("tinymce.ui.MenuButton:tinymce.ui.Button",{MenuButton:function(f,e){this.parent(f,e);this.onRenderMenu=new c.util.Dispatcher(this);e.menu_container=e.menu_container||b.doc.body},showMenu:function(){var g=this,j,i,h=b.get(g.id),f;if(g.isDisabled()){return}if(!g.isMenuRendered){g.renderMenu();g.isMenuRendered=true}if(g.isMenuVisible){return g.hideMenu()}j=b.getPos(g.settings.menu_container);i=b.getPos(h);f=g.menu;f.settings.offset_x=i.x;f.settings.offset_y=i.y;f.settings.vp_offset_x=i.x;f.settings.vp_offset_y=i.y;f.settings.keyboard_focus=g._focused;f.showMenu(0,h.clientHeight);a.add(b.doc,"mousedown",g.hideMenu,g);g.setState("Selected",1);g.isMenuVisible=1},renderMenu:function(){var f=this,e;e=f.settings.control_manager.createDropMenu(f.id+"_menu",{menu_line:1,"class":this.classPrefix+"Menu",icons:f.settings.icons});e.onHideMenu.add(f.hideMenu,f);f.onRenderMenu.dispatch(f,e);f.menu=e},hideMenu:function(g){var f=this;if(g&&g.type=="mousedown"&&b.getParent(g.target,function(h){return h.id===f.id||h.id===f.id+"_open"})){return}if(!g||!b.getParent(g.target,".mceMenu")){f.setState("Selected",0);a.remove(b.doc,"mousedown",f.hideMenu,f);if(f.menu){f.menu.hideMenu()}}f.isMenuVisible=0},postRender:function(){var e=this,f=e.settings;a.add(e.id,"click",function(){if(!e.isDisabled()){if(f.onclick){f.onclick(e.value)}e.showMenu()}})}})})(tinymce);(function(c){var b=c.DOM,a=c.dom.Event,d=c.each;c.create("tinymce.ui.SplitButton:tinymce.ui.MenuButton",{SplitButton:function(f,e){this.parent(f,e);this.classPrefix="mceSplitButton"},renderHTML:function(){var i,f=this,g=f.settings,e;i="<tbody><tr>";if(g.image){e=b.createHTML("img ",{src:g.image,"class":"mceAction "+g["class"]})}else{e=b.createHTML("span",{"class":"mceAction "+g["class"]},"")}i+="<td>"+b.createHTML("a",{id:f.id+"_action",href:"javascript:;","class":"mceAction "+g["class"],onclick:"return false;",onmousedown:"return false;",title:g.title},e)+"</td>";e=b.createHTML("span",{"class":"mceOpen "+g["class"]});i+="<td>"+b.createHTML("a",{id:f.id+"_open",href:"javascript:;","class":"mceOpen "+g["class"],onclick:"return false;",onmousedown:"return false;",title:g.title},e)+"</td>";i+="</tr></tbody>";return b.createHTML("table",{id:f.id,"class":"mceSplitButton mceSplitButtonEnabled "+g["class"],cellpadding:"0",cellspacing:"0",onmousedown:"return false;",title:g.title},i)},postRender:function(){var e=this,f=e.settings;if(f.onclick){a.add(e.id+"_action","click",function(){if(!e.isDisabled()){f.onclick(e.value)}})}a.add(e.id+"_open","click",e.showMenu,e);a.add(e.id+"_open","focus",function(){e._focused=1});a.add(e.id+"_open","blur",function(){e._focused=0});if(c.isIE6||!b.boxModel){a.add(e.id,"mouseover",function(){if(!b.hasClass(e.id,"mceSplitButtonDisabled")){b.addClass(e.id,"mceSplitButtonHover")}});a.add(e.id,"mouseout",function(){if(!b.hasClass(e.id,"mceSplitButtonDisabled")){b.removeClass(e.id,"mceSplitButtonHover")}})}},destroy:function(){this.parent();a.clear(this.id+"_action");a.clear(this.id+"_open")}})})(tinymce);(function(d){var c=d.DOM,a=d.dom.Event,b=d.is,e=d.each;d.create("tinymce.ui.ColorSplitButton:tinymce.ui.SplitButton",{ColorSplitButton:function(h,g){var f=this;f.parent(h,g);f.settings=g=d.extend({colors:"000000,993300,333300,003300,003366,000080,333399,333333,800000,FF6600,808000,008000,008080,0000FF,666699,808080,FF0000,FF9900,99CC00,339966,33CCCC,3366FF,800080,999999,FF00FF,FFCC00,FFFF00,00FF00,00FFFF,00CCFF,993366,C0C0C0,FF99CC,FFCC99,FFFF99,CCFFCC,CCFFFF,99CCFF,CC99FF,FFFFFF",grid_width:8,default_color:"#888888"},f.settings);f.onShowMenu=new d.util.Dispatcher(f);f.onHideMenu=new d.util.Dispatcher(f);f.value=g.default_color},showMenu:function(){var f=this,g,j,i,h;if(f.isDisabled()){return}if(!f.isMenuRendered){f.renderMenu();f.isMenuRendered=true}if(f.isMenuVisible){return f.hideMenu()}i=c.get(f.id);c.show(f.id+"_menu");c.addClass(i,"mceSplitButtonSelected");h=c.getPos(i);c.setStyles(f.id+"_menu",{left:h.x,top:h.y+i.clientHeight,zIndex:200000});i=0;a.add(c.doc,"mousedown",f.hideMenu,f);f.onShowMenu.dispatch(f);if(f._focused){f._keyHandler=a.add(f.id+"_menu","keydown",function(k){if(k.keyCode==27){f.hideMenu()}});c.select("a",f.id+"_menu")[0].focus()}f.isMenuVisible=1},hideMenu:function(g){var f=this;if(g&&g.type=="mousedown"&&c.getParent(g.target,function(h){return h.id===f.id+"_open"})){return}if(!g||!c.getParent(g.target,".mceSplitButtonMenu")){c.removeClass(f.id,"mceSplitButtonSelected");a.remove(c.doc,"mousedown",f.hideMenu,f);a.remove(f.id+"_menu","keydown",f._keyHandler);c.hide(f.id+"_menu")}f.onHideMenu.dispatch(f);f.isMenuVisible=0},renderMenu:function(){var k=this,f,j=0,l=k.settings,p,h,o,g;g=c.add(l.menu_container,"div",{id:k.id+"_menu","class":l.menu_class+" "+l["class"],style:"position:absolute;left:0;top:-1000px;"});f=c.add(g,"div",{"class":l["class"]+" mceSplitButtonMenu"});c.add(f,"span",{"class":"mceMenuLine"});p=c.add(f,"table",{"class":"mceColorSplitMenu"});h=c.add(p,"tbody");j=0;e(b(l.colors,"array")?l.colors:l.colors.split(","),function(i){i=i.replace(/^#/,"");if(!j--){o=c.add(h,"tr");j=l.grid_width-1}p=c.add(o,"td");p=c.add(p,"a",{href:"javascript:;",style:{backgroundColor:"#"+i},_mce_color:"#"+i})});if(l.more_colors_func){p=c.add(h,"tr");p=c.add(p,"td",{colspan:l.grid_width,"class":"mceMoreColors"});p=c.add(p,"a",{id:k.id+"_more",href:"javascript:;",onclick:"return false;","class":"mceMoreColors"},l.more_colors_title);a.add(p,"click",function(i){l.more_colors_func.call(l.more_colors_scope||this);return a.cancel(i)})}c.addClass(f,"mceColorSplitMenu");a.add(k.id+"_menu","click",function(i){var m;i=i.target;if(i.nodeName=="A"&&(m=i.getAttribute("_mce_color"))){k.setColor(m)}return a.cancel(i)});return g},setColor:function(g){var f=this;c.setStyle(f.id+"_preview","backgroundColor",g);f.value=g;f.hideMenu();f.settings.onselect(g)},postRender:function(){var f=this,g=f.id;f.parent();c.add(g+"_action","div",{id:g+"_preview","class":"mceColorPreview"});c.setStyle(f.id+"_preview","backgroundColor",f.value)},destroy:function(){this.parent();a.clear(this.id+"_menu");a.clear(this.id+"_more");c.remove(this.id+"_menu")}})})(tinymce);tinymce.create("tinymce.ui.Toolbar:tinymce.ui.Container",{renderHTML:function(){var l=this,e="",g,j,b=tinymce.DOM,m=l.settings,d,a,f,k;k=l.controls;for(d=0;d<k.length;d++){j=k[d];a=k[d-1];f=k[d+1];if(d===0){g="mceToolbarStart";if(j.Button){g+=" mceToolbarStartButton"}else{if(j.SplitButton){g+=" mceToolbarStartSplitButton"}else{if(j.ListBox){g+=" mceToolbarStartListBox"}}}e+=b.createHTML("td",{"class":g},b.createHTML("span",null,"<!-- IE -->"))}if(a&&j.ListBox){if(a.Button||a.SplitButton){e+=b.createHTML("td",{"class":"mceToolbarEnd"},b.createHTML("span",null,"<!-- IE -->"))}}if(b.stdMode){e+='<td style="position: relative">'+j.renderHTML()+"</td>"}else{e+="<td>"+j.renderHTML()+"</td>"}if(f&&j.ListBox){if(f.Button||f.SplitButton){e+=b.createHTML("td",{"class":"mceToolbarStart"},b.createHTML("span",null,"<!-- IE -->"))}}}g="mceToolbarEnd";if(j.Button){g+=" mceToolbarEndButton"}else{if(j.SplitButton){g+=" mceToolbarEndSplitButton"}else{if(j.ListBox){g+=" mceToolbarEndListBox"}}}e+=b.createHTML("td",{"class":g},b.createHTML("span",null,"<!-- IE -->"));return b.createHTML("table",{id:l.id,"class":"mceToolbar"+(m["class"]?" "+m["class"]:""),cellpadding:"0",cellspacing:"0",align:l.settings.align||""},"<tbody><tr>"+e+"</tr></tbody>")}});(function(b){var a=b.util.Dispatcher,c=b.each;b.create("tinymce.AddOnManager",{items:[],urls:{},lookup:{},onAdd:new a(this),get:function(d){return this.lookup[d]},requireLangPack:function(e){var d=b.settings;if(d&&d.language){b.ScriptLoader.add(this.urls[e]+"/langs/"+d.language+".js")}},add:function(e,d){this.items.push(d);this.lookup[e]=d;this.onAdd.dispatch(this,e,d);return d},load:function(h,e,d,g){var f=this;if(f.urls[h]){return}if(e.indexOf("/")!=0&&e.indexOf("://")==-1){e=b.baseURL+"/"+e}f.urls[h]=e.substring(0,e.lastIndexOf("/"));b.ScriptLoader.add(e,d,g)}});b.PluginManager=new b.AddOnManager();b.ThemeManager=new b.AddOnManager()}(tinymce));(function(j){var g=j.each,d=j.extend,k=j.DOM,i=j.dom.Event,f=j.ThemeManager,b=j.PluginManager,e=j.explode,h=j.util.Dispatcher,a,c=0;j.documentBaseURL=window.location.href.replace(/[\?#].*$/,"").replace(/[\/\\][^\/]+$/,"");if(!/[\/\\]$/.test(j.documentBaseURL)){j.documentBaseURL+="/"}j.baseURL=new j.util.URI(j.documentBaseURL).toAbsolute(j.baseURL);j.baseURI=new j.util.URI(j.baseURL);j.onBeforeUnload=new h(j);i.add(window,"beforeunload",function(l){j.onBeforeUnload.dispatch(j,l)});j.onAddEditor=new h(j);j.onRemoveEditor=new h(j);j.EditorManager=d(j,{editors:[],i18n:{},activeEditor:null,init:function(q){var n=this,p,l=j.ScriptLoader,u,o=[],m;function r(x,y,t){var v=x[y];if(!v){return}if(j.is(v,"string")){t=v.replace(/\.\w+$/,"");t=t?j.resolve(t):0;v=j.resolve(v)}return v.apply(t||this,Array.prototype.slice.call(arguments,2))}q=d({theme:"simple",language:"en"},q);n.settings=q;i.add(document,"init",function(){var s,v;r(q,"onpageload");switch(q.mode){case"exact":s=q.elements||"";if(s.length>0){g(e(s),function(x){if(k.get(x)){m=new j.Editor(x,q);o.push(m);m.render(1)}else{g(document.forms,function(y){g(y.elements,function(z){if(z.name===x){x="mce_editor_"+c++;k.setAttrib(z,"id",x);m=new j.Editor(x,q);o.push(m);m.render(1)}})})}})}break;case"textareas":case"specific_textareas":function t(y,x){return x.constructor===RegExp?x.test(y.className):k.hasClass(y,x)}g(k.select("textarea"),function(x){if(q.editor_deselector&&t(x,q.editor_deselector)){return}if(!q.editor_selector||t(x,q.editor_selector)){u=k.get(x.name);if(!x.id&&!u){x.id=x.name}if(!x.id||n.get(x.id)){x.id=k.uniqueId()}m=new j.Editor(x.id,q);o.push(m);m.render(1)}});break}if(q.oninit){s=v=0;g(o,function(x){v++;if(!x.initialized){x.onInit.add(function(){s++;if(s==v){r(q,"oninit")}})}else{s++}if(s==v){r(q,"oninit")}})}})},get:function(l){if(l===a){return this.editors}return this.editors[l]},getInstanceById:function(l){return this.get(l)},add:function(m){var l=this,n=l.editors;n[m.id]=m;n.push(m);l._setActive(m);l.onAddEditor.dispatch(l,m);if(j.adapter){j.adapter.patchEditor(m)}return m},remove:function(n){var m=this,l,o=m.editors;if(!o[n.id]){return null}delete o[n.id];for(l=0;l<o.length;l++){if(o[l]==n){o.splice(l,1);break}}if(m.activeEditor==n){m._setActive(o[0])}n.destroy();m.onRemoveEditor.dispatch(m,n);return n},execCommand:function(r,p,o){var q=this,n=q.get(o),l;switch(r){case"mceFocus":n.focus();return true;case"mceAddEditor":case"mceAddControl":if(!q.get(o)){new j.Editor(o,q.settings).render()}return true;case"mceAddFrameControl":l=o.window;l.tinyMCE=tinyMCE;l.tinymce=j;j.DOM.doc=l.document;j.DOM.win=l;n=new j.Editor(o.element_id,o);n.render();if(j.isIE){function m(){n.destroy();l.detachEvent("onunload",m);l=l.tinyMCE=l.tinymce=null}l.attachEvent("onunload",m)}o.page_window=null;return true;case"mceRemoveEditor":case"mceRemoveControl":if(n){n.remove()}return true;case"mceToggleEditor":if(!n){q.execCommand("mceAddControl",0,o);return true}if(n.isHidden()){n.show()}else{n.hide()}return true}if(q.activeEditor){return q.activeEditor.execCommand(r,p,o)}return false},execInstanceCommand:function(p,o,n,m){var l=this.get(p);if(l){return l.execCommand(o,n,m)}return false},triggerSave:function(){g(this.editors,function(l){l.save()})},addI18n:function(n,q){var l,m=this.i18n;if(!j.is(n,"string")){g(n,function(r,p){g(r,function(t,s){g(t,function(v,u){if(s==="common"){m[p+"."+u]=v}else{m[p+"."+s+"."+u]=v}})})})}else{g(q,function(r,p){m[n+"."+p]=r})}},_setActive:function(l){this.selectedInstance=this.activeEditor=l}})})(tinymce);(function(m){var n=m.DOM,j=m.dom.Event,f=m.extend,k=m.util.Dispatcher,i=m.each,a=m.isGecko,b=m.isIE,e=m.isWebKit,d=m.is,h=m.ThemeManager,c=m.PluginManager,o=m.inArray,l=m.grep,g=m.explode;m.create("tinymce.Editor",{Editor:function(r,q){var p=this;p.id=p.editorId=r;p.execCommands={};p.queryStateCommands={};p.queryValueCommands={};p.isNotDirty=false;p.plugins={};i(["onPreInit","onBeforeRenderUI","onPostRender","onInit","onRemove","onActivate","onDeactivate","onClick","onEvent","onMouseUp","onMouseDown","onDblClick","onKeyDown","onKeyUp","onKeyPress","onContextMenu","onSubmit","onReset","onPaste","onPreProcess","onPostProcess","onBeforeSetContent","onBeforeGetContent","onSetContent","onGetContent","onLoadContent","onSaveContent","onNodeChange","onChange","onBeforeExecCommand","onExecCommand","onUndo","onRedo","onVisualAid","onSetProgressState"],function(s){p[s]=new k(p)});p.settings=q=f({id:r,language:"en",docs_language:"en",theme:"simple",skin:"default",delta_width:0,delta_height:0,popup_css:"",plugins:"",document_base_url:m.documentBaseURL,add_form_submit_trigger:1,submit_patch:1,add_unload_trigger:1,convert_urls:1,relative_urls:1,remove_script_host:1,table_inline_editing:0,object_resizing:1,cleanup:1,accessibility_focus:1,custom_shortcuts:1,custom_undo_redo_keyboard_shortcuts:1,custom_undo_redo_restore_selection:1,custom_undo_redo:1,doctype:m.isIE6?'<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">':"<!DOCTYPE>",visual_table_class:"mceItemTable",visual:1,font_size_style_values:"xx-small,x-small,small,medium,large,x-large,xx-large",apply_source_formatting:1,directionality:"ltr",forced_root_block:"p",valid_elements:"@[id|class|style|title|dir<ltr?rtl|lang|xml::lang|onclick|ondblclick|onmousedown|onmouseup|onmouseover|onmousemove|onmouseout|onkeypress|onkeydown|onkeyup],a[rel|rev|charset|hreflang|tabindex|accesskey|type|name|href|target|title|class|onfocus|onblur],strong/b,em/i,strike,u,#p,-ol[type|compact],-ul[type|compact],-li,br,img[longdesc|usemap|src|border|alt=|title|hspace|vspace|width|height|align],-sub,-sup,-blockquote[cite],-table[border|cellspacing|cellpadding|width|frame|rules|height|align|summary|bgcolor|background|bordercolor],-tr[rowspan|width|height|align|valign|bgcolor|background|bordercolor],tbody,thead,tfoot,#td[colspan|rowspan|width|height|align|valign|bgcolor|background|bordercolor|scope],#th[colspan|rowspan|width|height|align|valign|scope],caption,-div,-span,-code,-pre,address,-h1,-h2,-h3,-h4,-h5,-h6,hr[size|noshade],-font[face|size|color],dd,dl,dt,cite,abbr,acronym,del[datetime|cite],ins[datetime|cite],object[classid|width|height|codebase|*],param[name|value],embed[type|width|height|src|*],script[src|type],map[name],area[shape|coords|href|alt|target],bdo,button,col[align|char|charoff|span|valign|width],colgroup[align|char|charoff|span|valign|width],dfn,fieldset,form[action|accept|accept-charset|enctype|method],input[accept|alt|checked|disabled|maxlength|name|readonly|size|src|type|value|tabindex|accesskey],kbd,label[for],legend,noscript,optgroup[label|disabled],option[disabled|label|selected|value],q[cite],samp,select[disabled|multiple|name|size],small,textarea[cols|rows|disabled|name|readonly],tt,var,big",hidden_input:1,padd_empty_editor:1,render_ui:1,init_theme:1,force_p_newlines:1,indentation:"30px",keep_styles:1,fix_table_elements:1,inline_styles:1,convert_fonts_to_spans:true},q);p.documentBaseURI=new m.util.URI(q.document_base_url||m.documentBaseURL,{base_uri:tinyMCE.baseURI});p.baseURI=m.baseURI;p.execCallback("setup",p)},render:function(r){var u=this,v=u.settings,x=u.id,p=m.ScriptLoader;if(!j.domLoaded){j.add(document,"init",function(){u.render()});return}tinyMCE.settings=v;if(!u.getElement()){return}if(m.isIDevice){return}if(!/TEXTAREA|INPUT/i.test(u.getElement().nodeName)&&v.hidden_input&&n.getParent(x,"form")){n.insertAfter(n.create("input",{type:"hidden",name:x}),x)}if(m.WindowManager){u.windowManager=new m.WindowManager(u)}if(v.encoding=="xml"){u.onGetContent.add(function(s,t){if(t.save){t.content=n.encode(t.content)}})}if(v.add_form_submit_trigger){u.onSubmit.addToTop(function(){if(u.initialized){u.save();u.isNotDirty=1}})}if(v.add_unload_trigger){u._beforeUnload=tinyMCE.onBeforeUnload.add(function(){if(u.initialized&&!u.destroyed&&!u.isHidden()){u.save({format:"raw",no_events:true})}})}m.addUnload(u.destroy,u);if(v.submit_patch){u.onBeforeRenderUI.add(function(){var s=u.getElement().form;if(!s){return}if(s._mceOldSubmit){return}if(!s.submit.nodeType&&!s.submit.length){u.formElement=s;s._mceOldSubmit=s.submit;s.submit=function(){m.triggerSave();u.isNotDirty=1;return u.formElement._mceOldSubmit(u.formElement)}}s=null})}function q(){if(v.language){p.add(m.baseURL+"/langs/"+v.language+".js")}if(v.theme&&v.theme.charAt(0)!="-"&&!h.urls[v.theme]){h.load(v.theme,"themes/"+v.theme+"/editor_template"+m.suffix+".js")}i(g(v.plugins),function(s){if(s&&s.charAt(0)!="-"&&!c.urls[s]){if(s=="safari"){return}c.load(s,"plugins/"+s+"/editor_plugin"+m.suffix+".js")}});p.loadQueue(function(){if(!u.removed){u.init()}})}q()},init:function(){var r,E=this,F=E.settings,B,y,A=E.getElement(),q,p,C,x,z,D;m.add(E);if(F.theme){F.theme=F.theme.replace(/-/,"");q=h.get(F.theme);E.theme=new q();if(E.theme.init&&F.init_theme){E.theme.init(E,h.urls[F.theme]||m.documentBaseURL.replace(/\/$/,""))}}i(g(F.plugins.replace(/\-/g,"")),function(G){var H=c.get(G),t=c.urls[G]||m.documentBaseURL.replace(/\/$/,""),s;if(H){s=new H(E,t);E.plugins[G]=s;if(s.init){s.init(E,t)}}});if(F.popup_css!==false){if(F.popup_css){F.popup_css=E.documentBaseURI.toAbsolute(F.popup_css)}else{F.popup_css=E.baseURI.toAbsolute("themes/"+F.theme+"/skins/"+F.skin+"/dialog.css")}}if(F.popup_css_add){F.popup_css+=","+E.documentBaseURI.toAbsolute(F.popup_css_add)}E.controlManager=new m.ControlManager(E);if(F.custom_undo_redo){E.onBeforeExecCommand.add(function(t,G,u,H,s){if(G!="Undo"&&G!="Redo"&&G!="mceRepaint"&&(!s||!s.skip_undo)){if(!E.undoManager.hasUndo()){E.undoManager.add()}}});E.onExecCommand.add(function(t,G,u,H,s){if(G!="Undo"&&G!="Redo"&&G!="mceRepaint"&&(!s||!s.skip_undo)){E.undoManager.add()}})}E.onExecCommand.add(function(s,t){if(!/^(FontName|FontSize)$/.test(t)){E.nodeChanged()}});if(a){function v(s,t){if(!t||!t.initial){E.execCommand("mceRepaint")}}E.onUndo.add(v);E.onRedo.add(v);E.onSetContent.add(v)}E.onBeforeRenderUI.dispatch(E,E.controlManager);if(F.render_ui){B=F.width||A.style.width||A.offsetWidth;y=F.height||A.style.height||A.offsetHeight;E.orgDisplay=A.style.display;D=/^[0-9\.]+(|px)$/i;if(D.test(""+B)){B=Math.max(parseInt(B)+(q.deltaWidth||0),100)}if(D.test(""+y)){y=Math.max(parseInt(y)+(q.deltaHeight||0),100)}q=E.theme.renderUI({targetNode:A,width:B,height:y,deltaWidth:F.delta_width,deltaHeight:F.delta_height});E.editorContainer=q.editorContainer}if(document.domain&&location.hostname!=document.domain){m.relaxedDomain=document.domain}n.setStyles(q.sizeContainer||q.editorContainer,{width:B,height:y});y=(q.iframeHeight||y)+(typeof(y)=="number"?(q.deltaHeight||0):"");if(y<100){y=100}E.iframeHTML=F.doctype+'<html><head xmlns="http://www.w3.org/1999/xhtml">';if(F.document_base_url!=m.documentBaseURL){E.iframeHTML+='<base href="'+E.documentBaseURI.getURI()+'" />'}E.iframeHTML+='<meta http-equiv="X-UA-Compatible" content="IE=7" /><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />';if(m.relaxedDomain){E.iframeHTML+='<script type="text/javascript">document.domain = "'+m.relaxedDomain+'";<\/script>'}x=F.body_id||"tinymce";if(x.indexOf("=")!=-1){x=E.getParam("body_id","","hash");x=x[E.id]||x}z=F.body_class||"";if(z.indexOf("=")!=-1){z=E.getParam("body_class","","hash");z=z[E.id]||""}E.iframeHTML+='</head><body id="'+x+'" class="mceContentBody '+z+'"></body></html>';if(m.relaxedDomain){if(b||(m.isOpera&&parseFloat(opera.version())>=9.5)){C='javascript:(function(){document.open();document.domain="'+document.domain+'";var ed = window.parent.tinyMCE.get("'+E.id+'");document.write(ed.iframeHTML);document.close();ed.setupIframe();})()'}else{if(m.isOpera){C='javascript:(function(){document.open();document.domain="'+document.domain+'";document.close();ed.setupIframe();})()'}}}r=n.add(q.iframeContainer,"iframe",{id:E.id+"_ifr",src:C||'javascript:""',frameBorder:"0",style:{width:"100%",height:y}});E.contentAreaContainer=q.iframeContainer;n.get(q.editorContainer).style.display=E.orgDisplay;n.get(E.id).style.display="none";if(!b||!m.relaxedDomain){E.setupIframe()}A=r=q=null},setupIframe:function(){var z=this,A=z.settings,r=n.get(z.id),u=z.getDoc(),q,x;if(!b||!m.relaxedDomain){u.open();u.write(z.iframeHTML);u.close()}if(!b){try{if(!A.readonly){u.designMode="On"}}catch(v){}}if(b){x=z.getBody();n.hide(x);if(!A.readonly){x.contentEditable=true}n.show(x)}z.dom=new m.dom.DOMUtils(z.getDoc(),{keep_values:true,url_converter:z.convertURL,url_converter_scope:z,hex_colors:A.force_hex_style_colors,class_filter:A.class_filter,update_styles:1,fix_ie_paragraphs:1,valid_styles:A.valid_styles});z.schema=new m.dom.Schema();z.serializer=new m.dom.Serializer(f(A,{valid_elements:A.verify_html===false?"*[*]":A.valid_elements,dom:z.dom,schema:z.schema}));z.selection=new m.dom.Selection(z.dom,z.getWin(),z.serializer);z.formatter=new m.Formatter(this);z.formatter.register({alignleft:[{selector:"p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li",styles:{textAlign:"left"}},{selector:"img,table",styles:{"float":"left"}}],aligncenter:[{selector:"p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li",styles:{textAlign:"center"}},{selector:"img",styles:{display:"block",marginLeft:"auto",marginRight:"auto"}},{selector:"table",styles:{marginLeft:"auto",marginRight:"auto"}}],alignright:[{selector:"p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li",styles:{textAlign:"right"}},{selector:"img,table",styles:{"float":"right"}}],alignfull:[{selector:"p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li",styles:{textAlign:"justify"}}],bold:[{inline:"strong"},{inline:"span",styles:{fontWeight:"bold"}},{inline:"b"}],italic:[{inline:"em"},{inline:"span",styles:{fontStyle:"italic"}},{inline:"i"}],underline:[{inline:"span",styles:{textDecoration:"underline"},exact:true},{inline:"u"}],strikethrough:[{inline:"span",styles:{textDecoration:"line-through"},exact:true},{inline:"u"}],forecolor:{inline:"span",styles:{color:"%value"}},hilitecolor:{inline:"span",styles:{backgroundColor:"%value"}},fontname:{inline:"span",styles:{fontFamily:"%value"}},fontsize:{inline:"span",styles:{fontSize:"%value"}},fontsize_class:{inline:"span",attributes:{"class":"%value"}},blockquote:{block:"blockquote",wrapper:1,remove:"all"},removeformat:[{selector:"b,strong,em,i,font,u,strike",remove:"all",split:true,expand:false,block_expand:true,deep:true},{selector:"span",attributes:["style","class"],remove:"empty",split:true,expand:false,deep:true},{selector:"*",attributes:["style","class"],split:false,expand:false,deep:true}]});i("p h1 h2 h3 h4 h5 h6 div address pre div code dt dd samp".split(/\s/),function(s){z.formatter.register(s,{block:s,remove:"all"})});z.formatter.register(z.settings.formats);z.undoManager=new m.UndoManager(z);z.undoManager.onAdd.add(function(t,s){if(!s.initial){return z.onChange.dispatch(z,s,t)}});z.undoManager.onUndo.add(function(t,s){return z.onUndo.dispatch(z,s,t)});z.undoManager.onRedo.add(function(t,s){return z.onRedo.dispatch(z,s,t)});z.forceBlocks=new m.ForceBlocks(z,{forced_root_block:A.forced_root_block});z.editorCommands=new m.EditorCommands(z);z.serializer.onPreProcess.add(function(s,t){return z.onPreProcess.dispatch(z,t,s)});z.serializer.onPostProcess.add(function(s,t){return z.onPostProcess.dispatch(z,t,s)});z.onPreInit.dispatch(z);if(!A.gecko_spellcheck){z.getBody().spellcheck=0}if(!A.readonly){z._addEvents()}z.controlManager.onPostRender.dispatch(z,z.controlManager);z.onPostRender.dispatch(z);if(A.directionality){z.getBody().dir=A.directionality}if(A.nowrap){z.getBody().style.whiteSpace="nowrap"}if(A.custom_elements){function y(s,t){i(g(A.custom_elements),function(B){var C;if(B.indexOf("~")===0){B=B.substring(1);C="span"}else{C="div"}t.content=t.content.replace(new RegExp("<("+B+")([^>]*)>","g"),"<"+C+' _mce_name="$1"$2>');t.content=t.content.replace(new RegExp("</("+B+")>","g"),"</"+C+">")})}z.onBeforeSetContent.add(y);z.onPostProcess.add(function(s,t){if(t.set){y(s,t)}})}if(A.handle_node_change_callback){z.onNodeChange.add(function(t,s,B){z.execCallback("handle_node_change_callback",z.id,B,-1,-1,true,z.selection.isCollapsed())})}if(A.save_callback){z.onSaveContent.add(function(s,B){var t=z.execCallback("save_callback",z.id,B.content,z.getBody());if(t){B.content=t}})}if(A.onchange_callback){z.onChange.add(function(t,s){z.execCallback("onchange_callback",z,s)})}if(A.convert_newlines_to_brs){z.onBeforeSetContent.add(function(s,t){if(t.initial){t.content=t.content.replace(/\r?\n/g,"<br />")}})}if(A.fix_nesting&&b){z.onBeforeSetContent.add(function(s,t){t.content=z._fixNesting(t.content)})}if(A.preformatted){z.onPostProcess.add(function(s,t){t.content=t.content.replace(/^\s*<pre.*?>/,"");t.content=t.content.replace(/<\/pre>\s*$/,"");if(t.set){t.content='<pre class="mceItemHidden">'+t.content+"</pre>"}})}if(A.verify_css_classes){z.serializer.attribValueFilter=function(D,B){var C,t;if(D=="class"){if(!z.classesRE){t=z.dom.getClasses();if(t.length>0){C="";i(t,function(s){C+=(C?"|":"")+s["class"]});z.classesRE=new RegExp("("+C+")","gi")}}return !z.classesRE||/(\bmceItem\w+\b|\bmceTemp\w+\b)/g.test(B)||z.classesRE.test(B)?B:""}return B}}if(A.cleanup_callback){z.onBeforeSetContent.add(function(s,t){t.content=z.execCallback("cleanup_callback","insert_to_editor",t.content,t)});z.onPreProcess.add(function(s,t){if(t.set){z.execCallback("cleanup_callback","insert_to_editor_dom",t.node,t)}if(t.get){z.execCallback("cleanup_callback","get_from_editor_dom",t.node,t)}});z.onPostProcess.add(function(s,t){if(t.set){t.content=z.execCallback("cleanup_callback","insert_to_editor",t.content,t)}if(t.get){t.content=z.execCallback("cleanup_callback","get_from_editor",t.content,t)}})}if(A.save_callback){z.onGetContent.add(function(s,t){if(t.save){t.content=z.execCallback("save_callback",z.id,t.content,z.getBody())}})}if(A.handle_event_callback){z.onEvent.add(function(s,t,B){if(z.execCallback("handle_event_callback",t,s,B)===false){j.cancel(t)}})}z.onSetContent.add(function(){z.addVisual(z.getBody())});if(A.padd_empty_editor){z.onPostProcess.add(function(s,t){t.content=t.content.replace(/^(<p[^>]*>(&nbsp;|&#160;|\s|\u00a0|)<\/p>[\r\n]*|<br \/>[\r\n]*)$/,"")})}if(a){function p(s,t){i(s.dom.select("a"),function(C){var B=C.parentNode;if(s.dom.isBlock(B)&&B.lastChild===C){s.dom.add(B,"br",{_mce_bogus:1})}})}z.onExecCommand.add(function(s,t){if(t==="CreateLink"){p(s)}});z.onSetContent.add(z.selection.onSetContent.add(p));if(!A.readonly){try{u.designMode="Off";u.designMode="On"}catch(v){}}}setTimeout(function(){if(z.removed){return}z.load({initial:true,format:(A.cleanup_on_startup?"html":"raw")});z.startContent=z.getContent({format:"raw"});z.initialized=true;z.onInit.dispatch(z);z.execCallback("setupcontent_callback",z.id,z.getBody(),z.getDoc());z.execCallback("init_instance_callback",z);z.focus(true);z.nodeChanged({initial:1});if(A.content_css){m.each(g(A.content_css),function(s){z.dom.loadCSS(z.documentBaseURI.toAbsolute(s))})}if(A.auto_focus){setTimeout(function(){var s=m.get(A.auto_focus);s.selection.select(s.getBody(),1);s.selection.collapse(1);s.getWin().focus()},100)}},1);r=null},focus:function(s){var x,q=this,v=q.settings.content_editable,r,p,u=q.getDoc();if(!s){r=q.selection.getRng();if(r.item){p=r.item(0)}if(!v){q.getWin().focus()}if(p&&p.ownerDocument==u){r=u.body.createControlRange();r.addElement(p);r.select()}}if(m.activeEditor!=q){if((x=m.activeEditor)!=null){x.onDeactivate.dispatch(x,q)}q.onActivate.dispatch(q,x)}m._setActive(q)},execCallback:function(u){var p=this,r=p.settings[u],q;if(!r){return}if(p.callbackLookup&&(q=p.callbackLookup[u])){r=q.func;q=q.scope}if(d(r,"string")){q=r.replace(/\.\w+$/,"");q=q?m.resolve(q):0;r=m.resolve(r);p.callbackLookup=p.callbackLookup||{};p.callbackLookup[u]={func:r,scope:q}}return r.apply(q||p,Array.prototype.slice.call(arguments,1))},translate:function(p){var r=this.settings.language||"en",q=m.i18n;if(!p){return""}return q[r+"."+p]||p.replace(/{\#([^}]+)\}/g,function(t,s){return q[r+"."+s]||"{#"+s+"}"})},getLang:function(q,p){return m.i18n[(this.settings.language||"en")+"."+q]||(d(p)?p:"{#"+q+"}")},getParam:function(u,r,p){var s=m.trim,q=d(this.settings[u])?this.settings[u]:r,t;if(p==="hash"){t={};if(d(q,"string")){i(q.indexOf("=")>0?q.split(/[;,](?![^=;,]*(?:[;,]|$))/):q.split(","),function(x){x=x.split("=");if(x.length>1){t[s(x[0])]=s(x[1])}else{t[s(x[0])]=s(x)}})}else{t=q}return t}return q},nodeChanged:function(r){var p=this,q=p.selection,u=(b?q.getNode():q.getStart())||p.getBody();if(p.initialized){r=r||{};u=b&&u.ownerDocument!=p.getDoc()?p.getBody():u;r.parents=[];p.dom.getParent(u,function(s){if(s.nodeName=="BODY"){return true}r.parents.push(s)});p.onNodeChange.dispatch(p,r?r.controlManager||p.controlManager:p.controlManager,u,q.isCollapsed(),r)}},addButton:function(r,q){var p=this;p.buttons=p.buttons||{};p.buttons[r]=q},addCommand:function(r,q,p){this.execCommands[r]={func:q,scope:p||this}},addQueryStateHandler:function(r,q,p){this.queryStateCommands[r]={func:q,scope:p||this}},addQueryValueHandler:function(r,q,p){this.queryValueCommands[r]={func:q,scope:p||this}},addShortcut:function(r,u,p,s){var q=this,v;if(!q.settings.custom_shortcuts){return false}q.shortcuts=q.shortcuts||{};if(d(p,"string")){v=p;p=function(){q.execCommand(v,false,null)}}if(d(p,"object")){v=p;p=function(){q.execCommand(v[0],v[1],v[2])}}i(g(r),function(t){var x={func:p,scope:s||this,desc:u,alt:false,ctrl:false,shift:false};i(g(t,"+"),function(y){switch(y){case"alt":case"ctrl":case"shift":x[y]=true;break;default:x.charCode=y.charCodeAt(0);x.keyCode=y.toUpperCase().charCodeAt(0)}});q.shortcuts[(x.ctrl?"ctrl":"")+","+(x.alt?"alt":"")+","+(x.shift?"shift":"")+","+x.keyCode]=x});return true},execCommand:function(x,v,z,p){var r=this,u=0,y,q;if(!/^(mceAddUndoLevel|mceEndUndoLevel|mceBeginUndoLevel|mceRepaint|SelectAll)$/.test(x)&&(!p||!p.skip_focus)){r.focus()}y={};r.onBeforeExecCommand.dispatch(r,x,v,z,y);if(y.terminate){return false}if(r.execCallback("execcommand_callback",r.id,r.selection.getNode(),x,v,z)){r.onExecCommand.dispatch(r,x,v,z,p);return true}if(y=r.execCommands[x]){q=y.func.call(y.scope,v,z);if(q!==true){r.onExecCommand.dispatch(r,x,v,z,p);return q}}i(r.plugins,function(s){if(s.execCommand&&s.execCommand(x,v,z)){r.onExecCommand.dispatch(r,x,v,z,p);u=1;return false}});if(u){return true}if(r.theme&&r.theme.execCommand&&r.theme.execCommand(x,v,z)){r.onExecCommand.dispatch(r,x,v,z,p);return true}if(m.GlobalCommands.execCommand(r,x,v,z)){r.onExecCommand.dispatch(r,x,v,z,p);return true}if(r.editorCommands.execCommand(x,v,z)){r.onExecCommand.dispatch(r,x,v,z,p);return true}r.getDoc().execCommand(x,v,z);r.onExecCommand.dispatch(r,x,v,z,p)},queryCommandState:function(u){var q=this,v,r;if(q._isHidden()){return}if(v=q.queryStateCommands[u]){r=v.func.call(v.scope);if(r!==true){return r}}v=q.editorCommands.queryCommandState(u);if(v!==-1){return v}try{return this.getDoc().queryCommandState(u)}catch(p){}},queryCommandValue:function(v){var q=this,u,r;if(q._isHidden()){return}if(u=q.queryValueCommands[v]){r=u.func.call(u.scope);if(r!==true){return r}}u=q.editorCommands.queryCommandValue(v);if(d(u)){return u}try{return this.getDoc().queryCommandValue(v)}catch(p){}},show:function(){var p=this;n.show(p.getContainer());n.hide(p.id);p.load()},hide:function(){var p=this,q=p.getDoc();if(b&&q){q.execCommand("SelectAll")}p.save();n.hide(p.getContainer());n.setStyle(p.id,"display",p.orgDisplay)},isHidden:function(){return !n.isHidden(this.id)},setProgressState:function(p,q,r){this.onSetProgressState.dispatch(this,p,q,r);return p},load:function(s){var p=this,r=p.getElement(),q;if(r){s=s||{};s.load=true;q=p.setContent(d(r.value)?r.value:r.innerHTML,s);s.element=r;if(!s.no_events){p.onLoadContent.dispatch(p,s)}s.element=r=null;return q}},save:function(u){var p=this,s=p.getElement(),q,r;if(!s||!p.initialized){return}u=u||{};u.save=true;if(!u.no_events){p.undoManager.typing=0;p.undoManager.add()}u.element=s;q=u.content=p.getContent(u);if(!u.no_events){p.onSaveContent.dispatch(p,u)}q=u.content;if(!/TEXTAREA|INPUT/i.test(s.nodeName)){s.innerHTML=q;if(r=n.getParent(p.id,"form")){i(r.elements,function(t){if(t.name==p.id){t.value=q;return false}})}}else{s.value=q}u.element=s=null;return q},setContent:function(q,r){var p=this;r=r||{};r.format=r.format||"html";r.set=true;r.content=q;if(!r.no_events){p.onBeforeSetContent.dispatch(p,r)}if(!m.isIE&&(q.length===0||/^\s+$/.test(q))){r.content=p.dom.setHTML(p.getBody(),'<br _mce_bogus="1" />');r.format="raw"}r.content=p.dom.setHTML(p.getBody(),m.trim(r.content));if(r.format!="raw"&&p.settings.cleanup){r.getInner=true;r.content=p.dom.setHTML(p.getBody(),p.serializer.serialize(p.getBody(),r))}if(!r.no_events){p.onSetContent.dispatch(p,r)}return r.content},getContent:function(r){var p=this,q;r=r||{};r.format=r.format||"html";r.get=true;if(!r.no_events){p.onBeforeGetContent.dispatch(p,r)}if(r.format!="raw"&&p.settings.cleanup){r.getInner=true;q=p.serializer.serialize(p.getBody(),r)}else{q=p.getBody().innerHTML}q=q.replace(/^\s*|\s*$/g,"");r.content=q;if(!r.no_events){p.onGetContent.dispatch(p,r)}return r.content},isDirty:function(){var p=this;return m.trim(p.startContent)!=m.trim(p.getContent({format:"raw",no_events:1}))&&!p.isNotDirty},getContainer:function(){var p=this;if(!p.container){p.container=n.get(p.editorContainer||p.id+"_parent")}return p.container},getContentAreaContainer:function(){return this.contentAreaContainer},getElement:function(){return n.get(this.settings.content_element||this.id)},getWin:function(){var p=this,q;if(!p.contentWindow){q=n.get(p.id+"_ifr");if(q){p.contentWindow=q.contentWindow}}return p.contentWindow},getDoc:function(){var q=this,p;if(!q.contentDocument){p=q.getWin();if(p){q.contentDocument=p.document}}return q.contentDocument},getBody:function(){return this.bodyElement||this.getDoc().body},convertURL:function(p,x,v){var q=this,r=q.settings;if(r.urlconverter_callback){return q.execCallback("urlconverter_callback",p,v,true,x)}if(!r.convert_urls||(v&&v.nodeName=="LINK")||p.indexOf("file:")===0){return p}if(r.relative_urls){return q.documentBaseURI.toRelative(p)}p=q.documentBaseURI.toAbsolute(p,r.remove_script_host);return p},addVisual:function(r){var p=this,q=p.settings;r=r||p.getBody();if(!d(p.hasVisual)){p.hasVisual=q.visual}i(p.dom.select("table,a",r),function(t){var s;switch(t.nodeName){case"TABLE":s=p.dom.getAttrib(t,"border");if(!s||s=="0"){if(p.hasVisual){p.dom.addClass(t,q.visual_table_class)}else{p.dom.removeClass(t,q.visual_table_class)}}return;case"A":s=p.dom.getAttrib(t,"name");if(s){if(p.hasVisual){p.dom.addClass(t,"mceItemAnchor")}else{p.dom.removeClass(t,"mceItemAnchor")}}return}});p.onVisualAid.dispatch(p,r,p.hasVisual)},remove:function(){var p=this,q=p.getContainer();p.removed=1;p.hide();p.execCallback("remove_instance_callback",p);p.onRemove.dispatch(p);p.onExecCommand.listeners=[];m.remove(p);n.remove(q)},destroy:function(q){var p=this;if(p.destroyed){return}if(!q){m.removeUnload(p.destroy);tinyMCE.onBeforeUnload.remove(p._beforeUnload);if(p.theme&&p.theme.destroy){p.theme.destroy()}p.controlManager.destroy();p.selection.destroy();p.dom.destroy();if(!p.settings.content_editable){j.clear(p.getWin());j.clear(p.getDoc())}j.clear(p.getBody());j.clear(p.formElement)}if(p.formElement){p.formElement.submit=p.formElement._mceOldSubmit;p.formElement._mceOldSubmit=null}p.contentAreaContainer=p.formElement=p.container=p.settings.content_element=p.bodyElement=p.contentDocument=p.contentWindow=null;if(p.selection){p.selection=p.selection.win=p.selection.dom=p.selection.dom.doc=null}p.destroyed=1},_addEvents:function(){var v=this,u,y=v.settings,x={mouseup:"onMouseUp",mousedown:"onMouseDown",click:"onClick",keyup:"onKeyUp",keydown:"onKeyDown",keypress:"onKeyPress",submit:"onSubmit",reset:"onReset",contextmenu:"onContextMenu",dblclick:"onDblClick",paste:"onPaste"};function r(t,A){var s=t.type;if(v.removed){return}if(v.onEvent.dispatch(v,t,A)!==false){v[x[t.fakeType||t.type]].dispatch(v,t,A)}}i(x,function(t,s){switch(s){case"contextmenu":if(m.isOpera){v.dom.bind(v.getBody(),"mousedown",function(A){if(A.ctrlKey){A.fakeType="contextmenu";r(A)}})}else{v.dom.bind(v.getBody(),s,r)}break;case"paste":v.dom.bind(v.getBody(),s,function(A){r(A)});break;case"submit":case"reset":v.dom.bind(v.getElement().form||n.getParent(v.id,"form"),s,r);break;default:v.dom.bind(y.content_editable?v.getBody():v.getDoc(),s,r)}});v.dom.bind(y.content_editable?v.getBody():(a?v.getDoc():v.getWin()),"focus",function(s){v.focus(true)});if(m.isGecko){v.dom.bind(v.getDoc(),"DOMNodeInserted",function(t){var s;t=t.target;if(t.nodeType===1&&t.nodeName==="IMG"&&(s=t.getAttribute("_mce_src"))){t.src=v.documentBaseURI.toAbsolute(s)}})}if(a){function p(){var B=this,D=B.getDoc(),C=B.settings;if(a&&!C.readonly){if(B._isHidden()){try{if(!C.content_editable){D.designMode="On"}}catch(A){}}try{D.execCommand("styleWithCSS",0,false)}catch(A){if(!B._isHidden()){try{D.execCommand("useCSS",0,true)}catch(A){}}}if(!C.table_inline_editing){try{D.execCommand("enableInlineTableEditing",false,false)}catch(A){}}if(!C.object_resizing){try{D.execCommand("enableObjectResizing",false,false)}catch(A){}}}}v.onBeforeExecCommand.add(p);v.onMouseDown.add(p)}if(m.isWebKit){v.onClick.add(function(s,t){t=t.target;if(t.nodeName=="IMG"||(t.nodeName=="A"&&v.dom.hasClass(t,"mceItemAnchor"))){v.selection.getSel().setBaseAndExtent(t,0,t,1)}})}v.onMouseUp.add(v.nodeChanged);v.onKeyUp.add(function(s,t){var A=t.keyCode;if((A>=33&&A<=36)||(A>=37&&A<=40)||A==13||A==45||A==46||A==8||(m.isMac&&(A==91||A==93))||t.ctrlKey){v.nodeChanged()}});v.onReset.add(function(){v.setContent(v.startContent,{format:"raw"})});if(y.custom_shortcuts){if(y.custom_undo_redo_keyboard_shortcuts){v.addShortcut("ctrl+z",v.getLang("undo_desc"),"Undo");v.addShortcut("ctrl+y",v.getLang("redo_desc"),"Redo")}v.addShortcut("ctrl+b",v.getLang("bold_desc"),"Bold");v.addShortcut("ctrl+i",v.getLang("italic_desc"),"Italic");v.addShortcut("ctrl+u",v.getLang("underline_desc"),"Underline");for(u=1;u<=6;u++){v.addShortcut("ctrl+"+u,"",["FormatBlock",false,"h"+u])}v.addShortcut("ctrl+7","",["FormatBlock",false,"<p>"]);v.addShortcut("ctrl+8","",["FormatBlock",false,"<div>"]);v.addShortcut("ctrl+9","",["FormatBlock",false,"<address>"]);function z(t){var s=null;if(!t.altKey&&!t.ctrlKey&&!t.metaKey){return s}i(v.shortcuts,function(A){if(m.isMac&&A.ctrl!=t.metaKey){return}else{if(!m.isMac&&A.ctrl!=t.ctrlKey){return}}if(A.alt!=t.altKey){return}if(A.shift!=t.shiftKey){return}if(t.keyCode==A.keyCode||(t.charCode&&t.charCode==A.charCode)){s=A;return false}});return s}v.onKeyUp.add(function(s,t){var A=z(t);if(A){return j.cancel(t)}});v.onKeyPress.add(function(s,t){var A=z(t);if(A){return j.cancel(t)}});v.onKeyDown.add(function(s,t){var A=z(t);if(A){A.func.call(A.scope);return j.cancel(t)}})}if(m.isIE){v.dom.bind(v.getDoc(),"controlselect",function(A){var t=v.resizeInfo,s;A=A.target;if(A.nodeName!=="IMG"){return}if(t){v.dom.unbind(t.node,t.ev,t.cb)}if(!v.dom.hasClass(A,"mceItemNoResize")){ev="resizeend";s=v.dom.bind(A,ev,function(C){var B;C=C.target;if(B=v.dom.getStyle(C,"width")){v.dom.setAttrib(C,"width",B.replace(/[^0-9%]+/g,""));v.dom.setStyle(C,"width","")}if(B=v.dom.getStyle(C,"height")){v.dom.setAttrib(C,"height",B.replace(/[^0-9%]+/g,""));v.dom.setStyle(C,"height","")}})}else{ev="resizestart";s=v.dom.bind(A,"resizestart",j.cancel,j)}t=v.resizeInfo={node:A,ev:ev,cb:s}});v.onKeyDown.add(function(s,t){switch(t.keyCode){case 8:if(v.selection.getRng().item){s.dom.remove(v.selection.getRng().item(0));return j.cancel(t)}}})}if(m.isOpera){v.onClick.add(function(s,t){j.prevent(t)})}if(y.custom_undo_redo){function q(){v.undoManager.typing=0;v.undoManager.add()}v.dom.bind(v.getDoc(),"focusout",function(s){if(!v.removed&&v.undoManager.typing){q()}});v.onKeyUp.add(function(s,t){if((t.keyCode>=33&&t.keyCode<=36)||(t.keyCode>=37&&t.keyCode<=40)||t.keyCode==13||t.keyCode==45||t.ctrlKey){q()}});v.onKeyDown.add(function(t,D){var s,C,B;if(b&&D.keyCode==46){s=v.selection.getRng();if(s.parentElement){C=s.parentElement();if(D.ctrlKey){s.moveEnd("word",1);s.select()}v.selection.getSel().clear();if(s.parentElement()==C){B=v.selection.getBookmark();try{C.innerHTML=C.innerHTML}catch(A){}v.selection.moveToBookmark(B)}D.preventDefault();return}}if((D.keyCode>=33&&D.keyCode<=36)||(D.keyCode>=37&&D.keyCode<=40)||D.keyCode==13||D.keyCode==45){if(v.undoManager.typing){q()}return}if(!v.undoManager.typing){v.undoManager.add();v.undoManager.typing=1}});v.onMouseDown.add(function(){if(v.undoManager.typing){q()}})}},_isHidden:function(){var p;if(!a){return 0}p=this.selection.getSel();return(!p||!p.rangeCount||p.rangeCount==0)},_fixNesting:function(q){var r=[],p;q=q.replace(/<(\/)?([^\s>]+)[^>]*?>/g,function(t,s,v){var u;if(s==="/"){if(!r.length){return""}if(v!==r[r.length-1].tag){for(p=r.length-1;p>=0;p--){if(r[p].tag===v){r[p].close=1;break}}return""}else{r.pop();if(r.length&&r[r.length-1].close){t=t+"</"+r[r.length-1].tag+">";r.pop()}}}else{if(/^(br|hr|input|meta|img|link|param)$/i.test(v)){return t}if(/\/>$/.test(t)){return t}r.push({tag:v})}return t});for(p=r.length-1;p>=0;p--){q+="</"+r[p].tag+">"}return q}})})(tinymce);(function(c){var d=c.each,e,a=true,b=false;c.EditorCommands=function(n){var l=n.dom,p=n.selection,j={state:{},exec:{},value:{}},k=n.settings,o;function q(y,x,v){var u;y=y.toLowerCase();if(u=j.exec[y]){u(y,x,v);return a}return b}function m(v){var u;v=v.toLowerCase();if(u=j.state[v]){return u(v)}return -1}function h(v){var u;v=v.toLowerCase();if(u=j.value[v]){return u(v)}return b}function t(u,v){v=v||"exec";d(u,function(y,x){d(x.toLowerCase().split(","),function(z){j[v][z]=y})})}c.extend(this,{execCommand:q,queryCommandState:m,queryCommandValue:h,addCommands:t});function f(x,v,u){if(v===e){v=b}if(u===e){u=null}return n.getDoc().execCommand(x,v,u)}function s(u){return n.formatter.match(u)}function r(u,v){n.formatter.toggle(u,v?{value:v}:e)}function i(u){o=p.getBookmark(u)}function g(){p.moveToBookmark(o)}t({"mceResetDesignMode,mceBeginUndoLevel":function(){},"mceEndUndoLevel,mceAddUndoLevel":function(){n.undoManager.add()},"Cut,Copy,Paste":function(y){var x=n.getDoc(),u;try{f(y)}catch(v){u=a}if(u||!x.queryCommandSupported(y)){if(c.isGecko){n.windowManager.confirm(n.getLang("clipboard_msg"),function(z){if(z){open("http://www.mozilla.org/editor/midasdemo/securityprefs.html","_blank")}})}else{n.windowManager.alert(n.getLang("clipboard_no_support"))}}},unlink:function(u){if(p.isCollapsed()){p.select(p.getNode())}f(u);p.collapse(b)},"JustifyLeft,JustifyCenter,JustifyRight,JustifyFull":function(u){var v=u.substring(7);d("left,center,right,full".split(","),function(x){if(v!=x){n.formatter.remove("align"+x)}});r("align"+v)},"InsertUnorderedList,InsertOrderedList":function(x){var u,v;f(x);u=l.getParent(p.getNode(),"ol,ul");if(u){v=u.parentNode;if(/^(H[1-6]|P|ADDRESS|PRE)$/.test(v.nodeName)){i();l.split(v,u);g()}}},"Bold,Italic,Underline,Strikethrough":function(u){r(u)},"ForeColor,HiliteColor,FontName":function(x,v,u){r(x,u)},FontSize:function(y,x,v){var u,z;if(v>=1&&v<=7){z=c.explode(k.font_size_style_values);u=c.explode(k.font_size_classes);if(u){v=u[v-1]||v}else{v=z[v-1]||v}}r(y,v)},RemoveFormat:function(u){n.formatter.remove(u)},mceBlockQuote:function(u){r("blockquote")},FormatBlock:function(x,v,u){return r(u||"p")},mceCleanup:function(){var u=p.getBookmark();n.setContent(n.getContent({cleanup:a}),{cleanup:a});p.moveToBookmark(u)},mceRemoveNode:function(y,x,v){var u=v||p.getNode();if(u!=n.getBody()){i();n.dom.remove(u,a);g()}},mceSelectNodeDepth:function(y,x,v){var u=0;l.getParent(p.getNode(),function(z){if(z.nodeType==1&&u++==v){p.select(z);return b}},n.getBody())},mceSelectNode:function(x,v,u){p.select(u)},mceInsertContent:function(x,v,u){p.setContent(u)},mceInsertRawHTML:function(x,v,u){p.setContent("tiny_mce_marker");n.setContent(n.getContent().replace(/tiny_mce_marker/g,u))},mceSetContent:function(x,v,u){n.setContent(u)},"Indent,Outdent":function(y){var v,u,x;v=k.indentation;u=/[a-z%]+$/i.exec(v);v=parseInt(v);if(!m("InsertUnorderedList")&&!m("InsertOrderedList")){d(p.getSelectedBlocks(),function(z){if(y=="outdent"){x=Math.max(0,parseInt(z.style.paddingLeft||0)-v);l.setStyle(z,"paddingLeft",x?x+u:"")}else{l.setStyle(z,"paddingLeft",(parseInt(z.style.paddingLeft||0)+v)+u)}})}else{f(y)}},mceRepaint:function(){var v;if(c.isGecko){try{i(a);if(p.getSel()){p.getSel().selectAllChildren(n.getBody())}p.collapse(a);g()}catch(u){}}},mceToggleFormat:function(x,v,u){n.formatter.toggle(u)},InsertHorizontalRule:function(){p.setContent("<hr />")},mceToggleVisualAid:function(){n.hasVisual=!n.hasVisual;n.addVisual()},mceReplaceContent:function(x,v,u){p.setContent(u.replace(/\{\$selection\}/g,p.getContent({format:"text"})))},mceInsertLink:function(y,x,v){var u=l.getParent(p.getNode(),"a");if(c.is(v,"string")){v={href:v}}if(!u){f("CreateLink",b,"javascript:mctmp(0);");d(l.select("a[href=javascript:mctmp(0);]"),function(z){l.setAttribs(z,v)})}else{if(v.href){l.setAttribs(u,v)}else{n.dom.remove(u,a)}}},selectAll:function(){var v=l.getRoot(),u=l.createRng();u.setStart(v,0);u.setEnd(v,v.childNodes.length);n.selection.setRng(u)}});t({"JustifyLeft,JustifyCenter,JustifyRight,JustifyFull":function(u){return s("align"+u.substring(7))},"Bold,Italic,Underline,Strikethrough":function(u){return s(u)},mceBlockQuote:function(){return s("blockquote")},Outdent:function(){var u;if(k.inline_styles){if((u=l.getParent(p.getStart(),l.isBlock))&&parseInt(u.style.paddingLeft)>0){return a}if((u=l.getParent(p.getEnd(),l.isBlock))&&parseInt(u.style.paddingLeft)>0){return a}}return m("InsertUnorderedList")||m("InsertOrderedList")||(!k.inline_styles&&!!l.getParent(p.getNode(),"BLOCKQUOTE"))},"InsertUnorderedList,InsertOrderedList":function(u){return l.getParent(p.getNode(),u=="insertunorderedlist"?"UL":"OL")}},"state");t({"FontSize,FontName":function(x){var v=0,u;if(u=l.getParent(p.getNode(),"span")){if(x=="fontsize"){v=u.style.fontSize}else{v=u.style.fontFamily.replace(/, /g,",").replace(/[\'\"]/g,"").toLowerCase()}}return v}},"value");if(k.custom_undo_redo){t({Undo:function(){n.undoManager.undo()},Redo:function(){n.undoManager.redo()}})}}})(tinymce);(function(b){var a=b.util.Dispatcher;b.UndoManager=function(e){var c,d=0,g=[];function f(){return b.trim(e.getContent({format:"raw",no_events:1}))}return c={typing:0,onAdd:new a(c),onUndo:new a(c),onRedo:new a(c),add:function(l){var h,j=e.settings,k;l=l||{};l.content=f();k=g[d];if(k&&k.content==l.content){if(d>0||g.length==1){return null}}if(j.custom_undo_redo_levels){if(g.length>j.custom_undo_redo_levels){for(h=0;h<g.length-1;h++){g[h]=g[h+1]}g.length--;d=g.length}}l.bookmark=e.selection.getBookmark(2,true);if(d<g.length-1){if(d==0){g=[]}else{g.length=d+1}}g.push(l);d=g.length-1;c.onAdd.dispatch(c,l);e.isNotDirty=0;return l},undo:function(){var j,h;if(c.typing){c.add();c.typing=0}if(d>0){j=g[--d];e.setContent(j.content,{format:"raw"});e.selection.moveToBookmark(j.bookmark);c.onUndo.dispatch(c,j)}return j},redo:function(){var h;if(d<g.length-1){h=g[++d];e.setContent(h.content,{format:"raw"});e.selection.moveToBookmark(h.bookmark);c.onRedo.dispatch(c,h)}return h},clear:function(){g=[];d=c.typing=0},hasUndo:function(){return d>0||c.typing},hasRedo:function(){return d<g.length-1}}}})(tinymce);(function(m){var k=m.dom.Event,c=m.isIE,a=m.isGecko,b=m.isOpera,j=m.each,i=m.extend,d=true,h=false;function l(p){var q,o,n;do{if(/^(SPAN|STRONG|B|EM|I|FONT|STRIKE|U)$/.test(p.nodeName)){if(q){o=p.cloneNode(false);o.appendChild(q);q=o}else{q=n=p.cloneNode(false)}q.removeAttribute("id")}}while(p=p.parentNode);if(q){return{wrapper:q,inner:n}}}function g(o,p){var n=p.ownerDocument.createRange();n.setStart(o.endContainer,o.endOffset);n.setEndAfter(p);return n.cloneContents().textContent.length==0}function f(o){o=o.innerHTML;o=o.replace(/<(img|hr|table|input|select|textarea)[ \>]/gi,"-");o=o.replace(/<[^>]+>/g,"");return o.replace(/[ \u00a0\t\r\n]+/g,"")==""}function e(p,r,n){var o,q;if(f(n)){o=r.getParent(n,"ul,ol");if(!r.getParent(o.parentNode,"ul,ol")){r.split(o,n);q=r.create("p",0,'<br _mce_bogus="1" />');r.replace(q,n);p.select(q,1)}return h}return d}m.create("tinymce.ForceBlocks",{ForceBlocks:function(o){var p=this,q=o.settings,r;p.editor=o;p.dom=o.dom;r=(q.forced_root_block||"p").toLowerCase();q.element=r.toUpperCase();o.onPreInit.add(p.setup,p);p.reOpera=new RegExp("(\\u00a0|&#160;|&nbsp;)</"+r+">","gi");p.rePadd=new RegExp("<p( )([^>]+)><\\/p>|<p( )([^>]+)\\/>|<p( )([^>]+)>\\s+<\\/p>|<p><\\/p>|<p\\/>|<p>\\s+<\\/p>".replace(/p/g,r),"gi");p.reNbsp2BR1=new RegExp("<p( )([^>]+)>[\\s\\u00a0]+<\\/p>|<p>[\\s\\u00a0]+<\\/p>".replace(/p/g,r),"gi");p.reNbsp2BR2=new RegExp("<%p()([^>]+)>(&nbsp;|&#160;)<\\/%p>|<%p>(&nbsp;|&#160;)<\\/%p>".replace(/%p/g,r),"gi");p.reBR2Nbsp=new RegExp("<p( )([^>]+)>\\s*<br \\/>\\s*<\\/p>|<p>\\s*<br \\/>\\s*<\\/p>".replace(/p/g,r),"gi");function n(s,t){if(b){t.content=t.content.replace(p.reOpera,"</"+r+">")}t.content=t.content.replace(p.rePadd,"<"+r+"$1$2$3$4$5$6>\u00a0</"+r+">");if(!c&&!b&&t.set){t.content=t.content.replace(p.reNbsp2BR1,"<"+r+"$1$2><br /></"+r+">");t.content=t.content.replace(p.reNbsp2BR2,"<"+r+"$1$2><br /></"+r+">")}else{t.content=t.content.replace(p.reBR2Nbsp,"<"+r+"$1$2>\u00a0</"+r+">")}}o.onBeforeSetContent.add(n);o.onPostProcess.add(n);if(q.forced_root_block){o.onInit.add(p.forceRoots,p);o.onSetContent.add(p.forceRoots,p);o.onBeforeGetContent.add(p.forceRoots,p)}},setup:function(){var o=this,n=o.editor,q=n.settings,u=n.dom,p=n.selection;if(q.forced_root_block){n.onBeforeExecCommand.add(o.forceRoots,o);n.onKeyUp.add(o.forceRoots,o);n.onPreProcess.add(o.forceRoots,o)}if(q.force_br_newlines){if(c){n.onKeyPress.add(function(s,t){var v;if(t.keyCode==13&&p.getNode().nodeName!="LI"){p.setContent('<br id="__" /> ',{format:"raw"});v=u.get("__");v.removeAttribute("id");p.select(v);p.collapse();return k.cancel(t)}})}}if(q.force_p_newlines){if(!c){n.onKeyPress.add(function(s,t){if(t.keyCode==13&&!t.shiftKey&&!o.insertPara(t)){k.cancel(t)}})}else{m.addUnload(function(){o._previousFormats=0});n.onKeyPress.add(function(s,t){o._previousFormats=0;if(t.keyCode==13&&!t.shiftKey&&s.selection.isCollapsed()&&q.keep_styles){o._previousFormats=l(s.selection.getStart())}});n.onKeyUp.add(function(t,x){if(x.keyCode==13&&!x.shiftKey){var v=t.selection.getStart(),s=o._previousFormats;if(!v.hasChildNodes()){v=u.getParent(v,u.isBlock);if(v){v.innerHTML="";if(o._previousFormats){v.appendChild(s.wrapper);s.inner.innerHTML="\uFEFF"}else{v.innerHTML="\uFEFF"}p.select(v,1);t.getDoc().execCommand("Delete",false,null)}}}})}if(a){n.onKeyDown.add(function(s,t){if((t.keyCode==8||t.keyCode==46)&&!t.shiftKey){o.backspaceDelete(t,t.keyCode==8)}})}}if(m.isWebKit){function r(t){var s=p.getRng(),v,z=u.create("div",null," "),y,x=u.getViewPort(t.getWin()).h;s.insertNode(v=u.create("br"));s.setStartAfter(v);s.setEndAfter(v);p.setRng(s);if(p.getSel().focusNode==v.previousSibling){p.select(u.insertAfter(u.doc.createTextNode("\u00a0"),v));p.collapse(d)}u.insertAfter(z,v);y=u.getPos(z).y;u.remove(z);if(y>x){t.getWin().scrollTo(0,y)}}n.onKeyPress.add(function(s,t){if(t.keyCode==13&&(t.shiftKey||(q.force_br_newlines&&!u.getParent(p.getNode(),"h1,h2,h3,h4,h5,h6,ol,ul")))){r(s);k.cancel(t)}})}n.onPreProcess.add(function(s,t){j(u.select("p,h1,h2,h3,h4,h5,h6,div",t.node),function(v){if(f(v)){j(u.select("span,em,strong,b,i",t.node),function(x){if(!x.hasChildNodes()){x.appendChild(s.getDoc().createTextNode("\u00a0"));return h}})}})});if(c){if(q.element!="P"){n.onKeyPress.add(function(s,t){o.lastElm=p.getNode().nodeName});n.onKeyUp.add(function(t,v){var y,x=p.getNode(),s=t.getBody();if(s.childNodes.length===1&&x.nodeName=="P"){x=u.rename(x,q.element);p.select(x);p.collapse();t.nodeChanged()}else{if(v.keyCode==13&&!v.shiftKey&&o.lastElm!="P"){y=u.getParent(x,"p");if(y){u.rename(y,q.element);t.nodeChanged()}}}})}}},find:function(v,q,r){var p=this.editor,o=p.getDoc().createTreeWalker(v,4,null,h),u=-1;while(v=o.nextNode()){u++;if(q==0&&v==r){return u}if(q==1&&u==r){return v}}return -1},forceRoots:function(x,I){var z=this,x=z.editor,M=x.getBody(),J=x.getDoc(),P=x.selection,A=P.getSel(),B=P.getRng(),N=-2,v,G,o,p,K=-16777215;var L,q,O,F,C,u=M.childNodes,E,D,y;for(E=u.length-1;E>=0;E--){L=u[E];if(L.nodeType===1&&L.getAttribute("_mce_type")){q=null;continue}if(L.nodeType===3||(!z.dom.isBlock(L)&&L.nodeType!==8&&!/^(script|mce:script|style|mce:style)$/i.test(L.nodeName))){if(!q){if(L.nodeType!=3||/[^\s]/g.test(L.nodeValue)){if(N==-2&&B){if(!c){if(B.startContainer.nodeType==1&&(D=B.startContainer.childNodes[B.startOffset])&&D.nodeType==1){y=D.getAttribute("id");D.setAttribute("id","__mce")}else{if(x.dom.getParent(B.startContainer,function(n){return n===M})){G=B.startOffset;o=B.endOffset;N=z.find(M,0,B.startContainer);v=z.find(M,0,B.endContainer)}}}else{if(B.item){p=J.body.createTextRange();p.moveToElementText(B.item(0));B=p}p=J.body.createTextRange();p.moveToElementText(M);p.collapse(1);O=p.move("character",K)*-1;p=B.duplicate();p.collapse(1);F=p.move("character",K)*-1;p=B.duplicate();p.collapse(0);C=(p.move("character",K)*-1)-F;N=F-O;v=C}}q=x.dom.create(x.settings.forced_root_block);L.parentNode.replaceChild(q,L);q.appendChild(L)}}else{if(q.hasChildNodes()){q.insertBefore(L,q.firstChild)}else{q.appendChild(L)}}}else{q=null}}if(N!=-2){if(!c){q=M.getElementsByTagName(x.settings.element)[0];B=J.createRange();if(N!=-1){B.setStart(z.find(M,1,N),G)}else{B.setStart(q,0)}if(v!=-1){B.setEnd(z.find(M,1,v),o)}else{B.setEnd(q,0)}if(A){A.removeAllRanges();A.addRange(B)}}else{try{B=A.createRange();B.moveToElementText(M);B.collapse(1);B.moveStart("character",N);B.moveEnd("character",v);B.select()}catch(H){}}}else{if(!c&&(D=x.dom.get("__mce"))){if(y){D.setAttribute("id",y)}else{D.removeAttribute("id")}B=J.createRange();B.setStartBefore(D);B.setEndBefore(D);P.setRng(B)}}},getParentBlock:function(p){var o=this.dom;return o.getParent(p,o.isBlock)},insertPara:function(S){var G=this,x=G.editor,O=x.dom,T=x.getDoc(),X=x.settings,H=x.selection.getSel(),I=H.getRangeAt(0),W=T.body;var L,M,J,Q,P,u,p,v,A,o,E,V,q,z,K,N=O.getViewPort(x.getWin()),D,F,C;L=T.createRange();L.setStart(H.anchorNode,H.anchorOffset);L.collapse(d);M=T.createRange();M.setStart(H.focusNode,H.focusOffset);M.collapse(d);J=L.compareBoundaryPoints(L.START_TO_END,M)<0;Q=J?H.anchorNode:H.focusNode;P=J?H.anchorOffset:H.focusOffset;u=J?H.focusNode:H.anchorNode;p=J?H.focusOffset:H.anchorOffset;if(Q===u&&/^(TD|TH)$/.test(Q.nodeName)){if(Q.firstChild.nodeName=="BR"){O.remove(Q.firstChild)}if(Q.childNodes.length==0){x.dom.add(Q,X.element,null,"<br />");V=x.dom.add(Q,X.element,null,"<br />")}else{K=Q.innerHTML;Q.innerHTML="";x.dom.add(Q,X.element,null,K);V=x.dom.add(Q,X.element,null,"<br />")}I=T.createRange();I.selectNodeContents(V);I.collapse(1);x.selection.setRng(I);return h}if(Q==W&&u==W&&W.firstChild&&x.dom.isBlock(W.firstChild)){Q=u=Q.firstChild;P=p=0;L=T.createRange();L.setStart(Q,0);M=T.createRange();M.setStart(u,0)}Q=Q.nodeName=="HTML"?T.body:Q;Q=Q.nodeName=="BODY"?Q.firstChild:Q;u=u.nodeName=="HTML"?T.body:u;u=u.nodeName=="BODY"?u.firstChild:u;v=G.getParentBlock(Q);A=G.getParentBlock(u);o=v?v.nodeName:X.element;if(K=G.dom.getParent(v,"li,pre")){if(K.nodeName=="LI"){return e(x.selection,G.dom,K)}return d}if(v&&(v.nodeName=="CAPTION"||/absolute|relative|fixed/gi.test(O.getStyle(v,"position",1)))){o=X.element;v=null}if(A&&(A.nodeName=="CAPTION"||/absolute|relative|fixed/gi.test(O.getStyle(v,"position",1)))){o=X.element;A=null}if(/(TD|TABLE|TH|CAPTION)/.test(o)||(v&&o=="DIV"&&/left|right/gi.test(O.getStyle(v,"float",1)))){o=X.element;v=A=null}E=(v&&v.nodeName==o)?v.cloneNode(0):x.dom.create(o);V=(A&&A.nodeName==o)?A.cloneNode(0):x.dom.create(o);V.removeAttribute("id");if(/^(H[1-6])$/.test(o)&&g(I,v)){V=x.dom.create(X.element)}K=q=Q;do{if(K==W||K.nodeType==9||G.dom.isBlock(K)||/(TD|TABLE|TH|CAPTION)/.test(K.nodeName)){break}q=K}while((K=K.previousSibling?K.previousSibling:K.parentNode));K=z=u;do{if(K==W||K.nodeType==9||G.dom.isBlock(K)||/(TD|TABLE|TH|CAPTION)/.test(K.nodeName)){break}z=K}while((K=K.nextSibling?K.nextSibling:K.parentNode));if(q.nodeName==o){L.setStart(q,0)}else{L.setStartBefore(q)}L.setEnd(Q,P);E.appendChild(L.cloneContents()||T.createTextNode(""));try{M.setEndAfter(z)}catch(R){}M.setStart(u,p);V.appendChild(M.cloneContents()||T.createTextNode(""));I=T.createRange();if(!q.previousSibling&&q.parentNode.nodeName==o){I.setStartBefore(q.parentNode)}else{if(L.startContainer.nodeName==o&&L.startOffset==0){I.setStartBefore(L.startContainer)}else{I.setStart(L.startContainer,L.startOffset)}}if(!z.nextSibling&&z.parentNode.nodeName==o){I.setEndAfter(z.parentNode)}else{I.setEnd(M.endContainer,M.endOffset)}I.deleteContents();if(b){x.getWin().scrollTo(0,N.y)}if(E.firstChild&&E.firstChild.nodeName==o){E.innerHTML=E.firstChild.innerHTML}if(V.firstChild&&V.firstChild.nodeName==o){V.innerHTML=V.firstChild.innerHTML}if(f(E)){E.innerHTML="<br />"}function U(y,s){var r=[],Z,Y,t;y.innerHTML="";if(X.keep_styles){Y=s;do{if(/^(SPAN|STRONG|B|EM|I|FONT|STRIKE|U)$/.test(Y.nodeName)){Z=Y.cloneNode(h);O.setAttrib(Z,"id","");r.push(Z)}}while(Y=Y.parentNode)}if(r.length>0){for(t=r.length-1,Z=y;t>=0;t--){Z=Z.appendChild(r[t])}r[0].innerHTML=b?"&nbsp;":"<br />";return r[0]}else{y.innerHTML=b?"&nbsp;":"<br />"}}if(f(V)){C=U(V,u)}if(b&&parseFloat(opera.version())<9.5){I.insertNode(E);I.insertNode(V)}else{I.insertNode(V);I.insertNode(E)}V.normalize();E.normalize();function B(r){return T.createTreeWalker(r,NodeFilter.SHOW_TEXT,null,h).nextNode()||r}I=T.createRange();I.selectNodeContents(a?B(C||V):C||V);I.collapse(1);H.removeAllRanges();H.addRange(I);D=x.dom.getPos(V).y;F=V.clientHeight;if(D<N.y||D+F>N.y+N.h){x.getWin().scrollTo(0,D<N.y?D:D-N.h+25)}return h},backspaceDelete:function(v,C){var D=this,u=D.editor,z=u.getBody(),s=u.dom,q,x=u.selection,p=x.getRng(),y=p.startContainer,q,A,B,o;if(!C&&p.collapsed&&y.nodeType==1&&p.startOffset==y.childNodes.length){o=new m.dom.TreeWalker(y.lastChild,y);for(q=y.lastChild;q;q=o.prev()){if(q.nodeType==3){p.setStart(q,q.nodeValue.length);p.collapse(true);x.setRng(p);return}}}if(y&&u.dom.isBlock(y)&&!/^(TD|TH)$/.test(y.nodeName)&&C){if(y.childNodes.length==0||(y.childNodes.length==1&&y.firstChild.nodeName=="BR")){q=y;while((q=q.previousSibling)&&!u.dom.isBlock(q)){}if(q){if(y!=z.firstChild){A=u.dom.doc.createTreeWalker(q,NodeFilter.SHOW_TEXT,null,h);while(B=A.nextNode()){q=B}p=u.getDoc().createRange();p.setStart(q,q.nodeValue?q.nodeValue.length:0);p.setEnd(q,q.nodeValue?q.nodeValue.length:0);x.setRng(p);u.dom.remove(y)}return k.cancel(v)}}}}})})(tinymce);(function(c){var b=c.DOM,a=c.dom.Event,d=c.each,e=c.extend;c.create("tinymce.ControlManager",{ControlManager:function(f,j){var h=this,g;j=j||{};h.editor=f;h.controls={};h.onAdd=new c.util.Dispatcher(h);h.onPostRender=new c.util.Dispatcher(h);h.prefix=j.prefix||f.id+"_";h._cls={};h.onPostRender.add(function(){d(h.controls,function(i){i.postRender()})})},get:function(f){return this.controls[this.prefix+f]||this.controls[f]},setActive:function(h,f){var g=null;if(g=this.get(h)){g.setActive(f)}return g},setDisabled:function(h,f){var g=null;if(g=this.get(h)){g.setDisabled(f)}return g},add:function(g){var f=this;if(g){f.controls[g.id]=g;f.onAdd.dispatch(g,f)}return g},createControl:function(i){var h,g=this,f=g.editor;d(f.plugins,function(j){if(j.createControl){h=j.createControl(i,g);if(h){return false}}});switch(i){case"|":case"separator":return g.createSeparator()}if(!h&&f.buttons&&(h=f.buttons[i])){return g.createButton(i,h)}return g.add(h)},createDropMenu:function(f,n,h){var m=this,i=m.editor,j,g,k,l;n=e({"class":"mceDropDown",constrain:i.settings.constrain_menus},n);n["class"]=n["class"]+" "+i.getParam("skin")+"Skin";if(k=i.getParam("skin_variant")){n["class"]+=" "+i.getParam("skin")+"Skin"+k.substring(0,1).toUpperCase()+k.substring(1)}f=m.prefix+f;l=h||m._cls.dropmenu||c.ui.DropMenu;j=m.controls[f]=new l(f,n);j.onAddItem.add(function(r,q){var p=q.settings;p.title=i.getLang(p.title,p.title);if(!p.onclick){p.onclick=function(o){if(p.cmd){i.execCommand(p.cmd,p.ui||false,p.value)}}}});i.onRemove.add(function(){j.destroy()});if(c.isIE){j.onShowMenu.add(function(){i.focus();g=i.selection.getBookmark(1)});j.onHideMenu.add(function(){if(g){i.selection.moveToBookmark(g);g=0}})}return m.add(j)},createListBox:function(m,i,l){var h=this,g=h.editor,j,k,f;if(h.get(m)){return null}i.title=g.translate(i.title);i.scope=i.scope||g;if(!i.onselect){i.onselect=function(n){g.execCommand(i.cmd,i.ui||false,n||i.value)}}i=e({title:i.title,"class":"mce_"+m,scope:i.scope,control_manager:h},i);m=h.prefix+m;if(g.settings.use_native_selects){k=new c.ui.NativeListBox(m,i)}else{f=l||h._cls.listbox||c.ui.ListBox;k=new f(m,i)}h.controls[m]=k;if(c.isWebKit){k.onPostRender.add(function(p,o){a.add(o,"mousedown",function(){g.bookmark=g.selection.getBookmark(1)});a.add(o,"focus",function(){g.selection.moveToBookmark(g.bookmark);g.bookmark=null})})}if(k.hideMenu){g.onMouseDown.add(k.hideMenu,k)}return h.add(k)},createButton:function(m,i,l){var h=this,g=h.editor,j,k,f;if(h.get(m)){return null}i.title=g.translate(i.title);i.label=g.translate(i.label);i.scope=i.scope||g;if(!i.onclick&&!i.menu_button){i.onclick=function(){g.execCommand(i.cmd,i.ui||false,i.value)}}i=e({title:i.title,"class":"mce_"+m,unavailable_prefix:g.getLang("unavailable",""),scope:i.scope,control_manager:h},i);m=h.prefix+m;if(i.menu_button){f=l||h._cls.menubutton||c.ui.MenuButton;k=new f(m,i);g.onMouseDown.add(k.hideMenu,k)}else{f=h._cls.button||c.ui.Button;k=new f(m,i)}return h.add(k)},createMenuButton:function(h,f,g){f=f||{};f.menu_button=1;return this.createButton(h,f,g)},createSplitButton:function(m,i,l){var h=this,g=h.editor,j,k,f;if(h.get(m)){return null}i.title=g.translate(i.title);i.scope=i.scope||g;if(!i.onclick){i.onclick=function(n){g.execCommand(i.cmd,i.ui||false,n||i.value)}}if(!i.onselect){i.onselect=function(n){g.execCommand(i.cmd,i.ui||false,n||i.value)}}i=e({title:i.title,"class":"mce_"+m,scope:i.scope,control_manager:h},i);m=h.prefix+m;f=l||h._cls.splitbutton||c.ui.SplitButton;k=h.add(new f(m,i));g.onMouseDown.add(k.hideMenu,k);return k},createColorSplitButton:function(f,n,h){var l=this,j=l.editor,i,k,m,g;if(l.get(f)){return null}n.title=j.translate(n.title);n.scope=n.scope||j;if(!n.onclick){n.onclick=function(o){if(c.isIE){g=j.selection.getBookmark(1)}j.execCommand(n.cmd,n.ui||false,o||n.value)}}if(!n.onselect){n.onselect=function(o){j.execCommand(n.cmd,n.ui||false,o||n.value)}}n=e({title:n.title,"class":"mce_"+f,menu_class:j.getParam("skin")+"Skin",scope:n.scope,more_colors_title:j.getLang("more_colors")},n);f=l.prefix+f;m=h||l._cls.colorsplitbutton||c.ui.ColorSplitButton;k=new m(f,n);j.onMouseDown.add(k.hideMenu,k);j.onRemove.add(function(){k.destroy()});if(c.isIE){k.onShowMenu.add(function(){j.focus();g=j.selection.getBookmark(1)});k.onHideMenu.add(function(){if(g){j.selection.moveToBookmark(g);g=0}})}return l.add(k)},createToolbar:function(k,h,j){var i,g=this,f;k=g.prefix+k;f=j||g._cls.toolbar||c.ui.Toolbar;i=new f(k,h);if(g.get(k)){return null}return g.add(i)},createSeparator:function(g){var f=g||this._cls.separator||c.ui.Separator;return new f()},setControlType:function(g,f){return this._cls[g.toLowerCase()]=f},destroy:function(){d(this.controls,function(f){f.destroy()});this.controls=null}})})(tinymce);(function(d){var a=d.util.Dispatcher,e=d.each,c=d.isIE,b=d.isOpera;d.create("tinymce.WindowManager",{WindowManager:function(f){var g=this;g.editor=f;g.onOpen=new a(g);g.onClose=new a(g);g.params={};g.features={}},open:function(z,h){var v=this,k="",n,m,i=v.editor.settings.dialog_type=="modal",q,o,j,g=d.DOM.getViewPort(),r;z=z||{};h=h||{};o=b?g.w:screen.width;j=b?g.h:screen.height;z.name=z.name||"mc_"+new Date().getTime();z.width=parseInt(z.width||320);z.height=parseInt(z.height||240);z.resizable=true;z.left=z.left||parseInt(o/2)-(z.width/2);z.top=z.top||parseInt(j/2)-(z.height/2);h.inline=false;h.mce_width=z.width;h.mce_height=z.height;h.mce_auto_focus=z.auto_focus;if(i){if(c){z.center=true;z.help=false;z.dialogWidth=z.width+"px";z.dialogHeight=z.height+"px";z.scroll=z.scrollbars||false}}e(z,function(p,f){if(d.is(p,"boolean")){p=p?"yes":"no"}if(!/^(name|url)$/.test(f)){if(c&&i){k+=(k?";":"")+f+":"+p}else{k+=(k?",":"")+f+"="+p}}});v.features=z;v.params=h;v.onOpen.dispatch(v,z,h);r=z.url||z.file;r=d._addVer(r);try{if(c&&i){q=1;window.showModalDialog(r,window,k)}else{q=window.open(r,z.name,k)}}catch(l){}if(!q){alert(v.editor.getLang("popup_blocked"))}},close:function(f){f.close();this.onClose.dispatch(this)},createInstance:function(i,h,g,m,l,k){var j=d.resolve(i);return new j(h,g,m,l,k)},confirm:function(h,f,i,g){g=g||window;f.call(i||this,g.confirm(this._decode(this.editor.getLang(h,h))))},alert:function(h,f,j,g){var i=this;g=g||window;g.alert(i._decode(i.editor.getLang(h,h)));if(f){f.call(j||i)}},resizeBy:function(f,g,h){h.resizeBy(f,g)},_decode:function(f){return d.DOM.decode(f).replace(/\\n/g,"\n")}})}(tinymce));(function(a){function b(){var d={},c={},e={};function f(j,i,h,g){if(typeof(i)=="string"){i=[i]}a.each(i,function(k){j[k.toLowerCase()]={func:h,scope:g}})}a.extend(this,{add:function(i,h,g){f(d,i,h,g)},addQueryStateHandler:function(i,h,g){f(c,i,h,g)},addQueryValueHandler:function(i,h,g){f(e,i,h,g)},execCommand:function(h,k,j,i,g){if(k=d[k.toLowerCase()]){if(k.func.call(h||k.scope,j,i,g)!==false){return true}}},queryCommandValue:function(){if(cmd=e[cmd.toLowerCase()]){return cmd.func.call(scope||cmd.scope,ui,value,args)}},queryCommandState:function(){if(cmd=c[cmd.toLowerCase()]){return cmd.func.call(scope||cmd.scope,ui,value,args)}}})}a.GlobalCommands=new b()})(tinymce);(function(a){a.Formatter=function(T){var K={},M=a.each,c=T.dom,p=T.selection,s=a.dom.TreeWalker,I=new a.dom.RangeUtils(c),d=T.schema.isValid,E=c.isBlock,k=T.settings.forced_root_block,r=c.nodeIndex,D="\uFEFF",e=/^(src|href|style)$/,Q=false,A=true,o,N={apply:[],remove:[]};function y(U){return U instanceof Array}function l(V,U){return c.getParents(V,U,c.getRoot())}function b(U){return U.nodeType===1&&(U.face==="mceinline"||U.style.fontFamily==="mceinline")}function P(U){return U?K[U]:K}function j(U,V){if(U){if(typeof(U)!=="string"){M(U,function(X,W){j(W,X)})}else{V=V.length?V:[V];M(V,function(W){if(W.deep===o){W.deep=!W.selector}if(W.split===o){W.split=!W.selector||W.inline}if(W.remove===o&&W.selector&&!W.inline){W.remove="none"}if(W.selector&&W.inline){W.mixed=true;W.block_expand=true}if(typeof(W.classes)==="string"){W.classes=W.classes.split(/\s+/)}});K[U]=V}}}function R(W,ac,Y){var Z=P(W),ad=Z[0],ab,V,aa;function X(ag){var af=ag.startContainer,aj=ag.startOffset,ai,ah;if(af.nodeType==1||af.nodeValue===""){af=af.nodeType==1?af.childNodes[aj]:af;if(af){ai=new s(af,af.parentNode);for(ah=ai.current();ah;ah=ai.next()){if(ah.nodeType==3&&!f(ah)){ag.setStart(ah,0);break}}}}return ag}function U(ag,af){af=af||ad;if(ag){M(af.styles,function(ai,ah){c.setStyle(ag,ah,q(ai,ac))});M(af.attributes,function(ai,ah){c.setAttrib(ag,ah,q(ai,ac))});M(af.classes,function(ah){ah=q(ah,ac);if(!c.hasClass(ag,ah)){c.addClass(ag,ah)}})}}function ae(ag){var af=[],ai,ah;ai=ad.inline||ad.block;ah=c.create(ai);U(ah);I.walk(ag,function(aj){var ak;function al(am){var ap=am.nodeName.toLowerCase(),ao=am.parentNode.nodeName.toLowerCase(),an;if(g(ap,"br")){ak=0;if(ad.block){c.remove(am)}return}if(ad.wrapper&&v(am,W,ac)){ak=0;return}if(ad.block&&!ad.wrapper&&F(ap)){am=c.rename(am,ai);U(am);af.push(am);ak=0;return}if(ad.selector){M(Z,function(aq){if(c.is(am,aq.selector)&&!b(am)){U(am,aq);an=true}});if(!ad.inline||an){ak=0;return}}if(d(ai,ap)&&d(ao,ai)){if(!ak){ak=ah.cloneNode(Q);am.parentNode.insertBefore(ak,am);af.push(ak)}ak.appendChild(am)}else{ak=0;M(a.grep(am.childNodes),al);ak=0}}M(aj,al)});M(af,function(al){var aj;function am(ao){var an=0;M(ao.childNodes,function(ap){if(!f(ap)&&!G(ap)){an++}});return an}function ak(an){var ap,ao;M(an.childNodes,function(aq){if(aq.nodeType==1&&!G(aq)&&!b(aq)){ap=aq;return Q}});if(ap&&h(ap,ad)){ao=ap.cloneNode(Q);U(ao);c.replace(ao,an,A);c.remove(ap,1)}return ao||an}aj=am(al);if(aj===0){c.remove(al,1);return}if(ad.inline||ad.wrapper){if(!ad.exact&&aj===1){al=ak(al)}M(Z,function(an){M(c.select(an.inline,al),function(ao){S(an,ac,ao,an.exact?ao:null)})});if(v(al.parentNode,W,ac)){c.remove(al,1);al=0;return A}if(ad.merge_with_parents){c.getParent(al.parentNode,function(an){if(v(an,W,ac)){c.remove(al,1);al=0;return A}})}if(al){al=t(B(al),al);al=t(al,B(al,A))}}})}if(ad){if(Y){V=c.createRng();V.setStartBefore(Y);V.setEndAfter(Y);ae(n(V,Z))}else{if(!p.isCollapsed()||!ad.inline){ab=p.getBookmark();ae(n(p.getRng(A),Z));p.moveToBookmark(ab);p.setRng(X(p.getRng(A)));T.nodeChanged()}else{O("apply",W,ac)}}}}function z(W,af,Z){var aa=P(W),ah=aa[0],ae,ad,V;function Y(ak){var aj=ak.startContainer,ap=ak.startOffset,ao,an,al,am;if(aj.nodeType==3&&ap>=aj.nodeValue.length-1){aj=aj.parentNode;ap=r(aj)+1}if(aj.nodeType==1){al=aj.childNodes;aj=al[Math.min(ap,al.length-1)];ao=new s(aj);if(ap>al.length-1){ao.next()}for(an=ao.current();an;an=ao.next()){if(an.nodeType==3&&!f(an)){am=c.create("a",null,D);an.parentNode.insertBefore(am,an);ak.setStart(an,0);p.setRng(ak);c.remove(am);return}}}}function X(am){var al,ak,aj;al=a.grep(am.childNodes);for(ak=0,aj=aa.length;ak<aj;ak++){if(S(aa[ak],af,am,am)){break}}if(ah.deep){for(ak=0,aj=al.length;ak<aj;ak++){X(al[ak])}}}function ab(aj){var ak;M(l(aj.parentNode).reverse(),function(al){var am;if(!ak&&al.id!="_start"&&al.id!="_end"){am=v(al,W,af);if(am&&am.split!==false){ak=al}}});return ak}function U(am,aj,ao,ar){var at,aq,ap,al,an,ak;if(am){ak=am.parentNode;for(at=aj.parentNode;at&&at!=ak;at=at.parentNode){aq=at.cloneNode(Q);for(an=0;an<aa.length;an++){if(S(aa[an],af,aq,aq)){aq=0;break}}if(aq){if(ap){aq.appendChild(ap)}if(!al){al=aq}ap=aq}}if(ar&&(!ah.mixed||!E(am))){aj=c.split(am,aj)}if(ap){ao.parentNode.insertBefore(ap,ao);al.appendChild(ao)}}return aj}function ag(aj){return U(ab(aj),aj,aj,true)}function ac(al){var ak=c.get(al?"_start":"_end"),aj=ak[al?"firstChild":"lastChild"];if(G(aj)){aj=aj[al?"firstChild":"lastChild"]}c.remove(ak,true);return aj}function ai(aj){var ak,al;aj=n(aj,aa,A);if(ah.split){ak=H(aj,A);al=H(aj);if(ak!=al){ak=L(ak,"span",{id:"_start",_mce_type:"bookmark"});al=L(al,"span",{id:"_end",_mce_type:"bookmark"});ag(ak);ag(al);ak=ac(A);al=ac()}else{ak=al=ag(ak)}aj.startContainer=ak.parentNode;aj.startOffset=r(ak);aj.endContainer=al.parentNode;aj.endOffset=r(al)+1}I.walk(aj,function(am){M(am,function(an){X(an)})})}if(Z){V=c.createRng();V.setStartBefore(Z);V.setEndAfter(Z);ai(V);return}if(!p.isCollapsed()||!ah.inline){ae=p.getBookmark();ai(p.getRng(A));p.moveToBookmark(ae);if(i(W,af,p.getStart())){Y(p.getRng(true))}T.nodeChanged()}else{O("remove",W,af)}}function C(U,W,V){if(i(U,W,V)){z(U,W,V)}else{R(U,W,V)}}function v(V,U,aa,Y){var W=P(U),ab,Z,X;function ac(ag,ai,aj){var af,ah,ad=ai[aj],ae;if(ad){if(ad.length===o){for(af in ad){if(ad.hasOwnProperty(af)){if(aj==="attributes"){ah=c.getAttrib(ag,af)}else{ah=J(ag,af)}if(Y&&!ah&&!ai.exact){return}if((!Y||ai.exact)&&!g(ah,q(ad[af],aa))){return}}}}else{for(ae=0;ae<ad.length;ae++){if(aj==="attributes"?c.getAttrib(ag,ad[ae]):J(ag,ad[ae])){return ai}}}}return ai}if(W&&V){for(Z=0;Z<W.length;Z++){ab=W[Z];if(h(V,ab)&&ac(V,ab,"attributes")&&ac(V,ab,"styles")){if(X=ab.classes){for(Z=0;Z<X.length;Z++){if(!c.hasClass(V,X[Z])){return}}}return ab}}}}function i(W,Z,Y){var V,X;function U(aa){aa=c.getParent(aa,function(ab){return !!v(ab,W,Z,true)});return v(aa,W,Z)}if(Y){return U(Y)}if(p.isCollapsed()){for(X=N.apply.length-1;X>=0;X--){if(N.apply[X].name==W){return true}}for(X=N.remove.length-1;X>=0;X--){if(N.remove[X].name==W){return false}}return U(p.getNode())}Y=p.getNode();if(U(Y)){return A}V=p.getStart();if(V!=Y){if(U(V)){return A}}return Q}function u(ab,aa){var Y,Z=[],X={},W,V,U;if(p.isCollapsed()){for(V=0;V<ab.length;V++){for(W=N.remove.length-1;W>=0;W--){U=ab[V];if(N.remove[W].name==U){X[U]=true;break}}}for(W=N.apply.length-1;W>=0;W--){for(V=0;V<ab.length;V++){U=ab[V];if(!X[U]&&N.apply[W].name==U){X[U]=true;Z.push(U)}}}}Y=p.getStart();c.getParent(Y,function(ae){var ad,ac;for(ad=0;ad<ab.length;ad++){ac=ab[ad];if(!X[ac]&&v(ae,ac,aa)){X[ac]=true;Z.push(ac)}}});return Z}function x(Y){var aa=P(Y),X,W,Z,V,U;if(aa){X=p.getStart();W=l(X);for(V=aa.length-1;V>=0;V--){U=aa[V].selector;if(!U){return A}for(Z=W.length-1;Z>=0;Z--){if(c.is(W[Z],U)){return A}}}}return Q}a.extend(this,{get:P,register:j,apply:R,remove:z,toggle:C,match:i,matchAll:u,matchNode:v,canApply:x});function h(U,V){if(g(U,V.inline)){return A}if(g(U,V.block)){return A}if(V.selector){return c.is(U,V.selector)}}function g(V,U){V=V||"";U=U||"";V=""+(V.nodeName||V);U=""+(U.nodeName||U);return V.toLowerCase()==U.toLowerCase()}function J(V,U){var W=c.getStyle(V,U);if(U=="color"||U=="backgroundColor"){W=c.toHex(W)}if(U=="fontWeight"&&W==700){W="bold"}return""+W}function q(U,V){if(typeof(U)!="string"){U=U(V)}else{if(V){U=U.replace(/%(\w+)/g,function(X,W){return V[W]||X})}}return U}function f(U){return U&&U.nodeType===3&&/^([\s\r\n]+|)$/.test(U.nodeValue)}function L(W,V,U){var X=c.create(V,U);W.parentNode.insertBefore(X,W);X.appendChild(W);return X}function n(U,ac,X){var W=U.startContainer,Z=U.startOffset,af=U.endContainer,aa=U.endOffset,ae,ab;function ad(ai,aj,ag,ah){var ak,al;ah=ah||c.getRoot();for(;;){ak=ai.parentNode;if(ak==ah||(!ac[0].block_expand&&E(ak))){return ai}for(ae=ak[aj];ae&&ae!=ai;ae=ae[ag]){if(ae.nodeType==1&&!G(ae)){return ai}if(ae.nodeType==3&&!f(ae)){return ai}}ai=ai.parentNode}return ai}if(W.nodeType==1&&W.hasChildNodes()){ab=W.childNodes.length-1;W=W.childNodes[Z>ab?ab:Z];if(W.nodeType==3){Z=0}}if(af.nodeType==1&&af.hasChildNodes()){ab=af.childNodes.length-1;af=af.childNodes[aa>ab?ab:aa-1];if(af.nodeType==3){aa=af.nodeValue.length}}if(G(W.parentNode)){W=W.parentNode}if(G(W)){W=W.nextSibling||W}if(G(af.parentNode)){af=af.parentNode}if(G(af)){af=af.previousSibling||af}if(ac[0].inline||ac[0].block_expand){W=ad(W,"firstChild","nextSibling");af=ad(af,"lastChild","previousSibling")}if(ac[0].selector&&ac[0].expand!==Q&&!ac[0].inline){function Y(ah,ag){var ai,aj,ak;if(ah.nodeType==3&&ah.nodeValue.length==0&&ah[ag]){ah=ah[ag]}ai=l(ah);for(aj=0;aj<ai.length;aj++){for(ak=0;ak<ac.length;ak++){if(c.is(ai[aj],ac[ak].selector)){return ai[aj]}}}return ah}W=Y(W,"previousSibling");af=Y(af,"nextSibling")}if(ac[0].block||ac[0].selector){function V(ah,ag,aj){var ai;if(!ac[0].wrapper){ai=c.getParent(ah,ac[0].block)}if(!ai){ai=c.getParent(ah.nodeType==3?ah.parentNode:ah,E)}if(ai&&ac[0].wrapper){ai=l(ai,"ul,ol").reverse()[0]||ai}if(!ai){ai=ah;while(ai[ag]&&!E(ai[ag])){ai=ai[ag];if(g(ai,"br")){break}}}return ai||ah}W=V(W,"previousSibling");af=V(af,"nextSibling");if(ac[0].block){if(!E(W)){W=ad(W,"firstChild","nextSibling")}if(!E(af)){af=ad(af,"lastChild","previousSibling")}}}if(W.nodeType==1){Z=r(W);W=W.parentNode}if(af.nodeType==1){aa=r(af)+1;af=af.parentNode}return{startContainer:W,startOffset:Z,endContainer:af,endOffset:aa}}function S(aa,Z,X,U){var W,V,Y;if(!h(X,aa)){return Q}if(aa.remove!="all"){M(aa.styles,function(ac,ab){ac=q(ac,Z);if(typeof(ab)==="number"){ab=ac;U=0}if(!U||g(J(U,ab),ac)){c.setStyle(X,ab,"")}Y=1});if(Y&&c.getAttrib(X,"style")==""){X.removeAttribute("style");X.removeAttribute("_mce_style")}M(aa.attributes,function(ad,ab){var ac;ad=q(ad,Z);if(typeof(ab)==="number"){ab=ad;U=0}if(!U||g(c.getAttrib(U,ab),ad)){if(ab=="class"){ad=c.getAttrib(X,ab);if(ad){ac="";M(ad.split(/\s+/),function(ae){if(/mce\w+/.test(ae)){ac+=(ac?" ":"")+ae}});if(ac){c.setAttrib(X,ab,ac);return}}}if(ab=="class"){X.removeAttribute("className")}if(e.test(ab)){X.removeAttribute("_mce_"+ab)}X.removeAttribute(ab)}});M(aa.classes,function(ab){ab=q(ab,Z);if(!U||c.hasClass(U,ab)){c.removeClass(X,ab)}});V=c.getAttribs(X);for(W=0;W<V.length;W++){if(V[W].nodeName.indexOf("_")!==0){return Q}}}if(aa.remove!="none"){m(X,aa);return A}}function m(W,X){var U=W.parentNode,V;if(X.block){if(!k){function Y(aa,Z,ab){aa=B(aa,Z,ab);return !aa||(aa.nodeName=="BR"||E(aa))}if(E(W)&&!E(U)){if(!Y(W,Q)&&!Y(W.firstChild,A,1)){W.insertBefore(c.create("br"),W.firstChild)}if(!Y(W,A)&&!Y(W.lastChild,Q,1)){W.appendChild(c.create("br"))}}}else{if(U==c.getRoot()){if(!X.list_block||!g(W,X.list_block)){M(a.grep(W.childNodes),function(Z){if(d(k,Z.nodeName.toLowerCase())){if(!V){V=L(Z,k)}else{V.appendChild(Z)}}else{V=0}})}}}}if(X.selector&&X.inline&&!g(X.inline,W)){return}c.remove(W,1)}function B(V,U,W){if(V){U=U?"nextSibling":"previousSibling";for(V=W?V:V[U];V;V=V[U]){if(V.nodeType==1||!f(V)){return V}}}}function G(U){return U&&U.nodeType==1&&U.getAttribute("_mce_type")=="bookmark"}function t(Y,X){var U,W,V;function aa(ad,ac){if(ad.nodeName!=ac.nodeName){return Q}function ab(af){var ag={};M(c.getAttribs(af),function(ah){var ai=ah.nodeName.toLowerCase();if(ai.indexOf("_")!==0&&ai!=="style"){ag[ai]=c.getAttrib(af,ai)}});return ag}function ae(ai,ah){var ag,af;for(af in ai){if(ai.hasOwnProperty(af)){ag=ah[af];if(ag===o){return Q}if(ai[af]!=ag){return Q}delete ah[af]}}for(af in ah){if(ah.hasOwnProperty(af)){return Q}}return A}if(!ae(ab(ad),ab(ac))){return Q}if(!ae(c.parseStyle(c.getAttrib(ad,"style")),c.parseStyle(c.getAttrib(ac,"style")))){return Q}return A}if(Y&&X){function Z(ac,ab){for(W=ac;W;W=W[ab]){if(W.nodeType==3&&!f(W)){return ac}if(W.nodeType==1&&!G(W)){return W}}return ac}Y=Z(Y,"previousSibling");X=Z(X,"nextSibling");if(aa(Y,X)){for(W=Y.nextSibling;W&&W!=X;){V=W;W=W.nextSibling;Y.appendChild(V)}c.remove(X);M(a.grep(X.childNodes),function(ab){Y.appendChild(ab)});return Y}}return X}function F(U){return/^(h[1-6]|p|div|pre|address|dl|dt|dd)$/.test(U)}function H(V,Y){var U,X,W;U=V[Y?"startContainer":"endContainer"];X=V[Y?"startOffset":"endOffset"];if(U.nodeType==1){W=U.childNodes.length-1;if(!Y&&X){X--}U=U.childNodes[X>W?W:X]}return U}function O(Z,V,Y){var W,U=N[Z],aa=N[Z=="apply"?"remove":"apply"];function ab(){return N.apply.length||N.remove.length}function X(){N.apply=[];N.remove=[]}function ac(ad){M(N.apply.reverse(),function(ae){R(ae.name,ae.vars,ad)});M(N.remove.reverse(),function(ae){z(ae.name,ae.vars,ad)});c.remove(ad,1);X()}for(W=U.length-1;W>=0;W--){if(U[W].name==V){return}}U.push({name:V,vars:Y});for(W=aa.length-1;W>=0;W--){if(aa[W].name==V){aa.splice(W,1)}}if(ab()){T.getDoc().execCommand("FontName",false,"mceinline");N.lastRng=p.getRng();M(c.select("font,span"),function(ae){var ad;if(b(ae)){ad=p.getBookmark();ac(ae);p.moveToBookmark(ad);T.nodeChanged()}});if(!N.isListening&&ab()){N.isListening=true;M("onKeyDown,onKeyUp,onKeyPress,onMouseUp".split(","),function(ad){T[ad].addToTop(function(ae,af){if(ab()&&!a.dom.RangeUtils.compareRanges(N.lastRng,p.getRng())){M(c.select("font,span"),function(ah){var ai,ag;if(b(ah)){ai=ah.firstChild;if(ai){ac(ah);ag=c.createRng();ag.setStart(ai,ai.nodeValue.length);ag.setEnd(ai,ai.nodeValue.length);p.setRng(ag);ae.nodeChanged()}else{c.remove(ah)}}});if(af.type=="keyup"||af.type=="mouseup"){X()}}})})}}}}})(tinymce);tinymce.onAddEditor.add(function(e,a){var d,h,g,c=a.settings;if(c.inline_styles){h=e.explode(c.font_size_style_values);function b(j,i){g.replace(g.create("span",{style:i}),j,1)}d={font:function(j,i){b(i,{backgroundColor:i.style.backgroundColor,color:i.color,fontFamily:i.face,fontSize:h[parseInt(i.size)-1]})},u:function(j,i){b(i,{textDecoration:"underline"})},strike:function(j,i){b(i,{textDecoration:"line-through"})}};function f(i,j){g=i.dom;if(c.convert_fonts_to_spans){e.each(g.select("font,u,strike",j.node),function(k){d[k.nodeName.toLowerCase()](a.dom,k)})}}a.onPreProcess.add(f);a.onInit.add(function(){a.selection.onSetContent.add(f)})}});
\ No newline at end of file
+(function(d){var a=/^\s*|\s*$/g,e,c="B".replace(/A(.)|B/,"$1")==="$1";var b={majorVersion:"3",minorVersion:"4.3.1",releaseDate:"2011-06-16",_init:function(){var s=this,q=document,o=navigator,g=o.userAgent,m,f,l,k,j,r;s.isOpera=d.opera&&opera.buildNumber;s.isWebKit=/WebKit/.test(g);s.isIE=!s.isWebKit&&!s.isOpera&&(/MSIE/gi).test(g)&&(/Explorer/gi).test(o.appName);s.isIE6=s.isIE&&/MSIE [56]/.test(g);s.isGecko=!s.isWebKit&&/Gecko/.test(g);s.isMac=g.indexOf("Mac")!=-1;s.isAir=/adobeair/i.test(g);s.isIDevice=/(iPad|iPhone)/.test(g);s.isIOS5=s.isIDevice&&g.match(/AppleWebKit\/(\d*)/)[1]>=534;if(d.tinyMCEPreInit){s.suffix=tinyMCEPreInit.suffix;s.baseURL=tinyMCEPreInit.base;s.query=tinyMCEPreInit.query;return}s.suffix="";f=q.getElementsByTagName("base");for(m=0;m<f.length;m++){if(r=f[m].href){if(/^https?:\/\/[^\/]+$/.test(r)){r+="/"}k=r?r.match(/.*\//)[0]:""}}function h(i){if(i.src&&/tiny_mce(|_gzip|_jquery|_prototype|_full)(_dev|_src)?.js/.test(i.src)){if(/_(src|dev)\.js/g.test(i.src)){s.suffix="_src"}if((j=i.src.indexOf("?"))!=-1){s.query=i.src.substring(j+1)}s.baseURL=i.src.substring(0,i.src.lastIndexOf("/"));if(k&&s.baseURL.indexOf("://")==-1&&s.baseURL.indexOf("/")!==0){s.baseURL=k+s.baseURL}return s.baseURL}return null}f=q.getElementsByTagName("script");for(m=0;m<f.length;m++){if(h(f[m])){return}}l=q.getElementsByTagName("head")[0];if(l){f=l.getElementsByTagName("script");for(m=0;m<f.length;m++){if(h(f[m])){return}}}return},is:function(g,f){if(!f){return g!==e}if(f=="array"&&(g.hasOwnProperty&&g instanceof Array)){return true}return typeof(g)==f},makeMap:function(f,j,h){var g;f=f||[];j=j||",";if(typeof(f)=="string"){f=f.split(j)}h=h||{};g=f.length;while(g--){h[f[g]]={}}return h},each:function(i,f,h){var j,g;if(!i){return 0}h=h||i;if(i.length!==e){for(j=0,g=i.length;j<g;j++){if(f.call(h,i[j],j,i)===false){return 0}}}else{for(j in i){if(i.hasOwnProperty(j)){if(f.call(h,i[j],j,i)===false){return 0}}}}return 1},map:function(g,h){var i=[];b.each(g,function(f){i.push(h(f))});return i},grep:function(g,h){var i=[];b.each(g,function(f){if(!h||h(f)){i.push(f)}});return i},inArray:function(g,h){var j,f;if(g){for(j=0,f=g.length;j<f;j++){if(g[j]===h){return j}}}return -1},extend:function(k,j){var h,g,f=arguments;for(h=1,g=f.length;h<g;h++){j=f[h];b.each(j,function(i,l){if(i!==e){k[l]=i}})}return k},trim:function(f){return(f?""+f:"").replace(a,"")},create:function(o,f,j){var n=this,g,i,k,l,h,m=0;o=/^((static) )?([\w.]+)(:([\w.]+))?/.exec(o);k=o[3].match(/(^|\.)(\w+)$/i)[2];i=n.createNS(o[3].replace(/\.\w+$/,""),j);if(i[k]){return}if(o[2]=="static"){i[k]=f;if(this.onCreate){this.onCreate(o[2],o[3],i[k])}return}if(!f[k]){f[k]=function(){};m=1}i[k]=f[k];n.extend(i[k].prototype,f);if(o[5]){g=n.resolve(o[5]).prototype;l=o[5].match(/\.(\w+)$/i)[1];h=i[k];if(m){i[k]=function(){return g[l].apply(this,arguments)}}else{i[k]=function(){this.parent=g[l];return h.apply(this,arguments)}}i[k].prototype[k]=i[k];n.each(g,function(p,q){i[k].prototype[q]=g[q]});n.each(f,function(p,q){if(g[q]){i[k].prototype[q]=function(){this.parent=g[q];return p.apply(this,arguments)}}else{if(q!=k){i[k].prototype[q]=p}}})}n.each(f["static"],function(p,q){i[k][q]=p});if(this.onCreate){this.onCreate(o[2],o[3],i[k].prototype)}},walk:function(i,h,j,g){g=g||this;if(i){if(j){i=i[j]}b.each(i,function(k,f){if(h.call(g,k,f,j)===false){return false}b.walk(k,h,j,g)})}},createNS:function(j,h){var g,f;h=h||d;j=j.split(".");for(g=0;g<j.length;g++){f=j[g];if(!h[f]){h[f]={}}h=h[f]}return h},resolve:function(j,h){var g,f;h=h||d;j=j.split(".");for(g=0,f=j.length;g<f;g++){h=h[j[g]];if(!h){break}}return h},addUnload:function(j,i){var h=this;j={func:j,scope:i||this};if(!h.unloads){function g(){var f=h.unloads,l,m;if(f){for(m in f){l=f[m];if(l&&l.func){l.func.call(l.scope,1)}}if(d.detachEvent){d.detachEvent("onbeforeunload",k);d.detachEvent("onunload",g)}else{if(d.removeEventListener){d.removeEventListener("unload",g,false)}}h.unloads=l=f=w=g=0;if(d.CollectGarbage){CollectGarbage()}}}function k(){var l=document;if(l.readyState=="interactive"){function f(){l.detachEvent("onstop",f);if(g){g()}l=0}if(l){l.attachEvent("onstop",f)}d.setTimeout(function(){if(l){l.detachEvent("onstop",f)}},0)}}if(d.attachEvent){d.attachEvent("onunload",g);d.attachEvent("onbeforeunload",k)}else{if(d.addEventListener){d.addEventListener("unload",g,false)}}h.unloads=[j]}else{h.unloads.push(j)}return j},removeUnload:function(i){var g=this.unloads,h=null;b.each(g,function(j,f){if(j&&j.func==i){g.splice(f,1);h=i;return false}});return h},explode:function(f,g){return f?b.map(f.split(g||","),b.trim):f},_addVer:function(g){var f;if(!this.query){return g}f=(g.indexOf("?")==-1?"?":"&")+this.query;if(g.indexOf("#")==-1){return g+f}return g.replace("#",f+"#")},_replace:function(h,f,g){if(c){return g.replace(h,function(){var l=f,j=arguments,k;for(k=0;k<j.length-2;k++){if(j[k]===e){l=l.replace(new RegExp("\\$"+k,"g"),"")}else{l=l.replace(new RegExp("\\$"+k,"g"),j[k])}}return l})}return g.replace(h,f)}};b._init();d.tinymce=d.tinyMCE=b})(window);tinymce.create("tinymce.util.Dispatcher",{scope:null,listeners:null,Dispatcher:function(a){this.scope=a||this;this.listeners=[]},add:function(a,b){this.listeners.push({cb:a,scope:b||this.scope});return a},addToTop:function(a,b){this.listeners.unshift({cb:a,scope:b||this.scope});return a},remove:function(a){var b=this.listeners,c=null;tinymce.each(b,function(e,d){if(a==e.cb){c=a;b.splice(d,1);return false}});return c},dispatch:function(){var f,d=arguments,e,b=this.listeners,g;for(e=0;e<b.length;e++){g=b[e];f=g.cb.apply(g.scope,d);if(f===false){break}}return f}});(function(){var a=tinymce.each;tinymce.create("tinymce.util.URI",{URI:function(e,g){var f=this,i,d,c,h;e=tinymce.trim(e);g=f.settings=g||{};if(/^(mailto|tel|news|javascript|about|data):/i.test(e)||/^\s*#/.test(e)){f.source=e;return}if(e.indexOf("/")===0&&e.indexOf("//")!==0){e=(g.base_uri?g.base_uri.protocol||"http":"http")+"://mce_host"+e}if(!/^[\w-]*:?\/\//.test(e)){h=g.base_uri?g.base_uri.path:new tinymce.util.URI(location.href).directory;e=((g.base_uri&&g.base_uri.protocol)||"http")+"://mce_host"+f.toAbsPath(h,e)}e=e.replace(/@@/g,"(mce_at)");e=/^(?:(?![^:@]+:[^:@\/]*@)([^:\/?#.]+):)?(?:\/\/)?((?:(([^:@]*):?([^:@]*))?@)?([^:\/?#]*)(?::(\d*))?)(((\/(?:[^?#](?![^?#\/]*\.[^?#\/.]+(?:[?#]|$)))*\/?)?([^?#\/]*))(?:\?([^#]*))?(?:#(.*))?)/.exec(e);a(["source","protocol","authority","userInfo","user","password","host","port","relative","path","directory","file","query","anchor"],function(b,j){var k=e[j];if(k){k=k.replace(/\(mce_at\)/g,"@@")}f[b]=k});if(c=g.base_uri){if(!f.protocol){f.protocol=c.protocol}if(!f.userInfo){f.userInfo=c.userInfo}if(!f.port&&f.host=="mce_host"){f.port=c.port}if(!f.host||f.host=="mce_host"){f.host=c.host}f.source=""}},setPath:function(c){var b=this;c=/^(.*?)\/?(\w+)?$/.exec(c);b.path=c[0];b.directory=c[1];b.file=c[2];b.source="";b.getURI()},toRelative:function(b){var c=this,d;if(b==="./"){return b}b=new tinymce.util.URI(b,{base_uri:c});if((b.host!="mce_host"&&c.host!=b.host&&b.host)||c.port!=b.port||c.protocol!=b.protocol){return b.getURI()}d=c.toRelPath(c.path,b.path);if(b.query){d+="?"+b.query}if(b.anchor){d+="#"+b.anchor}return d},toAbsolute:function(b,c){var b=new tinymce.util.URI(b,{base_uri:this});return b.getURI(this.host==b.host&&this.protocol==b.protocol?c:0)},toRelPath:function(g,h){var c,f=0,d="",e,b;g=g.substring(0,g.lastIndexOf("/"));g=g.split("/");c=h.split("/");if(g.length>=c.length){for(e=0,b=g.length;e<b;e++){if(e>=c.length||g[e]!=c[e]){f=e+1;break}}}if(g.length<c.length){for(e=0,b=c.length;e<b;e++){if(e>=g.length||g[e]!=c[e]){f=e+1;break}}}if(f==1){return h}for(e=0,b=g.length-(f-1);e<b;e++){d+="../"}for(e=f-1,b=c.length;e<b;e++){if(e!=f-1){d+="/"+c[e]}else{d+=c[e]}}return d},toAbsPath:function(e,f){var c,b=0,h=[],d,g;d=/\/$/.test(f)?"/":"";e=e.split("/");f=f.split("/");a(e,function(i){if(i){h.push(i)}});e=h;for(c=f.length-1,h=[];c>=0;c--){if(f[c].length==0||f[c]=="."){continue}if(f[c]==".."){b++;continue}if(b>0){b--;continue}h.push(f[c])}c=e.length-b;if(c<=0){g=h.reverse().join("/")}else{g=e.slice(0,c).join("/")+"/"+h.reverse().join("/")}if(g.indexOf("/")!==0){g="/"+g}if(d&&g.lastIndexOf("/")!==g.length-1){g+=d}return g},getURI:function(d){var c,b=this;if(!b.source||d){c="";if(!d){if(b.protocol){c+=b.protocol+"://"}if(b.userInfo){c+=b.userInfo+"@"}if(b.host){c+=b.host}if(b.port){c+=":"+b.port}}if(b.path){c+=b.path}if(b.query){c+="?"+b.query}if(b.anchor){c+="#"+b.anchor}b.source=c}return b.source}})})();(function(){var a=tinymce.each;tinymce.create("static tinymce.util.Cookie",{getHash:function(d){var b=this.get(d),c;if(b){a(b.split("&"),function(e){e=e.split("=");c=c||{};c[unescape(e[0])]=unescape(e[1])})}return c},setHash:function(j,b,g,f,i,c){var h="";a(b,function(e,d){h+=(!h?"":"&")+escape(d)+"="+escape(e)});this.set(j,h,g,f,i,c)},get:function(i){var h=document.cookie,g,f=i+"=",d;if(!h){return}d=h.indexOf("; "+f);if(d==-1){d=h.indexOf(f);if(d!=0){return null}}else{d+=2}g=h.indexOf(";",d);if(g==-1){g=h.length}return unescape(h.substring(d+f.length,g))},set:function(i,b,g,f,h,c){document.cookie=i+"="+escape(b)+((g)?"; expires="+g.toGMTString():"")+((f)?"; path="+escape(f):"")+((h)?"; domain="+h:"")+((c)?"; secure":"")},remove:function(e,b){var c=new Date();c.setTime(c.getTime()-1000);this.set(e,"",c,b,c)}})})();(function(){function serialize(o,quote){var i,v,t;quote=quote||'"';if(o==null){return"null"}t=typeof o;if(t=="string"){v="\bb\tt\nn\ff\rr\"\"''\\\\";return quote+o.replace(/([\u0080-\uFFFF\x00-\x1f\"\'\\])/g,function(a,b){if(quote==='"'&&a==="'"){return a}i=v.indexOf(b);if(i+1){return"\\"+v.charAt(i+1)}a=b.charCodeAt().toString(16);return"\\u"+"0000".substring(a.length)+a})+quote}if(t=="object"){if(o.hasOwnProperty&&o instanceof Array){for(i=0,v="[";i<o.length;i++){v+=(i>0?",":"")+serialize(o[i],quote)}return v+"]"}v="{";for(i in o){v+=typeof o[i]!="function"?(v.length>1?","+quote:quote)+i+quote+":"+serialize(o[i],quote):""}return v+"}"}return""+o}tinymce.util.JSON={serialize:serialize,parse:function(s){try{return eval("("+s+")")}catch(ex){}}}})();tinymce.create("static tinymce.util.XHR",{send:function(g){var a,e,b=window,h=0;g.scope=g.scope||this;g.success_scope=g.success_scope||g.scope;g.error_scope=g.error_scope||g.scope;g.async=g.async===false?false:true;g.data=g.data||"";function d(i){a=0;try{a=new ActiveXObject(i)}catch(c){}return a}a=b.XMLHttpRequest?new XMLHttpRequest():d("Microsoft.XMLHTTP")||d("Msxml2.XMLHTTP");if(a){if(a.overrideMimeType){a.overrideMimeType(g.content_type)}a.open(g.type||(g.data?"POST":"GET"),g.url,g.async);if(g.content_type){a.setRequestHeader("Content-Type",g.content_type)}a.setRequestHeader("X-Requested-With","XMLHttpRequest");a.send(g.data);function f(){if(!g.async||a.readyState==4||h++>10000){if(g.success&&h<10000&&a.status==200){g.success.call(g.success_scope,""+a.responseText,a,g)}else{if(g.error){g.error.call(g.error_scope,h>10000?"TIMED_OUT":"GENERAL",a,g)}}a=null}else{b.setTimeout(f,10)}}if(!g.async){return f()}e=b.setTimeout(f,10)}}});(function(){var c=tinymce.extend,b=tinymce.util.JSON,a=tinymce.util.XHR;tinymce.create("tinymce.util.JSONRequest",{JSONRequest:function(d){this.settings=c({},d);this.count=0},send:function(f){var e=f.error,d=f.success;f=c(this.settings,f);f.success=function(h,g){h=b.parse(h);if(typeof(h)=="undefined"){h={error:"JSON Parse error."}}if(h.error){e.call(f.error_scope||f.scope,h.error,g)}else{d.call(f.success_scope||f.scope,h.result)}};f.error=function(h,g){if(e){e.call(f.error_scope||f.scope,h,g)}};f.data=b.serialize({id:f.id||"c"+(this.count++),method:f.method,params:f.params});f.content_type="application/json";a.send(f)},"static":{sendRPC:function(d){return new tinymce.util.JSONRequest().send(d)}}})}());(function(j){var a,g,d,k=/[&<>\"\u007E-\uD7FF]|[\uD800-\uDBFF][\uDC00-\uDFFF]/g,b=/[<>&\u007E-\uD7FF]|[\uD800-\uDBFF][\uDC00-\uDFFF]/g,f=/[<>&\"\']/g,c=/&(#x|#)?([\w]+);/g,i={128:"\u20AC",130:"\u201A",131:"\u0192",132:"\u201E",133:"\u2026",134:"\u2020",135:"\u2021",136:"\u02C6",137:"\u2030",138:"\u0160",139:"\u2039",140:"\u0152",142:"\u017D",145:"\u2018",146:"\u2019",147:"\u201C",148:"\u201D",149:"\u2022",150:"\u2013",151:"\u2014",152:"\u02DC",153:"\u2122",154:"\u0161",155:"\u203A",156:"\u0153",158:"\u017E",159:"\u0178"};g={'"':"&quot;","'":"&#39;","<":"&lt;",">":"&gt;","&":"&amp;"};d={"&lt;":"<","&gt;":">","&amp;":"&","&quot;":'"',"&apos;":"'"};function h(l){var m;m=document.createElement("div");m.innerHTML=l;return m.textContent||m.innerText||l}function e(m,p){var n,o,l,q={};if(m){m=m.split(",");p=p||10;for(n=0;n<m.length;n+=2){o=String.fromCharCode(parseInt(m[n],p));if(!g[o]){l="&"+m[n+1]+";";q[o]=l;q[l]=o}}return q}}a=e("50,nbsp,51,iexcl,52,cent,53,pound,54,curren,55,yen,56,brvbar,57,sect,58,uml,59,copy,5a,ordf,5b,laquo,5c,not,5d,shy,5e,reg,5f,macr,5g,deg,5h,plusmn,5i,sup2,5j,sup3,5k,acute,5l,micro,5m,para,5n,middot,5o,cedil,5p,sup1,5q,ordm,5r,raquo,5s,frac14,5t,frac12,5u,frac34,5v,iquest,60,Agrave,61,Aacute,62,Acirc,63,Atilde,64,Auml,65,Aring,66,AElig,67,Ccedil,68,Egrave,69,Eacute,6a,Ecirc,6b,Euml,6c,Igrave,6d,Iacute,6e,Icirc,6f,Iuml,6g,ETH,6h,Ntilde,6i,Ograve,6j,Oacute,6k,Ocirc,6l,Otilde,6m,Ouml,6n,times,6o,Oslash,6p,Ugrave,6q,Uacute,6r,Ucirc,6s,Uuml,6t,Yacute,6u,THORN,6v,szlig,70,agrave,71,aacute,72,acirc,73,atilde,74,auml,75,aring,76,aelig,77,ccedil,78,egrave,79,eacute,7a,ecirc,7b,euml,7c,igrave,7d,iacute,7e,icirc,7f,iuml,7g,eth,7h,ntilde,7i,ograve,7j,oacute,7k,ocirc,7l,otilde,7m,ouml,7n,divide,7o,oslash,7p,ugrave,7q,uacute,7r,ucirc,7s,uuml,7t,yacute,7u,thorn,7v,yuml,ci,fnof,sh,Alpha,si,Beta,sj,Gamma,sk,Delta,sl,Epsilon,sm,Zeta,sn,Eta,so,Theta,sp,Iota,sq,Kappa,sr,Lambda,ss,Mu,st,Nu,su,Xi,sv,Omicron,t0,Pi,t1,Rho,t3,Sigma,t4,Tau,t5,Upsilon,t6,Phi,t7,Chi,t8,Psi,t9,Omega,th,alpha,ti,beta,tj,gamma,tk,delta,tl,epsilon,tm,zeta,tn,eta,to,theta,tp,iota,tq,kappa,tr,lambda,ts,mu,tt,nu,tu,xi,tv,omicron,u0,pi,u1,rho,u2,sigmaf,u3,sigma,u4,tau,u5,upsilon,u6,phi,u7,chi,u8,psi,u9,omega,uh,thetasym,ui,upsih,um,piv,812,bull,816,hellip,81i,prime,81j,Prime,81u,oline,824,frasl,88o,weierp,88h,image,88s,real,892,trade,89l,alefsym,8cg,larr,8ch,uarr,8ci,rarr,8cj,darr,8ck,harr,8dl,crarr,8eg,lArr,8eh,uArr,8ei,rArr,8ej,dArr,8ek,hArr,8g0,forall,8g2,part,8g3,exist,8g5,empty,8g7,nabla,8g8,isin,8g9,notin,8gb,ni,8gf,prod,8gh,sum,8gi,minus,8gn,lowast,8gq,radic,8gt,prop,8gu,infin,8h0,ang,8h7,and,8h8,or,8h9,cap,8ha,cup,8hb,int,8hk,there4,8hs,sim,8i5,cong,8i8,asymp,8j0,ne,8j1,equiv,8j4,le,8j5,ge,8k2,sub,8k3,sup,8k4,nsub,8k6,sube,8k7,supe,8kl,oplus,8kn,otimes,8l5,perp,8m5,sdot,8o8,lceil,8o9,rceil,8oa,lfloor,8ob,rfloor,8p9,lang,8pa,rang,9ea,loz,9j0,spades,9j3,clubs,9j5,hearts,9j6,diams,ai,OElig,aj,oelig,b0,Scaron,b1,scaron,bo,Yuml,m6,circ,ms,tilde,802,ensp,803,emsp,809,thinsp,80c,zwnj,80d,zwj,80e,lrm,80f,rlm,80j,ndash,80k,mdash,80o,lsquo,80p,rsquo,80q,sbquo,80s,ldquo,80t,rdquo,80u,bdquo,810,dagger,811,Dagger,81g,permil,81p,lsaquo,81q,rsaquo,85c,euro",32);j.html=j.html||{};j.html.Entities={encodeRaw:function(m,l){return m.replace(l?k:b,function(n){return g[n]||n})},encodeAllRaw:function(l){return(""+l).replace(f,function(m){return g[m]||m})},encodeNumeric:function(m,l){return m.replace(l?k:b,function(n){if(n.length>1){return"&#"+(((n.charCodeAt(0)-55296)*1024)+(n.charCodeAt(1)-56320)+65536)+";"}return g[n]||"&#"+n.charCodeAt(0)+";"})},encodeNamed:function(n,l,m){m=m||a;return n.replace(l?k:b,function(o){return g[o]||m[o]||o})},getEncodeFunc:function(l,o){var p=j.html.Entities;o=e(o)||a;function m(r,q){return r.replace(q?k:b,function(s){return g[s]||o[s]||"&#"+s.charCodeAt(0)+";"||s})}function n(r,q){return p.encodeNamed(r,q,o)}l=j.makeMap(l.replace(/\+/g,","));if(l.named&&l.numeric){return m}if(l.named){if(o){return n}return p.encodeNamed}if(l.numeric){return p.encodeNumeric}return p.encodeRaw},decode:function(l){return l.replace(c,function(n,m,o){if(m){o=parseInt(o,m.length===2?16:10);if(o>65535){o-=65536;return String.fromCharCode(55296+(o>>10),56320+(o&1023))}else{return i[o]||String.fromCharCode(o)}}return d[n]||a[n]||h(n)})}}})(tinymce);tinymce.html.Styles=function(d,f){var k=/rgb\s*\(\s*([0-9]+)\s*,\s*([0-9]+)\s*,\s*([0-9]+)\s*\)/gi,h=/(?:url(?:(?:\(\s*\"([^\"]+)\"\s*\))|(?:\(\s*\'([^\']+)\'\s*\))|(?:\(\s*([^)\s]+)\s*\))))|(?:\'([^\']+)\')|(?:\"([^\"]+)\")/gi,b=/\s*([^:]+):\s*([^;]+);?/g,l=/\s+$/,m=/rgb/,e,g,a={},j;d=d||{};j="\\\" \\' \\; \\: ; : \uFEFF".split(" ");for(g=0;g<j.length;g++){a[j[g]]="\uFEFF"+g;a["\uFEFF"+g]=j[g]}function c(n,q,p,i){function o(r){r=parseInt(r).toString(16);return r.length>1?r:"0"+r}return"#"+o(q)+o(p)+o(i)}return{toHex:function(i){return i.replace(k,c)},parse:function(r){var y={},p,n,v,q,u=d.url_converter,x=d.url_converter_scope||this;function o(C,F){var E,B,A,D;E=y[C+"-top"+F];if(!E){return}B=y[C+"-right"+F];if(E!=B){return}A=y[C+"-bottom"+F];if(B!=A){return}D=y[C+"-left"+F];if(A!=D){return}y[C+F]=D;delete y[C+"-top"+F];delete y[C+"-right"+F];delete y[C+"-bottom"+F];delete y[C+"-left"+F]}function t(B){var C=y[B],A;if(!C||C.indexOf(" ")<0){return}C=C.split(" ");A=C.length;while(A--){if(C[A]!==C[0]){return false}}y[B]=C[0];return true}function z(C,B,A,D){if(!t(B)){return}if(!t(A)){return}if(!t(D)){return}y[C]=y[B]+" "+y[A]+" "+y[D];delete y[B];delete y[A];delete y[D]}function s(A){q=true;return a[A]}function i(B,A){if(q){B=B.replace(/\uFEFF[0-9]/g,function(C){return a[C]})}if(!A){B=B.replace(/\\([\'\";:])/g,"$1")}return B}if(r){r=r.replace(/\\[\"\';:\uFEFF]/g,s).replace(/\"[^\"]+\"|\'[^\']+\'/g,function(A){return A.replace(/[;:]/g,s)});while(p=b.exec(r)){n=p[1].replace(l,"").toLowerCase();v=p[2].replace(l,"");if(n&&v.length>0){if(n==="font-weight"&&v==="700"){v="bold"}else{if(n==="color"||n==="background-color"){v=v.toLowerCase()}}v=v.replace(k,c);v=v.replace(h,function(B,A,E,D,F,C){F=F||C;if(F){F=i(F);return"'"+F.replace(/\'/g,"\\'")+"'"}A=i(A||E||D);if(u){A=u.call(x,A,"style")}return"url('"+A.replace(/\'/g,"\\'")+"')"});y[n]=q?i(v,true):v}b.lastIndex=p.index+p[0].length}o("border","");o("border","-width");o("border","-color");o("border","-style");o("padding","");o("margin","");z("border","border-width","border-style","border-color");if(y.border==="medium none"){delete y.border}}return y},serialize:function(p,r){var o="",n,q;function i(t){var x,u,s,v;x=f.styles[t];if(x){for(u=0,s=x.length;u<s;u++){t=x[u];v=p[t];if(v!==e&&v.length>0){o+=(o.length>0?" ":"")+t+": "+v+";"}}}}if(r&&f&&f.styles){i("*");i(r)}else{for(n in p){q=p[n];if(q!==e&&q.length>0){o+=(o.length>0?" ":"")+n+": "+q+";"}}}return o}}};(function(m){var h={},j,l,g,f,c={},b,e,d=m.makeMap,k=m.each;function i(o,n){return o.split(n||",")}function a(r,q){var o,p={};function n(s){return s.replace(/[A-Z]+/g,function(t){return n(r[t])})}for(o in r){if(r.hasOwnProperty(o)){r[o]=n(r[o])}}n(q).replace(/#/g,"#text").replace(/(\w+)\[([^\]]+)\]\[([^\]]*)\]/g,function(v,t,s,u){s=i(s,"|");p[t]={attributes:d(s),attributesOrder:s,children:d(u,"|",{"#comment":{}})}});return p}l="h1,h2,h3,h4,h5,h6,hr,p,div,address,pre,form,table,tbody,thead,tfoot,th,tr,td,li,ol,ul,caption,blockquote,center,dl,dt,dd,dir,fieldset,noscript,menu,isindex,samp,header,footer,article,section,hgroup";l=d(l,",",d(l.toUpperCase()));h=a({Z:"H|K|N|O|P",Y:"X|form|R|Q",ZG:"E|span|width|align|char|charoff|valign",X:"p|T|div|U|W|isindex|fieldset|table",ZF:"E|align|char|charoff|valign",W:"pre|hr|blockquote|address|center|noframes",ZE:"abbr|axis|headers|scope|rowspan|colspan|align|char|charoff|valign|nowrap|bgcolor|width|height",ZD:"[E][S]",U:"ul|ol|dl|menu|dir",ZC:"p|Y|div|U|W|table|br|span|bdo|object|applet|img|map|K|N|Q",T:"h1|h2|h3|h4|h5|h6",ZB:"X|S|Q",S:"R|P",ZA:"a|G|J|M|O|P",R:"a|H|K|N|O",Q:"noscript|P",P:"ins|del|script",O:"input|select|textarea|label|button",N:"M|L",M:"em|strong|dfn|code|q|samp|kbd|var|cite|abbr|acronym",L:"sub|sup",K:"J|I",J:"tt|i|b|u|s|strike",I:"big|small|font|basefont",H:"G|F",G:"br|span|bdo",F:"object|applet|img|map|iframe",E:"A|B|C",D:"accesskey|tabindex|onfocus|onblur",C:"onclick|ondblclick|onmousedown|onmouseup|onmouseover|onmousemove|onmouseout|onkeypress|onkeydown|onkeyup",B:"lang|xml:lang|dir",A:"id|class|style|title"},"script[id|charset|type|language|src|defer|xml:space][]style[B|id|type|media|title|xml:space][]object[E|declare|classid|codebase|data|type|codetype|archive|standby|width|height|usemap|name|tabindex|align|border|hspace|vspace][#|param|Y]param[id|name|value|valuetype|type][]p[E|align][#|S]a[E|D|charset|type|name|href|hreflang|rel|rev|shape|coords|target][#|Z]br[A|clear][]span[E][#|S]bdo[A|C|B][#|S]applet[A|codebase|archive|code|object|alt|name|width|height|align|hspace|vspace][#|param|Y]h1[E|align][#|S]img[E|src|alt|name|longdesc|width|height|usemap|ismap|align|border|hspace|vspace][]map[B|C|A|name][X|form|Q|area]h2[E|align][#|S]iframe[A|longdesc|name|src|frameborder|marginwidth|marginheight|scrolling|align|width|height][#|Y]h3[E|align][#|S]tt[E][#|S]i[E][#|S]b[E][#|S]u[E][#|S]s[E][#|S]strike[E][#|S]big[E][#|S]small[E][#|S]font[A|B|size|color|face][#|S]basefont[id|size|color|face][]em[E][#|S]strong[E][#|S]dfn[E][#|S]code[E][#|S]q[E|cite][#|S]samp[E][#|S]kbd[E][#|S]var[E][#|S]cite[E][#|S]abbr[E][#|S]acronym[E][#|S]sub[E][#|S]sup[E][#|S]input[E|D|type|name|value|checked|disabled|readonly|size|maxlength|src|alt|usemap|onselect|onchange|accept|align][]select[E|name|size|multiple|disabled|tabindex|onfocus|onblur|onchange][optgroup|option]optgroup[E|disabled|label][option]option[E|selected|disabled|label|value][]textarea[E|D|name|rows|cols|disabled|readonly|onselect|onchange][]label[E|for|accesskey|onfocus|onblur][#|S]button[E|D|name|value|type|disabled][#|p|T|div|U|W|table|G|object|applet|img|map|K|N|Q]h4[E|align][#|S]ins[E|cite|datetime][#|Y]h5[E|align][#|S]del[E|cite|datetime][#|Y]h6[E|align][#|S]div[E|align][#|Y]ul[E|type|compact][li]li[E|type|value][#|Y]ol[E|type|compact|start][li]dl[E|compact][dt|dd]dt[E][#|S]dd[E][#|Y]menu[E|compact][li]dir[E|compact][li]pre[E|width|xml:space][#|ZA]hr[E|align|noshade|size|width][]blockquote[E|cite][#|Y]address[E][#|S|p]center[E][#|Y]noframes[E][#|Y]isindex[A|B|prompt][]fieldset[E][#|legend|Y]legend[E|accesskey|align][#|S]table[E|summary|width|border|frame|rules|cellspacing|cellpadding|align|bgcolor][caption|col|colgroup|thead|tfoot|tbody|tr]caption[E|align][#|S]col[ZG][]colgroup[ZG][col]thead[ZF][tr]tr[ZF|bgcolor][th|td]th[E|ZE][#|Y]form[E|action|method|name|enctype|onsubmit|onreset|accept|accept-charset|target][#|X|R|Q]noscript[E][#|Y]td[E|ZE][#|Y]tfoot[ZF][tr]tbody[ZF][tr]area[E|D|shape|coords|href|nohref|alt|target][]base[id|href|target][]body[E|onload|onunload|background|bgcolor|text|link|vlink|alink][#|Y]");j=d("checked,compact,declare,defer,disabled,ismap,multiple,nohref,noresize,noshade,nowrap,readonly,selected,preload,autoplay,loop,controls");g=d("area,base,basefont,br,col,frame,hr,img,input,isindex,link,meta,param,embed,source");f=m.extend(d("td,th,iframe,video,object"),g);b=d("pre,script,style");e=d("colgroup,dd,dt,li,options,p,td,tfoot,th,thead,tr");m.html.Schema=function(q){var y=this,n={},o={},v=[],p;q=q||{};if(q.verify_html===false){q.valid_elements="*[*]"}if(q.valid_styles){p={};k(q.valid_styles,function(A,z){p[z]=m.explode(A)})}function x(z){return new RegExp("^"+z.replace(/([?+*])/g,".$1")+"$")}function s(G){var F,B,U,Q,V,A,D,P,S,L,T,X,J,E,R,z,N,C,W,Y,K,O,I=/^([#+-])?([^\[\/]+)(?:\/([^\[]+))?(?:\[([^\]]+)\])?$/,M=/^([!\-])?(\w+::\w+|[^=:<]+)?(?:([=:<])(.*))?$/,H=/[*?+]/;if(G){G=i(G);if(n["@"]){N=n["@"].attributes;C=n["@"].attributesOrder}for(F=0,B=G.length;F<B;F++){A=I.exec(G[F]);if(A){R=A[1];L=A[2];z=A[3];S=A[4];J={};E=[];D={attributes:J,attributesOrder:E};if(R==="#"){D.paddEmpty=true}if(R==="-"){D.removeEmpty=true}if(N){for(Y in N){J[Y]=N[Y]}E.push.apply(E,C)}if(S){S=i(S,"|");for(U=0,Q=S.length;U<Q;U++){A=M.exec(S[U]);if(A){P={};X=A[1];T=A[2].replace(/::/g,":");R=A[3];O=A[4];if(X==="!"){D.attributesRequired=D.attributesRequired||[];D.attributesRequired.push(T);P.required=true}if(X==="-"){delete J[T];E.splice(m.inArray(E,T),1);continue}if(R){if(R==="="){D.attributesDefault=D.attributesDefault||[];D.attributesDefault.push({name:T,value:O});P.defaultValue=O}if(R===":"){D.attributesForced=D.attributesForced||[];D.attributesForced.push({name:T,value:O});P.forcedValue=O}if(R==="<"){P.validValues=d(O,"?")}}if(H.test(T)){D.attributePatterns=D.attributePatterns||[];P.pattern=x(T);D.attributePatterns.push(P)}else{if(!J[T]){E.push(T)}J[T]=P}}}}if(!N&&L=="@"){N=J;C=E}if(z){D.outputName=L;n[z]=D}if(H.test(L)){D.pattern=x(L);v.push(D)}else{n[L]=D}}}}}function u(z){n={};v=[];s(z);k(h,function(B,A){o[A]=B.children})}function r(A){var z=/^(~)?(.+)$/;if(A){k(i(A),function(E){var C=z.exec(E),D=C[1]==="~",F=D?"span":"div",B=C[2];o[B]=o[F];c[B]=F;if(!D){l[B]={}}k(o,function(G,H){if(G[F]){G[B]=G[F]}})})}}function t(A){var z=/^([+\-]?)(\w+)\[([^\]]+)\]$/;if(A){k(i(A),function(E){var D=z.exec(E),B,C;if(D){C=D[1];if(C){B=o[D[2]]}else{B=o[D[2]]={"#comment":{}}}B=o[D[2]];k(i(D[3],"|"),function(F){if(C==="-"){delete B[F]}else{B[F]={}}})}})}}if(!q.valid_elements){k(h,function(A,z){n[z]={attributes:A.attributes,attributesOrder:A.attributesOrder};o[z]=A.children});k(i("strong/b,em/i"),function(z){z=i(z,"/");n[z[1]].outputName=z[0]});n.img.attributesDefault=[{name:"alt",value:""}];k(i("ol,ul,sub,sup,blockquote,span,font,a,table,tbody,tr"),function(z){n[z].removeEmpty=true});k(i("p,h1,h2,h3,h4,h5,h6,th,td,pre,div,address,caption"),function(z){n[z].paddEmpty=true})}else{u(q.valid_elements)}r(q.custom_elements);t(q.valid_children);s(q.extended_valid_elements);t("+ol[ul|ol],+ul[ul|ol]");if(q.invalid_elements){m.each(m.explode(q.invalid_elements),function(z){if(n[z]){delete n[z]}})}y.children=o;y.styles=p;y.getBoolAttrs=function(){return j};y.getBlockElements=function(){return l};y.getShortEndedElements=function(){return g};y.getSelfClosingElements=function(){return e};y.getNonEmptyElements=function(){return f};y.getWhiteSpaceElements=function(){return b};y.isValidChild=function(z,B){var A=o[z];return !!(A&&A[B])};y.getElementRule=function(z){var B=n[z],A;if(B){return B}A=v.length;while(A--){B=v[A];if(B.pattern.test(z)){return B}}};y.getCustomElements=function(){return c};y.addValidElements=s;y.setValidElements=u;y.addCustomElements=r;y.addValidChildren=t};m.html.Schema.boolAttrMap=j;m.html.Schema.blockElementsMap=l})(tinymce);(function(a){a.html.SaxParser=function(c,e){var b=this,d=function(){};c=c||{};b.schema=e=e||new a.html.Schema();if(c.fix_self_closing!==false){c.fix_self_closing=true}a.each("comment cdata text start end pi doctype".split(" "),function(f){if(f){b[f]=c[f]||d}});b.parse=function(q){var A=this,f,m=0,G,j,l=[],B,K,t,N,F,k,p,x,I,r,E,o,J,n,H,M,L,z,D,h,g,u,s=0,v=a.html.Entities.decode,y;function C(O){var Q,P;Q=l.length;while(Q--){if(l[Q].name===O){break}}if(Q>=0){for(P=l.length-1;P>=Q;P--){O=l[P];if(O.valid){A.end(O.name)}}l.length=Q}}D=new RegExp("<(?:(?:!--([\\w\\W]*?)-->)|(?:!\\[CDATA\\[([\\w\\W]*?)\\]\\]>)|(?:!DOCTYPE([\\w\\W]*?)>)|(?:\\?([^\\s\\/<>]+) ?([\\w\\W]*?)[?/]>)|(?:\\/([^>]+)>)|(?:([^\\s\\/<>]+)\\s*((?:[^\"'>]+(?:(?:\"[^\"]*\")|(?:'[^']*')|[^>]*))*)>))","g");h=/([\w:\-]+)(?:\s*=\s*(?:(?:\"((?:\\.|[^\"])*)\")|(?:\'((?:\\.|[^\'])*)\')|([^>\s]+)))?/g;g={script:/<\/script[^>]*>/gi,style:/<\/style[^>]*>/gi,noscript:/<\/noscript[^>]*>/gi};F=e.getShortEndedElements();z=e.getSelfClosingElements();k=e.getBoolAttrs();x=c.validate;y=c.fix_self_closing;while(f=D.exec(q)){if(m<f.index){A.text(v(q.substr(m,f.index-m)))}if(G=f[6]){C(G.toLowerCase())}else{if(G=f[7]){G=G.toLowerCase();p=G in F;if(y&&z[G]&&l.length>0&&l[l.length-1].name===G){C(G)}if(!x||(I=e.getElementRule(G))){r=true;if(x){J=I.attributes;n=I.attributePatterns}if(o=f[8]){B=[];B.map={};o.replace(h,function(P,O,T,S,R){var U,Q;O=O.toLowerCase();T=O in k?O:v(T||S||R||"");if(x&&O.indexOf("data-")!==0){U=J[O];if(!U&&n){Q=n.length;while(Q--){U=n[Q];if(U.pattern.test(O)){break}}if(Q===-1){U=null}}if(!U){return}if(U.validValues&&!(T in U.validValues)){return}}B.map[O]=T;B.push({name:O,value:T})})}else{B=[];B.map={}}if(x){H=I.attributesRequired;M=I.attributesDefault;L=I.attributesForced;if(L){K=L.length;while(K--){E=L[K];N=E.name;u=E.value;if(u==="{$uid}"){u="mce_"+s++}B.map[N]=u;B.push({name:N,value:u})}}if(M){K=M.length;while(K--){E=M[K];N=E.name;if(!(N in B.map)){u=E.value;if(u==="{$uid}"){u="mce_"+s++}B.map[N]=u;B.push({name:N,value:u})}}}if(H){K=H.length;while(K--){if(H[K] in B.map){break}}if(K===-1){r=false}}if(B.map["data-mce-bogus"]){r=false}}if(r){A.start(G,B,p)}}else{r=false}if(j=g[G]){j.lastIndex=m=f.index+f[0].length;if(f=j.exec(q)){if(r){t=q.substr(m,f.index-m)}m=f.index+f[0].length}else{t=q.substr(m);m=q.length}if(r&&t.length>0){A.text(t,true)}if(r){A.end(G)}D.lastIndex=m;continue}if(!p){if(!o||o.indexOf("/")!=o.length-1){l.push({name:G,valid:r})}else{if(r){A.end(G)}}}}else{if(G=f[1]){A.comment(G)}else{if(G=f[2]){A.cdata(G)}else{if(G=f[3]){A.doctype(G)}else{if(G=f[4]){A.pi(G,f[5])}}}}}}m=f.index+f[0].length}if(m<q.length){A.text(v(q.substr(m)))}for(K=l.length-1;K>=0;K--){G=l[K];if(G.valid){A.end(G.name)}}}}})(tinymce);(function(d){var c=/^[ \t\r\n]*$/,e={"#text":3,"#comment":8,"#cdata":4,"#pi":7,"#doctype":10,"#document-fragment":11};function a(k,l,j){var i,h,f=j?"lastChild":"firstChild",g=j?"prev":"next";if(k[f]){return k[f]}if(k!==l){i=k[g];if(i){return i}for(h=k.parent;h&&h!==l;h=h.parent){i=h[g];if(i){return i}}}}function b(f,g){this.name=f;this.type=g;if(g===1){this.attributes=[];this.attributes.map={}}}d.extend(b.prototype,{replace:function(g){var f=this;if(g.parent){g.remove()}f.insert(g,f);f.remove();return f},attr:function(h,l){var f=this,g,j,k;if(typeof h!=="string"){for(j in h){f.attr(j,h[j])}return f}if(g=f.attributes){if(l!==k){if(l===null){if(h in g.map){delete g.map[h];j=g.length;while(j--){if(g[j].name===h){g=g.splice(j,1);return f}}}return f}if(h in g.map){j=g.length;while(j--){if(g[j].name===h){g[j].value=l;break}}}else{g.push({name:h,value:l})}g.map[h]=l;return f}else{return g.map[h]}}},clone:function(){var g=this,n=new b(g.name,g.type),h,f,m,j,k;if(m=g.attributes){k=[];k.map={};for(h=0,f=m.length;h<f;h++){j=m[h];if(j.name!=="id"){k[k.length]={name:j.name,value:j.value};k.map[j.name]=j.value}}n.attributes=k}n.value=g.value;n.shortEnded=g.shortEnded;return n},wrap:function(g){var f=this;f.parent.insert(g,f);g.append(f);return f},unwrap:function(){var f=this,h,g;for(h=f.firstChild;h;){g=h.next;f.insert(h,f,true);h=g}f.remove()},remove:function(){var f=this,h=f.parent,g=f.next,i=f.prev;if(h){if(h.firstChild===f){h.firstChild=g;if(g){g.prev=null}}else{i.next=g}if(h.lastChild===f){h.lastChild=i;if(i){i.next=null}}else{g.prev=i}f.parent=f.next=f.prev=null}return f},append:function(h){var f=this,g;if(h.parent){h.remove()}g=f.lastChild;if(g){g.next=h;h.prev=g;f.lastChild=h}else{f.lastChild=f.firstChild=h}h.parent=f;return h},insert:function(h,f,i){var g;if(h.parent){h.remove()}g=f.parent||this;if(i){if(f===g.firstChild){g.firstChild=h}else{f.prev.next=h}h.prev=f.prev;h.next=f;f.prev=h}else{if(f===g.lastChild){g.lastChild=h}else{f.next.prev=h}h.next=f.next;h.prev=f;f.next=h}h.parent=g;return h},getAll:function(g){var f=this,h,i=[];for(h=f.firstChild;h;h=a(h,f)){if(h.name===g){i.push(h)}}return i},empty:function(){var g=this,f,h,j;if(g.firstChild){f=[];for(j=g.firstChild;j;j=a(j,g)){f.push(j)}h=f.length;while(h--){j=f[h];j.parent=j.firstChild=j.lastChild=j.next=j.prev=null}}g.firstChild=g.lastChild=null;return g},isEmpty:function(k){var f=this,j=f.firstChild,h,g;if(j){do{if(j.type===1){if(j.attributes.map["data-mce-bogus"]){continue}if(k[j.name]){return false}h=j.attributes.length;while(h--){g=j.attributes[h].name;if(g==="name"||g.indexOf("data-")===0){return false}}}if((j.type===3&&!c.test(j.value))){return false}}while(j=a(j,f))}return true},walk:function(f){return a(this,null,f)}});d.extend(b,{create:function(g,f){var i,h;i=new b(g,e[g]||1);if(f){for(h in f){i.attr(h,f[h])}}return i}});d.html.Node=b})(tinymce);(function(b){var a=b.html.Node;b.html.DomParser=function(g,h){var f=this,e={},d=[],i={},c={};g=g||{};g.validate="validate" in g?g.validate:true;g.root_name=g.root_name||"body";f.schema=h=h||new b.html.Schema();function j(m){var o,p,x,v,z,n,q,l,t,u,k,s,y,r;s=b.makeMap("tr,td,th,tbody,thead,tfoot,table");k=h.getNonEmptyElements();for(o=0;o<m.length;o++){p=m[o];if(!p.parent){continue}v=[p];for(x=p.parent;x&&!h.isValidChild(x.name,p.name)&&!s[x.name];x=x.parent){v.push(x)}if(x&&v.length>1){v.reverse();z=n=f.filterNode(v[0].clone());for(t=0;t<v.length-1;t++){if(h.isValidChild(n.name,v[t].name)){q=f.filterNode(v[t].clone());n.append(q)}else{q=n}for(l=v[t].firstChild;l&&l!=v[t+1];){r=l.next;q.append(l);l=r}n=q}if(!z.isEmpty(k)){x.insert(z,v[0],true);x.insert(p,z)}else{x.insert(p,v[0],true)}x=v[0];if(x.isEmpty(k)||x.firstChild===x.lastChild&&x.firstChild.name==="br"){x.empty().remove()}}else{if(p.parent){if(p.name==="li"){y=p.prev;if(y&&(y.name==="ul"||y.name==="ul")){y.append(p);continue}y=p.next;if(y&&(y.name==="ul"||y.name==="ul")){y.insert(p,y.firstChild,true);continue}p.wrap(f.filterNode(new a("ul",1)));continue}if(h.isValidChild(p.parent.name,"div")&&h.isValidChild("div",p.name)){p.wrap(f.filterNode(new a("div",1)))}else{if(p.name==="style"||p.name==="script"){p.empty().remove()}else{p.unwrap()}}}}}}f.filterNode=function(m){var l,k,n;if(k in e){n=i[k];if(n){n.push(m)}else{i[k]=[m]}}l=d.length;while(l--){k=d[l].name;if(k in m.attributes.map){n=c[k];if(n){n.push(m)}else{c[k]=[m]}}}return m};f.addNodeFilter=function(k,l){b.each(b.explode(k),function(m){var n=e[m];if(!n){e[m]=n=[]}n.push(l)})};f.addAttributeFilter=function(k,l){b.each(b.explode(k),function(m){var n;for(n=0;n<d.length;n++){if(d[n].name===m){d[n].callbacks.push(l);return}}d.push({name:m,callbacks:[l]})})};f.parse=function(v,m){var n,H,A,z,C,B,x,r,E,K,y,o,D,J=[],t,k,s,p,u,q;m=m||{};i={};c={};o=b.extend(b.makeMap("script,style,head,html,body,title,meta,param"),h.getBlockElements());u=h.getNonEmptyElements();p=h.children;y=g.validate;q="forced_root_block" in m?m.forced_root_block:g.forced_root_block;s=h.getWhiteSpaceElements();D=/^[ \t\r\n]+/;t=/[ \t\r\n]+$/;k=/[ \t\r\n]+/g;function F(){var L=H.firstChild,l,M;while(L){l=L.next;if(L.type==3||(L.type==1&&L.name!=="p"&&!o[L.name]&&!L.attr("data-mce-type"))){if(!M){M=I(q,1);H.insert(M,L);M.append(L)}else{M.append(L)}}else{M=null}L=l}}function I(l,L){var M=new a(l,L),N;if(l in e){N=i[l];if(N){N.push(M)}else{i[l]=[M]}}return M}function G(M){var N,l,L;for(N=M.prev;N&&N.type===3;){l=N.value.replace(t,"");if(l.length>0){N.value=l;N=N.prev}else{L=N.prev;N.remove();N=L}}}n=new b.html.SaxParser({validate:y,fix_self_closing:!y,cdata:function(l){A.append(I("#cdata",4)).value=l},text:function(M,l){var L;if(!s[A.name]){M=M.replace(k," ");if(A.lastChild&&o[A.lastChild.name]){M=M.replace(D,"")}}if(M.length!==0){L=I("#text",3);L.raw=!!l;A.append(L).value=M}},comment:function(l){A.append(I("#comment",8)).value=l},pi:function(l,L){A.append(I(l,7)).value=L;G(A)},doctype:function(L){var l;l=A.append(I("#doctype",10));l.value=L;G(A)},start:function(l,T,M){var R,O,N,L,P,U,S,Q;N=y?h.getElementRule(l):{};if(N){R=I(N.outputName||l,1);R.attributes=T;R.shortEnded=M;A.append(R);Q=p[A.name];if(Q&&p[R.name]&&!Q[R.name]){J.push(R)}O=d.length;while(O--){P=d[O].name;if(P in T.map){E=c[P];if(E){E.push(R)}else{c[P]=[R]}}}if(o[l]){G(R)}if(!M){A=R}}},end:function(l){var P,M,O,L,N;M=y?h.getElementRule(l):{};if(M){if(o[l]){if(!s[A.name]){for(P=A.firstChild;P&&P.type===3;){O=P.value.replace(D,"");if(O.length>0){P.value=O;P=P.next}else{L=P.next;P.remove();P=L}}for(P=A.lastChild;P&&P.type===3;){O=P.value.replace(t,"");if(O.length>0){P.value=O;P=P.prev}else{L=P.prev;P.remove();P=L}}}P=A.prev;if(P&&P.type===3){O=P.value.replace(D,"");if(O.length>0){P.value=O}else{P.remove()}}}if(M.removeEmpty||M.paddEmpty){if(A.isEmpty(u)){if(M.paddEmpty){A.empty().append(new a("#text","3")).value="\u00a0"}else{if(!A.attributes.map.name){N=A.parent;A.empty().remove();A=N;return}}}}A=A.parent}}},h);H=A=new a(m.context||g.root_name,11);n.parse(v);if(y&&J.length){if(!m.context){j(J)}else{m.invalid=true}}if(q&&H.name=="body"){F()}if(!m.invalid){for(K in i){E=e[K];z=i[K];x=z.length;while(x--){if(!z[x].parent){z.splice(x,1)}}for(C=0,B=E.length;C<B;C++){E[C](z,K,m)}}for(C=0,B=d.length;C<B;C++){E=d[C];if(E.name in c){z=c[E.name];x=z.length;while(x--){if(!z[x].parent){z.splice(x,1)}}for(x=0,r=E.callbacks.length;x<r;x++){E.callbacks[x](z,E.name,m)}}}}return H};if(g.remove_trailing_brs){f.addNodeFilter("br",function(n,m){var r,q=n.length,o,u=h.getBlockElements(),k=h.getNonEmptyElements(),s,p,t;u.body=1;for(r=0;r<q;r++){o=n[r];s=o.parent;if(u[o.parent.name]&&o===s.lastChild){p=o.prev;while(p){t=p.name;if(t!=="span"||p.attr("data-mce-type")!=="bookmark"){if(t!=="br"){break}if(t==="br"){o=null;break}}p=p.prev}if(o){o.remove();if(s.isEmpty(k)){elementRule=h.getElementRule(s.name);if(elementRule.removeEmpty){s.remove()}else{if(elementRule.paddEmpty){s.empty().append(new b.html.Node("#text",3)).value="\u00a0"}}}}}}})}}})(tinymce);tinymce.html.Writer=function(e){var c=[],a,b,d,f,g;e=e||{};a=e.indent;b=tinymce.makeMap(e.indent_before||"");d=tinymce.makeMap(e.indent_after||"");f=tinymce.html.Entities.getEncodeFunc(e.entity_encoding||"raw",e.entities);g=e.element_format=="html";return{start:function(m,k,p){var n,j,h,o;if(a&&b[m]&&c.length>0){o=c[c.length-1];if(o.length>0&&o!=="\n"){c.push("\n")}}c.push("<",m);if(k){for(n=0,j=k.length;n<j;n++){h=k[n];c.push(" ",h.name,'="',f(h.value,true),'"')}}if(!p||g){c[c.length]=">"}else{c[c.length]=" />"}if(p&&a&&d[m]&&c.length>0){o=c[c.length-1];if(o.length>0&&o!=="\n"){c.push("\n")}}},end:function(h){var i;c.push("</",h,">");if(a&&d[h]&&c.length>0){i=c[c.length-1];if(i.length>0&&i!=="\n"){c.push("\n")}}},text:function(i,h){if(i.length>0){c[c.length]=h?i:f(i)}},cdata:function(h){c.push("<![CDATA[",h,"]]>")},comment:function(h){c.push("<!--",h,"-->")},pi:function(h,i){if(i){c.push("<?",h," ",i,"?>")}else{c.push("<?",h,"?>")}if(a){c.push("\n")}},doctype:function(h){c.push("<!DOCTYPE",h,">",a?"\n":"")},reset:function(){c.length=0},getContent:function(){return c.join("").replace(/\n$/,"")}}};(function(a){a.html.Serializer=function(c,d){var b=this,e=new a.html.Writer(c);c=c||{};c.validate="validate" in c?c.validate:true;b.schema=d=d||new a.html.Schema();b.writer=e;b.serialize=function(h){var g,i;i=c.validate;g={3:function(k,j){e.text(k.value,k.raw)},8:function(j){e.comment(j.value)},7:function(j){e.pi(j.name,j.value)},10:function(j){e.doctype(j.value)},4:function(j){e.cdata(j.value)},11:function(j){if((j=j.firstChild)){do{f(j)}while(j=j.next)}}};e.reset();function f(k){var t=g[k.type],j,o,s,r,p,u,n,m,q;if(!t){j=k.name;o=k.shortEnded;s=k.attributes;if(i&&s&&s.length>1){u=[];u.map={};q=d.getElementRule(k.name);for(n=0,m=q.attributesOrder.length;n<m;n++){r=q.attributesOrder[n];if(r in s.map){p=s.map[r];u.map[r]=p;u.push({name:r,value:p})}}for(n=0,m=s.length;n<m;n++){r=s[n].name;if(!(r in u.map)){p=s.map[r];u.map[r]=p;u.push({name:r,value:p})}}s=u}e.start(k.name,s,o);if(!o){if((k=k.firstChild)){do{f(k)}while(k=k.next)}e.end(j)}}else{t(k)}}if(h.type==1&&!c.inner){f(h)}else{g[11](h)}return e.getContent()}}})(tinymce);(function(h){var f=h.each,e=h.is,d=h.isWebKit,b=h.isIE,c=h.html.Entities,a=/^([a-z0-9],?)+$/i,g=h.html.Schema.blockElementsMap,i=/^[ \t\r\n]*$/;h.create("tinymce.dom.DOMUtils",{doc:null,root:null,files:null,pixelStyles:/^(top|left|bottom|right|width|height|borderWidth)$/,props:{"for":"htmlFor","class":"className",className:"className",checked:"checked",disabled:"disabled",maxlength:"maxLength",readonly:"readOnly",selected:"selected",value:"value",id:"id",name:"name",type:"type"},DOMUtils:function(o,m){var l=this,j,k;l.doc=o;l.win=window;l.files={};l.cssFlicker=false;l.counter=0;l.stdMode=!h.isIE||o.documentMode>=8;l.boxModel=!h.isIE||o.compatMode=="CSS1Compat"||l.stdMode;l.hasOuterHTML="outerHTML" in o.createElement("a");l.settings=m=h.extend({keep_values:false,hex_colors:1},m);l.schema=m.schema;l.styles=new h.html.Styles({url_converter:m.url_converter,url_converter_scope:m.url_converter_scope},m.schema);if(h.isIE6){try{o.execCommand("BackgroundImageCache",false,true)}catch(n){l.cssFlicker=true}}if(b&&m.schema){("abbr article aside audio canvas details figcaption figure footer header hgroup mark menu meter nav output progress section summary time video").replace(/\w+/g,function(p){o.createElement(p)});for(k in m.schema.getCustomElements()){o.createElement(k)}}h.addUnload(l.destroy,l)},getRoot:function(){var j=this,k=j.settings;return(k&&j.get(k.root_element))||j.doc.body},getViewPort:function(k){var l,j;k=!k?this.win:k;l=k.document;j=this.boxModel?l.documentElement:l.body;return{x:k.pageXOffset||j.scrollLeft,y:k.pageYOffset||j.scrollTop,w:k.innerWidth||j.clientWidth,h:k.innerHeight||j.clientHeight}},getRect:function(m){var l,j=this,k;m=j.get(m);l=j.getPos(m);k=j.getSize(m);return{x:l.x,y:l.y,w:k.w,h:k.h}},getSize:function(m){var k=this,j,l;m=k.get(m);j=k.getStyle(m,"width");l=k.getStyle(m,"height");if(j.indexOf("px")===-1){j=0}if(l.indexOf("px")===-1){l=0}return{w:parseInt(j)||m.offsetWidth||m.clientWidth,h:parseInt(l)||m.offsetHeight||m.clientHeight}},getParent:function(l,k,j){return this.getParents(l,k,j,false)},getParents:function(u,p,l,s){var k=this,j,m=k.settings,q=[];u=k.get(u);s=s===undefined;if(m.strict_root){l=l||k.getRoot()}if(e(p,"string")){j=p;if(p==="*"){p=function(o){return o.nodeType==1}}else{p=function(o){return k.is(o,j)}}}while(u){if(u==l||!u.nodeType||u.nodeType===9){break}if(!p||p(u)){if(s){q.push(u)}else{return u}}u=u.parentNode}return s?q:null},get:function(j){var k;if(j&&this.doc&&typeof(j)=="string"){k=j;j=this.doc.getElementById(j);if(j&&j.id!==k){return this.doc.getElementsByName(k)[1]}}return j},getNext:function(k,j){return this._findSib(k,j,"nextSibling")},getPrev:function(k,j){return this._findSib(k,j,"previousSibling")},select:function(l,k){var j=this;return h.dom.Sizzle(l,j.get(k)||j.get(j.settings.root_element)||j.doc,[])},is:function(l,j){var k;if(l.length===undefined){if(j==="*"){return l.nodeType==1}if(a.test(j)){j=j.toLowerCase().split(/,/);l=l.nodeName.toLowerCase();for(k=j.length-1;k>=0;k--){if(j[k]==l){return true}}return false}}return h.dom.Sizzle.matches(j,l.nodeType?[l]:l).length>0},add:function(m,q,j,l,o){var k=this;return this.run(m,function(s){var r,n;r=e(q,"string")?k.doc.createElement(q):q;k.setAttribs(r,j);if(l){if(l.nodeType){r.appendChild(l)}else{k.setHTML(r,l)}}return !o?s.appendChild(r):r})},create:function(l,j,k){return this.add(this.doc.createElement(l),l,j,k,1)},createHTML:function(r,j,p){var q="",m=this,l;q+="<"+r;for(l in j){if(j.hasOwnProperty(l)){q+=" "+l+'="'+m.encode(j[l])+'"'}}if(typeof(p)!="undefined"){return q+">"+p+"</"+r+">"}return q+" />"},remove:function(j,k){return this.run(j,function(m){var n,l=m.parentNode;if(!l){return null}if(k){while(n=m.firstChild){if(!h.isIE||n.nodeType!==3||n.nodeValue){l.insertBefore(n,m)}else{m.removeChild(n)}}}return l.removeChild(m)})},setStyle:function(m,j,k){var l=this;return l.run(m,function(p){var o,n;o=p.style;j=j.replace(/-(\D)/g,function(r,q){return q.toUpperCase()});if(l.pixelStyles.test(j)&&(h.is(k,"number")||/^[\-0-9\.]+$/.test(k))){k+="px"}switch(j){case"opacity":if(b){o.filter=k===""?"":"alpha(opacity="+(k*100)+")";if(!m.currentStyle||!m.currentStyle.hasLayout){o.display="inline-block"}}o[j]=o["-moz-opacity"]=o["-khtml-opacity"]=k||"";break;case"float":b?o.styleFloat=k:o.cssFloat=k;break;default:o[j]=k||""}if(l.settings.update_styles){l.setAttrib(p,"data-mce-style")}})},getStyle:function(m,j,l){m=this.get(m);if(!m){return}if(this.doc.defaultView&&l){j=j.replace(/[A-Z]/g,function(n){return"-"+n});try{return this.doc.defaultView.getComputedStyle(m,null).getPropertyValue(j)}catch(k){return null}}j=j.replace(/-(\D)/g,function(o,n){return n.toUpperCase()});if(j=="float"){j=b?"styleFloat":"cssFloat"}if(m.currentStyle&&l){return m.currentStyle[j]}return m.style?m.style[j]:undefined},setStyles:function(m,n){var k=this,l=k.settings,j;j=l.update_styles;l.update_styles=0;f(n,function(o,p){k.setStyle(m,p,o)});l.update_styles=j;if(l.update_styles){k.setAttrib(m,l.cssText)}},removeAllAttribs:function(j){return this.run(j,function(m){var l,k=m.attributes;for(l=k.length-1;l>=0;l--){m.removeAttributeNode(k.item(l))}})},setAttrib:function(l,m,j){var k=this;if(!l||!m){return}if(k.settings.strict){m=m.toLowerCase()}return this.run(l,function(o){var n=k.settings;switch(m){case"style":if(!e(j,"string")){f(j,function(p,q){k.setStyle(o,q,p)});return}if(n.keep_values){if(j&&!k._isRes(j)){o.setAttribute("data-mce-style",j,2)}else{o.removeAttribute("data-mce-style",2)}}o.style.cssText=j;break;case"class":o.className=j||"";break;case"src":case"href":if(n.keep_values){if(n.url_converter){j=n.url_converter.call(n.url_converter_scope||k,j,m,o)}k.setAttrib(o,"data-mce-"+m,j,2)}break;case"shape":o.setAttribute("data-mce-style",j);break}if(e(j)&&j!==null&&j.length!==0){o.setAttribute(m,""+j,2)}else{o.removeAttribute(m,2)}})},setAttribs:function(k,l){var j=this;return this.run(k,function(m){f(l,function(o,p){j.setAttrib(m,p,o)})})},getAttrib:function(m,o,l){var j,k=this;m=k.get(m);if(!m||m.nodeType!==1){return false}if(!e(l)){l=""}if(/^(src|href|style|coords|shape)$/.test(o)){j=m.getAttribute("data-mce-"+o);if(j){return j}}if(b&&k.props[o]){j=m[k.props[o]];j=j&&j.nodeValue?j.nodeValue:j}if(!j){j=m.getAttribute(o,2)}if(/^(checked|compact|declare|defer|disabled|ismap|multiple|nohref|noshade|nowrap|readonly|selected)$/.test(o)){if(m[k.props[o]]===true&&j===""){return o}return j?o:""}if(m.nodeName==="FORM"&&m.getAttributeNode(o)){return m.getAttributeNode(o).nodeValue}if(o==="style"){j=j||m.style.cssText;if(j){j=k.serializeStyle(k.parseStyle(j),m.nodeName);if(k.settings.keep_values&&!k._isRes(j)){m.setAttribute("data-mce-style",j)}}}if(d&&o==="class"&&j){j=j.replace(/(apple|webkit)\-[a-z\-]+/gi,"")}if(b){switch(o){case"rowspan":case"colspan":if(j===1){j=""}break;case"size":if(j==="+0"||j===20||j===0){j=""}break;case"width":case"height":case"vspace":case"checked":case"disabled":case"readonly":if(j===0){j=""}break;case"hspace":if(j===-1){j=""}break;case"maxlength":case"tabindex":if(j===32768||j===2147483647||j==="32768"){j=""}break;case"multiple":case"compact":case"noshade":case"nowrap":if(j===65535){return o}return l;case"shape":j=j.toLowerCase();break;default:if(o.indexOf("on")===0&&j){j=h._replace(/^function\s+\w+\(\)\s+\{\s+(.*)\s+\}$/,"$1",""+j)}}}return(j!==undefined&&j!==null&&j!=="")?""+j:l},getPos:function(s,m){var k=this,j=0,q=0,o,p=k.doc,l;s=k.get(s);m=m||p.body;if(s){if(s.getBoundingClientRect){s=s.getBoundingClientRect();o=k.boxModel?p.documentElement:p.body;j=s.left+(p.documentElement.scrollLeft||p.body.scrollLeft)-o.clientTop;q=s.top+(p.documentElement.scrollTop||p.body.scrollTop)-o.clientLeft;return{x:j,y:q}}l=s;while(l&&l!=m&&l.nodeType){j+=l.offsetLeft||0;q+=l.offsetTop||0;l=l.offsetParent}l=s.parentNode;while(l&&l!=m&&l.nodeType){j-=l.scrollLeft||0;q-=l.scrollTop||0;l=l.parentNode}}return{x:j,y:q}},parseStyle:function(j){return this.styles.parse(j)},serializeStyle:function(k,j){return this.styles.serialize(k,j)},loadCSS:function(j){var l=this,m=l.doc,k;if(!j){j=""}k=l.select("head")[0];f(j.split(","),function(n){var o;if(l.files[n]){return}l.files[n]=true;o=l.create("link",{rel:"stylesheet",href:h._addVer(n)});if(b&&m.documentMode&&m.recalc){o.onload=function(){if(m.recalc){m.recalc()}o.onload=null}}k.appendChild(o)})},addClass:function(j,k){return this.run(j,function(l){var m;if(!k){return 0}if(this.hasClass(l,k)){return l.className}m=this.removeClass(l,k);return l.className=(m!=""?(m+" "):"")+k})},removeClass:function(l,m){var j=this,k;return j.run(l,function(o){var n;if(j.hasClass(o,m)){if(!k){k=new RegExp("(^|\\s+)"+m+"(\\s+|$)","g")}n=o.className.replace(k," ");n=h.trim(n!=" "?n:"");o.className=n;if(!n){o.removeAttribute("class");o.removeAttribute("className")}return n}return o.className})},hasClass:function(k,j){k=this.get(k);if(!k||!j){return false}return(" "+k.className+" ").indexOf(" "+j+" ")!==-1},show:function(j){return this.setStyle(j,"display","block")},hide:function(j){return this.setStyle(j,"display","none")},isHidden:function(j){j=this.get(j);return !j||j.style.display=="none"||this.getStyle(j,"display")=="none"},uniqueId:function(j){return(!j?"mce_":j)+(this.counter++)},setHTML:function(l,k){var j=this;return j.run(l,function(n){if(b){while(n.firstChild){n.removeChild(n.firstChild)}try{n.innerHTML="<br />"+k;n.removeChild(n.firstChild)}catch(m){n=j.create("div");n.innerHTML="<br />"+k;f(n.childNodes,function(p,o){if(o){n.appendChild(p)}})}}else{n.innerHTML=k}return k})},getOuterHTML:function(l){var k,j=this;l=j.get(l);if(!l){return null}if(l.nodeType===1&&j.hasOuterHTML){return l.outerHTML}k=(l.ownerDocument||j.doc).createElement("body");k.appendChild(l.cloneNode(true));return k.innerHTML},setOuterHTML:function(m,k,n){var j=this;function l(p,o,r){var s,q;q=r.createElement("body");q.innerHTML=o;s=q.lastChild;while(s){j.insertAfter(s.cloneNode(true),p);s=s.previousSibling}j.remove(p)}return this.run(m,function(p){p=j.get(p);if(p.nodeType==1){n=n||p.ownerDocument||j.doc;if(b){try{if(b&&p.nodeType==1){p.outerHTML=k}else{l(p,k,n)}}catch(o){l(p,k,n)}}else{l(p,k,n)}}})},decode:c.decode,encode:c.encodeAllRaw,insertAfter:function(j,k){k=this.get(k);return this.run(j,function(m){var l,n;l=k.parentNode;n=k.nextSibling;if(n){l.insertBefore(m,n)}else{l.appendChild(m)}return m})},isBlock:function(k){var j=k.nodeType;if(j){return !!(j===1&&g[k.nodeName])}return !!g[k]},replace:function(p,m,j){var l=this;if(e(m,"array")){p=p.cloneNode(true)}return l.run(m,function(k){if(j){f(h.grep(k.childNodes),function(n){p.appendChild(n)})}return k.parentNode.replaceChild(p,k)})},rename:function(m,j){var l=this,k;if(m.nodeName!=j.toUpperCase()){k=l.create(j);f(l.getAttribs(m),function(n){l.setAttrib(k,n.nodeName,l.getAttrib(m,n.nodeName))});l.replace(k,m,1)}return k||m},findCommonAncestor:function(l,j){var m=l,k;while(m){k=j;while(k&&m!=k){k=k.parentNode}if(m==k){break}m=m.parentNode}if(!m&&l.ownerDocument){return l.ownerDocument.documentElement}return m},toHex:function(j){var l=/^\s*rgb\s*?\(\s*?([0-9]+)\s*?,\s*?([0-9]+)\s*?,\s*?([0-9]+)\s*?\)\s*$/i.exec(j);function k(m){m=parseInt(m).toString(16);return m.length>1?m:"0"+m}if(l){j="#"+k(l[1])+k(l[2])+k(l[3]);return j}return j},getClasses:function(){var n=this,j=[],m,o={},p=n.settings.class_filter,l;if(n.classes){return n.classes}function q(r){f(r.imports,function(s){q(s)});f(r.cssRules||r.rules,function(s){switch(s.type||1){case 1:if(s.selectorText){f(s.selectorText.split(","),function(t){t=t.replace(/^\s*|\s*$|^\s\./g,"");if(/\.mce/.test(t)||!/\.[\w\-]+$/.test(t)){return}l=t;t=h._replace(/.*\.([a-z0-9_\-]+).*/i,"$1",t);if(p&&!(t=p(t,l))){return}if(!o[t]){j.push({"class":t});o[t]=1}})}break;case 3:q(s.styleSheet);break}})}try{f(n.doc.styleSheets,q)}catch(k){}if(j.length>0){n.classes=j}return j},run:function(m,l,k){var j=this,n;if(j.doc&&typeof(m)==="string"){m=j.get(m)}if(!m){return false}k=k||this;if(!m.nodeType&&(m.length||m.length===0)){n=[];f(m,function(p,o){if(p){if(typeof(p)=="string"){p=j.doc.getElementById(p)}n.push(l.call(k,p,o))}});return n}return l.call(k,m)},getAttribs:function(k){var j;k=this.get(k);if(!k){return[]}if(b){j=[];if(k.nodeName=="OBJECT"){return k.attributes}if(k.nodeName==="OPTION"&&this.getAttrib(k,"selected")){j.push({specified:1,nodeName:"selected"})}k.cloneNode(false).outerHTML.replace(/<\/?[\w:\-]+ ?|=[\"][^\"]+\"|=\'[^\']+\'|=[\w\-]+|>/gi,"").replace(/[\w:\-]+/gi,function(l){j.push({specified:1,nodeName:l})});return j}return k.attributes},isEmpty:function(o,p){var k=this,m,j,n,q,l;o=o.firstChild;if(o){q=new h.dom.TreeWalker(o);p=p||k.schema?k.schema.getNonEmptyElements():null;do{n=o.nodeType;if(n===1){if(o.getAttribute("data-mce-bogus")){continue}if(p&&p[o.nodeName.toLowerCase()]){return false}j=k.getAttribs(o);m=o.attributes.length;while(m--){l=o.attributes[m].nodeName;if(l==="name"||l.indexOf("data-")===0){return false}}}if((n===3&&!i.test(o.nodeValue))){return false}}while(o=q.next())}return true},destroy:function(k){var j=this;if(j.events){j.events.destroy()}j.win=j.doc=j.root=j.events=null;if(!k){h.removeUnload(j.destroy)}},createRng:function(){var j=this.doc;return j.createRange?j.createRange():new h.dom.Range(this)},nodeIndex:function(n,o){var j=0,l,m,k;if(n){for(l=n.nodeType,n=n.previousSibling,m=n;n;n=n.previousSibling){k=n.nodeType;if(o&&k==3){if(k==l||!n.nodeValue.length){continue}}j++;l=k}}return j},split:function(n,m,q){var s=this,j=s.createRng(),o,l,p;function k(v){var t,r=v.childNodes,u=v.nodeType;if(u==1&&v.getAttribute("data-mce-type")=="bookmark"){return}for(t=r.length-1;t>=0;t--){k(r[t])}if(u!=9){if(u==3&&v.nodeValue.length>0){if(!s.isBlock(v.parentNode)||h.trim(v.nodeValue).length>0){return}}else{if(u==1){r=v.childNodes;if(r.length==1&&r[0]&&r[0].nodeType==1&&r[0].getAttribute("data-mce-type")=="bookmark"){v.parentNode.insertBefore(r[0],v)}if(r.length||/^(br|hr|input|img)$/i.test(v.nodeName)){return}}}s.remove(v)}return v}if(n&&m){j.setStart(n.parentNode,s.nodeIndex(n));j.setEnd(m.parentNode,s.nodeIndex(m));o=j.extractContents();j=s.createRng();j.setStart(m.parentNode,s.nodeIndex(m)+1);j.setEnd(n.parentNode,s.nodeIndex(n)+1);l=j.extractContents();p=n.parentNode;p.insertBefore(k(o),n);if(q){p.replaceChild(q,m)}else{p.insertBefore(m,n)}p.insertBefore(k(l),n);s.remove(n);return q||m}},bind:function(n,j,m,l){var k=this;if(!k.events){k.events=new h.dom.EventUtils()}return k.events.add(n,j,m,l||this)},unbind:function(m,j,l){var k=this;if(!k.events){k.events=new h.dom.EventUtils()}return k.events.remove(m,j,l)},_findSib:function(m,j,k){var l=this,n=j;if(m){if(e(n,"string")){n=function(o){return l.is(o,j)}}for(m=m[k];m;m=m[k]){if(n(m)){return m}}}return null},_isRes:function(j){return/^(top|left|bottom|right|width|height)/i.test(j)||/;\s*(top|left|bottom|right|width|height)/i.test(j)}});h.DOM=new h.dom.DOMUtils(document,{process_html:0})})(tinymce);(function(a){function b(c){var N=this,e=c.doc,S=0,E=1,j=2,D=true,R=false,U="startOffset",h="startContainer",P="endContainer",z="endOffset",k=tinymce.extend,n=c.nodeIndex;k(N,{startContainer:e,startOffset:0,endContainer:e,endOffset:0,collapsed:D,commonAncestorContainer:e,START_TO_START:0,START_TO_END:1,END_TO_END:2,END_TO_START:3,setStart:q,setEnd:s,setStartBefore:g,setStartAfter:I,setEndBefore:J,setEndAfter:u,collapse:A,selectNode:x,selectNodeContents:F,compareBoundaryPoints:v,deleteContents:p,extractContents:H,cloneContents:d,insertNode:C,surroundContents:M,cloneRange:K});function q(V,t){B(D,V,t)}function s(V,t){B(R,V,t)}function g(t){q(t.parentNode,n(t))}function I(t){q(t.parentNode,n(t)+1)}function J(t){s(t.parentNode,n(t))}function u(t){s(t.parentNode,n(t)+1)}function A(t){if(t){N[P]=N[h];N[z]=N[U]}else{N[h]=N[P];N[U]=N[z]}N.collapsed=D}function x(t){g(t);u(t)}function F(t){q(t,0);s(t,t.nodeType===1?t.childNodes.length:t.nodeValue.length)}function v(Y,t){var ab=N[h],W=N[U],aa=N[P],V=N[z],Z=t.startContainer,ad=t.startOffset,X=t.endContainer,ac=t.endOffset;if(Y===0){return G(ab,W,Z,ad)}if(Y===1){return G(aa,V,Z,ad)}if(Y===2){return G(aa,V,X,ac)}if(Y===3){return G(ab,W,X,ac)}}function p(){m(j)}function H(){return m(S)}function d(){return m(E)}function C(Y){var V=this[h],t=this[U],X,W;if((V.nodeType===3||V.nodeType===4)&&V.nodeValue){if(!t){V.parentNode.insertBefore(Y,V)}else{if(t>=V.nodeValue.length){c.insertAfter(Y,V)}else{X=V.splitText(t);V.parentNode.insertBefore(Y,X)}}}else{if(V.childNodes.length>0){W=V.childNodes[t]}if(W){V.insertBefore(Y,W)}else{V.appendChild(Y)}}}function M(V){var t=N.extractContents();N.insertNode(V);V.appendChild(t);N.selectNode(V)}function K(){return k(new b(c),{startContainer:N[h],startOffset:N[U],endContainer:N[P],endOffset:N[z],collapsed:N.collapsed,commonAncestorContainer:N.commonAncestorContainer})}function O(t,V){var W;if(t.nodeType==3){return t}if(V<0){return t}W=t.firstChild;while(W&&V>0){--V;W=W.nextSibling}if(W){return W}return t}function l(){return(N[h]==N[P]&&N[U]==N[z])}function G(X,Z,V,Y){var aa,W,t,ab,ad,ac;if(X==V){if(Z==Y){return 0}if(Z<Y){return -1}return 1}aa=V;while(aa&&aa.parentNode!=X){aa=aa.parentNode}if(aa){W=0;t=X.firstChild;while(t!=aa&&W<Z){W++;t=t.nextSibling}if(Z<=W){return -1}return 1}aa=X;while(aa&&aa.parentNode!=V){aa=aa.parentNode}if(aa){W=0;t=V.firstChild;while(t!=aa&&W<Y){W++;t=t.nextSibling}if(W<Y){return -1}return 1}ab=c.findCommonAncestor(X,V);ad=X;while(ad&&ad.parentNode!=ab){ad=ad.parentNode}if(!ad){ad=ab}ac=V;while(ac&&ac.parentNode!=ab){ac=ac.parentNode}if(!ac){ac=ab}if(ad==ac){return 0}t=ab.firstChild;while(t){if(t==ad){return -1}if(t==ac){return 1}t=t.nextSibling}}function B(V,Y,X){var t,W;if(V){N[h]=Y;N[U]=X}else{N[P]=Y;N[z]=X}t=N[P];while(t.parentNode){t=t.parentNode}W=N[h];while(W.parentNode){W=W.parentNode}if(W==t){if(G(N[h],N[U],N[P],N[z])>0){N.collapse(V)}}else{N.collapse(V)}N.collapsed=l();N.commonAncestorContainer=c.findCommonAncestor(N[h],N[P])}function m(ab){var aa,X=0,ad=0,V,Z,W,Y,t,ac;if(N[h]==N[P]){return f(ab)}for(aa=N[P],V=aa.parentNode;V;aa=V,V=V.parentNode){if(V==N[h]){return r(aa,ab)}++X}for(aa=N[h],V=aa.parentNode;V;aa=V,V=V.parentNode){if(V==N[P]){return T(aa,ab)}++ad}Z=ad-X;W=N[h];while(Z>0){W=W.parentNode;Z--}Y=N[P];while(Z<0){Y=Y.parentNode;Z++}for(t=W.parentNode,ac=Y.parentNode;t!=ac;t=t.parentNode,ac=ac.parentNode){W=t;Y=ac}return o(W,Y,ab)}function f(Z){var ab,Y,X,aa,t,W,V;if(Z!=j){ab=e.createDocumentFragment()}if(N[U]==N[z]){return ab}if(N[h].nodeType==3){Y=N[h].nodeValue;X=Y.substring(N[U],N[z]);if(Z!=E){N[h].deleteData(N[U],N[z]-N[U]);N.collapse(D)}if(Z==j){return}ab.appendChild(e.createTextNode(X));return ab}aa=O(N[h],N[U]);t=N[z]-N[U];while(t>0){W=aa.nextSibling;V=y(aa,Z);if(ab){ab.appendChild(V)}--t;aa=W}if(Z!=E){N.collapse(D)}return ab}function r(ab,Y){var aa,Z,V,t,X,W;if(Y!=j){aa=e.createDocumentFragment()}Z=i(ab,Y);if(aa){aa.appendChild(Z)}V=n(ab);t=V-N[U];if(t<=0){if(Y!=E){N.setEndBefore(ab);N.collapse(R)}return aa}Z=ab.previousSibling;while(t>0){X=Z.previousSibling;W=y(Z,Y);if(aa){aa.insertBefore(W,aa.firstChild)}--t;Z=X}if(Y!=E){N.setEndBefore(ab);N.collapse(R)}return aa}function T(Z,Y){var ab,V,aa,t,X,W;if(Y!=j){ab=e.createDocumentFragment()}aa=Q(Z,Y);if(ab){ab.appendChild(aa)}V=n(Z);++V;t=N[z]-V;aa=Z.nextSibling;while(t>0){X=aa.nextSibling;W=y(aa,Y);if(ab){ab.appendChild(W)}--t;aa=X}if(Y!=E){N.setStartAfter(Z);N.collapse(D)}return ab}function o(Z,t,ac){var W,ae,Y,aa,ab,V,ad,X;if(ac!=j){ae=e.createDocumentFragment()}W=Q(Z,ac);if(ae){ae.appendChild(W)}Y=Z.parentNode;aa=n(Z);ab=n(t);++aa;V=ab-aa;ad=Z.nextSibling;while(V>0){X=ad.nextSibling;W=y(ad,ac);if(ae){ae.appendChild(W)}ad=X;--V}W=i(t,ac);if(ae){ae.appendChild(W)}if(ac!=E){N.setStartAfter(Z);N.collapse(D)}return ae}function i(aa,ab){var W=O(N[P],N[z]-1),ac,Z,Y,t,V,X=W!=N[P];if(W==aa){return L(W,X,R,ab)}ac=W.parentNode;Z=L(ac,R,R,ab);while(ac){while(W){Y=W.previousSibling;t=L(W,X,R,ab);if(ab!=j){Z.insertBefore(t,Z.firstChild)}X=D;W=Y}if(ac==aa){return Z}W=ac.previousSibling;ac=ac.parentNode;V=L(ac,R,R,ab);if(ab!=j){V.appendChild(Z)}Z=V}}function Q(aa,ab){var X=O(N[h],N[U]),Y=X!=N[h],ac,Z,W,t,V;if(X==aa){return L(X,Y,D,ab)}ac=X.parentNode;Z=L(ac,R,D,ab);while(ac){while(X){W=X.nextSibling;t=L(X,Y,D,ab);if(ab!=j){Z.appendChild(t)}Y=D;X=W}if(ac==aa){return Z}X=ac.nextSibling;ac=ac.parentNode;V=L(ac,R,D,ab);if(ab!=j){V.appendChild(Z)}Z=V}}function L(t,Y,ab,ac){var X,W,Z,V,aa;if(Y){return y(t,ac)}if(t.nodeType==3){X=t.nodeValue;if(ab){V=N[U];W=X.substring(V);Z=X.substring(0,V)}else{V=N[z];W=X.substring(0,V);Z=X.substring(V)}if(ac!=E){t.nodeValue=Z}if(ac==j){return}aa=t.cloneNode(R);aa.nodeValue=W;return aa}if(ac==j){return}return t.cloneNode(R)}function y(V,t){if(t!=j){return t==E?V.cloneNode(D):V}V.parentNode.removeChild(V)}}a.Range=b})(tinymce.dom);(function(){function a(d){var b=this,h=d.dom,c=true,f=false;function e(i,j){var k,t=0,q,n,m,l,o,r,p=-1,s;k=i.duplicate();k.collapse(j);s=k.parentElement();if(s.ownerDocument!==d.dom.doc){return}while(s.contentEditable==="false"){s=s.parentNode}if(!s.hasChildNodes()){return{node:s,inside:1}}m=s.children;q=m.length-1;while(t<=q){r=Math.floor((t+q)/2);l=m[r];k.moveToElementText(l);p=k.compareEndPoints(j?"StartToStart":"EndToEnd",i);if(p>0){q=r-1}else{if(p<0){t=r+1}else{return{node:l}}}}if(p<0){if(!l){k.moveToElementText(s);k.collapse(true);l=s;n=true}else{k.collapse(false)}k.setEndPoint(j?"EndToStart":"EndToEnd",i);if(k.compareEndPoints(j?"StartToStart":"StartToEnd",i)>0){k=i.duplicate();k.collapse(j);o=-1;while(s==k.parentElement()){if(k.move("character",-1)==0){break}o++}}o=o||k.text.replace("\r\n"," ").length}else{k.collapse(true);k.setEndPoint(j?"StartToStart":"StartToEnd",i);o=k.text.replace("\r\n"," ").length}return{node:l,position:p,offset:o,inside:n}}function g(){var i=d.getRng(),r=h.createRng(),l,k,p,q,m,j;l=i.item?i.item(0):i.parentElement();if(l.ownerDocument!=h.doc){return r}k=d.isCollapsed();if(i.item){r.setStart(l.parentNode,h.nodeIndex(l));r.setEnd(r.startContainer,r.startOffset+1);return r}function o(A){var u=e(i,A),s,y,z=0,x,v,t;s=u.node;y=u.offset;if(u.inside&&!s.hasChildNodes()){r[A?"setStart":"setEnd"](s,0);return}if(y===v){r[A?"setStartBefore":"setEndAfter"](s);return}if(u.position<0){x=u.inside?s.firstChild:s.nextSibling;if(!x){r[A?"setStartAfter":"setEndAfter"](s);return}if(!y){if(x.nodeType==3){r[A?"setStart":"setEnd"](x,0)}else{r[A?"setStartBefore":"setEndBefore"](x)}return}while(x){t=x.nodeValue;z+=t.length;if(z>=y){s=x;z-=y;z=t.length-z;break}x=x.nextSibling}}else{x=s.previousSibling;if(!x){return r[A?"setStartBefore":"setEndBefore"](s)}if(!y){if(s.nodeType==3){r[A?"setStart":"setEnd"](x,s.nodeValue.length)}else{r[A?"setStartAfter":"setEndAfter"](x)}return}while(x){z+=x.nodeValue.length;if(z>=y){s=x;z-=y;break}x=x.previousSibling}}r[A?"setStart":"setEnd"](s,z)}try{o(true);if(!k){o()}}catch(n){if(n.number==-2147024809){m=b.getBookmark(2);p=i.duplicate();p.collapse(true);l=p.parentElement();if(!k){p=i.duplicate();p.collapse(false);q=p.parentElement();q.innerHTML=q.innerHTML}l.innerHTML=l.innerHTML;b.moveToBookmark(m);i=d.getRng();o(true);if(!k){o()}}else{throw n}}return r}this.getBookmark=function(m){var j=d.getRng(),o,i,l={};function n(u){var u,t,p,s,r,q=[];t=u.parentNode;p=h.getRoot().parentNode;while(t!=p){s=t.children;r=s.length;while(r--){if(u===s[r]){q.push(r);break}}u=t;t=t.parentNode}return q}function k(q){var p;p=e(j,q);if(p){return{position:p.position,offset:p.offset,indexes:n(p.node),inside:p.inside}}}if(m===2){if(!j.item){l.start=k(true);if(!d.isCollapsed()){l.end=k()}}else{l.start={ctrl:true,indexes:n(j.item(0))}}}return l};this.moveToBookmark=function(k){var j,i=h.doc.body;function m(o){var r,q,n,p;r=h.getRoot();for(q=o.length-1;q>=0;q--){p=r.children;n=o[q];if(n<=p.length-1){r=p[n]}}return r}function l(r){var n=k[r?"start":"end"],q,p,o;if(n){q=n.position>0;p=i.createTextRange();p.moveToElementText(m(n.indexes));offset=n.offset;if(offset!==o){p.collapse(n.inside||q);p.moveStart("character",q?-offset:offset)}else{p.collapse(r)}j.setEndPoint(r?"StartToStart":"EndToStart",p);if(r){j.collapse(true)}}}if(k.start){if(k.start.ctrl){j=i.createControlRange();j.addElement(m(k.start.indexes));j.select()}else{j=i.createTextRange();l(true);l();j.select()}}};this.addRange=function(i){var n,l,k,p,s,q,r=d.dom.doc,m=r.body;function j(z){var u,y,t,x,v;t=h.create("a");u=z?k:s;y=z?p:q;x=n.duplicate();if(u==r||u==r.documentElement){u=m;y=0}if(u.nodeType==3){u.parentNode.insertBefore(t,u);x.moveToElementText(t);x.moveStart("character",y);h.remove(t);n.setEndPoint(z?"StartToStart":"EndToEnd",x)}else{v=u.childNodes;if(v.length){if(y>=v.length){h.insertAfter(t,v[v.length-1])}else{u.insertBefore(t,v[y])}x.moveToElementText(t)}else{t=r.createTextNode("\uFEFF");u.appendChild(t);x.moveToElementText(t.parentNode);x.collapse(c)}n.setEndPoint(z?"StartToStart":"EndToEnd",x);h.remove(t)}}k=i.startContainer;p=i.startOffset;s=i.endContainer;q=i.endOffset;n=m.createTextRange();if(k==s&&k.nodeType==1&&p==q-1){if(p==q-1){try{l=m.createControlRange();l.addElement(k.childNodes[p]);l.select();return}catch(o){}}}j(true);j();n.select()};this.getRangeAt=g}tinymce.dom.TridentSelection=a})();(function(){var p=/((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^\[\]]*\]|['"][^'"]*['"]|[^\[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,j=0,d=Object.prototype.toString,o=false,i=true;[0,0].sort(function(){i=false;return 0});var b=function(v,e,z,A){z=z||[];e=e||document;var C=e;if(e.nodeType!==1&&e.nodeType!==9){return[]}if(!v||typeof v!=="string"){return z}var x=[],s,E,H,r,u=true,t=b.isXML(e),B=v,D,G,F,y;do{p.exec("");s=p.exec(B);if(s){B=s[3];x.push(s[1]);if(s[2]){r=s[3];break}}}while(s);if(x.length>1&&k.exec(v)){if(x.length===2&&f.relative[x[0]]){E=h(x[0]+x[1],e)}else{E=f.relative[x[0]]?[e]:b(x.shift(),e);while(x.length){v=x.shift();if(f.relative[v]){v+=x.shift()}E=h(v,E)}}}else{if(!A&&x.length>1&&e.nodeType===9&&!t&&f.match.ID.test(x[0])&&!f.match.ID.test(x[x.length-1])){D=b.find(x.shift(),e,t);e=D.expr?b.filter(D.expr,D.set)[0]:D.set[0]}if(e){D=A?{expr:x.pop(),set:a(A)}:b.find(x.pop(),x.length===1&&(x[0]==="~"||x[0]==="+")&&e.parentNode?e.parentNode:e,t);E=D.expr?b.filter(D.expr,D.set):D.set;if(x.length>0){H=a(E)}else{u=false}while(x.length){G=x.pop();F=G;if(!f.relative[G]){G=""}else{F=x.pop()}if(F==null){F=e}f.relative[G](H,F,t)}}else{H=x=[]}}if(!H){H=E}if(!H){b.error(G||v)}if(d.call(H)==="[object Array]"){if(!u){z.push.apply(z,H)}else{if(e&&e.nodeType===1){for(y=0;H[y]!=null;y++){if(H[y]&&(H[y]===true||H[y].nodeType===1&&b.contains(e,H[y]))){z.push(E[y])}}}else{for(y=0;H[y]!=null;y++){if(H[y]&&H[y].nodeType===1){z.push(E[y])}}}}}else{a(H,z)}if(r){b(r,C,z,A);b.uniqueSort(z)}return z};b.uniqueSort=function(r){if(c){o=i;r.sort(c);if(o){for(var e=1;e<r.length;e++){if(r[e]===r[e-1]){r.splice(e--,1)}}}}return r};b.matches=function(e,r){return b(e,null,null,r)};b.find=function(y,e,z){var x;if(!y){return[]}for(var t=0,s=f.order.length;t<s;t++){var v=f.order[t],u;if((u=f.leftMatch[v].exec(y))){var r=u[1];u.splice(1,1);if(r.substr(r.length-1)!=="\\"){u[1]=(u[1]||"").replace(/\\/g,"");x=f.find[v](u,e,z);if(x!=null){y=y.replace(f.match[v],"");break}}}}if(!x){x=e.getElementsByTagName("*")}return{set:x,expr:y}};b.filter=function(C,B,F,u){var s=C,H=[],z=B,x,e,y=B&&B[0]&&b.isXML(B[0]);while(C&&B.length){for(var A in f.filter){if((x=f.leftMatch[A].exec(C))!=null&&x[2]){var r=f.filter[A],G,E,t=x[1];e=false;x.splice(1,1);if(t.substr(t.length-1)==="\\"){continue}if(z===H){H=[]}if(f.preFilter[A]){x=f.preFilter[A](x,z,F,H,u,y);if(!x){e=G=true}else{if(x===true){continue}}}if(x){for(var v=0;(E=z[v])!=null;v++){if(E){G=r(E,x,v,z);var D=u^!!G;if(F&&G!=null){if(D){e=true}else{z[v]=false}}else{if(D){H.push(E);e=true}}}}}if(G!==undefined){if(!F){z=H}C=C.replace(f.match[A],"");if(!e){return[]}break}}}if(C===s){if(e==null){b.error(C)}else{break}}s=C}return z};b.error=function(e){throw"Syntax error, unrecognized expression: "+e};var f=b.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\))?/},leftMatch:{},attrMap:{"class":"className","for":"htmlFor"},attrHandle:{href:function(e){return e.getAttribute("href")}},relative:{"+":function(x,r){var t=typeof r==="string",v=t&&!/\W/.test(r),y=t&&!v;if(v){r=r.toLowerCase()}for(var s=0,e=x.length,u;s<e;s++){if((u=x[s])){while((u=u.previousSibling)&&u.nodeType!==1){}x[s]=y||u&&u.nodeName.toLowerCase()===r?u||false:u===r}}if(y){b.filter(r,x,true)}},">":function(x,r){var u=typeof r==="string",v,s=0,e=x.length;if(u&&!/\W/.test(r)){r=r.toLowerCase();for(;s<e;s++){v=x[s];if(v){var t=v.parentNode;x[s]=t.nodeName.toLowerCase()===r?t:false}}}else{for(;s<e;s++){v=x[s];if(v){x[s]=u?v.parentNode:v.parentNode===r}}if(u){b.filter(r,x,true)}}},"":function(t,r,v){var s=j++,e=q,u;if(typeof r==="string"&&!/\W/.test(r)){r=r.toLowerCase();u=r;e=n}e("parentNode",r,s,t,u,v)},"~":function(t,r,v){var s=j++,e=q,u;if(typeof r==="string"&&!/\W/.test(r)){r=r.toLowerCase();u=r;e=n}e("previousSibling",r,s,t,u,v)}},find:{ID:function(r,s,t){if(typeof s.getElementById!=="undefined"&&!t){var e=s.getElementById(r[1]);return e?[e]:[]}},NAME:function(s,v){if(typeof v.getElementsByName!=="undefined"){var r=[],u=v.getElementsByName(s[1]);for(var t=0,e=u.length;t<e;t++){if(u[t].getAttribute("name")===s[1]){r.push(u[t])}}return r.length===0?null:r}},TAG:function(e,r){return r.getElementsByTagName(e[1])}},preFilter:{CLASS:function(t,r,s,e,x,y){t=" "+t[1].replace(/\\/g,"")+" ";if(y){return t}for(var u=0,v;(v=r[u])!=null;u++){if(v){if(x^(v.className&&(" "+v.className+" ").replace(/[\t\n]/g," ").indexOf(t)>=0)){if(!s){e.push(v)}}else{if(s){r[u]=false}}}}return false},ID:function(e){return e[1].replace(/\\/g,"")},TAG:function(r,e){return r[1].toLowerCase()},CHILD:function(e){if(e[1]==="nth"){var r=/(-?)(\d*)n((?:\+|-)?\d*)/.exec(e[2]==="even"&&"2n"||e[2]==="odd"&&"2n+1"||!/\D/.test(e[2])&&"0n+"+e[2]||e[2]);e[2]=(r[1]+(r[2]||1))-0;e[3]=r[3]-0}e[0]=j++;return e},ATTR:function(u,r,s,e,v,x){var t=u[1].replace(/\\/g,"");if(!x&&f.attrMap[t]){u[1]=f.attrMap[t]}if(u[2]==="~="){u[4]=" "+u[4]+" "}return u},PSEUDO:function(u,r,s,e,v){if(u[1]==="not"){if((p.exec(u[3])||"").length>1||/^\w/.test(u[3])){u[3]=b(u[3],null,null,r)}else{var t=b.filter(u[3],r,s,true^v);if(!s){e.push.apply(e,t)}return false}}else{if(f.match.POS.test(u[0])||f.match.CHILD.test(u[0])){return true}}return u},POS:function(e){e.unshift(true);return e}},filters:{enabled:function(e){return e.disabled===false&&e.type!=="hidden"},disabled:function(e){return e.disabled===true},checked:function(e){return e.checked===true},selected:function(e){e.parentNode.selectedIndex;return e.selected===true},parent:function(e){return !!e.firstChild},empty:function(e){return !e.firstChild},has:function(s,r,e){return !!b(e[3],s).length},header:function(e){return(/h\d/i).test(e.nodeName)},text:function(e){return"text"===e.type},radio:function(e){return"radio"===e.type},checkbox:function(e){return"checkbox"===e.type},file:function(e){return"file"===e.type},password:function(e){return"password"===e.type},submit:function(e){return"submit"===e.type},image:function(e){return"image"===e.type},reset:function(e){return"reset"===e.type},button:function(e){return"button"===e.type||e.nodeName.toLowerCase()==="button"},input:function(e){return(/input|select|textarea|button/i).test(e.nodeName)}},setFilters:{first:function(r,e){return e===0},last:function(s,r,e,t){return r===t.length-1},even:function(r,e){return e%2===0},odd:function(r,e){return e%2===1},lt:function(s,r,e){return r<e[3]-0},gt:function(s,r,e){return r>e[3]-0},nth:function(s,r,e){return e[3]-0===r},eq:function(s,r,e){return e[3]-0===r}},filter:{PSEUDO:function(s,y,x,z){var e=y[1],r=f.filters[e];if(r){return r(s,x,y,z)}else{if(e==="contains"){return(s.textContent||s.innerText||b.getText([s])||"").indexOf(y[3])>=0}else{if(e==="not"){var t=y[3];for(var v=0,u=t.length;v<u;v++){if(t[v]===s){return false}}return true}else{b.error("Syntax error, unrecognized expression: "+e)}}}},CHILD:function(e,t){var x=t[1],r=e;switch(x){case"only":case"first":while((r=r.previousSibling)){if(r.nodeType===1){return false}}if(x==="first"){return true}r=e;case"last":while((r=r.nextSibling)){if(r.nodeType===1){return false}}return true;case"nth":var s=t[2],A=t[3];if(s===1&&A===0){return true}var v=t[0],z=e.parentNode;if(z&&(z.sizcache!==v||!e.nodeIndex)){var u=0;for(r=z.firstChild;r;r=r.nextSibling){if(r.nodeType===1){r.nodeIndex=++u}}z.sizcache=v}var y=e.nodeIndex-A;if(s===0){return y===0}else{return(y%s===0&&y/s>=0)}}},ID:function(r,e){return r.nodeType===1&&r.getAttribute("id")===e},TAG:function(r,e){return(e==="*"&&r.nodeType===1)||r.nodeName.toLowerCase()===e},CLASS:function(r,e){return(" "+(r.className||r.getAttribute("class"))+" ").indexOf(e)>-1},ATTR:function(v,t){var s=t[1],e=f.attrHandle[s]?f.attrHandle[s](v):v[s]!=null?v[s]:v.getAttribute(s),x=e+"",u=t[2],r=t[4];return e==null?u==="!=":u==="="?x===r:u==="*="?x.indexOf(r)>=0:u==="~="?(" "+x+" ").indexOf(r)>=0:!r?x&&e!==false:u==="!="?x!==r:u==="^="?x.indexOf(r)===0:u==="$="?x.substr(x.length-r.length)===r:u==="|="?x===r||x.substr(0,r.length+1)===r+"-":false},POS:function(u,r,s,v){var e=r[2],t=f.setFilters[e];if(t){return t(u,s,r,v)}}}};var k=f.match.POS,g=function(r,e){return"\\"+(e-0+1)};for(var m in f.match){f.match[m]=new RegExp(f.match[m].source+(/(?![^\[]*\])(?![^\(]*\))/.source));f.leftMatch[m]=new RegExp(/(^(?:.|\r|\n)*?)/.source+f.match[m].source.replace(/\\(\d+)/g,g))}var a=function(r,e){r=Array.prototype.slice.call(r,0);if(e){e.push.apply(e,r);return e}return r};try{Array.prototype.slice.call(document.documentElement.childNodes,0)[0].nodeType}catch(l){a=function(u,t){var r=t||[],s=0;if(d.call(u)==="[object Array]"){Array.prototype.push.apply(r,u)}else{if(typeof u.length==="number"){for(var e=u.length;s<e;s++){r.push(u[s])}}else{for(;u[s];s++){r.push(u[s])}}}return r}}var c;if(document.documentElement.compareDocumentPosition){c=function(r,e){if(!r.compareDocumentPosition||!e.compareDocumentPosition){if(r==e){o=true}return r.compareDocumentPosition?-1:1}var s=r.compareDocumentPosition(e)&4?-1:r===e?0:1;if(s===0){o=true}return s}}else{if("sourceIndex" in document.documentElement){c=function(r,e){if(!r.sourceIndex||!e.sourceIndex){if(r==e){o=true}return r.sourceIndex?-1:1}var s=r.sourceIndex-e.sourceIndex;if(s===0){o=true}return s}}else{if(document.createRange){c=function(t,r){if(!t.ownerDocument||!r.ownerDocument){if(t==r){o=true}return t.ownerDocument?-1:1}var s=t.ownerDocument.createRange(),e=r.ownerDocument.createRange();s.setStart(t,0);s.setEnd(t,0);e.setStart(r,0);e.setEnd(r,0);var u=s.compareBoundaryPoints(Range.START_TO_END,e);if(u===0){o=true}return u}}}}b.getText=function(e){var r="",t;for(var s=0;e[s];s++){t=e[s];if(t.nodeType===3||t.nodeType===4){r+=t.nodeValue}else{if(t.nodeType!==8){r+=b.getText(t.childNodes)}}}return r};(function(){var r=document.createElement("div"),s="script"+(new Date()).getTime();r.innerHTML="<a name='"+s+"'/>";var e=document.documentElement;e.insertBefore(r,e.firstChild);if(document.getElementById(s)){f.find.ID=function(u,v,x){if(typeof v.getElementById!=="undefined"&&!x){var t=v.getElementById(u[1]);return t?t.id===u[1]||typeof t.getAttributeNode!=="undefined"&&t.getAttributeNode("id").nodeValue===u[1]?[t]:undefined:[]}};f.filter.ID=function(v,t){var u=typeof v.getAttributeNode!=="undefined"&&v.getAttributeNode("id");return v.nodeType===1&&u&&u.nodeValue===t}}e.removeChild(r);e=r=null})();(function(){var e=document.createElement("div");e.appendChild(document.createComment(""));if(e.getElementsByTagName("*").length>0){f.find.TAG=function(r,v){var u=v.getElementsByTagName(r[1]);if(r[1]==="*"){var t=[];for(var s=0;u[s];s++){if(u[s].nodeType===1){t.push(u[s])}}u=t}return u}}e.innerHTML="<a href='#'></a>";if(e.firstChild&&typeof e.firstChild.getAttribute!=="undefined"&&e.firstChild.getAttribute("href")!=="#"){f.attrHandle.href=function(r){return r.getAttribute("href",2)}}e=null})();if(document.querySelectorAll){(function(){var e=b,s=document.createElement("div");s.innerHTML="<p class='TEST'></p>";if(s.querySelectorAll&&s.querySelectorAll(".TEST").length===0){return}b=function(x,v,t,u){v=v||document;if(!u&&v.nodeType===9&&!b.isXML(v)){try{return a(v.querySelectorAll(x),t)}catch(y){}}return e(x,v,t,u)};for(var r in e){b[r]=e[r]}s=null})()}(function(){var e=document.createElement("div");e.innerHTML="<div class='test e'></div><div class='test'></div>";if(!e.getElementsByClassName||e.getElementsByClassName("e").length===0){return}e.lastChild.className="e";if(e.getElementsByClassName("e").length===1){return}f.order.splice(1,0,"CLASS");f.find.CLASS=function(r,s,t){if(typeof s.getElementsByClassName!=="undefined"&&!t){return s.getElementsByClassName(r[1])}};e=null})();function n(r,x,v,A,y,z){for(var t=0,s=A.length;t<s;t++){var e=A[t];if(e){e=e[r];var u=false;while(e){if(e.sizcache===v){u=A[e.sizset];break}if(e.nodeType===1&&!z){e.sizcache=v;e.sizset=t}if(e.nodeName.toLowerCase()===x){u=e;break}e=e[r]}A[t]=u}}}function q(r,x,v,A,y,z){for(var t=0,s=A.length;t<s;t++){var e=A[t];if(e){e=e[r];var u=false;while(e){if(e.sizcache===v){u=A[e.sizset];break}if(e.nodeType===1){if(!z){e.sizcache=v;e.sizset=t}if(typeof x!=="string"){if(e===x){u=true;break}}else{if(b.filter(x,[e]).length>0){u=e;break}}}e=e[r]}A[t]=u}}}b.contains=document.compareDocumentPosition?function(r,e){return !!(r.compareDocumentPosition(e)&16)}:function(r,e){return r!==e&&(r.contains?r.contains(e):true)};b.isXML=function(e){var r=(e?e.ownerDocument||e:0).documentElement;return r?r.nodeName!=="HTML":false};var h=function(e,y){var t=[],u="",v,s=y.nodeType?[y]:y;while((v=f.match.PSEUDO.exec(e))){u+=v[0];e=e.replace(f.match.PSEUDO,"")}e=f.relative[e]?e+"*":e;for(var x=0,r=s.length;x<r;x++){b(e,s[x],t)}return b.filter(u,t)};window.tinymce.dom.Sizzle=b})();(function(d){var f=d.each,c=d.DOM,b=d.isIE,e=d.isWebKit,a;d.create("tinymce.dom.EventUtils",{EventUtils:function(){this.inits=[];this.events=[]},add:function(m,p,l,j){var g,h=this,i=h.events,k;if(p instanceof Array){k=[];f(p,function(o){k.push(h.add(m,o,l,j))});return k}if(m&&m.hasOwnProperty&&m instanceof Array){k=[];f(m,function(n){n=c.get(n);k.push(h.add(n,p,l,j))});return k}m=c.get(m);if(!m){return}g=function(n){if(h.disabled){return}n=n||window.event;if(n&&b){if(!n.target){n.target=n.srcElement}d.extend(n,h._stoppers)}if(!j){return l(n)}return l.call(j,n)};if(p=="unload"){d.unloads.unshift({func:g});return g}if(p=="init"){if(h.domLoaded){g()}else{h.inits.push(g)}return g}i.push({obj:m,name:p,func:l,cfunc:g,scope:j});h._add(m,p,g);return l},remove:function(l,m,k){var h=this,g=h.events,i=false,j;if(l&&l.hasOwnProperty&&l instanceof Array){j=[];f(l,function(n){n=c.get(n);j.push(h.remove(n,m,k))});return j}l=c.get(l);f(g,function(o,n){if(o.obj==l&&o.name==m&&(!k||(o.func==k||o.cfunc==k))){g.splice(n,1);h._remove(l,m,o.cfunc);i=true;return false}});return i},clear:function(l){var j=this,g=j.events,h,k;if(l){l=c.get(l);for(h=g.length-1;h>=0;h--){k=g[h];if(k.obj===l){j._remove(k.obj,k.name,k.cfunc);k.obj=k.cfunc=null;g.splice(h,1)}}}},cancel:function(g){if(!g){return false}this.stop(g);return this.prevent(g)},stop:function(g){if(g.stopPropagation){g.stopPropagation()}else{g.cancelBubble=true}return false},prevent:function(g){if(g.preventDefault){g.preventDefault()}else{g.returnValue=false}return false},destroy:function(){var g=this;f(g.events,function(j,h){g._remove(j.obj,j.name,j.cfunc);j.obj=j.cfunc=null});g.events=[];g=null},_add:function(h,i,g){if(h.attachEvent){h.attachEvent("on"+i,g)}else{if(h.addEventListener){h.addEventListener(i,g,false)}else{h["on"+i]=g}}},_remove:function(i,j,h){if(i){try{if(i.detachEvent){i.detachEvent("on"+j,h)}else{if(i.removeEventListener){i.removeEventListener(j,h,false)}else{i["on"+j]=null}}}catch(g){}}},_pageInit:function(h){var g=this;if(g.domLoaded){return}g.domLoaded=true;f(g.inits,function(i){i()});g.inits=[]},_wait:function(i){var g=this,h=i.document;if(i.tinyMCE_GZ&&tinyMCE_GZ.loaded){g.domLoaded=1;return}if(h.attachEvent){h.attachEvent("onreadystatechange",function(){if(h.readyState==="complete"){h.detachEvent("onreadystatechange",arguments.callee);g._pageInit(i)}});if(h.documentElement.doScroll&&i==i.top){(function(){if(g.domLoaded){return}try{h.documentElement.doScroll("left")}catch(j){setTimeout(arguments.callee,0);return}g._pageInit(i)})()}}else{if(h.addEventListener){g._add(i,"DOMContentLoaded",function(){g._pageInit(i)})}}g._add(i,"load",function(){g._pageInit(i)})},_stoppers:{preventDefault:function(){this.returnValue=false},stopPropagation:function(){this.cancelBubble=true}}});a=d.dom.Event=new d.dom.EventUtils();a._wait(window);d.addUnload(function(){a.destroy()})})(tinymce);(function(a){a.dom.Element=function(f,d){var b=this,e,c;b.settings=d=d||{};b.id=f;b.dom=e=d.dom||a.DOM;if(!a.isIE){c=e.get(b.id)}a.each(("getPos,getRect,getParent,add,setStyle,getStyle,setStyles,setAttrib,setAttribs,getAttrib,addClass,removeClass,hasClass,getOuterHTML,setOuterHTML,remove,show,hide,isHidden,setHTML,get").split(/,/),function(g){b[g]=function(){var h=[f],j;for(j=0;j<arguments.length;j++){h.push(arguments[j])}h=e[g].apply(e,h);b.update(g);return h}});a.extend(b,{on:function(i,h,g){return a.dom.Event.add(b.id,i,h,g)},getXY:function(){return{x:parseInt(b.getStyle("left")),y:parseInt(b.getStyle("top"))}},getSize:function(){var g=e.get(b.id);return{w:parseInt(b.getStyle("width")||g.clientWidth),h:parseInt(b.getStyle("height")||g.clientHeight)}},moveTo:function(g,h){b.setStyles({left:g,top:h})},moveBy:function(g,i){var h=b.getXY();b.moveTo(h.x+g,h.y+i)},resizeTo:function(g,i){b.setStyles({width:g,height:i})},resizeBy:function(g,j){var i=b.getSize();b.resizeTo(i.w+g,i.h+j)},update:function(h){var g;if(a.isIE6&&d.blocker){h=h||"";if(h.indexOf("get")===0||h.indexOf("has")===0||h.indexOf("is")===0){return}if(h=="remove"){e.remove(b.blocker);return}if(!b.blocker){b.blocker=e.uniqueId();g=e.add(d.container||e.getRoot(),"iframe",{id:b.blocker,style:"position:absolute;",frameBorder:0,src:'javascript:""'});e.setStyle(g,"opacity",0)}else{g=e.get(b.blocker)}e.setStyles(g,{left:b.getStyle("left",1),top:b.getStyle("top",1),width:b.getStyle("width",1),height:b.getStyle("height",1),display:b.getStyle("display",1),zIndex:parseInt(b.getStyle("zIndex",1)||0)-1})}}})}})(tinymce);(function(c){function e(f){return f.replace(/[\n\r]+/g,"")}var b=c.is,a=c.isIE,d=c.each;c.create("tinymce.dom.Selection",{Selection:function(i,h,g){var f=this;f.dom=i;f.win=h;f.serializer=g;d(["onBeforeSetContent","onBeforeGetContent","onSetContent","onGetContent"],function(j){f[j]=new c.util.Dispatcher(f)});if(!f.win.getSelection){f.tridentSel=new c.dom.TridentSelection(f)}if(c.isIE&&i.boxModel){this._fixIESelection()}c.addUnload(f.destroy,f)},getContent:function(g){var f=this,h=f.getRng(),l=f.dom.create("body"),j=f.getSel(),i,k,m;g=g||{};i=k="";g.get=true;g.format=g.format||"html";g.forced_root_block="";f.onBeforeGetContent.dispatch(f,g);if(g.format=="text"){return f.isCollapsed()?"":(h.text||(j.toString?j.toString():""))}if(h.cloneContents){m=h.cloneContents();if(m){l.appendChild(m)}}else{if(b(h.item)||b(h.htmlText)){l.innerHTML=h.item?h.item(0).outerHTML:h.htmlText}else{l.innerHTML=h.toString()}}if(/^\s/.test(l.innerHTML)){i=" "}if(/\s+$/.test(l.innerHTML)){k=" "}g.getInner=true;g.content=f.isCollapsed()?"":i+f.serializer.serialize(l,g)+k;f.onGetContent.dispatch(f,g);return g.content},setContent:function(g,i){var n=this,f=n.getRng(),j,k=n.win.document,m,l;i=i||{format:"html"};i.set=true;g=i.content=g;if(!i.no_events){n.onBeforeSetContent.dispatch(n,i)}g=i.content;if(f.insertNode){g+='<span id="__caret">_</span>';if(f.startContainer==k&&f.endContainer==k){k.body.innerHTML=g}else{f.deleteContents();if(k.body.childNodes.length==0){k.body.innerHTML=g}else{if(f.createContextualFragment){f.insertNode(f.createContextualFragment(g))}else{m=k.createDocumentFragment();l=k.createElement("div");m.appendChild(l);l.outerHTML=g;f.insertNode(m)}}}j=n.dom.get("__caret");f=k.createRange();f.setStartBefore(j);f.setEndBefore(j);n.setRng(f);n.dom.remove("__caret");try{n.setRng(f)}catch(h){}}else{if(f.item){k.execCommand("Delete",false,null);f=n.getRng()}f.pasteHTML(g)}if(!i.no_events){n.onSetContent.dispatch(n,i)}},getStart:function(){var g=this.getRng(),h,f,j,i;if(g.duplicate||g.item){if(g.item){return g.item(0)}j=g.duplicate();j.collapse(1);h=j.parentElement();f=i=g.parentElement();while(i=i.parentNode){if(i==h){h=f;break}}return h}else{h=g.startContainer;if(h.nodeType==1&&h.hasChildNodes()){h=h.childNodes[Math.min(h.childNodes.length-1,g.startOffset)]}if(h&&h.nodeType==3){return h.parentNode}return h}},getEnd:function(){var g=this,h=g.getRng(),i,f;if(h.duplicate||h.item){if(h.item){return h.item(0)}h=h.duplicate();h.collapse(0);i=h.parentElement();if(i&&i.nodeName=="BODY"){return i.lastChild||i}return i}else{i=h.endContainer;f=h.endOffset;if(i.nodeType==1&&i.hasChildNodes()){i=i.childNodes[f>0?f-1:f]}if(i&&i.nodeType==3){return i.parentNode}return i}},getBookmark:function(r,s){var v=this,m=v.dom,g,j,i,n,h,o,p,l="\uFEFF",u;function f(x,y){var t=0;d(m.select(x),function(A,z){if(A==y){t=z}});return t}if(r==2){function k(){var x=v.getRng(true),t=m.getRoot(),y={};function z(C,H){var B=C[H?"startContainer":"endContainer"],G=C[H?"startOffset":"endOffset"],A=[],D,F,E=0;if(B.nodeType==3){if(s){for(D=B.previousSibling;D&&D.nodeType==3;D=D.previousSibling){G+=D.nodeValue.length}}A.push(G)}else{F=B.childNodes;if(G>=F.length&&F.length){E=1;G=Math.max(0,F.length-1)}A.push(v.dom.nodeIndex(F[G],s)+E)}for(;B&&B!=t;B=B.parentNode){A.push(v.dom.nodeIndex(B,s))}return A}y.start=z(x,true);if(!v.isCollapsed()){y.end=z(x)}return y}if(v.tridentSel){return v.tridentSel.getBookmark(r)}return k()}if(r){return{rng:v.getRng()}}g=v.getRng();i=m.uniqueId();n=tinyMCE.activeEditor.selection.isCollapsed();u="overflow:hidden;line-height:0px";if(g.duplicate||g.item){if(!g.item){j=g.duplicate();try{g.collapse();g.pasteHTML('<span data-mce-type="bookmark" id="'+i+'_start" style="'+u+'">'+l+"</span>");if(!n){j.collapse(false);g.moveToElementText(j.parentElement());if(g.compareEndPoints("StartToEnd",j)==0){j.move("character",-1)}j.pasteHTML('<span data-mce-type="bookmark" id="'+i+'_end" style="'+u+'">'+l+"</span>")}}catch(q){return null}}else{o=g.item(0);h=o.nodeName;return{name:h,index:f(h,o)}}}else{o=v.getNode();h=o.nodeName;if(h=="IMG"){return{name:h,index:f(h,o)}}j=g.cloneRange();if(!n){j.collapse(false);j.insertNode(m.create("span",{"data-mce-type":"bookmark",id:i+"_end",style:u},l))}g.collapse(true);g.insertNode(m.create("span",{"data-mce-type":"bookmark",id:i+"_start",style:u},l))}v.moveToBookmark({id:i,keep:1});return{id:i}},moveToBookmark:function(n){var r=this,l=r.dom,i,h,f,q,j,s,o,p;if(n){if(n.start){f=l.createRng();q=l.getRoot();function g(z){var t=n[z?"start":"end"],v,x,y,u;if(t){y=t[0];for(x=q,v=t.length-1;v>=1;v--){u=x.childNodes;if(t[v]>u.length-1){return}x=u[t[v]]}if(x.nodeType===3){y=Math.min(t[0],x.nodeValue.length)}if(x.nodeType===1){y=Math.min(t[0],x.childNodes.length)}if(z){f.setStart(x,y)}else{f.setEnd(x,y)}}return true}if(r.tridentSel){return r.tridentSel.moveToBookmark(n)}if(g(true)&&g()){r.setRng(f)}}else{if(n.id){function k(A){var u=l.get(n.id+"_"+A),z,t,x,y,v=n.keep;if(u){z=u.parentNode;if(A=="start"){if(!v){t=l.nodeIndex(u)}else{z=u.firstChild;t=1}j=s=z;o=p=t}else{if(!v){t=l.nodeIndex(u)}else{z=u.firstChild;t=1}s=z;p=t}if(!v){y=u.previousSibling;x=u.nextSibling;d(c.grep(u.childNodes),function(B){if(B.nodeType==3){B.nodeValue=B.nodeValue.replace(/\uFEFF/g,"")}});while(u=l.get(n.id+"_"+A)){l.remove(u,1)}if(y&&x&&y.nodeType==x.nodeType&&y.nodeType==3&&!c.isOpera){t=y.nodeValue.length;y.appendData(x.nodeValue);l.remove(x);if(A=="start"){j=s=y;o=p=t}else{s=y;p=t}}}}}function m(t){if(l.isBlock(t)&&!t.innerHTML){t.innerHTML=!a?'<br data-mce-bogus="1" />':" "}return t}k("start");k("end");if(j){f=l.createRng();f.setStart(m(j),o);f.setEnd(m(s),p);r.setRng(f)}}else{if(n.name){r.select(l.select(n.name)[n.index])}else{if(n.rng){r.setRng(n.rng)}}}}}},select:function(k,j){var i=this,l=i.dom,g=l.createRng(),f;if(k){f=l.nodeIndex(k);g.setStart(k.parentNode,f);g.setEnd(k.parentNode,f+1);if(j){function h(m,o){var n=new c.dom.TreeWalker(m,m);do{if(m.nodeType==3&&c.trim(m.nodeValue).length!=0){if(o){g.setStart(m,0)}else{g.setEnd(m,m.nodeValue.length)}return}if(m.nodeName=="BR"){if(o){g.setStartBefore(m)}else{g.setEndBefore(m)}return}}while(m=(o?n.next():n.prev()))}h(k,1);h(k)}i.setRng(g)}return k},isCollapsed:function(){var f=this,h=f.getRng(),g=f.getSel();if(!h||h.item){return false}if(h.compareEndPoints){return h.compareEndPoints("StartToEnd",h)===0}return !g||h.collapsed},collapse:function(f){var h=this,g=h.getRng(),i;if(g.item){i=g.item(0);g=h.win.document.body.createTextRange();g.moveToElementText(i)}g.collapse(!!f);h.setRng(g)},getSel:function(){var g=this,f=this.win;return f.getSelection?f.getSelection():f.document.selection},getRng:function(l){var g=this,h,i,k,j=g.win.document;if(l&&g.tridentSel){return g.tridentSel.getRangeAt(0)}try{if(h=g.getSel()){i=h.rangeCount>0?h.getRangeAt(0):(h.createRange?h.createRange():j.createRange())}}catch(f){}if(c.isIE&&i&&i.setStart&&j.selection.createRange().item){k=j.selection.createRange().item(0);i=j.createRange();i.setStartBefore(k);i.setEndAfter(k)}if(!i){i=j.createRange?j.createRange():j.body.createTextRange()}if(g.selectedRange&&g.explicitRange){if(i.compareBoundaryPoints(i.START_TO_START,g.selectedRange)===0&&i.compareBoundaryPoints(i.END_TO_END,g.selectedRange)===0){i=g.explicitRange}else{g.selectedRange=null;g.explicitRange=null}}return i},setRng:function(i){var h,g=this;if(!g.tridentSel){h=g.getSel();if(h){g.explicitRange=i;try{h.removeAllRanges()}catch(f){}h.addRange(i);g.selectedRange=h.getRangeAt(0)}}else{if(i.cloneRange){g.tridentSel.addRange(i);return}try{i.select()}catch(f){}}},setNode:function(g){var f=this;f.setContent(f.dom.getOuterHTML(g));return g},getNode:function(){var h=this,g=h.getRng(),i=h.getSel(),l,k=g.startContainer,f=g.endContainer;if(!g){return h.dom.getRoot()}if(g.setStart){l=g.commonAncestorContainer;if(!g.collapsed){if(g.startContainer==g.endContainer){if(g.endOffset-g.startOffset<2){if(g.startContainer.hasChildNodes()){l=g.startContainer.childNodes[g.startOffset]}}}if(k.nodeType===3&&f.nodeType===3){function j(p,m){var o=p;while(p&&p.nodeType===3&&p.length===0){p=m?p.nextSibling:p.previousSibling}return p||o}if(k.length===g.startOffset){k=j(k.nextSibling,true)}else{k=k.parentNode}if(g.endOffset===0){f=j(f.previousSibling,false)}else{f=f.parentNode}if(k&&k===f){return k}}}if(l&&l.nodeType==3){return l.parentNode}return l}return g.item?g.item(0):g.parentElement()},getSelectedBlocks:function(g,f){var i=this,j=i.dom,m,h,l,k=[];m=j.getParent(g||i.getStart(),j.isBlock);h=j.getParent(f||i.getEnd(),j.isBlock);if(m){k.push(m)}if(m&&h&&m!=h){l=m;while((l=l.nextSibling)&&l!=h){if(j.isBlock(l)){k.push(l)}}}if(h&&m!=h){k.push(h)}return k},destroy:function(g){var f=this;f.win=null;if(!g){c.removeUnload(f.destroy)}},_fixIESelection:function(){var g=this.dom,m=g.doc,h=m.body,j,n,f;m.documentElement.unselectable=true;function i(o,r){var p=h.createTextRange();try{p.moveToPoint(o,r)}catch(q){p=null}return p}function l(p){var o;if(p.button){o=i(p.x,p.y);if(o){if(o.compareEndPoints("StartToStart",n)>0){o.setEndPoint("StartToStart",n)}else{o.setEndPoint("EndToEnd",n)}o.select()}}else{k()}}function k(){var o=m.selection.createRange();if(n&&!o.item&&o.compareEndPoints("StartToEnd",o)===0){n.select()}g.unbind(m,"mouseup",k);g.unbind(m,"mousemove",l);n=j=0}g.bind(m,["mousedown","contextmenu"],function(o){if(o.target.nodeName==="HTML"){if(j){k()}f=m.documentElement;if(f.scrollHeight>f.clientHeight){return}j=1;n=i(o.x,o.y);if(n){g.bind(m,"mouseup",k);g.bind(m,"mousemove",l);g.win.focus();n.select()}}})}})})(tinymce);(function(a){a.dom.Serializer=function(e,i,f){var h,b,d=a.isIE,g=a.each,c;if(!e.apply_source_formatting){e.indent=false}e.remove_trailing_brs=true;i=i||a.DOM;f=f||new a.html.Schema(e);e.entity_encoding=e.entity_encoding||"named";h=new a.util.Dispatcher(self);b=new a.util.Dispatcher(self);c=new a.html.DomParser(e,f);c.addAttributeFilter("src,href,style",function(k,j){var o=k.length,l,q,n="data-mce-"+j,p=e.url_converter,r=e.url_converter_scope,m;while(o--){l=k[o];q=l.attributes.map[n];if(q!==m){l.attr(j,q.length>0?q:null);l.attr(n,null)}else{q=l.attributes.map[j];if(j==="style"){q=i.serializeStyle(i.parseStyle(q),l.name)}else{if(p){q=p.call(r,q,j,l.name)}}l.attr(j,q.length>0?q:null)}}});c.addAttributeFilter("class",function(j,k){var l=j.length,m,n;while(l--){m=j[l];n=m.attr("class").replace(/\s*mce(Item\w+|Selected)\s*/g,"");m.attr("class",n.length>0?n:null)}});c.addAttributeFilter("data-mce-type",function(j,l,k){var m=j.length,n;while(m--){n=j[m];if(n.attributes.map["data-mce-type"]==="bookmark"&&!k.cleanup){n.remove()}}});c.addNodeFilter("script,style",function(k,l){var m=k.length,n,o;function j(p){return p.replace(/(<!--\[CDATA\[|\]\]-->)/g,"\n").replace(/^[\r\n]*|[\r\n]*$/g,"").replace(/^\s*(\/\/\s*<!--|\/\/\s*<!\[CDATA\[|<!--|<!\[CDATA\[)[\r\n]*/g,"").replace(/\s*(\/\/\s*\]\]>|\/\/\s*-->|\]\]>|-->|\]\]-->)\s*$/g,"")}while(m--){n=k[m];o=n.firstChild?n.firstChild.value:"";if(l==="script"){n.attr("type",(n.attr("type")||"text/javascript").replace(/^mce\-/,""));if(o.length>0){n.firstChild.value="// <![CDATA[\n"+j(o)+"\n// ]]>"}}else{if(o.length>0){n.firstChild.value="<!--\n"+j(o)+"\n-->"}}}});c.addNodeFilter("#comment",function(j,k){var l=j.length,m;while(l--){m=j[l];if(m.value.indexOf("[CDATA[")===0){m.name="#cdata";m.type=4;m.value=m.value.replace(/^\[CDATA\[|\]\]$/g,"")}else{if(m.value.indexOf("mce:protected ")===0){m.name="#text";m.type=3;m.raw=true;m.value=unescape(m.value).substr(14)}}}});c.addNodeFilter("xml:namespace,input",function(j,k){var l=j.length,m;while(l--){m=j[l];if(m.type===7){m.remove()}else{if(m.type===1){if(k==="input"&&!("type" in m.attributes.map)){m.attr("type","text")}}}}});if(e.fix_list_elements){c.addNodeFilter("ul,ol",function(k,l){var m=k.length,n,j;while(m--){n=k[m];j=n.parent;if(j.name==="ul"||j.name==="ol"){if(n.prev&&n.prev.name==="li"){n.prev.append(n)}}}})}c.addAttributeFilter("data-mce-src,data-mce-href,data-mce-style",function(j,k){var l=j.length;while(l--){j[l].attr(k,null)}});return{schema:f,addNodeFilter:c.addNodeFilter,addAttributeFilter:c.addAttributeFilter,onPreProcess:h,onPostProcess:b,serialize:function(o,m){var l,p,k,j,n;if(d&&i.select("script,style,select").length>0){n=o.innerHTML;o=o.cloneNode(false);i.setHTML(o,n)}else{o=o.cloneNode(true)}l=o.ownerDocument.implementation;if(l.createHTMLDocument){p=l.createHTMLDocument("");g(o.nodeName=="BODY"?o.childNodes:[o],function(q){p.body.appendChild(p.importNode(q,true))});if(o.nodeName!="BODY"){o=p.body.firstChild}else{o=p.body}k=i.doc;i.doc=p}m=m||{};m.format=m.format||"html";if(!m.no_events){m.node=o;h.dispatch(self,m)}j=new a.html.Serializer(e,f);m.content=j.serialize(c.parse(m.getInner?o.innerHTML:a.trim(i.getOuterHTML(o),m),m));if(!m.cleanup){m.content=m.content.replace(/\uFEFF/g,"")}if(!m.no_events){b.dispatch(self,m)}if(k){i.doc=k}m.node=null;return m.content},addRules:function(j){f.addValidElements(j)},setRules:function(j){f.setValidElements(j)}}}})(tinymce);(function(a){a.dom.ScriptLoader=function(h){var c=0,k=1,i=2,l={},j=[],f={},d=[],g=0,e;function b(m,v){var x=this,q=a.DOM,s,o,r,n;function p(){q.remove(n);if(s){s.onreadystatechange=s.onload=s=null}v()}function u(){if(typeof(console)!=="undefined"&&console.log){console.log("Failed to load: "+m)}}n=q.uniqueId();if(a.isIE6){o=new a.util.URI(m);r=location;if(o.host==r.hostname&&o.port==r.port&&(o.protocol+":")==r.protocol&&o.protocol.toLowerCase()!="file"){a.util.XHR.send({url:a._addVer(o.getURI()),success:function(y){var t=q.create("script",{type:"text/javascript"});t.text=y;document.getElementsByTagName("head")[0].appendChild(t);q.remove(t);p()},error:u});return}}s=q.create("script",{id:n,type:"text/javascript",src:a._addVer(m)});if(!a.isIE){s.onload=p}s.onerror=u;if(!a.isOpera){s.onreadystatechange=function(){var t=s.readyState;if(t=="complete"||t=="loaded"){p()}}}(document.getElementsByTagName("head")[0]||document.body).appendChild(s)}this.isDone=function(m){return l[m]==i};this.markDone=function(m){l[m]=i};this.add=this.load=function(m,q,n){var o,p=l[m];if(p==e){j.push(m);l[m]=c}if(q){if(!f[m]){f[m]=[]}f[m].push({func:q,scope:n||this})}};this.loadQueue=function(n,m){this.loadScripts(j,n,m)};this.loadScripts=function(m,q,p){var o;function n(r){a.each(f[r],function(s){s.func.call(s.scope)});f[r]=e}d.push({func:q,scope:p||this});o=function(){var r=a.grep(m);m.length=0;a.each(r,function(s){if(l[s]==i){n(s);return}if(l[s]!=k){l[s]=k;g++;b(s,function(){l[s]=i;g--;n(s);o()})}});if(!g){a.each(d,function(s){s.func.call(s.scope)});d.length=0}};o()}};a.ScriptLoader=new a.dom.ScriptLoader()})(tinymce);tinymce.dom.TreeWalker=function(a,c){var b=a;function d(i,f,e,j){var h,g;if(i){if(!j&&i[f]){return i[f]}if(i!=c){h=i[e];if(h){return h}for(g=i.parentNode;g&&g!=c;g=g.parentNode){h=g[e];if(h){return h}}}}}this.current=function(){return b};this.next=function(e){return(b=d(b,"firstChild","nextSibling",e))};this.prev=function(e){return(b=d(b,"lastChild","previousSibling",e))}};(function(a){a.dom.RangeUtils=function(c){var b="\uFEFF";this.walk=function(d,r){var h=d.startContainer,k=d.startOffset,s=d.endContainer,l=d.endOffset,i,f,n,g,q,p,e;e=c.select("td.mceSelected,th.mceSelected");if(e.length>0){a.each(e,function(t){r([t])});return}function o(v,u,t){var x=[];for(;v&&v!=t;v=v[u]){x.push(v)}return x}function m(u,t){do{if(u.parentNode==t){return u}u=u.parentNode}while(u)}function j(v,u,x){var t=x?"nextSibling":"previousSibling";for(g=v,q=g.parentNode;g&&g!=u;g=q){q=g.parentNode;p=o(g==v?g:g[t],t);if(p.length){if(!x){p.reverse()}r(p)}}}if(h.nodeType==1&&h.hasChildNodes()){h=h.childNodes[k]}if(s.nodeType==1&&s.hasChildNodes()){s=s.childNodes[Math.min(l-1,s.childNodes.length-1)]}i=c.findCommonAncestor(h,s);if(h==s){return r([h])}for(g=h;g;g=g.parentNode){if(g==s){return j(h,i,true)}if(g==i){break}}for(g=s;g;g=g.parentNode){if(g==h){return j(s,i)}if(g==i){break}}f=m(h,i)||h;n=m(s,i)||s;j(h,f,true);p=o(f==h?f:f.nextSibling,"nextSibling",n==s?n.nextSibling:n);if(p.length){r(p)}j(s,n)}};a.dom.RangeUtils.compareRanges=function(c,b){if(c&&b){if(c.item||c.duplicate){if(c.item&&b.item&&c.item(0)===b.item(0)){return true}if(c.isEqual&&b.isEqual&&b.isEqual(c)){return true}}else{return c.startContainer==b.startContainer&&c.startOffset==b.startOffset}}return false}})(tinymce);(function(b){var a=b.dom.Event,c=b.each;b.create("tinymce.ui.KeyboardNavigation",{KeyboardNavigation:function(e,f){var p=this,m=e.root,l=e.items,n=e.enableUpDown,i=e.enableLeftRight||!e.enableUpDown,k=e.excludeFromTabOrder,j,h,o,d,g;f=f||b.DOM;j=function(q){g=q.target.id};h=function(q){f.setAttrib(q.target.id,"tabindex","-1")};d=function(q){var r=f.get(g);f.setAttrib(r,"tabindex","0");r.focus()};p.focus=function(){f.get(g).focus()};p.destroy=function(){c(l,function(q){f.unbind(f.get(q.id),"focus",j);f.unbind(f.get(q.id),"blur",h)});f.unbind(f.get(m),"focus",d);f.unbind(f.get(m),"keydown",o);l=f=m=p.focus=j=h=o=d=null;p.destroy=function(){}};p.moveFocus=function(u,r){var q=-1,t=p.controls,s;if(!g){return}c(l,function(x,v){if(x.id===g){q=v;return false}});q+=u;if(q<0){q=l.length-1}else{if(q>=l.length){q=0}}s=l[q];f.setAttrib(g,"tabindex","-1");f.setAttrib(s.id,"tabindex","0");f.get(s.id).focus();if(e.actOnFocus){e.onAction(s.id)}if(r){a.cancel(r)}};o=function(y){var u=37,t=39,x=38,z=40,q=27,s=14,r=13,v=32;switch(y.keyCode){case u:if(i){p.moveFocus(-1)}break;case t:if(i){p.moveFocus(1)}break;case x:if(n){p.moveFocus(-1)}break;case z:if(n){p.moveFocus(1)}break;case q:if(e.onCancel){e.onCancel();a.cancel(y)}break;case s:case r:case v:if(e.onAction){e.onAction(g);a.cancel(y)}break}};c(l,function(s,q){var r;if(!s.id){s.id=f.uniqueId("_mce_item_")}if(k){f.bind(s.id,"blur",h);r="-1"}else{r=(q===0?"0":"-1")}f.setAttrib(s.id,"tabindex",r);f.bind(f.get(s.id),"focus",j)});if(l[0]){g=l[0].id}f.setAttrib(m,"tabindex","-1");f.bind(f.get(m),"focus",d);f.bind(f.get(m),"keydown",o)}})})(tinymce);(function(c){var b=c.DOM,a=c.is;c.create("tinymce.ui.Control",{Control:function(f,e,d){this.id=f;this.settings=e=e||{};this.rendered=false;this.onRender=new c.util.Dispatcher(this);this.classPrefix="";this.scope=e.scope||this;this.disabled=0;this.active=0;this.editor=d},setAriaProperty:function(f,e){var d=b.get(this.id+"_aria")||b.get(this.id);if(d){b.setAttrib(d,"aria-"+f,!!e)}},focus:function(){b.get(this.id).focus()},setDisabled:function(d){if(d!=this.disabled){this.setAriaProperty("disabled",d);this.setState("Disabled",d);this.setState("Enabled",!d);this.disabled=d}},isDisabled:function(){return this.disabled},setActive:function(d){if(d!=this.active){this.setState("Active",d);this.active=d;this.setAriaProperty("pressed",d)}},isActive:function(){return this.active},setState:function(f,d){var e=b.get(this.id);f=this.classPrefix+f;if(d){b.addClass(e,f)}else{b.removeClass(e,f)}},isRendered:function(){return this.rendered},renderHTML:function(){},renderTo:function(d){b.setHTML(d,this.renderHTML())},postRender:function(){var e=this,d;if(a(e.disabled)){d=e.disabled;e.disabled=-1;e.setDisabled(d)}if(a(e.active)){d=e.active;e.active=-1;e.setActive(d)}},remove:function(){b.remove(this.id);this.destroy()},destroy:function(){c.dom.Event.clear(this.id)}})})(tinymce);tinymce.create("tinymce.ui.Container:tinymce.ui.Control",{Container:function(c,b,a){this.parent(c,b,a);this.controls=[];this.lookup={}},add:function(a){this.lookup[a.id]=a;this.controls.push(a);return a},get:function(a){return this.lookup[a]}});tinymce.create("tinymce.ui.Separator:tinymce.ui.Control",{Separator:function(b,a){this.parent(b,a);this.classPrefix="mceSeparator";this.setDisabled(true)},renderHTML:function(){return tinymce.DOM.createHTML("span",{"class":this.classPrefix,role:"separator","aria-orientation":"vertical",tabindex:"-1"})}});(function(d){var c=d.is,b=d.DOM,e=d.each,a=d.walk;d.create("tinymce.ui.MenuItem:tinymce.ui.Control",{MenuItem:function(g,f){this.parent(g,f);this.classPrefix="mceMenuItem"},setSelected:function(f){this.setState("Selected",f);this.setAriaProperty("checked",!!f);this.selected=f},isSelected:function(){return this.selected},postRender:function(){var f=this;f.parent();if(c(f.selected)){f.setSelected(f.selected)}}})})(tinymce);(function(d){var c=d.is,b=d.DOM,e=d.each,a=d.walk;d.create("tinymce.ui.Menu:tinymce.ui.MenuItem",{Menu:function(h,g){var f=this;f.parent(h,g);f.items={};f.collapsed=false;f.menuCount=0;f.onAddItem=new d.util.Dispatcher(this)},expand:function(g){var f=this;if(g){a(f,function(h){if(h.expand){h.expand()}},"items",f)}f.collapsed=false},collapse:function(g){var f=this;if(g){a(f,function(h){if(h.collapse){h.collapse()}},"items",f)}f.collapsed=true},isCollapsed:function(){return this.collapsed},add:function(f){if(!f.settings){f=new d.ui.MenuItem(f.id||b.uniqueId(),f)}this.onAddItem.dispatch(this,f);return this.items[f.id]=f},addSeparator:function(){return this.add({separator:true})},addMenu:function(f){if(!f.collapse){f=this.createMenu(f)}this.menuCount++;return this.add(f)},hasMenus:function(){return this.menuCount!==0},remove:function(f){delete this.items[f.id]},removeAll:function(){var f=this;a(f,function(g){if(g.removeAll){g.removeAll()}else{g.remove()}g.destroy()},"items",f);f.items={}},createMenu:function(g){var f=new d.ui.Menu(g.id||b.uniqueId(),g);f.onAddItem.add(this.onAddItem.dispatch,this.onAddItem);return f}})})(tinymce);(function(e){var d=e.is,c=e.DOM,f=e.each,a=e.dom.Event,b=e.dom.Element;e.create("tinymce.ui.DropMenu:tinymce.ui.Menu",{DropMenu:function(h,g){g=g||{};g.container=g.container||c.doc.body;g.offset_x=g.offset_x||0;g.offset_y=g.offset_y||0;g.vp_offset_x=g.vp_offset_x||0;g.vp_offset_y=g.vp_offset_y||0;if(d(g.icons)&&!g.icons){g["class"]+=" mceNoIcons"}this.parent(h,g);this.onShowMenu=new e.util.Dispatcher(this);this.onHideMenu=new e.util.Dispatcher(this);this.classPrefix="mceMenu"},createMenu:function(j){var h=this,i=h.settings,g;j.container=j.container||i.container;j.parent=h;j.constrain=j.constrain||i.constrain;j["class"]=j["class"]||i["class"];j.vp_offset_x=j.vp_offset_x||i.vp_offset_x;j.vp_offset_y=j.vp_offset_y||i.vp_offset_y;j.keyboard_focus=i.keyboard_focus;g=new e.ui.DropMenu(j.id||c.uniqueId(),j);g.onAddItem.add(h.onAddItem.dispatch,h.onAddItem);return g},focus:function(){var g=this;if(g.keyboardNav){g.keyboardNav.focus()}},update:function(){var i=this,j=i.settings,g=c.get("menu_"+i.id+"_tbl"),l=c.get("menu_"+i.id+"_co"),h,k;h=j.max_width?Math.min(g.clientWidth,j.max_width):g.clientWidth;k=j.max_height?Math.min(g.clientHeight,j.max_height):g.clientHeight;if(!c.boxModel){i.element.setStyles({width:h+2,height:k+2})}else{i.element.setStyles({width:h,height:k})}if(j.max_width){c.setStyle(l,"width",h)}if(j.max_height){c.setStyle(l,"height",k);if(g.clientHeight<j.max_height){c.setStyle(l,"overflow","hidden")}}},showMenu:function(p,n,r){var z=this,A=z.settings,o,g=c.getViewPort(),u,l,v,q,i=2,k,j,m=z.classPrefix;z.collapse(1);if(z.isMenuVisible){return}if(!z.rendered){o=c.add(z.settings.container,z.renderNode());f(z.items,function(h){h.postRender()});z.element=new b("menu_"+z.id,{blocker:1,container:A.container})}else{o=c.get("menu_"+z.id)}if(!e.isOpera){c.setStyles(o,{left:-65535,top:-65535})}c.show(o);z.update();p+=A.offset_x||0;n+=A.offset_y||0;g.w-=4;g.h-=4;if(A.constrain){u=o.clientWidth-i;l=o.clientHeight-i;v=g.x+g.w;q=g.y+g.h;if((p+A.vp_offset_x+u)>v){p=r?r-u:Math.max(0,(v-A.vp_offset_x)-u)}if((n+A.vp_offset_y+l)>q){n=Math.max(0,(q-A.vp_offset_y)-l)}}c.setStyles(o,{left:p,top:n});z.element.update();z.isMenuVisible=1;z.mouseClickFunc=a.add(o,"click",function(s){var h;s=s.target;if(s&&(s=c.getParent(s,"tr"))&&!c.hasClass(s,m+"ItemSub")){h=z.items[s.id];if(h.isDisabled()){return}k=z;while(k){if(k.hideMenu){k.hideMenu()}k=k.settings.parent}if(h.settings.onclick){h.settings.onclick(s)}return a.cancel(s)}});if(z.hasMenus()){z.mouseOverFunc=a.add(o,"mouseover",function(x){var h,t,s;x=x.target;if(x&&(x=c.getParent(x,"tr"))){h=z.items[x.id];if(z.lastMenu){z.lastMenu.collapse(1)}if(h.isDisabled()){return}if(x&&c.hasClass(x,m+"ItemSub")){t=c.getRect(x);h.showMenu((t.x+t.w-i),t.y-i,t.x);z.lastMenu=h;c.addClass(c.get(h.id).firstChild,m+"ItemActive")}}})}a.add(o,"keydown",z._keyHandler,z);z.onShowMenu.dispatch(z);if(A.keyboard_focus){z._setupKeyboardNav()}},hideMenu:function(j){var g=this,i=c.get("menu_"+g.id),h;if(!g.isMenuVisible){return}if(g.keyboardNav){g.keyboardNav.destroy()}a.remove(i,"mouseover",g.mouseOverFunc);a.remove(i,"click",g.mouseClickFunc);a.remove(i,"keydown",g._keyHandler);c.hide(i);g.isMenuVisible=0;if(!j){g.collapse(1)}if(g.element){g.element.hide()}if(h=c.get(g.id)){c.removeClass(h.firstChild,g.classPrefix+"ItemActive")}g.onHideMenu.dispatch(g)},add:function(i){var g=this,h;i=g.parent(i);if(g.isRendered&&(h=c.get("menu_"+g.id))){g._add(c.select("tbody",h)[0],i)}return i},collapse:function(g){this.parent(g);this.hideMenu(1)},remove:function(g){c.remove(g.id);this.destroy();return this.parent(g)},destroy:function(){var g=this,h=c.get("menu_"+g.id);if(g.keyboardNav){g.keyboardNav.destroy()}a.remove(h,"mouseover",g.mouseOverFunc);a.remove(c.select("a",h),"focus",g.mouseOverFunc);a.remove(h,"click",g.mouseClickFunc);a.remove(h,"keydown",g._keyHandler);if(g.element){g.element.remove()}c.remove(h)},renderNode:function(){var i=this,j=i.settings,l,h,k,g;g=c.create("div",{role:"listbox",id:"menu_"+i.id,"class":j["class"],style:"position:absolute;left:0;top:0;z-index:200000;outline:0"});if(i.settings.parent){c.setAttrib(g,"aria-parent","menu_"+i.settings.parent.id)}k=c.add(g,"div",{role:"presentation",id:"menu_"+i.id+"_co","class":i.classPrefix+(j["class"]?" "+j["class"]:"")});i.element=new b("menu_"+i.id,{blocker:1,container:j.container});if(j.menu_line){c.add(k,"span",{"class":i.classPrefix+"Line"})}l=c.add(k,"table",{role:"presentation",id:"menu_"+i.id+"_tbl",border:0,cellPadding:0,cellSpacing:0});h=c.add(l,"tbody");f(i.items,function(m){i._add(h,m)});i.rendered=true;return g},_setupKeyboardNav:function(){var i,h,g=this;i=c.select("#menu_"+g.id)[0];h=c.select("a[role=option]","menu_"+g.id);h.splice(0,0,i);g.keyboardNav=new e.ui.KeyboardNavigation({root:"menu_"+g.id,items:h,onCancel:function(){g.hideMenu()},enableUpDown:true});i.focus()},_keyHandler:function(g){var h=this,i;switch(g.keyCode){case 37:if(h.settings.parent){h.hideMenu();h.settings.parent.focus();a.cancel(g)}break;case 39:if(h.mouseOverFunc){h.mouseOverFunc(g)}break}},_add:function(j,h){var i,q=h.settings,p,l,k,m=this.classPrefix,g;if(q.separator){l=c.add(j,"tr",{id:h.id,"class":m+"ItemSeparator"});c.add(l,"td",{"class":m+"ItemSeparator"});if(i=l.previousSibling){c.addClass(i,"mceLast")}return}i=l=c.add(j,"tr",{id:h.id,"class":m+"Item "+m+"ItemEnabled"});i=k=c.add(i,q.titleItem?"th":"td");i=p=c.add(i,"a",{id:h.id+"_aria",role:q.titleItem?"presentation":"option",href:"javascript:;",onclick:"return false;",onmousedown:"return false;"});if(q.parent){c.setAttrib(p,"aria-haspopup","true");c.setAttrib(p,"aria-owns","menu_"+h.id)}c.addClass(k,q["class"]);g=c.add(i,"span",{"class":"mceIcon"+(q.icon?" mce_"+q.icon:"")});if(q.icon_src){c.add(g,"img",{src:q.icon_src})}i=c.add(i,q.element||"span",{"class":"mceText",title:h.settings.title},h.settings.title);if(h.settings.style){c.setAttrib(i,"style",h.settings.style)}if(j.childNodes.length==1){c.addClass(l,"mceFirst")}if((i=l.previousSibling)&&c.hasClass(i,m+"ItemSeparator")){c.addClass(l,"mceFirst")}if(h.collapse){c.addClass(l,m+"ItemSub")}if(i=l.previousSibling){c.removeClass(i,"mceLast")}c.addClass(l,"mceLast")}})})(tinymce);(function(b){var a=b.DOM;b.create("tinymce.ui.Button:tinymce.ui.Control",{Button:function(e,d,c){this.parent(e,d,c);this.classPrefix="mceButton"},renderHTML:function(){var f=this.classPrefix,e=this.settings,d,c;c=a.encode(e.label||"");d='<a role="button" id="'+this.id+'" href="javascript:;" class="'+f+" "+f+"Enabled "+e["class"]+(c?" "+f+"Labeled":"")+'" onmousedown="return false;" onclick="return false;" aria-labelledby="'+this.id+'_voice" title="'+a.encode(e.title)+'">';if(e.image&&!(this.editor&&this.editor.forcedHighContrastMode)){d+='<img class="mceIcon" src="'+e.image+'" alt="'+a.encode(e.title)+'" />'+c}else{d+='<span class="mceIcon '+e["class"]+'"></span>'+(c?'<span class="'+f+'Label">'+c+"</span>":"")}d+='<span class="mceVoiceLabel mceIconOnly" style="display: none;" id="'+this.id+'_voice">'+e.title+"</span>";d+="</a>";return d},postRender:function(){var c=this,d=c.settings;b.dom.Event.add(c.id,"click",function(f){if(!c.isDisabled()){return d.onclick.call(d.scope,f)}})}})})(tinymce);(function(d){var c=d.DOM,b=d.dom.Event,e=d.each,a=d.util.Dispatcher;d.create("tinymce.ui.ListBox:tinymce.ui.Control",{ListBox:function(i,h,f){var g=this;g.parent(i,h,f);g.items=[];g.onChange=new a(g);g.onPostRender=new a(g);g.onAdd=new a(g);g.onRenderMenu=new d.util.Dispatcher(this);g.classPrefix="mceListBox"},select:function(h){var g=this,j,i;if(h==undefined){return g.selectByIndex(-1)}if(h&&h.call){i=h}else{i=function(f){return f==h}}if(h!=g.selectedValue){e(g.items,function(k,f){if(i(k.value)){j=1;g.selectByIndex(f);return false}});if(!j){g.selectByIndex(-1)}}},selectByIndex:function(f){var g=this,h,i;if(f!=g.selectedIndex){h=c.get(g.id+"_text");i=g.items[f];if(i){g.selectedValue=i.value;g.selectedIndex=f;c.setHTML(h,c.encode(i.title));c.removeClass(h,"mceTitle");c.setAttrib(g.id,"aria-valuenow",i.title)}else{c.setHTML(h,c.encode(g.settings.title));c.addClass(h,"mceTitle");g.selectedValue=g.selectedIndex=null;c.setAttrib(g.id,"aria-valuenow",g.settings.title)}h=0}},add:function(i,f,h){var g=this;h=h||{};h=d.extend(h,{title:i,value:f});g.items.push(h);g.onAdd.dispatch(g,h)},getLength:function(){return this.items.length},renderHTML:function(){var i="",f=this,g=f.settings,j=f.classPrefix;i='<span role="button" aria-haspopup="true" aria-labelledby="'+f.id+'_text" aria-describedby="'+f.id+'_voiceDesc"><table role="presentation" tabindex="0" id="'+f.id+'" cellpadding="0" cellspacing="0" class="'+j+" "+j+"Enabled"+(g["class"]?(" "+g["class"]):"")+'"><tbody><tr>';i+="<td>"+c.createHTML("span",{id:f.id+"_voiceDesc","class":"voiceLabel",style:"display:none;"},f.settings.title);i+=c.createHTML("a",{id:f.id+"_text",tabindex:-1,href:"javascript:;","class":"mceText",onclick:"return false;",onmousedown:"return false;"},c.encode(f.settings.title))+"</td>";i+="<td>"+c.createHTML("a",{id:f.id+"_open",tabindex:-1,href:"javascript:;","class":"mceOpen",onclick:"return false;",onmousedown:"return false;"},'<span><span style="display:none;" class="mceIconOnly" aria-hidden="true">\u25BC</span></span>')+"</td>";i+="</tr></tbody></table></span>";return i},showMenu:function(){var g=this,i,h=c.get(this.id),f;if(g.isDisabled()||g.items.length==0){return}if(g.menu&&g.menu.isMenuVisible){return g.hideMenu()}if(!g.isMenuRendered){g.renderMenu();g.isMenuRendered=true}i=c.getPos(h);f=g.menu;f.settings.offset_x=i.x;f.settings.offset_y=i.y;f.settings.keyboard_focus=!d.isOpera;if(g.oldID){f.items[g.oldID].setSelected(0)}e(g.items,function(j){if(j.value===g.selectedValue){f.items[j.id].setSelected(1);g.oldID=j.id}});f.showMenu(0,h.clientHeight);b.add(c.doc,"mousedown",g.hideMenu,g);c.addClass(g.id,g.classPrefix+"Selected")},hideMenu:function(g){var f=this;if(f.menu&&f.menu.isMenuVisible){c.removeClass(f.id,f.classPrefix+"Selected");if(g&&g.type=="mousedown"&&(g.target.id==f.id+"_text"||g.target.id==f.id+"_open")){return}if(!g||!c.getParent(g.target,".mceMenu")){c.removeClass(f.id,f.classPrefix+"Selected");b.remove(c.doc,"mousedown",f.hideMenu,f);f.menu.hideMenu()}}},renderMenu:function(){var g=this,f;f=g.settings.control_manager.createDropMenu(g.id+"_menu",{menu_line:1,"class":g.classPrefix+"Menu mceNoIcons",max_width:150,max_height:150});f.onHideMenu.add(function(){g.hideMenu();g.focus()});f.add({title:g.settings.title,"class":"mceMenuItemTitle",onclick:function(){if(g.settings.onselect("")!==false){g.select("")}}});e(g.items,function(h){if(h.value===undefined){f.add({title:h.title,"class":"mceMenuItemTitle",onclick:function(){if(g.settings.onselect("")!==false){g.select("")}}})}else{h.id=c.uniqueId();h.onclick=function(){if(g.settings.onselect(h.value)!==false){g.select(h.value)}};f.add(h)}});g.onRenderMenu.dispatch(g,f);g.menu=f},postRender:function(){var f=this,g=f.classPrefix;b.add(f.id,"click",f.showMenu,f);b.add(f.id,"keydown",function(h){if(h.keyCode==32){f.showMenu(h);b.cancel(h)}});b.add(f.id,"focus",function(){if(!f._focused){f.keyDownHandler=b.add(f.id,"keydown",function(h){if(h.keyCode==40){f.showMenu();b.cancel(h)}});f.keyPressHandler=b.add(f.id,"keypress",function(i){var h;if(i.keyCode==13){h=f.selectedValue;f.selectedValue=null;b.cancel(i);f.settings.onselect(h)}})}f._focused=1});b.add(f.id,"blur",function(){b.remove(f.id,"keydown",f.keyDownHandler);b.remove(f.id,"keypress",f.keyPressHandler);f._focused=0});if(d.isIE6||!c.boxModel){b.add(f.id,"mouseover",function(){if(!c.hasClass(f.id,g+"Disabled")){c.addClass(f.id,g+"Hover")}});b.add(f.id,"mouseout",function(){if(!c.hasClass(f.id,g+"Disabled")){c.removeClass(f.id,g+"Hover")}})}f.onPostRender.dispatch(f,c.get(f.id))},destroy:function(){this.parent();b.clear(this.id+"_text");b.clear(this.id+"_open")}})})(tinymce);(function(d){var c=d.DOM,b=d.dom.Event,e=d.each,a=d.util.Dispatcher;d.create("tinymce.ui.NativeListBox:tinymce.ui.ListBox",{NativeListBox:function(g,f){this.parent(g,f);this.classPrefix="mceNativeListBox"},setDisabled:function(f){c.get(this.id).disabled=f;this.setAriaProperty("disabled",f)},isDisabled:function(){return c.get(this.id).disabled},select:function(h){var g=this,j,i;if(h==undefined){return g.selectByIndex(-1)}if(h&&h.call){i=h}else{i=function(f){return f==h}}if(h!=g.selectedValue){e(g.items,function(k,f){if(i(k.value)){j=1;g.selectByIndex(f);return false}});if(!j){g.selectByIndex(-1)}}},selectByIndex:function(f){c.get(this.id).selectedIndex=f+1;this.selectedValue=this.items[f]?this.items[f].value:null},add:function(j,g,f){var i,h=this;f=f||{};f.value=g;if(h.isRendered()){c.add(c.get(this.id),"option",f,j)}i={title:j,value:g,attribs:f};h.items.push(i);h.onAdd.dispatch(h,i)},getLength:function(){return this.items.length},renderHTML:function(){var g,f=this;g=c.createHTML("option",{value:""},"-- "+f.settings.title+" --");e(f.items,function(h){g+=c.createHTML("option",{value:h.value},h.title)});g=c.createHTML("select",{id:f.id,"class":"mceNativeListBox","aria-labelledby":f.id+"_aria"},g);g+=c.createHTML("span",{id:f.id+"_aria",style:"display: none"},f.settings.title);return g},postRender:function(){var g=this,h,i=true;g.rendered=true;function f(k){var j=g.items[k.target.selectedIndex-1];if(j&&(j=j.value)){g.onChange.dispatch(g,j);if(g.settings.onselect){g.settings.onselect(j)}}}b.add(g.id,"change",f);b.add(g.id,"keydown",function(k){var j;b.remove(g.id,"change",h);i=false;j=b.add(g.id,"blur",function(){if(i){return}i=true;b.add(g.id,"change",f);b.remove(g.id,"blur",j)});if(k.keyCode==13||k.keyCode==32){f(k);return b.cancel(k)}});g.onPostRender.dispatch(g,c.get(g.id))}})})(tinymce);(function(c){var b=c.DOM,a=c.dom.Event,d=c.each;c.create("tinymce.ui.MenuButton:tinymce.ui.Button",{MenuButton:function(g,f,e){this.parent(g,f,e);this.onRenderMenu=new c.util.Dispatcher(this);f.menu_container=f.menu_container||b.doc.body},showMenu:function(){var g=this,j,i,h=b.get(g.id),f;if(g.isDisabled()){return}if(!g.isMenuRendered){g.renderMenu();g.isMenuRendered=true}if(g.isMenuVisible){return g.hideMenu()}j=b.getPos(g.settings.menu_container);i=b.getPos(h);f=g.menu;f.settings.offset_x=i.x;f.settings.offset_y=i.y;f.settings.vp_offset_x=i.x;f.settings.vp_offset_y=i.y;f.settings.keyboard_focus=g._focused;f.showMenu(0,h.clientHeight);a.add(b.doc,"mousedown",g.hideMenu,g);g.setState("Selected",1);g.isMenuVisible=1},renderMenu:function(){var f=this,e;e=f.settings.control_manager.createDropMenu(f.id+"_menu",{menu_line:1,"class":this.classPrefix+"Menu",icons:f.settings.icons});e.onHideMenu.add(function(){f.hideMenu();f.focus()});f.onRenderMenu.dispatch(f,e);f.menu=e},hideMenu:function(g){var f=this;if(g&&g.type=="mousedown"&&b.getParent(g.target,function(h){return h.id===f.id||h.id===f.id+"_open"})){return}if(!g||!b.getParent(g.target,".mceMenu")){f.setState("Selected",0);a.remove(b.doc,"mousedown",f.hideMenu,f);if(f.menu){f.menu.hideMenu()}}f.isMenuVisible=0},postRender:function(){var e=this,f=e.settings;a.add(e.id,"click",function(){if(!e.isDisabled()){if(f.onclick){f.onclick(e.value)}e.showMenu()}})}})})(tinymce);(function(c){var b=c.DOM,a=c.dom.Event,d=c.each;c.create("tinymce.ui.SplitButton:tinymce.ui.MenuButton",{SplitButton:function(g,f,e){this.parent(g,f,e);this.classPrefix="mceSplitButton"},renderHTML:function(){var i,f=this,g=f.settings,e;i="<tbody><tr>";if(g.image){e=b.createHTML("img ",{src:g.image,role:"presentation","class":"mceAction "+g["class"]})}else{e=b.createHTML("span",{"class":"mceAction "+g["class"]},"")}e+=b.createHTML("span",{"class":"mceVoiceLabel mceIconOnly",id:f.id+"_voice",style:"display:none;"},g.title);i+="<td >"+b.createHTML("a",{role:"button",id:f.id+"_action",tabindex:"-1",href:"javascript:;","class":"mceAction "+g["class"],onclick:"return false;",onmousedown:"return false;",title:g.title},e)+"</td>";e=b.createHTML("span",{"class":"mceOpen "+g["class"]},'<span style="display:none;" class="mceIconOnly" aria-hidden="true">\u25BC</span>');i+="<td >"+b.createHTML("a",{role:"button",id:f.id+"_open",tabindex:"-1",href:"javascript:;","class":"mceOpen "+g["class"],onclick:"return false;",onmousedown:"return false;",title:g.title},e)+"</td>";i+="</tr></tbody>";i=b.createHTML("table",{id:f.id,role:"presentation",tabindex:"0","class":"mceSplitButton mceSplitButtonEnabled "+g["class"],cellpadding:"0",cellspacing:"0",title:g.title},i);return b.createHTML("span",{role:"button","aria-labelledby":f.id+"_voice","aria-haspopup":"true"},i)},postRender:function(){var e=this,g=e.settings,f;if(g.onclick){f=function(h){if(!e.isDisabled()){g.onclick(e.value);a.cancel(h)}};a.add(e.id+"_action","click",f);a.add(e.id,["click","keydown"],function(h){var k=32,m=14,i=13,j=38,l=40;if((h.keyCode===32||h.keyCode===13||h.keyCode===14)&&!h.altKey&&!h.ctrlKey&&!h.metaKey){f();a.cancel(h)}else{if(h.type==="click"||h.keyCode===l){e.showMenu();a.cancel(h)}}})}a.add(e.id+"_open","click",function(h){e.showMenu();a.cancel(h)});a.add([e.id,e.id+"_open"],"focus",function(){e._focused=1});a.add([e.id,e.id+"_open"],"blur",function(){e._focused=0});if(c.isIE6||!b.boxModel){a.add(e.id,"mouseover",function(){if(!b.hasClass(e.id,"mceSplitButtonDisabled")){b.addClass(e.id,"mceSplitButtonHover")}});a.add(e.id,"mouseout",function(){if(!b.hasClass(e.id,"mceSplitButtonDisabled")){b.removeClass(e.id,"mceSplitButtonHover")}})}},destroy:function(){this.parent();a.clear(this.id+"_action");a.clear(this.id+"_open");a.clear(this.id)}})})(tinymce);(function(d){var c=d.DOM,a=d.dom.Event,b=d.is,e=d.each;d.create("tinymce.ui.ColorSplitButton:tinymce.ui.SplitButton",{ColorSplitButton:function(i,h,f){var g=this;g.parent(i,h,f);g.settings=h=d.extend({colors:"000000,993300,333300,003300,003366,000080,333399,333333,800000,FF6600,808000,008000,008080,0000FF,666699,808080,FF0000,FF9900,99CC00,339966,33CCCC,3366FF,800080,999999,FF00FF,FFCC00,FFFF00,00FF00,00FFFF,00CCFF,993366,C0C0C0,FF99CC,FFCC99,FFFF99,CCFFCC,CCFFFF,99CCFF,CC99FF,FFFFFF",grid_width:8,default_color:"#888888"},g.settings);g.onShowMenu=new d.util.Dispatcher(g);g.onHideMenu=new d.util.Dispatcher(g);g.value=h.default_color},showMenu:function(){var f=this,g,j,i,h;if(f.isDisabled()){return}if(!f.isMenuRendered){f.renderMenu();f.isMenuRendered=true}if(f.isMenuVisible){return f.hideMenu()}i=c.get(f.id);c.show(f.id+"_menu");c.addClass(i,"mceSplitButtonSelected");h=c.getPos(i);c.setStyles(f.id+"_menu",{left:h.x,top:h.y+i.clientHeight,zIndex:200000});i=0;a.add(c.doc,"mousedown",f.hideMenu,f);f.onShowMenu.dispatch(f);if(f._focused){f._keyHandler=a.add(f.id+"_menu","keydown",function(k){if(k.keyCode==27){f.hideMenu()}});c.select("a",f.id+"_menu")[0].focus()}f.isMenuVisible=1},hideMenu:function(g){var f=this;if(f.isMenuVisible){if(g&&g.type=="mousedown"&&c.getParent(g.target,function(h){return h.id===f.id+"_open"})){return}if(!g||!c.getParent(g.target,".mceSplitButtonMenu")){c.removeClass(f.id,"mceSplitButtonSelected");a.remove(c.doc,"mousedown",f.hideMenu,f);a.remove(f.id+"_menu","keydown",f._keyHandler);c.hide(f.id+"_menu")}f.isMenuVisible=0}},renderMenu:function(){var p=this,h,k=0,q=p.settings,g,j,l,o,f;o=c.add(q.menu_container,"div",{role:"listbox",id:p.id+"_menu","class":q.menu_class+" "+q["class"],style:"position:absolute;left:0;top:-1000px;"});h=c.add(o,"div",{"class":q["class"]+" mceSplitButtonMenu"});c.add(h,"span",{"class":"mceMenuLine"});g=c.add(h,"table",{role:"presentation","class":"mceColorSplitMenu"});j=c.add(g,"tbody");k=0;e(b(q.colors,"array")?q.colors:q.colors.split(","),function(i){i=i.replace(/^#/,"");if(!k--){l=c.add(j,"tr");k=q.grid_width-1}g=c.add(l,"td");g=c.add(g,"a",{role:"option",href:"javascript:;",style:{backgroundColor:"#"+i},title:p.editor.getLang("colors."+i,i),"data-mce-color":"#"+i});if(p.editor.forcedHighContrastMode){g=c.add(g,"canvas",{width:16,height:16,"aria-hidden":"true"});if(g.getContext&&(f=g.getContext("2d"))){f.fillStyle="#"+i;f.fillRect(0,0,16,16)}else{c.remove(g)}}});if(q.more_colors_func){g=c.add(j,"tr");g=c.add(g,"td",{colspan:q.grid_width,"class":"mceMoreColors"});g=c.add(g,"a",{role:"option",id:p.id+"_more",href:"javascript:;",onclick:"return false;","class":"mceMoreColors"},q.more_colors_title);a.add(g,"click",function(i){q.more_colors_func.call(q.more_colors_scope||this);return a.cancel(i)})}c.addClass(h,"mceColorSplitMenu");new d.ui.KeyboardNavigation({root:p.id+"_menu",items:c.select("a",p.id+"_menu"),onCancel:function(){p.hideMenu();p.focus()}});a.add(p.id+"_menu","mousedown",function(i){return a.cancel(i)});a.add(p.id+"_menu","click",function(i){var m;i=c.getParent(i.target,"a",j);if(i&&i.nodeName.toLowerCase()=="a"&&(m=i.getAttribute("data-mce-color"))){p.setColor(m)}return a.cancel(i)});return o},setColor:function(f){this.displayColor(f);this.hideMenu();this.settings.onselect(f)},displayColor:function(g){var f=this;c.setStyle(f.id+"_preview","backgroundColor",g);f.value=g},postRender:function(){var f=this,g=f.id;f.parent();c.add(g+"_action","div",{id:g+"_preview","class":"mceColorPreview"});c.setStyle(f.id+"_preview","backgroundColor",f.value)},destroy:function(){this.parent();a.clear(this.id+"_menu");a.clear(this.id+"_more");c.remove(this.id+"_menu")}})})(tinymce);(function(b){var d=b.DOM,c=b.each,a=b.dom.Event;b.create("tinymce.ui.ToolbarGroup:tinymce.ui.Container",{renderHTML:function(){var f=this,i=[],e=f.controls,j=b.each,g=f.settings;i.push('<div id="'+f.id+'" role="group" aria-labelledby="'+f.id+'_voice">');i.push("<span role='application'>");i.push('<span id="'+f.id+'_voice" class="mceVoiceLabel" style="display:none;">'+d.encode(g.name)+"</span>");j(e,function(h){i.push(h.renderHTML())});i.push("</span>");i.push("</div>");return i.join("")},focus:function(){this.keyNav.focus()},postRender:function(){var f=this,e=[];c(f.controls,function(g){c(g.controls,function(h){if(h.id){e.push(h)}})});f.keyNav=new b.ui.KeyboardNavigation({root:f.id,items:e,onCancel:function(){f.editor.focus()},excludeFromTabOrder:!f.settings.tab_focus_toolbar})},destroy:function(){var e=this;e.parent();e.keyNav.destroy();a.clear(e.id)}})})(tinymce);(function(a){var c=a.DOM,b=a.each;a.create("tinymce.ui.Toolbar:tinymce.ui.Container",{renderHTML:function(){var m=this,f="",j,k,n=m.settings,e,d,g,l;l=m.controls;for(e=0;e<l.length;e++){k=l[e];d=l[e-1];g=l[e+1];if(e===0){j="mceToolbarStart";if(k.Button){j+=" mceToolbarStartButton"}else{if(k.SplitButton){j+=" mceToolbarStartSplitButton"}else{if(k.ListBox){j+=" mceToolbarStartListBox"}}}f+=c.createHTML("td",{"class":j},c.createHTML("span",null,"<!-- IE -->"))}if(d&&k.ListBox){if(d.Button||d.SplitButton){f+=c.createHTML("td",{"class":"mceToolbarEnd"},c.createHTML("span",null,"<!-- IE -->"))}}if(c.stdMode){f+='<td style="position: relative">'+k.renderHTML()+"</td>"}else{f+="<td>"+k.renderHTML()+"</td>"}if(g&&k.ListBox){if(g.Button||g.SplitButton){f+=c.createHTML("td",{"class":"mceToolbarStart"},c.createHTML("span",null,"<!-- IE -->"))}}}j="mceToolbarEnd";if(k.Button){j+=" mceToolbarEndButton"}else{if(k.SplitButton){j+=" mceToolbarEndSplitButton"}else{if(k.ListBox){j+=" mceToolbarEndListBox"}}}f+=c.createHTML("td",{"class":j},c.createHTML("span",null,"<!-- IE -->"));return c.createHTML("table",{id:m.id,"class":"mceToolbar"+(n["class"]?" "+n["class"]:""),cellpadding:"0",cellspacing:"0",align:m.settings.align||"",role:"presentation",tabindex:"-1"},"<tbody><tr>"+f+"</tr></tbody>")}})})(tinymce);(function(b){var a=b.util.Dispatcher,c=b.each;b.create("tinymce.AddOnManager",{AddOnManager:function(){var d=this;d.items=[];d.urls={};d.lookup={};d.onAdd=new a(d)},get:function(d){if(this.lookup[d]){return this.lookup[d].instance}else{return undefined}},dependencies:function(e){var d;if(this.lookup[e]){d=this.lookup[e].dependencies}return d||[]},requireLangPack:function(e){var d=b.settings;if(d&&d.language&&d.language_load!==false){b.ScriptLoader.add(this.urls[e]+"/langs/"+d.language+".js")}},add:function(f,e,d){this.items.push(e);this.lookup[f]={instance:e,dependencies:d};this.onAdd.dispatch(this,f,e);return e},createUrl:function(d,e){if(typeof e==="object"){return e}else{return{prefix:d.prefix,resource:e,suffix:d.suffix}}},addComponents:function(f,d){var e=this.urls[f];b.each(d,function(g){b.ScriptLoader.add(e+"/"+g)})},load:function(j,f,d,h){var g=this,e=f;function i(){var k=g.dependencies(j);b.each(k,function(m){var l=g.createUrl(f,m);g.load(l.resource,l,undefined,undefined)});if(d){if(h){d.call(h)}else{d.call(b.ScriptLoader)}}}if(g.urls[j]){return}if(typeof f==="object"){e=f.prefix+f.resource+f.suffix}if(e.indexOf("/")!=0&&e.indexOf("://")==-1){e=b.baseURL+"/"+e}g.urls[j]=e.substring(0,e.lastIndexOf("/"));if(g.lookup[j]){i()}else{b.ScriptLoader.add(e,i,h)}}});b.PluginManager=new b.AddOnManager();b.ThemeManager=new b.AddOnManager()}(tinymce));(function(j){var g=j.each,d=j.extend,k=j.DOM,i=j.dom.Event,f=j.ThemeManager,b=j.PluginManager,e=j.explode,h=j.util.Dispatcher,a,c=0;j.documentBaseURL=window.location.href.replace(/[\?#].*$/,"").replace(/[\/\\][^\/]+$/,"");if(!/[\/\\]$/.test(j.documentBaseURL)){j.documentBaseURL+="/"}j.baseURL=new j.util.URI(j.documentBaseURL).toAbsolute(j.baseURL);j.baseURI=new j.util.URI(j.baseURL);j.onBeforeUnload=new h(j);i.add(window,"beforeunload",function(l){j.onBeforeUnload.dispatch(j,l)});j.onAddEditor=new h(j);j.onRemoveEditor=new h(j);j.EditorManager=d(j,{editors:[],i18n:{},activeEditor:null,init:function(q){var n=this,p,l=j.ScriptLoader,u,o=[],m;function r(x,y,t){var v=x[y];if(!v){return}if(j.is(v,"string")){t=v.replace(/\.\w+$/,"");t=t?j.resolve(t):0;v=j.resolve(v)}return v.apply(t||this,Array.prototype.slice.call(arguments,2))}q=d({theme:"simple",language:"en"},q);n.settings=q;i.add(document,"init",function(){var s,v;r(q,"onpageload");switch(q.mode){case"exact":s=q.elements||"";if(s.length>0){g(e(s),function(x){if(k.get(x)){m=new j.Editor(x,q);o.push(m);m.render(1)}else{g(document.forms,function(y){g(y.elements,function(z){if(z.name===x){x="mce_editor_"+c++;k.setAttrib(z,"id",x);m=new j.Editor(x,q);o.push(m);m.render(1)}})})}})}break;case"textareas":case"specific_textareas":function t(y,x){return x.constructor===RegExp?x.test(y.className):k.hasClass(y,x)}g(k.select("textarea"),function(x){if(q.editor_deselector&&t(x,q.editor_deselector)){return}if(!q.editor_selector||t(x,q.editor_selector)){u=k.get(x.name);if(!x.id&&!u){x.id=x.name}if(!x.id||n.get(x.id)){x.id=k.uniqueId()}m=new j.Editor(x.id,q);o.push(m);m.render(1)}});break}if(q.oninit){s=v=0;g(o,function(x){v++;if(!x.initialized){x.onInit.add(function(){s++;if(s==v){r(q,"oninit")}})}else{s++}if(s==v){r(q,"oninit")}})}})},get:function(l){if(l===a){return this.editors}return this.editors[l]},getInstanceById:function(l){return this.get(l)},add:function(m){var l=this,n=l.editors;n[m.id]=m;n.push(m);l._setActive(m);l.onAddEditor.dispatch(l,m);return m},remove:function(n){var m=this,l,o=m.editors;if(!o[n.id]){return null}delete o[n.id];for(l=0;l<o.length;l++){if(o[l]==n){o.splice(l,1);break}}if(m.activeEditor==n){m._setActive(o[0])}n.destroy();m.onRemoveEditor.dispatch(m,n);return n},execCommand:function(r,p,o){var q=this,n=q.get(o),l;switch(r){case"mceFocus":n.focus();return true;case"mceAddEditor":case"mceAddControl":if(!q.get(o)){new j.Editor(o,q.settings).render()}return true;case"mceAddFrameControl":l=o.window;l.tinyMCE=tinyMCE;l.tinymce=j;j.DOM.doc=l.document;j.DOM.win=l;n=new j.Editor(o.element_id,o);n.render();if(j.isIE){function m(){n.destroy();l.detachEvent("onunload",m);l=l.tinyMCE=l.tinymce=null}l.attachEvent("onunload",m)}o.page_window=null;return true;case"mceRemoveEditor":case"mceRemoveControl":if(n){n.remove()}return true;case"mceToggleEditor":if(!n){q.execCommand("mceAddControl",0,o);return true}if(n.isHidden()){n.show()}else{n.hide()}return true}if(q.activeEditor){return q.activeEditor.execCommand(r,p,o)}return false},execInstanceCommand:function(p,o,n,m){var l=this.get(p);if(l){return l.execCommand(o,n,m)}return false},triggerSave:function(){g(this.editors,function(l){l.save()})},addI18n:function(n,q){var l,m=this.i18n;if(!j.is(n,"string")){g(n,function(r,p){g(r,function(t,s){g(t,function(v,u){if(s==="common"){m[p+"."+u]=v}else{m[p+"."+s+"."+u]=v}})})})}else{g(q,function(r,p){m[n+"."+p]=r})}},_setActive:function(l){this.selectedInstance=this.activeEditor=l}})})(tinymce);(function(m){var n=m.DOM,j=m.dom.Event,f=m.extend,k=m.util.Dispatcher,i=m.each,a=m.isGecko,b=m.isIE,e=m.isWebKit,d=m.is,h=m.ThemeManager,c=m.PluginManager,o=m.inArray,l=m.grep,g=m.explode;m.create("tinymce.Editor",{Editor:function(r,q){var p=this;p.id=p.editorId=r;p.execCommands={};p.queryStateCommands={};p.queryValueCommands={};p.isNotDirty=false;p.plugins={};i(["onPreInit","onBeforeRenderUI","onPostRender","onInit","onRemove","onActivate","onDeactivate","onClick","onEvent","onMouseUp","onMouseDown","onDblClick","onKeyDown","onKeyUp","onKeyPress","onContextMenu","onSubmit","onReset","onPaste","onPreProcess","onPostProcess","onBeforeSetContent","onBeforeGetContent","onSetContent","onGetContent","onLoadContent","onSaveContent","onNodeChange","onChange","onBeforeExecCommand","onExecCommand","onUndo","onRedo","onVisualAid","onSetProgressState"],function(s){p[s]=new k(p)});p.settings=q=f({id:r,language:"en",docs_language:"en",theme:"simple",skin:"default",delta_width:0,delta_height:0,popup_css:"",plugins:"",document_base_url:m.documentBaseURL,add_form_submit_trigger:1,submit_patch:1,add_unload_trigger:1,convert_urls:1,relative_urls:1,remove_script_host:1,table_inline_editing:0,object_resizing:1,cleanup:1,accessibility_focus:1,custom_shortcuts:1,custom_undo_redo_keyboard_shortcuts:1,custom_undo_redo_restore_selection:1,custom_undo_redo:1,doctype:m.isIE6?'<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">':"<!DOCTYPE>",visual_table_class:"mceItemTable",visual:1,font_size_style_values:"xx-small,x-small,small,medium,large,x-large,xx-large",apply_source_formatting:1,directionality:"ltr",forced_root_block:"p",hidden_input:1,padd_empty_editor:1,render_ui:1,init_theme:1,force_p_newlines:1,indentation:"30px",keep_styles:1,fix_table_elements:1,inline_styles:1,convert_fonts_to_spans:true,indent:"simple",indent_before:"p,h1,h2,h3,h4,h5,h6,blockquote,div,title,style,pre,script,td,ul,li,area,table,thead,tfoot,tbody,tr",indent_after:"p,h1,h2,h3,h4,h5,h6,blockquote,div,title,style,pre,script,td,ul,li,area,table,thead,tfoot,tbody,tr",validate:true,entity_encoding:"named",url_converter:p.convertURL,url_converter_scope:p,ie7_compat:true},q);p.documentBaseURI=new m.util.URI(q.document_base_url||m.documentBaseURL,{base_uri:tinyMCE.baseURI});p.baseURI=m.baseURI;p.contentCSS=[];p.execCallback("setup",p)},render:function(r){var u=this,v=u.settings,x=u.id,p=m.ScriptLoader;if(!j.domLoaded){j.add(document,"init",function(){u.render()});return}tinyMCE.settings=v;if(!u.getElement()){return}if(m.isIDevice&&!m.isIOS5){return}if(!/TEXTAREA|INPUT/i.test(u.getElement().nodeName)&&v.hidden_input&&n.getParent(x,"form")){n.insertAfter(n.create("input",{type:"hidden",name:x}),x)}if(m.WindowManager){u.windowManager=new m.WindowManager(u)}if(v.encoding=="xml"){u.onGetContent.add(function(s,t){if(t.save){t.content=n.encode(t.content)}})}if(v.add_form_submit_trigger){u.onSubmit.addToTop(function(){if(u.initialized){u.save();u.isNotDirty=1}})}if(v.add_unload_trigger){u._beforeUnload=tinyMCE.onBeforeUnload.add(function(){if(u.initialized&&!u.destroyed&&!u.isHidden()){u.save({format:"raw",no_events:true})}})}m.addUnload(u.destroy,u);if(v.submit_patch){u.onBeforeRenderUI.add(function(){var s=u.getElement().form;if(!s){return}if(s._mceOldSubmit){return}if(!s.submit.nodeType&&!s.submit.length){u.formElement=s;s._mceOldSubmit=s.submit;s.submit=function(){m.triggerSave();u.isNotDirty=1;return u.formElement._mceOldSubmit(u.formElement)}}s=null})}function q(){if(v.language&&v.language_load!==false){p.add(m.baseURL+"/langs/"+v.language+".js")}if(v.theme&&v.theme.charAt(0)!="-"&&!h.urls[v.theme]){h.load(v.theme,"themes/"+v.theme+"/editor_template"+m.suffix+".js")}i(g(v.plugins),function(t){if(t&&!c.urls[t]){if(t.charAt(0)=="-"){t=t.substr(1,t.length);var s=c.dependencies(t);i(s,function(z){var y={prefix:"plugins/",resource:z,suffix:"/editor_plugin"+m.suffix+".js"};var z=c.createUrl(y,z);c.load(z.resource,z)})}else{if(t=="safari"){return}c.load(t,{prefix:"plugins/",resource:t,suffix:"/editor_plugin"+m.suffix+".js"})}}});p.loadQueue(function(){if(!u.removed){u.init()}})}q()},init:function(){var r,H=this,I=H.settings,E,A,D=H.getElement(),q,p,F,y,C,G,z,v=[];m.add(H);I.aria_label=I.aria_label||n.getAttrib(D,"aria-label",H.getLang("aria.rich_text_area"));if(I.theme){I.theme=I.theme.replace(/-/,"");q=h.get(I.theme);H.theme=new q();if(H.theme.init&&I.init_theme){H.theme.init(H,h.urls[I.theme]||m.documentBaseURL.replace(/\/$/,""))}}function B(J){var K=c.get(J),t=c.urls[J]||m.documentBaseURL.replace(/\/$/,""),s;if(K&&m.inArray(v,J)===-1){i(c.dependencies(J),function(u){B(u)});s=new K(H,t);H.plugins[J]=s;if(s.init){s.init(H,t);v.push(J)}}}i(g(I.plugins.replace(/\-/g,"")),B);if(I.popup_css!==false){if(I.popup_css){I.popup_css=H.documentBaseURI.toAbsolute(I.popup_css)}else{I.popup_css=H.baseURI.toAbsolute("themes/"+I.theme+"/skins/"+I.skin+"/dialog.css")}}if(I.popup_css_add){I.popup_css+=","+H.documentBaseURI.toAbsolute(I.popup_css_add)}H.controlManager=new m.ControlManager(H);if(I.custom_undo_redo){H.onBeforeExecCommand.add(function(t,J,u,K,s){if(J!="Undo"&&J!="Redo"&&J!="mceRepaint"&&(!s||!s.skip_undo)){H.undoManager.beforeChange()}});H.onExecCommand.add(function(t,J,u,K,s){if(J!="Undo"&&J!="Redo"&&J!="mceRepaint"&&(!s||!s.skip_undo)){H.undoManager.add()}})}H.onExecCommand.add(function(s,t){if(!/^(FontName|FontSize)$/.test(t)){H.nodeChanged()}});if(a){function x(s,t){if(!t||!t.initial){H.execCommand("mceRepaint")}}H.onUndo.add(x);H.onRedo.add(x);H.onSetContent.add(x)}H.onBeforeRenderUI.dispatch(H,H.controlManager);if(I.render_ui){E=I.width||D.style.width||D.offsetWidth;A=I.height||D.style.height||D.offsetHeight;H.orgDisplay=D.style.display;G=/^[0-9\.]+(|px)$/i;if(G.test(""+E)){E=Math.max(parseInt(E)+(q.deltaWidth||0),100)}if(G.test(""+A)){A=Math.max(parseInt(A)+(q.deltaHeight||0),100)}q=H.theme.renderUI({targetNode:D,width:E,height:A,deltaWidth:I.delta_width,deltaHeight:I.delta_height});H.editorContainer=q.editorContainer}if(document.domain&&location.hostname!=document.domain){m.relaxedDomain=document.domain}n.setStyles(q.sizeContainer||q.editorContainer,{width:E,height:A});if(I.content_css){m.each(g(I.content_css),function(s){H.contentCSS.push(H.documentBaseURI.toAbsolute(s))})}A=(q.iframeHeight||A)+(typeof(A)=="number"?(q.deltaHeight||0):"");if(A<100){A=100}H.iframeHTML=I.doctype+'<html><head xmlns="http://www.w3.org/1999/xhtml">';if(I.document_base_url!=m.documentBaseURL){H.iframeHTML+='<base href="'+H.documentBaseURI.getURI()+'" />'}if(I.ie7_compat){H.iframeHTML+='<meta http-equiv="X-UA-Compatible" content="IE=7" />'}else{H.iframeHTML+='<meta http-equiv="X-UA-Compatible" content="IE=edge" />'}H.iframeHTML+='<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />';if(!a||!/Firefox\/2/.test(navigator.userAgent)){for(z=0;z<H.contentCSS.length;z++){H.iframeHTML+='<link type="text/css" rel="stylesheet" href="'+H.contentCSS[z]+'" />'}H.contentCSS=[]}y=I.body_id||"tinymce";if(y.indexOf("=")!=-1){y=H.getParam("body_id","","hash");y=y[H.id]||y}C=I.body_class||"";if(C.indexOf("=")!=-1){C=H.getParam("body_class","","hash");C=C[H.id]||""}H.iframeHTML+='</head><body id="'+y+'" class="mceContentBody '+C+'"></body></html>';if(m.relaxedDomain&&(b||(m.isOpera&&parseFloat(opera.version())<11))){F='javascript:(function(){document.open();document.domain="'+document.domain+'";var ed = window.parent.tinyMCE.get("'+H.id+'");document.write(ed.iframeHTML);document.close();ed.setupIframe();})()'}r=n.add(q.iframeContainer,"iframe",{id:H.id+"_ifr",src:F||'javascript:""',frameBorder:"0",allowTransparency:"true",title:I.aria_label,style:{width:"100%",height:A}});H.contentAreaContainer=q.iframeContainer;n.get(q.editorContainer).style.display=H.orgDisplay;n.get(H.id).style.display="none";n.setAttrib(H.id,"aria-hidden",true);if(!m.relaxedDomain||!F){H.setupIframe()}D=r=q=null},setupIframe:function(x){var q=this,v=q.settings,y=n.get(q.id),z=q.getDoc(),u,p;if((!b||!m.relaxedDomain)&&!x){if(a&&!v.readonly){q.getWin().onload=function(){window.setTimeout(function(){var s=q.getBody(),t;s.innerHTML="<br>";if(s.contentEditable!==t){s.contentEditable=false;s.contentEditable=true;q.onMouseDown.add(function(A,B){if(B.target.nodeName==="HTML"){z.designMode="on";window.setTimeout(function(){z.designMode="off";q.getBody().focus()},1)}})}else{z.designMode="on"}q.setupIframe(true)},1)}}z.open();z.write(q.iframeHTML);z.close();if(m.relaxedDomain){z.domain=m.relaxedDomain}if(a&&!v.readonly){return}}p=q.getBody();p.disabled=true;if(!a&&!v.readonly){p.contentEditable=true}p.disabled=false;q.schema=new m.html.Schema(v);q.dom=new m.dom.DOMUtils(q.getDoc(),{keep_values:true,url_converter:q.convertURL,url_converter_scope:q,hex_colors:v.force_hex_style_colors,class_filter:v.class_filter,update_styles:1,fix_ie_paragraphs:1,schema:q.schema});q.parser=new m.html.DomParser(v,q.schema);if(!q.settings.allow_html_in_named_anchor){q.parser.addAttributeFilter("name",function(s,t){var B=s.length,D,A,C,E;while(B--){E=s[B];if(E.name==="a"&&E.firstChild){C=E.parent;D=E.lastChild;do{A=D.prev;C.insert(D,E);D=A}while(D)}}})}q.parser.addAttributeFilter("src,href,style",function(s,t){var A=s.length,C,E=q.dom,D,B;while(A--){C=s[A];D=C.attr(t);B="data-mce-"+t;if(!C.attributes.map[B]){if(t==="style"){C.attr(B,E.serializeStyle(E.parseStyle(D),C.name))}else{C.attr(B,q.convertURL(D,t,C.name))}}}});q.parser.addNodeFilter("script",function(s,t){var A=s.length;while(A--){s[A].attr("type","mce-text/javascript")}});q.parser.addNodeFilter("#cdata",function(s,t){var A=s.length,B;while(A--){B=s[A];B.type=8;B.name="#comment";B.value="[CDATA["+B.value+"]]"}});q.parser.addNodeFilter("p,h1,h2,h3,h4,h5,h6,div",function(t,A){var B=t.length,C,s=q.schema.getNonEmptyElements();while(B--){C=t[B];if(C.isEmpty(s)){C.empty().append(new m.html.Node("br",1)).shortEnded=true}}});q.serializer=new m.dom.Serializer(v,q.dom,q.schema);q.selection=new m.dom.Selection(q.dom,q.getWin(),q.serializer);q.formatter=new m.Formatter(this);q.formatter.register({alignleft:[{selector:"p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li",styles:{textAlign:"left"}},{selector:"img,table",collapsed:false,styles:{"float":"left"}}],aligncenter:[{selector:"p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li",styles:{textAlign:"center"}},{selector:"img",collapsed:false,styles:{display:"block",marginLeft:"auto",marginRight:"auto"}},{selector:"table",collapsed:false,styles:{marginLeft:"auto",marginRight:"auto"}}],alignright:[{selector:"p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li",styles:{textAlign:"right"}},{selector:"img,table",collapsed:false,styles:{"float":"right"}}],alignfull:[{selector:"p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li",styles:{textAlign:"justify"}}],bold:[{inline:"strong",remove:"all"},{inline:"span",styles:{fontWeight:"bold"}},{inline:"b",remove:"all"}],italic:[{inline:"em",remove:"all"},{inline:"span",styles:{fontStyle:"italic"}},{inline:"i",remove:"all"}],underline:[{inline:"span",styles:{textDecoration:"underline"},exact:true},{inline:"u",remove:"all"}],strikethrough:[{inline:"span",styles:{textDecoration:"line-through"},exact:true},{inline:"strike",remove:"all"}],forecolor:{inline:"span",styles:{color:"%value"},wrap_links:false},hilitecolor:{inline:"span",styles:{backgroundColor:"%value"},wrap_links:false},fontname:{inline:"span",styles:{fontFamily:"%value"}},fontsize:{inline:"span",styles:{fontSize:"%value"}},fontsize_class:{inline:"span",attributes:{"class":"%value"}},blockquote:{block:"blockquote",wrapper:1,remove:"all"},subscript:{inline:"sub"},superscript:{inline:"sup"},removeformat:[{selector:"b,strong,em,i,font,u,strike",remove:"all",split:true,expand:false,block_expand:true,deep:true},{selector:"span",attributes:["style","class"],remove:"empty",split:true,expand:false,deep:true},{selector:"*",attributes:["style","class"],split:false,expand:false,deep:true}]});i("p h1 h2 h3 h4 h5 h6 div address pre div code dt dd samp".split(/\s/),function(s){q.formatter.register(s,{block:s,remove:"all"})});q.formatter.register(q.settings.formats);q.undoManager=new m.UndoManager(q);q.undoManager.onAdd.add(function(t,s){if(t.hasUndo()){return q.onChange.dispatch(q,s,t)}});q.undoManager.onUndo.add(function(t,s){return q.onUndo.dispatch(q,s,t)});q.undoManager.onRedo.add(function(t,s){return q.onRedo.dispatch(q,s,t)});q.forceBlocks=new m.ForceBlocks(q,{forced_root_block:v.forced_root_block});q.editorCommands=new m.EditorCommands(q);q.serializer.onPreProcess.add(function(s,t){return q.onPreProcess.dispatch(q,t,s)});q.serializer.onPostProcess.add(function(s,t){return q.onPostProcess.dispatch(q,t,s)});q.onPreInit.dispatch(q);if(!v.gecko_spellcheck){q.getBody().spellcheck=0}if(!v.readonly){q._addEvents()}q.controlManager.onPostRender.dispatch(q,q.controlManager);q.onPostRender.dispatch(q);if(v.directionality){q.getBody().dir=v.directionality}if(v.nowrap){q.getBody().style.whiteSpace="nowrap"}if(v.handle_node_change_callback){q.onNodeChange.add(function(t,s,A){q.execCallback("handle_node_change_callback",q.id,A,-1,-1,true,q.selection.isCollapsed())})}if(v.save_callback){q.onSaveContent.add(function(s,A){var t=q.execCallback("save_callback",q.id,A.content,q.getBody());if(t){A.content=t}})}if(v.onchange_callback){q.onChange.add(function(t,s){q.execCallback("onchange_callback",q,s)})}if(v.protect){q.onBeforeSetContent.add(function(s,t){if(v.protect){i(v.protect,function(A){t.content=t.content.replace(A,function(B){return"<!--mce:protected "+escape(B)+"-->"})})}})}if(v.convert_newlines_to_brs){q.onBeforeSetContent.add(function(s,t){if(t.initial){t.content=t.content.replace(/\r?\n/g,"<br />")}})}if(v.preformatted){q.onPostProcess.add(function(s,t){t.content=t.content.replace(/^\s*<pre.*?>/,"");t.content=t.content.replace(/<\/pre>\s*$/,"");if(t.set){t.content='<pre class="mceItemHidden">'+t.content+"</pre>"}})}if(v.verify_css_classes){q.serializer.attribValueFilter=function(C,A){var B,t;if(C=="class"){if(!q.classesRE){t=q.dom.getClasses();if(t.length>0){B="";i(t,function(s){B+=(B?"|":"")+s["class"]});q.classesRE=new RegExp("("+B+")","gi")}}return !q.classesRE||/(\bmceItem\w+\b|\bmceTemp\w+\b)/g.test(A)||q.classesRE.test(A)?A:""}return A}}if(v.cleanup_callback){q.onBeforeSetContent.add(function(s,t){t.content=q.execCallback("cleanup_callback","insert_to_editor",t.content,t)});q.onPreProcess.add(function(s,t){if(t.set){q.execCallback("cleanup_callback","insert_to_editor_dom",t.node,t)}if(t.get){q.execCallback("cleanup_callback","get_from_editor_dom",t.node,t)}});q.onPostProcess.add(function(s,t){if(t.set){t.content=q.execCallback("cleanup_callback","insert_to_editor",t.content,t)}if(t.get){t.content=q.execCallback("cleanup_callback","get_from_editor",t.content,t)}})}if(v.save_callback){q.onGetContent.add(function(s,t){if(t.save){t.content=q.execCallback("save_callback",q.id,t.content,q.getBody())}})}if(v.handle_event_callback){q.onEvent.add(function(s,t,A){if(q.execCallback("handle_event_callback",t,s,A)===false){j.cancel(t)}})}q.onSetContent.add(function(){q.addVisual(q.getBody())});if(v.padd_empty_editor){q.onPostProcess.add(function(s,t){t.content=t.content.replace(/^(<p[^>]*>(&nbsp;|&#160;|\s|\u00a0|)<\/p>[\r\n]*|<br \/>[\r\n]*)$/,"")})}if(a){function r(s,t){i(s.dom.select("a"),function(B){var A=B.parentNode;if(s.dom.isBlock(A)&&A.lastChild===B){s.dom.add(A,"br",{"data-mce-bogus":1})}})}q.onExecCommand.add(function(s,t){if(t==="CreateLink"){r(s)}});q.onSetContent.add(q.selection.onSetContent.add(r))}q.load({initial:true,format:"html"});q.startContent=q.getContent({format:"raw"});q.undoManager.add();q.initialized=true;q.onInit.dispatch(q);q.execCallback("setupcontent_callback",q.id,q.getBody(),q.getDoc());q.execCallback("init_instance_callback",q);q.focus(true);q.nodeChanged({initial:1});i(q.contentCSS,function(s){q.dom.loadCSS(s)});if(v.auto_focus){setTimeout(function(){var s=m.get(v.auto_focus);s.selection.select(s.getBody(),1);s.selection.collapse(1);s.getBody().focus();s.getWin().focus()},100)}y=null},focus:function(s){var x,q=this,v=q.settings.content_editable,r,p,u=q.getDoc();if(!s){r=q.selection.getRng();if(r.item){p=r.item(0)}if(!v){q.getWin().focus()}if(p&&p.ownerDocument==u){r=u.body.createControlRange();r.addElement(p);r.select()}}if(m.activeEditor!=q){if((x=m.activeEditor)!=null){x.onDeactivate.dispatch(x,q)}q.onActivate.dispatch(q,x)}m._setActive(q)},execCallback:function(u){var p=this,r=p.settings[u],q;if(!r){return}if(p.callbackLookup&&(q=p.callbackLookup[u])){r=q.func;q=q.scope}if(d(r,"string")){q=r.replace(/\.\w+$/,"");q=q?m.resolve(q):0;r=m.resolve(r);p.callbackLookup=p.callbackLookup||{};p.callbackLookup[u]={func:r,scope:q}}return r.apply(q||p,Array.prototype.slice.call(arguments,1))},translate:function(p){var r=this.settings.language||"en",q=m.i18n;if(!p){return""}return q[r+"."+p]||p.replace(/{\#([^}]+)\}/g,function(t,s){return q[r+"."+s]||"{#"+s+"}"})},getLang:function(q,p){return m.i18n[(this.settings.language||"en")+"."+q]||(d(p)?p:"{#"+q+"}")},getParam:function(u,r,p){var s=m.trim,q=d(this.settings[u])?this.settings[u]:r,t;if(p==="hash"){t={};if(d(q,"string")){i(q.indexOf("=")>0?q.split(/[;,](?![^=;,]*(?:[;,]|$))/):q.split(","),function(x){x=x.split("=");if(x.length>1){t[s(x[0])]=s(x[1])}else{t[s(x[0])]=s(x)}})}else{t=q}return t}return q},nodeChanged:function(r){var p=this,q=p.selection,u=q.getStart()||p.getBody();if(p.initialized){r=r||{};u=b&&u.ownerDocument!=p.getDoc()?p.getBody():u;r.parents=[];p.dom.getParent(u,function(s){if(s.nodeName=="BODY"){return true}r.parents.push(s)});p.onNodeChange.dispatch(p,r?r.controlManager||p.controlManager:p.controlManager,u,q.isCollapsed(),r)}},addButton:function(r,q){var p=this;p.buttons=p.buttons||{};p.buttons[r]=q},addCommand:function(p,r,q){this.execCommands[p]={func:r,scope:q||this}},addQueryStateHandler:function(p,r,q){this.queryStateCommands[p]={func:r,scope:q||this}},addQueryValueHandler:function(p,r,q){this.queryValueCommands[p]={func:r,scope:q||this}},addShortcut:function(r,u,p,s){var q=this,v;if(!q.settings.custom_shortcuts){return false}q.shortcuts=q.shortcuts||{};if(d(p,"string")){v=p;p=function(){q.execCommand(v,false,null)}}if(d(p,"object")){v=p;p=function(){q.execCommand(v[0],v[1],v[2])}}i(g(r),function(t){var x={func:p,scope:s||this,desc:u,alt:false,ctrl:false,shift:false};i(g(t,"+"),function(y){switch(y){case"alt":case"ctrl":case"shift":x[y]=true;break;default:x.charCode=y.charCodeAt(0);x.keyCode=y.toUpperCase().charCodeAt(0)}});q.shortcuts[(x.ctrl?"ctrl":"")+","+(x.alt?"alt":"")+","+(x.shift?"shift":"")+","+x.keyCode]=x});return true},execCommand:function(x,v,z,p){var r=this,u=0,y,q;if(!/^(mceAddUndoLevel|mceEndUndoLevel|mceBeginUndoLevel|mceRepaint|SelectAll)$/.test(x)&&(!p||!p.skip_focus)){r.focus()}y={};r.onBeforeExecCommand.dispatch(r,x,v,z,y);if(y.terminate){return false}if(r.execCallback("execcommand_callback",r.id,r.selection.getNode(),x,v,z)){r.onExecCommand.dispatch(r,x,v,z,p);return true}if(y=r.execCommands[x]){q=y.func.call(y.scope,v,z);if(q!==true){r.onExecCommand.dispatch(r,x,v,z,p);return q}}i(r.plugins,function(s){if(s.execCommand&&s.execCommand(x,v,z)){r.onExecCommand.dispatch(r,x,v,z,p);u=1;return false}});if(u){return true}if(r.theme&&r.theme.execCommand&&r.theme.execCommand(x,v,z)){r.onExecCommand.dispatch(r,x,v,z,p);return true}if(r.editorCommands.execCommand(x,v,z)){r.onExecCommand.dispatch(r,x,v,z,p);return true}r.getDoc().execCommand(x,v,z);r.onExecCommand.dispatch(r,x,v,z,p)},queryCommandState:function(u){var q=this,v,r;if(q._isHidden()){return}if(v=q.queryStateCommands[u]){r=v.func.call(v.scope);if(r!==true){return r}}v=q.editorCommands.queryCommandState(u);if(v!==-1){return v}try{return this.getDoc().queryCommandState(u)}catch(p){}},queryCommandValue:function(v){var q=this,u,r;if(q._isHidden()){return}if(u=q.queryValueCommands[v]){r=u.func.call(u.scope);if(r!==true){return r}}u=q.editorCommands.queryCommandValue(v);if(d(u)){return u}try{return this.getDoc().queryCommandValue(v)}catch(p){}},show:function(){var p=this;n.show(p.getContainer());n.hide(p.id);p.load()},hide:function(){var p=this,q=p.getDoc();if(b&&q){q.execCommand("SelectAll")}p.save();n.hide(p.getContainer());n.setStyle(p.id,"display",p.orgDisplay)},isHidden:function(){return !n.isHidden(this.id)},setProgressState:function(p,q,r){this.onSetProgressState.dispatch(this,p,q,r);return p},load:function(s){var p=this,r=p.getElement(),q;if(r){s=s||{};s.load=true;q=p.setContent(d(r.value)?r.value:r.innerHTML,s);s.element=r;if(!s.no_events){p.onLoadContent.dispatch(p,s)}s.element=r=null;return q}},save:function(u){var p=this,s=p.getElement(),q,r;if(!s||!p.initialized){return}u=u||{};u.save=true;if(!u.no_events){p.undoManager.typing=false;p.undoManager.add()}u.element=s;q=u.content=p.getContent(u);if(!u.no_events){p.onSaveContent.dispatch(p,u)}q=u.content;if(!/TEXTAREA|INPUT/i.test(s.nodeName)){s.innerHTML=q;if(r=n.getParent(p.id,"form")){i(r.elements,function(t){if(t.name==p.id){t.value=q;return false}})}}else{s.value=q}u.element=s=null;return q},setContent:function(u,s){var r=this,q,p=r.getBody(),t;s=s||{};s.format=s.format||"html";s.set=true;s.content=u;if(!s.no_events){r.onBeforeSetContent.dispatch(r,s)}u=s.content;if(!m.isIE&&(u.length===0||/^\s+$/.test(u))){t=r.settings.forced_root_block;if(t){u="<"+t+'><br data-mce-bogus="1"></'+t+">"}else{u='<br data-mce-bogus="1">'}p.innerHTML=u;r.selection.select(p,true);r.selection.collapse(true);return}if(s.format!=="raw"){u=new m.html.Serializer({},r.schema).serialize(r.parser.parse(u))}s.content=m.trim(u);r.dom.setHTML(p,s.content);if(!s.no_events){r.onSetContent.dispatch(r,s)}return s.content},getContent:function(q){var p=this,r;q=q||{};q.format=q.format||"html";q.get=true;if(!q.no_events){p.onBeforeGetContent.dispatch(p,q)}if(q.format=="raw"){r=p.getBody().innerHTML}else{r=p.serializer.serialize(p.getBody(),q)}q.content=m.trim(r);if(!q.no_events){p.onGetContent.dispatch(p,q)}return q.content},isDirty:function(){var p=this;return m.trim(p.startContent)!=m.trim(p.getContent({format:"raw",no_events:1}))&&!p.isNotDirty},getContainer:function(){var p=this;if(!p.container){p.container=n.get(p.editorContainer||p.id+"_parent")}return p.container},getContentAreaContainer:function(){return this.contentAreaContainer},getElement:function(){return n.get(this.settings.content_element||this.id)},getWin:function(){var p=this,q;if(!p.contentWindow){q=n.get(p.id+"_ifr");if(q){p.contentWindow=q.contentWindow}}return p.contentWindow},getDoc:function(){var q=this,p;if(!q.contentDocument){p=q.getWin();if(p){q.contentDocument=p.document}}return q.contentDocument},getBody:function(){return this.bodyElement||this.getDoc().body},convertURL:function(p,x,v){var q=this,r=q.settings;if(r.urlconverter_callback){return q.execCallback("urlconverter_callback",p,v,true,x)}if(!r.convert_urls||(v&&v.nodeName=="LINK")||p.indexOf("file:")===0){return p}if(r.relative_urls){return q.documentBaseURI.toRelative(p)}p=q.documentBaseURI.toAbsolute(p,r.remove_script_host);return p},addVisual:function(r){var p=this,q=p.settings;r=r||p.getBody();if(!d(p.hasVisual)){p.hasVisual=q.visual}i(p.dom.select("table,a",r),function(t){var s;switch(t.nodeName){case"TABLE":s=p.dom.getAttrib(t,"border");if(!s||s=="0"){if(p.hasVisual){p.dom.addClass(t,q.visual_table_class)}else{p.dom.removeClass(t,q.visual_table_class)}}return;case"A":s=p.dom.getAttrib(t,"name");if(s){if(p.hasVisual){p.dom.addClass(t,"mceItemAnchor")}else{p.dom.removeClass(t,"mceItemAnchor")}}return}});p.onVisualAid.dispatch(p,r,p.hasVisual)},remove:function(){var p=this,q=p.getContainer();p.removed=1;p.hide();p.execCallback("remove_instance_callback",p);p.onRemove.dispatch(p);p.onExecCommand.listeners=[];m.remove(p);n.remove(q)},destroy:function(q){var p=this;if(p.destroyed){return}if(!q){m.removeUnload(p.destroy);tinyMCE.onBeforeUnload.remove(p._beforeUnload);if(p.theme&&p.theme.destroy){p.theme.destroy()}p.controlManager.destroy();p.selection.destroy();p.dom.destroy();if(!p.settings.content_editable){j.clear(p.getWin());j.clear(p.getDoc())}j.clear(p.getBody());j.clear(p.formElement)}if(p.formElement){p.formElement.submit=p.formElement._mceOldSubmit;p.formElement._mceOldSubmit=null}p.contentAreaContainer=p.formElement=p.container=p.settings.content_element=p.bodyElement=p.contentDocument=p.contentWindow=null;if(p.selection){p.selection=p.selection.win=p.selection.dom=p.selection.dom.doc=null}p.destroyed=1},_addEvents:function(){var B=this,r,C=B.settings,q=B.dom,x={mouseup:"onMouseUp",mousedown:"onMouseDown",click:"onClick",keyup:"onKeyUp",keydown:"onKeyDown",keypress:"onKeyPress",submit:"onSubmit",reset:"onReset",contextmenu:"onContextMenu",dblclick:"onDblClick",paste:"onPaste"};function p(t,D){var s=t.type;if(B.removed){return}if(B.onEvent.dispatch(B,t,D)!==false){B[x[t.fakeType||t.type]].dispatch(B,t,D)}}i(x,function(t,s){switch(s){case"contextmenu":q.bind(B.getDoc(),s,p);break;case"paste":q.bind(B.getBody(),s,function(D){p(D)});break;case"submit":case"reset":q.bind(B.getElement().form||n.getParent(B.id,"form"),s,p);break;default:q.bind(C.content_editable?B.getBody():B.getDoc(),s,p)}});q.bind(C.content_editable?B.getBody():(a?B.getDoc():B.getWin()),"focus",function(s){B.focus(true)});if(m.isGecko){q.bind(B.getDoc(),"DOMNodeInserted",function(t){var s;t=t.target;if(t.nodeType===1&&t.nodeName==="IMG"&&(s=t.getAttribute("data-mce-src"))){t.src=B.documentBaseURI.toAbsolute(s)}})}if(a){function u(){var E=this,G=E.getDoc(),F=E.settings;if(a&&!F.readonly){if(E._isHidden()){try{if(!F.content_editable){G.body.contentEditable=false;G.body.contentEditable=true}}catch(D){}}try{G.execCommand("styleWithCSS",0,false)}catch(D){if(!E._isHidden()){try{G.execCommand("useCSS",0,true)}catch(D){}}}if(!F.table_inline_editing){try{G.execCommand("enableInlineTableEditing",false,false)}catch(D){}}if(!F.object_resizing){try{G.execCommand("enableObjectResizing",false,false)}catch(D){}}}}B.onBeforeExecCommand.add(u);B.onMouseDown.add(u)}B.onClick.add(function(s,t){t=t.target;if(m.isWebKit&&t.nodeName=="IMG"){B.selection.getSel().setBaseAndExtent(t,0,t,1)}if(t.nodeName=="A"&&q.hasClass(t,"mceItemAnchor")){B.selection.select(t)}B.nodeChanged()});B.onMouseUp.add(B.nodeChanged);B.onKeyUp.add(function(s,t){var D=t.keyCode;if((D>=33&&D<=36)||(D>=37&&D<=40)||D==13||D==45||D==46||D==8||(m.isMac&&(D==91||D==93))||t.ctrlKey){B.nodeChanged()}});B.onReset.add(function(){B.setContent(B.startContent,{format:"raw"})});if(C.custom_shortcuts){if(C.custom_undo_redo_keyboard_shortcuts){B.addShortcut("ctrl+z",B.getLang("undo_desc"),"Undo");B.addShortcut("ctrl+y",B.getLang("redo_desc"),"Redo")}B.addShortcut("ctrl+b",B.getLang("bold_desc"),"Bold");B.addShortcut("ctrl+i",B.getLang("italic_desc"),"Italic");B.addShortcut("ctrl+u",B.getLang("underline_desc"),"Underline");for(r=1;r<=6;r++){B.addShortcut("ctrl+"+r,"",["FormatBlock",false,"h"+r])}B.addShortcut("ctrl+7","",["FormatBlock",false,"<p>"]);B.addShortcut("ctrl+8","",["FormatBlock",false,"<div>"]);B.addShortcut("ctrl+9","",["FormatBlock",false,"<address>"]);function v(t){var s=null;if(!t.altKey&&!t.ctrlKey&&!t.metaKey){return s}i(B.shortcuts,function(D){if(m.isMac&&D.ctrl!=t.metaKey){return}else{if(!m.isMac&&D.ctrl!=t.ctrlKey){return}}if(D.alt!=t.altKey){return}if(D.shift!=t.shiftKey){return}if(t.keyCode==D.keyCode||(t.charCode&&t.charCode==D.charCode)){s=D;return false}});return s}B.onKeyUp.add(function(s,t){var D=v(t);if(D){return j.cancel(t)}});B.onKeyPress.add(function(s,t){var D=v(t);if(D){return j.cancel(t)}});B.onKeyDown.add(function(s,t){var D=v(t);if(D){D.func.call(D.scope);return j.cancel(t)}})}if(m.isIE){q.bind(B.getDoc(),"controlselect",function(D){var t=B.resizeInfo,s;D=D.target;if(D.nodeName!=="IMG"){return}if(t){q.unbind(t.node,t.ev,t.cb)}if(!q.hasClass(D,"mceItemNoResize")){ev="resizeend";s=q.bind(D,ev,function(F){var E;F=F.target;if(E=q.getStyle(F,"width")){q.setAttrib(F,"width",E.replace(/[^0-9%]+/g,""));q.setStyle(F,"width","")}if(E=q.getStyle(F,"height")){q.setAttrib(F,"height",E.replace(/[^0-9%]+/g,""));q.setStyle(F,"height","")}})}else{ev="resizestart";s=q.bind(D,"resizestart",j.cancel,j)}t=B.resizeInfo={node:D,ev:ev,cb:s}})}if(m.isOpera){B.onClick.add(function(s,t){j.prevent(t)})}if(C.custom_undo_redo){function y(){B.undoManager.typing=false;B.undoManager.add()}q.bind(B.getDoc(),"focusout",function(s){if(!B.removed&&B.undoManager.typing){y()}});B.dom.bind(B.dom.getRoot(),"dragend",function(s){y()});B.onKeyUp.add(function(s,D){var t=D.keyCode;if((t>=33&&t<=36)||(t>=37&&t<=40)||t==13||t==45||D.ctrlKey){y()}});B.onKeyDown.add(function(s,E){var D=E.keyCode,t;if(D==8){t=B.getDoc().selection;if(t&&t.createRange&&t.createRange().item){B.undoManager.beforeChange();s.dom.remove(t.createRange().item(0));y();return j.cancel(E)}}if((D>=33&&D<=36)||(D>=37&&D<=40)||D==13||D==45){if(m.isIE&&D==13){B.undoManager.beforeChange()}if(B.undoManager.typing){y()}return}if((D<16||D>20)&&D!=224&&D!=91&&!B.undoManager.typing){B.undoManager.beforeChange();B.undoManager.typing=true;B.undoManager.add()}});B.onMouseDown.add(function(){if(B.undoManager.typing){y()}})}if(m.isGecko){function A(){var s=B.dom.getAttribs(B.selection.getStart().cloneNode(false));return function(){var t=B.selection.getStart();B.dom.removeAllAttribs(t);i(s,function(D){t.setAttributeNode(D.cloneNode(true))})}}function z(){var t=B.selection;return !t.isCollapsed()&&t.getStart()!=t.getEnd()}B.onKeyPress.add(function(s,D){var t;if((D.keyCode==8||D.keyCode==46)&&z()){t=A();B.getDoc().execCommand("delete",false,null);t();return j.cancel(D)}});B.dom.bind(B.getDoc(),"cut",function(t){var s;if(z()){s=A();B.onKeyUp.addToTop(j.cancel,j);setTimeout(function(){s();B.onKeyUp.remove(j.cancel,j)},0)}})}},_isHidden:function(){var p;if(!a){return 0}p=this.selection.getSel();return(!p||!p.rangeCount||p.rangeCount==0)}})})(tinymce);(function(c){var d=c.each,e,a=true,b=false;c.EditorCommands=function(n){var l=n.dom,p=n.selection,j={state:{},exec:{},value:{}},k=n.settings,o;function q(y,x,v){var u;y=y.toLowerCase();if(u=j.exec[y]){u(y,x,v);return a}return b}function m(v){var u;v=v.toLowerCase();if(u=j.state[v]){return u(v)}return -1}function h(v){var u;v=v.toLowerCase();if(u=j.value[v]){return u(v)}return b}function t(u,v){v=v||"exec";d(u,function(y,x){d(x.toLowerCase().split(","),function(z){j[v][z]=y})})}c.extend(this,{execCommand:q,queryCommandState:m,queryCommandValue:h,addCommands:t});function f(x,v,u){if(v===e){v=b}if(u===e){u=null}return n.getDoc().execCommand(x,v,u)}function s(u){return n.formatter.match(u)}function r(u,v){n.formatter.toggle(u,v?{value:v}:e)}function i(u){o=p.getBookmark(u)}function g(){p.moveToBookmark(o)}t({"mceResetDesignMode,mceBeginUndoLevel":function(){},"mceEndUndoLevel,mceAddUndoLevel":function(){n.undoManager.add()},"Cut,Copy,Paste":function(y){var x=n.getDoc(),u;try{f(y)}catch(v){u=a}if(u||!x.queryCommandSupported(y)){if(c.isGecko){n.windowManager.confirm(n.getLang("clipboard_msg"),function(z){if(z){open("http://www.mozilla.org/editor/midasdemo/securityprefs.html","_blank")}})}else{n.windowManager.alert(n.getLang("clipboard_no_support"))}}},unlink:function(u){if(p.isCollapsed()){p.select(p.getNode())}f(u);p.collapse(b)},"JustifyLeft,JustifyCenter,JustifyRight,JustifyFull":function(u){var v=u.substring(7);d("left,center,right,full".split(","),function(x){if(v!=x){n.formatter.remove("align"+x)}});r("align"+v);q("mceRepaint")},"InsertUnorderedList,InsertOrderedList":function(x){var u,v;f(x);u=l.getParent(p.getNode(),"ol,ul");if(u){v=u.parentNode;if(/^(H[1-6]|P|ADDRESS|PRE)$/.test(v.nodeName)){i();l.split(v,u);g()}}},"Bold,Italic,Underline,Strikethrough,Superscript,Subscript":function(u){r(u)},"ForeColor,HiliteColor,FontName":function(x,v,u){r(x,u)},FontSize:function(y,x,v){var u,z;if(v>=1&&v<=7){z=c.explode(k.font_size_style_values);u=c.explode(k.font_size_classes);if(u){v=u[v-1]||v}else{v=z[v-1]||v}}r(y,v)},RemoveFormat:function(u){n.formatter.remove(u)},mceBlockQuote:function(u){r("blockquote")},FormatBlock:function(x,v,u){return r(u||"p")},mceCleanup:function(){var u=p.getBookmark();n.setContent(n.getContent({cleanup:a}),{cleanup:a});p.moveToBookmark(u)},mceRemoveNode:function(y,x,v){var u=v||p.getNode();if(u!=n.getBody()){i();n.dom.remove(u,a);g()}},mceSelectNodeDepth:function(y,x,v){var u=0;l.getParent(p.getNode(),function(z){if(z.nodeType==1&&u++==v){p.select(z);return b}},n.getBody())},mceSelectNode:function(x,v,u){p.select(u)},mceInsertContent:function(A,H,J){var x,I,D,y,E,F,C,B,K,v,z,L,u,G;x=n.parser;I=new c.html.Serializer({},n.schema);u='<span id="mce_marker" data-mce-type="bookmark">\uFEFF</span>';F={content:J,format:"html"};p.onBeforeSetContent.dispatch(p,F);J=F.content;if(J.indexOf("{$caret}")==-1){J+="{$caret}"}J=J.replace(/\{\$caret\}/,u);if(!p.isCollapsed()){n.getDoc().execCommand("Delete",false,null)}D=p.getNode();F={context:D.nodeName.toLowerCase()};E=x.parse(J,F);z=E.lastChild;if(z.attr("id")=="mce_marker"){C=z;for(z=z.prev;z;z=z.walk(true)){if(z.type==3||!l.isBlock(z.name)){z.parent.insert(C,z,z.name==="br");break}}}if(!F.invalid){J=I.serialize(E);z=D.firstChild;L=D.lastChild;if(!z||(z===L&&z.nodeName==="BR")){l.setHTML(D,J)}else{p.setContent(J)}}else{p.setContent(u);D=n.selection.getNode();y=n.getBody();if(D.nodeType==9){D=z=y}else{z=D}while(z!==y){D=z;z=z.parentNode}J=D==y?y.innerHTML:l.getOuterHTML(D);J=I.serialize(x.parse(J.replace(/<span (id="mce_marker"|id=mce_marker).+<\/span>/i,function(){return I.serialize(E)})));if(D==y){l.setHTML(y,J)}else{l.setOuterHTML(D,J)}}C=l.get("mce_marker");B=l.getRect(C);K=l.getViewPort(n.getWin());if((B.y+B.h>K.y+K.h||B.y<K.y)||(B.x>K.x+K.w||B.x<K.x)){G=c.isIE?n.getDoc().documentElement:n.getBody();G.scrollLeft=B.x;G.scrollTop=B.y-K.h+25}v=l.createRng();z=C.previousSibling;if(z&&z.nodeType==3){v.setStart(z,z.nodeValue.length)}else{v.setStartBefore(C);v.setEndBefore(C)}l.remove(C);p.setRng(v);p.onSetContent.dispatch(p,F);n.addVisual()},mceInsertRawHTML:function(x,v,u){p.setContent("tiny_mce_marker");n.setContent(n.getContent().replace(/tiny_mce_marker/g,function(){return u}))},mceSetContent:function(x,v,u){n.setContent(u)},"Indent,Outdent":function(y){var v,u,x;v=k.indentation;u=/[a-z%]+$/i.exec(v);v=parseInt(v);if(!m("InsertUnorderedList")&&!m("InsertOrderedList")){d(p.getSelectedBlocks(),function(z){if(y=="outdent"){x=Math.max(0,parseInt(z.style.paddingLeft||0)-v);l.setStyle(z,"paddingLeft",x?x+u:"")}else{l.setStyle(z,"paddingLeft",(parseInt(z.style.paddingLeft||0)+v)+u)}})}else{f(y)}},mceRepaint:function(){var v;if(c.isGecko){try{i(a);if(p.getSel()){p.getSel().selectAllChildren(n.getBody())}p.collapse(a);g()}catch(u){}}},mceToggleFormat:function(x,v,u){n.formatter.toggle(u)},InsertHorizontalRule:function(){n.execCommand("mceInsertContent",false,"<hr />")},mceToggleVisualAid:function(){n.hasVisual=!n.hasVisual;n.addVisual()},mceReplaceContent:function(x,v,u){n.execCommand("mceInsertContent",false,u.replace(/\{\$selection\}/g,p.getContent({format:"text"})))},mceInsertLink:function(B,A,z){var y=l.getParent(p.getNode(),"a"),v,x,u;if(c.is(z,"string")){z={href:z}}z.href=z.href.replace(" ","%20");if(!y){if(c.isWebKit){v=l.getParent(p.getNode(),"img");if(v){x=v.style.cssText;u=v.className;v.style.cssText=null;v.className=null}}f("CreateLink",b,"javascript:mctmp(0);");if(x){v.style.cssText=x}if(u){v.className=u}d(l.select("a[href='javascript:mctmp(0);']"),function(C){l.setAttribs(C,z)})}else{if(z.href){l.setAttribs(y,z)}else{n.dom.remove(y,a)}}},selectAll:function(){var v=l.getRoot(),u=l.createRng();u.setStart(v,0);u.setEnd(v,v.childNodes.length);n.selection.setRng(u)}});t({"JustifyLeft,JustifyCenter,JustifyRight,JustifyFull":function(u){return s("align"+u.substring(7))},"Bold,Italic,Underline,Strikethrough,Superscript,Subscript":function(u){return s(u)},mceBlockQuote:function(){return s("blockquote")},Outdent:function(){var u;if(k.inline_styles){if((u=l.getParent(p.getStart(),l.isBlock))&&parseInt(u.style.paddingLeft)>0){return a}if((u=l.getParent(p.getEnd(),l.isBlock))&&parseInt(u.style.paddingLeft)>0){return a}}return m("InsertUnorderedList")||m("InsertOrderedList")||(!k.inline_styles&&!!l.getParent(p.getNode(),"BLOCKQUOTE"))},"InsertUnorderedList,InsertOrderedList":function(u){return l.getParent(p.getNode(),u=="insertunorderedlist"?"UL":"OL")}},"state");t({"FontSize,FontName":function(x){var v=0,u;if(u=l.getParent(p.getNode(),"span")){if(x=="fontsize"){v=u.style.fontSize}else{v=u.style.fontFamily.replace(/, /g,",").replace(/[\'\"]/g,"").toLowerCase()}}return v}},"value");if(k.custom_undo_redo){t({Undo:function(){n.undoManager.undo()},Redo:function(){n.undoManager.redo()}})}}})(tinymce);(function(b){var a=b.util.Dispatcher;b.UndoManager=function(f){var d,e=0,h=[],c;function g(){return b.trim(f.getContent({format:"raw",no_events:1}))}return d={typing:false,onAdd:new a(d),onUndo:new a(d),onRedo:new a(d),beforeChange:function(){c=f.selection.getBookmark(2,true)},add:function(m){var j,k=f.settings,l;m=m||{};m.content=g();l=h[e];if(l&&l.content==m.content){return null}if(h[e]){h[e].beforeBookmark=c}if(k.custom_undo_redo_levels){if(h.length>k.custom_undo_redo_levels){for(j=0;j<h.length-1;j++){h[j]=h[j+1]}h.length--;e=h.length}}m.bookmark=f.selection.getBookmark(2,true);if(e<h.length-1){h.length=e+1}h.push(m);e=h.length-1;d.onAdd.dispatch(d,m);f.isNotDirty=0;return m},undo:function(){var k,j;if(d.typing){d.add();d.typing=false}if(e>0){k=h[--e];f.setContent(k.content,{format:"raw"});f.selection.moveToBookmark(k.beforeBookmark);d.onUndo.dispatch(d,k)}return k},redo:function(){var i;if(e<h.length-1){i=h[++e];f.setContent(i.content,{format:"raw"});f.selection.moveToBookmark(i.bookmark);d.onRedo.dispatch(d,i)}return i},clear:function(){h=[];e=0;d.typing=false},hasUndo:function(){return e>0||this.typing},hasRedo:function(){return e<h.length-1&&!this.typing}}}})(tinymce);(function(l){var j=l.dom.Event,c=l.isIE,a=l.isGecko,b=l.isOpera,i=l.each,h=l.extend,d=true,g=false;function k(o){var p,n,m;do{if(/^(SPAN|STRONG|B|EM|I|FONT|STRIKE|U)$/.test(o.nodeName)){if(p){n=o.cloneNode(false);n.appendChild(p);p=n}else{p=m=o.cloneNode(false)}p.removeAttribute("id")}}while(o=o.parentNode);if(p){return{wrapper:p,inner:m}}}function f(n,o){var m=o.ownerDocument.createRange();m.setStart(n.endContainer,n.endOffset);m.setEndAfter(o);return m.cloneContents().textContent.length==0}function e(o,q,m){var n,p;if(q.isEmpty(m)){n=q.getParent(m,"ul,ol");if(!q.getParent(n.parentNode,"ul,ol")){q.split(n,m);p=q.create("p",0,'<br data-mce-bogus="1" />');q.replace(p,m);o.select(p,1)}return g}return d}l.create("tinymce.ForceBlocks",{ForceBlocks:function(m){var n=this,o=m.settings,p;n.editor=m;n.dom=m.dom;p=(o.forced_root_block||"p").toLowerCase();o.element=p.toUpperCase();m.onPreInit.add(n.setup,n)},setup:function(){var n=this,m=n.editor,p=m.settings,u=m.dom,o=m.selection,q=m.schema.getBlockElements();if(p.forced_root_block){function v(){var y=o.getStart(),t=m.getBody(),s,z,D,F,E,x,A,B=-16777215;if(!y||y.nodeType!==1){return}while(y!=t){if(q[y.nodeName]){return}y=y.parentNode}s=o.getRng();if(s.setStart){z=s.startContainer;D=s.startOffset;F=s.endContainer;E=s.endOffset}else{if(s.item){s=m.getDoc().body.createTextRange();s.moveToElementText(s.item(0))}tmpRng=s.duplicate();tmpRng.collapse(true);D=tmpRng.move("character",B)*-1;if(!tmpRng.collapsed){tmpRng=s.duplicate();tmpRng.collapse(false);E=(tmpRng.move("character",B)*-1)-D}}for(y=t.firstChild;y;y){if(y.nodeType===3||(y.nodeType==1&&!q[y.nodeName])){if(!x){x=u.create(p.forced_root_block);y.parentNode.insertBefore(x,y)}A=y;y=y.nextSibling;x.appendChild(A)}else{x=null;y=y.nextSibling}}if(s.setStart){s.setStart(z,D);s.setEnd(F,E);o.setRng(s)}else{try{s=m.getDoc().body.createTextRange();s.moveToElementText(t);s.collapse(true);s.moveStart("character",D);if(E>0){s.moveEnd("character",E)}s.select()}catch(C){}}m.nodeChanged()}m.onKeyUp.add(v);m.onClick.add(v)}if(p.force_br_newlines){if(c){m.onKeyPress.add(function(s,t){var x;if(t.keyCode==13&&o.getNode().nodeName!="LI"){o.setContent('<br id="__" /> ',{format:"raw"});x=u.get("__");x.removeAttribute("id");o.select(x);o.collapse();return j.cancel(t)}})}}if(p.force_p_newlines){if(!c){m.onKeyPress.add(function(s,t){if(t.keyCode==13&&!t.shiftKey&&!n.insertPara(t)){j.cancel(t)}})}else{l.addUnload(function(){n._previousFormats=0});m.onKeyPress.add(function(s,t){n._previousFormats=0;if(t.keyCode==13&&!t.shiftKey&&s.selection.isCollapsed()&&p.keep_styles){n._previousFormats=k(s.selection.getStart())}});m.onKeyUp.add(function(t,y){if(y.keyCode==13&&!y.shiftKey){var x=t.selection.getStart(),s=n._previousFormats;if(!x.hasChildNodes()&&s){x=u.getParent(x,u.isBlock);if(x&&x.nodeName!="LI"){x.innerHTML="";if(n._previousFormats){x.appendChild(s.wrapper);s.inner.innerHTML="\uFEFF"}else{x.innerHTML="\uFEFF"}o.select(x,1);o.collapse(true);t.getDoc().execCommand("Delete",false,null);n._previousFormats=0}}}})}if(a){m.onKeyDown.add(function(s,t){if((t.keyCode==8||t.keyCode==46)&&!t.shiftKey){n.backspaceDelete(t,t.keyCode==8)}})}}if(l.isWebKit){function r(t){var s=o.getRng(),x,A=u.create("div",null," "),z,y=u.getViewPort(t.getWin()).h;s.insertNode(x=u.create("br"));s.setStartAfter(x);s.setEndAfter(x);o.setRng(s);if(o.getSel().focusNode==x.previousSibling){o.select(u.insertAfter(u.doc.createTextNode("\u00a0"),x));o.collapse(d)}u.insertAfter(A,x);z=u.getPos(A).y;u.remove(A);if(z>y){t.getWin().scrollTo(0,z)}}m.onKeyPress.add(function(s,t){if(t.keyCode==13&&(t.shiftKey||(p.force_br_newlines&&!u.getParent(o.getNode(),"h1,h2,h3,h4,h5,h6,ol,ul")))){r(s);j.cancel(t)}})}if(c){if(p.element!="P"){m.onKeyPress.add(function(s,t){n.lastElm=o.getNode().nodeName});m.onKeyUp.add(function(t,x){var z,y=o.getNode(),s=t.getBody();if(s.childNodes.length===1&&y.nodeName=="P"){y=u.rename(y,p.element);o.select(y);o.collapse();t.nodeChanged()}else{if(x.keyCode==13&&!x.shiftKey&&n.lastElm!="P"){z=u.getParent(y,"p");if(z){u.rename(z,p.element);t.nodeChanged()}}}})}}},getParentBlock:function(o){var m=this.dom;return m.getParent(o,m.isBlock)},insertPara:function(Q){var E=this,v=E.editor,M=v.dom,R=v.getDoc(),V=v.settings,F=v.selection.getSel(),G=F.getRangeAt(0),U=R.body;var J,K,H,O,N,q,o,u,z,m,C,T,p,x,I,L=M.getViewPort(v.getWin()),B,D,A;v.undoManager.beforeChange();J=R.createRange();J.setStart(F.anchorNode,F.anchorOffset);J.collapse(d);K=R.createRange();K.setStart(F.focusNode,F.focusOffset);K.collapse(d);H=J.compareBoundaryPoints(J.START_TO_END,K)<0;O=H?F.anchorNode:F.focusNode;N=H?F.anchorOffset:F.focusOffset;q=H?F.focusNode:F.anchorNode;o=H?F.focusOffset:F.anchorOffset;if(O===q&&/^(TD|TH)$/.test(O.nodeName)){if(O.firstChild.nodeName=="BR"){M.remove(O.firstChild)}if(O.childNodes.length==0){v.dom.add(O,V.element,null,"<br />");T=v.dom.add(O,V.element,null,"<br />")}else{I=O.innerHTML;O.innerHTML="";v.dom.add(O,V.element,null,I);T=v.dom.add(O,V.element,null,"<br />")}G=R.createRange();G.selectNodeContents(T);G.collapse(1);v.selection.setRng(G);return g}if(O==U&&q==U&&U.firstChild&&v.dom.isBlock(U.firstChild)){O=q=O.firstChild;N=o=0;J=R.createRange();J.setStart(O,0);K=R.createRange();K.setStart(q,0)}O=O.nodeName=="HTML"?R.body:O;O=O.nodeName=="BODY"?O.firstChild:O;q=q.nodeName=="HTML"?R.body:q;q=q.nodeName=="BODY"?q.firstChild:q;u=E.getParentBlock(O);z=E.getParentBlock(q);m=u?u.nodeName:V.element;if(I=E.dom.getParent(u,"li,pre")){if(I.nodeName=="LI"){return e(v.selection,E.dom,I)}return d}if(u&&(u.nodeName=="CAPTION"||/absolute|relative|fixed/gi.test(M.getStyle(u,"position",1)))){m=V.element;u=null}if(z&&(z.nodeName=="CAPTION"||/absolute|relative|fixed/gi.test(M.getStyle(u,"position",1)))){m=V.element;z=null}if(/(TD|TABLE|TH|CAPTION)/.test(m)||(u&&m=="DIV"&&/left|right/gi.test(M.getStyle(u,"float",1)))){m=V.element;u=z=null}C=(u&&u.nodeName==m)?u.cloneNode(0):v.dom.create(m);T=(z&&z.nodeName==m)?z.cloneNode(0):v.dom.create(m);T.removeAttribute("id");if(/^(H[1-6])$/.test(m)&&f(G,u)){T=v.dom.create(V.element)}I=p=O;do{if(I==U||I.nodeType==9||E.dom.isBlock(I)||/(TD|TABLE|TH|CAPTION)/.test(I.nodeName)){break}p=I}while((I=I.previousSibling?I.previousSibling:I.parentNode));I=x=q;do{if(I==U||I.nodeType==9||E.dom.isBlock(I)||/(TD|TABLE|TH|CAPTION)/.test(I.nodeName)){break}x=I}while((I=I.nextSibling?I.nextSibling:I.parentNode));if(p.nodeName==m){J.setStart(p,0)}else{J.setStartBefore(p)}J.setEnd(O,N);C.appendChild(J.cloneContents()||R.createTextNode(""));try{K.setEndAfter(x)}catch(P){}K.setStart(q,o);T.appendChild(K.cloneContents()||R.createTextNode(""));G=R.createRange();if(!p.previousSibling&&p.parentNode.nodeName==m){G.setStartBefore(p.parentNode)}else{if(J.startContainer.nodeName==m&&J.startOffset==0){G.setStartBefore(J.startContainer)}else{G.setStart(J.startContainer,J.startOffset)}}if(!x.nextSibling&&x.parentNode.nodeName==m){G.setEndAfter(x.parentNode)}else{G.setEnd(K.endContainer,K.endOffset)}G.deleteContents();if(b){v.getWin().scrollTo(0,L.y)}if(C.firstChild&&C.firstChild.nodeName==m){C.innerHTML=C.firstChild.innerHTML}if(T.firstChild&&T.firstChild.nodeName==m){T.innerHTML=T.firstChild.innerHTML}function S(y,s){var r=[],X,W,t;y.innerHTML="";if(V.keep_styles){W=s;do{if(/^(SPAN|STRONG|B|EM|I|FONT|STRIKE|U)$/.test(W.nodeName)){X=W.cloneNode(g);M.setAttrib(X,"id","");r.push(X)}}while(W=W.parentNode)}if(r.length>0){for(t=r.length-1,X=y;t>=0;t--){X=X.appendChild(r[t])}r[0].innerHTML=b?"\u00a0":"<br />";return r[0]}else{y.innerHTML=b?"\u00a0":"<br />"}}if(M.isEmpty(C)){S(C,O)}if(M.isEmpty(T)){A=S(T,q)}if(b&&parseFloat(opera.version())<9.5){G.insertNode(C);G.insertNode(T)}else{G.insertNode(T);G.insertNode(C)}T.normalize();C.normalize();v.selection.select(T,true);v.selection.collapse(true);B=v.dom.getPos(T).y;if(B<L.y||B+25>L.y+L.h){v.getWin().scrollTo(0,B<L.y?B:B-L.h+25)}v.undoManager.add();return g},backspaceDelete:function(u,B){var C=this,s=C.editor,y=s.getBody(),q=s.dom,p,v=s.selection,o=v.getRng(),x=o.startContainer,p,z,A,m;if(!B&&o.collapsed&&x.nodeType==1&&o.startOffset==x.childNodes.length){m=new l.dom.TreeWalker(x.lastChild,x);for(p=x.lastChild;p;p=m.prev()){if(p.nodeType==3){o.setStart(p,p.nodeValue.length);o.collapse(true);v.setRng(o);return}}}if(x&&s.dom.isBlock(x)&&!/^(TD|TH)$/.test(x.nodeName)&&B){if(x.childNodes.length==0||(x.childNodes.length==1&&x.firstChild.nodeName=="BR")){p=x;while((p=p.previousSibling)&&!s.dom.isBlock(p)){}if(p){if(x!=y.firstChild){z=s.dom.doc.createTreeWalker(p,NodeFilter.SHOW_TEXT,null,g);while(A=z.nextNode()){p=A}o=s.getDoc().createRange();o.setStart(p,p.nodeValue?p.nodeValue.length:0);o.setEnd(p,p.nodeValue?p.nodeValue.length:0);v.setRng(o);s.dom.remove(x)}return j.cancel(u)}}}}})})(tinymce);(function(c){var b=c.DOM,a=c.dom.Event,d=c.each,e=c.extend;c.create("tinymce.ControlManager",{ControlManager:function(f,j){var h=this,g;j=j||{};h.editor=f;h.controls={};h.onAdd=new c.util.Dispatcher(h);h.onPostRender=new c.util.Dispatcher(h);h.prefix=j.prefix||f.id+"_";h._cls={};h.onPostRender.add(function(){d(h.controls,function(i){i.postRender()})})},get:function(f){return this.controls[this.prefix+f]||this.controls[f]},setActive:function(h,f){var g=null;if(g=this.get(h)){g.setActive(f)}return g},setDisabled:function(h,f){var g=null;if(g=this.get(h)){g.setDisabled(f)}return g},add:function(g){var f=this;if(g){f.controls[g.id]=g;f.onAdd.dispatch(g,f)}return g},createControl:function(i){var h,g=this,f=g.editor;d(f.plugins,function(j){if(j.createControl){h=j.createControl(i,g);if(h){return false}}});switch(i){case"|":case"separator":return g.createSeparator()}if(!h&&f.buttons&&(h=f.buttons[i])){return g.createButton(i,h)}return g.add(h)},createDropMenu:function(f,n,h){var m=this,i=m.editor,j,g,k,l;n=e({"class":"mceDropDown",constrain:i.settings.constrain_menus},n);n["class"]=n["class"]+" "+i.getParam("skin")+"Skin";if(k=i.getParam("skin_variant")){n["class"]+=" "+i.getParam("skin")+"Skin"+k.substring(0,1).toUpperCase()+k.substring(1)}f=m.prefix+f;l=h||m._cls.dropmenu||c.ui.DropMenu;j=m.controls[f]=new l(f,n);j.onAddItem.add(function(r,q){var p=q.settings;p.title=i.getLang(p.title,p.title);if(!p.onclick){p.onclick=function(o){if(p.cmd){i.execCommand(p.cmd,p.ui||false,p.value)}}}});i.onRemove.add(function(){j.destroy()});if(c.isIE){j.onShowMenu.add(function(){i.focus();g=i.selection.getBookmark(1)});j.onHideMenu.add(function(){if(g){i.selection.moveToBookmark(g);g=0}})}return m.add(j)},createListBox:function(m,i,l){var h=this,g=h.editor,j,k,f;if(h.get(m)){return null}i.title=g.translate(i.title);i.scope=i.scope||g;if(!i.onselect){i.onselect=function(n){g.execCommand(i.cmd,i.ui||false,n||i.value)}}i=e({title:i.title,"class":"mce_"+m,scope:i.scope,control_manager:h},i);m=h.prefix+m;if(g.settings.use_native_selects){k=new c.ui.NativeListBox(m,i)}else{f=l||h._cls.listbox||c.ui.ListBox;k=new f(m,i,g)}h.controls[m]=k;if(c.isWebKit){k.onPostRender.add(function(p,o){a.add(o,"mousedown",function(){g.bookmark=g.selection.getBookmark(1)});a.add(o,"focus",function(){g.selection.moveToBookmark(g.bookmark);g.bookmark=null})})}if(k.hideMenu){g.onMouseDown.add(k.hideMenu,k)}return h.add(k)},createButton:function(m,i,l){var h=this,g=h.editor,j,k,f;if(h.get(m)){return null}i.title=g.translate(i.title);i.label=g.translate(i.label);i.scope=i.scope||g;if(!i.onclick&&!i.menu_button){i.onclick=function(){g.execCommand(i.cmd,i.ui||false,i.value)}}i=e({title:i.title,"class":"mce_"+m,unavailable_prefix:g.getLang("unavailable",""),scope:i.scope,control_manager:h},i);m=h.prefix+m;if(i.menu_button){f=l||h._cls.menubutton||c.ui.MenuButton;k=new f(m,i,g);g.onMouseDown.add(k.hideMenu,k)}else{f=h._cls.button||c.ui.Button;k=new f(m,i,g)}return h.add(k)},createMenuButton:function(h,f,g){f=f||{};f.menu_button=1;return this.createButton(h,f,g)},createSplitButton:function(m,i,l){var h=this,g=h.editor,j,k,f;if(h.get(m)){return null}i.title=g.translate(i.title);i.scope=i.scope||g;if(!i.onclick){i.onclick=function(n){g.execCommand(i.cmd,i.ui||false,n||i.value)}}if(!i.onselect){i.onselect=function(n){g.execCommand(i.cmd,i.ui||false,n||i.value)}}i=e({title:i.title,"class":"mce_"+m,scope:i.scope,control_manager:h},i);m=h.prefix+m;f=l||h._cls.splitbutton||c.ui.SplitButton;k=h.add(new f(m,i,g));g.onMouseDown.add(k.hideMenu,k);return k},createColorSplitButton:function(f,n,h){var l=this,j=l.editor,i,k,m,g;if(l.get(f)){return null}n.title=j.translate(n.title);n.scope=n.scope||j;if(!n.onclick){n.onclick=function(o){if(c.isIE){g=j.selection.getBookmark(1)}j.execCommand(n.cmd,n.ui||false,o||n.value)}}if(!n.onselect){n.onselect=function(o){j.execCommand(n.cmd,n.ui||false,o||n.value)}}n=e({title:n.title,"class":"mce_"+f,menu_class:j.getParam("skin")+"Skin",scope:n.scope,more_colors_title:j.getLang("more_colors")},n);f=l.prefix+f;m=h||l._cls.colorsplitbutton||c.ui.ColorSplitButton;k=new m(f,n,j);j.onMouseDown.add(k.hideMenu,k);j.onRemove.add(function(){k.destroy()});if(c.isIE){k.onShowMenu.add(function(){j.focus();g=j.selection.getBookmark(1)});k.onHideMenu.add(function(){if(g){j.selection.moveToBookmark(g);g=0}})}return l.add(k)},createToolbar:function(k,h,j){var i,g=this,f;k=g.prefix+k;f=j||g._cls.toolbar||c.ui.Toolbar;i=new f(k,h,g.editor);if(g.get(k)){return null}return g.add(i)},createToolbarGroup:function(k,h,j){var i,g=this,f;k=g.prefix+k;f=j||this._cls.toolbarGroup||c.ui.ToolbarGroup;i=new f(k,h,g.editor);if(g.get(k)){return null}return g.add(i)},createSeparator:function(g){var f=g||this._cls.separator||c.ui.Separator;return new f()},setControlType:function(g,f){return this._cls[g.toLowerCase()]=f},destroy:function(){d(this.controls,function(f){f.destroy()});this.controls=null}})})(tinymce);(function(d){var a=d.util.Dispatcher,e=d.each,c=d.isIE,b=d.isOpera;d.create("tinymce.WindowManager",{WindowManager:function(f){var g=this;g.editor=f;g.onOpen=new a(g);g.onClose=new a(g);g.params={};g.features={}},open:function(z,h){var v=this,k="",n,m,i=v.editor.settings.dialog_type=="modal",q,o,j,g=d.DOM.getViewPort(),r;z=z||{};h=h||{};o=b?g.w:screen.width;j=b?g.h:screen.height;z.name=z.name||"mc_"+new Date().getTime();z.width=parseInt(z.width||320);z.height=parseInt(z.height||240);z.resizable=true;z.left=z.left||parseInt(o/2)-(z.width/2);z.top=z.top||parseInt(j/2)-(z.height/2);h.inline=false;h.mce_width=z.width;h.mce_height=z.height;h.mce_auto_focus=z.auto_focus;if(i){if(c){z.center=true;z.help=false;z.dialogWidth=z.width+"px";z.dialogHeight=z.height+"px";z.scroll=z.scrollbars||false}}e(z,function(p,f){if(d.is(p,"boolean")){p=p?"yes":"no"}if(!/^(name|url)$/.test(f)){if(c&&i){k+=(k?";":"")+f+":"+p}else{k+=(k?",":"")+f+"="+p}}});v.features=z;v.params=h;v.onOpen.dispatch(v,z,h);r=z.url||z.file;r=d._addVer(r);try{if(c&&i){q=1;window.showModalDialog(r,window,k)}else{q=window.open(r,z.name,k)}}catch(l){}if(!q){alert(v.editor.getLang("popup_blocked"))}},close:function(f){f.close();this.onClose.dispatch(this)},createInstance:function(i,h,g,m,l,k){var j=d.resolve(i);return new j(h,g,m,l,k)},confirm:function(h,f,i,g){g=g||window;f.call(i||this,g.confirm(this._decode(this.editor.getLang(h,h))))},alert:function(h,f,j,g){var i=this;g=g||window;g.alert(i._decode(i.editor.getLang(h,h)));if(f){f.call(j||i)}},resizeBy:function(f,g,h){h.resizeBy(f,g)},_decode:function(f){return d.DOM.decode(f).replace(/\\n/g,"\n")}})}(tinymce));(function(a){a.Formatter=function(V){var M={},O=a.each,c=V.dom,q=V.selection,t=a.dom.TreeWalker,K=new a.dom.RangeUtils(c),d=V.schema.isValidChild,F=c.isBlock,l=V.settings.forced_root_block,s=c.nodeIndex,E="\uFEFF",e=/^(src|href|style)$/,S=false,B=true,p,P={apply:[],remove:[]};function z(W){return W instanceof Array}function m(X,W){return c.getParents(X,W,c.getRoot())}function b(W){return W.nodeType===1&&(W.face==="mceinline"||W.style.fontFamily==="mceinline")}function R(W){return W?M[W]:M}function k(W,X){if(W){if(typeof(W)!=="string"){O(W,function(Z,Y){k(Y,Z)})}else{X=X.length?X:[X];O(X,function(Y){if(Y.deep===p){Y.deep=!Y.selector}if(Y.split===p){Y.split=!Y.selector||Y.inline}if(Y.remove===p&&Y.selector&&!Y.inline){Y.remove="none"}if(Y.selector&&Y.inline){Y.mixed=true;Y.block_expand=true}if(typeof(Y.classes)==="string"){Y.classes=Y.classes.split(/\s+/)}});M[W]=X}}}var i=function(X){var W;V.dom.getParent(X,function(Y){W=V.dom.getStyle(Y,"text-decoration");return W&&W!=="none"});return W};var I=function(W){var X;if(W.nodeType===1&&W.parentNode&&W.parentNode.nodeType===1){X=i(W.parentNode);if(V.dom.getStyle(W,"color")&&X){V.dom.setStyle(W,"text-decoration",X)}else{if(V.dom.getStyle(W,"textdecoration")===X){V.dom.setStyle(W,"text-decoration",null)}}}};function T(Y,af,aa){var ab=R(Y),ag=ab[0],ae,X,ad,ac=q.isCollapsed();function Z(ak){var aj=ak.startContainer,an=ak.startOffset,am,al;if(aj.nodeType==1||aj.nodeValue===""){aj=aj.nodeType==1?aj.childNodes[an]:aj;if(aj){am=new t(aj,aj.parentNode);for(al=am.current();al;al=am.next()){if(al.nodeType==3&&!f(al)){ak.setStart(al,0);break}}}}return ak}function W(ak,aj){aj=aj||ag;if(ak){O(aj.styles,function(am,al){c.setStyle(ak,al,r(am,af))});O(aj.attributes,function(am,al){c.setAttrib(ak,al,r(am,af))});O(aj.classes,function(al){al=r(al,af);if(!c.hasClass(ak,al)){c.addClass(ak,al)}})}}function ah(ak){var aj=[],am,al;am=ag.inline||ag.block;al=c.create(am);W(al);K.walk(ak,function(an){var ao;function ap(aq){var au=aq.nodeName.toLowerCase(),at=aq.parentNode.nodeName.toLowerCase(),ar;if(g(au,"br")){ao=0;if(ag.block){c.remove(aq)}return}if(ag.wrapper&&x(aq,Y,af)){ao=0;return}if(ag.block&&!ag.wrapper&&G(au)){aq=c.rename(aq,am);W(aq);aj.push(aq);ao=0;return}if(ag.selector){O(ab,function(av){if("collapsed" in av&&av.collapsed!==ac){return}if(c.is(aq,av.selector)&&!b(aq)){W(aq,av);ar=true}});if(!ag.inline||ar){ao=0;return}}if(d(am,au)&&d(at,am)&&!(aq.nodeType===3&&aq.nodeValue.length===1&&aq.nodeValue.charCodeAt(0)===65279)){if(!ao){ao=al.cloneNode(S);aq.parentNode.insertBefore(ao,aq);aj.push(ao)}ao.appendChild(aq)}else{if(au=="li"){if(!ao){liTextNode=aq.ownerDocument.createTextNode("");O(a.grep(aq.childNodes),function(av){if(av.nodeType==3){liTextNode.nodeValue+=av.nodeValue;av.parentNode.removeChild(av)}});ao=al.cloneNode(S);aq.insertBefore(ao,aq.firstChild);aj.push(ao)}ao.appendChild(liTextNode)}else{ao=0;O(a.grep(aq.childNodes),ap);ao=0}}}O(an,ap)});if(ag.wrap_links===false){O(aj,function(an){function ao(at){var ar,aq,ap;if(at.nodeName==="A"){aq=al.cloneNode(S);aj.push(aq);ap=a.grep(at.childNodes);for(ar=0;ar<ap.length;ar++){aq.appendChild(ap[ar])}at.appendChild(aq)}O(a.grep(at.childNodes),ao)}ao(an)})}O(aj,function(ap){var an;function aq(at){var ar=0;O(at.childNodes,function(au){if(!f(au)&&!H(au)){ar++}});return ar}function ao(ar){var au,at;O(ar.childNodes,function(av){if(av.nodeType==1&&!H(av)&&!b(av)){au=av;return S}});if(au&&h(au,ag)){at=au.cloneNode(S);W(at);c.replace(at,ar,B);c.remove(au,1)}return at||ar}an=aq(ap);if((aj.length>1||!F(ap))&&an===0){c.remove(ap,1);return}if(ag.inline||ag.wrapper){if(!ag.exact&&an===1){ap=ao(ap)}O(ab,function(ar){O(c.select(ar.inline,ap),function(au){var at;if(ar.wrap_links===false){at=au.parentNode;do{if(at.nodeName==="A"){return}}while(at=at.parentNode)}U(ar,af,au,ar.exact?au:null)})});if(x(ap.parentNode,Y,af)){c.remove(ap,1);ap=0;return B}if(ag.merge_with_parents){c.getParent(ap.parentNode,function(ar){if(x(ar,Y,af)){c.remove(ap,1);ap=0;return B}})}if(ap){ap=u(C(ap),ap);ap=u(ap,C(ap,B))}}})}if(ag){if(aa){X=c.createRng();X.setStartBefore(aa);X.setEndAfter(aa);ah(o(X,ab))}else{if(!ac||!ag.inline||c.select("td.mceSelected,th.mceSelected").length){var ai=V.selection.getNode();ae=q.getBookmark();ah(o(q.getRng(B),ab));if(ag.styles&&(ag.styles.color||ag.styles.textDecoration)){a.walk(ai,I,"childNodes");I(ai)}q.moveToBookmark(ae);q.setRng(Z(q.getRng(B)));V.nodeChanged()}else{Q("apply",Y,af)}}}}function A(Y,ah,ab){var ac=R(Y),aj=ac[0],ag,af,X;function aa(am){var al=am.startContainer,ar=am.startOffset,aq,ap,an,ao;if(al.nodeType==3&&ar>=al.nodeValue.length-1){al=al.parentNode;ar=s(al)+1}if(al.nodeType==1){an=al.childNodes;al=an[Math.min(ar,an.length-1)];aq=new t(al);if(ar>an.length-1){aq.next()}for(ap=aq.current();ap;ap=aq.next()){if(ap.nodeType==3&&!f(ap)){ao=c.create("a",null,E);ap.parentNode.insertBefore(ao,ap);am.setStart(ap,0);q.setRng(am);c.remove(ao);return}}}}function Z(ao){var an,am,al;an=a.grep(ao.childNodes);for(am=0,al=ac.length;am<al;am++){if(U(ac[am],ah,ao,ao)){break}}if(aj.deep){for(am=0,al=an.length;am<al;am++){Z(an[am])}}}function ad(al){var am;O(m(al.parentNode).reverse(),function(an){var ao;if(!am&&an.id!="_start"&&an.id!="_end"){ao=x(an,Y,ah);if(ao&&ao.split!==false){am=an}}});return am}function W(ao,al,aq,au){var av,at,ar,an,ap,am;if(ao){am=ao.parentNode;for(av=al.parentNode;av&&av!=am;av=av.parentNode){at=av.cloneNode(S);for(ap=0;ap<ac.length;ap++){if(U(ac[ap],ah,at,at)){at=0;break}}if(at){if(ar){at.appendChild(ar)}if(!an){an=at}ar=at}}if(au&&(!aj.mixed||!F(ao))){al=c.split(ao,al)}if(ar){aq.parentNode.insertBefore(ar,aq);an.appendChild(aq)}}return al}function ai(al){return W(ad(al),al,al,true)}function ae(an){var am=c.get(an?"_start":"_end"),al=am[an?"firstChild":"lastChild"];if(H(al)){al=al[an?"firstChild":"lastChild"]}c.remove(am,true);return al}function ak(al){var am,an;al=o(al,ac,B);if(aj.split){am=J(al,B);an=J(al);if(am!=an){am=N(am,"span",{id:"_start","data-mce-type":"bookmark"});an=N(an,"span",{id:"_end","data-mce-type":"bookmark"});ai(am);ai(an);am=ae(B);an=ae()}else{am=an=ai(am)}al.startContainer=am.parentNode;al.startOffset=s(am);al.endContainer=an.parentNode;al.endOffset=s(an)+1}K.walk(al,function(ao){O(ao,function(ap){Z(ap);if(ap.nodeType===1&&V.dom.getStyle(ap,"text-decoration")==="underline"&&ap.parentNode&&i(ap.parentNode)==="underline"){U({deep:false,exact:true,inline:"span",styles:{textDecoration:"underline"}},null,ap)}})})}if(ab){X=c.createRng();X.setStartBefore(ab);X.setEndAfter(ab);ak(X);return}if(!q.isCollapsed()||!aj.inline||c.select("td.mceSelected,th.mceSelected").length){ag=q.getBookmark();ak(q.getRng(B));q.moveToBookmark(ag);if(j(Y,ah,q.getStart())){aa(q.getRng(true))}V.nodeChanged()}else{Q("remove",Y,ah)}}function D(X,Z,Y){var W=R(X);if(j(X,Z,Y)&&(!("toggle" in W[0])||W[0]["toggle"])){A(X,Z,Y)}else{T(X,Z,Y)}}function x(X,W,ac,aa){var Y=R(W),ad,ab,Z;function ae(ai,ak,al){var ah,aj,af=ak[al],ag;if(af){if(af.length===p){for(ah in af){if(af.hasOwnProperty(ah)){if(al==="attributes"){aj=c.getAttrib(ai,ah)}else{aj=L(ai,ah)}if(aa&&!aj&&!ak.exact){return}if((!aa||ak.exact)&&!g(aj,r(af[ah],ac))){return}}}}else{for(ag=0;ag<af.length;ag++){if(al==="attributes"?c.getAttrib(ai,af[ag]):L(ai,af[ag])){return ak}}}}return ak}if(Y&&X){for(ab=0;ab<Y.length;ab++){ad=Y[ab];if(h(X,ad)&&ae(X,ad,"attributes")&&ae(X,ad,"styles")){if(Z=ad.classes){for(ab=0;ab<Z.length;ab++){if(!c.hasClass(X,Z[ab])){return}}}return ad}}}}function j(Y,ab,aa){var X,Z;function W(ac){ac=c.getParent(ac,function(ad){return !!x(ad,Y,ab,true)});return x(ac,Y,ab)}if(aa){return W(aa)}if(q.isCollapsed()){for(Z=P.apply.length-1;Z>=0;Z--){if(P.apply[Z].name==Y){return true}}for(Z=P.remove.length-1;Z>=0;Z--){if(P.remove[Z].name==Y){return false}}return W(q.getNode())}aa=q.getNode();if(W(aa)){return B}X=q.getStart();if(X!=aa){if(W(X)){return B}}return S}function v(ad,ac){var aa,ab=[],Z={},Y,X,W;if(q.isCollapsed()){for(X=0;X<ad.length;X++){for(Y=P.remove.length-1;Y>=0;Y--){W=ad[X];if(P.remove[Y].name==W){Z[W]=true;break}}}for(Y=P.apply.length-1;Y>=0;Y--){for(X=0;X<ad.length;X++){W=ad[X];if(!Z[W]&&P.apply[Y].name==W){Z[W]=true;ab.push(W)}}}}aa=q.getStart();c.getParent(aa,function(ag){var af,ae;for(af=0;af<ad.length;af++){ae=ad[af];if(!Z[ae]&&x(ag,ae,ac)){Z[ae]=true;ab.push(ae)}}});return ab}function y(aa){var ac=R(aa),Z,Y,ab,X,W;if(ac){Z=q.getStart();Y=m(Z);for(X=ac.length-1;X>=0;X--){W=ac[X].selector;if(!W){return B}for(ab=Y.length-1;ab>=0;ab--){if(c.is(Y[ab],W)){return B}}}}return S}a.extend(this,{get:R,register:k,apply:T,remove:A,toggle:D,match:j,matchAll:v,matchNode:x,canApply:y});function h(W,X){if(g(W,X.inline)){return B}if(g(W,X.block)){return B}if(X.selector){return c.is(W,X.selector)}}function g(X,W){X=X||"";W=W||"";X=""+(X.nodeName||X);W=""+(W.nodeName||W);return X.toLowerCase()==W.toLowerCase()}function L(X,W){var Y=c.getStyle(X,W);if(W=="color"||W=="backgroundColor"){Y=c.toHex(Y)}if(W=="fontWeight"&&Y==700){Y="bold"}return""+Y}function r(W,X){if(typeof(W)!="string"){W=W(X)}else{if(X){W=W.replace(/%(\w+)/g,function(Z,Y){return X[Y]||Z})}}return W}function f(W){return W&&W.nodeType===3&&/^([\s\r\n]+|)$/.test(W.nodeValue)}function N(Y,X,W){var Z=c.create(X,W);Y.parentNode.insertBefore(Z,Y);Z.appendChild(Y);return Z}function o(W,ag,Z){var Y=W.startContainer,ad=W.startOffset,aj=W.endContainer,ae=W.endOffset,ai,af,ac;function ah(am,an,ak,al){var ao,ap;al=al||c.getRoot();for(;;){ao=am.parentNode;if(ao==al||(!ag[0].block_expand&&F(ao))){return am}for(ai=ao[an];ai&&ai!=am;ai=ai[ak]){if(ai.nodeType==1&&!H(ai)){return am}if(ai.nodeType==3&&!f(ai)){return am}}am=am.parentNode}return am}function ab(ak,al){if(al===p){al=ak.nodeType===3?ak.length:ak.childNodes.length}while(ak&&ak.hasChildNodes()){ak=ak.childNodes[al];if(ak){al=ak.nodeType===3?ak.length:ak.childNodes.length}}return{node:ak,offset:al}}if(Y.nodeType==1&&Y.hasChildNodes()){af=Y.childNodes.length-1;Y=Y.childNodes[ad>af?af:ad];if(Y.nodeType==3){ad=0}}if(aj.nodeType==1&&aj.hasChildNodes()){af=aj.childNodes.length-1;aj=aj.childNodes[ae>af?af:ae-1];if(aj.nodeType==3){ae=aj.nodeValue.length}}if(H(Y.parentNode)){Y=Y.parentNode}if(H(Y)){Y=Y.nextSibling||Y}if(H(aj.parentNode)){ae=c.nodeIndex(aj);aj=aj.parentNode}if(H(aj)&&aj.previousSibling){aj=aj.previousSibling;ae=aj.length}if(ag[0].inline){ac=ab(aj,ae);if(ac.node){while(ac.node&&ac.offset===0&&ac.node.previousSibling){ac=ab(ac.node.previousSibling)}if(ac.node&&ac.offset>0&&ac.node.nodeType===3&&ac.node.nodeValue.charAt(ac.offset-1)===" "){if(ac.offset>1){aj=ac.node;aj.splitText(ac.offset-1)}else{if(ac.node.previousSibling){aj=ac.node.previousSibling}}}}}if(ag[0].inline||ag[0].block_expand){Y=ah(Y,"firstChild","nextSibling");aj=ah(aj,"lastChild","previousSibling")}if(ag[0].selector&&ag[0].expand!==S&&!ag[0].inline){function aa(al,ak){var am,an,ap,ao;if(al.nodeType==3&&al.nodeValue.length==0&&al[ak]){al=al[ak]}am=m(al);for(an=0;an<am.length;an++){for(ap=0;ap<ag.length;ap++){ao=ag[ap];if("collapsed" in ao&&ao.collapsed!==W.collapsed){continue}if(c.is(am[an],ao.selector)){return am[an]}}}return al}Y=aa(Y,"previousSibling");aj=aa(aj,"nextSibling")}if(ag[0].block||ag[0].selector){function X(al,ak,an){var am;if(!ag[0].wrapper){am=c.getParent(al,ag[0].block)}if(!am){am=c.getParent(al.nodeType==3?al.parentNode:al,F)}if(am&&ag[0].wrapper){am=m(am,"ul,ol").reverse()[0]||am}if(!am){am=al;while(am[ak]&&!F(am[ak])){am=am[ak];if(g(am,"br")){break}}}return am||al}Y=X(Y,"previousSibling");aj=X(aj,"nextSibling");if(ag[0].block){if(!F(Y)){Y=ah(Y,"firstChild","nextSibling")}if(!F(aj)){aj=ah(aj,"lastChild","previousSibling")}}}if(Y.nodeType==1){ad=s(Y);Y=Y.parentNode}if(aj.nodeType==1){ae=s(aj)+1;aj=aj.parentNode}return{startContainer:Y,startOffset:ad,endContainer:aj,endOffset:ae}}function U(ac,ab,Z,W){var Y,X,aa;if(!h(Z,ac)){return S}if(ac.remove!="all"){O(ac.styles,function(ae,ad){ae=r(ae,ab);if(typeof(ad)==="number"){ad=ae;W=0}if(!W||g(L(W,ad),ae)){c.setStyle(Z,ad,"")}aa=1});if(aa&&c.getAttrib(Z,"style")==""){Z.removeAttribute("style");Z.removeAttribute("data-mce-style")}O(ac.attributes,function(af,ad){var ae;af=r(af,ab);if(typeof(ad)==="number"){ad=af;W=0}if(!W||g(c.getAttrib(W,ad),af)){if(ad=="class"){af=c.getAttrib(Z,ad);if(af){ae="";O(af.split(/\s+/),function(ag){if(/mce\w+/.test(ag)){ae+=(ae?" ":"")+ag}});if(ae){c.setAttrib(Z,ad,ae);return}}}if(ad=="class"){Z.removeAttribute("className")}if(e.test(ad)){Z.removeAttribute("data-mce-"+ad)}Z.removeAttribute(ad)}});O(ac.classes,function(ad){ad=r(ad,ab);if(!W||c.hasClass(W,ad)){c.removeClass(Z,ad)}});X=c.getAttribs(Z);for(Y=0;Y<X.length;Y++){if(X[Y].nodeName.indexOf("_")!==0){return S}}}if(ac.remove!="none"){n(Z,ac);return B}}function n(Y,Z){var W=Y.parentNode,X;if(Z.block){if(!l){function aa(ac,ab,ad){ac=C(ac,ab,ad);return !ac||(ac.nodeName=="BR"||F(ac))}if(F(Y)&&!F(W)){if(!aa(Y,S)&&!aa(Y.firstChild,B,1)){Y.insertBefore(c.create("br"),Y.firstChild)}if(!aa(Y,B)&&!aa(Y.lastChild,S,1)){Y.appendChild(c.create("br"))}}}else{if(W==c.getRoot()){if(!Z.list_block||!g(Y,Z.list_block)){O(a.grep(Y.childNodes),function(ab){if(d(l,ab.nodeName.toLowerCase())){if(!X){X=N(ab,l)}else{X.appendChild(ab)}}else{X=0}})}}}}if(Z.selector&&Z.inline&&!g(Z.inline,Y)){return}c.remove(Y,1)}function C(X,W,Y){if(X){W=W?"nextSibling":"previousSibling";for(X=Y?X:X[W];X;X=X[W]){if(X.nodeType==1||!f(X)){return X}}}}function H(W){return W&&W.nodeType==1&&W.getAttribute("data-mce-type")=="bookmark"}function u(aa,Z){var W,Y,X;function ac(af,ae){if(af.nodeName!=ae.nodeName){return S}function ad(ah){var ai={};O(c.getAttribs(ah),function(aj){var ak=aj.nodeName.toLowerCase();if(ak.indexOf("_")!==0&&ak!=="style"){ai[ak]=c.getAttrib(ah,ak)}});return ai}function ag(ak,aj){var ai,ah;for(ah in ak){if(ak.hasOwnProperty(ah)){ai=aj[ah];if(ai===p){return S}if(ak[ah]!=ai){return S}delete aj[ah]}}for(ah in aj){if(aj.hasOwnProperty(ah)){return S}}return B}if(!ag(ad(af),ad(ae))){return S}if(!ag(c.parseStyle(c.getAttrib(af,"style")),c.parseStyle(c.getAttrib(ae,"style")))){return S}return B}if(aa&&Z){function ab(ae,ad){for(Y=ae;Y;Y=Y[ad]){if(Y.nodeType==3&&Y.nodeValue.length!==0){return ae}if(Y.nodeType==1&&!H(Y)){return Y}}return ae}aa=ab(aa,"previousSibling");Z=ab(Z,"nextSibling");if(ac(aa,Z)){for(Y=aa.nextSibling;Y&&Y!=Z;){X=Y;Y=Y.nextSibling;aa.appendChild(X)}c.remove(Z);O(a.grep(Z.childNodes),function(ad){aa.appendChild(ad)});return aa}}return Z}function G(W){return/^(h[1-6]|p|div|pre|address|dl|dt|dd)$/.test(W)}function J(X,aa){var W,Z,Y;W=X[aa?"startContainer":"endContainer"];Z=X[aa?"startOffset":"endOffset"];if(W.nodeType==1){Y=W.childNodes.length-1;if(!aa&&Z){Z--}W=W.childNodes[Z>Y?Y:Z]}return W}function Q(ab,X,aa){var Y,W=P[ab],ac=P[ab=="apply"?"remove":"apply"];function ad(){return P.apply.length||P.remove.length}function Z(){P.apply=[];P.remove=[]}function ae(af){O(P.apply.reverse(),function(ag){T(ag.name,ag.vars,af);if(ag.name==="forecolor"&&ag.vars.value){I(af.parentNode)}});O(P.remove.reverse(),function(ag){A(ag.name,ag.vars,af)});c.remove(af,1);Z()}for(Y=W.length-1;Y>=0;Y--){if(W[Y].name==X){return}}W.push({name:X,vars:aa});for(Y=ac.length-1;Y>=0;Y--){if(ac[Y].name==X){ac.splice(Y,1)}}if(ad()){V.getDoc().execCommand("FontName",false,"mceinline");P.lastRng=q.getRng();O(c.select("font,span"),function(ag){var af;if(b(ag)){af=q.getBookmark();ae(ag);q.moveToBookmark(af);V.nodeChanged()}});if(!P.isListening&&ad()){P.isListening=true;O("onKeyDown,onKeyUp,onKeyPress,onMouseUp".split(","),function(af){V[af].addToTop(function(ag,ah){if(ad()&&!a.dom.RangeUtils.compareRanges(P.lastRng,q.getRng())){O(c.select("font,span"),function(aj){var ak,ai;if(b(aj)){ak=aj.firstChild;while(ak&&ak.nodeType!=3){ak=ak.firstChild}if(ak){ae(aj);ai=c.createRng();ai.setStart(ak,ak.nodeValue.length);ai.setEnd(ak,ak.nodeValue.length);q.setRng(ai);ag.nodeChanged()}else{c.remove(aj)}}});if(ah.type=="keyup"||ah.type=="mouseup"){Z()}}})})}}}}})(tinymce);tinymce.onAddEditor.add(function(e,a){var d,h,g,c=a.settings;if(c.inline_styles){h=e.explode(c.font_size_style_values);function b(j,i){e.each(i,function(l,k){if(l){g.setStyle(j,k,l)}});g.rename(j,"span")}d={font:function(j,i){b(i,{backgroundColor:i.style.backgroundColor,color:i.color,fontFamily:i.face,fontSize:h[parseInt(i.size)-1]})},u:function(j,i){b(i,{textDecoration:"underline"})},strike:function(j,i){b(i,{textDecoration:"line-through"})}};function f(i,j){g=i.dom;if(c.convert_fonts_to_spans){e.each(g.select("font,u,strike",j.node),function(k){d[k.nodeName.toLowerCase()](a.dom,k)})}}a.onPreProcess.add(f);a.onSetContent.add(f);a.onInit.add(function(){a.selection.onSetContent.add(f)})}});
\ No newline at end of file
diff --git a/plugins/TinyMCE/js/tiny_mce_popup.js b/plugins/TinyMCE/js/tiny_mce_popup.js
index 3ef3acb1fd..f859d24e6a 100644
--- a/plugins/TinyMCE/js/tiny_mce_popup.js
+++ b/plugins/TinyMCE/js/tiny_mce_popup.js
@@ -2,4 +2,4 @@
 // Uncomment and change this document.domain value if you are loading the script cross subdomains
 // document.domain = 'moxiecode.com';
 
-var tinymce=null,tinyMCEPopup,tinyMCE;tinyMCEPopup={init:function(){var b=this,a,c;a=b.getWin();tinymce=a.tinymce;tinyMCE=a.tinyMCE;b.editor=tinymce.EditorManager.activeEditor;b.params=b.editor.windowManager.params;b.features=b.editor.windowManager.features;b.dom=b.editor.windowManager.createInstance("tinymce.dom.DOMUtils",document);if(b.features.popup_css!==false){b.dom.loadCSS(b.features.popup_css||b.editor.settings.popup_css)}b.listeners=[];b.onInit={add:function(e,d){b.listeners.push({func:e,scope:d})}};b.isWindow=!b.getWindowArg("mce_inline");b.id=b.getWindowArg("mce_window_id");b.editor.windowManager.onOpen.dispatch(b.editor.windowManager,window)},getWin:function(){return(!window.frameElement&&window.dialogArguments)||opener||parent||top},getWindowArg:function(c,b){var a=this.params[c];return tinymce.is(a)?a:b},getParam:function(b,a){return this.editor.getParam(b,a)},getLang:function(b,a){return this.editor.getLang(b,a)},execCommand:function(d,c,e,b){b=b||{};b.skip_focus=1;this.restoreSelection();return this.editor.execCommand(d,c,e,b)},resizeToInnerSize:function(){var a=this;setTimeout(function(){var b=a.dom.getViewPort(window);a.editor.windowManager.resizeBy(a.getWindowArg("mce_width")-b.w,a.getWindowArg("mce_height")-b.h,a.id||window)},0)},executeOnLoad:function(s){this.onInit.add(function(){eval(s)})},storeSelection:function(){this.editor.windowManager.bookmark=tinyMCEPopup.editor.selection.getBookmark(1)},restoreSelection:function(){var a=tinyMCEPopup;if(!a.isWindow&&tinymce.isIE){a.editor.selection.moveToBookmark(a.editor.windowManager.bookmark)}},requireLangPack:function(){var b=this,a=b.getWindowArg("plugin_url")||b.getWindowArg("theme_url");if(a&&b.editor.settings.language&&b.features.translate_i18n!==false){a+="/langs/"+b.editor.settings.language+"_dlg.js";if(!tinymce.ScriptLoader.isDone(a)){document.write('<script type="text/javascript" src="'+tinymce._addVer(a)+'"><\/script>');tinymce.ScriptLoader.markDone(a)}}},pickColor:function(b,a){this.execCommand("mceColorPicker",true,{color:document.getElementById(a).value,func:function(e){document.getElementById(a).value=e;try{document.getElementById(a).onchange()}catch(d){}}})},openBrowser:function(a,c,b){tinyMCEPopup.restoreSelection();this.editor.execCallback("file_browser_callback",a,document.getElementById(a).value,c,window)},confirm:function(b,a,c){this.editor.windowManager.confirm(b,a,c,window)},alert:function(b,a,c){this.editor.windowManager.alert(b,a,c,window)},close:function(){var a=this;function b(){a.editor.windowManager.close(window);tinymce=tinyMCE=a.editor=a.params=a.dom=a.dom.doc=null}if(tinymce.isOpera){a.getWin().setTimeout(b,0)}else{b()}},_restoreSelection:function(){var a=window.event.srcElement;if(a.nodeName=="INPUT"&&(a.type=="submit"||a.type=="button")){tinyMCEPopup.restoreSelection()}},_onDOMLoaded:function(){var b=tinyMCEPopup,d=document.title,e,c,a;if(b.domLoaded){return}b.domLoaded=1;if(b.features.translate_i18n!==false){c=document.body.innerHTML;if(tinymce.isIE){c=c.replace(/ (value|title|alt)=([^"][^\s>]+)/gi,' $1="$2"')}document.dir=b.editor.getParam("directionality","");if((a=b.editor.translate(c))&&a!=c){document.body.innerHTML=a}if((a=b.editor.translate(d))&&a!=d){document.title=d=a}}document.body.style.display="";if(tinymce.isIE){document.attachEvent("onmouseup",tinyMCEPopup._restoreSelection);b.dom.add(b.dom.select("head")[0],"base",{target:"_self"})}b.restoreSelection();b.resizeToInnerSize();if(!b.isWindow){b.editor.windowManager.setTitle(window,d)}else{window.focus()}if(!tinymce.isIE&&!b.isWindow){tinymce.dom.Event._add(document,"focus",function(){b.editor.windowManager.focus(b.id)})}tinymce.each(b.dom.select("select"),function(f){f.onkeydown=tinyMCEPopup._accessHandler});tinymce.each(b.listeners,function(f){f.func.call(f.scope,b.editor)});if(b.getWindowArg("mce_auto_focus",true)){window.focus();tinymce.each(document.forms,function(g){tinymce.each(g.elements,function(f){if(b.dom.hasClass(f,"mceFocus")&&!f.disabled){f.focus();return false}})})}document.onkeyup=tinyMCEPopup._closeWinKeyHandler},_accessHandler:function(a){a=a||window.event;if(a.keyCode==13||a.keyCode==32){a=a.target||a.srcElement;if(a.onchange){a.onchange()}return tinymce.dom.Event.cancel(a)}},_closeWinKeyHandler:function(a){a=a||window.event;if(a.keyCode==27){tinyMCEPopup.close()}},_wait:function(){if(document.attachEvent){document.attachEvent("onreadystatechange",function(){if(document.readyState==="complete"){document.detachEvent("onreadystatechange",arguments.callee);tinyMCEPopup._onDOMLoaded()}});if(document.documentElement.doScroll&&window==window.top){(function(){if(tinyMCEPopup.domLoaded){return}try{document.documentElement.doScroll("left")}catch(a){setTimeout(arguments.callee,0);return}tinyMCEPopup._onDOMLoaded()})()}document.attachEvent("onload",tinyMCEPopup._onDOMLoaded)}else{if(document.addEventListener){window.addEventListener("DOMContentLoaded",tinyMCEPopup._onDOMLoaded,false);window.addEventListener("load",tinyMCEPopup._onDOMLoaded,false)}}}};tinyMCEPopup.init();tinyMCEPopup._wait();
\ No newline at end of file
+var tinymce=null,tinyMCEPopup,tinyMCE;tinyMCEPopup={init:function(){var b=this,a,c;a=b.getWin();tinymce=a.tinymce;tinyMCE=a.tinyMCE;b.editor=tinymce.EditorManager.activeEditor;b.params=b.editor.windowManager.params;b.features=b.editor.windowManager.features;b.dom=b.editor.windowManager.createInstance("tinymce.dom.DOMUtils",document);if(b.features.popup_css!==false){b.dom.loadCSS(b.features.popup_css||b.editor.settings.popup_css)}b.listeners=[];b.onInit={add:function(e,d){b.listeners.push({func:e,scope:d})}};b.isWindow=!b.getWindowArg("mce_inline");b.id=b.getWindowArg("mce_window_id");b.editor.windowManager.onOpen.dispatch(b.editor.windowManager,window)},getWin:function(){return(!window.frameElement&&window.dialogArguments)||opener||parent||top},getWindowArg:function(c,b){var a=this.params[c];return tinymce.is(a)?a:b},getParam:function(b,a){return this.editor.getParam(b,a)},getLang:function(b,a){return this.editor.getLang(b,a)},execCommand:function(d,c,e,b){b=b||{};b.skip_focus=1;this.restoreSelection();return this.editor.execCommand(d,c,e,b)},resizeToInnerSize:function(){var a=this;setTimeout(function(){var b=a.dom.getViewPort(window);a.editor.windowManager.resizeBy(a.getWindowArg("mce_width")-b.w,a.getWindowArg("mce_height")-b.h,a.id||window)},10)},executeOnLoad:function(s){this.onInit.add(function(){eval(s)})},storeSelection:function(){this.editor.windowManager.bookmark=tinyMCEPopup.editor.selection.getBookmark(1)},restoreSelection:function(){var a=tinyMCEPopup;if(!a.isWindow&&tinymce.isIE){a.editor.selection.moveToBookmark(a.editor.windowManager.bookmark)}},requireLangPack:function(){var b=this,a=b.getWindowArg("plugin_url")||b.getWindowArg("theme_url");if(a&&b.editor.settings.language&&b.features.translate_i18n!==false&&b.editor.settings.language_load!==false){a+="/langs/"+b.editor.settings.language+"_dlg.js";if(!tinymce.ScriptLoader.isDone(a)){document.write('<script type="text/javascript" src="'+tinymce._addVer(a)+'"><\/script>');tinymce.ScriptLoader.markDone(a)}}},pickColor:function(b,a){this.execCommand("mceColorPicker",true,{color:document.getElementById(a).value,func:function(e){document.getElementById(a).value=e;try{document.getElementById(a).onchange()}catch(d){}}})},openBrowser:function(a,c,b){tinyMCEPopup.restoreSelection();this.editor.execCallback("file_browser_callback",a,document.getElementById(a).value,c,window)},confirm:function(b,a,c){this.editor.windowManager.confirm(b,a,c,window)},alert:function(b,a,c){this.editor.windowManager.alert(b,a,c,window)},close:function(){var a=this;function b(){a.editor.windowManager.close(window);tinymce=tinyMCE=a.editor=a.params=a.dom=a.dom.doc=null}if(tinymce.isOpera){a.getWin().setTimeout(b,0)}else{b()}},_restoreSelection:function(){var a=window.event.srcElement;if(a.nodeName=="INPUT"&&(a.type=="submit"||a.type=="button")){tinyMCEPopup.restoreSelection()}},_onDOMLoaded:function(){var b=tinyMCEPopup,d=document.title,e,c,a;if(b.domLoaded){return}b.domLoaded=1;if(b.features.translate_i18n!==false){c=document.body.innerHTML;if(tinymce.isIE){c=c.replace(/ (value|title|alt)=([^"][^\s>]+)/gi,' $1="$2"')}document.dir=b.editor.getParam("directionality","");if((a=b.editor.translate(c))&&a!=c){document.body.innerHTML=a}if((a=b.editor.translate(d))&&a!=d){document.title=d=a}}if(!b.editor.getParam("browser_preferred_colors",false)||!b.isWindow){b.dom.addClass(document.body,"forceColors")}document.body.style.display="";if(tinymce.isIE){document.attachEvent("onmouseup",tinyMCEPopup._restoreSelection);b.dom.add(b.dom.select("head")[0],"base",{target:"_self"})}b.restoreSelection();b.resizeToInnerSize();if(!b.isWindow){b.editor.windowManager.setTitle(window,d)}else{window.focus()}if(!tinymce.isIE&&!b.isWindow){tinymce.dom.Event._add(document,"focus",function(){b.editor.windowManager.focus(b.id)})}tinymce.each(b.dom.select("select"),function(f){f.onkeydown=tinyMCEPopup._accessHandler});tinymce.each(b.listeners,function(f){f.func.call(f.scope,b.editor)});if(b.getWindowArg("mce_auto_focus",true)){window.focus();tinymce.each(document.forms,function(g){tinymce.each(g.elements,function(f){if(b.dom.hasClass(f,"mceFocus")&&!f.disabled){f.focus();return false}})})}document.onkeyup=tinyMCEPopup._closeWinKeyHandler},_accessHandler:function(a){a=a||window.event;if(a.keyCode==13||a.keyCode==32){a=a.target||a.srcElement;if(a.onchange){a.onchange()}return tinymce.dom.Event.cancel(a)}},_closeWinKeyHandler:function(a){a=a||window.event;if(a.keyCode==27){tinyMCEPopup.close()}},_wait:function(){if(document.attachEvent){document.attachEvent("onreadystatechange",function(){if(document.readyState==="complete"){document.detachEvent("onreadystatechange",arguments.callee);tinyMCEPopup._onDOMLoaded()}});if(document.documentElement.doScroll&&window==window.top){(function(){if(tinyMCEPopup.domLoaded){return}try{document.documentElement.doScroll("left")}catch(a){setTimeout(arguments.callee,0);return}tinyMCEPopup._onDOMLoaded()})()}document.attachEvent("onload",tinyMCEPopup._onDOMLoaded)}else{if(document.addEventListener){window.addEventListener("DOMContentLoaded",tinyMCEPopup._onDOMLoaded,false);window.addEventListener("load",tinyMCEPopup._onDOMLoaded,false)}}}};tinyMCEPopup.init();tinyMCEPopup._wait();
\ No newline at end of file
diff --git a/plugins/TinyMCE/js/tiny_mce_src.js b/plugins/TinyMCE/js/tiny_mce_src.js
index acc1db528e..bc6aecef07 100644
--- a/plugins/TinyMCE/js/tiny_mce_src.js
+++ b/plugins/TinyMCE/js/tiny_mce_src.js
@@ -1,13 +1,13 @@
 (function(win) {
 	var whiteSpaceRe = /^\s*|\s*$/g,
-		undefined;
+		undefined, isRegExpBroken = 'B'.replace(/A(.)|B/, '$1') === '$1';
 
 	var tinymce = {
 		majorVersion : '3',
 
-		minorVersion : '3.8',
+		minorVersion : '4.3.1',
 
-		releaseDate : '2010-06-30',
+		releaseDate : '2011-06-16',
 
 		_init : function() {
 			var t = this, d = document, na = navigator, ua = na.userAgent, i, nl, n, base, p, v;
@@ -27,6 +27,8 @@
 			t.isAir = /adobeair/i.test(ua);
 
 			t.isIDevice = /(iPad|iPhone)/.test(ua);
+			
+			t.isIOS5 = t.isIDevice && ua.match(/AppleWebKit\/(\d*)/)[1]>=534;
 
 			// TinyMCE .NET webcontrol might be setting the values for TinyMCE
 			if (win.tinyMCEPreInit) {
@@ -52,7 +54,7 @@
 			}
 
 			function getBase(n) {
-				if (n.src && /tiny_mce(|_gzip|_jquery|_prototype)(_dev|_src)?.js/.test(n.src)) {
+				if (n.src && /tiny_mce(|_gzip|_jquery|_prototype|_full)(_dev|_src)?.js/.test(n.src)) {
 					if (/_(src|dev)\.js/g.test(n.src))
 						t.suffix = '_src';
 
@@ -103,6 +105,24 @@
 			return typeof(o) == t;
 		},
 
+		makeMap : function(items, delim, map) {
+			var i;
+
+			items = items || [];
+			delim = delim || ',';
+
+			if (typeof(items) == "string")
+				items = items.split(delim);
+
+			map = map || {};
+
+			i = items.length;
+			while (i--)
+				map[items[i]] = {};
+
+			return map;
+		},
+
 		each : function(o, cb, s) {
 			var n, l;
 
@@ -131,11 +151,61 @@
 		},
 
 
+		map : function(a, f) {
+			var o = [];
+
+			tinymce.each(a, function(v) {
+				o.push(f(v));
+			});
+
+			return o;
+		},
+
+		grep : function(a, f) {
+			var o = [];
+
+			tinymce.each(a, function(v) {
+				if (!f || f(v))
+					o.push(v);
+			});
+
+			return o;
+		},
+
+		inArray : function(a, v) {
+			var i, l;
+
+			if (a) {
+				for (i = 0, l = a.length; i < l; i++) {
+					if (a[i] === v)
+						return i;
+				}
+			}
+
+			return -1;
+		},
+
+		extend : function(o, e) {
+			var i, l, a = arguments;
+
+			for (i = 1, l = a.length; i < l; i++) {
+				e = a[i];
+
+				tinymce.each(e, function(v, n) {
+					if (v !== undefined)
+						o[n] = v;
+				});
+			}
+
+			return o;
+		},
+
+
 		trim : function(s) {
 			return (s ? '' + s : '').replace(whiteSpaceRe, '');
 		},
 
-		create : function(s, p) {
+		create : function(s, p, root) {
 			var t = this, sp, ns, cn, scn, c, de = 0;
 
 			// Parse : <prefix> <class>:<super class>
@@ -143,7 +213,7 @@
 			cn = s[3].match(/(^|\.)(\w+)$/i)[2]; // Class name
 
 			// Create namespace for new class
-			ns = t.createNS(s[3].replace(/\.\w+$/, ''));
+			ns = t.createNS(s[3].replace(/\.\w+$/, ''), root);
 
 			// Class already exists
 			if (ns[cn])
@@ -378,6 +448,29 @@
 				return u + v;
 
 			return u.replace('#', v + '#');
+		},
+
+		// Fix function for IE 9 where regexps isn't working correctly
+		// Todo: remove me once MS fixes the bug
+		_replace : function(find, replace, str) {
+			// On IE9 we have to fake $x replacement
+			if (isRegExpBroken) {
+				return str.replace(find, function() {
+					var val = replace, args = arguments, i;
+
+					for (i = 0; i < args.length - 2; i++) {
+						if (args[i] === undefined) {
+							val = val.replace(new RegExp('\\$' + i, 'g'), '');
+						} else {
+							val = val.replace(new RegExp('\\$' + i, 'g'), args[i]);
+						}
+					}
+
+					return val;
+				});
+			}
+
+			return str.replace(find, replace);
 		}
 
 		};
@@ -387,330 +480,10 @@
 
 	// Expose tinymce namespace to the global namespace (window)
 	win.tinymce = win.tinyMCE = tinymce;
-})(window);
 
-(function($, tinymce) {
-	var is = tinymce.is, attrRegExp = /^(href|src|style)$/i, undefined;
+	// Describe the different namespaces
 
-	// jQuery is undefined
-	if (!$)
-		return alert("Load jQuery first!");
-
-	// Stick jQuery into the tinymce namespace
-	tinymce.$ = $;
-
-	// Setup adapter
-	tinymce.adapter = {
-		patchEditor : function(editor) {
-			var fn = $.fn;
-
-			// Adapt the css function to make sure that the _mce_style
-			// attribute gets updated with the new style information
-			function css(name, value) {
-				var self = this;
-
-				// Remove _mce_style when set operation occurs
-				if (value)
-					self.removeAttr('_mce_style');
-
-				return fn.css.apply(self, arguments);
-			};
-
-			// Apapt the attr function to make sure that it uses the _mce_ prefixed variants
-			function attr(name, value) {
-				var self = this;
-
-				// Update/retrive _mce_ attribute variants
-				if (attrRegExp.test(name)) {
-					if (value !== undefined) {
-						// Use TinyMCE behavior when setting the specifc attributes
-						self.each(function(i, node) {
-							editor.dom.setAttrib(node, name, value);
-						});
-
-						return self;
-					} else
-						return self.attr('_mce_' + name);
-				}
-
-				// Default behavior
-				return fn.attr.apply(self, arguments);
-			};
-
-			function htmlPatchFunc(func) {
-				// Returns a modified function that processes
-				// the HTML before executing the action this makes sure
-				// that href/src etc gets moved into the _mce_ variants
-				return function(content) {
-					if (content)
-						content = editor.dom.processHTML(content);
-
-					return func.call(this, content);
-				};
-			};
-
-			// Patch various jQuery functions to handle tinymce specific attribute and content behavior
-			// we don't patch the jQuery.fn directly since it will most likely break compatibility
-			// with other jQuery logic on the page. Only instances created by TinyMCE should be patched.
-			function patch(jq) {
-				// Patch some functions, only patch the object once
-				if (jq.css !== css) {
-					// Patch css/attr to use the _mce_ prefixed attribute variants
-					jq.css = css;
-					jq.attr = attr;
-
-					// Patch HTML functions to use the DOMUtils.processHTML filter logic
-					jq.html = htmlPatchFunc(fn.html);
-					jq.append = htmlPatchFunc(fn.append);
-					jq.prepend = htmlPatchFunc(fn.prepend);
-					jq.after = htmlPatchFunc(fn.after);
-					jq.before = htmlPatchFunc(fn.before);
-					jq.replaceWith = htmlPatchFunc(fn.replaceWith);
-					jq.tinymce = editor;
-
-					// Each pushed jQuery instance needs to be patched
-					// as well for example when traversing the DOM
-					jq.pushStack = function() {
-						return patch(fn.pushStack.apply(this, arguments));
-					};
-				}
-
-				return jq;
-			};
-
-			// Add a $ function on each editor instance this one is scoped for the editor document object
-			// this way you can do chaining like this tinymce.get(0).$('p').append('text').css('color', 'red');
-			editor.$ = function(selector, scope) {
-				var doc = editor.getDoc();
-
-				return patch($(selector || doc, doc || scope));
-			};
-		}
-	};
-
-	// Patch in core NS functions
-	tinymce.extend = $.extend;
-	tinymce.extend(tinymce, {
-		map : $.map,
-		grep : function(a, f) {return $.grep(a, f || function(){return 1;});},
-		inArray : function(a, v) {return $.inArray(v, a || []);}
-
-		/* Didn't iterate stylesheets
-		each : function(o, cb, s) {
-			if (!o)
-				return 0;
-
-			var r = 1;
-
-			$.each(o, function(nr, el){
-				if (cb.call(s, el, nr, o) === false) {
-					r = 0;
-					return false;
-				}
-			});
-
-			return r;
-		}*/
-	});
-
-	// Patch in functions in various clases
-	// Add a "#ifndefjquery" statement around each core API function you add below
-	var patches = {
-		'tinymce.dom.DOMUtils' : {
-			/*
-			addClass : function(e, c) {
-				if (is(e, 'array') && is(e[0], 'string'))
-					e = e.join(',#');
-				return (e && $(is(e, 'string') ? '#' + e : e)
-					.addClass(c)
-					.attr('class')) || false;
-			},
-
-			hasClass : function(n, c) {
-				return $(is(n, 'string') ? '#' + n : n).hasClass(c);
-			},
-
-			removeClass : function(e, c) {
-				if (!e)
-					return false;
-
-				var r = [];
-
-				$(is(e, 'string') ? '#' + e : e)
-					.removeClass(c)
-					.each(function(){
-						r.push(this.className);
-					});
-
-				return r.length == 1 ? r[0] : r;
-			},
-			*/
-
-			select : function(pattern, scope) {
-				var t = this;
-
-				return $.find(pattern, t.get(scope) || t.get(t.settings.root_element) || t.doc, []);
-			},
-
-			is : function(n, patt) {
-				return $(this.get(n)).is(patt);
-			}
-
-			/*
-			show : function(e) {
-				if (is(e, 'array') && is(e[0], 'string'))
-					e = e.join(',#');
-
-				$(is(e, 'string') ? '#' + e : e).css('display', 'block');
-			},
-
-			hide : function(e) {
-				if (is(e, 'array') && is(e[0], 'string'))
-					e = e.join(',#');
-
-				$(is(e, 'string') ? '#' + e : e).css('display', 'none');
-			},
-
-			isHidden : function(e) {
-				return $(is(e, 'string') ? '#' + e : e).is(':hidden');
-			},
-
-			insertAfter : function(n, e) {
-				return $(is(e, 'string') ? '#' + e : e).after(n);
-			},
-
-			replace : function(o, n, k) {
-				n = $(is(n, 'string') ? '#' + n : n);
-
-				if (k)
-					n.children().appendTo(o);
-
-				n.replaceWith(o);
-			},
-
-			setStyle : function(n, na, v) {
-				if (is(n, 'array') && is(n[0], 'string'))
-					n = n.join(',#');
-
-				$(is(n, 'string') ? '#' + n : n).css(na, v);
-			},
-
-			getStyle : function(n, na, c) {
-				return $(is(n, 'string') ? '#' + n : n).css(na);
-			},
-
-			setStyles : function(e, o) {
-				if (is(e, 'array') && is(e[0], 'string'))
-					e = e.join(',#');
-				$(is(e, 'string') ? '#' + e : e).css(o);
-			},
-
-			setAttrib : function(e, n, v) {
-				var t = this, s = t.settings;
-
-				if (is(e, 'array') && is(e[0], 'string'))
-					e = e.join(',#');
-
-				e = $(is(e, 'string') ? '#' + e : e);
-
-				switch (n) {
-					case "style":
-						e.each(function(i, v){
-							if (s.keep_values)
-								$(v).attr('_mce_style', v);
-
-							v.style.cssText = v;
-						});
-						break;
-
-					case "class":
-						e.each(function(){
-							this.className = v;
-						});
-						break;
-
-					case "src":
-					case "href":
-						e.each(function(i, v){
-							if (s.keep_values) {
-								if (s.url_converter)
-									v = s.url_converter.call(s.url_converter_scope || t, v, n, v);
-
-								t.setAttrib(v, '_mce_' + n, v);
-							}
-						});
-
-						break;
-				}
-
-				if (v !== null && v.length !== 0)
-					e.attr(n, '' + v);
-				else
-					e.removeAttr(n);
-			},
-
-			setAttribs : function(e, o) {
-				var t = this;
-
-				$.each(o, function(n, v){
-					t.setAttrib(e,n,v);
-				});
-			}
-			*/
-		}
-
-/*
-		'tinymce.dom.Event' : {
-			add : function (o, n, f, s) {
-				var lo, cb;
-
-				cb = function(e) {
-					e.target = e.target || this;
-					f.call(s || this, e);
-				};
-
-				if (is(o, 'array') && is(o[0], 'string'))
-					o = o.join(',#');
-				o = $(is(o, 'string') ? '#' + o : o);
-				if (n == 'init') {
-					o.ready(cb, s);
-				} else {
-					if (s) {
-						o.bind(n, s, cb);
-					} else {
-						o.bind(n, cb);
-					}
-				}
-
-				lo = this._jqLookup || (this._jqLookup = []);
-				lo.push({func : f, cfunc : cb});
-
-				return cb;
-			},
-
-			remove : function(o, n, f) {
-				// Find cfunc
-				$(this._jqLookup).each(function() {
-					if (this.func === f)
-						f = this.cfunc;
-				});
-
-				if (is(o, 'array') && is(o[0], 'string'))
-					o = o.join(',#');
-
-				$(is(o, 'string') ? '#' + o : o).unbind(n,f);
-
-				return true;
-			}
-		}
-*/
-	};
-
-	// Patch functions after a class is created
-	tinymce.onCreate = function(ty, c, p) {
-		tinymce.extend(p, patches[c]);
-	};
-})(window.jQuery, tinymce);
+	})(window);
 
 
 
@@ -772,7 +545,7 @@ tinymce.create('tinymce.util.Dispatcher', {
 
 	tinymce.create('tinymce.util.URI', {
 		URI : function(u, s) {
-			var t = this, o, a, b;
+			var t = this, o, a, b, base_url;
 
 			// Trim whitespace
 			u = tinymce.trim(u);
@@ -791,8 +564,10 @@ tinymce.create('tinymce.util.Dispatcher', {
 				u = (s.base_uri ? s.base_uri.protocol || 'http' : 'http') + '://mce_host' + u;
 
 			// Relative path http:// or protocol relative //path
-			if (!/^\w*:?\/\//.test(u))
-				u = (s.base_uri.protocol || 'http') + '://mce_host' + t.toAbsPath(s.base_uri.path, u);
+			if (!/^[\w-]*:?\/\//.test(u)) {
+				base_url = s.base_uri ? s.base_uri.path : new tinymce.util.URI(location.href).directory;
+				u = ((s.base_uri && s.base_uri.protocol) || 'http') + '://mce_host' + t.toAbsPath(base_url, u);
+			}
 
 			// Parse URL (Credits goes to Steave, http://blog.stevenlevithan.com/archives/parseuri)
 			u = u.replace(/@@/g, '(mce_at)'); // Zope 3 workaround, they use @@something
@@ -1079,9 +854,11 @@ tinymce.create('tinymce.util.Dispatcher', {
 	});
 })();
 
-tinymce.create('static tinymce.util.JSON', {
-	serialize : function(o) {
-		var i, v, s = tinymce.util.JSON.serialize, t;
+(function() {
+	function serialize(o, quote) {
+		var i, v, t;
+
+		quote = quote || '"';
 
 		if (o == null)
 			return 'null';
@@ -1091,7 +868,11 @@ tinymce.create('static tinymce.util.JSON', {
 		if (t == 'string') {
 			v = '\bb\tt\nn\ff\rr\""\'\'\\\\';
 
-			return '"' + o.replace(/([\u0080-\uFFFF\x00-\x1f\"])/g, function(a, b) {
+			return quote + o.replace(/([\u0080-\uFFFF\x00-\x1f\"\'\\])/g, function(a, b) {
+				// Make sure single quotes never get encoded inside double quotes for JSON compatibility
+				if (quote === '"' && a === "'")
+					return a;
+
 				i = v.indexOf(b);
 
 				if (i + 1)
@@ -1100,13 +881,13 @@ tinymce.create('static tinymce.util.JSON', {
 				a = b.charCodeAt().toString(16);
 
 				return '\\u' + '0000'.substring(a.length) + a;
-			}) + '"';
+			}) + quote;
 		}
 
 		if (t == 'object') {
 			if (o.hasOwnProperty && o instanceof Array) {
 					for (i=0, v = '['; i<o.length; i++)
-						v += (i > 0 ? ',' : '') + s(o[i]);
+						v += (i > 0 ? ',' : '') + serialize(o[i], quote);
 
 					return v + ']';
 				}
@@ -1114,24 +895,27 @@ tinymce.create('static tinymce.util.JSON', {
 				v = '{';
 
 				for (i in o)
-					v += typeof o[i] != 'function' ? (v.length > 1 ? ',"' : '"') + i + '":' + s(o[i]) : '';
+					v += typeof o[i] != 'function' ? (v.length > 1 ? ',' + quote : quote) + i + quote +':' + serialize(o[i], quote) : '';
 
 				return v + '}';
 		}
 
 		return '' + o;
-	},
+	};
 
-	parse : function(s) {
-		try {
-			return eval('(' + s + ')');
-		} catch (ex) {
-			// Ignore
+	tinymce.util.JSON = {
+		serialize: serialize,
+
+		parse: function(s) {
+			try {
+				return eval('(' + s + ')');
+			} catch (ex) {
+				// Ignore
+			}
 		}
-	}
-
-	});
 
+		};
+})();
 tinymce.create('static tinymce.util.XHR', {
 	send : function(o) {
 		var x, t, w = window, c = 0;
@@ -1222,7 +1006,8 @@ tinymce.create('static tinymce.util.XHR', {
 			};
 
 			o.error = function(ty, x) {
-				ecb.call(o.error_scope || o.scope, ty, x);
+				if (ecb)
+					ecb.call(o.error_scope || o.scope, ty, x);
 			};
 
 			o.data = JSON.serialize({
@@ -1244,30 +1029,2259 @@ tinymce.create('static tinymce.util.XHR', {
 		}
 	});
 }());
+(function(tinymce) {
+	var namedEntities, baseEntities, reverseEntities,
+		attrsCharsRegExp = /[&<>\"\u007E-\uD7FF]|[\uD800-\uDBFF][\uDC00-\uDFFF]/g,
+		textCharsRegExp = /[<>&\u007E-\uD7FF]|[\uD800-\uDBFF][\uDC00-\uDFFF]/g,
+		rawCharsRegExp = /[<>&\"\']/g,
+		entityRegExp = /&(#x|#)?([\w]+);/g,
+		asciiMap = {
+				128 : "\u20AC", 130 : "\u201A", 131 : "\u0192", 132 : "\u201E", 133 : "\u2026", 134 : "\u2020",
+				135 : "\u2021", 136 : "\u02C6", 137 : "\u2030", 138 : "\u0160", 139 : "\u2039", 140 : "\u0152",
+				142 : "\u017D", 145 : "\u2018", 146 : "\u2019", 147 : "\u201C", 148 : "\u201D", 149 : "\u2022",
+				150 : "\u2013", 151 : "\u2014", 152 : "\u02DC", 153 : "\u2122", 154 : "\u0161", 155 : "\u203A",
+				156 : "\u0153", 158 : "\u017E", 159 : "\u0178"
+		};
+
+	// Raw entities
+	baseEntities = {
+		'"' : '&quot;',
+		"'" : '&#39;',
+		'<' : '&lt;',
+		'>' : '&gt;',
+		'&' : '&amp;'
+	};
+
+	// Reverse lookup table for raw entities
+	reverseEntities = {
+		'&lt;' : '<',
+		'&gt;' : '>',
+		'&amp;' : '&',
+		'&quot;' : '"',
+		'&apos;' : "'"
+	};
+
+	// Decodes text by using the browser
+	function nativeDecode(text) {
+		var elm;
+
+		elm = document.createElement("div");
+		elm.innerHTML = text;
+
+		return elm.textContent || elm.innerText || text;
+	};
+
+	// Build a two way lookup table for the entities
+	function buildEntitiesLookup(items, radix) {
+		var i, chr, entity, lookup = {};
+
+		if (items) {
+			items = items.split(',');
+			radix = radix || 10;
+
+			// Build entities lookup table
+			for (i = 0; i < items.length; i += 2) {
+				chr = String.fromCharCode(parseInt(items[i], radix));
+
+				// Only add non base entities
+				if (!baseEntities[chr]) {
+					entity = '&' + items[i + 1] + ';';
+					lookup[chr] = entity;
+					lookup[entity] = chr;
+				}
+			}
+
+			return lookup;
+		}
+	};
+
+	// Unpack entities lookup where the numbers are in radix 32 to reduce the size
+	namedEntities = buildEntitiesLookup(
+		'50,nbsp,51,iexcl,52,cent,53,pound,54,curren,55,yen,56,brvbar,57,sect,58,uml,59,copy,' +
+		'5a,ordf,5b,laquo,5c,not,5d,shy,5e,reg,5f,macr,5g,deg,5h,plusmn,5i,sup2,5j,sup3,5k,acute,' +
+		'5l,micro,5m,para,5n,middot,5o,cedil,5p,sup1,5q,ordm,5r,raquo,5s,frac14,5t,frac12,5u,frac34,' +
+		'5v,iquest,60,Agrave,61,Aacute,62,Acirc,63,Atilde,64,Auml,65,Aring,66,AElig,67,Ccedil,' +
+		'68,Egrave,69,Eacute,6a,Ecirc,6b,Euml,6c,Igrave,6d,Iacute,6e,Icirc,6f,Iuml,6g,ETH,6h,Ntilde,' +
+		'6i,Ograve,6j,Oacute,6k,Ocirc,6l,Otilde,6m,Ouml,6n,times,6o,Oslash,6p,Ugrave,6q,Uacute,' +
+		'6r,Ucirc,6s,Uuml,6t,Yacute,6u,THORN,6v,szlig,70,agrave,71,aacute,72,acirc,73,atilde,74,auml,' +
+		'75,aring,76,aelig,77,ccedil,78,egrave,79,eacute,7a,ecirc,7b,euml,7c,igrave,7d,iacute,7e,icirc,' +
+		'7f,iuml,7g,eth,7h,ntilde,7i,ograve,7j,oacute,7k,ocirc,7l,otilde,7m,ouml,7n,divide,7o,oslash,' +
+		'7p,ugrave,7q,uacute,7r,ucirc,7s,uuml,7t,yacute,7u,thorn,7v,yuml,ci,fnof,sh,Alpha,si,Beta,' +
+		'sj,Gamma,sk,Delta,sl,Epsilon,sm,Zeta,sn,Eta,so,Theta,sp,Iota,sq,Kappa,sr,Lambda,ss,Mu,' +
+		'st,Nu,su,Xi,sv,Omicron,t0,Pi,t1,Rho,t3,Sigma,t4,Tau,t5,Upsilon,t6,Phi,t7,Chi,t8,Psi,' +
+		't9,Omega,th,alpha,ti,beta,tj,gamma,tk,delta,tl,epsilon,tm,zeta,tn,eta,to,theta,tp,iota,' +
+		'tq,kappa,tr,lambda,ts,mu,tt,nu,tu,xi,tv,omicron,u0,pi,u1,rho,u2,sigmaf,u3,sigma,u4,tau,' +
+		'u5,upsilon,u6,phi,u7,chi,u8,psi,u9,omega,uh,thetasym,ui,upsih,um,piv,812,bull,816,hellip,' +
+		'81i,prime,81j,Prime,81u,oline,824,frasl,88o,weierp,88h,image,88s,real,892,trade,89l,alefsym,' +
+		'8cg,larr,8ch,uarr,8ci,rarr,8cj,darr,8ck,harr,8dl,crarr,8eg,lArr,8eh,uArr,8ei,rArr,8ej,dArr,' +
+		'8ek,hArr,8g0,forall,8g2,part,8g3,exist,8g5,empty,8g7,nabla,8g8,isin,8g9,notin,8gb,ni,8gf,prod,' +
+		'8gh,sum,8gi,minus,8gn,lowast,8gq,radic,8gt,prop,8gu,infin,8h0,ang,8h7,and,8h8,or,8h9,cap,8ha,cup,' +
+		'8hb,int,8hk,there4,8hs,sim,8i5,cong,8i8,asymp,8j0,ne,8j1,equiv,8j4,le,8j5,ge,8k2,sub,8k3,sup,8k4,' +
+		'nsub,8k6,sube,8k7,supe,8kl,oplus,8kn,otimes,8l5,perp,8m5,sdot,8o8,lceil,8o9,rceil,8oa,lfloor,8ob,' +
+		'rfloor,8p9,lang,8pa,rang,9ea,loz,9j0,spades,9j3,clubs,9j5,hearts,9j6,diams,ai,OElig,aj,oelig,b0,' +
+		'Scaron,b1,scaron,bo,Yuml,m6,circ,ms,tilde,802,ensp,803,emsp,809,thinsp,80c,zwnj,80d,zwj,80e,lrm,' +
+		'80f,rlm,80j,ndash,80k,mdash,80o,lsquo,80p,rsquo,80q,sbquo,80s,ldquo,80t,rdquo,80u,bdquo,810,dagger,' +
+		'811,Dagger,81g,permil,81p,lsaquo,81q,rsaquo,85c,euro'
+	, 32);
+
+	tinymce.html = tinymce.html || {};
+
+	tinymce.html.Entities = {
+		encodeRaw : function(text, attr) {
+			return text.replace(attr ? attrsCharsRegExp : textCharsRegExp, function(chr) {
+				return baseEntities[chr] || chr;
+			});
+		},
+
+		encodeAllRaw : function(text) {
+			return ('' + text).replace(rawCharsRegExp, function(chr) {
+				return baseEntities[chr] || chr;
+			});
+		},
+
+		encodeNumeric : function(text, attr) {
+			return text.replace(attr ? attrsCharsRegExp : textCharsRegExp, function(chr) {
+				// Multi byte sequence convert it to a single entity
+				if (chr.length > 1)
+					return '&#' + (((chr.charCodeAt(0) - 0xD800) * 0x400) + (chr.charCodeAt(1) - 0xDC00) + 0x10000) + ';';
+
+				return baseEntities[chr] || '&#' + chr.charCodeAt(0) + ';';
+			});
+		},
+
+		encodeNamed : function(text, attr, entities) {
+			entities = entities || namedEntities;
+
+			return text.replace(attr ? attrsCharsRegExp : textCharsRegExp, function(chr) {
+				return baseEntities[chr] || entities[chr] || chr;
+			});
+		},
+
+		getEncodeFunc : function(name, entities) {
+			var Entities = tinymce.html.Entities;
+
+			entities = buildEntitiesLookup(entities) || namedEntities;
+
+			function encodeNamedAndNumeric(text, attr) {
+				return text.replace(attr ? attrsCharsRegExp : textCharsRegExp, function(chr) {
+					return baseEntities[chr] || entities[chr] || '&#' + chr.charCodeAt(0) + ';' || chr;
+				});
+			};
+
+			function encodeCustomNamed(text, attr) {
+				return Entities.encodeNamed(text, attr, entities);
+			};
+
+			// Replace + with , to be compatible with previous TinyMCE versions
+			name = tinymce.makeMap(name.replace(/\+/g, ','));
+
+			// Named and numeric encoder
+			if (name.named && name.numeric)
+				return encodeNamedAndNumeric;
+
+			// Named encoder
+			if (name.named) {
+				// Custom names
+				if (entities)
+					return encodeCustomNamed;
+
+				return Entities.encodeNamed;
+			}
+
+			// Numeric
+			if (name.numeric)
+				return Entities.encodeNumeric;
+
+			// Raw encoder
+			return Entities.encodeRaw;
+		},
+
+		decode : function(text) {
+			return text.replace(entityRegExp, function(all, numeric, value) {
+				if (numeric) {
+					value = parseInt(value, numeric.length === 2 ? 16 : 10);
+
+					// Support upper UTF
+					if (value > 0xFFFF) {
+						value -= 0x10000;
+
+						return String.fromCharCode(0xD800 + (value >> 10), 0xDC00 + (value & 0x3FF));
+					} else
+						return asciiMap[value] || String.fromCharCode(value);
+				}
+
+				return reverseEntities[all] || namedEntities[all] || nativeDecode(all);
+			});
+		}
+	};
+})(tinymce);
+
+tinymce.html.Styles = function(settings, schema) {
+	var rgbRegExp = /rgb\s*\(\s*([0-9]+)\s*,\s*([0-9]+)\s*,\s*([0-9]+)\s*\)/gi,
+		urlOrStrRegExp = /(?:url(?:(?:\(\s*\"([^\"]+)\"\s*\))|(?:\(\s*\'([^\']+)\'\s*\))|(?:\(\s*([^)\s]+)\s*\))))|(?:\'([^\']+)\')|(?:\"([^\"]+)\")/gi,
+		styleRegExp = /\s*([^:]+):\s*([^;]+);?/g,
+		trimRightRegExp = /\s+$/,
+		urlColorRegExp = /rgb/,
+		undef, i, encodingLookup = {}, encodingItems;
+
+	settings = settings || {};
+
+	encodingItems = '\\" \\\' \\; \\: ; : \uFEFF'.split(' ');
+	for (i = 0; i < encodingItems.length; i++) {
+		encodingLookup[encodingItems[i]] = '\uFEFF' + i;
+		encodingLookup['\uFEFF' + i] = encodingItems[i];
+	}
+
+	function toHex(match, r, g, b) {
+		function hex(val) {
+			val = parseInt(val).toString(16);
+
+			return val.length > 1 ? val : '0' + val; // 0 -> 00
+		};
+
+		return '#' + hex(r) + hex(g) + hex(b);
+	};
+
+	return {
+		toHex : function(color) {
+			return color.replace(rgbRegExp, toHex);
+		},
+
+		parse : function(css) {
+			var styles = {}, matches, name, value, isEncoded, urlConverter = settings.url_converter, urlConverterScope = settings.url_converter_scope || this;
+
+			function compress(prefix, suffix) {
+				var top, right, bottom, left;
+
+				// Get values and check it it needs compressing
+				top = styles[prefix + '-top' + suffix];
+				if (!top)
+					return;
+
+				right = styles[prefix + '-right' + suffix];
+				if (top != right)
+					return;
+
+				bottom = styles[prefix + '-bottom' + suffix];
+				if (right != bottom)
+					return;
+
+				left = styles[prefix + '-left' + suffix];
+				if (bottom != left)
+					return;
+
+				// Compress
+				styles[prefix + suffix] = left;
+				delete styles[prefix + '-top' + suffix];
+				delete styles[prefix + '-right' + suffix];
+				delete styles[prefix + '-bottom' + suffix];
+				delete styles[prefix + '-left' + suffix];
+			};
+
+			function canCompress(key) {
+				var value = styles[key], i;
+
+				if (!value || value.indexOf(' ') < 0)
+					return;
+
+				value = value.split(' ');
+				i = value.length;
+				while (i--) {
+					if (value[i] !== value[0])
+						return false;
+				}
+
+				styles[key] = value[0];
+
+				return true;
+			};
+
+			function compress2(target, a, b, c) {
+				if (!canCompress(a))
+					return;
+
+				if (!canCompress(b))
+					return;
+
+				if (!canCompress(c))
+					return;
+
+				// Compress
+				styles[target] = styles[a] + ' ' + styles[b] + ' ' + styles[c];
+				delete styles[a];
+				delete styles[b];
+				delete styles[c];
+			};
+
+			// Encodes the specified string by replacing all \" \' ; : with _<num>
+			function encode(str) {
+				isEncoded = true;
+
+				return encodingLookup[str];
+			};
+
+			// Decodes the specified string by replacing all _<num> with it's original value \" \' etc
+			// It will also decode the \" \' if keep_slashes is set to fale or omitted
+			function decode(str, keep_slashes) {
+				if (isEncoded) {
+					str = str.replace(/\uFEFF[0-9]/g, function(str) {
+						return encodingLookup[str];
+					});
+				}
+
+				if (!keep_slashes)
+					str = str.replace(/\\([\'\";:])/g, "$1");
+
+				return str;
+			}
+
+			if (css) {
+				// Encode \" \' % and ; and : inside strings so they don't interfere with the style parsing
+				css = css.replace(/\\[\"\';:\uFEFF]/g, encode).replace(/\"[^\"]+\"|\'[^\']+\'/g, function(str) {
+					return str.replace(/[;:]/g, encode);
+				});
+
+				// Parse styles
+				while (matches = styleRegExp.exec(css)) {
+					name = matches[1].replace(trimRightRegExp, '').toLowerCase();
+					value = matches[2].replace(trimRightRegExp, '');
+
+					if (name && value.length > 0) {
+						// Opera will produce 700 instead of bold in their style values
+						if (name === 'font-weight' && value === '700')
+							value = 'bold';
+						else if (name === 'color' || name === 'background-color') // Lowercase colors like RED
+							value = value.toLowerCase();		
+
+						// Convert RGB colors to HEX
+						value = value.replace(rgbRegExp, toHex);
+
+						// Convert URLs and force them into url('value') format
+						value = value.replace(urlOrStrRegExp, function(match, url, url2, url3, str, str2) {
+							str = str || str2;
+
+							if (str) {
+								str = decode(str);
+
+								// Force strings into single quote format
+								return "'" + str.replace(/\'/g, "\\'") + "'";
+							}
+
+							url = decode(url || url2 || url3);
+
+							// Convert the URL to relative/absolute depending on config
+							if (urlConverter)
+								url = urlConverter.call(urlConverterScope, url, 'style');
+
+							// Output new URL format
+							return "url('" + url.replace(/\'/g, "\\'") + "')";
+						});
+
+						styles[name] = isEncoded ? decode(value, true) : value;
+					}
+
+					styleRegExp.lastIndex = matches.index + matches[0].length;
+				}
+
+				// Compress the styles to reduce it's size for example IE will expand styles
+				compress("border", "");
+				compress("border", "-width");
+				compress("border", "-color");
+				compress("border", "-style");
+				compress("padding", "");
+				compress("margin", "");
+				compress2('border', 'border-width', 'border-style', 'border-color');
+
+				// Remove pointless border, IE produces these
+				if (styles.border === 'medium none')
+					delete styles.border;
+			}
+
+			return styles;
+		},
+
+		serialize : function(styles, element_name) {
+			var css = '', name, value;
+
+			function serializeStyles(name) {
+				var styleList, i, l, value;
+
+				styleList = schema.styles[name];
+				if (styleList) {
+					for (i = 0, l = styleList.length; i < l; i++) {
+						name = styleList[i];
+						value = styles[name];
+
+						if (value !== undef && value.length > 0)
+							css += (css.length > 0 ? ' ' : '') + name + ': ' + value + ';';
+					}
+				}
+			};
+
+			// Serialize styles according to schema
+			if (element_name && schema && schema.styles) {
+				// Serialize global styles and element specific styles
+				serializeStyles('*');
+				serializeStyles(element_name);
+			} else {
+				// Output the styles in the order they are inside the object
+				for (name in styles) {
+					value = styles[name];
+
+					if (value !== undef && value.length > 0)
+						css += (css.length > 0 ? ' ' : '') + name + ': ' + value + ';';
+				}
+			}
+
+			return css;
+		}
+	};
+};
+
+(function(tinymce) {
+	var transitional = {}, boolAttrMap, blockElementsMap, shortEndedElementsMap, nonEmptyElementsMap, customElementsMap = {},
+		whiteSpaceElementsMap, selfClosingElementsMap, makeMap = tinymce.makeMap, each = tinymce.each;
+
+	function split(str, delim) {
+		return str.split(delim || ',');
+	};
+
+	function unpack(lookup, data) {
+		var key, elements = {};
+
+		function replace(value) {
+			return value.replace(/[A-Z]+/g, function(key) {
+				return replace(lookup[key]);
+			});
+		};
+
+		// Unpack lookup
+		for (key in lookup) {
+			if (lookup.hasOwnProperty(key))
+				lookup[key] = replace(lookup[key]);
+		}
+
+		// Unpack and parse data into object map
+		replace(data).replace(/#/g, '#text').replace(/(\w+)\[([^\]]+)\]\[([^\]]*)\]/g, function(str, name, attributes, children) {
+			attributes = split(attributes, '|');
+
+			elements[name] = {
+				attributes : makeMap(attributes),
+				attributesOrder : attributes,
+				children : makeMap(children, '|', {'#comment' : {}})
+			}
+		});
+
+		return elements;
+	};
+
+	// Build a lookup table for block elements both lowercase and uppercase
+	blockElementsMap = 'h1,h2,h3,h4,h5,h6,hr,p,div,address,pre,form,table,tbody,thead,tfoot,' + 
+						'th,tr,td,li,ol,ul,caption,blockquote,center,dl,dt,dd,dir,fieldset,' + 
+						'noscript,menu,isindex,samp,header,footer,article,section,hgroup';
+	blockElementsMap = makeMap(blockElementsMap, ',', makeMap(blockElementsMap.toUpperCase()));
+
+	// This is the XHTML 1.0 transitional elements with it's attributes and children packed to reduce it's size
+	transitional = unpack({
+		Z : 'H|K|N|O|P',
+		Y : 'X|form|R|Q',
+		ZG : 'E|span|width|align|char|charoff|valign',
+		X : 'p|T|div|U|W|isindex|fieldset|table',
+		ZF : 'E|align|char|charoff|valign',
+		W : 'pre|hr|blockquote|address|center|noframes',
+		ZE : 'abbr|axis|headers|scope|rowspan|colspan|align|char|charoff|valign|nowrap|bgcolor|width|height',
+		ZD : '[E][S]',
+		U : 'ul|ol|dl|menu|dir',
+		ZC : 'p|Y|div|U|W|table|br|span|bdo|object|applet|img|map|K|N|Q',
+		T : 'h1|h2|h3|h4|h5|h6',
+		ZB : 'X|S|Q',
+		S : 'R|P',
+		ZA : 'a|G|J|M|O|P',
+		R : 'a|H|K|N|O',
+		Q : 'noscript|P',
+		P : 'ins|del|script',
+		O : 'input|select|textarea|label|button',
+		N : 'M|L',
+		M : 'em|strong|dfn|code|q|samp|kbd|var|cite|abbr|acronym',
+		L : 'sub|sup',
+		K : 'J|I',
+		J : 'tt|i|b|u|s|strike',
+		I : 'big|small|font|basefont',
+		H : 'G|F',
+		G : 'br|span|bdo',
+		F : 'object|applet|img|map|iframe',
+		E : 'A|B|C',
+		D : 'accesskey|tabindex|onfocus|onblur',
+		C : 'onclick|ondblclick|onmousedown|onmouseup|onmouseover|onmousemove|onmouseout|onkeypress|onkeydown|onkeyup',
+		B : 'lang|xml:lang|dir',
+		A : 'id|class|style|title'
+	}, 'script[id|charset|type|language|src|defer|xml:space][]' + 
+		'style[B|id|type|media|title|xml:space][]' + 
+		'object[E|declare|classid|codebase|data|type|codetype|archive|standby|width|height|usemap|name|tabindex|align|border|hspace|vspace][#|param|Y]' + 
+		'param[id|name|value|valuetype|type][]' + 
+		'p[E|align][#|S]' + 
+		'a[E|D|charset|type|name|href|hreflang|rel|rev|shape|coords|target][#|Z]' + 
+		'br[A|clear][]' + 
+		'span[E][#|S]' + 
+		'bdo[A|C|B][#|S]' + 
+		'applet[A|codebase|archive|code|object|alt|name|width|height|align|hspace|vspace][#|param|Y]' + 
+		'h1[E|align][#|S]' + 
+		'img[E|src|alt|name|longdesc|width|height|usemap|ismap|align|border|hspace|vspace][]' + 
+		'map[B|C|A|name][X|form|Q|area]' + 
+		'h2[E|align][#|S]' + 
+		'iframe[A|longdesc|name|src|frameborder|marginwidth|marginheight|scrolling|align|width|height][#|Y]' + 
+		'h3[E|align][#|S]' + 
+		'tt[E][#|S]' + 
+		'i[E][#|S]' + 
+		'b[E][#|S]' + 
+		'u[E][#|S]' + 
+		's[E][#|S]' + 
+		'strike[E][#|S]' + 
+		'big[E][#|S]' + 
+		'small[E][#|S]' + 
+		'font[A|B|size|color|face][#|S]' + 
+		'basefont[id|size|color|face][]' + 
+		'em[E][#|S]' + 
+		'strong[E][#|S]' + 
+		'dfn[E][#|S]' + 
+		'code[E][#|S]' + 
+		'q[E|cite][#|S]' + 
+		'samp[E][#|S]' + 
+		'kbd[E][#|S]' + 
+		'var[E][#|S]' + 
+		'cite[E][#|S]' + 
+		'abbr[E][#|S]' + 
+		'acronym[E][#|S]' + 
+		'sub[E][#|S]' + 
+		'sup[E][#|S]' + 
+		'input[E|D|type|name|value|checked|disabled|readonly|size|maxlength|src|alt|usemap|onselect|onchange|accept|align][]' + 
+		'select[E|name|size|multiple|disabled|tabindex|onfocus|onblur|onchange][optgroup|option]' + 
+		'optgroup[E|disabled|label][option]' + 
+		'option[E|selected|disabled|label|value][]' + 
+		'textarea[E|D|name|rows|cols|disabled|readonly|onselect|onchange][]' + 
+		'label[E|for|accesskey|onfocus|onblur][#|S]' + 
+		'button[E|D|name|value|type|disabled][#|p|T|div|U|W|table|G|object|applet|img|map|K|N|Q]' + 
+		'h4[E|align][#|S]' + 
+		'ins[E|cite|datetime][#|Y]' + 
+		'h5[E|align][#|S]' + 
+		'del[E|cite|datetime][#|Y]' + 
+		'h6[E|align][#|S]' + 
+		'div[E|align][#|Y]' + 
+		'ul[E|type|compact][li]' + 
+		'li[E|type|value][#|Y]' + 
+		'ol[E|type|compact|start][li]' + 
+		'dl[E|compact][dt|dd]' + 
+		'dt[E][#|S]' + 
+		'dd[E][#|Y]' + 
+		'menu[E|compact][li]' + 
+		'dir[E|compact][li]' + 
+		'pre[E|width|xml:space][#|ZA]' + 
+		'hr[E|align|noshade|size|width][]' + 
+		'blockquote[E|cite][#|Y]' + 
+		'address[E][#|S|p]' + 
+		'center[E][#|Y]' + 
+		'noframes[E][#|Y]' + 
+		'isindex[A|B|prompt][]' + 
+		'fieldset[E][#|legend|Y]' + 
+		'legend[E|accesskey|align][#|S]' + 
+		'table[E|summary|width|border|frame|rules|cellspacing|cellpadding|align|bgcolor][caption|col|colgroup|thead|tfoot|tbody|tr]' + 
+		'caption[E|align][#|S]' + 
+		'col[ZG][]' + 
+		'colgroup[ZG][col]' + 
+		'thead[ZF][tr]' + 
+		'tr[ZF|bgcolor][th|td]' + 
+		'th[E|ZE][#|Y]' + 
+		'form[E|action|method|name|enctype|onsubmit|onreset|accept|accept-charset|target][#|X|R|Q]' + 
+		'noscript[E][#|Y]' + 
+		'td[E|ZE][#|Y]' + 
+		'tfoot[ZF][tr]' + 
+		'tbody[ZF][tr]' + 
+		'area[E|D|shape|coords|href|nohref|alt|target][]' + 
+		'base[id|href|target][]' + 
+		'body[E|onload|onunload|background|bgcolor|text|link|vlink|alink][#|Y]'
+	);
+
+	boolAttrMap = makeMap('checked,compact,declare,defer,disabled,ismap,multiple,nohref,noresize,noshade,nowrap,readonly,selected,preload,autoplay,loop,controls');
+	shortEndedElementsMap = makeMap('area,base,basefont,br,col,frame,hr,img,input,isindex,link,meta,param,embed,source');
+	nonEmptyElementsMap = tinymce.extend(makeMap('td,th,iframe,video,object'), shortEndedElementsMap);
+	whiteSpaceElementsMap = makeMap('pre,script,style');
+	selfClosingElementsMap = makeMap('colgroup,dd,dt,li,options,p,td,tfoot,th,thead,tr');
+
+	tinymce.html.Schema = function(settings) {
+		var self = this, elements = {}, children = {}, patternElements = [], validStyles;
+
+		settings = settings || {};
+
+		// Allow all elements and attributes if verify_html is set to false
+		if (settings.verify_html === false)
+			settings.valid_elements = '*[*]';
+
+		// Build styles list
+		if (settings.valid_styles) {
+			validStyles = {};
+
+			// Convert styles into a rule list
+			each(settings.valid_styles, function(value, key) {
+				validStyles[key] = tinymce.explode(value);
+			});
+		}
+
+		// Converts a wildcard expression string to a regexp for example *a will become /.*a/.
+		function patternToRegExp(str) {
+			return new RegExp('^' + str.replace(/([?+*])/g, '.$1') + '$');
+		};
+
+		// Parses the specified valid_elements string and adds to the current rules
+		// This function is a bit hard to read since it's heavily optimized for speed
+		function addValidElements(valid_elements) {
+			var ei, el, ai, al, yl, matches, element, attr, attrData, elementName, attrName, attrType, attributes, attributesOrder,
+				prefix, outputName, globalAttributes, globalAttributesOrder, transElement, key, childKey, value,
+				elementRuleRegExp = /^([#+-])?([^\[\/]+)(?:\/([^\[]+))?(?:\[([^\]]+)\])?$/,
+				attrRuleRegExp = /^([!\-])?(\w+::\w+|[^=:<]+)?(?:([=:<])(.*))?$/,
+				hasPatternsRegExp = /[*?+]/;
+
+			if (valid_elements) {
+				// Split valid elements into an array with rules
+				valid_elements = split(valid_elements);
+
+				if (elements['@']) {
+					globalAttributes = elements['@'].attributes;
+					globalAttributesOrder = elements['@'].attributesOrder;
+				}
+
+				// Loop all rules
+				for (ei = 0, el = valid_elements.length; ei < el; ei++) {
+					// Parse element rule
+					matches = elementRuleRegExp.exec(valid_elements[ei]);
+					if (matches) {
+						// Setup local names for matches
+						prefix = matches[1];
+						elementName = matches[2];
+						outputName = matches[3];
+						attrData = matches[4];
+
+						// Create new attributes and attributesOrder
+						attributes = {};
+						attributesOrder = [];
+
+						// Create the new element
+						element = {
+							attributes : attributes,
+							attributesOrder : attributesOrder
+						};
+
+						// Padd empty elements prefix
+						if (prefix === '#')
+							element.paddEmpty = true;
+
+						// Remove empty elements prefix
+						if (prefix === '-')
+							element.removeEmpty = true;
+
+						// Copy attributes from global rule into current rule
+						if (globalAttributes) {
+							for (key in globalAttributes)
+								attributes[key] = globalAttributes[key];
+
+							attributesOrder.push.apply(attributesOrder, globalAttributesOrder);
+						}
+
+						// Attributes defined
+						if (attrData) {
+							attrData = split(attrData, '|');
+							for (ai = 0, al = attrData.length; ai < al; ai++) {
+								matches = attrRuleRegExp.exec(attrData[ai]);
+								if (matches) {
+									attr = {};
+									attrType = matches[1];
+									attrName = matches[2].replace(/::/g, ':');
+									prefix = matches[3];
+									value = matches[4];
+
+									// Required
+									if (attrType === '!') {
+										element.attributesRequired = element.attributesRequired || [];
+										element.attributesRequired.push(attrName);
+										attr.required = true;
+									}
+
+									// Denied from global
+									if (attrType === '-') {
+										delete attributes[attrName];
+										attributesOrder.splice(tinymce.inArray(attributesOrder, attrName), 1);
+										continue;
+									}
+
+									// Default value
+									if (prefix) {
+										// Default value
+										if (prefix === '=') {
+											element.attributesDefault = element.attributesDefault || [];
+											element.attributesDefault.push({name: attrName, value: value});
+											attr.defaultValue = value;
+										}
+
+										// Forced value
+										if (prefix === ':') {
+											element.attributesForced = element.attributesForced || [];
+											element.attributesForced.push({name: attrName, value: value});
+											attr.forcedValue = value;
+										}
+
+										// Required values
+										if (prefix === '<')
+											attr.validValues = makeMap(value, '?');
+									}
+
+									// Check for attribute patterns
+									if (hasPatternsRegExp.test(attrName)) {
+										element.attributePatterns = element.attributePatterns || [];
+										attr.pattern = patternToRegExp(attrName);
+										element.attributePatterns.push(attr);
+									} else {
+										// Add attribute to order list if it doesn't already exist
+										if (!attributes[attrName])
+											attributesOrder.push(attrName);
+
+										attributes[attrName] = attr;
+									}
+								}
+							}
+						}
+
+						// Global rule, store away these for later usage
+						if (!globalAttributes && elementName == '@') {
+							globalAttributes = attributes;
+							globalAttributesOrder = attributesOrder;
+						}
+
+						// Handle substitute elements such as b/strong
+						if (outputName) {
+							element.outputName = elementName;
+							elements[outputName] = element;
+						}
+
+						// Add pattern or exact element
+						if (hasPatternsRegExp.test(elementName)) {
+							element.pattern = patternToRegExp(elementName);
+							patternElements.push(element);
+						} else
+							elements[elementName] = element;
+					}
+				}
+			}
+		};
+
+		function setValidElements(valid_elements) {
+			elements = {};
+			patternElements = [];
+
+			addValidElements(valid_elements);
+
+			each(transitional, function(element, name) {
+				children[name] = element.children;
+			});
+		};
+
+		// Adds custom non HTML elements to the schema
+		function addCustomElements(custom_elements) {
+			var customElementRegExp = /^(~)?(.+)$/;
+
+			if (custom_elements) {
+				each(split(custom_elements), function(rule) {
+					var matches = customElementRegExp.exec(rule),
+						inline = matches[1] === '~',
+						cloneName = inline ? 'span' : 'div',
+						name = matches[2];
+
+					children[name] = children[cloneName];
+					customElementsMap[name] = cloneName;
+
+					// If it's not marked as inline then add it to valid block elements
+					if (!inline)
+						blockElementsMap[name] = {};
+
+					// Add custom elements at span/div positions
+					each(children, function(element, child) {
+						if (element[cloneName])
+							element[name] = element[cloneName];
+					});
+				});
+			}
+		};
+
+		// Adds valid children to the schema object
+		function addValidChildren(valid_children) {
+			var childRuleRegExp = /^([+\-]?)(\w+)\[([^\]]+)\]$/;
+
+			if (valid_children) {
+				each(split(valid_children), function(rule) {
+					var matches = childRuleRegExp.exec(rule), parent, prefix;
+
+					if (matches) {
+						prefix = matches[1];
+
+						// Add/remove items from default
+						if (prefix)
+							parent = children[matches[2]];
+						else
+							parent = children[matches[2]] = {'#comment' : {}};
+
+						parent = children[matches[2]];
+
+						each(split(matches[3], '|'), function(child) {
+							if (prefix === '-')
+								delete parent[child];
+							else
+								parent[child] = {};
+						});
+					}
+				});
+			}
+		}
+
+		if (!settings.valid_elements) {
+			// No valid elements defined then clone the elements from the transitional spec
+			each(transitional, function(element, name) {
+				elements[name] = {
+					attributes : element.attributes,
+					attributesOrder : element.attributesOrder
+				};
+
+				children[name] = element.children;
+			});
+
+			// Switch these
+			each(split('strong/b,em/i'), function(item) {
+				item = split(item, '/');
+				elements[item[1]].outputName = item[0];
+			});
+
+			// Add default alt attribute for images
+			elements.img.attributesDefault = [{name: 'alt', value: ''}];
+
+			// Remove these if they are empty by default
+			each(split('ol,ul,sub,sup,blockquote,span,font,a,table,tbody,tr'), function(name) {
+				elements[name].removeEmpty = true;
+			});
+
+			// Padd these by default
+			each(split('p,h1,h2,h3,h4,h5,h6,th,td,pre,div,address,caption'), function(name) {
+				elements[name].paddEmpty = true;
+			});
+		} else
+			setValidElements(settings.valid_elements);
+
+		addCustomElements(settings.custom_elements);
+		addValidChildren(settings.valid_children);
+		addValidElements(settings.extended_valid_elements);
+
+		// Todo: Remove this when we fix list handling to be valid
+		addValidChildren('+ol[ul|ol],+ul[ul|ol]');
+
+		// Delete invalid elements
+		if (settings.invalid_elements) {
+			tinymce.each(tinymce.explode(settings.invalid_elements), function(item) {
+				if (elements[item])
+					delete elements[item];
+			});
+		}
+
+		self.children = children;
+
+		self.styles = validStyles;
+
+		self.getBoolAttrs = function() {
+			return boolAttrMap;
+		};
+
+		self.getBlockElements = function() {
+			return blockElementsMap;
+		};
+
+		self.getShortEndedElements = function() {
+			return shortEndedElementsMap;
+		};
+
+		self.getSelfClosingElements = function() {
+			return selfClosingElementsMap;
+		};
+
+		self.getNonEmptyElements = function() {
+			return nonEmptyElementsMap;
+		};
+
+		self.getWhiteSpaceElements = function() {
+			return whiteSpaceElementsMap;
+		};
+
+		self.isValidChild = function(name, child) {
+			var parent = children[name];
+
+			return !!(parent && parent[child]);
+		};
+
+		self.getElementRule = function(name) {
+			var element = elements[name], i;
+
+			// Exact match found
+			if (element)
+				return element;
+
+			// No exact match then try the patterns
+			i = patternElements.length;
+			while (i--) {
+				element = patternElements[i];
+
+				if (element.pattern.test(name))
+					return element;
+			}
+		};
+
+		self.getCustomElements = function() {
+			return customElementsMap;
+		};
+
+		self.addValidElements = addValidElements;
+
+		self.setValidElements = setValidElements;
+
+		self.addCustomElements = addCustomElements;
+
+		self.addValidChildren = addValidChildren;
+	};
+
+	// Expose boolMap and blockElementMap as static properties for usage in DOMUtils
+	tinymce.html.Schema.boolAttrMap = boolAttrMap;
+	tinymce.html.Schema.blockElementsMap = blockElementsMap;
+})(tinymce);
+
+(function(tinymce) {
+	tinymce.html.SaxParser = function(settings, schema) {
+		var self = this, noop = function() {};
+
+		settings = settings || {};
+		self.schema = schema = schema || new tinymce.html.Schema();
+
+		if (settings.fix_self_closing !== false)
+			settings.fix_self_closing = true;
+
+		// Add handler functions from settings and setup default handlers
+		tinymce.each('comment cdata text start end pi doctype'.split(' '), function(name) {
+			if (name)
+				self[name] = settings[name] || noop;
+		});
+
+		self.parse = function(html) {
+			var self = this, matches, index = 0, value, endRegExp, stack = [], attrList, i, text, name,
+				shortEndedElements, fillAttrsMap, isShortEnded, validate, elementRule, isValidElement, attr, attribsValue,
+				validAttributesMap, validAttributePatterns, attributesRequired, attributesDefault, attributesForced, selfClosing,
+				tokenRegExp, attrRegExp, specialElements, attrValue, idCount = 0, decode = tinymce.html.Entities.decode, fixSelfClosing;
+
+			function processEndTag(name) {
+				var pos, i;
+
+				// Find position of parent of the same type
+				pos = stack.length;
+				while (pos--) {
+					if (stack[pos].name === name)
+						break;						
+				}
+
+				// Found parent
+				if (pos >= 0) {
+					// Close all the open elements
+					for (i = stack.length - 1; i >= pos; i--) {
+						name = stack[i];
+
+						if (name.valid)
+							self.end(name.name);
+					}
+
+					// Remove the open elements from the stack
+					stack.length = pos;
+				}
+			};
+
+			// Precompile RegExps and map objects
+			tokenRegExp = new RegExp('<(?:' +
+				'(?:!--([\\w\\W]*?)-->)|' + // Comment
+				'(?:!\\[CDATA\\[([\\w\\W]*?)\\]\\]>)|' + // CDATA
+				'(?:!DOCTYPE([\\w\\W]*?)>)|' + // DOCTYPE
+				'(?:\\?([^\\s\\/<>]+) ?([\\w\\W]*?)[?/]>)|' + // PI
+				'(?:\\/([^>]+)>)|' + // End element
+				'(?:([^\\s\\/<>]+)\\s*((?:[^"\'>]+(?:(?:"[^"]*")|(?:\'[^\']*\')|[^>]*))*)>)' + // Start element
+			')', 'g');
+
+			attrRegExp = /([\w:\-]+)(?:\s*=\s*(?:(?:\"((?:\\.|[^\"])*)\")|(?:\'((?:\\.|[^\'])*)\')|([^>\s]+)))?/g;
+			specialElements = {
+				'script' : /<\/script[^>]*>/gi,
+				'style' : /<\/style[^>]*>/gi,
+				'noscript' : /<\/noscript[^>]*>/gi
+			};
+
+			// Setup lookup tables for empty elements and boolean attributes
+			shortEndedElements = schema.getShortEndedElements();
+			selfClosing = schema.getSelfClosingElements();
+			fillAttrsMap = schema.getBoolAttrs();
+			validate = settings.validate;
+			fixSelfClosing = settings.fix_self_closing;
+
+			while (matches = tokenRegExp.exec(html)) {
+				// Text
+				if (index < matches.index)
+					self.text(decode(html.substr(index, matches.index - index)));
+
+				if (value = matches[6]) { // End element
+					processEndTag(value.toLowerCase());
+				} else if (value = matches[7]) { // Start element
+					value = value.toLowerCase();
+					isShortEnded = value in shortEndedElements;
+
+					// Is self closing tag for example an <li> after an open <li>
+					if (fixSelfClosing && selfClosing[value] && stack.length > 0 && stack[stack.length - 1].name === value)
+						processEndTag(value);
+
+					// Validate element
+					if (!validate || (elementRule = schema.getElementRule(value))) {
+						isValidElement = true;
+
+						// Grab attributes map and patters when validation is enabled
+						if (validate) {
+							validAttributesMap = elementRule.attributes;
+							validAttributePatterns = elementRule.attributePatterns;
+						}
+
+						// Parse attributes
+						if (attribsValue = matches[8]) {
+							attrList = [];
+							attrList.map = {};
+
+							attribsValue.replace(attrRegExp, function(match, name, value, val2, val3) {
+								var attrRule, i;
+
+								name = name.toLowerCase();
+								value = name in fillAttrsMap ? name : decode(value || val2 || val3 || ''); // Handle boolean attribute than value attribute
+
+								// Validate name and value
+								if (validate && name.indexOf('data-') !== 0) {
+									attrRule = validAttributesMap[name];
+
+									// Find rule by pattern matching
+									if (!attrRule && validAttributePatterns) {
+										i = validAttributePatterns.length;
+										while (i--) {
+											attrRule = validAttributePatterns[i];
+											if (attrRule.pattern.test(name))
+												break;
+										}
+
+										// No rule matched
+										if (i === -1)
+											attrRule = null;
+									}
+
+									// No attribute rule found
+									if (!attrRule)
+										return;
+
+									// Validate value
+									if (attrRule.validValues && !(value in attrRule.validValues))
+										return;
+								}
+
+								// Add attribute to list and map
+								attrList.map[name] = value;
+								attrList.push({
+									name: name,
+									value: value
+								});
+							});
+						} else {
+							attrList = [];
+							attrList.map = {};
+						}
+
+						// Process attributes if validation is enabled
+						if (validate) {
+							attributesRequired = elementRule.attributesRequired;
+							attributesDefault = elementRule.attributesDefault;
+							attributesForced = elementRule.attributesForced;
+
+							// Handle forced attributes
+							if (attributesForced) {
+								i = attributesForced.length;
+								while (i--) {
+									attr = attributesForced[i];
+									name = attr.name;
+									attrValue = attr.value;
+
+									if (attrValue === '{$uid}')
+										attrValue = 'mce_' + idCount++;
+
+									attrList.map[name] = attrValue;
+									attrList.push({name: name, value: attrValue});
+								}
+							}
+
+							// Handle default attributes
+							if (attributesDefault) {
+								i = attributesDefault.length;
+								while (i--) {
+									attr = attributesDefault[i];
+									name = attr.name;
+
+									if (!(name in attrList.map)) {
+										attrValue = attr.value;
+
+										if (attrValue === '{$uid}')
+											attrValue = 'mce_' + idCount++;
+
+										attrList.map[name] = attrValue;
+										attrList.push({name: name, value: attrValue});
+									}
+								}
+							}
+
+							// Handle required attributes
+							if (attributesRequired) {
+								i = attributesRequired.length;
+								while (i--) {
+									if (attributesRequired[i] in attrList.map)
+										break;
+								}
+
+								// None of the required attributes where found
+								if (i === -1)
+									isValidElement = false;
+							}
+
+							// Invalidate element if it's marked as bogus
+							if (attrList.map['data-mce-bogus'])
+								isValidElement = false;
+						}
+
+						if (isValidElement)
+							self.start(value, attrList, isShortEnded);
+					} else
+						isValidElement = false;
+
+					// Treat script, noscript and style a bit different since they may include code that looks like elements
+					if (endRegExp = specialElements[value]) {
+						endRegExp.lastIndex = index = matches.index + matches[0].length;
+
+						if (matches = endRegExp.exec(html)) {
+							if (isValidElement)
+								text = html.substr(index, matches.index - index);
+
+							index = matches.index + matches[0].length;
+						} else {
+							text = html.substr(index);
+							index = html.length;
+						}
+
+						if (isValidElement && text.length > 0)
+							self.text(text, true);
+
+						if (isValidElement)
+							self.end(value);
+
+						tokenRegExp.lastIndex = index;
+						continue;
+					}
+
+					// Push value on to stack
+					if (!isShortEnded) {
+						if (!attribsValue || attribsValue.indexOf('/') != attribsValue.length - 1)
+							stack.push({name: value, valid: isValidElement});
+						else if (isValidElement)
+							self.end(value);
+					}
+				} else if (value = matches[1]) { // Comment
+					self.comment(value);
+				} else if (value = matches[2]) { // CDATA
+					self.cdata(value);
+				} else if (value = matches[3]) { // DOCTYPE
+					self.doctype(value);
+				} else if (value = matches[4]) { // PI
+					self.pi(value, matches[5]);
+				}
+
+				index = matches.index + matches[0].length;
+			}
+
+			// Text
+			if (index < html.length)
+				self.text(decode(html.substr(index)));
+
+			// Close any open elements
+			for (i = stack.length - 1; i >= 0; i--) {
+				value = stack[i];
+
+				if (value.valid)
+					self.end(value.name);
+			}
+		};
+	}
+})(tinymce);
+
+(function(tinymce) {
+	var whiteSpaceRegExp = /^[ \t\r\n]*$/, typeLookup = {
+		'#text' : 3,
+		'#comment' : 8,
+		'#cdata' : 4,
+		'#pi' : 7,
+		'#doctype' : 10,
+		'#document-fragment' : 11
+	};
+
+	// Walks the tree left/right
+	function walk(node, root_node, prev) {
+		var sibling, parent, startName = prev ? 'lastChild' : 'firstChild', siblingName = prev ? 'prev' : 'next';
+
+		// Walk into nodes if it has a start
+		if (node[startName])
+			return node[startName];
+
+		// Return the sibling if it has one
+		if (node !== root_node) {
+			sibling = node[siblingName];
+
+			if (sibling)
+				return sibling;
+
+			// Walk up the parents to look for siblings
+			for (parent = node.parent; parent && parent !== root_node; parent = parent.parent) {
+				sibling = parent[siblingName];
+
+				if (sibling)
+					return sibling;
+			}
+		}
+	};
+
+	function Node(name, type) {
+		this.name = name;
+		this.type = type;
+
+		if (type === 1) {
+			this.attributes = [];
+			this.attributes.map = {};
+		}
+	}
+
+	tinymce.extend(Node.prototype, {
+		replace : function(node) {
+			var self = this;
+
+			if (node.parent)
+				node.remove();
+
+			self.insert(node, self);
+			self.remove();
+
+			return self;
+		},
+
+		attr : function(name, value) {
+			var self = this, attrs, i, undef;
+
+			if (typeof name !== "string") {
+				for (i in name)
+					self.attr(i, name[i]);
+
+				return self;
+			}
+
+			if (attrs = self.attributes) {
+				if (value !== undef) {
+					// Remove attribute
+					if (value === null) {
+						if (name in attrs.map) {
+							delete attrs.map[name];
+
+							i = attrs.length;
+							while (i--) {
+								if (attrs[i].name === name) {
+									attrs = attrs.splice(i, 1);
+									return self;
+								}
+							}
+						}
+
+						return self;
+					}
+
+					// Set attribute
+					if (name in attrs.map) {
+						// Set attribute
+						i = attrs.length;
+						while (i--) {
+							if (attrs[i].name === name) {
+								attrs[i].value = value;
+								break;
+							}
+						}
+					} else
+						attrs.push({name: name, value: value});
+
+					attrs.map[name] = value;
+
+					return self;
+				} else {
+					return attrs.map[name];
+				}
+			}
+		},
+
+		clone : function() {
+			var self = this, clone = new Node(self.name, self.type), i, l, selfAttrs, selfAttr, cloneAttrs;
+
+			// Clone element attributes
+			if (selfAttrs = self.attributes) {
+				cloneAttrs = [];
+				cloneAttrs.map = {};
+
+				for (i = 0, l = selfAttrs.length; i < l; i++) {
+					selfAttr = selfAttrs[i];
+
+					// Clone everything except id
+					if (selfAttr.name !== 'id') {
+						cloneAttrs[cloneAttrs.length] = {name: selfAttr.name, value: selfAttr.value};
+						cloneAttrs.map[selfAttr.name] = selfAttr.value;
+					}
+				}
+
+				clone.attributes = cloneAttrs;
+			}
+
+			clone.value = self.value;
+			clone.shortEnded = self.shortEnded;
+
+			return clone;
+		},
+
+		wrap : function(wrapper) {
+			var self = this;
+
+			self.parent.insert(wrapper, self);
+			wrapper.append(self);
+
+			return self;
+		},
+
+		unwrap : function() {
+			var self = this, node, next;
+
+			for (node = self.firstChild; node; ) {
+				next = node.next;
+				self.insert(node, self, true);
+				node = next;
+			}
+
+			self.remove();
+		},
+
+		remove : function() {
+			var self = this, parent = self.parent, next = self.next, prev = self.prev;
+
+			if (parent) {
+				if (parent.firstChild === self) {
+					parent.firstChild = next;
+
+					if (next)
+						next.prev = null;
+				} else {
+					prev.next = next;
+				}
+
+				if (parent.lastChild === self) {
+					parent.lastChild = prev;
+
+					if (prev)
+						prev.next = null;
+				} else {
+					next.prev = prev;
+				}
+
+				self.parent = self.next = self.prev = null;
+			}
+
+			return self;
+		},
+
+		append : function(node) {
+			var self = this, last;
+
+			if (node.parent)
+				node.remove();
+
+			last = self.lastChild;
+			if (last) {
+				last.next = node;
+				node.prev = last;
+				self.lastChild = node;
+			} else
+				self.lastChild = self.firstChild = node;
+
+			node.parent = self;
+
+			return node;
+		},
+
+		insert : function(node, ref_node, before) {
+			var parent;
+
+			if (node.parent)
+				node.remove();
+
+			parent = ref_node.parent || this;
+
+			if (before) {
+				if (ref_node === parent.firstChild)
+					parent.firstChild = node;
+				else
+					ref_node.prev.next = node;
+
+				node.prev = ref_node.prev;
+				node.next = ref_node;
+				ref_node.prev = node;
+			} else {
+				if (ref_node === parent.lastChild)
+					parent.lastChild = node;
+				else
+					ref_node.next.prev = node;
+
+				node.next = ref_node.next;
+				node.prev = ref_node;
+				ref_node.next = node;
+			}
+
+			node.parent = parent;
+
+			return node;
+		},
+
+		getAll : function(name) {
+			var self = this, node, collection = [];
+
+			for (node = self.firstChild; node; node = walk(node, self)) {
+				if (node.name === name)
+					collection.push(node);
+			}
+
+			return collection;
+		},
+
+		empty : function() {
+			var self = this, nodes, i, node;
+
+			// Remove all children
+			if (self.firstChild) {
+				nodes = [];
+
+				// Collect the children
+				for (node = self.firstChild; node; node = walk(node, self))
+					nodes.push(node);
+
+				// Remove the children
+				i = nodes.length;
+				while (i--) {
+					node = nodes[i];
+					node.parent = node.firstChild = node.lastChild = node.next = node.prev = null;
+				}
+			}
+
+			self.firstChild = self.lastChild = null;
+
+			return self;
+		},
+
+		isEmpty : function(elements) {
+			var self = this, node = self.firstChild, i, name;
+
+			if (node) {
+				do {
+					if (node.type === 1) {
+						// Ignore bogus elements
+						if (node.attributes.map['data-mce-bogus'])
+							continue;
+
+						// Keep empty elements like <img />
+						if (elements[node.name])
+							return false;
+
+						// Keep elements with data attributes or name attribute like <a name="1"></a>
+						i = node.attributes.length;
+						while (i--) {
+							name = node.attributes[i].name;
+							if (name === "name" || name.indexOf('data-') === 0)
+								return false;
+						}
+					}
+
+					// Keep non whitespace text nodes
+					if ((node.type === 3 && !whiteSpaceRegExp.test(node.value)))
+						return false;
+				} while (node = walk(node, self));
+			}
+
+			return true;
+		},
+
+		walk : function(prev) {
+			return walk(this, null, prev);
+		}
+	});
+
+	tinymce.extend(Node, {
+		create : function(name, attrs) {
+			var node, attrName;
+
+			// Create node
+			node = new Node(name, typeLookup[name] || 1);
+
+			// Add attributes if needed
+			if (attrs) {
+				for (attrName in attrs)
+					node.attr(attrName, attrs[attrName]);
+			}
+
+			return node;
+		}
+	});
+
+	tinymce.html.Node = Node;
+})(tinymce);
+
+(function(tinymce) {
+	var Node = tinymce.html.Node;
+
+	tinymce.html.DomParser = function(settings, schema) {
+		var self = this, nodeFilters = {}, attributeFilters = [], matchedNodes = {}, matchedAttributes = {};
+
+		settings = settings || {};
+		settings.validate = "validate" in settings ? settings.validate : true;
+		settings.root_name = settings.root_name || 'body';
+		self.schema = schema = schema || new tinymce.html.Schema();
+
+		function fixInvalidChildren(nodes) {
+			var ni, node, parent, parents, newParent, currentNode, tempNode, childNode, i,
+				childClone, nonEmptyElements, nonSplitableElements, sibling, nextNode;
+
+			nonSplitableElements = tinymce.makeMap('tr,td,th,tbody,thead,tfoot,table');
+			nonEmptyElements = schema.getNonEmptyElements();
+
+			for (ni = 0; ni < nodes.length; ni++) {
+				node = nodes[ni];
+
+				// Already removed
+				if (!node.parent)
+					continue;
+
+				// Get list of all parent nodes until we find a valid parent to stick the child into
+				parents = [node];
+				for (parent = node.parent; parent && !schema.isValidChild(parent.name, node.name) && !nonSplitableElements[parent.name]; parent = parent.parent)
+					parents.push(parent);
+
+				// Found a suitable parent
+				if (parent && parents.length > 1) {
+					// Reverse the array since it makes looping easier
+					parents.reverse();
+
+					// Clone the related parent and insert that after the moved node
+					newParent = currentNode = self.filterNode(parents[0].clone());
+
+					// Start cloning and moving children on the left side of the target node
+					for (i = 0; i < parents.length - 1; i++) {
+						if (schema.isValidChild(currentNode.name, parents[i].name)) {
+							tempNode = self.filterNode(parents[i].clone());
+							currentNode.append(tempNode);
+						} else
+							tempNode = currentNode;
+
+						for (childNode = parents[i].firstChild; childNode && childNode != parents[i + 1]; ) {
+							nextNode = childNode.next;
+							tempNode.append(childNode);
+							childNode = nextNode;
+						}
+
+						currentNode = tempNode;
+					}
+
+					if (!newParent.isEmpty(nonEmptyElements)) {
+						parent.insert(newParent, parents[0], true);
+						parent.insert(node, newParent);
+					} else {
+						parent.insert(node, parents[0], true);
+					}
+
+					// Check if the element is empty by looking through it's contents and special treatment for <p><br /></p>
+					parent = parents[0];
+					if (parent.isEmpty(nonEmptyElements) || parent.firstChild === parent.lastChild && parent.firstChild.name === 'br') {
+						parent.empty().remove();
+					}
+				} else if (node.parent) {
+					// If it's an LI try to find a UL/OL for it or wrap it
+					if (node.name === 'li') {
+						sibling = node.prev;
+						if (sibling && (sibling.name === 'ul' || sibling.name === 'ul')) {
+							sibling.append(node);
+							continue;
+						}
+
+						sibling = node.next;
+						if (sibling && (sibling.name === 'ul' || sibling.name === 'ul')) {
+							sibling.insert(node, sibling.firstChild, true);
+							continue;
+						}
+
+						node.wrap(self.filterNode(new Node('ul', 1)));
+						continue;
+					}
+
+					// Try wrapping the element in a DIV
+					if (schema.isValidChild(node.parent.name, 'div') && schema.isValidChild('div', node.name)) {
+						node.wrap(self.filterNode(new Node('div', 1)));
+					} else {
+						// We failed wrapping it, then remove or unwrap it
+						if (node.name === 'style' || node.name === 'script')
+							node.empty().remove();
+						else
+							node.unwrap();
+					}
+				}
+			}
+		};
+
+		self.filterNode = function(node) {
+			var i, name, list;
+
+			// Run element filters
+			if (name in nodeFilters) {
+				list = matchedNodes[name];
+
+				if (list)
+					list.push(node);
+				else
+					matchedNodes[name] = [node];
+			}
+
+			// Run attribute filters
+			i = attributeFilters.length;
+			while (i--) {
+				name = attributeFilters[i].name;
+
+				if (name in node.attributes.map) {
+					list = matchedAttributes[name];
+
+					if (list)
+						list.push(node);
+					else
+						matchedAttributes[name] = [node];
+				}
+			}
+
+			return node;
+		};
+
+		self.addNodeFilter = function(name, callback) {
+			tinymce.each(tinymce.explode(name), function(name) {
+				var list = nodeFilters[name];
+
+				if (!list)
+					nodeFilters[name] = list = [];
+
+				list.push(callback);
+			});
+		};
+
+		self.addAttributeFilter = function(name, callback) {
+			tinymce.each(tinymce.explode(name), function(name) {
+				var i;
+
+				for (i = 0; i < attributeFilters.length; i++) {
+					if (attributeFilters[i].name === name) {
+						attributeFilters[i].callbacks.push(callback);
+						return;
+					}
+				}
+
+				attributeFilters.push({name: name, callbacks: [callback]});
+			});
+		};
+
+		self.parse = function(html, args) {
+			var parser, rootNode, node, nodes, i, l, fi, fl, list, name, validate,
+				blockElements, startWhiteSpaceRegExp, invalidChildren = [],
+				endWhiteSpaceRegExp, allWhiteSpaceRegExp, whiteSpaceElements, children, nonEmptyElements, rootBlockName;
+
+			args = args || {};
+			matchedNodes = {};
+			matchedAttributes = {};
+			blockElements = tinymce.extend(tinymce.makeMap('script,style,head,html,body,title,meta,param'), schema.getBlockElements());
+			nonEmptyElements = schema.getNonEmptyElements();
+			children = schema.children;
+			validate = settings.validate;
+			rootBlockName = "forced_root_block" in args ? args.forced_root_block : settings.forced_root_block;
+
+			whiteSpaceElements = schema.getWhiteSpaceElements();
+			startWhiteSpaceRegExp = /^[ \t\r\n]+/;
+			endWhiteSpaceRegExp = /[ \t\r\n]+$/;
+			allWhiteSpaceRegExp = /[ \t\r\n]+/g;
+
+			function addRootBlocks() {
+				var node = rootNode.firstChild, next, rootBlockNode;
+
+				while (node) {
+					next = node.next;
+
+					if (node.type == 3 || (node.type == 1 && node.name !== 'p' && !blockElements[node.name] && !node.attr('data-mce-type'))) {
+						if (!rootBlockNode) {
+							// Create a new root block element
+							rootBlockNode = createNode(rootBlockName, 1);
+							rootNode.insert(rootBlockNode, node);
+							rootBlockNode.append(node);
+						} else
+							rootBlockNode.append(node);
+					} else {
+						rootBlockNode = null;
+					}
+
+					node = next;
+				};
+			};
+
+			function createNode(name, type) {
+				var node = new Node(name, type), list;
+
+				if (name in nodeFilters) {
+					list = matchedNodes[name];
+
+					if (list)
+						list.push(node);
+					else
+						matchedNodes[name] = [node];
+				}
+
+				return node;
+			};
+
+			function removeWhitespaceBefore(node) {
+				var textNode, textVal, sibling;
+
+				for (textNode = node.prev; textNode && textNode.type === 3; ) {
+					textVal = textNode.value.replace(endWhiteSpaceRegExp, '');
+
+					if (textVal.length > 0) {
+						textNode.value = textVal;
+						textNode = textNode.prev;
+					} else {
+						sibling = textNode.prev;
+						textNode.remove();
+						textNode = sibling;
+					}
+				}
+			};
+
+			parser = new tinymce.html.SaxParser({
+				validate : validate,
+				fix_self_closing : !validate, // Let the DOM parser handle <li> in <li> or <p> in <p> for better results
+
+				cdata: function(text) {
+					node.append(createNode('#cdata', 4)).value = text;
+				},
+
+				text: function(text, raw) {
+					var textNode;
+
+					// Trim all redundant whitespace on non white space elements
+					if (!whiteSpaceElements[node.name]) {
+						text = text.replace(allWhiteSpaceRegExp, ' ');
+
+						if (node.lastChild && blockElements[node.lastChild.name])
+							text = text.replace(startWhiteSpaceRegExp, '');
+					}
+
+					// Do we need to create the node
+					if (text.length !== 0) {
+						textNode = createNode('#text', 3);
+						textNode.raw = !!raw;
+						node.append(textNode).value = text;
+					}
+				},
+
+				comment: function(text) {
+					node.append(createNode('#comment', 8)).value = text;
+				},
+
+				pi: function(name, text) {
+					node.append(createNode(name, 7)).value = text;
+					removeWhitespaceBefore(node);
+				},
+
+				doctype: function(text) {
+					var newNode;
+		
+					newNode = node.append(createNode('#doctype', 10));
+					newNode.value = text;
+					removeWhitespaceBefore(node);
+				},
+
+				start: function(name, attrs, empty) {
+					var newNode, attrFiltersLen, elementRule, textNode, attrName, text, sibling, parent;
+
+					elementRule = validate ? schema.getElementRule(name) : {};
+					if (elementRule) {
+						newNode = createNode(elementRule.outputName || name, 1);
+						newNode.attributes = attrs;
+						newNode.shortEnded = empty;
+
+						node.append(newNode);
+
+						// Check if node is valid child of the parent node is the child is
+						// unknown we don't collect it since it's probably a custom element
+						parent = children[node.name];
+						if (parent && children[newNode.name] && !parent[newNode.name])
+							invalidChildren.push(newNode);
+
+						attrFiltersLen = attributeFilters.length;
+						while (attrFiltersLen--) {
+							attrName = attributeFilters[attrFiltersLen].name;
+
+							if (attrName in attrs.map) {
+								list = matchedAttributes[attrName];
+
+								if (list)
+									list.push(newNode);
+								else
+									matchedAttributes[attrName] = [newNode];
+							}
+						}
+
+						// Trim whitespace before block
+						if (blockElements[name])
+							removeWhitespaceBefore(newNode);
+
+						// Change current node if the element wasn't empty i.e not <br /> or <img />
+						if (!empty)
+							node = newNode;
+					}
+				},
+
+				end: function(name) {
+					var textNode, elementRule, text, sibling, tempNode;
+
+					elementRule = validate ? schema.getElementRule(name) : {};
+					if (elementRule) {
+						if (blockElements[name]) {
+							if (!whiteSpaceElements[node.name]) {
+								// Trim whitespace at beginning of block
+								for (textNode = node.firstChild; textNode && textNode.type === 3; ) {
+									text = textNode.value.replace(startWhiteSpaceRegExp, '');
+
+									if (text.length > 0) {
+										textNode.value = text;
+										textNode = textNode.next;
+									} else {
+										sibling = textNode.next;
+										textNode.remove();
+										textNode = sibling;
+									}
+								}
+
+								// Trim whitespace at end of block
+								for (textNode = node.lastChild; textNode && textNode.type === 3; ) {
+									text = textNode.value.replace(endWhiteSpaceRegExp, '');
+
+									if (text.length > 0) {
+										textNode.value = text;
+										textNode = textNode.prev;
+									} else {
+										sibling = textNode.prev;
+										textNode.remove();
+										textNode = sibling;
+									}
+								}
+							}
+
+							// Trim start white space
+							textNode = node.prev;
+							if (textNode && textNode.type === 3) {
+								text = textNode.value.replace(startWhiteSpaceRegExp, '');
+
+								if (text.length > 0)
+									textNode.value = text;
+								else
+									textNode.remove();
+							}
+						}
+
+						// Handle empty nodes
+						if (elementRule.removeEmpty || elementRule.paddEmpty) {
+							if (node.isEmpty(nonEmptyElements)) {
+								if (elementRule.paddEmpty)
+									node.empty().append(new Node('#text', '3')).value = '\u00a0';
+								else {
+									// Leave nodes that have a name like <a name="name">
+									if (!node.attributes.map.name) {
+										tempNode = node.parent;
+										node.empty().remove();
+										node = tempNode;
+										return;
+									}
+								}
+							}
+						}
+
+						node = node.parent;
+					}
+				}
+			}, schema);
+
+			rootNode = node = new Node(args.context || settings.root_name, 11);
+
+			parser.parse(html);
+
+			// Fix invalid children or report invalid children in a contextual parsing
+			if (validate && invalidChildren.length) {
+				if (!args.context)
+					fixInvalidChildren(invalidChildren);
+				else
+					args.invalid = true;
+			}
+
+			// Wrap nodes in the root into block elements if the root is body
+			if (rootBlockName && rootNode.name == 'body')
+				addRootBlocks();
+
+			// Run filters only when the contents is valid
+			if (!args.invalid) {
+				// Run node filters
+				for (name in matchedNodes) {
+					list = nodeFilters[name];
+					nodes = matchedNodes[name];
+
+					// Remove already removed children
+					fi = nodes.length;
+					while (fi--) {
+						if (!nodes[fi].parent)
+							nodes.splice(fi, 1);
+					}
+
+					for (i = 0, l = list.length; i < l; i++)
+						list[i](nodes, name, args);
+				}
+
+				// Run attribute filters
+				for (i = 0, l = attributeFilters.length; i < l; i++) {
+					list = attributeFilters[i];
+
+					if (list.name in matchedAttributes) {
+						nodes = matchedAttributes[list.name];
+
+						// Remove already removed children
+						fi = nodes.length;
+						while (fi--) {
+							if (!nodes[fi].parent)
+								nodes.splice(fi, 1);
+						}
+
+						for (fi = 0, fl = list.callbacks.length; fi < fl; fi++)
+							list.callbacks[fi](nodes, list.name, args);
+					}
+				}
+			}
+
+			return rootNode;
+		};
+
+		// Remove <br> at end of block elements Gecko and WebKit injects BR elements to
+		// make it possible to place the caret inside empty blocks. This logic tries to remove
+		// these elements and keep br elements that where intended to be there intact
+		if (settings.remove_trailing_brs) {
+			self.addNodeFilter('br', function(nodes, name) {
+				var i, l = nodes.length, node, blockElements = schema.getBlockElements(),
+					nonEmptyElements = schema.getNonEmptyElements(), parent, prev, prevName;
+
+				// Remove brs from body element as well
+				blockElements.body = 1;
+
+				// Must loop forwards since it will otherwise remove all brs in <p>a<br><br><br></p>
+				for (i = 0; i < l; i++) {
+					node = nodes[i];
+					parent = node.parent;
+
+					if (blockElements[node.parent.name] && node === parent.lastChild) {
+						// Loop all nodes to the right of the current node and check for other BR elements
+						// excluding bookmarks since they are invisible
+						prev = node.prev;
+						while (prev) {
+							prevName = prev.name;
+
+							// Ignore bookmarks
+							if (prevName !== "span" || prev.attr('data-mce-type') !== 'bookmark') {
+								// Found a non BR element
+								if (prevName !== "br")
+									break;
+	
+								// Found another br it's a <br><br> structure then don't remove anything
+								if (prevName === 'br') {
+									node = null;
+									break;
+								}
+							}
+
+							prev = prev.prev;
+						}
+
+						if (node) {
+							node.remove();
+
+							// Is the parent to be considered empty after we removed the BR
+							if (parent.isEmpty(nonEmptyElements)) {
+								elementRule = schema.getElementRule(parent.name);
+
+								// Remove or padd the element depending on schema rule
+								if (elementRule.removeEmpty)
+									parent.remove();
+								else if (elementRule.paddEmpty) 
+									parent.empty().append(new tinymce.html.Node('#text', 3)).value = '\u00a0';
+							}
+						}
+					}
+				}
+			});
+		}
+	}
+})(tinymce);
+
+tinymce.html.Writer = function(settings) {
+	var html = [], indent, indentBefore, indentAfter, encode, htmlOutput;
+
+	settings = settings || {};
+	indent = settings.indent;
+	indentBefore = tinymce.makeMap(settings.indent_before || '');
+	indentAfter = tinymce.makeMap(settings.indent_after || '');
+	encode = tinymce.html.Entities.getEncodeFunc(settings.entity_encoding || 'raw', settings.entities);
+	htmlOutput = settings.element_format == "html";
+
+	return {
+		start: function(name, attrs, empty) {
+			var i, l, attr, value;
+
+			if (indent && indentBefore[name] && html.length > 0) {
+				value = html[html.length - 1];
+
+				if (value.length > 0 && value !== '\n')
+					html.push('\n');
+			}
+
+			html.push('<', name);
+
+			if (attrs) {
+				for (i = 0, l = attrs.length; i < l; i++) {
+					attr = attrs[i];
+					html.push(' ', attr.name, '="', encode(attr.value, true), '"');
+				}
+			}
+
+			if (!empty || htmlOutput)
+				html[html.length] = '>';
+			else
+				html[html.length] = ' />';
+
+			if (empty && indent && indentAfter[name] && html.length > 0) {
+				value = html[html.length - 1];
+
+				if (value.length > 0 && value !== '\n')
+					html.push('\n');
+			}
+		},
+
+		end: function(name) {
+			var value;
+
+			/*if (indent && indentBefore[name] && html.length > 0) {
+				value = html[html.length - 1];
+
+				if (value.length > 0 && value !== '\n')
+					html.push('\n');
+			}*/
+
+			html.push('</', name, '>');
+
+			if (indent && indentAfter[name] && html.length > 0) {
+				value = html[html.length - 1];
+
+				if (value.length > 0 && value !== '\n')
+					html.push('\n');
+			}
+		},
+
+		text: function(text, raw) {
+			if (text.length > 0)
+				html[html.length] = raw ? text : encode(text);
+		},
+
+		cdata: function(text) {
+			html.push('<![CDATA[', text, ']]>');
+		},
+
+		comment: function(text) {
+			html.push('<!--', text, '-->');
+		},
+
+		pi: function(name, text) {
+			if (text)
+				html.push('<?', name, ' ', text, '?>');
+			else
+				html.push('<?', name, '?>');
+
+			if (indent)
+				html.push('\n');
+		},
+
+		doctype: function(text) {
+			html.push('<!DOCTYPE', text, '>', indent ? '\n' : '');
+		},
+
+		reset: function() {
+			html.length = 0;
+		},
+
+		getContent: function() {
+			return html.join('').replace(/\n$/, '');
+		}
+	};
+};
+
+(function(tinymce) {
+	tinymce.html.Serializer = function(settings, schema) {
+		var self = this, writer = new tinymce.html.Writer(settings);
+
+		settings = settings || {};
+		settings.validate = "validate" in settings ? settings.validate : true;
+
+		self.schema = schema = schema || new tinymce.html.Schema();
+		self.writer = writer;
+
+		self.serialize = function(node) {
+			var handlers, validate;
+
+			validate = settings.validate;
+
+			handlers = {
+				// #text
+				3: function(node, raw) {
+					writer.text(node.value, node.raw);
+				},
+
+				// #comment
+				8: function(node) {
+					writer.comment(node.value);
+				},
+
+				// Processing instruction
+				7: function(node) {
+					writer.pi(node.name, node.value);
+				},
+
+				// Doctype
+				10: function(node) {
+					writer.doctype(node.value);
+				},
+
+				// CDATA
+				4: function(node) {
+					writer.cdata(node.value);
+				},
+
+ 				// Document fragment
+				11: function(node) {
+					if ((node = node.firstChild)) {
+						do {
+							walk(node);
+						} while (node = node.next);
+					}
+				}
+			};
+
+			writer.reset();
+
+			function walk(node) {
+				var handler = handlers[node.type], name, isEmpty, attrs, attrName, attrValue, sortedAttrs, i, l, elementRule;
+
+				if (!handler) {
+					name = node.name;
+					isEmpty = node.shortEnded;
+					attrs = node.attributes;
+
+					// Sort attributes
+					if (validate && attrs && attrs.length > 1) {
+						sortedAttrs = [];
+						sortedAttrs.map = {};
+
+						elementRule = schema.getElementRule(node.name);
+						for (i = 0, l = elementRule.attributesOrder.length; i < l; i++) {
+							attrName = elementRule.attributesOrder[i];
+
+							if (attrName in attrs.map) {
+								attrValue = attrs.map[attrName];
+								sortedAttrs.map[attrName] = attrValue;
+								sortedAttrs.push({name: attrName, value: attrValue});
+							}
+						}
+
+						for (i = 0, l = attrs.length; i < l; i++) {
+							attrName = attrs[i].name;
+
+							if (!(attrName in sortedAttrs.map)) {
+								attrValue = attrs.map[attrName];
+								sortedAttrs.map[attrName] = attrValue;
+								sortedAttrs.push({name: attrName, value: attrValue});
+							}
+						}
+
+						attrs = sortedAttrs;
+					}
+
+					writer.start(node.name, attrs, isEmpty);
+
+					if (!isEmpty) {
+						if ((node = node.firstChild)) {
+							do {
+								walk(node);
+							} while (node = node.next);
+						}
+
+						writer.end(name);
+					}
+				} else
+					handler(node);
+			}
+
+			// Serialize element and treat all non elements as fragments
+			if (node.type == 1 && !settings.inner)
+				walk(node);
+			else
+				handlers[11](node);
+
+			return writer.getContent();
+		};
+	}
+})(tinymce);
+
 (function(tinymce) {
 	// Shorten names
 	var each = tinymce.each,
 		is = tinymce.is,
 		isWebKit = tinymce.isWebKit,
 		isIE = tinymce.isIE,
-		blockRe = /^(H[1-6R]|P|DIV|ADDRESS|PRE|FORM|T(ABLE|BODY|HEAD|FOOT|H|R|D)|LI|OL|UL|CAPTION|BLOCKQUOTE|CENTER|DL|DT|DD|DIR|FIELDSET|NOSCRIPT|MENU|ISINDEX|SAMP)$/,
-		boolAttrs = makeMap('checked,compact,declare,defer,disabled,ismap,multiple,nohref,noresize,noshade,nowrap,readonly,selected'),
-		mceAttribs = makeMap('src,href,style,coords,shape'),
-		encodedChars = {'&' : '&amp;', '"' : '&quot;', '<' : '&lt;', '>' : '&gt;'},
-		encodeCharsRe = /[<>&\"]/g,
+		Entities = tinymce.html.Entities,
 		simpleSelectorRe = /^([a-z0-9],?)+$/i,
-		tagRegExp = /<(\w+)((?:\s+\w+(?:\s*=\s*(?:(?:"[^"]*")|(?:'[^']*')|[^>\s]+))?)*)(\s*\/?)>/g,
-		attrRegExp = /(\w+)(?:\s*=\s*(?:(?:"((?:\\.|[^"])*)")|(?:'((?:\\.|[^'])*)')|([^>\s]+)))?/g;
-
-	function makeMap(str) {
-		var map = {}, i;
-
-		str = str.split(',');
-		for (i = str.length; i >= 0; i--)
-			map[str[i]] = 1;
-
-		return map;
-	};
+		blockElementsMap = tinymce.html.Schema.blockElementsMap,
+		whiteSpaceRegExp = /^[ \t\r\n]*$/;
 
 	tinymce.create('tinymce.dom.DOMUtils', {
 		doc : null,
@@ -1290,21 +3304,27 @@ tinymce.create('static tinymce.util.XHR', {
 		},
 
 		DOMUtils : function(d, s) {
-			var t = this, globalStyle;
+			var t = this, globalStyle, name;
 
 			t.doc = d;
 			t.win = window;
 			t.files = {};
 			t.cssFlicker = false;
 			t.counter = 0;
-			t.boxModel = !tinymce.isIE || d.compatMode == "CSS1Compat"; 
-			t.stdMode = d.documentMode === 8;
+			t.stdMode = !tinymce.isIE || d.documentMode >= 8;
+			t.boxModel = !tinymce.isIE || d.compatMode == "CSS1Compat" || t.stdMode;
+			t.hasOuterHTML = "outerHTML" in d.createElement("a");
 
 			t.settings = s = tinymce.extend({
 				keep_values : false,
-				hex_colors : 1,
-				process_html : 1
+				hex_colors : 1
 			}, s);
+			
+			t.schema = s.schema;
+			t.styles = new tinymce.html.Styles({
+				url_converter : s.url_converter,
+				url_converter_scope : s.url_converter_scope
+			}, s.schema);
 
 			// Fix IE6SP2 flicker and check it failed for pre SP2
 			if (tinymce.isIE6) {
@@ -1315,14 +3335,20 @@ tinymce.create('static tinymce.util.XHR', {
 				}
 			}
 
-			// Build styles list
-			if (s.valid_styles) {
-				t._styles = {};
-
-				// Convert styles into a rule list
-				each(s.valid_styles, function(value, key) {
-					t._styles[key] = tinymce.explode(value);
+			if (isIE && s.schema) {
+				// Add missing HTML 4/5 elements to IE
+				('abbr article aside audio canvas ' +
+				'details figcaption figure footer ' +
+				'header hgroup mark menu meter nav ' +
+				'output progress section summary ' +
+				'time video').replace(/\w+/g, function(name) {
+					d.createElement(name);
 				});
+
+				// Create all custom elements
+				for (name in s.schema.getCustomElements()) {
+					d.createElement(name);
+				}
 			}
 
 			tinymce.addUnload(t.destroy, t);
@@ -1453,6 +3479,39 @@ tinymce.create('static tinymce.util.XHR', {
 		},
 
 
+		select : function(pa, s) {
+			var t = this;
+
+			return tinymce.dom.Sizzle(pa, t.get(s) || t.get(t.settings.root_element) || t.doc, []);
+		},
+
+		is : function(n, selector) {
+			var i;
+
+			// If it isn't an array then try to do some simple selectors instead of Sizzle for to boost performance
+			if (n.length === undefined) {
+				// Simple all selector
+				if (selector === '*')
+					return n.nodeType == 1;
+
+				// Simple selector just elements
+				if (simpleSelectorRe.test(selector)) {
+					selector = selector.toLowerCase().split(/,/);
+					n = n.nodeName.toLowerCase();
+
+					for (i = selector.length - 1; i >= 0; i--) {
+						if (selector[i] == n)
+							return true;
+					}
+
+					return false;
+				}
+			}
+
+			return tinymce.dom.Sizzle.matches(selector, n.nodeType ? [n] : n).length > 0;
+		},
+
+
 		add : function(p, n, a, h, c) {
 			var t = this;
 
@@ -1487,7 +3546,8 @@ tinymce.create('static tinymce.util.XHR', {
 					o += ' ' + k + '="' + t.encode(a[k]) + '"';
 			}
 
-			if (tinymce.is(h))
+			// A call to tinymce.is doesn't work for some odd reason on IE9 possible bug inside their JS runtime
+			if (typeof(h) != "undefined")
 				return o + '>' + h + '</' + n + '>';
 
 			return o + ' />';
@@ -1495,9 +3555,7 @@ tinymce.create('static tinymce.util.XHR', {
 
 		remove : function(node, keep_children) {
 			return this.run(node, function(node) {
-				var parent, child;
-
-				parent = node.parentNode;
+				var child, parent = node.parentNode;
 
 				if (!parent)
 					return null;
@@ -1557,7 +3615,7 @@ tinymce.create('static tinymce.util.XHR', {
 
 				// Force update of the style data
 				if (t.settings.update_styles)
-					t.setAttrib(e, '_mce_style');
+					t.setAttrib(e, 'data-mce-style');
 			});
 		},
 
@@ -1565,7 +3623,7 @@ tinymce.create('static tinymce.util.XHR', {
 			n = this.get(n);
 
 			if (!n)
-				return false;
+				return;
 
 			// Gecko
 			if (this.doc.defaultView && c) {
@@ -1594,7 +3652,7 @@ tinymce.create('static tinymce.util.XHR', {
 			if (n.currentStyle && c)
 				return n.currentStyle[na];
 
-			return n.style[na];
+			return n.style ? n.style[na] : undefined;
 		},
 
 		setStyles : function(e, o) {
@@ -1613,6 +3671,15 @@ tinymce.create('static tinymce.util.XHR', {
 				t.setAttrib(e, s.cssText);
 		},
 
+		removeAllAttribs: function(e) {
+			return this.run(e, function(e) {
+				var i, attrs = e.attributes;
+				for (i = attrs.length - 1; i >= 0; i--) {
+					e.removeAttributeNode(attrs.item(i));
+				}
+			});
+		},
+
 		setAttrib : function(e, n, v) {
 			var t = this;
 
@@ -1640,9 +3707,9 @@ tinymce.create('static tinymce.util.XHR', {
 						// No mce_style for elements with these since they might get resized by the user
 						if (s.keep_values) {
 							if (v && !t._isRes(v))
-								e.setAttribute('_mce_style', v, 2);
+								e.setAttribute('data-mce-style', v, 2);
 							else
-								e.removeAttribute('_mce_style', 2);
+								e.removeAttribute('data-mce-style', 2);
 						}
 
 						e.style.cssText = v;
@@ -1658,13 +3725,13 @@ tinymce.create('static tinymce.util.XHR', {
 							if (s.url_converter)
 								v = s.url_converter.call(s.url_converter_scope || t, v, n, e);
 
-							t.setAttrib(e, '_mce_' + n, v, 2);
+							t.setAttrib(e, 'data-mce-' + n, v, 2);
 						}
 
 						break;
-					
+
 					case "shape":
-						e.setAttribute('_mce_style', v);
+						e.setAttribute('data-mce-style', v);
 						break;
 				}
 
@@ -1698,7 +3765,7 @@ tinymce.create('static tinymce.util.XHR', {
 
 			// Try the mce variant for these
 			if (/^(src|href|style|coords|shape)$/.test(n)) {
-				v = e.getAttribute("_mce_" + n);
+				v = e.getAttribute("data-mce-" + n);
 
 				if (v)
 					return v;
@@ -1731,7 +3798,7 @@ tinymce.create('static tinymce.util.XHR', {
 					v = t.serializeStyle(t.parseStyle(v), e.nodeName);
 
 					if (t.settings.keep_values && !t._isRes(v))
-						e.setAttribute('_mce_style', v);
+						e.setAttribute('data-mce-style', v);
 				}
 			}
 
@@ -1799,7 +3866,7 @@ tinymce.create('static tinymce.util.XHR', {
 					default:
 						// IE has odd anonymous function for event attributes
 						if (n.indexOf('on') === 0 && v)
-							v = ('' + v).replace(/^function\s+\w+\(\)\s+\{\s+(.*)\s+\}$/, '$1');
+							v = tinymce._replace(/^function\s+\w+\(\)\s+\{\s+(.*)\s+\}$/, '$1', '' + v);
 				}
 			}
 
@@ -1813,14 +3880,17 @@ tinymce.create('static tinymce.util.XHR', {
 			ro = ro || d.body;
 
 			if (n) {
-				// Use getBoundingClientRect on IE, Opera has it but it's not perfect
-				if (isIE && !t.stdMode) {
+				// Use getBoundingClientRect if it exists since it's faster than looping offset nodes
+				if (n.getBoundingClientRect) {
 					n = n.getBoundingClientRect();
 					e = t.boxModel ? d.documentElement : d.body;
-					x = t.getStyle(t.select('html')[0], 'borderWidth'); // Remove border
-					x = (x == 'medium' || t.boxModel && !t.isIE6) && 2 || x;
 
-					return {x : n.left + e.scrollLeft - x, y : n.top + e.scrollTop - x};
+					// Add scroll offsets from documentElement or body since IE with the wrong box model will use d.body and so do WebKit
+					// Also remove the body/documentelement clientTop/clientLeft on IE 6, 7 since they offset the position
+					x = n.left + (d.documentElement.scrollLeft || d.body.scrollLeft) - e.clientTop;
+					y = n.top + (d.documentElement.scrollTop || d.body.scrollTop) - e.clientLeft;
+
+					return {x : x, y : y};
 				}
 
 				r = n;
@@ -1842,144 +3912,11 @@ tinymce.create('static tinymce.util.XHR', {
 		},
 
 		parseStyle : function(st) {
-			var t = this, s = t.settings, o = {};
-
-			if (!st)
-				return o;
-
-			function compress(p, s, ot) {
-				var t, r, b, l;
-
-				// Get values and check it it needs compressing
-				t = o[p + '-top' + s];
-				if (!t)
-					return;
-
-				r = o[p + '-right' + s];
-				if (t != r)
-					return;
-
-				b = o[p + '-bottom' + s];
-				if (r != b)
-					return;
-
-				l = o[p + '-left' + s];
-				if (b != l)
-					return;
-
-				// Compress
-				o[ot] = l;
-				delete o[p + '-top' + s];
-				delete o[p + '-right' + s];
-				delete o[p + '-bottom' + s];
-				delete o[p + '-left' + s];
-			};
-
-			function compress2(ta, a, b, c) {
-				var t;
-
-				t = o[a];
-				if (!t)
-					return;
-
-				t = o[b];
-				if (!t)
-					return;
-
-				t = o[c];
-				if (!t)
-					return;
-
-				// Compress
-				o[ta] = o[a] + ' ' + o[b] + ' ' + o[c];
-				delete o[a];
-				delete o[b];
-				delete o[c];
-			};
-
-			st = st.replace(/&(#?[a-z0-9]+);/g, '&$1_MCE_SEMI_'); // Protect entities
-
-			each(st.split(';'), function(v) {
-				var sv, ur = [];
-
-				if (v) {
-					v = v.replace(/_MCE_SEMI_/g, ';'); // Restore entities
-					v = v.replace(/url\([^\)]+\)/g, function(v) {ur.push(v);return 'url(' + ur.length + ')';});
-					v = v.split(':');
-					sv = tinymce.trim(v[1]);
-					sv = sv.replace(/url\(([^\)]+)\)/g, function(a, b) {return ur[parseInt(b) - 1];});
-
-					sv = sv.replace(/rgb\([^\)]+\)/g, function(v) {
-						return t.toHex(v);
-					});
-
-					if (s.url_converter) {
-						sv = sv.replace(/url\([\'\"]?([^\)\'\"]+)[\'\"]?\)/g, function(x, c) {
-							return 'url(' + s.url_converter.call(s.url_converter_scope || t, t.decode(c), 'style', null) + ')';
-						});
-					}
-
-					o[tinymce.trim(v[0]).toLowerCase()] = sv;
-				}
-			});
-
-			compress("border", "", "border");
-			compress("border", "-width", "border-width");
-			compress("border", "-color", "border-color");
-			compress("border", "-style", "border-style");
-			compress("padding", "", "padding");
-			compress("margin", "", "margin");
-			compress2('border', 'border-width', 'border-style', 'border-color');
-
-			if (isIE) {
-				// Remove pointless border
-				if (o.border == 'medium none')
-					o.border = '';
-			}
-
-			return o;
+			return this.styles.parse(st);
 		},
 
 		serializeStyle : function(o, name) {
-			var t = this, s = '';
-
-			function add(v, k) {
-				if (k && v) {
-					// Remove browser specific styles like -moz- or -webkit-
-					if (k.indexOf('-') === 0)
-						return;
-
-					switch (k) {
-						case 'font-weight':
-							// Opera will output bold as 700
-							if (v == 700)
-								v = 'bold';
-
-							break;
-
-						case 'color':
-						case 'background-color':
-							v = v.toLowerCase();
-							break;
-					}
-
-					s += (s ? ' ' : '') + k + ': ' + v + ';';
-				}
-			};
-
-			// Validate style output
-			if (name && t._styles) {
-				each(t._styles['*'], function(name) {
-					add(o[name], name);
-				});
-
-				each(t._styles[name.toLowerCase()], function(name) {
-					add(o[name], name);
-				});
-			} else
-				each(o, add);
-
-			return s;
+			return this.styles.serialize(o, name);
 		},
 
 		loadCSS : function(u) {
@@ -2002,9 +3939,11 @@ tinymce.create('static tinymce.util.XHR', {
 				// IE 8 has a bug where dynamically loading stylesheets would produce a 1 item remaining bug
 				// This fix seems to resolve that issue by realcing the document ones a stylesheet finishes loading
 				// It's ugly but it seems to work fine.
-				if (isIE && d.documentMode) {
+				if (isIE && d.documentMode && d.recalc) {
 					link.onload = function() {
-						d.recalc();
+						if (d.recalc)
+							d.recalc();
+
 						link.onload = null;
 					};
 				}
@@ -2084,256 +4023,57 @@ tinymce.create('static tinymce.util.XHR', {
 			return (!p ? 'mce_' : p) + (this.counter++);
 		},
 
-		setHTML : function(e, h) {
-			var t = this;
-
-			return this.run(e, function(e) {
-				var x, i, nl, n, p, x;
-
-				h = t.processHTML(h);
+		setHTML : function(element, html) {
+			var self = this;
 
+			return self.run(element, function(element) {
 				if (isIE) {
-					function set() {
-						// Remove all child nodes
-						while (e.firstChild)
-							e.firstChild.removeNode();
+					// Remove all child nodes, IE keeps empty text nodes in DOM
+					while (element.firstChild)
+						element.removeChild(element.firstChild);
 
-						try {
-							// IE will remove comments from the beginning
-							// unless you padd the contents with something
-							e.innerHTML = '<br />' + h;
-							e.removeChild(e.firstChild);
-						} catch (ex) {
-							// IE sometimes produces an unknown runtime error on innerHTML if it's an block element within a block element for example a div inside a p
-							// This seems to fix this problem
+					try {
+						// IE will remove comments from the beginning
+						// unless you padd the contents with something
+						element.innerHTML = '<br />' + html;
+						element.removeChild(element.firstChild);
+					} catch (ex) {
+						// IE sometimes produces an unknown runtime error on innerHTML if it's an block element within a block element for example a div inside a p
+						// This seems to fix this problem
 
-							// Create new div with HTML contents and a BR infront to keep comments
-							x = t.create('div');
-							x.innerHTML = '<br />' + h;
+						// Create new div with HTML contents and a BR infront to keep comments
+						element = self.create('div');
+						element.innerHTML = '<br />' + html;
 
-							// Add all children from div to target
-							each (x.childNodes, function(n, i) {
-								// Skip br element
-								if (i)
-									e.appendChild(n);
-							});
-						}
-					};
-
-					// IE has a serious bug when it comes to paragraphs it can produce an invalid
-					// DOM tree if contents like this <p><ul><li>Item 1</li></ul></p> is inserted
-					// It seems to be that IE doesn't like a root block element placed inside another root block element
-					if (t.settings.fix_ie_paragraphs)
-						h = h.replace(/<p><\/p>|<p([^>]+)><\/p>|<p[^\/+]\/>/gi, '<p$1 _mce_keep="true">&nbsp;</p>');
-
-					set();
-
-					if (t.settings.fix_ie_paragraphs) {
-						// Check for odd paragraphs this is a sign of a broken DOM
-						nl = e.getElementsByTagName("p");
-						for (i = nl.length - 1, x = 0; i >= 0; i--) {
-							n = nl[i];
-
-							if (!n.hasChildNodes()) {
-								if (!n._mce_keep) {
-									x = 1; // Is broken
-									break;
-								}
-
-								n.removeAttribute('_mce_keep');
-							}
-						}
-					}
-
-					// Time to fix the madness IE left us
-					if (x) {
-						// So if we replace the p elements with divs and mark them and then replace them back to paragraphs
-						// after we use innerHTML we can fix the DOM tree
-						h = h.replace(/<p ([^>]+)>|<p>/ig, '<div $1 _mce_tmp="1">');
-						h = h.replace(/<\/p>/gi, '</div>');
-
-						// Set the new HTML with DIVs
-						set();
-
-						// Replace all DIV elements with the _mce_tmp attibute back to paragraphs
-						// This is needed since IE has a annoying bug see above for details
-						// This is a slow process but it has to be done. :(
-						if (t.settings.fix_ie_paragraphs) {
-							nl = e.getElementsByTagName("DIV");
-							for (i = nl.length - 1; i >= 0; i--) {
-								n = nl[i];
-
-								// Is it a temp div
-								if (n._mce_tmp) {
-									// Create new paragraph
-									p = t.doc.createElement('p');
-
-									// Copy all attributes
-									n.cloneNode(false).outerHTML.replace(/([a-z0-9\-_]+)=/gi, function(a, b) {
-										var v;
-
-										if (b !== '_mce_tmp') {
-											v = n.getAttribute(b);
-
-											if (!v && b === 'class')
-												v = n.className;
-
-											p.setAttribute(b, v);
-										}
-									});
-
-									// Append all children to new paragraph
-									for (x = 0; x<n.childNodes.length; x++)
-										p.appendChild(n.childNodes[x].cloneNode(true));
-
-									// Replace div with new paragraph
-									n.swapNode(p);
-								}
-							}
-						}
+						// Add all children from div to target
+						each (element.childNodes, function(node, i) {
+							// Skip br element
+							if (i)
+								element.appendChild(node);
+						});
 					}
 				} else
-					e.innerHTML = h;
+					element.innerHTML = html;
 
-				return h;
+				return html;
 			});
 		},
 
-		processHTML : function(h) {
-			var t = this, s = t.settings, codeBlocks = [];
+		getOuterHTML : function(elm) {
+			var doc, self = this;
 
-			if (!s.process_html)
-				return h;
+			elm = self.get(elm);
 
-			if (isIE) {
-				h = h.replace(/&apos;/g, '&#39;'); // IE can't handle apos
-				h = h.replace(/\s+(disabled|checked|readonly|selected)\s*=\s*[\"\']?(false|0)[\"\']?/gi, ''); // IE doesn't handle default values correct
-			}
-
-			// Fix some issues
-			h = h.replace(/<a( )([^>]+)\/>|<a\/>/gi, '<a$1$2></a>'); // Force open
-
-			// Store away src and href in _mce_src and mce_href since browsers mess them up
-			if (s.keep_values) {
-				// Wrap scripts and styles in comments for serialization purposes
-				if (/<script|noscript|style/i.test(h)) {
-					function trim(s) {
-						// Remove prefix and suffix code for element
-						s = s.replace(/(<!--\[CDATA\[|\]\]-->)/g, '\n');
-						s = s.replace(/^[\r\n]*|[\r\n]*$/g, '');
-						s = s.replace(/^\s*(\/\/\s*<!--|\/\/\s*<!\[CDATA\[|<!--|<!\[CDATA\[)[\r\n]*/g, '');
-						s = s.replace(/\s*(\/\/\s*\]\]>|\/\/\s*-->|\]\]>|-->|\]\]-->)\s*$/g, '');
-
-						return s;
-					};
-
-					// Wrap the script contents in CDATA and keep them from executing
-					h = h.replace(/<script([^>]+|)>([\s\S]*?)<\/script>/gi, function(v, attribs, text) {
-						// Force type attribute
-						if (!attribs)
-							attribs = ' type="text/javascript"';
-
-						// Convert the src attribute of the scripts
-						attribs = attribs.replace(/src=\"([^\"]+)\"?/i, function(a, url) {
-							if (s.url_converter)
-								url = t.encode(s.url_converter.call(s.url_converter_scope || t, t.decode(url), 'src', 'script'));
-
-							return '_mce_src="' + url + '"';
-						});
-
-						// Wrap text contents
-						if (tinymce.trim(text)) {
-							codeBlocks.push(trim(text));
-							text = '<!--\nMCE_SCRIPT:' + (codeBlocks.length - 1) + '\n// -->';
-						}
-
-						return '<mce:script' + attribs + '>' + text + '</mce:script>';
-					});
-
-					// Wrap style elements
-					h = h.replace(/<style([^>]+|)>([\s\S]*?)<\/style>/gi, function(v, attribs, text) {
-						// Wrap text contents
-						if (text) {
-							codeBlocks.push(trim(text));
-							text = '<!--\nMCE_SCRIPT:' + (codeBlocks.length - 1) + '\n-->';
-						}
-
-						return '<mce:style' + attribs + '>' + text + '</mce:style><style ' + attribs + ' _mce_bogus="1">' + text + '</style>';
-					});
-
-					// Wrap noscript elements
-					h = h.replace(/<noscript([^>]+|)>([\s\S]*?)<\/noscript>/g, function(v, attribs, text) {
-						return '<mce:noscript' + attribs + '><!--' + t.encode(text).replace(/--/g, '&#45;&#45;') + '--></mce:noscript>';
-					});
-				}
-
-				h = h.replace(/<!\[CDATA\[([\s\S]+)\]\]>/g, '<!--[CDATA[$1]]-->');
-
-				// This function processes the attributes in the HTML string to force boolean
-				// attributes to the attr="attr" format and convert style, src and href to _mce_ versions
-				function processTags(html) {
-					return html.replace(tagRegExp, function(match, elm_name, attrs, end) {
-						return '<' + elm_name + attrs.replace(attrRegExp, function(match, name, value, val2, val3) {
-							var mceValue;
-
-							name = name.toLowerCase();
-							value = value || val2 || val3 || "";
-
-							// Treat boolean attributes
-							if (boolAttrs[name]) {
-								// false or 0 is treated as a missing attribute
-								if (value === 'false' || value === '0')
-									return;
-
-								return name + '="' + name + '"';
-							}
-
-							// Is attribute one that needs special treatment
-							if (mceAttribs[name] && attrs.indexOf('_mce_' + name) == -1) {
-								mceValue = t.decode(value);
-
-								// Convert URLs to relative/absolute ones
-								if (s.url_converter && (name == "src" || name == "href"))
-									mceValue = s.url_converter.call(s.url_converter_scope || t, mceValue, name, elm_name);
-
-								// Process styles lowercases them and compresses them
-								if (name == 'style')
-									mceValue = t.serializeStyle(t.parseStyle(mceValue), name);
-
-								return name + '="' + value + '"' + ' _mce_' + name + '="' + t.encode(mceValue) + '"';
-							}
-
-							return match;
-						}) + end + '>';
-					});
-				};
-
-				h = processTags(h);
-
-				// Restore script blocks
-				h = h.replace(/MCE_SCRIPT:([0-9]+)/g, function(val, idx) {
-					return codeBlocks[idx];
-				});
-			}
-
-			return h;
-		},
-
-		getOuterHTML : function(e) {
-			var d;
-
-			e = this.get(e);
-
-			if (!e)
+			if (!elm)
 				return null;
 
-			if (e.outerHTML !== undefined)
-				return e.outerHTML;
+			if (elm.nodeType === 1 && self.hasOuterHTML)
+				return elm.outerHTML;
 
-			d = (e.ownerDocument || this.doc).createElement("body");
-			d.appendChild(e.cloneNode(true));
+			doc = (elm.ownerDocument || self.doc).createElement("body");
+			doc.appendChild(elm.cloneNode(true));
 
-			return d.innerHTML;
+			return doc.innerHTML;
 		},
 
 		setOuterHTML : function(e, h, d) {
@@ -2378,34 +4118,9 @@ tinymce.create('static tinymce.util.XHR', {
 			});
 		},
 
-		decode : function(s) {
-			var e, n, v;
+		decode : Entities.decode,
 
-			// Look for entities to decode
-			if (/&[\w#]+;/.test(s)) {
-				// Decode the entities using a div element not super efficient but less code
-				e = this.doc.createElement("div");
-				e.innerHTML = s;
-				n = e.firstChild;
-				v = '';
-
-				if (n) {
-					do {
-						v += n.nodeValue;
-					} while (n = n.nextSibling);
-				}
-
-				return v || s;
-			}
-
-			return s;
-		},
-
-		encode : function(str) {
-			return ('' + str).replace(encodeCharsRe, function(chr) {
-				return encodedChars[chr];
-			});
-		},
+		encode : Entities.encodeAllRaw,
 
 		insertAfter : function(node, reference_node) {
 			reference_node = this.get(reference_node);
@@ -2425,13 +4140,14 @@ tinymce.create('static tinymce.util.XHR', {
 			});
 		},
 
-		isBlock : function(n) {
-			if (n.nodeType && n.nodeType !== 1)
-				return false;
+		isBlock : function(node) {
+			var type = node.nodeType;
 
-			n = n.nodeName || n;
+			// If it's a node then check the type and use the nodeName
+			if (type)
+				return !!(type === 1 && blockElementsMap[node.nodeName]);
 
-			return blockRe.test(n);
+			return !!blockElementsMap[node];
 		},
 
 		replace : function(n, o, k) {
@@ -2536,7 +4252,7 @@ tinymce.create('static tinymce.util.XHR', {
 
 									// Remove everything but class name
 									ov = v;
-									v = v.replace(/.*\.([a-z0-9_\-]+).*/i, '$1');
+									v = tinymce._replace(/.*\.([a-z0-9_\-]+).*/i, '$1', v);
 
 									// Filter classes
 									if (f && !(v = f(v, ov)))
@@ -2628,6 +4344,45 @@ tinymce.create('static tinymce.util.XHR', {
 			return n.attributes;
 		},
 
+		isEmpty : function(node, elements) {
+			var self = this, i, attributes, type, walker, name;
+
+			node = node.firstChild;
+			if (node) {
+				walker = new tinymce.dom.TreeWalker(node);
+				elements = elements || self.schema ? self.schema.getNonEmptyElements() : null;
+
+				do {
+					type = node.nodeType;
+
+					if (type === 1) {
+						// Ignore bogus elements
+						if (node.getAttribute('data-mce-bogus'))
+							continue;
+
+						// Keep empty elements like <img />
+						if (elements && elements[node.nodeName.toLowerCase()])
+							return false;
+
+						// Keep elements with data attributes or name attribute like <a name="1"></a>
+						attributes = self.getAttribs(node);
+						i = node.attributes.length;
+						while (i--) {
+							name = node.attributes[i].nodeName;
+							if (name === "name" || name.indexOf('data-') === 0)
+								return false;
+						}
+					}
+
+					// Keep non whitespace text nodes
+					if ((type === 3 && !whiteSpaceRegExp.test(node.nodeValue)))
+						return false;
+				} while (node = walker.next());
+			}
+
+			return true;
+		},
+
 		destroy : function(s) {
 			var t = this;
 
@@ -2659,7 +4414,6 @@ tinymce.create('static tinymce.util.XHR', {
 						if (nodeType == lastNodeType || !node.nodeValue.length)
 							continue;
 					}
-
 					idx++;
 					lastNodeType = nodeType;
 				}
@@ -2680,23 +4434,24 @@ tinymce.create('static tinymce.util.XHR', {
 			// this function will then trim of empty edges and produce:
 			//   <p>text 1</p><b>CHOP</b><p>text 2</p>
 			function trim(node) {
-				var i, children = node.childNodes;
+				var i, children = node.childNodes, type = node.nodeType;
 
-				if (node.nodeType == 1 && node.getAttribute('_mce_type') == 'bookmark')
+				if (type == 1 && node.getAttribute('data-mce-type') == 'bookmark')
 					return;
 
 				for (i = children.length - 1; i >= 0; i--)
 					trim(children[i]);
 
-				if (node.nodeType != 9) {
+				if (type != 9) {
 					// Keep non whitespace text nodes
-					if (node.nodeType == 3 && node.nodeValue.length > 0)
-						return;
-
-					if (node.nodeType == 1) {
+					if (type == 3 && node.nodeValue.length > 0) {
+						// If parent element isn't a block or there isn't any useful contents for example "<p>   </p>"
+						if (!t.isBlock(node.parentNode) || tinymce.trim(node.nodeValue).length > 0)
+							return;
+					} else if (type == 1) {
 						// If the only child is a bookmark then move it up
 						children = node.childNodes;
-						if (children.length == 1 && children[0] && children[0].nodeType == 1 && children[0].getAttribute('_mce_type') == 'bookmark')
+						if (children.length == 1 && children[0] && children[0].nodeType == 1 && children[0].getAttribute('data-mce-type') == 'bookmark')
 							node.parentNode.insertBefore(children[0], node);
 
 						// Keep non empty elements or img, hr etc
@@ -2917,23 +4672,24 @@ tinymce.create('static tinymce.util.XHR', {
 		};
 
 		function compareBoundaryPoints(h, r) {
-			var sc = t[START_CONTAINER], so = t[START_OFFSET], ec = t[END_CONTAINER], eo = t[END_OFFSET];
+			var sc = t[START_CONTAINER], so = t[START_OFFSET], ec = t[END_CONTAINER], eo = t[END_OFFSET],
+			rsc = r.startContainer, rso = r.startOffset, rec = r.endContainer, reo = r.endOffset;
 
 			// Check START_TO_START
 			if (h === 0)
-				return _compareBoundaryPoints(sc, so, sc, so);
-
+				return _compareBoundaryPoints(sc, so, rsc, rso);
+	
 			// Check START_TO_END
 			if (h === 1)
-				return _compareBoundaryPoints(sc, so, ec, eo);
-
+				return _compareBoundaryPoints(ec, eo, rsc, rso);
+	
 			// Check END_TO_END
 			if (h === 2)
-				return _compareBoundaryPoints(ec, eo, ec, eo);
-
+				return _compareBoundaryPoints(ec, eo, rec, reo);
+	
 			// Check END_TO_START
-			if (h === 3)
-				return _compareBoundaryPoints(ec, eo, sc, so);
+			if (h === 3) 
+				return _compareBoundaryPoints(sc, so, rec, reo);
 		};
 
 		function deleteContents() {
@@ -3025,7 +4781,7 @@ tinymce.create('static tinymce.util.XHR', {
 
 		function _compareBoundaryPoints(containerA, offsetA, containerB, offsetB) {
 			var c, offsetC, n, cmnRoot, childA, childB;
-
+			
 			// In the first case the boundary-points have the same container. A is before B
 			// if its offset is less than the offset of B, A is equal to B if its offset is
 			// equal to the offset of B, and A is after B if its offset is greater than the
@@ -3311,7 +5067,7 @@ tinymce.create('static tinymce.util.XHR', {
 				frag.appendChild(n);
 
 			startIdx = nodeIndex(startAncestor);
-			++startIdx;  // Because we already traversed it....
+			++startIdx; // Because we already traversed it
 
 			cnt = t[END_OFFSET] - startIdx;
 			n = startAncestor.nextSibling;
@@ -3498,119 +5254,357 @@ tinymce.create('static tinymce.util.XHR', {
 
 (function() {
 	function Selection(selection) {
-		var t = this, invisibleChar = '\uFEFF', range, lastIERng, dom = selection.dom, TRUE = true, FALSE = false;
+		var self = this, dom = selection.dom, TRUE = true, FALSE = false;
+
+		function getPosition(rng, start) {
+			var checkRng, startIndex = 0, endIndex, inside,
+				children, child, offset, index, position = -1, parent;
+
+			// Setup test range, collapse it and get the parent
+			checkRng = rng.duplicate();
+			checkRng.collapse(start);
+			parent = checkRng.parentElement();
+
+			// Check if the selection is within the right document
+			if (parent.ownerDocument !== selection.dom.doc)
+				return;
+
+			// IE will report non editable elements as it's parent so look for an editable one
+			while (parent.contentEditable === "false") {
+				parent = parent.parentNode;
+			}
+
+			// If parent doesn't have any children then return that we are inside the element
+			if (!parent.hasChildNodes()) {
+				return {node : parent, inside : 1};
+			}
+
+			// Setup node list and endIndex
+			children = parent.children;
+			endIndex = children.length - 1;
+
+			// Perform a binary search for the position
+			while (startIndex <= endIndex) {
+				index = Math.floor((startIndex + endIndex) / 2);
+
+				// Move selection to node and compare the ranges
+				child = children[index];
+				checkRng.moveToElementText(child);
+				position = checkRng.compareEndPoints(start ? 'StartToStart' : 'EndToEnd', rng);
+
+				// Before/after or an exact match
+				if (position > 0) {
+					endIndex = index - 1;
+				} else if (position < 0) {
+					startIndex = index + 1;
+				} else {
+					return {node : child};
+				}
+			}
+
+			// Check if child position is before or we didn't find a position
+			if (position < 0) {
+				// No element child was found use the parent element and the offset inside that
+				if (!child) {
+					checkRng.moveToElementText(parent);
+					checkRng.collapse(true);
+					child = parent;
+					inside = true;
+				} else
+					checkRng.collapse(false);
+
+				checkRng.setEndPoint(start ? 'EndToStart' : 'EndToEnd', rng);
+
+				// Fix for edge case: <div style="width: 100px; height:100px;"><table>..</table>ab|c</div>
+				if (checkRng.compareEndPoints(start ? 'StartToStart' : 'StartToEnd', rng) > 0) {
+					checkRng = rng.duplicate();
+					checkRng.collapse(start);
+
+					offset = -1;
+					while (parent == checkRng.parentElement()) {
+						if (checkRng.move('character', -1) == 0)
+							break;
+
+						offset++;
+					}
+				}
+
+				offset = offset || checkRng.text.replace('\r\n', ' ').length;
+			} else {
+				// Child position is after the selection endpoint
+				checkRng.collapse(true);
+				checkRng.setEndPoint(start ? 'StartToStart' : 'StartToEnd', rng);
+
+				// Get the length of the text to find where the endpoint is relative to it's container
+				offset = checkRng.text.replace('\r\n', ' ').length;
+			}
+
+			return {node : child, position : position, offset : offset, inside : inside};
+		};
 
 		// Returns a W3C DOM compatible range object by using the IE Range API
 		function getRange() {
-			var ieRange = selection.getRng(), domRange = dom.createRng(), element, collapsed;
+			var ieRange = selection.getRng(), domRange = dom.createRng(), element, collapsed, tmpRange, element2, bookmark, fail;
 
 			// If selection is outside the current document just return an empty range
 			element = ieRange.item ? ieRange.item(0) : ieRange.parentElement();
 			if (element.ownerDocument != dom.doc)
 				return domRange;
 
-			// Handle control selection or text selection of a image
-			if (ieRange.item || !element.hasChildNodes()) {
+			collapsed = selection.isCollapsed();
+
+			// Handle control selection
+			if (ieRange.item) {
 				domRange.setStart(element.parentNode, dom.nodeIndex(element));
 				domRange.setEnd(domRange.startContainer, domRange.startOffset + 1);
 
 				return domRange;
 			}
 
-			collapsed = selection.isCollapsed();
-
 			function findEndPoint(start) {
-				var marker, container, offset, nodes, startIndex = 0, endIndex, index, parent, checkRng, position;
+				var endPoint = getPosition(ieRange, start), container, offset, textNodeOffset = 0, sibling, undef, nodeValue;
 
-				// Setup temp range and collapse it
-				checkRng = ieRange.duplicate();
-				checkRng.collapse(start);
+				container = endPoint.node;
+				offset = endPoint.offset;
 
-				// Create marker and insert it at the end of the endpoints parent
-				marker = dom.create('a');
-				parent = checkRng.parentElement();
-
-				// If parent doesn't have any children then set the container to that parent and the index to 0
-				if (!parent.hasChildNodes()) {
-					domRange[start ? 'setStart' : 'setEnd'](parent, 0);
+				if (endPoint.inside && !container.hasChildNodes()) {
+					domRange[start ? 'setStart' : 'setEnd'](container, 0);
 					return;
 				}
 
-				parent.appendChild(marker);
-				checkRng.moveToElementText(marker);
-				position = ieRange.compareEndPoints(start ? 'StartToStart' : 'EndToEnd', checkRng);
-				if (position > 0) {
-					// The position is after the end of the parent element.
-					// This is the case where IE puts the caret to the left edge of a table.
-					domRange[start ? 'setStartAfter' : 'setEndAfter'](parent);
-					dom.remove(marker);
+				if (offset === undef) {
+					domRange[start ? 'setStartBefore' : 'setEndAfter'](container);
 					return;
 				}
 
-				// Setup node list and endIndex
-				nodes = tinymce.grep(parent.childNodes);
-				endIndex = nodes.length - 1;
-				// Perform a binary search for the position
-				while (startIndex <= endIndex) {
-					index = Math.floor((startIndex + endIndex) / 2);
+				if (endPoint.position < 0) {
+					sibling = endPoint.inside ? container.firstChild : container.nextSibling;
 
-					// Insert marker and check it's position relative to the selection
-					parent.insertBefore(marker, nodes[index]);
-					checkRng.moveToElementText(marker);
-					position = ieRange.compareEndPoints(start ? 'StartToStart' : 'EndToEnd', checkRng);
-					if (position > 0) {
-						// Marker is to the right
-						startIndex = index + 1;
-					} else if (position < 0) {
-						// Marker is to the left
-						endIndex = index - 1;
-					} else {
-						// Maker is where we are
-						found = true;
-						break;
+					if (!sibling) {
+						domRange[start ? 'setStartAfter' : 'setEndAfter'](container);
+						return;
 					}
-				}
 
-				// Setup container
-				container = position > 0 || index == 0 ? marker.nextSibling : marker.previousSibling;
+					if (!offset) {
+						if (sibling.nodeType == 3)
+							domRange[start ? 'setStart' : 'setEnd'](sibling, 0);
+						else
+							domRange[start ? 'setStartBefore' : 'setEndBefore'](sibling);
 
-				// Handle element selection
-				if (container.nodeType == 1) {
-					dom.remove(marker);
+						return;
+					}
 
-					// Find offset and container
-					offset = dom.nodeIndex(container);
-					container = container.parentNode;
+					// Find the text node and offset
+					while (sibling) {
+						nodeValue = sibling.nodeValue;
+						textNodeOffset += nodeValue.length;
 
-					// Move the offset if we are setting the end or the position is after an element
-					if (!start || index > 0)
-						offset++;
+						// We are at or passed the position we where looking for
+						if (textNodeOffset >= offset) {
+							container = sibling;
+							textNodeOffset -= offset;
+							textNodeOffset = nodeValue.length - textNodeOffset;
+							break;
+						}
+
+						sibling = sibling.nextSibling;
+					}
 				} else {
-					// Calculate offset within text node
-					if (position > 0 || index == 0) {
-						checkRng.setEndPoint(start ? 'StartToStart' : 'EndToEnd', ieRange);
-						offset = checkRng.text.length;
-					} else {
-						checkRng.setEndPoint(start ? 'StartToStart' : 'EndToEnd', ieRange);
-						offset = container.nodeValue.length - checkRng.text.length;
+					// Find the text node and offset
+					sibling = container.previousSibling;
+
+					if (!sibling)
+						return domRange[start ? 'setStartBefore' : 'setEndBefore'](container);
+
+					// If there isn't any text to loop then use the first position
+					if (!offset) {
+						if (container.nodeType == 3)
+							domRange[start ? 'setStart' : 'setEnd'](sibling, container.nodeValue.length);
+						else
+							domRange[start ? 'setStartAfter' : 'setEndAfter'](sibling);
+
+						return;
 					}
 
-					dom.remove(marker);
+					while (sibling) {
+						textNodeOffset += sibling.nodeValue.length;
+
+						// We are at or passed the position we where looking for
+						if (textNodeOffset >= offset) {
+							container = sibling;
+							textNodeOffset -= offset;
+							break;
+						}
+
+						sibling = sibling.previousSibling;
+					}
 				}
 
-				domRange[start ? 'setStart' : 'setEnd'](container, offset);
+				domRange[start ? 'setStart' : 'setEnd'](container, textNodeOffset);
 			};
 
-			// Find start point
-			findEndPoint(true);
+			try {
+				// Find start point
+				findEndPoint(true);
 
-			// Find end point if needed
-			if (!collapsed)
-				findEndPoint();
+				// Find end point if needed
+				if (!collapsed)
+					findEndPoint();
+			} catch (ex) {
+				// IE has a nasty bug where text nodes might throw "invalid argument" when you
+				// access the nodeValue or other properties of text nodes. This seems to happend when
+				// text nodes are split into two nodes by a delete/backspace call. So lets detect it and try to fix it.
+				if (ex.number == -2147024809) {
+					// Get the current selection
+					bookmark = self.getBookmark(2);
+
+					// Get start element
+					tmpRange = ieRange.duplicate();
+					tmpRange.collapse(true);
+					element = tmpRange.parentElement();
+
+					// Get end element
+					if (!collapsed) {
+						tmpRange = ieRange.duplicate();
+						tmpRange.collapse(false);
+						element2 = tmpRange.parentElement();
+						element2.innerHTML = element2.innerHTML;
+					}
+
+					// Remove the broken elements
+					element.innerHTML = element.innerHTML;
+
+					// Restore the selection
+					self.moveToBookmark(bookmark);
+
+					// Since the range has moved we need to re-get it
+					ieRange = selection.getRng();
+
+					// Find start point
+					findEndPoint(true);
+
+					// Find end point if needed
+					if (!collapsed)
+						findEndPoint();
+				} else
+					throw ex; // Throw other errors
+			}
 
 			return domRange;
 		};
 
+		this.getBookmark = function(type) {
+			var rng = selection.getRng(), start, end, bookmark = {};
+
+			function getIndexes(node) {
+				var node, parent, root, children, i, indexes = [];
+
+				parent = node.parentNode;
+				root = dom.getRoot().parentNode;
+
+				while (parent != root) {
+					children = parent.children;
+
+					i = children.length;
+					while (i--) {
+						if (node === children[i]) {
+							indexes.push(i);
+							break;
+						}
+					}
+
+					node = parent;
+					parent = parent.parentNode;
+				}
+
+				return indexes;
+			};
+
+			function getBookmarkEndPoint(start) {
+				var position;
+
+				position = getPosition(rng, start);
+				if (position) {
+					return {
+						position : position.position,
+						offset : position.offset,
+						indexes : getIndexes(position.node),
+						inside : position.inside
+					};
+				}
+			};
+
+			// Non ubstructive bookmark
+			if (type === 2) {
+				// Handle text selection
+				if (!rng.item) {
+					bookmark.start = getBookmarkEndPoint(true);
+
+					if (!selection.isCollapsed())
+						bookmark.end = getBookmarkEndPoint();
+				} else
+					bookmark.start = {ctrl : true, indexes : getIndexes(rng.item(0))};
+			}
+
+			return bookmark;
+		};
+
+		this.moveToBookmark = function(bookmark) {
+			var rng, body = dom.doc.body;
+
+			function resolveIndexes(indexes) {
+				var node, i, idx, children;
+
+				node = dom.getRoot();
+				for (i = indexes.length - 1; i >= 0; i--) {
+					children = node.children;
+					idx = indexes[i];
+
+					if (idx <= children.length - 1) {
+						node = children[idx];
+					}
+				}
+
+				return node;
+			};
+			
+			function setBookmarkEndPoint(start) {
+				var endPoint = bookmark[start ? 'start' : 'end'], moveLeft, moveRng, undef;
+
+				if (endPoint) {
+					moveLeft = endPoint.position > 0;
+
+					moveRng = body.createTextRange();
+					moveRng.moveToElementText(resolveIndexes(endPoint.indexes));
+
+					offset = endPoint.offset;
+					if (offset !== undef) {
+						moveRng.collapse(endPoint.inside || moveLeft);
+						moveRng.moveStart('character', moveLeft ? -offset : offset);
+					} else
+						moveRng.collapse(start);
+
+					rng.setEndPoint(start ? 'StartToStart' : 'EndToStart', moveRng);
+
+					if (start)
+						rng.collapse(true);
+				}
+			};
+
+			if (bookmark.start) {
+				if (bookmark.start.ctrl) {
+					rng = body.createControlRange();
+					rng.addElement(resolveIndexes(bookmark.start.indexes));
+					rng.select();
+				} else {
+					rng = body.createTextRange();
+					setBookmarkEndPoint(true);
+					setBookmarkEndPoint();
+					rng.select();
+				}
+			}
+		};
+
 		this.addRange = function(rng) {
 			var ieRng, ctrlRng, startContainer, startOffset, endContainer, endOffset, doc = selection.dom.doc, body = doc.body;
 
@@ -3622,7 +5616,7 @@ tinymce.create('static tinymce.util.XHR', {
 				offset = start ? startOffset : endOffset;
 				tmpRng = ieRng.duplicate();
 
-				if (container == doc) {
+				if (container == doc || container == doc.documentElement) {
 					container = body;
 					offset = 0;
 				}
@@ -3646,7 +5640,7 @@ tinymce.create('static tinymce.util.XHR', {
 						tmpRng.moveToElementText(marker);
 					} else {
 						// Empty node selection for example <div>|</div>
-						marker = doc.createTextNode(invisibleChar);
+						marker = doc.createTextNode('\uFEFF');
 						container.appendChild(marker);
 						tmpRng.moveToElementText(marker.parentNode);
 						tmpRng.collapse(TRUE);
@@ -3657,9 +5651,6 @@ tinymce.create('static tinymce.util.XHR', {
 				}
 			}
 
-			// Destroy cached range
-			this.destroy();
-
 			// Setup some shorter versions
 			startContainer = rng.startContainer;
 			startOffset = rng.startOffset;
@@ -3674,7 +5665,6 @@ tinymce.create('static tinymce.util.XHR', {
 						ctrlRng = body.createControlRange();
 						ctrlRng.addElement(startContainer.childNodes[startOffset]);
 						ctrlRng.select();
-						ctrlRng.scrollIntoView();
 						return;
 					} catch (ex) {
 						// Ignore
@@ -3688,109 +5678,10 @@ tinymce.create('static tinymce.util.XHR', {
 
 			// Select the new range and scroll it into view
 			ieRng.select();
-			ieRng.scrollIntoView();
 		};
 
-		this.getRangeAt = function() {
-			// Setup new range if the cache is empty
-			if (!range || !tinymce.dom.RangeUtils.compareRanges(lastIERng, selection.getRng())) {
-				range = getRange();
-
-				// Store away text range for next call
-				lastIERng = selection.getRng();
-			}
-
-			// IE will say that the range is equal then produce an invalid argument exception
-			// if you perform specific operations in a keyup event. For example Ctrl+Del.
-			// This hack will invalidate the range cache if the exception occurs
-			try {
-				range.startContainer.nextSibling;
-			} catch (ex) {
-				range = getRange();
-				lastIERng = null;
-			}
-
-			// Return cached range
-			return range;
-		};
-
-		this.destroy = function() {
-			// Destroy cached range and last IE range to avoid memory leaks
-			lastIERng = range = null;
-		};
-
-		// IE has an issue where you can't select/move the caret by clicking outside the body if the document is in standards mode
-		if (selection.dom.boxModel) {
-			(function() {
-				var doc = dom.doc, body = doc.body, started, startRng;
-
-				// Make HTML element unselectable since we are going to handle selection by hand
-				doc.documentElement.unselectable = TRUE;
-
-				// Return range from point or null if it failed
-				function rngFromPoint(x, y) {
-					var rng = body.createTextRange();
-
-					try {
-						rng.moveToPoint(x, y);
-					} catch (ex) {
-						// IE sometimes throws and exception, so lets just ignore it
-						rng = null;
-					}
-
-					return rng;
-				};
-
-				// Fires while the selection is changing
-				function selectionChange(e) {
-					var pointRng;
-
-					// Check if the button is down or not
-					if (e.button) {
-						// Create range from mouse position
-						pointRng = rngFromPoint(e.x, e.y);
-
-						if (pointRng) {
-							// Check if pointRange is before/after selection then change the endPoint
-							if (pointRng.compareEndPoints('StartToStart', startRng) > 0)
-								pointRng.setEndPoint('StartToStart', startRng);
-							else
-								pointRng.setEndPoint('EndToEnd', startRng);
-
-							pointRng.select();
-						}
-					} else
-						endSelection();
-				}
-
-				// Removes listeners
-				function endSelection() {
-					dom.unbind(doc, 'mouseup', endSelection);
-					dom.unbind(doc, 'mousemove', selectionChange);
-					started = 0;
-				};
-
-				// Detect when user selects outside BODY
-				dom.bind(doc, 'mousedown', function(e) {
-					if (e.target.nodeName === 'HTML') {
-						if (started)
-							endSelection();
-
-						started = 1;
-
-						// Setup start position
-						startRng = rngFromPoint(e.x, e.y);
-						if (startRng) {
-							// Listen for selection change events
-							dom.bind(doc, 'mouseup', endSelection);
-							dom.bind(doc, 'mousemove', selectionChange);
-
-							startRng.select();
-						}
-					}
-				});
-			})();
-		}
+		// Expose range method
+		this.getRangeAt = getRange;
 	};
 
 	// Expose the selection object
@@ -3798,6 +5689,1076 @@ tinymce.create('static tinymce.util.XHR', {
 })();
 
 
+/*
+ * Sizzle CSS Selector Engine - v1.0
+ *  Copyright 2009, The Dojo Foundation
+ *  Released under the MIT, BSD, and GPL Licenses.
+ *  More information: http://sizzlejs.com/
+ */
+(function(){
+
+var chunker = /((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^\[\]]*\]|['"][^'"]*['"]|[^\[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,
+	done = 0,
+	toString = Object.prototype.toString,
+	hasDuplicate = false,
+	baseHasDuplicate = true;
+
+// Here we check if the JavaScript engine is using some sort of
+// optimization where it does not always call our comparision
+// function. If that is the case, discard the hasDuplicate value.
+//   Thus far that includes Google Chrome.
+[0, 0].sort(function(){
+	baseHasDuplicate = false;
+	return 0;
+});
+
+var Sizzle = function(selector, context, results, seed) {
+	results = results || [];
+	context = context || document;
+
+	var origContext = context;
+
+	if ( context.nodeType !== 1 && context.nodeType !== 9 ) {
+		return [];
+	}
+	
+	if ( !selector || typeof selector !== "string" ) {
+		return results;
+	}
+
+	var parts = [], m, set, checkSet, extra, prune = true, contextXML = Sizzle.isXML(context),
+		soFar = selector, ret, cur, pop, i;
+	
+	// Reset the position of the chunker regexp (start from head)
+	do {
+		chunker.exec("");
+		m = chunker.exec(soFar);
+
+		if ( m ) {
+			soFar = m[3];
+		
+			parts.push( m[1] );
+		
+			if ( m[2] ) {
+				extra = m[3];
+				break;
+			}
+		}
+	} while ( m );
+
+	if ( parts.length > 1 && origPOS.exec( selector ) ) {
+		if ( parts.length === 2 && Expr.relative[ parts[0] ] ) {
+			set = posProcess( parts[0] + parts[1], context );
+		} else {
+			set = Expr.relative[ parts[0] ] ?
+				[ context ] :
+				Sizzle( parts.shift(), context );
+
+			while ( parts.length ) {
+				selector = parts.shift();
+
+				if ( Expr.relative[ selector ] ) {
+					selector += parts.shift();
+				}
+				
+				set = posProcess( selector, set );
+			}
+		}
+	} else {
+		// Take a shortcut and set the context if the root selector is an ID
+		// (but not if it'll be faster if the inner selector is an ID)
+		if ( !seed && parts.length > 1 && context.nodeType === 9 && !contextXML &&
+				Expr.match.ID.test(parts[0]) && !Expr.match.ID.test(parts[parts.length - 1]) ) {
+			ret = Sizzle.find( parts.shift(), context, contextXML );
+			context = ret.expr ? Sizzle.filter( ret.expr, ret.set )[0] : ret.set[0];
+		}
+
+		if ( context ) {
+			ret = seed ?
+				{ expr: parts.pop(), set: makeArray(seed) } :
+				Sizzle.find( parts.pop(), parts.length === 1 && (parts[0] === "~" || parts[0] === "+") && context.parentNode ? context.parentNode : context, contextXML );
+			set = ret.expr ? Sizzle.filter( ret.expr, ret.set ) : ret.set;
+
+			if ( parts.length > 0 ) {
+				checkSet = makeArray(set);
+			} else {
+				prune = false;
+			}
+
+			while ( parts.length ) {
+				cur = parts.pop();
+				pop = cur;
+
+				if ( !Expr.relative[ cur ] ) {
+					cur = "";
+				} else {
+					pop = parts.pop();
+				}
+
+				if ( pop == null ) {
+					pop = context;
+				}
+
+				Expr.relative[ cur ]( checkSet, pop, contextXML );
+			}
+		} else {
+			checkSet = parts = [];
+		}
+	}
+
+	if ( !checkSet ) {
+		checkSet = set;
+	}
+
+	if ( !checkSet ) {
+		Sizzle.error( cur || selector );
+	}
+
+	if ( toString.call(checkSet) === "[object Array]" ) {
+		if ( !prune ) {
+			results.push.apply( results, checkSet );
+		} else if ( context && context.nodeType === 1 ) {
+			for ( i = 0; checkSet[i] != null; i++ ) {
+				if ( checkSet[i] && (checkSet[i] === true || checkSet[i].nodeType === 1 && Sizzle.contains(context, checkSet[i])) ) {
+					results.push( set[i] );
+				}
+			}
+		} else {
+			for ( i = 0; checkSet[i] != null; i++ ) {
+				if ( checkSet[i] && checkSet[i].nodeType === 1 ) {
+					results.push( set[i] );
+				}
+			}
+		}
+	} else {
+		makeArray( checkSet, results );
+	}
+
+	if ( extra ) {
+		Sizzle( extra, origContext, results, seed );
+		Sizzle.uniqueSort( results );
+	}
+
+	return results;
+};
+
+Sizzle.uniqueSort = function(results){
+	if ( sortOrder ) {
+		hasDuplicate = baseHasDuplicate;
+		results.sort(sortOrder);
+
+		if ( hasDuplicate ) {
+			for ( var i = 1; i < results.length; i++ ) {
+				if ( results[i] === results[i-1] ) {
+					results.splice(i--, 1);
+				}
+			}
+		}
+	}
+
+	return results;
+};
+
+Sizzle.matches = function(expr, set){
+	return Sizzle(expr, null, null, set);
+};
+
+Sizzle.find = function(expr, context, isXML){
+	var set;
+
+	if ( !expr ) {
+		return [];
+	}
+
+	for ( var i = 0, l = Expr.order.length; i < l; i++ ) {
+		var type = Expr.order[i], match;
+		
+		if ( (match = Expr.leftMatch[ type ].exec( expr )) ) {
+			var left = match[1];
+			match.splice(1,1);
+
+			if ( left.substr( left.length - 1 ) !== "\\" ) {
+				match[1] = (match[1] || "").replace(/\\/g, "");
+				set = Expr.find[ type ]( match, context, isXML );
+				if ( set != null ) {
+					expr = expr.replace( Expr.match[ type ], "" );
+					break;
+				}
+			}
+		}
+	}
+
+	if ( !set ) {
+		set = context.getElementsByTagName("*");
+	}
+
+	return {set: set, expr: expr};
+};
+
+Sizzle.filter = function(expr, set, inplace, not){
+	var old = expr, result = [], curLoop = set, match, anyFound,
+		isXMLFilter = set && set[0] && Sizzle.isXML(set[0]);
+
+	while ( expr && set.length ) {
+		for ( var type in Expr.filter ) {
+			if ( (match = Expr.leftMatch[ type ].exec( expr )) != null && match[2] ) {
+				var filter = Expr.filter[ type ], found, item, left = match[1];
+				anyFound = false;
+
+				match.splice(1,1);
+
+				if ( left.substr( left.length - 1 ) === "\\" ) {
+					continue;
+				}
+
+				if ( curLoop === result ) {
+					result = [];
+				}
+
+				if ( Expr.preFilter[ type ] ) {
+					match = Expr.preFilter[ type ]( match, curLoop, inplace, result, not, isXMLFilter );
+
+					if ( !match ) {
+						anyFound = found = true;
+					} else if ( match === true ) {
+						continue;
+					}
+				}
+
+				if ( match ) {
+					for ( var i = 0; (item = curLoop[i]) != null; i++ ) {
+						if ( item ) {
+							found = filter( item, match, i, curLoop );
+							var pass = not ^ !!found;
+
+							if ( inplace && found != null ) {
+								if ( pass ) {
+									anyFound = true;
+								} else {
+									curLoop[i] = false;
+								}
+							} else if ( pass ) {
+								result.push( item );
+								anyFound = true;
+							}
+						}
+					}
+				}
+
+				if ( found !== undefined ) {
+					if ( !inplace ) {
+						curLoop = result;
+					}
+
+					expr = expr.replace( Expr.match[ type ], "" );
+
+					if ( !anyFound ) {
+						return [];
+					}
+
+					break;
+				}
+			}
+		}
+
+		// Improper expression
+		if ( expr === old ) {
+			if ( anyFound == null ) {
+				Sizzle.error( expr );
+			} else {
+				break;
+			}
+		}
+
+		old = expr;
+	}
+
+	return curLoop;
+};
+
+Sizzle.error = function( msg ) {
+	throw "Syntax error, unrecognized expression: " + msg;
+};
+
+var Expr = Sizzle.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\))?/
+	},
+	leftMatch: {},
+	attrMap: {
+		"class": "className",
+		"for": "htmlFor"
+	},
+	attrHandle: {
+		href: function(elem){
+			return elem.getAttribute("href");
+		}
+	},
+	relative: {
+		"+": function(checkSet, part){
+			var isPartStr = typeof part === "string",
+				isTag = isPartStr && !/\W/.test(part),
+				isPartStrNotTag = isPartStr && !isTag;
+
+			if ( isTag ) {
+				part = part.toLowerCase();
+			}
+
+			for ( var i = 0, l = checkSet.length, elem; i < l; i++ ) {
+				if ( (elem = checkSet[i]) ) {
+					while ( (elem = elem.previousSibling) && elem.nodeType !== 1 ) {}
+
+					checkSet[i] = isPartStrNotTag || elem && elem.nodeName.toLowerCase() === part ?
+						elem || false :
+						elem === part;
+				}
+			}
+
+			if ( isPartStrNotTag ) {
+				Sizzle.filter( part, checkSet, true );
+			}
+		},
+		">": function(checkSet, part){
+			var isPartStr = typeof part === "string",
+				elem, i = 0, l = checkSet.length;
+
+			if ( isPartStr && !/\W/.test(part) ) {
+				part = part.toLowerCase();
+
+				for ( ; i < l; i++ ) {
+					elem = checkSet[i];
+					if ( elem ) {
+						var parent = elem.parentNode;
+						checkSet[i] = parent.nodeName.toLowerCase() === part ? parent : false;
+					}
+				}
+			} else {
+				for ( ; i < l; i++ ) {
+					elem = checkSet[i];
+					if ( elem ) {
+						checkSet[i] = isPartStr ?
+							elem.parentNode :
+							elem.parentNode === part;
+					}
+				}
+
+				if ( isPartStr ) {
+					Sizzle.filter( part, checkSet, true );
+				}
+			}
+		},
+		"": function(checkSet, part, isXML){
+			var doneName = done++, checkFn = dirCheck, nodeCheck;
+
+			if ( typeof part === "string" && !/\W/.test(part) ) {
+				part = part.toLowerCase();
+				nodeCheck = part;
+				checkFn = dirNodeCheck;
+			}
+
+			checkFn("parentNode", part, doneName, checkSet, nodeCheck, isXML);
+		},
+		"~": function(checkSet, part, isXML){
+			var doneName = done++, checkFn = dirCheck, nodeCheck;
+
+			if ( typeof part === "string" && !/\W/.test(part) ) {
+				part = part.toLowerCase();
+				nodeCheck = part;
+				checkFn = dirNodeCheck;
+			}
+
+			checkFn("previousSibling", part, doneName, checkSet, nodeCheck, isXML);
+		}
+	},
+	find: {
+		ID: function(match, context, isXML){
+			if ( typeof context.getElementById !== "undefined" && !isXML ) {
+				var m = context.getElementById(match[1]);
+				return m ? [m] : [];
+			}
+		},
+		NAME: function(match, context){
+			if ( typeof context.getElementsByName !== "undefined" ) {
+				var ret = [], results = context.getElementsByName(match[1]);
+
+				for ( var i = 0, l = results.length; i < l; i++ ) {
+					if ( results[i].getAttribute("name") === match[1] ) {
+						ret.push( results[i] );
+					}
+				}
+
+				return ret.length === 0 ? null : ret;
+			}
+		},
+		TAG: function(match, context){
+			return context.getElementsByTagName(match[1]);
+		}
+	},
+	preFilter: {
+		CLASS: function(match, curLoop, inplace, result, not, isXML){
+			match = " " + match[1].replace(/\\/g, "") + " ";
+
+			if ( isXML ) {
+				return match;
+			}
+
+			for ( var i = 0, elem; (elem = curLoop[i]) != null; i++ ) {
+				if ( elem ) {
+					if ( not ^ (elem.className && (" " + elem.className + " ").replace(/[\t\n]/g, " ").indexOf(match) >= 0) ) {
+						if ( !inplace ) {
+							result.push( elem );
+						}
+					} else if ( inplace ) {
+						curLoop[i] = false;
+					}
+				}
+			}
+
+			return false;
+		},
+		ID: function(match){
+			return match[1].replace(/\\/g, "");
+		},
+		TAG: function(match, curLoop){
+			return match[1].toLowerCase();
+		},
+		CHILD: function(match){
+			if ( match[1] === "nth" ) {
+				// parse equations like 'even', 'odd', '5', '2n', '3n+2', '4n-1', '-n+6'
+				var test = /(-?)(\d*)n((?:\+|-)?\d*)/.exec(
+					match[2] === "even" && "2n" || match[2] === "odd" && "2n+1" ||
+					!/\D/.test( match[2] ) && "0n+" + match[2] || match[2]);
+
+				// calculate the numbers (first)n+(last) including if they are negative
+				match[2] = (test[1] + (test[2] || 1)) - 0;
+				match[3] = test[3] - 0;
+			}
+
+			// TODO: Move to normal caching system
+			match[0] = done++;
+
+			return match;
+		},
+		ATTR: function(match, curLoop, inplace, result, not, isXML){
+			var name = match[1].replace(/\\/g, "");
+			
+			if ( !isXML && Expr.attrMap[name] ) {
+				match[1] = Expr.attrMap[name];
+			}
+
+			if ( match[2] === "~=" ) {
+				match[4] = " " + match[4] + " ";
+			}
+
+			return match;
+		},
+		PSEUDO: function(match, curLoop, inplace, result, not){
+			if ( match[1] === "not" ) {
+				// If we're dealing with a complex expression, or a simple one
+				if ( ( chunker.exec(match[3]) || "" ).length > 1 || /^\w/.test(match[3]) ) {
+					match[3] = Sizzle(match[3], null, null, curLoop);
+				} else {
+					var ret = Sizzle.filter(match[3], curLoop, inplace, true ^ not);
+					if ( !inplace ) {
+						result.push.apply( result, ret );
+					}
+					return false;
+				}
+			} else if ( Expr.match.POS.test( match[0] ) || Expr.match.CHILD.test( match[0] ) ) {
+				return true;
+			}
+			
+			return match;
+		},
+		POS: function(match){
+			match.unshift( true );
+			return match;
+		}
+	},
+	filters: {
+		enabled: function(elem){
+			return elem.disabled === false && elem.type !== "hidden";
+		},
+		disabled: function(elem){
+			return elem.disabled === true;
+		},
+		checked: function(elem){
+			return elem.checked === true;
+		},
+		selected: function(elem){
+			// Accessing this property makes selected-by-default
+			// options in Safari work properly
+			elem.parentNode.selectedIndex;
+			return elem.selected === true;
+		},
+		parent: function(elem){
+			return !!elem.firstChild;
+		},
+		empty: function(elem){
+			return !elem.firstChild;
+		},
+		has: function(elem, i, match){
+			return !!Sizzle( match[3], elem ).length;
+		},
+		header: function(elem){
+			return (/h\d/i).test( elem.nodeName );
+		},
+		text: function(elem){
+			return "text" === elem.type;
+		},
+		radio: function(elem){
+			return "radio" === elem.type;
+		},
+		checkbox: function(elem){
+			return "checkbox" === elem.type;
+		},
+		file: function(elem){
+			return "file" === elem.type;
+		},
+		password: function(elem){
+			return "password" === elem.type;
+		},
+		submit: function(elem){
+			return "submit" === elem.type;
+		},
+		image: function(elem){
+			return "image" === elem.type;
+		},
+		reset: function(elem){
+			return "reset" === elem.type;
+		},
+		button: function(elem){
+			return "button" === elem.type || elem.nodeName.toLowerCase() === "button";
+		},
+		input: function(elem){
+			return (/input|select|textarea|button/i).test(elem.nodeName);
+		}
+	},
+	setFilters: {
+		first: function(elem, i){
+			return i === 0;
+		},
+		last: function(elem, i, match, array){
+			return i === array.length - 1;
+		},
+		even: function(elem, i){
+			return i % 2 === 0;
+		},
+		odd: function(elem, i){
+			return i % 2 === 1;
+		},
+		lt: function(elem, i, match){
+			return i < match[3] - 0;
+		},
+		gt: function(elem, i, match){
+			return i > match[3] - 0;
+		},
+		nth: function(elem, i, match){
+			return match[3] - 0 === i;
+		},
+		eq: function(elem, i, match){
+			return match[3] - 0 === i;
+		}
+	},
+	filter: {
+		PSEUDO: function(elem, match, i, array){
+			var name = match[1], filter = Expr.filters[ name ];
+
+			if ( filter ) {
+				return filter( elem, i, match, array );
+			} else if ( name === "contains" ) {
+				return (elem.textContent || elem.innerText || Sizzle.getText([ elem ]) || "").indexOf(match[3]) >= 0;
+			} else if ( name === "not" ) {
+				var not = match[3];
+
+				for ( var j = 0, l = not.length; j < l; j++ ) {
+					if ( not[j] === elem ) {
+						return false;
+					}
+				}
+
+				return true;
+			} else {
+				Sizzle.error( "Syntax error, unrecognized expression: " + name );
+			}
+		},
+		CHILD: function(elem, match){
+			var type = match[1], node = elem;
+			switch (type) {
+				case 'only':
+				case 'first':
+					while ( (node = node.previousSibling) )	 {
+						if ( node.nodeType === 1 ) { 
+							return false; 
+						}
+					}
+					if ( type === "first" ) { 
+						return true; 
+					}
+					node = elem;
+				case 'last':
+					while ( (node = node.nextSibling) )	 {
+						if ( node.nodeType === 1 ) { 
+							return false; 
+						}
+					}
+					return true;
+				case 'nth':
+					var first = match[2], last = match[3];
+
+					if ( first === 1 && last === 0 ) {
+						return true;
+					}
+					
+					var doneName = match[0],
+						parent = elem.parentNode;
+	
+					if ( parent && (parent.sizcache !== doneName || !elem.nodeIndex) ) {
+						var count = 0;
+						for ( node = parent.firstChild; node; node = node.nextSibling ) {
+							if ( node.nodeType === 1 ) {
+								node.nodeIndex = ++count;
+							}
+						} 
+						parent.sizcache = doneName;
+					}
+					
+					var diff = elem.nodeIndex - last;
+					if ( first === 0 ) {
+						return diff === 0;
+					} else {
+						return ( diff % first === 0 && diff / first >= 0 );
+					}
+			}
+		},
+		ID: function(elem, match){
+			return elem.nodeType === 1 && elem.getAttribute("id") === match;
+		},
+		TAG: function(elem, match){
+			return (match === "*" && elem.nodeType === 1) || elem.nodeName.toLowerCase() === match;
+		},
+		CLASS: function(elem, match){
+			return (" " + (elem.className || elem.getAttribute("class")) + " ")
+				.indexOf( match ) > -1;
+		},
+		ATTR: function(elem, match){
+			var name = match[1],
+				result = Expr.attrHandle[ name ] ?
+					Expr.attrHandle[ name ]( elem ) :
+					elem[ name ] != null ?
+						elem[ name ] :
+						elem.getAttribute( name ),
+				value = result + "",
+				type = match[2],
+				check = match[4];
+
+			return result == null ?
+				type === "!=" :
+				type === "=" ?
+				value === check :
+				type === "*=" ?
+				value.indexOf(check) >= 0 :
+				type === "~=" ?
+				(" " + value + " ").indexOf(check) >= 0 :
+				!check ?
+				value && result !== false :
+				type === "!=" ?
+				value !== check :
+				type === "^=" ?
+				value.indexOf(check) === 0 :
+				type === "$=" ?
+				value.substr(value.length - check.length) === check :
+				type === "|=" ?
+				value === check || value.substr(0, check.length + 1) === check + "-" :
+				false;
+		},
+		POS: function(elem, match, i, array){
+			var name = match[2], filter = Expr.setFilters[ name ];
+
+			if ( filter ) {
+				return filter( elem, i, match, array );
+			}
+		}
+	}
+};
+
+var origPOS = Expr.match.POS,
+	fescape = function(all, num){
+		return "\\" + (num - 0 + 1);
+	};
+
+for ( var type in Expr.match ) {
+	Expr.match[ type ] = new RegExp( Expr.match[ type ].source + (/(?![^\[]*\])(?![^\(]*\))/.source) );
+	Expr.leftMatch[ type ] = new RegExp( /(^(?:.|\r|\n)*?)/.source + Expr.match[ type ].source.replace(/\\(\d+)/g, fescape) );
+}
+
+var makeArray = function(array, results) {
+	array = Array.prototype.slice.call( array, 0 );
+
+	if ( results ) {
+		results.push.apply( results, array );
+		return results;
+	}
+	
+	return array;
+};
+
+// Perform a simple check to determine if the browser is capable of
+// converting a NodeList to an array using builtin methods.
+// Also verifies that the returned array holds DOM nodes
+// (which is not the case in the Blackberry browser)
+try {
+	Array.prototype.slice.call( document.documentElement.childNodes, 0 )[0].nodeType;
+
+// Provide a fallback method if it does not work
+} catch(e){
+	makeArray = function(array, results) {
+		var ret = results || [], i = 0;
+
+		if ( toString.call(array) === "[object Array]" ) {
+			Array.prototype.push.apply( ret, array );
+		} else {
+			if ( typeof array.length === "number" ) {
+				for ( var l = array.length; i < l; i++ ) {
+					ret.push( array[i] );
+				}
+			} else {
+				for ( ; array[i]; i++ ) {
+					ret.push( array[i] );
+				}
+			}
+		}
+
+		return ret;
+	};
+}
+
+var sortOrder;
+
+if ( document.documentElement.compareDocumentPosition ) {
+	sortOrder = function( a, b ) {
+		if ( !a.compareDocumentPosition || !b.compareDocumentPosition ) {
+			if ( a == b ) {
+				hasDuplicate = true;
+			}
+			return a.compareDocumentPosition ? -1 : 1;
+		}
+
+		var ret = a.compareDocumentPosition(b) & 4 ? -1 : a === b ? 0 : 1;
+		if ( ret === 0 ) {
+			hasDuplicate = true;
+		}
+		return ret;
+	};
+} else if ( "sourceIndex" in document.documentElement ) {
+	sortOrder = function( a, b ) {
+		if ( !a.sourceIndex || !b.sourceIndex ) {
+			if ( a == b ) {
+				hasDuplicate = true;
+			}
+			return a.sourceIndex ? -1 : 1;
+		}
+
+		var ret = a.sourceIndex - b.sourceIndex;
+		if ( ret === 0 ) {
+			hasDuplicate = true;
+		}
+		return ret;
+	};
+} else if ( document.createRange ) {
+	sortOrder = function( a, b ) {
+		if ( !a.ownerDocument || !b.ownerDocument ) {
+			if ( a == b ) {
+				hasDuplicate = true;
+			}
+			return a.ownerDocument ? -1 : 1;
+		}
+
+		var aRange = a.ownerDocument.createRange(), bRange = b.ownerDocument.createRange();
+		aRange.setStart(a, 0);
+		aRange.setEnd(a, 0);
+		bRange.setStart(b, 0);
+		bRange.setEnd(b, 0);
+		var ret = aRange.compareBoundaryPoints(Range.START_TO_END, bRange);
+		if ( ret === 0 ) {
+			hasDuplicate = true;
+		}
+		return ret;
+	};
+}
+
+// Utility function for retreiving the text value of an array of DOM nodes
+Sizzle.getText = function( elems ) {
+	var ret = "", elem;
+
+	for ( var i = 0; elems[i]; i++ ) {
+		elem = elems[i];
+
+		// Get the text from text nodes and CDATA nodes
+		if ( elem.nodeType === 3 || elem.nodeType === 4 ) {
+			ret += elem.nodeValue;
+
+		// Traverse everything else, except comment nodes
+		} else if ( elem.nodeType !== 8 ) {
+			ret += Sizzle.getText( elem.childNodes );
+		}
+	}
+
+	return ret;
+};
+
+// Check to see if the browser returns elements by name when
+// querying by getElementById (and provide a workaround)
+(function(){
+	// We're going to inject a fake input element with a specified name
+	var form = document.createElement("div"),
+		id = "script" + (new Date()).getTime();
+	form.innerHTML = "<a name='" + id + "'/>";
+
+	// Inject it into the root element, check its status, and remove it quickly
+	var root = document.documentElement;
+	root.insertBefore( form, root.firstChild );
+
+	// 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, isXML){
+			if ( typeof context.getElementById !== "undefined" && !isXML ) {
+				var m = context.getElementById(match[1]);
+				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 = typeof elem.getAttributeNode !== "undefined" && elem.getAttributeNode("id");
+			return elem.nodeType === 1 && node && node.nodeValue === match;
+		};
+	}
+
+	root.removeChild( form );
+	root = form = null; // release memory in IE
+})();
+
+(function(){
+	// Check to see if the browser returns only elements
+	// when doing getElementsByTagName("*")
+
+	// Create a fake element
+	var div = document.createElement("div");
+	div.appendChild( document.createComment("") );
+
+	// Make sure no comments are found
+	if ( div.getElementsByTagName("*").length > 0 ) {
+		Expr.find.TAG = function(match, context){
+			var results = context.getElementsByTagName(match[1]);
+
+			// Filter out possible comments
+			if ( match[1] === "*" ) {
+				var tmp = [];
+
+				for ( var i = 0; results[i]; i++ ) {
+					if ( results[i].nodeType === 1 ) {
+						tmp.push( results[i] );
+					}
+				}
+
+				results = tmp;
+			}
+
+			return results;
+		};
+	}
+
+	// Check to see if an attribute returns normalized href attributes
+	div.innerHTML = "<a href='#'></a>";
+	if ( div.firstChild && typeof div.firstChild.getAttribute !== "undefined" &&
+			div.firstChild.getAttribute("href") !== "#" ) {
+		Expr.attrHandle.href = function(elem){
+			return elem.getAttribute("href", 2);
+		};
+	}
+
+	div = null; // release memory in IE
+})();
+
+if ( document.querySelectorAll ) {
+	(function(){
+		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;
+
+			// Only use querySelectorAll on non-XML documents
+			// (ID selectors don't work in non-HTML documents)
+			if ( !seed && context.nodeType === 9 && !Sizzle.isXML(context) ) {
+				try {
+					return makeArray( context.querySelectorAll(query), extra );
+				} catch(e){}
+			}
+		
+			return oldSizzle(query, context, extra, seed);
+		};
+
+		for ( var prop in oldSizzle ) {
+			Sizzle[ prop ] = oldSizzle[ prop ];
+		}
+
+		div = null; // release memory in IE
+	})();
+}
+
+(function(){
+	var div = document.createElement("div");
+
+	div.innerHTML = "<div class='test e'></div><div class='test'></div>";
+
+	// Opera can't find a second classname (in 9.6)
+	// Also, make sure that getElementsByClassName actually exists
+	if ( !div.getElementsByClassName || div.getElementsByClassName("e").length === 0 ) {
+		return;
+	}
+
+	// Safari caches class attributes, doesn't catch changes (in 3.2)
+	div.lastChild.className = "e";
+
+	if ( div.getElementsByClassName("e").length === 1 ) {
+		return;
+	}
+	
+	Expr.order.splice(1, 0, "CLASS");
+	Expr.find.CLASS = function(match, context, isXML) {
+		if ( typeof context.getElementsByClassName !== "undefined" && !isXML ) {
+			return context.getElementsByClassName(match[1]);
+		}
+	};
+
+	div = null; // release memory in IE
+})();
+
+function dirNodeCheck( dir, cur, doneName, checkSet, nodeCheck, isXML ) {
+	for ( var i = 0, l = checkSet.length; i < l; i++ ) {
+		var elem = checkSet[i];
+		if ( elem ) {
+			elem = elem[dir];
+			var match = false;
+
+			while ( elem ) {
+				if ( elem.sizcache === doneName ) {
+					match = checkSet[elem.sizset];
+					break;
+				}
+
+				if ( elem.nodeType === 1 && !isXML ){
+					elem.sizcache = doneName;
+					elem.sizset = i;
+				}
+
+				if ( elem.nodeName.toLowerCase() === cur ) {
+					match = elem;
+					break;
+				}
+
+				elem = elem[dir];
+			}
+
+			checkSet[i] = match;
+		}
+	}
+}
+
+function dirCheck( dir, cur, doneName, checkSet, nodeCheck, isXML ) {
+	for ( var i = 0, l = checkSet.length; i < l; i++ ) {
+		var elem = checkSet[i];
+		if ( elem ) {
+			elem = elem[dir];
+			var match = false;
+
+			while ( elem ) {
+				if ( elem.sizcache === doneName ) {
+					match = checkSet[elem.sizset];
+					break;
+				}
+
+				if ( elem.nodeType === 1 ) {
+					if ( !isXML ) {
+						elem.sizcache = doneName;
+						elem.sizset = i;
+					}
+					if ( typeof cur !== "string" ) {
+						if ( elem === cur ) {
+							match = true;
+							break;
+						}
+
+					} else if ( Sizzle.filter( cur, [elem] ).length > 0 ) {
+						match = elem;
+						break;
+					}
+				}
+
+				elem = elem[dir];
+			}
+
+			checkSet[i] = match;
+		}
+	}
+}
+
+Sizzle.contains = document.compareDocumentPosition ? function(a, b){
+	return !!(a.compareDocumentPosition(b) & 16);
+} : function(a, b){
+	return a !== b && (a.contains ? a.contains(b) : true);
+};
+
+Sizzle.isXML = function(elem){
+	// documentElement is verified for cases where it doesn't yet exist
+	// (such as loading iframes in IE - #4833) 
+	var documentElement = (elem ? elem.ownerDocument || elem : 0).documentElement;
+	return documentElement ? documentElement.nodeName !== "HTML" : false;
+};
+
+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
+
+window.tinymce.dom.Sizzle = Sizzle;
+
+})();
+
+
 (function(tinymce) {
 	// Shorten names
 	var each = tinymce.each, DOM = tinymce.DOM, isIE = tinymce.isIE, isWebKit = tinymce.isWebKit, Event;
@@ -4039,7 +7000,7 @@ tinymce.create('static tinymce.util.XHR', {
 							return;
 
 						try {
-							// If IE is used, use the trick by Diego Perini
+							// If IE is used, use the trick by Diego Perini licensed under MIT by request to the author.
 							// http://javascript.nwbox.com/IEContentLoaded/
 							doc.documentElement.doScroll("left");
 						} catch (ex) {
@@ -4062,7 +7023,7 @@ tinymce.create('static tinymce.util.XHR', {
 		},
 
 		_stoppers : {
-			preventDefault :  function() {
+			preventDefault : function() {
 				this.returnValue = false;
 			},
 
@@ -4210,8 +7171,11 @@ tinymce.create('static tinymce.util.XHR', {
 			// Add events
 			each([
 				'onBeforeSetContent',
+
 				'onBeforeGetContent',
+
 				'onSetContent',
+
 				'onGetContent'
 			], function(e) {
 				t[e] = new tinymce.util.Dispatcher(t);
@@ -4221,6 +7185,9 @@ tinymce.create('static tinymce.util.XHR', {
 			if (!t.win.getSelection)
 				t.tridentSel = new tinymce.dom.TridentSelection(t);
 
+			if (tinymce.isIE && dom.boxModel)
+				this._fixIESelection();
+
 			// Prevent leaks
 			tinymce.addUnload(t.destroy, t);
 		},
@@ -4232,6 +7199,7 @@ tinymce.create('static tinymce.util.XHR', {
 			wb = wa = '';
 			s.get = true;
 			s.format = s.format || 'html';
+			s.forced_root_block = '';
 			t.onBeforeGetContent.dispatch(t, s);
 
 			if (s.format == 'text')
@@ -4262,57 +7230,79 @@ tinymce.create('static tinymce.util.XHR', {
 			return s.content;
 		},
 
-		setContent : function(h, s) {
-			var t = this, r = t.getRng(), c, d = t.win.document;
+		setContent : function(content, args) {
+			var self = this, rng = self.getRng(), caretNode, doc = self.win.document, frag, temp;
 
-			s = s || {format : 'html'};
-			s.set = true;
-			h = s.content = t.dom.processHTML(h);
+			args = args || {format : 'html'};
+			args.set = true;
+			content = args.content = content;
 
 			// Dispatch before set content event
-			t.onBeforeSetContent.dispatch(t, s);
-			h = s.content;
+			if (!args.no_events)
+				self.onBeforeSetContent.dispatch(self, args);
 
-			if (r.insertNode) {
+			content = args.content;
+
+			if (rng.insertNode) {
 				// Make caret marker since insertNode places the caret in the beginning of text after insert
-				h += '<span id="__caret">_</span>';
+				content += '<span id="__caret">_</span>';
 
 				// Delete and insert new node
-				
-				if (r.startContainer == d && r.endContainer ==  d) {
+				if (rng.startContainer == doc && rng.endContainer == doc) {
 					// WebKit will fail if the body is empty since the range is then invalid and it can't insert contents
-					d.body.innerHTML = h;
+					doc.body.innerHTML = content;
 				} else {
-					r.deleteContents();
-					if (d.body.childNodes.length == 0) {
-						d.body.innerHTML = h;
+					rng.deleteContents();
+
+					if (doc.body.childNodes.length == 0) {
+						doc.body.innerHTML = content;
 					} else {
-						r.insertNode(r.createContextualFragment(h));
+						// createContextualFragment doesn't exists in IE 9 DOMRanges
+						if (rng.createContextualFragment) {
+							rng.insertNode(rng.createContextualFragment(content));
+						} else {
+							// Fake createContextualFragment call in IE 9
+							frag = doc.createDocumentFragment();
+							temp = doc.createElement('div');
+
+							frag.appendChild(temp);
+							temp.outerHTML = content;
+
+							rng.insertNode(frag);
+						}
 					}
 				}
 
 				// Move to caret marker
-				c = t.dom.get('__caret');
+				caretNode = self.dom.get('__caret');
+
 				// Make sure we wrap it compleatly, Opera fails with a simple select call
-				r = d.createRange();
-				r.setStartBefore(c);
-				r.setEndBefore(c);
-				t.setRng(r);
+				rng = doc.createRange();
+				rng.setStartBefore(caretNode);
+				rng.setEndBefore(caretNode);
+				self.setRng(rng);
 
 				// Remove the caret position
-				t.dom.remove('__caret');
+				self.dom.remove('__caret');
+
+				try {
+					self.setRng(rng);
+				} catch (ex) {
+					// Might fail on Opera for some odd reason
+				}
 			} else {
-				if (r.item) {
+				if (rng.item) {
 					// Delete content and get caret text selection
-					d.execCommand('Delete', false, null);
-					r = t.getRng();
+					doc.execCommand('Delete', false, null);
+					rng = self.getRng();
 				}
 
-				r.pasteHTML(h);
+				rng.pasteHTML(content);
 			}
 
 			// Dispatch set content event
-			t.onSetContent.dispatch(t, s);
+			if (!args.no_events)
+				self.onSetContent.dispatch(self, args);
 		},
 
 		getStart : function() {
@@ -4338,10 +7328,6 @@ tinymce.create('static tinymce.util.XHR', {
 					}
 				}
 
-				// If start element is body element try to move to the first child if it exists
-				if (startElement && startElement.nodeName == 'BODY')
-					return startElement.firstChild || startElement;
-
 				return startElement;
 			} else {
 				startElement = rng.startContainer;
@@ -4439,6 +7425,9 @@ tinymce.create('static tinymce.util.XHR', {
 					return bookmark;
 				};
 
+				if (t.tridentSel)
+					return t.tridentSel.getBookmark(type);
+
 				return getLocation();
 			}
 
@@ -4457,14 +7446,25 @@ tinymce.create('static tinymce.util.XHR', {
 				if (!rng.item) {
 					rng2 = rng.duplicate();
 
-					// Insert start marker
-					rng.collapse();
-					rng.pasteHTML('<span _mce_type="bookmark" id="' + id + '_start" style="' + styles + '">' + chr + '</span>');
+					try {
+						// Insert start marker
+						rng.collapse();
+						rng.pasteHTML('<span data-mce-type="bookmark" id="' + id + '_start" style="' + styles + '">' + chr + '</span>');
 
-					// Insert end marker
-					if (!collapsed) {
-						rng2.collapse(false);
-						rng2.pasteHTML('<span _mce_type="bookmark" id="' + id + '_end" style="' + styles + '">' + chr + '</span>');
+						// Insert end marker
+						if (!collapsed) {
+							rng2.collapse(false);
+
+							// Detect the empty space after block elements in IE and move the end back one character <p></p>] becomes <p>]</p>
+							rng.moveToElementText(rng2.parentElement());
+							if (rng.compareEndPoints('StartToEnd', rng2) == 0)
+								rng2.move('character', -1);
+
+							rng2.pasteHTML('<span data-mce-type="bookmark" id="' + id + '_end" style="' + styles + '">' + chr + '</span>');
+						}
+					} catch (ex) {
+						// IE might throw unspecified error so lets ignore it
+						return null;
 					}
 				} else {
 					// Control selection
@@ -4485,11 +7485,11 @@ tinymce.create('static tinymce.util.XHR', {
 				// Insert end marker
 				if (!collapsed) {
 					rng2.collapse(false);
-					rng2.insertNode(dom.create('span', {_mce_type : "bookmark", id : id + '_end', style : styles}, chr));
+					rng2.insertNode(dom.create('span', {'data-mce-type' : "bookmark", id : id + '_end', style : styles}, chr));
 				}
 
 				rng.collapse(true);
-				rng.insertNode(dom.create('span', {_mce_type : "bookmark", id : id + '_start', style : styles}, chr));
+				rng.insertNode(dom.create('span', {'data-mce-type' : "bookmark", id : id + '_start', style : styles}, chr));
 			}
 
 			t.moveToBookmark({id : id, keep : 1});
@@ -4500,10 +7500,6 @@ tinymce.create('static tinymce.util.XHR', {
 		moveToBookmark : function(bookmark) {
 			var t = this, dom = t.dom, marker1, marker2, rng, root, startContainer, endContainer, startOffset, endOffset;
 
-			// Clear selection cache
-			if (t.tridentSel)
-				t.tridentSel.destroy();
-
 			if (bookmark) {
 				if (bookmark.start) {
 					rng = dom.createRng();
@@ -4513,26 +7509,42 @@ tinymce.create('static tinymce.util.XHR', {
 						var point = bookmark[start ? 'start' : 'end'], i, node, offset, children;
 
 						if (point) {
+							offset = point[0];
+
 							// Find container node
 							for (node = root, i = point.length - 1; i >= 1; i--) {
 								children = node.childNodes;
 
-								if (children.length)
-									node = children[point[i]];
+								if (point[i] > children.length - 1)
+									return;
+
+								node = children[point[i]];
 							}
 
+							// Move text offset to best suitable location
+							if (node.nodeType === 3)
+								offset = Math.min(point[0], node.nodeValue.length);
+
+							// Move element offset to best suitable location
+							if (node.nodeType === 1)
+								offset = Math.min(point[0], node.childNodes.length);
+
 							// Set offset within container node
 							if (start)
-								rng.setStart(node, point[0]);
+								rng.setStart(node, offset);
 							else
-								rng.setEnd(node, point[0]);
+								rng.setEnd(node, offset);
 						}
+
+						return true;
 					};
 
-					setEndPoint(true);
-					setEndPoint();
+					if (t.tridentSel)
+						return t.tridentSel.moveToBookmark(bookmark);
 
-					t.setRng(rng);
+					if (setEndPoint(true) && setEndPoint()) {
+						t.setRng(rng);
+					}
 				} else if (bookmark.id) {
 					function restoreEndPoint(suffix) {
 						var marker = dom.get(bookmark.id + '_' + suffix), node, idx, next, prev, keep = bookmark.keep;
@@ -4577,8 +7589,9 @@ tinymce.create('static tinymce.util.XHR', {
 								while (marker = dom.get(bookmark.id + '_' + suffix))
 									dom.remove(marker, 1);
 
-								// If siblings are text nodes then merge them
-								if (prev && next && prev.nodeType == next.nodeType && prev.nodeType == 3) {
+								// If siblings are text nodes then merge them unless it's Opera since it some how removes the node
+								// and we are sniffing since adding a lot of detection code for a browser with 3% of the market isn't worth the effort. Sorry, Opera but it's just a fact
+								if (prev && next && prev.nodeType == next.nodeType && prev.nodeType == 3 && !tinymce.isOpera) {
 									idx = prev.nodeValue.length;
 									prev.appendData(next.nodeValue);
 									dom.remove(next);
@@ -4596,10 +7609,9 @@ tinymce.create('static tinymce.util.XHR', {
 					};
 
 					function addBogus(node) {
-						// Adds a bogus BR element for empty block elements
-						// on non IE browsers just to have a place to put the caret
-						if (!isIE && dom.isBlock(node) && !node.innerHTML)
-							node.innerHTML = '<br _mce_bogus="1" />';
+						// Adds a bogus BR element for empty block elements or just a space on IE since it renders BR elements incorrectly
+						if (dom.isBlock(node) && !node.innerHTML)
+							node.innerHTML = !isIE ? '<br data-mce-bogus="1" />' : ' ';
 
 						return node;
 					};
@@ -4608,10 +7620,12 @@ tinymce.create('static tinymce.util.XHR', {
 					restoreEndPoint('start');
 					restoreEndPoint('end');
 
-					rng = dom.createRng();
-					rng.setStart(addBogus(startContainer), startOffset);
-					rng.setEnd(addBogus(endContainer), endOffset);
-					t.setRng(rng);
+					if (startContainer) {
+						rng = dom.createRng();
+						rng.setStart(addBogus(startContainer), startOffset);
+						rng.setEnd(addBogus(endContainer), endOffset);
+						t.setRng(rng);
+					}
 				} else if (bookmark.name) {
 					t.select(dom.select(bookmark.name)[bookmark.index]);
 				} else if (bookmark.rng)
@@ -4622,44 +7636,46 @@ tinymce.create('static tinymce.util.XHR', {
 		select : function(node, content) {
 			var t = this, dom = t.dom, rng = dom.createRng(), idx;
 
-			idx = dom.nodeIndex(node);
-			rng.setStart(node.parentNode, idx);
-			rng.setEnd(node.parentNode, idx + 1);
+			if (node) {
+				idx = dom.nodeIndex(node);
+				rng.setStart(node.parentNode, idx);
+				rng.setEnd(node.parentNode, idx + 1);
 
-			// Find first/last text node or BR element
-			if (content) {
-				function setPoint(node, start) {
-					var walker = new tinymce.dom.TreeWalker(node, node);
+				// Find first/last text node or BR element
+				if (content) {
+					function setPoint(node, start) {
+						var walker = new tinymce.dom.TreeWalker(node, node);
 
-					do {
-						// Text node
-						if (node.nodeType == 3 && tinymce.trim(node.nodeValue).length != 0) {
-							if (start)
-								rng.setStart(node, 0);
-							else
-								rng.setEnd(node, node.nodeValue.length);
+						do {
+							// Text node
+							if (node.nodeType == 3 && tinymce.trim(node.nodeValue).length != 0) {
+								if (start)
+									rng.setStart(node, 0);
+								else
+									rng.setEnd(node, node.nodeValue.length);
 
-							return;
-						}
+								return;
+							}
 
-						// BR element
-						if (node.nodeName == 'BR') {
-							if (start)
-								rng.setStartBefore(node);
-							else
-								rng.setEndBefore(node);
+							// BR element
+							if (node.nodeName == 'BR') {
+								if (start)
+									rng.setStartBefore(node);
+								else
+									rng.setEndBefore(node);
 
-							return;
-						}
-					} while (node = (start ? walker.next() : walker.prev()));
-				};
+								return;
+							}
+						} while (node = (start ? walker.next() : walker.prev()));
+					};
 
-				setPoint(node, 1);
-				setPoint(node);
+					setPoint(node, 1);
+					setPoint(node);
+				}
+
+				t.setRng(rng);
 			}
 
-			t.setRng(rng);
-
 			return node;
 		},
 
@@ -4675,18 +7691,18 @@ tinymce.create('static tinymce.util.XHR', {
 			return !s || r.collapsed;
 		},
 
-		collapse : function(b) {
-			var t = this, r = t.getRng(), n;
+		collapse : function(to_start) {
+			var self = this, rng = self.getRng(), node;
 
 			// Control range on IE
-			if (r.item) {
-				n = r.item(0);
-				r = this.win.document.body.createTextRange();
-				r.moveToElementText(n);
+			if (rng.item) {
+				node = rng.item(0);
+				rng = self.win.document.body.createTextRange();
+				rng.moveToElementText(node);
 			}
 
-			r.collapse(!!b);
-			t.setRng(r);
+			rng.collapse(!!to_start);
+			self.setRng(rng);
 		},
 
 		getSel : function() {
@@ -4696,7 +7712,7 @@ tinymce.create('static tinymce.util.XHR', {
 		},
 
 		getRng : function(w3c) {
-			var t = this, s, r;
+			var t = this, s, r, elm, doc = t.win.document;
 
 			// Found tridentSel object then we need to use that one
 			if (w3c && t.tridentSel)
@@ -4704,16 +7720,24 @@ tinymce.create('static tinymce.util.XHR', {
 
 			try {
 				if (s = t.getSel())
-					r = s.rangeCount > 0 ? s.getRangeAt(0) : (s.createRange ? s.createRange() : t.win.document.createRange());
+					r = s.rangeCount > 0 ? s.getRangeAt(0) : (s.createRange ? s.createRange() : doc.createRange());
 			} catch (ex) {
 				// IE throws unspecified error here if TinyMCE is placed in a frame/iframe
 			}
 
+			// We have W3C ranges and it's IE then fake control selection since IE9 doesn't handle that correctly yet
+			if (tinymce.isIE && r && r.setStart && doc.selection.createRange().item) {
+				elm = doc.selection.createRange().item(0);
+				r = doc.createRange();
+				r.setStartBefore(elm);
+				r.setEndAfter(elm);
+			}
+
 			// No range found then create an empty one
 			// This can occur when the editor is placed in a hidden container element on Gecko
 			// Or on IE when there was an exception
 			if (!r)
-				r = t.win.document.createRange ? t.win.document.createRange() : t.win.document.body.createTextRange();
+				r = doc.createRange ? doc.createRange() : doc.body.createTextRange();
 
 			if (t.selectedRange && t.explicitRange) {
 				if (r.compareBoundaryPoints(r.START_TO_START, t.selectedRange) === 0 && r.compareBoundaryPoints(r.END_TO_END, t.selectedRange) === 0) {
@@ -4725,6 +7749,7 @@ tinymce.create('static tinymce.util.XHR', {
 					t.explicitRange = null;
 				}
 			}
+
 			return r;
 		},
 
@@ -4736,7 +7761,13 @@ tinymce.create('static tinymce.util.XHR', {
 
 				if (s) {
 					t.explicitRange = r;
-					s.removeAllRanges();
+
+					try {
+						s.removeAllRanges();
+					} catch (ex) {
+						// IE9 might throw errors here don't know why
+					}
+
 					s.addRange(r);
 					t.selectedRange = s.getRangeAt(0);
 				}
@@ -4765,27 +7796,52 @@ tinymce.create('static tinymce.util.XHR', {
 		},
 
 		getNode : function() {
-			var t = this, rng = t.getRng(), sel = t.getSel(), elm;
+			var t = this, rng = t.getRng(), sel = t.getSel(), elm, start = rng.startContainer, end = rng.endContainer;
+
+			// Range maybe lost after the editor is made visible again
+			if (!rng)
+				return t.dom.getRoot();
 
 			if (rng.setStart) {
-				// Range maybe lost after the editor is made visible again
-				if (!rng)
-					return t.dom.getRoot();
-
 				elm = rng.commonAncestorContainer;
 
 				// Handle selection a image or other control like element such as anchors
 				if (!rng.collapsed) {
 					if (rng.startContainer == rng.endContainer) {
-						if (rng.startOffset - rng.endOffset < 2) {
+						if (rng.endOffset - rng.startOffset < 2) {
 							if (rng.startContainer.hasChildNodes())
 								elm = rng.startContainer.childNodes[rng.startOffset];
 						}
 					}
 
 					// If the anchor node is a element instead of a text node then return this element
-					if (tinymce.isWebKit && sel.anchorNode && sel.anchorNode.nodeType == 1) 
-						return sel.anchorNode.childNodes[sel.anchorOffset]; 
+					//if (tinymce.isWebKit && sel.anchorNode && sel.anchorNode.nodeType == 1) 
+					//	return sel.anchorNode.childNodes[sel.anchorOffset];
+
+					// Handle cases where the selection is immediately wrapped around a node and return that node instead of it's parent.
+					// This happens when you double click an underlined word in FireFox.
+					if (start.nodeType === 3 && end.nodeType === 3) {
+						function skipEmptyTextNodes(n, forwards) {
+							var orig = n;
+							while (n && n.nodeType === 3 && n.length === 0) {
+								n = forwards ? n.nextSibling : n.previousSibling;
+							}
+							return n || orig;
+						}
+						if (start.length === rng.startOffset) {
+							start = skipEmptyTextNodes(start.nextSibling, true);
+						} else {
+							start = start.parentNode;
+						}
+						if (rng.endOffset === 0) {
+							end = skipEmptyTextNodes(end.previousSibling, false);
+						} else {
+							end = end.parentNode;
+						}
+
+						if (start && start === end)
+							return start;
+					}
 				}
 
 				if (elm && elm.nodeType == 3)
@@ -4826,1110 +7882,347 @@ tinymce.create('static tinymce.util.XHR', {
 
 			t.win = null;
 
-			if (t.tridentSel)
-				t.tridentSel.destroy();
-
 			// Manual destroy then remove unload handler
 			if (!s)
 				tinymce.removeUnload(t.destroy);
-		}
-	});
-})(tinymce);
+		},
 
-(function(tinymce) {
-	tinymce.create('tinymce.dom.XMLWriter', {
-		node : null,
+		// IE has an issue where you can't select/move the caret by clicking outside the body if the document is in standards mode
+		_fixIESelection : function() {
+			var dom = this.dom, doc = dom.doc, body = doc.body, started, startRng, htmlElm;
 
-		XMLWriter : function(s) {
-			// Get XML document
-			function getXML() {
-				var i = document.implementation;
+			// Make HTML element unselectable since we are going to handle selection by hand
+			doc.documentElement.unselectable = true;
 
-				if (!i || !i.createDocument) {
-					// Try IE objects
-					try {return new ActiveXObject('MSXML2.DOMDocument');} catch (ex) {}
-					try {return new ActiveXObject('Microsoft.XmlDom');} catch (ex) {}
+			// Return range from point or null if it failed
+			function rngFromPoint(x, y) {
+				var rng = body.createTextRange();
+
+				try {
+					rng.moveToPoint(x, y);
+				} catch (ex) {
+					// IE sometimes throws and exception, so lets just ignore it
+					rng = null;
+				}
+
+				return rng;
+			};
+
+			// Fires while the selection is changing
+			function selectionChange(e) {
+				var pointRng;
+
+				// Check if the button is down or not
+				if (e.button) {
+					// Create range from mouse position
+					pointRng = rngFromPoint(e.x, e.y);
+
+					if (pointRng) {
+						// Check if pointRange is before/after selection then change the endPoint
+						if (pointRng.compareEndPoints('StartToStart', startRng) > 0)
+							pointRng.setEndPoint('StartToStart', startRng);
+						else
+							pointRng.setEndPoint('EndToEnd', startRng);
+
+						pointRng.select();
+					}
 				} else
-					return i.createDocument('', '', null);
+					endSelection();
+			}
+
+			// Removes listeners
+			function endSelection() {
+				var rng = doc.selection.createRange();
+
+				// If the range is collapsed then use the last start range
+				if (startRng && !rng.item && rng.compareEndPoints('StartToEnd', rng) === 0)
+					startRng.select();
+
+				dom.unbind(doc, 'mouseup', endSelection);
+				dom.unbind(doc, 'mousemove', selectionChange);
+				startRng = started = 0;
 			};
 
-			this.doc = getXML();
-			
-			// Since Opera and WebKit doesn't escape > into &gt; we need to do it our self to normalize the output for all browsers
-			this.valid = tinymce.isOpera || tinymce.isWebKit;
+			// Detect when user selects outside BODY
+			dom.bind(doc, ['mousedown', 'contextmenu'], function(e) {
+				if (e.target.nodeName === 'HTML') {
+					if (started)
+						endSelection();
 
-			this.reset();
-		},
+					// Detect vertical scrollbar, since IE will fire a mousedown on the scrollbar and have target set as HTML
+					htmlElm = doc.documentElement;
+					if (htmlElm.scrollHeight > htmlElm.clientHeight)
+						return;
 
-		reset : function() {
-			var t = this, d = t.doc;
+					started = 1;
+					// Setup start position
+					startRng = rngFromPoint(e.x, e.y);
+					if (startRng) {
+						// Listen for selection change events
+						dom.bind(doc, 'mouseup', endSelection);
+						dom.bind(doc, 'mousemove', selectionChange);
 
-			if (d.firstChild)
-				d.removeChild(d.firstChild);
-
-			t.node = d.appendChild(d.createElement("html"));
-		},
-
-		writeStartElement : function(n) {
-			var t = this;
-
-			t.node = t.node.appendChild(t.doc.createElement(n));
-		},
-
-		writeAttribute : function(n, v) {
-			if (this.valid)
-				v = v.replace(/>/g, '%MCGT%');
-
-			this.node.setAttribute(n, v);
-		},
-
-		writeEndElement : function() {
-			this.node = this.node.parentNode;
-		},
-
-		writeFullEndElement : function() {
-			var t = this, n = t.node;
-
-			n.appendChild(t.doc.createTextNode(""));
-			t.node = n.parentNode;
-		},
-
-		writeText : function(v) {
-			if (this.valid)
-				v = v.replace(/>/g, '%MCGT%');
-
-			this.node.appendChild(this.doc.createTextNode(v));
-		},
-
-		writeCDATA : function(v) {
-			this.node.appendChild(this.doc.createCDATASection(v));
-		},
-
-		writeComment : function(v) {
-			// Fix for bug #2035694
-			if (tinymce.isIE)
-				v = v.replace(/^\-|\-$/g, ' ');
-
-			this.node.appendChild(this.doc.createComment(v.replace(/\-\-/g, ' ')));
-		},
-
-		getContent : function() {
-			var h;
-
-			h = this.doc.xml || new XMLSerializer().serializeToString(this.doc);
-			h = h.replace(/<\?[^?]+\?>|<html>|<\/html>|<html\/>|<!DOCTYPE[^>]+>/g, '');
-			h = h.replace(/ ?\/>/g, ' />');
-
-			if (this.valid)
-				h = h.replace(/\%MCGT%/g, '&gt;');
-
-			return h;
+						dom.win.focus();
+						startRng.select();
+					}
+				}
+			});
 		}
 	});
 })(tinymce);
 
 (function(tinymce) {
-	tinymce.create('tinymce.dom.StringWriter', {
-		str : null,
-		tags : null,
-		count : 0,
-		settings : null,
-		indent : null,
+	tinymce.dom.Serializer = function(settings, dom, schema) {
+		var onPreProcess, onPostProcess, isIE = tinymce.isIE, each = tinymce.each, htmlParser;
 
-		StringWriter : function(s) {
-			this.settings = tinymce.extend({
-				indent_char : ' ',
-				indentation : 0
-			}, s);
+		// Support the old apply_source_formatting option
+		if (!settings.apply_source_formatting)
+			settings.indent = false;
 
-			this.reset();
-		},
+		settings.remove_trailing_brs = true;
 
-		reset : function() {
-			this.indent = '';
-			this.str = "";
-			this.tags = [];
-			this.count = 0;
-		},
+		// Default DOM and Schema if they are undefined
+		dom = dom || tinymce.DOM;
+		schema = schema || new tinymce.html.Schema(settings);
+		settings.entity_encoding = settings.entity_encoding || 'named';
 
-		writeStartElement : function(n) {
-			this._writeAttributesEnd();
-			this.writeRaw('<' + n);
-			this.tags.push(n);
-			this.inAttr = true;
-			this.count++;
-			this.elementCount = this.count;
-		},
+		onPreProcess = new tinymce.util.Dispatcher(self);
 
-		writeAttribute : function(n, v) {
-			var t = this;
+		onPostProcess = new tinymce.util.Dispatcher(self);
 
-			t.writeRaw(" " + t.encode(n) + '="' + t.encode(v) + '"');
-		},
+		htmlParser = new tinymce.html.DomParser(settings, schema);
 
-		writeEndElement : function() {
-			var n;
+		// Convert move data-mce-src, data-mce-href and data-mce-style into nodes or process them if needed
+		htmlParser.addAttributeFilter('src,href,style', function(nodes, name) {
+			var i = nodes.length, node, value, internalName = 'data-mce-' + name, urlConverter = settings.url_converter, urlConverterScope = settings.url_converter_scope, undef;
 
-			if (this.tags.length > 0) {
-				n = this.tags.pop();
+			while (i--) {
+				node = nodes[i];
 
-				if (this._writeAttributesEnd(1))
-					this.writeRaw('</' + n + '>');
+				value = node.attributes.map[internalName];
+				if (value !== undef) {
+					// Set external name to internal value and remove internal
+					node.attr(name, value.length > 0 ? value : null);
+					node.attr(internalName, null);
+				} else {
+					// No internal attribute found then convert the value we have in the DOM
+					value = node.attributes.map[name];
 
-				if (this.settings.indentation > 0)
-					this.writeRaw('\n');
+					if (name === "style")
+						value = dom.serializeStyle(dom.parseStyle(value), node.name);
+					else if (urlConverter)
+						value = urlConverter.call(urlConverterScope, value, name, node.name);
+
+					node.attr(name, value.length > 0 ? value : null);
+				}
 			}
-		},
+		});
 
-		writeFullEndElement : function() {
-			if (this.tags.length > 0) {
-				this._writeAttributesEnd();
-				this.writeRaw('</' + this.tags.pop() + '>');
+		// Remove internal classes mceItem<..>
+		htmlParser.addAttributeFilter('class', function(nodes, name) {
+			var i = nodes.length, node, value;
 
-				if (this.settings.indentation > 0)
-					this.writeRaw('\n');
+			while (i--) {
+				node = nodes[i];
+				value = node.attr('class').replace(/\s*mce(Item\w+|Selected)\s*/g, '');
+				node.attr('class', value.length > 0 ? value : null);
 			}
-		},
+		});
 
-		writeText : function(v) {
-			this._writeAttributesEnd();
-			this.writeRaw(this.encode(v));
-			this.count++;
-		},
+		// Remove bookmark elements
+		htmlParser.addAttributeFilter('data-mce-type', function(nodes, name, args) {
+			var i = nodes.length, node;
 
-		writeCDATA : function(v) {
-			this._writeAttributesEnd();
-			this.writeRaw('<![CDATA[' + v + ']]>');
-			this.count++;
-		},
+			while (i--) {
+				node = nodes[i];
 
-		writeComment : function(v) {
-			this._writeAttributesEnd();
-			this.writeRaw('<!-- ' + v + '-->');
-			this.count++;
-		},
+				if (node.attributes.map['data-mce-type'] === 'bookmark' && !args.cleanup)
+					node.remove();
+			}
+		});
 
-		writeRaw : function(v) {
-			this.str += v;
-		},
+		// Force script into CDATA sections and remove the mce- prefix also add comments around styles
+		htmlParser.addNodeFilter('script,style', function(nodes, name) {
+			var i = nodes.length, node, value;
 
-		encode : function(s) {
-			return s.replace(/[<>&"]/g, function(v) {
-				switch (v) {
-					case '<':
-						return '&lt;';
+			function trim(value) {
+				return value.replace(/(<!--\[CDATA\[|\]\]-->)/g, '\n')
+						.replace(/^[\r\n]*|[\r\n]*$/g, '')
+						.replace(/^\s*(\/\/\s*<!--|\/\/\s*<!\[CDATA\[|<!--|<!\[CDATA\[)[\r\n]*/g, '')
+						.replace(/\s*(\/\/\s*\]\]>|\/\/\s*-->|\]\]>|-->|\]\]-->)\s*$/g, '');
+			};
 
-					case '>':
-						return '&gt;';
+			while (i--) {
+				node = nodes[i];
+				value = node.firstChild ? node.firstChild.value : '';
 
-					case '&':
-						return '&amp;';
+				if (name === "script") {
+					// Remove mce- prefix from script elements
+					node.attr('type', (node.attr('type') || 'text/javascript').replace(/^mce\-/, ''));
 
-					case '"':
-						return '&quot;';
+					if (value.length > 0)
+						node.firstChild.value = '// <![CDATA[\n' + trim(value) + '\n// ]]>';
+				} else {
+					if (value.length > 0)
+						node.firstChild.value = '<!--\n' + trim(value) + '\n-->';
+				}
+			}
+		});
+
+		// Convert comments to cdata and handle protected comments
+		htmlParser.addNodeFilter('#comment', function(nodes, name) {
+			var i = nodes.length, node;
+
+			while (i--) {
+				node = nodes[i];
+
+				if (node.value.indexOf('[CDATA[') === 0) {
+					node.name = '#cdata';
+					node.type = 4;
+					node.value = node.value.replace(/^\[CDATA\[|\]\]$/g, '');
+				} else if (node.value.indexOf('mce:protected ') === 0) {
+					node.name = "#text";
+					node.type = 3;
+					node.raw = true;
+					node.value = unescape(node.value).substr(14);
+				}
+			}
+		});
+
+		htmlParser.addNodeFilter('xml:namespace,input', function(nodes, name) {
+			var i = nodes.length, node;
+
+			while (i--) {
+				node = nodes[i];
+				if (node.type === 7)
+					node.remove();
+				else if (node.type === 1) {
+					if (name === "input" && !("type" in node.attributes.map))
+						node.attr('type', 'text');
+				}
+			}
+		});
+
+		// Fix list elements, TODO: Replace this later
+		if (settings.fix_list_elements) {
+			htmlParser.addNodeFilter('ul,ol', function(nodes, name) {
+				var i = nodes.length, node, parentNode;
+
+				while (i--) {
+					node = nodes[i];
+					parentNode = node.parent;
+
+					if (parentNode.name === 'ul' || parentNode.name === 'ol') {
+						if (node.prev && node.prev.name === 'li') {
+							node.prev.append(node);
+						}
+					}
+				}
+			});
+		}
+
+		// Remove internal data attributes
+		htmlParser.addAttributeFilter('data-mce-src,data-mce-href,data-mce-style', function(nodes, name) {
+			var i = nodes.length;
+
+			while (i--) {
+				nodes[i].attr(name, null);
+			}
+		});
+
+		// Return public methods
+		return {
+			schema : schema,
+
+			addNodeFilter : htmlParser.addNodeFilter,
+
+			addAttributeFilter : htmlParser.addAttributeFilter,
+
+			onPreProcess : onPreProcess,
+
+			onPostProcess : onPostProcess,
+
+			serialize : function(node, args) {
+				var impl, doc, oldDoc, htmlSerializer, content;
+
+				// Explorer won't clone contents of script and style and the
+				// selected index of select elements are cleared on a clone operation.
+				if (isIE && dom.select('script,style,select').length > 0) {
+					content = node.innerHTML;
+					node = node.cloneNode(false);
+					dom.setHTML(node, content);
+				} else
+					node = node.cloneNode(true);
+
+				// Nodes needs to be attached to something in WebKit/Opera
+				// Older builds of Opera crashes if you attach the node to an document created dynamically
+				// and since we can't feature detect a crash we need to sniff the acutal build number
+				// This fix will make DOM ranges and make Sizzle happy!
+				impl = node.ownerDocument.implementation;
+				if (impl.createHTMLDocument) {
+					// Create an empty HTML document
+					doc = impl.createHTMLDocument("");
+
+					// Add the element or it's children if it's a body element to the new document
+					each(node.nodeName == 'BODY' ? node.childNodes : [node], function(node) {
+						doc.body.appendChild(doc.importNode(node, true));
+					});
+
+					// Grab first child or body element for serialization
+					if (node.nodeName != 'BODY')
+						node = doc.body.firstChild;
+					else
+						node = doc.body;
+
+					// set the new document in DOMUtils so createElement etc works
+					oldDoc = dom.doc;
+					dom.doc = doc;
 				}
 
-				return v;
-			});
-		},
+				args = args || {};
+				args.format = args.format || 'html';
 
-		getContent : function() {
-			return this.str;
-		},
+				// Pre process
+				if (!args.no_events) {
+					args.node = node;
+					onPreProcess.dispatch(self, args);
+				}
 
-		_writeAttributesEnd : function(s) {
-			if (!this.inAttr)
-				return;
+				// Setup serializer
+				htmlSerializer = new tinymce.html.Serializer(settings, schema);
 
-			this.inAttr = false;
+				// Parse and serialize HTML
+				args.content = htmlSerializer.serialize(
+					htmlParser.parse(args.getInner ? node.innerHTML : tinymce.trim(dom.getOuterHTML(node), args), args)
+				);
 
-			if (s && this.elementCount == this.count) {
-				this.writeRaw(' />');
-				return false;
+				// Replace all BOM characters for now until we can find a better solution
+				if (!args.cleanup)
+					args.content = args.content.replace(/\uFEFF/g, '');
+
+				// Post process
+				if (!args.no_events)
+					onPostProcess.dispatch(self, args);
+
+				// Restore the old document if it was changed
+				if (oldDoc)
+					dom.doc = oldDoc;
+
+				args.node = null;
+
+				return args.content;
+			},
+
+			addRules : function(rules) {
+				schema.addValidElements(rules);
+			},
+
+			setRules : function(rules) {
+				schema.setValidElements(rules);
 			}
-
-			this.writeRaw('>');
-
-			return true;
-		}
-	});
-})(tinymce);
-
-(function(tinymce) {
-	// Shorten names
-	var extend = tinymce.extend, each = tinymce.each, Dispatcher = tinymce.util.Dispatcher, isIE = tinymce.isIE, isGecko = tinymce.isGecko;
-
-	function wildcardToRE(s) {
-		return s.replace(/([?+*])/g, '.$1');
+		};
 	};
-
-	tinymce.create('tinymce.dom.Serializer', {
-		Serializer : function(s) {
-			var t = this;
-
-			t.key = 0;
-			t.onPreProcess = new Dispatcher(t);
-			t.onPostProcess = new Dispatcher(t);
-
-			try {
-				t.writer = new tinymce.dom.XMLWriter();
-			} catch (ex) {
-				// IE might throw exception if ActiveX is disabled so we then switch to the slightly slower StringWriter
-				t.writer = new tinymce.dom.StringWriter();
-			}
-
-			// Default settings
-			t.settings = s = extend({
-				dom : tinymce.DOM,
-				valid_nodes : 0,
-				node_filter : 0,
-				attr_filter : 0,
-				invalid_attrs : /^(_mce_|_moz_|sizset|sizcache)/,
-				closed : /^(br|hr|input|meta|img|link|param|area)$/,
-				entity_encoding : 'named',
-				entities : '160,nbsp,161,iexcl,162,cent,163,pound,164,curren,165,yen,166,brvbar,167,sect,168,uml,169,copy,170,ordf,171,laquo,172,not,173,shy,174,reg,175,macr,176,deg,177,plusmn,178,sup2,179,sup3,180,acute,181,micro,182,para,183,middot,184,cedil,185,sup1,186,ordm,187,raquo,188,frac14,189,frac12,190,frac34,191,iquest,192,Agrave,193,Aacute,194,Acirc,195,Atilde,196,Auml,197,Aring,198,AElig,199,Ccedil,200,Egrave,201,Eacute,202,Ecirc,203,Euml,204,Igrave,205,Iacute,206,Icirc,207,Iuml,208,ETH,209,Ntilde,210,Ograve,211,Oacute,212,Ocirc,213,Otilde,214,Ouml,215,times,216,Oslash,217,Ugrave,218,Uacute,219,Ucirc,220,Uuml,221,Yacute,222,THORN,223,szlig,224,agrave,225,aacute,226,acirc,227,atilde,228,auml,229,aring,230,aelig,231,ccedil,232,egrave,233,eacute,234,ecirc,235,euml,236,igrave,237,iacute,238,icirc,239,iuml,240,eth,241,ntilde,242,ograve,243,oacute,244,ocirc,245,otilde,246,ouml,247,divide,248,oslash,249,ugrave,250,uacute,251,ucirc,252,uuml,253,yacute,254,thorn,255,yuml,402,fnof,913,Alpha,914,Beta,915,Gamma,916,Delta,917,Epsilon,918,Zeta,919,Eta,920,Theta,921,Iota,922,Kappa,923,Lambda,924,Mu,925,Nu,926,Xi,927,Omicron,928,Pi,929,Rho,931,Sigma,932,Tau,933,Upsilon,934,Phi,935,Chi,936,Psi,937,Omega,945,alpha,946,beta,947,gamma,948,delta,949,epsilon,950,zeta,951,eta,952,theta,953,iota,954,kappa,955,lambda,956,mu,957,nu,958,xi,959,omicron,960,pi,961,rho,962,sigmaf,963,sigma,964,tau,965,upsilon,966,phi,967,chi,968,psi,969,omega,977,thetasym,978,upsih,982,piv,8226,bull,8230,hellip,8242,prime,8243,Prime,8254,oline,8260,frasl,8472,weierp,8465,image,8476,real,8482,trade,8501,alefsym,8592,larr,8593,uarr,8594,rarr,8595,darr,8596,harr,8629,crarr,8656,lArr,8657,uArr,8658,rArr,8659,dArr,8660,hArr,8704,forall,8706,part,8707,exist,8709,empty,8711,nabla,8712,isin,8713,notin,8715,ni,8719,prod,8721,sum,8722,minus,8727,lowast,8730,radic,8733,prop,8734,infin,8736,ang,8743,and,8744,or,8745,cap,8746,cup,8747,int,8756,there4,8764,sim,8773,cong,8776,asymp,8800,ne,8801,equiv,8804,le,8805,ge,8834,sub,8835,sup,8836,nsub,8838,sube,8839,supe,8853,oplus,8855,otimes,8869,perp,8901,sdot,8968,lceil,8969,rceil,8970,lfloor,8971,rfloor,9001,lang,9002,rang,9674,loz,9824,spades,9827,clubs,9829,hearts,9830,diams,338,OElig,339,oelig,352,Scaron,353,scaron,376,Yuml,710,circ,732,tilde,8194,ensp,8195,emsp,8201,thinsp,8204,zwnj,8205,zwj,8206,lrm,8207,rlm,8211,ndash,8212,mdash,8216,lsquo,8217,rsquo,8218,sbquo,8220,ldquo,8221,rdquo,8222,bdquo,8224,dagger,8225,Dagger,8240,permil,8249,lsaquo,8250,rsaquo,8364,euro',
-				valid_elements : '*[*]',
-				extended_valid_elements : 0,
-				invalid_elements : 0,
-				fix_table_elements : 1,
-				fix_list_elements : true,
-				fix_content_duplication : true,
-				convert_fonts_to_spans : false,
-				font_size_classes : 0,
-				apply_source_formatting : 0,
-				indent_mode : 'simple',
-				indent_char : '\t',
-				indent_levels : 1,
-				remove_linebreaks : 1,
-				remove_redundant_brs : 1,
-				element_format : 'xhtml'
-			}, s);
-
-			t.dom = s.dom;
-			t.schema = s.schema;
-
-			// Use raw entities if no entities are defined
-			if (s.entity_encoding == 'named' && !s.entities)
-				s.entity_encoding = 'raw';
-
-			if (s.remove_redundant_brs) {
-				t.onPostProcess.add(function(se, o) {
-					// Remove single BR at end of block elements since they get rendered
-					o.content = o.content.replace(/(<br \/>\s*)+<\/(p|h[1-6]|div|li)>/gi, function(a, b, c) {
-						// Check if it's a single element
-						if (/^<br \/>\s*<\//.test(a))
-							return '</' + c + '>';
-
-						return a;
-					});
-				});
-			}
-
-			// Remove XHTML element endings i.e. produce crap :) XHTML is better
-			if (s.element_format == 'html') {
-				t.onPostProcess.add(function(se, o) {
-					o.content = o.content.replace(/<([^>]+) \/>/g, '<$1>');
-				});
-			}
-
-			if (s.fix_list_elements) {
-				t.onPreProcess.add(function(se, o) {
-					var nl, x, a = ['ol', 'ul'], i, n, p, r = /^(OL|UL)$/, np;
-
-					function prevNode(e, n) {
-						var a = n.split(','), i;
-
-						while ((e = e.previousSibling) != null) {
-							for (i=0; i<a.length; i++) {
-								if (e.nodeName == a[i])
-									return e;
-							}
-						}
-
-						return null;
-					};
-
-					for (x=0; x<a.length; x++) {
-						nl = t.dom.select(a[x], o.node);
-
-						for (i=0; i<nl.length; i++) {
-							n = nl[i];
-							p = n.parentNode;
-
-							if (r.test(p.nodeName)) {
-								np = prevNode(n, 'LI');
-
-								if (!np) {
-									np = t.dom.create('li');
-									np.innerHTML = '&nbsp;';
-									np.appendChild(n);
-									p.insertBefore(np, p.firstChild);
-								} else
-									np.appendChild(n);
-							}
-						}
-					}
-				});
-			}
-
-			if (s.fix_table_elements) {
-				t.onPreProcess.add(function(se, o) {
-					// Since Opera will crash if you attach the node to a dynamic document we need to brrowser sniff a specific build
-					// so Opera users with an older version will have to live with less compaible output not much we can do here
-					if (!tinymce.isOpera || opera.buildNumber() >= 1767) {
-						each(t.dom.select('p table', o.node).reverse(), function(n) {
-							var parent = t.dom.getParent(n.parentNode, 'table,p');
-
-							if (parent.nodeName != 'TABLE') {
-								try {
-									t.dom.split(parent, n);
-								} catch (ex) {
-									// IE can sometimes fire an unknown runtime error so we just ignore it
-								}
-							}
-						});
-					}
-				});
-			}
-		},
-
-		setEntities : function(s) {
-			var t = this, a, i, l = {}, v;
-
-			// No need to setup more than once
-			if (t.entityLookup)
-				return;
-
-			// Build regex and lookup array
-			a = s.split(',');
-			for (i = 0; i < a.length; i += 2) {
-				v = a[i];
-
-				// Don't add default &amp; &quot; etc.
-				if (v == 34 || v == 38 || v == 60 || v == 62)
-					continue;
-
-				l[String.fromCharCode(a[i])] = a[i + 1];
-
-				v = parseInt(a[i]).toString(16);
-			}
-
-			t.entityLookup = l;
-		},
-
-		setRules : function(s) {
-			var t = this;
-
-			t._setup();
-			t.rules = {};
-			t.wildRules = [];
-			t.validElements = {};
-
-			return t.addRules(s);
-		},
-
-		addRules : function(s) {
-			var t = this, dr;
-
-			if (!s)
-				return;
-
-			t._setup();
-
-			each(s.split(','), function(s) {
-				var p = s.split(/\[|\]/), tn = p[0].split('/'), ra, at, wat, va = [];
-
-				// Extend with default rules
-				if (dr)
-					at = tinymce.extend([], dr.attribs);
-
-				// Parse attributes
-				if (p.length > 1) {
-					each(p[1].split('|'), function(s) {
-						var ar = {}, i;
-
-						at = at || [];
-
-						// Parse attribute rule
-						s = s.replace(/::/g, '~');
-						s = /^([!\-])?([\w*.?~_\-]+|)([=:<])?(.+)?$/.exec(s);
-						s[2] = s[2].replace(/~/g, ':');
-
-						// Add required attributes
-						if (s[1] == '!') {
-							ra = ra || [];
-							ra.push(s[2]);
-						}
-
-						// Remove inherited attributes
-						if (s[1] == '-') {
-							for (i = 0; i <at.length; i++) {
-								if (at[i].name == s[2]) {
-									at.splice(i, 1);
-									return;
-								}
-							}
-						}
-
-						switch (s[3]) {
-							// Add default attrib values
-							case '=':
-								ar.defaultVal = s[4] || '';
-								break;
-
-							// Add forced attrib values
-							case ':':
-								ar.forcedVal = s[4];
-								break;
-
-							// Add validation values
-							case '<':
-								ar.validVals = s[4].split('?');
-								break;
-						}
-
-						if (/[*.?]/.test(s[2])) {
-							wat = wat || [];
-							ar.nameRE = new RegExp('^' + wildcardToRE(s[2]) + '$');
-							wat.push(ar);
-						} else {
-							ar.name = s[2];
-							at.push(ar);
-						}
-
-						va.push(s[2]);
-					});
-				}
-
-				// Handle element names
-				each(tn, function(s, i) {
-					var pr = s.charAt(0), x = 1, ru = {};
-
-					// Extend with default rule data
-					if (dr) {
-						if (dr.noEmpty)
-							ru.noEmpty = dr.noEmpty;
-
-						if (dr.fullEnd)
-							ru.fullEnd = dr.fullEnd;
-
-						if (dr.padd)
-							ru.padd = dr.padd;
-					}
-
-					// Handle prefixes
-					switch (pr) {
-						case '-':
-							ru.noEmpty = true;
-							break;
-
-						case '+':
-							ru.fullEnd = true;
-							break;
-
-						case '#':
-							ru.padd = true;
-							break;
-
-						default:
-							x = 0;
-					}
-
-					tn[i] = s = s.substring(x);
-					t.validElements[s] = 1;
-
-					// Add element name or element regex
-					if (/[*.?]/.test(tn[0])) {
-						ru.nameRE = new RegExp('^' + wildcardToRE(tn[0]) + '$');
-						t.wildRules = t.wildRules || {};
-						t.wildRules.push(ru);
-					} else {
-						ru.name = tn[0];
-
-						// Store away default rule
-						if (tn[0] == '@')
-							dr = ru;
-
-						t.rules[s] = ru;
-					}
-
-					ru.attribs = at;
-
-					if (ra)
-						ru.requiredAttribs = ra;
-
-					if (wat) {
-						// Build valid attributes regexp
-						s = '';
-						each(va, function(v) {
-							if (s)
-								s += '|';
-
-							s += '(' + wildcardToRE(v) + ')';
-						});
-						ru.validAttribsRE = new RegExp('^' + s.toLowerCase() + '$');
-						ru.wildAttribs = wat;
-					}
-				});
-			});
-
-			// Build valid elements regexp
-			s = '';
-			each(t.validElements, function(v, k) {
-				if (s)
-					s += '|';
-
-				if (k != '@')
-					s += k;
-			});
-			t.validElementsRE = new RegExp('^(' + wildcardToRE(s.toLowerCase()) + ')$');
-
-			//console.debug(t.validElementsRE.toString());
-			//console.dir(t.rules);
-			//console.dir(t.wildRules);
-		},
-
-		findRule : function(n) {
-			var t = this, rl = t.rules, i, r;
-
-			t._setup();
-
-			// Exact match
-			r = rl[n];
-			if (r)
-				return r;
-
-			// Try wildcards
-			rl = t.wildRules;
-			for (i = 0; i < rl.length; i++) {
-				if (rl[i].nameRE.test(n))
-					return rl[i];
-			}
-
-			return null;
-		},
-
-		findAttribRule : function(ru, n) {
-			var i, wa = ru.wildAttribs;
-
-			for (i = 0; i < wa.length; i++) {
-				if (wa[i].nameRE.test(n))
-					return wa[i];
-			}
-
-			return null;
-		},
-
-		serialize : function(n, o) {
-			var h, t = this, doc, oldDoc, impl, selected;
-
-			t._setup();
-			o = o || {};
-			o.format = o.format || 'html';
-			t.processObj = o;
-
-			// IE looses the selected attribute on option elements so we need to store it
-			// See: http://support.microsoft.com/kb/829907
-			if (isIE) {
-				selected = [];
-				each(n.getElementsByTagName('option'), function(n) {
-					var v = t.dom.getAttrib(n, 'selected');
-
-					selected.push(v ? v : null);
-				});
-			}
-
-			n = n.cloneNode(true);
-
-			// IE looses the selected attribute on option elements so we need to restore it
-			if (isIE) {
-				each(n.getElementsByTagName('option'), function(n, i) {
-					t.dom.setAttrib(n, 'selected', selected[i]);
-				});
-			}
-
-			// Nodes needs to be attached to something in WebKit/Opera
-			// Older builds of Opera crashes if you attach the node to an document created dynamically
-			// and since we can't feature detect a crash we need to sniff the acutal build number
-			// This fix will make DOM ranges and make Sizzle happy!
-			impl = n.ownerDocument.implementation;
-			if (impl.createHTMLDocument && (tinymce.isOpera && opera.buildNumber() >= 1767)) {
-				// Create an empty HTML document
-				doc = impl.createHTMLDocument("");
-
-				// Add the element or it's children if it's a body element to the new document
-				each(n.nodeName == 'BODY' ? n.childNodes : [n], function(node) {
-					doc.body.appendChild(doc.importNode(node, true));
-				});
-
-				// Grab first child or body element for serialization
-				if (n.nodeName != 'BODY')
-					n = doc.body.firstChild;
-				else
-					n = doc.body;
-
-				// set the new document in DOMUtils so createElement etc works
-				oldDoc = t.dom.doc;
-				t.dom.doc = doc;
-			}
-
-			t.key = '' + (parseInt(t.key) + 1);
-
-			// Pre process
-			if (!o.no_events) {
-				o.node = n;
-				t.onPreProcess.dispatch(t, o);
-			}
-
-			// Serialize HTML DOM into a string
-			t.writer.reset();
-			t._info = o;
-			t._serializeNode(n, o.getInner);
-
-			// Post process
-			o.content = t.writer.getContent();
-
-			// Restore the old document if it was changed
-			if (oldDoc)
-				t.dom.doc = oldDoc;
-
-			if (!o.no_events)
-				t.onPostProcess.dispatch(t, o);
-
-			t._postProcess(o);
-			o.node = null;
-
-			return tinymce.trim(o.content);
-		},
-
-		// Internal functions
-
-		_postProcess : function(o) {
-			var t = this, s = t.settings, h = o.content, sc = [], p;
-
-			if (o.format == 'html') {
-				// Protect some elements
-				p = t._protect({
-					content : h,
-					patterns : [
-						{pattern : /(<script[^>]*>)(.*?)(<\/script>)/g},
-						{pattern : /(<noscript[^>]*>)(.*?)(<\/noscript>)/g},
-						{pattern : /(<style[^>]*>)(.*?)(<\/style>)/g},
-						{pattern : /(<pre[^>]*>)(.*?)(<\/pre>)/g, encode : 1},
-						{pattern : /(<!--\[CDATA\[)(.*?)(\]\]-->)/g}
-					]
-				});
-
-				h = p.content;
-
-				// Entity encode
-				if (s.entity_encoding !== 'raw')
-					h = t._encode(h);
-
-				// Use BR instead of &nbsp; padded P elements inside editor and use <p>&nbsp;</p> outside editor
-/*				if (o.set)
-					h = h.replace(/<p>\s+(&nbsp;|&#160;|\u00a0|<br \/>)\s+<\/p>/g, '<p><br /></p>');
-				else
-					h = h.replace(/<p>\s+(&nbsp;|&#160;|\u00a0|<br \/>)\s+<\/p>/g, '<p>$1</p>');*/
-
-				// Since Gecko and Safari keeps whitespace in the DOM we need to
-				// remove it inorder to match other browsers. But I think Gecko and Safari is right.
-				// This process is only done when getting contents out from the editor.
-				if (!o.set) {
-					// We need to replace paragraph whitespace with an nbsp before indentation to keep the \u00a0 char
-					h = h.replace(/<p>\s+<\/p>|<p([^>]+)>\s+<\/p>/g, s.entity_encoding == 'numeric' ? '<p$1>&#160;</p>' : '<p$1>&nbsp;</p>');
-
-					if (s.remove_linebreaks) {
-						h = h.replace(/\r?\n|\r/g, ' ');
-						h = h.replace(/(<[^>]+>)\s+/g, '$1 ');
-						h = h.replace(/\s+(<\/[^>]+>)/g, ' $1');
-						h = h.replace(/<(p|h[1-6]|blockquote|hr|div|table|tbody|tr|td|body|head|html|title|meta|style|pre|script|link|object) ([^>]+)>\s+/g, '<$1 $2>'); // Trim block start
-						h = h.replace(/<(p|h[1-6]|blockquote|hr|div|table|tbody|tr|td|body|head|html|title|meta|style|pre|script|link|object)>\s+/g, '<$1>'); // Trim block start
-						h = h.replace(/\s+<\/(p|h[1-6]|blockquote|hr|div|table|tbody|tr|td|body|head|html|title|meta|style|pre|script|link|object)>/g, '</$1>'); // Trim block end
-					}
-
-					// Simple indentation
-					if (s.apply_source_formatting && s.indent_mode == 'simple') {
-						// Add line breaks before and after block elements
-						h = h.replace(/<(\/?)(ul|hr|table|meta|link|tbody|tr|object|body|head|html|map)(|[^>]+)>\s*/g, '\n<$1$2$3>\n');
-						h = h.replace(/\s*<(p|h[1-6]|blockquote|div|title|style|pre|script|td|li|area)(|[^>]+)>/g, '\n<$1$2>');
-						h = h.replace(/<\/(p|h[1-6]|blockquote|div|title|style|pre|script|td|li)>\s*/g, '</$1>\n');
-						h = h.replace(/\n\n/g, '\n');
-					}
-				}
-
-				h = t._unprotect(h, p);
-
-				// Restore CDATA sections
-				h = h.replace(/<!--\[CDATA\[([\s\S]+)\]\]-->/g, '<![CDATA[$1]]>');
-
-				// Restore the \u00a0 character if raw mode is enabled
-				if (s.entity_encoding == 'raw')
-					h = h.replace(/<p>&nbsp;<\/p>|<p([^>]+)>&nbsp;<\/p>/g, '<p$1>\u00a0</p>');
-
-				// Restore noscript elements
-				h = h.replace(/<noscript([^>]+|)>([\s\S]*?)<\/noscript>/g, function(v, attribs, text) {
-					return '<noscript' + attribs + '>' + t.dom.decode(text.replace(/<!--|-->/g, '')) + '</noscript>';
-				});
-			}
-
-			o.content = h;
-		},
-
-		_serializeNode : function(n, inner) {
-			var t = this, s = t.settings, w = t.writer, hc, el, cn, i, l, a, at, no, v, nn, ru, ar, iv, closed, keep, type, scopeName;
-
-			if (!s.node_filter || s.node_filter(n)) {
-				switch (n.nodeType) {
-					case 1: // Element
-						if (n.hasAttribute ? n.hasAttribute('_mce_bogus') : n.getAttribute('_mce_bogus'))
-							return;
-
-						iv = keep = false;
-						hc = n.hasChildNodes();
-						nn = n.getAttribute('_mce_name') || n.nodeName.toLowerCase();
-
-						// Get internal type
-						type = n.getAttribute('_mce_type');
-						if (type) {
-							if (!t._info.cleanup) {
-								iv = true;
-								return;
-							} else
-								keep = 1;
-						}
-
-						// Add correct prefix on IE
-						if (isIE) {
-							scopeName = n.scopeName;
-							if (scopeName && scopeName !== 'HTML' && scopeName !== 'html')
-								nn = scopeName + ':' + nn;
-						}
-
-						// Remove mce prefix on IE needed for the abbr element
-						if (nn.indexOf('mce:') === 0)
-							nn = nn.substring(4);
-
-						// Check if valid
-						if (!keep) {
-							if (!t.validElementsRE || !t.validElementsRE.test(nn) || (t.invalidElementsRE && t.invalidElementsRE.test(nn)) || inner) {
-								iv = true;
-								break;
-							}
-						}
-
-						if (isIE) {
-							// Fix IE content duplication (DOM can have multiple copies of the same node)
-							if (s.fix_content_duplication) {
-								if (n._mce_serialized == t.key)
-									return;
-
-								n._mce_serialized = t.key;
-							}
-
-							// IE sometimes adds a / infront of the node name
-							if (nn.charAt(0) == '/')
-								nn = nn.substring(1);
-						} else if (isGecko) {
-							// Ignore br elements
-							if (n.nodeName === 'BR' && n.getAttribute('type') == '_moz')
-								return;
-						}
-
-						// Check if valid child
-						if (s.validate_children) {
-							if (t.elementName && !t.schema.isValid(t.elementName, nn)) {
-								iv = true;
-								break;
-							}
-
-							t.elementName = nn;
-						}
-
-						ru = t.findRule(nn);
-						
-						// No valid rule for this element could be found then skip it
-						if (!ru) {
-							iv = true;
-							break;
-						}
-
-						nn = ru.name || nn;
-						closed = s.closed.test(nn);
-
-						// Skip empty nodes or empty node name in IE
-						if ((!hc && ru.noEmpty) || (isIE && !nn)) {
-							iv = true;
-							break;
-						}
-
-						// Check required
-						if (ru.requiredAttribs) {
-							a = ru.requiredAttribs;
-
-							for (i = a.length - 1; i >= 0; i--) {
-								if (this.dom.getAttrib(n, a[i]) !== '')
-									break;
-							}
-
-							// None of the required was there
-							if (i == -1) {
-								iv = true;
-								break;
-							}
-						}
-
-						w.writeStartElement(nn);
-
-						// Add ordered attributes
-						if (ru.attribs) {
-							for (i=0, at = ru.attribs, l = at.length; i<l; i++) {
-								a = at[i];
-								v = t._getAttrib(n, a);
-
-								if (v !== null)
-									w.writeAttribute(a.name, v);
-							}
-						}
-
-						// Add wild attributes
-						if (ru.validAttribsRE) {
-							at = t.dom.getAttribs(n);
-							for (i=at.length-1; i>-1; i--) {
-								no = at[i];
-
-								if (no.specified) {
-									a = no.nodeName.toLowerCase();
-
-									if (s.invalid_attrs.test(a) || !ru.validAttribsRE.test(a))
-										continue;
-
-									ar = t.findAttribRule(ru, a);
-									v = t._getAttrib(n, ar, a);
-
-									if (v !== null)
-										w.writeAttribute(a, v);
-								}
-							}
-						}
-
-						// Keep type attribute
-						if (type && keep)
-							w.writeAttribute('_mce_type', type);
-
-						// Write text from script
-						if (nn === 'script' && tinymce.trim(n.innerHTML)) {
-							w.writeText('// '); // Padd it with a comment so it will parse on older browsers
-							w.writeCDATA(n.innerHTML.replace(/<!--|-->|<\[CDATA\[|\]\]>/g, '')); // Remove comments and cdata stuctures
-							hc = false;
-							break;
-						}
-
-						// Padd empty nodes with a &nbsp;
-						if (ru.padd) {
-							// If it has only one bogus child, padd it anyway workaround for <td><br /></td> bug
-							if (hc && (cn = n.firstChild) && cn.nodeType === 1 && n.childNodes.length === 1) {
-								if (cn.hasAttribute ? cn.hasAttribute('_mce_bogus') : cn.getAttribute('_mce_bogus'))
-									w.writeText('\u00a0');
-							} else if (!hc)
-								w.writeText('\u00a0'); // No children then padd it
-						}
-
-						break;
-
-					case 3: // Text
-						// Check if valid child
-						if (s.validate_children && t.elementName && !t.schema.isValid(t.elementName, '#text'))
-							return;
-
-						return w.writeText(n.nodeValue);
-
-					case 4: // CDATA
-						return w.writeCDATA(n.nodeValue);
-
-					case 8: // Comment
-						return w.writeComment(n.nodeValue);
-				}
-			} else if (n.nodeType == 1)
-				hc = n.hasChildNodes();
-
-			if (hc && !closed) {
-				cn = n.firstChild;
-
-				while (cn) {
-					t._serializeNode(cn);
-					t.elementName = nn;
-					cn = cn.nextSibling;
-				}
-			}
-
-			// Write element end
-			if (!iv) {
-				if (!closed)
-					w.writeFullEndElement();
-				else
-					w.writeEndElement();
-			}
-		},
-
-		_protect : function(o) {
-			var t = this;
-
-			o.items = o.items || [];
-
-			function enc(s) {
-				return s.replace(/[\r\n\\]/g, function(c) {
-					if (c === '\n')
-						return '\\n';
-					else if (c === '\\')
-						return '\\\\';
-
-					return '\\r';
-				});
-			};
-
-			function dec(s) {
-				return s.replace(/\\[\\rn]/g, function(c) {
-					if (c === '\\n')
-						return '\n';
-					else if (c === '\\\\')
-						return '\\';
-
-					return '\r';
-				});
-			};
-
-			each(o.patterns, function(p) {
-				o.content = dec(enc(o.content).replace(p.pattern, function(x, a, b, c) {
-					b = dec(b);
-
-					if (p.encode)
-						b = t._encode(b);
-
-					o.items.push(b);
-					return a + '<!--mce:' + (o.items.length - 1) + '-->' + c;
-				}));
-			});
-
-			return o;
-		},
-
-		_unprotect : function(h, o) {
-			h = h.replace(/\<!--mce:([0-9]+)--\>/g, function(a, b) {
-				return o.items[parseInt(b)];
-			});
-
-			o.items = [];
-
-			return h;
-		},
-
-		_encode : function(h) {
-			var t = this, s = t.settings, l;
-
-			// Entity encode
-			if (s.entity_encoding !== 'raw') {
-				if (s.entity_encoding.indexOf('named') != -1) {
-					t.setEntities(s.entities);
-					l = t.entityLookup;
-
-					h = h.replace(/[\u007E-\uFFFF]/g, function(a) {
-						var v;
-
-						if (v = l[a])
-							a = '&' + v + ';';
-
-						return a;
-					});
-				}
-
-				if (s.entity_encoding.indexOf('numeric') != -1) {
-					h = h.replace(/[\u007E-\uFFFF]/g, function(a) {
-						return '&#' + a.charCodeAt(0) + ';';
-					});
-				}
-			}
-
-			return h;
-		},
-
-		_setup : function() {
-			var t = this, s = this.settings;
-
-			if (t.done)
-				return;
-
-			t.done = 1;
-
-			t.setRules(s.valid_elements);
-			t.addRules(s.extended_valid_elements);
-
-			if (s.invalid_elements)
-				t.invalidElementsRE = new RegExp('^(' + wildcardToRE(s.invalid_elements.replace(/,/g, '|').toLowerCase()) + ')$');
-
-			if (s.attrib_value_filter)
-				t.attribValueFilter = s.attribValueFilter;
-		},
-
-		_getAttrib : function(n, a, na) {
-			var i, v;
-
-			na = na || a.name;
-
-			if (a.forcedVal && (v = a.forcedVal)) {
-				if (v === '{$uid}')
-					return this.dom.uniqueId();
-
-				return v;
-			}
-
-			v = this.dom.getAttrib(n, na);
-
-			switch (na) {
-				case 'rowspan':
-				case 'colspan':
-					// Whats the point? Remove usless attribute value
-					if (v == '1')
-						v = '';
-
-					break;
-			}
-
-			if (this.attribValueFilter)
-				v = this.attribValueFilter(na, v, n);
-
-			if (a.validVals) {
-				for (i = a.validVals.length - 1; i >= 0; i--) {
-					if (v == a.validVals[i])
-						break;
-				}
-
-				if (i == -1)
-					return null;
-			}
-
-			if (v === '' && typeof(a.defaultVal) != 'undefined') {
-				v = a.defaultVal;
-
-				if (v === '{$uid}')
-					return this.dom.uniqueId();
-
-				return v;
-			} else {
-				// Remove internal mceItemXX classes when content is extracted from editor
-				if (na == 'class' && this.processObj.get)
-					v = v.replace(/\s?mceItem\w+\s?/g, '');
-			}
-
-			if (v === '')
-				return null;
-
-
-			return v;
-		}
-	});
 })(tinymce);
-
 (function(tinymce) {
 	tinymce.dom.ScriptLoader = function(settings) {
 		var QUEUED = 0,
@@ -5954,6 +8247,17 @@ tinymce.create('static tinymce.util.XHR', {
 
 				callback();
 			};
+			
+			function error() {
+				// Report the error so it's easier for people to spot loading errors
+				if (typeof(console) !== "undefined" && console.log)
+					console.log("Failed to load: " + url);
+
+				// We can't mark it as done if there is a load error since
+				// A) We don't want to produce 404 errors on the server and
+				// B) the onerror event won't fire on all browsers.
+				// done();
+			};
 
 			id = dom.uniqueId();
 
@@ -5963,7 +8267,7 @@ tinymce.create('static tinymce.util.XHR', {
 
 				// If script is from same domain and we
 				// use IE 6 then use XHR since it's more reliable
-				if (uri.host == loc.hostname && uri.port == loc.port && (uri.protocol + ':') == loc.protocol) {
+				if (uri.host == loc.hostname && uri.port == loc.port && (uri.protocol + ':') == loc.protocol && uri.protocol.toLowerCase() != 'file') {
 					tinymce.util.XHR.send({
 						url : tinymce._addVer(uri.getURI()),
 						success : function(content) {
@@ -5978,7 +8282,9 @@ tinymce.create('static tinymce.util.XHR', {
 							dom.remove(script);
 
 							done();
-						}
+						},
+						
+						error : error
 					});
 
 					return;
@@ -5992,17 +8298,26 @@ tinymce.create('static tinymce.util.XHR', {
 				src : tinymce._addVer(url)
 			});
 
-			// Add onload and readystate listeners
-			elm.onload = done;
-			elm.onreadystatechange = function() {
-				var state = elm.readyState;
+			// Add onload listener for non IE browsers since IE9
+			// fires onload event before the script is parsed and executed
+			if (!tinymce.isIE)
+				elm.onload = done;
 
-				// Loaded state is passed on IE 6 however there
-				// are known issues with this method but we can't use
-				// XHR in a cross domain loading
-				if (state == 'complete' || state == 'loaded')
-					done();
-			};
+			// Add onerror event will get fired on some browsers but not all of them
+			elm.onerror = error;
+
+			// Opera 9.60 doesn't seem to fire the onreadystate event at correctly
+			if (!tinymce.isOpera) {
+				elm.onreadystatechange = function() {
+					var state = elm.readyState;
+
+					// Loaded state is passed on IE 6 however there
+					// are known issues with this method but we can't use
+					// XHR in a cross domain loading
+					if (state == 'complete' || state == 'loaded')
+						done();
+				};
+			}
 
 			// Most browsers support this feature so we report errors
 			// for those at least to help users track their missing plugins etc
@@ -6150,164 +8465,10 @@ tinymce.dom.TreeWalker = function(start_node, root_node) {
 	};
 
 	this.prev = function(shallow) {
-		return (node = findSibling(node, 'lastChild', 'lastSibling', shallow));
+		return (node = findSibling(node, 'lastChild', 'previousSibling', shallow));
 	};
 };
 
-(function() {
-	var transitional = {};
-
-	function unpack(lookup, data) {
-		var key;
-
-		function replace(value) {
-			return value.replace(/[A-Z]+/g, function(key) {
-				return replace(lookup[key]);
-			});
-		};
-
-		// Unpack lookup
-		for (key in lookup) {
-			if (lookup.hasOwnProperty(key))
-				lookup[key] = replace(lookup[key]);
-		}
-
-		// Unpack and parse data into object map
-		replace(data).replace(/#/g, '#text').replace(/(\w+)\[([^\]]+)\]/g, function(str, name, children) {
-			var i, map = {};
-
-			children = children.split(/\|/);
-
-			for (i = children.length - 1; i >= 0; i--)
-				map[children[i]] = 1;
-
-			transitional[name] = map;
-		});
-	};
-
-	// This is the XHTML 1.0 transitional elements with it's children packed to reduce it's size
-	// we will later include the attributes here and use it as a default for valid elements but it
-	// requires us to rewrite the serializer engine
-	unpack({
-		Z : '#|H|K|N|O|P',
-		Y : '#|X|form|R|Q',
-		X : 'p|T|div|U|W|isindex|fieldset|table',
-		W : 'pre|hr|blockquote|address|center|noframes',
-		U : 'ul|ol|dl|menu|dir',
-		ZC : '#|p|Y|div|U|W|table|br|span|bdo|object|applet|img|map|K|N|Q',
-		T : 'h1|h2|h3|h4|h5|h6',
-		ZB : '#|X|S|Q',
-		S : 'R|P',
-		ZA : '#|a|G|J|M|O|P',
-		R : '#|a|H|K|N|O',
-		Q : 'noscript|P',
-		P : 'ins|del|script',
-		O : 'input|select|textarea|label|button',
-		N : 'M|L',
-		M : 'em|strong|dfn|code|q|samp|kbd|var|cite|abbr|acronym',
-		L : 'sub|sup',
-		K : 'J|I',
-		J : 'tt|i|b|u|s|strike',
-		I : 'big|small|font|basefont',
-		H : 'G|F',
-		G : 'br|span|bdo',
-		F : 'object|applet|img|map|iframe'
-	}, 'script[]' + 
-		'style[]' + 
-		'object[#|param|X|form|a|H|K|N|O|Q]' + 
-		'param[]' + 
-		'p[S]' + 
-		'a[Z]' + 
-		'br[]' + 
-		'span[S]' + 
-		'bdo[S]' + 
-		'applet[#|param|X|form|a|H|K|N|O|Q]' + 
-		'h1[S]' + 
-		'img[]' + 
-		'map[X|form|Q|area]' + 
-		'h2[S]' + 
-		'iframe[#|X|form|a|H|K|N|O|Q]' + 
-		'h3[S]' + 
-		'tt[S]' + 
-		'i[S]' + 
-		'b[S]' + 
-		'u[S]' + 
-		's[S]' + 
-		'strike[S]' + 
-		'big[S]' + 
-		'small[S]' + 
-		'font[S]' + 
-		'basefont[]' + 
-		'em[S]' + 
-		'strong[S]' + 
-		'dfn[S]' + 
-		'code[S]' + 
-		'q[S]' + 
-		'samp[S]' + 
-		'kbd[S]' + 
-		'var[S]' + 
-		'cite[S]' + 
-		'abbr[S]' + 
-		'acronym[S]' + 
-		'sub[S]' + 
-		'sup[S]' + 
-		'input[]' + 
-		'select[optgroup|option]' + 
-		'optgroup[option]' + 
-		'option[]' + 
-		'textarea[]' + 
-		'label[S]' + 
-		'button[#|p|T|div|U|W|table|G|object|applet|img|map|K|N|Q]' + 
-		'h4[S]' + 
-		'ins[#|X|form|a|H|K|N|O|Q]' + 
-		'h5[S]' + 
-		'del[#|X|form|a|H|K|N|O|Q]' + 
-		'h6[S]' + 
-		'div[#|X|form|a|H|K|N|O|Q]' + 
-		'ul[li]' + 
-		'li[#|X|form|a|H|K|N|O|Q]' + 
-		'ol[li]' + 
-		'dl[dt|dd]' + 
-		'dt[S]' + 
-		'dd[#|X|form|a|H|K|N|O|Q]' + 
-		'menu[li]' + 
-		'dir[li]' + 
-		'pre[ZA]' + 
-		'hr[]' + 
-		'blockquote[#|X|form|a|H|K|N|O|Q]' + 
-		'address[S|p]' + 
-		'center[#|X|form|a|H|K|N|O|Q]' + 
-		'noframes[#|X|form|a|H|K|N|O|Q]' + 
-		'isindex[]' + 
-		'fieldset[#|legend|X|form|a|H|K|N|O|Q]' + 
-		'legend[S]' + 
-		'table[caption|col|colgroup|thead|tfoot|tbody|tr]' + 
-		'caption[S]' + 
-		'col[]' + 
-		'colgroup[col]' + 
-		'thead[tr]' + 
-		'tr[th|td]' + 
-		'th[#|X|form|a|H|K|N|O|Q]' + 
-		'form[#|X|a|H|K|N|O|Q]' + 
-		'noscript[#|X|form|a|H|K|N|O|Q]' + 
-		'td[#|X|form|a|H|K|N|O|Q]' + 
-		'tfoot[tr]' + 
-		'tbody[tr]' + 
-		'area[]' + 
-		'base[]' + 
-		'body[#|X|form|a|H|K|N|O|Q]'
-	);
-
-	tinymce.dom.Schema = function() {
-		var t = this, elements = transitional;
-
-		t.isValid = function(name, child_name) {
-			var element = elements[name];
-
-			return !!(element && (!child_name || element[child_name]));
-		};
-	};
-})();
 (function(tinymce) {
 	tinymce.dom.RangeUtils = function(dom) {
 		var INVISIBLE_CHAR = '\uFEFF';
@@ -6371,7 +8532,7 @@ tinymce.dom.TreeWalker = function(start_node, root_node) {
 
 			// If index based end position then resolve it
 			if (endContainer.nodeType == 1 && endContainer.hasChildNodes())
-				endContainer = endContainer.childNodes[Math.min(startOffset == endOffset ? endOffset : endOffset - 1, endContainer.childNodes.length - 1)];
+				endContainer = endContainer.childNodes[Math.min(endOffset - 1, endContainer.childNodes.length - 1)];
 
 			// Find common ancestor and end points
 			ancestor = dom.findCommonAncestor(startContainer, endContainer);
@@ -6491,12 +8652,158 @@ tinymce.dom.TreeWalker = function(start_node, root_node) {
 	};
 })(tinymce);
 
+(function(tinymce) {
+	var Event = tinymce.dom.Event, each = tinymce.each;
+
+	tinymce.create('tinymce.ui.KeyboardNavigation', {
+		KeyboardNavigation: function(settings, dom) {
+			var t = this, root = settings.root, items = settings.items,
+					enableUpDown = settings.enableUpDown, enableLeftRight = settings.enableLeftRight || !settings.enableUpDown,
+					excludeFromTabOrder = settings.excludeFromTabOrder,
+					itemFocussed, itemBlurred, rootKeydown, rootFocussed, focussedId;
+
+			dom = dom || tinymce.DOM;
+
+			itemFocussed = function(evt) {
+				focussedId = evt.target.id;
+			};
+			
+			itemBlurred = function(evt) {
+				dom.setAttrib(evt.target.id, 'tabindex', '-1');
+			};
+			
+			rootFocussed = function(evt) {
+				var item = dom.get(focussedId);
+				dom.setAttrib(item, 'tabindex', '0');
+				item.focus();
+			};
+			
+			t.focus = function() {
+				dom.get(focussedId).focus();
+			};
+
+			t.destroy = function() {
+				each(items, function(item) {
+					dom.unbind(dom.get(item.id), 'focus', itemFocussed);
+					dom.unbind(dom.get(item.id), 'blur', itemBlurred);
+				});
+
+				dom.unbind(dom.get(root), 'focus', rootFocussed);
+				dom.unbind(dom.get(root), 'keydown', rootKeydown);
+
+				items = dom = root = t.focus = itemFocussed = itemBlurred = rootKeydown = rootFocussed = null;
+				t.destroy = function() {};
+			};
+			
+			t.moveFocus = function(dir, evt) {
+				var idx = -1, controls = t.controls, newFocus;
+
+				if (!focussedId)
+					return;
+
+				each(items, function(item, index) {
+					if (item.id === focussedId) {
+						idx = index;
+						return false;
+					}
+				});
+
+				idx += dir;
+				if (idx < 0) {
+					idx = items.length - 1;
+				} else if (idx >= items.length) {
+					idx = 0;
+				}
+				
+				newFocus = items[idx];
+				dom.setAttrib(focussedId, 'tabindex', '-1');
+				dom.setAttrib(newFocus.id, 'tabindex', '0');
+				dom.get(newFocus.id).focus();
+
+				if (settings.actOnFocus) {
+					settings.onAction(newFocus.id);
+				}
+
+				if (evt)
+					Event.cancel(evt);
+			};
+			
+			rootKeydown = function(evt) {
+				var DOM_VK_LEFT = 37, DOM_VK_RIGHT = 39, DOM_VK_UP = 38, DOM_VK_DOWN = 40, DOM_VK_ESCAPE = 27, DOM_VK_ENTER = 14, DOM_VK_RETURN = 13, DOM_VK_SPACE = 32;
+				
+				switch (evt.keyCode) {
+					case DOM_VK_LEFT:
+						if (enableLeftRight) t.moveFocus(-1);
+						break;
+	
+					case DOM_VK_RIGHT:
+						if (enableLeftRight) t.moveFocus(1);
+						break;
+	
+					case DOM_VK_UP:
+						if (enableUpDown) t.moveFocus(-1);
+						break;
+
+					case DOM_VK_DOWN:
+						if (enableUpDown) t.moveFocus(1);
+						break;
+
+					case DOM_VK_ESCAPE:
+						if (settings.onCancel) {
+							settings.onCancel();
+							Event.cancel(evt);
+						}
+						break;
+
+					case DOM_VK_ENTER:
+					case DOM_VK_RETURN:
+					case DOM_VK_SPACE:
+						if (settings.onAction) {
+							settings.onAction(focussedId);
+							Event.cancel(evt);
+						}
+						break;
+				}
+			};
+
+			// Set up state and listeners for each item.
+			each(items, function(item, idx) {
+				var tabindex;
+
+				if (!item.id) {
+					item.id = dom.uniqueId('_mce_item_');
+				}
+
+				if (excludeFromTabOrder) {
+					dom.bind(item.id, 'blur', itemBlurred);
+					tabindex = '-1';
+				} else {
+					tabindex = (idx === 0 ? '0' : '-1');
+				}
+
+				dom.setAttrib(item.id, 'tabindex', tabindex);
+				dom.bind(dom.get(item.id), 'focus', itemFocussed);
+			});
+			
+			// Setup initial state for root element.
+			if (items[0]){
+				focussedId = items[0].id;
+			}
+
+			dom.setAttrib(root, 'tabindex', '-1');
+			
+			// Setup listeners for root element.
+			dom.bind(dom.get(root), 'focus', rootFocussed);
+			dom.bind(dom.get(root), 'keydown', rootKeydown);
+		}
+	});
+})(tinymce);
 (function(tinymce) {
 	// Shorten class names
 	var DOM = tinymce.DOM, is = tinymce.is;
 
 	tinymce.create('tinymce.ui.Control', {
-		Control : function(id, s) {
+		Control : function(id, s, editor) {
 			this.id = id;
 			this.settings = s = s || {};
 			this.rendered = false;
@@ -6505,22 +8812,23 @@ tinymce.dom.TreeWalker = function(start_node, root_node) {
 			this.scope = s.scope || this;
 			this.disabled = 0;
 			this.active = 0;
+			this.editor = editor;
+		},
+		
+		setAriaProperty : function(property, value) {
+			var element = DOM.get(this.id + '_aria') || DOM.get(this.id);
+			if (element) {
+				DOM.setAttrib(element, 'aria-' + property, !!value);
+			}
+		},
+		
+		focus : function() {
+			DOM.get(this.id).focus();
 		},
 
 		setDisabled : function(s) {
-			var e;
-
 			if (s != this.disabled) {
-				e = DOM.get(this.id);
-
-				// Add accessibility title for unavailable actions
-				if (e && this.settings.unavailable_prefix) {
-					if (s) {
-						this.prevTitle = e.title;
-						e.title = this.settings.unavailable_prefix + ": " + e.title;
-					} else
-						e.title = this.prevTitle;
-				}
+				this.setAriaProperty('disabled', s);
 
 				this.setState('Disabled', s);
 				this.setState('Enabled', !s);
@@ -6536,6 +8844,7 @@ tinymce.dom.TreeWalker = function(start_node, root_node) {
 			if (s != this.active) {
 				this.setState('Active', s);
 				this.active = s;
+				this.setAriaProperty('pressed', s);
 			}
 		},
 
@@ -6593,8 +8902,8 @@ tinymce.dom.TreeWalker = function(start_node, root_node) {
 	});
 })(tinymce);
 tinymce.create('tinymce.ui.Container:tinymce.ui.Control', {
-	Container : function(id, s) {
-		this.parent(id, s);
+	Container : function(id, s, editor) {
+		this.parent(id, s, editor);
 
 		this.controls = [];
 
@@ -6618,10 +8927,11 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
 	Separator : function(id, s) {
 		this.parent(id, s);
 		this.classPrefix = 'mceSeparator';
+		this.setDisabled(true);
 	},
 
 	renderHTML : function() {
-		return tinymce.DOM.createHTML('span', {'class' : this.classPrefix});
+		return tinymce.DOM.createHTML('span', {'class' : this.classPrefix, role : 'separator', 'aria-orientation' : 'vertical', tabindex : '-1'});
 	}
 });
 
@@ -6636,6 +8946,7 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
 
 		setSelected : function(s) {
 			this.setState('Selected', s);
+			this.setAriaProperty('checked', !!s);
 			this.selected = s;
 		},
 
@@ -6783,12 +9094,20 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
 			s['class'] = s['class'] || cs['class'];
 			s.vp_offset_x = s.vp_offset_x || cs.vp_offset_x;
 			s.vp_offset_y = s.vp_offset_y || cs.vp_offset_y;
+			s.keyboard_focus = cs.keyboard_focus;
 			m = new tinymce.ui.DropMenu(s.id || DOM.uniqueId(), s);
 
 			m.onAddItem.add(t.onAddItem.dispatch, t.onAddItem);
 
 			return m;
 		},
+		
+		focus : function() {
+			var t = this;
+			if (t.keyboardNav) {
+				t.keyboardNav.focus();
+			}
+		},
 
 		update : function() {
 			var t = this, s = t.settings, tb = DOM.get('menu_' + t.id + '_tbl'), co = DOM.get('menu_' + t.id + '_co'), tw, th;
@@ -6912,13 +9231,13 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
 					}
 				});
 			}
+			
+			Event.add(co, 'keydown', t._keyHandler, t);
 
 			t.onShowMenu.dispatch(t);
 
-			if (s.keyboard_focus) {
-				Event.add(co, 'keydown', t._keyHandler, t);
-				DOM.select('a', 'menu_' + t.id)[0].focus(); // Select first link
-				t._focusIdx = 0;
+			if (s.keyboard_focus) { 
+				t._setupKeyboardNav(); 
 			}
 		},
 
@@ -6928,6 +9247,7 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
 			if (!t.isMenuVisible)
 				return;
 
+			if (t.keyboardNav) t.keyboardNav.destroy();
 			Event.remove(co, 'mouseover', t.mouseOverFunc);
 			Event.remove(co, 'click', t.mouseClickFunc);
 			Event.remove(co, 'keydown', t._keyHandler);
@@ -6972,8 +9292,11 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
 		destroy : function() {
 			var t = this, co = DOM.get('menu_' + t.id);
 
+			if (t.keyboardNav) t.keyboardNav.destroy();
 			Event.remove(co, 'mouseover', t.mouseOverFunc);
+			Event.remove(DOM.select('a', co), 'focus', t.mouseOverFunc);
 			Event.remove(co, 'click', t.mouseClickFunc);
+			Event.remove(co, 'keydown', t._keyHandler);
 
 			if (t.element)
 				t.element.remove();
@@ -6984,15 +9307,18 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
 		renderNode : function() {
 			var t = this, s = t.settings, n, tb, co, w;
 
-			w = DOM.create('div', {id : 'menu_' + t.id, 'class' : s['class'], 'style' : 'position:absolute;left:0;top:0;z-index:200000'});
-			co = DOM.add(w, 'div', {id : 'menu_' + t.id + '_co', 'class' : t.classPrefix + (s['class'] ? ' ' + s['class'] : '')});
+			w = DOM.create('div', {role: 'listbox', id : 'menu_' + t.id, 'class' : s['class'], 'style' : 'position:absolute;left:0;top:0;z-index:200000;outline:0'});
+			if (t.settings.parent) {
+				DOM.setAttrib(w, 'aria-parent', 'menu_' + t.settings.parent.id);
+			}
+			co = DOM.add(w, 'div', {role: 'presentation', id : 'menu_' + t.id + '_co', 'class' : t.classPrefix + (s['class'] ? ' ' + s['class'] : '')});
 			t.element = new Element('menu_' + t.id, {blocker : 1, container : s.container});
 
 			if (s.menu_line)
 				DOM.add(co, 'span', {'class' : t.classPrefix + 'Line'});
 
 //			n = DOM.add(co, 'div', {id : 'menu_' + t.id + '_co', 'class' : 'mceMenuContainer'});
-			n = DOM.add(co, 'table', {id : 'menu_' + t.id + '_tbl', border : 0, cellPadding : 0, cellSpacing : 0});
+			n = DOM.add(co, 'table', {role: 'presentation', id : 'menu_' + t.id + '_tbl', border : 0, cellPadding : 0, cellSpacing : 0});
 			tb = DOM.add(n, 'tbody');
 
 			each(t.items, function(o) {
@@ -7005,33 +9331,36 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
 		},
 
 		// Internal functions
+		_setupKeyboardNav : function(){
+			var contextMenu, menuItems, t=this; 
+			contextMenu = DOM.select('#menu_' + t.id)[0];
+			menuItems = DOM.select('a[role=option]', 'menu_' + t.id);
+			menuItems.splice(0,0,contextMenu);
+			t.keyboardNav = new tinymce.ui.KeyboardNavigation({
+				root: 'menu_' + t.id,
+				items: menuItems,
+				onCancel: function() {
+					t.hideMenu();
+				},
+				enableUpDown: true
+			});
+			contextMenu.focus();
+		},
 
-		_keyHandler : function(e) {
-			var t = this, kc = e.keyCode;
-
-			function focus(d) {
-				var i = t._focusIdx + d, e = DOM.select('a', 'menu_' + t.id)[i];
-
-				if (e) {
-					t._focusIdx = i;
-					e.focus();
-				}
-			};
-
-			switch (kc) {
-				case 38:
-					focus(-1); // Select first link
-					return;
-
-				case 40:
-					focus(1);
-					return;
-
-				case 13:
-					return;
-
-				case 27:
-					return this.hideMenu();
+		_keyHandler : function(evt) {
+			var t = this, e;
+			switch (evt.keyCode) {
+				case 37: // Left
+					if (t.settings.parent) {
+						t.hideMenu();
+						t.settings.parent.focus();
+						Event.cancel(evt);
+					}
+					break;
+				case 39: // Right
+					if (t.mouseOverFunc)
+						t.mouseOverFunc(evt);
+					break;
 			}
 		},
 
@@ -7049,8 +9378,13 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
 			}
 
 			n = ro = DOM.add(tb, 'tr', {id : o.id, 'class' : cp + 'Item ' + cp + 'ItemEnabled'});
-			n = it = DOM.add(n, 'td');
-			n = a = DOM.add(n, 'a', {href : 'javascript:;', onclick : "return false;", onmousedown : 'return false;'});
+			n = it = DOM.add(n, s.titleItem ? 'th' : 'td');
+			n = a = DOM.add(n, 'a', {id: o.id + '_aria',  role: s.titleItem ? 'presentation' : 'option', href : 'javascript:;', onclick : "return false;", onmousedown : 'return false;'});
+
+			if (s.parent) {
+				DOM.setAttrib(a, 'aria-haspopup', 'true');
+				DOM.setAttrib(a, 'aria-owns', 'menu_' + o.id);
+			}
 
 			DOM.addClass(it, s['class']);
 //			n = DOM.add(n, 'span', {'class' : 'item'});
@@ -7085,8 +9419,8 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
 	var DOM = tinymce.DOM;
 
 	tinymce.create('tinymce.ui.Button:tinymce.ui.Control', {
-		Button : function(id, s) {
-			this.parent(id, s);
+		Button : function(id, s, ed) {
+			this.parent(id, s, ed);
 			this.classPrefix = 'mceButton';
 		},
 
@@ -7094,13 +9428,14 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
 			var cp = this.classPrefix, s = this.settings, h, l;
 
 			l = DOM.encode(s.label || '');
-			h = '<a id="' + this.id + '" href="javascript:;" class="' + cp + ' ' + cp + 'Enabled ' + s['class'] + (l ? ' ' + cp + 'Labeled' : '') +'" onmousedown="return false;" onclick="return false;" title="' + DOM.encode(s.title) + '">';
-
-			if (s.image)
-				h += '<img class="mceIcon" src="' + s.image + '" />' + l + '</a>';
+			h = '<a role="button" id="' + this.id + '" href="javascript:;" class="' + cp + ' ' + cp + 'Enabled ' + s['class'] + (l ? ' ' + cp + 'Labeled' : '') +'" onmousedown="return false;" onclick="return false;" aria-labelledby="' + this.id + '_voice" title="' + DOM.encode(s.title) + '">';
+			if (s.image && !(this.editor  &&this.editor.forcedHighContrastMode) )
+				h += '<img class="mceIcon" src="' + s.image + '" alt="' + DOM.encode(s.title) + '" />' + l;
 			else
-				h += '<span class="mceIcon ' + s['class'] + '"></span>' + (l ? '<span class="' + cp + 'Label">' + l + '</span>' : '') + '</a>';
+				h += '<span class="mceIcon ' + s['class'] + '"></span>' + (l ? '<span class="' + cp + 'Label">' + l + '</span>' : '');
 
+			h += '<span class="mceVoiceLabel mceIconOnly" style="display: none;" id="' + this.id + '_voice">' + s.title + '</span>'; 
+			h += '</a>';
 			return h;
 		},
 
@@ -7119,10 +9454,10 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
 	var DOM = tinymce.DOM, Event = tinymce.dom.Event, each = tinymce.each, Dispatcher = tinymce.util.Dispatcher;
 
 	tinymce.create('tinymce.ui.ListBox:tinymce.ui.Control', {
-		ListBox : function(id, s) {
+		ListBox : function(id, s, ed) {
 			var t = this;
 
-			t.parent(id, s);
+			t.parent(id, s, ed);
 
 			t.items = [];
 
@@ -7180,12 +9515,13 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
 					t.selectedIndex = idx;
 					DOM.setHTML(e, DOM.encode(o.title));
 					DOM.removeClass(e, 'mceTitle');
+					DOM.setAttrib(t.id, 'aria-valuenow', o.title);
 				} else {
 					DOM.setHTML(e, DOM.encode(t.settings.title));
 					DOM.addClass(e, 'mceTitle');
 					t.selectedValue = t.selectedIndex = null;
+					DOM.setAttrib(t.id, 'aria-valuenow', t.settings.title);
 				}
-
 				e = 0;
 			}
 		},
@@ -7210,16 +9546,17 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
 		renderHTML : function() {
 			var h = '', t = this, s = t.settings, cp = t.classPrefix;
 
-			h = '<table id="' + t.id + '" cellpadding="0" cellspacing="0" class="' + cp + ' ' + cp + 'Enabled' + (s['class'] ? (' ' + s['class']) : '') + '"><tbody><tr>';
-			h += '<td>' + DOM.createHTML('a', {id : t.id + '_text', href : 'javascript:;', 'class' : 'mceText', onclick : "return false;", onmousedown : 'return false;'}, DOM.encode(t.settings.title)) + '</td>';
-			h += '<td>' + DOM.createHTML('a', {id : t.id + '_open', tabindex : -1, href : 'javascript:;', 'class' : 'mceOpen', onclick : "return false;", onmousedown : 'return false;'}, '<span></span>') + '</td>';
-			h += '</tr></tbody></table>';
+			h = '<span role="button" aria-haspopup="true" aria-labelledby="' + t.id +'_text" aria-describedby="' + t.id + '_voiceDesc"><table role="presentation" tabindex="0" id="' + t.id + '" cellpadding="0" cellspacing="0" class="' + cp + ' ' + cp + 'Enabled' + (s['class'] ? (' ' + s['class']) : '') + '"><tbody><tr>';
+			h += '<td>' + DOM.createHTML('span', {id: t.id + '_voiceDesc', 'class': 'voiceLabel', style:'display:none;'}, t.settings.title); 
+			h += DOM.createHTML('a', {id : t.id + '_text', tabindex : -1, href : 'javascript:;', 'class' : 'mceText', onclick : "return false;", onmousedown : 'return false;'}, DOM.encode(t.settings.title)) + '</td>';
+			h += '<td>' + DOM.createHTML('a', {id : t.id + '_open', tabindex : -1, href : 'javascript:;', 'class' : 'mceOpen', onclick : "return false;", onmousedown : 'return false;'}, '<span><span style="display:none;" class="mceIconOnly" aria-hidden="true">\u25BC</span></span>') + '</td>';
+			h += '</tr></tbody></table></span>';
 
 			return h;
 		},
 
 		showMenu : function() {
-			var t = this, p1, p2, e = DOM.get(this.id), m;
+			var t = this, p2, e = DOM.get(this.id), m;
 
 			if (t.isDisabled() || t.items.length == 0)
 				return;
@@ -7232,7 +9569,6 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
 				t.isMenuRendered = true;
 			}
 
-			p1 = DOM.getPos(this.settings.menu_container);
 			p2 = DOM.getPos(e);
 
 			m = t.menu;
@@ -7263,6 +9599,8 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
 			var t = this;
 
 			if (t.menu && t.menu.isMenuVisible) {
+				DOM.removeClass(t.id, t.classPrefix + 'Selected');
+
 				// Prevent double toogles by canceling the mouse click event to the button
 				if (e && e.type == "mousedown" && (e.target.id == t.id + '_text' || e.target.id == t.id + '_open'))
 					return;
@@ -7285,7 +9623,10 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
 				max_height : 150
 			});
 
-			m.onHideMenu.add(t.hideMenu, t);
+			m.onHideMenu.add(function() {
+				t.hideMenu();
+				t.focus();
+			});
 
 			m.add({
 				title : t.settings.title,
@@ -7326,40 +9667,39 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
 			var t = this, cp = t.classPrefix;
 
 			Event.add(t.id, 'click', t.showMenu, t);
-			Event.add(t.id + '_text', 'focus', function() {
+			Event.add(t.id, 'keydown', function(evt) {
+				if (evt.keyCode == 32) { // Space
+					t.showMenu(evt);
+					Event.cancel(evt);
+				}
+			});
+			Event.add(t.id, 'focus', function() {
 				if (!t._focused) {
-					t.keyDownHandler = Event.add(t.id + '_text', 'keydown', function(e) {
-						var idx = -1, v, kc = e.keyCode;
-
-						// Find current index
-						each(t.items, function(v, i) {
-							if (t.selectedValue == v.value)
-								idx = i;
-						});
-
-						// Move up/down
-						if (kc == 38)
-							v = t.items[idx - 1];
-						else if (kc == 40)
-							v = t.items[idx + 1];
-						else if (kc == 13) {
+					t.keyDownHandler = Event.add(t.id, 'keydown', function(e) {
+						if (e.keyCode == 40) {
+							t.showMenu();
+							Event.cancel(e);
+						}
+					});
+					t.keyPressHandler = Event.add(t.id, 'keypress', function(e) {
+						var v;
+						if (e.keyCode == 13) {
 							// Fake select on enter
 							v = t.selectedValue;
 							t.selectedValue = null; // Needs to be null to fake change
+							Event.cancel(e);
 							t.settings.onselect(v);
-							return Event.cancel(e);
-						}
-
-						if (v) {
-							t.hideMenu();
-							t.select(v.value);
 						}
 					});
 				}
 
 				t._focused = 1;
 			});
-			Event.add(t.id + '_text', 'blur', function() {Event.remove(t.id + '_text', 'keydown', t.keyDownHandler); t._focused = 0;});
+			Event.add(t.id, 'blur', function() {
+				Event.remove(t.id, 'keydown', t.keyDownHandler);
+				Event.remove(t.id, 'keypress', t.keyPressHandler);
+				t._focused = 0;
+			});
 
 			// Old IE doesn't have hover on all elements
 			if (tinymce.isIE6 || !DOM.boxModel) {
@@ -7396,6 +9736,7 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
 
 		setDisabled : function(s) {
 			DOM.get(this.id).disabled = s;
+			this.setAriaProperty('disabled', s);
 		},
 
 		isDisabled : function() {
@@ -7470,13 +9811,13 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
 				h += DOM.createHTML('option', {value : it.value}, it.title);
 			});
 
-			h = DOM.createHTML('select', {id : t.id, 'class' : 'mceNativeListBox'}, h);
-
+			h = DOM.createHTML('select', {id : t.id, 'class' : 'mceNativeListBox', 'aria-labelledby': t.id + '_aria'}, h);
+			h += DOM.createHTML('span', {id : t.id + '_aria', 'style': 'display: none'}, t.settings.title);
 			return h;
 		},
 
 		postRender : function() {
-			var t = this, ch;
+			var t = this, ch, changeListenerAdded = true;
 
 			t.rendered = true;
 
@@ -7498,8 +9839,11 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
 				var bf;
 
 				Event.remove(t.id, 'change', ch);
+				changeListenerAdded = false;
 
 				bf = Event.add(t.id, 'blur', function() {
+					if (changeListenerAdded) return;
+					changeListenerAdded = true;
 					Event.add(t.id, 'change', onChange);
 					Event.remove(t.id, 'blur', bf);
 				});
@@ -7518,8 +9862,8 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
 	var DOM = tinymce.DOM, Event = tinymce.dom.Event, each = tinymce.each;
 
 	tinymce.create('tinymce.ui.MenuButton:tinymce.ui.Button', {
-		MenuButton : function(id, s) {
-			this.parent(id, s);
+		MenuButton : function(id, s, ed) {
+			this.parent(id, s, ed);
 
 			this.onRenderMenu = new tinymce.util.Dispatcher(this);
 
@@ -7566,7 +9910,10 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
 				icons : t.settings.icons
 			});
 
-			m.onHideMenu.add(t.hideMenu, t);
+			m.onHideMenu.add(function() {
+				t.hideMenu();
+				t.focus();
+			});
 
 			t.onRenderMenu.dispatch(t, m);
 			t.menu = m;
@@ -7608,8 +9955,8 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
 	var DOM = tinymce.DOM, Event = tinymce.dom.Event, each = tinymce.each;
 
 	tinymce.create('tinymce.ui.SplitButton:tinymce.ui.MenuButton', {
-		SplitButton : function(id, s) {
-			this.parent(id, s);
+		SplitButton : function(id, s, ed) {
+			this.parent(id, s, ed);
 			this.classPrefix = 'mceSplitButton';
 		},
 
@@ -7619,33 +9966,50 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
 			h = '<tbody><tr>';
 
 			if (s.image)
-				h1 = DOM.createHTML('img ', {src : s.image, 'class' : 'mceAction ' + s['class']});
+				h1 = DOM.createHTML('img ', {src : s.image, role: 'presentation', 'class' : 'mceAction ' + s['class']});
 			else
 				h1 = DOM.createHTML('span', {'class' : 'mceAction ' + s['class']}, '');
 
-			h += '<td>' + DOM.createHTML('a', {id : t.id + '_action', href : 'javascript:;', 'class' : 'mceAction ' + s['class'], onclick : "return false;", onmousedown : 'return false;', title : s.title}, h1) + '</td>';
+			h1 += DOM.createHTML('span', {'class': 'mceVoiceLabel mceIconOnly', id: t.id + '_voice', style: 'display:none;'}, s.title);
+			h += '<td >' + DOM.createHTML('a', {role: 'button', id : t.id + '_action', tabindex: '-1', href : 'javascript:;', 'class' : 'mceAction ' + s['class'], onclick : "return false;", onmousedown : 'return false;', title : s.title}, h1) + '</td>';
 	
-			h1 = DOM.createHTML('span', {'class' : 'mceOpen ' + s['class']});
-			h += '<td>' + DOM.createHTML('a', {id : t.id + '_open', href : 'javascript:;', 'class' : 'mceOpen ' + s['class'], onclick : "return false;", onmousedown : 'return false;', title : s.title}, h1) + '</td>';
+			h1 = DOM.createHTML('span', {'class' : 'mceOpen ' + s['class']}, '<span style="display:none;" class="mceIconOnly" aria-hidden="true">\u25BC</span>');
+			h += '<td >' + DOM.createHTML('a', {role: 'button', id : t.id + '_open', tabindex: '-1', href : 'javascript:;', 'class' : 'mceOpen ' + s['class'], onclick : "return false;", onmousedown : 'return false;', title : s.title}, h1) + '</td>';
 
 			h += '</tr></tbody>';
-
-			return DOM.createHTML('table', {id : t.id, 'class' : 'mceSplitButton mceSplitButtonEnabled ' + s['class'], cellpadding : '0', cellspacing : '0', onmousedown : 'return false;', title : s.title}, h);
+			h = DOM.createHTML('table', {id : t.id, role: 'presentation', tabindex: '0',  'class' : 'mceSplitButton mceSplitButtonEnabled ' + s['class'], cellpadding : '0', cellspacing : '0', title : s.title}, h);
+			return DOM.createHTML('span', {role: 'button', 'aria-labelledby': t.id + '_voice', 'aria-haspopup': 'true'}, h);
 		},
 
 		postRender : function() {
-			var t = this, s = t.settings;
+			var t = this, s = t.settings, activate;
 
 			if (s.onclick) {
-				Event.add(t.id + '_action', 'click', function() {
-					if (!t.isDisabled())
+				activate = function(evt) {
+					if (!t.isDisabled()) {
 						s.onclick(t.value);
+						Event.cancel(evt);
+					}
+				};
+				Event.add(t.id + '_action', 'click', activate);
+				Event.add(t.id, ['click', 'keydown'], function(evt) {
+					var DOM_VK_SPACE = 32, DOM_VK_ENTER = 14, DOM_VK_RETURN = 13, DOM_VK_UP = 38, DOM_VK_DOWN = 40;
+					if ((evt.keyCode === 32 || evt.keyCode === 13 || evt.keyCode === 14) && !evt.altKey && !evt.ctrlKey && !evt.metaKey) {
+						activate();
+						Event.cancel(evt);
+					} else if (evt.type === 'click' || evt.keyCode === DOM_VK_DOWN) {
+						t.showMenu();
+						Event.cancel(evt);
+					}
 				});
 			}
 
-			Event.add(t.id + '_open', 'click', t.showMenu, t);
-			Event.add(t.id + '_open', 'focus', function() {t._focused = 1;});
-			Event.add(t.id + '_open', 'blur', function() {t._focused = 0;});
+			Event.add(t.id + '_open', 'click', function (evt) {
+				t.showMenu();
+				Event.cancel(evt);
+			});
+			Event.add([t.id, t.id + '_open'], 'focus', function() {t._focused = 1;});
+			Event.add([t.id, t.id + '_open'], 'blur', function() {t._focused = 0;});
 
 			// Old IE doesn't have hover on all elements
 			if (tinymce.isIE6 || !DOM.boxModel) {
@@ -7666,6 +10030,7 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
 
 			Event.clear(this.id + '_action');
 			Event.clear(this.id + '_open');
+			Event.clear(this.id);
 		}
 	});
 })(tinymce);
@@ -7674,10 +10039,10 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
 	var DOM = tinymce.DOM, Event = tinymce.dom.Event, is = tinymce.is, each = tinymce.each;
 
 	tinymce.create('tinymce.ui.ColorSplitButton:tinymce.ui.SplitButton', {
-		ColorSplitButton : function(id, s) {
+		ColorSplitButton : function(id, s, ed) {
 			var t = this;
 
-			t.parent(id, s);
+			t.parent(id, s, ed);
 
 			t.settings = s = tinymce.extend({
 				colors : '000000,993300,333300,003300,003366,000080,333399,333333,800000,FF6600,808000,008000,008080,0000FF,666699,808080,FF0000,FF9900,99CC00,339966,33CCCC,3366FF,800080,999999,FF00FF,FFCC00,FFFF00,00FF00,00FFFF,00CCFF,993366,C0C0C0,FF99CC,FFCC99,FFFF99,CCFFCC,CCFFFF,99CCFF,CC99FF,FFFFFF',
@@ -7735,30 +10100,30 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
 		hideMenu : function(e) {
 			var t = this;
 
-			// Prevent double toogles by canceling the mouse click event to the button
-			if (e && e.type == "mousedown" && DOM.getParent(e.target, function(e) {return e.id === t.id + '_open';}))
-				return;
+			if (t.isMenuVisible) {
+				// Prevent double toogles by canceling the mouse click event to the button
+				if (e && e.type == "mousedown" && DOM.getParent(e.target, function(e) {return e.id === t.id + '_open';}))
+					return;
 
-			if (!e || !DOM.getParent(e.target, '.mceSplitButtonMenu')) {
-				DOM.removeClass(t.id, 'mceSplitButtonSelected');
-				Event.remove(DOM.doc, 'mousedown', t.hideMenu, t);
-				Event.remove(t.id + '_menu', 'keydown', t._keyHandler);
-				DOM.hide(t.id + '_menu');
+				if (!e || !DOM.getParent(e.target, '.mceSplitButtonMenu')) {
+					DOM.removeClass(t.id, 'mceSplitButtonSelected');
+					Event.remove(DOM.doc, 'mousedown', t.hideMenu, t);
+					Event.remove(t.id + '_menu', 'keydown', t._keyHandler);
+					DOM.hide(t.id + '_menu');
+				}
+
+				t.isMenuVisible = 0;
 			}
-
-			t.onHideMenu.dispatch(t);
-
-			t.isMenuVisible = 0;
 		},
 
 		renderMenu : function() {
-			var t = this, m, i = 0, s = t.settings, n, tb, tr, w;
+			var t = this, m, i = 0, s = t.settings, n, tb, tr, w, context;
 
-			w = DOM.add(s.menu_container, 'div', {id : t.id + '_menu', 'class' : s['menu_class'] + ' ' + s['class'], style : 'position:absolute;left:0;top:-1000px;'});
+			w = DOM.add(s.menu_container, 'div', {role: 'listbox', id : t.id + '_menu', 'class' : s['menu_class'] + ' ' + s['class'], style : 'position:absolute;left:0;top:-1000px;'});
 			m = DOM.add(w, 'div', {'class' : s['class'] + ' mceSplitButtonMenu'});
 			DOM.add(m, 'span', {'class' : 'mceMenuLine'});
 
-			n = DOM.add(m, 'table', {'class' : 'mceColorSplitMenu'});
+			n = DOM.add(m, 'table', {role: 'presentation', 'class' : 'mceColorSplitMenu'});
 			tb = DOM.add(n, 'tbody');
 
 			// Generate color grid
@@ -7772,20 +10137,32 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
 				}
 
 				n = DOM.add(tr, 'td');
-
 				n = DOM.add(n, 'a', {
+					role : 'option',
 					href : 'javascript:;',
 					style : {
 						backgroundColor : '#' + c
 					},
-					_mce_color : '#' + c
+					'title': t.editor.getLang('colors.' + c, c),
+					'data-mce-color' : '#' + c
 				});
+
+				if (t.editor.forcedHighContrastMode) {
+					n = DOM.add(n, 'canvas', { width: 16, height: 16, 'aria-hidden': 'true' });
+					if (n.getContext && (context = n.getContext("2d"))) {
+						context.fillStyle = '#' + c;
+						context.fillRect(0, 0, 16, 16);
+					} else {
+						// No point leaving a canvas element around if it's not supported for drawing on anyway.
+						DOM.remove(n);
+					}
+				}
 			});
 
 			if (s.more_colors_func) {
 				n = DOM.add(tb, 'tr');
 				n = DOM.add(n, 'td', {colspan : s.grid_width, 'class' : 'mceMoreColors'});
-				n = DOM.add(n, 'a', {id : t.id + '_more', href : 'javascript:;', onclick : 'return false;', 'class' : 'mceMoreColors'}, s.more_colors_title);
+				n = DOM.add(n, 'a', {role: 'option', id : t.id + '_more', href : 'javascript:;', onclick : 'return false;', 'class' : 'mceMoreColors'}, s.more_colors_title);
 
 				Event.add(n, 'click', function(e) {
 					s.more_colors_func.call(s.more_colors_scope || this);
@@ -7794,13 +10171,25 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
 			}
 
 			DOM.addClass(m, 'mceColorSplitMenu');
+			
+			new tinymce.ui.KeyboardNavigation({
+				root: t.id + '_menu',
+				items: DOM.select('a', t.id + '_menu'),
+				onCancel: function() {
+					t.hideMenu();
+					t.focus();
+				}
+			});
+
+			// Prevent IE from scrolling and hindering click to occur #4019
+			Event.add(t.id + '_menu', 'mousedown', function(e) {return Event.cancel(e);});
 
 			Event.add(t.id + '_menu', 'click', function(e) {
 				var c;
 
-				e = e.target;
+				e = DOM.getParent(e.target, 'a', tb);
 
-				if (e.nodeName == 'A' && (c = e.getAttribute('_mce_color')))
+				if (e && e.nodeName.toLowerCase() == 'a' && (c = e.getAttribute('data-mce-color')))
 					t.setColor(c);
 
 				return Event.cancel(e); // Prevent IE auto save warning
@@ -7810,13 +10199,17 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
 		},
 
 		setColor : function(c) {
+			this.displayColor(c);
+			this.hideMenu();
+			this.settings.onselect(c);
+		},
+		
+		displayColor : function(c) {
 			var t = this;
 
 			DOM.setStyle(t.id + '_preview', 'backgroundColor', c);
 
 			t.value = c;
-			t.hideMenu();
-			t.settings.onselect(c);
 		},
 
 		postRender : function() {
@@ -7837,9 +10230,67 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
 	});
 })(tinymce);
 
+(function(tinymce) {
+// Shorten class names
+var dom = tinymce.DOM, each = tinymce.each, Event = tinymce.dom.Event;
+tinymce.create('tinymce.ui.ToolbarGroup:tinymce.ui.Container', {
+	renderHTML : function() {
+		var t = this, h = [], controls = t.controls, each = tinymce.each, settings = t.settings;
+
+		h.push('<div id="' + t.id + '" role="group" aria-labelledby="' + t.id + '_voice">');
+		//TODO: ACC test this out - adding a role = application for getting the landmarks working well.
+		h.push("<span role='application'>");
+		h.push('<span id="' + t.id + '_voice" class="mceVoiceLabel" style="display:none;">' + dom.encode(settings.name) + '</span>');
+		each(controls, function(toolbar) {
+			h.push(toolbar.renderHTML());
+		});
+		h.push("</span>");
+		h.push('</div>');
+
+		return h.join('');
+	},
+	
+	focus : function() {
+		this.keyNav.focus();
+	},
+	
+	postRender : function() {
+		var t = this, items = [];
+
+		each(t.controls, function(toolbar) {
+			each (toolbar.controls, function(control) {
+				if (control.id) {
+					items.push(control);
+				}
+			});
+		});
+
+		t.keyNav = new tinymce.ui.KeyboardNavigation({
+			root: t.id,
+			items: items,
+			onCancel: function() {
+				t.editor.focus();
+			},
+			excludeFromTabOrder: !t.settings.tab_focus_toolbar
+		});
+	},
+	
+	destroy : function() {
+		var self = this;
+
+		self.parent();
+		self.keyNav.destroy();
+		Event.clear(self.id);
+	}
+});
+})(tinymce);
+
+(function(tinymce) {
+// Shorten class names
+var dom = tinymce.DOM, each = tinymce.each;
 tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 	renderHTML : function() {
-		var t = this, h = '', c, co, dom = tinymce.DOM, s = t.settings, i, pr, nx, cl;
+		var t = this, h = '', c, co, s = t.settings, i, pr, nx, cl;
 
 		cl = t.controls;
 		for (i=0; i<cl.length; i++) {
@@ -7896,50 +10347,102 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 
 		h += dom.createHTML('td', {'class' : c}, dom.createHTML('span', null, '<!-- IE -->'));
 
-		return dom.createHTML('table', {id : t.id, 'class' : 'mceToolbar' + (s['class'] ? ' ' + s['class'] : ''), cellpadding : '0', cellspacing : '0', align : t.settings.align || ''}, '<tbody><tr>' + h + '</tr></tbody>');
+		return dom.createHTML('table', {id : t.id, 'class' : 'mceToolbar' + (s['class'] ? ' ' + s['class'] : ''), cellpadding : '0', cellspacing : '0', align : t.settings.align || '', role: 'presentation', tabindex: '-1'}, '<tbody><tr>' + h + '</tr></tbody>');
 	}
 });
+})(tinymce);
 
 (function(tinymce) {
 	var Dispatcher = tinymce.util.Dispatcher, each = tinymce.each;
 
 	tinymce.create('tinymce.AddOnManager', {
-		items : [],
-		urls : {},
-		lookup : {},
+		AddOnManager : function() {
+			var self = this;
 
-		onAdd : new Dispatcher(this),
+			self.items = [];
+			self.urls = {};
+			self.lookup = {};
+			self.onAdd = new Dispatcher(self);
+		},
 
 		get : function(n) {
-			return this.lookup[n];
+			if (this.lookup[n]) {
+				return this.lookup[n].instance;
+			} else {
+				return undefined;
+			}
+		},
+
+		dependencies : function(n) {
+			var result;
+			if (this.lookup[n]) {
+				result = this.lookup[n].dependencies;
+			}
+			return result || [];
 		},
 
 		requireLangPack : function(n) {
 			var s = tinymce.settings;
 
-			if (s && s.language)
+			if (s && s.language && s.language_load !== false)
 				tinymce.ScriptLoader.add(this.urls[n] + '/langs/' + s.language + '.js');
 		},
 
-		add : function(id, o) {
+		add : function(id, o, dependencies) {
 			this.items.push(o);
-			this.lookup[id] = o;
+			this.lookup[id] = {instance:o, dependencies:dependencies};
 			this.onAdd.dispatch(this, id, o);
 
 			return o;
 		},
+		createUrl: function(baseUrl, dep) {
+			if (typeof dep === "object") {
+				return dep
+			} else {
+				return {prefix: baseUrl.prefix, resource: dep, suffix: baseUrl.suffix};
+			}
+		},
+
+		addComponents: function(pluginName, scripts) {
+			var pluginUrl = this.urls[pluginName];
+			tinymce.each(scripts, function(script){
+				tinymce.ScriptLoader.add(pluginUrl+"/"+script);	
+			});
+		},
 
 		load : function(n, u, cb, s) {
-			var t = this;
+			var t = this, url = u;
+
+			function loadDependencies() {
+				var dependencies = t.dependencies(n);
+				tinymce.each(dependencies, function(dep) {
+					var newUrl = t.createUrl(u, dep);
+					t.load(newUrl.resource, newUrl, undefined, undefined);
+				});
+				if (cb) {
+					if (s) {
+						cb.call(s);
+					} else {
+						cb.call(tinymce.ScriptLoader);
+					}
+				}
+			}
 
 			if (t.urls[n])
 				return;
+			if (typeof u === "object")
+				url = u.prefix + u.resource + u.suffix;
 
-			if (u.indexOf('/') != 0 && u.indexOf('://') == -1)
-				u = tinymce.baseURL + '/' +  u;
+			if (url.indexOf('/') != 0 && url.indexOf('://') == -1)
+				url = tinymce.baseURL + '/' + url;
 
-			t.urls[n] = u.substring(0, u.lastIndexOf('/'));
-			tinymce.ScriptLoader.add(u, cb, s);
+			t.urls[n] = url.substring(0, url.lastIndexOf('/'));
+
+			if (t.lookup[n]) {
+				loadDependencies();
+			} else {
+				tinymce.ScriptLoader.add(url, loadDependencies, s);
+			}
 		}
 	});
 
@@ -8122,11 +10625,6 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 			self.onAddEditor.dispatch(self, editor);
 
 
-			// Patch the tinymce.Editor instance with jQuery adapter logic
-			if (tinymce.adapter)
-				tinymce.adapter.patchEditor(editor);
-
-
 			return editor;
 		},
 
@@ -8401,7 +10899,6 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 				apply_source_formatting : 1,
 				directionality : 'ltr',
 				forced_root_block : 'p',
-				valid_elements : '@[id|class|style|title|dir<ltr?rtl|lang|xml::lang|onclick|ondblclick|onmousedown|onmouseup|onmouseover|onmousemove|onmouseout|onkeypress|onkeydown|onkeyup],a[rel|rev|charset|hreflang|tabindex|accesskey|type|name|href|target|title|class|onfocus|onblur],strong/b,em/i,strike,u,#p,-ol[type|compact],-ul[type|compact],-li,br,img[longdesc|usemap|src|border|alt=|title|hspace|vspace|width|height|align],-sub,-sup,-blockquote[cite],-table[border|cellspacing|cellpadding|width|frame|rules|height|align|summary|bgcolor|background|bordercolor],-tr[rowspan|width|height|align|valign|bgcolor|background|bordercolor],tbody,thead,tfoot,#td[colspan|rowspan|width|height|align|valign|bgcolor|background|bordercolor|scope],#th[colspan|rowspan|width|height|align|valign|scope],caption,-div,-span,-code,-pre,address,-h1,-h2,-h3,-h4,-h5,-h6,hr[size|noshade],-font[face|size|color],dd,dl,dt,cite,abbr,acronym,del[datetime|cite],ins[datetime|cite],object[classid|width|height|codebase|*],param[name|value],embed[type|width|height|src|*],script[src|type],map[name],area[shape|coords|href|alt|target],bdo,button,col[align|char|charoff|span|valign|width],colgroup[align|char|charoff|span|valign|width],dfn,fieldset,form[action|accept|accept-charset|enctype|method],input[accept|alt|checked|disabled|maxlength|name|readonly|size|src|type|value|tabindex|accesskey],kbd,label[for],legend,noscript,optgroup[label|disabled],option[disabled|label|selected|value],q[cite],samp,select[disabled|multiple|name|size],small,textarea[cols|rows|disabled|name|readonly],tt,var,big',
 				hidden_input : 1,
 				padd_empty_editor : 1,
 				render_ui : 1,
@@ -8411,7 +10908,15 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 				keep_styles : 1,
 				fix_table_elements : 1,
 				inline_styles : 1,
-				convert_fonts_to_spans : true
+				convert_fonts_to_spans : true,
+				indent : 'simple',
+				indent_before : 'p,h1,h2,h3,h4,h5,h6,blockquote,div,title,style,pre,script,td,ul,li,area,table,thead,tfoot,tbody,tr',
+				indent_after : 'p,h1,h2,h3,h4,h5,h6,blockquote,div,title,style,pre,script,td,ul,li,area,table,thead,tfoot,tbody,tr',
+				validate : true,
+				entity_encoding : 'named',
+				url_converter : t.convertURL,
+				url_converter_scope : t,
+				ie7_compat : true
 			}, s);
 
 			t.documentBaseURI = new tinymce.util.URI(s.document_base_url || tinymce.documentBaseURL, {
@@ -8420,6 +10925,8 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 
 			t.baseURI = tinymce.baseURI;
 
+			t.contentCSS = [];
+
 			// Call setup
 			t.execCallback('setup', t);
 		},
@@ -8441,10 +10948,10 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 			if (!t.getElement())
 				return;
 
-			// Is a iPad/iPhone, then skip initialization. We need to sniff here since the
-			// browser says it has contentEditable support but there is no visible caret
-			// We will remove this check ones Apple implements full contentEditable support
-			if (tinymce.isIDevice)
+			// Is a iPad/iPhone and not on iOS5, then skip initialization. We need to sniff 
+			// here since the browser says it has contentEditable support but there is no visible
+			// caret We will remove this check ones Apple implements full contentEditable support
+			if (tinymce.isIDevice && !tinymce.isIOS5)
 				return;
 
 			// Add hidden input for non input elements inside form elements
@@ -8509,19 +11016,30 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 
 			// Load scripts
 			function loadScripts() {
-				if (s.language)
+				if (s.language && s.language_load !== false)
 					sl.add(tinymce.baseURL + '/langs/' + s.language + '.js');
 
 				if (s.theme && s.theme.charAt(0) != '-' && !ThemeManager.urls[s.theme])
 					ThemeManager.load(s.theme, 'themes/' + s.theme + '/editor_template' + tinymce.suffix + '.js');
 
 				each(explode(s.plugins), function(p) {
-					if (p && p.charAt(0) != '-' && !PluginManager.urls[p]) {
-						// Skip safari plugin, since it is removed as of 3.3b1
-						if (p == 'safari')
-							return;
-
-						PluginManager.load(p, 'plugins/' + p + '/editor_plugin' + tinymce.suffix + '.js');
+					if (p &&!PluginManager.urls[p]) {
+						if (p.charAt(0) == '-') {
+							p = p.substr(1, p.length);
+							var dependencies = PluginManager.dependencies(p);
+							each(dependencies, function(dep) {
+								var defaultSettings = {prefix:'plugins/', resource: dep, suffix:'/editor_plugin' + tinymce.suffix + '.js'};
+								var dep = PluginManager.createUrl(defaultSettings, dep);
+								PluginManager.load(dep.resource, dep);
+								
+							});
+						} else {
+							// Skip safari plugin, since it is removed as of 3.3b1
+							if (p == 'safari') {
+								return;
+							}
+							PluginManager.load(p, {prefix:'plugins/', resource: p, suffix:'/editor_plugin' + tinymce.suffix + '.js'});
+						}
 					}
 				});
 
@@ -8536,10 +11054,12 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 		},
 
 		init : function() {
-			var n, t = this, s = t.settings, w, h, e = t.getElement(), o, ti, u, bi, bc, re;
+			var n, t = this, s = t.settings, w, h, e = t.getElement(), o, ti, u, bi, bc, re, i, initializedPlugins = [];
 
 			tinymce.add(t);
 
+			s.aria_label = s.aria_label || DOM.getAttrib(e, 'aria-label', t.getLang('aria.rich_text_area'));
+
 			if (s.theme) {
 				s.theme = s.theme.replace(/-/, '');
 				o = ThemeManager.get(s.theme);
@@ -8548,20 +11068,25 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 				if (t.theme.init && s.init_theme)
 					t.theme.init(t, ThemeManager.urls[s.theme] || tinymce.documentBaseURL.replace(/\/$/, ''));
 			}
-
-			// Create all plugins
-			each(explode(s.plugins.replace(/\-/g, '')), function(p) {
+			function initPlugin(p) {
 				var c = PluginManager.get(p), u = PluginManager.urls[p] || tinymce.documentBaseURL.replace(/\/$/, ''), po;
-
-				if (c) {
+				if (c && tinymce.inArray(initializedPlugins,p) === -1) {
+					each(PluginManager.dependencies(p), function(dep){
+						initPlugin(dep);
+					});
 					po = new c(t, u);
 
 					t.plugins[p] = po;
 
-					if (po.init)
+					if (po.init) {
 						po.init(t, u);
+						initializedPlugins.push(p);
+					}
 				}
-			});
+			}
+			
+			// Create all plugins
+			each(explode(s.plugins.replace(/\-/g, '')), initPlugin);
 
 			// Setup popup CSS path(s)
 			if (s.popup_css !== false) {
@@ -8577,12 +11102,9 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 			t.controlManager = new tinymce.ControlManager(t);
 
 			if (s.custom_undo_redo) {
-				// Add initial undo level
 				t.onBeforeExecCommand.add(function(ed, cmd, ui, val, a) {
-					if (cmd != 'Undo' && cmd != 'Redo' && cmd != 'mceRepaint' && (!a || !a.skip_undo)) {
-						if (!t.undoManager.hasUndo())
-							t.undoManager.add();
-					}
+					if (cmd != 'Undo' && cmd != 'Redo' && cmd != 'mceRepaint' && (!a || !a.skip_undo))
+						t.undoManager.beforeChange();
 				});
 
 				t.onExecCommand.add(function(ed, cmd, ui, val, a) {
@@ -8648,6 +11170,13 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 				height : h
 			});
 
+			// Load specified content CSS last
+			if (s.content_css) {
+				tinymce.each(explode(s.content_css), function(u) {
+					t.contentCSS.push(t.documentBaseURI.toAbsolute(u));
+				});
+			}
+
 			h = (o.iframeHeight || h) + (typeof(h) == 'number' ? (o.deltaHeight || 0) : '');
 			if (h < 100)
 				h = 100;
@@ -8659,10 +11188,21 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 			if (s.document_base_url != tinymce.documentBaseURL)
 				t.iframeHTML += '<base href="' + t.documentBaseURI.getURI() + '" />';
 
-			t.iframeHTML += '<meta http-equiv="X-UA-Compatible" content="IE=7" /><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />';
+			// IE8 doesn't support carets behind images setting ie7_compat would force IE8+ to run in IE7 compat mode.
+			if (s.ie7_compat)
+				t.iframeHTML += '<meta http-equiv="X-UA-Compatible" content="IE=7" />';
+			else
+				t.iframeHTML += '<meta http-equiv="X-UA-Compatible" content="IE=edge" />';
 
-			if (tinymce.relaxedDomain)
-				t.iframeHTML += '<script type="text/javascript">document.domain = "' + tinymce.relaxedDomain + '";</script>';
+			t.iframeHTML += '<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />';
+
+			// Firefox 2 doesn't load stylesheets correctly this way
+			if (!isGecko || !/Firefox\/2/.test(navigator.userAgent)) {
+				for (i = 0; i < t.contentCSS.length; i++)
+					t.iframeHTML += '<link type="text/css" rel="stylesheet" href="' + t.contentCSS[i] + '" />';
+
+				t.contentCSS = [];
+			}
 
 			bi = s.body_id || 'tinymce';
 			if (bi.indexOf('=') != -1) {
@@ -8679,19 +11219,19 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 			t.iframeHTML += '</head><body id="' + bi + '" class="mceContentBody ' + bc + '"></body></html>';
 
 			// Domain relaxing enabled, then set document domain
-			if (tinymce.relaxedDomain) {
+			if (tinymce.relaxedDomain && (isIE || (tinymce.isOpera && parseFloat(opera.version()) < 11))) {
 				// We need to write the contents here in IE since multiple writes messes up refresh button and back button
-				if (isIE || (tinymce.isOpera && parseFloat(opera.version()) >= 9.5))
-					u = 'javascript:(function(){document.open();document.domain="' + document.domain + '";var ed = window.parent.tinyMCE.get("' + t.id + '");document.write(ed.iframeHTML);document.close();ed.setupIframe();})()';
-				else if (tinymce.isOpera)
-					u = 'javascript:(function(){document.open();document.domain="' + document.domain + '";document.close();ed.setupIframe();})()';					
+				u = 'javascript:(function(){document.open();document.domain="' + document.domain + '";var ed = window.parent.tinyMCE.get("' + t.id + '");document.write(ed.iframeHTML);document.close();ed.setupIframe();})()';				
 			}
 
 			// Create iframe
-			n = DOM.add(o.iframeContainer, 'iframe', {
+			// TODO: ACC add the appropriate description on this.
+			n = DOM.add(o.iframeContainer, 'iframe', { 
 				id : t.id + "_ifr",
 				src : u || 'javascript:""', // Workaround for HTTPS warning in IE6/7
 				frameBorder : '0',
+				allowTransparency : "true",
+				title : s.aria_label,
 				style : {
 					width : '100%',
 					height : h
@@ -8701,45 +11241,78 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 			t.contentAreaContainer = o.iframeContainer;
 			DOM.get(o.editorContainer).style.display = t.orgDisplay;
 			DOM.get(t.id).style.display = 'none';
+			DOM.setAttrib(t.id, 'aria-hidden', true);
 
-			if (!isIE || !tinymce.relaxedDomain)
+			if (!tinymce.relaxedDomain || !u)
 				t.setupIframe();
 
 			e = n = o = null; // Cleanup
 		},
 
-		setupIframe : function() {
+		setupIframe : function(filled) {
 			var t = this, s = t.settings, e = DOM.get(t.id), d = t.getDoc(), h, b;
 
 			// Setup iframe body
-			if (!isIE || !tinymce.relaxedDomain) {
+			if ((!isIE || !tinymce.relaxedDomain) && !filled) {
+				// We need to wait for the load event on Gecko
+				if (isGecko && !s.readonly) {
+					t.getWin().onload = function() {
+						window.setTimeout(function() {
+							var b = t.getBody(), undef;
+
+							// Editable element needs to have some contents or backspace/delete won't work properly for some odd reason on FF 3.6 or older
+							b.innerHTML = '<br>';
+
+							// Check if Gecko supports contentEditable mode FF2 doesn't
+							if (b.contentEditable !== undef) {
+								// Setting the contentEditable off/on seems to force caret mode in the editor and enabled auto focus
+								b.contentEditable = false;
+								b.contentEditable = true;
+
+								// Caret doesn't get rendered when you mousedown on the HTML element on FF 3.x
+								t.onMouseDown.add(function(ed, e) {
+									if (e.target.nodeName === "HTML") {
+										d.designMode = 'on'; // Render the caret
+
+										// Remove design mode again after a while so it has some time to execute
+										window.setTimeout(function() {
+											d.designMode = 'off';
+											t.getBody().focus();
+										}, 1);
+									}
+								});
+							} else
+								d.designMode = 'on';
+
+							// Call setup frame once the contentEditable/designMode has been initialized
+							// since the caret won't be rendered some times otherwise.
+							t.setupIframe(true);
+						}, 1);
+					};
+				}
+
 				d.open();
 				d.write(t.iframeHTML);
 				d.close();
+
+				if (tinymce.relaxedDomain)
+					d.domain = tinymce.relaxedDomain;
+
+				// Wait for iframe onload event on Gecko
+				if (isGecko && !s.readonly)
+					return;
 			}
 
-			// Design mode needs to be added here Ctrl+A will fail otherwise
-			if (!isIE) {
-				try {
-					if (!s.readonly)
-						d.designMode = 'On';
-				} catch (ex) {
-					// Will fail on Gecko if the editor is placed in an hidden container element
-					// The design mode will be set ones the editor is focused
-				}
-			}
+			// It will not steal focus while setting contentEditable
+			b = t.getBody();
+			b.disabled = true;
 
-			// IE needs to use contentEditable or it will display non secure items for HTTPS
-			if (isIE) {
-				// It will not steal focus if we hide it while setting contentEditable
-				b = t.getBody();
-				DOM.hide(b);
+			if (!isGecko && !s.readonly)
+				b.contentEditable = true;
 
-				if (!s.readonly)
-					b.contentEditable = true;
+			b.disabled = false;
 
-				DOM.show(b);
-			}
+			t.schema = new tinymce.html.Schema(s);
 
 			t.dom = new tinymce.dom.DOMUtils(t.getDoc(), {
 				keep_values : true,
@@ -8749,16 +11322,83 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 				class_filter : s.class_filter,
 				update_styles : 1,
 				fix_ie_paragraphs : 1,
-				valid_styles : s.valid_styles
+				schema : t.schema
 			});
 
-			t.schema = new tinymce.dom.Schema();
+			t.parser = new tinymce.html.DomParser(s, t.schema);
 
-			t.serializer = new tinymce.dom.Serializer(extend(s, {
-				valid_elements : s.verify_html === false ? '*[*]' : s.valid_elements,
-				dom : t.dom,
-				schema : t.schema
-			}));
+			// Force anchor names closed, unless the setting "allow_html_in_named_anchor" is explicitly included.
+			if (!t.settings.allow_html_in_named_anchor) {
+				t.parser.addAttributeFilter('name', function(nodes, name) {
+					var i = nodes.length, sibling, prevSibling, parent, node;
+	
+					while (i--) {
+						node = nodes[i];
+						if (node.name === 'a' && node.firstChild) {
+							parent = node.parent;
+	
+							// Move children after current node
+							sibling = node.lastChild;
+							do {
+								prevSibling = sibling.prev;
+								parent.insert(sibling, node);
+								sibling = prevSibling;
+							} while (sibling);
+						}
+					}
+				});
+			}
+
+			// Convert src and href into data-mce-src, data-mce-href and data-mce-style
+			t.parser.addAttributeFilter('src,href,style', function(nodes, name) {
+				var i = nodes.length, node, dom = t.dom, value, internalName;
+
+				while (i--) {
+					node = nodes[i];
+					value = node.attr(name);
+					internalName = 'data-mce-' + name;
+
+					// Add internal attribute if we need to we don't on a refresh of the document
+					if (!node.attributes.map[internalName]) {	
+						if (name === "style")
+							node.attr(internalName, dom.serializeStyle(dom.parseStyle(value), node.name));
+						else
+							node.attr(internalName, t.convertURL(value, name, node.name));
+					}
+				}
+			});
+
+			// Keep scripts from executing
+			t.parser.addNodeFilter('script', function(nodes, name) {
+				var i = nodes.length;
+
+				while (i--)
+					nodes[i].attr('type', 'mce-text/javascript');
+			});
+
+			t.parser.addNodeFilter('#cdata', function(nodes, name) {
+				var i = nodes.length, node;
+
+				while (i--) {
+					node = nodes[i];
+					node.type = 8;
+					node.name = '#comment';
+					node.value = '[CDATA[' + node.value + ']]';
+				}
+			});
+
+			t.parser.addNodeFilter('p,h1,h2,h3,h4,h5,h6,div', function(nodes, name) {
+				var i = nodes.length, node, nonEmptyElements = t.schema.getNonEmptyElements();
+
+				while (i--) {
+					node = nodes[i];
+
+					if (node.isEmpty(nonEmptyElements))
+						node.empty().append(new tinymce.html.Node('br', 1)).shortEnded = true;
+				}
+			});
+
+			t.serializer = new tinymce.dom.Serializer(s, t.dom, t.schema);
 
 			t.selection = new tinymce.dom.Selection(t.dom, t.getWin(), t.serializer);
 
@@ -8768,18 +11408,18 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 			t.formatter.register({
 				alignleft : [
 					{selector : 'p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li', styles : {textAlign : 'left'}},
-					{selector : 'img,table', styles : {'float' : 'left'}}
+					{selector : 'img,table', collapsed : false, styles : {'float' : 'left'}}
 				],
 
 				aligncenter : [
 					{selector : 'p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li', styles : {textAlign : 'center'}},
-					{selector : 'img', styles : {display : 'block', marginLeft : 'auto', marginRight : 'auto'}},
-					{selector : 'table', styles : {marginLeft : 'auto', marginRight : 'auto'}}
+					{selector : 'img', collapsed : false, styles : {display : 'block', marginLeft : 'auto', marginRight : 'auto'}},
+					{selector : 'table', collapsed : false, styles : {marginLeft : 'auto', marginRight : 'auto'}}
 				],
 
 				alignright : [
 					{selector : 'p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li', styles : {textAlign : 'right'}},
-					{selector : 'img,table', styles : {'float' : 'right'}}
+					{selector : 'img,table', collapsed : false, styles : {'float' : 'right'}}
 				],
 
 				alignfull : [
@@ -8787,33 +11427,35 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 				],
 
 				bold : [
-					{inline : 'strong'},
+					{inline : 'strong', remove : 'all'},
 					{inline : 'span', styles : {fontWeight : 'bold'}},
-					{inline : 'b'}
+					{inline : 'b', remove : 'all'}
 				],
 
 				italic : [
-					{inline : 'em'},
+					{inline : 'em', remove : 'all'},
 					{inline : 'span', styles : {fontStyle : 'italic'}},
-					{inline : 'i'}
+					{inline : 'i', remove : 'all'}
 				],
 
 				underline : [
 					{inline : 'span', styles : {textDecoration : 'underline'}, exact : true},
-					{inline : 'u'}
+					{inline : 'u', remove : 'all'}
 				],
 
 				strikethrough : [
 					{inline : 'span', styles : {textDecoration : 'line-through'}, exact : true},
-					{inline : 'u'}
+					{inline : 'strike', remove : 'all'}
 				],
 
-				forecolor : {inline : 'span', styles : {color : '%value'}},
-				hilitecolor : {inline : 'span', styles : {backgroundColor : '%value'}},
+				forecolor : {inline : 'span', styles : {color : '%value'}, wrap_links : false},
+				hilitecolor : {inline : 'span', styles : {backgroundColor : '%value'}, wrap_links : false},
 				fontname : {inline : 'span', styles : {fontFamily : '%value'}},
 				fontsize : {inline : 'span', styles : {fontSize : '%value'}},
 				fontsize_class : {inline : 'span', attributes : {'class' : '%value'}},
 				blockquote : {block : 'blockquote', wrapper : 1, remove : 'all'},
+				subscript : {inline : 'sub'},
+				superscript : {inline : 'sup'},
 
 				removeformat : [
 					{selector : 'b,strong,em,i,font,u,strike', remove : 'all', split : true, expand : false, block_expand : true, deep : true},
@@ -8834,7 +11476,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 
 			// Pass through
 			t.undoManager.onAdd.add(function(um, l) {
-				if (!l.initial)
+				if (um.hasUndo())
 					return t.onChange.dispatch(t, l, um);
 			});
 
@@ -8878,29 +11520,6 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 			if (s.nowrap)
 				t.getBody().style.whiteSpace = "nowrap";
 
-			if (s.custom_elements) {
-				function handleCustom(ed, o) {
-					each(explode(s.custom_elements), function(v) {
-						var n;
-
-						if (v.indexOf('~') === 0) {
-							v = v.substring(1);
-							n = 'span';
-						} else
-							n = 'div';
-
-						o.content = o.content.replace(new RegExp('<(' + v + ')([^>]*)>', 'g'), '<' + n + ' _mce_name="$1"$2>');
-						o.content = o.content.replace(new RegExp('</(' + v + ')>', 'g'), '</' + n + '>');
-					});
-				};
-
-				t.onBeforeSetContent.add(handleCustom);
-				t.onPostProcess.add(function(ed, o) {
-					if (o.set)
-						handleCustom(ed, o);
-				});
-			}
-
 			if (s.handle_node_change_callback) {
 				t.onNodeChange.add(function(ed, cm, n) {
 					t.execCallback('handle_node_change_callback', t.id, n, -1, -1, true, t.selection.isCollapsed());
@@ -8922,6 +11541,18 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 				});
 			}
 
+			if (s.protect) {
+				t.onBeforeSetContent.add(function(ed, o) {
+					if (s.protect) {
+						each(s.protect, function(pattern) {
+							o.content = o.content.replace(pattern, function(str) {
+								return '<!--mce:protected ' + escape(str) + '-->';
+							});
+						});
+					}
+				});
+			}
+
 			if (s.convert_newlines_to_brs) {
 				t.onBeforeSetContent.add(function(ed, o) {
 					if (o.initial)
@@ -8929,12 +11560,6 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 				});
 			}
 
-			if (s.fix_nesting && isIE) {
-				t.onBeforeSetContent.add(function(ed, o) {
-					o.content = t._fixNesting(o.content);
-				});
-			}
-
 			if (s.preformatted) {
 				t.onPostProcess.add(function(ed, o) {
 					o.content = o.content.replace(/^\s*<pre.*?>/, '');
@@ -9028,7 +11653,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 						var pn = n.parentNode;
 
 						if (ed.dom.isBlock(pn) && pn.lastChild === n)
-							ed.dom.add(pn, 'br', {'_mce_bogus' : 1});
+							ed.dom.add(pn, 'br', {'data-mce-bogus' : 1});
 					});
 				};
 
@@ -9038,54 +11663,36 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 				});
 
 				t.onSetContent.add(t.selection.onSetContent.add(fixLinks));
-
-				if (!s.readonly) {
-					try {
-						// Design mode must be set here once again to fix a bug where
-						// Ctrl+A/Delete/Backspace didn't work if the editor was added using mceAddControl then removed then added again
-						d.designMode = 'Off';
-						d.designMode = 'On';
-					} catch (ex) {
-						// Will fail on Gecko if the editor is placed in an hidden container element
-						// The design mode will be set ones the editor is focused
-					}
-				}
 			}
 
-			// A small timeout was needed since firefox will remove. Bug: #1838304
-			setTimeout(function () {
-				if (t.removed)
-					return;
+			t.load({initial : true, format : 'html'});
+			t.startContent = t.getContent({format : 'raw'});
+			t.undoManager.add();
+			t.initialized = true;
 
-				t.load({initial : true, format : (s.cleanup_on_startup ? 'html' : 'raw')});
-				t.startContent = t.getContent({format : 'raw'});
-				t.initialized = true;
+			t.onInit.dispatch(t);
+			t.execCallback('setupcontent_callback', t.id, t.getBody(), t.getDoc());
+			t.execCallback('init_instance_callback', t);
+			t.focus(true);
+			t.nodeChanged({initial : 1});
 
-				t.onInit.dispatch(t);
-				t.execCallback('setupcontent_callback', t.id, t.getBody(), t.getDoc());
-				t.execCallback('init_instance_callback', t);
-				t.focus(true);
-				t.nodeChanged({initial : 1});
+			// Load specified content CSS last
+			each(t.contentCSS, function(u) {
+				t.dom.loadCSS(u);
+			});
 
-				// Load specified content CSS last
-				if (s.content_css) {
-					tinymce.each(explode(s.content_css), function(u) {
-						t.dom.loadCSS(t.documentBaseURI.toAbsolute(u));
-					});
-				}
+			// Handle auto focus
+			if (s.auto_focus) {
+				setTimeout(function () {
+					var ed = tinymce.get(s.auto_focus);
 
-				// Handle auto focus
-				if (s.auto_focus) {
-					setTimeout(function () {
-						var ed = tinymce.get(s.auto_focus);
+					ed.selection.select(ed.getBody(), 1);
+					ed.selection.collapse(1);
+					ed.getBody().focus();
+					ed.getWin().focus();
+				}, 100);
+			}
 
-						ed.selection.select(ed.getBody(), 1);
-						ed.selection.collapse(1);
-						ed.getWin().focus();
-					}, 100);
-				}
-			}, 1);
-	
 			e = null;
 		},
 
@@ -9188,7 +11795,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 		},
 
 		nodeChanged : function(o) {
-			var t = this, s = t.selection, n = (isIE ? s.getNode() : s.getStart()) || t.getBody();
+			var t = this, s = t.selection, n = s.getStart() || t.getBody();
 
 			// Fix for bug #1896577 it seems that this can not be fired while the editor is loading
 			if (t.initialized) {
@@ -9221,16 +11828,16 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 			t.buttons[n] = s;
 		},
 
-		addCommand : function(n, f, s) {
-			this.execCommands[n] = {func : f, scope : s || this};
+		addCommand : function(name, callback, scope) {
+			this.execCommands[name] = {func : callback, scope : scope || this};
 		},
 
-		addQueryStateHandler : function(n, f, s) {
-			this.queryStateCommands[n] = {func : f, scope : s || this};
+		addQueryStateHandler : function(name, callback, scope) {
+			this.queryStateCommands[name] = {func : callback, scope : scope || this};
 		},
 
-		addQueryValueHandler : function(n, f, s) {
-			this.queryValueCommands[n] = {func : f, scope : s || this};
+		addQueryValueHandler : function(name, callback, scope) {
+			this.queryValueCommands[name] = {func : callback, scope : scope || this};
 		},
 
 		addShortcut : function(pa, desc, cmd_func, sc) {
@@ -9333,12 +11940,6 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 				return true;
 			}
 
-			// Execute global commands
-			if (tinymce.GlobalCommands.execCommand(t, cmd, ui, val)) {
-				t.onExecCommand.dispatch(t, cmd, ui, val, a);
-				return true;
-			}
-
 			// Editor commands
 			if (t.editorCommands.execCommand(cmd, ui, val)) {
 				t.onExecCommand.dispatch(t, cmd, ui, val, a);
@@ -9470,7 +12071,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 
 			// Add undo level will trigger onchange event
 			if (!o.no_events) {
-				t.undoManager.typing = 0;
+				t.undoManager.typing = false;
 				t.undoManager.add();
 			}
 
@@ -9502,66 +12103,85 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 			return h;
 		},
 
-		setContent : function(h, o) {
-			var t = this;
+		setContent : function(content, args) {
+			var self = this, rootNode, body = self.getBody(), forcedRootBlockName;
 
-			o = o || {};
-			o.format = o.format || 'html';
-			o.set = true;
-			o.content = h;
+			// Setup args object
+			args = args || {};
+			args.format = args.format || 'html';
+			args.set = true;
+			args.content = content;
 
-			if (!o.no_events)
-				t.onBeforeSetContent.dispatch(t, o);
+			// Do preprocessing
+			if (!args.no_events)
+				self.onBeforeSetContent.dispatch(self, args);
+
+			content = args.content;
 
 			// Padd empty content in Gecko and Safari. Commands will otherwise fail on the content
 			// It will also be impossible to place the caret in the editor unless there is a BR element present
-			if (!tinymce.isIE && (h.length === 0 || /^\s+$/.test(h))) {
-				o.content = t.dom.setHTML(t.getBody(), '<br _mce_bogus="1" />');
-				o.format = 'raw';
+			if (!tinymce.isIE && (content.length === 0 || /^\s+$/.test(content))) {
+				forcedRootBlockName = self.settings.forced_root_block;
+				if (forcedRootBlockName)
+					content = '<' + forcedRootBlockName + '><br data-mce-bogus="1"></' + forcedRootBlockName + '>';
+				else
+					content = '<br data-mce-bogus="1">';
+
+				body.innerHTML = content;
+				self.selection.select(body, true);
+				self.selection.collapse(true);
+				return;
 			}
 
-			o.content = t.dom.setHTML(t.getBody(), tinymce.trim(o.content));
-
-			if (o.format != 'raw' && t.settings.cleanup) {
-				o.getInner = true;
-				o.content = t.dom.setHTML(t.getBody(), t.serializer.serialize(t.getBody(), o));
+			// Parse and serialize the html
+			if (args.format !== 'raw') {
+				content = new tinymce.html.Serializer({}, self.schema).serialize(
+					self.parser.parse(content)
+				);
 			}
 
-			if (!o.no_events)
-				t.onSetContent.dispatch(t, o);
+			// Set the new cleaned contents to the editor
+			args.content = tinymce.trim(content);
+			self.dom.setHTML(body, args.content);
 
-			return o.content;
+			// Do post processing
+			if (!args.no_events)
+				self.onSetContent.dispatch(self, args);
+
+			return args.content;
 		},
 
-		getContent : function(o) {
-			var t = this, h;
+		getContent : function(args) {
+			var self = this, content;
 
-			o = o || {};
-			o.format = o.format || 'html';
-			o.get = true;
+			// Setup args object
+			args = args || {};
+			args.format = args.format || 'html';
+			args.get = true;
 
-			if (!o.no_events)
-				t.onBeforeGetContent.dispatch(t, o);
+			// Do preprocessing
+			if (!args.no_events)
+				self.onBeforeGetContent.dispatch(self, args);
 
-			if (o.format != 'raw' && t.settings.cleanup) {
-				o.getInner = true;
-				h = t.serializer.serialize(t.getBody(), o);
-			} else
-				h = t.getBody().innerHTML;
+			// Get raw contents or by default the cleaned contents
+			if (args.format == 'raw')
+				content = self.getBody().innerHTML;
+			else
+				content = self.serializer.serialize(self.getBody(), args);
 
-			h = h.replace(/^\s*|\s*$/g, '');
-			o.content = h;
+			args.content = tinymce.trim(content);
 
-			if (!o.no_events)
-				t.onGetContent.dispatch(t, o);
+			// Do post processing
+			if (!args.no_events)
+				self.onGetContent.dispatch(self, args);
 
-			return o.content;
+			return args.content;
 		},
 
 		isDirty : function() {
-			var t = this;
+			var self = this;
 
-			return tinymce.trim(t.startContent) != tinymce.trim(t.getContent({format : 'raw', no_events : 1})) && !t.isNotDirty;
+			return tinymce.trim(self.startContent) != tinymce.trim(self.getContent({format : 'raw', no_events : 1})) && !self.isNotDirty;
 		},
 
 		getContainer : function() {
@@ -9739,7 +12359,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 
 		_addEvents : function() {
 			// 'focus', 'blur', 'dblclick', 'beforedeactivate', submit, reset
-			var t = this, i, s = t.settings, lo = {
+			var t = this, i, s = t.settings, dom = t.dom, lo = {
 				mouseup : 'onMouseUp',
 				mousedown : 'onMouseDown',
 				click : 'onClick',
@@ -9771,35 +12391,26 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 			each(lo, function(v, k) {
 				switch (k) {
 					case 'contextmenu':
-						if (tinymce.isOpera) {
-							// Fake contextmenu on Opera
-							t.dom.bind(t.getBody(), 'mousedown', function(e) {
-								if (e.ctrlKey) {
-									e.fakeType = 'contextmenu';
-									eventHandler(e);
-								}
-							});
-						} else
-							t.dom.bind(t.getBody(), k, eventHandler);
+						dom.bind(t.getDoc(), k, eventHandler);
 						break;
 
 					case 'paste':
-						t.dom.bind(t.getBody(), k, function(e) {
+						dom.bind(t.getBody(), k, function(e) {
 							eventHandler(e);
 						});
 						break;
 
 					case 'submit':
 					case 'reset':
-						t.dom.bind(t.getElement().form || DOM.getParent(t.id, 'form'), k, eventHandler);
+						dom.bind(t.getElement().form || DOM.getParent(t.id, 'form'), k, eventHandler);
 						break;
 
 					default:
-						t.dom.bind(s.content_editable ? t.getBody() : t.getDoc(), k, eventHandler);
+						dom.bind(s.content_editable ? t.getBody() : t.getDoc(), k, eventHandler);
 				}
 			});
 
-			t.dom.bind(s.content_editable ? t.getBody() : (isGecko ? t.getDoc() : t.getWin()), 'focus', function(e) {
+			dom.bind(s.content_editable ? t.getBody() : (isGecko ? t.getDoc() : t.getWin()), 'focus', function(e) {
 				t.focus(true);
 			});
 
@@ -9807,22 +12418,12 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 			// Fixes bug where a specified document_base_uri could result in broken images
 			// This will also fix drag drop of images in Gecko
 			if (tinymce.isGecko) {
-				// Convert all images to absolute URLs
-/*				t.onSetContent.add(function(ed, o) {
-					each(ed.dom.select('img'), function(e) {
-						var v;
-
-						if (v = e.getAttribute('_mce_src'))
-							e.src = t.documentBaseURI.toAbsolute(v);
-					})
-				});*/
-
-				t.dom.bind(t.getDoc(), 'DOMNodeInserted', function(e) {
+				dom.bind(t.getDoc(), 'DOMNodeInserted', function(e) {
 					var v;
 
 					e = e.target;
 
-					if (e.nodeType === 1 && e.nodeName === 'IMG' && (v = e.getAttribute('_mce_src')))
+					if (e.nodeType === 1 && e.nodeName === 'IMG' && (v = e.getAttribute('data-mce-src')))
 						e.src = t.documentBaseURI.toAbsolute(v);
 				});
 			}
@@ -9835,8 +12436,10 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 					if (isGecko && !s.readonly) {
 						if (t._isHidden()) {
 							try {
-								if (!s.content_editable)
-									d.designMode = 'On';
+								if (!s.content_editable) {
+									d.body.contentEditable = false;
+									d.body.contentEditable = true;
+								}
 							} catch (ex) {
 								// Fails if it's hidden
 							}
@@ -9863,18 +12466,20 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 				t.onMouseDown.add(setOpts);
 			}
 
-			// Workaround for bug, http://bugs.webkit.org/show_bug.cgi?id=12250
-			// WebKit can't even do simple things like selecting an image
-			// This also fixes so it's possible to select mceItemAnchors
-			if (tinymce.isWebKit) {
-				t.onClick.add(function(ed, e) {
-					e = e.target;
+			t.onClick.add(function(ed, e) {
+				e = e.target;
 
-					// Needs tobe the setBaseAndExtend or it will fail to select floated images
-					if (e.nodeName == 'IMG' || (e.nodeName == 'A' && t.dom.hasClass(e, 'mceItemAnchor')))
-						t.selection.getSel().setBaseAndExtent(e, 0, e, 1);
-				});
-			}
+				// Workaround for bug, http://bugs.webkit.org/show_bug.cgi?id=12250
+				// WebKit can't even do simple things like selecting an image
+				// Needs tobe the setBaseAndExtend or it will fail to select floated images
+				if (tinymce.isWebKit && e.nodeName == 'IMG')
+					t.selection.getSel().setBaseAndExtent(e, 0, e, 1);
+
+				if (e.nodeName == 'A' && dom.hasClass(e, 'mceItemAnchor'))
+					t.selection.select(e);
+
+				t.nodeChanged();
+			});
 
 			// Add node change handlers
 			t.onMouseUp.add(t.nodeChanged);
@@ -9965,7 +12570,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 			if (tinymce.isIE) {
 				// Fix so resize will only update the width and height attributes not the styles of an image
 				// It will also block mceItemNoResize items
-				t.dom.bind(t.getDoc(), 'controlselect', function(e) {
+				dom.bind(t.getDoc(), 'controlselect', function(e) {
 					var re = t.resizeInfo, cb;
 
 					e = e.target;
@@ -9975,28 +12580,28 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 						return;
 
 					if (re)
-						t.dom.unbind(re.node, re.ev, re.cb);
+						dom.unbind(re.node, re.ev, re.cb);
 
-					if (!t.dom.hasClass(e, 'mceItemNoResize')) {
+					if (!dom.hasClass(e, 'mceItemNoResize')) {
 						ev = 'resizeend';
-						cb = t.dom.bind(e, ev, function(e) {
+						cb = dom.bind(e, ev, function(e) {
 							var v;
 
 							e = e.target;
 
-							if (v = t.dom.getStyle(e, 'width')) {
-								t.dom.setAttrib(e, 'width', v.replace(/[^0-9%]+/g, ''));
-								t.dom.setStyle(e, 'width', '');
+							if (v = dom.getStyle(e, 'width')) {
+								dom.setAttrib(e, 'width', v.replace(/[^0-9%]+/g, ''));
+								dom.setStyle(e, 'width', '');
 							}
 
-							if (v = t.dom.getStyle(e, 'height')) {
-								t.dom.setAttrib(e, 'height', v.replace(/[^0-9%]+/g, ''));
-								t.dom.setStyle(e, 'height', '');
+							if (v = dom.getStyle(e, 'height')) {
+								dom.setAttrib(e, 'height', v.replace(/[^0-9%]+/g, ''));
+								dom.setStyle(e, 'height', '');
 							}
 						});
 					} else {
 						ev = 'resizestart';
-						cb = t.dom.bind(e, 'resizestart', Event.cancel, Event);
+						cb = dom.bind(e, 'resizestart', Event.cancel, Event);
 					}
 
 					re = t.resizeInfo = {
@@ -10005,27 +12610,6 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 						cb : cb
 					};
 				});
-
-				t.onKeyDown.add(function(ed, e) {
-					switch (e.keyCode) {
-						case 8:
-							// Fix IE control + backspace browser bug
-							if (t.selection.getRng().item) {
-								ed.dom.remove(t.selection.getRng().item(0));
-								return Event.cancel(e);
-							}
-					}
-				});
-
-				/*if (t.dom.boxModel) {
-					t.getBody().style.height = '100%';
-
-					Event.add(t.getWin(), 'resize', function(e) {
-						var docElm = t.getDoc().documentElement;
-
-						docElm.style.height = (docElm.offsetHeight - 10) + 'px';
-					});
-				}*/
 			}
 
 			if (tinymce.isOpera) {
@@ -10037,74 +12621,61 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 			// Add custom undo/redo handlers
 			if (s.custom_undo_redo) {
 				function addUndo() {
-					t.undoManager.typing = 0;
+					t.undoManager.typing = false;
 					t.undoManager.add();
 				};
 
-				t.dom.bind(t.getDoc(), 'focusout', function(e) {
+				dom.bind(t.getDoc(), 'focusout', function(e) {
 					if (!t.removed && t.undoManager.typing)
 						addUndo();
 				});
 
+				// Add undo level when contents is drag/dropped within the editor
+				t.dom.bind(t.dom.getRoot(), 'dragend', function(e) {
+					addUndo();
+				});
+
 				t.onKeyUp.add(function(ed, e) {
-					if ((e.keyCode >= 33 && e.keyCode <= 36) || (e.keyCode >= 37 && e.keyCode <= 40) || e.keyCode == 13 || e.keyCode == 45 || e.ctrlKey)
+					var keyCode = e.keyCode;
+
+					if ((keyCode >= 33 && keyCode <= 36) || (keyCode >= 37 && keyCode <= 40) || keyCode == 13 || keyCode == 45 || e.ctrlKey)
 						addUndo();
 				});
 
 				t.onKeyDown.add(function(ed, e) {
-					var rng, parent, bookmark;
+					var keyCode = e.keyCode, sel;
 
-					// IE has a really odd bug where the DOM might include an node that doesn't have
-					// a proper structure. If you try to access nodeValue it would throw an illegal value exception.
-					// This seems to only happen when you delete contents and it seems to be avoidable if you refresh the element
-					// after you delete contents from it. See: #3008923
-					if (isIE && e.keyCode == 46) {
-						rng = t.selection.getRng();
+					if (keyCode == 8) {
+						sel = t.getDoc().selection;
 
-						if (rng.parentElement) {
-							parent = rng.parentElement();
+						// Fix IE control + backspace browser bug
+						if (sel && sel.createRange && sel.createRange().item) {
+							t.undoManager.beforeChange();
+							ed.dom.remove(sel.createRange().item(0));
+							addUndo();
 
-							// Select next word when ctrl key is used in combo with delete
-							if (e.ctrlKey) {
-								rng.moveEnd('word', 1);
-								rng.select();
-							}
-
-							// Delete contents
-							t.selection.getSel().clear();
-
-							// Check if we are within the same parent
-							if (rng.parentElement() == parent) {
-								bookmark = t.selection.getBookmark();
-
-								try {
-									// Update the HTML and hopefully it will remove the artifacts
-									parent.innerHTML = parent.innerHTML;
-								} catch (ex) {
-									// And since it's IE it can sometimes produce an unknown runtime error
-								}
-
-								// Restore the caret position
-								t.selection.moveToBookmark(bookmark);
-							}
-
-							// Block the default delete behavior since it might be broken
-							e.preventDefault();
-							return;
+							return Event.cancel(e);
 						}
 					}
 
-					// Is caracter positon keys
-					if ((e.keyCode >= 33 && e.keyCode <= 36) || (e.keyCode >= 37 && e.keyCode <= 40) || e.keyCode == 13 || e.keyCode == 45) {
+					// Is caracter positon keys left,right,up,down,home,end,pgdown,pgup,enter
+					if ((keyCode >= 33 && keyCode <= 36) || (keyCode >= 37 && keyCode <= 40) || keyCode == 13 || keyCode == 45) {
+						// Add position before enter key is pressed, used by IE since it still uses the default browser behavior
+						// Todo: Remove this once we normalize enter behavior on IE
+						if (tinymce.isIE && keyCode == 13)
+							t.undoManager.beforeChange();
+
 						if (t.undoManager.typing)
 							addUndo();
 
 						return;
 					}
 
-					if (!t.undoManager.typing) {
+					// If key isn't shift,ctrl,alt,capslock,metakey
+					if ((keyCode < 16 || keyCode > 20) && keyCode != 224 && keyCode != 91 && !t.undoManager.typing) {
+						t.undoManager.beforeChange();
+						t.undoManager.typing = true;
 						t.undoManager.add();
-						t.undoManager.typing = 1;
 					}
 				});
 
@@ -10113,6 +12684,53 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 						addUndo();
 				});
 			}
+
+			// Bug fix for FireFox keeping styles from end of selection instead of start.
+			if (tinymce.isGecko) {
+				function getAttributeApplyFunction() {
+					var template = t.dom.getAttribs(t.selection.getStart().cloneNode(false));
+
+					return function() {
+						var target = t.selection.getStart();
+						t.dom.removeAllAttribs(target);
+						each(template, function(attr) {
+							target.setAttributeNode(attr.cloneNode(true));
+						});
+					};
+				}
+
+				function isSelectionAcrossElements() {
+					var s = t.selection;
+
+					return !s.isCollapsed() && s.getStart() != s.getEnd();
+				}
+
+				t.onKeyPress.add(function(ed, e) {
+					var applyAttributes;
+
+					if ((e.keyCode == 8 || e.keyCode == 46) && isSelectionAcrossElements()) {
+						applyAttributes = getAttributeApplyFunction();
+						t.getDoc().execCommand('delete', false, null);
+						applyAttributes();
+
+						return Event.cancel(e);
+					}
+				});
+
+				t.dom.bind(t.getDoc(), 'cut', function(e) {
+					var applyAttributes;
+
+					if (isSelectionAcrossElements()) {
+						applyAttributes = getAttributeApplyFunction();
+						t.onKeyUp.addToTop(Event.cancel, Event);
+
+						setTimeout(function() {
+							applyAttributes();
+							t.onKeyUp.remove(Event.cancel, Event);
+						}, 0);
+					}
+				});
+			}
 		},
 
 		_isHidden : function() {
@@ -10124,57 +12742,6 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 			// Weird, wheres that cursor selection?
 			s = this.selection.getSel();
 			return (!s || !s.rangeCount || s.rangeCount == 0);
-		},
-
-		// Fix for bug #1867292
-		_fixNesting : function(s) {
-			var d = [], i;
-
-			s = s.replace(/<(\/)?([^\s>]+)[^>]*?>/g, function(a, b, c) {
-				var e;
-
-				// Handle end element
-				if (b === '/') {
-					if (!d.length)
-						return '';
-
-					if (c !== d[d.length - 1].tag) {
-						for (i=d.length - 1; i>=0; i--) {
-							if (d[i].tag === c) {
-								d[i].close = 1;
-								break;
-							}
-						}
-
-						return '';
-					} else {
-						d.pop();
-
-						if (d.length && d[d.length - 1].close) {
-							a = a + '</' + d[d.length - 1].tag + '>';
-							d.pop();
-						}
-					}
-				} else {
-					// Ignore these
-					if (/^(br|hr|input|meta|img|link|param)$/i.test(c))
-						return a;
-
-					// Ignore closed ones
-					if (/\/>$/.test(a))
-						return a;
-
-					d.push({tag : c}); // Push start element
-				}
-
-				return a;
-			});
-
-			// End all open tags
-			for (i=d.length - 1; i>=0; i--)
-				s += '</' + d[i].tag + '>';
-
-			return s;
 		}
 	});
 })(tinymce);
@@ -10321,6 +12888,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 				});
 
 				toggleFormat('align' + align);
+				execCommand('mceRepaint');
 			},
 
 			// Override list commands to fix WebKit bug
@@ -10346,7 +12914,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 			},
 
 			// Override commands to use the text formatter engine
-			'Bold,Italic,Underline,Strikethrough' : function(command) {
+			'Bold,Italic,Underline,Strikethrough,Superscript,Subscript' : function(command) {
 				toggleFormat(command);
 			},
 
@@ -10419,12 +12987,138 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 			},
 
 			mceInsertContent : function(command, ui, value) {
-				selection.setContent(value);
+				var parser, serializer, parentNode, rootNode, fragment, args,
+					marker, nodeRect, viewPortRect, rng, node, node2, bookmarkHtml, viewportBodyElement;
+
+				// Setup parser and serializer
+				parser = editor.parser;
+				serializer = new tinymce.html.Serializer({}, editor.schema);
+				bookmarkHtml = '<span id="mce_marker" data-mce-type="bookmark">\uFEFF</span>';
+
+				// Run beforeSetContent handlers on the HTML to be inserted
+				args = {content: value, format: 'html'};
+				selection.onBeforeSetContent.dispatch(selection, args);
+				value = args.content;
+
+				// Add caret at end of contents if it's missing
+				if (value.indexOf('{$caret}') == -1)
+					value += '{$caret}';
+
+				// Replace the caret marker with a span bookmark element
+				value = value.replace(/\{\$caret\}/, bookmarkHtml);
+
+				// Insert node maker where we will insert the new HTML and get it's parent
+				if (!selection.isCollapsed())
+					editor.getDoc().execCommand('Delete', false, null);
+
+				parentNode = selection.getNode();
+
+				// Parse the fragment within the context of the parent node
+				args = {context : parentNode.nodeName.toLowerCase()};
+				fragment = parser.parse(value, args);
+
+				// Move the caret to a more suitable location
+				node = fragment.lastChild;
+				if (node.attr('id') == 'mce_marker') {
+					marker = node;
+
+					for (node = node.prev; node; node = node.walk(true)) {
+						if (node.type == 3 || !dom.isBlock(node.name)) {
+							node.parent.insert(marker, node, node.name === 'br');
+							break;
+						}
+					}
+				}
+
+				// If parser says valid we can insert the contents into that parent
+				if (!args.invalid) {
+					value = serializer.serialize(fragment);
+
+					// Check if parent is empty or only has one BR element then set the innerHTML of that parent
+					node = parentNode.firstChild;
+					node2 = parentNode.lastChild;
+					if (!node || (node === node2 && node.nodeName === 'BR'))
+						dom.setHTML(parentNode, value);
+					else
+						selection.setContent(value);
+				} else {
+					// If the fragment was invalid within that context then we need
+					// to parse and process the parent it's inserted into
+
+					// Insert bookmark node and get the parent
+					selection.setContent(bookmarkHtml);
+					parentNode = editor.selection.getNode();
+					rootNode = editor.getBody();
+
+					// Opera will return the document node when selection is in root
+					if (parentNode.nodeType == 9)
+						parentNode = node = rootNode;
+					else
+						node = parentNode;
+
+					// Find the ancestor just before the root element
+					while (node !== rootNode) {
+						parentNode = node;
+						node = node.parentNode;
+					}
+
+					// Get the outer/inner HTML depending on if we are in the root and parser and serialize that
+					value = parentNode == rootNode ? rootNode.innerHTML : dom.getOuterHTML(parentNode);
+					value = serializer.serialize(
+						parser.parse(
+							// Need to replace by using a function since $ in the contents would otherwise be a problem
+							value.replace(/<span (id="mce_marker"|id=mce_marker).+<\/span>/i, function() {
+								return serializer.serialize(fragment);
+							})
+						)
+					);
+
+					// Set the inner/outer HTML depending on if we are in the root or not
+					if (parentNode == rootNode)
+						dom.setHTML(rootNode, value);
+					else
+						dom.setOuterHTML(parentNode, value);
+				}
+
+				marker = dom.get('mce_marker');
+
+				// Scroll range into view scrollIntoView on element can't be used since it will scroll the main view port as well
+				nodeRect = dom.getRect(marker);
+				viewPortRect = dom.getViewPort(editor.getWin());
+
+				// Check if node is out side the viewport if it is then scroll to it
+				if ((nodeRect.y + nodeRect.h > viewPortRect.y + viewPortRect.h || nodeRect.y < viewPortRect.y) ||
+					(nodeRect.x > viewPortRect.x + viewPortRect.w || nodeRect.x < viewPortRect.x)) {
+					viewportBodyElement = tinymce.isIE ? editor.getDoc().documentElement : editor.getBody();
+					viewportBodyElement.scrollLeft = nodeRect.x;
+					viewportBodyElement.scrollTop = nodeRect.y - viewPortRect.h + 25;
+				}
+
+				// Move selection before marker and remove it
+				rng = dom.createRng();
+
+				// If previous sibling is a text node set the selection to the end of that node
+				node = marker.previousSibling;
+				if (node && node.nodeType == 3) {
+					rng.setStart(node, node.nodeValue.length);
+				} else {
+					// If the previous sibling isn't a text node or doesn't exist set the selection before the marker node
+					rng.setStartBefore(marker);
+					rng.setEndBefore(marker);
+				}
+
+				// Remove the marker node and set the new range
+				dom.remove(marker);
+				selection.setRng(rng);
+
+				// Dispatch after event and add any visual elements needed
+				selection.onSetContent.dispatch(selection, args);
+				editor.addVisual();
 			},
 
 			mceInsertRawHTML : function(command, ui, value) {
 				selection.setContent('tiny_mce_marker');
-				editor.setContent(editor.getContent().replace(/tiny_mce_marker/g, value));
+				editor.setContent(editor.getContent().replace(/tiny_mce_marker/g, function() { return value }));
 			},
 
 			mceSetContent : function(command, ui, value) {
@@ -10474,7 +13168,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 			},
 
 			InsertHorizontalRule : function() {
-				selection.setContent('<hr />');
+				editor.execCommand('mceInsertContent', false, '<hr />');
 			},
 
 			mceToggleVisualAid : function() {
@@ -10483,18 +13177,41 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 			},
 
 			mceReplaceContent : function(command, ui, value) {
-				selection.setContent(value.replace(/\{\$selection\}/g, selection.getContent({format : 'text'})));
+				editor.execCommand('mceInsertContent', false, value.replace(/\{\$selection\}/g, selection.getContent({format : 'text'})));
 			},
 
 			mceInsertLink : function(command, ui, value) {
-				var link = dom.getParent(selection.getNode(), 'a');
+				var link = dom.getParent(selection.getNode(), 'a'), img, style, cls;
 
 				if (tinymce.is(value, 'string'))
 					value = {href : value};
 
+				// Spaces are never valid in URLs and it's a very common mistake for people to make so we fix it here.
+				value.href = value.href.replace(' ', '%20');
+
 				if (!link) {
+					// WebKit can't create links on floated images for some odd reason
+					// So, just remove styles and restore it later
+					if (tinymce.isWebKit) {
+						img = dom.getParent(selection.getNode(), 'img');
+
+						if (img) {
+							style = img.style.cssText;
+							cls = img.className;
+							img.style.cssText = null;
+							img.className = null;
+						}
+					}
+
 					execNativeCommand('CreateLink', FALSE, 'javascript:mctmp(0);');
-					each(dom.select('a[href=javascript:mctmp(0);]'), function(link) {
+
+					// Restore styles
+					if (style)
+						img.style.cssText = style;
+					if (cls)
+						img.className = cls;
+
+					each(dom.select("a[href='javascript:mctmp(0);']"), function(link) {
 						dom.setAttribs(link, value);
 					});
 				} else {
@@ -10522,7 +13239,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 				return isFormatMatch('align' + command.substring(7));
 			},
 
-			'Bold,Italic,Underline,Strikethrough' : function(command) {
+			'Bold,Italic,Underline,Strikethrough,Superscript,Subscript' : function(command) {
 				return isFormatMatch(command);
 			},
 
@@ -10579,23 +13296,30 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 		}
 	};
 })(tinymce);
+
 (function(tinymce) {
 	var Dispatcher = tinymce.util.Dispatcher;
 
 	tinymce.UndoManager = function(editor) {
-		var self, index = 0, data = [];
+		var self, index = 0, data = [], beforeBookmark;
 
 		function getContent() {
 			return tinymce.trim(editor.getContent({format : 'raw', no_events : 1}));
 		};
 
 		return self = {
-			typing : 0,
+			typing : false,
 
 			onAdd : new Dispatcher(self),
+
 			onUndo : new Dispatcher(self),
+
 			onRedo : new Dispatcher(self),
 
+			beforeChange : function() {
+				beforeBookmark = editor.selection.getBookmark(2, true);
+			},
+
 			add : function(level) {
 				var i, settings = editor.settings, lastLevel;
 
@@ -10604,10 +13328,12 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 
 				// Add undo level if needed
 				lastLevel = data[index];
-				if (lastLevel && lastLevel.content == level.content) {
-					if (index > 0 || data.length == 1)
-						return null;
-				}
+				if (lastLevel && lastLevel.content == level.content)
+					return null;
+
+				// Set before bookmark on previous level
+				if (data[index])
+					data[index].beforeBookmark = beforeBookmark;
 
 				// Time to compress
 				if (settings.custom_undo_redo_levels) {
@@ -10624,13 +13350,8 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 				level.bookmark = editor.selection.getBookmark(2, true);
 
 				// Crop array if needed
-				if (index < data.length - 1) {
-					// Treat first level as initial
-					if (index == 0)
-						data = [];
-					else
-						data.length = index + 1;
-				}
+				if (index < data.length - 1)
+					data.length = index + 1;
 
 				data.push(level);
 				index = data.length - 1;
@@ -10646,14 +13367,14 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 
 				if (self.typing) {
 					self.add();
-					self.typing = 0;
+					self.typing = false;
 				}
 
 				if (index > 0) {
 					level = data[--index];
 
 					editor.setContent(level.content, {format : 'raw'});
-					editor.selection.moveToBookmark(level.bookmark);
+					editor.selection.moveToBookmark(level.beforeBookmark);
 
 					self.onUndo.dispatch(self, level);
 				}
@@ -10678,15 +13399,16 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 
 			clear : function() {
 				data = [];
-				index = self.typing = 0;
+				index = 0;
+				self.typing = false;
 			},
 
 			hasUndo : function() {
-				return index > 0 || self.typing;
+				return index > 0 || this.typing;
 			},
 
 			hasRedo : function() {
-				return index < data.length - 1;
+				return index < data.length - 1 && !this.typing;
 			}
 		};
 	};
@@ -10735,24 +13457,15 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 		return rng2.cloneContents().textContent.length == 0;
 	};
 
-	function isEmpty(n) {
-		n = n.innerHTML;
-
-		n = n.replace(/<(img|hr|table|input|select|textarea)[ \>]/gi, '-'); // Keep these convert them to - chars
-		n = n.replace(/<[^>]+>/g, ''); // Remove all tags
-
-		return n.replace(/[ \u00a0\t\r\n]+/g, '') == '';
-	};
-
 	function splitList(selection, dom, li) {
 		var listBlock, block;
 
-		if (isEmpty(li)) {
+		if (dom.isEmpty(li)) {
 			listBlock = dom.getParent(li, 'ul,ol');
 
 			if (!dom.getParent(listBlock.parentNode, 'ul,ol')) {
 				dom.split(listBlock, li);
-				block = dom.create('p', 0, '<br _mce_bogus="1" />');
+				block = dom.create('p', 0, '<br data-mce-bogus="1" />');
 				dom.replace(block, li);
 				selection.select(block, 1);
 			}
@@ -10773,45 +13486,94 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 			s.element = elm.toUpperCase();
 
 			ed.onPreInit.add(t.setup, t);
-
-			t.reOpera = new RegExp('(\\u00a0|&#160;|&nbsp;)<\/' + elm + '>', 'gi');
-			t.rePadd = new RegExp('<p( )([^>]+)><\\\/p>|<p( )([^>]+)\\\/>|<p( )([^>]+)>\\s+<\\\/p>|<p><\\\/p>|<p\\\/>|<p>\\s+<\\\/p>'.replace(/p/g, elm), 'gi');
-			t.reNbsp2BR1 = new RegExp('<p( )([^>]+)>[\\s\\u00a0]+<\\\/p>|<p>[\\s\\u00a0]+<\\\/p>'.replace(/p/g, elm), 'gi');
-			t.reNbsp2BR2 = new RegExp('<%p()([^>]+)>(&nbsp;|&#160;)<\\\/%p>|<%p>(&nbsp;|&#160;)<\\\/%p>'.replace(/%p/g, elm), 'gi');
-			t.reBR2Nbsp = new RegExp('<p( )([^>]+)>\\s*<br \\\/>\\s*<\\\/p>|<p>\\s*<br \\\/>\\s*<\\\/p>'.replace(/p/g, elm), 'gi');
-
-			function padd(ed, o) {
-				if (isOpera)
-					o.content = o.content.replace(t.reOpera, '</' + elm + '>');
-
-				o.content = o.content.replace(t.rePadd, '<' + elm + '$1$2$3$4$5$6>\u00a0</' + elm + '>');
-
-				if (!isIE && !isOpera && o.set) {
-					// Use &nbsp; instead of BR in padded paragraphs
-					o.content = o.content.replace(t.reNbsp2BR1, '<' + elm + '$1$2><br /></' + elm + '>');
-					o.content = o.content.replace(t.reNbsp2BR2, '<' + elm + '$1$2><br /></' + elm + '>');
-				} else
-					o.content = o.content.replace(t.reBR2Nbsp, '<' + elm + '$1$2>\u00a0</' + elm + '>');
-			};
-
-			ed.onBeforeSetContent.add(padd);
-			ed.onPostProcess.add(padd);
-
-			if (s.forced_root_block) {
-				ed.onInit.add(t.forceRoots, t);
-				ed.onSetContent.add(t.forceRoots, t);
-				ed.onBeforeGetContent.add(t.forceRoots, t);
-			}
 		},
 
 		setup : function() {
-			var t = this, ed = t.editor, s = ed.settings, dom = ed.dom, selection = ed.selection;
+			var t = this, ed = t.editor, s = ed.settings, dom = ed.dom, selection = ed.selection, blockElements = ed.schema.getBlockElements();
 
-			// Force root blocks when typing and when getting output
+			// Force root blocks
 			if (s.forced_root_block) {
-				ed.onBeforeExecCommand.add(t.forceRoots, t);
-				ed.onKeyUp.add(t.forceRoots, t);
-				ed.onPreProcess.add(t.forceRoots, t);
+				function addRootBlocks() {
+					var node = selection.getStart(), rootNode = ed.getBody(), rng, startContainer, startOffset, endContainer, endOffset, rootBlockNode, tempNode, offset = -0xFFFFFF;
+
+					if (!node || node.nodeType !== 1)
+						return;
+
+					// Check if node is wrapped in block
+					while (node != rootNode) {
+						if (blockElements[node.nodeName])
+							return;
+
+						node = node.parentNode;
+					}
+
+					// Get current selection
+					rng = selection.getRng();
+					if (rng.setStart) {
+						startContainer = rng.startContainer;
+						startOffset = rng.startOffset;
+						endContainer = rng.endContainer;
+						endOffset = rng.endOffset;
+					} else {
+						// Force control range into text range
+						if (rng.item) {
+							rng = ed.getDoc().body.createTextRange();
+							rng.moveToElementText(rng.item(0));
+						}
+
+						tmpRng = rng.duplicate();
+						tmpRng.collapse(true);
+						startOffset = tmpRng.move('character', offset) * -1;
+
+						if (!tmpRng.collapsed) {
+							tmpRng = rng.duplicate();
+							tmpRng.collapse(false);
+							endOffset = (tmpRng.move('character', offset) * -1) - startOffset;
+						}
+					}
+
+					// Wrap non block elements and text nodes
+					for (node = rootNode.firstChild; node; node) {
+						if (node.nodeType === 3 || (node.nodeType == 1 && !blockElements[node.nodeName])) {
+							if (!rootBlockNode) {
+								rootBlockNode = dom.create(s.forced_root_block);
+								node.parentNode.insertBefore(rootBlockNode, node);
+							}
+
+							tempNode = node;
+							node = node.nextSibling;
+							rootBlockNode.appendChild(tempNode);
+						} else {
+							rootBlockNode = null;
+							node = node.nextSibling;
+						}
+					}
+
+					if (rng.setStart) {
+						rng.setStart(startContainer, startOffset);
+						rng.setEnd(endContainer, endOffset);
+						selection.setRng(rng);
+					} else {
+						try {
+							rng = ed.getDoc().body.createTextRange();
+							rng.moveToElementText(rootNode);
+							rng.collapse(true);
+							rng.moveStart('character', startOffset);
+
+							if (endOffset > 0)
+								rng.moveEnd('character', endOffset);
+
+							rng.select();
+						} catch (ex) {
+							// Ignore
+						}
+					}
+
+					ed.nodeChanged();
+				};
+
+				ed.onKeyUp.add(addRootBlocks);
+				ed.onClick.add(addRootBlocks);
 			}
 
 			if (s.force_br_newlines) {
@@ -10861,12 +13623,12 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 							var parent = ed.selection.getStart(), fmt = t._previousFormats;
 
 							// Parent is an empty block
-							if (!parent.hasChildNodes()) {
+							if (!parent.hasChildNodes() && fmt) {
 								parent = dom.getParent(parent, dom.isBlock);
 
-								if (parent) {
+								if (parent && parent.nodeName != 'LI') {
 									parent.innerHTML = '';
-	
+
 									if (t._previousFormats) {
 										parent.appendChild(fmt.wrapper);
 										fmt.inner.innerHTML = '\uFEFF';
@@ -10874,7 +13636,9 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 										parent.innerHTML = '\uFEFF';
 
 									selection.select(parent, 1);
+									selection.collapse(true);
 									ed.getDoc().execCommand('Delete', false, null);
+									t._previousFormats = 0;
 								}
 							}
 						}
@@ -10927,21 +13691,6 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 				});
 			}
 
-			// Padd empty inline elements within block elements
-			// For example: <p><strong><em></em></strong></p> becomes <p><strong><em>&nbsp;</em></strong></p>
-			ed.onPreProcess.add(function(ed, o) {
-				each(dom.select('p,h1,h2,h3,h4,h5,h6,div', o.node), function(p) {
-					if (isEmpty(p)) {
-						each(dom.select('span,em,strong,b,i', o.node), function(n) {
-							if (!n.hasChildNodes()) {
-								n.appendChild(ed.getDoc().createTextNode('\u00a0'));
-								return FALSE; // Break the loop one padding is enough
-							}
-						});
-					}
-				});
-			});
-
 			// IE specific fixes
 			if (isIE) {
 				// Replaces IE:s auto generated paragraphs with the specified element name
@@ -10971,155 +13720,6 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 			}
 		},
 
-		find : function(n, t, s) {
-			var ed = this.editor, w = ed.getDoc().createTreeWalker(n, 4, null, FALSE), c = -1;
-
-			while (n = w.nextNode()) {
-				c++;
-
-				// Index by node
-				if (t == 0 && n == s)
-					return c;
-
-				// Node by index
-				if (t == 1 && c == s)
-					return n;
-			}
-
-			return -1;
-		},
-
-		forceRoots : function(ed, e) {
-			var t = this, ed = t.editor, b = ed.getBody(), d = ed.getDoc(), se = ed.selection, s = se.getSel(), r = se.getRng(), si = -2, ei, so, eo, tr, c = -0xFFFFFF;
-			var nx, bl, bp, sp, le, nl = b.childNodes, i, n, eid;
-
-			// Fix for bug #1863847
-			//if (e && e.keyCode == 13)
-			//	return TRUE;
-
-			// Wrap non blocks into blocks
-			for (i = nl.length - 1; i >= 0; i--) {
-				nx = nl[i];
-
-				// Ignore internal elements
-				if (nx.nodeType === 1 && nx.getAttribute('_mce_type')) {
-					bl = null;
-					continue;
-				}
-
-				// Is text or non block element
-				if (nx.nodeType === 3 || (!t.dom.isBlock(nx) && nx.nodeType !== 8 && !/^(script|mce:script|style|mce:style)$/i.test(nx.nodeName))) {
-					if (!bl) {
-						// Create new block but ignore whitespace
-						if (nx.nodeType != 3 || /[^\s]/g.test(nx.nodeValue)) {
-							// Store selection
-							if (si == -2 && r) {
-								if (!isIE) {
-									// If selection is element then mark it
-									if (r.startContainer.nodeType == 1 && (n = r.startContainer.childNodes[r.startOffset]) && n.nodeType == 1) {
-										// Save the id of the selected element
-										eid = n.getAttribute("id");
-										n.setAttribute("id", "__mce");
-									} else {
-										// If element is inside body, might not be the case in contentEdiable mode
-										if (ed.dom.getParent(r.startContainer, function(e) {return e === b;})) {
-											so = r.startOffset;
-											eo = r.endOffset;
-											si = t.find(b, 0, r.startContainer);
-											ei = t.find(b, 0, r.endContainer);
-										}
-									}
-								} else {
-									// Force control range into text range
-									if (r.item) {
-										tr = d.body.createTextRange();
-										tr.moveToElementText(r.item(0));
-										r = tr;
-									}
-
-									tr = d.body.createTextRange();
-									tr.moveToElementText(b);
-									tr.collapse(1);
-									bp = tr.move('character', c) * -1;
-
-									tr = r.duplicate();
-									tr.collapse(1);
-									sp = tr.move('character', c) * -1;
-
-									tr = r.duplicate();
-									tr.collapse(0);
-									le = (tr.move('character', c) * -1) - sp;
-
-									si = sp - bp;
-									ei = le;
-								}
-							}
-
-							// Uses replaceChild instead of cloneNode since it removes selected attribute from option elements on IE
-							// See: http://support.microsoft.com/kb/829907
-							bl = ed.dom.create(ed.settings.forced_root_block);
-							nx.parentNode.replaceChild(bl, nx);
-							bl.appendChild(nx);
-						}
-					} else {
-						if (bl.hasChildNodes())
-							bl.insertBefore(nx, bl.firstChild);
-						else
-							bl.appendChild(nx);
-					}
-				} else
-					bl = null; // Time to create new block
-			}
-
-			// Restore selection
-			if (si != -2) {
-				if (!isIE) {
-					bl = b.getElementsByTagName(ed.settings.element)[0];
-					r = d.createRange();
-
-					// Select last location or generated block
-					if (si != -1)
-						r.setStart(t.find(b, 1, si), so);
-					else
-						r.setStart(bl, 0);
-
-					// Select last location or generated block
-					if (ei != -1)
-						r.setEnd(t.find(b, 1, ei), eo);
-					else
-						r.setEnd(bl, 0);
-
-					if (s) {
-						s.removeAllRanges();
-						s.addRange(r);
-					}
-				} else {
-					try {
-						r = s.createRange();
-						r.moveToElementText(b);
-						r.collapse(1);
-						r.moveStart('character', si);
-						r.moveEnd('character', ei);
-						r.select();
-					} catch (ex) {
-						// Ignore
-					}
-				}
-			} else if (!isIE && (n = ed.dom.get('__mce'))) {
-				// Restore the id of the selected element
-				if (eid)
-					n.setAttribute('id', eid);
-				else
-					n.removeAttribute('id');
-
-				// Move caret before selected element
-				r = d.createRange();
-				r.setStartBefore(n);
-				r.setEndBefore(n);
-				se.setRng(r);
-			}
-		},
-
 		getParentBlock : function(n) {
 			var d = this.dom;
 
@@ -11130,6 +13730,8 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 			var t = this, ed = t.editor, dom = ed.dom, d = ed.getDoc(), se = ed.settings, s = ed.selection.getSel(), r = s.getRangeAt(0), b = d.body;
 			var rb, ra, dir, sn, so, en, eo, sb, eb, bn, bef, aft, sc, ec, n, vp = dom.getViewPort(ed.getWin()), y, ch, car;
 
+			ed.undoManager.beforeChange();
+
 			// If root blocks are forced then use Operas default behavior since it's really good
 // Removed due to bug: #1853816
 //			if (se.forced_root_block && isOpera)
@@ -11305,10 +13907,6 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 			if (aft.firstChild && aft.firstChild.nodeName == bn)
 				aft.innerHTML = aft.firstChild.innerHTML;
 
-			// Padd empty blocks
-			if (isEmpty(bef))
-				bef.innerHTML = '<br />';
-
 			function appendStyles(e, en) {
 				var nl = [], nn, n, i;
 
@@ -11333,14 +13931,18 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 						nn = nn.appendChild(nl[i]);
 
 					// Padd most inner style element
-					nl[0].innerHTML = isOpera ? '&nbsp;' : '<br />'; // Extra space for Opera so that the caret can move there
+					nl[0].innerHTML = isOpera ? '\u00a0' : '<br />'; // Extra space for Opera so that the caret can move there
 					return nl[0]; // Move caret to most inner element
 				} else
-					e.innerHTML = isOpera ? '&nbsp;' : '<br />'; // Extra space for Opera so that the caret can move there
+					e.innerHTML = isOpera ? '\u00a0' : '<br />'; // Extra space for Opera so that the caret can move there
 			};
+				
+			// Padd empty blocks
+			if (dom.isEmpty(bef))
+				appendStyles(bef, sn);
 
 			// Fill empty afterblook with current style
-			if (isEmpty(aft))
+			if (dom.isEmpty(aft))
 				car = appendStyles(aft, en);
 
 			// Opera needs this one backwards for older versions
@@ -11356,27 +13958,26 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 			aft.normalize();
 			bef.normalize();
 
-			function first(n) {
-				return d.createTreeWalker(n, NodeFilter.SHOW_TEXT, null, FALSE).nextNode() || n;
-			};
-
 			// Move cursor and scroll into view
-			r = d.createRange();
-			r.selectNodeContents(isGecko ? first(car || aft) : car || aft);
-			r.collapse(1);
-			s.removeAllRanges();
-			s.addRange(r);
+			ed.selection.select(aft, true);
+			ed.selection.collapse(true);
 
 			// scrollIntoView seems to scroll the parent window in most browsers now including FF 3.0b4 so it's time to stop using it and do it our selfs
 			y = ed.dom.getPos(aft).y;
-			ch = aft.clientHeight;
+			//ch = aft.clientHeight;
 
 			// Is element within viewport
-			if (y < vp.y || y + ch > vp.y + vp.h) {
+			if (y < vp.y || y + 25 > vp.y + vp.h) {
 				ed.getWin().scrollTo(0, y < vp.y ? y : y - vp.h + 25); // Needs to be hardcoded to roughly one line of text if a huge text block is broken into two blocks
-				//console.debug('SCROLL!', 'vp.y: ' + vp.y, 'y' + y, 'vp.h' + vp.h, 'clientHeight' + aft.clientHeight, 'yyy: ' + (y < vp.y ? y : y - vp.h + aft.clientHeight));
+
+				/*console.debug(
+					'Element: y=' + y + ', h=' + ch + ', ' +
+					'Viewport: y=' + vp.y + ", h=" + vp.h + ', bottom=' + (vp.y + vp.h)
+				);*/
 			}
 
+			ed.undoManager.add();
+
 			return FALSE;
 		},
 
@@ -11591,7 +14192,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 				c = new tinymce.ui.NativeListBox(id, s);
 			else {
 				cls = cc || t._cls.listbox || tinymce.ui.ListBox;
-				c = new cls(id, s);
+				c = new cls(id, s, ed);
 			}
 
 			t.controls[id] = c;
@@ -11646,11 +14247,11 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 
 			if (s.menu_button) {
 				cls = cc || t._cls.menubutton || tinymce.ui.MenuButton;
-				c = new cls(id, s);
+				c = new cls(id, s, ed);
 				ed.onMouseDown.add(c.hideMenu, c);
 			} else {
 				cls = t._cls.button || tinymce.ui.Button;
-				c = new cls(id, s);
+				c = new cls(id, s, ed);
 			}
 
 			return t.add(c);
@@ -11693,7 +14294,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 
 			id = t.prefix + id;
 			cls = cc || t._cls.splitbutton || tinymce.ui.SplitButton;
-			c = t.add(new cls(id, s));
+			c = t.add(new cls(id, s, ed));
 			ed.onMouseDown.add(c.hideMenu, c);
 
 			return c;
@@ -11733,7 +14334,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 
 			id = t.prefix + id;
 			cls = cc || t._cls.colorsplitbutton || tinymce.ui.ColorSplitButton;
-			c = new cls(id, s);
+			c = new cls(id, s, ed);
 			ed.onMouseDown.add(c.hideMenu, c);
 
 			// Remove the menu element when the editor is removed
@@ -11765,13 +14366,25 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 
 			id = t.prefix + id;
 			cls = cc || t._cls.toolbar || tinymce.ui.Toolbar;
-			c = new cls(id, s);
+			c = new cls(id, s, t.editor);
 
 			if (t.get(id))
 				return null;
 
 			return t.add(c);
 		},
+		
+		createToolbarGroup : function(id, s, cc) {
+			var c, t = this, cls;
+			id = t.prefix + id;
+			cls = cc || this._cls.toolbarGroup || tinymce.ui.ToolbarGroup;
+			c = new cls(id, s, t.editor);
+			
+			if (t.get(id))
+				return null;
+			
+			return t.add(c);
+		},
 
 		createSeparator : function(cc) {
 			var cls = cc || this._cls.separator || tinymce.ui.Separator;
@@ -11908,53 +14521,6 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 		}
 	});
 }(tinymce));
-(function(tinymce) {
-	function CommandManager() {
-		var execCommands = {}, queryStateCommands = {}, queryValueCommands = {};
-
-		function add(collection, cmd, func, scope) {
-			if (typeof(cmd) == 'string')
-				cmd = [cmd];
-
-			tinymce.each(cmd, function(cmd) {
-				collection[cmd.toLowerCase()] = {func : func, scope : scope};
-			});
-		};
-
-		tinymce.extend(this, {
-			add : function(cmd, func, scope) {
-				add(execCommands, cmd, func, scope);
-			},
-
-			addQueryStateHandler : function(cmd, func, scope) {
-				add(queryStateCommands, cmd, func, scope);
-			},
-
-			addQueryValueHandler : function(cmd, func, scope) {
-				add(queryValueCommands, cmd, func, scope);
-			},
-
-			execCommand : function(scope, cmd, ui, value, args) {
-				if (cmd = execCommands[cmd.toLowerCase()]) {
-					if (cmd.func.call(scope || cmd.scope, ui, value, args) !== false)
-						return true;
-				}
-			},
-
-			queryCommandValue : function() {
-				if (cmd = queryValueCommands[cmd.toLowerCase()])
-					return cmd.func.call(scope || cmd.scope, ui, value, args);
-			},
-
-			queryCommandState : function() {
-				if (cmd = queryStateCommands[cmd.toLowerCase()])
-					return cmd.func.call(scope || cmd.scope, ui, value, args);
-			}
-		});
-	};
-
-	tinymce.GlobalCommands = new CommandManager();
-})(tinymce);
 (function(tinymce) {
 	tinymce.Formatter = function(ed) {
 		var formats = {},
@@ -11963,7 +14529,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 			selection = ed.selection,
 			TreeWalker = tinymce.dom.TreeWalker,
 			rangeUtils = new tinymce.dom.RangeUtils(dom),
-			isValid = ed.schema.isValid,
+			isValid = ed.schema.isValidChild,
 			isBlock = dom.isBlock,
 			forcedRootBlock = ed.settings.forced_root_block,
 			nodeIndex = dom.nodeIndex,
@@ -12032,8 +14598,31 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 			}
 		};
 
+		var getTextDecoration = function(node) {
+			var decoration;
+
+			ed.dom.getParent(node, function(n) {
+				decoration = ed.dom.getStyle(n, 'text-decoration');
+				return decoration && decoration !== 'none';
+			});
+
+			return decoration;
+		};
+
+		var processUnderlineAndColor = function(node) {
+			var textDecoration;
+			if (node.nodeType === 1 && node.parentNode && node.parentNode.nodeType === 1) {
+				textDecoration = getTextDecoration(node.parentNode);
+				if (ed.dom.getStyle(node, 'color') && textDecoration) {
+					ed.dom.setStyle(node, 'text-decoration', textDecoration);
+				} else if (ed.dom.getStyle(node, 'textdecoration') === textDecoration) {
+					ed.dom.setStyle(node, 'text-decoration', null);
+				}
+			}
+		};
+
 		function apply(name, vars, node) {
-			var formatList = get(name), format = formatList[0], bookmark, rng, i;
+			var formatList = get(name), format = formatList[0], bookmark, rng, i, isCollapsed = selection.isCollapsed();
 
 			function moveStart(rng) {
 				var container = rng.startContainer,
@@ -12124,6 +14713,11 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 						if (format.selector) {
 							// Look for matching formats
 							each(formatList, function(format) {
+								// Check collapsed state if it exists
+								if ('collapsed' in format && format.collapsed !== isCollapsed) {
+									return;
+								}
+
 								if (dom.is(node, format.selector) && !isCaretNode(node)) {
 									setElementFormat(node, format);
 									found = true;
@@ -12138,7 +14732,8 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 						}
 
 						// Is it valid to wrap this item
-						if (isValid(wrapName, nodeName) && isValid(parentName, wrapName)) {
+						if (isValid(wrapName, nodeName) && isValid(parentName, wrapName) &&
+								!(node.nodeType === 3 && node.nodeValue.length === 1 && node.nodeValue.charCodeAt(0) === 65279)) {
 							// Start wrapping
 							if (!currentWrapElm) {
 								// Wrap the node
@@ -12148,6 +14743,19 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 							}
 
 							currentWrapElm.appendChild(node);
+						} else if (nodeName == 'li') {
+							// Start wrapping
+							if (!currentWrapElm) {
+								// Wrap the node
+								liTextNode = node.ownerDocument.createTextNode('');
+								each(tinymce.grep(node.childNodes), function(n) { if (n.nodeType == 3) { liTextNode.nodeValue += n.nodeValue; n.parentNode.removeChild(n); } });
+								currentWrapElm = wrapElm.cloneNode(FALSE);
+								node.insertBefore(currentWrapElm, node.firstChild);
+								newWrappers.push(currentWrapElm);
+							}
+
+							currentWrapElm.appendChild(liTextNode);
+							
 						} else {
 							// Start a new wrapper for possible children
 							currentWrapElm = 0;
@@ -12163,6 +14771,30 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 					each(nodes, process);
 				});
 
+				// Wrap links inside as well, for example color inside a link when the wrapper is around the link
+				if (format.wrap_links === false) {
+					each(newWrappers, function(node) {
+						function process(node) {
+							var i, currentWrapElm, children;
+
+							if (node.nodeName === 'A') {
+								currentWrapElm = wrapElm.cloneNode(FALSE);
+								newWrappers.push(currentWrapElm);
+
+								children = tinymce.grep(node.childNodes);
+								for (i = 0; i < children.length; i++)
+									currentWrapElm.appendChild(children[i]);
+
+								node.appendChild(currentWrapElm);
+							}
+
+							each(tinymce.grep(node.childNodes), process);
+						};
+
+						process(node);
+					});
+				}
+
 				// Cleanup
 				each(newWrappers, function(node) {
 					var childCount;
@@ -12202,8 +14834,9 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 
 					childCount = getChildCount(node);
 
-					// Remove empty nodes
-					if (childCount === 0) {
+					// Remove empty nodes but only if there is multiple wrappers and they are not block
+					// elements so never remove single <h1></h1> since that would remove the currrent empty block element where the caret is at
+					if ((newWrappers.length > 1 || !isBlock(node)) && childCount === 0) {
 						dom.remove(node, 1);
 						return;
 					}
@@ -12219,6 +14852,19 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 							// this: <span style="color:red"><b><span style="color:red; font-size:10px">text</span></b></span>
 							// will become: <span style="color:red"><b><span style="font-size:10px">text</span></b></span>
 							each(dom.select(format.inline, node), function(child) {
+								var parent;
+
+								// When wrap_links is set to false we don't want
+								// to remove the format on children within links
+								if (format.wrap_links === false) {
+									parent = child.parentNode;
+
+									do {
+										if (parent.nodeName === 'A')
+											return;
+									} while (parent = parent.parentNode);
+								}
+
 								removeFormat(format, vars, child, format.exact ? child : null);
 							});
 						});
@@ -12259,11 +14905,20 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 
 					applyRngStyle(expandRng(rng, formatList));
 				} else {
-					if (!selection.isCollapsed() || !format.inline) {
+					if (!isCollapsed || !format.inline || dom.select('td.mceSelected,th.mceSelected').length) {
+						// Obtain selection node before selection is unselected by applyRngStyle()
+						var curSelNode = ed.selection.getNode();
+
 						// Apply formatting to selection
 						bookmark = selection.getBookmark();
 						applyRngStyle(expandRng(selection.getRng(TRUE), formatList));
 
+						// Colored nodes should be underlined so that the color of the underline matches the text color.
+						if (format.styles && (format.styles.color || format.styles.textDecoration)) {
+							tinymce.walk(curSelNode, processUnderlineAndColor, 'childNodes');
+							processUnderlineAndColor(curSelNode);
+						}
+
 						selection.moveToBookmark(bookmark);
 						selection.setRng(moveStart(selection.getRng(TRUE)));
 						ed.nodeChanged();
@@ -12427,8 +15082,8 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 
 					if (startContainer != endContainer) {
 						// Wrap start/end nodes in span element since these might be cloned/moved
-						startContainer = wrap(startContainer, 'span', {id : '_start', _mce_type : 'bookmark'});
-						endContainer = wrap(endContainer, 'span', {id : '_end', _mce_type : 'bookmark'});
+						startContainer = wrap(startContainer, 'span', {id : '_start', 'data-mce-type' : 'bookmark'});
+						endContainer = wrap(endContainer, 'span', {id : '_end', 'data-mce-type' : 'bookmark'});
 
 						// Split start/end
 						splitToFormatRoot(startContainer);
@@ -12451,6 +15106,11 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 				rangeUtils.walk(rng, function(nodes) {
 					each(nodes, function(node) {
 						process(node);
+
+						// Remove parent span if it only contains text-decoration: underline, yet a parent node is also underlined.
+						if (node.nodeType === 1 && ed.dom.getStyle(node, 'text-decoration') === 'underline' && node.parentNode && getTextDecoration(node.parentNode) === 'underline') {
+							removeFormat({'deep': false, 'exact': true, 'inline': 'span', 'styles': {'textDecoration' : 'underline'}}, null, node);
+						}
 					});
 				});
 			};
@@ -12464,7 +15124,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 				return;
 			}
 
-			if (!selection.isCollapsed() || !format.inline) {
+			if (!selection.isCollapsed() || !format.inline || dom.select('td.mceSelected,th.mceSelected').length) {
 				bookmark = selection.getBookmark();
 				removeRngStyle(selection.getRng(TRUE));
 				selection.moveToBookmark(bookmark);
@@ -12480,7 +15140,9 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 		};
 
 		function toggle(name, vars, node) {
-			if (match(name, vars, node))
+			var fmt = get(name);
+
+			if (match(name, vars, node) && (!('toggle' in fmt[0]) || fmt[0]['toggle']))
 				remove(name, vars, node);
 			else
 				apply(name, vars, node);
@@ -12744,7 +15406,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 			var startContainer = rng.startContainer,
 				startOffset = rng.startOffset,
 				endContainer = rng.endContainer,
-				endOffset = rng.endOffset, sibling, lastIdx;
+				endOffset = rng.endOffset, sibling, lastIdx, leaf;
 
 			// This function walks up the tree if there is no siblings before/after the node
 			function findParentContainer(container, child_name, sibling_name, root) {
@@ -12774,6 +15436,19 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 				return container;
 			};
 
+			// This function walks down the tree to find the leaf at the selection.
+			// The offset is also returned as if node initially a leaf, the offset may be in the middle of the text node.
+			function findLeaf(node, offset) {
+				if (offset === undefined)
+					offset = node.nodeType === 3 ? node.length : node.childNodes.length;
+				while (node && node.hasChildNodes()) {
+					node = node.childNodes[offset];
+					if (node)
+						offset = node.nodeType === 3 ? node.length : node.childNodes.length;
+				}
+				return { node: node, offset: offset };
+			}
+
 			// If index based start position then resolve it
 			if (startContainer.nodeType == 1 && startContainer.hasChildNodes()) {
 				lastIdx = startContainer.childNodes.length - 1;
@@ -12799,12 +15474,36 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 			if (isBookmarkNode(startContainer))
 				startContainer = startContainer.nextSibling || startContainer;
 
-			if (isBookmarkNode(endContainer.parentNode))
+			if (isBookmarkNode(endContainer.parentNode)) {
+				endOffset = dom.nodeIndex(endContainer);
 				endContainer = endContainer.parentNode;
+			}
 
-			if (isBookmarkNode(endContainer))
-				endContainer = endContainer.previousSibling || endContainer;
+			if (isBookmarkNode(endContainer) && endContainer.previousSibling) {
+				endContainer = endContainer.previousSibling;
+				endOffset = endContainer.length;
+			}
 
+			if (format[0].inline) {
+				// Avoid applying formatting to a trailing space.
+				leaf = findLeaf(endContainer, endOffset);
+				if (leaf.node) {
+					while (leaf.node && leaf.offset === 0 && leaf.node.previousSibling)
+						leaf = findLeaf(leaf.node.previousSibling);
+
+					if (leaf.node && leaf.offset > 0 && leaf.node.nodeType === 3 &&
+							leaf.node.nodeValue.charAt(leaf.offset - 1) === ' ') {
+
+						if (leaf.offset > 1) {
+							endContainer = leaf.node;
+							endContainer.splitText(leaf.offset - 1);
+						} else if (leaf.node.previousSibling) {
+							endContainer = leaf.node.previousSibling;
+						}
+					}
+				}
+			}
+			
 			// Move start/end point up the tree if the leaves are sharp and if we are in different containers
 			// Example * becomes !: !<p><b><i>*text</i><i>text*</i></b></p>!
 			// This will reduce the number of wrapper elements that needs to be created
@@ -12817,7 +15516,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 			// Expand start/end container to matching selector
 			if (format[0].selector && format[0].expand !== FALSE && !format[0].inline) {
 				function findSelectorEndPoint(container, sibling_name) {
-					var parents, i, y;
+					var parents, i, y, curFormat;
 
 					if (container.nodeType == 3 && container.nodeValue.length == 0 && container[sibling_name])
 						container = container[sibling_name];
@@ -12825,7 +15524,13 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 					parents = getParents(container);
 					for (i = 0; i < parents.length; i++) {
 						for (y = 0; y < format.length; y++) {
-							if (dom.is(parents[i], format[y].selector))
+							curFormat = format[y];
+
+							// If collapsed state is set then skip formats that doesn't match that
+							if ("collapsed" in curFormat && curFormat.collapsed !== rng.collapsed)
+								continue;
+
+							if (dom.is(parents[i], curFormat.selector))
 								return parents[i];
 						}
 					}
@@ -12935,7 +15640,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 				// Remove style attribute if it's empty
 				if (stylesModified && dom.getAttrib(node, 'style') == '') {
 					node.removeAttribute('style');
-					node.removeAttribute('_mce_style');
+					node.removeAttribute('data-mce-style');
 				}
 
 				// Remove attributes
@@ -12976,7 +15681,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 
 						// Remove mce prefixed attributes
 						if (MCE_ATTR_RE.test(name))
-							node.removeAttribute('_mce_' + name);
+							node.removeAttribute('data-mce-' + name);
 
 						node.removeAttribute(name);
 					}
@@ -13061,7 +15766,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 		};
 
 		function isBookmarkNode(node) {
-			return node && node.nodeType == 1 && node.getAttribute('_mce_type') == 'bookmark';
+			return node && node.nodeType == 1 && node.getAttribute('data-mce-type') == 'bookmark';
 		};
 
 		function mergeSiblings(prev, next) {
@@ -13132,7 +15837,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 			if (prev && next) {
 				function findElementSibling(node, sibling_name) {
 					for (sibling = node; sibling; sibling = sibling[sibling_name]) {
-						if (sibling.nodeType == 3 && !isWhiteSpaceNode(sibling))
+						if (sibling.nodeType == 3 && sibling.nodeValue.length !== 0)
 							return node;
 
 						if (sibling.nodeType == 1 && !isBookmarkNode(sibling))
@@ -13209,6 +15914,10 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 				// Apply pending formats
 				each(pendingFormats.apply.reverse(), function(item) {
 					apply(item.name, item.vars, caret_node);
+
+					// Colored nodes should be underlined so that the color of the underline matches the text color.
+					if (item.name === 'forecolor' && item.vars.value)
+						processUnderlineAndColor(caret_node.parentNode);
 				});
 
 				// Remove pending formats
@@ -13266,6 +15975,10 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 									if (isCaretNode(node)) {
 										textNode = node.firstChild;
 
+										// Find the first text node within node
+										while (textNode && textNode.nodeType != 3)
+											textNode = textNode.firstChild;
+
 										if (textNode) {
 											perform(node);
 
@@ -13298,9 +16011,12 @@ tinymce.onAddEditor.add(function(tinymce, ed) {
 		fontSizes = tinymce.explode(settings.font_size_style_values);
 
 		function replaceWithSpan(node, styles) {
-			dom.replace(dom.create('span', {
-				style : styles
-			}), node, 1);
+			tinymce.each(styles, function(value, name) {
+				if (value)
+					dom.setStyle(node, name, value);
+			});
+
+			dom.rename(node, 'span');
 		};
 
 		filters = {
@@ -13337,6 +16053,7 @@ tinymce.onAddEditor.add(function(tinymce, ed) {
 		};
 
 		ed.onPreProcess.add(convert);
+		ed.onSetContent.add(convert);
 
 		ed.onInit.add(function() {
 			ed.selection.onSetContent.add(convert);
diff --git a/plugins/TinyMCE/js/utils/form_utils.js b/plugins/TinyMCE/js/utils/form_utils.js
index 2617a26edb..59da01399e 100644
--- a/plugins/TinyMCE/js/utils/form_utils.js
+++ b/plugins/TinyMCE/js/utils/form_utils.js
@@ -11,10 +11,14 @@
 var themeBaseURL = tinyMCEPopup.editor.baseURI.toAbsolute('themes/' + tinyMCEPopup.getParam("theme"));
 
 function getColorPickerHTML(id, target_form_element) {
-	var h = "";
+	var h = "", dom = tinyMCEPopup.dom;
 
-	h += '<a id="' + id + '_link" href="javascript:;" onclick="tinyMCEPopup.pickColor(event,\'' + target_form_element +'\');" onmousedown="return false;" class="pickcolor">';
-	h += '<span id="' + id + '" title="' + tinyMCEPopup.getLang('browse') + '">&nbsp;</span></a>';
+	if (label = dom.select('label[for=' + target_form_element + ']')[0]) {
+		label.id = label.id || dom.uniqueId();
+	}
+
+	h += '<a role="button" aria-labelledby="' + id + '_label" id="' + id + '_link" href="javascript:;" onclick="tinyMCEPopup.pickColor(event,\'' + target_form_element +'\');" onmousedown="return false;" class="pickcolor">';
+	h += '<span id="' + id + '" title="' + tinyMCEPopup.getLang('browse') + '">&nbsp;<span id="' + id + '_label" class="mceVoiceLabel mceIconOnly" style="display:none;">' + tinyMCEPopup.getLang('browse') + '</span></span></a>';
 
 	return h;
 }
@@ -67,6 +71,9 @@ function selectByValue(form_obj, field_name, value, add_custom, ignore_case) {
 	if (!form_obj || !form_obj.elements[field_name])
 		return;
 
+	if (!value)
+		value = "";
+
 	var sel = form_obj.elements[field_name];
 
 	var found = false;
@@ -171,7 +178,7 @@ function convertHexToRGB(col) {
 }
 
 function trimSize(size) {
-	return size.replace(/([0-9\.]+)px|(%|in|cm|mm|em|ex|pt|pc)/, '$1$2');
+	return size.replace(/([0-9\.]+)(px|%|in|cm|mm|em|ex|pt|pc)/i, '$1$2');
 }
 
 function getCSSSize(size) {
@@ -183,6 +190,9 @@ function getCSSSize(size) {
 	// Add px
 	if (/^[0-9]+$/.test(size))
 		size += 'px';
+	// Sanity check, IE doesn't like broken values
+	else if (!(/^[0-9\.]+(px|%|in|cm|mm|em|ex|pt|pc)$/i.test(size)))
+		return "";
 
 	return size;
 }
diff --git a/plugins/TinyMCE/js/utils/mctabs.js b/plugins/TinyMCE/js/utils/mctabs.js
index 825d4c1433..458ec86da6 100644
--- a/plugins/TinyMCE/js/utils/mctabs.js
+++ b/plugins/TinyMCE/js/utils/mctabs.js
@@ -10,6 +10,7 @@
 
 function MCTabs() {
 	this.settings = [];
+	this.onChange = tinyMCEPopup.editor.windowManager.createInstance('tinymce.util.Dispatcher');
 };
 
 MCTabs.prototype.init = function(settings) {
@@ -28,26 +29,62 @@ MCTabs.prototype.getParam = function(name, default_value) {
 	return value;
 };
 
-MCTabs.prototype.displayTab = function(tab_id, panel_id) {
-	var panelElm, panelContainerElm, tabElm, tabContainerElm, selectionClass, nodes, i;
+MCTabs.prototype.showTab =function(tab){
+	tab.className = 'current';
+	tab.setAttribute("aria-selected", true);
+	tab.setAttribute("aria-expanded", true);
+	tab.tabIndex = 0;
+};
+
+MCTabs.prototype.hideTab =function(tab){
+	var t=this;
+
+	tab.className = '';
+	tab.setAttribute("aria-selected", false);
+	tab.setAttribute("aria-expanded", false);
+	tab.tabIndex = -1;
+};
+
+MCTabs.prototype.showPanel = function(panel) {
+	panel.className = 'current'; 
+	panel.setAttribute("aria-hidden", false);
+};
+
+MCTabs.prototype.hidePanel = function(panel) {
+	panel.className = 'panel';
+	panel.setAttribute("aria-hidden", true);
+}; 
+
+MCTabs.prototype.getPanelForTab = function(tabElm) {
+	return tinyMCEPopup.dom.getAttrib(tabElm, "aria-controls");
+};
+
+MCTabs.prototype.displayTab = function(tab_id, panel_id, avoid_focus) {
+	var panelElm, panelContainerElm, tabElm, tabContainerElm, selectionClass, nodes, i, t = this;
+
+	tabElm = document.getElementById(tab_id);
+
+	if (panel_id === undefined) {
+		panel_id = t.getPanelForTab(tabElm);
+	}
 
 	panelElm= document.getElementById(panel_id);
 	panelContainerElm = panelElm ? panelElm.parentNode : null;
-	tabElm = document.getElementById(tab_id);
 	tabContainerElm = tabElm ? tabElm.parentNode : null;
-	selectionClass = this.getParam('selection_class', 'current');
+	selectionClass = t.getParam('selection_class', 'current');
 
 	if (tabElm && tabContainerElm) {
 		nodes = tabContainerElm.childNodes;
 
 		// Hide all other tabs
 		for (i = 0; i < nodes.length; i++) {
-			if (nodes[i].nodeName == "LI")
-				nodes[i].className = '';
+			if (nodes[i].nodeName == "LI") {
+				t.hideTab(nodes[i]);
+			}
 		}
 
 		// Show selected tab
-		tabElm.className = 'current';
+		t.showTab(tabElm);
 	}
 
 	if (panelElm && panelContainerElm) {
@@ -56,11 +93,15 @@ MCTabs.prototype.displayTab = function(tab_id, panel_id) {
 		// Hide all other panels
 		for (i = 0; i < nodes.length; i++) {
 			if (nodes[i].nodeName == "DIV")
-				nodes[i].className = 'panel';
+				t.hidePanel(nodes[i]);
+		}
+
+		if (!avoid_focus) { 
+			tabElm.focus();
 		}
 
 		// Show selected panel
-		panelElm.className = 'current';
+		t.showPanel(panelElm);
 	}
 };
 
@@ -73,5 +114,49 @@ MCTabs.prototype.getAnchor = function() {
 	return "";
 };
 
-// Global instance
+
+//Global instance
 var mcTabs = new MCTabs();
+
+tinyMCEPopup.onInit.add(function() {
+	var tinymce = tinyMCEPopup.getWin().tinymce, dom = tinyMCEPopup.dom, each = tinymce.each;
+
+	each(dom.select('div.tabs'), function(tabContainerElm) {
+		var keyNav;
+
+		dom.setAttrib(tabContainerElm, "role", "tablist"); 
+
+		var items = tinyMCEPopup.dom.select('li', tabContainerElm);
+		var action = function(id) {
+			mcTabs.displayTab(id, mcTabs.getPanelForTab(id));
+			mcTabs.onChange.dispatch(id);
+		};
+
+		each(items, function(item) {
+			dom.setAttrib(item, 'role', 'tab');
+			dom.bind(item, 'click', function(evt) {
+				action(item.id);
+			});
+		});
+
+		dom.bind(dom.getRoot(), 'keydown', function(evt) {
+			if (evt.keyCode === 9 && evt.ctrlKey && !evt.altKey) { // Tab
+				keyNav.moveFocus(evt.shiftKey ? -1 : 1);
+				tinymce.dom.Event.cancel(evt);
+			}
+		});
+
+		each(dom.select('a', tabContainerElm), function(a) {
+			dom.setAttrib(a, 'tabindex', '-1');
+		});
+
+		keyNav = tinyMCEPopup.editor.windowManager.createInstance('tinymce.ui.KeyboardNavigation', {
+			root: tabContainerElm,
+			items: items,
+			onAction: action,
+			actOnFocus: true,
+			enableLeftRight: true,
+			enableUpDown: true
+		}, tinyMCEPopup.dom);
+	});
+});
\ No newline at end of file
diff --git a/plugins/TinyMCE/js/utils/validate.js b/plugins/TinyMCE/js/utils/validate.js
index a6fcf97015..27cbfab811 100644
--- a/plugins/TinyMCE/js/utils/validate.js
+++ b/plugins/TinyMCE/js/utils/validate.js
@@ -32,7 +32,7 @@ var Validator = {
 	},
 
 	isSize : function(s) {
-		return this.test(s, '^[0-9]+(%|in|cm|mm|em|ex|pt|pc|px)?$');
+		return this.test(s, '^[0-9.]+(%|in|cm|mm|em|ex|pt|pc|px)?$');
 	},
 
 	isId : function(s) {
@@ -96,8 +96,10 @@ var AutoValidator = {
 		var i, nl, s = this.settings, c = 0;
 
 		nl = this.tags(f, 'label');
-		for (i=0; i<nl.length; i++)
+		for (i=0; i<nl.length; i++) {
 			this.removeClass(nl[i], s.invalid_cls);
+			nl[i].setAttribute('aria-invalid', false);
+		}
 
 		c += this.validateElms(f, 'input');
 		c += this.validateElms(f, 'select');
@@ -109,6 +111,33 @@ var AutoValidator = {
 	invalidate : function(n) {
 		this.mark(n.form, n);
 	},
+	
+	getErrorMessages : function(f) {
+		var nl, i, s = this.settings, field, msg, values, messages = [], ed = tinyMCEPopup.editor;
+		nl = this.tags(f, "label");
+		for (i=0; i<nl.length; i++) {
+			if (this.hasClass(nl[i], s.invalid_cls)) {
+				field = document.getElementById(nl[i].getAttribute("for"));
+				values = { field: nl[i].textContent };
+				if (this.hasClass(field, s.min_cls, true)) {
+					message = ed.getLang('invalid_data_min');
+					values.min = this.getNum(field, s.min_cls);
+				} else if (this.hasClass(field, s.number_cls)) {
+					message = ed.getLang('invalid_data_number');
+				} else if (this.hasClass(field, s.size_cls)) {
+					message = ed.getLang('invalid_data_size');
+				} else {
+					message = ed.getLang('invalid_data');
+				}
+				
+				message = message.replace(/{\#([^}]+)\}/g, function(a, b) {
+					return values[b] || '{#' + b + '}';
+				});
+				messages.push(message);
+			}
+		}
+		return messages;
+	},
 
 	reset : function(e) {
 		var t = ['label', 'input', 'select', 'textarea'];
@@ -119,8 +148,10 @@ var AutoValidator = {
 
 		for (i=0; i<t.length; i++) {
 			nl = this.tags(e.form ? e.form : e, t[i]);
-			for (j=0; j<nl.length; j++)
+			for (j=0; j<nl.length; j++) {
 				this.removeClass(nl[j], s.invalid_cls);
+				nl[j].setAttribute('aria-invalid', false);
+			}
 		}
 	},
 
@@ -201,6 +232,7 @@ var AutoValidator = {
 		var s = this.settings;
 
 		this.addClass(n, s.invalid_cls);
+		n.setAttribute('aria-invalid', 'true');
 		this.markLabels(f, n, s.invalid_cls);
 
 		return false;
diff --git a/plugins/TinyMCE/locale/TinyMCE.pot b/plugins/TinyMCE/locale/TinyMCE.pot
index 86c1bee903..ccd2ea1f1f 100644
--- a/plugins/TinyMCE/locale/TinyMCE.pot
+++ b/plugins/TinyMCE/locale/TinyMCE.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,6 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#. TRANS: Plugin description.
 #: TinyMCEPlugin.php:87
 msgid "Use TinyMCE library to allow rich text editing in the browser."
 msgstr ""
diff --git a/plugins/TinyMCE/locale/ca/LC_MESSAGES/TinyMCE.po b/plugins/TinyMCE/locale/ca/LC_MESSAGES/TinyMCE.po
index 32743af438..0269928395 100644
--- a/plugins/TinyMCE/locale/ca/LC_MESSAGES/TinyMCE.po
+++ b/plugins/TinyMCE/locale/ca/LC_MESSAGES/TinyMCE.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - TinyMCE to Catalan (Català)
+# Translation of StatusNet - TinyMCE to Catalan (català)
 # Exported from translatewiki.net
 #
 # Author: Toniher
@@ -9,18 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TinyMCE\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:37+0000\n"
-"Language-Team: Catalan <http://translatewiki.net/wiki/Portal:ca>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:18+0000\n"
+"Language-Team: Catalan <https://translatewiki.net/wiki/Portal:ca>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:28+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:52:08+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ca\n"
 "X-Message-Group: #out-statusnet-plugin-tinymce\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Plugin description.
 msgid "Use TinyMCE library to allow rich text editing in the browser."
 msgstr ""
 "Fes servir la biblioteca TinyMCE per permetre l'edició de text ric en el "
diff --git a/plugins/TinyMCE/locale/de/LC_MESSAGES/TinyMCE.po b/plugins/TinyMCE/locale/de/LC_MESSAGES/TinyMCE.po
index c9e600d98d..a41e949f8c 100644
--- a/plugins/TinyMCE/locale/de/LC_MESSAGES/TinyMCE.po
+++ b/plugins/TinyMCE/locale/de/LC_MESSAGES/TinyMCE.po
@@ -9,18 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TinyMCE\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:37+0000\n"
-"Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:18+0000\n"
+"Language-Team: German <https://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:28+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:52:08+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-tinymce\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Plugin description.
 msgid "Use TinyMCE library to allow rich text editing in the browser."
 msgstr ""
 "Benutze die TinyMCE-Bibliothek um Rich-Text-Bearbeitung im Browser zu "
diff --git a/plugins/TinyMCE/locale/eo/LC_MESSAGES/TinyMCE.po b/plugins/TinyMCE/locale/eo/LC_MESSAGES/TinyMCE.po
index 04fe85318f..87ae53b98a 100644
--- a/plugins/TinyMCE/locale/eo/LC_MESSAGES/TinyMCE.po
+++ b/plugins/TinyMCE/locale/eo/LC_MESSAGES/TinyMCE.po
@@ -9,18 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TinyMCE\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:37+0000\n"
-"Language-Team: Esperanto <http://translatewiki.net/wiki/Portal:eo>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:18+0000\n"
+"Language-Team: Esperanto <https://translatewiki.net/wiki/Portal:eo>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:28+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:52:08+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: eo\n"
 "X-Message-Group: #out-statusnet-plugin-tinymce\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Plugin description.
 msgid "Use TinyMCE library to allow rich text editing in the browser."
 msgstr ""
 "Uzas la bibliotekon TinyMCE por ebligi redakton de riĉigita teksto en la "
diff --git a/plugins/TinyMCE/locale/es/LC_MESSAGES/TinyMCE.po b/plugins/TinyMCE/locale/es/LC_MESSAGES/TinyMCE.po
index 5984981573..b03b0ddf1e 100644
--- a/plugins/TinyMCE/locale/es/LC_MESSAGES/TinyMCE.po
+++ b/plugins/TinyMCE/locale/es/LC_MESSAGES/TinyMCE.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - TinyMCE to Spanish (Español)
+# Translation of StatusNet - TinyMCE to Spanish (español)
 # Exported from translatewiki.net
 #
 # Author: Translationista
@@ -9,18 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TinyMCE\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:37+0000\n"
-"Language-Team: Spanish <http://translatewiki.net/wiki/Portal:es>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:18+0000\n"
+"Language-Team: Spanish <https://translatewiki.net/wiki/Portal:es>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:28+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:52:08+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-plugin-tinymce\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Plugin description.
 msgid "Use TinyMCE library to allow rich text editing in the browser."
 msgstr ""
 "Utiliza la biblioteca TinyMCE para permitir la edición de texto enriquecido "
diff --git a/plugins/TinyMCE/locale/fr/LC_MESSAGES/TinyMCE.po b/plugins/TinyMCE/locale/fr/LC_MESSAGES/TinyMCE.po
index 418835568c..ab25a97d8e 100644
--- a/plugins/TinyMCE/locale/fr/LC_MESSAGES/TinyMCE.po
+++ b/plugins/TinyMCE/locale/fr/LC_MESSAGES/TinyMCE.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - TinyMCE to French (Français)
+# Translation of StatusNet - TinyMCE to French (français)
 # Exported from translatewiki.net
 #
 # Author: Verdy p
@@ -9,18 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TinyMCE\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:37+0000\n"
-"Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:18+0000\n"
+"Language-Team: French <https://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:28+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:52:08+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-tinymce\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#. TRANS: Plugin description.
 msgid "Use TinyMCE library to allow rich text editing in the browser."
 msgstr ""
 "Utiliser la bibliothèque TinyMCE pour permettre la modification de texte "
diff --git a/plugins/TinyMCE/locale/gl/LC_MESSAGES/TinyMCE.po b/plugins/TinyMCE/locale/gl/LC_MESSAGES/TinyMCE.po
new file mode 100644
index 0000000000..227f52874f
--- /dev/null
+++ b/plugins/TinyMCE/locale/gl/LC_MESSAGES/TinyMCE.po
@@ -0,0 +1,28 @@
+# Translation of StatusNet - TinyMCE to Galician (galego)
+# Exported from translatewiki.net
+#
+# Author: Toliño
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - TinyMCE\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:19+0000\n"
+"Language-Team: Galician <https://translatewiki.net/wiki/Portal:gl>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:52:08+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: gl\n"
+"X-Message-Group: #out-statusnet-plugin-tinymce\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin description.
+msgid "Use TinyMCE library to allow rich text editing in the browser."
+msgstr ""
+"Usar a biblioteca TinyMCE para permitir a edición de texto enriquecido no "
+"navegador."
diff --git a/plugins/TinyMCE/locale/he/LC_MESSAGES/TinyMCE.po b/plugins/TinyMCE/locale/he/LC_MESSAGES/TinyMCE.po
index b72d6165e0..0ac20eac9f 100644
--- a/plugins/TinyMCE/locale/he/LC_MESSAGES/TinyMCE.po
+++ b/plugins/TinyMCE/locale/he/LC_MESSAGES/TinyMCE.po
@@ -9,17 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TinyMCE\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:37+0000\n"
-"Language-Team: Hebrew <http://translatewiki.net/wiki/Portal:he>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:19+0000\n"
+"Language-Team: Hebrew <https://translatewiki.net/wiki/Portal:he>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:28+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:52:08+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: he\n"
 "X-Message-Group: #out-statusnet-plugin-tinymce\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Plugin description.
 msgid "Use TinyMCE library to allow rich text editing in the browser."
 msgstr "שימוש בספרייה TinyMCE כדי ל�פשר עריכת טקסט עשיר ב�מצעות הדפדפן."
diff --git a/plugins/TinyMCE/locale/ia/LC_MESSAGES/TinyMCE.po b/plugins/TinyMCE/locale/ia/LC_MESSAGES/TinyMCE.po
index 277a5f39f9..70e76204b4 100644
--- a/plugins/TinyMCE/locale/ia/LC_MESSAGES/TinyMCE.po
+++ b/plugins/TinyMCE/locale/ia/LC_MESSAGES/TinyMCE.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - TinyMCE to Interlingua (Interlingua)
+# Translation of StatusNet - TinyMCE to Interlingua (interlingua)
 # Exported from translatewiki.net
 #
 # Author: McDutchie
@@ -9,18 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TinyMCE\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:38+0000\n"
-"Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:19+0000\n"
+"Language-Team: Interlingua <https://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:28+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:52:08+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-tinymce\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Plugin description.
 msgid "Use TinyMCE library to allow rich text editing in the browser."
 msgstr ""
 "Usar le bibliotheca TinyMCE pro permitter le modification de texto "
diff --git a/plugins/TinyMCE/locale/id/LC_MESSAGES/TinyMCE.po b/plugins/TinyMCE/locale/id/LC_MESSAGES/TinyMCE.po
index 3bd9ff9901..fef89c39a5 100644
--- a/plugins/TinyMCE/locale/id/LC_MESSAGES/TinyMCE.po
+++ b/plugins/TinyMCE/locale/id/LC_MESSAGES/TinyMCE.po
@@ -9,18 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TinyMCE\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:38+0000\n"
-"Language-Team: Indonesian <http://translatewiki.net/wiki/Portal:id>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:19+0000\n"
+"Language-Team: Indonesian <https://translatewiki.net/wiki/Portal:id>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:28+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:52:08+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: id\n"
 "X-Message-Group: #out-statusnet-plugin-tinymce\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#. TRANS: Plugin description.
 msgid "Use TinyMCE library to allow rich text editing in the browser."
 msgstr ""
 "Gunakan pustaka TinyMCE untuk memungkinkan penyuntingan teks kaya pada "
diff --git a/plugins/TinyMCE/locale/ja/LC_MESSAGES/TinyMCE.po b/plugins/TinyMCE/locale/ja/LC_MESSAGES/TinyMCE.po
new file mode 100644
index 0000000000..dfd08796b4
--- /dev/null
+++ b/plugins/TinyMCE/locale/ja/LC_MESSAGES/TinyMCE.po
@@ -0,0 +1,24 @@
+# Translation of StatusNet - TinyMCE to Japanese (日本語)
+# Exported from translatewiki.net
+#
+# Author: Shirayuki
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - TinyMCE\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:19+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:52:08+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#. TRANS: Plugin description.
+msgid "Use TinyMCE library to allow rich text editing in the browser."
+msgstr ""
+"TinyMCE ライブラリーを使用�る�ブラウザ内�リッ��テキスト編集�����。"
diff --git a/plugins/TinyMCE/locale/mk/LC_MESSAGES/TinyMCE.po b/plugins/TinyMCE/locale/mk/LC_MESSAGES/TinyMCE.po
index 6d13005fad..abf72426c5 100644
--- a/plugins/TinyMCE/locale/mk/LC_MESSAGES/TinyMCE.po
+++ b/plugins/TinyMCE/locale/mk/LC_MESSAGES/TinyMCE.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - TinyMCE to Macedonian (Македон�ки)
+# Translation of StatusNet - TinyMCE to Macedonian (македон�ки)
 # Exported from translatewiki.net
 #
 # Author: Bjankuloski06
@@ -9,18 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TinyMCE\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:38+0000\n"
-"Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:19+0000\n"
+"Language-Team: Macedonian <https://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:28+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:52:08+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-tinymce\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
 
+#. TRANS: Plugin description.
 msgid "Use TinyMCE library to allow rich text editing in the browser."
 msgstr ""
 "Кори�ти ја библиотеката TinyMCE за уредување �о збогатен тек�т во "
diff --git a/plugins/TinyMCE/locale/ms/LC_MESSAGES/TinyMCE.po b/plugins/TinyMCE/locale/ms/LC_MESSAGES/TinyMCE.po
index 3581c51776..39393f0c27 100644
--- a/plugins/TinyMCE/locale/ms/LC_MESSAGES/TinyMCE.po
+++ b/plugins/TinyMCE/locale/ms/LC_MESSAGES/TinyMCE.po
@@ -9,18 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TinyMCE\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:38+0000\n"
-"Language-Team: Malay <http://translatewiki.net/wiki/Portal:ms>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:19+0000\n"
+"Language-Team: Malay <https://translatewiki.net/wiki/Portal:ms>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:28+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:52:08+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ms\n"
 "X-Message-Group: #out-statusnet-plugin-tinymce\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#. TRANS: Plugin description.
 msgid "Use TinyMCE library to allow rich text editing in the browser."
 msgstr ""
 "Gunakan perpustakaan TinyMCE untuk membolehkan penyuntingan teks beraneka "
diff --git a/plugins/TinyMCE/locale/nb/LC_MESSAGES/TinyMCE.po b/plugins/TinyMCE/locale/nb/LC_MESSAGES/TinyMCE.po
index d474cc3088..db49725fd7 100644
--- a/plugins/TinyMCE/locale/nb/LC_MESSAGES/TinyMCE.po
+++ b/plugins/TinyMCE/locale/nb/LC_MESSAGES/TinyMCE.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - TinyMCE to Norwegian (bokmål)‬ (‪Norsk (bokmål)‬)
+# Translation of StatusNet - TinyMCE to Norwegian Bokmål (‪norsk (bokmål)‬)
 # Exported from translatewiki.net
 #
 # Author: Nghtwlkr
@@ -9,18 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TinyMCE\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:38+0000\n"
-"Language-Team: Norwegian (bokmål)‬ <http://translatewiki.net/wiki/Portal:no>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:19+0000\n"
+"Language-Team: Norwegian Bokmål <https://translatewiki.net/wiki/Portal:nb>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:28+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
-"X-Language-Code: no\n"
+"X-POT-Import-Date: 2011-06-05 21:52:08+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: nb\n"
 "X-Message-Group: #out-statusnet-plugin-tinymce\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Plugin description.
 msgid "Use TinyMCE library to allow rich text editing in the browser."
 msgstr ""
 "Bruk TinyMCE-biblioteket for å tillate rik tekstredigering i nettleseren."
diff --git a/plugins/TinyMCE/locale/nl/LC_MESSAGES/TinyMCE.po b/plugins/TinyMCE/locale/nl/LC_MESSAGES/TinyMCE.po
index 52e4402028..81cb96e3b1 100644
--- a/plugins/TinyMCE/locale/nl/LC_MESSAGES/TinyMCE.po
+++ b/plugins/TinyMCE/locale/nl/LC_MESSAGES/TinyMCE.po
@@ -9,17 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TinyMCE\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:38+0000\n"
-"Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:19+0000\n"
+"Language-Team: Dutch <https://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:28+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:52:08+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-tinymce\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Plugin description.
 msgid "Use TinyMCE library to allow rich text editing in the browser."
 msgstr "TinyMCE gebruiken om WYSIWYG-bewerken in de browser mogelijk te maken."
diff --git a/plugins/TinyMCE/locale/pt/LC_MESSAGES/TinyMCE.po b/plugins/TinyMCE/locale/pt/LC_MESSAGES/TinyMCE.po
index 3bcf97f191..1a53bcaf86 100644
--- a/plugins/TinyMCE/locale/pt/LC_MESSAGES/TinyMCE.po
+++ b/plugins/TinyMCE/locale/pt/LC_MESSAGES/TinyMCE.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - TinyMCE to Portuguese (Português)
+# Translation of StatusNet - TinyMCE to Portuguese (português)
 # Exported from translatewiki.net
 #
 # Author: Waldir
@@ -9,17 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TinyMCE\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:38+0000\n"
-"Language-Team: Portuguese <http://translatewiki.net/wiki/Portal:pt>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:19+0000\n"
+"Language-Team: Portuguese <https://translatewiki.net/wiki/Portal:pt>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:28+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:52:08+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: pt\n"
 "X-Message-Group: #out-statusnet-plugin-tinymce\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Plugin description.
 msgid "Use TinyMCE library to allow rich text editing in the browser."
 msgstr "Use biblioteca TinyMCE para permitir a edição em rich text no browser."
diff --git a/plugins/TinyMCE/locale/pt_BR/LC_MESSAGES/TinyMCE.po b/plugins/TinyMCE/locale/pt_BR/LC_MESSAGES/TinyMCE.po
index 83f478b118..c149adebe0 100644
--- a/plugins/TinyMCE/locale/pt_BR/LC_MESSAGES/TinyMCE.po
+++ b/plugins/TinyMCE/locale/pt_BR/LC_MESSAGES/TinyMCE.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - TinyMCE to Brazilian Portuguese (Português do Brasil)
+# Translation of StatusNet - TinyMCE to Brazilian Portuguese (português do Brasil)
 # Exported from translatewiki.net
 #
 # Author: Giro720
@@ -9,19 +9,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TinyMCE\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:38+0000\n"
-"Language-Team: Brazilian Portuguese <http://translatewiki.net/wiki/Portal:pt-"
-"br>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:19+0000\n"
+"Language-Team: Brazilian Portuguese <https://translatewiki.net/wiki/Portal:"
+"pt-br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:28+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:52:08+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: pt-br\n"
 "X-Message-Group: #out-statusnet-plugin-tinymce\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#. TRANS: Plugin description.
 msgid "Use TinyMCE library to allow rich text editing in the browser."
 msgstr ""
 "Utilizar a biblioteca TinyMCE para permitir edição em rich text no navegador."
diff --git a/plugins/TinyMCE/locale/ru/LC_MESSAGES/TinyMCE.po b/plugins/TinyMCE/locale/ru/LC_MESSAGES/TinyMCE.po
index d6b7b5c7b1..2cafd46d9b 100644
--- a/plugins/TinyMCE/locale/ru/LC_MESSAGES/TinyMCE.po
+++ b/plugins/TinyMCE/locale/ru/LC_MESSAGES/TinyMCE.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - TinyMCE to Russian (Ру��кий)
+# Translation of StatusNet - TinyMCE to Russian (ру��кий)
 # Exported from translatewiki.net
 #
 # Author: �лек�андр Сигачёв
@@ -9,19 +9,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TinyMCE\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:38+0000\n"
-"Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:20+0000\n"
+"Language-Team: Russian <https://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:28+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:52:08+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-tinymce\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
+#. TRANS: Plugin description.
 msgid "Use TinyMCE library to allow rich text editing in the browser."
 msgstr ""
 "И�пользование библиотеки TinyMCE, дл� редактировани� тек�та в браузере."
diff --git a/plugins/TinyMCE/locale/tl/LC_MESSAGES/TinyMCE.po b/plugins/TinyMCE/locale/tl/LC_MESSAGES/TinyMCE.po
index 9024a7dae4..5c5bf59680 100644
--- a/plugins/TinyMCE/locale/tl/LC_MESSAGES/TinyMCE.po
+++ b/plugins/TinyMCE/locale/tl/LC_MESSAGES/TinyMCE.po
@@ -9,18 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TinyMCE\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:38+0000\n"
-"Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:20+0000\n"
+"Language-Team: Tagalog <https://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:28+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:52:08+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-tinymce\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Plugin description.
 msgid "Use TinyMCE library to allow rich text editing in the browser."
 msgstr ""
 "Gamitin ang aklatan ng TinyMCE upang pahintulutan ang pamamatnugot ng "
diff --git a/plugins/TinyMCE/locale/uk/LC_MESSAGES/TinyMCE.po b/plugins/TinyMCE/locale/uk/LC_MESSAGES/TinyMCE.po
index 6669df54c5..b77701ec48 100644
--- a/plugins/TinyMCE/locale/uk/LC_MESSAGES/TinyMCE.po
+++ b/plugins/TinyMCE/locale/uk/LC_MESSAGES/TinyMCE.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - TinyMCE to Ukrainian (Україн�ька)
+# Translation of StatusNet - TinyMCE to Ukrainian (україн�ька)
 # Exported from translatewiki.net
 #
 # Author: Boogie
@@ -9,19 +9,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TinyMCE\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:39+0000\n"
-"Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:20+0000\n"
+"Language-Team: Ukrainian <https://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:28+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:52:08+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-tinymce\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
+#. TRANS: Plugin description.
 msgid "Use TinyMCE library to allow rich text editing in the browser."
 msgstr ""
 "Викори�танн� бібліотеки TinyMCE дл� про�того форматуванн� тек�ту у вікні "
diff --git a/plugins/TwitterBridge/Notice_to_status.php b/plugins/TwitterBridge/Notice_to_status.php
index 3b8f816cfc..313adaeafc 100644
--- a/plugins/TwitterBridge/Notice_to_status.php
+++ b/plugins/TwitterBridge/Notice_to_status.php
@@ -71,7 +71,6 @@ class Notice_to_status extends Memcached_DataObject
      * @return Notice_to_status object found, or null for no hits
      *
      */
-
     function staticGet($k, $v=null)
     {
         return Memcached_DataObject::staticGet('Notice_to_status', $k, $v);
@@ -85,7 +84,6 @@ class Notice_to_status extends Memcached_DataObject
      *
      * @return array array of column definitions
      */
-
     function table()
     {
         return array('notice_id' => DB_DATAOBJECT_INT + DB_DATAOBJECT_NOTNULL,
@@ -102,7 +100,6 @@ class Notice_to_status extends Memcached_DataObject
      *
      * @return array list of key field names
      */
-
     function keys()
     {
         return array_keys($this->keyTypes());
@@ -120,7 +117,6 @@ class Notice_to_status extends Memcached_DataObject
      *         'K' for primary key: for compound keys, add an entry for each component;
      *         'U' for unique keys: compound keys are not well supported here.
      */
-
     function keyTypes()
     {
         return array('notice_id' => 'K', 'status_id' => 'U');
@@ -136,7 +132,6 @@ class Notice_to_status extends Memcached_DataObject
      *
      * @return array magic three-false array that stops auto-incrementing.
      */
-
     function sequenceKey()
     {
         return array(false, false, false);
@@ -151,7 +146,6 @@ class Notice_to_status extends Memcached_DataObject
      *
      * @return Notice_to_status new object for this value
      */
-
     static function saveNew($notice_id, $status_id)
     {
         if (empty($notice_id)) {
diff --git a/plugins/TwitterBridge/README b/plugins/TwitterBridge/README
index 10ea35b2b6..cb3369d1d0 100644
--- a/plugins/TwitterBridge/README
+++ b/plugins/TwitterBridge/README
@@ -75,13 +75,9 @@ Administration panel
 
 As of StatusNet 0.9.0 there is a new administration panel that allows
 you to configure Twitter bridge settings within StatusNet itself,
-instead of having to specify them manually in your config.php.  To enable
-the administration panel, you will need to add it to the list of active
-administration panels.  You can do this via your config.php. E.g.:
+instead of having to specify them manually in your config.php.
 
-    $config['admin']['panels'][] = 'twitter';
-
-And to access it, you'll need to use a user with the "administrator"
+To access it, you'll need to use a user with the "administrator"
 role (see: scripts/userrole.php).
 
 Sign in with Twitter
diff --git a/plugins/TwitterBridge/TwitterBridgePlugin.php b/plugins/TwitterBridge/TwitterBridgePlugin.php
index 29192cf53b..cae0dbfcac 100644
--- a/plugins/TwitterBridge/TwitterBridgePlugin.php
+++ b/plugins/TwitterBridge/TwitterBridgePlugin.php
@@ -148,8 +148,10 @@ class TwitterBridgePlugin extends Plugin
         if (self::hasKeys() && common_config('twitter', 'signin')) {
             $action->menuItem(
                 common_local_url('twitterlogin'),
-                _m('Twitter'),
-                _m('Login or register using Twitter'),
+                // TRANS: Menu item in login navigation.
+                _m('MENU','Twitter'),
+                // TRANS: Title for menu item in login navigation.
+                _m('Login or register using Twitter.'),
                 'twitterlogin' === $action_name
             );
         }
@@ -171,7 +173,9 @@ class TwitterBridgePlugin extends Plugin
 
             $action->menuItem(
                 common_local_url('twittersettings'),
-                _m('Twitter'),
+                // TRANS: Menu item in connection settings navigation.
+                _m('MENU','Twitter'),
+                // TRANS: Title for menu item in connection settings navigation.
                 _m('Twitter integration options'),
                 $action_name === 'twittersettings'
             );
@@ -200,6 +204,7 @@ class TwitterBridgePlugin extends Plugin
             return false;
         case 'TwitterOAuthClient':
         case 'TwitterQueueHandler':
+        case 'TweetInQueueHandler':
         case 'TwitterImport':
         case 'JsonStreamReader':
         case 'TwitterStreamReader':
@@ -283,6 +288,18 @@ class TwitterBridgePlugin extends Plugin
         return true;
     }
 
+    /**
+     * If the plugin's installed, this should be accessible to admins
+     */
+    function onAdminPanelCheck($name, &$isOK)
+    {
+        if ($name == 'twitter') {
+            $isOK = true;
+            return false;
+        }
+        return true;
+    }
+
     /**
      * Add a Twitter tab to the admin panel
      *
@@ -299,8 +316,10 @@ class TwitterBridgePlugin extends Plugin
 
             $nav->out->menuItem(
                 common_local_url('twitteradminpanel'),
+                // TRANS: Menu item in administrative panel that leads to the Twitter bridge configuration.
                 _m('Twitter'),
-                _m('Twitter bridge configuration'),
+                // TRANS: Menu item title in administrative panel that leads to the Twitter bridge configuration.
+                _m('Twitter bridge configuration page.'),
                 $action_name == 'twitteradminpanel',
                 'nav_twitter_admin_panel'
             );
@@ -321,10 +340,10 @@ class TwitterBridgePlugin extends Plugin
         $versions[] = array(
             'name' => 'TwitterBridge',
             'version' => self::VERSION,
-            'author' => 'Zach Copley, Julien C',
+            'author' => 'Zach Copley, Julien C, Jean Baptiste Favre',
             'homepage' => 'http://status.net/wiki/Plugin:TwitterBridge',
-            'rawdescription' => _m(
-                'The Twitter "bridge" plugin allows integration ' .
+            // TRANS: Plugin description.
+            'rawdescription' => _m('The Twitter "bridge" plugin allows integration ' .
                 'of a StatusNet instance with ' .
                 '<a href="http://twitter.com/">Twitter</a>.'
             )
@@ -539,4 +558,32 @@ class TwitterBridgePlugin extends Plugin
         }
         return true;
     }
+
+    /**
+     * Add links in the user's profile block to their Twitter profile URL.
+     *
+     * @param Profile $profile The profile being shown
+     * @param Array   &$links  Writeable array of arrays (href, text, image).
+     *
+     * @return boolean hook value (true)
+     */
+
+    function onOtherAccountProfiles($profile, &$links)
+    {
+        $fuser = null;
+
+        $flink = Foreign_link::getByUserID($profile->id, TWITTER_SERVICE);
+
+        if (!empty($flink)) {
+            $fuser = $flink->getForeignUser();
+
+            if (!empty($fuser)) {
+                $links[] = array("href" => $fuser->uri,
+                                 "text" => sprintf(_("@%s on Twitter"), $fuser->nickname),
+                                 "image" => $this->path("icons/twitter-bird-white-on-blue.png"));
+            }
+        }
+
+        return true;
+    }
 }
diff --git a/plugins/TwitterBridge/Twitter_synch_status.php b/plugins/TwitterBridge/Twitter_synch_status.php
index a8337862c8..9c61e7e7e0 100644
--- a/plugins/TwitterBridge/Twitter_synch_status.php
+++ b/plugins/TwitterBridge/Twitter_synch_status.php
@@ -64,7 +64,6 @@ class Twitter_synch_status extends Memcached_DataObject
      * @param mixed  $v Value to lookup
      *
      * @return Twitter_synch_status object found, or null for no hits
-     *
      */
     function staticGet($k, $v=null)
     {
diff --git a/plugins/TwitterBridge/daemons/twitterdaemon.php b/plugins/TwitterBridge/daemons/twitterdaemon.php
index d313d2de96..8b774889d1 100644
--- a/plugins/TwitterBridge/daemons/twitterdaemon.php
+++ b/plugins/TwitterBridge/daemons/twitterdaemon.php
@@ -23,7 +23,7 @@ define('INSTALLDIR', realpath(dirname(__FILE__) . '/../../..'));
 $shortoptions = 'fi::a';
 $longoptions = array('id::', 'foreground', 'all');
 
-$helptext = <<<END_OF_XMPP_HELP
+$helptext = <<<END_OF_TWITTERDAEMON_HELP
 Daemon script for receiving new notices from Twitter users.
 
     -i --id           Identity (default none)
@@ -31,12 +31,10 @@ Daemon script for receiving new notices from Twitter users.
                       (requires Stomp queue handler, status_network setup)
     -f --foreground   Stay in the foreground (default background)
 
-END_OF_XMPP_HELP;
+END_OF_TWITTERDAEMON_HELP;
 
 require_once INSTALLDIR.'/scripts/commandline.inc';
 
-require_once INSTALLDIR . '/lib/jabber.php';
-
 class TwitterDaemon extends SpawningDaemon
 {
     protected $allsites = false;
diff --git a/plugins/TwitterBridge/daemons/twitterstatusfetcher.php b/plugins/TwitterBridge/daemons/twitterstatusfetcher.php
index 06ce430371..47a44597be 100755
--- a/plugins/TwitterBridge/daemons/twitterstatusfetcher.php
+++ b/plugins/TwitterBridge/daemons/twitterstatusfetcher.php
@@ -136,7 +136,8 @@ class TwitterStatusFetcher extends ParallelizingDaemon
         // a new connection if there isn't one already
         $conn = &$flink->getDatabaseConnection();
 
-        $this->getTimeline($flink);
+        $this->getTimeline($flink, 'home_timeline');
+        $this->getTimeline($flink, 'mentions_timeline');
 
         $flink->last_friendsync = common_sql_now();
         $flink->update();
@@ -149,65 +150,68 @@ class TwitterStatusFetcher extends ParallelizingDaemon
         unset($_DB_DATAOBJECT['CONNECTIONS']);
     }
 
-    function getTimeline($flink)
+    function getTimeline($flink, $timelineUri = 'home_timeline')
     {
         if (empty($flink)) {
-            common_log(LOG_WARNING, $this->name() .
+            common_log(LOG_ERR, $this->name() .
                        " - Can't retrieve Foreign_link for foreign ID $fid");
             return;
         }
 
-        common_debug($this->name() . ' - Trying to get timeline for Twitter user ' .
-                     $flink->foreign_id);
+        common_log(LOG_DEBUG, $this->name() . ' - Trying to get ' . $timelineUri .
+                   ' timeline for Twitter user ' . $flink->foreign_id);
 
         $client = null;
 
         if (TwitterOAuthClient::isPackedToken($flink->credentials)) {
             $token = TwitterOAuthClient::unpackToken($flink->credentials);
             $client = new TwitterOAuthClient($token->key, $token->secret);
-            common_debug($this->name() . ' - Grabbing friends timeline with OAuth.');
+            common_log(LOG_DEBUG, $this->name() . ' - Grabbing ' . $timelineUri . ' timeline with OAuth.');
         } else {
-            common_debug("Skipping friends timeline for $flink->foreign_id since not OAuth.");
+            common_log(LOG_ERR, "Skipping " . $timelineUri . " timeline for " .
+                       $flink->foreign_id . " since not OAuth.");
         }
 
         $timeline = null;
 
-        $lastId = Twitter_synch_status::getLastId($flink->foreign_id, 'home_timeline');
+        $lastId = Twitter_synch_status::getLastId($flink->foreign_id, $timelineUri);
 
-        common_debug("Got lastId value '{$lastId}' for foreign id '{$flink->foreign_id}' and timeline 'home_timeline'");
+        common_log(LOG_DEBUG, "Got lastId value '" . $lastId . "' for foreign id '" .
+                     $flink->foreign_id . "' and timeline '" . $timelineUri. "'");
 
         try {
-            $timeline = $client->statusesHomeTimeline($lastId);
+            $timeline = $client->statusesTimeline($lastId, $timelineUri);
         } catch (Exception $e) {
-            common_log(LOG_WARNING, $this->name() .
-                       ' - Twitter client unable to get friends timeline for user ' .
-                       $flink->user_id . ' - code: ' .
-                       $e->getCode() . 'msg: ' . $e->getMessage());
+            common_log(LOG_ERR, $this->name() .
+                       ' - Unable to get ' . $timelineUri . ' timeline for user ' . $flink->user_id .
+                       ' - code: ' . $e->getCode() . 'msg: ' . $e->getMessage());
         }
 
         if (empty($timeline)) {
-            common_log(LOG_WARNING, $this->name() .  " - Empty timeline.");
+            common_log(LOG_WARNING, $this->name() .  " - Empty '" . $timelineUri . "' timeline.");
             return;
         }
 
-        common_debug(LOG_INFO, $this->name() . ' - Retrieved ' . sizeof($timeline) . ' statuses from Twitter.');
-
-        $importer = new TwitterImport();
-
-        // Reverse to preserve order
-
-        foreach (array_reverse($timeline) as $status) {
-            $notice = $importer->importStatus($status);
-
-            if (!empty($notice)) {
-                Inbox::insertNotice($flink->user_id, $notice->id);
-            }
-        }
+        common_log(LOG_INFO, $this->name() .
+                   ' - Retrieved ' . sizeof($timeline) . ' statuses from ' . $timelineUri . ' timeline' .
+                   ' - for user ' . $flink->user_id);
 
         if (!empty($timeline)) {
+            $qm = QueueManager::get();
+
+            // Reverse to preserve order
+            foreach (array_reverse($timeline) as $status) {
+                $data = array(
+                    'status' => $status,
+                    'for_user' => $flink->foreign_id,
+                );
+                $qm->enqueue($data, 'tweetin');
+            }
+
             $lastId = twitter_id($timeline[0]);
-            Twitter_synch_status::setLastId($flink->foreign_id, 'home_timeline', $lastId);
-            common_debug("Set lastId value '$lastId' for foreign id '{$flink->foreign_id}' and timeline 'home_timeline'");
+            Twitter_synch_status::setLastId($flink->foreign_id, $timelineUri, $lastId);
+            common_debug("Set lastId value '$lastId' for foreign id '{$flink->foreign_id}' and timeline '" .
+                         $timelineUri . "'");
         }
 
         // Okay, record the time we synced with Twitter for posterity
@@ -233,5 +237,5 @@ if (have_option('d') || have_option('debug')) {
     $debug = true;
 }
 
-$fetcher = new TwitterStatusFetcher($id, 60, 2, $debug);
+$fetcher = new TwitterStatusFetcher($id, POLL_INTERVAL, MAXCHILDREN, $debug);
 $fetcher->runOnce();
diff --git a/plugins/TwitterBridge/icons/twitter-bird-white-on-blue.png b/plugins/TwitterBridge/icons/twitter-bird-white-on-blue.png
new file mode 100644
index 0000000000..2c42b0823e
Binary files /dev/null and b/plugins/TwitterBridge/icons/twitter-bird-white-on-blue.png differ
diff --git a/plugins/TwitterBridge/jsonstreamreader.php b/plugins/TwitterBridge/jsonstreamreader.php
index f6572c9eef..d5852c93e3 100644
--- a/plugins/TwitterBridge/jsonstreamreader.php
+++ b/plugins/TwitterBridge/jsonstreamreader.php
@@ -63,7 +63,8 @@ abstract class JsonStreamReader
         } else if ($scheme == 'https') {
             $rawScheme = 'ssl';
         } else {
-            throw new ServerException('Invalid URL scheme for HTTP stream reader');
+            // TRANS: Server exception thrown when an invalid URL scheme is detected.
+            throw new ServerException(_m('Invalid URL scheme for HTTP stream reader.'));
         }
 
         $host = parse_url($url, PHP_URL_HOST);
@@ -180,7 +181,8 @@ abstract class JsonStreamReader
     public function handleInput($socket)
     {
         if ($this->socket !== $socket) {
-            throw new Exception('Got input from unexpected socket!');
+            // TRANS: Exception thrown when input from an inexpected socket is encountered.
+            throw new Exception(_m('Got input from unexpected socket!'));
         }
 
         try {
@@ -210,7 +212,9 @@ abstract class JsonStreamReader
                 $this->handleLineActive($line);
                 break;
             default:
-                throw new Exception('Invalid state in handleLine: ' . $this->state);
+                // TRANS: Exception thrown when an invalid state is encountered in handleLine.
+                // TRANS: %s is the invalid state.
+                throw new Exception(sprintf(_m('Invalid state in handleLine: %s.'),$this->state));
         }
     }
 
@@ -222,15 +226,21 @@ abstract class JsonStreamReader
     {
         $bits = explode(' ', $line, 3);
         if (count($bits) != 3) {
-            throw new Exception("Invalid HTTP response line: $line");
+            // TRANS: Exception thrown when an invalid response line is encountered.
+            // TRANS: %s is the invalid line.
+            throw new Exception(sprintf(_m('Invalid HTTP response line: %s.'),$line));
         }
 
         list($http, $status, $text) = $bits;
         if (substr($http, 0, 5) != 'HTTP/') {
-            throw new Exception("Invalid HTTP response line chunk '$http': $line");
+            // TRANS: Exception thrown when an invalid response line part is encountered.
+            // TRANS: %1$s is the chunk, %2$s is the line.
+            throw new Exception(sprintf(_m('Invalid HTTP response line chunk "%1$s": %2$s.'),$http, $line));
         }
         if ($status != '200') {
-            throw new Exception("Bad HTTP response code $status: $line");
+            // TRANS: Exception thrown when an invalid response code is encountered.
+            // TRANS: %1$s is the response code, %2$s is the line.
+            throw new Exception(sprintf(_m('Bad HTTP response code %1$s: %2$s.'),$status,$line));
         }
         common_log(LOG_DEBUG, "$this->id $line");
         $this->state = 'headers';
diff --git a/plugins/TwitterBridge/locale/TwitterBridge.pot b/plugins/TwitterBridge/locale/TwitterBridge.pot
index 947c638244..15e80afa55 100644
--- a/plugins/TwitterBridge/locale/TwitterBridge.pot
+++ b/plugins/TwitterBridge/locale/TwitterBridge.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,349 +16,481 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: twittersettings.php:57
+#. TRANS: Title for page with Twitter integration settings.
+#: twittersettings.php:58
 msgid "Twitter settings"
 msgstr ""
 
-#: twittersettings.php:68
+#. TRANS: Instructions for page with Twitter integration settings.
+#: twittersettings.php:70
 msgid ""
 "Connect your Twitter account to share your updates with your Twitter friends "
 "and vice-versa."
 msgstr ""
 
-#: twittersettings.php:115
+#. TRANS: Fieldset legend.
+#: twittersettings.php:119
 msgid "Twitter account"
 msgstr ""
 
-#: twittersettings.php:120
+#. TRANS: Form note when a Twitter account has been connected.
+#: twittersettings.php:125
 msgid "Connected Twitter account"
 msgstr ""
 
-#: twittersettings.php:125
+#. TRANS: Fieldset legend.
+#: twittersettings.php:131
 msgid "Disconnect my account from Twitter"
 msgstr ""
 
-#: twittersettings.php:131
-msgid "Disconnecting your Twitter could make it impossible to log in! Please "
-msgstr ""
-
-#: twittersettings.php:135
-msgid "set a password"
-msgstr ""
-
+#. TRANS: Form guide. %s is a URL to the password settings.
+#. TRANS: This message contains a Markdown link in the form [description](link).
 #: twittersettings.php:137
-msgid " first."
+#, php-format
+msgid ""
+"Disconnecting your Twitter account could make it impossible to log in! "
+"Please [set a password](%s) first."
 msgstr ""
 
-#. TRANS: %1$s is the current website name.
-#: twittersettings.php:141
+#. TRANS: Form instructions. %1$s is the StatusNet sitename.
+#: twittersettings.php:146
 #, php-format
 msgid ""
 "Keep your %1$s account but disconnect from Twitter. You can use your %1$s "
 "password to log in."
 msgstr ""
 
-#: twittersettings.php:149
+#. TRANS: Button text for disconnecting a Twitter account.
+#: twittersettings.php:154
+msgctxt "BUTTON"
 msgid "Disconnect"
 msgstr ""
 
-#: twittersettings.php:156
+#. TRANS: Fieldset legend.
+#: twittersettings.php:162
 msgid "Preferences"
 msgstr ""
 
-#: twittersettings.php:160
+#. TRANS: Checkbox label.
+#: twittersettings.php:167
 msgid "Automatically send my notices to Twitter."
 msgstr ""
 
-#: twittersettings.php:167
+#. TRANS: Checkbox label.
+#: twittersettings.php:175
 msgid "Send local \"@\" replies to Twitter."
 msgstr ""
 
-#: twittersettings.php:174
+#. TRANS: Checkbox label.
+#: twittersettings.php:183
 msgid "Subscribe to my Twitter friends here."
 msgstr ""
 
-#: twittersettings.php:183
+#. TRANS: Checkbox label.
+#: twittersettings.php:193
 msgid "Import my friends timeline."
 msgstr ""
 
-#: twittersettings.php:199 twitteradminpanel.php:293
+#. TRANS: Button text for saving Twitter integration settings.
+#. TRANS: Button text for saving the administrative Twitter bridge settings.
+#: twittersettings.php:210 twitteradminpanel.php:311
+msgctxt "BUTTON"
 msgid "Save"
 msgstr ""
 
-#: twittersettings.php:201
+#. TRANS: Button text for adding Twitter integration.
+#: twittersettings.php:213
+msgctxt "BUTTON"
 msgid "Add"
 msgstr ""
 
-#: twittersettings.php:225 twitterauthorization.php:120
+#. TRANS: Client error displayed when the session token does not match or is not given.
+#: twittersettings.php:238 twitterauthorization.php:121
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 
-#: twittersettings.php:235
+#. TRANS: Client error displayed when the submitted form contains unexpected data.
+#: twittersettings.php:249
 msgid "Unexpected form submission."
 msgstr ""
 
-#: twittersettings.php:250
+#. TRANS: Client error displayed when trying to remove a connected Twitter account when there isn't one connected.
+#: twittersettings.php:265
 msgid "No Twitter connection to remove."
 msgstr ""
 
-#: twittersettings.php:258
-msgid "Couldn't remove Twitter user."
+#. TRANS: Server error displayed when trying to remove a connected Twitter account fails.
+#: twittersettings.php:274
+msgid "Could not remove Twitter user."
 msgstr ""
 
-#: twittersettings.php:262
+#. TRANS: Success message displayed after disconnecting a Twitter account.
+#: twittersettings.php:279
 msgid "Twitter account disconnected."
 msgstr ""
 
-#: twittersettings.php:282 twittersettings.php:293
-msgid "Couldn't save Twitter preferences."
+#. TRANS: Server error displayed when saving Twitter integration preferences fails.
+#: twittersettings.php:301 twittersettings.php:314
+msgid "Could not save Twitter preferences."
 msgstr ""
 
-#: twittersettings.php:301
+#. TRANS: Success message after saving Twitter integration preferences.
+#: twittersettings.php:323
 msgid "Twitter preferences saved."
 msgstr ""
 
-#: twitterauthorization.php:126
+#. TRANS: Form validation error displayed when the checkbox to agree to the license has not been checked.
+#: twitterauthorization.php:128
 msgid "You cannot register if you do not agree to the license."
 msgstr ""
 
-#: twitterauthorization.php:135
+#. TRANS: Form validation error displayed when an unhandled error occurs.
+#: twitterauthorization.php:138
 msgid "Something weird happened."
 msgstr ""
 
-#: twitterauthorization.php:181
+#. TRANS: Server error displayed when linking to a Twitter account fails.
+#: twitterauthorization.php:183 twitterauthorization.php:233
+#: twitterauthorization.php:305
 msgid "Could not link your Twitter account."
 msgstr ""
 
-#: twitterauthorization.php:201
-msgid "Couldn't link your Twitter account: oauth_token mismatch."
+#. TRANS: Server error displayed when linking to a Twitter account fails because of an incorrect oauth_token.
+#: twitterauthorization.php:204
+msgid "Could not link your Twitter account: oauth_token mismatch."
 msgstr ""
 
-#: twitterauthorization.php:229 twitterauthorization.php:300
-msgid "Couldn't link your Twitter account."
-msgstr ""
-
-#: twitterauthorization.php:312
+#. TRANS: Page instruction. %s is the StatusNet sitename.
+#: twitterauthorization.php:318
 #, php-format
 msgid ""
-"This is the first time you've logged into %s so we must connect your Twitter "
-"account to a local account. You can either create a new account, or connect "
-"with your existing account, if you have one."
+"This is the first time you have logged into %s so we must connect your "
+"Twitter account to a local account. You can either create a new account, or "
+"connect with your existing account, if you have one."
 msgstr ""
 
-#: twitterauthorization.php:318
+#. TRANS: Page title.
+#: twitterauthorization.php:325
 msgid "Twitter Account Setup"
 msgstr ""
 
-#: twitterauthorization.php:351
+#. TRANS: Fieldset legend.
+#: twitterauthorization.php:359
 msgid "Connection options"
 msgstr ""
 
-#: twitterauthorization.php:360
+#. TRANS: Fieldset legend.
+#: twitterauthorization.php:373
+msgid "Create new account"
+msgstr ""
+
+#. TRANS: Sub form introduction text.
+#: twitterauthorization.php:376
+msgid "Create a new user with this nickname."
+msgstr ""
+
+#. TRANS: Field label.
+#: twitterauthorization.php:384
+msgid "New nickname"
+msgstr ""
+
+#. TRANS: Field title for nickname field.
+#: twitterauthorization.php:387
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
+msgstr ""
+
+#. TRANS: Field label.
+#: twitterauthorization.php:391
+msgctxt "LABEL"
+msgid "Email"
+msgstr ""
+
+#. TRANS: Field title for e-mail address field.
+#: twitterauthorization.php:393
+msgid "Used only for updates, announcements, and password recovery"
+msgstr ""
+
+#. TRANS: Button text for creating a new StatusNet account in the Twitter connect page.
+#: twitterauthorization.php:402
+msgctxt "BUTTON"
+msgid "Create"
+msgstr ""
+
+#. TRANS: Fieldset legend.
+#: twitterauthorization.php:409
+msgid "Connect existing account"
+msgstr ""
+
+#. TRANS: Sub form introduction text.
+#: twitterauthorization.php:412
+msgid ""
+"If you already have an account, login with your username and password to "
+"connect it to your Twitter account."
+msgstr ""
+
+#. TRANS: Field label.
+#: twitterauthorization.php:416
+msgid "Existing nickname"
+msgstr ""
+
+#. TRANS: Field label.
+#: twitterauthorization.php:420
+msgid "Password"
+msgstr ""
+
+#. TRANS: Fieldset legend.
+#: twitterauthorization.php:428
+msgid "License"
+msgstr ""
+
+#. TRANS: Text for license agreement checkbox.
+#. TRANS: %s is the license as configured for the StatusNet site.
+#: twitterauthorization.php:439
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
 "email address, IM address, and phone number."
 msgstr ""
 
-#: twitterauthorization.php:381
-msgid "Create new account"
-msgstr ""
-
-#: twitterauthorization.php:383
-msgid "Create a new user with this nickname."
-msgstr ""
-
-#: twitterauthorization.php:390
-msgid "New nickname"
-msgstr ""
-
-#: twitterauthorization.php:392
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
-msgstr ""
-
-#: twitterauthorization.php:395
-msgctxt "LABEL"
-msgid "Email"
-msgstr ""
-
-#: twitterauthorization.php:396
-msgid "Used only for updates, announcements, and password recovery"
-msgstr ""
-
-#: twitterauthorization.php:404
-msgid "Create"
-msgstr ""
-
-#: twitterauthorization.php:409
-msgid "Connect existing account"
-msgstr ""
-
-#: twitterauthorization.php:411
-msgid ""
-"If you already have an account, login with your username and password to "
-"connect it to your Twitter account."
-msgstr ""
-
-#: twitterauthorization.php:414
-msgid "Existing nickname"
-msgstr ""
-
-#: twitterauthorization.php:417
-msgid "Password"
-msgstr ""
-
-#: twitterauthorization.php:420
+#. TRANS: Button text for connecting an existing StatusNet account in the Twitter connect page..
+#: twitterauthorization.php:453
+msgctxt "BUTTON"
 msgid "Connect"
 msgstr ""
 
-#: twitterauthorization.php:466 twitterauthorization.php:475
+#. TRANS: Client error displayed when trying to create a new user while creating new users is not allowed.
+#: twitterauthorization.php:498 twitterauthorization.php:508
 msgid "Registration not allowed."
 msgstr ""
 
-#: twitterauthorization.php:482
+#. TRANS: Client error displayed when trying to create a new user with an invalid invitation code.
+#: twitterauthorization.php:516
 msgid "Not a valid invitation code."
 msgstr ""
 
-#: twitterauthorization.php:495
+#. TRANS: Client error displayed when trying to create a new user with an invalid username.
+#: twitterauthorization.php:530
 msgid "Nickname not allowed."
 msgstr ""
 
-#: twitterauthorization.php:500
+#. TRANS: Client error displayed when trying to create a new user with a username that is already in use.
+#: twitterauthorization.php:536
 msgid "Nickname already in use. Try another one."
 msgstr ""
 
-#: twitterauthorization.php:520
+#. TRANS: Server error displayed when creating a new user has failed.
+#: twitterauthorization.php:557
 msgid "Error registering user."
 msgstr ""
 
-#: twitterauthorization.php:531 twitterauthorization.php:571
-#: twitterauthorization.php:591
+#. TRANS: Server error displayed when connecting a user to a Twitter user has failed.
+#. TRANS: Server error displayed connecting a user to a Twitter user has failed.
+#: twitterauthorization.php:569 twitterauthorization.php:612
+#: twitterauthorization.php:633
 msgid "Error connecting user to Twitter."
 msgstr ""
 
-#: twitterauthorization.php:553
+#. TRANS: Form validation error displayed when connecting an existing user to a Twitter user fails because
+#. TRANS: the provided username and/or password are incorrect.
+#: twitterauthorization.php:593
 msgid "Invalid username or password."
 msgstr ""
 
-#: twitteradminpanel.php:52 TwitterBridgePlugin.php:151
-#: TwitterBridgePlugin.php:174 TwitterBridgePlugin.php:302
+#. TRANS: Page title for Twitter administration panel.
+#: twitteradminpanel.php:53
+msgctxt "TITLE"
 msgid "Twitter"
 msgstr ""
 
-#: twitteradminpanel.php:62
+#. TRANS: Instructions for Twitter bridge administration page.
+#: twitteradminpanel.php:64
 msgid "Twitter bridge settings"
 msgstr ""
 
-#: twitteradminpanel.php:150
-msgid "Invalid consumer key. Max length is 255 characters."
+#. TRANS: Client error displayed when a consumer key is invalid because it is too long.
+#: twitteradminpanel.php:153
+msgid "Invalid consumer key. Maximum length is 255 characters."
 msgstr ""
 
-#: twitteradminpanel.php:156
-msgid "Invalid consumer secret. Max length is 255 characters."
+#. TRANS: Client error displayed when a consumer secret is invalid because it is too long.
+#: twitteradminpanel.php:160
+msgid "Invalid consumer secret. Maximum length is 255 characters."
 msgstr ""
 
-#: twitteradminpanel.php:212
+#. TRANS: Fieldset legend for Twitter application settings.
+#: twitteradminpanel.php:217
 msgid "Twitter application settings"
 msgstr ""
 
-#: twitteradminpanel.php:218
+#. TRANS: Field label for Twitter assigned consumer key.
+#: twitteradminpanel.php:224
 msgid "Consumer key"
 msgstr ""
 
-#: twitteradminpanel.php:219
-msgid "Consumer key assigned by Twitter"
+#. TRANS: Field title for Twitter assigned consumer key.
+#: twitteradminpanel.php:226
+msgid "The consumer key assigned by Twitter."
 msgstr ""
 
-#: twitteradminpanel.php:227
+#. TRANS: Field label for Twitter assigned consumer secret.
+#: twitteradminpanel.php:235
 msgid "Consumer secret"
 msgstr ""
 
-#: twitteradminpanel.php:228
-msgid "Consumer secret assigned by Twitter"
+#. TRANS: Field title for Twitter assigned consumer secret.
+#: twitteradminpanel.php:237
+msgid "The consumer secret assigned by Twitter."
 msgstr ""
 
-#: twitteradminpanel.php:238
-msgid "Note: a global consumer key and secret are set."
+#. TRANS: Form guide displayed when two required fields have already been provided.
+#: twitteradminpanel.php:248
+msgid "Note: A global consumer key and secret are set."
 msgstr ""
 
-#: twitteradminpanel.php:245
+#. TRANS: Field label for Twitter application name.
+#: twitteradminpanel.php:256
 msgid "Integration source"
 msgstr ""
 
-#: twitteradminpanel.php:246
-msgid "Name of your Twitter application"
+#. TRANS: Field title for Twitter application name.
+#: twitteradminpanel.php:258
+msgid "The name of your Twitter application."
 msgstr ""
 
-#: twitteradminpanel.php:258
+#. TRANS: Fieldset legend for Twitter integration options.
+#: twitteradminpanel.php:271
 msgid "Options"
 msgstr ""
 
-#: twitteradminpanel.php:265
+#. TRANS: Checkbox label for global setting.
+#: twitteradminpanel.php:279
 msgid "Enable \"Sign-in with Twitter\""
 msgstr ""
 
-#: twitteradminpanel.php:267
-msgid "Allow users to login with their Twitter credentials"
+#. TRANS: Checkbox title.
+#: twitteradminpanel.php:282
+msgid "This allow users to login with their Twitter credentials."
 msgstr ""
 
-#: twitteradminpanel.php:274
+#. TRANS: Checkbox label for global setting.
+#: twitteradminpanel.php:290
 msgid "Enable Twitter import"
 msgstr ""
 
-#: twitteradminpanel.php:276
+#. TRANS: Checkbox title for global setting.
+#: twitteradminpanel.php:293
 msgid ""
 "Allow users to import their Twitter friends' timelines. Requires daemons to "
 "be manually configured."
 msgstr ""
 
-#: twitteradminpanel.php:293
-msgid "Save Twitter settings"
+#. TRANS: Button title for saving the administrative Twitter bridge settings.
+#: twitteradminpanel.php:313
+msgid "Save the Twitter bridge settings."
 msgstr ""
 
-#: TwitterBridgePlugin.php:152
-msgid "Login or register using Twitter"
+#. TRANS: Server exception thrown when an invalid URL scheme is detected.
+#: jsonstreamreader.php:67
+msgid "Invalid URL scheme for HTTP stream reader."
 msgstr ""
 
-#: TwitterBridgePlugin.php:175
+#. TRANS: Exception thrown when input from an inexpected socket is encountered.
+#: jsonstreamreader.php:185
+msgid "Got input from unexpected socket!"
+msgstr ""
+
+#. TRANS: Exception thrown when an invalid state is encountered in handleLine.
+#. TRANS: %s is the invalid state.
+#: jsonstreamreader.php:217
+#, php-format
+msgid "Invalid state in handleLine: %s."
+msgstr ""
+
+#. TRANS: Exception thrown when an invalid response line is encountered.
+#. TRANS: %s is the invalid line.
+#: jsonstreamreader.php:231
+#, php-format
+msgid "Invalid HTTP response line: %s."
+msgstr ""
+
+#. TRANS: Exception thrown when an invalid response line part is encountered.
+#. TRANS: %1$s is the chunk, %2$s is the line.
+#: jsonstreamreader.php:238
+#, php-format
+msgid "Invalid HTTP response line chunk \"%1$s\": %2$s."
+msgstr ""
+
+#. TRANS: Exception thrown when an invalid response code is encountered.
+#. TRANS: %1$s is the response code, %2$s is the line.
+#: jsonstreamreader.php:243
+#, php-format
+msgid "Bad HTTP response code %1$s: %2$s."
+msgstr ""
+
+#. TRANS: Menu item in login navigation.
+#. TRANS: Menu item in connection settings navigation.
+#: TwitterBridgePlugin.php:152 TwitterBridgePlugin.php:177
+msgctxt "MENU"
+msgid "Twitter"
+msgstr ""
+
+#. TRANS: Title for menu item in login navigation.
+#: TwitterBridgePlugin.php:154
+msgid "Login or register using Twitter."
+msgstr ""
+
+#. TRANS: Title for menu item in connection settings navigation.
+#: TwitterBridgePlugin.php:179
 msgid "Twitter integration options"
 msgstr ""
 
-#: TwitterBridgePlugin.php:303
-msgid "Twitter bridge configuration"
+#. TRANS: Menu item in administrative panel that leads to the Twitter bridge configuration.
+#: TwitterBridgePlugin.php:319
+msgid "Twitter"
 msgstr ""
 
-#: TwitterBridgePlugin.php:327
+#. TRANS: Menu item title in administrative panel that leads to the Twitter bridge configuration.
+#: TwitterBridgePlugin.php:321
+msgid "Twitter bridge configuration page."
+msgstr ""
+
+#. TRANS: Plugin description.
+#: TwitterBridgePlugin.php:345
 msgid ""
 "The Twitter \"bridge\" plugin allows integration of a StatusNet instance "
 "with <a href=\"http://twitter.com/\">Twitter</a>."
 msgstr ""
 
-#: twitterlogin.php:56
+#. TRANS: Client error displayed when trying to log in using Twitter while already logged in to StatusNet.
+#: twitterlogin.php:57
 msgid "Already logged in."
 msgstr ""
 
-#: twitterlogin.php:64
+#. TRANS: Title for login using Twitter page.
+#: twitterlogin.php:66
+msgctxt "TITLE"
 msgid "Twitter Login"
 msgstr ""
 
-#: twitterlogin.php:69
+#. TRANS: Instructions for login using Twitter page.
+#: twitterlogin.php:72
 msgid "Login with your Twitter account"
 msgstr ""
 
-#: twitterlogin.php:87
+#. TRANS: Alternative text for "sign in with Twitter" image.
+#: twitterlogin.php:91
 msgid "Sign in with Twitter"
 msgstr ""
 
 #. TRANS: Mail subject after forwarding notices to Twitter has stopped working.
-#: twitter.php:428
+#: twitter.php:438
 msgid "Your Twitter bridge has been disabled"
 msgstr ""
 
 #. TRANS: Mail body after forwarding notices to Twitter has stopped working.
 #. TRANS: %1$ is the name of the user the mail is sent to, %2$s is a URL to the
 #. TRANS: Twitter settings, %3$s is the StatusNet sitename.
-#: twitter.php:435
+#: twitter.php:445
 #, php-format
 msgid ""
 "Hi, %1$s. We're sorry to inform you that your link to Twitter has been "
diff --git a/plugins/TwitterBridge/locale/ar/LC_MESSAGES/TwitterBridge.po b/plugins/TwitterBridge/locale/ar/LC_MESSAGES/TwitterBridge.po
index 4022e031f4..4354ce8b22 100644
--- a/plugins/TwitterBridge/locale/ar/LC_MESSAGES/TwitterBridge.po
+++ b/plugins/TwitterBridge/locale/ar/LC_MESSAGES/TwitterBridge.po
@@ -1,6 +1,7 @@
 # Translation of StatusNet - TwitterBridge to Arabic (العربية)
 # Exported from translatewiki.net
 #
+# Author: Majid Al-Dharrab
 # Author: OsamaK
 # --
 # This file is distributed under the same license as the StatusNet package.
@@ -9,274 +10,404 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TwitterBridge\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:44+0000\n"
-"Language-Team: Arabic <http://translatewiki.net/wiki/Portal:ar>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:20+0000\n"
+"Language-Team: Arabic <https://translatewiki.net/wiki/Portal:ar>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:29+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-12-03 13:51:38+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ar\n"
 "X-Message-Group: #out-statusnet-plugin-twitterbridge\n"
 "Plural-Forms: nplurals=6; plural=(n == 0) ? 0 : ( (n == 1) ? 1 : ( (n == "
 "2) ? 2 : ( (n%100 >= 3 && n%100 <= 10) ? 3 : ( (n%100 >= 11 && n%100 <= "
 "99) ? 4 : 5 ) ) ) );\n"
 
+#. TRANS: Title for page with Twitter integration settings.
 msgid "Twitter settings"
 msgstr "إعدادات تويتر"
 
+#. TRANS: Instructions for page with Twitter integration settings.
 msgid ""
 "Connect your Twitter account to share your updates with your Twitter friends "
 "and vice-versa."
-msgstr ""
+msgstr "اربط حسابك على تويتر لتشارك مستجداتك مع أصدقائك على تويتر والعكس."
 
+#. TRANS: Fieldset legend.
 msgid "Twitter account"
 msgstr "حساب تويتر"
 
+#. TRANS: Form note when a Twitter account has been connected.
 msgid "Connected Twitter account"
 msgstr "حساب تويتر مربوط"
 
+#. TRANS: Fieldset legend.
 msgid "Disconnect my account from Twitter"
 msgstr "ا�صل حسابي عن تويتر"
 
-msgid "Disconnecting your Twitter could make it impossible to log in! Please "
+#. TRANS: Form guide. %s is a URL to the password settings.
+#. TRANS: This message contains a Markdown link in the form [description](link).
+#, php-format
+msgid ""
+"Disconnecting your Twitter account could make it impossible to log in! "
+"Please [set a password](%s) first."
 msgstr ""
+"قد يجعل �صل حسابك على تويتر الولوج مستحيلا! الرجاء [تعيين كلمة سر](%s) أولا."
 
-msgid "set a password"
-msgstr ""
-
-msgid " first."
-msgstr ""
-
-#. TRANS: %1$s is the current website name.
+#. TRANS: Form instructions. %1$s is the StatusNet sitename.
 #, php-format
 msgid ""
 "Keep your %1$s account but disconnect from Twitter. You can use your %1$s "
 "password to log in."
 msgstr ""
+"أبق حسابك على %1$s لكن ا�صله من تويتر. يمكن أن تستخدم كلمة سر %1$s للولوج."
 
+#. TRANS: Button text for disconnecting a Twitter account.
+msgctxt "BUTTON"
 msgid "Disconnect"
-msgstr ""
+msgstr "اقطع الارتباط"
 
+#. TRANS: Fieldset legend.
 msgid "Preferences"
 msgstr "ت�ضيلات"
 
+#. TRANS: Checkbox label.
 msgid "Automatically send my notices to Twitter."
-msgstr ""
+msgstr "أرسل إشعاراتي تلقائيا إلى تويتر."
 
+#. TRANS: Checkbox label.
 msgid "Send local \"@\" replies to Twitter."
-msgstr ""
+msgstr "أرسل ردود \"@\" المحلية إلى تويتر."
 
+#. TRANS: Checkbox label.
 msgid "Subscribe to my Twitter friends here."
-msgstr ""
+msgstr "اشترك بأصدقائي على تويتر هنا."
 
+#. TRANS: Checkbox label.
 msgid "Import my friends timeline."
-msgstr ""
+msgstr "استورد المسار الزمني لأصدقائي."
 
+#. TRANS: Button text for saving Twitter integration settings.
+#. TRANS: Button text for saving the administrative Twitter bridge settings.
+msgctxt "BUTTON"
 msgid "Save"
 msgstr "اح�ظ"
 
+#. TRANS: Button text for adding Twitter integration.
+msgctxt "BUTTON"
 msgid "Add"
 msgstr "أض�"
 
+#. TRANS: Client error displayed when the session token does not match or is not given.
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 
+#. TRANS: Client error displayed when the submitted form contains unexpected data.
 msgid "Unexpected form submission."
 msgstr ""
 
+#. TRANS: Client error displayed when trying to remove a connected Twitter account when there isn't one connected.
 msgid "No Twitter connection to remove."
 msgstr ""
 
-msgid "Couldn't remove Twitter user."
+#. TRANS: Server error displayed when trying to remove a connected Twitter account fails.
+msgid "Could not remove Twitter user."
 msgstr ""
 
+#. TRANS: Success message displayed after disconnecting a Twitter account.
 msgid "Twitter account disconnected."
-msgstr ""
+msgstr "قطع الارتباط بحساب تويتر."
 
-msgid "Couldn't save Twitter preferences."
-msgstr ""
+#. TRANS: Server error displayed when saving Twitter integration preferences fails.
+msgid "Could not save Twitter preferences."
+msgstr "تعذر ح�ظ ت�ضيلات تويتر."
 
+#. TRANS: Success message after saving Twitter integration preferences.
 msgid "Twitter preferences saved."
 msgstr "ح��ظت ت�ضيلات تويتر."
 
+#. TRANS: Form validation error displayed when the checkbox to agree to the license has not been checked.
 msgid "You cannot register if you do not agree to the license."
 msgstr ""
 
+#. TRANS: Form validation error displayed when an unhandled error occurs.
 msgid "Something weird happened."
-msgstr ""
+msgstr "حدث شيء غريب."
 
+#. TRANS: Server error displayed when linking to a Twitter account fails.
 msgid "Could not link your Twitter account."
 msgstr ""
 
-msgid "Couldn't link your Twitter account: oauth_token mismatch."
-msgstr ""
-
-msgid "Couldn't link your Twitter account."
+#. TRANS: Server error displayed when linking to a Twitter account fails because of an incorrect oauth_token.
+msgid "Could not link your Twitter account: oauth_token mismatch."
 msgstr ""
 
+#. TRANS: Page instruction. %s is the StatusNet sitename.
 #, php-format
 msgid ""
-"This is the first time you've logged into %s so we must connect your Twitter "
-"account to a local account. You can either create a new account, or connect "
-"with your existing account, if you have one."
+"This is the first time you have logged into %s so we must connect your "
+"Twitter account to a local account. You can either create a new account, or "
+"connect with your existing account, if you have one."
 msgstr ""
 
+#. TRANS: Page title.
 msgid "Twitter Account Setup"
 msgstr "إعداد حساب تويتر"
 
+#. TRANS: Fieldset legend.
 msgid "Connection options"
 msgstr "خيارات الربط"
 
-#, php-format
-msgid ""
-"My text and files are available under %s except this private data: password, "
-"email address, IM address, and phone number."
-msgstr ""
-
+#. TRANS: Fieldset legend.
 msgid "Create new account"
 msgstr "أنشئ حسابًا جديدًا"
 
+#. TRANS: Sub form introduction text.
 msgid "Create a new user with this nickname."
 msgstr "أنشئ مستخدمًا جديدًا بهذا الاسم المستعار."
 
+#. TRANS: Field label.
 msgid "New nickname"
 msgstr "الاسم المستعار الجديد"
 
+#. TRANS: Field title for nickname field.
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
-msgstr ""
+msgstr "1-64 حر�ًا إنجليزيًا أو رقمًا، بدون نقاط أو مسا�ات."
 
+#. TRANS: Field label.
 msgctxt "LABEL"
 msgid "Email"
 msgstr "البريد الإلكتروني"
 
+#. TRANS: Field title for e-mail address field.
 msgid "Used only for updates, announcements, and password recovery"
 msgstr ""
 
+#. TRANS: Button text for creating a new StatusNet account in the Twitter connect page.
+msgctxt "BUTTON"
 msgid "Create"
 msgstr "أنشئ"
 
+#. TRANS: Fieldset legend.
 msgid "Connect existing account"
 msgstr "اربط الحساب الموجود"
 
+#. TRANS: Sub form introduction text.
 msgid ""
 "If you already have an account, login with your username and password to "
 "connect it to your Twitter account."
 msgstr ""
 "إذا كان لديك حساب �علا، ل�ج باسم مستخدمك وكلمة سرك لتربطه بحسابك على تويتر."
 
+#. TRANS: Field label.
 msgid "Existing nickname"
 msgstr "الاسم المستعار الموجود"
 
+#. TRANS: Field label.
 msgid "Password"
 msgstr "كلمة السر"
 
+#. TRANS: Fieldset legend.
+msgid "License"
+msgstr ""
+
+#. TRANS: Text for license agreement checkbox.
+#. TRANS: %s is the license as configured for the StatusNet site.
+#, php-format
+msgid ""
+"My text and files are available under %s except this private data: password, "
+"email address, IM address, and phone number."
+msgstr ""
+"تخضع نصوصي ومل�اتي ل%s إلا البيانات الخاصة التالية: كلمة السر وعنوان البريد "
+"الإلكتروني وعنوان المراسلة ال�ورية ورقم الهات�."
+
+#. TRANS: Button text for connecting an existing StatusNet account in the Twitter connect page..
+msgctxt "BUTTON"
 msgid "Connect"
 msgstr "اربط"
 
+#. TRANS: Client error displayed when trying to create a new user while creating new users is not allowed.
 msgid "Registration not allowed."
 msgstr "لا ي�سمح بالتسجيل."
 
+#. TRANS: Client error displayed when trying to create a new user with an invalid invitation code.
 msgid "Not a valid invitation code."
 msgstr "رمز دعوة غير صالح."
 
+#. TRANS: Client error displayed when trying to create a new user with an invalid username.
 msgid "Nickname not allowed."
 msgstr "لا يسمح بهذا الاسم المستعار."
 
+#. TRANS: Client error displayed when trying to create a new user with a username that is already in use.
 msgid "Nickname already in use. Try another one."
 msgstr "الاسم المستعار مستخدم بال�عل. جرّب اسمًا آخرًا."
 
+#. TRANS: Server error displayed when creating a new user has failed.
 msgid "Error registering user."
 msgstr "خطأ �ي تسجيل مستخدم."
 
+#. TRANS: Server error displayed when connecting a user to a Twitter user has failed.
+#. TRANS: Server error displayed connecting a user to a Twitter user has failed.
 msgid "Error connecting user to Twitter."
 msgstr "خطأ �ي ربط المستخدم بتويتر."
 
+#. TRANS: Form validation error displayed when connecting an existing user to a Twitter user fails because
+#. TRANS: the provided username and/or password are incorrect.
 msgid "Invalid username or password."
 msgstr "اسم مستخدم أو كلمة سر غير صالحة."
 
+#. TRANS: Page title for Twitter administration panel.
+msgctxt "TITLE"
 msgid "Twitter"
 msgstr "تويتر"
 
+#. TRANS: Instructions for Twitter bridge administration page.
 msgid "Twitter bridge settings"
 msgstr "إعدادات جسر تويتر"
 
-msgid "Invalid consumer key. Max length is 255 characters."
+#. TRANS: Client error displayed when a consumer key is invalid because it is too long.
+msgid "Invalid consumer key. Maximum length is 255 characters."
 msgstr ""
 
-msgid "Invalid consumer secret. Max length is 255 characters."
+#. TRANS: Client error displayed when a consumer secret is invalid because it is too long.
+msgid "Invalid consumer secret. Maximum length is 255 characters."
 msgstr ""
 
+#. TRANS: Fieldset legend for Twitter application settings.
 msgid "Twitter application settings"
 msgstr ""
 
+#. TRANS: Field label for Twitter assigned consumer key.
 msgid "Consumer key"
 msgstr ""
 
-msgid "Consumer key assigned by Twitter"
+#. TRANS: Field title for Twitter assigned consumer key.
+msgid "The consumer key assigned by Twitter."
 msgstr ""
 
+#. TRANS: Field label for Twitter assigned consumer secret.
 msgid "Consumer secret"
 msgstr ""
 
-msgid "Consumer secret assigned by Twitter"
+#. TRANS: Field title for Twitter assigned consumer secret.
+msgid "The consumer secret assigned by Twitter."
 msgstr ""
 
-msgid "Note: a global consumer key and secret are set."
+#. TRANS: Form guide displayed when two required fields have already been provided.
+msgid "Note: A global consumer key and secret are set."
 msgstr ""
 
+#. TRANS: Field label for Twitter application name.
 msgid "Integration source"
 msgstr ""
 
-msgid "Name of your Twitter application"
+#. TRANS: Field title for Twitter application name.
+msgid "The name of your Twitter application."
 msgstr ""
 
+#. TRANS: Fieldset legend for Twitter integration options.
 msgid "Options"
 msgstr "خيارات"
 
+#. TRANS: Checkbox label for global setting.
 msgid "Enable \"Sign-in with Twitter\""
 msgstr ""
 
-msgid "Allow users to login with their Twitter credentials"
+#. TRANS: Checkbox title.
+msgid "This allow users to login with their Twitter credentials."
 msgstr ""
 
+#. TRANS: Checkbox label for global setting.
 msgid "Enable Twitter import"
-msgstr ""
+msgstr "مكّن الاستيراد من تويتر"
 
+#. TRANS: Checkbox title for global setting.
 msgid ""
 "Allow users to import their Twitter friends' timelines. Requires daemons to "
 "be manually configured."
 msgstr ""
 
-msgid "Save Twitter settings"
+#. TRANS: Button title for saving the administrative Twitter bridge settings.
+msgid "Save the Twitter bridge settings."
+msgstr "اح�ظ إعدادات جسر تويتر."
+
+#. TRANS: Server exception thrown when an invalid URL scheme is detected.
+msgid "Invalid URL scheme for HTTP stream reader."
 msgstr ""
 
-msgid "Login or register using Twitter"
+#. TRANS: Exception thrown when input from an inexpected socket is encountered.
+msgid "Got input from unexpected socket!"
 msgstr ""
 
+#. TRANS: Exception thrown when an invalid state is encountered in handleLine.
+#. TRANS: %s is the invalid state.
+#, php-format
+msgid "Invalid state in handleLine: %s."
+msgstr ""
+
+#. TRANS: Exception thrown when an invalid response line is encountered.
+#. TRANS: %s is the invalid line.
+#, php-format
+msgid "Invalid HTTP response line: %s."
+msgstr ""
+
+#. TRANS: Exception thrown when an invalid response line part is encountered.
+#. TRANS: %1$s is the chunk, %2$s is the line.
+#, php-format
+msgid "Invalid HTTP response line chunk \"%1$s\": %2$s."
+msgstr ""
+
+#. TRANS: Exception thrown when an invalid response code is encountered.
+#. TRANS: %1$s is the response code, %2$s is the line.
+#, php-format
+msgid "Bad HTTP response code %1$s: %2$s."
+msgstr ""
+
+#. TRANS: Menu item in login navigation.
+#. TRANS: Menu item in connection settings navigation.
+msgctxt "MENU"
+msgid "Twitter"
+msgstr "تويتر"
+
+#. TRANS: Title for menu item in login navigation.
+msgid "Login or register using Twitter."
+msgstr "ل�ج أو سجّل باستخدام تويتر."
+
+#. TRANS: Title for menu item in connection settings navigation.
 msgid "Twitter integration options"
+msgstr "خيارات التكامل مع تويتر"
+
+#. TRANS: Menu item in administrative panel that leads to the Twitter bridge configuration.
+msgid "Twitter"
+msgstr "تويتر"
+
+#. TRANS: Menu item title in administrative panel that leads to the Twitter bridge configuration.
+msgid "Twitter bridge configuration page."
 msgstr ""
 
-msgid "Twitter bridge configuration"
-msgstr ""
-
+#. TRANS: Plugin description.
 msgid ""
 "The Twitter \"bridge\" plugin allows integration of a StatusNet instance "
 "with <a href=\"http://twitter.com/\">Twitter</a>."
 msgstr ""
 
+#. TRANS: Client error displayed when trying to log in using Twitter while already logged in to StatusNet.
 msgid "Already logged in."
 msgstr "والج بال�عل."
 
+#. TRANS: Title for login using Twitter page.
+msgctxt "TITLE"
 msgid "Twitter Login"
-msgstr ""
+msgstr "ولوج بتويتر"
 
+#. TRANS: Instructions for login using Twitter page.
 msgid "Login with your Twitter account"
-msgstr ""
+msgstr "ل�ج بحسابك على تويتر"
 
+#. TRANS: Alternative text for "sign in with Twitter" image.
 msgid "Sign in with Twitter"
-msgstr ""
+msgstr "سجل دخولك بتويتر"
 
 #. TRANS: Mail subject after forwarding notices to Twitter has stopped working.
 msgid "Your Twitter bridge has been disabled"
@@ -299,9 +430,18 @@ msgid ""
 "Regards,\n"
 "%3$s"
 msgstr ""
+"مرحبًا يا %1$s. يؤس�نا إخبارك أن ارتباطك بتويتر قد ع�طّل. يبدو أنه لم يعد يسمح "
+"لنا بتحديث حالتك على تويتر. هل ألغيت السماح ل%3$s؟\n"
+"\n"
+"يمكنك إعادة ت�عيل جسر تويتر بزيارة ص�حة إعدادات تويتر:\n"
+"\n"
+"%2$s\n"
+"\n"
+"مع تحياتنا،\n"
+"%3$s"
 
 #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
 #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
 #, php-format
 msgid "RT @%1$s %2$s"
-msgstr ""
+msgstr "RT @%1$s %2$s"
diff --git a/plugins/TwitterBridge/locale/br/LC_MESSAGES/TwitterBridge.po b/plugins/TwitterBridge/locale/br/LC_MESSAGES/TwitterBridge.po
index 2bda5c3d9c..6961336677 100644
--- a/plugins/TwitterBridge/locale/br/LC_MESSAGES/TwitterBridge.po
+++ b/plugins/TwitterBridge/locale/br/LC_MESSAGES/TwitterBridge.po
@@ -9,18 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TwitterBridge\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:44+0000\n"
+"POT-Creation-Date: 2011-06-18 15:54+0000\n"
+"PO-Revision-Date: 2011-06-18 15:57:55+0000\n"
 "Language-Team: Breton <http://translatewiki.net/wiki/Portal:br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:29+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
+"X-POT-Import-Date: 2011-06-05 21:52:09+0000\n"
+"X-Generator: MediaWiki 1.19alpha (r90318); Translate extension (2011-06-02)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-twitterbridge\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#. TRANS: Title for page with Twitter integration settings.
 msgid "Twitter settings"
 msgstr "Arventennoù Twitter"
 
@@ -29,250 +30,382 @@ msgid ""
 "and vice-versa."
 msgstr ""
 
+#. TRANS: Fieldset legend.
 msgid "Twitter account"
 msgstr "Kont Twitter"
 
+#. TRANS: Form note when a Twitter account has been connected.
 msgid "Connected Twitter account"
 msgstr ""
 
+#. TRANS: Fieldset legend.
 msgid "Disconnect my account from Twitter"
 msgstr "Digevreañ ma c'hont deus Twitter"
 
-msgid "Disconnecting your Twitter could make it impossible to log in! Please "
+#. TRANS: Form guide. %s is a URL to the password settings.
+#. TRANS: This message contains a Markdown link in the form [description](link).
+#, php-format
+msgid ""
+"Disconnecting your Twitter account could make it impossible to log in! "
+"Please [set a password](%s) first."
 msgstr ""
 
-msgid "set a password"
-msgstr "Termeniñ ur ger-tremen"
-
-msgid " first."
-msgstr "da gentañ."
-
-#. TRANS: %1$s is the current website name.
+#. TRANS: Form instructions. %s is a URL to the password settings.
+#. TRANS: %1$s is the StatusNet sitename.
 #, php-format
 msgid ""
 "Keep your %1$s account but disconnect from Twitter. You can use your %1$s "
 "password to log in."
 msgstr ""
 
+#. TRANS: Button text for disconnecting a Twitter account.
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Disconnect"
 msgstr "Digevreet"
 
+#. TRANS: Fieldset legend.
 msgid "Preferences"
 msgstr "Penndibaboù"
 
+#. TRANS: Checkbox label.
 msgid "Automatically send my notices to Twitter."
 msgstr ""
 
+#. TRANS: Checkbox label.
 msgid "Send local \"@\" replies to Twitter."
 msgstr ""
 
+#. TRANS: Checkbox label.
 msgid "Subscribe to my Twitter friends here."
 msgstr ""
 
+#. TRANS: Checkbox label.
 msgid "Import my friends timeline."
 msgstr ""
 
+#. TRANS: Button text for saving Twitter integration settings.
+#. TRANS: Button text for saving the administrative Twitter bridge settings.
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Save"
 msgstr "Enrollañ"
 
+#. TRANS: Button text for adding Twitter integration.
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Add"
 msgstr "Ouzhpennañ"
 
+#. TRANS: Client error displayed when the session token does not match or is not given.
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 
+#. TRANS: Client error displayed when the submitted form contains unexpected data.
 msgid "Unexpected form submission."
 msgstr ""
 
+#. TRANS: Client error displayed when trying to remove a connected Twitter account when there isn't one connected.
 msgid "No Twitter connection to remove."
 msgstr ""
 
-msgid "Couldn't remove Twitter user."
-msgstr ""
+#. TRANS: Server error displayed when trying to remove a connected Twitter account fails.
+#, fuzzy
+msgid "Could not remove Twitter user."
+msgstr "Kevreadenn gant ho kont Twitter"
 
+#. TRANS: Success message displayed after disconnecting a Twitter account.
 msgid "Twitter account disconnected."
 msgstr ""
 
-msgid "Couldn't save Twitter preferences."
+#. TRANS: Server error displayed when saving Twitter integration preferences fails.
+msgid "Could not save Twitter preferences."
 msgstr ""
 
+#. TRANS: Success message after saving Twitter integration preferences.
 msgid "Twitter preferences saved."
 msgstr ""
 
+#. TRANS: Form validation error displayed when the checkbox to agree to the license has not been checked.
 msgid "You cannot register if you do not agree to the license."
 msgstr ""
 
+#. TRANS: Form validation error displayed when an unhandled error occurs.
 msgid "Something weird happened."
 msgstr ""
 
+#. TRANS: Server error displayed when linking to a Twitter account fails.
 #, fuzzy
 msgid "Could not link your Twitter account."
 msgstr "Kevreadenn gant ho kont Twitter"
 
-msgid "Couldn't link your Twitter account: oauth_token mismatch."
-msgstr ""
-
-msgid "Couldn't link your Twitter account."
-msgstr ""
+#. TRANS: Server error displayed when linking to a Twitter account fails because of an incorrect oauth_token.
+#, fuzzy
+msgid "Could not link your Twitter account: oauth_token mismatch."
+msgstr "Kevreadenn gant ho kont Twitter"
 
+#. TRANS: Page instruction. %s is the StatusNet sitename.
 #, php-format
 msgid ""
-"This is the first time you've logged into %s so we must connect your Twitter "
-"account to a local account. You can either create a new account, or connect "
-"with your existing account, if you have one."
+"This is the first time you have logged into %s so we must connect your "
+"Twitter account to a local account. You can either create a new account, or "
+"connect with your existing account, if you have one."
 msgstr ""
 
+#. TRANS: Page title.
 msgid "Twitter Account Setup"
 msgstr ""
 
+#. TRANS: Fieldset legend.
 msgid "Connection options"
 msgstr "Dibarzhioù kevreañ"
 
+#. TRANS: Text for license agreement checkbox.
+#. TRANS: %s is the license as configured for the StatusNet site.
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
 "email address, IM address, and phone number."
 msgstr ""
 
+#. TRANS: Fieldset legend.
 msgid "Create new account"
 msgstr "Krouiñ ur gont nevez"
 
+#. TRANS: Sub form introduction text.
 msgid "Create a new user with this nickname."
 msgstr "Krouiñ un implijer nevez gant al lesanv-se."
 
+#. TRANS: Field label.
 msgid "New nickname"
 msgstr "Lesanv nevez"
 
+#. TRANS: Field title for nickname field.
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr ""
 
+#. TRANS: Field label.
 msgctxt "LABEL"
 msgid "Email"
 msgstr ""
 
+#. TRANS: Field title for e-mail address field.
 msgid "Used only for updates, announcements, and password recovery"
 msgstr ""
 
+#. TRANS: Button text for creating a new StatusNet account in the Twitter connect page.
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Create"
 msgstr "Krouiñ"
 
+#. TRANS: Fieldset legend.
 msgid "Connect existing account"
 msgstr "Kevreañ d'ur gont a zo dioutañ"
 
+#. TRANS: Sub form introduction text.
 msgid ""
 "If you already have an account, login with your username and password to "
 "connect it to your Twitter account."
 msgstr ""
 
+#. TRANS: Field label.
 msgid "Existing nickname"
 msgstr "Lesanv a zo dioutañ"
 
+#. TRANS: Field label.
 msgid "Password"
 msgstr "Ger-tremen"
 
+#. TRANS: Button text for connecting an existing StatusNet account in the Twitter connect page..
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Connect"
 msgstr "Kevreañ"
 
+#. TRANS: Client error displayed when trying to create a new user while creating new users is not allowed.
 msgid "Registration not allowed."
 msgstr "N'eo ket aotreet krouiñ kontoù."
 
+#. TRANS: Client error displayed when trying to create a new user with an invalid invitation code.
 msgid "Not a valid invitation code."
 msgstr ""
 
+#. TRANS: Client error displayed when trying to create a new user with an invalid username.
 msgid "Nickname not allowed."
 msgstr "Lesanv nann-aotreet."
 
+#. TRANS: Client error displayed when trying to create a new user with a username that is already in use.
 msgid "Nickname already in use. Try another one."
 msgstr "Implijet eo dija al lesanv-se. Klaskit unan all."
 
+#. TRANS: Server error displayed when creating a new user has failed.
 msgid "Error registering user."
 msgstr ""
 
+#. TRANS: Server error displayed when connecting a user to a Twitter user has failed.
+#. TRANS: Server error displayed connecting a user to a Twitter user has failed.
 msgid "Error connecting user to Twitter."
 msgstr ""
 
+#. TRANS: Form validation error displayed when connecting an existing user to a Twitter user fails because
+#. TRANS: the provided username and/or password are incorrect.
 msgid "Invalid username or password."
 msgstr "Anv implijer pe ger-tremen direizh."
 
+#. TRANS: Page title for Twitter administration panel.
+#, fuzzy
+msgctxt "TITLE"
 msgid "Twitter"
 msgstr "Twitter"
 
+#. TRANS: Instructions for Twitter bridge administration page.
 msgid "Twitter bridge settings"
 msgstr ""
 
-msgid "Invalid consumer key. Max length is 255 characters."
+#. TRANS: Client error displayed when a consumer key is invalid because it is too long.
+msgid "Invalid consumer key. Maximum length is 255 characters."
 msgstr ""
 
-msgid "Invalid consumer secret. Max length is 255 characters."
+#. TRANS: Client error displayed when a consumer secret is invalid because it is too long.
+msgid "Invalid consumer secret. Maximum length is 255 characters."
 msgstr ""
 
+#. TRANS: Fieldset legend for Twitter application settings.
 msgid "Twitter application settings"
 msgstr ""
 
+#. TRANS: Field label for Twitter assigned consumer key.
 msgid "Consumer key"
 msgstr ""
 
-msgid "Consumer key assigned by Twitter"
+#. TRANS: Field title for Twitter assigned consumer key.
+msgid "The consumer key assigned by Twitter."
 msgstr ""
 
+#. TRANS: Field label for Twitter assigned consumer secret.
 msgid "Consumer secret"
 msgstr ""
 
-msgid "Consumer secret assigned by Twitter"
+#. TRANS: Field title for Twitter assigned consumer secret.
+msgid "The consumer secret assigned by Twitter."
 msgstr ""
 
-msgid "Note: a global consumer key and secret are set."
+#. TRANS: Form guide displayed when two required fields have already been provided.
+msgid "Note: A global consumer key and secret are set."
 msgstr ""
 
+#. TRANS: Field label for Twitter application name.
 msgid "Integration source"
 msgstr ""
 
-msgid "Name of your Twitter application"
-msgstr ""
+#. TRANS: Field title for Twitter application name.
+#, fuzzy
+msgid "The name of your Twitter application."
+msgstr "Kevreadenn gant ho kont Twitter"
 
+#. TRANS: Fieldset legend for Twitter integration options.
 msgid "Options"
 msgstr "Dibarzhioù"
 
+#. TRANS: Checkbox label for global setting.
 msgid "Enable \"Sign-in with Twitter\""
 msgstr ""
 
-msgid "Allow users to login with their Twitter credentials"
+#. TRANS: Checkbox title.
+msgid "This allow users to login with their Twitter credentials."
 msgstr ""
 
+#. TRANS: Checkbox label for global setting.
 msgid "Enable Twitter import"
 msgstr ""
 
+#. TRANS: Checkbox title for global setting.
 msgid ""
 "Allow users to import their Twitter friends' timelines. Requires daemons to "
 "be manually configured."
 msgstr ""
 
-msgid "Save Twitter settings"
+#. TRANS: Button title for saving the administrative Twitter bridge settings.
+#, fuzzy
+msgid "Save the Twitter bridge settings."
 msgstr "Enrollañ arventennoù Twitter"
 
-msgid "Login or register using Twitter"
+#. TRANS: Server exception thrown when an invalid URL scheme is detected.
+msgid "Invalid URL scheme for HTTP stream reader."
+msgstr ""
+
+#. TRANS: Exception thrown when input from an inexpected socket is encountered.
+msgid "Got input from unexpected socket!"
+msgstr ""
+
+#. TRANS: Exception thrown when an invalid state is encountered in handleLine.
+#. TRANS: %s is the invalid state.
+#, php-format
+msgid "Invalid state in handleLine: %s."
+msgstr ""
+
+#. TRANS: Exception thrown when an invalid response line is encountered.
+#. TRANS: %s is the invalid line.
+#, php-format
+msgid "Invalid HTTP response line: %s."
+msgstr ""
+
+#. TRANS: Exception thrown when an invalid response line part is encountered.
+#. TRANS: %1$s is the chunk, %2$s is the line.
+#, php-format
+msgid "Invalid HTTP response line chunk \"%1$s\": %2$s."
+msgstr ""
+
+#. TRANS: Exception thrown when an invalid response code is encountered.
+#. TRANS: %1$s is the response code, %2$s is the line.
+#, php-format
+msgid "Bad HTTP response code %1$s: %2$s."
+msgstr ""
+
+#. TRANS: Menu item in login navigation.
+#. TRANS: Menu item in connection settings navigation.
+#, fuzzy
+msgctxt "MENU"
+msgid "Twitter"
+msgstr "Twitter"
+
+#. TRANS: Title for menu item in login navigation.
+#, fuzzy
+msgid "Login or register using Twitter."
 msgstr "Kevreañ pe en em enskrivañ dre Twitter"
 
+#. TRANS: Title for menu item in connection settings navigation.
 msgid "Twitter integration options"
 msgstr "Dibarzhioù enframmañ Twitter"
 
+msgid "Twitter"
+msgstr "Twitter"
+
 msgid "Twitter bridge configuration"
 msgstr ""
 
+#. TRANS: Plugin description.
 msgid ""
 "The Twitter \"bridge\" plugin allows integration of a StatusNet instance "
 "with <a href=\"http://twitter.com/\">Twitter</a>."
 msgstr ""
 
+#. TRANS: Client error displayed when trying to log in using Twitter while already logged in to StatusNet.
 msgid "Already logged in."
 msgstr "Kevreet oc'h dija."
 
+#. TRANS: Title for login using Twitter page.
+#, fuzzy
+msgctxt "TITLE"
 msgid "Twitter Login"
 msgstr "Keveadenn Twitter"
 
+#. TRANS: Instructions for login using Twitter page.
 msgid "Login with your Twitter account"
 msgstr "Kevreadenn gant ho kont Twitter"
 
+#. TRANS: Alternative text for "sign in with Twitter" image.
 msgid "Sign in with Twitter"
 msgstr "Kevreañ gant Twitter"
 
@@ -303,3 +436,9 @@ msgstr ""
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
+
+#~ msgid "set a password"
+#~ msgstr "Termeniñ ur ger-tremen"
+
+#~ msgid " first."
+#~ msgstr "da gentañ."
diff --git a/plugins/TwitterBridge/locale/ca/LC_MESSAGES/TwitterBridge.po b/plugins/TwitterBridge/locale/ca/LC_MESSAGES/TwitterBridge.po
index 73335383eb..877ef039b3 100644
--- a/plugins/TwitterBridge/locale/ca/LC_MESSAGES/TwitterBridge.po
+++ b/plugins/TwitterBridge/locale/ca/LC_MESSAGES/TwitterBridge.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - TwitterBridge to Catalan (Català)
+# Translation of StatusNet - TwitterBridge to Catalan (català)
 # Exported from translatewiki.net
 #
 # Author: Toniher
@@ -9,21 +9,23 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TwitterBridge\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:44+0000\n"
-"Language-Team: Catalan <http://translatewiki.net/wiki/Portal:ca>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:20+0000\n"
+"Language-Team: Catalan <https://translatewiki.net/wiki/Portal:ca>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:29+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-12-03 13:51:38+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ca\n"
 "X-Message-Group: #out-statusnet-plugin-twitterbridge\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Title for page with Twitter integration settings.
 msgid "Twitter settings"
 msgstr "Paràmetres del Twitter"
 
+#. TRANS: Instructions for page with Twitter integration settings.
 msgid ""
 "Connect your Twitter account to share your updates with your Twitter friends "
 "and vice-versa."
@@ -31,27 +33,29 @@ msgstr ""
 "Connecteu el vostre compte del Twitter per compartir les vostres "
 "actualitzacions amb els vostres amics del Twitter i viceversa."
 
+#. TRANS: Fieldset legend.
 msgid "Twitter account"
 msgstr "Compte del Twitter"
 
+#. TRANS: Form note when a Twitter account has been connected.
 msgid "Connected Twitter account"
 msgstr "Compte del Twitter connectat"
 
+#. TRANS: Fieldset legend.
 msgid "Disconnect my account from Twitter"
 msgstr "Desconnecta el meu compte del Twitter"
 
-msgid "Disconnecting your Twitter could make it impossible to log in! Please "
+#. TRANS: Form guide. %s is a URL to the password settings.
+#. TRANS: This message contains a Markdown link in the form [description](link).
+#, php-format
+msgid ""
+"Disconnecting your Twitter account could make it impossible to log in! "
+"Please [set a password](%s) first."
 msgstr ""
-"En desconnectar el vostre Twitter podeu impossibilitar que torneu a iniciar "
-"una sessió! "
+"En desconnectar el vostre Twitter podeu fer que no pogueu tornar a iniciar "
+"una sessió!  [Definiu-ne una contrasenya](%s) abans de res."
 
-msgid "set a password"
-msgstr "Definiu una contrasenya"
-
-msgid " first."
-msgstr " primer."
-
-#. TRANS: %1$s is the current website name.
+#. TRANS: Form instructions. %1$s is the StatusNet sitename.
 #, php-format
 msgid ""
 "Keep your %1$s account but disconnect from Twitter. You can use your %1$s "
@@ -60,86 +64,166 @@ msgstr ""
 "Mantingueu el vostre compte %1$s, però desconnecteu-lo del Twitter. Podeu "
 "emprar la vostra contrasenya %1$s per iniciar una sessió."
 
+#. TRANS: Button text for disconnecting a Twitter account.
+msgctxt "BUTTON"
 msgid "Disconnect"
 msgstr "Desconnecta"
 
+#. TRANS: Fieldset legend.
 msgid "Preferences"
 msgstr "Preferències"
 
+#. TRANS: Checkbox label.
 msgid "Automatically send my notices to Twitter."
 msgstr "Envia automàticament els meus avisos al Twitter."
 
+#. TRANS: Checkbox label.
 msgid "Send local \"@\" replies to Twitter."
 msgstr "Envia les respostes locals «@» al Twitter."
 
+#. TRANS: Checkbox label.
 msgid "Subscribe to my Twitter friends here."
 msgstr "Subscriu els meus amics del Twitter aquí."
 
+#. TRANS: Checkbox label.
 msgid "Import my friends timeline."
 msgstr "Importa la línia temporal d'amics."
 
+#. TRANS: Button text for saving Twitter integration settings.
+#. TRANS: Button text for saving the administrative Twitter bridge settings.
+msgctxt "BUTTON"
 msgid "Save"
 msgstr "Desa"
 
+#. TRANS: Button text for adding Twitter integration.
+msgctxt "BUTTON"
 msgid "Add"
 msgstr "Afegeix"
 
+#. TRANS: Client error displayed when the session token does not match or is not given.
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 "S'ha produït un problema amb el vostre testimoni de sessió. Torneu-ho a "
 "provar."
 
+#. TRANS: Client error displayed when the submitted form contains unexpected data.
 msgid "Unexpected form submission."
 msgstr "Enviament de formulari inesperat."
 
+#. TRANS: Client error displayed when trying to remove a connected Twitter account when there isn't one connected.
 msgid "No Twitter connection to remove."
 msgstr "No hi ha cap connexió del Twitter a suprimir."
 
-msgid "Couldn't remove Twitter user."
-msgstr "No s'ha pogut suprimir l'usuari del Twitter."
+#. TRANS: Server error displayed when trying to remove a connected Twitter account fails.
+msgid "Could not remove Twitter user."
+msgstr "No s'ha pogut eliminar l'usuari del Twitter."
 
+#. TRANS: Success message displayed after disconnecting a Twitter account.
 msgid "Twitter account disconnected."
 msgstr "S'ha desconnectat el compte del Twitter."
 
-msgid "Couldn't save Twitter preferences."
+#. TRANS: Server error displayed when saving Twitter integration preferences fails.
+msgid "Could not save Twitter preferences."
 msgstr "No s'han pogut desar les preferències del Twitter."
 
+#. TRANS: Success message after saving Twitter integration preferences.
 msgid "Twitter preferences saved."
 msgstr "S'han desat les preferències del Twitter."
 
+#. TRANS: Form validation error displayed when the checkbox to agree to the license has not been checked.
 msgid "You cannot register if you do not agree to the license."
 msgstr "No podeu registrar-vos-hi si no accepteu la llicència."
 
+#. TRANS: Form validation error displayed when an unhandled error occurs.
 msgid "Something weird happened."
 msgstr "Ha passat quelcom estrany."
 
+#. TRANS: Server error displayed when linking to a Twitter account fails.
 msgid "Could not link your Twitter account."
 msgstr "No s'ha pogut enllaçar amb el compte del Twitter."
 
-msgid "Couldn't link your Twitter account: oauth_token mismatch."
+#. TRANS: Server error displayed when linking to a Twitter account fails because of an incorrect oauth_token.
+msgid "Could not link your Twitter account: oauth_token mismatch."
 msgstr ""
-"No s'ha pogut enllaçar amb el vostre compte del Twitter: no coincidència de "
-"l'oath_token."
-
-msgid "Couldn't link your Twitter account."
-msgstr "No s'ha pogut enllaçar amb el compte del Twitter."
+"No s'ha pogut enllaçar amb el vostre compte del Twitter: no hi ha "
+"coincidència de l'oath_token."
 
+#. TRANS: Page instruction. %s is the StatusNet sitename.
 #, php-format
 msgid ""
-"This is the first time you've logged into %s so we must connect your Twitter "
-"account to a local account. You can either create a new account, or connect "
-"with your existing account, if you have one."
+"This is the first time you have logged into %s so we must connect your "
+"Twitter account to a local account. You can either create a new account, or "
+"connect with your existing account, if you have one."
 msgstr ""
 "Aquesta és la primera vegada que inicieu una sessió a %s, per tant hem de "
 "connectar el vostre compte del Twitter al vostre compte local. Podeu crear "
 "un compte nou, o bé connectar-vos amb un compte ja existent si en teniu un."
 
+#. TRANS: Page title.
 msgid "Twitter Account Setup"
 msgstr "Configuració del compte del Twitter"
 
+#. TRANS: Fieldset legend.
 msgid "Connection options"
 msgstr "Opcions de connexió"
 
+#. TRANS: Fieldset legend.
+msgid "Create new account"
+msgstr "Crea un compte nou"
+
+#. TRANS: Sub form introduction text.
+msgid "Create a new user with this nickname."
+msgstr "Crea un usuari nom amb aquest sobrenom."
+
+#. TRANS: Field label.
+msgid "New nickname"
+msgstr "Nou sobrenom"
+
+#. TRANS: Field title for nickname field.
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
+msgstr "1-64 lletres en minúscules o nombres, sense puntuació o espais."
+
+#. TRANS: Field label.
+msgctxt "LABEL"
+msgid "Email"
+msgstr "Correu electrònic"
+
+#. TRANS: Field title for e-mail address field.
+msgid "Used only for updates, announcements, and password recovery"
+msgstr ""
+"S'utilitza per a actualitzacions, anuncis i per recuperar la contrasenya"
+
+#. TRANS: Button text for creating a new StatusNet account in the Twitter connect page.
+msgctxt "BUTTON"
+msgid "Create"
+msgstr "Crea"
+
+#. TRANS: Fieldset legend.
+msgid "Connect existing account"
+msgstr "Connecta un compte ja existent"
+
+#. TRANS: Sub form introduction text.
+msgid ""
+"If you already have an account, login with your username and password to "
+"connect it to your Twitter account."
+msgstr ""
+"Si ja teniu un compte, inicieu una sessió amb el vostre usuari i contrasenya "
+"per connectar-lo al vostre compte del Twitter."
+
+#. TRANS: Field label.
+msgid "Existing nickname"
+msgstr "Sobrenom ja existent"
+
+#. TRANS: Field label.
+msgid "Password"
+msgstr "Contrasenya"
+
+#. TRANS: Fieldset legend.
+msgid "License"
+msgstr "Llicència"
+
+#. TRANS: Text for license agreement checkbox.
+#. TRANS: %s is the license as configured for the StatusNet site.
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
@@ -149,118 +233,108 @@ msgstr ""
 "dades privades: contrasenya, adreça de correu electrònic i MI, i número de "
 "telèfon."
 
-msgid "Create new account"
-msgstr "Crea un compte nou"
-
-msgid "Create a new user with this nickname."
-msgstr "Crea un usuari nom amb aquest sobrenom."
-
-msgid "New nickname"
-msgstr "Nou sobrenom"
-
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
-msgstr "1-64 lletres en minúscules o nombres, sense puntuació o espais."
-
-msgctxt "LABEL"
-msgid "Email"
-msgstr "Correu electrònic"
-
-msgid "Used only for updates, announcements, and password recovery"
-msgstr ""
-"S'utilitza per a actualitzacions, anuncis i per recuperar la contrasenya"
-
-msgid "Create"
-msgstr "Crea"
-
-msgid "Connect existing account"
-msgstr "Connecta un compte ja existent"
-
-msgid ""
-"If you already have an account, login with your username and password to "
-"connect it to your Twitter account."
-msgstr ""
-"Si ja teniu un compte, inicieu una sessió amb el vostre usuari i contrasenya "
-"per connectar-lo al vostre compte del Twitter."
-
-msgid "Existing nickname"
-msgstr "Sobrenom ja existent"
-
-msgid "Password"
-msgstr "Contrasenya"
-
+#. TRANS: Button text for connecting an existing StatusNet account in the Twitter connect page..
+msgctxt "BUTTON"
 msgid "Connect"
 msgstr "Connecta"
 
+#. TRANS: Client error displayed when trying to create a new user while creating new users is not allowed.
 msgid "Registration not allowed."
 msgstr "No es permet el registre."
 
+#. TRANS: Client error displayed when trying to create a new user with an invalid invitation code.
 msgid "Not a valid invitation code."
 msgstr "No és un codi d'invitació vàlid."
 
+#. TRANS: Client error displayed when trying to create a new user with an invalid username.
 msgid "Nickname not allowed."
 msgstr "El sobrenom no és permès."
 
+#. TRANS: Client error displayed when trying to create a new user with a username that is already in use.
 msgid "Nickname already in use. Try another one."
 msgstr "El sobrenom ja és en ús. Proveu-ne un altre."
 
+#. TRANS: Server error displayed when creating a new user has failed.
 msgid "Error registering user."
 msgstr "Error en registrar l'usuari."
 
+#. TRANS: Server error displayed when connecting a user to a Twitter user has failed.
+#. TRANS: Server error displayed connecting a user to a Twitter user has failed.
 msgid "Error connecting user to Twitter."
 msgstr "Error en connectar l'usuari al Twitter."
 
+#. TRANS: Form validation error displayed when connecting an existing user to a Twitter user fails because
+#. TRANS: the provided username and/or password are incorrect.
 msgid "Invalid username or password."
 msgstr "Nom d'usuari o contrasenya no vàlida."
 
+#. TRANS: Page title for Twitter administration panel.
+msgctxt "TITLE"
 msgid "Twitter"
 msgstr "Twitter"
 
+#. TRANS: Instructions for Twitter bridge administration page.
 msgid "Twitter bridge settings"
 msgstr "Paràmetres del pont del Twitter"
 
-msgid "Invalid consumer key. Max length is 255 characters."
-msgstr "Clau de consumidor no vàlida. La llargada màxima és 255 caràcters."
+#. TRANS: Client error displayed when a consumer key is invalid because it is too long.
+msgid "Invalid consumer key. Maximum length is 255 characters."
+msgstr "Clau de consumidor no vàlida. La longitud màxima és 255 caràcters."
 
-msgid "Invalid consumer secret. Max length is 255 characters."
+#. TRANS: Client error displayed when a consumer secret is invalid because it is too long.
+msgid "Invalid consumer secret. Maximum length is 255 characters."
 msgstr ""
-"Clau secreta de consumidor no vàlida. La llargada màxima és 255 caràcters."
+"Clau secreta de consumidor no vàlida. La longitud màxima és 255 caràcters."
 
+#. TRANS: Fieldset legend for Twitter application settings.
 msgid "Twitter application settings"
 msgstr "Paràmetres de l'aplicació del Twitter"
 
+#. TRANS: Field label for Twitter assigned consumer key.
 msgid "Consumer key"
 msgstr "Clau de consumidor"
 
-msgid "Consumer key assigned by Twitter"
-msgstr "Clau de consumidor assignada pel Twitter"
+#. TRANS: Field title for Twitter assigned consumer key.
+msgid "The consumer key assigned by Twitter."
+msgstr "Clau de consumidor assignada pel Twitter."
 
+#. TRANS: Field label for Twitter assigned consumer secret.
 msgid "Consumer secret"
 msgstr "Clau secreta de consumidor"
 
-msgid "Consumer secret assigned by Twitter"
-msgstr "Clau secreta de consumidor assignada pel Twitter"
+#. TRANS: Field title for Twitter assigned consumer secret.
+msgid "The consumer secret assigned by Twitter."
+msgstr "Clau secreta de consumidor assignada pel Twitter."
 
-msgid "Note: a global consumer key and secret are set."
-msgstr "Nota: es defineixen una clau pública i secreta de consumidor."
+#. TRANS: Form guide displayed when two required fields have already been provided.
+msgid "Note: A global consumer key and secret are set."
+msgstr "Nota: es defineix una clau pública i secreta de consumidor global."
 
+#. TRANS: Field label for Twitter application name.
 msgid "Integration source"
 msgstr "Font d'integració"
 
-msgid "Name of your Twitter application"
-msgstr "Nom de la vostra aplicació del Twitter"
+#. TRANS: Field title for Twitter application name.
+msgid "The name of your Twitter application."
+msgstr "El nom de la vostra aplicació del Twitter."
 
+#. TRANS: Fieldset legend for Twitter integration options.
 msgid "Options"
 msgstr "Opcions"
 
+#. TRANS: Checkbox label for global setting.
 msgid "Enable \"Sign-in with Twitter\""
 msgstr "Habilita l'inici de sessió amb el Twitter"
 
-msgid "Allow users to login with their Twitter credentials"
-msgstr "Permet als usuaris iniciar una sessió amb les credencials del Twitter"
+#. TRANS: Checkbox title.
+msgid "This allow users to login with their Twitter credentials."
+msgstr "Permet als usuaris iniciar una sessió amb les credencials del Twitter."
 
+#. TRANS: Checkbox label for global setting.
 msgid "Enable Twitter import"
 msgstr "Habilita la importació del Twitter"
 
+#. TRANS: Checkbox title for global setting.
 msgid ""
 "Allow users to import their Twitter friends' timelines. Requires daemons to "
 "be manually configured."
@@ -268,18 +342,65 @@ msgstr ""
 "Permet als usuaris importar les línies temporals dels amics al Twitter. Cal "
 "que es configurin els dimonis manualment."
 
-msgid "Save Twitter settings"
-msgstr "Desa els paràmetres del Twitter"
+#. TRANS: Button title for saving the administrative Twitter bridge settings.
+msgid "Save the Twitter bridge settings."
+msgstr "Desa els paràmetres del pont del Twitter."
 
-msgid "Login or register using Twitter"
-msgstr "Inicieu una sessió o registreu-vos fent servir el Twitter"
+#. TRANS: Server exception thrown when an invalid URL scheme is detected.
+msgid "Invalid URL scheme for HTTP stream reader."
+msgstr ""
 
+#. TRANS: Exception thrown when input from an inexpected socket is encountered.
+msgid "Got input from unexpected socket!"
+msgstr ""
+
+#. TRANS: Exception thrown when an invalid state is encountered in handleLine.
+#. TRANS: %s is the invalid state.
+#, php-format
+msgid "Invalid state in handleLine: %s."
+msgstr ""
+
+#. TRANS: Exception thrown when an invalid response line is encountered.
+#. TRANS: %s is the invalid line.
+#, php-format
+msgid "Invalid HTTP response line: %s."
+msgstr ""
+
+#. TRANS: Exception thrown when an invalid response line part is encountered.
+#. TRANS: %1$s is the chunk, %2$s is the line.
+#, php-format
+msgid "Invalid HTTP response line chunk \"%1$s\": %2$s."
+msgstr ""
+
+#. TRANS: Exception thrown when an invalid response code is encountered.
+#. TRANS: %1$s is the response code, %2$s is the line.
+#, php-format
+msgid "Bad HTTP response code %1$s: %2$s."
+msgstr ""
+
+#. TRANS: Menu item in login navigation.
+#. TRANS: Menu item in connection settings navigation.
+msgctxt "MENU"
+msgid "Twitter"
+msgstr "Twitter"
+
+#. TRANS: Title for menu item in login navigation.
+msgid "Login or register using Twitter."
+msgstr "Inicieu una sessió o registreu-vos fent servir el Twitter."
+
+#. TRANS: Title for menu item in connection settings navigation.
 msgid "Twitter integration options"
 msgstr "Opcions d'integració del Twitter"
 
-msgid "Twitter bridge configuration"
-msgstr "Configuració del pont del Twitter"
+#. TRANS: Menu item in administrative panel that leads to the Twitter bridge configuration.
+msgid "Twitter"
+msgstr "Twitter"
 
+#. TRANS: Menu item title in administrative panel that leads to the Twitter bridge configuration.
+msgid "Twitter bridge configuration page."
+msgstr "Pàgina de configuració del pont del Twitter."
+
+#. TRANS: Plugin description.
 msgid ""
 "The Twitter \"bridge\" plugin allows integration of a StatusNet instance "
 "with <a href=\"http://twitter.com/\">Twitter</a>."
@@ -287,15 +408,20 @@ msgstr ""
 "El connector del pont del Twitter permet integrar una instància de "
 "l'StatusNet amb el <a href=\"http://twitter.com/\">Twitter</a>."
 
+#. TRANS: Client error displayed when trying to log in using Twitter while already logged in to StatusNet.
 msgid "Already logged in."
 msgstr "Ja heu iniciat una sessió."
 
+#. TRANS: Title for login using Twitter page.
+msgctxt "TITLE"
 msgid "Twitter Login"
 msgstr "Inici de sessió del Twitter"
 
+#. TRANS: Instructions for login using Twitter page.
 msgid "Login with your Twitter account"
 msgstr "Inicieu una sessió amb el vostre compte del Twitter"
 
+#. TRANS: Alternative text for "sign in with Twitter" image.
 msgid "Sign in with Twitter"
 msgstr "Inici de sessió amb el Twitter"
 
diff --git a/plugins/TwitterBridge/locale/de/LC_MESSAGES/TwitterBridge.po b/plugins/TwitterBridge/locale/de/LC_MESSAGES/TwitterBridge.po
index 30a1c8f4ca..0901de5ef7 100644
--- a/plugins/TwitterBridge/locale/de/LC_MESSAGES/TwitterBridge.po
+++ b/plugins/TwitterBridge/locale/de/LC_MESSAGES/TwitterBridge.po
@@ -1,10 +1,13 @@
 # Translation of StatusNet - TwitterBridge to German (Deutsch)
 # Exported from translatewiki.net
 #
+# Author: Alphakilo
 # Author: George Animal
 # Author: Giftpflanze
 # Author: Habi
+# Author: Marcel083
 # Author: Michael
+# Author: Tiin
 # --
 # This file is distributed under the same license as the StatusNet package.
 #
@@ -12,21 +15,23 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TwitterBridge\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:44+0000\n"
-"Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:20+0000\n"
+"Language-Team: German <https://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:29+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-12-03 13:51:38+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-twitterbridge\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Title for page with Twitter integration settings.
 msgid "Twitter settings"
 msgstr "Twittereinstellungen"
 
+#. TRANS: Instructions for page with Twitter integration settings.
 msgid ""
 "Connect your Twitter account to share your updates with your Twitter friends "
 "and vice-versa."
@@ -34,26 +39,29 @@ msgstr ""
 "Verbinde dein Twitterkonto, um deine Aktualisierungen mit Twitterfreunden "
 "und umgekehrt zu teilen."
 
+#. TRANS: Fieldset legend.
 msgid "Twitter account"
 msgstr "Twitterkonto"
 
+#. TRANS: Form note when a Twitter account has been connected.
 msgid "Connected Twitter account"
 msgstr "Verbundenes Twitterkonto"
 
+#. TRANS: Fieldset legend.
 msgid "Disconnect my account from Twitter"
 msgstr "Trenne mein Konto von Twitter"
 
-msgid "Disconnecting your Twitter could make it impossible to log in! Please "
+#. TRANS: Form guide. %s is a URL to the password settings.
+#. TRANS: This message contains a Markdown link in the form [description](link).
+#, php-format
+msgid ""
+"Disconnecting your Twitter account could make it impossible to log in! "
+"Please [set a password](%s) first."
 msgstr ""
-"Die Trennung von Twitter könnte es unmöglich machen, sich anzumelden! Bitte "
+"Die Trennung von deinem Twitterkonto könnte es unmöglich machen, sich "
+"anzumelden! Bitte erst [ein Kennwort festlegen](%s)."
 
-msgid "set a password"
-msgstr "setze ein Passwort"
-
-msgid " first."
-msgstr "bevor du das tust."
-
-#. TRANS: %1$s is the current website name.
+#. TRANS: Form instructions. %1$s is the StatusNet sitename.
 #, php-format
 msgid ""
 "Keep your %1$s account but disconnect from Twitter. You can use your %1$s "
@@ -62,86 +70,167 @@ msgstr ""
 "Behalte dein Konto auf %1$s, aber trenne von Twitter. Du kannst dein %1$s-"
 "Passwort benutzen, um dich anzumelden."
 
+#. TRANS: Button text for disconnecting a Twitter account.
+msgctxt "BUTTON"
 msgid "Disconnect"
 msgstr "Trennen"
 
+#. TRANS: Fieldset legend.
 msgid "Preferences"
 msgstr "Einstellungen"
 
+#. TRANS: Checkbox label.
 msgid "Automatically send my notices to Twitter."
 msgstr "Sende meine Nachrichten automatisch zu Twitter."
 
+#. TRANS: Checkbox label.
 msgid "Send local \"@\" replies to Twitter."
 msgstr "Sende lokale @-Antworten zu Twitter."
 
+#. TRANS: Checkbox label.
 msgid "Subscribe to my Twitter friends here."
 msgstr "Abonniere meine Twitterfreunde hier."
 
+#. TRANS: Checkbox label.
 msgid "Import my friends timeline."
 msgstr "Importiere meine Freundezeitleiste."
 
+#. TRANS: Button text for saving Twitter integration settings.
+#. TRANS: Button text for saving the administrative Twitter bridge settings.
+msgctxt "BUTTON"
 msgid "Save"
 msgstr "Speichern"
 
+#. TRANS: Button text for adding Twitter integration.
+msgctxt "BUTTON"
 msgid "Add"
 msgstr "Hinzufügen"
 
+#. TRANS: Client error displayed when the session token does not match or is not given.
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 "Es gab ein Problem mit deinem Sitzungstoken. Bitte noch einmal versuchen."
 
+#. TRANS: Client error displayed when the submitted form contains unexpected data.
 msgid "Unexpected form submission."
 msgstr "Unerwartete Formulareingabe."
 
+#. TRANS: Client error displayed when trying to remove a connected Twitter account when there isn't one connected.
 msgid "No Twitter connection to remove."
 msgstr "Keine Twitterverbindung zu entfernen."
 
-msgid "Couldn't remove Twitter user."
+#. TRANS: Server error displayed when trying to remove a connected Twitter account fails.
+msgid "Could not remove Twitter user."
 msgstr "Konnte Twitterbenutzer nicht entfernen."
 
+#. TRANS: Success message displayed after disconnecting a Twitter account.
 msgid "Twitter account disconnected."
 msgstr "Twitterkonto getrennt."
 
-msgid "Couldn't save Twitter preferences."
+#. TRANS: Server error displayed when saving Twitter integration preferences fails.
+msgid "Could not save Twitter preferences."
 msgstr "Konnte Twittereinstellungen nicht speichern."
 
+#. TRANS: Success message after saving Twitter integration preferences.
 msgid "Twitter preferences saved."
 msgstr "Twittereinstellungen gespeichert."
 
+#. TRANS: Form validation error displayed when the checkbox to agree to the license has not been checked.
 msgid "You cannot register if you do not agree to the license."
 msgstr "Du kannst dich nicht registrieren, wenn du der Lizenz nicht zustimmst."
 
+#. TRANS: Form validation error displayed when an unhandled error occurs.
 msgid "Something weird happened."
 msgstr "Etwas merkwürdiges ist passiert."
 
+#. TRANS: Server error displayed when linking to a Twitter account fails.
 msgid "Could not link your Twitter account."
 msgstr "Konnte nicht mit deinem Twitterkonto verbinden."
 
-msgid "Couldn't link your Twitter account: oauth_token mismatch."
+#. TRANS: Server error displayed when linking to a Twitter account fails because of an incorrect oauth_token.
+msgid "Could not link your Twitter account: oauth_token mismatch."
 msgstr ""
 "Konnte nicht mit deinem Twitterkonto verbinden: oauth_token passt nicht "
 "zusammen."
 
-msgid "Couldn't link your Twitter account."
-msgstr "Konnte dein Twitterkonto nicht verbinden."
-
+#. TRANS: Page instruction. %s is the StatusNet sitename.
 #, php-format
 msgid ""
-"This is the first time you've logged into %s so we must connect your Twitter "
-"account to a local account. You can either create a new account, or connect "
-"with your existing account, if you have one."
+"This is the first time you have logged into %s so we must connect your "
+"Twitter account to a local account. You can either create a new account, or "
+"connect with your existing account, if you have one."
 msgstr ""
 "Dies ist das erste Mal, dass du dich bei %s angemeldet hast, sodass wir dein "
 "Twitterkonto mit einem lokalen Konto verbinden müssen. Du kannst entweder "
 "ein neues Konto einrichten, oder mit einem bereits vorhandenen Konto "
 "verbinden, wenn du eines hast."
 
+#. TRANS: Page title.
 msgid "Twitter Account Setup"
 msgstr "Einrichten des Twitterkontos"
 
+#. TRANS: Fieldset legend.
 msgid "Connection options"
 msgstr "Verbindungsoptionen"
 
+#. TRANS: Fieldset legend.
+msgid "Create new account"
+msgstr "Neues Konto erstellen"
+
+#. TRANS: Sub form introduction text.
+msgid "Create a new user with this nickname."
+msgstr "Erstelle einen neuen Benutzer mit diesem Namen."
+
+#. TRANS: Field label.
+msgid "New nickname"
+msgstr "Neuer Benutzername"
+
+#. TRANS: Field title for nickname field.
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
+msgstr ""
+"1–64 Kleinbuchstaben oder Ziffern, keine Interpunktion oder Leerzeichen."
+
+#. TRANS: Field label.
+msgctxt "LABEL"
+msgid "Email"
+msgstr "E-Mail"
+
+#. TRANS: Field title for e-mail address field.
+msgid "Used only for updates, announcements, and password recovery"
+msgstr ""
+"Nur für Updates, Bekanntmachungen und Passwortwiederherstellung verwendet"
+
+#. TRANS: Button text for creating a new StatusNet account in the Twitter connect page.
+msgctxt "BUTTON"
+msgid "Create"
+msgstr "Erstellen"
+
+#. TRANS: Fieldset legend.
+msgid "Connect existing account"
+msgstr "Bereits vorhandenes Konto verbinden"
+
+#. TRANS: Sub form introduction text.
+msgid ""
+"If you already have an account, login with your username and password to "
+"connect it to your Twitter account."
+msgstr ""
+"Wenn du bereits ein Konto hast, melde dich mit deinem Benutzernamen und "
+"Passwort an um es mit deinem Twitterkonto zu verbinden."
+
+#. TRANS: Field label.
+msgid "Existing nickname"
+msgstr "Bereits vorhandener Benutzername"
+
+#. TRANS: Field label.
+msgid "Password"
+msgstr "Passwort"
+
+#. TRANS: Fieldset legend.
+msgid "License"
+msgstr "Lizenz"
+
+#. TRANS: Text for license agreement checkbox.
+#. TRANS: %s is the license as configured for the StatusNet site.
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
@@ -150,120 +239,109 @@ msgstr ""
 "Meine Daten, außer Passwort, E-Mail-Adresse, IM-Adresse und Telefonnummer, "
 "sind unter %s verfügbar."
 
-msgid "Create new account"
-msgstr "Neues Konto erstellen"
-
-msgid "Create a new user with this nickname."
-msgstr "Erstelle einen neuen Benutzer mit diesem Namen."
-
-msgid "New nickname"
-msgstr "Neuer Benutzername"
-
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
-msgstr ""
-"1–64 Kleinbuchstaben oder Ziffern, keine Interpunktion oder Leerzeichen."
-
-msgctxt "LABEL"
-msgid "Email"
-msgstr "E-Mail"
-
-msgid "Used only for updates, announcements, and password recovery"
-msgstr ""
-"Nur für Updates, Bekanntmachungen und Passwortwiederherstellung verwendet"
-
-msgid "Create"
-msgstr "Erstellen"
-
-msgid "Connect existing account"
-msgstr "Bereits vorhandenes Konto verbinden"
-
-msgid ""
-"If you already have an account, login with your username and password to "
-"connect it to your Twitter account."
-msgstr ""
-"Wenn du bereits ein Konto hast, melde dich mit deinem Benutzernamen und "
-"Passwort an um es mit deinem Twitterkonto zu verbinden."
-
-msgid "Existing nickname"
-msgstr "Bereits vorhandener Benutzername"
-
-msgid "Password"
-msgstr "Passwort"
-
+#. TRANS: Button text for connecting an existing StatusNet account in the Twitter connect page..
+msgctxt "BUTTON"
 msgid "Connect"
 msgstr "Verbinden"
 
+#. TRANS: Client error displayed when trying to create a new user while creating new users is not allowed.
 msgid "Registration not allowed."
 msgstr "Registrierung nicht erlaubt."
 
+#. TRANS: Client error displayed when trying to create a new user with an invalid invitation code.
 msgid "Not a valid invitation code."
 msgstr "Kein gültiger Einladungscode."
 
+#. TRANS: Client error displayed when trying to create a new user with an invalid username.
 msgid "Nickname not allowed."
 msgstr "Benutzername nicht erlaubt."
 
+#. TRANS: Client error displayed when trying to create a new user with a username that is already in use.
 msgid "Nickname already in use. Try another one."
 msgstr "Benutzername bereits in Verwendung. Versuche einen anderen."
 
+#. TRANS: Server error displayed when creating a new user has failed.
 msgid "Error registering user."
 msgstr "Fehler bei der Benutzerregistrierung."
 
+#. TRANS: Server error displayed when connecting a user to a Twitter user has failed.
+#. TRANS: Server error displayed connecting a user to a Twitter user has failed.
 msgid "Error connecting user to Twitter."
 msgstr "Fehler bei der Verbindung des Benutzers zu Twitter."
 
+#. TRANS: Form validation error displayed when connecting an existing user to a Twitter user fails because
+#. TRANS: the provided username and/or password are incorrect.
 msgid "Invalid username or password."
 msgstr "Ungültiger Benutzername oder ungültiges Passwort."
 
+#. TRANS: Page title for Twitter administration panel.
+msgctxt "TITLE"
 msgid "Twitter"
 msgstr "Twitter"
 
+#. TRANS: Instructions for Twitter bridge administration page.
 msgid "Twitter bridge settings"
 msgstr "Einstellungen für Twitterüberbrückung"
 
-msgid "Invalid consumer key. Max length is 255 characters."
-msgstr "Ungültiger Verbraucherschlüssel. Maximallänge beträgt 255 Zeichen."
+#. TRANS: Client error displayed when a consumer key is invalid because it is too long.
+msgid "Invalid consumer key. Maximum length is 255 characters."
+msgstr "Ungültiger Verbraucherschlüssel. Maximale Länge beträgt 255 Zeichen."
 
-msgid "Invalid consumer secret. Max length is 255 characters."
-msgstr "Ungültiges Verbrauchergeheimnis. Maximallänge beträgt 255 Zeichen."
+#. TRANS: Client error displayed when a consumer secret is invalid because it is too long.
+msgid "Invalid consumer secret. Maximum length is 255 characters."
+msgstr "Ungültiges Verbrauchergeheimnis. Maximale Länge beträgt 255 Zeichen."
 
+#. TRANS: Fieldset legend for Twitter application settings.
 msgid "Twitter application settings"
 msgstr "Einstellungen für Twitteranwendung"
 
+#. TRANS: Field label for Twitter assigned consumer key.
 msgid "Consumer key"
 msgstr "Verbraucherschlüssel"
 
-msgid "Consumer key assigned by Twitter"
-msgstr "Von Twitter vergebener Verbraucherschlüssel"
+#. TRANS: Field title for Twitter assigned consumer key.
+msgid "The consumer key assigned by Twitter."
+msgstr "Von Twitter vergebener Verbraucherschlüssel."
 
+#. TRANS: Field label for Twitter assigned consumer secret.
 msgid "Consumer secret"
 msgstr "Verbrauchergeheimnis"
 
-msgid "Consumer secret assigned by Twitter"
-msgstr "Von Twitter vergebenes Verbrauchergeheimnis"
+#. TRANS: Field title for Twitter assigned consumer secret.
+msgid "The consumer secret assigned by Twitter."
+msgstr "Von Twitter vergebenes Verbrauchergeheimnis."
 
-msgid "Note: a global consumer key and secret are set."
+#. TRANS: Form guide displayed when two required fields have already been provided.
+msgid "Note: A global consumer key and secret are set."
 msgstr ""
-"Hinweis: Globaler Verbraucherschlüssel und globals Verbrauchergeheimnis "
+"Hinweis: Globaler Verbraucherschlüssel und globales Verbrauchergeheimnis "
 "gesetzt."
 
+#. TRANS: Field label for Twitter application name.
 msgid "Integration source"
 msgstr "Integrationsquelle"
 
-msgid "Name of your Twitter application"
-msgstr "Name deiner Twitteranwendung"
+#. TRANS: Field title for Twitter application name.
+msgid "The name of your Twitter application."
+msgstr "Name deiner Twitteranwendung."
 
+#. TRANS: Fieldset legend for Twitter integration options.
 msgid "Options"
 msgstr "Optionen"
 
+#. TRANS: Checkbox label for global setting.
 msgid "Enable \"Sign-in with Twitter\""
 msgstr "Ermögliche „Anmelden mit Twitter“"
 
-msgid "Allow users to login with their Twitter credentials"
-msgstr "Ermögliche Benutzern, sich mit ihren Twitteranmeldedaten anzumelden"
+#. TRANS: Checkbox title.
+msgid "This allow users to login with their Twitter credentials."
+msgstr "Ermöglicht Benutzern, sich mit ihren Twitteranmeldedaten anzumelden."
 
+#. TRANS: Checkbox label for global setting.
 msgid "Enable Twitter import"
 msgstr "Ermögliche Twitterimport"
 
+#. TRANS: Checkbox title for global setting.
 msgid ""
 "Allow users to import their Twitter friends' timelines. Requires daemons to "
 "be manually configured."
@@ -271,18 +349,65 @@ msgstr ""
 "Ermögliche Benutzern, ihre Twitterfreunde-Zeitleisten zu importieren. "
 "Erfordert, dass Dämons manuell konfiguriert werden."
 
-msgid "Save Twitter settings"
-msgstr "Speichere Twittereinstellungen"
+#. TRANS: Button title for saving the administrative Twitter bridge settings.
+msgid "Save the Twitter bridge settings."
+msgstr "Einstellungen für Twitterüberbrückung speichern."
 
-msgid "Login or register using Twitter"
-msgstr "Anmeldung oder Registrierung, um Twitter zu benutzen"
+#. TRANS: Server exception thrown when an invalid URL scheme is detected.
+msgid "Invalid URL scheme for HTTP stream reader."
+msgstr "Ungültiges URL-Schema für den HTTP-Stream-Reader."
 
+#. TRANS: Exception thrown when input from an inexpected socket is encountered.
+msgid "Got input from unexpected socket!"
+msgstr "Eingabe erfolgte durch unerwarteten Socket"
+
+#. TRANS: Exception thrown when an invalid state is encountered in handleLine.
+#. TRANS: %s is the invalid state.
+#, php-format
+msgid "Invalid state in handleLine: %s."
+msgstr "Ungültiger Status der HandleZeile: %s."
+
+#. TRANS: Exception thrown when an invalid response line is encountered.
+#. TRANS: %s is the invalid line.
+#, php-format
+msgid "Invalid HTTP response line: %s."
+msgstr "Ungültige HTTP-Antwortzeile: %s."
+
+#. TRANS: Exception thrown when an invalid response line part is encountered.
+#. TRANS: %1$s is the chunk, %2$s is the line.
+#, php-format
+msgid "Invalid HTTP response line chunk \"%1$s\": %2$s."
+msgstr "Ungültiges HTTP-Antwortzeilenstück „%1$s“: %2$s."
+
+#. TRANS: Exception thrown when an invalid response code is encountered.
+#. TRANS: %1$s is the response code, %2$s is the line.
+#, php-format
+msgid "Bad HTTP response code %1$s: %2$s."
+msgstr "Falscher HTTP-Antwortcode %1$s: %2$s."
+
+#. TRANS: Menu item in login navigation.
+#. TRANS: Menu item in connection settings navigation.
+msgctxt "MENU"
+msgid "Twitter"
+msgstr "Twitter"
+
+#. TRANS: Title for menu item in login navigation.
+msgid "Login or register using Twitter."
+msgstr "Mit Twitter anmelden oder registrieren."
+
+#. TRANS: Title for menu item in connection settings navigation.
 msgid "Twitter integration options"
 msgstr "Twitterintegrationsoptionen"
 
-msgid "Twitter bridge configuration"
-msgstr "Konfiguration der Twitterüberbrückung"
+#. TRANS: Menu item in administrative panel that leads to the Twitter bridge configuration.
+msgid "Twitter"
+msgstr "Twitter"
 
+#. TRANS: Menu item title in administrative panel that leads to the Twitter bridge configuration.
+msgid "Twitter bridge configuration page."
+msgstr "Konfigurationsseite der Twitterüberbrückung."
+
+#. TRANS: Plugin description.
 msgid ""
 "The Twitter \"bridge\" plugin allows integration of a StatusNet instance "
 "with <a href=\"http://twitter.com/\">Twitter</a>."
@@ -290,15 +415,20 @@ msgstr ""
 "Das Twitterüberbrückungsplugin ermöglicht die Integration einer StatusNet-"
 "Instanz mit <a href=\"http://twitter.com/\">Twitter</a>."
 
+#. TRANS: Client error displayed when trying to log in using Twitter while already logged in to StatusNet.
 msgid "Already logged in."
 msgstr "Schon angemeldet."
 
+#. TRANS: Title for login using Twitter page.
+msgctxt "TITLE"
 msgid "Twitter Login"
-msgstr "Twitter Login"
+msgstr "Twitter-Login"
 
+#. TRANS: Instructions for login using Twitter page.
 msgid "Login with your Twitter account"
 msgstr "Melden Sie sich mit Ihrem Twitter-Account an"
 
+#. TRANS: Alternative text for "sign in with Twitter" image.
 msgid "Sign in with Twitter"
 msgstr "Mit Twitter anmelden"
 
diff --git a/plugins/TwitterBridge/locale/es/LC_MESSAGES/TwitterBridge.po b/plugins/TwitterBridge/locale/es/LC_MESSAGES/TwitterBridge.po
new file mode 100644
index 0000000000..9a2510273a
--- /dev/null
+++ b/plugins/TwitterBridge/locale/es/LC_MESSAGES/TwitterBridge.po
@@ -0,0 +1,467 @@
+# Translation of StatusNet - TwitterBridge to Spanish (español)
+# Exported from translatewiki.net
+#
+# Author: Armando-Martin
+# Author: Peter17
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - TwitterBridge\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:20+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-12-03 13:51:38+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Title for page with Twitter integration settings.
+msgid "Twitter settings"
+msgstr "Configuración de Twitter"
+
+#. TRANS: Instructions for page with Twitter integration settings.
+msgid ""
+"Connect your Twitter account to share your updates with your Twitter friends "
+"and vice-versa."
+msgstr ""
+"Conecte su cuenta de Twitter para compartir sus actualizaciones con sus "
+"amigos de Twitter y viceversa."
+
+#. TRANS: Fieldset legend.
+msgid "Twitter account"
+msgstr "Cuenta de Twitter"
+
+#. TRANS: Form note when a Twitter account has been connected.
+msgid "Connected Twitter account"
+msgstr "Cuenta de Twitter conectada"
+
+#. TRANS: Fieldset legend.
+msgid "Disconnect my account from Twitter"
+msgstr "Desconectar mi cuenta de Twitter"
+
+#. TRANS: Form guide. %s is a URL to the password settings.
+#. TRANS: This message contains a Markdown link in the form [description](link).
+#, php-format
+msgid ""
+"Disconnecting your Twitter account could make it impossible to log in! "
+"Please [set a password](%s) first."
+msgstr ""
+"¡Si desconecta su cuenta de Twitter podría ser imposible iniciar sesión! Por "
+"favor [establezca una contraseña] (%s) primero."
+
+#. TRANS: Form instructions. %1$s is the StatusNet sitename.
+#, php-format
+msgid ""
+"Keep your %1$s account but disconnect from Twitter. You can use your %1$s "
+"password to log in."
+msgstr ""
+"Mantener su cuenta %1$s pero desconectarse de Facebook. Puede usar su "
+"contraseña %1$s para iniciar sesión."
+
+#. TRANS: Button text for disconnecting a Twitter account.
+msgctxt "BUTTON"
+msgid "Disconnect"
+msgstr "Desconectarse"
+
+#. TRANS: Fieldset legend.
+msgid "Preferences"
+msgstr "Preferencias"
+
+#. TRANS: Checkbox label.
+msgid "Automatically send my notices to Twitter."
+msgstr "Enviar automáticamente mis mensajes a Twitter."
+
+#. TRANS: Checkbox label.
+msgid "Send local \"@\" replies to Twitter."
+msgstr "Enviar respuestas \"@\" locales a Twitter."
+
+#. TRANS: Checkbox label.
+msgid "Subscribe to my Twitter friends here."
+msgstr "Suscribirse a Mis amigos de Twitter aquí."
+
+#. TRANS: Checkbox label.
+msgid "Import my friends timeline."
+msgstr "Importar la agenda de mis amigos."
+
+#. TRANS: Button text for saving Twitter integration settings.
+#. TRANS: Button text for saving the administrative Twitter bridge settings.
+msgctxt "BUTTON"
+msgid "Save"
+msgstr "Guardar"
+
+#. TRANS: Button text for adding Twitter integration.
+msgctxt "BUTTON"
+msgid "Add"
+msgstr "Añadir"
+
+#. TRANS: Client error displayed when the session token does not match or is not given.
+msgid "There was a problem with your session token. Try again, please."
+msgstr ""
+"Hubo un problema con su clave (token) de sesión. Inténtelo de nuevo, por "
+"favor."
+
+#. TRANS: Client error displayed when the submitted form contains unexpected data.
+msgid "Unexpected form submission."
+msgstr "Envío de formulario inesperado."
+
+#. TRANS: Client error displayed when trying to remove a connected Twitter account when there isn't one connected.
+msgid "No Twitter connection to remove."
+msgstr "No hay ninguna conexión de Twitter para eliminar."
+
+#. TRANS: Server error displayed when trying to remove a connected Twitter account fails.
+msgid "Could not remove Twitter user."
+msgstr "No se pudo eliminar el usuario de Twitter."
+
+#. TRANS: Success message displayed after disconnecting a Twitter account.
+msgid "Twitter account disconnected."
+msgstr "Cuenta de Twitter desconectada."
+
+#. TRANS: Server error displayed when saving Twitter integration preferences fails.
+msgid "Could not save Twitter preferences."
+msgstr "No se pudieron guardar las preferencias de Twitter."
+
+#. TRANS: Success message after saving Twitter integration preferences.
+msgid "Twitter preferences saved."
+msgstr "Preferencias de Twitter guardadas."
+
+#. TRANS: Form validation error displayed when the checkbox to agree to the license has not been checked.
+msgid "You cannot register if you do not agree to the license."
+msgstr "No puede registrarse si no acepta la licencia."
+
+#. TRANS: Form validation error displayed when an unhandled error occurs.
+msgid "Something weird happened."
+msgstr "Ocurrió algo extraño."
+
+#. TRANS: Server error displayed when linking to a Twitter account fails.
+msgid "Could not link your Twitter account."
+msgstr "No se pudo enlazar a su cuenta de Twitter."
+
+#. TRANS: Server error displayed when linking to a Twitter account fails because of an incorrect oauth_token.
+msgid "Could not link your Twitter account: oauth_token mismatch."
+msgstr ""
+"No se pudo enlazar a su cuenta de Twitter: La clave oauth_token no coincide."
+
+#. TRANS: Page instruction. %s is the StatusNet sitename.
+#, php-format
+msgid ""
+"This is the first time you have logged into %s so we must connect your "
+"Twitter account to a local account. You can either create a new account, or "
+"connect with your existing account, if you have one."
+msgstr ""
+"Esta es la primera vez que ha iniciado sesión en %s por lo que debemos "
+"conectar su cuenta Twitter a una cuenta local. Puede crear una nueva cuenta "
+"o conectarse con una cuenta existente si ya tiene una."
+
+#. TRANS: Page title.
+msgid "Twitter Account Setup"
+msgstr "Configuración de la cuenta de Twitter"
+
+#. TRANS: Fieldset legend.
+msgid "Connection options"
+msgstr "Opciones de conexión"
+
+#. TRANS: Fieldset legend.
+msgid "Create new account"
+msgstr "Crear nueva cuenta"
+
+#. TRANS: Sub form introduction text.
+msgid "Create a new user with this nickname."
+msgstr "Crear un nuevo usuario con este alias."
+
+#. TRANS: Field label.
+msgid "New nickname"
+msgstr "Nuevo alias"
+
+#. TRANS: Field title for nickname field.
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
+msgstr ""
+"De 1 a 64 letras en minúscula o números, sin signos de puntuación ni "
+"espacios."
+
+#. TRANS: Field label.
+msgctxt "LABEL"
+msgid "Email"
+msgstr "Correo electrónico"
+
+#. TRANS: Field title for e-mail address field.
+msgid "Used only for updates, announcements, and password recovery"
+msgstr ""
+"Sólo se usa para actualizaciones, anuncios y recuperación de contraseñas"
+
+#. TRANS: Button text for creating a new StatusNet account in the Twitter connect page.
+msgctxt "BUTTON"
+msgid "Create"
+msgstr "Crear"
+
+#. TRANS: Fieldset legend.
+msgid "Connect existing account"
+msgstr "Conectar a una cuenta existente"
+
+#. TRANS: Sub form introduction text.
+msgid ""
+"If you already have an account, login with your username and password to "
+"connect it to your Twitter account."
+msgstr ""
+"Si ya tiene una cuenta, inicie sesión con su nombre de usuario y contraseña "
+"para conectarse a su cuenta de Facebook."
+
+#. TRANS: Field label.
+msgid "Existing nickname"
+msgstr "Alias existente"
+
+#. TRANS: Field label.
+msgid "Password"
+msgstr "Contraseña"
+
+#. TRANS: Fieldset legend.
+msgid "License"
+msgstr "Licencia"
+
+#. TRANS: Text for license agreement checkbox.
+#. TRANS: %s is the license as configured for the StatusNet site.
+#, php-format
+msgid ""
+"My text and files are available under %s except this private data: password, "
+"email address, IM address, and phone number."
+msgstr ""
+"Mi texto y archivos están disponibles bajo %s con excepción de esta "
+"información privada: contraseña, dirección de correo electrónico, dirección "
+"de mensajería instantánea IM y número de teléfono."
+
+#. TRANS: Button text for connecting an existing StatusNet account in the Twitter connect page..
+msgctxt "BUTTON"
+msgid "Connect"
+msgstr "Conectar"
+
+#. TRANS: Client error displayed when trying to create a new user while creating new users is not allowed.
+msgid "Registration not allowed."
+msgstr "Registro de usuario no permitido."
+
+#. TRANS: Client error displayed when trying to create a new user with an invalid invitation code.
+msgid "Not a valid invitation code."
+msgstr "No es un código de invitación válido."
+
+#. TRANS: Client error displayed when trying to create a new user with an invalid username.
+msgid "Nickname not allowed."
+msgstr "Alias no permitido."
+
+#. TRANS: Client error displayed when trying to create a new user with a username that is already in use.
+msgid "Nickname already in use. Try another one."
+msgstr "El alias ya existe. Pruebe con otro."
+
+#. TRANS: Server error displayed when creating a new user has failed.
+msgid "Error registering user."
+msgstr "Error al registrar el usuario."
+
+#. TRANS: Server error displayed when connecting a user to a Twitter user has failed.
+#. TRANS: Server error displayed connecting a user to a Twitter user has failed.
+msgid "Error connecting user to Twitter."
+msgstr "Error al conectar el usuario a Twitter."
+
+#. TRANS: Form validation error displayed when connecting an existing user to a Twitter user fails because
+#. TRANS: the provided username and/or password are incorrect.
+msgid "Invalid username or password."
+msgstr "Nombre de usuario o contraseña incorrectos."
+
+#. TRANS: Page title for Twitter administration panel.
+msgctxt "TITLE"
+msgid "Twitter"
+msgstr "Twitter"
+
+#. TRANS: Instructions for Twitter bridge administration page.
+msgid "Twitter bridge settings"
+msgstr "Configuración de la pasarela a Twitter"
+
+#. TRANS: Client error displayed when a consumer key is invalid because it is too long.
+msgid "Invalid consumer key. Maximum length is 255 characters."
+msgstr ""
+"Clave de consumidor no válida. La longitud máxima es de 255 caracteres."
+
+#. TRANS: Client error displayed when a consumer secret is invalid because it is too long.
+msgid "Invalid consumer secret. Maximum length is 255 characters."
+msgstr ""
+"La frase secreta de consumidor es incorrecta. La longitud máxima es de 255 "
+"caracteres."
+
+#. TRANS: Fieldset legend for Twitter application settings.
+msgid "Twitter application settings"
+msgstr "Configuración de la aplicación de Twitter"
+
+#. TRANS: Field label for Twitter assigned consumer key.
+msgid "Consumer key"
+msgstr "Clave de consumidor"
+
+#. TRANS: Field title for Twitter assigned consumer key.
+msgid "The consumer key assigned by Twitter."
+msgstr "La clave de consumidor asignada por Twitter."
+
+#. TRANS: Field label for Twitter assigned consumer secret.
+msgid "Consumer secret"
+msgstr "Frase secreta del consumidor"
+
+#. TRANS: Field title for Twitter assigned consumer secret.
+msgid "The consumer secret assigned by Twitter."
+msgstr "La frase secreta de consumidor asignada por Twitter."
+
+#. TRANS: Form guide displayed when two required fields have already been provided.
+msgid "Note: A global consumer key and secret are set."
+msgstr "Nota: Se establecen una clave y frase secreta de consumidor global."
+
+#. TRANS: Field label for Twitter application name.
+msgid "Integration source"
+msgstr "Fuente de integración"
+
+#. TRANS: Field title for Twitter application name.
+msgid "The name of your Twitter application."
+msgstr "El nombre de su aplicación de Twitter."
+
+#. TRANS: Fieldset legend for Twitter integration options.
+msgid "Options"
+msgstr "Opciones"
+
+#. TRANS: Checkbox label for global setting.
+msgid "Enable \"Sign-in with Twitter\""
+msgstr "Habilitar \"Registrarse con Twitter\""
+
+#. TRANS: Checkbox title.
+msgid "This allow users to login with their Twitter credentials."
+msgstr ""
+"Esto permitir a los usuarios iniciar sesión con sus credenciales de Twitter."
+
+#. TRANS: Checkbox label for global setting.
+msgid "Enable Twitter import"
+msgstr "Activar la importación de Twitter"
+
+#. TRANS: Checkbox title for global setting.
+msgid ""
+"Allow users to import their Twitter friends' timelines. Requires daemons to "
+"be manually configured."
+msgstr ""
+"Permitir a los usuarios importar agendas de sus amigos de Twitter. Requiere "
+"configurar manualmente los servicios."
+
+#. TRANS: Button title for saving the administrative Twitter bridge settings.
+msgid "Save the Twitter bridge settings."
+msgstr "Guardar la configuración de la pasarela de Twitter."
+
+#. TRANS: Server exception thrown when an invalid URL scheme is detected.
+msgid "Invalid URL scheme for HTTP stream reader."
+msgstr "Esquema de URL no válido para lector de secuencia HTTP."
+
+#. TRANS: Exception thrown when input from an inexpected socket is encountered.
+msgid "Got input from unexpected socket!"
+msgstr "¡Recibió una entrada desde un conector (socket) inesperado!"
+
+#. TRANS: Exception thrown when an invalid state is encountered in handleLine.
+#. TRANS: %s is the invalid state.
+#, php-format
+msgid "Invalid state in handleLine: %s."
+msgstr "Estado no válido en handleLine: %s."
+
+#. TRANS: Exception thrown when an invalid response line is encountered.
+#. TRANS: %s is the invalid line.
+#, php-format
+msgid "Invalid HTTP response line: %s."
+msgstr "Línea de respuesta HTTP no válida: %s."
+
+#. TRANS: Exception thrown when an invalid response line part is encountered.
+#. TRANS: %1$s is the chunk, %2$s is the line.
+#, php-format
+msgid "Invalid HTTP response line chunk \"%1$s\": %2$s."
+msgstr "Fragmento de línea de respuesta HTTP no válido \"%1$s\": %2$s ."
+
+#. TRANS: Exception thrown when an invalid response code is encountered.
+#. TRANS: %1$s is the response code, %2$s is the line.
+#, php-format
+msgid "Bad HTTP response code %1$s: %2$s."
+msgstr "Código de respuesta HTTP erróneo %1$s: %2$s."
+
+#. TRANS: Menu item in login navigation.
+#. TRANS: Menu item in connection settings navigation.
+msgctxt "MENU"
+msgid "Twitter"
+msgstr "Twitter"
+
+#. TRANS: Title for menu item in login navigation.
+msgid "Login or register using Twitter."
+msgstr "Inicie sesión o regístrese mediante Twitter."
+
+#. TRANS: Title for menu item in connection settings navigation.
+msgid "Twitter integration options"
+msgstr "Opciones de integración de Twitter"
+
+#. TRANS: Menu item in administrative panel that leads to the Twitter bridge configuration.
+msgid "Twitter"
+msgstr "Twitter"
+
+#. TRANS: Menu item title in administrative panel that leads to the Twitter bridge configuration.
+msgid "Twitter bridge configuration page."
+msgstr "Página de configuración de la pasarela de Twitter."
+
+#. TRANS: Plugin description.
+msgid ""
+"The Twitter \"bridge\" plugin allows integration of a StatusNet instance "
+"with <a href=\"http://twitter.com/\">Twitter</a>."
+msgstr ""
+"El complemento (plugin) de \"pasarela\" de Twitter permite la integración de "
+"una instancia de StatusNet con <a href=\"http://twitter.com/\">Twitter</a>."
+
+#. TRANS: Client error displayed when trying to log in using Twitter while already logged in to StatusNet.
+msgid "Already logged in."
+msgstr "Ya has iniciado sesión"
+
+#. TRANS: Title for login using Twitter page.
+msgctxt "TITLE"
+msgid "Twitter Login"
+msgstr "Inicio de sesión de Twitter"
+
+#. TRANS: Instructions for login using Twitter page.
+msgid "Login with your Twitter account"
+msgstr "Inicie sesión con su cuenta de Twitter"
+
+#. TRANS: Alternative text for "sign in with Twitter" image.
+msgid "Sign in with Twitter"
+msgstr "Registrarse con Twitter"
+
+#. TRANS: Mail subject after forwarding notices to Twitter has stopped working.
+msgid "Your Twitter bridge has been disabled"
+msgstr "Se ha deshabilitado su pasarela de Twitter"
+
+#. TRANS: Mail body after forwarding notices to Twitter has stopped working.
+#. TRANS: %1$ is the name of the user the mail is sent to, %2$s is a URL to the
+#. TRANS: Twitter settings, %3$s is the StatusNet sitename.
+#, php-format
+msgid ""
+"Hi, %1$s. We're sorry to inform you that your link to Twitter has been "
+"disabled. We no longer seem to have permission to update your Twitter "
+"status. Did you maybe revoke %3$s's access?\n"
+"\n"
+"You can re-enable your Twitter bridge by visiting your Twitter settings "
+"page:\n"
+"\n"
+"\t%2$s\n"
+"\n"
+"Regards,\n"
+"%3$s"
+msgstr ""
+"Hola, %1$s. Lamentamos informarle de que su enlace a Twitter se ha "
+"deshabilitado. Parece que ya no tenemos permiso para actualizar tu estado de "
+"Twitter. ¿Tal vez ha revocado el acceso de %3$s?\n"
+"\n"
+"Puede volver a habilitar la pasarela de Twitter visitando la página de "
+"configuración de Twitter:\n"
+"\n"
+"%2$s\n"
+"\n"
+"Saludos,\n"
+"%3$s"
+
+#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
+#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
+#, php-format
+msgid "RT @%1$s %2$s"
+msgstr "RT @%1$s %2$s"
diff --git a/plugins/TwitterBridge/locale/eu/LC_MESSAGES/TwitterBridge.po b/plugins/TwitterBridge/locale/eu/LC_MESSAGES/TwitterBridge.po
new file mode 100644
index 0000000000..a8df3c9082
--- /dev/null
+++ b/plugins/TwitterBridge/locale/eu/LC_MESSAGES/TwitterBridge.po
@@ -0,0 +1,440 @@
+# Translation of StatusNet - TwitterBridge to Basque (euskara)
+# Exported from translatewiki.net
+#
+# Author: Artsuaga
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - TwitterBridge\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:21+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-12-03 13:51:38+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Title for page with Twitter integration settings.
+msgid "Twitter settings"
+msgstr "Twitter aukerak"
+
+#. TRANS: Instructions for page with Twitter integration settings.
+msgid ""
+"Connect your Twitter account to share your updates with your Twitter friends "
+"and vice-versa."
+msgstr ""
+
+#. TRANS: Fieldset legend.
+msgid "Twitter account"
+msgstr "Twitter kontua"
+
+#. TRANS: Form note when a Twitter account has been connected.
+msgid "Connected Twitter account"
+msgstr "Kontektaturiko Twitter kontua"
+
+#. TRANS: Fieldset legend.
+msgid "Disconnect my account from Twitter"
+msgstr "Deskonektatu nere kontua Twitterretik"
+
+#. TRANS: Form guide. %s is a URL to the password settings.
+#. TRANS: This message contains a Markdown link in the form [description](link).
+#, php-format
+msgid ""
+"Disconnecting your Twitter account could make it impossible to log in! "
+"Please [set a password](%s) first."
+msgstr ""
+
+#. TRANS: Form instructions. %1$s is the StatusNet sitename.
+#, php-format
+msgid ""
+"Keep your %1$s account but disconnect from Twitter. You can use your %1$s "
+"password to log in."
+msgstr ""
+"Mantendu zure %1$s kontua baina Twitterretik deskonektatu. Zure %1$s "
+"pasahitza erabiliko duzu saioa hasteko."
+
+#. TRANS: Button text for disconnecting a Twitter account.
+msgctxt "BUTTON"
+msgid "Disconnect"
+msgstr "Eten."
+
+#. TRANS: Fieldset legend.
+msgid "Preferences"
+msgstr "Hobespenak"
+
+#. TRANS: Checkbox label.
+msgid "Automatically send my notices to Twitter."
+msgstr "Automatikoki bidali nere oharrak Twitterrera."
+
+#. TRANS: Checkbox label.
+msgid "Send local \"@\" replies to Twitter."
+msgstr "Bidali \"@\" lokalen erantzuntak Twitterrera."
+
+#. TRANS: Checkbox label.
+msgid "Subscribe to my Twitter friends here."
+msgstr "Harpidetu nere Twitter kontaktuetara hemen."
+
+#. TRANS: Checkbox label.
+msgid "Import my friends timeline."
+msgstr "Importatu nere lagunen denbora lerroa."
+
+#. TRANS: Button text for saving Twitter integration settings.
+#. TRANS: Button text for saving the administrative Twitter bridge settings.
+msgctxt "BUTTON"
+msgid "Save"
+msgstr "Gorde"
+
+#. TRANS: Button text for adding Twitter integration.
+msgctxt "BUTTON"
+msgid "Add"
+msgstr "Gehitu"
+
+#. TRANS: Client error displayed when the session token does not match or is not given.
+msgid "There was a problem with your session token. Try again, please."
+msgstr "Zure saio tokenarekin arazo bat egon da. Saiatu berriro, mesedez."
+
+#. TRANS: Client error displayed when the submitted form contains unexpected data.
+msgid "Unexpected form submission."
+msgstr "Ustekabeko inprimaki bidalketa."
+
+#. TRANS: Client error displayed when trying to remove a connected Twitter account when there isn't one connected.
+msgid "No Twitter connection to remove."
+msgstr "Ez dago Twitter koneksiorik ezabatzeko."
+
+#. TRANS: Server error displayed when trying to remove a connected Twitter account fails.
+msgid "Could not remove Twitter user."
+msgstr "Ezin izan da Twitter erabiltzailea ezabatu."
+
+#. TRANS: Success message displayed after disconnecting a Twitter account.
+msgid "Twitter account disconnected."
+msgstr "Twitter kontua deskonektaturik."
+
+#. TRANS: Server error displayed when saving Twitter integration preferences fails.
+msgid "Could not save Twitter preferences."
+msgstr "Ezin izan dira Twitter hobespenak gorde."
+
+#. TRANS: Success message after saving Twitter integration preferences.
+msgid "Twitter preferences saved."
+msgstr "Twitter hobespenak gorderik."
+
+#. TRANS: Form validation error displayed when the checkbox to agree to the license has not been checked.
+msgid "You cannot register if you do not agree to the license."
+msgstr "Ezin duzu izenik eman ez bazaude lizentziarekin ados."
+
+#. TRANS: Form validation error displayed when an unhandled error occurs.
+msgid "Something weird happened."
+msgstr "Zerbait arraroa gertatu da."
+
+#. TRANS: Server error displayed when linking to a Twitter account fails.
+msgid "Could not link your Twitter account."
+msgstr "Ezin izan da zure Twitter kontua estekatu."
+
+#. TRANS: Server error displayed when linking to a Twitter account fails because of an incorrect oauth_token.
+msgid "Could not link your Twitter account: oauth_token mismatch."
+msgstr "Ezin izan da zure Twitter kontua estekatu: oauth_token doitugabea."
+
+#. TRANS: Page instruction. %s is the StatusNet sitename.
+#, php-format
+msgid ""
+"This is the first time you have logged into %s so we must connect your "
+"Twitter account to a local account. You can either create a new account, or "
+"connect with your existing account, if you have one."
+msgstr ""
+"%s gunean sartzen zaren lehen aldia da, zure Twitter kontua kontu lokal "
+"batekin lotuko dugu. Bestela kontu berri bat sor dezakezu, edo lehendik "
+"beste kontu bat bazenuen, kontu harekin lotu."
+
+#. TRANS: Page title.
+msgid "Twitter Account Setup"
+msgstr "Twitter Kontu Kudeaketa"
+
+#. TRANS: Fieldset legend.
+msgid "Connection options"
+msgstr "Koneksio aukerak"
+
+#. TRANS: Fieldset legend.
+msgid "Create new account"
+msgstr "Sortu kontu berria"
+
+#. TRANS: Sub form introduction text.
+msgid "Create a new user with this nickname."
+msgstr "Sortu erabiltzaile berria goitizen honentzat."
+
+#. TRANS: Field label.
+msgid "New nickname"
+msgstr "Goitizen berria"
+
+#. TRANS: Field title for nickname field.
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
+msgstr "1-64 letra xehe edo zenbaki, puntuazio edo espaziorik gabe."
+
+#. TRANS: Field label.
+msgctxt "LABEL"
+msgid "Email"
+msgstr "Eposta"
+
+#. TRANS: Field title for e-mail address field.
+msgid "Used only for updates, announcements, and password recovery"
+msgstr ""
+"Eguneraketetarako, iragarkietarako eta pasahitza berreskuratzeko soilik "
+"erabiltzen da."
+
+#. TRANS: Button text for creating a new StatusNet account in the Twitter connect page.
+msgctxt "BUTTON"
+msgid "Create"
+msgstr "Sortu"
+
+#. TRANS: Fieldset legend.
+msgid "Connect existing account"
+msgstr "Konektatu sortutako kontua"
+
+#. TRANS: Sub form introduction text.
+msgid ""
+"If you already have an account, login with your username and password to "
+"connect it to your Twitter account."
+msgstr ""
+"Dagoeneko kontu bat baduzu, hasi saioa zure erabiltzaile eta pasahitzarekin "
+"zure Twitterrera konektatzeko."
+
+#. TRANS: Field label.
+msgid "Existing nickname"
+msgstr "Goitizena existitzen da"
+
+#. TRANS: Field label.
+msgid "Password"
+msgstr "Pasahitza"
+
+#. TRANS: Fieldset legend.
+msgid "License"
+msgstr "Lizentzia"
+
+#. TRANS: Text for license agreement checkbox.
+#. TRANS: %s is the license as configured for the StatusNet site.
+#, php-format
+msgid ""
+"My text and files are available under %s except this private data: password, "
+"email address, IM address, and phone number."
+msgstr ""
+"Nire testu eta fitxategiak %s lizentziapean daude, datu pribatu hauek izan "
+"ezik: pasahitza, helbide elektronikoa, BM helbidea eta telefono zenbakia."
+
+#. TRANS: Button text for connecting an existing StatusNet account in the Twitter connect page..
+msgctxt "BUTTON"
+msgid "Connect"
+msgstr "Konektatu"
+
+#. TRANS: Client error displayed when trying to create a new user while creating new users is not allowed.
+msgid "Registration not allowed."
+msgstr "Erregistroa ez dago baimenduta."
+
+#. TRANS: Client error displayed when trying to create a new user with an invalid invitation code.
+msgid "Not a valid invitation code."
+msgstr "Gonbidapen kodea ez da baliozkoa."
+
+#. TRANS: Client error displayed when trying to create a new user with an invalid username.
+msgid "Nickname not allowed."
+msgstr "Goitizen hori ez da onartzen."
+
+#. TRANS: Client error displayed when trying to create a new user with a username that is already in use.
+msgid "Nickname already in use. Try another one."
+msgstr "Goitizen hori hartua dago. Saiatu beste batekin."
+
+#. TRANS: Server error displayed when creating a new user has failed.
+msgid "Error registering user."
+msgstr "Akatsa erabiltzailea erregistratzerakoan."
+
+#. TRANS: Server error displayed when connecting a user to a Twitter user has failed.
+#. TRANS: Server error displayed connecting a user to a Twitter user has failed.
+msgid "Error connecting user to Twitter."
+msgstr "Akatsa erabiltzailea Twitterrera konektatzean."
+
+#. TRANS: Form validation error displayed when connecting an existing user to a Twitter user fails because
+#. TRANS: the provided username and/or password are incorrect.
+msgid "Invalid username or password."
+msgstr "Baliogabeko erabiltzaile edo pasahitza."
+
+#. TRANS: Page title for Twitter administration panel.
+msgctxt "TITLE"
+msgid "Twitter"
+msgstr "Twitter"
+
+#. TRANS: Instructions for Twitter bridge administration page.
+msgid "Twitter bridge settings"
+msgstr "Twitter bridge aukerak"
+
+#. TRANS: Client error displayed when a consumer key is invalid because it is too long.
+msgid "Invalid consumer key. Maximum length is 255 characters."
+msgstr "Kontsumitzaile gako okerra. Luzera maximoa 255 karakterekoa da."
+
+#. TRANS: Client error displayed when a consumer secret is invalid because it is too long.
+msgid "Invalid consumer secret. Maximum length is 255 characters."
+msgstr "Kontsumitzaile sekretu okerra. Luzera maximoa 255 karakterekoa da."
+
+#. TRANS: Fieldset legend for Twitter application settings.
+msgid "Twitter application settings"
+msgstr "Twitter aplikazio aukerak"
+
+#. TRANS: Field label for Twitter assigned consumer key.
+msgid "Consumer key"
+msgstr "Kontsumitzaile gakoa"
+
+#. TRANS: Field title for Twitter assigned consumer key.
+msgid "The consumer key assigned by Twitter."
+msgstr "Twitterrek emandako kontsumitzaile gakoa."
+
+#. TRANS: Field label for Twitter assigned consumer secret.
+msgid "Consumer secret"
+msgstr "Kontsumitzaile sekretua"
+
+#. TRANS: Field title for Twitter assigned consumer secret.
+msgid "The consumer secret assigned by Twitter."
+msgstr "Twitterrek emandako kontsumitzaile sekretua."
+
+#. TRANS: Form guide displayed when two required fields have already been provided.
+msgid "Note: A global consumer key and secret are set."
+msgstr "Oharra: kontsumitzaile gako eta sekretu orokorra ezarriak."
+
+#. TRANS: Field label for Twitter application name.
+msgid "Integration source"
+msgstr "Integrazio iturburua."
+
+#. TRANS: Field title for Twitter application name.
+msgid "The name of your Twitter application."
+msgstr "Zure Twitter aplikazioaren izena."
+
+#. TRANS: Fieldset legend for Twitter integration options.
+msgid "Options"
+msgstr "Hobespenak"
+
+#. TRANS: Checkbox label for global setting.
+msgid "Enable \"Sign-in with Twitter\""
+msgstr "Gaitu \"Sartu Twitterrekin\""
+
+#. TRANS: Checkbox title.
+msgid "This allow users to login with their Twitter credentials."
+msgstr "Twitterreko kontuarekin saio hasteko aukera ematen du."
+
+#. TRANS: Checkbox label for global setting.
+msgid "Enable Twitter import"
+msgstr "Gaitu Twitter inportazioa"
+
+#. TRANS: Checkbox title for global setting.
+msgid ""
+"Allow users to import their Twitter friends' timelines. Requires daemons to "
+"be manually configured."
+msgstr ""
+"Twitterreko lagunen denbora-lerroak inportatzen uzten du. Daemonak "
+"beharrezkoak eskuz konfiguratzeko."
+
+#. TRANS: Button title for saving the administrative Twitter bridge settings.
+msgid "Save the Twitter bridge settings."
+msgstr "Gorde Twitter bridge aukerak."
+
+#. TRANS: Server exception thrown when an invalid URL scheme is detected.
+msgid "Invalid URL scheme for HTTP stream reader."
+msgstr "URL amarru baliogabea HTTP jario irakurgailuarentzat."
+
+#. TRANS: Exception thrown when input from an inexpected socket is encountered.
+msgid "Got input from unexpected socket!"
+msgstr ""
+
+#. TRANS: Exception thrown when an invalid state is encountered in handleLine.
+#. TRANS: %s is the invalid state.
+#, php-format
+msgid "Invalid state in handleLine: %s."
+msgstr ""
+
+#. TRANS: Exception thrown when an invalid response line is encountered.
+#. TRANS: %s is the invalid line.
+#, php-format
+msgid "Invalid HTTP response line: %s."
+msgstr "HTTP erantzun lerro baliogabea: %s."
+
+#. TRANS: Exception thrown when an invalid response line part is encountered.
+#. TRANS: %1$s is the chunk, %2$s is the line.
+#, php-format
+msgid "Invalid HTTP response line chunk \"%1$s\": %2$s."
+msgstr ""
+
+#. TRANS: Exception thrown when an invalid response code is encountered.
+#. TRANS: %1$s is the response code, %2$s is the line.
+#, php-format
+msgid "Bad HTTP response code %1$s: %2$s."
+msgstr "HTTP erantzun okerraren kodea %1$s: %2$s."
+
+#. TRANS: Menu item in login navigation.
+#. TRANS: Menu item in connection settings navigation.
+msgctxt "MENU"
+msgid "Twitter"
+msgstr "Twitter"
+
+#. TRANS: Title for menu item in login navigation.
+msgid "Login or register using Twitter."
+msgstr "Saioa hasi edo erregistratu Twitter erabiliz."
+
+#. TRANS: Title for menu item in connection settings navigation.
+msgid "Twitter integration options"
+msgstr "Twitter integrazio aukerak"
+
+#. TRANS: Menu item in administrative panel that leads to the Twitter bridge configuration.
+msgid "Twitter"
+msgstr "Twitter"
+
+#. TRANS: Menu item title in administrative panel that leads to the Twitter bridge configuration.
+msgid "Twitter bridge configuration page."
+msgstr "Twitter bridge konfigurazio orria."
+
+#. TRANS: Plugin description.
+msgid ""
+"The Twitter \"bridge\" plugin allows integration of a StatusNet instance "
+"with <a href=\"http://twitter.com/\">Twitter</a>."
+msgstr ""
+
+#. TRANS: Client error displayed when trying to log in using Twitter while already logged in to StatusNet.
+msgid "Already logged in."
+msgstr "Dagoeneko saioa hasita."
+
+#. TRANS: Title for login using Twitter page.
+msgctxt "TITLE"
+msgid "Twitter Login"
+msgstr "Twitter Saio Hasera"
+
+#. TRANS: Instructions for login using Twitter page.
+msgid "Login with your Twitter account"
+msgstr "Saioa hasi zure Twitter kontuarekin"
+
+#. TRANS: Alternative text for "sign in with Twitter" image.
+msgid "Sign in with Twitter"
+msgstr "Erregistratu Twitterrekin"
+
+#. TRANS: Mail subject after forwarding notices to Twitter has stopped working.
+msgid "Your Twitter bridge has been disabled"
+msgstr ""
+
+#. TRANS: Mail body after forwarding notices to Twitter has stopped working.
+#. TRANS: %1$ is the name of the user the mail is sent to, %2$s is a URL to the
+#. TRANS: Twitter settings, %3$s is the StatusNet sitename.
+#, php-format
+msgid ""
+"Hi, %1$s. We're sorry to inform you that your link to Twitter has been "
+"disabled. We no longer seem to have permission to update your Twitter "
+"status. Did you maybe revoke %3$s's access?\n"
+"\n"
+"You can re-enable your Twitter bridge by visiting your Twitter settings "
+"page:\n"
+"\n"
+"\t%2$s\n"
+"\n"
+"Regards,\n"
+"%3$s"
+msgstr ""
+
+#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
+#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
+#, php-format
+msgid "RT @%1$s %2$s"
+msgstr "RT @%1$s %2$s"
diff --git a/plugins/TwitterBridge/locale/fa/LC_MESSAGES/TwitterBridge.po b/plugins/TwitterBridge/locale/fa/LC_MESSAGES/TwitterBridge.po
index 8b4a0dc343..94bfbec889 100644
--- a/plugins/TwitterBridge/locale/fa/LC_MESSAGES/TwitterBridge.po
+++ b/plugins/TwitterBridge/locale/fa/LC_MESSAGES/TwitterBridge.po
@@ -9,18 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TwitterBridge\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:44+0000\n"
+"POT-Creation-Date: 2011-06-18 15:54+0000\n"
+"PO-Revision-Date: 2011-06-18 15:57:55+0000\n"
 "Language-Team: Persian <http://translatewiki.net/wiki/Portal:fa>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:29+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
+"X-POT-Import-Date: 2011-06-05 21:52:09+0000\n"
+"X-Generator: MediaWiki 1.19alpha (r90318); Translate extension (2011-06-02)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fa\n"
 "X-Message-Group: #out-statusnet-plugin-twitterbridge\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#. TRANS: Title for page with Twitter integration settings.
 msgid "Twitter settings"
 msgstr "تنظیمات توییتر"
 
@@ -29,250 +30,383 @@ msgid ""
 "and vice-versa."
 msgstr ""
 
+#. TRANS: Fieldset legend.
 msgid "Twitter account"
 msgstr "حساب کاربری توییتر"
 
+#. TRANS: Form note when a Twitter account has been connected.
 msgid "Connected Twitter account"
 msgstr "حساب کاربری توییتر متصل شد"
 
+#. TRANS: Fieldset legend.
 msgid "Disconnect my account from Twitter"
 msgstr "قطع ارتباط حساب کاربری من از توییتر"
 
-msgid "Disconnecting your Twitter could make it impossible to log in! Please "
+#. TRANS: Form guide. %s is a URL to the password settings.
+#. TRANS: This message contains a Markdown link in the form [description](link).
+#, php-format
+msgid ""
+"Disconnecting your Twitter account could make it impossible to log in! "
+"Please [set a password](%s) first."
 msgstr ""
 
-msgid "set a password"
-msgstr "تنظیم رمز عبور"
-
-msgid " first."
-msgstr " ابتدا."
-
-#. TRANS: %1$s is the current website name.
+#. TRANS: Form instructions. %s is a URL to the password settings.
+#. TRANS: %1$s is the StatusNet sitename.
 #, php-format
 msgid ""
 "Keep your %1$s account but disconnect from Twitter. You can use your %1$s "
 "password to log in."
 msgstr ""
 
+#. TRANS: Button text for disconnecting a Twitter account.
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Disconnect"
 msgstr "قطع اتصال"
 
+#. TRANS: Fieldset legend.
 msgid "Preferences"
 msgstr "ترجیحات"
 
+#. TRANS: Checkbox label.
 msgid "Automatically send my notices to Twitter."
 msgstr ""
 
+#. TRANS: Checkbox label.
 msgid "Send local \"@\" replies to Twitter."
 msgstr ""
 
+#. TRANS: Checkbox label.
 msgid "Subscribe to my Twitter friends here."
 msgstr ""
 
+#. TRANS: Checkbox label.
 msgid "Import my friends timeline."
 msgstr ""
 
+#. TRANS: Button text for saving Twitter integration settings.
+#. TRANS: Button text for saving the administrative Twitter bridge settings.
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Save"
 msgstr "ذخیره"
 
+#. TRANS: Button text for adding Twitter integration.
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Add"
 msgstr "ا�زودن"
 
+#. TRANS: Client error displayed when the session token does not match or is not given.
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 
+#. TRANS: Client error displayed when the submitted form contains unexpected data.
 msgid "Unexpected form submission."
 msgstr ""
 
+#. TRANS: Client error displayed when trying to remove a connected Twitter account when there isn't one connected.
 msgid "No Twitter connection to remove."
 msgstr "هیچ ارتباط توییتری برای حذ� وجود ندارد."
 
-msgid "Couldn't remove Twitter user."
+#. TRANS: Server error displayed when trying to remove a connected Twitter account fails.
+#, fuzzy
+msgid "Could not remove Twitter user."
 msgstr "نمی‌توان کاربر توییتر را حذ� کرد."
 
+#. TRANS: Success message displayed after disconnecting a Twitter account.
 msgid "Twitter account disconnected."
 msgstr "حساب توییتر قطع شده است."
 
-msgid "Couldn't save Twitter preferences."
+#. TRANS: Server error displayed when saving Twitter integration preferences fails.
+#, fuzzy
+msgid "Could not save Twitter preferences."
 msgstr "نمی‌توان ترجیحات توییتر را ذخیره کرد."
 
+#. TRANS: Success message after saving Twitter integration preferences.
 msgid "Twitter preferences saved."
 msgstr "تنظیمات توییتر ذخیره شد."
 
+#. TRANS: Form validation error displayed when the checkbox to agree to the license has not been checked.
 msgid "You cannot register if you do not agree to the license."
 msgstr ""
 
+#. TRANS: Form validation error displayed when an unhandled error occurs.
 msgid "Something weird happened."
 msgstr ""
 
+#. TRANS: Server error displayed when linking to a Twitter account fails.
 #, fuzzy
 msgid "Could not link your Twitter account."
 msgstr "حساب کاربری توییتر متصل شد"
 
-msgid "Couldn't link your Twitter account: oauth_token mismatch."
-msgstr ""
-
-msgid "Couldn't link your Twitter account."
-msgstr ""
+#. TRANS: Server error displayed when linking to a Twitter account fails because of an incorrect oauth_token.
+#, fuzzy
+msgid "Could not link your Twitter account: oauth_token mismatch."
+msgstr "حساب کاربری توییتر متصل شد"
 
+#. TRANS: Page instruction. %s is the StatusNet sitename.
 #, php-format
 msgid ""
-"This is the first time you've logged into %s so we must connect your Twitter "
-"account to a local account. You can either create a new account, or connect "
-"with your existing account, if you have one."
+"This is the first time you have logged into %s so we must connect your "
+"Twitter account to a local account. You can either create a new account, or "
+"connect with your existing account, if you have one."
 msgstr ""
 
+#. TRANS: Page title.
 msgid "Twitter Account Setup"
 msgstr "تنظیم حساب کاربری توییتر"
 
+#. TRANS: Fieldset legend.
 msgid "Connection options"
 msgstr "تنظیمات اتصال"
 
+#. TRANS: Text for license agreement checkbox.
+#. TRANS: %s is the license as configured for the StatusNet site.
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
 "email address, IM address, and phone number."
 msgstr ""
 
+#. TRANS: Fieldset legend.
 msgid "Create new account"
 msgstr "ایجاد حساب کاربری جدید"
 
+#. TRANS: Sub form introduction text.
 msgid "Create a new user with this nickname."
 msgstr "ایجاد یک کاربر جدید با این نام مستعار."
 
+#. TRANS: Field label.
 msgid "New nickname"
 msgstr "نام مستعار جدید"
 
+#. TRANS: Field title for nickname field.
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr ""
 
+#. TRANS: Field label.
 msgctxt "LABEL"
 msgid "Email"
 msgstr ""
 
+#. TRANS: Field title for e-mail address field.
 msgid "Used only for updates, announcements, and password recovery"
 msgstr ""
 
+#. TRANS: Button text for creating a new StatusNet account in the Twitter connect page.
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Create"
 msgstr "ایجاد"
 
+#. TRANS: Fieldset legend.
 msgid "Connect existing account"
 msgstr "اتصال به حساب کاربری موجود"
 
+#. TRANS: Sub form introduction text.
 msgid ""
 "If you already have an account, login with your username and password to "
 "connect it to your Twitter account."
 msgstr ""
 
+#. TRANS: Field label.
 msgid "Existing nickname"
 msgstr "نام مستعار موجود"
 
+#. TRANS: Field label.
 msgid "Password"
 msgstr "رمز عبور"
 
+#. TRANS: Button text for connecting an existing StatusNet account in the Twitter connect page..
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Connect"
 msgstr "اتصال"
 
+#. TRANS: Client error displayed when trying to create a new user while creating new users is not allowed.
 msgid "Registration not allowed."
 msgstr "اجازهٔ ثبت‌نام داده نشده است."
 
+#. TRANS: Client error displayed when trying to create a new user with an invalid invitation code.
 msgid "Not a valid invitation code."
 msgstr "کد دعوت نامعتبر است."
 
+#. TRANS: Client error displayed when trying to create a new user with an invalid username.
 msgid "Nickname not allowed."
 msgstr "نام مستعار مجاز نیست."
 
+#. TRANS: Client error displayed when trying to create a new user with a username that is already in use.
 msgid "Nickname already in use. Try another one."
 msgstr "این نام مستعار در حال حاضر مورد است�اده است. یکی دیگر را بیازمایید."
 
+#. TRANS: Server error displayed when creating a new user has failed.
 msgid "Error registering user."
 msgstr "خطا در ثبت نام کاربر."
 
+#. TRANS: Server error displayed when connecting a user to a Twitter user has failed.
+#. TRANS: Server error displayed connecting a user to a Twitter user has failed.
 msgid "Error connecting user to Twitter."
 msgstr "خطا در اتصال کاربر به توییتر."
 
+#. TRANS: Form validation error displayed when connecting an existing user to a Twitter user fails because
+#. TRANS: the provided username and/or password are incorrect.
 msgid "Invalid username or password."
 msgstr "نام کاربری یا رمز عبور اشتباه است."
 
+#. TRANS: Page title for Twitter administration panel.
+#, fuzzy
+msgctxt "TITLE"
 msgid "Twitter"
 msgstr "توییتر"
 
+#. TRANS: Instructions for Twitter bridge administration page.
 msgid "Twitter bridge settings"
 msgstr "تنظیمات پل توییتر"
 
-msgid "Invalid consumer key. Max length is 255 characters."
+#. TRANS: Client error displayed when a consumer key is invalid because it is too long.
+msgid "Invalid consumer key. Maximum length is 255 characters."
 msgstr ""
 
-msgid "Invalid consumer secret. Max length is 255 characters."
+#. TRANS: Client error displayed when a consumer secret is invalid because it is too long.
+msgid "Invalid consumer secret. Maximum length is 255 characters."
 msgstr ""
 
+#. TRANS: Fieldset legend for Twitter application settings.
 msgid "Twitter application settings"
 msgstr ""
 
+#. TRANS: Field label for Twitter assigned consumer key.
 msgid "Consumer key"
 msgstr ""
 
-msgid "Consumer key assigned by Twitter"
+#. TRANS: Field title for Twitter assigned consumer key.
+msgid "The consumer key assigned by Twitter."
 msgstr ""
 
+#. TRANS: Field label for Twitter assigned consumer secret.
 msgid "Consumer secret"
 msgstr ""
 
-msgid "Consumer secret assigned by Twitter"
+#. TRANS: Field title for Twitter assigned consumer secret.
+msgid "The consumer secret assigned by Twitter."
 msgstr ""
 
-msgid "Note: a global consumer key and secret are set."
+#. TRANS: Form guide displayed when two required fields have already been provided.
+msgid "Note: A global consumer key and secret are set."
 msgstr ""
 
+#. TRANS: Field label for Twitter application name.
 msgid "Integration source"
 msgstr ""
 
-msgid "Name of your Twitter application"
-msgstr ""
+#. TRANS: Field title for Twitter application name.
+#, fuzzy
+msgid "The name of your Twitter application."
+msgstr "حساب کاربری توییتر متصل شد"
 
+#. TRANS: Fieldset legend for Twitter integration options.
 msgid "Options"
 msgstr "تنظیمات"
 
+#. TRANS: Checkbox label for global setting.
 msgid "Enable \"Sign-in with Twitter\""
 msgstr ""
 
-msgid "Allow users to login with their Twitter credentials"
+#. TRANS: Checkbox title.
+msgid "This allow users to login with their Twitter credentials."
 msgstr ""
 
+#. TRANS: Checkbox label for global setting.
 msgid "Enable Twitter import"
 msgstr ""
 
+#. TRANS: Checkbox title for global setting.
 msgid ""
 "Allow users to import their Twitter friends' timelines. Requires daemons to "
 "be manually configured."
 msgstr ""
 
-msgid "Save Twitter settings"
-msgstr "ذخیره تنظیمات توییتر"
+#. TRANS: Button title for saving the administrative Twitter bridge settings.
+#, fuzzy
+msgid "Save the Twitter bridge settings."
+msgstr "تنظیمات پل توییتر"
 
-msgid "Login or register using Twitter"
+#. TRANS: Server exception thrown when an invalid URL scheme is detected.
+msgid "Invalid URL scheme for HTTP stream reader."
+msgstr ""
+
+#. TRANS: Exception thrown when input from an inexpected socket is encountered.
+msgid "Got input from unexpected socket!"
+msgstr ""
+
+#. TRANS: Exception thrown when an invalid state is encountered in handleLine.
+#. TRANS: %s is the invalid state.
+#, php-format
+msgid "Invalid state in handleLine: %s."
+msgstr ""
+
+#. TRANS: Exception thrown when an invalid response line is encountered.
+#. TRANS: %s is the invalid line.
+#, php-format
+msgid "Invalid HTTP response line: %s."
+msgstr ""
+
+#. TRANS: Exception thrown when an invalid response line part is encountered.
+#. TRANS: %1$s is the chunk, %2$s is the line.
+#, php-format
+msgid "Invalid HTTP response line chunk \"%1$s\": %2$s."
+msgstr ""
+
+#. TRANS: Exception thrown when an invalid response code is encountered.
+#. TRANS: %1$s is the response code, %2$s is the line.
+#, php-format
+msgid "Bad HTTP response code %1$s: %2$s."
+msgstr ""
+
+#. TRANS: Menu item in login navigation.
+#. TRANS: Menu item in connection settings navigation.
+#, fuzzy
+msgctxt "MENU"
+msgid "Twitter"
+msgstr "توییتر"
+
+#. TRANS: Title for menu item in login navigation.
+#, fuzzy
+msgid "Login or register using Twitter."
 msgstr "برای است�اده از توییتر، وارد شوید یا ثبت نام کنید"
 
+#. TRANS: Title for menu item in connection settings navigation.
 msgid "Twitter integration options"
 msgstr "تنظیمات پیوسته توییتر"
 
+msgid "Twitter"
+msgstr "توییتر"
+
 msgid "Twitter bridge configuration"
 msgstr "پیکربندی پل توییتر"
 
+#. TRANS: Plugin description.
 msgid ""
 "The Twitter \"bridge\" plugin allows integration of a StatusNet instance "
 "with <a href=\"http://twitter.com/\">Twitter</a>."
 msgstr ""
 
+#. TRANS: Client error displayed when trying to log in using Twitter while already logged in to StatusNet.
 msgid "Already logged in."
 msgstr "در حال حاضر وارد شده‌اید."
 
+#. TRANS: Title for login using Twitter page.
+#, fuzzy
+msgctxt "TITLE"
 msgid "Twitter Login"
 msgstr "ورود به توییتر"
 
+#. TRANS: Instructions for login using Twitter page.
 msgid "Login with your Twitter account"
 msgstr ""
 
+#. TRANS: Alternative text for "sign in with Twitter" image.
 msgid "Sign in with Twitter"
 msgstr "با حساب کاربری توییتر وارد شوید"
 
@@ -304,3 +438,12 @@ msgstr ""
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr ""
+
+#~ msgid "set a password"
+#~ msgstr "تنظیم رمز عبور"
+
+#~ msgid " first."
+#~ msgstr " ابتدا."
+
+#~ msgid "Save Twitter settings"
+#~ msgstr "ذخیره تنظیمات توییتر"
diff --git a/plugins/TwitterBridge/locale/fr/LC_MESSAGES/TwitterBridge.po b/plugins/TwitterBridge/locale/fr/LC_MESSAGES/TwitterBridge.po
index 8e35417471..54ec84d3ca 100644
--- a/plugins/TwitterBridge/locale/fr/LC_MESSAGES/TwitterBridge.po
+++ b/plugins/TwitterBridge/locale/fr/LC_MESSAGES/TwitterBridge.po
@@ -1,8 +1,11 @@
-# Translation of StatusNet - TwitterBridge to French (Français)
+# Translation of StatusNet - TwitterBridge to French (français)
 # Exported from translatewiki.net
 #
+# Author: Gomoko
 # Author: Od1n
 # Author: Peter17
+# Author: Tititou36
+# Author: Valeryan 24
 # Author: Verdy p
 # --
 # This file is distributed under the same license as the StatusNet package.
@@ -11,21 +14,23 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TwitterBridge\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:45+0000\n"
-"Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:21+0000\n"
+"Language-Team: French <https://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:29+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-12-03 13:51:38+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-twitterbridge\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#. TRANS: Title for page with Twitter integration settings.
 msgid "Twitter settings"
 msgstr "Paramètres Twitter"
 
+#. TRANS: Instructions for page with Twitter integration settings.
 msgid ""
 "Connect your Twitter account to share your updates with your Twitter friends "
 "and vice-versa."
@@ -33,27 +38,29 @@ msgstr ""
 "Connectez votre compte Twitter pour partager vos mises à jour avec vos amis "
 "Twitter et vice-versa."
 
+#. TRANS: Fieldset legend.
 msgid "Twitter account"
 msgstr "Compte Twitter"
 
+#. TRANS: Form note when a Twitter account has been connected.
 msgid "Connected Twitter account"
 msgstr "Compte Twitter connecté"
 
+#. TRANS: Fieldset legend.
 msgid "Disconnect my account from Twitter"
 msgstr "Déconnecter mon compte de Twitter"
 
-msgid "Disconnecting your Twitter could make it impossible to log in! Please "
+#. TRANS: Form guide. %s is a URL to the password settings.
+#. TRANS: This message contains a Markdown link in the form [description](link).
+#, php-format
+msgid ""
+"Disconnecting your Twitter account could make it impossible to log in! "
+"Please [set a password](%s) first."
 msgstr ""
-"La déconnexion de votre compte Twitter ne vous permettrait plus de vous "
-"connecter ! S’il vous plaît "
+"Vous déconnecter de votre compte Twitter pourrait vous empêcher de vous "
+"connecter! Veuillez d'abord [définir un mot de passe](%s)."
 
-msgid "set a password"
-msgstr "définissez un mot de passe"
-
-msgid " first."
-msgstr " tout d’abord."
-
-#. TRANS: %1$s is the current website name.
+#. TRANS: Form instructions. %1$s is the StatusNet sitename.
 #, php-format
 msgid ""
 "Keep your %1$s account but disconnect from Twitter. You can use your %1$s "
@@ -62,87 +69,166 @@ msgstr ""
 "Gardez votre compte %1$s, mais déconnectez-vous de Twitter. Vous pouvez "
 "utiliser votre mot de passe %1$s pour vous connecter."
 
+#. TRANS: Button text for disconnecting a Twitter account.
+msgctxt "BUTTON"
 msgid "Disconnect"
 msgstr "Déconnecter"
 
+#. TRANS: Fieldset legend.
 msgid "Preferences"
 msgstr "Préférences"
 
+#. TRANS: Checkbox label.
 msgid "Automatically send my notices to Twitter."
 msgstr "Envoyer automatiquement mes avis sur Twitter."
 
+#. TRANS: Checkbox label.
 msgid "Send local \"@\" replies to Twitter."
 msgstr "Envoyer des réponses \"@\" locales à Twitter."
 
+#. TRANS: Checkbox label.
 msgid "Subscribe to my Twitter friends here."
 msgstr "S’abonner à mes amis Twitter ici."
 
+#. TRANS: Checkbox label.
 msgid "Import my friends timeline."
 msgstr "Importer l’agenda de mes amis."
 
+#. TRANS: Button text for saving Twitter integration settings.
+#. TRANS: Button text for saving the administrative Twitter bridge settings.
+msgctxt "BUTTON"
 msgid "Save"
-msgstr "Sauvegarder"
+msgstr "Enregistrer"
 
+#. TRANS: Button text for adding Twitter integration.
+msgctxt "BUTTON"
 msgid "Add"
 msgstr "Ajouter"
 
+#. TRANS: Client error displayed when the session token does not match or is not given.
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 "Un problème est survenu avec votre jeton de session. Veuillez essayer à "
 "nouveau."
 
+#. TRANS: Client error displayed when the submitted form contains unexpected data.
 msgid "Unexpected form submission."
 msgstr "Soumission de formulaire inattendue."
 
+#. TRANS: Client error displayed when trying to remove a connected Twitter account when there isn't one connected.
 msgid "No Twitter connection to remove."
 msgstr "Aucune connexion Twitter à retirer."
 
-msgid "Couldn't remove Twitter user."
+#. TRANS: Server error displayed when trying to remove a connected Twitter account fails.
+msgid "Could not remove Twitter user."
 msgstr "Impossible de supprimer l’utilisateur Twitter."
 
+#. TRANS: Success message displayed after disconnecting a Twitter account.
 msgid "Twitter account disconnected."
 msgstr "Compte Twitter déconnecté."
 
-msgid "Couldn't save Twitter preferences."
+#. TRANS: Server error displayed when saving Twitter integration preferences fails.
+msgid "Could not save Twitter preferences."
 msgstr "Impossible de sauvegarder les préférences Twitter."
 
+#. TRANS: Success message after saving Twitter integration preferences.
 msgid "Twitter preferences saved."
 msgstr "Préférences Twitter enregistrées."
 
+#. TRANS: Form validation error displayed when the checkbox to agree to the license has not been checked.
 msgid "You cannot register if you do not agree to the license."
 msgstr "Vous ne pouvez pas vous inscrire si vous n’acceptez pas la licence."
 
+#. TRANS: Form validation error displayed when an unhandled error occurs.
 msgid "Something weird happened."
 msgstr "Quelque chose de bizarre s’est passé."
 
+#. TRANS: Server error displayed when linking to a Twitter account fails.
 msgid "Could not link your Twitter account."
 msgstr "Impossible de lier votre compte Twitter."
 
-msgid "Couldn't link your Twitter account: oauth_token mismatch."
+#. TRANS: Server error displayed when linking to a Twitter account fails because of an incorrect oauth_token.
+msgid "Could not link your Twitter account: oauth_token mismatch."
 msgstr ""
-"Impossible de lier votre compte Twitter : le jeton d’authentification ne "
-"correspond pas."
-
-msgid "Couldn't link your Twitter account."
-msgstr "Impossible de lier votre compte Twitter."
+"Impossible de lier votre compte Twitter: oauth_token ne correspond pas."
 
+#. TRANS: Page instruction. %s is the StatusNet sitename.
 #, php-format
 msgid ""
-"This is the first time you've logged into %s so we must connect your Twitter "
-"account to a local account. You can either create a new account, or connect "
-"with your existing account, if you have one."
+"This is the first time you have logged into %s so we must connect your "
+"Twitter account to a local account. You can either create a new account, or "
+"connect with your existing account, if you have one."
 msgstr ""
-"C’est la première fois que vous êtes connecté à %s via Twitter, il nous faut "
-"donc lier votre compte Twitter à un compte local. Vous pouvez soit créer un "
-"nouveau compte, soit vous connecter avec votre compte local existant si vous "
-"en avez un."
+"C’est la première fois que vous êtes connecté sous %s, vous devez donc lier "
+"votre compte Twitter à un compte local. Vous pouvez soit créer un nouveau "
+"compte, soit vous connecter avec votre compte existant, si vous en avez un."
 
+#. TRANS: Page title.
 msgid "Twitter Account Setup"
 msgstr "Configuration du compte Twitter"
 
+#. TRANS: Fieldset legend.
 msgid "Connection options"
 msgstr "Options de connexion"
 
+#. TRANS: Fieldset legend.
+msgid "Create new account"
+msgstr "Créer un nouveau compte"
+
+#. TRANS: Sub form introduction text.
+msgid "Create a new user with this nickname."
+msgstr "Créer un nouvel utilisateur avec ce pseudonyme."
+
+#. TRANS: Field label.
+msgid "New nickname"
+msgstr "Nouveau pseudonyme"
+
+#. TRANS: Field title for nickname field.
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
+msgstr "1 à 64 lettres minuscules ou chiffres, sans ponctuation ni espaces."
+
+#. TRANS: Field label.
+msgctxt "LABEL"
+msgid "Email"
+msgstr "Courriel"
+
+#. TRANS: Field title for e-mail address field.
+msgid "Used only for updates, announcements, and password recovery"
+msgstr ""
+"Utilisé uniquement pour les mises à jour, les annonces, et la récupération "
+"de mot de passe"
+
+#. TRANS: Button text for creating a new StatusNet account in the Twitter connect page.
+msgctxt "BUTTON"
+msgid "Create"
+msgstr "Créer"
+
+#. TRANS: Fieldset legend.
+msgid "Connect existing account"
+msgstr "Se connecter à un compte existant"
+
+#. TRANS: Sub form introduction text.
+msgid ""
+"If you already have an account, login with your username and password to "
+"connect it to your Twitter account."
+msgstr ""
+"Si vous avez déjà un compte ici, connectez-vous avec votre nom d’utilisateur "
+"et mot de passe pour l’associer à votre compte Twitter."
+
+#. TRANS: Field label.
+msgid "Existing nickname"
+msgstr "Pseudonyme existant"
+
+#. TRANS: Field label.
+msgid "Password"
+msgstr "Mot de passe"
+
+#. TRANS: Fieldset legend.
+msgid "License"
+msgstr "Licence"
+
+#. TRANS: Text for license agreement checkbox.
+#. TRANS: %s is the license as configured for the StatusNet site.
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
@@ -152,120 +238,109 @@ msgstr ""
 "des données privées suivantes : mot de passe, adresse courriel, adresse de "
 "messagerie instantanée et numéro de téléphone."
 
-msgid "Create new account"
-msgstr "Créer un nouveau compte"
-
-msgid "Create a new user with this nickname."
-msgstr "Créer un nouvel utilisateur avec ce pseudonyme."
-
-msgid "New nickname"
-msgstr "Nouveau pseudonyme"
-
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
-msgstr "1 à 64 lettres minuscules ou chiffres, sans ponctuation ni espaces."
-
-msgctxt "LABEL"
-msgid "Email"
-msgstr "Courriel"
-
-msgid "Used only for updates, announcements, and password recovery"
-msgstr ""
-"Utilisé uniquement pour les mises à jour, les annonces, et la récupération "
-"de mot de passe"
-
-msgid "Create"
-msgstr "Créer"
-
-msgid "Connect existing account"
-msgstr "Se connecter à un compte existant"
-
-msgid ""
-"If you already have an account, login with your username and password to "
-"connect it to your Twitter account."
-msgstr ""
-"Si vous avez déjà un compte ici, connectez-vous avec votre nom d’utilisateur "
-"et mot de passe pour l’associer à votre compte Twitter."
-
-msgid "Existing nickname"
-msgstr "Pseudonyme existant"
-
-msgid "Password"
-msgstr "Mot de passe"
-
+#. TRANS: Button text for connecting an existing StatusNet account in the Twitter connect page..
+msgctxt "BUTTON"
 msgid "Connect"
 msgstr "Connexion"
 
+#. TRANS: Client error displayed when trying to create a new user while creating new users is not allowed.
 msgid "Registration not allowed."
 msgstr "Inscription non autorisée."
 
+#. TRANS: Client error displayed when trying to create a new user with an invalid invitation code.
 msgid "Not a valid invitation code."
 msgstr "Le code d’invitation n’est pas valide."
 
+#. TRANS: Client error displayed when trying to create a new user with an invalid username.
 msgid "Nickname not allowed."
 msgstr "Pseudonyme non autorisé."
 
+#. TRANS: Client error displayed when trying to create a new user with a username that is already in use.
 msgid "Nickname already in use. Try another one."
 msgstr "Pseudonyme déjà utilisé. Essayez-en un autre."
 
+#. TRANS: Server error displayed when creating a new user has failed.
 msgid "Error registering user."
 msgstr "Erreur lors de l’inscription de l’utilisateur."
 
+#. TRANS: Server error displayed when connecting a user to a Twitter user has failed.
+#. TRANS: Server error displayed connecting a user to a Twitter user has failed.
 msgid "Error connecting user to Twitter."
 msgstr "Erreur de connexion de l’utilisateur à Twitter."
 
+#. TRANS: Form validation error displayed when connecting an existing user to a Twitter user fails because
+#. TRANS: the provided username and/or password are incorrect.
 msgid "Invalid username or password."
 msgstr "Nom d’utilisateur ou mot de passe incorrect."
 
+#. TRANS: Page title for Twitter administration panel.
+msgctxt "TITLE"
 msgid "Twitter"
 msgstr "Twitter"
 
+#. TRANS: Instructions for Twitter bridge administration page.
 msgid "Twitter bridge settings"
 msgstr "Paramètres de la passerelle Twitter"
 
-msgid "Invalid consumer key. Max length is 255 characters."
+#. TRANS: Client error displayed when a consumer key is invalid because it is too long.
+msgid "Invalid consumer key. Maximum length is 255 characters."
 msgstr "Clé de client invalide. La longueur maximum est de 255 caractères."
 
-msgid "Invalid consumer secret. Max length is 255 characters."
+#. TRANS: Client error displayed when a consumer secret is invalid because it is too long.
+msgid "Invalid consumer secret. Maximum length is 255 characters."
 msgstr ""
 "Code secret du client invalide. La longueur maximum est de 255 caractères."
 
+#. TRANS: Fieldset legend for Twitter application settings.
 msgid "Twitter application settings"
 msgstr "Paramètres de l’application Twitter"
 
+#. TRANS: Field label for Twitter assigned consumer key.
 msgid "Consumer key"
 msgstr "Clé du client"
 
-msgid "Consumer key assigned by Twitter"
-msgstr "Clé du client assignée par Twitter"
+#. TRANS: Field title for Twitter assigned consumer key.
+msgid "The consumer key assigned by Twitter."
+msgstr "La clé du client assignée par Twitter."
 
+#. TRANS: Field label for Twitter assigned consumer secret.
 msgid "Consumer secret"
 msgstr "Code secret du client"
 
-msgid "Consumer secret assigned by Twitter"
-msgstr "Code secret du client assigné par Twitter"
+#. TRANS: Field title for Twitter assigned consumer secret.
+msgid "The consumer secret assigned by Twitter."
+msgstr "Le code secret du client assigné par Twitter."
 
-msgid "Note: a global consumer key and secret are set."
-msgstr "Note : une clé et un code secret de client global sont définis."
+#. TRANS: Form guide displayed when two required fields have already been provided.
+msgid "Note: A global consumer key and secret are set."
+msgstr "Note : Une clé globale et un code secret du client sont définis."
 
+#. TRANS: Field label for Twitter application name.
 msgid "Integration source"
 msgstr "Source d’intégration"
 
-msgid "Name of your Twitter application"
-msgstr "Nom de votre application Twitter"
+#. TRANS: Field title for Twitter application name.
+msgid "The name of your Twitter application."
+msgstr "Le nom de votre application Twitter."
 
+#. TRANS: Fieldset legend for Twitter integration options.
 msgid "Options"
 msgstr "Options"
 
+#. TRANS: Checkbox label for global setting.
 msgid "Enable \"Sign-in with Twitter\""
 msgstr "Activer « S’inscrire avec Twitter »"
 
-msgid "Allow users to login with their Twitter credentials"
+#. TRANS: Checkbox title.
+msgid "This allow users to login with their Twitter credentials."
 msgstr ""
-"Permet aux utilisateurs de se connecter avec leurs identifiants Twitter"
+"Cela permet aux utilisateurs de se connecter avec leurs identifiants Twitter."
 
+#. TRANS: Checkbox label for global setting.
 msgid "Enable Twitter import"
 msgstr "Activer l’importation Twitter"
 
+#. TRANS: Checkbox title for global setting.
 msgid ""
 "Allow users to import their Twitter friends' timelines. Requires daemons to "
 "be manually configured."
@@ -273,18 +348,65 @@ msgstr ""
 "Permettre aux utilisateurs d’importer les agendas de leurs amis Twitter. "
 "Exige que les démons soient configurés manuellement."
 
-msgid "Save Twitter settings"
-msgstr "Sauvegarder les paramètres Twitter"
+#. TRANS: Button title for saving the administrative Twitter bridge settings.
+msgid "Save the Twitter bridge settings."
+msgstr "Enregistrer les paramètres de la passerelle Twitter."
 
-msgid "Login or register using Twitter"
+#. TRANS: Server exception thrown when an invalid URL scheme is detected.
+msgid "Invalid URL scheme for HTTP stream reader."
+msgstr "Schéma d'URL non valide pour le lecteur de flux HTTP."
+
+#. TRANS: Exception thrown when input from an inexpected socket is encountered.
+msgid "Got input from unexpected socket!"
+msgstr "Entrée reçue d'une socket non attendue!"
+
+#. TRANS: Exception thrown when an invalid state is encountered in handleLine.
+#. TRANS: %s is the invalid state.
+#, php-format
+msgid "Invalid state in handleLine: %s."
+msgstr "État non valide dans handleLine: %s."
+
+#. TRANS: Exception thrown when an invalid response line is encountered.
+#. TRANS: %s is the invalid line.
+#, php-format
+msgid "Invalid HTTP response line: %s."
+msgstr "Ligne de réponse HTTP invalide: %s."
+
+#. TRANS: Exception thrown when an invalid response line part is encountered.
+#. TRANS: %1$s is the chunk, %2$s is the line.
+#, php-format
+msgid "Invalid HTTP response line chunk \"%1$s\": %2$s."
+msgstr "Partie de ligne de réponse HTTP invalide \"%1$s\": %2$s."
+
+#. TRANS: Exception thrown when an invalid response code is encountered.
+#. TRANS: %1$s is the response code, %2$s is the line.
+#, php-format
+msgid "Bad HTTP response code %1$s: %2$s."
+msgstr "Mauvais code de réponse HTTP %1$s : %2$s."
+
+#. TRANS: Menu item in login navigation.
+#. TRANS: Menu item in connection settings navigation.
+msgctxt "MENU"
+msgid "Twitter"
+msgstr "Twitter"
+
+#. TRANS: Title for menu item in login navigation.
+msgid "Login or register using Twitter."
 msgstr "Se connecter ou s’inscrire via Twitter"
 
+#. TRANS: Title for menu item in connection settings navigation.
 msgid "Twitter integration options"
 msgstr "Options d’intégration de Twitter"
 
-msgid "Twitter bridge configuration"
-msgstr "Configuration de la passerelle Twitter"
+#. TRANS: Menu item in administrative panel that leads to the Twitter bridge configuration.
+msgid "Twitter"
+msgstr "Twitter"
 
+#. TRANS: Menu item title in administrative panel that leads to the Twitter bridge configuration.
+msgid "Twitter bridge configuration page."
+msgstr "Page de configuration de la passerelle Twitter"
+
+#. TRANS: Plugin description.
 msgid ""
 "The Twitter \"bridge\" plugin allows integration of a StatusNet instance "
 "with <a href=\"http://twitter.com/\">Twitter</a>."
@@ -292,15 +414,20 @@ msgstr ""
 "Le greffon de « passerelle » Twitter permet l’intégration d’une instance de "
 "StatusNet avec <a href=\"http://twitter.com/\">Twitter</a>."
 
+#. TRANS: Client error displayed when trying to log in using Twitter while already logged in to StatusNet.
 msgid "Already logged in."
 msgstr "Déjà connecté."
 
+#. TRANS: Title for login using Twitter page.
+msgctxt "TITLE"
 msgid "Twitter Login"
 msgstr "Connexion Twitter"
 
+#. TRANS: Instructions for login using Twitter page.
 msgid "Login with your Twitter account"
 msgstr "Connexion avec votre compte Twitter"
 
+#. TRANS: Alternative text for "sign in with Twitter" image.
 msgid "Sign in with Twitter"
 msgstr "S’inscrire avec Twitter"
 
diff --git a/plugins/TwitterBridge/locale/fur/LC_MESSAGES/TwitterBridge.po b/plugins/TwitterBridge/locale/fur/LC_MESSAGES/TwitterBridge.po
index 7e60e731ff..8307c51c45 100644
--- a/plugins/TwitterBridge/locale/fur/LC_MESSAGES/TwitterBridge.po
+++ b/plugins/TwitterBridge/locale/fur/LC_MESSAGES/TwitterBridge.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - TwitterBridge to Friulian (Furlan)
+# Translation of StatusNet - TwitterBridge to Friulian (furlan)
 # Exported from translatewiki.net
 #
 # Author: Klenje
@@ -9,271 +9,397 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TwitterBridge\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:45+0000\n"
-"Language-Team: Friulian <http://translatewiki.net/wiki/Portal:fur>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:21+0000\n"
+"Language-Team: Friulian <https://translatewiki.net/wiki/Portal:fur>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:29+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-12-03 13:51:38+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: fur\n"
 "X-Message-Group: #out-statusnet-plugin-twitterbridge\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Title for page with Twitter integration settings.
 msgid "Twitter settings"
 msgstr "Impuestazions di Twitter"
 
+#. TRANS: Instructions for page with Twitter integration settings.
 msgid ""
 "Connect your Twitter account to share your updates with your Twitter friends "
 "and vice-versa."
 msgstr ""
 
+#. TRANS: Fieldset legend.
 msgid "Twitter account"
 msgstr "Identitât su Twitter"
 
+#. TRANS: Form note when a Twitter account has been connected.
 msgid "Connected Twitter account"
 msgstr "Identitât su Twitter conetude"
 
+#. TRANS: Fieldset legend.
 msgid "Disconnect my account from Twitter"
 msgstr ""
 
-msgid "Disconnecting your Twitter could make it impossible to log in! Please "
+#. TRANS: Form guide. %s is a URL to the password settings.
+#. TRANS: This message contains a Markdown link in the form [description](link).
+#, php-format
+msgid ""
+"Disconnecting your Twitter account could make it impossible to log in! "
+"Please [set a password](%s) first."
 msgstr ""
 
-msgid "set a password"
-msgstr ""
-
-msgid " first."
-msgstr ""
-
-#. TRANS: %1$s is the current website name.
+#. TRANS: Form instructions. %1$s is the StatusNet sitename.
 #, php-format
 msgid ""
 "Keep your %1$s account but disconnect from Twitter. You can use your %1$s "
 "password to log in."
 msgstr ""
 
+#. TRANS: Button text for disconnecting a Twitter account.
+msgctxt "BUTTON"
 msgid "Disconnect"
 msgstr "Disconetiti"
 
+#. TRANS: Fieldset legend.
 msgid "Preferences"
 msgstr "Preferencis"
 
+#. TRANS: Checkbox label.
 msgid "Automatically send my notices to Twitter."
 msgstr "Mande in automatic i miei avîs su Twitter."
 
+#. TRANS: Checkbox label.
 msgid "Send local \"@\" replies to Twitter."
 msgstr "Mande lis rispuestis locâls cun \"@\" a Twitter."
 
+#. TRANS: Checkbox label.
 msgid "Subscribe to my Twitter friends here."
-msgstr ""
+msgstr "Sotscrivimi culì ai miei amîs di Twitter."
 
+#. TRANS: Checkbox label.
 msgid "Import my friends timeline."
 msgstr "Impuarte la ativitât dai miei amîs."
 
+#. TRANS: Button text for saving Twitter integration settings.
+#. TRANS: Button text for saving the administrative Twitter bridge settings.
+msgctxt "BUTTON"
 msgid "Save"
 msgstr "Salve"
 
+#. TRANS: Button text for adding Twitter integration.
+msgctxt "BUTTON"
 msgid "Add"
 msgstr "Zonte"
 
+#. TRANS: Client error displayed when the session token does not match or is not given.
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 
+#. TRANS: Client error displayed when the submitted form contains unexpected data.
 msgid "Unexpected form submission."
 msgstr ""
 
+#. TRANS: Client error displayed when trying to remove a connected Twitter account when there isn't one connected.
 msgid "No Twitter connection to remove."
 msgstr ""
 
-msgid "Couldn't remove Twitter user."
+#. TRANS: Server error displayed when trying to remove a connected Twitter account fails.
+msgid "Could not remove Twitter user."
 msgstr ""
 
+#. TRANS: Success message displayed after disconnecting a Twitter account.
 msgid "Twitter account disconnected."
 msgstr ""
 
-msgid "Couldn't save Twitter preferences."
-msgstr ""
+#. TRANS: Server error displayed when saving Twitter integration preferences fails.
+msgid "Could not save Twitter preferences."
+msgstr "No si à podût salvâ lis preferencis di Twitter."
 
+#. TRANS: Success message after saving Twitter integration preferences.
 msgid "Twitter preferences saved."
 msgstr "Preferencis di Twitter salvadis."
 
+#. TRANS: Form validation error displayed when the checkbox to agree to the license has not been checked.
 msgid "You cannot register if you do not agree to the license."
 msgstr "No tu puedis regjistrâti se no tu sês dacuardi cu la licence."
 
+#. TRANS: Form validation error displayed when an unhandled error occurs.
 msgid "Something weird happened."
 msgstr ""
 
+#. TRANS: Server error displayed when linking to a Twitter account fails.
 msgid "Could not link your Twitter account."
 msgstr ""
 
-msgid "Couldn't link your Twitter account: oauth_token mismatch."
-msgstr ""
-
-msgid "Couldn't link your Twitter account."
+#. TRANS: Server error displayed when linking to a Twitter account fails because of an incorrect oauth_token.
+msgid "Could not link your Twitter account: oauth_token mismatch."
 msgstr ""
 
+#. TRANS: Page instruction. %s is the StatusNet sitename.
 #, php-format
 msgid ""
-"This is the first time you've logged into %s so we must connect your Twitter "
-"account to a local account. You can either create a new account, or connect "
-"with your existing account, if you have one."
+"This is the first time you have logged into %s so we must connect your "
+"Twitter account to a local account. You can either create a new account, or "
+"connect with your existing account, if you have one."
 msgstr ""
 
+#. TRANS: Page title.
 msgid "Twitter Account Setup"
 msgstr ""
 
+#. TRANS: Fieldset legend.
 msgid "Connection options"
 msgstr "Opzions di conession"
 
+#. TRANS: Fieldset legend.
+msgid "Create new account"
+msgstr "Cree une gnove identitât"
+
+#. TRANS: Sub form introduction text.
+msgid "Create a new user with this nickname."
+msgstr "Cree un gnûf utent cun chest sorenon."
+
+#. TRANS: Field label.
+msgid "New nickname"
+msgstr "Gnûf sorenon"
+
+#. TRANS: Field title for nickname field.
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
+msgstr "1-64 letaris minusculis o numars, cence segns di puntuazion o spazis."
+
+#. TRANS: Field label.
+msgctxt "LABEL"
+msgid "Email"
+msgstr "Pueste eletroniche"
+
+#. TRANS: Field title for e-mail address field.
+msgid "Used only for updates, announcements, and password recovery"
+msgstr "Doprât dome par inzornaments, comunicazions e recupar de password.ì"
+
+#. TRANS: Button text for creating a new StatusNet account in the Twitter connect page.
+msgctxt "BUTTON"
+msgid "Create"
+msgstr "Cree"
+
+#. TRANS: Fieldset legend.
+msgid "Connect existing account"
+msgstr "Conet une identitât che esist za"
+
+#. TRANS: Sub form introduction text.
+msgid ""
+"If you already have an account, login with your username and password to "
+"connect it to your Twitter account."
+msgstr ""
+
+#. TRANS: Field label.
+msgid "Existing nickname"
+msgstr "Sorenon esistint"
+
+#. TRANS: Field label.
+msgid "Password"
+msgstr "Password"
+
+#. TRANS: Fieldset legend.
+msgid "License"
+msgstr ""
+
+#. TRANS: Text for license agreement checkbox.
+#. TRANS: %s is the license as configured for the StatusNet site.
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
 "email address, IM address, and phone number."
 msgstr ""
 
-msgid "Create new account"
-msgstr "Cree une gnove identitât"
-
-msgid "Create a new user with this nickname."
-msgstr "Cree un gnûf utent cun chest sorenon."
-
-msgid "New nickname"
-msgstr "Gnûf sorenon"
-
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
-msgstr "1-64 letaris minusculis o numars, cence segns di puntuazion o spazis."
-
-msgctxt "LABEL"
-msgid "Email"
-msgstr "Pueste eletroniche"
-
-msgid "Used only for updates, announcements, and password recovery"
-msgstr "Doprât dome par inzornaments, comunicazions e recupar de password.ì"
-
-msgid "Create"
-msgstr "Cree"
-
-msgid "Connect existing account"
-msgstr "Conet une identitât che esist za"
-
-msgid ""
-"If you already have an account, login with your username and password to "
-"connect it to your Twitter account."
-msgstr ""
-
-msgid "Existing nickname"
-msgstr "Sorenon esistint"
-
-msgid "Password"
-msgstr "Password"
-
+#. TRANS: Button text for connecting an existing StatusNet account in the Twitter connect page..
+msgctxt "BUTTON"
 msgid "Connect"
 msgstr "Conetiti"
 
+#. TRANS: Client error displayed when trying to create a new user while creating new users is not allowed.
 msgid "Registration not allowed."
 msgstr "Regjistrazion no permitude."
 
+#. TRANS: Client error displayed when trying to create a new user with an invalid invitation code.
 msgid "Not a valid invitation code."
 msgstr ""
 
+#. TRANS: Client error displayed when trying to create a new user with an invalid username.
 msgid "Nickname not allowed."
 msgstr "Il sorenon nol è permetût."
 
+#. TRANS: Client error displayed when trying to create a new user with a username that is already in use.
 msgid "Nickname already in use. Try another one."
 msgstr "Il sorenon al è za doprât. Provent un altri."
 
+#. TRANS: Server error displayed when creating a new user has failed.
 msgid "Error registering user."
 msgstr ""
 
+#. TRANS: Server error displayed when connecting a user to a Twitter user has failed.
+#. TRANS: Server error displayed connecting a user to a Twitter user has failed.
 msgid "Error connecting user to Twitter."
 msgstr ""
 
+#. TRANS: Form validation error displayed when connecting an existing user to a Twitter user fails because
+#. TRANS: the provided username and/or password are incorrect.
 msgid "Invalid username or password."
 msgstr "Il non utent o la password no son valits."
 
+#. TRANS: Page title for Twitter administration panel.
+msgctxt "TITLE"
 msgid "Twitter"
 msgstr "Twitter"
 
+#. TRANS: Instructions for Twitter bridge administration page.
 msgid "Twitter bridge settings"
 msgstr ""
 
-msgid "Invalid consumer key. Max length is 255 characters."
+#. TRANS: Client error displayed when a consumer key is invalid because it is too long.
+msgid "Invalid consumer key. Maximum length is 255 characters."
 msgstr ""
 
-msgid "Invalid consumer secret. Max length is 255 characters."
+#. TRANS: Client error displayed when a consumer secret is invalid because it is too long.
+msgid "Invalid consumer secret. Maximum length is 255 characters."
 msgstr ""
 
+#. TRANS: Fieldset legend for Twitter application settings.
 msgid "Twitter application settings"
 msgstr ""
 
+#. TRANS: Field label for Twitter assigned consumer key.
 msgid "Consumer key"
 msgstr ""
 
-msgid "Consumer key assigned by Twitter"
+#. TRANS: Field title for Twitter assigned consumer key.
+msgid "The consumer key assigned by Twitter."
 msgstr ""
 
+#. TRANS: Field label for Twitter assigned consumer secret.
 msgid "Consumer secret"
 msgstr ""
 
-msgid "Consumer secret assigned by Twitter"
+#. TRANS: Field title for Twitter assigned consumer secret.
+msgid "The consumer secret assigned by Twitter."
 msgstr ""
 
-msgid "Note: a global consumer key and secret are set."
+#. TRANS: Form guide displayed when two required fields have already been provided.
+msgid "Note: A global consumer key and secret are set."
 msgstr ""
 
+#. TRANS: Field label for Twitter application name.
 msgid "Integration source"
 msgstr ""
 
-msgid "Name of your Twitter application"
+#. TRANS: Field title for Twitter application name.
+msgid "The name of your Twitter application."
 msgstr "Non de tô aplicazion Twitter"
 
+#. TRANS: Fieldset legend for Twitter integration options.
 msgid "Options"
 msgstr "Opzions"
 
+#. TRANS: Checkbox label for global setting.
 msgid "Enable \"Sign-in with Twitter\""
 msgstr ""
 
-msgid "Allow users to login with their Twitter credentials"
+#. TRANS: Checkbox title.
+msgid "This allow users to login with their Twitter credentials."
 msgstr ""
 
+#. TRANS: Checkbox label for global setting.
 msgid "Enable Twitter import"
 msgstr ""
 
+#. TRANS: Checkbox title for global setting.
 msgid ""
 "Allow users to import their Twitter friends' timelines. Requires daemons to "
 "be manually configured."
 msgstr ""
 
-msgid "Save Twitter settings"
-msgstr "Salve lis impuestazions di Twitter"
+#. TRANS: Button title for saving the administrative Twitter bridge settings.
+msgid "Save the Twitter bridge settings."
+msgstr "Salve lis impuestazions dal puint par Twitter."
 
-msgid "Login or register using Twitter"
+#. TRANS: Server exception thrown when an invalid URL scheme is detected.
+msgid "Invalid URL scheme for HTTP stream reader."
 msgstr ""
 
+#. TRANS: Exception thrown when input from an inexpected socket is encountered.
+msgid "Got input from unexpected socket!"
+msgstr ""
+
+#. TRANS: Exception thrown when an invalid state is encountered in handleLine.
+#. TRANS: %s is the invalid state.
+#, php-format
+msgid "Invalid state in handleLine: %s."
+msgstr ""
+
+#. TRANS: Exception thrown when an invalid response line is encountered.
+#. TRANS: %s is the invalid line.
+#, php-format
+msgid "Invalid HTTP response line: %s."
+msgstr ""
+
+#. TRANS: Exception thrown when an invalid response line part is encountered.
+#. TRANS: %1$s is the chunk, %2$s is the line.
+#, php-format
+msgid "Invalid HTTP response line chunk \"%1$s\": %2$s."
+msgstr ""
+
+#. TRANS: Exception thrown when an invalid response code is encountered.
+#. TRANS: %1$s is the response code, %2$s is the line.
+#, php-format
+msgid "Bad HTTP response code %1$s: %2$s."
+msgstr ""
+
+#. TRANS: Menu item in login navigation.
+#. TRANS: Menu item in connection settings navigation.
+msgctxt "MENU"
+msgid "Twitter"
+msgstr "Twitter"
+
+#. TRANS: Title for menu item in login navigation.
+msgid "Login or register using Twitter."
+msgstr "Jentre o regjistriti doprant Twitter."
+
+#. TRANS: Title for menu item in connection settings navigation.
 msgid "Twitter integration options"
 msgstr ""
 
-msgid "Twitter bridge configuration"
+#. TRANS: Menu item in administrative panel that leads to the Twitter bridge configuration.
+msgid "Twitter"
+msgstr "Twitter"
+
+#. TRANS: Menu item title in administrative panel that leads to the Twitter bridge configuration.
+msgid "Twitter bridge configuration page."
 msgstr ""
 
+#. TRANS: Plugin description.
 msgid ""
 "The Twitter \"bridge\" plugin allows integration of a StatusNet instance "
 "with <a href=\"http://twitter.com/\">Twitter</a>."
 msgstr ""
 
+#. TRANS: Client error displayed when trying to log in using Twitter while already logged in to StatusNet.
 msgid "Already logged in."
 msgstr "Tu sês za jentrât."
 
+#. TRANS: Title for login using Twitter page.
+msgctxt "TITLE"
 msgid "Twitter Login"
-msgstr ""
+msgstr "Jentre su Twitter"
 
+#. TRANS: Instructions for login using Twitter page.
 msgid "Login with your Twitter account"
-msgstr ""
+msgstr "Jentre cu la tô identitât su Twitter"
 
+#. TRANS: Alternative text for "sign in with Twitter" image.
 msgid "Sign in with Twitter"
-msgstr ""
+msgstr "Jentre cun Twitter"
 
 #. TRANS: Mail subject after forwarding notices to Twitter has stopped working.
 msgid "Your Twitter bridge has been disabled"
diff --git a/plugins/TwitterBridge/locale/gl/LC_MESSAGES/TwitterBridge.po b/plugins/TwitterBridge/locale/gl/LC_MESSAGES/TwitterBridge.po
index c6fbbd1824..f3d2f73c51 100644
--- a/plugins/TwitterBridge/locale/gl/LC_MESSAGES/TwitterBridge.po
+++ b/plugins/TwitterBridge/locale/gl/LC_MESSAGES/TwitterBridge.po
@@ -1,5 +1,5 @@
-# Translation of StatusNet - TwitterBridge to Galician (Galego)
-# Expored from translatewiki.net
+# Translation of StatusNet - TwitterBridge to Galician (galego)
+# Exported from translatewiki.net
 #
 # Author: Toliño
 # --
@@ -9,30 +9,431 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TwitterBridge\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:34:14+0000\n"
-"Language-Team: Galician <http://translatewiki.net/wiki/Portal:gl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:21+0000\n"
+"Language-Team: Galician <https://translatewiki.net/wiki/Portal:gl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:27:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-12-03 13:51:38+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: gl\n"
 "X-Message-Group: #out-statusnet-plugin-twitterbridge\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
-#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: twitterimport.php:114
+#. TRANS: Title for page with Twitter integration settings.
+msgid "Twitter settings"
+msgstr "Configuración do Twitter"
+
+#. TRANS: Instructions for page with Twitter integration settings.
+msgid ""
+"Connect your Twitter account to share your updates with your Twitter friends "
+"and vice-versa."
+msgstr ""
+"Conecte a súa conta do Twitter para compartir as súas actualizacións cos "
+"seus amigos do Twitter e viceversa."
+
+#. TRANS: Fieldset legend.
+msgid "Twitter account"
+msgstr "Conta do Twitter"
+
+#. TRANS: Form note when a Twitter account has been connected.
+msgid "Connected Twitter account"
+msgstr "Conta do Twitter conectada"
+
+#. TRANS: Fieldset legend.
+msgid "Disconnect my account from Twitter"
+msgstr "Desconectar a miña conta do Twitter"
+
+#. TRANS: Form guide. %s is a URL to the password settings.
+#. TRANS: This message contains a Markdown link in the form [description](link).
 #, php-format
-msgid "RT @%1$s %2$s"
+msgid ""
+"Disconnecting your Twitter account could make it impossible to log in! "
+"Please [set a password](%s) first."
 msgstr ""
+"Ao desconectar o Twitter será imposible acceder ao sistema! [Defina un "
+"contrasinal](%s) primeiro."
 
-#: twitter.php:407
-msgid "Your Twitter bridge has been disabled."
+#. TRANS: Form instructions. %1$s is the StatusNet sitename.
+#, php-format
+msgid ""
+"Keep your %1$s account but disconnect from Twitter. You can use your %1$s "
+"password to log in."
 msgstr ""
+"Manter a conta de %1$s pero desconectala do Twitter. Agora usará o seu "
+"contrasinal de %1$s para acceder ao sistema."
 
-#: twitter.php:411
+#. TRANS: Button text for disconnecting a Twitter account.
+msgctxt "BUTTON"
+msgid "Disconnect"
+msgstr "Desconectarse"
+
+#. TRANS: Fieldset legend.
+msgid "Preferences"
+msgstr "Preferencias"
+
+#. TRANS: Checkbox label.
+msgid "Automatically send my notices to Twitter."
+msgstr "Enviar automaticamente as notas ao Twitter."
+
+#. TRANS: Checkbox label.
+msgid "Send local \"@\" replies to Twitter."
+msgstr "Enviar as respostas \"@\" locais ao Twitter."
+
+#. TRANS: Checkbox label.
+msgid "Subscribe to my Twitter friends here."
+msgstr "Subscribirse aos amigos do Twitter aquí."
+
+#. TRANS: Checkbox label.
+msgid "Import my friends timeline."
+msgstr "Importar a liña do tempo dos amigos."
+
+#. TRANS: Button text for saving Twitter integration settings.
+#. TRANS: Button text for saving the administrative Twitter bridge settings.
+msgctxt "BUTTON"
+msgid "Save"
+msgstr "Gardar"
+
+#. TRANS: Button text for adding Twitter integration.
+msgctxt "BUTTON"
+msgid "Add"
+msgstr "Engadir"
+
+#. TRANS: Client error displayed when the session token does not match or is not given.
+msgid "There was a problem with your session token. Try again, please."
+msgstr "Houbo un erro co seu pase. Inténteo de novo."
+
+#. TRANS: Client error displayed when the submitted form contains unexpected data.
+msgid "Unexpected form submission."
+msgstr "Envío de formulario inesperado."
+
+#. TRANS: Client error displayed when trying to remove a connected Twitter account when there isn't one connected.
+msgid "No Twitter connection to remove."
+msgstr "Non hai ningunha conexión ao Twitter que eliminar."
+
+#. TRANS: Server error displayed when trying to remove a connected Twitter account fails.
+msgid "Could not remove Twitter user."
+msgstr "Non se puido eliminar o usuario do Twitter."
+
+#. TRANS: Success message displayed after disconnecting a Twitter account.
+msgid "Twitter account disconnected."
+msgstr "Conta do Twitter desconectada."
+
+#. TRANS: Server error displayed when saving Twitter integration preferences fails.
+msgid "Could not save Twitter preferences."
+msgstr "Non se puideron gardar as preferencias do Twitter."
+
+#. TRANS: Success message after saving Twitter integration preferences.
+msgid "Twitter preferences saved."
+msgstr "Gardáronse as preferencias do Twitter."
+
+#. TRANS: Form validation error displayed when the checkbox to agree to the license has not been checked.
+msgid "You cannot register if you do not agree to the license."
+msgstr "Non pode rexistrarse se non acepta a licenza."
+
+#. TRANS: Form validation error displayed when an unhandled error occurs.
+msgid "Something weird happened."
+msgstr "Ocorreu algo estraño."
+
+#. TRANS: Server error displayed when linking to a Twitter account fails.
+msgid "Could not link your Twitter account."
+msgstr "Non se puido ligar a súa conta do Twitter."
+
+#. TRANS: Server error displayed when linking to a Twitter account fails because of an incorrect oauth_token.
+msgid "Could not link your Twitter account: oauth_token mismatch."
+msgstr ""
+"Non se puido ligar a súa conta do Twitter: O pase de autenticación "
+"oauth_token non coincide."
+
+#. TRANS: Page instruction. %s is the StatusNet sitename.
+#, php-format
+msgid ""
+"This is the first time you have logged into %s so we must connect your "
+"Twitter account to a local account. You can either create a new account, or "
+"connect with your existing account, if you have one."
+msgstr ""
+"Esta é a primeira vez que accede ao sistema de %s, de modo que debemos "
+"conectar a súa conta do Twitter cunha conta local. Pode crear unha nova "
+"conta local ou ben conectar con outra conta local existente."
+
+#. TRANS: Page title.
+msgid "Twitter Account Setup"
+msgstr "Configuración da conta do Twitter"
+
+#. TRANS: Fieldset legend.
+msgid "Connection options"
+msgstr "Opcións de conexión"
+
+#. TRANS: Fieldset legend.
+msgid "Create new account"
+msgstr "Crear unha conta nova"
+
+#. TRANS: Sub form introduction text.
+msgid "Create a new user with this nickname."
+msgstr "Crear un novo usuario con este alcume."
+
+#. TRANS: Field label.
+msgid "New nickname"
+msgstr "Novo alcume"
+
+#. TRANS: Field title for nickname field.
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
+msgstr ""
+"Entre 1 e 64 letras minúsculas ou números, sen signos de puntuación, "
+"espazos, tiles ou eñes."
+
+#. TRANS: Field label.
+msgctxt "LABEL"
+msgid "Email"
+msgstr "Correo electrónico"
+
+#. TRANS: Field title for e-mail address field.
+msgid "Used only for updates, announcements, and password recovery"
+msgstr ""
+"Só se utiliza para actualizacións, anuncios e recuperación de contrasinais"
+
+#. TRANS: Button text for creating a new StatusNet account in the Twitter connect page.
+msgctxt "BUTTON"
+msgid "Create"
+msgstr "Crear"
+
+#. TRANS: Fieldset legend.
+msgid "Connect existing account"
+msgstr "Conectar cunha conta existente"
+
+#. TRANS: Sub form introduction text.
+msgid ""
+"If you already have an account, login with your username and password to "
+"connect it to your Twitter account."
+msgstr ""
+"Se xa ten unha conta, acceda ao sistema co seu nome de usuario e contrasinal "
+"para conectala coa do Twitter."
+
+#. TRANS: Field label.
+msgid "Existing nickname"
+msgstr "Alcume existente"
+
+#. TRANS: Field label.
+msgid "Password"
+msgstr "Contrasinal"
+
+#. TRANS: Fieldset legend.
+msgid "License"
+msgstr "Licenza"
+
+#. TRANS: Text for license agreement checkbox.
+#. TRANS: %s is the license as configured for the StatusNet site.
+#, php-format
+msgid ""
+"My text and files are available under %s except this private data: password, "
+"email address, IM address, and phone number."
+msgstr ""
+"Os meus textos e ficheiros están dispoñibles baixo %s, salvo os seguintes "
+"datos privados: contrasinais, enderezos de correo electrónico e mensaxería "
+"instantánea e números de teléfono."
+
+#. TRANS: Button text for connecting an existing StatusNet account in the Twitter connect page..
+msgctxt "BUTTON"
+msgid "Connect"
+msgstr "Conectar"
+
+#. TRANS: Client error displayed when trying to create a new user while creating new users is not allowed.
+msgid "Registration not allowed."
+msgstr "Non se permite o rexistro."
+
+#. TRANS: Client error displayed when trying to create a new user with an invalid invitation code.
+msgid "Not a valid invitation code."
+msgstr "O código da invitación é incorrecto."
+
+#. TRANS: Client error displayed when trying to create a new user with an invalid username.
+msgid "Nickname not allowed."
+msgstr "Alcume non permitido."
+
+#. TRANS: Client error displayed when trying to create a new user with a username that is already in use.
+msgid "Nickname already in use. Try another one."
+msgstr "Ese alcume xa está en uso. Probe con outro."
+
+#. TRANS: Server error displayed when creating a new user has failed.
+msgid "Error registering user."
+msgstr "Erro ao rexistrar o usuario."
+
+#. TRANS: Server error displayed when connecting a user to a Twitter user has failed.
+#. TRANS: Server error displayed connecting a user to a Twitter user has failed.
+msgid "Error connecting user to Twitter."
+msgstr "Erro ao conectar o usuario co Twitter."
+
+#. TRANS: Form validation error displayed when connecting an existing user to a Twitter user fails because
+#. TRANS: the provided username and/or password are incorrect.
+msgid "Invalid username or password."
+msgstr "O nome de usuario ou contrasinal non son correctos."
+
+#. TRANS: Page title for Twitter administration panel.
+msgctxt "TITLE"
+msgid "Twitter"
+msgstr "Twitter"
+
+#. TRANS: Instructions for Twitter bridge administration page.
+msgid "Twitter bridge settings"
+msgstr "Configuración da ponte ata o Twitter"
+
+#. TRANS: Client error displayed when a consumer key is invalid because it is too long.
+msgid "Invalid consumer key. Maximum length is 255 characters."
+msgstr ""
+"Clave de consumidor incorrecta. A extensión máxima é de 255 caracteres."
+
+#. TRANS: Client error displayed when a consumer secret is invalid because it is too long.
+msgid "Invalid consumer secret. Maximum length is 255 characters."
+msgstr ""
+"Frase secreta de consumidor incorrecta. A extensión máxima é de 255 "
+"caracteres."
+
+#. TRANS: Fieldset legend for Twitter application settings.
+msgid "Twitter application settings"
+msgstr "Configuración da aplicación do Twitter"
+
+#. TRANS: Field label for Twitter assigned consumer key.
+msgid "Consumer key"
+msgstr "Clave do consumidor"
+
+#. TRANS: Field title for Twitter assigned consumer key.
+msgid "The consumer key assigned by Twitter."
+msgstr "A clave de consumidor asignada polo Twitter."
+
+#. TRANS: Field label for Twitter assigned consumer secret.
+msgid "Consumer secret"
+msgstr "Pregunta secreta do consumidor"
+
+#. TRANS: Field title for Twitter assigned consumer secret.
+msgid "The consumer secret assigned by Twitter."
+msgstr "A pregunta secreta do consumidor asignada polo Twitter."
+
+#. TRANS: Form guide displayed when two required fields have already been provided.
+msgid "Note: A global consumer key and secret are set."
+msgstr "Nota: Están definidas a clave e a pregunta secreta de consumidor."
+
+#. TRANS: Field label for Twitter application name.
+msgid "Integration source"
+msgstr "Fonte de integración"
+
+#. TRANS: Field title for Twitter application name.
+msgid "The name of your Twitter application."
+msgstr "O nome da súa aplicación do Twitter."
+
+#. TRANS: Fieldset legend for Twitter integration options.
+msgid "Options"
+msgstr "Opcións"
+
+#. TRANS: Checkbox label for global setting.
+msgid "Enable \"Sign-in with Twitter\""
+msgstr "Activar \"Rexistrarse co Twitter\""
+
+#. TRANS: Checkbox title.
+msgid "This allow users to login with their Twitter credentials."
+msgstr "Isto permite aos usuarios rexistrarse coas credenciais do Twitter."
+
+#. TRANS: Checkbox label for global setting.
+msgid "Enable Twitter import"
+msgstr "Activar a importación desde o Twitter"
+
+#. TRANS: Checkbox title for global setting.
+msgid ""
+"Allow users to import their Twitter friends' timelines. Requires daemons to "
+"be manually configured."
+msgstr ""
+"Permitir aos usuarios importar as liñas do tempo dos amigos do Twitter. "
+"Cómpre configurar manualmente os servizos."
+
+#. TRANS: Button title for saving the administrative Twitter bridge settings.
+msgid "Save the Twitter bridge settings."
+msgstr "Gardar a configuración da ponte ata o Twitter."
+
+#. TRANS: Server exception thrown when an invalid URL scheme is detected.
+msgid "Invalid URL scheme for HTTP stream reader."
+msgstr "Esquema de URL inválido para o lector de fluxo HTTP."
+
+#. TRANS: Exception thrown when input from an inexpected socket is encountered.
+msgid "Got input from unexpected socket!"
+msgstr "Recibiuse unha entrada desde un conectador non esperado!"
+
+#. TRANS: Exception thrown when an invalid state is encountered in handleLine.
+#. TRANS: %s is the invalid state.
+#, php-format
+msgid "Invalid state in handleLine: %s."
+msgstr "Estado inválido en handleLine: %s."
+
+#. TRANS: Exception thrown when an invalid response line is encountered.
+#. TRANS: %s is the invalid line.
+#, php-format
+msgid "Invalid HTTP response line: %s."
+msgstr "Liña de resposta HTTP inválida: %s."
+
+#. TRANS: Exception thrown when an invalid response line part is encountered.
+#. TRANS: %1$s is the chunk, %2$s is the line.
+#, php-format
+msgid "Invalid HTTP response line chunk \"%1$s\": %2$s."
+msgstr "Fragmento de liña de resposta HTTP inválido \"%1$s\": %2$s."
+
+#. TRANS: Exception thrown when an invalid response code is encountered.
+#. TRANS: %1$s is the response code, %2$s is the line.
+#, php-format
+msgid "Bad HTTP response code %1$s: %2$s."
+msgstr "Código de resposta HTTP erróneo %1$s: %2$s."
+
+#. TRANS: Menu item in login navigation.
+#. TRANS: Menu item in connection settings navigation.
+msgctxt "MENU"
+msgid "Twitter"
+msgstr "Twitter"
+
+#. TRANS: Title for menu item in login navigation.
+msgid "Login or register using Twitter."
+msgstr "Acceda ou rexístrese mediante o Twitter."
+
+#. TRANS: Title for menu item in connection settings navigation.
+msgid "Twitter integration options"
+msgstr "Opcións de integración do Twitter"
+
+#. TRANS: Menu item in administrative panel that leads to the Twitter bridge configuration.
+msgid "Twitter"
+msgstr "Twitter"
+
+#. TRANS: Menu item title in administrative panel that leads to the Twitter bridge configuration.
+msgid "Twitter bridge configuration page."
+msgstr "Páxina de configuración da ponte ata o Twitter."
+
+#. TRANS: Plugin description.
+msgid ""
+"The Twitter \"bridge\" plugin allows integration of a StatusNet instance "
+"with <a href=\"http://twitter.com/\">Twitter</a>."
+msgstr ""
+"O complemento de \"ponte\" ata o Twitter permite a integración dunha "
+"instancia do StatusNet co <a href=\"http://twitter.com/\">Twitter</a>."
+
+#. TRANS: Client error displayed when trying to log in using Twitter while already logged in to StatusNet.
+msgid "Already logged in."
+msgstr "Xa se identificou."
+
+#. TRANS: Title for login using Twitter page.
+msgctxt "TITLE"
+msgid "Twitter Login"
+msgstr "Rexistro do Twitter"
+
+#. TRANS: Instructions for login using Twitter page.
+msgid "Login with your Twitter account"
+msgstr "Acceder coa conta do Twitter"
+
+#. TRANS: Alternative text for "sign in with Twitter" image.
+msgid "Sign in with Twitter"
+msgstr "Rexistrarse co Twitter"
+
+#. TRANS: Mail subject after forwarding notices to Twitter has stopped working.
+msgid "Your Twitter bridge has been disabled"
+msgstr "Desactivouse a súa ponte ata o Twitter"
+
+#. TRANS: Mail body after forwarding notices to Twitter has stopped working.
+#. TRANS: %1$ is the name of the user the mail is sent to, %2$s is a URL to the
+#. TRANS: Twitter settings, %3$s is the StatusNet sitename.
 #, php-format
 msgid ""
 "Hi, %1$s. We're sorry to inform you that your link to Twitter has been "
@@ -47,325 +448,20 @@ msgid ""
 "Regards,\n"
 "%3$s"
 msgstr ""
+"Ola, %1$s. Sentimos informar de que a súa ligazón cara ao Twitter está "
+"desctivada. Semella que xa non temos permiso para actualizar o seu estado no "
+"Twitter. Poida que revogase o acceso que tiña %3$s?\n"
+"\n"
+"Pode volver activar a súa ponte ata o Twitter visitando a páxina de "
+"configuración do Twitter:\n"
+"\n"
+"\t%2$s\n"
+"\n"
+"Atentamente,\n"
+"%3$s"
 
-#: TwitterBridgePlugin.php:151 TwitterBridgePlugin.php:174
-#: TwitterBridgePlugin.php:302 twitteradminpanel.php:52
-msgid "Twitter"
-msgstr "Twitter"
-
-#: TwitterBridgePlugin.php:152
-msgid "Login or register using Twitter"
-msgstr ""
-
-#: TwitterBridgePlugin.php:175
-msgid "Twitter integration options"
-msgstr ""
-
-#: TwitterBridgePlugin.php:303
-msgid "Twitter bridge configuration"
-msgstr ""
-
-#: TwitterBridgePlugin.php:327
-msgid ""
-"The Twitter \"bridge\" plugin allows integration of a StatusNet instance "
-"with <a href=\"http://twitter.com/\">Twitter</a>."
-msgstr ""
-
-#: twitteradminpanel.php:62
-msgid "Twitter bridge settings"
-msgstr ""
-
-#: twitteradminpanel.php:150
-msgid "Invalid consumer key. Max length is 255 characters."
-msgstr ""
-
-#: twitteradminpanel.php:156
-msgid "Invalid consumer secret. Max length is 255 characters."
-msgstr ""
-
-#: twitteradminpanel.php:212
-msgid "Twitter application settings"
-msgstr ""
-
-#: twitteradminpanel.php:218
-msgid "Consumer key"
-msgstr "Clave do consumidor"
-
-#: twitteradminpanel.php:219
-msgid "Consumer key assigned by Twitter"
-msgstr "Clave do consumidor asignada polo Twitter"
-
-#: twitteradminpanel.php:227
-msgid "Consumer secret"
-msgstr "Pregunta secreta do consumidor"
-
-#: twitteradminpanel.php:228
-msgid "Consumer secret assigned by Twitter"
-msgstr "Pregunta secreta do consumidor asignada polo Twitter"
-
-#: twitteradminpanel.php:238
-msgid "Note: a global consumer key and secret are set."
-msgstr ""
-
-#: twitteradminpanel.php:245
-msgid "Integration source"
-msgstr "Fonte de integración"
-
-#: twitteradminpanel.php:246
-msgid "Name of your Twitter application"
-msgstr ""
-
-#: twitteradminpanel.php:258
-msgid "Options"
-msgstr "Opcións"
-
-#: twitteradminpanel.php:265
-msgid "Enable \"Sign-in with Twitter\""
-msgstr ""
-
-#: twitteradminpanel.php:267
-msgid "Allow users to login with their Twitter credentials"
-msgstr ""
-
-#: twitteradminpanel.php:274
-msgid "Enable Twitter import"
-msgstr ""
-
-#: twitteradminpanel.php:276
-msgid ""
-"Allow users to import their Twitter friends' timelines. Requires daemons to "
-"be manually configured."
-msgstr ""
-
-#: twitteradminpanel.php:293 twittersettings.php:200
-msgid "Save"
-msgstr "Gardar"
-
-#: twitteradminpanel.php:293
-msgid "Save Twitter settings"
-msgstr ""
-
-#: twitterlogin.php:56
-msgid "Already logged in."
-msgstr ""
-
-#: twitterlogin.php:64
-msgid "Twitter Login"
-msgstr ""
-
-#: twitterlogin.php:69
-msgid "Login with your Twitter account"
-msgstr ""
-
-#: twitterlogin.php:87
-msgid "Sign in with Twitter"
-msgstr ""
-
-#: twitterauthorization.php:120 twittersettings.php:226
-msgid "There was a problem with your session token. Try again, please."
-msgstr ""
-
-#: twitterauthorization.php:126
-msgid "You can't register if you don't agree to the license."
-msgstr ""
-
-#: twitterauthorization.php:135
-msgid "Something weird happened."
-msgstr ""
-
-#: twitterauthorization.php:181 twitterauthorization.php:229
-#: twitterauthorization.php:300
-msgid "Couldn't link your Twitter account."
-msgstr ""
-
-#: twitterauthorization.php:201
-msgid "Couldn't link your Twitter account: oauth_token mismatch."
-msgstr ""
-
-#: twitterauthorization.php:312
+#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
+#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
 #, php-format
-msgid ""
-"This is the first time you've logged into %s so we must connect your Twitter "
-"account to a local account. You can either create a new account, or connect "
-"with your existing account, if you have one."
-msgstr ""
-
-#: twitterauthorization.php:318
-msgid "Twitter Account Setup"
-msgstr ""
-
-#: twitterauthorization.php:351
-msgid "Connection options"
-msgstr ""
-
-#: twitterauthorization.php:360
-#, php-format
-msgid ""
-"My text and files are available under %s except this private data: password, "
-"email address, IM address, and phone number."
-msgstr ""
-
-#: twitterauthorization.php:381
-msgid "Create new account"
-msgstr ""
-
-#: twitterauthorization.php:383
-msgid "Create a new user with this nickname."
-msgstr ""
-
-#: twitterauthorization.php:386
-msgid "New nickname"
-msgstr ""
-
-#: twitterauthorization.php:388
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr ""
-
-#: twitterauthorization.php:391
-msgid "Create"
-msgstr "Crear"
-
-#: twitterauthorization.php:396
-msgid "Connect existing account"
-msgstr ""
-
-#: twitterauthorization.php:398
-msgid ""
-"If you already have an account, login with your username and password to "
-"connect it to your Twitter account."
-msgstr ""
-
-#: twitterauthorization.php:401
-msgid "Existing nickname"
-msgstr ""
-
-#: twitterauthorization.php:404
-msgid "Password"
-msgstr "Contrasinal"
-
-#: twitterauthorization.php:407
-msgid "Connect"
-msgstr "Conectar"
-
-#: twitterauthorization.php:423 twitterauthorization.php:432
-msgid "Registration not allowed."
-msgstr ""
-
-#: twitterauthorization.php:439
-msgid "Not a valid invitation code."
-msgstr ""
-
-#: twitterauthorization.php:452
-msgid "Nickname not allowed."
-msgstr ""
-
-#: twitterauthorization.php:457
-msgid "Nickname already in use. Try another one."
-msgstr ""
-
-#: twitterauthorization.php:472
-msgid "Error registering user."
-msgstr ""
-
-#: twitterauthorization.php:483 twitterauthorization.php:521
-#: twitterauthorization.php:541
-msgid "Error connecting user to Twitter."
-msgstr ""
-
-#: twitterauthorization.php:503
-msgid "Invalid username or password."
-msgstr ""
-
-#: twittersettings.php:58
-msgid "Twitter settings"
-msgstr "Configuración do Twitter"
-
-#: twittersettings.php:69
-msgid ""
-"Connect your Twitter account to share your updates with your Twitter friends "
-"and vice-versa."
-msgstr ""
-
-#: twittersettings.php:116
-msgid "Twitter account"
-msgstr "Conta do Twitter"
-
-#: twittersettings.php:121
-msgid "Connected Twitter account"
-msgstr ""
-
-#: twittersettings.php:126
-msgid "Disconnect my account from Twitter"
-msgstr ""
-
-#: twittersettings.php:132
-msgid "Disconnecting your Twitter could make it impossible to log in! Please "
-msgstr ""
-
-#: twittersettings.php:136
-msgid "set a password"
-msgstr ""
-
-#: twittersettings.php:138
-msgid " first."
-msgstr " primeiro."
-
-#. TRANS: %1$s is the current website name.
-#: twittersettings.php:142
-#, php-format
-msgid ""
-"Keep your %1$s account but disconnect from Twitter. You can use your %1$s "
-"password to log in."
-msgstr ""
-
-#: twittersettings.php:150
-msgid "Disconnect"
-msgstr "Desconectarse"
-
-#: twittersettings.php:157
-msgid "Preferences"
-msgstr "Preferencias"
-
-#: twittersettings.php:161
-msgid "Automatically send my notices to Twitter."
-msgstr ""
-
-#: twittersettings.php:168
-msgid "Send local \"@\" replies to Twitter."
-msgstr ""
-
-#: twittersettings.php:175
-msgid "Subscribe to my Twitter friends here."
-msgstr ""
-
-#: twittersettings.php:184
-msgid "Import my friends timeline."
-msgstr ""
-
-#: twittersettings.php:202
-msgid "Add"
-msgstr "Engadir"
-
-#: twittersettings.php:236
-msgid "Unexpected form submission."
-msgstr ""
-
-#: twittersettings.php:251
-msgid "No Twitter connection to remove."
-msgstr ""
-
-#: twittersettings.php:259
-msgid "Couldn't remove Twitter user."
-msgstr ""
-
-#: twittersettings.php:263
-msgid "Twitter account disconnected."
-msgstr ""
-
-#: twittersettings.php:283 twittersettings.php:294
-msgid "Couldn't save Twitter preferences."
-msgstr ""
-
-#: twittersettings.php:302
-msgid "Twitter preferences saved."
-msgstr ""
+msgid "RT @%1$s %2$s"
+msgstr "RT @%1$s %2$s"
diff --git a/plugins/TwitterBridge/locale/ia/LC_MESSAGES/TwitterBridge.po b/plugins/TwitterBridge/locale/ia/LC_MESSAGES/TwitterBridge.po
index 09160072ea..7dafc86864 100644
--- a/plugins/TwitterBridge/locale/ia/LC_MESSAGES/TwitterBridge.po
+++ b/plugins/TwitterBridge/locale/ia/LC_MESSAGES/TwitterBridge.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - TwitterBridge to Interlingua (Interlingua)
+# Translation of StatusNet - TwitterBridge to Interlingua (interlingua)
 # Exported from translatewiki.net
 #
 # Author: McDutchie
@@ -9,49 +9,53 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TwitterBridge\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:45+0000\n"
-"Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:21+0000\n"
+"Language-Team: Interlingua <https://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:29+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-12-03 13:51:38+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-twitterbridge\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Title for page with Twitter integration settings.
 msgid "Twitter settings"
 msgstr "Configuration de Twitter"
 
+#. TRANS: Instructions for page with Twitter integration settings.
 msgid ""
 "Connect your Twitter account to share your updates with your Twitter friends "
 "and vice-versa."
 msgstr ""
-"Connecte tu conto de Twitter pro condivider tu actualisationes con tu amicos "
-"de Twitter e vice versa."
+"Connecte tu conto de Twitter pro divider tu actualitates con tu amicos de "
+"Twitter e vice versa."
 
+#. TRANS: Fieldset legend.
 msgid "Twitter account"
 msgstr "Conto de Twitter"
 
+#. TRANS: Form note when a Twitter account has been connected.
 msgid "Connected Twitter account"
 msgstr "Conto de Twitter connectite"
 
+#. TRANS: Fieldset legend.
 msgid "Disconnect my account from Twitter"
 msgstr "Disconnecter mi conto ab Twitter"
 
-msgid "Disconnecting your Twitter could make it impossible to log in! Please "
+#. TRANS: Form guide. %s is a URL to the password settings.
+#. TRANS: This message contains a Markdown link in the form [description](link).
+#, php-format
+msgid ""
+"Disconnecting your Twitter account could make it impossible to log in! "
+"Please [set a password](%s) first."
 msgstr ""
 "Le disconnexion de tu conto de Twitter renderea le authentication "
-"impossibile! Per favor "
+"impossibile! Per favor [defini un contrasigno](%s) primo."
 
-msgid "set a password"
-msgstr "defini un contrasigno"
-
-msgid " first."
-msgstr " primo."
-
-#. TRANS: %1$s is the current website name.
+#. TRANS: Form instructions. %1$s is the StatusNet sitename.
 #, php-format
 msgid ""
 "Keep your %1$s account but disconnect from Twitter. You can use your %1$s "
@@ -60,82 +64,163 @@ msgstr ""
 "Retene tu conto de %1$s ma disconnecte ab Twitter. Tu pote usar tu "
 "contrasigno de %1$s pro aperir session."
 
+#. TRANS: Button text for disconnecting a Twitter account.
+msgctxt "BUTTON"
 msgid "Disconnect"
 msgstr "Disconnecter"
 
+#. TRANS: Fieldset legend.
 msgid "Preferences"
 msgstr "Preferentias"
 
+#. TRANS: Checkbox label.
 msgid "Automatically send my notices to Twitter."
 msgstr "Automaticamente inviar mi notas a Twitter."
 
+#. TRANS: Checkbox label.
 msgid "Send local \"@\" replies to Twitter."
 msgstr "Inviar responsas \"@\" local a Twitter."
 
+#. TRANS: Checkbox label.
 msgid "Subscribe to my Twitter friends here."
 msgstr "Subscriber hic a mi amicos de Twitter."
 
+#. TRANS: Checkbox label.
 msgid "Import my friends timeline."
 msgstr "Importar le chronologia de mi amicos."
 
+#. TRANS: Button text for saving Twitter integration settings.
+#. TRANS: Button text for saving the administrative Twitter bridge settings.
+msgctxt "BUTTON"
 msgid "Save"
 msgstr "Salveguardar"
 
+#. TRANS: Button text for adding Twitter integration.
+msgctxt "BUTTON"
 msgid "Add"
 msgstr "Adder"
 
+#. TRANS: Client error displayed when the session token does not match or is not given.
 msgid "There was a problem with your session token. Try again, please."
 msgstr "Occurreva un problema con le indicio de tu session. Per favor reproba."
 
+#. TRANS: Client error displayed when the submitted form contains unexpected data.
 msgid "Unexpected form submission."
 msgstr "Submission de formulario inexpectate."
 
+#. TRANS: Client error displayed when trying to remove a connected Twitter account when there isn't one connected.
 msgid "No Twitter connection to remove."
 msgstr "Nulle connexion Twitter a remover."
 
-msgid "Couldn't remove Twitter user."
+#. TRANS: Server error displayed when trying to remove a connected Twitter account fails.
+msgid "Could not remove Twitter user."
 msgstr "Non poteva remover le usator de Twitter."
 
+#. TRANS: Success message displayed after disconnecting a Twitter account.
 msgid "Twitter account disconnected."
 msgstr "Conto de Twitter disconnectite."
 
-msgid "Couldn't save Twitter preferences."
+#. TRANS: Server error displayed when saving Twitter integration preferences fails.
+msgid "Could not save Twitter preferences."
 msgstr "Non poteva salveguardar le preferentias de Twitter."
 
+#. TRANS: Success message after saving Twitter integration preferences.
 msgid "Twitter preferences saved."
 msgstr "Preferentias de Twitter salveguardate."
 
+#. TRANS: Form validation error displayed when the checkbox to agree to the license has not been checked.
 msgid "You cannot register if you do not agree to the license."
 msgstr "Tu non pote crear un conto si tu non accepta le licentia."
 
+#. TRANS: Form validation error displayed when an unhandled error occurs.
 msgid "Something weird happened."
 msgstr "Qualcosa de bizarre occurreva."
 
+#. TRANS: Server error displayed when linking to a Twitter account fails.
 msgid "Could not link your Twitter account."
 msgstr "Non poteva ligar tu conto de Twitter."
 
-msgid "Couldn't link your Twitter account: oauth_token mismatch."
+#. TRANS: Server error displayed when linking to a Twitter account fails because of an incorrect oauth_token.
+msgid "Could not link your Twitter account: oauth_token mismatch."
 msgstr "Non poteva ligar a tu conto de Twitter: oauth_token non corresponde."
 
-msgid "Couldn't link your Twitter account."
-msgstr "Non poteva ligar a tu conto de Twitter."
-
+#. TRANS: Page instruction. %s is the StatusNet sitename.
 #, php-format
 msgid ""
-"This is the first time you've logged into %s so we must connect your Twitter "
-"account to a local account. You can either create a new account, or connect "
-"with your existing account, if you have one."
+"This is the first time you have logged into %s so we must connect your "
+"Twitter account to a local account. You can either create a new account, or "
+"connect with your existing account, if you have one."
 msgstr ""
 "Isto es le prime vice que tu ha aperite un session in %s; dunque, nos debe "
 "connecter tu conto de Twitter a un conto local. Tu pote crear un nove conto, "
 "o connecter con tu conto existente, si tu ha un."
 
+#. TRANS: Page title.
 msgid "Twitter Account Setup"
 msgstr "Configuration del conto de Twitter"
 
+#. TRANS: Fieldset legend.
 msgid "Connection options"
 msgstr "Optiones de connexion"
 
+#. TRANS: Fieldset legend.
+msgid "Create new account"
+msgstr "Crear nove conto"
+
+#. TRANS: Sub form introduction text.
+msgid "Create a new user with this nickname."
+msgstr "Crear un nove usator con iste pseudonymo."
+
+#. TRANS: Field label.
+msgid "New nickname"
+msgstr "Nove pseudonymo"
+
+#. TRANS: Field title for nickname field.
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
+msgstr "1-64 minusculas o numeros, sin punctuation o spatios."
+
+#. TRANS: Field label.
+msgctxt "LABEL"
+msgid "Email"
+msgstr "E-mail"
+
+#. TRANS: Field title for e-mail address field.
+msgid "Used only for updates, announcements, and password recovery"
+msgstr ""
+"Usate solmente pro actualisationes, notificationes e recuperation de "
+"contrasigno"
+
+#. TRANS: Button text for creating a new StatusNet account in the Twitter connect page.
+msgctxt "BUTTON"
+msgid "Create"
+msgstr "Crear"
+
+#. TRANS: Fieldset legend.
+msgid "Connect existing account"
+msgstr "Connecter conto existente"
+
+#. TRANS: Sub form introduction text.
+msgid ""
+"If you already have an account, login with your username and password to "
+"connect it to your Twitter account."
+msgstr ""
+"Si tu ha jam un conto, aperi session con tu nomine de usator e contrasigno "
+"pro connecter lo a tu conto de Twitter."
+
+#. TRANS: Field label.
+msgid "Existing nickname"
+msgstr "Pseudonymo existente"
+
+#. TRANS: Field label.
+msgid "Password"
+msgstr "Contrasigno"
+
+#. TRANS: Fieldset legend.
+msgid "License"
+msgstr "Licentia"
+
+#. TRANS: Text for license agreement checkbox.
+#. TRANS: %s is the license as configured for the StatusNet site.
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
@@ -145,118 +230,107 @@ msgstr ""
 "contrasigno, adresse de e-mail, adresse de messageria instantanee, numero de "
 "telephono."
 
-msgid "Create new account"
-msgstr "Crear nove conto"
-
-msgid "Create a new user with this nickname."
-msgstr "Crear un nove usator con iste pseudonymo."
-
-msgid "New nickname"
-msgstr "Nove pseudonymo"
-
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
-msgstr "1-64 minusculas o numeros, sin punctuation o spatios."
-
-msgctxt "LABEL"
-msgid "Email"
-msgstr "E-mail"
-
-msgid "Used only for updates, announcements, and password recovery"
-msgstr ""
-"Usate solmente pro actualisationes, notificationes e recuperation de "
-"contrasigno"
-
-msgid "Create"
-msgstr "Crear"
-
-msgid "Connect existing account"
-msgstr "Connecter conto existente"
-
-msgid ""
-"If you already have an account, login with your username and password to "
-"connect it to your Twitter account."
-msgstr ""
-"Si tu ha jam un conto, aperi session con tu nomine de usator e contrasigno "
-"pro connecter lo a tu conto de Twitter."
-
-msgid "Existing nickname"
-msgstr "Pseudonymo existente"
-
-msgid "Password"
-msgstr "Contrasigno"
-
+#. TRANS: Button text for connecting an existing StatusNet account in the Twitter connect page..
+msgctxt "BUTTON"
 msgid "Connect"
 msgstr "Connecter"
 
+#. TRANS: Client error displayed when trying to create a new user while creating new users is not allowed.
 msgid "Registration not allowed."
 msgstr "Creation de conto non permittite."
 
+#. TRANS: Client error displayed when trying to create a new user with an invalid invitation code.
 msgid "Not a valid invitation code."
 msgstr "Le codice de invitation es invalide."
 
+#. TRANS: Client error displayed when trying to create a new user with an invalid username.
 msgid "Nickname not allowed."
 msgstr "Pseudonymo non permittite."
 
+#. TRANS: Client error displayed when trying to create a new user with a username that is already in use.
 msgid "Nickname already in use. Try another one."
 msgstr "Pseudonymo ja in uso. Proba un altere."
 
+#. TRANS: Server error displayed when creating a new user has failed.
 msgid "Error registering user."
 msgstr "Error durante le registration del usator."
 
+#. TRANS: Server error displayed when connecting a user to a Twitter user has failed.
+#. TRANS: Server error displayed connecting a user to a Twitter user has failed.
 msgid "Error connecting user to Twitter."
 msgstr "Error durante le connexion del usator a Twitter."
 
+#. TRANS: Form validation error displayed when connecting an existing user to a Twitter user fails because
+#. TRANS: the provided username and/or password are incorrect.
 msgid "Invalid username or password."
 msgstr "Nomine de usator o contrasigno invalide."
 
+#. TRANS: Page title for Twitter administration panel.
+msgctxt "TITLE"
 msgid "Twitter"
 msgstr "Twitter"
 
+#. TRANS: Instructions for Twitter bridge administration page.
 msgid "Twitter bridge settings"
 msgstr "Configuration del ponte a Twitter"
 
-msgid "Invalid consumer key. Max length is 255 characters."
-msgstr "Clave de consumitor invalide. Longitude maximal es 255 characteres."
+#. TRANS: Client error displayed when a consumer key is invalid because it is too long.
+msgid "Invalid consumer key. Maximum length is 255 characters."
+msgstr "Clave de consumitor invalide. Longitude maxime es 255 characteres."
 
-msgid "Invalid consumer secret. Max length is 255 characters."
-msgstr "Secreto de consumitor invalide. Longitude maximal es 255 characteres."
+#. TRANS: Client error displayed when a consumer secret is invalid because it is too long.
+msgid "Invalid consumer secret. Maximum length is 255 characters."
+msgstr "Secreto de consumitor invalide. Longitude maxime es 255 characteres."
 
+#. TRANS: Fieldset legend for Twitter application settings.
 msgid "Twitter application settings"
 msgstr "Configuration del application Twitter"
 
+#. TRANS: Field label for Twitter assigned consumer key.
 msgid "Consumer key"
 msgstr "Clave de consumitor"
 
-msgid "Consumer key assigned by Twitter"
-msgstr "Clave de consumitor assignate per Twitter"
+#. TRANS: Field title for Twitter assigned consumer key.
+msgid "The consumer key assigned by Twitter."
+msgstr "Le clave de consumitor assignate per Twitter."
 
+#. TRANS: Field label for Twitter assigned consumer secret.
 msgid "Consumer secret"
 msgstr "Secreto de consumitor"
 
-msgid "Consumer secret assigned by Twitter"
-msgstr "Secreto de consumitor assignate per Twitter"
+#. TRANS: Field title for Twitter assigned consumer secret.
+msgid "The consumer secret assigned by Twitter."
+msgstr "Le secreto de consumitor assignate per Twitter."
 
-msgid "Note: a global consumer key and secret are set."
-msgstr "Nota: un clave e un secreto de consumitor global es definite."
+#. TRANS: Form guide displayed when two required fields have already been provided.
+msgid "Note: A global consumer key and secret are set."
+msgstr "Nota: Un clave e un secreto de consumitor global es definite."
 
+#. TRANS: Field label for Twitter application name.
 msgid "Integration source"
 msgstr "Fonte de integration"
 
-msgid "Name of your Twitter application"
-msgstr "Nomine de tu application Twitter"
+#. TRANS: Field title for Twitter application name.
+msgid "The name of your Twitter application."
+msgstr "Le nomine de tu application Twitter."
 
+#. TRANS: Fieldset legend for Twitter integration options.
 msgid "Options"
 msgstr "Optiones"
 
+#. TRANS: Checkbox label for global setting.
 msgid "Enable \"Sign-in with Twitter\""
 msgstr "Activar \"Aperir session con Twitter\""
 
-msgid "Allow users to login with their Twitter credentials"
-msgstr "Permitte que usatores aperi session con lor conto de Twitter"
+#. TRANS: Checkbox title.
+msgid "This allow users to login with their Twitter credentials."
+msgstr "Isto permitte que usatores aperi session con lor conto de Twitter."
 
+#. TRANS: Checkbox label for global setting.
 msgid "Enable Twitter import"
 msgstr "Activar le importation de Twitter"
 
+#. TRANS: Checkbox title for global setting.
 msgid ""
 "Allow users to import their Twitter friends' timelines. Requires daemons to "
 "be manually configured."
@@ -264,18 +338,65 @@ msgstr ""
 "Permitte que usatores importa le chronologias de lor amicos de Twitter. "
 "Require que le demones sia configurate manualmente."
 
-msgid "Save Twitter settings"
-msgstr "Salveguardar configurationes de Twitter"
+#. TRANS: Button title for saving the administrative Twitter bridge settings.
+msgid "Save the Twitter bridge settings."
+msgstr "Salveguardar le configuration del ponte a Twitter."
 
-msgid "Login or register using Twitter"
-msgstr "Aperir session o crear conto usante Twitter"
+#. TRANS: Server exception thrown when an invalid URL scheme is detected.
+msgid "Invalid URL scheme for HTTP stream reader."
+msgstr "Schema de URL invalide pro le lector de fluxo HTTP."
 
+#. TRANS: Exception thrown when input from an inexpected socket is encountered.
+msgid "Got input from unexpected socket!"
+msgstr "Recipeva datos ab un prisa inexpectate!"
+
+#. TRANS: Exception thrown when an invalid state is encountered in handleLine.
+#. TRANS: %s is the invalid state.
+#, php-format
+msgid "Invalid state in handleLine: %s."
+msgstr "Stato invalide in \"handleLine\": %s."
+
+#. TRANS: Exception thrown when an invalid response line is encountered.
+#. TRANS: %s is the invalid line.
+#, php-format
+msgid "Invalid HTTP response line: %s."
+msgstr "Linea de responsa HTTP invalide: %s."
+
+#. TRANS: Exception thrown when an invalid response line part is encountered.
+#. TRANS: %1$s is the chunk, %2$s is the line.
+#, php-format
+msgid "Invalid HTTP response line chunk \"%1$s\": %2$s."
+msgstr "Parte de linea de responsa HTTP invalide \"%1$s\": %2$s."
+
+#. TRANS: Exception thrown when an invalid response code is encountered.
+#. TRANS: %1$s is the response code, %2$s is the line.
+#, php-format
+msgid "Bad HTTP response code %1$s: %2$s."
+msgstr "Mal codice de responsa HTTP %1$s: %2$s."
+
+#. TRANS: Menu item in login navigation.
+#. TRANS: Menu item in connection settings navigation.
+msgctxt "MENU"
+msgid "Twitter"
+msgstr "Twitter"
+
+#. TRANS: Title for menu item in login navigation.
+msgid "Login or register using Twitter."
+msgstr "Aperir session o crear conto usante Twitter."
+
+#. TRANS: Title for menu item in connection settings navigation.
 msgid "Twitter integration options"
 msgstr "Optiones de integration de Twitter"
 
-msgid "Twitter bridge configuration"
-msgstr "Configuration del ponte a Twitter"
+#. TRANS: Menu item in administrative panel that leads to the Twitter bridge configuration.
+msgid "Twitter"
+msgstr "Twitter"
 
+#. TRANS: Menu item title in administrative panel that leads to the Twitter bridge configuration.
+msgid "Twitter bridge configuration page."
+msgstr "Pagina de configuration del ponte a Twitter."
+
+#. TRANS: Plugin description.
 msgid ""
 "The Twitter \"bridge\" plugin allows integration of a StatusNet instance "
 "with <a href=\"http://twitter.com/\">Twitter</a>."
@@ -283,15 +404,20 @@ msgstr ""
 "Le plug-in de \"ponte\" a Twitter permitte le integration de un installation "
 "de StatusNet con <a href=\"http://twitter.com/\">Twitter</a>."
 
+#. TRANS: Client error displayed when trying to log in using Twitter while already logged in to StatusNet.
 msgid "Already logged in."
 msgstr "Tu es jam authenticate."
 
+#. TRANS: Title for login using Twitter page.
+msgctxt "TITLE"
 msgid "Twitter Login"
 msgstr "Apertura de session con Twitter"
 
+#. TRANS: Instructions for login using Twitter page.
 msgid "Login with your Twitter account"
 msgstr "Aperir session con tu conto de Twitter"
 
+#. TRANS: Alternative text for "sign in with Twitter" image.
 msgid "Sign in with Twitter"
 msgstr "Aperir session con Twitter"
 
diff --git a/plugins/TwitterBridge/locale/ko/LC_MESSAGES/TwitterBridge.po b/plugins/TwitterBridge/locale/ko/LC_MESSAGES/TwitterBridge.po
index 26f941f396..29e4b1a216 100644
--- a/plugins/TwitterBridge/locale/ko/LC_MESSAGES/TwitterBridge.po
+++ b/plugins/TwitterBridge/locale/ko/LC_MESSAGES/TwitterBridge.po
@@ -9,21 +9,23 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TwitterBridge\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:45+0000\n"
-"Language-Team: Korean <http://translatewiki.net/wiki/Portal:ko>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:21+0000\n"
+"Language-Team: Korean <https://translatewiki.net/wiki/Portal:ko>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:29+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-12-03 13:51:38+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ko\n"
 "X-Message-Group: #out-statusnet-plugin-twitterbridge\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#. TRANS: Title for page with Twitter integration settings.
 msgid "Twitter settings"
 msgstr "트위터 설정"
 
+#. TRANS: Instructions for page with Twitter integration settings.
 msgid ""
 "Connect your Twitter account to share your updates with your Twitter friends "
 "and vice-versa."
@@ -31,25 +33,27 @@ msgstr ""
 "트위터 계정� 연결합니다. 내 글� 트위터 친구들과 공유할 수 있고 반대로 할 수"
 "� 있습니다."
 
+#. TRANS: Fieldset legend.
 msgid "Twitter account"
 msgstr "트위터 계정"
 
+#. TRANS: Form note when a Twitter account has been connected.
 msgid "Connected Twitter account"
 msgstr "연결한 트위터 계정"
 
+#. TRANS: Fieldset legend.
 msgid "Disconnect my account from Twitter"
 msgstr "내 계정�서 트위터 연결� 해제합니다."
 
-msgid "Disconnecting your Twitter could make it impossible to log in! Please "
+#. TRANS: Form guide. %s is a URL to the password settings.
+#. TRANS: This message contains a Markdown link in the form [description](link).
+#, fuzzy, php-format
+msgid ""
+"Disconnecting your Twitter account could make it impossible to log in! "
+"Please [set a password](%s) first."
 msgstr "트위터 연결� 해제하면 로그�� 불가능해질 수 있습니다!"
 
-msgid "set a password"
-msgstr "비밀 번호를 설정하십시오"
-
-msgid " first."
-msgstr "."
-
-#. TRANS: %1$s is the current website name.
+#. TRANS: Form instructions. %1$s is the StatusNet sitename.
 #, php-format
 msgid ""
 "Keep your %1$s account but disconnect from Twitter. You can use your %1$s "
@@ -58,81 +62,166 @@ msgstr ""
 "내 %1$s 계정� 유지하지만 트위터�서 연결� 해제합니다. 로그�� %1$s 비밀 번"
 "호를 사용할 수 있습니다."
 
+#. TRANS: Button text for disconnecting a Twitter account.
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Disconnect"
 msgstr "연결 �기"
 
+#. TRANS: Fieldset legend.
 msgid "Preferences"
 msgstr "기본 설정"
 
+#. TRANS: Checkbox label.
 msgid "Automatically send my notices to Twitter."
 msgstr "내 글� ��으로 트위터로 보내기"
 
+#. TRANS: Checkbox label.
 msgid "Send local \"@\" replies to Twitter."
 msgstr "로컬 \"@\" 답장� 트위터로 보내기."
 
+#. TRANS: Checkbox label.
 msgid "Subscribe to my Twitter friends here."
 msgstr "여기 있는 내 트위터 친구들� 구�."
 
+#. TRANS: Checkbox label.
 msgid "Import my friends timeline."
 msgstr "내 친구 타임�� 가져오기."
 
+#. TRANS: Button text for saving Twitter integration settings.
+#. TRANS: Button text for saving the administrative Twitter bridge settings.
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Save"
 msgstr "저장"
 
+#. TRANS: Button text for adding Twitter integration.
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Add"
 msgstr "추가"
 
+#. TRANS: Client error displayed when the session token does not match or is not given.
 msgid "There was a problem with your session token. Try again, please."
 msgstr "세션 토�� 문제가 있습니다. 다시 시�해 보십시오."
 
+#. TRANS: Client error displayed when the submitted form contains unexpected data.
 msgid "Unexpected form submission."
 msgstr "예�치 못한 � 제출."
 
+#. TRANS: Client error displayed when trying to remove a connected Twitter account when there isn't one connected.
 msgid "No Twitter connection to remove."
 msgstr "제거할 트위터 연결� 없습니다."
 
-msgid "Couldn't remove Twitter user."
+#. TRANS: Server error displayed when trying to remove a connected Twitter account fails.
+#, fuzzy
+msgid "Could not remove Twitter user."
 msgstr "트위터 사용�를 제거할 수 없습니다."
 
+#. TRANS: Success message displayed after disconnecting a Twitter account.
 msgid "Twitter account disconnected."
 msgstr "트위터 계정 연결� �었습니다."
 
-msgid "Couldn't save Twitter preferences."
+#. TRANS: Server error displayed when saving Twitter integration preferences fails.
+#, fuzzy
+msgid "Could not save Twitter preferences."
 msgstr "트위터 기본 설정� 저장할 수 없습니다."
 
+#. TRANS: Success message after saving Twitter integration preferences.
 msgid "Twitter preferences saved."
 msgstr "트위터 기본 설정� 저장했습니다."
 
+#. TRANS: Form validation error displayed when the checkbox to agree to the license has not been checked.
 msgid "You cannot register if you do not agree to the license."
 msgstr "��선스� ��하지 않으면 가입할 수 없습니다."
 
+#. TRANS: Form validation error displayed when an unhandled error occurs.
 msgid "Something weird happened."
 msgstr "��한 �� 발�했습니다."
 
+#. TRANS: Server error displayed when linking to a Twitter account fails.
 msgid "Could not link your Twitter account."
 msgstr "트위터 계정� 연결할 수 없습니다."
 
-msgid "Couldn't link your Twitter account: oauth_token mismatch."
+#. TRANS: Server error displayed when linking to a Twitter account fails because of an incorrect oauth_token.
+#, fuzzy
+msgid "Could not link your Twitter account: oauth_token mismatch."
 msgstr "트위터 계정� 연결할 수 없습니다: oauth_token �치하지 않습니다."
 
-msgid "Couldn't link your Twitter account."
-msgstr "트위터 계정� 연결할 수 없습니다."
-
-#, php-format
+#. TRANS: Page instruction. %s is the StatusNet sitename.
+#, fuzzy, php-format
 msgid ""
-"This is the first time you've logged into %s so we must connect your Twitter "
-"account to a local account. You can either create a new account, or connect "
-"with your existing account, if you have one."
+"This is the first time you have logged into %s so we must connect your "
+"Twitter account to a local account. You can either create a new account, or "
+"connect with your existing account, if you have one."
 msgstr ""
 "처�으로 %s 사�트� 로그�했으므로 트위터를 로컬 계정� 연결해야 합니다. 새 "
 "계정� 만들거나, 계정� 있으면 기존 계정� 트위터� 연결할 수 있습니다."
 
+#. TRANS: Page title.
 msgid "Twitter Account Setup"
 msgstr "트위터 계정 준비"
 
+#. TRANS: Fieldset legend.
 msgid "Connection options"
 msgstr "연결 옵션"
 
+#. TRANS: Fieldset legend.
+msgid "Create new account"
+msgstr "새 계정 만들기"
+
+#. TRANS: Sub form introduction text.
+msgid "Create a new user with this nickname."
+msgstr "� �름으로 새 사용� 만들기"
+
+#. TRANS: Field label.
+msgid "New nickname"
+msgstr "새 �름"
+
+#. TRANS: Field title for nickname field.
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
+msgstr ""
+"1-64� 사�� �문 소문�, 숫�로만 �니다. 기호나 공백� 쓰면 안 �니다."
+
+#. TRANS: Field label.
+msgctxt "LABEL"
+msgid "Email"
+msgstr "메�"
+
+#. TRANS: Field title for e-mail address field.
+msgid "Used only for updates, announcements, and password recovery"
+msgstr "업��트, 공지 사항, 비밀번호 찾기�만 사용합니다."
+
+#. TRANS: Button text for creating a new StatusNet account in the Twitter connect page.
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Create"
+msgstr "만들기"
+
+#. TRANS: Fieldset legend.
+msgid "Connect existing account"
+msgstr "기존 계정� 연결"
+
+#. TRANS: Sub form introduction text.
+msgid ""
+"If you already have an account, login with your username and password to "
+"connect it to your Twitter account."
+msgstr "계정� 있으면, 아�디와 비밀 번호로 로그�해서 트위터� 연결하십시오."
+
+#. TRANS: Field label.
+msgid "Existing nickname"
+msgstr "기존 �름"
+
+#. TRANS: Field label.
+msgid "Password"
+msgstr "비밀 번호"
+
+#. TRANS: Fieldset legend.
+msgid "License"
+msgstr ""
+
+#. TRANS: Text for license agreement checkbox.
+#. TRANS: %s is the license as configured for the StatusNet site.
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
@@ -141,115 +230,116 @@ msgstr ""
 "내 글과 파�� %s 조건� 따릅니다. 다� 개� ��터는 제외합니다: 비밀 번호, "
 "메� 주소, 메신저 주소, 전화 번호."
 
-msgid "Create new account"
-msgstr "새 계정 만들기"
-
-msgid "Create a new user with this nickname."
-msgstr "� �름으로 새 사용� 만들기"
-
-msgid "New nickname"
-msgstr "새 �름"
-
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
-msgstr ""
-"1-64� 사�� �문 소문�, 숫�로만 �니다. 기호나 공백� 쓰면 안 �니다."
-
-msgctxt "LABEL"
-msgid "Email"
-msgstr "메�"
-
-msgid "Used only for updates, announcements, and password recovery"
-msgstr "업��트, 공지 사항, 비밀번호 찾기�만 사용합니다."
-
-msgid "Create"
-msgstr "만들기"
-
-msgid "Connect existing account"
-msgstr "기존 계정� 연결"
-
-msgid ""
-"If you already have an account, login with your username and password to "
-"connect it to your Twitter account."
-msgstr "계정� 있으면, 아�디와 비밀 번호로 로그�해서 트위터� 연결하십시오."
-
-msgid "Existing nickname"
-msgstr "기존 �름"
-
-msgid "Password"
-msgstr "비밀 번호"
-
+#. TRANS: Button text for connecting an existing StatusNet account in the Twitter connect page..
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Connect"
 msgstr "ì—°ê²°"
 
+#. TRANS: Client error displayed when trying to create a new user while creating new users is not allowed.
 msgid "Registration not allowed."
 msgstr "가입� 허용�지 않습니다."
 
+#. TRANS: Client error displayed when trying to create a new user with an invalid invitation code.
 msgid "Not a valid invitation code."
 msgstr "초대 코드가 잘못�었습니다."
 
+#. TRANS: Client error displayed when trying to create a new user with an invalid username.
 msgid "Nickname not allowed."
 msgstr "허용�지 않는 �름입니다."
 
+#. TRANS: Client error displayed when trying to create a new user with a username that is already in use.
 msgid "Nickname already in use. Try another one."
 msgstr "�름� �미 사용 중입니다. 다른 �름� 사용해 보십시오."
 
+#. TRANS: Server error displayed when creating a new user has failed.
 msgid "Error registering user."
 msgstr "사용� 등�� 오류."
 
+#. TRANS: Server error displayed when connecting a user to a Twitter user has failed.
+#. TRANS: Server error displayed connecting a user to a Twitter user has failed.
 msgid "Error connecting user to Twitter."
 msgstr "사용�를 트위터� 연결하는� 오류."
 
+#. TRANS: Form validation error displayed when connecting an existing user to a Twitter user fails because
+#. TRANS: the provided username and/or password are incorrect.
 msgid "Invalid username or password."
 msgstr "사용� �름�나 비밀 번호가 틀렸습니다."
 
+#. TRANS: Page title for Twitter administration panel.
+#, fuzzy
+msgctxt "TITLE"
 msgid "Twitter"
 msgstr "트위터"
 
+#. TRANS: Instructions for Twitter bridge administration page.
 msgid "Twitter bridge settings"
 msgstr "트위터 브리지 설정"
 
-msgid "Invalid consumer key. Max length is 255 characters."
+#. TRANS: Client error displayed when a consumer key is invalid because it is too long.
+#, fuzzy
+msgid "Invalid consumer key. Maximum length is 255 characters."
 msgstr "컨수머 키가 잘못�었습니다. 최대값� 255�입니다."
 
-msgid "Invalid consumer secret. Max length is 255 characters."
+#. TRANS: Client error displayed when a consumer secret is invalid because it is too long.
+#, fuzzy
+msgid "Invalid consumer secret. Maximum length is 255 characters."
 msgstr "컨수머 비밀값� 잘못�었습니다. 최대값� 255�입니다."
 
+#. TRANS: Fieldset legend for Twitter application settings.
 msgid "Twitter application settings"
 msgstr "트위터 �용 프로그램 설정"
 
+#. TRANS: Field label for Twitter assigned consumer key.
 msgid "Consumer key"
 msgstr "컨수머 키"
 
-msgid "Consumer key assigned by Twitter"
+#. TRANS: Field title for Twitter assigned consumer key.
+#, fuzzy
+msgid "The consumer key assigned by Twitter."
 msgstr "트위터가 할당한 컨수머 키"
 
+#. TRANS: Field label for Twitter assigned consumer secret.
 msgid "Consumer secret"
 msgstr "컨수머 비밀 값"
 
-msgid "Consumer secret assigned by Twitter"
+#. TRANS: Field title for Twitter assigned consumer secret.
+#, fuzzy
+msgid "The consumer secret assigned by Twitter."
 msgstr "트위터가 할당한 컨수머 비밀 값"
 
-msgid "Note: a global consumer key and secret are set."
+#. TRANS: Form guide displayed when two required fields have already been provided.
+#, fuzzy
+msgid "Note: A global consumer key and secret are set."
 msgstr "참고: 전체 컨수머 키와 비밀값� 설정했습니다."
 
+#. TRANS: Field label for Twitter application name.
 msgid "Integration source"
 msgstr "통합 소스"
 
-msgid "Name of your Twitter application"
+#. TRANS: Field title for Twitter application name.
+#, fuzzy
+msgid "The name of your Twitter application."
 msgstr "내 트위터 �용 프로그램� �름"
 
+#. TRANS: Fieldset legend for Twitter integration options.
 msgid "Options"
 msgstr "설정"
 
+#. TRANS: Checkbox label for global setting.
 msgid "Enable \"Sign-in with Twitter\""
 msgstr "\"트위터로 로그�\" 사용"
 
-msgid "Allow users to login with their Twitter credentials"
+#. TRANS: Checkbox title.
+#, fuzzy
+msgid "This allow users to login with their Twitter credentials."
 msgstr "사용�가 트위터 로그�� 통해 로그�하�� 허용"
 
+#. TRANS: Checkbox label for global setting.
 msgid "Enable Twitter import"
 msgstr "트위터 가져오기 사용"
 
+#. TRANS: Checkbox title for global setting.
 msgid ""
 "Allow users to import their Twitter friends' timelines. Requires daemons to "
 "be manually configured."
@@ -257,18 +347,69 @@ msgstr ""
 "사용�가 트위터 친구� 타임��� 가져오�� 허용합니다. �몬� 수�으로 설정"
 "해야 합니다."
 
-msgid "Save Twitter settings"
-msgstr "트위터 설정 저장"
+#. TRANS: Button title for saving the administrative Twitter bridge settings.
+#, fuzzy
+msgid "Save the Twitter bridge settings."
+msgstr "트위터 브리지 설정"
 
-msgid "Login or register using Twitter"
+#. TRANS: Server exception thrown when an invalid URL scheme is detected.
+msgid "Invalid URL scheme for HTTP stream reader."
+msgstr ""
+
+#. TRANS: Exception thrown when input from an inexpected socket is encountered.
+msgid "Got input from unexpected socket!"
+msgstr ""
+
+#. TRANS: Exception thrown when an invalid state is encountered in handleLine.
+#. TRANS: %s is the invalid state.
+#, php-format
+msgid "Invalid state in handleLine: %s."
+msgstr ""
+
+#. TRANS: Exception thrown when an invalid response line is encountered.
+#. TRANS: %s is the invalid line.
+#, php-format
+msgid "Invalid HTTP response line: %s."
+msgstr ""
+
+#. TRANS: Exception thrown when an invalid response line part is encountered.
+#. TRANS: %1$s is the chunk, %2$s is the line.
+#, php-format
+msgid "Invalid HTTP response line chunk \"%1$s\": %2$s."
+msgstr ""
+
+#. TRANS: Exception thrown when an invalid response code is encountered.
+#. TRANS: %1$s is the response code, %2$s is the line.
+#, php-format
+msgid "Bad HTTP response code %1$s: %2$s."
+msgstr ""
+
+#. TRANS: Menu item in login navigation.
+#. TRANS: Menu item in connection settings navigation.
+#, fuzzy
+msgctxt "MENU"
+msgid "Twitter"
+msgstr "트위터"
+
+#. TRANS: Title for menu item in login navigation.
+#, fuzzy
+msgid "Login or register using Twitter."
 msgstr "트위터를 사용해 로그� �는 가입"
 
+#. TRANS: Title for menu item in connection settings navigation.
 msgid "Twitter integration options"
 msgstr "트위터 통합 옵션"
 
-msgid "Twitter bridge configuration"
+#. TRANS: Menu item in administrative panel that leads to the Twitter bridge configuration.
+msgid "Twitter"
+msgstr "트위터"
+
+#. TRANS: Menu item title in administrative panel that leads to the Twitter bridge configuration.
+#, fuzzy
+msgid "Twitter bridge configuration page."
 msgstr "트위터 브릿지 설정"
 
+#. TRANS: Plugin description.
 msgid ""
 "The Twitter \"bridge\" plugin allows integration of a StatusNet instance "
 "with <a href=\"http://twitter.com/\">Twitter</a>."
@@ -276,15 +417,21 @@ msgstr ""
 "트위터 \"브릿지\" 플러그�� 통해 StatusNet �스턴스를 <a href=\"http://"
 "twitter.com/\">트위터</a>와 연결할 수 있습니다."
 
+#. TRANS: Client error displayed when trying to log in using Twitter while already logged in to StatusNet.
 msgid "Already logged in."
 msgstr "�미 로그�헀습니다."
 
+#. TRANS: Title for login using Twitter page.
+#, fuzzy
+msgctxt "TITLE"
 msgid "Twitter Login"
 msgstr "트위터 로그�"
 
+#. TRANS: Instructions for login using Twitter page.
 msgid "Login with your Twitter account"
 msgstr "트위터 계정으로 로그�"
 
+#. TRANS: Alternative text for "sign in with Twitter" image.
 msgid "Sign in with Twitter"
 msgstr "트위터로 로그�"
 
diff --git a/plugins/TwitterBridge/locale/mk/LC_MESSAGES/TwitterBridge.po b/plugins/TwitterBridge/locale/mk/LC_MESSAGES/TwitterBridge.po
index 3ed5a0b8eb..87aa6ff6ed 100644
--- a/plugins/TwitterBridge/locale/mk/LC_MESSAGES/TwitterBridge.po
+++ b/plugins/TwitterBridge/locale/mk/LC_MESSAGES/TwitterBridge.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - TwitterBridge to Macedonian (Македон�ки)
+# Translation of StatusNet - TwitterBridge to Macedonian (македон�ки)
 # Exported from translatewiki.net
 #
 # Author: Bjankuloski06
@@ -9,21 +9,23 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TwitterBridge\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:45+0000\n"
-"Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:22+0000\n"
+"Language-Team: Macedonian <https://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:29+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-12-03 13:51:38+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-twitterbridge\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
 
+#. TRANS: Title for page with Twitter integration settings.
 msgid "Twitter settings"
 msgstr "�агодувања за Twitter"
 
+#. TRANS: Instructions for page with Twitter integration settings.
 msgid ""
 "Connect your Twitter account to share your updates with your Twitter friends "
 "and vice-versa."
@@ -31,27 +33,29 @@ msgstr ""
 "Поврзете ја Вашата �метка на Twitter за да ги �поделувате подновувањата �о "
 "Вашите пријатели на Twitter и обратно."
 
+#. TRANS: Fieldset legend.
 msgid "Twitter account"
 msgstr "Сметка на Twitter"
 
+#. TRANS: Form note when a Twitter account has been connected.
 msgid "Connected Twitter account"
 msgstr "Поврзана �метка на Twitter"
 
+#. TRANS: Fieldset legend.
 msgid "Disconnect my account from Twitter"
 msgstr "Прекини ја вр�ката �о �метката на Twitter"
 
-msgid "Disconnecting your Twitter could make it impossible to log in! Please "
+#. TRANS: Form guide. %s is a URL to the password settings.
+#. TRANS: This message contains a Markdown link in the form [description](link).
+#, php-format
+msgid ""
+"Disconnecting your Twitter account could make it impossible to log in! "
+"Please [set a password](%s) first."
 msgstr ""
 "�ко ја прекинете вр�ката �о �метката на Twitter, нема да можете да �е "
-"најавите! Затоа "
+"најавувате! �ајпрвин [�тавете лозинка](%s)."
 
-msgid "set a password"
-msgstr "�тавете лозинка"
-
-msgid " first."
-msgstr "пред да продолжите."
-
-#. TRANS: %1$s is the current website name.
+#. TRANS: Form instructions. %1$s is the StatusNet sitename.
 #, php-format
 msgid ""
 "Keep your %1$s account but disconnect from Twitter. You can use your %1$s "
@@ -60,84 +64,163 @@ msgstr ""
 "Задржете �и ја �метката на %1$s, но прекинете ја вр�ката �о Twitter. За "
 "најава, кори�тете ја Вашата лозинка на %1$s."
 
+#. TRANS: Button text for disconnecting a Twitter account.
+msgctxt "BUTTON"
 msgid "Disconnect"
-msgstr "Прекини"
+msgstr "Прекрати"
 
+#. TRANS: Fieldset legend.
 msgid "Preferences"
 msgstr "�агодувања"
 
+#. TRANS: Checkbox label.
 msgid "Automatically send my notices to Twitter."
 msgstr "�втомат�ки и�праќај ми ги забелешките на Twitter."
 
+#. TRANS: Checkbox label.
 msgid "Send local \"@\" replies to Twitter."
 msgstr "И�праќај локални „@“ одговори на Twitter."
 
+#. TRANS: Checkbox label.
 msgid "Subscribe to my Twitter friends here."
 msgstr "Претплатете �е на пријателите од Twitter тука."
 
+#. TRANS: Checkbox label.
 msgid "Import my friends timeline."
 msgstr "Увези ја хронологијата на моите пријатели."
 
+#. TRANS: Button text for saving Twitter integration settings.
+#. TRANS: Button text for saving the administrative Twitter bridge settings.
+msgctxt "BUTTON"
 msgid "Save"
 msgstr "Зачувај"
 
+#. TRANS: Button text for adding Twitter integration.
+msgctxt "BUTTON"
 msgid "Add"
 msgstr "Додај"
 
+#. TRANS: Client error displayed when the session token does not match or is not given.
 msgid "There was a problem with your session token. Try again, please."
 msgstr "Се појави проблем �о жетонот на Вашата �е�ија. Обидете �е повторно."
 
+#. TRANS: Client error displayed when the submitted form contains unexpected data.
 msgid "Unexpected form submission."
 msgstr "�еочекувано подне�ување на образец."
 
+#. TRANS: Client error displayed when trying to remove a connected Twitter account when there isn't one connected.
 msgid "No Twitter connection to remove."
 msgstr "�ема вр�ка �о Twitter за от�транување."
 
-msgid "Couldn't remove Twitter user."
-msgstr "�е можев да го от�транам кори�никот на Twitter."
+#. TRANS: Server error displayed when trying to remove a connected Twitter account fails.
+msgid "Could not remove Twitter user."
+msgstr "�е можев да го от�транам кори�никот од Twitter."
 
+#. TRANS: Success message displayed after disconnecting a Twitter account.
 msgid "Twitter account disconnected."
 msgstr "Вр�ката �о �метката на Twitter е прекината."
 
-msgid "Couldn't save Twitter preferences."
+#. TRANS: Server error displayed when saving Twitter integration preferences fails.
+msgid "Could not save Twitter preferences."
 msgstr "�е можев да ги зачувам нагодувањата за Twitter."
 
+#. TRANS: Success message after saving Twitter integration preferences.
 msgid "Twitter preferences saved."
 msgstr "�агодувањата за Twitter �е зачувани."
 
+#. TRANS: Form validation error displayed when the checkbox to agree to the license has not been checked.
 msgid "You cannot register if you do not agree to the license."
 msgstr "�е можете да �е реги�трирате ако не �е �огла�увате �о лиценцата."
 
+#. TRANS: Form validation error displayed when an unhandled error occurs.
 msgid "Something weird happened."
 msgstr "Се �лучи нешто чудно."
 
+#. TRANS: Server error displayed when linking to a Twitter account fails.
 msgid "Could not link your Twitter account."
 msgstr "�е можам да ја поврзам Вашата �метка на Twitter."
 
-msgid "Couldn't link your Twitter account: oauth_token mismatch."
+#. TRANS: Server error displayed when linking to a Twitter account fails because of an incorrect oauth_token.
+msgid "Could not link your Twitter account: oauth_token mismatch."
 msgstr ""
 "�е можев да ја поврзам Вашата �метка на Twitter: не�огла�ување �о "
 "oauth_token."
 
-msgid "Couldn't link your Twitter account."
-msgstr "�е можам да ја поврзам Вашата �метка на Twitter."
-
+#. TRANS: Page instruction. %s is the StatusNet sitename.
 #, php-format
 msgid ""
-"This is the first time you've logged into %s so we must connect your Twitter "
-"account to a local account. You can either create a new account, or connect "
-"with your existing account, if you have one."
+"This is the first time you have logged into %s so we must connect your "
+"Twitter account to a local account. You can either create a new account, or "
+"connect with your existing account, if you have one."
 msgstr ""
 "Ова е прв пат како �е најавувате на %s, па затоа мораме да ја поврземе "
 "Вашата �метка на Twitter �о локална �метка. Можете да �оздадете нова �метка, "
-"или пак да �е поврзете �о Вашата по�тоечка �метка (ако ја имате)."
+"или пак да �е поврзете �о по�тоечката (ако ја имате)."
 
+#. TRANS: Page title.
 msgid "Twitter Account Setup"
 msgstr "По�тавки за �метката на Twitter"
 
+#. TRANS: Fieldset legend.
 msgid "Connection options"
 msgstr "�агодувања за вр�ка"
 
+#. TRANS: Fieldset legend.
+msgid "Create new account"
+msgstr "Создај нова �метка"
+
+#. TRANS: Sub form introduction text.
+msgid "Create a new user with this nickname."
+msgstr "Создај нов кори�ник �о овој прекар."
+
+#. TRANS: Field label.
+msgid "New nickname"
+msgstr "�ов прекар"
+
+#. TRANS: Field title for nickname field.
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
+msgstr "1-64 мали букви или бројки, без интерпункци�ки знаци и празни ме�та."
+
+#. TRANS: Field label.
+msgctxt "LABEL"
+msgid "Email"
+msgstr "Е-пошта"
+
+#. TRANS: Field title for e-mail address field.
+msgid "Used only for updates, announcements, and password recovery"
+msgstr "Се кори�ти �амо за подновувања, објави и повраќање на лозинка."
+
+#. TRANS: Button text for creating a new StatusNet account in the Twitter connect page.
+msgctxt "BUTTON"
+msgid "Create"
+msgstr "Создај"
+
+#. TRANS: Fieldset legend.
+msgid "Connect existing account"
+msgstr "Поврзи по�тоечка �метка"
+
+#. TRANS: Sub form introduction text.
+msgid ""
+"If you already have an account, login with your username and password to "
+"connect it to your Twitter account."
+msgstr ""
+"�ко веќе имате �метка, најавете �е �о кори�ничкото име и лозинката за да ја "
+"поврзете �о профилот на Twitter."
+
+#. TRANS: Field label.
+msgid "Existing nickname"
+msgstr "По�тоечки прекар"
+
+#. TRANS: Field label.
+msgid "Password"
+msgstr "Лозинка"
+
+#. TRANS: Fieldset legend.
+msgid "License"
+msgstr "Лиценца"
+
+#. TRANS: Text for license agreement checkbox.
+#. TRANS: %s is the license as configured for the StatusNet site.
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
@@ -146,117 +229,110 @@ msgstr ""
 "Мојот тек�т и податотеки �е до�тапни под %s, о�вен �ледниве приватни "
 "податоци: лозинка, е-пошта, �П-адре�а и телефон�ки број."
 
-msgid "Create new account"
-msgstr "Создај нова �метка"
-
-msgid "Create a new user with this nickname."
-msgstr "Создај нов кори�ник �о овој прекар."
-
-msgid "New nickname"
-msgstr "�ов прекар"
-
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
-msgstr "1-64 мали букви или бројки, без интерпункци�ки знаци и празни ме�та."
-
-msgctxt "LABEL"
-msgid "Email"
-msgstr "Е-пошта"
-
-msgid "Used only for updates, announcements, and password recovery"
-msgstr "Се кори�ти �амо за подновувања, објави и повраќање на лозинка."
-
-msgid "Create"
-msgstr "Создај"
-
-msgid "Connect existing account"
-msgstr "Поврзи по�тоечка �метка"
-
-msgid ""
-"If you already have an account, login with your username and password to "
-"connect it to your Twitter account."
-msgstr ""
-"�ко веќе имате �метка, најавете �е �о кори�ничкото име и лозинката за да ја "
-"поврзете �о профилот на Twitter."
-
-msgid "Existing nickname"
-msgstr "По�тоечки прекар"
-
-msgid "Password"
-msgstr "Лозинка"
-
+#. TRANS: Button text for connecting an existing StatusNet account in the Twitter connect page..
+msgctxt "BUTTON"
 msgid "Connect"
 msgstr "Поврзи �е"
 
+#. TRANS: Client error displayed when trying to create a new user while creating new users is not allowed.
 msgid "Registration not allowed."
 msgstr "Реги�трацијата не е дозволена."
 
+#. TRANS: Client error displayed when trying to create a new user with an invalid invitation code.
 msgid "Not a valid invitation code."
 msgstr "Ова не е важечки код за покана."
 
+#. TRANS: Client error displayed when trying to create a new user with an invalid username.
 msgid "Nickname not allowed."
 msgstr "Прекарот не е дозволен."
 
+#. TRANS: Client error displayed when trying to create a new user with a username that is already in use.
 msgid "Nickname already in use. Try another one."
 msgstr "Прекарот е зафатен. Одберете друг."
 
+#. TRANS: Server error displayed when creating a new user has failed.
 msgid "Error registering user."
 msgstr "Грешка при реги�трирање на кори�никот."
 
+#. TRANS: Server error displayed when connecting a user to a Twitter user has failed.
+#. TRANS: Server error displayed connecting a user to a Twitter user has failed.
 msgid "Error connecting user to Twitter."
 msgstr "Грешка при поврзувањето на кори�никот �о Twitter."
 
+#. TRANS: Form validation error displayed when connecting an existing user to a Twitter user fails because
+#. TRANS: the provided username and/or password are incorrect.
 msgid "Invalid username or password."
 msgstr "�еважечко кори�ничко име или лозинка."
 
+#. TRANS: Page title for Twitter administration panel.
+msgctxt "TITLE"
 msgid "Twitter"
 msgstr "Twitter"
 
+#. TRANS: Instructions for Twitter bridge administration page.
 msgid "Twitter bridge settings"
 msgstr "По�тавки за мо�тот до Twitter"
 
-msgid "Invalid consumer key. Max length is 255 characters."
+#. TRANS: Client error displayed when a consumer key is invalid because it is too long.
+msgid "Invalid consumer key. Maximum length is 255 characters."
 msgstr "�еважечки потрошувачки клуч. Дозволени �е највеќе 255 знаци."
 
-msgid "Invalid consumer secret. Max length is 255 characters."
+#. TRANS: Client error displayed when a consumer secret is invalid because it is too long.
+msgid "Invalid consumer secret. Maximum length is 255 characters."
 msgstr "�еважечка потрошувачка тајна. Дозволени �е највеќе 255 знаци."
 
+#. TRANS: Fieldset legend for Twitter application settings.
 msgid "Twitter application settings"
 msgstr "�агодувања на програмчето за Twitter"
 
+#. TRANS: Field label for Twitter assigned consumer key.
 msgid "Consumer key"
 msgstr "Потрошувачки клуч"
 
-msgid "Consumer key assigned by Twitter"
-msgstr "Потрошувачкиот клуч доделен од Twitter"
+#. TRANS: Field title for Twitter assigned consumer key.
+msgid "The consumer key assigned by Twitter."
+msgstr "Потрошувачкиот клуч доделен од Twitter."
 
+#. TRANS: Field label for Twitter assigned consumer secret.
 msgid "Consumer secret"
 msgstr "Потрошувачка тајна"
 
-msgid "Consumer secret assigned by Twitter"
-msgstr "Потрошувачката тајна доделена од Twitter"
+#. TRANS: Field title for Twitter assigned consumer secret.
+msgid "The consumer secret assigned by Twitter."
+msgstr "Потрошувачката тајна доделена од Twitter."
 
-msgid "Note: a global consumer key and secret are set."
-msgstr "�апомена: по�тавени �е глобални потрошувачки клуч и тајна."
+#. TRANS: Form guide displayed when two required fields have already been provided.
+msgid "Note: A global consumer key and secret are set."
+msgstr ""
+"�апомена: По�тавени �е е глобален потрошувачки клуч и потрошувачка тајна."
 
+#. TRANS: Field label for Twitter application name.
 msgid "Integration source"
 msgstr "Извор на �оединување"
 
-msgid "Name of your Twitter application"
-msgstr "Име на Вашето програмче за Twitter"
+#. TRANS: Field title for Twitter application name.
+msgid "The name of your Twitter application."
+msgstr "Име на Вашето програмче за Twitter."
 
+#. TRANS: Fieldset legend for Twitter integration options.
 msgid "Options"
 msgstr "По�тавки"
 
+#. TRANS: Checkbox label for global setting.
 msgid "Enable \"Sign-in with Twitter\""
 msgstr "Овозможи „најава �о Twitter“"
 
-msgid "Allow users to login with their Twitter credentials"
+#. TRANS: Checkbox title.
+msgid "This allow users to login with their Twitter credentials."
 msgstr ""
-"Им овозможува на кори�ниците да �е најавуваат �о нивните податоци од Twitter"
+"Ова им овозможува на кори�ниците да �е најавуваат �о нивните податоци од "
+"Twitter."
 
+#. TRANS: Checkbox label for global setting.
 msgid "Enable Twitter import"
 msgstr "Овозможу увоз од Twitter"
 
+#. TRANS: Checkbox title for global setting.
 msgid ""
 "Allow users to import their Twitter friends' timelines. Requires daemons to "
 "be manually configured."
@@ -264,18 +340,65 @@ msgstr ""
 "Им овозможува на кори�ниците да ги увезуваат хронологиите на нивните "
 "пријатели на Twitter. Бара рачно нагодување на демоните."
 
-msgid "Save Twitter settings"
-msgstr "Зачувај нагодувања на Twitter"
+#. TRANS: Button title for saving the administrative Twitter bridge settings.
+msgid "Save the Twitter bridge settings."
+msgstr "Зачувај ги по�тавките за мо�тот до Twitter."
 
-msgid "Login or register using Twitter"
-msgstr "�ајава или реги�трација �о Twitter"
+#. TRANS: Server exception thrown when an invalid URL scheme is detected.
+msgid "Invalid URL scheme for HTTP stream reader."
+msgstr "�еважечка URL-шема за читачот на HTTP-каналот."
 
+#. TRANS: Exception thrown when input from an inexpected socket is encountered.
+msgid "Got input from unexpected socket!"
+msgstr "Добив влезни податоци од неочекуван извор!"
+
+#. TRANS: Exception thrown when an invalid state is encountered in handleLine.
+#. TRANS: %s is the invalid state.
+#, php-format
+msgid "Invalid state in handleLine: %s."
+msgstr "�еважечка �о�тојба во handleLine: %s."
+
+#. TRANS: Exception thrown when an invalid response line is encountered.
+#. TRANS: %s is the invalid line.
+#, php-format
+msgid "Invalid HTTP response line: %s."
+msgstr "�еважечки ред во одговорот �о HTTP: %s."
+
+#. TRANS: Exception thrown when an invalid response line part is encountered.
+#. TRANS: %1$s is the chunk, %2$s is the line.
+#, php-format
+msgid "Invalid HTTP response line chunk \"%1$s\": %2$s."
+msgstr "�еважечко парче „%1$s“ од редот во одговорот �о HTTP: %2$s."
+
+#. TRANS: Exception thrown when an invalid response code is encountered.
+#. TRANS: %1$s is the response code, %2$s is the line.
+#, php-format
+msgid "Bad HTTP response code %1$s: %2$s."
+msgstr "�еправилен код %1$s на одговорот �о HTTP: %2$s."
+
+#. TRANS: Menu item in login navigation.
+#. TRANS: Menu item in connection settings navigation.
+msgctxt "MENU"
+msgid "Twitter"
+msgstr "Twitter"
+
+#. TRANS: Title for menu item in login navigation.
+msgid "Login or register using Twitter."
+msgstr "�ајава или реги�трација �о Twitter."
+
+#. TRANS: Title for menu item in connection settings navigation.
 msgid "Twitter integration options"
 msgstr "�агодувања за обединување �о Twitter"
 
-msgid "Twitter bridge configuration"
-msgstr "�агодувања за мо�тот до Twitter"
+#. TRANS: Menu item in administrative panel that leads to the Twitter bridge configuration.
+msgid "Twitter"
+msgstr "Twitter"
 
+#. TRANS: Menu item title in administrative panel that leads to the Twitter bridge configuration.
+msgid "Twitter bridge configuration page."
+msgstr "�агодувања за мо�тот до Twitter."
+
+#. TRANS: Plugin description.
 msgid ""
 "The Twitter \"bridge\" plugin allows integration of a StatusNet instance "
 "with <a href=\"http://twitter.com/\">Twitter</a>."
@@ -283,15 +406,20 @@ msgstr ""
 "Приклучокот за „мо�т“ до Twitter овозможува �оединување на примерок на "
 "StatusNet �о <a href=\"http://twitter.com/\">Twitter</a>."
 
+#. TRANS: Client error displayed when trying to log in using Twitter while already logged in to StatusNet.
 msgid "Already logged in."
 msgstr "Веќе �те најавени."
 
+#. TRANS: Title for login using Twitter page.
+msgctxt "TITLE"
 msgid "Twitter Login"
 msgstr "�ајава �о Twitter"
 
+#. TRANS: Instructions for login using Twitter page.
 msgid "Login with your Twitter account"
 msgstr "�ајава �о Вашата �метка од Twitter"
 
+#. TRANS: Alternative text for "sign in with Twitter" image.
 msgid "Sign in with Twitter"
 msgstr "�ајава �о Twitter"
 
diff --git a/plugins/TwitterBridge/locale/ms/LC_MESSAGES/TwitterBridge.po b/plugins/TwitterBridge/locale/ms/LC_MESSAGES/TwitterBridge.po
index 2d97251097..10066369d6 100644
--- a/plugins/TwitterBridge/locale/ms/LC_MESSAGES/TwitterBridge.po
+++ b/plugins/TwitterBridge/locale/ms/LC_MESSAGES/TwitterBridge.po
@@ -9,21 +9,23 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TwitterBridge\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:45+0000\n"
-"Language-Team: Malay <http://translatewiki.net/wiki/Portal:ms>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:22+0000\n"
+"Language-Team: Malay <https://translatewiki.net/wiki/Portal:ms>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:29+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-12-03 13:51:38+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ms\n"
 "X-Message-Group: #out-statusnet-plugin-twitterbridge\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#. TRANS: Title for page with Twitter integration settings.
 msgid "Twitter settings"
 msgstr "Tetapan Twitter"
 
+#. TRANS: Instructions for page with Twitter integration settings.
 msgid ""
 "Connect your Twitter account to share your updates with your Twitter friends "
 "and vice-versa."
@@ -31,219 +33,307 @@ msgstr ""
 "Sambungkan akaun Twitter anda untuk berkongsi kemaskini dengan rakan-rakan "
 "Twitter anda."
 
+#. TRANS: Fieldset legend.
 msgid "Twitter account"
 msgstr "Akaun Twitter"
 
+#. TRANS: Form note when a Twitter account has been connected.
 msgid "Connected Twitter account"
 msgstr "Akaun Twitter disambungkan"
 
+#. TRANS: Fieldset legend.
 msgid "Disconnect my account from Twitter"
 msgstr "Putuskan akaun saya dari Twitter"
 
-msgid "Disconnecting your Twitter could make it impossible to log in! Please "
+#. TRANS: Form guide. %s is a URL to the password settings.
+#. TRANS: This message contains a Markdown link in the form [description](link).
+#, fuzzy, php-format
+msgid ""
+"Disconnecting your Twitter account could make it impossible to log in! "
+"Please [set a password](%s) first."
 msgstr "Jika Twitter anda diputuskan, mungkin tak boleh log masuk! Tolong "
 
-msgid "set a password"
-msgstr "tetapkan kata laluan"
-
-msgid " first."
-msgstr " terlebih dahulu."
-
-#. TRANS: %1$s is the current website name.
+#. TRANS: Form instructions. %1$s is the StatusNet sitename.
 #, php-format
 msgid ""
 "Keep your %1$s account but disconnect from Twitter. You can use your %1$s "
 "password to log in."
 msgstr ""
 
+#. TRANS: Button text for disconnecting a Twitter account.
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Disconnect"
 msgstr "Putuskan"
 
+#. TRANS: Fieldset legend.
 msgid "Preferences"
 msgstr "Keutamaan"
 
+#. TRANS: Checkbox label.
 msgid "Automatically send my notices to Twitter."
 msgstr "Hantarkan notis saya secara automatik ke Twitter."
 
+#. TRANS: Checkbox label.
 msgid "Send local \"@\" replies to Twitter."
 msgstr "Hantarkan balasan \"@\" setempat ke Twitter."
 
+#. TRANS: Checkbox label.
 msgid "Subscribe to my Twitter friends here."
 msgstr "Langgan kawan-kawan Twitter saya di sini."
 
+#. TRANS: Checkbox label.
 msgid "Import my friends timeline."
 msgstr "Import garis masa kawan-kawan saya."
 
+#. TRANS: Button text for saving Twitter integration settings.
+#. TRANS: Button text for saving the administrative Twitter bridge settings.
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Save"
 msgstr "Simpan"
 
+#. TRANS: Button text for adding Twitter integration.
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Add"
 msgstr "Tambahkan"
 
+#. TRANS: Client error displayed when the session token does not match or is not given.
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 
+#. TRANS: Client error displayed when the submitted form contains unexpected data.
 msgid "Unexpected form submission."
 msgstr ""
 
+#. TRANS: Client error displayed when trying to remove a connected Twitter account when there isn't one connected.
 msgid "No Twitter connection to remove."
 msgstr "Tiada sambungan Twitter untuk digugurkan."
 
-msgid "Couldn't remove Twitter user."
+#. TRANS: Server error displayed when trying to remove a connected Twitter account fails.
+#, fuzzy
+msgid "Could not remove Twitter user."
 msgstr "Pengguna Twitter tidak dapat digugurkan."
 
+#. TRANS: Success message displayed after disconnecting a Twitter account.
 msgid "Twitter account disconnected."
 msgstr ""
 
-msgid "Couldn't save Twitter preferences."
-msgstr ""
+#. TRANS: Server error displayed when saving Twitter integration preferences fails.
+#, fuzzy
+msgid "Could not save Twitter preferences."
+msgstr "Pengguna Twitter tidak dapat digugurkan."
 
+#. TRANS: Success message after saving Twitter integration preferences.
 msgid "Twitter preferences saved."
 msgstr ""
 
+#. TRANS: Form validation error displayed when the checkbox to agree to the license has not been checked.
 msgid "You cannot register if you do not agree to the license."
 msgstr ""
 
+#. TRANS: Form validation error displayed when an unhandled error occurs.
 msgid "Something weird happened."
 msgstr ""
 
+#. TRANS: Server error displayed when linking to a Twitter account fails.
 #, fuzzy
 msgid "Could not link your Twitter account."
 msgstr "Log masuk dengan akaun Twitter anda"
 
-msgid "Couldn't link your Twitter account: oauth_token mismatch."
-msgstr ""
-
-msgid "Couldn't link your Twitter account."
-msgstr ""
+#. TRANS: Server error displayed when linking to a Twitter account fails because of an incorrect oauth_token.
+#, fuzzy
+msgid "Could not link your Twitter account: oauth_token mismatch."
+msgstr "Log masuk dengan akaun Twitter anda"
 
+#. TRANS: Page instruction. %s is the StatusNet sitename.
 #, php-format
 msgid ""
-"This is the first time you've logged into %s so we must connect your Twitter "
-"account to a local account. You can either create a new account, or connect "
-"with your existing account, if you have one."
+"This is the first time you have logged into %s so we must connect your "
+"Twitter account to a local account. You can either create a new account, or "
+"connect with your existing account, if you have one."
 msgstr ""
 
+#. TRANS: Page title.
 msgid "Twitter Account Setup"
 msgstr "Persediaan Akaun Twitter"
 
+#. TRANS: Fieldset legend.
 msgid "Connection options"
 msgstr "Opsyen sambungan"
 
+#. TRANS: Fieldset legend.
+msgid "Create new account"
+msgstr "Buka akaun baru"
+
+#. TRANS: Sub form introduction text.
+msgid "Create a new user with this nickname."
+msgstr ""
+
+#. TRANS: Field label.
+msgid "New nickname"
+msgstr ""
+
+#. TRANS: Field title for nickname field.
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
+msgstr ""
+
+#. TRANS: Field label.
+msgctxt "LABEL"
+msgid "Email"
+msgstr "E-mel"
+
+#. TRANS: Field title for e-mail address field.
+msgid "Used only for updates, announcements, and password recovery"
+msgstr ""
+
+#. TRANS: Button text for creating a new StatusNet account in the Twitter connect page.
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Create"
+msgstr "Cipta"
+
+#. TRANS: Fieldset legend.
+msgid "Connect existing account"
+msgstr "Sambungkan akaun yang sedia ada"
+
+#. TRANS: Sub form introduction text.
+msgid ""
+"If you already have an account, login with your username and password to "
+"connect it to your Twitter account."
+msgstr ""
+
+#. TRANS: Field label.
+msgid "Existing nickname"
+msgstr ""
+
+#. TRANS: Field label.
+msgid "Password"
+msgstr ""
+
+#. TRANS: Fieldset legend.
+msgid "License"
+msgstr ""
+
+#. TRANS: Text for license agreement checkbox.
+#. TRANS: %s is the license as configured for the StatusNet site.
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
 "email address, IM address, and phone number."
 msgstr ""
 
-msgid "Create new account"
-msgstr "Buka akaun baru"
-
-msgid "Create a new user with this nickname."
-msgstr ""
-
-msgid "New nickname"
-msgstr ""
-
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
-msgstr ""
-
-msgctxt "LABEL"
-msgid "Email"
-msgstr "E-mel"
-
-msgid "Used only for updates, announcements, and password recovery"
-msgstr ""
-
-msgid "Create"
-msgstr "Cipta"
-
-msgid "Connect existing account"
-msgstr "Sambungkan akaun yang sedia ada"
-
-msgid ""
-"If you already have an account, login with your username and password to "
-"connect it to your Twitter account."
-msgstr ""
-
-msgid "Existing nickname"
-msgstr ""
-
-msgid "Password"
-msgstr ""
-
+#. TRANS: Button text for connecting an existing StatusNet account in the Twitter connect page..
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Connect"
-msgstr ""
+msgstr "Putuskan"
 
+#. TRANS: Client error displayed when trying to create a new user while creating new users is not allowed.
 msgid "Registration not allowed."
 msgstr ""
 
+#. TRANS: Client error displayed when trying to create a new user with an invalid invitation code.
 msgid "Not a valid invitation code."
 msgstr ""
 
+#. TRANS: Client error displayed when trying to create a new user with an invalid username.
 msgid "Nickname not allowed."
 msgstr ""
 
+#. TRANS: Client error displayed when trying to create a new user with a username that is already in use.
 msgid "Nickname already in use. Try another one."
 msgstr ""
 
+#. TRANS: Server error displayed when creating a new user has failed.
 msgid "Error registering user."
 msgstr ""
 
+#. TRANS: Server error displayed when connecting a user to a Twitter user has failed.
+#. TRANS: Server error displayed connecting a user to a Twitter user has failed.
 msgid "Error connecting user to Twitter."
 msgstr ""
 
+#. TRANS: Form validation error displayed when connecting an existing user to a Twitter user fails because
+#. TRANS: the provided username and/or password are incorrect.
 msgid "Invalid username or password."
 msgstr ""
 
+#. TRANS: Page title for Twitter administration panel.
+#, fuzzy
+msgctxt "TITLE"
 msgid "Twitter"
 msgstr "Twitter"
 
+#. TRANS: Instructions for Twitter bridge administration page.
 msgid "Twitter bridge settings"
 msgstr "Tetapan pengantara Twitter"
 
-msgid "Invalid consumer key. Max length is 255 characters."
+#. TRANS: Client error displayed when a consumer key is invalid because it is too long.
+#, fuzzy
+msgid "Invalid consumer key. Maximum length is 255 characters."
 msgstr "Kunci pengguna tidak sah. Panjang maksimum 255 aksara."
 
-msgid "Invalid consumer secret. Max length is 255 characters."
+#. TRANS: Client error displayed when a consumer secret is invalid because it is too long.
+#, fuzzy
+msgid "Invalid consumer secret. Maximum length is 255 characters."
 msgstr "Rahsia pengguna tidak sah. Panjang maksimum 255 aksara."
 
+#. TRANS: Fieldset legend for Twitter application settings.
 msgid "Twitter application settings"
 msgstr ""
 
+#. TRANS: Field label for Twitter assigned consumer key.
 msgid "Consumer key"
 msgstr "Kunci pengguna"
 
-msgid "Consumer key assigned by Twitter"
+#. TRANS: Field title for Twitter assigned consumer key.
+#, fuzzy
+msgid "The consumer key assigned by Twitter."
 msgstr "Kunci pengguna yang diperuntukkan oleh Twitter"
 
+#. TRANS: Field label for Twitter assigned consumer secret.
 msgid "Consumer secret"
 msgstr "Rahsia pengguna"
 
-msgid "Consumer secret assigned by Twitter"
+#. TRANS: Field title for Twitter assigned consumer secret.
+#, fuzzy
+msgid "The consumer secret assigned by Twitter."
 msgstr "Rahsia pengguna yang diperuntukkan oleh Twitter"
 
-msgid "Note: a global consumer key and secret are set."
+#. TRANS: Form guide displayed when two required fields have already been provided.
+#, fuzzy
+msgid "Note: A global consumer key and secret are set."
 msgstr "Perhatian: kunci dan rahsia pengguna global telah ditetapkan."
 
+#. TRANS: Field label for Twitter application name.
 msgid "Integration source"
 msgstr "Sumber penyepaduan"
 
-msgid "Name of your Twitter application"
+#. TRANS: Field title for Twitter application name.
+#, fuzzy
+msgid "The name of your Twitter application."
 msgstr "Nama aplikasi Twitter anda"
 
+#. TRANS: Fieldset legend for Twitter integration options.
 msgid "Options"
 msgstr "Opsyen"
 
+#. TRANS: Checkbox label for global setting.
 msgid "Enable \"Sign-in with Twitter\""
 msgstr "Hidupkan \"Daftar masuk dengan Twitter\""
 
-msgid "Allow users to login with their Twitter credentials"
+#. TRANS: Checkbox title.
+#, fuzzy
+msgid "This allow users to login with their Twitter credentials."
 msgstr "Benarkan pengguna log masuk dengan watikah Twitter"
 
+#. TRANS: Checkbox label for global setting.
 msgid "Enable Twitter import"
 msgstr "Bolehkan import dari Twitter"
 
+#. TRANS: Checkbox title for global setting.
 msgid ""
 "Allow users to import their Twitter friends' timelines. Requires daemons to "
 "be manually configured."
@@ -251,18 +341,69 @@ msgstr ""
 "Benarkan pengguna mengimport garis masa kawan-kawannya di Twitter. Untuk "
 "itu, daemon perlu ditataletak secara manual."
 
-msgid "Save Twitter settings"
-msgstr "Simpan tetapan Twitter"
+#. TRANS: Button title for saving the administrative Twitter bridge settings.
+#, fuzzy
+msgid "Save the Twitter bridge settings."
+msgstr "Tetapan pengantara Twitter"
 
-msgid "Login or register using Twitter"
+#. TRANS: Server exception thrown when an invalid URL scheme is detected.
+msgid "Invalid URL scheme for HTTP stream reader."
+msgstr ""
+
+#. TRANS: Exception thrown when input from an inexpected socket is encountered.
+msgid "Got input from unexpected socket!"
+msgstr ""
+
+#. TRANS: Exception thrown when an invalid state is encountered in handleLine.
+#. TRANS: %s is the invalid state.
+#, php-format
+msgid "Invalid state in handleLine: %s."
+msgstr ""
+
+#. TRANS: Exception thrown when an invalid response line is encountered.
+#. TRANS: %s is the invalid line.
+#, php-format
+msgid "Invalid HTTP response line: %s."
+msgstr ""
+
+#. TRANS: Exception thrown when an invalid response line part is encountered.
+#. TRANS: %1$s is the chunk, %2$s is the line.
+#, php-format
+msgid "Invalid HTTP response line chunk \"%1$s\": %2$s."
+msgstr ""
+
+#. TRANS: Exception thrown when an invalid response code is encountered.
+#. TRANS: %1$s is the response code, %2$s is the line.
+#, php-format
+msgid "Bad HTTP response code %1$s: %2$s."
+msgstr ""
+
+#. TRANS: Menu item in login navigation.
+#. TRANS: Menu item in connection settings navigation.
+#, fuzzy
+msgctxt "MENU"
+msgid "Twitter"
+msgstr "Twitter"
+
+#. TRANS: Title for menu item in login navigation.
+#, fuzzy
+msgid "Login or register using Twitter."
 msgstr "Log masuk atau berdaftar dengan menggunakan Twitter"
 
+#. TRANS: Title for menu item in connection settings navigation.
 msgid "Twitter integration options"
 msgstr "Opsyen penyepaduan Twitter"
 
-msgid "Twitter bridge configuration"
+#. TRANS: Menu item in administrative panel that leads to the Twitter bridge configuration.
+msgid "Twitter"
+msgstr "Twitter"
+
+#. TRANS: Menu item title in administrative panel that leads to the Twitter bridge configuration.
+#, fuzzy
+msgid "Twitter bridge configuration page."
 msgstr "Tatarajah pengantara Twitter"
 
+#. TRANS: Plugin description.
 msgid ""
 "The Twitter \"bridge\" plugin allows integration of a StatusNet instance "
 "with <a href=\"http://twitter.com/\">Twitter</a>."
@@ -270,15 +411,21 @@ msgstr ""
 "Pemalam \"penghubung\" Twitter membolehkan penyepaduan peristiwa StatusNet "
 "dengan <a href=\"http://twitter.com/\">Twitter</a>."
 
+#. TRANS: Client error displayed when trying to log in using Twitter while already logged in to StatusNet.
 msgid "Already logged in."
 msgstr "Sudah log masuk."
 
+#. TRANS: Title for login using Twitter page.
+#, fuzzy
+msgctxt "TITLE"
 msgid "Twitter Login"
 msgstr "Log masuk Twitter"
 
+#. TRANS: Instructions for login using Twitter page.
 msgid "Login with your Twitter account"
 msgstr "Log masuk dengan akaun Twitter anda"
 
+#. TRANS: Alternative text for "sign in with Twitter" image.
 msgid "Sign in with Twitter"
 msgstr "Daftar masuk dengan Twitter"
 
diff --git a/plugins/TwitterBridge/locale/nl/LC_MESSAGES/TwitterBridge.po b/plugins/TwitterBridge/locale/nl/LC_MESSAGES/TwitterBridge.po
index 632384e3b7..3791d76da7 100644
--- a/plugins/TwitterBridge/locale/nl/LC_MESSAGES/TwitterBridge.po
+++ b/plugins/TwitterBridge/locale/nl/LC_MESSAGES/TwitterBridge.po
@@ -9,21 +9,23 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TwitterBridge\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:45+0000\n"
-"Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:22+0000\n"
+"Language-Team: Dutch <https://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:29+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-12-03 13:51:38+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-twitterbridge\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Title for page with Twitter integration settings.
 msgid "Twitter settings"
 msgstr "Twitterinstellingen"
 
+#. TRANS: Instructions for page with Twitter integration settings.
 msgid ""
 "Connect your Twitter account to share your updates with your Twitter friends "
 "and vice-versa."
@@ -31,27 +33,29 @@ msgstr ""
 "Koppel uw Twittergebruiker om uw berichten te delen met uw Twittervrienden "
 "en vice versa."
 
+#. TRANS: Fieldset legend.
 msgid "Twitter account"
 msgstr "Twittergebruiker"
 
+#. TRANS: Form note when a Twitter account has been connected.
 msgid "Connected Twitter account"
 msgstr "Gekoppelde Twittergebruiker"
 
+#. TRANS: Fieldset legend.
 msgid "Disconnect my account from Twitter"
 msgstr "Mijn gebruiker loskoppelen van Twitter"
 
-msgid "Disconnecting your Twitter could make it impossible to log in! Please "
+#. TRANS: Form guide. %s is a URL to the password settings.
+#. TRANS: This message contains a Markdown link in the form [description](link).
+#, php-format
+msgid ""
+"Disconnecting your Twitter account could make it impossible to log in! "
+"Please [set a password](%s) first."
 msgstr ""
-"Loskoppelen van uw Twittergebruiker zou ervoor zorgen dat u niet langer kunt "
-"aanmelden. U moet eerst "
+"Door uw Twittergebruiker los te koppelen, kunt u mogelijk niet meer "
+"aanmelden! [Stel eerst een wachtwoord in](%s)."
 
-msgid "set a password"
-msgstr "een wachtwoord instellen"
-
-msgid " first."
-msgstr " voordat u verder kunt met deze handeling."
-
-#. TRANS: %1$s is the current website name.
+#. TRANS: Form instructions. %1$s is the StatusNet sitename.
 #, php-format
 msgid ""
 "Keep your %1$s account but disconnect from Twitter. You can use your %1$s "
@@ -60,86 +64,165 @@ msgstr ""
 "Uw gebruiker bij %1$s behouden maar deze loskoppelen van Twitter. U kunt uw "
 "wachtwoord van %1$s gebruiken om aan te melden."
 
+#. TRANS: Button text for disconnecting a Twitter account.
+msgctxt "BUTTON"
 msgid "Disconnect"
 msgstr "Loskoppelen"
 
+#. TRANS: Fieldset legend.
 msgid "Preferences"
 msgstr "Voorkeuren"
 
+#. TRANS: Checkbox label.
 msgid "Automatically send my notices to Twitter."
 msgstr "Mijn berichten automatisch naar Twitter verzenden"
 
+#. TRANS: Checkbox label.
 msgid "Send local \"@\" replies to Twitter."
 msgstr "Lokale antwoorden met \"2\" naar Twitter verzenden."
 
+#. TRANS: Checkbox label.
 msgid "Subscribe to my Twitter friends here."
 msgstr "Hier op mijn Twittervrienden abonneren."
 
+#. TRANS: Checkbox label.
 msgid "Import my friends timeline."
 msgstr "Tijdlijn van mijn vrienden importeren."
 
+#. TRANS: Button text for saving Twitter integration settings.
+#. TRANS: Button text for saving the administrative Twitter bridge settings.
+msgctxt "BUTTON"
 msgid "Save"
 msgstr "Opslaan"
 
+#. TRANS: Button text for adding Twitter integration.
+msgctxt "BUTTON"
 msgid "Add"
 msgstr "Toevoegen"
 
+#. TRANS: Client error displayed when the session token does not match or is not given.
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 "Er is een probleem ontstaan met uw sessie. Probeer het nog een keer, "
 "alstublieft."
 
+#. TRANS: Client error displayed when the submitted form contains unexpected data.
 msgid "Unexpected form submission."
 msgstr "Het formulier is onverwacht ingezonden."
 
+#. TRANS: Client error displayed when trying to remove a connected Twitter account when there isn't one connected.
 msgid "No Twitter connection to remove."
 msgstr "Er is geen Twitterkoppeling om te verwijderen."
 
-msgid "Couldn't remove Twitter user."
+#. TRANS: Server error displayed when trying to remove a connected Twitter account fails.
+msgid "Could not remove Twitter user."
 msgstr "Het was niet mogelijk de Twittergebruiker te verwijderen."
 
+#. TRANS: Success message displayed after disconnecting a Twitter account.
 msgid "Twitter account disconnected."
 msgstr "De Twittergebruiker is ontkoppeld."
 
-msgid "Couldn't save Twitter preferences."
+#. TRANS: Server error displayed when saving Twitter integration preferences fails.
+msgid "Could not save Twitter preferences."
 msgstr "Het was niet mogelijk de Twittervoorkeuren op te slaan."
 
+#. TRANS: Success message after saving Twitter integration preferences.
 msgid "Twitter preferences saved."
 msgstr "De Twitterinstellingen zijn opgeslagen."
 
+#. TRANS: Form validation error displayed when the checkbox to agree to the license has not been checked.
 msgid "You cannot register if you do not agree to the license."
 msgstr "U kunt zich niet registreren als u niet met de licentie akkoord gaat."
 
+#. TRANS: Form validation error displayed when an unhandled error occurs.
 msgid "Something weird happened."
 msgstr "Er is iets vreemds gebeurd."
 
+#. TRANS: Server error displayed when linking to a Twitter account fails.
 msgid "Could not link your Twitter account."
 msgstr "Het was niet mogelijk uw Twittergebruiker te koppelen."
 
-msgid "Couldn't link your Twitter account: oauth_token mismatch."
+#. TRANS: Server error displayed when linking to a Twitter account fails because of an incorrect oauth_token.
+msgid "Could not link your Twitter account: oauth_token mismatch."
 msgstr ""
 "Het was niet mogelijk uw Twittergebruiker te koppelen: het oauth_token kwam "
 "niet overeen."
 
-msgid "Couldn't link your Twitter account."
-msgstr "Het was niet mogelijk uw Twittergebruiker te koppelen."
-
+#. TRANS: Page instruction. %s is the StatusNet sitename.
 #, php-format
 msgid ""
-"This is the first time you've logged into %s so we must connect your Twitter "
-"account to a local account. You can either create a new account, or connect "
-"with your existing account, if you have one."
+"This is the first time you have logged into %s so we must connect your "
+"Twitter account to a local account. You can either create a new account, or "
+"connect with your existing account, if you have one."
 msgstr ""
 "Dit is de eerste keer dat u aanmeldt bij %s en dan moeten we uw "
 "Twittergebruiker koppelen met uw lokale gebruiker. U kunt een nieuwe "
 "gebruiker aanmaken of koppelen met een bestaande gebruiker als u die al hebt."
 
+#. TRANS: Page title.
 msgid "Twitter Account Setup"
 msgstr "Instellingen Twittergebruiker"
 
+#. TRANS: Fieldset legend.
 msgid "Connection options"
 msgstr "Koppelingsinstellingen"
 
+#. TRANS: Fieldset legend.
+msgid "Create new account"
+msgstr "Nieuwe gebruiker aanmaken"
+
+#. TRANS: Sub form introduction text.
+msgid "Create a new user with this nickname."
+msgstr "Nieuwe gebruiker aanmaken met deze gebruikersnaam."
+
+#. TRANS: Field label.
+msgid "New nickname"
+msgstr "Nieuwe gebruikersnaam"
+
+#. TRANS: Field title for nickname field.
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
+msgstr "1-64 kleine letters of cijfers, geen leestekens of spaties."
+
+#. TRANS: Field label.
+msgctxt "LABEL"
+msgid "Email"
+msgstr "E-mail"
+
+#. TRANS: Field title for e-mail address field.
+msgid "Used only for updates, announcements, and password recovery"
+msgstr "Alleen gebruikt voor updates, aankondigingen en wachtwoordherstel."
+
+#. TRANS: Button text for creating a new StatusNet account in the Twitter connect page.
+msgctxt "BUTTON"
+msgid "Create"
+msgstr "Aanmaken"
+
+#. TRANS: Fieldset legend.
+msgid "Connect existing account"
+msgstr "Verbinden met een bestaande gebruiker"
+
+#. TRANS: Sub form introduction text.
+msgid ""
+"If you already have an account, login with your username and password to "
+"connect it to your Twitter account."
+msgstr ""
+"Als u al een gebruiker hebt, meld dan aan met uw gebruikersnaam en "
+"wachtwoord om deze daarna te koppelen met uw Twittergebruiker."
+
+#. TRANS: Field label.
+msgid "Existing nickname"
+msgstr "Bestaande gebruikersnaam"
+
+#. TRANS: Field label.
+msgid "Password"
+msgstr "Wachtwoord"
+
+#. TRANS: Fieldset legend.
+msgid "License"
+msgstr "Licentie"
+
+#. TRANS: Text for license agreement checkbox.
+#. TRANS: %s is the license as configured for the StatusNet site.
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
@@ -148,119 +231,110 @@ msgstr ""
 "Mijn teksten en bestanden zijn beschikbaar onder %s, behalve de volgende "
 "privégegevens: wachtwoord, e-mailadres, IM-adres, telefoonnummer."
 
-msgid "Create new account"
-msgstr "Nieuwe gebruiker aanmaken"
-
-msgid "Create a new user with this nickname."
-msgstr "Nieuwe gebruiker aanmaken met deze gebruikersnaam."
-
-msgid "New nickname"
-msgstr "Nieuwe gebruikersnaam"
-
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
-msgstr "1-64 kleine letters of cijfers, geen leestekens of spaties."
-
-msgctxt "LABEL"
-msgid "Email"
-msgstr "E-mail"
-
-msgid "Used only for updates, announcements, and password recovery"
-msgstr "Alleen gebruikt voor updates, aankondigingen en wachtwoordherstel."
-
-msgid "Create"
-msgstr "Aanmaken"
-
-msgid "Connect existing account"
-msgstr "Verbinden met een bestaande gebruiker"
-
-msgid ""
-"If you already have an account, login with your username and password to "
-"connect it to your Twitter account."
-msgstr ""
-"Als u al een gebruiker hebt, meld dan aan met uw gebruikersnaam en "
-"wachtwoord om deze daarna te koppelen met uw Twittergebruiker."
-
-msgid "Existing nickname"
-msgstr "Bestaande gebruikersnaam"
-
-msgid "Password"
-msgstr "Wachtwoord"
-
+#. TRANS: Button text for connecting an existing StatusNet account in the Twitter connect page..
+msgctxt "BUTTON"
 msgid "Connect"
 msgstr "Koppelen"
 
+#. TRANS: Client error displayed when trying to create a new user while creating new users is not allowed.
 msgid "Registration not allowed."
 msgstr "Registratie is niet toegestaan."
 
+#. TRANS: Client error displayed when trying to create a new user with an invalid invitation code.
 msgid "Not a valid invitation code."
 msgstr "De uitnodigingscode is ongeldig."
 
+#. TRANS: Client error displayed when trying to create a new user with an invalid username.
 msgid "Nickname not allowed."
 msgstr "Gebruikersnaam niet toegestaan."
 
+#. TRANS: Client error displayed when trying to create a new user with a username that is already in use.
 msgid "Nickname already in use. Try another one."
 msgstr ""
 "De opgegeven gebruikersnaam is al in gebruik. Kies een andere gebruikersnaam."
 
+#. TRANS: Server error displayed when creating a new user has failed.
 msgid "Error registering user."
 msgstr "Fout bij het registreren van de gebruiker."
 
+#. TRANS: Server error displayed when connecting a user to a Twitter user has failed.
+#. TRANS: Server error displayed connecting a user to a Twitter user has failed.
 msgid "Error connecting user to Twitter."
 msgstr "Fout bij het verbinden van de gebruiker met Twitter."
 
+#. TRANS: Form validation error displayed when connecting an existing user to a Twitter user fails because
+#. TRANS: the provided username and/or password are incorrect.
 msgid "Invalid username or password."
 msgstr "Ongeldige gebruikersnaam of wachtwoord."
 
+#. TRANS: Page title for Twitter administration panel.
+msgctxt "TITLE"
 msgid "Twitter"
 msgstr "Twitter"
 
+#. TRANS: Instructions for Twitter bridge administration page.
 msgid "Twitter bridge settings"
 msgstr "Instellingen Twitterkoppeling"
 
-msgid "Invalid consumer key. Max length is 255 characters."
+#. TRANS: Client error displayed when a consumer key is invalid because it is too long.
+msgid "Invalid consumer key. Maximum length is 255 characters."
 msgstr "Ongeldige gebruikerssleutel. De maximale lengte is 255 tekens."
 
-msgid "Invalid consumer secret. Max length is 255 characters."
+#. TRANS: Client error displayed when a consumer secret is invalid because it is too long.
+msgid "Invalid consumer secret. Maximum length is 255 characters."
 msgstr "Ongeldig gebruikersgeheim. De maximale lengte is 255 tekens."
 
+#. TRANS: Fieldset legend for Twitter application settings.
 msgid "Twitter application settings"
 msgstr "Instellingen Twitterapplicatie"
 
+#. TRANS: Field label for Twitter assigned consumer key.
 msgid "Consumer key"
 msgstr "Gebruikerssleutel"
 
-msgid "Consumer key assigned by Twitter"
-msgstr "Gebruikerssleutel uitgegeven door Twitter"
+#. TRANS: Field title for Twitter assigned consumer key.
+msgid "The consumer key assigned by Twitter."
+msgstr "De gebruikerssleutel als uitgegeven door Twitter."
 
+#. TRANS: Field label for Twitter assigned consumer secret.
 msgid "Consumer secret"
 msgstr "Gebruikersgeheim"
 
-msgid "Consumer secret assigned by Twitter"
-msgstr "Gebruikersgeheim uitgegeven door Twitter"
+#. TRANS: Field title for Twitter assigned consumer secret.
+msgid "The consumer secret assigned by Twitter."
+msgstr "Het gebruikersgeheim als uitgegeven door Twitter."
 
-msgid "Note: a global consumer key and secret are set."
+#. TRANS: Form guide displayed when two required fields have already been provided.
+msgid "Note: A global consumer key and secret are set."
 msgstr "Let op: er zijn een gebruikerssleutel en gebruikersgeheim ingesteld."
 
+#. TRANS: Field label for Twitter application name.
 msgid "Integration source"
 msgstr "Integratiebron"
 
-msgid "Name of your Twitter application"
-msgstr "Naam van uw Twitterapplicatie"
+#. TRANS: Field title for Twitter application name.
+msgid "The name of your Twitter application."
+msgstr "De naam van uw Twitterapplicatie."
 
+#. TRANS: Fieldset legend for Twitter integration options.
 msgid "Options"
 msgstr "Opties"
 
+#. TRANS: Checkbox label for global setting.
 msgid "Enable \"Sign-in with Twitter\""
 msgstr "\"Aanmelden via Twitter\" inschakelen"
 
-msgid "Allow users to login with their Twitter credentials"
+#. TRANS: Checkbox title.
+msgid "This allow users to login with their Twitter credentials."
 msgstr ""
 "Gebruikers toestaan aan te melden met hun gebruikersnaam en wachtwoord van "
 "Twitter"
 
+#. TRANS: Checkbox label for global setting.
 msgid "Enable Twitter import"
 msgstr "Twitterimport inschakelen"
 
+#. TRANS: Checkbox title for global setting.
 msgid ""
 "Allow users to import their Twitter friends' timelines. Requires daemons to "
 "be manually configured."
@@ -268,18 +342,65 @@ msgstr ""
 "Gebruikers toestaan de tijdlijnen van hun Twittervrienden te importeren. "
 "Vereist handmatig te configureren daemons."
 
-msgid "Save Twitter settings"
-msgstr "Twitterinstellingen opslaan"
+#. TRANS: Button title for saving the administrative Twitter bridge settings.
+msgid "Save the Twitter bridge settings."
+msgstr "De instellingen voor de Twitterkoppeling opslaan."
 
-msgid "Login or register using Twitter"
-msgstr "Aanmelden of registreren via Twitter"
+#. TRANS: Server exception thrown when an invalid URL scheme is detected.
+msgid "Invalid URL scheme for HTTP stream reader."
+msgstr "Ongeldig URL-schema voor de HTTP streamlezer."
 
+#. TRANS: Exception thrown when input from an inexpected socket is encountered.
+msgid "Got input from unexpected socket!"
+msgstr "Er is uitvoer ontvangen van een onverwachte socket!"
+
+#. TRANS: Exception thrown when an invalid state is encountered in handleLine.
+#. TRANS: %s is the invalid state.
+#, php-format
+msgid "Invalid state in handleLine: %s."
+msgstr "Ongeldige status in handleLIne: %s."
+
+#. TRANS: Exception thrown when an invalid response line is encountered.
+#. TRANS: %s is the invalid line.
+#, php-format
+msgid "Invalid HTTP response line: %s."
+msgstr "Ongeldige HTTP-responsregel: %s."
+
+#. TRANS: Exception thrown when an invalid response line part is encountered.
+#. TRANS: %1$s is the chunk, %2$s is the line.
+#, php-format
+msgid "Invalid HTTP response line chunk \"%1$s\": %2$s."
+msgstr "Ongeldig HTTP-responsregeldeel \"%1$s\": %2$s."
+
+#. TRANS: Exception thrown when an invalid response code is encountered.
+#. TRANS: %1$s is the response code, %2$s is the line.
+#, php-format
+msgid "Bad HTTP response code %1$s: %2$s."
+msgstr "Ongeldige HTTP-responscode %1$s: %2$s."
+
+#. TRANS: Menu item in login navigation.
+#. TRANS: Menu item in connection settings navigation.
+msgctxt "MENU"
+msgid "Twitter"
+msgstr "Twitter"
+
+#. TRANS: Title for menu item in login navigation.
+msgid "Login or register using Twitter."
+msgstr "Aanmelden of registreren via Twitter."
+
+#. TRANS: Title for menu item in connection settings navigation.
 msgid "Twitter integration options"
 msgstr "Opties voor Twitterintegratie"
 
-msgid "Twitter bridge configuration"
-msgstr "Instellingen voor Twitterkoppeling"
+#. TRANS: Menu item in administrative panel that leads to the Twitter bridge configuration.
+msgid "Twitter"
+msgstr "Twitter"
 
+#. TRANS: Menu item title in administrative panel that leads to the Twitter bridge configuration.
+msgid "Twitter bridge configuration page."
+msgstr "Pagina voor instellingen van de Twitterkoppeling."
+
+#. TRANS: Plugin description.
 msgid ""
 "The Twitter \"bridge\" plugin allows integration of a StatusNet instance "
 "with <a href=\"http://twitter.com/\">Twitter</a>."
@@ -287,15 +408,20 @@ msgstr ""
 "De plugin Twitter Brigde maakt het mogelijk en StatusNetinstallatie te "
 "integreren met <a href=\"http://twitter.com/\">Twitter</a>."
 
+#. TRANS: Client error displayed when trying to log in using Twitter while already logged in to StatusNet.
 msgid "Already logged in."
 msgstr "U bent al aangemeld."
 
+#. TRANS: Title for login using Twitter page.
+msgctxt "TITLE"
 msgid "Twitter Login"
 msgstr "Aanmelden via Twitter"
 
+#. TRANS: Instructions for login using Twitter page.
 msgid "Login with your Twitter account"
 msgstr "Aanmelden met uw Twittergebruiker"
 
+#. TRANS: Alternative text for "sign in with Twitter" image.
 msgid "Sign in with Twitter"
 msgstr "Aanmelden met Twitter"
 
diff --git a/plugins/TwitterBridge/locale/tl/LC_MESSAGES/TwitterBridge.po b/plugins/TwitterBridge/locale/tl/LC_MESSAGES/TwitterBridge.po
index 46b2b6aa9e..2abee72dba 100644
--- a/plugins/TwitterBridge/locale/tl/LC_MESSAGES/TwitterBridge.po
+++ b/plugins/TwitterBridge/locale/tl/LC_MESSAGES/TwitterBridge.po
@@ -9,21 +9,23 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TwitterBridge\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:46+0000\n"
-"Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:22+0000\n"
+"Language-Team: Tagalog <https://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:29+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-12-03 13:51:38+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-twitterbridge\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Title for page with Twitter integration settings.
 msgid "Twitter settings"
 msgstr "Mga katakdaan ng Twitter"
 
+#. TRANS: Instructions for page with Twitter integration settings.
 msgid ""
 "Connect your Twitter account to share your updates with your Twitter friends "
 "and vice-versa."
@@ -31,27 +33,29 @@ msgstr ""
 "Iugnay ang akawnt mo ng Twitter upang maibagi ang mga pagsasapanahon mo sa "
 "iyong mga kaibigan sa Twitter at pabalik din."
 
+#. TRANS: Fieldset legend.
 msgid "Twitter account"
 msgstr "Akawnt sa Twitter"
 
+#. TRANS: Form note when a Twitter account has been connected.
 msgid "Connected Twitter account"
 msgstr "Nakaugnay na akawnt ng Twitter"
 
+#. TRANS: Fieldset legend.
 msgid "Disconnect my account from Twitter"
 msgstr "Huwag iugnay ang akawnt ko na mula sa Twitter"
 
-msgid "Disconnecting your Twitter could make it impossible to log in! Please "
+#. TRANS: Form guide. %s is a URL to the password settings.
+#. TRANS: This message contains a Markdown link in the form [description](link).
+#, php-format
+msgid ""
+"Disconnecting your Twitter account could make it impossible to log in! "
+"Please [set a password](%s) first."
 msgstr ""
-"Ang pagkalas ng Twitter mo ay maaaring makapagdulot ng hindi makalagda!  "
-"Mangyaring "
+"Ang pagkalas sa akawnt mo ng Twitter mo ay maaaring makapagdulot ng kawalan "
+"ng kakayanang makalagda!  Mangyaring [magtakda muna ng hudyat] (%s)."
 
-msgid "set a password"
-msgstr "magtakda ng isang hudyat"
-
-msgid " first."
-msgstr "muna."
-
-#. TRANS: %1$s is the current website name.
+#. TRANS: Form instructions. %1$s is the StatusNet sitename.
 #, php-format
 msgid ""
 "Keep your %1$s account but disconnect from Twitter. You can use your %1$s "
@@ -60,86 +64,168 @@ msgstr ""
 "Panatilihin ang akawnt mong %1$s subalit kumalas mula sa Twitter.  Maaari "
 "mong gamitin ang hudyat mo sa %1$s upang lumagdang papasok."
 
+#. TRANS: Button text for disconnecting a Twitter account.
+msgctxt "BUTTON"
 msgid "Disconnect"
-msgstr "Huwag umugnay"
+msgstr "Kumalas"
 
+#. TRANS: Fieldset legend.
 msgid "Preferences"
 msgstr "Mga nais"
 
+#. TRANS: Checkbox label.
 msgid "Automatically send my notices to Twitter."
 msgstr "Kusang ipadala ang mga pabatid ko sa Twitter."
 
+#. TRANS: Checkbox label.
 msgid "Send local \"@\" replies to Twitter."
 msgstr "Ipadala ang katutubong mga tugon na \"@\" sa Twitter."
 
+#. TRANS: Checkbox label.
 msgid "Subscribe to my Twitter friends here."
 msgstr "Tumanggap ng mga pagsipi sa aking mga kaibigan sa Twitter dito."
 
+#. TRANS: Checkbox label.
 msgid "Import my friends timeline."
 msgstr "Angkatin ang guhit ng panahon ng mga kaibigan ko."
 
+#. TRANS: Button text for saving Twitter integration settings.
+#. TRANS: Button text for saving the administrative Twitter bridge settings.
+msgctxt "BUTTON"
 msgid "Save"
 msgstr "Sagipin"
 
+#. TRANS: Button text for adding Twitter integration.
+msgctxt "BUTTON"
 msgid "Add"
 msgstr "Idagdag"
 
+#. TRANS: Client error displayed when the session token does not match or is not given.
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 "Nagkaroon ng isang suliranin sa kahalip ng sesyon mo.  Pakisubukan uli."
 
+#. TRANS: Client error displayed when the submitted form contains unexpected data.
 msgid "Unexpected form submission."
 msgstr "Hindi inaasahang pagpapasa ng pormularyo."
 
+#. TRANS: Client error displayed when trying to remove a connected Twitter account when there isn't one connected.
 msgid "No Twitter connection to remove."
 msgstr "Walang matatanggal na ugnay sa Twitter."
 
-msgid "Couldn't remove Twitter user."
-msgstr "Hindi matanggal ang tagagamit ng Twitter."
+#. TRANS: Server error displayed when trying to remove a connected Twitter account fails.
+msgid "Could not remove Twitter user."
+msgstr "Hindi maalis ang tagagamit ng Twitter."
 
+#. TRANS: Success message displayed after disconnecting a Twitter account.
 msgid "Twitter account disconnected."
 msgstr "Nawala ang ugnay sa akawnt ng Twitter."
 
-msgid "Couldn't save Twitter preferences."
-msgstr "Hindi masagip ang mga nais na pang-Twitter."
+#. TRANS: Server error displayed when saving Twitter integration preferences fails.
+msgid "Could not save Twitter preferences."
+msgstr "Hindi masagip ang mga kanaisan na nasa Twitter."
 
+#. TRANS: Success message after saving Twitter integration preferences.
 msgid "Twitter preferences saved."
 msgstr "Nasagip ang mga nais na pang-Twitter."
 
+#. TRANS: Form validation error displayed when the checkbox to agree to the license has not been checked.
 msgid "You cannot register if you do not agree to the license."
 msgstr "Hindi ka makakapagpatala kung hindi ka sasang-ayon sa lisensiya."
 
+#. TRANS: Form validation error displayed when an unhandled error occurs.
 msgid "Something weird happened."
 msgstr "May nangyaring kakaiba."
 
+#. TRANS: Server error displayed when linking to a Twitter account fails.
 msgid "Could not link your Twitter account."
 msgstr "Hindi maikawing ang iyong akawnt ng Twitter."
 
-msgid "Couldn't link your Twitter account: oauth_token mismatch."
+#. TRANS: Server error displayed when linking to a Twitter account fails because of an incorrect oauth_token.
+msgid "Could not link your Twitter account: oauth_token mismatch."
 msgstr ""
-"Hindi maikawing ang iyong akawnt ng Twitter: hindi magkatugma ang "
-"oauth_token."
-
-msgid "Couldn't link your Twitter account."
-msgstr "Hindi maikawing ang iyong akawnt ng Twitter."
+"Hindi maikawing ang akawnt mong nasa Twitter: hindi katugma ang oauth_token."
 
+#. TRANS: Page instruction. %s is the StatusNet sitename.
 #, php-format
 msgid ""
-"This is the first time you've logged into %s so we must connect your Twitter "
-"account to a local account. You can either create a new account, or connect "
-"with your existing account, if you have one."
+"This is the first time you have logged into %s so we must connect your "
+"Twitter account to a local account. You can either create a new account, or "
+"connect with your existing account, if you have one."
 msgstr ""
-"Ito ang iyong unang pagkakataon ng paglagda sa %s kaya't kailangan naming "
-"iugnay ang iyong akawnt ng Twitter papunta sa isang katutubong akawnt.  "
-"Maaari kang lumikha ng isang bagong akawnt, o umugnay sa pamamagitan ng "
-"umiiral mong akawnt, kung mayroon ka."
+"Ito ang una mong pagkakataon na lumagdang papasok sa %s kaya't kailangan "
+"naming iugnay ang akawnt mong nasa Twitter sa isang katutubong akawnt.  "
+"Maaari kang lumikha ng isang bagong akawnt, o kumabit sa umiiral mong "
+"akawnt, kung mayroon ka na."
 
+#. TRANS: Page title.
 msgid "Twitter Account Setup"
 msgstr "Pagkakahanda ng Akawnt ng Twitter"
 
+#. TRANS: Fieldset legend.
 msgid "Connection options"
 msgstr "Mga mapagpipilian ng ugnay"
 
+#. TRANS: Fieldset legend.
+msgid "Create new account"
+msgstr "Lumikha ng bagong akawnt"
+
+#. TRANS: Sub form introduction text.
+msgid "Create a new user with this nickname."
+msgstr "Lumikha ng isang bagong tagagamit na may ganitong palayaw."
+
+#. TRANS: Field label.
+msgid "New nickname"
+msgstr "Bagong palayaw"
+
+#. TRANS: Field title for nickname field.
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
+msgstr ""
+"1 hanggang 64 maliliit na mga titik o mga bilang, walang bantas o mga "
+"patlang."
+
+#. TRANS: Field label.
+msgctxt "LABEL"
+msgid "Email"
+msgstr "E-liham"
+
+#. TRANS: Field title for e-mail address field.
+msgid "Used only for updates, announcements, and password recovery"
+msgstr ""
+"Ginagamit lamang para sa mga pagsasapanahon, mga pagpapahayag, at pagbawi ng "
+"hudyat"
+
+#. TRANS: Button text for creating a new StatusNet account in the Twitter connect page.
+msgctxt "BUTTON"
+msgid "Create"
+msgstr "Likhain"
+
+#. TRANS: Fieldset legend.
+msgid "Connect existing account"
+msgstr "Iugnay ang umiiral na akawnt"
+
+#. TRANS: Sub form introduction text.
+msgid ""
+"If you already have an account, login with your username and password to "
+"connect it to your Twitter account."
+msgstr ""
+"Kung mayroon ka nang akawnt, lumagda sa pamamagitan ng iyong pangalan ng "
+"tagagamit at hudyat upang iugnay ito sa iyong akawnt ng Twitter."
+
+#. TRANS: Field label.
+msgid "Existing nickname"
+msgstr "Umiiral na palayaw"
+
+#. TRANS: Field label.
+msgid "Password"
+msgstr "Hudyat"
+
+#. TRANS: Fieldset legend.
+msgid "License"
+msgstr "Lisensiya"
+
+#. TRANS: Text for license agreement checkbox.
+#. TRANS: %s is the license as configured for the StatusNet site.
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
@@ -149,126 +235,113 @@ msgstr ""
 "pribadong datong ito: hudyat, tirahan ng e-liham, tirahan ng IM, at numero "
 "ng telepono."
 
-msgid "Create new account"
-msgstr "Lumikha ng bagong akawnt"
-
-msgid "Create a new user with this nickname."
-msgstr "Lumikha ng isang bagong tagagamit na may ganitong palayaw."
-
-msgid "New nickname"
-msgstr "Bagong palayaw"
-
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
-msgstr ""
-"1 hanggang 64 maliliit na mga titik o mga bilang, walang bantas o mga "
-"patlang."
-
-msgctxt "LABEL"
-msgid "Email"
-msgstr "E-liham"
-
-msgid "Used only for updates, announcements, and password recovery"
-msgstr ""
-"Ginagamit lamang para sa mga pagsasapanahon, mga pagpapahayag, at pagbawi ng "
-"hudyat"
-
-msgid "Create"
-msgstr "Likhain"
-
-msgid "Connect existing account"
-msgstr "Iugnay ang umiiral na akawnt"
-
-msgid ""
-"If you already have an account, login with your username and password to "
-"connect it to your Twitter account."
-msgstr ""
-"Kung mayroon ka nang akawnt, lumagda sa pamamagitan ng iyong pangalan ng "
-"tagagamit at hudyat upang iugnay ito sa iyong akawnt ng Twitter."
-
-msgid "Existing nickname"
-msgstr "Umiiral na palayaw"
-
-msgid "Password"
-msgstr "Hudyat"
-
+#. TRANS: Button text for connecting an existing StatusNet account in the Twitter connect page..
+msgctxt "BUTTON"
 msgid "Connect"
-msgstr "Umugnay"
+msgstr "Kumabit"
 
+#. TRANS: Client error displayed when trying to create a new user while creating new users is not allowed.
 msgid "Registration not allowed."
 msgstr "Hindi pinayagan ang pagpapatala."
 
+#. TRANS: Client error displayed when trying to create a new user with an invalid invitation code.
 msgid "Not a valid invitation code."
 msgstr "Hindi isang tanggap na kodigo ng paanyaya."
 
+#. TRANS: Client error displayed when trying to create a new user with an invalid username.
 msgid "Nickname not allowed."
 msgstr "Hindi pinayagan ang palayaw."
 
+#. TRANS: Client error displayed when trying to create a new user with a username that is already in use.
 msgid "Nickname already in use. Try another one."
 msgstr "Ginagamit na ang palayaw.  Sumubok ng iba."
 
+#. TRANS: Server error displayed when creating a new user has failed.
 msgid "Error registering user."
 msgstr "May kamalian sa pagpapatala ng tagagamit."
 
+#. TRANS: Server error displayed when connecting a user to a Twitter user has failed.
+#. TRANS: Server error displayed connecting a user to a Twitter user has failed.
 msgid "Error connecting user to Twitter."
 msgstr "May kamalian sa pag-ugnay ng tagagamit sa Twitter."
 
+#. TRANS: Form validation error displayed when connecting an existing user to a Twitter user fails because
+#. TRANS: the provided username and/or password are incorrect.
 msgid "Invalid username or password."
 msgstr "Hindi katanggap-tanggap na pangalan ng tagagamit o hudyat."
 
+#. TRANS: Page title for Twitter administration panel.
+msgctxt "TITLE"
 msgid "Twitter"
 msgstr "Twitter"
 
+#. TRANS: Instructions for Twitter bridge administration page.
 msgid "Twitter bridge settings"
 msgstr "Mga katakdaan sa tulay ng Twitter"
 
-msgid "Invalid consumer key. Max length is 255 characters."
+#. TRANS: Client error displayed when a consumer key is invalid because it is too long.
+msgid "Invalid consumer key. Maximum length is 255 characters."
 msgstr ""
-"Hindi katanggap-tanggap na susi ng tagaubos.  Ang pinakamataas na haba ay "
+"Hindi katanggap-tanggap na susi ng mang-uubos. Ang pinakamataas na haba ay "
 "255 mga panitik."
 
-msgid "Invalid consumer secret. Max length is 255 characters."
+#. TRANS: Client error displayed when a consumer secret is invalid because it is too long.
+msgid "Invalid consumer secret. Maximum length is 255 characters."
 msgstr ""
 "Hindi katanggap-tanggap na lihim ng tagaubos.  Ang pinakamataas na haba ay "
 "255 mga panitik."
 
+#. TRANS: Fieldset legend for Twitter application settings.
 msgid "Twitter application settings"
 msgstr "Mga katakdaan ng aplikasyong Twitter"
 
+#. TRANS: Field label for Twitter assigned consumer key.
 msgid "Consumer key"
 msgstr "Susi ng tagaubos"
 
-msgid "Consumer key assigned by Twitter"
-msgstr "Susi ng tagaubos na itinalaga ng Twitter"
+#. TRANS: Field title for Twitter assigned consumer key.
+msgid "The consumer key assigned by Twitter."
+msgstr "Ang susi ng tagaubos na itinalaga ng Twitter."
 
+#. TRANS: Field label for Twitter assigned consumer secret.
 msgid "Consumer secret"
 msgstr "Lihim ng tagaubos"
 
-msgid "Consumer secret assigned by Twitter"
-msgstr "Lihim ng tagaubos na itinalaga ng Twitter"
+#. TRANS: Field title for Twitter assigned consumer secret.
+msgid "The consumer secret assigned by Twitter."
+msgstr "Ang lihim ng tagaubos na itinalaga ng Twitter."
 
-msgid "Note: a global consumer key and secret are set."
-msgstr "Paunawa: nakatakda ang isang pandaigdigang susi at lihim ng tagaubos."
+#. TRANS: Form guide displayed when two required fields have already been provided.
+msgid "Note: A global consumer key and secret are set."
+msgstr "Paunawa: Naitakda na ang isang pangglobong susi at lihim ng tagaubos."
 
+#. TRANS: Field label for Twitter application name.
 msgid "Integration source"
 msgstr "Pinagmulan ng pagsasama"
 
-msgid "Name of your Twitter application"
-msgstr "Pangalan ng iyong aplikasyong Twitter"
+#. TRANS: Field title for Twitter application name.
+msgid "The name of your Twitter application."
+msgstr "Ang pangalan ng aplikasyon mo ng Twitter."
 
+#. TRANS: Fieldset legend for Twitter integration options.
 msgid "Options"
 msgstr "Mga mapagpipilian"
 
+#. TRANS: Checkbox label for global setting.
 msgid "Enable \"Sign-in with Twitter\""
 msgstr "Paganahin ang \"Lumagdang may Twitter\""
 
-msgid "Allow users to login with their Twitter credentials"
+#. TRANS: Checkbox title.
+msgid "This allow users to login with their Twitter credentials."
 msgstr ""
-"Pahintulutan ang mga tagagamit na lumagdang papasok sa pamamagitan ng "
-"kanilang mga katangian sa Twitter"
+"Nagpapahintulot ito sa mga tagagamit na lumagdang papasok sa pamamagitan ng "
+"kanilang mga kredensiyal na nasa Twitter."
 
+#. TRANS: Checkbox label for global setting.
 msgid "Enable Twitter import"
 msgstr "Paganahin ang pang-angkat ng Twitter"
 
+#. TRANS: Checkbox title for global setting.
 msgid ""
 "Allow users to import their Twitter friends' timelines. Requires daemons to "
 "be manually configured."
@@ -277,18 +350,67 @@ msgstr ""
 "kanilang mga kaibigang nasa Twitter.  Nangangailangan ng kinakamay na "
 "pagsasaayos ng mga daemon."
 
-msgid "Save Twitter settings"
-msgstr "Sagipin ang mga katakdaan ng Twitter"
+#. TRANS: Button title for saving the administrative Twitter bridge settings.
+msgid "Save the Twitter bridge settings."
+msgstr "Sagipin ang mga katakdaan na nasa tulay ng Twitter."
 
-msgid "Login or register using Twitter"
-msgstr "Lumagda o magpatala na ginagamit ang Twitter"
+#. TRANS: Server exception thrown when an invalid URL scheme is detected.
+msgid "Invalid URL scheme for HTTP stream reader."
+msgstr ""
+"Hindi katanggap-tanggap na pakana ng URL para sa pambasa ng batis ng HTTP."
 
+#. TRANS: Exception thrown when input from an inexpected socket is encountered.
+msgid "Got input from unexpected socket!"
+msgstr "Nakakuha ng pagpasok mula sa hindi inaasahang bokilya!"
+
+#. TRANS: Exception thrown when an invalid state is encountered in handleLine.
+#. TRANS: %s is the invalid state.
+#, php-format
+msgid "Invalid state in handleLine: %s."
+msgstr "Hindi katanggap-tanggap na katayuan sa loob ng linya ng hawakan: %s."
+
+#. TRANS: Exception thrown when an invalid response line is encountered.
+#. TRANS: %s is the invalid line.
+#, php-format
+msgid "Invalid HTTP response line: %s."
+msgstr "Hindi katanggap-tanggap na linya ng tugon ng HTTP: %s."
+
+#. TRANS: Exception thrown when an invalid response line part is encountered.
+#. TRANS: %1$s is the chunk, %2$s is the line.
+#, php-format
+msgid "Invalid HTTP response line chunk \"%1$s\": %2$s."
+msgstr ""
+"Hindi katanggap-tanggap na tipak ng guhit ng tugon ng HTTP na \"%1$s\": %2$s."
+
+#. TRANS: Exception thrown when an invalid response code is encountered.
+#. TRANS: %1$s is the response code, %2$s is the line.
+#, php-format
+msgid "Bad HTTP response code %1$s: %2$s."
+msgstr "Masamang kodigo ng tugon ng HTTP na %1$s: %2$s."
+
+#. TRANS: Menu item in login navigation.
+#. TRANS: Menu item in connection settings navigation.
+msgctxt "MENU"
+msgid "Twitter"
+msgstr "Twitter"
+
+#. TRANS: Title for menu item in login navigation.
+msgid "Login or register using Twitter."
+msgstr "Lumagda o magpatala na ginagamit ang Twitter."
+
+#. TRANS: Title for menu item in connection settings navigation.
 msgid "Twitter integration options"
 msgstr "Mga pagpipilian ng pagsasama ng Twitter"
 
-msgid "Twitter bridge configuration"
-msgstr "Pagkakaayos ng tulay ng Twitter"
+#. TRANS: Menu item in administrative panel that leads to the Twitter bridge configuration.
+msgid "Twitter"
+msgstr "Twitter"
 
+#. TRANS: Menu item title in administrative panel that leads to the Twitter bridge configuration.
+msgid "Twitter bridge configuration page."
+msgstr "Pahina ng pagkakaayos ng tulay ng Twitter."
+
+#. TRANS: Plugin description.
 msgid ""
 "The Twitter \"bridge\" plugin allows integration of a StatusNet instance "
 "with <a href=\"http://twitter.com/\">Twitter</a>."
@@ -297,15 +419,20 @@ msgstr ""
 "isang pagkakataon ng StatusNet sa <a href=\"http://twitter.com/\">Twitter</"
 "a>."
 
+#. TRANS: Client error displayed when trying to log in using Twitter while already logged in to StatusNet.
 msgid "Already logged in."
 msgstr "Nakalagda na."
 
+#. TRANS: Title for login using Twitter page.
+msgctxt "TITLE"
 msgid "Twitter Login"
-msgstr "Paglagda sa Twitter"
+msgstr "Panglagdang Papasok sa Twitter"
 
+#. TRANS: Instructions for login using Twitter page.
 msgid "Login with your Twitter account"
 msgstr "Lumagda sa pamamagitan ng akawnt mo sa Twitter"
 
+#. TRANS: Alternative text for "sign in with Twitter" image.
 msgid "Sign in with Twitter"
 msgstr "Lumagda sa pamamagitan ng Twitter"
 
diff --git a/plugins/TwitterBridge/locale/tr/LC_MESSAGES/TwitterBridge.po b/plugins/TwitterBridge/locale/tr/LC_MESSAGES/TwitterBridge.po
index 7c0faa43d5..9dcc97753f 100644
--- a/plugins/TwitterBridge/locale/tr/LC_MESSAGES/TwitterBridge.po
+++ b/plugins/TwitterBridge/locale/tr/LC_MESSAGES/TwitterBridge.po
@@ -9,21 +9,23 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TwitterBridge\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:46+0000\n"
-"Language-Team: Turkish <http://translatewiki.net/wiki/Portal:tr>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:22+0000\n"
+"Language-Team: Turkish <https://translatewiki.net/wiki/Portal:tr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:29+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-12-03 13:51:38+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: tr\n"
 "X-Message-Group: #out-statusnet-plugin-twitterbridge\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#. TRANS: Title for page with Twitter integration settings.
 msgid "Twitter settings"
 msgstr "Twitter ayarları"
 
+#. TRANS: Instructions for page with Twitter integration settings.
 msgid ""
 "Connect your Twitter account to share your updates with your Twitter friends "
 "and vice-versa."
@@ -31,109 +33,200 @@ msgstr ""
 "Güncellemelerinizi Twitter arkadaşlarınızla paylaşmak ve onların sizi takip "
 "edebilmesi için Twitter hesabınızla bağlantı kurun."
 
+#. TRANS: Fieldset legend.
 msgid "Twitter account"
 msgstr "Twitter hesabı"
 
+#. TRANS: Form note when a Twitter account has been connected.
 msgid "Connected Twitter account"
 msgstr "Bağlı Twitter hesabı"
 
+#. TRANS: Fieldset legend.
 msgid "Disconnect my account from Twitter"
 msgstr "Hesabımın Twitter bağlantısını kes."
 
-msgid "Disconnecting your Twitter could make it impossible to log in! Please "
+#. TRANS: Form guide. %s is a URL to the password settings.
+#. TRANS: This message contains a Markdown link in the form [description](link).
+#, php-format
+msgid ""
+"Disconnecting your Twitter account could make it impossible to log in! "
+"Please [set a password](%s) first."
 msgstr ""
 
-msgid "set a password"
-msgstr "bir parola ayarla"
-
-msgid " first."
-msgstr " ilk."
-
-#. TRANS: %1$s is the current website name.
+#. TRANS: Form instructions. %1$s is the StatusNet sitename.
 #, php-format
 msgid ""
 "Keep your %1$s account but disconnect from Twitter. You can use your %1$s "
 "password to log in."
 msgstr ""
 
+#. TRANS: Button text for disconnecting a Twitter account.
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Disconnect"
 msgstr "Bağlantıyı Kes"
 
+#. TRANS: Fieldset legend.
 msgid "Preferences"
 msgstr "Tercihler"
 
+#. TRANS: Checkbox label.
 msgid "Automatically send my notices to Twitter."
 msgstr "Durum mesajlarımı otomatik olarak Twitter'a gönder."
 
+#. TRANS: Checkbox label.
 msgid "Send local \"@\" replies to Twitter."
 msgstr ""
 
+#. TRANS: Checkbox label.
 msgid "Subscribe to my Twitter friends here."
 msgstr ""
 
+#. TRANS: Checkbox label.
 msgid "Import my friends timeline."
 msgstr "Arkadaşlarımın zaman çizelgesini içeri aktar."
 
+#. TRANS: Button text for saving Twitter integration settings.
+#. TRANS: Button text for saving the administrative Twitter bridge settings.
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Save"
 msgstr "Kaydet"
 
+#. TRANS: Button text for adding Twitter integration.
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Add"
 msgstr "Ekle"
 
+#. TRANS: Client error displayed when the session token does not match or is not given.
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 
+#. TRANS: Client error displayed when the submitted form contains unexpected data.
 msgid "Unexpected form submission."
 msgstr "Beklenmedik form gönderimi."
 
+#. TRANS: Client error displayed when trying to remove a connected Twitter account when there isn't one connected.
 msgid "No Twitter connection to remove."
 msgstr ""
 
-msgid "Couldn't remove Twitter user."
+#. TRANS: Server error displayed when trying to remove a connected Twitter account fails.
+#, fuzzy
+msgid "Could not remove Twitter user."
 msgstr "Twitter kullanıcısı silinemedi."
 
+#. TRANS: Success message displayed after disconnecting a Twitter account.
 msgid "Twitter account disconnected."
 msgstr "Twitter hesabı bağlantısı kesildi."
 
-msgid "Couldn't save Twitter preferences."
+#. TRANS: Server error displayed when saving Twitter integration preferences fails.
+#, fuzzy
+msgid "Could not save Twitter preferences."
 msgstr "Twitter tercihleri kaydedilemedi."
 
+#. TRANS: Success message after saving Twitter integration preferences.
 msgid "Twitter preferences saved."
 msgstr "Twitter tercihleriniz kaydedildi."
 
+#. TRANS: Form validation error displayed when the checkbox to agree to the license has not been checked.
 #, fuzzy
 msgid "You cannot register if you do not agree to the license."
 msgstr "Eğer lisansı kabul etmezseniz kayıt olamazsınız."
 
+#. TRANS: Form validation error displayed when an unhandled error occurs.
 msgid "Something weird happened."
 msgstr "Garip bir ÅŸeyler oldu."
 
+#. TRANS: Server error displayed when linking to a Twitter account fails.
 #, fuzzy
 msgid "Could not link your Twitter account."
 msgstr "Twitter hesabınızla giriş yapın"
 
-msgid "Couldn't link your Twitter account: oauth_token mismatch."
-msgstr ""
+#. TRANS: Server error displayed when linking to a Twitter account fails because of an incorrect oauth_token.
+#, fuzzy
+msgid "Could not link your Twitter account: oauth_token mismatch."
+msgstr "Twitter hesabınızla giriş yapın"
 
-msgid "Couldn't link your Twitter account."
-msgstr ""
-
-#, php-format
+#. TRANS: Page instruction. %s is the StatusNet sitename.
+#, fuzzy, php-format
 msgid ""
-"This is the first time you've logged into %s so we must connect your Twitter "
-"account to a local account. You can either create a new account, or connect "
-"with your existing account, if you have one."
+"This is the first time you have logged into %s so we must connect your "
+"Twitter account to a local account. You can either create a new account, or "
+"connect with your existing account, if you have one."
 msgstr ""
 "İlk defa %s'ye giriş yaptınız, Twitter hesabınızı yerel bir hesapla "
 "bağlamamız gerekiyor. Yeni bir hesap oluşturabilir ya da varolan bir "
 "hesabınızı kullanabilirsiniz."
 
+#. TRANS: Page title.
 msgid "Twitter Account Setup"
 msgstr "Twitter Hesap Kurulumu"
 
+#. TRANS: Fieldset legend.
 msgid "Connection options"
 msgstr "Bağlantı seçenekleri"
 
+#. TRANS: Fieldset legend.
+msgid "Create new account"
+msgstr "Yeni hesap oluÅŸtur"
+
+#. TRANS: Sub form introduction text.
+msgid "Create a new user with this nickname."
+msgstr "Bu kullanıcı adıyla yeni bir kullanıcı oluştur."
+
+#. TRANS: Field label.
+msgid "New nickname"
+msgstr "Yeni kullanıcı adı"
+
+#. TRANS: Field title for nickname field.
+#, fuzzy
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
+msgstr ""
+"1-64 tane küçük harf veya rakam, noktalama işaretlerine ve boşluklara izin "
+"verilmez"
+
+#. TRANS: Field label.
+msgctxt "LABEL"
+msgid "Email"
+msgstr ""
+
+#. TRANS: Field title for e-mail address field.
+msgid "Used only for updates, announcements, and password recovery"
+msgstr ""
+
+#. TRANS: Button text for creating a new StatusNet account in the Twitter connect page.
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Create"
+msgstr "OluÅŸtur"
+
+#. TRANS: Fieldset legend.
+msgid "Connect existing account"
+msgstr "Varolan hesaba baÄŸlan"
+
+#. TRANS: Sub form introduction text.
+msgid ""
+"If you already have an account, login with your username and password to "
+"connect it to your Twitter account."
+msgstr ""
+"Halihazırda bir hesabınız varsa, Twitter hesabınızla bağlantı kurmak için "
+"kullanıcı adı ve parolanızla giriş yapın."
+
+#. TRANS: Field label.
+msgid "Existing nickname"
+msgstr "Varolan kullanıcı adı"
+
+#. TRANS: Field label.
+msgid "Password"
+msgstr "Parola"
+
+#. TRANS: Fieldset legend.
+msgid "License"
+msgstr ""
+
+#. TRANS: Text for license agreement checkbox.
+#. TRANS: %s is the license as configured for the StatusNet site.
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
@@ -142,150 +235,200 @@ msgstr ""
 "Parola, e-posta adresi, anlık mesajlaşma adresi ve telefon numarası gibi "
 "özel verilerim dışındaki tüm yazı ve dosyalarım %s dahilinde kullanılabilir."
 
-msgid "Create new account"
-msgstr "Yeni hesap oluÅŸtur"
-
-msgid "Create a new user with this nickname."
-msgstr "Bu kullanıcı adıyla yeni bir kullanıcı oluştur."
-
-msgid "New nickname"
-msgstr "Yeni kullanıcı adı"
-
+#. TRANS: Button text for connecting an existing StatusNet account in the Twitter connect page..
 #, fuzzy
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
-msgstr ""
-"1-64 tane küçük harf veya rakam, noktalama işaretlerine ve boşluklara izin "
-"verilmez"
-
-msgctxt "LABEL"
-msgid "Email"
-msgstr ""
-
-msgid "Used only for updates, announcements, and password recovery"
-msgstr ""
-
-msgid "Create"
-msgstr "OluÅŸtur"
-
-msgid "Connect existing account"
-msgstr "Varolan hesaba baÄŸlan"
-
-msgid ""
-"If you already have an account, login with your username and password to "
-"connect it to your Twitter account."
-msgstr ""
-"Halihazırda bir hesabınız varsa, Twitter hesabınızla bağlantı kurmak için "
-"kullanıcı adı ve parolanızla giriş yapın."
-
-msgid "Existing nickname"
-msgstr "Varolan kullanıcı adı"
-
-msgid "Password"
-msgstr "Parola"
-
+msgctxt "BUTTON"
 msgid "Connect"
 msgstr "BaÄŸlan"
 
+#. TRANS: Client error displayed when trying to create a new user while creating new users is not allowed.
 msgid "Registration not allowed."
 msgstr "Kayıt yapılmasına izin verilmiyor."
 
+#. TRANS: Client error displayed when trying to create a new user with an invalid invitation code.
 msgid "Not a valid invitation code."
 msgstr "Geçerli bir davet kodu değil."
 
+#. TRANS: Client error displayed when trying to create a new user with an invalid username.
 msgid "Nickname not allowed."
 msgstr "Bu kullanıcı adına izin verilmiyor."
 
+#. TRANS: Client error displayed when trying to create a new user with a username that is already in use.
 msgid "Nickname already in use. Try another one."
 msgstr "Kullanıcı adı halihazırda kullanılıyor. Başka bir tane deneyin."
 
+#. TRANS: Server error displayed when creating a new user has failed.
 msgid "Error registering user."
 msgstr "Kullanıcı kayıt hatası."
 
+#. TRANS: Server error displayed when connecting a user to a Twitter user has failed.
+#. TRANS: Server error displayed connecting a user to a Twitter user has failed.
 msgid "Error connecting user to Twitter."
 msgstr "Twitter'a kullanıcı bağlama hatası."
 
+#. TRANS: Form validation error displayed when connecting an existing user to a Twitter user fails because
+#. TRANS: the provided username and/or password are incorrect.
 msgid "Invalid username or password."
 msgstr "Geçersiz kullanıcı adı veya parola."
 
+#. TRANS: Page title for Twitter administration panel.
+#, fuzzy
+msgctxt "TITLE"
 msgid "Twitter"
 msgstr "Twitter"
 
+#. TRANS: Instructions for Twitter bridge administration page.
 msgid "Twitter bridge settings"
 msgstr "Twitter köprü ayarları"
 
-msgid "Invalid consumer key. Max length is 255 characters."
+#. TRANS: Client error displayed when a consumer key is invalid because it is too long.
+msgid "Invalid consumer key. Maximum length is 255 characters."
 msgstr ""
 
-msgid "Invalid consumer secret. Max length is 255 characters."
+#. TRANS: Client error displayed when a consumer secret is invalid because it is too long.
+msgid "Invalid consumer secret. Maximum length is 255 characters."
 msgstr ""
 
+#. TRANS: Fieldset legend for Twitter application settings.
 msgid "Twitter application settings"
 msgstr ""
 
+#. TRANS: Field label for Twitter assigned consumer key.
 msgid "Consumer key"
 msgstr "Kullanıcı anahtarı"
 
-msgid "Consumer key assigned by Twitter"
+#. TRANS: Field title for Twitter assigned consumer key.
+#, fuzzy
+msgid "The consumer key assigned by Twitter."
 msgstr "Twitter tarafından atanan kullanıcı anahtarı"
 
+#. TRANS: Field label for Twitter assigned consumer secret.
 msgid "Consumer secret"
 msgstr ""
 
-msgid "Consumer secret assigned by Twitter"
-msgstr ""
-
-msgid "Note: a global consumer key and secret are set."
+#. TRANS: Field title for Twitter assigned consumer secret.
+#, fuzzy
+msgid "The consumer secret assigned by Twitter."
+msgstr "Twitter tarafından atanan kullanıcı anahtarı"
+
+#. TRANS: Form guide displayed when two required fields have already been provided.
+msgid "Note: A global consumer key and secret are set."
 msgstr ""
 
+#. TRANS: Field label for Twitter application name.
 msgid "Integration source"
 msgstr "Entegrasyon kaynağı"
 
-msgid "Name of your Twitter application"
+#. TRANS: Field title for Twitter application name.
+#, fuzzy
+msgid "The name of your Twitter application."
 msgstr "Twitter uygulamanızın ismi"
 
+#. TRANS: Fieldset legend for Twitter integration options.
 msgid "Options"
 msgstr "Seçenekler"
 
+#. TRANS: Checkbox label for global setting.
 msgid "Enable \"Sign-in with Twitter\""
 msgstr ""
 
-msgid "Allow users to login with their Twitter credentials"
+#. TRANS: Checkbox title.
+msgid "This allow users to login with their Twitter credentials."
 msgstr ""
 
+#. TRANS: Checkbox label for global setting.
 msgid "Enable Twitter import"
 msgstr ""
 
+#. TRANS: Checkbox title for global setting.
 msgid ""
 "Allow users to import their Twitter friends' timelines. Requires daemons to "
 "be manually configured."
 msgstr ""
 
-msgid "Save Twitter settings"
-msgstr "Twitter ayarlarını kaydet"
+#. TRANS: Button title for saving the administrative Twitter bridge settings.
+#, fuzzy
+msgid "Save the Twitter bridge settings."
+msgstr "Twitter köprü ayarları"
 
-msgid "Login or register using Twitter"
+#. TRANS: Server exception thrown when an invalid URL scheme is detected.
+msgid "Invalid URL scheme for HTTP stream reader."
 msgstr ""
 
+#. TRANS: Exception thrown when input from an inexpected socket is encountered.
+msgid "Got input from unexpected socket!"
+msgstr ""
+
+#. TRANS: Exception thrown when an invalid state is encountered in handleLine.
+#. TRANS: %s is the invalid state.
+#, php-format
+msgid "Invalid state in handleLine: %s."
+msgstr ""
+
+#. TRANS: Exception thrown when an invalid response line is encountered.
+#. TRANS: %s is the invalid line.
+#, php-format
+msgid "Invalid HTTP response line: %s."
+msgstr ""
+
+#. TRANS: Exception thrown when an invalid response line part is encountered.
+#. TRANS: %1$s is the chunk, %2$s is the line.
+#, php-format
+msgid "Invalid HTTP response line chunk \"%1$s\": %2$s."
+msgstr ""
+
+#. TRANS: Exception thrown when an invalid response code is encountered.
+#. TRANS: %1$s is the response code, %2$s is the line.
+#, php-format
+msgid "Bad HTTP response code %1$s: %2$s."
+msgstr ""
+
+#. TRANS: Menu item in login navigation.
+#. TRANS: Menu item in connection settings navigation.
+#, fuzzy
+msgctxt "MENU"
+msgid "Twitter"
+msgstr "Twitter"
+
+#. TRANS: Title for menu item in login navigation.
+#, fuzzy
+msgid "Login or register using Twitter."
+msgstr "Kullanıcı kayıt hatası."
+
+#. TRANS: Title for menu item in connection settings navigation.
 msgid "Twitter integration options"
 msgstr "Twitter entegrasyon seçenekleri"
 
-msgid "Twitter bridge configuration"
+#. TRANS: Menu item in administrative panel that leads to the Twitter bridge configuration.
+msgid "Twitter"
+msgstr "Twitter"
+
+#. TRANS: Menu item title in administrative panel that leads to the Twitter bridge configuration.
+#, fuzzy
+msgid "Twitter bridge configuration page."
 msgstr "Twitter köprü yapılandırması"
 
+#. TRANS: Plugin description.
 msgid ""
 "The Twitter \"bridge\" plugin allows integration of a StatusNet instance "
 "with <a href=\"http://twitter.com/\">Twitter</a>."
 msgstr ""
 
+#. TRANS: Client error displayed when trying to log in using Twitter while already logged in to StatusNet.
 msgid "Already logged in."
 msgstr "Zaten giriş yapılmış."
 
+#. TRANS: Title for login using Twitter page.
+#, fuzzy
+msgctxt "TITLE"
 msgid "Twitter Login"
 msgstr "Twitter GiriÅŸ"
 
+#. TRANS: Instructions for login using Twitter page.
 msgid "Login with your Twitter account"
 msgstr "Twitter hesabınızla giriş yapın"
 
+#. TRANS: Alternative text for "sign in with Twitter" image.
 msgid "Sign in with Twitter"
 msgstr ""
 
diff --git a/plugins/TwitterBridge/locale/uk/LC_MESSAGES/TwitterBridge.po b/plugins/TwitterBridge/locale/uk/LC_MESSAGES/TwitterBridge.po
index 9c910eb822..aec93aa186 100644
--- a/plugins/TwitterBridge/locale/uk/LC_MESSAGES/TwitterBridge.po
+++ b/plugins/TwitterBridge/locale/uk/LC_MESSAGES/TwitterBridge.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - TwitterBridge to Ukrainian (Україн�ька)
+# Translation of StatusNet - TwitterBridge to Ukrainian (україн�ька)
 # Exported from translatewiki.net
 #
 # Author: Boogie
@@ -9,22 +9,24 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TwitterBridge\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:46+0000\n"
-"Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:22+0000\n"
+"Language-Team: Ukrainian <https://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:29+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-12-03 13:51:38+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-twitterbridge\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
+#. TRANS: Title for page with Twitter integration settings.
 msgid "Twitter settings"
 msgstr "�алаштуванн� Twitter"
 
+#. TRANS: Instructions for page with Twitter integration settings.
 msgid ""
 "Connect your Twitter account to share your updates with your Twitter friends "
 "and vice-versa."
@@ -32,27 +34,29 @@ msgstr ""
 "Підключіть ваш акаунт Twitter, щоб ділити�� новими допи�ами з друз�ми в "
 "Twitter і навпаки."
 
+#. TRANS: Fieldset legend.
 msgid "Twitter account"
 msgstr "�каунт Twitter"
 
+#. TRANS: Form note when a Twitter account has been connected.
 msgid "Connected Twitter account"
 msgstr "Під’єднаний акаунт Twitter"
 
+#. TRANS: Fieldset legend.
 msgid "Disconnect my account from Twitter"
 msgstr "Від’єднати мій акаунт від Twitter"
 
-msgid "Disconnecting your Twitter could make it impossible to log in! Please "
+#. TRANS: Form guide. %s is a URL to the password settings.
+#. TRANS: This message contains a Markdown link in the form [description](link).
+#, fuzzy, php-format
+msgid ""
+"Disconnecting your Twitter account could make it impossible to log in! "
+"Please [set a password](%s) first."
 msgstr ""
 "Якщо ви від’єднаєте �вій Twitter, то це унеможливить вхід до �и�теми у "
 "майбутньому! Будь ла�ка, "
 
-msgid "set a password"
-msgstr "в�тановіть пароль"
-
-msgid " first."
-msgstr " �початку."
-
-#. TRANS: %1$s is the current website name.
+#. TRANS: Form instructions. %1$s is the StatusNet sitename.
 #, php-format
 msgid ""
 "Keep your %1$s account but disconnect from Twitter. You can use your %1$s "
@@ -61,83 +65,171 @@ msgstr ""
 "Зберегти ваш акаунт %1$s, але від’єднати його від Twitter. Ви можете "
 "викори�товувати пароль від %1$s дл� входу на �айт."
 
+#. TRANS: Button text for disconnecting a Twitter account.
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Disconnect"
 msgstr "Від’єднати"
 
+#. TRANS: Fieldset legend.
 msgid "Preferences"
 msgstr "�алаштуванн�"
 
+#. TRANS: Checkbox label.
 msgid "Automatically send my notices to Twitter."
 msgstr "�втоматично пере�илати мої допи�и на Twitter."
 
+#. TRANS: Checkbox label.
 msgid "Send local \"@\" replies to Twitter."
 msgstr "�аді�лати локальні «@» відповіді на Twitter."
 
+#. TRANS: Checkbox label.
 msgid "Subscribe to my Twitter friends here."
 msgstr "Підпи�ати�ь до моїх друзів з Twitter тут."
 
+#. TRANS: Checkbox label.
 msgid "Import my friends timeline."
 msgstr "Імпортувати �трічку допи�ів моїх друзів."
 
+#. TRANS: Button text for saving Twitter integration settings.
+#. TRANS: Button text for saving the administrative Twitter bridge settings.
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Save"
 msgstr "Зберегти"
 
+#. TRANS: Button text for adding Twitter integration.
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Add"
 msgstr "Додати"
 
+#. TRANS: Client error displayed when the session token does not match or is not given.
 msgid "There was a problem with your session token. Try again, please."
 msgstr "Виникли певні проблеми з токеном �е�ії. Спробуйте знов, будь ла�ка."
 
+#. TRANS: Client error displayed when the submitted form contains unexpected data.
 msgid "Unexpected form submission."
 msgstr "�е�подіване пред�тавленн� форми."
 
+#. TRANS: Client error displayed when trying to remove a connected Twitter account when there isn't one connected.
 msgid "No Twitter connection to remove."
 msgstr "�е ви�влено з’єднань з Twitter дл� видаленн�."
 
-msgid "Couldn't remove Twitter user."
+#. TRANS: Server error displayed when trying to remove a connected Twitter account fails.
+#, fuzzy
+msgid "Could not remove Twitter user."
 msgstr "�е вдаєть�� видалити кори�тувача Twitter."
 
+#. TRANS: Success message displayed after disconnecting a Twitter account.
 msgid "Twitter account disconnected."
 msgstr "�каунт Twitter від’єднано."
 
-msgid "Couldn't save Twitter preferences."
+#. TRANS: Server error displayed when saving Twitter integration preferences fails.
+#, fuzzy
+msgid "Could not save Twitter preferences."
 msgstr "�е можу зберегти налаштуванн� Twitter."
 
+#. TRANS: Success message after saving Twitter integration preferences.
 msgid "Twitter preferences saved."
 msgstr "�алаштуванн� Twitter збережено."
 
+#. TRANS: Form validation error displayed when the checkbox to agree to the license has not been checked.
 msgid "You cannot register if you do not agree to the license."
 msgstr "Ви не зможете зареє�трувати�ь, �кщо не погодите�ь з умовами ліцензії."
 
+#. TRANS: Form validation error displayed when an unhandled error occurs.
 msgid "Something weird happened."
 msgstr "Стало�� що�ь незрозуміле."
 
+#. TRANS: Server error displayed when linking to a Twitter account fails.
 msgid "Could not link your Twitter account."
 msgstr "�е вдаєть�� прив’�зати ваш акаунт Twitter."
 
-msgid "Couldn't link your Twitter account: oauth_token mismatch."
+#. TRANS: Server error displayed when linking to a Twitter account fails because of an incorrect oauth_token.
+#, fuzzy
+msgid "Could not link your Twitter account: oauth_token mismatch."
 msgstr ""
 "�е вдаєть�� підключити ваш акаунт Twitter: невідповідні�ть oauth_token."
 
-msgid "Couldn't link your Twitter account."
-msgstr "�е вдаєть�� підключити ваш акаунт Twitter."
-
-#, php-format
+#. TRANS: Page instruction. %s is the StatusNet sitename.
+#, fuzzy, php-format
 msgid ""
-"This is the first time you've logged into %s so we must connect your Twitter "
-"account to a local account. You can either create a new account, or connect "
-"with your existing account, if you have one."
+"This is the first time you have logged into %s so we must connect your "
+"Twitter account to a local account. You can either create a new account, or "
+"connect with your existing account, if you have one."
 msgstr ""
 "Ви вперше увійшли до �айту %s, отже ми му�имо приєднати ваш акаунт Twitter "
 "до акаунту на даному �айті. Ви маєте можливі�ть �творити новий акаунт або "
 "викори�тати такий, що вже і�нує, �кщо він у ва� є."
 
+#. TRANS: Page title.
 msgid "Twitter Account Setup"
 msgstr "Створенн� акаунту за допомогою Twitter"
 
+#. TRANS: Fieldset legend.
 msgid "Connection options"
 msgstr "Опції з’єднанн�"
 
+#. TRANS: Fieldset legend.
+msgid "Create new account"
+msgstr "Створити новий акаунт"
+
+#. TRANS: Sub form introduction text.
+msgid "Create a new user with this nickname."
+msgstr "Створити нового кори�тувача з цим нікнеймом."
+
+#. TRANS: Field label.
+msgid "New nickname"
+msgstr "�овий нікнейм"
+
+#. TRANS: Field title for nickname field.
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
+msgstr "1-64 р�дкові літери і цифри, ні�кої пунктуації або інтервалів."
+
+#. TRANS: Field label.
+msgctxt "LABEL"
+msgid "Email"
+msgstr "Пошта"
+
+#. TRANS: Field title for e-mail address field.
+msgid "Used only for updates, announcements, and password recovery"
+msgstr ""
+"Викори�товуєть�� лише дл� над�иланн� оновлень, оголошень та відновленн� "
+"парол�."
+
+#. TRANS: Button text for creating a new StatusNet account in the Twitter connect page.
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Create"
+msgstr "Створити"
+
+#. TRANS: Fieldset legend.
+msgid "Connect existing account"
+msgstr "Приєднати акаунт, �кий вже і�нує"
+
+#. TRANS: Sub form introduction text.
+msgid ""
+"If you already have an account, login with your username and password to "
+"connect it to your Twitter account."
+msgstr ""
+"Якщо ви вже маєте акаунт, увійдіть з вашим ім’�м кори�тувача та паролем, аби "
+"приєднати їх до Twitter."
+
+#. TRANS: Field label.
+msgid "Existing nickname"
+msgstr "�ікнейм, �кий вже і�нує"
+
+#. TRANS: Field label.
+msgid "Password"
+msgstr "Пароль"
+
+#. TRANS: Fieldset legend.
+msgid "License"
+msgstr ""
+
+#. TRANS: Text for license agreement checkbox.
+#. TRANS: %s is the license as configured for the StatusNet site.
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
@@ -146,119 +238,117 @@ msgstr ""
 "Мої допи�и і файли до�тупні на умовах %s, окрім цих приватних даних: пароль, "
 "електронна адре�а, адре�а IM, телефонний номер."
 
-msgid "Create new account"
-msgstr "Створити новий акаунт"
-
-msgid "Create a new user with this nickname."
-msgstr "Створити нового кори�тувача з цим нікнеймом."
-
-msgid "New nickname"
-msgstr "�овий нікнейм"
-
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
-msgstr "1-64 р�дкові літери і цифри, ні�кої пунктуації або інтервалів."
-
-msgctxt "LABEL"
-msgid "Email"
-msgstr "Пошта"
-
-msgid "Used only for updates, announcements, and password recovery"
-msgstr ""
-"Викори�товуєть�� лише дл� над�иланн� оновлень, оголошень та відновленн� "
-"парол�."
-
-msgid "Create"
-msgstr "Створити"
-
-msgid "Connect existing account"
-msgstr "Приєднати акаунт, �кий вже і�нує"
-
-msgid ""
-"If you already have an account, login with your username and password to "
-"connect it to your Twitter account."
-msgstr ""
-"Якщо ви вже маєте акаунт, увійдіть з вашим ім’�м кори�тувача та паролем, аби "
-"приєднати їх до Twitter."
-
-msgid "Existing nickname"
-msgstr "�ікнейм, �кий вже і�нує"
-
-msgid "Password"
-msgstr "Пароль"
-
+#. TRANS: Button text for connecting an existing StatusNet account in the Twitter connect page..
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Connect"
 msgstr "Під’єднати"
 
+#. TRANS: Client error displayed when trying to create a new user while creating new users is not allowed.
 msgid "Registration not allowed."
 msgstr "Реє�трацію не дозволено."
 
+#. TRANS: Client error displayed when trying to create a new user with an invalid invitation code.
 msgid "Not a valid invitation code."
 msgstr "Це не дій�ний код запрошенн�."
 
+#. TRANS: Client error displayed when trying to create a new user with an invalid username.
 msgid "Nickname not allowed."
 msgstr "�ікнейм не допу�каєть��."
 
+#. TRANS: Client error displayed when trying to create a new user with a username that is already in use.
 msgid "Nickname already in use. Try another one."
 msgstr "Цей нікнейм вже викори�товуєть��. Спробуйте інший."
 
+#. TRANS: Server error displayed when creating a new user has failed.
 msgid "Error registering user."
 msgstr "Помилка при реє�трації кори�тувача."
 
+#. TRANS: Server error displayed when connecting a user to a Twitter user has failed.
+#. TRANS: Server error displayed connecting a user to a Twitter user has failed.
 msgid "Error connecting user to Twitter."
 msgstr "Помилка при підключенні кори�тувача до Twitter."
 
+#. TRANS: Form validation error displayed when connecting an existing user to a Twitter user fails because
+#. TRANS: the provided username and/or password are incorrect.
 msgid "Invalid username or password."
 msgstr "�едій�не ім’� або пароль."
 
+#. TRANS: Page title for Twitter administration panel.
+#, fuzzy
+msgctxt "TITLE"
 msgid "Twitter"
 msgstr "Twitter"
 
+#. TRANS: Instructions for Twitter bridge administration page.
 msgid "Twitter bridge settings"
 msgstr "�алаштуванн� мі�тка з Twitter"
 
-msgid "Invalid consumer key. Max length is 255 characters."
+#. TRANS: Client error displayed when a consumer key is invalid because it is too long.
+#, fuzzy
+msgid "Invalid consumer key. Maximum length is 255 characters."
 msgstr "�евірний ключ �поживача. Мак�имальна довжина — 255 �имволів."
 
-msgid "Invalid consumer secret. Max length is 255 characters."
+#. TRANS: Client error displayed when a consumer secret is invalid because it is too long.
+#, fuzzy
+msgid "Invalid consumer secret. Maximum length is 255 characters."
 msgstr "�евірний �екретний код �поживача. Мак�имальна довжина — 255 �имволів."
 
+#. TRANS: Fieldset legend for Twitter application settings.
 msgid "Twitter application settings"
 msgstr "�алаштуванн� додатку дл� Twitter"
 
+#. TRANS: Field label for Twitter assigned consumer key.
 msgid "Consumer key"
 msgstr "Ключ �поживача"
 
-msgid "Consumer key assigned by Twitter"
+#. TRANS: Field title for Twitter assigned consumer key.
+#, fuzzy
+msgid "The consumer key assigned by Twitter."
 msgstr "Ключ �поживача, що він був наданий �ерві�ом Twitter"
 
+#. TRANS: Field label for Twitter assigned consumer secret.
 msgid "Consumer secret"
 msgstr "Секретний код �поживача"
 
-msgid "Consumer secret assigned by Twitter"
+#. TRANS: Field title for Twitter assigned consumer secret.
+#, fuzzy
+msgid "The consumer secret assigned by Twitter."
 msgstr "Секретний код �поживача, що він був наданий �ерві�ом Twitter"
 
-msgid "Note: a global consumer key and secret are set."
+#. TRANS: Form guide displayed when two required fields have already been provided.
+#, fuzzy
+msgid "Note: A global consumer key and secret are set."
 msgstr "Примітка: глобальний ключ �поживача та �екретний код в�тановлено."
 
+#. TRANS: Field label for Twitter application name.
 msgid "Integration source"
 msgstr "Джерело об’єднанн�"
 
-msgid "Name of your Twitter application"
+#. TRANS: Field title for Twitter application name.
+#, fuzzy
+msgid "The name of your Twitter application."
 msgstr "�азва вашого додатку дл� Twitter"
 
+#. TRANS: Fieldset legend for Twitter integration options.
 msgid "Options"
 msgstr "Параметри"
 
+#. TRANS: Checkbox label for global setting.
 msgid "Enable \"Sign-in with Twitter\""
 msgstr "Увімкнути «Увійти з допомогою Twitter»"
 
-msgid "Allow users to login with their Twitter credentials"
+#. TRANS: Checkbox title.
+#, fuzzy
+msgid "This allow users to login with their Twitter credentials."
 msgstr ""
 "Дозволити кори�тувачам входити на �айт, викори�товуючи повноваженн� Twitter"
 
+#. TRANS: Checkbox label for global setting.
 msgid "Enable Twitter import"
 msgstr "Увімкнути імпорт з Twitter"
 
+#. TRANS: Checkbox title for global setting.
 msgid ""
 "Allow users to import their Twitter friends' timelines. Requires daemons to "
 "be manually configured."
@@ -266,18 +356,69 @@ msgstr ""
 "Дозволити кори�тувачам імпортувати їхні �трічки допи�ів з Twitter. Це "
 "вимагає ручної на�тройки проце�ів типу «daemon»."
 
-msgid "Save Twitter settings"
-msgstr "Зберегти налаштуванн� Twitter"
+#. TRANS: Button title for saving the administrative Twitter bridge settings.
+#, fuzzy
+msgid "Save the Twitter bridge settings."
+msgstr "�алаштуванн� мі�тка з Twitter"
 
-msgid "Login or register using Twitter"
+#. TRANS: Server exception thrown when an invalid URL scheme is detected.
+msgid "Invalid URL scheme for HTTP stream reader."
+msgstr ""
+
+#. TRANS: Exception thrown when input from an inexpected socket is encountered.
+msgid "Got input from unexpected socket!"
+msgstr ""
+
+#. TRANS: Exception thrown when an invalid state is encountered in handleLine.
+#. TRANS: %s is the invalid state.
+#, php-format
+msgid "Invalid state in handleLine: %s."
+msgstr ""
+
+#. TRANS: Exception thrown when an invalid response line is encountered.
+#. TRANS: %s is the invalid line.
+#, php-format
+msgid "Invalid HTTP response line: %s."
+msgstr ""
+
+#. TRANS: Exception thrown when an invalid response line part is encountered.
+#. TRANS: %1$s is the chunk, %2$s is the line.
+#, php-format
+msgid "Invalid HTTP response line chunk \"%1$s\": %2$s."
+msgstr ""
+
+#. TRANS: Exception thrown when an invalid response code is encountered.
+#. TRANS: %1$s is the response code, %2$s is the line.
+#, php-format
+msgid "Bad HTTP response code %1$s: %2$s."
+msgstr ""
+
+#. TRANS: Menu item in login navigation.
+#. TRANS: Menu item in connection settings navigation.
+#, fuzzy
+msgctxt "MENU"
+msgid "Twitter"
+msgstr "Twitter"
+
+#. TRANS: Title for menu item in login navigation.
+#, fuzzy
+msgid "Login or register using Twitter."
 msgstr "Увійти або зареє�трувати�ь з Twitter"
 
+#. TRANS: Title for menu item in connection settings navigation.
 msgid "Twitter integration options"
 msgstr "Параметри інтеграції з Twitter"
 
-msgid "Twitter bridge configuration"
+#. TRANS: Menu item in administrative panel that leads to the Twitter bridge configuration.
+msgid "Twitter"
+msgstr "Twitter"
+
+#. TRANS: Menu item title in administrative panel that leads to the Twitter bridge configuration.
+#, fuzzy
+msgid "Twitter bridge configuration page."
 msgstr "�алаштуванн� мі�тка з Twitter"
 
+#. TRANS: Plugin description.
 msgid ""
 "The Twitter \"bridge\" plugin allows integration of a StatusNet instance "
 "with <a href=\"http://twitter.com/\">Twitter</a>."
@@ -285,15 +426,21 @@ msgstr ""
 "Додаток TwitterBridge дозвол�є інтегрувати StatusNet-�умі�ний �айт з <a href="
 "\"http://twitter.com/\">Twitter</a>, в�тановлюючи так званий «мі�ток»."
 
+#. TRANS: Client error displayed when trying to log in using Twitter while already logged in to StatusNet.
 msgid "Already logged in."
 msgstr "Тепер ви увійшли."
 
+#. TRANS: Title for login using Twitter page.
+#, fuzzy
+msgctxt "TITLE"
 msgid "Twitter Login"
 msgstr "Вхід Twitter"
 
+#. TRANS: Instructions for login using Twitter page.
 msgid "Login with your Twitter account"
 msgstr "Увійти за допомогою акаунту Twitter"
 
+#. TRANS: Alternative text for "sign in with Twitter" image.
 msgid "Sign in with Twitter"
 msgstr "Увійти з акаунтом Twitter"
 
diff --git a/plugins/TwitterBridge/locale/zh_CN/LC_MESSAGES/TwitterBridge.po b/plugins/TwitterBridge/locale/zh_CN/LC_MESSAGES/TwitterBridge.po
index ab0c705277..20abf21d80 100644
--- a/plugins/TwitterBridge/locale/zh_CN/LC_MESSAGES/TwitterBridge.po
+++ b/plugins/TwitterBridge/locale/zh_CN/LC_MESSAGES/TwitterBridge.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - TwitterBridge to Simplified Chinese (‪中文(简体)‬)
+# Translation of StatusNet - TwitterBridge to Simplified Chinese (‪中文（简体）‬)
 # Exported from translatewiki.net
 #
 # Author: Hydra
@@ -11,130 +11,219 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TwitterBridge\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:46+0000\n"
-"Language-Team: Simplified Chinese <http://translatewiki.net/wiki/Portal:zh-"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:23+0000\n"
+"Language-Team: Simplified Chinese <https://translatewiki.net/wiki/Portal:zh-"
 "hans>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:29+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-12-03 13:51:38+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: #out-statusnet-plugin-twitterbridge\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#. TRANS: Title for page with Twitter integration settings.
 msgid "Twitter settings"
 msgstr "Twitter 设置"
 
+#. TRANS: Instructions for page with Twitter integration settings.
 msgid ""
 "Connect your Twitter account to share your updates with your Twitter friends "
 "and vice-versa."
 msgstr ""
 "关�你的 Twitter ��并与你的 Twitter 好�分享你的更新和查看好�的更新。"
 
+#. TRANS: Fieldset legend.
 msgid "Twitter account"
 msgstr "Twitter ��"
 
+#. TRANS: Form note when a Twitter account has been connected.
 msgid "Connected Twitter account"
 msgstr "已关�的 Twitter ��"
 
+#. TRANS: Fieldset legend.
 msgid "Disconnect my account from Twitter"
 msgstr "�消我的��与 Twitter 的关�"
 
-msgid "Disconnecting your Twitter could make it impossible to log in! Please "
+#. TRANS: Form guide. %s is a URL to the password settings.
+#. TRANS: This message contains a Markdown link in the form [description](link).
+#, fuzzy, php-format
+msgid ""
+"Disconnecting your Twitter account could make it impossible to log in! "
+"Please [set a password](%s) first."
 msgstr "�消关�你的 Twitter ��和能会导致无法登录�请"
 
-msgid "set a password"
-msgstr "设置一个密�"
-
-msgid " first."
-msgstr "先。"
-
-#. TRANS: %1$s is the current website name.
+#. TRANS: Form instructions. %1$s is the StatusNet sitename.
 #, php-format
 msgid ""
 "Keep your %1$s account but disconnect from Twitter. You can use your %1$s "
 "password to log in."
 msgstr "�留你的 %1$s ��并�消关� Twitter。你�以使用你的 %1$s 密��登录。"
 
+#. TRANS: Button text for disconnecting a Twitter account.
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Disconnect"
 msgstr "�消关�"
 
+#. TRANS: Fieldset legend.
 msgid "Preferences"
 msgstr "�数设置"
 
+#. TRANS: Checkbox label.
 msgid "Automatically send my notices to Twitter."
 msgstr "自动将我的消���到 Twitter。"
 
+#. TRANS: Checkbox label.
 msgid "Send local \"@\" replies to Twitter."
 msgstr "将本地的“@�回���到 Twitter。"
 
+#. TRANS: Checkbox label.
 msgid "Subscribe to my Twitter friends here."
 msgstr "关注我在这里的 Twitter 好�。"
 
+#. TRANS: Checkbox label.
 msgid "Import my friends timeline."
 msgstr "导入我好�的时间线。"
 
+#. TRANS: Button text for saving Twitter integration settings.
+#. TRANS: Button text for saving the administrative Twitter bridge settings.
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Save"
 msgstr "�存"
 
+#. TRANS: Button text for adding Twitter integration.
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Add"
 msgstr "添加"
 
+#. TRANS: Client error displayed when the session token does not match or is not given.
 msgid "There was a problem with your session token. Try again, please."
 msgstr "你的 session token 出现了一个问题，请�试。"
 
+#. TRANS: Client error displayed when the submitted form contains unexpected data.
 msgid "Unexpected form submission."
 msgstr "未预料的表��交。"
 
+#. TRANS: Client error displayed when trying to remove a connected Twitter account when there isn't one connected.
 msgid "No Twitter connection to remove."
 msgstr "没有�以移除的Twitter连接。"
 
-msgid "Couldn't remove Twitter user."
+#. TRANS: Server error displayed when trying to remove a connected Twitter account fails.
+#, fuzzy
+msgid "Could not remove Twitter user."
 msgstr "无法删除 Twitter 用户。"
 
+#. TRANS: Success message displayed after disconnecting a Twitter account.
 msgid "Twitter account disconnected."
 msgstr "已�消 Twitter ��关�。"
 
-msgid "Couldn't save Twitter preferences."
+#. TRANS: Server error displayed when saving Twitter integration preferences fails.
+#, fuzzy
+msgid "Could not save Twitter preferences."
 msgstr "无法�存 Twitter �数设置。"
 
+#. TRANS: Success message after saving Twitter integration preferences.
 msgid "Twitter preferences saved."
 msgstr "已�存 Twitter �数设置。"
 
+#. TRANS: Form validation error displayed when the checkbox to agree to the license has not been checked.
 #, fuzzy
 msgid "You cannot register if you do not agree to the license."
 msgstr "你必须��许��议�能注册。"
 
+#. TRANS: Form validation error displayed when an unhandled error occurs.
 msgid "Something weird happened."
 msgstr "�生了很诡异的事情。"
 
+#. TRANS: Server error displayed when linking to a Twitter account fails.
 #, fuzzy
 msgid "Could not link your Twitter account."
 msgstr "无法连接你的 Twitter ��。"
 
-msgid "Couldn't link your Twitter account: oauth_token mismatch."
+#. TRANS: Server error displayed when linking to a Twitter account fails because of an incorrect oauth_token.
+#, fuzzy
+msgid "Could not link your Twitter account: oauth_token mismatch."
 msgstr "无法连接你的 Twitter ��：oauth_token �符。"
 
-msgid "Couldn't link your Twitter account."
-msgstr "无法连接你的 Twitter ��。"
-
-#, php-format
+#. TRANS: Page instruction. %s is the StatusNet sitename.
+#, fuzzy, php-format
 msgid ""
-"This is the first time you've logged into %s so we must connect your Twitter "
-"account to a local account. You can either create a new account, or connect "
-"with your existing account, if you have one."
+"This is the first time you have logged into %s so we must connect your "
+"Twitter account to a local account. You can either create a new account, or "
+"connect with your existing account, if you have one."
 msgstr ""
 "这是你第一次登录到 %s，我们需�将你的 Twitter ��与一个本地的��关�。你�"
 "以新建一个��，或者使用你在本站已有的��。"
 
+#. TRANS: Page title.
 msgid "Twitter Account Setup"
 msgstr "Twitter ��设置"
 
+#. TRANS: Fieldset legend.
 msgid "Connection options"
 msgstr "连接选项"
 
+#. TRANS: Fieldset legend.
+msgid "Create new account"
+msgstr "创建新�户"
+
+#. TRANS: Sub form introduction text.
+msgid "Create a new user with this nickname."
+msgstr "以此昵称创建新�户"
+
+#. TRANS: Field label.
+msgid "New nickname"
+msgstr "新昵称"
+
+#. TRANS: Field title for nickname field.
+#, fuzzy
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
+msgstr "1 到 64 个�写字�或数字，�包�标点或空格"
+
+#. TRANS: Field label.
+msgctxt "LABEL"
+msgid "Email"
+msgstr ""
+
+#. TRANS: Field title for e-mail address field.
+msgid "Used only for updates, announcements, and password recovery"
+msgstr ""
+
+#. TRANS: Button text for creating a new StatusNet account in the Twitter connect page.
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Create"
+msgstr "创建"
+
+#. TRANS: Fieldset legend.
+msgid "Connect existing account"
+msgstr "关�现有账�"
+
+#. TRANS: Sub form introduction text.
+msgid ""
+"If you already have an account, login with your username and password to "
+"connect it to your Twitter account."
+msgstr "如果你已有��，请输入用户�和密�登录并将其与你的 Twitter 账�关�。"
+
+#. TRANS: Field label.
+msgid "Existing nickname"
+msgstr "已存在的昵称"
+
+#. TRANS: Field label.
+msgid "Password"
+msgstr "密�"
+
+#. TRANS: Fieldset legend.
+msgid "License"
+msgstr ""
+
+#. TRANS: Text for license agreement checkbox.
+#. TRANS: %s is the license as configured for the StatusNet site.
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
@@ -143,132 +232,184 @@ msgstr ""
 "我的文字和文件在%s下�供，除了如下��内容：密��电�邮件地��IM 地�和电�"
 "��。"
 
-msgid "Create new account"
-msgstr "创建新�户"
-
-msgid "Create a new user with this nickname."
-msgstr "以此昵称创建新�户"
-
-msgid "New nickname"
-msgstr "新昵称"
-
+#. TRANS: Button text for connecting an existing StatusNet account in the Twitter connect page..
 #, fuzzy
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
-msgstr "1 到 64 个�写字�或数字，�包�标点或空格"
-
-msgctxt "LABEL"
-msgid "Email"
-msgstr ""
-
-msgid "Used only for updates, announcements, and password recovery"
-msgstr ""
-
-msgid "Create"
-msgstr "创建"
-
-msgid "Connect existing account"
-msgstr "关�现有账�"
-
-msgid ""
-"If you already have an account, login with your username and password to "
-"connect it to your Twitter account."
-msgstr "如果你已有��，请输入用户�和密�登录并将其与你的 Twitter 账�关�。"
-
-msgid "Existing nickname"
-msgstr "已存在的昵称"
-
-msgid "Password"
-msgstr "密�"
-
+msgctxt "BUTTON"
 msgid "Connect"
 msgstr "关�"
 
+#. TRANS: Client error displayed when trying to create a new user while creating new users is not allowed.
 msgid "Registration not allowed."
 msgstr "��许注册。"
 
+#. TRANS: Client error displayed when trying to create a new user with an invalid invitation code.
 msgid "Not a valid invitation code."
 msgstr "无效的邀请�。"
 
+#. TRANS: Client error displayed when trying to create a new user with an invalid username.
 msgid "Nickname not allowed."
 msgstr "昵称�被�许。"
 
+#. TRANS: Client error displayed when trying to create a new user with a username that is already in use.
 msgid "Nickname already in use. Try another one."
 msgstr "昵称已被使用，�一个�。"
 
+#. TRANS: Server error displayed when creating a new user has failed.
 msgid "Error registering user."
 msgstr "注册用户出错。"
 
+#. TRANS: Server error displayed when connecting a user to a Twitter user has failed.
+#. TRANS: Server error displayed connecting a user to a Twitter user has failed.
 msgid "Error connecting user to Twitter."
 msgstr "关�用户到 Twitter 出错。"
 
+#. TRANS: Form validation error displayed when connecting an existing user to a Twitter user fails because
+#. TRANS: the provided username and/or password are incorrect.
 msgid "Invalid username or password."
 msgstr "用户�或密��正确。"
 
+#. TRANS: Page title for Twitter administration panel.
+#, fuzzy
+msgctxt "TITLE"
 msgid "Twitter"
 msgstr "Twitter"
 
+#. TRANS: Instructions for Twitter bridge administration page.
 msgid "Twitter bridge settings"
 msgstr "Twitter bridge 设置"
 
-msgid "Invalid consumer key. Max length is 255 characters."
+#. TRANS: Client error displayed when a consumer key is invalid because it is too long.
+#, fuzzy
+msgid "Invalid consumer key. Maximum length is 255 characters."
 msgstr "无效的 consumer key。最大长度为 255 字符。"
 
-msgid "Invalid consumer secret. Max length is 255 characters."
+#. TRANS: Client error displayed when a consumer secret is invalid because it is too long.
+#, fuzzy
+msgid "Invalid consumer secret. Maximum length is 255 characters."
 msgstr "无效的 consumer secret。最大长度为 255 字符。"
 
+#. TRANS: Fieldset legend for Twitter application settings.
 msgid "Twitter application settings"
 msgstr "Twitter 应用设置"
 
+#. TRANS: Field label for Twitter assigned consumer key.
 msgid "Consumer key"
 msgstr "Consumer key"
 
-msgid "Consumer key assigned by Twitter"
+#. TRANS: Field title for Twitter assigned consumer key.
+#, fuzzy
+msgid "The consumer key assigned by Twitter."
 msgstr "Twitter 分�的 consumer key"
 
+#. TRANS: Field label for Twitter assigned consumer secret.
 msgid "Consumer secret"
 msgstr "Consumer secret"
 
-msgid "Consumer secret assigned by Twitter"
+#. TRANS: Field title for Twitter assigned consumer secret.
+#, fuzzy
+msgid "The consumer secret assigned by Twitter."
 msgstr "Twitter 分�的 consumer secret"
 
-msgid "Note: a global consumer key and secret are set."
+#. TRANS: Form guide displayed when two required fields have already been provided.
+#, fuzzy
+msgid "Note: A global consumer key and secret are set."
 msgstr "注�：已设置了一个全局的 consumer key 和 secret。"
 
+#. TRANS: Field label for Twitter application name.
 msgid "Integration source"
 msgstr "整���"
 
-msgid "Name of your Twitter application"
+#. TRANS: Field title for Twitter application name.
+#, fuzzy
+msgid "The name of your Twitter application."
 msgstr "你的 Twitter 应用�称"
 
+#. TRANS: Fieldset legend for Twitter integration options.
 msgid "Options"
 msgstr "选项"
 
+#. TRANS: Checkbox label for global setting.
 msgid "Enable \"Sign-in with Twitter\""
 msgstr "�用 “使用 Twitter 登录�"
 
-msgid "Allow users to login with their Twitter credentials"
+#. TRANS: Checkbox title.
+#, fuzzy
+msgid "This allow users to login with their Twitter credentials."
 msgstr "�许用户使用他们的 Twitter ��登录。"
 
+#. TRANS: Checkbox label for global setting.
 msgid "Enable Twitter import"
 msgstr "�用 Twitter 导入"
 
+#. TRANS: Checkbox title for global setting.
 msgid ""
 "Allow users to import their Twitter friends' timelines. Requires daemons to "
 "be manually configured."
 msgstr "�许用户导入他们 Twitter 好�的时间线。需�手动设置��进程。"
 
-msgid "Save Twitter settings"
-msgstr "�存 Twitter 设置"
+#. TRANS: Button title for saving the administrative Twitter bridge settings.
+#, fuzzy
+msgid "Save the Twitter bridge settings."
+msgstr "Twitter bridge 设置"
 
-msgid "Login or register using Twitter"
+#. TRANS: Server exception thrown when an invalid URL scheme is detected.
+msgid "Invalid URL scheme for HTTP stream reader."
+msgstr ""
+
+#. TRANS: Exception thrown when input from an inexpected socket is encountered.
+msgid "Got input from unexpected socket!"
+msgstr ""
+
+#. TRANS: Exception thrown when an invalid state is encountered in handleLine.
+#. TRANS: %s is the invalid state.
+#, php-format
+msgid "Invalid state in handleLine: %s."
+msgstr ""
+
+#. TRANS: Exception thrown when an invalid response line is encountered.
+#. TRANS: %s is the invalid line.
+#, php-format
+msgid "Invalid HTTP response line: %s."
+msgstr ""
+
+#. TRANS: Exception thrown when an invalid response line part is encountered.
+#. TRANS: %1$s is the chunk, %2$s is the line.
+#, php-format
+msgid "Invalid HTTP response line chunk \"%1$s\": %2$s."
+msgstr ""
+
+#. TRANS: Exception thrown when an invalid response code is encountered.
+#. TRANS: %1$s is the response code, %2$s is the line.
+#, php-format
+msgid "Bad HTTP response code %1$s: %2$s."
+msgstr ""
+
+#. TRANS: Menu item in login navigation.
+#. TRANS: Menu item in connection settings navigation.
+#, fuzzy
+msgctxt "MENU"
+msgid "Twitter"
+msgstr "Twitter"
+
+#. TRANS: Title for menu item in login navigation.
+#, fuzzy
+msgid "Login or register using Twitter."
 msgstr "使用 Twitter 登录或注册"
 
+#. TRANS: Title for menu item in connection settings navigation.
 msgid "Twitter integration options"
 msgstr "Twitter 整�选项"
 
-msgid "Twitter bridge configuration"
+#. TRANS: Menu item in administrative panel that leads to the Twitter bridge configuration.
+msgid "Twitter"
+msgstr "Twitter"
+
+#. TRANS: Menu item title in administrative panel that leads to the Twitter bridge configuration.
+#, fuzzy
+msgid "Twitter bridge configuration page."
 msgstr "Twitter bridge 设置"
 
+#. TRANS: Plugin description.
 msgid ""
 "The Twitter \"bridge\" plugin allows integration of a StatusNet instance "
 "with <a href=\"http://twitter.com/\">Twitter</a>."
@@ -276,15 +417,21 @@ msgstr ""
 "Twitter \"bridge\" 是个�以让 StatusNet 账户与 <a href=\"http://twitter.com/"
 "\">Twitter</a> 整�的�件。"
 
+#. TRANS: Client error displayed when trying to log in using Twitter while already logged in to StatusNet.
 msgid "Already logged in."
 msgstr "已登录。"
 
+#. TRANS: Title for login using Twitter page.
+#, fuzzy
+msgctxt "TITLE"
 msgid "Twitter Login"
 msgstr "Twitter 登录"
 
+#. TRANS: Instructions for login using Twitter page.
 msgid "Login with your Twitter account"
 msgstr "使用你的 Twitter ��登录"
 
+#. TRANS: Alternative text for "sign in with Twitter" image.
 msgid "Sign in with Twitter"
 msgstr "使用 Twitter 登录"
 
diff --git a/plugins/TwitterBridge/tweetinqueuehandler.php b/plugins/TwitterBridge/tweetinqueuehandler.php
index ff6b2cc861..7f34ade23b 100644
--- a/plugins/TwitterBridge/tweetinqueuehandler.php
+++ b/plugins/TwitterBridge/tweetinqueuehandler.php
@@ -51,10 +51,14 @@ class TweetInQueueHandler extends QueueHandler
         $importer = new TwitterImport();
         $notice = $importer->importStatus($status);
         if ($notice) {
-            $flink = Foreign_link::getByForeignID(TWITTER_SERVICE, $receiver);
+            $flink = Foreign_link::getByForeignID($receiver, TWITTER_SERVICE);
             if ($flink) {
+                common_log(LOG_DEBUG, "TweetInQueueHandler - Got flink so add notice ".
+                           $notice->id." to inbox ".$flink->user_id);
                 // @fixme this should go through more regular channels?
                 Inbox::insertNotice($flink->user_id, $notice->id);
+            }else {
+               common_log(LOG_DEBUG, "TweetInQueueHandler - No flink found for foreign user ".$receiver);
             }
         }
 
diff --git a/plugins/TwitterBridge/twitter.php b/plugins/TwitterBridge/twitter.php
index 396de22b09..ac61cc6160 100644
--- a/plugins/TwitterBridge/twitter.php
+++ b/plugins/TwitterBridge/twitter.php
@@ -1,7 +1,7 @@
 <?php
 /*
  * StatusNet - the distributed open-source microblogging tool
- * Copyright (C) 2008-2010 StatusNet, Inc.
+ * Copyright (C) 2008-2011 StatusNet, Inc.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -23,8 +23,6 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
 
 define('TWITTER_SERVICE', 1); // Twitter is foreign_service ID 1
 
-require_once INSTALLDIR . '/plugins/TwitterBridge/twitteroauthclient.php';
-
 function add_twitter_user($twitter_id, $screen_name)
 {
     // Clear out any bad old foreign_users with the new user's legit URL
@@ -71,7 +69,6 @@ function save_twitter_user($twitter_id, $screen_name)
     $fuser = Foreign_user::getForeignUser($twitter_id, TWITTER_SERVICE);
 
     if (!empty($fuser)) {
-
         // Delete old record if Twitter user changed screen name
 
         if ($fuser->nickname != $screen_name) {
@@ -105,14 +102,27 @@ function save_twitter_user($twitter_id, $screen_name)
 }
 
 function is_twitter_bound($notice, $flink) {
+
+    // Don't send activity activities (at least for now)
+    if ($notice->object_type == ActivityObject::ACTIVITY) {
+        return false;
+    }
+
+    $allowedVerbs = array(ActivityVerb::POST, ActivityVerb::SHARE);
+
+    // Don't send things that aren't posts or repeats (at least for now)
+    if (!in_array($notice->verb, $allowedVerbs)) {
+        return false;
+    }
+
     // Check to see if notice should go to Twitter
-    if (!empty($flink) && ($flink->noticesync & FOREIGN_NOTICE_SEND)) {
+    if (!empty($flink) && (($flink->noticesync & FOREIGN_NOTICE_SEND) == FOREIGN_NOTICE_SEND)) {
 
         // If it's not a Twitter-style reply, or if the user WANTS to send replies,
         // or if it's in reply to a twitter notice
-        if (!preg_match('/^@[a-zA-Z0-9_]{1,15}\b/u', $notice->content) ||
-            ($flink->noticesync & FOREIGN_NOTICE_SEND_REPLY) ||
-            is_twitter_notice($notice->reply_to)) {
+        if ( (($flink->noticesync & FOREIGN_NOTICE_SEND_REPLY) == FOREIGN_NOTICE_SEND_REPLY) ||
+             (is_twitter_notice($notice->reply_to) || is_twitter_notice($notice->repeat_of)) ||
+             (empty($notice->reply_to) && !preg_match('/^@[a-zA-Z0-9_]{1,15}\b/u', $notice->content)) ){
             return true;
         }
     }
diff --git a/plugins/TwitterBridge/twitteradminpanel.php b/plugins/TwitterBridge/twitteradminpanel.php
index 1a83b47d56..9ace4e4a97 100644
--- a/plugins/TwitterBridge/twitteradminpanel.php
+++ b/plugins/TwitterBridge/twitteradminpanel.php
@@ -49,7 +49,8 @@ class TwitteradminpanelAction extends AdminPanelAction
      */
     function title()
     {
-        return _m('Twitter');
+        // TRANS: Page title for Twitter administration panel.
+        return _m('TITLE','Twitter');
     }
 
     /**
@@ -59,6 +60,7 @@ class TwitteradminpanelAction extends AdminPanelAction
      */
     function getInstructions()
     {
+        // TRANS: Instructions for Twitter bridge administration page.
         return _m('Twitter bridge settings');
     }
 
@@ -147,13 +149,15 @@ class TwitteradminpanelAction extends AdminPanelAction
 
         if (mb_strlen($values['twitter']['consumer_key']) > 255) {
             $this->clientError(
-                _m("Invalid consumer key. Max length is 255 characters.")
+                // TRANS: Client error displayed when a consumer key is invalid because it is too long.
+                _m('Invalid consumer key. Maximum length is 255 characters.')
             );
         }
 
         if (mb_strlen($values['twitter']['consumer_secret']) > 255) {
             $this->clientError(
-                _m("Invalid consumer secret. Max length is 255 characters.")
+                // TRANS: Client error displayed when a consumer secret is invalid because it is too long.
+                _m('Invalid consumer secret. Maximum length is 255 characters.')
             );
         }
     }
@@ -209,14 +213,17 @@ class TwitterAdminPanelForm extends AdminForm
             'fieldset',
             array('id' => 'settings_twitter-application')
         );
+        // TRANS: Fieldset legend for Twitter application settings.
         $this->out->element('legend', null, _m('Twitter application settings'));
         $this->out->elementStart('ul', 'form_data');
 
         $this->li();
         $this->input(
             'consumer_key',
+            // TRANS: Field label for Twitter assigned consumer key.
             _m('Consumer key'),
-            _m('Consumer key assigned by Twitter'),
+            // TRANS: Field title for Twitter assigned consumer key.
+            _m('The consumer key assigned by Twitter.'),
             'twitter'
         );
         $this->unli();
@@ -224,8 +231,10 @@ class TwitterAdminPanelForm extends AdminForm
         $this->li();
         $this->input(
             'consumer_secret',
-             _m('Consumer secret'),
-            _m('Consumer secret assigned by Twitter'),
+            // TRANS: Field label for Twitter assigned consumer secret.
+            _m('Consumer secret'),
+            // TRANS: Field title for Twitter assigned consumer secret.
+            _m('The consumer secret assigned by Twitter.'),
             'twitter'
         );
         $this->unli();
@@ -235,15 +244,18 @@ class TwitterAdminPanelForm extends AdminForm
 
         if (!empty($globalConsumerKey) && !empty($globalConsumerSec)) {
             $this->li();
-            $this->out->element('p', 'form_guide', _m('Note: a global consumer key and secret are set.'));
+            // TRANS: Form guide displayed when two required fields have already been provided.
+            $this->out->element('p', 'form_guide', _m('Note: A global consumer key and secret are set.'));
             $this->unli();
         }
 
         $this->li();
         $this->input(
             'source',
-             _m('Integration source'),
-            _m('Name of your Twitter application'),
+            // TRANS: Field label for Twitter application name.
+            _m('Integration source'),
+            // TRANS: Field title for Twitter application name.
+            _m('The name of your Twitter application.'),
             'integration'
         );
         $this->unli();
@@ -255,6 +267,7 @@ class TwitterAdminPanelForm extends AdminForm
             'fieldset',
             array('id' => 'settings_twitter-options')
         );
+        // TRANS: Fieldset legend for Twitter integration options.
         $this->out->element('legend', null, _m('Options'));
 
         $this->out->elementStart('ul', 'form_data');
@@ -262,17 +275,21 @@ class TwitterAdminPanelForm extends AdminForm
         $this->li();
 
         $this->out->checkbox(
+            // TRANS: Checkbox label for global setting.
             'signin', _m('Enable "Sign-in with Twitter"'),
             (bool) $this->value('signin', 'twitter'),
-            _m('Allow users to login with their Twitter credentials')
+            // TRANS: Checkbox title.
+            _m('This allow users to login with their Twitter credentials.')
         );
         $this->unli();
 
         if (Event::handle('TwitterBridgeAdminImportControl')) {
             $this->li();
             $this->out->checkbox(
+                // TRANS: Checkbox label for global setting.
                 'enabled', _m('Enable Twitter import'),
                 (bool) $this->value('enabled', 'twitterimport'),
+                // TRANS: Checkbox title for global setting.
                 _m('Allow users to import their Twitter friends\' timelines. Requires daemons to be manually configured.')
             );
             $this->unli();
@@ -290,6 +307,9 @@ class TwitterAdminPanelForm extends AdminForm
      */
     function formActions()
     {
-        $this->out->submit('submit', _m('Save'), 'submit', null, _m('Save Twitter settings'));
+        // TRANS: Button text for saving the administrative Twitter bridge settings.
+        $this->out->submit('submit', _m('BUTTON','Save'), 'submit', null,
+        // TRANS: Button title for saving the administrative Twitter bridge settings.
+        _m('Save the Twitter bridge settings.'));
     }
 }
diff --git a/plugins/TwitterBridge/twitterauthorization.php b/plugins/TwitterBridge/twitterauthorization.php
index e45b677e17..1a7234214e 100644
--- a/plugins/TwitterBridge/twitterauthorization.php
+++ b/plugins/TwitterBridge/twitterauthorization.php
@@ -117,12 +117,14 @@ class TwitterauthorizationAction extends Action
             $token = $this->trimmed('token');
 
             if (!$token || $token != common_session_token()) {
+                // TRANS: Client error displayed when the session token does not match or is not given.
                 $this->showForm(_m('There was a problem with your session token. Try again, please.'));
                 return;
             }
 
             if ($this->arg('create')) {
                 if (!$this->boolean('license')) {
+                    // TRANS: Form validation error displayed when the checkbox to agree to the license has not been checked.
                     $this->showForm(_m('You cannot register if you do not agree to the license.'),
                                     $this->trimmed('newname'));
                     return;
@@ -132,6 +134,7 @@ class TwitterauthorizationAction extends Action
                 $this->connectNewUser();
             } else {
                 common_debug('Twitter bridge - ' . print_r($this->args, true));
+                // TRANS: Form validation error displayed when an unhandled error occurs.
                 $this->showForm(_m('Something weird happened.'),
                                 $this->trimmed('newname'));
             }
@@ -157,7 +160,6 @@ class TwitterauthorizationAction extends Action
     function authorizeRequestToken()
     {
         try {
-
             // Get a new request token and authorize it
 
             $client  = new TwitterOAuthClient();
@@ -169,7 +171,6 @@ class TwitterauthorizationAction extends Action
             $_SESSION['twitter_request_token_secret'] = $req_tok->secret;
 
             $auth_link = $client->getAuthorizeLink($req_tok, $this->signin);
-
         } catch (OAuthClientException $e) {
             $msg = sprintf(
                 'OAuth client error - code: %1s, msg: %2s',
@@ -178,6 +179,7 @@ class TwitterauthorizationAction extends Action
             );
             common_log(LOG_INFO, 'Twitter bridge - ' . $msg);
             $this->serverError(
+                // TRANS: Server error displayed when linking to a Twitter account fails.
                 _m('Could not link your Twitter account.')
             );
         }
@@ -198,7 +200,8 @@ class TwitterauthorizationAction extends Action
 
         if ($_SESSION['twitter_request_token'] != $this->oauth_token) {
             $this->serverError(
-                _m('Couldn\'t link your Twitter account: oauth_token mismatch.')
+                // TRANS: Server error displayed when linking to a Twitter account fails because of an incorrect oauth_token.
+                _m('Could not link your Twitter account: oauth_token mismatch.')
             );
         }
 
@@ -226,7 +229,8 @@ class TwitterauthorizationAction extends Action
             );
             common_log(LOG_INFO, 'Twitter bridge - ' . $msg);
             $this->serverError(
-                _m('Couldn\'t link your Twitter account.')
+                // TRANS: Server error displayed when linking to a Twitter account fails.
+                _m('Could not link your Twitter account.')
             );
         }
 
@@ -297,7 +301,8 @@ class TwitterauthorizationAction extends Action
 
         if (empty($flink_id)) {
             common_log_db_error($flink, 'INSERT', __FILE__);
-            $this->serverError(_m('Couldn\'t link your Twitter account.'));
+            // TRANS: Server error displayed when linking to a Twitter account fails.
+            $this->serverError(_m('Could not link your Twitter account.'));
         }
 
         return $flink_id;
@@ -309,12 +314,14 @@ class TwitterauthorizationAction extends Action
             $this->element('div', array('class' => 'error'), $this->error);
         } else {
             $this->element('div', 'instructions',
-                           sprintf(_m('This is the first time you\'ve logged into %s so we must connect your Twitter account to a local account. You can either create a new account, or connect with your existing account, if you have one.'), common_config('site', 'name')));
+                           // TRANS: Page instruction. %s is the StatusNet sitename.
+                           sprintf(_m('This is the first time you have logged into %s so we must connect your Twitter account to a local account. You can either create a new account, or connect with your existing account, if you have one.'), common_config('site', 'name')));
         }
     }
 
     function title()
     {
+        // TRANS: Page title.
         return _m('Twitter Account Setup');
     }
 
@@ -348,7 +355,77 @@ class TwitterauthorizationAction extends Action
                                           'class' => 'form_settings',
                                           'action' => common_local_url('twitterauthorization')));
         $this->elementStart('fieldset', array('id' => 'settings_twitter_connect_options'));
+        // TRANS: Fieldset legend.
         $this->element('legend', null, _m('Connection options'));
+
+        $this->hidden('access_token_key', $this->access_token->key);
+        $this->hidden('access_token_secret', $this->access_token->secret);
+        $this->hidden('twuid', $this->twuid);
+        $this->hidden('tw_fields_screen_name', $this->tw_fields['screen_name']);
+        $this->hidden('tw_fields_name', $this->tw_fields['fullname']);
+        $this->hidden('token', common_session_token());
+
+        // Don't allow new account creation if site is flagged as invite only
+	if (common_config('site', 'inviteonly') == false) {
+            $this->elementStart('fieldset');
+            $this->element('legend', null,
+                           // TRANS: Fieldset legend.
+                           _m('Create new account'));
+            $this->element('p', null,
+                           // TRANS: Sub form introduction text.
+                          _m('Create a new user with this nickname.'));
+            $this->elementStart('ul', 'form_data');
+
+            // Hook point for captcha etc
+            Event::handle('StartRegistrationFormData', array($this));
+
+            $this->elementStart('li');
+            // TRANS: Field label.
+            $this->input('newname', _m('New nickname'),
+                         ($this->username) ? $this->username : '',
+                         // TRANS: Field title for nickname field.
+                         _m('1-64 lowercase letters or numbers, no punctuation or spaces.'));
+            $this->elementEnd('li');
+            $this->elementStart('li');
+            // TRANS: Field label.
+            $this->input('email', _m('LABEL','Email'), $this->getEmail(),
+                         // TRANS: Field title for e-mail address field.
+                         _m('Used only for updates, announcements, '.
+                           'and password recovery'));
+            $this->elementEnd('li');
+
+            // Hook point for captcha etc
+            Event::handle('EndRegistrationFormData', array($this));
+
+            $this->elementEnd('ul');
+            // TRANS: Button text for creating a new StatusNet account in the Twitter connect page.
+            $this->submit('create', _m('BUTTON','Create'));
+            $this->elementEnd('fieldset');
+        }
+
+        $this->elementStart('fieldset');
+        $this->element('legend', null,
+                       // TRANS: Fieldset legend.
+                       _m('Connect existing account'));
+        $this->element('p', null,
+                       // TRANS: Sub form introduction text.
+                       _m('If you already have an account, login with your username and password to connect it to your Twitter account.'));
+        $this->elementStart('ul', 'form_data');
+        $this->elementStart('li');
+        // TRANS: Field label.
+        $this->input('nickname', _m('Existing nickname'));
+        $this->elementEnd('li');
+        $this->elementStart('li');
+        // TRANS: Field label.
+        $this->password('password', _m('Password'));
+        $this->elementEnd('li');
+        $this->elementEnd('ul');
+        $this->elementEnd('fieldset');
+
+        $this->elementStart('fieldset');
+        $this->element('legend', null,
+                       // TRANS: Fieldset legend.
+                       _m('License'));
         $this->elementStart('ul', 'form_data');
         $this->elementStart('li');
         $this->element('input', array('type' => 'checkbox',
@@ -357,6 +434,8 @@ class TwitterauthorizationAction extends Action
                                       'name' => 'license',
                                       'value' => 'true'));
         $this->elementStart('label', array('class' => 'checkbox', 'for' => 'license'));
+        // TRANS: Text for license agreement checkbox.
+        // TRANS: %s is the license as configured for the StatusNet site.
         $message = _m('My text and files are available under %s ' .
                      'except this private data: password, ' .
                      'email address, IM address, and phone number.');
@@ -369,57 +448,9 @@ class TwitterauthorizationAction extends Action
         $this->elementEnd('label');
         $this->elementEnd('li');
         $this->elementEnd('ul');
-        $this->hidden('access_token_key', $this->access_token->key);
-        $this->hidden('access_token_secret', $this->access_token->secret);
-        $this->hidden('twuid', $this->twuid);
-        $this->hidden('tw_fields_screen_name', $this->tw_fields['screen_name']);
-        $this->hidden('tw_fields_name', $this->tw_fields['fullname']);
-
-        $this->elementStart('fieldset');
-        $this->hidden('token', common_session_token());
-        $this->element('legend', null,
-                       _m('Create new account'));
-        $this->element('p', null,
-                       _m('Create a new user with this nickname.'));
-        $this->elementStart('ul', 'form_data');
-
-        // Hook point for captcha etc
-        Event::handle('StartRegistrationFormData', array($this));
-
-        $this->elementStart('li');
-        $this->input('newname', _m('New nickname'),
-                     ($this->username) ? $this->username : '',
-                     _m('1-64 lowercase letters or numbers, no punctuation or spaces.'));
-        $this->elementEnd('li');
-        $this->elementStart('li');
-        $this->input('email', _m('LABEL','Email'), $this->getEmail(),
-                     _m('Used only for updates, announcements, '.
-                       'and password recovery'));
-        $this->elementEnd('li');
-
-        // Hook point for captcha etc
-        Event::handle('EndRegistrationFormData', array($this));
-
-        $this->elementEnd('ul');
-        $this->submit('create', _m('Create'));
         $this->elementEnd('fieldset');
-
-        $this->elementStart('fieldset');
-        $this->element('legend', null,
-                       _m('Connect existing account'));
-        $this->element('p', null,
-                       _m('If you already have an account, login with your username and password to connect it to your Twitter account.'));
-        $this->elementStart('ul', 'form_data');
-        $this->elementStart('li');
-        $this->input('nickname', _m('Existing nickname'));
-        $this->elementEnd('li');
-        $this->elementStart('li');
-        $this->password('password', _m('Password'));
-        $this->elementEnd('li');
-        $this->elementEnd('ul');
-        $this->submit('connect', _m('Connect'));
-        $this->elementEnd('fieldset');
-
+        // TRANS: Button text for connecting an existing StatusNet account in the Twitter connect page..
+        $this->submit('connect', _m('BUTTON','Connect'));
         $this->elementEnd('fieldset');
         $this->elementEnd('form');
     }
@@ -463,6 +494,7 @@ class TwitterauthorizationAction extends Action
         }
 
         if (common_config('site', 'closed')) {
+            // TRANS: Client error displayed when trying to create a new user while creating new users is not allowed.
             $this->clientError(_m('Registration not allowed.'));
             return;
         }
@@ -472,6 +504,7 @@ class TwitterauthorizationAction extends Action
         if (common_config('site', 'inviteonly')) {
             $code = $_SESSION['invitecode'];
             if (empty($code)) {
+                // TRANS: Client error displayed when trying to create a new user while creating new users is not allowed.
                 $this->clientError(_m('Registration not allowed.'));
                 return;
             }
@@ -479,6 +512,7 @@ class TwitterauthorizationAction extends Action
             $invite = Invitation::staticGet($code);
 
             if (empty($invite)) {
+                // TRANS: Client error displayed when trying to create a new user with an invalid invitation code.
                 $this->clientError(_m('Not a valid invitation code.'));
                 return;
             }
@@ -492,11 +526,13 @@ class TwitterauthorizationAction extends Action
         }
 
         if (!User::allowed_nickname($nickname)) {
+            // TRANS: Client error displayed when trying to create a new user with an invalid username.
             $this->showForm(_m('Nickname not allowed.'));
             return;
         }
 
         if (User::staticGet('nickname', $nickname)) {
+            // TRANS: Client error displayed when trying to create a new user with a username that is already in use.
             $this->showForm(_m('Nickname already in use. Try another one.'));
             return;
         }
@@ -517,6 +553,7 @@ class TwitterauthorizationAction extends Action
         $user = User::register($args);
 
         if (empty($user)) {
+            // TRANS: Server error displayed when creating a new user has failed.
             $this->serverError(_m('Error registering user.'));
             return;
         }
@@ -528,6 +565,7 @@ class TwitterauthorizationAction extends Action
         save_twitter_user($this->twuid, $this->tw_fields['screen_name']);
 
         if (!$result) {
+            // TRANS: Server error displayed when connecting a user to a Twitter user has failed.
             $this->serverError(_m('Error connecting user to Twitter.'));
             return;
         }
@@ -550,6 +588,8 @@ class TwitterauthorizationAction extends Action
         $password = $this->trimmed('password');
 
         if (!common_check_user($nickname, $password)) {
+            // TRANS: Form validation error displayed when connecting an existing user to a Twitter user fails because
+            // TRANS: the provided username and/or password are incorrect.
             $this->showForm(_m('Invalid username or password.'));
             return;
         }
@@ -568,6 +608,7 @@ class TwitterauthorizationAction extends Action
         save_twitter_user($this->twuid, $this->tw_fields['screen_name']);
 
         if (!$result) {
+            // TRANS: Server error displayed connecting a user to a Twitter user has failed.
             $this->serverError(_m('Error connecting user to Twitter.'));
             return;
         }
@@ -588,6 +629,7 @@ class TwitterauthorizationAction extends Action
         $result = $this->flinkUser($user->id, $this->twuid);
 
         if (empty($result)) {
+            // TRANS: Server error displayed connecting a user to a Twitter user has failed.
             $this->serverError(_m('Error connecting user to Twitter.'));
             return;
         }
diff --git a/plugins/TwitterBridge/twitterimport.php b/plugins/TwitterBridge/twitterimport.php
index 0eacfcd62c..dc7277caf9 100644
--- a/plugins/TwitterBridge/twitterimport.php
+++ b/plugins/TwitterBridge/twitterimport.php
@@ -172,8 +172,8 @@ class TwitterImport
 
         $notice->is_local   = Notice::GATEWAY;
 
-        $notice->content  = html_entity_decode($status->text, ENT_QUOTES, 'UTF-8');
-        $notice->rendered = $this->linkify($status);
+        $notice->content  = html_entity_decode($this->linkify($status, FALSE), ENT_QUOTES, 'UTF-8');
+        $notice->rendered = $this->linkify($status, TRUE);
 
         if (Event::handle('StartNoticeSave', array(&$notice))) {
 
@@ -339,10 +339,7 @@ class TwitterImport
     {
         global $config;
 
-        $path_parts = pathinfo($twitter_user->profile_image_url);
-
-        $newname = 'Twitter_' . $twitter_user->id . '_' .
-            $path_parts['basename'];
+        $newname = 'Twitter_' . $twitter_user->id . '_' . basename($twitter_user->profile_image_url);
 
         $oldname = $profile->getAvatar(48)->filename;
 
@@ -370,15 +367,15 @@ class TwitterImport
 
         $path_parts = pathinfo($twitter_user->profile_image_url);
 
-        $img_root = substr($path_parts['basename'], 0, -11);
-        $ext = $path_parts['extension'];
-        $mediatype = $this->getMediatype($ext);
+        $ext = (isset($path_parts['extension']) ? '.'.$path_parts['extension'] : '');	// some lack extension
+        $img_root = basename($path_parts['basename'], '_normal'.$ext);	// cut off extension
+        $mediatype = $this->getMediatype(substr($ext, 1));
 
         foreach (array('mini', 'normal', 'bigger') as $size) {
             $url = $path_parts['dirname'] . '/' .
-                $img_root . '_' . $size . ".$ext";
+                $img_root . '_' . $size . $ext;
             $filename = 'Twitter_' . $twitter_user->id . '_' .
-                $img_root . "_$size.$ext";
+                $img_root . '_' . $size . $ext;
 
             $this->updateAvatar($profile->id, $size, $mediatype, $filename);
             $this->fetchAvatar($url, $filename);
@@ -401,8 +398,9 @@ class TwitterImport
         $mediatype = null;
 
         switch (strtolower($ext)) {
+        case 'jpeg':
         case 'jpg':
-            $mediatype = 'image/jpg';
+            $mediatype = 'image/jpeg';
             break;
         case 'gif':
             $mediatype = 'image/gif';
@@ -419,16 +417,15 @@ class TwitterImport
         global $config;
 
         $path_parts = pathinfo($user->profile_image_url);
-        $ext = $path_parts['extension'];
-        $end = strlen('_normal' . $ext);
-        $img_root = substr($path_parts['basename'], 0, -($end+1));
-        $mediatype = $this->getMediatype($ext);
+        $ext = (isset($path_parts['extension']) ? '.'.$path_parts['extension'] : '');
+        $img_root = basename($path_parts['basename'], '_normal'.$ext);
+        $mediatype = $this->getMediatype(substr($ext, 1));
 
         foreach (array('mini', 'normal', 'bigger') as $size) {
             $url = $path_parts['dirname'] . '/' .
-                $img_root . '_' . $size . ".$ext";
+                $img_root . '_' . $size . $ext;
             $filename = 'Twitter_' . $user->id . '_' .
-                $img_root . "_$size.$ext";
+                $img_root . '_' . $size . $ext;
 
             if ($this->fetchAvatar($url, $filename)) {
                 $this->newAvatar($id, $size, $mediatype, $filename);
@@ -540,7 +537,7 @@ class TwitterImport
     const HASHTAG = 2;
     const MENTION = 3;
 
-    function linkify($status)
+    function linkify($status, $html = FALSE)
     {
         $text = $status->text;
 
@@ -596,13 +593,21 @@ class TwitterImport
             $orig = $this->twitEscape(mb_substr($text, $start, $end - $start));
             switch($type) {
             case self::URL:
-                $linkText = $this->makeUrlLink($object, $orig);
+                $linkText = $this->makeUrlLink($object, $orig, $html);
                 break;
             case self::HASHTAG:
-                $linkText = $this->makeHashtagLink($object, $orig);
+                if ($html) {
+                    $linkText = $this->makeHashtagLink($object, $orig);
+                }else{
+                    $linkText = $orig;
+                }
                 break;
             case self::MENTION:
-                $linkText = $this->makeMentionLink($object, $orig);
+                if ($html) {
+                    $linkText = $this->makeMentionLink($object, $orig);
+                }else{
+                    $linkText = $orig;
+                }
                 break;
             default:
                 $linkText = $orig;
@@ -630,9 +635,13 @@ class TwitterImport
         return htmlspecialchars(html_entity_decode($str, ENT_COMPAT, 'UTF-8'));
     }
 
-    function makeUrlLink($object, $orig)
+    function makeUrlLink($object, $orig, $html)
     {
-        return "<a href='{$object->url}' class='extlink'>{$orig}</a>";
+        if ($html) {
+            return '<a href="'.htmlspecialchars($object->expanded_url).'" class="extlink">'.htmlspecialchars($object->display_url).'</a>';
+        }else{
+            return htmlspecialchars($object->expanded_url);
+        }
     }
 
     function makeHashtagLink($object, $orig)
@@ -700,4 +709,4 @@ class TwitterImport
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/plugins/TwitterBridge/twitterlogin.php b/plugins/TwitterBridge/twitterlogin.php
index 062c781f77..379e136045 100644
--- a/plugins/TwitterBridge/twitterlogin.php
+++ b/plugins/TwitterBridge/twitterlogin.php
@@ -53,6 +53,7 @@ class TwitterloginAction extends Action
         parent::handle($args);
 
         if (common_is_real_login()) {
+            // TRANS: Client error displayed when trying to log in using Twitter while already logged in to StatusNet.
             $this->clientError(_m('Already logged in.'));
         }
 
@@ -61,11 +62,13 @@ class TwitterloginAction extends Action
 
     function title()
     {
-        return _m('Twitter Login');
+        // TRANS: Title for login using Twitter page.
+        return _m('TITLE','Twitter Login');
     }
 
     function getInstructions()
     {
+        // TRANS: Instructions for login using Twitter page.
         return _m('Login with your Twitter account');
     }
 
@@ -84,6 +87,7 @@ class TwitterloginAction extends Action
                                                                   null,
                                                                   array('signin' => true))));
         $this->element('img', array('src' => Plugin::staticPath('TwitterBridge', 'Sign-in-with-Twitter-lighter.png'),
+                                    // TRANS: Alternative text for "sign in with Twitter" image.
                                     'alt' => _m('Sign in with Twitter')));
         $this->elementEnd('a');
     }
diff --git a/plugins/TwitterBridge/twitteroauthclient.php b/plugins/TwitterBridge/twitteroauthclient.php
index a17911b03e..720844211a 100644
--- a/plugins/TwitterBridge/twitteroauthclient.php
+++ b/plugins/TwitterBridge/twitteroauthclient.php
@@ -157,7 +157,7 @@ class TwitterOAuthClient extends OAuthClient
      */
     function verifyCredentials()
     {
-        $url          = 'https://api.twitter.com/1/account/verify_credentials.json';
+        $url          = 'https://api.twitter.com/1.1/account/verify_credentials.json';
         $response     = $this->oAuthGet($url);
         $twitter_user = json_decode($response);
         return $twitter_user;
@@ -175,7 +175,7 @@ class TwitterOAuthClient extends OAuthClient
      */
     function statusesUpdate($status, $params=array())
     {
-        $url      = 'https://api.twitter.com/1/statuses/update.json';
+        $url      = 'https://api.twitter.com/1.1/statuses/update.json';
         if (is_numeric($params)) {
             $params = array('in_reply_to_status_id' => intval($params));
         }
@@ -190,19 +190,21 @@ class TwitterOAuthClient extends OAuthClient
     /**
      * Calls Twitter's /statuses/home_timeline API method
      *
-     * @param int $since_id show statuses after this id
-     * @param int $max_id   show statuses before this id
-     * @param int $cnt      number of statuses to show
-     * @param int $page     page number
+     * @param int    $since_id    show statuses after this id
+     * @param string $timelineUri timeline to poll statuses from
+     * @param int    $max_id      show statuses before this id
+     * @param int    $cnt         number of statuses to show
+     * @param int    $page        page number
      *
      * @return mixed an array of statuses
      */
-    function statusesHomeTimeline($since_id = null, $max_id = null,
-                                  $cnt = null, $page = null)
+    function statusesTimeline($since_id = null, $timelineUri = 'home_timeline',
+                              $max_id = null, $cnt = 200, $page = null)
     {
-        $url    = 'https://api.twitter.com/1/statuses/home_timeline.json';
+        $url    = 'https://api.twitter.com/1.1/statuses/'.$timelineUri.'.json';
 
-        $params = array('include_entities' => 'true');
+        $params = array('include_entities' => 'true',
+                        'include_rts'      => 'true');
 
         if (!empty($since_id)) {
             $params['since_id'] = $since_id;
@@ -235,7 +237,7 @@ class TwitterOAuthClient extends OAuthClient
     function statusesFriends($id = null, $user_id = null, $screen_name = null,
                              $page = null)
     {
-        $url = "https://api.twitter.com/1/statuses/friends.json";
+        $url = "https://api.twitter.com/1.1/friends/list.json";
 
         $params = array();
 
@@ -273,7 +275,7 @@ class TwitterOAuthClient extends OAuthClient
     function friendsIds($id = null, $user_id = null, $screen_name = null,
                          $page = null)
     {
-        $url = "https://api.twitter.com/1/friends/ids.json";
+        $url = "https://api.twitter.com/1.1/friends/ids.json";
 
         $params = array();
 
@@ -308,7 +310,7 @@ class TwitterOAuthClient extends OAuthClient
 
     function statusesRetweet($id)
     {
-        $url = "http://api.twitter.com/1/statuses/retweet/$id.json";
+        $url = "http://api.twitter.com/1.1/statuses/retweet/$id.json";
         $response = $this->oAuthPost($url);
         $status = json_decode($response);
         return $status;
@@ -324,8 +326,10 @@ class TwitterOAuthClient extends OAuthClient
 
     function favoritesCreate($id)
     {
-        $url = "http://api.twitter.com/1/favorites/create/$id.json";
-        $response = $this->oAuthPost($url);
+        $url = "http://api.twitter.com/1.1/favorites/create.json";
+        $params=array();
+        $params['id'] = $id;
+        $response = $this->oAuthPost($url, $params);
         $status = json_decode($response);
         return $status;
     }
@@ -340,8 +344,10 @@ class TwitterOAuthClient extends OAuthClient
 
     function favoritesDestroy($id)
     {
-        $url = "http://api.twitter.com/1/favorites/destroy/$id.json";
-        $response = $this->oAuthPost($url);
+        $url = "http://api.twitter.com/1.1/favorites/destroy.json";
+        $params=array();
+        $params['id'] = $id;
+        $response = $this->oAuthPost($url,$params);
         $status = json_decode($response);
         return $status;
     }
@@ -356,7 +362,7 @@ class TwitterOAuthClient extends OAuthClient
 
     function statusesDestroy($id)
     {
-        $url = "http://api.twitter.com/1/statuses/destroy/$id.json";
+        $url = "http://api.twitter.com/1.1/statuses/destroy/$id.json";
         $response = $this->oAuthPost($url);
         $status = json_decode($response);
         return $status;
diff --git a/plugins/TwitterBridge/twittersettings.php b/plugins/TwitterBridge/twittersettings.php
index 763a586079..88799e75a9 100644
--- a/plugins/TwitterBridge/twittersettings.php
+++ b/plugins/TwitterBridge/twittersettings.php
@@ -54,6 +54,7 @@ class TwittersettingsAction extends ProfileSettingsAction
 
     function title()
     {
+        // TRANS: Title for page with Twitter integration settings.
         return _m('Twitter settings');
     }
 
@@ -65,6 +66,7 @@ class TwittersettingsAction extends ProfileSettingsAction
 
     function getInstructions()
     {
+        // TRANS: Instructions for page with Twitter integration settings.
         return _m('Connect your Twitter account to share your updates ' .
                   'with your Twitter friends and vice-versa.');
     }
@@ -106,57 +108,62 @@ class TwittersettingsAction extends ProfileSettingsAction
             $this->elementStart('ul', 'form_data');
             $this->elementStart('li', array('id' => 'settings_twitter_login_button'));
             $this->element('a', array('href' => common_local_url('twitterauthorization')),
+                           // TRANS: Link description to connect to a Twitter account.
                            'Connect my Twitter account');
             $this->elementEnd('li');
             $this->elementEnd('ul');
 
             $this->elementEnd('fieldset');
         } else {
+            // TRANS: Fieldset legend.
             $this->element('legend', null, _m('Twitter account'));
             $this->elementStart('p', array('id' => 'form_confirmed'));
             $this->element('a', array('href' => $fuser->uri), $fuser->nickname);
             $this->elementEnd('p');
             $this->element('p', 'form_note',
+                           // TRANS: Form note when a Twitter account has been connected.
                            _m('Connected Twitter account'));
             $this->elementEnd('fieldset');
 
             $this->elementStart('fieldset');
 
+            // TRANS: Fieldset legend.
             $this->element('legend', null, _m('Disconnect my account from Twitter'));
 
             if (!$user->password) {
-
                 $this->elementStart('p', array('class' => 'form_guide'));
-                // @todo FIXME: Bad i18n (patchwork in three parts).
-                $this->text(_m('Disconnecting your Twitter ' .
-                               'could make it impossible to log in! Please '));
-                $this->element('a',
-                    array('href' => common_local_url('passwordsettings')),
-                        _m('set a password'));
-
-                $this->text(_m(' first.'));
+                // TRANS: Form guide. %s is a URL to the password settings.
+                // TRANS: This message contains a Markdown link in the form [description](link).
+                $message = sprintf(_m('Disconnecting your Twitter account ' .
+                                      'could make it impossible to log in! Please ' .
+                                      '[set a password](%s) first.'),
+                                   common_local_url('passwordsettings'));
+                $message = common_markup_to_html($message);
+                $this->text($message);
                 $this->elementEnd('p');
             } else {
-                // TRANS: %1$s is the current website name.
+                // TRANS: Form instructions. %1$s is the StatusNet sitename.
                 $note = _m('Keep your %1$s account but disconnect from Twitter. ' .
                     'You can use your %1$s password to log in.');
-
                 $site = common_config('site', 'name');
 
                 $this->element('p', 'instructions',
                     sprintf($note, $site));
 
-                $this->submit('disconnect', _m('Disconnect'));
+                // TRANS: Button text for disconnecting a Twitter account.
+                $this->submit('disconnect', _m('BUTTON','Disconnect'));
             }
 
             $this->elementEnd('fieldset');
 
             $this->elementStart('fieldset', array('id' => 'settings_twitter_preferences'));
 
+            // TRANS: Fieldset legend.
             $this->element('legend', null, _m('Preferences'));
             $this->elementStart('ul', 'form_data');
             $this->elementStart('li');
             $this->checkbox('noticesend',
+                            // TRANS: Checkbox label.
                             _m('Automatically send my notices to Twitter.'),
                             ($flink) ?
                             ($flink->noticesync & FOREIGN_NOTICE_SEND) :
@@ -164,6 +171,7 @@ class TwittersettingsAction extends ProfileSettingsAction
             $this->elementEnd('li');
             $this->elementStart('li');
             $this->checkbox('replysync',
+                            // TRANS: Checkbox label.
                             _m('Send local "@" replies to Twitter.'),
                             ($flink) ?
                             ($flink->noticesync & FOREIGN_NOTICE_SEND_REPLY) :
@@ -171,6 +179,7 @@ class TwittersettingsAction extends ProfileSettingsAction
             $this->elementEnd('li');
             $this->elementStart('li');
             $this->checkbox('friendsync',
+                            // TRANS: Checkbox label.
                             _m('Subscribe to my Twitter friends here.'),
                             ($flink) ?
                             ($flink->friendsync & FOREIGN_FRIEND_RECV) :
@@ -180,6 +189,7 @@ class TwittersettingsAction extends ProfileSettingsAction
             if (common_config('twitterimport','enabled')) {
                 $this->elementStart('li');
                 $this->checkbox('noticerecv',
+                                // TRANS: Checkbox label.
                                 _m('Import my friends timeline.'),
                                 ($flink) ?
                                 ($flink->noticesync & FOREIGN_NOTICE_RECV) :
@@ -196,9 +206,11 @@ class TwittersettingsAction extends ProfileSettingsAction
             $this->elementEnd('ul');
 
             if ($flink) {
-                $this->submit('save', _m('Save'));
+                // TRANS: Button text for saving Twitter integration settings.
+                $this->submit('save', _m('BUTTON','Save'));
             } else {
-                $this->submit('add', _m('Add'));
+                // TRANS: Button text for adding Twitter integration.
+                $this->submit('add', _m('BUTTON','Add'));
             }
 
             $this->elementEnd('fieldset');
@@ -222,6 +234,7 @@ class TwittersettingsAction extends ProfileSettingsAction
         // CSRF protection
         $token = $this->trimmed('token');
         if (!$token || $token != common_session_token()) {
+            // TRANS: Client error displayed when the session token does not match or is not given.
             $this->showForm(_m('There was a problem with your session token. '.
                                'Try again, please.'));
             return;
@@ -232,6 +245,7 @@ class TwittersettingsAction extends ProfileSettingsAction
         } else if ($this->arg('disconnect')) {
             $this->removeTwitterAccount();
         } else {
+            // TRANS: Client error displayed when the submitted form contains unexpected data.
             $this->showForm(_m('Unexpected form submission.'));
         }
     }
@@ -247,6 +261,7 @@ class TwittersettingsAction extends ProfileSettingsAction
         $flink = Foreign_link::getByUserID($user->id, TWITTER_SERVICE);
 
         if (empty($flink)) {
+            // TRANS: Client error displayed when trying to remove a connected Twitter account when there isn't one connected.
             $this->clientError(_m('No Twitter connection to remove.'));
             return;
         }
@@ -255,10 +270,12 @@ class TwittersettingsAction extends ProfileSettingsAction
 
         if (empty($result)) {
             common_log_db_error($flink, 'DELETE', __FILE__);
-            $this->serverError(_m('Couldn\'t remove Twitter user.'));
+            // TRANS: Server error displayed when trying to remove a connected Twitter account fails.
+            $this->serverError(_m('Could not remove Twitter user.'));
             return;
         }
 
+        // TRANS: Success message displayed after disconnecting a Twitter account.
         $this->showForm(_m('Twitter account disconnected.'), true);
     }
 
@@ -279,7 +296,9 @@ class TwittersettingsAction extends ProfileSettingsAction
 
         if (empty($flink)) {
             common_log_db_error($flink, 'SELECT', __FILE__);
-            $this->showForm(_m('Couldn\'t save Twitter preferences.'));
+            // @todo FIXME: Shouldn't this be a serverError()?
+            // TRANS: Server error displayed when saving Twitter integration preferences fails.
+            $this->showForm(_m('Could not save Twitter preferences.'));
             return;
         }
 
@@ -290,7 +309,9 @@ class TwittersettingsAction extends ProfileSettingsAction
 
         if ($result === false) {
             common_log_db_error($flink, 'UPDATE', __FILE__);
-            $this->showForm(_m('Couldn\'t save Twitter preferences.'));
+            // @todo FIXME: Shouldn't this be a serverError()?
+            // TRANS: Server error displayed when saving Twitter integration preferences fails.
+            $this->showForm(_m('Could not save Twitter preferences.'));
             return;
         }
 
@@ -298,6 +319,7 @@ class TwittersettingsAction extends ProfileSettingsAction
             $this->notifyDaemon($flink->foreign_id, $noticerecv);
         }
 
+        // TRANS: Success message after saving Twitter integration preferences.
         $this->showForm(_m('Twitter preferences saved.'), true);
     }
 
@@ -306,7 +328,6 @@ class TwittersettingsAction extends ProfileSettingsAction
      */
     function notifyDaemon($twitterUserId, $receiving)
     {
-        // todo... should use control signals rather than queues
+        // @todo... should use control signals rather than queues
     }
-
 }
diff --git a/plugins/TwitterBridge/twitterstreamreader.php b/plugins/TwitterBridge/twitterstreamreader.php
index 5b0613bc40..2441b13357 100644
--- a/plugins/TwitterBridge/twitterstreamreader.php
+++ b/plugins/TwitterBridge/twitterstreamreader.php
@@ -54,7 +54,7 @@ abstract class TwitterStreamReader extends JsonStreamReader
      *
      * @param string $url
      * @param array $params
-     * @return string 
+     * @return string
      */
     protected function oAuthUrl($url, $params=array())
     {
@@ -136,7 +136,7 @@ abstract class TwitterStreamReader extends JsonStreamReader
 
     /**
      * Call event handler callbacks for the given event.
-     * 
+     *
      * @param string $event
      * @param mixed $arg1 ... one or more params to pass on
      */
@@ -208,7 +208,7 @@ class TwitterSiteStream extends TwitterStreamReader
 {
     protected $userIds;
 
-    public function __construct(TwitterOAuthClient $auth, $baseUrl='http://betastream.twitter.com')
+    public function __construct(TwitterOAuthClient $auth, $baseUrl='https://sitestream.twitter.com')
     {
         parent::__construct($auth, $baseUrl);
     }
diff --git a/plugins/UserFlag/User_flag_profile.php b/plugins/UserFlag/User_flag_profile.php
index f4e9844dfc..cdc67cf8e7 100644
--- a/plugins/UserFlag/User_flag_profile.php
+++ b/plugins/UserFlag/User_flag_profile.php
@@ -157,7 +157,8 @@ class User_flag_profile extends Memcached_DataObject
 
         if (!$ufp->insert()) {
             // TRANS: Server exception.
-            $msg = sprintf(_m('Couldn\'t flag profile "%d" for review.'),
+            // TRANS: %d is a profile ID (number).
+            $msg = sprintf(_m('Could not flag profile "%d" for review.'),
                            $profile_id);
             throw new ServerException($msg);
         }
diff --git a/plugins/UserFlag/adminprofileflag.php b/plugins/UserFlag/adminprofileflag.php
index 1aafa3c1bf..d9e57cfc4b 100644
--- a/plugins/UserFlag/adminprofileflag.php
+++ b/plugins/UserFlag/adminprofileflag.php
@@ -86,6 +86,7 @@ class AdminprofileflagAction extends Action
         // User must have the right to review flags
 
         if (!$user->hasRight(UserFlagPlugin::REVIEWFLAGS)) {
+            // TRANS: Error message displayed when trying to review profile flags while not authorised.
             $this->clientError(_m('You cannot review profile flags.'));
             return false;
         }
@@ -385,7 +386,7 @@ class FlaggedProfileListItem extends ProfileListItem
                 $flagging_users = implode(', ', $lnks);
                 // TRANS: Message displayed on a profile if it has been flagged.
                 // TRANS: %1$s is a comma separated list of at most 5 user nicknames that flagged.
-                // TRANS: %2$d is a positive integer of additional flagging users. Also used for the plural.
+                // TRANS: %2$d is a positive integer of additional flagging users. Also used for plural.
                 $text .= sprintf(_m('Flagged by %1$s and %2$d other', 'Flagged by %1$s and %2$d others', $others), $flagging_users, $others);
             } else {
                 // TRANS: Message displayed on a profile if it has been flagged.
diff --git a/plugins/UserFlag/clearflag.php b/plugins/UserFlag/clearflag.php
index feda29f1b7..e5704d6af5 100644
--- a/plugins/UserFlag/clearflag.php
+++ b/plugins/UserFlag/clearflag.php
@@ -49,7 +49,6 @@ class ClearflagAction extends ProfileFormAction
      *
      * @return boolean success flag
      */
-
     function prepare($args)
     {
         if (!parent::prepare($args)) {
@@ -102,7 +101,8 @@ class ClearflagAction extends ProfileFormAction
 
         if ($result == false) {
             // TRANS: Server exception given when flags could not be cleared.
-            $msg = sprintf(_m('Couldn\'t clear flags for profile "%s".'),
+            // TRANS: %s is a profile nickname.
+            $msg = sprintf(_m('Could not clear flags for profile "%s".'),
                            $this->profile->nickname);
             throw new ServerException($msg);
         }
diff --git a/plugins/UserFlag/clearflagform.php b/plugins/UserFlag/clearflagform.php
index 26a8848758..47dd3924c3 100644
--- a/plugins/UserFlag/clearflagform.php
+++ b/plugins/UserFlag/clearflagform.php
@@ -84,7 +84,7 @@ class ClearFlagForm extends ProfileActionForm
 
     function description()
     {
-        // Form description for clearing flags from a profile.
+        // TRANS: Form description for clearing flags from a profile.
         return _m('Clear all flags');
     }
 }
diff --git a/plugins/UserFlag/locale/UserFlag.pot b/plugins/UserFlag/locale/UserFlag.pot
index 638ab36e5c..70c8ba1191 100644
--- a/plugins/UserFlag/locale/UserFlag.pot
+++ b/plugins/UserFlag/locale/UserFlag.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
+"POT-Creation-Date: 2012-06-30 11:07+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"
@@ -50,6 +50,7 @@ msgstr ""
 msgid "Clear"
 msgstr ""
 
+#. TRANS: Form description for clearing flags from a profile.
 #: clearflagform.php:88
 msgid "Clear all flags"
 msgstr ""
@@ -59,24 +60,25 @@ msgstr ""
 msgid "Not logged in."
 msgstr ""
 
-#: adminprofileflag.php:89
+#. TRANS: Error message displayed when trying to review profile flags while not authorised.
+#: adminprofileflag.php:90
 msgid "You cannot review profile flags."
 msgstr ""
 
 #. TRANS: Title for page with a list of profiles that were flagged for review.
-#: adminprofileflag.php:126
+#: adminprofileflag.php:127
 msgid "Flagged profiles"
 msgstr ""
 
 #. TRANS: Header for moderation menu with action buttons for flagged profiles (like 'sandbox', 'silence', ...).
-#: adminprofileflag.php:243
+#: adminprofileflag.php:244
 msgid "Moderate"
 msgstr ""
 
 #. TRANS: Message displayed on a profile if it has been flagged.
 #. TRANS: %1$s is a comma separated list of at most 5 user nicknames that flagged.
-#. TRANS: %2$d is a positive integer of additional flagging users. Also used for the plural.
-#: adminprofileflag.php:389
+#. TRANS: %2$d is a positive integer of additional flagging users. Also used for plural.
+#: adminprofileflag.php:390
 #, php-format
 msgid "Flagged by %1$s and %2$d other"
 msgid_plural "Flagged by %1$s and %2$d others"
@@ -85,15 +87,16 @@ msgstr[1] ""
 
 #. TRANS: Message displayed on a profile if it has been flagged.
 #. TRANS: %s is a comma separated list of at most 5 user nicknames that flagged.
-#: adminprofileflag.php:393
+#: adminprofileflag.php:394
 #, php-format
 msgid "Flagged by %s"
 msgstr ""
 
 #. TRANS: Server exception given when flags could not be cleared.
+#. TRANS: %s is a profile nickname.
 #: clearflag.php:105
 #, php-format
-msgid "Couldn't clear flags for profile \"%s\"."
+msgid "Could not clear flags for profile \"%s\"."
 msgstr ""
 
 #. TRANS: Title for AJAX form to indicated that flags were removed.
@@ -107,7 +110,8 @@ msgid "Cleared"
 msgstr ""
 
 #. TRANS: Server exception.
-#: User_flag_profile.php:160
+#. TRANS: %d is a profile ID (number).
+#: User_flag_profile.php:161
 #, php-format
-msgid "Couldn't flag profile \"%d\" for review."
+msgid "Could not flag profile \"%d\" for review."
 msgstr ""
diff --git a/plugins/UserFlag/locale/ar/LC_MESSAGES/UserFlag.po b/plugins/UserFlag/locale/ar/LC_MESSAGES/UserFlag.po
new file mode 100644
index 0000000000..3e43114ad0
--- /dev/null
+++ b/plugins/UserFlag/locale/ar/LC_MESSAGES/UserFlag.po
@@ -0,0 +1,110 @@
+# Translation of StatusNet - UserFlag to Arabic (العربية)
+# Exported from translatewiki.net
+#
+# Author: OsamaK
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - UserFlag\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:23+0000\n"
+"Language-Team: Arabic <https://translatewiki.net/wiki/Portal:ar>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-12-03 13:51:36+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: ar\n"
+"X-Message-Group: #out-statusnet-plugin-userflag\n"
+"Plural-Forms: nplurals=6; plural=(n == 0) ? 0 : ( (n == 1) ? 1 : ( (n == "
+"2) ? 2 : ( (n%100 >= 3 && n%100 <= 10) ? 3 : ( (n%100 >= 11 && n%100 <= "
+"99) ? 4 : 5 ) ) ) );\n"
+
+#. TRANS: AJAX form title for a flagged profile.
+msgid "Flagged for review"
+msgstr "ع�لّم للمراجعة"
+
+#. TRANS: Body text for AJAX form when a profile has been flagged for review.
+#. TRANS: Message added to a profile if it has been flagged for review.
+msgid "Flagged"
+msgstr "ع�لّم"
+
+#. TRANS: Plugin description.
+msgid ""
+"This plugin allows flagging of profiles for review and reviewing flagged "
+"profiles."
+msgstr ""
+
+#. TRANS: Form title for flagging a profile for review.
+msgid "Flag"
+msgstr "علّم"
+
+#. TRANS: Form description.
+msgid "Flag profile for review."
+msgstr ""
+
+#. TRANS: Form title for action on a profile.
+msgid "Clear"
+msgstr "امسح"
+
+#. TRANS: Form description for clearing flags from a profile.
+msgid "Clear all flags"
+msgstr "امسح كل الأعلام"
+
+#. TRANS: Error message displayed when trying to perform an action that requires a logged in user.
+msgid "Not logged in."
+msgstr "لست والجًا."
+
+#. TRANS: Error message displayed when trying to review profile flags while not authorised.
+msgid "You cannot review profile flags."
+msgstr ""
+
+#. TRANS: Title for page with a list of profiles that were flagged for review.
+msgid "Flagged profiles"
+msgstr "المل�ات الشخصية المعلمة"
+
+#. TRANS: Header for moderation menu with action buttons for flagged profiles (like 'sandbox', 'silence', ...).
+msgid "Moderate"
+msgstr "راقب"
+
+#. TRANS: Message displayed on a profile if it has been flagged.
+#. TRANS: %1$s is a comma separated list of at most 5 user nicknames that flagged.
+#. TRANS: %2$d is a positive integer of additional flagging users. Also used for plural.
+#, php-format
+msgid "Flagged by %1$s and %2$d other"
+msgid_plural "Flagged by %1$s and %2$d others"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
+msgstr[5] ""
+
+#. TRANS: Message displayed on a profile if it has been flagged.
+#. TRANS: %s is a comma separated list of at most 5 user nicknames that flagged.
+#, php-format
+msgid "Flagged by %s"
+msgstr ""
+
+#. TRANS: Server exception given when flags could not be cleared.
+#. TRANS: %s is a profile nickname.
+#, php-format
+msgid "Could not clear flags for profile \"%s\"."
+msgstr ""
+
+#. TRANS: Title for AJAX form to indicated that flags were removed.
+msgid "Flags cleared"
+msgstr ""
+
+#. TRANS: Body element for "flags cleared" form.
+msgid "Cleared"
+msgstr ""
+
+#. TRANS: Server exception.
+#. TRANS: %d is a profile ID (number).
+#, php-format
+msgid "Could not flag profile \"%d\" for review."
+msgstr ""
diff --git a/plugins/UserFlag/locale/ca/LC_MESSAGES/UserFlag.po b/plugins/UserFlag/locale/ca/LC_MESSAGES/UserFlag.po
index aed7fcb23e..52d02f74c9 100644
--- a/plugins/UserFlag/locale/ca/LC_MESSAGES/UserFlag.po
+++ b/plugins/UserFlag/locale/ca/LC_MESSAGES/UserFlag.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - UserFlag to Catalan (Català)
+# Translation of StatusNet - UserFlag to Catalan (català)
 # Exported from translatewiki.net
 #
 # Author: Toniher
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - UserFlag\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:48+0000\n"
-"Language-Team: Catalan <http://translatewiki.net/wiki/Portal:ca>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:23+0000\n"
+"Language-Team: Catalan <https://translatewiki.net/wiki/Portal:ca>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:29+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-12-03 13:51:36+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ca\n"
 "X-Message-Group: #out-statusnet-plugin-userflag\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -50,15 +50,17 @@ msgstr "Senyala el perfil per revisar."
 msgid "Clear"
 msgstr "Esborra"
 
+#. TRANS: Form description for clearing flags from a profile.
 msgid "Clear all flags"
 msgstr "Esborra tots els senyals"
 
 #. TRANS: Error message displayed when trying to perform an action that requires a logged in user.
 msgid "Not logged in."
-msgstr ""
+msgstr "No s'ha iniciat una sessió."
 
+#. TRANS: Error message displayed when trying to review profile flags while not authorised.
 msgid "You cannot review profile flags."
-msgstr ""
+msgstr "No podeu revisar els senyals del perfil."
 
 #. TRANS: Title for page with a list of profiles that were flagged for review.
 msgid "Flagged profiles"
@@ -70,7 +72,7 @@ msgstr "Modera"
 
 #. TRANS: Message displayed on a profile if it has been flagged.
 #. TRANS: %1$s is a comma separated list of at most 5 user nicknames that flagged.
-#. TRANS: %2$d is a positive integer of additional flagging users. Also used for the plural.
+#. TRANS: %2$d is a positive integer of additional flagging users. Also used for plural.
 #, php-format
 msgid "Flagged by %1$s and %2$d other"
 msgid_plural "Flagged by %1$s and %2$d others"
@@ -84,8 +86,9 @@ msgid "Flagged by %s"
 msgstr "Senyalat per %s"
 
 #. TRANS: Server exception given when flags could not be cleared.
+#. TRANS: %s is a profile nickname.
 #, php-format
-msgid "Couldn't clear flags for profile \"%s\"."
+msgid "Could not clear flags for profile \"%s\"."
 msgstr "No s'han pogut esborrar els senyals del perfil «%s»."
 
 #. TRANS: Title for AJAX form to indicated that flags were removed.
@@ -97,6 +100,7 @@ msgid "Cleared"
 msgstr "S'ha esborrat"
 
 #. TRANS: Server exception.
+#. TRANS: %d is a profile ID (number).
 #, php-format
-msgid "Couldn't flag profile \"%d\" for review."
-msgstr "No s'ha pogut senyalar el perfil «%d» per revisar."
+msgid "Could not flag profile \"%d\" for review."
+msgstr "No s'ha pogut senyalar el perfil «%d» per a una revisió."
diff --git a/plugins/UserFlag/locale/de/LC_MESSAGES/UserFlag.po b/plugins/UserFlag/locale/de/LC_MESSAGES/UserFlag.po
index 3fd953bc4f..ad8905ebdd 100644
--- a/plugins/UserFlag/locale/de/LC_MESSAGES/UserFlag.po
+++ b/plugins/UserFlag/locale/de/LC_MESSAGES/UserFlag.po
@@ -1,6 +1,7 @@
 # Translation of StatusNet - UserFlag to German (Deutsch)
 # Exported from translatewiki.net
 #
+# Author: ChrisiPK
 # Author: Giftpflanze
 # Author: Habi
 # --
@@ -10,14 +11,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - UserFlag\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:48+0000\n"
-"Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:23+0000\n"
+"Language-Team: German <https://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:29+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-12-03 13:51:36+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-userflag\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -51,6 +52,7 @@ msgstr "Profil zur Überprüfung markieren."
 msgid "Clear"
 msgstr "Löschen"
 
+#. TRANS: Form description for clearing flags from a profile.
 msgid "Clear all flags"
 msgstr "Alle Markierungen löschen"
 
@@ -58,6 +60,7 @@ msgstr "Alle Markierungen löschen"
 msgid "Not logged in."
 msgstr "Nicht angemeldet."
 
+#. TRANS: Error message displayed when trying to review profile flags while not authorised.
 msgid "You cannot review profile flags."
 msgstr "Du  kannst die Profilflags nicht überprüfen."
 
@@ -71,7 +74,7 @@ msgstr "Moderieren"
 
 #. TRANS: Message displayed on a profile if it has been flagged.
 #. TRANS: %1$s is a comma separated list of at most 5 user nicknames that flagged.
-#. TRANS: %2$d is a positive integer of additional flagging users. Also used for the plural.
+#. TRANS: %2$d is a positive integer of additional flagging users. Also used for plural.
 #, php-format
 msgid "Flagged by %1$s and %2$d other"
 msgid_plural "Flagged by %1$s and %2$d others"
@@ -85,9 +88,10 @@ msgid "Flagged by %s"
 msgstr "Durch %s markiert"
 
 #. TRANS: Server exception given when flags could not be cleared.
+#. TRANS: %s is a profile nickname.
 #, php-format
-msgid "Couldn't clear flags for profile \"%s\"."
-msgstr "Konnte Markierung für Profil \"%s\" nicht entfernen."
+msgid "Could not clear flags for profile \"%s\"."
+msgstr "Konnte Markierungen für Profil „%s“ nicht entfernen."
 
 #. TRANS: Title for AJAX form to indicated that flags were removed.
 msgid "Flags cleared"
@@ -98,6 +102,7 @@ msgid "Cleared"
 msgstr "Gelöscht"
 
 #. TRANS: Server exception.
+#. TRANS: %d is a profile ID (number).
 #, php-format
-msgid "Couldn't flag profile \"%d\" for review."
-msgstr "Konnte Profil „%d“ nicht zur Überprüfung flaggen."
+msgid "Could not flag profile \"%d\" for review."
+msgstr "Konnte Profil „%d“ nicht zur Überprüfung markieren."
diff --git a/plugins/UserFlag/locale/diq/LC_MESSAGES/UserFlag.po b/plugins/UserFlag/locale/diq/LC_MESSAGES/UserFlag.po
new file mode 100644
index 0000000000..8d433e5ee5
--- /dev/null
+++ b/plugins/UserFlag/locale/diq/LC_MESSAGES/UserFlag.po
@@ -0,0 +1,101 @@
+# Translation of StatusNet - UserFlag to Zazaki (Zazaki)
+# Exported from translatewiki.net
+#
+# Author: Erdemaslancan
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - UserFlag\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:23+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-12-03 13:51:36+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: AJAX form title for a flagged profile.
+msgid "Flagged for review"
+msgstr ""
+
+#. TRANS: Body text for AJAX form when a profile has been flagged for review.
+#. TRANS: Message added to a profile if it has been flagged for review.
+msgid "Flagged"
+msgstr "Desmale"
+
+#. TRANS: Plugin description.
+msgid ""
+"This plugin allows flagging of profiles for review and reviewing flagged "
+"profiles."
+msgstr ""
+
+#. TRANS: Form title for flagging a profile for review.
+msgid "Flag"
+msgstr "Desmal"
+
+#. TRANS: Form description.
+msgid "Flag profile for review."
+msgstr ""
+
+#. TRANS: Form title for action on a profile.
+msgid "Clear"
+msgstr "estern"
+
+#. TRANS: Form description for clearing flags from a profile.
+msgid "Clear all flags"
+msgstr ""
+
+#. TRANS: Error message displayed when trying to perform an action that requires a logged in user.
+msgid "Not logged in."
+msgstr ""
+
+#. TRANS: Error message displayed when trying to review profile flags while not authorised.
+msgid "You cannot review profile flags."
+msgstr ""
+
+#. TRANS: Title for page with a list of profiles that were flagged for review.
+msgid "Flagged profiles"
+msgstr ""
+
+#. TRANS: Header for moderation menu with action buttons for flagged profiles (like 'sandbox', 'silence', ...).
+msgid "Moderate"
+msgstr "Modere"
+
+#. TRANS: Message displayed on a profile if it has been flagged.
+#. TRANS: %1$s is a comma separated list of at most 5 user nicknames that flagged.
+#. TRANS: %2$d is a positive integer of additional flagging users. Also used for plural.
+#, php-format
+msgid "Flagged by %1$s and %2$d other"
+msgid_plural "Flagged by %1$s and %2$d others"
+msgstr[0] ""
+msgstr[1] ""
+
+#. TRANS: Message displayed on a profile if it has been flagged.
+#. TRANS: %s is a comma separated list of at most 5 user nicknames that flagged.
+#, php-format
+msgid "Flagged by %s"
+msgstr "Desmala %s"
+
+#. TRANS: Server exception given when flags could not be cleared.
+#. TRANS: %s is a profile nickname.
+#, php-format
+msgid "Could not clear flags for profile \"%s\"."
+msgstr ""
+
+#. TRANS: Title for AJAX form to indicated that flags were removed.
+msgid "Flags cleared"
+msgstr "Desmala estere ke"
+
+#. TRANS: Body element for "flags cleared" form.
+msgid "Cleared"
+msgstr ""
+
+#. TRANS: Server exception.
+#. TRANS: %d is a profile ID (number).
+#, php-format
+msgid "Could not flag profile \"%d\" for review."
+msgstr ""
diff --git a/plugins/UserFlag/locale/es/LC_MESSAGES/UserFlag.po b/plugins/UserFlag/locale/es/LC_MESSAGES/UserFlag.po
new file mode 100644
index 0000000000..cc2575c0df
--- /dev/null
+++ b/plugins/UserFlag/locale/es/LC_MESSAGES/UserFlag.po
@@ -0,0 +1,103 @@
+# Translation of StatusNet - UserFlag to Spanish (español)
+# Exported from translatewiki.net
+#
+# Author: Armando-Martin
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - UserFlag\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:23+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-12-03 13:51:36+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: AJAX form title for a flagged profile.
+msgid "Flagged for review"
+msgstr "Marcado para revisión"
+
+#. TRANS: Body text for AJAX form when a profile has been flagged for review.
+#. TRANS: Message added to a profile if it has been flagged for review.
+msgid "Flagged"
+msgstr "Marcado"
+
+#. TRANS: Plugin description.
+msgid ""
+"This plugin allows flagging of profiles for review and reviewing flagged "
+"profiles."
+msgstr ""
+"Este complemento (plugin) permite marcar perfiles para revisión y revisar "
+"los perfiles marcados."
+
+#. TRANS: Form title for flagging a profile for review.
+msgid "Flag"
+msgstr "Marcar"
+
+#. TRANS: Form description.
+msgid "Flag profile for review."
+msgstr "Marcar el perfil para revisión."
+
+#. TRANS: Form title for action on a profile.
+msgid "Clear"
+msgstr "Borrar"
+
+#. TRANS: Form description for clearing flags from a profile.
+msgid "Clear all flags"
+msgstr "Borrar todas las marcas"
+
+#. TRANS: Error message displayed when trying to perform an action that requires a logged in user.
+msgid "Not logged in."
+msgstr "No ha iniciado sesión"
+
+#. TRANS: Error message displayed when trying to review profile flags while not authorised.
+msgid "You cannot review profile flags."
+msgstr "No puede revisar las marcas de perfil."
+
+#. TRANS: Title for page with a list of profiles that were flagged for review.
+msgid "Flagged profiles"
+msgstr "Perfiles marcados"
+
+#. TRANS: Header for moderation menu with action buttons for flagged profiles (like 'sandbox', 'silence', ...).
+msgid "Moderate"
+msgstr "Moderado"
+
+#. TRANS: Message displayed on a profile if it has been flagged.
+#. TRANS: %1$s is a comma separated list of at most 5 user nicknames that flagged.
+#. TRANS: %2$d is a positive integer of additional flagging users. Also used for plural.
+#, php-format
+msgid "Flagged by %1$s and %2$d other"
+msgid_plural "Flagged by %1$s and %2$d others"
+msgstr[0] "Marcado por  %1$s  y  otro"
+msgstr[1] "Marcado por  %1$s  y  otros  %2$d más"
+
+#. TRANS: Message displayed on a profile if it has been flagged.
+#. TRANS: %s is a comma separated list of at most 5 user nicknames that flagged.
+#, php-format
+msgid "Flagged by %s"
+msgstr "Marcado por %s"
+
+#. TRANS: Server exception given when flags could not be cleared.
+#. TRANS: %s is a profile nickname.
+#, php-format
+msgid "Could not clear flags for profile \"%s\"."
+msgstr "No pueden borrar las marcas del perfil \"%s\"."
+
+#. TRANS: Title for AJAX form to indicated that flags were removed.
+msgid "Flags cleared"
+msgstr "Marcas borradas"
+
+#. TRANS: Body element for "flags cleared" form.
+msgid "Cleared"
+msgstr "Borrado"
+
+#. TRANS: Server exception.
+#. TRANS: %d is a profile ID (number).
+#, php-format
+msgid "Could not flag profile \"%d\" for review."
+msgstr "No pudo marcar el perfil \"%d\" para su revisión."
diff --git a/plugins/UserFlag/locale/eu/LC_MESSAGES/UserFlag.po b/plugins/UserFlag/locale/eu/LC_MESSAGES/UserFlag.po
new file mode 100644
index 0000000000..58f2ea84af
--- /dev/null
+++ b/plugins/UserFlag/locale/eu/LC_MESSAGES/UserFlag.po
@@ -0,0 +1,101 @@
+# Translation of StatusNet - UserFlag to Basque (euskara)
+# Exported from translatewiki.net
+#
+# Author: Artsuaga
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - UserFlag\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:23+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-12-03 13:51:36+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: AJAX form title for a flagged profile.
+msgid "Flagged for review"
+msgstr "Azterketarako markatua"
+
+#. TRANS: Body text for AJAX form when a profile has been flagged for review.
+#. TRANS: Message added to a profile if it has been flagged for review.
+msgid "Flagged"
+msgstr ""
+
+#. TRANS: Plugin description.
+msgid ""
+"This plugin allows flagging of profiles for review and reviewing flagged "
+"profiles."
+msgstr ""
+
+#. TRANS: Form title for flagging a profile for review.
+msgid "Flag"
+msgstr ""
+
+#. TRANS: Form description.
+msgid "Flag profile for review."
+msgstr "Markatu profila aztertzeko."
+
+#. TRANS: Form title for action on a profile.
+msgid "Clear"
+msgstr "Garbitu"
+
+#. TRANS: Form description for clearing flags from a profile.
+msgid "Clear all flags"
+msgstr "Marka guztiak garbitu"
+
+#. TRANS: Error message displayed when trying to perform an action that requires a logged in user.
+msgid "Not logged in."
+msgstr "Saioa hasi gabe."
+
+#. TRANS: Error message displayed when trying to review profile flags while not authorised.
+msgid "You cannot review profile flags."
+msgstr ""
+
+#. TRANS: Title for page with a list of profiles that were flagged for review.
+msgid "Flagged profiles"
+msgstr "Markatutako profilak"
+
+#. TRANS: Header for moderation menu with action buttons for flagged profiles (like 'sandbox', 'silence', ...).
+msgid "Moderate"
+msgstr "Moderatu"
+
+#. TRANS: Message displayed on a profile if it has been flagged.
+#. TRANS: %1$s is a comma separated list of at most 5 user nicknames that flagged.
+#. TRANS: %2$d is a positive integer of additional flagging users. Also used for plural.
+#, php-format
+msgid "Flagged by %1$s and %2$d other"
+msgid_plural "Flagged by %1$s and %2$d others"
+msgstr[0] "%1$s and %2$dek markatua"
+msgstr[1] "%1$s and %2$d(e)k markatua"
+
+#. TRANS: Message displayed on a profile if it has been flagged.
+#. TRANS: %s is a comma separated list of at most 5 user nicknames that flagged.
+#, php-format
+msgid "Flagged by %s"
+msgstr "%s(e)k markatua"
+
+#. TRANS: Server exception given when flags could not be cleared.
+#. TRANS: %s is a profile nickname.
+#, php-format
+msgid "Could not clear flags for profile \"%s\"."
+msgstr "\"%s\" profilarentzako ezin izan dira markak garbitu."
+
+#. TRANS: Title for AJAX form to indicated that flags were removed.
+msgid "Flags cleared"
+msgstr ""
+
+#. TRANS: Body element for "flags cleared" form.
+msgid "Cleared"
+msgstr ""
+
+#. TRANS: Server exception.
+#. TRANS: %d is a profile ID (number).
+#, fuzzy, php-format
+msgid "Could not flag profile \"%d\" for review."
+msgstr "\"%s\" profila ezin izan da azterketarako markatu."
diff --git a/plugins/UserFlag/locale/fr/LC_MESSAGES/UserFlag.po b/plugins/UserFlag/locale/fr/LC_MESSAGES/UserFlag.po
index 7080693d1b..010e189764 100644
--- a/plugins/UserFlag/locale/fr/LC_MESSAGES/UserFlag.po
+++ b/plugins/UserFlag/locale/fr/LC_MESSAGES/UserFlag.po
@@ -1,7 +1,8 @@
-# Translation of StatusNet - UserFlag to French (Français)
+# Translation of StatusNet - UserFlag to French (français)
 # Exported from translatewiki.net
 #
 # Author: Peter17
+# Author: Tititou36
 # --
 # This file is distributed under the same license as the StatusNet package.
 #
@@ -9,14 +10,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - UserFlag\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:48+0000\n"
-"Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:23+0000\n"
+"Language-Team: French <https://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:29+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-12-03 13:51:36+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-userflag\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
@@ -50,6 +51,7 @@ msgstr "Marquer le profil pour vérification."
 msgid "Clear"
 msgstr "Effacer"
 
+#. TRANS: Form description for clearing flags from a profile.
 msgid "Clear all flags"
 msgstr "Effacer tous les marquages"
 
@@ -57,6 +59,7 @@ msgstr "Effacer tous les marquages"
 msgid "Not logged in."
 msgstr "Non connecté."
 
+#. TRANS: Error message displayed when trying to review profile flags while not authorised.
 msgid "You cannot review profile flags."
 msgstr "Vous ne pouvez pas examiner les drapeaux de profil."
 
@@ -70,7 +73,7 @@ msgstr "Modérer"
 
 #. TRANS: Message displayed on a profile if it has been flagged.
 #. TRANS: %1$s is a comma separated list of at most 5 user nicknames that flagged.
-#. TRANS: %2$d is a positive integer of additional flagging users. Also used for the plural.
+#. TRANS: %2$d is a positive integer of additional flagging users. Also used for plural.
 #, php-format
 msgid "Flagged by %1$s and %2$d other"
 msgid_plural "Flagged by %1$s and %2$d others"
@@ -84,8 +87,9 @@ msgid "Flagged by %s"
 msgstr "Marqué par %s"
 
 #. TRANS: Server exception given when flags could not be cleared.
+#. TRANS: %s is a profile nickname.
 #, php-format
-msgid "Couldn't clear flags for profile \"%s\"."
+msgid "Could not clear flags for profile \"%s\"."
 msgstr "Impossible de supprimer les marquages pour le profil « %s »."
 
 #. TRANS: Title for AJAX form to indicated that flags were removed.
@@ -97,6 +101,7 @@ msgid "Cleared"
 msgstr "Effacé"
 
 #. TRANS: Server exception.
+#. TRANS: %d is a profile ID (number).
 #, php-format
-msgid "Couldn't flag profile \"%d\" for review."
+msgid "Could not flag profile \"%d\" for review."
 msgstr "Impossible de marquer le profil « %d » pour vérification."
diff --git a/plugins/UserFlag/locale/gl/LC_MESSAGES/UserFlag.po b/plugins/UserFlag/locale/gl/LC_MESSAGES/UserFlag.po
new file mode 100644
index 0000000000..04d211a7e5
--- /dev/null
+++ b/plugins/UserFlag/locale/gl/LC_MESSAGES/UserFlag.po
@@ -0,0 +1,106 @@
+# Translation of StatusNet - UserFlag to Galician (galego)
+# Exported from translatewiki.net
+#
+# Author: Toliño
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - UserFlag\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:24+0000\n"
+"Language-Team: Galician <https://translatewiki.net/wiki/Portal:gl>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-12-03 13:51:36+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: gl\n"
+"X-Message-Group: #out-statusnet-plugin-userflag\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: AJAX form title for a flagged profile.
+msgid "Flagged for review"
+msgstr "Marcado para revisión"
+
+#. TRANS: Body text for AJAX form when a profile has been flagged for review.
+#. TRANS: Message added to a profile if it has been flagged for review.
+msgid "Flagged"
+msgstr "Marcado"
+
+#. TRANS: Plugin description.
+msgid ""
+"This plugin allows flagging of profiles for review and reviewing flagged "
+"profiles."
+msgstr ""
+"Este complemento permite marcar perfís para revisión e revisar perfís "
+"marcados."
+
+#. TRANS: Form title for flagging a profile for review.
+msgid "Flag"
+msgstr "Marcar"
+
+#. TRANS: Form description.
+msgid "Flag profile for review."
+msgstr "Marcar o perfil para revisión."
+
+#. TRANS: Form title for action on a profile.
+msgid "Clear"
+msgstr "Limpar"
+
+#. TRANS: Form description for clearing flags from a profile.
+msgid "Clear all flags"
+msgstr "Limpar todas as marcas"
+
+#. TRANS: Error message displayed when trying to perform an action that requires a logged in user.
+msgid "Not logged in."
+msgstr "Non iniciou sesión."
+
+#. TRANS: Error message displayed when trying to review profile flags while not authorised.
+msgid "You cannot review profile flags."
+msgstr "Non pode revisar marcas de perfíl."
+
+#. TRANS: Title for page with a list of profiles that were flagged for review.
+msgid "Flagged profiles"
+msgstr "Perfís marcados"
+
+#. TRANS: Header for moderation menu with action buttons for flagged profiles (like 'sandbox', 'silence', ...).
+msgid "Moderate"
+msgstr "Moderar"
+
+#. TRANS: Message displayed on a profile if it has been flagged.
+#. TRANS: %1$s is a comma separated list of at most 5 user nicknames that flagged.
+#. TRANS: %2$d is a positive integer of additional flagging users. Also used for plural.
+#, php-format
+msgid "Flagged by %1$s and %2$d other"
+msgid_plural "Flagged by %1$s and %2$d others"
+msgstr[0] "Marcado por %1$s e outro"
+msgstr[1] "Marado por %1$s e %2$d máis"
+
+#. TRANS: Message displayed on a profile if it has been flagged.
+#. TRANS: %s is a comma separated list of at most 5 user nicknames that flagged.
+#, php-format
+msgid "Flagged by %s"
+msgstr "Marcado por %s"
+
+#. TRANS: Server exception given when flags could not be cleared.
+#. TRANS: %s is a profile nickname.
+#, php-format
+msgid "Could not clear flags for profile \"%s\"."
+msgstr "Non se puideron limpar as marcas do perfil \"%s\"."
+
+#. TRANS: Title for AJAX form to indicated that flags were removed.
+msgid "Flags cleared"
+msgstr "Marcas limpadas"
+
+#. TRANS: Body element for "flags cleared" form.
+msgid "Cleared"
+msgstr "Limpado"
+
+#. TRANS: Server exception.
+#. TRANS: %d is a profile ID (number).
+#, php-format
+msgid "Could not flag profile \"%d\" for review."
+msgstr "Non se puido marcar o perfil \"%d\" para revisión."
diff --git a/plugins/UserFlag/locale/ia/LC_MESSAGES/UserFlag.po b/plugins/UserFlag/locale/ia/LC_MESSAGES/UserFlag.po
index 56b196e32f..e53199301f 100644
--- a/plugins/UserFlag/locale/ia/LC_MESSAGES/UserFlag.po
+++ b/plugins/UserFlag/locale/ia/LC_MESSAGES/UserFlag.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - UserFlag to Interlingua (Interlingua)
+# Translation of StatusNet - UserFlag to Interlingua (interlingua)
 # Exported from translatewiki.net
 #
 # Author: McDutchie
@@ -9,59 +9,62 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - UserFlag\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:48+0000\n"
-"Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:24+0000\n"
+"Language-Team: Interlingua <https://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:29+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-12-03 13:51:36+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-userflag\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANS: AJAX form title for a flagged profile.
 msgid "Flagged for review"
-msgstr "Marcate pro revision"
+msgstr "Signalate pro inspection"
 
 #. TRANS: Body text for AJAX form when a profile has been flagged for review.
 #. TRANS: Message added to a profile if it has been flagged for review.
 msgid "Flagged"
-msgstr "Marcate"
+msgstr "Signalate"
 
 #. TRANS: Plugin description.
 msgid ""
 "This plugin allows flagging of profiles for review and reviewing flagged "
 "profiles."
 msgstr ""
-"Iste plugin permitte marcar profilos pro revision e revider profilos marcate."
+"Iste plug-in permitte signalar profilos pro inspection e inspectar profilos "
+"signalate."
 
 #. TRANS: Form title for flagging a profile for review.
 msgid "Flag"
-msgstr "Rader tote le marcas"
+msgstr "Signalar"
 
 #. TRANS: Form description.
 msgid "Flag profile for review."
-msgstr "Marcar profilo pro revision."
+msgstr "Signalar profilo pro inspection."
 
 #. TRANS: Form title for action on a profile.
 msgid "Clear"
 msgstr "Rader"
 
+#. TRANS: Form description for clearing flags from a profile.
 msgid "Clear all flags"
-msgstr "Rader tote le marcas"
+msgstr "Rader tote le signalamentos"
 
 #. TRANS: Error message displayed when trying to perform an action that requires a logged in user.
 msgid "Not logged in."
 msgstr "Tu non ha aperite un session."
 
+#. TRANS: Error message displayed when trying to review profile flags while not authorised.
 msgid "You cannot review profile flags."
-msgstr "Tu non pote revider marcationes de profilo."
+msgstr "Tu non pote inspectar profilos signalate."
 
 #. TRANS: Title for page with a list of profiles that were flagged for review.
 msgid "Flagged profiles"
-msgstr "Profilos marcate"
+msgstr "Profilos signalate"
 
 #. TRANS: Header for moderation menu with action buttons for flagged profiles (like 'sandbox', 'silence', ...).
 msgid "Moderate"
@@ -69,33 +72,35 @@ msgstr "Moderar"
 
 #. TRANS: Message displayed on a profile if it has been flagged.
 #. TRANS: %1$s is a comma separated list of at most 5 user nicknames that flagged.
-#. TRANS: %2$d is a positive integer of additional flagging users. Also used for the plural.
+#. TRANS: %2$d is a positive integer of additional flagging users. Also used for plural.
 #, php-format
 msgid "Flagged by %1$s and %2$d other"
 msgid_plural "Flagged by %1$s and %2$d others"
-msgstr[0] "Marcate per %1$s e %2$d altere"
-msgstr[1] "Marcate per %1$s e %2$d alteres"
+msgstr[0] "Signalate per %1$s e %2$d altere"
+msgstr[1] "Signalate per %1$s e %2$d alteres"
 
 #. TRANS: Message displayed on a profile if it has been flagged.
 #. TRANS: %s is a comma separated list of at most 5 user nicknames that flagged.
 #, php-format
 msgid "Flagged by %s"
-msgstr "Marcate per %s"
+msgstr "Signalate per %s"
 
 #. TRANS: Server exception given when flags could not be cleared.
+#. TRANS: %s is a profile nickname.
 #, php-format
-msgid "Couldn't clear flags for profile \"%s\"."
-msgstr "Non poteva rader marcas pro profilo \"%s\"."
+msgid "Could not clear flags for profile \"%s\"."
+msgstr "Non poteva rader signalamentos pro le profilo \"%s\"."
 
 #. TRANS: Title for AJAX form to indicated that flags were removed.
 msgid "Flags cleared"
-msgstr "Marcas radite"
+msgstr "Signalamentos radite"
 
 #. TRANS: Body element for "flags cleared" form.
 msgid "Cleared"
 msgstr "Radite"
 
 #. TRANS: Server exception.
+#. TRANS: %d is a profile ID (number).
 #, php-format
-msgid "Couldn't flag profile \"%d\" for review."
-msgstr "Non poteva marcar profilo \"%d\" pro revision."
+msgid "Could not flag profile \"%d\" for review."
+msgstr "Non poteva signalar le profilo \"%d\" pro inspection."
diff --git a/plugins/UserFlag/locale/mk/LC_MESSAGES/UserFlag.po b/plugins/UserFlag/locale/mk/LC_MESSAGES/UserFlag.po
index 1811f2736c..18456fadc8 100644
--- a/plugins/UserFlag/locale/mk/LC_MESSAGES/UserFlag.po
+++ b/plugins/UserFlag/locale/mk/LC_MESSAGES/UserFlag.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - UserFlag to Macedonian (Македон�ки)
+# Translation of StatusNet - UserFlag to Macedonian (македон�ки)
 # Exported from translatewiki.net
 #
 # Author: Bjankuloski06
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - UserFlag\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:48+0000\n"
-"Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:24+0000\n"
+"Language-Team: Macedonian <https://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:29+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-12-03 13:51:36+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-userflag\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
@@ -48,8 +48,9 @@ msgstr "Означи профил за преглед."
 
 #. TRANS: Form title for action on a profile.
 msgid "Clear"
-msgstr "От�трани"
+msgstr "И�чи�ти"
 
+#. TRANS: Form description for clearing flags from a profile.
 msgid "Clear all flags"
 msgstr "От�трани ги �ите ознаки"
 
@@ -57,6 +58,7 @@ msgstr "От�трани ги �ите ознаки"
 msgid "Not logged in."
 msgstr "�е �те најавени."
 
+#. TRANS: Error message displayed when trying to review profile flags while not authorised.
 msgid "You cannot review profile flags."
 msgstr "�е можете да прегледувате профилни знаменца."
 
@@ -70,7 +72,7 @@ msgstr "Модерирај"
 
 #. TRANS: Message displayed on a profile if it has been flagged.
 #. TRANS: %1$s is a comma separated list of at most 5 user nicknames that flagged.
-#. TRANS: %2$d is a positive integer of additional flagging users. Also used for the plural.
+#. TRANS: %2$d is a positive integer of additional flagging users. Also used for plural.
 #, php-format
 msgid "Flagged by %1$s and %2$d other"
 msgid_plural "Flagged by %1$s and %2$d others"
@@ -84,8 +86,9 @@ msgid "Flagged by %s"
 msgstr "Означено од %s"
 
 #. TRANS: Server exception given when flags could not be cleared.
+#. TRANS: %s is a profile nickname.
 #, php-format
-msgid "Couldn't clear flags for profile \"%s\"."
+msgid "Could not clear flags for profile \"%s\"."
 msgstr "�е можев да ги от�транам ознаките за профилот „%s“."
 
 #. TRANS: Title for AJAX form to indicated that flags were removed.
@@ -97,6 +100,7 @@ msgid "Cleared"
 msgstr "От�трането"
 
 #. TRANS: Server exception.
+#. TRANS: %d is a profile ID (number).
 #, php-format
-msgid "Couldn't flag profile \"%d\" for review."
+msgid "Could not flag profile \"%d\" for review."
 msgstr "�е можев да го означам профилот „%d“ за преглед."
diff --git a/plugins/UserFlag/locale/nl/LC_MESSAGES/UserFlag.po b/plugins/UserFlag/locale/nl/LC_MESSAGES/UserFlag.po
index da15b71656..8329cdf4c8 100644
--- a/plugins/UserFlag/locale/nl/LC_MESSAGES/UserFlag.po
+++ b/plugins/UserFlag/locale/nl/LC_MESSAGES/UserFlag.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - UserFlag\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:48+0000\n"
-"Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:24+0000\n"
+"Language-Team: Dutch <https://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:29+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-12-03 13:51:36+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-userflag\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -50,6 +50,7 @@ msgstr "Profiel voor controle markeren"
 msgid "Clear"
 msgstr "Wissen"
 
+#. TRANS: Form description for clearing flags from a profile.
 msgid "Clear all flags"
 msgstr "Alle markeringen wissen"
 
@@ -57,6 +58,7 @@ msgstr "Alle markeringen wissen"
 msgid "Not logged in."
 msgstr "Niet aangemeld."
 
+#. TRANS: Error message displayed when trying to review profile flags while not authorised.
 msgid "You cannot review profile flags."
 msgstr "U kunt gemarkeerde profielen niet controleren."
 
@@ -70,7 +72,7 @@ msgstr "Modereren"
 
 #. TRANS: Message displayed on a profile if it has been flagged.
 #. TRANS: %1$s is a comma separated list of at most 5 user nicknames that flagged.
-#. TRANS: %2$d is a positive integer of additional flagging users. Also used for the plural.
+#. TRANS: %2$d is a positive integer of additional flagging users. Also used for plural.
 #, php-format
 msgid "Flagged by %1$s and %2$d other"
 msgid_plural "Flagged by %1$s and %2$d others"
@@ -84,8 +86,9 @@ msgid "Flagged by %s"
 msgstr "Gemarkeerd door %s"
 
 #. TRANS: Server exception given when flags could not be cleared.
+#. TRANS: %s is a profile nickname.
 #, php-format
-msgid "Couldn't clear flags for profile \"%s\"."
+msgid "Could not clear flags for profile \"%s\"."
 msgstr ""
 "Het was niet mogelijk de markeringen van het profiel \"%s\" te verwijderen."
 
@@ -98,6 +101,7 @@ msgid "Cleared"
 msgstr "Verwijderd"
 
 #. TRANS: Server exception.
+#. TRANS: %d is a profile ID (number).
 #, php-format
-msgid "Couldn't flag profile \"%d\" for review."
+msgid "Could not flag profile \"%d\" for review."
 msgstr "Het was niet mogelijk het profiel \"%d\" voor controle te markeren."
diff --git a/plugins/UserFlag/locale/pt/LC_MESSAGES/UserFlag.po b/plugins/UserFlag/locale/pt/LC_MESSAGES/UserFlag.po
index 396126a836..525f03960c 100644
--- a/plugins/UserFlag/locale/pt/LC_MESSAGES/UserFlag.po
+++ b/plugins/UserFlag/locale/pt/LC_MESSAGES/UserFlag.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - UserFlag to Portuguese (Português)
+# Translation of StatusNet - UserFlag to Portuguese (português)
 # Exported from translatewiki.net
 #
 # Author: GTNS
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - UserFlag\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:48+0000\n"
-"Language-Team: Portuguese <http://translatewiki.net/wiki/Portal:pt>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:24+0000\n"
+"Language-Team: Portuguese <https://translatewiki.net/wiki/Portal:pt>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:29+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-12-03 13:51:36+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: pt\n"
 "X-Message-Group: #out-statusnet-plugin-userflag\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -50,6 +50,7 @@ msgstr "Sinalizar perfil para análise."
 msgid "Clear"
 msgstr "Limpar"
 
+#. TRANS: Form description for clearing flags from a profile.
 msgid "Clear all flags"
 msgstr "Limpar todas as sinalizações"
 
@@ -57,6 +58,7 @@ msgstr "Limpar todas as sinalizações"
 msgid "Not logged in."
 msgstr ""
 
+#. TRANS: Error message displayed when trying to review profile flags while not authorised.
 msgid "You cannot review profile flags."
 msgstr ""
 
@@ -70,7 +72,7 @@ msgstr "Moderar"
 
 #. TRANS: Message displayed on a profile if it has been flagged.
 #. TRANS: %1$s is a comma separated list of at most 5 user nicknames that flagged.
-#. TRANS: %2$d is a positive integer of additional flagging users. Also used for the plural.
+#. TRANS: %2$d is a positive integer of additional flagging users. Also used for plural.
 #, php-format
 msgid "Flagged by %1$s and %2$d other"
 msgid_plural "Flagged by %1$s and %2$d others"
@@ -84,8 +86,9 @@ msgid "Flagged by %s"
 msgstr "Sinalizado por %s"
 
 #. TRANS: Server exception given when flags could not be cleared.
-#, php-format
-msgid "Couldn't clear flags for profile \"%s\"."
+#. TRANS: %s is a profile nickname.
+#, fuzzy, php-format
+msgid "Could not clear flags for profile \"%s\"."
 msgstr "Não foi possível limpar as sinalizações do perfil \"%s\"."
 
 #. TRANS: Title for AJAX form to indicated that flags were removed.
@@ -97,6 +100,7 @@ msgid "Cleared"
 msgstr "Limpas"
 
 #. TRANS: Server exception.
-#, php-format
-msgid "Couldn't flag profile \"%d\" for review."
+#. TRANS: %d is a profile ID (number).
+#, fuzzy, php-format
+msgid "Could not flag profile \"%d\" for review."
 msgstr "Não foi possível sinalizar o perfil \"%d\" para análise."
diff --git a/plugins/UserFlag/locale/ru/LC_MESSAGES/UserFlag.po b/plugins/UserFlag/locale/ru/LC_MESSAGES/UserFlag.po
index 5380935836..e7ac5674b0 100644
--- a/plugins/UserFlag/locale/ru/LC_MESSAGES/UserFlag.po
+++ b/plugins/UserFlag/locale/ru/LC_MESSAGES/UserFlag.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - UserFlag to Russian (Ру��кий)
+# Translation of StatusNet - UserFlag to Russian (ру��кий)
 # Exported from translatewiki.net
 #
 # Author: Byulent
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - UserFlag\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:48+0000\n"
-"Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:24+0000\n"
+"Language-Team: Russian <https://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:29+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-12-03 13:51:36+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-userflag\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
@@ -51,6 +51,7 @@ msgstr "Профиль помечен дл� про�мотра"
 msgid "Clear"
 msgstr "Очи�тить"
 
+#. TRANS: Form description for clearing flags from a profile.
 msgid "Clear all flags"
 msgstr "Очи�тить в�е флаги"
 
@@ -58,6 +59,7 @@ msgstr "Очи�тить в�е флаги"
 msgid "Not logged in."
 msgstr ""
 
+#. TRANS: Error message displayed when trying to review profile flags while not authorised.
 msgid "You cannot review profile flags."
 msgstr ""
 
@@ -71,7 +73,7 @@ msgstr "Модерировать"
 
 #. TRANS: Message displayed on a profile if it has been flagged.
 #. TRANS: %1$s is a comma separated list of at most 5 user nicknames that flagged.
-#. TRANS: %2$d is a positive integer of additional flagging users. Also used for the plural.
+#. TRANS: %2$d is a positive integer of additional flagging users. Also used for plural.
 #, php-format
 msgid "Flagged by %1$s and %2$d other"
 msgid_plural "Flagged by %1$s and %2$d others"
@@ -86,8 +88,9 @@ msgid "Flagged by %s"
 msgstr "Отмечено %s"
 
 #. TRANS: Server exception given when flags could not be cleared.
-#, php-format
-msgid "Couldn't clear flags for profile \"%s\"."
+#. TRANS: %s is a profile nickname.
+#, fuzzy, php-format
+msgid "Could not clear flags for profile \"%s\"."
 msgstr "�е �нимать отметки дл� профил� %s"
 
 #. TRANS: Title for AJAX form to indicated that flags were removed.
@@ -99,6 +102,7 @@ msgid "Cleared"
 msgstr "Сн�то"
 
 #. TRANS: Server exception.
-#, php-format
-msgid "Couldn't flag profile \"%d\" for review."
+#. TRANS: %d is a profile ID (number).
+#, fuzzy, php-format
+msgid "Could not flag profile \"%d\" for review."
 msgstr "�евозможно отметить профиль %d дл� про�мотра."
diff --git a/plugins/UserFlag/locale/tl/LC_MESSAGES/UserFlag.po b/plugins/UserFlag/locale/tl/LC_MESSAGES/UserFlag.po
index e9bab6428e..ca940979cd 100644
--- a/plugins/UserFlag/locale/tl/LC_MESSAGES/UserFlag.po
+++ b/plugins/UserFlag/locale/tl/LC_MESSAGES/UserFlag.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - UserFlag\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:48+0000\n"
-"Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:24+0000\n"
+"Language-Team: Tagalog <https://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:29+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-12-03 13:51:36+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-userflag\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -50,6 +50,7 @@ msgstr "Balangkas ng watawat na susuriing muli."
 msgid "Clear"
 msgstr "Hawiin"
 
+#. TRANS: Form description for clearing flags from a profile.
 msgid "Clear all flags"
 msgstr "Hawiin ang lahat ng mga watawat"
 
@@ -57,6 +58,7 @@ msgstr "Hawiin ang lahat ng mga watawat"
 msgid "Not logged in."
 msgstr "Hindi nakalagda."
 
+#. TRANS: Error message displayed when trying to review profile flags while not authorised.
 msgid "You cannot review profile flags."
 msgstr "Hindi ka maaaring magsuring muli ng mga watawat ng balangkas."
 
@@ -70,7 +72,7 @@ msgstr "Katamtaman"
 
 #. TRANS: Message displayed on a profile if it has been flagged.
 #. TRANS: %1$s is a comma separated list of at most 5 user nicknames that flagged.
-#. TRANS: %2$d is a positive integer of additional flagging users. Also used for the plural.
+#. TRANS: %2$d is a positive integer of additional flagging users. Also used for plural.
 #, php-format
 msgid "Flagged by %1$s and %2$d other"
 msgid_plural "Flagged by %1$s and %2$d others"
@@ -84,9 +86,10 @@ msgid "Flagged by %s"
 msgstr "Iwinatawat ni %s"
 
 #. TRANS: Server exception given when flags could not be cleared.
+#. TRANS: %s is a profile nickname.
 #, php-format
-msgid "Couldn't clear flags for profile \"%s\"."
-msgstr "Hindi mahawi ang mga watawat para sa balangkas na \"%s\"."
+msgid "Could not clear flags for profile \"%s\"."
+msgstr "Hindi mahawi ang mga watawat para sa balangkas ng katangian na \"%s\"."
 
 #. TRANS: Title for AJAX form to indicated that flags were removed.
 msgid "Flags cleared"
@@ -97,7 +100,8 @@ msgid "Cleared"
 msgstr "Nahawi na"
 
 #. TRANS: Server exception.
+#. TRANS: %d is a profile ID (number).
 #, php-format
-msgid "Couldn't flag profile \"%d\" for review."
+msgid "Could not flag profile \"%d\" for review."
 msgstr ""
-"Hindi maiwatawat ang watawat ng balangkas na \"%d\" para sa muling pagsusuri."
+"Hindi maibandila ang balangkas ng katangian na \"%d\" na susuriing muli."
diff --git a/plugins/UserFlag/locale/uk/LC_MESSAGES/UserFlag.po b/plugins/UserFlag/locale/uk/LC_MESSAGES/UserFlag.po
index 6bc921fd6d..e4d8bee167 100644
--- a/plugins/UserFlag/locale/uk/LC_MESSAGES/UserFlag.po
+++ b/plugins/UserFlag/locale/uk/LC_MESSAGES/UserFlag.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - UserFlag to Ukrainian (Україн�ька)
+# Translation of StatusNet - UserFlag to Ukrainian (україн�ька)
 # Exported from translatewiki.net
 #
 # Author: Boogie
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - UserFlag\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:48+0000\n"
-"Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:24+0000\n"
+"Language-Team: Ukrainian <https://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:29+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-12-03 13:51:36+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-userflag\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
@@ -51,6 +51,7 @@ msgstr "Відмітити профіль дл� розгл�ду."
 msgid "Clear"
 msgstr "Зн�ти"
 
+#. TRANS: Form description for clearing flags from a profile.
 msgid "Clear all flags"
 msgstr "Зн�ти в�і позначки"
 
@@ -58,6 +59,7 @@ msgstr "Зн�ти в�і позначки"
 msgid "Not logged in."
 msgstr "�е увійшли."
 
+#. TRANS: Error message displayed when trying to review profile flags while not authorised.
 msgid "You cannot review profile flags."
 msgstr "Ви не можете перегл�нути профілі позначених кори�тувачів."
 
@@ -71,7 +73,7 @@ msgstr "Модерувати"
 
 #. TRANS: Message displayed on a profile if it has been flagged.
 #. TRANS: %1$s is a comma separated list of at most 5 user nicknames that flagged.
-#. TRANS: %2$d is a positive integer of additional flagging users. Also used for the plural.
+#. TRANS: %2$d is a positive integer of additional flagging users. Also used for plural.
 #, php-format
 msgid "Flagged by %1$s and %2$d other"
 msgid_plural "Flagged by %1$s and %2$d others"
@@ -86,8 +88,9 @@ msgid "Flagged by %s"
 msgstr "Відмічено %s"
 
 #. TRANS: Server exception given when flags could not be cleared.
-#, php-format
-msgid "Couldn't clear flags for profile \"%s\"."
+#. TRANS: %s is a profile nickname.
+#, fuzzy, php-format
+msgid "Could not clear flags for profile \"%s\"."
 msgstr "�е можу зн�ти позначки дл� профілю «%s»."
 
 #. TRANS: Title for AJAX form to indicated that flags were removed.
@@ -99,6 +102,7 @@ msgid "Cleared"
 msgstr "Зн�то"
 
 #. TRANS: Server exception.
-#, php-format
-msgid "Couldn't flag profile \"%d\" for review."
+#. TRANS: %d is a profile ID (number).
+#, fuzzy, php-format
+msgid "Could not flag profile \"%d\" for review."
 msgstr "�е вдало�� відмітити профіль «%d» дл� розгл�ду."
diff --git a/plugins/UserLimit/UserLimitPlugin.php b/plugins/UserLimit/UserLimitPlugin.php
index ad2c6e363e..412f8604a5 100644
--- a/plugins/UserLimit/UserLimitPlugin.php
+++ b/plugins/UserLimit/UserLimitPlugin.php
@@ -45,7 +45,6 @@ if (!defined('STATUSNET')) {
  *
  * @seeAlso  Location
  */
-
 class UserLimitPlugin extends Plugin
 {
     public $maxUsers = null;
@@ -65,14 +64,16 @@ class UserLimitPlugin extends Plugin
     function _checkMaxUsers()
     {
         if (!is_null($this->maxUsers)) {
-
             $cls = new User();
 
             $cnt = $cls->count();
 
             if ($cnt >= $this->maxUsers) {
-                // @todo FIXME: i18n issue. Needs plural.
-                $msg = sprintf(_m('Cannot register; maximum number of users (%d) reached.'),
+                // TRANS: Error message given if creating a new user is not possible because a limit has been reached.
+                // TRANS: %d is the user limit (also available for plural).
+                $msg = sprintf(_m('Cannot register because the maximum number of users (%d) for this site was reached.',
+                                  'Cannot register because the maximum number of users (%d) for this site was reached.',
+                                  $this->maxUsers),
                                $this->maxUsers);
 
                 throw new ClientException($msg);
@@ -87,6 +88,7 @@ class UserLimitPlugin extends Plugin
                             'author' => 'Evan Prodromou',
                             'homepage' => 'http://status.net/wiki/Plugin:UserLimit',
                             'description' =>
+                            // TRANS: Plugin description.
                             _m('Limit the number of users who can register.'));
         return true;
     }
diff --git a/plugins/UserLimit/locale/UserLimit.pot b/plugins/UserLimit/locale/UserLimit.pot
index 26b218d489..5e73559f22 100644
--- a/plugins/UserLimit/locale/UserLimit.pot
+++ b/plugins/UserLimit/locale/UserLimit.pot
@@ -8,19 +8,29 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: UserLimitPlugin.php:75
+#. TRANS: Error message given if creating a new user is not possible because a limit has been reached.
+#. TRANS: %d is the user limit (also available for plural).
+#: UserLimitPlugin.php:74
 #, php-format
-msgid "Cannot register; maximum number of users (%d) reached."
-msgstr ""
+msgid ""
+"Cannot register because the maximum number of users (%d) for this site was "
+"reached."
+msgid_plural ""
+"Cannot register because the maximum number of users (%d) for this site was "
+"reached."
+msgstr[0] ""
+msgstr[1] ""
 
-#: UserLimitPlugin.php:90
+#. TRANS: Plugin description.
+#: UserLimitPlugin.php:92
 msgid "Limit the number of users who can register."
 msgstr ""
diff --git a/plugins/UserLimit/locale/br/LC_MESSAGES/UserLimit.po b/plugins/UserLimit/locale/br/LC_MESSAGES/UserLimit.po
index da44081fdf..5a474486b5 100644
--- a/plugins/UserLimit/locale/br/LC_MESSAGES/UserLimit.po
+++ b/plugins/UserLimit/locale/br/LC_MESSAGES/UserLimit.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - UserLimit to Breton (Brezhoneg)
+# Translation of StatusNet - UserLimit to Breton (brezhoneg)
 # Exported from translatewiki.net
 #
 # Author: Fulup
@@ -9,21 +9,30 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - UserLimit\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:49+0000\n"
-"Language-Team: Breton <http://translatewiki.net/wiki/Portal:br>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:25+0000\n"
+"Language-Team: Breton <https://translatewiki.net/wiki/Portal:br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:29+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-19 11:23:51+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-userlimit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#. TRANS: Error message given if creating a new user is not possible because a limit has been reached.
+#. TRANS: %d is the user limit (also available for plural).
 #, php-format
-msgid "Cannot register; maximum number of users (%d) reached."
-msgstr ""
+msgid ""
+"Cannot register because the maximum number of users (%d) for this site was "
+"reached."
+msgid_plural ""
+"Cannot register because the maximum number of users (%d) for this site was "
+"reached."
+msgstr[0] ""
+msgstr[1] ""
 
+#. TRANS: Plugin description.
 msgid "Limit the number of users who can register."
 msgstr "Bevenniñ an niver a implijerien a c'hall en em enskrivañ"
diff --git a/plugins/UserLimit/locale/de/LC_MESSAGES/UserLimit.po b/plugins/UserLimit/locale/de/LC_MESSAGES/UserLimit.po
index 75801093b1..39237ab036 100644
--- a/plugins/UserLimit/locale/de/LC_MESSAGES/UserLimit.po
+++ b/plugins/UserLimit/locale/de/LC_MESSAGES/UserLimit.po
@@ -1,6 +1,7 @@
 # Translation of StatusNet - UserLimit to German (Deutsch)
 # Exported from translatewiki.net
 #
+# Author: ChrisiPK
 # Author: Giftpflanze
 # Author: The Evil IP address
 # --
@@ -10,22 +11,32 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - UserLimit\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:49+0000\n"
-"Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:25+0000\n"
+"Language-Team: German <https://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:29+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-19 11:23:51+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-userlimit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Error message given if creating a new user is not possible because a limit has been reached.
+#. TRANS: %d is the user limit (also available for plural).
 #, php-format
-msgid "Cannot register; maximum number of users (%d) reached."
-msgstr ""
+msgid ""
+"Cannot register because the maximum number of users (%d) for this site was "
+"reached."
+msgid_plural ""
+"Cannot register because the maximum number of users (%d) for this site was "
+"reached."
+msgstr[0] ""
+"Registrierung fehlgeschlagen; maximale Anzahl von Benutzern (%d) erreicht."
+msgstr[1] ""
 "Registrierung fehlgeschlagen; maximale Anzahl von Benutzern (%d) erreicht."
 
+#. TRANS: Plugin description.
 msgid "Limit the number of users who can register."
 msgstr "Beschränkung der Anzahl von Benutzern, die sich registrieren können."
diff --git a/plugins/UserLimit/locale/es/LC_MESSAGES/UserLimit.po b/plugins/UserLimit/locale/es/LC_MESSAGES/UserLimit.po
index 7a41bc2f64..847810f61d 100644
--- a/plugins/UserLimit/locale/es/LC_MESSAGES/UserLimit.po
+++ b/plugins/UserLimit/locale/es/LC_MESSAGES/UserLimit.po
@@ -1,6 +1,7 @@
-# Translation of StatusNet - UserLimit to Spanish (Español)
+# Translation of StatusNet - UserLimit to Spanish (español)
 # Exported from translatewiki.net
 #
+# Author: Armando-Martin
 # Author: Translationista
 # --
 # This file is distributed under the same license as the StatusNet package.
@@ -9,21 +10,34 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - UserLimit\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:49+0000\n"
-"Language-Team: Spanish <http://translatewiki.net/wiki/Portal:es>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:25+0000\n"
+"Language-Team: Spanish <https://translatewiki.net/wiki/Portal:es>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:29+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-19 11:23:51+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-plugin-userlimit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Error message given if creating a new user is not possible because a limit has been reached.
+#. TRANS: %d is the user limit (also available for plural).
 #, php-format
-msgid "Cannot register; maximum number of users (%d) reached."
-msgstr ""
+msgid ""
+"Cannot register because the maximum number of users (%d) for this site was "
+"reached."
+msgid_plural ""
+"Cannot register because the maximum number of users (%d) for this site was "
+"reached."
+msgstr[0] ""
+"No se puede registrar porque se alcanzó el número máximo de usuarios (%d) "
+"para este sitio."
+msgstr[1] ""
+"No se puede registrar porque se alcanzó el número máximo de usuarios (%d) "
+"para este sitio."
 
+#. TRANS: Plugin description.
 msgid "Limit the number of users who can register."
 msgstr "Limitarla cantidad de usuarios que pueden registrarse."
diff --git a/plugins/UserLimit/locale/fa/LC_MESSAGES/UserLimit.po b/plugins/UserLimit/locale/fa/LC_MESSAGES/UserLimit.po
index 4077296351..94c36e7968 100644
--- a/plugins/UserLimit/locale/fa/LC_MESSAGES/UserLimit.po
+++ b/plugins/UserLimit/locale/fa/LC_MESSAGES/UserLimit.po
@@ -9,21 +9,29 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - UserLimit\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:49+0000\n"
-"Language-Team: Persian <http://translatewiki.net/wiki/Portal:fa>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:25+0000\n"
+"Language-Team: Persian <https://translatewiki.net/wiki/Portal:fa>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:29+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-19 11:23:51+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: fa\n"
 "X-Message-Group: #out-statusnet-plugin-userlimit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#. TRANS: Error message given if creating a new user is not possible because a limit has been reached.
+#. TRANS: %d is the user limit (also available for plural).
 #, php-format
-msgid "Cannot register; maximum number of users (%d) reached."
-msgstr ""
+msgid ""
+"Cannot register because the maximum number of users (%d) for this site was "
+"reached."
+msgid_plural ""
+"Cannot register because the maximum number of users (%d) for this site was "
+"reached."
+msgstr[0] ""
 
+#. TRANS: Plugin description.
 msgid "Limit the number of users who can register."
 msgstr "محدودکردن تعداد کاربرانی که می‌توانید ثبت نام کنند."
diff --git a/plugins/UserLimit/locale/fi/LC_MESSAGES/UserLimit.po b/plugins/UserLimit/locale/fi/LC_MESSAGES/UserLimit.po
index 8e47ffb694..4c39405dcb 100644
--- a/plugins/UserLimit/locale/fi/LC_MESSAGES/UserLimit.po
+++ b/plugins/UserLimit/locale/fi/LC_MESSAGES/UserLimit.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - UserLimit to Finnish (Suomi)
+# Translation of StatusNet - UserLimit to Finnish (suomi)
 # Exported from translatewiki.net
 #
 # Author: Centerlink
@@ -9,21 +9,30 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - UserLimit\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:49+0000\n"
-"Language-Team: Finnish <http://translatewiki.net/wiki/Portal:fi>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:25+0000\n"
+"Language-Team: Finnish <https://translatewiki.net/wiki/Portal:fi>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:29+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-19 11:23:51+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: fi\n"
 "X-Message-Group: #out-statusnet-plugin-userlimit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Error message given if creating a new user is not possible because a limit has been reached.
+#. TRANS: %d is the user limit (also available for plural).
 #, php-format
-msgid "Cannot register; maximum number of users (%d) reached."
-msgstr ""
+msgid ""
+"Cannot register because the maximum number of users (%d) for this site was "
+"reached."
+msgid_plural ""
+"Cannot register because the maximum number of users (%d) for this site was "
+"reached."
+msgstr[0] ""
+msgstr[1] ""
 
+#. TRANS: Plugin description.
 msgid "Limit the number of users who can register."
 msgstr "Rajoita niiden käyttäjien lukumäärää, jotka voivat rekisteröityä."
diff --git a/plugins/UserLimit/locale/fr/LC_MESSAGES/UserLimit.po b/plugins/UserLimit/locale/fr/LC_MESSAGES/UserLimit.po
index d5e0f9b232..273b1c17ae 100644
--- a/plugins/UserLimit/locale/fr/LC_MESSAGES/UserLimit.po
+++ b/plugins/UserLimit/locale/fr/LC_MESSAGES/UserLimit.po
@@ -1,6 +1,7 @@
-# Translation of StatusNet - UserLimit to French (Français)
+# Translation of StatusNet - UserLimit to French (français)
 # Exported from translatewiki.net
 #
+# Author: Crochet.david
 # Author: Peter17
 # Author: Verdy p
 # --
@@ -10,23 +11,34 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - UserLimit\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:49+0000\n"
-"Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:25+0000\n"
+"Language-Team: French <https://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:29+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-19 11:23:51+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-userlimit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#. TRANS: Error message given if creating a new user is not possible because a limit has been reached.
+#. TRANS: %d is the user limit (also available for plural).
 #, php-format
-msgid "Cannot register; maximum number of users (%d) reached."
-msgstr ""
-"Impossible de s’enregistrer ; le nombre maximum d’utilisateurs (%d) a été "
-"atteint."
+msgid ""
+"Cannot register because the maximum number of users (%d) for this site was "
+"reached."
+msgid_plural ""
+"Cannot register because the maximum number of users (%d) for this site was "
+"reached."
+msgstr[0] ""
+"Impossible d’enregistrer car le nombre maximal d’utilisateurs (%d) pour ce "
+"site a été atteint"
+msgstr[1] ""
+"Impossible d’enregistrer car le nombre maximal d’utilisateurs (%d) pour ce "
+"site a été atteint"
 
+#. TRANS: Plugin description.
 msgid "Limit the number of users who can register."
 msgstr "Limiter le nombre d’utilisateurs qui peuvent s’inscrire."
diff --git a/plugins/UserLimit/locale/gl/LC_MESSAGES/UserLimit.po b/plugins/UserLimit/locale/gl/LC_MESSAGES/UserLimit.po
index 836983c5ce..d1f4494979 100644
--- a/plugins/UserLimit/locale/gl/LC_MESSAGES/UserLimit.po
+++ b/plugins/UserLimit/locale/gl/LC_MESSAGES/UserLimit.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - UserLimit to Galician (Galego)
+# Translation of StatusNet - UserLimit to Galician (galego)
 # Exported from translatewiki.net
 #
 # Author: Toliño
@@ -9,21 +9,34 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - UserLimit\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:49+0000\n"
-"Language-Team: Galician <http://translatewiki.net/wiki/Portal:gl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:25+0000\n"
+"Language-Team: Galician <https://translatewiki.net/wiki/Portal:gl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:29+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-19 11:23:51+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: gl\n"
 "X-Message-Group: #out-statusnet-plugin-userlimit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Error message given if creating a new user is not possible because a limit has been reached.
+#. TRANS: %d is the user limit (also available for plural).
 #, php-format
-msgid "Cannot register; maximum number of users (%d) reached."
-msgstr ""
+msgid ""
+"Cannot register because the maximum number of users (%d) for this site was "
+"reached."
+msgid_plural ""
+"Cannot register because the maximum number of users (%d) for this site was "
+"reached."
+msgstr[0] ""
+"Non se pode rexistrar porque se acadou o número máximo de usuarios (%d) para "
+"este sitio."
+msgstr[1] ""
+"Non se pode rexistrar porque se acadou o número máximo de usuarios (%d) para "
+"este sitio."
 
+#. TRANS: Plugin description.
 msgid "Limit the number of users who can register."
 msgstr "Limitar o número de usuarios que se poden rexistrar."
diff --git a/plugins/UserLimit/locale/he/LC_MESSAGES/UserLimit.po b/plugins/UserLimit/locale/he/LC_MESSAGES/UserLimit.po
index b5fcf11727..76520dd1e5 100644
--- a/plugins/UserLimit/locale/he/LC_MESSAGES/UserLimit.po
+++ b/plugins/UserLimit/locale/he/LC_MESSAGES/UserLimit.po
@@ -1,6 +1,7 @@
 # Translation of StatusNet - UserLimit to Hebrew (עברית)
 # Exported from translatewiki.net
 #
+# Author: Amire80
 # Author: YaronSh
 # --
 # This file is distributed under the same license as the StatusNet package.
@@ -9,21 +10,30 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - UserLimit\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:49+0000\n"
-"Language-Team: Hebrew <http://translatewiki.net/wiki/Portal:he>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:25+0000\n"
+"Language-Team: Hebrew <https://translatewiki.net/wiki/Portal:he>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:29+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-19 11:23:51+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: he\n"
 "X-Message-Group: #out-statusnet-plugin-userlimit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Error message given if creating a new user is not possible because a limit has been reached.
+#. TRANS: %d is the user limit (also available for plural).
 #, php-format
-msgid "Cannot register; maximum number of users (%d) reached."
-msgstr ""
+msgid ""
+"Cannot register because the maximum number of users (%d) for this site was "
+"reached."
+msgid_plural ""
+"Cannot register because the maximum number of users (%d) for this site was "
+"reached."
+msgstr[0] "ל� ניתן להירש� משו� שב�תר כבר יש מספר מרבי של מנויי� (%d)."
+msgstr[1] "ל� ניתן להירש� משו� שב�תר כבר יש מספר מרבי של מנויי� (%d)."
 
+#. TRANS: Plugin description.
 msgid "Limit the number of users who can register."
 msgstr "הגבלת מספר המשתמשי� שיכולי� להירש�."
diff --git a/plugins/UserLimit/locale/ia/LC_MESSAGES/UserLimit.po b/plugins/UserLimit/locale/ia/LC_MESSAGES/UserLimit.po
index 28274c5bc7..6814c29545 100644
--- a/plugins/UserLimit/locale/ia/LC_MESSAGES/UserLimit.po
+++ b/plugins/UserLimit/locale/ia/LC_MESSAGES/UserLimit.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - UserLimit to Interlingua (Interlingua)
+# Translation of StatusNet - UserLimit to Interlingua (interlingua)
 # Exported from translatewiki.net
 #
 # Author: McDutchie
@@ -9,23 +9,34 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - UserLimit\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:49+0000\n"
-"Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:25+0000\n"
+"Language-Team: Interlingua <https://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:29+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-19 11:23:51+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-userlimit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Error message given if creating a new user is not possible because a limit has been reached.
+#. TRANS: %d is the user limit (also available for plural).
 #, php-format
-msgid "Cannot register; maximum number of users (%d) reached."
-msgstr ""
-"Impossibile crear conto; le numero maxime de usatores (%d) ha essite "
-"attingite."
+msgid ""
+"Cannot register because the maximum number of users (%d) for this site was "
+"reached."
+msgid_plural ""
+"Cannot register because the maximum number of users (%d) for this site was "
+"reached."
+msgstr[0] ""
+"Impossibile crear conto; le numero maxime de usatores (%d) pro iste sito ha "
+"essite attingite."
+msgstr[1] ""
+"Impossibile crear conto; le numero maxime de usatores (%d) pro iste sito ha "
+"essite attingite."
 
+#. TRANS: Plugin description.
 msgid "Limit the number of users who can register."
 msgstr "Limitar le numero de usatores que pote registrar se."
diff --git a/plugins/UserLimit/locale/id/LC_MESSAGES/UserLimit.po b/plugins/UserLimit/locale/id/LC_MESSAGES/UserLimit.po
index 8edc494f59..756e9f092d 100644
--- a/plugins/UserLimit/locale/id/LC_MESSAGES/UserLimit.po
+++ b/plugins/UserLimit/locale/id/LC_MESSAGES/UserLimit.po
@@ -9,21 +9,29 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - UserLimit\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:49+0000\n"
-"Language-Team: Indonesian <http://translatewiki.net/wiki/Portal:id>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:25+0000\n"
+"Language-Team: Indonesian <https://translatewiki.net/wiki/Portal:id>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:29+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-19 11:23:51+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: id\n"
 "X-Message-Group: #out-statusnet-plugin-userlimit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#. TRANS: Error message given if creating a new user is not possible because a limit has been reached.
+#. TRANS: %d is the user limit (also available for plural).
 #, php-format
-msgid "Cannot register; maximum number of users (%d) reached."
-msgstr ""
+msgid ""
+"Cannot register because the maximum number of users (%d) for this site was "
+"reached."
+msgid_plural ""
+"Cannot register because the maximum number of users (%d) for this site was "
+"reached."
+msgstr[0] ""
 
+#. TRANS: Plugin description.
 msgid "Limit the number of users who can register."
 msgstr "Batasi jumlah pengguna yang boleh mendaftar."
diff --git a/plugins/UserLimit/locale/lb/LC_MESSAGES/UserLimit.po b/plugins/UserLimit/locale/lb/LC_MESSAGES/UserLimit.po
index 3685a65f41..2bb1adebd6 100644
--- a/plugins/UserLimit/locale/lb/LC_MESSAGES/UserLimit.po
+++ b/plugins/UserLimit/locale/lb/LC_MESSAGES/UserLimit.po
@@ -9,21 +9,30 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - UserLimit\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:50+0000\n"
-"Language-Team: Luxembourgish <http://translatewiki.net/wiki/Portal:lb>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:26+0000\n"
+"Language-Team: Luxembourgish <https://translatewiki.net/wiki/Portal:lb>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:29+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-19 11:23:51+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: lb\n"
 "X-Message-Group: #out-statusnet-plugin-userlimit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Error message given if creating a new user is not possible because a limit has been reached.
+#. TRANS: %d is the user limit (also available for plural).
 #, php-format
-msgid "Cannot register; maximum number of users (%d) reached."
-msgstr ""
+msgid ""
+"Cannot register because the maximum number of users (%d) for this site was "
+"reached."
+msgid_plural ""
+"Cannot register because the maximum number of users (%d) for this site was "
+"reached."
+msgstr[0] ""
+msgstr[1] ""
 
+#. TRANS: Plugin description.
 msgid "Limit the number of users who can register."
 msgstr "D'Zuel vun de Benotzer, déi sech registréiere kënnen, limitéieren."
diff --git a/plugins/UserLimit/locale/lv/LC_MESSAGES/UserLimit.po b/plugins/UserLimit/locale/lv/LC_MESSAGES/UserLimit.po
index be53761efc..1722a14e3e 100644
--- a/plugins/UserLimit/locale/lv/LC_MESSAGES/UserLimit.po
+++ b/plugins/UserLimit/locale/lv/LC_MESSAGES/UserLimit.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - UserLimit to Latvian (Latviešu)
+# Translation of StatusNet - UserLimit to Latvian (latviešu)
 # Exported from translatewiki.net
 #
 # Author: Geimeris
@@ -9,22 +9,32 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - UserLimit\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:50+0000\n"
-"Language-Team: Latvian <http://translatewiki.net/wiki/Portal:lv>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:26+0000\n"
+"Language-Team: Latvian <https://translatewiki.net/wiki/Portal:lv>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:29+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-19 11:23:51+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: lv\n"
 "X-Message-Group: #out-statusnet-plugin-userlimit\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n != "
 "0) ? 1 : 2 );\n"
 
+#. TRANS: Error message given if creating a new user is not possible because a limit has been reached.
+#. TRANS: %d is the user limit (also available for plural).
 #, php-format
-msgid "Cannot register; maximum number of users (%d) reached."
-msgstr ""
+msgid ""
+"Cannot register because the maximum number of users (%d) for this site was "
+"reached."
+msgid_plural ""
+"Cannot register because the maximum number of users (%d) for this site was "
+"reached."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
+#. TRANS: Plugin description.
 msgid "Limit the number of users who can register."
 msgstr "Ierobežotais lietot�ju skaits, kuri var reģistrēties."
diff --git a/plugins/UserLimit/locale/mk/LC_MESSAGES/UserLimit.po b/plugins/UserLimit/locale/mk/LC_MESSAGES/UserLimit.po
index e239105630..faabb00894 100644
--- a/plugins/UserLimit/locale/mk/LC_MESSAGES/UserLimit.po
+++ b/plugins/UserLimit/locale/mk/LC_MESSAGES/UserLimit.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - UserLimit to Macedonian (Македон�ки)
+# Translation of StatusNet - UserLimit to Macedonian (македон�ки)
 # Exported from translatewiki.net
 #
 # Author: Bjankuloski06
@@ -9,23 +9,34 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - UserLimit\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:50+0000\n"
-"Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:26+0000\n"
+"Language-Team: Macedonian <https://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:29+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-19 11:23:51+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-userlimit\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
 
+#. TRANS: Error message given if creating a new user is not possible because a limit has been reached.
+#. TRANS: %d is the user limit (also available for plural).
 #, php-format
-msgid "Cannot register; maximum number of users (%d) reached."
-msgstr ""
-"Реги�трацијата не може да �е изврши. До�тигнат е мак�ималниот број на "
-"кори�ници (%d)."
+msgid ""
+"Cannot register because the maximum number of users (%d) for this site was "
+"reached."
+msgid_plural ""
+"Cannot register because the maximum number of users (%d) for this site was "
+"reached."
+msgstr[0] ""
+"�е можам да Ве реги�трирам. До�тигнат е мак�ималниот број на кори�ници (%d) "
+"за ова мрежно ме�то."
+msgstr[1] ""
+"�е можам да Ве реги�трирам. До�тигнат е мак�ималниот број на кори�ници (%d) "
+"за ова мрежно ме�то."
 
+#. TRANS: Plugin description.
 msgid "Limit the number of users who can register."
 msgstr "Ограничување на бројот на кори�ници што можат да �е реги�трираат."
diff --git a/plugins/UserLimit/locale/ms/LC_MESSAGES/UserLimit.po b/plugins/UserLimit/locale/ms/LC_MESSAGES/UserLimit.po
index 55dfe10493..c189d88ade 100644
--- a/plugins/UserLimit/locale/ms/LC_MESSAGES/UserLimit.po
+++ b/plugins/UserLimit/locale/ms/LC_MESSAGES/UserLimit.po
@@ -9,21 +9,29 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - UserLimit\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:50+0000\n"
-"Language-Team: Malay <http://translatewiki.net/wiki/Portal:ms>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:26+0000\n"
+"Language-Team: Malay <https://translatewiki.net/wiki/Portal:ms>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:29+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-19 11:23:51+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ms\n"
 "X-Message-Group: #out-statusnet-plugin-userlimit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#, php-format
-msgid "Cannot register; maximum number of users (%d) reached."
-msgstr "Tidak boleh berdaftar; bilangan pengguna maksimum (%d) dicapai."
+#. TRANS: Error message given if creating a new user is not possible because a limit has been reached.
+#. TRANS: %d is the user limit (also available for plural).
+#, fuzzy, php-format
+msgid ""
+"Cannot register because the maximum number of users (%d) for this site was "
+"reached."
+msgid_plural ""
+"Cannot register because the maximum number of users (%d) for this site was "
+"reached."
+msgstr[0] "Tidak boleh berdaftar; bilangan pengguna maksimum (%d) dicapai."
 
+#. TRANS: Plugin description.
 msgid "Limit the number of users who can register."
 msgstr "Hadkan jumlah pengguna yang boleh berdaftar."
diff --git a/plugins/UserLimit/locale/nb/LC_MESSAGES/UserLimit.po b/plugins/UserLimit/locale/nb/LC_MESSAGES/UserLimit.po
index acfc6432d7..f1273c3319 100644
--- a/plugins/UserLimit/locale/nb/LC_MESSAGES/UserLimit.po
+++ b/plugins/UserLimit/locale/nb/LC_MESSAGES/UserLimit.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - UserLimit to Norwegian (bokmål)‬ (‪Norsk (bokmål)‬)
+# Translation of StatusNet - UserLimit to Norwegian Bokmål (‪norsk (bokmål)‬)
 # Exported from translatewiki.net
 #
 # Author: Nghtwlkr
@@ -9,21 +9,30 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - UserLimit\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:50+0000\n"
-"Language-Team: Norwegian (bokmål)‬ <http://translatewiki.net/wiki/Portal:no>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:26+0000\n"
+"Language-Team: Norwegian Bokmål <https://translatewiki.net/wiki/Portal:nb>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:29+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
-"X-Language-Code: no\n"
+"X-POT-Import-Date: 2011-06-19 11:23:51+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: nb\n"
 "X-Message-Group: #out-statusnet-plugin-userlimit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Error message given if creating a new user is not possible because a limit has been reached.
+#. TRANS: %d is the user limit (also available for plural).
 #, php-format
-msgid "Cannot register; maximum number of users (%d) reached."
-msgstr ""
+msgid ""
+"Cannot register because the maximum number of users (%d) for this site was "
+"reached."
+msgid_plural ""
+"Cannot register because the maximum number of users (%d) for this site was "
+"reached."
+msgstr[0] ""
+msgstr[1] ""
 
+#. TRANS: Plugin description.
 msgid "Limit the number of users who can register."
 msgstr "Begrens antallet brukere som kan registrere seg."
diff --git a/plugins/UserLimit/locale/nl/LC_MESSAGES/UserLimit.po b/plugins/UserLimit/locale/nl/LC_MESSAGES/UserLimit.po
index 39c4b34a1a..4032ea4567 100644
--- a/plugins/UserLimit/locale/nl/LC_MESSAGES/UserLimit.po
+++ b/plugins/UserLimit/locale/nl/LC_MESSAGES/UserLimit.po
@@ -9,22 +9,32 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - UserLimit\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:50+0000\n"
-"Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:26+0000\n"
+"Language-Team: Dutch <https://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:29+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-19 11:23:51+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-userlimit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Error message given if creating a new user is not possible because a limit has been reached.
+#. TRANS: %d is the user limit (also available for plural).
 #, php-format
-msgid "Cannot register; maximum number of users (%d) reached."
-msgstr ""
+msgid ""
+"Cannot register because the maximum number of users (%d) for this site was "
+"reached."
+msgid_plural ""
+"Cannot register because the maximum number of users (%d) for this site was "
+"reached."
+msgstr[0] ""
+"Registreren is niet mogelijk. Het maximale aantal gebruikers (%d) is bereikt."
+msgstr[1] ""
 "Registreren is niet mogelijk. Het maximale aantal gebruikers (%d) is bereikt."
 
+#. TRANS: Plugin description.
 msgid "Limit the number of users who can register."
 msgstr "Limiteert het aantal gebruikers dat kan registreren."
diff --git a/plugins/UserLimit/locale/pt/LC_MESSAGES/UserLimit.po b/plugins/UserLimit/locale/pt/LC_MESSAGES/UserLimit.po
index dba79a6e62..1ef9850b44 100644
--- a/plugins/UserLimit/locale/pt/LC_MESSAGES/UserLimit.po
+++ b/plugins/UserLimit/locale/pt/LC_MESSAGES/UserLimit.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - UserLimit to Portuguese (Português)
+# Translation of StatusNet - UserLimit to Portuguese (português)
 # Exported from translatewiki.net
 #
 # Author: Hamilton Abreu
@@ -9,21 +9,30 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - UserLimit\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:50+0000\n"
-"Language-Team: Portuguese <http://translatewiki.net/wiki/Portal:pt>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:26+0000\n"
+"Language-Team: Portuguese <https://translatewiki.net/wiki/Portal:pt>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:29+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-19 11:23:51+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: pt\n"
 "X-Message-Group: #out-statusnet-plugin-userlimit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Error message given if creating a new user is not possible because a limit has been reached.
+#. TRANS: %d is the user limit (also available for plural).
 #, php-format
-msgid "Cannot register; maximum number of users (%d) reached."
-msgstr ""
+msgid ""
+"Cannot register because the maximum number of users (%d) for this site was "
+"reached."
+msgid_plural ""
+"Cannot register because the maximum number of users (%d) for this site was "
+"reached."
+msgstr[0] ""
+msgstr[1] ""
 
+#. TRANS: Plugin description.
 msgid "Limit the number of users who can register."
 msgstr "Limitar o número de utilizadores que se podem registar."
diff --git a/plugins/UserLimit/locale/pt_BR/LC_MESSAGES/UserLimit.po b/plugins/UserLimit/locale/pt_BR/LC_MESSAGES/UserLimit.po
index 7ac20d7acd..458eb3cea3 100644
--- a/plugins/UserLimit/locale/pt_BR/LC_MESSAGES/UserLimit.po
+++ b/plugins/UserLimit/locale/pt_BR/LC_MESSAGES/UserLimit.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - UserLimit to Brazilian Portuguese (Português do Brasil)
+# Translation of StatusNet - UserLimit to Brazilian Portuguese (português do Brasil)
 # Exported from translatewiki.net
 #
 # Author: Giro720
@@ -9,22 +9,31 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - UserLimit\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:50+0000\n"
-"Language-Team: Brazilian Portuguese <http://translatewiki.net/wiki/Portal:pt-"
-"br>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:26+0000\n"
+"Language-Team: Brazilian Portuguese <https://translatewiki.net/wiki/Portal:"
+"pt-br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:29+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-19 11:23:51+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: pt-br\n"
 "X-Message-Group: #out-statusnet-plugin-userlimit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#. TRANS: Error message given if creating a new user is not possible because a limit has been reached.
+#. TRANS: %d is the user limit (also available for plural).
 #, php-format
-msgid "Cannot register; maximum number of users (%d) reached."
-msgstr ""
+msgid ""
+"Cannot register because the maximum number of users (%d) for this site was "
+"reached."
+msgid_plural ""
+"Cannot register because the maximum number of users (%d) for this site was "
+"reached."
+msgstr[0] ""
+msgstr[1] ""
 
+#. TRANS: Plugin description.
 msgid "Limit the number of users who can register."
 msgstr "Limitar o número de usuários que podem se registrar."
diff --git a/plugins/UserLimit/locale/ru/LC_MESSAGES/UserLimit.po b/plugins/UserLimit/locale/ru/LC_MESSAGES/UserLimit.po
index bd888f4d34..71e4df1552 100644
--- a/plugins/UserLimit/locale/ru/LC_MESSAGES/UserLimit.po
+++ b/plugins/UserLimit/locale/ru/LC_MESSAGES/UserLimit.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - UserLimit to Russian (Ру��кий)
+# Translation of StatusNet - UserLimit to Russian (ру��кий)
 # Exported from translatewiki.net
 #
 # Author: �лек�андр Сигачёв
@@ -9,24 +9,36 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - UserLimit\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:50+0000\n"
-"Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:26+0000\n"
+"Language-Team: Russian <https://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:29+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-19 11:23:51+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-userlimit\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
-#, php-format
-msgid "Cannot register; maximum number of users (%d) reached."
-msgstr ""
+#. TRANS: Error message given if creating a new user is not possible because a limit has been reached.
+#. TRANS: %d is the user limit (also available for plural).
+#, fuzzy, php-format
+msgid ""
+"Cannot register because the maximum number of users (%d) for this site was "
+"reached."
+msgid_plural ""
+"Cannot register because the maximum number of users (%d) for this site was "
+"reached."
+msgstr[0] ""
+"Реги�траци� не удала�ь. До�тигнуто предельное чи�ло пользователей (%d)."
+msgstr[1] ""
+"Реги�траци� не удала�ь. До�тигнуто предельное чи�ло пользователей (%d)."
+msgstr[2] ""
 "Реги�траци� не удала�ь. До�тигнуто предельное чи�ло пользователей (%d)."
 
+#. TRANS: Plugin description.
 msgid "Limit the number of users who can register."
 msgstr ""
 "Ограничение количе�тва пользователей, которые могут зареги�трировать��."
diff --git a/plugins/UserLimit/locale/tl/LC_MESSAGES/UserLimit.po b/plugins/UserLimit/locale/tl/LC_MESSAGES/UserLimit.po
index c6b23b3598..2a5d3329ea 100644
--- a/plugins/UserLimit/locale/tl/LC_MESSAGES/UserLimit.po
+++ b/plugins/UserLimit/locale/tl/LC_MESSAGES/UserLimit.po
@@ -9,22 +9,34 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - UserLimit\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:50+0000\n"
-"Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:26+0000\n"
+"Language-Team: Tagalog <https://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:29+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-19 11:23:51+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-userlimit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Error message given if creating a new user is not possible because a limit has been reached.
+#. TRANS: %d is the user limit (also available for plural).
 #, php-format
-msgid "Cannot register; maximum number of users (%d) reached."
-msgstr ""
-"Hindi maipatala; naabot na ang pinakamataas na bilang ng mga tagagamit (%d)."
+msgid ""
+"Cannot register because the maximum number of users (%d) for this site was "
+"reached."
+msgid_plural ""
+"Cannot register because the maximum number of users (%d) for this site was "
+"reached."
+msgstr[0] ""
+"Hindi mairehistro dahil naabot na ang pinakamataas na bilang ng mga "
+"tagagamit (%d) para sa pook na ito."
+msgstr[1] ""
+"Hindi maipatala dahil naabot na ang pinakamataas na bilang ng mga tagagamit "
+"(%d) para sa pook na ito."
 
+#. TRANS: Plugin description.
 msgid "Limit the number of users who can register."
 msgstr "Hangganan ng bilang ng mga tagagamit na makakapagpatala."
diff --git a/plugins/UserLimit/locale/tr/LC_MESSAGES/UserLimit.po b/plugins/UserLimit/locale/tr/LC_MESSAGES/UserLimit.po
index 6a1fd3b79c..cd08694a2e 100644
--- a/plugins/UserLimit/locale/tr/LC_MESSAGES/UserLimit.po
+++ b/plugins/UserLimit/locale/tr/LC_MESSAGES/UserLimit.po
@@ -9,21 +9,29 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - UserLimit\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:50+0000\n"
-"Language-Team: Turkish <http://translatewiki.net/wiki/Portal:tr>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:26+0000\n"
+"Language-Team: Turkish <https://translatewiki.net/wiki/Portal:tr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:29+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-19 11:23:51+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: tr\n"
 "X-Message-Group: #out-statusnet-plugin-userlimit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#. TRANS: Error message given if creating a new user is not possible because a limit has been reached.
+#. TRANS: %d is the user limit (also available for plural).
 #, php-format
-msgid "Cannot register; maximum number of users (%d) reached."
-msgstr ""
+msgid ""
+"Cannot register because the maximum number of users (%d) for this site was "
+"reached."
+msgid_plural ""
+"Cannot register because the maximum number of users (%d) for this site was "
+"reached."
+msgstr[0] ""
 
+#. TRANS: Plugin description.
 msgid "Limit the number of users who can register."
 msgstr "Kayıt olabilecek kullanıcı sayısını sınırla."
diff --git a/plugins/UserLimit/locale/uk/LC_MESSAGES/UserLimit.po b/plugins/UserLimit/locale/uk/LC_MESSAGES/UserLimit.po
index fd7b7279d7..d6d7d770f4 100644
--- a/plugins/UserLimit/locale/uk/LC_MESSAGES/UserLimit.po
+++ b/plugins/UserLimit/locale/uk/LC_MESSAGES/UserLimit.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - UserLimit to Ukrainian (Україн�ька)
+# Translation of StatusNet - UserLimit to Ukrainian (україн�ька)
 # Exported from translatewiki.net
 #
 # Author: Boogie
@@ -9,24 +9,38 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - UserLimit\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:50+0000\n"
-"Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:26+0000\n"
+"Language-Team: Ukrainian <https://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:29+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-19 11:23:51+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-userlimit\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
-#, php-format
-msgid "Cannot register; maximum number of users (%d) reached."
-msgstr ""
+#. TRANS: Error message given if creating a new user is not possible because a limit has been reached.
+#. TRANS: %d is the user limit (also available for plural).
+#, fuzzy, php-format
+msgid ""
+"Cannot register because the maximum number of users (%d) for this site was "
+"reached."
+msgid_plural ""
+"Cannot register because the maximum number of users (%d) for this site was "
+"reached."
+msgstr[0] ""
+"�е вдаєть�� зареє�трувати; мак�имально можливу кількі�ть кори�тувачів (%d) "
+"вже зареє�тровано."
+msgstr[1] ""
+"�е вдаєть�� зареє�трувати; мак�имально можливу кількі�ть кори�тувачів (%d) "
+"вже зареє�тровано."
+msgstr[2] ""
 "�е вдаєть�� зареє�трувати; мак�имально можливу кількі�ть кори�тувачів (%d) "
 "вже зареє�тровано."
 
+#. TRANS: Plugin description.
 msgid "Limit the number of users who can register."
 msgstr "Обмеженн� кілько�ті кори�тувачів, котрі можуть зареє�трувати��."
diff --git a/plugins/WikiHashtags/WikiHashtagsPlugin.php b/plugins/WikiHashtags/WikiHashtagsPlugin.php
index 46ae4bc068..52925d113a 100644
--- a/plugins/WikiHashtags/WikiHashtagsPlugin.php
+++ b/plugins/WikiHashtags/WikiHashtagsPlugin.php
@@ -42,7 +42,6 @@ if (!defined('STATUSNET')) {
  *
  * @see      Event
  */
-
 class WikiHashtagsPlugin extends Plugin
 {
     const VERSION = '0.1';
@@ -57,12 +56,10 @@ class WikiHashtagsPlugin extends Plugin
         $name = $action->trimmed('action');
 
         if ($name == 'tag') {
-
             $taginput = $action->trimmed('tag');
             $tag = common_canonical_tag($taginput);
 
             if (!empty($tag)) {
-
                 $url = sprintf('http://hashtags.wikia.com/index.php?title=%s&action=render',
                                urlencode($tag));
                 $editurl = sprintf('http://hashtags.wikia.com/index.php?title=%s&action=edit',
@@ -81,15 +78,22 @@ class WikiHashtagsPlugin extends Plugin
                     $action->raw($html);
                     $action->elementStart('p');
                     $action->element('a', array('href' => $editurl,
+                                                // TRANS: Link title for editing an article on WikiHashTags.
+                                                // TRANS: %s is the hash tag page to be edited.
                                                 'title' => sprintf(_m('Edit the article for #%s on WikiHashtags'), $tag)),
+                                     // TRANS: Link description for editing an article on WikiHashTags.
                                      _m('Edit'));
                     $action->element('a', array('href' => 'http://www.gnu.org/copyleft/fdl.html',
+                                                // TRANS: Link title for viewing the GFDL.
                                                 'title' => _m('Shared under the terms of the GNU Free Documentation License'),
                                                 'rel' => 'license'),
-                                     'GNU FDL');
+                                     // TRANS: Link description for viewing the GFDL.
+                                     _m('GNU FDL'));
                     $action->elementEnd('p');
                 } else {
                     $action->element('a', array('href' => $editurl),
+                                     // TRANS: Link description for editing an article on WikiHashTags.
+                                     // TRANS: %s is the hash tag page to be created.
                                      sprintf(_m('Start the article for #%s on WikiHashtags'), $tag));
                 }
 
@@ -107,6 +111,7 @@ class WikiHashtagsPlugin extends Plugin
                             'author' => 'Evan Prodromou',
                             'homepage' => 'http://status.net/wiki/Plugin:WikiHashtags',
                             'rawdescription' =>
+                            // TRANS: Plugin description.
                             _m('Gets hashtag descriptions from <a href="http://hashtags.wikia.com/">WikiHashtags</a>.'));
         return true;
     }
diff --git a/plugins/WikiHashtags/locale/WikiHashtags.pot b/plugins/WikiHashtags/locale/WikiHashtags.pot
index 56d9723384..12d1038061 100644
--- a/plugins/WikiHashtags/locale/WikiHashtags.pot
+++ b/plugins/WikiHashtags/locale/WikiHashtags.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,25 +16,37 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: WikiHashtagsPlugin.php:84
+#. TRANS: Link title for editing an article on WikiHashTags.
+#. TRANS: %s is the hash tag page to be edited.
+#: WikiHashtagsPlugin.php:83
 #, php-format
 msgid "Edit the article for #%s on WikiHashtags"
 msgstr ""
 
+#. TRANS: Link description for editing an article on WikiHashTags.
 #: WikiHashtagsPlugin.php:85
 msgid "Edit"
 msgstr ""
 
-#: WikiHashtagsPlugin.php:87
+#. TRANS: Link title for viewing the GFDL.
+#: WikiHashtagsPlugin.php:88
 msgid "Shared under the terms of the GNU Free Documentation License"
 msgstr ""
 
-#: WikiHashtagsPlugin.php:93
+#. TRANS: Link description for viewing the GFDL.
+#: WikiHashtagsPlugin.php:91
+msgid "GNU FDL"
+msgstr ""
+
+#. TRANS: Link description for editing an article on WikiHashTags.
+#. TRANS: %s is the hash tag page to be created.
+#: WikiHashtagsPlugin.php:97
 #, php-format
 msgid "Start the article for #%s on WikiHashtags"
 msgstr ""
 
-#: WikiHashtagsPlugin.php:110
+#. TRANS: Plugin description.
+#: WikiHashtagsPlugin.php:115
 msgid ""
 "Gets hashtag descriptions from <a href=\"http://hashtags.wikia.com/"
 "\">WikiHashtags</a>."
diff --git a/plugins/WikiHashtags/locale/de/LC_MESSAGES/WikiHashtags.po b/plugins/WikiHashtags/locale/de/LC_MESSAGES/WikiHashtags.po
index 28c90f5753..2d1b3010d8 100644
--- a/plugins/WikiHashtags/locale/de/LC_MESSAGES/WikiHashtags.po
+++ b/plugins/WikiHashtags/locale/de/LC_MESSAGES/WikiHashtags.po
@@ -1,6 +1,7 @@
 # Translation of StatusNet - WikiHashtags to German (Deutsch)
 # Exported from translatewiki.net
 #
+# Author: ChrisiPK
 # Author: Giftpflanze
 # Author: The Evil IP address
 # --
@@ -10,33 +11,44 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - WikiHashtags\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:51+0000\n"
-"Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:27+0000\n"
+"Language-Team: German <https://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:31+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-19 11:23:53+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-wikihashtags\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Link title for editing an article on WikiHashTags.
+#. TRANS: %s is the hash tag page to be edited.
 #, php-format
 msgid "Edit the article for #%s on WikiHashtags"
 msgstr "Bearbeite den Artikel für #%s auf WikiHashtags"
 
+#. TRANS: Link description for editing an article on WikiHashTags.
 msgid "Edit"
 msgstr "Bearbeiten"
 
+#. TRANS: Link title for viewing the GFDL.
 msgid "Shared under the terms of the GNU Free Documentation License"
 msgstr ""
 "Veröffentlicht unter den Bedingungen der GNU Free Documentation License"
 
+#. TRANS: Link description for viewing the GFDL.
+msgid "GNU FDL"
+msgstr "GNU FDL"
+
+#. TRANS: Link description for editing an article on WikiHashTags.
+#. TRANS: %s is the hash tag page to be created.
 #, php-format
 msgid "Start the article for #%s on WikiHashtags"
 msgstr "Beginnne den Artikel über #%s auf WikiHashtags"
 
+#. TRANS: Plugin description.
 msgid ""
 "Gets hashtag descriptions from <a href=\"http://hashtags.wikia.com/"
 "\">WikiHashtags</a>."
diff --git a/plugins/WikiHashtags/locale/es/LC_MESSAGES/WikiHashtags.po b/plugins/WikiHashtags/locale/es/LC_MESSAGES/WikiHashtags.po
new file mode 100644
index 0000000000..1ad41310af
--- /dev/null
+++ b/plugins/WikiHashtags/locale/es/LC_MESSAGES/WikiHashtags.po
@@ -0,0 +1,52 @@
+# Translation of StatusNet - WikiHashtags to Spanish (español)
+# Exported from translatewiki.net
+#
+# Author: Armando-Martin
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - WikiHashtags\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:27+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-19 11:23:53+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Link title for editing an article on WikiHashTags.
+#. TRANS: %s is the hash tag page to be edited.
+#, php-format
+msgid "Edit the article for #%s on WikiHashtags"
+msgstr "Editar el artículo \"#%s\" en WikiHashtags"
+
+#. TRANS: Link description for editing an article on WikiHashTags.
+msgid "Edit"
+msgstr "Editar"
+
+#. TRANS: Link title for viewing the GFDL.
+msgid "Shared under the terms of the GNU Free Documentation License"
+msgstr ""
+"Difundido bajo los términos de la licencia de documentación libre de GNU"
+
+#. TRANS: Link description for viewing the GFDL.
+msgid "GNU FDL"
+msgstr "GNU FDL"
+
+#. TRANS: Link description for editing an article on WikiHashTags.
+#. TRANS: %s is the hash tag page to be created.
+#, php-format
+msgid "Start the article for #%s on WikiHashtags"
+msgstr "Crear el artículo \"#%s\" en WikiHashtags"
+
+#. TRANS: Plugin description.
+msgid ""
+"Gets hashtag descriptions from <a href=\"http://hashtags.wikia.com/"
+"\">WikiHashtags</a>."
+msgstr ""
+"Obtiene las descripciones de las etiquetas desde <a href=\"http://hashtags."
+"wikia.com/\">WikiHashtags</a>."
diff --git a/plugins/WikiHashtags/locale/fr/LC_MESSAGES/WikiHashtags.po b/plugins/WikiHashtags/locale/fr/LC_MESSAGES/WikiHashtags.po
index e7ac374ee2..97811a2dee 100644
--- a/plugins/WikiHashtags/locale/fr/LC_MESSAGES/WikiHashtags.po
+++ b/plugins/WikiHashtags/locale/fr/LC_MESSAGES/WikiHashtags.po
@@ -1,7 +1,8 @@
-# Translation of StatusNet - WikiHashtags to French (Français)
+# Translation of StatusNet - WikiHashtags to French (français)
 # Exported from translatewiki.net
 #
 # Author: Od1n
+# Author: Tititou36
 # Author: Verdy p
 # --
 # This file is distributed under the same license as the StatusNet package.
@@ -10,32 +11,43 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - WikiHashtags\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:51+0000\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:27+0000\n"
 "Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:31+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-19 11:23:53+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-wikihashtags\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#. TRANS: Link title for editing an article on WikiHashTags.
+#. TRANS: %s is the hash tag page to be edited.
 #, php-format
 msgid "Edit the article for #%s on WikiHashtags"
-msgstr ""
+msgstr "Modifier l'article pour #%s sur WikiHashtags"
 
+#. TRANS: Link description for editing an article on WikiHashTags.
 msgid "Edit"
 msgstr "Modifier"
 
+#. TRANS: Link title for viewing the GFDL.
 msgid "Shared under the terms of the GNU Free Documentation License"
-msgstr ""
+msgstr "Partagé selon les termes de la license GNU Free Documentation"
 
+#. TRANS: Link description for viewing the GFDL.
+msgid "GNU FDL"
+msgstr "GNU FDL"
+
+#. TRANS: Link description for editing an article on WikiHashTags.
+#. TRANS: %s is the hash tag page to be created.
 #, php-format
 msgid "Start the article for #%s on WikiHashtags"
-msgstr ""
+msgstr "Débuter l'article pour #%s sur WikiHashtags"
 
+#. TRANS: Plugin description.
 msgid ""
 "Gets hashtag descriptions from <a href=\"http://hashtags.wikia.com/"
 "\">WikiHashtags</a>."
diff --git a/plugins/WikiHashtags/locale/gl/LC_MESSAGES/WikiHashtags.po b/plugins/WikiHashtags/locale/gl/LC_MESSAGES/WikiHashtags.po
new file mode 100644
index 0000000000..64e18185e4
--- /dev/null
+++ b/plugins/WikiHashtags/locale/gl/LC_MESSAGES/WikiHashtags.po
@@ -0,0 +1,54 @@
+# Translation of StatusNet - WikiHashtags to Galician (galego)
+# Exported from translatewiki.net
+#
+# Author: Toliño
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - WikiHashtags\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:27+0000\n"
+"Language-Team: Galician <https://translatewiki.net/wiki/Portal:gl>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-19 11:23:53+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: gl\n"
+"X-Message-Group: #out-statusnet-plugin-wikihashtags\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Link title for editing an article on WikiHashTags.
+#. TRANS: %s is the hash tag page to be edited.
+#, php-format
+msgid "Edit the article for #%s on WikiHashtags"
+msgstr "Editar o artigo \"#%s\" en WikiHashtags"
+
+#. TRANS: Link description for editing an article on WikiHashTags.
+msgid "Edit"
+msgstr "Editar"
+
+#. TRANS: Link title for viewing the GFDL.
+msgid "Shared under the terms of the GNU Free Documentation License"
+msgstr "Difundido baixo os termos da licenza de documentación libre de GNU"
+
+#. TRANS: Link description for viewing the GFDL.
+msgid "GNU FDL"
+msgstr "GNU FDL"
+
+#. TRANS: Link description for editing an article on WikiHashTags.
+#. TRANS: %s is the hash tag page to be created.
+#, php-format
+msgid "Start the article for #%s on WikiHashtags"
+msgstr "Crear o artigo \"#%s\" en WikiHashtags"
+
+#. TRANS: Plugin description.
+msgid ""
+"Gets hashtag descriptions from <a href=\"http://hashtags.wikia.com/"
+"\">WikiHashtags</a>."
+msgstr ""
+"Obtén as descricións das etiquetas desde <a href=\"http://hashtags.wikia.com/"
+"\">WikiHashtags</a>."
diff --git a/plugins/WikiHashtags/locale/ia/LC_MESSAGES/WikiHashtags.po b/plugins/WikiHashtags/locale/ia/LC_MESSAGES/WikiHashtags.po
index 34ef59378b..71c822fb0c 100644
--- a/plugins/WikiHashtags/locale/ia/LC_MESSAGES/WikiHashtags.po
+++ b/plugins/WikiHashtags/locale/ia/LC_MESSAGES/WikiHashtags.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - WikiHashtags to Interlingua (Interlingua)
+# Translation of StatusNet - WikiHashtags to Interlingua (interlingua)
 # Exported from translatewiki.net
 #
 # Author: McDutchie
@@ -9,33 +9,44 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - WikiHashtags\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:51+0000\n"
-"Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:27+0000\n"
+"Language-Team: Interlingua <https://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:31+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-19 11:23:53+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-wikihashtags\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Link title for editing an article on WikiHashTags.
+#. TRANS: %s is the hash tag page to be edited.
 #, php-format
 msgid "Edit the article for #%s on WikiHashtags"
 msgstr "Modificar le articulo pro #%s in WikiHashtags"
 
+#. TRANS: Link description for editing an article on WikiHashTags.
 msgid "Edit"
 msgstr "Modificar"
 
+#. TRANS: Link title for viewing the GFDL.
 msgid "Shared under the terms of the GNU Free Documentation License"
 msgstr ""
 "Diffundite sub le conditiones del Licentia GNU pro Documentation Libere"
 
+#. TRANS: Link description for viewing the GFDL.
+msgid "GNU FDL"
+msgstr "GNU FDL"
+
+#. TRANS: Link description for editing an article on WikiHashTags.
+#. TRANS: %s is the hash tag page to be created.
 #, php-format
 msgid "Start the article for #%s on WikiHashtags"
 msgstr "Crear le articulo pro #%s in WikiHashtags"
 
+#. TRANS: Plugin description.
 msgid ""
 "Gets hashtag descriptions from <a href=\"http://hashtags.wikia.com/"
 "\">WikiHashtags</a>."
diff --git a/plugins/WikiHashtags/locale/mk/LC_MESSAGES/WikiHashtags.po b/plugins/WikiHashtags/locale/mk/LC_MESSAGES/WikiHashtags.po
index abacfb00ee..447a91c1f6 100644
--- a/plugins/WikiHashtags/locale/mk/LC_MESSAGES/WikiHashtags.po
+++ b/plugins/WikiHashtags/locale/mk/LC_MESSAGES/WikiHashtags.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - WikiHashtags to Macedonian (Македон�ки)
+# Translation of StatusNet - WikiHashtags to Macedonian (македон�ки)
 # Exported from translatewiki.net
 #
 # Author: Bjankuloski06
@@ -9,34 +9,45 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - WikiHashtags\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:51+0000\n"
-"Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:27+0000\n"
+"Language-Team: Macedonian <https://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:31+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-19 11:23:53+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-wikihashtags\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
 
+#. TRANS: Link title for editing an article on WikiHashTags.
+#. TRANS: %s is the hash tag page to be edited.
 #, php-format
 msgid "Edit the article for #%s on WikiHashtags"
 msgstr "Уредете ја �татијата за #%s на WikiHashtags"
 
+#. TRANS: Link description for editing an article on WikiHashTags.
 msgid "Edit"
 msgstr "Уреди"
 
+#. TRANS: Link title for viewing the GFDL.
 msgid "Shared under the terms of the GNU Free Documentation License"
 msgstr ""
 "Споделувањето подлежи на у�ловите на Г�У-овата лиценца за �лободна "
 "документација"
 
+#. TRANS: Link description for viewing the GFDL.
+msgid "GNU FDL"
+msgstr "GNU FDL"
+
+#. TRANS: Link description for editing an article on WikiHashTags.
+#. TRANS: %s is the hash tag page to be created.
 #, php-format
 msgid "Start the article for #%s on WikiHashtags"
 msgstr "Започнете ја �татијата за #%s на WikiHashtags"
 
+#. TRANS: Plugin description.
 msgid ""
 "Gets hashtag descriptions from <a href=\"http://hashtags.wikia.com/"
 "\">WikiHashtags</a>."
diff --git a/plugins/WikiHashtags/locale/ms/LC_MESSAGES/WikiHashtags.po b/plugins/WikiHashtags/locale/ms/LC_MESSAGES/WikiHashtags.po
index 41ae3f613d..33d9ec6621 100644
--- a/plugins/WikiHashtags/locale/ms/LC_MESSAGES/WikiHashtags.po
+++ b/plugins/WikiHashtags/locale/ms/LC_MESSAGES/WikiHashtags.po
@@ -9,32 +9,43 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - WikiHashtags\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:51+0000\n"
-"Language-Team: Malay <http://translatewiki.net/wiki/Portal:ms>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:27+0000\n"
+"Language-Team: Malay <https://translatewiki.net/wiki/Portal:ms>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:31+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-19 11:23:53+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ms\n"
 "X-Message-Group: #out-statusnet-plugin-wikihashtags\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#. TRANS: Link title for editing an article on WikiHashTags.
+#. TRANS: %s is the hash tag page to be edited.
 #, php-format
 msgid "Edit the article for #%s on WikiHashtags"
 msgstr "Sunting rencana untuk #%s di WikiHashtags"
 
+#. TRANS: Link description for editing an article on WikiHashTags.
 msgid "Edit"
 msgstr "Sunting"
 
+#. TRANS: Link title for viewing the GFDL.
 msgid "Shared under the terms of the GNU Free Documentation License"
 msgstr "Dikongsikan di bawah terma-terma Lesen Dokumentasi Bebas GNU"
 
+#. TRANS: Link description for viewing the GFDL.
+msgid "GNU FDL"
+msgstr ""
+
+#. TRANS: Link description for editing an article on WikiHashTags.
+#. TRANS: %s is the hash tag page to be created.
 #, php-format
 msgid "Start the article for #%s on WikiHashtags"
 msgstr "Cipta rencana untuk #%s di WikiHashtags"
 
+#. TRANS: Plugin description.
 msgid ""
 "Gets hashtag descriptions from <a href=\"http://hashtags.wikia.com/"
 "\">WikiHashtags</a>."
diff --git a/plugins/WikiHashtags/locale/nl/LC_MESSAGES/WikiHashtags.po b/plugins/WikiHashtags/locale/nl/LC_MESSAGES/WikiHashtags.po
index 063e24ace7..251bf48a26 100644
--- a/plugins/WikiHashtags/locale/nl/LC_MESSAGES/WikiHashtags.po
+++ b/plugins/WikiHashtags/locale/nl/LC_MESSAGES/WikiHashtags.po
@@ -9,32 +9,43 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - WikiHashtags\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:51+0000\n"
-"Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:27+0000\n"
+"Language-Team: Dutch <https://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:31+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-19 11:23:53+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-wikihashtags\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Link title for editing an article on WikiHashTags.
+#. TRANS: %s is the hash tag page to be edited.
 #, php-format
 msgid "Edit the article for #%s on WikiHashtags"
 msgstr "Het artikel voor #%s op WikiHashtags bewerken"
 
+#. TRANS: Link description for editing an article on WikiHashTags.
 msgid "Edit"
 msgstr "Bewerken"
 
+#. TRANS: Link title for viewing the GFDL.
 msgid "Shared under the terms of the GNU Free Documentation License"
 msgstr "Gedeeld onder de voorwaarden van de GNU Free Documentation License"
 
+#. TRANS: Link description for viewing the GFDL.
+msgid "GNU FDL"
+msgstr "GNU FDL"
+
+#. TRANS: Link description for editing an article on WikiHashTags.
+#. TRANS: %s is the hash tag page to be created.
 #, php-format
 msgid "Start the article for #%s on WikiHashtags"
 msgstr "Het artikel voor #%s op WikiHashtags aanmaken"
 
+#. TRANS: Plugin description.
 msgid ""
 "Gets hashtag descriptions from <a href=\"http://hashtags.wikia.com/"
 "\">WikiHashtags</a>."
diff --git a/plugins/WikiHashtags/locale/tl/LC_MESSAGES/WikiHashtags.po b/plugins/WikiHashtags/locale/tl/LC_MESSAGES/WikiHashtags.po
index 9a0e37e92a..8783fc22ed 100644
--- a/plugins/WikiHashtags/locale/tl/LC_MESSAGES/WikiHashtags.po
+++ b/plugins/WikiHashtags/locale/tl/LC_MESSAGES/WikiHashtags.po
@@ -9,34 +9,45 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - WikiHashtags\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:52+0000\n"
-"Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:27+0000\n"
+"Language-Team: Tagalog <https://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:31+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-19 11:23:53+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-wikihashtags\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Link title for editing an article on WikiHashTags.
+#. TRANS: %s is the hash tag page to be edited.
 #, php-format
 msgid "Edit the article for #%s on WikiHashtags"
 msgstr "Baguhin ang artikulo para sa #%s na nasa WikiHashtags"
 
+#. TRANS: Link description for editing an article on WikiHashTags.
 msgid "Edit"
 msgstr "Baguhin"
 
+#. TRANS: Link title for viewing the GFDL.
 msgid "Shared under the terms of the GNU Free Documentation License"
 msgstr ""
 "Ibinabahagi sa ilalim ng mga pagsasaad ng Lisensiya ng Malayang "
 "Dokumentasyon ng GNU"
 
+#. TRANS: Link description for viewing the GFDL.
+msgid "GNU FDL"
+msgstr "GNU FDL"
+
+#. TRANS: Link description for editing an article on WikiHashTags.
+#. TRANS: %s is the hash tag page to be created.
 #, php-format
 msgid "Start the article for #%s on WikiHashtags"
 msgstr "Simulan ang artikulo para sa #%s na nasa WikiHashtags"
 
+#. TRANS: Plugin description.
 msgid ""
 "Gets hashtag descriptions from <a href=\"http://hashtags.wikia.com/"
 "\">WikiHashtags</a>."
diff --git a/plugins/WikiHashtags/locale/uk/LC_MESSAGES/WikiHashtags.po b/plugins/WikiHashtags/locale/uk/LC_MESSAGES/WikiHashtags.po
index 48d0c29027..a7b823d897 100644
--- a/plugins/WikiHashtags/locale/uk/LC_MESSAGES/WikiHashtags.po
+++ b/plugins/WikiHashtags/locale/uk/LC_MESSAGES/WikiHashtags.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - WikiHashtags to Ukrainian (Україн�ька)
+# Translation of StatusNet - WikiHashtags to Ukrainian (україн�ька)
 # Exported from translatewiki.net
 #
 # Author: Boogie
@@ -9,33 +9,44 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - WikiHashtags\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:52+0000\n"
-"Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:28+0000\n"
+"Language-Team: Ukrainian <https://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:31+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-19 11:23:53+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-wikihashtags\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
+#. TRANS: Link title for editing an article on WikiHashTags.
+#. TRANS: %s is the hash tag page to be edited.
 #, php-format
 msgid "Edit the article for #%s on WikiHashtags"
 msgstr "Редагувати �таттю про #%s на WikiHashtags"
 
+#. TRANS: Link description for editing an article on WikiHashTags.
 msgid "Edit"
 msgstr "Змінити"
 
+#. TRANS: Link title for viewing the GFDL.
 msgid "Shared under the terms of the GNU Free Documentation License"
 msgstr "Розміщуєть�� на умовах GNU Free Documentation License"
 
+#. TRANS: Link description for viewing the GFDL.
+msgid "GNU FDL"
+msgstr ""
+
+#. TRANS: Link description for editing an article on WikiHashTags.
+#. TRANS: %s is the hash tag page to be created.
 #, php-format
 msgid "Start the article for #%s on WikiHashtags"
 msgstr "Почати нову �таттю про #%s на WikiHashtags"
 
+#. TRANS: Plugin description.
 msgid ""
 "Gets hashtag descriptions from <a href=\"http://hashtags.wikia.com/"
 "\">WikiHashtags</a>."
diff --git a/plugins/WikiHowProfile/WikiHowProfilePlugin.php b/plugins/WikiHowProfile/WikiHowProfilePlugin.php
index 753dff5a37..3532ca5987 100644
--- a/plugins/WikiHowProfile/WikiHowProfilePlugin.php
+++ b/plugins/WikiHowProfile/WikiHowProfilePlugin.php
@@ -56,6 +56,7 @@ class WikiHowProfilePlugin extends Plugin
                             'author' => 'Brion Vibber',
                             'homepage' => 'http://status.net/wiki/Plugin:Sample',
                             'rawdescription' =>
+                            // TRANS: Plugin description.
                             _m('Fetches avatar and other profile information for WikiHow users when setting up an account via OpenID.'));
         return true;
     }
@@ -121,7 +122,8 @@ class WikiHowProfilePlugin extends Plugin
         $client = HTTPClient::start();
         $response = $client->get($profileUrl);
         if (!$response->isOk()) {
-            throw new Exception("WikiHow profile page fetch failed.");
+            // TRANS: Exception thrown when fetching a WikiHow profile page fails.
+            throw new Exception(_m('WikiHow profile page fetch failed.'));
             // HTTP error response already logged.
             return false;
         }
@@ -137,7 +139,8 @@ class WikiHowProfilePlugin extends Plugin
         error_reporting($old);
 
         if (!$ok) {
-            throw new Exception("HTML parse failure during check for WikiHow avatar.");
+            // TRANS: Exception thrown when parsing a WikiHow profile page fails.
+            throw new Exception(_m('HTML parse failure during check for WikiHow avatar.'));
             return false;
         }
 
@@ -168,15 +171,19 @@ class WikiHowProfilePlugin extends Plugin
     private function saveAvatar($user, $url)
     {
         if (!common_valid_http_url($url)) {
-            throw new ServerException(sprintf(_m("Invalid avatar URL %s."), $url));
+            // TRANS: Server exception thrown when an avatar URL is invalid.
+            // TRANS: %s is the invalid avatar URL.
+            throw new ServerException(sprintf(_m('Invalid avatar URL %s.'), $url));
         }
 
-        // @fixme this should be better encapsulated
+        // @todo FIXME: This should be better encapsulated
         // ripped from OStatus via oauthstore.php (for old OMB client)
         $temp_filename = tempnam(sys_get_temp_dir(), 'listener_avatar');
         try {
             if (!copy($url, $temp_filename)) {
-                throw new ServerException(sprintf(_m("Unable to fetch avatar from %s."), $url));
+                // TRANS: Exception thrown when fetching an avatar from a URL fails.
+                // TRANS: %s is a URL.
+                throw new ServerException(sprintf(_m('Unable to fetch avatar from %s.'), $url));
             }
 
             $profile = $user->getProfile();
diff --git a/plugins/WikiHowProfile/locale/WikiHowProfile.pot b/plugins/WikiHowProfile/locale/WikiHowProfile.pot
index e19d05aacb..dde5c971a1 100644
--- a/plugins/WikiHowProfile/locale/WikiHowProfile.pot
+++ b/plugins/WikiHowProfile/locale/WikiHowProfile.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,18 +16,33 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: WikiHowProfilePlugin.php:59
+#. TRANS: Plugin description.
+#: WikiHowProfilePlugin.php:60
 msgid ""
 "Fetches avatar and other profile information for WikiHow users when setting "
 "up an account via OpenID."
 msgstr ""
 
-#: WikiHowProfilePlugin.php:171
+#. TRANS: Exception thrown when fetching a WikiHow profile page fails.
+#: WikiHowProfilePlugin.php:126
+msgid "WikiHow profile page fetch failed."
+msgstr ""
+
+#. TRANS: Exception thrown when parsing a WikiHow profile page fails.
+#: WikiHowProfilePlugin.php:143
+msgid "HTML parse failure during check for WikiHow avatar."
+msgstr ""
+
+#. TRANS: Server exception thrown when an avatar URL is invalid.
+#. TRANS: %s is the invalid avatar URL.
+#: WikiHowProfilePlugin.php:176
 #, php-format
 msgid "Invalid avatar URL %s."
 msgstr ""
 
-#: WikiHowProfilePlugin.php:179
+#. TRANS: Exception thrown when fetching an avatar from a URL fails.
+#. TRANS: %s is a URL.
+#: WikiHowProfilePlugin.php:186
 #, php-format
 msgid "Unable to fetch avatar from %s."
 msgstr ""
diff --git a/plugins/WikiHowProfile/locale/de/LC_MESSAGES/WikiHowProfile.po b/plugins/WikiHowProfile/locale/de/LC_MESSAGES/WikiHowProfile.po
index de4c8ea6cf..ed9ee97e65 100644
--- a/plugins/WikiHowProfile/locale/de/LC_MESSAGES/WikiHowProfile.po
+++ b/plugins/WikiHowProfile/locale/de/LC_MESSAGES/WikiHowProfile.po
@@ -1,6 +1,7 @@
 # Translation of StatusNet - WikiHowProfile to German (Deutsch)
 # Exported from translatewiki.net
 #
+# Author: ChrisiPK
 # Author: Giftpflanze
 # --
 # This file is distributed under the same license as the StatusNet package.
@@ -9,18 +10,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - WikiHowProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:52+0000\n"
-"Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:28+0000\n"
+"Language-Team: German <https://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:54+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-19 11:23:54+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-wikihowprofile\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Plugin description.
 msgid ""
 "Fetches avatar and other profile information for WikiHow users when setting "
 "up an account via OpenID."
@@ -28,10 +30,22 @@ msgstr ""
 "Holt Avatar- und andere Profilinformationen für WikiHow-Benutzer beim "
 "Aufsetzen eines Kontos über OpenID."
 
+#. TRANS: Exception thrown when fetching a WikiHow profile page fails.
+msgid "WikiHow profile page fetch failed."
+msgstr "Laden des WikiHow-Profils fehlgeschlagen."
+
+#. TRANS: Exception thrown when parsing a WikiHow profile page fails.
+msgid "HTML parse failure during check for WikiHow avatar."
+msgstr "HTML-Parsingfehler bei der Suche des WikiHow-Avatars."
+
+#. TRANS: Server exception thrown when an avatar URL is invalid.
+#. TRANS: %s is the invalid avatar URL.
 #, php-format
 msgid "Invalid avatar URL %s."
 msgstr "Ungültige Avatar-URL %s."
 
+#. TRANS: Exception thrown when fetching an avatar from a URL fails.
+#. TRANS: %s is a URL.
 #, php-format
 msgid "Unable to fetch avatar from %s."
 msgstr "Kann Avatar nicht von %s holen."
diff --git a/plugins/WikiHowProfile/locale/es/LC_MESSAGES/WikiHowProfile.po b/plugins/WikiHowProfile/locale/es/LC_MESSAGES/WikiHowProfile.po
new file mode 100644
index 0000000000..53b28d7b83
--- /dev/null
+++ b/plugins/WikiHowProfile/locale/es/LC_MESSAGES/WikiHowProfile.po
@@ -0,0 +1,49 @@
+# Translation of StatusNet - WikiHowProfile to Spanish (español)
+# Exported from translatewiki.net
+#
+# Author: Armando-Martin
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - WikiHowProfile\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:28+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-19 11:23:54+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin description.
+msgid ""
+"Fetches avatar and other profile information for WikiHow users when setting "
+"up an account via OpenID."
+msgstr ""
+"Recupera el avatar y otra información de perfil para los usuarios de WikiHow "
+"al crear una cuenta mediante OpenID."
+
+#. TRANS: Exception thrown when fetching a WikiHow profile page fails.
+msgid "WikiHow profile page fetch failed."
+msgstr "Error al recuperar la página de perfil de WikiHow."
+
+#. TRANS: Exception thrown when parsing a WikiHow profile page fails.
+msgid "HTML parse failure during check for WikiHow avatar."
+msgstr ""
+"Error de interpretación de HTML durante la comprobación del avatar de "
+"WikiHow."
+
+#. TRANS: Server exception thrown when an avatar URL is invalid.
+#. TRANS: %s is the invalid avatar URL.
+#, php-format
+msgid "Invalid avatar URL %s."
+msgstr "La dirección URL del avatar, %s, es incorrecta."
+
+#. TRANS: Exception thrown when fetching an avatar from a URL fails.
+#. TRANS: %s is a URL.
+#, php-format
+msgid "Unable to fetch avatar from %s."
+msgstr "No se pudo recuperar el avatar desde %s."
diff --git a/plugins/WikiHowProfile/locale/eu/LC_MESSAGES/WikiHowProfile.po b/plugins/WikiHowProfile/locale/eu/LC_MESSAGES/WikiHowProfile.po
new file mode 100644
index 0000000000..de9e733cfd
--- /dev/null
+++ b/plugins/WikiHowProfile/locale/eu/LC_MESSAGES/WikiHowProfile.po
@@ -0,0 +1,45 @@
+# Translation of StatusNet - WikiHowProfile to Basque (euskara)
+# Exported from translatewiki.net
+#
+# Author: Artsuaga
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - WikiHowProfile\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:28+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-19 11:23:54+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin description.
+msgid ""
+"Fetches avatar and other profile information for WikiHow users when setting "
+"up an account via OpenID."
+msgstr ""
+
+#. TRANS: Exception thrown when fetching a WikiHow profile page fails.
+msgid "WikiHow profile page fetch failed."
+msgstr ""
+
+#. TRANS: Exception thrown when parsing a WikiHow profile page fails.
+msgid "HTML parse failure during check for WikiHow avatar."
+msgstr ""
+
+#. TRANS: Server exception thrown when an avatar URL is invalid.
+#. TRANS: %s is the invalid avatar URL.
+#, php-format
+msgid "Invalid avatar URL %s."
+msgstr "Abatarraren %s URL helbidea okerra da."
+
+#. TRANS: Exception thrown when fetching an avatar from a URL fails.
+#. TRANS: %s is a URL.
+#, php-format
+msgid "Unable to fetch avatar from %s."
+msgstr "Ezin izan da abatarra lortu %s helbidetik."
diff --git a/plugins/WikiHowProfile/locale/fr/LC_MESSAGES/WikiHowProfile.po b/plugins/WikiHowProfile/locale/fr/LC_MESSAGES/WikiHowProfile.po
index dc6ec4d175..68da2c97b6 100644
--- a/plugins/WikiHowProfile/locale/fr/LC_MESSAGES/WikiHowProfile.po
+++ b/plugins/WikiHowProfile/locale/fr/LC_MESSAGES/WikiHowProfile.po
@@ -1,6 +1,7 @@
-# Translation of StatusNet - WikiHowProfile to French (Français)
+# Translation of StatusNet - WikiHowProfile to French (français)
 # Exported from translatewiki.net
 #
+# Author: DavidL
 # Author: Verdy p
 # --
 # This file is distributed under the same license as the StatusNet package.
@@ -9,18 +10,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - WikiHowProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:52+0000\n"
-"Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:28+0000\n"
+"Language-Team: French <https://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:54+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-19 11:23:54+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-wikihowprofile\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#. TRANS: Plugin description.
 msgid ""
 "Fetches avatar and other profile information for WikiHow users when setting "
 "up an account via OpenID."
@@ -28,10 +30,23 @@ msgstr ""
 "Récupère l’avatar et les autres informations de profil des utilisateurs "
 "WikiHow lorsqu’ils créent un compte via OpenID."
 
+#. TRANS: Exception thrown when fetching a WikiHow profile page fails.
+msgid "WikiHow profile page fetch failed."
+msgstr "La recherche de la page de profile WikiHow a échoué."
+
+#. TRANS: Exception thrown when parsing a WikiHow profile page fails.
+msgid "HTML parse failure during check for WikiHow avatar."
+msgstr ""
+"Échec de l'interprétation HTML durant la vérification de l'avatar WikiHow."
+
+#. TRANS: Server exception thrown when an avatar URL is invalid.
+#. TRANS: %s is the invalid avatar URL.
 #, php-format
 msgid "Invalid avatar URL %s."
 msgstr "Adresse URL d’avatar « %s » invalide."
 
+#. TRANS: Exception thrown when fetching an avatar from a URL fails.
+#. TRANS: %s is a URL.
 #, php-format
 msgid "Unable to fetch avatar from %s."
 msgstr "Impossible de récupérer l’avatar depuis « %s »."
diff --git a/plugins/WikiHowProfile/locale/gl/LC_MESSAGES/WikiHowProfile.po b/plugins/WikiHowProfile/locale/gl/LC_MESSAGES/WikiHowProfile.po
new file mode 100644
index 0000000000..e82481d403
--- /dev/null
+++ b/plugins/WikiHowProfile/locale/gl/LC_MESSAGES/WikiHowProfile.po
@@ -0,0 +1,50 @@
+# Translation of StatusNet - WikiHowProfile to Galician (galego)
+# Exported from translatewiki.net
+#
+# Author: Toliño
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - WikiHowProfile\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:28+0000\n"
+"Language-Team: Galician <https://translatewiki.net/wiki/Portal:gl>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-19 11:23:54+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: gl\n"
+"X-Message-Group: #out-statusnet-plugin-wikihowprofile\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin description.
+msgid ""
+"Fetches avatar and other profile information for WikiHow users when setting "
+"up an account via OpenID."
+msgstr ""
+"Recupera o avatar e outra información de perfil para os usuarios de WikiHow "
+"ao crear unha conta mediante o OpenID."
+
+#. TRANS: Exception thrown when fetching a WikiHow profile page fails.
+msgid "WikiHow profile page fetch failed."
+msgstr "Erro ao recuperar a páxina de perfil WikiHow."
+
+#. TRANS: Exception thrown when parsing a WikiHow profile page fails.
+msgid "HTML parse failure during check for WikiHow avatar."
+msgstr "Erro de interpretación HTML durante a comprobación do avatar WikiHow."
+
+#. TRANS: Server exception thrown when an avatar URL is invalid.
+#. TRANS: %s is the invalid avatar URL.
+#, php-format
+msgid "Invalid avatar URL %s."
+msgstr "O enderezo URL do avatar, %s, é incorrecto."
+
+#. TRANS: Exception thrown when fetching an avatar from a URL fails.
+#. TRANS: %s is a URL.
+#, php-format
+msgid "Unable to fetch avatar from %s."
+msgstr "Non se puido recuperar o avatar desde %s."
diff --git a/plugins/WikiHowProfile/locale/ia/LC_MESSAGES/WikiHowProfile.po b/plugins/WikiHowProfile/locale/ia/LC_MESSAGES/WikiHowProfile.po
index c7ac0bca31..02aaf92a4f 100644
--- a/plugins/WikiHowProfile/locale/ia/LC_MESSAGES/WikiHowProfile.po
+++ b/plugins/WikiHowProfile/locale/ia/LC_MESSAGES/WikiHowProfile.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - WikiHowProfile to Interlingua (Interlingua)
+# Translation of StatusNet - WikiHowProfile to Interlingua (interlingua)
 # Exported from translatewiki.net
 #
 # Author: McDutchie
@@ -9,18 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - WikiHowProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:52+0000\n"
-"Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:28+0000\n"
+"Language-Team: Interlingua <https://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:54+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-19 11:23:54+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-wikihowprofile\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Plugin description.
 msgid ""
 "Fetches avatar and other profile information for WikiHow users when setting "
 "up an account via OpenID."
@@ -28,10 +29,24 @@ msgstr ""
 "Obtene le avatar e altere informationes de profilo pro usatores de WikiHow "
 "durante le creation de un conto via OpenID."
 
+#. TRANS: Exception thrown when fetching a WikiHow profile page fails.
+msgid "WikiHow profile page fetch failed."
+msgstr "Le obtention del pagina de profilo de WikiHow ha fallite."
+
+#. TRANS: Exception thrown when parsing a WikiHow profile page fails.
+msgid "HTML parse failure during check for WikiHow avatar."
+msgstr ""
+"Problema de interpretar le HTML durante le verification del presentia de un "
+"avatar de WikiHow."
+
+#. TRANS: Server exception thrown when an avatar URL is invalid.
+#. TRANS: %s is the invalid avatar URL.
 #, php-format
 msgid "Invalid avatar URL %s."
 msgstr "URL de avatar %s invalide."
 
+#. TRANS: Exception thrown when fetching an avatar from a URL fails.
+#. TRANS: %s is a URL.
 #, php-format
 msgid "Unable to fetch avatar from %s."
 msgstr "Incapace de obtener avatar ab %s."
diff --git a/plugins/WikiHowProfile/locale/mk/LC_MESSAGES/WikiHowProfile.po b/plugins/WikiHowProfile/locale/mk/LC_MESSAGES/WikiHowProfile.po
index f39518e88b..bd70918deb 100644
--- a/plugins/WikiHowProfile/locale/mk/LC_MESSAGES/WikiHowProfile.po
+++ b/plugins/WikiHowProfile/locale/mk/LC_MESSAGES/WikiHowProfile.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - WikiHowProfile to Macedonian (Македон�ки)
+# Translation of StatusNet - WikiHowProfile to Macedonian (македон�ки)
 # Exported from translatewiki.net
 #
 # Author: Bjankuloski06
@@ -9,18 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - WikiHowProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:52+0000\n"
-"Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:28+0000\n"
+"Language-Team: Macedonian <https://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:54+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-19 11:23:54+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-wikihowprofile\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
 
+#. TRANS: Plugin description.
 msgid ""
 "Fetches avatar and other profile information for WikiHow users when setting "
 "up an account via OpenID."
@@ -28,10 +29,22 @@ msgstr ""
 "Презема аватар и други профилни податоци за кори�ници на WikiHow при "
 "�оздавање на �метка преку OpenID."
 
+#. TRANS: Exception thrown when fetching a WikiHow profile page fails.
+msgid "WikiHow profile page fetch failed."
+msgstr "�е у�пеав да ја добијам профилната �траница од WikiHow."
+
+#. TRANS: Exception thrown when parsing a WikiHow profile page fails.
+msgid "HTML parse failure during check for WikiHow avatar."
+msgstr "�е у�пеа пар�ирањето на HTML при проверката на аватар од WikiHow."
+
+#. TRANS: Server exception thrown when an avatar URL is invalid.
+#. TRANS: %s is the invalid avatar URL.
 #, php-format
 msgid "Invalid avatar URL %s."
 msgstr "�еважечка URL-адре�а на аватарот: %s."
 
+#. TRANS: Exception thrown when fetching an avatar from a URL fails.
+#. TRANS: %s is a URL.
 #, php-format
 msgid "Unable to fetch avatar from %s."
 msgstr "�е можев да го преземам аватарот од %s."
diff --git a/plugins/WikiHowProfile/locale/ms/LC_MESSAGES/WikiHowProfile.po b/plugins/WikiHowProfile/locale/ms/LC_MESSAGES/WikiHowProfile.po
index 6ff9373944..717ca0a841 100644
--- a/plugins/WikiHowProfile/locale/ms/LC_MESSAGES/WikiHowProfile.po
+++ b/plugins/WikiHowProfile/locale/ms/LC_MESSAGES/WikiHowProfile.po
@@ -9,18 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - WikiHowProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:52+0000\n"
-"Language-Team: Malay <http://translatewiki.net/wiki/Portal:ms>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:28+0000\n"
+"Language-Team: Malay <https://translatewiki.net/wiki/Portal:ms>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:54+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-19 11:23:54+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ms\n"
 "X-Message-Group: #out-statusnet-plugin-wikihowprofile\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#. TRANS: Plugin description.
 msgid ""
 "Fetches avatar and other profile information for WikiHow users when setting "
 "up an account via OpenID."
@@ -28,10 +29,22 @@ msgstr ""
 "Mengambil avatar dan maklumat profil yang lain untuk pengguna WikiHow "
 "apabila membuka akaun melalui OpenID."
 
+#. TRANS: Exception thrown when fetching a WikiHow profile page fails.
+msgid "WikiHow profile page fetch failed."
+msgstr ""
+
+#. TRANS: Exception thrown when parsing a WikiHow profile page fails.
+msgid "HTML parse failure during check for WikiHow avatar."
+msgstr ""
+
+#. TRANS: Server exception thrown when an avatar URL is invalid.
+#. TRANS: %s is the invalid avatar URL.
 #, php-format
 msgid "Invalid avatar URL %s."
 msgstr "URL avatar %s tidak sah."
 
+#. TRANS: Exception thrown when fetching an avatar from a URL fails.
+#. TRANS: %s is a URL.
 #, php-format
 msgid "Unable to fetch avatar from %s."
 msgstr "Avatar tidak dapat diambil dari %s."
diff --git a/plugins/WikiHowProfile/locale/nl/LC_MESSAGES/WikiHowProfile.po b/plugins/WikiHowProfile/locale/nl/LC_MESSAGES/WikiHowProfile.po
index 76f1f89048..34ded405c9 100644
--- a/plugins/WikiHowProfile/locale/nl/LC_MESSAGES/WikiHowProfile.po
+++ b/plugins/WikiHowProfile/locale/nl/LC_MESSAGES/WikiHowProfile.po
@@ -9,18 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - WikiHowProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:53+0000\n"
-"Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:29+0000\n"
+"Language-Team: Dutch <https://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:54+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-19 11:23:54+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-wikihowprofile\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Plugin description.
 msgid ""
 "Fetches avatar and other profile information for WikiHow users when setting "
 "up an account via OpenID."
@@ -28,10 +29,24 @@ msgstr ""
 "Haalt avatar- en andere gegevens op voor WikiHow-gebruikers die een "
 "gebruiker aanmaken via OpenID."
 
+#. TRANS: Exception thrown when fetching a WikiHow profile page fails.
+msgid "WikiHow profile page fetch failed."
+msgstr "Het ophalen van de profielpagina van WikiHow is mislukt."
+
+#. TRANS: Exception thrown when parsing a WikiHow profile page fails.
+msgid "HTML parse failure during check for WikiHow avatar."
+msgstr ""
+"Het verwerken van de HTML is mislukt tijdens het controleren op de WikiHow-"
+"avatar."
+
+#. TRANS: Server exception thrown when an avatar URL is invalid.
+#. TRANS: %s is the invalid avatar URL.
 #, php-format
 msgid "Invalid avatar URL %s."
 msgstr "Ongeldige avatar-URL %s."
 
+#. TRANS: Exception thrown when fetching an avatar from a URL fails.
+#. TRANS: %s is a URL.
 #, php-format
 msgid "Unable to fetch avatar from %s."
 msgstr "Het was niet mogelijk om de avatar op te halen van %s."
diff --git a/plugins/WikiHowProfile/locale/ru/LC_MESSAGES/WikiHowProfile.po b/plugins/WikiHowProfile/locale/ru/LC_MESSAGES/WikiHowProfile.po
index ffbc7f2cfb..d6dd07e9d7 100644
--- a/plugins/WikiHowProfile/locale/ru/LC_MESSAGES/WikiHowProfile.po
+++ b/plugins/WikiHowProfile/locale/ru/LC_MESSAGES/WikiHowProfile.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - WikiHowProfile to Russian (Ру��кий)
+# Translation of StatusNet - WikiHowProfile to Russian (ру��кий)
 # Exported from translatewiki.net
 #
 # Author: Lockal
@@ -9,19 +9,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - WikiHowProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:53+0000\n"
-"Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:29+0000\n"
+"Language-Team: Russian <https://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:54+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-19 11:23:54+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-wikihowprofile\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
+#. TRANS: Plugin description.
 msgid ""
 "Fetches avatar and other profile information for WikiHow users when setting "
 "up an account via OpenID."
@@ -29,10 +30,22 @@ msgstr ""
 "Запрашивает аватару и прочую информацию из профил� пользовател� WikiHow при "
 "�оздании учётной запи�и � помощью OpenID."
 
+#. TRANS: Exception thrown when fetching a WikiHow profile page fails.
+msgid "WikiHow profile page fetch failed."
+msgstr ""
+
+#. TRANS: Exception thrown when parsing a WikiHow profile page fails.
+msgid "HTML parse failure during check for WikiHow avatar."
+msgstr ""
+
+#. TRANS: Server exception thrown when an avatar URL is invalid.
+#. TRANS: %s is the invalid avatar URL.
 #, php-format
 msgid "Invalid avatar URL %s."
 msgstr "�еверный URL-адре� аватары %s"
 
+#. TRANS: Exception thrown when fetching an avatar from a URL fails.
+#. TRANS: %s is a URL.
 #, php-format
 msgid "Unable to fetch avatar from %s."
 msgstr "�е удаёт�� получить аватару из %s."
diff --git a/plugins/WikiHowProfile/locale/tl/LC_MESSAGES/WikiHowProfile.po b/plugins/WikiHowProfile/locale/tl/LC_MESSAGES/WikiHowProfile.po
index 0f79d00bd9..6b74926cfc 100644
--- a/plugins/WikiHowProfile/locale/tl/LC_MESSAGES/WikiHowProfile.po
+++ b/plugins/WikiHowProfile/locale/tl/LC_MESSAGES/WikiHowProfile.po
@@ -9,18 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - WikiHowProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:53+0000\n"
-"Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:29+0000\n"
+"Language-Team: Tagalog <https://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:54+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-19 11:23:54+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-wikihowprofile\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Plugin description.
 msgid ""
 "Fetches avatar and other profile information for WikiHow users when setting "
 "up an account via OpenID."
@@ -28,10 +29,22 @@ msgstr ""
 "Dumarampot ng abatar at ibang kabatiran ng balangkas para sa mga tagagamit "
 "ng WikiHow kapag nagtatalaga ng isang akawnt sa pamamagitan ng OpenID."
 
+#. TRANS: Exception thrown when fetching a WikiHow profile page fails.
+msgid "WikiHow profile page fetch failed."
+msgstr "Nabigo ang pagsalok sa pahina ng balangkas ng WikiHow."
+
+#. TRANS: Exception thrown when parsing a WikiHow profile page fails.
+msgid "HTML parse failure during check for WikiHow avatar."
+msgstr "Kabiguan ng parse ng HTML habang sinusuri para sa abatar ng WikiHow."
+
+#. TRANS: Server exception thrown when an avatar URL is invalid.
+#. TRANS: %s is the invalid avatar URL.
 #, php-format
 msgid "Invalid avatar URL %s."
 msgstr "Hindi tanggap na URL ng abatar ang %s."
 
+#. TRANS: Exception thrown when fetching an avatar from a URL fails.
+#. TRANS: %s is a URL.
 #, php-format
 msgid "Unable to fetch avatar from %s."
 msgstr "Hindi nagawang damputin ang huwaran mula sa %s."
diff --git a/plugins/WikiHowProfile/locale/tr/LC_MESSAGES/WikiHowProfile.po b/plugins/WikiHowProfile/locale/tr/LC_MESSAGES/WikiHowProfile.po
index 96617aeae9..99fd3f9a92 100644
--- a/plugins/WikiHowProfile/locale/tr/LC_MESSAGES/WikiHowProfile.po
+++ b/plugins/WikiHowProfile/locale/tr/LC_MESSAGES/WikiHowProfile.po
@@ -9,18 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - WikiHowProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:53+0000\n"
-"Language-Team: Turkish <http://translatewiki.net/wiki/Portal:tr>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:29+0000\n"
+"Language-Team: Turkish <https://translatewiki.net/wiki/Portal:tr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:54+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-19 11:23:54+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: tr\n"
 "X-Message-Group: #out-statusnet-plugin-wikihowprofile\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#. TRANS: Plugin description.
 msgid ""
 "Fetches avatar and other profile information for WikiHow users when setting "
 "up an account via OpenID."
@@ -28,10 +29,22 @@ msgstr ""
 "OpenID aracılığıyla hesap oluşturan WikiHow kullanıcıları için kullanıcı "
 "resimlerini ve diğer profil bilgilerini alır."
 
+#. TRANS: Exception thrown when fetching a WikiHow profile page fails.
+msgid "WikiHow profile page fetch failed."
+msgstr ""
+
+#. TRANS: Exception thrown when parsing a WikiHow profile page fails.
+msgid "HTML parse failure during check for WikiHow avatar."
+msgstr ""
+
+#. TRANS: Server exception thrown when an avatar URL is invalid.
+#. TRANS: %s is the invalid avatar URL.
 #, php-format
 msgid "Invalid avatar URL %s."
 msgstr "Geçersiz kullanıcı resmi bağlantısı %s."
 
+#. TRANS: Exception thrown when fetching an avatar from a URL fails.
+#. TRANS: %s is a URL.
 #, php-format
 msgid "Unable to fetch avatar from %s."
 msgstr "%s'ten kullanıcı resmi alınamıyor."
diff --git a/plugins/WikiHowProfile/locale/uk/LC_MESSAGES/WikiHowProfile.po b/plugins/WikiHowProfile/locale/uk/LC_MESSAGES/WikiHowProfile.po
index 9db7d32301..d63f01d958 100644
--- a/plugins/WikiHowProfile/locale/uk/LC_MESSAGES/WikiHowProfile.po
+++ b/plugins/WikiHowProfile/locale/uk/LC_MESSAGES/WikiHowProfile.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - WikiHowProfile to Ukrainian (Україн�ька)
+# Translation of StatusNet - WikiHowProfile to Ukrainian (україн�ька)
 # Exported from translatewiki.net
 #
 # Author: Boogie
@@ -9,19 +9,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - WikiHowProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:53+0000\n"
-"Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:29+0000\n"
+"Language-Team: Ukrainian <https://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:54+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-19 11:23:54+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-wikihowprofile\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
+#. TRANS: Plugin description.
 msgid ""
 "Fetches avatar and other profile information for WikiHow users when setting "
 "up an account via OpenID."
@@ -29,10 +30,22 @@ msgstr ""
 "Запитує аватар та іншу �упутню інформацію з WikiHow дл� кори�тувачів, котрі "
 "�творюють акаунти через OpenID."
 
+#. TRANS: Exception thrown when fetching a WikiHow profile page fails.
+msgid "WikiHow profile page fetch failed."
+msgstr ""
+
+#. TRANS: Exception thrown when parsing a WikiHow profile page fails.
+msgid "HTML parse failure during check for WikiHow avatar."
+msgstr ""
+
+#. TRANS: Server exception thrown when an avatar URL is invalid.
+#. TRANS: %s is the invalid avatar URL.
 #, php-format
 msgid "Invalid avatar URL %s."
 msgstr "�евірна URL-адре�а аватари %s."
 
+#. TRANS: Exception thrown when fetching an avatar from a URL fails.
+#. TRANS: %s is a URL.
 #, php-format
 msgid "Unable to fetch avatar from %s."
 msgstr "�еможливо завантажити аватару з %s."
diff --git a/plugins/XCache/XCachePlugin.php b/plugins/XCache/XCachePlugin.php
index 2baa290ed2..5b10718eaf 100644
--- a/plugins/XCache/XCachePlugin.php
+++ b/plugins/XCache/XCachePlugin.php
@@ -47,7 +47,6 @@ if (!defined('STATUSNET')) {
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
  */
-
 class XCachePlugin extends Plugin
 {
     /**
@@ -60,7 +59,6 @@ class XCachePlugin extends Plugin
      *
      * @return boolean hook success
      */
-
     function onStartCacheGet(&$key, &$value)
     {
         if (!xcache_isset($key)) {
@@ -84,7 +82,6 @@ class XCachePlugin extends Plugin
      *
      * @return boolean hook success
      */
-
     function onStartCacheSet(&$key, &$value, &$flag, &$expiry, &$success)
     {
         $success = xcache_set($key, serialize($value));
@@ -102,7 +99,6 @@ class XCachePlugin extends Plugin
      *
      * @return boolean hook success
      */
-
     function onStartCacheDelete(&$key, &$success)
     {
         $success = xcache_unset($key);
@@ -117,8 +113,8 @@ class XCachePlugin extends Plugin
                             'author' => 'Craig Andrews',
                             'homepage' => 'http://status.net/wiki/Plugin:XCache',
                             'rawdescription' =>
+                            // TRANS: Plugin description.
                             _m('Use the <a href="http://xcache.lighttpd.net/">XCache</a> variable cache to cache query results.'));
         return true;
     }
 }
-
diff --git a/plugins/XCache/locale/XCache.pot b/plugins/XCache/locale/XCache.pot
index c5cb57ad80..8840592faf 100644
--- a/plugins/XCache/locale/XCache.pot
+++ b/plugins/XCache/locale/XCache.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,7 +16,8 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: XCachePlugin.php:120
+#. TRANS: Plugin description.
+#: XCachePlugin.php:117
 msgid ""
 "Use the <a href=\"http://xcache.lighttpd.net/\">XCache</a> variable cache to "
 "cache query results."
diff --git a/plugins/XCache/locale/ast/LC_MESSAGES/XCache.po b/plugins/XCache/locale/ast/LC_MESSAGES/XCache.po
index 52a0bd195c..6253db6caf 100644
--- a/plugins/XCache/locale/ast/LC_MESSAGES/XCache.po
+++ b/plugins/XCache/locale/ast/LC_MESSAGES/XCache.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - XCache to Asturian (Asturianu)
+# Translation of StatusNet - XCache to Asturian (asturianu)
 # Exported from translatewiki.net
 #
 # Author: Xuacu
@@ -9,18 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - XCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:53+0000\n"
-"Language-Team: Asturian <http://translatewiki.net/wiki/Portal:ast>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:29+0000\n"
+"Language-Team: Asturian <https://translatewiki.net/wiki/Portal:ast>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:55+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:52:14+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ast\n"
 "X-Message-Group: #out-statusnet-plugin-xcache\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Plugin description.
 msgid ""
 "Use the <a href=\"http://xcache.lighttpd.net/\">XCache</a> variable cache to "
 "cache query results."
diff --git a/plugins/XCache/locale/br/LC_MESSAGES/XCache.po b/plugins/XCache/locale/br/LC_MESSAGES/XCache.po
index 712e46e153..50a3993391 100644
--- a/plugins/XCache/locale/br/LC_MESSAGES/XCache.po
+++ b/plugins/XCache/locale/br/LC_MESSAGES/XCache.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - XCache to Breton (Brezhoneg)
+# Translation of StatusNet - XCache to Breton (brezhoneg)
 # Exported from translatewiki.net
 #
 # Author: Fulup
@@ -9,18 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - XCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:53+0000\n"
-"Language-Team: Breton <http://translatewiki.net/wiki/Portal:br>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:29+0000\n"
+"Language-Team: Breton <https://translatewiki.net/wiki/Portal:br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:55+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:52:14+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-xcache\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#. TRANS: Plugin description.
 msgid ""
 "Use the <a href=\"http://xcache.lighttpd.net/\">XCache</a> variable cache to "
 "cache query results."
diff --git a/plugins/XCache/locale/de/LC_MESSAGES/XCache.po b/plugins/XCache/locale/de/LC_MESSAGES/XCache.po
index 0045526b14..4ba1878c38 100644
--- a/plugins/XCache/locale/de/LC_MESSAGES/XCache.po
+++ b/plugins/XCache/locale/de/LC_MESSAGES/XCache.po
@@ -9,18 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - XCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:53+0000\n"
-"Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:29+0000\n"
+"Language-Team: German <https://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:55+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:52:14+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-xcache\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Plugin description.
 msgid ""
 "Use the <a href=\"http://xcache.lighttpd.net/\">XCache</a> variable cache to "
 "cache query results."
diff --git a/plugins/XCache/locale/es/LC_MESSAGES/XCache.po b/plugins/XCache/locale/es/LC_MESSAGES/XCache.po
index 6f6377e368..7ed35e5c55 100644
--- a/plugins/XCache/locale/es/LC_MESSAGES/XCache.po
+++ b/plugins/XCache/locale/es/LC_MESSAGES/XCache.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - XCache to Spanish (Español)
+# Translation of StatusNet - XCache to Spanish (español)
 # Exported from translatewiki.net
 #
 # Author: Locos epraix
@@ -9,18 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - XCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:54+0000\n"
-"Language-Team: Spanish <http://translatewiki.net/wiki/Portal:es>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:29+0000\n"
+"Language-Team: Spanish <https://translatewiki.net/wiki/Portal:es>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:55+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:52:14+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-plugin-xcache\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Plugin description.
 msgid ""
 "Use the <a href=\"http://xcache.lighttpd.net/\">XCache</a> variable cache to "
 "cache query results."
diff --git a/plugins/XCache/locale/eu/LC_MESSAGES/XCache.po b/plugins/XCache/locale/eu/LC_MESSAGES/XCache.po
new file mode 100644
index 0000000000..7e449b1fba
--- /dev/null
+++ b/plugins/XCache/locale/eu/LC_MESSAGES/XCache.po
@@ -0,0 +1,27 @@
+# Translation of StatusNet - XCache to Basque (euskara)
+# Exported from translatewiki.net
+#
+# Author: Artsuaga
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - XCache\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:29+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:52:14+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Plugin description.
+msgid ""
+"Use the <a href=\"http://xcache.lighttpd.net/\">XCache</a> variable cache to "
+"cache query results."
+msgstr ""
+"Erabili <a href=\"http://xcache.lighttpd.net/\">XCache</a> aldagairen katxea "
+"kontsultako emaitzak katxeatzeko."
diff --git a/plugins/XCache/locale/fi/LC_MESSAGES/XCache.po b/plugins/XCache/locale/fi/LC_MESSAGES/XCache.po
index 0b3b725c99..005b21611c 100644
--- a/plugins/XCache/locale/fi/LC_MESSAGES/XCache.po
+++ b/plugins/XCache/locale/fi/LC_MESSAGES/XCache.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - XCache to Finnish (Suomi)
+# Translation of StatusNet - XCache to Finnish (suomi)
 # Exported from translatewiki.net
 #
 # Author: Centerlink
@@ -9,18 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - XCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:54+0000\n"
-"Language-Team: Finnish <http://translatewiki.net/wiki/Portal:fi>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:30+0000\n"
+"Language-Team: Finnish <https://translatewiki.net/wiki/Portal:fi>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:55+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:52:14+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: fi\n"
 "X-Message-Group: #out-statusnet-plugin-xcache\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Plugin description.
 msgid ""
 "Use the <a href=\"http://xcache.lighttpd.net/\">XCache</a> variable cache to "
 "cache query results."
diff --git a/plugins/XCache/locale/fr/LC_MESSAGES/XCache.po b/plugins/XCache/locale/fr/LC_MESSAGES/XCache.po
index 068bc7f445..f55f398ae4 100644
--- a/plugins/XCache/locale/fr/LC_MESSAGES/XCache.po
+++ b/plugins/XCache/locale/fr/LC_MESSAGES/XCache.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - XCache to French (Français)
+# Translation of StatusNet - XCache to French (français)
 # Exported from translatewiki.net
 #
 # Author: Verdy p
@@ -9,18 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - XCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:54+0000\n"
-"Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:30+0000\n"
+"Language-Team: French <https://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:55+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:52:14+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-xcache\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#. TRANS: Plugin description.
 msgid ""
 "Use the <a href=\"http://xcache.lighttpd.net/\">XCache</a> variable cache to "
 "cache query results."
diff --git a/plugins/XCache/locale/gl/LC_MESSAGES/XCache.po b/plugins/XCache/locale/gl/LC_MESSAGES/XCache.po
index 7802dd9b15..6fc7b009c9 100644
--- a/plugins/XCache/locale/gl/LC_MESSAGES/XCache.po
+++ b/plugins/XCache/locale/gl/LC_MESSAGES/XCache.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - XCache to Galician (Galego)
+# Translation of StatusNet - XCache to Galician (galego)
 # Exported from translatewiki.net
 #
 # Author: Toliño
@@ -9,18 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - XCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:54+0000\n"
-"Language-Team: Galician <http://translatewiki.net/wiki/Portal:gl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:30+0000\n"
+"Language-Team: Galician <https://translatewiki.net/wiki/Portal:gl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:55+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:52:14+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: gl\n"
 "X-Message-Group: #out-statusnet-plugin-xcache\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Plugin description.
 msgid ""
 "Use the <a href=\"http://xcache.lighttpd.net/\">XCache</a> variable cache to "
 "cache query results."
diff --git a/plugins/XCache/locale/he/LC_MESSAGES/XCache.po b/plugins/XCache/locale/he/LC_MESSAGES/XCache.po
index 8c34b446ae..23deac8a23 100644
--- a/plugins/XCache/locale/he/LC_MESSAGES/XCache.po
+++ b/plugins/XCache/locale/he/LC_MESSAGES/XCache.po
@@ -9,18 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - XCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:54+0000\n"
-"Language-Team: Hebrew <http://translatewiki.net/wiki/Portal:he>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:30+0000\n"
+"Language-Team: Hebrew <https://translatewiki.net/wiki/Portal:he>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:55+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:52:14+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: he\n"
 "X-Message-Group: #out-statusnet-plugin-xcache\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Plugin description.
 msgid ""
 "Use the <a href=\"http://xcache.lighttpd.net/\">XCache</a> variable cache to "
 "cache query results."
diff --git a/plugins/XCache/locale/ia/LC_MESSAGES/XCache.po b/plugins/XCache/locale/ia/LC_MESSAGES/XCache.po
index 2242887cfd..d72209d273 100644
--- a/plugins/XCache/locale/ia/LC_MESSAGES/XCache.po
+++ b/plugins/XCache/locale/ia/LC_MESSAGES/XCache.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - XCache to Interlingua (Interlingua)
+# Translation of StatusNet - XCache to Interlingua (interlingua)
 # Exported from translatewiki.net
 #
 # Author: McDutchie
@@ -9,18 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - XCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:54+0000\n"
-"Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:30+0000\n"
+"Language-Team: Interlingua <https://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:55+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:52:14+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-xcache\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Plugin description.
 msgid ""
 "Use the <a href=\"http://xcache.lighttpd.net/\">XCache</a> variable cache to "
 "cache query results."
diff --git a/plugins/XCache/locale/id/LC_MESSAGES/XCache.po b/plugins/XCache/locale/id/LC_MESSAGES/XCache.po
index 112a3ee2f8..16e0073797 100644
--- a/plugins/XCache/locale/id/LC_MESSAGES/XCache.po
+++ b/plugins/XCache/locale/id/LC_MESSAGES/XCache.po
@@ -9,18 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - XCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:54+0000\n"
-"Language-Team: Indonesian <http://translatewiki.net/wiki/Portal:id>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:30+0000\n"
+"Language-Team: Indonesian <https://translatewiki.net/wiki/Portal:id>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:55+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:52:14+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: id\n"
 "X-Message-Group: #out-statusnet-plugin-xcache\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#. TRANS: Plugin description.
 msgid ""
 "Use the <a href=\"http://xcache.lighttpd.net/\">XCache</a> variable cache to "
 "cache query results."
diff --git a/plugins/XCache/locale/mk/LC_MESSAGES/XCache.po b/plugins/XCache/locale/mk/LC_MESSAGES/XCache.po
index 07f70c610c..83bc937e04 100644
--- a/plugins/XCache/locale/mk/LC_MESSAGES/XCache.po
+++ b/plugins/XCache/locale/mk/LC_MESSAGES/XCache.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - XCache to Macedonian (Македон�ки)
+# Translation of StatusNet - XCache to Macedonian (македон�ки)
 # Exported from translatewiki.net
 #
 # Author: Bjankuloski06
@@ -9,18 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - XCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:54+0000\n"
-"Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:30+0000\n"
+"Language-Team: Macedonian <https://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:55+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:52:14+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-xcache\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
 
+#. TRANS: Plugin description.
 msgid ""
 "Use the <a href=\"http://xcache.lighttpd.net/\">XCache</a> variable cache to "
 "cache query results."
diff --git a/plugins/XCache/locale/ms/LC_MESSAGES/XCache.po b/plugins/XCache/locale/ms/LC_MESSAGES/XCache.po
index 08c7baf941..ac9b5244ae 100644
--- a/plugins/XCache/locale/ms/LC_MESSAGES/XCache.po
+++ b/plugins/XCache/locale/ms/LC_MESSAGES/XCache.po
@@ -9,18 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - XCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:54+0000\n"
-"Language-Team: Malay <http://translatewiki.net/wiki/Portal:ms>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:30+0000\n"
+"Language-Team: Malay <https://translatewiki.net/wiki/Portal:ms>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:55+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:52:14+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ms\n"
 "X-Message-Group: #out-statusnet-plugin-xcache\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#. TRANS: Plugin description.
 msgid ""
 "Use the <a href=\"http://xcache.lighttpd.net/\">XCache</a> variable cache to "
 "cache query results."
diff --git a/plugins/XCache/locale/nb/LC_MESSAGES/XCache.po b/plugins/XCache/locale/nb/LC_MESSAGES/XCache.po
index 42596b8672..232638b857 100644
--- a/plugins/XCache/locale/nb/LC_MESSAGES/XCache.po
+++ b/plugins/XCache/locale/nb/LC_MESSAGES/XCache.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - XCache to Norwegian (bokmål)‬ (‪Norsk (bokmål)‬)
+# Translation of StatusNet - XCache to Norwegian Bokmål (‪norsk (bokmål)‬)
 # Exported from translatewiki.net
 #
 # Author: Nghtwlkr
@@ -9,18 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - XCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:54+0000\n"
-"Language-Team: Norwegian (bokmål)‬ <http://translatewiki.net/wiki/Portal:no>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:30+0000\n"
+"Language-Team: Norwegian Bokmål <https://translatewiki.net/wiki/Portal:nb>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:55+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
-"X-Language-Code: no\n"
+"X-POT-Import-Date: 2011-06-05 21:52:14+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: nb\n"
 "X-Message-Group: #out-statusnet-plugin-xcache\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Plugin description.
 msgid ""
 "Use the <a href=\"http://xcache.lighttpd.net/\">XCache</a> variable cache to "
 "cache query results."
diff --git a/plugins/XCache/locale/nl/LC_MESSAGES/XCache.po b/plugins/XCache/locale/nl/LC_MESSAGES/XCache.po
index 81513445f9..eab2395002 100644
--- a/plugins/XCache/locale/nl/LC_MESSAGES/XCache.po
+++ b/plugins/XCache/locale/nl/LC_MESSAGES/XCache.po
@@ -9,18 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - XCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:54+0000\n"
-"Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:31+0000\n"
+"Language-Team: Dutch <https://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:55+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:52:14+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-xcache\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Plugin description.
 msgid ""
 "Use the <a href=\"http://xcache.lighttpd.net/\">XCache</a> variable cache to "
 "cache query results."
diff --git a/plugins/XCache/locale/pl/LC_MESSAGES/XCache.po b/plugins/XCache/locale/pl/LC_MESSAGES/XCache.po
new file mode 100644
index 0000000000..8098b3a0e3
--- /dev/null
+++ b/plugins/XCache/locale/pl/LC_MESSAGES/XCache.po
@@ -0,0 +1,28 @@
+# Translation of StatusNet - XCache to Polish (polski)
+# Exported from translatewiki.net
+#
+# Author: BeginaFelicysym
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - XCache\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:31+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-05 21:52:14+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=3; plural=(n == 1) ? 0 : ( (n%10 >= 2 && n%10 <= 4 && "
+"(n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
+
+#. TRANS: Plugin description.
+msgid ""
+"Use the <a href=\"http://xcache.lighttpd.net/\">XCache</a> variable cache to "
+"cache query results."
+msgstr ""
+"Używa zmiennej pamięci podręcznej <a href=\"http://xcache.lighttpd.net/"
+"\">XCache</a> do buforowania wyników kwerendy."
diff --git a/plugins/XCache/locale/pt/LC_MESSAGES/XCache.po b/plugins/XCache/locale/pt/LC_MESSAGES/XCache.po
index 2a166cee09..7f60405087 100644
--- a/plugins/XCache/locale/pt/LC_MESSAGES/XCache.po
+++ b/plugins/XCache/locale/pt/LC_MESSAGES/XCache.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - XCache to Portuguese (Português)
+# Translation of StatusNet - XCache to Portuguese (português)
 # Exported from translatewiki.net
 #
 # Author: Waldir
@@ -9,18 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - XCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:54+0000\n"
-"Language-Team: Portuguese <http://translatewiki.net/wiki/Portal:pt>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:31+0000\n"
+"Language-Team: Portuguese <https://translatewiki.net/wiki/Portal:pt>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:55+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:52:14+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: pt\n"
 "X-Message-Group: #out-statusnet-plugin-xcache\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Plugin description.
 msgid ""
 "Use the <a href=\"http://xcache.lighttpd.net/\">XCache</a> variable cache to "
 "cache query results."
diff --git a/plugins/XCache/locale/pt_BR/LC_MESSAGES/XCache.po b/plugins/XCache/locale/pt_BR/LC_MESSAGES/XCache.po
index 10898cefd2..9a679b0289 100644
--- a/plugins/XCache/locale/pt_BR/LC_MESSAGES/XCache.po
+++ b/plugins/XCache/locale/pt_BR/LC_MESSAGES/XCache.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - XCache to Brazilian Portuguese (Português do Brasil)
+# Translation of StatusNet - XCache to Brazilian Portuguese (português do Brasil)
 # Exported from translatewiki.net
 #
 # Author: Giro720
@@ -9,19 +9,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - XCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:54+0000\n"
-"Language-Team: Brazilian Portuguese <http://translatewiki.net/wiki/Portal:pt-"
-"br>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:31+0000\n"
+"Language-Team: Brazilian Portuguese <https://translatewiki.net/wiki/Portal:"
+"pt-br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:55+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:52:14+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: pt-br\n"
 "X-Message-Group: #out-statusnet-plugin-xcache\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#. TRANS: Plugin description.
 msgid ""
 "Use the <a href=\"http://xcache.lighttpd.net/\">XCache</a> variable cache to "
 "cache query results."
diff --git a/plugins/XCache/locale/ru/LC_MESSAGES/XCache.po b/plugins/XCache/locale/ru/LC_MESSAGES/XCache.po
index 1087e57191..76d5c05346 100644
--- a/plugins/XCache/locale/ru/LC_MESSAGES/XCache.po
+++ b/plugins/XCache/locale/ru/LC_MESSAGES/XCache.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - XCache to Russian (Ру��кий)
+# Translation of StatusNet - XCache to Russian (ру��кий)
 # Exported from translatewiki.net
 #
 # Author: �лек�андр Сигачёв
@@ -9,19 +9,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - XCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:55+0000\n"
-"Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:31+0000\n"
+"Language-Team: Russian <https://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:55+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:52:14+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-xcache\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
+#. TRANS: Plugin description.
 msgid ""
 "Use the <a href=\"http://xcache.lighttpd.net/\">XCache</a> variable cache to "
 "cache query results."
diff --git a/plugins/XCache/locale/tl/LC_MESSAGES/XCache.po b/plugins/XCache/locale/tl/LC_MESSAGES/XCache.po
index e248e8ff10..62a5ae66c5 100644
--- a/plugins/XCache/locale/tl/LC_MESSAGES/XCache.po
+++ b/plugins/XCache/locale/tl/LC_MESSAGES/XCache.po
@@ -9,18 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - XCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:55+0000\n"
-"Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:31+0000\n"
+"Language-Team: Tagalog <https://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:55+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:52:14+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-xcache\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Plugin description.
 msgid ""
 "Use the <a href=\"http://xcache.lighttpd.net/\">XCache</a> variable cache to "
 "cache query results."
diff --git a/plugins/XCache/locale/tr/LC_MESSAGES/XCache.po b/plugins/XCache/locale/tr/LC_MESSAGES/XCache.po
index 63ee2a45a4..453cdacfec 100644
--- a/plugins/XCache/locale/tr/LC_MESSAGES/XCache.po
+++ b/plugins/XCache/locale/tr/LC_MESSAGES/XCache.po
@@ -9,18 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - XCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:55+0000\n"
-"Language-Team: Turkish <http://translatewiki.net/wiki/Portal:tr>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:31+0000\n"
+"Language-Team: Turkish <https://translatewiki.net/wiki/Portal:tr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:55+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:52:14+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: tr\n"
 "X-Message-Group: #out-statusnet-plugin-xcache\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#. TRANS: Plugin description.
 msgid ""
 "Use the <a href=\"http://xcache.lighttpd.net/\">XCache</a> variable cache to "
 "cache query results."
diff --git a/plugins/XCache/locale/uk/LC_MESSAGES/XCache.po b/plugins/XCache/locale/uk/LC_MESSAGES/XCache.po
index a39213c6c9..b607bd1def 100644
--- a/plugins/XCache/locale/uk/LC_MESSAGES/XCache.po
+++ b/plugins/XCache/locale/uk/LC_MESSAGES/XCache.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - XCache to Ukrainian (Україн�ька)
+# Translation of StatusNet - XCache to Ukrainian (україн�ька)
 # Exported from translatewiki.net
 #
 # Author: Boogie
@@ -9,19 +9,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - XCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:55+0000\n"
-"Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:31+0000\n"
+"Language-Team: Ukrainian <https://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:55+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-05 21:52:14+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-xcache\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
+#. TRANS: Plugin description.
 msgid ""
 "Use the <a href=\"http://xcache.lighttpd.net/\">XCache</a> variable cache to "
 "cache query results."
diff --git a/plugins/Xmpp/Queued_XMPP.php b/plugins/Xmpp/Queued_XMPP.php
index 24f542805b..aeb758421f 100644
--- a/plugins/Xmpp/Queued_XMPP.php
+++ b/plugins/Xmpp/Queued_XMPP.php
@@ -88,34 +88,38 @@ class Queued_XMPP extends XMPPHP_XMPP
      */
     public function connect($timeout = 30, $persistent = false, $sendinit = true)
     {
-        throw new Exception("Can't connect to server from fake XMPP.");
+        // No i18n needed. Test message.
+        throw new Exception('Cannot connect to server from fake XMPP.');
     }
 
     public function disconnect()
     {
-        throw new Exception("Can't connect to server from fake XMPP.");
+        // No i18n needed. Test message.
+        throw new Exception('Cannot connect to server from fake XMPP.');
     }
 
     public function process()
     {
-        throw new Exception("Can't read stream from fake XMPP.");
+        // No i18n needed. Test message.
+        throw new Exception('Cannot read stream from fake XMPP.');
     }
 
     public function processUntil($event, $timeout=-1)
     {
-        throw new Exception("Can't read stream from fake XMPP.");
+        // No i18n needed. Test message.
+        throw new Exception('Cannot read stream from fake XMPP.');
     }
 
     public function read()
     {
-        throw new Exception("Can't read stream from fake XMPP.");
+        // No i18n needed. Test message.
+        throw new Exception('Cannot read stream from fake XMPP.');
     }
 
     public function readyToProcess()
     {
-        throw new Exception("Can't read stream from fake XMPP.");
+        // No i18n needed. Test message.
+        throw new Exception('Cannot read stream from fake XMPP.');
     }
     //@}
-
 }
-
diff --git a/plugins/Xmpp/README b/plugins/Xmpp/README
index 9bd71e9807..96b0f3291a 100644
--- a/plugins/Xmpp/README
+++ b/plugins/Xmpp/README
@@ -1,4 +1,5 @@
-The XMPP plugin allows users to send and receive notices over the XMPP/Jabber/GTalk network.
+The XMPP plugin allows users to send and receive notices over the
+XMPP/Jabber/GTalk network.
 
 Installation
 ============
@@ -6,9 +7,10 @@ add "addPlugin('xmpp',
     array('setting'=>'value', 'setting2'=>'value2', ...);"
 to the bottom of your config.php
 
-The daemon included with this plugin must be running. It will be started by
-the plugin along with their other daemons when you run scripts/startdaemons.sh.
-See the StatusNet README for more about queuing and daemons.
+The daemon included with this plugin must be running. It will be
+started by the plugin along with their other daemons when you run
+scripts/startdaemons.sh. See the StatusNet README for more about queuing and
+daemons.
 
 Settings
 ========
@@ -32,4 +34,3 @@ addPlugin('xmpp', array(
     'password'=>'...',
     'public'=>array('bob@aol.com', 'sue@google.com')
 ));
-
diff --git a/plugins/Xmpp/XmppPlugin.php b/plugins/Xmpp/XmppPlugin.php
index f7df6812cf..74e104d974 100644
--- a/plugins/Xmpp/XmppPlugin.php
+++ b/plugins/Xmpp/XmppPlugin.php
@@ -44,7 +44,6 @@ if (!defined('STATUSNET')) {
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
  * @link      http://status.net/
  */
-
 class XmppPlugin extends ImPlugin
 {
     public $server = null;
@@ -59,22 +58,22 @@ class XmppPlugin extends ImPlugin
     public $transport = 'xmpp';
 
     function getDisplayName(){
+        // TRANS: Plugin display name.
         return _m('XMPP/Jabber/GTalk');
     }
 
     /**
      * Splits a Jabber ID (JID) into node, domain, and resource portions.
-     * 
+     *
      * Based on validation routine submitted by:
      * @copyright 2009 Patrick Georgi <patrick@georgi-clan.de>
-     * @license Licensed under ISC-L, which is compatible with everything else that keeps the copyright notice intact. 
+     * @license Licensed under ISC-L, which is compatible with everything else that keeps the copyright notice intact.
      *
      * @param string $jid string to check
      *
      * @return array with "node", "domain", and "resource" indices
      * @throws Exception if input is not valid
      */
-
     protected function splitJid($jid)
     {
         $chars = '';
@@ -102,11 +101,11 @@ class XmppPlugin extends ImPlugin
         $chars .= "\x{340}\x{341}\x{200e}\x{200f}\x{202a}-\x{202e}\x{206a}-\x{206f}";
         /* C9 - Tagging characters */
         $chars .= "\x{e0001}\x{e0020}-\x{e007f}";
-    
+
         /* Nodeprep forbids some more characters */
         $nodeprepchars = $chars;
         $nodeprepchars .= "\x{22}\x{26}\x{27}\x{2f}\x{3a}\x{3c}\x{3e}\x{40}";
-    
+
         $parts = explode("/", $jid, 2);
         if (count($parts) > 1) {
             $resource = $parts[1];
@@ -117,10 +116,11 @@ class XmppPlugin extends ImPlugin
         } else {
             $resource = null;
         }
-    
+
         $node = explode("@", $parts[0]);
         if ((count($node) > 2) || (count($node) == 0)) {
-            throw new Exception("Invalid JID: too many @s");
+            // TRANS: Exception thrown when using too many @ signs in a Jabber ID.
+            throw new Exception(_m('Invalid JID: too many @s.'));
         } else if (count($node) == 1) {
             $domain = $node[0];
             $node = null;
@@ -128,47 +128,57 @@ class XmppPlugin extends ImPlugin
             $domain = $node[1];
             $node = $node[0];
             if ($node == '') {
-                throw new Exception("Invalid JID: @ but no node");
+            // TRANS: Exception thrown when using @ sign not followed by a Jabber ID.
+                throw new Exception(_m('Invalid JID: @ but no node'));
             }
         }
-    
+
         // Length limits per http://xmpp.org/rfcs/rfc3920.html#addressing
         if ($node !== null) {
             if (strlen($node) > 1023) {
-                throw new Exception("Invalid JID: node too long.");
+                // TRANS: Exception thrown when using too long a Jabber ID (>1023).
+                throw new Exception(_m('Invalid JID: node too long.'));
             }
             if (preg_match("/[".$nodeprepchars."]/u", $node)) {
-                throw new Exception("Invalid JID node '$node'");
+                // TRANS: Exception thrown when using an invalid Jabber ID.
+                // TRANS: %s is the invalid Jabber ID.
+                throw new Exception(sprintf(_m('Invalid JID node "%s".'),$node));
             }
         }
-    
+
         if (strlen($domain) > 1023) {
-            throw new Exception("Invalid JID: domain too long.");
+            // TRANS: Exception thrown when using too long a Jabber domain (>1023).
+            throw new Exception(_m('Invalid JID: domain too long.'));
         }
         if (!common_valid_domain($domain)) {
-            throw new Exception("Invalid JID domain name '$domain'");
+            // TRANS: Exception thrown when using an invalid Jabber domain name.
+            // TRANS: %s is the invalid domain name.
+            throw new Exception(sprintf(_m('Invalid JID domain name "%s".'),$domain));
         }
-    
+
         if ($resource !== null) {
             if (strlen($resource) > 1023) {
+                // TRANS: Exception thrown when using too long a resource (>1023).
                 throw new Exception("Invalid JID: resource too long.");
             }
             if (preg_match("/[".$chars."]/u", $resource)) {
-                throw new Exception("Invalid JID resource '$resource'");
+                // TRANS: Exception thrown when using an invalid Jabber resource.
+                // TRANS: %s is the invalid resource.
+                throw new Exception(sprintf(_m('Invalid JID resource "%s".'),$resource));
             }
         }
-    
+
         return array('node' => is_null($node) ? null : mb_strtolower($node),
                      'domain' => is_null($domain) ? null : mb_strtolower($domain),
                      'resource' => $resource);
     }
-    
+
     /**
      * Checks whether a string is a syntactically valid Jabber ID (JID),
      * either with or without a resource.
-     * 
+     *
      * Note that a bare domain can be a valid JID.
-     * 
+     *
      * @param string $jid string to check
      * @param bool $check_domain whether we should validate that domain...
      *
@@ -188,15 +198,15 @@ class XmppPlugin extends ImPlugin
             return false;
         }
     }
-    
+
     /**
      * Checks whether a string is a syntactically valid base Jabber ID (JID).
      * A base JID won't include a resource specifier on the end; since we
      * take it off when reading input we can't really use them reliably
      * to direct outgoing messages yet (sorry guys!)
-     * 
+     *
      * Note that a bare domain can be a valid JID.
-     * 
+     *
      * @param string $jid string to check
      * @param bool $check_domain whether we should validate that domain...
      *
@@ -225,7 +235,6 @@ class XmppPlugin extends ImPlugin
      *
      * @return string an equivalent JID in normalized (lowercase) form
      */
-
     function normalize($jid)
     {
         try {
@@ -308,7 +317,7 @@ class XmppPlugin extends ImPlugin
 
     function microiduri($screenname)
     {
-        return 'xmpp:' . $screenname;    
+        return 'xmpp:' . $screenname;
     }
 
     function sendMessage($screenname, $body)
@@ -320,7 +329,7 @@ class XmppPlugin extends ImPlugin
     {
         $msg   = $this->formatNotice($notice);
         $entry = $this->format_entry($notice);
-        
+
         $this->queuedConnection()->message($screenname, $msg, 'chat', null, $entry);
         return true;
     }
@@ -333,7 +342,6 @@ class XmppPlugin extends ImPlugin
      *
      * @return string Extra information (Atom, HTML, addresses) in string format
      */
-
     function format_entry($notice)
     {
         $profile = $notice->getProfile();
@@ -355,6 +363,7 @@ class XmppPlugin extends ImPlugin
         $xs->element('a', array(
             'href'=>common_local_url('conversation',
                 array('id' => $notice->conversation)).'#notice-'.$notice->id),
+             // TRANS: Link description to notice in conversation.
              // TRANS: %s is a notice ID.
              sprintf(_m('[%s]'),$notice->id));
         $xs->elementEnd('body');
@@ -371,38 +380,42 @@ class XmppPlugin extends ImPlugin
 
         if ($pl['type'] != 'chat') {
             $this->log(LOG_WARNING, "Ignoring message of type ".$pl['type']." from $from: " . $pl['xml']->toString());
-            return;
+            return true;
         }
 
         if (mb_strlen($pl['body']) == 0) {
             $this->log(LOG_WARNING, "Ignoring message with empty body from $from: "  . $pl['xml']->toString());
-            return;
+            return true;
         }
 
         $this->handleIncoming($from, $pl['body']);
-        
+
         return true;
     }
 
     /**
      * Build a queue-proxied XMPP interface object. Any outgoing messages
      * will be run back through us for enqueing rather than sent directly.
-     * 
+     *
      * @return Queued_XMPP
      * @throws Exception if server settings are invalid.
      */
     function queuedConnection(){
         if(!isset($this->server)){
-            throw new Exception("must specify a server");
+            // TRANS: Exception thrown when the plugin configuration is incorrect.
+            throw new Exception(_m('You must specify a server in the configuration.'));
         }
         if(!isset($this->port)){
-            throw new Exception("must specify a port");
+            // TRANS: Exception thrown when the plugin configuration is incorrect.
+            throw new Exception(_m('You must specify a port in the configuration.'));
         }
         if(!isset($this->user)){
-            throw new Exception("must specify a user");
+            // TRANS: Exception thrown when the plugin configuration is incorrect.
+            throw new Exception(_m('You must specify a user in the configuration.'));
         }
         if(!isset($this->password)){
-            throw new Exception("must specify a password");
+            // TRANS: Exception thrown when the plugin configuration is incorrect.
+            throw new Exception(_m('You must specify a password in the configuration.'));
         }
 
         return new Queued_XMPP($this, $this->host ?
@@ -420,6 +433,31 @@ class XmppPlugin extends ImPlugin
                                     );
     }
 
+    /**
+     * Add XMPP plugin daemon to the list of daemon to start
+     *
+     * @param array $daemons the list of daemons to run
+     *
+     * @return boolean hook return
+     */
+    function onGetValidDaemons($daemons)
+    {
+        if( isset($this->server) &&
+            isset($this->port)   &&
+            isset($this->user)   &&
+            isset($this->password) ){
+
+            array_push(
+                $daemons,
+                INSTALLDIR
+                . '/scripts/imdaemon.php'
+            );
+        }
+
+        return true;
+    }
+
+
     function onPluginVersion(&$versions)
     {
         $versions[] = array('name' => 'XMPP',
@@ -427,6 +465,7 @@ class XmppPlugin extends ImPlugin
                             'author' => 'Craig Andrews, Evan Prodromou',
                             'homepage' => 'http://status.net/wiki/Plugin:XMPP',
                             'rawdescription' =>
+                            // TRANS: Plugin description.
                             _m('The XMPP plugin allows users to send and receive notices over the XMPP/Jabber network.'));
         return true;
     }
diff --git a/plugins/Xmpp/locale/Xmpp.pot b/plugins/Xmpp/locale/Xmpp.pot
index 1ad42f56fc..dd693b68c8 100644
--- a/plugins/Xmpp/locale/Xmpp.pot
+++ b/plugins/Xmpp/locale/Xmpp.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,21 +16,87 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: xmppmanager.php:168 xmppmanager.php:207
+#. TRANS: Presence announcement for XMPP.
+#. TRANS: Message for XMPP reconnect.
+#: xmppmanager.php:167 xmppmanager.php:207
 msgid "Send me a message to post a notice"
 msgstr ""
 
+#. TRANS: Plugin display name.
 #: XmppPlugin.php:62
 msgid "XMPP/Jabber/GTalk"
 msgstr ""
 
+#. TRANS: Exception thrown when using too many @ signs in a Jabber ID.
+#: XmppPlugin.php:123
+msgid "Invalid JID: too many @s."
+msgstr ""
+
+#. TRANS: Exception thrown when using @ sign not followed by a Jabber ID.
+#: XmppPlugin.php:132
+msgid "Invalid JID: @ but no node"
+msgstr ""
+
+#. TRANS: Exception thrown when using too long a Jabber ID (>1023).
+#: XmppPlugin.php:140
+msgid "Invalid JID: node too long."
+msgstr ""
+
+#. TRANS: Exception thrown when using an invalid Jabber ID.
+#. TRANS: %s is the invalid Jabber ID.
+#: XmppPlugin.php:145
+#, php-format
+msgid "Invalid JID node \"%s\"."
+msgstr ""
+
+#. TRANS: Exception thrown when using too long a Jabber domain (>1023).
+#: XmppPlugin.php:151
+msgid "Invalid JID: domain too long."
+msgstr ""
+
+#. TRANS: Exception thrown when using an invalid Jabber domain name.
+#. TRANS: %s is the invalid domain name.
+#: XmppPlugin.php:156
+#, php-format
+msgid "Invalid JID domain name \"%s\"."
+msgstr ""
+
+#. TRANS: Exception thrown when using an invalid Jabber resource.
+#. TRANS: %s is the invalid resource.
+#: XmppPlugin.php:167
+#, php-format
+msgid "Invalid JID resource \"%s\"."
+msgstr ""
+
+#. TRANS: Link description to notice in conversation.
 #. TRANS: %s is a notice ID.
-#: XmppPlugin.php:359
+#: XmppPlugin.php:368
 #, php-format
 msgid "[%s]"
 msgstr ""
 
-#: XmppPlugin.php:430
+#. TRANS: Exception thrown when the plugin configuration is incorrect.
+#: XmppPlugin.php:406
+msgid "You must specify a server in the configuration."
+msgstr ""
+
+#. TRANS: Exception thrown when the plugin configuration is incorrect.
+#: XmppPlugin.php:410
+msgid "You must specify a port in the configuration."
+msgstr ""
+
+#. TRANS: Exception thrown when the plugin configuration is incorrect.
+#: XmppPlugin.php:414
+msgid "You must specify a user in the configuration."
+msgstr ""
+
+#. TRANS: Exception thrown when the plugin configuration is incorrect.
+#: XmppPlugin.php:418
+msgid "You must specify a password in the configuration."
+msgstr ""
+
+#. TRANS: Plugin description.
+#: XmppPlugin.php:444
 msgid ""
 "The XMPP plugin allows users to send and receive notices over the XMPP/"
 "Jabber network."
diff --git a/plugins/Xmpp/locale/ca/LC_MESSAGES/Xmpp.po b/plugins/Xmpp/locale/ca/LC_MESSAGES/Xmpp.po
index 00bafb9d28..91b05993d4 100644
--- a/plugins/Xmpp/locale/ca/LC_MESSAGES/Xmpp.po
+++ b/plugins/Xmpp/locale/ca/LC_MESSAGES/Xmpp.po
@@ -9,29 +9,84 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Xmpp\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:55+0000\n"
+"POT-Creation-Date: 2011-06-18 15:54+0000\n"
+"PO-Revision-Date: 2011-06-18 15:58:03+0000\n"
 "Language-Team: Catalan <http://translatewiki.net/wiki/Portal:ca>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:55+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
+"X-POT-Import-Date: 2011-06-05 21:52:15+0000\n"
+"X-Generator: MediaWiki 1.19alpha (r90318); Translate extension (2011-06-02)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ca\n"
 "X-Message-Group: #out-statusnet-plugin-xmpp\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Presence announcement for XMPP.
+#. TRANS: Message for XMPP reconnect.
 msgid "Send me a message to post a notice"
 msgstr "Envia'm un missatge per a publicar un avís"
 
+#. TRANS: Plugin display name.
 msgid "XMPP/Jabber/GTalk"
 msgstr "XMPP/Jabber/GTalk"
 
+#. TRANS: Exception thrown when using too many @ signs in a Jabber ID.
+msgid "Invalid JID: too many @s."
+msgstr ""
+
+#. TRANS: Exception thrown when using @ sign not followed by a Jabber ID.
+msgid "Invalid JID: @ but no node"
+msgstr ""
+
+#. TRANS: Exception thrown when using too long a Jabber ID (>1023).
+msgid "Invalid JID: node too long."
+msgstr ""
+
+#. TRANS: Exception thrown when using an invalid Jabber ID.
+#. TRANS: %s is the invalid Jabber ID.
+#, php-format
+msgid "Invalid JID node \"%s\"."
+msgstr ""
+
+#. TRANS: Exception thrown when using too long a Jabber domain (>1023).
+msgid "Invalid JID: domain too long."
+msgstr ""
+
+#. TRANS: Exception thrown when using an invalid Jabber domain name.
+#. TRANS: %s is the invalid domain name.
+#, php-format
+msgid "Invalid JID domain name \"%s\"."
+msgstr ""
+
+#. TRANS: Exception thrown when using an invalid Jabber resource.
+#. TRANS: %s is the invalid resource.
+#, php-format
+msgid "Invalid JID resource \"%s\"."
+msgstr ""
+
+#. TRANS: Link description to notice in conversation.
 #. TRANS: %s is a notice ID.
 #, php-format
 msgid "[%s]"
 msgstr "[%s]"
 
+#. TRANS: Exception thrown when the plugin configuration is incorrect.
+msgid "You must specify a server in the configuration."
+msgstr ""
+
+#. TRANS: Exception thrown when the plugin configuration is incorrect.
+msgid "You must specify a port in the configuration."
+msgstr ""
+
+#. TRANS: Exception thrown when the plugin configuration is incorrect.
+msgid "You must specify a user in the configuration."
+msgstr ""
+
+#. TRANS: Exception thrown when the plugin configuration is incorrect.
+msgid "You must specify a password in the configuration."
+msgstr ""
+
+#. TRANS: Plugin description.
 msgid ""
 "The XMPP plugin allows users to send and receive notices over the XMPP/"
 "Jabber network."
diff --git a/plugins/Xmpp/locale/de/LC_MESSAGES/Xmpp.po b/plugins/Xmpp/locale/de/LC_MESSAGES/Xmpp.po
index ba9d25ac0b..9187415f12 100644
--- a/plugins/Xmpp/locale/de/LC_MESSAGES/Xmpp.po
+++ b/plugins/Xmpp/locale/de/LC_MESSAGES/Xmpp.po
@@ -3,6 +3,9 @@
 #
 # Author: Giftpflanze
 # Author: Habi
+# Author: Inkowik
+# Author: PtM
+# Author: Tiin
 # --
 # This file is distributed under the same license as the StatusNet package.
 #
@@ -10,29 +13,84 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Xmpp\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:55+0000\n"
-"Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:31+0000\n"
+"Language-Team: German <https://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:55+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-19 11:23:56+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-xmpp\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Presence announcement for XMPP.
+#. TRANS: Message for XMPP reconnect.
 msgid "Send me a message to post a notice"
 msgstr "Sende mir eine Nachricht, um eine Nachricht zu erstellen"
 
+#. TRANS: Plugin display name.
 msgid "XMPP/Jabber/GTalk"
 msgstr "XMPP/Jabber/GTalk"
 
+#. TRANS: Exception thrown when using too many @ signs in a Jabber ID.
+msgid "Invalid JID: too many @s."
+msgstr "Ungültige JID: zu viele @s."
+
+#. TRANS: Exception thrown when using @ sign not followed by a Jabber ID.
+msgid "Invalid JID: @ but no node"
+msgstr "Ungültige JID: @ aber kein Knoten"
+
+#. TRANS: Exception thrown when using too long a Jabber ID (>1023).
+msgid "Invalid JID: node too long."
+msgstr "Ungültige JID: Knoten zu lang."
+
+#. TRANS: Exception thrown when using an invalid Jabber ID.
+#. TRANS: %s is the invalid Jabber ID.
+#, php-format
+msgid "Invalid JID node \"%s\"."
+msgstr "Ungültiger JID-Knoten \"%s\"."
+
+#. TRANS: Exception thrown when using too long a Jabber domain (>1023).
+msgid "Invalid JID: domain too long."
+msgstr "Ungültige JID: Domain zu lang."
+
+#. TRANS: Exception thrown when using an invalid Jabber domain name.
+#. TRANS: %s is the invalid domain name.
+#, php-format
+msgid "Invalid JID domain name \"%s\"."
+msgstr "Ungültiger JID-Domainname „%s“."
+
+#. TRANS: Exception thrown when using an invalid Jabber resource.
+#. TRANS: %s is the invalid resource.
+#, php-format
+msgid "Invalid JID resource \"%s\"."
+msgstr "Ungültige JID-Quelle „%s“."
+
+#. TRANS: Link description to notice in conversation.
 #. TRANS: %s is a notice ID.
 #, php-format
 msgid "[%s]"
 msgstr "[%s]"
 
+#. TRANS: Exception thrown when the plugin configuration is incorrect.
+msgid "You must specify a server in the configuration."
+msgstr "Du musst einen Server in der Konfiguration angeben."
+
+#. TRANS: Exception thrown when the plugin configuration is incorrect.
+msgid "You must specify a port in the configuration."
+msgstr "Du musst einen Port in der Konfiguration angeben."
+
+#. TRANS: Exception thrown when the plugin configuration is incorrect.
+msgid "You must specify a user in the configuration."
+msgstr "Du musst einen Benutzernamen in der Konfiguration angeben."
+
+#. TRANS: Exception thrown when the plugin configuration is incorrect.
+msgid "You must specify a password in the configuration."
+msgstr "Du musst ein Passwort in der Konfiguration angeben."
+
+#. TRANS: Plugin description.
 msgid ""
 "The XMPP plugin allows users to send and receive notices over the XMPP/"
 "Jabber network."
diff --git a/plugins/Xmpp/locale/es/LC_MESSAGES/Xmpp.po b/plugins/Xmpp/locale/es/LC_MESSAGES/Xmpp.po
new file mode 100644
index 0000000000..3ae2511a10
--- /dev/null
+++ b/plugins/Xmpp/locale/es/LC_MESSAGES/Xmpp.po
@@ -0,0 +1,92 @@
+# Translation of StatusNet - Xmpp to Spanish (español)
+# Exported from translatewiki.net
+#
+# Author: Armando-Martin
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Xmpp\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:32+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-19 11:23:56+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Presence announcement for XMPP.
+#. TRANS: Message for XMPP reconnect.
+msgid "Send me a message to post a notice"
+msgstr "Envíeme un mensaje para publicar una nota"
+
+#. TRANS: Plugin display name.
+msgid "XMPP/Jabber/GTalk"
+msgstr "XMPP/Jabber/GTalk"
+
+#. TRANS: Exception thrown when using too many @ signs in a Jabber ID.
+msgid "Invalid JID: too many @s."
+msgstr "JID no válido: demasiados signos @s."
+
+#. TRANS: Exception thrown when using @ sign not followed by a Jabber ID.
+msgid "Invalid JID: @ but no node"
+msgstr "JID no válido: Signo @ sin nodo"
+
+#. TRANS: Exception thrown when using too long a Jabber ID (>1023).
+msgid "Invalid JID: node too long."
+msgstr "JID no válido: nodo demasiado largo."
+
+#. TRANS: Exception thrown when using an invalid Jabber ID.
+#. TRANS: %s is the invalid Jabber ID.
+#, php-format
+msgid "Invalid JID node \"%s\"."
+msgstr "Nodo JID \"%s\" no válido."
+
+#. TRANS: Exception thrown when using too long a Jabber domain (>1023).
+msgid "Invalid JID: domain too long."
+msgstr "JID no válido: dominio demasiado largo."
+
+#. TRANS: Exception thrown when using an invalid Jabber domain name.
+#. TRANS: %s is the invalid domain name.
+#, php-format
+msgid "Invalid JID domain name \"%s\"."
+msgstr "Nombre de dominio JID \"%s\" no válido."
+
+#. TRANS: Exception thrown when using an invalid Jabber resource.
+#. TRANS: %s is the invalid resource.
+#, php-format
+msgid "Invalid JID resource \"%s\"."
+msgstr "Recurso JID \"%s\" no válido."
+
+#. TRANS: Link description to notice in conversation.
+#. TRANS: %s is a notice ID.
+#, php-format
+msgid "[%s]"
+msgstr "[%s]"
+
+#. TRANS: Exception thrown when the plugin configuration is incorrect.
+msgid "You must specify a server in the configuration."
+msgstr "Debe especificar un servidor en la configuración."
+
+#. TRANS: Exception thrown when the plugin configuration is incorrect.
+msgid "You must specify a port in the configuration."
+msgstr "Debe especificar un puerto en la configuración."
+
+#. TRANS: Exception thrown when the plugin configuration is incorrect.
+msgid "You must specify a user in the configuration."
+msgstr "Debe especificar un usuario en la configuración."
+
+#. TRANS: Exception thrown when the plugin configuration is incorrect.
+msgid "You must specify a password in the configuration."
+msgstr "Debe especificar una contraseña en la configuración."
+
+#. TRANS: Plugin description.
+msgid ""
+"The XMPP plugin allows users to send and receive notices over the XMPP/"
+"Jabber network."
+msgstr ""
+"El complemento (plugin) XMPP permite a los usuarios enviar y recibir "
+"mensajes mediante la red XMPP/Jabber."
diff --git a/plugins/Xmpp/locale/fr/LC_MESSAGES/Xmpp.po b/plugins/Xmpp/locale/fr/LC_MESSAGES/Xmpp.po
index 5e43f2a0c0..f721d1277f 100644
--- a/plugins/Xmpp/locale/fr/LC_MESSAGES/Xmpp.po
+++ b/plugins/Xmpp/locale/fr/LC_MESSAGES/Xmpp.po
@@ -1,8 +1,10 @@
-# Translation of StatusNet - Xmpp to French (Français)
+# Translation of StatusNet - Xmpp to French (français)
 # Exported from translatewiki.net
 #
+# Author: Gomoko
 # Author: Od1n
 # Author: Peter17
+# Author: Tititou36
 # --
 # This file is distributed under the same license as the StatusNet package.
 #
@@ -10,29 +12,84 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Xmpp\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:55+0000\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:32+0000\n"
 "Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:55+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-19 11:23:56+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-xmpp\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#. TRANS: Presence announcement for XMPP.
+#. TRANS: Message for XMPP reconnect.
 msgid "Send me a message to post a notice"
 msgstr "M’envoyer un message pour afficher un avis."
 
+#. TRANS: Plugin display name.
 msgid "XMPP/Jabber/GTalk"
 msgstr "XMPP/Jabber/GTalk"
 
+#. TRANS: Exception thrown when using too many @ signs in a Jabber ID.
+msgid "Invalid JID: too many @s."
+msgstr "JID non valide: trop de @s."
+
+#. TRANS: Exception thrown when using @ sign not followed by a Jabber ID.
+msgid "Invalid JID: @ but no node"
+msgstr "JID non valide: @ mais sans nœud."
+
+#. TRANS: Exception thrown when using too long a Jabber ID (>1023).
+msgid "Invalid JID: node too long."
+msgstr "JID non valide: nœud trop long."
+
+#. TRANS: Exception thrown when using an invalid Jabber ID.
+#. TRANS: %s is the invalid Jabber ID.
+#, php-format
+msgid "Invalid JID node \"%s\"."
+msgstr "NÅ“ud JID \"%s\" non valide."
+
+#. TRANS: Exception thrown when using too long a Jabber domain (>1023).
+msgid "Invalid JID: domain too long."
+msgstr "JID non valide: domaine trop long."
+
+#. TRANS: Exception thrown when using an invalid Jabber domain name.
+#. TRANS: %s is the invalid domain name.
+#, php-format
+msgid "Invalid JID domain name \"%s\"."
+msgstr "Nom de domaine JID \"%s\" non valide."
+
+#. TRANS: Exception thrown when using an invalid Jabber resource.
+#. TRANS: %s is the invalid resource.
+#, php-format
+msgid "Invalid JID resource \"%s\"."
+msgstr "Ressource JID \"%s\" non valide."
+
+#. TRANS: Link description to notice in conversation.
 #. TRANS: %s is a notice ID.
 #, php-format
 msgid "[%s]"
 msgstr "[%s]"
 
+#. TRANS: Exception thrown when the plugin configuration is incorrect.
+msgid "You must specify a server in the configuration."
+msgstr "Vous devez spécifier un serveur dans la configuration."
+
+#. TRANS: Exception thrown when the plugin configuration is incorrect.
+msgid "You must specify a port in the configuration."
+msgstr "Vous devez spécifier un port dans la configuration."
+
+#. TRANS: Exception thrown when the plugin configuration is incorrect.
+msgid "You must specify a user in the configuration."
+msgstr "Vous devez spécifier un utilisateur dans la configuration."
+
+#. TRANS: Exception thrown when the plugin configuration is incorrect.
+msgid "You must specify a password in the configuration."
+msgstr "Vous devez spécifier un mot de passe dans la configuration."
+
+#. TRANS: Plugin description.
 msgid ""
 "The XMPP plugin allows users to send and receive notices over the XMPP/"
 "Jabber network."
diff --git a/plugins/Xmpp/locale/gl/LC_MESSAGES/Xmpp.po b/plugins/Xmpp/locale/gl/LC_MESSAGES/Xmpp.po
new file mode 100644
index 0000000000..7bf9ce1000
--- /dev/null
+++ b/plugins/Xmpp/locale/gl/LC_MESSAGES/Xmpp.po
@@ -0,0 +1,95 @@
+# Translation of StatusNet - Xmpp to Galician (galego)
+# Exported from translatewiki.net
+#
+# Author: Toliño
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Xmpp\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:32+0000\n"
+"Language-Team: Galician <https://translatewiki.net/wiki/Portal:gl>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-19 11:23:56+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Language-Code: gl\n"
+"X-Message-Group: #out-statusnet-plugin-xmpp\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Presence announcement for XMPP.
+#. TRANS: Message for XMPP reconnect.
+msgid "Send me a message to post a notice"
+msgstr "Envíame unha mensaxe para publicar unha nota"
+
+#. TRANS: Plugin display name.
+msgid "XMPP/Jabber/GTalk"
+msgstr "XMPP/Jabber/GTalk"
+
+#. TRANS: Exception thrown when using too many @ signs in a Jabber ID.
+msgid "Invalid JID: too many @s."
+msgstr "JID inválido: Demasiados signos @."
+
+#. TRANS: Exception thrown when using @ sign not followed by a Jabber ID.
+msgid "Invalid JID: @ but no node"
+msgstr "JID inválido: Signo @ sen nodo"
+
+#. TRANS: Exception thrown when using too long a Jabber ID (>1023).
+msgid "Invalid JID: node too long."
+msgstr "JID inválido: O nodo é longo de máis."
+
+#. TRANS: Exception thrown when using an invalid Jabber ID.
+#. TRANS: %s is the invalid Jabber ID.
+#, php-format
+msgid "Invalid JID node \"%s\"."
+msgstr "Nodo JID, \"%s\", inválido."
+
+#. TRANS: Exception thrown when using too long a Jabber domain (>1023).
+msgid "Invalid JID: domain too long."
+msgstr "JID inválido: O dominio é longo de máis."
+
+#. TRANS: Exception thrown when using an invalid Jabber domain name.
+#. TRANS: %s is the invalid domain name.
+#, php-format
+msgid "Invalid JID domain name \"%s\"."
+msgstr "Nome de dominio JID, \"%s\", inválido."
+
+#. TRANS: Exception thrown when using an invalid Jabber resource.
+#. TRANS: %s is the invalid resource.
+#, php-format
+msgid "Invalid JID resource \"%s\"."
+msgstr "Recurso JID, \"%s\", inválido."
+
+#. TRANS: Link description to notice in conversation.
+#. TRANS: %s is a notice ID.
+#, php-format
+msgid "[%s]"
+msgstr "[%s]"
+
+#. TRANS: Exception thrown when the plugin configuration is incorrect.
+msgid "You must specify a server in the configuration."
+msgstr "Cómpre especificar un servidor na configuración."
+
+#. TRANS: Exception thrown when the plugin configuration is incorrect.
+msgid "You must specify a port in the configuration."
+msgstr "Cómpre especificar un porto na configuración."
+
+#. TRANS: Exception thrown when the plugin configuration is incorrect.
+msgid "You must specify a user in the configuration."
+msgstr "Cómpre especificar un usuario na configuración."
+
+#. TRANS: Exception thrown when the plugin configuration is incorrect.
+msgid "You must specify a password in the configuration."
+msgstr "Cómpre especificar un contrasinal na configuración."
+
+#. TRANS: Plugin description.
+msgid ""
+"The XMPP plugin allows users to send and receive notices over the XMPP/"
+"Jabber network."
+msgstr ""
+"O complemento XMPP permite aos usuarios enviar e recibir mensaxes desde a "
+"rede de XMPP/Jabber."
diff --git a/plugins/Xmpp/locale/ia/LC_MESSAGES/Xmpp.po b/plugins/Xmpp/locale/ia/LC_MESSAGES/Xmpp.po
index 1988f3cb52..d13e713b7d 100644
--- a/plugins/Xmpp/locale/ia/LC_MESSAGES/Xmpp.po
+++ b/plugins/Xmpp/locale/ia/LC_MESSAGES/Xmpp.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Xmpp to Interlingua (Interlingua)
+# Translation of StatusNet - Xmpp to Interlingua (interlingua)
 # Exported from translatewiki.net
 #
 # Author: McDutchie
@@ -9,29 +9,84 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Xmpp\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:56+0000\n"
-"Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:32+0000\n"
+"Language-Team: Interlingua <https://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:55+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-19 11:23:56+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-xmpp\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Presence announcement for XMPP.
+#. TRANS: Message for XMPP reconnect.
 msgid "Send me a message to post a notice"
 msgstr "Inviar me un message pro publicar un nota"
 
+#. TRANS: Plugin display name.
 msgid "XMPP/Jabber/GTalk"
 msgstr "XMPP/Jabber/GTalk"
 
+#. TRANS: Exception thrown when using too many @ signs in a Jabber ID.
+msgid "Invalid JID: too many @s."
+msgstr "JID invalide: troppo de signos @."
+
+#. TRANS: Exception thrown when using @ sign not followed by a Jabber ID.
+msgid "Invalid JID: @ but no node"
+msgstr "JID invalide: signo @ sin nodo"
+
+#. TRANS: Exception thrown when using too long a Jabber ID (>1023).
+msgid "Invalid JID: node too long."
+msgstr "JID invalide: nodo troppo longe."
+
+#. TRANS: Exception thrown when using an invalid Jabber ID.
+#. TRANS: %s is the invalid Jabber ID.
+#, php-format
+msgid "Invalid JID node \"%s\"."
+msgstr "Nodo JID \"%s\" invalide."
+
+#. TRANS: Exception thrown when using too long a Jabber domain (>1023).
+msgid "Invalid JID: domain too long."
+msgstr "JID invalide: dominio troppo longe."
+
+#. TRANS: Exception thrown when using an invalid Jabber domain name.
+#. TRANS: %s is the invalid domain name.
+#, php-format
+msgid "Invalid JID domain name \"%s\"."
+msgstr "Nomine de dominio JID \"%s\" invalide."
+
+#. TRANS: Exception thrown when using an invalid Jabber resource.
+#. TRANS: %s is the invalid resource.
+#, php-format
+msgid "Invalid JID resource \"%s\"."
+msgstr "Ressource JID \"%s\" invalide."
+
+#. TRANS: Link description to notice in conversation.
 #. TRANS: %s is a notice ID.
 #, php-format
 msgid "[%s]"
 msgstr "[%s]"
 
+#. TRANS: Exception thrown when the plugin configuration is incorrect.
+msgid "You must specify a server in the configuration."
+msgstr "Es necessari specificar un servitor in le configuration."
+
+#. TRANS: Exception thrown when the plugin configuration is incorrect.
+msgid "You must specify a port in the configuration."
+msgstr "Es necessari specificar un porto in le configuration."
+
+#. TRANS: Exception thrown when the plugin configuration is incorrect.
+msgid "You must specify a user in the configuration."
+msgstr "Es necessari specificar un usator in le configuration."
+
+#. TRANS: Exception thrown when the plugin configuration is incorrect.
+msgid "You must specify a password in the configuration."
+msgstr "Es necessari specificar un contrasigno in le configuration."
+
+#. TRANS: Plugin description.
 msgid ""
 "The XMPP plugin allows users to send and receive notices over the XMPP/"
 "Jabber network."
diff --git a/plugins/Xmpp/locale/mk/LC_MESSAGES/Xmpp.po b/plugins/Xmpp/locale/mk/LC_MESSAGES/Xmpp.po
index 1be3577b2f..341b1d060a 100644
--- a/plugins/Xmpp/locale/mk/LC_MESSAGES/Xmpp.po
+++ b/plugins/Xmpp/locale/mk/LC_MESSAGES/Xmpp.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Xmpp to Macedonian (Македон�ки)
+# Translation of StatusNet - Xmpp to Macedonian (македон�ки)
 # Exported from translatewiki.net
 #
 # Author: Bjankuloski06
@@ -9,29 +9,84 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Xmpp\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:56+0000\n"
-"Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:32+0000\n"
+"Language-Team: Macedonian <https://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:55+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-19 11:23:56+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-xmpp\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
 
+#. TRANS: Presence announcement for XMPP.
+#. TRANS: Message for XMPP reconnect.
 msgid "Send me a message to post a notice"
 msgstr "И�прати ми порака за да објавам забелешка"
 
+#. TRANS: Plugin display name.
 msgid "XMPP/Jabber/GTalk"
 msgstr "XMPP/Jabber/GTalk"
 
+#. TRANS: Exception thrown when using too many @ signs in a Jabber ID.
+msgid "Invalid JID: too many @s."
+msgstr "�еважечки JID: премногу мајмунчиња (@)."
+
+#. TRANS: Exception thrown when using @ sign not followed by a Jabber ID.
+msgid "Invalid JID: @ but no node"
+msgstr "�еважежки JID: @, но нема јазол"
+
+#. TRANS: Exception thrown when using too long a Jabber ID (>1023).
+msgid "Invalid JID: node too long."
+msgstr "�еважечки JID: јазолот е предолг."
+
+#. TRANS: Exception thrown when using an invalid Jabber ID.
+#. TRANS: %s is the invalid Jabber ID.
+#, php-format
+msgid "Invalid JID node \"%s\"."
+msgstr "�еважечки јазол од JID „%s“."
+
+#. TRANS: Exception thrown when using too long a Jabber domain (>1023).
+msgid "Invalid JID: domain too long."
+msgstr "�еважечки JID: доменот е предолг."
+
+#. TRANS: Exception thrown when using an invalid Jabber domain name.
+#. TRANS: %s is the invalid domain name.
+#, php-format
+msgid "Invalid JID domain name \"%s\"."
+msgstr "�еважечко домен�ко име од JID „%s“."
+
+#. TRANS: Exception thrown when using an invalid Jabber resource.
+#. TRANS: %s is the invalid resource.
+#, php-format
+msgid "Invalid JID resource \"%s\"."
+msgstr "�еважечки ре�ур� од JID „%s“."
+
+#. TRANS: Link description to notice in conversation.
 #. TRANS: %s is a notice ID.
 #, php-format
 msgid "[%s]"
 msgstr "[%s]"
 
+#. TRANS: Exception thrown when the plugin configuration is incorrect.
+msgid "You must specify a server in the configuration."
+msgstr "Мора да наведете оп�лужувач во по�тавувањето."
+
+#. TRANS: Exception thrown when the plugin configuration is incorrect.
+msgid "You must specify a port in the configuration."
+msgstr "Мора да наведете порта во по�тавувањето."
+
+#. TRANS: Exception thrown when the plugin configuration is incorrect.
+msgid "You must specify a user in the configuration."
+msgstr "Мора да назначите кори�ник во по�тавувањето."
+
+#. TRANS: Exception thrown when the plugin configuration is incorrect.
+msgid "You must specify a password in the configuration."
+msgstr "Мора да назначите лозинка во по�тавувањето."
+
+#. TRANS: Plugin description.
 msgid ""
 "The XMPP plugin allows users to send and receive notices over the XMPP/"
 "Jabber network."
diff --git a/plugins/Xmpp/locale/ms/LC_MESSAGES/Xmpp.po b/plugins/Xmpp/locale/ms/LC_MESSAGES/Xmpp.po
index a279d0aafe..5c2a1d04b6 100644
--- a/plugins/Xmpp/locale/ms/LC_MESSAGES/Xmpp.po
+++ b/plugins/Xmpp/locale/ms/LC_MESSAGES/Xmpp.po
@@ -9,29 +9,84 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Xmpp\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:56+0000\n"
+"POT-Creation-Date: 2011-06-18 15:54+0000\n"
+"PO-Revision-Date: 2011-06-18 15:58:03+0000\n"
 "Language-Team: Malay <http://translatewiki.net/wiki/Portal:ms>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:55+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
+"X-POT-Import-Date: 2011-06-05 21:52:15+0000\n"
+"X-Generator: MediaWiki 1.19alpha (r90318); Translate extension (2011-06-02)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ms\n"
 "X-Message-Group: #out-statusnet-plugin-xmpp\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#. TRANS: Presence announcement for XMPP.
+#. TRANS: Message for XMPP reconnect.
 msgid "Send me a message to post a notice"
 msgstr "Hantarkan pesanan kepada saya untuk mengirim notis"
 
+#. TRANS: Plugin display name.
 msgid "XMPP/Jabber/GTalk"
 msgstr "XMPP/Jabber/GTalk"
 
+#. TRANS: Exception thrown when using too many @ signs in a Jabber ID.
+msgid "Invalid JID: too many @s."
+msgstr ""
+
+#. TRANS: Exception thrown when using @ sign not followed by a Jabber ID.
+msgid "Invalid JID: @ but no node"
+msgstr ""
+
+#. TRANS: Exception thrown when using too long a Jabber ID (>1023).
+msgid "Invalid JID: node too long."
+msgstr ""
+
+#. TRANS: Exception thrown when using an invalid Jabber ID.
+#. TRANS: %s is the invalid Jabber ID.
+#, php-format
+msgid "Invalid JID node \"%s\"."
+msgstr ""
+
+#. TRANS: Exception thrown when using too long a Jabber domain (>1023).
+msgid "Invalid JID: domain too long."
+msgstr ""
+
+#. TRANS: Exception thrown when using an invalid Jabber domain name.
+#. TRANS: %s is the invalid domain name.
+#, php-format
+msgid "Invalid JID domain name \"%s\"."
+msgstr ""
+
+#. TRANS: Exception thrown when using an invalid Jabber resource.
+#. TRANS: %s is the invalid resource.
+#, php-format
+msgid "Invalid JID resource \"%s\"."
+msgstr ""
+
+#. TRANS: Link description to notice in conversation.
 #. TRANS: %s is a notice ID.
 #, php-format
 msgid "[%s]"
 msgstr "[%s]"
 
+#. TRANS: Exception thrown when the plugin configuration is incorrect.
+msgid "You must specify a server in the configuration."
+msgstr ""
+
+#. TRANS: Exception thrown when the plugin configuration is incorrect.
+msgid "You must specify a port in the configuration."
+msgstr ""
+
+#. TRANS: Exception thrown when the plugin configuration is incorrect.
+msgid "You must specify a user in the configuration."
+msgstr ""
+
+#. TRANS: Exception thrown when the plugin configuration is incorrect.
+msgid "You must specify a password in the configuration."
+msgstr ""
+
+#. TRANS: Plugin description.
 msgid ""
 "The XMPP plugin allows users to send and receive notices over the XMPP/"
 "Jabber network."
diff --git a/plugins/Xmpp/locale/nl/LC_MESSAGES/Xmpp.po b/plugins/Xmpp/locale/nl/LC_MESSAGES/Xmpp.po
index fb50a4994c..af31d7b1f5 100644
--- a/plugins/Xmpp/locale/nl/LC_MESSAGES/Xmpp.po
+++ b/plugins/Xmpp/locale/nl/LC_MESSAGES/Xmpp.po
@@ -9,29 +9,84 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Xmpp\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:56+0000\n"
-"Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:32+0000\n"
+"Language-Team: Dutch <https://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:55+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-19 11:23:56+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-xmpp\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Presence announcement for XMPP.
+#. TRANS: Message for XMPP reconnect.
 msgid "Send me a message to post a notice"
 msgstr "Mij een bericht sturen om een mededeling te verzenden"
 
+#. TRANS: Plugin display name.
 msgid "XMPP/Jabber/GTalk"
 msgstr "XMPP/Jabber/Google Talk"
 
+#. TRANS: Exception thrown when using too many @ signs in a Jabber ID.
+msgid "Invalid JID: too many @s."
+msgstr "Ongeldige JID: te veel @'s."
+
+#. TRANS: Exception thrown when using @ sign not followed by a Jabber ID.
+msgid "Invalid JID: @ but no node"
+msgstr "Ongeldige JID: @ maar geen node"
+
+#. TRANS: Exception thrown when using too long a Jabber ID (>1023).
+msgid "Invalid JID: node too long."
+msgstr "Ongeldige JID: de node is te lang."
+
+#. TRANS: Exception thrown when using an invalid Jabber ID.
+#. TRANS: %s is the invalid Jabber ID.
+#, php-format
+msgid "Invalid JID node \"%s\"."
+msgstr "Ongeldige JID node \"%s\"."
+
+#. TRANS: Exception thrown when using too long a Jabber domain (>1023).
+msgid "Invalid JID: domain too long."
+msgstr "Ongeldige JID: het domein is te lang."
+
+#. TRANS: Exception thrown when using an invalid Jabber domain name.
+#. TRANS: %s is the invalid domain name.
+#, php-format
+msgid "Invalid JID domain name \"%s\"."
+msgstr "Ongeldige JID-domeinnaam \"%s\"."
+
+#. TRANS: Exception thrown when using an invalid Jabber resource.
+#. TRANS: %s is the invalid resource.
+#, php-format
+msgid "Invalid JID resource \"%s\"."
+msgstr "Ongeldige JID-bron \"%s\"."
+
+#. TRANS: Link description to notice in conversation.
 #. TRANS: %s is a notice ID.
 #, php-format
 msgid "[%s]"
 msgstr "[%s]"
 
+#. TRANS: Exception thrown when the plugin configuration is incorrect.
+msgid "You must specify a server in the configuration."
+msgstr "U moet in de instellingen een server opgeven."
+
+#. TRANS: Exception thrown when the plugin configuration is incorrect.
+msgid "You must specify a port in the configuration."
+msgstr "U moet in de instellingen een poort opgeven."
+
+#. TRANS: Exception thrown when the plugin configuration is incorrect.
+msgid "You must specify a user in the configuration."
+msgstr "U moet in de instellingen een gebruiker opgeven."
+
+#. TRANS: Exception thrown when the plugin configuration is incorrect.
+msgid "You must specify a password in the configuration."
+msgstr "U moet in de instellingen een wachtwoord opgeven."
+
+#. TRANS: Plugin description.
 msgid ""
 "The XMPP plugin allows users to send and receive notices over the XMPP/"
 "Jabber network."
diff --git a/plugins/Xmpp/locale/pl/LC_MESSAGES/Xmpp.po b/plugins/Xmpp/locale/pl/LC_MESSAGES/Xmpp.po
new file mode 100644
index 0000000000..417603fad2
--- /dev/null
+++ b/plugins/Xmpp/locale/pl/LC_MESSAGES/Xmpp.po
@@ -0,0 +1,94 @@
+# Translation of StatusNet - Xmpp to Polish (polski)
+# Exported from translatewiki.net
+#
+# Author: BeginaFelicysym
+# Author: Woytecr
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Xmpp\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:32+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-06-19 11:23:56+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=3; plural=(n == 1) ? 0 : ( (n%10 >= 2 && n%10 <= 4 && "
+"(n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
+
+#. TRANS: Presence announcement for XMPP.
+#. TRANS: Message for XMPP reconnect.
+msgid "Send me a message to post a notice"
+msgstr "Wyślij do mnie wiadomość dodania ogłoszenia"
+
+#. TRANS: Plugin display name.
+msgid "XMPP/Jabber/GTalk"
+msgstr "XMPP/Jabber/GTalk"
+
+#. TRANS: Exception thrown when using too many @ signs in a Jabber ID.
+msgid "Invalid JID: too many @s."
+msgstr "Nieprawidłowy JID: zbyt wiele znaków @."
+
+#. TRANS: Exception thrown when using @ sign not followed by a Jabber ID.
+msgid "Invalid JID: @ but no node"
+msgstr "Nieprawidłowy JID: jest @ ale brak węzła"
+
+#. TRANS: Exception thrown when using too long a Jabber ID (>1023).
+msgid "Invalid JID: node too long."
+msgstr "Nieprawidłowy JID: za długi węzeł."
+
+#. TRANS: Exception thrown when using an invalid Jabber ID.
+#. TRANS: %s is the invalid Jabber ID.
+#, php-format
+msgid "Invalid JID node \"%s\"."
+msgstr "Nieprawidłowy węzeł \"%s\" w JID."
+
+#. TRANS: Exception thrown when using too long a Jabber domain (>1023).
+msgid "Invalid JID: domain too long."
+msgstr "Nieprawidłowy JID: za długa domena."
+
+#. TRANS: Exception thrown when using an invalid Jabber domain name.
+#. TRANS: %s is the invalid domain name.
+#, php-format
+msgid "Invalid JID domain name \"%s\"."
+msgstr "Nieprawidłowa nazwa domeny \"%s\" w JID."
+
+#. TRANS: Exception thrown when using an invalid Jabber resource.
+#. TRANS: %s is the invalid resource.
+#, php-format
+msgid "Invalid JID resource \"%s\"."
+msgstr "Nieprawidłowy zasób \"%s\" w JID."
+
+#. TRANS: Link description to notice in conversation.
+#. TRANS: %s is a notice ID.
+#, php-format
+msgid "[%s]"
+msgstr "[%s]"
+
+#. TRANS: Exception thrown when the plugin configuration is incorrect.
+msgid "You must specify a server in the configuration."
+msgstr "Musisz określić serwer w konfiguracji."
+
+#. TRANS: Exception thrown when the plugin configuration is incorrect.
+msgid "You must specify a port in the configuration."
+msgstr "Należy określić port w konfiguracji."
+
+#. TRANS: Exception thrown when the plugin configuration is incorrect.
+msgid "You must specify a user in the configuration."
+msgstr "Należy określić użytkownika w konfiguracji."
+
+#. TRANS: Exception thrown when the plugin configuration is incorrect.
+msgid "You must specify a password in the configuration."
+msgstr "Musisz określić hasło w konfiguracji."
+
+#. TRANS: Plugin description.
+msgid ""
+"The XMPP plugin allows users to send and receive notices over the XMPP/"
+"Jabber network."
+msgstr ""
+"Wtyczka XMPP umożliwia użytkownikom wysyłanie i otrzymywanie powiadomień w "
+"sieci XMPP/Jabber."
diff --git a/plugins/Xmpp/locale/pt/LC_MESSAGES/Xmpp.po b/plugins/Xmpp/locale/pt/LC_MESSAGES/Xmpp.po
index 9c3a2f298c..69568f4e29 100644
--- a/plugins/Xmpp/locale/pt/LC_MESSAGES/Xmpp.po
+++ b/plugins/Xmpp/locale/pt/LC_MESSAGES/Xmpp.po
@@ -9,29 +9,84 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Xmpp\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:56+0000\n"
+"POT-Creation-Date: 2011-06-18 15:54+0000\n"
+"PO-Revision-Date: 2011-06-18 15:58:03+0000\n"
 "Language-Team: Portuguese <http://translatewiki.net/wiki/Portal:pt>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:55+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
+"X-POT-Import-Date: 2011-06-05 21:52:15+0000\n"
+"X-Generator: MediaWiki 1.19alpha (r90318); Translate extension (2011-06-02)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt\n"
 "X-Message-Group: #out-statusnet-plugin-xmpp\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Presence announcement for XMPP.
+#. TRANS: Message for XMPP reconnect.
 msgid "Send me a message to post a notice"
 msgstr "Envia-me uma mensagem para postar uma notícia"
 
+#. TRANS: Plugin display name.
 msgid "XMPP/Jabber/GTalk"
 msgstr "XMPP/Jabber/GTalk"
 
+#. TRANS: Exception thrown when using too many @ signs in a Jabber ID.
+msgid "Invalid JID: too many @s."
+msgstr ""
+
+#. TRANS: Exception thrown when using @ sign not followed by a Jabber ID.
+msgid "Invalid JID: @ but no node"
+msgstr ""
+
+#. TRANS: Exception thrown when using too long a Jabber ID (>1023).
+msgid "Invalid JID: node too long."
+msgstr ""
+
+#. TRANS: Exception thrown when using an invalid Jabber ID.
+#. TRANS: %s is the invalid Jabber ID.
+#, php-format
+msgid "Invalid JID node \"%s\"."
+msgstr ""
+
+#. TRANS: Exception thrown when using too long a Jabber domain (>1023).
+msgid "Invalid JID: domain too long."
+msgstr ""
+
+#. TRANS: Exception thrown when using an invalid Jabber domain name.
+#. TRANS: %s is the invalid domain name.
+#, php-format
+msgid "Invalid JID domain name \"%s\"."
+msgstr ""
+
+#. TRANS: Exception thrown when using an invalid Jabber resource.
+#. TRANS: %s is the invalid resource.
+#, php-format
+msgid "Invalid JID resource \"%s\"."
+msgstr ""
+
+#. TRANS: Link description to notice in conversation.
 #. TRANS: %s is a notice ID.
 #, php-format
 msgid "[%s]"
 msgstr ""
 
+#. TRANS: Exception thrown when the plugin configuration is incorrect.
+msgid "You must specify a server in the configuration."
+msgstr ""
+
+#. TRANS: Exception thrown when the plugin configuration is incorrect.
+msgid "You must specify a port in the configuration."
+msgstr ""
+
+#. TRANS: Exception thrown when the plugin configuration is incorrect.
+msgid "You must specify a user in the configuration."
+msgstr ""
+
+#. TRANS: Exception thrown when the plugin configuration is incorrect.
+msgid "You must specify a password in the configuration."
+msgstr ""
+
+#. TRANS: Plugin description.
 msgid ""
 "The XMPP plugin allows users to send and receive notices over the XMPP/"
 "Jabber network."
diff --git a/plugins/Xmpp/locale/sv/LC_MESSAGES/Xmpp.po b/plugins/Xmpp/locale/sv/LC_MESSAGES/Xmpp.po
index 08bdf588f7..f1006df471 100644
--- a/plugins/Xmpp/locale/sv/LC_MESSAGES/Xmpp.po
+++ b/plugins/Xmpp/locale/sv/LC_MESSAGES/Xmpp.po
@@ -9,29 +9,84 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Xmpp\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:56+0000\n"
+"POT-Creation-Date: 2011-06-18 15:54+0000\n"
+"PO-Revision-Date: 2011-06-18 15:58:03+0000\n"
 "Language-Team: Swedish <http://translatewiki.net/wiki/Portal:sv>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:55+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
+"X-POT-Import-Date: 2011-06-05 21:52:15+0000\n"
+"X-Generator: MediaWiki 1.19alpha (r90318); Translate extension (2011-06-02)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: sv\n"
 "X-Message-Group: #out-statusnet-plugin-xmpp\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Presence announcement for XMPP.
+#. TRANS: Message for XMPP reconnect.
 msgid "Send me a message to post a notice"
 msgstr ""
 
+#. TRANS: Plugin display name.
 msgid "XMPP/Jabber/GTalk"
 msgstr "XMPP/Jabber/GTalk"
 
+#. TRANS: Exception thrown when using too many @ signs in a Jabber ID.
+msgid "Invalid JID: too many @s."
+msgstr ""
+
+#. TRANS: Exception thrown when using @ sign not followed by a Jabber ID.
+msgid "Invalid JID: @ but no node"
+msgstr ""
+
+#. TRANS: Exception thrown when using too long a Jabber ID (>1023).
+msgid "Invalid JID: node too long."
+msgstr ""
+
+#. TRANS: Exception thrown when using an invalid Jabber ID.
+#. TRANS: %s is the invalid Jabber ID.
+#, php-format
+msgid "Invalid JID node \"%s\"."
+msgstr ""
+
+#. TRANS: Exception thrown when using too long a Jabber domain (>1023).
+msgid "Invalid JID: domain too long."
+msgstr ""
+
+#. TRANS: Exception thrown when using an invalid Jabber domain name.
+#. TRANS: %s is the invalid domain name.
+#, php-format
+msgid "Invalid JID domain name \"%s\"."
+msgstr ""
+
+#. TRANS: Exception thrown when using an invalid Jabber resource.
+#. TRANS: %s is the invalid resource.
+#, php-format
+msgid "Invalid JID resource \"%s\"."
+msgstr ""
+
+#. TRANS: Link description to notice in conversation.
 #. TRANS: %s is a notice ID.
 #, php-format
 msgid "[%s]"
 msgstr ""
 
+#. TRANS: Exception thrown when the plugin configuration is incorrect.
+msgid "You must specify a server in the configuration."
+msgstr ""
+
+#. TRANS: Exception thrown when the plugin configuration is incorrect.
+msgid "You must specify a port in the configuration."
+msgstr ""
+
+#. TRANS: Exception thrown when the plugin configuration is incorrect.
+msgid "You must specify a user in the configuration."
+msgstr ""
+
+#. TRANS: Exception thrown when the plugin configuration is incorrect.
+msgid "You must specify a password in the configuration."
+msgstr ""
+
+#. TRANS: Plugin description.
 msgid ""
 "The XMPP plugin allows users to send and receive notices over the XMPP/"
 "Jabber network."
diff --git a/plugins/Xmpp/locale/tl/LC_MESSAGES/Xmpp.po b/plugins/Xmpp/locale/tl/LC_MESSAGES/Xmpp.po
index b618e0508f..eddef4a2dc 100644
--- a/plugins/Xmpp/locale/tl/LC_MESSAGES/Xmpp.po
+++ b/plugins/Xmpp/locale/tl/LC_MESSAGES/Xmpp.po
@@ -9,29 +9,84 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Xmpp\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:56+0000\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:32+0000\n"
 "Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:55+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-06-19 11:23:56+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-xmpp\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Presence announcement for XMPP.
+#. TRANS: Message for XMPP reconnect.
 msgid "Send me a message to post a notice"
 msgstr "Padalhan ako ng isang mensahe upang makapagpaskil ng isang pabatid"
 
+#. TRANS: Plugin display name.
 msgid "XMPP/Jabber/GTalk"
 msgstr "XMPP/Jabber/GTalk"
 
+#. TRANS: Exception thrown when using too many @ signs in a Jabber ID.
+msgid "Invalid JID: too many @s."
+msgstr "Hindi katanggap-tanggap na JID: napakaraming mga @s."
+
+#. TRANS: Exception thrown when using @ sign not followed by a Jabber ID.
+msgid "Invalid JID: @ but no node"
+msgstr "Hindi katanggap-tanggap na JID: @ ngunit walang buko"
+
+#. TRANS: Exception thrown when using too long a Jabber ID (>1023).
+msgid "Invalid JID: node too long."
+msgstr "Hindi katanggap-tanggap na JID: napakahaba ng buko."
+
+#. TRANS: Exception thrown when using an invalid Jabber ID.
+#. TRANS: %s is the invalid Jabber ID.
+#, php-format
+msgid "Invalid JID node \"%s\"."
+msgstr "Hindi katanggap-tanggap na buko ng JID na \"%s\"."
+
+#. TRANS: Exception thrown when using too long a Jabber domain (>1023).
+msgid "Invalid JID: domain too long."
+msgstr "Hindi katanggap-tanggap na JID: napakahaba ng sakop."
+
+#. TRANS: Exception thrown when using an invalid Jabber domain name.
+#. TRANS: %s is the invalid domain name.
+#, php-format
+msgid "Invalid JID domain name \"%s\"."
+msgstr "Hindi katanggap-tanggap na pangalan ng saklaw na \"%s\"."
+
+#. TRANS: Exception thrown when using an invalid Jabber resource.
+#. TRANS: %s is the invalid resource.
+#, php-format
+msgid "Invalid JID resource \"%s\"."
+msgstr "Hindi katanggap-tanggap na pinagkunan ng JID na \"%s\"."
+
+#. TRANS: Link description to notice in conversation.
 #. TRANS: %s is a notice ID.
 #, php-format
 msgid "[%s]"
 msgstr "[%s]"
 
+#. TRANS: Exception thrown when the plugin configuration is incorrect.
+msgid "You must specify a server in the configuration."
+msgstr "Dapat kang tumukoy ng isang tagapaghain sa loob ng pagkakaayos."
+
+#. TRANS: Exception thrown when the plugin configuration is incorrect.
+msgid "You must specify a port in the configuration."
+msgstr "Dapat kang tumukoy ng isang daungan sa loob ng kaayusan."
+
+#. TRANS: Exception thrown when the plugin configuration is incorrect.
+msgid "You must specify a user in the configuration."
+msgstr "Dapat kang tumukoy ng isang tagagamit sa loob ng pagkakaayos."
+
+#. TRANS: Exception thrown when the plugin configuration is incorrect.
+msgid "You must specify a password in the configuration."
+msgstr "Dapat kang tumukoy ng isang hudyat sa loob ng kaayusan."
+
+#. TRANS: Plugin description.
 msgid ""
 "The XMPP plugin allows users to send and receive notices over the XMPP/"
 "Jabber network."
diff --git a/plugins/Xmpp/locale/uk/LC_MESSAGES/Xmpp.po b/plugins/Xmpp/locale/uk/LC_MESSAGES/Xmpp.po
index 6aa5e1bed9..2bbf330f68 100644
--- a/plugins/Xmpp/locale/uk/LC_MESSAGES/Xmpp.po
+++ b/plugins/Xmpp/locale/uk/LC_MESSAGES/Xmpp.po
@@ -9,30 +9,85 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Xmpp\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51:56+0000\n"
+"POT-Creation-Date: 2011-06-18 15:54+0000\n"
+"PO-Revision-Date: 2011-06-18 15:58:04+0000\n"
 "Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:55+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
+"X-POT-Import-Date: 2011-06-05 21:52:15+0000\n"
+"X-Generator: MediaWiki 1.19alpha (r90318); Translate extension (2011-06-02)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-xmpp\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
+#. TRANS: Presence announcement for XMPP.
+#. TRANS: Message for XMPP reconnect.
 msgid "Send me a message to post a notice"
 msgstr "�адішліть мені повідомленн�, щоб опублікувати допи�"
 
+#. TRANS: Plugin display name.
 msgid "XMPP/Jabber/GTalk"
 msgstr "XMPP/Jabber/GTalk"
 
+#. TRANS: Exception thrown when using too many @ signs in a Jabber ID.
+msgid "Invalid JID: too many @s."
+msgstr ""
+
+#. TRANS: Exception thrown when using @ sign not followed by a Jabber ID.
+msgid "Invalid JID: @ but no node"
+msgstr ""
+
+#. TRANS: Exception thrown when using too long a Jabber ID (>1023).
+msgid "Invalid JID: node too long."
+msgstr ""
+
+#. TRANS: Exception thrown when using an invalid Jabber ID.
+#. TRANS: %s is the invalid Jabber ID.
+#, php-format
+msgid "Invalid JID node \"%s\"."
+msgstr ""
+
+#. TRANS: Exception thrown when using too long a Jabber domain (>1023).
+msgid "Invalid JID: domain too long."
+msgstr ""
+
+#. TRANS: Exception thrown when using an invalid Jabber domain name.
+#. TRANS: %s is the invalid domain name.
+#, php-format
+msgid "Invalid JID domain name \"%s\"."
+msgstr ""
+
+#. TRANS: Exception thrown when using an invalid Jabber resource.
+#. TRANS: %s is the invalid resource.
+#, php-format
+msgid "Invalid JID resource \"%s\"."
+msgstr ""
+
+#. TRANS: Link description to notice in conversation.
 #. TRANS: %s is a notice ID.
 #, php-format
 msgid "[%s]"
 msgstr "[%s]"
 
+#. TRANS: Exception thrown when the plugin configuration is incorrect.
+msgid "You must specify a server in the configuration."
+msgstr ""
+
+#. TRANS: Exception thrown when the plugin configuration is incorrect.
+msgid "You must specify a port in the configuration."
+msgstr ""
+
+#. TRANS: Exception thrown when the plugin configuration is incorrect.
+msgid "You must specify a user in the configuration."
+msgstr ""
+
+#. TRANS: Exception thrown when the plugin configuration is incorrect.
+msgid "You must specify a password in the configuration."
+msgstr ""
+
+#. TRANS: Plugin description.
 msgid ""
 "The XMPP plugin allows users to send and receive notices over the XMPP/"
 "Jabber network."
diff --git a/plugins/Xmpp/xmppmanager.php b/plugins/Xmpp/xmppmanager.php
index 4aaed677b5..c7d4c15dd6 100644
--- a/plugins/Xmpp/xmppmanager.php
+++ b/plugins/Xmpp/xmppmanager.php
@@ -29,16 +29,14 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
  * In a multi-site queuedaemon.php run, one connection will be instantiated
  * for each site being handled by the current process that has XMPP enabled.
  */
-
 class XmppManager extends ImManager
 {
     protected $lastping = null;
     protected $pingid = null;
 
     public $conn = null;
-    
+
     const PING_INTERVAL = 120;
-    
 
     /**
      * Initialize connection to server.
@@ -114,7 +112,7 @@ class XmppManager extends ImManager
      *
      * Side effect: kills process on exception from XMPP library.
      *
-     * @fixme non-dying error handling
+     * @todo FIXME: non-dying error handling
      */
     public function idle($timeout=0)
     {
@@ -165,6 +163,7 @@ class XmppManager extends ImManager
             }
 
             $this->conn->processUntil('session_start');
+            // TRANS: Presence announcement for XMPP.
             $this->send_presence(_m('Send me a message to post a notice'), 'available', null, 'available', 100);
         }
         return $this->conn;
@@ -204,6 +203,7 @@ class XmppManager extends ImManager
         common_log(LOG_NOTICE, 'XMPP reconnected');
 
         $this->conn->processUntil('session_start');
+        // TRANS: Message for XMPP reconnect.
         $this->send_presence(_m('Send me a message to post a notice'), 'available', null, 'available', 100);
     }
 
@@ -245,7 +245,7 @@ class XmppManager extends ImManager
 
     function special_presence($type, $to=null, $show=null, $status=null)
     {
-        // FIXME: why use this instead of send_presence()?
+        // @todo FIXME: why use this instead of send_presence()?
         $this->connect();
         if (!$this->conn || $this->conn->isDisconnected()) {
             return false;
diff --git a/plugins/YammerImport/README b/plugins/YammerImport/README
index 975faa2132..db16744dce 100644
--- a/plugins/YammerImport/README
+++ b/plugins/YammerImport/README
@@ -139,8 +139,6 @@ File type and size limitations on attachments will be applied, so beware some
 attachments may not make it through.
 
 
-
-
 Code structure
 ==============
 
@@ -179,4 +177,3 @@ Yammer_notice_stub: data object for temporary storage of fetched Yammer messages
 Yammer_user,
 Yammer_group,
 Yammer_notice: data objects mapping original Yammer item IDs to their local copies.
-
diff --git a/plugins/YammerImport/YammerImportPlugin.php b/plugins/YammerImport/YammerImportPlugin.php
index 41d8d08a66..b93eb3ba4a 100644
--- a/plugins/YammerImport/YammerImportPlugin.php
+++ b/plugins/YammerImport/YammerImportPlugin.php
@@ -95,8 +95,10 @@ class YammerImportPlugin extends Plugin
             $action_name = $nav->action->trimmed('action');
 
             $nav->out->menuItem(common_local_url('yammeradminpanel'),
-                                _m('Yammer'),
-                                _m('Yammer import'),
+                                // TRANS: Menu item for Yammer import.
+                                _m('MENU','Yammer'),
+                                // TRANS: Menu item title for Yammer import.
+                                _m('Yammer import module.'),
                                 $action_name == 'yammeradminpanel',
                                 'nav_yammer_admin_panel');
         }
diff --git a/plugins/YammerImport/actions/yammeradminpanel.php b/plugins/YammerImport/actions/yammeradminpanel.php
index 4714154290..f8e099109e 100644
--- a/plugins/YammerImport/actions/yammeradminpanel.php
+++ b/plugins/YammerImport/actions/yammeradminpanel.php
@@ -42,6 +42,7 @@ class YammeradminpanelAction extends AdminPanelAction
      */
     function title()
     {
+        // TRANS: Page title for Yammer import administration panel.
         return _m('Yammer Import');
     }
 
@@ -52,6 +53,7 @@ class YammeradminpanelAction extends AdminPanelAction
      */
     function getInstructions()
     {
+        // TRANS: Instructions for Yammer import administration panel.
         return _m('This Yammer import tool is still undergoing testing, ' .
                   'and is incomplete in some areas. ' .
                 'Currently user subscriptions and group memberships are not ' .
@@ -99,6 +101,7 @@ class YammeradminpanelAction extends AdminPanelAction
 
                 $form = new YammerProgressForm($this, $this->runner);
             } else if ($this->subaction == 'pause-import') {
+                // TRANS: Error message about an import job being paused from the admin panel.
                 $this->runner->recordError(_m('Paused from admin panel.'));
                 $form = $this->statusForm();
             } else if ($this->subaction == 'continue-import') {
@@ -111,7 +114,8 @@ class YammeradminpanelAction extends AdminPanelAction
             } else if ($this->subaction == 'progress') {
                 $form = $this->statusForm();
             } else {
-                throw new ClientException('Invalid POST');
+                // TRANS: Client exception thrown when encountering an unhandled sub action.
+                throw new ClientException(_m('Invalid POST'));
             }
             return $this->showAjaxForm($form);
         }
@@ -132,6 +136,7 @@ class YammeradminpanelAction extends AdminPanelAction
     {
         $this->startHTML('text/xml;charset=utf-8');
         $this->elementStart('head');
+        // TRANS: Page title for Yammer import administration panel.
         $this->element('title', null, _m('Yammer import'));
         $this->elementEnd('head');
         $this->elementStart('body');
diff --git a/plugins/YammerImport/actions/yammerauth.php b/plugins/YammerImport/actions/yammerauth.php
index d0d4b40c71..d25be91440 100644
--- a/plugins/YammerImport/actions/yammerauth.php
+++ b/plugins/YammerImport/actions/yammerauth.php
@@ -33,7 +33,6 @@ if (!defined('STATUSNET')) {
 
 class YammerauthAction extends AdminPanelAction
 {
-
     /**
      * Show the Yammer admin panel form
      *
@@ -42,7 +41,7 @@ class YammerauthAction extends AdminPanelAction
     function prepare($args)
     {
         parent::prepare($args);
-        
+
         $this->verify_token = $this->trim('verify_token');
     }
 
@@ -55,7 +54,6 @@ class YammerauthAction extends AdminPanelAction
      *
      * @return void
      */
-
     function handle($args)
     {
         if ($this->verify_token) {
@@ -68,6 +66,7 @@ class YammerauthAction extends AdminPanelAction
 
         $this->startHTML('text/xml;charset=utf-8');
         $this->elementStart('head');
+        // TRANS: Page title for Yammer administration panel.
         $this->element('title', null, _m('Connect to Yammer'));
         $this->elementEnd('head');
         $this->elementStart('body');
@@ -76,4 +75,3 @@ class YammerauthAction extends AdminPanelAction
         $this->elementEnd('html');
     }
 }
-
diff --git a/plugins/YammerImport/classes/Yammer_common.php b/plugins/YammerImport/classes/Yammer_common.php
index 6ec6fc9041..e262623263 100644
--- a/plugins/YammerImport/classes/Yammer_common.php
+++ b/plugins/YammerImport/classes/Yammer_common.php
@@ -40,7 +40,6 @@ if (!defined('STATUSNET')) {
  * - schemaDef (call self::doSchemaDef)
  * - record (call self::doRecord)
  */
-
 class Yammer_common extends Memcached_DataObject
 {
     public $__table = 'yammer_XXXX'; // table name
@@ -50,7 +49,7 @@ class Yammer_common extends Memcached_DataObject
     public $created;                 // datetime
 
     /**
-     * @fixme add a 'references' thing for the foreign key when we support that
+     * @todo FIXME: Add a 'references' thing for the foreign key when we support that
      */
     protected static function doSchemaDef($field)
     {
@@ -87,7 +86,6 @@ class Yammer_common extends Memcached_DataObject
      *
      * @return array list of key field names
      */
-
     function keys()
     {
         return array_keys($this->keyTypes());
@@ -105,7 +103,6 @@ class Yammer_common extends Memcached_DataObject
      *         'K' for primary key: for compound keys, add an entry for each component;
      *         'U' for unique keys: compound keys are not well supported here.
      */
-
     function keyTypes()
     {
         return array('id' => 'K', $this->__field => 'U');
@@ -121,7 +118,6 @@ class Yammer_common extends Memcached_DataObject
      *
      * @return array magic three-false array that stops auto-incrementing.
      */
-
     function sequenceKey()
     {
         return array(false, false, false);
@@ -135,7 +131,6 @@ class Yammer_common extends Memcached_DataObject
      *
      * @return Yammer_common new object for this value
      */
-
     protected static function doRecord($class, $field, $orig_id, $local_id)
     {
         $map = parent::staticGet($class, 'id', $orig_id);
diff --git a/plugins/YammerImport/classes/Yammer_group.php b/plugins/YammerImport/classes/Yammer_group.php
index 4e7a6ebd03..a52b5119d4 100644
--- a/plugins/YammerImport/classes/Yammer_group.php
+++ b/plugins/YammerImport/classes/Yammer_group.php
@@ -48,7 +48,6 @@ class Yammer_group extends Yammer_common
      * @return Yammer_group object found, or null for no hits
      *
      */
-
     function staticGet($k, $v=null)
     {
         return Memcached_DataObject::staticGet('Yammer_group', $k, $v);
@@ -57,7 +56,6 @@ class Yammer_group extends Yammer_common
     /**
      * Return schema definition to set this table up in onCheckSchema
      */
-
     static function schemaDef()
     {
         return self::doSchemaDef('group_id');
@@ -71,7 +69,6 @@ class Yammer_group extends Yammer_common
      *
      * @return Yammer_group new object for this value
      */
-
     static function record($orig_id, $group_id)
     {
         return self::doRecord('Yammer_group', 'group_id', $orig_id, $group_id);
diff --git a/plugins/YammerImport/classes/Yammer_notice.php b/plugins/YammerImport/classes/Yammer_notice.php
index 0f63db6303..118266aed0 100644
--- a/plugins/YammerImport/classes/Yammer_notice.php
+++ b/plugins/YammerImport/classes/Yammer_notice.php
@@ -48,7 +48,6 @@ class Yammer_notice extends Yammer_common
      * @return Yammer_notice object found, or null for no hits
      *
      */
-
     function staticGet($k, $v=null)
     {
         return Memcached_DataObject::staticGet('Yammer_notice', $k, $v);
@@ -57,7 +56,6 @@ class Yammer_notice extends Yammer_common
     /**
      * Return schema definition to set this table up in onCheckSchema
      */
-
     static function schemaDef()
     {
         return self::doSchemaDef('notice_id');
@@ -71,7 +69,6 @@ class Yammer_notice extends Yammer_common
      *
      * @return Yammer_notice new object for this value
      */
-
     static function record($orig_id, $notice_id)
     {
         return self::doRecord('Yammer_notice', 'notice_id', $orig_id, $notice_id);
diff --git a/plugins/YammerImport/classes/Yammer_notice_stub.php b/plugins/YammerImport/classes/Yammer_notice_stub.php
index e10300c4c7..6dd78206d2 100644
--- a/plugins/YammerImport/classes/Yammer_notice_stub.php
+++ b/plugins/YammerImport/classes/Yammer_notice_stub.php
@@ -40,7 +40,6 @@ if (!defined('STATUSNET')) {
  * down in reverse chronological order, then go back over them from oldest to
  * newest and actually save them into our notice table.
  */
-
 class Yammer_notice_stub extends Memcached_DataObject
 {
     public $__table = 'yammer_notice_stub'; // table name
@@ -57,9 +56,7 @@ class Yammer_notice_stub extends Memcached_DataObject
      * @param mixed  $v Value to lookup
      *
      * @return Yammer_notice_stub object found, or null for no hits
-     *
      */
-
     function staticGet($k, $v=null)
     {
         return Memcached_DataObject::staticGet('Yammer_notice_stub', $k, $v);
@@ -86,7 +83,6 @@ class Yammer_notice_stub extends Memcached_DataObject
      *
      * @return array array of column definitions
      */
-
     function table()
     {
         return array('id'           => DB_DATAOBJECT_INT + DB_DATAOBJECT_NOTNULL,
@@ -121,7 +117,6 @@ class Yammer_notice_stub extends Memcached_DataObject
      *         'K' for primary key: for compound keys, add an entry for each component;
      *         'U' for unique keys: compound keys are not well supported here.
      */
-
     function keyTypes()
     {
         return array('id' => 'K');
@@ -137,7 +132,6 @@ class Yammer_notice_stub extends Memcached_DataObject
      *
      * @return array magic three-false array that stops auto-incrementing.
      */
-
     function sequenceKey()
     {
         return array(false, false, false);
diff --git a/plugins/YammerImport/classes/Yammer_state.php b/plugins/YammerImport/classes/Yammer_state.php
index 88bd693bfd..548fbbf024 100644
--- a/plugins/YammerImport/classes/Yammer_state.php
+++ b/plugins/YammerImport/classes/Yammer_state.php
@@ -55,9 +55,7 @@ class Yammer_state extends Memcached_DataObject
      * @param mixed  $v Value to lookup
      *
      * @return Yammer_state object found, or null for no hits
-     *
      */
-
     function staticGet($k, $v=null)
     {
         return Memcached_DataObject::staticGet('Yammer_state', $k, $v);
@@ -90,7 +88,6 @@ class Yammer_state extends Memcached_DataObject
      *
      * @return array array of column definitions
      */
-
     function table()
     {
         return array('id'              => DB_DATAOBJECT_INT + DB_DATAOBJECT_NOTNULL,
@@ -114,7 +111,6 @@ class Yammer_state extends Memcached_DataObject
      *
      * @return array list of key field names
      */
-
     function keys()
     {
         return array_keys($this->keyTypes());
@@ -132,7 +128,6 @@ class Yammer_state extends Memcached_DataObject
      *         'K' for primary key: for compound keys, add an entry for each component;
      *         'U' for unique keys: compound keys are not well supported here.
      */
-
     function keyTypes()
     {
         return array('id' => 'K');
@@ -148,7 +143,6 @@ class Yammer_state extends Memcached_DataObject
      *
      * @return array magic three-false array that stops auto-incrementing.
      */
-
     function sequenceKey()
     {
         return array(false, false, false);
diff --git a/plugins/YammerImport/classes/Yammer_user.php b/plugins/YammerImport/classes/Yammer_user.php
index f6fcd6c3cb..8139613347 100644
--- a/plugins/YammerImport/classes/Yammer_user.php
+++ b/plugins/YammerImport/classes/Yammer_user.php
@@ -48,7 +48,6 @@ class Yammer_user extends Yammer_common
      * @return Yammer_user object found, or null for no hits
      *
      */
-
     function staticGet($k, $v=null)
     {
         return Memcached_DataObject::staticGet('Yammer_user', $k, $v);
@@ -57,7 +56,6 @@ class Yammer_user extends Yammer_common
     /**
      * Return schema definition to set this table up in onCheckSchema
      */
-
     static function schemaDef()
     {
         return self::doSchemaDef('user_id');
@@ -71,7 +69,6 @@ class Yammer_user extends Yammer_common
      *
      * @return Yammer_user new object for this value
      */
-
     static function record($orig_id, $user_id)
     {
         return self::doRecord('Yammer_user', 'user_id', $orig_id, $user_id);
diff --git a/plugins/YammerImport/lib/sn_yammerclient.php b/plugins/YammerImport/lib/sn_yammerclient.php
index 5da1cc5e7e..2827bdc53a 100644
--- a/plugins/YammerImport/lib/sn_yammerclient.php
+++ b/plugins/YammerImport/lib/sn_yammerclient.php
@@ -19,7 +19,7 @@
 
 /**
  * Basic client class for Yammer's OAuth/JSON API.
- * 
+ *
  * @package YammerImportPlugin
  * @author Brion Vibber <brion@status.net>
  */
@@ -69,7 +69,11 @@ class SN_YammerClient
         if ($response->isOk()) {
             return $response->getBody();
         } else {
-            throw new Exception("Yammer API returned HTTP code " . $response->getStatus() . ': ' . $response->getBody());
+            // TRANS: Exeption thrown when an external Yammer system gives an error.
+            // TRANS: %1$s is an HTTP error code, %2$s is the error message body.
+            throw new Exception(sprintf(_m('Yammer API returned HTTP code %1$s: %2$s'),
+                                $response->getStatus(),
+                                $response->getBody()));
         }
     }
 
@@ -106,7 +110,8 @@ class SN_YammerClient
         $data = json_decode($body, true);
         if ($data === null) {
             common_log(LOG_ERR, "Invalid JSON response from Yammer API: " . $body);
-            throw new Exception("Invalid JSON response from Yammer API");
+            // TRANS: Exeption thrown when an external Yammer system an invalid JSON response.
+            throw new Exception(_m('Invalid JSON response from Yammer API.'));
         }
         return $data;
     }
@@ -160,7 +165,8 @@ class SN_YammerClient
     public function requestToken()
     {
         if ($this->token || $this->tokenSecret) {
-            throw new Exception("Requesting a token, but already set up with a token");
+            // TRANS: Exeption thrown when a trust relationship has already been established.
+            throw new Exception(_m('Requesting a token, but already set up with a token.'));
         }
         $data = $this->fetchApi('oauth/request_token');
         $arr = array();
diff --git a/plugins/YammerImport/lib/yammerapikeyform.php b/plugins/YammerImport/lib/yammerapikeyform.php
index b2acec4ede..72c14c30ce 100644
--- a/plugins/YammerImport/lib/yammerapikeyform.php
+++ b/plugins/YammerImport/lib/yammerapikeyform.php
@@ -53,6 +53,7 @@ class YammerApikeyForm extends Form
      */
     function formLegend()
     {
+        // TRANS: Form legend for adding details to connect to a remote Yammer API.
         $this->out->element('legend', null, _m('Yammer API registration'));
     }
 
@@ -69,6 +70,7 @@ class YammerApikeyForm extends Form
         $this->out->elementStart('fieldset');
 
         $this->out->elementStart('p');
+        // TRANS: Explanation of what needs to be done to connect to a Yammer network.
         $this->out->text(_m('Before we can connect to your Yammer network, ' .
                             'you will need to register the importer as an ' .
                             'application authorized to pull data on your behalf. ' .
@@ -81,21 +83,28 @@ class YammerApikeyForm extends Form
         $this->out->element('a',
             array('href' => 'https://www.yammer.com/client_applications/new',
                   'target' => '_blank'),
+            // TRANS: Link description to a Yammer application registration form.
             _m('Open Yammer application registration form'));
         $this->out->elementEnd('p');
 
+        // TRANS: Instructions.
         $this->out->element('p', array(), _m('Copy the consumer key and secret you are given into the form below:'));
 
         $this->out->elementStart('ul', array('class' => 'form_data'));
         $this->out->elementStart('li');
+        // TRANS: Field label for a Yammer consumer key.
         $this->out->input('consumer_key', _m('Consumer key:'), common_config('yammer', 'consumer_key'));
         $this->out->elementEnd('li');
         $this->out->elementStart('li');
+        // TRANS: Field label for a Yammer consumer secret.
         $this->out->input('consumer_secret', _m('Consumer secret:'), common_config('yammer', 'consumer_secret'));
         $this->out->elementEnd('li');
         $this->out->elementEnd('ul');
 
-        $this->out->submit('submit', _m('Save'), 'submit', null, _m('Save these consumer keys'));
+        // TRANS: Button text for saving a Yammer API registration.
+        $this->out->submit('submit', _m('BUTTON','Save'),
+                           // TRANS: Button title for saving a Yammer API registration.
+                           'submit', null, _m('Save the entered consumer key and consumer secret.'));
 
         $this->out->elementEnd('fieldset');
     }
diff --git a/plugins/YammerImport/lib/yammerauthinitform.php b/plugins/YammerImport/lib/yammerauthinitform.php
index 9f48fd82a5..c123bbbb9d 100644
--- a/plugins/YammerImport/lib/yammerauthinitform.php
+++ b/plugins/YammerImport/lib/yammerauthinitform.php
@@ -45,6 +45,7 @@ class YammerAuthInitForm extends Form
      */
     function formLegend()
     {
+        // TRANS: Form legend.
         $this->out->element('legend', null, _m('Connect to Yammer'));
     }
 
@@ -59,8 +60,12 @@ class YammerAuthInitForm extends Form
         $this->out->hidden('subaction', 'authinit');
 
         $this->out->elementStart('fieldset');
-        $this->out->submit('submit', _m('Start authentication'), 'submit', null, _m('Request authorization to connect to Yammer account'));
-        $this->out->submit('change-apikey', _m('Change API key'));
+        // TRANS: Button text for starting Yammer authentication.
+        $this->out->submit('submit', _m('BUTTON','Start authentication'),
+                           // TRANS: Button title for starting Yammer authentication.
+                           'submit', null, _m('Request authorization to connect to a Yammer account.'));
+        // TRANS: Button text for starting changing a Yammer API key.
+        $this->out->submit('change-apikey', _m('BUTTON','Change API key'));
         $this->out->elementEnd('fieldset');
     }
 
diff --git a/plugins/YammerImport/lib/yammerauthverifyform.php b/plugins/YammerImport/lib/yammerauthverifyform.php
index e119be96f7..bb82eba6ae 100644
--- a/plugins/YammerImport/lib/yammerauthverifyform.php
+++ b/plugins/YammerImport/lib/yammerauthverifyform.php
@@ -53,6 +53,7 @@ class YammerAuthVerifyForm extends Form
      */
     function formLegend()
     {
+        // TRANS: Form legend.
         $this->out->element('legend', null, _m('Connect to Yammer'));
     }
 
@@ -69,6 +70,7 @@ class YammerAuthVerifyForm extends Form
         $this->out->elementStart('fieldset');
 
         $this->out->elementStart('p');
+        // TRANS: Form instructions.
         $this->out->text(_m('Follow this link to confirm authorization at Yammer; you will be prompted to log in if necessary:'));
         $this->out->elementEnd('p');
 
@@ -84,18 +86,24 @@ class YammerAuthVerifyForm extends Form
         $this->out->element('a',
             array('href' => $this->runner->getAuthUrl(),
                   'target' => '_blank'),
+            // TRANS: Link description for a link in an external Yammer system.
             _m('Open Yammer authentication window'));
         $this->out->elementEnd('p');
-        
+
+        // TRANS: Form instructions.
         $this->out->element('p', array(), _m('Copy the verification code you are given below:'));
 
         $this->out->elementStart('ul', array('class' => 'form_data'));
         $this->out->elementStart('li');
+        // TRANS: Field label.
         $this->out->input('verify_token', _m('Verification code:'));
         $this->out->elementEnd('li');
         $this->out->elementEnd('ul');
-        
-        $this->out->submit('submit', _m('Continue'), 'submit', null, _m('Save code and begin import'));
+
+        // TRANS: Button text for saving  Yammer authorisation data and starting Yammer import.
+        $this->out->submit('submit', _m('BUTTON','Continue'),
+                           // TRANS: Button title for saving  Yammer authorisation data and starting Yammer import.
+                           'submit', null, _m('Save the verification code and begin import.'));
         $this->out->elementEnd('fieldset');
     }
 
diff --git a/plugins/YammerImport/lib/yammerimporter.php b/plugins/YammerImport/lib/yammerimporter.php
index 93bc96d529..ffc88ab473 100644
--- a/plugins/YammerImport/lib/yammerimporter.php
+++ b/plugins/YammerImport/lib/yammerimporter.php
@@ -34,7 +34,7 @@ class YammerImporter
 
     /**
      * Load or create an imported profile from Yammer data.
-     * 
+     *
      * @param object $item loaded JSON data for Yammer importer
      * @return Profile
      */
@@ -180,7 +180,8 @@ class YammerImporter
     function prepUser($item)
     {
         if ($item['type'] != 'user') {
-            throw new Exception('Wrong item type sent to Yammer user import processing.');
+            // TRANS: Exception thrown when a non-user item type is used, but expected.
+            throw new Exception(_m('Wrong item type sent to Yammer user import processing.'));
         }
 
         $origId = $item['id'];
@@ -227,6 +228,7 @@ class YammerImporter
             $bio[] = $item['summary'];
         }
         if (!empty($item['expertise'])) {
+            // TRANS: Used as a prefix for the Yammer expertise field contents.
             $bio[] = _m('Expertise:') . ' ' . $item['expertise'];
         }
         $options['bio'] = implode("\n\n", $bio);
@@ -262,7 +264,8 @@ class YammerImporter
     function prepGroup($item)
     {
         if ($item['type'] != 'group') {
-            throw new Exception('Wrong item type sent to Yammer group import processing.');
+            // TRANS: Exception thrown when a non-group item type is used, but expected.
+            throw new Exception(_m('Wrong item type sent to Yammer group import processing.'));
         }
 
         $origId = $item['id'];
@@ -277,7 +280,6 @@ class YammerImporter
 
         $avatar = $item['mugshot_url']; // as with user profiles...
 
-
         $options['mainpage'] = common_local_url('showgroup',
                                    array('nickname' => $options['nickname']));
 
@@ -285,7 +287,7 @@ class YammerImporter
         $options['homepage'] = '';
         $options['location'] = '';
         $options['aliases'] = array();
-        // @fixme what about admin user for the group?
+        // @todo FIXME: What about admin user for the group?
 
         $options['local'] = true;
         return array('orig_id' => $origId,
@@ -303,7 +305,8 @@ class YammerImporter
     function prepNotice($item)
     {
         if (isset($item['type']) && $item['type'] != 'message') {
-            throw new Exception('Wrong item type sent to Yammer message import processing.');
+            // TRANS: Exception thrown when a non-message item type is used, but expected.
+            throw new Exception(_m('Wrong item type sent to Yammer message import processing.'));
         }
 
         $origId = $item['id'];
@@ -430,7 +433,9 @@ class YammerImporter
         $url = preg_replace('/_small(\..*?)$/', '$1', $url);
 
         if (!common_valid_http_url($url)) {
-            throw new ServerException(sprintf(_m("Invalid avatar URL %s."), $url));
+            // TRANS: Server exception thrown when an avatar URL is invalid.
+            // TRANS: %s is the invalid avatar URL.
+            throw new ServerException(sprintf(_m('Invalid avatar URL %s.'), $url));
         }
 
         // @fixme this should be better encapsulated
@@ -438,7 +443,9 @@ class YammerImporter
         $temp_filename = tempnam(sys_get_temp_dir(), 'listener_avatar');
         try {
             if (!copy($url, $temp_filename)) {
-                throw new ServerException(sprintf(_m("Unable to fetch avatar from %s."), $url));
+                // TRANS: Server exception thrown when an avatar could not be fetched.
+                // TRANS: %s is the failed avatar URL.
+                throw new ServerException(sprintf(_m('Unable to fetch avatar from %s.'), $url));
             }
 
             $id = $dest->id;
diff --git a/plugins/YammerImport/lib/yammerprogressform.php b/plugins/YammerImport/lib/yammerprogressform.php
index 9bf8332261..0b73472a4d 100644
--- a/plugins/YammerImport/lib/yammerprogressform.php
+++ b/plugins/YammerImport/lib/yammerprogressform.php
@@ -60,39 +60,92 @@ class YammerProgressForm extends Form
 
         $labels = array(
             'init' => array(
-                'label' => _m("Initialize"),
+                // TRANS: Field label for a Yammer import initialise step.
+                'label' => _m('Initialize'),
+                // TRANS: "In progress" description.
                 'progress' => _m('No import running'),
+                // TRANS: "Complete" description for initialize state.
                 'complete' => _m('Initiated Yammer server connection...'),
             ),
             'requesting-auth' => array(
+                // TRANS: Field label for a Yammer import connect step.
                 'label' => _m('Connect to Yammer'),
+                // TRANS: "In progress" description.
                 'progress' => _m('Awaiting authorization...'),
+                // TRANS: "Complete" description for connect state.
                 'complete' => _m('Connected.'),
             ),
             'import-users' => array(
+                // TRANS: Field label for a Yammer user import users step.
                 'label' => _m('Import user accounts'),
-                'progress' => sprintf(_m("Importing %d user...", "Importing %d users...", $userCount), $userCount),
-                'complete' => sprintf(_m("Imported %d user.", "Imported %d users.", $userCount), $userCount),
+                // TRANS: "In progress" description.
+                // TRANS: %d is the number of users to be imported.
+                'progress' => sprintf(_m('Importing %d user...',
+                                         'Importing %d users...',
+                                         $userCount),
+                                      $userCount),
+                // TRANS: "Complete" description for step.
+                // TRANS: %d is the number of users imported.
+                'complete' => sprintf(_m('Imported %d user.',
+                                         'Imported %d users.',
+                                         $userCount),
+                                      $userCount),
             ),
             'import-groups' => array(
+                // TRANS: Field label for a Yammer group import step.
                 'label' => _m('Import user groups'),
-                'progress' => sprintf(_m("Importing %d group...", "Importing %d groups...", $groupCount), $groupCount),
-                'complete' => sprintf(_m("Imported %d group.", "Imported %d groups.", $groupCount), $groupCount),
+                // TRANS: "In progress" description.
+                // TRANS: %d is the number of groups to be imported.
+                'progress' => sprintf(_m('Importing %d group...',
+                                         'Importing %d groups...',
+                                         $groupCount),
+                                      $groupCount),
+                // TRANS: "Complete" description for step.
+                // TRANS: %d is the number of groups imported.
+                'complete' => sprintf(_m('Imported %d group.',
+                                         'Imported %d groups.',
+                                         $groupCount),
+                                      $groupCount),
             ),
             'fetch-messages' => array(
+                // TRANS: Field label for a Yammer import prepare notices step.
                 'label' => _m('Prepare public notices for import'),
-                'progress' => sprintf(_m("Preparing %d notice...", "Preparing %d notices...", $fetchedCount), $fetchedCount),
-                'complete' => sprintf(_m("Prepared %d notice.", "Prepared %d notices.", $fetchedCount), $fetchedCount),
+                // TRANS: "In progress" description.
+                // TRANS: %d is the number of notices to be prepared for import.
+                'progress' => sprintf(_m('Preparing %d notice...',
+                                         'Preparing %d notices...',
+                                         $fetchedCount),
+                                      $fetchedCount),
+                // TRANS: "Complete" description for step.
+                // TRANS: %d is the number of notices prepared for import.
+                'complete' => sprintf(_m('Prepared %d notice.',
+                                         'Prepared %d notices.',
+                                         $fetchedCount),
+                                      $fetchedCount),
             ),
             'save-messages' => array(
+                // TRANS: Field label for a Yammer import notices step.
                 'label' => _m('Import public notices'),
-                'progress' => sprintf(_m("Importing %d notice...", "Importing %d notices...", $savedCount), $savedCount),
-                'complete' => sprintf(_m("Imported %d notice.", "Imported %d notices.", $savedCount), $savedCount),
+                // TRANS: "In progress" description.
+                // TRANS: %d is the number of notices to be imported.
+                'progress' => sprintf(_m('Importing %d notice...',
+                                         'Importing %d notices...',
+                                         $savedCount),
+                                      $savedCount),
+                // TRANS: "Complete" description for step.
+                // TRANS: %d is the number of notices imported.
+                'complete' => sprintf(_m('Imported %d notice.',
+                                         'Imported %d notices.',
+                                         $savedCount),
+                                      $savedCount),
             ),
             'done' => array(
+                // TRANS: Field label for a Yammer import done step.
                 'label' => _m('Done'),
-                'progress' => sprintf(_m("Import is complete!")),
-                'complete' => sprintf(_m("Import is complete!")),
+                // TRANS: "In progress" description for done step.
+                'progress' => sprintf(_m('Import is complete!')),
+                // TRANS: "Complete" description for done step.
+                'complete' => sprintf(_m('Import is complete!')),
             )
         );
         $steps = array_keys($labels);
@@ -105,6 +158,7 @@ class YammerProgressForm extends Form
             $classes[] = 'yammer-running';
         }
         $this->out->elementStart('fieldset', array('class' => implode(' ', $classes)));
+        // TRANS: Fieldset legend.
         $this->out->element('legend', array(), _m('Import status'));
         foreach ($steps as $step => $state) {
             if ($state == 'init') {
@@ -129,7 +183,8 @@ class YammerProgressForm extends Form
                 $this->progressBar($state,
                                    'waiting',
                                    $labels[$state]['label'],
-                                   _m("Waiting..."));
+                                   // TRANS: Progress bar status.
+                                   _m('Waiting...'));
             }
         }
         $this->out->elementEnd('fieldset');
@@ -143,11 +198,13 @@ class YammerProgressForm extends Form
         $this->out->element('div', array('class' => 'import-status'), $status);
         if ($class == 'progress') {
             if ($state == 'done') {
+                // TRANS: Button text for resetting the import state.
                 $this->out->submit('abort-import', _m('Reset import state'));
             } else {
                 if ($error) {
                     $this->errorBox($error);
                 } else {
+                    // TRANS: Button text for pausing an import.
                     $this->out->submit('pause-import', _m('Pause import'));
                 }
             }
@@ -157,11 +214,15 @@ class YammerProgressForm extends Form
 
     private function errorBox($msg)
     {
-        $errline = sprintf(_m('Encountered error "%s"'), $msg);
+        // TRANS: Error message. %s are the error details.
+        $errline = sprintf(_m('Encountered error "%s".'), $msg);
         $this->out->elementStart('fieldset', array('class' => 'import-error'));
+        // TRANS: Fieldset legend for a paused import.
         $this->out->element('legend', array(), _m('Paused'));
         $this->out->element('p', array(), $errline);
+        // TRANS: Button text for continuing a paused import.
         $this->out->submit('continue-import', _m('Continue'));
+        // TRANS: Button text for aborting a paused import.
         $this->out->submit('abort-import', _m('Abort import'));
         $this->out->elementEnd('fieldset');
     }
diff --git a/plugins/YammerImport/lib/yammerrunner.php b/plugins/YammerImport/lib/yammerrunner.php
index 3e53f3361b..04cc9c0283 100644
--- a/plugins/YammerImport/lib/yammerrunner.php
+++ b/plugins/YammerImport/lib/yammerrunner.php
@@ -123,7 +123,8 @@ class YammerRunner
     public function requestAuth()
     {
         if ($this->state->state != 'init') {
-            throw new ServerException("Cannot request Yammer auth; already there!");
+            // TRANS: Server exception thrown if a Yammer authentication request is already present.
+            throw new ServerException(_m('Cannot request Yammer auth; already there!'));
         }
 
         $data = $this->client->requestToken();
@@ -149,7 +150,8 @@ class YammerRunner
         if ($this->state() == 'requesting-auth') {
             return $this->client->authorizeUrl($this->state->oauth_token);
         } else {
-            throw new ServerException('Cannot get Yammer auth URL when not in requesting-auth state!');
+            // TRANS: Server exception thrown when requesting a Yammer authentication URL while in an incorrect state.
+            throw new ServerException(_m('Cannot get Yammer auth URL when not in requesting-auth state!'));
         }
     }
 
@@ -167,7 +169,9 @@ class YammerRunner
     public function saveAuthToken($verifier)
     {
         if ($this->state->state != 'requesting-auth') {
-            throw new ServerException("Cannot save auth token in Yammer import state {$this->state->state}");
+            // TRANS: Server exception thrown if a Yammer authentication token could not be saved in a certain import state.
+            // TRANS: %s is the import state in the which the error occurred.
+            throw new ServerException(_m('Cannot save auth token in Yammer import state %s.',$this->state->state));
         }
 
         $data = $this->client->accessToken($verifier);
@@ -324,7 +328,7 @@ class YammerRunner
         $stub->limit(20);
         $stub->orderBy('id');
         $stub->find();
-        
+
         if ($stub->N == 0) {
             common_log(LOG_INFO, "Finished saving Yammer messages; import complete!");
             $this->state->state = 'done';
@@ -353,7 +357,6 @@ class YammerRunner
         return $map->count();
     }
 
-
     /**
      * Count the number of Yammer groups we've mapped into our system!
      *
@@ -365,7 +368,6 @@ class YammerRunner
         return $map->count();
     }
 
-
     /**
      * Count the number of Yammer notices we've pulled down for pending import...
      *
@@ -377,7 +379,6 @@ class YammerRunner
         return $map->count();
     }
 
-
     /**
      * Count the number of Yammer notices we've mapped into our system!
      *
@@ -401,8 +402,8 @@ class YammerRunner
     /**
      * Record an error condition from a background run, which we should
      * display in progress state for the admin.
-     * 
-     * @param string $msg 
+     *
+     * @param string $msg
      */
     public function recordError($msg)
     {
@@ -428,7 +429,7 @@ class YammerRunner
 
     /**
      * Get the last recorded background error message, if any.
-     * 
+     *
      * @return string
      */
     public function lastError()
diff --git a/plugins/YammerImport/locale/YammerImport.pot b/plugins/YammerImport/locale/YammerImport.pot
index f8dc717420..1263ae14fd 100644
--- a/plugins/YammerImport/locale/YammerImport.pot
+++ b/plugins/YammerImport/locale/YammerImport.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
+"POT-Creation-Date: 2012-06-30 11:07+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,16 +17,22 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: actions/yammerauth.php:71 lib/yammerauthinitform.php:48
-#: lib/yammerprogressform.php:68 lib/yammerauthverifyform.php:56
+#. TRANS: Page title for Yammer administration panel.
+#. TRANS: Form legend.
+#. TRANS: Field label for a Yammer import connect step.
+#. TRANS: Form legend.
+#: actions/yammerauth.php:70 lib/yammerauthinitform.php:49
+#: lib/yammerprogressform.php:72 lib/yammerauthverifyform.php:57
 msgid "Connect to Yammer"
 msgstr ""
 
-#: actions/yammeradminpanel.php:45
+#. TRANS: Page title for Yammer import administration panel.
+#: actions/yammeradminpanel.php:46
 msgid "Yammer Import"
 msgstr ""
 
-#: actions/yammeradminpanel.php:55
+#. TRANS: Instructions for Yammer import administration panel.
+#: actions/yammeradminpanel.php:57
 msgid ""
 "This Yammer import tool is still undergoing testing, and is incomplete in "
 "some areas. Currently user subscriptions and group memberships are not "
@@ -34,204 +40,319 @@ msgid ""
 "verified administrators on the Yammer side."
 msgstr ""
 
-#: actions/yammeradminpanel.php:102
+#. TRANS: Error message about an import job being paused from the admin panel.
+#: actions/yammeradminpanel.php:105
 msgid "Paused from admin panel."
 msgstr ""
 
-#: actions/yammeradminpanel.php:135 YammerImportPlugin.php:99
+#. TRANS: Client exception thrown when encountering an unhandled sub action.
+#: actions/yammeradminpanel.php:118
+msgid "Invalid POST"
+msgstr ""
+
+#. TRANS: Page title for Yammer import administration panel.
+#: actions/yammeradminpanel.php:140
 msgid "Yammer import"
 msgstr ""
 
-#: YammerImportPlugin.php:98
+#. TRANS: Menu item for Yammer import.
+#: YammerImportPlugin.php:99
+msgctxt "MENU"
 msgid "Yammer"
 msgstr ""
 
-#: lib/yammerimporter.php:230
+#. TRANS: Menu item title for Yammer import.
+#: YammerImportPlugin.php:101
+msgid "Yammer import module."
+msgstr ""
+
+#. TRANS: Exception thrown when a non-user item type is used, but expected.
+#: lib/yammerimporter.php:184
+msgid "Wrong item type sent to Yammer user import processing."
+msgstr ""
+
+#. TRANS: Used as a prefix for the Yammer expertise field contents.
+#: lib/yammerimporter.php:232
 msgid "Expertise:"
 msgstr ""
 
-#: lib/yammerimporter.php:433
+#. TRANS: Exception thrown when a non-group item type is used, but expected.
+#: lib/yammerimporter.php:268
+msgid "Wrong item type sent to Yammer group import processing."
+msgstr ""
+
+#. TRANS: Exception thrown when a non-message item type is used, but expected.
+#: lib/yammerimporter.php:309
+msgid "Wrong item type sent to Yammer message import processing."
+msgstr ""
+
+#. TRANS: Server exception thrown when an avatar URL is invalid.
+#. TRANS: %s is the invalid avatar URL.
+#: lib/yammerimporter.php:438
 #, php-format
 msgid "Invalid avatar URL %s."
 msgstr ""
 
-#: lib/yammerimporter.php:441
+#. TRANS: Server exception thrown when an avatar could not be fetched.
+#. TRANS: %s is the failed avatar URL.
+#: lib/yammerimporter.php:448
 #, php-format
 msgid "Unable to fetch avatar from %s."
 msgstr ""
 
-#: lib/yammerauthinitform.php:62
+#. TRANS: Button text for starting Yammer authentication.
+#: lib/yammerauthinitform.php:64
+msgctxt "BUTTON"
 msgid "Start authentication"
 msgstr ""
 
-#: lib/yammerauthinitform.php:62
-msgid "Request authorization to connect to Yammer account"
+#. TRANS: Button title for starting Yammer authentication.
+#: lib/yammerauthinitform.php:66
+msgid "Request authorization to connect to a Yammer account."
 msgstr ""
 
-#: lib/yammerauthinitform.php:63
+#. TRANS: Button text for starting changing a Yammer API key.
+#: lib/yammerauthinitform.php:68
+msgctxt "BUTTON"
 msgid "Change API key"
 msgstr ""
 
-#: lib/yammerprogressform.php:63
+#. TRANS: Server exception thrown if a Yammer authentication request is already present.
+#: lib/yammerrunner.php:127
+msgid "Cannot request Yammer auth; already there!"
+msgstr ""
+
+#. TRANS: Server exception thrown when requesting a Yammer authentication URL while in an incorrect state.
+#: lib/yammerrunner.php:154
+msgid "Cannot get Yammer auth URL when not in requesting-auth state!"
+msgstr ""
+
+#. TRANS: Exeption thrown when an external Yammer system gives an error.
+#. TRANS: %1$s is an HTTP error code, %2$s is the error message body.
+#: lib/sn_yammerclient.php:74
+#, php-format
+msgid "Yammer API returned HTTP code %1$s: %2$s"
+msgstr ""
+
+#. TRANS: Exeption thrown when an external Yammer system an invalid JSON response.
+#: lib/sn_yammerclient.php:114
+msgid "Invalid JSON response from Yammer API."
+msgstr ""
+
+#. TRANS: Exeption thrown when a trust relationship has already been established.
+#: lib/sn_yammerclient.php:169
+msgid "Requesting a token, but already set up with a token."
+msgstr ""
+
+#. TRANS: Field label for a Yammer import initialise step.
+#: lib/yammerprogressform.php:64
 msgid "Initialize"
 msgstr ""
 
-#: lib/yammerprogressform.php:64
+#. TRANS: "In progress" description.
+#: lib/yammerprogressform.php:66
 msgid "No import running"
 msgstr ""
 
-#: lib/yammerprogressform.php:65
+#. TRANS: "Complete" description for initialize state.
+#: lib/yammerprogressform.php:68
 msgid "Initiated Yammer server connection..."
 msgstr ""
 
-#: lib/yammerprogressform.php:69
+#. TRANS: "In progress" description.
+#: lib/yammerprogressform.php:74
 msgid "Awaiting authorization..."
 msgstr ""
 
-#: lib/yammerprogressform.php:70
+#. TRANS: "Complete" description for connect state.
+#: lib/yammerprogressform.php:76
 msgid "Connected."
 msgstr ""
 
-#: lib/yammerprogressform.php:73
+#. TRANS: Field label for a Yammer user import users step.
+#: lib/yammerprogressform.php:80
 msgid "Import user accounts"
 msgstr ""
 
-#: lib/yammerprogressform.php:74
+#. TRANS: "In progress" description.
+#. TRANS: %d is the number of users to be imported.
+#: lib/yammerprogressform.php:83
 #, php-format
 msgid "Importing %d user..."
 msgid_plural "Importing %d users..."
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/yammerprogressform.php:75
+#. TRANS: "Complete" description for step.
+#. TRANS: %d is the number of users imported.
+#: lib/yammerprogressform.php:89
 #, php-format
 msgid "Imported %d user."
 msgid_plural "Imported %d users."
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/yammerprogressform.php:78
+#. TRANS: Field label for a Yammer group import step.
+#: lib/yammerprogressform.php:96
 msgid "Import user groups"
 msgstr ""
 
-#: lib/yammerprogressform.php:79
+#. TRANS: "In progress" description.
+#. TRANS: %d is the number of groups to be imported.
+#: lib/yammerprogressform.php:99
 #, php-format
 msgid "Importing %d group..."
 msgid_plural "Importing %d groups..."
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/yammerprogressform.php:80
+#. TRANS: "Complete" description for step.
+#. TRANS: %d is the number of groups imported.
+#: lib/yammerprogressform.php:105
 #, php-format
 msgid "Imported %d group."
 msgid_plural "Imported %d groups."
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/yammerprogressform.php:83
+#. TRANS: Field label for a Yammer import prepare notices step.
+#: lib/yammerprogressform.php:112
 msgid "Prepare public notices for import"
 msgstr ""
 
-#: lib/yammerprogressform.php:84
+#. TRANS: "In progress" description.
+#. TRANS: %d is the number of notices to be prepared for import.
+#: lib/yammerprogressform.php:115
 #, php-format
 msgid "Preparing %d notice..."
 msgid_plural "Preparing %d notices..."
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/yammerprogressform.php:85
+#. TRANS: "Complete" description for step.
+#. TRANS: %d is the number of notices prepared for import.
+#: lib/yammerprogressform.php:121
 #, php-format
 msgid "Prepared %d notice."
 msgid_plural "Prepared %d notices."
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/yammerprogressform.php:88
+#. TRANS: Field label for a Yammer import notices step.
+#: lib/yammerprogressform.php:128
 msgid "Import public notices"
 msgstr ""
 
-#: lib/yammerprogressform.php:89
+#. TRANS: "In progress" description.
+#. TRANS: %d is the number of notices to be imported.
+#: lib/yammerprogressform.php:131
 #, php-format
 msgid "Importing %d notice..."
 msgid_plural "Importing %d notices..."
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/yammerprogressform.php:90
+#. TRANS: "Complete" description for step.
+#. TRANS: %d is the number of notices imported.
+#: lib/yammerprogressform.php:137
 #, php-format
 msgid "Imported %d notice."
 msgid_plural "Imported %d notices."
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/yammerprogressform.php:93
+#. TRANS: Field label for a Yammer import done step.
+#: lib/yammerprogressform.php:144
 msgid "Done"
 msgstr ""
 
-#: lib/yammerprogressform.php:94 lib/yammerprogressform.php:95
+#. TRANS: "In progress" description for done step.
+#. TRANS: "Complete" description for done step.
+#: lib/yammerprogressform.php:146 lib/yammerprogressform.php:148
 msgid "Import is complete!"
 msgstr ""
 
-#: lib/yammerprogressform.php:108
+#. TRANS: Fieldset legend.
+#: lib/yammerprogressform.php:162
 msgid "Import status"
 msgstr ""
 
-#: lib/yammerprogressform.php:132
+#. TRANS: Progress bar status.
+#: lib/yammerprogressform.php:187
 msgid "Waiting..."
 msgstr ""
 
-#: lib/yammerprogressform.php:146
+#. TRANS: Button text for resetting the import state.
+#: lib/yammerprogressform.php:202
 msgid "Reset import state"
 msgstr ""
 
-#: lib/yammerprogressform.php:151
+#. TRANS: Button text for pausing an import.
+#: lib/yammerprogressform.php:208
 msgid "Pause import"
 msgstr ""
 
-#: lib/yammerprogressform.php:160
+#. TRANS: Error message. %s are the error details.
+#: lib/yammerprogressform.php:218
 #, php-format
-msgid "Encountered error \"%s\""
+msgid "Encountered error \"%s\"."
 msgstr ""
 
-#: lib/yammerprogressform.php:162
+#. TRANS: Fieldset legend for a paused import.
+#: lib/yammerprogressform.php:221
 msgid "Paused"
 msgstr ""
 
-#: lib/yammerprogressform.php:164 lib/yammerauthverifyform.php:98
+#. TRANS: Button text for continuing a paused import.
+#: lib/yammerprogressform.php:224
 msgid "Continue"
 msgstr ""
 
-#: lib/yammerprogressform.php:165
+#. TRANS: Button text for aborting a paused import.
+#: lib/yammerprogressform.php:226
 msgid "Abort import"
 msgstr ""
 
-#: lib/yammerauthverifyform.php:72
+#. TRANS: Form instructions.
+#: lib/yammerauthverifyform.php:74
 msgid ""
 "Follow this link to confirm authorization at Yammer; you will be prompted to "
 "log in if necessary:"
 msgstr ""
 
-#: lib/yammerauthverifyform.php:87
+#. TRANS: Link description for a link in an external Yammer system.
+#: lib/yammerauthverifyform.php:90
 msgid "Open Yammer authentication window"
 msgstr ""
 
-#: lib/yammerauthverifyform.php:90
+#. TRANS: Form instructions.
+#: lib/yammerauthverifyform.php:94
 msgid "Copy the verification code you are given below:"
 msgstr ""
 
-#: lib/yammerauthverifyform.php:94
+#. TRANS: Field label.
+#: lib/yammerauthverifyform.php:99
 msgid "Verification code:"
 msgstr ""
 
-#: lib/yammerauthverifyform.php:98
-msgid "Save code and begin import"
+#. TRANS: Button text for saving  Yammer authorisation data and starting Yammer import.
+#: lib/yammerauthverifyform.php:104
+msgctxt "BUTTON"
+msgid "Continue"
 msgstr ""
 
-#: lib/yammerapikeyform.php:56
+#. TRANS: Button title for saving  Yammer authorisation data and starting Yammer import.
+#: lib/yammerauthverifyform.php:106
+msgid "Save the verification code and begin import."
+msgstr ""
+
+#. TRANS: Form legend for adding details to connect to a remote Yammer API.
+#: lib/yammerapikeyform.php:57
 msgid "Yammer API registration"
 msgstr ""
 
-#: lib/yammerapikeyform.php:72
+#. TRANS: Explanation of what needs to be done to connect to a Yammer network.
+#: lib/yammerapikeyform.php:74
 msgid ""
 "Before we can connect to your Yammer network, you will need to register the "
 "importer as an application authorized to pull data on your behalf. This "
@@ -239,26 +360,33 @@ msgid ""
 "register the app at Yammer; you will be prompted to log in if necessary:"
 msgstr ""
 
-#: lib/yammerapikeyform.php:84
+#. TRANS: Link description to a Yammer application registration form.
+#: lib/yammerapikeyform.php:87
 msgid "Open Yammer application registration form"
 msgstr ""
 
-#: lib/yammerapikeyform.php:87
+#. TRANS: Instructions.
+#: lib/yammerapikeyform.php:91
 msgid "Copy the consumer key and secret you are given into the form below:"
 msgstr ""
 
-#: lib/yammerapikeyform.php:91
+#. TRANS: Field label for a Yammer consumer key.
+#: lib/yammerapikeyform.php:96
 msgid "Consumer key:"
 msgstr ""
 
-#: lib/yammerapikeyform.php:94
+#. TRANS: Field label for a Yammer consumer secret.
+#: lib/yammerapikeyform.php:100
 msgid "Consumer secret:"
 msgstr ""
 
-#: lib/yammerapikeyform.php:98
+#. TRANS: Button text for saving a Yammer API registration.
+#: lib/yammerapikeyform.php:105
+msgctxt "BUTTON"
 msgid "Save"
 msgstr ""
 
-#: lib/yammerapikeyform.php:98
-msgid "Save these consumer keys"
+#. TRANS: Button title for saving a Yammer API registration.
+#: lib/yammerapikeyform.php:107
+msgid "Save the entered consumer key and consumer secret."
 msgstr ""
diff --git a/plugins/YammerImport/locale/br/LC_MESSAGES/YammerImport.po b/plugins/YammerImport/locale/br/LC_MESSAGES/YammerImport.po
index 31595d7b79..84863158dd 100644
--- a/plugins/YammerImport/locale/br/LC_MESSAGES/YammerImport.po
+++ b/plugins/YammerImport/locale/br/LC_MESSAGES/YammerImport.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - YammerImport to Breton (Brezhoneg)
+# Translation of StatusNet - YammerImport to Breton (brezhoneg)
 # Exported from translatewiki.net
 #
 # Author: Fulup
@@ -10,24 +10,30 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - YammerImport\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:52:00+0000\n"
-"Language-Team: Breton <http://translatewiki.net/wiki/Portal:br>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:33+0000\n"
+"Language-Team: Breton <https://translatewiki.net/wiki/Portal:br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:56+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-12-03 13:51:41+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-yammerimport\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#. TRANS: Page title for Yammer administration panel.
+#. TRANS: Form legend.
+#. TRANS: Field label for a Yammer import connect step.
+#. TRANS: Form legend.
 msgid "Connect to Yammer"
 msgstr "Kevreañ da Yammer"
 
+#. TRANS: Page title for Yammer import administration panel.
 msgid "Yammer Import"
 msgstr "Enporzh Yammer"
 
+#. TRANS: Instructions for Yammer import administration panel.
 msgid ""
 "This Yammer import tool is still undergoing testing, and is incomplete in "
 "some areas. Currently user subscriptions and group memberships are not "
@@ -40,141 +46,237 @@ msgstr ""
 "bezañ en amzer da zont evit an enporzhiadennoù sevenet gant ar verourien "
 "aotreet eus tu YAMMER."
 
+#. TRANS: Error message about an import job being paused from the admin panel.
 msgid "Paused from admin panel."
 msgstr "Ehanet adalek ar banell verañ."
 
+#. TRANS: Client exception thrown when encountering an unhandled sub action.
+msgid "Invalid POST"
+msgstr ""
+
+#. TRANS: Page title for Yammer import administration panel.
 msgid "Yammer import"
 msgstr "Enporzh Yammer"
 
+#. TRANS: Menu item for Yammer import.
+#, fuzzy
+msgctxt "MENU"
 msgid "Yammer"
 msgstr "Yammer"
 
+#. TRANS: Menu item title for Yammer import.
+#, fuzzy
+msgid "Yammer import module."
+msgstr "Enporzh Yammer"
+
+#. TRANS: Exception thrown when a non-user item type is used, but expected.
+msgid "Wrong item type sent to Yammer user import processing."
+msgstr ""
+
+#. TRANS: Used as a prefix for the Yammer expertise field contents.
 msgid "Expertise:"
 msgstr "Prizacha :"
 
+#. TRANS: Exception thrown when a non-group item type is used, but expected.
+msgid "Wrong item type sent to Yammer group import processing."
+msgstr ""
+
+#. TRANS: Exception thrown when a non-message item type is used, but expected.
+msgid "Wrong item type sent to Yammer message import processing."
+msgstr ""
+
+#. TRANS: Server exception thrown when an avatar URL is invalid.
+#. TRANS: %s is the invalid avatar URL.
 #, php-format
 msgid "Invalid avatar URL %s."
 msgstr "Direizh eo URL an avatar %s."
 
+#. TRANS: Server exception thrown when an avatar could not be fetched.
+#. TRANS: %s is the failed avatar URL.
 #, php-format
 msgid "Unable to fetch avatar from %s."
 msgstr "Dibosupl eo adtapout an avatar adalek %s."
 
+#. TRANS: Button text for starting Yammer authentication.
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Start authentication"
+msgstr "Digeriñ prenestr emzisklêriañ Yammer"
+
+#. TRANS: Button title for starting Yammer authentication.
+msgid "Request authorization to connect to a Yammer account."
 msgstr ""
 
-msgid "Request authorization to connect to Yammer account"
-msgstr ""
-
+#. TRANS: Button text for starting changing a Yammer API key.
+msgctxt "BUTTON"
 msgid "Change API key"
 msgstr ""
 
+#. TRANS: Server exception thrown if a Yammer authentication request is already present.
+msgid "Cannot request Yammer auth; already there!"
+msgstr ""
+
+#. TRANS: Server exception thrown when requesting a Yammer authentication URL while in an incorrect state.
+msgid "Cannot get Yammer auth URL when not in requesting-auth state!"
+msgstr ""
+
+#. TRANS: Exeption thrown when an external Yammer system gives an error.
+#. TRANS: %1$s is an HTTP error code, %2$s is the error message body.
+#, php-format
+msgid "Yammer API returned HTTP code %1$s: %2$s"
+msgstr ""
+
+#. TRANS: Exeption thrown when an external Yammer system an invalid JSON response.
+msgid "Invalid JSON response from Yammer API."
+msgstr ""
+
+#. TRANS: Exeption thrown when a trust relationship has already been established.
+msgid "Requesting a token, but already set up with a token."
+msgstr ""
+
+#. TRANS: Field label for a Yammer import initialise step.
 msgid "Initialize"
 msgstr "Deraouekaat"
 
+#. TRANS: "In progress" description.
 msgid "No import running"
 msgstr "Enporzhiadenn ebet o treiñ"
 
+#. TRANS: "Complete" description for initialize state.
 msgid "Initiated Yammer server connection..."
 msgstr "Loc'het ar gevreadenn d'ar servijer Yammer"
 
+#. TRANS: "In progress" description.
 msgid "Awaiting authorization..."
 msgstr "O c'hortoz an aotre..."
 
+#. TRANS: "Complete" description for connect state.
 msgid "Connected."
 msgstr "Kevreet."
 
+#. TRANS: Field label for a Yammer user import users step.
 msgid "Import user accounts"
 msgstr "Enporzhiañ ar c'hontoù implijer"
 
+#. TRANS: "In progress" description.
+#. TRANS: %d is the number of users to be imported.
 #, php-format
 msgid "Importing %d user..."
 msgid_plural "Importing %d users..."
 msgstr[0] "Oc'h enporzhiañ %d implijer..."
 msgstr[1] "Oc'h enporzhiañ %d implijer..."
 
+#. TRANS: "Complete" description for step.
+#. TRANS: %d is the number of users imported.
 #, php-format
 msgid "Imported %d user."
 msgid_plural "Imported %d users."
 msgstr[0] "Enporzhiet %d implijer."
 msgstr[1] "Enporzhiet %d implijer."
 
+#. TRANS: Field label for a Yammer group import step.
 msgid "Import user groups"
 msgstr "Enporzhiañ strolladoù implijer"
 
+#. TRANS: "In progress" description.
+#. TRANS: %d is the number of groups to be imported.
 #, php-format
 msgid "Importing %d group..."
 msgid_plural "Importing %d groups..."
 msgstr[0] "Oc'h enporzhiañ %d strollad..."
 msgstr[1] "Oc'h enporzhiañ %d strollad..."
 
+#. TRANS: "Complete" description for step.
+#. TRANS: %d is the number of groups imported.
 #, php-format
 msgid "Imported %d group."
 msgid_plural "Imported %d groups."
 msgstr[0] "Enporzhiet %d strollad..."
 msgstr[1] "Enporzhiet %d strollad..."
 
+#. TRANS: Field label for a Yammer import prepare notices step.
 msgid "Prepare public notices for import"
 msgstr "O prientiñ enporzh ar c'hemennoù foran"
 
+#. TRANS: "In progress" description.
+#. TRANS: %d is the number of notices to be prepared for import.
 #, php-format
 msgid "Preparing %d notice..."
 msgid_plural "Preparing %d notices..."
 msgstr[0] "O prientiñ %d kemenn..."
 msgstr[1] "O prientiñ %d kemenn..."
 
+#. TRANS: "Complete" description for step.
+#. TRANS: %d is the number of notices prepared for import.
 #, php-format
 msgid "Prepared %d notice."
 msgid_plural "Prepared %d notices."
 msgstr[0] "Prientet %d kemenn."
 msgstr[1] "Prientet %d kemenn."
 
+#. TRANS: Field label for a Yammer import notices step.
 msgid "Import public notices"
 msgstr "Enporzh kemennoù foran"
 
+#. TRANS: "In progress" description.
+#. TRANS: %d is the number of notices to be imported.
 #, php-format
 msgid "Importing %d notice..."
 msgid_plural "Importing %d notices..."
 msgstr[0] "Oc'h enporzhiañ %d kemenn..."
 msgstr[1] "Oc'h enporzhiañ %d kemenn..."
 
+#. TRANS: "Complete" description for step.
+#. TRANS: %d is the number of notices imported.
 #, php-format
 msgid "Imported %d notice."
 msgid_plural "Imported %d notices."
 msgstr[0] "Enporzhiet %d kemenn."
 msgstr[1] "Enporzhiet %d kemenn."
 
+#. TRANS: Field label for a Yammer import done step.
 msgid "Done"
 msgstr "Graet"
 
+#. TRANS: "In progress" description for done step.
+#. TRANS: "Complete" description for done step.
 msgid "Import is complete!"
 msgstr "Enporzh kaset da benn vat !"
 
+#. TRANS: Fieldset legend.
 msgid "Import status"
 msgstr "Stad an enporzh"
 
+#. TRANS: Progress bar status.
 msgid "Waiting..."
 msgstr "O c'hortoz..."
 
+#. TRANS: Button text for resetting the import state.
 msgid "Reset import state"
 msgstr "Adderaouekaat stad an enporzh"
 
+#. TRANS: Button text for pausing an import.
 msgid "Pause import"
 msgstr "Ober un tamm ehan gant an enporzh"
 
+#. TRANS: Error message. %s are the error details.
 #, php-format
-msgid "Encountered error \"%s\""
-msgstr "C'hoarvezet eo ar fazi \"%s\""
+msgid "Encountered error \"%s\"."
+msgstr "C'hoarvezet eo ar fazi \"%s\"."
 
+#. TRANS: Fieldset legend for a paused import.
 msgid "Paused"
 msgstr "Ehanet"
 
+#. TRANS: Button text for continuing a paused import.
 msgid "Continue"
 msgstr "Kenderc'hel"
 
+#. TRANS: Button text for aborting a paused import.
 msgid "Abort import"
 msgstr "Nullañ an enporzh"
 
+#. TRANS: Form instructions.
 msgid ""
 "Follow this link to confirm authorization at Yammer; you will be prompted to "
 "log in if necessary:"
@@ -182,21 +284,33 @@ msgstr ""
 "Heuliañ al liamm-mañ da gadarnaat an aotre war Yammer ; mar bez ret e vo "
 "goulennet ouzhoc'h kevreañ :"
 
+#. TRANS: Link description for a link in an external Yammer system.
 msgid "Open Yammer authentication window"
 msgstr "Digeriñ prenestr emzisklêriañ Yammer"
 
+#. TRANS: Form instructions.
 msgid "Copy the verification code you are given below:"
 msgstr "Eilit a-is ar c'hod gwiriañ bet roet deoc'h :"
 
+#. TRANS: Field label.
 msgid "Verification code:"
 msgstr "Kod gwiriekaat :"
 
-msgid "Save code and begin import"
+#. TRANS: Button text for saving  Yammer authorisation data and starting Yammer import.
+msgctxt "BUTTON"
+msgid "Continue"
+msgstr "Kenderc'hel"
+
+#. TRANS: Button title for saving  Yammer authorisation data and starting Yammer import.
+#, fuzzy
+msgid "Save the verification code and begin import."
 msgstr "Enrollañ ar c'hod ha kregiñ da enporzhiañ"
 
+#. TRANS: Form legend for adding details to connect to a remote Yammer API.
 msgid "Yammer API registration"
 msgstr "Enrolladenn an API Yammer"
 
+#. TRANS: Explanation of what needs to be done to connect to a Yammer network.
 msgid ""
 "Before we can connect to your Yammer network, you will need to register the "
 "importer as an application authorized to pull data on your behalf. This "
@@ -209,21 +323,29 @@ msgstr ""
 "mañ evit enrollañ an arload war Yammer ; mar bez ret e vo goulennet ouzhoc'h "
 "kevreañ."
 
+#. TRANS: Link description to a Yammer application registration form.
 msgid "Open Yammer application registration form"
 msgstr "Digeriñ furmskrid enrollañ Yammer"
 
+#. TRANS: Instructions.
 msgid "Copy the consumer key and secret you are given into the form below:"
 msgstr ""
 "Eilit er furmskrid a-is an alc'hwez hag ar sekred implijer bet roet deoc'h :"
 
+#. TRANS: Field label for a Yammer consumer key.
 msgid "Consumer key:"
 msgstr "Alc'hwez implijer :"
 
+#. TRANS: Field label for a Yammer consumer secret.
 msgid "Consumer secret:"
 msgstr "Sekred an implijer :"
 
+#. TRANS: Button text for saving a Yammer API registration.
+msgctxt "BUTTON"
 msgid "Save"
 msgstr "Enrollañ"
 
-msgid "Save these consumer keys"
+#. TRANS: Button title for saving a Yammer API registration.
+#, fuzzy
+msgid "Save the entered consumer key and consumer secret."
 msgstr "Enrollañ an alc'hwezioù implijer-mañ"
diff --git a/plugins/YammerImport/locale/de/LC_MESSAGES/YammerImport.po b/plugins/YammerImport/locale/de/LC_MESSAGES/YammerImport.po
index f50cf7b773..de0e123cf6 100644
--- a/plugins/YammerImport/locale/de/LC_MESSAGES/YammerImport.po
+++ b/plugins/YammerImport/locale/de/LC_MESSAGES/YammerImport.po
@@ -4,6 +4,9 @@
 # Author: George Animal
 # Author: Giftpflanze
 # Author: Habi
+# Author: PtM
+# Author: Tiin
+# Author: Welathêja
 # --
 # This file is distributed under the same license as the StatusNet package.
 #
@@ -11,24 +14,30 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - YammerImport\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:52:00+0000\n"
-"Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:33+0000\n"
+"Language-Team: German <https://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:56+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-12-03 13:51:41+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-yammerimport\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Page title for Yammer administration panel.
+#. TRANS: Form legend.
+#. TRANS: Field label for a Yammer import connect step.
+#. TRANS: Form legend.
 msgid "Connect to Yammer"
 msgstr "Verbinden mit Yammer"
 
+#. TRANS: Page title for Yammer import administration panel.
 msgid "Yammer Import"
 msgstr "Yammer-Import"
 
+#. TRANS: Instructions for Yammer import administration panel.
 msgid ""
 "This Yammer import tool is still undergoing testing, and is incomplete in "
 "some areas. Currently user subscriptions and group memberships are not "
@@ -41,141 +50,236 @@ msgstr ""
 "Importe unterstützt werden, die von beglaubigten Administratoren auf Seiten "
 "von Yammer getätigt werden."
 
+#. TRANS: Error message about an import job being paused from the admin panel.
 msgid "Paused from admin panel."
 msgstr "Angehalten über das Admin-Panel."
 
+#. TRANS: Client exception thrown when encountering an unhandled sub action.
+msgid "Invalid POST"
+msgstr "Ungültiger POST"
+
+#. TRANS: Page title for Yammer import administration panel.
 msgid "Yammer import"
 msgstr "Yammer-Import"
 
+#. TRANS: Menu item for Yammer import.
+msgctxt "MENU"
 msgid "Yammer"
 msgstr "Yammer"
 
+#. TRANS: Menu item title for Yammer import.
+msgid "Yammer import module."
+msgstr "Yammer-Import-Modul"
+
+#. TRANS: Exception thrown when a non-user item type is used, but expected.
+msgid "Wrong item type sent to Yammer user import processing."
+msgstr "Falscher Itemtyp zu Yammers Benutzerimport-Verarbeitung gesendet."
+
+#. TRANS: Used as a prefix for the Yammer expertise field contents.
 msgid "Expertise:"
 msgstr "Expertise:"
 
+#. TRANS: Exception thrown when a non-group item type is used, but expected.
+msgid "Wrong item type sent to Yammer group import processing."
+msgstr "Falscher Itemtyp zu Yammers Gruppenimport-Verarbeitung gesendet."
+
+#. TRANS: Exception thrown when a non-message item type is used, but expected.
+msgid "Wrong item type sent to Yammer message import processing."
+msgstr "Falscher Itemtyp zu Yammers Nachrichtenimport-Verarbeitung gesendet."
+
+#. TRANS: Server exception thrown when an avatar URL is invalid.
+#. TRANS: %s is the invalid avatar URL.
 #, php-format
 msgid "Invalid avatar URL %s."
 msgstr "Ungültige Avatar-URL %s."
 
+#. TRANS: Server exception thrown when an avatar could not be fetched.
+#. TRANS: %s is the failed avatar URL.
 #, php-format
 msgid "Unable to fetch avatar from %s."
 msgstr "Kann Avatar nicht von %s holen."
 
+#. TRANS: Button text for starting Yammer authentication.
+msgctxt "BUTTON"
 msgid "Start authentication"
-msgstr "Starte Authentifikation"
+msgstr "Starte Authentifizierung"
 
-msgid "Request authorization to connect to Yammer account"
-msgstr "Beantrage Authentifizierung, um mit Yammerkonto zu verbinden"
+#. TRANS: Button title for starting Yammer authentication.
+msgid "Request authorization to connect to a Yammer account."
+msgstr "Beantrage Authentifizierung zur Verbindung mit einem Yammer-Account."
 
+#. TRANS: Button text for starting changing a Yammer API key.
+msgctxt "BUTTON"
 msgid "Change API key"
 msgstr "Ändere API-Schlüssel"
 
+#. TRANS: Server exception thrown if a Yammer authentication request is already present.
+msgid "Cannot request Yammer auth; already there!"
+msgstr "Kann Yammer-Auth. nicht beantragen; bereits vorhanden!"
+
+#. TRANS: Server exception thrown when requesting a Yammer authentication URL while in an incorrect state.
+msgid "Cannot get Yammer auth URL when not in requesting-auth state!"
+msgstr ""
+"Kann Yammers Auth.-URL nicht erhalten, wenn nicht im Auth.-Anforderungs-"
+"Modus!"
+
+#. TRANS: Exeption thrown when an external Yammer system gives an error.
+#. TRANS: %1$s is an HTTP error code, %2$s is the error message body.
+#, php-format
+msgid "Yammer API returned HTTP code %1$s: %2$s"
+msgstr "Yammer-API gab HTTP-Code %1$s: %2$s"
+
+#. TRANS: Exeption thrown when an external Yammer system an invalid JSON response.
+msgid "Invalid JSON response from Yammer API."
+msgstr "Ungültige JSON-Antwort vom Yammer-API."
+
+#. TRANS: Exeption thrown when a trust relationship has already been established.
+msgid "Requesting a token, but already set up with a token."
+msgstr "Ein Token anfordert, aber bereits mit einem Token ausgestattet."
+
+#. TRANS: Field label for a Yammer import initialise step.
 msgid "Initialize"
 msgstr "Initialisieren"
 
+#. TRANS: "In progress" description.
 msgid "No import running"
 msgstr "Zur Zeit kein Import"
 
+#. TRANS: "Complete" description for initialize state.
 msgid "Initiated Yammer server connection..."
 msgstr "Yammer-Server-Verbindung initiiert …"
 
+#. TRANS: "In progress" description.
 msgid "Awaiting authorization..."
 msgstr "Authentifizierung wird abgewartet …"
 
+#. TRANS: "Complete" description for connect state.
 msgid "Connected."
 msgstr "Verbunden."
 
+#. TRANS: Field label for a Yammer user import users step.
 msgid "Import user accounts"
 msgstr "Benutzerkonten importieren"
 
+#. TRANS: "In progress" description.
+#. TRANS: %d is the number of users to be imported.
 #, php-format
 msgid "Importing %d user..."
 msgid_plural "Importing %d users..."
 msgstr[0] "Importiere %d Benutzer …"
 msgstr[1] "Importiere %d Benutzer …"
 
+#. TRANS: "Complete" description for step.
+#. TRANS: %d is the number of users imported.
 #, php-format
 msgid "Imported %d user."
 msgid_plural "Imported %d users."
 msgstr[0] "Importierte %d Benutzer."
 msgstr[1] "Importierte %d Benutzer."
 
+#. TRANS: Field label for a Yammer group import step.
 msgid "Import user groups"
 msgstr "Importiere Benutzergruppen"
 
+#. TRANS: "In progress" description.
+#. TRANS: %d is the number of groups to be imported.
 #, php-format
 msgid "Importing %d group..."
 msgid_plural "Importing %d groups..."
 msgstr[0] "Importiere %d Gruppe …"
 msgstr[1] "Importiere %d Gruppen …"
 
+#. TRANS: "Complete" description for step.
+#. TRANS: %d is the number of groups imported.
 #, php-format
 msgid "Imported %d group."
 msgid_plural "Imported %d groups."
 msgstr[0] "Importierte %d Gruppe."
 msgstr[1] "Importierte %d Gruppen."
 
+#. TRANS: Field label for a Yammer import prepare notices step.
 msgid "Prepare public notices for import"
 msgstr "Bereite öffentliche Nachrichten für Import vor"
 
+#. TRANS: "In progress" description.
+#. TRANS: %d is the number of notices to be prepared for import.
 #, php-format
 msgid "Preparing %d notice..."
 msgid_plural "Preparing %d notices..."
 msgstr[0] "Bereite %d Nachricht vor …"
 msgstr[1] "Bereite %d Nachrichten vor …"
 
+#. TRANS: "Complete" description for step.
+#. TRANS: %d is the number of notices prepared for import.
 #, php-format
 msgid "Prepared %d notice."
 msgid_plural "Prepared %d notices."
 msgstr[0] "%d Nachricht vorbereitet."
 msgstr[1] "%d Nachrichten vorbereitet."
 
+#. TRANS: Field label for a Yammer import notices step.
 msgid "Import public notices"
 msgstr "Importiere öffentliche Nachrichten"
 
+#. TRANS: "In progress" description.
+#. TRANS: %d is the number of notices to be imported.
 #, php-format
 msgid "Importing %d notice..."
 msgid_plural "Importing %d notices..."
 msgstr[0] "Importiere %d Nachricht …"
 msgstr[1] "Importiere %d Nachrichten …"
 
+#. TRANS: "Complete" description for step.
+#. TRANS: %d is the number of notices imported.
 #, php-format
 msgid "Imported %d notice."
 msgid_plural "Imported %d notices."
 msgstr[0] "Importierte %d Nachricht."
 msgstr[1] "Importierte %d Nachrichten."
 
+#. TRANS: Field label for a Yammer import done step.
 msgid "Done"
 msgstr "Erledigt"
 
+#. TRANS: "In progress" description for done step.
+#. TRANS: "Complete" description for done step.
 msgid "Import is complete!"
 msgstr "Import abgeschlossen!"
 
+#. TRANS: Fieldset legend.
 msgid "Import status"
 msgstr "Import-Status"
 
+#. TRANS: Progress bar status.
 msgid "Waiting..."
 msgstr "Warten..."
 
+#. TRANS: Button text for resetting the import state.
 msgid "Reset import state"
 msgstr "Import-Status zurücksetzen"
 
+#. TRANS: Button text for pausing an import.
 msgid "Pause import"
 msgstr "Import pausieren"
 
+#. TRANS: Error message. %s are the error details.
 #, php-format
-msgid "Encountered error \"%s\""
-msgstr "Fehler \"%s\" ist aufgetreten"
+msgid "Encountered error \"%s\"."
+msgstr "Fehler aufgetreten: \"%s\"."
 
+#. TRANS: Fieldset legend for a paused import.
 msgid "Paused"
 msgstr "Angehalten"
 
+#. TRANS: Button text for continuing a paused import.
 msgid "Continue"
 msgstr "Fortfahren"
 
+#. TRANS: Button text for aborting a paused import.
 msgid "Abort import"
 msgstr "Import abbrechen"
 
+#. TRANS: Form instructions.
 msgid ""
 "Follow this link to confirm authorization at Yammer; you will be prompted to "
 "log in if necessary:"
@@ -183,21 +287,32 @@ msgstr ""
 "Folge diesem Link, um die Authentifikation bei Yammer zu bestätigen; "
 "nötigenfalls wirst du aufgefordert, dich anzumelden:"
 
+#. TRANS: Link description for a link in an external Yammer system.
 msgid "Open Yammer authentication window"
 msgstr "Öffne Yammer-Authentifizierungsfenster"
 
+#. TRANS: Form instructions.
 msgid "Copy the verification code you are given below:"
 msgstr "Kopiere den untenstehenden Bestätigungscode"
 
+#. TRANS: Field label.
 msgid "Verification code:"
 msgstr "Bestätigunts-Code:"
 
-msgid "Save code and begin import"
-msgstr "Speichere Code und starte Import"
+#. TRANS: Button text for saving  Yammer authorisation data and starting Yammer import.
+msgctxt "BUTTON"
+msgid "Continue"
+msgstr "Fortfahren"
 
+#. TRANS: Button title for saving  Yammer authorisation data and starting Yammer import.
+msgid "Save the verification code and begin import."
+msgstr "Speichere Bestätigungs-Code und starte Import."
+
+#. TRANS: Form legend for adding details to connect to a remote Yammer API.
 msgid "Yammer API registration"
 msgstr "Yammer-API-Registrierung"
 
+#. TRANS: Explanation of what needs to be done to connect to a Yammer network.
 msgid ""
 "Before we can connect to your Yammer network, you will need to register the "
 "importer as an application authorized to pull data on your behalf. This "
@@ -210,21 +325,28 @@ msgstr ""
 "Sie diesem Link, um diese Applikation bei Yammer zu registrieren; Sie werden "
 "gegebenenfalls aufgefordert, sich anzumelden:"
 
+#. TRANS: Link description to a Yammer application registration form.
 msgid "Open Yammer application registration form"
 msgstr "Öffne Yammer-Anwendungsregistrierungsformular"
 
+#. TRANS: Instructions.
 msgid "Copy the consumer key and secret you are given into the form below:"
 msgstr ""
 "Kopiere den Verbraucherschlüssel und das Geheimnis, beide untenstehend:"
 
+#. TRANS: Field label for a Yammer consumer key.
 msgid "Consumer key:"
 msgstr "Verbraucherschlüssel:"
 
+#. TRANS: Field label for a Yammer consumer secret.
 msgid "Consumer secret:"
 msgstr "Verbrauchergeheimnis:"
 
+#. TRANS: Button text for saving a Yammer API registration.
+msgctxt "BUTTON"
 msgid "Save"
 msgstr "Speichern"
 
-msgid "Save these consumer keys"
-msgstr "Speichere diese Verbraucherschlüssel"
+#. TRANS: Button title for saving a Yammer API registration.
+msgid "Save the entered consumer key and consumer secret."
+msgstr "Speichere eingegebenen Verbraucherschlüssel und Verbrauchergeheimnis."
diff --git a/plugins/YammerImport/locale/es/LC_MESSAGES/YammerImport.po b/plugins/YammerImport/locale/es/LC_MESSAGES/YammerImport.po
new file mode 100644
index 0000000000..50b21a461a
--- /dev/null
+++ b/plugins/YammerImport/locale/es/LC_MESSAGES/YammerImport.po
@@ -0,0 +1,352 @@
+# Translation of StatusNet - YammerImport to Spanish (español)
+# Exported from translatewiki.net
+#
+# Author: Armando-Martin
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - YammerImport\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:33+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-12-03 13:51:41+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Page title for Yammer administration panel.
+#. TRANS: Form legend.
+#. TRANS: Field label for a Yammer import connect step.
+#. TRANS: Form legend.
+msgid "Connect to Yammer"
+msgstr "Conectarse a Yammer"
+
+#. TRANS: Page title for Yammer import administration panel.
+msgid "Yammer Import"
+msgstr "Importación Yammer"
+
+#. TRANS: Instructions for Yammer import administration panel.
+msgid ""
+"This Yammer import tool is still undergoing testing, and is incomplete in "
+"some areas. Currently user subscriptions and group memberships are not "
+"transferred; in the future this may be supported for imports done by "
+"verified administrators on the Yammer side."
+msgstr ""
+"Esta herramienta de importación de Yammer aún está sometida a pruebas y está "
+"incompleta en algunas áreas. Actualmente no se transfieren las suscripciones "
+"de usuario y la pertenencia a grupos; en el futuro esto puede estar "
+"soportado para las importaciones realizadas por los administradores "
+"verificados del lado de Yammer."
+
+#. TRANS: Error message about an import job being paused from the admin panel.
+msgid "Paused from admin panel."
+msgstr "En pausa desde el panel de administración."
+
+#. TRANS: Client exception thrown when encountering an unhandled sub action.
+msgid "Invalid POST"
+msgstr "POST no válido"
+
+#. TRANS: Page title for Yammer import administration panel.
+msgid "Yammer import"
+msgstr "Importación Yammer"
+
+#. TRANS: Menu item for Yammer import.
+msgctxt "MENU"
+msgid "Yammer"
+msgstr "Yammer"
+
+#. TRANS: Menu item title for Yammer import.
+msgid "Yammer import module."
+msgstr "Módulo de importación Yammer."
+
+#. TRANS: Exception thrown when a non-user item type is used, but expected.
+msgid "Wrong item type sent to Yammer user import processing."
+msgstr ""
+"Tipo de elemento incorrecto enviado para el proceso de importación de "
+"usuarios de Yammer."
+
+#. TRANS: Used as a prefix for the Yammer expertise field contents.
+msgid "Expertise:"
+msgstr "Experiencia:"
+
+#. TRANS: Exception thrown when a non-group item type is used, but expected.
+msgid "Wrong item type sent to Yammer group import processing."
+msgstr ""
+"Tipo de elemento incorrecto enviado para el proceso de importación de grupos "
+"de Yammer."
+
+#. TRANS: Exception thrown when a non-message item type is used, but expected.
+msgid "Wrong item type sent to Yammer message import processing."
+msgstr ""
+"Tipo de elemento incorrecto enviado para el proceso de importación de "
+"mensajes de Yammer."
+
+#. TRANS: Server exception thrown when an avatar URL is invalid.
+#. TRANS: %s is the invalid avatar URL.
+#, php-format
+msgid "Invalid avatar URL %s."
+msgstr "La dirección URL del avatar, %s, es incorrecta."
+
+#. TRANS: Server exception thrown when an avatar could not be fetched.
+#. TRANS: %s is the failed avatar URL.
+#, php-format
+msgid "Unable to fetch avatar from %s."
+msgstr "No se pudo recuperar el avatar desde %s."
+
+#. TRANS: Button text for starting Yammer authentication.
+msgctxt "BUTTON"
+msgid "Start authentication"
+msgstr "Iniciar la autenticación"
+
+#. TRANS: Button title for starting Yammer authentication.
+msgid "Request authorization to connect to a Yammer account."
+msgstr "Solicitar autorización para conectarse a una cuenta de Yammer."
+
+#. TRANS: Button text for starting changing a Yammer API key.
+msgctxt "BUTTON"
+msgid "Change API key"
+msgstr "Cambiar la clave de la API"
+
+#. TRANS: Server exception thrown if a Yammer authentication request is already present.
+msgid "Cannot request Yammer auth; already there!"
+msgstr "No puede solicitar la autenticación Yammer; ¡ya lo hizo!"
+
+#. TRANS: Server exception thrown when requesting a Yammer authentication URL while in an incorrect state.
+msgid "Cannot get Yammer auth URL when not in requesting-auth state!"
+msgstr ""
+"¡No puede obtener la dirección URL de autenticación Yammer cuando no está en "
+"modo de solicitud de autenticación!"
+
+#. TRANS: Exeption thrown when an external Yammer system gives an error.
+#. TRANS: %1$s is an HTTP error code, %2$s is the error message body.
+#, php-format
+msgid "Yammer API returned HTTP code %1$s: %2$s"
+msgstr "La API de Yammer ha devuelto el código HTTP %1$s: %2$s"
+
+#. TRANS: Exeption thrown when an external Yammer system an invalid JSON response.
+msgid "Invalid JSON response from Yammer API."
+msgstr "Respuesta JSON inválida desde la API de Yammer."
+
+#. TRANS: Exeption thrown when a trust relationship has already been established.
+msgid "Requesting a token, but already set up with a token."
+msgstr "Solicitando una clave (token), pero ya está configurado con una clave."
+
+#. TRANS: Field label for a Yammer import initialise step.
+msgid "Initialize"
+msgstr "Inicializar"
+
+#. TRANS: "In progress" description.
+msgid "No import running"
+msgstr "No hay ninguna importación en curso"
+
+#. TRANS: "Complete" description for initialize state.
+msgid "Initiated Yammer server connection..."
+msgstr "Conexión al servidor de Yammer iniciada..."
+
+#. TRANS: "In progress" description.
+msgid "Awaiting authorization..."
+msgstr "A la espera de autorización..."
+
+#. TRANS: "Complete" description for connect state.
+msgid "Connected."
+msgstr "Conectado."
+
+#. TRANS: Field label for a Yammer user import users step.
+msgid "Import user accounts"
+msgstr "Importar cuentas de usuario"
+
+#. TRANS: "In progress" description.
+#. TRANS: %d is the number of users to be imported.
+#, php-format
+msgid "Importing %d user..."
+msgid_plural "Importing %d users..."
+msgstr[0] "Importando %d usuario..."
+msgstr[1] "Importando %d usuarios..."
+
+#. TRANS: "Complete" description for step.
+#. TRANS: %d is the number of users imported.
+#, php-format
+msgid "Imported %d user."
+msgid_plural "Imported %d users."
+msgstr[0] "%d usuario importado."
+msgstr[1] "%d usuarios importados."
+
+#. TRANS: Field label for a Yammer group import step.
+msgid "Import user groups"
+msgstr "Importar grupos de usuario"
+
+#. TRANS: "In progress" description.
+#. TRANS: %d is the number of groups to be imported.
+#, php-format
+msgid "Importing %d group..."
+msgid_plural "Importing %d groups..."
+msgstr[0] "Importando %d grupo..."
+msgstr[1] "Importando %d grupos..."
+
+#. TRANS: "Complete" description for step.
+#. TRANS: %d is the number of groups imported.
+#, php-format
+msgid "Imported %d group."
+msgid_plural "Imported %d groups."
+msgstr[0] "%d grupo importado."
+msgstr[1] "%d grupos importados."
+
+#. TRANS: Field label for a Yammer import prepare notices step.
+msgid "Prepare public notices for import"
+msgstr "Preparar notas públicas para importación"
+
+#. TRANS: "In progress" description.
+#. TRANS: %d is the number of notices to be prepared for import.
+#, php-format
+msgid "Preparing %d notice..."
+msgid_plural "Preparing %d notices..."
+msgstr[0] "Preparando %d nota..."
+msgstr[1] "Preparando %d notas..."
+
+#. TRANS: "Complete" description for step.
+#. TRANS: %d is the number of notices prepared for import.
+#, php-format
+msgid "Prepared %d notice."
+msgid_plural "Prepared %d notices."
+msgstr[0] "%d nota preparada."
+msgstr[1] "%d notas preparadas."
+
+#. TRANS: Field label for a Yammer import notices step.
+msgid "Import public notices"
+msgstr "Importar notas públicas"
+
+#. TRANS: "In progress" description.
+#. TRANS: %d is the number of notices to be imported.
+#, php-format
+msgid "Importing %d notice..."
+msgid_plural "Importing %d notices..."
+msgstr[0] "Importando %d nota..."
+msgstr[1] "Importando %d notas..."
+
+#. TRANS: "Complete" description for step.
+#. TRANS: %d is the number of notices imported.
+#, php-format
+msgid "Imported %d notice."
+msgid_plural "Imported %d notices."
+msgstr[0] "%d nota importada."
+msgstr[1] "%d notas importadas."
+
+#. TRANS: Field label for a Yammer import done step.
+msgid "Done"
+msgstr "Hecho"
+
+#. TRANS: "In progress" description for done step.
+#. TRANS: "Complete" description for done step.
+msgid "Import is complete!"
+msgstr "¡La importación se ha completado!"
+
+#. TRANS: Fieldset legend.
+msgid "Import status"
+msgstr "Estado de importación"
+
+#. TRANS: Progress bar status.
+msgid "Waiting..."
+msgstr "Esperando..."
+
+#. TRANS: Button text for resetting the import state.
+msgid "Reset import state"
+msgstr "Reiniciar el estado de la importación"
+
+#. TRANS: Button text for pausing an import.
+msgid "Pause import"
+msgstr "Pausar la importación"
+
+#. TRANS: Error message. %s are the error details.
+#, php-format
+msgid "Encountered error \"%s\"."
+msgstr "Se ha encontrado el error \"%s\"."
+
+#. TRANS: Fieldset legend for a paused import.
+msgid "Paused"
+msgstr "En pausa"
+
+#. TRANS: Button text for continuing a paused import.
+msgid "Continue"
+msgstr "Continuar"
+
+#. TRANS: Button text for aborting a paused import.
+msgid "Abort import"
+msgstr "Anular la importación"
+
+#. TRANS: Form instructions.
+msgid ""
+"Follow this link to confirm authorization at Yammer; you will be prompted to "
+"log in if necessary:"
+msgstr ""
+"Siga este enlace para confirmar la autorización en Yammer; se le pedirá que "
+"inicie sesión si es necesario:"
+
+#. TRANS: Link description for a link in an external Yammer system.
+msgid "Open Yammer authentication window"
+msgstr "Abrir la ventana de autenticación Yammer"
+
+#. TRANS: Form instructions.
+msgid "Copy the verification code you are given below:"
+msgstr "Copie a continuación el código de verificación que ha obtenido:"
+
+#. TRANS: Field label.
+msgid "Verification code:"
+msgstr "Código de verificación:"
+
+#. TRANS: Button text for saving  Yammer authorisation data and starting Yammer import.
+msgctxt "BUTTON"
+msgid "Continue"
+msgstr "Continuar"
+
+#. TRANS: Button title for saving  Yammer authorisation data and starting Yammer import.
+msgid "Save the verification code and begin import."
+msgstr "Guardar el código de verificación y empezar a importar."
+
+#. TRANS: Form legend for adding details to connect to a remote Yammer API.
+msgid "Yammer API registration"
+msgstr "Registro de la API de Yammer"
+
+#. TRANS: Explanation of what needs to be done to connect to a Yammer network.
+msgid ""
+"Before we can connect to your Yammer network, you will need to register the "
+"importer as an application authorized to pull data on your behalf. This "
+"registration will work only for your own network. Follow this link to "
+"register the app at Yammer; you will be prompted to log in if necessary:"
+msgstr ""
+"Antes de que nos podemos conectar a su red de Yammer, necesita registrar el "
+"importador con una solicitud de autorización para que podamos extraer datos "
+"en su nombre. Este registro funcionará sólo en su propia red. Siga este "
+"enlace para registrar la aplicación en Yammer; se le pedirá que inicie "
+"sesión si es necesario:"
+
+#. TRANS: Link description to a Yammer application registration form.
+msgid "Open Yammer application registration form"
+msgstr "Abrir el formulario de registro de la aplicación de Yammer"
+
+#. TRANS: Instructions.
+msgid "Copy the consumer key and secret you are given into the form below:"
+msgstr ""
+"Copie  en el siguiente formulario la clave de consumidor y la frase secreta "
+"que recibió:"
+
+#. TRANS: Field label for a Yammer consumer key.
+msgid "Consumer key:"
+msgstr "Clave de consumidor:"
+
+#. TRANS: Field label for a Yammer consumer secret.
+msgid "Consumer secret:"
+msgstr "Frase secreta del consumidor:"
+
+#. TRANS: Button text for saving a Yammer API registration.
+msgctxt "BUTTON"
+msgid "Save"
+msgstr "Guardar"
+
+#. TRANS: Button title for saving a Yammer API registration.
+msgid "Save the entered consumer key and consumer secret."
+msgstr ""
+"Guarde la clave de consumidor introducida y la frase secreta del consumidor."
diff --git a/plugins/YammerImport/locale/eu/LC_MESSAGES/YammerImport.po b/plugins/YammerImport/locale/eu/LC_MESSAGES/YammerImport.po
new file mode 100644
index 0000000000..8955645ba5
--- /dev/null
+++ b/plugins/YammerImport/locale/eu/LC_MESSAGES/YammerImport.po
@@ -0,0 +1,329 @@
+# Translation of StatusNet - YammerImport to Basque (euskara)
+# Exported from translatewiki.net
+#
+# Author: Artsuaga
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - YammerImport\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:33+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-12-03 13:51:41+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Page title for Yammer administration panel.
+#. TRANS: Form legend.
+#. TRANS: Field label for a Yammer import connect step.
+#. TRANS: Form legend.
+msgid "Connect to Yammer"
+msgstr "Yammerrera konektatu"
+
+#. TRANS: Page title for Yammer import administration panel.
+msgid "Yammer Import"
+msgstr "Yammer Inportazioa"
+
+#. TRANS: Instructions for Yammer import administration panel.
+msgid ""
+"This Yammer import tool is still undergoing testing, and is incomplete in "
+"some areas. Currently user subscriptions and group memberships are not "
+"transferred; in the future this may be supported for imports done by "
+"verified administrators on the Yammer side."
+msgstr ""
+
+#. TRANS: Error message about an import job being paused from the admin panel.
+msgid "Paused from admin panel."
+msgstr ""
+
+#. TRANS: Client exception thrown when encountering an unhandled sub action.
+msgid "Invalid POST"
+msgstr "POST baliogabea"
+
+#. TRANS: Page title for Yammer import administration panel.
+msgid "Yammer import"
+msgstr "Yammer inportazioa"
+
+#. TRANS: Menu item for Yammer import.
+msgctxt "MENU"
+msgid "Yammer"
+msgstr ""
+
+#. TRANS: Menu item title for Yammer import.
+msgid "Yammer import module."
+msgstr "Yammer inportazio modulua."
+
+#. TRANS: Exception thrown when a non-user item type is used, but expected.
+msgid "Wrong item type sent to Yammer user import processing."
+msgstr ""
+
+#. TRANS: Used as a prefix for the Yammer expertise field contents.
+msgid "Expertise:"
+msgstr ""
+
+#. TRANS: Exception thrown when a non-group item type is used, but expected.
+msgid "Wrong item type sent to Yammer group import processing."
+msgstr ""
+
+#. TRANS: Exception thrown when a non-message item type is used, but expected.
+msgid "Wrong item type sent to Yammer message import processing."
+msgstr ""
+
+#. TRANS: Server exception thrown when an avatar URL is invalid.
+#. TRANS: %s is the invalid avatar URL.
+#, php-format
+msgid "Invalid avatar URL %s."
+msgstr "%s abatar URL okerra."
+
+#. TRANS: Server exception thrown when an avatar could not be fetched.
+#. TRANS: %s is the failed avatar URL.
+#, php-format
+msgid "Unable to fetch avatar from %s."
+msgstr "Ezin izan da abatarra lortu %s helbidetik."
+
+#. TRANS: Button text for starting Yammer authentication.
+msgctxt "BUTTON"
+msgid "Start authentication"
+msgstr "Hasi egiaztatzea"
+
+#. TRANS: Button title for starting Yammer authentication.
+msgid "Request authorization to connect to a Yammer account."
+msgstr ""
+
+#. TRANS: Button text for starting changing a Yammer API key.
+msgctxt "BUTTON"
+msgid "Change API key"
+msgstr "Aldatu API gakoa"
+
+#. TRANS: Server exception thrown if a Yammer authentication request is already present.
+msgid "Cannot request Yammer auth; already there!"
+msgstr ""
+
+#. TRANS: Server exception thrown when requesting a Yammer authentication URL while in an incorrect state.
+msgid "Cannot get Yammer auth URL when not in requesting-auth state!"
+msgstr ""
+
+#. TRANS: Exeption thrown when an external Yammer system gives an error.
+#. TRANS: %1$s is an HTTP error code, %2$s is the error message body.
+#, php-format
+msgid "Yammer API returned HTTP code %1$s: %2$s"
+msgstr ""
+
+#. TRANS: Exeption thrown when an external Yammer system an invalid JSON response.
+msgid "Invalid JSON response from Yammer API."
+msgstr ""
+
+#. TRANS: Exeption thrown when a trust relationship has already been established.
+msgid "Requesting a token, but already set up with a token."
+msgstr ""
+
+#. TRANS: Field label for a Yammer import initialise step.
+msgid "Initialize"
+msgstr ""
+
+#. TRANS: "In progress" description.
+msgid "No import running"
+msgstr "Inportazioa abiatu gabe"
+
+#. TRANS: "Complete" description for initialize state.
+msgid "Initiated Yammer server connection..."
+msgstr ""
+
+#. TRANS: "In progress" description.
+msgid "Awaiting authorization..."
+msgstr "Baimenaren zai..."
+
+#. TRANS: "Complete" description for connect state.
+msgid "Connected."
+msgstr "Konektaturik."
+
+#. TRANS: Field label for a Yammer user import users step.
+msgid "Import user accounts"
+msgstr "Inportatu erabiltzaileen kontuak"
+
+#. TRANS: "In progress" description.
+#. TRANS: %d is the number of users to be imported.
+#, php-format
+msgid "Importing %d user..."
+msgid_plural "Importing %d users..."
+msgstr[0] "Erabiltzaile %d inportatzen..."
+msgstr[1] "%d erabiltzaile inportatzen..."
+
+#. TRANS: "Complete" description for step.
+#. TRANS: %d is the number of users imported.
+#, php-format
+msgid "Imported %d user."
+msgid_plural "Imported %d users."
+msgstr[0] "Erabiltzaile %d inportatu da."
+msgstr[1] "%d erabiltzaile inportatu dira."
+
+#. TRANS: Field label for a Yammer group import step.
+msgid "Import user groups"
+msgstr "Inportatu erabiltzaileen taldeak"
+
+#. TRANS: "In progress" description.
+#. TRANS: %d is the number of groups to be imported.
+#, php-format
+msgid "Importing %d group..."
+msgid_plural "Importing %d groups..."
+msgstr[0] "Talde %d inportatzen..."
+msgstr[1] "%d talde inportatzen..."
+
+#. TRANS: "Complete" description for step.
+#. TRANS: %d is the number of groups imported.
+#, php-format
+msgid "Imported %d group."
+msgid_plural "Imported %d groups."
+msgstr[0] "Talde %d inportatu da."
+msgstr[1] "%d talde inportatu dira."
+
+#. TRANS: Field label for a Yammer import prepare notices step.
+msgid "Prepare public notices for import"
+msgstr ""
+
+#. TRANS: "In progress" description.
+#. TRANS: %d is the number of notices to be prepared for import.
+#, php-format
+msgid "Preparing %d notice..."
+msgid_plural "Preparing %d notices..."
+msgstr[0] "Ohar %d prestatzen..."
+msgstr[1] "%d ohar prestatzen..."
+
+#. TRANS: "Complete" description for step.
+#. TRANS: %d is the number of notices prepared for import.
+#, php-format
+msgid "Prepared %d notice."
+msgid_plural "Prepared %d notices."
+msgstr[0] "Ohar %d prestatua."
+msgstr[1] "%d ohar prestatuak."
+
+#. TRANS: Field label for a Yammer import notices step.
+msgid "Import public notices"
+msgstr "Inportatu ohar publikoak"
+
+#. TRANS: "In progress" description.
+#. TRANS: %d is the number of notices to be imported.
+#, php-format
+msgid "Importing %d notice..."
+msgid_plural "Importing %d notices..."
+msgstr[0] "Ohar %d inportatzen..."
+msgstr[1] "%d ohar inportatzen..."
+
+#. TRANS: "Complete" description for step.
+#. TRANS: %d is the number of notices imported.
+#, php-format
+msgid "Imported %d notice."
+msgid_plural "Imported %d notices."
+msgstr[0] "Ohar %d inportatua."
+msgstr[1] "%d ohar inportatuak."
+
+#. TRANS: Field label for a Yammer import done step.
+msgid "Done"
+msgstr ""
+
+#. TRANS: "In progress" description for done step.
+#. TRANS: "Complete" description for done step.
+msgid "Import is complete!"
+msgstr "Inportazioa bete da!"
+
+#. TRANS: Fieldset legend.
+msgid "Import status"
+msgstr "Inportazio egoera"
+
+#. TRANS: Progress bar status.
+msgid "Waiting..."
+msgstr ""
+
+#. TRANS: Button text for resetting the import state.
+msgid "Reset import state"
+msgstr "Reseteatu inportazio egoera"
+
+#. TRANS: Button text for pausing an import.
+msgid "Pause import"
+msgstr "Pausatu inportazioa"
+
+#. TRANS: Error message. %s are the error details.
+#, php-format
+msgid "Encountered error \"%s\"."
+msgstr "\"%s\" akatsa aurkitu da."
+
+#. TRANS: Fieldset legend for a paused import.
+msgid "Paused"
+msgstr ""
+
+#. TRANS: Button text for continuing a paused import.
+msgid "Continue"
+msgstr "Jarraitu"
+
+#. TRANS: Button text for aborting a paused import.
+msgid "Abort import"
+msgstr "Utzi inportazioa"
+
+#. TRANS: Form instructions.
+msgid ""
+"Follow this link to confirm authorization at Yammer; you will be prompted to "
+"log in if necessary:"
+msgstr ""
+
+#. TRANS: Link description for a link in an external Yammer system.
+msgid "Open Yammer authentication window"
+msgstr ""
+
+#. TRANS: Form instructions.
+msgid "Copy the verification code you are given below:"
+msgstr ""
+
+#. TRANS: Field label.
+msgid "Verification code:"
+msgstr "Baieztapen-kodea:"
+
+#. TRANS: Button text for saving  Yammer authorisation data and starting Yammer import.
+msgctxt "BUTTON"
+msgid "Continue"
+msgstr "Jarraitu"
+
+#. TRANS: Button title for saving  Yammer authorisation data and starting Yammer import.
+msgid "Save the verification code and begin import."
+msgstr ""
+
+#. TRANS: Form legend for adding details to connect to a remote Yammer API.
+msgid "Yammer API registration"
+msgstr "Yammer API erregistroa"
+
+#. TRANS: Explanation of what needs to be done to connect to a Yammer network.
+msgid ""
+"Before we can connect to your Yammer network, you will need to register the "
+"importer as an application authorized to pull data on your behalf. This "
+"registration will work only for your own network. Follow this link to "
+"register the app at Yammer; you will be prompted to log in if necessary:"
+msgstr ""
+
+#. TRANS: Link description to a Yammer application registration form.
+msgid "Open Yammer application registration form"
+msgstr ""
+
+#. TRANS: Instructions.
+msgid "Copy the consumer key and secret you are given into the form below:"
+msgstr ""
+
+#. TRANS: Field label for a Yammer consumer key.
+msgid "Consumer key:"
+msgstr "Kontsumitzaile gakoa:"
+
+#. TRANS: Field label for a Yammer consumer secret.
+msgid "Consumer secret:"
+msgstr "Kontsumitzaile sekretua:"
+
+#. TRANS: Button text for saving a Yammer API registration.
+msgctxt "BUTTON"
+msgid "Save"
+msgstr "Gorde"
+
+#. TRANS: Button title for saving a Yammer API registration.
+msgid "Save the entered consumer key and consumer secret."
+msgstr "Gorde kontsumitzaile gako eta sekretua."
diff --git a/plugins/YammerImport/locale/fr/LC_MESSAGES/YammerImport.po b/plugins/YammerImport/locale/fr/LC_MESSAGES/YammerImport.po
index ecf89a39b4..01304fc5b2 100644
--- a/plugins/YammerImport/locale/fr/LC_MESSAGES/YammerImport.po
+++ b/plugins/YammerImport/locale/fr/LC_MESSAGES/YammerImport.po
@@ -1,7 +1,11 @@
-# Translation of StatusNet - YammerImport to French (Français)
+# Translation of StatusNet - YammerImport to French (français)
 # Exported from translatewiki.net
 #
+# Author: Gomoko
+# Author: Hashar
+# Author: Od1n
 # Author: Peter17
+# Author: Tititou36
 # --
 # This file is distributed under the same license as the StatusNet package.
 #
@@ -9,24 +13,30 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - YammerImport\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:52:00+0000\n"
-"Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:33+0000\n"
+"Language-Team: French <https://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:56+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-12-03 13:51:41+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-yammerimport\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#. TRANS: Page title for Yammer administration panel.
+#. TRANS: Form legend.
+#. TRANS: Field label for a Yammer import connect step.
+#. TRANS: Form legend.
 msgid "Connect to Yammer"
 msgstr "Connexion à Yammer"
 
+#. TRANS: Page title for Yammer import administration panel.
 msgid "Yammer Import"
 msgstr "Import Yammer"
 
+#. TRANS: Instructions for Yammer import administration panel.
 msgid ""
 "This Yammer import tool is still undergoing testing, and is incomplete in "
 "some areas. Currently user subscriptions and group memberships are not "
@@ -39,141 +49,239 @@ msgstr ""
 "le futur pour les imports réalisés par les administrateurs autorisés du côté "
 "de Yammer."
 
+#. TRANS: Error message about an import job being paused from the admin panel.
 msgid "Paused from admin panel."
 msgstr "Mis en pause depuis le panneau d’administration"
 
+#. TRANS: Client exception thrown when encountering an unhandled sub action.
+msgid "Invalid POST"
+msgstr "POST invalide."
+
+#. TRANS: Page title for Yammer import administration panel.
 msgid "Yammer import"
 msgstr "Import Yammer"
 
+#. TRANS: Menu item for Yammer import.
+msgctxt "MENU"
 msgid "Yammer"
 msgstr "Yammer"
 
+#. TRANS: Menu item title for Yammer import.
+msgid "Yammer import module."
+msgstr "Module d'import Yammer."
+
+#. TRANS: Exception thrown when a non-user item type is used, but expected.
+msgid "Wrong item type sent to Yammer user import processing."
+msgstr ""
+"Mauvais type d'élément envoyé au processus d'import d'utilisateur de Yammer."
+
+#. TRANS: Used as a prefix for the Yammer expertise field contents.
 msgid "Expertise:"
 msgstr "Expertise :"
 
+#. TRANS: Exception thrown when a non-group item type is used, but expected.
+msgid "Wrong item type sent to Yammer group import processing."
+msgstr ""
+"Mauvais type d'élément envoyé au processus d'import de groupe de Yammer."
+
+#. TRANS: Exception thrown when a non-message item type is used, but expected.
+msgid "Wrong item type sent to Yammer message import processing."
+msgstr ""
+"Mauvais type d'élément envoyé au processus d'import de message de Yammer."
+
+#. TRANS: Server exception thrown when an avatar URL is invalid.
+#. TRANS: %s is the invalid avatar URL.
 #, php-format
 msgid "Invalid avatar URL %s."
 msgstr "URL d’avatar invalide : %s."
 
+#. TRANS: Server exception thrown when an avatar could not be fetched.
+#. TRANS: %s is the failed avatar URL.
 #, php-format
 msgid "Unable to fetch avatar from %s."
 msgstr "Impossible de récupérer l’avatar depuis « %s »."
 
+#. TRANS: Button text for starting Yammer authentication.
+msgctxt "BUTTON"
 msgid "Start authentication"
 msgstr "Démarrer l’identification"
 
-msgid "Request authorization to connect to Yammer account"
+#. TRANS: Button title for starting Yammer authentication.
+msgid "Request authorization to connect to a Yammer account."
 msgstr "Demander l’autorisation de se connecter à un compte Yammer"
 
+#. TRANS: Button text for starting changing a Yammer API key.
+msgctxt "BUTTON"
 msgid "Change API key"
 msgstr "Changer la clé de l’API"
 
+#. TRANS: Server exception thrown if a Yammer authentication request is already present.
+msgid "Cannot request Yammer auth; already there!"
+msgstr "Impossible de demander une authentification Yammer; déjà présent!"
+
+#. TRANS: Server exception thrown when requesting a Yammer authentication URL while in an incorrect state.
+msgid "Cannot get Yammer auth URL when not in requesting-auth state!"
+msgstr ""
+"Impossible d'obtenir une URL d'authentification Yammer en n'étant pas dans "
+"un état demandant une authentification!"
+
+#. TRANS: Exeption thrown when an external Yammer system gives an error.
+#. TRANS: %1$s is an HTTP error code, %2$s is the error message body.
+#, php-format
+msgid "Yammer API returned HTTP code %1$s: %2$s"
+msgstr "L'API Yammer a renvoyé le code HTTP %1$s : %2$s"
+
+#. TRANS: Exeption thrown when an external Yammer system an invalid JSON response.
+msgid "Invalid JSON response from Yammer API."
+msgstr "Réponse JSON non valide en provenance de l'API Yammer."
+
+#. TRANS: Exeption thrown when a trust relationship has already been established.
+msgid "Requesting a token, but already set up with a token."
+msgstr "Jeton demandé, mais un jeton a déjà été accordé."
+
+#. TRANS: Field label for a Yammer import initialise step.
 msgid "Initialize"
 msgstr "Initialiser"
 
+#. TRANS: "In progress" description.
 msgid "No import running"
 msgstr "Aucun import en cours d’exécution"
 
+#. TRANS: "Complete" description for initialize state.
 msgid "Initiated Yammer server connection..."
 msgstr "Connexion au serveur Yammer initiée..."
 
+#. TRANS: "In progress" description.
 msgid "Awaiting authorization..."
 msgstr "En attente d’autorisation..."
 
+#. TRANS: "Complete" description for connect state.
 msgid "Connected."
 msgstr "Connecté."
 
+#. TRANS: Field label for a Yammer user import users step.
 msgid "Import user accounts"
 msgstr "Importer des comptes utilisateur"
 
+#. TRANS: "In progress" description.
+#. TRANS: %d is the number of users to be imported.
 #, php-format
 msgid "Importing %d user..."
 msgid_plural "Importing %d users..."
 msgstr[0] "Import de %d utilisateur..."
 msgstr[1] "Import de %d utilisateurs..."
 
+#. TRANS: "Complete" description for step.
+#. TRANS: %d is the number of users imported.
 #, php-format
 msgid "Imported %d user."
 msgid_plural "Imported %d users."
 msgstr[0] "%d utilisateur importé."
 msgstr[1] "%d utilisateurs importés."
 
+#. TRANS: Field label for a Yammer group import step.
 msgid "Import user groups"
 msgstr "Importer des groupes utilisateur"
 
+#. TRANS: "In progress" description.
+#. TRANS: %d is the number of groups to be imported.
 #, php-format
 msgid "Importing %d group..."
 msgid_plural "Importing %d groups..."
 msgstr[0] "Import de %d groupe..."
 msgstr[1] "Import de %d groupes..."
 
+#. TRANS: "Complete" description for step.
+#. TRANS: %d is the number of groups imported.
 #, php-format
 msgid "Imported %d group."
 msgid_plural "Imported %d groups."
 msgstr[0] "%d groupe importé."
 msgstr[1] "%d groupes importés."
 
+#. TRANS: Field label for a Yammer import prepare notices step.
 msgid "Prepare public notices for import"
 msgstr "Préparation de l’import d’avis publiques"
 
+#. TRANS: "In progress" description.
+#. TRANS: %d is the number of notices to be prepared for import.
 #, php-format
 msgid "Preparing %d notice..."
 msgid_plural "Preparing %d notices..."
 msgstr[0] "Préparation de %d avis..."
 msgstr[1] "Préparation de %d avis..."
 
+#. TRANS: "Complete" description for step.
+#. TRANS: %d is the number of notices prepared for import.
 #, php-format
 msgid "Prepared %d notice."
 msgid_plural "Prepared %d notices."
 msgstr[0] "%d avis prépara."
 msgstr[1] "%d avis préparés."
 
+#. TRANS: Field label for a Yammer import notices step.
 msgid "Import public notices"
 msgstr "Import d’avis publiques"
 
+#. TRANS: "In progress" description.
+#. TRANS: %d is the number of notices to be imported.
 #, php-format
 msgid "Importing %d notice..."
 msgid_plural "Importing %d notices..."
 msgstr[0] "Import de %d avis..."
 msgstr[1] "Import de %d avis..."
 
+#. TRANS: "Complete" description for step.
+#. TRANS: %d is the number of notices imported.
 #, php-format
 msgid "Imported %d notice."
 msgid_plural "Imported %d notices."
 msgstr[0] "%d avis importé."
 msgstr[1] "%d avis importés."
 
+#. TRANS: Field label for a Yammer import done step.
 msgid "Done"
 msgstr "Fait"
 
+#. TRANS: "In progress" description for done step.
+#. TRANS: "Complete" description for done step.
 msgid "Import is complete!"
 msgstr "L’import est terminé !"
 
+#. TRANS: Fieldset legend.
 msgid "Import status"
 msgstr "État de l’import"
 
+#. TRANS: Progress bar status.
 msgid "Waiting..."
 msgstr "Attente..."
 
+#. TRANS: Button text for resetting the import state.
 msgid "Reset import state"
 msgstr "Réinitialiser l’état de l’import"
 
+#. TRANS: Button text for pausing an import.
 msgid "Pause import"
 msgstr "Mettre l’import en pause"
 
+#. TRANS: Error message. %s are the error details.
 #, php-format
-msgid "Encountered error \"%s\""
+msgid "Encountered error \"%s\"."
 msgstr "L’erreur « %s » est survenue"
 
+#. TRANS: Fieldset legend for a paused import.
 msgid "Paused"
 msgstr "En pause"
 
+#. TRANS: Button text for continuing a paused import.
 msgid "Continue"
 msgstr "Continuer"
 
+#. TRANS: Button text for aborting a paused import.
 msgid "Abort import"
 msgstr "Abandonner l’import"
 
+#. TRANS: Form instructions.
 msgid ""
 "Follow this link to confirm authorization at Yammer; you will be prompted to "
 "log in if necessary:"
@@ -181,21 +289,32 @@ msgstr ""
 "Suivez ce lien pour confirmer l’autorisation sur Yammer ; il vous sera "
 "demandé de vous identifier si nécessaire :"
 
+#. TRANS: Link description for a link in an external Yammer system.
 msgid "Open Yammer authentication window"
 msgstr "Ouvrir la fenêtre d’identification Yammer"
 
+#. TRANS: Form instructions.
 msgid "Copy the verification code you are given below:"
 msgstr "Copiez ci-dessous le code de vérification qui vous est donné :"
 
+#. TRANS: Field label.
 msgid "Verification code:"
 msgstr "Code de vérification :"
 
-msgid "Save code and begin import"
-msgstr "Enregistrer le code et commencer l’import"
+#. TRANS: Button text for saving  Yammer authorisation data and starting Yammer import.
+msgctxt "BUTTON"
+msgid "Continue"
+msgstr "Continuer"
 
+#. TRANS: Button title for saving  Yammer authorisation data and starting Yammer import.
+msgid "Save the verification code and begin import."
+msgstr "Enregistrer le code de vérification et commencer l’import"
+
+#. TRANS: Form legend for adding details to connect to a remote Yammer API.
 msgid "Yammer API registration"
 msgstr "Enregistrement de l’API Yammer"
 
+#. TRANS: Explanation of what needs to be done to connect to a Yammer network.
 msgid ""
 "Before we can connect to your Yammer network, you will need to register the "
 "importer as an application authorized to pull data on your behalf. This "
@@ -208,22 +327,31 @@ msgstr ""
 "propre réseau. Suivez ce lien pour enregistrer l’application sur Yammer ; si "
 "cela est nécessaire, il vous sera demandé de vous identifier :"
 
+#. TRANS: Link description to a Yammer application registration form.
 msgid "Open Yammer application registration form"
 msgstr "Ouvrir le formulaire d’enregistrement de l’application Yammer"
 
+#. TRANS: Instructions.
 msgid "Copy the consumer key and secret you are given into the form below:"
 msgstr ""
 "Copiez dans le formulaire ci-dessous la clé et le secret utilisateur qui "
 "vous sont donnés :"
 
+#. TRANS: Field label for a Yammer consumer key.
 msgid "Consumer key:"
 msgstr "Clé de l'utilisateur :"
 
+#. TRANS: Field label for a Yammer consumer secret.
 msgid "Consumer secret:"
 msgstr "Secret de l'utilisateur :"
 
+#. TRANS: Button text for saving a Yammer API registration.
+msgctxt "BUTTON"
 msgid "Save"
-msgstr "Sauvegarder"
+msgstr "Enregistrer"
 
-msgid "Save these consumer keys"
-msgstr "Enregistrer ces clés utilisateur"
+#. TRANS: Button title for saving a Yammer API registration.
+msgid "Save the entered consumer key and consumer secret."
+msgstr ""
+"Enregistrer les clés d'utilisateur entrées et le mot de passe de "
+"l'utilisateur."
diff --git a/plugins/YammerImport/locale/gl/LC_MESSAGES/YammerImport.po b/plugins/YammerImport/locale/gl/LC_MESSAGES/YammerImport.po
index de7690aa8d..8557abaca4 100644
--- a/plugins/YammerImport/locale/gl/LC_MESSAGES/YammerImport.po
+++ b/plugins/YammerImport/locale/gl/LC_MESSAGES/YammerImport.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - YammerImport to Galician (Galego)
+# Translation of StatusNet - YammerImport to Galician (galego)
 # Exported from translatewiki.net
 #
 # Author: Toliño
@@ -9,207 +9,346 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - YammerImport\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:52:00+0000\n"
-"Language-Team: Galician <http://translatewiki.net/wiki/Portal:gl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:33+0000\n"
+"Language-Team: Galician <https://translatewiki.net/wiki/Portal:gl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:56+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-12-03 13:51:41+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: gl\n"
 "X-Message-Group: #out-statusnet-plugin-yammerimport\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Page title for Yammer administration panel.
+#. TRANS: Form legend.
+#. TRANS: Field label for a Yammer import connect step.
+#. TRANS: Form legend.
 msgid "Connect to Yammer"
-msgstr ""
+msgstr "Conectar ao Yammer"
 
+#. TRANS: Page title for Yammer import administration panel.
 msgid "Yammer Import"
 msgstr "Importación Yammer"
 
+#. TRANS: Instructions for Yammer import administration panel.
 msgid ""
 "This Yammer import tool is still undergoing testing, and is incomplete in "
 "some areas. Currently user subscriptions and group memberships are not "
 "transferred; in the future this may be supported for imports done by "
 "verified administrators on the Yammer side."
 msgstr ""
+"Esta ferramenta de importación do Yammer está aínda baixo probas e está "
+"incompleta nalgúns aspectos. Arestora, non se transfiren as subscricións de "
+"usuarios e as pertenzas aos grupos; no futuro, isto pode estar soportado "
+"para as importacións feitas por administradores verificados no Yammer."
 
+#. TRANS: Error message about an import job being paused from the admin panel.
 msgid "Paused from admin panel."
 msgstr "En pausa desde o panel de administración."
 
+#. TRANS: Client exception thrown when encountering an unhandled sub action.
+msgid "Invalid POST"
+msgstr "POST inválido."
+
+#. TRANS: Page title for Yammer import administration panel.
 msgid "Yammer import"
-msgstr ""
+msgstr "Importación Yammer"
 
+#. TRANS: Menu item for Yammer import.
+msgctxt "MENU"
 msgid "Yammer"
-msgstr ""
+msgstr "Yammer"
 
+#. TRANS: Menu item title for Yammer import.
+msgid "Yammer import module."
+msgstr "Módulo de importación Yammer."
+
+#. TRANS: Exception thrown when a non-user item type is used, but expected.
+msgid "Wrong item type sent to Yammer user import processing."
+msgstr ""
+"Tipo de elemento incorrecto enviado para o proceso de importación de "
+"usuarios do Yammer."
+
+#. TRANS: Used as a prefix for the Yammer expertise field contents.
 msgid "Expertise:"
-msgstr ""
+msgstr "Experiencia:"
 
+#. TRANS: Exception thrown when a non-group item type is used, but expected.
+msgid "Wrong item type sent to Yammer group import processing."
+msgstr ""
+"Tipo de elemento incorrecto enviado para o proceso de importación de grupos "
+"do Yammer."
+
+#. TRANS: Exception thrown when a non-message item type is used, but expected.
+msgid "Wrong item type sent to Yammer message import processing."
+msgstr ""
+"Tipo de elemento incorrecto enviado para o proceso de importación de "
+"mensaxes do Yammer."
+
+#. TRANS: Server exception thrown when an avatar URL is invalid.
+#. TRANS: %s is the invalid avatar URL.
 #, php-format
 msgid "Invalid avatar URL %s."
-msgstr ""
+msgstr "O enderezo URL do avatar, %s, é incorrecto."
 
+#. TRANS: Server exception thrown when an avatar could not be fetched.
+#. TRANS: %s is the failed avatar URL.
 #, php-format
 msgid "Unable to fetch avatar from %s."
-msgstr ""
+msgstr "Non se puido recuperar o avatar desde %s."
 
+#. TRANS: Button text for starting Yammer authentication.
+msgctxt "BUTTON"
 msgid "Start authentication"
-msgstr ""
+msgstr "Comezar a autenticación"
 
-msgid "Request authorization to connect to Yammer account"
-msgstr ""
+#. TRANS: Button title for starting Yammer authentication.
+msgid "Request authorization to connect to a Yammer account."
+msgstr "Solicitar autorización para conectarse a unha conta do Yammer."
 
+#. TRANS: Button text for starting changing a Yammer API key.
+msgctxt "BUTTON"
 msgid "Change API key"
-msgstr ""
+msgstr "Cambiar a clave da API"
 
+#. TRANS: Server exception thrown if a Yammer authentication request is already present.
+msgid "Cannot request Yammer auth; already there!"
+msgstr ""
+"Non se pode solicitar a autenticación do Yammer; a solicitude xa está "
+"presente!"
+
+#. TRANS: Server exception thrown when requesting a Yammer authentication URL while in an incorrect state.
+msgid "Cannot get Yammer auth URL when not in requesting-auth state!"
+msgstr ""
+"Non se pode obter a autenticación do Yammer sen estar no modo de solicitude "
+"de autenticación!"
+
+#. TRANS: Exeption thrown when an external Yammer system gives an error.
+#. TRANS: %1$s is an HTTP error code, %2$s is the error message body.
+#, php-format
+msgid "Yammer API returned HTTP code %1$s: %2$s"
+msgstr "A API do Yammer devolveu o código HTTP %1$s: %2$s"
+
+#. TRANS: Exeption thrown when an external Yammer system an invalid JSON response.
+msgid "Invalid JSON response from Yammer API."
+msgstr "Resposta JSON inválida desde a API do Yammer."
+
+#. TRANS: Exeption thrown when a trust relationship has already been established.
+msgid "Requesting a token, but already set up with a token."
+msgstr "Solicitando un pase, pero o pase xa está configurado."
+
+#. TRANS: Field label for a Yammer import initialise step.
 msgid "Initialize"
 msgstr "Iniciar"
 
+#. TRANS: "In progress" description.
 msgid "No import running"
-msgstr ""
+msgstr "Non hai ningunha importación en curso"
 
+#. TRANS: "Complete" description for initialize state.
 msgid "Initiated Yammer server connection..."
-msgstr ""
+msgstr "Conexión ao servidor do Yammer iniciada..."
 
+#. TRANS: "In progress" description.
 msgid "Awaiting authorization..."
 msgstr "Agardando a autorización..."
 
+#. TRANS: "Complete" description for connect state.
 msgid "Connected."
 msgstr "Conectado."
 
+#. TRANS: Field label for a Yammer user import users step.
 msgid "Import user accounts"
-msgstr ""
+msgstr "Importar contas de usuario"
 
+#. TRANS: "In progress" description.
+#. TRANS: %d is the number of users to be imported.
 #, php-format
 msgid "Importing %d user..."
 msgid_plural "Importing %d users..."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Importando %d usuario..."
+msgstr[1] "Importando %d usuarios..."
 
+#. TRANS: "Complete" description for step.
+#. TRANS: %d is the number of users imported.
 #, php-format
 msgid "Imported %d user."
 msgid_plural "Imported %d users."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d usuario importado."
+msgstr[1] "%d usuarios importados."
 
+#. TRANS: Field label for a Yammer group import step.
 msgid "Import user groups"
-msgstr ""
+msgstr "Importar grupos de usuario"
 
+#. TRANS: "In progress" description.
+#. TRANS: %d is the number of groups to be imported.
 #, php-format
 msgid "Importing %d group..."
 msgid_plural "Importing %d groups..."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Importando %d grupo..."
+msgstr[1] "Importando %d grupos..."
 
+#. TRANS: "Complete" description for step.
+#. TRANS: %d is the number of groups imported.
 #, php-format
 msgid "Imported %d group."
 msgid_plural "Imported %d groups."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d grupo importado."
+msgstr[1] "%d grupos importados."
 
+#. TRANS: Field label for a Yammer import prepare notices step.
 msgid "Prepare public notices for import"
-msgstr ""
+msgstr "Preparar a importación de notas públicas"
 
+#. TRANS: "In progress" description.
+#. TRANS: %d is the number of notices to be prepared for import.
 #, php-format
 msgid "Preparing %d notice..."
 msgid_plural "Preparing %d notices..."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Preparando %d nota..."
+msgstr[1] "Preparando %d notas..."
 
+#. TRANS: "Complete" description for step.
+#. TRANS: %d is the number of notices prepared for import.
 #, php-format
 msgid "Prepared %d notice."
 msgid_plural "Prepared %d notices."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d nota preparada."
+msgstr[1] "%d notas preparadas."
 
+#. TRANS: Field label for a Yammer import notices step.
 msgid "Import public notices"
-msgstr ""
+msgstr "Importar notas públicas"
 
+#. TRANS: "In progress" description.
+#. TRANS: %d is the number of notices to be imported.
 #, php-format
 msgid "Importing %d notice..."
 msgid_plural "Importing %d notices..."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Importando %d nota..."
+msgstr[1] "Importando %d notas..."
 
+#. TRANS: "Complete" description for step.
+#. TRANS: %d is the number of notices imported.
 #, php-format
 msgid "Imported %d notice."
 msgid_plural "Imported %d notices."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d nota importada."
+msgstr[1] "%d notas importadas."
 
+#. TRANS: Field label for a Yammer import done step.
 msgid "Done"
 msgstr "Feito"
 
+#. TRANS: "In progress" description for done step.
+#. TRANS: "Complete" description for done step.
 msgid "Import is complete!"
 msgstr "Completouse a importación!"
 
+#. TRANS: Fieldset legend.
 msgid "Import status"
 msgstr "Estado da importación"
 
+#. TRANS: Progress bar status.
 msgid "Waiting..."
 msgstr "Agarde..."
 
+#. TRANS: Button text for resetting the import state.
 msgid "Reset import state"
 msgstr "Reiniciar o estado da importación"
 
+#. TRANS: Button text for pausing an import.
 msgid "Pause import"
 msgstr "Pausar a importación"
 
+#. TRANS: Error message. %s are the error details.
 #, php-format
-msgid "Encountered error \"%s\""
-msgstr "Atopouse o erro \"%s\""
+msgid "Encountered error \"%s\"."
+msgstr "Atopouse o erro \"%s\"."
 
+#. TRANS: Fieldset legend for a paused import.
 msgid "Paused"
 msgstr "En pausa"
 
+#. TRANS: Button text for continuing a paused import.
 msgid "Continue"
 msgstr "Continuar"
 
+#. TRANS: Button text for aborting a paused import.
 msgid "Abort import"
 msgstr "Abortar a importación"
 
+#. TRANS: Form instructions.
 msgid ""
 "Follow this link to confirm authorization at Yammer; you will be prompted to "
 "log in if necessary:"
 msgstr ""
+"Siga esta ligazón para confirmar a autorización no Yammer; pedirémoslle que "
+"inicie sesión se fose necesario:"
 
+#. TRANS: Link description for a link in an external Yammer system.
 msgid "Open Yammer authentication window"
-msgstr ""
+msgstr "Abrir a ventá de importación do Yammer"
 
+#. TRANS: Form instructions.
 msgid "Copy the verification code you are given below:"
-msgstr ""
+msgstr "Copie o código de verificación que recibiu a continuación:"
 
+#. TRANS: Field label.
 msgid "Verification code:"
 msgstr "Código de verificación:"
 
-msgid "Save code and begin import"
-msgstr ""
+#. TRANS: Button text for saving  Yammer authorisation data and starting Yammer import.
+msgctxt "BUTTON"
+msgid "Continue"
+msgstr "Continuar"
 
+#. TRANS: Button title for saving  Yammer authorisation data and starting Yammer import.
+msgid "Save the verification code and begin import."
+msgstr "Gardar o código de verificación e comezar a importación."
+
+#. TRANS: Form legend for adding details to connect to a remote Yammer API.
 msgid "Yammer API registration"
-msgstr ""
+msgstr "Rexistro da API do Yammer"
 
+#. TRANS: Explanation of what needs to be done to connect to a Yammer network.
 msgid ""
 "Before we can connect to your Yammer network, you will need to register the "
 "importer as an application authorized to pull data on your behalf. This "
 "registration will work only for your own network. Follow this link to "
 "register the app at Yammer; you will be prompted to log in if necessary:"
 msgstr ""
+"Antes de que poidamos conectar coa rede do Yammer, terá que rexistrar a "
+"aplicación de importación co fin de autorizala para que recolla datos no seu "
+"nome. Este rexistro funcionará unicamente na súa propia rede. Siga esta "
+"ligazón para rexistrar a aplicación no Yammer; pedirémoslle que inicie "
+"sesión se fose necesario:"
 
+#. TRANS: Link description to a Yammer application registration form.
 msgid "Open Yammer application registration form"
-msgstr ""
+msgstr "Abrir o formulario de rexistro da aplicación do Yammer"
 
+#. TRANS: Instructions.
 msgid "Copy the consumer key and secret you are given into the form below:"
 msgstr ""
+"Copie a clave e a frase de consumidor secreta que recibiu a continuación:"
 
+#. TRANS: Field label for a Yammer consumer key.
 msgid "Consumer key:"
 msgstr "Clave do consumidor:"
 
+#. TRANS: Field label for a Yammer consumer secret.
 msgid "Consumer secret:"
 msgstr "Pregunta secreta do consumidor:"
 
+#. TRANS: Button text for saving a Yammer API registration.
+msgctxt "BUTTON"
 msgid "Save"
 msgstr "Gardar"
 
-msgid "Save these consumer keys"
-msgstr ""
+#. TRANS: Button title for saving a Yammer API registration.
+msgid "Save the entered consumer key and consumer secret."
+msgstr "Gardar a clave e a frase de consumidor secreta inseridas."
diff --git a/plugins/YammerImport/locale/ia/LC_MESSAGES/YammerImport.po b/plugins/YammerImport/locale/ia/LC_MESSAGES/YammerImport.po
index a76ea5ffc8..8873358582 100644
--- a/plugins/YammerImport/locale/ia/LC_MESSAGES/YammerImport.po
+++ b/plugins/YammerImport/locale/ia/LC_MESSAGES/YammerImport.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - YammerImport to Interlingua (Interlingua)
+# Translation of StatusNet - YammerImport to Interlingua (interlingua)
 # Exported from translatewiki.net
 #
 # Author: McDutchie
@@ -9,24 +9,30 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - YammerImport\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:52:00+0000\n"
-"Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:33+0000\n"
+"Language-Team: Interlingua <https://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:56+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-12-03 13:51:41+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-yammerimport\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Page title for Yammer administration panel.
+#. TRANS: Form legend.
+#. TRANS: Field label for a Yammer import connect step.
+#. TRANS: Form legend.
 msgid "Connect to Yammer"
 msgstr "Connecter a Yammer"
 
+#. TRANS: Page title for Yammer import administration panel.
 msgid "Yammer Import"
 msgstr "Importation de Yammer"
 
+#. TRANS: Instructions for Yammer import administration panel.
 msgid ""
 "This Yammer import tool is still undergoing testing, and is incomplete in "
 "some areas. Currently user subscriptions and group memberships are not "
@@ -39,141 +45,238 @@ msgstr ""
 "supportate pro importationes facite per administratores verificate al latere "
 "de Yammer."
 
+#. TRANS: Error message about an import job being paused from the admin panel.
 msgid "Paused from admin panel."
 msgstr "Pausate ab le pannello admin."
 
+#. TRANS: Client exception thrown when encountering an unhandled sub action.
+msgid "Invalid POST"
+msgstr "POST invalide"
+
+#. TRANS: Page title for Yammer import administration panel.
 msgid "Yammer import"
 msgstr "Importation de Yammer"
 
+#. TRANS: Menu item for Yammer import.
+msgctxt "MENU"
 msgid "Yammer"
 msgstr "Yammer"
 
+#. TRANS: Menu item title for Yammer import.
+msgid "Yammer import module."
+msgstr "Modulo de importation de Yammer."
+
+#. TRANS: Exception thrown when a non-user item type is used, but expected.
+msgid "Wrong item type sent to Yammer user import processing."
+msgstr "Mal typo de elemento inviate pro le importation de usatores de Yammer."
+
+#. TRANS: Used as a prefix for the Yammer expertise field contents.
 msgid "Expertise:"
 msgstr "Expertise:"
 
+#. TRANS: Exception thrown when a non-group item type is used, but expected.
+msgid "Wrong item type sent to Yammer group import processing."
+msgstr "Mal typo de elemento inviate pro le importation de gruppos de Yammer."
+
+#. TRANS: Exception thrown when a non-message item type is used, but expected.
+msgid "Wrong item type sent to Yammer message import processing."
+msgstr "Mal typo de elemento inviate pro le importation de messages de Yammer."
+
+#. TRANS: Server exception thrown when an avatar URL is invalid.
+#. TRANS: %s is the invalid avatar URL.
 #, php-format
 msgid "Invalid avatar URL %s."
 msgstr "URL de avatar %s invalide."
 
+#. TRANS: Server exception thrown when an avatar could not be fetched.
+#. TRANS: %s is the failed avatar URL.
 #, php-format
 msgid "Unable to fetch avatar from %s."
 msgstr "Incapace de obtener avatar ab %s."
 
+#. TRANS: Button text for starting Yammer authentication.
+msgctxt "BUTTON"
 msgid "Start authentication"
 msgstr "Comenciar authentication"
 
-msgid "Request authorization to connect to Yammer account"
-msgstr "Requestar autorisation de connecter al conto Yammer"
+#. TRANS: Button title for starting Yammer authentication.
+msgid "Request authorization to connect to a Yammer account."
+msgstr "Requestar autorisation pro connecter a un conto Yammer."
 
+#. TRANS: Button text for starting changing a Yammer API key.
+msgctxt "BUTTON"
 msgid "Change API key"
 msgstr "Cambiar clave API"
 
+#. TRANS: Server exception thrown if a Yammer authentication request is already present.
+msgid "Cannot request Yammer auth; already there!"
+msgstr ""
+"Impossibile requestar un authentication de Yammer; le requesta es jam "
+"presente!"
+
+#. TRANS: Server exception thrown when requesting a Yammer authentication URL while in an incorrect state.
+msgid "Cannot get Yammer auth URL when not in requesting-auth state!"
+msgstr ""
+"Impossibile obtener un URL de authentication Yammer si non in modo de "
+"requestar authentication!"
+
+#. TRANS: Exeption thrown when an external Yammer system gives an error.
+#. TRANS: %1$s is an HTTP error code, %2$s is the error message body.
+#, php-format
+msgid "Yammer API returned HTTP code %1$s: %2$s"
+msgstr "Le API de Yammer retornava le codice HTTP %1$s: %2$s"
+
+#. TRANS: Exeption thrown when an external Yammer system an invalid JSON response.
+msgid "Invalid JSON response from Yammer API."
+msgstr "Responsa JSON invalide ab le API de Yammer."
+
+#. TRANS: Exeption thrown when a trust relationship has already been established.
+msgid "Requesting a token, but already set up with a token."
+msgstr "Un indicio es requestate, ma un indicio ha jam essite installate."
+
+#. TRANS: Field label for a Yammer import initialise step.
 msgid "Initialize"
 msgstr "Initialisar"
 
+#. TRANS: "In progress" description.
 msgid "No import running"
 msgstr "Nulle importation in curso"
 
+#. TRANS: "Complete" description for initialize state.
 msgid "Initiated Yammer server connection..."
 msgstr "Connexion al servitor Yammer initiate..."
 
+#. TRANS: "In progress" description.
 msgid "Awaiting authorization..."
 msgstr "Attende autorisation..."
 
+#. TRANS: "Complete" description for connect state.
 msgid "Connected."
 msgstr "Connectite."
 
+#. TRANS: Field label for a Yammer user import users step.
 msgid "Import user accounts"
 msgstr "Importar contos de usator"
 
+#. TRANS: "In progress" description.
+#. TRANS: %d is the number of users to be imported.
 #, php-format
 msgid "Importing %d user..."
 msgid_plural "Importing %d users..."
 msgstr[0] "Importa %d usator..."
 msgstr[1] "Importa %d usatores..."
 
+#. TRANS: "Complete" description for step.
+#. TRANS: %d is the number of users imported.
 #, php-format
 msgid "Imported %d user."
 msgid_plural "Imported %d users."
 msgstr[0] "%d usator importate."
 msgstr[1] "%d usatores importate."
 
+#. TRANS: Field label for a Yammer group import step.
 msgid "Import user groups"
 msgstr "Importar gruppos de usatores"
 
+#. TRANS: "In progress" description.
+#. TRANS: %d is the number of groups to be imported.
 #, php-format
 msgid "Importing %d group..."
 msgid_plural "Importing %d groups..."
 msgstr[0] "Importa %d gruppo..."
 msgstr[1] "Importa %d gruppos..."
 
+#. TRANS: "Complete" description for step.
+#. TRANS: %d is the number of groups imported.
 #, php-format
 msgid "Imported %d group."
 msgid_plural "Imported %d groups."
 msgstr[0] "%d gruppo importate."
 msgstr[1] "%d gruppos importate."
 
+#. TRANS: Field label for a Yammer import prepare notices step.
 msgid "Prepare public notices for import"
 msgstr "Preparar notas public pro importation"
 
+#. TRANS: "In progress" description.
+#. TRANS: %d is the number of notices to be prepared for import.
 #, php-format
 msgid "Preparing %d notice..."
 msgid_plural "Preparing %d notices..."
 msgstr[0] "Prepara %d nota..."
 msgstr[1] "Prepara %d notas..."
 
+#. TRANS: "Complete" description for step.
+#. TRANS: %d is the number of notices prepared for import.
 #, php-format
 msgid "Prepared %d notice."
 msgid_plural "Prepared %d notices."
 msgstr[0] "%d nota preparate."
 msgstr[1] "%d notas preparate."
 
+#. TRANS: Field label for a Yammer import notices step.
 msgid "Import public notices"
 msgstr "Importar notas public"
 
+#. TRANS: "In progress" description.
+#. TRANS: %d is the number of notices to be imported.
 #, php-format
 msgid "Importing %d notice..."
 msgid_plural "Importing %d notices..."
 msgstr[0] "Importa %d nota..."
 msgstr[1] "Importa %d notas..."
 
+#. TRANS: "Complete" description for step.
+#. TRANS: %d is the number of notices imported.
 #, php-format
 msgid "Imported %d notice."
 msgid_plural "Imported %d notices."
 msgstr[0] "%d nota importate."
 msgstr[1] "%d notas importate."
 
+#. TRANS: Field label for a Yammer import done step.
 msgid "Done"
 msgstr "Finite"
 
+#. TRANS: "In progress" description for done step.
+#. TRANS: "Complete" description for done step.
 msgid "Import is complete!"
 msgstr "Le importation es complete!"
 
+#. TRANS: Fieldset legend.
 msgid "Import status"
 msgstr "Stato de importation"
 
+#. TRANS: Progress bar status.
 msgid "Waiting..."
 msgstr "Attende..."
 
+#. TRANS: Button text for resetting the import state.
 msgid "Reset import state"
 msgstr "Reinitialisar stato de importation"
 
+#. TRANS: Button text for pausing an import.
 msgid "Pause import"
 msgstr "Pausar importation"
 
+#. TRANS: Error message. %s are the error details.
 #, php-format
-msgid "Encountered error \"%s\""
-msgstr "Incontrava error \"%s\""
+msgid "Encountered error \"%s\"."
+msgstr "Incontrava error \"%s\"."
 
+#. TRANS: Fieldset legend for a paused import.
 msgid "Paused"
 msgstr "Pausate"
 
+#. TRANS: Button text for continuing a paused import.
 msgid "Continue"
 msgstr "Continuar"
 
+#. TRANS: Button text for aborting a paused import.
 msgid "Abort import"
 msgstr "Abortar importation"
 
+#. TRANS: Form instructions.
 msgid ""
 "Follow this link to confirm authorization at Yammer; you will be prompted to "
 "log in if necessary:"
@@ -181,21 +284,32 @@ msgstr ""
 "Seque iste ligamine pro confirmar autorisation a Yammer; tu essera demandate "
 "de aperir session si necessari:"
 
+#. TRANS: Link description for a link in an external Yammer system.
 msgid "Open Yammer authentication window"
 msgstr "Aperir fenestra de authentication a Yammer"
 
+#. TRANS: Form instructions.
 msgid "Copy the verification code you are given below:"
 msgstr "Copia hic infra le codice de verification que tu recipe:"
 
+#. TRANS: Field label.
 msgid "Verification code:"
 msgstr "Codice de verification:"
 
-msgid "Save code and begin import"
-msgstr "Salveguardar codice e comenciar importation"
+#. TRANS: Button text for saving  Yammer authorisation data and starting Yammer import.
+msgctxt "BUTTON"
+msgid "Continue"
+msgstr "Continuar"
 
+#. TRANS: Button title for saving  Yammer authorisation data and starting Yammer import.
+msgid "Save the verification code and begin import."
+msgstr "Salveguardar le codice de verification e comenciar le importation."
+
+#. TRANS: Form legend for adding details to connect to a remote Yammer API.
 msgid "Yammer API registration"
 msgstr "Registration in API de Yammer"
 
+#. TRANS: Explanation of what needs to be done to connect to a Yammer network.
 msgid ""
 "Before we can connect to your Yammer network, you will need to register the "
 "importer as an application authorized to pull data on your behalf. This "
@@ -208,22 +322,29 @@ msgstr ""
 "pro registrar le application a Yammer; tu essera demandate de aperir session "
 "si necessari:"
 
+#. TRANS: Link description to a Yammer application registration form.
 msgid "Open Yammer application registration form"
 msgstr "Aperir formulario de registration del application Yammer"
 
+#. TRANS: Instructions.
 msgid "Copy the consumer key and secret you are given into the form below:"
 msgstr ""
 "Copia le clave e secreto de consumitor que tu recipe in le formulario hic "
 "infra:"
 
+#. TRANS: Field label for a Yammer consumer key.
 msgid "Consumer key:"
 msgstr "Clave de consumitor:"
 
+#. TRANS: Field label for a Yammer consumer secret.
 msgid "Consumer secret:"
 msgstr "Secreto de consumitor:"
 
+#. TRANS: Button text for saving a Yammer API registration.
+msgctxt "BUTTON"
 msgid "Save"
 msgstr "Salveguardar"
 
-msgid "Save these consumer keys"
-msgstr "Salveguardar iste claves de consumitor"
+#. TRANS: Button title for saving a Yammer API registration.
+msgid "Save the entered consumer key and consumer secret."
+msgstr "Salveguardar le clave de consumitor e secreto de consumitor entrate."
diff --git a/plugins/YammerImport/locale/mk/LC_MESSAGES/YammerImport.po b/plugins/YammerImport/locale/mk/LC_MESSAGES/YammerImport.po
index 35bb3787b6..6235fcd4a2 100644
--- a/plugins/YammerImport/locale/mk/LC_MESSAGES/YammerImport.po
+++ b/plugins/YammerImport/locale/mk/LC_MESSAGES/YammerImport.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - YammerImport to Macedonian (Македон�ки)
+# Translation of StatusNet - YammerImport to Macedonian (македон�ки)
 # Exported from translatewiki.net
 #
 # Author: Bjankuloski06
@@ -9,24 +9,30 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - YammerImport\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:52:00+0000\n"
-"Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:34+0000\n"
+"Language-Team: Macedonian <https://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:56+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-12-03 13:51:41+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-yammerimport\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
 
+#. TRANS: Page title for Yammer administration panel.
+#. TRANS: Form legend.
+#. TRANS: Field label for a Yammer import connect step.
+#. TRANS: Form legend.
 msgid "Connect to Yammer"
 msgstr "Поврзување �о Yammer"
 
+#. TRANS: Page title for Yammer import administration panel.
 msgid "Yammer Import"
 msgstr "Увоз од Yammer"
 
+#. TRANS: Instructions for Yammer import administration panel.
 msgid ""
 "This Yammer import tool is still undergoing testing, and is incomplete in "
 "some areas. Currently user subscriptions and group memberships are not "
@@ -38,141 +44,237 @@ msgstr ""
 "член�тва во групи. Ваквите префрлања може да �е поддржани во иднина, и тие "
 "би ги вршеле овла�тени админи�тратори на Yammer."
 
+#. TRANS: Error message about an import job being paused from the admin panel.
 msgid "Paused from admin panel."
 msgstr "Паузирано од админи�тратор�ката табла."
 
+#. TRANS: Client exception thrown when encountering an unhandled sub action.
+msgid "Invalid POST"
+msgstr "�еважечки POST"
+
+#. TRANS: Page title for Yammer import administration panel.
 msgid "Yammer import"
 msgstr "Увоз од Yammer"
 
+#. TRANS: Menu item for Yammer import.
+msgctxt "MENU"
 msgid "Yammer"
 msgstr "Yammer"
 
+#. TRANS: Menu item title for Yammer import.
+msgid "Yammer import module."
+msgstr "Модул за увоз од Yammer."
+
+#. TRANS: Exception thrown when a non-user item type is used, but expected.
+msgid "Wrong item type sent to Yammer user import processing."
+msgstr "�а увозот на кори�ник од Yammer му е и�пратен погрешен тип на �тавка."
+
+#. TRANS: Used as a prefix for the Yammer expertise field contents.
 msgid "Expertise:"
 msgstr "Стручно�т:"
 
+#. TRANS: Exception thrown when a non-group item type is used, but expected.
+msgid "Wrong item type sent to Yammer group import processing."
+msgstr ""
+"�а групниот увоз на кори�ници од Yammer му е и�пратен погрешен тип на �тавка."
+
+#. TRANS: Exception thrown when a non-message item type is used, but expected.
+msgid "Wrong item type sent to Yammer message import processing."
+msgstr "�а увозот на пораки од Yammer му е и�пратен погрешен тип на �тавка."
+
+#. TRANS: Server exception thrown when an avatar URL is invalid.
+#. TRANS: %s is the invalid avatar URL.
 #, php-format
 msgid "Invalid avatar URL %s."
 msgstr "�еважечка URL-адре�а на аватарот: %s."
 
+#. TRANS: Server exception thrown when an avatar could not be fetched.
+#. TRANS: %s is the failed avatar URL.
 #, php-format
 msgid "Unable to fetch avatar from %s."
 msgstr "�е можев да го преземам аватарот од %s."
 
+#. TRANS: Button text for starting Yammer authentication.
+msgctxt "BUTTON"
 msgid "Start authentication"
-msgstr "Започни проверка"
+msgstr "Започни заверка"
 
-msgid "Request authorization to connect to Yammer account"
-msgstr "Барај овла�тување за поврзување �о �метката на Yammer"
+#. TRANS: Button title for starting Yammer authentication.
+msgid "Request authorization to connect to a Yammer account."
+msgstr "Побарај овла�тување за поврзување �о �метката на Yammer."
 
+#. TRANS: Button text for starting changing a Yammer API key.
+msgctxt "BUTTON"
 msgid "Change API key"
-msgstr "Промени API-клуч"
+msgstr "Смени API-клуч"
 
+#. TRANS: Server exception thrown if a Yammer authentication request is already present.
+msgid "Cannot request Yammer auth; already there!"
+msgstr "�е можам да побарам заверка од Yammer. Веќе �те таму!"
+
+#. TRANS: Server exception thrown when requesting a Yammer authentication URL while in an incorrect state.
+msgid "Cannot get Yammer auth URL when not in requesting-auth state!"
+msgstr ""
+"�е можам да ја добијам URL-адр�ата за заверка на Yammer кога не �те во таков "
+"режим!"
+
+#. TRANS: Exeption thrown when an external Yammer system gives an error.
+#. TRANS: %1$s is an HTTP error code, %2$s is the error message body.
+#, php-format
+msgid "Yammer API returned HTTP code %1$s: %2$s"
+msgstr "API на Yammer го даде HTTP-кодот %1$s: %2$s"
+
+#. TRANS: Exeption thrown when an external Yammer system an invalid JSON response.
+msgid "Invalid JSON response from Yammer API."
+msgstr "�еважечки JSON-одговор од API на Yammer."
+
+#. TRANS: Exeption thrown when a trust relationship has already been established.
+msgid "Requesting a token, but already set up with a token."
+msgstr "Жетонот е веќе по�тавен."
+
+#. TRANS: Field label for a Yammer import initialise step.
 msgid "Initialize"
 msgstr "Започни"
 
+#. TRANS: "In progress" description.
 msgid "No import running"
 msgstr "Увозот не е во тек"
 
+#. TRANS: "Complete" description for initialize state.
 msgid "Initiated Yammer server connection..."
 msgstr "Започнав �о поврзувањето �о оп�лужувачот на Yammer..."
 
+#. TRANS: "In progress" description.
 msgid "Awaiting authorization..."
 msgstr "Чекам на овла�тување..."
 
+#. TRANS: "Complete" description for connect state.
 msgid "Connected."
 msgstr "Поврзано."
 
+#. TRANS: Field label for a Yammer user import users step.
 msgid "Import user accounts"
 msgstr "Увези кори�нички �метки"
 
+#. TRANS: "In progress" description.
+#. TRANS: %d is the number of users to be imported.
 #, php-format
 msgid "Importing %d user..."
 msgid_plural "Importing %d users..."
 msgstr[0] "Увезувам %d кори�ник..."
 msgstr[1] "Увезувам %d кори�ници..."
 
+#. TRANS: "Complete" description for step.
+#. TRANS: %d is the number of users imported.
 #, php-format
 msgid "Imported %d user."
 msgid_plural "Imported %d users."
 msgstr[0] "Увезов %d кори�ник."
 msgstr[1] "Увезов %d кори�ници."
 
+#. TRANS: Field label for a Yammer group import step.
 msgid "Import user groups"
 msgstr "Увези кори�нички групи"
 
+#. TRANS: "In progress" description.
+#. TRANS: %d is the number of groups to be imported.
 #, php-format
 msgid "Importing %d group..."
 msgid_plural "Importing %d groups..."
 msgstr[0] "Увезувам %d група..."
 msgstr[1] "Увезувам %d групи..."
 
+#. TRANS: "Complete" description for step.
+#. TRANS: %d is the number of groups imported.
 #, php-format
 msgid "Imported %d group."
 msgid_plural "Imported %d groups."
 msgstr[0] "Увезов %d група."
 msgstr[1] "Увезов %d групи."
 
+#. TRANS: Field label for a Yammer import prepare notices step.
 msgid "Prepare public notices for import"
 msgstr "Подготви јавни изве�тувања за увоз"
 
+#. TRANS: "In progress" description.
+#. TRANS: %d is the number of notices to be prepared for import.
 #, php-format
 msgid "Preparing %d notice..."
 msgid_plural "Preparing %d notices..."
 msgstr[0] "Подготвувам %d изве�тување..."
 msgstr[1] "Подготвувам %d изве�тувања..."
 
+#. TRANS: "Complete" description for step.
+#. TRANS: %d is the number of notices prepared for import.
 #, php-format
 msgid "Prepared %d notice."
 msgid_plural "Prepared %d notices."
 msgstr[0] "Подготвив %d изве�тување."
 msgstr[1] "Подготвив %d изве�тувања."
 
+#. TRANS: Field label for a Yammer import notices step.
 msgid "Import public notices"
 msgstr "Увези јавни изве�тувања"
 
+#. TRANS: "In progress" description.
+#. TRANS: %d is the number of notices to be imported.
 #, php-format
 msgid "Importing %d notice..."
 msgid_plural "Importing %d notices..."
 msgstr[0] "Увезувам %d изве�тување..."
 msgstr[1] "Увезувам %d изве�тувања..."
 
+#. TRANS: "Complete" description for step.
+#. TRANS: %d is the number of notices imported.
 #, php-format
 msgid "Imported %d notice."
 msgid_plural "Imported %d notices."
 msgstr[0] "Увезов %d изве�тување..."
 msgstr[1] "Увезов %d изве�тувања..."
 
+#. TRANS: Field label for a Yammer import done step.
 msgid "Done"
 msgstr "Готово"
 
+#. TRANS: "In progress" description for done step.
+#. TRANS: "Complete" description for done step.
 msgid "Import is complete!"
 msgstr "Увозот заврши!"
 
+#. TRANS: Fieldset legend.
 msgid "Import status"
 msgstr "Увези �тату�"
 
+#. TRANS: Progress bar status.
 msgid "Waiting..."
 msgstr "Чекам..."
 
+#. TRANS: Button text for resetting the import state.
 msgid "Reset import state"
 msgstr "Врати о�новна �о�тојба на увозот"
 
+#. TRANS: Button text for pausing an import.
 msgid "Pause import"
 msgstr "Паузирај увоз"
 
+#. TRANS: Error message. %s are the error details.
 #, php-format
-msgid "Encountered error \"%s\""
-msgstr "�аидов на грешка „%s“"
+msgid "Encountered error \"%s\"."
+msgstr "�аидов на грешка „%s“."
 
+#. TRANS: Fieldset legend for a paused import.
 msgid "Paused"
 msgstr "Паузирано"
 
+#. TRANS: Button text for continuing a paused import.
 msgid "Continue"
 msgstr "Продолжи"
 
+#. TRANS: Button text for aborting a paused import.
 msgid "Abort import"
 msgstr "Прекини увоз"
 
+#. TRANS: Form instructions.
 msgid ""
 "Follow this link to confirm authorization at Yammer; you will be prompted to "
 "log in if necessary:"
@@ -180,21 +282,32 @@ msgstr ""
 "Про�ледете ја вр�кава за да го потврдите овла�тувањето на �траницата на "
 "Yammer. �ко е потребно, ќе Ви биде побарано да �е најавите:"
 
+#. TRANS: Link description for a link in an external Yammer system.
 msgid "Open Yammer authentication window"
 msgstr "Отвори прозорец за потврда на Yammer"
 
+#. TRANS: Form instructions.
 msgid "Copy the verification code you are given below:"
 msgstr "И�копирајте го долунаведениот потврден код:"
 
+#. TRANS: Field label.
 msgid "Verification code:"
 msgstr "Потврден код:"
 
-msgid "Save code and begin import"
-msgstr "Зачувај код и почни �о увоз"
+#. TRANS: Button text for saving  Yammer authorisation data and starting Yammer import.
+msgctxt "BUTTON"
+msgid "Continue"
+msgstr "Продолжи"
 
+#. TRANS: Button title for saving  Yammer authorisation data and starting Yammer import.
+msgid "Save the verification code and begin import."
+msgstr "Зачувај го потврдниот код и почни �о увоз."
+
+#. TRANS: Form legend for adding details to connect to a remote Yammer API.
 msgid "Yammer API registration"
 msgstr "Реги�трација на API за Yammer"
 
+#. TRANS: Explanation of what needs to be done to connect to a Yammer network.
 msgid ""
 "Before we can connect to your Yammer network, you will need to register the "
 "importer as an application authorized to pull data on your behalf. This "
@@ -207,22 +320,29 @@ msgstr ""
 "вр�ката за да го реги�трирате програмот на Yammer. �ко е потребно, ќе Ви "
 "биде побарано да �е најавите:"
 
+#. TRANS: Link description to a Yammer application registration form.
 msgid "Open Yammer application registration form"
 msgstr "Отвори образец за реги�трација на програм на Yammer"
 
+#. TRANS: Instructions.
 msgid "Copy the consumer key and secret you are given into the form below:"
 msgstr ""
 "И�копирајте ги потрошувачкиот клуч и тајната што �е наведени во образецот "
 "подолу:"
 
+#. TRANS: Field label for a Yammer consumer key.
 msgid "Consumer key:"
 msgstr "Потрошувачки клуч:"
 
+#. TRANS: Field label for a Yammer consumer secret.
 msgid "Consumer secret:"
 msgstr "Потрошувачка тајна:"
 
+#. TRANS: Button text for saving a Yammer API registration.
+msgctxt "BUTTON"
 msgid "Save"
 msgstr "Зачувај"
 
-msgid "Save these consumer keys"
-msgstr "Зачувај ги овие потрошувачки клучеви"
+#. TRANS: Button title for saving a Yammer API registration.
+msgid "Save the entered consumer key and consumer secret."
+msgstr "Зачувај го вне�ениот потрошувачки клуч и потрошувачка тајна."
diff --git a/plugins/YammerImport/locale/ms/LC_MESSAGES/YammerImport.po b/plugins/YammerImport/locale/ms/LC_MESSAGES/YammerImport.po
index decf939064..675d700957 100644
--- a/plugins/YammerImport/locale/ms/LC_MESSAGES/YammerImport.po
+++ b/plugins/YammerImport/locale/ms/LC_MESSAGES/YammerImport.po
@@ -9,24 +9,30 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - YammerImport\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:52:00+0000\n"
+"POT-Creation-Date: 2011-06-19 13:18+0000\n"
+"PO-Revision-Date: 2011-06-19 13:18:15+0000\n"
 "Language-Team: Malay <http://translatewiki.net/wiki/Portal:ms>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:56+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
+"X-POT-Import-Date: 2011-06-05 21:52:16+0000\n"
+"X-Generator: MediaWiki 1.19alpha (r90375); Translate extension (2011-06-02)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ms\n"
 "X-Message-Group: #out-statusnet-plugin-yammerimport\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#. TRANS: Page title for Yammer administration panel.
+#. TRANS: Form legend.
+#. TRANS: Field label for a Yammer import connect step.
+#. TRANS: Form legend.
 msgid "Connect to Yammer"
 msgstr ""
 
+#. TRANS: Page title for Yammer import administration panel.
 msgid "Yammer Import"
 msgstr "Import dari Yammer"
 
+#. TRANS: Instructions for Yammer import administration panel.
 msgid ""
 "This Yammer import tool is still undergoing testing, and is incomplete in "
 "some areas. Currently user subscriptions and group memberships are not "
@@ -34,153 +40,263 @@ msgid ""
 "verified administrators on the Yammer side."
 msgstr ""
 
+#. TRANS: Error message about an import job being paused from the admin panel.
 msgid "Paused from admin panel."
 msgstr "Berhenti dari panel pentadbir."
 
+#. TRANS: Client exception thrown when encountering an unhandled sub action.
+msgid "Invalid POST"
+msgstr ""
+
+#. TRANS: Page title for Yammer import administration panel.
 msgid "Yammer import"
 msgstr "Import dari Yammer"
 
+#. TRANS: Menu item for Yammer import.
+#, fuzzy
+msgctxt "MENU"
 msgid "Yammer"
 msgstr "Yammer"
 
+#. TRANS: Menu item title for Yammer import.
+#, fuzzy
+msgid "Yammer import module."
+msgstr "Import dari Yammer"
+
+#. TRANS: Exception thrown when a non-user item type is used, but expected.
+msgid "Wrong item type sent to Yammer user import processing."
+msgstr ""
+
+#. TRANS: Used as a prefix for the Yammer expertise field contents.
 msgid "Expertise:"
 msgstr "Kepakaran:"
 
+#. TRANS: Exception thrown when a non-group item type is used, but expected.
+msgid "Wrong item type sent to Yammer group import processing."
+msgstr ""
+
+#. TRANS: Exception thrown when a non-message item type is used, but expected.
+msgid "Wrong item type sent to Yammer message import processing."
+msgstr ""
+
+#. TRANS: Server exception thrown when an avatar URL is invalid.
+#. TRANS: %s is the invalid avatar URL.
 #, php-format
 msgid "Invalid avatar URL %s."
 msgstr "URL avatar %s tidak sah."
 
+#. TRANS: Server exception thrown when an avatar could not be fetched.
+#. TRANS: %s is the failed avatar URL.
 #, php-format
 msgid "Unable to fetch avatar from %s."
 msgstr "Avatar tidak dapat diambil dari %s."
 
+#. TRANS: Button text for starting Yammer authentication.
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Start authentication"
 msgstr "Mulakan pengesahan"
 
-msgid "Request authorization to connect to Yammer account"
+#. TRANS: Button title for starting Yammer authentication.
+#, fuzzy
+msgid "Request authorization to connect to a Yammer account."
 msgstr "Minta kebenaran untuk bersambung dengan akaun Yammer"
 
+#. TRANS: Button text for starting changing a Yammer API key.
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Change API key"
 msgstr "Tukar kunci API"
 
+#. TRANS: Server exception thrown if a Yammer authentication request is already present.
+msgid "Cannot request Yammer auth; already there!"
+msgstr ""
+
+#. TRANS: Server exception thrown when requesting a Yammer authentication URL while in an incorrect state.
+msgid "Cannot get Yammer auth URL when not in requesting-auth state!"
+msgstr ""
+
+#. TRANS: Exeption thrown when an external Yammer system gives an error.
+#. TRANS: %1$s is an HTTP error code, %2$s is the error message body.
+#, php-format
+msgid "Yammer API returned HTTP code %1$s: %2$s"
+msgstr ""
+
+#. TRANS: Exeption thrown when an external Yammer system an invalid JSON response.
+msgid "Invalid JSON response from Yammer API."
+msgstr ""
+
+#. TRANS: Exeption thrown when a trust relationship has already been established.
+msgid "Requesting a token, but already set up with a token."
+msgstr ""
+
+#. TRANS: Field label for a Yammer import initialise step.
 msgid "Initialize"
 msgstr "Mulakan"
 
+#. TRANS: "In progress" description.
 msgid "No import running"
 msgstr "Proses import tidak berjalan"
 
+#. TRANS: "Complete" description for initialize state.
 msgid "Initiated Yammer server connection..."
 msgstr "Sambungan pelayan Yammer dimulakan..."
 
+#. TRANS: "In progress" description.
 msgid "Awaiting authorization..."
 msgstr "Menunggu kebenaran..."
 
+#. TRANS: "Complete" description for connect state.
 msgid "Connected."
 msgstr "Bersambung."
 
+#. TRANS: Field label for a Yammer user import users step.
 msgid "Import user accounts"
 msgstr "Import akaun pengguna"
 
+#. TRANS: "In progress" description.
+#. TRANS: %d is the number of users to be imported.
 #, php-format
 msgid "Importing %d user..."
 msgid_plural "Importing %d users..."
 msgstr[0] ""
 
+#. TRANS: "Complete" description for step.
+#. TRANS: %d is the number of users imported.
 #, php-format
 msgid "Imported %d user."
 msgid_plural "Imported %d users."
 msgstr[0] ""
 
+#. TRANS: Field label for a Yammer group import step.
 msgid "Import user groups"
 msgstr ""
 
+#. TRANS: "In progress" description.
+#. TRANS: %d is the number of groups to be imported.
 #, php-format
 msgid "Importing %d group..."
 msgid_plural "Importing %d groups..."
 msgstr[0] ""
 
+#. TRANS: "Complete" description for step.
+#. TRANS: %d is the number of groups imported.
 #, php-format
 msgid "Imported %d group."
 msgid_plural "Imported %d groups."
 msgstr[0] ""
 
+#. TRANS: Field label for a Yammer import prepare notices step.
 msgid "Prepare public notices for import"
 msgstr ""
 
+#. TRANS: "In progress" description.
+#. TRANS: %d is the number of notices to be prepared for import.
 #, php-format
 msgid "Preparing %d notice..."
 msgid_plural "Preparing %d notices..."
 msgstr[0] ""
 
+#. TRANS: "Complete" description for step.
+#. TRANS: %d is the number of notices prepared for import.
 #, php-format
 msgid "Prepared %d notice."
 msgid_plural "Prepared %d notices."
 msgstr[0] ""
 
+#. TRANS: Field label for a Yammer import notices step.
 msgid "Import public notices"
 msgstr ""
 
+#. TRANS: "In progress" description.
+#. TRANS: %d is the number of notices to be imported.
 #, php-format
 msgid "Importing %d notice..."
 msgid_plural "Importing %d notices..."
 msgstr[0] ""
 
+#. TRANS: "Complete" description for step.
+#. TRANS: %d is the number of notices imported.
 #, php-format
 msgid "Imported %d notice."
 msgid_plural "Imported %d notices."
 msgstr[0] ""
 
+#. TRANS: Field label for a Yammer import done step.
 msgid "Done"
 msgstr "Siap"
 
+#. TRANS: "In progress" description for done step.
+#. TRANS: "Complete" description for done step.
 msgid "Import is complete!"
 msgstr "Proses import selesai!"
 
+#. TRANS: Fieldset legend.
 msgid "Import status"
 msgstr ""
 
+#. TRANS: Progress bar status.
 msgid "Waiting..."
 msgstr "Menunggu..."
 
+#. TRANS: Button text for resetting the import state.
 msgid "Reset import state"
 msgstr ""
 
+#. TRANS: Button text for pausing an import.
 msgid "Pause import"
 msgstr "Hentikan import"
 
+#. TRANS: Error message. %s are the error details.
 #, php-format
-msgid "Encountered error \"%s\""
+msgid "Encountered error \"%s\"."
 msgstr ""
 
+#. TRANS: Fieldset legend for a paused import.
 msgid "Paused"
 msgstr "Terhenti"
 
+#. TRANS: Button text for continuing a paused import.
 msgid "Continue"
 msgstr "Sambung"
 
+#. TRANS: Button text for aborting a paused import.
 msgid "Abort import"
 msgstr ""
 
+#. TRANS: Form instructions.
 msgid ""
 "Follow this link to confirm authorization at Yammer; you will be prompted to "
 "log in if necessary:"
 msgstr ""
 
+#. TRANS: Link description for a link in an external Yammer system.
 msgid "Open Yammer authentication window"
 msgstr ""
 
+#. TRANS: Form instructions.
 msgid "Copy the verification code you are given below:"
 msgstr ""
 
+#. TRANS: Field label.
 msgid "Verification code:"
 msgstr ""
 
-msgid "Save code and begin import"
+#. TRANS: Button text for saving  Yammer authorisation data and starting Yammer import.
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Continue"
+msgstr "Sambung"
+
+#. TRANS: Button title for saving  Yammer authorisation data and starting Yammer import.
+msgid "Save the verification code and begin import."
 msgstr ""
 
+#. TRANS: Form legend for adding details to connect to a remote Yammer API.
 msgid "Yammer API registration"
 msgstr ""
 
+#. TRANS: Explanation of what needs to be done to connect to a Yammer network.
 msgid ""
 "Before we can connect to your Yammer network, you will need to register the "
 "importer as an application authorized to pull data on your behalf. This "
@@ -188,20 +304,29 @@ msgid ""
 "register the app at Yammer; you will be prompted to log in if necessary:"
 msgstr ""
 
+#. TRANS: Link description to a Yammer application registration form.
 msgid "Open Yammer application registration form"
 msgstr ""
 
+#. TRANS: Instructions.
 msgid "Copy the consumer key and secret you are given into the form below:"
 msgstr ""
 
+#. TRANS: Field label for a Yammer consumer key.
 msgid "Consumer key:"
 msgstr "Kunci pengguna:"
 
+#. TRANS: Field label for a Yammer consumer secret.
 msgid "Consumer secret:"
 msgstr "Rahsia pengguna:"
 
+#. TRANS: Button text for saving a Yammer API registration.
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Save"
 msgstr "Simpan"
 
-msgid "Save these consumer keys"
+#. TRANS: Button title for saving a Yammer API registration.
+#, fuzzy
+msgid "Save the entered consumer key and consumer secret."
 msgstr "Simpan kunci pengguna ini"
diff --git a/plugins/YammerImport/locale/nl/LC_MESSAGES/YammerImport.po b/plugins/YammerImport/locale/nl/LC_MESSAGES/YammerImport.po
index 8955f88b69..d6c0401a37 100644
--- a/plugins/YammerImport/locale/nl/LC_MESSAGES/YammerImport.po
+++ b/plugins/YammerImport/locale/nl/LC_MESSAGES/YammerImport.po
@@ -10,24 +10,30 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - YammerImport\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:52:00+0000\n"
-"Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:34+0000\n"
+"Language-Team: Dutch <https://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:56+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-12-03 13:51:41+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-yammerimport\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Page title for Yammer administration panel.
+#. TRANS: Form legend.
+#. TRANS: Field label for a Yammer import connect step.
+#. TRANS: Form legend.
 msgid "Connect to Yammer"
 msgstr "Verbinden met Yammer"
 
+#. TRANS: Page title for Yammer import administration panel.
 msgid "Yammer Import"
 msgstr "Yammerimport"
 
+#. TRANS: Instructions for Yammer import administration panel.
 msgid ""
 "This Yammer import tool is still undergoing testing, and is incomplete in "
 "some areas. Currently user subscriptions and group memberships are not "
@@ -40,141 +46,244 @@ msgstr ""
 "mogelijk voor imports die door bevestigde beheerders in Yammer worden "
 "uitgevoerd."
 
+#. TRANS: Error message about an import job being paused from the admin panel.
 msgid "Paused from admin panel."
 msgstr "Gepauzeerd vanuit het beheerpaneel."
 
+#. TRANS: Client exception thrown when encountering an unhandled sub action.
+msgid "Invalid POST"
+msgstr "Ongeldige POST."
+
+#. TRANS: Page title for Yammer import administration panel.
 msgid "Yammer import"
 msgstr "Yammerimport"
 
+#. TRANS: Menu item for Yammer import.
+msgctxt "MENU"
 msgid "Yammer"
 msgstr "Yammer"
 
+#. TRANS: Menu item title for Yammer import.
+msgid "Yammer import module."
+msgstr "De importmodule voor Yammer."
+
+#. TRANS: Exception thrown when a non-user item type is used, but expected.
+msgid "Wrong item type sent to Yammer user import processing."
+msgstr ""
+"Er is een incorrect type verzonden naar de verwerking van de "
+"gebruikersimport van Yammer."
+
+#. TRANS: Used as a prefix for the Yammer expertise field contents.
 msgid "Expertise:"
 msgstr "Expertise:"
 
+#. TRANS: Exception thrown when a non-group item type is used, but expected.
+msgid "Wrong item type sent to Yammer group import processing."
+msgstr ""
+"Er is een incorrect type verzonden naar de verwerking van de groepenimport "
+"van Yammer."
+
+#. TRANS: Exception thrown when a non-message item type is used, but expected.
+msgid "Wrong item type sent to Yammer message import processing."
+msgstr ""
+"Er is een incorrect type verzonden naar de verwerking van de berichtenimport "
+"van Yammer."
+
+#. TRANS: Server exception thrown when an avatar URL is invalid.
+#. TRANS: %s is the invalid avatar URL.
 #, php-format
 msgid "Invalid avatar URL %s."
-msgstr "%s is een ongeldige URL voor avatar."
+msgstr "Ongeldige avatar-URL %s."
 
+#. TRANS: Server exception thrown when an avatar could not be fetched.
+#. TRANS: %s is the failed avatar URL.
 #, php-format
 msgid "Unable to fetch avatar from %s."
-msgstr "Het was niet mogelijk de avatar op te halen van %s."
+msgstr "Het was niet mogelijk om de avatar op te halen van %s."
 
+#. TRANS: Button text for starting Yammer authentication.
+msgctxt "BUTTON"
 msgid "Start authentication"
 msgstr "Authenticatie starten"
 
-msgid "Request authorization to connect to Yammer account"
-msgstr "Autorisatie verzoeken om te verbinden met Yammergebruiker"
+#. TRANS: Button title for starting Yammer authentication.
+msgid "Request authorization to connect to a Yammer account."
+msgstr "Autorisatie verzoeken om te verbinden met een Yammergebruiker."
 
+#. TRANS: Button text for starting changing a Yammer API key.
+msgctxt "BUTTON"
 msgid "Change API key"
 msgstr "API-sleutel wijzigen"
 
+#. TRANS: Server exception thrown if a Yammer authentication request is already present.
+msgid "Cannot request Yammer auth; already there!"
+msgstr ""
+"Het authenticatieverzoek voor Yammer kan niet uitgevoerd worden. Het bestaat "
+"al!"
+
+#. TRANS: Server exception thrown when requesting a Yammer authentication URL while in an incorrect state.
+msgid "Cannot get Yammer auth URL when not in requesting-auth state!"
+msgstr ""
+"Het is niet mogelijk een authenticatie-URL voor Yammer te verkrijgen als de "
+"workflowstatus niet \"requesting-auth\" is!"
+
+#. TRANS: Exeption thrown when an external Yammer system gives an error.
+#. TRANS: %1$s is an HTTP error code, %2$s is the error message body.
+#, php-format
+msgid "Yammer API returned HTTP code %1$s: %2$s"
+msgstr "De Yammer-API heeft de HTTP-code %1$s teruggegeven: %2$s"
+
+#. TRANS: Exeption thrown when an external Yammer system an invalid JSON response.
+msgid "Invalid JSON response from Yammer API."
+msgstr "Er is een ongeldig JSON-antwoord van de Yammer-API ontvangen."
+
+#. TRANS: Exeption thrown when a trust relationship has already been established.
+msgid "Requesting a token, but already set up with a token."
+msgstr "Er is om een token gevraagd, maar er is al een token beschikbaar."
+
+#. TRANS: Field label for a Yammer import initialise step.
 msgid "Initialize"
 msgstr "Initialiseren"
 
+#. TRANS: "In progress" description.
 msgid "No import running"
 msgstr "Er loopt geen import"
 
+#. TRANS: "Complete" description for initialize state.
 msgid "Initiated Yammer server connection..."
 msgstr "Er is verbinding gemaakt met de Yammerserver..."
 
+#. TRANS: "In progress" description.
 msgid "Awaiting authorization..."
 msgstr "Wachten op autorisatie..."
 
+#. TRANS: "Complete" description for connect state.
 msgid "Connected."
 msgstr "Verbonden."
 
+#. TRANS: Field label for a Yammer user import users step.
 msgid "Import user accounts"
 msgstr "Gebruikers importeren"
 
+#. TRANS: "In progress" description.
+#. TRANS: %d is the number of users to be imported.
 #, php-format
 msgid "Importing %d user..."
 msgid_plural "Importing %d users..."
 msgstr[0] "Bezig met het importeren van %d gebruiker..."
 msgstr[1] "Bezig met het importeren van %d gebruikers..."
 
+#. TRANS: "Complete" description for step.
+#. TRANS: %d is the number of users imported.
 #, php-format
 msgid "Imported %d user."
 msgid_plural "Imported %d users."
 msgstr[0] "%d gebruiker geïmporteerd."
 msgstr[1] "%d gebruikers geïmporteerd."
 
+#. TRANS: Field label for a Yammer group import step.
 msgid "Import user groups"
 msgstr "Gebruikersgroepen importeren"
 
+#. TRANS: "In progress" description.
+#. TRANS: %d is the number of groups to be imported.
 #, php-format
 msgid "Importing %d group..."
 msgid_plural "Importing %d groups..."
 msgstr[0] "Bezig met het importeren van %d gebruikersgroep..."
 msgstr[1] "Bezig met het importeren van %d gebruikersgroepen..."
 
+#. TRANS: "Complete" description for step.
+#. TRANS: %d is the number of groups imported.
 #, php-format
 msgid "Imported %d group."
 msgid_plural "Imported %d groups."
 msgstr[0] "%d gebruikersgroep geïmporteerd."
 msgstr[1] "%d gebruikersgroepen geïmporteerd."
 
+#. TRANS: Field label for a Yammer import prepare notices step.
 msgid "Prepare public notices for import"
 msgstr "Publieke mededelingen voorbereiden op import"
 
+#. TRANS: "In progress" description.
+#. TRANS: %d is the number of notices to be prepared for import.
 #, php-format
 msgid "Preparing %d notice..."
 msgid_plural "Preparing %d notices..."
 msgstr[0] "Bezig met het voorbereiden van %d mededeling..."
 msgstr[1] "Bezig met het voorbereiden van %d mededelingen..."
 
+#. TRANS: "Complete" description for step.
+#. TRANS: %d is the number of notices prepared for import.
 #, php-format
 msgid "Prepared %d notice."
 msgid_plural "Prepared %d notices."
 msgstr[0] "%d mededeling voorbereid."
 msgstr[1] "%d mededelingen voorbereid."
 
+#. TRANS: Field label for a Yammer import notices step.
 msgid "Import public notices"
 msgstr "Publieke mededelingen importeren"
 
+#. TRANS: "In progress" description.
+#. TRANS: %d is the number of notices to be imported.
 #, php-format
 msgid "Importing %d notice..."
 msgid_plural "Importing %d notices..."
 msgstr[0] "Bezig met het importeren van %d mededeling..."
 msgstr[1] "Bezig met het importeren van %d mededelingen..."
 
+#. TRANS: "Complete" description for step.
+#. TRANS: %d is the number of notices imported.
 #, php-format
 msgid "Imported %d notice."
 msgid_plural "Imported %d notices."
 msgstr[0] "%d mededeling geïmporteerd."
 msgstr[1] "%d mededelingen geïmporteerd."
 
+#. TRANS: Field label for a Yammer import done step.
 msgid "Done"
 msgstr "Afgerond"
 
+#. TRANS: "In progress" description for done step.
+#. TRANS: "Complete" description for done step.
 msgid "Import is complete!"
 msgstr "Het importeren is voltooid!"
 
+#. TRANS: Fieldset legend.
 msgid "Import status"
 msgstr "Importstatus"
 
+#. TRANS: Progress bar status.
 msgid "Waiting..."
 msgstr "Even geduld alstublieft..."
 
+#. TRANS: Button text for resetting the import state.
 msgid "Reset import state"
 msgstr "Importstatus herstellen"
 
+#. TRANS: Button text for pausing an import.
 msgid "Pause import"
 msgstr "Import pauzeren"
 
+#. TRANS: Error message. %s are the error details.
 #, php-format
-msgid "Encountered error \"%s\""
-msgstr "Er is een fout opgetreden: \"%s\""
+msgid "Encountered error \"%s\"."
+msgstr "Er is een fout opgetreden: \"%s\"."
 
+#. TRANS: Fieldset legend for a paused import.
 msgid "Paused"
 msgstr "Gepauzeerd"
 
+#. TRANS: Button text for continuing a paused import.
 msgid "Continue"
 msgstr "Doorgaan"
 
+#. TRANS: Button text for aborting a paused import.
 msgid "Abort import"
 msgstr "Import afbreken"
 
+#. TRANS: Form instructions.
 msgid ""
 "Follow this link to confirm authorization at Yammer; you will be prompted to "
 "log in if necessary:"
@@ -182,21 +291,32 @@ msgstr ""
 "Volg deze verwijzing om de autorisatie bij Yammer te bevestigen. Als u moet "
 "aanmelden wordt daarom gevraagd:"
 
+#. TRANS: Link description for a link in an external Yammer system.
 msgid "Open Yammer authentication window"
 msgstr "Authenticatievenster voor Yammer openen"
 
+#. TRANS: Form instructions.
 msgid "Copy the verification code you are given below:"
 msgstr "Kopieer de verificatiecode die u hebt gekregen hieronder:"
 
+#. TRANS: Field label.
 msgid "Verification code:"
 msgstr "Verificatiecode:"
 
-msgid "Save code and begin import"
-msgstr "Code opslaan en importeren"
+#. TRANS: Button text for saving  Yammer authorisation data and starting Yammer import.
+msgctxt "BUTTON"
+msgid "Continue"
+msgstr "Doorgaan"
 
+#. TRANS: Button title for saving  Yammer authorisation data and starting Yammer import.
+msgid "Save the verification code and begin import."
+msgstr "De verificatiecode opslaan en beginnen met importeren."
+
+#. TRANS: Form legend for adding details to connect to a remote Yammer API.
 msgid "Yammer API registration"
 msgstr "API-registratie voor Yammer"
 
+#. TRANS: Explanation of what needs to be done to connect to a Yammer network.
 msgid ""
 "Before we can connect to your Yammer network, you will need to register the "
 "importer as an application authorized to pull data on your behalf. This "
@@ -209,22 +329,29 @@ msgstr ""
 "onderstaande verwijzing om de applicatie bij Yammer te registreren. Als het "
 "nodig is om aan te melden, wordt u dat gevraagd:"
 
+#. TRANS: Link description to a Yammer application registration form.
 msgid "Open Yammer application registration form"
 msgstr "Applicatieregistratieformulier voor Yammer openen"
 
+#. TRANS: Instructions.
 msgid "Copy the consumer key and secret you are given into the form below:"
 msgstr ""
 "Kopieer de gebruikerssleutel en het gebruikersgeheim dat u hebt gekregen in "
 "het formulier hieronder:"
 
+#. TRANS: Field label for a Yammer consumer key.
 msgid "Consumer key:"
 msgstr "Gebruikerssleutel:"
 
+#. TRANS: Field label for a Yammer consumer secret.
 msgid "Consumer secret:"
 msgstr "Gebruikersgeheim:"
 
+#. TRANS: Button text for saving a Yammer API registration.
+msgctxt "BUTTON"
 msgid "Save"
 msgstr "Opslaan"
 
-msgid "Save these consumer keys"
-msgstr "Deze gebruikerssleutels opslaan"
+#. TRANS: Button title for saving a Yammer API registration.
+msgid "Save the entered consumer key and consumer secret."
+msgstr "De ingevoerde gebruikerssleutel en het gebruikersgeheim opslaan."
diff --git a/plugins/YammerImport/locale/pl/LC_MESSAGES/YammerImport.po b/plugins/YammerImport/locale/pl/LC_MESSAGES/YammerImport.po
new file mode 100644
index 0000000000..0f39c47d07
--- /dev/null
+++ b/plugins/YammerImport/locale/pl/LC_MESSAGES/YammerImport.po
@@ -0,0 +1,348 @@
+# Translation of StatusNet - YammerImport to Polish (polski)
+# Exported from translatewiki.net
+#
+# Author: BeginaFelicysym
+# Author: Woytecr
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - YammerImport\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:34+0000\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-12-03 13:51:41+0000\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"Plural-Forms: nplurals=3; plural=(n == 1) ? 0 : ( (n%10 >= 2 && n%10 <= 4 && "
+"(n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
+
+#. TRANS: Page title for Yammer administration panel.
+#. TRANS: Form legend.
+#. TRANS: Field label for a Yammer import connect step.
+#. TRANS: Form legend.
+msgid "Connect to Yammer"
+msgstr "Połączenie z Yammer"
+
+#. TRANS: Page title for Yammer import administration panel.
+msgid "Yammer Import"
+msgstr "Import Yammer"
+
+#. TRANS: Instructions for Yammer import administration panel.
+msgid ""
+"This Yammer import tool is still undergoing testing, and is incomplete in "
+"some areas. Currently user subscriptions and group memberships are not "
+"transferred; in the future this may be supported for imports done by "
+"verified administrators on the Yammer side."
+msgstr ""
+"To narzędzie importu Yammer nadal przechodzi badania i w niektórych "
+"dziedzinach jest niekompletne. Obecnie sÄ… nie przenoszone subskrypcje "
+"użytkownika i członkostwa w grupach; w przyszłości może to być obsługiwane w "
+"importach wykonywanych przez administratorów zweryfikowanych po stronie "
+"Yammer."
+
+#. TRANS: Error message about an import job being paused from the admin panel.
+msgid "Paused from admin panel."
+msgstr "Wstrzymane z panelu administratora."
+
+#. TRANS: Client exception thrown when encountering an unhandled sub action.
+msgid "Invalid POST"
+msgstr "Nieprawidłowy POST"
+
+#. TRANS: Page title for Yammer import administration panel.
+msgid "Yammer import"
+msgstr "Import Yammer"
+
+#. TRANS: Menu item for Yammer import.
+msgctxt "MENU"
+msgid "Yammer"
+msgstr "Yammer"
+
+#. TRANS: Menu item title for Yammer import.
+msgid "Yammer import module."
+msgstr "Moduł importu Yammer."
+
+#. TRANS: Exception thrown when a non-user item type is used, but expected.
+msgid "Wrong item type sent to Yammer user import processing."
+msgstr ""
+"Niewłaściwy typ elementu wysłany do importu przetwarzanego użytkownika "
+"Yammer."
+
+#. TRANS: Used as a prefix for the Yammer expertise field contents.
+msgid "Expertise:"
+msgstr "Ekspertyza:"
+
+#. TRANS: Exception thrown when a non-group item type is used, but expected.
+msgid "Wrong item type sent to Yammer group import processing."
+msgstr ""
+"Niewłaściwy typ elementu wysłany do importu przetwarzanej grupy Yammer."
+
+#. TRANS: Exception thrown when a non-message item type is used, but expected.
+msgid "Wrong item type sent to Yammer message import processing."
+msgstr ""
+"Niewłaściwy typ elementu wysłany do importu przetwarzanej wiadomości Yammer."
+
+#. TRANS: Server exception thrown when an avatar URL is invalid.
+#. TRANS: %s is the invalid avatar URL.
+#, php-format
+msgid "Invalid avatar URL %s."
+msgstr "Nieprawidłowy adres URL awataru %s ."
+
+#. TRANS: Server exception thrown when an avatar could not be fetched.
+#. TRANS: %s is the failed avatar URL.
+#, php-format
+msgid "Unable to fetch avatar from %s."
+msgstr "Nie udało się pobrać awatara z  %s ."
+
+#. TRANS: Button text for starting Yammer authentication.
+msgctxt "BUTTON"
+msgid "Start authentication"
+msgstr "PoczÄ…tek uwierzytelnienia"
+
+#. TRANS: Button title for starting Yammer authentication.
+msgid "Request authorization to connect to a Yammer account."
+msgstr "Żądanie autoryzacji wejścia na konto Yammer."
+
+#. TRANS: Button text for starting changing a Yammer API key.
+msgctxt "BUTTON"
+msgid "Change API key"
+msgstr "Zmiana klucza API"
+
+#. TRANS: Server exception thrown if a Yammer authentication request is already present.
+msgid "Cannot request Yammer auth; already there!"
+msgstr ""
+
+#. TRANS: Server exception thrown when requesting a Yammer authentication URL while in an incorrect state.
+msgid "Cannot get Yammer auth URL when not in requesting-auth state!"
+msgstr ""
+
+#. TRANS: Exeption thrown when an external Yammer system gives an error.
+#. TRANS: %1$s is an HTTP error code, %2$s is the error message body.
+#, php-format
+msgid "Yammer API returned HTTP code %1$s: %2$s"
+msgstr ""
+
+#. TRANS: Exeption thrown when an external Yammer system an invalid JSON response.
+msgid "Invalid JSON response from Yammer API."
+msgstr ""
+
+#. TRANS: Exeption thrown when a trust relationship has already been established.
+msgid "Requesting a token, but already set up with a token."
+msgstr ""
+
+#. TRANS: Field label for a Yammer import initialise step.
+msgid "Initialize"
+msgstr "Inicjowanie"
+
+#. TRANS: "In progress" description.
+msgid "No import running"
+msgstr ""
+
+#. TRANS: "Complete" description for initialize state.
+msgid "Initiated Yammer server connection..."
+msgstr "Zanicjowano połączenie z serwerem Yammer..."
+
+#. TRANS: "In progress" description.
+msgid "Awaiting authorization..."
+msgstr "Oczekiwanie na autoryzacjiÄ™..."
+
+#. TRANS: "Complete" description for connect state.
+msgid "Connected."
+msgstr "Połączono."
+
+#. TRANS: Field label for a Yammer user import users step.
+msgid "Import user accounts"
+msgstr "Importuj konta użytkowników"
+
+#. TRANS: "In progress" description.
+#. TRANS: %d is the number of users to be imported.
+#, php-format
+msgid "Importing %d user..."
+msgid_plural "Importing %d users..."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#. TRANS: "Complete" description for step.
+#. TRANS: %d is the number of users imported.
+#, php-format
+msgid "Imported %d user."
+msgid_plural "Imported %d users."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#. TRANS: Field label for a Yammer group import step.
+msgid "Import user groups"
+msgstr "Importuj grupy użytkowników"
+
+#. TRANS: "In progress" description.
+#. TRANS: %d is the number of groups to be imported.
+#, php-format
+msgid "Importing %d group..."
+msgid_plural "Importing %d groups..."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#. TRANS: "Complete" description for step.
+#. TRANS: %d is the number of groups imported.
+#, php-format
+msgid "Imported %d group."
+msgid_plural "Imported %d groups."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#. TRANS: Field label for a Yammer import prepare notices step.
+msgid "Prepare public notices for import"
+msgstr ""
+
+#. TRANS: "In progress" description.
+#. TRANS: %d is the number of notices to be prepared for import.
+#, php-format
+msgid "Preparing %d notice..."
+msgid_plural "Preparing %d notices..."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#. TRANS: "Complete" description for step.
+#. TRANS: %d is the number of notices prepared for import.
+#, php-format
+msgid "Prepared %d notice."
+msgid_plural "Prepared %d notices."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#. TRANS: Field label for a Yammer import notices step.
+msgid "Import public notices"
+msgstr ""
+
+#. TRANS: "In progress" description.
+#. TRANS: %d is the number of notices to be imported.
+#, php-format
+msgid "Importing %d notice..."
+msgid_plural "Importing %d notices..."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#. TRANS: "Complete" description for step.
+#. TRANS: %d is the number of notices imported.
+#, php-format
+msgid "Imported %d notice."
+msgid_plural "Imported %d notices."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#. TRANS: Field label for a Yammer import done step.
+msgid "Done"
+msgstr "Gotowe"
+
+#. TRANS: "In progress" description for done step.
+#. TRANS: "Complete" description for done step.
+msgid "Import is complete!"
+msgstr "Import zakończony!"
+
+#. TRANS: Fieldset legend.
+msgid "Import status"
+msgstr "Stan importu"
+
+#. TRANS: Progress bar status.
+msgid "Waiting..."
+msgstr "Oczekiwanie..."
+
+#. TRANS: Button text for resetting the import state.
+msgid "Reset import state"
+msgstr "Zresetuj stan importu"
+
+#. TRANS: Button text for pausing an import.
+msgid "Pause import"
+msgstr "Wstrzymaj import"
+
+#. TRANS: Error message. %s are the error details.
+#, php-format
+msgid "Encountered error \"%s\"."
+msgstr "Wystąpił błąd \"%s\"."
+
+#. TRANS: Fieldset legend for a paused import.
+msgid "Paused"
+msgstr "Wstrzymano"
+
+#. TRANS: Button text for continuing a paused import.
+msgid "Continue"
+msgstr "Kontynuuj"
+
+#. TRANS: Button text for aborting a paused import.
+msgid "Abort import"
+msgstr "Przerwij import"
+
+#. TRANS: Form instructions.
+msgid ""
+"Follow this link to confirm authorization at Yammer; you will be prompted to "
+"log in if necessary:"
+msgstr ""
+
+#. TRANS: Link description for a link in an external Yammer system.
+msgid "Open Yammer authentication window"
+msgstr ""
+
+#. TRANS: Form instructions.
+msgid "Copy the verification code you are given below:"
+msgstr ""
+
+#. TRANS: Field label.
+msgid "Verification code:"
+msgstr "Kod weryfikacyjny:"
+
+#. TRANS: Button text for saving  Yammer authorisation data and starting Yammer import.
+msgctxt "BUTTON"
+msgid "Continue"
+msgstr "Kontynuuj"
+
+#. TRANS: Button title for saving  Yammer authorisation data and starting Yammer import.
+msgid "Save the verification code and begin import."
+msgstr "Zapisz kod weryfikacji i rozpocznij import."
+
+#. TRANS: Form legend for adding details to connect to a remote Yammer API.
+msgid "Yammer API registration"
+msgstr "API rejestracji Yammer"
+
+#. TRANS: Explanation of what needs to be done to connect to a Yammer network.
+msgid ""
+"Before we can connect to your Yammer network, you will need to register the "
+"importer as an application authorized to pull data on your behalf. This "
+"registration will work only for your own network. Follow this link to "
+"register the app at Yammer; you will be prompted to log in if necessary:"
+msgstr ""
+
+#. TRANS: Link description to a Yammer application registration form.
+msgid "Open Yammer application registration form"
+msgstr "Otwórz formularz rejestracji aplikacji Yammer"
+
+#. TRANS: Instructions.
+msgid "Copy the consumer key and secret you are given into the form below:"
+msgstr ""
+
+#. TRANS: Field label for a Yammer consumer key.
+msgid "Consumer key:"
+msgstr ""
+
+#. TRANS: Field label for a Yammer consumer secret.
+msgid "Consumer secret:"
+msgstr ""
+
+#. TRANS: Button text for saving a Yammer API registration.
+msgctxt "BUTTON"
+msgid "Save"
+msgstr "Zapisz"
+
+#. TRANS: Button title for saving a Yammer API registration.
+msgid "Save the entered consumer key and consumer secret."
+msgstr ""
diff --git a/plugins/YammerImport/locale/ru/LC_MESSAGES/YammerImport.po b/plugins/YammerImport/locale/ru/LC_MESSAGES/YammerImport.po
index 4ccc1ef1ff..6dba55160d 100644
--- a/plugins/YammerImport/locale/ru/LC_MESSAGES/YammerImport.po
+++ b/plugins/YammerImport/locale/ru/LC_MESSAGES/YammerImport.po
@@ -10,25 +10,31 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - YammerImport\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:52:01+0000\n"
+"POT-Creation-Date: 2011-06-19 13:18+0000\n"
+"PO-Revision-Date: 2011-06-19 13:18:15+0000\n"
 "Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:56+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
+"X-POT-Import-Date: 2011-06-05 21:52:16+0000\n"
+"X-Generator: MediaWiki 1.19alpha (r90375); Translate extension (2011-06-02)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-yammerimport\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
+#. TRANS: Page title for Yammer administration panel.
+#. TRANS: Form legend.
+#. TRANS: Field label for a Yammer import connect step.
+#. TRANS: Form legend.
 msgid "Connect to Yammer"
 msgstr ""
 
+#. TRANS: Page title for Yammer import administration panel.
 msgid "Yammer Import"
 msgstr ""
 
+#. TRANS: Instructions for Yammer import administration panel.
 msgid ""
 "This Yammer import tool is still undergoing testing, and is incomplete in "
 "some areas. Currently user subscriptions and group memberships are not "
@@ -36,53 +42,118 @@ msgid ""
 "verified administrators on the Yammer side."
 msgstr ""
 
+#. TRANS: Error message about an import job being paused from the admin panel.
 msgid "Paused from admin panel."
 msgstr ""
 
+#. TRANS: Client exception thrown when encountering an unhandled sub action.
+msgid "Invalid POST"
+msgstr ""
+
+#. TRANS: Page title for Yammer import administration panel.
 msgid "Yammer import"
 msgstr ""
 
+#. TRANS: Menu item for Yammer import.
+msgctxt "MENU"
 msgid "Yammer"
 msgstr ""
 
+#. TRANS: Menu item title for Yammer import.
+msgid "Yammer import module."
+msgstr ""
+
+#. TRANS: Exception thrown when a non-user item type is used, but expected.
+msgid "Wrong item type sent to Yammer user import processing."
+msgstr ""
+
+#. TRANS: Used as a prefix for the Yammer expertise field contents.
 msgid "Expertise:"
 msgstr ""
 
+#. TRANS: Exception thrown when a non-group item type is used, but expected.
+msgid "Wrong item type sent to Yammer group import processing."
+msgstr ""
+
+#. TRANS: Exception thrown when a non-message item type is used, but expected.
+msgid "Wrong item type sent to Yammer message import processing."
+msgstr ""
+
+#. TRANS: Server exception thrown when an avatar URL is invalid.
+#. TRANS: %s is the invalid avatar URL.
 #, php-format
 msgid "Invalid avatar URL %s."
 msgstr ""
 
+#. TRANS: Server exception thrown when an avatar could not be fetched.
+#. TRANS: %s is the failed avatar URL.
 #, php-format
 msgid "Unable to fetch avatar from %s."
 msgstr ""
 
+#. TRANS: Button text for starting Yammer authentication.
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Start authentication"
 msgstr "�ачало проверки подлинно�ти"
 
-msgid "Request authorization to connect to Yammer account"
+#. TRANS: Button title for starting Yammer authentication.
+msgid "Request authorization to connect to a Yammer account."
 msgstr ""
 
+#. TRANS: Button text for starting changing a Yammer API key.
+msgctxt "BUTTON"
 msgid "Change API key"
 msgstr ""
 
+#. TRANS: Server exception thrown if a Yammer authentication request is already present.
+msgid "Cannot request Yammer auth; already there!"
+msgstr ""
+
+#. TRANS: Server exception thrown when requesting a Yammer authentication URL while in an incorrect state.
+msgid "Cannot get Yammer auth URL when not in requesting-auth state!"
+msgstr ""
+
+#. TRANS: Exeption thrown when an external Yammer system gives an error.
+#. TRANS: %1$s is an HTTP error code, %2$s is the error message body.
+#, php-format
+msgid "Yammer API returned HTTP code %1$s: %2$s"
+msgstr ""
+
+#. TRANS: Exeption thrown when an external Yammer system an invalid JSON response.
+msgid "Invalid JSON response from Yammer API."
+msgstr ""
+
+#. TRANS: Exeption thrown when a trust relationship has already been established.
+msgid "Requesting a token, but already set up with a token."
+msgstr ""
+
+#. TRANS: Field label for a Yammer import initialise step.
 msgid "Initialize"
 msgstr "Инициализаци�"
 
+#. TRANS: "In progress" description.
 msgid "No import running"
 msgstr "Импорт не запущен"
 
+#. TRANS: "Complete" description for initialize state.
 msgid "Initiated Yammer server connection..."
 msgstr ""
 
+#. TRANS: "In progress" description.
 msgid "Awaiting authorization..."
 msgstr "Ожидание авторизации…"
 
+#. TRANS: "Complete" description for connect state.
 msgid "Connected."
 msgstr "Под�оединено."
 
+#. TRANS: Field label for a Yammer user import users step.
 msgid "Import user accounts"
 msgstr "Импорт учётных запи�ей пользователей"
 
+#. TRANS: "In progress" description.
+#. TRANS: %d is the number of users to be imported.
 #, php-format
 msgid "Importing %d user..."
 msgid_plural "Importing %d users..."
@@ -90,6 +161,8 @@ msgstr[0] "Импорт %d пользовател�…"
 msgstr[1] "Импорт %d пользователей…"
 msgstr[2] "Импорт %d пользователей…"
 
+#. TRANS: "Complete" description for step.
+#. TRANS: %d is the number of users imported.
 #, php-format
 msgid "Imported %d user."
 msgid_plural "Imported %d users."
@@ -97,9 +170,12 @@ msgstr[0] "Импортирован %d пользователь."
 msgstr[1] "Импортировано %d пользовател�."
 msgstr[2] "Импортировано %d пользователей."
 
+#. TRANS: Field label for a Yammer group import step.
 msgid "Import user groups"
 msgstr "Импорт групп пользователей"
 
+#. TRANS: "In progress" description.
+#. TRANS: %d is the number of groups to be imported.
 #, fuzzy, php-format
 msgid "Importing %d group..."
 msgid_plural "Importing %d groups..."
@@ -107,6 +183,8 @@ msgstr[0] "Импорт %d группы…"
 msgstr[1] "Импорт %d группы…"
 msgstr[2] "Импорт %d группы…"
 
+#. TRANS: "Complete" description for step.
+#. TRANS: %d is the number of groups imported.
 #, php-format
 msgid "Imported %d group."
 msgid_plural "Imported %d groups."
@@ -114,9 +192,12 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
+#. TRANS: Field label for a Yammer import prepare notices step.
 msgid "Prepare public notices for import"
 msgstr ""
 
+#. TRANS: "In progress" description.
+#. TRANS: %d is the number of notices to be prepared for import.
 #, php-format
 msgid "Preparing %d notice..."
 msgid_plural "Preparing %d notices..."
@@ -124,6 +205,8 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
+#. TRANS: "Complete" description for step.
+#. TRANS: %d is the number of notices prepared for import.
 #, php-format
 msgid "Prepared %d notice."
 msgid_plural "Prepared %d notices."
@@ -131,9 +214,12 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
+#. TRANS: Field label for a Yammer import notices step.
 msgid "Import public notices"
 msgstr ""
 
+#. TRANS: "In progress" description.
+#. TRANS: %d is the number of notices to be imported.
 #, php-format
 msgid "Importing %d notice..."
 msgid_plural "Importing %d notices..."
@@ -141,6 +227,8 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
+#. TRANS: "Complete" description for step.
+#. TRANS: %d is the number of notices imported.
 #, php-format
 msgid "Imported %d notice."
 msgid_plural "Imported %d notices."
@@ -148,57 +236,82 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
+#. TRANS: Field label for a Yammer import done step.
 msgid "Done"
 msgstr "Готово"
 
+#. TRANS: "In progress" description for done step.
+#. TRANS: "Complete" description for done step.
 msgid "Import is complete!"
 msgstr "Импорт завершён!"
 
+#. TRANS: Fieldset legend.
 msgid "Import status"
 msgstr "Стату� проце��а импорта"
 
+#. TRANS: Progress bar status.
 msgid "Waiting..."
 msgstr "Ожидание…"
 
+#. TRANS: Button text for resetting the import state.
 msgid "Reset import state"
 msgstr ""
 
+#. TRANS: Button text for pausing an import.
 msgid "Pause import"
 msgstr "Прио�тановить импорт"
 
-#, php-format
-msgid "Encountered error \"%s\""
+#. TRANS: Error message. %s are the error details.
+#, fuzzy, php-format
+msgid "Encountered error \"%s\"."
 msgstr "Обнаружена ошибка «%s»"
 
+#. TRANS: Fieldset legend for a paused import.
 msgid "Paused"
 msgstr "Прио�тановлено"
 
+#. TRANS: Button text for continuing a paused import.
 msgid "Continue"
 msgstr "Продолжить"
 
+#. TRANS: Button text for aborting a paused import.
 msgid "Abort import"
 msgstr "Прервать импорт"
 
+#. TRANS: Form instructions.
 msgid ""
 "Follow this link to confirm authorization at Yammer; you will be prompted to "
 "log in if necessary:"
 msgstr ""
 
+#. TRANS: Link description for a link in an external Yammer system.
 msgid "Open Yammer authentication window"
 msgstr ""
 
+#. TRANS: Form instructions.
 msgid "Copy the verification code you are given below:"
 msgstr ""
 
+#. TRANS: Field label.
 msgid "Verification code:"
 msgstr "Код подтверждени�:"
 
-msgid "Save code and begin import"
+#. TRANS: Button text for saving  Yammer authorisation data and starting Yammer import.
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Continue"
+msgstr "Продолжить"
+
+#. TRANS: Button title for saving  Yammer authorisation data and starting Yammer import.
+#, fuzzy
+msgid "Save the verification code and begin import."
 msgstr "Сохранить код и начать импорт"
 
+#. TRANS: Form legend for adding details to connect to a remote Yammer API.
 msgid "Yammer API registration"
 msgstr ""
 
+#. TRANS: Explanation of what needs to be done to connect to a Yammer network.
 msgid ""
 "Before we can connect to your Yammer network, you will need to register the "
 "importer as an application authorized to pull data on your behalf. This "
@@ -206,20 +319,28 @@ msgid ""
 "register the app at Yammer; you will be prompted to log in if necessary:"
 msgstr ""
 
+#. TRANS: Link description to a Yammer application registration form.
 msgid "Open Yammer application registration form"
 msgstr ""
 
+#. TRANS: Instructions.
 msgid "Copy the consumer key and secret you are given into the form below:"
 msgstr ""
 
+#. TRANS: Field label for a Yammer consumer key.
 msgid "Consumer key:"
 msgstr ""
 
+#. TRANS: Field label for a Yammer consumer secret.
 msgid "Consumer secret:"
 msgstr ""
 
+#. TRANS: Button text for saving a Yammer API registration.
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Save"
 msgstr "Сохранить"
 
-msgid "Save these consumer keys"
+#. TRANS: Button title for saving a Yammer API registration.
+msgid "Save the entered consumer key and consumer secret."
 msgstr ""
diff --git a/plugins/YammerImport/locale/tl/LC_MESSAGES/YammerImport.po b/plugins/YammerImport/locale/tl/LC_MESSAGES/YammerImport.po
index 661e0ecb71..d2fd4990b5 100644
--- a/plugins/YammerImport/locale/tl/LC_MESSAGES/YammerImport.po
+++ b/plugins/YammerImport/locale/tl/LC_MESSAGES/YammerImport.po
@@ -9,24 +9,30 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - YammerImport\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:52:01+0000\n"
-"Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:34+0000\n"
+"Language-Team: Tagalog <https://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:56+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-12-03 13:51:41+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-yammerimport\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. TRANS: Page title for Yammer administration panel.
+#. TRANS: Form legend.
+#. TRANS: Field label for a Yammer import connect step.
+#. TRANS: Form legend.
 msgid "Connect to Yammer"
 msgstr "Umugnay sa Yammer"
 
+#. TRANS: Page title for Yammer import administration panel.
 msgid "Yammer Import"
 msgstr "Pang-angkat ng Yammer"
 
+#. TRANS: Instructions for Yammer import administration panel.
 msgid ""
 "This Yammer import tool is still undergoing testing, and is incomplete in "
 "some areas. Currently user subscriptions and group memberships are not "
@@ -39,141 +45,242 @@ msgstr ""
 "maaaring tangkilikin ito sa hinaharap para sa mga pag-aangkat na ginagawa ng "
 "napatunayang mga tagapangasiwa na nasa gawi ng Yammer."
 
+#. TRANS: Error message about an import job being paused from the admin panel.
 msgid "Paused from admin panel."
 msgstr "Pansamantalang itinigil mula sa inampalan ng tagapangasiwa."
 
+#. TRANS: Client exception thrown when encountering an unhandled sub action.
+msgid "Invalid POST"
+msgstr "Hindi katanggap-tanggap na PASKIL"
+
+#. TRANS: Page title for Yammer import administration panel.
 msgid "Yammer import"
 msgstr "Pang-angkat ng Yammer"
 
+#. TRANS: Menu item for Yammer import.
+msgctxt "MENU"
 msgid "Yammer"
 msgstr "Yammer"
 
+#. TRANS: Menu item title for Yammer import.
+msgid "Yammer import module."
+msgstr "Modulo na pang-angkat ng Yammer."
+
+#. TRANS: Exception thrown when a non-user item type is used, but expected.
+msgid "Wrong item type sent to Yammer user import processing."
+msgstr ""
+"Maling uri ng bagay ang naipadala sa pagpuproseso ng pag-angkat ng tagagamit "
+"ng Yammer."
+
+#. TRANS: Used as a prefix for the Yammer expertise field contents.
 msgid "Expertise:"
 msgstr "Kadalubhasaan:"
 
+#. TRANS: Exception thrown when a non-group item type is used, but expected.
+msgid "Wrong item type sent to Yammer group import processing."
+msgstr ""
+"aling uri ng bagay ang naipadala sa pagpuproseso ng pag-angkat ng pangkat ng "
+"Yammer."
+
+#. TRANS: Exception thrown when a non-message item type is used, but expected.
+msgid "Wrong item type sent to Yammer message import processing."
+msgstr ""
+"aling uri ng bagay ang naipadala sa pagpuproseso ng pag-angkat ng mensahe ng "
+"Yammer."
+
+#. TRANS: Server exception thrown when an avatar URL is invalid.
+#. TRANS: %s is the invalid avatar URL.
 #, php-format
 msgid "Invalid avatar URL %s."
 msgstr "Hindi katanggap-tanggap na URL ng abatar ang %s."
 
+#. TRANS: Server exception thrown when an avatar could not be fetched.
+#. TRANS: %s is the failed avatar URL.
 #, php-format
 msgid "Unable to fetch avatar from %s."
 msgstr "Hindi nagawang damputin ang huwaran mula sa %s."
 
+#. TRANS: Button text for starting Yammer authentication.
+msgctxt "BUTTON"
 msgid "Start authentication"
-msgstr "Simulan ang pagpapatotoo"
+msgstr "Simulan ang pagpapatunay"
 
-msgid "Request authorization to connect to Yammer account"
-msgstr "Humiling ng pahintulot upang makaugnay sa akawnt ng Yammer"
+#. TRANS: Button title for starting Yammer authentication.
+msgid "Request authorization to connect to a Yammer account."
+msgstr "Humiling ng pahintulot upang makakabit sa isang akawnt ng Yammer."
 
+#. TRANS: Button text for starting changing a Yammer API key.
+msgctxt "BUTTON"
 msgid "Change API key"
 msgstr "Baguhin ang susi ng API"
 
+#. TRANS: Server exception thrown if a Yammer authentication request is already present.
+msgid "Cannot request Yammer auth; already there!"
+msgstr "Hindi mahihiling ang awtorisasyon ng Yammer; naroon na!"
+
+#. TRANS: Server exception thrown when requesting a Yammer authentication URL while in an incorrect state.
+msgid "Cannot get Yammer auth URL when not in requesting-auth state!"
+msgstr ""
+"Hindi makukuha ang URL ng awtorisasyon ng Yammer kapag hindi nasa katayuan "
+"ng paghiling ng awtorisasyon!"
+
+#. TRANS: Exeption thrown when an external Yammer system gives an error.
+#. TRANS: %1$s is an HTTP error code, %2$s is the error message body.
+#, php-format
+msgid "Yammer API returned HTTP code %1$s: %2$s"
+msgstr "Ibinalik ng API ng Yammer ang kodigo ng HTTP na %1$s: %2$s"
+
+#. TRANS: Exeption thrown when an external Yammer system an invalid JSON response.
+msgid "Invalid JSON response from Yammer API."
+msgstr "Hindi katanggap-tanggap na tugong JSON mula sa API ng Yammer."
+
+#. TRANS: Exeption thrown when a trust relationship has already been established.
+msgid "Requesting a token, but already set up with a token."
+msgstr "Humihiling ng isang panghalip, ngunit nakatakda na sa isang panghalip."
+
+#. TRANS: Field label for a Yammer import initialise step.
 msgid "Initialize"
 msgstr "Magpasimula"
 
+#. TRANS: "In progress" description.
 msgid "No import running"
 msgstr "Walang tumatakbong pag-aangkat"
 
+#. TRANS: "Complete" description for initialize state.
 msgid "Initiated Yammer server connection..."
 msgstr "Pinasimulan ang pag-ugnay sa tagapaghain ng Yammer..."
 
+#. TRANS: "In progress" description.
 msgid "Awaiting authorization..."
 msgstr "Naghihintay ng kapahintulutan..."
 
+#. TRANS: "Complete" description for connect state.
 msgid "Connected."
 msgstr "Naiugnay na."
 
+#. TRANS: Field label for a Yammer user import users step.
 msgid "Import user accounts"
 msgstr "Angkatin ang mga akawnt ng tagagamit"
 
+#. TRANS: "In progress" description.
+#. TRANS: %d is the number of users to be imported.
 #, php-format
 msgid "Importing %d user..."
 msgid_plural "Importing %d users..."
 msgstr[0] "Inaangkat ang tagagamit ng %d... "
 msgstr[1] "Inaangkat ang mga tagagamit ng %d..."
 
+#. TRANS: "Complete" description for step.
+#. TRANS: %d is the number of users imported.
 #, php-format
 msgid "Imported %d user."
 msgid_plural "Imported %d users."
 msgstr[0] "Naangkat na tagagamit ng %d."
 msgstr[1] "Naangkat na mga tagagamit ng %d."
 
+#. TRANS: Field label for a Yammer group import step.
 msgid "Import user groups"
 msgstr "Angkatin ang mga pangkat ng tagagamit"
 
+#. TRANS: "In progress" description.
+#. TRANS: %d is the number of groups to be imported.
 #, php-format
 msgid "Importing %d group..."
 msgid_plural "Importing %d groups..."
 msgstr[0] "Inaangkat ang pangkat ng %d... "
 msgstr[1] "Inaangkat ang mga pangkat ng %d..."
 
+#. TRANS: "Complete" description for step.
+#. TRANS: %d is the number of groups imported.
 #, php-format
 msgid "Imported %d group."
 msgid_plural "Imported %d groups."
 msgstr[0] "Naangkat na pangkat ng %d."
 msgstr[1] "Naangkat na mga pangkat ng %d."
 
+#. TRANS: Field label for a Yammer import prepare notices step.
 msgid "Prepare public notices for import"
 msgstr "Ihanda ang aangkating mga pabatid na pangmadla"
 
+#. TRANS: "In progress" description.
+#. TRANS: %d is the number of notices to be prepared for import.
 #, php-format
 msgid "Preparing %d notice..."
 msgid_plural "Preparing %d notices..."
 msgstr[0] "Inihahanda ang pabatid na %d..."
 msgstr[1] "Inihahanda ang mga pabatid na %d..."
 
+#. TRANS: "Complete" description for step.
+#. TRANS: %d is the number of notices prepared for import.
 #, php-format
 msgid "Prepared %d notice."
 msgid_plural "Prepared %d notices."
 msgstr[0] "Naihanda na ang pabatid na %d..."
 msgstr[1] "Naihanda na ang mga pabatid na %d..."
 
+#. TRANS: Field label for a Yammer import notices step.
 msgid "Import public notices"
 msgstr "Angkatin ang mga pabatid na pangmadla"
 
+#. TRANS: "In progress" description.
+#. TRANS: %d is the number of notices to be imported.
 #, php-format
 msgid "Importing %d notice..."
 msgid_plural "Importing %d notices..."
 msgstr[0] "Inaangkat ang pabatid na %d... "
 msgstr[1] "Inaangkat ang mga pabatid na %d..."
 
+#. TRANS: "Complete" description for step.
+#. TRANS: %d is the number of notices imported.
 #, php-format
 msgid "Imported %d notice."
 msgid_plural "Imported %d notices."
 msgstr[0] "Naangkat na ang pabatid na %d"
 msgstr[1] "Naangkat na ang mga pabatid na %d."
 
+#. TRANS: Field label for a Yammer import done step.
 msgid "Done"
 msgstr "Nagawa na"
 
+#. TRANS: "In progress" description for done step.
+#. TRANS: "Complete" description for done step.
 msgid "Import is complete!"
 msgstr "Buo na ang pag-aangkat!"
 
+#. TRANS: Fieldset legend.
 msgid "Import status"
 msgstr "Katayuan ng pag-aangkat"
 
+#. TRANS: Progress bar status.
 msgid "Waiting..."
 msgstr "Naghihintay..."
 
+#. TRANS: Button text for resetting the import state.
 msgid "Reset import state"
 msgstr "Muling itakda ang katayuan ng pag-aangkat"
 
+#. TRANS: Button text for pausing an import.
 msgid "Pause import"
 msgstr "Pansamantalang itigil ang pag-aangkat"
 
+#. TRANS: Error message. %s are the error details.
 #, php-format
-msgid "Encountered error \"%s\""
-msgstr "Nakatagpo ng kamaliang \"%s\""
+msgid "Encountered error \"%s\"."
+msgstr "Nakatagpo ng kamaliang \"%s\"."
 
+#. TRANS: Fieldset legend for a paused import.
 msgid "Paused"
 msgstr "Pansamantalang inihinto"
 
+#. TRANS: Button text for continuing a paused import.
 msgid "Continue"
 msgstr "Magpatuloy"
 
+#. TRANS: Button text for aborting a paused import.
 msgid "Abort import"
 msgstr "Pigilin ang pag-angkat"
 
+#. TRANS: Form instructions.
 msgid ""
 "Follow this link to confirm authorization at Yammer; you will be prompted to "
 "log in if necessary:"
@@ -181,21 +288,32 @@ msgstr ""
 "Sundan ang kawing na ito upang tiyakin ang pahintulot sa Yammer; ikay ay "
 "uudyuking lumagdang papasok kung kailangan:"
 
+#. TRANS: Link description for a link in an external Yammer system.
 msgid "Open Yammer authentication window"
 msgstr "Buksan ang bintana ng pagpapatotoo ng Yammer"
 
+#. TRANS: Form instructions.
 msgid "Copy the verification code you are given below:"
 msgstr "Kopyahin ang kodigo ng pagpapatotoo na ibinigay sa iyo sa ibaba:"
 
+#. TRANS: Field label.
 msgid "Verification code:"
 msgstr "Kodigo ng pagpapatotoo:"
 
-msgid "Save code and begin import"
-msgstr "Sagipin ang kodigo at simulan ang pag-aangkat"
+#. TRANS: Button text for saving  Yammer authorisation data and starting Yammer import.
+msgctxt "BUTTON"
+msgid "Continue"
+msgstr "Magpatuloy"
 
+#. TRANS: Button title for saving  Yammer authorisation data and starting Yammer import.
+msgid "Save the verification code and begin import."
+msgstr "Sagipin ang kodigo ng pagpapatunay at simulan ang pag-aangkat"
+
+#. TRANS: Form legend for adding details to connect to a remote Yammer API.
 msgid "Yammer API registration"
 msgstr "Pagpapatala sa API ng Yammer"
 
+#. TRANS: Explanation of what needs to be done to connect to a Yammer network.
 msgid ""
 "Before we can connect to your Yammer network, you will need to register the "
 "importer as an application authorized to pull data on your behalf. This "
@@ -208,22 +326,29 @@ msgstr ""
 "iyong lambatan.  Sundan ang kawing na ito upang ipatala ang aplikasyon sa "
 "Yammer; uudyukin kang lumagdang papasok kung kinakailangan:"
 
+#. TRANS: Link description to a Yammer application registration form.
 msgid "Open Yammer application registration form"
 msgstr "Buksan ang pormularyo ng pagpapatala ng aplikasyon ng Yammer"
 
+#. TRANS: Instructions.
 msgid "Copy the consumer key and secret you are given into the form below:"
 msgstr ""
 "Kopyahin ang susi at lihim ng tagaubos na ibinigay sa iyo papasok sa "
 "pormularyong nasa ibaba:"
 
+#. TRANS: Field label for a Yammer consumer key.
 msgid "Consumer key:"
 msgstr "Susi ng tagaubos:"
 
+#. TRANS: Field label for a Yammer consumer secret.
 msgid "Consumer secret:"
 msgstr "Lihim ng tagaubos:"
 
+#. TRANS: Button text for saving a Yammer API registration.
+msgctxt "BUTTON"
 msgid "Save"
 msgstr "Sagipin"
 
-msgid "Save these consumer keys"
-msgstr "Sagipin ang mga susing ito ng tagaubos"
+#. TRANS: Button title for saving a Yammer API registration.
+msgid "Save the entered consumer key and consumer secret."
+msgstr "Sagipin ang ipinasok na susi ng tagaubos at lihim ng mang-uubos."
diff --git a/plugins/YammerImport/locale/tr/LC_MESSAGES/YammerImport.po b/plugins/YammerImport/locale/tr/LC_MESSAGES/YammerImport.po
index 9e08d3a6f3..dabe979414 100644
--- a/plugins/YammerImport/locale/tr/LC_MESSAGES/YammerImport.po
+++ b/plugins/YammerImport/locale/tr/LC_MESSAGES/YammerImport.po
@@ -9,24 +9,30 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - YammerImport\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:52:01+0000\n"
-"Language-Team: Turkish <http://translatewiki.net/wiki/Portal:tr>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:34+0000\n"
+"Language-Team: Turkish <https://translatewiki.net/wiki/Portal:tr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:56+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-12-03 13:51:41+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: tr\n"
 "X-Message-Group: #out-statusnet-plugin-yammerimport\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#. TRANS: Page title for Yammer administration panel.
+#. TRANS: Form legend.
+#. TRANS: Field label for a Yammer import connect step.
+#. TRANS: Form legend.
 msgid "Connect to Yammer"
 msgstr "Yammer'a BaÄŸlan"
 
+#. TRANS: Page title for Yammer import administration panel.
 msgid "Yammer Import"
 msgstr "Yammer İçeri Aktar"
 
+#. TRANS: Instructions for Yammer import administration panel.
 msgid ""
 "This Yammer import tool is still undergoing testing, and is incomplete in "
 "some areas. Currently user subscriptions and group memberships are not "
@@ -34,153 +40,262 @@ msgid ""
 "verified administrators on the Yammer side."
 msgstr ""
 
+#. TRANS: Error message about an import job being paused from the admin panel.
 msgid "Paused from admin panel."
 msgstr "Yönetim panelinden durduruldu."
 
+#. TRANS: Client exception thrown when encountering an unhandled sub action.
+msgid "Invalid POST"
+msgstr ""
+
+#. TRANS: Page title for Yammer import administration panel.
 msgid "Yammer import"
 msgstr "Yammer içeri aktarma"
 
+#. TRANS: Menu item for Yammer import.
+#, fuzzy
+msgctxt "MENU"
 msgid "Yammer"
 msgstr "Yammer"
 
+#. TRANS: Menu item title for Yammer import.
+#, fuzzy
+msgid "Yammer import module."
+msgstr "Yammer içeri aktarma"
+
+#. TRANS: Exception thrown when a non-user item type is used, but expected.
+msgid "Wrong item type sent to Yammer user import processing."
+msgstr ""
+
+#. TRANS: Used as a prefix for the Yammer expertise field contents.
 msgid "Expertise:"
 msgstr ""
 
+#. TRANS: Exception thrown when a non-group item type is used, but expected.
+msgid "Wrong item type sent to Yammer group import processing."
+msgstr ""
+
+#. TRANS: Exception thrown when a non-message item type is used, but expected.
+msgid "Wrong item type sent to Yammer message import processing."
+msgstr ""
+
+#. TRANS: Server exception thrown when an avatar URL is invalid.
+#. TRANS: %s is the invalid avatar URL.
 #, php-format
 msgid "Invalid avatar URL %s."
 msgstr "Geçersiz kullanıcı resmi bağlantısı %s."
 
+#. TRANS: Server exception thrown when an avatar could not be fetched.
+#. TRANS: %s is the failed avatar URL.
 #, php-format
 msgid "Unable to fetch avatar from %s."
 msgstr ""
 
+#. TRANS: Button text for starting Yammer authentication.
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Start authentication"
 msgstr "Kimlik doÄŸrulamaya baÅŸla"
 
-msgid "Request authorization to connect to Yammer account"
+#. TRANS: Button title for starting Yammer authentication.
+msgid "Request authorization to connect to a Yammer account."
 msgstr ""
 
+#. TRANS: Button text for starting changing a Yammer API key.
+msgctxt "BUTTON"
 msgid "Change API key"
 msgstr ""
 
+#. TRANS: Server exception thrown if a Yammer authentication request is already present.
+msgid "Cannot request Yammer auth; already there!"
+msgstr ""
+
+#. TRANS: Server exception thrown when requesting a Yammer authentication URL while in an incorrect state.
+msgid "Cannot get Yammer auth URL when not in requesting-auth state!"
+msgstr ""
+
+#. TRANS: Exeption thrown when an external Yammer system gives an error.
+#. TRANS: %1$s is an HTTP error code, %2$s is the error message body.
+#, php-format
+msgid "Yammer API returned HTTP code %1$s: %2$s"
+msgstr ""
+
+#. TRANS: Exeption thrown when an external Yammer system an invalid JSON response.
+msgid "Invalid JSON response from Yammer API."
+msgstr ""
+
+#. TRANS: Exeption thrown when a trust relationship has already been established.
+msgid "Requesting a token, but already set up with a token."
+msgstr ""
+
+#. TRANS: Field label for a Yammer import initialise step.
 msgid "Initialize"
 msgstr "İlk kullanıma hazırla"
 
+#. TRANS: "In progress" description.
 msgid "No import running"
 msgstr "Çalışan içeri aktarma yok"
 
+#. TRANS: "Complete" description for initialize state.
 msgid "Initiated Yammer server connection..."
 msgstr "Başlatılan Yammer sunucu bağlantısı..."
 
+#. TRANS: "In progress" description.
 msgid "Awaiting authorization..."
 msgstr "Yetkilendirme bekleniyor..."
 
+#. TRANS: "Complete" description for connect state.
 msgid "Connected."
 msgstr "Bağlandı."
 
+#. TRANS: Field label for a Yammer user import users step.
 msgid "Import user accounts"
 msgstr "Kullanıcı hesaplarını içeri aktar"
 
+#. TRANS: "In progress" description.
+#. TRANS: %d is the number of users to be imported.
 #, php-format
 msgid "Importing %d user..."
 msgid_plural "Importing %d users..."
 msgstr[0] ""
 
+#. TRANS: "Complete" description for step.
+#. TRANS: %d is the number of users imported.
 #, php-format
 msgid "Imported %d user."
 msgid_plural "Imported %d users."
 msgstr[0] ""
 
+#. TRANS: Field label for a Yammer group import step.
 msgid "Import user groups"
 msgstr "Kullanıcı gruplarını içeri aktar"
 
+#. TRANS: "In progress" description.
+#. TRANS: %d is the number of groups to be imported.
 #, php-format
 msgid "Importing %d group..."
 msgid_plural "Importing %d groups..."
 msgstr[0] ""
 
+#. TRANS: "Complete" description for step.
+#. TRANS: %d is the number of groups imported.
 #, php-format
 msgid "Imported %d group."
 msgid_plural "Imported %d groups."
 msgstr[0] ""
 
+#. TRANS: Field label for a Yammer import prepare notices step.
 msgid "Prepare public notices for import"
 msgstr "Genel durum mesajlarını içeri aktarmak için hazırla"
 
+#. TRANS: "In progress" description.
+#. TRANS: %d is the number of notices to be prepared for import.
 #, php-format
 msgid "Preparing %d notice..."
 msgid_plural "Preparing %d notices..."
 msgstr[0] ""
 
+#. TRANS: "Complete" description for step.
+#. TRANS: %d is the number of notices prepared for import.
 #, php-format
 msgid "Prepared %d notice."
 msgid_plural "Prepared %d notices."
 msgstr[0] ""
 
+#. TRANS: Field label for a Yammer import notices step.
 msgid "Import public notices"
 msgstr "Genel durum mesajlarını içeri aktar"
 
+#. TRANS: "In progress" description.
+#. TRANS: %d is the number of notices to be imported.
 #, php-format
 msgid "Importing %d notice..."
 msgid_plural "Importing %d notices..."
 msgstr[0] ""
 
+#. TRANS: "Complete" description for step.
+#. TRANS: %d is the number of notices imported.
 #, php-format
 msgid "Imported %d notice."
 msgid_plural "Imported %d notices."
 msgstr[0] ""
 
+#. TRANS: Field label for a Yammer import done step.
 msgid "Done"
 msgstr "Tamamlandı"
 
+#. TRANS: "In progress" description for done step.
+#. TRANS: "Complete" description for done step.
 msgid "Import is complete!"
 msgstr "İçeri aktarma tamamlandı!"
 
+#. TRANS: Fieldset legend.
 msgid "Import status"
 msgstr "İçeri aktarma durumu"
 
+#. TRANS: Progress bar status.
 msgid "Waiting..."
 msgstr "Bekleniyor..."
 
+#. TRANS: Button text for resetting the import state.
 msgid "Reset import state"
 msgstr "İçeri aktarma durumunu sıfırla"
 
+#. TRANS: Button text for pausing an import.
 msgid "Pause import"
 msgstr "İçeri aktarmayı duraklat"
 
-#, php-format
-msgid "Encountered error \"%s\""
+#. TRANS: Error message. %s are the error details.
+#, fuzzy, php-format
+msgid "Encountered error \"%s\"."
 msgstr "Karşılaşılan hata \"%s\""
 
+#. TRANS: Fieldset legend for a paused import.
 msgid "Paused"
 msgstr "Duraklatıldı"
 
+#. TRANS: Button text for continuing a paused import.
 msgid "Continue"
 msgstr "Devam et"
 
+#. TRANS: Button text for aborting a paused import.
 msgid "Abort import"
 msgstr "İçeri aktarmayı iptal et"
 
+#. TRANS: Form instructions.
 msgid ""
 "Follow this link to confirm authorization at Yammer; you will be prompted to "
 "log in if necessary:"
 msgstr ""
 
+#. TRANS: Link description for a link in an external Yammer system.
 msgid "Open Yammer authentication window"
 msgstr "Open Yammer kimlik doÄŸrulama penceresi"
 
+#. TRANS: Form instructions.
 msgid "Copy the verification code you are given below:"
 msgstr "Aşağıda verilen doğrulama kodunu kopyalayın:"
 
+#. TRANS: Field label.
 msgid "Verification code:"
 msgstr "DoÄŸrulama kodu:"
 
-msgid "Save code and begin import"
+#. TRANS: Button text for saving  Yammer authorisation data and starting Yammer import.
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Continue"
+msgstr "Devam et"
+
+#. TRANS: Button title for saving  Yammer authorisation data and starting Yammer import.
+#, fuzzy
+msgid "Save the verification code and begin import."
 msgstr "Kodu kaydet ve içeri aktarmaya başla"
 
+#. TRANS: Form legend for adding details to connect to a remote Yammer API.
 msgid "Yammer API registration"
 msgstr ""
 
+#. TRANS: Explanation of what needs to be done to connect to a Yammer network.
 msgid ""
 "Before we can connect to your Yammer network, you will need to register the "
 "importer as an application authorized to pull data on your behalf. This "
@@ -188,20 +303,28 @@ msgid ""
 "register the app at Yammer; you will be prompted to log in if necessary:"
 msgstr ""
 
+#. TRANS: Link description to a Yammer application registration form.
 msgid "Open Yammer application registration form"
 msgstr ""
 
+#. TRANS: Instructions.
 msgid "Copy the consumer key and secret you are given into the form below:"
 msgstr ""
 
+#. TRANS: Field label for a Yammer consumer key.
 msgid "Consumer key:"
 msgstr ""
 
+#. TRANS: Field label for a Yammer consumer secret.
 msgid "Consumer secret:"
 msgstr ""
 
+#. TRANS: Button text for saving a Yammer API registration.
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Save"
 msgstr "Kaydet"
 
-msgid "Save these consumer keys"
+#. TRANS: Button title for saving a Yammer API registration.
+msgid "Save the entered consumer key and consumer secret."
 msgstr ""
diff --git a/plugins/YammerImport/locale/uk/LC_MESSAGES/YammerImport.po b/plugins/YammerImport/locale/uk/LC_MESSAGES/YammerImport.po
index ed71d7a0f5..e90407e8a0 100644
--- a/plugins/YammerImport/locale/uk/LC_MESSAGES/YammerImport.po
+++ b/plugins/YammerImport/locale/uk/LC_MESSAGES/YammerImport.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - YammerImport to Ukrainian (Україн�ька)
+# Translation of StatusNet - YammerImport to Ukrainian (україн�ька)
 # Exported from translatewiki.net
 #
 # Author: Boogie
@@ -9,25 +9,31 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - YammerImport\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:48+0000\n"
-"PO-Revision-Date: 2011-05-05 20:52:01+0000\n"
-"Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
+"POT-Creation-Date: 2012-06-30 11:07+0000\n"
+"PO-Revision-Date: 2012-06-30 11:10:35+0000\n"
+"Language-Team: Ukrainian <https://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-04-27 13:31:56+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r87509); Translate extension (2011-04-26)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-POT-Import-Date: 2011-12-03 13:51:41+0000\n"
+"X-Generator: MediaWiki 1.20alpha (233fc08); Translate 2012-06-21\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-yammerimport\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
+#. TRANS: Page title for Yammer administration panel.
+#. TRANS: Form legend.
+#. TRANS: Field label for a Yammer import connect step.
+#. TRANS: Form legend.
 msgid "Connect to Yammer"
 msgstr "З’єднанн� з Yammer"
 
+#. TRANS: Page title for Yammer import administration panel.
 msgid "Yammer Import"
 msgstr "Імпорт з Yammer"
 
+#. TRANS: Instructions for Yammer import administration panel.
 msgid ""
 "This Yammer import tool is still undergoing testing, and is incomplete in "
 "some areas. Currently user subscriptions and group memberships are not "
@@ -40,53 +46,122 @@ msgstr ""
 "�айту Yammer піде нам на зу�тріч і тоді роботу над цим додатком буде "
 "завершено."
 
+#. TRANS: Error message about an import job being paused from the admin panel.
 msgid "Paused from admin panel."
 msgstr "Призупинено з адміні�тратор�ької панелі."
 
+#. TRANS: Client exception thrown when encountering an unhandled sub action.
+msgid "Invalid POST"
+msgstr ""
+
+#. TRANS: Page title for Yammer import administration panel.
 msgid "Yammer import"
 msgstr "Імпорт з Yammer"
 
+#. TRANS: Menu item for Yammer import.
+#, fuzzy
+msgctxt "MENU"
 msgid "Yammer"
 msgstr "Yammer"
 
+#. TRANS: Menu item title for Yammer import.
+#, fuzzy
+msgid "Yammer import module."
+msgstr "Імпорт з Yammer"
+
+#. TRANS: Exception thrown when a non-user item type is used, but expected.
+msgid "Wrong item type sent to Yammer user import processing."
+msgstr ""
+
+#. TRANS: Used as a prefix for the Yammer expertise field contents.
 msgid "Expertise:"
 msgstr "Ек�пертиза:"
 
+#. TRANS: Exception thrown when a non-group item type is used, but expected.
+msgid "Wrong item type sent to Yammer group import processing."
+msgstr ""
+
+#. TRANS: Exception thrown when a non-message item type is used, but expected.
+msgid "Wrong item type sent to Yammer message import processing."
+msgstr ""
+
+#. TRANS: Server exception thrown when an avatar URL is invalid.
+#. TRANS: %s is the invalid avatar URL.
 #, php-format
 msgid "Invalid avatar URL %s."
 msgstr "�евірна URL-адре�а аватари %s."
 
+#. TRANS: Server exception thrown when an avatar could not be fetched.
+#. TRANS: %s is the failed avatar URL.
 #, php-format
 msgid "Unable to fetch avatar from %s."
 msgstr "�еможливо завантажити аватару з %s."
 
+#. TRANS: Button text for starting Yammer authentication.
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Start authentication"
 msgstr "Початок автентифікації"
 
-msgid "Request authorization to connect to Yammer account"
+#. TRANS: Button title for starting Yammer authentication.
+#, fuzzy
+msgid "Request authorization to connect to a Yammer account."
 msgstr "Запит дозволу на підключенн� до Yammer"
 
+#. TRANS: Button text for starting changing a Yammer API key.
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Change API key"
 msgstr "Змінити API-ключ"
 
+#. TRANS: Server exception thrown if a Yammer authentication request is already present.
+msgid "Cannot request Yammer auth; already there!"
+msgstr ""
+
+#. TRANS: Server exception thrown when requesting a Yammer authentication URL while in an incorrect state.
+msgid "Cannot get Yammer auth URL when not in requesting-auth state!"
+msgstr ""
+
+#. TRANS: Exeption thrown when an external Yammer system gives an error.
+#. TRANS: %1$s is an HTTP error code, %2$s is the error message body.
+#, php-format
+msgid "Yammer API returned HTTP code %1$s: %2$s"
+msgstr ""
+
+#. TRANS: Exeption thrown when an external Yammer system an invalid JSON response.
+msgid "Invalid JSON response from Yammer API."
+msgstr ""
+
+#. TRANS: Exeption thrown when a trust relationship has already been established.
+msgid "Requesting a token, but already set up with a token."
+msgstr ""
+
+#. TRANS: Field label for a Yammer import initialise step.
 msgid "Initialize"
 msgstr "Ініціалізаці�"
 
+#. TRANS: "In progress" description.
 msgid "No import running"
 msgstr "Імпорт не працює"
 
+#. TRANS: "Complete" description for initialize state.
 msgid "Initiated Yammer server connection..."
 msgstr "Розпочато з’єднанн� з �ервером Yammer..."
 
+#. TRANS: "In progress" description.
 msgid "Awaiting authorization..."
 msgstr "Чекаємо дозволу..."
 
+#. TRANS: "Complete" description for connect state.
 msgid "Connected."
 msgstr "Під’єднано."
 
+#. TRANS: Field label for a Yammer user import users step.
 msgid "Import user accounts"
 msgstr "Імпорт облікових запи�ів кори�тувачів"
 
+#. TRANS: "In progress" description.
+#. TRANS: %d is the number of users to be imported.
 #, php-format
 msgid "Importing %d user..."
 msgid_plural "Importing %d users..."
@@ -94,6 +169,8 @@ msgstr[0] "Імпорт %d кори�тувача..."
 msgstr[1] "Імпорт %d кори�тувачів..."
 msgstr[2] "Імпорт %d кори�тувачів..."
 
+#. TRANS: "Complete" description for step.
+#. TRANS: %d is the number of users imported.
 #, php-format
 msgid "Imported %d user."
 msgid_plural "Imported %d users."
@@ -101,9 +178,12 @@ msgstr[0] "Імпортовано %d кори�тувача."
 msgstr[1] "Імпортовано %d кори�тувачів."
 msgstr[2] "Імпортовано %d кори�тувачів."
 
+#. TRANS: Field label for a Yammer group import step.
 msgid "Import user groups"
 msgstr "Імпорт �пільнот"
 
+#. TRANS: "In progress" description.
+#. TRANS: %d is the number of groups to be imported.
 #, php-format
 msgid "Importing %d group..."
 msgid_plural "Importing %d groups..."
@@ -111,6 +191,8 @@ msgstr[0] "Імпорт %d �пільноти..."
 msgstr[1] "Імпорт %d �пільнот..."
 msgstr[2] "Імпорт %d �пільнот..."
 
+#. TRANS: "Complete" description for step.
+#. TRANS: %d is the number of groups imported.
 #, php-format
 msgid "Imported %d group."
 msgid_plural "Imported %d groups."
@@ -118,9 +200,12 @@ msgstr[0] "Імпортовано %d �пільноту."
 msgstr[1] "Імпортовано %d �пільнот."
 msgstr[2] "Імпортовано %d �пільнот."
 
+#. TRANS: Field label for a Yammer import prepare notices step.
 msgid "Prepare public notices for import"
 msgstr "Підготовка до імпорту �трічки допи�ів"
 
+#. TRANS: "In progress" description.
+#. TRANS: %d is the number of notices to be prepared for import.
 #, php-format
 msgid "Preparing %d notice..."
 msgid_plural "Preparing %d notices..."
@@ -128,6 +213,8 @@ msgstr[0] "Підготовка %d допи�у..."
 msgstr[1] "Підготовка %d допи�ів..."
 msgstr[2] "Підготовка %d допи�ів..."
 
+#. TRANS: "Complete" description for step.
+#. TRANS: %d is the number of notices prepared for import.
 #, php-format
 msgid "Prepared %d notice."
 msgid_plural "Prepared %d notices."
@@ -135,9 +222,12 @@ msgstr[0] "Готовий %d допи�."
 msgstr[1] "Готово %d допи�ів."
 msgstr[2] "Готово %d допи�ів."
 
+#. TRANS: Field label for a Yammer import notices step.
 msgid "Import public notices"
 msgstr "Імпорт �трічки допи�ів"
 
+#. TRANS: "In progress" description.
+#. TRANS: %d is the number of notices to be imported.
 #, php-format
 msgid "Importing %d notice..."
 msgid_plural "Importing %d notices..."
@@ -145,6 +235,8 @@ msgstr[0] "Імпорт %d допи�у..."
 msgstr[1] "Імпорт %d допи�ів..."
 msgstr[2] "Імпорт %d допи�ів..."
 
+#. TRANS: "Complete" description for step.
+#. TRANS: %d is the number of notices imported.
 #, php-format
 msgid "Imported %d notice."
 msgid_plural "Imported %d notices."
@@ -152,37 +244,49 @@ msgstr[0] "Імпортовано %d допи�."
 msgstr[1] "Імпортовано %d допи�ів."
 msgstr[2] "Імпортовано %d допи�ів."
 
+#. TRANS: Field label for a Yammer import done step.
 msgid "Done"
 msgstr "Виконано"
 
+#. TRANS: "In progress" description for done step.
+#. TRANS: "Complete" description for done step.
 msgid "Import is complete!"
 msgstr "Імпорт завершено!"
 
+#. TRANS: Fieldset legend.
 msgid "Import status"
 msgstr "Стату� проце�у імпорту"
 
+#. TRANS: Progress bar status.
 msgid "Waiting..."
 msgstr "Очікуванн�..."
 
+#. TRANS: Button text for resetting the import state.
 msgid "Reset import state"
 msgstr "Перезапу�тити імпорт"
 
+#. TRANS: Button text for pausing an import.
 msgid "Pause import"
 msgstr "Призупинити імпорт"
 
-#, php-format
-msgid "Encountered error \"%s\""
+#. TRANS: Error message. %s are the error details.
+#, fuzzy, php-format
+msgid "Encountered error \"%s\"."
 msgstr "Ви�влено помилку «%s»"
 
+#. TRANS: Fieldset legend for a paused import.
 msgid "Paused"
 msgstr "Призупинено"
 
+#. TRANS: Button text for continuing a paused import.
 msgid "Continue"
 msgstr "Продовжити"
 
+#. TRANS: Button text for aborting a paused import.
 msgid "Abort import"
 msgstr "Перервати імпорт"
 
+#. TRANS: Form instructions.
 msgid ""
 "Follow this link to confirm authorization at Yammer; you will be prompted to "
 "log in if necessary:"
@@ -190,21 +294,34 @@ msgstr ""
 "Перейдіть за цим по�иланн�м дл� підтвердженн� дозволу від Yammer; вам буде "
 "запропоновано увійти до �и�теми, �кщо це необхідно:"
 
+#. TRANS: Link description for a link in an external Yammer system.
 msgid "Open Yammer authentication window"
 msgstr "Відкрити вікно автентифікації Yammer"
 
+#. TRANS: Form instructions.
 msgid "Copy the verification code you are given below:"
 msgstr "Скопіюйте наданий вам код підтвердженн� до віконц� нижче:"
 
+#. TRANS: Field label.
 msgid "Verification code:"
 msgstr "Код підтвердженн�:"
 
-msgid "Save code and begin import"
+#. TRANS: Button text for saving  Yammer authorisation data and starting Yammer import.
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Continue"
+msgstr "Продовжити"
+
+#. TRANS: Button title for saving  Yammer authorisation data and starting Yammer import.
+#, fuzzy
+msgid "Save the verification code and begin import."
 msgstr "Зберегти код і почати імпорт"
 
+#. TRANS: Form legend for adding details to connect to a remote Yammer API.
 msgid "Yammer API registration"
 msgstr "Реє�траці� API Yammer"
 
+#. TRANS: Explanation of what needs to be done to connect to a Yammer network.
 msgid ""
 "Before we can connect to your Yammer network, you will need to register the "
 "importer as an application authorized to pull data on your behalf. This "
@@ -217,22 +334,31 @@ msgstr ""
 "мережі. Перейдіть за цим по�иланн�м, щоб зареє�трувати додаток на Yammer; "
 "вам буде запропоновано увійти до �и�теми, �кщо це необхідно:"
 
+#. TRANS: Link description to a Yammer application registration form.
 msgid "Open Yammer application registration form"
 msgstr "Відкрити реє�траційну форму додатку дл� Yammer"
 
+#. TRANS: Instructions.
 msgid "Copy the consumer key and secret you are given into the form below:"
 msgstr ""
 "Скопіюйте ключ �поживача та �екретний код, котрі вам було надано, до віконц� "
 "нижче:"
 
+#. TRANS: Field label for a Yammer consumer key.
 msgid "Consumer key:"
 msgstr "Ключ �поживача:"
 
+#. TRANS: Field label for a Yammer consumer secret.
 msgid "Consumer secret:"
 msgstr "Секретний код:"
 
+#. TRANS: Button text for saving a Yammer API registration.
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Save"
 msgstr "Зберегти"
 
-msgid "Save these consumer keys"
+#. TRANS: Button title for saving a Yammer API registration.
+#, fuzzy
+msgid "Save the entered consumer key and consumer secret."
 msgstr "Зберегти ключі �поживача"
diff --git a/plugins/YammerImport/scripts/yammer-import.php b/plugins/YammerImport/scripts/yammer-import.php
index b4aa921e50..22b6422195 100644
--- a/plugins/YammerImport/scripts/yammer-import.php
+++ b/plugins/YammerImport/scripts/yammer-import.php
@@ -4,7 +4,6 @@ if (php_sapi_name() != 'cli') {
     die('no');
 }
 
-
 define('INSTALLDIR', dirname(dirname(dirname(dirname(__FILE__)))));
 
 $longoptions = array('verify=', 'reset');
diff --git a/scripts/SearchMonkey-MrH.0.txt b/scripts/SearchMonkey-MrH.0.txt
deleted file mode 100644
index 34191d90a8..0000000000
--- a/scripts/SearchMonkey-MrH.0.txt
+++ /dev/null
@@ -1 +0,0 @@
-b2.PXYLSJBuLkZnUQ7H.2gOSSTbVllQM_XyN0ya4sO9CNt5uBUATEGyKd3LkkR0QXTSduKb7xj7Bp1TX6.8XdIDsOVVuXe.3HPnPLtSacZm66.NLY3JGhJv1MfGvcJU42YEQiUvpAhZRe46E.lv38ZPzxvhjjAmGFyFv8UNuhdw6sNIlTwBdct3k1GKA1YSEeVJ_xLiAVa8IaU_XG8PlxMovsBPePOry8__.aAp5loHtmqX6vEVu3lcHEn5NvSZ502QoWkK_20Y.6oja.Fqqxtr6eli_AQXaVzWWDEu_D4_rDV9Mz_.EC8KzXKo.YdUaWQfS9akqNm1v54wTNM4ZDegsbKnaNUR7J0OYgzpzcPj4L57yWKFm7k2af.v2loGrUOKJGO3rBcOQSfUz5jyCKDdd29cdd2L96XA0Uy31RjvdWSsprigS94HjoE9e5TUMHHZt47Wi50DsMq5R87uznHTouuHOKyxT3c_wCejxb_A0lVM5JL4VnrjVEo0CkY5ju1fDXfXG.Q8T4WYbnW_4i4W.DAuaFiRxIsLtrSG5bpMvJWQ8MTfc39gaLkNtGACL_O8IxX7iyFjARapuIXPhu3v3ndEt6qlgcUsEBl6zhxe6WcTQssBTUSDSPQWMmbA8TCYe1xwHd3ukSdqkhkALdIri2oeLLhkbNQRKxouIWHqL5aH0r7CCKM.P87rJE1meb28ux00FrBg4Fa62RM5S5Wn24u0odvPGK9JGmzisi.zM2cULr8C03gwBEeGDXzLIPevVnoqcYvtUfs8_B9xtaFzsKEM.04JX94e5Y_qWqfJs2.vWdY02BwWNsM1ONUzsS5qBzFhNpVnvZYHkNuOGXLb7cg7sL0Zm9pGMQPJsffThK2KY5EGSxbCB_JMqZmu9UtmcFyrsny7Yo1z6uCgu7GzN9_6Tc_DGW4OyuOm6XaLZSbGApmGosEKRKIODNAUGyT6QChSEwnPxhgYVpIn1TYualgrBtwvON5d84Up5.mxTH5ZHDjQcW04oE1dp2mBQhlUHvTF.PbEuUztvA8mMuLZgERcE01oOKkDlh9gvjZNiMs6f8SPmulKmtvheecitvB4Urgkae_PiXbcD4aOL4PyjwByX4zpCw9NG8Ga.6JLv1nH.vEE5XBCzh0_rnEmv0XzNBjiE8nj_p2pntfxmdpEeSGrA8WzigZTHrjawltlC_sMGLqR0EfRqoVrs3NtH8jafQ8DoqKUnR1wiG1BFC9PiQzPbPunYvVT_vMILkfwHDS7gY4bfZAlLrfbC0n8EKumGJc1o1ag_VsfnO2O8vE9667oVTaAGMmxXA_g1qpPVJTDWHRm4kwA6SWTZ6RCSb0Scd_DTXN4cevjn3sSGOCKE5Tocd1s4JRCuDPGQ9XI1OXGSKZrUuuM8mUlZqj6A.FWgdv2c5qXoRla.Qlb6encfFh8gnBNNoIR5X4F9PFl7.Yq38Vi0BJ7zIJVYAU8UXqJqPKKN.qH4A941m8jG7trm9NBrsRIkyCJBE5W1UVZ4x4sBDSuJMT_UCYCyn_qsjHkYpJOaYt44c7PT5U_S8oVUUe0qtuvmQ5DK.cZAU1hdw9fINikie3yGxO66lWRPtmM1rqTHwEHqaJXkn4mnRhQmHE.pqB.N_Byir3AiezaA2EGi6Z7.G99XrOjxJ0tIyim39AkoPZbeWqVlLDL.4AGCzPLQyndMClwWJdjcHBaSrxGGL1OpZ9cGA6w1zLD_6uyP4gK2pGTGxvOk4TFqrpc07eX7j6agiBfkUzYykXSm_JYDVZqiivMwKVEynFsX24erN0kd379wr_QI8Ov2nfXudbZn9EY1bhmupuAtMqpW.dNGk7YJ3AD31zrfz2KcZjdQuLkTYwqW4zI3YEI0jFqk0WYXSUmCNRzbdvmoZI1kAWRw2COuUnYeMfoTiMeJGgUd.g--
\ No newline at end of file
diff --git a/scripts/SearchMonkey-Om3.0.txt b/scripts/SearchMonkey-Om3.0.txt
deleted file mode 100644
index 6f8840962e..0000000000
--- a/scripts/SearchMonkey-Om3.0.txt
+++ /dev/null
@@ -1 +0,0 @@
-WJofugbSJAtzh.lFcHxO_WHM64iJd7qHJFbsqC9VLnpiqoBxdbE0iwoKozxZC331Svk6O9Un9jonWUrQeTndGO8hldPlxqGdFdbl6OjoucDGG_h6qBw3Ugnbethbyuew1qOaUr6ItfU4Pe9O2GtUj2KbqxZpUAvMeiS20hykHbIZ8n_1.fl.fTToLiJn58zcLc1_ryM0f5jbkIGwmGX_SG6isGJRzC4.BiNmntpJ5ZCKa80e7oUH9S6NlM5SEmXoA3zhuzkbBxF_fKLendcC7EafnTT34MbgD5s4uwTyubSBJvdmBu.mWSO9xrnojM903Vo8h3.UdG.id1LmFrj4xxd24IQqZM2v4zOfl8ugF8ChHaIzp82A1AOuk0ulkqKgiALia6bsZMbKdPZtlu_HGrF06tCt5VGvu5f0ZgjRk_kOlP_f_oppyVKRWzZpSH9GryOpoqJA2vlxgEH2BvZqaaUYEmaYJjIh7eNkLRLVorbK7rGhPf_L5qfHir.31Ar1zZxWgvhjSW7ipkvsNr_3j7oOh1LSTVWNHo.dpLT0_dib6syFopav2FqStJG0RTsWNXkQ_6h.jf439DjwuZmCLMcbUrMAMrRVcsUyR5nfqP5cP0igSx8m.oONA7O.txOXSzc3HjqvIVSTRO8BIHx.vTMJ6mq4NUmZ6_pHWapHbO9esUlIyXf5CF2qhtlM9aulr2fwCf8BqtjQctAtvYLrI_qKP95wNaB_qhcuFsZN1aiql.FtigHe2YYTix4SWg9.67VSBAyOqjWcA5jbyoomf8Gxzks9PZQfSuKbkbw_x3XOshGl4QMo6CEypV0qIYVVW77bOJc7I0WgwgxuAKg6lROlmsIdN0.SeTV4sY1ZcoLEgdNCNb81SVstXdE0iPXPZZsEStez.qluWnQoVkkWfOaBe78PxPZUvQS02RaR0FCH4bksqGWXLA8chAHIe4vPNerCLJwskKG3rA43xRDEZY7sgdEfA93iTztmIRq8dkYA6dJOxOMtvpSdh9jds04xpdmfhb23bVYp1XCp3qWka6JoKlzvQU2THqFr7gNU3KMCbr2ngHHkDTZGNO__MLa3SKlp2Vg3qHXxkivFUmWTNUz5vuW7v.FhsKOVFIFfSrTl3pjJMD3hyIlxzf_HJ60q1LRBkwqxrA9e8Fr5tqWQj.evL5kqz_r26MdHFeMTx9VwfDnHLaVx3eu5Wy2NJmLVPRLNn4t1VhexsEdLquy0ynBVBOBBRa2HbYgv0lXOP.QRl5twTKwJO6fx6J4_L_HhPv6jhcQej1LtUyGyKwLuXrHxnHCOqD.e9ZL_xnqSRthM6NvBsvbnZOPr7falUuQWPzbikXMFUvSlckeetPi2Z11l9pH.cxZDj19B38v7jwT5zZMQN9FzQvTCvzrQCpHxfIxwh3a2cx18BEMKHL7MJWDsoYVURtI3iIdR84WzXcr3kkCz.LM8tqTKVkzHLk8Grx8KT3dF5ZIVhWK5yyb05RFOZdoZQ4cWXmvsaQhDUd6Dm2KRJiypSFntLLSp34URsLaqzxaakMnywHvfmsINah4oKBBy8.NFBRULU9SqTyIOwf6_ggWG06J1WJxWV94RRCD1rMNNM9ISMOo4yB_dmfLHnXKOZm1lOnisEN36gsxniy_psLN3Ed1ozRtbbD.wALfE.92DrDA9ASPOdu08P7xer76iXVbdt_4cg5whY59Hq2N.A1mrSbetDbSu7NeziZ.nBvSUg_YpVvMo2H3elySL.1UsLPFznStGuYfbISN79MZecU.ScSCtaeZQ2cBFekXMNT77HWZmv6YLsz84ceQwL_MidvAYqPh6PUNiBl8iwFR5PCpTB54.g0m3zuALOqF9hJ598v9rh9Zlu1SfE.UfmGpUICMSuXH7C8zHMq4TFZGzCuBY9EOuBc.JQaCfBr8N3jnDq2bwlQjDmgbVW2xm2WpPMCB0OxkqoggA0i4ZZA3gSfqhlZ9mdmr_l9mUe0dOd_EkyWyu0l.Z1.VQLY2KJHl.8pZWyP6S_RAFmABOlEGP3m1E8NxaMP87o9ot_BNg21DeHbwADKbv16deRlDrKmntHoPwfsaTPNo5KembI_4nHxQ3y2B2OjsUPcLYFZZtsP4ukLBhYusR8SdtsEC._plxsMQzS9nH.zRP8nbluMlUjCKgfepGN_rCq.NeGON.L_.FowXEOcX7M1SD.IfihdAHqk0zUpuyTfe.9E77aEu26iIZOGmyOwSqRvN9HksJx.iMk5xL.xah7hl.NByMBbmkRDS52wDMxygNpPXsIHdvu8OyLxq.ZsNBGF.IHs0qiquX4.RZ2TBqTQ6O4AhzOTpFeZlG3UzdmxsEtDI2a7tY_27Gg39apf_83ijjiLaJE2RG5Mb9krZ2RCIAXaFez74o_oqli5dy6WyT4lEIKtw38T7m1bJ_xpLju5FBQUE54RpsK.ZWSAoyh3c05b2mBeN2id_NV7sM4MinY7rEsOgNVevUNrWebNrrdunUF8gsa59cXdGSKvmUw9kEKW_Z6Y14AICD43zlmVGYDYlSLqpHsu32m9aGuQFlqzBlHCKPg9uD9dyFKsZJI8l2yq91sEj9snlYhApmHLVQzGWLiOJCJUclByiPmVD_.OnHE84lBcv0bkXKFYXvUhFs2Xu1VrN1mGXz50KkG4Xovzkw0ueuWlJ2vozPUf9CkJ1mlOA4jwuFLMrQZmN04aXyR3ZWFN8pdSVITI0ADqNr9OGacCra.emTRIWdBLEj18kp39vhlR6BpxI2V0FQjC_27n2hkDUNAUNFaJ1Q84OO2mgzZnPXcN7NYz57W3lB_mMVUtKngnRlTNWn1sFdN6.WFQ1szScjtpFa68NBv5pLUOvKy49VWjn14uS4aUoDL_fbMi9tGw0tlrMEr74fm5hJNwPX1QKd3cy0jqDHLIpZTb1aNxIz_KU4XIJ2wx0gZZQH2zV7eTxsrozzo3J0TtiQC6pPOqbnsRF1TuX1..DV5LzUdKX0TUXyO8x0710.EF4z6pim0HuVKzV2VBKmG6qtzpIRCKzVk14lx2E9YkJTQusU9qZnw9Ixu_YL0Ue_4LachvurMZDYTIRcSyd4St3TmtZswmeLPS6Md6NtHwxQEy.RVLhuCmliiZcw9hB.CH6v0UX1i9E6r_FZyboWtnzX42mZDrJR4n1u2nGFzYwJrDN_kJ3uHKs4EoV9ESEd5AojHDWSkOs4lKbyRlYwhGrHgB25mZ2xRdBtkHMDupYisNjOJ.QEIXzpK291wKHWTL.VdeTOLqGxsthxoR7AOdnzalMIuUItxagzB14Gw2eZ5PcIZvcgO9C4BouZW4SAg0D0Xhmd4A0MW0an7NqzXM4VDVg6WMgeBHqL54yfHjK4oMkwDUQTvqNH13AKINKbtr5t5JJzfpSN0fmfysA1Z1PdkJROhFkyH1_ZXcoMJp2XbYSk6ZXm69U4j4QCYe_vmkp3NM802bMpohywJRxYstmfIxinJukmZOEiSClAk1MhRGVlj60w8ggV29QYa_pdqUjTm0DwYZQF1Z_NVkhVXVv7bQMpRQJPIMwf3TggPPHVAMA1tk0OdPFOCx1207E-
\ No newline at end of file
diff --git a/scripts/SearchMonkey-yQP.0.txt b/scripts/SearchMonkey-yQP.0.txt
deleted file mode 100644
index dcfc31ad19..0000000000
--- a/scripts/SearchMonkey-yQP.0.txt
+++ /dev/null
@@ -1 +0,0 @@
-8Yd1y.bSJBPj3Ul5NjhQHFX0dN0NuJAfBObEdgIY2QDh0bVXkzcJbNlBamPSFBZqHojxbPzIj5GlY3XdxGMY6ttYzBHvc_FK5krngYtlLSmBtjRArxI_bBfngIxeI2kFC3wPvHIdzp8gygRp2.IlDahWHABFhAPrPrxAkAOqv6O3tKUTTzcnZX22eOdoXVXQSMiphlDQIxpfbdpLnduBvMxvI.hwrfAW4iIVY7iBjkdnrtdAVj4N2.u65khGuAwaX9i6Buca3XQJm601Atf6fjM57yOFA0.laixrOss1_F36iqrc4mOeWnYI_UDw8SgIrXroswrJ.KwXlqCdICxel3Ui0hfrOoGnCt4HHT9tiObu9VG.GxM2KQ_tjb1LwFFX0WEisFKXfQwpR_2NU..0j1icWhnmPHFJGsImvX1dFgeTqcNvoAcfZ0y9c8KQKzV5CbQeg9_oPC7uviIdxQK2lJ7SzgRfZAw4FDeDXKDxuVZRE7jZYQEWtkmp9dFlFLM_L0dPk4kiJuRrRPJ8DAyWSiex_ib1mJ3bHAxbsEcWoUunIOivWVdZDudCBath8AdoAQ0P8_f.fl8jYgbZil49Qhg.WmFD_H0w7ikdEi1iHsWnjSrDORtAjENGvoEje0h.gMBf38FbQ6vW2BbKC.RBKp.cQhVPvDHel1UFtqZ8IJm7mTP0BDSDG2iFJp1_N7L5MUoUxEwgskMxeQf99vE1UybdR4q0kbx6i_RR3_6.AQ5QKk1EBeKAfnVYDdwcLGVgWd9JxxvekkL7Scl1ncZ9ViLvlC3Hfrbtrm2Q5rr17pIG6L.a6gDKKH1NGgapyLUCVtKZ27Ysd9ExMF1yHfMAyOKL5I7KaJmZTZnxWQ9ex.hHS6tZ9WjPFhjvpve7H_mB8ZXNBdEc4bL.iRdknHNe3WSSgCLWf2RVFZ4wmVMYW4KwGpIp7iGbaUDBYdBFkcCmv6zeneEsLGJHUYipsay5unopuFyBe611pwFRNHZ3XznmqaK8TXl18k_PCmQ6g93.fXFeWKmszw_FArltYuXHNIm3zwRobvDo7Rp0znnt76Q0ha3q5WHggFd6.QmC6jywGLpki_09v0Pc6qGh4gpGt1vZeZrA1OGQ7VSB7Muo4Mr4TbQU_6342nXeG0tBImIanPZsQrew1.tOmAfn16UpzcCuEC3NWw99yipIaEZirdr4teITB7xX3x6UGRcjtoAlz8oo6VEYaFX7ybG6Bo.K4hspnJLWH6jKK4hcpYedE2qSB0W4z_ieFy6Y.2qrx8_3CL1_8h5w6PjXOFTmsyk0v0DXQVuGh8QxPgPVyrWyDzlXJZ.5_mHTohGRGCI41I6jGJcCOh3qEQZKF2VYb.3o00Le9YlXxpBIBh7rBw5vNypp9jSd.W6VPnQ53xM6QzVbYW4OV3gkVE__AgvKNUzfRHiK9dN7evwvKX66W4tUPGQapjGbRWnFc3Q_0__oMYTtSR3EMxs0Lvkjh87s0SMxy0gzvVCfNt4VrdZCzdBd8N8Tcj5Pc4KJ09ikPtNB3V8i6jtcVUuKzs32B37O6AA2iOydQdsPDEhfkDA0S_ocu3DqqBsJOYmzjRq39e1WFhlRijNftxHF6DRvzpSIIm5VzcwIg8LLl4zbHyeRXEmBDp.KvlfP_.z2IUqilhGeccCmV2XFD_VFidZclzscmceMmuBOXYmaplSW3sX94eM7mp2dyDjVXtR4igukNU8Fabaqilu98OKIv9mLdTlE9u7t25KNqMHQQOsYNM4BUocalSN1K3JOot544vz9VbWJfIljF2L6DCduJd6h9aDH5wLMjljRqrteltA3yz86ensnOZ5wmU8X3NMpPN.OCXM8zxqdhEGxE_jeXkpf4AKIFWYrn8zH84sFU60gpy3xMOleKK6NfrFDRdzxkBIJGV7yhBaDi1_0iZuwm8hVLFe2odNyEKbllCeXYpeMJwe3w_e7XQD1T2Zv4bvK69qYPhmkngPs7_nCYYUFWKlvkg0njZyxn3kNSTONHjzrLSlTWMvGobei1GV74wJzWmmZpC1yQNOe_8Stjbj5Lg47iELys5kCMWU1NyIQf16AT35xTlPCYJ_RNVy3yDNeh5kqy9AMX_HIJOHw8xwJEUoiqKzWzLV.BWmpzcny9_7P2naXBrzRlOYmYyWUtp.P0gGNxLZXtEaKKGgdQB.fYXUyuKH0ptXqj1YCl1g1KWo3.AwndjDy0PE8ZYCaCjz.EyXqx.8bvfJycccGRw5RVU74aydE0DRCC3vF6VI9qbPWK89HNTMWxPSSTHdChY6yAhNsc5UhDwsAmhZ_UIYynZ8AM_oCS232.einbw9fYI4X6yZm_fD60DJ1FsBweU9ivf3Y4X2ucLFY8xPp_8SxZ5UtaP67TKflzMYjuvhGXAUF9.1u8ZKJGOliFmMxIwJ7lPJs93HfZgLN2eyH6F.rZjREeyd0fbsRzZ_vMEs4fx6sX4eIGVoyVFpO5b11kxnBqlKnATI_nw1.exkl5sQj00clwphsecXiVLaDFCEjG94ve_1cw2foqQUoX6pUfqr_hSSpnacdacPclbxWPehuN5LpjMso_5b4v.rj4s9VtzRqxovBinIgBdTFAH560aN5f7wuN5ZZT_BT5aCFNwQBYoDfCTaU9jw3aaXU29vEJmYZcvC9WCpU0RTntciGlx8rIbagu7cUGrYFvLbU2ZekazCMklPO5Sno_z5zzxLnTpFxesNoreOj7M3Cp1RHKUmqAog04bYC9kPFvH_q.jF2g507LEN3nPL9EJUx460UG_o4HRQOhDi2YrmrHk.gLZECgnMwCN770fhL
\ No newline at end of file
diff --git a/scripts/allsites.php b/scripts/allsites.php
index a67db12337..211728c497 100755
--- a/scripts/allsites.php
+++ b/scripts/allsites.php
@@ -22,19 +22,72 @@
 
 define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
 
+$shortoptions = 't:w:';
+$longoptions = array('tagged=', 'not-tagged=');
+
 $helptext = <<<ENDOFHELP
 allsites.php - list all sites configured for multi-site use
+USAGE: allsites.php [OPTIONS]
 
-returns the nickname of each site configured for multi-site use
+-t --tagged=tagname  List only sites with this tag
+-w --not-tagged=tagname List only sites without this tag
 
 ENDOFHELP;
 
 require_once INSTALLDIR.'/scripts/commandline.inc';
 
-$sn = new Status_network();
+function print_all_sites() {
+
+    $sn = new Status_network();
+
+    if ($sn->find()) {
+        while ($sn->fetch()) {
+            print "$sn->nickname\n";
+        }
+    }
+    return;
+}
+
+function print_tagged_sites($tag) {
+
+    $sn = new Status_network();
+
+    $sn->query('select status_network.nickname '.
+               'from status_network join status_network_tag '.
+               'on status_network.site_id = status_network_tag.site_id '.
+               'where status_network_tag.tag = "' . $tag . '"');
 
-if ($sn->find()) {
     while ($sn->fetch()) {
         print "$sn->nickname\n";
     }
-}
\ No newline at end of file
+
+    return;
+}
+
+function print_untagged_sites($tag) {
+
+    $sn = new Status_network();
+
+    $sn->query('select status_network.nickname '.
+               'from status_network '.
+               'where not exists '.
+               '(select tag from status_network_tag '.
+               'where site_id = status_network.site_id '.
+               'and tag = "'.$tag.'")');
+
+    while ($sn->fetch()) {
+        print "$sn->nickname\n";
+    }
+
+    return;
+}
+
+if (have_option('t', 'tagged')) {
+    $tag = get_option_value('t', 'tagged');
+    print_tagged_sites($tag);
+} else if (have_option('w', 'not-tagged')) {
+    $tag = get_option_value('w', 'not-tagged');
+    print_untagged_sites($tag);
+} else {
+    print_all_sites();
+}
diff --git a/scripts/backupuser.php b/scripts/backupuser.php
index ee2951fc8f..740ae25d44 100644
--- a/scripts/backupuser.php
+++ b/scripts/backupuser.php
@@ -19,8 +19,8 @@
 
 define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
 
-$shortoptions = 'i:n:f:';
-$longoptions = array('id=', 'nickname=', 'file=');
+$shortoptions = 'i:n:f:a:j';
+$longoptions = array('id=', 'nickname=', 'file=', 'after=', 'json');
 
 $helptext = <<<END_OF_EXPORTACTIVITYSTREAM_HELP
 exportactivitystream.php [options]
@@ -28,7 +28,8 @@ Export a StatusNet user history to a file
 
   -i --id       ID of user to export
   -n --nickname nickname of the user to export
-  -f --file     file to export to (default STDOUT)
+  -j --json     Output JSON (default Atom)
+  -a --after    Only activities after the given date
 
 END_OF_EXPORTACTIVITYSTREAM_HELP;
 
@@ -36,8 +37,18 @@ require_once INSTALLDIR.'/scripts/commandline.inc';
 
 try {
     $user = getUser();
-    $actstr = new UserActivityStream($user, true, UserActivityStream::OUTPUT_RAW);
-    print $actstr->getString();
+    if (have_option('a', 'after')) {
+        $afterStr = get_option_value('a', 'after');
+        $after = strtotime($afterStr);
+        $actstr = new UserActivityStream($user, true, UserActivityStream::OUTPUT_RAW, $after);
+    } else {
+        $actstr = new UserActivityStream($user, true, UserActivityStream::OUTPUT_RAW);
+    }
+    if (have_option('j', 'json')) {
+        $actstr->writeJSON(STDOUT);
+    } else {
+        print $actstr->getString();
+    }
 } catch (Exception $e) {
     print $e->getMessage()."\n";
     exit(1);
diff --git a/scripts/cleardb.sh b/scripts/cleardb.sh
deleted file mode 100755
index 06690ed70a..0000000000
--- a/scripts/cleardb.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-
-export user=$1
-export password=$2
-export DB=$3
-export SCR=$4
-
-mysqladmin -u $user --password=$password -f drop $DB
-mysqladmin -u $user --password=$password create $DB
-mysql -u $user --password=$password $DB < $SCR
-
diff --git a/scripts/createsim.php b/scripts/createsim.php
index 7435dcfeb2..d5ed227581 100644
--- a/scripts/createsim.php
+++ b/scripts/createsim.php
@@ -20,20 +20,33 @@
 
 define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
 
-$shortoptions = 'u:n:b:g:j:t:x:z:';
-$longoptions = array('users=', 'notices=', 'subscriptions=', 'groups=', 'joins=', 'tags=', 'prefix=');
+$shortoptions = 'b:g:j:n:t:u:w:x:z:';
+$longoptions = array(
+    'subscriptions=',
+    'groups=',
+    'joins=',
+    'notices=',
+    'tags=',
+    'users=',
+    'words=',
+    'prefix=',
+    'groupprefix=',
+    'faves='
+);
 
 $helptext = <<<END_OF_CREATESIM_HELP
 Creates a lot of test users and notices to (loosely) simulate a real server.
 
-    -u --users         Number of users (default 100)
-    -n --notices       Average notices per user (default 100)
     -b --subscriptions Average subscriptions per user (default no. users/20)
     -g --groups        Number of groups (default 20)
     -j --joins         Number of groups per user (default 5)
+    -f --faves         Number of faves per user (default notices/10)
+    -n --notices       Average notices per user (default 100)
     -t --tags          Number of distinct hash tags (default 10000)
-    -x --prefix        User name prefix (default 'testuser')
+    -u --users         Number of users (default 100)
     -w --words         Words file (default '/usr/share/dict/words')
+    -x --prefix        User name prefix (default 'testuser')
+    -z --groupprefix   Group name prefix (default 'testgroup')
 
 END_OF_CREATESIM_HELP;
 
@@ -72,7 +85,7 @@ function newNotice($i, $tagmax)
 {
     global $userprefix;
 
-    $options = array('scope' => common_config('notice', 'defaultscope'));
+    $options = array('scope' => Notice::defaultScope());
 
     $n = rand(0, $i - 1);
     $user = User::staticGet('nickname', sprintf('%s%d', $userprefix, $n));
@@ -101,6 +114,39 @@ function newNotice($i, $tagmax)
                 $options['scope'] |= Notice::ADDRESSEE_SCOPE;
             }
         }
+    } else {
+        $is_directed = rand(0, 4);
+
+        if ($is_directed == 0) {
+            $subs = $user->getSubscriptions(0, 100)->fetchAll();
+            if (count($subs) > 0) {
+                $seen = array();
+                $f = rand(0, 9);
+                if ($f <= 6) {
+                    $addrs = 1;
+                } else if ($f <= 8) {
+                    $addrs = 2;
+                } else {
+                    $addrs = 3;
+                }
+                for ($m = 0; $m < $addrs; $m++) {
+                    $x = rand(0, count($subs) - 1);
+                    if ($seen[$x]) {
+                        continue;
+                    }
+                    if ($subs[$x]->id == $user->id) {
+                        continue;
+                    }
+                    $seen[$x] = true;
+                    $rprofile = $subs[$x];
+                    $content = "@".$rprofile->nickname." ".$content;
+                }
+                $private_to_addressees = rand(0, 4);
+                if ($private_to_addressees == 0) {
+                    $options['scope'] |= Notice::ADDRESSEE_SCOPE;
+                }
+            }
+        }
     }
 
     $has_hash = rand(0, 2);
@@ -118,7 +164,7 @@ function newNotice($i, $tagmax)
     if ($in_group == 0) {
         $groups = $user->getGroups();
         if ($groups->N > 0) {
-            $gval = rand(0, $group->N - 1);
+            $gval = rand(0, $groups->N - 1);
             $groups->fetch(); // go to 0th
             for ($i = 0; $i < $gval; $i++) {
                 $groups->fetch();
@@ -138,7 +184,29 @@ function newNotice($i, $tagmax)
         $options['scope'] |= Notice::SITE_SCOPE;
     }
 
-    $notice = Notice::saveNew($user->id, $content, 'system', $options);
+    $notice = Notice::saveNew($user->id, $content, 'createsim', $options);
+}
+
+function newMessage($i)
+{
+    global $userprefix;
+
+    $n = rand(0, $i - 1);
+    $user = User::staticGet('nickname', sprintf('%s%d', $userprefix, $n));
+
+    $content = testNoticeContent();
+
+    $friends = $user->mutuallySubscribedUsers()->fetchAll();
+
+    if (count($friends) == 0) {
+        return;
+    }
+
+    $j = rand(0, count($friends) - 1);
+    
+    $other = $friends[$j];
+
+    $message = Message::saveNew($user->id, $other->id, $content, 'createsim');
 }
 
 function newSub($i)
@@ -207,10 +275,54 @@ function newJoin($u, $g)
     }
 }
 
+function newFave($u)
+{
+    global $userprefix;
+    global $groupprefix;
+
+    $userNumber = rand(0, $u - 1);
+
+    $userNick = sprintf('%s%d', $userprefix, $userNumber);
+
+    $user = User::staticGet('nickname', $userNick);
+
+    if (empty($user)) {
+        throw new Exception("Can't find user '$userNick'.");
+    }
+
+    // NB: it's OK to like your own stuff!
+
+    $otherNumber = rand(0, $u - 1);
+
+    $otherNick = sprintf('%s%d', $userprefix, $otherNumber);
+
+    $other = User::staticGet('nickname', $otherNick);
+
+    if (empty($other)) {
+        throw new Exception("Can't find user '$otherNick'.");
+    }
+
+    $notices = $other->getNotices()->fetchAll();
+
+    if (count($notices) == 0) {
+        return;
+    }
+
+    $idx = rand(0, count($notices) - 1);
+
+    $notice = $notices[$idx];
+
+    if ($user->hasFave($notice)) {
+        return;
+    }
+
+    Fave::addNew($user->getProfile(), $notice);
+}
+
 function testNoticeContent()
 {
     global $words;
-    
+
     if (is_null($words)) {
         return "test notice content";
     }
@@ -224,15 +336,15 @@ function testNoticeContent()
     }
 
     $text = implode(' ', $parts);
-    
+
     if (mb_strlen($text) > 80) {
         $text = substr($text, 0, 77) . "...";
     }
-    
+
     return $text;
 }
 
-function main($usercount, $groupcount, $noticeavg, $subsavg, $joinsavg, $tagmax)
+function main($usercount, $groupcount, $noticeavg, $subsavg, $joinsavg, $favesavg, $messageavg, $tagmax)
 {
     global $config;
     $config['site']['dupelimit'] = -1;
@@ -260,7 +372,7 @@ function main($usercount, $groupcount, $noticeavg, $subsavg, $joinsavg, $tagmax)
 
     // # registrations + # notices + # subs
 
-    $events = $usercount + $groupcount + ($usercount * ($noticeavg + $subsavg + $joinsavg));
+    $events = $usercount + $groupcount + ($usercount * ($noticeavg + $subsavg + $joinsavg + $favesavg + $messageavg));
 
     $events -= $preuser;
     $events -= $pregroup;
@@ -270,8 +382,10 @@ function main($usercount, $groupcount, $noticeavg, $subsavg, $joinsavg, $tagmax)
     $nt = $gt + ($usercount * $noticeavg);
     $st = $nt + ($usercount * $subsavg);
     $jt = $st + ($usercount * $joinsavg);
+    $ft = $jt + ($usercount * $favesavg);
+    $mt = $ft + ($usercount * $messageavg);
 
-    printfv("$events events ($ut, $gt, $nt, $st, $jt)\n");
+    printfv("$events events ($ut, $gt, $nt, $st, $jt, $ft, $mt)\n");
 
     for ($i = 0; $i < $events; $i++)
     {
@@ -294,30 +408,44 @@ function main($usercount, $groupcount, $noticeavg, $subsavg, $joinsavg, $tagmax)
         } else if ($e > $st && $e <= $jt) {
             printfv("$i Making a new group join\n");
             newJoin($n, $g);
+        } else if ($e > $jt && $e <= $ft) {
+            printfv("$i Making a new fave\n");
+            newFave($n);
+        } else if ($e > $ft && $e <= $mt) {
+            printfv("$i Making a new message\n");
+            newMessage($n);
         } else {
             printfv("No event for $i!");
         }
     }
 }
 
+$defaultWordsfile = '/usr/share/dict/words';
+
 $usercount   = (have_option('u', 'users')) ? get_option_value('u', 'users') : 100;
 $groupcount  = (have_option('g', 'groups')) ? get_option_value('g', 'groups') : 20;
 $noticeavg   = (have_option('n', 'notices')) ? get_option_value('n', 'notices') : 100;
 $subsavg     = (have_option('b', 'subscriptions')) ? get_option_value('b', 'subscriptions') : max($usercount/20, 10);
 $joinsavg    = (have_option('j', 'joins')) ? get_option_value('j', 'joins') : 5;
+$favesavg    = (have_option('f', 'faves')) ? get_option_value('f', 'faves') : max($noticeavg/10, 5);
+$messageavg  = (have_option('m', 'messages')) ? get_option_value('m', 'messages') : max($noticeavg/10, 5);
 $tagmax      = (have_option('t', 'tags')) ? get_option_value('t', 'tags') : 10000;
 $userprefix  = (have_option('x', 'prefix')) ? get_option_value('x', 'prefix') : 'testuser';
 $groupprefix = (have_option('z', 'groupprefix')) ? get_option_value('z', 'groupprefix') : 'testgroup';
-$wordsfile   = (have_option('w', 'words')) ? get_option_value('w', 'words') : '/usr/share/dict/words';
+$wordsfile   = (have_option('w', 'words')) ? get_option_value('w', 'words') : $defaultWordsfile;
 
 if (is_readable($wordsfile)) {
     $words = file($wordsfile);
 } else {
+   if ($wordsfile != $defaultWordsfile) {
+      // user specified words file couldn't be read
+      throw new Exception("Couldn't read words file: {$wordsfile}.");
+    }
     $words = null;
 }
 
 try {
-    main($usercount, $groupcount, $noticeavg, $subsavg, $joinsavg, $tagmax);
+    main($usercount, $groupcount, $noticeavg, $subsavg, $joinsavg, $favesavg, $messageavg, $tagmax);
 } catch (Exception $e) {
     printfv("Got an exception: ".$e->getMessage());
 }
diff --git a/scripts/decache.php b/scripts/decache.php
deleted file mode 100644
index 094bdb5aa0..0000000000
--- a/scripts/decache.php
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/usr/bin/env php
-<?php
-/*
- * StatusNet - the distributed open-source microblogging tool
- * Copyright (C) 2009, StatusNet, Inc.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
-
-$helptext = <<<ENDOFHELP
-USAGE: decache.php <table> <id> [<column>]
-Clears the cache for the object in table <table> with id <id>
-If <column> is specified, use that instead of 'id'
-
-
-ENDOFHELP;
-
-require_once INSTALLDIR.'/scripts/commandline.inc';
-
-if (count($args) < 2 || count($args) > 3) {
-    show_help();
-}
-
-$table = $args[0];
-$id = $args[1];
-if (count($args) > 2) {
-    $column = $args[2];
-} else {
-    $column = 'id';
-}
-
-$object = Memcached_DataObject::staticGet($table, $column, $id);
-
-if (!$object) {
-    print "No such '$table' with $column = '$id'; it's possible some cache keys won't be cleared properly.\n";
-    $class = ucfirst($table);
-    $object = new $class();
-    $object->column = $id;
-}
-
-$result = $object->decache();
diff --git a/scripts/fixup_conversations.php b/scripts/fixup_conversations.php
deleted file mode 100755
index 80890fe98d..0000000000
--- a/scripts/fixup_conversations.php
+++ /dev/null
@@ -1,68 +0,0 @@
-#!/usr/bin/env php
-<?php
-/*
- * StatusNet - the distributed open-source microblogging tool
- * Copyright (C) 2008, 2009, StatusNet, Inc.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
-
-require_once INSTALLDIR.'/scripts/commandline.inc';
-
-common_log(LOG_INFO, 'Fixing up conversations.');
-
-$notice = new Notice();
-$notice->query('select id, reply_to from notice where conversation is null');
-
-while ($notice->fetch()) {
-
-    $cid = null;
-    
-    $orig = clone($notice);
-    
-    if (empty($notice->reply_to)) {
-        $notice->conversation = $notice->id;
-    } else {
-        $reply = Notice::staticGet('id', $notice->reply_to);
-
-        if (empty($reply)) {
-            common_log(LOG_WARNING, "Replied-to notice $notice->reply_to not found.");
-            $notice->conversation = $notice->id;
-        } else if (empty($reply->conversation)) {
-            common_log(LOG_WARNING, "Replied-to notice $reply->id has no conversation ID.");
-            $notice->conversation = $notice->id;
-        } else {
-            $notice->conversation = $reply->conversation;
-        }
-	
-	unset($reply);
-	$reply = null;
-    }
-
-    print "$notice->conversation";
-
-    $result = $notice->update($orig);
-
-    if (!$result) {
-        common_log_db_error($notice, 'UPDATE', __FILE__);
-        continue;
-    }
-
-    $orig = null;
-    unset($orig);
-    
-    print ".\n";
-}
diff --git a/scripts/fixup_group_uri.php b/scripts/fixup_group_uri.php
deleted file mode 100644
index 90938dac3e..0000000000
--- a/scripts/fixup_group_uri.php
+++ /dev/null
@@ -1,102 +0,0 @@
-#!/usr/bin/env php
-<?php
-/*
- * StatusNet - a distributed open-source microblogging tool
- * Copyright (C) 2008, 2009, 2010 StatusNet, Inc.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
-
-$shortoptions = 'i:n:a';
-$longoptions = array('id=', 'nickname=', 'all', 'dry-run');
-
-$helptext = <<<END_OF_UPDATEAVATARURL_HELP
-fixup_group_uri.php [options]
-Fill in unstored URIs for groups in the system (added during 0.9)
-
-  -i --id       ID of group to update
-  -n --nickname nickname of the group to update
-  -a --all      update all
-     --dry-run  don't change anything
-
-END_OF_UPDATEAVATARURL_HELP;
-
-require_once INSTALLDIR.'/scripts/commandline.inc';
-
-try {
-    $user = null;
-
-    if (have_option('i', 'id')) {
-        $id = get_option_value('i', 'id');
-        $group = User_group::staticGet('id', $id);
-        if (empty($group)) {
-            throw new Exception("Can't find group with id '$id'.");
-        }
-        updateGroupUri($group);
-    } else if (have_option('n', 'nickname')) {
-        $nickname = get_option_value('n', 'nickname');
-        $group = User_group::staticGet('nickname', $nickname);
-        if (empty($group)) {
-            throw new Exception("Can't find group with nickname '$nickname'");
-        }
-        updateGroupUri($group);
-    } else if (have_option('a', 'all')) {
-        $group = new User_group();
-        $group->whereAdd('uri IS NULL');
-        if ($group->find()) {
-            while ($group->fetch()) {
-                updateGroupUri($group);
-            }
-        }
-    } else {
-        show_help();
-        exit(1);
-    }
-} catch (Exception $e) {
-    print $e->getMessage()."\n";
-    exit(1);
-}
-
-function updateGroupUri($group)
-{
-    if (!have_option('q', 'quiet')) {
-        print "Updating URI for group '".$group->nickname."' (".$group->id.")...";
-    }
-
-    if (empty($group->uri)) {
-        // Using clone here was screwing up the group->find() iteration
-        $orig = User_group::staticGet('id', $group->id);
-
-        $group->uri = $group->getUri();
-        if (have_option('dry_run')) {
-            echo " would have set $group->uri ";
-        } else {
-            if (!$group->update($orig)) {
-                throw new Exception("Can't update uri for group " . $group->nickname . ".");
-            }
-            echo " set $group->uri ";
-        }
-    } else {
-        print " already set, keeping $group->uri ";
-    }
-
-    if (have_option('v', 'verbose')) {
-        print "DONE.";
-    }
-    if (!have_option('q', 'quiet') || have_option('v', 'verbose')) {
-        print "\n";
-    }
-}
diff --git a/scripts/fixup_inboxes.php b/scripts/fixup_inboxes.php
deleted file mode 100755
index 2aa5d16900..0000000000
--- a/scripts/fixup_inboxes.php
+++ /dev/null
@@ -1,81 +0,0 @@
-#!/usr/bin/env php
-<?php
-/*
- * StatusNet - the distributed open-source microblogging tool
- * Copyright (C) 2008, 2009, StatusNet, Inc.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-// Abort if called from a web server
-if (isset($_SERVER) && array_key_exists('REQUEST_METHOD', $_SERVER)) {
-    print "This script must be run from the command line\n";
-    exit();
-}
-
-ini_set("max_execution_time", "0");
-ini_set("max_input_time", "0");
-set_time_limit(0);
-mb_internal_encoding('UTF-8');
-
-define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
-define('STATUSNET', true);
-define('LACONICA', true); // compatibility
-
-require_once(INSTALLDIR . '/lib/common.php');
-
-$start_at = ($argc > 1) ? $argv[1] : null;
-
-common_log(LOG_INFO, 'Updating user inboxes.');
-
-$user = new User();
-
-if ($start_at) {
-    $user->whereAdd('id >= ' . $start_at);
-}
-
-$cnt = $user->find();
-$cache = Cache::instance();
-
-while ($user->fetch()) {
-    common_log(LOG_INFO, 'Updating inbox for user ' . $user->id);
-    $user->query('BEGIN');
-    $inbox = new Notice_inbox();
-    $result = $inbox->query('INSERT LOW_PRIORITY INTO notice_inbox (user_id, notice_id, created) ' .
-                            'SELECT ' . $user->id . ', notice.id, notice.created ' .
-                            'FROM subscription JOIN notice ON subscription.subscribed = notice.profile_id ' .
-                            'WHERE subscription.subscriber = ' . $user->id . ' ' .
-                            'AND notice.created >= subscription.created ' . 
-                            'AND NOT EXISTS (SELECT user_id, notice_id ' .
-                            'FROM notice_inbox ' .
-                            'WHERE user_id = ' . $user->id . ' ' . 
-                            'AND notice_id = notice.id)');
-    if (is_null($result) || $result === false) {
-        common_log_db_error($inbox, 'INSERT', __FILE__);
-        continue;
-    }
-    $orig = clone($user);
-    $user->inboxed = 1;
-    $result = $user->update($orig);
-    if (!$result) {
-        common_log_db_error($user, 'UPDATE', __FILE__);
-        continue;
-    }
-    $user->query('COMMIT');
-    $inbox->free();
-    unset($inbox);
-    if ($cache) {
-        $cache->delete(Cache::key('user:notices_with_friends:' . $user->id));
-    }
-}
diff --git a/scripts/fixup_notices_rendered.php b/scripts/fixup_notices_rendered.php
deleted file mode 100755
index cfbdc7479b..0000000000
--- a/scripts/fixup_notices_rendered.php
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/usr/bin/env php
-<?php
-/*
- * StatusNet - the distributed open-source microblogging tool
- * Copyright (C) 2008, 2009, StatusNet, Inc.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-// 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('STATUSNET', true);
-define('LACONICA', true); // compatibility
-
-require_once(INSTALLDIR . '/lib/common.php');
-
-common_log(LOG_INFO, 'Starting to render old notices.');
-
-$start_at = ($argc > 1) ? $argv[1] : null;
-
-$notice = new Notice();
-if ($start_at) {
-    $notice->whereAdd('id >= ' . $start_at);
-}
-$cnt = $notice->find();
-
-while ($notice->fetch()) {
-    common_log(LOG_INFO, 'Pre-rendering notice #' . $notice->id);
-    $original = clone($notice);
-    $notice->rendered = common_render_content($notice->content, $notice);
-    $result = $notice->update($original);
-    if (!$result) {
-        common_log_db_error($notice, 'UPDATE', __FILE__);
-    }
-}
diff --git a/scripts/getvaliddaemons.php b/scripts/getvaliddaemons.php
index 80c21bce58..78cbba8c07 100755
--- a/scripts/getvaliddaemons.php
+++ b/scripts/getvaliddaemons.php
@@ -39,8 +39,6 @@ $daemons = array();
 
 $daemons[] = INSTALLDIR.'/scripts/queuedaemon.php';
 
-$daemons[] = INSTALLDIR.'/scripts/imdaemon.php';
-
 if (Event::handle('GetValidDaemons', array(&$daemons))) {
     foreach ($daemons as $daemon) {
         print $daemon . ' ';
diff --git a/scripts/init_conversation.php b/scripts/init_conversation.php
deleted file mode 100755
index 675e7cabdd..0000000000
--- a/scripts/init_conversation.php
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/usr/bin/env php
-<?php
-/*
- * StatusNet - the distributed open-source microblogging tool
- * Copyright (C) 2008, 2009, StatusNet, Inc.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
-
-require_once INSTALLDIR.'/scripts/commandline.inc';
-
-common_log(LOG_INFO, 'Initializing conversation table...');
-
-$notice = new Notice();
-$notice->query('select distinct conversation from notice');
-
-while ($notice->fetch()) {
-    $id = $notice->conversation;
-
-    if ($id) {
-        $uri = common_local_url('conversation', array('id' => $id));
-
-        // @fixme db_dataobject won't save our value for an autoincrement
-        // so we're bypassing the insert wrappers
-        $conv = new Conversation();
-        $sql = "insert into conversation (id,uri,created) values(%d,'%s','%s')";
-        $sql = sprintf($sql,
-                       $id,
-                       $conv->escape($uri),
-                       $conv->escape(common_sql_now()));
-        echo "$id ";
-        $conv->query($sql);
-        print "... ";
-    }
-}
-print "done.\n";
diff --git a/scripts/initializeinbox.php b/scripts/initializeinbox.php
deleted file mode 100644
index 44508fe22a..0000000000
--- a/scripts/initializeinbox.php
+++ /dev/null
@@ -1,116 +0,0 @@
-#!/usr/bin/env php
-<?php
-/*
- * StatusNet - a distributed open-source microblogging tool
- * Copyright (C) 2009, StatusNet, Inc.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
-
-$shortoptions = 'i:n:af:';
-$longoptions = array('id=', 'nickname=', 'all', 'file=');
-
-$helptext = <<<END_OF_INITIALIZEINBOX_HELP
-initializeinbox.php [options]
-initialize the inbox for a user
-
-  -i --id         ID of user to update
-  -n --nickname   nickname of the user to update
-  -f FILENAME     read list of IDs from FILENAME (1 per line)
-  --file=FILENAME ditto
-  -a --all        update all
-
-END_OF_INITIALIZEINBOX_HELP;
-
-require_once INSTALLDIR.'/scripts/commandline.inc';
-
-try {
-    $user = null;
-
-    if (have_option('i', 'id')) {
-        $id = get_option_value('i', 'id');
-        $user = User::staticGet('id', $id);
-        if (empty($user)) {
-            throw new Exception("Can't find user with id '$id'.");
-        }
-        initializeInbox($user);
-    } else if (have_option('n', 'nickname')) {
-        $nickname = get_option_value('n', 'nickname');
-        $user = User::staticGet('nickname', $nickname);
-        if (empty($user)) {
-            throw new Exception("Can't find user with nickname '$nickname'");
-        }
-        initializeInbox($user);
-    } else if (have_option('a', 'all')) {
-        $user = new User();
-        if ($user->find()) {
-            while ($user->fetch()) {
-                initializeInbox($user);
-            }
-        }
-    } else if (have_option('f', 'file')) {
-        $filename = get_option_value('f', 'file');
-        if (!file_exists($filename)) {
-            throw new Exception("No such file '$filename'.");
-        } else if (!is_readable($filename)) {
-            throw new Exception("Can't read '$filename'.");
-        }
-        $ids = file($filename);
-        foreach ($ids as $id) {
-            $user = User::staticGet('id', $id);
-            if (empty($user)) {
-                print "Can't find user with id '$id'.\n";
-            }
-            initializeInbox($user);
-        }
-    } else {
-        show_help();
-        exit(1);
-    }
-} catch (Exception $e) {
-    print $e->getMessage()."\n";
-    exit(1);
-}
-
-function initializeInbox($user)
-{
-    if (!have_option('q', 'quiet')) {
-        print "Initializing inbox for $user->nickname...";
-    }
-
-    $inbox = Inbox::staticGet('user_id', $user->id);
-
-    if ($inbox && !empty($inbox->fake)) {
-        if (!have_option('q', 'quiet')) {
-            echo "(replacing faux cached inbox)";
-        }
-        $inbox = false;
-    }
-    if (!empty($inbox)) {
-        if (!have_option('q', 'quiet')) {
-            print "SKIP\n";
-        }
-    } else {
-        $inbox = Inbox::initialize($user->id);
-        if (!have_option('q', 'quiet')) {
-            if (empty($inbox)) {
-                print "ERR\n";
-            } else {
-                print "DONE\n";
-            }
-        }
-    }
-}
diff --git a/scripts/install_cli.php b/scripts/install_cli.php
index dadbcf66f0..3e18f28f3e 100755
--- a/scripts/install_cli.php
+++ b/scripts/install_cli.php
@@ -82,7 +82,9 @@ class CliInstaller extends Installer
             '--admin-nick' => 'adminNick',
             '--admin-pass' => 'adminPass',
             '--admin-email' => 'adminEmail',
-            '--admin-updates' => 'adminUpdates'
+            '--admin-updates' => 'adminUpdates',
+
+            '--site-profile' => 'siteProfile'
         );
         foreach ($map as $arg => $target) {
             if (substr($arg, 0, 2) == '--') {
@@ -170,6 +172,8 @@ install_cli.php - StatusNet command-line installer
        --admin-updates   'yes' (default) or 'no', whether to subscribe
                          admin to update@status.net (default yes)
        
+       --site-profile    site profile ['public', 'private' (default), 'community', 'singleuser']
+       
        --skip-config     Don't write a config.php -- use with caution,
                          requires a global configuration file.
 
diff --git a/scripts/joingroup.php b/scripts/joingroup.php
new file mode 100644
index 0000000000..658244db9d
--- /dev/null
+++ b/scripts/joingroup.php
@@ -0,0 +1,58 @@
+<?php
+/*
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2012 StatusNet, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
+
+$shortoptions = 'i:n:g:G:';
+$longoptions = array('id=', 'nickname=', 'group=', 'group-id=');
+
+$helptext = <<<END_OF_HELP
+addusertogroup.php [options]
+
+Adds a local user to a local group.
+
+  -i --id       ID of user to add
+  -n --nickname nickname of the user to add
+  -g --group    nickname or alias of group
+  -G --group-id ID of group
+
+END_OF_HELP;
+
+require_once INSTALLDIR.'/scripts/commandline.inc';
+
+try {
+    $user = getUser();
+    $lgroup = null;
+    if (have_option('G', 'group-id')) {
+        $gid = get_option_value('G', 'group-id');
+        $lgroup = Local_group::staticGet('group_id', $gid);
+    } else if (have_option('g', 'group')) {
+        $gnick = get_option_value('g', 'group');
+        $lgroup = Local_group::staticGet('nickname', $gnick);
+    }
+    if (empty($lgroup)) {
+        throw new Exception("No such local group: $gnick");
+    }
+    $group = User_group::staticGet('id', $lgroup->group_id);
+    $user->joinGroup($group);
+    print "OK\n";
+} catch (Exception $e) {
+    print $e->getMessage()."\n";
+    exit(1);
+}
diff --git a/scripts/leavegroup.php b/scripts/leavegroup.php
new file mode 100644
index 0000000000..653c3b5aad
--- /dev/null
+++ b/scripts/leavegroup.php
@@ -0,0 +1,58 @@
+<?php
+/*
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2012 StatusNet, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
+
+$shortoptions = 'i:n:g:G:';
+$longoptions = array('id=', 'nickname=', 'group=', 'group-id=');
+
+$helptext = <<<END_OF_HELP
+leavegroup.php [options]
+
+Removes a local user from a local group.
+
+  -i --id       ID of user to remove
+  -n --nickname nickname of the user to remove
+  -g --group    nickname or alias of group
+  -G --group-id ID of group
+
+END_OF_HELP;
+
+require_once INSTALLDIR.'/scripts/commandline.inc';
+
+try {
+    $user = getUser();
+    $lgroup = null;
+    if (have_option('G', 'group-id')) {
+        $gid = get_option_value('G', 'group-id');
+        $lgroup = Local_group::staticGet('group_id', $gid);
+    } else if (have_option('g', 'group')) {
+        $gnick = get_option_value('g', 'group');
+        $lgroup = Local_group::staticGet('nickname', $gnick);
+    }
+    if (empty($lgroup)) {
+        throw new Exception("No such local group: $gnick");
+    }
+    $group = User_group::staticGet('id', $lgroup->group_id);
+    $user->leaveGroup($group);
+    print "OK\n";
+} catch (Exception $e) {
+    print $e->getMessage()."\n";
+    exit(1);
+}
diff --git a/scripts/move_status_network.sh b/scripts/move_status_network.sh
new file mode 100755
index 0000000000..2a259c280a
--- /dev/null
+++ b/scripts/move_status_network.sh
@@ -0,0 +1,102 @@
+#!/bin/bash
+
+# live fast! die young!
+
+set -e
+
+# move_status_network.sh nickname newserver
+
+export nickname="$1"
+export newdbhost="$2"
+
+source /etc/statusnet/setup.cfg
+
+function set_maintenance_mode()
+{
+    local nickname=$1;
+
+    php $PHPBASE/scripts/settag.php $nickname maintenancemode;
+}
+
+function get_current_db_info()
+{
+    local nickname=$1;
+
+    #FIXME I couldn't make this work better
+    
+    export dbhost=`mysql -NB -h $SITEDBHOSTNAME -u $ADMIN --password=$ADMINPASS -e "SELECT dbhost FROM status_network WHERE nickname = '$nickname'" $SITEDB`
+    export dbuser=`mysql -NB -h $SITEDBHOSTNAME -u $ADMIN --password=$ADMINPASS -e "SELECT dbuser FROM status_network WHERE nickname = '$nickname'" $SITEDB`
+    export dbpass=`mysql -NB -h $SITEDBHOSTNAME -u $ADMIN --password=$ADMINPASS -e "SELECT dbpass FROM status_network WHERE nickname = '$nickname'" $SITEDB`
+    export dbname=`mysql -NB -h $SITEDBHOSTNAME -u $ADMIN --password=$ADMINPASS -e "SELECT dbname FROM status_network WHERE nickname = '$nickname'" $SITEDB`
+}
+
+function create_empty_db()
+{
+    local newdbhost=$1;
+    local dbuser=$2;
+    local dbpass=$3;
+    local dbname=$4;
+    
+    mysqladmin -h $newdbhost -u $ADMIN --password=$ADMINPASS create $dbname;
+    
+    mysql -h $newdbhost -u $ADMIN --password=$ADMINPASS -e "GRANT ALL ON $dbname.* TO '$dbuser'@'localhost' IDENTIFIED BY '$dbpass';" $dbname;
+    mysql -h $newdbhost -u $ADMIN --password=$ADMINPASS -e "GRANT ALL ON $dbname.* TO '$dbuser'@'%' IDENTIFIED BY '$dbpass';" $dbname;
+}
+
+function transfer_data()
+{
+    local dbhost=$1;
+    local newdbhost=$2;
+    local dbuser=$3;
+    local dbpass=$4;
+    local dbname=$5;
+    local dumpfile=`mktemp`;
+
+    mysqldump -h $dbhost -u $ADMIN --password=$ADMINPASS $dbname > $dumpfile;
+    mysql -h $newdbhost -u $ADMIN --password=$ADMINPASS $dbname < $dumpfile;
+    rm $dumpfile;
+}
+
+function update_routing_table()
+{
+    local nickname=$1;
+    local newdbhost=$2;
+    
+    mysql -h $SITEDBHOSTNAME -u $ADMIN --password=$ADMINPASS -e "UPDATE status_network set dbhost = '$newdbhost' where nickname = '$nickname'" $SITEDB
+}
+
+function flush_site()
+{
+    local nickname=$1;
+    
+    php $PHPBASE/scripts/flushsite.php -s$nickname.$WILDCARD
+}
+
+function unset_maintenance_mode()
+{
+    local nickname=$1;
+    
+    php $PHPBASE/scripts/settag.php -d $nickname maintenancemode;
+}
+
+echo -n Setting maintenance mode on $nickname...
+set_maintenance_mode $nickname
+echo DONE.
+echo -n Getting current database info...
+get_current_db_info $nickname
+echo DONE.
+echo -n Creating empty $dbname database on server $newdbhost...
+create_empty_db $newdbhost $dbuser $dbpass $dbname
+echo DONE
+echo -n Copying $dbname database from $dbhost to $newdbhost...
+transfer_data $dbhost $newdbhost $dbuser $dbpass $dbname
+echo DONE
+echo -n Updating the routing table for $nickname to use $dbname on $newdbhost...
+update_routing_table $nickname $newdbhost
+echo DONE
+echo -n Flushing $nickname site from cache...
+flush_site $nickname
+echo DONE
+echo -n Turning off maintenance mode on $nickname...
+unset_maintenance_mode $nickname
+echo DONE.
diff --git a/scripts/rebuilddb.sh b/scripts/rebuilddb.sh
deleted file mode 100755
index 89bc6e252d..0000000000
--- a/scripts/rebuilddb.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/bash
-
-export user=$1
-export password=$2
-export DB=$3
-export SCR=$4
-
-mysqldump -u $user --password=$password -c -t --hex-blob $DB > /tmp/$DB.sql
-mysqladmin -u $user --password=$password -f drop $DB
-mysqladmin -u $user --password=$password create $DB
-mysql -u $user --password=$password $DB < $SCR
-mysql -u $user --password=$password $DB < /tmp/$DB.sql
-
-
diff --git a/scripts/rebuilddb_psql.sh b/scripts/rebuilddb_psql.sh
deleted file mode 100755
index 6b15b9212f..0000000000
--- a/scripts/rebuilddb_psql.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/bash
-#
-# ******************************* WARNING *********************************
-# Do not run this script until you have read and understood the information
-# below, AND backed up your database. Failure to observe these instructions
-# may result in losing all the data in your database.
-#
-# This script is used to upgrade StatusNet's PostgreSQL database to the
-# latest version. It does the following:
-# 
-#  1. Dumps the existing data to /tmp/rebuilddb_psql.sql
-#  2. Clears out the objects (tables, etc) in the database schema
-#  3. Reconstructs the database schema using the latest script
-#  4. Restores the data dumped in step 1
-#
-# You MUST run this script as the 'postgres' user.
-# You MUST be able to write to /tmp/rebuilddb_psql.sql
-# You MUST specify the statusnet database user and database name on the
-# command line, e.g. ./rebuilddb_psql.sh myuser mydbname
-#
-
-user=$1
-DB=$2
-
-cd `dirname $0`
-
-pg_dump -a -D --disable-trigger $DB > /tmp/rebuilddb_psql.sql
-psql -c "drop schema public cascade; create schema public;" $DB
-psql -c "grant all privileges on schema public to $user;" $DB
-psql $DB < ../db/statusnet_pg.sql
-psql $DB < /tmp/rebuilddb_psql.sql
-for tab in `psql -c '\dts' $DB -tA | cut -d\| -f2`; do
-  psql -c "ALTER TABLE \"$tab\" OWNER TO $user;" $DB
-done
diff --git a/scripts/settag.php b/scripts/settag.php
index ca260f7bf9..19abce43c8 100644
--- a/scripts/settag.php
+++ b/scripts/settag.php
@@ -66,12 +66,12 @@ if ($i !== false) {
         }
     } else {
         print "Already set.\n";
-        exit(-1);
+        exit(0);
     }
 } else {
     if (have_option('d', 'delete')) { // Delete
         print "No such tag.\n";
-        exit(-1);
+        exit(0);
     } else {
         $tags[] = $tag;
         $result = $sn->setTags($tags);
diff --git a/scripts/setup.cfg.sample b/scripts/setup.cfg.sample
index 049cd3e859..3296bbe043 100644
--- a/scripts/setup.cfg.sample
+++ b/scripts/setup.cfg.sample
@@ -18,3 +18,4 @@ export MAILSUBJECT="Your new StatusNet site"
 export POSTINSTALL=/etc/statusnet/morestuff.sh
 export WEBUSER=www-data
 export WEBGROUP=www-data
+export TAGS=tag1,tag2,tag3
diff --git a/scripts/sitemap.php b/scripts/sitemap.php
deleted file mode 100755
index f8c3921465..0000000000
--- a/scripts/sitemap.php
+++ /dev/null
@@ -1,399 +0,0 @@
-#!/usr/bin/env php
-<?php
-/*
- * StatusNet - the distributed open-source microblogging tool
- * Copyright (C) 2008, 2009, StatusNet, Inc.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
-
-$shortoptions = 'f:d:u:';
-
-$helptext = <<<END_OF_SITEMAP_HELP
-Script for creating sitemaps files per http://sitemaps.org/
-
-    -f <indexfile>   Use <indexfile> as output file
-    -d <outputdir>   Use <outputdir> for new sitemaps
-    -u <outputurl>   Use <outputurl> as root for URLs
-
-END_OF_SITEMAP_HELP;
-
-require_once INSTALLDIR . '/scripts/commandline.inc';
-
-$output_paths = parse_args();
-
-standard_map();
-notices_map();
-user_map();
-index_map();
-
-// ------------------------------------------------------------------------------
-// Main functions: get data out and turn them into sitemaps
-// ------------------------------------------------------------------------------
-
-// Generate index sitemap of all other sitemaps.
-function index_map()
-{
-    global $output_paths;
-    $output_dir = $output_paths['output_dir'];
-    $output_url = $output_paths['output_url'];
-
-    foreach (glob("$output_dir*.xml") as $file_name) {
-
-        // Just the file name please.
-        $file_name = preg_replace("|$output_dir|", '', $file_name);
-
-        $index_urls .= sitemap(
-                           array(
-                                 'url' => $output_url . $file_name,
-                                 'changefreq' => 'daily'
-                                 )
-                           );
-    }
-
-    write_file($output_paths['index_file'], sitemapindex($index_urls));
-}
-
-// Generate sitemap of standard site elements.
-function standard_map()
-{
-    global $output_paths;
-
-    $standard_map_urls .= url(
-                              array(
-                                    'url' => common_local_url('public'),
-                                    'changefreq' => 'daily',
-                                    'priority' => '1',
-                                    )
-                              );
-
-    $standard_map_urls .= url(
-                              array(
-                                    'url' => common_local_url('publicrss'),
-                                    'changefreq' => 'daily',
-                                    'priority' => '0.3',
-                                    )
-                              );
-
-    $docs = array('about', 'faq', 'contact', 'im', 'openid', 'openmublog',
-        'privacy', 'source', 'badge');
-
-    foreach($docs as $title) {
-        $standard_map_urls .= url(
-                                  array(
-                                        'url' => common_local_url('doc', array('title' => $title)),
-                                        'changefreq' => 'monthly',
-                                        'priority'   => '0.2',
-                                        )
-                                  );
-    }
-
-    $urlset_path = $output_paths['output_dir'] . 'standard.xml';
-
-    write_file($urlset_path, urlset($standard_map_urls));
-}
-
-// Generate sitemaps of all notices.
-function notices_map()
-{
-    global $output_paths;
-
-    $notices = DB_DataObject::factory('notice');
-
-    $notices->query('SELECT id, uri, url, modified FROM notice where is_local = 1');
-
-    $notice_count = 0;
-    $map_count = 1;
-
-    while ($notices->fetch()) {
-
-        // Maximum 50,000 URLs per sitemap file.
-        if ($notice_count == 50000) {
-            $notice_count = 0;
-            $map_count++;
-        }
-
-        // remote notices have an URL
-
-        if (!$notices->url && $notices->uri) {
-            $notice = array(
-                        'url'        => ($notices->uri) ? $notices->uri : common_local_url('shownotice', array('notice' => $notices->id)),
-                        'lastmod'    => common_date_w3dtf($notices->modified),
-                        'changefreq' => 'never',
-                        'priority'   => '1',
-                        );
-
-            $notice_list[$map_count] .= url($notice);
-            $notice_count++;
-        }
-    }
-
-    // Make full sitemaps from the lists and save them.
-    array_to_map($notice_list, 'notice');
-}
-
-// Generate sitemaps of all users.
-function user_map()
-{
-    global $output_paths;
-
-    $users = DB_DataObject::factory('user');
-
-    $users->query('SELECT id, nickname FROM user');
-
-    $user_count = 0;
-    $map_count = 1;
-
-    while ($users->fetch()) {
-
-        // Maximum 50,000 URLs per sitemap file.
-        if ($user_count == 50000) {
-            $user_count = 0;
-            $map_count++;
-        }
-
-        $user_args = array('nickname' => $users->nickname);
-
-        // Define parameters for generating <url></url> elements.
-        $user = array(
-                      'url'        => common_local_url('showstream', $user_args),
-                      'changefreq' => 'daily',
-                      'priority'   => '1',
-                      );
-
-        $user_rss = array(
-                          'url'        => common_local_url('userrss', $user_args),
-                          'changefreq' => 'daily',
-                          'priority'   => '0.3',
-                          );
-
-        $all = array(
-                     'url'        => common_local_url('all', $user_args),
-                     'changefreq' => 'daily',
-                     'priority'   => '1',
-                     );
-
-        $all_rss = array(
-                         'url'        => common_local_url('allrss', $user_args),
-                         'changefreq' => 'daily',
-                         'priority'   => '0.3',
-                         );
-
-        $replies = array(
-                         'url'        => common_local_url('replies', $user_args),
-                         'changefreq' => 'daily',
-                         'priority'   => '1',
-                         );
-
-        $replies_rss = array(
-                             'url'        => common_local_url('repliesrss', $user_args),
-                             'changefreq' => 'daily',
-                             'priority'   => '0.3',
-                             );
-
-        $foaf = array(
-                      'url'        => common_local_url('foaf', $user_args),
-                      'changefreq' => 'weekly',
-                      'priority'   => '0.5',
-                      );
-
-        // Construct a <url></url> element for each user facet and add it
-        // to our existing list of those.
-        $user_list[$map_count]        .= url($user);
-        $user_rss_list[$map_count]    .= url($user_rss);
-        $all_list[$map_count]         .= url($all);
-        $all_rss_list[$map_count]     .= url($all_rss);
-        $replies_list[$map_count]     .= url($replies);
-        $replies_rss_list[$map_count] .= url($replies_rss);
-        $foaf_list[$map_count]        .= url($foaf);
-
-        $user_count++;
-    }
-
-    // Make full sitemaps from the lists and save them.
-    // Possible factoring: put all the lists into a master array, thus allowing
-    // calling with single argument (i.e., array_to_map('user')).
-    array_to_map($user_list, 'user');
-    array_to_map($user_rss_list, 'user_rss');
-    array_to_map($all_list, 'all');
-    array_to_map($all_rss_list, 'all_rss');
-    array_to_map($replies_list, 'replies');
-    array_to_map($replies_rss_list, 'replies_rss');
-    array_to_map($foaf_list, 'foaf');
-}
-
-// ------------------------------------------------------------------------------
-// XML generation functions
-// ------------------------------------------------------------------------------
-
-// Generate a <url></url> element.
-function url($url_args)
-{
-    $url        = preg_replace('/&/', '&amp;', $url_args['url']); // escape ampersands for XML
-    $lastmod    = $url_args['lastmod'];
-    $changefreq = $url_args['changefreq'];
-    $priority   = $url_args['priority'];
-
-    if (is_null($url)) {
-        error("url() arguments require 'url' value.");
-    }
-
-    $url_out = "\t<url>\n";
-    $url_out .= "\t\t<loc>$url</loc>\n";
-
-    if ($changefreq) {
-        $url_out .= "\t\t<changefreq>$changefreq</changefreq>\n";
-    }
-
-    if ($lastmod) {
-        $url_out .= "\t\t<lastmod>$lastmod</lastmod>\n";
-    }
-
-    if ($priority) {
-        $url_out .= "\t\t<priority>$priority</priority>\n";
-    }
-
-    $url_out .= "\t</url>\n";
-
-    return $url_out;
-}
-
-function sitemap($sitemap_args)
-{
-    $url        = preg_replace('/&/', '&amp;', $sitemap_args['url']); // escape ampersands for XML
-    $lastmod    = $sitemap_args['lastmod'];
-
-    if (is_null($url)) {
-        error("url() arguments require 'url' value.");
-    }
-
-    $sitemap_out = "\t<sitemap>\n";
-    $sitemap_out .= "\t\t<loc>$url</loc>\n";
-
-    if ($lastmod) {
-        $sitemap_out .= "\t\t<lastmod>$lastmod</lastmod>\n";
-    }
-
-    $sitemap_out .= "\t</sitemap>\n";
-
-    return $sitemap_out;
-}
-
-// Generate a <urlset></urlset> element.
-function urlset($urlset_text)
-{
-    $urlset = '<?xml version="1.0" encoding="UTF-8"?>' . "\n" .
-      '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">' . "\n" .
-      $urlset_text .
-      '</urlset>';
-
-    return $urlset;
-}
-
-// Generate a <urlset></urlset> element.
-function sitemapindex($sitemapindex_text)
-{
-    $sitemapindex = '<?xml version="1.0" encoding="UTF-8"?>' . "\n" .
-      '<sitemapindex xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">' . "\n" .
-      $sitemapindex_text .
-      '</sitemapindex>';
-
-    return $sitemapindex;
-}
-
-// Generate a sitemap from an array containing <url></url> elements and write it to a file.
-function array_to_map($url_list, $filename_prefix)
-{
-    global $output_paths;
-
-    if ($url_list) {
-        // $map_urls is a long string containing concatenated <url></url> elements.
-        while (list($map_idx, $map_urls) = each($url_list)) {
-            $urlset_path = $output_paths['output_dir'] . "$filename_prefix-$map_idx.xml";
-
-            write_file($urlset_path, urlset($map_urls));
-        }
-    }
-}
-
-// ------------------------------------------------------------------------------
-// Internal functions
-// ------------------------------------------------------------------------------
-
-// Parse command line arguments.
-function parse_args()
-{
-    $index_file = get_option_value('f');
-    $output_dir = get_option_value('d');
-    $output_url = get_option_value('u');
-
-    if (file_exists($output_dir)) {
-        if (is_writable($output_dir) === false) {
-            error("$output_dir is not writable.");
-        }
-    }     else {
-        error("output directory $output_dir does not exist.");
-    }
-
-    $paths = array(
-                   'index_file' => $index_file,
-                   'output_dir' => trailing_slash($output_dir),
-                   'output_url' => trailing_slash($output_url),
-                   );
-
-    return $paths;
-}
-
-// Ensure paths end with a "/".
-function trailing_slash($path)
-{
-    if (preg_match('/\/$/', $path) == 0) {
-        $path .= '/';
-    }
-
-    return $path;
-}
-
-// Write data to disk.
-function write_file($path, $data)
-{
-    if (is_null($path)) {
-        error('No path specified for writing to.');
-    }     elseif (is_null($data)) {
-        error('No data specified for writing.');
-    }
-
-    if (($fh_out = fopen($path,'w')) === false) {
-        error("couldn't open $path for writing.");
-    }
-
-    if (fwrite($fh_out, $data) === false) {
-        error("couldn't write to $path.");
-    }
-}
-
-// Display an error message and exit.
-function error ($error_msg)
-{
-    if (is_null($error_msg)) {
-        $error_msg = 'error() was called without any explanation!';
-    }
-
-    echo "Error: $error_msg\n";
-    exit(1);
-}
-
-?>
\ No newline at end of file
diff --git a/scripts/stopdaemons.sh b/scripts/stopdaemons.sh
index bc1230e645..45a7d5cc8b 100755
--- a/scripts/stopdaemons.sh
+++ b/scripts/stopdaemons.sh
@@ -23,8 +23,8 @@
 SDIR=`dirname $0`
 DIR=`php $SDIR/getpiddir.php`
 
-for f in ombhandler smshandler pinghandler \
-	 twitterhandler facebookhandler \
+for f in ombhandler smshandler pinghandler queuedaemon \
+	 twitterhandler facebookhandler imdaemon \
 	 twitterstatusfetcher synctwitterfriends pluginhandler rsscloudhandler; do
 
 	FILES="$DIR/$f.*.pid"
diff --git a/scripts/updateavatarurl.php b/scripts/updateavatarurl.php
deleted file mode 100644
index 3b6681bae9..0000000000
--- a/scripts/updateavatarurl.php
+++ /dev/null
@@ -1,132 +0,0 @@
-#!/usr/bin/env php
-<?php
-/*
- * StatusNet - a distributed open-source microblogging tool
- * Copyright (C) 2008, 2009, StatusNet, Inc.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
-
-$shortoptions = 'i:n:a';
-$longoptions = array('id=', 'nickname=', 'all');
-
-$helptext = <<<END_OF_UPDATEAVATARURL_HELP
-updateavatarurl.php [options]
-update the URLs of all avatars in the system
-
-  -i --id       ID of user to update
-  -n --nickname nickname of the user to update
-  -a --all      update all
-
-END_OF_UPDATEAVATARURL_HELP;
-
-require_once INSTALLDIR.'/scripts/commandline.inc';
-
-try {
-    $user = null;
-
-    if (have_option('i', 'id')) {
-        $id = get_option_value('i', 'id');
-        $user = User::staticGet('id', $id);
-        if (empty($user)) {
-            throw new Exception("Can't find user with id '$id'.");
-        }
-        updateAvatars($user);
-    } else if (have_option('n', 'nickname')) {
-        $nickname = get_option_value('n', 'nickname');
-        $user = User::staticGet('nickname', $nickname);
-        if (empty($user)) {
-            throw new Exception("Can't find user with nickname '$nickname'");
-        }
-        updateAvatars($user);
-    } else if (have_option('a', 'all')) {
-        $user = new User();
-        if ($user->find()) {
-            while ($user->fetch()) {
-                updateAvatars($user);
-            }
-        }
-    } else {
-        show_help();
-        exit(1);
-    }
-} catch (Exception $e) {
-    print $e->getMessage()."\n";
-    exit(1);
-}
-
-function updateAvatars($user)
-{
-    $touched = false;
-
-    if (!have_option('q', 'quiet')) {
-        print "Updating avatars for user '".$user->nickname."' (".$user->id.")...";
-    }
-
-    $avatar = new Avatar();
-
-    $avatar->profile_id = $user->id;
-
-    if (!$avatar->find()) {
-        if (have_option('v', 'verbose')) {
-                print "(none found)...";
-        }
-    } else {
-        while ($avatar->fetch()) {
-            if (have_option('v', 'verbose')) {
-                if ($avatar->original) {
-                    print "original...";
-                } else {
-                    print $avatar->width."...";
-                }
-            }
-
-            $orig_url = $avatar->url;
-
-            $avatar->url = Avatar::url($avatar->filename);
-
-            if ($avatar->url != $orig_url) {
-                $sql =
-                  "UPDATE avatar SET url = '" . $avatar->url . "' ".
-                  "WHERE profile_id = " . $avatar->profile_id . " ".
-                  "AND width = " . $avatar->width . " " .
-                  "AND height = " . $avatar->height . " ";
-
-                if ($avatar->original) {
-                    $sql .= "AND original = 1 ";
-                }
-
-                if (!$avatar->query($sql)) {
-                    throw new Exception("Can't update avatar for user " . $user->nickname . ".");
-                } else {
-                    $touched = true;
-                }
-            }
-        }
-    }
-
-    if ($touched) {
-        $profile = $user->getProfile();
-        common_broadcast_profile($profile);
-    }
-
-    if (have_option('v', 'verbose')) {
-        print "DONE.";
-    }
-    if (!have_option('q', 'quiet') || have_option('v', 'verbose')) {
-        print "\n";
-    }
-}
diff --git a/scripts/updateavatarurl_group.php b/scripts/updateavatarurl_group.php
deleted file mode 100644
index ada42de202..0000000000
--- a/scripts/updateavatarurl_group.php
+++ /dev/null
@@ -1,99 +0,0 @@
-#!/usr/bin/env php
-<?php
-/*
- * StatusNet - a distributed open-source microblogging tool
- * Copyright (C) 2008, 2009, StatusNet, Inc.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
-
-$shortoptions = 'i:n:a';
-$longoptions = array('id=', 'nickname=', 'all');
-
-$helptext = <<<END_OF_UPDATEAVATARURL_HELP
-updateavatarurl_group.php [options]
-update the URLs of all group avatars in the system
-
-  -i --id       ID of group to update
-  -n --nickname nickname of the group to update
-  -a --all      update all
-
-END_OF_UPDATEAVATARURL_HELP;
-
-require_once INSTALLDIR.'/scripts/commandline.inc';
-
-try {
-    $user = null;
-
-    if (have_option('i', 'id')) {
-        $id = get_option_value('i', 'id');
-        $group = User_group::staticGet('id', $id);
-        if (empty($group)) {
-            throw new Exception("Can't find group with id '$id'.");
-        }
-        updateGroupAvatars($group);
-    } else if (have_option('n', 'nickname')) {
-        $nickname = get_option_value('n', 'nickname');
-        $group = User_group::staticGet('nickname', $nickname);
-        if (empty($group)) {
-            throw new Exception("Can't find group with nickname '$nickname'");
-        }
-        updateGroupAvatars($group);
-    } else if (have_option('a', 'all')) {
-        $group = new User_group();
-        if ($group->find()) {
-            while ($group->fetch()) {
-                updateGroupAvatars($group);
-            }
-        }
-    } else {
-        show_help();
-        exit(1);
-    }
-} catch (Exception $e) {
-    print $e->getMessage()."\n";
-    exit(1);
-}
-
-function updateGroupAvatars($group)
-{
-    if (!have_option('q', 'quiet')) {
-        print "Updating avatars for group '".$group->nickname."' (".$group->id.")...";
-    }
-
-    if (empty($group->original_logo)) {
-        print "(none found)...";
-    } else {
-        // Using clone here was screwing up the group->find() iteration
-        $orig = User_group::staticGet('id', $group->id);
-
-        $group->original_logo = Avatar::url(basename($group->original_logo));
-        $group->homepage_logo = Avatar::url(basename($group->homepage_logo));
-        $group->stream_logo = Avatar::url(basename($group->stream_logo));
-        $group->mini_logo = Avatar::url(basename($group->mini_logo));
-
-        if (!$group->update($orig)) {
-            throw new Exception("Can't update avatars for group " . $group->nickname . ".");
-        }
-    }
-
-    if (have_option('v', 'verbose')) {
-        print "DONE.";
-    }
-    if (!have_option('q', 'quiet') || have_option('v', 'verbose')) {
-        print "\n";
-    }
-}
diff --git a/scripts/updateprofileurl.php b/scripts/updateprofileurl.php
deleted file mode 100644
index 2fc6828e60..0000000000
--- a/scripts/updateprofileurl.php
+++ /dev/null
@@ -1,99 +0,0 @@
-#!/usr/bin/env php
-<?php
-/*
- * StatusNet - a distributed open-source microblogging tool
- * Copyright (C) 2008, 2009, StatusNet, Inc.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
-
-$shortoptions = 'i:n:a';
-$longoptions = array('id=', 'nickname=', 'all');
-
-$helptext = <<<END_OF_UPDATEPROFILEURL_HELP
-updateprofileurl.php [options]
-update the URLs of all avatars in the system
-
-  -i --id       ID of user to update
-  -n --nickname nickname of the user to update
-  -a --all      update all
-
-END_OF_UPDATEPROFILEURL_HELP;
-
-require_once INSTALLDIR.'/scripts/commandline.inc';
-
-try {
-    $user = null;
-
-    if (have_option('i', 'id')) {
-        $id = get_option_value('i', 'id');
-        $user = User::staticGet('id', $id);
-        if (empty($user)) {
-            throw new Exception("Can't find user with id '$id'.");
-        }
-        updateProfileURL($user);
-    } else if (have_option('n', 'nickname')) {
-        $nickname = get_option_value('n', 'nickname');
-        $user = User::staticGet('nickname', $nickname);
-        if (empty($user)) {
-            throw new Exception("Can't find user with nickname '$nickname'");
-        }
-        updateProfileURL($user);
-    } else if (have_option('a', 'all')) {
-        $user = new User();
-        if ($user->find()) {
-            while ($user->fetch()) {
-                updateProfileURL($user);
-            }
-        }
-    } else {
-        show_help();
-        exit(1);
-    }
-} catch (Exception $e) {
-    print $e->getMessage()."\n";
-    exit(1);
-}
-
-function updateProfileURL($user)
-{
-    $profile = $user->getProfile();
-
-    if (empty($profile)) {
-        throw new Exception("Can't find profile for user $user->nickname ($user->id)");
-    }
-
-    $orig = clone($profile);
-
-    $profile->profileurl = common_profile_url($user->nickname);
-
-    if (!have_option('q', 'quiet')) {
-        print "Updating profile url for $user->nickname ($user->id) ".
-          "from $orig->profileurl to $profile->profileurl...";
-    }
-
-    $result = $profile->update($orig);
-
-    if (!$result) {
-        print "FAIL.\n";
-        common_log_db_error($profile, 'UPDATE', __FILE__);
-        throw new Exception("Can't update profile for user $user->nickname ($user->id)");
-    }
-
-    common_broadcast_profile($profile);
-
-    print "OK.\n";
-}
diff --git a/scripts/updateurls.php b/scripts/updateurls.php
new file mode 100644
index 0000000000..01b3c2283b
--- /dev/null
+++ b/scripts/updateurls.php
@@ -0,0 +1,138 @@
+#!/usr/bin/env php
+<?php
+/*
+ * StatusNet - a distributed open-source microblogging tool
+ * Copyright (C) 2008-2011, StatusNet, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
+
+$shortoptions = '';
+$longoptions = array();
+
+$helptext = <<<END_OF_UPDATEURLS_HELP
+updateurls.php [options]
+update stored URLs in the system
+
+END_OF_UPDATEURLS_HELP;
+
+require_once INSTALLDIR.'/scripts/commandline.inc';
+
+function main()
+{
+    updateUserUrls();
+    updateGroupUrls();
+}
+
+function updateUserUrls()
+{
+    printfnq("Updating user URLs...\n");
+
+    // XXX: only update user URLs where out-of-date
+
+    $user = new User();
+    if ($user->find()) {
+        while ($user->fetch()) {
+            printfv("Updating user {$user->nickname}...");
+            try {
+                $profile = $user->getProfile();
+
+                updateProfileUrl($profile);
+                updateAvatarUrls($profile);
+
+                // Broadcast for remote users
+
+                common_broadcast_profile($profile);
+
+            } catch (Exception $e) {
+                printv("Error updating URLs: " . $e->getMessage());
+            }
+            printfv("DONE.");
+        }
+    }
+}
+
+function updateProfileUrl($profile)
+{
+    $orig = clone($profile);
+    $profile->profileurl = common_profile_url($profile->nickname);
+    $profile->update($orig);
+}
+
+function updateAvatarUrls($profile)
+{
+    $avatar = new Avatar();
+
+    $avatar->profile_id = $profile->id;
+    if ($avatar->find()) {
+        while ($avatar->fetch()) {
+            $orig_url = $avatar->url;
+            $avatar->url = Avatar::url($avatar->filename);
+            if ($avatar->url != $orig_url) {
+                $sql =
+                  "UPDATE avatar SET url = '" . $avatar->url . "' ".
+                  "WHERE profile_id = " . $avatar->profile_id . " ".
+                  "AND width = " . $avatar->width . " " .
+                  "AND height = " . $avatar->height . " ";
+
+                if ($avatar->original) {
+                    $sql .= "AND original = 1 ";
+                }
+
+                if (!$avatar->query($sql)) {
+                    throw new Exception("Can't update avatar for user " . $profile->nickname . ".");
+                } else {
+                    $touched = true;
+                }
+            }
+        }
+    }
+}
+
+function updateGroupUrls()
+{
+    printfnq("Updating group URLs...\n");
+
+    $group = new User_group();
+
+    if ($group->find()) {
+        while ($group->fetch()) {
+            try {
+                printfv("Updating group {$group->nickname}...");
+                $orig = User_group::staticGet('id', $group->id);
+                if (!empty($group->original_logo)) {
+                    $group->original_logo = Avatar::url(basename($group->original_logo));
+                    $group->homepage_logo = Avatar::url(basename($group->homepage_logo));
+                    $group->stream_logo = Avatar::url(basename($group->stream_logo));
+                    $group->mini_logo = Avatar::url(basename($group->mini_logo));
+                }
+                // XXX: this is a hack to see if a group is local or not
+                $localUri = common_local_url('groupbyid',
+                                             array('id' => $group->id));
+                if ($group->getUri() != $localUri) {
+                    $group->mainpage = common_local_url('showgroup',
+                                                        array('nickname' => $group->nickname));
+                }
+                $group->update($orig);
+                printfv("DONE.");
+            } catch (Exception $e) {
+                printv("Can't update avatars for group " . $group->nickname . ": ". $e->getMessage());
+            }
+        }
+    }
+}
+
+main();
diff --git a/scripts/upgrade.php b/scripts/upgrade.php
new file mode 100644
index 0000000000..7d81c19835
--- /dev/null
+++ b/scripts/upgrade.php
@@ -0,0 +1,422 @@
+#!/usr/bin/env php
+<?php
+/*
+ * StatusNet - a distributed open-source microblogging tool
+ * Copyright (C) 2008-2011 StatusNet, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
+
+$shortoptions = 'x::';
+$longoptions = array('extensions=');
+
+$helptext = <<<END_OF_UPGRADE_HELP
+php upgrade.php [options]
+Upgrade database schema and data to latest software
+
+END_OF_UPGRADE_HELP;
+
+require_once INSTALLDIR.'/scripts/commandline.inc';
+
+function main()
+{
+    if (Event::handle('StartUpgrade')) {
+        updateSchemaCore();
+        updateSchemaPlugins();
+
+        // These replace old "fixup_*" scripts
+
+        fixupNoticeRendered();
+        fixupNoticeConversation();
+        initConversation();
+        initInbox();
+        fixupGroupURI();
+
+        initLocalGroup();
+        initNoticeReshare();
+    
+        initFaveURI();
+        initSubscriptionURI();
+        initGroupMemberURI();
+
+        initProfileLists();
+
+        Event::handle('EndUpgrade');
+    }
+}
+
+function tableDefs()
+{
+	$schema = array();
+	require INSTALLDIR.'/db/core.php';
+	return $schema;
+}
+
+function updateSchemaCore()
+{
+    printfnq("Upgrading core schema...");
+
+    $schema = Schema::get();
+    $schemaUpdater = new SchemaUpdater($schema);
+    foreach (tableDefs() as $table => $def) {
+        $schemaUpdater->register($table, $def);
+    }
+    $schemaUpdater->checkSchema();
+
+    printfnq("DONE.\n");
+}
+
+function updateSchemaPlugins()
+{
+    printfnq("Upgrading plugin schema...");
+
+    Event::handle('CheckSchema');
+
+    printfnq("DONE.\n");
+}
+
+function fixupNoticeRendered()
+{
+    printfnq("Ensuring all notices have rendered HTML...");
+
+    $notice = new Notice();
+
+    $notice->whereAdd('rendered IS NULL');
+    $notice->find();
+
+    while ($notice->fetch()) {
+        $original = clone($notice);
+        $notice->rendered = common_render_content($notice->content, $notice);
+        $notice->update($original);
+    }
+
+    printfnq("DONE.\n");
+}
+
+function fixupNoticeConversation()
+{
+    printfnq("Ensuring all notices have a conversation ID...");
+
+    $notice = new Notice();
+    $notice->whereAdd('conversation is null');
+    $notice->orderBy('id'); // try to get originals before replies
+    $notice->find();
+
+    while ($notice->fetch()) {
+        try {
+            $cid = null;
+    
+            $orig = clone($notice);
+    
+            if (empty($notice->reply_to)) {
+                $notice->conversation = $notice->id;
+            } else {
+                $reply = Notice::staticGet('id', $notice->reply_to);
+
+                if (empty($reply)) {
+                    $notice->conversation = $notice->id;
+                } else if (empty($reply->conversation)) {
+                    $notice->conversation = $notice->id;
+                } else {
+                    $notice->conversation = $reply->conversation;
+                }
+	
+                unset($reply);
+                $reply = null;
+            }
+
+            $result = $notice->update($orig);
+
+            $orig = null;
+            unset($orig);
+        } catch (Exception $e) {
+            printv("Error setting conversation: " . $e->getMessage());
+        }
+    }
+
+    printfnq("DONE.\n");
+}
+
+function fixupGroupURI()
+{
+    printfnq("Ensuring all groups have an URI...");
+
+    $group = new User_group();
+    $group->whereAdd('uri IS NULL');
+
+    if ($group->find()) {
+        while ($group->fetch()) {
+            $orig = User_group::staticGet('id', $group->id);
+            $group->uri = $group->getUri();
+            $group->update($orig);
+        }
+    }
+
+    printfnq("DONE.\n");
+}
+
+function initConversation()
+{
+    printfnq("Ensuring all conversations have a row in conversation table...");
+
+    $notice = new Notice();
+    $notice->query('select distinct notice.conversation from notice '.
+                   'where notice.conversation is not null '.
+                   'and not exists (select conversation.id from conversation where id = notice.conversation)');
+
+    while ($notice->fetch()) {
+
+        $id = $notice->conversation;
+
+        $uri = common_local_url('conversation', array('id' => $id));
+
+        // @fixme db_dataobject won't save our value for an autoincrement
+        // so we're bypassing the insert wrappers
+        $conv = new Conversation();
+        $sql = "insert into conversation (id,uri,created) values(%d,'%s','%s')";
+        $sql = sprintf($sql,
+                       $id,
+                       $conv->escape($uri),
+                       $conv->escape(common_sql_now()));
+        $conv->query($sql);
+    }
+
+    printfnq("DONE.\n");
+}
+
+function initInbox()
+{
+    printfnq("Ensuring all users have an inbox...");
+
+    $user = new User();
+    $user->whereAdd('not exists (select user_id from inbox where user_id = user.id)');
+    $user->orderBy('id');
+
+    if ($user->find()) {
+
+        while ($user->fetch()) {
+
+            try {
+                $notice = new Notice();
+
+                $notice->selectAdd();
+                $notice->selectAdd('id');
+                $notice->joinAdd(array('profile_id', 'subscription:subscribed'));
+                $notice->whereAdd('subscription.subscriber = ' . $user->id);
+                $notice->whereAdd('notice.created >= subscription.created');
+
+                $ids = array();
+
+                if ($notice->find()) {
+                    while ($notice->fetch()) {
+                        $ids[] = $notice->id;
+                    }
+                }
+
+                $notice = null;
+
+                $inbox = new Inbox();
+                $inbox->user_id = $user->id;
+                $inbox->pack($ids);
+                $inbox->insert();
+            } catch (Exception $e) {
+                printv("Error initializing inbox: " . $e->getMessage());
+            }
+        }
+    }
+
+    printfnq("DONE.\n");
+}
+
+function initLocalGroup()
+{
+    printfnq("Ensuring all local user groups have a local_group...");
+
+    $group = new User_group();
+    $group->whereAdd('NOT EXISTS (select group_id from local_group where group_id = user_group.id)');
+    $group->find();
+
+    while ($group->fetch()) {
+        try {
+            // Hack to check for local groups
+            if ($group->getUri() == common_local_url('groupbyid', array('id' => $group->id))) {
+                $lg = new Local_group();
+
+                $lg->group_id = $group->id;
+                $lg->nickname = $group->nickname;
+                $lg->created  = $group->created; // XXX: common_sql_now() ?
+                $lg->modified = $group->modified;
+
+                $lg->insert();
+            }
+        } catch (Exception $e) {
+            printfv("Error initializing local group for {$group->nickname}:" . $e->getMessage());
+        }
+    }
+
+    printfnq("DONE.\n");
+}
+
+function initNoticeReshare()
+{
+    printfnq("Ensuring all reshares have the correct verb and object-type...");
+    
+    $notice = new Notice();
+    $notice->whereAdd('repeat_of is not null');
+    $notice->whereAdd('(verb != "'.ActivityVerb::SHARE.'" OR object_type != "'.ActivityObject::ACTIVITY.'")');
+
+    if ($notice->find()) {
+        while ($notice->fetch()) {
+            try {
+                $orig = Notice::staticGet('id', $notice->id);
+                $notice->verb = ActivityVerb::SHARE;
+                $notice->object_type = ActivityObject::ACTIVITY;
+                $notice->update($orig);
+            } catch (Exception $e) {
+                printfv("Error updating verb and object_type for {$notice->id}:" . $e->getMessage());
+            }
+        }
+    }
+
+    printfnq("DONE.\n");
+}
+
+function initFaveURI() 
+{
+    printfnq("Ensuring all faves have a URI...");
+
+    $fave = new Fave();
+    $fave->whereAdd('uri IS NULL');
+
+    if ($fave->find()) {
+        while ($fave->fetch()) {
+            try {
+                $fave->decache();
+                $fave->query(sprintf('update fave '.
+                                     'set uri = "%s", '.
+                                     '    modified = "%s" '.
+                                     'where user_id = %d '.
+                                     'and notice_id = %d',
+                                     Fave::newURI($fave->user_id, $fave->notice_id, $fave->modified),
+                                     common_sql_date(strtotime($fave->modified)),
+                                     $fave->user_id,
+                                     $fave->notice_id));
+            } catch (Exception $e) {
+                common_log(LOG_ERR, "Error updated fave URI: " . $e->getMessage());
+            }
+        }
+    }
+
+    printfnq("DONE.\n");
+}
+
+function initSubscriptionURI()
+{
+    printfnq("Ensuring all subscriptions have a URI...");
+
+    $sub = new Subscription();
+    $sub->whereAdd('uri IS NULL');
+
+    if ($sub->find()) {
+        while ($sub->fetch()) {
+            try {
+                $sub->decache();
+                $sub->query(sprintf('update subscription '.
+                                    'set uri = "%s" '.
+                                    'where subscriber = %d '.
+                                    'and subscribed = %d',
+                                    Subscription::newURI($sub->subscriber, $sub->subscribed, $sub->created),
+                                    $sub->subscriber,
+                                    $sub->subscribed));
+            } catch (Exception $e) {
+                common_log(LOG_ERR, "Error updated subscription URI: " . $e->getMessage());
+            }
+        }
+    }
+
+    printfnq("DONE.\n");
+}
+
+function initGroupMemberURI()
+{
+    printfnq("Ensuring all group memberships have a URI...");
+
+    $mem = new Group_member();
+    $mem->whereAdd('uri IS NULL');
+
+    if ($mem->find()) {
+        while ($mem->fetch()) {
+            try {
+                $mem->decache();
+                $mem->query(sprintf('update group_member set uri = "%s" '.
+                                    'where profile_id = %d ' . 
+                                    'and group_id = %d ',
+                                    Group_member::newURI($mem->profile_id, $mem->group_id, $mem->created),
+                                    $mem->profile_id,
+                                    $mem->group_id));
+            } catch (Exception $e) {
+                common_log(LOG_ERR, "Error updated membership URI: " . $e->getMessage());  
+          }
+        }
+    }
+
+    printfnq("DONE.\n");
+}
+
+function initProfileLists()
+{
+    printfnq("Ensuring all profile tags have a corresponding list...");
+
+    $ptag = new Profile_tag();
+    $ptag->selectAdd();
+    $ptag->selectAdd('tagger, tag, count(*) as tagged_count');
+    $ptag->whereAdd('NOT EXISTS (SELECT tagger, tagged from profile_list '.
+                    'where profile_tag.tagger = profile_list.tagger '.
+                    'and profile_tag.tag = profile_list.tag)');
+    $ptag->groupBy('tagger, tag');
+    $ptag->orderBy('tagger, tag');
+
+    if ($ptag->find()) {
+        while ($ptag->fetch()) {
+            $plist = new Profile_list();
+
+            $plist->tagger   = $ptag->tagger;
+            $plist->tag      = $ptag->tag;
+            $plist->private  = 0;
+            $plist->created  = common_sql_now();
+            $plist->modified = $plist->created;
+            $plist->mainpage = common_local_url('showprofiletag',
+                                                array('tagger' => $plist->getTagger()->nickname,
+                                                      'tag'    => $plist->tag));;
+
+            $plist->tagged_count     = $ptag->tagged_count;
+            $plist->subscriber_count = 0;
+
+            $plist->insert();
+
+            $orig = clone($plist);
+            // After insert since it uses auto-generated ID
+            $plist->uri      = common_local_url('profiletagbyid',
+                                        array('id' => $plist->id, 'tagger_id' => $plist->tagger));
+
+            $plist->update($orig);
+        }
+    }
+
+    printfnq("DONE.\n");
+}
+
+main();
diff --git a/tests/ActivityParseTests.php b/tests/ActivityParseTests.php
index c2817a4602..6423eaaf03 100644
--- a/tests/ActivityParseTests.php
+++ b/tests/ActivityParseTests.php
@@ -405,6 +405,28 @@ class ActivityParseTests extends PHPUnit_Framework_TestCase
         $act = new Activity($entry, $feed);
         $this->assertEquals($act->actor->id, $expected);
     }
+
+    public function testBookmarkRelated()
+    {
+        global $_example11;
+        $dom = new DOMDocument();
+        $dom->loadXML($_example11);
+
+        $feed = $dom->documentElement;
+        $entry = $dom->getElementsByTagName('entry')->item(0);
+
+        $expected = 'http://blog.teambox.com/open-source-companies';
+
+        $links = ActivityUtils::getLinks($entry, 'related');
+
+        $this->assertFalse(empty($links));
+        $this->assertTrue(is_array($links));
+        $this->assertEquals(count($links), 1);
+
+        $url = $links[0]->getAttribute('href');
+
+        $this->assertEquals($url, $expected);
+    }
 }
 
 $_example1 = <<<EXAMPLE1
@@ -905,3 +927,90 @@ $_example10 = <<<EXAMPLE10
 </entry>
 </feed>
 EXAMPLE10;
+
+$_example11 = <<<EXAMPLE11
+<?xml version="1.0" encoding="UTF-8"?>
+<feed xml:lang="en-US" xmlns="http://www.w3.org/2005/Atom" xmlns:thr="http://purl.org/syndication/thread/1.0" xmlns:georss="http://www.georss.org/georss" xmlns:activity="http://activitystrea.ms/spec/1.0/" xmlns:media="http://purl.org/syndication/atommedia" xmlns:poco="http://portablecontacts.net/spec/1.0" xmlns:ostatus="http://ostatus.org/schema/1.0" xmlns:statusnet="http://status.net/schema/api/1/">
+ <generator uri="http://status.net" version="0.9.7">StatusNet</generator>
+ <id>http://freelish.us/api/statuses/user_timeline/1.atom</id>
+ <title>demon timeline</title>
+ <subtitle>Updates from demon on freelish.us!</subtitle>
+ <logo>http://avatar.status.net/f/freelishus/1-96-20110331163048.jpeg</logo>
+ <updated>2011-05-30T09:36:03-04:00</updated>
+<author>
+ <activity:object-type>http://activitystrea.ms/schema/1.0/person</activity:object-type>
+ <uri>http://freelishus.status.net/user/1</uri>
+ <name>demon</name>
+ <link rel="alternate" type="text/html" href="http://freelish.us/demon"/>
+ <link rel="avatar" type="image/jpeg" media:width="192" media:height="192" href="http://avatar.status.net/f/freelishus/1-192-20110331163048.jpeg"/>
+ <link rel="avatar" type="image/jpeg" media:width="96" media:height="96" href="http://avatar.status.net/f/freelishus/1-96-20110331163048.jpeg"/>
+ <link rel="avatar" type="image/jpeg" media:width="48" media:height="48" href="http://avatar.status.net/f/freelishus/1-48-20110331163048.jpeg"/>
+ <link rel="avatar" type="image/jpeg" media:width="24" media:height="24" href="http://avatar.status.net/f/freelishus/1-24-20110331163049.jpeg"/>
+ <georss:point>45.50884 -73.58781</georss:point>
+ <poco:preferredUsername>demon</poco:preferredUsername>
+ <poco:displayName>Evan Prodromou</poco:displayName>
+ <poco:note>Montreal hacker and entrepreneur.</poco:note>
+ <poco:address>
+  <poco:formatted>Montreal, Quebec</poco:formatted>
+
+</poco:address>
+ <poco:urls>
+  <poco:type>homepage</poco:type>
+  <poco:value>http://evan.status.net/</poco:value>
+  <poco:primary>true</poco:primary>
+</poco:urls>
+ <statusnet:profile_info local_id="1"></statusnet:profile_info>
+</author>
+<!--Deprecation warning: activity:subject is present only for backward compatibility. It will be removed in the next version of StatusNet.-->
+<activity:subject>
+ <activity:object-type>http://activitystrea.ms/schema/1.0/person</activity:object-type>
+ <id>http://freelishus.status.net/user/1</id>
+ <title>Evan Prodromou</title>
+ <link rel="alternate" type="text/html" href="http://freelish.us/demon"/>
+ <link rel="avatar" type="image/jpeg" media:width="192" media:height="192" href="http://avatar.status.net/f/freelishus/1-192-20110331163048.jpeg"/>
+ <link rel="avatar" type="image/jpeg" media:width="96" media:height="96" href="http://avatar.status.net/f/freelishus/1-96-20110331163048.jpeg"/>
+ <link rel="avatar" type="image/jpeg" media:width="48" media:height="48" href="http://avatar.status.net/f/freelishus/1-48-20110331163048.jpeg"/>
+ <link rel="avatar" type="image/jpeg" media:width="24" media:height="24" href="http://avatar.status.net/f/freelishus/1-24-20110331163049.jpeg"/>
+ <georss:point>45.50884 -73.58781</georss:point>
+ <poco:preferredUsername>demon</poco:preferredUsername>
+ <poco:displayName>Evan Prodromou</poco:displayName>
+ <poco:note>Montreal hacker and entrepreneur.</poco:note>
+ <poco:address>
+  <poco:formatted>Montreal, Quebec</poco:formatted>
+
+</poco:address>
+ <poco:urls>
+  <poco:type>homepage</poco:type>
+  <poco:value>http://evan.status.net/</poco:value>
+  <poco:primary>true</poco:primary>
+</poco:urls>
+ <statusnet:profile_info local_id="1"></statusnet:profile_info>
+</activity:subject>
+ <link href="http://freelish.us/demon" rel="alternate" type="text/html"/>
+ <link href="http://freelish.us/main/sup#1" rel="http://api.friendfeed.com/2008/03#sup" type="application/json"/>
+ <link href="http://freelish.us/api/statuses/user_timeline/1.atom?max_id=13210408" rel="next" type="application/atom+xml"/>
+ <link href="http://freelish.us/main/push/hub" rel="hub"/>
+ <link href="http://freelish.us/main/salmon/user/1" rel="salmon"/>
+ <link href="http://freelish.us/main/salmon/user/1" rel="http://salmon-protocol.org/ns/salmon-replies"/>
+ <link href="http://freelish.us/main/salmon/user/1" rel="http://salmon-protocol.org/ns/salmon-mention"/>
+ <link href="http://freelish.us/api/statuses/user_timeline/1.atom" rel="self" type="application/atom+xml"/>
+
+<entry>
+ <activity:object-type>http://activitystrea.ms/schema/1.0/bookmark</activity:object-type>
+ <id>http://freelish.us/bookmark/9e930c3e-7ed9-47de-aba5-df6c60cec542</id>
+ <title>Why you should build an open-source startup | Teambox Blog</title>
+ <link rel="alternate" type="text/html" href="http://freelish.us/bookmark/9e930c3e-7ed9-47de-aba5-df6c60cec542"/>
+ <link rel="related" href="http://blog.teambox.com/open-source-companies"/>
+ <activity:verb>http://activitystrea.ms/schema/1.0/post</activity:verb>
+ <published>2011-05-26T20:36:25+00:00</published>
+ <updated>2011-05-26T20:36:25+00:00</updated>
+ <link rel="ostatus:conversation" href="http://freelish.us/conversation/13835232"/>
+ <category term="opensource"></category>
+ <category term="startup"></category>
+ <link rel="self" type="application/atom+xml" href="http://freelish.us/api/statuses/show/13836862.atom"/>
+ <link rel="edit" type="application/atom+xml" href="http://freelish.us/api/statuses/show/13836862.atom"/>
+ <statusnet:notice_info local_id="13836862" source="web" favorite="false" repeated="false"></statusnet:notice_info>
+
+</entry>
+</feed>
+EXAMPLE11;
diff --git a/tests/atompub/atompub_test.php b/tests/atompub/atompub_test.php
index e23e4a711b..fb675c778e 100644
--- a/tests/atompub/atompub_test.php
+++ b/tests/atompub/atompub_test.php
@@ -39,212 +39,6 @@ END_OF_HELP;
 
 require_once INSTALLDIR.'/scripts/commandline.inc';
 
-class AtomPubClient
-{
-    public $url;
-    private $user, $pass;
-
-    /**
-     *
-     * @param string $url collection feed URL
-     * @param string $user auth username
-     * @param string $pass auth password
-     */
-    function __construct($url, $user, $pass)
-    {
-        $this->url = $url;
-        $this->user = $user;
-        $this->pass = $pass;
-    }
-
-    /**
-     * Set up an HTTPClient with auth for our resource.
-     *
-     * @param string $method
-     * @return HTTPClient
-     */
-    private function httpClient($method='GET')
-    {
-        $client = new HTTPClient($this->url);
-        $client->setMethod($method);
-        $client->setAuth($this->user, $this->pass);
-        return $client;
-    }
-
-    function get()
-    {
-        $client = $this->httpClient('GET');
-        $response = $client->send();
-        if ($response->isOk()) {
-            return $response->getBody();
-        } else {
-            throw new Exception("Bogus return code: " . $response->getStatus() . ': ' . $response->getBody());
-        }
-    }
-
-    /**
-     * Create a new resource by POSTing it to the collection.
-     * If successful, will return the URL representing the
-     * canonical location of the new resource. Neat!
-     *
-     * @param string $data
-     * @param string $type defaults to Atom entry
-     * @return string URL to the created resource
-     *
-     * @throws exceptions on failure
-     */
-    function post($data, $type='application/atom+xml;type=entry')
-    {
-        $client = $this->httpClient('POST');
-        $client->setHeader('Content-Type', $type);
-        // optional Slug header not used in this case
-        $client->setBody($data);
-        $response = $client->send();
-
-        if ($response->getStatus() != '201') {
-            throw new Exception("Expected HTTP 201 on POST, got " . $response->getStatus() . ': ' . $response->getBody());
-        }
-        $loc = $response->getHeader('Location');
-        $contentLoc = $response->getHeader('Content-Location');
-
-        if (empty($loc)) {
-            throw new Exception("AtomPub POST response missing Location header.");
-        }
-        if (!empty($contentLoc)) {
-            if ($loc != $contentLoc) {
-                throw new Exception("AtomPub POST response Location and Content-Location headers do not match.");
-            }
-
-            // If Content-Location and Location match, that means the response
-            // body is safe to interpret as the resource itself.
-            if ($type == 'application/atom+xml;type=entry') {
-                self::validateAtomEntry($response->getBody());
-            }
-        }
-
-        return $loc;
-    }
-
-    /**
-     * Note that StatusNet currently doesn't allow PUT editing on notices.
-     *
-     * @param string $data
-     * @param string $type defaults to Atom entry
-     * @return true on success
-     *
-     * @throws exceptions on failure
-     */
-    function put($data, $type='application/atom+xml;type=entry')
-    {
-        $client = $this->httpClient('PUT');
-        $client->setHeader('Content-Type', $type);
-        $client->setBody($data);
-        $response = $client->send();
-
-        if ($response->getStatus() != '200' && $response->getStatus() != '204') {
-            throw new Exception("Expected HTTP 200 or 204 on PUT, got " . $response->getStatus() . ': ' . $response->getBody());
-        }
-
-        return true;
-    }
-
-    /**
-     * Delete the resource.
-     *
-     * @return true on success
-     *
-     * @throws exceptions on failure
-     */
-    function delete()
-    {
-        $client = $this->httpClient('DELETE');
-        $client->setBody($data);
-        $response = $client->send();
-
-        if ($response->getStatus() != '200' && $response->getStatus() != '204') {
-            throw new Exception("Expected HTTP 200 or 204 on DELETE, got " . $response->getStatus() . ': ' . $response->getBody());
-        }
-
-        return true;
-    }
-
-    /**
-     * Ensure that the given string is a parseable Atom entry.
-     *
-     * @param string $str
-     * @return boolean
-     * @throws Exception on invalid input
-     */
-    static function validateAtomEntry($str)
-    {
-        if (empty($str)) {
-            throw new Exception('Bad Atom entry: empty');
-        }
-        $dom = new DOMDocument;
-        if (!$dom->loadXML($str)) {
-            throw new Exception('Bad Atom entry: XML is not well formed.');
-        }
-
-        $activity = new Activity($dom->documentRoot);
-        return true;
-    }
-
-    static function entryEditURL($str) {
-        $dom = new DOMDocument;
-        $dom->loadXML($str);
-        $path = new DOMXPath($dom);
-        $path->registerNamespace('atom', 'http://www.w3.org/2005/Atom');
-
-        $links = $path->query('/atom:entry/atom:link[@rel="edit"]', $dom->documentRoot);
-        if ($links && $links->length) {
-            if ($links->length > 1) {
-                throw new Exception('Bad Atom entry; has multiple rel=edit links.');
-            }
-            $link = $links->item(0);
-            $url = $link->getAttribute('href');
-            return $url;
-        } else {
-            throw new Exception('Atom entry lists no rel=edit link.');
-        }
-    }
-
-    static function entryId($str) {
-        $dom = new DOMDocument;
-        $dom->loadXML($str);
-        $path = new DOMXPath($dom);
-        $path->registerNamespace('atom', 'http://www.w3.org/2005/Atom');
-
-        $links = $path->query('/atom:entry/atom:id', $dom->documentRoot);
-        if ($links && $links->length) {
-            if ($links->length > 1) {
-                throw new Exception('Bad Atom entry; has multiple id entries.');
-            }
-            $link = $links->item(0);
-            $url = $link->textContent;
-            return $url;
-        } else {
-            throw new Exception('Atom entry lists no id.');
-        }
-    }
-
-    static function getEntryInFeed($str, $id)
-    {
-        $dom = new DOMDocument;
-        $dom->loadXML($str);
-        $path = new DOMXPath($dom);
-        $path->registerNamespace('atom', 'http://www.w3.org/2005/Atom');
-
-        $query = '/atom:feed/atom:entry[atom:id="'.$id.'"]';
-        $items = $path->query($query, $dom->documentRoot);
-        if ($items && $items->length) {
-            return $items->item(0);
-        } else {
-            return null;
-        }
-    }
-}
-
-
 $user = get_option_value('n', 'nickname');
 $pass = get_option_value('p', 'password');
 
diff --git a/tests/oEmbedTest.php b/tests/oEmbedTest.php
index b5e441c42f..1f1d5f826c 100644
--- a/tests/oEmbedTest.php
+++ b/tests/oEmbedTest.php
@@ -15,22 +15,22 @@ class oEmbedTest extends PHPUnit_Framework_TestCase
 
     public function setup()
     {
-        $this->old_oohembed = common_config('oohembed', 'endpoint');
+        $this->old_ohembed = common_config('ohembed', 'endpoint');
     }
 
     public function tearDown()
     {
-        $GLOBALS['config']['oohembed']['endpoint'] = $this->old_oohembed;
+        $GLOBALS['config']['oembed']['endpoint'] = $this->old_ohembed;
     }
 
     /**
-     * Test with oohembed DISABLED.
+     * Test with ohembed DISABLED.
      *
      * @dataProvider discoverableSources
      */
     public function testoEmbed($url, $expectedType)
     {
-        $GLOBALS['config']['oohembed']['endpoint'] = false;
+        $GLOBALS['config']['oembed']['endpoint'] = false;
         $this->_doTest($url, $expectedType);
     }
 
@@ -39,14 +39,14 @@ class oEmbedTest extends PHPUnit_Framework_TestCase
      *
      * @dataProvider fallbackSources
      */
-    public function testoohEmbed($url, $expectedType)
+    public function testnoEmbed($url, $expectedType)
     {
-        $GLOBALS['config']['oohembed']['endpoint'] = $this->_endpoint();
+        $GLOBALS['config']['oembed']['endpoint'] = $this->_endpoint();
         $this->_doTest($url, $expectedType);
     }
 
     /**
-     * Get default oohembed endpoint.
+     * Get default oembed endpoint.
      *
      * @return string
      */
@@ -55,7 +55,7 @@ class oEmbedTest extends PHPUnit_Framework_TestCase
         $default = array();
         $_server = 'localhost'; $_path = '';
         require INSTALLDIR . '/lib/default.php';
-        return $default['oohembed']['endpoint'];
+        return $default['oembed']['endpoint'];
     }
 
     /**
@@ -113,7 +113,6 @@ class oEmbedTest extends PHPUnit_Framework_TestCase
     static public function discoverableSources()
     {
         $sources = array(
-            array('http://identi.ca/attachment/34437400', 'photo'),
 
             array('http://www.youtube.com/watch?v=eUgLR232Cnw', 'video'),
             array('http://vimeo.com/9283184', 'video'),
@@ -125,16 +124,20 @@ class oEmbedTest extends PHPUnit_Framework_TestCase
     }
 
     /**
-     * Sample oEmbed targets that can be found via oohembed.com.
+     * Sample oEmbed targets that can be found via noembed.com.
      * Includes also discoverableSources() output.
      *
      * @return array
      */
     static public function fallbackSources()
     {
+
         $sources = array(
-            array('http://en.wikipedia.org/wiki/File:Wiki.png', 'link'), // @fixme in future there may be a native provider -- will change to 'photo'
+            array('https://github.com/git/git/commit/85e9c7e1d42849c5c3084a9da748608468310c0e', 'Github Commit'), // @fixme in future there may be a native provider -- will change to 'photo'
         );
+
+        $sources = array();
+
         return array_merge(self::discoverableSources(), $sources);
     }
 }
diff --git a/theme/README b/theme/README
index 56a7a66c38..2e3c134bb6 100644
--- a/theme/README
+++ b/theme/README
@@ -1,41 +1,8 @@
-/** Howto: create a StatusNet theme
- *
- * @package   StatusNet
- * @author    Sarven Capadisli <csarven@status.net>
- * @copyright 2010 StatusNet, Inc.
- * @license   http://creativecommons.org/licenses/by/3.0/ Creative Commons Attribution 3.0 unported
- * @link      http://status.net/
- */
+* To use a theme other than neo, add this to config.php:
+$config['site']['theme'] = 'yourthemename';
 
-== Location of key paths and files ==
-<pre><nowiki>
-base/css/
-base/css/display.css                #layout, typography rules
-base/images/                        #common icons, illustrations
-base/images/icons/icons-01.png      #main icons file (combined into a single file)
-
-default/css/
-default/css/display.css             #imports the base stylesheet for layout and adds background images and colour rules
-default/logo.png                    #default site logo for this theme
-default/mobilelogo.png              #default logo for the mobile output
-default/default-avatar-mini.png     #24x24 default avatar for minilists
-default/default-avatar-stream.png   #48x48 default avatar for notice timelines
-default/default-avatar-profile.png  #96x96 default avatar for the profile page
-</nowiki></pre>
-
-== How to create your own theme ==
-
-You probably want to do one of the following:
-
-* If you just want to change the text, link, background, content, sidebar colours, background image:
-** Do this from the Admin->Design settings (recommended!). You could also create a directory and a file structure like the default theme, search and replace with your own values. This is more work, but, you can do this if you plan to make additional *minimal* changes.
-
-* If you want to change the background images and colours:
-# Create a directory and a file structure like the default theme.
-# Have your stylesheet import base/css/display.css and add your own styles below. It is okay to add *minimal* changes here.
-
-* If you want to create a different layout, typography, background images and colours:
-** Create your own theme directory (base or default) with stylesheets and images like.
-
-Finally, enable your theme by selecting it from the Admin->Design interface. You can set site's logo from here as well.
+* To use/import the base theme, add this to your theme.ini file:
+include=base
 
+* To include an external CSS resource (e.g. for a webfont), add this to the top of your theme.ini file:
+external[]="yourexternalURL"
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 6ae14d2c7d..b73078295e 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -1,8 +1,8 @@
-/** theme: rebase
+/** theme: base
  *
  * @package   StatusNet
  * @author    Samantha Doherty <sammy@status.net>
- * @copyright 2010 StatusNet, Inc.
+ * @copyright 2011 StatusNet, Inc.
  * @license   http://creativecommons.org/licenses/by/3.0/ Creative Commons Attribution 3.0 Unported
  * @link      http://status.net/
  */
@@ -23,16 +23,14 @@ input, textarea, select, option {padding: 2px;}
 textarea {overflow:auto;}
 
 body {
-    background-color: #ffffff;
+    background-color: #f2f2f2;
     color: #000;
-    font-family: sans-serif;
-    font-size: 100%;
-    line-height: 1.4;
-    min-width: 700px;
+    font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+    font-size: 14px;
+    line-height: 1.6;
 }
 
 a {
-    color: #00008c; 
     text-decoration: none; 
     outline: none;
 }
@@ -67,7 +65,7 @@ p {
 }
 
 input, textarea, select, option {
-    font-family: "DejaVu Sans", "Bitstream Vera Sans", Geneva, Verdana, sans-serif;
+    font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
     font-size: 1em;
 }
 
@@ -82,63 +80,113 @@ option {
 }
 
 #wrap {
-    width: 92%;
-    margin-left: 4%;
-    margin-right: 4%;
     position: relative;
+    width: 960px;
+    margin: 0px auto;
+    background-color: #fff;
+    border-left: 10px solid #fff;
+    border-right: 10px solid #fff;
+    padding-top: 10px;
 }
 
-#header { 
-    padding: 1%;
+#header {
     position: relative;
+    width: 960px;
+    padding: 0px
 }
 
 #core {
-	display:inline;
-	float: left;
-	position: relative;
-	margin-left: 1%;
-	margin-right: 1%;
-    width: 98%;
+    position: relative;
+    float: left;
+    clear: both;
+    margin: 0px;
+    width: 958px;
+    border-top: 5px solid #ccc;
+    border-left: 1px solid #ccc;
+    border-right: 1px solid #ccc;
+}
+
+#aside_primary_wrapper {
+    width: 100%;
+    float: left;
+    overflow: hidden;
+    position: relative;
+    background-color: #f2f2f2;  
+}    
+
+#content_wrapper  {  
+    width: 100%;  
+    float: left;
+    position: relative;  
+    right: 239px; 
+    background-color: #fff;  
+    border-right: 1px solid #ccc;
+}  
+
+#site_nav_local_views_wrapper  {  
+    width: 100%;  
+    float: left;
+    position: relative;  
+    right: 561px;
+    background-color: #f2f2f2;  
+    border-right: 1px solid #ccc;
+} 
+
+#site_nav_local_views {
+    width: 138px;
+    float: left;
+    overflow: hidden;
+    position: relative;
+    left: 800px;
+    margin: 0px 0px 20px 0px;
+    padding: 22px 10px 40px 10px;
 }
 
 #content {
-    margin-bottom: 20px;
+    width: 520px;
+    float: left;
+    overflow: hidden;
+    position: relative;
+    left: 801px;
+    margin: 0px;
+    padding: 20px 20px 40px 20px;
     background-color: #fff;
-	display:inline;
-	float: left;
-	position: relative;
-    min-height: 300px;
-    width: 64.667%;
-    margin-right: 2%;
 }
 
 #aside_primary {
-	display: inline;
-	float: right;
-	position: relative;
-    width: 33.333%;
-    padding-top: 15px;
-    background: #f2f2f2;
-    margin-bottom: 20px;
-}
-
-#aside_primary .section {
-    margin: 0px 2% 20px 2%;
-    position: relative;
-    width: 96%;
+    width: 218px;
     float: left;
-    clear: both;
+    overflow: hidden;
+    position: relative;
+    left: 802px;
+    padding: 22px 10px 40px 10px;
+    margin: 0px 0px 20px 0px;
 }
 
-body[id$=adminpanel] #aside_primary {
-    display:none;
+#footer {
+    clear: both;
+    position: relative;
+    width: 940px;
+    background-color: #ccc;
+    padding: 10px;
 }
 
 /* header elements */
 
-address { 
-    margin-bottom: 10px;
+address {
+    float: left;
+    position: relative;
+    margin: -2px 0 3px 0;
+    padding: 0px;
+    z-index: 99;
+}
+
+address a, address img {
+    display: block;
+}
+
+address img {
+    max-width: 158px;
 }
 
 address img + .fn {
@@ -150,192 +198,165 @@ address .poweredby {
     width: auto;
 }
 
-#site_nav_global_primary { 
-    margin: 20px 0px 20px 0px;
+#site_nav_global_primary {
+    display: block;
+    position: absolute;
+    top: 0;
+    right: 0;
+    width: 800px;
+    margin: 0px;
+    height: 24px;
+    line-height: 20px;
 }
 
-#site_nav_global_primary dt {
-    display: none;
+#site_nav_global_primary ul {
+    float: right;
 }
 
 #site_nav_global_primary li {
     display: inline;
-    margin-right: 20px;
+    margin-right: 10px;
+}
+
+#site_nav_global_primary li:last-child {
+    margin-right: 0px;
+}
+
+#header-search {
+    float: right;
+    position: relative;
+    top: -8px;
+    margin-left: 10px;
 }
 
 #site_notice { 
-    padding: 1%;
+    float: right;
+    width: 300px;
+    margin: 26px 0px 4px 0px;
+    padding: 10px;
     background-color: #f2f2f2;
-    margin-bottom: 10px;    
 }
 
 #site_notice p {
     margin-bottom: 0px;
 }
 
-#site_notice ul {
-    margin-left: 15px;
+/* input forms */
+
+.input_forms {
+    float: left;
+    position: relative;
+    margin-bottom: 10px;
+    border-bottom: 1px dotted #ccc;
 }
 
-#anon_notice { 
-    padding: 1%;
-    background-color: #ccc;   
-    margin-bottom: 10px; 
+#input_form_nav {
+    float: left;
+    width: 100%;
+    margin-bottom: 10px;
+    list-style-type: none;
 }
 
-#anon_notice p {
-    margin-bottom: 0px;
+#input_form_nav li { 
+    display: inline;
 }
 
-/* new notice & direct message forms */
+#input_form_nav li a {
+    margin-right: 10px;
+}
+
+.input_form_nav_tab.current a {
+    text-decoration: underline;
+}
+
+.input_form { 
+    position: relative;
+    float: left;
+    width: 520px;
+    padding-bottom: 20px;
+    display: none;
+}
+
+.input_form.current { 
+    display: block;
+}
+
+#input_form_status, #input_form_direct {
+    padding-bottom: 50px;
+}
 
 .form_notice { 
-    background: #ccc;
     margin-bottom: 10px;
-    padding: 1%;
 }
 
 .form_notice fieldset {
-    border: 0;
-	position: relative;
-    width: 620px;
+    width: auto;
 }
 
 .form_notice legend {
     display: none;
-}    
+}
+
+.form_notice #notice_data-text-label { /* TODO can remove this now? */
+    display: none;
+}
+
+.form_notice_placeholder .placeholder {
+    width: 508px;
+    padding: 4px 4px 4px 6px;
+    border: 1px solid #a6a6a6;
+    z-index: 97;
+    font-size: 1em;
+    color: #888;
+}
 
 .form_notice textarea {
     clear: left;
     float: left;
-    padding: 10px;
-    border: none;
     position: relative;
-    width: 485px;
-    height: 60px;
-    padding-bottom: 18px;
-    z-index: 9;
+    width: 483px;
+    height: 42px;
+    padding: 6px 5px 18px 5px;
+    border: 1px solid #a6a6a6;
+    z-index: 97;
+    font-size: 1.2em;
 }
 
-.form_notice label[for=notice_data-text] {
-    float: left;
-    font-weight: normal;
-    font-size: 1.2em;
-    margin-bottom: 0.2em;
-    opacity: 1;
-    color: #333 !important;
+#form_notice-direct.form_notice textarea {
+    width: 508px;
 }
 
 .form_notice label.notice_data-attach,
 .form_notice input.notice_data-attach {
-    position:absolute;
-    cursor:pointer;
+    position: absolute;
+    cursor: pointer;
 }
 .form_notice label.notice_data-attach {
-    top: 31px;
-    right: 88px;
+    top: 0px;
+    right: 0px;
+    z-index: 96;
+    text-indent: -9999px;
+    width: 16px;
+    height: 16px;
 }
+
 .form_notice input.notice_data-attach {
-    /* Positioned inside the label */
     top: 0;
     right: 0;
-}
-
-.form_notice label.notice_data-attach {
-    text-indent:-9999px;
-    width:16px;
-    height:16px;
-}
-
-.form_notice input.notice_data-attach {
     padding:0;
     height:16px;
 }
 
-.form_notice .count {
-    position: absolute;
-    bottom: 0px;
-    right: 125px;
-    z-index: 9;
-    font-size: 0.8em; 
-}
-
-.form_notice .count dt {
-    display:none;
-}
-
-.form_notice .count {
-    color: #777;
-}
-
-.form_notice.warning .count {
-    color: #ff0000;
-}        
-
-.form_notice .submit {
-    padding:0;
-    position:absolute;
-    right:0;
-    top: 81px;
-    height: 2.4em;
-    width: 106px;
-}
-
-.form_notice label[for=to] {
-    margin-top: 0px;
-    float: left;
-    font-size: 1.2em;
-    font-weight: normal;
-    color: #333 !important;
-}
-
-.form_notice select[id=to] {
-    margin-bottom: 4px;
-    margin-top: -4px;
-    margin-left:18px;
-    float:left;
-    max-width:322px;
-}
-
-.form_notice .error,
-.form_notice .success,
-.form_notice .notice-status {
-    clear: left;
-    float: left;
-    overflow: auto;
-    line-height: 1.2em;
-    padding: 2px 2px 2px 5px;
-    width: 498px;
-    border: 2px solid #ccc;
-    margin-left: -2px;
-}
-
-.form_notice .attach-status code {
-    font-size: 1.2em;
-}
-
-.form_notice .error {
-    border: none;
-    width: 502px;
-    padding: 6px 2px 6px 5px;
-}
-
-.form_notice .attach-status button.close,
-.form_notice .notice-status button.close {
-    float:right;
-    font-size:0.8em;
-}
-
 .form_notice .notice_data-geo_wrap label,
 .form_notice .notice_data-geo_wrap input {
-    position:absolute;
-    top: 55px;
-    right: 88px;
-    left:auto;
-    cursor:pointer;
-    width:16px;
-    height:16px;
-    display:block;
+    position: absolute;
+    top: 26px;
+    right: 0px;
+    cursor: pointer;
+    width: 16px;
+    height: 16px;
+    display: block;
+    z-index: 99;
 }
 
 .form_notice .notice_data-geo_wrap input {
@@ -358,36 +379,231 @@ address .poweredby {
 }
 
 .form_notice input.notice_data-attach {
-    opacity:0;
+    opacity: 0;
+}
+
+.form_notice .count {
+    position: absolute;
+    top: 50px;
+    right: 32px;
+    z-index: 99;
+    font-size: 0.8em;
+    height: 1em; 
+    color: #777;
+}
+
+.form_notice.warning .count {
+    color: #ff0000;
+}
+
+#form_notice-direct.form_notice .count {
+    top: 84px;
+    right: 7px;
+}
+    
+.form_notice .error,
+.form_notice .success,
+.form_notice .notice-status {
+    position: relative;
+    overflow: auto;
+    line-height: 1.2em;
+    padding: 5px 5px 5px 10px;
+    margin: 10px 0px 0px 0px;
+    width: 478px;
+    border: 1px solid #ccc;
+}
+
+.form_notice .error {
+    border: 1px solid #d05858;
+}
+
+.form_notice .attach-status button.close,
+.form_notice .notice-status button.close {
+    float:right;
+    font-size:0.8em;
+}
+
+.input_form .form_settings fieldset {
+    margin: 0px;
+    padding: 0px;
+}
+
+.input_form .form_settings fieldset fieldset {
+    width: 400px;
+    float: left;
+    background: none;
+    border: none;
+    margin-bottom: 0px;
+    padding: 0px;
+}
+
+.input_form .form_settings .form_data li {
+    position: relative;
+    margin-bottom: 12px;
+}
+
+.input_form fieldset fieldset label {
+    position: absolute;
+    top: 0;
+    left: 6px;
+    float: none;
+    text-align: left;
+    color: #888;
+    cursor: text;
+    background: #fff;
+}
+
+.input_form .form_settings li input {
+    width: 388px;
+    margin-left: 0;
+    margin-right: 0;
+    padding: 4px 5px 4px 5px;
+    border: 1px solid #a6a6a6;
+    font-size: 1em;
+}
+
+.input_form .form_settings li textarea {
+    width: 388px;
+    margin-left: 0;
+    padding: 4px 5px 4px 5px;
+    border: 1px solid #a6a6a6;
+    z-index: 97;
+    font-size: 1em;
+}
+
+.input_form .form_settings .form_data p.form_guide {
+    margin-left: 5px;
+}
+
+.form_notice label[for=to] {
+    float: left;
+}
+
+.form_notice select[id=to] {
+    float:left;
+    margin: -4px 0px 10px 10px;
+    max-width: 450px;
 }
 
 .form_notice .to-selector { 
-    clear:left;
+    clear: left;
+    padding-top: 15px;
+    z-index: 99;
 }
 
-/* Local navigation */
+.form_settings label[for=notice_to] {
+    left: 5px;
+    margin-left: 0px;
+    margin-right: 10px;
+    position: relative;
+    clear: left;
+    background: none;
+}
 
-#site_nav_local_views { 
+.checkbox-wrapper {
+    padding: 2px;
+    margin-left: 10px;
+}
+
+.form_notice .checkbox-wrapper {
+    display: inline;
+    margin-left: 10px;
+}
+
+.form_settings .checkbox-wrapper label.checkbox {
+    margin-left: 0px;
+    margin-top: 6px;
+    line-height: 1.2em;
+    left: -3px;
+    float: none;
+}
+
+.checkbox-wrapper #notice_private {
+    display:none;
+}
+
+.checkbox-wrapper.unchecked label.checkbox {
+    padding-left: 20px;
+    background: url(../images/icons/lock_open.png) no-repeat 0px 0px;
+    opacity: 0.6;
+}
+
+.checkbox-wrapper.unchecked label.checkbox:hover {
+    opacity: 1;
+    cursor: pointer;
+}
+
+.checkbox-wrapper.checked label.checkbox {
+    padding-left: 20px;
+    background: url(../images/icons/lock.png) no-repeat 0px 0px;
+    color: red;
+    opacity: 1;
+}
+
+.checkbox-wrapper.checked label.checkbox:hover {
+    cursor: pointer;
+}
+
+.form_notice input.submit {
+    position: absolute;
+    top: 100%;
+    left: 0px;
+    margin-top: -49px;
+    float: left;
+    width: 100px;
+    padding: 0px;
+    z-index: 99;
+}
+
+.input_form .form_settings .submit {
+    position: relative;
+    top: 0;
+    right: 0;
+    float: right;   
+    width: 100px;
+    height: 26px;
+    line-height: 26px;
+    padding: 0px 10px;
+    margin: 0px;
+    z-index: 1;
+}
+
+/* site nav local views */
+
+
+#site_nav_local_views li {
+    display: block;
+    margin: 0px 0px 8px 0px;
+}
+
+#site_nav_local_views li ul {
     margin-bottom: 20px;
 }
 
-#site_nav_local_views dt {
-    display: none;
-}
-
-#site_nav_local_views li {
-    display: inline;
-    margin-right: 20px;
+#site_nav_local_views a {
+    word-wrap: break-word;
 }
 
 #site_nav_local_views .current a {
     text-decoration: underline;
 }
 
+
+/* aside primary */
+
+#aside_primary .section {
+    position: relative;
+    float: left;
+    clear: both;
+    width: 100%;
+    margin-bottom: 20px;
+}
+
+
 /* notices */
 
 #notices_primary {
-    padding-top: 8px;
+    padding-top: 3px;
     clear: both;
 }
 
@@ -397,10 +613,10 @@ address .poweredby {
 
 .notice {
     list-style-type: none;
-    margin-bottom: 25px;
+    margin-bottom: 10px;
     clear: left;
-    min-height: 54px;
     padding-bottom: 2px;
+    line-height: 1.36em;
 }
 
 .notice, .profile, .application, #content .peopletag {
@@ -418,8 +634,8 @@ address .poweredby {
     content: '\25B8';
 }
 
-.notice .addressees:empty:before {
-    content: none;
+.notice .addressees .group {
+    font-style: italic;
 }
 
 .fn {
@@ -438,13 +654,14 @@ address .poweredby {
 
 #content .notice .author .photo {
     position: absolute;
-    top: 4px;
-    left: 4px;
+    top: 7px;
+    left: 0px;
     float: none;
 }
 
 #content .notice .entry-title {
     margin: 2px 7px 0px 59px;
+    min-height: 35px;
 }
 
 .vcard .url {
@@ -471,24 +688,27 @@ font-style:italic;
     display:none;
 }
 
+#remoteprofile .notice .entry-title, #remoteprofile .notice div.entry-content,
 #showstream .notice .entry-title, #showstream .notice div.entry-content {
     margin-left: 0;
 }
 
+#remoteprofile .notice .entry-title,
+#showstream .notice .entry-title {
+    min-height: 1px;
+}
+
+#remoteprofile #content .notice .author,
 #showstream #content .notice .author {
     display: none;
 }
 
+#remoteprofile .notice,
 #showstream .notice {
     min-height: 1em; 
 }
 
-#shownotice .vcard .photo {
-    margin-bottom: 4px;
-}
-
 #shownotice .notice .entry-title {
-    margin-left:110px;
     font-size:2.2em;
     min-height:123px;
     font-size: 1.6em;
@@ -526,6 +746,7 @@ left:0;
     float: right;    
     margin-top: 12px;
     margin-right: -6px;
+    margin-bottom: 10px;
 }
 
 .notice-options fieldset {
@@ -613,7 +834,7 @@ clear:both;
 
 #jOverlayContent,
 #jOverlayContent #content,
-#jOverlayContent #content_inner {
+#jOverlayContent #content_inner { /* TODO can remove this now? */
 width: auto !important;
 margin-bottom:0;
 }
@@ -658,24 +879,148 @@ font-weight:bold;
 content: ":";
 }
 
-#content .notice .notice {
-    width: 98%;
-    margin-left: 2%;
-    margin-top: 16px;
+/* threaded replies */
+
+.threaded-replies {
+    clear: both;
+    float: left;
+    width: 458px;
+    margin-left: 59px;
+    margin-top: 10px;
     margin-bottom: 10px;
+    padding-right: 2px;
+    border-left: 3px solid #ECECF2;
+    background: #fafafa;
+    color: #222;
+    font-size: 1em;
 }
 
-.notice .notice {
-background-color:rgba(200, 200, 200, 0.050);
+.threaded-replies:empty {
+    margin-bottom: 0px; 
 }
-.notice .notice .notice {
-background-color:rgba(200, 200, 200, 0.100);
+
+.user_in .threaded-replies {
+    margin-top: 0px;
 }
-.notice .notice .notice .notice {
-background-color:rgba(200, 200, 200, 0.150);
+
+#content .notice .threaded-replies .notice,
+#content .notice .threaded-replies .notice-data { 
+    width: 440px;
+    padding-bottom: 14px;
+    padding-top: 5px;
+    border-bottom: 2px dotted #eee;
+    line-height: 1.36em;
+    margin-top: 0px;
+    margin-bottom: 0px;
+    margin-left: 10px;
+    background: none;
 }
-.notice .notice .notice .notice .notice {
-background-color:rgba(200, 200, 200, 0.300);
+
+#content .notice .threaded-replies .entry-title {
+    min-height: 1px;
+}
+
+#content .threaded-replies .notice .author .photo {
+    height: 24px;
+    width: 24px;
+    top: 12px;
+}
+
+#content .notice .threaded-replies .notice .entry-title {
+    margin: 2px 7px 0px 35px;
+}
+
+#content .notice .threaded-replies .notice div.entry-content {
+    clear:left;
+    float:left;
+    margin-left: 35px;
+    margin-top: 6px !important;
+}
+
+#content .notice .threaded-replies .notice div.entry-content.notice-faves {
+    margin-top: 2px !important;
+}
+
+#content .notice .threaded-replies .notice .notice-options {
+    margin-top: 5px;
+    margin-bottom: 0px;
+}
+
+.threaded-replies li {
+    list-style-type: none;
+}
+
+.threaded-replies .notice-reply-comments {
+    margin: 2px 0px 4px 10px;
+}
+
+.threaded-replies .placeholder {
+    margin: 10px;
+    width: 426px;
+    padding: 4px 4px 4px 6px;
+    border: 1px solid #a6a6a6;
+    color: #888;
+}
+
+.threaded-replies .notice-reply {
+    clear: left;
+    position: relative;
+    padding: 10px;
+    padding-bottom: 44px;
+}
+
+.threaded-replies .form_notice textarea {
+    width: 395px;
+}
+
+.threaded-replies .form_notice label.notice_data-attach {
+    top: 10px;
+    right: 10px;
+}
+
+.threaded-replies .form_notice .notice_data-geo_wrap label,
+.threaded-replies .form_notice .notice_data-geo_wrap input {
+    top: 36px;
+    right: 10px;
+}
+
+.threaded-replies .form_notice .count {
+    top: 60px;
+    right: 50px;
+}
+
+.threaded-replies .form_notice #notice_action-submit {
+    left: 10px;
+    margin-top: -44px;
+}
+
+.threaded-replies .form_notice .error,
+.threaded-replies .form_notice .success,
+.threaded-replies .form_notice .notice-status {
+    width: 390px; 
+}
+
+.threaded-replies .to-selector {
+    display: none;
+}
+
+/* old school conversation style */
+
+#conversation .notices .notices {
+    float: left;
+    background-color:rgba(200, 200, 200, 0.050);
+    margin-left: 15px;
+    width: auto;
+}
+
+#conversation .notices .threaded-replies {
+    margin-left: 59px;
+    background: #fafafa;
+}
+
+#conversation .notices .notices .notices .notices .notices .notices .notices .notices .notices .notices .notices .notices .notices  {
+    background: none;
+    margin-left: 0px;
 }
 
 /* aside primary specific styles */
@@ -829,23 +1174,14 @@ display:none;
 
 /* secondary elements */
 
-.processing { 
-background-image:url(../../base/images/icons/icon_processing.gif);
-background-repeat:no-repeat;
-background-position:47% 47%;
-}
-
-.error {
+.error, .success, .notice-status {
     background-color: #F7E8E8;
+    padding: 4px 10px;
 }
-.success {
+.success, .notice-status {
     background-color: #f2f2f2;
 }
 
-.system_notice dt {
-    display:none;
-}
-
 #page_notice {
 clear:both;
 margin-bottom:18px;
@@ -934,14 +1270,6 @@ padding-left:4px;
 margin-bottom:0;
 }
 
-#wrap form.processing input.submit,
-.entity_actions a.processing,
-.dialogbox.processing .submit_dialogbox {
-cursor:wait;
-outline:none;
-text-indent:-9999px;
-}
-
 #pagination {
     background-color: #f2f2f2;
     clear: left;
@@ -962,14 +1290,17 @@ text-indent:-9999px;
     float: right;
 }
 
-#footer {
-    clear: both;
-    background-color: #ccc;
-    margin-left: 1%;
-    margin-right: 1%;
-    padding: 1%;
+#wrap form.processing input.submit,
+#wrap a.processing,
+.dialogbox.processing .submit_dialogbox {
+    background: url(../images/icons/icon_processing.gif) no-repeat 47% 47%;
+    cursor: wait;
+    outline: none;
+    text-indent: -9999px;
 }
 
+/* footer elements */
+
 #site_nav_global_secondary dt {
     display: none;
 }
@@ -1036,6 +1367,7 @@ margin-left:11px;
 .form_settings .form_data li {
 width:100%;
 float:left;
+    margin-bottom: 22px;
 }
 .form_settings .form_data label {
 float:left;
@@ -1046,6 +1378,12 @@ float:left;
 margin-left:1.795%;
 float:left;
 }
+
+.form_settings .form_data select {
+    margin-top: 0px;
+}
+
+
 .form_settings .form_data input {
 width:39%;
 }
@@ -1064,12 +1402,36 @@ margin-left:0;
 
 .form_settings label {
 margin-top:2px;
-width:24%;
+    width: 25%;
     text-align: right;
 }
 
+.form_settings input.checkbox, .form_settings input.radio {
+    margin-left: 25%;
+    margin-top: 3px;
+    position: relative;
+    left: -14px;
+}
+
+.form_settings label.checkbox, .form_settings label.radio {
+    width: auto;
+    max-width: 60%;
+    position: relative;
+    left: -25px;
+}
+
 .form_settings label.checkbox {
     text-align: left;
+    line-height: 1.2em;
+}
+
+.form_settings label.radio {
+    text-align: left;
+    margin: 0px;
+}
+
+.form_settings li input.radio {
+    clear: left;
 }
 
 .form_actions label {
@@ -1123,50 +1485,24 @@ width:50px;
 
 .form_settings .form_data p.form_guide {
 clear:both;
-margin-left:26%;
+    margin-left: 27%;
 margin-bottom:0;
+    line-height: 1.2em;
+    padding-top: 4px;
 }
 
 .form_settings p {
 margin-bottom:11px;
 }
 
-.form_settings input.checkbox,
-.form_settings input.radio {
-margin-top:3px;
-margin-left:0;
-}
-.form_settings label.checkbox {
-font-weight:normal;
-margin-top:0;
-margin-right:0;
-margin-left:11px;
-float:left;
-width:90%;
-}
-.form_settings label.radio {
-margin-top:0;
-margin-right:47px;
-margin-left:11px;
-width:auto;
-}
-
-#form_login p.form_guide,
-#form_register #settings_rememberme p.form_guide,
-#form_openid_login #settings_rememberme p.form_guide,
-#settings_twitter_remove p.form_guide,
-#form_search ul.form_data #q,
-#design_background-image_onoff p.form_guide {
-margin-left:0;
-}
-
 .form_settings .form_note {
-border-radius:4px;
--moz-border-radius:4px;
--webkit-border-radius:4px;
 padding:0 7px;
 }
 
+.form_settings .form_response {
+    margin-top: 10px;
+}
+
 .form_settings input {
     margin-right: 20px;
 }
@@ -1187,47 +1523,25 @@ content:'☠';
 font-size:150%;
 }
 
-/* override OStatus plugin style */
+#content .notice-source-activity div.entry-title, .notice-source-activity div.entry-content {
+    margin-left: 0;
+} 
 
-#form_ostatus_connect.form_settings.dialogbox, #form_ostatus_sub.dialogbox {
-    width: 76%;
+#content .notice-source-activity div.entry-title {
+    font-style: italic;
+    min-height: 0;
 }
 
-#form_ostatus_connect.form_settings.dialogbox legend {
-    font-size: 1.4em;
-    font-weight: normal;
-    padding-bottom: 10px;    
+#content .notice-source-activity .notice div.entry-title {
+    font-style: normal;
 }
 
-#form_ostatus_connect.dialogbox .form_data label,
-#form_ostatus_sub.dialogbox .form_data label {
-    font-weight: normal;
-    font-size: 1.2em;
-    width:34%;
-}
-
-#form_ostatus_connect.dialogbox .form_data input,
-#form_ostatus_sub.dialogbox .form_data input {
-    float: right;
-    width: 52% !important;
-}
-
-#form_ostatus_connect.dialogbox .form_data .form_guide,
-#form_ostatus_sub.dialogbox .form_data .form_guide {
-    background: none !important;
+span.rtl {
+    display: block;
+    direction: rtl;
     text-align: right;
-    margin-right: 16px;
-}
-
-.section .entity_actions {
-    margin-right: 0px !important;
-}
-
-.section .entity_remote_subscribe {
-    color:#000 !important;
-    padding-left: 26px !important;
-    background-position: 4px -1183px !important;
-}
+    float: right;
+} 
 
 #filter_tags ul li,
 .entity_send-a-message .form_notice,
@@ -1243,7 +1557,7 @@ background:none;
 }
 
 .form_settings .form_note {
-background-color:#9BB43E;
+    background-color: #d1f7cb;
 }
 
 #form_settings_photo .form_data {
@@ -1429,11 +1743,6 @@ display:block;
 text-align:left;
 width:100%;
 }
-.entity_actions a {
-text-decoration:none;
-font-weight:bold;
-display:block;
-}
 
 .entity_actions a, .entity_actions input, .entity_actions p {
     color: #333 !important;
@@ -1442,6 +1751,8 @@ display:block;
 }
 
 .entity_actions a {
+text-decoration:none;
+display:block;
     padding: 3px 4px 4px 28px;
 }
 
@@ -1669,6 +1980,12 @@ display:block;
 width:auto;
 }
 
+.profile_block .group_aliases .group_alias {
+    display:inline;
+    list-style-type: none;
+    font-style: italic;
+}
+
 .profile_block .entity_tags dt {
 display: inline;
 margin-right: 3px;
@@ -1808,14 +2125,37 @@ max-height:96px;
 margin-right:18px;
 float:left;
 }
+
+.oauth-desktop-mode #wrap {
+    min-width: 500px;
+}
+
+.oauth-desktop-mode #content {
+    width: 480px;
+    padding: 6px;
+    margin: 4px 0px 0px 4px;
+    border-top-left-radius: 7px;
+    -moz-border-radius-topleft: 7px;
+    -webkit-border-top-left-radius: 7px;
+}
+
+.oauth-desktop-mode fieldset {
+    margin-bottom: 10px !important;
+}
+
+#oauth_pin {
+    text-align: center;
+    font-size: 3em;
+}
+
 #showapplication .entity_profile {
 width:68%;
 }
 #showapplication .entity_profile .entity_fn {
 margin-left:0;
 }
-#showapplication .entity_profile .entity_fn .fn:before,
-#showapplication .entity_profile .entity_fn .fn:after {
+#showapplication .entity_profile .fn:before,
+#showapplication .entity_profile .fn:after {
 content:'';
 }
 #showapplication .entity_data {
@@ -1825,16 +2165,10 @@ margin-bottom:18px;
 #showapplication .entity_data h2 {
 display:none;
 }
-#showapplication .entity_data dl {
-margin-bottom:18px;
-}
-#showapplication .entity_data dt {
-font-weight:bold;
-}
 #showapplication .entity_data dd {
-margin-left:1.795%;
 font-family:monospace;
 font-size:1.3em;
+    margin-bottom: 10px;
 }
 .form_data #application_types label.radio,
 .form_data #default_access_types label.radio {
@@ -2013,6 +2347,13 @@ background-position:0 -64px;
 #export_data li a.foaf {
 background-position:0 1px;
 }
+
+#export_data li a.json {
+background-image:url(../images/icons/activitystreams.png);
+background-repeat:no-repeat;
+background-color:transparent;
+}
+
 .form_group_leave input.submit,
 .form_user_unsubscribe input.submit,
 .form_user_remove_peopletag input.submit,
@@ -2173,25 +2514,7 @@ margin-bottom:18px;
 padding-left:20px;
 }
 
-#input_form_nav { 
-    list-style-type: none;
-}
 
-#input_form_nav li { 
-    display:inline;
-}
-
-.input_form_nav_tab.current {
-    text-decoration: underline;
-}
-
-.input_form { 
-    display: none;
-}
-
-.input_form.current { 
-    display: block;
-}
 
 .entity_tags li.mode-private {
 color: #829D25;
@@ -2226,6 +2549,15 @@ float:right;
 display:none;
 }
 
+#site_nav_local_views li.extended_menu a {
+    display:none;
+}
+
+.profile_block_otherprofile_list li {
+    display: inline;
+    list-style-type: none;
+}
+
 /*end of @media screen, projection, tv*/
 
 
diff --git a/theme/base/css/ie.css b/theme/base/css/ie.css
index a1144b489b..7f0265129b 100644
--- a/theme/base/css/ie.css
+++ b/theme/base/css/ie.css
@@ -10,13 +10,11 @@ top:0;
 }
 
 .threaded-replies .form_notice textarea {
-    width: 385px;
+    width: 395px;
 }
 
 .form_notice .form_note + label {
 position:absolute;
-top:25px;
-left:83%;
 text-indent:-9999px;
 height:16px;
 width:16px;
@@ -52,10 +50,6 @@ display:block;
     width: 468px; 
 }
 
-.threaded-replies .form_notice textarea {
-    width: 395px;
-}
-
 .notice-options input.submit {
 font-size:0;
 text-align:right;
@@ -99,22 +93,6 @@ line-height:auto;
     filter: alpha(opacity=0);
 }
 
-/* IE7 */ 
-
-*+html .input_forms {
-    margin-bottom: -20px;
-}
-
-/* IE6 */
-
-#content {
-    _width: 520px;
-}
-
-#aside_primary {
-    _width: 190px;
-}
-
-#content h1 {
-    _clear: left;
+.notice .addressees:before {
+    content: '\003E';
 }
diff --git a/theme/base/css/ie6.css b/theme/base/css/ie6.css
index 1784677d08..c4a87a6631 100644
--- a/theme/base/css/ie6.css
+++ b/theme/base/css/ie6.css
@@ -1,30 +1,30 @@
-/**
- * @package   StatusNet
- * @author    Sarven Capadisli <csarven@status.net>
- * @copyright 2009-2010 StatusNet, Inc.
- * @license   http://creativecommons.org/licenses/by/3.0/ Creative Commons Attribution 3.0 Unported
- * @link      http://status.net/
- */
-/* IE6 specific styles */
-address {
-margin-left:7px;
-}
-address .fn {
-display:none;
-}
-
-#wrap {
-width:1003px;
-margin:0 auto;
-}
+/* LTE IE6 styles */
 
 #content {
-width:66%;
+    width: 520px;
 }
+
 #aside_primary {
-padding:1.8%;
-width:24%;
+    width: 220px;
 }
+
+#content h1 {
+    clear: left;
+}
+
+address .fn {
+    display: none;
+}
+
+#header-search {
+    width: 240px;
+}
+
+#header-search input {
+    height: 20px;
+    font-size: 12px;
+}
+
 .entity_profile .entity_nickname,
 .entity_profile .entity_location,
 .entity_profile .entity_url,
@@ -38,10 +38,23 @@ margin-bottom:123px;
 .entity_actions {
 width:20%;
 }
+
 .notice div.entry-content {
-width:65%;
-margin-left:30px;
+    margin-left: 30px;
 }
+
+.notice-source-activity div.entry-content {
+    margin-left: 0;
+} 
+
+.threaded-replies {
+    margin-left: 30px;
+}
+
+#content .notice .threaded-replies .notice div.entry-content {
+    margin-left: 18px;
+}
+
 .notice-options a {
 width:16px;
 }
diff --git a/theme/base/css/ie7.css b/theme/base/css/ie7.css
new file mode 100644
index 0000000000..a4e8a612b3
--- /dev/null
+++ b/theme/base/css/ie7.css
@@ -0,0 +1,22 @@
+/* LTE IE7 styles */ 
+
+#core {
+    margin-top: 3px;
+}
+
+#header-search input[type="submit"] {
+    padding-left: 20px;
+}
+
+.input_forms {
+    margin-bottom: -20px;
+}
+
+.notice .addressees {
+    background: url(../images/icons/arrow_right.png) no-repeat top left;
+    padding-left: 16px;
+}
+
+#content .notice .threaded-replies .notice-data { 
+    margin-left: 0px;
+}
diff --git a/theme/base/css/mp-screen.css b/theme/base/css/mp-screen.css
deleted file mode 100644
index c9fb6dcc4f..0000000000
--- a/theme/base/css/mp-screen.css
+++ /dev/null
@@ -1,7 +0,0 @@
-/* just a placeholder for now */
-
-address img + .fn {
-display:block;
-margin-top:1em;
-float:left;
-}
diff --git a/theme/base/css/rtl.css b/theme/base/css/rtl.css
new file mode 100644
index 0000000000..a9b6e593cd
--- /dev/null
+++ b/theme/base/css/rtl.css
@@ -0,0 +1 @@
+/* placeholder for RTL style */
diff --git a/theme/base/default-avatar-mini.png b/theme/base/default-avatar-mini.png
index 7c9fc0348b..3f3f026ab7 100644
Binary files a/theme/base/default-avatar-mini.png and b/theme/base/default-avatar-mini.png differ
diff --git a/theme/base/default-avatar-profile.png b/theme/base/default-avatar-profile.png
index e8f87006a0..f9addc06b4 100644
Binary files a/theme/base/default-avatar-profile.png and b/theme/base/default-avatar-profile.png differ
diff --git a/theme/base/default-avatar-stream.png b/theme/base/default-avatar-stream.png
index c8148e42ef..e542854e77 100644
Binary files a/theme/base/default-avatar-stream.png and b/theme/base/default-avatar-stream.png differ
diff --git a/theme/base/images/icons/README b/theme/base/images/icons/README
index f701959ca0..d124671da1 100644
--- a/theme/base/images/icons/README
+++ b/theme/base/images/icons/README
@@ -57,3 +57,4 @@ Created by various authors
 * Atom feed icon from http://intertwingly.net/wiki/pie/Icon with Public Domain license
 * RSS feed icon from http://www.feedicons.com/ (Mozilla, Microsoft, Matt Brett) with MPL/GPL/LGPL tri-license
 * Processing icon from/by Unknown with Unknown license //FIXME
+* lock and lock_open icons by Mark James http://www.famfamfam.com/lab/icons/silk/ (Creative Commons Attribution 2.5 License)
diff --git a/theme/base/images/icons/activitystreams.png b/theme/base/images/icons/activitystreams.png
new file mode 100644
index 0000000000..dfb3269365
Binary files /dev/null and b/theme/base/images/icons/activitystreams.png differ
diff --git a/theme/base/images/icons/arrow_right.png b/theme/base/images/icons/arrow_right.png
new file mode 100644
index 0000000000..7f48cec57e
Binary files /dev/null and b/theme/base/images/icons/arrow_right.png differ
diff --git a/theme/base/images/icons/lock.png b/theme/base/images/icons/lock.png
new file mode 100644
index 0000000000..2ebc4f6f96
Binary files /dev/null and b/theme/base/images/icons/lock.png differ
diff --git a/theme/base/images/icons/lock_open.png b/theme/base/images/icons/lock_open.png
new file mode 100644
index 0000000000..a471765ff1
Binary files /dev/null and b/theme/base/images/icons/lock_open.png differ
diff --git a/theme/base/logo.png b/theme/base/logo.png
index b078601019..3891979530 100644
Binary files a/theme/base/logo.png and b/theme/base/logo.png differ
diff --git a/theme/base/mobilelogo.png b/theme/base/mobilelogo.png
index 66bb5f6787..cd2e0e7f16 100644
Binary files a/theme/base/mobilelogo.png and b/theme/base/mobilelogo.png differ
diff --git a/theme/neo-blue/css/display.css b/theme/neo-blue/css/display.css
new file mode 100644
index 0000000000..f5163fcdf1
--- /dev/null
+++ b/theme/neo-blue/css/display.css
@@ -0,0 +1,73 @@
+/** theme: neo-blue
+ *
+ * @package   StatusNet
+ * @author    Samantha Doherty <sammy@status.net>
+ * @copyright 2011 StatusNet, Inc.
+ * @license   http://creativecommons.org/licenses/by/3.0/ Creative Commons Attribution 3.0 Unported
+ * @link      http://status.net/
+ */
+
+@media screen, projection, tv {
+
+body { 
+    background: #7e89a4;
+}
+
+#wrap {
+    border: none;
+    padding: 0px 10px;
+    box-shadow: 0px 0px 12px rgba(0, 0, 0, 0.7);
+    -moz-box-shadow: 0px 0px 12px rgba(0, 0, 0, 0.7);
+    -webkit-box-shadow: 0px 0px 12px rgba(0, 0, 0, 0.7);
+    background: #fff;
+}
+
+#header {
+    padding-top: 7px;
+}
+
+#site_nav_global_primary {
+    top: 0px;
+    right: -14px;
+    padding-top: 5px;
+    height: 30px;
+    width: 986px;
+    box-shadow: 0px 0px 6px rgba(0, 0, 0, 0.7);
+    -moz-box-shadow: 0px 0px 6px rgba(0, 0, 0, 0.7);
+    -webkit-box-shadow: 0px 0px 6px rgba(0, 0, 0, 0.7);
+    -webkit-border-bottom-left-radius: 4px;
+    -moz-border-radius-bottomleft: 4px;
+    border-bottom-left-radius: 4px;
+    -webkit-border-bottom-right-radius: 4px;
+    -moz-border-radius-bottomright: 4px;
+    border-bottom-right-radius: 4px;
+    z-index: 98;
+    border-bottom: 1px solid #fff;
+    border-left: 1px solid #516499;
+    border-right: 1px solid #516499;
+}
+
+#site_nav_global_primary a:hover {
+    background: #4c619c;
+    -webkit-border-radius: 4px;
+    -moz-border-radius: 4px;
+    border-radius: 4px;    
+}
+
+#site_notice { 
+    margin: 45px 0px 0px 0px;
+    background-color: #f2f2f2; /* XXX */
+}
+
+#core {
+    border-top: none;
+    margin-top: 3px;
+}
+
+.input_forms {
+    background-color: #fff;
+    left: 0px;
+    padding: 18px 0px 0px 0px;
+}
+
+}/*end of @media screen, projection, tv*/
diff --git a/theme/neo-blue/css/mp-screen.css b/theme/neo-blue/css/mp-screen.css
new file mode 100644
index 0000000000..670843adcf
--- /dev/null
+++ b/theme/neo-blue/css/mp-screen.css
@@ -0,0 +1,129 @@
+address img {
+    background: none !important;
+}
+
+/* copy of mp-screen.css from neo theme */
+
+body {
+    background-image: none;
+    min-width: 0;
+}
+
+#header {
+    padding: 0;
+}
+
+#site_nav_global_primary {
+    top: 0;
+    -webkit-border-top-right-radius: 0px;
+    -moz-border-radius-topright: 0px;
+    border-top-right-radius: 0px;
+    line-height: 16px;
+}
+
+#site_nav_global_primary li {
+    float: left;
+    margin-right: 8px;
+}
+
+#site_nav_local_views {
+    line-height: 2em;
+}
+
+#site_nav_local_views h3 {
+    color: #333;
+    background: none;
+    text-transform: none;
+    letter-spacing: 0;
+    padding-bottom: 0;
+}
+
+#site_nav_local_views li li {
+    margin: 0 6px 6px 0;
+}
+
+#login #site_nav_local_views li, #register #site_nav_local_views li, #openidlogin #site_nav_local_views li {
+    margin: 0 6px 6px 0;
+}
+
+#site_nav_local_views a {
+    color: #fff;
+    text-shadow: 0px 1px 1px rgba(0, 0, 0, 0.5);;
+    background: #364a84;
+    background: -moz-linear-gradient(top, #7b8dbb , #364a84);
+    background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#7b8dbb), color-stop(100%,#364a84));
+    font-size: 0.9em;
+    width: auto;
+}
+
+#site_nav_local_views a:hover {
+    background: #7b8dbb;
+    background: -moz-linear-gradient(top, #364a84 , #7b8dbb);
+    background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#364a84), color-stop(100%,#7b8dbb));
+}
+
+.input_forms { 
+    top: -10px;
+    padding-right: 0;
+}
+
+#input_form_nav li a {
+    padding: 0px 4px 1px 4px;
+}
+
+.form_notice .count {
+    top: 44px;
+    left: 276px;
+}
+
+#form_notice-direct.form_notice .count {
+    top: 74px;
+    left: 276px;
+}
+
+#event-startdate, #event-starttime, #event-enddate, #event-endtime {
+    width: 120px;
+    margin-right: 12px;
+}
+
+.input_form .form_settings .submit {
+    font-size: 1em;
+}
+
+.form_notice input.submit {
+    font-size: 1em;
+}
+
+.question div.question-description {
+    max-width: 100% !important;
+}
+
+ul.qna-dummy {
+    width: 80%;
+}
+
+.qna-dummy-placeholder input {
+    width: 92%;
+}
+
+.question #qna-answer, .qna-full-question #qna-answer {
+    width: 220px;
+}
+
+.threaded-replies #answer-form fieldset {
+    width: 220px;
+}
+
+.threaded-replies #qna-answer-submit {
+    float: left;
+    clear: left;
+    position: relative;
+    top: 0;
+    bottom: 0px;
+    left: 0;
+    margin-top: 10px;
+}
+
+a.company_logo {
+    display: none !important;
+}
diff --git a/theme/neo-blue/default-avatar-mini.png b/theme/neo-blue/default-avatar-mini.png
new file mode 100644
index 0000000000..3f3f026ab7
Binary files /dev/null and b/theme/neo-blue/default-avatar-mini.png differ
diff --git a/theme/neo-blue/default-avatar-profile.png b/theme/neo-blue/default-avatar-profile.png
new file mode 100644
index 0000000000..f9addc06b4
Binary files /dev/null and b/theme/neo-blue/default-avatar-profile.png differ
diff --git a/theme/neo-blue/default-avatar-stream.png b/theme/neo-blue/default-avatar-stream.png
new file mode 100644
index 0000000000..e542854e77
Binary files /dev/null and b/theme/neo-blue/default-avatar-stream.png differ
diff --git a/theme/neo-blue/logo.png b/theme/neo-blue/logo.png
new file mode 100644
index 0000000000..5bf1063683
Binary files /dev/null and b/theme/neo-blue/logo.png differ
diff --git a/theme/neo-blue/mobilelogo.png b/theme/neo-blue/mobilelogo.png
new file mode 100644
index 0000000000..c72b6ac0ab
Binary files /dev/null and b/theme/neo-blue/mobilelogo.png differ
diff --git a/theme/neo-blue/theme.ini b/theme/neo-blue/theme.ini
new file mode 100644
index 0000000000..8bdec29d25
--- /dev/null
+++ b/theme/neo-blue/theme.ini
@@ -0,0 +1 @@
+include=neo
diff --git a/theme/neo-light/css/display.css b/theme/neo-light/css/display.css
new file mode 100644
index 0000000000..624797f6f8
--- /dev/null
+++ b/theme/neo-light/css/display.css
@@ -0,0 +1,44 @@
+/** theme: neo-light
+ *
+ * @package   StatusNet
+ * @author    Samantha Doherty <sammy@status.net>
+ * @copyright 2011 StatusNet, Inc.
+ * @license   http://creativecommons.org/licenses/by/3.0/ Creative Commons Attribution 3.0 Unported
+ * @link      http://status.net/
+ */
+
+@media screen, projection, tv {
+
+body { 
+    background: #f0f2f5;
+}
+
+#wrap {
+    background-color: #f0f2f5;
+    border: none;
+}
+
+#aside_primary_wrapper {
+    background-color: #fafafa;  
+}    
+
+#content_wrapper  {  
+    border-right: 1px solid #fff;
+}  
+
+#site_nav_local_views_wrapper  {  
+    background-color: #fafafa;  
+    border-right: 1px solid #fff;
+}  
+
+#site_notice {
+    background: #fff;
+}
+
+.input_forms {
+    background-color: #fff;
+    left: 0px;
+    padding: 18px 0px 0px 0px;
+}
+
+}/*end of @media screen, projection, tv*/
diff --git a/theme/neo-light/css/mp-screen.css b/theme/neo-light/css/mp-screen.css
new file mode 100644
index 0000000000..ba305c47ad
--- /dev/null
+++ b/theme/neo-light/css/mp-screen.css
@@ -0,0 +1,125 @@
+/* copy of mp-screen.css from neo theme */
+
+body {
+    background-image: none;
+    min-width: 0;
+}
+
+#header {
+    padding: 0;
+}
+
+#site_nav_global_primary {
+    top: 0;
+    -webkit-border-top-right-radius: 0px;
+    -moz-border-radius-topright: 0px;
+    border-top-right-radius: 0px;
+    line-height: 16px;
+}
+
+#site_nav_global_primary li {
+    float: left;
+    margin-right: 8px;
+}
+
+#site_nav_local_views {
+    line-height: 2em;
+}
+
+#site_nav_local_views h3 {
+    color: #333;
+    background: none;
+    text-transform: none;
+    letter-spacing: 0;
+    padding-bottom: 0;
+}
+
+#site_nav_local_views li li {
+    margin: 0 6px 6px 0;
+}
+
+#login #site_nav_local_views li, #register #site_nav_local_views li, #openidlogin #site_nav_local_views li {
+    margin: 0 6px 6px 0;
+}
+
+#site_nav_local_views a {
+    color: #fff;
+    text-shadow: 0px 1px 1px rgba(0, 0, 0, 0.5);;
+    background: #364a84;
+    background: -moz-linear-gradient(top, #7b8dbb , #364a84);
+    background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#7b8dbb), color-stop(100%,#364a84));
+    font-size: 0.9em;
+    width: auto;
+}
+
+#site_nav_local_views a:hover {
+    background: #7b8dbb;
+    background: -moz-linear-gradient(top, #364a84 , #7b8dbb);
+    background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#364a84), color-stop(100%,#7b8dbb));
+}
+
+.input_forms { 
+    top: -10px;
+    padding-right: 0;
+}
+
+#input_form_nav li a {
+    padding: 0px 4px 1px 4px;
+}
+
+.form_notice .count {
+    top: 44px;
+    left: 276px;
+}
+
+#form_notice-direct.form_notice .count {
+    top: 74px;
+    left: 276px;
+}
+
+#event-startdate, #event-starttime, #event-enddate, #event-endtime {
+    width: 120px;
+    margin-right: 12px;
+}
+
+.input_form .form_settings .submit {
+    font-size: 1em;
+}
+
+.form_notice input.submit {
+    font-size: 1em;
+}
+
+.question div.question-description {
+    max-width: 100% !important;
+}
+
+ul.qna-dummy {
+    width: 80%;
+}
+
+.qna-dummy-placeholder input {
+    width: 92%;
+}
+
+.question #qna-answer, .qna-full-question #qna-answer {
+    width: 220px;
+}
+
+.threaded-replies #answer-form fieldset {
+    width: 220px;
+}
+
+.threaded-replies #qna-answer-submit {
+    float: left;
+    clear: left;
+    position: relative;
+    top: 0;
+    bottom: 0px;
+    left: 0;
+    margin-top: 10px;
+}
+
+a.company_logo {
+    display: none !important;
+}
diff --git a/theme/neo-light/default-avatar-mini.png b/theme/neo-light/default-avatar-mini.png
new file mode 100644
index 0000000000..3f3f026ab7
Binary files /dev/null and b/theme/neo-light/default-avatar-mini.png differ
diff --git a/theme/neo-light/default-avatar-profile.png b/theme/neo-light/default-avatar-profile.png
new file mode 100644
index 0000000000..f9addc06b4
Binary files /dev/null and b/theme/neo-light/default-avatar-profile.png differ
diff --git a/theme/neo-light/default-avatar-stream.png b/theme/neo-light/default-avatar-stream.png
new file mode 100644
index 0000000000..e542854e77
Binary files /dev/null and b/theme/neo-light/default-avatar-stream.png differ
diff --git a/theme/neo-light/logo.png b/theme/neo-light/logo.png
new file mode 100644
index 0000000000..3891979530
Binary files /dev/null and b/theme/neo-light/logo.png differ
diff --git a/theme/neo-light/mobilelogo.png b/theme/neo-light/mobilelogo.png
new file mode 100644
index 0000000000..cd2e0e7f16
Binary files /dev/null and b/theme/neo-light/mobilelogo.png differ
diff --git a/theme/neo-light/theme.ini b/theme/neo-light/theme.ini
new file mode 100644
index 0000000000..8bdec29d25
--- /dev/null
+++ b/theme/neo-light/theme.ini
@@ -0,0 +1 @@
+include=neo
diff --git a/theme/neo/README b/theme/neo/README
index 9e001123cb..eff8cd6dfa 100644
--- a/theme/neo/README
+++ b/theme/neo/README
@@ -1,7 +1,7 @@
 Default avatars are modified from an image by Francesco 'Architetto' Rollandin.
 http://www.openclipart.org/detail/34957
 
-Icons by Mark James
+Some icons by Mark James
 http://www.famfamfam.com/lab/icons/silk/
 http://creativecommons.org/licenses/by/2.5/ Creative Commons Attribution 2.5 License
 
diff --git a/theme/neo/css/display.css b/theme/neo/css/display.css
index a0df1e9cb4..e8ef88fd94 100644
--- a/theme/neo/css/display.css
+++ b/theme/neo/css/display.css
@@ -30,18 +30,17 @@
 
 @media screen, projection, tv {
 
+/* general styles and layout */
+
 body {
     background-color: #C6C8CC;
     background-image: url(../images/bg.png);
     font-family: 'Lato', "Helvetica Neue", Helvetica, Arial, sans-serif; 
-    font-size: 14px;
-    line-height: 1.6;
     color: #222;
 }
 
 input, textarea, select, option {
     font-family: 'Lato', "Helvetica Neue", Helvetica, Arial, sans-serif; 
-    font-size: 1em;
 }
 
 a {color: #3e3e8c;}
@@ -57,52 +56,57 @@ h5 {font-size: 1.2em;}
 h6 {font-size: 1em;}
 
 #wrap {
-    width: 960px;
-    margin: 0px auto;
     background: #fff url('../images/brdr_black_dot.png') repeat-x 0px 10px;
-    border-left: 10px solid #fff;
-    border-right: 10px solid #fff;
-    padding-top: 10px;
 }
 
 #header {
-    width: 960px;
-    padding: 0px;
     padding-top: 12px;
 }
 
-address {
-    float: left;
-    position: relative;
-    top: 1px;
-    left: 2px;
-    margin: 0px;
-    padding: 0px;
-    height: 24px;
-    width: 148px;
-    z-index: 99;
+#core {
+    border-top: 5px solid #FB6104;
+    border-left: 1px solid #d8dae6;
+    border-right: 1px solid #d8dae6;
 }
 
+#aside_primary_wrapper {
+    background-color: #ececf2;  
+}    
+
+#content_wrapper  {  
+    border-right: 1px solid #d8dae6;
+}  
+
+#site_nav_local_views_wrapper  {  
+    background-color: #ececf2;  
+    border-right: 1px solid #d8dae6;
+}  
+
+#footer {
+    top: -6px;
+    -webkit-border-top-left-radius: 6px;
+    -webkit-border-top-right-radius: 6px;
+    -moz-border-radius-topleft: 6px;
+    -moz-border-radius-topright: 6px;
+    border-top-left-radius: 6px;
+    border-top-right-radius: 6px;
+}
+
+/* header elements */
+
 #site_nav_global_primary {
-    display: block;
-    position: absolute;
     top: 10px;
-    right: 0;
-    width: 800px;
-    margin: 0px;
-    height: 24px;
-    line-height: 20px;
     -webkit-border-top-right-radius: 6px;
     -moz-border-radius-topright: 6px;
     border-top-right-radius: 6px;
     background: #364A84;
-    background: -moz-linear-gradient(top, #516499 , #364a84);
+    background: -moz-linear-gradient(top, #516499 0%, #364a84 100%);
     background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#516499), color-stop(100%,#364a84));
-    filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#516499', endColorstr='#364a84',GradientType=0 ); /* XXX move all to ie.css */ 
-}
-
-#site_nav_global_primary ul {
-    float: right;
+    background: -webkit-linear-gradient(top, #516499 0%,#364a84 100%);
+    background: -o-linear-gradient(top, #516499 0%,#364a84 100%);
+    background: -ms-linear-gradient(top, #516499 0%,#364a84 100%);
+    filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#516499', endColorstr='#364a84',GradientType=0 );
+    background: linear-gradient(top, #516499 0%,#364a84 100%);
 }
 
 #site_nav_global_primary li {
@@ -114,12 +118,12 @@ address {
 }
 
 #site_nav_global_primary a {
-    color: #fff !important;
-    text-shadow: 0px 1px 1px rgba(0, 0, 0, 0.5);
     padding: 2px 10px 2px 10px;
     height: 20px;
     display: block;
     float: left;
+    color: #fff;
+    text-shadow: 0px 1px 1px rgba(0, 0, 0, 0.5);
 }
 
 #site_nav_global_primary a:hover {
@@ -129,78 +133,122 @@ address {
     text-decoration: none;
 }
 
+#header-search {
+    top: 1px;
+    margin-left: 6px;
+}
+
+#header-search #search-q {
+    position: relative;
+    width: 131px;
+    height: 12px;
+    margin-right: 10px;
+    padding: 2px 22px 2px 6px;
+    -webkit-border-radius: 4px;
+    -moz-border-radius: 4px;
+    border-radius: 4px;
+    border: none;
+    font-size: 0.88em;
+}
+
+#header-search input[type="submit"] {
+    border: 0;
+    background: url(../images/magnifier.png) no-repeat 2px 1px;
+    text-indent: -9999px;
+    width: 20px;
+    height: 18px;
+    position: absolute;
+    right: 10px;
+    top: 2px;
+    z-index: 2;
+    cursor: pointer;
+}
+
 #site_notice {
-    color: #000;
-    float: right;
-    width: 280px;
-    padding: 10px; 
-    margin-left: 40px;
     -webkit-border-radius: 6px;
     -moz-border-radius: 6px;
     border-radius: 6px;
 }
 
-#site_notice a {
+/* input forms */
+
+.input_forms {
+    float: left;
+    top: -20px;
+    left: -20px;
+    padding: 18px 20px 0px 20px;
+    border-bottom: none;
+    margin-bottom: 0px;
+    background: #fafafa url('../images/brdr_black_dot.png') repeat-x bottom left;
+}
+
+#input_form_nav li a {
+    display: block;
+    float: left;
+    padding: 0px 10px 1px 10px;
+    -webkit-border-radius: 4px;
+    -moz-border-radius: 4px;
+    border-radius: 4px;
+    border: 1px solid #ECECF2;
+    font-weight: bold;
+    line-height: 1.4em;
     color: #3e3e8c;
+    text-shadow: 0px 1px 0px rgba(255, 255, 255, 0.9);
+    background: #ececf2;
+    background: -moz-linear-gradient(top, #ffffff 0%, #ececf2 100%);
+    background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#ffffff), color-stop(100%,#ececf2));
+    background: -webkit-linear-gradient(top, #ffffff 0%,#ececf2 100%);
+    background: -o-linear-gradient(top, #ffffff 0%,#ececf2 100%);
+    background: -ms-linear-gradient(top, #ffffff 0%,#ececf2 100%);
+    filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffffff', endColorstr='#ececf2',GradientType=0 );
+    background: linear-gradient(top, #ffffff 0%,#ececf2 100%);
 }
 
-#anon_notice {
-    color: #000;
-    clear: both;
-    background: none;
-    padding: 0px;
-    margin-bottom: 10px;
+#input_form_nav li:hover a, #input_form_nav li.current a {
+    color: #fff;
+    text-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5);
+    border: 1px solid #ececf2;
+    background: #364a84;
+    background: -moz-linear-gradient(top, #7b8dbb 0%, #364a84 100%);
+    background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#7b8dbb), color-stop(100%,#364a84));
+    background: -webkit-linear-gradient(top, #7b8dbb 0%,#364a84 100%);
+    background: -o-linear-gradient(top, #7b8dbb 0%,#364a84 100%);
+    background: -ms-linear-gradient(top, #7b8dbb 0%,#364a84 100%);
+    filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#7b8dbb', endColorstr='#364a84',GradientType=0 );
+    background: linear-gradient(top, #7b8dbb 0%,#364a84 100%);
 }
 
-#anon_notice a {
-    color: #3e3e8c;
+.input_form_nav_tab a, .input_form_nav_tab.current a {
+    text-decoration: none;
 }
 
-#core {
-    clear: both;
-    margin: 0px;
-    width: 958px;
-    border-top: 5px solid #FB6104;
-    border-left: 1px solid #d8dae6;
-    border-right: 1px solid #d8dae6;
+.form_notice .error,
+.form_notice .success,
+.form_notice .notice-status {
+    -webkit-border-radius: 4px;
+    -moz-border-radius: 4px;
+    border-radius: 4px;
 }
 
-#aside_primary_wrapper {
-    width: 100%;
-    float: left;
-    overflow: hidden;
-    position: relative;
-    background-color: #ececf2;  
-}    
-
-#content_wrapper  {  
-    width: 100%;  
-    float: left;
-    position: relative;  
-    right: 239px; 
-    background-color: #fff;  
-    border-right: 1px solid #d8dae6;
-}  
-
-#site_nav_local_views_wrapper  {  
-    width: 100%;  
-    float: left;
-    position: relative;  
-    right: 561px;
-    background-color: #ececf2;  
-    border-right: 1px solid #d8dae6;
-}  
-
-#site_nav_local_views {
-    width: 138px;
-    float: left;
-    overflow: hidden;
-    position: relative;
-    left: 800px;
-    margin-top: 0px;
-    padding: 22px 10px 40px 10px;
+.form_notice_placeholder .placeholder,
+.form_notice textarea ,
+.input_form .form_settings li input,
+.input_form .form_settings li textarea,
+.threaded-replies .placeholder { /* TODO combine all these declarations */
+    -webkit-border-radius: 4px;
+    -moz-border-radius: 4px;
+    border-radius: 4px;
+    box-shadow: 0px 0px 4px rgba(0, 0, 0, 0.2);
+    -moz-box-shadow: 0px 0px 4px rgba(0, 0, 0, 0.2);
+    -webkit-box-shadow: 0px 0px 4px rgba(0, 0, 0, 0.2);
 }
 
+.input_form .form_settings .submit {
+    font-size: 1.1em;
+}
+
+/* site nav local views */
+
 #site_nav_local_views H3 {
     margin-bottom: 10px;
     padding-bottom: 6px;
@@ -212,15 +260,6 @@ address {
     text-transform: uppercase;
 }
 
-#site_nav_local_views li {
-    display: block;
-    margin: 0px 0px 8px 0px;
-}
-
-#site_nav_local_views li ul {
-    margin-bottom: 20px;
-}
-
 #site_nav_local_views a {
     display: block;
     width: 118px;
@@ -238,344 +277,18 @@ address {
     text-decoration: none;
     text-shadow: 0px 1px 1px rgba(0, 0, 0, 0.5);
     background: #364a84;
-    background: -moz-linear-gradient(top, #7b8dbb , #364a84);
+    background: -moz-linear-gradient(top, #7b8dbb 0%, #364a84 100%);
     background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#7b8dbb), color-stop(100%,#364a84));
+    background: -webkit-linear-gradient(top, #7b8dbb 0%,#364a84 100%);
+    background: -o-linear-gradient(top, #7b8dbb 0%,#364a84 100%);
+    background: -ms-linear-gradient(top, #7b8dbb 0%,#364a84 100%);
     filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#7b8dbb', endColorstr='#364a84',GradientType=0 );
+    background: linear-gradient(top, #7b8dbb 0%,#364a84 100%);
 }
 
-#content {
-    width: 520px;
-    float: left;
-    overflow: hidden;
-    position: relative;
-    left: 801px;
-    margin: 0px;
-    padding: 20px 20px 40px 20px;
-}
-
-/* Input forms */
-
-.input_forms {
-    float: left;
-    position: relative;
-    top: -20px;
-    left: -20px;
-    padding: 18px 20px 0px 20px;
-    background: #fafafa url('../images/brdr_black_dot.png') repeat-x bottom left;
-}
-
-#input_form_nav {
-    float: left;
-    margin-bottom: 10px;
-}
-
-#input_form_nav li a {
-    display: block;
-    float: left;
-    padding: 0px 10px 1px 10px;
-    margin-right: 10px;
-    -webkit-border-radius: 4px;
-    -moz-border-radius: 4px;
-    border-radius: 4px;
-    border: 1px solid #ECECF2;
-    font-weight: bold;
-    line-height: 1.4em;
-    text-shadow: 0px 1px 0px rgba(255, 255, 255, 0.9);
-    background: #ececf2;
-    background: -moz-linear-gradient(top, #ffffff , #ececf2);
-    background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#ffffff), color-stop(100%,#ececf2));
-    filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffffff', endColorstr='#ececf2',GradientType=0 );
-}
-
-#input_form_nav li:hover a, #input_form_nav li.current a {
-    color: #fff;
-    text-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5);
-    border: 1px solid #ececf2;
-    background: #364a84;
-    background: -moz-linear-gradient(top, #7b8dbb , #364a84);
-    background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#7b8dbb), color-stop(100%,#364a84));
-    filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#7b8dbb', endColorstr='#364a84',GradientType=0 );
-}
-
-.input_form_nav_tab a, .input_form_nav_tab.current {
-    text-decoration: none !important; /* XXX cf rebase */
-}
-
-.input_form {
-    position: relative;
-    float: left;
-    width: 520px;
-    padding-bottom: 20px;
-}
-
-#input_form_status, #input_form_direct {
-    padding-bottom: 50px;
-}
-
-.form_notice {
-    padding: 0px;
-    background: none;
-}
-
-.form_notice fieldset {
-    width: auto;
-    position: static;
-}
-
-.form_notice #notice_data-text-label {
-    display: none; /* XXX move into input with js */
-}
-
-.form_notice_placeholder .placeholder {
-    width: 508px;
-    padding: 4px 4px 4px 6px;
-    border: 1px solid #a6a6a6;
-    -webkit-border-radius: 4px;
-    -moz-border-radius: 4px;
-    border-radius: 4px;
-    box-shadow: 0px 0px 4px rgba(0, 0, 0, 0.2);
-    -moz-box-shadow: 0px 0px 4px rgba(0, 0, 0, 0.2);
-    -webkit-box-shadow: 0px 0px 4px rgba(0, 0, 0, 0.2);
-    z-index: 97;
-    font-size: 1em;
-    color: #888;
-}
-
-.form_notice textarea {
-    width: 483px;
-    height: 42px;
-    padding: 6px 5px 18px 5px;
-    border: 1px solid #a6a6a6;
-    -webkit-border-radius: 4px;
-    -moz-border-radius: 4px;
-    border-radius: 4px;
-    box-shadow: 0px 0px 4px rgba(0, 0, 0, 0.2);
-    -moz-box-shadow: 0px 0px 4px rgba(0, 0, 0, 0.2);
-    -webkit-box-shadow: 0px 0px 4px rgba(0, 0, 0, 0.2);
-    z-index: 97;
-    font-size: 1.2em;
-}
-
-#form_notice-direct.form_notice textarea {
-    width: 508px;
-}
-
-.form_notice label.notice_data-attach {
-    top: 0px;
-    right: 0px;
-    z-index: 96;
-}
-
-.form_notice .notice_data-geo_wrap label,
-.form_notice .notice_data-geo_wrap input {
-    top: 26px;
-    right: 0px;
-    z-index: 99;
-}
-
-.form_notice .count {
-    position: absolute;
-    top: 50px;
-    right: 32px;
-    font-size: 0.8em; 
-    height: 1em;
-    z-index: 99;
-}
-
-#form_notice-direct.form_notice .count {
-    top: 78px;
-    right: 7px;
-}
-
-.form_notice #notice_action-submit {
-    position: absolute;
-    top: 100%;
-    left: 0px;
-    margin-top: -49px;
-    float: left;
-    width: 100px;
-    padding: 0px;
-    z-index: 99;
-}
-
-.form_notice .error,
-.form_notice .success,
-.form_notice .notice-status {
-    width: 478px; 
-    position: relative;
-    top: 0px;
-    float: none;
-    clear: none;
-    margin-left: 0px;
-    margin-top: 10px;
-    padding: 5px 5px 5px 10px;
-    border: 1px solid #ccc;
-    -webkit-border-radius: 4px;
-    -moz-border-radius: 4px;
-    border-radius: 4px;
-}
-
-.form_notice .error {
-    border: 1px solid #d05858;
-}
-
-.form_notice .attach-status code {
-    font-size: 1em;
-}
-
-.input_form fieldset {
-    margin: 0px;
-    padding: 0px;
-}
-
-.input_form fieldset fieldset {
-    width: 400px;
-    float: left;
-    background: none;
-    border: none;
-    margin-bottom: 0px !important;
-    padding: 0px !important;
-}
-
-.input_form .form_settings .form_data li {
-    position: relative;
-    margin-bottom: 12px;
-}
-
-.input_form fieldset fieldset label {
-    position: absolute;
-    top: 0;
-    left: 6px;
-    float: none;
-    text-align: left;
-    color: #888;
-    cursor: text;
-    background: #fff;
-}
-
-.input_form .form_settings li input {
-    width: 388px;
-    margin-left: 0;
-    margin-right: 0;
-    padding: 4px 5px 4px 5px;
-    border: 1px solid #a6a6a6;
-    -webkit-border-radius: 4px;
-    -moz-border-radius: 4px;
-    border-radius: 4px;
-    box-shadow: 0px 0px 4px rgba(0, 0, 0, 0.2);
-    -moz-box-shadow: 0px 0px 4px rgba(0, 0, 0, 0.2);
-    -webkit-box-shadow: 0px 0px 4px rgba(0, 0, 0, 0.2);
-    font-size: 1em;
-}
-
-.input_form .form_settings li textarea {
-    width: 388px;
-    margin-left: 0;
-    padding: 4px 5px 4px 5px;
-    border: 1px solid #a6a6a6;
-    -webkit-border-radius: 4px;
-    -moz-border-radius: 4px;
-    border-radius: 4px;
-    box-shadow: 0px 0px 4px rgba(0, 0, 0, 0.2);
-    -moz-box-shadow: 0px 0px 4px rgba(0, 0, 0, 0.2);
-    -webkit-box-shadow: 0px 0px 4px rgba(0, 0, 0, 0.2);
-    z-index: 97;
-    font-size: 1em;
-}
-
-.input_form .form_settings p.form_guide {
-    margin-left: 5px;
-}
-
-.input_form .form_settings .submit {
-    position: relative;
-    top: 0;
-    right: 0;
-    float: right;   
-    width: 100px;
-    height: 26px;
-    line-height: 26px;
-    padding: 0px 10px;
-    margin: 0px;
-    color:#fff;
-    font-weight: bold;
-    text-transform: uppercase;
-    font-size: 1.1em;
-    z-index: 1;
-}
-
-.to-selector { 
-    padding-top: 15px;
-    z-index: 99;
-}
-
-.form_settings label[for=notice_to] {
-    left: 5px;
-    margin-left: 0px;
-    margin-right: 10px;
-    position: relative;
-    clear: left;
-}
-
-.checkbox-wrapper {
-    padding: 2px;
-    margin-left: 10px;
-}
-
-.form_notice .checkbox-wrapper {
-    display: inline;
-    margin-left: 10px;
-}
-
-.form_settings .checkbox-wrapper label.checkbox {
-    margin-left: 0px;
-    margin-top: 6px;
-    line-height: 1.2em;
-    left: -3px;
-    float: none;
-}
-
-.checkbox-wrapper #notice_private {
-    display:none;
-}
-
-.checkbox-wrapper.unchecked label.checkbox {
-    padding-left: 20px;
-    background: url(../images/lock_open.png) no-repeat 0px 0px;
-    opacity: 0.6;
-}
-
-.checkbox-wrapper.unchecked label.checkbox:hover {
-    opacity: 1;
-    cursor: pointer;
-}
-
-.checkbox-wrapper.checked label.checkbox {
-    padding-left: 20px;
-    background: url(../images/lock.png) no-repeat 0px 0px;
-    color: red;
-    opacity: 1;
-}
-
-.checkbox-wrapper.checked label.checkbox:hover {
-    cursor: pointer;
-}
-
-#aside_primary {
-    width: 218px;
-    float: left;
-    overflow: hidden;
-    position: relative;
-    left: 802px;
-    padding: 22px 10px 40px 10px;
-    margin-top: 0px;
-    background: none;
-}
+/* aside primary */
 
 #aside_primary .section {
-    width: 100%;
-    margin-left: 0px;
-    margin-right: 0px;
     font-size: 0.88em;
 }
 
@@ -641,9 +354,13 @@ address {
     text-decoration: none;
     text-shadow: 0px 1px 1px rgba(0, 0, 0, 0.5);
     background: #364a84;
-    background: -moz-linear-gradient(top, #7b8dbb , #364a84);
+    background: -moz-linear-gradient(top, #7b8dbb 0%, #364a84 100%);
     background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#7b8dbb), color-stop(100%,#364a84));
+    background: -webkit-linear-gradient(top, #7b8dbb 0%,#364a84 100%);
+    background: -o-linear-gradient(top, #7b8dbb 0%,#364a84 100%);
+    background: -ms-linear-gradient(top, #7b8dbb 0%,#364a84 100%);
     filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#7b8dbb', endColorstr='#364a84',GradientType=0 );
+    background: linear-gradient(top, #7b8dbb 0%,#364a84 100%);
 }
 
 .section ul.entities {
@@ -692,9 +409,13 @@ address {
     -moz-border-radius: 4px;
     -webkit-border-radius: 4px;
     background: #FB6104;
-    background: -moz-linear-gradient(top, #ff9d63 , #FB6104);
-    background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#ff9d63), color-stop(100%,#FB6104)); 
-    filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ff9d63', endColorstr='#FB6104',GradientType=0 );
+    background: -moz-linear-gradient(top, #ff9d63 0%, #fb6104 100%);
+    background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#ff9d63), color-stop(100%,#fb6104));
+    background: -webkit-linear-gradient(top, #ff9d63 0%,#fb6104 100%);
+    background: -o-linear-gradient(top, #ff9d63 0%,#fb6104 100%);
+    background: -ms-linear-gradient(top, #ff9d63 0%,#fb6104 100%);
+    filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ff9d63', endColorstr='#fb6104',GradientType=0 );
+    background: linear-gradient(top, #ff9d63 0%,#fb6104 100%);
 }
 
 .invite_button:hover {
@@ -702,11 +423,17 @@ address {
     text-decoration: none;
     text-shadow: 0px -1px 0px rgba(0, 0, 0, 0.6);
     background: #ff9d63;
-    background: -moz-linear-gradient(top, #FB6104 , #fc8035);
-    background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#FB6104), color-stop(100%,#fc8035));
-    filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#FB6104', endColorstr='#fc8035',GradientType=0 );
+    background: -moz-linear-gradient(top, #fb6104 0%, #fc8035 100%);
+    background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#fb6104), color-stop(100%,#fc8035));
+    background: -webkit-linear-gradient(top, #fb6104 0%,#fc8035 100%);
+    background: -o-linear-gradient(top, #fb6104 0%,#fc8035 100%);
+    background: -ms-linear-gradient(top, #fb6104 0%,#fc8035 100%);
+    filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#fb6104', endColorstr='#fc8035',GradientType=0 );
+    background: linear-gradient(top, #fb6104 0%,#fc8035 100%);
 }
 
+/* notices etc */
+
 #content h1 {
     border-bottom: 3px solid #A6ADBF;
     color: #A6ADBF;
@@ -715,37 +442,11 @@ address {
     text-transform: none;
 }
 
-#notices_primary {
-    margin-top: -5px;
-}
-
 #content .notice {
     padding-bottom: 4px;
     border-bottom: 2px dotted #eee;
 }
 
-.notice {
-    line-height: 1.36em;
-    margin-bottom: 10px;
-}
-
-#content .notice .author .photo {
-    left: 0px;
-    top: 7px;
-}
-
-#content .notice .entry-title {
-    min-height: 35px;
-}
-
-#showstream .notice .entry-title {
-    min-height: 1px;
-}
-
-#shownotice .notice .entry-title {
-    min-height:123px;
-}
-
 .notice div.entry-content {
     font-size: 0.88em;
     line-height: 1.2em;
@@ -771,145 +472,38 @@ div.entry-content a.response:after {
 
 .notice-options {
     margin-top: 4px;
-    margin-bottom: 10px;
 }
 
-.threaded-replies {
-    clear: both;
-    float: left;
-    width: 458px;
-    margin-left: 59px;
-    margin-top: 10px;
-    margin-bottom: 10px;
-    padding-right: 2px;
-    border-left: 3px solid #ECECF2;
-    background: #fafafa;
-    font-size: 1em;
+.notice-options .form_repeat.dialogbox {
+    margin-right: 0px;
+    border: 1px solid #aaa;
+    -webkit-border-radius: 4px;
+    -moz-border-radius: 4px;
+    border-radius: 4px;
+    box-shadow: 0px 0px 4px rgba(0, 0, 0, 0.4);
+    -moz-box-shadow: 0px 0px 4px rgba(0, 0, 0, 0.4);
+    -webkit-box-shadow: 0px 0px 4px rgba(0, 0, 0, 0.4);
 }
 
-.threaded-replies:empty {
-    display: none;
+.notice-options .form_repeat.dialogbox legend {
+    padding-top: 10px;
 }
 
-.user_in .threaded-replies {
-    margin-top: 0px;
-}
-
-#content .notice .threaded-replies .notice,
-#content .notice .threaded-replies .notice-data {
-    width: 440px;
-    min-height: 1px;
-    padding-bottom: 14px;
-    padding-top: 5px;
-    border-bottom: 2px dotted #eee;
-    line-height: 1.36em;
-    margin-top: 0px;
-    margin-bottom: 0px;
-    margin-left: 10px;
-    background: none;
-}
-
-#content .notice .threaded-replies .entry-title {
-    min-height: 1px;
+.notice-options .form_repeat.dialogbox input.submit_dialogbox {
+    min-width: 80px;
 }
 
 #content .threaded-replies .notice .author .photo {
-    height: 24px;
-    width: 24px;
-    top: 12px;
     box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.5);
     -moz-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.5);
     -webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.5);
 }
 
-#content .notice .threaded-replies .notice .entry-title {
-    margin: 2px 7px 0px 35px;
-}
-
-#content .notice .threaded-replies .notice div.entry-content {
-    clear:left;
-    float:left;
-    margin-left: 35px;
-    margin-top: 6px !important;
-}
-
-#content .notice .threaded-replies .notice div.entry-content.notice-faves {
-    margin-top: 2px !important;
-}
-
-#content .notice .threaded-replies .notice .notice-options {
-    margin-top: 5px;
-    margin-bottom: 0px;
-}
-
-.threaded-replies li {
-    list-style-type: none;
-}
-
-.threaded-replies .notice-reply-comments {
-    margin: 2px 0px 4px 10px;
-}
-
-.threaded-replies .placeholder {
-    margin: 10px;
-    width: 426px;
-    padding: 4px 4px 4px 6px;
-    border: 1px solid #a6a6a6;
-    -webkit-border-radius: 4px;
-    -moz-border-radius: 4px;
-    border-radius: 4px;
-    box-shadow: 0px 0px 4px rgba(0, 0, 0, 0.2);
-    -moz-box-shadow: 0px 0px 4px rgba(0, 0, 0, 0.2);
-    -webkit-box-shadow: 0px 0px 4px rgba(0, 0, 0, 0.2);
-    color: #888;
-}
-
-.threaded-replies .notice-reply {
-    clear: left;
-    position: relative;
-    padding: 10px;
-    padding-bottom: 44px;
-}
-
-.threaded-replies .form_notice textarea {
-    width: 395px;
-}
-
-.threaded-replies .form_notice label.notice_data-attach {
-    top: 10px;
-    right: 10px;
-}
-
-.threaded-replies .form_notice .notice_data-geo_wrap label,
-.threaded-replies .form_notice .notice_data-geo_wrap input {
-    top: 36px;
-    right: 10px;
-}
-
-.threaded-replies .form_notice .count {
-    top: 60px;
-    right: 50px;
-}
-
-.threaded-replies .form_notice #notice_action-submit {
-    left: 10px;
-    margin-top: -44px;
-}
-
-.threaded-replies .form_notice .error,
-.threaded-replies .form_notice .success,
-.threaded-replies .form_notice .notice-status {
-    width: 390px; 
-}
-
-.threaded-replies .to-selector {
-    display: none;
-}
-
 .user_in.realtime-popup .notice div.entry-content {
     max-width: 320px;
 }
 
+
 .realtime-popup .threaded-replies {
     margin-left: 15px;
 }
@@ -923,35 +517,11 @@ div.entry-content a.response:after {
     right: 10px !important;
 }
 
-#content .notice .notice {
-    width: 100%;
-    margin-left: 0;
-    margin-top: 16px;
-    margin-bottom: 10px;
-}
-
-.notice .notice {
-background-color:rgba(200, 200, 200, 0.050);
-}
-.notice .notice .notice {
-background-color:rgba(200, 200, 200, 0.100);
-}
-.notice .notice .notice .notice {
-background-color:rgba(200, 200, 200, 0.150);
-}
-.notice .notice .notice .notice .notice {
-background-color:rgba(200, 200, 200, 0.300);
-}
 
 .pagination {
     height: 1.2em;
 }
 
-#jOverlayContent button {
-    top: 20px;
-    right: 36px;
-}
-
 .entity_profile {
     float: left;
     width: 360px;
@@ -996,24 +566,18 @@ background-color:rgba(200, 200, 200, 0.300);
     top: 46px;
 }
 
-#aside_primary #entity_remote_subscribe a:hover {
-    background-color: #fff !important;
+.entity_subscribe .dialogbox, .entity_tag .dialogbox {
+    border: 1px solid #aaa;
+    -webkit-border-radius: 4px;
+    -moz-border-radius: 4px;
+    border-radius: 4px;
+    box-shadow: 0px 0px 4px rgba(0, 0, 0, 0.4);
+    -moz-box-shadow: 0px 0px 4px rgba(0, 0, 0, 0.4);
+    -webkit-box-shadow: 0px 0px 4px rgba(0, 0, 0, 0.4);
 }
 
-#entity_remote_subscribe .dialogbox {
-    border: 1px solid #7B4E82;
-    border-radius: 8px;
-	-moz-border-radius: 8px;
-	-webkit-border-radius: 8px;
-}
-
-#entity_remote_subscribe input {
-    padding-left: 4px;
-}
-
-#entity_remote_subscribe .submit_dialogbox {
-    margin-top: 10px;
-    float: right;
+.entity_subscribe .dialogbox input.submit_dialogbox, .entity_tag .dialogbox input.submit_dialogbox {
+    color: #fff !important;
 }
 
 #filter_tags_item .submit {
@@ -1029,20 +593,11 @@ background-color:rgba(200, 200, 200, 0.300);
     border-radius: 6px;
 }
 
-#footer {
-    position: relative;
-    top: -6px;
-    color: #000;
-    margin-left: 0px;
-    margin-right: 0px;
-    -webkit-border-top-left-radius: 6px;
-    -webkit-border-top-right-radius: 6px;
-    -moz-border-radius-topleft: 6px;
-    -moz-border-radius-topright: 6px;
-    border-top-left-radius: 6px;
-    border-top-right-radius: 6px;
+#pagination a {
+    color: #3e3e8c;
 }
 
+
 #footer a {
     color: #3e3e8c;
 }
@@ -1052,17 +607,17 @@ background-color:rgba(200, 200, 200, 0.300);
 }
 
 .error, .success, .notice-status {
-    background-color: #F7E8E8;
-    padding: 4px 10px;
     -webkit-border-radius: 6px;
     -moz-border-radius: 6px;
     border-radius: 6px;
 }
-.success, .notice-status {
-    background-color: #f2f2f2;
-}
 
-.form_notice input.submit, .form_settings input.submit, .form_settings input.cancel, #form_invite input.submit {
+
+.form_notice input.submit, .form_settings input.submit, .form_settings input.cancel, #form_invite input.submit,
+.entity_subscribe .dialogbox input.submit_dialogbox,
+.entity_tag .dialogbox input.submit_dialogbox,
+.form_repeat.dialogbox input.submit_dialogbox
+{ /* TODO combine all these declarations */
     height: 1.9em;
     padding: 0px 10px;
     color:#fff;
@@ -1075,57 +630,41 @@ background-color:rgba(200, 200, 200, 0.300);
     -moz-border-radius: 4px;
     -webkit-border-radius: 4px;
     background: #FB6104;
-    background: -moz-linear-gradient(top, #ff9d63 , #FB6104);
-    background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#ff9d63), color-stop(100%,#FB6104)); 
-    filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ff9d63', endColorstr='#FB6104',GradientType=0 );
+    background: -moz-linear-gradient(top, #ff9d63 0%, #fb6104 100%);
+    background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#ff9d63), color-stop(100%,#fb6104));
+    background: -webkit-linear-gradient(top, #ff9d63 0%,#fb6104 100%);
+    background: -o-linear-gradient(top, #ff9d63 0%,#fb6104 100%);
+    background: -ms-linear-gradient(top, #ff9d63 0%,#fb6104 100%);
+    filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ff9d63', endColorstr='#fb6104',GradientType=0 );
+    background: linear-gradient(top, #ff9d63 0%,#fb6104 100%);
 }
 
-.form_notice input.submit:hover, .form_settings input.submit:hover, .form_settings input.cancel:hover, #form_invite input.submit:hover {
+.form_notice input.submit:hover, .form_settings input.submit:hover, .form_settings input.cancel:hover, #form_invite input.submit:hover,
+.entity_subscribe .dialogbox input.submit_dialogbox:hover,
+.entity_tag .dialogbox input.submit_dialogbox:hover,
+.form_repeat.dialogbox input.submit_dialogbox:hover
+{
     text-shadow: 0px -1px 0px rgba(0, 0, 0, 0.6);
     background: #ff9d63;
-    background: -moz-linear-gradient(top, #FB6104 , #fc8035);
-    background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#FB6104), color-stop(100%,#fc8035));
-    filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#FB6104', endColorstr='#fc8035',GradientType=0 );
+    background: -moz-linear-gradient(top, #fb6104 0%, #fc8035 100%);
+    background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#fb6104), color-stop(100%,#fc8035));
+    background: -webkit-linear-gradient(top, #fb6104 0%,#fc8035 100%);
+    background: -o-linear-gradient(top, #fb6104 0%,#fc8035 100%);
+    background: -ms-linear-gradient(top, #fb6104 0%,#fc8035 100%);
+    filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#fb6104', endColorstr='#fc8035',GradientType=0 );
+    background: linear-gradient(top, #fb6104 0%,#fc8035 100%);
 }
 
-.form_settings input#settings_design_reset, .form_settings input.cancel {
-    background: #e2e2e2;
-    color: #8e181b;
-    text-shadow: 0px 1px 1px rgba(255, 255, 255, 0.5);
-}
-
-.form_settings input#settings_design_reset:hover, .form_settings input.cancel:hover {
+.form_settings input#settings_design_reset, .form_settings input#cancel, #form_action-no {
     background: #f2f2f2;
-    color: #8e181b;
+    color: #d7621c;
     text-shadow: 0px 1px 1px rgba(255, 255, 255, 0.5);
 }
 
-.form_settings input.checkbox, .form_settings input.radio {
-    margin-left: 24%;
-    margin-top: 2px;
-    position: relative;
-    left: -14px;
-}
-
-.form_settings label.checkbox, .form_settings label.radio {
-    width: auto;
-    max-width: 60%;
-    position: relative;
-    left: -30px;
-}
-
-.form_settings li input.radio {
-    clear: left;
-}
-
-.form_settings label.radio {
-    margin-left: 10px;
-    margin-right: 10px;
-    text-align: left;
-}
-
-#form_login p.form_guide, #form_register #settings_rememberme p.form_guide, #form_openid_login #settings_rememberme p.form_guide, #settings_twitter_remove p.form_guide, #design_background-image_onoff p.form_guide {
-    margin-left: 26%;
+.form_settings input#settings_design_reset:hover, .form_settings input#cancel:hover, #form_action-no:hover {
+    background: #fff;
+    color: #d7621c;
+    text-shadow: 0px 1px 1px rgba(255, 255, 255, 0.5);
 }
 
 .form_settings fieldset fieldset {
@@ -1260,7 +799,61 @@ padding-right:0;
     margin-top: 60px;
 }
 
+/* Limited-scope */
+
+.limited-scope .entry-content .timestamp {
+    padding-left: 20px;
+    position: relative;
+}
+
+.limited-scope .entry-content .timestamp:before {
+    content: url(../images/lock.png);
+    position: absolute;
+    top: -2px;
+    left: 0px;
+}
+
+.limited-scope li .entry-content .timestamp {
+    padding-left: 0px;
+}
+
+.limited-scope li .entry-content .timestamp:before {
+    content: none;
+}
+
+.limited-scope li.limited-scope .entry-content .timestamp {
+    padding-left: 20px;
+}
+
+.limited-scope li.limited-scope .entry-content .timestamp:before {
+    content: url(../images/lock.png);
+    position: absolute;
+    top: -2px;
+    left: 0px;
+}
+
+/* Blog */
+
+label[for=blog-entry-content] {
+    display: none !important;
+}
+
+#input_form_blog td {
+    padding-top: 0px;
+    padding-bottom: 0px;
+}
+
+#input_form_blog td.mceToolbar {
+    padding-top: 4px;
+}
+
+h4.blog-entry-title {
+    margin-bottom: 8px;
+    line-height: 1.2em;
+}
+
 /* Bookmark specific styles */
+/* TODO separate base styles and move to plugin */
 
 .bookmark h3 {
     margin: 0px 0px 8px 0px;
@@ -1342,10 +935,6 @@ ul.bookmark-tags a:hover {
     opacity: 1;
 }
 
-.bookmark .notice-options {
-    margin-top: 16px;
-}
-
 #bookmarkpopup {
     min-width: 600px;
     margin-top: 0px;
@@ -1382,9 +971,8 @@ ul.bookmark-tags a:hover {
     color: #777;
 }
 
-#bookmarkpopup #submit {
-    float: right;
-    margin-right: 0px;
+#bookmarkpopup #bookmark-submit {
+    min-width: 100px;
 }
 
 #bookmarkpopup fieldset fieldset {
@@ -1402,6 +990,7 @@ ul.bookmark-tags a:hover {
 }
 
 /* Onboard specific styles */
+/* TODO move to plugin */
 
 #cboxOverlay{
     background: url(../images/lightbox_bg.png) repeat 0 0 !important;
@@ -1438,7 +1027,7 @@ ul.bookmark-tags a:hover {
 
 #aside_primary #onboard_section {
     background: #f2f2f2;
-    width: 198px;
+    width: 196px;
     padding: 10px;
     border-radius: 4px;
     -moz-border-radius: 4px;
@@ -1463,9 +1052,13 @@ ul.bookmark-tags a:hover {
     color: #fff;
     text-shadow: 0px 1px 1px rgba(0, 0, 0, 0.5);
     background: #364A84;
-    background: -moz-linear-gradient(top, #516499 , #364a84);
+    background: -moz-linear-gradient(top, #516499 0%, #364a84 100%);
     background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#516499), color-stop(100%,#364a84));
+    background: -webkit-linear-gradient(top, #516499 0%,#364a84 100%);
+    background: -o-linear-gradient(top, #516499 0%,#364a84 100%);
+    background: -ms-linear-gradient(top, #516499 0%,#364a84 100%);
     filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#516499', endColorstr='#364a84',GradientType=0 );
+    background: linear-gradient(top, #516499 0%,#364a84 100%);
 }
 
 #onboard_section ul {
@@ -1487,6 +1080,7 @@ ul.bookmark-tags a:hover {
 }
 
 /* Billing specific styles */
+/* TODO move to plugin */
 
 #content table.billing_info {
     margin-top: 10px;
@@ -1511,6 +1105,7 @@ ul.bookmark-tags a:hover {
 }
 
 /* Directory specific styles */
+/* TODO separate base styles and move to plugin */
 
 div#profile_directory div.alpha_nav > a {
     border-left: 1px solid #ccc !important;
@@ -1651,6 +1246,7 @@ td.entity_profile {
 }
 
 /* Event specific styles */
+/* TODO separate base styles and move to plugin */
 
 .notice .vevent div {
     margin-bottom: 8px;
@@ -1688,17 +1284,30 @@ td.entity_profile {
     -moz-border-radius: 4px;
     -webkit-border-radius: 4px;
     background: #FB6104;
-    background: -moz-linear-gradient(top, #ff9d63 , #FB6104);
-    background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#ff9d63), color-stop(100%,#FB6104)); 
-    filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ff9d63', endColorstr='#FB6104',GradientType=0 );
+    background: -moz-linear-gradient(top, #ff9d63 0%, #fb6104 100%);
+    background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#ff9d63), color-stop(100%,#fb6104));
+    background: -webkit-linear-gradient(top, #ff9d63 0%,#fb6104 100%);
+    background: -o-linear-gradient(top, #ff9d63 0%,#fb6104 100%);
+    background: -ms-linear-gradient(top, #ff9d63 0%,#fb6104 100%);
+    filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ff9d63', endColorstr='#fb6104',GradientType=0 );
+    background: linear-gradient(top, #ff9d63 0%,#fb6104 100%);
 }
 
 #form_event_rsvp input.submit:hover {
     text-shadow: 0px -1px 0px rgba(0, 0, 0, 0.6);
     background: #ff9d63;
-    background: -moz-linear-gradient(top, #FB6104 , #fc8035);
-    background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#FB6104), color-stop(100%,#fc8035));
-    filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#FB6104', endColorstr='#fc8035',GradientType=0 );
+    background: -moz-linear-gradient(top, #fb6104 0%, #fc8035 100%);
+    background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#fb6104), color-stop(100%,#fc8035));
+    background: -webkit-linear-gradient(top, #fb6104 0%,#fc8035 100%);
+    background: -o-linear-gradient(top, #fb6104 0%,#fc8035 100%);
+    background: -ms-linear-gradient(top, #fb6104 0%,#fc8035 100%);
+    filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#fb6104', endColorstr='#fc8035',GradientType=0 );
+    background: linear-gradient(top, #fb6104 0%,#fc8035 100%);
+}
+
+#wrap .vevent form.processing input.submit {
+    text-indent: 0;
+    background: #ff9d63;
 }
 
 #input_form_event .form_settings .form_data {
@@ -1714,49 +1323,22 @@ td.entity_profile {
     width: auto;
 }
 
-#event-startdate, #event-starttime, #event-enddate, #event-endtime {
-    width: 120px;
+label[for=event-starttime], label[for=event-endtime] {
+    display: none !important;
+}
+
+#event-starttime, #event-endtime {
+    margin-top:  -1px;
+    margin-bottom:  -1px;
+    height: 2em;
+}
+
+#event-startdate, #event-enddate {
     margin-right: 20px;
+    width: 120px;
 }
 
-/* Limited-scope specific styles */
-
-.limited-scope .entry-content .timestamp {
-    padding-left: 20px;
-    position: relative;
-}
-
-.limited-scope .entry-content .timestamp:before {
-    content: url(../images/lock.png);
-    position: absolute;
-    top: -2px;
-    left: 0px;
-}
-
-.limited-scope li .entry-content .timestamp {
-    padding-left: 0px;
-}
-
-.limited-scope li .entry-content .timestamp:before {
-    content: none;
-}
-
-.limited-scope li.limited-scope .entry-content .timestamp {
-    padding-left: 20px;
-}
-
-.limited-scope li.limited-scope .entry-content .timestamp:before {
-    content: url(../images/lock.png);
-    position: absolute;
-    top: -2px;
-    left: 0px;
-}
-
-/* QnA specific styles */
-
-#content .question .entry-title, #content .qna-full-question .entry-title {
-    min-height: 1px;
-}
+/* QnA */
 
 .question div.question-description {
     font-size: 1em;
@@ -1766,95 +1348,17 @@ td.entity_profile {
 }
 
 .question div.answer-content, .qna-full-question div.answer-content {
+    font-size: 1em;
     opacity: 1;
 }
 
-.question .answer-count, .qna-full-question .answer-count {
-    display: block;
-    clear: left;
-}
-
-.question .answer-count:before, .qna-full-question .answer-count:before {
-    content: '(';
-}
-
-.question .answer-count:after, .qna-full-question .answer-count:after {
-    content: ')';
-}
-
-.question .notice-answer {
-    margin-left: 10px;
-    padding-bottom: 10px;
-}
-
-ul.qna-dummy {
-    clear: left;
-    float: left;
-    list-style-type: none;
-    width: 458px;
-    margin-left: 59px;
-    padding-right: 2px;
-    border-left: 3px solid #ECECF2;
-    background: #fafafa;
-    font-size: 1em;
-}
-
-ul.qna-dummy + ul.threaded-replies li.notice:first-child {
-    border-top: 2px dotted #eee;
-    margin-top: -10px;
-    padding-top: 10px;
-}
-
-.qna-dummy-placeholder input {
-    margin: 10px;
-    width: 426px;
-    padding: 4px 4px 4px 6px;
-    border: 1px solid #a6a6a6;
+.qna-dummy-placeholder input, .question #qna-answer, .qna-full-question #qna-answer {
     -webkit-border-radius: 4px;
     -moz-border-radius: 4px;
     border-radius: 4px;
     box-shadow: 0px 0px 4px rgba(0, 0, 0, 0.2);
     -moz-box-shadow: 0px 0px 4px rgba(0, 0, 0, 0.2);
     -webkit-box-shadow: 0px 0px 4px rgba(0, 0, 0, 0.2);
-    color: #888;
-}
-
-li.notice-answer + li.notice {
-    border-top: 2px dotted #eee;
-    margin-top: -10px;
-    padding-top: 10px;
-}
-
-.question fieldset, .qna-full-question fieldset {
-    margin: 0px;
-}
-
-.question fieldset legend, .qna-full-question fieldset legend, .answer fieldset legend {
-    display: none;
-}
-
-.question label[for=qna-answer], .qna-full-question label[for=qna-answer] {
-    display: none;
-}
-
-.question #qna-answer, .qna-full-question #qna-answer {
-    width: 426px;
-    height: 54px;
-    padding: 6px 5px;
-    border: 1px solid #a6a6a6;
-    -webkit-border-radius: 4px;
-    -moz-border-radius: 4px;
-    border-radius: 4px;
-    box-shadow: 0px 0px 4px rgba(0, 0, 0, 0.2);
-    -moz-box-shadow: 0px 0px 4px rgba(0, 0, 0, 0.2);
-    -webkit-box-shadow: 0px 0px 4px rgba(0, 0, 0, 0.2);
-    font-size: 1.2em;
-    margin-top: 10px;
-    margin-bottom: 10px;
-}
-
-.qna-full-question textarea {
-    width: 508px;
 }
 
 .question-description input.submit, .answer-content input.submit {
@@ -1871,17 +1375,29 @@ li.notice-answer + li.notice {
     -moz-border-radius: 4px;
     -webkit-border-radius: 4px;
     background: #FB6104;
-    background: -moz-linear-gradient(top, #ff9d63 , #FB6104);
-    background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#ff9d63), color-stop(100%,#FB6104)); 
-    filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ff9d63', endColorstr='#FB6104',GradientType=0 );
+    background: -moz-linear-gradient(top, #ff9d63 0%, #fb6104 100%);
+    background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#ff9d63), color-stop(100%,#fb6104));
+    background: -webkit-linear-gradient(top, #ff9d63 0%,#fb6104 100%);
+    background: -o-linear-gradient(top, #ff9d63 0%,#fb6104 100%);
+    background: -ms-linear-gradient(top, #ff9d63 0%,#fb6104 100%);
+    filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ff9d63', endColorstr='#fb6104',GradientType=0 );
+    background: linear-gradient(top, #ff9d63 0%,#fb6104 100%);
+}
+
+#qna-answer-submit {
+    min-width: 100px;
 }
 
 .question .question-description input.submit:hover, .question .answer-content input.submit:hover {
     text-shadow: 0px -1px 0px rgba(0, 0, 0, 0.6);
     background: #ff9d63;
-    background: -moz-linear-gradient(top, #FB6104 , #fc8035);
-    background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#FB6104), color-stop(100%,#fc8035));
-    filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#FB6104', endColorstr='#fc8035',GradientType=0 );
+    background: -moz-linear-gradient(top, #fb6104 0%, #fc8035 100%);
+    background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#fb6104), color-stop(100%,#fc8035));
+    background: -webkit-linear-gradient(top, #fb6104 0%,#fc8035 100%);
+    background: -o-linear-gradient(top, #fb6104 0%,#fc8035 100%);
+    background: -ms-linear-gradient(top, #fb6104 0%,#fc8035 100%);
+    filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#fb6104', endColorstr='#fc8035',GradientType=0 );
+    background: linear-gradient(top, #fb6104 0%,#fc8035 100%);
 }
 
 .question .question-description #answer-form input.submit {
@@ -1893,4 +1409,51 @@ li.notice-answer + li.notice {
     padding-left: 20px;
 }
 
+.question p.best:before, .answer p.best:before {
+    content: none !important;
+}
+
+/* Poll specific styles */
+
+.notice div.poll-content {
+    opacity: 1;
+}
+
+#poll-response-submit {
+    min-width: 100px;
+}
+
+/* SNOD CompanyLogo styling */
+/* TODO move to plugin */
+
+#site_nav_local_views a.company_logo {
+    width: 138px;
+    padding: 0px;
+    font-weight: bold;
+    text-transform: none;
+    line-height: 1em;
+    margin-bottom: 20px;
+    position: relative;
+    top: -4px;
+}
+
+#site_nav_local_views a.company_logo:hover {
+    background: none;
+    color: blue;
+    text-shadow: 0px 1px 1px rgba(255, 255, 255, 0.5);
+}
+
+.company_logo img {
+    max-width: 138px;
+    margin-bottom: 4px;
+}
+
+.company_logo span {
+    display: block;
+}
+
+a.company_logo:hover span {
+    text-decoration: underline;
+}
+
 }/*end of @media screen, projection, tv*/
diff --git a/theme/neo/css/mp-screen.css b/theme/neo/css/mp-screen.css
index 559e71ce00..013779ca95 100644
--- a/theme/neo/css/mp-screen.css
+++ b/theme/neo/css/mp-screen.css
@@ -1,137 +1,43 @@
-/* mobile style */
-
 body {
     background-image: none;
     min-width: 0;
 }
 
-#wrap {
-    margin: 0;
-    padding: 0;
-    min-width:0;
-    max-width:100%;
-    width: auto;
-    border: none;
-}
-
 #header {
-    width: 100%;
     padding: 0;
 }
 
-address {
-    float:left;
-    margin: 0px;
-    width: auto;
-    left: 0px;
-}
-
-address img {
-    float: left;
-    background: #fff;
-    padding: 2px 2px 2px 6px;
-}
-
-address img + .fn {
-    display:block;
-    margin-top: 8px;
-    clear: left;
-    float: left;
-    color: #000;
-    margin-left: 6px;
-}
-
 #site_nav_global_primary {
-    margin:0;
-    width: 100%;
-    padding: 2px 0;
-    height: auto;
-    position:absolute;
-    top:0;
-    left:0;
-    font-size: 1em;
-	letter-spacing: 0em;
-    border-top: none;
+    top: 0;
     -webkit-border-top-right-radius: 0px;
     -moz-border-radius-topright: 0px;
     border-top-right-radius: 0px;
-    height: 24px;
     line-height: 16px;
 }
 
 #site_nav_global_primary li {
-    margin-left:0;
-    margin-right: 2px;
-    float:left;
-    font-size:0.9em;
-    padding: 2px 4px;
-    line-height: 1em;
-    height: auto;
-}
-
-#site_nav_global_primary li:last-child {
-    margin-right: 0px;
-}
-
-#site_nav_global_primary a {
-    padding: 2px 4px;
-    height: 20px;
-}
-
-#core {
-    width: 100%;
-    border-left: none;
-    border-right: none;
-}
-
-#aside_primary_wrapper {
-    background: none;
-}    
-
-#content_wrapper {  
-    right: 0px;
-    border: none;
-}  
-
-#site_nav_local_views_wrapper  {  
-    right: 0px;
-    border: none;
-}  
-
-#navtoggle {
-    float: right;
-    padding: 2px 6px;
-    text-decoration: none;
+    float: left;
+    margin-right: 8px;
 }
 
 #site_nav_local_views {
-    height: auto;
-    font-size: 1em;
     line-height: 2em;
-    margin-bottom: 0px;
-    padding: 10px 0px 10px 6px;
-    background: none;
-    left: 0px;
-    width: 100%;
-    display: none;
 }
 
 #site_nav_local_views h3 {
     color: #333;
-    font-size: 1em;
-    margin-bottom: 0px;
-}
-
-#site_nav_local_views li {
-    margin-right: 6px;
-    margin-bottom: 0px;
-    clear: left;
+    background: none;
+    text-transform: none;
+    letter-spacing: 0;
+    padding-bottom: 0;
 }
 
 #site_nav_local_views li li {
-    float: left;
-    clear: none;
-    margin-bottom: 6px;
+    margin: 0 6px 6px 0;
+}
+
+#login #site_nav_local_views li, #register #site_nav_local_views li, #openidlogin #site_nav_local_views li {
+    margin: 0 6px 6px 0;
 }
 
 #site_nav_local_views a {
@@ -150,268 +56,40 @@ address img + .fn {
     background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#364a84), color-stop(100%,#7b8dbb));
 }
 
-#login #site_nav_local_views, #register #site_nav_local_views, #openidlogin #site_nav_local_views {
-    display: block;
-    margin-top: 25px;
-}
-
-#login #navtoggle, #register #navtoggle, #openidlogin #navtoggle {
-    display: none;
-}
-
-#login #site_nav_local_views li, #register #site_nav_local_views li, #openidlogin #site_nav_local_views li {
-    float: left;
-    clear: none;
-    margin-bottom: 6px;
-}
-
-#content {
-    width: 96%;
-    padding: 10px 2%;
-    margin: 0;
-    min-height: auto;
-    left: 0px;
-}
-
-#content h1 {
-    clear: left;
-}
-
-#footer {
-    margin: 0;
-    padding: 10px 4px 4px 4px;
-}
-
 .input_forms { 
-    display: block;
-    width: 102%;
     top: -10px;
-    left: -2%;
-    padding-left: 2%;
     padding-right: 0;
 }
 
 #input_form_nav li a {
     padding: 0px 4px 1px 4px;
-    margin-right: 6px;
-}
-
-.input_form {
-    clear: left;
-    width: 100%;
-    padding-bottom: 0px;
-}
-
-#input_form_status, #input_form_direct {
-    padding-bottom: 40px;
-}
-
-.form_notice_placeholder .placeholder {
-    width: 290px;
-    margin-bottom: 20px;
-}
-
-.form_notice {
-    float: left;
-    margin-left: 0px;
-    width: 300px;
-    padding: 4px 0px;
-}
-
-#form_notice-direct.form_notice {
-    padding-top: 0px;
-}
-
-.form_notice textarea, #form_notice-direct.form_notice textarea {
-    width: 292px;
-    height: 36px;
-    padding: 4px 4px 16px 4px;
-    font-size: 1em;
 }
 
 .form_notice .count {
-    position: absolute;
     top: 44px;
-    left: 270px;
+    left: 276px;
 }
 
 #form_notice-direct.form_notice .count {
-    top: 70px;
-    left: 270px;
+    top: 74px;
+    left: 276px;
 }
 
-
-/*input type=file no good in
-iPhone/iPod Touch, Android, Opera Mini Simulator
-*/
-
-.form_notice .notice_data-attach, .form_notice .notice_data-geo_wrap label, .form_notice .notice_data-geo_wrap input {
-    display:none;
-}
-
-.checkbox-wrapper {
-    margin-left: 0px;
-    clear: left;
-    float: left;
-    width: 200px;
-}
-
-.form_notice .checkbox-wrapper {
-    display: inline;
-    margin-left: 0px;
-}
-
-.checkbox-wrapper label.checkbox {
-    display: none;
-}
-
-.checkbox-wrapper #notice_private {
-    display: inline;
-    margin-top: 10px;
-    margin-left: 20px;
-}
-
-.form_notice .checkbox-wrapper #notice_private {
-    margin-left: 0px;
-}
-
-.checkbox-wrapper:before {
-    content: "Send privately?";
-}
-
-.input_form fieldset fieldset {
-    width: 300px;
-}
-
-.input_form .form_settings li input {
-    width: 292px;
-}
-
-.input_form .form_settings li textarea {
-    width: 292px;
-}
-
-.bookmarkform-thumbnail {
-    display: none;
+#event-startdate, #event-starttime, #event-enddate, #event-endtime {
+    width: 120px;
+    margin-right: 12px;
 }
 
 .input_form .form_settings .submit {
     font-size: 1em;
-    margin: 10px 0;
-    clear: left;
-    float: left;
 }
 
-.form_notice #notice_action-submit {
-    text-align: center;
-    left: 0px;
-    top: 192px;
-    width: 80px;
+.form_notice input.submit {
     font-size: 1em;
 }
 
-#form_notice-direct.form_notice #notice_action-submit {
-    top: 148px;
-}
-
-.threaded-replies {
-    width: 80%;
-    margin-left: 59px;
-}
-
-#content .notice .threaded-replies .notice {
-    width: 95%;
-}
-
-.threaded-replies .placeholder {
-    margin: 10px;
-    width: 92%;
-}
-
-.threaded-replies .form_notice {
-    margin-bottom: 10px;
-}
-
-.threaded-replies .form_notice textarea {
-    width: 220px;
-}
-
-.threaded-replies .form_notice .count {
-    left: 205px;
-    top: 53px;
-}
-
-.threaded-replies .form_notice #notice_action-submit {
-    position: relative;
-    top: 0;
-    bottom: 0px;
-    left: 0;
-    margin-top: 10px;
-}
-
-.threaded-replies .form_notice .error,
-.threaded-replies .form_notice .success,
-.threaded-replies .form_notice .notice-status {
-    width: 210px; 
-}
-
-.form_settings fieldset {
-margin-bottom:7px;
-}
-
-.form_settings label {
-width:auto;
-display:block;
-float:none;
-    text-align: left;
-}
-
-.form_settings .form_data li {
-margin-bottom:7px;
-}
-
-.form_settings .form_data textarea,
-.form_settings .form_data select, 
-.form_settings .form_data input {
-margin-left:0;
-display:block;
-}
-.form_settings .form_data textarea {
-width:96.41%;
-}
-
-.form_settings .form_data label {
-float:none;
-}
-
-.form_settings .form_data p.form_guide {
-width:auto;
-margin-left:0 !important;
-}
-
-#settings_design_color .form_data {
- width: auto;
- margin-right: 0;
-}
-
-.form_settings input.checkbox, .form_settings input.radio {
-  left: 0px;
-}
-
-.form_settings label.checkbox, .form_settings label.radio {
-  left: -10px;
-}
-
-.notice .addressees:before {
-    content: '\003E';
-}
-
-.notice .addressees:empty:before {
-    content: none;
-}
-
-.user_in .notice div.entry-content {
-  max-width: 150px;
+.question div.question-description {
+    max-width: 100% !important;
 }
 
 ul.qna-dummy {
@@ -426,6 +104,10 @@ ul.qna-dummy {
     width: 220px;
 }
 
+.threaded-replies #answer-form fieldset {
+    width: 220px;
+}
+
 .threaded-replies #qna-answer-submit {
     float: left;
     clear: left;
@@ -435,3 +117,7 @@ ul.qna-dummy {
     left: 0;
     margin-top: 10px;
 }
+
+a.company_logo {
+    display: none !important;
+}
diff --git a/theme/neo/css/rtl.css b/theme/neo/css/rtl.css
new file mode 100644
index 0000000000..7d044213a3
--- /dev/null
+++ b/theme/neo/css/rtl.css
@@ -0,0 +1,326 @@
+/** theme: neo
+ *
+ * @package   StatusNet
+ * @author    Osama Khalid <osamak@gnu.org>
+ * @copyright Osama Khalid
+ * @license   http://creativecommons.org/licenses/by/3.0/ Creative Commons Attribution 3.0 Unported
+ * @link      http://status.net/
+ */
+
+body {
+    direction: rtl;
+}
+
+span.rtl{
+    direction: rtl !important;
+}
+
+#content .notice .entry-title{
+    direction: ltr;
+}
+
+.form_notice textarea{
+    direction: ltr;
+}
+
+#site_nav_global_primary ul{
+    float: left;
+}
+
+.notice div.entry-content {
+    float: right;
+    clear: right;
+}
+
+#content .notice .threaded-replies .notice div.entry-content{
+    clear: right;
+    float: right;
+}
+
+#content h1{
+    font-weight: bold;
+    letter-spacing: 0;
+}
+
+.threaded-replies {
+    border-right: 3px solid #ECECF2;
+    border-left: 0;
+    margin-right: 59px;
+    margin-left: 0;
+}
+
+address{
+    float: right;
+}
+
+#site_nav_global_primary {
+    left: 0;
+    right: auto;
+}
+
+.input_form .form_settings .submit{
+    float: left;
+}
+
+.input_form .form_settings fieldset fieldset{
+    float: right;
+}
+
+.input_form fieldset fieldset label{
+    right: 6px;
+    text-align: right;
+}
+
+#input_form_event .form_settings .form_data li{
+    float: right;
+}
+
+.notice .author {
+    direction: rtl;
+    float: right;
+    margin-left: 8px;
+    margin-right: 0;
+}
+
+.section .notice .author {
+    margin-left: 0;
+}
+
+.notice p.entry-content {
+    float: left;
+}
+
+.threaded-replies .form_notice #notice_action-submit {
+    right: 10px;
+}
+
+.form_notice input.submit{
+    float: right;
+}
+
+#export_data li a{
+    padding-right: 30px;
+    padding-left: 0;
+/*    background-position: right center; */
+}
+
+#content .notice .threaded-replies .notice .entry-title{
+    margin: 2px 35px 0 7px;
+}
+
+#content .notice .entry-title {
+    margin: 2px 59px 0 7px;
+}
+
+#content .notice .author .photo{
+    right: 0;
+    left: auto;
+}
+
+.notice-options{
+    float: left;
+}
+
+.notice div.entry-content {
+    margin-right: 59px;
+    margin-left: 0;
+}
+
+#core .vcard .photo {
+    margin-left: 11px;
+    margin-right: 0;
+}
+
+.threaded-replies .notice-reply-comments {
+    margin: 2px 10px 4px 0;
+}
+
+#shownotice .notice div.entry-content {
+    margin-right: 0;
+}
+
+.notice .addressees:before {
+    content: '\25C2';
+}
+
+#content thead th {
+    text-align: right;
+}
+
+.profile_list th.current a {
+    background-position: left top;
+    padding-left: 25px;
+}
+
+.form_settings .form_data textarea, .form_settings .form_data select, .form_settings .form_data input {
+    float: right;
+    margin-right: 1.795%;
+}
+
+.form_settings .form_data label {
+    float: right;
+}
+
+.form_settings label {
+    text-align: left;
+}
+
+#form_search input.submit {
+    margin-right: 5px;
+}
+
+#site_nav_local_views H3{
+    font-weight: bold;
+    letter-spacing: 0;
+}
+
+#aside_primary h2{
+    font-weight: bold;
+    letter-spacing: 0;
+}
+
+.form_settings label[for="notice_to"] {
+    margin-left: 10px;
+    margin-right: 0;
+}
+
+select {
+    padding-left: 10px;
+}
+
+#input_form_nav li a {
+    float: right;
+}
+
+#content table.extended-profile td {
+    padding-left: 0 !important;
+    padding-right: 8px !important;
+}
+
+.experience-item, .education-item {
+    float: right;
+}
+
+#site_nav_global_primary a {
+    float: right;
+}
+
+.form_settings .form_data p.form_guide {
+    margin-right: 27%;
+}
+
+.form_settings label.checkbox {
+    text-align: right;
+}
+
+.form_settings label.checkbox, .form_settings label.radio {
+    left: 0;
+    right: -25px;
+}
+
+.form_settings input.checkbox, .form_settings input.radio {
+    margin-right: 25%;
+    margin-left: 20px;
+    right: -14px;
+    left: 0;
+}
+
+.form_settings input {
+    margin-left: 20px;
+}
+
+.form_settings .form_data li {
+    float: right;
+}
+
+#header-search {
+    float: left;
+}
+
+#header-search input[type="submit"] {
+    left: 0;
+    right: auto;
+}
+
+#avatarfile {
+    width: 100%;
+}
+
+.form_settings .checkbox-wrapper label.checkbox {
+    right: -3px;
+    left: auto;
+}
+
+.checkbox-wrapper.unchecked label.checkbox, .checkbox-wrapper.checked label.checkbox {
+    padding-right: 20px;
+    padding-left: 0;
+    background-position: right center;
+}
+
+.input_form .form_settings .form_data p.form_guide {
+    margin-right: 5px;
+    margin-left: 27%;
+}
+
+.experience-item, .education-item {
+    float: right !important;
+}
+
+.profile_block .entity_actions {
+    float: left;
+}
+
+.profile .entity_profile .fn, .profile .entity_profile .label {
+    margin-right: 11px;
+    margin-left: 0;
+}
+
+#core .vcard .photo {
+    float: right;
+}
+
+.profile_list .label {
+    margin-right: 59px !important;
+}
+
+.profile .entity_profile .note, .profile .entity_profile .url, .profile .entity_profile .entity_tags, .profile .entity_profile .form_subscription_edit {
+    margin-right: 59px;
+    margin-left: 0;
+}
+
+.profile_list .entity_actions ul {
+    left: 20px;
+    right: auto;
+}
+
+.entity_actions input.submit {
+   text-align: right;
+}
+
+#entity_statistics dt, #entity_statistics dd {
+    margin-left: 11px;
+    margin-right: 0;
+}
+
+#showstream .notice .entry-title, #showstream .notice div.entry-content {
+    margin-right: 0;
+}
+
+.limited-scope .entry-content .timestamp:before {
+    right: 0;
+    left: auto;
+}
+
+.limited-scope .entry-content .timestamp {
+    padding-left: 0;
+    padding-right: 20px;
+}
+
+.section ul.entities {
+    float: right;
+}
+
+.section .entities li {
+    float: right;
+}
+
diff --git a/theme/neo/images/magnifier.png b/theme/neo/images/magnifier.png
new file mode 100644
index 0000000000..cf3d97f75e
Binary files /dev/null and b/theme/neo/images/magnifier.png differ
diff --git a/theme/neo/logo.png b/theme/neo/logo.png
index 3891979530..e4634b9e9c 100644
Binary files a/theme/neo/logo.png and b/theme/neo/logo.png differ
diff --git a/tpl/index.php b/tpl/index.php
deleted file mode 100644
index 36a1611449..0000000000
--- a/tpl/index.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php echo '<?';?>xml version="1.0" encoding="UTF-8"?> <!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-	<head>
-		<title><?php echo section('title'); ?></title>
-		<?php echo section('styles'); ?>
-		<?php echo section('scripts'); ?>
-		<?php echo section('search'); ?>
-		<?php echo section('feeds'); ?>
-		<?php echo section('description'); ?>
-		<?php echo section('head'); ?>
-		</head>
-	<body id="<?php echo section('action'); ?>">
-		<div id="wrap">
-			<div id="header">
-				<?php echo section('logo'); ?>
-				<?php echo section('nav'); ?>
-				<?php echo section('notice'); ?>
-				<?php echo section('noticeform'); ?>
-			</div>
-			<div id="core">
-				<?php echo section('localnav'); ?>
-				<?php echo section('bodytext'); ?>
-				<div id="aside_primary" class="aside">
-					<?php echo section('export'); ?>
-					<?php echo section('subscriptions'); ?>
-					<?php echo section('subscribers'); ?>
-					<?php echo section('groups'); ?>
-					<?php echo section('statistics'); ?>
-					<?php echo section('cloud'); ?>
-					<?php echo section('groupmembers'); ?>
-					<?php echo section('groupstatistics'); ?>
-					<?php echo section('groupcloud'); ?>
-					<?php echo section('popular'); ?>
-					<?php echo section('groupsbyposts'); ?>
-					<?php echo section('featuredusers'); ?>
-					<?php echo section('groupsbymembers'); ?>
-					</div>
-				</div>
-			<div id="footer">
-				<?php echo section('secondarynav'); ?>
-				<?php echo section('licenses'); ?>
-			</div>
-			</div>
-		</body>
-	</html>